diff -Naurp linux-2.4.20-wolk4.15-fullkernel/2.4-WOLK-CHANGELOG linux-2.4.20-wolk4.16-fullkernel/2.4-WOLK-CHANGELOG
--- linux-2.4.20-wolk4.15-fullkernel/2.4-WOLK-CHANGELOG	2004-06-29 13:23:02.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/2.4-WOLK-CHANGELOG	2004-09-09 13:30:42.000000000 +0200
@@ -1,3 +1,86 @@
+Changelog from v4.15s -> v4.16s
+-------------------------------
+o   added:    Autonegotiation on|off|sense for sk98lin driver if
+                compiled statically into the kernel via config
+o   added:    calculate default broadcast even when using SIOCSIGNETMASK
+o   added:    NDIS wrapper v0.9
+o   added:    AGP: Intel i915G support
+o   added:    nForce Ethernet v0.29
+o   added:    Broadcom BCM4400 (b44, alternate driver) v0.93
+o   added:    Intel PRO/10GbE support v1.0.65
+o   added:    Statistic support for LSI MegaRAID (v2.10.6) in /proc
+o   added:    /proc/sys/net/ipv4/netdebug, default on
+                disable this if you get annoyed by things like:
+                - hw tcp v4 csum failed
+                - TCP: Treason uncloaked! Peer <foo> shrinks window <bar>.
+                - udp v4 hw csum failure
+                Bonus: Made error messages consistent!
+o   added:    3c920n 9100 IGP support to 3c59x network driver
+o   added:    WCCP tunnels over IP (IPWCCP)
+o   fixed:    compile problems with RANDEXEC enabled
+o   fixed:    RANDEXEC works now with RMAP :p
+o   fixed:    ntpd segfaults with grsecurity
+o   fixed:    CAN-2004-0497: missing DAC check on sys_chown
+o   fixed:    CAN-2004-0587: QLA2xxx device permissions
+o   fixed:    CAN-2004-0394: potential buffer overflow in panic
+o   fixed:    CAN-2004-0415: fix an exploitable race in file offset
+                handling which allows unpriviledged users from potentially
+                reading kernel memory. This touches several drivers and
+                generic proc code.
+o   fixed:    wtd semaphore race condition
+o   fixed:    ext3 direct io
+o   fixed:    removed bogus __set_current_state(TASK_RUNNING)
+o   fixed:    some compiler warnings in kernel/ksyms.c
+o   fixed:    With PREEMPT and SMP, machines rebooted immediately :(
+o   fixed:    /proc/config.gz output was fucked up on SMP
+o   fixed:    duplicated /proc/<PID>/status:TGid field
+o   fixed:    now really fix the oops output to get kallsyms feature back.
+o   fixed:    compile warnings in all QLA2xxx drivers
+o   fixed:    pcmcia shared irq on qlogicfas
+o   fixed:    repair scsi/pcmcia modules so that they can build by only
+                including scsi_module.c for non-PCMCIA builds
+o   fixed:    some xconfig holy shit brain damage
+o   fixed:    unresolved symbol 'ipv6_skip_exthdr' in ip6_tables.o
+o   updated:  LUFS v0.9.7
+o   updated:  XFS (up to 2.4.27-pre3)
+o   updated:  JFS (up to 2.4.28-pre3)
+o   updated:  Loop-AES v2.2b
+o   updated:  Loop Cyphers: Blowfish, twofish, serpent v2.0i
+o   updated:  CryptoAPI (up to 2.4.28-pre3)
+o   updated:  Bluetooth 2.4.20-mh18
+o   updated:  Broadcom BCM5700 v7.3.5
+o   updated:  Broadcom Tigon3 (tg3) v3.9
+o   updated:  SysKonnect SK-98xx v7.07
+o   updated:  3ware 9xxx SATA-RAID support v2.24.00.011fw
+o   updated:  HP CISS Driver v2.4.52
+o   updated:  Compaq SMART2 Driver v2.4.28
+o   updated:  IBM ServeRAID v7.10.18 (New driver series)
+o   updated:  Openswan v1.0.7
+o   updated:  CIFS v1.20c
+o   updated:  grsecurity v2.0.1 as an replacement patch you have to apply
+                manually to use v2.0.1 instead of v1.9.15. Please use
+		gradm2 from ./gradm2 directory and make sure, /dev/grsec
+                has minor number 12 instead of 10.
+o   updated:  Bonding v2.6.0 + mpxor support + ifenslave v1.1.0
+o   updated:  802.1Q VLAN support v1.8
+o   updated:  Ethernet Link Aggregation (veth) v0.6.5
+o   updated:  Redundancy of Link Segment (lr) v0.8.5
+o   updated:  NTFS v2.1.6b
+o   updated:  AutoFS v4 2.4.20-20040508
+o   removed:  QIC-02 tape support (tpqic02): non-GPL. Mainline will follow!
+o   removed:  FTP file system support (use LUFS instead)
+o   removed:  enchanced SFQ: breaks normal SFQ, HTB and whatelse
+o   removed:  ikconfig support
+o   removed:  /proc/config.gz: merged better support, this was broken!
+o   changed:  net.ipv4.tcp_default_win_scale default to 7
+o   changed:  net.ipv4.tcp_vegas_cong_avoid default to 1
+o   changed:  net.ipv4.tcp_moderate_rcvbuf default to 1
+o   changed:  net.ipv4.tcp_rfc1337 default to 1
+o   changed:  net.ipv4.ipfrag_secret_interval default to 300
+o   changed:  net.ipv4.route.secret_interval default to 300
+
+
+
 Changelog from v4.14s -> v4.15s
 -------------------------------
 o   added:    grsecurity v2.0.1 as an replacement patch you have to apply
@@ -21,7 +104,7 @@ o   added:    Ethernet Link Aggregation 
                 Anyway, works in production with a SysKonnect SK-9844 SX
                 Dual NIC on 2 machines routing ~1000 connections per
                 second and this works damn well! :)
-o   added:    Redundancy of Link Segment (lt) v0.8.4
+o   added:    Redundancy of Link Segment (lr) v0.8.4
                 If you don't know what this is, you'll never need this!
 o   added:    TCP RFC2385 MD5 support
 o   added:    TCP Westwood support
@@ -68,6 +151,8 @@ o   added:    Introduce /proc/sys/kernel
 o   added:    BIC-TCP backport from 2.6
 o   added:    TCP Vegas backport from 2.6
 o   added:    3ware 9xxx SATA-RAID support v2.24.00.006fw
+o   added:    Quantum unlock support (TiVo) - Merged by Cory Visi
+o   added:    TiVo partition map support - Merged by Cory Visi
 
 o   added:    A holy cool VM tuning knob. It was intended by me as drop
                 behind but ended as something completely different.
@@ -159,7 +244,8 @@ o   fixed:    workaround rmap vs. PaX se
 o   fixed:    PaX: large file mapping bug introduced by vma mirroring
 o   fixed:    wrong dependences for grsecurity/PaX configure system
 o   fixed:    memory pools goes crazy sometimes. Backported 2.6 fixes
-o   updated:  Broadcom BCM5700 driver v7.1.22
+o   updated:  Bluetooth 2.4.20-mh17
+o   updated:  Broadcom BCM5700 v7.1.22
 o   updated:  AIC7xxx v6.3.9 / AIC79xx v2.0.12 (v2004-05-22)
 o   updated:  IBM ServeRAID v7.00.15 (New driver series)
 o   updated:  RAID code (up to 2.4.27-rc2)
@@ -173,10 +259,10 @@ o   updated:  CryptoAPI (up to 2.4.27-rc
 o   updated:  PPP Microsoft encryption/compression (MPPE/MPPC) v0.99
 o   updated:  libata (S-ATA support via SCSI layer)
                 same as 2.4.27-pre4 + ICH5/ICH6
-o   updated:  Intel e100 driver v2.3.40
-o   updated:  Intel e1000 driver v5.2.51
+o   updated:  Intel e100 v2.3.40
+o   updated:  Intel e1000 v5.2.51
 o   updated:  Broadcom Tigon3 (tg3) v3.6
-o   updated:  SysKonnect SK-98xx driver v6.24
+o   updated:  SysKonnect SK-98xx v6.24
 o   updated:  Realtek 8139cp v1.1
 o   updated:  SiS 900 v1.08.06
 o   updated:  Sundance v1.01+LK1.09a
@@ -402,8 +488,8 @@ o   fixed:    speedup 'make dep' again a
 o   fixed:    loop handling of sector size ioctl
 o   fixed:    asm constraint bug in arch/i386/kernel/pci-pc.c
 o   updated:  IBM ServeRAID v6.10.24
-o   updated:  Broadcom BCM4400 driver v2.0.5
-o   updated:  Broadcom BCM5700 driver v6.2.17
+o   updated:  Broadcom BCM4400 v2.0.5
+o   updated:  Broadcom BCM5700 v6.2.17
 o   updated:  SysKonnect SK-98xx driver v6.17
 o   updated:  iSCSI support (SCSI-over-Network) v3.4.0.3
 o   updated:  XFS v1.3.0 Final
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/2.4-WOLK-README linux-2.4.20-wolk4.16-fullkernel/2.4-WOLK-README
--- linux-2.4.20-wolk4.15-fullkernel/2.4-WOLK-README	2004-06-29 13:03:35.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/2.4-WOLK-README	2004-09-09 16:57:33.000000000 +0200
@@ -1,4 +1,4 @@
-Kernel - patched - WOLK v4.15s - Base: Linux kernel 2.4.20
+Kernel - patched - WOLK v4.16s - Base: Linux kernel 2.4.20
  located at http://sf.net/projects/wolk
  by Marc-Christian Petersen <m.c.p@wolk-project.de>
 --------------------------------------------------------------------------
@@ -40,10 +40,12 @@ https://sourceforge.net/mail/?group_id=4
 
 Some of the features:
 ---------------------
-O(1) Scheduler, RMAP VM, GRsecurity, Crypto, XFS, KDB, Preempt, Systrace,
-Super FreeS/WAN, Trustees, IPVS, i2c/lmsensors, TUX, EVMS, BadMEM, ftpfs,
+O(1) Scheduler, RMAP VM, Grsecurity, Crypto, XFS, KDB, Preempt, Systrace,
+Openswan, Trustees, IPVS, i2c/lmsensors, TuX, EVMS, BadMEM, ftpfs, lufs,
 HostAP, all known security fixes, all known filesystem fixes, and many more.
 
+Addon: Grsecurity v2.0.1
+
 
 Credits go to all the people who created the patches, working hard on
 improving the quality.
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/INFO linux-2.4.20-wolk4.16-fullkernel/3rdparty/INFO
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/INFO	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/INFO	2004-09-09 16:59:26.000000000 +0200
@@ -0,0 +1,4 @@
+avm-fritz-dsl: Sources used: ftp://ftp.avm.de/cardware/fritzcrd.dsl_v20/linux/suse.90/fcdsl2-suse9.0-03.11.04.tar.gz
+
+avm-fritz-pci: Sources used: ftp://ftp.avm.de/cardware/fritzcrd.pci/linux/suse.82/fcpci-suse8.2-03.11.02.tar.gz
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/make.card linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/make.card
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/make.card	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/make.card	2004-08-13 00:00:00.000000000 +0200
@@ -0,0 +1,2 @@
+CARD=fcdsl2
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/makefile linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/makefile
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/makefile	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/makefile	2004-08-13 00:00:00.000000000 +0200
@@ -0,0 +1,12 @@
+include make.card
+
+.PHONY: all clean install
+
+all:	drv
+
+clean:	; (cd src.drv; make clean CARD=$(CARD))
+
+install: ; (cd src.drv; make install CARD=$(CARD))
+
+drv: ;	(cd src.drv; make CARD=$(CARD))
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/ca.h linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/ca.h
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/ca.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/ca.h	2004-08-13 00:00:00.000000000 +0200
@@ -0,0 +1,120 @@
+/* 
+ * ca.h
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#ifndef __have_ca_h__
+#define __have_ca_h__
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void CA_INIT (unsigned Len, void (* Register) (void *adata, unsigned ApplId),
+                            void (* Release) (void * adata),
+                            void (* Down) (void));
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+char *CA_PARAMS (void);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int CA_GET_MESSAGE (unsigned char *Msg);
+void CA_PUT_MESSAGE (unsigned char *Msg);
+
+unsigned char *CA_NEW_DATA_B3_IND (unsigned ApplId, unsigned long NCCI, 
+                                                              unsigned Index);
+void CA_FREE_DATA_B3_REQ (unsigned ApplId, unsigned char *data);
+
+int CA_NEW_NCCI (unsigned ApplId, unsigned long NCCI, unsigned WindowSize, 
+                                                          unsigned BlockSize);
+void CA_FREE_NCCI (unsigned ApplId, unsigned long NCCI);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void *CA_MALLOC (unsigned);
+void CA_FREE (void *p);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#define MSEC_PER_SEC 1000l
+
+unsigned long CA_MSEC (void);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void CA_Delay (unsigned usec);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+unsigned CA_KARTE (void);
+unsigned CA_BLOCKSIZE (unsigned ApplId);
+unsigned CA_WINDOWSIZE (unsigned ApplId);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+typedef struct {
+
+    unsigned  Nr;
+    char     *Buffer;
+} __ApplsFirstNext, *_ApplsFirstNext;
+
+void *CA_APPLDATA (unsigned ApplId);
+_ApplsFirstNext CA_APPLDATA_FIRST (_ApplsFirstNext s);
+_ApplsFirstNext CA_APPLDATA_NEXT (_ApplsFirstNext s);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+typedef enum {
+
+    CA_TIMER_END			= 0,
+    CA_TIMER_RESTART			= 1,
+    CA_TIMER_RESTART_NOT_SET_TIME	= 2
+} CA_RESTARTTIMER;
+
+int CA_TIMER_NEW (unsigned nTimers);
+void CA_TIMER_DELETE (void);
+
+int CA_TIMER_START (unsigned          index,
+                    unsigned long     TimeoutValue,
+                    unsigned long     param,
+                    CA_RESTARTTIMER (*f)(unsigned long param));
+int CA_TIMER_STOP (unsigned index);
+
+void CA_TIMER_POLL (void);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void CA_PRINTF (char *s, ...);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#if !defined (NDEBUG)
+
+void CA_PUTS (char *);
+void CA_PUTI (int);
+void CA_PUTL (long);
+void CA_PUTC (char);
+void CA_PUTNL (void);
+
+#endif
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/capilli.h linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/capilli.h
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/capilli.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/capilli.h	2004-08-13 00:00:00.000000000 +0200
@@ -0,0 +1,132 @@
+/* 
+ * capilli.h
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+/*
+ * $Id: capilli.h,v 1.4 1999/07/23 08:51:05 calle Exp $
+ * 
+ * Kernel CAPI 2.0 Driver Interface for Linux
+ * 
+ * (c) Copyright 1999 by Carsten Paeth (calle@calle.in-berlin.de)
+ * 
+ */
+#ifndef __CAPILLI_H__
+#define __CAPILLI_H__
+
+typedef struct capiloaddatapart {
+	int user;		/* data in userspace ? */
+	int len;
+	unsigned char *data;
+} capiloaddatapart;
+
+typedef struct capiloaddata {
+	capiloaddatapart firmware;
+	capiloaddatapart configuration;
+} capiloaddata;
+
+typedef struct capicardparams {
+	unsigned int port;
+	unsigned irq;
+	int cardtype;
+	int cardnr;
+	unsigned int membase;
+} capicardparams;
+
+struct capi_driver;
+
+struct capi_ctr {
+        struct capi_ctr *next;			/* next ctr of same driver */
+        struct capi_driver *driver;
+	int cnr;				/* controller number */
+	char name[32];				/* name of controller */
+	volatile unsigned short cardstate;	/* controller state */
+	volatile int blocked;			/* output blocked */
+	int traceflag;				/* capi trace */
+
+	void *driverdata;			/* driver specific */
+
+	/* filled before calling ready callback */
+	__u8 manu[CAPI_MANUFACTURER_LEN];	/* CAPI_GET_MANUFACTURER */
+	capi_version version;			/* CAPI_GET_VERSION */
+	capi_profile profile;			/* CAPI_GET_PROFILE */
+	__u8 serial[CAPI_SERIAL_LEN];		/* CAPI_GET_SERIAL */
+
+	/* functions */
+        void (*ready)(struct capi_ctr * card);
+        void (*reseted)(struct capi_ctr * card);
+        void (*suspend_output)(struct capi_ctr * card);
+        void (*resume_output)(struct capi_ctr * card);
+        void (*handle_capimsg)(struct capi_ctr * card,
+			   	__u16 appl, struct sk_buff *skb);
+	void (*appl_registered)(struct capi_ctr * card, __u16 appl);
+	void (*appl_released)(struct capi_ctr * card, __u16 appl);
+
+        void (*new_ncci)(struct capi_ctr * card,
+			   	__u16 appl, __u32 ncci, __u32 winsize);
+        void (*free_ncci)(struct capi_ctr * card, __u16 appl, __u32 ncci);
+
+	/* management information for kcapi */
+
+	unsigned long nrecvctlpkt;
+	unsigned long nrecvdatapkt;
+	unsigned long nsentctlpkt;
+	unsigned long nsentdatapkt;
+
+	struct proc_dir_entry *procent;
+        char procfn[128];
+};
+
+struct capi_driver_interface {
+    struct capi_ctr *(*attach_ctr)(struct capi_driver *driver, char *name, void *data);
+    int (*detach_ctr)(struct capi_ctr *);
+};
+
+struct capi_driver {
+     char name[32];				/* driver name */
+     char revision[32];
+     int (*load_firmware)(struct capi_ctr *, capiloaddata *);
+     void (*reset_ctr)(struct capi_ctr *);
+     void (*remove_ctr)(struct capi_ctr *);
+     void (*register_appl)(struct capi_ctr *, __u16 appl,
+						capi_register_params *);
+     void (*release_appl)(struct capi_ctr *, __u16 appl);
+     void (*send_message)(struct capi_ctr *, struct sk_buff *skb);
+
+     char *(*procinfo)(struct capi_ctr *);
+     int (*ctr_read_proc)(char *page, char **start, off_t off,
+			       int count, int *eof, struct capi_ctr *card);
+     int (*driver_read_proc)(char *page, char **start, off_t off,
+		               int count, int *eof, struct capi_driver *driver);
+
+     int (*add_card)(struct capi_driver *driver, capicardparams *data);
+
+     /* intitialized by kcapi */
+     struct capi_ctr	*controller;		/* list of controllers */
+     struct capi_driver *next;
+     int ncontroller;
+     struct proc_dir_entry *procent;
+     char procfn[128];
+};
+
+struct capi_driver_interface *attach_capi_driver(struct capi_driver *driver);
+void detach_capi_driver(struct capi_driver *driver);
+
+#endif				/* __CAPILLI_H__ */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/common.h linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/common.h
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/common.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/common.h	2004-08-13 00:00:00.000000000 +0200
@@ -0,0 +1,128 @@
+/* 
+ * common.h
+ * Copyright (C) 2003, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#ifndef __have_common_h__
+#define __have_common_h__
+
+struct __card;
+struct __ndi;
+struct c6205_ctx;
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+typedef void * (* code_func_t) (void *, unsigned, unsigned *);
+
+typedef unsigned (* timer_func_t) (void);
+
+typedef void (* to_pc_ack_func_t) (unsigned char);
+
+typedef void (* wait_func_t) (unsigned);
+
+typedef unsigned (* xfer_func_t) (void *, unsigned);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+typedef struct __dst {
+
+	int			tx_flag;
+	unsigned		length;
+	void *			alloc_ptr;
+	unsigned		phys_addr;
+	unsigned		virt_addr;
+	void *			context;
+} dma_struct_t, * dma_struct_p;
+
+typedef dma_struct_p *		dma_list_t;
+
+typedef struct __ndi	num_dma_info_t, * num_dma_info_p;
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+typedef struct __ist {
+	
+	unsigned		length;
+	unsigned		phys_addr;
+	unsigned		virt_addr;
+
+	unsigned char	     (* inb)  (unsigned);
+	unsigned short	     (* inw)  (unsigned);
+	unsigned long	     (* inl)  (unsigned);
+	void		     (* outb) (unsigned char,  unsigned);
+	void		     (* outw) (unsigned short, unsigned);
+	void		     (* outl) (unsigned long,  unsigned);
+} ioaddr_t, * ioaddr_p;
+
+typedef struct __card		card_t, * card_p;
+typedef struct c6205_ctx *	c6205_context;
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+typedef struct __dreq {
+
+	unsigned	tx_block_num;
+	unsigned	tx_block_size;
+	unsigned	tx_max_trans_len;
+	unsigned	rx_block_num;
+	unsigned	rx_block_size;
+	unsigned	rx_max_trans_len;
+	code_func_t	get_code;
+	void *		context;
+	wait_func_t	stack_wait;
+} dif_require_t, * dif_require_p;
+
+typedef struct __ireq {
+
+	xfer_func_t	tx_func;
+} in_require_t, * in_require_p;
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+typedef void * hw_block_handle;
+
+typedef struct __buf_desc {					
+
+	hw_block_handle			handle;		/* const */
+	unsigned char *			buffer;		/* const */
+	unsigned long			length;		/* const */
+	void *				context;	/* const */
+} hw_buffer_descriptor_t, * hw_buffer_descriptor_p;
+
+typedef void (* hw_completion_func_t) (
+	const hw_buffer_descriptor_p	desc, 
+	unsigned			offset,
+	unsigned			length,
+	void *				context
+);
+
+typedef void (* hw_event_func_t) (
+	unsigned			event_mask,
+	const hw_buffer_descriptor_p	desc,
+	unsigned			offset,
+	unsigned			length,
+	void *				context
+);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+
+#endif
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/defs.h linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/defs.h
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/defs.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/defs.h	2004-09-05 18:25:37.000000000 +0200
@@ -0,0 +1,85 @@
+/* 
+ * defs.h
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#ifndef __have_defs_h__
+#define __have_defs_h__
+
+#ifndef LINUX_VERSION_CODE
+# include <linux/version.h>
+#endif
+
+#ifndef TRUE
+# define TRUE		(1==1)
+# define FALSE		(1==0)
+#endif
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#if defined (__fcdslsl__)
+# define PCI_DEVICE_ID_FCDSL2	0x2700
+# define PRODUCT_LOGO		"AVM FRITZ!Card DSL SL"
+# define INTERFACE		"pci"
+#elif defined (__fcdsl2__)
+# define PCI_DEVICE_ID_FCDSL2	0x2900
+# define PRODUCT_LOGO		"AVM FRITZ!Card DSL v2.0"
+# define INTERFACE		"pci"
+#else
+# error Card specifier missing!
+#endif
+#define DRIVER_LOGO		PRODUCT_LOGO " driver"
+#define SHORT_LOGO		TARGET "-" INTERFACE
+
+#define	REV_DEFAULT		"0.2"
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#if defined (OSDEBUG) && defined (NDEBUG)
+# undef NDEBUG
+#endif
+
+/*---------------------------------------------------------------------------*\
+ * LOG_MESSAGES - CAPI trace
+ * LOG_ALLOC - Log heap activity
+ * LOG_LINK - Log buffer transfers
+\*---------------------------------------------------------------------------*/
+
+#define LOG_ALLOC
+
+#define	UNUSED_ARG(x)	(x)=(x)
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 3, 13)
+# define GET_PCI_BASE(d, r)	(d)->base_address[r]
+#else
+# define GET_PCI_BASE(d, r)	(d)->resource[r].start
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 3, 43)
+# define KFREE_SKB(x)	dev_kfree_skb(x)
+#else
+# include <linux/netdevice.h>
+# define KFREE_SKB(x)	dev_kfree_skb_any(x)
+#endif
+
+#endif
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/devif.c linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/devif.c
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/devif.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/devif.c	2004-08-13 00:00:00.000000000 +0200
@@ -0,0 +1,1328 @@
+/* 
+ * devif.c
+ * Copyright (C) 2003, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#include <asm/io.h>
+#include <asm/atomic.h>
+#include <linux/sched.h>
+#include <linux/spinlock.h>
+#include "tools.h"
+#include "fw.h"	
+#include "driver.h"
+#include "devif.h"
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#define	DMA_BUFFER_NUM_MAX	8
+#define	DMA_INVALID_NUMBER	0
+#define	DMA_ALIGNMENT		8
+#define	DMA_ALIGN_MASK		(DMA_ALIGNMENT-1)
+#define	MAX_HEADER_RETRANSMIT	100
+#define	MAX_LENGTH		16 * 1024
+
+#define	INC(x)			(x)=(((x)==255)?1:(x)+1)
+
+#define	MY_INT(x)		(((x)&C6205_PCI_HSR_INTSRC)!=0)
+#define	PCI_INT_LINE_ON(x)	(((x)&C6205_PCI_HSR_INTAVAL)!=0)
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static atomic_t			is_stopped		= ATOMIC_INIT (FALSE);
+static atomic_t			xfer_flag		= ATOMIC_INIT (0);
+static atomic_t			window_ok		= ATOMIC_INIT (0);
+#if !defined (NDEBUG)
+static atomic_t			is_open			= ATOMIC_INIT (FALSE);
+static atomic_t			is_started		= ATOMIC_INIT (FALSE);
+static atomic_t			n_buffers		= ATOMIC_INIT (0);
+static unsigned			last_to_pc_ack;
+static unsigned			tx_handled_count	= 0;
+static unsigned			rx_handled_count	= 0;
+#endif
+
+static to_pc_ack_func_t		to_pc_ack_func		= NULL;
+static timer_func_t		get_timer_func		= NULL;
+static hw_completion_func_t	rx_callback		= NULL;
+static hw_completion_func_t	tx_callback		= NULL;
+static hw_event_func_t		event_callback		= NULL;
+static xfer_func_t		tx_function		= NULL;
+static dif_require_t		dif_req			= { 0, };
+static unsigned			buf_disc		= 0;
+static ptr_queue_p		tx_list			= NULL;
+static ptr_queue_p		rx_list			= NULL;
+static unsigned char		tx_num			= 1;
+static unsigned char		rx_num			= 1;
+static unsigned			rx_hdr_fail;
+static unsigned			rx_blk_fail;
+static unsigned			crrx_local;
+static unsigned			crrx_global;
+static unsigned			ro_num;
+static unsigned			ro_offset;
+static ioaddr_p			ro_pwin;
+static unsigned			ro_len;
+static unsigned			ro_next;
+static unsigned			ro_bufofs;
+static int			ro_flag			= FALSE;
+static card_p			card_link		= NULL;
+
+static int		     (* int_callback) (void *)	= NULL;
+static void *			int_context		= NULL;
+static void			xfer_task (unsigned long);
+
+static DECLARE_TASKLET(xfer_tasklet, xfer_task, 0);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+typedef struct __rbi {
+
+	hw_buffer_descriptor_p	pbd;
+	unsigned		ofs;
+	unsigned		len;
+	void *			ctx;
+} buf_info_t, * buf_info_p;
+
+/*****************************************************************************\
+ * D M A   B U F F E R   M A N A G E M E N T
+\*****************************************************************************/ 
+
+struct __ndi {
+
+	unsigned char		num;
+	unsigned char		cr;
+	unsigned short		len;
+	unsigned		timer;
+} __attribute__ ((packed));
+
+static dma_struct_p		dma_struct[2 * DMA_BUFFER_NUM_MAX];
+#if !defined (NDEBUG)
+static dma_struct_p		tx_last_buffer = NULL;
+static dma_struct_p		rx_last_buffer = NULL;
+#endif
+
+/*---------------------------------------------------------------------------*\
+\*-D-------------------------------------------------------------------------*/
+dma_struct_p * dma_get_struct_list (unsigned * pnum) {
+#if !defined (NDEBUG) && defined (LOG_LINK)
+	unsigned	n;
+
+	log ("List of %u DMA structures: %p\n", buf_disc, dma_struct);
+	for (n = 0; n < buf_disc; n++) {
+		assert (dma_struct[n] != NULL);
+		log (
+			"%02u) %cX vaddr/paddr = %08x/%08x\n", 
+			n, 
+			dma_struct[n]->tx_flag ? 'T' : 'R',
+			dma_struct[n]->virt_addr,
+			dma_struct[n]->phys_addr
+		);
+	}
+#endif
+	assert (pnum != NULL);
+	*pnum = buf_disc;
+	return dma_struct;
+} /* dma_get_struct_list */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+dma_struct_p dma_alloc (void) {
+	dma_struct_p	pdma = NULL;
+	
+	pdma = (dma_struct_p) hcalloc (sizeof (dma_struct_t));
+	info (pdma != NULL);
+	return pdma;
+} /* dma_alloc */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void dma_free (dma_struct_p * ppdma) {
+
+	assert (ppdma != NULL);
+	assert (*ppdma != NULL);
+	assert ((*ppdma)->virt_addr == 0);
+	hfree (*ppdma);
+	*ppdma = NULL;
+} /* dma_free */
+		
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static unsigned dma_min_buf_size (dma_struct_p pdma, int tx_flag) {
+	unsigned	bs;
+
+	if (pdma != NULL) {
+		tx_flag = pdma->tx_flag;
+	}
+	bs = sizeof (num_dma_info_t) + + sizeof (unsigned);
+	if (!tx_flag) {
+		bs += sizeof (unsigned);
+	}
+	return bs;
+} /* dma_min_buf_size */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static unsigned dma_eff_buf_size (dma_struct_p pdma) {
+
+	assert (pdma != NULL);
+	assert (pdma->length >= dma_min_buf_size (pdma, 0));
+	return pdma->length - dma_min_buf_size (pdma, 0);
+} /* dma_eff_buf_size */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static char * dma_eff_buf_virt (dma_struct_p pdma) {
+
+	assert (pdma != NULL);
+	return ((char *) pdma->virt_addr) + sizeof (num_dma_info_t);
+} /* dma_eff_buf_virt */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void dma_reset_buf (dma_struct_p pdma) {
+
+	assert (pdma != NULL);
+	memset ((void *) pdma->virt_addr, 0, pdma->length);
+	log ("DMA buffer %p reset\n", pdma->virt_addr);
+} /* dma_reset_buf */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void dma_invalidate (dma_struct_p pdma, int fall) {
+	num_dma_info_p	pndi = (num_dma_info_p) pdma->virt_addr;
+	unsigned short	len;
+	
+	assert (pdma != NULL);
+	assert (pndi != NULL);
+	len = (fall) ? pdma->length : pndi->len + dma_min_buf_size (pdma, 0);
+	assert (len <= pdma->length);
+	assert (len >= dma_min_buf_size (pdma, 0));
+	assert (DMA_INVALID_NUMBER == 0);
+	assert (len >= sizeof (num_dma_info_t));
+
+	memset (pndi, 0, len);
+} /* dma_invalidate */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int dma_setup (dma_struct_p pdma, unsigned long buf_size) {
+	void	* buf1;
+	void	* buf2;
+	
+	assert (buf_size > dma_min_buf_size (pdma, 0));
+	assert (buf_size > 0);
+	assert (pdma != NULL);
+	assert (pdma->virt_addr == 0);
+	if (NULL == (buf1 = kmalloc (buf_size + DMA_ALIGNMENT, GFP_ATOMIC))) {
+		pdma->virt_addr = 0;
+		return FALSE;
+	}
+	if ((((unsigned) buf1) & DMA_ALIGN_MASK) != 0) {
+		log ("Buffer is not %d-aligned (%p)\n", DMA_ALIGNMENT, buf1);
+		buf2 = (void *) ((((unsigned) buf1) + DMA_ALIGNMENT - 1) & ~DMA_ALIGN_MASK);
+	} else {
+		buf2 = buf1;
+	}
+	assert ((((unsigned) buf2) & DMA_ALIGN_MASK) == 0);
+	memset (buf2, 0, buf_size);
+	pdma->length	= (unsigned) buf_size;
+	pdma->alloc_ptr = buf1;
+	pdma->virt_addr = (unsigned) buf2;
+	pdma->phys_addr = virt_to_bus (buf2);
+	log (
+		"Allocated DMA buffer vaddr %08x, paddr %08x, length %u\n", 
+		pdma->virt_addr, 
+		pdma->phys_addr,
+		pdma->length
+	);
+	assert (pdma->length == buf_size);
+	return TRUE;
+} /* dma_setup */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int dma_init (dma_struct_p pdma, unsigned long buf_size) {
+	int	res;
+
+	if (TRUE == (res = dma_setup (pdma, buf_size))) {
+		dma_invalidate (pdma, TRUE);
+	}
+	return res;
+} /* dma_init */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static int dma_init_xx (dma_struct_p pdma, unsigned long buf_size, int tx_flag) {
+	int	res;
+	
+	if (TRUE == (res = dma_init (pdma, buf_size))) {
+		pdma->tx_flag = tx_flag;
+		log ("... is a %s DMA buffer\n", pdma->tx_flag ? "TX" : "RX");
+	}
+	return res;
+} /* dma_init_xx */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void dma_free_buffer (dma_struct_p pdma) {
+	
+	assert (pdma != NULL);
+	info (pdma->virt_addr != 0);
+	if (pdma->virt_addr != 0) {
+		kfree (pdma->alloc_ptr);
+		pdma->virt_addr = 
+		pdma->phys_addr = 0;
+	}
+} /* dma_free_buffer */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void dma_exit (dma_struct_p pdma) {
+	
+	assert (pdma != NULL);
+	info (pdma->virt_addr != 0);
+	if (pdma->virt_addr != 0) {
+		log (
+			"Freeing %s DMA buffer vaddr %08x\n",
+			pdma->tx_flag ? "TX" : "RX",
+			pdma->virt_addr 
+		);
+		dma_invalidate (pdma, TRUE);
+		dma_free_buffer (pdma);
+	}
+} /* dma_exit */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static unsigned char * ndi_number_back_ptr (dma_struct_p pdma, unsigned len) {
+	num_dma_info_p	pndi = (num_dma_info_p) pdma->virt_addr;
+	unsigned	ofs;
+	
+	assert (pdma != NULL);
+	assert (pndi != NULL);
+	ofs = len + sizeof (num_dma_info_t);
+	assert ((ofs + sizeof (unsigned char)) < pdma->length);
+	return ((unsigned char *) pndi) + ofs; 
+} /* ndi_number_back_ptr */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static int ndi_length_valid (dma_struct_p pdma, unsigned short len, unsigned short maxlen) {
+	num_dma_info_p	pndi = (num_dma_info_p) pdma->virt_addr;
+
+	assert (pdma != NULL);
+	assert (pndi != NULL);
+	if (((pndi->len) & 3) != 0) {
+		info (0);
+		return FALSE;
+	}
+	if (len > maxlen) {
+		info (0);
+		return FALSE;
+	}
+	return TRUE;
+} /* ndi_length_valid */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#if !defined (NDEBUG)
+static int ndi_header_valid (dma_struct_p pdma, unsigned short maxlen) {
+	num_dma_info_p	pndi = (num_dma_info_p) pdma->virt_addr;
+
+	assert (pdma != NULL);
+	assert (pndi != NULL);
+	if (pndi->num == DMA_INVALID_NUMBER) {
+		info (0);
+		return FALSE;
+	}
+	return ndi_length_valid (pdma, pndi->len, maxlen);
+} /* ndi_header_valid */
+#endif
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#if !defined (NDEBUG)
+static int ndi_buffer_valid (dma_struct_p pdma) {
+	num_dma_info_p	pndi = (num_dma_info_p) pdma->virt_addr;
+	
+	assert (pdma != NULL);
+	assert (pndi != NULL);
+	if (!ndi_header_valid (pdma, dma_eff_buf_size (pdma))) {
+		return FALSE;
+	}
+	if (!pdma->tx_flag) {
+		unsigned char * uc = ndi_number_back_ptr (pdma, pndi->len);
+
+		if (pndi->num != *uc) {
+			return FALSE;
+		}
+	}
+	return TRUE;
+} /* ndi_buffer_valid */
+#endif
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void dma_validate_cs (dma_struct_p pdma, unsigned char num, unsigned cs) {
+	num_dma_info_p	pndi = (num_dma_info_p) pdma->virt_addr;
+	unsigned 	bnum;
+	
+	assert (pdma != NULL);
+	assert (pndi != NULL);
+	bnum = 3 + (unsigned) ndi_number_back_ptr (pdma, pndi->len);
+	bnum &= ~3;
+#if !defined (NDEBUG)
+	assert ((bnum + sizeof (unsigned)) <= (pdma->virt_addr + pdma->length));
+	if ((bnum + sizeof (unsigned)) > (pdma->virt_addr + pdma->length)) {
+		log ("Back num %x, buffer (virtual) %p\n", bnum, pdma->virt_addr);
+	}
+#endif
+	*((unsigned *) bnum) = cs;
+	assert (num != DMA_INVALID_NUMBER);
+	pndi->num = num;
+	assert (ndi_buffer_valid (pdma));
+} /* dma_validate_cs */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void dma_validate (dma_struct_p pdma, unsigned char cr, unsigned short len, unsigned timer) {
+	num_dma_info_p	pndi = (num_dma_info_p) pdma->virt_addr;
+	
+	assert (pdma != NULL);
+	assert (pndi != NULL);
+	assert (len <= dma_eff_buf_size (pdma));
+	assert ((len + dma_min_buf_size (pdma, pdma->tx_flag)) <= pdma->length);
+	
+	pndi->cr	= cr;
+	pndi->len	= len;
+	pndi->timer	= timer;
+} /* dma_validate */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static unsigned char ndi_get_cr (dma_struct_p pdma) {
+	num_dma_info_p	pndi = (num_dma_info_p) pdma->virt_addr;
+
+	assert (pdma != NULL);
+	assert (pndi != NULL);
+	return pndi->cr;
+} /* ndi_get_cr */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static unsigned short ndi_get_length (dma_struct_p pdma) {
+	num_dma_info_p	pndi = (num_dma_info_p) pdma->virt_addr;
+
+	assert (pdma != NULL);
+	assert (pndi != NULL);
+	return pndi->len;
+} /* ndi_get_length */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void ndi_set_number (dma_struct_p pdma, unsigned char x) {
+	num_dma_info_p	pndi = (num_dma_info_p) pdma->virt_addr;
+
+	assert (pdma != NULL);
+	assert (pndi != NULL);
+	pndi->num = x;
+} /* ndi_set_number */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static unsigned char ndi_get_number (dma_struct_p pdma) {
+	num_dma_info_p	pndi = (num_dma_info_p) pdma->virt_addr;
+
+	assert (pdma != NULL);
+	assert (pndi != NULL);
+	return pndi->num;
+} /* ndi_get_number */
+
+/*****************************************************************************\
+ * H E L P E R   F U N C T I O N S
+\*****************************************************************************/ 
+
+static unsigned check_sum (unsigned char num, unsigned wcnt, unsigned * addr) {
+	unsigned	sum = 0x55aa55aa;
+	
+	assert (ro_flag);
+	assert (addr != NULL);
+	assert (wcnt > 0);
+#if defined (LOG_CHECKSUM)
+	log ("[start] sum = 0x%x\n", sum);
+#endif
+	sum ^= (unsigned) num;
+#if defined (LOG_CHECKSUM)
+	log ("[number] sum = 0x%x, num = 0x%x\n", sum, num);
+#endif
+	do {
+		sum ^= *addr;
+#if defined (LOG_CHECKSUM)
+		log ("[%u] sum = 0x%x, num = 0x%x\n", wcnt, sum, *addr);
+#endif
+		++addr;
+	} while (--wcnt);
+	return sum;
+} /* check_sum */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void trigger_interrupt (card_p cp) {
+
+	assert (cp != NULL);
+	assert (cp->mmio_base != 0);
+	POUTL (cp->mmio_base + C6205_PCI_HDCR_OFFSET, C6205_PCI_HDCR_DSPINT);
+} /* trigger_interrupt */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#if !defined (NDEBUG) && defined (LOG_LINK)
+static void dump_buffers (int tx_flag) {
+	unsigned	n, ofs;
+	unsigned	offset, val0, val1;
+	
+	ofs = tx_flag ? 0 : DMA_BUFFER_NUM_MAX;
+	log ("Dump buffers in %cX direction...\n", tx_flag ? 'T' : 'R');
+	for (n = ofs; n < (ofs + DMA_BUFFER_NUM_MAX); n++) {
+		if (dma_struct[n] != NULL) {
+			memdump (
+				(void *) dma_struct[n]->virt_addr, 
+				32, 
+				dma_struct[n]->virt_addr,
+				tx_flag ? "TX buffer" : "RX buffer"
+			);
+		}
+		if (!tx_flag && (ro_pwin != NULL)) {
+			offset = ro_offset + (n - 8) * ro_len + ro_bufofs;
+			val0 = ro_pwin->inl (ro_pwin->virt_addr + offset);
+			val1 = ro_pwin->inl (ro_pwin->virt_addr + offset + 4);
+			log ("RX%u prefix: %08X %08X\n", n, val0, val1);
+		}
+	}
+	log ("End of dump\n");
+} /* dump_buffers */
+#endif
+
+/*****************************************************************************\
+ * T R A N S F E R   M A N A G E M E N T
+\*****************************************************************************/ 
+
+static int receive_buf (card_p cp, dma_struct_p pdma) {
+	unsigned	count = 0;
+	unsigned	offset, chksum;
+	unsigned	wc, wcnt, tmp1;
+	unsigned *	mem;
+	unsigned *	tmp2;
+	int		res;
+	
+	assert (cp != NULL);
+	assert (pdma != NULL);
+	assert (ro_pwin != NULL);
+	offset = ro_offset + ro_next * ro_len + ro_bufofs;
+	mem = (unsigned *) pdma->virt_addr;
+	assert (mem != NULL);
+	do {
+		count++;
+		*mem	   = ro_pwin->inl (ro_pwin->virt_addr + offset);
+		*(mem + 1) = ro_pwin->inl (ro_pwin->virt_addr + offset + sizeof (unsigned));
+	} while ((*mem != ~*(mem + 1)) && (count < MAX_HEADER_RETRANSMIT));
+	if (count > 2) {
+		rx_hdr_fail += count - 2;
+	}
+	if (count > MAX_HEADER_RETRANSMIT) {
+		log ("Too many header re-transmits (%u)...\n", count);
+		return FALSE;
+	}
+	if (ndi_get_number (pdma) != rx_num) {
+#if !defined (NDEBUG) && defined (LOG_LINK)
+		log (
+			"Unexpected number, want:%u, have:%u...\n",
+			rx_num,
+			ndi_get_number (pdma)
+		);
+#endif
+		return FALSE;
+	}
+	res = ndi_length_valid (pdma, ndi_get_number (pdma), dma_eff_buf_size (pdma));
+	if (!res) {
+#if !defined (NDEBUG) && defined (LOG_LINK)
+		log ("Invalid length (%d)...\n", ndi_get_length (pdma));
+#endif
+		return FALSE;
+	}
+	assert (0 == (sizeof (num_dma_info_t) % 4));
+	count = 0;
+	offset += sizeof (num_dma_info_t);
+
+	/* wcnt: datalen + num + checksum */
+	wcnt = (ndi_get_length (pdma) + 4 + 4) >> 2;
+	tmp1 = sizeof (num_dma_info_t) >> 2;
+	tmp2 = mem + tmp1;
+	do {
+		count++;
+		for (wc = 0; wc < wcnt; wc++) {
+			*(tmp2 + wc) = ro_pwin->inl (ro_pwin->virt_addr + offset + 4 * wc);
+		}
+		chksum = check_sum (0, wcnt + tmp1, mem);
+	} while ((chksum != 0) && (count < MAX_HEADER_RETRANSMIT));
+	if (count > 1) {
+		rx_blk_fail += count - 1;
+	}
+	if (count > MAX_HEADER_RETRANSMIT) {
+		log ("Too many block re-transmits (%u)...\n", count);
+		return FALSE;
+	}
+	assert (ndi_buffer_valid (pdma));
+	return TRUE;
+} /* receive_buf */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void receive_done (void) {
+
+	if (++ro_next == dif_req.rx_block_num) {
+		ro_next = 0;
+	}
+} /* receive_done */
+
+/*---------------------------------------------------------------------------*\
+\*-I-------------------------------------------------------------------------*/
+static unsigned int_complete_buf (int tx_flag) {
+	ptr_queue_p 		pq;
+	hw_completion_func_t	pcf;
+	dma_struct_p		pdma;
+	buf_info_p		pinfo;
+	buf_info_t		info;
+	void *			phlp;
+	int			res;
+
+	if (tx_flag) {
+		pq  = tx_list;
+		pcf = tx_callback;
+	} else {
+		pq  = rx_list;
+		pcf = rx_callback;
+	}
+	phlp = NULL;
+	res = q_dequeue (pq, &phlp);
+	assert (res == TRUE);
+	pinfo = (buf_info_p) phlp;
+	assert (pinfo != NULL);
+	info = *pinfo;
+	
+	assert (info.pbd != NULL);
+	assert (info.ofs == 0);
+	pdma = (dma_struct_p) info.pbd->context;
+
+	assert (pdma != NULL);
+	assert (info.len <= dma_eff_buf_size (pdma));
+	assert (ndi_get_length (pdma) <= dma_eff_buf_size (pdma));
+
+	assert (!in_critical ());
+	enter_critical ();
+	assert (ndi_buffer_valid (pdma));
+	assert (pcf != NULL);
+	(* pcf) (info.pbd, info.ofs, ndi_get_length (pdma), info.ctx);
+	leave_critical ();
+	assert (!in_critical ());
+
+	return 1;
+} /* int_complete_buf */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static unsigned int int_work_buffers (void) {
+	unsigned	tx_handled	= 0;
+	unsigned	rx_handled	= 0;
+	void *		phlp		= NULL;
+	buf_info_p	pinfo;
+	unsigned	cr;
+	dma_struct_p	pdma;
+	
+	while (q_peek (rx_list, &phlp)) {
+		pinfo = (buf_info_p) phlp;
+		assert (pinfo != NULL);
+		assert (pinfo->pbd != NULL);
+		pdma = (dma_struct_p) pinfo->pbd->context;
+		assert (pdma != NULL);
+		assert (card_link != NULL);
+		if (!atomic_read (&window_ok)) {
+			log ("I/O window not ready!\n");
+			break;
+		} 
+		if (!receive_buf (card_link, pdma)) {
+			break;
+		}
+#if !defined (NDEBUG) && defined (LOG_LINK)
+		log ("Received buf #%u\n", ndi_get_number (pdma));
+#endif
+		assert (ndi_get_number (pdma) == rx_num);
+		INC(rx_num);
+		receive_done ();
+
+		cr = ndi_get_cr (pdma);
+		rx_handled += int_complete_buf (FALSE);
+		while (cr-- > 0) {
+			tx_handled += int_complete_buf (TRUE);
+		}
+		phlp = NULL;
+	}
+#if !defined (NDEBUG)
+	assert ((tx_handled == 0) || (rx_handled > 0));
+	tx_handled_count += tx_handled;
+	rx_handled_count += rx_handled;
+#endif
+	return (tx_handled + rx_handled);
+} /* int_work_buffers */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void set_interrupt_callback (int (* cbf) (void *), void * ctx) {
+
+	assert (int_callback == NULL);
+	assert (int_context  == NULL);
+	int_callback = cbf;
+	int_context  = ctx;
+} /* set_interrupt_callback */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void clear_interrupt_callback (void) {
+
+	info (int_callback != NULL);
+	info (int_context  != NULL);
+	int_callback = NULL;
+	int_context  = NULL;
+} /* clear_interrupt_callback */
+
+/*---------------------------------------------------------------------------*\
+\*-T-------------------------------------------------------------------------*/
+void xfer_handler (card_p cp) {
+	unsigned int	traffic_cnt = 0;
+	
+	UNUSED_ARG(cp);
+	atomic_set (&xfer_flag, 0);
+	traffic_cnt += int_work_buffers ();
+	if (traffic_cnt > 0) {
+		info (int_callback != NULL);
+		if (int_callback != NULL) {
+#if !defined (NDEBUG)
+			int res =
+#endif
+			(*int_callback) (int_context);
+			assert (res == TRUE);
+		}
+	}
+} /* xfer_handler */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void xfer_task (unsigned long data) {
+
+	UNUSED_ARG (data);
+	if (in_critical ()) {
+		atomic_set (&xfer_flag, 1);
+	} else if (spin_trylock (&stack_lock)) {
+		xfer_handler (capi_card);
+		spin_unlock (&stack_lock);
+	} else {
+		atomic_set (&xfer_flag, 1);
+	}
+} /* xfer_task */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+irqreturn_t device_interrupt (int irq, void * args, struct pt_regs * regs) {
+	unsigned long	intpins;
+	card_p		cp	= (card_p) args;
+
+	UNUSED_ARG (irq);
+	UNUSED_ARG (regs);
+	assert (capi_card == cp);
+
+	intpins = PINL (cp->mmio_base + C6205_PCI_HSR_OFFSET);
+	if (!MY_INT (intpins)) {
+		return IRQ_NONE;
+	}
+	do {
+		POUTL (
+			cp->mmio_base + C6205_PCI_HSR_OFFSET, 
+			C6205_PCI_HSR_INTSRC
+		);
+		tasklet_schedule (&xfer_tasklet);
+		intpins = PINL (cp->mmio_base + C6205_PCI_HSR_OFFSET);
+	} while (MY_INT (intpins));
+	return IRQ_HANDLED;
+} /* device_interrupt */
+
+/*****************************************************************************\
+ * D E V I C E   I N T E R F A C E
+\*****************************************************************************/ 
+
+void dif_xfer_requirements (dif_require_p rp, unsigned ofs) {
+
+	assert (rp != NULL);
+	assert (rp->tx_block_num > 0);
+	assert (rp->tx_block_size > 0);
+	assert (rp->tx_max_trans_len == 0);
+	assert (rp->rx_block_num > 0);
+	assert (rp->rx_block_size > 0);
+	assert (rp->rx_max_trans_len == 0);
+	assert (rp->tx_block_num <= DMA_BUFFER_NUM_MAX);
+	assert (rp->rx_block_num <= DMA_BUFFER_NUM_MAX);
+
+	dif_req = *rp;
+	assert (dif_req.tx_block_size >= dma_min_buf_size (NULL, TRUE));
+	dif_req.tx_max_trans_len = dif_req.tx_block_size - dma_min_buf_size (NULL, TRUE);
+	assert (dif_req.rx_block_size >= (dma_min_buf_size (NULL, FALSE) + ofs));
+	dif_req.rx_max_trans_len = dif_req.rx_block_size - dma_min_buf_size (NULL, FALSE) - ofs;
+	dif_req.tx_block_size += 4 * sizeof (unsigned char);
+	
+#if !defined (NDEBUG) && defined (LOG_LINK)
+	log (
+		"Requirements: TX %u/%u/%u, RX %u/%u/%u, Func/Ctx %p/%p\n",
+		dif_req.tx_block_num,
+		dif_req.tx_block_size,
+		dif_req.tx_max_trans_len,
+		dif_req.rx_block_num,
+		dif_req.rx_block_size,
+		dif_req.rx_max_trans_len,
+		dif_req.get_code,
+		dif_req.context
+	);
+#endif
+} /* dif_xfer_requirements */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void dif_reset (void) {
+
+	log ("Resetting device structures...\n");
+	
+	atomic_set (&window_ok, 0);
+	ro_num		= 0;
+	ro_offset	= 0;
+	ro_pwin		= NULL;
+	ro_len		= 0;
+	ro_next		= 0;
+	ro_bufofs	= 0;
+	rx_hdr_fail	= 0;
+	rx_blk_fail	= 0;
+
+	lock ();
+	q_reset (tx_list);
+	q_reset (rx_list);
+	crrx_local = 0;
+	crrx_global = 0;
+	tx_num = 1;
+	rx_num = 1;
+#if !defined (NDEBUG)
+	tx_last_buffer = 0;
+	rx_last_buffer = 0;
+	tx_handled_count = 0;
+	rx_handled_count = 0;
+#endif
+	atomic_set (&is_stopped, FALSE);
+	unlock ();
+	log ("Reset done.\n");
+} /* dif_reset */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void dif_set_params (
+	unsigned	num,
+	unsigned	offset,
+	ioaddr_p	pwin,
+	unsigned	len,
+	unsigned	bufofs
+) {
+#if !defined (NDEBUG) && defined (LOG_LINK)
+	unsigned	n, ofs;
+#endif
+
+	assert (num > 0);
+	assert ((offset % 4) == 0);
+	assert (len > 0);
+	assert ((len % 4) == 0);
+	assert (pwin != NULL);
+
+	ro_num = num;
+	ro_offset = offset;
+	ro_pwin = pwin;
+	ro_len = len;
+	ro_bufofs = bufofs;
+	atomic_set (&window_ok, 1);
+	log ("I/O window has been set!\n");
+
+#if !defined (NDEBUG) && defined (LOG_LINK)
+	log ("dif_set_params:\n");
+	for (n = 0; n < ro_num; n++) {
+		ofs = ro_offset + n * ro_len + ro_bufofs;
+		log ("buffer(%u), vaddr 0x%08x\n", n, pwin->virt_addr + ofs);
+	}
+#endif
+} /* dif_set_params */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int dif_init (card_p cp, int ro, timer_func_t timerf, to_pc_ack_func_t ackf) {
+
+	info (get_timer_func == NULL);
+	info (to_pc_ack_func == NULL);
+	log ("Initializing device structures...\n");
+	buf_disc	= 0;
+	ro_num		= 0;
+	ro_offset	= 0;
+	ro_pwin		= NULL;
+	ro_len		= 0;
+	ro_next		= 0;
+	ro_bufofs	= 0;
+	rx_hdr_fail	= 0;
+	rx_blk_fail	= 0;
+	tx_num		= 1;
+	rx_num		= 1;
+	card_link	= cp;
+	crrx_local	= 0;
+	crrx_global	= 0;
+	get_timer_func	= timerf ? timerf : &get_timer;
+	to_pc_ack_func	= ackf   ? ackf   : &pc_acknowledge;
+	info (ro == TRUE);
+	ro_flag = ro;
+	if (NULL == (tx_list = q_make (DMA_BUFFER_NUM_MAX))) {
+		log ("Could not allocate TX queue\n");
+		return FALSE;
+	}
+	if (NULL == (rx_list = q_make (DMA_BUFFER_NUM_MAX))) {
+		log ("Could not allocate RX queue\n");
+		q_remove (&tx_list);
+		return FALSE;
+	}
+	q_attach_mem (tx_list, DMA_BUFFER_NUM_MAX, sizeof (buf_info_t));
+	q_attach_mem (rx_list, DMA_BUFFER_NUM_MAX, sizeof (buf_info_t));
+	memset (&dma_struct, 0, 2 * DMA_BUFFER_NUM_MAX * sizeof (dma_struct_p));
+	memset (&dif_req, 0, sizeof (dif_require_t));
+	return ro_flag;
+} /* dif_init */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void dif_exit (void) {
+
+	dif_reset ();
+	log ("Deinitializing device...\n");
+	info (get_timer_func != NULL);
+	get_timer_func = NULL;
+	info (to_pc_ack_func != NULL);
+	to_pc_ack_func = NULL;
+	if (tx_list != NULL) {
+		q_remove (&tx_list);
+	}
+	if (rx_list != NULL) {
+		q_remove (&rx_list);
+	}
+} /* dif_exit */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int dif_start (void) {
+
+	return TRUE;
+} /* dif_start */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void dif_stop (int tx_flag) {
+	void *		phlp = NULL;
+	buf_info_p	pi;
+	ptr_queue_p	pq;
+	dma_struct_p	pdma;
+	unsigned	n;
+	
+	pq = tx_flag ? tx_list : rx_list;
+	assert (pq != NULL);
+	while (q_dequeue (pq, &phlp)) {
+		pi = (buf_info_p) phlp;
+		assert (pi != NULL);
+		assert (pi->pbd != NULL);
+		pdma = (dma_struct_p) pi->pbd->context;
+		assert (pdma != NULL);
+
+		dma_invalidate (pdma, TRUE);
+		assert (event_callback != NULL);
+		lock ();
+		(* event_callback) (
+			DMA_REQUEST_CANCELLED, 
+			pi->pbd, 
+			pi->ofs, 
+			pi->len, 
+			pi->ctx
+		);
+		unlock ();
+		
+		phlp = NULL;
+	}
+	for (n = 0; n < (2 * DMA_BUFFER_NUM_MAX); n++) {
+		info (dma_struct[n] != NULL);
+		if (dma_struct[n] != NULL) {
+			dma_reset_buf (dma_struct[n]);
+		}
+	}
+} /* dif_stop */
+
+/*****************************************************************************\
+ * H A R D W A R E   I N T E R F A C E
+\*****************************************************************************/ 
+
+unsigned OSHWBlockOpen (unsigned index, hw_block_handle * handle) {
+
+	UNUSED_ARG (index);
+	assert (handle != NULL);
+	info (*handle == NULL);
+	*handle = (hw_block_handle) card_link;
+	assert (!atomic_xchg (&is_open, 1));
+	return TRUE;
+} /* OSHWBlockOpen */
+
+/*---------------------------------------------------------------------------*\
+\*-O-------------------------------------------------------------------------*/
+void OSHWBlockClose (hw_block_handle handle) {
+
+	assert (handle == (hw_block_handle) card_link);
+	assert (atomic_read (&n_buffers) == 0);
+	assert (atomic_read (&is_open));
+	assert (!atomic_read (&is_started));
+	assert (atomic_xchg (&is_open, 0));
+} /* OSHWBlockClose */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern unsigned OSHWStart (
+	hw_block_handle		handle,
+	hw_completion_func_t	rx_completer,
+	hw_completion_func_t	tx_completer,
+	hw_event_func_t		event_handler
+) {
+	assert (handle == (hw_block_handle) card_link);
+	assert (atomic_read (&is_open));
+	assert (!atomic_read (&is_started));
+	assert (rx_callback == NULL);
+	assert (tx_callback == NULL);
+	assert (event_callback == NULL);
+
+	rx_callback	= rx_completer;
+	tx_callback	= tx_completer;
+	event_callback	= event_handler;
+	assert (!atomic_xchg (&is_started, 1));
+
+	return dif_start ();
+} /* OSHWStart */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void OSHWStop (hw_block_handle handle) {
+
+	assert (handle == (hw_block_handle) card_link);
+	assert (atomic_read (&is_open));
+	assert (atomic_read (&is_started));
+
+	dif_stop (TRUE);
+	dif_stop (FALSE);
+	atomic_set (&is_stopped, TRUE);
+
+	rx_callback	= NULL;
+	tx_callback	= NULL;
+	event_callback	= NULL;
+	assert (atomic_xchg (&is_started, 0));
+} /* OSHWStop */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+hw_buffer_descriptor_p OSHWAllocBuffer (hw_block_handle handle, unsigned length) {
+	hw_buffer_descriptor_p	pbd;
+	dma_struct_p		pstr;
+#if !defined (NDEBUG)
+	unsigned		start, stop, n;
+#endif
+	
+	log ("Allocating DMA buffer of %u bytes\n", length);
+	assert (handle == (hw_block_handle) card_link);
+	assert (atomic_read (&is_open));
+	assert (length < OSHWGetMaxBlockSize (handle));
+	assert (dif_req.tx_block_num > 0);
+	assert (dif_req.rx_block_num > 0);
+	assert ((length == dif_req.tx_block_size) || (length == dif_req.rx_block_size));
+
+	if (NULL == (pbd = (hw_buffer_descriptor_p) hmalloc (sizeof (hw_buffer_descriptor_t)))) {
+		return NULL;
+	}
+	
+	if (NULL == (pstr = dma_alloc ())) {
+		hfree (pbd);
+		return NULL;
+	}
+	if (!dma_init_xx (pstr, length, (buf_disc < dif_req.tx_block_num))) {
+		hfree (pbd);
+		dma_exit (pstr);
+		dma_free (&pstr);
+		return NULL;
+	}
+	pbd->handle	= handle;
+	pbd->buffer	= dma_eff_buf_virt (pstr);
+	pbd->length	= length;
+	pbd->context	= pstr;
+
+	assert (buf_disc < 2 * DMA_BUFFER_NUM_MAX);
+	assert (dma_struct[buf_disc] == NULL);
+	dma_struct[buf_disc++] = pstr;
+
+#if !defined (NDEBUG)
+	atomic_inc (&n_buffers);
+	start = stop = 0;
+	if (buf_disc == dif_req.tx_block_num) {
+		stop  = buf_disc;
+	} else if (buf_disc == (dif_req.tx_block_num + dif_req.rx_block_num)) {
+		start = dif_req.tx_block_num;
+		stop  = buf_disc;
+	}
+	if (start != stop) {
+		assert (stop > 1);
+		for (n = start; n < (stop - 1); n++) {
+			assert (dma_struct[n] != NULL);
+			assert (dma_struct[n + 1] != NULL);
+			dma_struct[n]->context = dma_struct[n + 1];
+			log (
+				"DMA context of structure #%u(%p) set to %p\n", 
+				n, dma_struct[n], dma_struct[n + 1]
+			);
+		}
+		dma_struct[n]->context = dma_struct[start];
+		log (
+			"DMA context of structure #%u(%p) set to %p\n", 
+			n, dma_struct[n], dma_struct[start]
+		);
+	}
+#endif
+	
+	return pbd;
+} /* OSHWAllocBuffer */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern void OSHWFreeBuffer (hw_buffer_descriptor_p desc) {
+	dma_struct_p	pstr;
+
+	if (desc == NULL) {
+		log ("Attempt to free NULL descriptor!\n");
+		return;
+	}
+	pstr = (dma_struct_p) desc->context;
+	assert (pstr != NULL);
+	desc->buffer = (unsigned char *) pstr->virt_addr;
+	
+	assert (atomic_read (&is_open));
+	assert (atomic_read (&n_buffers) > 0);
+	dma_exit (pstr);
+	hfree (pstr);
+	hfree (desc);
+
+	assert (buf_disc > 0);
+	assert (buf_disc <= 2 * DMA_BUFFER_NUM_MAX);
+	buf_disc--;
+	assert (dma_struct[buf_disc] != NULL);
+	dma_struct[buf_disc] = NULL;
+#if !defined (NDEBUG)
+	atomic_dec (&n_buffers);
+#endif
+} /* OSHWFreeBuffer */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+unsigned OSHWGetMaxBlockSize (hw_block_handle handle) {
+
+	assert (handle == (hw_block_handle) card_link);
+	return 4 * 1024;
+} /* OSHWGetMaxBlockSize */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+unsigned OSHWGetMaxConcurrentRxBlocks (hw_block_handle handle) {
+
+	assert (handle == (hw_block_handle) card_link);
+	return dif_req.rx_block_num;
+} /* OSHWGetMaxConcurrentRxBlocks */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+unsigned OSHWGetMaxConcurrentTxBlocks (hw_block_handle handle) {
+
+	assert (handle == (hw_block_handle) card_link);
+	return dif_req.tx_block_num;
+} /* OSHWGetMaxConcurrentRxBlocks */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void * OSHWExchangeDeviceRequirements (hw_block_handle handle, void * pin) {
+	in_require_p	pr = (in_require_p) pin;
+	
+	assert (handle == (hw_block_handle) card_link);
+	info (pr != NULL);
+	if (pr != NULL) {
+		tx_function = pr->tx_func;
+		assert (tx_function != NULL);
+	}
+	assert (dif_req.tx_block_num > 0);
+	assert (dif_req.tx_block_size > 0);
+	assert (dif_req.tx_max_trans_len > 0);
+	assert (dif_req.rx_block_num > 0);
+	assert (dif_req.rx_block_size > 0);
+	assert (dif_req.rx_max_trans_len > 0);
+	log ("Returning requirements, TX %u/%u/%u, RX %u/%u/%u\n", 
+		dif_req.tx_block_num,
+		dif_req.tx_block_size,
+		dif_req.tx_max_trans_len,
+		dif_req.rx_block_num,
+		dif_req.rx_block_size,
+		dif_req.rx_max_trans_len
+	);
+	return (void *) &dif_req;
+} /* OSHWExchangeRequirements */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+unsigned OSHWTxBuffer (
+	const hw_buffer_descriptor_p	desc,
+	unsigned			offset,
+	unsigned			length,
+	void *				context
+) {
+	buf_info_t			info	= { desc, offset, length, context } ;
+	dma_struct_p			pdma;
+	unsigned			chksum, timer = 0;
+	int				res;
+	
+	assert (!atomic_read (&is_stopped));
+	assert (atomic_read (&is_open));
+	assert (info.pbd != NULL);
+	pdma = (dma_struct_p) info.pbd->context;
+	assert (pdma != NULL);
+	assert (info.ofs == 0);
+	assert (info.len <= dif_req.tx_max_trans_len);
+	assert (info.len <= dma_eff_buf_size (pdma));
+	assert (info.len <= MAX_LENGTH);
+	
+	assert (q_get_count (tx_list) < dif_req.tx_block_num);
+
+#if !defined (NDEBUG)
+	assert (get_timer_func != NULL);
+	timer = (*get_timer_func) ();
+#endif
+	dma_validate (pdma, 0, info.len, timer);
+	ndi_set_number (pdma, 0);	/* 0 for chksum */
+	chksum = check_sum (
+			tx_num, 
+			(sizeof (num_dma_info_t) + ndi_get_length (pdma) + 3) >> 2, 
+			(unsigned *) pdma->virt_addr
+		 );
+	dma_validate_cs (pdma, tx_num, chksum);
+	res = q_enqueue_mem (tx_list, &info, sizeof (buf_info_t));
+	assert (res != 0);
+	assert (q_get_count (tx_list) <= DMA_BUFFER_NUM_MAX);
+	assert (q_get_count (tx_list) <= dif_req.tx_block_num);
+#if !defined (NDEBUG)
+	if (tx_last_buffer != NULL) {
+		assert ((void *) pdma == tx_last_buffer->context);
+	} else {
+		assert (pdma == dma_struct [0]);
+	}
+	tx_last_buffer = pdma;
+#endif
+	INC(tx_num);
+	assert (card_link != NULL);
+	trigger_interrupt (card_link);
+	
+	return TRUE;
+} /* OSHWTxBuffer */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern unsigned OSHWRxBuffer (
+	const hw_buffer_descriptor_p	desc,
+	unsigned			offset,
+	unsigned			length,
+	void *				context
+) {
+	buf_info_t			info	= { desc, offset, length, context } ;
+	dma_struct_p			pdma;
+	int				res;
+#if !defined (NDEBUG)
+	unsigned			time;
+#endif
+	
+	assert (!atomic_read (&is_stopped));
+	assert (atomic_read (&is_open));
+	assert (info.pbd != NULL);
+	pdma = (dma_struct_p) info.pbd->context;
+	assert (pdma != NULL);
+	assert (info.ofs == 0);
+	assert (info.len <= dif_req.rx_max_trans_len);
+
+	assert (info.len <= dma_eff_buf_size (pdma));
+	assert (info.len <= MAX_LENGTH);
+	
+	assert (q_get_count (rx_list) < dif_req.rx_block_num);
+	res = q_enqueue_mem (rx_list, &info, sizeof (buf_info_t));
+	assert (res != 0);
+#if !defined (NDEBUG)
+	if (rx_last_buffer != NULL) {
+		assert (rx_last_buffer->context == (void *) pdma);
+	} else {
+		assert (dif_req.tx_block_num > 0);
+		assert (dif_req.tx_block_num < (2 * DMA_BUFFER_NUM_MAX));
+		assert (pdma == dma_struct [dif_req.tx_block_num]);
+	}
+	rx_last_buffer = pdma;
+	assert (get_timer_func != NULL);
+	time = (*get_timer_func) ();
+	last_to_pc_ack = time;
+#endif
+	assert (to_pc_ack_func != NULL);
+	(*to_pc_ack_func) (ndi_get_number (pdma));
+
+	return TRUE;
+} /* OSHWRxBuffer */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+unsigned OSHWCancelRx (hw_block_handle handle) {
+
+	UNUSED_ARG (handle);
+	assert (0);
+	return FALSE;
+} /* OSHWCancelRx */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+unsigned OSHWCancelTx (hw_block_handle handle) {
+
+	UNUSED_ARG (handle);
+	assert (0);
+	return FALSE;
+} /* OSHWCancelTx */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/devif.h linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/devif.h
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/devif.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/devif.h	2004-08-13 00:00:00.000000000 +0200
@@ -0,0 +1,158 @@
+/* 
+ * devif.h
+ * Copyright (C) 2003, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#ifndef __have_devif_h__
+#define __have_devif_h__
+
+#include <asm/atomic.h>
+#include <linux/sched.h>
+#include "common.h"
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#if !defined (C6205_PCI_HSR_OFFSET)
+#define C6205_PCI_HSR_OFFSET		0
+#define C6205_PCI_HDCR_OFFSET		4
+#define C6205_PCI_DSPP_OFFSET		8
+#endif
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#define	C6205_PCI_HDCR_WARMRESET	1
+#define	C6205_PCI_HDCR_DSPINT		2
+#define	C6205_PCI_HDCR_PCIBOOT		4
+#define	C6205_PCI_HSR_INTSRC		1
+#define	C6205_PCI_HSR_INTAVAL		2
+#define	C6205_PCI_HSR_OMTA		4
+#define	C6205_PCI_HSR_CFRGERR		8
+#define	C6205_PCI_HSR_EEREAD		16
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern atomic_t		xfer_flag;
+
+extern void		xfer_handler (card_p);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern int dif_init (card_p, int, timer_func_t, to_pc_ack_func_t);
+extern void dif_exit (void);
+
+extern void dif_set_params (
+	unsigned	num,
+	unsigned	offset,
+	ioaddr_p	pwin,
+	unsigned	len,
+	unsigned	bufofs
+);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern void dif_xfer_requirements (dif_require_p, unsigned);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern void set_interrupt_callback (int (*f) (void *), void *);
+extern void clear_interrupt_callback (void);
+
+extern void device_interrupt (int, void *, struct pt_regs *);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern dma_struct_p dma_alloc (void);
+extern void dma_free (dma_struct_p *);
+
+extern int dma_setup (dma_struct_p, unsigned long);
+extern void dma_free_buffer (dma_struct_p);
+
+extern int dma_init (dma_struct_p, unsigned long);
+extern void dma_exit (dma_struct_p);
+
+extern dma_struct_p * dma_get_struct_list (unsigned *);
+	
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#if defined (USB_EVENT_HARD_ERROR)
+# undef USB_EVENT_HARD_ERROR
+#endif
+
+#define USB_REQUEST_CANCELLED	0x8000
+#define USB_RX_REQUEST		0x4000
+#define USB_TX_REQUEST		0x2000
+#define USB_EVENT_HARD_ERROR	0x0800
+
+#define DMA_REQUEST_CANCELLED	0x8000
+#define DMA_RX_REQUEST		0x4000
+#define DMA_TX_REQUEST		0x2000
+#define DMA_EVENT_HARD_ERROR	0x0800
+
+extern unsigned OSHWBlockOpen (unsigned, hw_block_handle *);
+extern void OSHWBlockClose (hw_block_handle);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern unsigned OSHWStart (
+	hw_block_handle, 
+	hw_completion_func_t, 
+	hw_completion_func_t, 
+	hw_event_func_t
+);
+extern void OSHWStop (hw_block_handle);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern hw_buffer_descriptor_p OSHWAllocBuffer (hw_block_handle, unsigned);
+extern void OSHWFreeBuffer (hw_buffer_descriptor_p);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern unsigned OSHWGetMaxBlockSize (hw_block_handle);
+extern unsigned OSHWGetMaxConcurrentRxBlocks (hw_block_handle);
+extern unsigned OSHWGetMaxConcurrentTxBlocks (hw_block_handle);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern void * OSHWExchangeDeviceRequirements (hw_block_handle, void *);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern unsigned OSHWTxBuffer (
+	const hw_buffer_descriptor_p,
+	unsigned,
+	unsigned,
+	void *
+);
+
+extern unsigned OSHWRxBuffer (
+	const hw_buffer_descriptor_p,
+	unsigned,
+	unsigned,
+	void *
+);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern unsigned OSHWCancelRx (hw_block_handle);
+
+extern unsigned OSHWCancelTx (hw_block_handle);
+
+#endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/driver.c linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/driver.c
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/driver.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/driver.c	2004-08-13 00:00:00.000000000 +0200
@@ -0,0 +1,1933 @@
+/* 
+ * driver.c
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/atomic.h>
+#include <asm/uaccess.h>
+#include <asm/system.h>
+#include <linux/version.h>
+#include <linux/ioport.h>
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+#include <linux/tqueue.h>
+#include <linux/skbuff.h>
+#include <linux/kernel.h>
+#include <linux/spinlock.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <linux/ctype.h>
+#include <linux/string.h>
+#include <linux/capi.h>
+#include <linux/kernelcapi.h>
+#include <stdarg.h>
+#include "libstub.h"
+#include "ca.h"
+#include "capilli.h"
+#include "tables.h"
+#include "queue.h"
+#include "lib.h"
+#include "main.h"
+#include "tools.h"
+#include "defs.h"
+#include "fw.h"
+#include "devif.h"
+#include "driver.h"
+
+#if defined (LOG_MESSAGES)
+# define mlog		log
+#else
+# define mlog(f,a...)
+#endif
+
+#define	__entry
+
+#define	KILOBYTE		1024
+#define	MEGABYTE		(1024*KILOBYTE)
+#define	_2_MEGS_		(2*MEGABYTE)
+#define	_4_MEGS_		(4*MEGABYTE)
+#define	_8_MEGS_		(8*MEGABYTE)
+#define	TEN_MSECS		(HZ/100)
+
+#define	MAPPED_DATA_LEN		_4_MEGS_
+#define	MAPPED_CODE_LEN		_8_MEGS_
+#define	IO_REGION_LEN		16
+#define	DEBUG_MEM_SIZE		MEGABYTE
+#define	DEBUG_TIMEOUT		100
+#define	RESET_DELAY		10
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#define	DBG_FORMAT_LEN		1024
+#define	DBG_MEM_SIZE		(1024 * 1024)
+#define	DBG_TIMEOUT		100
+#define	DBG_MIN_SIZE		1024
+
+typedef struct __db {
+
+	dma_struct_p	pdma;
+	atomic_t	stop;
+	unsigned	len;
+	unsigned	tout;
+	char *		pbuf;
+	int		pid;
+} dbg_buf_t, * dbg_buf_p;
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+card_p				capi_card		= NULL;
+lib_callback_t *		capi_lib		= NULL;
+atomic_t			crit_count		= ATOMIC_INIT(0);
+spinlock_t			stack_lock		= SPIN_LOCK_UNLOCKED;
+
+struct capi_driver_interface *	capi_driver		= NULL;
+static int			load_flag		= FALSE;
+static int			init_flag		= FALSE;
+static int			nvers			= 0;
+static atomic_t			scheduler_enabled	= ATOMIC_INIT (1);
+struct capi_ctr *		capi_controller[2]	= { NULL, NULL } ;
+static bundle_t			ctrl_context[2];
+static per_ctrl_t		ctrl_params[2];
+static unsigned long		qt_flags;
+static spinlock_t		qt_lock			= SPIN_LOCK_UNLOCKED;
+static atomic_t			thread_flag		= ATOMIC_INIT (0);
+static atomic_t			thread_capi_flag	= ATOMIC_INIT (0);
+static int			thread_pid		= -1;
+static char *			firmware_ptr		= NULL;
+static unsigned			firmware_len		= 0;
+static unsigned			pc_ack_offset		= 0;
+static unsigned			timer_offset		= 0;
+static dbg_buf_p		dbgbuf			= NULL;
+
+static DECLARE_WAIT_QUEUE_HEAD(wait);
+static DECLARE_WAIT_QUEUE_HEAD(capi_wait);
+static DECLARE_WAIT_QUEUE_HEAD(dbg_wait);
+
+static DECLARE_MUTEX_LOCKED(thread_sync);
+
+static int			irq_callback (void *);
+static void			enable_thread (void);
+static void			disable_thread (void);
+static int			make_thread (void);
+static void			kill_thread (void);
+static void			scheduler_control (unsigned);
+static void			wakeup_control (unsigned);
+static void			version_callback (char *);
+static void			kill_version (struct capi_ctr *);
+static unsigned			scheduler_suspend (unsigned long);
+static unsigned			scheduler_resume (void);
+static unsigned			controller_remove (void);
+static unsigned			controller_add (void);
+
+struct capi_driver		capi_interface		= {
+
+	TARGET,
+	REV_DEFAULT,			
+	load_ware,
+	reset_ctrl,
+	remove_ctrl,
+	register_appl,
+	release_appl,
+	send_msg,
+	proc_info,
+	ctr_info,
+	drv_info,
+	NULL,		/* add_card */
+	NULL,
+	NULL,
+	0,
+	NULL,
+	""
+} ;
+
+static functions_t		ca_funcs = {
+
+	7,
+	scheduler_control,
+	wakeup_control,
+	version_callback,
+	scheduler_suspend,
+	scheduler_resume,
+	controller_remove,
+	controller_add
+} ;
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static char *	invalid_msg   = "Invalid application id #%d.\n";
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static unsigned char  minb (unsigned addr) { return MINB(addr); }
+static unsigned short minw (unsigned addr) { return MINW(addr); }
+static unsigned long  minl (unsigned addr) { return MINL(addr); }
+static unsigned char  pinb (unsigned addr) { return PINB(addr); }
+static unsigned short pinw (unsigned addr) { return PINW(addr); }
+static unsigned long  pinl (unsigned addr) { return PINL(addr); }
+
+static void moutb (unsigned char  val, unsigned addr) { MOUTB(addr, val); }
+static void moutw (unsigned short val, unsigned addr) { MOUTW(addr, val); }
+static void moutl (unsigned long  val, unsigned addr) { MOUTL(addr, val); }
+static void poutb (unsigned char  val, unsigned addr) { POUTB(addr, val); }
+static void poutw (unsigned short val, unsigned addr) { POUTW(addr, val); }
+static void poutl (unsigned long  val, unsigned addr) { POUTL(addr, val); }
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#define	PCI_NO_RESOURCE		4
+#define PCI_NO_PCI_KERN		3
+#define PCI_NO_CARD		2
+#define PCI_NO_PCI		1
+#define PCI_OK			0
+
+static int alloc_resources (struct pci_dev * dev, card_p cp) {
+
+	UNUSED_ARG (dev);
+	if (!request_region (cp->addr_mmio, IO_REGION_LEN, TARGET)) {
+		error ("Could not claim i/o region.\n");
+	io_problem:
+		cp->mmio_base = 0;
+		return PCI_NO_RESOURCE;
+	}
+	cp->mmio_base = cp->addr_mmio;
+	cp->mmio_access_ok = TRUE;
+	log ("I/O region at 0x%08x\n", cp->mmio_base);
+	if (!(cp->data_base = ioremap_nocache (cp->addr_data, cp->len_data))) {
+		log ("Could not map data memory into virtual memory.\n");
+	data_map_exit:
+		release_region (cp->addr_mmio, IO_REGION_LEN);
+		goto io_problem;
+	}
+	cp->data_access_ok = TRUE;
+	log ("Controller data memory mapped to %08x\n", cp->data_base);
+	if (!(cp->code_base = ioremap_nocache (cp->addr_code, cp->len_code))) {
+		log ("Could not map code memory into virtual memory.\n");
+	/* code_map_exit: */
+		iounmap (cp->data_base);
+		cp->data_base = NULL;
+		goto data_map_exit;
+	}
+	cp->code_access_ok = TRUE;
+	log ("Controller code memory mapped to %08x\n", cp->code_base);
+	pci_set_master (dev);
+	return PCI_OK;
+} /* alloc_resources */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void free_interrupt (card_p cp) {
+
+	log ("Free IRQ...\n");
+	assert (cp);
+	if (cp->irq != 0) {
+		free_irq (cp->irq, cp);
+		cp->irq = 0;
+		log ("IRQ freed.\n");
+	}
+} /* free_interrupt */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void free_resources (card_p cp) {
+
+	assert (cp->mmio_base != 0);
+	assert (cp->data_base != NULL);
+	assert (cp->code_base != NULL);
+
+	free_interrupt (cp);
+	clear_interrupt_callback ();
+	log ("Unmapping code, data, i/o regions...\n");
+	iounmap (cp->code_base);
+	iounmap (cp->data_base);
+	release_region (cp->addr_mmio, IO_REGION_LEN);
+	info (cp->piowin != NULL);
+	if (cp->piowin != NULL) {
+		hfree (cp->piowin);
+	}
+	log ("Resources freed.\n");
+} /* free_resources */
+
+/*---------------------------------------------------------------------------*\
+\*-B-------------------------------------------------------------------------*/
+#define	DBG_FORMAT_START	0xABCD1234
+#define	DBG_FORMAT_STOP		0x4321DCBA
+
+void dump (char * p1, char * p2, char * end, unsigned l1, unsigned l2) {
+
+	p1 += sizeof (unsigned);
+	p2 += sizeof (unsigned);
+	memdump (p1, l1, p1 - p2, "");
+	if (l2 != 0) {
+		memdump (p2, l2, 0, "");
+	}
+} /* dump */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void dump_debug_buffer (dbg_buf_p dbp) {
+	static char *	bp = NULL;
+	unsigned	part1_len, part2_len;
+	unsigned	total_len, check_len;
+	int		delta;
+	
+	assert (dbp != NULL);
+	if ((dbp->pbuf == NULL) || atomic_read (&dbp->stop)) {
+		log ("No debug buffer???\n");
+		return;
+	}
+	
+	assert (dbp->pbuf != NULL);
+	assert (dbp->pdma != NULL);
+	assert (dbp->pbuf >= (char *) dbp->pdma->virt_addr);
+	assert (dbp->pbuf < (char *) (dbp->pdma->virt_addr + dbp->len));
+	assert ((((unsigned) dbp->pbuf) & 3) == 0);
+	if (bp == NULL) {
+		bp = dbp->pbuf;
+	}
+	part1_len = part2_len = 0;
+		
+	assert (bp >= dbp->pbuf);
+	assert (bp < (dbp->pbuf + dbp->len));
+	total_len = * ((unsigned *) bp);
+	info (total_len < dbp->len);
+	if ((total_len > dbp->len) || ((total_len & 3) != 0)) {
+		log ("Debug thread needs debugging!\n");
+		return;
+	}
+
+	delta = ((char *) bp + total_len) - (dbp->pbuf + dbp->len);
+	if (delta > 0) {
+		part2_len = (unsigned) delta;
+		part1_len = total_len - part2_len;
+	} else {
+		part2_len = 0;
+		part1_len = total_len;
+	}
+	assert ((part2_len & 3) == 0);
+	assert ((part1_len & 3) == 0);
+	assert (part2_len < dbp->len);
+
+	if (part1_len != 0) {
+		check_len = (part2_len == 0) 
+			? * ((unsigned *) (bp + part1_len) + 1)
+			: * ((unsigned *) (dbp->pbuf + part2_len) + 1);
+		assert (check_len == total_len);
+		
+		dump (
+			bp, 
+			dbp->pbuf, 
+			dbp->pbuf + dbp->len, 
+			part1_len, 
+			part2_len
+		);
+
+		if (part2_len == 0) {
+			bp += 2 * sizeof (unsigned) + part1_len;
+		} else {
+			bp = dbp->pbuf + part2_len + sizeof (unsigned);
+		}
+	}
+} /* dump_debug_buffer */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static int debug_thread (void * arg) {
+	dbg_buf_p	dbp = (dbg_buf_p) arg;
+	unsigned	to;
+
+	assert (dbp != NULL);
+	to = (((dbp->tout < 10) ? 10 : dbp->tout) / 10) * TEN_MSECS;
+	while (!atomic_read (&dbp->stop)) {
+		interruptible_sleep_on_timeout (&dbg_wait, to);
+		dump_debug_buffer (dbp);
+	}
+	log ("Debug thread stopped.\n");
+	if (dbp->pdma != NULL) {
+		dma_free_buffer (dbp->pdma);
+		dma_free (&dbp->pdma);
+	}
+	hfree (dbp);
+	return 0;
+} /* debug_thread */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static int init_debug_buffer (dbg_buf_p dbp) {
+	int		res	= 0;
+	unsigned	size	= DBG_MEM_SIZE;
+	dma_struct_p	pdma;
+	
+	assert (dbp != NULL);
+	assert (size >= DBG_MIN_SIZE);
+	assert (DBG_TIMEOUT > 0);
+	assert (dbp->pbuf == NULL);
+	pdma = dma_alloc ();
+	res = FALSE;
+	for ( ; size >= DBG_MIN_SIZE; size /= 2) {
+		if ((res = dma_setup (pdma, size))) {
+			break;
+		}
+		log ("Failed to allocate %u byte DMA buffer...\n", size);
+	}
+	if (!res) {
+		dma_exit (pdma);
+		dma_free (&pdma);
+		return FALSE;
+	}
+	log (
+		"Debug DMA buffer, %u bytes, vaddr %p, paddr %p\n", 
+		pdma->length, 
+		(void *) pdma->virt_addr, 
+		(void *) pdma->phys_addr
+	);
+	assert (size == pdma->length);
+	dbp->pdma = pdma;
+	dbp->pbuf = (void *) pdma->virt_addr;
+	dbp->len  = size;
+	dbp->tout = DBG_TIMEOUT;
+	atomic_set (&dbp->stop, 0);
+	dbp->pid = kernel_thread (debug_thread, dbp, 0);
+	return TRUE;
+} /* init_debug_buffer */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void exit_debug_buffer (dbg_buf_p dbp) {
+	
+	assert (dbp != NULL);
+	info (find_task_by_pid (dbp->pid) != NULL);
+	log ("Stopping debug thread...\n");
+	atomic_set (&dbp->stop, 1);
+	if (find_task_by_pid (dbp->pid)) {
+		wake_up_interruptible (&dbg_wait);
+	} else {
+		hfree (dbp);
+	}
+} /* exit_debug_buffer */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void reset (card_p cp) {
+	int	done = 0;
+
+	assert (cp != NULL);
+	if (fw_ready ()) {
+		assert (cp->c6205_ctx != NULL);
+		log ("Loadfile based reset.\n");
+		done = fw_send_reset (cp->c6205_ctx);
+	}
+	if (!done) {
+		assert (cp->mmio_base != 0);
+		log ("I/O based reset.\n");
+		POUTL (
+			cp->mmio_base + C6205_PCI_HDCR_OFFSET, 
+			C6205_PCI_HDCR_WARMRESET
+		);
+	}
+	mdelay (RESET_DELAY);
+} /* reset */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static inline void kill_versions (void) {
+	
+	if (ctrl_context[0].ctrl != NULL) {
+		kill_version (capi_controller[0]);
+	}
+	kill_version (capi_controller[1]);
+} /* kill_versions */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int start_stack (card_p cp) {
+	int		res = 0;
+	unsigned	num = 0, n;
+	unsigned	ofs, len, bof;
+	ioaddr_p	pwin;
+	dma_struct_p *	ppdma;
+	
+	/* preparing the stack */
+	cp->count = 0;
+	table_init (&cp->appls);
+	queue_init (&cp->queue);
+
+	assert (capi_lib != NULL);
+	assert (capi_lib->cm_register_ca_functions != NULL);
+	assert (capi_lib->cm_start != NULL);
+	assert (capi_lib->cm_init != NULL);
+	(*capi_lib->cm_register_ca_functions) (&ca_funcs);
+	if ((*capi_lib->cm_start) ()) {
+		error ("Starting the stack failed...\n");
+	early_exit:
+		queue_exit (&cp->queue);
+		table_exit (&cp->appls);
+		return FALSE;
+	}
+	(void) (*capi_lib->cm_init) (0, cp->irq);
+	assert (nvers == 2);
+	
+	/* install an interrupt handler */
+	set_interrupt_callback (&irq_callback, cp);
+	if (0 != (res = request_irq (cp->irq, &device_interrupt, SA_INTERRUPT | SA_SHIRQ, TARGET, cp))) {
+		error ("Could not install irq handler.\n");
+	stack_exit:
+		assert (capi_lib->cm_exit != NULL);
+		(*capi_lib->cm_exit) ();
+		clear_interrupt_callback ();
+		kill_versions ();
+		goto early_exit;
+	} else {
+		log ("IRQ #%d assigned to " TARGET " driver.\n", cp->irq);
+	}
+
+	/* debug buffer */
+	assert (capi_lib->cc_need_debug_buffer != NULL);
+	if ((*capi_lib->cc_need_debug_buffer) ()) {
+		log ("Setting up debug buffer.\n");
+		if (dbgbuf == NULL) {
+			if (NULL != (dbgbuf = (dbg_buf_p) hcalloc (sizeof (dbg_buf_t)))) {
+				if (!init_debug_buffer (dbgbuf)) {
+					hfree (dbgbuf);
+					goto stack_exit;
+				}
+				assert (capi_lib->cc_init_debug != NULL);
+				(*capi_lib->cc_init_debug) (
+					(void *) dbgbuf->pdma->phys_addr, 
+					dbgbuf->pdma->length
+				);
+			}
+		}
+	} else {
+		log ("No debug buffer.\n");
+	}
+
+	/* establish DMA buffers */
+	ppdma = dma_get_struct_list (&num);
+	assert (capi_lib->cc_num_link_buffer != NULL);
+	assert (capi_lib->cc_init_dma != NULL);
+	n = (*capi_lib->cc_num_link_buffer) (TRUE),
+	(*capi_lib->cc_init_dma) (
+		&ppdma[0], n,
+		&ppdma[n], (*capi_lib->cc_num_link_buffer) (FALSE)
+	);
+	
+	assert (capi_lib->cc_link_version != NULL);
+	assert (capi_lib->cc_buffer_params != NULL);
+	if ((*capi_lib->cc_link_version) () > 1) {
+		num = (*capi_lib->cc_buffer_params) (&ofs, &pwin, &len, &bof);
+		dif_set_params (num, ofs, pwin, len, bof);
+	}
+	reset (cp);
+	assert (capi_lib->cc_run != NULL);
+	res = (*capi_lib->cc_run) ();
+	if (res == FALSE) {	/* Failure */
+		error ("Firmware does not respond!\n");
+	reset_exit:
+		reset (cp);
+		if (dbgbuf != NULL) {
+			exit_debug_buffer (dbgbuf);
+		}
+		goto stack_exit;
+	}
+	assert (capi_lib->cc_compress_code != NULL);
+	(*capi_lib->cc_compress_code) ();
+
+	/* start the stack */
+	enter_critical ();
+	if ((*capi_lib->cm_activate) ()) {
+		error ("Activation of the card failed.\n");
+		leave_critical ();
+		goto reset_exit;
+	}
+	leave_critical ();
+	make_thread ();
+	enable_thread ();
+	init_flag = TRUE;
+	return TRUE;
+} /* start_stack */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void stop_stack (card_p card) {
+
+	if (!init_flag) {
+		log ("Stack not initialized.\n");
+		return;
+	}
+	init_flag = FALSE;
+	if (dbgbuf != NULL) {
+		exit_debug_buffer (dbgbuf);
+		dbgbuf = NULL;
+	}
+	(*capi_lib->cm_exit) ();
+	if (thread_pid != -1) {
+	     // disable_thread ();
+		kill_thread ();
+	}
+	queue_exit (&card->queue);
+	table_exit (&card->appls);
+	kill_versions ();
+	nvers = 0;
+} /* stop_stack */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static int reset_card (card_p cp) {
+
+	reset (cp);
+	fw_exit (&cp->c6205_ctx);
+	return TRUE;
+} /* reset_card */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static int test_card (card_p cp) {
+
+	UNUSED_ARG (cp);
+	return TRUE;
+} /* test_card */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static int params_ok (card_p cp) {
+
+	UNUSED_ARG (cp);
+	return TRUE;
+} /* params_ok */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static int find_card (card_p cp) {
+#if !defined (CONFIG_PCI)
+	return PCI_NO_PCI_KERN;
+#else
+	struct pci_dev * dev = NULL;
+
+	if (!pci_present ()) {
+		return PCI_NO_PCI;
+	}
+	dev = pci_find_device (PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_FCDSL2, dev);
+	if (NULL == dev) {
+		return PCI_NO_CARD;
+	}
+	if (0 != pci_enable_device (dev)) {
+		log ("Failed to enable the controller.\n");
+		return PCI_NO_CARD;
+	}
+
+	assert (pci_resource_len (dev, 0) == MAPPED_DATA_LEN);
+	assert (pci_resource_len (dev, 1) == MAPPED_CODE_LEN);
+	assert (pci_resource_len (dev, 2) == IO_REGION_LEN);
+
+	cp->addr_data = pci_resource_start (dev, 0);
+	cp->len_data  = pci_resource_len (dev, 0);
+	cp->addr_code = pci_resource_start (dev, 1);
+	cp->len_code  = pci_resource_len (dev, 1);
+	cp->addr_mmio = pci_resource_start (dev, 2);
+	cp->len_mmio  = pci_resource_len (dev, 2);
+	cp->irq       = dev->irq;
+
+	log (
+		"PCI: " PRODUCT_LOGO ", dev %04x, irq %d\n",
+		dev->device,
+		cp->irq
+	);
+	log (
+		"     data %08x (%dM), code %08x (%dM), mmio %04x\n",
+		cp->addr_data, cp->len_data / MEGABYTE,
+		cp->addr_code, cp->len_code / MEGABYTE,
+		cp->addr_mmio
+	);
+
+	return alloc_resources (dev, cp);
+#endif
+} /* find_card */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static struct capi_ctr * get_capi_ctr (int ctrl) {
+	int	ix;
+	
+	assert (capi_card);
+	assert (capi_card->ctrl2 > 0);
+	ix = (capi_card->ctrl2 == ctrl) ? 1 : 0;
+	info (NULL != capi_controller[ix]);
+	return capi_controller[ix];
+} /* get_capi_ctr */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static int nbchans (struct capi_ctr * ctrl) {
+	per_ctrl_p	C;
+	unsigned char *	prf;
+	int		temp = 2;
+    
+	assert (ctrl);
+	assert (ctrl->driverdata);
+	C = GET_CTRL (ctrl);
+	prf = (unsigned char *) C->string[6];
+	if (prf != NULL) {
+		temp = prf[2] + 256 * prf[3];
+	}
+	return temp;
+} /* nbchans */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static struct sk_buff * make_0xfe_request (unsigned appl) {
+	unsigned char    request[8];
+	struct sk_buff * skb;
+
+	if (NULL == (skb = alloc_skb (8, GFP_ATOMIC))) {
+		lprintf (KERN_ERR, "Unable to allocate message buffer.\n");
+	} else {    
+		request[0] = 8;
+		request[1] = 0;
+		request[2] = appl & 0xFF;
+		request[3] = (appl >> 8) & 0xFF;
+		request[4] = 0xFE;
+		request[5] = 0x80;
+		memcpy (skb_put (skb, 8), &request, 8);
+	}
+	return skb;
+} /* make_0xfe_request */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void scan_version (struct capi_ctr * ctrl, const char * ver) {
+	int		vlen, i;
+	char *		vstr;
+	per_ctrl_p	C;
+
+	assert (ctrl);
+	assert (ctrl->driverdata);
+	C = GET_CTRL (ctrl);
+
+	vlen = (unsigned char) ver[0];
+	C->version = vstr = (char *) hmalloc (vlen);
+	if (NULL == vstr) {
+		log ("Could not allocate version buffer.\n");
+		return;
+	}
+	memcpy (C->version, ver + 1, vlen);
+	i = 0;
+	for (i = 0; i < 8; i++) {
+		C->string[i] = vstr + 1;
+		vstr += 1 + *vstr;
+	} 
+#if defined (NDEBUG)
+	lprintf (KERN_INFO, "Stack version %s\n", C->string[0]);
+#endif
+	log ("Library version:    %s\n", C->string[0]);
+	log ("Card type:          %s\n", C->string[1]);
+	log ("Capabilities:       %s\n", C->string[4]);
+	log ("D-channel protocol: %s\n", C->string[5]);
+} /* scan_version */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void copy_version (struct capi_ctr * ctrl) {
+	char *		tmp;
+	per_ctrl_p	C;
+	
+	assert (ctrl);
+	assert (ctrl->driverdata);
+	C = GET_CTRL (ctrl);
+	
+	if (NULL == (tmp = C->string[3])) {
+		lprintf (KERN_ERR, "Do not have version information...\n");
+		return;
+	}
+	strncpy (ctrl->serial, tmp, CAPI_SERIAL_LEN);
+#if defined (__fcdslsl__)
+	if (ctrl == capi_controller[0]) {
+		memset (&ctrl->profile, 0, sizeof (capi_profile));
+	} else {
+		memcpy (&ctrl->profile, C->string[6], sizeof (capi_profile));
+	}
+#else
+	memcpy (&ctrl->profile, C->string[6], sizeof (capi_profile));
+#endif
+	strncpy (ctrl->manu, "AVM-GmbH", CAPI_MANUFACTURER_LEN);
+	ctrl->version.majorversion = 2;
+	ctrl->version.minorversion = 0;
+	tmp = C->string[0];
+	ctrl->version.majormanuversion = (((tmp[0] - '0') & 15) << 4)
+					+ ((tmp[2] - '0') & 15);
+	ctrl->version.minormanuversion = ((tmp[3] - '0') << 4)
+					+ (tmp[5] - '0') * 10
+					+ ((tmp[6] - '0') & 15);
+} /* copy_version */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void kill_version (struct capi_ctr * ctrl) {
+	int		i;
+	per_ctrl_p	C;
+	
+	assert (ctrl);
+	assert (ctrl->driverdata);
+	C = GET_CTRL (ctrl);
+
+	for (i = 0; i < 8; i++) {
+		C->string[i] = NULL;
+	}
+	if (C->version != NULL) {
+		hfree (C->version);
+		C->version = NULL;
+	}
+} /* kill_version */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void pprintf (char * page, int * len, const char * fmt, ...) {
+	va_list args;
+
+	va_start (args, fmt);
+	*len += vsprintf (page + *len, fmt, args);
+	va_end (args);
+} /* pprintf */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void stack_wait (unsigned msec) {
+
+	log ("Stack wait request for %u msecs\n", msec);
+	assert (!in_interrupt ());
+	mdelay (msec);
+} /* stack_wait */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+unsigned get_timer (void) {
+	unsigned	t = 0;
+
+	if (!capi_card->code_access_ok) {
+		t = MINL (capi_card->code_base + timer_offset);
+	}
+	return t;
+} /* get_timer */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void pc_acknowledge (unsigned char num) {
+	
+	assert (capi_lib != NULL);
+	assert (capi_lib->cc_link_version != NULL);
+	assert ((*capi_lib->cc_link_version) () > 3);
+#if !defined (NDEBUG) && defined (LOG_LINK)
+	log ("ACK for buffer #%u\n", num);
+#endif
+	MOUTL (capi_card->data_base + pc_ack_offset, num);
+	assert (MINL (capi_card->data_base + pc_ack_offset) == num);
+} /* pc_acknowledge */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int __entry load_ware (struct capi_ctr * ctrl, capiloaddata * ware) {
+	card_p		cp;
+	char *		buffer;
+	int		res;
+	ioaddr_p	io;
+
+	assert (ctrl != NULL);
+	assert (ware != NULL);
+	cp = GET_CARD(ctrl);
+	if (load_flag) {
+		log ("Firmware has already been loaded!\n");
+		return 0;
+	}
+	assert (firmware_ptr == NULL);
+	if (NULL == (buffer = (char *) hmalloc (ware->firmware.len))) {
+		error ("Could not allocate firmware buffer.\n");
+		return -EIO;
+	}
+        if (ware->firmware.user) {
+		if (copy_from_user (buffer, ware->firmware.data, ware->firmware.len)) {
+			error ("Error copying firmware data!\n");
+			return -EIO;
+		}
+	} else {
+		memcpy (buffer, ware->firmware.data, ware->firmware.len);
+	}
+	log ("Loaded %d bytes of firmware.\n", ware->firmware.len);
+	firmware_ptr = buffer;
+	firmware_len = ware->firmware.len;
+
+	if (NULL == (io = (ioaddr_p) hmalloc (3 * sizeof (ioaddr_t)))) {
+		log ("Could not claim memory for i/o structures.\n");
+		return -ENOMEM;
+	}
+	cp->piowin = io;
+	
+#define	INIT_IO(x,n,f)	x.virt_addr	= (unsigned) cp->n##_base;	\
+			x.phys_addr	= cp->addr_##n;			\
+			x.length	= cp->len_##n;			\
+			x.inb		= &(f##inb);			\
+			x.inw		= &(f##inw);			\
+			x.inl		= &(f##inl);			\
+			x.outb		= &(f##outb);			\
+			x.outw		= &(f##outw);			\
+			x.outl		= &(f##outl);
+			
+	INIT_IO(io[0], data, m);
+	INIT_IO(io[1], code, m);
+	INIT_IO(io[2], mmio, p);
+	
+#undef INIT_IO
+	
+	cp->c6205_ctx = fw_init (
+				cp, 
+				firmware_ptr, 
+				firmware_len, 
+				3, io, 
+				&res
+			);
+	if ((NULL == cp->c6205_ctx) || (res != 0)) {
+		error ("Error while processing firmware (%d)!\n", res);
+	error1:
+		fw_exit (&cp->c6205_ctx);
+		hfree (firmware_ptr);
+		hfree (cp->piowin);
+		firmware_ptr = NULL;
+		cp->piowin = NULL;
+		return -EIO;
+	}
+	assert (capi_lib != NULL);
+	assert (capi_lib->cc_link_version != NULL);
+	assert ((*capi_lib->cc_link_version) () > 1);
+	if (!dif_init (cp, (*capi_lib->cc_link_version) () > 1, &get_timer, &pc_acknowledge)) {
+		error ("Error while setting up device structures!\n");
+	error2:
+		goto error1;
+	}
+	assert (capi_lib->cc_timer_offset != NULL);
+	timer_offset = (*capi_lib->cc_timer_offset) ();
+	if ((*capi_lib->cc_link_version) () > 3) {
+		pc_ack_offset = (*capi_lib->cc_pc_ack_offset) ();
+	}
+
+	fw_setup (cp->c6205_ctx);
+	if (!start_stack (cp)) {
+		error ("Error while starting protocoll stack!\n");
+	/* error3: */
+		dif_exit ();
+		goto error2;
+	}
+	assert (load_flag == FALSE);
+	load_flag = TRUE;
+	if (ctrl_context[0].ctrl != NULL) {
+		assert (capi_controller[0]->ready);
+		(*capi_controller[0]->ready) (capi_controller[0]);
+	}
+	assert (capi_controller[1]->ready);
+	(*capi_controller[1]->ready) (capi_controller[1]);
+	return 0;
+} /* load_ware */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void init_ctrl (void) {
+
+	ctrl_context[0].card = ctrl_context[1].card = NULL;
+	ctrl_context[0].ctrl = ctrl_context[1].ctrl = NULL;
+	capi_controller[0]   = capi_controller[1]   = NULL;
+} /* init_ctrl */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static int setup_ctrl (card_p cp, int ix) {
+	int			cix;
+	struct capi_ctr *	cptr;
+	
+	assert ((0 < ix) && (ix < 3));
+	cptr = (*capi_driver->attach_ctr) (&capi_interface, SHORT_LOGO, NULL);
+	if (NULL == cptr) {
+		free_resources (cp);
+		lprintf (KERN_INFO, "Error: Could not attach controller %d.\n", ix);
+		return -EBUSY;
+	}
+	if ((1 == ix) && (cptr->cnr != 1)) {
+		cix = ix;
+	} else {
+		cix = ix - 1;
+	}
+	log ("Controller %d (%d) --> %d\n", ix, cptr->cnr, cix);
+	capi_controller[cix] = cptr;
+	ctrl_context[cix].card = cp;
+	ctrl_context[cix].ctrl = &ctrl_params[cix];
+	capi_controller[cix]->driverdata = (void *) &ctrl_context[cix];
+	return 0;
+} /* setup_ctrl */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int __entry add_card (struct capi_driver * drv, capicardparams * args) {
+	card_p  cp;
+	int	res = 0;
+	char *	msg;
+
+	UNUSED_ARG (drv);
+	UNUSED_ARG (args);
+	if (NULL != capi_card) {
+		lprintf (KERN_ERR, "Cannot handle two controllers!\n");
+ 		return -EBUSY;
+	}
+	if (NULL == (cp = (card_p) hcalloc (sizeof (card_t)))) {
+		lprintf (KERN_ERR, "Card object allocation failed.\n");
+		return -EIO;
+	}
+	capi_card = cp;
+	init_waitqueue_head (&wait);
+
+	switch (find_card (cp)) {
+        
+	case PCI_OK:
+		break;
+	case PCI_NO_RESOURCE:
+		msg = "Could not claim required resources.";
+		res = -EBUSY;
+		break;
+        case PCI_NO_PCI_KERN:
+		msg = "No PCI kernel support available.";
+		res = -ESRCH;
+		break;
+        case PCI_NO_CARD:
+		msg = "Could not locate any " PRODUCT_LOGO ".";
+		res = -ESRCH;
+		break;
+        case PCI_NO_PCI:
+		msg = "No PCI busses available.";
+		res = -ESRCH;
+		break;
+        default:
+		msg = "Unknown PCI related problem...";
+		res = -EINVAL;
+		break;
+	}
+	if (res != 0) {
+	msg_exit:
+		error ("Error: %s\n", msg);
+		hfree (cp);
+		return res;
+	}
+	if (!params_ok (cp)) {
+		free_resources (cp);
+		msg = "Error: Invalid parameters!";
+		res = -EINVAL;
+		goto msg_exit;
+	}
+	inc_use_count ();
+	init_ctrl ();
+#if defined (__fcdslsl__)
+	if (0 != (res = setup_ctrl (cp, 2))) {
+		dec_use_count ();
+		return res;
+	}
+#else
+	if (0 != (res = setup_ctrl (cp, 1))) {
+		dec_use_count ();
+		return res;
+	}
+	if (ctrl_context[0].ctrl != NULL) {
+		if (0 != (res = setup_ctrl (cp, 2))) {
+			(*capi_driver->detach_ctr) (capi_controller[0]);
+			capi_controller[0] = NULL;
+			dec_use_count ();
+			return res;
+		}
+	}
+#endif
+	cp->ctrl2 = capi_controller[1]->cnr;
+	cp->ctxp  = NULL;
+	return res;
+} /* add_card */ 
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void __entry reset_ctrl (struct capi_ctr * ctrl) {
+	card_p		cp;
+	appl_t *	appp;
+
+	assert (ctrl != NULL);
+	assert (ctrl->driverdata != NULL);
+	cp = GET_CARD (ctrl);
+	assert (cp != NULL);
+        if (0 != cp->count) {
+		lprintf (KERN_INFO, "Removing registered applications!\n");
+		info (cp->appls);
+		if (cp->appls != NULL) {
+			appp = first_appl (cp->appls);
+			while (appp != NULL) {
+				free_ncci (appp->id, (unsigned) -1);
+				appp = next_appl (cp->appls, appp);
+			}
+		}
+	}
+	stop_stack (cp);
+	/* to do: remove marked buffers */
+	reset_card (cp);
+	if (firmware_ptr != NULL) {
+		hfree (firmware_ptr);
+		firmware_ptr = NULL;
+		firmware_len = 0;
+	}
+	dif_exit ();
+	load_flag = FALSE;
+	if (ctrl_context[0].ctrl != NULL) {
+		assert (capi_controller[0]->reseted);
+		(*capi_controller[0]->reseted) (capi_controller[0]);
+	}
+	assert (capi_controller[1]->reseted);
+	(*capi_controller[1]->reseted) (capi_controller[1]);
+} /* reset_ctrl */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void __entry remove_ctrl (struct capi_ctr * ctrl) {
+	card_p	cp;
+
+	assert (ctrl);
+	assert (ctrl->driverdata);
+	cp = GET_CARD (ctrl);
+	info (load_flag == FALSE);
+	if (load_flag) {
+		lprintf (KERN_ERR, "Remove controller w/o reset!\n");
+		reset_card (cp);
+	}
+	free_resources (cp);
+	assert (capi_driver->detach_ctr);
+	if (ctrl_context[0].ctrl != NULL) {
+		(*capi_driver->detach_ctr) (capi_controller[0]);
+	}
+	(*capi_driver->detach_ctr) (capi_controller[1]);
+	dec_use_count ();
+	init_ctrl ();
+	hfree (capi_card);
+	capi_card = NULL;
+} /* remove_ctrl */
+
+/*---------------------------------------------------------------------------*\
+\*-L-------------------------------------------------------------------------*/
+void lock (void) {
+	unsigned long	local_flags;
+	
+	info (!spin_is_locked (&qt_lock));
+	spin_lock_irqsave (&qt_lock, local_flags);
+	qt_flags = local_flags;
+} /* lock */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void unlock (void) {
+	unsigned long	local_flags = qt_flags;
+
+	spin_unlock_irqrestore (&qt_lock, local_flags);
+} /* unlock */
+
+/*---------------------------------------------------------------------------*\
+\*-C-------------------------------------------------------------------------*/
+static inline void check (void) {
+	unsigned long		flags;
+	static spinlock_t	chk_lock = SPIN_LOCK_UNLOCKED;
+
+	if (atomic_xchg (&xfer_flag, 0)) {
+		spin_lock_irqsave (&chk_lock, flags);
+		xfer_handler (capi_card);
+		spin_unlock_irqrestore (&chk_lock, flags);
+	}
+} /* check */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void enter_critical (void) {
+
+	if (!atomic_read (&crit_count) && !in_interrupt ()) {
+		check ();
+	}
+	atomic_inc (&crit_count);
+} /* enter_critical */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void leave_critical (void) {
+	
+	assert (in_critical ());
+	atomic_dec (&crit_count);
+	if (!atomic_read (&crit_count) && !in_interrupt ()) {
+		check ();
+	}
+} /* leave_critical */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void __entry register_appl (
+	struct capi_ctr *	ctrl, 
+	u16			appl, 
+	capi_register_params *	args
+) {
+	card_t *		card;
+	appl_t *		appp;
+	void *			ptr;
+	unsigned		nc;
+
+	mlog ("REGISTER(ctrl:%d,appl:%u)\n", ctrl->cnr, appl);
+	assert (ctrl);
+	assert (ctrl->driverdata);
+	assert (args);
+	card = GET_CARD (ctrl);
+	if ((int) args->level3cnt < 0) {
+		nc = nbchans (ctrl) * -((int) args->level3cnt);
+	} else {
+		nc = args->level3cnt;
+	}
+	if (0 == nc) {
+		nc = nbchans (ctrl);
+	}
+	if (ctrl->cnr == card->ctrl2) {	
+		appp = create_appl (
+				card->appls, 
+				appl, 
+				nc, 
+				args->datablkcnt, 
+				args->datablklen
+				);
+		if (NULL == appp) {
+			log ("Unable to create application record.\n");
+			return;
+		}
+		ptr = hcalloc (card->length);		
+		if (NULL == ptr) {
+			lprintf (KERN_ERR, "Not enough memory for application data.\n");
+			remove_appl (card->appls, appp);
+			return;
+		} else {
+			inc_use_count ();
+			card->count++;
+			appp->data = ptr;
+			assert (card->reg_func);
+			(*card->reg_func) (ptr, appl);
+		}
+	}
+	assert (ctrl->appl_registered);
+	(*ctrl->appl_registered) (ctrl, appl);
+} /* register_appl */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void __entry release_appl (struct capi_ctr * ctrl, u16 appl) {
+	card_t *		card;
+	struct sk_buff *	skb;
+	appl_t *		appp;
+
+	mlog ("RELEASE(ctrl:%d,appl:%u)\n", ctrl->cnr, appl);
+	assert (ctrl);
+	assert (ctrl->driverdata);
+	card =  GET_CARD (ctrl);
+	if (ctrl->cnr == card->ctrl2) {	
+		if (NULL == (appp = search_appl (card->appls, appl))) {
+			log ("Attempt to release unknown application (id #%u)\n", appl);
+			return;
+		}
+		skb = make_0xfe_request (appl);	
+		handle_message (card->queue, appp, skb);
+		kick_scheduler ();
+		appp->dying = TRUE;
+	}
+} /* release_appl */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void __entry send_msg (struct capi_ctr * ctrl, struct sk_buff * skb) {
+	card_t *	card;
+	unsigned char *	byte;
+	unsigned	appl;
+	appl_t *	appp;
+
+	assert (ctrl != NULL);
+	assert (ctrl->driverdata != NULL);
+	assert (skb != NULL);
+	assert (skb->list == NULL);
+	card = GET_CARD (ctrl);
+	byte = skb->data;
+	appl = byte[2] + 256 * byte[3];
+	appp = search_appl (card->appls, appl);
+	if ((NULL == appp) || appp->dying) {
+		log ("Message for unknown application (id %u).\n", appl);
+		return;
+	}
+	handle_message (card->queue, appp, skb);
+	kick_scheduler ();
+} /* send_msg */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+char * __entry proc_info (struct capi_ctr * ctrl) {
+	card_p		cp;
+	per_ctrl_p	C;
+	static char	text[80];
+
+	assert (ctrl);
+	assert (ctrl->driverdata);
+	cp = GET_CARD (ctrl);
+	C  = GET_CTRL (ctrl);
+	if (load_flag) {
+		SNPRINTF (
+			text, 
+			sizeof (text),
+			"%s %s data %08lx code %08lx io %lx %u",
+			C->version ? C->string[1] : "A1",
+			C->version ? C->string[0] : "-",
+			cp->addr_code, cp->addr_data, cp->addr_mmio,
+			cp->irq
+		);
+	} else {
+		SNPRINTF (
+			text,
+			sizeof (text),
+			TARGET " device data %08lx code %08lx io %lx irq %u",
+			cp->addr_code, cp->addr_data, cp->addr_mmio,
+			cp->irq
+		);
+	}
+	return text;
+} /* proc_info */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int __entry ctr_info (
+	char *			page, 
+	char **			start, 
+	off_t			ofs,
+	int			count, 
+	int *			eof,
+	struct capi_ctr *	ctrl
+) {
+	card_p			cp;
+	per_ctrl_p		C;
+	char *			temp;
+	unsigned char		flag;
+	int			len = 0;
+
+	assert (ctrl);
+	assert (ctrl->driverdata);
+	cp = GET_CARD (ctrl);
+	C  = GET_CTRL (ctrl);
+	pprintf (page, &len, "%-16s %s\n", "name", SHORT_LOGO);
+	pprintf (page, &len, "%-16s %d\n", "irq", cp->irq);
+	pprintf (page, &len, "%-16s %08lx\n", "data", cp->data_base);
+	pprintf (page, &len, "%-16s %08lx\n", "code", cp->code_base);
+	pprintf (page, &len, "%-16s %lx\n", "io", cp->mmio_base);
+
+	if (load_flag) {
+		temp = C->version ? C->string[1] : "A1";
+		pprintf (page, &len, "%-16s %s\n", "type", temp);
+
+		temp = C->version ? C->string[0] : "-";
+		pprintf (page, &len, "%-16s %s\n", "ver_driver", temp);
+		pprintf (page, &len, "%-16s %s\n", "ver_cardtype", SHORT_LOGO);
+
+		flag = ((unsigned char *) (ctrl->profile.manu))[3];
+		if (flag) {
+			pprintf(page, &len, "%-16s%s%s%s%s%s%s%s\n", "protocol",
+				(flag & 0x01) ? " DSS1" : "",
+				(flag & 0x02) ? " CT1" : "",
+				(flag & 0x04) ? " VN3" : "",
+				(flag & 0x08) ? " NI1" : "",
+				(flag & 0x10) ? " AUSTEL" : "",
+				(flag & 0x20) ? " ESS" : "",
+				(flag & 0x40) ? " 1TR6" : ""
+			);
+		}
+		flag = ((unsigned char *) (ctrl->profile.manu))[5];
+		if (flag) {
+			pprintf(page, &len, "%-16s%s%s%s%s\n", "linetype",
+				(flag & 0x01) ? " point to point" : "",
+				(flag & 0x02) ? " point to multipoint" : "",
+				(flag & 0x08) ? " leased line without D-channel" : "",
+				(flag & 0x04) ? " leased line with D-channel" : ""
+			);
+		}
+	}
+
+	if (len < ofs) {
+		return 0;
+	}
+	*eof = 1;
+	*start = page - ofs;
+	return ((count < len - ofs) ? count : len - ofs);
+} /* ctr_info */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int __entry drv_info (
+	char *			page, 
+	char **			start, 
+	off_t			ofs,
+	int			count, 
+	int *			eof, 
+	struct capi_driver *	drv
+) {
+	int			len = 0;
+
+	UNUSED_ARG (drv);
+	pprintf (page, &len, "%-16s %s\n", "name", TARGET);
+	pprintf (page, &len, "%-16s %s\n", "revision", capi_interface.revision);
+	if (len < ofs) {
+		return 0;
+	}
+	*eof = 1;
+	*start = page - ofs;
+	return ((count < len - ofs) ? count : len - ofs);
+} /* drv_info */
+ 
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void * data_by_id (unsigned appl_id) {
+	appl_t * appp;
+
+	appp = search_appl (capi_card->appls, appl_id);	
+	return (appp != NULL) ? appp->data : NULL;
+} /* data_by_id */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+unsigned attr_by_id (unsigned appl_id) {
+	appl_t * appp;
+
+	appp = search_appl (capi_card->appls, appl_id);	
+	return (appp != NULL) ? appp->attr : 0;
+} /* attr_by_id */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void * first_data (int * res) {
+	appl_t * appp;
+
+	assert (res);
+	appp = first_appl (capi_card->appls);
+	*res = (appp != NULL) ? 0 : -1;
+	return (appp != NULL) ? appp->data  : NULL;
+} /* first_data */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void * next_data (int * res) {
+	appl_t * appp;
+
+	assert (res);
+	if (NULL != (appp = get_appl (capi_card->appls, *res))) {
+		appp = next_appl (capi_card->appls, appp);
+	}
+	*res = (appp != NULL) ? 1 + *res : -1;
+	return (appp != NULL) ? appp->data  : NULL;
+} /* next_data */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int appl_profile (unsigned appl_id, unsigned * bs, unsigned * bc) {
+	appl_t * appp;
+
+	appp = search_appl (capi_card->appls, appl_id);	
+	if (NULL == appp) {
+		return 0;
+	}
+	*bs = appp->blk_size; 
+	*bc = appp->blk_count; 
+	return 1;
+} /* appl_profile */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int msg2stack (unsigned char * msg) {
+	unsigned		mlen;
+	unsigned		appl;
+	unsigned		nctr;
+	__u32			ncci;
+	unsigned		hand;
+	unsigned char *		mptr;
+	unsigned char *		dptr;
+	struct sk_buff *	skb;
+	unsigned		temp;
+	int			res = 0;
+
+	assert (msg);
+	if (!queue_is_empty (capi_card->queue)) {
+		res = 1;
+		skb = queue_peek (capi_card->queue);	
+		assert (skb);
+		mptr = (unsigned char *) skb->data;
+		mlen = mptr[0] + 256 * mptr[1]; 
+		appl = mptr[2] + 256 * mptr[3];
+		nctr = mptr[8] & 127;
+		
+		mlog (
+			"PUT_MESSAGE(ctrl:%d,appl:%u,cmd:0x%02X,subcmd:0x%02X)\n", 
+			nctr,
+			appl, 
+			mptr[4], 
+			mptr[5]
+		);
+
+		if ((0x86 == mptr[4]) && (0x80 == mptr[5])) { /* DATA_B3_REQ */
+			ncci = mptr[8] 
+				+ 256 * (mptr[9] 
+					+ 256 * (mptr[10] 
+						+ 256 * mptr[11]
+					)	);
+			hand = mptr[18] + 256 * mptr[19];
+			temp = (unsigned) (mptr + mlen);
+			dptr = mptr + 12;
+			*dptr++ = temp & 0xFF;	temp >>= 8;
+			*dptr++ = temp & 0xFF;	temp >>= 8;
+			*dptr++ = temp & 0xFF;	temp >>= 8;
+			*dptr++ = temp & 0xFF;
+			memcpy (msg, mptr, mlen);
+			queue_park (capi_card->queue, appl, ncci, hand);
+		} else {
+			memcpy (msg, mptr, mlen);
+			queue_drop (capi_card->queue);
+		}
+	}
+	return res;
+} /* msg2stack */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void msg2capi (unsigned char * msg) {
+	unsigned		mlen; 
+	unsigned		appl;
+	unsigned		nctr;
+	__u32			ncci;
+	unsigned		hand;
+	unsigned		dlen;
+	unsigned char *		dptr;
+	unsigned		temp;
+	struct sk_buff *	skb;
+	struct capi_ctr *	ctrl;
+
+	assert (msg);
+	mlen = msg[0] + 256 * msg[1];
+	appl = msg[2] + 256 * msg[3];
+	nctr = msg[8] & 127;
+
+	mlog (
+		"GET_MESSAGE(ctrl:%u,appl:%d,cmd:0x%02X,subcmd:0x%02X)\n", 
+		nctr,
+		appl, 
+		msg[4], 
+		msg[5]
+	);
+	if ((0x86 == msg[4]) && (0x81 == msg[5])) {	/* DATA_B3_CONF */
+		hand = msg[12] + 256 * msg[13];
+		ncci = msg[8] 
+			+ 256 * (msg[9] 
+				+ 256 * (msg[10] 
+					+ 256 * msg[11]
+				)	);
+		queue_conf (capi_card->queue, appl, ncci, hand);
+	}
+	if ((0x86 == msg[4]) && (0x82 == msg[5])) {	/* DATA_B3_IND */
+		dlen = msg[16] + 256 * msg[17];
+		skb = alloc_skb (
+				mlen + dlen + ((mlen < 30) ? (30 - mlen) : 0), 
+				GFP_ATOMIC
+				); 
+		if (NULL == skb) {
+			lprintf (
+				KERN_ERR, 
+				"Unable to build CAPI message skb. Message lost.\n"
+			);
+			return;
+		}
+		/* Messages are expected to come with 32 bit data pointers. 
+		 * The kernel CAPI works with extended (64 bit ready) message 
+		 * formats so that the incoming message needs to be fixed, 
+		 * i.e. the length gets adjusted and the required 64 bit data 
+		 * pointer is added.
+		 */
+		temp = msg[12] + 256 * (msg[13] 
+					+ 256 * (msg[14] + 256 * msg[15]));
+		dptr = (unsigned char *) temp;
+		if (mlen < 30) {
+			msg[0] = 30;
+			ncci   = 0;	
+			memcpy (skb_put (skb, mlen), msg, mlen);
+			memcpy (skb_put (skb, 4), &ncci, 4);	
+			memcpy (skb_put (skb, 4), &ncci, 4);
+		} else {
+			memcpy (skb_put (skb, mlen), msg, mlen);
+        	}
+		memcpy (skb_put (skb, dlen), dptr, dlen); 
+	} else {
+		if (NULL == (skb = alloc_skb (mlen, GFP_ATOMIC))) {
+			lprintf (
+				KERN_ERR, 
+				"Unable to build CAPI message skb."
+							" Message lost.\n"
+			);
+			return;
+		}
+		memcpy (skb_put (skb, mlen), msg, mlen);
+	}
+	ctrl = get_capi_ctr (nctr);
+	if (ctrl == NULL) {
+		lprintf (KERN_ERR, "Message to illegal controller #%u!\n", nctr);
+		ctrl = (NULL == capi_controller[0])
+			? capi_controller[1]
+			: capi_controller[0];
+	}
+	assert (ctrl->handle_capimsg != NULL);
+	(*ctrl->handle_capimsg) (ctrl, appl, skb);
+} /* msg2capi */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void new_ncci (
+	unsigned		appl_id, 
+	__u32			ncci,
+	unsigned		winsize,
+	unsigned		blksize
+) {
+	appl_t *		appp;
+	ncci_t *		nccip;
+	struct capi_ctr *	ctrl;
+	unsigned		nctr;
+	
+	nctr = ncci & 127;
+	mlog ("NEW NCCI(ctrl:%u,appl:%u,ncci:0x%08X)\n", nctr, appl_id, ncci);
+	if (NULL == (appp = search_appl (capi_card->appls, appl_id))) {
+		lprintf (KERN_ERR, invalid_msg, appl_id);
+		return;
+	}
+	nccip = create_ncci (
+			capi_card->appls, 
+			appp, 
+			(NCCI_t) ncci, 
+			winsize, 
+			blksize
+			);
+	if (NULL == nccip) {
+		log ("Cannot handle new NCCI...\n");
+		return;
+	}
+	ctrl = get_capi_ctr (nctr);
+	assert (ctrl != NULL);	
+	assert (ctrl->cnr == (int) nctr);
+	assert (ctrl->new_ncci != NULL);
+	(*ctrl->new_ncci) (ctrl, appl_id, ncci, winsize);
+} /* new_ncci */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void free_ncci (unsigned appl_id, __u32 ncci) {
+	appl_t *		appp;
+	ncci_t *		nccip;
+	struct capi_ctr *	ctrl;
+	unsigned		nctr;
+	
+	appp = search_appl (capi_card->appls, appl_id);
+	if (NULL == appp) {
+		lprintf (KERN_ERR, invalid_msg, appl_id);
+		return;
+	}
+	if (0xFFFFFFFF == ncci) {		/* 2nd phase RELEASE */
+		assert (appp->dying);
+		dec_use_count ();
+		capi_card->count--;
+		mlog ("FREE APPL(appl:%u)\n", appl_id);
+		(*capi_card->rel_func) (appp->data);			
+		remove_appl (capi_card->appls, appp);		
+		if (ctrl_context[0].ctrl != NULL) {
+			assert (capi_controller[0]->appl_released);
+			(*capi_controller[0]->appl_released) (capi_controller[0], appl_id);
+		}
+		assert (capi_controller[1]->appl_released);
+		(*capi_controller[1]->appl_released) (capi_controller[1], appl_id);
+	} else if (NULL != (nccip = locate_ncci (appp, ncci))) {
+		nctr = ncci & 127;
+		ctrl = get_capi_ctr (nctr);
+		assert (ctrl);		
+		assert (ctrl->cnr == (int) nctr);
+		mlog ("FREE NCCI(ctrl:%u, appl:%u,ncci:0x%08X)\n", nctr,  appl_id, ncci);
+		(*ctrl->free_ncci) (ctrl, appl_id, ncci);
+		remove_ncci (capi_card->appls, appp, nccip);
+	} else {
+		lprintf (KERN_ERR, "Attempt to free unknown NCCI.\n");
+	}
+} /* free_ncci */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+unsigned char * data_block (unsigned appl_id, __u32 ncci, unsigned handle) {
+	appl_t * appp;
+ 
+	appp = search_appl (capi_card->appls, appl_id);
+	if (NULL == appp) {
+		lprintf (KERN_ERR, invalid_msg, appl_id);
+		return NULL;
+	}
+	return ncci_data_buffer (capi_card->appls, appp, ncci, handle);
+} /* data_block */
+
+/*-S-------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static int sched_thread (void * arg) {
+
+	UNUSED_ARG (arg);
+	daemonize ();
+	SNPRINTF (current->comm, 16, "%s_thread", TARGET);	/* See: sched.h */
+	log ("Starting kicker thread '%s'...\n", current->comm);
+	while (atomic_read (&thread_flag)) {
+		/* Start/stop logic */
+		if (!atomic_read (&thread_capi_flag)) {
+			interruptible_sleep_on (&capi_wait);
+		} else {
+			if (atomic_read (&scheduler_enabled)) {
+				interruptible_sleep_on_timeout (&wait, TEN_MSECS);
+			} else {
+				interruptible_sleep_on (&wait);
+			}
+		}
+		assert (!in_critical ());
+		/* Enable/disable logic */
+		if (!atomic_read (&thread_flag)) {
+			info (atomic_read (&thread_flag));
+			break;
+		}
+		if (!atomic_read (&thread_capi_flag)) {
+			info (atomic_read (&thread_capi_flag));
+			continue;
+		}
+                if (!atomic_read (&scheduler_enabled)) {
+			info (atomic_read (&scheduler_enabled));
+			continue;
+		}
+		/* Body of thread, invoke scheduler */
+		if (spin_trylock (&stack_lock)) {
+			os_timer_poll ();
+			assert (capi_lib->cm_schedule);
+			if ((*capi_lib->cm_schedule) ()) {
+				scheduler_control (TRUE); 
+			}
+			spin_unlock (&stack_lock);
+		}
+	}
+	log ("Scheduler thread stopped.\n");
+	up (&thread_sync);
+	return 0;
+} /* sched_thread */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static int make_thread (void) {
+
+	if (-1 != thread_pid) {
+		log ("Thread[%d] already running.\n", thread_pid);
+		return thread_pid;
+	}
+	atomic_set (&thread_flag, 1);
+	atomic_set (&thread_capi_flag, 0);
+	init_waitqueue_head (&capi_wait);
+	thread_pid = kernel_thread (sched_thread, NULL, 0);
+	log ("Thread[%d] started.\n", thread_pid);
+	return thread_pid;
+} /* make_thread */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void kill_thread (void) {
+
+	atomic_set (&thread_flag, 0);
+	if (NULL == find_task_by_pid (thread_pid)) {
+		log ("Thread[%d] has died before!\n", thread_pid);
+	} else {
+		if (!atomic_read (&thread_capi_flag)) {
+			wake_up_interruptible (&capi_wait);
+		} else {
+			wake_up_interruptible (&wait);
+		}
+		log ("Thread signalled, waiting for termination...\n");
+		down (&thread_sync);
+		log ("Thread[%d] terminated.\n", thread_pid);
+	}
+	thread_pid = -1;
+} /* kill_thread */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void enable_thread (void) {
+
+	info (!atomic_read (&thread_capi_flag));
+	if (!atomic_read (&thread_capi_flag)) {
+		atomic_set (&thread_capi_flag, 1);
+		wake_up_interruptible (&capi_wait);
+		log ("Thread enabled.\n");
+	}
+} /* enable_thread */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void disable_thread (void) {
+
+	info (atomic_read (&thread_capi_flag));
+	if (atomic_read (&thread_capi_flag)) {
+		atomic_set (&thread_capi_flag, 0);
+		wake_up_interruptible (&wait);
+		log ("Thread disabled.\n");
+	}
+} /* disable_thread */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/ 
+int irq_callback (void * arg) {
+	
+	assert ((card_p) arg == capi_card);
+	kick_scheduler ();
+	return TRUE;
+} /* irq_callback */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/ 
+static void wakeup_control (unsigned enable_flag) { 
+	
+	enable_flag = 0; 
+} /* wakeup_control */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/ 
+static void version_callback (char * vp) { 
+	
+	assert (nvers < 2);
+	if ((0 == nvers) && (NULL == ctrl_context[0].ctrl)) {
+		++nvers;
+		log ("Version string #0 rejected.\n");
+		return;
+	}
+	log ("Version string #%d:\n", nvers);
+	scan_version (capi_controller[nvers], vp);
+	copy_version (capi_controller[nvers]);
+	++nvers;
+} /* version_callback */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/ 
+static unsigned	scheduler_suspend (unsigned long timeout) { 
+	
+	timeout = 0; 
+	return 0; 
+} /* scheduler_suspend */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/ 
+static unsigned	scheduler_resume (void) { 
+	
+	return 0; 
+} /* scheduler_resume */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/ 
+static unsigned	controller_remove (void) { 
+
+	assert (0);
+	return 0; 
+} /* controller_remove */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/ 
+static unsigned	controller_add (void) { 
+	
+	assert (0);
+	return 0; 
+} /* controller_add */
+	
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/ 
+void kick_scheduler (void) {
+
+	if ((thread_pid != -1) && (NULL != find_task_by_pid (thread_pid))) {
+		atomic_set (&scheduler_enabled, 1);
+		wake_up_interruptible (&wait);
+	} 
+} /* kick_scheduler */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/ 
+static void scheduler_control (unsigned ena) {
+	int	enabled = (int) ena;
+	int	changed;
+
+	enter_critical ();
+	changed = (atomic_read (&scheduler_enabled) != enabled);
+	leave_critical ();
+	if (changed) {
+		if (enabled) {
+			kick_scheduler ();
+		} else {
+			atomic_set (&scheduler_enabled, 0);
+			wake_up_interruptible (&wait);
+		}
+	}
+} /* scheduler_control */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/ 
+void init (
+	unsigned len, 
+	void  (* reg) (void *, unsigned),
+	void  (* rel) (void *),
+	void  (* dwn) (void)
+) {
+	assert (reg);
+	assert (rel);
+	assert (dwn);
+
+	capi_card->length   = len;
+	capi_card->reg_func = reg;
+	capi_card->rel_func = rel;
+	capi_card->dwn_func = dwn;
+} /* init */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int driver_init (void) {
+
+	strncpy (
+		capi_interface.revision, 
+		REVISION, 
+		sizeof (capi_interface.revision)
+	);
+	return (NULL != (capi_lib = link_library (&capi_card)));
+} /* driver_init */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void driver_exit (void) {
+
+	assert (capi_lib);
+	free_library ();
+	capi_lib = NULL;
+} /* driver_exit */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/driver.h linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/driver.h
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/driver.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/driver.h	2004-08-13 00:00:00.000000000 +0200
@@ -0,0 +1,202 @@
+/* 
+ * driver.h
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#ifndef __have_driver_h__
+#define __have_driver_h__
+
+#include <asm/atomic.h>
+#include <linux/config.h>
+#include <linux/skbuff.h>
+#include <linux/spinlock.h>
+#include <linux/capi.h>
+#include "capilli.h"
+#include "tables.h"
+#include "queue.h" 
+#include "libdefs.h" 
+#include "common.h"
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+struct __card {
+
+	/* Software */
+	int			ctrl2;
+	void *			ctxp;
+	unsigned		length;
+	unsigned		count;
+	appltab_t *		appls;
+	queue_t *		queue;
+	void		     (* reg_func) (void *, unsigned);
+	void		     (* rel_func) (void *);
+	void		     (* dwn_func) (void);
+
+	/* Hardware */
+	
+	c6205_context		c6205_ctx;
+	ioaddr_p		piowin;
+
+	unsigned long		addr_data;
+	unsigned long		len_data;
+	void *			data_base;
+	int			data_access_ok;
+
+	unsigned long		addr_code;
+	unsigned long		len_code;
+	void *			code_base;
+	int			code_access_ok;
+
+	unsigned long		addr_mmio;
+	unsigned long		len_mmio;
+	unsigned		mmio_base;
+	int			mmio_access_ok;
+
+	int			irq;
+	
+	/* TX */
+	void *			tx_dmabuf;
+	void *			tx_dmabuf_b;
+	void *			tx_base;
+	void *			tx_buffer;
+	unsigned		tx_length;
+	hw_completion_func_t	tx_func;
+	void *			tx_ctx;
+	
+	/* RX */
+	void *			rx_dmabuf;
+	void *			rx_dmabuf_b;
+	void *			rx_base;
+	void *			rx_buffer;
+	unsigned		rx_length;
+	hw_completion_func_t	rx_func;
+	void *			rx_ctx;
+} ;
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+typedef struct __per_ctrl {
+#if !defined (NDEBUG)
+	int			cid;
+#endif
+	char *			version;
+	char *			string[8];
+	struct capi_ctr *	kctrl;
+} per_ctrl_t, * per_ctrl_p;
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+typedef struct __bundle {
+
+	card_p		card;
+	per_ctrl_p	ctrl;
+} bundle_t, * bundle_p;
+
+#define	GET_CARD(ctr)	(((bundle_p) (ctr)->driverdata)->card)
+#define	GET_CTRL(ctr)	(((bundle_p) (ctr)->driverdata)->ctrl)
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern card_p				capi_card;
+extern lib_callback_t *			capi_lib;
+extern struct capi_driver_interface *	capi_driver;
+extern struct capi_driver		capi_interface;
+extern struct capi_ctr *		capi_controller[2];
+extern atomic_t				crit_count;
+extern spinlock_t			stack_lock;
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern int load_ware(struct capi_ctr * ctrl, capiloaddata * ware);
+extern void reset_ctrl(struct capi_ctr * ctrl);
+extern void remove_ctrl(struct capi_ctr * ctrl); 
+extern void register_appl(struct capi_ctr * ctrl, __u16 appl, 
+                                                  capi_register_params * args);
+extern void release_appl(struct capi_ctr * ctrl, __u16 appl); 
+extern void send_msg(struct capi_ctr * ctrl, struct sk_buff * skb); 
+extern char * proc_info(struct capi_ctr * ctrl);
+extern int ctr_info(char * page, char ** start, off_t ofs, int count, 
+                                             int * eof, struct capi_ctr * ctr);
+extern int drv_info(char * page, char ** start, off_t ofs, int count, 
+                                          int * eof, struct capi_driver * drv); 
+extern int add_card(struct capi_driver * drv, capicardparams *args); 
+
+extern void * data_by_id (unsigned appl_id);
+extern unsigned attr_by_id (unsigned appl_id);
+extern struct capi_ctr * card_by_id (unsigned appl_id);
+extern void * first_data (int * res);
+extern void * next_data (int * res);
+
+extern int appl_profile (unsigned appl_id, unsigned * blksize, 
+							unsigned * blkcount);
+
+extern int msg2stack (unsigned char * msg);
+extern void msg2capi (unsigned char * msg);
+
+extern void new_ncci (unsigned appl_id, __u32 ncci, unsigned winsize, 
+							unsigned blksize);
+extern void free_ncci (unsigned appl_id, __u32 ncci);
+
+extern unsigned char * data_block (unsigned appl_id, __u32 ncci, 
+							unsigned handle);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern void stack_wait (unsigned);
+extern unsigned get_timer (void);
+extern void pc_acknowledge (unsigned char);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern void enter_critical (void);
+extern void leave_critical (void);
+
+static inline int in_critical (void) {
+
+	return (0 < atomic_read (&crit_count));
+} /* in_critical */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern void kick_scheduler (void);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern void lock (void);
+extern void unlock (void);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern int install_card (card_p card);
+extern void remove_card (card_p card);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern void init (unsigned len, 
+		  void  (* reg) (void *, unsigned),
+		  void  (* rel) (void *),
+		  void  (* dwn) (void));
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern int driver_init (void);
+extern void driver_exit (void);
+
+#endif
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/fw.h linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/fw.h
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/fw.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/fw.h	2004-08-13 00:00:00.000000000 +0200
@@ -0,0 +1,55 @@
+/* 
+ * fw.h
+ * Copyright (C) 2003, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#ifndef __have_fw_h__
+#define __have_fw_h__
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#include "common.h"
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern ioaddr_p fw_get_window (unsigned index);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern c6205_context fw_init (
+	card_p		cp, 
+	void *		image_ptr,
+	unsigned	image_len,
+	unsigned	iolistlen,
+	ioaddr_p	iolist,
+	int *		status
+);
+extern void fw_exit (c6205_context * ctx);
+
+extern int fw_ready (void);
+extern int fw_setup (c6205_context ctx);
+extern int fw_send_reset (c6205_context ctx);
+extern unsigned fw_get_timer_offset (c6205_context ctx);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+
+#endif
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/lib.c linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/lib.c
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/lib.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/lib.c	2004-08-13 00:00:00.000000000 +0200
@@ -0,0 +1,623 @@
+/* 
+ * lib.c
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#include <asm/param.h>
+#include <asm/io.h>
+#include <linux/mm.h>
+#include <linux/kernel.h>
+#include <linux/wait.h>
+#include <linux/sched.h>
+#include <stdarg.h>
+#include "main.h"
+#include "driver.h"
+#include "devif.h"
+#include "queue.h" 
+#include "defs.h"
+#include "tools.h"
+#include "libstub.h"
+#include "lib.h"
+
+#define	PRINTF_BUFFER_SIZE	256	/* see: os_debug_printf */
+#define	CA_PRINTF_BUFFER_SIZE	1024	/* see: os_printf */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static unsigned long long	j64 = 0;
+static unsigned long		j32 = 0;
+
+static DECLARE_WAIT_QUEUE_HEAD(delay);
+
+#define	TEN_MSECS		(HZ/100)
+#define JIFF2MSEC		(1000/HZ)
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void os__enter_critical (const char * f, int l) { 
+
+	f = (void *) l;
+	enter_critical (); 
+} /* os__enter_critical */
+
+static void os__leave_critical (const char * f, int l) {
+
+	f = (void *) l;
+	leave_critical ();
+} /* os__leave_critical */
+
+static void os_enter_critical (void) { enter_critical (); }
+
+static void os_leave_critical (void) { leave_critical (); } 
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void os_enter_cache_sensitive_code (void) { /* NOP */ }
+
+static void os_leave_cache_sensitive_code (void) { /* NOP */ }
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void os_init (unsigned len, register_t reg, release_t rel, down_t down) {
+
+	init (len, reg, rel, down);
+} /* os_init */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static char * os_params (void) {
+	static char	parmbuf[128];
+	size_t		parmlen = 0;
+	size_t		n;
+	int		i	= 0;
+	
+	static struct {
+	  char *	name;
+	  short *	var;
+	} 		X[] = {
+		{ "ATMVCC",	&VCC },
+		{ "ATMVPI",	&VPI },
+		{ "ATMVCI",	&VCI },
+		{ NULL,		NULL }
+	} ;
+
+#define	GUARD(n)	if ((parmlen + (n)) >= sizeof (parmbuf)) {	\
+				log ("Parameter buffer overflow!\n");	\
+				return NULL;				\
+			}
+	
+	lprintf (
+		KERN_INFO, 
+		"Using VCC/VPI/VCI = 0x%x/0x%x/0x%x\n", 
+		VCC, 
+		VPI, 
+		VCI
+	);
+	while (X[i].name != NULL) {
+		GUARD(1);
+		parmbuf[parmlen++] = ':';
+		n = strlen (X[i].name);
+		GUARD(n + 1)
+		memcpy (&parmbuf[parmlen], X[i].name, n);
+		parmlen += n;
+		parmbuf[parmlen++] = (char) 0;
+		GUARD (7);
+		n = sprintf (&parmbuf[parmlen], "\\x%04x", *X[i].var);
+		assert (n == 6);
+		parmlen += n;
+		parmbuf[parmlen++] = (char) 0;
+		++i;
+	}
+	GUARD (1);
+	parmbuf[parmlen++] = (char) 0;
+	
+#undef GUARD
+
+	return parmbuf;
+} /* os_params */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static int os_get_message (unsigned char * msg) {
+	int res;
+
+	assert (msg);
+	res = msg2stack (msg); 
+	return res;
+} /* os_get_message */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void os_put_message (unsigned char * msg) {
+
+	assert (msg);
+	msg2capi (msg);
+} /* os_put_message */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static unsigned char * os_get_data_block (
+	unsigned	appl, 
+	unsigned long	ncci, 
+	unsigned	index
+) {
+	char * res;
+
+	res = data_block (appl, ncci, index);
+	return res;
+} /* os_get_data_block */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void os_free_data_block (unsigned appl, unsigned char * data) {
+
+	data = (void *) appl;	/* Avoid "unused arg" warning */
+} /* os_free_data_block */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static int os_new_ncci (
+	unsigned	appl,
+	unsigned long	ncci, 
+	unsigned	win_size,
+	unsigned	blk_size
+) {
+	
+	new_ncci (appl, ncci, win_size, blk_size); 
+	return 1;
+} /* os_new_ncci */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void os_free_ncci (unsigned appl, unsigned long ncci) {
+
+	free_ncci (appl, ncci);
+} /* os_free_ncci */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static unsigned os_block_size (unsigned appl) {
+	unsigned bs, dummy;
+
+	appl_profile (appl, &bs, &dummy);
+	return bs;
+} /* os_block_size */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static unsigned os_window_size (unsigned appl) {
+	unsigned bc, dummy;
+
+	appl_profile (appl, &dummy, &bc);
+	return bc;
+} /* os_window_size */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static unsigned os_card (void) {
+
+	return 0;
+} /* os_card */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void * os_appl_data (unsigned appl) {
+	void * res;
+
+	res = data_by_id (appl);
+	return res;
+} /* os_appl_data */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static unsigned os_appl_attr (unsigned appl) {
+	unsigned res;
+
+	res = attr_by_id (appl);
+	return res;
+} /* os_appl_attr */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static appldata_t * os_appl_1st_data (appldata_t * s) {
+	int		num;
+	void *		data;
+	static char	e[10]; 
+
+	memset (&e, 0, 10);
+	data = first_data (&num);
+	s->num    = num;
+	s->buffer = (NULL == data) ? e : data;
+	return s;
+} /* os_appl_1st_data */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static appldata_t * os_appl_next_data (appldata_t * s) {
+	int		num;
+	void *		data;
+	static char	e[10]; 
+
+	memset (&e, 0, 10);
+	if ((num = s->num) < 0) {	
+		return NULL;
+	}
+	data = next_data (&num);
+	s->num    = num;
+	s->buffer = (NULL == data) ? e : data;
+	return s;
+} /* os_appl_next_data */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void * os_malloc (unsigned len) {
+	void * res;
+
+	res = hcalloc (len); 
+	return res;
+} /* os_malloc */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void * os_malloc2 (unsigned len) {
+	void * res;
+
+	assert (0);	/* Not used */
+	res = hcalloc_kernel (len); 
+	return res;
+} /* os_malloc2 */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void os_free (void * p) {
+
+	assert (p != NULL);
+	hfree (p);
+} /* os_free */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void update_j64 (void) {
+	static int	run1 = 1;
+	unsigned long	j;
+	long long	diff;
+
+	j = jiffies;
+	if (run1) {
+		j32 = j;
+		run1 = 0;
+	}
+	if ((diff = j - j32) < 0) {
+		diff = -diff;
+	}
+	assert (diff >= 0);
+	j32 = j;
+	j64 += diff;
+} /* update_j64 */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static unsigned long long os_msec64 (void) {
+	unsigned long	tmp;
+
+	update_j64 ();
+	tmp = j64 * JIFF2MSEC;
+	return tmp;
+} /* os_msec64 */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static unsigned long os_msec (void) {
+	unsigned long   tmp;
+
+	update_j64 ();
+	tmp = ((unsigned long) j64) * JIFF2MSEC;
+	return tmp;
+} /* os_msec */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void os_delay (unsigned msec) {
+
+	assert (!in_interrupt ());
+	info (msec > 9);
+	msec = (msec > 9) ? (msec / 10) * TEN_MSECS : TEN_MSECS;
+	interruptible_sleep_on_timeout (&delay, msec);
+} /* os_delay */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+typedef struct {
+
+	unsigned long	lstart;
+	unsigned long	start;
+	unsigned long	tics;
+	unsigned long	arg;
+	timerfunc_t	func;
+} timer_rec_t;
+
+static volatile timer_rec_t *	timer = 0;
+static unsigned			timer_count = 0;
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static int os_timer_new (unsigned ntimers) {
+	unsigned size;
+
+	assert (ntimers > 0); 
+	timer_count = ntimers;
+	size = sizeof (timer_rec_t) * ntimers;
+	timer = (timer_rec_t *) hcalloc (size);
+	info (timer != NULL);
+	if (NULL == timer) {
+		timer_count = 0;
+	} 
+	return timer == NULL;
+} /* os_timer_new */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void os_timer_delete (void) {
+
+	
+	hfree ((void *) timer);
+	timer = NULL;
+	timer_count = 0;
+} /* os_timer_delete */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static int os_timer_start (
+	unsigned	index,
+	unsigned long	timeout,
+	unsigned long	arg,
+	timerfunc_t	func
+) {
+	assert (index < timer_count);
+	if (index >= timer_count) {
+		return 1;
+	}
+	enter_critical ();
+	timer[index].start = os_msec ();
+	timer[index].tics  = timeout + 1;
+	timer[index].arg   = arg;
+	timer[index].func  = func;
+	leave_critical ();
+	return 0;
+} /* os_timer_start */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static int os_timer_stop (unsigned index) {
+
+	assert (index < timer_count);
+	if (index >= timer_count) {
+		return 1;
+	}
+	enter_critical ();
+	timer[index].func = NULL;
+	leave_critical ();
+	return 0;
+} /* os_timer_stop */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void os_timer_poll (void) {
+	unsigned  	i;
+	unsigned long	msec;
+	restart_t 	flag;
+
+	if (NULL == timer) {
+		return;
+	}
+	enter_critical ();
+	msec = os_msec ();
+	for (i = 0; i < timer_count; i++) {
+		if (timer[i].func != 0) {
+			if ((msec - timer[i].start) >= timer[i].tics) {
+				leave_critical ();
+				assert (timer[i].func != NULL);
+				flag = (*timer[i].func) (timer[i].arg);
+				enter_critical ();
+				switch (flag) {
+				
+				case timer_end:
+					timer[i].func = NULL;
+					break;
+				case timer_restart: 
+					assert (timer[i].func != NULL);
+					timer[i].start = msec;
+					break;
+				case timer_renew:
+					assert (timer[i].func != NULL);
+					break;
+				default:
+					assert (0);
+					break;
+				}
+			}
+		}
+	}
+	leave_critical ();
+} /* os_timer_poll */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static int os_gettimeofday (struct timeval * tv) {
+
+	if (NULL != tv) {
+		do_gettimeofday (tv);
+	}
+	return 0;
+} /* os_gettimeofday */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static int	nl_needed = 0;
+
+static void os_printf (char * s, va_list args) {
+#if !defined (NDEBUG)
+	char	buffer[CA_PRINTF_BUFFER_SIZE];
+	char *	bufptr = buffer;
+	int	count;
+
+	if (nl_needed) {
+		nl_needed = 0;
+		printk ("\n");
+	}	
+	count = VSNPRINTF (bufptr, sizeof (buffer), s, args);
+	if ('\n' == buffer[0]) {
+		bufptr++;
+	}
+	if ('\n' != buffer[count - 1]) {
+		assert (count < (int) (sizeof (buffer) - 2));
+		buffer[count++] = '\n';
+		buffer[count]   = (char) 0;
+	}
+	printk (KERN_INFO TARGET ": %s", bufptr);
+#else
+	s = s;
+	args = args;
+#endif
+} /* os_printf */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void os_puts (char * str, ...) { 
+	va_list dummy;
+
+	va_start (dummy, str);
+	os_printf (str, dummy);
+	va_end (dummy);
+} /* os_puts */
+ 
+static void os_putl (long l) { 
+
+	nl_needed = 1; 
+	lprintf (KERN_INFO, "%ld", l); 
+}  /* os_putl */
+
+static void os_puti (int i) { 
+
+	nl_needed = 1; 
+	lprintf (KERN_INFO, "%d", i); 
+} /* os_puti */
+
+static void os_putnl (void) { 
+
+	nl_needed = 0; 
+	lprintf (KERN_INFO, "\n"); 
+}  /* os_putnl */
+
+static void os_putc (char c) {
+	char buffer[10];
+    
+	nl_needed = 1;
+	if ((31 < c) && (c < 127)) {
+	        sprintf (buffer, "'%c' (0x%02x)", c, (unsigned char) c);
+	} else {
+		sprintf (buffer, "0x%02x", (unsigned char) c);
+	}
+	lprintf (KERN_INFO, "%s", buffer);
+} /* os_putc */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void os_debug_printf (const char * fmt, va_list args) {
+	char	buffer [PRINTF_BUFFER_SIZE];
+
+	VSNPRINTF (buffer, sizeof (buffer), fmt, args);
+	printk (KERN_INFO TARGET ": %s", buffer);
+} /* os_debug_printf */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static lib_callback_t *	lib	= NULL;
+static lib_interface_t	libif	= {
+
+	init:				&os_init,
+	params:				&os_params,
+	get_message:			&os_get_message,
+	put_message:			&os_put_message,
+	get_data_block:			&os_get_data_block,
+	free_data_block:		&os_free_data_block,
+	new_ncci:			&os_new_ncci,
+	free_ncci:			&os_free_ncci,
+	block_size:			&os_block_size,
+	window_size:			&os_window_size,
+	card:				&os_card,
+	appl_data:			&os_appl_data,
+	appl_attr:			&os_appl_attr,
+	appl_1st_data:			&os_appl_1st_data,
+	appl_next_data:			&os_appl_next_data,
+	malloc:				&os_malloc,
+	malloc2:			&os_malloc2,
+	free:				&os_free,
+	msec:				&os_msec,	
+	msec64:				&os_msec64,
+	delay:				&os_delay,
+	timer_new:			&os_timer_new,
+	timer_delete:			&os_timer_delete,
+	timer_start:			&os_timer_start,
+	timer_stop:			&os_timer_stop,
+	timer_poll:			&os_timer_poll,
+	get_time:			&os_gettimeofday,
+	printf:				&os_debug_printf,
+	putf:				&os_printf,
+	puts:				(void (*) (char *)) &os_puts,
+	putl:				&os_putl,
+	puti:				&os_puti,
+	putc:				&os_putc,
+	putnl:				&os_putnl,
+	_enter_critical:		&os__enter_critical,
+	_leave_critical:		&os__leave_critical,
+	enter_critical:			&os_enter_critical,
+	leave_critical:			&os_leave_critical,
+	enter_cache_sensitive_code:	&os_enter_cache_sensitive_code,	
+	leave_cache_sensitive_code:	&os_leave_cache_sensitive_code,
+
+	xfer_req:			&dif_xfer_requirements,
+					
+	name:				TARGET,
+	udata:				0,
+	pdata:				NULL
+} ;
+
+lib_callback_t * get_library (void) {
+
+	return lib;
+} /* get_library */
+
+lib_callback_t * link_library (void * context) {
+
+	return (lib = avm_lib_attach (&libif, context));
+} /* link_library */
+
+void free_library (void) {
+
+	if (lib != NULL) {
+		lib = 0;
+		avm_lib_detach (&libif);
+	}
+} /* free_library */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/lib.h linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/lib.h
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/lib.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/lib.h	2004-08-13 00:00:00.000000000 +0200
@@ -0,0 +1,34 @@
+/* 
+ * lib.h
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#ifndef __have_lib_h__
+#define __have_lib_h__
+
+#include "libdefs.h"
+
+extern lib_callback_t * get_library (void);
+extern lib_callback_t * link_library (void * context);
+extern void free_library (void);
+
+extern void os_timer_poll (void);
+
+#endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/libdefs.h linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/libdefs.h
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/libdefs.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/libdefs.h	2004-08-13 00:00:00.000000000 +0200
@@ -0,0 +1,136 @@
+/* 
+ * libdefs.h
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#ifndef __have_libdefs_h__
+#define __have_libdefs_h__
+
+#include <linux/time.h>
+#include <stdarg.h>
+#include "common.h"
+
+typedef void (* register_t) (void *, unsigned);
+typedef void (* release_t) (void *);
+typedef void (* down_t) (void);
+
+typedef enum {
+
+	timer_end	= 0,
+	timer_restart	= 1,
+	timer_renew	= 2
+} restart_t;
+
+typedef restart_t (* timerfunc_t) (unsigned long);
+
+typedef struct __data {
+
+	unsigned	num;
+	char *		buffer;
+} appldata_t;
+
+typedef struct __lib {
+
+	void (* init) (unsigned, register_t, release_t, down_t);
+	char * (* params) (void);
+	int (* get_message) (unsigned char *);
+	void (* put_message) (unsigned char *);
+	unsigned char * (* get_data_block) (unsigned, unsigned long, unsigned);
+	void (* free_data_block) (unsigned, unsigned char *);
+	int (* new_ncci) (unsigned, unsigned long, unsigned, unsigned);
+	void (* free_ncci) (unsigned, unsigned long);
+	unsigned (* block_size) (unsigned);
+	unsigned (* window_size) (unsigned);
+	unsigned (* card) (void);
+	void * (* appl_data) (unsigned);
+	unsigned (* appl_attr) (unsigned);
+	appldata_t * (* appl_1st_data) (appldata_t *);
+	appldata_t * (* appl_next_data) (appldata_t *);
+	void * (* malloc) (unsigned);
+	void (* free) (void *);
+	void * (* malloc2) (unsigned);
+	void (* delay) (unsigned);
+	unsigned long (* msec) (void);
+	unsigned long long (* msec64) (void);
+	int (* timer_new) (unsigned);
+	void (* timer_delete) (void);
+	int (* timer_start) (unsigned, unsigned long, unsigned long, timerfunc_t);
+	int (* timer_stop) (unsigned);
+	void (* timer_poll) (void);
+	int (* get_time) (struct timeval *);
+	void (* printf) (const char *, va_list);
+	void (* putf) (char *, va_list);
+	void (* puts) (char *);
+	void (* putl) (long);
+	void (* puti) (int);
+	void (* putc) (char);
+	void (* putnl) (void);
+	void (* _enter_critical) (const char *, int);
+	void (* _leave_critical) (const char *, int);
+	void (* enter_critical) (void);
+	void (* leave_critical) (void);
+	void (* enter_cache_sensitive_code) (void);
+	void (* leave_cache_sensitive_code) (void);
+
+	void (* xfer_req) (dif_require_p, unsigned);
+
+	char *		name;
+	unsigned	udata;
+	void *		pdata;
+} lib_interface_t, * lib_interface_p;
+
+typedef struct __f {
+	
+	unsigned	nfuncs;
+	void	     (* sched_ctrl) (unsigned);
+	void         (* wakeup_ctrl) (unsigned);
+	void         (* version_ind) (char *);
+	unsigned     (* sched_suspend) (unsigned long);
+	unsigned     (* sched_resume) (void);
+	unsigned     (* ctrl_remove) (void);
+	unsigned     (* ctrl_add) (void);
+} functions_t, * functions_p;
+
+typedef struct __cb {
+
+	unsigned (* cm_start) (void);
+	char * (* cm_init) (unsigned, unsigned);
+	int (* cm_activate) (void);
+	int (* cm_exit) (void);
+	unsigned (* cm_handle_events) (void);
+	int (* cm_schedule) (void);
+	void (* cm_timer_irq_control) (unsigned);
+	void (* cm_register_ca_functions) (functions_p);
+
+	int (* cc_need_debug_buffer) (void);
+	void (* cc_init_debug) (void *, unsigned);
+	void (* cc_init_dma) (dma_list_t, unsigned, dma_list_t, unsigned);
+	unsigned (* cc_num_link_buffer) (int);
+	unsigned (* cc_link_version) (void);
+	unsigned (* cc_timer_offset) (void);
+	unsigned (* cc_pc_ack_offset) (void);
+	unsigned (* cc_buffer_params) (unsigned *, ioaddr_p *, unsigned *, unsigned *);
+	void (* cc_compress_code) (void);
+	int (* cc_status) (unsigned, void *, void *);
+	int (* cc_run) (void);
+} lib_callback_t, * lib_callback_p;
+
+#endif
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/libstub.h linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/libstub.h
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/libstub.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/libstub.h	2004-08-13 00:00:00.000000000 +0200
@@ -0,0 +1,37 @@
+/* 
+ * libstub.h
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#ifndef __have_libstub_h__
+#define __have_libstub_h__
+
+#include "libdefs.h"
+
+#if defined (OSDEBUG) && defined (NDEBUG)
+# undef NDEBUG
+#endif
+
+extern lib_interface_p avm_get_interface (void);
+extern lib_callback_p avm_lib_attach (lib_interface_p lif, void * ctx);
+extern void avm_lib_detach (lib_interface_p lif);
+
+#endif
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/main.c linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/main.c
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/main.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/main.c	2004-09-05 18:48:43.000000000 +0200
@@ -0,0 +1,205 @@
+/* 
+ * main.c
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#ifndef EXPORT_SYMTAB
+# define EXPORT_SYMTAB
+#endif
+
+#include <stdarg.h>
+#include <asm/uaccess.h>
+#include <linux/pci.h>
+#include <linux/config.h>
+#include <linux/version.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/string.h>
+#include <linux/skbuff.h>
+#include <linux/errno.h>
+#include <linux/capi.h>
+#include <linux/ctype.h>
+#include "capilli.h"
+#include "driver.h" 
+#include "tools.h"
+#include "defs.h"
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static char *	REVCONST = "$Revision: $";
+char		REVISION[32];
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+
+static struct pci_device_id fcdslsl_id_table[] __initdata = {
+
+	{ PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_FCDSL2,
+		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+        { /* Terminating entry */ }
+} ;
+
+MODULE_DEVICE_TABLE (pci, fcdslsl_id_table);
+#else
+#define	__exit
+#endif
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+short int	VCC = 0x01;
+short int	VPI = 0x01;
+short int	VCI = 0x20;
+
+MODULE_PARM (VCC, "h");
+MODULE_PARM (VPI, "h");
+MODULE_PARM (VCI, "h");
+
+MODULE_PARM_DESC (VCC, "VCC - Virtual Channel Connection");
+MODULE_PARM_DESC (VPI, "VPI - Virtual Path Identifier");
+MODULE_PARM_DESC (VCI, "VCI - Virtual Channel Identifier");
+
+#if defined (MODULE_LICENSE)
+MODULE_LICENSE ("GPL");
+#endif
+#if defined (MODULE_DESCRIPTION)
+MODULE_DESCRIPTION ("CAPI4Linux: Driver for " PRODUCT_LOGO);
+#endif
+#if defined (MODULE_AUTHOR)
+MODULE_AUTHOR("AVM GmbH");
+#endif
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#ifndef NDEBUG
+static void base_address (void) {
+
+	log ("Base address: %p\n", base_address);
+	log ("Compile time: %s\n", __TIME__);
+} /* base_address */
+#endif
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static int __init auto_attach (void) {
+
+	lprintf (KERN_INFO, "Auto-attaching...\n");
+	return add_card (&capi_interface, NULL);
+} /* auto_attach */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void inc_use_count (void) { MOD_INC_USE_COUNT; }
+void dec_use_count (void) { MOD_DEC_USE_COUNT; }
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static int __init fcdsl_init (void) {
+	char * tmp;
+	
+#define	RETURN(x)	MOD_DEC_USE_COUNT; return (x);
+
+	EXPORT_NO_SYMBOLS;
+#ifndef NDEBUG
+	base_address ();
+#endif
+	if ((NULL != (tmp = strchr (REVCONST, ':'))) && isdigit (*(tmp + 2))) {
+		strncpy (REVISION, tmp + 1, sizeof (REVISION));
+		tmp = strchr (REVISION, '$');
+		*tmp = 0;
+	} else {
+		strcpy (REVISION, REV_DEFAULT);
+	}
+	lprintf (KERN_INFO, "%s, revision %s\n", DRIVER_LOGO, REVISION);
+        lprintf (KERN_INFO, "(%s built on %s at %s)\n", TARGET, __DATE__, __TIME__);
+
+	/*-------------------------------------------------------------------*\
+	 * 64 bit CAPI is not supported yet.
+	\*-------------------------------------------------------------------*/
+	if (sizeof (char *) > 4) {
+		lprintf (KERN_ERR, "Cannot deal with 64 bit CAPI messages!\n");
+		return -ENOSYS;
+	}
+
+	MOD_INC_USE_COUNT;		/* Protect attachment procedure */
+	lprintf (KERN_INFO, "Loading...\n");
+	if (!driver_init ()) {
+		lprintf (KERN_INFO, "Error: Driver library not available.\n");
+		lprintf (KERN_INFO, "Not loaded.\n");
+		RETURN (-ENOSYS);
+	}
+	capi_driver = attach_capi_driver (&capi_interface);
+	if (NULL == capi_driver) {
+		lprintf (KERN_INFO, "Error: Could not attach the driver.\n");
+		lprintf (KERN_INFO, "Not loaded.\n");
+		driver_exit ();
+		RETURN (-EIO);
+	} 
+	if (0 != auto_attach ()) {
+		lprintf (KERN_INFO, "Not loaded.\n");
+		detach_capi_driver (&capi_interface);
+		driver_exit ();
+		RETURN (-EIO);
+	}
+	lprintf (KERN_INFO, "Loaded.\n");
+	RETURN (0);
+
+#undef RETURN
+
+} /* fcdsl_init */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void __exit fcdsl_exit (void) {
+
+#if defined (__fcdsl__)
+	if (capi_controller[0] != NULL) {
+		lprintf (KERN_INFO, "Shutting down controller 0...\n");
+		(*capi_driver->detach_ctr) (capi_controller[0]);
+	}
+#endif
+	if (capi_controller[1] != NULL) {
+		lprintf (KERN_INFO, "Shutting down controller 1...\n");
+		(*capi_driver->detach_ctr) (capi_controller[1]);
+	}
+	lprintf (KERN_INFO, "Removing...\n");
+	detach_capi_driver (&capi_interface);
+	driver_exit ();
+#ifndef NDEBUG
+	if (hallocated() != 0) {
+		lprintf (KERN_ERR, "%u bytes leaked.\n", hallocated());
+	}
+#endif
+	lprintf (KERN_INFO, "Removed.\n");
+} /* fcdsl_exit  */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+module_init (fcdsl_init);
+module_exit (fcdsl_exit);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/main.h linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/main.h
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/main.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/main.h	2004-08-13 00:00:00.000000000 +0200
@@ -0,0 +1,35 @@
+/* 
+ * main.h
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#ifndef __have_main_h__
+#define __have_main_h__
+
+extern void inc_use_count (void);
+extern void dec_use_count (void);
+
+extern char REVISION[];
+
+extern short int VCC;
+extern short int VPI;
+extern short int VCI;
+
+#endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/makefile linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/makefile
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/makefile	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/makefile	2004-08-13 00:00:00.000000000 +0200
@@ -0,0 +1,48 @@
+SOURCES		= main.c driver.c tables.c queue.c lib.c tools.c devif.c
+OBJECTS		= $(patsubst %.c,%.o,$(SOURCES)) 
+LIBRARY		= ../lib/$(CARD)-lib.o
+
+CARD_PATH	= /lib/modules/`uname -r`/misc
+CS_PATH		= /lib/modules/`uname -r`/pcmcia-external
+
+# As propsed by /usr/include/linux/version.h...
+KRNLINCL	= /lib/modules/`uname -r`/build/include
+# KRNLINCL	= /usr/src/linux/include
+
+DEFINES		= -DMODULE -D__KERNEL__ -DNDEBUG \
+		  -D__$(CARD)__ -DTARGET=\"$(CARD)\" 
+CCFLAGS 	= -c $(DEFINES) -O2 -Wall -I $(KRNLINCL)
+LDFLAGS		= -r
+
+ifeq ($(CARD),fcpcmcia)
+CS_MOD		= fcpcmcia_cs.o
+CS_SRC		= fcpcmcia_cs.c
+else
+CS_MOD		=
+CS_SRC		=
+endif
+
+all:		$(CARD).o $(LIBRARY) $(CS_MOD)
+
+install:	$(CARD).o $(LIBRARY) $(CS_MOD)
+		mkdir -p $(CARD_PATH)
+		cp -f $(CARD).o $(CARD_PATH)
+ifeq ($(CARD),fcpcmcia)
+		mkdir -p $(CS_PATH)
+		cp -f $(CS_MOD) $(CS_PATH)
+endif
+
+clean:		
+		$(RM) $(OBJECTS) $(CARD).o $(CS_MOD)
+
+$(CARD).o:	$(OBJECTS)
+		$(LD) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBRARY)
+
+$(OBJECTS):	%.o: %.c
+		$(CC) $(CCFLAGS) $< -o $@ 
+
+$(CS_MOD):	$(CS_SRC)
+		$(CC) $(CCFLAGS) $< -o $@
+
+# No dependencies yet...
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/queue.c linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/queue.c
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/queue.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/queue.c	2004-08-13 00:00:00.000000000 +0200
@@ -0,0 +1,276 @@
+/* 
+ * queue.c
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#include "defs.h"
+#include "driver.h"
+#include "tools.h"
+#include "tables.h"
+#include "queue.h"
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#define	MAKE_KEY(a,n,h)	(((tag_t)(a)<<48)+((tag_t)(n)<<16)+((tag_t)(h)))
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static qitem_t *	free_list = NULL;
+
+static inline qitem_t * alloc_item (void) {
+	qitem_t *	item;
+	
+	if (free_list != NULL) {
+		item = free_list;
+		free_list = item->succ;
+	} else {
+		item = (qitem_t *) hmalloc (sizeof (qitem_t));
+	}
+	info (item);
+	return item;
+} /* alloc_item */
+
+static inline void free_item (qitem_t * item) {
+	
+	assert (item);
+	item->succ = free_list;
+	free_list = item;
+} /* free_item */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void queue_init (queue_t ** q) { 
+    
+	if (NULL == (*q = (queue_t *) hmalloc (sizeof (queue_t)))) {
+		lprintf (KERN_ERR, "Not enough memory for queue struct.\n");
+	} else {
+		(*q)->noconf = (*q)->put = (*q)->get = NULL;
+		(*q)->num = 0;
+	}
+	assert (free_list == NULL);
+} /* queue_init */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void queue_exit (queue_t ** q) { 
+	qitem_t * item;
+    
+	assert (q != NULL);
+	assert (*q != NULL);
+	while ((*q)->get != NULL) {
+		item = (*q)->get->succ;
+		KFREE_SKB ((*q)->get->msg);
+		hfree ((*q)->get);
+		(*q)->get = item;
+	}
+	while ((*q)->noconf != NULL) {
+		item = (*q)->noconf->succ;
+		KFREE_SKB ((*q)->noconf->msg);
+		hfree ((*q)->noconf);
+		(*q)->noconf = item;
+	}
+	while (free_list != NULL) {
+		item = free_list->succ;
+		hfree (free_list);
+		free_list = item;
+	}
+	hfree (*q);
+	*q = NULL;
+} /* queue_exit */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static int enqueue (queue_t * q, struct sk_buff * msg) {
+	qitem_t * item;
+
+	if (NULL == (item = alloc_item ())) {
+		lprintf (KERN_ERR, "Not enough memory for queue item.\n");
+		lprintf (KERN_ERR, "Message lost.\n");
+		return 0;
+	}
+	item->succ = NULL;
+	item->msg  = msg;
+	item->key  = 0;
+	assert (q != NULL);
+	if (q->num != 0) {
+		q->put->succ = item;
+	} else {
+		q->get = item;
+	}
+	q->put = item;
+	q->num++;
+	return 1;
+} /* enqueue */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static struct sk_buff * dequeue (queue_t * q) {
+	struct sk_buff * res;
+	qitem_t *        item;
+	qitem_t *        tmp;
+
+	assert (q != NULL);
+	assert (q->get != NULL);
+	res = q->get->msg;
+	item = q->get->succ;
+	tmp = q->get;
+	q->get = item;
+	q->num--;
+	free_item (tmp);
+	return res;
+} /* dequeue */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int queue_put (queue_t * q, struct sk_buff * msg) {
+	int res;
+	
+	assert (q != NULL);
+	lock ();
+	res = enqueue (q, msg);
+	unlock ();
+	return res;
+} /* queue_put */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+struct sk_buff * queue_peek (queue_t * q) {
+	struct sk_buff * tmp = NULL;
+
+	assert (q != NULL);
+	lock ();
+	if (!queue_is_empty (q)) {
+		assert (q->get != NULL);
+		tmp = q->get->msg;
+	} else {
+		lprintf (KERN_ERR, "Queue underflow.\n");
+	}
+	unlock ();
+	return tmp;
+} /* queue_peek */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+struct sk_buff * queue_get (queue_t * q) {
+	struct sk_buff * tmp = NULL;
+
+	assert (q != NULL);
+	lock ();
+	if (!queue_is_empty (q)) {
+		tmp = dequeue (q);
+	} else {
+		lprintf (KERN_ERR, "Cannot read empty queue.\n");
+	}
+	unlock ();
+	return tmp;
+} /* queue_get */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void queue_drop (queue_t * q) {
+	struct sk_buff * tmp;
+
+	assert (q != NULL);
+	lock ();
+	if (!queue_is_empty (q)) {
+		tmp = dequeue (q);
+		KFREE_SKB (tmp);
+	} else {
+		lprintf (KERN_ERR, "Cannot read empty queue.\n");
+	}
+	unlock ();
+} /* queue_drop */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int queue_size (queue_t * q) { 
+
+	assert (q != NULL);
+	return (int) q->num; 
+} /* queue_size */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int queue_is_empty (queue_t * q) { 
+
+	assert (q != NULL);
+	return (q->num == 0) ? TRUE : FALSE; 
+} /* queue_is_empty */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void queue_park (queue_t * q, unsigned appl, NCCI_t ncci, unsigned hand) {
+	struct sk_buff * eoq;
+	qitem_t *        item;
+
+	assert (q != NULL);
+	if (NULL == (eoq = queue_get (q))) {
+		lprintf (KERN_ERR, "Cannot park from empty queue.\n");
+		return;
+	}
+	if (NULL == (item = alloc_item ())) {
+		lprintf (KERN_ERR, "Not enough memory for queue item.\n");
+		return;
+	}
+	item->key  = MAKE_KEY (appl, ncci, hand);
+	item->msg  = eoq;
+	item->pred = NULL;
+	lock ();
+	item->succ = q->noconf;
+	if (q->noconf != NULL) {
+		q->noconf->pred = item;
+	}
+	q->noconf = item;
+	unlock ();
+} /* queue_park */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void queue_conf (queue_t * q, unsigned appl, NCCI_t ncci, unsigned hand) {
+	qitem_t *	item;
+	tag_t		key = MAKE_KEY (appl, ncci, hand);
+
+	assert (q != NULL);
+	lock ();
+	item = q->noconf;
+	while ((item != NULL) && (item->key != key)) {
+		item = item->succ;
+	}
+	if (item != NULL) {
+		if (item->succ != NULL) {
+			item->succ->pred = item->pred;
+		}
+		if (item->pred != NULL) {
+			item->pred->succ = item->succ;
+		} else {
+			q->noconf = item->succ;
+		}
+		assert (item->msg);
+		KFREE_SKB (item->msg);
+		free_item (item);
+	} else {
+		log ("Tried to confirm unknown data b3 message.\n");
+	}
+	unlock ();
+} /* queue_conf */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/queue.h linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/queue.h
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/queue.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/queue.h	2004-08-13 00:00:00.000000000 +0200
@@ -0,0 +1,62 @@
+/* 
+ * queue.h
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#ifndef __have_queue_h__
+#define __have_queue_h__
+
+#include <linux/skbuff.h>
+
+typedef long long	tag_t;
+typedef __u32		NCCI_t;
+
+typedef struct __qitem {
+
+	tag_t			key;
+	struct sk_buff *	msg;
+	struct __qitem *	succ;
+	struct __qitem *	pred;
+} qitem_t;
+
+typedef struct __queue {
+
+	qitem_t *		put;
+	qitem_t *		get;
+	qitem_t *		noconf;
+	unsigned		num;
+} queue_t;
+
+extern void queue_init (queue_t ** q);
+extern void queue_exit (queue_t ** q);
+
+extern int queue_put (queue_t * q, struct sk_buff * msg);
+extern struct sk_buff * queue_peek (queue_t * q);
+extern struct sk_buff * queue_get (queue_t * q);
+extern void queue_drop (queue_t * q);
+
+extern int queue_size (queue_t * q);
+extern int queue_is_empty (queue_t * q);
+
+extern void queue_park (queue_t * q, unsigned appl, NCCI_t ncci, unsigned hand);
+extern void queue_conf (queue_t * q, unsigned appl, NCCI_t ncci, unsigned hand);
+
+#endif
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/tables.c linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/tables.c
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/tables.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/tables.c	2004-08-13 00:00:00.000000000 +0200
@@ -0,0 +1,328 @@
+/* 
+ * tables.c
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#include <linux/skbuff.h>
+#include <linux/capi.h>
+#include <linux/kernelcapi.h>
+#include "defs.h"
+#include "main.h"
+#include "tools.h"
+#include "driver.h"
+#include "queue.h"
+#include "tables.h"
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void table_init (appltab_t ** tab) {
+
+	if (NULL != (*tab = (appltab_t *) hmalloc (sizeof (appltab_t)))) {
+		(*tab)->appl_root  = NULL;
+		(*tab)->appl_count = 0;
+	}
+} /* table_init */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void table_exit (appltab_t ** tab) {
+	appl_t *	appp;
+	appl_t *	tmp;
+    
+	assert (*tab);
+	appp = (*tab)->appl_root;
+	while (appp != NULL) {
+		tmp = appp->succ;
+		capi_card->count--;
+		remove_appl (*tab, appp);
+		if (appp->data != NULL) {
+			hfree (appp->data);
+		}
+		appp = tmp;
+	}
+	hfree (*tab);
+	*tab = NULL;
+} /* table_exit */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+appl_t * create_appl (
+	appltab_t *	tab, 
+	unsigned	id, 
+	unsigned	ncount, 
+	unsigned	bcount, 
+	unsigned	bsize
+) {
+	appl_t *	appp;
+
+	if (NULL == (appp = (appl_t *) hmalloc (sizeof (appl_t)))) {
+		lprintf (KERN_ERR, "Not enough memory for application record.\n");
+		return NULL;
+	}
+	appp->id         = id;
+	appp->ncci_count = ncount;
+	appp->blk_count  = bcount;
+	appp->blk_size   = bsize;
+	appp->data       = NULL;
+	appp->attr       = 0;
+	appp->dying      = FALSE;
+	appp->nncci      = 0;
+	appp->root       = NULL;
+	appp->pred       = NULL;
+	lock ();
+	appp->succ       = tab->appl_root;
+	tab->appl_root = appp;
+	if (NULL != appp->succ) {
+		appp->succ->pred = appp;
+	}
+	tab->appl_count++;
+	unlock ();
+	return appp;
+} /* create_appl */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void remove_appl (appltab_t * tab, appl_t * appp) {
+	ncci_t *	nccip;
+	ncci_t *	tmp;
+
+	assert (appp);
+	lock ();
+	if (appp->pred != NULL) {
+		appp->pred->succ = appp->succ;
+	} else {
+		tab->appl_root = appp->succ;
+	}
+	if (appp->succ != NULL) {
+		appp->succ->pred = appp->pred;
+	}
+	if (appp->data != NULL) {
+		hfree (appp->data);
+		appp->data = NULL;
+	}
+	nccip = appp->root;
+	tab->appl_count--;
+	unlock ();
+	while (nccip != NULL) {
+		tmp = nccip->succ;
+		remove_ncci (tab, appp, nccip);
+		nccip = tmp;
+	}
+	hfree (appp);
+} /* remove_appl */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+appl_t * search_appl (appltab_t * tab, unsigned id) {
+	appl_t * appp;
+
+	lock ();
+	appp = tab->appl_root;
+	while (appp != NULL) {
+		if (appp->id == id) {
+			break;
+		}
+		appp = appp->succ;
+	}
+	unlock ();
+	info (appp);
+	return appp;
+} /* search_appl */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+appl_t * get_appl (appltab_t * tab, unsigned ix) {
+	appl_t *	appp = NULL;
+
+	assert (ix < tab->appl_count);
+	lock ();
+	if (ix < tab->appl_count) {
+		appp = tab->appl_root;
+		while (ix > 0) {
+			appp = appp->succ;
+			--ix;
+		}
+	}
+	unlock ();
+	return appp;
+} /* get_appl */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+appl_t * next_appl (appltab_t * tab, appl_t * appp) {
+
+	UNUSED_ARG (tab);
+	assert (appp);
+	return appp->succ;
+} /* next_appl */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+appl_t * first_appl (appltab_t * tab) {
+
+	return tab->appl_root;
+} /* first_appl */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int handle_message (queue_t * q, appl_t * appp, struct sk_buff * msg) {
+	int ok;
+
+	UNUSED_ARG (appp);
+	assert (q != NULL);
+	assert (msg != NULL);
+	if (!(ok = queue_put (q, msg))) {
+		lprintf (KERN_ERR, "Message queue overflow. Message lost...\n");
+		KFREE_SKB (msg);
+	}
+	return ok;
+} /* handle_message */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+ncci_t * create_ncci (	
+	appltab_t *		tab, 
+	appl_t *		appp, 
+	NCCI_t			ncci, 
+	unsigned		wsize, 
+	unsigned		bsize
+) {
+	ncci_t *		tmp;
+	unsigned char **	data;
+
+	UNUSED_ARG (tab);
+#if defined (LOG_NCCI)
+	log ("Creating new NCCI 0x%08x\n", ncci);
+#endif
+	if (NULL == (tmp = (ncci_t *) hmalloc (sizeof (ncci_t)))) {
+		lprintf (KERN_ERR, "Failed to allocate NCCI record.\n");
+		return NULL;
+	}
+	data = (unsigned char **) hcalloc (sizeof (unsigned char *) 
+							* appp->blk_count);
+	if (NULL == data) {
+		lprintf (KERN_ERR, "Failed to allocate data buffer directory.\n");
+		hfree (tmp);
+		return NULL;
+	}
+	tmp->ncci     = ncci;
+	tmp->appl     = appp->id;
+	tmp->win_size = wsize;
+	tmp->blk_size = bsize;
+	tmp->data     = data;
+	tmp->pred     = NULL;
+	lock ();
+	tmp->succ     = appp->root;
+	appp->root    = tmp;
+	if (NULL != tmp->succ) {
+		tmp->succ->pred = tmp;
+	}
+	appp->nncci++;
+	unlock ();
+	return tmp;
+} /* create_ncci */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void remove_ncci (appltab_t * tab, appl_t * appp, ncci_t * nccip) {
+	unsigned	i;
+
+	UNUSED_ARG (tab);
+	assert (appp);
+	assert (nccip);
+	if (nccip != NULL) {
+#if defined (LOG_NCCI)
+	log ("Removing NCCI 0x%08x\n", nccip->ncci);
+#endif
+		lock ();
+		for (i = 0; i < appp->blk_count; i++) {
+			if (nccip->data[i] != NULL) {
+				hfree (nccip->data[i]);
+			}
+		}
+		hfree (nccip->data);
+		if (nccip->succ != NULL) {
+			nccip->succ->pred = nccip->pred;
+		}
+		if (nccip->pred != NULL) {
+			nccip->pred->succ = nccip->succ;
+		} else {
+			appp->root = nccip->succ;
+		}
+		hfree (nccip);
+		appp->nncci--;
+		unlock ();
+	}
+} /* remove_ncci */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+unsigned char * ncci_data_buffer (
+	appltab_t *	tab,
+	appl_t *	appp,
+	NCCI_t		ncci,
+	unsigned	index
+) {
+	ncci_t *	nccip;
+
+        UNUSED_ARG (tab);
+        if (NULL == (nccip = locate_ncci (appp, ncci))) {
+                log ("Data buffer request failed. NCCI not found.\n");
+                return NULL;
+        }
+        lock ();
+        if (index >= appp->blk_count) {
+                unlock ();
+                log ("Data buffer index out of range.\n");
+                return NULL;
+        }
+        if (nccip->data[index] == NULL) {
+                if (NULL == (nccip->data[index] = (unsigned char *) hmalloc (appp->blk_size))) {
+                        lprintf (KERN_ERR, "Not enough memory for data buffer.\n");
+                }
+        }
+        unlock ();
+        return nccip->data[index];
+} /* ncci_data_buffer */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+ncci_t * locate_ncci (appl_t * appp, NCCI_t ncci) {
+	ncci_t *	tmp;
+
+	assert (appp);
+	lock ();
+	tmp = appp->root;
+	while ((tmp != NULL) && (tmp->ncci != ncci)) {
+		tmp = tmp->succ;
+	}
+	unlock ();
+#if defined (LOG_NCCI)
+	if (tmp == NULL) {
+		log ("Failed to find NCCI 0x%08x\n", ncci);
+	}
+#endif
+	info (tmp);
+	return tmp;
+} /* locate_ncci */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/tables.h linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/tables.h
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/tables.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/tables.h	2004-08-13 00:00:00.000000000 +0200
@@ -0,0 +1,101 @@
+/* 
+ * tables.h
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#ifndef __have_tables_h__
+#define __have_tables_h__
+
+#include <asm/types.h>
+#include <linux/skbuff.h>
+#include <linux/capi.h>
+#include "queue.h"
+#include "capilli.h"
+
+typedef struct __ncci {
+
+	NCCI_t			ncci;
+	unsigned		appl;
+	unsigned		win_size;
+	unsigned		blk_size;
+	unsigned char **	data;
+	struct __ncci *		pred;
+	struct __ncci *		succ;
+} ncci_t;
+
+typedef struct __appl {
+
+	unsigned		id;
+	unsigned		dying;
+	void *			data;
+	unsigned		attr;
+	unsigned		blk_size;
+	unsigned		blk_count;
+	unsigned		ncci_count;
+	unsigned		nncci;
+	ncci_t *		root;
+	struct __appl *		pred;
+	struct __appl *		succ;
+} appl_t;
+
+typedef struct __appltab {
+
+	appl_t *		appl_root;
+	unsigned		appl_count;
+} appltab_t;
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern void table_init (appltab_t ** tab);
+extern void table_exit (appltab_t ** tab);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern appl_t * create_appl (appltab_t * tab, 
+			     unsigned    id, 
+			     unsigned    ncount, 
+			     unsigned    bcount, 
+			     unsigned    bsize);
+extern void remove_appl (appltab_t * tab, appl_t * appp);
+
+extern appl_t * search_appl (appltab_t * tab, unsigned id);
+extern appl_t * get_appl (appltab_t * tab, unsigned ix);
+extern appl_t * first_appl (appltab_t * tab);
+extern appl_t * next_appl (appltab_t * tab, appl_t * appp);
+
+extern int handle_message (queue_t * q, appl_t * appp, struct sk_buff * msg);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern ncci_t * create_ncci (appltab_t * tab, 
+			     appl_t *    appl, 
+			     NCCI_t      ncci, 
+			     unsigned    wsize, 
+			     unsigned    bsize);
+extern void remove_ncci (appltab_t * tab, appl_t * appp, ncci_t * nccip);
+
+extern unsigned char * ncci_data_buffer (appltab_t * tab,
+					 appl_t *    appl,
+					 NCCI_t      ncci,
+					 unsigned    index);
+
+extern ncci_t * locate_ncci (appl_t * appp, NCCI_t ncci);
+
+#endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/tools.c linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/tools.c
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/tools.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/tools.c	2004-08-13 00:00:00.000000000 +0200
@@ -0,0 +1,574 @@
+/* 
+ * tools.c
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <linux/vmalloc.h>
+#include <linux/kernel.h>
+#include "defs.h"
+#include "tools.h"
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+struct __q {
+
+	unsigned	head, tail, mask;
+	unsigned	size, free;
+	unsigned	bnum, blen;
+	void **		item;
+	char *		bptr;
+} ;
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+typedef struct __header {
+
+	unsigned	type;
+#if !defined (NDEBUG)
+	unsigned	size;
+	unsigned	from;
+	unsigned	tag;
+#endif
+} header_t;
+
+#define	TYPE_NONE	'?'
+#define TYPE_KMALLOCED	'k'
+#define	TYPE_VMALLOCED	'v'
+#define KMALLOC_LIMIT	131072
+
+static nomem_handler_t	handler		= NULL;
+
+#if !defined (NDEBUG)
+#include <asm/atomic.h>
+
+#define	FENCE_TAG	0xDEADBEEF
+#define	FENCE1_OK(h,m)	((h)->tag==FENCE_TAG)
+#define	FENCE2_OK(h,m)	(*(unsigned *)(((char *) m)+(h)->size)==FENCE_TAG)
+
+static atomic_t		alloc_count	= ATOMIC_INIT (0);
+
+#if !defined (NDEBUG) && defined (LOG_TIMER)
+static struct timeval	zero_time;
+#endif
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+unsigned hallocated (void) {
+    
+	return atomic_read (&alloc_count);
+} /* hallocated */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+unsigned hallocator (void * mem) {
+	header_t * hdr;
+
+	if (mem != NULL) {
+		hdr = ((header_t *) mem) - 1;
+		return FENCE1_OK(hdr, mem) ? 0 : hdr->from;
+	} else {
+		return 0;
+	}
+} /* hallocator */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int hvalid (void * mem) {
+	header_t *	hdr;
+	int		flag = TRUE;
+
+	if (mem != NULL) {
+		hdr  = ((header_t *) mem) - 1;
+		flag = FENCE1_OK(hdr, mem) && FENCE2_OK(hdr, mem);
+	} 
+	return flag;
+} /* hvalid */
+#endif
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void * ALLOCATE (unsigned n, unsigned * t, int p) {
+	void *		temp;
+	unsigned	type;
+
+	if (n <= KMALLOC_LIMIT) {
+		temp = kmalloc (n, p);
+		type = TYPE_KMALLOCED;
+	} else {
+		temp = vmalloc (n);
+		type = TYPE_VMALLOCED;
+	}
+	*t = (temp != NULL) ? type : TYPE_NONE;
+	return temp;
+} /* ALLOCATE */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#if !defined (NDEBUG)
+#define	PATCH(n)	sizeof(header_t)+sizeof(unsigned)+((n)?(n):1)
+#else
+#define	PATCH(n)	sizeof(header_t)+((n)?(n):1)
+#endif
+
+static void * halloc (unsigned size, unsigned addr, int prio) {
+	unsigned	n, t = TYPE_NONE;
+	void *		mem;
+	header_t *	hdr;
+
+	n = PATCH(size);
+	if (NULL == (hdr = (header_t *) ALLOCATE (n, &t, prio))) {
+		log ("Memory request (%u/%u bytes) failed.\n", size, n);
+		mem = NULL;
+		if (handler != NULL) {
+			(*handler) (size);
+		}
+	} else {
+		mem = (void *) (hdr + 1);
+		hdr->type = t;
+#if !defined (NDEBUG)
+		hdr->size = size ? size : 1;
+		hdr->from = addr;
+		hdr->tag  = FENCE_TAG;
+		* (unsigned *) (((char *) mem) + size) = FENCE_TAG;
+		atomic_add (hdr->size, &alloc_count);
+#if defined (LOG_ALLOC)
+		log (
+			"malloc (%u[%u,%c]) = %p @ %08x\n", 
+			hdr->size, 
+			n, 
+			hdr->type, 
+			mem, 
+			hdr->from
+		);
+#endif
+#else
+		UNUSED_ARG (addr);
+#endif
+	}
+	return mem;
+} /* halloc */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void * hmalloc (unsigned size) {
+
+	return halloc (size, *(((unsigned *) &size) - 1), GFP_ATOMIC);
+} /* hmalloc */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void * hcalloc (unsigned size) {
+	void * mem;
+
+	mem = halloc (size, *(((unsigned *) &size) - 1), GFP_ATOMIC);
+	if ((mem != NULL) && (size != 0)) {
+		memset (mem, 0, size);
+	}
+	return mem;
+} /* hcalloc */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void * hmalloc_kernel (unsigned size) {
+
+	return halloc (size, *(((unsigned *) &size) - 1), GFP_KERNEL);
+} /* hmalloc */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void * hcalloc_kernel (unsigned size) {
+	void * mem;
+
+	mem = halloc (size, *(((unsigned *) &size) - 1), GFP_KERNEL);
+	if ((mem != NULL) && (size != 0)) {
+		memset (mem, 0, size);
+	}
+	return mem;
+} /* hcalloc */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void hfree (void * mem) {
+	header_t *	hdr;
+
+	if (mem != NULL) {
+		hdr = ((header_t *) mem) - 1;
+#if !defined (NDEBUG)
+		if (!(FENCE1_OK(hdr, mem) && FENCE2_OK(hdr, mem))) {
+			log (
+				"FENCE VIOLATED (%u/0x%08X)!\n", 
+				hdr->size, 
+				hdr->from
+			);
+			return; /* Oops. */
+		} 
+		atomic_sub (hdr->size, &alloc_count);
+#if defined (LOG_ALLOC)
+		log (
+			"free (%p), %u bytes, alloc @ %08x\n",
+			mem,
+			hdr->size,
+			hdr->from
+		);
+#endif
+#endif
+		assert ((hdr->type == TYPE_KMALLOCED) || (hdr->type == TYPE_VMALLOCED));
+		switch (hdr->type) {
+		
+		case TYPE_KMALLOCED: 
+			kfree (hdr);
+			break;
+		case TYPE_VMALLOCED: 
+			vfree (hdr);
+			break;
+		default:
+			log ("Could not free memory @ %p.\n", mem);
+		}
+	}
+} /* hfree */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+nomem_handler_t hset_handler (nomem_handler_t hndf) {
+	nomem_handler_t	oldf = handler;
+	
+	handler = hndf;
+	return oldf;
+} /* hset_handler */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+
+#if !defined (NDEBUG) && defined (LOG_TIMER)
+
+#include <linux/time.h>
+
+void setup_timer (dbg_timer * t, long dsec, long dusec) {
+	
+	assert (t != NULL);
+	memset (&t->t, 0, sizeof (t->t));
+	t->d.tv_sec  = dsec;
+	t->d.tv_usec = dusec;
+} /* setup_timer */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int check_timer (dbg_timer * t) {
+	int		res = 1;
+	struct timeval	now;
+	struct timeval	delta;
+	
+	assert (t != NULL);
+	do_gettimeofday (&now);
+	timeval_less (now, zero_time, &delta);
+	now = delta;
+	timeval_less (now, t->t, &delta);
+	if ((delta.tv_sec > t->d.tv_sec) 
+	|| ((delta.tv_sec == t->d.tv_sec) && (delta.tv_usec > t->d.tv_usec))
+	) {
+		lprintf (
+			KERN_INFO, 
+			"Timer '%s' exceeded: %ld s, %ld µs\n", 
+			t->name,
+			delta.tv_sec,
+			delta.tv_usec
+		);
+		res = 0;
+	} 
+	return res;
+} /* check_timer */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int check_timer_cb (dbg_timer * t, void (* callback) (dbg_timer *, struct timeval *)) {
+	int		res = 1;
+	struct timeval	now;
+	struct timeval	delta;
+	
+	assert (t != NULL);
+	do_gettimeofday (&now);
+	timeval_less (now, zero_time, &delta);
+	now = delta;
+	timeval_less (now, t->t, &delta);
+	if ((delta.tv_sec > t->d.tv_sec) 
+	|| ((delta.tv_sec == t->d.tv_sec) && (delta.tv_usec > t->d.tv_usec))
+	) {
+		if (callback != NULL) {
+			(*callback) (t, &delta);
+		}
+		res = 0;
+	} 
+	return res;
+} /* check_timer_cb */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void touch_timer (dbg_timer * t) {
+	struct timeval	temp, delta;
+	
+	assert (t != NULL);
+	do_gettimeofday (&temp);
+	timeval_less (temp, zero_time, &delta);
+	t->t = delta;
+} /* touch_timer */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void start_watch (dbg_timer * w) {
+	struct timeval	temp, delta;
+	
+	assert (w != NULL);
+	do_gettimeofday (&temp);
+	timeval_less (temp, zero_time, &delta);
+	w->t = delta;
+} /* start_watch */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void stop_watch (dbg_timer * w) {
+	struct timeval	temp, delta;
+	
+	assert (w != NULL);
+	do_gettimeofday (&temp);
+	timeval_less (temp, zero_time, &delta);
+	temp = delta;
+	timeval_less (temp, w->t, &delta);
+	w->t = delta;
+} /* stop_watch */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int timers_start (void) {
+
+	do_gettimeofday (&zero_time);
+	return 1;
+} /* timers_start */
+     
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void timers_stop (void) {
+
+} /* timers_stop */
+
+#endif /* !NDEBUG && LOG_TIMER */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void vlprintf (const char * level, const char * fmt, va_list args) {
+	char line[__BUFSIZE];
+
+	VSNPRINTF (line, sizeof (line), fmt, args);
+	printk ("%s%s: %s", level, TARGET, line); 
+} /* vlprintf */
+ 
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void lprintf (const char * level, const char * fmt, ...) {
+	va_list args;
+
+	va_start (args, fmt);
+	vlprintf (level, fmt, args);
+	va_end (args);
+} /* lprintf */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+unsigned long atomic_xchg (volatile atomic_t * v, unsigned value) {
+
+	return __xchg (value, &v->counter, sizeof (unsigned));
+} /* atomic_xchg */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+ptr_queue_p q_make (unsigned max) {
+	ptr_queue_p	qp;
+	unsigned	mask = 1;
+	
+	if (NULL == (qp = (ptr_queue_p) hmalloc (sizeof (ptr_queue_t)))) {
+		return NULL;
+	}
+	if (NULL == (qp->item = (void **) hmalloc (max * sizeof (void *)))) {
+		hfree (qp);
+		return NULL;
+	}
+	qp->bptr = NULL;
+	while (mask < max) {
+		mask <<= 1;
+	}
+	assert (mask == max);
+	--mask;
+	qp->head = 0;
+	qp->tail = 0;
+	qp->mask = mask;
+	qp->size = max;
+	qp->free = max;
+	return qp;
+} /* q_make */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void q_remove (ptr_queue_p * qpp) {
+	ptr_queue_p	qp;
+	
+	assert (qpp != NULL);
+	qp = *qpp;
+	assert (qp != NULL);
+	assert (qp->item != NULL);
+	if (qp->bptr != NULL) {
+		hfree (qp->bptr);
+	}
+	hfree (qp->item);
+	hfree (qp);
+	*qpp = NULL;
+} /* q_remove */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void q_reset (ptr_queue_p qp) {
+
+	assert (qp != NULL);
+	qp->head = qp->tail = 0;
+	qp->free = qp->size;
+} /* q_reset */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int q_attach_mem (ptr_queue_p qp, unsigned n, unsigned len) {
+	void *		buf;
+
+	assert (qp != NULL);
+	assert (qp->bptr == 0);
+	assert ((n * len) != 0);
+	if (NULL == (buf = hmalloc (n * len))) {
+		return FALSE;
+	} 
+	qp->bnum = n;
+	qp->blen = len;
+	qp->bptr = buf;
+	return TRUE;
+} /* q_attach_mem */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int q_enqueue (ptr_queue_p qp, void * p) {
+
+	assert (qp != NULL);
+	if (qp->free == 0) {
+		return FALSE;
+	}
+	assert (qp->head < qp->size);
+	qp->item[qp->head++] = p;
+	qp->head &= qp->mask;
+	assert (qp->head < qp->size);
+	qp->free--;
+	return TRUE;
+} /* q_enqueue */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int q_enqueue_mem (ptr_queue_p qp, void * m, unsigned len) {
+	unsigned	ix;
+	char *		mp;
+	
+	assert (qp != NULL);
+	assert (qp->bptr != NULL);
+	assert (qp->blen >= len);
+	if (qp->free == 0) {
+		return FALSE;
+	}
+	assert (qp->head < qp->size);
+	ix = qp->head++;
+	qp->head &= qp->mask;
+	qp->item[ix] = mp = &qp->bptr[ix * len];
+	assert (mp != NULL);
+	memcpy (mp, m, len);
+	assert (qp->head < qp->size);
+	qp->free--;
+	return TRUE;
+} /* q_enqueue_mem */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int q_dequeue (ptr_queue_p qp, void ** pp) {
+
+	assert (qp != NULL);
+	if (qp->free == qp->size) {
+		return FALSE;
+	}
+	assert (qp->tail < qp->size);
+	assert (pp != NULL);
+	*pp = qp->item[qp->tail++];
+	qp->tail &= qp->mask;
+	assert (qp->tail < qp->size);
+	qp->free++;
+	return TRUE;
+} /* q_dequeue */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int q_peek (ptr_queue_p qp, void ** pp) {
+
+	assert (qp != NULL);
+	if (qp->free == qp->size) {
+		return FALSE;
+	}
+	assert (qp->tail < qp->size);
+	assert (pp != NULL);
+	*pp = qp->item[qp->tail];
+	return TRUE;
+} /* q_peek */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+unsigned q_get_count (ptr_queue_p qp) {
+
+	assert (qp != NULL);
+	return qp->size - qp->free;
+} /* q_get_count */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void memdump (const void * mem, unsigned len, unsigned start, const char * msg) {
+        unsigned        max, min, idx;
+        unsigned char * data = (unsigned char *) mem;
+        char            hex[50], chr[20];
+
+	lprintf (KERN_INFO, "Memory dump %s:\n", msg);
+        min = 0;
+        while (min < len) {
+                max = ((min + 16) > len ? len : min + 16);
+                idx = 0;
+                while ((min + idx) < max) {
+                        sprintf (hex + 3 * idx, "%02x ", *data);
+                        sprintf (chr + idx, "%c", ((' ' <= *data) &&
+                                        (*data <= '~')) ? *data : '.');
+                        ++idx;
+                        ++data;
+                }
+                while (idx < 16) {
+                        strcpy (hex + 3 * idx++, "   ");
+                }
+                lprintf (KERN_INFO, "%08x: %s  %s\n", min + start, hex, chr);
+                min = max;
+        }
+} /* memdump */
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/tools.h linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/tools.h
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-dsl/src.drv/tools.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-dsl/src.drv/tools.h	2004-08-13 00:00:00.000000000 +0200
@@ -0,0 +1,201 @@
+/* 
+ * tools.h
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#ifndef __have_tools_h__
+#define __have_tools_h__
+
+#include <asm/io.h>
+#include <asm/atomic.h>
+#include <linux/types.h>
+#include <stdarg.h>
+#include "defs.h"
+
+#if defined (HERE)
+#undef HERE
+#endif
+
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,4,4)
+#define	VSNPRINTF(s,n,f,a)	vsnprintf (s, n, f, a)
+#define	SNPRINTF(s,n,f,l...)	snprintf (s, n, f, ##l)
+#define	__BUFSIZE		256
+#else
+#define	VSNPRINTF(s,n,f,a)	vsprintf (s, f, a)
+#define	SNPRINTF(s,n,f,l...)	sprintf (s, f, ##l)
+#define	__BUFSIZE		512
+#endif
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#define	MINB(addr)	readb(addr)
+#define	MINW(addr)	readw(addr)
+#define	MINL(addr)	readl(addr)
+#define	MOUTB(addr,v)	writeb((v),(addr))
+#define	MOUTW(addr,v)	writew((v),(addr))
+#define	MOUTL(addr,v)	writel((v),(addr))
+
+#define	PINB(addr)	inb(addr)
+#define	PINW(addr)	inw(addr)
+#define	PINL(addr)	inl(addr)
+#define	POUTB(addr,v)	outb((v),(addr))
+#define	POUTW(addr,v)	outw((v),(addr))
+#define	POUTL(addr,v)	outl((v),(addr))
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#ifndef NDEBUG
+# define assert(x)	(!(x)?lprintf(KERN_INFO,"%s(%d): assert (%s) " \
+				"failed\n", __FILE__, __LINE__, #x):((void)0))
+# define info(x)	(!(x)?lprintf(KERN_INFO,"%s(%d): info (%s) failed\n", \
+				__FILE__, __LINE__, #x):((void)0))
+# define log(f,x...)	lprintf(KERN_INFO, f, ##x)
+#else
+# define assert(x)
+# define info(x)
+# define log(f,x...)
+#endif
+
+#define error(f,x...)   lprintf(KERN_ERR, f, ##x)
+
+/*---------------------------------------------------------------------------*
+\*---------------------------------------------------------------------------*/
+extern void lprintf  (const char *, const char *, ...);
+extern void vlprintf (const char *, const char *, va_list);
+
+/*---------------------------------------------------------------------------*
+\*---------------------------------------------------------------------------*/
+extern unsigned long atomic_xchg (volatile atomic_t *, unsigned);
+
+/*---------------------------------------------------------------------------*
+\*---------------------------------------------------------------------------*/
+typedef void (* nomem_handler_t) (unsigned);
+
+#ifndef NDEBUG
+extern unsigned hallocated (void);
+extern unsigned hallocator (void * mem);
+extern int hvalid (void * mem);
+#endif
+
+/*---------------------------------------------------------------------------*
+\*---------------------------------------------------------------------------*/
+extern nomem_handler_t hset_handler (nomem_handler_t hndf);
+
+/*---------------------------------------------------------------------------*
+\*---------------------------------------------------------------------------*/
+extern void * hmalloc (unsigned);
+extern void * hcalloc (unsigned);
+extern void * hmalloc_kernel (unsigned);
+extern void * hcalloc_kernel (unsigned);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern void hfree (void *);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern void memdump (const void *, unsigned, unsigned, const char *);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#if !defined (NDEBUG) && defined (LOG_TIMER)
+
+#include <linux/time.h>
+
+typedef struct {
+
+	const char *	name;
+	struct timeval	t;
+	struct timeval	d;
+} dbg_timer;
+
+#define	PRINT_TIMER(x)		log ( \
+					"Timer '%s': %ld s, %ld µs\n", \
+					(x)->name, \
+					(x)->t.tv_sec, (x)->t.tv_usec \
+				)
+#define	PRINT_TIME_MSG(s,x)	log ( \
+					"%s: %ld s, %ld µs\n", \
+					s, (x)->t.tv_sec, (x)->t.tv_usec \
+				)
+
+#define	WATCH_DECL(id)		dbg_timer	id##_timer
+#define	WATCH_START(id)		start_watch (&id##_timer)
+#define	WATCH_STOP(id)		stop_watch (&id##_timer); \
+				PRINT_TIME_MSG(#id,&id##_timer)
+	
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern int	timers_start (void);
+extern void	timers_stop (void);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern void	setup_timer (dbg_timer *, long, long);
+extern int	check_timer (dbg_timer *);
+extern int	check_timer_cb (dbg_timer *, void (*) (dbg_timer *, struct timeval *));
+extern void	touch_timer (dbg_timer *);
+
+extern void	start_watch (dbg_timer *);
+extern void	stop_watch (dbg_timer *);
+#else
+#define	PRINT_TIMER(t)
+#define	WATCH_DECL(name)
+#define	WATCH_START(name)
+#define	WATCH_STOP(name)
+#endif
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+typedef struct __q ptr_queue_t, * ptr_queue_p;
+
+extern ptr_queue_p q_make (unsigned);
+extern void q_remove (ptr_queue_p *);
+extern void q_reset (ptr_queue_p);
+
+extern int q_attach_mem (ptr_queue_p, unsigned, unsigned);
+
+extern int q_dequeue (ptr_queue_p, void **);
+extern int q_peek (ptr_queue_p, void **);
+extern int q_enqueue (ptr_queue_p, void *);
+extern int q_enqueue_mem (ptr_queue_p, void *, unsigned);
+
+extern unsigned q_get_count (ptr_queue_p);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#ifdef NEED_MEM_STR_PROTOS
+
+extern void * memcpy (void * d, const void * s, size_t n);
+extern void * memmove (void * d, const void * s, size_t n);
+extern void * memset (void * m, int x, size_t c);
+
+extern int memcmp (const void * s1, const void * s2, size_t n);
+
+extern char * strcpy (char * d, const char * s);
+extern char * strncpy (char * d, const char * s, unsigned n);
+extern char * strcat (char * d, const char * s);
+extern int strcmp (const char * s1, const char * s2);
+extern int strncmp (const char * s1, const char * s2, unsigned n);
+
+extern size_t strlen (const char * s);
+
+#endif
+#endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/make.card linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/make.card
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/make.card	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/make.card	2003-07-08 00:02:00.000000000 +0200
@@ -0,0 +1,2 @@
+CARD=fcpci
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/makefile linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/makefile
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/makefile	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/makefile	2003-07-08 00:02:00.000000000 +0200
@@ -0,0 +1,12 @@
+include make.card
+
+.PHONY: all clean install
+
+all:	drv
+
+clean:	; (cd src.drv; make clean CARD=$(CARD))
+
+install: ; (cd src.drv; make install CARD=$(CARD))
+
+drv: ;	(cd src.drv; make CARD=$(CARD))
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/ca.h linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/ca.h
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/ca.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/ca.h	2003-07-08 00:02:00.000000000 +0200
@@ -0,0 +1,114 @@
+/* 
+ * ca.h
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#ifndef __have_ca_h__
+#define __have_ca_h__
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void CA_INIT (unsigned Len, void (* Register) (void *adata, unsigned ApplId),
+                            void (* Release) (void * adata),
+                            void (* Down) (void));
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+char *CA_PARAMS (void);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int CA_GET_MESSAGE (unsigned char *Msg);
+void CA_PUT_MESSAGE (unsigned char *Msg);
+
+unsigned char *CA_NEW_DATA_B3_IND (unsigned ApplId, unsigned long NCCI, 
+                                                              unsigned Index);
+void CA_FREE_DATA_B3_REQ (unsigned ApplId, unsigned char *data);
+
+int CA_NEW_NCCI (unsigned ApplId, unsigned long NCCI, unsigned WindowSize, 
+                                                          unsigned BlockSize);
+void CA_FREE_NCCI (unsigned ApplId, unsigned long NCCI);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void *CA_MALLOC (unsigned);
+void CA_FREE (void *p);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#define MSEC_PER_SEC 1000l
+
+unsigned long CA_MSEC (void);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+unsigned CA_KARTE (void);
+unsigned CA_BLOCKSIZE (unsigned ApplId);
+unsigned CA_WINDOWSIZE (unsigned ApplId);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+typedef struct {
+
+    unsigned  Nr;
+    char     *Buffer;
+} __ApplsFirstNext, *_ApplsFirstNext;
+
+void *CA_APPLDATA (unsigned ApplId);
+_ApplsFirstNext CA_APPLDATA_FIRST (_ApplsFirstNext s);
+_ApplsFirstNext CA_APPLDATA_NEXT (_ApplsFirstNext s);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+typedef enum {
+    CA_TIMER_END     = 0,
+    CA_TIMER_RESTART = 1
+} CA_RESTARTTIMER;
+
+int CA_TIMER_NEW (unsigned nTimers);
+void CA_TIMER_DELETE (void);
+
+int CA_TIMER_START (unsigned          index,
+                    unsigned long     TimeoutValue,
+                    unsigned long     param,
+                    CA_RESTARTTIMER (*f)(unsigned long param));
+int CA_TIMER_STOP (unsigned index);
+
+void CA_TIMER_POLL (void);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void CA_PRINTF (char *s, ...);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#if !defined (NDEBUG)
+
+void CA_PUTS (char *);
+void CA_PUTI (int);
+void CA_PUTL (long);
+void CA_PUTC (char);
+void CA_PUTNL (void);
+
+#endif
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/capilli.h linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/capilli.h
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/capilli.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/capilli.h	2003-07-08 00:02:00.000000000 +0200
@@ -0,0 +1,132 @@
+/* 
+ * capilli.h
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+/*
+ * $Id: capilli.h,v 1.4 1999/07/23 08:51:05 calle Exp $
+ * 
+ * Kernel CAPI 2.0 Driver Interface for Linux
+ * 
+ * (c) Copyright 1999 by Carsten Paeth (calle@calle.in-berlin.de)
+ * 
+ */
+#ifndef __CAPILLI_H__
+#define __CAPILLI_H__
+
+typedef struct capiloaddatapart {
+	int user;		/* data in userspace ? */
+	int len;
+	unsigned char *data;
+} capiloaddatapart;
+
+typedef struct capiloaddata {
+	capiloaddatapart firmware;
+	capiloaddatapart configuration;
+} capiloaddata;
+
+typedef struct capicardparams {
+	unsigned int port;
+	unsigned irq;
+	int cardtype;
+	int cardnr;
+	unsigned int membase;
+} capicardparams;
+
+struct capi_driver;
+
+struct capi_ctr {
+        struct capi_ctr *next;			/* next ctr of same driver */
+        struct capi_driver *driver;
+	int cnr;				/* controller number */
+	char name[32];				/* name of controller */
+	volatile unsigned short cardstate;	/* controller state */
+	volatile int blocked;			/* output blocked */
+	int traceflag;				/* capi trace */
+
+	void *driverdata;			/* driver specific */
+
+	/* filled before calling ready callback */
+	__u8 manu[CAPI_MANUFACTURER_LEN];	/* CAPI_GET_MANUFACTURER */
+	capi_version version;			/* CAPI_GET_VERSION */
+	capi_profile profile;			/* CAPI_GET_PROFILE */
+	__u8 serial[CAPI_SERIAL_LEN];		/* CAPI_GET_SERIAL */
+
+	/* functions */
+        void (*ready)(struct capi_ctr * card);
+        void (*reseted)(struct capi_ctr * card);
+        void (*suspend_output)(struct capi_ctr * card);
+        void (*resume_output)(struct capi_ctr * card);
+        void (*handle_capimsg)(struct capi_ctr * card,
+			   	__u16 appl, struct sk_buff *skb);
+	void (*appl_registered)(struct capi_ctr * card, __u16 appl);
+	void (*appl_released)(struct capi_ctr * card, __u16 appl);
+
+        void (*new_ncci)(struct capi_ctr * card,
+			   	__u16 appl, __u32 ncci, __u32 winsize);
+        void (*free_ncci)(struct capi_ctr * card, __u16 appl, __u32 ncci);
+
+	/* management information for kcapi */
+
+	unsigned long nrecvctlpkt;
+	unsigned long nrecvdatapkt;
+	unsigned long nsentctlpkt;
+	unsigned long nsentdatapkt;
+
+	struct proc_dir_entry *procent;
+        char procfn[128];
+};
+
+struct capi_driver_interface {
+    struct capi_ctr *(*attach_ctr)(struct capi_driver *driver, char *name, void *data);
+    int (*detach_ctr)(struct capi_ctr *);
+};
+
+struct capi_driver {
+     char name[32];				/* driver name */
+     char revision[32];
+     int (*load_firmware)(struct capi_ctr *, capiloaddata *);
+     void (*reset_ctr)(struct capi_ctr *);
+     void (*remove_ctr)(struct capi_ctr *);
+     void (*register_appl)(struct capi_ctr *, __u16 appl,
+						capi_register_params *);
+     void (*release_appl)(struct capi_ctr *, __u16 appl);
+     void (*send_message)(struct capi_ctr *, struct sk_buff *skb);
+
+     char *(*procinfo)(struct capi_ctr *);
+     int (*ctr_read_proc)(char *page, char **start, off_t off,
+			       int count, int *eof, struct capi_ctr *card);
+     int (*driver_read_proc)(char *page, char **start, off_t off,
+		               int count, int *eof, struct capi_driver *driver);
+
+     int (*add_card)(struct capi_driver *driver, capicardparams *data);
+
+     /* intitialized by kcapi */
+     struct capi_ctr	*controller;		/* list of controllers */
+     struct capi_driver *next;
+     int ncontroller;
+     struct proc_dir_entry *procent;
+     char procfn[128];
+};
+
+struct capi_driver_interface *attach_capi_driver(struct capi_driver *driver);
+void detach_capi_driver(struct capi_driver *driver);
+
+#endif				/* __CAPILLI_H__ */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/defs.h linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/defs.h
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/defs.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/defs.h	2004-09-05 18:12:51.000000000 +0200
@@ -0,0 +1,89 @@
+/* 
+ * defs.h
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#ifndef __have_defs_h__
+#define __have_defs_h__
+
+#ifndef LINUX_VERSION_CODE
+# include <linux/version.h>
+#endif
+
+#ifndef TRUE
+# define TRUE		(1==1)
+# define FALSE		(1==0)
+#endif
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#if defined (__fcclassic__)
+# define PRODUCT_LOGO	"AVM FRITZ!Card Classic"
+# define INTERFACE	"isa"
+#elif defined (__fcpnp__)
+# define PRODUCT_LOGO	"AVM FRITZ!Card PnP"
+# define INTERFACE	"pnp"
+#elif defined (__fcpcmcia__)
+# define PRODUCT_LOGO	"AVM FRITZ!Card PCMCIA"
+# define INTERFACE	"pcmcia"
+#elif defined (__fcpci__)
+# define PRODUCT_LOGO	"AVM FRITZ!Card PCI"
+# define INTERFACE	"pci"
+#endif
+#define DRIVER_LOGO	PRODUCT_LOGO " driver"
+#define SHORT_LOGO	"fritz-" INTERFACE
+
+#define	REV_DEFAULT	"0.5.2"
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#if defined (OSDEBUG) && defined (NDEBUG)
+# undef NDEBUG
+#endif
+
+#define	UNUSED_ARG(x)	(x)=(x)
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#define	KB			1024
+#define	MIN_LIB_HEAP_SIZE	(64 * KB)
+#define	MAX_LIB_HEAP_SIZE	(600 * KB)
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 3, 13)
+# define GET_PCI_BASE(d, r)	(d)->base_address[r]
+#else
+# define GET_PCI_BASE(d, r)	(d)->resource[r].start
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 3, 43)
+# define KFREE_SKB(x)	dev_kfree_skb(x)
+#else
+# include <linux/netdevice.h>
+# define KFREE_SKB(x)	dev_kfree_skb_any(x)
+#endif
+
+#if defined (CONFIG_ISAPNP_MODULE) && !defined (CONFIG_ISAPNP)
+#define CONFIG_ISAPNP
+#endif
+
+#endif
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/driver.c linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/driver.c
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/driver.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/driver.c	2003-07-08 00:02:00.000000000 +0200
@@ -0,0 +1,1323 @@
+/* 
+ * driver.c
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/atomic.h>
+#include <asm/system.h>
+#include <linux/version.h>
+#include <linux/ioport.h>
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+#include <linux/tqueue.h>
+#include <linux/skbuff.h>
+#include <linux/kernel.h>
+#include <linux/smp.h>
+#include <linux/ctype.h>
+#include <linux/string.h>
+#include <linux/capi.h>
+#include <linux/kernelcapi.h>
+#include <stdarg.h>
+#include "ca.h"
+#include "capilli.h"
+#include "main.h"
+#include "tables.h"
+#include "queue.h"
+#include "tools.h"
+#include "defs.h"
+#include "lib.h"
+#include "driver.h"
+
+#if defined (LOG_MESSAGES)
+# define mlog		log
+#else
+# define mlog(f, a...)	
+#endif
+
+#define	__entry
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
+#error This module depends on tasklets (introduced with kernel 2.4)!
+#endif
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#if defined (__fcclassic__) 
+# define	IO_RANGE		32
+#elif defined (__fcpcmcia__)
+# define	CARD_ID			1
+# define	ID_OFFSET		6
+# define	IO_RANGE		8
+#elif defined (__fcpnp__)
+# include <linux/isapnp.h>
+
+# define	AVM_VENDOR_ID		ISAPNP_VENDOR('A','V','M')
+# define	AVM_DEVICE_ID		ISAPNP_DEVICE(0x0900)
+# define	PNP_NO_CARD		2
+# define	PNP_ERROR		1
+# define	PNP_OK			0
+# define	CARD_ID			9
+# define	ID_OFFSET		0
+# define	IO_RANGE		32
+#elif defined (__fcpci__)
+# include <linux/pci.h>
+
+# define	AVM_VENDOR_ID		0x1244
+# define	AVM_DEVICE_ID		0x0A00
+# define	AVM_DEVICE_ID2		0x0E00
+# define	PCI_NO_PCI_KERN		3
+# define	PCI_NO_CARD		2
+# define	PCI_NO_PCI		1
+# define	PCI_OK			0
+# define	CARD_ID			10
+# define	CARD_ID2		14
+# define	ID_OFFSET		0
+# define	IO_RANGE		32
+#else
+# error You must define a card identifier...
+#endif
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+card_t *			capi_card		= NULL;
+lib_callback_t *		capi_lib		= NULL;
+
+static int			irq;
+static atomic_t			timer_irq_enabled	= ATOMIC_INIT (0);
+static atomic_t			dont_sched		= ATOMIC_INIT (1);
+static atomic_t			crit_level		= ATOMIC_INIT (0);
+static atomic_t			event_pending		= ATOMIC_INIT (0);
+static atomic_t			scheduler_enabled	= ATOMIC_INIT (0);
+static atomic_t			scheduler_id		= ATOMIC_INIT (-1);
+struct capi_driver_interface *	capi_driver		= NULL;
+struct capi_ctr *		capi_controller		= NULL;
+static spinlock_t		sched_lock		= SPIN_LOCK_UNLOCKED;
+static spinlock_t		qt_lock			= SPIN_LOCK_UNLOCKED;
+static unsigned long		qt_flags;
+#if !defined (__fcclassic__)
+static int			card_id			= 0;
+#endif
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void scheduler (unsigned long data);
+static void scheduler_control (unsigned);
+static void irq_handler (int irq, void * args, struct pt_regs * regs);
+static void check_events (void);
+
+static DECLARE_TASKLET_DISABLED (scheduler_tasklet, scheduler, 0);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+struct capi_driver		capi_interface		= {
+
+	TARGET,
+	REV_DEFAULT,			
+	load_ware,
+	reset_ctrl,
+	remove_ctrl,
+	register_appl,
+	release_appl,
+	send_msg,
+	proc_info,
+	ctr_info,
+	drv_info,
+	add_card,
+	NULL,
+	NULL,
+	0,
+	NULL,
+	""
+} ;
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static char *	invalid_msg   = "Invalid application id #%d.\n";
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static functions_t	cafuncs = {
+	
+	1,
+	scheduler_control,
+	NULL
+} ;
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static inline unsigned long atomic_xchg (
+	volatile atomic_t *	v, 
+	unsigned		value
+) {
+	return __xchg (value, &v->counter, sizeof (unsigned));
+} /* atomic_xchg */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static int nbchans (struct capi_ctr * ctrl) {
+	card_t *	card;
+	unsigned char *	prf;
+	int		temp = 2;
+    
+	assert (ctrl);
+	card = (card_t *) ctrl->driverdata;
+	prf = (unsigned char *) card->string[6];
+	if (prf != NULL) {
+		temp = prf[2] + 256 * prf[3];
+	}
+	return temp;
+} /* nbchans */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static struct sk_buff * make_0xfe_request (unsigned appl) {
+	unsigned char    request[8];
+	struct sk_buff * skb;
+
+	if (NULL == (skb = alloc_skb (8, GFP_ATOMIC))) {
+		lprintf (KERN_ERR, "Unable to allocate message buffer.\n");
+	} else {    
+		request[0] = 8;
+		request[1] = 0;
+		request[2] = appl & 0xFF;
+		request[3] = (appl >> 8) & 0xFF;
+		request[4] = 0xFE;
+		request[5] = 0x80;
+		memcpy (skb_put (skb, 8), &request, 8);
+	}
+	return skb;
+} /* make_0xfe_request */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void scan_version (card_t * card, const char * ver) {
+	int	vlen, i;
+	char *	vstr;
+
+	vlen = (unsigned char) ver[0];
+	card->version = vstr = (char *) hmalloc (vlen);
+	if (NULL == card->version) {
+		log ("Could not allocate version buffer.\n");
+		return;
+	}
+	memcpy (card->version, ver + 1, vlen);
+	i = 0;
+	for (i = 0; i < 8; i++) {
+		card->string[i] = vstr + 1;
+		vstr += 1 + *vstr;
+	} 
+#ifdef NDEBUG
+	lprintf (KERN_INFO, "Stack version %s\n", card->string[0]);
+#endif
+	log ("Library version:    %s\n", card->string[0]);
+	log ("Card type:          %s\n", card->string[1]);
+	log ("Capabilities:       %s\n", card->string[4]);
+	log ("D-channel protocol: %s\n", card->string[5]);
+} /* scan_version */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void copy_version (struct capi_ctr * ctrl) {
+	char *		tmp;
+	card_t *	card;
+
+	assert (ctrl);
+	card = (card_t *) ctrl->driverdata;
+	if (NULL == (tmp = card->string[3])) {
+		lprintf (KERN_ERR, "Do not have version information...\n");
+		return;
+	}
+	strncpy (ctrl->serial, tmp, CAPI_SERIAL_LEN);
+	memcpy (&ctrl->profile, card->string[6], sizeof (capi_profile));
+	strncpy (ctrl->manu, "AVM GmbH", CAPI_MANUFACTURER_LEN);
+	ctrl->version.majorversion = 2;
+	ctrl->version.minorversion = 0;
+	tmp = card->string[0];
+	ctrl->version.majormanuversion = (((tmp[0] - '0') & 15) << 4)
+					+ ((tmp[2] - '0') & 15);
+	ctrl->version.minormanuversion = ((tmp[3] - '0') << 4)
+					+ (tmp[5] - '0') * 10
+					+ ((tmp[6] - '0') & 15);
+} /* copy_version */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void kill_version (card_t * card) {
+	int	i;
+
+	for (i = 0; i < 8; i++) {
+		card->string[i] = NULL;
+	}
+	if (card->version != NULL) {
+		hfree (card->version);
+		card->version = NULL;
+	}
+} /* kill_version */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void pprintf (char * page, int * len, const char * fmt, ...) {
+	va_list args;
+
+	va_start (args, fmt);
+	*len += vsprintf (page + *len, fmt, args);
+	va_end (args);
+} /* pprintf */
+
+/*---------------------------------------------------------------------------*\
+\*-L-------------------------------------------------------------------------*/
+void lock (void) {
+	unsigned long	local_flags;
+	
+	spin_lock_irqsave (&qt_lock, local_flags);
+	qt_flags = local_flags;
+} /* lock */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void unlock (void) {
+	
+	spin_unlock_irqrestore (&qt_lock, qt_flags);
+} /* unlock */
+
+/*---------------------------------------------------------------------------*\
+\*-C-------------------------------------------------------------------------*/
+void enter_critical (void) {
+
+	disable_irq (capi_card->irq);
+	if (!atomic_read (&crit_level)) {
+		check_events ();
+	}
+	atomic_inc (&crit_level);
+} /* enter_critical */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void leave_critical (void) {
+	
+	assert (0 < atomic_read (&crit_level));
+	atomic_dec (&crit_level);
+	if (!atomic_read (&crit_level)) {
+		check_events ();
+	}
+	enable_irq (capi_card->irq);
+} /* leave_critical */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static inline int in_critical (void) {
+	
+	return (atomic_read (&crit_level) > 0);
+} /* in_critical */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#if defined (__fcpci__)
+static int find_card (unsigned * base, unsigned * irq) {
+# ifndef CONFIG_PCI
+	return PCI_NO_PCI_KERN;
+# else
+	struct pci_dev * dev = NULL;
+	if (!pci_present ()) {
+		return PCI_NO_PCI;
+	}
+	dev = pci_find_device (AVM_VENDOR_ID, AVM_DEVICE_ID, dev);
+	if (NULL == dev) {
+		dev = pci_find_device (AVM_VENDOR_ID, AVM_DEVICE_ID2, dev);
+		if (NULL == dev) {
+			return PCI_NO_CARD;
+		}
+	}
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 3, 0)
+	if (0 != pci_enable_device (dev)) {
+		return PCI_NO_CARD;
+	}
+# endif
+	*irq  = dev->irq;
+	*base = GET_PCI_BASE (dev, 1) & PCI_BASE_ADDRESS_IO_MASK;
+	log ("PCI: dev %04x, irq %d, base %04x\n", dev->device, *irq, *base);
+	return PCI_OK;
+# endif
+} /* find_card */
+#endif
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#if defined (__fcpnp__) && defined (CONFIG_ISAPNP)
+static int find_card (unsigned * base, unsigned * irq, struct pci_dev ** d) {
+	struct pci_dev * dev = NULL;
+
+	dev = isapnp_find_dev (NULL, AVM_VENDOR_ID, AVM_DEVICE_ID, dev);
+	if (NULL == dev) {
+		return PNP_NO_CARD;
+	} else {
+		if (dev->active) {
+			lprintf (KERN_ERR, "PnP device is already in use.\n");
+			return PNP_ERROR;
+		}
+		if ((*dev->prepare) (dev) < 0) {
+			lprintf (KERN_ERR, "PnP device preparation failed.\n");
+			return PNP_ERROR;
+		}
+		if ((*dev->activate) (dev) < 0) {
+			lprintf (KERN_ERR, "PnP device activation failed.\n");
+			return PNP_ERROR;
+		}
+		*base = dev->resource[0].start;
+		*irq  = dev->irq_resource[0].start;
+ 		*d    = dev;
+		return PNP_OK;
+	}
+} /* find_card */
+#endif
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static inline void enable_scheduler (void) {
+
+	log ("Enabling scheduler...\n");
+	tasklet_enable (&scheduler_tasklet);
+	atomic_set (&scheduler_enabled, 1);
+} /* enable_scheduler */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static inline void disable_scheduler (void) {
+
+	log ("Disabling scheduler...\n");
+	atomic_set (&scheduler_enabled, 0);
+	tasklet_disable (&scheduler_tasklet);
+} /* disable_scheduler */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void kick_scheduler (void) {
+
+	assert (atomic_read (&scheduler_enabled));
+	if (atomic_dec_and_test (&dont_sched)) {
+		tasklet_schedule (&scheduler_tasklet);
+	} else {
+		atomic_set (&dont_sched, 0);
+	}
+} /* kick_scheduler */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/ 
+int install_card (card_t * card) {
+	int result = 4711;
+
+	assert (card);
+#if !defined (__fcpcmcia__)
+	request_region (card->base, IO_RANGE, TARGET);
+	log (
+		"I/O range 0x%04x-0x%04x assigned to " TARGET " driver.\n",
+		card->base, 
+		card->base + IO_RANGE - 1
+	);
+#endif
+#if !defined (__fcclassic__) 
+	card_id = inb (card->base + ID_OFFSET);
+#if defined (__fcpci__)
+	if ((CARD_ID != card_id) && (CARD_ID2 != card_id)) 
+#else
+	if (CARD_ID != card_id) 
+#endif
+	{
+		release_region (card->base, IO_RANGE);
+		lprintf (KERN_ERR, "Card identification test failed.\n");
+		return FALSE;
+	}
+#endif
+	card->data = (unsigned) &irq_handler;
+	irq = card->irq;
+	tasklet_init (&scheduler_tasklet, scheduler, 0);
+	disable_scheduler ();
+	result = request_irq (
+			card->irq, 
+			&irq_handler, 
+#if defined (__fcpci__) && defined (SHARED_IRQ)
+			SA_INTERRUPT | SA_SHIRQ, 
+#else
+			SA_INTERRUPT, 
+#endif
+			TARGET, 
+			card
+			);
+	if (result) {
+		release_region (card->base, IO_RANGE);
+		lprintf (KERN_ERR, "Could not install irq handler.\n");
+		return FALSE;
+	} else {
+		log ("IRQ #%d assigned to " TARGET " driver.\n", card->irq);
+	}
+	return TRUE;
+} /* install_card */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void remove_card (card_t * card) {
+
+	log ("Releasing IRQ #%d...\n", card->irq);
+	free_irq (card->irq, card);
+	log (
+		"Releasing I/O range 0x%04x-0x%04x...\n", 
+		card->base, 
+		card->base + IO_RANGE - 1
+	);
+#if !defined (__fcpcmcia__)
+	release_region (card->base, IO_RANGE);
+#endif
+#if defined (__fcpnp__) && defined (CONFIG_ISAPNP)
+	(*card->dev->deactivate) (card->dev);
+#endif
+} /* remove_card */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static int start (card_t * card) {
+	char * version;
+
+	card->count = 0;
+	table_init (&card->appls);
+	queue_init (&card->queue);
+	(*capi_lib->cm_register_ca_functions) (&cafuncs);
+	(*capi_lib->cm_start) ();
+	version = (*capi_lib->cm_init) (card->base, card->irq);
+	scan_version (card, version);
+	if (!install_card (card)) {
+		(*capi_lib->cm_exit) ();
+		return FALSE;
+	}
+	disable_irq (card->irq);
+	if ((*capi_lib->cm_activate) ()) {
+		log ("Activate failed.\n");
+		remove_card (card);
+		return FALSE;
+	}
+	(*capi_lib->cm_handle_events) ();
+	enable_irq (card->irq);
+	enable_scheduler ();
+	kick_scheduler ();
+	return TRUE; 
+} /* start */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void stop (card_t * card) {
+
+	disable_scheduler ();
+	log ("Killing scheduler...\n");
+	tasklet_kill (&scheduler_tasklet);
+	(*capi_lib->cm_exit) ();
+	remove_card (card);
+	queue_exit (&card->queue);
+	table_exit (&card->appls);
+	kill_version (card);
+} /* stop */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int __entry load_ware (struct capi_ctr * ctrl, capiloaddata * ware) {
+
+	UNUSED_ARG (ctrl);
+	UNUSED_ARG (ware);
+	lprintf (KERN_ERR, "No firmware required!\n");
+	return -EIO;
+} /* load_ware */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void __entry reset_ctrl (struct capi_ctr * ctrl) {
+	card_t *	card;
+	appl_t *	appp;
+
+	assert (ctrl);
+	card = (card_t *) ctrl->driverdata;
+	if (0 != card->count) {
+		lprintf (KERN_INFO, "Removing registered applications!\n");
+		info (card->appls);
+		if (card->appls != NULL) {
+			appp = first_appl (card->appls);
+			while (appp != NULL) {
+				free_ncci (appp->id, (unsigned) -1);
+				appp = next_appl (card->appls, appp);
+			}
+		}
+	}
+	stop (card);
+	(*ctrl->reseted) (ctrl);
+} /* reset_ctrl */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int __entry add_card (struct capi_driver * drv, capicardparams * args) {
+	card_t *	card;
+
+	UNUSED_ARG (drv);
+	if (NULL != capi_controller) {
+		lprintf (KERN_ERR, "Cannot handle two controllers!\n");
+ 		return -EBUSY;
+	}
+	if (NULL == (card = (card_t *) hmalloc (sizeof (card_t)))) {
+		lprintf (KERN_ERR, "Card object allocation failed.\n");
+		return -EIO;
+	}
+	capi_card = card;
+	
+	/*-------------------------------------------------------------------*\
+	 * Card-dependent handling of I/O and IRQ values...
+	\*-------------------------------------------------------------------*/
+
+#if defined (__fcclassic__) || defined (__fcpcmcia__)
+	card->base = args->port;
+	card->irq  = args->irq;
+#elif defined (__fcpnp__) 
+# if !defined (CONFIG_ISAPNP)
+	card->base = args->port;
+	card->irq  = args->irq;
+# else
+	UNUSED_ARG (args);
+	switch (find_card (&card->base, &card->irq, &card->dev)) {
+	
+	case PNP_OK:
+		break;
+	case PNP_ERROR:
+		return -ESRCH;
+	case PNP_NO_CARD:
+		lprintf (KERN_ERR, "Could not locate any FRITZ!Card PnP.\n");
+		return -ESRCH;
+	default:
+		lprintf (KERN_ERR, "Unknown PnP related problem...\n");
+		return -EINVAL;
+	}
+# endif
+#else
+	UNUSED_ARG (args);
+	switch (find_card (&card->base, &card->irq)) {
+        
+	case PCI_OK:
+		break;
+        case PCI_NO_PCI_KERN:
+		lprintf (KERN_ERR, "No PCI kernel support available.\n");
+		return -ESRCH;
+        case PCI_NO_CARD:
+		lprintf (KERN_ERR, "Could not locate any FRITZ!Card PCI.\n");
+		return -ESRCH;
+        case PCI_NO_PCI:
+		lprintf (KERN_ERR, "No PCI busses available.\n");
+		return -ESRCH;
+        default:
+		lprintf (KERN_ERR, "Unknown PCI related problem...\n");
+		return -EINVAL;
+	}
+#endif
+
+	if (!params_ok (card)) {
+		lprintf (
+			KERN_INFO, 
+			"Error: Invalid parameters (base=0x%04x, irq=%d)\n", 
+			card->base, 
+			card->irq
+		);
+		return -EINVAL;
+	}
+	inc_use_count ();
+	if (!start (card)) {
+		dec_use_count ();
+		lprintf (KERN_INFO, "Error: Initialization failed.\n");
+		return -EIO;
+	}
+	capi_controller = (*capi_driver->attach_ctr) 
+					(&capi_interface, SHORT_LOGO, NULL);
+	if (NULL == capi_controller) {
+		dec_use_count ();
+		stop (card);
+		lprintf (KERN_INFO, "Error: Could not attach controller.\n");
+		return -EBUSY;
+	}
+	capi_controller->driverdata = (void *) card;
+	copy_version (capi_controller);
+	(*capi_controller->ready) (capi_controller);
+	return 0;
+} /* add_card */ 
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void __entry remove_ctrl (struct capi_ctr * ctrl) {
+
+	UNUSED_ARG (ctrl);
+	assert (capi_controller != NULL);
+	(*capi_driver->detach_ctr) (capi_controller);
+	dec_use_count ();
+	ctrl->driverdata = NULL;
+	hfree (capi_card);
+	capi_controller = NULL;
+	capi_card       = NULL;
+} /* remove_ctrl */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void __entry register_appl (
+	struct capi_ctr *	ctrl, 
+	u16			appl, 
+	capi_register_params *	args
+) {
+	card_t *		card;
+	appl_t *		appp;
+	void *			ptr;
+	unsigned		nc;
+
+	mlog ("REGISTER(appl:%u)\n", appl);
+	assert (ctrl);
+	assert (args);
+	card = (card_t *) ctrl->driverdata;
+	if ((int) args->level3cnt < 0) {
+		nc = nbchans (ctrl) * -((int) args->level3cnt);
+	} else {
+		nc = args->level3cnt;
+	}
+	if (0 == nc) {
+		nc = nbchans (ctrl);
+	}
+	appp = create_appl (
+			card->appls, 
+			appl, 
+			nc, 
+			args->datablkcnt, 
+			args->datablklen
+			);
+	if (NULL == appp) {
+		log ("Unable to create application record.\n");
+		return;
+	}
+	ptr = hcalloc (card->length);
+	if (NULL == ptr) {
+		lprintf (KERN_ERR, "Not enough memory for application data.\n");
+		remove_appl (card->appls, appp);
+	} else {
+		inc_use_count ();
+		lock ();
+		card->count++;
+		appp->data = ptr;
+		appp->ctrl = ctrl;
+		unlock ();
+		(*card->reg_func) (ptr, appl);
+		(*ctrl->appl_registered) (ctrl, appl);
+	}
+} /* register_appl */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void __entry release_appl (struct capi_ctr * ctrl, u16 appl) {
+	card_t *		card;
+	struct sk_buff *	skb;
+	appl_t *		appp;
+
+	mlog ("RELEASE(appl:%u)\n", appl);
+	assert (ctrl);
+	card = (card_t *) ctrl->driverdata;
+	if (NULL == (appp = search_appl (card->appls, appl))) {
+		log ("Attempt to release unknown application (id #%u)\n", appl);
+		return;
+	}
+	skb = make_0xfe_request (appl);
+	handle_message (card->appls, appp, skb);
+	kick_scheduler ();
+	appp->dying = TRUE;
+} /* release_appl */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void __entry send_msg (struct capi_ctr * ctrl, struct sk_buff * skb) {
+	card_t *	card;
+	unsigned char *	byte;
+	unsigned	appl;
+	appl_t *	appp;
+
+	assert (ctrl);
+	assert (skb);
+	card = (card_t *) ctrl->driverdata;
+	byte = skb->data;
+	appl = byte[2] + 256 * byte[3];
+	appp = search_appl (card->appls, appl);
+	if ((NULL == appp) || appp->dying) {
+		log ("Message for unknown application (id %u).\n", appl);
+		return;
+	}
+	handle_message (card->appls, appp, skb);
+	kick_scheduler ();
+} /* send_msg */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+char * __entry proc_info (struct capi_ctr * ctrl) {
+	card_t *	card;
+	static char	text[80];
+
+	assert (ctrl);
+	card = (card_t *) ctrl->driverdata;
+	SNPRINTF (
+		text, 
+		sizeof (text),
+		"%s %s 0x%04x %u",
+		card->version ? card->string[1] : "A1",
+		card->version ? card->string[0] : "-",
+		card->base, card->irq
+	);
+	return text;
+} /* proc_info */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int __entry ctr_info (
+	char *			page, 
+	char **			start, 
+	off_t			ofs,
+	int			count, 
+	int *			eof,
+	struct capi_ctr *	ctrl
+) {
+	card_t *		card;
+	char *			temp;
+	unsigned char		flag;
+	int			len = 0;
+
+	assert (ctrl);
+	card = (card_t *) ctrl->driverdata;
+	pprintf (page, &len, "%-16s %s\n", "name", SHORT_LOGO);
+	pprintf (page, &len, "%-16s 0x%04x\n", "io", card->base);
+	pprintf (page, &len, "%-16s %d\n", "irq", card->irq);
+	temp = card->version ? card->string[1] : "A1";
+	pprintf (page, &len, "%-16s %s\n", "type", temp);
+	temp = card->version ? card->string[0] : "-";
+#if defined (__fcclassic__) || defined (__fcpcmcia__)
+	pprintf (page, &len, "%-16s 0x%04x\n", "revision", card->info);
+#elif defined (__fcpci__)
+	pprintf (page, &len, "%-16s %d\n", "class", card_id);
+#endif
+	pprintf (page, &len, "%-16s %s\n", "ver_driver", temp);
+	pprintf (page, &len, "%-16s %s\n", "ver_cardtype", SHORT_LOGO);
+
+	flag = ((unsigned char *) (ctrl->profile.manu))[3];
+	if (flag) {
+		pprintf(page, &len, "%-16s%s%s%s%s%s%s%s\n", "protocol",
+			(flag & 0x01) ? " DSS1" : "",
+			(flag & 0x02) ? " CT1" : "",
+			(flag & 0x04) ? " VN3" : "",
+			(flag & 0x08) ? " NI1" : "",
+			(flag & 0x10) ? " AUSTEL" : "",
+			(flag & 0x20) ? " ESS" : "",
+			(flag & 0x40) ? " 1TR6" : ""
+		);
+	}
+	flag = ((unsigned char *) (ctrl->profile.manu))[5];
+	if (flag) {
+		pprintf(page, &len, "%-16s%s%s%s%s\n", "linetype",
+			(flag & 0x01) ? " point to point" : "",
+			(flag & 0x02) ? " point to multipoint" : "",
+			(flag & 0x08) ? " leased line without D-channel" : "",
+			(flag & 0x04) ? " leased line with D-channel" : ""
+		);
+	}
+	if (len < ofs) {
+		return 0;
+	}
+	*eof = 1;
+	*start = page - ofs;
+	return ((count < len - ofs) ? count : len - ofs);
+} /* ctr_info */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int __entry drv_info (
+	char *			page, 
+	char **			start, 
+	off_t			ofs,
+	int			count, 
+	int *			eof, 
+	struct capi_driver *	drv
+) {
+	int			len = 0;
+
+	UNUSED_ARG (drv);
+	pprintf (page, &len, "%-16s %s\n", "name", TARGET);
+	pprintf (page, &len, "%-16s %s\n", "revision", capi_interface.revision);
+	if (len < ofs) {
+		return 0;
+	}
+	*eof = 1;
+	*start = page - ofs;
+	return ((count < len - ofs) ? count : len - ofs);
+} /* drv_info */
+ 
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void * data_by_id (unsigned appl_id) {
+	appl_t * appp;
+
+	appp = search_appl (capi_card->appls, appl_id);
+	return (appp != NULL) ? appp->data : NULL;
+} /* data_by_id */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+struct capi_ctr * card_by_id (unsigned appl_id) {
+	appl_t * appp;
+
+	appp = search_appl (capi_card->appls, appl_id);
+	return (appp != NULL) ? appp->ctrl : NULL;
+} /* card_by_id */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void * first_data (int * res) {
+	appl_t * appp;
+
+	assert (res);
+	appp = first_appl (capi_card->appls);
+	*res = (appp != NULL) ? 0 : -1;
+	return (appp != NULL) ? appp->data  : NULL;
+} /* first_data */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void * next_data (int * res) {
+	appl_t * appp;
+
+	assert (res);
+	if (NULL != (appp = get_appl (capi_card->appls, *res))) {
+		appp = next_appl (capi_card->appls, appp);
+	}
+	*res = (appp != NULL) ? 1 + *res : -1;
+	return (appp != NULL) ? appp->data  : NULL;
+} /* next_data */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int appl_profile (unsigned appl_id, unsigned * bs, unsigned * bc) {
+	appl_t * appp;
+
+	appp = search_appl (capi_card->appls, appl_id);
+	if (NULL == appp) {
+		return 0;
+	}
+	if (bs) { 
+		*bs = appp->blk_size; 
+	}
+	if (bc) { 
+		*bc = appp->blk_count; 
+	}
+	return 1;
+} /* appl_profile */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int msg2stack (unsigned char * msg) {
+	unsigned		mlen;
+	unsigned		appl;
+	__u32			ncci;
+	unsigned		hand;
+	unsigned char *		mptr;
+	unsigned char *		dptr;
+	struct sk_buff *	skb;
+	unsigned		temp;
+	int			res = 0;
+
+	assert (msg);
+	if (!queue_is_empty (capi_card->queue)) {
+		res = 1;
+		skb = queue_peek (capi_card->queue);	
+		assert (skb);
+		mptr = (unsigned char *) skb->data;
+		mlen = mptr[0] + 256 * mptr[1]; 
+		appl = mptr[2] + 256 * mptr[3];
+
+		mlog (
+			"PUT_MESSAGE(appl:%u,cmd:0x%02X,subcmd:0x%02X)\n", 
+			appl, 
+			mptr[4], 
+			mptr[5]
+		);
+
+		if ((0x86 == mptr[4]) && (0x80 == mptr[5])) { /* DATA_B3_REQ */
+			ncci = mptr[8] 
+				+ 256 * (mptr[9] 
+					+ 256 * (mptr[10] 
+						+ 256 * mptr[11]
+					)	);
+			hand = mptr[18] + 256 * mptr[19];
+			temp = (unsigned) (mptr + mlen);
+			dptr = mptr + 12;
+			*dptr++ = temp & 0xFF;	temp >>= 8;
+			*dptr++ = temp & 0xFF;	temp >>= 8;
+			*dptr++ = temp & 0xFF;	temp >>= 8;
+			*dptr++ = temp & 0xFF;
+			memcpy (msg, mptr, mlen);
+			queue_park (capi_card->queue, appl, ncci, hand);
+		} else {
+			memcpy (msg, mptr, mlen);
+			queue_drop (capi_card->queue);
+		}
+	}
+	return res;
+} /* msg2stack */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void msg2capi (unsigned char * msg) {
+	unsigned		mlen; 
+	unsigned		appl;
+	__u32			ncci;
+	unsigned		hand;
+	unsigned		dlen;
+	unsigned char *		dptr;
+	unsigned		temp;
+	struct sk_buff *	skb;
+	struct capi_ctr *	card;
+
+	assert (msg);
+	mlen = msg[0] + 256 * msg[1];
+	appl = msg[2] + 256 * msg[3];
+	if ((0x86 == msg[4]) && (0x81 == msg[5])) {	/* DATA_B3_CONF */
+		hand = msg[12] + 256 * msg[13];
+		ncci = msg[8] 
+			+ 256 * (msg[9] 
+				+ 256 * (msg[10] 
+					+ 256 * msg[11]
+				)	);
+		queue_conf (capi_card->queue, appl, ncci, hand);
+	}
+
+	if ((0x86 == msg[4]) && (0x82 == msg[5])) {	/* DATA_B3_IND */
+		dlen = msg[16] + 256 * msg[17];
+		skb = alloc_skb (
+				mlen + dlen + ((mlen < 30) ? (30 - mlen) : 0), 
+				GFP_ATOMIC
+				); 
+		if (NULL == skb) {
+			lprintf (
+				KERN_ERR, 
+				"Unable to build CAPI message skb." 
+						" Message lost.\n"
+			);
+			return;
+		}
+		/* Messages are expected to come with 32 bit data pointers. 
+		 * The kernel CAPI works with extended (64 bit ready) message 
+		 * formats so that the incoming message needs to be fixed, 
+		 * i.e. the length gets adjusted and the required 64 bit data 
+		 * pointer is added.
+		 */
+		temp = msg[12] + 256 * (msg[13] 
+					+ 256 * (msg[14] + 256 * msg[15]));
+		dptr = (unsigned char *) temp;
+		if (mlen < 30) {
+			msg[0] = 30;
+			ncci   = 0;	
+			memcpy (skb_put (skb, mlen), msg, mlen);
+			memcpy (skb_put (skb, 4), &ncci, 4);	
+			memcpy (skb_put (skb, 4), &ncci, 4);
+		} else {
+			memcpy (skb_put (skb, mlen), msg, mlen);
+        	}
+		memcpy (skb_put (skb, dlen), dptr, dlen); 
+	} else {
+		if (NULL == (skb = alloc_skb (mlen, GFP_ATOMIC))) {
+			lprintf (
+				KERN_ERR, 
+				"Unable to build CAPI message skb."
+							" Message lost.\n"
+			);
+			return;
+		}
+		memcpy (skb_put (skb, mlen), msg, mlen);
+	}
+	mlog (
+		"GET_MESSAGE(appl:%d,cmd:0x%02X,subcmd:0x%02X)\n", 
+		appl, 
+		msg[4], 
+		msg[5]
+	);
+	card = card_by_id (appl);
+	if (card != NULL) {
+		(*card->handle_capimsg) (card, appl, skb);
+	}
+} /* msg2capi */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void new_ncci (
+	unsigned	appl_id, 
+	__u32		ncci,
+	unsigned	winsize,
+	unsigned	blksize
+) {
+	appl_t *	appp;
+	ncci_t *	nccip;
+
+	mlog ("NEW NCCI(appl:%u,ncci:0x%08X)\n", appl_id, ncci);
+	if (NULL == (appp = search_appl (capi_card->appls, appl_id))) {
+		lprintf (KERN_ERR, invalid_msg, appl_id);
+		return;
+	}
+	nccip = create_ncci (
+			capi_card->appls, 
+			appp, 
+			(NCCI_t) ncci, 
+			winsize, 
+			blksize
+			);
+	if (NULL == nccip) {
+		log ("Cannot handle new NCCI...\n");
+		return;
+	}
+	assert (appp->ctrl);
+	(*appp->ctrl->new_ncci) (appp->ctrl, appl_id, ncci, winsize);
+} /* new_ncci */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void free_ncci (unsigned appl_id, __u32 ncci) {
+	appl_t *	appp;
+	ncci_t *	nccip;
+
+	appp = search_appl (capi_card->appls, appl_id);
+	if (NULL == appp) {
+		lprintf (KERN_ERR, invalid_msg, appl_id);
+		return;
+	}
+	assert (appp->ctrl);
+	if (0xFFFFFFFF == ncci) {		/* 2nd phase RELEASE */
+		assert (appp->dying);
+		dec_use_count ();
+		capi_card->count--;
+		mlog ("FREE APPL(appl:%u)\n", appl_id);
+		(*appp->ctrl->appl_released) (appp->ctrl, appl_id);
+		(*capi_card->rel_func) (appp->data);
+		remove_appl (capi_card->appls, appp);
+	} else if (NULL != (nccip = locate_ncci (appp, ncci))) {
+		mlog ("FREE NCCI(appl:%u,ncci:0x%08X)\n", appl_id, ncci);
+		(*appp->ctrl->free_ncci) (appp->ctrl, appl_id, ncci);
+		remove_ncci (capi_card->appls, appp, nccip);
+	} else {
+		lprintf (KERN_ERR, "Attempt to free unknown NCCI.\n");
+	}
+} /* free_ncci */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+unsigned char * data_block (unsigned appl_id, __u32 ncci, unsigned handle) {
+	appl_t * appp;
+ 
+	appp = search_appl (capi_card->appls, appl_id);
+	if (NULL == appp) {
+		lprintf (KERN_ERR, invalid_msg, appl_id);
+		return NULL;
+	}
+	return ncci_data_buffer (capi_card->appls, appp, ncci, handle);
+} /* data_block */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int params_ok (card_t * card) {
+	int  chk;
+
+	assert (card);
+	if (0 == card->irq) {
+		lprintf (
+			KERN_ERR, 
+			"IRQ not assigned by BIOS. Please check BIOS"
+			"settings/manual for a proper PnP/PCI-Support.\n"
+		);
+		return FALSE;
+	}
+	if (0 == card->base) {
+		lprintf (KERN_ERR, "Base address has not been set.\n");
+		return FALSE;
+	}
+#if defined (__fcclassic__)
+	switch (card->base) {
+
+	case 0x200: case 0x240: case 0x300: case 0x340:
+		log ("Base address valid.\n");
+		break;
+	default:
+		log ("Invalid base address.\n");
+		return FALSE;
+	}
+#endif
+#if !defined (__fcpcmcia__)
+	if ((chk = check_region (card->base, IO_RANGE)) < 0) {
+		log (
+			"I/O range 0x%04x-0x%04x busy. [%d]\n", 
+			card->base, 
+			card->base + IO_RANGE - 1, 
+			chk
+		);
+		return FALSE;
+	}
+#endif
+	if (!(chk = (*capi_lib->check_controller) (card->base, &card->info))) {
+		return TRUE;
+	} else {
+		log ("Controller check failed.\n");
+		return FALSE;
+	}
+} /* params_ok */
+
+/*---------------------------------------------------------------------------*\
+\*-S-------------------------------------------------------------------------*/ 
+static void scheduler_control (unsigned ena) {
+	int	enabled = (int) ena;
+	int	changed;
+
+	enter_critical ();
+	changed = (atomic_read (&timer_irq_enabled) != enabled);
+	if (changed) {
+		atomic_set (&timer_irq_enabled, enabled);
+		(*capi_lib->cm_timer_irq_control) (enabled);
+	}
+	leave_critical ();
+} /* scheduler_control */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static inline void handle_events (void) {
+
+	if ((*capi_lib->cm_handle_events) ()) {
+		atomic_set (&dont_sched, 0);
+		if (atomic_read (&scheduler_enabled)) {
+			tasklet_schedule (&scheduler_tasklet);
+		}
+	}
+} /* handle_events */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void check_events (void) {
+	
+	assert (!in_critical ());
+	if (atomic_read (&event_pending)) {
+		handle_events ();
+		atomic_dec (&event_pending);
+	}
+} /* check_events */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void scheduler (unsigned long data) {
+	
+	UNUSED_ARG (data);
+	atomic_set (&scheduler_id, smp_processor_id ());
+	if (spin_trylock (&sched_lock)) {
+		while (!atomic_read (&dont_sched)) {
+			atomic_set (&dont_sched, 1);
+			os_timer_poll ();
+			if ((*capi_lib->cm_schedule) ()) {
+				scheduler_control (TRUE); 
+			}
+		}
+		check_events ();
+		spin_unlock (&sched_lock);
+	}
+} /* scheduler */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void irq_handler (int irq, void * args, struct pt_regs * regs) {
+	
+	UNUSED_ARG (irq);
+	UNUSED_ARG (regs);
+	if (args != NULL) {
+		if (spin_trylock (&sched_lock)) {
+			handle_events ();
+			spin_unlock (&sched_lock);
+		} else if (atomic_read (&scheduler_id) == smp_processor_id ()) {
+			handle_events ();
+		} else {
+			atomic_inc (&event_pending);
+		}
+	}
+} /* irq_handler */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void init (
+	unsigned len, 
+	void  (* reg) (void *, unsigned),
+	void  (* rel) (void *),
+	void  (* dwn) (void)) 
+{
+	assert (reg);
+	assert (rel);
+	assert (dwn);
+
+	capi_card->length   = len;
+	capi_card->reg_func = reg;
+	capi_card->rel_func = rel;
+	capi_card->dwn_func = dwn;
+} /* init */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#if defined (__fcpcmcia__)
+int avm_a1pcmcia_addcard (unsigned int port, unsigned irq) {
+	capicardparams args;
+
+	args.port = port;
+	args.irq  = irq;
+	return add_card (&capi_interface, &args);
+} /* avm_a1pcmcia_addcard */
+
+int avm_a1pcmcia_delcard (unsigned int port, unsigned irq) {
+
+	UNUSED_ARG (port);
+	UNUSED_ARG (irq);
+	if (NULL != capi_controller) { 
+		reset_ctrl (capi_controller);
+		remove_ctrl (capi_controller);
+	}
+	return 0; 
+} /* avm_a1pcmcia_delcard */
+#endif
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int driver_init (void) {
+
+	strncpy (capi_interface.revision, REVISION, 
+					sizeof (capi_interface.revision));
+	return (NULL != (capi_lib = link_library ()));
+} /* driver_init */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void driver_exit (void) {
+
+	assert (capi_lib);
+	free_library ();
+	capi_lib = NULL;
+} /* driver_exit */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/driver.h linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/driver.h
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/driver.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/driver.h	2003-07-08 00:02:00.000000000 +0200
@@ -0,0 +1,140 @@
+/* 
+ * driver.h
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#ifndef __have_driver_h__
+#define __have_driver_h__
+
+#include <linux/config.h>
+#include <linux/skbuff.h>
+#include <linux/capi.h>
+#include "capilli.h"
+#include "tables.h"
+#include "queue.h"
+#include "libdefs.h"
+
+#define	SHARED_IRQ		/* For PCI only... */
+
+#if defined (CONFIG_ISAPNP)
+# include <linux/isapnp.h>
+#endif
+
+typedef struct __irq {
+
+	unsigned	id;
+} irq_t;
+
+typedef struct __card {
+
+	unsigned		base;
+	unsigned		irq;
+	unsigned		info;
+	unsigned		data;
+	char *			version;
+	char *			string[8];
+	unsigned		count;
+	appltab_t *		appls;
+	queue_t *		queue;
+	unsigned		length;
+	void		     (* reg_func) (void *, unsigned);
+	void		     (* rel_func) (void *);
+	void		     (* dwn_func) (void);
+#if defined (CONFIG_ISAPNP)
+	struct pci_dev *	dev;
+#endif
+} card_t;
+
+extern card_t *				capi_card;
+extern lib_callback_t *			capi_lib;
+extern struct capi_driver_interface *	capi_driver;
+extern struct capi_driver		capi_interface;
+extern struct capi_ctr *		capi_controller;
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern int load_ware(struct capi_ctr * ctrl, capiloaddata * ware);
+extern void reset_ctrl(struct capi_ctr * ctrl);
+extern void remove_ctrl(struct capi_ctr * ctrl); 
+extern void register_appl(struct capi_ctr * ctrl, __u16 appl, 
+                                                  capi_register_params * args);
+extern void release_appl(struct capi_ctr * ctrl, __u16 appl); 
+extern void send_msg(struct capi_ctr * ctrl, struct sk_buff * skb); 
+extern char * proc_info(struct capi_ctr * ctrl);
+extern int ctr_info(char * page, char ** start, off_t ofs, int count, 
+                                             int * eof, struct capi_ctr * ctr);
+extern int drv_info(char * page, char ** start, off_t ofs, int count, 
+                                          int * eof, struct capi_driver * drv); 
+extern int add_card(struct capi_driver * drv, capicardparams *args); 
+
+extern void * data_by_id (unsigned appl_id);
+extern struct capi_ctr * card_by_id (unsigned appl_id);
+extern void * first_data (int * res);
+extern void * next_data (int * res);
+
+extern int appl_profile (unsigned appl_id, unsigned * blksize, 
+							unsigned * blkcount);
+
+extern int msg2stack (unsigned char * msg);
+extern void msg2capi (unsigned char * msg);
+
+extern void new_ncci (unsigned appl_id, __u32 ncci, unsigned winsize, 
+							unsigned blksize);
+extern void free_ncci (unsigned appl_id, __u32 ncci);
+
+extern unsigned char * data_block (unsigned appl_id, __u32 ncci, 
+							unsigned handle);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern void enter_critical (void);
+extern void leave_critical (void);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern void lock (void);
+extern void unlock (void);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern int params_ok (card_t * card);
+
+extern void stop (card_t * card);
+
+extern int install_card (card_t * card);
+extern void remove_card (card_t * card);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern void init (unsigned len, 
+		  void  (* reg) (void *, unsigned),
+		  void  (* rel) (void *),
+		  void  (* dwn) (void));
+
+#if defined (__fcpcmcia__)
+extern int avm_a1pcmcia_addcard (unsigned int port, unsigned irq);
+extern int avm_a1pcmcia_delcard (unsigned int port, unsigned irq);
+#endif
+
+extern int driver_init (void);
+extern void driver_exit (void);
+
+#endif
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/fcpcmcia_cs.c linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/fcpcmcia_cs.c
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/fcpcmcia_cs.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/fcpcmcia_cs.c	2003-07-08 00:02:00.000000000 +0200
@@ -0,0 +1,559 @@
+/* 
+ * fcpcmcia_cs.c
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+/*---------------------------------------------------------------------------*\
+ *
+ *    Based on Carsten Paeth's PCMCIA client driver for AVM B1/M1/M2
+ *
+\*---------------------------------------------------------------------------*/
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/ptrace.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <linux/timer.h>
+#include <asm/io.h>
+#include <asm/system.h>
+
+#include <pcmcia/version.h>
+#include <pcmcia/cs_types.h>
+#include <pcmcia/cs.h>
+#include <pcmcia/cistpl.h>
+#include <pcmcia/ds.h>
+
+#include <linux/skbuff.h>
+#include <linux/capi.h>
+
+/*---------------------------------------------------------------------------*\
+ * Interface to the main driver module
+\*---------------------------------------------------------------------------*/
+
+extern int avm_a1pcmcia_addcard (unsigned int, unsigned);
+extern int avm_a1pcmcia_delcard (unsigned int, unsigned);
+
+/*---------------------------------------------------------------------------*\
+ * All the PCMCIA modules use PCMCIA_DEBUG to control debugging.  If you do 
+ * not define PCMCIA_DEBUG at all, all the debug code will be left out.  If 
+ * you compile with PCMCIA_DEBUG=0, the debug code will be present but 
+ * disabled -- but it can then be enabled for specific modules at load time 
+ * with a 'pc_debug=#' option to insmod.
+\*---------------------------------------------------------------------------*/
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
+#define	KFREE_S(a,n)	kfree_s(a,n)
+#else
+#define	KFREE_S(a,n)	kfree(a)
+#endif
+
+#ifdef PCMCIA_DEBUG
+static int pc_debug = PCMCIA_DEBUG;
+MODULE_PARM(pc_debug, "i");
+#define DEBUG(n, args...) if (pc_debug>(n)) \
+				printk(KERN_DEBUG "fcpcmcia_cs: " args); 
+#else
+#define DEBUG(n, args...)
+#endif
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+
+/* Parameters that can be set with 'insmod' */
+/* This means pick from 15, 12, 11, 10, 9, 7, 5, 4, and 3 */
+
+static int default_irq_list[10] = { 15, 12, 11, 10, 9, 7, 5, 4, 3, -1 };
+static int irq_list[10] = { -1 };
+
+MODULE_PARM(irq_list, "1-10i");
+
+/*---------------------------------------------------------------------------*\
+ * The event() function is this driver's Card Services event handler. It will 
+ * be called by Card Services when an appropriate card status event is 
+ * received.  The config() and release() entry points are used to configure 
+ * or release a socket, in response to card insertion and ejection events.  
+ * They are invoked from the skeleton event handler.
+\*---------------------------------------------------------------------------*/
+static void fcpcmcia_config (dev_link_t * link);
+static void fcpcmcia_release (u_long arg);
+static int fcpcmcia_event (event_t event, int priority,
+			   event_callback_args_t * args);
+
+/*---------------------------------------------------------------------------*\
+ * The attach() and detach() entry points are used to create and destroy
+ * "instances" of the driver, where each instance represents everything
+ * needed to manage one actual PCMCIA card.
+\*---------------------------------------------------------------------------*/
+static dev_link_t * fcpcmcia_attach (void);
+static void fcpcmcia_detach (dev_link_t *);
+
+/*---------------------------------------------------------------------------*\
+ * The dev_info variable is the "key" that is used to match up this device 
+ * driver with appropriate cards, through the card configuration database.
+\*---------------------------------------------------------------------------*/
+static dev_info_t dev_info = "fcpcmcia_cs";
+
+/*---------------------------------------------------------------------------*\
+ * A linked list of "instances" of the skeleton device.  Each actual PCMCIA 
+ * card corresponds to one device instance, and is described by one dev_link_t 
+ * structure (defined in ds.h).
+ *
+ * You may not want to use a linked list for this -- for example, the memory 
+ * card driver uses an array of dev_link_t pointers, where minor device
+ * numbers are used to derive the corresponding array index.
+\*---------------------------------------------------------------------------*/
+static dev_link_t * dev_list = NULL;
+
+/*---------------------------------------------------------------------------*\
+ * A dev_link_t structure has fields for most things that are needed to keep 
+ * track of a socket, but there will usually be some device specific 
+ * information that also needs to be kept track of.  The 'priv' pointer in a 
+ * dev_link_t structure can be used to point to a device-specific private data 
+ * structure, like this.
+ *
+ * A driver needs to provide a dev_node_t structure for each device on a 
+ * card. In some cases, there is only one device per card (for example, 
+ * ethernet cards, modems).  In other cases, there may be many actual or 
+ * logical devices (SCSI adapters, memory cards with  multiple partitions).  
+ * The dev_node_t structures need to be kept in a linked list starting at the 
+ * 'dev' field of a dev_link_t structure.  We allocate them in the card's 
+ * private data structure, because they generally can't be allocated 
+ * dynamically.
+\*---------------------------------------------------------------------------*/
+typedef struct local_info_t {
+
+    dev_node_t	node;
+} local_info_t;
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void cs_error(client_handle_t handle, int func, int ret) {
+    error_info_t err = { func, ret };
+
+    CardServices (ReportError, handle, &err);
+} /* cs_error */
+
+/*---------------------------------------------------------------------------*\
+ * fcpcmcia_attach() creates an "instance" of the driver, allocating local 
+ * data structures for one device.  The device is registered with Card 
+ * Services.
+ *
+ * The dev_link structure is initialized, but we don't actually configure the 
+ * card at this point -- we wait until we receive a card insertion event.
+\*---------------------------------------------------------------------------*/
+static dev_link_t * fcpcmcia_attach(void) {
+    client_reg_t   client_reg;
+    dev_link_t *   link;
+    local_info_t * local;
+    int            ret, i;
+    
+    DEBUG (0, "fcpcmcia_attach()\n");
+
+    /* Initialize the dev_link_t structure */
+    link = kmalloc (sizeof (struct dev_link_t), GFP_KERNEL);
+    memset (link, 0, sizeof (struct dev_link_t));
+    link->release.function = &fcpcmcia_release;
+    link->release.data = (u_long) link;
+
+    /* The io structure describes IO port mapping */
+    link->io.NumPorts1 = 16;
+    link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+    link->io.NumPorts2 = 0;
+
+    /* Interrupt setup */
+    link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
+    link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_FIRST_SHARED;
+
+    link->irq.IRQInfo1 = IRQ_INFO2_VALID|IRQ_LEVEL_ID;
+    if (irq_list[0] != -1) {
+	for (i = 0; i < 10 && irq_list[i] > 0; i++) {
+	    link->irq.IRQInfo2 |= 1 << irq_list[i];
+	}
+    } else {
+	for (i = 0; i < 10 && default_irq_list[i] > 0; i++) {
+	    link->irq.IRQInfo2 |= 1 << default_irq_list[i];
+	}
+    }
+    
+    /* General socket configuration */
+    link->conf.Attributes = CONF_ENABLE_IRQ;
+    link->conf.Vcc = 50;
+    link->conf.IntType = INT_MEMORY_AND_IO;
+    link->conf.ConfigIndex = 1;
+    link->conf.Present = PRESENT_OPTION;
+
+    /* Allocate space for private device-specific data */
+    local = kmalloc (sizeof (local_info_t), GFP_KERNEL);
+    memset (local, 0, sizeof (local_info_t));
+    link->priv = local;
+    
+    /* Register with Card Services */
+    link->next = dev_list;
+    dev_list = link;
+    client_reg.dev_info = &dev_info;
+    client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
+    client_reg.EventMask =
+	CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
+	CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
+	CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
+    client_reg.event_handler = &fcpcmcia_event;
+    client_reg.Version = 0x0210;
+    client_reg.event_callback_args.client_data = link;
+    ret = CardServices (RegisterClient, &link->handle, &client_reg);
+    if (ret != 0) {
+	cs_error (link->handle, RegisterClient, ret);
+	fcpcmcia_detach (link);
+	return NULL;
+    }
+
+    return link;
+} /* fcpcmcia_attach */
+
+/*---------------------------------------------------------------------------*\
+ * This deletes a driver "instance".  The device is de-registered with Card 
+ * Services. If it has been released, all local data structures are freed.  
+ * Otherwise, the structures will be freed when the device is released.
+\*---------------------------------------------------------------------------*/
+static void fcpcmcia_detach (dev_link_t * link)
+{
+    dev_link_t ** linkp;
+
+    DEBUG (0, "fcpcmcia_detach(0x%p)\n", link);
+    
+    /* Locate device structure */
+    for (linkp = &dev_list; *linkp; linkp = &(*linkp)->next) {
+	if (*linkp == link) break;
+    }
+    if (*linkp == NULL) {
+	return;
+    }
+
+    /*-----------------------------------------------------------------------*\
+     * If the device is currently configured and active, we won't actually 
+     * delete it yet.  Instead, it is marked so that when the release() 
+     * function is called, that will trigger a proper detach().
+    \*-----------------------------------------------------------------------*/
+    if (link->state & DEV_CONFIG) {
+#ifdef PCMCIA_DEBUG
+	printk (KERN_DEBUG "fcpcmcia_cs: detach postponed, '%s' "
+	       "still locked\n", link->dev->dev_name);
+#endif
+	link->state |= DEV_STALE_LINK;
+	return;
+    }
+
+    /* Break the link with Card Services */
+    if (link->handle) {
+	CardServices (DeregisterClient, link->handle);
+    }
+
+    /* Unlink device structure, free pieces */
+    *linkp = link->next;
+    if (link->priv) {
+	KFREE_S (link->priv, sizeof(local_info_t));
+    }
+    KFREE_S (link, sizeof(struct dev_link_t));
+    
+} /* fcpcmcia_detach */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static int get_tuple (int fn, client_handle_t handle, tuple_t * tuple,
+		     cisparse_t *parse)
+{
+    int i;
+
+    i = CardServices (fn, handle, tuple);
+    if (i != CS_SUCCESS) {
+	return i;
+    }
+    i = CardServices (GetTupleData, handle, tuple);
+    if (i != CS_SUCCESS) {
+	return i;
+    }
+    return CardServices (ParseTuple, handle, tuple, parse);
+} /* get_tuple */
+
+#define first_tuple(a, b, c) get_tuple(GetFirstTuple, a, b, c)
+#define next_tuple(a, b, c) get_tuple(GetNextTuple, a, b, c)
+
+/*---------------------------------------------------------------------------*\
+ * fcpcmcia_config() is scheduled to run after a CARD_INSERTION event is
+ * received, to configure the PCMCIA socket, and to make the ISDN controller 
+ * available to the system.
+\*---------------------------------------------------------------------------*/ 
+static void fcpcmcia_config (dev_link_t * link) {
+    client_handle_t		handle;
+    tuple_t			tuple;
+    cisparse_t			parse;
+    cistpl_cftable_entry_t *	cf = &parse.cftable_entry;
+    local_info_t *		dev;
+    int 			i;
+    u_char			buf[64];
+    char			devname[128];
+    int				cardtype;
+    
+    handle = link->handle;
+    dev = link->priv;
+
+    DEBUG (0, "fcpcmcia_config(0x%p)\n", link);
+
+    /*-----------------------------------------------------------------------*\
+     * Read the card's CONFIG tuple to find its configuration registers.
+    \*-----------------------------------------------------------------------*/
+    do {
+	tuple.DesiredTuple = CISTPL_CONFIG;
+	i = CardServices (GetFirstTuple, handle, &tuple);
+	if (i != CS_SUCCESS) {
+	    break;
+	}
+	tuple.TupleData = buf;
+	tuple.TupleDataMax = 64;
+	tuple.TupleOffset = 0;
+	i = CardServices (GetTupleData, handle, &tuple);
+	if (i != CS_SUCCESS) {
+	    break;
+	}
+	i = CardServices (ParseTuple, handle, &tuple, &parse);
+	if (i != CS_SUCCESS) {
+	    break;
+	}
+	link->conf.ConfigBase = parse.config.base;
+    } while (0);
+    if (i != CS_SUCCESS) {
+	cs_error (link->handle, ParseTuple, i);
+	link->state &= ~DEV_CONFIG_PENDING;
+	return;
+    }
+    
+    /* Configure card */
+    link->state |= DEV_CONFIG;
+
+    do {
+	tuple.Attributes = 0;
+	tuple.TupleData = buf;
+	tuple.TupleDataMax = 254;
+	tuple.TupleOffset = 0;
+	tuple.DesiredTuple = CISTPL_VERS_1;
+
+	devname[0] = 0;
+	if (!first_tuple (handle, &tuple, &parse) && (parse.version_1.ns > 1)) {
+	    strncpy (devname, parse.version_1.str + parse.version_1.ofs[1], 
+			sizeof(devname));
+	}
+
+	/* find IO port */
+	tuple.TupleData = (cisdata_t *) buf;
+	tuple.TupleOffset = 0; 
+	tuple.TupleDataMax = 255;
+	tuple.Attributes = 0;
+	tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+	i = first_tuple (handle, &tuple, &parse);
+	while (i == CS_SUCCESS) {
+	    if (cf->io.nwin > 0) {
+		link->conf.ConfigIndex = cf->index;
+		link->io.BasePort1 = cf->io.win[0].base;
+		link->io.NumPorts1 = cf->io.win[0].len;
+		link->io.NumPorts2 = 0;
+                printk (KERN_INFO "fcpcmcia_cs: testing i/o %#x-%#x\n",
+			link->io.BasePort1,
+		        link->io.BasePort1 + link->io.NumPorts1 - 1);
+		i = CardServices (RequestIO, link->handle, &link->io);
+		if (i == CS_SUCCESS) {
+		    goto found_port;
+		}
+	    }
+	    i = next_tuple (handle, &tuple, &parse);
+	}
+
+    found_port:
+	if (i != CS_SUCCESS) {
+	    cs_error (link->handle, RequestIO, i);
+	    break;
+	}
+	
+	/* allocate an interrupt line */
+	i = CardServices (RequestIRQ, link->handle, &link->irq);
+	if (i != CS_SUCCESS) {
+	    cs_error (link->handle, RequestIRQ, i);
+	    CardServices (ReleaseIO, link->handle, &link->io);
+	    break;
+	}
+	
+	/* configure the PCMCIA socket */
+	i = CardServices (RequestConfiguration, link->handle, &link->conf);
+	if (i != CS_SUCCESS) {
+	    cs_error (link->handle, RequestConfiguration, i);
+	    CardServices (ReleaseIO, link->handle, &link->io);
+	    CardServices (ReleaseIRQ, link->handle, &link->irq);
+	    break;
+	}
+
+    } while (0);
+
+    /*-----------------------------------------------------------------------*\
+     * At this point, the dev_node_t structure(s) should be initialized and 
+     * arranged in a linked list at link->dev. 
+    \*-----------------------------------------------------------------------*/
+    strcpy (dev->node.dev_name, "A1");
+    dev->node.major = 45;	/* <<<< */
+    dev->node.minor = 0;	/* <<<< */
+    link->dev = &dev->node;
+    
+    link->state &= ~DEV_CONFIG_PENDING;
+    /* If any step failed, release any partially configured state */
+    if (i != 0) {
+	fcpcmcia_release ((u_long) link);
+	return;
+    }
+
+    if ((i = avm_a1pcmcia_addcard (link->io.BasePort1, link->irq.AssignedIRQ)) < 0) {
+        printk (KERN_ERR "fcpcmcia_cs: failed to add AVM-%s-Controller at"
+                                                        " i/o %#x, irq %d\n",
+		dev->node.dev_name, link->io.BasePort1, link->irq.AssignedIRQ);
+	fcpcmcia_release ((u_long) link);
+	return;
+    }
+    dev->node.minor = i;
+
+    printk (KERN_DEBUG "fcpcmcia_cs device loaded\n");
+} /* fcpcmcia_config */
+
+/*---------------------------------------------------------------------------*\
+ * After a card is removed, fcpcmcia_release() will unregister the net device, 
+ * and release the PCMCIA configuration.  If the device is still open, this 
+ * will be postponed until it is closed.
+\*---------------------------------------------------------------------------*/ 
+
+static void fcpcmcia_release (u_long arg) {
+    dev_link_t * link = (dev_link_t *) arg;
+
+    DEBUG (0, "fcpcmcia_release(0x%p)\n", link);
+
+    /*-----------------------------------------------------------------------*\
+     * If the device is currently in use, we won't release until it is 
+     * actually closed.
+    \*-----------------------------------------------------------------------*/
+    if (link->open) {
+	DEBUG (1, "fcpcmcia_cs: release postponed, '%s' still open\n",
+	                                             link->dev->dev_name);
+	link->state |= DEV_STALE_CONFIG;
+	return;
+    }
+
+    avm_a1pcmcia_delcard (link->io.BasePort1, link->irq.AssignedIRQ);
+
+    /* Unlink the device chain */
+    link->dev = NULL;
+    
+    /* Don't bother checking to see if these succeed or not */
+    (void) CardServices (ReleaseConfiguration, link->handle);
+    (void) CardServices (ReleaseIO, link->handle, &link->io);
+    (void) CardServices (ReleaseIRQ, link->handle, &link->irq);
+    link->state &= ~DEV_CONFIG;
+    
+    if (link->state & DEV_STALE_LINK)
+	fcpcmcia_detach (link);
+    
+} /* fcpcmcia_release */
+
+/*---------------------------------------------------------------------------*\
+ * The card status event handler.  Mostly, this schedules other stuff to run 
+ * after an event is received.  A CARD_REMOVAL event also sets some flags to 
+ * discourage the net drivers from trying to talk to the card any more.
+ *
+ * When a CARD_REMOVAL event is received, we immediately set a flag to block 
+ * future accesses  to this device.  All the functions that  actually access 
+ * the device should check this flag to make sure the card is still present.
+\*---------------------------------------------------------------------------*/
+static int fcpcmcia_event (event_t event, int priority,
+			   event_callback_args_t * args)
+{
+    dev_link_t * link = args->client_data;
+
+    DEBUG (1, "fcpcmcia_event(0x%06x)\n", event);
+    
+    switch (event) {
+    case CS_EVENT_CARD_REMOVAL:
+	link->state &= ~DEV_PRESENT;
+	if (link->state & DEV_CONFIG) {
+	    link->release.expires = jiffies + (HZ/20);
+	    add_timer (&link->release);
+	}
+	break;
+    case CS_EVENT_CARD_INSERTION:
+	link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
+	fcpcmcia_config (link);
+	break;
+    case CS_EVENT_PM_SUSPEND:
+	link->state |= DEV_SUSPEND;
+	/* Fall through... */
+    case CS_EVENT_RESET_PHYSICAL:
+	if (link->state & DEV_CONFIG) {
+	    CardServices (ReleaseConfiguration, link->handle);
+	}
+	break;
+    case CS_EVENT_PM_RESUME:
+	link->state &= ~DEV_SUSPEND;
+	/* Fall through... */
+    case CS_EVENT_CARD_RESET:
+	if (link->state & DEV_CONFIG) {
+	    CardServices (RequestConfiguration, link->handle, &link->conf);
+	}
+	break;
+    }
+    return 0;
+} /* fcpcmcia_event */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int init_module (void) {
+    servinfo_t serv;
+
+    DEBUG (0, "%s\n", version);
+    CardServices (GetCardServicesInfo, &serv);
+    if (serv.Revision != CS_RELEASE_CODE) {
+	printk (KERN_NOTICE "fcpcmcia_cs: Card Services release " 
+							"does not match!\n");
+	return -1;
+    }
+    register_pcmcia_driver (&dev_info, &fcpcmcia_attach, &fcpcmcia_detach);
+    return 0;
+} /* init_module */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void cleanup_module (void) {
+
+    DEBUG (0, "fcpcmcia_cs: unloading\n");
+    unregister_pcmcia_driver (&dev_info);
+    while (dev_list != NULL) {
+	if (dev_list->state & DEV_CONFIG) {
+	    fcpcmcia_release ((u_long) dev_list);
+	}
+	fcpcmcia_detach (dev_list);
+    }
+} /* cleanup_module */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/io.c linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/io.c
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/io.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/io.c	2003-07-08 00:02:00.000000000 +0200
@@ -0,0 +1,75 @@
+/* 
+ * io.c
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#include <asm/io.h>
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+unsigned char InpByte (unsigned port) {
+
+	return inb (port);
+} /* InpByte */
+
+void OutpByte (unsigned port, unsigned char data) { 
+
+	outb (data, port); 
+} /* OutpByte */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+unsigned long InpDWord (unsigned port) { 
+
+	return inl (port); 
+} /* InpDWord */
+
+void OutpDWord (unsigned port, unsigned long data) { 
+
+	outl (data, port); 
+} /* OutpDWord */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void InpByteBlock (unsigned port, unsigned char * buffer, unsigned length) {
+
+	insb (port, buffer, length);
+} /* InpByteBlock */
+
+void OutpByteBlock (unsigned port, unsigned char * buffer, unsigned length) {
+
+	outsb (port, buffer, length);
+} /* OutpByteBlock */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void InpDWordBlock (unsigned port, unsigned char * buffer, unsigned length) {
+
+	insl (port, buffer, (length + 3) / 4);
+} /* InpDWordBlock */
+
+void OutpDWordBlock (unsigned port, unsigned char * buffer, unsigned length) {
+
+	outsl (port, buffer, (length + 3) / 4);
+} /* OutpDWordBlock */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/lib.c linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/lib.c
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/lib.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/lib.c	2003-07-08 00:02:00.000000000 +0200
@@ -0,0 +1,520 @@
+/* 
+ * lib.c
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#include <asm/param.h>
+#include <asm/io.h>
+#include <linux/mm.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <stdarg.h>
+#include "driver.h"
+#include "queue.h"
+#include "defs.h"
+#include "tools.h"
+#include "libstub.h"
+#include "lib.h"
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static unsigned long long	j64 = 0;
+static unsigned long		j32 = 0;
+
+#define	JIFF2MSEC		(1000/HZ)
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void os__enter_critical (const char * f, int l) { 
+
+	f = (void *) l;
+	enter_critical (); 
+} /* os__enter_critical */
+
+void os__leave_critical (const char * f, int l) {
+
+	f = (void *) l;
+	leave_critical ();
+} /* os__leave_critical */
+
+void os_enter_critical (void) { enter_critical (); }
+
+void os_leave_critical (void) { leave_critical (); } 
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void os_enter_cache_sensitive_code (void) { /* NOP */ }
+
+void os_leave_cache_sensitive_code (void) { /* NOP */ }
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void os_init (unsigned len, register_t reg, release_t rel, down_t down) {
+
+	init (len, reg, rel, down);
+} /* os_init */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+char * os_params (void) {
+
+	return NULL;
+} /* os_params */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int os_get_message (unsigned char * msg) {
+	int res;
+
+	assert (msg);
+	res = msg2stack (msg); 
+	return res;
+} /* os_get_message */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void os_put_message (unsigned char * msg) {
+
+	assert (msg);
+	msg2capi (msg);
+} /* os_put_message */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+unsigned char * os_get_data_block (
+	unsigned	appl, 
+	unsigned long	ncci, 
+	unsigned	index) 
+{
+	char * res;
+
+	res = data_block (appl, ncci, index);
+	return res;
+} /* os_get_data_block */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void os_free_data_block (unsigned appl, unsigned char * data) {
+
+	data = (void *) appl;	/* Avoid "unused arg" warning */
+} /* os_free_data_block */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int os_new_ncci (
+	unsigned	appl,
+	unsigned	long ncci, 
+	unsigned	win_size,
+	unsigned	blk_size
+) {
+	
+	new_ncci (appl, ncci, win_size, blk_size); 
+	return 1;
+} /* os_new_ncci */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void os_free_ncci (unsigned appl, unsigned long ncci) {
+
+	free_ncci (appl, ncci);
+} /* os_free_ncci */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+unsigned os_block_size (unsigned appl) {
+	unsigned bs;
+
+	appl_profile (appl, &bs, NULL);
+	return bs;
+} /* os_block_size */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+unsigned os_window_size (unsigned appl) {
+	unsigned bc;
+
+	appl_profile (appl, NULL, &bc);
+	return bc;
+} /* os_window_size */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+unsigned os_card (void) {
+
+	return 0;
+} /* os_card */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void * os_appl_data (unsigned appl) {
+	void * res;
+
+	res = data_by_id (appl);
+	return res;
+} /* os_appl_data */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+appldata_t * os_appl_1st_data (appldata_t * s) {
+	int		num;
+	void *		data;
+	static char	e[10]; 
+
+	memset (&e, 0, 10);
+	data = first_data (&num);
+	s->num    = num;
+	s->buffer = (NULL == data) ? e : data;
+	return s;
+} /* os_appl_1st_data */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+appldata_t * os_appl_next_data (appldata_t * s) {
+	int		num;
+	void *		data;
+	static char	e[10]; 
+
+	memset (&e, 0, 10);
+	if ((num = s->num) < 0) {	
+		
+		return NULL;
+	}
+	data = next_data (&num);
+	s->num    = num;
+	s->buffer = (NULL == data) ? e : data;
+	return s;
+} /* os_appl_next_data */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void * os_malloc (unsigned len) {
+	void * res;
+
+	res = hcalloc (len); 
+	return res;
+} /* os_malloc */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void os_free (void * p) {
+
+	assert (p);
+	hfree (p);
+} /* os_free */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void update_j64 (void) {
+	static int	run1 = 1;
+	unsigned long	j;
+	long long	diff;
+	
+	j = jiffies;
+	if (run1) {
+		j32 = j;
+		run1 = 0;
+	}
+	if ((diff = j - j32) < 0) {
+		diff = -diff;
+	}
+	assert (diff >= 0);
+	j32 = j;
+	j64 += diff;
+} /* update_j64 */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+unsigned long long os_msec64 (void) {
+	unsigned long	tmp;
+	
+	update_j64 ();
+	tmp = j64 * JIFF2MSEC;
+	return tmp;
+} /* os_msec64 */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+unsigned long os_msec (void) {
+	unsigned long	tmp;
+	
+	update_j64 ();
+	tmp = ((unsigned long) j64) * JIFF2MSEC;
+	return tmp;
+} /* os_msec */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+typedef struct {
+
+	unsigned long	lstart;
+	unsigned long	start;
+	unsigned long	tics;
+	unsigned long	arg;
+	timerfunc_t	func;
+} timer_rec_t;
+
+#define	TIC_PER_SEC		250
+#define	TIC_PER_MSEC		4
+#define	Time()			(avm_time_base * TIC_PER_MSEC)
+
+static volatile timer_rec_t *	timer = 0;
+static unsigned			timer_count = 0;
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int os_timer_new (unsigned ntimers) {
+	unsigned size;
+
+	assert (ntimers > 0); 
+
+	
+	timer_count = ntimers;
+	size = sizeof (timer_rec_t) * ntimers;
+	timer = (timer_rec_t *) hcalloc (size);
+	info (timer != NULL);
+	if (NULL == timer) {
+		timer_count = 0;
+	} 
+	
+	return timer == NULL;
+} /* os_timer_new */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void os_timer_delete (void) {
+
+	
+	hfree ((void *) timer);
+	timer = NULL;
+	timer_count = 0;
+} /* os_timer_delete */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int os_timer_start (
+	unsigned	index,
+	unsigned long	timeout,
+	unsigned long	arg,
+	timerfunc_t	func
+) {
+	assert (index < timer_count);
+	
+	if (index >= timer_count) {
+		return 1;
+	}
+	enter_critical ();
+	timer[index].start = avm_time_base;
+	timer[index].tics  = (timeout + TIC_PER_MSEC) / TIC_PER_MSEC;
+	timer[index].arg   = arg;
+	timer[index].func  = func;
+	leave_critical ();
+	return 0;
+} /* os_timer_start */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int os_timer_stop (unsigned index) {
+
+	assert (index < timer_count);
+	
+	if (index >= timer_count) {
+		return 1;
+	}
+	enter_critical ();
+	timer[index].func = NULL;
+	leave_critical ();
+	return 0;
+} /* os_timer_stop */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void os_timer_poll (void) {
+	unsigned  i;
+	restart_t flag;
+
+	if (NULL == timer) {
+		return;
+	}
+	enter_critical ();
+	for (i = 0; i < timer_count; i++) {
+		if (timer[i].func != 0) {
+			if ((avm_time_base - timer[i].start) >= timer[i].tics) {
+				leave_critical ();
+				assert (timer[i].func);
+				flag = (*timer[i].func) (timer[i].arg);
+				enter_critical ();
+				if (timer_restart == flag) {
+					timer[i].start = avm_time_base;
+				} else {
+					timer[i].func = 0;
+				}
+			}
+		}
+	}
+	leave_critical ();
+} /* os_timer_poll */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static int	nl_needed = 0;
+
+void os_printf (char * s, va_list args) {
+#if !defined (NDEBUG)
+	char	buffer[500];
+	char *	bufptr = buffer;
+	int	count;
+
+	if (nl_needed) {
+		nl_needed = 0;
+		printk ("\n");
+	}	
+	count = VSNPRINTF (bufptr, sizeof (buffer), s, args);
+	if ('\n' == buffer[0]) {
+		bufptr++;
+	}
+	if ('\n' != buffer[count - 1]) {
+		assert (count < 498);
+		buffer[count++] = '\n';
+		buffer[count]   = (char) 0;
+	}
+	lprintf (KERN_INFO, bufptr);
+#else
+	s = s;
+	args = args;
+#endif
+} /* os_printf */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void os_puts (char * str, ...) { 
+	va_list dummy;
+
+	va_start (dummy, str);
+	os_printf (str, dummy);
+	va_end (dummy);
+} /* os_puts */
+ 
+void os_putl (long l) { 
+
+	nl_needed = 1; 
+	lprintf (KERN_INFO, "%ld", l); 
+}  /* os_putl */
+
+void os_puti (int i) { 
+
+	nl_needed = 1; 
+	lprintf (KERN_INFO, "%d", i); 
+} /* os_puti */
+
+void os_putnl (void) { 
+
+	nl_needed = 0; 
+	lprintf (KERN_INFO, "\n"); 
+}  /* os_putnl */
+
+void os_putc (char c) {
+	char buffer[10];
+    
+	nl_needed = 1;
+	if ((31 < c) && (c < 127)) {
+	        sprintf (buffer, "'%c' (0x%02x)", c, (unsigned char) c);
+	} else {
+		sprintf (buffer, "0x%02x", (unsigned char) c);
+	}
+	lprintf (KERN_INFO, "%s", buffer);
+} /* os_putc */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static lib_callback_t *	lib	= NULL;
+static lib_interface_t	libif	= {
+
+	init:				&os_init,
+	params:				&os_params,
+	get_message:			&os_get_message,
+	put_message:			&os_put_message,
+	get_data_block:			&os_get_data_block,
+	free_data_block:		&os_free_data_block,
+	new_ncci:			&os_new_ncci,
+	free_ncci:			&os_free_ncci,
+	block_size:			&os_block_size,
+	window_size:			&os_window_size,
+	card:				&os_card,
+	appl_data:			&os_appl_data,
+	appl_1st_data:			&os_appl_1st_data,
+	appl_next_data:			&os_appl_next_data,
+	malloc:				&os_malloc,
+	free:				&os_free,
+	msec:				&os_msec,	
+	timer_new:			&os_timer_new,
+	timer_delete:			&os_timer_delete,
+	timer_start:			&os_timer_start,
+	timer_stop:			&os_timer_stop,
+	timer_poll:			&os_timer_poll,
+	printf:				&os_printf,
+	puts:				(void (*) (char *)) &os_puts,
+	putl:				&os_putl,
+	puti:				&os_puti,
+	putc:				&os_putc,
+	putnl:				&os_putnl,
+	_enter_critical:		&os__enter_critical,
+	_leave_critical:		&os__leave_critical,
+	enter_critical:			&os_enter_critical,
+	leave_critical:			&os_leave_critical,
+	enter_cache_sensitive_code:	&os_enter_cache_sensitive_code,	
+	leave_cache_sensitive_code:	&os_leave_cache_sensitive_code,
+	name:				TARGET,
+	udata:				0,
+	pdata:				NULL
+} ;
+
+lib_callback_t * get_library (void) {
+
+	return lib;
+} /* get_library */
+
+lib_callback_t * link_library (void) {
+
+	return (lib = avm_lib_attach (&libif));
+} /* link_library */
+
+void free_library (void) {
+
+	if (lib != NULL) {
+		lib = 0;
+		avm_lib_detach (&libif);
+	}
+} /* free_library */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void printl (char * fmt, ...) {
+	va_list	args;
+	char	buffer [80];
+
+	va_start (args, fmt);
+	VSNPRINTF (buffer, sizeof (buffer), fmt, args);
+	printk (buffer);
+	va_end (args);
+} /* printl */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/lib.h linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/lib.h
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/lib.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/lib.h	2003-07-08 00:02:00.000000000 +0200
@@ -0,0 +1,36 @@
+/* 
+ * lib.h
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#ifndef __have_lib_h__
+#define __have_lib_h__
+
+#include "libdefs.h"
+
+extern lib_callback_t * get_library (void);
+extern lib_callback_t * link_library (void);
+extern void free_library (void);
+
+extern void printl (char * fmt, ...);
+
+extern void os_timer_poll (void);
+
+#endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/libdefs.h linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/libdefs.h
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/libdefs.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/libdefs.h	2003-07-08 00:02:00.000000000 +0200
@@ -0,0 +1,114 @@
+/* 
+ * libdefs.h
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#ifndef __have_libdefs_h__
+#define __have_libdefs_h__
+
+#include <stdarg.h>
+
+typedef void (* register_t) (void *, unsigned);
+typedef void (* release_t) (void *);
+typedef void (* down_t) (void);
+
+typedef enum {
+
+	timer_end	= 0,
+	timer_restart	= 1
+} restart_t;
+
+typedef restart_t (* timerfunc_t) (unsigned long);
+
+typedef struct __data {
+
+	unsigned	num;
+	char *		buffer;
+} appldata_t;
+
+typedef struct __lib {
+
+	void (* init) (unsigned, register_t, release_t, down_t);
+	char * (* params) (void);
+	int (* get_message) (unsigned char *);
+	void (* put_message) (unsigned char *);
+	unsigned char * (* get_data_block) (unsigned, unsigned long, unsigned);
+	void (* free_data_block) (unsigned, unsigned char *);
+	int (* new_ncci) (unsigned, unsigned long, unsigned, unsigned);
+	void (* free_ncci) (unsigned, unsigned long);
+	unsigned (* block_size) (unsigned);
+	unsigned (* window_size) (unsigned);
+	unsigned (* card) (void);
+	void * (* appl_data) (unsigned);
+	appldata_t * (* appl_1st_data) (appldata_t *);
+	appldata_t * (* appl_next_data) (appldata_t *);
+	void * (* malloc) (unsigned);
+	void (* free) (void *);
+	unsigned long (* msec) (void);
+	int (* timer_new) (unsigned);
+	void (* timer_delete) (void);
+	int (* timer_start) (unsigned, unsigned long, unsigned long, timerfunc_t);
+	int (* timer_stop) (unsigned);
+	void (* timer_poll) (void);
+	void (* printf) (char *, va_list);
+	void (* puts) (char *);
+	void (* putl) (long);
+	void (* puti) (int);
+	void (* putc) (char);
+	void (* putnl) (void);
+	void (* _enter_critical) (const char *, int);
+	void (* _leave_critical) (const char *, int);
+	void (* enter_critical) (void);
+	void (* leave_critical) (void);
+	void (* enter_cache_sensitive_code) (void);
+	void (* leave_cache_sensitive_code) (void);
+
+	char *		name;
+	unsigned	udata;
+	void *		pdata;
+} lib_interface_t;
+
+typedef struct __f {
+	
+	unsigned	nfuncs;
+	void	     (* sched_ctrl) (unsigned);
+	void         (* wakeup_ctrl) (unsigned);
+} functions_t, * functions_p;
+
+typedef struct __cb {
+
+	unsigned (* cm_start) (void);
+	char * (* cm_init) (unsigned, unsigned);
+	int (* cm_activate) (void);
+	int (* cm_exit) (void);
+	unsigned (* cm_handle_events) (void);
+	int (* cm_schedule) (void);
+	void (* cm_timer_irq_control) (unsigned);
+	void (* cm_register_ca_functions) (functions_p);
+	unsigned (* check_controller) (unsigned, unsigned *);
+
+	void * (* lib_heap_init) (void *, unsigned);
+	void (* lib_heap_exit) (void *);
+	void * (* lib_heap_alloc) (void *, unsigned);
+	void (* lib_heap_free) (void *, void *);
+} lib_callback_t;
+
+#endif
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/libstub.h linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/libstub.h
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/libstub.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/libstub.h	2003-07-08 00:02:00.000000000 +0200
@@ -0,0 +1,37 @@
+/* 
+ * libstub.h
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#ifndef __have_libstub_h__
+#define __have_libstub_h__
+
+#include "libdefs.h"
+
+#if defined (OSDEBUG) && defined (NDEBUG)
+# undef NDEBUG
+#endif
+
+extern lib_callback_t * avm_lib_attach (lib_interface_t * lif);
+extern void avm_lib_detach (lib_interface_t * lif);
+extern volatile unsigned long avm_time_base;
+
+#endif
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/main.c linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/main.c
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/main.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/main.c	2004-09-05 18:49:34.000000000 +0200
@@ -0,0 +1,212 @@
+/* 
+ * main.c
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#ifndef EXPORT_SYMTAB
+# define EXPORT_SYMTAB
+#endif
+ 
+#include <stdarg.h>
+#include <asm/uaccess.h>
+#include <linux/config.h>
+#include <linux/version.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/string.h>
+#include <linux/skbuff.h>
+#include <linux/errno.h>
+#include <linux/capi.h>
+#include <linux/ctype.h>
+
+#if defined (__fcpci__)
+#include <linux/pci.h>
+#elif defined (__fcpnp__)
+#include <linux/isapnp.h>
+#endif
+
+#include "capilli.h"
+#include "driver.h"
+#include "tools.h"
+#include "defs.h"
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static char *	REVCONST = "$Revision: $";
+char		REVISION[32];
+
+#if defined (MODULE_LICENSE)
+MODULE_LICENSE ("GPL");
+#endif
+#if defined (MODULE_DESCRIPTION)
+MODULE_DESCRIPTION ("CAPI4Linux: Driver for " PRODUCT_LOGO);
+#endif
+#if defined (MODULE_AUTHOR)
+MODULE_AUTHOR("AVM GmbH");
+#endif
+
+#if defined (__fcpcmcia__)
+EXPORT_SYMBOL (avm_a1pcmcia_addcard);
+EXPORT_SYMBOL (avm_a1pcmcia_delcard);
+#else
+EXPORT_NO_SYMBOLS;
+#endif
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+#if defined (__fcpci__)
+#define	PCI_DEVICE_ID_FRITZ1	0x0A00
+#define	PCI_DEVICE_ID_FRITZ2	0x0E00
+
+static struct pci_device_id fcpci_id_table[] __initdata = {
+	{ PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_FRITZ1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+	{ PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_FRITZ2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+	{ /* Terminating entry */ }
+} ;
+
+MODULE_DEVICE_TABLE (pci, fcpci_id_table);
+#elif defined (__fcpnp__)
+static struct isapnp_device_id fcpnp_id_table[] __initdata = {
+	{ ISAPNP_VENDOR('A', 'V', 'M'), ISAPNP_FUNCTION(0x0900), 
+		ISAPNP_VENDOR('A', 'V', 'M'), ISAPNP_FUNCTION(0x0900), 0 },
+	{ /* Terminating entry */ }
+} ;
+
+MODULE_DEVICE_TABLE (isapnp, fcpnp_id_table);
+#endif
+#else
+#define	__exit
+#endif
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#ifndef NDEBUG
+static void base_address (void) {
+
+	log ("Base address: %p\n", base_address);
+	log ("Compile time: %s\n", __TIME__);
+} /* base_address */
+#endif
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#if defined (__fcpci__) || (defined (__fcpnp__) && defined (CONFIG_ISAPNP))
+static int auto_attach (void) {
+	struct capicardparams args;
+
+	lprintf (KERN_INFO, "Auto-attaching...\n");
+	return add_card (&capi_interface, &args);
+} /* auto_attach */
+#endif
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void inc_use_count (void) { MOD_INC_USE_COUNT; }
+void dec_use_count (void) { MOD_DEC_USE_COUNT; }
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static int __init fritz_init (void) {
+	char * tmp;
+	
+#define	RETURN(x)	MOD_DEC_USE_COUNT; return (x);
+
+#ifndef NDEBUG
+	base_address ();
+#endif
+	if ((NULL != (tmp = strchr (REVCONST, ':'))) && isdigit (*(tmp + 2))) {
+		strncpy (REVISION, tmp + 1, sizeof (REVISION));
+		tmp = strchr (REVISION, '$');
+		*tmp = 0;
+	} else {
+		strcpy (REVISION, REV_DEFAULT);
+	}
+	lprintf (KERN_INFO, "%s, revision %s\n", DRIVER_LOGO, REVISION);
+        lprintf (KERN_INFO, "(%s built on %s at %s)\n", TARGET, __DATE__, __TIME__);
+		
+	/*-------------------------------------------------------------------*\
+	 * 64 bit CAPI is not supported yet.
+	\*-------------------------------------------------------------------*/
+	if (sizeof (char *) > 4) {
+		lprintf (KERN_ERR, "Cannot deal with 64 bit CAPI messages!\n");
+		return -ENOSYS;
+	}
+
+	MOD_INC_USE_COUNT;		/* Protect attachment procedure */
+	lprintf (KERN_INFO, "Loading...\n");
+	if (!driver_init ()) {
+		lprintf (KERN_INFO, "Error: Driver library not available.\n");
+		lprintf (KERN_INFO, "Not loaded.\n");
+		RETURN (-ENOSYS);
+	}
+	capi_driver = attach_capi_driver (&capi_interface);
+	if (NULL == capi_driver) {
+		lprintf (KERN_INFO, "Error: Could not attach the driver.\n");
+		lprintf (KERN_INFO, "Not loaded.\n");
+		driver_exit ();
+		RETURN (-EIO);
+	} 
+#if defined (__fcpci__) || (defined (__fcpnp__) && defined (CONFIG_ISAPNP))
+	if (0 != auto_attach ()) {
+		lprintf (KERN_INFO, "Not loaded.\n");
+		detach_capi_driver (&capi_interface);
+		driver_exit ();
+		RETURN (-EIO);
+	}
+#endif   
+	libheap_init (MAX_LIB_HEAP_SIZE);
+	lprintf (KERN_INFO, "Loaded.\n");
+	RETURN (0);
+
+#undef RETURN
+
+} /* fritz_init */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void __exit fritz_exit (void) {
+
+	if (capi_controller != NULL) {
+		lprintf (KERN_INFO, "Shutting down controller...\n");
+		stop (capi_card);
+		(*capi_driver->detach_ctr) (capi_controller);
+	}
+	lprintf (KERN_INFO, "Removing...\n");
+	detach_capi_driver (&capi_interface);
+	libheap_exit ();
+	driver_exit ();
+#ifndef NDEBUG
+	if (hallocated() != 0) {
+		lprintf (KERN_ERR, "%u bytes leaked.\n", hallocated());
+	}
+#endif
+	lprintf (KERN_INFO, "Removed.\n");
+} /* fritz_exit */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+module_init (fritz_init);
+module_exit (fritz_exit);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/main.h linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/main.h
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/main.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/main.h	2003-07-08 00:02:00.000000000 +0200
@@ -0,0 +1,31 @@
+/* 
+ * main.h
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#ifndef __have_main_h__
+#define __have_main_h__
+
+extern void inc_use_count (void);
+extern void dec_use_count (void);
+
+extern char REVISION[];
+
+#endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/makefile linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/makefile
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/makefile	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/makefile	2003-07-08 00:02:00.000000000 +0200
@@ -0,0 +1,48 @@
+SOURCES		= main.c driver.c tables.c queue.c lib.c tools.c 
+OBJECTS		= $(patsubst %.c,%.o,$(SOURCES)) 
+LIBRARY		= ../lib/$(CARD)-lib.o
+
+CARD_PATH	= /lib/modules/`uname -r`/misc
+CS_PATH		= /lib/modules/`uname -r`/pcmcia-external
+
+# As propsed by /usr/include/linux/version.h...
+KRNLINCL	= /lib/modules/`uname -r`/build/include
+# KRNLINCL	= /usr/src/linux/include
+
+DEFINES		= -DMODULE -D__KERNEL__ -DNDEBUG \
+		  -D__$(CARD)__ -DTARGET=\"$(CARD)\" 
+CCFLAGS 	= -c $(DEFINES) -O2 -Wall -I $(KRNLINCL)
+LDFLAGS		= -r
+
+ifeq ($(CARD),fcpcmcia)
+CS_MOD		= fcpcmcia_cs.o
+CS_SRC		= fcpcmcia_cs.c
+else
+CS_MOD		=
+CS_SRC		=
+endif
+
+all:		$(CARD).o $(LIBRARY) $(CS_MOD)
+
+install:	$(CARD).o $(LIBRARY) $(CS_MOD)
+		mkdir -p $(CARD_PATH)
+		cp -f $(CARD).o $(CARD_PATH)
+ifeq ($(CARD),fcpcmcia)
+		mkdir -p $(CS_PATH)
+		cp -f $(CS_MOD) $(CS_PATH)
+endif
+
+clean:		
+		$(RM) $(OBJECTS) $(CARD).o $(CS_MOD)
+
+$(CARD).o:	$(OBJECTS)
+		$(LD) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBRARY)
+
+$(OBJECTS):	%.o: %.c
+		$(CC) $(CCFLAGS) $< -o $@ 
+
+$(CS_MOD):	$(CS_SRC)
+		$(CC) $(CCFLAGS) $< -o $@
+
+# No dependencies yet...
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/queue.c linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/queue.c
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/queue.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/queue.c	2003-07-08 00:02:00.000000000 +0200
@@ -0,0 +1,276 @@
+/* 
+ * queue.c
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#include "defs.h"
+#include "driver.h"
+#include "tools.h"
+#include "tables.h"
+#include "queue.h"
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#define	MAKE_KEY(a,n,h)	(((tag_t)(a)<<48)+((tag_t)(n)<<16)+((tag_t)(h)))
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static qitem_t *	free_list = NULL;
+
+static inline qitem_t * alloc_item (void) {
+	qitem_t *	item;
+	
+	if (free_list != NULL) {
+		item = free_list;
+		free_list = item->succ;
+	} else {
+		item = (qitem_t *) hmalloc (sizeof (qitem_t));
+	}
+	info (item);
+	return item;
+} /* alloc_item */
+
+static inline void free_item (qitem_t * item) {
+	
+	assert (item);
+	item->succ = free_list;
+	free_list = item;
+} /* free_item */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void queue_init (queue_t ** q) { 
+    
+	if (NULL == (*q = (queue_t *) hmalloc (sizeof (queue_t)))) {
+		lprintf (KERN_ERR, "Not enough memory for queue struct.\n");
+	} else {
+		(*q)->noconf = (*q)->put = (*q)->get = NULL;
+		(*q)->num = 0;
+	}
+	assert (free_list == NULL);
+} /* queue_init */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void queue_exit (queue_t ** q) { 
+	qitem_t * item;
+    
+	assert (q != NULL);
+	assert (*q != NULL);
+	while ((*q)->get != NULL) {
+		item = (*q)->get->succ;
+		KFREE_SKB ((*q)->get->msg);
+		hfree ((*q)->get);
+		(*q)->get = item;
+	}
+	while ((*q)->noconf != NULL) {
+		item = (*q)->noconf->succ;
+		KFREE_SKB ((*q)->noconf->msg);
+		hfree ((*q)->noconf);
+		(*q)->noconf = item;
+	}
+	while (free_list != NULL) {
+		item = free_list->succ;
+		hfree (free_list);
+		free_list = item;
+	}
+	hfree (*q);
+	*q = NULL;
+} /* queue_exit */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static int enqueue (queue_t * q, struct sk_buff * msg) {
+	qitem_t * item;
+
+	if (NULL == (item = alloc_item ())) {
+		lprintf (KERN_ERR, "Not enough memory for queue item.\n");
+		lprintf (KERN_ERR, "Message lost.\n");
+		return 0;
+	}
+	item->succ = NULL;
+	item->msg  = msg;
+	item->key  = 0;
+	assert (q != NULL);
+	if (q->num != 0) {
+		q->put->succ = item;
+	} else {
+		q->get = item;
+	}
+	q->put = item;
+	q->num++;
+	return 1;
+} /* enqueue */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static struct sk_buff * dequeue (queue_t * q) {
+	struct sk_buff * res;
+	qitem_t *        item;
+	qitem_t *        tmp;
+
+	assert (q != NULL);
+	assert (q->get != NULL);
+	res = q->get->msg;
+	item = q->get->succ;
+	tmp = q->get;
+	q->get = item;
+	q->num--;
+	free_item (tmp);
+	return res;
+} /* dequeue */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int queue_put (queue_t * q, struct sk_buff * msg) {
+	int res;
+	
+	assert (q != NULL);
+	lock ();
+	res = enqueue (q, msg);
+	unlock ();
+	return res;
+} /* queue_put */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+struct sk_buff * queue_peek (queue_t * q) {
+	struct sk_buff * tmp = NULL;
+
+	assert (q != NULL);
+	lock ();
+	if (!queue_is_empty (q)) {
+		assert (q->get != NULL);
+		tmp = q->get->msg;
+	} else {
+		lprintf (KERN_ERR, "Queue underflow.\n");
+	}
+	unlock ();
+	return tmp;
+} /* queue_peek */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+struct sk_buff * queue_get (queue_t * q) {
+	struct sk_buff * tmp = NULL;
+
+	assert (q != NULL);
+	lock ();
+	if (!queue_is_empty (q)) {
+		tmp = dequeue (q);
+	} else {
+		lprintf (KERN_ERR, "Cannot read empty queue.\n");
+	}
+	unlock ();
+	return tmp;
+} /* queue_get */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void queue_drop (queue_t * q) {
+	struct sk_buff * tmp;
+
+	assert (q != NULL);
+	lock ();
+	if (!queue_is_empty (q)) {
+		tmp = dequeue (q);
+		KFREE_SKB (tmp);
+	} else {
+		lprintf (KERN_ERR, "Cannot read empty queue.\n");
+	}
+	unlock ();
+} /* queue_drop */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int queue_size (queue_t * q) { 
+
+	assert (q != NULL);
+	return (int) q->num; 
+} /* queue_size */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int queue_is_empty (queue_t * q) { 
+
+	assert (q != NULL);
+	return (q->num == 0) ? TRUE : FALSE; 
+} /* queue_is_empty */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void queue_park (queue_t * q, unsigned appl, NCCI_t ncci, unsigned hand) {
+	struct sk_buff * eoq;
+	qitem_t *        item;
+
+	assert (q != NULL);
+	if (NULL == (eoq = queue_get (q))) {
+		lprintf (KERN_ERR, "Cannot park from empty queue.\n");
+		return;
+	}
+	if (NULL == (item = alloc_item ())) {
+		lprintf (KERN_ERR, "Not enough memory for queue item.\n");
+		return;
+	}
+	item->key  = MAKE_KEY (appl, ncci, hand);
+	item->msg  = eoq;
+	item->pred = NULL;
+	lock ();
+	item->succ = q->noconf;
+	if (q->noconf != NULL) {
+		q->noconf->pred = item;
+	}
+	q->noconf = item;
+	unlock ();
+} /* queue_park */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void queue_conf (queue_t * q, unsigned appl, NCCI_t ncci, unsigned hand) {
+	qitem_t *	item;
+	tag_t		key = MAKE_KEY (appl, ncci, hand);
+
+	assert (q != NULL);
+	lock ();
+	item = q->noconf;
+	while ((item != NULL) && (item->key != key)) {
+		item = item->succ;
+	}
+	if (item != NULL) {
+		if (item->succ != NULL) {
+			item->succ->pred = item->pred;
+		}
+		if (item->pred != NULL) {
+			item->pred->succ = item->succ;
+		} else {
+			q->noconf = item->succ;
+		}
+		assert (item->msg);
+		KFREE_SKB (item->msg);
+		free_item (item);
+	} else {
+		log ("Tried to confirm unknown data b3 message.\n");
+	}
+	unlock ();
+} /* queue_conf */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/queue.h linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/queue.h
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/queue.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/queue.h	2003-07-08 00:02:00.000000000 +0200
@@ -0,0 +1,62 @@
+/* 
+ * queue.h
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#ifndef __have_queue_h__
+#define __have_queue_h__
+
+#include <linux/skbuff.h>
+
+typedef long long	tag_t;
+typedef __u32		NCCI_t;
+
+typedef struct __qitem {
+
+	tag_t			key;
+	struct sk_buff *	msg;
+	struct __qitem *	succ;
+	struct __qitem *	pred;
+} qitem_t;
+
+typedef struct __queue {
+
+	qitem_t *		put;
+	qitem_t *		get;
+	qitem_t *		noconf;
+	unsigned		num;
+} queue_t;
+
+extern void queue_init (queue_t ** q);
+extern void queue_exit (queue_t ** q);
+
+extern int queue_put (queue_t * q, struct sk_buff * msg);
+extern struct sk_buff * queue_peek (queue_t * q);
+extern struct sk_buff * queue_get (queue_t * q);
+extern void queue_drop (queue_t * q);
+
+extern int queue_size (queue_t * q);
+extern int queue_is_empty (queue_t * q);
+
+extern void queue_park (queue_t * q, unsigned appl, NCCI_t ncci, unsigned hand);
+extern void queue_conf (queue_t * q, unsigned appl, NCCI_t ncci, unsigned hand);
+
+#endif
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/tables.c linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/tables.c
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/tables.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/tables.c	2003-07-08 00:02:00.000000000 +0200
@@ -0,0 +1,316 @@
+/* 
+ * tables.c
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#include <linux/skbuff.h>
+#include <linux/capi.h>
+#include <linux/kernelcapi.h>
+#include "defs.h"
+#include "main.h"
+#include "tools.h"
+#include "driver.h"
+#include "queue.h"
+#include "tables.h"
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void table_init (appltab_t ** tab) {
+
+	if (NULL != (*tab = (appltab_t *) hmalloc (sizeof (appltab_t)))) {
+		(*tab)->appl_root  = NULL;
+		(*tab)->appl_count = 0;
+	}
+} /* table_init */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void table_exit (appltab_t ** tab) {
+	appl_t *	appp;
+	appl_t *	tmp;
+    
+	assert (*tab);
+	appp = (*tab)->appl_root;
+	while (appp != NULL) {
+		tmp = appp->succ;
+		capi_card->count--;
+		remove_appl (*tab, appp);
+		if (appp->data != NULL) {
+			hfree (appp->data);
+		}
+		appp = tmp;
+	}
+	hfree (*tab);
+	*tab = NULL;
+} /* table_exit */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+appl_t * create_appl (
+	appltab_t *	tab, 
+	unsigned	id, 
+	unsigned	ncount, 
+	unsigned	bcount, 
+	unsigned	bsize
+) {
+	appl_t *	appp;
+
+	if (NULL == (appp = (appl_t *) hmalloc (sizeof (appl_t)))) {
+		lprintf (KERN_ERR, "Not enough memory for application record.\n");
+		return NULL;
+	}
+	appp->id         = id;
+	appp->ncci_count = ncount;
+	appp->blk_count  = bcount;
+	appp->blk_size   = bsize;
+	appp->data       = NULL;
+	appp->dying      = FALSE;
+	appp->nncci      = 0;
+	appp->root       = NULL;
+	appp->pred       = NULL;
+	lock ();
+	appp->succ       = tab->appl_root;
+	tab->appl_root = appp;
+	if (NULL != appp->succ) {
+		appp->succ->pred = appp;
+	}
+	tab->appl_count++;
+	unlock ();
+	return appp;
+} /* create_appl */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void remove_appl (appltab_t * tab, appl_t * appp) {
+	ncci_t *	nccip;
+	ncci_t *	tmp;
+
+	assert (appp);
+	lock ();
+	if (appp->pred != NULL) {
+		appp->pred->succ = appp->succ;
+	} else {
+		tab->appl_root = appp->succ;
+	}
+	if (appp->succ != NULL) {
+		appp->succ->pred = appp->pred;
+	}
+	if (appp->data != NULL) {
+		hfree (appp->data);
+		appp->data = NULL;
+	}
+	nccip = appp->root;
+	tab->appl_count--;
+	unlock ();
+	while (nccip != NULL) {
+		tmp = nccip->succ;
+		remove_ncci (tab, appp, nccip);
+		nccip = tmp;
+	}
+	hfree (appp);
+} /* remove_appl */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+appl_t * search_appl (appltab_t * tab, unsigned id) {
+	appl_t * appp;
+
+	lock ();
+	appp = tab->appl_root;
+	while (appp != NULL) {
+		if (appp->id == id) {
+			break;
+		}
+		appp = appp->succ;
+	}
+	unlock ();
+	info (appp);
+	return appp;
+} /* search_appl */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+appl_t * get_appl (appltab_t * tab, unsigned ix) {
+	appl_t *	appp = NULL;
+
+	assert (ix < tab->appl_count);
+	lock ();
+	if (ix < tab->appl_count) {
+		appp = tab->appl_root;
+		while (ix > 0) {
+			appp = appp->succ;
+			--ix;
+		}
+	}
+	unlock ();
+	return appp;
+} /* get_appl */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+appl_t * next_appl (appltab_t * tab, appl_t * appp) {
+
+	UNUSED_ARG (tab);
+	assert (appp);
+	return appp->succ;
+} /* next_appl */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+appl_t * first_appl (appltab_t * tab) {
+
+	return tab->appl_root;
+} /* first_appl */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int handle_message (appltab_t * tab, appl_t * appp, struct sk_buff * msg) {
+	int ok;
+
+	UNUSED_ARG (tab);
+	UNUSED_ARG (appp);
+	assert (msg);
+	if (!(ok = queue_put (capi_card->queue, msg))) {
+		lprintf (KERN_ERR, "Message queue overflow. Message lost...\n");
+		KFREE_SKB (msg);
+	}
+	return ok;
+} /* handle_message */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+ncci_t * create_ncci (	
+	appltab_t *		tab, 
+	appl_t *		appp, 
+	NCCI_t			ncci, 
+	unsigned		wsize, 
+	unsigned		bsize
+) {
+	ncci_t *		tmp;
+	unsigned char **	data;
+
+	UNUSED_ARG (tab);
+	if (NULL == (tmp = (ncci_t *) hmalloc (sizeof (ncci_t)))) {
+		lprintf (KERN_ERR, "Failed to allocate NCCI record.\n");
+		return NULL;
+	}
+	data = (unsigned char **) hcalloc (sizeof (unsigned char *) 
+							* appp->blk_count);
+	if (NULL == data) {
+		lprintf (KERN_ERR, "Failed to allocate data buffer directory.\n");
+		hfree (tmp);
+		return NULL;
+	}
+	tmp->ncci     = ncci;
+	tmp->appl     = appp->id;
+	tmp->win_size = wsize;
+	tmp->blk_size = bsize;
+	tmp->data     = data;
+	tmp->pred     = NULL;
+	lock ();
+	tmp->succ     = appp->root;
+	appp->root    = tmp;
+	if (NULL != tmp->succ) {
+		tmp->succ->pred = tmp;
+	}
+	appp->nncci++;
+	unlock ();
+	return tmp;
+} /* create_ncci */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void remove_ncci (appltab_t * tab, appl_t * appp, ncci_t * nccip) {
+	unsigned	i;
+
+	UNUSED_ARG (tab);
+	assert (appp);
+	assert (nccip);
+	if (nccip != NULL) {
+		lock ();
+		for (i = 0; i < appp->blk_count; i++) {
+			if (nccip->data[i] != NULL) {
+				hfree (nccip->data[i]);
+			}
+		}
+		hfree (nccip->data);
+		if (nccip->succ != NULL) {
+			nccip->succ->pred = nccip->pred;
+		}
+		if (nccip->pred != NULL) {
+			nccip->pred->succ = nccip->succ;
+		} else {
+			appp->root = nccip->succ;
+		}
+		hfree (nccip);
+		appp->nncci--;
+		unlock ();
+	}
+} /* remove_ncci */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+unsigned char * ncci_data_buffer (
+	appltab_t *	tab,
+	appl_t *	appp,
+	NCCI_t		ncci,
+	unsigned	index
+) {
+	ncci_t *	nccip;
+
+        UNUSED_ARG (tab);
+        if (NULL == (nccip = locate_ncci (appp, ncci))) {
+                log ("Data buffer request failed. NCCI not found.\n");
+                return NULL;
+        }
+        lock ();
+        if (index >= appp->blk_count) {
+                unlock ();
+                log ("Data buffer index out of range.\n");
+                return NULL;
+        }
+        if (nccip->data[index] == NULL) {
+                if (NULL == (nccip->data[index] = (unsigned char *) hmalloc (appp->blk_size))) {
+                        lprintf (KERN_ERR, "Not enough memory for data buffer.\n");
+                }
+        }
+        unlock ();
+        return nccip->data[index];
+} /* ncci_data_buffer */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+ncci_t * locate_ncci (appl_t * appp, NCCI_t ncci) {
+	ncci_t *	tmp;
+
+	assert (appp);
+	lock ();
+	tmp = appp->root;
+	while ((tmp != NULL) && (tmp->ncci != ncci)) {
+		tmp = tmp->succ;
+	}
+	unlock ();
+	info (tmp);
+	return tmp;
+} /* locate_ncci */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/tables.h linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/tables.h
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/tables.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/tables.h	2003-07-08 00:02:00.000000000 +0200
@@ -0,0 +1,112 @@
+/* 
+ * tables.h
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#ifndef __have_tables_h__
+#define __have_tables_h__
+
+#include <asm/types.h>
+#include <linux/wait.h>
+#include <linux/skbuff.h>
+#include <linux/capi.h>
+#include "queue.h"
+#include "capilli.h"
+
+typedef struct __ncci {
+
+    NCCI_t		ncci;
+    unsigned		appl;
+    unsigned		win_size;
+    unsigned		blk_size;
+    unsigned char **	data;
+    struct __ncci *	pred;
+    struct __ncci *	succ;
+} ncci_t;
+
+typedef struct __appl {
+
+    unsigned		id;
+    unsigned		dying;
+    struct capi_ctr *	ctrl;
+    void *		data;
+    unsigned		blk_size;
+    unsigned		blk_count;
+    unsigned		ncci_count;
+    unsigned		nncci;
+    ncci_t *		root;
+    struct __appl *	pred;
+    struct __appl *	succ;
+} appl_t;
+
+typedef struct __appltab {
+
+    appl_t *		appl_root;
+    unsigned		appl_count;
+} appltab_t;
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern void table_init (appltab_t ** tab);
+extern void table_exit (appltab_t ** tab);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern appl_t * create_appl (
+	appltab_t *		tab, 
+	unsigned		id, 
+	unsigned		ncount, 
+	unsigned		bcount, 
+	unsigned		bsize
+);
+extern void remove_appl (appltab_t * tab, appl_t * appp);
+
+extern appl_t * search_appl (appltab_t * tab, unsigned id);
+extern appl_t * get_appl (appltab_t * tab, unsigned ix);
+extern appl_t * first_appl (appltab_t * tab);
+extern appl_t * next_appl (appltab_t * tab, appl_t * appp);
+
+extern int handle_message (
+	appltab_t *		tab,
+	appl_t *		appp,
+	struct sk_buff *	msg
+);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern ncci_t * create_ncci (
+	appltab_t *		tab, 
+	appl_t *		appp, 
+	NCCI_t			ncci, 
+	unsigned		wsize, 
+	unsigned		bsize
+);
+extern void remove_ncci (appltab_t * tab, appl_t * appp, ncci_t * nccip);
+
+extern unsigned char * ncci_data_buffer (
+	appltab_t *		tab,
+	appl_t *		appp,
+	NCCI_t			ncci,
+	unsigned		index
+);
+extern ncci_t * locate_ncci (appl_t * appp, NCCI_t ncci);
+extern ncci_t * search_ncci (appltab_t * tab, unsigned appl, NCCI_t ncci);
+
+#endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/tools.c linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/tools.c
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/tools.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/tools.c	2003-07-08 00:02:00.000000000 +0200
@@ -0,0 +1,398 @@
+/* 
+ * tools.c
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#include <linux/string.h>
+#include <linux/vmalloc.h>
+#include <linux/kernel.h>
+#include <linux/version.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,18)
+#include <linux/slab.h>
+#else
+#include <linux/malloc.h>
+#endif
+
+#include "defs.h"
+#include "libdefs.h"
+#include "driver.h"
+#include "tools.h"
+
+typedef struct __header {
+
+	unsigned	type;
+#if !defined (NDEBUG)
+	unsigned	size;
+	unsigned	from;
+	unsigned	tag;
+#endif
+} header_t;
+
+#define	TYPE_NONE	'?'
+#define TYPE_KMALLOCED	'k'
+#define	TYPE_VMALLOCED	'v'
+#define	TYPE_SMALLOCED	's'
+
+#define	ALLOC_NORMAL	0
+#define	ALLOC_SPECIAL	1
+
+#define	PRIORITY	GFP_ATOMIC
+
+static void *		lib_heap_base	= NULL;
+static unsigned		lib_heap_size	= 0;
+
+#if !defined (NDEBUG)
+#include <asm/atomic.h>
+
+#define	FENCE_TAG	0xDEADBEEF
+#define	FENCE1_OK(h,m)	((h)->tag==FENCE_TAG)
+#define	FENCE2_OK(h,m)	(*(unsigned *)(((char *) m)+(h)->size)==FENCE_TAG)
+
+static atomic_t		alloc_count	= ATOMIC_INIT (0);
+
+#if !defined (NDEBUG) && defined (LOG_TIMER)
+static struct timeval	zero_time;
+#endif
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+unsigned hallocated (void) {
+    
+	return atomic_read (&alloc_count);
+} /* hallocated */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+unsigned hallocator (void * mem) {
+	header_t * hdr;
+
+	if (mem != NULL) {
+		hdr = ((header_t *) mem) - 1;
+		return FENCE1_OK(hdr, mem) ? 0 : hdr->from;
+	} else {
+		return 0;
+	}
+} /* hallocator */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int hvalid (void * mem) {
+	header_t *	hdr;
+	int		flag = TRUE;
+
+	if (mem != NULL) {
+		hdr  = ((header_t *) mem) - 1;
+		flag = FENCE1_OK(hdr, mem) && FENCE2_OK(hdr, mem);
+	} 
+	return flag;
+} /* hvalid */
+#endif
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+static void * ALLOCATE (unsigned n, unsigned * t, unsigned m) {
+	void *		temp;
+	unsigned	type;
+
+	temp = kmalloc (n, PRIORITY);
+	type = TYPE_KMALLOCED;
+	if (temp == NULL) {
+		if (ALLOC_NORMAL == m) {
+			assert (capi_lib->lib_heap_alloc != NULL);
+			info (lib_heap_base != NULL);
+			temp = (*capi_lib->lib_heap_alloc) (lib_heap_base, n);
+			type = TYPE_SMALLOCED;
+		} else {
+			temp = vmalloc (n);
+			type = TYPE_VMALLOCED;
+		}
+	}
+	info (temp != NULL);
+	*t = (temp != NULL) ? type : TYPE_NONE;
+#if defined (LOG_ALLOC)
+	log ("ALLOC (%u,%u) = 0x%p, type %c\n", n, m, temp, (char) *t);
+#endif
+	return temp;
+} /* ALLOCATE */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#if !defined (NDEBUG)
+#define	PATCH(n)	sizeof(header_t)+sizeof(unsigned)+((n)?(n):1)
+#else
+#define	PATCH(n)	sizeof(header_t)+((n)?(n):1)
+#endif
+
+static void * halloc (unsigned size, unsigned addr, unsigned mode) {
+	unsigned	n, t = TYPE_NONE;
+	void *		mem;
+	header_t *	hdr;
+
+	n = PATCH(size);
+	if (NULL == (hdr = (header_t *) ALLOCATE (n, &t, mode))) {
+		log (
+			"Memory request (%u/%u bytes) failed. (mode %u)\n", 
+			size, 
+			PATCH(size),
+			mode
+		);
+		mem = NULL;
+	} else {
+		mem = (void *) (hdr + 1);
+		hdr->type = t;
+#if !defined (NDEBUG)
+		hdr->size = size ? size : 1;
+		hdr->from = addr;
+		hdr->tag  = FENCE_TAG;
+		* (unsigned *) (((char *) mem) + size) = FENCE_TAG;
+		atomic_add (size, &alloc_count);
+#else
+		UNUSED_ARG (addr);
+#endif
+	}
+	return mem;
+} /* halloc */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+unsigned libheap_init (unsigned heap_size) {
+	void *	heap_base = NULL;
+
+	assert (lib_heap_base == NULL);
+	assert (heap_size > MIN_LIB_HEAP_SIZE);
+	do {
+		if (NULL != (heap_base = halloc (heap_size, (unsigned) &libheap_init, ALLOC_SPECIAL))) {
+			lib_heap_base = heap_base;
+			lib_heap_size = heap_size;
+			(*capi_lib->lib_heap_init) (heap_base, heap_size);
+			return heap_size;
+		}
+		heap_size /= 2;
+	} while (heap_size > 0);
+	return 0;
+} /* libheap_init */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void libheap_exit (void) {
+
+	assert (lib_heap_base != NULL);
+	(*capi_lib->lib_heap_exit) (lib_heap_base);
+	hfree (lib_heap_base);
+	lib_heap_base = NULL;
+	lib_heap_size = 0;
+} /* libheap_exit */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void * hmalloc (unsigned size) {
+
+	return halloc (size, *(((unsigned *) &size) - 1), ALLOC_NORMAL);
+} /* hmalloc */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void * hcalloc (unsigned size) {
+	void * mem;
+
+	mem = halloc (size, *(((unsigned *) &size) - 1), ALLOC_NORMAL);
+	if ((mem != NULL) && (size != 0)) {
+		memset (mem, 0, size);
+	}
+	return mem;
+} /* hcalloc */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void hfree (void * mem) {
+	header_t *	hdr;
+
+	if (mem != NULL) {
+		hdr = ((header_t *) mem) - 1;
+#if !defined (NDEBUG)
+		if (!(FENCE1_OK(hdr, mem) && FENCE2_OK(hdr, mem))) {
+			log (
+				"FENCE VIOLATED (%u/0x%08X)!\n", 
+				hdr->size, 
+				hdr->from
+			);
+		}
+		atomic_sub (hdr->size, &alloc_count);
+#if defined (LOG_ALLOC)
+		log ("FREE (0x%p, %u), type %c\n", hdr, hdr->size, hdr->type);
+#endif
+#endif
+		switch (hdr->type) {
+
+		case TYPE_KMALLOCED:	
+			kfree (hdr);	
+			break;
+		case TYPE_VMALLOCED:	
+			vfree (hdr);	
+			break;
+		case TYPE_SMALLOCED:	
+			assert (capi_lib->lib_heap_free != NULL);
+			info (lib_heap_base != NULL);
+			(*capi_lib->lib_heap_free) (lib_heap_base, hdr);	
+			break;
+		default:		
+			assert (0);	
+			break;
+		}
+	}
+} /* hfree */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#if !defined (NDEBUG) && defined (LOG_TIMER)
+
+#include <linux/time.h>
+
+void setup_timer (dbg_timer * t, long dsec, long dusec) {
+	
+	assert (t != NULL);
+	memset (&t->t, 0, sizeof (t->t));
+	t->d.tv_sec  = dsec;
+	t->d.tv_usec = dusec;
+} /* dbg_setup_timer */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int check_timer (dbg_timer * t) {
+	int		res = 1;
+	struct timeval	now;
+	struct timeval	delta;
+	
+	assert (t != NULL);
+	do_gettimeofday (&now);
+	timeval_less (now, zero_time, &delta);
+	now = delta;
+	timeval_less (now, t->t, &delta);
+	if ((delta.tv_sec > t->d.tv_sec) 
+	|| ((delta.tv_sec == t->d.tv_sec) && (delta.tv_usec > t->d.tv_usec))
+	) {
+		lprintf (
+			KERN_INFO, 
+			"Timer '%s' exceeded: %ld s, %ld µs\n", 
+			t->name,
+			delta.tv_sec,
+			delta.tv_usec
+		);
+		res = 0;
+	} 
+	return res;
+} /* check_timer */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void touch_timer (dbg_timer * t) {
+	struct timeval	temp, delta;
+	
+	assert (t != NULL);
+	do_gettimeofday (&temp);
+	timeval_less (temp, zero_time, &delta);
+	t->t = delta;
+} /* touch_timer */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void start_watch (dbg_timer * w) {
+	struct timeval	temp, delta;
+	
+	assert (w != NULL);
+	do_gettimeofday (&temp);
+	timeval_less (temp, zero_time, &delta);
+	w->t = delta;
+} /* start_watch */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void stop_watch (dbg_timer * w) {
+	struct timeval	temp, delta;
+	
+	assert (w != NULL);
+	do_gettimeofday (&temp);
+	timeval_less (temp, zero_time, &delta);
+	temp = delta;
+	timeval_less (temp, w->t, &delta);
+	w->t = delta;
+} /* stop_watch */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+int timers_start (void) {
+
+	do_gettimeofday (&zero_time);
+	return 1;
+} /* timers_start */
+     
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void timers_stop (void) {
+
+} /* timers_stop */
+
+#endif /* !NDEBUG && LOG_TIMER */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void vlprintf (const char * level, const char * fmt, va_list args) {
+	static char line[256];
+
+	VSNPRINTF (line, sizeof (line), fmt, args);
+	printk ("%s%s: %s", level, TARGET, line);
+} /* vlprintf */
+ 
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void lprintf (const char * level, const char * fmt, ...) {
+	va_list args;
+
+	va_start (args, fmt);
+	vlprintf (level, fmt, args);
+	va_end (args);
+} /* lprintf */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+void message (const char * fmt, ...) {
+	va_list args;
+
+	va_start (args, fmt);
+	vlprintf (KERN_INFO, fmt, args);
+	va_end (args);
+} /* message */
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#ifndef NDEBUG
+void _OSassert (void * exp, void * file, unsigned line) {
+
+	message ("assert (%s) in %s(%u)\n", exp, file, line);
+} /* _OSassert */
+
+void _OSinfo (void * exp, void * file, unsigned line) {
+
+	message ("info (%s) in %s(%u)\n", exp, file, line);
+} /* _OSinfo */
+#endif
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/tools.h linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/tools.h
--- linux-2.4.20-wolk4.15-fullkernel/3rdparty/avm-fritz-pci/src.drv/tools.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/3rdparty/avm-fritz-pci/src.drv/tools.h	2003-07-08 00:02:00.000000000 +0200
@@ -0,0 +1,144 @@
+/* 
+ * tools.h
+ * Copyright (C) 2002, AVM GmbH. All rights reserved.
+ * 
+ * This Software is  free software. You can redistribute and/or
+ * modify such free software under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * The free software 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this Software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, or see
+ * http://www.opensource.org/licenses/lgpl-license.html
+ * 
+ * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+ */
+
+#ifndef __have_tools_h__
+#define __have_tools_h__
+
+#include <asm/atomic.h>
+#include <linux/spinlock.h>
+#include <linux/types.h>
+#include <stdarg.h>
+#include "defs.h"
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,4,4)
+#define VSNPRINTF(s,n,f,a)	vsnprintf (s, n, f, a)
+#define SNPRINTF(s,n,f,l...)	snprintf (s, n, f, ##l)
+#else
+#define VSNPRINTF(s,n,f,a)	vsprintf (s, f, a)
+#define SNPRINTF(s,n,f,l...)	sprintf (s, f, ##l)
+#endif
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#if !defined (NDEBUG)
+# define assert(x)	(!(x)?message("%s(%d): assert (%s) failed\n", \
+                                        __FILE__, __LINE__, #x):((void)0))
+# define info(x)	(!(x)?message("%s(%d): info (%s) failed\n", \
+					__FILE__, __LINE__, #x):((void)0))
+# define log(f,x...)	message (f, ##x)
+
+extern void message (const char * fmt, ...);
+#else
+# define assert(x)
+# define info(x)
+# define log(f,x...)
+#endif
+
+extern void lprintf  (const char * level, const char * fmt, ...);
+extern void vlprintf (const char * level, const char * fmt, va_list args);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#if !defined (NDEBUG)
+extern unsigned hallocated (void);
+extern unsigned hallocator (void * mem);
+extern int	hvalid (void * mem);
+#endif
+
+extern void *   hmalloc (unsigned size);
+extern void *   hcalloc (unsigned size);
+
+extern void     hfree (void * mem);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern unsigned libheap_init (unsigned heap_size);
+extern void libheap_exit (void);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#if !defined (NDEBUG) && defined (LOG_TIMER)
+
+#include <linux/time.h>
+
+typedef struct {
+
+	const char *	name;
+	struct timeval	t;
+	struct timeval	d;
+} dbg_timer;
+
+#define	PRINT_TIMER(x)		log ( \
+					"Timer '%s': %ld s, %ld µs\n", \
+					(x)->name, \
+					(x)->t.tv_sec, (x)->t.tv_usec \
+				)
+#define	PRINT_TIME_MSG(s,x)	log ( \
+					"%s: %ld s, %ld µs\n", \
+					s, (x)->t.tv_sec, (x)->t.tv_usec \
+				)
+
+#define	WATCH_DECL(id)		dbg_timer	id##_timer
+#define	WATCH_START(id)		start_watch (&id##_timer)
+#define	WATCH_STOP(id)		stop_watch (&id##_timer); \
+				PRINT_TIME_MSG(#id,&id##_timer)
+	
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern int	timers_start (void);
+extern void	timers_stop (void);
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+extern void	setup_timer (dbg_timer * t, long dsec, long dusec);
+extern int	check_timer (dbg_timer * t);
+extern void	touch_timer (dbg_timer * t);
+
+extern void	start_watch (dbg_timer * w);
+extern void	stop_watch (dbg_timer * w);
+#else
+#define	PRINT_TIMER(t)
+#define	WATCH_DECL(name)
+#define	WATCH_START(name)
+#define	WATCH_STOP(name)
+#endif
+
+/*---------------------------------------------------------------------------*\
+\*---------------------------------------------------------------------------*/
+#ifdef NEED_MEM_STR_PROTOS
+
+extern void * memcpy (void * d, const void * s, size_t n);
+extern void * memmove (void * d, const void * s, size_t n);
+extern void * memset (void * m, int x, size_t c);
+
+extern int memcmp (const void * s1, const void * s2, size_t n);
+
+extern char * strcpy (char * d, const char * s);
+extern char * strcat (char * d, const char * s);
+extern int strcmp (const char * s1, const char * s2);
+
+extern size_t strlen (const char * s);
+
+#endif
+#endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/ADDON-patches/01_grsecurity-v2.0.1.patch linux-2.4.20-wolk4.16-fullkernel/ADDON-patches/01_grsecurity-v2.0.1.patch
--- linux-2.4.20-wolk4.15-fullkernel/ADDON-patches/01_grsecurity-v2.0.1.patch	2004-06-29 13:28:10.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/ADDON-patches/01_grsecurity-v2.0.1.patch	2004-09-05 17:09:24.000000000 +0200
@@ -1,411 +1,1143 @@
-diff -Naurp old/gradm2/Makefile new/gradm2/Makefile
---- old/gradm2/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/Makefile	2004-06-29 13:10:03.000000000 +0200
-@@ -0,0 +1,131 @@
-+##############################################################################
-+#gradm (c) 2002 Brad Spengler 		                http://grsecurity.net#
-+#----------------------------				---------------------#
-+#gradm is licensed under the GNU GPL http://www.gnu.org		             #
-+##############################################################################
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/Documentation/Configure.help linux-2.4.20-wolk4.16-grsec2/Documentation/Configure.help
+--- linux-2.4.20-wolk4.16-fullkernel/Documentation/Configure.help	2004-09-05 16:28:06.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/Documentation/Configure.help	2004-09-05 17:07:53.000000000 +0200
+@@ -27304,6 +27304,17 @@ CONFIG_GRKERNSEC_HIDESYM
+   useful protection against local and remote kernel exploitation of
+   overflows and arbitrary read/write vulnerabilities.
+ 
++Deter exploit bruteforcing
++CONFIG_GRKERNSEC_BRUTE
++  If you say Y here, attempts to bruteforce exploits against forking
++  daemons such as apache or sshd will be deterred.  When a child of a 
++  forking daemon is killed by PaX or crashes due to an illegal 
++  instruction, the parent process will be delayed 30 seconds upon every
++  subsequent fork until the administrator is able to assess the 
++  situation and restart the daemon.  It is recommended that you also 
++  enable signal logging in the auditing section so that logs are 
++  generated when a process performs an illegal instruction.
++
+ /proc/<pid>/ipaddr support
+ CONFIG_GRKERNSEC_PROC_IPADDR
+   If you say Y here, a new entry will be added to each /proc/<pid>
+@@ -27531,9 +27542,9 @@ CONFIG_GRKERNSEC_CHROOT_PIVOT
+ Deny double-chroots
+ CONFIG_GRKERNSEC_CHROOT_DOUBLE
+   If you say Y here, processes inside a chroot will not be able to chroot
+-  again.  This is a widely used method of breaking out of a chroot jail
+-  and should not be allowed.  If the sysctl option is enabled, a sysctl
+-  option with name "chroot_deny_chroot" is created.
++  again outside of the chroot.  This is a widely used method of breaking
++  out of a chroot jail and should not be allowed.  If the sysctl option
++  is enabled, a sysctl option with name "chroot_deny_chroot" is created.
+ 
+ Deny fchdir outside of chroot
+ CONFIG_GRKERNSEC_CHROOT_FCHDIR
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/init_task.c linux-2.4.20-wolk4.16-grsec2/arch/i386/kernel/init_task.c
+--- linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/init_task.c	2004-09-05 15:45:59.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/arch/i386/kernel/init_task.c	2004-09-05 17:07:52.000000000 +0200
+@@ -30,5 +30,9 @@ union task_union init_task_union 
+  * section. Since TSS's are completely CPU-local, we want them
+  * on exact cacheline boundaries, to eliminate cacheline ping-pong.
+  */ 
+-struct tss_struct init_tss[NR_CPUS] __cacheline_aligned = { [0 ... NR_CPUS-1] = INIT_TSS };
+ 
++#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
++struct tss_struct init_tss[NR_CPUS] __attribute__((__aligned__(SMP_CACHE_BYTES), __section__(".rodata"))) = { [0 ... NR_CPUS-1] = INIT_TSS };
++#else
++struct tss_struct init_tss[NR_CPUS] __cacheline_aligned = { [0 ... NR_CPUS-1] = INIT_TSS };
++#endif
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/ioport.c linux-2.4.20-wolk4.16-grsec2/arch/i386/kernel/ioport.c
+--- linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/ioport.c	2004-09-05 16:05:40.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/arch/i386/kernel/ioport.c	2004-09-05 17:07:52.000000000 +0200
+@@ -15,6 +15,7 @@
+ #include <linux/smp_lock.h>
+ #include <linux/stddef.h>
+ #include <linux/grsecurity.h>
++#include <asm/desc.h>
+ 
+ /* RSBAC */
+ #ifdef CONFIG_RSBAC
+@@ -63,6 +64,10 @@ asmlinkage int sys_ioperm(unsigned long 
+ 	struct thread_struct * t = &current->thread;
+ 	struct tss_struct * tss;
+ 
++#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
++	unsigned long flags, cr3;
++#endif
 +
-+GRADM_BIN=gradm
-+GRSEC_DIR=/etc/grsec
+         /* RSBAC */
+         #ifdef CONFIG_RSBAC
+         union rsbac_target_id_t       rsbac_target_id;
+@@ -126,6 +131,11 @@ asmlinkage int sys_ioperm(unsigned long 
+ 	 * do it in the per-thread copy and in the TSS ...
+ 	 */
+ 	set_bitmap(t->io_bitmap, from, num, !turn_on);
 +
-+LEX=/usr/bin/lex
-+FLEX=/usr/bin/flex
-+LEXFLAGS=-B
-+YACC=/usr/bin/yacc
-+BYACC=/usr/bin/byacc
-+BISON=/usr/bin/bison
-+MKNOD=/bin/mknod
-+#for dietlibc
-+#CC=/usr/bin/diet /usr/bin/gcc
-+CC=/usr/bin/gcc
-+FIND=/usr/bin/find
-+STRIP=/usr/bin/strip
-+#for sparc64
-+#LIBS=
-+LIBS=-lfl
-+KERNVER=`uname -r | cut -d"." -f 2`
-+#for 64-bit archs
-+#OPT_FLAGS=-O2 -m64
-+OPT_FLAGS=-O2
-+CFLAGS=$(OPT_FLAGS) -DGRSEC_DIR=\"$(GRSEC_DIR)\" -DKERNVER=$(KERNVER)
-+LDFLAGS=
-+INSTALL = /usr/bin/install -c
++#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
++	pax_open_kernel(flags, cr3);
++#endif
 +
-+# FHS
-+MANDIR=/usr/share/man
-+# older MANDIR
-+#MANDIR=/usr/man
-+DESTDIR=
+ 	if (tss->bitmap == IO_BITMAP_OFFSET) { /* already active? */
+ 		set_bitmap(tss->io_bitmap, from, num, !turn_on);
+ 	} else {
+@@ -133,6 +143,10 @@ asmlinkage int sys_ioperm(unsigned long 
+ 		tss->bitmap = IO_BITMAP_OFFSET; /* Activate it in the TSS */
+ 	}
+ 
++#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
++	pax_close_kernel(flags, cr3);
++#endif
 +
-+OBJECTS=gradm.tab.o lex.gradm.o learn_pass1.tab.o learn_pass2.tab.o \
-+	fulllearn_pass1.tab.o fulllearn_pass2.tab.o fulllearn_pass3.tab.o \
-+	gradm_misc.o gradm_parse.o gradm_arg.o gradm_pw.o gradm_opt.o \
-+	gradm_cap.o gradm_sha256.o gradm_adm.o gradm_analyze.o gradm_res.o \
-+	gradm_human.o gradm_learn.o gradm_net.o gradm_nest.o \
-+	gradm_sym.o gradm_newlearn.o gradm_fulllearn.o gradm_lib.o \
-+	lex.fulllearn_pass1.o lex.fulllearn_pass2.o \
-+	lex.fulllearn_pass3.o lex.learn_pass1.o lex.learn_pass2.o
+ 	preempt_enable();
+ 
+ 	return 0;
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/process.c linux-2.4.20-wolk4.16-grsec2/arch/i386/kernel/process.c
+--- linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/process.c	2004-09-05 16:08:39.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/arch/i386/kernel/process.c	2004-09-05 17:07:52.000000000 +0200
+@@ -1009,6 +1009,10 @@ void __switch_to(struct task_struct *pre
+ 				 *next = &next_p->thread;
+ 	struct tss_struct *tss = init_tss + smp_processor_id();
+ 
++#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
++	unsigned long flags, cr3;
++#endif
 +
-+all: $(USE_YACC) $(USE_LEX) $(GRADM_BIN) grlearn
+ 	unlazy_fpu(prev_p);
+ 
+ #ifdef CONFIG_GRKERNSEC_PAX_SEGMEXEC
+@@ -1016,11 +1020,6 @@ void __switch_to(struct task_struct *pre
+ #endif
+ 
+ 	/*
+-	 * Reload esp0, LDT and the page table pointer:
+-	 */
+-	tss->esp0 = next->esp0;
+-
+-	/*
+ 	 * Save away %fs and %gs. No need to save %es and %ds, as
+ 	 * those are always kernel segments while inside the kernel.
+ 	 */
+@@ -1048,6 +1047,15 @@ void __switch_to(struct task_struct *pre
+ 		loaddebug(next, 7);
+ 	}
+ 
++#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
++	pax_open_kernel(flags, cr3);
++#endif
 +
-+USE_YACC = $(shell if [ -x $(BYACC) ]; then echo $(BYACC); \
-+	else if [ -x $(BISON) ]; then echo $(BISON) -y; \
-+	else if [ -x $(YACC) ]; then echo $(YACC); \
-+	else \
-+		echo "Bison/(b)yacc needs to be installed to compile gradm."; \
-+		exit 1; \
-+	fi;fi;fi)
++	/*
++	 * Reload esp0, LDT and the page table pointer:
++	 */
++	tss->esp0 = next->esp0;
 +
-+USE_LEX = $(shell if [ -x $(FLEX) ]; then echo $(FLEX); \
-+	else if [ -x $(LEX) ]; then echo $(LEX); \
-+	else \
-+		echo "(f)Lex needs to be installed to compile gradm."; \
-+		exit 1; \
-+	fi;fi)
+ 	if (unlikely(prev->ioperm || next->ioperm)) {
+ 		if (next->ioperm) {
+ 			/*
+@@ -1070,6 +1078,11 @@ void __switch_to(struct task_struct *pre
+ 			 */
+ 			tss->bitmap = INVALID_IO_BITMAP_OFFSET;
+ 	}
 +
-+$(GRADM_BIN): $(OBJECTS)
-+	$(CC) $(CFLAGS) -o $@ $(OBJECTS) $(LIBS) $(LDFLAGS)
++#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
++	pax_close_kernel(flags, cr3);
++#endif
 +
-+grlearn: grlearn.c gradm_lib.c
-+	$(CC) $(CFLAGS) -o $@ grlearn.c gradm_lib.c $(LIBS) $(LDFLAGS)
+ }
+ 
+ asmlinkage int sys_fork(struct pt_regs regs)
+@@ -1164,6 +1177,10 @@ asmlinkage void pax_randomize_kstack(voi
+ 	struct tss_struct *tss = init_tss + smp_processor_id();
+ 	unsigned long time;
+ 
++#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
++	unsigned long flags, cr3;
++#endif
 +
+ #ifdef CONFIG_GRKERNSEC_PAX_SOFTMODE
+ 	if (!pax_aslr)
+ 		return;
+@@ -1180,7 +1197,16 @@ asmlinkage void pax_randomize_kstack(voi
+ 	time <<= 2;
+ #endif
+ 
++#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
++	pax_open_kernel(flags, cr3);
++#endif
 +
-+gradm.tab.c: gradm.y
-+	$(USE_YACC) -b gradm -p gradm -d ./gradm.y
+ 	tss->esp0 ^= time;
+ 	current->thread.esp0 = tss->esp0;
 +
-+lex.gradm.c: gradm.l
-+	$(USE_LEX) $(LEXFLAGS) -Pgradm ./gradm.l
++#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
++	pax_close_kernel(flags, cr3);
++#endif
 +
-+fulllearn_pass1.tab.c: gradm_fulllearn_pass1.y
-+	$(USE_YACC) -b fulllearn_pass1 -p fulllearn_pass1 -d ./gradm_fulllearn_pass1.y
-+fulllearn_pass2.tab.c: gradm_fulllearn_pass2.y
-+	$(USE_YACC) -b fulllearn_pass2 -p fulllearn_pass2 -d ./gradm_fulllearn_pass2.y
-+fulllearn_pass3.tab.c: gradm_fulllearn_pass3.y
-+	$(USE_YACC) -b fulllearn_pass3 -p fulllearn_pass3 -d ./gradm_fulllearn_pass3.y
+ }
+ #endif
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/setup.c linux-2.4.20-wolk4.16-grsec2/arch/i386/kernel/setup.c
+--- linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/setup.c	2004-09-05 16:08:38.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/arch/i386/kernel/setup.c	2004-09-05 17:07:52.000000000 +0200
+@@ -177,7 +177,7 @@ unsigned char aux_device_present;
+ extern void mcheck_init(struct cpuinfo_x86 *c);
+ extern void dmi_scan_machine(void);
+ extern int root_mountflags;
+-extern char _text, _etext, _edata, _end;
++extern char _text, _etext, _data, _edata, _end;
+ 
+ static int have_cpuid_p(void) __init;
+ 
+@@ -1343,7 +1343,7 @@ void __init setup_arch(char **cmdline_p)
+ 
+ 	code_resource.start = virt_to_bus(&_text);
+ 	code_resource.end = virt_to_bus(&_etext)-1;
+-	data_resource.start = virt_to_bus(&_etext);
++	data_resource.start = virt_to_bus(&_data);
+ 	data_resource.end = virt_to_bus(&_edata)-1;
+ 
+ 	parse_cmdline_early(cmdline_p);
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/vm86.c linux-2.4.20-wolk4.16-grsec2/arch/i386/kernel/vm86.c
+--- linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/vm86.c	2004-09-05 16:04:41.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/arch/i386/kernel/vm86.c	2004-09-05 17:07:52.000000000 +0200
+@@ -45,6 +45,7 @@
+ #include <asm/pgalloc.h>
+ #include <asm/io.h>
+ #include <asm/irq.h>
++#include <asm/desc.h>
+ 
+ /*
+  * Known problems:
+@@ -98,6 +99,10 @@ struct pt_regs * save_v86_state(struct k
+ 	struct pt_regs *ret;
+ 	unsigned long tmp;
+ 
++#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
++	unsigned long flags, cr3;
++#endif
 +
-+lex.fulllearn_pass1.c: gradm_fulllearn_pass1.l
-+	$(USE_LEX) $(LEXFLAGS) -Pfulllearn_pass1 ./gradm_fulllearn_pass1.l
-+lex.fulllearn_pass2.c: gradm_fulllearn_pass2.l
-+	$(USE_LEX) $(LEXFLAGS) -Pfulllearn_pass2 ./gradm_fulllearn_pass2.l
-+lex.fulllearn_pass3.c: gradm_fulllearn_pass3.l
-+	$(USE_LEX) $(LEXFLAGS) -Pfulllearn_pass3 ./gradm_fulllearn_pass3.l
+ 	if (!current->thread.vm86_info) {
+ 		printk("no vm86_info: BAD\n");
+ 		do_exit(SIGSEGV);
+@@ -112,7 +117,17 @@ struct pt_regs * save_v86_state(struct k
+ 		do_exit(SIGSEGV);
+ 	}
+ 	tss = init_tss + smp_processor_id();
 +
-+learn_pass1.tab.c: gradm_learn_pass1.y
-+	$(USE_YACC) -b learn_pass1 -p learn_pass1 -d ./gradm_learn_pass1.y
-+learn_pass2.tab.c: gradm_learn_pass2.y
-+	$(USE_YACC) -b learn_pass2 -p learn_pass2 -d ./gradm_learn_pass2.y
++#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
++	pax_open_kernel(flags, cr3);
++#endif
 +
-+lex.learn_pass1.c: gradm_learn_pass1.l
-+	$(USE_LEX) $(LEXFLAGS) -Plearn_pass1 ./gradm_learn_pass1.l
-+lex.learn_pass2.c: gradm_learn_pass2.l
-+	$(USE_LEX) $(LEXFLAGS) -Plearn_pass2 ./gradm_learn_pass2.l
+ 	tss->esp0 = current->thread.esp0 = current->thread.saved_esp0;
 +
-+install: $(GRADM_BIN) gradm.8 acl grlearn
-+	mkdir -p $(DESTDIR)/sbin
-+	$(INSTALL) -m 0755 $(GRADM_BIN) $(DESTDIR)/sbin
-+	$(STRIP) $(DESTDIR)/sbin/$(GRADM_BIN)
-+	$(INSTALL) -m 0700 grlearn $(DESTDIR)/sbin
-+	$(STRIP) $(DESTDIR)/sbin/grlearn
-+	mkdir -p -m 700 $(DESTDIR)$(GRSEC_DIR)
-+	@if [ ! -f $(DESTDIR)$(GRSEC_DIR)/acl ] ; then \
-+		$(INSTALL) -m 0600 acl $(DESTDIR)$(GRSEC_DIR) ; \
-+	fi
-+	@if [ -z "`cut -d" " -f3 /proc/mounts | grep "^devfs"`" ] ; then \
-+		rm -f $(DESTDIR)/dev/grsec ; \
-+		if [ ! -e $(DESTDIR)/dev/grsec ] ; then \
-+			mkdir -p $(DESTDIR)/dev ; \
-+			$(MKNOD) -m 0622 $(DESTDIR)/dev/grsec c 1 11 ; \
-+		fi \
-+	fi
-+	mkdir -p $(DESTDIR)$(MANDIR)/man8
-+	$(INSTALL) -m 0644 gradm.8 $(DESTDIR)$(MANDIR)/man8/$(GRADM_BIN).8
-+	@if [ -z $(DESTDIR) ] ; then \
-+		if [ -x /sbin/$(GRADM_BIN) ] ; then \
-+			$(FIND) $(GRSEC_DIR) -type f -name pw -size 48c -exec rm -f $(GRSEC_DIR)/pw \; ; \
-+			if [ ! -f $(GRSEC_DIR)/pw ] ; then \
-+				/sbin/$(GRADM_BIN) -P ; \
-+                        fi \
-+		fi \
-+	fi
++#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
++	pax_close_kernel(flags, cr3);
++#endif
 +
-+clean:
-+	rm -f core *.o $(GRADM_BIN) lex.*.c *.tab.c *.tab.h grlearn
-diff -Naurp old/gradm2/acl new/gradm2/acl
---- old/gradm2/acl	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/acl	2004-04-03 18:03:13.000000000 +0200
-@@ -0,0 +1,179 @@
-+#sample default process acl for grsecurity
-+# Role flags:
-+# A -> This role is an administrative role, thus it has special privilege normal
-+#      roles do not have.  In particular, this role bypasses the 
-+#      additional ptrace restrictions
-+# N -> Don't require authentication for this role.  To access
-+#      the role, use gradm -n <rolename>
-+# s -> This role is a special role, meaning it does not belong to a
-+#      user or group, and does not fall under ACL enforcement
-+# u -> This role is a user role
-+# g -> This role is a group role
-+# G -> This role can use gradm to authenticate to the kernel
-+#      An ACL for gradm will automatically be added to the role
-+# T -> Enable TPE for this role
-+# l -> Enable learning for this role
-+#
-+# a role can only be one of user, group, or special
-+#
-+# role_allow_ip IP/optional netmask
-+# eg: role_allow_ip 192.168.1.0/24
-+# You can have as many of these per role as you want
-+# They restrict the use of a role to a list of IPs.  If a user
-+# is on the system that would normally get the role does not
-+# belong to those lists of IPs, the system falls back through
-+# its method of determining a role for the user
-+#
-+# Role hierarchy
-+# user -> group -> default
-+# First a user role attempts to match, if one is not found,
-+# a group role attempts to match, if one is not found,
-+# the default role is used.
-+#
-+# role_transitions <special role 1> <special role 2> ... <special role n>
-+# eg: role_transitions www_admin dns_admin
-+#
-+# role transitions specify which special roles a given role is allowed
-+# to authenticate to.  This applies to special roles that do not
-+# require password authentication as well.  If a user tries to
-+# authenticate to a role that is not within his transition table, he
-+# will receive a permission denied error
-+#
-+# Nested subjects
-+# subject /bin/su:/bin/bash:/bin/cat
-+#	  / rwx
-+#	  +CAP_ALL
-+# grant privilege to specific processes if they are executed
-+# within a trusted path.  In this case, privilege is
-+# granted if /bin/cat is executed from /bin/bash, which is
-+# executed from /bin/su.
-+#
-+# Configuration inheritance on nested subjects
-+# nested subjects inherit rules from their parents.  In the
-+# example above, the nested subject would inherit rules
-+# from the nested subject for /bin/su:/bin/bash,
-+# and the subject /bin/su
-+# View the 1.9.x documentation for more information on
-+# configuration inheritance
-+#
-+# new object modes:
-+# m -> allow creation of setuid/setgid files/directories
-+#      and modification of files/directories to be setuid/setgid
-+# M -> audit the setuid/setgid creation/modification
-+# c -> allow creation of the file/directory
-+# C -> audit the creation
-+# d -> allow deletion of the file/directory
-+# D -> audit the deletion
-+# p -> reject all ptraces to this object
-+# new subject modes:
-+# r -> relax ptrace restrictions (allows process to ptrace processes
-+#      other than its own descendants)
-+#
-+# user/group transitions:
-+# You may now specify what users and groups a given subject can
-+# transition to.  This can be done on an inclusive or exclusive basis.
-+# Examples:
-+# subject /bin/su
-+# user_transition_allow root spender
-+# group_transition_allow root spender
-+# subject /bin/su
-+# user_transition_deny evilhacker
-+# subject /bin/su
-+# group_transition_deny evilhacker1 evilhacker2
-+#
-+# New learning system:
-+# To learn on a given subject: add l (the letter l, not the number 1)
-+# to the subject mode
-+# To learn on a given role, add l to the role mode
-+# For both of these, to enable learning, enable the system like:
-+# gradm -L /etc/grsec/learning.logs -E
-+# and then generate the rules after disabling the system after the 
-+# learning phase with:
-+# gradm -L /etc/grsec/learning.logs -O /etc/grsec/acl
-+# To use full system learning, enable the system like:
-+# gradm -F -L /etc/grsec/learning.logs
-+# and then generate the rules after disabling the system after the 
-+# learning phase with:
-+# gradm -F -L /etc/grsec/learning.logs -O /etc/grsec/acl
+ 	current->thread.saved_esp0 = 0;
+ 	ret = KVM86->regs32;
+ 	return ret;
+@@ -239,6 +254,11 @@ out:
+ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk)
+ {
+ 	struct tss_struct *tss;
 +
-+role admin sA
-+subject / r
-+	/ rwcdmxi
++#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
++	unsigned long flags, cr3;
++#endif
 +
-+role default G
-+role_transitions admin
-+subject /
-+	/		r
-+	/opt		rx
-+	/home		rwxcd
-+	/mnt		rw
-+	/dev
-+	/dev/grsec	h
-+	/dev/urandom	r
-+	/dev/random	r
-+	/dev/zero	rw
-+	/dev/input	rw
-+	/dev/psaux	rw
-+	/dev/null	rw
-+	/dev/tty0	rw
-+	/dev/tty1	rw
-+	/dev/tty2	rw
-+	/dev/tty3	rw
-+	/dev/tty4	rw
-+	/dev/tty5	rw
-+	/dev/tty6	rw
-+	/dev/tty7	rw
-+	/dev/tty8	rw
-+	/dev/console	rw
-+	/dev/tty	rw
-+	/dev/pts	rw
-+	/dev/ptmx	rw
-+	/dev/dsp	rw
-+	/dev/mixer	rw
-+	/dev/initctl	rw
-+	/dev/fd0	r
-+	/dev/cdrom	r
-+	/dev/mem	h
-+	/dev/kmem	h
-+	/dev/port	h
-+	/bin		rx
-+	/sbin		rx
-+	/lib		rx
-+	/usr		rx
-+	/etc		rx
-+	/proc		rwx
-+	/proc/kcore	h
-+	/proc/sys	r
-+	/root		r
-+	/tmp		rwcd
-+	/var		rwxcd
-+	/var/tmp	rwcd
-+	/var/log	r
-+	/boot		r
-+	/etc/grsec	h
-+	/etc/ssh	h
-+	
-+	-CAP_SYS_TTY_CONFIG
-+	-CAP_LINUX_IMMUTABLE
-+	-CAP_NET_RAW
-+	-CAP_MKNOD
-+	-CAP_SYS_ADMIN
-+	-CAP_SYS_RAWIO
-+	-CAP_SYS_MODULE
-+	-CAP_SYS_PTRACE
-+	-CAP_NET_ADMIN
-+	-CAP_NET_BIND_SERVICE
-+	-CAP_SYS_CHROOT
+ /*
+  * make sure the vm86() system call doesn't try to do anything silly
+  */
+@@ -280,8 +300,17 @@ static void do_sys_vm86(struct kernel_vm
+ 	info->regs32->eax = 0;
+ 	tsk->thread.saved_esp0 = tsk->thread.esp0;
+ 	tss = init_tss + smp_processor_id();
 +
-+#	RES_AS 100M 100M
++#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
++	pax_open_kernel(flags, cr3);
++#endif
 +
-+#	connect 192.168.1.0/24:22 stream tcp
-+#	bind	0.0.0.0 stream dgram tcp udp
+ 	tss->esp0 = tsk->thread.esp0 = (unsigned long) &info->VM86_TSS_ESP0;
+ 
++#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
++	pax_close_kernel(flags, cr3);
++#endif
 +
-+# the d flag protects /proc fd and mem entries for sshd
-+subject /usr/sbin/sshd dp
-+	/etc/ssh r
-+	/dev/log rw
-+	+CAP_SYS_TTY_CONFIG
-+	+CAP_SYS_CHROOT
+ 	tsk->thread.screen_bitmap = info->screen_bitmap;
+ 	if (info->flags & VM86_SCREEN_BITMAP)
+ 		mark_screen_rdonly(tsk);
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/drivers/char/mem.c linux-2.4.20-wolk4.16-grsec2/drivers/char/mem.c
+--- linux-2.4.20-wolk4.16-fullkernel/drivers/char/mem.c	2004-09-05 16:09:03.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/drivers/char/mem.c	2004-09-05 17:07:52.000000000 +0200
+@@ -41,7 +41,11 @@ extern void mda_console_init(void);
+ #if defined(CONFIG_S390_TAPE) && defined(CONFIG_S390_TAPE_CHAR)
+ extern void tapechar_init(void);
+ #endif
+-     
 +
-diff -Naurp old/gradm2/gradm.8 new/gradm2/gradm.8
---- old/gradm2/gradm.8	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/gradm.8	2003-08-20 13:33:45.000000000 +0200
-@@ -0,0 +1,136 @@
-+.TH GRADM 8 
-+.SH NAME
-+gradm \- Administration program for the grsecurity RBAC system
-+.SH SYNOPSIS
-+.B gradm
-+[
-+.B \-E 
-+]
-+[
-+.B \-R
-+]
-+[
-+.B \-F
-+]
-+[
-+.B \-L <logfile>
-+]
-+[
-+.B \-O <filename|stream>
-+]
-+[
-+.B \-M
-+<filename|uid>
-+]
-+[
-+.B \-D 
-+]
-+[
-+.B \-P [rolename]
-+]
-+[
-+.B \-a <rolename>
-+]
-+[
-+.B \-n <rolename>
-+]
-+[
-+.B \-u
-+]
-+[
-+.B \-h 
-+]
-+[
-+.B \-v
-+]
++#ifdef CONFIG_GRKERNSEC
++extern struct file_operations grsec_fops;
++#endif
 +
-+.SH DESCRIPTION
+ /* RSBAC */
+ #ifdef CONFIG_RSBAC
+ #include <rsbac/adf.h>
+@@ -770,6 +774,11 @@ static int memory_open(struct inode * in
+ 		case 10:
+ 		        filp->f_op = &anon_file_operations;
+ 			break;
++#ifdef CONFIG_GRKERNSEC
++		case 12:
++			filp->f_op = &grsec_fops;
++			break;
++#endif
+ 		default:
+ 			return -ENXIO;
+ 	}
+@@ -797,7 +806,10 @@ void __init memory_devfs_register (void)
+ 	{7, "full",    S_IRUGO | S_IWUGO,           &full_fops},
+ 	{8, "random",  S_IRUGO | S_IWUSR,           &random_fops},
+ 	{9, "urandom", S_IRUGO | S_IWUSR,           &urandom_fops},
+-	{10, "anon",   S_IRUGO | S_IWUSR,           &anon_file_operations}
++	{10, "anon",   S_IRUGO | S_IWUSR,           &anon_file_operations},
++#ifdef CONFIG_GRKERNSEC
++	{12, "grsec",  S_IRUSR | S_IWUGO,           &grsec_fops}
++#endif
+     };
+     int i;
+ 
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/drivers/char/vt.c linux-2.4.20-wolk4.16-grsec2/drivers/char/vt.c
+--- linux-2.4.20-wolk4.16-fullkernel/drivers/char/vt.c	2004-09-05 16:05:31.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/drivers/char/vt.c	2004-09-05 17:07:52.000000000 +0200
+@@ -179,6 +179,11 @@ do_kdsk_ioctl(int cmd, struct kbentry *u
+ 	case KDSKBENT:
+ 		if (!perm)
+ 			return -EPERM;
++#ifdef CONFIG_GRKERNSEC
++		if (!capable(CAP_SYS_TTY_CONFIG))
++			return -EPERM;
++#endif
 +
-+.I gradm
-+is the userspace ACL parsing and authentication program for the
-+.I grsecurity
-+Access Control List System.
+ 		if (!i && v == K_NOSUCHMAP) {
+ 			/* disallocate map */
+ 			key_map = key_maps[s];
+@@ -301,6 +306,11 @@ do_kdgkb_ioctl(int cmd, struct kbsentry 
+ 		if (!perm)
+ 			return -EPERM;
+ 
++#ifdef CONFIG_GRKERNSEC
++		if (!capable(CAP_SYS_TTY_CONFIG))
++			return -EPERM;
++#endif
 +
-+grsecurity aims to be a complete security system for Linux 2.4.  gradm 
-+performs several tasks for the RBAC system including authenticated via a 
-+password to the kernel and parsing rules to be passed to the kernel.
+ 		q = func_table[i];
+ 		first_free = funcbufptr + (funcbufsize - funcbufleft);
+ 		for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++) 
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/fs/binfmt_elf.c linux-2.4.20-wolk4.16-grsec2/fs/binfmt_elf.c
+--- linux-2.4.20-wolk4.16-fullkernel/fs/binfmt_elf.c	2004-09-05 16:08:32.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/fs/binfmt_elf.c	2004-09-05 17:07:53.000000000 +0200
+@@ -897,8 +897,6 @@ static int load_elf_binary(struct linux_
+ 	}
+ #endif
+ 
+-	gr_set_pax_flags(current);	
+-
+ 	elf_entry = (unsigned long) elf_ex.e_entry;
+ 
+ 	/* Do this so that we can load the interpreter, if need be.  We will
+@@ -1079,7 +1077,7 @@ static int load_elf_binary(struct linux_
+ #endif
+ 
+ 	if (current->flags & PF_PAX_RANDMMAP)
+-		elf_brk += pax_delta_mask(get_random_long(), 4, PAGE_SHIFT);
++		elf_brk += PAGE_SIZE + pax_delta_mask(get_random_long(), 4, PAGE_SHIFT);
+ #undef pax_delta_mask
+ #endif
+ 
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/fs/exec.c linux-2.4.20-wolk4.16-grsec2/fs/exec.c
+--- linux-2.4.20-wolk4.16-fullkernel/fs/exec.c	2004-09-05 16:08:32.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/fs/exec.c	2004-09-05 17:07:52.000000000 +0200
+@@ -914,9 +914,6 @@ int prepare_binprm(struct linux_binprm *
+ 			cap_set_full(bprm->cap_effective);
+ 	}
+ 
+-	if (gr_handle_ptrace_exec(bprm->file->f_dentry, bprm->file->f_vfsmnt))
+-		return -EACCES;
+-
+ 	memset(bprm->buf,0,BINPRM_BUF_SIZE);
+ 	return kernel_read(bprm->file,0,bprm->buf,BINPRM_BUF_SIZE);
+ }
+@@ -979,8 +976,11 @@ void compute_creds(struct linux_binprm *
+ 	
+         /* AUD: Audit candidate if current->cap_effective is set */
+ 
+-        current->suid = current->euid = current->fsuid = bprm->e_uid;
+-        current->sgid = current->egid = current->fsgid = bprm->e_gid;
++	if (!gr_check_user_change(-1, bprm->e_uid, bprm->e_uid))
++		current->suid = current->euid = current->fsuid = bprm->e_uid;
 +
-+.SH OPTIONS
-+.TP
++	if (!gr_check_group_change(-1, bprm->e_gid, bprm->e_gid))
++	        current->sgid = current->egid = current->fsgid = bprm->e_gid;
+ 
+ 	gr_handle_chroot_caps(current);
+ 
+@@ -1248,7 +1248,9 @@ int do_execve(char * filename, char ** a
+ 	current->exec_file = file;
+ #endif
+ 
+-	gr_set_proc_label(file->f_dentry, file->f_vfsmnt);
++	retval = gr_set_proc_label(file->f_dentry, file->f_vfsmnt);
++	if (retval < 0)
++		goto out_fail;
+ 
+ 	retval = search_binary_handler(&bprm,regs);
+ 	if (retval >= 0) {
+@@ -1284,6 +1286,7 @@ int do_execve(char * filename, char ** a
+ 	  }
+ 	}
+ 
++out_fail:
+ #ifdef CONFIG_GRKERNSEC
+ 	current->acl = old_acl;
+ 	memcpy(current->rlim, old_rlim, sizeof(old_rlim));
+@@ -1525,6 +1528,10 @@ int do_coredump(long signr, struct pt_re
+ 	if (!is_dumpable(current))
+ 		goto fail;
+ 	current->mm->dumpable = 0;
++
++	if (signr == SIGKILL || signr == SIGILL)
++		gr_handle_brute_attach(current);
++
+ 	gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
+ 	if (current->rlim[RLIMIT_CORE].rlim_cur < binfmt->min_coredump)
+ 		goto fail;
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/fs/fcntl.c linux-2.4.20-wolk4.16-grsec2/fs/fcntl.c
+--- linux-2.4.20-wolk4.16-fullkernel/fs/fcntl.c	2004-09-05 16:05:23.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/fs/fcntl.c	2004-09-05 17:07:52.000000000 +0200
+@@ -65,10 +65,11 @@ static int locate_fd(struct files_struct
+ 	int error;
+ 	unsigned int start;
+ 
++	gr_learn_resource(current, RLIMIT_NOFILE, orig_start, 0);
 +
-+All options to gradm are mutually exclusive, except for -L and -O.
-+.TP
-+.B \-E
-+Enable the RBAC system
-+.TP
+ 	write_lock(&files->file_lock);
+ 	
+ 	error = -EINVAL;
+-	gr_learn_resource(current, RLIMIT_NOFILE, orig_start, 0);
+ 	if (orig_start >= current->rlim[RLIMIT_NOFILE].rlim_cur)
+ 		goto out;
+ 
+@@ -144,6 +145,8 @@ asmlinkage long sys_dup2(unsigned int ol
+ 	struct file * file, *tofree;
+ 	struct files_struct * files = current->files;
+ 
++	gr_learn_resource(current, RLIMIT_NOFILE, newfd, 0);
 +
-+.B \-R
-+Reload the RBAC system (only valid while in admin mode)
-+.TP
+ 	write_lock(&files->file_lock);
+ 	if (!(file = fcheck(oldfd)))
+ 		goto out_unlock;
+@@ -151,7 +154,6 @@ asmlinkage long sys_dup2(unsigned int ol
+ 	if (newfd == oldfd)
+ 		goto out_unlock;
+ 	err = -EBADF;
+-	gr_learn_resource(current, RLIMIT_NOFILE, newfd, 0);
+ 	if (newfd >= current->rlim[RLIMIT_NOFILE].rlim_cur)
+ 		goto out_unlock;
+ 	get_file(file);			/* We are now finished with oldfd */
+@@ -446,10 +448,6 @@ void send_sigio(struct fown_struct *fown
+ 			match = -p->pgrp;
+ 		if (pid != match)
+ 			continue;
+-		if (gr_check_protected_task(p))
+-			continue;
+-		if (gr_pid_is_chrooted(p))
+-			continue;
+ 		send_sigio_to_task(p, fown, fd, band);
+ 	}
+ out:
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/fs/namei.c linux-2.4.20-wolk4.16-grsec2/fs/namei.c
+--- linux-2.4.20-wolk4.16-fullkernel/fs/namei.c	2004-09-05 16:06:25.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/fs/namei.c	2004-09-05 17:07:52.000000000 +0200
+@@ -1334,9 +1334,7 @@ int open_namei(const char * pathname, in
+ 		if (error)
+ 			return error;
+ 
+-		if (gr_acl_is_enabled() && nd->dentry->d_inode && 
+-		    S_ISBLK(nd->dentry->d_inode->i_mode) &&
+-	    	    !capable(CAP_SYS_RAWIO)) {
++		if (gr_handle_rawio(nd->dentry->d_inode)) {
+ 			error = -EPERM;
+ 			goto exit;
+ 		}
+@@ -1388,7 +1386,7 @@ do_last:
+ 			up(&dir->d_inode->i_sem);
+ 			goto exit_dput;
+ 		}
+-		if (!gr_acl_handle_creat(dentry, nd->dentry, nd->mnt, flag)) {
++		if (!gr_acl_handle_creat(dentry, nd->dentry, nd->mnt, flag, mode)) {
+ 			error = -EACCES;
+ 			up(&dir->d_inode->i_sem);
+ 			goto exit_dput;
+@@ -1419,8 +1417,7 @@ do_last:
+ 	 * It already exists.
+ 	 */
+ 
+-	if (gr_acl_is_enabled() && S_ISBLK(dentry->d_inode->i_mode) &&
+-	    !capable(CAP_SYS_RAWIO)) {
++	if (gr_handle_rawio(dentry->d_inode)) {
+ 		error = -EPERM;
+ 		up(&dir->d_inode->i_sem);
+ 		goto exit_dput;
+@@ -1874,7 +1871,7 @@ asmlinkage long sys_mknod(const char * f
+ 			goto out_dput;
+ 		}
+ 
+-		if (!gr_acl_handle_mknod(dentry, nd.dentry, nd.mnt)) {
++		if (!gr_acl_handle_mknod(dentry, nd.dentry, nd.mnt, mode)) {
+ 			error = -EACCES;
+ 			dput(dentry);
+ 			goto out_dput;
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/fs/open.c linux-2.4.20-wolk4.16-grsec2/fs/open.c
+--- linux-2.4.20-wolk4.16-fullkernel/fs/open.c	2004-09-05 16:06:32.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/fs/open.c	2004-09-05 17:07:52.000000000 +0200
+@@ -726,7 +726,7 @@ asmlinkage long sys_fchmod(unsigned int 
+ 	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
+ 		goto out_putf;
+ 
+-	if (!gr_acl_handle_fchmod(dentry, file->f_vfsmnt)) {
++	if (!gr_acl_handle_fchmod(dentry, file->f_vfsmnt, mode)) {
+ 		err = -EACCES;
+ 		goto out_putf;
+ 	}
+@@ -776,7 +776,7 @@ asmlinkage long sys_chmod(const char * f
+ 	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
+ 		goto dput_and_out;
+ 
+-	if (!gr_acl_handle_chmod(nd.dentry, nd.mnt)) {
++	if (!gr_acl_handle_chmod(nd.dentry, nd.mnt, mode)) {
+ 		error = -EACCES;
+ 		goto dput_and_out;
+ 	}
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/fs/proc/base.c linux-2.4.20-wolk4.16-grsec2/fs/proc/base.c
+--- linux-2.4.20-wolk4.16-fullkernel/fs/proc/base.c	2004-09-05 16:09:03.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/fs/proc/base.c	2004-09-05 17:07:52.000000000 +0200
+@@ -248,7 +248,8 @@ static int proc_root_link(struct inode *
+ #define MAY_PTRACE(task) \
+ 	(task == current || \
+ 	(task->p_pptr == current && \
+-	(task->ptrace & PT_PTRACED) && task->state == TASK_STOPPED))
++	(task->ptrace & PT_PTRACED) && task->state == TASK_STOPPED && \
++	!gr_handle_proc_ptrace(task)))
+ 
+ static int may_ptrace_attach(struct task_struct *task)
+ {
+@@ -267,6 +268,8 @@ static int may_ptrace_attach(struct task
+ 	rmb();
+ 	if (!is_dumpable(task) && !capable(CAP_SYS_PTRACE))
+ 		goto out;
++	if (gr_handle_proc_ptrace(task))
++		goto out;
+ 
+ 	retval = 1;
+ 
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/Makefile linux-2.4.20-wolk4.16-grsec2/gradm2/Makefile
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/Makefile	2004-09-05 17:07:53.000000000 +0200
+@@ -0,0 +1,131 @@
++##############################################################################
++#gradm (c) 2002,2003,2004 Brad Spengler 	        http://grsecurity.net#
++#--------------------------------------			---------------------#
++#gradm is licensed under the GNU GPL http://www.gnu.org		             #
++##############################################################################
 +
-+.B \-F
-+Toggle full learning mode.
-+If used only with -L, it enables the RBAC system in full learning
-+mode.
-+If used with -L and -O, it parses the full learning logs and
-+generates a complete ruleset.
-+.TP
++GRADM_BIN=gradm2
++GRSEC_DIR=/etc/grsec2
 +
-+.B \-M <filename|uid>
-+Remove an execution ban on a given uid or filename that has been
-+put in place by the RES_CRASH resource restriction of the RBAC system.
-+.TP
++LEX=/usr/bin/lex
++FLEX=/usr/bin/flex
++LEXFLAGS=-B
++YACC=/usr/bin/yacc
++BYACC=/usr/bin/byacc
++BISON=/usr/bin/bison
++MKNOD=/bin/mknod
++#for dietlibc
++#CC=/usr/bin/diet /usr/bin/gcc
++CC=/usr/bin/gcc
++FIND=/usr/bin/find
++STRIP=/usr/bin/strip
++KERNVER=`uname -r | cut -d"." -f 2`
++LIBS = $(shell if [ "`uname -m`" != "sparc64" ]; then echo "-lfl" ; else echo "" ; fi)
++OPT_FLAGS = $(shell if [ "`uname -m`" != "sparc64" ]; then echo "-O2" ; else echo "-O2 -m64" ; fi)
++CFLAGS=$(OPT_FLAGS) -DGRSEC_DIR=\"$(GRSEC_DIR)\" -DKERNVER=$(KERNVER)
++LDFLAGS=
++INSTALL = /usr/bin/install -c
 +
-+.B \-L <logfile>
-+Parses the learning logs.  Accepts an argument which
-+specifies the logfile to scan for the learning logs.
++# FHS
++MANDIR=/usr/share/man
++# older MANDIR
++#MANDIR=/usr/man
++DESTDIR=
++
++OBJECTS=gradm.tab.o lex.gradm.o learn_pass1.tab.o learn_pass2.tab.o \
++	fulllearn_pass1.tab.o fulllearn_pass2.tab.o fulllearn_pass3.tab.o \
++	gradm_misc.o gradm_parse.o gradm_arg.o gradm_pw.o gradm_opt.o \
++	gradm_cap.o gradm_sha256.o gradm_adm.o gradm_analyze.o gradm_res.o \
++	gradm_human.o gradm_learn.o gradm_net.o gradm_nest.o \
++	gradm_sym.o gradm_newlearn.o gradm_fulllearn.o gradm_lib.o \
++	lex.fulllearn_pass1.o lex.fulllearn_pass2.o \
++	lex.fulllearn_pass3.o lex.learn_pass1.o lex.learn_pass2.o
++
++all: $(USE_YACC) $(USE_LEX) $(GRADM_BIN) grlearn
++
++USE_YACC = $(shell if [ -x $(BYACC) ]; then echo $(BYACC); \
++	else if [ -x $(BISON) ]; then echo $(BISON) -y; \
++	else if [ -x $(YACC) ]; then echo $(YACC); \
++	else \
++		echo "Bison/(b)yacc needs to be installed to compile gradm."; \
++		exit 1; \
++	fi;fi;fi)
++
++USE_LEX = $(shell if [ -x $(FLEX) ]; then echo $(FLEX); \
++	else if [ -x $(LEX) ]; then echo $(LEX); \
++	else \
++		echo "(f)Lex needs to be installed to compile gradm."; \
++		exit 1; \
++	fi;fi)
++
++$(GRADM_BIN): $(OBJECTS)
++	$(CC) $(CFLAGS) -o $@ $(OBJECTS) $(LIBS) $(LDFLAGS)
++
++grlearn: grlearn.c gradm_lib.c
++	$(CC) $(CFLAGS) -o $@ grlearn.c gradm_lib.c $(LIBS) $(LDFLAGS)
++
++
++gradm.tab.c: gradm.y
++	$(USE_YACC) -b gradm -p gradm -d ./gradm.y
++
++lex.gradm.c: gradm.l
++	$(USE_LEX) $(LEXFLAGS) -Pgradm ./gradm.l
++
++fulllearn_pass1.tab.c: gradm_fulllearn_pass1.y
++	$(USE_YACC) -b fulllearn_pass1 -p fulllearn_pass1 -d ./gradm_fulllearn_pass1.y
++fulllearn_pass2.tab.c: gradm_fulllearn_pass2.y
++	$(USE_YACC) -b fulllearn_pass2 -p fulllearn_pass2 -d ./gradm_fulllearn_pass2.y
++fulllearn_pass3.tab.c: gradm_fulllearn_pass3.y
++	$(USE_YACC) -b fulllearn_pass3 -p fulllearn_pass3 -d ./gradm_fulllearn_pass3.y
++
++lex.fulllearn_pass1.c: gradm_fulllearn_pass1.l
++	$(USE_LEX) $(LEXFLAGS) -Pfulllearn_pass1 ./gradm_fulllearn_pass1.l
++lex.fulllearn_pass2.c: gradm_fulllearn_pass2.l
++	$(USE_LEX) $(LEXFLAGS) -Pfulllearn_pass2 ./gradm_fulllearn_pass2.l
++lex.fulllearn_pass3.c: gradm_fulllearn_pass3.l
++	$(USE_LEX) $(LEXFLAGS) -Pfulllearn_pass3 ./gradm_fulllearn_pass3.l
++
++learn_pass1.tab.c: gradm_learn_pass1.y
++	$(USE_YACC) -b learn_pass1 -p learn_pass1 -d ./gradm_learn_pass1.y
++learn_pass2.tab.c: gradm_learn_pass2.y
++	$(USE_YACC) -b learn_pass2 -p learn_pass2 -d ./gradm_learn_pass2.y
++
++lex.learn_pass1.c: gradm_learn_pass1.l
++	$(USE_LEX) $(LEXFLAGS) -Plearn_pass1 ./gradm_learn_pass1.l
++lex.learn_pass2.c: gradm_learn_pass2.l
++	$(USE_LEX) $(LEXFLAGS) -Plearn_pass2 ./gradm_learn_pass2.l
++
++install: $(GRADM_BIN) gradm.8 policy grlearn
++	mkdir -p $(DESTDIR)/sbin
++	$(INSTALL) -m 0755 $(GRADM_BIN) $(DESTDIR)/sbin
++	$(STRIP) $(DESTDIR)/sbin/$(GRADM_BIN)
++	$(INSTALL) -m 0700 grlearn $(DESTDIR)/sbin
++	$(STRIP) $(DESTDIR)/sbin/grlearn
++	mkdir -p -m 700 $(DESTDIR)$(GRSEC_DIR)
++	if [ -f $(DESTDIR)$(GRSEC_DIR)/acl ] ; then \
++		if [ -f $(DESTDIR)$(GRSEC_DIR)/acl ] ; then \
++			mv $(DESTDIR)$(GRSEC_DIR)/acl $(DESTDIR)$(GRSEC_DIR)/policy ; \
++		else \
++			$(INSTALL) -m 0600 policy $(DESTDIR)$(GRSEC_DIR) ; \
++		fi \
++	fi
++	@if [ -z "`cut -d" " -f3 /proc/mounts | grep "^devfs"`" ] ; then \
++		rm -f $(DESTDIR)/dev/grsec ; \
++		if [ ! -e $(DESTDIR)/dev/grsec ] ; then \
++			mkdir -p $(DESTDIR)/dev ; \
++			$(MKNOD) -m 0622 $(DESTDIR)/dev/grsec c 1 12 ; \
++		fi \
++	fi
++	mkdir -p $(DESTDIR)$(MANDIR)/man8
++	$(INSTALL) -m 0644 gradm.8 $(DESTDIR)$(MANDIR)/man8/$(GRADM_BIN).8
++	@if [ -z $(DESTDIR) ] ; then \
++		if [ -x /sbin/$(GRADM_BIN) ] ; then \
++			$(FIND) $(GRSEC_DIR) -type f -name pw -size 48c -exec rm -f $(GRSEC_DIR)/pw \; ; \
++			if [ ! -f $(GRSEC_DIR)/pw ] ; then \
++				/sbin/$(GRADM_BIN) -P ; \
++                        fi \
++		fi \
++	fi
++
++clean:
++	rm -f core *.o $(GRADM_BIN) lex.*.c *.tab.c *.tab.h grlearn
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/changelog linux-2.4.20-wolk4.16-grsec2/gradm2/debian/changelog
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/changelog	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/debian/changelog	2004-09-05 17:07:53.000000000 +0200
+@@ -0,0 +1,20 @@
++gradm2 (2.0.1-1) unstable; urgency=medium
++
++  * New upstream release, grsec device is now 'c 1 12' and _not_ 'c 1 10';
++    thus recreate it if it exists with the wrong minor number.
++  * Added Dutch Debconf translation, thanks to Luk Claes
++    <Luk.Claes@UGent.be>!
++
++ -- László Böszörményi (GCS) <gcs@lsc.hu>  Mon, 16 Aug 2004 23:01:54 +0000
++
++gradm2 (2.0-1) unstable; urgency=low
++
++  * Initial release (closes: #244094).
++  * Changed binary name to gradm2 and config dir to /etc/gradm2 , not to
++    conflict with the gradm package, as one may need both on dual boot
++    setups.
++  * Renamed /etc/gradm2/acl to /etc/gradm2/policy as well, as now it is
++    required upstream.
++  * Backport amd64 compile fix from upstream CVS.
++
++ -- László Böszörményi (GCS) <gcs@lsc.hu>  Sat, 24 Apr 2004 19:19:02 +0000
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/config linux-2.4.20-wolk4.16-grsec2/gradm2/debian/config
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/config	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/debian/config	2004-09-05 17:07:53.000000000 +0200
+@@ -0,0 +1,13 @@
++#!/bin/sh -e
++
++. /usr/share/debconf/confmodule
++
++# Check for configure time
++if [ "$1" = configure -o "$1" = reconfigure ]; then
++	db_version 2.0
++	db_input medium gradm2/create_dev_grsec || true
++	db_go
++fi
++
++
++exit 0
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/control linux-2.4.20-wolk4.16-grsec2/gradm2/debian/control
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/control	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/debian/control	2004-09-05 17:07:53.000000000 +0200
+@@ -0,0 +1,16 @@
++Source: gradm2
++Section: admin
++Priority: optional
++Maintainer: László Böszörményi (GCS) <gcs@lsc.hu>
++Build-Depends: debhelper (>> 4.0.0), bison, flex
++Standards-Version: 3.6.1
++
++Package: gradm2
++Architecture: any
++Suggests: kernel-patch-grsecurity2
++Depends: ${misc:Depends}
++Description: Administration program for the grsecurity2 RBAC based ACL system
++ Used to manage the RBAC based ACL system of grsecurity2. Please note that you
++ will need a specially patched kernel for grsecurity to work (see the
++ kernel-patch-grsecurity2 Debian package). You can find more information
++ about grsecurity at http://www.grsecurity.net/
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/copyright linux-2.4.20-wolk4.16-grsec2/gradm2/debian/copyright
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/copyright	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/debian/copyright	2004-09-05 17:07:53.000000000 +0200
+@@ -0,0 +1,23 @@
++This package was debianized by  LA¡szlA¶szA¶rmACnyi (GCS) <gcs@lsc.hu> on
++at, 24 Apr 2004 20:19:02 CET
++
++It was downloaded from: http://www.grsecurity.net/download.php
++
++Upstream Authors: Brad Spender <spender@grsecurity.net>
++
++Copyright:
++    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  02111-1307  USA
++
++The complete license can be found at '/usr/share/common-licenses/GPL-2'.
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/grlearn.8 linux-2.4.20-wolk4.16-grsec2/gradm2/debian/grlearn.8
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/grlearn.8	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/debian/grlearn.8	2004-09-05 17:07:53.000000000 +0200
+@@ -0,0 +1,26 @@
++.TH GRLEARN 8
++.SH NAME
++grlearn \- Automatic learning daemon for grsecurity RBAC system
++.SH SYNOPSIS
++.B grlearn
++[
++.B logfile
++]
++
++.SH DESCRIPTION
++.I grlearn
++is a daemon for automaticaly create minimalistic learnt access configuration
++for the grsecurity RBAC system.
++
++.SH BUGS
++This package is by no means complete.
++
++.SH REPORTING BUGS
++Please include as much information as possible(using any available debugging
++options) and send bug reports for gradm2 or the grsecurity RBAC system
++to
++.B dev@grsecurity.net.
++                                                                                
++.SH AUTHOR
++.B grsecurity and grlearn
++were created and are maintained by Brad Spengler <spender@grsecurity.net>
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/lintian.overrides linux-2.4.20-wolk4.16-grsec2/gradm2/debian/lintian.overrides
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/lintian.overrides	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/debian/lintian.overrides	2004-09-05 17:07:53.000000000 +0200
+@@ -0,0 +1 @@
++gradm2: mknod-in-maintainer-script
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/po/POTFILES.in linux-2.4.20-wolk4.16-grsec2/gradm2/debian/po/POTFILES.in
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/po/POTFILES.in	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/debian/po/POTFILES.in	2004-09-05 17:07:53.000000000 +0200
+@@ -0,0 +1 @@
++[type: gettext/rfc822deb] templates
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/po/hu.po linux-2.4.20-wolk4.16-grsec2/gradm2/debian/po/hu.po
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/po/hu.po	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/debian/po/hu.po	2004-09-05 17:07:53.000000000 +0200
+@@ -0,0 +1,42 @@
++#
++#    Translators, if you are not familiar with the PO format, gettext
++#    documentation is worth reading, especially sections dedicated to
++#    this format, e.g. by running:
++#         info -n '(gettext)PO Files'
++#         info -n '(gettext)Header Entry'
++#
++#    Some information specific to po-debconf are available at
++#            /usr/share/doc/po-debconf/README-trans
++#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
++#
++#    Developers do not need to manually edit POT or PO files.
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: PACKAGE VERSION\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2004-07-04 12:45+0000\n"
++"PO-Revision-Date: 2004-07-28 22:25+0100\n"
++"Last-Translator: László 'GCS' Böszörményi <gcs@lsc.hu>\n"
++"Language-Team: LANGUAGE <LL@li.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=iso-8859-1\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#. Type: note
++#. Description
++#: ../templates:3
++msgid "gradm2 needs a device entry "
++msgstr "A gradm2-nek szüksége van egy eszközbejegyzésre"
++
++#. Type: note
++#. Description
++#: ../templates:3
++msgid ""
++"gradm2 needs a special entry, a device called /dev/grsec to communicate with "
++"the kernel. It will be created for you if you don't already have it and you "
++"don't have devfs or udev."
++msgstr ""
++"A gradm2-nek szükséges egy speciális bejegyzés, egy eszköz amit /dev/grsec -"
++"nek hívnak. Ez létre lesz hozva, ha még nem létezik, és nem devfs-t vagy "
++"udev-et használ."
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/po/nl.po linux-2.4.20-wolk4.16-grsec2/gradm2/debian/po/nl.po
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/po/nl.po	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/debian/po/nl.po	2004-09-05 17:07:53.000000000 +0200
+@@ -0,0 +1,39 @@
++#         info -n '(gettext)PO Files'
++#         info -n '(gettext)Header Entry'
++# 
++#    Some information specific to po-debconf are available at
++#            /usr/share/doc/po-debconf/README-trans
++#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
++# 
++#    Developers do not need to manually edit POT or PO files.
++# 
++msgid ""
++msgstr ""
++"Project-Id-Version: gradm2 2.0-1\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2004-07-04 12:45+0000\n"
++"PO-Revision-Date: 2004-08-11 17:13+0100\n"
++"Last-Translator: Luk Claes <luk.claes@ugent.be>\n"
++"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=iso-8859-1\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#. Type: note
++#. Description
++#: ../templates:3
++msgid "gradm2 needs a device entry "
++msgstr "gradm2 heeft een apparaat (device) nodig"
++
++#. Type: note
++#. Description
++#: ../templates:3
++#, fuzzy
++msgid ""
++"gradm2 needs a special entry, a device called /dev/grsec to communicate with "
++"the kernel. It will be created for you if you don't already have it and you "
++"don't have devfs or udev."
++msgstr ""
++"gradm2 heeft een speciaal apparaat nodig, genaamd /dev/grsec, om te "
++"communiceren met de kernel. Het zal voor u worden aangemaakt als u het nog "
++"niet heeft en u geen devfs heeft."
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/po/templates.pot linux-2.4.20-wolk4.16-grsec2/gradm2/debian/po/templates.pot
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/po/templates.pot	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/debian/po/templates.pot	2004-09-05 17:07:53.000000000 +0200
+@@ -0,0 +1,40 @@
++#
++#    Translators, if you are not familiar with the PO format, gettext
++#    documentation is worth reading, especially sections dedicated to
++#    this format, e.g. by running:
++#         info -n '(gettext)PO Files'
++#         info -n '(gettext)Header Entry'
++#
++#    Some information specific to po-debconf are available at
++#            /usr/share/doc/po-debconf/README-trans
++#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
++#
++#    Developers do not need to manually edit POT or PO files.
++#
++#, fuzzy
++msgid ""
++msgstr ""
++"Project-Id-Version: PACKAGE VERSION\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2004-07-04 12:45+0000\n"
++"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
++"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
++"Language-Team: LANGUAGE <LL@li.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=CHARSET\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#. Type: note
++#. Description
++#: ../templates:3
++msgid "gradm2 needs a device entry "
++msgstr ""
++
++#. Type: note
++#. Description
++#: ../templates:3
++msgid ""
++"gradm2 needs a special entry, a device called /dev/grsec to communicate with "
++"the kernel. It will be created for you if you don't already have it and you "
++"don't have devfs or udev."
++msgstr ""
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/postinst linux-2.4.20-wolk4.16-grsec2/gradm2/debian/postinst
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/postinst	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/debian/postinst	2004-09-05 17:07:53.000000000 +0200
+@@ -0,0 +1,13 @@
++#!/bin/sh -e
++
++. /usr/share/debconf/confmodule
++
++if [ "$1" = configure ]; then
++	if [ ! -c /dev/grsec ] && [ ! -c /dev/.devfsd ] && [ ! -f /dev/.udev.tdb ]; then
++		mknod -m 0622 /dev/grsec c 1 12 || true
++	fi
++fi
++
++#DEBHELPER#
++
++exit 0
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/preinst linux-2.4.20-wolk4.16-grsec2/gradm2/debian/preinst
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/preinst	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/debian/preinst	2004-09-05 17:07:53.000000000 +0200
+@@ -0,0 +1,13 @@
++#!/bin/sh -e
++
++. /usr/share/debconf/confmodule
++
++if [ "$1" = install ] || [ "$1" = upgrade ]; then
++	if [ -c /dev/grsec ] && [ `ls -l /dev/grsec | tr -s ' ' | cut -f6 -d' '` = 10 ]; then
++		rm -f /dev/grsec
++	fi
++fi
++
++#DEBHELPER#
++
++exit 0
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/rules linux-2.4.20-wolk4.16-grsec2/gradm2/debian/rules
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/rules	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/debian/rules	2004-09-05 17:07:53.000000000 +0200
+@@ -0,0 +1,67 @@
++#!/usr/bin/make -f
++# Uncomment this to turn on verbose mode.
++#export DH_VERBOSE=1
++
++export DH_COMPAT=4
++
++BUILDDIR=$(CURDIR)/debian/gradm2
++
++# These are used for cross-compiling and for saving the configure script
++# from having to guess our platform (since we know it already)
++DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
++DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
++
++ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
++	CFLAGS += -g
++endif
++ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
++	INSTALL_PROGRAM += -s
++endif
++
++debian/po/templates.pot: debian/templates
++	@debconf-updatepo
++
++clean: debian/po/templates.pot
++	dh_testdir
++
++	rm -f build-stamp install-stamp
++	$(MAKE) clean
++	dh_clean
++
++build: build-stamp
++
++build-stamp:
++	dh_testdir
++
++	$(MAKE)
++	touch $@
++
++install: install-stamp
++
++install-stamp: build
++	dh_testdir
++
++	$(MAKE) install DESTDIR=$(BUILDDIR)
++	rm -rf $(BUILDDIR)/dev/
++	install -d $(BUILDDIR)/usr/share/lintian/overrides/
++	install -m0644 $(CURDIR)/debian/lintian.overrides $(BUILDDIR)/usr/share/lintian/overrides/gradm2
++	touch $@
++
++binary-indep: build install
++
++binary-arch: build install
++	dh_testdir
++	dh_installdebconf
++	dh_installdocs
++	dh_installman debian/grlearn.8
++	dh_installchangelogs
++	dh_compress
++	dh_strip
++	dh_fixperms
++	dh_installdeb
++	dh_gencontrol
++	dh_md5sums
++	dh_builddeb
++
++binary: binary-indep binary-arch
++.PHONY: clean build binary-indep binary-arch binary install
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/templates linux-2.4.20-wolk4.16-grsec2/gradm2/debian/templates
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/templates	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/debian/templates	2004-09-05 17:07:53.000000000 +0200
+@@ -0,0 +1,6 @@
++Template: gradm2/create_dev_grsec
++Type: note
++_Description: gradm2 needs a device entry 
++ gradm2 needs a special entry, a device called /dev/grsec to communicate with
++ the kernel. It will be created for you if you don't already have it and you
++ don't have devfs or udev.
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm.8 linux-2.4.20-wolk4.16-grsec2/gradm2/gradm.8
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm.8	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/gradm.8	2004-09-05 17:07:53.000000000 +0200
+@@ -0,0 +1,135 @@
++.TH GRADM 8 
++.SH NAME
++gradm \- Administration program for the grsecurity RBAC system
++.SH SYNOPSIS
++.B gradm
++[
++.B \-E 
++]
++[
++.B \-R
++]
++[
++.B \-F
++]
++[
++.B \-L <logfile>
++]
++[
++.B \-O <filename|stream>
++]
++[
++.B \-M
++<filename|uid>
++]
++[
++.B \-D 
++]
++[
++.B \-P [rolename]
++]
++[
++.B \-a <rolename>
++]
++[
++.B \-n <rolename>
++]
++[
++.B \-u
++]
++[
++.B \-h 
++]
++[
++.B \-v
++]
++
++.SH DESCRIPTION
++
++.I gradm
++is the userspace RBAC parsing and authentication program for
++.I grsecurity
++
++grsecurity aims to be a complete security system for Linux 2.4.  gradm 
++performs several tasks for the RBAC system including authenticated via a 
++password to the kernel and parsing rules to be passed to the kernel.
++
++.SH OPTIONS
++.TP
++
++All options to gradm are mutually exclusive, except for -L and -O.
++.TP
++.B \-E
++Enable the RBAC system
++.TP
++
++.B \-R
++Reload the RBAC system (only valid while in admin mode)
++.TP
++
++.B \-F
++Toggle full learning mode.
++If used only with -L, it enables the RBAC system in full learning
++mode.
++If used with -L and -O, it parses the full learning logs and
++generates a complete ruleset.
++.TP
++
++.B \-M <filename|uid>
++Remove an execution ban on a given uid or filename that has been
++put in place by the RES_CRASH resource restriction of the RBAC system.
++.TP
++
++.B \-L <logfile>
++Parses the learning logs.  Accepts an argument which
++specifies the logfile to scan for the learning logs.
 +This option can be used with -E, -O, or -F.
 +.TP
 +
@@ -456,9 +1188,9 @@ diff -Naurp old/gradm2/gradm.8 new/gradm
 +.SH AUTHOR
 +.B grsecurity and gradm
 +were created and are maintained by Brad Spengler <spender@grsecurity.net>
-diff -Naurp old/gradm2/gradm.h new/gradm2/gradm.h
---- old/gradm2/gradm.h	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/gradm.h	2004-06-23 22:55:46.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm.h linux-2.4.20-wolk4.16-grsec2/gradm2/gradm.h
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/gradm.h	2004-09-05 17:07:53.000000000 +0200
 @@ -0,0 +1,79 @@
 +#ifndef GRADM_H
 +#define GRADM_H
@@ -539,10 +1271,10 @@ diff -Naurp old/gradm2/gradm.h new/gradm
 +#include "gradm_func.h"
 +
 +#endif
-diff -Naurp old/gradm2/gradm.l new/gradm2/gradm.l
---- old/gradm2/gradm.l	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/gradm.l	2004-06-18 03:51:29.000000000 +0200
-@@ -0,0 +1,405 @@
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm.l linux-2.4.20-wolk4.16-grsec2/gradm2/gradm.l
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm.l	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/gradm.l	2004-09-05 17:07:53.000000000 +0200
+@@ -0,0 +1,511 @@
 +%{
 +#include "gradm.h"
 +#include "gradm.tab.h"
@@ -557,11 +1289,20 @@ diff -Naurp old/gradm2/gradm.l new/gradm
 +int is_eof(void);
 +void add_include(char *includename);
 +
-+int include_stack_ptr = 0;
-+unsigned long lineno_stack[MAX_INCLUDE_DEPTH];
-+YY_BUFFER_STATE include_stack[MAX_INCLUDE_DEPTH];
-+FILE *include_in[MAX_INCLUDE_DEPTH];
-+char *current_acl[MAX_INCLUDE_DEPTH];
++struct include_entry {
++	unsigned long lineno;
++	YY_BUFFER_STATE buffer;
++	FILE *file;
++	char *name;
++	struct include_entry *prev;
++	struct include_entry *next;
++	struct include_entry *parent;
++	struct include_entry **stack;
++	int sp;
++};
++
++struct include_entry include_stack;
++struct include_entry *current_stack;
 +
 +%}
 +
@@ -571,7 +1312,8 @@ diff -Naurp old/gradm2/gradm.l new/gradm
 +
 +%x ROLE_STATE SUBJECT_STATE IP_STATE RES_STATE COMMENT_STATE ROLETYPE_STATE
 +%x INCLUDE_STATE IPNETMASK_STATE IPPORT_STATE ROLETRANS_STATE
-+%x VAR_STATE VAR_OBJ_STATE IDTRANS_STATE
++%x VAR_STATE VAR_OBJ_STATE IDTRANS_STATE DOMAIN_STATE DOMAINTYPE_STATE
++%x DOMAINLIST_STATE
 +
 +%%
 +
@@ -594,11 +1336,25 @@ diff -Naurp old/gradm2/gradm.l new/gradm
 +					  gradmlval.string = strdup(yytext);
 +					  return ROLE_TYPE;
 +					}
++<DOMAINTYPE_STATE>([ug]l?)|(l?[ug])	{
++					  BEGIN(DOMAINLIST_STATE);
++					  gradmlval.string = strdup(yytext);
++					  return DOMAIN_TYPE;
++					}
 +<ROLE_STATE>[_a-zA-Z0-9-]{1,30}		{
 +					  BEGIN(ROLETYPE_STATE);
 +					  gradmlval.string = strdup(yytext);
 +					  return ROLE_NAME;
 +					}
++<DOMAIN_STATE>[_a-zA-Z0-9-]{1,30}	{
++					  BEGIN(DOMAINTYPE_STATE);
++					  gradmlval.string = strdup(yytext);
++					  return ROLE_NAME;
++					}
++<DOMAINLIST_STATE>[_a-zA-Z0-9-]{1,30}	{
++					  gradmlval.string = strdup(yytext);
++					  return ROLE_NAME;
++					}
 +<ROLETRANS_STATE>[_a-zA-Z0-9-]{1,30}	{
 +					  gradmlval.string = strdup(yytext);
 +					  return ROLE_NAME;
@@ -741,6 +1497,10 @@ diff -Naurp old/gradm2/gradm.l new/gradm
 +					  BEGIN(ROLE_STATE);
 +					  return ROLE;
 +					}
++"domain"				{
++					  BEGIN(DOMAIN_STATE);
++					  return DOMAIN;
++					}
 +"role_allow_ip"				{
 +					  BEGIN(IP_STATE);
 +					  return ROLE_ALLOW_IP;
@@ -819,18 +1579,70 @@ diff -Naurp old/gradm2/gradm.l new/gradm
 +	struct stat fstat;
 +	FILE *tmpfile;
 +
-+	if (include_stack_ptr >= MAX_INCLUDE_DEPTH) {
++	if (current_stack->sp >= MAX_INCLUDE_DEPTH) {
 +		fprintf(stderr, "Includes too deep while trying to process "
 +				"%s\n", includename);
 +		exit(EXIT_FAILURE);
 +	}
 +
++	current_stack->stack = realloc(current_stack->stack, (1 + current_stack->sp) * sizeof(struct include_entry *));
++	if (current_stack->stack == NULL)
++		failure("realloc");
++	current_stack->stack[current_stack->sp] = calloc(1, sizeof(struct include_entry));
++	if (current_stack->stack[current_stack->sp] == NULL)
++		failure("calloc");
++	current_stack->stack[current_stack->sp]->lineno = lineno;
++	lineno = 1;
++	current_stack->stack[current_stack->sp]->file = yyin;
++	current_stack->stack[current_stack->sp]->name = current_acl_file;
++	current_stack->stack[current_stack->sp]->buffer = YY_CURRENT_BUFFER;
++	current_stack->stack[current_stack->sp]->parent = current_stack;
++
 +	if (!stat(includename, &fstat)) {
 +		if (S_ISDIR(fstat.st_mode)) {
-+			fprintf(stderr, "Error while including %s: "
-+				"Directories cannot be specified by an "
-+				"include directive.\n", includename);
-+			exit(EXIT_FAILURE);
++			struct dirent **namelist;
++			struct include_entry *last = current_stack->stack[current_stack->sp];
++			struct include_entry *tmp;
++			char *path;
++			int n;
++
++			n = scandir(includename, &namelist, 0, alphasort);
++			if (n >= 3) {
++				while (n--) {
++					if (!strcmp(namelist[n]->d_name, ".") || !strcmp(namelist[n]->d_name, ".."))
++						continue;
++					tmp = calloc(1, sizeof(struct include_entry));
++					if (tmp == NULL)
++						failure("calloc");
++					
++					path = calloc(1, strlen(includename) + strlen(namelist[n]->d_name) + 2);
++					if (path == NULL)
++						failure("calloc");
++
++					sprintf(path, "%s/%s", includename, namelist[n]->d_name);
++
++					tmp->name = path;
++					tmp->lineno = 1;
++					tmp->parent = current_stack;
++
++					last->next = tmp;
++					tmp->prev = last;
++					last = tmp;
++				}
++				change_current_acl_file(tmp->name);
++				tmpfile = fopen(tmp->name, "r");
++
++				if (!tmpfile) {
++					fprintf(stderr, "Unable to open included file: %s\n", tmp->name);
++					exit(EXIT_FAILURE);
++				}
++
++				yyin = tmpfile;
++				current_stack = tmp;
++				yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE));
++				return;
++			}
++			return;
 +		}
 +	}
 +	tmpfile = fopen(includename, "r");
@@ -841,12 +1653,8 @@ diff -Naurp old/gradm2/gradm.l new/gradm
 +		exit(EXIT_FAILURE);
 +	}
 +
-+	lineno_stack[include_stack_ptr] = lineno;
-+	lineno = 1;
-+	include_in[include_stack_ptr] = yyin;
-+	current_acl[include_stack_ptr] = current_acl_file;
 +	change_current_acl_file(includename);
-+	include_stack[include_stack_ptr++] = YY_CURRENT_BUFFER;
++	current_stack->sp++;
 +	yyin = tmpfile;
 +	yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE));
 +
@@ -855,20 +1663,41 @@ diff -Naurp old/gradm2/gradm.l new/gradm
 +
 +int is_eof(void)
 +{
-+	if (include_stack_ptr)
++	if (current_stack->sp)
 +		fclose(yyin);
-+	if (--include_stack_ptr < 0)
-+	{
-+		include_stack_ptr = 0;
-+		lineno = 1;
-+		return 1;
++	current_stack->sp--;
++	if (current_stack->sp < 0) {
++		if (!current_stack->prev || !current_stack->prev->prev) {
++			if (current_stack->parent == NULL || current_stack->parent->name == NULL) {
++				current_stack->sp = 0;
++				lineno = 1;
++				return 1;
++			} else {
++				current_stack = current_stack->parent;
++				goto regular;
++			}
++		} else {
++			current_stack = current_stack->prev;
++			lineno = 1;
++			change_current_acl_file(current_stack->name);
++			yy_delete_buffer(YY_CURRENT_BUFFER);
++			yyin = fopen(current_stack->name, "r");
++			if (yyin == NULL) {
++				fprintf(stderr, "Unable to open included file: %s\n", current_stack->name);
++				exit(EXIT_FAILURE);
++			}
++			yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE));
++			return 0;
++		}
 +	}
 +
-+	change_current_acl_file(current_acl[include_stack_ptr]);
++regular:
++	change_current_acl_file(current_stack->stack[current_stack->sp]->name);
 +	yy_delete_buffer(YY_CURRENT_BUFFER);
-+	lineno = lineno_stack[include_stack_ptr];
-+	yyin = include_in[include_stack_ptr];
-+	yy_switch_to_buffer(include_stack[include_stack_ptr]);
++	lineno = current_stack->stack[current_stack->sp]->lineno;
++	yyin = current_stack->stack[current_stack->sp]->file;
++	yy_switch_to_buffer(current_stack->stack[current_stack->sp]->buffer);
++
 +	return 0;
 +}
 +
@@ -897,30 +1726,15 @@ diff -Naurp old/gradm2/gradm.l new/gradm
 +	return;
 +}
 +
-+int main(int argc, char *argv[])
-+{
 +#ifdef GRADM_DEBUG
++void show_policy(void) {
 +	struct file_acl *filp;
 +	struct proc_acl *proc;
 +	struct role_acl *rolp;
 +	struct role_transition *rolet;
 +	extern struct rlimconv rlim_table[];
 +	int i;
-+#endif
-+	if (geteuid() != getuid()) {
-+		fprintf(stderr, "gradm is not meant to run suid root.\n");
-+		exit(EXIT_FAILURE);
-+	}
-+
-+	special_role_uid = 0;
-+	
-+	no_coredump();
 +
-+	init_variables();
-+
-+	parse_args(argc, argv);
-+
-+#ifdef GRADM_DEBUG
 +	for (rolp = current_role;rolp;rolp=rolp->prev) {
 +	printf("ROLE: %s type:%s uid/gid:%u\n", rolp->rolename,
 +		rolp->roletype & GR_ROLE_SPECIAL ? "special" :
@@ -936,7 +1750,7 @@ diff -Naurp old/gradm2/gradm.l new/gradm
 +		printf("\tSUBJECT: %s dev:%d inode:%lu mode:%d c_raise:%x c_drop:%x\n",
 +			proc->filename, proc->dev, proc->inode, proc->mode, ~proc->cap_drop,
 +			proc->cap_drop);
-+		if (!proc->ip_object)
++		if (!proc->ips)
 +			printf("\t\tNo socket restrictions\n");
 +		for (filp = proc->hash->first;filp;filp=filp->prev)
 +                        printf("\t\tOBJECT: %s dev:%d inode:%lu mode:%d\n", filp->filename, filp->dev, filp->inode, filp->mode);
@@ -945,13 +1759,37 @@ diff -Naurp old/gradm2/gradm.l new/gradm
 +				printf("\t\t%s: soft: %lu hard: %lu\n", rlim_table[i].name, proc->res[i].rlim_cur, proc->res[i].rlim_max);
 +	}
 +	}
++}
++#endif
++
++int main(int argc, char *argv[])
++{
++	if (geteuid() != getuid()) {
++		fprintf(stderr, "gradm is not meant to run suid root.\n");
++		exit(EXIT_FAILURE);
++	}
++
++	special_role_uid = 0;
++	
++	no_coredump();
++
++	current_stack = &include_stack;
++	memset(current_stack, 0, sizeof(struct include_entry));
++
++	init_variables();
++
++	parse_args(argc, argv);
++
++#ifdef GRADM_DEBUG
++	show_policy();
 +#endif
 +	return 0;
 +}
-diff -Naurp old/gradm2/gradm.y new/gradm2/gradm.y
---- old/gradm2/gradm.y	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/gradm.y	2004-03-08 01:22:08.000000000 +0100
-@@ -0,0 +1,337 @@
++
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm.y linux-2.4.20-wolk4.16-grsec2/gradm2/gradm.y
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm.y	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/gradm.y	2004-09-05 17:07:53.000000000 +0200
+@@ -0,0 +1,356 @@
 +%{
 +#include "gradm.h"
 +
@@ -975,7 +1813,7 @@ diff -Naurp old/gradm2/gradm.y new/gradm
 +%token <string> IPPROTO OBJ_MODE SUBJ_MODE IPNETMASK CAP_NAME ROLE_ALLOW_IP
 +%token <string> ROLE_TRANSITION VARIABLE DEFINE DEFINE_NAME DISABLED
 +%token <string> ID_NAME USER_TRANS_ALLOW GROUP_TRANS_ALLOW 
-+%token <string> USER_TRANS_DENY GROUP_TRANS_DENY
++%token <string> USER_TRANS_DENY GROUP_TRANS_DENY DOMAIN_TYPE DOMAIN
 +%type <long_int> subj_mode obj_mode ip_netmask
 +%type <mode> role_type
 +%type <var> variable_expression
@@ -990,6 +1828,7 @@ diff -Naurp old/gradm2/gradm.y new/gradm
 +	;
 +
 +various_acls:			role_label
++	|			domain_label
 +	|			role_allow_ip
 +	|			role_transitions
 +	|			subject_label
@@ -1057,6 +1896,24 @@ diff -Naurp old/gradm2/gradm.y new/gradm
 +				}
 +	;
 +
++domain_label:			DOMAIN ROLE_NAME DOMAIN_TYPE 
++				{
++				 if (!add_role_acl(&current_role, $2, GR_ROLE_DOMAIN | role_mode_conv($3), 1))
++					exit(EXIT_FAILURE);
++				}
++				domain_user_list
++	;
++
++domain_user_list:		ROLE_NAME
++				{
++					add_domain_child(current_role, $1);
++				}
++	|			domain_user_list ROLE_NAME
++				{
++					add_domain_child(current_role, $2);
++				}
++	;
++
 +role_label: 			ROLE ROLE_NAME role_type
 +				{
 +				 if (!add_role_acl(&current_role, $2, $3, 0))
@@ -1289,10 +2146,150 @@ diff -Naurp old/gradm2/gradm.y new/gradm
 +	|			ip_typeproto IPTYPE
 +				{ conv_name_to_type(&ip, $2); }
 +	;
-diff -Naurp old/gradm2/gradm_adm.c new/gradm2/gradm_adm.c
---- old/gradm2/gradm_adm.c	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/gradm_adm.c	2004-06-23 22:55:46.000000000 +0200
-@@ -0,0 +1,246 @@
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm2.8 linux-2.4.20-wolk4.16-grsec2/gradm2/gradm2.8
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm2.8	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/gradm2.8	2004-09-05 17:07:53.000000000 +0200
+@@ -0,0 +1,136 @@
++.TH GRADM2 8 
++.SH NAME
++gradm2 \- Administration program for the grsecurity RBAC system
++.SH SYNOPSIS
++.B gradm2
++[
++.B \-E 
++]
++[
++.B \-R
++]
++[
++.B \-F
++]
++[
++.B \-L <logfile>
++]
++[
++.B \-O <filename|stream>
++]
++[
++.B \-M
++<filename|uid>
++]
++[
++.B \-D 
++]
++[
++.B \-P [rolename]
++]
++[
++.B \-a <rolename>
++]
++[
++.B \-n <rolename>
++]
++[
++.B \-u
++]
++[
++.B \-h 
++]
++[
++.B \-v
++]
++
++.SH DESCRIPTION
++
++.I gradm2
++is the userspace ACL parsing and authentication program for the
++.I grsecurity
++Access Control List System.
++
++grsecurity aims to be a complete security system for Linux 2.4.  gradm2 
++performs several tasks for the RBAC system including authenticated via a 
++password to the kernel and parsing rules to be passed to the kernel.
++
++.SH OPTIONS
++.TP
++
++All options to gradm2 are mutually exclusive, except for -L and -O.
++.TP
++.B \-E
++Enable the RBAC system
++.TP
++
++.B \-R
++Reload the RBAC system (only valid while in admin mode)
++.TP
++
++.B \-F
++Toggle full learning mode.
++If used only with -L, it enables the RBAC system in full learning
++mode.
++If used with -L and -O, it parses the full learning logs and
++generates a complete ruleset.
++.TP
++
++.B \-M <filename|uid>
++Remove an execution ban on a given uid or filename that has been
++put in place by the RES_CRASH resource restriction of the RBAC system.
++.TP
++
++.B \-L <logfile>
++Parses the learning logs.  Accepts an argument which
++specifies the logfile to scan for the learning logs.
++This option can be used with -E, -O, or -F.
++.TP
++
++.B \-O <filename|stream>
++Specifies output mode.  Requires a single argument that can be
++"stdout", "stderr", or a regular file.  Only used with -L or -F.
++.TP
++
++.B \-D
++Disable the RBAC system
++.TP
++
++.B \-P [rolename]
++Without an argument, it sets the password for administering
++the RBAC system.  With a role name as an argument, it sets
++the password for that given special role.
++.TP
++
++.B \-a <rolename>
++Authenticate to a special role that requires a password.
++.TP
++
++.B \-n <rolename>
++Authenticate to a special role that does not require a password.
++.TP
++
++.B \-u
++Removes yourself from your current special role, reverting back
++to the normal role selection.  To be used, for instance, for logging
++out of an admin role without exiting your shell.
++
++.B \-h
++Display help information
++.TP
++
++.B \-v
++Print version information and exit
++.TP
++
++.BR
++
++.SH REPORTING BUGS
++Please include as much information as possible(using any available debugging 
++options) and send bug reports for gradm2 or the grsecurity RBAC system 
++to 
++.B dev@grsecurity.net.
++
++.SH AUTHOR
++.B grsecurity and gradm2
++were created and are maintained by Brad Spengler <spender@grsecurity.net>
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_adm.c linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_adm.c
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_adm.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_adm.c	2004-09-05 17:07:53.000000000 +0200
+@@ -0,0 +1,256 @@
 +#include "gradm.h"
 +
 +int
@@ -1389,6 +2386,10 @@ diff -Naurp old/gradm2/gradm_adm.c new/g
 +				 proc_object_mode_conv("r"), GR_FEXIST))
 +		exit(EXIT_FAILURE);
 +
++	if (!add_proc_object_acl(current_subject, "/etc/ld.so.preload",
++				 proc_object_mode_conv("r"), GR_FEXIST))
++		exit(EXIT_FAILURE);
++
 +	if (!add_proc_object_acl(current_subject, "/dev/urandom",
 +				 proc_object_mode_conv("r"), GR_FEXIST))
 +		exit(EXIT_FAILURE);
@@ -1431,6 +2432,12 @@ diff -Naurp old/gradm2/gradm_adm.c new/g
 +	    (current_subject, "/", proc_object_mode_conv("rx"), GR_FEXIST))
 +		exit(EXIT_FAILURE);
 +	if (!add_proc_object_acl
++	    (current_subject, "/dev/tty", proc_object_mode_conv("rw"), GR_FEXIST))
++		exit(EXIT_FAILURE);
++	if (!add_proc_object_acl
++	    (current_subject, "/dev/null", proc_object_mode_conv("rw"), GR_FEXIST))
++		exit(EXIT_FAILURE);
++	if (!add_proc_object_acl
 +	    (current_subject, "/etc/grsec", proc_object_mode_conv("h"),
 +	     GR_FEXIST))
 +		exit(EXIT_FAILURE);
@@ -1539,9 +2546,9 @@ diff -Naurp old/gradm2/gradm_adm.c new/g
 +
 +	return;
 +}
-diff -Naurp old/gradm2/gradm_analyze.c new/gradm2/gradm_analyze.c
---- old/gradm2/gradm_analyze.c	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/gradm_analyze.c	2004-05-31 17:03:56.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_analyze.c linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_analyze.c
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_analyze.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_analyze.c	2004-09-05 17:07:53.000000000 +0200
 @@ -0,0 +1,564 @@
 +#include "gradm.h"
 +
@@ -1628,7 +2635,7 @@ diff -Naurp old/gradm2/gradm_analyze.c n
 +		if (!check_permission(role, def_acl, tmp->filename, &chk))
 +			fprintf(stderr,
 +				"Warning: write access is allowed to your "
-+				"subject ACL for %s in role %s.  Please ensure that the subject is running with less privilege than the default subject.\n",
++				"subject for %s in role %s.  Please ensure that the subject is running with less privilege than the default subject.\n",
 +				tmp->filename, role->rolename);
 +
 +	return errs_found;
@@ -1913,7 +2920,7 @@ diff -Naurp old/gradm2/gradm_analyze.c n
 +		if (!check_permission(role, def_acl, GRSEC_DIR, &chk)) {
 +			fprintf(stderr,
 +				"Viewing access is allowed by role %s to %s, the directory which "
-+				"holds ACL and ACL password information.\n\n",
++				"stores RBAC policies and RBAC password information.\n\n",
 +				role->rolename, GRSEC_DIR);
 +			errs_found++;
 +		}
@@ -2048,7 +3055,7 @@ diff -Naurp old/gradm2/gradm_analyze.c n
 +		if (!check_permission(role, def_acl, "", &chk)) {
 +			fprintf(stderr, "CAP_SYS_ADMIN is not "
 +				"removed in role %s.  This would allow an "
-+				"attacker to mount filesystems to bypass ACLs\n\n",
++				"attacker to mount filesystems to bypass your policies\n\n",
 +				role->rolename);
 +			errs_found++;
 +		}
@@ -2107,9 +3114,9 @@ diff -Naurp old/gradm2/gradm_analyze.c n
 +
 +	return;
 +}
-diff -Naurp old/gradm2/gradm_arg.c new/gradm2/gradm_arg.c
---- old/gradm2/gradm_arg.c	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/gradm_arg.c	2004-06-23 23:19:53.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_arg.c linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_arg.c
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_arg.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_arg.c	2004-09-05 17:07:53.000000000 +0200
 @@ -0,0 +1,316 @@
 +#include "gradm.h"
 +
@@ -2143,7 +3150,7 @@ diff -Naurp old/gradm2/gradm_arg.c new/g
 +	       "	-L <filename>, --learn\n"
 +	       "			Specify the pathname for learning logs\n"
 +	       "	-O <filename>, --output\n"
-+	       "			Specify where to place ACLs generated from learning mode\n"
++	       "			Specify where to place policies generated from learning mode\n"
 +	       "	-M <filename|uid>, --modsegv\n"
 +	       "			Remove a ban on a specific file or UID\n"
 +	       "	-a <rolename> , --auth\n"
@@ -2188,7 +3195,7 @@ diff -Naurp old/gradm2/gradm_arg.c new/g
 +	int gr_enable = 0;
 +	int gr_fulllearn = 0;
 +	struct gr_pw_entry entry;
-+	struct gr_arg *grarg;
++	struct gr_arg_wrapper *grarg;
 +	char cwd[PATH_MAX];
 +	const char *const short_opts = "SEFuDP::RL:O:M:a:n:hv";
 +	const struct option long_opts[] = {
@@ -2266,8 +3273,8 @@ diff -Naurp old/gradm2/gradm_arg.c new/g
 +			expand_acls();
 +			analyze_acls();
 +			grarg = conv_user_to_kernel(&entry);
-+			read_saltandpass(entry.rolename, grarg->salt,
-+					 grarg->sum);
++			read_saltandpass(entry.rolename, grarg->arg->salt,
++					 grarg->arg->sum);
 +			transmit_to_kernel(grarg);
 +			break;
 +		case 'M':
@@ -2398,8 +3405,8 @@ diff -Naurp old/gradm2/gradm_arg.c new/g
 +		if (gr_learn)
 +			start_grlearn(learn_log);
 +		grarg = conv_user_to_kernel(&entry);
-+		read_saltandpass(entry.rolename, grarg->salt,
-+				 grarg->sum);
++		read_saltandpass(entry.rolename, grarg->arg->salt,
++				 grarg->arg->sum);
 +		transmit_to_kernel(grarg);
 +	} else if (gr_learn && gr_output) {
 +		FILE *stream;
@@ -2427,9 +3434,9 @@ diff -Naurp old/gradm2/gradm_arg.c new/g
 +	}
 +	return;
 +}
-diff -Naurp old/gradm2/gradm_cap.c new/gradm2/gradm_cap.c
---- old/gradm2/gradm_cap.c	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/gradm_cap.c	2004-03-31 03:20:18.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_cap.c linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_cap.c
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_cap.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_cap.c	2004-09-05 17:07:53.000000000 +0200
 @@ -0,0 +1,90 @@
 +#include "gradm.h"
 +
@@ -2521,19 +3528,20 @@ diff -Naurp old/gradm2/gradm_cap.c new/g
 +
 +	return;
 +}
-diff -Naurp old/gradm2/gradm_defs.h new/gradm2/gradm_defs.h
---- old/gradm2/gradm_defs.h	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/gradm_defs.h	2004-06-25 19:04:25.000000000 +0200
-@@ -0,0 +1,390 @@
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_defs.h linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_defs.h
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_defs.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_defs.h	2004-09-05 17:07:53.000000000 +0200
+@@ -0,0 +1,403 @@
 +#ifndef GRSEC_DIR
-+#define GRSEC_DIR		"/etc/grsec"
++#define GRSEC_DIR		"/etc/grsec2"
 +#endif
 +#define GRLEARN_PATH		"/sbin/grlearn"
 +#define GRDEV_PATH		"/dev/grsec"
-+#define GR_ACL_PATH 		GRSEC_DIR "/acl"
++#define GR_POLICY_PATH 		GRSEC_DIR "/policy"
 +#define GR_PW_PATH 		GRSEC_DIR "/pw"
 +
 +#define GR_VERSION		"2.0.1"
++#define GRADM_VERSION		0x201
 +
 +#define GR_PWONLY		0
 +#define GR_PWANDSUM		1
@@ -2619,7 +3627,8 @@ diff -Naurp old/gradm2/gradm_defs.h new/
 +	GR_ROLE_NOPW = 0x0020,
 +	GR_ROLE_GOD = 0x0040,
 +	GR_ROLE_LEARN = 0x0080,
-+	GR_ROLE_TPE = 0x0100
++	GR_ROLE_TPE = 0x0100,
++	GR_ROLE_DOMAIN = 0x0200
 +};
 +
 +enum {
@@ -2733,6 +3742,8 @@ diff -Naurp old/gradm2/gradm_defs.h new/
 +
 +	struct role_transition *transitions;
 +	struct role_allowed_ip *allowed_ips;
++	uid_t *domain_children;
++	__u16 domain_child_num;
 +
 +	struct proc_acl **subj_hash;
 +	__u32 subj_hash_size;
@@ -2766,7 +3777,6 @@ diff -Naurp old/gradm2/gradm_defs.h new/
 +
 +	struct proc_acl *parent_subject;
 +	struct gr_hash_struct *hash;
-+	struct ip_acl *ip_object;
 +	struct proc_acl *prev;
 +	struct proc_acl *next;
 +
@@ -2882,13 +3892,11 @@ diff -Naurp old/gradm2/gradm_defs.h new/
 +
 +struct user_acl_role_db {
 +	struct role_acl **r_table;
-+	__u32 r_entries;	/* Number of entries in table */
-+	__u32 s_entries;	/* total number of subject acls */
-+	__u32 i_entries;	/* total number of ip acls */
-+	__u32 o_entries;	/* Total number of object acls */
-+	__u32 g_entries;	/* total number of globbed objects */
-+	__u32 a_entries;	/* total number of allowed role ips */
-+	__u32 t_entries;	/* total number of transitions */
++	__u32 num_pointers;		/* Number of allocations to track */
++	__u32 num_roles;		/* Number of roles */
++	__u32 num_domain_children;	/* Number of domain children */
++	__u32 num_subjects;		/* Number of subjects */
++	__u32 num_objects; 		/* Number of objects */
 +};
 +
 +struct sprole_pw {
@@ -2911,13 +3919,25 @@ diff -Naurp old/gradm2/gradm_defs.h new/
 +	__u16 mode;
 +};
 +
++struct gr_arg_wrapper {
++	struct gr_arg *arg;
++	__u32 version;
++	__u32 size;
++};
++
 +struct capability_set capability_list[30];
 +struct rlimconv rlim_table[12];
 +
 +uid_t special_role_uid;
-diff -Naurp old/gradm2/gradm_fulllearn.c new/gradm2/gradm_fulllearn.c
---- old/gradm2/gradm_fulllearn.c	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/gradm_fulllearn.c	2004-03-04 06:30:05.000000000 +0100
++
++__u32 num_subjects;
++__u32 num_roles;
++__u32 num_objects;
++__u32 num_pointers;
++__u32 num_domain_children;
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_fulllearn.c linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_fulllearn.c
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_fulllearn.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_fulllearn.c	2004-09-05 17:07:53.000000000 +0200
 @@ -0,0 +1,275 @@
 +#include "gradm.h"
 +
@@ -3194,9 +4214,9 @@ diff -Naurp old/gradm2/gradm_fulllearn.c
 +
 +	return;
 +}
-diff -Naurp old/gradm2/gradm_fulllearn_pass1.l new/gradm2/gradm_fulllearn_pass1.l
---- old/gradm2/gradm_fulllearn_pass1.l	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/gradm_fulllearn_pass1.l	2003-06-25 21:01:10.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_fulllearn_pass1.l linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_fulllearn_pass1.l
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_fulllearn_pass1.l	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_fulllearn_pass1.l	2004-09-05 17:07:53.000000000 +0200
 @@ -0,0 +1,41 @@
 +%{
 +#include "gradm.h"
@@ -3239,9 +4259,9 @@ diff -Naurp old/gradm2/gradm_fulllearn_p
 +
 +void fulllearn_pass1error(const char *s) { return; }
 +int fulllearn_pass1wrap(void) { return 1; }
-diff -Naurp old/gradm2/gradm_fulllearn_pass1.y new/gradm2/gradm_fulllearn_pass1.y
---- old/gradm2/gradm_fulllearn_pass1.y	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/gradm_fulllearn_pass1.y	2003-06-22 23:30:29.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_fulllearn_pass1.y linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_fulllearn_pass1.y
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_fulllearn_pass1.y	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_fulllearn_pass1.y	2004-09-05 17:07:53.000000000 +0200
 @@ -0,0 +1,64 @@
 +%{
 +#include "gradm.h"
@@ -3307,9 +4327,9 @@ diff -Naurp old/gradm2/gradm_fulllearn_p
 +		}
 +	;
 +%%
-diff -Naurp old/gradm2/gradm_fulllearn_pass2.l new/gradm2/gradm_fulllearn_pass2.l
---- old/gradm2/gradm_fulllearn_pass2.l	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/gradm_fulllearn_pass2.l	2003-06-25 21:01:10.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_fulllearn_pass2.l linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_fulllearn_pass2.l
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_fulllearn_pass2.l	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_fulllearn_pass2.l	2004-09-05 17:07:53.000000000 +0200
 @@ -0,0 +1,41 @@
 +%{
 +#include "gradm.h"
@@ -3352,9 +4372,9 @@ diff -Naurp old/gradm2/gradm_fulllearn_p
 +
 +void fulllearn_pass2error(const char *s) { return; }
 +int fulllearn_pass2wrap(void) { return 1; }
-diff -Naurp old/gradm2/gradm_fulllearn_pass2.y new/gradm2/gradm_fulllearn_pass2.y
---- old/gradm2/gradm_fulllearn_pass2.y	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/gradm_fulllearn_pass2.y	2004-03-04 05:17:04.000000000 +0100
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_fulllearn_pass2.y linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_fulllearn_pass2.y
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_fulllearn_pass2.y	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_fulllearn_pass2.y	2004-09-05 17:07:53.000000000 +0200
 @@ -0,0 +1,91 @@
 +%{
 +#include "gradm.h"
@@ -3447,9 +4467,9 @@ diff -Naurp old/gradm2/gradm_fulllearn_p
 +		}
 +	;
 +%%
-diff -Naurp old/gradm2/gradm_fulllearn_pass3.l new/gradm2/gradm_fulllearn_pass3.l
---- old/gradm2/gradm_fulllearn_pass3.l	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/gradm_fulllearn_pass3.l	2003-06-25 21:01:10.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_fulllearn_pass3.l linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_fulllearn_pass3.l
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_fulllearn_pass3.l	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_fulllearn_pass3.l	2004-09-05 17:07:53.000000000 +0200
 @@ -0,0 +1,41 @@
 +%{
 +#include "gradm.h"
@@ -3492,9 +4512,9 @@ diff -Naurp old/gradm2/gradm_fulllearn_p
 +
 +void fulllearn_pass3error(const char *s) { return; }
 +int fulllearn_pass3wrap(void) { return 1; }
-diff -Naurp old/gradm2/gradm_fulllearn_pass3.y new/gradm2/gradm_fulllearn_pass3.y
---- old/gradm2/gradm_fulllearn_pass3.y	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/gradm_fulllearn_pass3.y	2004-03-04 05:05:42.000000000 +0100
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_fulllearn_pass3.y linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_fulllearn_pass3.y
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_fulllearn_pass3.y	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_fulllearn_pass3.y	2004-09-05 17:07:53.000000000 +0200
 @@ -0,0 +1,108 @@
 +%{
 +#include "gradm.h"
@@ -3604,14 +4624,14 @@ diff -Naurp old/gradm2/gradm_fulllearn_p
 +		}
 +	;
 +%%
-diff -Naurp old/gradm2/gradm_func.h new/gradm2/gradm_func.h
---- old/gradm2/gradm_func.h	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/gradm_func.h	2004-06-18 03:50:57.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_func.h linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_func.h
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_func.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_func.h	2004-09-05 17:07:53.000000000 +0200
 @@ -0,0 +1,129 @@
 +void yyerror(const char *s);
 +FILE *open_acl_file(const char *filename);
 +void get_user_passwd(struct gr_pw_entry *entry, int mode);
-+int transmit_to_kernel(struct gr_arg *buf);
++int transmit_to_kernel(struct gr_arg_wrapper *buf);
 +void generate_salt(struct gr_pw_entry *entry);
 +void write_user_passwd(struct gr_pw_entry *entry);
 +void parse_acls(void);
@@ -3630,7 +4650,7 @@ diff -Naurp old/gradm2/gradm_func.h new/
 +void add_gradm_acl(struct role_acl *role);
 +void add_grlearn_acl(struct role_acl *role);
 +void change_current_acl_file(const char *filename);
-+struct gr_arg *conv_user_to_kernel(struct gr_pw_entry *entry);
++struct gr_arg_wrapper *conv_user_to_kernel(struct gr_pw_entry *entry);
 +int parent_dir(const char *filename, char *parent_dirent[]);
 +void rem_proc_object_acl(struct proc_acl *proc, struct file_acl *filp);
 +void expand_acls(void);
@@ -3737,9 +4757,9 @@ diff -Naurp old/gradm2/gradm_func.h new/
 +void insert_acl_subject(struct role_acl *role, struct proc_acl *subject);
 +
 +void insert_nested_acl_subject(struct proc_acl *subject);
-diff -Naurp old/gradm2/gradm_human.c new/gradm2/gradm_human.c
---- old/gradm2/gradm_human.c	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/gradm_human.c	2004-04-03 18:22:57.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_human.c linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_human.c
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_human.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_human.c	2004-09-05 17:07:53.000000000 +0200
 @@ -0,0 +1,161 @@
 +#include "gradm.h"
 +
@@ -3902,10 +4922,10 @@ diff -Naurp old/gradm2/gradm_human.c new
 +
 +	return;
 +}
-diff -Naurp old/gradm2/gradm_learn.c new/gradm2/gradm_learn.c
---- old/gradm2/gradm_learn.c	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/gradm_learn.c	2004-06-18 04:50:52.000000000 +0200
-@@ -0,0 +1,324 @@
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_learn.c linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_learn.c
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_learn.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_learn.c	2004-09-05 17:07:53.000000000 +0200
+@@ -0,0 +1,325 @@
 +#include "gradm.h"
 +
 +struct gr_learn_role_entry *default_role_entry;
@@ -4046,7 +5066,8 @@ diff -Naurp old/gradm2/gradm_learn.c new
 +				for_each_object(object, subject) {
 +					insert_learn_object(matchsubj, conv_filename_to_struct(object->filename, object->mode));
 +				}
-+				for (ipp = subject->ip_object; ipp; ipp = ipp->prev) {
++				for (i = 0; i < subject->ip_num; i++) {
++					ipp = subject->ips[i];
 +					if (ipp->mode == GR_IP_CONNECT) {
 +						for (i = ipp->low; i <= ipp->high; i++)
 +						for (x = 0; x < 5; x++)
@@ -4230,9 +5251,9 @@ diff -Naurp old/gradm2/gradm_learn.c new
 +
 +	return;
 +}
-diff -Naurp old/gradm2/gradm_learn_pass1.l new/gradm2/gradm_learn_pass1.l
---- old/gradm2/gradm_learn_pass1.l	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/gradm_learn_pass1.l	2003-06-25 21:01:10.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_learn_pass1.l linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_learn_pass1.l
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_learn_pass1.l	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_learn_pass1.l	2004-09-05 17:07:53.000000000 +0200
 @@ -0,0 +1,41 @@
 +%{
 +#include "gradm.h"
@@ -4275,9 +5296,9 @@ diff -Naurp old/gradm2/gradm_learn_pass1
 +
 +void learn_pass1error(const char *s) { return; }
 +int learn_pass1wrap(void) { return 1; }
-diff -Naurp old/gradm2/gradm_learn_pass1.y new/gradm2/gradm_learn_pass1.y
---- old/gradm2/gradm_learn_pass1.y	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/gradm_learn_pass1.y	2004-03-04 05:05:42.000000000 +0100
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_learn_pass1.y linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_learn_pass1.y
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_learn_pass1.y	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_learn_pass1.y	2004-09-05 17:07:53.000000000 +0200
 @@ -0,0 +1,112 @@
 +%{
 +#include "gradm.h"
@@ -4391,9 +5412,9 @@ diff -Naurp old/gradm2/gradm_learn_pass1
 +		}
 +	;
 +%%
-diff -Naurp old/gradm2/gradm_learn_pass2.l new/gradm2/gradm_learn_pass2.l
---- old/gradm2/gradm_learn_pass2.l	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/gradm_learn_pass2.l	2003-06-25 21:01:10.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_learn_pass2.l linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_learn_pass2.l
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_learn_pass2.l	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_learn_pass2.l	2004-09-05 17:07:53.000000000 +0200
 @@ -0,0 +1,41 @@
 +%{
 +#include "gradm.h"
@@ -4436,9 +5457,9 @@ diff -Naurp old/gradm2/gradm_learn_pass2
 +
 +void learn_pass2error(const char *s) { return; }
 +int learn_pass2wrap(void) { return 1; }
-diff -Naurp old/gradm2/gradm_learn_pass2.y new/gradm2/gradm_learn_pass2.y
---- old/gradm2/gradm_learn_pass2.y	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/gradm_learn_pass2.y	2004-03-04 05:05:42.000000000 +0100
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_learn_pass2.y linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_learn_pass2.y
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_learn_pass2.y	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_learn_pass2.y	2004-09-05 17:07:53.000000000 +0200
 @@ -0,0 +1,123 @@
 +%{
 +#include "gradm.h"
@@ -4563,9 +5584,9 @@ diff -Naurp old/gradm2/gradm_learn_pass2
 +		}
 +	;
 +%%
-diff -Naurp old/gradm2/gradm_lib.c new/gradm2/gradm_lib.c
---- old/gradm2/gradm_lib.c	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/gradm_lib.c	2004-06-18 03:50:57.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_lib.c linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_lib.c
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_lib.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_lib.c	2004-09-05 17:07:53.000000000 +0200
 @@ -0,0 +1,561 @@
 +#include "gradm.h"
 +
@@ -5128,10 +6149,10 @@ diff -Naurp old/gradm2/gradm_lib.c new/g
 +	subject->hash = create_hash_table(GR_HASH_OBJECT);
 +	return;
 +}
-diff -Naurp old/gradm2/gradm_misc.c new/gradm2/gradm_misc.c
---- old/gradm2/gradm_misc.c	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/gradm_misc.c	2004-06-23 23:19:53.000000000 +0200
-@@ -0,0 +1,171 @@
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_misc.c linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_misc.c
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_misc.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_misc.c	2004-09-05 17:07:53.000000000 +0200
+@@ -0,0 +1,177 @@
 +#include "gradm.h"
 +
 +FILE *
@@ -5148,18 +6169,17 @@ diff -Naurp old/gradm2/gradm_misc.c new/
 +}
 +
 +int
-+transmit_to_kernel(struct gr_arg *buf)
++transmit_to_kernel(struct gr_arg_wrapper *buf)
 +{
 +	int fd;
 +	int err = 0;
-+	void *pbuf = buf;
 +
 +	if ((fd = open(GRDEV_PATH, O_WRONLY)) < 0) {
 +		fprintf(stderr, "Could not open %s.\n", GRDEV_PATH);
 +		failure("open");
 +	}
 +
-+	if (write(fd, &pbuf, sizeof(struct gr_arg *)) != sizeof(struct gr_arg *)) {
++	if (write(fd, buf, sizeof(struct gr_arg_wrapper)) != sizeof(struct gr_arg_wrapper)) {
 +		err = 1;
 +		switch (errno) {
 +		case EFAULT:
@@ -5191,12 +6211,12 @@ diff -Naurp old/gradm2/gradm_misc.c new/
 +	}
 +
 +	close(fd);
-+	if (buf->mode != GRADM_DISABLE) {
-+		memset(buf, 0, sizeof(struct gr_arg));
++	if (buf->arg->mode != GRADM_DISABLE) {
++		memset(buf->arg, 0, sizeof(struct gr_arg));
 +		if (err)
 +			exit(EXIT_FAILURE);
 +	} else {
-+		memset(buf, 0, sizeof(struct gr_arg));
++		memset(buf->arg, 0, sizeof(struct gr_arg));
 +		if (err)
 +			exit(EXIT_FAILURE);
 +		else
@@ -5211,8 +6231,11 @@ diff -Naurp old/gradm2/gradm_misc.c new/
 +	int fd;
 +	int retval;
 +	struct gr_arg arg;
-+	struct gr_arg *parg = &arg;
++	struct gr_arg_wrapper wrapper;
 +
++	wrapper.version = GRADM_VERSION;
++	wrapper.size = sizeof(struct gr_arg);
++	wrapper.arg = &arg;
 +	arg.mode = GRADM_STATUS;
 +
 +	if ((fd = open(GRDEV_PATH, O_WRONLY)) < 0) {
@@ -5220,7 +6243,7 @@ diff -Naurp old/gradm2/gradm_misc.c new/
 +		failure("open");
 +	}
 +
-+	retval = write(fd, &parg, sizeof(struct gr_arg *));
++	retval = write(fd, &wrapper, sizeof(struct gr_arg_wrapper));
 +	close(fd);
 +
 +	switch (reqmode) {
@@ -5265,6 +6288,10 @@ diff -Naurp old/gradm2/gradm_misc.c new/
 +	current_acl_file = NULL;
 +	current_role = NULL;
 +	current_subject = NULL;
++	num_roles = 0;
++	num_subjects = 0;
++	num_objects = 0;
++	num_pointers = 0;
 +
 +	memset(&ip, 0, sizeof (ip));
 +
@@ -5303,10 +6330,10 @@ diff -Naurp old/gradm2/gradm_misc.c new/
 +
 +	return 0;
 +}
-diff -Naurp old/gradm2/gradm_nest.c new/gradm2/gradm_nest.c
---- old/gradm2/gradm_nest.c	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/gradm_nest.c	2004-02-29 16:05:11.000000000 +0100
-@@ -0,0 +1,94 @@
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_nest.c linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_nest.c
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_nest.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_nest.c	2004-09-05 17:07:53.000000000 +0200
+@@ -0,0 +1,89 @@
 +#include "gradm.h"
 +
 +void
@@ -5390,21 +6417,16 @@ diff -Naurp old/gradm2/gradm_nest.c new/
 +	current_subject->mode |= GR_NESTED;
 +
 +	if (!stat(nestednames[i - 1], &fstat) && S_ISREG(fstat.st_mode)) {
-+		if (is_valid_elf_binary(nestednames[i - 1])) {
-+			if (!add_proc_object_acl(current_subject, nestednames[i - 1], proc_object_mode_conv("x"), GR_FLEARN))
-+				exit(EXIT_FAILURE);
-+		} else {
-+			if (!add_proc_object_acl(current_subject, nestednames[i - 1], proc_object_mode_conv("rx"), GR_FLEARN))
-+				exit(EXIT_FAILURE);
-+		}
++		if (!add_proc_object_acl(current_subject, nestednames[i - 1], proc_object_mode_conv("rx"), GR_FLEARN))
++			exit(EXIT_FAILURE);
 +	}
 +
 +	return;
 +}
-diff -Naurp old/gradm2/gradm_net.c new/gradm2/gradm_net.c
---- old/gradm2/gradm_net.c	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/gradm_net.c	2003-05-16 23:59:28.000000000 +0200
-@@ -0,0 +1,123 @@
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_net.c linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_net.c
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_net.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_net.c	2004-09-05 17:07:53.000000000 +0200
+@@ -0,0 +1,126 @@
 +#include "gradm.h"
 +
 +void
@@ -5413,6 +6435,8 @@ diff -Naurp old/gradm2/gradm_net.c new/g
 +	struct role_allowed_ip **roleipp;
 +	struct role_allowed_ip *roleip;
 +
++	num_pointers++;
++
 +	roleip =
 +	    (struct role_allowed_ip *) calloc(1,
 +					      sizeof (struct role_allowed_ip));
@@ -5437,29 +6461,32 @@ diff -Naurp old/gradm2/gradm_net.c new/g
 +void
 +add_ip_acl(struct proc_acl *subject, __u8 mode, struct ip_acl *acl_tmp)
 +{
-+	struct ip_acl **ipp;
 +	struct ip_acl *p;
 +	int i;
 +
 +	if (!subject) {
 +		fprintf(stderr, "Error on line %lu of %s.\n  Definition "
-+			"of an IP ACL without a subject definition.\n"
++			"of an IP policy without a subject definition.\n"
 +			"The RBAC system will not be allowed to be "
 +			"enabled until this problem is fixed.\n",
 +			lineno, current_acl_file);
 +		exit(EXIT_FAILURE);
 +	}
 +
-+	ipp = &(subject->ip_object);
++	/* add one for the pointer to array of pointers */
++	if (subject->ips == NULL)
++		num_pointers++;
++
++	num_pointers++;
++
++	subject->ip_num++;
++	subject->ips = gr_dyn_realloc(subject->ips, subject->ip_num * sizeof(struct ip_acl *));
 +
 +	p = (struct ip_acl *) calloc(1, sizeof (struct ip_acl));
 +	if (!p)
 +		failure("calloc");
 +
-+	if (*ipp)
-+		(*ipp)->next = p;
-+
-+	p->prev = *ipp;
++	*(subject->ips + subject->ip_num - 1) = p;
 +
 +	p->mode = mode;
 +	p->addr = acl_tmp->addr;
@@ -5473,8 +6500,6 @@ diff -Naurp old/gradm2/gradm_net.c new/g
 +		subject->ip_proto[i] |= p->proto[i];
 +	subject->ip_type |= p->type;
 +
-+	*ipp = p;
-+
 +	return;
 +}
 +
@@ -5528,9 +6553,9 @@ diff -Naurp old/gradm2/gradm_net.c new/g
 +	}
 +	return;
 +}
-diff -Naurp old/gradm2/gradm_newlearn.c new/gradm2/gradm_newlearn.c
---- old/gradm2/gradm_newlearn.c	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/gradm_newlearn.c	2004-06-18 04:50:20.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_newlearn.c linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_newlearn.c
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_newlearn.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_newlearn.c	2004-09-05 17:07:53.000000000 +0200
 @@ -0,0 +1,1675 @@
 +#include "gradm.h"
 +
@@ -7207,10 +8232,10 @@ diff -Naurp old/gradm2/gradm_newlearn.c 
 +	return NULL;
 +}
 +
-diff -Naurp old/gradm2/gradm_opt.c new/gradm2/gradm_opt.c
---- old/gradm2/gradm_opt.c	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/gradm_opt.c	2004-05-08 21:26:47.000000000 +0200
-@@ -0,0 +1,48 @@
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_opt.c linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_opt.c
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_opt.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_opt.c	2004-09-05 17:07:53.000000000 +0200
+@@ -0,0 +1,43 @@
 +#include "gradm.h"
 +
 +static void
@@ -7243,13 +8268,8 @@ diff -Naurp old/gradm2/gradm_opt.c new/g
 +	for_each_role(role, current_role) {
 +		for_each_subject(proc, role) {
 +			if (!stat(proc->filename, &fstat) && S_ISREG(fstat.st_mode)) {
-+				if (is_valid_elf_binary(proc->filename)) {
-+					if (!add_proc_object_acl(proc, proc->filename, proc_object_mode_conv("x"), GR_FLEARN))
-+						exit(EXIT_FAILURE);
-+				} else {
-+					if (!add_proc_object_acl(proc, proc->filename, proc_object_mode_conv("rx"), GR_FLEARN))
-+						exit(EXIT_FAILURE);
-+				}
++				if (!add_proc_object_acl(proc, proc->filename, proc_object_mode_conv("rx"), GR_FLEARN))
++					exit(EXIT_FAILURE);
 +			}
 +			/* if we're not nested and not /, set parent subject */
 +			if (!(proc->mode & GR_OVERRIDE) && !(proc->mode & GR_NESTED) && strcmp(proc->filename, "/"))
@@ -7259,10 +8279,10 @@ diff -Naurp old/gradm2/gradm_opt.c new/g
 +
 +	return;
 +}
-diff -Naurp old/gradm2/gradm_parse.c new/gradm2/gradm_parse.c
---- old/gradm2/gradm_parse.c	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/gradm_parse.c	2004-06-18 03:50:57.000000000 +0200
-@@ -0,0 +1,1021 @@
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_parse.c linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_parse.c
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_parse.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_parse.c	2004-09-05 17:07:53.000000000 +0200
+@@ -0,0 +1,1094 @@
 +#include "gradm.h"
 +
 +extern FILE *gradmin;
@@ -7306,8 +8326,12 @@ diff -Naurp old/gradm2/gradm_parse.c new
 +			exit(EXIT_FAILURE);
 +		}
 +
++		/* increment pointer count upon allocation of user transition list */
++		if (subject->user_transitions == NULL)
++			num_pointers++;
++
 +		subject->user_trans_num++;
-+		subject->user_transitions = gr_dyn_realloc(subject->user_transitions, subject->user_trans_num);
++		subject->user_transitions = gr_dyn_realloc(subject->user_transitions, subject->user_trans_num * sizeof(uid_t));
 +		*(subject->user_transitions + subject->user_trans_num - 1) = pwd->pw_uid;
 +	} else if (usergroup == GR_ID_GROUP) {
 +		if (allowdeny == GR_ID_ALLOW) {
@@ -7341,8 +8365,12 @@ diff -Naurp old/gradm2/gradm_parse.c new
 +			exit(EXIT_FAILURE);
 +		}
 +
++		/* increment pointer count upon allocation of group transition list */
++		if (subject->group_transitions == NULL)
++			num_pointers++;
++
 +		subject->group_trans_num++;
-+		subject->group_transitions = gr_dyn_realloc(subject->group_transitions, subject->group_trans_num);
++		subject->group_transitions = gr_dyn_realloc(subject->group_transitions, subject->group_trans_num * sizeof(gid_t));
 +		*(subject->group_transitions + subject->group_trans_num - 1) = grp->gr_gid;
 +	}
 +
@@ -7350,11 +8378,70 @@ diff -Naurp old/gradm2/gradm_parse.c new
 +}
 +
 +void
++add_domain_child(struct role_acl *role, char *idname)
++{
++	struct passwd *pwd;
++	struct group *grp;
++
++	/* reason for this is that in the kernel, the hash table which is keyed by UID/GID
++	   has a size dependent on the number of roles.  Since we want to fake a domain
++	   as being a real role for each of those users/groups by providing a pointer
++	   to the domain for each user/group, we need to count each of these against the
++	   role count */
++	num_domain_children++;
++
++	/* increment pointer count upon allocation of domain list */
++	if (role->domain_children == NULL)
++		num_pointers++;
++
++	if (role->roletype & GR_ROLE_USER) {
++		pwd = getpwnam(idname);
++
++		if (!pwd) {
++			fprintf(stderr, "User %s on line %lu of %s "
++				"does not exist.\nThe RBAC system will "
++				"not be allowed to be enabled until "
++				"this error is fixed.\n", idname,
++				lineno, current_acl_file);
++			exit(EXIT_FAILURE);
++		}
++
++		role->domain_child_num++;
++		role->domain_children = gr_dyn_realloc(role->domain_children, role->domain_child_num * sizeof(uid_t));
++		*(role->domain_children + role->domain_child_num - 1) = pwd->pw_uid;
++	} else if (role->roletype & GR_ROLE_GROUP) {
++		grp = getgrnam(idname);
++
++		if (!grp) {
++			fprintf(stderr, "Group %s on line %lu of %s "
++				"does not exist.\nThe RBAC system will "
++				"not be allowed to be enabled until "
++				"this error is fixed.\n", idname,
++				lineno, current_acl_file);
++			exit(EXIT_FAILURE);
++		}
++
++		role->domain_child_num++;
++		role->domain_children = gr_dyn_realloc(role->domain_children, role->domain_child_num * sizeof(uid_t));
++		*(role->domain_children + role->domain_child_num - 1) = grp->gr_gid;
++	} else {
++		// should never get here
++		fprintf(stderr, "Unhandled exception 1.\n");
++		exit(EXIT_FAILURE);
++	}
++
++	return;
++}
++
++void
 +add_role_transition(struct role_acl *role, char *rolename)
 +{
 +	struct role_transition **roletpp;
 +	struct role_transition *roletp;
 +
++	/* one for transition, one for name */
++	num_pointers += 2;
++
 +	roletp =
 +	    (struct role_transition *) calloc(1,
 +					      sizeof (struct role_transition));
@@ -7471,6 +8558,11 @@ diff -Naurp old/gradm2/gradm_parse.c new
 +	struct passwd *pwd;
 +	struct group *grp;
 +
++	num_roles++;
++
++	/* one for role, one for name */
++	num_pointers += 2;
++
 +	if (!rolename) {
 +		fprintf(stderr, "Out of memory.\n");
 +		exit(EXIT_FAILURE);
@@ -7553,6 +8645,18 @@ diff -Naurp old/gradm2/gradm_parse.c new
 +	return 1;
 +}
 +
++int count_slashes(char *str)
++{
++	int i = 0;
++	while (*str) {
++		if (*str == '/')
++			i++;
++		str++;
++	}
++
++	return i;
++}
++
 +static int
 +add_globbing_file(struct proc_acl *subject, char *filename,
 +		  __u32 mode, int type)
@@ -7561,6 +8665,10 @@ diff -Naurp old/gradm2/gradm_parse.c new
 +	char *p, *p2;
 +	struct file_acl *anchor;
 +	struct file_acl *glob, *glob2;
++	int lnum, onum;
++
++	/* one for the object itself, one for the filename */
++	num_pointers += 2;
 +
 +	if (!basepoint)
 +		failure("strdup");
@@ -7570,7 +8678,7 @@ diff -Naurp old/gradm2/gradm_parse.c new
 +	while (*p != '\0') {
 +		if (*p == '/')
 +			p2 = p;
-+		if (*p == '?' || *p == '*')
++		if (*p == '?' || *p == '*' || *p == '[')
 +			break;
 +		p++;
 +	}
@@ -7591,11 +8699,32 @@ diff -Naurp old/gradm2/gradm_parse.c new
 +
 +	if (anchor->globbed) {
 +		glob = anchor->globbed;
-+		while (glob->next)
-+			glob = glob->next;
 +		glob2 = calloc(1, sizeof(struct file_acl));
 +		if (!glob2)
 +			failure("calloc");
++		onum = count_slashes(filename);
++		lnum = count_slashes(glob->filename);
++		if (onum > lnum) {
++			glob2->next = glob;
++			anchor->globbed = glob2;
++			glob2->filename = filename;
++			glob2->mode = mode;
++			glob->prev = glob2;
++			return 1;
++		}
++		while (glob->next) {
++			lnum = count_slashes(glob->next->filename);
++			if (onum > lnum) {
++				glob2->next = glob->next;
++				glob->next = glob2;
++				glob2->filename = filename;
++				glob2->mode = mode;
++				glob2->prev = glob;
++				glob->next->prev = glob2;
++				return 1;
++			}
++			glob = glob->next;
++		}
 +		glob2->filename = filename;
 +		glob2->mode = mode;
 +		glob2->prev = glob;
@@ -7675,6 +8804,7 @@ diff -Naurp old/gradm2/gradm_parse.c new
 +	struct stat fstat;
 +	struct deleted_file *dfile;
 +	unsigned int file_len;
++	char *str;
 +
 +	if (!subject) {
 +		fprintf(stderr, "Error on line %lu of %s.  Attempt to "
@@ -7692,10 +8822,28 @@ diff -Naurp old/gradm2/gradm_parse.c new
 +	if (!strncmp(filename, "$HOME", 5))
 +		filename = parse_homedir(filename);
 +
-+	file_len = strlen(filename) + 1;
++	str = filename;
++	file_len = 0;
++	while (*str) {
++		file_len++;
++		if (*str == '?' || *str == '*')
++			return add_globbing_file(subject, filename, mode, type);
++		if (*str == '[') {
++			char *str2 = str;
++			while (*str2) {
++				if (*str2 == ']')	
++					return add_globbing_file(subject, filename, mode, type);
++				str2++;
++			}
++		}
++		str++;
++	}
++
++	file_len++;
 +
-+	if (strchr(filename, '?') || strchr(filename, '*'))
-+		return add_globbing_file(subject, filename, mode, type);
++	num_objects++;
++	/* one for the object, one for the filename, one for the name entry struct in the kernel*/
++	num_pointers += 3;
 +
 +	if (lstat(filename, &fstat)) {
 +		dfile = add_deleted_file(filename);
@@ -7771,6 +8919,10 @@ diff -Naurp old/gradm2/gradm_parse.c new
 +	struct stat fstat;
 +	unsigned int file_len;
 +
++	num_subjects++;
++	/* one for the subject, one for the filename */
++	num_pointers += 2;
++
 +	if (!role) {
 +		fprintf(stderr, "Error on line %lu of %s.  Attempt to "
 +			"add a subject without a role declaration.\n"
@@ -8081,8 +9233,8 @@ diff -Naurp old/gradm2/gradm_parse.c new
 +		exit(EXIT_FAILURE);
 +	}
 +
-+	gradmin = open_acl_file(GR_ACL_PATH);
-+	change_current_acl_file(GR_ACL_PATH);
++	gradmin = open_acl_file(GR_POLICY_PATH);
++	change_current_acl_file(GR_POLICY_PATH);
 +	gradmparse();
 +	fclose(gradmin);
 +
@@ -8134,30 +9286,16 @@ diff -Naurp old/gradm2/gradm_parse.c new
 +	return;
 +}
 +
-+struct gr_arg *
++struct gr_arg_wrapper *
 +conv_user_to_kernel(struct gr_pw_entry *entry)
 +{
++	struct gr_arg_wrapper *wrapper;
 +	struct gr_arg *retarg;
 +	struct user_acl_role_db *role_db;
 +	struct role_acl *rtmp = NULL;
-+	struct proc_acl *tmp = NULL;
-+	struct file_acl *tmpf = NULL;
-+	struct file_acl *tmpg = NULL;
-+	struct role_allowed_ip *atmp = NULL;
-+	struct role_transition *trtmp = NULL;
-+	struct ip_acl *tmpi = NULL;
-+	struct ip_acl *i_tmp = NULL;
 +	struct role_acl **r_tmp = NULL;
-+	struct ip_acl **i_table = NULL;
-+	unsigned long facls = 0;
-+	unsigned long gacls = 0;
-+	unsigned long tpacls = 0;
-+	unsigned long racls = 0;
-+	unsigned long iacls = 0;
-+	unsigned long tiacls = 0;
-+	unsigned long aacls = 0;
-+	unsigned long tracls = 0;
 +	unsigned long i = 0;
++	unsigned long racls = 0;
 +	__u16 sproles = 0;
 +	int err;
 +
@@ -8166,35 +9304,26 @@ diff -Naurp old/gradm2/gradm_parse.c new
 +		if (rtmp->roletype & GR_ROLE_SPECIAL &&
 +		    !(rtmp->roletype & GR_ROLE_NOPW))
 +			sproles++;
-+
-+		for_each_allowed_ip(atmp, rtmp->allowed_ips)
-+		    aacls++;
-+
-+		for_each_transition(trtmp, rtmp->transitions)
-+		    tracls++;
-+
-+		for_each_subject(tmp, rtmp) {
-+			tpacls++;
-+			for (tmpi = tmp->ip_object; tmpi; tmpi = tmpi->prev)
-+			    tiacls++;
-+			for_each_object(tmpf, tmp) {
-+			    facls++;
-+			    for_each_globbed(tmpg, tmpf)
-+				gacls++;
-+			}
-+		}
-+	}
++	}
 +
 +	if ((retarg =
 +	     (struct gr_arg *) calloc(1, sizeof (struct gr_arg))) == NULL)
 +		failure("calloc");
 +
++	if ((wrapper =
++	     (struct gr_arg_wrapper *) calloc(1, sizeof (struct gr_arg_wrapper))) == NULL)
++		failure("calloc");
++
++	wrapper->version = GRADM_VERSION;
++	wrapper->size = sizeof(struct gr_arg);
++	wrapper->arg = retarg;
++
 +	err = mlock(retarg, sizeof (struct gr_arg));
 +	if (err && !getuid())
 +		fprintf(stderr, "Warning, unable to lock authentication "
 +			"structure in physical memory.\n");
 +
-+	if (!racls && !tpacls && !facls)	// we are disabling, don't want to calloc 0
++	if (!racls)	// we are disabling, don't want to calloc 0
 +		goto set_pw;
 +
 +	if ((retarg->sprole_pws =
@@ -8211,20 +9340,15 @@ diff -Naurp old/gradm2/gradm_parse.c new
 +
 +	retarg->num_sprole_pws = sproles;
 +
-+	if ((role_db =
-+	     (struct user_acl_role_db *) calloc(1,
-+						sizeof (struct
-+							user_acl_role_db))) ==
-+	    NULL)
++	role_db = (struct user_acl_role_db *) calloc(1, sizeof (struct user_acl_role_db));
++	if (role_db == NULL)
 +		failure("calloc");
 +
-+	role_db->r_entries = racls;
-+	role_db->s_entries = tpacls;
-+	role_db->i_entries = tiacls;
-+	role_db->o_entries = facls;
-+	role_db->g_entries = gacls;
-+	role_db->a_entries = aacls;
-+	role_db->t_entries = tracls;
++	role_db->num_pointers = num_pointers;
++	role_db->num_roles = num_roles;
++	role_db->num_domain_children = num_domain_children;
++	role_db->num_subjects = num_subjects;
++	role_db->num_objects = num_objects;
 +
 +	if ((r_tmp = role_db->r_table =
 +	     (struct role_acl **) calloc(racls,
@@ -8233,37 +9357,6 @@ diff -Naurp old/gradm2/gradm_parse.c new
 +
 +	for_each_role(rtmp, current_role) {
 +		*r_tmp = rtmp;
-+		for_each_subject(tmp, rtmp) {
-+			iacls = 0;
-+			for (tmpi = tmp->ip_object; tmpi; tmpi = tmpi->prev)
-+			    iacls++;
-+			if (iacls) {
-+				i_table =
-+				    (struct ip_acl **) calloc(iacls,
-+							      sizeof (struct
-+								      ip_acl
-+								      *));
-+				if (!i_table)
-+					failure("calloc");
-+				i = 0;
-+				for (tmpi = tmp->ip_object; tmpi; tmpi = tmpi->prev) {
-+					i_tmp =
-+					    (struct ip_acl *) calloc(1,
-+								     sizeof
-+								     (struct
-+								      ip_acl));
-+					memcpy(i_tmp, tmpi,
-+					       sizeof (struct ip_acl));
-+					*(i_table + i) = i_tmp;
-+					i++;
-+				}
-+				tmp->ips = i_table;
-+				tmp->ip_num = iacls;
-+			} else {
-+				tmp->ips = NULL;
-+				tmp->ip_num = 0;
-+			}
-+		}
 +		r_tmp++;
 +	}
 +
@@ -8282,11 +9375,11 @@ diff -Naurp old/gradm2/gradm_parse.c new
 +
 +	memset(entry, 0, sizeof (struct gr_pw_entry));
 +
-+	return retarg;
++	return wrapper;
 +}
-diff -Naurp old/gradm2/gradm_pw.c new/gradm2/gradm_pw.c
---- old/gradm2/gradm_pw.c	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/gradm_pw.c	2003-04-06 05:13:14.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_pw.c linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_pw.c
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_pw.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_pw.c	2004-09-05 17:07:53.000000000 +0200
 @@ -0,0 +1,189 @@
 +#include "gradm.h"
 +
@@ -8477,9 +9570,9 @@ diff -Naurp old/gradm2/gradm_pw.c new/gr
 +
 +	return 1;
 +}
-diff -Naurp old/gradm2/gradm_res.c new/gradm2/gradm_res.c
---- old/gradm2/gradm_res.c	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/gradm_res.c	2004-02-18 15:37:17.000000000 +0100
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_res.c linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_res.c
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_res.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_res.c	2004-09-05 17:07:53.000000000 +0200
 @@ -0,0 +1,158 @@
 +#include "gradm.h"
 +
@@ -8639,9 +9732,9 @@ diff -Naurp old/gradm2/gradm_res.c new/g
 +
 +	return;
 +}
-diff -Naurp old/gradm2/gradm_sha256.c new/gradm2/gradm_sha256.c
---- old/gradm2/gradm_sha256.c	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/gradm_sha256.c	2003-04-06 05:13:14.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_sha256.c linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_sha256.c
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_sha256.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_sha256.c	2004-09-05 17:07:53.000000000 +0200
 @@ -0,0 +1,288 @@
 +#include "gradm.h"
 +
@@ -8931,9 +10024,9 @@ diff -Naurp old/gradm2/gradm_sha256.c ne
 +
 +	return;
 +}
-diff -Naurp old/gradm2/gradm_sym.c new/gradm2/gradm_sym.c
---- old/gradm2/gradm_sym.c	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/gradm_sym.c	2003-05-03 16:33:48.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_sym.c linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_sym.c
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_sym.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/gradm_sym.c	2004-09-05 17:07:53.000000000 +0200
 @@ -0,0 +1,148 @@
 +#include "gradm.h"
 +
@@ -9083,13 +10176,13 @@ diff -Naurp old/gradm2/gradm_sym.c new/g
 +
 +	return;
 +}
-diff -Naurp old/gradm2/grlearn.c new/gradm2/grlearn.c
---- old/gradm2/grlearn.c	1970-01-01 01:00:00.000000000 +0100
-+++ new/gradm2/grlearn.c	2004-04-06 05:10:05.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/grlearn.c linux-2.4.20-wolk4.16-grsec2/gradm2/grlearn.c
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/grlearn.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/grlearn.c	2004-09-05 17:07:53.000000000 +0200
 @@ -0,0 +1,279 @@
 +#include "gradm.h"
 +
-+#define GR_LEARN_PID_PATH "/etc/grsec/.grlearn.pid"
++#define GR_LEARN_PID_PATH "/etc/grsec2/.grlearn.pid"
 +#define LEARN_BUFFER_SIZE (1024 * 1024)
 +#define MAX_ENTRY_SIZE 16384
 +
@@ -9366,501 +10459,256 @@ diff -Naurp old/gradm2/grlearn.c new/gra
 +
 +	return 0;
 +}
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/Documentation/Configure.help linux-2.4.20-wolk4.15-grsec2/Documentation/Configure.help
---- linux-2.4.20-wolk4.15-fullkernel/Documentation/Configure.help	2004-06-29 11:35:50.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/Documentation/Configure.help	2004-06-29 13:00:43.000000000 +0200
-@@ -27371,9 +27371,9 @@ CONFIG_GRKERNSEC_CHROOT_PIVOT
- Deny double-chroots
- CONFIG_GRKERNSEC_CHROOT_DOUBLE
-   If you say Y here, processes inside a chroot will not be able to chroot
--  again.  This is a widely used method of breaking out of a chroot jail
--  and should not be allowed.  If the sysctl option is enabled, a sysctl
--  option with name "chroot_deny_chroot" is created.
-+  again outside of the chroot.  This is a widely used method of breaking
-+  out of a chroot jail and should not be allowed.  If the sysctl option
-+  is enabled, a sysctl option with name "chroot_deny_chroot" is created.
- 
- Deny fchdir outside of chroot
- CONFIG_GRKERNSEC_CHROOT_FCHDIR
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/init_task.c linux-2.4.20-wolk4.15-grsec2/arch/i386/kernel/init_task.c
---- linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/init_task.c	2004-06-29 11:23:10.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/arch/i386/kernel/init_task.c	2004-06-29 13:00:30.000000000 +0200
-@@ -30,5 +30,9 @@ union task_union init_task_union 
-  * section. Since TSS's are completely CPU-local, we want them
-  * on exact cacheline boundaries, to eliminate cacheline ping-pong.
-  */ 
--struct tss_struct init_tss[NR_CPUS] __cacheline_aligned = { [0 ... NR_CPUS-1] = INIT_TSS };
- 
-+#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
-+struct tss_struct init_tss[NR_CPUS] __attribute__((__aligned__(SMP_CACHE_BYTES), __section__(".rodata"))) = { [0 ... NR_CPUS-1] = INIT_TSS };
-+#else
-+struct tss_struct init_tss[NR_CPUS] __cacheline_aligned = { [0 ... NR_CPUS-1] = INIT_TSS };
-+#endif
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/ioport.c linux-2.4.20-wolk4.15-grsec2/arch/i386/kernel/ioport.c
---- linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/ioport.c	2004-06-29 11:31:07.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/arch/i386/kernel/ioport.c	2004-06-29 13:00:30.000000000 +0200
-@@ -15,6 +15,7 @@
- #include <linux/smp_lock.h>
- #include <linux/stddef.h>
- #include <linux/grsecurity.h>
-+#include <asm/desc.h>
- 
- /* RSBAC */
- #ifdef CONFIG_RSBAC
-@@ -63,6 +64,10 @@ asmlinkage int sys_ioperm(unsigned long 
- 	struct thread_struct * t = &current->thread;
- 	struct tss_struct * tss;
- 
-+#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
-+	unsigned long flags, cr3;
-+#endif
-+
-         /* RSBAC */
-         #ifdef CONFIG_RSBAC
-         union rsbac_target_id_t       rsbac_target_id;
-@@ -126,6 +131,11 @@ asmlinkage int sys_ioperm(unsigned long 
- 	 * do it in the per-thread copy and in the TSS ...
- 	 */
- 	set_bitmap(t->io_bitmap, from, num, !turn_on);
-+
-+#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
-+	pax_open_kernel(flags, cr3);
-+#endif
-+
- 	if (tss->bitmap == IO_BITMAP_OFFSET) { /* already active? */
- 		set_bitmap(tss->io_bitmap, from, num, !turn_on);
- 	} else {
-@@ -133,6 +143,10 @@ asmlinkage int sys_ioperm(unsigned long 
- 		tss->bitmap = IO_BITMAP_OFFSET; /* Activate it in the TSS */
- 	}
- 
-+#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
-+	pax_close_kernel(flags, cr3);
-+#endif
-+
- 	preempt_enable();
- 
- 	return 0;
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/process.c linux-2.4.20-wolk4.15-grsec2/arch/i386/kernel/process.c
---- linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/process.c	2004-06-29 11:31:29.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/arch/i386/kernel/process.c	2004-06-29 13:00:30.000000000 +0200
-@@ -1008,6 +1008,10 @@ void __switch_to(struct task_struct *pre
- 				 *next = &next_p->thread;
- 	struct tss_struct *tss = init_tss + smp_processor_id();
- 
-+#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
-+	unsigned long flags, cr3;
-+#endif
-+
- 	unlazy_fpu(prev_p);
- 
- #ifdef CONFIG_GRKERNSEC_PAX_SEGMEXEC
-@@ -1015,11 +1019,6 @@ void __switch_to(struct task_struct *pre
- #endif
- 
- 	/*
--	 * Reload esp0, LDT and the page table pointer:
--	 */
--	tss->esp0 = next->esp0;
--
--	/*
- 	 * Save away %fs and %gs. No need to save %es and %ds, as
- 	 * those are always kernel segments while inside the kernel.
- 	 */
-@@ -1047,6 +1046,15 @@ void __switch_to(struct task_struct *pre
- 		loaddebug(next, 7);
- 	}
- 
-+#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
-+	pax_open_kernel(flags, cr3);
-+#endif
-+
-+	/*
-+	 * Reload esp0, LDT and the page table pointer:
-+	 */
-+	tss->esp0 = next->esp0;
-+
- 	if (unlikely(prev->ioperm || next->ioperm)) {
- 		if (next->ioperm) {
- 			/*
-@@ -1069,6 +1077,11 @@ void __switch_to(struct task_struct *pre
- 			 */
- 			tss->bitmap = INVALID_IO_BITMAP_OFFSET;
- 	}
-+
-+#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
-+	pax_close_kernel(flags, cr3);
-+#endif
-+
- }
- 
- asmlinkage int sys_fork(struct pt_regs regs)
-@@ -1163,6 +1176,10 @@ asmlinkage void pax_randomize_kstack(voi
- 	struct tss_struct *tss = init_tss + smp_processor_id();
- 	unsigned long time;
- 
-+#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
-+	unsigned long flags, cr3;
-+#endif
-+
- #ifdef CONFIG_GRKERNSEC_PAX_SOFTMODE
- 	if (!pax_aslr)
- 		return;
-@@ -1179,7 +1196,16 @@ asmlinkage void pax_randomize_kstack(voi
- 	time <<= 2;
- #endif
- 
-+#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
-+	pax_open_kernel(flags, cr3);
-+#endif
-+
- 	tss->esp0 ^= time;
- 	current->thread.esp0 = tss->esp0;
-+
-+#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
-+	pax_close_kernel(flags, cr3);
-+#endif
-+
- }
- #endif
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/setup.c linux-2.4.20-wolk4.15-grsec2/arch/i386/kernel/setup.c
---- linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/setup.c	2004-06-29 11:31:38.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/arch/i386/kernel/setup.c	2004-06-29 13:00:30.000000000 +0200
-@@ -177,7 +177,7 @@ unsigned char aux_device_present;
- extern void mcheck_init(struct cpuinfo_x86 *c);
- extern void dmi_scan_machine(void);
- extern int root_mountflags;
--extern char _text, _etext, _edata, _end;
-+extern char _text, _etext, _data, _edata, _end;
- 
- static int have_cpuid_p(void) __init;
- 
-@@ -1341,7 +1341,7 @@ void __init setup_arch(char **cmdline_p)
- 
- 	code_resource.start = virt_to_bus(&_text);
- 	code_resource.end = virt_to_bus(&_etext)-1;
--	data_resource.start = virt_to_bus(&_etext);
-+	data_resource.start = virt_to_bus(&_data);
- 	data_resource.end = virt_to_bus(&_edata)-1;
- 
- 	parse_cmdline_early(cmdline_p);
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/vm86.c linux-2.4.20-wolk4.15-grsec2/arch/i386/kernel/vm86.c
---- linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/vm86.c	2004-06-29 11:26:14.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/arch/i386/kernel/vm86.c	2004-06-29 13:00:30.000000000 +0200
-@@ -45,6 +45,7 @@
- #include <asm/pgalloc.h>
- #include <asm/io.h>
- #include <asm/irq.h>
-+#include <asm/desc.h>
- 
- /*
-  * Known problems:
-@@ -98,6 +99,10 @@ struct pt_regs * save_v86_state(struct k
- 	struct pt_regs *ret;
- 	unsigned long tmp;
- 
-+#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
-+	unsigned long flags, cr3;
-+#endif
-+
- 	if (!current->thread.vm86_info) {
- 		printk("no vm86_info: BAD\n");
- 		do_exit(SIGSEGV);
-@@ -112,7 +117,17 @@ struct pt_regs * save_v86_state(struct k
- 		do_exit(SIGSEGV);
- 	}
- 	tss = init_tss + smp_processor_id();
-+
-+#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
-+	pax_open_kernel(flags, cr3);
-+#endif
-+
- 	tss->esp0 = current->thread.esp0 = current->thread.saved_esp0;
-+
-+#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
-+	pax_close_kernel(flags, cr3);
-+#endif
-+
- 	current->thread.saved_esp0 = 0;
- 	ret = KVM86->regs32;
- 	return ret;
-@@ -239,6 +254,11 @@ out:
- static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk)
- {
- 	struct tss_struct *tss;
-+
-+#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
-+	unsigned long flags, cr3;
-+#endif
-+
- /*
-  * make sure the vm86() system call doesn't try to do anything silly
-  */
-@@ -280,8 +300,17 @@ static void do_sys_vm86(struct kernel_vm
- 	info->regs32->eax = 0;
- 	tsk->thread.saved_esp0 = tsk->thread.esp0;
- 	tss = init_tss + smp_processor_id();
-+
-+#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
-+	pax_open_kernel(flags, cr3);
-+#endif
-+
- 	tss->esp0 = tsk->thread.esp0 = (unsigned long) &info->VM86_TSS_ESP0;
- 
-+#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
-+	pax_close_kernel(flags, cr3);
-+#endif
-+
- 	tsk->thread.screen_bitmap = info->screen_bitmap;
- 	if (info->flags & VM86_SCREEN_BITMAP)
- 		mark_screen_rdonly(tsk);
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/char/mem.c linux-2.4.20-wolk4.15-grsec2/drivers/char/mem.c
---- linux-2.4.20-wolk4.15-fullkernel/drivers/char/mem.c	2004-06-29 11:31:48.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/drivers/char/mem.c	2004-06-29 13:00:19.000000000 +0200
-@@ -42,7 +42,11 @@ extern void mda_console_init(void);
- #if defined(CONFIG_S390_TAPE) && defined(CONFIG_S390_TAPE_CHAR)
- extern void tapechar_init(void);
- #endif
--     
-+
-+#ifdef CONFIG_GRKERNSEC
-+extern struct file_operations grsec_fops;
-+#endif
-+
- /* RSBAC */
- #ifdef CONFIG_RSBAC
- #include <rsbac/adf.h>
-@@ -769,6 +773,11 @@ static int memory_open(struct inode * in
- 		case 10:
- 		        filp->f_op = &anon_file_operations;
- 			break;
-+#ifdef CONFIG_GRKERNSEC
-+		case 11:
-+			filp->f_op = &grsec_fops;
-+			break;
-+#endif
- 		default:
- 			return -ENXIO;
- 	}
-@@ -796,7 +805,10 @@ void __init memory_devfs_register (void)
- 	{7, "full",    S_IRUGO | S_IWUGO,           &full_fops},
- 	{8, "random",  S_IRUGO | S_IWUSR,           &random_fops},
- 	{9, "urandom", S_IRUGO | S_IWUSR,           &urandom_fops},
--	{10, "anon",   S_IRUGO | S_IWUSR,           &anon_file_operations}
-+	{10, "anon",   S_IRUGO | S_IWUSR,           &anon_file_operations},
-+#ifdef CONFIG_GRKERNSEC
-+	{11, "grsec",  S_IRUSR | S_IWUGO,           &grsec_fops}
-+#endif
-     };
-     int i;
- 
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/char/vt.c linux-2.4.20-wolk4.15-grsec2/drivers/char/vt.c
---- linux-2.4.20-wolk4.15-fullkernel/drivers/char/vt.c	2004-06-29 11:31:00.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/drivers/char/vt.c	2004-06-29 13:00:19.000000000 +0200
-@@ -179,6 +179,11 @@ do_kdsk_ioctl(int cmd, struct kbentry *u
- 	case KDSKBENT:
- 		if (!perm)
- 			return -EPERM;
-+#ifdef CONFIG_GRKERNSEC
-+		if (!capable(CAP_SYS_TTY_CONFIG))
-+			return -EPERM;
-+#endif
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/gradm2/policy linux-2.4.20-wolk4.16-grsec2/gradm2/policy
+--- linux-2.4.20-wolk4.16-fullkernel/gradm2/policy	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/gradm2/policy	2004-09-05 17:07:53.000000000 +0200
+@@ -0,0 +1,234 @@
++#sample default policy for grsecurity
++#
++# Role flags:
++# A -> This role is an administrative role, thus it has special privilege normal
++#      roles do not have.  In particular, this role bypasses the 
++#      additional ptrace restrictions
++# N -> Don't require authentication for this role.  To access
++#      the role, use gradm2 -n <rolename>
++# s -> This role is a special role, meaning it does not belong to a
++#      user or group, and does not require an enforced secure policy
++#      base to be included in the ruleset
++# u -> This role is a user role
++# g -> This role is a group role
++# G -> This role can use gradm2 to authenticate to the kernel
++#      A polciy for gradm2 will automatically be added to the role
++# T -> Enable TPE for this role
++# l -> Enable learning for this role
++#
++# a role can only be one of user, group, or special
++#
++# role_allow_ip IP/optional netmask
++# eg: role_allow_ip 192.168.1.0/24
++# You can have as many of these per role as you want
++# They restrict the use of a role to a list of IPs.  If a user
++# is on the system that would normally get the role does not
++# belong to those lists of IPs, the system falls back through
++# its method of determining a role for the user
++#
++# Role hierarchy
++# user -> group -> default
++# First a user role attempts to match, if one is not found,
++# a group role attempts to match, if one is not found,
++# the default role is used.
++#
++# role_transitions <special role 1> <special role 2> ... <special role n>
++# eg: role_transitions www_admin dns_admin
++#
++# role transitions specify which special roles a given role is allowed
++# to authenticate to.  This applies to special roles that do not
++# require password authentication as well.  If a user tries to
++# authenticate to a role that is not within his transition table, he
++# will receive a permission denied error
++#
++# Nested subjects
++# subject /bin/su:/bin/bash:/bin/cat
++#	  / rwx
++#	  +CAP_ALL
++# grant privilege to specific processes if they are executed
++# within a trusted path.  In this case, privilege is
++# granted if /bin/cat is executed from /bin/bash, which is
++# executed from /bin/su.
++#
++# Configuration inheritance on nested subjects
++# nested subjects inherit rules from their parents.  In the
++# example above, the nested subject would inherit rules
++# from the nested subject for /bin/su:/bin/bash,
++# and the subject /bin/su
++# View the 1.9.x documentation for more information on
++# configuration inheritance
++#
++# new object modes:
++# m -> allow creation of setuid/setgid files/directories
++#      and modification of files/directories to be setuid/setgid
++# M -> audit the setuid/setgid creation/modification
++# c -> allow creation of the file/directory
++# C -> audit the creation
++# d -> allow deletion of the file/directory
++# D -> audit the deletion
++# p -> reject all ptraces to this object
++# new subject modes:
++# r -> relax ptrace restrictions (allows process to ptrace processes
++#      other than its own descendants)
++#
++# user/group transitions:
++# You may now specify what users and groups a given subject can
++# transition to.  This can be done on an inclusive or exclusive basis.
++# Examples:
++# subject /bin/su
++# user_transition_allow root spender
++# group_transition_allow root spender
++# subject /bin/su
++# user_transition_deny evilhacker
++# subject /bin/su
++# group_transition_deny evilhacker1 evilhacker2
++#
++# Domains:
++# With domains you can combine users that don't share a common
++# GID as well as groups so that they share a single policy
++# Domains work just like roles, with the only exception being that
++# the line starting with "role" is replaced with one of the following:
++# domain somedomainname u user1 user2 user3 user4 ... usern
++# domain somedomainname g group1 group2 group3 group4 ... groupn
++#
++# New learning system:
++# To learn on a given subject: add l (the letter l, not the number 1)
++# to the subject mode
++# To learn on a given role, add l to the role mode
++# For both of these, to enable learning, enable the system like:
++# gradm2 -L /etc/grsec2/learning.logs -E
++# and then generate the rules after disabling the system after the 
++# learning phase with:
++# gradm2 -L /etc/grsec2/learning.logs -O /etc/grsec2/policy
++# To use full system learning, enable the system like:
++# gradm2 -F -L /etc/grsec2/learning.logs
++# and then generate the rules after disabling the system after the 
++# learning phase with:
++# gradm2 -F -L /etc/grsec2/learning.logs -O /etc/grsec2/policy
 +
- 		if (!i && v == K_NOSUCHMAP) {
- 			/* disallocate map */
- 			key_map = key_maps[s];
-@@ -301,6 +306,11 @@ do_kdgkb_ioctl(int cmd, struct kbsentry 
- 		if (!perm)
- 			return -EPERM;
- 
-+#ifdef CONFIG_GRKERNSEC
-+		if (!capable(CAP_SYS_TTY_CONFIG))
-+			return -EPERM;
-+#endif
++role admin sA
++subject / r
++	/ rwcdmxi
 +
- 		q = func_table[i];
- 		first_free = funcbufptr + (funcbufsize - funcbufleft);
- 		for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++) 
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/binfmt_elf.c linux-2.4.20-wolk4.15-grsec2/fs/binfmt_elf.c
---- linux-2.4.20-wolk4.15-fullkernel/fs/binfmt_elf.c	2004-06-29 11:31:52.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/fs/binfmt_elf.c	2004-06-29 13:00:30.000000000 +0200
-@@ -1079,7 +1079,7 @@ static int load_elf_binary(struct linux_
- #endif
- 
- 	if (current->flags & PF_PAX_RANDMMAP)
--		elf_brk += pax_delta_mask(get_random_long(), 4, PAGE_SHIFT);
-+		elf_brk += PAGE_SIZE + pax_delta_mask(get_random_long(), 4, PAGE_SHIFT);
- #undef pax_delta_mask
- #endif
- 
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/exec.c linux-2.4.20-wolk4.15-grsec2/fs/exec.c
---- linux-2.4.20-wolk4.15-fullkernel/fs/exec.c	2004-06-29 11:31:52.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/fs/exec.c	2004-06-29 13:00:30.000000000 +0200
-@@ -914,9 +914,6 @@ int prepare_binprm(struct linux_binprm *
- 			cap_set_full(bprm->cap_effective);
- 	}
- 
--	if (gr_handle_ptrace_exec(bprm->file->f_dentry, bprm->file->f_vfsmnt))
--		return -EACCES;
--
- 	memset(bprm->buf,0,BINPRM_BUF_SIZE);
- 	return kernel_read(bprm->file,0,bprm->buf,BINPRM_BUF_SIZE);
- }
-@@ -979,8 +976,11 @@ void compute_creds(struct linux_binprm *
- 	
-         /* AUD: Audit candidate if current->cap_effective is set */
- 
--        current->suid = current->euid = current->fsuid = bprm->e_uid;
--        current->sgid = current->egid = current->fsgid = bprm->e_gid;
-+	if (!gr_check_user_change(-1, bprm->e_uid, bprm->e_uid))
-+		current->suid = current->euid = current->fsuid = bprm->e_uid;
++role default G
++role_transitions admin
++subject /
++	/		r
++	/opt		rx
++	/home		rwxcd
++	/mnt		rw
++	/dev
++	/dev/grsec	h
++	/dev/urandom	r
++	/dev/random	r
++	/dev/zero	rw
++	/dev/input	rw
++	/dev/psaux	rw
++	/dev/null	rw
++	/dev/tty0	rw
++	/dev/tty1	rw
++	/dev/tty2	rw
++	/dev/tty3	rw
++	/dev/tty4	rw
++	/dev/tty5	rw
++	/dev/tty6	rw
++	/dev/tty7	rw
++	/dev/tty8	rw
++	/dev/console	rw
++	/dev/tty	rw
++	/dev/pts	rw
++	/dev/ptmx	rw
++	/dev/dsp	rw
++	/dev/mixer	rw
++	/dev/initctl	rw
++	/dev/fd0	r
++	/dev/cdrom	r
++	/dev/mem	h
++	/dev/kmem	h
++	/dev/port	h
++	/bin		rx
++	/sbin		rx
++	/lib		rx
++	/usr		rx
++	/etc		rx
++	/proc		rwx
++	/proc/kcore	h
++	/proc/sys	r
++	/root		r
++	/tmp		rwcd
++	/var		rwxcd
++	/var/tmp	rwcd
++	/var/log	r
++	/boot		r
++	/etc/grsec2	h
++	/etc/ssh	h
 +
-+	if (!gr_check_group_change(-1, bprm->e_gid, bprm->e_gid))
-+	        current->sgid = current->egid = current->fsgid = bprm->e_gid;
- 
- 	gr_handle_chroot_caps(current);
- 
-@@ -1248,7 +1248,9 @@ int do_execve(char * filename, char ** a
- 	current->exec_file = file;
- #endif
- 
--	gr_set_proc_label(file->f_dentry, file->f_vfsmnt);
-+	retval = gr_set_proc_label(file->f_dentry, file->f_vfsmnt);
-+	if (retval < 0)
-+		goto out_fail;
- 
- 	retval = search_binary_handler(&bprm,regs);
- 	if (retval >= 0) {
-@@ -1284,6 +1286,7 @@ int do_execve(char * filename, char ** a
- 	  }
- 	}
- 
-+out_fail:
- #ifdef CONFIG_GRKERNSEC
- 	current->acl = old_acl;
- 	memcpy(current->rlim, old_rlim, sizeof(old_rlim));
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/fcntl.c linux-2.4.20-wolk4.15-grsec2/fs/fcntl.c
---- linux-2.4.20-wolk4.15-fullkernel/fs/fcntl.c	2004-06-29 11:30:55.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/fs/fcntl.c	2004-06-29 13:00:19.000000000 +0200
-@@ -65,10 +65,11 @@ static int locate_fd(struct files_struct
- 	int error;
- 	unsigned int start;
- 
-+	gr_learn_resource(current, RLIMIT_NOFILE, orig_start, 0);
++# if sshd needs to be restarted, it can be done through the admin role
++	/usr/sbin/sshd
++	
++	-CAP_KILL
++	-CAP_SYS_TTY_CONFIG
++	-CAP_LINUX_IMMUTABLE
++	-CAP_NET_RAW
++	-CAP_MKNOD
++	-CAP_SYS_ADMIN
++	-CAP_SYS_RAWIO
++	-CAP_SYS_MODULE
++	-CAP_SYS_PTRACE
++	-CAP_NET_ADMIN
++	-CAP_NET_BIND_SERVICE
++	-CAP_SYS_CHROOT
 +
- 	write_lock(&files->file_lock);
- 	
- 	error = -EINVAL;
--	gr_learn_resource(current, RLIMIT_NOFILE, orig_start, 0);
- 	if (orig_start >= current->rlim[RLIMIT_NOFILE].rlim_cur)
- 		goto out;
- 
-@@ -144,6 +145,8 @@ asmlinkage long sys_dup2(unsigned int ol
- 	struct file * file, *tofree;
- 	struct files_struct * files = current->files;
- 
-+	gr_learn_resource(current, RLIMIT_NOFILE, newfd, 0);
++#	RES_AS 100M 100M
 +
- 	write_lock(&files->file_lock);
- 	if (!(file = fcheck(oldfd)))
- 		goto out_unlock;
-@@ -151,7 +154,6 @@ asmlinkage long sys_dup2(unsigned int ol
- 	if (newfd == oldfd)
- 		goto out_unlock;
- 	err = -EBADF;
--	gr_learn_resource(current, RLIMIT_NOFILE, newfd, 0);
- 	if (newfd >= current->rlim[RLIMIT_NOFILE].rlim_cur)
- 		goto out_unlock;
- 	get_file(file);			/* We are now finished with oldfd */
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/namei.c linux-2.4.20-wolk4.15-grsec2/fs/namei.c
---- linux-2.4.20-wolk4.15-fullkernel/fs/namei.c	2004-06-29 11:31:21.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/fs/namei.c	2004-06-29 13:00:19.000000000 +0200
-@@ -1331,9 +1331,7 @@ int open_namei(const char * pathname, in
- 		if (error)
- 			return error;
- 
--		if (gr_acl_is_enabled() && nd->dentry->d_inode && 
--		    S_ISBLK(nd->dentry->d_inode->i_mode) &&
--	    	    !capable(CAP_SYS_RAWIO)) {
-+		if (gr_handle_rawio(nd->dentry->d_inode)) {
- 			error = -EPERM;
- 			goto exit;
- 		}
-@@ -1385,7 +1383,7 @@ do_last:
- 			up(&dir->d_inode->i_sem);
- 			goto exit_dput;
- 		}
--		if (!gr_acl_handle_creat(dentry, nd->dentry, nd->mnt, flag)) {
-+		if (!gr_acl_handle_creat(dentry, nd->dentry, nd->mnt, flag, mode)) {
- 			error = -EACCES;
- 			up(&dir->d_inode->i_sem);
- 			goto exit_dput;
-@@ -1416,8 +1414,7 @@ do_last:
- 	 * It already exists.
- 	 */
- 
--	if (gr_acl_is_enabled() && S_ISBLK(dentry->d_inode->i_mode) &&
--	    !capable(CAP_SYS_RAWIO)) {
-+	if (gr_handle_rawio(dentry->d_inode)) {
- 		error = -EPERM;
- 		up(&dir->d_inode->i_sem);
- 		goto exit_dput;
-@@ -1871,7 +1868,7 @@ asmlinkage long sys_mknod(const char * f
- 			goto out_dput;
- 		}
- 
--		if (!gr_acl_handle_mknod(dentry, nd.dentry, nd.mnt)) {
-+		if (!gr_acl_handle_mknod(dentry, nd.dentry, nd.mnt, mode)) {
- 			error = -EACCES;
- 			dput(dentry);
- 			goto out_dput;
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/open.c linux-2.4.20-wolk4.15-grsec2/fs/open.c
---- linux-2.4.20-wolk4.15-fullkernel/fs/open.c	2004-06-29 11:31:27.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/fs/open.c	2004-06-29 13:00:19.000000000 +0200
-@@ -726,7 +726,7 @@ asmlinkage long sys_fchmod(unsigned int 
- 	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
- 		goto out_putf;
- 
--	if (!gr_acl_handle_fchmod(dentry, file->f_vfsmnt)) {
-+	if (!gr_acl_handle_fchmod(dentry, file->f_vfsmnt, mode)) {
- 		err = -EACCES;
- 		goto out_putf;
- 	}
-@@ -776,7 +776,7 @@ asmlinkage long sys_chmod(const char * f
- 	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
- 		goto dput_and_out;
- 
--	if (!gr_acl_handle_chmod(nd.dentry, nd.mnt)) {
-+	if (!gr_acl_handle_chmod(nd.dentry, nd.mnt, mode)) {
- 		error = -EACCES;
- 		goto dput_and_out;
- 	}
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/proc/base.c linux-2.4.20-wolk4.15-grsec2/fs/proc/base.c
---- linux-2.4.20-wolk4.15-fullkernel/fs/proc/base.c	2004-06-29 11:32:31.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/fs/proc/base.c	2004-06-29 13:00:19.000000000 +0200
-@@ -248,7 +248,8 @@ static int proc_root_link(struct inode *
- #define MAY_PTRACE(task) \
- 	(task == current || \
- 	(task->p_pptr == current && \
--	(task->ptrace & PT_PTRACED) && task->state == TASK_STOPPED))
-+	(task->ptrace & PT_PTRACED) && task->state == TASK_STOPPED && \
-+	!gr_handle_proc_ptrace(task)))
- 
- static int may_ptrace_attach(struct task_struct *task)
- {
-@@ -267,6 +268,8 @@ static int may_ptrace_attach(struct task
- 	rmb();
- 	if (!is_dumpable(task) && !capable(CAP_SYS_PTRACE))
- 		goto out;
-+	if (gr_handle_proc_ptrace(task))
-+		goto out;
- 
- 	retval = 1;
- 
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/Config.in linux-2.4.20-wolk4.15-grsec2/grsecurity/Config.in
---- linux-2.4.20-wolk4.15-fullkernel/grsecurity/Config.in	2004-06-29 11:31:06.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/grsecurity/Config.in	2004-06-29 13:00:19.000000000 +0200
-@@ -110,8 +110,8 @@ define_int CONFIG_GRKERNSEC_ACL_TIMEOUT 
++#	connect 192.168.1.0/24:22 stream tcp
++#	bind	0.0.0.0 stream dgram tcp udp
++
++# the d flag protects /proc fd and mem entries for sshd
++# all daemons should have 'p' in their subject mode to prevent
++# an attacker from killing the service (and restarting it with trojaned
++# config file or taking the port it reserved to run a trojaned service)
++
++subject /usr/sbin/sshd dpo
++	/		h
++	/bin/bash	x
++	/dev		h
++	/dev/log	rw
++	/dev/null	r
++	/dev/ptmx	rw
++	/dev/pts	rw
++	/dev/tty	rw
++	/dev/tty?	rw
++	/etc		r
++	/etc/grsec2	h
++	/home
++	/lib		rx
++	/root
++	/proc
++	/proc/kcore	h
++	/proc/sys	h
++	/usr/lib	rx
++	/var/log
++	/var/mail
++	/var/log/lastlog	rw
++	/var/log/wtmp		w
++	/var/run/sshd
++	/var/run/utmp		rw
++
++	-CAP_ALL
++	+CAP_CHOWN
++	+CAP_SETGID
++	+CAP_SETUID
++	+CAP_SYS_CHROOT
++	+CAP_SYS_RESOURCE
++	+CAP_SYS_TTY_CONFIG
++
++subject /usr/X11R6/bin/XFree86
++	/dev/mem	rw
++
++	+CAP_SYS_ADMIN
++	+CAP_SYS_TTY_CONFIG
++	+CAP_SYS_RAWIO
++
++subject /usr/bin/ssh
++	/etc/ssh/ssh_config r
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/grsecurity/Config.in linux-2.4.20-wolk4.16-grsec2/grsecurity/Config.in
+--- linux-2.4.20-wolk4.16-fullkernel/grsecurity/Config.in	2004-09-05 16:05:39.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/grsecurity/Config.in	2004-09-05 17:07:53.000000000 +0200
+@@ -28,6 +28,7 @@ define_bool CONFIG_GRKERNSEC_PROC n
+ define_bool CONFIG_GRKERNSEC_PROC_IPADDR n
+ define_bool CONFIG_GRKERNSEC_PROC_MEMMAP n
+ define_bool CONFIG_GRKERNSEC_HIDESYM n
++define_bool CONFIG_GRKERNSEC_BRUTE n
+ define_bool CONFIG_GRKERNSEC_CHROOT_CAPS n
+ define_bool CONFIG_GRKERNSEC_CHROOT_SYSCTL n
+ define_bool CONFIG_GRKERNSEC_PROC_USERGROUP n
+@@ -110,8 +111,8 @@ define_int CONFIG_GRKERNSEC_ACL_TIMEOUT 
  
  define_int  CONFIG_GRKERNSEC_FLOODTIME 10
  define_int  CONFIG_GRKERNSEC_FLOODBURST 4
@@ -9870,7 +10718,36 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  define_bool CONFIG_GRKERNSEC_LINK y
  define_bool CONFIG_GRKERNSEC_FIFO y
  define_bool CONFIG_GRKERNSEC_RANDPID y
-@@ -307,7 +307,7 @@ bool 'Remove addresses from /proc/pid/[m
+@@ -143,6 +144,7 @@ define_bool CONFIG_GRKERNSEC_PAX_RANDKST
+ define_bool CONFIG_GRKERNSEC_PAX_KERNEXEC n
+ define_bool CONFIG_GRKERNSEC_PAX_ASLR y
+ define_bool CONFIG_GRKERNSEC_PAX_RANDMMAP y
++define_bool CONFIG_GRKERNSEC_BRUTE n
+ fi
+ if [ "$CONFIG_GRKERNSEC_HI" = "y" ]; then
+ define_int CONFIG_GRKERNSEC_FLOODTIME 10
+@@ -175,6 +177,7 @@ define_bool CONFIG_GRKERNSEC_PROC y
+ define_bool CONFIG_GRKERNSEC_PROC_IPADDR n
+ define_bool CONFIG_GRKERNSEC_PROC_MEMMAP y
+ define_bool CONFIG_GRKERNSEC_HIDESYM y
++define_bool CONFIG_GRKERNSEC_BRUTE y
+ define_bool CONFIG_GRKERNSEC_PROC_USERGROUP y
+ define_int  CONFIG_GRKERNSEC_PROC_GID 10
+ define_bool CONFIG_GRKERNSEC_KMEM y
+@@ -228,7 +231,7 @@ bool 'Use ELF program header marking' CO
+ choice 'MAC system integration' \
+ 	"none		CONFIG_GRKERNSEC_PAX_NO_ACL_FLAGS \
+ 	 direct		CONFIG_GRKERNSEC_PAX_HAVE_ACL_FLAGS \
+-	 hook		CONFIG_GRKERNSEC_PAX_HOOK_ACL_FLAGS" none
++	 hook		CONFIG_GRKERNSEC_PAX_HOOK_ACL_FLAGS" direct
+ endmenu
+ mainmenu_option next_comment
+ comment 'Address Space Protection'
+@@ -304,10 +307,11 @@ if [ "$CONFIG_X86" = "y" ]; then
+   fi
+ fi
+ bool 'Remove addresses from /proc/pid/[maps|stat]' CONFIG_GRKERNSEC_PROC_MEMMAP
++bool 'Deter exploit bruteforcing' CONFIG_GRKERNSEC_BRUTE
  bool 'Hide kernel symbols' CONFIG_GRKERNSEC_HIDESYM
  endmenu
  mainmenu_option next_comment
@@ -9879,9 +10756,9 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  bool 'Hide kernel processes' CONFIG_GRKERNSEC_ACL_HIDEKERN
  int 'Maximum tries before password lockout' CONFIG_GRKERNSEC_ACL_MAXTRIES 3
  int 'Time to wait after max password tries, in seconds' CONFIG_GRKERNSEC_ACL_TIMEOUT 30
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/Makefile linux-2.4.20-wolk4.15-grsec2/grsecurity/Makefile
---- linux-2.4.20-wolk4.15-fullkernel/grsecurity/Makefile	2004-06-29 11:31:05.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/grsecurity/Makefile	2004-06-29 13:00:19.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/grsecurity/Makefile linux-2.4.20-wolk4.16-grsec2/grsecurity/Makefile
+--- linux-2.4.20-wolk4.16-fullkernel/grsecurity/Makefile	2004-09-05 16:05:37.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/grsecurity/Makefile	2004-09-05 17:07:52.000000000 +0200
 @@ -15,7 +15,7 @@ obj-y = grsec_chdir.o grsec_chroot.o grs
  ifeq ($(CONFIG_GRKERNSEC),y)
  obj-y += grsec_init.o grsum.o gracl.o gracl_ip.o gracl_segv.o obsd_rand.o \
@@ -9891,10 +10768,10 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
  else
  obj-y += grsec_disabled.o
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/gracl.c linux-2.4.20-wolk4.15-grsec2/grsecurity/gracl.c
---- linux-2.4.20-wolk4.15-fullkernel/grsecurity/gracl.c	2004-06-29 11:31:05.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/grsecurity/gracl.c	2004-06-29 13:00:37.000000000 +0200
-@@ -26,34 +26,44 @@
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/grsecurity/gracl.c linux-2.4.20-wolk4.16-grsec2/grsecurity/gracl.c
+--- linux-2.4.20-wolk4.16-fullkernel/grsecurity/gracl.c	2004-09-05 16:05:37.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/grsecurity/gracl.c	2004-09-05 17:07:53.000000000 +0200
+@@ -26,34 +26,48 @@
  #include <asm/errno.h>
  #include <asm/mman.h>
  
@@ -9910,9 +10787,13 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 +/* for keeping track of userspace pointers used for subjects, so we
 +   can share references in the kernel as well
 +*/
-+static struct acl_subj_map_db subj_map_set;
  
 -static DECLARE_MUTEX(gr_proc_sem);
++static struct dentry *real_root;
++static struct vfsmount *real_root_mnt;
++
++static struct acl_subj_map_db subj_map_set;
++
 +
 +static struct acl_role_label *default_role;
 +
@@ -9953,7 +10834,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  
  /* The following are used to keep a place held in the hash table when we move
     entries around.  They can be replaced during insert. */
-@@ -62,6 +72,15 @@ static struct acl_subject_label *deleted
+@@ -62,6 +76,15 @@ static struct acl_subject_label *deleted
  static struct acl_object_label *deleted_object;
  static struct name_entry *deleted_inodev;
  
@@ -9969,10 +10850,11 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  extern int gr_init_uidset(void);
  extern void gr_free_uidset(void);
  extern void gr_remove_uid(uid_t uid);
-@@ -73,6 +92,85 @@ gr_acl_is_enabled(void)
+@@ -73,26 +96,100 @@ gr_acl_is_enabled(void)
  	return (gr_status & GR_READY);
  }
  
+-static __inline__ char *
 +char gr_roletype_to_char(void)
 +{
 +	switch (current->role->roletype &
@@ -10005,13 +10887,12 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 +int
 +gr_handle_rawio(const struct inode *inode)
 +{
-+	if (inode && S_ISBLK(inode->i_mode) && !capable(CAP_SYS_RAWIO) &&
-+	    ((gr_status & GR_READY)
 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
-+	     || (grsec_enable_chroot_caps && proc_is_chrooted(current))
-+#endif
-+	    ))
++	if (inode && S_ISBLK(inode->i_mode) &&
++	    grsec_enable_chroot_caps && proc_is_chrooted(current) &&
++	    !capable(CAP_SYS_RAWIO))
 +		return 1;
++#endif
 +	return 0;
 +}
 +
@@ -10052,10 +10933,34 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 +	return 1;
 +}
 +		
- static __inline__ char *
++static char *
  d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
  	    char *buf, int buflen)
-@@ -101,10 +199,64 @@ d_real_path(const struct dentry *dentry,
+ {
+ 	char *res;
+-	struct dentry *our_dentry;
+-	struct vfsmount *our_mount;
+-	struct vfsmount *rootmnt;
+ 	struct dentry *root;
++	struct vfsmount *rootmnt;
+ 
+-	our_dentry = (struct dentry *) dentry;
+-	our_mount = (struct vfsmount *) vfsmnt;
+-
++	/* we can't use real_root, real_root_mnt, because they belong only to the RBAC system */
+ 	read_lock(&child_reaper->fs->lock);
+-	rootmnt = mntget(child_reaper->fs->rootmnt);
+ 	root = dget(child_reaper->fs->root);
++	rootmnt = mntget(child_reaper->fs->rootmnt);
+ 	read_unlock(&child_reaper->fs->lock);
+ 
+ 	spin_lock(&dcache_lock);
+-	res = __d_path(our_dentry, our_mount, root, rootmnt, buf, buflen);
++	res = __d_path((struct dentry *)dentry, (struct vfsmount *)vfsmnt, root, rootmnt, buf, buflen);
+ 	spin_unlock(&dcache_lock);
+ 	if (unlikely(IS_ERR(res)))
+ 		res = strcpy(buf, "<path too long>");
+@@ -101,10 +198,60 @@ d_real_path(const struct dentry *dentry,
  	return res;
  }
  
@@ -10064,20 +10969,16 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 +	    char *buf, int buflen)
 +{
 +	char *res;
-+	struct dentry *our_dentry;
-+	struct vfsmount *our_mount;
-+	struct vfsmount *rootmnt;
 +	struct dentry *root;
++	struct vfsmount *rootmnt;
 +
-+	our_dentry = (struct dentry *) dentry;
-+	our_mount = (struct vfsmount *) vfsmnt;
-+
++	/* we can't use real_root, real_root_mnt, because they belong only to the RBAC system */
 +	read_lock(&child_reaper->fs->lock);
-+	rootmnt = mntget(child_reaper->fs->rootmnt);
 +	root = dget(child_reaper->fs->root);
++	rootmnt = mntget(child_reaper->fs->rootmnt);
 +	read_unlock(&child_reaper->fs->lock);
 +
-+	res = __d_path(our_dentry, our_mount, root, rootmnt, buf, buflen);
++	res = __d_path((struct dentry *)dentry, (struct vfsmount *)vfsmnt, root, rootmnt, buf, buflen);
 +	if (unlikely(IS_ERR(res)))
 +		res = strcpy(buf, "<path too long>");
 +	dput(root);
@@ -10121,7 +11022,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  			   PAGE_SIZE);
  }
  
-@@ -119,29 +271,133 @@ to_gr_audit(const __u32 reqmode)
+@@ -119,29 +266,146 @@ to_gr_audit(const __u32 reqmode)
  	retmode |= (reqmode & GR_EXEC) ? GR_AUDIT_EXEC : 0;
  	retmode |= (reqmode & GR_INHERIT) ? GR_AUDIT_INHERIT : 0;
  	retmode |= (reqmode & GR_FIND) ? GR_AUDIT_FIND : 0;
@@ -10156,8 +11057,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 +
 +static void
 +insert_subj_map_entry(struct subject_map *subjmap)
- {
--	unsigned long index = fhash(ino, dev, acl_subj_set.s_size);
++{
 +	unsigned long index = shash(subjmap->user, subj_map_set.s_size);
 +	struct subject_map **curr;
 +	__u8 i = 0;
@@ -10182,30 +11082,43 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 +	unsigned long index = rhash(uid, GR_ROLE_USER, acl_role_set.r_size);
 +	struct acl_role_label *match;
 +	struct role_allowed_ip *ipp;
++	int x;
 +	__u8 i = 0;
 +
 +	match = acl_role_set.r_hash[index];
 +
-+	while (match
-+	       && (match->uidgid != uid || !(match->roletype & GR_ROLE_USER))) {
++	while (match) {
++		if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
++			for (x = 0; x < match->domain_child_num; x++) {
++				if (match->domain_children[x] == uid)
++					goto found;
++			}
++		} else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
++			break;
 +		index = (index + (1 << i)) % acl_role_set.r_size;
 +		match = acl_role_set.r_hash[index];
 +		i = (i + 1) % 32;
 +	}
-+
++found:
 +	if (match == NULL) {
 +	      try_group:
 +		index = rhash(gid, GR_ROLE_GROUP, acl_role_set.r_size);
 +		match = acl_role_set.r_hash[index];
 +		i = 0;
 +
-+		while (match && (match->uidgid != gid
-+			   || !(match->roletype & GR_ROLE_GROUP))) {
++		while (match) {
++			if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
++				for (x = 0; x < match->domain_child_num; x++) {
++					if (match->domain_children[x] == gid)
++						goto found2;
++				}
++			} else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
++				break;
 +			index = (index + (1 << i)) % acl_role_set.r_size;
 +			match = acl_role_set.r_hash[index];
 +			i = (i + 1) % 32;
 +		}
-+
++found2:
 +		if (match == NULL)
 +			match = default_role;
 +		if (match->allowed_ips == NULL)
@@ -10213,8 +11126,8 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 +		else {
 +			for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
 +				if (likely
-+				    ((task->curr_ip & ipp->netmask) ==
-+				     (ipp->addr & ipp->netmask)))
++				    ((ntohl(task->curr_ip) & ipp->netmask) ==
++				     (ntohl(ipp->addr) & ipp->netmask)))
 +					return match;
 +			}
 +			match = default_role;
@@ -10224,8 +11137,8 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 +	} else {
 +		for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
 +			if (likely
-+			    ((task->curr_ip & ipp->netmask) ==
-+			     (ipp->addr & ipp->netmask)))
++			    ((ntohl(task->curr_ip) & ipp->netmask) ==
++			     (ntohl(ipp->addr) & ipp->netmask)))
 +				return match;
 +		}
 +		goto try_group;
@@ -10237,7 +11150,8 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 +__inline__ struct acl_subject_label *
 +lookup_acl_subj_label(const ino_t ino, const kdev_t dev,
 +		      const struct acl_role_label *role)
-+{
+ {
+-	unsigned long index = fhash(ino, dev, acl_subj_set.s_size);
 +	unsigned long subj_size = role->subj_hash_size;
 +	struct acl_subject_label **s_hash = role->subj_hash;
 +	unsigned long index = fhash(ino, dev, subj_size);
@@ -10263,7 +11177,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  		return match;
  	else
  		return NULL;
-@@ -166,9 +422,7 @@ lookup_acl_obj_label(const ino_t ino, co
+@@ -166,9 +430,7 @@ lookup_acl_obj_label(const ino_t ino, co
  		i = (i + 1) % 32;
  	}
  
@@ -10274,7 +11188,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  		return match;
  	else
  		return NULL;
-@@ -193,13 +447,11 @@ lookup_acl_obj_label_create(const ino_t 
+@@ -193,13 +455,11 @@ lookup_acl_obj_label_create(const ino_t 
  		i = (i + 1) % 32;
  	}
  
@@ -10290,7 +11204,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  	match = o_hash[index];
  
  	while (match && (match->inode != ino || match->device != dev ||
-@@ -209,9 +461,7 @@ lookup_acl_obj_label_create(const ino_t 
+@@ -209,9 +469,7 @@ lookup_acl_obj_label_create(const ino_t 
  		i = (i + 1) % 32;
  	}
  
@@ -10301,7 +11215,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  		return match;
  	else
  		return NULL;
-@@ -220,22 +470,20 @@ lookup_acl_obj_label_create(const ino_t 
+@@ -220,22 +478,20 @@ lookup_acl_obj_label_create(const ino_t 
  static __inline__ struct name_entry *
  lookup_name_entry(const char *name)
  {
@@ -10328,7 +11242,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  }
  
  static __inline__ struct name_entry *
-@@ -253,16 +501,12 @@ lookup_inodev_entry(const ino_t ino, con
+@@ -253,16 +509,12 @@ lookup_inodev_entry(const ino_t ino, con
  		i = (i + 1) % 32;
  	}
  
@@ -10346,15 +11260,15 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  static void
  insert_inodev_entry(struct name_entry *nentry)
  {
-@@ -284,16 +528,38 @@ insert_inodev_entry(struct name_entry *n
+@@ -284,16 +536,50 @@ insert_inodev_entry(struct name_entry *n
  	return;
  }
  
 +static void
-+insert_acl_role_label(struct acl_role_label *role)
++__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
 +{
 +	unsigned long index =
-+	    rhash(role->uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), acl_role_set.r_size);
++	    rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), acl_role_set.r_size);
 +	struct acl_role_label **curr;
 +	__u8 i = 0;
 +
@@ -10371,6 +11285,18 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 +	return;
 +}
 +
++static void
++insert_acl_role_label(struct acl_role_label *role)
++{
++	int i;
++
++	if (role->roletype & GR_ROLE_DOMAIN) {
++		for (i = 0; i < role->domain_child_num; i++)
++			__insert_acl_role_label(role, role->domain_children[i]);
++	} else
++		__insert_acl_role_label(role, role->uidgid);
++}
++					
  static int
  insert_name_entry(char *name, const ino_t inode, const kdev_t device)
  {
@@ -10387,7 +11313,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  		index = (index + (1 << i)) % name_set.n_size;
  		curr = &name_set.n_hash[index];
  		i = (i + 1) % 32;
-@@ -307,6 +573,7 @@ insert_name_entry(char *name, const ino_
+@@ -307,6 +593,7 @@ insert_name_entry(char *name, const ino_
  		nentry->name = name;
  		nentry->inode = inode;
  		nentry->device = device;
@@ -10395,7 +11321,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  		*curr = nentry;
  		/* insert us into the table searchable by inode/dev */
  		insert_inodev_entry(nentry);
-@@ -338,18 +605,20 @@ insert_acl_obj_label(struct acl_object_l
+@@ -338,18 +625,20 @@ insert_acl_obj_label(struct acl_object_l
  }
  
  static void
@@ -10422,7 +11348,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  		i = (i + 1) % 32;
  	}
  
-@@ -358,11 +627,6 @@ insert_acl_subj_label(struct acl_subject
+@@ -358,11 +647,6 @@ insert_acl_subj_label(struct acl_subject
  	return;
  }
  
@@ -10434,40 +11360,46 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  static void **
  create_table(__u32 * len)
  {
-@@ -395,12 +659,18 @@ create_table(__u32 * len)
+@@ -394,22 +678,21 @@ create_table(__u32 * len)
+ }
  
  static int
- init_variables(const unsigned long acl_obj_size,
-+	       const unsigned long acl_glob_size,
- 	       const unsigned long acl_subj_size,
+-init_variables(const unsigned long acl_obj_size,
+-	       const unsigned long acl_subj_size,
 -	       const unsigned long acl_ip_size)
-+	       const unsigned long acl_ip_size,
-+	       const unsigned long acl_role_size,
-+	       const unsigned long allowed_ip_size,
-+	       const unsigned long acl_trans_size,
-+	       const __u16 num_sprole_pws)
++init_variables(const struct gr_arg *arg)
  {
  	unsigned long stacksize;
  
 -	acl_subj_set.s_size = acl_subj_size;
-+	subj_map_set.s_size = acl_subj_size;
-+	acl_role_set.r_size = acl_role_size;
- 	name_set.n_size = (acl_obj_size + acl_subj_size);
- 	inodev_set.n_size = (acl_obj_size + acl_subj_size);
+-	name_set.n_size = (acl_obj_size + acl_subj_size);
+-	inodev_set.n_size = (acl_obj_size + acl_subj_size);
++	subj_map_set.s_size = arg->role_db.num_subjects;
++	acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
++	name_set.n_size = arg->role_db.num_objects;
++	inodev_set.n_size = arg->role_db.num_objects;
  
-@@ -409,7 +679,9 @@ init_variables(const unsigned long acl_o
+ 	if (!gr_init_uidset())
+ 		return 1;
  
  	/* set up the stack that holds allocation info */
  
 -	stacksize = (3 * acl_obj_size) + (4 * acl_subj_size) + acl_ip_size + 3;
-+	stacksize = (3 * acl_obj_size) + (3 * acl_role_size) +
-+	    (6 * acl_subj_size) + acl_ip_size + (2 * acl_trans_size) +
-+	    allowed_ip_size + (2 * num_sprole_pws) + (2 * acl_glob_size) + 5;
++	stacksize = arg->role_db.num_pointers + 5;
  
  	if (!acl_alloc_stack_init(stacksize))
  		return 1;
-@@ -433,16 +705,22 @@ init_variables(const unsigned long acl_o
+@@ -431,18 +714,31 @@ init_variables(const unsigned long acl_o
+ 	memset(deleted_object, 0, sizeof (struct acl_object_label));
+ 	memset(deleted_inodev, 0, sizeof (struct name_entry));
  
++	/* grab reference for the real root dentry and vfsmount */
++	read_lock(&child_reaper->fs->lock);
++	real_root_mnt = mntget(child_reaper->fs->rootmnt);
++	real_root = dget(child_reaper->fs->root);
++	read_unlock(&child_reaper->fs->lock);
++	
++
  	/* We only want 50% full tables for now */
  
 -	acl_subj_set.s_hash =
@@ -10494,7 +11426,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  	memset(name_set.n_hash, 0,
  	       sizeof (struct name_entry *) * name_set.n_size);
  	memset(inodev_set.n_hash, 0,
-@@ -451,42 +729,83 @@ init_variables(const unsigned long acl_o
+@@ -451,42 +747,91 @@ init_variables(const unsigned long acl_o
  	return 0;
  }
  
@@ -10545,6 +11477,14 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  	}
  	read_unlock(&tasklist_lock);
  
++	/* release the reference to the real root dentry and vfsmount */
++	if (real_root)
++		dput(real_root);
++	real_root = NULL;
++	if (real_root_mnt)
++		mntput(real_root_mnt);
++	real_root_mnt = NULL;
++
  	/* free all object hash tables */
  
 -	if (subj_list_head) {
@@ -10592,7 +11532,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  	}
  	if (name_set.n_hash) {
  		if ((name_set.n_size * sizeof (struct name_entry *)) <=
-@@ -508,12 +827,11 @@ free_variables(void)
+@@ -508,12 +853,11 @@ free_variables(void)
  
  	memset(&name_set, 0, sizeof (struct name_db));
  	memset(&inodev_set, 0, sizeof (struct name_db));
@@ -10609,15 +11549,14 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  
  	return;
  }
-@@ -536,11 +854,61 @@ count_user_objs(struct acl_object_label 
+@@ -536,11 +880,61 @@ count_user_objs(struct acl_object_label 
  	return num;
  }
  
 +static struct acl_subject_label *
 +do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role);
 +
- static int
--copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj)
++static int
 +copy_user_glob(struct acl_object_label *obj)
 +{
 +	struct acl_object_label *g_tmp, **guser, *glast = NULL;
@@ -10662,7 +11601,8 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 +	return 0;
 +}
 +
-+static int
+ static int
+-copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj)
 +copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
 +	       struct acl_role_label *role)
  {
@@ -10672,7 +11612,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  	char *tmp;
  
  	while (userp) {
-@@ -571,56 +939,443 @@ copy_user_objs(struct acl_object_label *
+@@ -571,147 +965,524 @@ copy_user_objs(struct acl_object_label *
  		if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
  				       o_tmp->device))
  			return -ENOMEM;
@@ -10693,17 +11633,46 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  	return 0;
  }
  
+-static int
+-copy_user_acl(struct gr_arg *arg)
 +static __u32
 +count_user_subjs(struct acl_subject_label *userp)
-+{
+ {
+-	struct acl_subject_label *s_tmp = NULL, **s_utmp, *s_utmp2, *s_last;
+-	struct acl_ip_label **i_tmp, *i_utmp2;
+-	unsigned long s_num, i_num;
+-	char *tmp;
+-	int err = 0;
+-	unsigned int len;
+-	__u32 num_objs;
+-
+-	s_utmp = (struct acl_subject_label **) arg->subj_db.s_table;
 +	struct acl_subject_label s_tmp;
 +	__u32 num = 0;
-+
+ 
+-	for (s_num = 0; s_num < arg->subj_db.s_entries; s_num++) {
+-		s_last = s_tmp;
+-		if ((s_tmp =
+-		     acl_alloc(sizeof (struct acl_subject_label))) == NULL) {
+-			err = -ENOMEM;
+-			goto cleanup;
+-		}
+-		if (copy_from_user(&s_utmp2, s_utmp + s_num,
+-				   sizeof (struct acl_subject_label *))) {
+-			err = -EFAULT;
+-			goto cleanup;
+-		}
+-		if (copy_from_user(s_tmp, s_utmp2,
+-				   sizeof (struct acl_subject_label))) {
+-			err = -EFAULT;
+-			goto cleanup;
+-		}
 +	while (userp) {
 +		if (copy_from_user(&s_tmp, userp,
 +				   sizeof (struct acl_subject_label)))
 +			break;
-+
+ 
+-		/* set up subject pointers */
 +		userp = s_tmp.prev;
 +		/* do not count nested subjects against this count, since
 +		   they are not included in the hash table, but are
@@ -10714,46 +11683,80 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 +		if (!(s_tmp.mode & GR_NESTED))
 +			num++;
 +	}
-+
+ 
+-		if (!s_last) {
+-			s_tmp->prev = NULL;
+-			subj_list_head = s_tmp;
+-		} else {
+-			s_last->next = s_tmp;
+-			s_tmp->prev = s_last;
+-		}
 +	return num;
 +}
-+
- static int
--copy_user_acl(struct gr_arg *arg)
+ 
+-		if (s_num == (arg->subj_db.s_entries - 1))
+-			s_tmp->next = NULL;
++static int
 +copy_user_allowedips(struct acl_role_label *rolep)
- {
--	struct acl_subject_label *s_tmp = NULL, **s_utmp, *s_utmp2, *s_last;
--	struct acl_ip_label **i_tmp, *i_utmp2;
--	unsigned long s_num, i_num;
++{
 +	struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
-+
+ 
+-		len = strnlen_user(s_tmp->filename, PATH_MAX);
 +	ruserip = rolep->allowed_ips;
-+
+ 
+-		if (!len || len >= PATH_MAX) {
+-			err = -EINVAL;
+-			goto cleanup;
+-		}
 +	while (ruserip) {
 +		rlast = rtmp;
-+
+ 
+-		if ((tmp = (char *) acl_alloc(len)) == NULL) {
+-			err = -ENOMEM;
+-			goto cleanup;
+-		}
+-		if (copy_from_user(tmp, s_tmp->filename, len)) {
+-			err = -EFAULT;
+-			goto cleanup;
+-		}
+-		s_tmp->filename = tmp;
 +		if ((rtmp = (struct role_allowed_ip *)
 +		     acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
 +			return -ENOMEM;
-+
+ 
+-		/* set up object hash table */
+-		num_objs = count_user_objs(s_tmp->proc_object);
 +		if (copy_from_user(rtmp, ruserip,
 +				   sizeof (struct role_allowed_ip)))
 +			return -EFAULT;
-+
+ 
+-		s_tmp->obj_hash_size = num_objs;
+-		s_tmp->obj_hash =
+-		    (struct acl_object_label **)
+-		    create_table(&(s_tmp->obj_hash_size));
 +		ruserip = rtmp->prev;
-+
+ 
+-		if (!s_tmp->obj_hash) {
+-			err = -ENOMEM;
+-			goto cleanup;
 +		if (!rlast) {
 +			rtmp->prev = NULL;
 +			rolep->allowed_ips = rtmp;
 +		} else {
 +			rlast->next = rtmp;
 +			rtmp->prev = rlast;
-+		}
-+
+ 		}
+-		memset(s_tmp->obj_hash, 0,
+-		       s_tmp->obj_hash_size *
+-		       sizeof (struct acl_object_label *));
+ 
+-		/* add in objects */
+-		err = copy_user_objs(s_tmp->proc_object, s_tmp);
 +		if (!ruserip)
 +			rtmp->next = NULL;
 +	}
-+
+ 
+-		if (err)
 +	return 0;
 +}
 +
@@ -10762,8 +11765,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 +{
 +	struct role_transition *rusertp, *rtmp = NULL, *rlast;
 +	unsigned int len;
- 	char *tmp;
--	int err = 0;
++	char *tmp;
 +
 +	rusertp = rolep->transitions;
 +
@@ -10812,9 +11814,9 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 +do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role)
 +{
 +	struct acl_subject_label *s_tmp = NULL, *s_tmp2;
- 	unsigned int len;
++	unsigned int len;
 +	char *tmp;
- 	__u32 num_objs;
++	__u32 num_objs;
 +	struct acl_ip_label **i_tmp, *i_utmp2;
 +	struct gr_hash_struct ghash;
 +	struct subject_map *subjmap;
@@ -10937,14 +11939,9 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 +
 +		s_tmp->parent_subject = s_tmp2;
 +	}
- 
--	s_utmp = (struct acl_subject_label **) arg->subj_db.s_table;
++
 +	/* add in ip acls */
- 
--	for (s_num = 0; s_num < arg->subj_db.s_entries; s_num++) {
--		s_last = s_tmp;
--		if ((s_tmp =
--		     acl_alloc(sizeof (struct acl_subject_label))) == NULL) {
++
 +	if (!s_tmp->ip_num) {
 +		s_tmp->ips = NULL;
 +		goto insert;
@@ -11029,6 +12026,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 +	struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2, *r_last;
 +	struct sprole_pw *sptmp;
 +	struct gr_hash_struct *ghash;
++	uid_t *domainlist;
 +	unsigned long r_num;
 +	unsigned int len;
 +	char *tmp;
@@ -11037,7 +12035,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 +	__u32 num_subjs;
 +
 +	/* we need a default and kernel role */
-+	if (arg->role_db.r_entries < 2)
++	if (arg->role_db.num_roles < 2)
 +		return -EINVAL;
 +
 +	/* copy special role authentication info from userspace */
@@ -11053,18 +12051,14 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 +	for (i = 0; i < num_sprole_pws; i++) {
 +		sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
 +		if (!sptmp) {
- 			err = -ENOMEM;
- 			goto cleanup;
- 		}
--		if (copy_from_user(&s_utmp2, s_utmp + s_num,
--				   sizeof (struct acl_subject_label *))) {
++			err = -ENOMEM;
++			goto cleanup;
++		}
 +		if (copy_from_user(sptmp, arg->sprole_pws + i,
 +				   sizeof (struct sprole_pw))) {
- 			err = -EFAULT;
- 			goto cleanup;
- 		}
--		if (copy_from_user(s_tmp, s_utmp2,
--				   sizeof (struct acl_subject_label))) {
++			err = -EFAULT;
++			goto cleanup;
++		}
 +
 +		len =
 +		    strnlen_user(sptmp->rolename, GR_SPROLE_LEN);
@@ -11093,7 +12087,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 +
 +	r_utmp = (struct acl_role_label **) arg->role_db.r_table;
 +
-+	for (r_num = 0; r_num < arg->role_db.r_entries; r_num++) {
++	for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
 +		r_last = r_tmp;
 +
 +		r_tmp = acl_alloc(sizeof (struct acl_role_label));
@@ -11105,87 +12099,34 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 +
 +		if (copy_from_user(&r_utmp2, r_utmp + r_num,
 +				   sizeof (struct acl_role_label *))) {
- 			err = -EFAULT;
- 			goto cleanup;
- 		}
- 
--		/* set up subject pointers */
++			err = -EFAULT;
++			goto cleanup;
++		}
++
 +		if (copy_from_user(r_tmp, r_utmp2,
 +				   sizeof (struct acl_role_label))) {
 +			err = -EFAULT;
 +			goto cleanup;
 +		}
- 
--		if (!s_last) {
--			s_tmp->prev = NULL;
--			subj_list_head = s_tmp;
++
 +		if (!r_last) {
 +			r_tmp->prev = NULL;
 +			role_list_head = r_tmp;
- 		} else {
--			s_last->next = s_tmp;
--			s_tmp->prev = s_last;
++		} else {
 +			r_last->next = r_tmp;
 +			r_tmp->prev = r_last;
- 		}
- 
--		if (s_num == (arg->subj_db.s_entries - 1))
--			s_tmp->next = NULL;
-+		if (r_num == (arg->role_db.r_entries - 1))
-+			r_tmp->next = NULL;
- 
--		len = strnlen_user(s_tmp->filename, PATH_MAX);
-+		len = strnlen_user(r_tmp->rolename, PATH_MAX);
- 
- 		if (!len || len >= PATH_MAX) {
- 			err = -EINVAL;
-@@ -631,87 +1386,62 @@ copy_user_acl(struct gr_arg *arg)
- 			err = -ENOMEM;
- 			goto cleanup;
- 		}
--		if (copy_from_user(tmp, s_tmp->filename, len)) {
-+		if (copy_from_user(tmp, r_tmp->rolename, len)) {
- 			err = -EFAULT;
- 			goto cleanup;
- 		}
--		s_tmp->filename = tmp;
-+		r_tmp->rolename = tmp;
- 
--		/* set up object hash table */
--		num_objs = count_user_objs(s_tmp->proc_object);
--
--		s_tmp->obj_hash_size = num_objs;
--		s_tmp->obj_hash =
--		    (struct acl_object_label **)
--		    create_table(&(s_tmp->obj_hash_size));
-+		if (!strcmp(r_tmp->rolename, "default")
-+		    && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
-+			default_role = r_tmp;
-+		} else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
-+			kernel_role = r_tmp;
 +		}
- 
--		if (!s_tmp->obj_hash) {
-+		if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL) {
- 			err = -ENOMEM;
++
++		if (r_num == (arg->role_db.num_roles - 1))
++			r_tmp->next = NULL;
++
++		len = strnlen_user(r_tmp->rolename, GR_SPROLE_LEN);
++
++		if (!len || len >= PATH_MAX) {
++			err = -EINVAL;
  			goto cleanup;
- 		}
--		memset(s_tmp->obj_hash, 0,
--		       s_tmp->obj_hash_size *
--		       sizeof (struct acl_object_label *));
-+		if (copy_from_user(ghash, r_tmp->hash, sizeof(struct gr_hash_struct))) {
-+			err = -EFAULT;
-+			goto cleanup;
 +		}
  
--		/* add in objects */
--		err = copy_user_objs(s_tmp->proc_object, s_tmp);
-+		r_tmp->hash = ghash;
- 
--		if (err)
--			goto cleanup;
-+		num_subjs = count_user_subjs(r_tmp->hash->first);
- 
 -		if (!(strcmp(s_tmp->filename, "god")))
 -			god_label = s_tmp;
 -		if (!(strcmp(s_tmp->filename, "kernel")))
@@ -11205,23 +12146,61 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 -							sizeof (struct
 -								acl_ip_label
 -								*))) == NULL) {
-+		r_tmp->subj_hash_size = num_subjs;
-+		r_tmp->subj_hash =
-+		    (struct acl_subject_label **)
-+		    create_table(&(r_tmp->subj_hash_size));
-+
-+		if (!r_tmp->subj_hash) {
++		if ((tmp = (char *) acl_alloc(len)) == NULL) {
  			err = -ENOMEM;
  			goto cleanup;
  		}
++		if (copy_from_user(tmp, r_tmp->rolename, len)) {
++			err = -EFAULT;
++			goto cleanup;
++		}
++		r_tmp->rolename = tmp;
++
++		if (!strcmp(r_tmp->rolename, "default")
++		    && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
++			default_role = r_tmp;
++		} else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
++			kernel_role = r_tmp;
++		}
++
++		if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL) {
++			err = -ENOMEM;
++			goto cleanup;
++		}
++		if (copy_from_user(ghash, r_tmp->hash, sizeof(struct gr_hash_struct))) {
++			err = -EFAULT;
++			goto cleanup;
++		}
++
++		r_tmp->hash = ghash;
++
++		num_subjs = count_user_subjs(r_tmp->hash->first);
  
 -		for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
 -			if ((*(i_tmp + i_num) =
 -			     (struct acl_ip_label *)
 -			     acl_alloc(sizeof (struct acl_ip_label))) == NULL) {
--				err = -ENOMEM;
--				goto cleanup;
--			}
++		r_tmp->subj_hash_size = num_subjs;
++		r_tmp->subj_hash =
++		    (struct acl_subject_label **)
++		    create_table(&(r_tmp->subj_hash_size));
++
++		if (!r_tmp->subj_hash) {
++			err = -ENOMEM;
++			goto cleanup;
++		}
++
++		err = copy_user_allowedips(r_tmp);
++		if (err)
++			goto cleanup;
++
++		/* copy domain info */
++		if (r_tmp->domain_children != NULL) {
++			domainlist = acl_alloc(r_tmp->domain_child_num * sizeof(uid_t));
++			if (domainlist == NULL) {
+ 				err = -ENOMEM;
+ 				goto cleanup;
+ 			}
 -			if (copy_from_user
 -			    (&i_utmp2, s_tmp->ips + i_num,
 -			     sizeof (struct acl_ip_label *))) {
@@ -11231,13 +12210,12 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 -			if (copy_from_user
 -			    (*(i_tmp + i_num), i_utmp2,
 -			     sizeof (struct acl_ip_label))) {
--				err = -EFAULT;
--				goto cleanup;
--			}
--		}
-+		err = copy_user_allowedips(r_tmp);
-+		if (err)
-+			goto cleanup;
++			if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t))) {
+ 				err = -EFAULT;
+ 				goto cleanup;
+ 			}
++			r_tmp->domain_children = domainlist;
+ 		}
  
 -		s_tmp->ips = i_tmp;
 +		err = copy_user_transitions(r_tmp);
@@ -11265,28 +12243,25 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  	}
  
        cleanup:
-@@ -724,14 +1454,13 @@ gracl_init(struct gr_arg *args)
+@@ -724,14 +1495,10 @@ gracl_init(struct gr_arg *args)
  {
  	int error = 0;
  
 -	memcpy(gr_pwent->salt, args->salt, GR_SALT_LEN);
 -	memcpy(gr_pwent->sum, args->sum, GR_SHA_LEN);
--
--	if (args->subj_db.s_entries < 3)
--		return -EINVAL;
 +	memcpy(gr_system_salt, args->salt, GR_SALT_LEN);
 +	memcpy(gr_system_sum, args->sum, GR_SHA_LEN);
  
+-	if (args->subj_db.s_entries < 3)
+-		return -EINVAL;
+-
 -	if (init_variables(args->subj_db.o_entries, args->subj_db.s_entries,
 -			   args->subj_db.i_entries)) {
-+	if (init_variables(args->role_db.o_entries, args->role_db.g_entries,
-+			   args->role_db.s_entries, args->role_db.i_entries,
-+			   args->role_db.r_entries, args->role_db.a_entries,
-+			   args->role_db.t_entries, args->num_sprole_pws)) {
++	if (init_variables(args)) {
  		security_alert_good(GR_INITF_ACL_MSG, GR_VERSION);
  		error = -ENOMEM;
  		free_variables();
-@@ -739,6 +1468,7 @@ gracl_init(struct gr_arg *args)
+@@ -739,6 +1506,7 @@ gracl_init(struct gr_arg *args)
  	}
  
  	error = copy_user_acl(args);
@@ -11294,7 +12269,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  	if (error) {
  		free_variables();
  		goto out;
-@@ -750,24 +1480,105 @@ gracl_init(struct gr_arg *args)
+@@ -750,44 +1518,210 @@ gracl_init(struct gr_arg *args)
  	}
  
  	gr_status |= GR_READY;
@@ -11306,40 +12281,135 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 -/* * * * * * * * * * * * * * * * * * * * * * *
 - * Begin Misc Section 
 - * * * * * * * * * * * * * * * * * * * * * * */
-+static int
-+glob_match(char *pattern, char *string)
-+{
-+	char *p1, *p2;
++/* derived from glibc fnmatch() 0: match, 1: no match*/
  
 -static __u32
-+	p1 = pattern;
-+	p2 = string;
++static int
++glob_match(const char *pattern, const char *string)
++{
++	char *p = pattern, *n = string;
++	char c;
 +
-+	while (*p1 != '\0' && *p2 != '\0' && *p1 != '*') {
-+		if (*p1 == *p2 || *p1 == '?') {
-+			p1++;
-+			p2++;
-+		} else
++	while ((c = *p++) != '\0') {
++	switch (c) {
++		case '?':
++			if (*n == '\0')
++				return 1;
++			else if (*n == '/')
++				return 1;
++			break;
++		case '\\':
++			if (*n != c)
++				return 1;
++			break;
++		case '*':
++			for (c = *p++; c == '?' || c == '*'; c = *p++) {
++				if (*n == '/')
++					return 1;
++				else if (c == '?') {
++					if (*n == '\0')
++						return 1;
++					else
++						++n;
++				}
++			}
++			if (c == '\0') {
++				if (strchr(n, '/') != NULL)
++					return 1;
++				else
++					return 0;
++			} else {
++				const char *endp;
++
++				if ((endp = strchr(n, '/')) == NULL)
++					endp = n + strlen(n);
++
++				if (c == '[') {
++					for (--p; n < endp; ++n)
++						if (!glob_match(p, n))
++							return 0;
++				} else if (c == '/') {
++					while (*n != '\0' && *n != '/')
++						++n;
++					if (*n == '/' && !glob_match(p, n + 1))
++						return 0;
++				} else {
++					for (--p; n < endp; ++n)
++						if (*n == c && !glob_match(p, n))
++							return 0;
++				}
++
++				return 1;
++			}
++		case '[':
++			{
++			int not;
++			char cold;
++
++			if (*n == '\0' || *n == '/')
++				return 1;
++
++			not = (*p == '!' || *p == '^');
++			if (not)
++				++p;
++
++			c = *p++;
++			for (;;) {
++				unsigned char fn = (unsigned char)*n;
++
++				if (c == '\0')
++					return 1;
++				else {
++					if (c == fn)
++						goto matched;
++					cold = c;
++					c = *p++;
++
++					if (c == '-' && *p != ']') {
++						unsigned char cend = *p++;
++
++						if (cend == '\0')
++							return 1;
++
++						if (cold <= fn && fn <= cend)
++							goto matched;
++
++						c = *p++;
++					}
++				}
++
++				if (c == ']')
++					break;
++			}
++			if (!not)
++				return 1;
 +			break;
-+	}
-+	if (*p1 == '*') {
-+		p1++;
-+		while (*p2 != '\0') {
-+			if (!glob_match(p1, p2))
-+				return 0;
-+			else
-+				p2++;
++		matched:
++			while (c != ']') {
++				if (c == '\0')
++					return 1;
++
++				c = *p++;
++			}
++			if (not)
++				return 1;
 +		}
++		break;
++	default:
++		if (c != *n)
++			return 1;
 +	}
 +
-+	if (*p2 == '\0' && *p1 == '*')
-+		while (*p1 == '*')
-+			p1++;
++	++n;
++	}
++				
++	if (*n == '\0')
++		return 0;
 +
-+	if (*p1 == '\0' && *p2 == '\0')
++	if (*n == '/')
 +		return 0;
-+	else
-+		return 1;
++
++	return 1;
 +}
 +
 +static struct acl_object_label *
@@ -11399,19 +12469,20 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  {
  	struct dentry *dentry = (struct dentry *) l_dentry;
  	struct vfsmount *mnt = (struct vfsmount *) l_mnt;
- 	struct dentry *root;
- 	struct vfsmount *rootmnt;
+-	struct dentry *root;
+-	struct vfsmount *rootmnt;
  	struct acl_object_label *retval;
 +	char *path = NULL;
  
- 	read_lock(&child_reaper->fs->lock);
- 	rootmnt = mntget(child_reaper->fs->rootmnt);
-@@ -776,18 +1587,65 @@ chk_obj_label(const struct dentry *l_den
+-	read_lock(&child_reaper->fs->lock);
+-	rootmnt = mntget(child_reaper->fs->rootmnt);
+-	root = dget(child_reaper->fs->root);
+-	read_unlock(&child_reaper->fs->lock);
  	spin_lock(&dcache_lock);
  
  	for (;;) {
 -		if (unlikely(dentry == root && mnt == rootmnt))
-+		if (dentry == root && mnt == rootmnt)
++		if (dentry == real_root && mnt == real_root_mnt)
  			break;
 -		if (unlikely(dentry == mnt->mnt_root || IS_ROOT(dentry))) {
 +		if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
@@ -11426,61 +12497,10 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 -			if (unlikely(retval != NULL))
 +			retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path);
 +			if (retval != NULL)
-+				goto out;
-+
-+			dentry = mnt->mnt_mountpoint;
-+			mnt = mnt->mnt_parent;
-+			continue;
-+		}
-+
-+		retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path);
-+		if (retval != NULL)
-+			goto out;
-+
-+		dentry = dentry->d_parent;
-+	}
-+
-+	retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path);
-+
-+	if (retval == NULL)
-+		retval = full_lookup(l_dentry, l_mnt, root, subj, &path);
-+      out:
-+	spin_unlock(&dcache_lock);
-+	dput(root);
-+	mntput(rootmnt);
-+
-+	return retval;
-+}
-+
-+static struct acl_object_label *
-+chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
-+	      const struct acl_subject_label *subj, char *path)
-+{
-+	struct dentry *dentry = (struct dentry *) l_dentry;
-+	struct vfsmount *mnt = (struct vfsmount *) l_mnt;
-+	struct dentry *root;
-+	struct vfsmount *rootmnt;
-+	struct acl_object_label *retval;
-+
-+	read_lock(&child_reaper->fs->lock);
-+	rootmnt = mntget(child_reaper->fs->rootmnt);
-+	root = dget(child_reaper->fs->root);
-+	read_unlock(&child_reaper->fs->lock);
-+	spin_lock(&dcache_lock);
-+
-+	for (;;) {
-+		if (dentry == root && mnt == rootmnt)
-+			break;
-+		if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
-+			if (mnt->mnt_parent == mnt)
-+				break;
-+
-+			retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path);
-+			if (retval != NULL)
  				goto out;
  
  			dentry = mnt->mnt_mountpoint;
-@@ -795,40 +1653,28 @@ chk_obj_label(const struct dentry *l_den
+@@ -795,55 +1729,78 @@ chk_obj_label(const struct dentry *l_den
  			continue;
  		}
  
@@ -11510,13 +12530,55 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 -		    lookup_acl_obj_label(root->d_inode->i_ino,
 -					 root->d_inode->i_dev, subj);
 -		read_unlock(&gr_inode_lock);
--	}
 +	if (retval == NULL)
-+		retval = full_lookup(l_dentry, l_mnt, root, subj, &path);
++		retval = full_lookup(l_dentry, l_mnt, real_root, subj, &path);
++      out:
++	spin_unlock(&dcache_lock);
++
++	return retval;
++}
++
++static struct acl_object_label *
++chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
++	      const struct acl_subject_label *subj, char *path)
++{
++	struct dentry *dentry = (struct dentry *) l_dentry;
++	struct vfsmount *mnt = (struct vfsmount *) l_mnt;
++	struct acl_object_label *retval;
++
++	spin_lock(&dcache_lock);
++
++	for (;;) {
++		if (dentry == real_root && mnt == real_root_mnt)
++			break;
++		if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
++			if (mnt->mnt_parent == mnt)
++				break;
++
++			retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path);
++			if (retval != NULL)
++				goto out;
++
++			dentry = mnt->mnt_mountpoint;
++			mnt = mnt->mnt_parent;
++			continue;
++		}
++
++		retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path);
++		if (retval != NULL)
++			goto out;
++
++		dentry = dentry->d_parent;
+ 	}
++
++	retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path);
++
++	if (retval == NULL)
++		retval = full_lookup(l_dentry, l_mnt, real_root, subj, &path);
        out:
  	spin_unlock(&dcache_lock);
- 	dput(root);
- 	mntput(rootmnt);
+-	dput(root);
+-	mntput(rootmnt);
  
 -	return (retval->mode & reqmode);
 +	return retval;
@@ -11529,7 +12591,23 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  {
  	struct dentry *dentry = (struct dentry *) l_dentry;
  	struct vfsmount *mnt = (struct vfsmount *) l_mnt;
-@@ -852,7 +1698,7 @@ chk_subj_label(const struct dentry *l_de
+-	struct dentry *root;
+-	struct vfsmount *rootmnt;
+ 	struct acl_subject_label *retval;
+ 
+-	read_lock(&child_reaper->fs->lock);
+-	rootmnt = mntget(child_reaper->fs->rootmnt);
+-	root = dget(child_reaper->fs->root);
+-	read_unlock(&child_reaper->fs->lock);
+ 	spin_lock(&dcache_lock);
+ 
+ 	for (;;) {
+-		if (unlikely(dentry == root && mnt == rootmnt))
++		if (unlikely(dentry == real_root && mnt == real_root_mnt))
+ 			break;
+ 		if (unlikely(dentry == mnt->mnt_root || IS_ROOT(dentry))) {
+ 			if (mnt->mnt_parent == mnt)
+@@ -852,7 +1809,7 @@ chk_subj_label(const struct dentry *l_de
  			read_lock(&gr_inode_lock);
  			retval =
  			    lookup_acl_subj_label(dentry->d_inode->i_ino,
@@ -11538,7 +12616,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  			read_unlock(&gr_inode_lock);
  			if (unlikely(retval != NULL))
  				goto out;
-@@ -865,7 +1711,7 @@ chk_subj_label(const struct dentry *l_de
+@@ -865,7 +1822,7 @@ chk_subj_label(const struct dentry *l_de
  		read_lock(&gr_inode_lock);
  		retval =
  		    lookup_acl_subj_label(dentry->d_inode->i_ino,
@@ -11547,7 +12625,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  		read_unlock(&gr_inode_lock);
  		if (unlikely(retval != NULL))
  			goto out;
-@@ -876,14 +1722,14 @@ chk_subj_label(const struct dentry *l_de
+@@ -876,35 +1833,31 @@ chk_subj_label(const struct dentry *l_de
  	read_lock(&gr_inode_lock);
  	retval =
  	    lookup_acl_subj_label(dentry->d_inode->i_ino,
@@ -11558,13 +12636,18 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  	if (unlikely(retval == NULL)) {
  		read_lock(&gr_inode_lock);
  		retval =
- 		    lookup_acl_subj_label(root->d_inode->i_ino,
+-		    lookup_acl_subj_label(root->d_inode->i_ino,
 -					  root->d_inode->i_dev);
-+					  root->d_inode->i_dev, role);
++		    lookup_acl_subj_label(real_root->d_inode->i_ino,
++					  real_root->d_inode->i_dev, role);
  		read_unlock(&gr_inode_lock);
  	}
        out:
-@@ -895,16 +1741,14 @@ chk_subj_label(const struct dentry *l_de
+ 	spin_unlock(&dcache_lock);
+-	dput(root);
+-	mntput(rootmnt);
+ 
+ 	return retval;
  }
  
  static __inline__ void
@@ -11589,7 +12672,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  
  	return;
  }
-@@ -915,26 +1759,28 @@ gr_check_link(const struct dentry * new_
+@@ -915,26 +1868,28 @@ gr_check_link(const struct dentry * new_
  	      const struct vfsmount * parent_mnt,
  	      const struct dentry * old_dentry, const struct vfsmount * old_mnt)
  {
@@ -11626,7 +12709,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  	} else if (newmode & GR_SUPPRESS)
  		return GR_SUPPRESS;
  	else
-@@ -947,25 +1793,28 @@ gr_search_file(const struct dentry * den
+@@ -947,25 +1902,28 @@ gr_search_file(const struct dentry * den
  {
  	__u32 retval = mode;
  	struct acl_subject_label *curracl;
@@ -11659,7 +12742,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  	}
  
  	return retval;
-@@ -978,14 +1827,15 @@ gr_check_create(const struct dentry * ne
+@@ -978,14 +1936,15 @@ gr_check_create(const struct dentry * ne
  	struct name_entry *match;
  	struct acl_object_label *matchpo;
  	struct acl_subject_label *curracl;
@@ -11677,7 +12760,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  
  	if (!match)
  		goto check_parent;
-@@ -1004,8 +1854,8 @@ gr_check_create(const struct dentry * ne
+@@ -1004,8 +1963,8 @@ gr_check_create(const struct dentry * ne
  
  			new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
  
@@ -11688,7 +12771,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  
  			preempt_enable();
  			return new_mode;
-@@ -1014,10 +1864,11 @@ gr_check_create(const struct dentry * ne
+@@ -1014,10 +1973,11 @@ gr_check_create(const struct dentry * ne
  		return (matchpo->mode & mode);
  	}
  
@@ -11702,7 +12785,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  
  	if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
  	    && (curracl->mode & GR_LEARN)) {
-@@ -1025,8 +1876,8 @@ gr_check_create(const struct dentry * ne
+@@ -1025,8 +1985,8 @@ gr_check_create(const struct dentry * ne
  
  		new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
  
@@ -11713,7 +12796,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  		preempt_enable();
  		return new_mode;
  	}
-@@ -1062,19 +1913,16 @@ gr_check_protected_task(const struct tas
+@@ -1062,19 +2022,16 @@ gr_check_protected_task(const struct tas
  __inline__ void
  gr_copy_label(struct task_struct *tsk)
  {
@@ -11738,10 +12821,25 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  	if (unlikely(current->used_accept))
  		current->curr_ip = 0;
  
-@@ -1129,30 +1977,243 @@ gr_set_pax_flags(struct task_struct *tas
+@@ -1103,9 +2060,11 @@ gr_set_proc_res(void)
  	return;
  }
  
++#ifdef CONFIG_GRKERNSEC_PAX_HAVE_ACL_FLAGS
+ void
+-gr_set_pax_flags(struct task_struct *task)
++pax_set_flags(struct linux_binprm *bprm)
+ {
++	struct task_struct *task = current;
+ 	struct acl_subject_label *proc;
+ 
+ 	if (unlikely(!(gr_status & GR_READY)))
+@@ -1128,31 +2087,245 @@ gr_set_pax_flags(struct task_struct *tas
+ 
+ 	return;
+ }
++#endif
++
 +static __inline__ void
 +do_set_role_label(struct task_struct *task, const uid_t uid, const gid_t gid)
 +{
@@ -11877,7 +12975,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 +		return 1;
 +	}
 +}
-+
+ 
  void
 +gr_set_role_label(struct task_struct *task, const uid_t uid, const uid_t gid)
 +{
@@ -11931,10 +13029,10 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  	if (unlikely(!(gr_status & GR_READY)))
 -		return;
 +		return 0;
++
++	newacl = chk_subj_label(dentry, mnt, task->role);
  
 -	newacl = chk_subj_label(dentry, mnt);
-+	newacl = chk_subj_label(dentry, mnt, task->role);
-+
 +	task_lock(task);
 +	if (((task->ptrace & PT_PTRACED) && !(task->acl->mode & 
 +	     GR_OVERRIDE) && (task->acl != newacl) && 
@@ -11993,7 +13091,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  }
  
  static __inline__ void
-@@ -1161,14 +2222,22 @@ do_handle_delete(const ino_t ino, const 
+@@ -1161,14 +2334,22 @@ do_handle_delete(const ino_t ino, const 
  	struct acl_object_label *matchpo;
  	struct acl_subject_label *matchps;
  	struct acl_subject_label *i;
@@ -12022,7 +13120,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  
  	return;
  }
-@@ -1180,7 +2249,7 @@ gr_handle_delete(const ino_t ino, const 
+@@ -1180,7 +2361,7 @@ gr_handle_delete(const ino_t ino, const 
  		return;
  
  	write_lock(&gr_inode_lock);
@@ -12031,7 +13129,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  		do_handle_delete(ino, dev);
  	write_unlock(&gr_inode_lock);
  
-@@ -1226,24 +2295,27 @@ update_acl_obj_label(const ino_t oldinod
+@@ -1226,24 +2407,27 @@ update_acl_obj_label(const ino_t oldinod
  
  static __inline__ void
  update_acl_subj_label(const ino_t oldinode, const kdev_t olddevice,
@@ -12065,7 +13163,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  	    && ((*match)->inode == oldinode)
  	    && ((*match)->device == olddevice)
  	    && ((*match)->mode & GR_DELETED)) {
-@@ -1255,7 +2327,7 @@ update_acl_subj_label(const ino_t oldino
+@@ -1255,7 +2439,7 @@ update_acl_subj_label(const ino_t oldino
  
  		*match = deleted_subject;
  
@@ -12074,7 +13172,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  	}
  
  	return;
-@@ -1301,14 +2373,24 @@ do_handle_create(const struct name_entry
+@@ -1301,14 +2485,24 @@ do_handle_create(const struct name_entry
  		 const struct vfsmount *mnt)
  {
  	struct acl_subject_label *i;
@@ -12106,7 +13204,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  	}
  
  	update_inodev_entry(matchn->inode, matchn->device,
-@@ -1329,7 +2411,7 @@ gr_handle_create(const struct dentry *de
+@@ -1329,7 +2523,7 @@ gr_handle_create(const struct dentry *de
  	matchn = lookup_name_entry(gr_to_filename(dentry, mnt));
  	preempt_enable();
  
@@ -12115,7 +13213,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  		write_lock(&gr_inode_lock);
  		do_handle_create(matchn, dentry, mnt);
  		write_unlock(&gr_inode_lock);
-@@ -1355,7 +2437,7 @@ gr_handle_rename(struct inode *old_dir, 
+@@ -1355,7 +2549,7 @@ gr_handle_rename(struct inode *old_dir, 
  	error = vfs_rename(old_dir, old_dentry, new_dir, new_dentry);
  	unlock_kernel();
  
@@ -12124,7 +13222,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  		return error;
  
  	/* we wouldn't have to check d_inode if it weren't for
-@@ -1364,9 +2446,9 @@ gr_handle_rename(struct inode *old_dir, 
+@@ -1364,9 +2558,9 @@ gr_handle_rename(struct inode *old_dir, 
  
  	write_lock(&gr_inode_lock);
  	if (unlikely(replace && new_dentry->d_inode)) {
@@ -12136,7 +13234,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  			do_handle_delete(new_dentry->d_inode->i_ino,
  					 new_dentry->d_inode->i_dev);
  	}
-@@ -1377,77 +2459,190 @@ gr_handle_rename(struct inode *old_dir, 
+@@ -1377,77 +2571,211 @@ gr_handle_rename(struct inode *old_dir, 
  		do_handle_delete(old_dentry->d_inode->i_ino,
  				 old_dentry->d_inode->i_dev);
  
@@ -12157,6 +13255,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 +			 unsigned char **sum)
 +{
 +	struct acl_role_label *r;
++	struct role_allowed_ip *ipp;
 +	struct role_transition *trans;
 +	__u16 i;
 +	int found = 0;
@@ -12173,14 +13272,29 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 +	if (!found)
 +		return 0;
 +
-+	/* handle special roles that do not require authentication */
++	/* handle special roles that do not require authentication 
++	   and check ip */
 +
 +	for (r = role_list_head; r; r = r->next) {
-+		if (!strcmp(rolename, r->rolename)
-+		    && (r->roletype & GR_ROLE_NOPW)) {
-+			*salt = NULL;
-+			*sum = NULL;
-+			return 1;
++		if (!strcmp(rolename, r->rolename) &&
++		    (r->roletype & GR_ROLE_SPECIAL)) {
++			found = 0;
++			if (r->allowed_ips != NULL) {
++				for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
++					if ((ntohl(current->curr_ip) & ipp->netmask) ==
++					     (ntohl(ipp->addr) & ipp->netmask))
++						found = 1;
++				}
++			} else
++				found = 2;
++			if (!found)
++				return 0;
++
++			if (r->roletype & GR_ROLE_NOPW) {
++				*salt = NULL;
++				*sum = NULL;
++				return 1;
++			}
 +		}
 +	}
 +
@@ -12207,7 +13321,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 +	struct acl_role_label *assigned = NULL;
 +	struct task_struct *tsk;
 +	struct file *filp;
- 
++
 +	for (r = role_list_head; r; r = r->next)
 +		if (!strcmp(rolename, r->rolename) &&
 +		    (r->roletype & GR_ROLE_SPECIAL))
@@ -12224,7 +13338,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 +		read_unlock(&tasklist_lock);
 +		return;
 +	}
-+
+ 
 +	filp = tsk->exec_file;
 +	if (filp == NULL) {
 +		read_unlock(&grsec_exec_file_lock);
@@ -12267,46 +13381,50 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 -	struct gr_arg *arg;
 -	struct gr_arg usermode;
 -	int error = sizeof (struct gr_arg);
-+	struct gr_arg *uarg;
++	struct gr_arg_wrapper uwrap;
 +	unsigned char *sprole_salt;
 +	unsigned char *sprole_sum;
-+	int error = sizeof (struct gr_arg *);
++	int error = sizeof (struct gr_arg_wrapper);
  	int error2 = 0;
  
 -	if (!write)
 -		return -EPERM;
 +	down(&gr_dev_sem);
- 
--	down(&gr_proc_sem);
-+	if (count != sizeof (struct gr_arg *)) {
-+		security_alert_good(GR_DEV_ACL_MSG, count,
-+				    (int) sizeof (struct gr_arg *));
++
++	if (count != sizeof (struct gr_arg_wrapper)) {
++		security_alert_good(GR_DEV_ACL_MSG, (int)count,
++				    (int) sizeof (struct gr_arg_wrapper));
 +		error = -EINVAL;
 +		goto out;
 +	}
  
--	arg = (struct gr_arg *) buffer;
+-	down(&gr_proc_sem);
 +	if ((gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES)
 +	    && time_before_eq(gr_auth_expires, jiffies)) {
 +		gr_auth_expires = 0;
 +		gr_auth_attempts = 0;
 +	}
  
--	if (*lenp != sizeof (struct gr_arg)) {
--		security_alert_good(GR_PROC_ACL_MSG, (int) *lenp,
--				    (int) sizeof (struct gr_arg));
--		error = -EINVAL;
-+	if (copy_from_user(&uarg, buf, sizeof (struct gr_arg *))) {
+-	arg = (struct gr_arg *) buffer;
++	if (copy_from_user(&uwrap, buf, sizeof (struct gr_arg_wrapper))) {
 +		error = -EFAULT;
 +		goto out;
 +	}
-+
-+	if (copy_from_user(gr_usermode, uarg, sizeof (struct gr_arg))) {
-+		error = -EFAULT;
+ 
+-	if (*lenp != sizeof (struct gr_arg)) {
+-		security_alert_good(GR_PROC_ACL_MSG, (int) *lenp,
+-				    (int) sizeof (struct gr_arg));
++	if ((uwrap.version != GRSECURITY_VERSION) || (uwrap.size != sizeof(struct gr_arg))) {
+ 		error = -EINVAL;
  		goto out;
  	}
 -	if (during_wait) {
 +
++	if (copy_from_user(gr_usermode, uwrap.arg, sizeof (struct gr_arg))) {
++		error = -EFAULT;
++		goto out;
++	}
++
 +	if (gr_usermode->mode != SPROLE && time_after(gr_auth_expires, jiffies)) {
  		error = -EBUSY;
  		goto out;
@@ -12359,7 +13477,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  		} else if (gr_status & GR_READY) {
  			security_alert(GR_SHUTF_ACL_MSG, DEFAULTSECARGS);
  			error = -EPERM;
-@@ -1457,7 +2652,7 @@ gr_proc_handler(ctl_table * table, int w
+@@ -1457,7 +2785,7 @@ gr_proc_handler(ctl_table * table, int w
  		}
  		break;
  	case ENABLE:
@@ -12368,7 +13486,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  			security_alert_good(GR_ENABLE_ACL_MSG, GR_VERSION);
  		else {
  			if (gr_status & GR_READY)
-@@ -1472,11 +2667,11 @@ gr_proc_handler(ctl_table * table, int w
+@@ -1472,11 +2800,11 @@ gr_proc_handler(ctl_table * table, int w
  		if (!(gr_status & GR_READY)) {
  			security_alert_good(GR_RELOADI_ACL_MSG);
  			error = -EAGAIN;
@@ -12382,7 +13500,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  				unlock_kernel();
  				security_alert_good(GR_RELOAD_ACL_MSG,
  						    GR_VERSION);
-@@ -1500,53 +2695,93 @@ gr_proc_handler(ctl_table * table, int w
+@@ -1500,53 +2828,93 @@ gr_proc_handler(ctl_table * table, int w
  			break;
  		}
  
@@ -12498,7 +13616,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  			       DEFAULTSECARGS);
  		error = -EINVAL;
  		break;
-@@ -1555,47 +2790,63 @@ gr_proc_handler(ctl_table * table, int w
+@@ -1555,47 +2923,63 @@ gr_proc_handler(ctl_table * table, int w
  	if (error != -EPERM)
  		goto out;
  
@@ -12574,7 +13692,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  				if (!(curr->mode & GR_LEARN))
  					for (i = 0; i < RLIM_NLIMITS; i++) {
  						if (!(curr->resmask & (1 << i)))
-@@ -1607,6 +2858,7 @@ gr_set_acls(const int type)
+@@ -1607,6 +2991,7 @@ gr_set_acls(const int type)
  						    curr->res[i].rlim_max;
  					}
  			} else {
@@ -12582,7 +13700,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  				read_unlock(&tasklist_lock);
  				security_alert_good(GR_DEFACL_MSG, task->comm,
  						    task->pid);
-@@ -1614,12 +2866,14 @@ gr_set_acls(const int type)
+@@ -1614,12 +2999,14 @@ gr_set_acls(const int type)
  			}
  		} else {
  			// it's a kernel process
@@ -12599,18 +13717,18 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  	read_unlock(&tasklist_lock);
  	return 0;
  }
-@@ -1693,8 +2947,8 @@ gr_learn_resource(const struct task_stru
+@@ -1693,8 +3080,8 @@ gr_learn_resource(const struct task_stru
  		if (wanted > acl->res[res].rlim_max)
  			acl->res[res].rlim_max = res_add;
  
 -		security_learn(GR_LEARN_AUDIT_MSG, acl->device,
 -			       (unsigned long) acl->inode,
-+		security_learn(GR_LEARN_AUDIT_MSG, current->role->rolename,
-+			       current->role->roletype, acl->filename,
++		security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
++			       task->role->roletype, acl->filename,
  			       acl->res[res].rlim_cur, acl->res[res].rlim_max,
  			       "", (unsigned long) res);
  	}
-@@ -1712,7 +2966,8 @@ gr_handle_sysctl(const struct ctl_table 
+@@ -1712,7 +3099,8 @@ gr_handle_sysctl(const struct ctl_table 
  	struct proc_dir_entry *tmp;
  	struct nameidata nd;
  	const char *proc_sys = "/proc/sys";
@@ -12620,7 +13738,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  	unsigned short len = 0, pos = 0, depth = 0, i;
  	__u32 err = 0;
  	__u32 mode = 0;
-@@ -1762,9 +3017,8 @@ gr_handle_sysctl(const struct ctl_table 
+@@ -1762,9 +3150,8 @@ gr_handle_sysctl(const struct ctl_table 
  	if (err)
  		goto out;
  
@@ -12632,7 +13750,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  
  	if (unlikely((current->acl->mode & GR_LEARN) && ((err & mode) != mode))) {
  		__u32 new_mode = mode;
-@@ -1772,7 +3026,8 @@ gr_handle_sysctl(const struct ctl_table 
+@@ -1772,7 +3159,8 @@ gr_handle_sysctl(const struct ctl_table 
  		new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
  
  		err = new_mode;
@@ -12642,7 +13760,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  	} else if ((err & mode) != mode && !(err & GR_SUPPRESS)) {
  		security_alert(GR_SYSCTL_ACL_MSG, "denied", path,
  			       (mode & GR_READ) ? " reading" : "",
-@@ -1796,21 +3051,96 @@ gr_handle_sysctl(const struct ctl_table 
+@@ -1796,21 +3184,88 @@ gr_handle_sysctl(const struct ctl_table 
  #endif
  
  int
@@ -12700,14 +13818,6 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 +	if (unlikely(!(gr_status & GR_READY)))
 +		return 0;
 +
-+	if (task->acl->mode & GR_NOPTRACE) {
-+		security_alert(GR_PTRACE_ACL_MSG, task->exec_file ? 
-+			       gr_to_filename(task->exec_file->f_dentry, task->exec_file->f_vfsmnt)
-+			       : "(none)", task->comm, task->pid, 
-+			       DEFAULTSECARGS);
-+		return 1;
-+	}
-+
 +	read_lock(&tasklist_lock);
 +	while (tmp->pid > 0) {
 +		if (tmp == curtemp)
@@ -12743,7 +13853,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  	if (retmode & GR_PTRACERD) {
  		switch (request) {
  		case PTRACE_POKETEXT:
-@@ -1831,12 +3161,12 @@ gr_handle_ptrace(struct task_struct *tas
+@@ -1831,41 +3286,11 @@ gr_handle_ptrace(struct task_struct *tas
  			return 0;
  		}
  	} else if (!(current->acl->mode & GR_OVERRIDE) &&
@@ -12751,20 +13861,18 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 -						   (current->acl != root_label
 -						    && current->pid !=
 -						    task->pid))) {
-+		   !(current->role->roletype & GR_ROLE_GOD)
-+		   && (current->acl != task->acl
-+		       || (current->acl != current->role->root_label
-+			   && current->pid != task->pid))) {
++		   !(current->role->roletype & GR_ROLE_GOD) &&
++		   (current->acl != task->acl)) {
  		security_alert(GR_PTRACE_ACL_MSG,
 -			       gr_to_filename(filp->f_dentry, filp->f_vfsmnt),
-+			       gr_to_filename(task->exec_file->f_dentry, task->exec_file->f_vfsmnt),
- 			       task->comm, task->pid, DEFAULTSECARGS);
- 		return 1;
- 	}
-@@ -1845,54 +3175,22 @@ gr_handle_ptrace(struct task_struct *tas
- }
- 
- int
+-			       task->comm, task->pid, DEFAULTSECARGS);
+-		return 1;
+-	}
+-
+-	return 0;
+-}
+-
+-int
 -gr_handle_ptrace_exec(const struct dentry *dentry, const struct vfsmount *mnt)
 -{
 -	__u32 retmode;
@@ -12786,13 +13894,13 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 -	    (current->acl != subj)) {
 -		security_alert(GR_PTRACE_EXEC_ACL_MSG,
 -			       gr_to_filename(dentry, mnt), DEFAULTSECARGS);
--		return 1;
--	}
--
--	return 0;
--}
--
--int
++			       gr_to_filename(task->exec_file->f_dentry, task->exec_file->f_vfsmnt),
++					      task->comm, task->pid, DEFAULTSECARGS);
+ 		return 1;
+ 	}
+ 
+@@ -1875,24 +3300,20 @@ gr_handle_ptrace_exec(const struct dentr
+ int
  gr_handle_mmap(const struct file *filp, const unsigned long prot)
  {
 -	struct file *exec_file;
@@ -12822,7 +13930,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  		security_alert(GR_WRITLIB_ACL_MSG,
  			       gr_to_filename(filp->f_dentry, filp->f_vfsmnt),
  			       DEFAULTSECARGS);
-@@ -1907,7 +3205,7 @@ gr_acl_handle_mmap(const struct file *fi
+@@ -1907,7 +3328,7 @@ gr_acl_handle_mmap(const struct file *fi
  {
  	__u32 mode;
  
@@ -12831,7 +13939,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  		return 1;
  
  	mode =
-@@ -1915,14 +3213,14 @@ gr_acl_handle_mmap(const struct file *fi
+@@ -1915,14 +3336,14 @@ gr_acl_handle_mmap(const struct file *fi
  			   GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
  			   file->f_vfsmnt);
  
@@ -12849,7 +13957,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  		security_audit(GR_MMAP_ACL_MSG, "successful",
  			       gr_to_filename(file->f_dentry, file->f_vfsmnt),
  			       DEFAULTSECARGS);
-@@ -1937,7 +3235,7 @@ gr_acl_handle_mprotect(const struct file
+@@ -1937,7 +3358,7 @@ gr_acl_handle_mprotect(const struct file
  {
  	__u32 mode;
  
@@ -12858,7 +13966,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  		return 1;
  
  	mode =
-@@ -1945,14 +3243,14 @@ gr_acl_handle_mprotect(const struct file
+@@ -1945,14 +3366,14 @@ gr_acl_handle_mprotect(const struct file
  			   GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
  			   file->f_vfsmnt);
  
@@ -12876,7 +13984,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  		security_audit(GR_MPROTECT_ACL_MSG, "successful",
  			       gr_to_filename(file->f_dentry, file->f_vfsmnt),
  			       DEFAULTSECARGS);
-@@ -1996,14 +3294,15 @@ gr_acl_handle_psacct(struct task_struct 
+@@ -1996,14 +3417,15 @@ gr_acl_handle_psacct(struct task_struct 
  	cputime -= cmin * 60;
  	csec = cputime;
  
@@ -12894,7 +14002,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  		       NIPQUAD(task->p_pptr->curr_ip),
  		       tty_name(task->p_pptr->tty, parent_tty),
  		       task->p_pptr->uid, task->p_pptr->euid, task->p_pptr->gid,
-@@ -2014,8 +3313,9 @@ gr_acl_handle_psacct(struct task_struct 
+@@ -2014,8 +3436,9 @@ gr_acl_handle_psacct(struct task_struct 
  
  void gr_set_kernel_label(struct task_struct *task)
  {
@@ -12907,10 +14015,10 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 +	}
  	return;
  }
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/gracl_cap.c linux-2.4.20-wolk4.15-grsec2/grsecurity/gracl_cap.c
---- linux-2.4.20-wolk4.15-fullkernel/grsecurity/gracl_cap.c	2004-06-29 11:24:38.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/grsecurity/gracl_cap.c	2004-06-29 13:00:19.000000000 +0200
-@@ -40,28 +40,47 @@ static const char *captab_log[29] = {
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/grsecurity/gracl_cap.c linux-2.4.20-wolk4.16-grsec2/grsecurity/gracl_cap.c
+--- linux-2.4.20-wolk4.16-fullkernel/grsecurity/gracl_cap.c	2004-09-05 15:48:18.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/grsecurity/gracl_cap.c	2004-09-05 17:07:52.000000000 +0200
+@@ -40,28 +40,48 @@ static const char *captab_log[29] = {
  };
  
  int
@@ -12931,7 +14039,8 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 +	cap_mask = curracl->cap_mask;
 +
 +	while ((curracl = curracl->parent_subject)) {
-+		cap_drop |= curracl->cap_lower & (cap_mask & ~curracl->cap_mask);
++		if (!(cap_mask & (1 << cap)) && (curracl->cap_mask & (1 << cap)))
++			cap_drop |= curracl->cap_lower & (1 << cap);
 +		cap_mask |= curracl->cap_mask;
 +	}
 +
@@ -12967,10 +14076,18 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  
  	return 0;
  }
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/gracl_fs.c linux-2.4.20-wolk4.15-grsec2/grsecurity/gracl_fs.c
---- linux-2.4.20-wolk4.15-fullkernel/grsecurity/gracl_fs.c	2004-06-29 11:24:38.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/grsecurity/gracl_fs.c	2004-06-29 13:00:27.000000000 +0200
-@@ -25,7 +25,8 @@ gr_acl_handle_hidden_file(const struct d
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/grsecurity/gracl_fs.c linux-2.4.20-wolk4.16-grsec2/grsecurity/gracl_fs.c
+--- linux-2.4.20-wolk4.16-fullkernel/grsecurity/gracl_fs.c	2004-09-05 15:48:18.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/grsecurity/gracl_fs.c	2004-09-05 17:07:52.000000000 +0200
+@@ -3,6 +3,7 @@
+ #include <linux/types.h>
+ #include <linux/fs.h>
+ #include <linux/file.h>
++#include <linux/stat.h>
+ #include <linux/grsecurity.h>
+ #include <linux/grinternal.h>
+ #include <linux/gracl.h>
+@@ -25,7 +26,8 @@ gr_acl_handle_hidden_file(const struct d
  		return mode;
  	} else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
  		security_alert(GR_HIDDEN_ACL_MSG, "denied",
@@ -12980,7 +14097,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  		return 0;
  	} else if (unlikely(!(mode & GR_FIND)))
  		return 0;
-@@ -43,11 +44,11 @@ gr_acl_handle_open(const struct dentry *
+@@ -43,11 +45,11 @@ gr_acl_handle_open(const struct dentry *
  	if (unlikely(!dentry->d_inode))
  		return reqmode;
  
@@ -12995,7 +14112,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  		reqmode |= GR_READ;
  
  	mode =
-@@ -80,22 +81,25 @@ gr_acl_handle_open(const struct dentry *
+@@ -80,22 +82,25 @@ gr_acl_handle_open(const struct dentry *
  __u32
  gr_acl_handle_creat(const struct dentry * dentry,
  		    const struct dentry * p_dentry,
@@ -13026,7 +14143,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  			       gr_to_filename(dentry, p_mnt),
  			       reqmode & GR_READ ? " reading" : "",
  			       reqmode & GR_WRITE ? " writing" :
-@@ -105,7 +109,7 @@ gr_acl_handle_creat(const struct dentry 
+@@ -105,7 +110,7 @@ gr_acl_handle_creat(const struct dentry 
  	} else
  	    if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
  	{
@@ -13035,7 +14152,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  			       gr_to_filename(dentry, p_mnt),
  			       reqmode & GR_READ ? " reading" : "",
  			       reqmode & GR_WRITE ? " writing" : reqmode &
-@@ -181,13 +185,13 @@ gr_acl_handle_access(const struct dentry
+@@ -181,13 +186,13 @@ gr_acl_handle_access(const struct dentry
  __u32
  gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
  {
@@ -13051,7 +14168,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  }
  
  __u32
-@@ -203,15 +207,27 @@ gr_acl_handle_utime(const struct dentry 
+@@ -203,15 +208,30 @@ gr_acl_handle_utime(const struct dentry 
  }
  
  __u32
@@ -13060,6 +14177,9 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 +		     mode_t mode)
  {
 -	generic_fs_handler(dentry, mnt, GR_WRITE, GR_FCHMOD_ACL_MSG);
++	if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode)))
++		return 1;
++
 +	if (unlikely((mode != (mode_t)-1) && (mode & (S_ISUID | S_ISGID)))) {
 +		generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
 +				   GR_FCHMOD_ACL_MSG);
@@ -13083,7 +14203,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  }
  
  __u32
-@@ -237,14 +253,14 @@ __u32
+@@ -237,14 +257,14 @@ __u32
  gr_acl_handle_filldir(const struct dentry *dentry, const struct vfsmount *mnt,
  		      const ino_t ino)
  {
@@ -13100,7 +14220,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  			return 0;
  	}
  
-@@ -258,26 +274,27 @@ gr_acl_handle_link(const struct dentry *
+@@ -258,26 +278,27 @@ gr_acl_handle_link(const struct dentry *
  		   const struct dentry * old_dentry,
  		   const struct vfsmount * old_mnt, const char *to)
  {
@@ -13132,7 +14252,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  }
  
  __u32
-@@ -285,26 +302,28 @@ gr_acl_handle_symlink(const struct dentr
+@@ -285,26 +306,28 @@ gr_acl_handle_symlink(const struct dentr
  		      const struct dentry * parent_dentry,
  		      const struct vfsmount * parent_mnt, const char *from)
  {
@@ -13165,7 +14285,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  }
  
  #define generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt, reqmode, fmt) \
-@@ -332,10 +351,15 @@ gr_acl_handle_symlink(const struct dentr
+@@ -332,10 +355,15 @@ gr_acl_handle_symlink(const struct dentr
  __u32
  gr_acl_handle_mknod(const struct dentry * new_dentry,
  		    const struct dentry * parent_dentry,
@@ -13183,7 +14303,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  }
  
  __u32
-@@ -344,7 +368,7 @@ gr_acl_handle_mkdir(const struct dentry 
+@@ -344,7 +372,7 @@ gr_acl_handle_mkdir(const struct dentry 
  		    const struct vfsmount *parent_mnt)
  {
  	generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
@@ -13192,7 +14312,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  }
  
  #define RENAME_CHECK_SUCCESS(old, new) \
-@@ -370,18 +394,22 @@ gr_acl_handle_rename(struct dentry *new_
+@@ -370,18 +398,22 @@ gr_acl_handle_rename(struct dentry *new_
  		gr_replace = 0;
  
  		comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
@@ -13217,7 +14337,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  				   GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
  	}
  
-@@ -411,17 +439,23 @@ gr_acl_handle_rename(struct dentry *new_
+@@ -411,17 +443,25 @@ gr_acl_handle_rename(struct dentry *new_
  void
  gr_acl_handle_exit(void)
  {
@@ -13226,6 +14346,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 -		id = current->acl_admin_id;
 +	u16 id;
 +	char *rolename;
++	struct file *exec_file;
 +
 +	if (unlikely(current->acl_sp_role && gr_acl_is_enabled())) {
 +		id = current->acl_role_id;
@@ -13236,18 +14357,23 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 +				    rolename, id, DEFAULTSECARGS);
  	}
  
-+	write_lock_irq(&grsec_exec_file_lock);
- 	if (current->exec_file) {
- 		fput(current->exec_file);
- 		current->exec_file = NULL;
- 	}
-+	write_unlock_irq(&grsec_exec_file_lock);
+-	if (current->exec_file) {
+-		fput(current->exec_file);
+-		current->exec_file = NULL;
+-	}
++	write_lock(&grsec_exec_file_lock);
++	exec_file = current->exec_file;
++	current->exec_file = NULL;
++	write_unlock(&grsec_exec_file_lock);
++
++	if (exec_file)
++		fput(exec_file);
  }
  
  int
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/gracl_ip.c linux-2.4.20-wolk4.15-grsec2/grsecurity/gracl_ip.c
---- linux-2.4.20-wolk4.15-fullkernel/grsecurity/gracl_ip.c	2004-06-29 11:30:54.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/grsecurity/gracl_ip.c	2004-06-29 13:00:19.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/grsecurity/gracl_ip.c linux-2.4.20-wolk4.16-grsec2/grsecurity/gracl_ip.c
+--- linux-2.4.20-wolk4.16-fullkernel/grsecurity/gracl_ip.c	2004-09-05 16:05:21.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/grsecurity/gracl_ip.c	2004-09-05 17:07:52.000000000 +0200
 @@ -25,6 +25,58 @@
  #define GR_BIND 	0x01
  #define GR_CONNECT 	0x02
@@ -13377,9 +14503,9 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  
  	return 0;
  }
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/gracl_learn.c linux-2.4.20-wolk4.15-grsec2/grsecurity/gracl_learn.c
---- linux-2.4.20-wolk4.15-fullkernel/grsecurity/gracl_learn.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.20-wolk4.15-grsec2/grsecurity/gracl_learn.c	2004-06-29 13:00:19.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/grsecurity/gracl_learn.c linux-2.4.20-wolk4.16-grsec2/grsecurity/gracl_learn.c
+--- linux-2.4.20-wolk4.16-fullkernel/grsecurity/gracl_learn.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.20-wolk4.16-grsec2/grsecurity/gracl_learn.c	2004-09-05 17:07:52.000000000 +0200
 @@ -0,0 +1,170 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -13551,9 +14677,9 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 +	release:	close_learn,
 +	poll:		poll_learn,
 +};
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/gracl_res.c linux-2.4.20-wolk4.15-grsec2/grsecurity/gracl_res.c
---- linux-2.4.20-wolk4.15-fullkernel/grsecurity/gracl_res.c	2004-06-29 11:31:05.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/grsecurity/gracl_res.c	2004-06-29 13:00:43.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/grsecurity/gracl_res.c linux-2.4.20-wolk4.16-grsec2/grsecurity/gracl_res.c
+--- linux-2.4.20-wolk4.16-fullkernel/grsecurity/gracl_res.c	2004-09-05 16:09:14.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/grsecurity/gracl_res.c	2004-09-05 17:07:53.000000000 +0200
 @@ -40,10 +40,15 @@ gr_log_resource(const struct task_struct
  		      (!gt && wanted >= task->rlim[res].rlim_cur)) &&
  		     task->rlim[res].rlim_cur != RLIM_INFINITY))
@@ -13573,9 +14699,9 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  
  	preempt_enable_no_resched();
  
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/gracl_segv.c linux-2.4.20-wolk4.15-grsec2/grsecurity/gracl_segv.c
---- linux-2.4.20-wolk4.15-fullkernel/grsecurity/gracl_segv.c	2004-06-29 11:24:38.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/grsecurity/gracl_segv.c	2004-06-29 13:00:19.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/grsecurity/gracl_segv.c linux-2.4.20-wolk4.16-grsec2/grsecurity/gracl_segv.c
+--- linux-2.4.20-wolk4.16-fullkernel/grsecurity/gracl_segv.c	2004-09-05 15:48:18.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/grsecurity/gracl_segv.c	2004-09-05 17:07:52.000000000 +0200
 @@ -27,8 +27,9 @@ static struct crash_uid *uid_set;
  static unsigned short uid_used;
  static rwlock_t gr_uid_lock = RW_LOCK_UNLOCKED;
@@ -13633,9 +14759,9 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  	read_unlock(&gr_inode_lock);
  
  	if (!curr || !(curr->resmask & (1 << GR_CRASH_RES)) ||
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_chroot.c linux-2.4.20-wolk4.15-grsec2/grsecurity/grsec_chroot.c
---- linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_chroot.c	2004-06-29 11:31:06.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/grsecurity/grsec_chroot.c	2004-06-29 13:00:27.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_chroot.c linux-2.4.20-wolk4.16-grsec2/grsecurity/grsec_chroot.c
+--- linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_chroot.c	2004-09-05 16:05:38.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/grsecurity/grsec_chroot.c	2004-09-05 17:07:53.000000000 +0200
 @@ -23,11 +23,17 @@ gr_handle_chroot_unix(const pid_t pid)
  
  	for (p = *htable; p && p->pid != pid; p = p->pidhash_next) ;
@@ -13927,10 +15053,10 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  	return 0;
  }
 +
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_disabled.c linux-2.4.20-wolk4.15-grsec2/grsecurity/grsec_disabled.c
---- linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_disabled.c	2004-06-29 11:31:05.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/grsecurity/grsec_disabled.c	2004-06-29 13:00:41.000000000 +0200
-@@ -10,13 +10,13 @@
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_disabled.c linux-2.4.20-wolk4.16-grsec2/grsecurity/grsec_disabled.c
+--- linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_disabled.c	2004-09-05 16:05:37.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/grsecurity/grsec_disabled.c	2004-09-05 17:07:53.000000000 +0200
+@@ -10,68 +10,82 @@
  #include <linux/kdev_t.h>
  #include <linux/net.h>
  #include <linux/in.h>
@@ -13938,15 +15064,21 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  #include <linux/ip.h>
 +#include <linux/skbuff.h>
  #include <linux/sysctl.h>
- #include <linux/grdefs.h>
  
++#ifdef CONFIG_GRKERNSEC_PAX_HAVE_ACL_FLAGS
++__inline__ void
++pax_set_flags(struct linux_binprm *bprm)
++{
++	return;
++}
++#endif
++
  #ifdef CONFIG_SYSCTL
 -__u32
 +__inline__ __u32
  gr_handle_sysctl(const struct ctl_table * table, const void *oldval, const void *newval)
  {
- 	__u32 mode = 0;
-@@ -29,56 +29,62 @@ gr_handle_sysctl(const struct ctl_table 
+ 	return 1;
  }
  #endif
  
@@ -14021,7 +15153,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  gr_check_protected_task(const struct task_struct *task)
  {
  	return 0;
-@@ -90,49 +96,49 @@ gr_copy_label(struct task_struct *tsk)
+@@ -83,49 +97,49 @@ gr_copy_label(struct task_struct *tsk)
  	return;
  }
  
@@ -14080,7 +15212,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
  		 struct dentry *old_dentry,
  		 struct dentry *new_dentry,
-@@ -141,123 +147,126 @@ gr_handle_rename(struct inode *old_dir, 
+@@ -134,123 +148,126 @@ gr_handle_rename(struct inode *old_dir, 
  	return 0;
  }
  
@@ -14230,7 +15362,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  gr_acl_handle_mkdir(const struct dentry * new_dentry,
  		    const struct dentry * parent_dentry,
  		    const struct vfsmount * parent_mnt)
-@@ -265,7 +274,7 @@ gr_acl_handle_mkdir(const struct dentry 
+@@ -258,7 +275,7 @@ gr_acl_handle_mkdir(const struct dentry 
  	return 1;
  }
  
@@ -14239,7 +15371,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  gr_acl_handle_symlink(const struct dentry * new_dentry,
  		      const struct dentry * parent_dentry,
  		      const struct vfsmount * parent_mnt, const char *from)
-@@ -273,7 +282,7 @@ gr_acl_handle_symlink(const struct dentr
+@@ -266,7 +283,7 @@ gr_acl_handle_symlink(const struct dentr
  	return 1;
  }
  
@@ -14248,7 +15380,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  gr_acl_handle_link(const struct dentry * new_dentry,
  		   const struct dentry * parent_dentry,
  		   const struct vfsmount * parent_mnt,
-@@ -283,7 +292,7 @@ gr_acl_handle_link(const struct dentry *
+@@ -276,7 +293,7 @@ gr_acl_handle_link(const struct dentry *
  	return 1;
  }
  
@@ -14257,7 +15389,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  gr_acl_handle_rename(const struct dentry *new_dentry,
  		     const struct dentry *parent_dentry,
  		     const struct vfsmount *parent_mnt,
-@@ -294,78 +303,98 @@ gr_acl_handle_rename(const struct dentry
+@@ -287,78 +304,98 @@ gr_acl_handle_rename(const struct dentry
  	return 1;
  }
  
@@ -14369,9 +15501,9 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 +	return 0;
 +}
 +
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_init.c linux-2.4.20-wolk4.15-grsec2/grsecurity/grsec_init.c
---- linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_init.c	2004-06-29 11:31:06.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/grsecurity/grsec_init.c	2004-06-29 13:00:43.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_init.c linux-2.4.20-wolk4.16-grsec2/grsecurity/grsec_init.c
+--- linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_init.c	2004-09-05 16:05:39.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/grsecurity/grsec_init.c	2004-09-05 17:07:53.000000000 +0200
 @@ -4,6 +4,7 @@
  #include <linux/smp_lock.h>
  #include <linux/gracl.h>
@@ -14380,7 +15512,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  
  int grsec_enable_link;
  int grsec_enable_dmesg;
-@@ -57,40 +58,53 @@ spinlock_t grsec_alert_lock = SPIN_LOCK_
+@@ -57,40 +58,42 @@ spinlock_t grsec_alert_lock = SPIN_LOCK_
  unsigned long grsec_alert_wtime = 0;
  unsigned long grsec_alert_fyet = 0;
  
@@ -14399,8 +15531,6 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 +extern struct gr_arg *gr_usermode;
 +extern unsigned char *gr_system_salt;
 +extern unsigned char *gr_system_sum;
-+extern struct task_struct **gr_conn_table;
-+extern const unsigned int gr_conn_table_size;
  
  void
  grsecurity_init(void)
@@ -14428,15 +15558,6 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 -
  	preempt_enable();
  
-+	/* create hash tables for ip tagging */
-+
-+	gr_conn_table = (struct task_struct **) vmalloc(gr_conn_table_size * sizeof(struct task_struct *));
-+	if (gr_conn_table == NULL) {
-+		panic("Unable to allocate grsecurity IP tagging table");
-+		return;
-+	}
-+	memset(gr_conn_table, 0, gr_conn_table_size * sizeof(struct task_struct *));
-+
  	/* allocate memory for authentication structure */
 -	gr_pwent = kmalloc(sizeof(struct admin_pw), GFP_KERNEL);
 -	if (gr_pwent == NULL) {
@@ -14452,9 +15573,9 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  
  #ifndef CONFIG_GRKERNSEC_SYSCTL
  	grsec_lock = 1;
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_link.c linux-2.4.20-wolk4.15-grsec2/grsecurity/grsec_link.c
---- linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_link.c	2004-06-29 11:24:38.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/grsecurity/grsec_link.c	2004-06-29 13:00:19.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_link.c linux-2.4.20-wolk4.16-grsec2/grsecurity/grsec_link.c
+--- linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_link.c	2004-09-05 15:48:18.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/grsecurity/grsec_link.c	2004-09-05 17:07:52.000000000 +0200
 @@ -13,8 +13,7 @@ gr_handle_follow_link(const struct inode
  	if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
  	    (parent->i_mode & S_ISVTX) && (parent->i_uid != inode->i_uid) &&
@@ -14465,22 +15586,34 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  			       inode->i_uid, inode->i_gid, DEFAULTSECARGS);
  		return -EACCES;
  	}
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_mem.c linux-2.4.20-wolk4.15-grsec2/grsecurity/grsec_mem.c
---- linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_mem.c	2004-06-29 11:30:54.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/grsecurity/grsec_mem.c	2004-06-29 13:00:19.000000000 +0200
-@@ -41,8 +41,7 @@ gr_handle_open_port(void)
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_mem.c linux-2.4.20-wolk4.16-grsec2/grsecurity/grsec_mem.c
+--- linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_mem.c	2004-09-05 16:05:21.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/grsecurity/grsec_mem.c	2004-09-05 17:07:52.000000000 +0200
+@@ -41,10 +41,17 @@ gr_handle_open_port(void)
  int
  gr_handle_mem_mmap(const unsigned long offset, struct vm_area_struct *vma)
  {
 -	if (offset < __pa(high_memory) &&
 -	    (pgprot_val(vma->vm_page_prot) & PROT_WRITE) &&
-+	if (offset < __pa(high_memory) && (vma->vm_flags & VM_WRITE) &&
- 	    !(offset == 0xf0000 && ((vma->vm_end - vma->vm_start) <= 0x10000)) &&
- 	    !(offset == 0xa0000 && ((vma->vm_end - vma->vm_start) <= 0x20000))) {
+-	    !(offset == 0xf0000 && ((vma->vm_end - vma->vm_start) <= 0x10000)) &&
+-	    !(offset == 0xa0000 && ((vma->vm_end - vma->vm_start) <= 0x20000))) {
++	if (offset + vma->vm_end - vma->vm_start <= offset) {
++		security_alert(GR_MEM_MMAP_MSG, DEFAULTSECARGS);
++		return -EPERM;
++	}
++
++	if (offset < __pa(high_memory) && (vma->vm_flags & VM_WRITE)
++#ifdef CONFIG_X86
++ 	    && !(offset == 0xf0000 && ((vma->vm_end - vma->vm_start) <= 0x10000))
++	    && !(offset == 0xa0000 && ((vma->vm_end - vma->vm_start) <= 0x20000))
++#endif
++	   ) {
  		security_alert(GR_MEM_MMAP_MSG, DEFAULTSECARGS);
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_sig.c linux-2.4.20-wolk4.15-grsec2/grsecurity/grsec_sig.c
---- linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_sig.c	2004-06-29 11:24:38.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/grsecurity/grsec_sig.c	2004-06-29 13:00:27.000000000 +0200
+ 		return -EPERM;
+ 	} else if (offset < __pa(high_memory))
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_sig.c linux-2.4.20-wolk4.16-grsec2/grsecurity/grsec_sig.c
+--- linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_sig.c	2004-09-05 15:48:18.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/grsecurity/grsec_sig.c	2004-09-05 17:07:52.000000000 +0200
 @@ -12,11 +12,14 @@ gr_log_signal(const int sig, const struc
  			security_alert_good(GR_UNISIGLOG_MSG, sig,
  					    DEFAULTSECARGS);
@@ -14500,13 +15633,15 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  		}
  	}
  #endif
-@@ -28,11 +31,15 @@ gr_handle_signal(const struct task_struc
+@@ -27,14 +30,43 @@ int
+ gr_handle_signal(const struct task_struct *p, const int sig)
  {
  #ifdef CONFIG_GRKERNSEC
- 	if (current->pid > 1 && gr_check_protected_task(p)) {
+-	if (current->pid > 1 && gr_check_protected_task(p)) {
 -		security_alert(GR_SIG_ACL_MSG, sig, p->comm, p->pid, p->uid,
 -			       p->euid, p->p_pptr->comm, p->p_pptr->pid,
 -			       p->p_pptr->uid, p->p_pptr->euid, DEFAULTSECARGS);
++	if (current->pid > 1 && sig != SIGCHLD && gr_check_protected_task(p)) {
 +		security_alert(GR_SIG_ACL_MSG, sig, gr_task_fullpath0(p),
 +			       p->comm, p->pid, p->uid,
 +			       p->euid, p->gid, p->egid,
@@ -14520,16 +15655,43 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  		return -EPERM;
  	}
  #endif
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_sock.c linux-2.4.20-wolk4.15-grsec2/grsecurity/grsec_sock.c
---- linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_sock.c	2004-06-29 11:30:54.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/grsecurity/grsec_sock.c	2004-06-29 13:00:19.000000000 +0200
+ 	return 0;
+ }
++
++void gr_handle_brute_attach(struct task_struct *p)
++{
++#ifdef CONFIG_GRKERNSEC_BRUTE
++	read_lock(&tasklist_lock);
++	read_lock(&grsec_exec_file_lock);
++	if (p->p_pptr && p->p_pptr->exec_file == p->exec_file)
++		p->p_pptr->brute = 1;
++	read_unlock(&grsec_exec_file_lock);
++	read_unlock(&tasklist_lock);
++#endif
++	return;
++}
++
++void gr_handle_brute_check(void)
++{
++#ifdef CONFIG_GRKERNSEC_BRUTE
++	if (current->brute) {
++		set_current_state(TASK_UNINTERRUPTIBLE);
++		schedule_timeout(30 * HZ);
++	}	
++#endif
++	return;
++}
++
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_sock.c linux-2.4.20-wolk4.16-grsec2/grsecurity/grsec_sock.c
+--- linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_sock.c	2004-09-05 16:05:22.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/grsecurity/grsec_sock.c	2004-09-05 17:07:53.000000000 +0200
 @@ -7,6 +7,114 @@
  #include <linux/grinternal.h>
  #include <linux/gracl.h>
  
 +#ifdef CONFIG_GRKERNSEC
-+struct task_struct **gr_conn_table;
-+const unsigned int gr_conn_table_size = 65521;
++#define gr_conn_table_size 65521
++struct task_struct *gr_conn_table[gr_conn_table_size];
 +struct task_struct *deleted_conn = (struct task_struct *)~0;
 +spinlock_t gr_conn_table_lock = SPIN_LOCK_UNLOCKED;
 +
@@ -14690,9 +15852,22 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  		return -EACCES;
  	}
  #endif
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_sysctl.c linux-2.4.20-wolk4.15-grsec2/grsecurity/grsec_sysctl.c
---- linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_sysctl.c	2004-06-29 11:24:38.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/grsecurity/grsec_sysctl.c	2004-06-29 13:00:19.000000000 +0200
+@@ -94,8 +191,11 @@ gr_cap_rtnetlink(void)
+ #ifdef CONFIG_GRKERNSEC
+ 	if (!gr_acl_is_enabled())
+ 		return current->cap_effective;
++	else if (cap_raised(current->cap_effective, CAP_NET_ADMIN) &&
++		 gr_task_is_capable(current, CAP_NET_ADMIN))
++		return current->cap_effective;
+ 	else
+-		return (current->cap_effective & ~(current->acl->cap_lower));
++		return 0;
+ #else
+ 	return current->cap_effective;
+ #endif
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_sysctl.c linux-2.4.20-wolk4.16-grsec2/grsecurity/grsec_sysctl.c
+--- linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_sysctl.c	2004-09-05 15:48:18.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/grsecurity/grsec_sysctl.c	2004-09-05 17:07:52.000000000 +0200
 @@ -6,9 +6,8 @@
  int
  gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
@@ -14705,9 +15880,9 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  		security_alert(GR_SYSCTL_MSG, name, DEFAULTSECARGS);
  		return -EACCES;
  	}
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_tpe.c linux-2.4.20-wolk4.15-grsec2/grsecurity/grsec_tpe.c
---- linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_tpe.c	2004-06-29 11:24:38.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/grsecurity/grsec_tpe.c	2004-06-29 13:00:19.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_tpe.c linux-2.4.20-wolk4.16-grsec2/grsecurity/grsec_tpe.c
+--- linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_tpe.c	2004-09-05 15:48:18.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/grsecurity/grsec_tpe.c	2004-09-05 17:07:52.000000000 +0200
 @@ -4,13 +4,15 @@
  #include <linux/fs.h>
  #include <linux/grinternal.h>
@@ -14726,9 +15901,9 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  	    (inode->i_uid || (!inode->i_uid && ((inode->i_mode & S_IWGRP) ||
  						(inode->i_mode & S_IWOTH))))) {
  		security_alert(GR_EXEC_TPE_MSG,
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsum.c linux-2.4.20-wolk4.15-grsec2/grsecurity/grsum.c
---- linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsum.c	2004-06-29 11:30:54.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/grsecurity/grsum.c	2004-06-29 13:00:19.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsum.c linux-2.4.20-wolk4.16-grsec2/grsecurity/grsum.c
+--- linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsum.c	2004-09-05 16:05:21.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/grsecurity/grsum.c	2004-09-05 17:07:52.000000000 +0200
 @@ -5,12 +5,13 @@
  #include <linux/crypto.h>
  #include <linux/gracl.h>
@@ -14772,9 +15947,9 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  	return retval;
  }
 -
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/asm-i386/pgtable.h linux-2.4.20-wolk4.15-grsec2/include/asm-i386/pgtable.h
---- linux-2.4.20-wolk4.15-fullkernel/include/asm-i386/pgtable.h	2004-06-29 11:31:02.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/include/asm-i386/pgtable.h	2004-06-29 13:00:30.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/include/asm-i386/pgtable.h linux-2.4.20-wolk4.16-grsec2/include/asm-i386/pgtable.h
+--- linux-2.4.20-wolk4.16-fullkernel/include/asm-i386/pgtable.h	2004-09-05 16:05:34.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/include/asm-i386/pgtable.h	2004-09-05 17:07:52.000000000 +0200
 @@ -21,12 +21,6 @@
  #include <asm/bitops.h>
  #endif
@@ -14819,10 +15994,10 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  #define __beep() asm("movb $0x3,%al; outb %al,$0x61")
  
  #define PMD_SIZE	(1UL << PMD_SHIFT)
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/gracl.h linux-2.4.20-wolk4.15-grsec2/include/linux/gracl.h
---- linux-2.4.20-wolk4.15-fullkernel/include/linux/gracl.h	2004-06-29 11:31:04.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/include/linux/gracl.h	2004-06-29 13:00:30.000000000 +0200
-@@ -1,28 +1,24 @@
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/include/linux/gracl.h linux-2.4.20-wolk4.16-grsec2/include/linux/gracl.h
+--- linux-2.4.20-wolk4.16-fullkernel/include/linux/gracl.h	2004-09-05 16:05:35.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/include/linux/gracl.h	2004-09-05 17:07:52.000000000 +0200
+@@ -1,28 +1,25 @@
  #ifndef GR_ACL_H
  #define GR_ACL_H
 -#endif
@@ -14842,6 +16017,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  
 -#define GR_VERSION  "grsecurity 1.9.15"
 +#define GR_VERSION  "grsecurity 2.0.1"
++#define GRSECURITY_VERSION 0x201
  
  enum {
  
@@ -14857,7 +16033,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  };
  
  /* Password setup definitions
-@@ -33,9 +29,14 @@ enum {
+@@ -33,9 +30,14 @@ enum {
  	GR_SHA_LEN = 32,
  };
  
@@ -14873,7 +16049,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  	unsigned char salt[GR_SALT_LEN];
  	unsigned char sum[GR_SHA_LEN];	/* 256-bit SHA hash of the password */
  };
-@@ -44,11 +45,12 @@ struct name_entry {
+@@ -44,11 +46,12 @@ struct name_entry {
  	ino_t inode;
  	kdev_t device;
  	char *name;
@@ -14889,7 +16065,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  };
  
  struct name_db {
-@@ -61,18 +63,34 @@ struct crash_uid {
+@@ -61,18 +64,34 @@ struct crash_uid {
  	unsigned long expires;
  };
  
@@ -14925,23 +16101,26 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  	__u32 ip_proto[8];
  	__u32 ip_type;
  	struct acl_ip_label **ips;
-@@ -81,7 +99,8 @@ struct acl_subject_label {
+@@ -81,8 +100,8 @@ struct acl_subject_label {
  	__u32 crashes;
  	unsigned long expires;
  
 -	struct acl_object_label *proc_object;
+-	struct acl_ip_label *ip_object;
 +	struct acl_subject_label *parent_subject;
 +	struct gr_hash_struct *hash;
- 	struct acl_ip_label *ip_object;
  	struct acl_subject_label *prev;
  	struct acl_subject_label *next;
-@@ -90,11 +109,50 @@ struct acl_subject_label {
+ 
+@@ -90,11 +109,51 @@ struct acl_subject_label {
  	__u32 obj_hash_size;
  };
  
 -struct user_acl_subject_db {
 -	struct acl_subject_label **s_table;
 -	__u32 s_entries;	/* Number of entries in table */
+-	__u32 i_entries;	/* total number of ip acls */
+-	__u32 o_entries;	/* Total number of object acls */
 +struct role_allowed_ip {
 +	__u32 addr;
 +	__u32 netmask;
@@ -14973,23 +16152,24 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 +
 +	struct role_transition *transitions;
 +	struct role_allowed_ip *allowed_ips;
++	uid_t *domain_children;
++	__u16 domain_child_num;
++
 +	struct acl_subject_label **subj_hash;
 +	__u32 subj_hash_size;
 +};
 +
 +struct user_acl_role_db {
 +	struct acl_role_label **r_table;
-+	__u32 r_entries;	/* number of entries in table */
-+	__u32 s_entries;	/* total number of subject acls */
- 	__u32 i_entries;	/* total number of ip acls */
- 	__u32 o_entries;	/* Total number of object acls */
-+	__u32 g_entries;	/* total number of globbed objects */
-+	__u32 a_entries;	/* total number of allowed ips */
-+	__u32 t_entries;	/* total number of transitions */
++	__u32 num_pointers;		/* Number of allocations to track */
++	__u32 num_roles;		/* Number of roles */
++	__u32 num_domain_children;	/* Number of domain children */
++	__u32 num_subjects;		/* Number of subjects */
++	__u32 num_objects;		/* Number of objects */
  };
  
  struct acl_object_label {
-@@ -103,6 +161,9 @@ struct acl_object_label {
+@@ -103,6 +162,9 @@ struct acl_object_label {
  	kdev_t device;
  	__u32 mode;
  
@@ -14999,7 +16179,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  	/* next two structures not used */
  
  	struct acl_object_label *prev;
-@@ -124,15 +185,27 @@ struct acl_ip_label {
+@@ -124,15 +186,33 @@ struct acl_ip_label {
  };
  
  struct gr_arg {
@@ -15017,6 +16197,12 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  	__u16 mode;
 +};
  
++struct gr_arg_wrapper {
++	struct gr_arg *arg;
++	__u32 version;
++	__u32 size;
++};
++
 +struct subject_map {
 +	struct acl_subject_label *user;
 +	struct acl_subject_label *kernel;
@@ -15028,7 +16214,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  };
  
  /* End Data Structures Section */
-@@ -143,13 +216,27 @@ struct gr_arg {
+@@ -143,13 +223,27 @@ struct gr_arg {
     Shift/add algorithm with modulus of table size and an XOR*/
  
  static __inline__ unsigned long
@@ -15058,10 +16244,10 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  }
 +
 +#endif
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/grdefs.h linux-2.4.20-wolk4.15-grsec2/include/linux/grdefs.h
---- linux-2.4.20-wolk4.15-fullkernel/include/linux/grdefs.h	2004-06-29 11:24:39.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/include/linux/grdefs.h	2004-06-29 13:00:19.000000000 +0200
-@@ -10,6 +10,20 @@ enum {
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/include/linux/grdefs.h linux-2.4.20-wolk4.16-grsec2/include/linux/grdefs.h
+--- linux-2.4.20-wolk4.16-fullkernel/include/linux/grdefs.h	2004-09-05 15:48:20.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/include/linux/grdefs.h	2004-09-05 17:07:52.000000000 +0200
+@@ -10,6 +10,21 @@ enum {
  
  /* Begin  ACL declarations */
  
@@ -15076,13 +16262,14 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
 +	GR_ROLE_NOPW = 0x0020,
 +	GR_ROLE_GOD = 0x0040,
 +	GR_ROLE_LEARN = 0x0080,
-+	GR_ROLE_TPE = 0x0100
++	GR_ROLE_TPE = 0x0100,
++	GR_ROLE_DOMAIN = 0x0200
 +};
 +
  /* ACL Subject and Object mode flags */
  enum {
  	GR_DELETED = 0x00000080
-@@ -17,49 +31,68 @@ enum {
+@@ -17,49 +32,68 @@ enum {
  
  /* ACL Object-only mode flags */
  enum {
@@ -15186,9 +16373,9 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  };
  
  #define GR_CRASH_RES	11
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/grinternal.h linux-2.4.20-wolk4.15-grsec2/include/linux/grinternal.h
---- linux-2.4.20-wolk4.15-fullkernel/include/linux/grinternal.h	2004-06-29 11:31:05.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/include/linux/grinternal.h	2004-06-29 13:00:43.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/include/linux/grinternal.h linux-2.4.20-wolk4.16-grsec2/include/linux/grinternal.h
+--- linux-2.4.20-wolk4.16-fullkernel/include/linux/grinternal.h	2004-09-05 16:05:37.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/include/linux/grinternal.h	2004-09-05 17:07:53.000000000 +0200
 @@ -4,24 +4,34 @@
  #ifdef CONFIG_GRKERNSEC
  
@@ -15379,9 +16566,9 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  })
  
  #endif
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/grmsg.h linux-2.4.20-wolk4.15-grsec2/include/linux/grmsg.h
---- linux-2.4.20-wolk4.15-fullkernel/include/linux/grmsg.h	2004-06-29 11:31:05.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/include/linux/grmsg.h	2004-06-29 13:00:19.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/include/linux/grmsg.h linux-2.4.20-wolk4.16-grsec2/include/linux/grmsg.h
+--- linux-2.4.20-wolk4.16-fullkernel/include/linux/grmsg.h	2004-09-05 16:05:37.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/include/linux/grmsg.h	2004-09-05 17:07:53.000000000 +0200
 @@ -1,5 +1,5 @@
 -#define DEFAULTSECMSG "(%.16s:%d) UID(%d) EUID(%d), parent (%.16s:%d) UID(%d) EUID(%d)"
 -#define GR_ACL_PROCACCT_MSG "(%.16s:%d) IP:%u.%u.%u.%u TTY:%.64s UID(%d) EUID(%d) GID(%d) EGID(%d) run time:[%ud %uh %um %us] cpu time:[%ud %uh %um %us] %s with exit code %ld, parent (%.16s:%d) IP:%u.%u.%u.%u TTY:%.64s UID(%d) EUID(%d) GID(%d) EGID(%d)"
@@ -15462,19 +16649,17 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  #define GR_REMOUNT_AUDIT_MSG "remount of %.30s by " DEFAULTSECMSG
  #define GR_UNMOUNT_AUDIT_MSG "unmount of %.30s by " DEFAULTSECMSG
  #define GR_MOUNT_AUDIT_MSG "mount %.30s to %.64s by " DEFAULTSECMSG
-@@ -98,3 +106,4 @@
- #define GR_SHMR_AUDIT_MSG "shared memory of uid:%d euid:%d removed by " DEFAULTSECMSG
- #define GR_RESOURCE_MSG "attempted resource overstep by requesting %lu for %.16s against limit %lu by " DEFAULTSECMSG
- #define GR_TEXTREL_AUDIT_MSG "text relocation in %s, VMA:0x%08lx 0x%08lx by " DEFAULTSECMSG
-+#define GR_TEXTREL_AUDIT_MSG "text relocation in %s, VMA:0x%08lx 0x%08lx by " DEFAULTSECMSG
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/grsecurity.h linux-2.4.20-wolk4.15-grsec2/include/linux/grsecurity.h
---- linux-2.4.20-wolk4.15-fullkernel/include/linux/grsecurity.h	2004-06-29 11:31:06.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/include/linux/grsecurity.h	2004-06-29 13:00:30.000000000 +0200
-@@ -1,10 +1,16 @@
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/include/linux/grsecurity.h linux-2.4.20-wolk4.16-grsec2/include/linux/grsecurity.h
+--- linux-2.4.20-wolk4.16-fullkernel/include/linux/grsecurity.h	2004-09-05 16:05:39.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/include/linux/grsecurity.h	2004-09-05 17:07:53.000000000 +0200
+@@ -1,10 +1,19 @@
  #ifndef GR_SECURITY_H
  #define GR_SECURITY_H
  
 -extern int gr_pid_is_chrooted(const struct task_struct *p);
++extern void gr_handle_brute_attach(struct task_struct *p);
++extern void gr_handle_brute_check(void);
++
 +extern int gr_check_user_change(int real, int effective, int fs);
 +extern int gr_check_group_change(int real, int effective, int fs);
 +
@@ -15489,7 +16674,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  extern int gr_handle_chroot_setpriority(const struct task_struct *p,
  					const int niceval);
  extern int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
-@@ -22,6 +28,7 @@ extern int gr_handle_chroot_mount(const 
+@@ -22,6 +31,7 @@ extern int gr_handle_chroot_mount(const 
  extern int gr_handle_chroot_pivot(void);
  extern int gr_handle_chroot_unix(const pid_t pid);
  
@@ -15497,7 +16682,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  extern int gr_handle_nproc(void);
  
  extern void gr_handle_ioperm(void);
-@@ -63,7 +70,7 @@ extern int gr_handle_hardlink(const stru
+@@ -63,7 +73,7 @@ extern int gr_handle_hardlink(const stru
  			      struct inode *inode,
  			      const int mode, const char *to);
  
@@ -15506,7 +16691,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  extern void gr_learn_resource(const struct task_struct *task, const int limit,
  			      const unsigned long wanted, const int gt);
  extern void gr_copy_label(struct task_struct *tsk);
-@@ -71,7 +78,6 @@ extern void gr_handle_crash(struct task_
+@@ -71,7 +81,6 @@ extern void gr_handle_crash(struct task_
  extern int gr_handle_signal(const struct task_struct *p, const int sig);
  extern int gr_check_crash_uid(const uid_t uid);
  extern int gr_check_protected_task(const struct task_struct *task);
@@ -15514,7 +16699,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  extern int gr_acl_handle_mmap(const struct file *file,
  			      const unsigned long prot);
  extern int gr_acl_handle_mprotect(const struct file *file,
-@@ -84,20 +90,22 @@ extern __u32 gr_acl_handle_utime(const s
+@@ -84,20 +93,22 @@ extern __u32 gr_acl_handle_utime(const s
  extern __u32 gr_acl_handle_access(const struct dentry *dentry,
  				  const struct vfsmount *mnt, const int fmode);
  extern __u32 gr_acl_handle_fchmod(const struct dentry *dentry,
@@ -15542,7 +16727,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  			      const struct vfsmount *mnt);
  extern __u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
  				       const struct vfsmount *mnt);
-@@ -105,12 +113,14 @@ extern __u32 gr_acl_handle_open(const st
+@@ -105,12 +116,14 @@ extern __u32 gr_acl_handle_open(const st
  				const struct vfsmount *mnt, const int fmode);
  extern __u32 gr_acl_handle_creat(const struct dentry *dentry,
  				 const struct dentry *p_dentry,
@@ -15559,7 +16744,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  extern __u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
  				 const struct dentry *parent_dentry,
  				 const struct vfsmount *parent_mnt);
-@@ -128,17 +138,17 @@ extern __u32 gr_acl_handle_link(const st
+@@ -128,22 +141,21 @@ extern __u32 gr_acl_handle_link(const st
  				const struct vfsmount *parent_mnt,
  				const struct dentry *old_dentry,
  				const struct vfsmount *old_mnt, const char *to);
@@ -15582,10 +16767,15 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  extern __u32 gr_acl_handle_filldir(const struct dentry *dentry,
  				   const struct vfsmount *mnt, const ino_t ino);
  extern __u32 gr_acl_handle_unix(const struct dentry *dentry,
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/mm.h linux-2.4.20-wolk4.15-grsec2/include/linux/mm.h
---- linux-2.4.20-wolk4.15-fullkernel/include/linux/mm.h	2004-06-29 11:32:23.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/include/linux/mm.h	2004-06-29 13:00:30.000000000 +0200
-@@ -861,6 +861,11 @@ static inline int expand_stack(struct vm
+ 				const struct vfsmount *mnt);
+-extern void gr_set_pax_flags(struct task_struct *task);
+ extern void gr_acl_handle_exit(void);
+ extern void gr_acl_handle_psacct(struct task_struct *task, const long code);
+ extern int gr_acl_handle_procpidmem(const struct task_struct *task);
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/include/linux/mm.h linux-2.4.20-wolk4.16-grsec2/include/linux/mm.h
+--- linux-2.4.20-wolk4.16-fullkernel/include/linux/mm.h	2004-09-05 16:09:14.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/include/linux/mm.h	2004-09-05 17:07:52.000000000 +0200
+@@ -846,6 +846,11 @@ static inline int expand_stack(struct vm
  {
  	unsigned long grow;
  
@@ -15597,7 +16787,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  	/*
  	 * vma->vm_start/vm_end cannot change under us because the caller is required
  	 * to hold the mmap_sem in write mode. We need to get the spinlock only
-@@ -876,9 +881,6 @@ static inline int expand_stack(struct vm
+@@ -861,9 +866,6 @@ static inline int expand_stack(struct vm
  
  #if defined(CONFIG_GRKERNSEC_PAX_SEGMEXEC) || defined(CONFIG_GRKERNSEC_PAX_RANDEXEC)
  	if (vma->vm_flags & VM_MIRROR) {
@@ -15607,7 +16797,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  		address_m = vma->vm_start + (unsigned long)vma->vm_private_data;
  		vma_m = find_vma(vma->vm_mm, address_m);
  		if (!vma_m || vma_m->vm_start != address_m || !(vma_m->vm_flags & VM_MIRROR) ||
-@@ -897,12 +899,6 @@ static inline int expand_stack(struct vm
+@@ -882,12 +884,6 @@ static inline int expand_stack(struct vm
  			spin_unlock(&vma->vm_mm->page_table_lock);
  			return -ENOMEM;
  		}
@@ -15620,7 +16810,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  	} else
  #endif
  
-@@ -919,6 +915,17 @@ static inline int expand_stack(struct vm
+@@ -904,6 +900,17 @@ static inline int expand_stack(struct vm
  	vma->vm_mm->total_vm += grow;
  	if (vma->vm_flags & VM_LOCKED)
  		vma->vm_mm->locked_vm += grow;
@@ -15638,9 +16828,9 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  	spin_unlock(&vma->vm_mm->page_table_lock);
  	return 0;
  }
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/sched.h linux-2.4.20-wolk4.15-grsec2/include/linux/sched.h
---- linux-2.4.20-wolk4.15-fullkernel/include/linux/sched.h	2004-06-29 11:32:25.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/include/linux/sched.h	2004-06-29 13:00:27.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/include/linux/sched.h linux-2.4.20-wolk4.16-grsec2/include/linux/sched.h
+--- linux-2.4.20-wolk4.16-fullkernel/include/linux/sched.h	2004-09-05 16:08:59.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/include/linux/sched.h	2004-09-05 17:07:52.000000000 +0200
 @@ -29,8 +29,8 @@ extern unsigned long event;
  #include <linux/securebits.h>
  #include <linux/fs_struct.h>
@@ -15652,7 +16842,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  
  struct exec_domain;
  
-@@ -477,17 +477,18 @@ struct task_struct {
+@@ -478,17 +478,19 @@ struct task_struct {
  
  /* added by grsecurity's ACL system */
  #ifdef CONFIG_GRKERNSEC
@@ -15673,10 +16863,11 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  	u8 used_accept:1;
 -	u8 used_connect:1;
 +	u8 is_writable:1;
++	u8 brute:1;
  #endif
  
  /* TASK_UNMAPPED_BASE value */
-@@ -854,7 +855,7 @@ static inline int fsuser(void)
+@@ -861,7 +863,7 @@ static inline int fsuser(void)
  static inline int capable(int cap)
  {
  #if 1 /* ok now */
@@ -15685,9 +16876,9 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  #else
  	if (cap_is_fs_cap(cap) ? current->fsuid == 0 : current->euid == 0)
  #endif
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/init/main.c linux-2.4.20-wolk4.15-grsec2/init/main.c
---- linux-2.4.20-wolk4.15-fullkernel/init/main.c	2004-06-29 11:31:45.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/init/main.c	2004-06-29 13:00:34.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/init/main.c linux-2.4.20-wolk4.16-grsec2/init/main.c
+--- linux-2.4.20-wolk4.16-fullkernel/init/main.c	2004-09-05 16:08:23.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/init/main.c	2004-09-05 17:07:53.000000000 +0200
 @@ -612,7 +612,7 @@ asmlinkage void __init start_kernel(void
  	 *	We want to tell the user if we are using grsecurity or not.
  	 */
@@ -15697,9 +16888,9 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  	#endif
  
  
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/kernel/exit.c linux-2.4.20-wolk4.15-grsec2/kernel/exit.c
---- linux-2.4.20-wolk4.15-fullkernel/kernel/exit.c	2004-06-29 11:31:44.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/kernel/exit.c	2004-06-29 13:00:27.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/kernel/exit.c linux-2.4.20-wolk4.16-grsec2/kernel/exit.c
+--- linux-2.4.20-wolk4.16-fullkernel/kernel/exit.c	2004-09-05 16:08:20.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/kernel/exit.c	2004-09-05 17:07:52.000000000 +0200
 @@ -7,6 +7,7 @@
  #include <linux/config.h>
  #include <linux/slab.h>
@@ -15754,10 +16945,22 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  
  #ifdef CONFIG_SYSTRACE
  	systrace_exit(tsk);
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/kernel/ksyms.c linux-2.4.20-wolk4.15-grsec2/kernel/ksyms.c
---- linux-2.4.20-wolk4.15-fullkernel/kernel/ksyms.c	2004-06-29 11:32:00.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/kernel/ksyms.c	2004-06-29 13:00:19.000000000 +0200
-@@ -700,7 +700,7 @@ EXPORT_SYMBOL(kdb_usb_infos);
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/kernel/fork.c linux-2.4.20-wolk4.16-grsec2/kernel/fork.c
+--- linux-2.4.20-wolk4.16-fullkernel/kernel/fork.c	2004-09-05 16:09:14.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/kernel/fork.c	2004-09-05 17:07:52.000000000 +0200
+@@ -799,6 +799,8 @@ int do_fork(unsigned long clone_flags, u
+           }
+         #endif
+ 
++	gr_handle_brute_check();
++
+ 	retval = -ENOMEM;
+ 	p = alloc_task_struct();
+ 	if (!p)
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/kernel/ksyms.c linux-2.4.20-wolk4.16-grsec2/kernel/ksyms.c
+--- linux-2.4.20-wolk4.16-fullkernel/kernel/ksyms.c	2004-09-05 16:08:47.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/kernel/ksyms.c	2004-09-05 17:07:52.000000000 +0200
+@@ -701,7 +701,7 @@ EXPORT_SYMBOL(kdb_usb_infos);
  #endif
  
  /* grsecurity */
@@ -15766,9 +16969,78 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  EXPORT_SYMBOL(gr_pid_is_chrooted);
  EXPORT_SYMBOL(gr_learn_resource);
  EXPORT_SYMBOL(gr_set_kernel_label);
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/kernel/sys.c linux-2.4.20-wolk4.15-grsec2/kernel/sys.c
---- linux-2.4.20-wolk4.15-fullkernel/kernel/sys.c	2004-06-29 11:31:22.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/kernel/sys.c	2004-06-29 13:00:27.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/kernel/signal.c linux-2.4.20-wolk4.16-grsec2/kernel/signal.c
+--- linux-2.4.20-wolk4.16-fullkernel/kernel/signal.c	2004-09-05 16:06:34.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/kernel/signal.c	2004-09-05 17:07:52.000000000 +0200
+@@ -369,7 +369,7 @@ int bad_signal(int sig, struct siginfo *
+ 	    && ((sig != SIGCONT) || (current->session != t->session))
+ 	    && (   (   (current->euid ^ t->suid) && (current->euid ^ t->uid)
+ 	    && (current->uid ^ t->suid) && (current->uid ^ t->uid)
+-	            && !capable(CAP_KILL)
++	            && !capable(CAP_KILL) && !gr_handle_signal(t, sig)
+ 	           )
+                 /* RSBAC */
+                 #ifdef CONFIG_RSBAC
+@@ -652,13 +652,9 @@ kill_pg_info(int sig, struct siginfo *in
+ 		read_lock(&tasklist_lock);
+ 		for_each_task(p) {
+ 			if (p->pgrp == pgrp && thread_group_leader(p)) {
+-				if (gr_handle_signal(p, sig))
+-					retval = -EPERM;
+-				else {
+-					int err = send_sig_info(sig, info, p);
+-					if (retval)
+-						retval = err;
+-				}
++				int err = send_sig_info(sig, info, p);
++				if (retval)
++					retval = err;
+ 			}
+ 		}
+ 		read_unlock(&tasklist_lock);
+@@ -709,10 +705,7 @@ kill_proc_info(int sig, struct siginfo *
+                        if (tg)
+                                p = tg;
+                 }
+-		if (gr_handle_signal(p, sig))
+-			error = -EPERM;
+-		else
+-			error = send_sig_info(sig, info, p);
++		error = send_sig_info(sig, info, p);
+ 	}
+ 	read_unlock(&tasklist_lock);
+ 	return error;
+@@ -737,14 +730,10 @@ static int kill_something_info(int sig, 
+ 		read_lock(&tasklist_lock);
+ 		for_each_task(p) {
+ 			if (p->pid > 1 && p != current && thread_group_leader(p)) {
+-				if (gr_handle_signal(p, sig))
+-					retval = -EPERM;
+-				else {
+-					int err = send_sig_info(sig, info, p);
+-					++count;
+-					if (err != -EPERM)
+-						retval = err;
+-				}
++				int err = send_sig_info(sig, info, p);
++				++count;
++				if (err != -EPERM)
++					retval = err;
+ 			}
+ 		}
+ 		read_unlock(&tasklist_lock);
+@@ -1092,7 +1081,7 @@ sys_tkill(int pid, int sig)
+        p = find_task_by_pid(pid);
+        error = -ESRCH;
+        if (p) {
+-               error = send_sig_info(sig, &info, p);
++              error = send_sig_info(sig, &info, p);
+        }
+        read_unlock(&tasklist_lock);
+        return error;
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/kernel/sys.c linux-2.4.20-wolk4.16-grsec2/kernel/sys.c
+--- linux-2.4.20-wolk4.16-fullkernel/kernel/sys.c	2004-09-05 16:06:21.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/kernel/sys.c	2004-09-05 17:07:52.000000000 +0200
 @@ -606,6 +606,10 @@ asmlinkage long sys_setregid(gid_t rgid,
  			return -EPERM;
  		}
@@ -15905,9 +17177,9 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  		if (!core_allow_setid && gid != old_fsgid)
  		{
  			current->mm->dumpable = 0;
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/kernel/sysctl.c linux-2.4.20-wolk4.15-grsec2/kernel/sysctl.c
---- linux-2.4.20-wolk4.15-fullkernel/kernel/sysctl.c	2004-06-29 11:31:55.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/kernel/sysctl.c	2004-06-29 13:00:43.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/kernel/sysctl.c linux-2.4.20-wolk4.16-grsec2/kernel/sysctl.c
+--- linux-2.4.20-wolk4.16-fullkernel/kernel/sysctl.c	2004-09-05 16:09:03.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/kernel/sysctl.c	2004-09-05 17:07:53.000000000 +0200
 @@ -52,8 +52,6 @@
  #include <linux/grsecurity.h>
  #include <linux/grinternal.h>
@@ -15969,19 +17241,20 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  		return -EACCES;
  	if (gr_handle_chroot_sysctl(op))
  		return -EACCES;
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/mm/memory.c linux-2.4.20-wolk4.15-grsec2/mm/memory.c
---- linux-2.4.20-wolk4.15-fullkernel/mm/memory.c	2004-06-29 11:32:25.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/mm/memory.c	2004-06-29 13:00:30.000000000 +0200
-@@ -1122,17 +1122,21 @@ static void pax_mirror_fault(struct mm_s
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/mm/memory.c linux-2.4.20-wolk4.16-grsec2/mm/memory.c
+--- linux-2.4.20-wolk4.16-fullkernel/mm/memory.c	2004-09-05 16:08:59.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/mm/memory.c	2004-09-05 17:07:53.000000000 +0200
+@@ -1129,17 +1129,22 @@ static void pax_mirror_fault(struct mm_s
  	if (pte_none(entry_m)) {
  		++mm->rss;
  	} else if (pte_present(entry_m)) {
 -		page_remove_rmap(pte_page(entry_m), pte_m);
 -		page_cache_release(pte_page(entry_m));
 +		page_m = pte_page(entry_m);
-+		if (!PageReserved(page_m))
++		if (!PageReserved(page_m)) {
++			page_remove_rmap(pte_page(entry_m), pte_m);
 +			page_cache_release(page_m);
-+		else
++		} else
 +			++mm->rss;
  	} else {
  		free_swap_and_cache(pte_to_swp_entry(entry_m));
@@ -15998,7 +17271,7 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  		entry_m = pte_mkdirty(pte_mkwrite(entry_m));
  	establish_pte(vma_m, address_m, pte_m, entry_m);  
  }                      
-@@ -1719,12 +1723,9 @@ int handle_mm_fault(struct mm_struct *mm
+@@ -1726,12 +1731,9 @@ int handle_mm_fault(struct mm_struct *mm
  		address_m = address + (unsigned long)vma->vm_private_data;
  		pgd_m = pgd_offset(mm, address_m);
  		pmd_m = pmd_alloc(mm, pgd_m, address_m);
@@ -16014,10 +17287,10 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  			spin_unlock(&mm->page_table_lock);
  			return -1;
  		}
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipv4/tcp_ipv4.c linux-2.4.20-wolk4.15-grsec2/net/ipv4/tcp_ipv4.c
---- linux-2.4.20-wolk4.15-fullkernel/net/ipv4/tcp_ipv4.c	2004-06-29 11:30:54.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/net/ipv4/tcp_ipv4.c	2004-06-29 13:00:19.000000000 +0200
-@@ -783,11 +783,12 @@ static int tcp_v4_hash_connect(struct so
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/net/ipv4/tcp_ipv4.c linux-2.4.20-wolk4.16-grsec2/net/ipv4/tcp_ipv4.c
+--- linux-2.4.20-wolk4.16-fullkernel/net/ipv4/tcp_ipv4.c	2004-09-05 16:09:36.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/net/ipv4/tcp_ipv4.c	2004-09-05 17:07:52.000000000 +0200
+@@ -780,11 +780,12 @@ static int tcp_v4_hash_connect(struct so
  		spin_unlock(&head->lock);
  
  #ifdef CONFIG_GRKERNSEC
@@ -16031,10 +17304,10 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  #endif
  
  		if (tw) {
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipv4/udp.c linux-2.4.20-wolk4.15-grsec2/net/ipv4/udp.c
---- linux-2.4.20-wolk4.15-fullkernel/net/ipv4/udp.c	2004-06-29 11:30:54.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/net/ipv4/udp.c	2004-06-29 13:00:19.000000000 +0200
-@@ -487,6 +487,7 @@ int udp_sendmsg(struct sock *sk, struct 
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/net/ipv4/udp.c linux-2.4.20-wolk4.16-grsec2/net/ipv4/udp.c
+--- linux-2.4.20-wolk4.16-fullkernel/net/ipv4/udp.c	2004-09-05 16:09:36.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/net/ipv4/udp.c	2004-09-05 17:07:52.000000000 +0200
+@@ -490,6 +490,7 @@ int udp_sendmsg(struct sock *sk, struct 
  		ufh.uh.dest = usin->sin_port;
  		if (ufh.uh.dest == 0)
  			return -EINVAL;
@@ -16042,9 +17315,9 @@ diff -Naurp linux-2.4.20-wolk4.15-fullke
  		if (!gr_search_udp_sendmsg(sk, usin))
  			return -EPERM;
  	} else {
-diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/unix/af_unix.c linux-2.4.20-wolk4.15-grsec2/net/unix/af_unix.c
---- linux-2.4.20-wolk4.15-fullkernel/net/unix/af_unix.c	2004-06-29 11:25:23.000000000 +0200
-+++ linux-2.4.20-wolk4.15-grsec2/net/unix/af_unix.c	2004-06-29 13:00:19.000000000 +0200
+diff -Naurp linux-2.4.20-wolk4.16-fullkernel/net/unix/af_unix.c linux-2.4.20-wolk4.16-grsec2/net/unix/af_unix.c
+--- linux-2.4.20-wolk4.16-fullkernel/net/unix/af_unix.c	2004-09-05 15:55:19.000000000 +0200
++++ linux-2.4.20-wolk4.16-grsec2/net/unix/af_unix.c	2004-09-05 17:07:52.000000000 +0200
 @@ -736,7 +736,7 @@ static int unix_bind(struct socket *sock
  		 */
  		mode = S_IFSOCK | (sock->inode->i_mode & ~current->fs->umask);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/CREDITS linux-2.4.20-wolk4.16-fullkernel/CREDITS
--- linux-2.4.20-wolk4.15-fullkernel/CREDITS	2004-06-29 11:31:21.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/CREDITS	2004-09-05 16:06:18.000000000 +0200
@@ -1337,8 +1337,10 @@ S: USA
 N: Marcel Holtmann
 E: marcel@holtmann.org
 W: http://www.holtmann.org
+D: Maintainer of the Linux Bluetooth Subsystem
 D: Author and maintainer of the various Bluetooth HCI drivers
 D: Author and maintainer of the CAPI message transport protocol driver
+D: Author and maintainer of the Bluetooth HID protocol driver
 D: Various other Bluetooth related patches, cleanups and fixes
 S: Germany
 
@@ -2596,6 +2598,7 @@ S: Australia
 N: Aristeu Sergio Rozanski Filho
 E: aris@conectiva.com.br
 D: Support for EtherExpress 10 ISA (i82595) in eepro driver
+D: User level driver support for input
 S: Conectiva S.A.
 S: R. Tocantins, 89 - Cristo Rei
 S: 80050-430 - Curitiba - Paraná
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/Changelog.rmap linux-2.4.20-wolk4.16-fullkernel/Changelog.rmap
--- linux-2.4.20-wolk4.15-fullkernel/Changelog.rmap	2004-06-29 11:24:33.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/Changelog.rmap	1970-01-01 01:00:00.000000000 +0100
@@ -1,279 +0,0 @@
-The eleventh maintenance release of the 15th version of the reverse
-mapping based VM is now available.
-This is an attempt at making a more robust and flexible VM
-subsystem, while cleaning up a lot of code at the same time.
-The patch is available from:
-
-           http://surriel.com/patches/2.4/2.4.22-rmap15l
-and        http://linuxvm.bkbits.net/
-
-
-My big TODO items for a next release are:
-  - 2.4-rmap is now in maintenance mode, let me know when something
-    needs fixing
-
-rmap 15l:
-  - merge hfsplus with rmap                               (Rene Herman)
-  - fix inode code ordering bug                           (Harald Hoyer)
-  - clean a tunable percentage of the inactive pages      (Larry Woodman)
-  - fix double-decrement inactive_clean_pages on SMP race (Martin Wilck)
-  - also clean pages on free shortage                     (me)
-rmap 15k:
-  - fix various SMP races                                 (Larry Woodman,
-                                                           Stephen Tweedie,
-                                                           me)
-  - make the per-cpu free lists work better               (me)
-  - make the OOM killer a bit less agressive              (me)
-  - fix page->flags corruption problem                    (Matt Domsch,
-    | should go upstream                                   Robert Hentosh)
-  - treat shared memory segment as anon for swapping      (me)
-  - backport various 2.6 optimisations and fixes          (me)
-  - a "can't happen" situation does happen, deal with it  (Stephen Tweedie,
-                                                           Larry Woodman)
-  - shrink kiobuf slab when reclaiming buffer heads       (Arjan van de Ven)
-  - deal with a non-zero highmem zone that's all IO space (Larry Woodman)
-  - only reclaim buffer heads / mapped inodes when lots   (me)
-  - make O(1) page launder work as advertised             (me)
-  - fix potential loop in inode pruning                   (Ernie Petrides)
-rmap 15j:
-  - agressive inode reclaim on highmem boxes              (me)
-  - OOM killer tweaks, hopefully better now               (me)
-  - better higher-order page allocations                  (me)
-  - small updates and tweaks
-rmap 15i:
-  - drop behind only drops really new pages               (Arjan van de Ven)
-  - lots of VM tuning left and right                      (Arjan, Ingo, me)
-rmap 15h:
-  - fix obscure SMP race                                  (Ben LaHaise, me)
-  - fix smp races with bufferhead reclaim                 (Andrew Morton, me)
-  - architecture updates                                  (various)
-  - add barrier to page_unlock_rmap                       (Pete Zaitcev)
-rmap 15g:
-  - more ppc64 pte-highmem stuff                          (Julie DeWandel)
-  - hammer pte-highmem stuff                              (Jim Paradis)
-  - reclaim buffer heads under memory pressure            (me)
-rmap 15f:
-  - remove pte-highmem compat define from ieee1394        (Marc-C. Petersen)
-  - clean up scan_active_list after suggestion from hch   (me)
-  - lock ordering fix                                     (me)
-  - add barrier() to page_chain_lock()                    (Pete Zaitcev)
-  - fix pte-highmem defines for ppc64                     (Julie DeWandel)
-  - add pte-highmem defines for s390 & s390x              (Pete Zaitcev)
-rmap 15e:
-  - make reclaiming unused inodes more efficient          (Arjan van de Ven)
-    | push to Marcelo and Andrew once it's well tested !
-  - fix DRM memory leak                                   (Arjan van de Ven)
-  - fix potential infinite loop in kswapd                 (me)
-  - clean up elevator.h (no IO scheduler in -rmap...)     (me)
-  - page aging interval tuned on a per zone basis, better
-    wakeup mechanism for sudden memory pressure           (Arjan, me)
-rmap 15d:
-  - compatability with PREEMPT patch                      (me)
-    | fairly ugly, but should work
-  - bugfix for the pte_chain allocation code              (Arjan van de Ven)
-rmap 15c:
-  - backport and audit akpm's reliable pte_chain alloc
-    code from 2.5                                         (me)
-  - reintroduce cache size tuning knobs in /proc          (me)
-    | on very, very popular request
-rmap 15b:
-  - adjust anon/cache work table                          (me)
-  - make active_age_bias a per-active list thing          (me)
-  - don't wake up kswapd early from mark_page_accessed    (me)
-  - make sure pte-chains are cacheline aligned with PAE   (me, Andrew Morton)
-  - change some O(1) VM thresholds                        (me)
-  - fix pte-highmem backport                              (me)
-  - 2.5 backport: pte-highmem                             (Ben LaHaise)
-  - 2.5 backport: large cacheline aligned pte-chains      (Ben LaHaise)
-  - 2.5 backport: direct pte pointers                     (Ben LaHaise)
-  - undo __find_pagecache_page braindamage                (Christoph Hellwig)
-rmap 15a:
-  - more agressive freeing for higher order allocations   (me)
-  - export __find_pagecache_page, find_get_page define    (me, Christoph, Arjan)
-  - make memory statistics SMP safe again                 (me)
-  - make page aging slow down again when needed           (Andrew Morton)
-  - first stab at fine-tuning arjan's O(1) VM             (me)
-  - split active list in cache / working set              (me)
-  - fix SMP locking in arjan's O(1) VM                    (me)
-rmap 15:
-  - small code cleanups and spelling fixes for O(1) VM    (me)
-  - O(1) page launder, O(1) page aging                    (Arjan van de Ven)
-  - resync code with -ac (12 small patches)               (me)
-rmap 14c:
-  - fold page_over_rsslimit() into page_referenced()      (me)
-  - 2.5 backport: get pte_chains from the slab cache      (William Lee Irwin)
-  - remove dead code from page_launder_zone()             (me)
-  - make OOM detection a bit more agressive               (me)
-rmap 14b:
-  - don't unmap pages not in pagecache (ext3 & reiser)    (Andrew Morton, me)
-  - clean up mark_page_accessed a bit                     (me)
-  - Alpha NUMA fix for Ingo's per-cpu pages               (Flávio Leitner, me)
-  - remove explicit low latency schedule zap_page_range   (Robert Love)
-  - fix OOM stuff for good, hopefully                     (me)
-rmap 14a:
-  - Ingo Molnar's per-cpu pages (SMP speedup)             (Christoph Hellwig)
-  - fix SMP bug in page_launder_zone (rmap14 only)        (Arjan van de Ven) 
-  - semicolon day, fix typo in rmap.c w/ DEBUG_RMAP       (Craig Kulesa)
-  - remove unneeded pte_chain_unlock/lock pair vmscan.c   (Craig Kulesa)
-  - low latency zap_page_range also without preempt       (Arjan van de Ven)
-  - do some throughput tuning for kswapd/page_launder     (me)
-  - don't allocate swap space for pages we're not writing (me)
-rmap 14:
-  - get rid of stalls during swapping, hopefully          (me)
-  - low latency zap_page_range                            (Robert Love)
-rmap 13c:
-  - add wmb() to wakeup_memwaiters                        (Arjan van de Ven)
-  - remap_pmd_range now calls pte_alloc with full address (Paul Mackerras)
-  - #ifdef out pte_chain_lock/unlock on UP machines       (Andrew Morton)
-  - un-BUG() truncate_complete_page, the race is expected (Andrew Morton, me)
-  - remove NUMA changes from rmap13a                      (Christoph Hellwig)
-rmap 13b:
-  - prevent PF_MEMALLOC recursion for higher order allocs (Arjan van de Ven, me)
-  - fix small SMP race, PG_lru                            (Hugh Dickins)
-rmap 13a:
-  - NUMA changes for page_address                         (Samuel Ortiz)
-  - replace vm.freepages with simpler kswapd_minfree      (Christoph Hellwig)
-rmap 13:
-  - rename touch_page to mark_page_accessed and uninline  (Christoph Hellwig)
-  - NUMA bugfix for __alloc_pages                         (William Irwin)
-  - kill __find_page                                      (Christoph Hellwig)
-  - make pte_chain_freelist per zone                      (William Irwin)
-  - protect pte_chains by per-page lock bit               (William Irwin)
-  - minor code cleanups                                   (me)
-rmap 12i:
-  - slab cleanup                                          (Christoph Hellwig)
-  - remove references to compiler.h from mm/*             (me)
-  - move rmap to marcelo's bk tree                        (me)
-  - minor cleanups                                        (me)
-rmap 12h:
-  - hopefully fix OOM detection algorithm                 (me)
-  - drop pte quicklist in anticipation of pte-highmem     (me)
-  - replace andrea's highmem emulation by ingo's one      (me)
-  - improve rss limit checking                            (Nick Piggin)
-rmap 12g:
-  - port to armv architecture                             (David Woodhouse)
-  - NUMA fix to zone_table initialisation                 (Samuel Ortiz)
-  - remove init_page_count                                (David Miller)
-rmap 12f:
-  - for_each_pgdat macro                                  (William Lee Irwin)
-  - put back EXPORT(__find_get_page) for modular rd       (me)
-  - make bdflush and kswapd actually start queued disk IO (me)
-rmap 12e
-  - RSS limit fix, the limit can be 0 for some reason     (me)
-  - clean up for_each_zone define to not need pgdata_t    (William Lee Irwin)
-  - fix i810_dma bug introduced with page->wait removal   (William Lee Irwin)
-rmap 12d:
-  - fix compiler warning in rmap.c                        (Roger Larsson)
-  - read latency improvement   (read-latency2)            (Andrew Morton)
-rmap 12c:
-  - fix small balancing bug in page_launder_zone          (Nick Piggin)
-  - wakeup_kswapd / wakeup_memwaiters code fix            (Arjan van de Ven)
-  - improve RSS limit enforcement                         (me)
-rmap 12b:
-  - highmem emulation (for debugging purposes)            (Andrea Arcangeli)
-  - ulimit RSS enforcement when memory gets tight         (me)
-  - sparc64 page->virtual quickfix                        (Greg Procunier)
-rmap 12a:
-  - fix the compile warning in buffer.c                   (me)
-  - fix divide-by-zero on highmem initialisation  DOH!    (me)
-  - remove the pgd quicklist (suspicious ...)             (DaveM, me)
-rmap 12:
-  - keep some extra free memory on large machines         (Arjan van de Ven, me)
-  - higher-order allocation bugfix                        (Adrian Drzewiecki)
-  - nr_free_buffer_pages() returns inactive + free mem    (me)
-  - pages from unused objects directly to inactive_clean  (me)
-  - use fast pte quicklists on non-pae machines           (Andrea Arcangeli)
-  - remove sleep_on from wakeup_kswapd                    (Arjan van de Ven)
-  - page waitqueue cleanup                                (Christoph Hellwig)
-rmap 11c:
-  - oom_kill race locking fix                             (Andres Salomon)
-  - elevator improvement                                  (Andrew Morton)
-  - dirty buffer writeout speedup (hopefully ;))          (me)
-  - small documentation updates                           (me)
-  - page_launder() never does synchronous IO, kswapd
-    and the processes calling it sleep on higher level    (me)
-  - deadlock fix in touch_page()                          (me)
-rmap 11b:
-  - added low latency reschedule points in vmscan.c       (me)
-  - make i810_dma.c include mm_inline.h too               (William Lee Irwin)
-  - wake up kswapd sleeper tasks on OOM kill so the
-    killed task can continue on its way out               (me)
-  - tune page allocation sleep point a little             (me)
-rmap 11a:
-  - don't let refill_inactive() progress count for OOM    (me)
-  - after an OOM kill, wait 5 seconds for the next kill   (me)
-  - agpgart_be fix for hashed waitqueues                  (William Lee Irwin)
-rmap 11:
-  - fix stupid logic inversion bug in wakeup_kswapd()     (Andrew Morton)
-  - fix it again in the morning                           (me)
-  - add #ifdef BROKEN_PPC_PTE_ALLOC_ONE to rmap.h, it
-    seems PPC calls pte_alloc() before mem_map[] init     (me)
-  - disable the debugging code in rmap.c ... the code
-    is working and people are running benchmarks          (me)
-  - let the slab cache shrink functions return a value
-    to help prevent early OOM killing                     (Ed Tomlinson)
-  - also, don't call the OOM code if we have enough
-    free pages                                            (me)
-  - move the call to lru_cache_del into __free_pages_ok   (Ben LaHaise)
-  - replace the per-page waitqueue with a hashed
-    waitqueue, reduces size of struct page from 64
-    bytes to 52 bytes (48 bytes on non-highmem machines)  (William Lee Irwin)
-rmap 10:
-  - fix the livelock for real (yeah right), turned out
-    to be a stupid bug in page_launder_zone()             (me)
-  - to make sure the VM subsystem doesn't monopolise
-    the CPU, let kswapd and some apps sleep a bit under
-    heavy stress situations                               (me)
-  - let __GFP_HIGH allocations dig a little bit deeper
-    into the free page pool, the SCSI layer seems fragile (me)
-rmap 9:
-  - improve comments all over the place                   (Michael Cohen)
-  - don't panic if page_remove_rmap() cannot find the
-    rmap in question, it's possible that the memory was
-    PG_reserved and belonging to a driver, but the driver
-    exited and cleared the PG_reserved bit                (me)
-  - fix the VM livelock by replacing > by >= in a few
-    critical places in the pageout code                   (me)
-  - treat the reclaiming of an inactive_clean page like
-    allocating a new page, calling try_to_free_pages()
-    and/or fixup_freespace() if required                  (me)
-  - when low on memory, don't make things worse by
-    doing swapin_readahead                                (me)
-rmap 8:
-  - add ANY_ZONE to the balancing functions to improve
-    kswapd's balancing a bit                              (me)
-  - regularize some of the maximum loop bounds in
-    vmscan.c for cosmetic purposes                        (William Lee Irwin)
-  - move page_address() to architecture-independent
-    code, now the removal of page->virtual is portable    (William Lee Irwin)
-  - speed up free_area_init_core() by doing a single
-    pass over the pages and not using atomic ops          (William Lee Irwin)
-  - documented the buddy allocator in page_alloc.c        (William Lee Irwin)
-rmap 7:
-  - clean up and document vmscan.c                        (me)
-  - reduce size of page struct, part one                  (William Lee Irwin)
-  - add rmap.h for other archs (untested, not for ARM)    (me)
-rmap 6:
-  - make the active and inactive_dirty list per zone,
-    this is finally possible because we can free pages
-    based on their physical address                       (William Lee Irwin)
-  - cleaned up William's code a bit                       (me)
-  - turn some defines into inlines and move those to
-    mm_inline.h (the includes are a mess ...)             (me)
-  - improve the VM balancing a bit                        (me)
-  - add back inactive_target to /proc/meminfo             (me)
-rmap 5:
-  - fixed recursive buglet, introduced by directly
-    editing the patch for making rmap 4 ;)))              (me)
-rmap 4:
-  - look at the referenced bits in page tables            (me)
-rmap 3:
-  - forgot one FASTCALL definition                        (me)
-rmap 2:
-  - teach try_to_unmap_one() about mremap()               (me)
-  - don't assign swap space to pages with buffers         (me)
-  - make the rmap.c functions FASTCALL / inline           (me)
-rmap 1:
-  - fix the swap leak in rmap 0                           (Dave McCracken)
-rmap 0:
-  - port of reverse mapping VM to 2.4.16                  (me)
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/Documentation/Configure.help linux-2.4.20-wolk4.16-fullkernel/Documentation/Configure.help
--- linux-2.4.20-wolk4.15-fullkernel/Documentation/Configure.help	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/Documentation/Configure.help	2004-09-09 13:21:58.000000000 +0200
@@ -1601,7 +1601,7 @@ CONFIG_X86_UP_APIC
   here: the local APIC will be used automatically.
 
 Do not report APIC errors on CPU(s)
-CONFIG_X86_UP_APIC_ERRORS
+CONFIG_X86_FUCK_DIFFERENT_NAMINGS_BC_XCONFIG_IS_FUCKED_ERRORS
   If you see annoying messages in your dmesg|syslog like:
 
     kernel: APIC error on CPU0: 08(00)
@@ -1913,6 +1913,10 @@ CONFIG_05GB
 
   Select "1GB" otherwise Win4Lin and valgrind won't work!
 
+  Select "1GB.REAL" to allocate even the last 128MB of RAM which
+  are normally mapped as high, but with this option mapped as low
+  without the need for enabling high memory support.
+
   You can't select anything but 1GB here if you said Y to
   Segmentation based non-executable pages (CONFIG_GRKERNSEC_PAX_SEGMEXEC)
 
@@ -2200,6 +2204,16 @@ CONFIG_BLK_DEV_LOOP_AES
   If you want to use AES encryption algorithm to encrypt loop devices,
   say Y here. If you don't know what to do here, say N.
 
+loop encryption key scrubbing support
+CONFIG_BLK_DEV_LOOP_KEYSCRUB
+  Loop encryption key scrubbing moves and inverts key bits in
+  kernel RAM so that the thin oxide which forms the storage
+  capacitor dielectric of DRAM cells is not permitted to develop
+  detectable property. For more info, see Peter Gutmann's paper:
+  http://www.cs.auckland.ac.nz/~pgut001/pubs/secure_del.html
+
+  Paranoid tinfoil hat crowd say Y here, everyone else say N.
+
 ATA/IDE/MFM/RLL support
 CONFIG_IDE
   If you say Y here, your kernel will be able to manage low cost mass
@@ -2983,7 +2997,7 @@ CONFIG_PIIX_TUNING
 
   If unsure, say N.
 
-PROMISE PDC20246/PDC20262/PDC20265/PDC20267 support
+Promise PDC202{46|62|65|67} support
 CONFIG_BLK_DEV_PDC202XX_OLD
   Promise Ultra 33 [PDC20246]
   Promise Ultra 66 [PDC20262]
@@ -2992,14 +3006,13 @@ CONFIG_BLK_DEV_PDC202XX_OLD
   Promise Ultra 100 [PDC20267]
 
   This driver adds up to 4 more EIDE devices sharing a single
-  interrupt. This device is a bootable PCI UDMA controller. Since
+  interrupt. This add-on card is a bootable PCI UDMA controller. Since
   multiple cards can be installed and there are BIOS ROM problems that
-  happen if the BIOS revisions of all installed cards (max of three) do
+  happen if the BIOS revisions of all installed cards (three-max) do
   not match, the driver attempts to do dynamic tuning of the chipset
-  at boot-time for max speed.  Ultra33 BIOS 1.25 or newer is required
+  at boot-time for max-speed.  Ultra33 BIOS 1.25 or newer is required
   for more than one card. This card may require that you say Y to
-  "Special UDMA Feature" to force UDMA mode for connected UDMA capable
-  disk drives.
+  "Force (U)DMA burst transfers" (old name: "Special UDMA Feature").
 
   If you say Y here, you need to say Y to "Use DMA by default when
   available" as well.
@@ -3009,7 +3022,7 @@ CONFIG_BLK_DEV_PDC202XX_OLD
 
   If unsure, say N.
 
-PROMISE PDC202{68|69|70|71|75|76|77} support
+Promise PDC202{68|69|70|71|75|76|77} support
 CONFIG_BLK_DEV_PDC202XX_NEW
   Promise Ultra 100 TX2 [PDC20268]
   Promise Ultra 133 PTX2 [PDC20269]
@@ -3024,42 +3037,39 @@ CONFIG_BLK_DEV_PDC202XX_NEW
   multiple cards can be installed and there are BIOS ROM problems that
   happen if the BIOS revisions of all installed cards (max of five) do
   not match, the driver attempts to do dynamic tuning of the chipset
-  at boot-time for max speed.  Ultra33 BIOS 1.25 or newer is required
-  for more than one card. 
+  at boot-time for max speed. 
 
   If you say Y here, you need to say Y to "Use DMA by default when
   available" as well.
-
+  
   If unsure, say N.
-
-Override-Enable UDMA for Promise Controllers
+  
+Force (U)DMA burst transfers
 CONFIG_PDC202XX_BURST
-  This option causes the pdc202xx driver to enable UDMA modes on the
+  This option causes the pdc202xx_old driver to enable UDMA modes on the
   PDC202xx even when the PDC202xx BIOS has not done so.
-
+  
   It was originally designed for the PDC20246/Ultra33, whose BIOS will
   only setup UDMA on the first two PDC20246 cards.  It has also been
   used successfully on a PDC20265/Ultra100, allowing use of UDMA modes
   when the PDC20265 BIOS has been disabled (for faster boot up).
 
+  Please read the comments at the top of
+  <file:drivers/ide/pci/pdc202xx_old.c>.
+
   If unsure, say N.
 
-Use FastTrak RAID capable device as plain IDE controller
+Ignore BIOS port disabled setting on FastTrak
 CONFIG_PDC202XX_FORCE
-  Setting this option causes the kernel to use your Promise IDE disk
-  controller as an ordinary IDE controller, rather than as a FastTrak
-  RAID controller. RAID is a system for using multiple physical disks
-  as one virtual disk.
-
-  You need to say Y here if you have a PDC20276 IDE interface but either
-  you do not have a RAID disk array, or you wish to use the Linux
-  internal RAID software (/dev/mdX).
-
-  You need to say N here if you wish to use your Promise controller to
-  control a FastTrak RAID disk array, and you you must also say Y to
-  CONFIG_BLK_DEV_ATARAID_PDC.
+  Chipsets affected:
+  
+  PDC202{46|62|63|65|67}
+  (pdc202xx_old driver)
 
-  If unsure, say Y.
+  PDC202{70|76}
+  (pdc202xx_new driver)
+  
+  Say Y unless you want to use Promise proprietary driver.
 
 CONFIG_SCSI_PTI_ST
   This driver supports the Promise SX6000 hardware ATA-RAID controller.
@@ -6604,12 +6614,6 @@ CONFIG_BINFMT_ELF
   ld.so (check the file <file:Documentation/Changes> for location and
   latest version).
 
-  If you want to compile this as a module ( = code which can be
-  inserted in and removed from the running kernel whenever you want),
-  say M here and read <file:Documentation/modules.txt>.  The module
-  will be called binfmt_elf.o. Saying M or N here is dangerous because
-  some crucial programs on your system might be in ELF format.
-
 ELF binaries with a.out format interpreters or a.out libraries
 CONFIG_BINFMT_ELF_AOUT
   The kernel may support ELF executables which use an a.out format
@@ -8016,32 +8020,6 @@ CONFIG_KMOD
   replacement for kerneld.) Say Y here and read about configuring it
   in <file:Documentation/kmod.txt>.
 
-Kernel .config file saved in kernel image
-CONFIG_IKCONFIG
-  This option enables the complete Linux kernel ".config" file 
-  contents, information on compiler used to build the kernel, 
-  kernel running when this kernel was built and kernel version 
-  from Makefile to be saved in kernel. It provides documentation 
-  of which kernel options are used in a running kernel or in an 
-  on-disk kernel.  This information can be extracted from the kernel 
-  image file with the script scripts/extract-ikconfig and used as 
-  input to rebuild the current kernel or to build another kernel. 
-  It can also be extracted from a running kernel by reading 
-  /proc/ikconfig/config and /proc/ikconfig/built_with, if enabled. 
-  /proc/ikconfig/config will list the configuration that was used 
-  to build the kernel and /proc/ikconfig/built_with will list 
-  information on the compiler and host machine that was used to 
-  build the kernel.  Since the kernel image is zipped, using this
-  option adds approximately 8 KB to a kernel image file.
-  This option is not available as a module.  If you want a separate
-  file to save the kernel's .config contents, use 'installkernel' or 'cp'
-  or a similar tool, or just save it in '/lib/modules/<kernel-version>'.
-
-Enable access to .config through /proc/ikconfig
-CONFIG_IKCONFIG_PROC
-  This option enables access to kernel configuration file and build
-  information through /proc/ikconfig.
-
 ARP daemon support
 CONFIG_ARPD
   Normally, the kernel maintains an internal cache which maps IP
@@ -8318,6 +8296,21 @@ CONFIG_NET_IPGRE
   <file:Documentation/modules.txt>. The module will be called
   ip_gre.o
 
+IP: WCCP tunnels over IP
+CONFIG_NET_IPWCCP
+  Tunneling means encapsulating data of one protocol type within
+  another protocol and sending it over a channel that understands the
+  encapsulating protocol. This particular tunneling driver implements
+  WCCP (Web Cache Coordination Protocol) GRE.  This driver is useful
+  if you have a WCCP-enabled router, and would like to use WCCP to
+  redirect packets to a web cache.
+
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  If you want to compile it as a module, say M here and read
+  <file:Documentation/modules.txt>. The module will be called
+  ip_wccp.o
+
 Broadcast GRE over IP
 CONFIG_NET_IPGRE_BROADCAST
   One application of GRE/IP is to construct a broadcast WAN (Wide Area
@@ -10121,6 +10114,15 @@ CONFIG_CHR_DEV_SG
   <file:Documentation/scsi.txt>. The module will be called sg.o. If unsure,
   say N.
 
+SCSI generic support Use Direct I/O
+CONFIG_CHR_DEV_SG_DIO
+  Per default Direct I/O for SCSI generic support is off. Enabling this
+  will increae performance. This is the same as doing:
+
+    echo 1 >/proc/scsi/sg/allow_dio
+
+  If unsure, say Y.
+
 SCSI media changer support
 CONFIG_CHR_DEV_SCH
   This is a driver for SCSI media changers.  Most common devices are
@@ -10524,7 +10526,7 @@ CONFIG_SCSI_IPS_OLD
   inserted in and removed from the running kernel whenever you want),
   but only a single instance may be loaded. If you want to compile it
   as a module, say M here and read <file:Documentation/modules.txt>.
-  The module will be called ips.o.
+  The module will be called ips_old.o.
 
   NOTE: This driver is known to deadlock under heavy load.
         You should use the new driver 7.x instead.
@@ -11495,6 +11497,17 @@ CONFIG_SCSI_MEGARAID2
   say M here and read <file:Documentation/modules.txt>.  The module
   will be called megaraid2.o.
 
+Collect statistics to report in /proc
+CONFIG_SCSI_MEGARAID2_PROC_STATS
+  Set this if you are interested in statics about number of I/O completed
+  on each logical drive and how many interrupts generated. If enabled,
+  this information is available through /proc/megaraid and through the
+  private ioctl.
+
+  Setting this has a performance penalty.
+
+  If unsure, say N.
+
 CONFIG_SCSI_SATA
   This driver family supports Serial ATA host controllers
   and devices.
@@ -12868,6 +12881,21 @@ CONFIG_AIRO_CS
   say M here and read <file:Documentation/modules.txt>.  The module
   will be called airo_cs.o.
 
+NDIS driver wrapper support
+CONFIG_NDISWRAPPER
+  Some wireless LAN vendors refuse to release hardware specifications or
+  drivers for their products for operating systems other than Microsoft
+  Windows. The ndiswrapper project makes it possible to use such
+  hardware with Linux by means of a loadable kernel module that "wraps
+  around" NDIS (Windows network driver API) drivers.
+
+  For more informations please visit <http://ndiswrapper.sourceforge.net>
+
+  If you want to compile the driver as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want),
+  say M here and read <file:Documentation/modules.txt>.  The module
+  will be called ndiswrapper.o.
+
 Aviator/Raytheon 2.4MHz wireless support
 CONFIG_PCMCIA_RAYCS
   Say Y here if you intend to attach an Aviator/Raytheon PCMCIA
@@ -13429,6 +13457,16 @@ CONFIG_NET_SCH_TBF
   whenever you want). If you want to compile it as a module, say M
   here and read <file:Documentation/modules.txt>.
 
+CONFIG_NET_SCH_NETEM
+  Say Y if you want to emulate network delay, loss, and packet
+  re-ordering. This is often useful to simulate networks when
+  testing applications or protocols.
+
+  To compile this driver as a module, choose M here: the module
+  will be called sch_netem.
+
+  If unsure, say N.
+
   If unsure, say N.
 
 Ingress Qdisc
@@ -14488,6 +14526,8 @@ CONFIG_SK98LIN
   by this driver:
 	    - 3Com 3C940 Gigabit LOM Ethernet Adapter
 	    - 3Com 3C941 Gigabit LOM Ethernet Adapter
+	    - Abocom EFE3K - 10/100 Ethernet Expresscard
+	    - Abocom EGE5K - Giga Ethernet Expresscard
 	    - Allied Telesyn AT-2970LX Gigabit Ethernet Adapter
 	    - Allied Telesyn AT-2970LX/2SC Gigabit Ethernet Adapter
 	    - Allied Telesyn AT-2970SX Gigabit Ethernet Adapter
@@ -14500,29 +14540,68 @@ CONFIG_SK98LIN
 	    - DGE-530T Gigabit Ethernet Adapter
 	    - EG1032 v2 Instant Gigabit Network Adapter
 	    - EG1064 v2 Instant Gigabit Network Adapter
-	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Abit)
-	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Albatron)
-	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Asus)
-	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (ECS)
-	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Epox)
-	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Foxconn)
-	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Gigabyte)
-	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Iwill)
-	    - Marvell 88E8050 Gigabit LOM Ethernet Adapter (Intel)
+	    - Marvell 88E8001 Gigabit Ethernet Controller (Abit)
+	    - Marvell 88E8001 Gigabit Ethernet Controller (Albatron)
+	    - Marvell 88E8001 Gigabit Ethernet Controller (Asus)
+	    - Marvell 88E8001 Gigabit Ethernet Controller (Chaintech)
+	    - Marvell 88E8001 Gigabit Ethernet Controller (ECS)
+	    - Marvell 88E8001 Gigabit Ethernet Controller (Epox)
+	    - Marvell 88E8001 Gigabit Ethernet Controller (Foxconn)
+	    - Marvell 88E8001 Gigabit Ethernet Controller (Gigabyte)
+	    - Marvell 88E8001 Gigabit Ethernet Controller (Iwill)
+	    - Marvell 88E8035 Fast Ethernet Controller (LGE)
+	    - Marvell 88E8035 Fast Ethernet Controller (Toshiba)
+	    - Marvell 88E8036 Fast Ethernet Controller (Arima)
+	    - Marvell 88E8036 Fast Ethernet Controller (Compal)
+	    - Marvell 88E8036 Fast Ethernet Controller (Inventec)
+	    - Marvell 88E8036 Fast Ethernet Controller (LGE)
+	    - Marvell 88E8036 Fast Ethernet Controller (Toshiba)
+	    - Marvell 88E8036 Fast Ethernet Controller (Wistron)
+	    - Marvell 88E8050 Gigabit Ethernet Controller (Intel)
+	    - Marvell 88E8052 Gigabit Ethernet Controller (ASRock)
+	    - Marvell 88E8052 Gigabit Ethernet Controller (Aopen)
+	    - Marvell 88E8052 Gigabit Ethernet Controller (Asus)
+	    - Marvell 88E8052 Gigabit Ethernet Controller (Gigabyte)
+	    - Marvell 88E8052 Gigabit Ethernet Controller (MSI)
+	    - Marvell 88E8052 Gigabit Ethernet Controller (Wistron)
+	    - Marvell 88E8053 Gigabit Ethernet Controller (ASRock)
+	    - Marvell 88E8053 Gigabit Ethernet Controller (Albatron)
+	    - Marvell 88E8053 Gigabit Ethernet Controller (Aopen)
+	    - Marvell 88E8053 Gigabit Ethernet Controller (Arima)
+	    - Marvell 88E8053 Gigabit Ethernet Controller (Asus)
+	    - Marvell 88E8053 Gigabit Ethernet Controller (Chaintech)
+	    - Marvell 88E8053 Gigabit Ethernet Controller (Clevo)
+	    - Marvell 88E8053 Gigabit Ethernet Controller (Compal)
+	    - Marvell 88E8053 Gigabit Ethernet Controller (DFI)
+	    - Marvell 88E8053 Gigabit Ethernet Controller (Epox)
+	    - Marvell 88E8053 Gigabit Ethernet Controller (Gigabyte)
+	    - Marvell 88E8053 Gigabit Ethernet Controller (Inventec)
+	    - Marvell 88E8053 Gigabit Ethernet Controller (LGE)
+	    - Marvell 88E8053 Gigabit Ethernet Controller (MSI)
+	    - Marvell 88E8053 Gigabit Ethernet Controller (Quanta)
+	    - Marvell 88E8053 Gigabit Ethernet Controller (SOYO)
+	    - Marvell 88E8053 Gigabit Ethernet Controller (Shuttle)
+	    - Marvell 88E8053 Gigabit Ethernet Controller (Toshiba)
+	    - Marvell 88E8053 Gigabit Ethernet Controller (Trigem)
+	    - Marvell RDK-8001 
 	    - Marvell RDK-8001 Adapter
 	    - Marvell RDK-8002 Adapter
+	    - Marvell RDK-8003 
 	    - 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-8010 Adapter
+	    - Marvell RDK-8010 
 	    - Marvell RDK-8011 Adapter
 	    - Marvell RDK-8012 Adapter
-	    - Marvell RDK-8052 Adapter
-	    - Marvell Yukon Gigabit Ethernet 10/100/1000Base-T Adapter (32 bit)
-	    - Marvell Yukon Gigabit Ethernet 10/100/1000Base-T Adapter (64 bit)
+	    - Marvell RDK-8035 
+	    - Marvell RDK-8036 
+	    - Marvell RDK-8052 
+	    - Marvell RDK-8053 
+	    - Marvell Yukon Gigabit Ethernet 10/100/1000Base-T Controller (32 bit)
+	    - Marvell Yukon Gigabit Ethernet 10/100/1000Base-T Controller (64 bit)
 	    - N-Way PCI-Bus Giga-Card 1000/100/10Mbps(L)
 	    - SK-9521 10/100/1000Base-T Adapter
 	    - SK-9521 V2.0 10/100/1000Base-T Adapter
@@ -14558,6 +14637,32 @@ CONFIG_SK98LIN
   say M here and read Documentation/modules.txt. This is recommended.
   The module will be called sk98lin.o.
 
+SysKonnect SK-98xx Use DualNET
+CONFIG_SK98LIN_DUAL
+  If you have a Dual NIC from SysKonnect, and want to make use of both
+  channels, i.e. for LACP, say Y here.
+
+  If you said M to the option above, you can change this via a module
+  parameter. Please refer to <file:Documentation/networking/sk98lin.txt>
+
+  If unsure, say N.
+
+SysKonnect SK-98xx Autonegotiation
+CONFIG_SK98LIN_AUTONEG_SENSE
+  If you want to use LACP with an Enterasys Switch, in most cases it'll
+  only work if you set autonegotiation off.
+
+  SysKonnects default is On, WOLKs default is Sense.
+
+  Select On to use autonegotiation, select Off to disable autonegotiation
+  or select Sense to automatically detect whether the link partner supports
+  autonegotiation or not.
+
+  If you said M to the option above, you can change this via a module
+  parameter. Please refer to <file:Documentation/networking/sk98lin.txt>
+
+  If unsure, select Sense.
+
 SysKonnect SK-9Dxx support
 CONFIG_SK9DLIN
   Say Y here if you have a SysKonnect SK-9Dxx Gigabit Ethernet Adapter.
@@ -14593,8 +14698,8 @@ CONFIG_SUNGEM
   will be called sungem.o.
 
 Broadcom NetXtreme BCM5700 Gigabit Ethernet support
-CONFIG_NET_BROADCOM
-  Say Y here if you have a Broadcom BCM570x, or 3Com
+CONFIG_NET_BCM5700
+  Say Y here if you have a Broadcom BCM57xx, or 3Com
   3C996/3C997/3C1000/3C940 PCI/PCIX Gigabit Ethernet adapter.
 
   If you want to compile this driver as a module ( = code which can be
@@ -14606,6 +14711,9 @@ Broadcom Tigon3 support
 CONFIG_TIGON3
   This driver supports Broadcom Tigon3 based gigabit Ethernet cards.
 
+  Say Y here if you have a Broadcom BCM57xx, or 3Com
+  3C996/3C997/3C1000/3C940 PCI/PCIX Gigabit Ethernet adapter.
+
   If you want to compile this driver as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
   say M here and read <file:Documentation/modules.txt>.  This is
@@ -14683,6 +14791,9 @@ CONFIG_E100
                                                     A22220-xxx,
                                                     A23796-xxx
 
+CONFIG_SK98LIN_NAPI
+  NAPI is a new driver API designed to reduce CPU and interrupt load
+  when the driver is receiving lots of packets from the card.
 
   To verify that your adapter is supported, find the board ID number
   on the adapter. Look for a label that has a barcode and a number
@@ -14763,6 +14874,32 @@ CONFIG_E1000_NAPI
 
   If in doubt, say N.
 
+Intel(R) PRO/10GbE support
+CONFIG_IXGB
+  This driver supports Intel(R) PRO/10GbE family of
+  adapters, which includes:
+
+  Controller  Adapter Name                           Board IDs
+  ----------  ------------                           ---------
+  82597EX     Intel(R) PRO/10GbE LR Server Adapter   A82505-xxx
+
+  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 general information and support, go to the Intel support
+  website at:
+
+  <http://support.intel.com>
+
+  More specific information on configuring the driver is in 
+  <file:Documentation/networking/ixgb.txt>.
+
+  To compile this driver as a module, choose M here and read
+  <file:Documentation/networking/net-modules.txt>.  The module
+  will be called ixgb.o.
+
 AMD LANCE and PCnet (AT1500 and NE2100) support
 CONFIG_LANCE
   If you have a network (Ethernet) card of this type, say Y and read
@@ -15122,6 +15259,40 @@ CONFIG_E2100
   module, say M here and read <file:Documentation/modules.txt> as well
   as <file:Documentation/networking/net-modules.txt>.
 
+Broadcom BCM4400 support (b44, alternate driver)
+CONFIG_NET_B44
+  If you have a network (Ethernet) controller of this type, say Y and
+  read the Ethernet-HOWTO, available from
+  <http://www.tldp.org/docs.html#howto>.
+
+  If you want to compile this as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want),
+  say M here and read <file:Documentation/modules.txt> as well as 
+  <file:Documentation/networking/net-modules.txt>. The module will be
+  called b44.
+
+Broadcom BCM4400 support (bcm4440, original Broadcom driver)
+CONFIG_NET_BCM4400
+  If you have a network (Ethernet) controller of this type, say Y and
+  read the Ethernet-HOWTO, available from
+  <http://www.tldp.org/docs.html#howto>.
+
+  If you want to compile this as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want),
+  say M here and read <file:Documentation/modules.txt> as well as 
+  <file:Documentation/networking/net-modules.txt>. The module will be
+  called bcm4400.
+
+nForce Ethernet support (EXPERIMENTAL)
+CONFIG_NET_FORCEDETH
+  If you have a network (Ethernet) controller of this type, say Y and
+  read the Ethernet-HOWTO, available from
+  <http://www.tldp.org/docs.html#howto>.
+
+  To compile this driver as a module, choose M here and read
+  <file:Documentation/networking/net-modules.txt>.
+  The module will be called forcedeth.o.
+
 CS89x0 support (Daynaport CS and LC cards)
 CONFIG_CS89x0
   Support for CS89x0 chipset based Ethernet cards. If you have a
@@ -17699,6 +17870,15 @@ CONFIG_INPUT_EVDEV
   accessible under char device 13:64+ - /dev/input/eventX in a generic
   way.  This is the future ...
 
+CONFIG_INPUT_UINPUT
+  Say Y here if you want to support user level drivers for input
+  subsystem accessible under char device 10:223 - /dev/input/uinput.
+
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called uinput.o.  If you want to compile it as a
+  module, say M here and read <file:Documentation/modules.txt>.	    
+
 USB Scanner support
 CONFIG_USB_SCANNER
   Say Y here if you want to connect a USB scanner to your computer's
@@ -19811,6 +19991,36 @@ CONFIG_PROC_FS_ENHANCED_MEMINFO
 
   If unsure, say Y. It's usefull :)
 
+Provide kernel config via /proc
+CONFIG_PROC_CONFIG
+  If you enable this, you can read the configuration of the running
+  kernel from /proc/config. This is very convenient if you are managing
+  a large number of machines.
+
+  The kernel enlargement depends on your kernel configuration and the
+  compression method chosen (see next option). An average configuration
+  with gzip compression should be around 5-7 KB.
+
+  This code is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called kconfig.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt.
+
+  Note that if you compile this as a module, there is always the
+  possibility of an outdated module floating around, so you probably
+  don't want to compile this as a module.
+
+Compression algorithm for /proc/config.*
+CONFIG_PROC_CONFIG_GZ
+  The compression method used for /proc/config. This reduces the size
+  of the configuration data noticeably. An appropriate extension is
+  added to /proc/config, depending on the compression method (e.g.
+  /proc/config.gz for gzip compression).
+
+  Note that the proc file provides the compressed data, so you have
+  to use the appropriate userspace utility to decompress them (e.g.
+  zcat).
+
 Support for PReP Residual Data
 CONFIG_PREP_RESIDUAL
   Some PReP systems have residual data passed to the kernel by the
@@ -19862,16 +20072,6 @@ CONFIG_DEVFS_DEBUG
 
   If unsure, say N.
 
-/proc/config.gz support
-CONFIG_PROC_CONFIG
-  Say Y here if you want a copy of your current kernel configuration
-  saved in the kernel that you build. This is extremely useful if you
-  ever build more than one kernel. The cost is around 1K-4K of running
-  memory. Only say no if you really can't spare this. You can sneeze
-  and lose more on memory than this.
-
-  If unsure, say Y.
-
 NFS file system support
 CONFIG_NFS_FS
   If you are connected to some other (usually local) Unix computer
@@ -20072,13 +20272,29 @@ CONFIG_NTFS_DEBUG
   debugging messages while the misbehaviour was occurring.
 
 CONFIG_NTFS_RW
-  This enables the experimental write support in the NTFS driver.
+  This enables the partial, but safe, write support in the NTFS driver.
 
-  WARNING: Do not use this option unless you are actively developing
-           NTFS as it is currently guaranteed to be broken and you
-           may lose all your data!
+  The only supported operation is overwriting existing files, without
+  changing the file length.  No file or directory creation, deletion or
+  renaming is possible.  Note only non-resident files can be written to
+  so you may find that some very small files (<500 bytes or so) cannot
+  be written to.
+
+  While we cannot guarantee that it will not damage any data, we have
+  so far not received a single report where the driver would have
+  damaged someones data so we assume it is perfectly safe to use.
+
+  Note:  While write support is safe in this version (a rewrite from
+  scratch of the NTFS support), it should be noted that the old NTFS
+  write support, is not safe.
+
+  This is currently useful with TopologiLinux.  TopologiLinux is run
+  on top of any DOS/Microsoft Windows system without partitioning your
+  hard disk.  Unlike other Linux distributions TopologiLinux does not
+  need its own partition.  For more information see
+  <http://topologi-linux.sourceforge.net/>
 
-  It is strongly recommended and perfectly safe to say N here.
+  It is perfectly safe to say N here.
 
 NetWare 3/4/5 file system support (NWFS)
 CONFIG_NWFS_FS
@@ -20512,7 +20728,7 @@ CONFIG_LUFS_FS
   the lufsd daemon and file system modules available from
   http://lufs.sourceforge.net.
   
-  Say Y here if you want to get access to a bunch of usefull file systems
+  Say Y here if you want to get access to a bunch of useful file systems
   (sshfs, ftpfs, gnutellafs, gvfs, cardfs, cefs, etc). 
 
 Advanced partition selection
@@ -22567,14 +22783,6 @@ CONFIG_ATIXL_BUSMOUSE
   If you are unsure, say N and read the HOWTO nevertheless: it will
   tell you what you have.
 
-QIC-02 tape support
-CONFIG_QIC02_TAPE
-  If you have a non-SCSI tape drive like that, say Y. Or, if you want
-  to compile this driver as a module ( = code which can be inserted in
-  and removed from the running kernel whenever you want), say M here
-  and read <file:Documentation/modules.txt>. The module will be called
-  tpqic02.o.
-
 iSeries Virtual Tape Support
 CONFIG_VIOTAPE
   If you are running Linux on an iSeries system and you want Linux
@@ -26435,22 +26643,21 @@ CONFIG_BLUEZ
 
   Linux Bluetooth subsystem consist of several layers:
                BlueZ Core (HCI device and connection manager, scheduler)
-               HCI Device drivers (interface to the hardware)
-               L2CAP Module (L2CAP protocol)
-               SCO Module (SCO links)
-               RFCOMM Module (RFCOMM protocol)
-               BNEP Module (BNEP protocol)
-               CMTP Module (CMTP protocol)
+               HCI Device drivers (Interface to the hardware)
+               SCO Module (SCO audio links)
+               L2CAP Module (Logical Link Control and Adaptation Protocol)
+               RFCOMM Module (RFCOMM Protocol)
+               BNEP Module (Bluetooth Network Encapsulation Protocol)
+               CMTP Module (CAPI Message Transport Protocol)
+               HIDP Module (Human Interface Device Protocol)
 
-  Say Y here to enable Linux Bluetooth support and to build BlueZ Core
-  layer.
+  Say Y here to compile Bluetooth support into the kernel or say M to
+  compile it as module (bluez.o).
 
   To use Linux Bluetooth subsystem, you will need several user-space
   utilities like hciconfig and hcid.  These utilities and updates to
   Bluetooth kernel modules are provided in the BlueZ package.
-  For more information, see <http://bluez.sourceforge.net/>.
-
-  If you want to compile BlueZ Core as module (bluez.o) say M here.
+  For more information, see <http://www.bluez.org/>.
 
 L2CAP protocol support
 CONFIG_BLUEZ_L2CAP
@@ -26463,7 +26670,7 @@ CONFIG_BLUEZ_L2CAP
 
 SCO links support
 CONFIG_BLUEZ_SCO
-  SCO link provides voice transport over Bluetooth. SCO support is
+  SCO link provides voice transport over Bluetooth.  SCO support is
   required for voice applications like Headset and Audio.
 
   Say Y here to compile SCO support into the kernel or say M to
@@ -26471,7 +26678,7 @@ CONFIG_BLUEZ_SCO
 
 RFCOMM protocol support
 CONFIG_BLUEZ_RFCOMM
-  RFCOMM provides connection oriented stream transport. RFCOMM
+  RFCOMM provides connection oriented stream transport.  RFCOMM
   support is required for Dialup Networking, OBEX and other Bluetooth
   applications.
 
@@ -26485,32 +26692,37 @@ CONFIG_BLUEZ_RFCOMM_TTY
 BNEP protocol support
 CONFIG_BLUEZ_BNEP
   BNEP (Bluetooth Network Encapsulation Protocol) is Ethernet
-  emulation layer on top of Bluetooth. BNEP is required for Bluetooth
-  PAN (Personal Area Network).
-
-  To use BNEP, you will need user-space utilities provided in the 
-  BlueZ-PAN package.
-  For more information, see <http://bluez.sourceforge.net>.
+  emulation layer on top of Bluetooth.  BNEP is required for
+  Bluetooth PAN (Personal Area Network).
 
   Say Y here to compile BNEP support into the kernel or say M to
   compile it as module (bnep.o).
 
+BNEP multicast filter support
+CONFIG_BLUEZ_BNEP_MC_FILTER
+  This option enables the multicast filter support for BNEP.
+
+BNEP protocol filter support
+CONFIG_BLUEZ_BNEP_PROTO_FILTER
+  This option enables the protocol filter support for BNEP.
+
 CMTP protocol support
 CONFIG_BLUEZ_CMTP
   CMTP (CAPI Message Transport Protocol) is a transport layer
-  for CAPI messages. CMTP is required for the Bluetooth Common
+  for CAPI messages.  CMTP is required for the Bluetooth Common
   ISDN Access Profile.
 
   Say Y here to compile CMTP support into the kernel or say M to
   compile it as module (cmtp.o).
 
-BNEP multicast filter support
-CONFIG_BLUEZ_BNEP_MC_FILTER
-  This option enables the multicast filter support for BNEP.
+HIDP protocol support
+CONFIG_BLUEZ_HIDP
+  HIDP (Human Interface Device Protocol) is a transport layer
+  for HID reports.  HIDP is required for the Bluetooth Human
+  Interface Device Profile.
 
-BNEP protocol filter support
-CONFIG_BLUEZ_BNEP_PROTO_FILTER
-  This option enables the protocol filter support for BNEP.
+  Say Y here to compile HIDP support into the kernel or say M to
+  compile it as module (hidp.o).
 
 HCI UART driver
 CONFIG_BLUEZ_HCIUART
@@ -26556,7 +26768,7 @@ CONFIG_BLUEZ_HCIUSB
   kernel or say M to compile it as module (hci_usb.o).
 
 HCI USB SCO (voice) support
-CONFIG_BLUEZ_USB_SCO
+CONFIG_BLUEZ_HCIUSB_SCO
   This option enables the SCO support in the HCI USB driver. You need this
   to transmit voice data with your Bluetooth USB device. And your device
   must also support sending SCO data over the HCI layer, because some of
@@ -26564,14 +26776,6 @@ CONFIG_BLUEZ_USB_SCO
  
   Say Y here to compile support for HCI SCO data.
  
-HCI USB zero packet support
-CONFIG_BLUEZ_USB_ZERO_PACKET
-  This option is provided only as a work around for buggy Bluetooth USB 
-  devices. Do NOT enable it unless you know for sure that your device 
-  requires zero packets.
- 
-  Most people should say N here.
-
 HCI VHCI Virtual HCI device driver
 CONFIG_BLUEZ_HCIVHCI
   Bluetooth Virtual HCI device driver.
@@ -26609,9 +26813,6 @@ CONFIG_BLUEZ_HCIBT3C
      3Com Bluetooth Card (3CRWB6096)
      HP Bluetooth Card
 
-  The HCI BT3C driver uses external firmware loader program provided in
-  the BlueFW package. For more information, see <http://bluez.sf.net>.
-
   Say Y here to compile support for HCI BT3C devices into the
   kernel or say M to compile it as module (bt3c_cs.o).
 
@@ -27144,6 +27345,17 @@ CONFIG_GRKERNSEC_HIDESYM
   useful protection against local and remote kernel exploitation of
   overflows and arbitrary read/write vulnerabilities.
 
+Deter exploit bruteforcing
+CONFIG_GRKERNSEC_BRUTE
+  If you say Y here, attempts to bruteforce exploits against forking
+  daemons such as apache or sshd will be deterred.  When a child of a 
+  forking daemon is killed by PaX or crashes due to an illegal 
+  instruction, the parent process will be delayed 30 seconds upon every
+  subsequent fork until the administrator is able to assess the 
+  situation and restart the daemon.  It is recommended that you also 
+  enable signal logging in the auditing section so that logs are 
+  generated when a process performs an illegal instruction.
+
 /proc/<pid>/ipaddr support
 CONFIG_GRKERNSEC_PROC_IPADDR
   If you say Y here, a new entry will be added to each /proc/<pid>
@@ -27371,9 +27583,9 @@ CONFIG_GRKERNSEC_CHROOT_PIVOT
 Deny double-chroots
 CONFIG_GRKERNSEC_CHROOT_DOUBLE
   If you say Y here, processes inside a chroot will not be able to chroot
-  again.  This is a widely used method of breaking out of a chroot jail
-  and should not be allowed.  If the sysctl option is enabled, a sysctl
-  option with name "chroot_deny_chroot" is created.
+  again outside of the chroot.  This is a widely used method of breaking
+  out of a chroot jail and should not be allowed.  If the sysctl option
+  is enabled, a sysctl option with name "chroot_deny_chroot" is created.
 
 Deny fchdir outside of chroot
 CONFIG_GRKERNSEC_CHROOT_FCHDIR
@@ -32947,6 +33159,18 @@ CONFIG_CRYPTO_SHA512
   This code also includes SHA-384, a 384 bit hash with 192 bits
   of security against collision attacks.
 
+CONFIG_CRYPTO_WHIRLPOOL
+  Whirlpool hash algorithm.
+
+  Whirlpool is part of the NESSIE cryptographic primtives.
+  Whirlpool works on messages shorter than 2^256 bits and
+  produces a 512 bit hash.
+
+  Whirlpool will be part of the ISO/IEC 10118-3:2003(E) standard
+
+  See also:
+  http://planeta.terra.com.br/informatica/paulobarreto/WhirlpoolPage.html
+
 CONFIG_CRYPTO_DES
   DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).
 
@@ -33008,6 +33232,17 @@ CONFIG_CRYPTO_CAST6
   The CAST6 encryption algorithm (synonymous with CAST-256) is
   described in RFC2612.
 
+CONFIG_CRYPTO_TEA
+  TEA cipher algorithm.
+
+  Tiny Encryption Algorithm is a simple cipher that uses
+  many rounds for security.  It is very fast and uses
+  little memory.
+
+  Xtendend Tiny Encryption Algorithm is a modification to
+  the TEA algorithm to address a potential key weakness
+  in the TEA algorithm.
+
 CONFIG_CRYPTO_ARC4
   ARC4 cipher algorithm.
   
@@ -33016,6 +33251,16 @@ CONFIG_CRYPTO_ARC4
   WEP, but it should not be for other purposes because of the
   weakness of the algorithm.
 
+CONFIG_CRYPTO_KHAZAD
+  Khazad cipher algorithm.
+
+  Khazad was a finalist in the initial NESSIE competition.  It is
+  an algorithm optimized for 64-bit processors with good performance
+  on 32-bit processors.  Khazad uses an 128 bit key size.
+
+  See also:
+  http://planeta.terra.com.br/informatica/paulobarreto/KhazadPage.html
+
 CONFIG_CRYPTO_DEFLATE
   This is the Deflate algorithm (RFC1951), specified for use in
   IPSec with the IPCOMP protocol (RFC3173, RFC2394).
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/Documentation/crypto/api-intro.txt linux-2.4.20-wolk4.16-fullkernel/Documentation/crypto/api-intro.txt
--- linux-2.4.20-wolk4.15-fullkernel/Documentation/crypto/api-intro.txt	2004-06-29 11:24:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/Documentation/crypto/api-intro.txt	2004-09-05 15:47:28.000000000 +0200
@@ -219,6 +219,15 @@ AES algorithm contributors:
 CAST5/CAST6 algorithm contributors:
   Kartikey Mahendra Bhatt (original developers unknown, FSF copyright).
 
+TEA/XTEA algorithm contributors:
+  Aaron Grothe
+
+Khazad algorithm contributors:
+  Aaron Grothe
+
+Whirlpool algorithm contributors:
+  Aaron Grothe
+
 Generic scatterwalk code by Adam J. Richter <adam@yggdrasil.com>
 
 Please send any credits updates or corrections to:
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/Documentation/devices.txt linux-2.4.20-wolk4.16-fullkernel/Documentation/devices.txt
--- linux-2.4.20-wolk4.15-fullkernel/Documentation/devices.txt	2004-06-29 11:31:45.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/Documentation/devices.txt	2004-09-05 16:08:22.000000000 +0200
@@ -426,6 +426,7 @@ Your cooperation is appreciated.
 		220 = /dev/mptctl	Message passing technology (MPT) control
 		221 = /dev/mvista/hssdsi	Montavista PICMG hot swap system driver
 		222 = /dev/mvista/hasi		Montavista PICMG high availability
+		223 = /dev/input/uinput		User level driver support for input
 		223 = /dev/systrace	Systrace device
 		224 = /dev/tpm		TCPA TPM driver
 		225 = /dev/pps		Pulse Per Second driver
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/Documentation/filesystems/ntfs.txt linux-2.4.20-wolk4.16-fullkernel/Documentation/filesystems/ntfs.txt
--- linux-2.4.20-wolk4.15-fullkernel/Documentation/filesystems/ntfs.txt	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/Documentation/filesystems/ntfs.txt	2004-09-05 15:47:37.000000000 +0200
@@ -247,6 +247,19 @@ ChangeLog
 
 Note, a technical ChangeLog aimed at kernel hackers is in fs/ntfs/ChangeLog.
 
+2.1.6b:
+	- Update kernel help documentation on NTFS write support.
+
+2.1.6a:
+	- Fix minor bug in handling of compressed directories that fixes the
+	  erroneous "du" and "stat" output people reported.
+2.1.5a:
+	- Minor bug fix in attribute list attribute handling that fixes the
+	  I/O errors on "ls" of certain fragmented files found by at least two
+	  people running Windows XP.
+2.1.4a:
+	- Minor update allowing compilation with all gcc versions (well, the
+	  ones the kernel can be compiled with anyway).
 2.1.3a:
 	- Major bug fixes for reading files and volumes in corner cases which
 	  were being hit by Windows 2k/XP users.
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/Documentation/mkdev_dyn.cciss linux-2.4.20-wolk4.16-fullkernel/Documentation/mkdev_dyn.cciss
--- linux-2.4.20-wolk4.15-fullkernel/Documentation/mkdev_dyn.cciss	2004-06-29 11:24:47.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/Documentation/mkdev_dyn.cciss	1970-01-01 01:00:00.000000000 +0100
@@ -1,171 +0,0 @@
-#!/bin/sh
-#
-# Author: Francis Wiran <Francis.Wiran@hp.com>
-#
-# Script to create device nodes for SMART Array controllers, idea from
-# mkdev.cciss found in Documentation. The argument syntax is different,
-# hence, the name change.
-#
-# Usage:
-# 	mkdev_dyn.cciss [ctlr num] [major num] [num log vol] [num partitions]
-#
-# With no arguments, the script will check to see if there are any cciss
-# nodes already created in the /dev directory. If so, then it will assume
-# that the nodes for the first 8 controllers are already created by
-# /etc/makedev.d, which is likely. If not, then the script will create 
-# them, using the major numbers reserved for cciss controllers (104 thru 111).
-#
-# After that, it will start creating nodes for the controllers which major
-# numbers are dynamically allocated by the kernel. It will check 
-# /proc/devices for any cciss controllers with major numbers other than
-# 104 thru 111 and creates the nodes.
-#
-# Note that it is a good idea to run rmdev_dyn.cciss script if you remove
-# those controllers (the ones which major numbers were dynamically allocated)
-# This will unclutter /dev, as well as preventing possible problems due to 
-# referenced devices and major numbers no longer available or taken by
-# other non-cciss drivers.
-#
-# With no arguments, the script assumes 16 logical volumes per controller
-# and 16 partitions per volume; 
-#
-# Passing arguments:
-# If you know that one of your controllers, say cciss8, has been dynamically 
-# assigned major number 254, and were planning on no more than 2 logical 
-# volumes, using a maximum of 4 partitions per volume, you could do:
-#
-# mkdev_dyn.cciss 8 254 2 4
-#
-# Of course, this has no real benefit over "mkdev_dyn.cciss 8 254" except 
-# that it doesn't create as many device nodes in /dev/cciss.
-#
-
-# Inputs
-NR_CTLR=${1-8}
-NR_MAJOR=${2-254}
-NR_VOL=${3-16}
-NR_PART=${4-16}
-
-echo_usage()
-{
-	echo "Usage: mkdev_dyn.cciss [ctlr num] [maj] [volumes] [partitions]"
-	echo "The script assumes that ctlr 0 thru 7 is statically created"
-	echo "Therefore, if you want to pass arguments make sure that"
-	echo "ctlr num is equal or greater than 8, and the major number"
-	echo "is not one that's statically assigned for cciss controller."
-	echo "Check the correct major number in /proc/devices"
-
-	# Hmm... we don't support volumes and partitions greater than 16
-	# either.
-}
-
-echo_create()
-{
-	echo "created /dev/cciss/c${1}* nodes using major number ${2}"
-}
-
-
-# Function: do_mknod()
-#           Creates devices nodes under /dev/cciss
-# Inputs: $1 - ctlr number
-#	  $2 - major number
-#	  $3 - number of devices on controller
-#	  $4 - number of partitions per device
-do_mknod()
-{
-	D=0;
-	while [ $D -lt $3 ]; do
-		P=0;
-		while [ $P -lt $4 ]; do
-			MIN=`expr $D \* 16 + $P`;
-			if [ $P -eq 0 ]; then
-				mknod /dev/cciss/c${1}d${D} b $2 $MIN
-			else
-				mknod /dev/cciss/c${1}d${D}p${P} b $2 $MIN
-			fi
-			P=`expr $P + 1`;
-		done
-		D=`expr $D + 1`;
-	done
-}
-
-# Function: do_dyn
-#           Search and create cciss nodes for the controllers which
-#           major numbers are allocated dynamically by the kernel
-#           instead of using kernel.org 's value of 104 to 111.
-#
-# Input: $1 - ctlr num - will create nodes /dev/cciss/c${1}
-#	 $2 - major num - the major number to assign to the nodes
-#	 $3 - volumes - max number of volumes per controller
-#	 $4 - partitions - max number of partitions per volume
-#
-# Note: Without input, this function will start creating nodes
-#       for controller c8 and above, making assumption that 
-#       c0 thru c7 are already made, and the name c8 and above 
-#       are not already taken.
-do_dyn()
-{
-	if [ $# -eq 0 ]; then
-		C=0;
-		for MAJ in `cat /proc/devices |\
-			grep cciss |\
-			awk '/cciss[0-9]$/ { sub("cciss", "cciss0") }; {print}' |\
-			sort -k 2,2 |\
-			awk '{print $1-i}'`;
-		do
-			if [ `ls -l /dev/cciss/c* |\
-				awk '{print $5-i}' |\
-				uniq |\
-				grep $MAJ |\
-				wc -l` -gt 0 ]; then
-				:
-			else
-				do_mknod $C $MAJ $NR_VOL $NR_PART;
-				echo_create $C $MAJ;
-			fi
-			C=`expr $C + 1`;
-		done
-	else
-		do_mknod $1 $2 $3 $4;
-		echo_create $1 $2;
-	fi
-	
-	exit
-}
-
-# Start here
-
-# Check the input values
-if [ $NR_CTLR -lt 8 ]; then
-	echo_usage;
-	exit
-fi
-
-if [ $NR_CTLR -ge 8 ]; then
-	if [ \( $NR_MAJOR -ge 104 \) -a \( $NR_MAJOR -le 111 \) ]; then
-		echo_usage;
-		exit
-	fi
-fi
-
-if [ ! -d /dev/cciss ]; then
-        mkdir -p /dev/cciss
-fi
-
-# Assume that if c0d0p1 node already exist, then all nodes from c0d0p1
-# to c7d15p15 have been created for us.
-if [ ! -b /dev/cciss/c0d0p1 ]; then
-	C=0; 
-	while [ $C -lt 8 ]; do
-		MAJ=`expr $C + 104`;
-		do_mknod $C $MAJ $NR_VOL $NR_PART;
-		echo_create $C $MAJ;
-		C=`expr $C + 1`;
-	done
-fi
-
-if [ $# -gt 0 ]; then
-	do_dyn $NR_CTLR $NR_MAJOR $NR_VOL $NR_PART;
-else
-	do_dyn;
-fi
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/bonding.txt linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/bonding.txt
--- linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/bonding.txt	2004-06-29 11:25:07.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/bonding.txt	2004-09-05 15:54:58.000000000 +0200
@@ -31,6 +31,7 @@ Verifying Bond Configuration
 Frequently Asked Questions
 High Availability
 Promiscuous Sniffing notes
+8021q VLAN support
 Limitations
 Resources and Links
 
@@ -140,10 +141,6 @@ probeall bond0 eth0 eth1 bonding
 Be careful not to reference bond0 itself at the end of the line, or modprobe
 will die in an endless recursive loop.
 
-To have device characteristics (such as MTU size) propagate to slave devices,
-set the bond characteristics before enslaving the device.  The characteristics
-are propagated during the enslave process.
-
 If running SNMP agents, the bonding driver should be loaded before any network
 drivers participating in a bond. This requirement is due to the the interface
 index (ipAdEntIfIndex) being associated to the first interface found with a
@@ -612,7 +609,7 @@ Frequently Asked Questions
 	For ethernet cards not supporting MII status, the arp_interval and
         arp_ip_target parameters must be specified for bonding to work
         correctly. If packets have not been sent or received during the
-        specified arp_interval durration, an ARP request is sent to the
+        specified arp_interval duration, an ARP request is sent to the
         targets to generate send and receive traffic. If after this
         interval, either the successful send and/or receive count has not
         incremented, the next slave in the sequence will become the active
@@ -680,16 +677,8 @@ Frequently Asked Questions
 	that will be added.
 
 	To restore your slaves' MAC addresses, you need to detach them
-	from the bond (`ifenslave -d bond0 eth0'), set them down
-	(`ifconfig eth0 down'), unload the drivers (`rmmod 3c59x', for
-	example) and reload them to get the MAC addresses from their
-	eeproms. If the driver is shared by several devices, you need
-	to turn them all down. Another solution is to look for the MAC
-	address at boot time (dmesg or tail /var/log/messages) and to
-	reset it by hand with ifconfig :
-
-	  # ifconfig eth0 down
-	  # ifconfig eth0 hw ether 00:20:40:60:80:A0
+	from the bond (`ifenslave -d bond0 eth0'). The bonding driver will then
+	restore the MAC addresses that the slaves had before they were enslaved.
 
 9.  Which transmit polices can be used?
 
@@ -854,7 +843,7 @@ point of failure" solution.
 
 In this configuration, there is an ISL - Inter Switch Link (could be a trunk),
 several servers (host1, host2 ...) attached to both switches each, and one or
-more ports to the outside world (port3...). One an only one slave on each host
+more ports to the outside world (port3...). One and only one slave on each host
 is active at a time, while all links are still monitored (the system can
 detect a failure of active and backup links).
 
@@ -944,6 +933,41 @@ capacity aggregating; but it works fine 
 just ignore all the warnings it emits.
 
 
+8021q VLAN support
+==================
+
+It is possible to configure VLAN devices over a bond interface using the 8021q
+driver. However, only packets coming from the 8021q driver and passing through
+bonding will be tagged by default. Self generated packets, like bonding's
+learning packets or ARP packets generated by either ALB mode or the ARP
+monitor mechanism, are tagged internally by bonding itself. As a result,
+bonding has to "learn" what VLAN IDs are configured on top of it, and it uses
+those IDs to tag self generated packets.
+
+For simplicity reasons, and to support the use of adapters that can do VLAN
+hardware acceleration offloding, the bonding interface declares itself as
+fully hardware offloaing capable, it gets the add_vid/kill_vid notifications
+to gather the necessary information, and it propagates those actions to the
+slaves.
+In case of mixed adapter types, hardware accelerated tagged packets that should
+go through an adapter that is not offloading capable are "un-accelerated" by the
+bonding driver so the VLAN tag sits in the regular location.
+
+VLAN interfaces *must* be added on top of a bonding interface only after
+enslaving at least one slave. This is because until the first slave is added the
+bonding interface has a HW address of 00:00:00:00:00:00, which will be copied by
+the VLAN interface when it is created.
+
+Notice that a problem would occur if all slaves are released from a bond that
+still has VLAN interfaces on top of it. When later coming to add new slaves, the
+bonding interface would get a HW address from the first slave, which might not
+match that of the VLAN interfaces. It is recommended that either all VLANs are
+removed and then re-added, or to manually set the bonding interface's HW
+address so it matches the VLAN's. (Note: changing a VLAN interface's HW address
+would set the underlying device -- i.e. the bonding interface -- to promiscouos
+mode, which might not be what you want).
+
+
 Limitations
 ===========
 The main limitations are :
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/ifenslave.c linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/ifenslave.c
--- linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/ifenslave.c	2004-06-29 11:25:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/ifenslave.c	2004-09-05 15:54:58.000000000 +0200
@@ -89,21 +89,17 @@
  *	   while it is running. It was already set during enslave. To
  *	   simplify things, it is now handeled separately.
  *
- *    - 2003/09/24 - Shmulik Hen <shmulik.hen at intel dot com>
+ *    - 2003/12/01 - Shmulik Hen <shmulik.hen at intel dot com>
  *	 - Code cleanup and style changes
  *	   set version to 1.1.0
  */
 
 #define APP_VERSION	"1.1.0"
-#define APP_RELDATE	"Septemer 24, 2003"
+#define APP_RELDATE	"December 1, 2003"
 #define APP_NAME	"ifenslave"
 
 static char *version =
-APP_NAME ".c:v" APP_VERSION " (" APP_RELDATE ")\n"
-"o Donald Becker (becker@cesdis.gsfc.nasa.gov).\n"
-"o Detach support added on 2000/10/02 by Willy Tarreau (willy at meta-x.org).\n"
-"o 2.4 kernel support added on 2001/02/16 by Chad N. Tindel\n"
-"  (ctindel at ieee dot org).\n";
+APP_NAME ".c:v" APP_VERSION " (" APP_RELDATE ")\n";
 
 static const char *usage_msg =
 "Usage: ifenslave [-f] <master-if> <slave-if> [<slave-if>...]\n"
@@ -159,7 +155,7 @@ static const char *help_msg =
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <linux/if.h>
-#include <linux/if_arp.h>
+#include <net/if_arp.h>
 #include <linux/if_ether.h>
 #include <linux/if_bonding.h>
 #include <linux/sockios.h>
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/ixgb.txt linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/ixgb.txt
--- linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/ixgb.txt	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/ixgb.txt	2004-09-09 13:21:58.000000000 +0200
@@ -0,0 +1,431 @@
+Linux* Base Driver for the Intel(R) PRO/10GbE Family of Adapters
+================================================================
+
+March 05, 2004
+
+
+Contents
+========
+
+- In This Release
+- Supported Adapters
+- Building and Installation
+- Command Line Parameters
+- Improving Performance
+- Additional Configurations
+- Known Issues
+- Support
+
+
+In This Release
+===============
+
+This file describes the Linux* Base Driver for the Intel(R) PRO/10GbE Family
+of Adapters, version 1.0.x. This driver is intended for 2.4.x kernels; it is
+known to build properly on 2.4.x kernels through 2.4.20. Intel focused
+testing on Intel architectures running the 2.4.20 kernel. This driver
+includes support for Itanium(R)-based systems.
+
+This driver is only supported as a loadable module at this time. Intel is not
+supplying patches against the kernel source to allow for static linking of
+the driver. For questions related to hardware requirements, refer to the
+documentation supplied with your Intel PRO/10GbE adapter. All hardware
+requirements listed apply to use with Linux.
+
+Native VLANs are now available with supported kernels.
+
+The driver information previously displayed in the /proc filesystem is not
+supported in this release.  Alternatively, you can use ethtool (version 1.6
+or later), lspci, and ifconfig to obtain the same information.  Instructions
+on updating ethtool can be found in the section "Additional Configurations"
+later in this document.
+
+
+Supported Adapters
+==================
+
+The following Intel network adapters are compatible with the drivers in this 
+release:
+
+   Controller  Adapter Name                 Physical Layer
+   ----------  ------------                 --------------
+
+   82597EX     Intel(R) PRO/10GbE LR/SR     10G Base -LR and -SR
+               Server Adapters              (850 and 1310 nm optical fiber) 
+
+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
+website. In the search field, enter your adapter name or type, or use the
+networking link on the left to search for your adapter:
+
+    http://downloadfinder.intel.com/scripts-df/support_intel.asp
+
+
+Building and Installation
+=========================
+
+To build a binary RPM* package of this driver, run 'rpmbuild -tb
+<filename.tar.gz>'. Replace <filename.tar.gz> with the specific filename of
+the driver.
+
+NOTE: For the build to work properly, the currently running kernel MUST match
+      the version and configuration of the installed kernel sources. If you
+      have just recompiled the kernel reboot the system now.
+
+      RPM functionality has only been tested in Red Hat distributions.
+
+To manually build this driver:
+
+1. Move the base driver tar file to the directory of your choice. For example,
+   use /home/username/ixgb or /usr/local/src/ixgb.
+
+2. Untar/unzip archive:
+
+     tar zxf ixgb-x.x.x.tar.gz
+
+3. Change to the driver src directory:
+
+     cd ixgb-x.x.x/src/
+
+4. Compile the driver module:
+
+     make install
+
+   The binary will be installed as:
+
+     /lib/modules/[KERNEL_VERSION]/kernel/drivers/net/ixgb.o
+
+   The install locations listed above are the default locations. They might
+   not be correct for certain Linux distributions. For more information,
+   see the ldistrib.txt file included in the driver tar.
+
+5. Install the module:
+
+     insmod ixgb <parameter>=<value>
+
+6. Assign an IP address to the interface by entering the following, where
+   x is the interface number:
+
+     ifconfig ethx <IP_address>
+
+7. Verify that the interface works. Enter the following, where <IP_address>
+   is the IP address for another machine on the same subnet as the interface
+   that is being tested:
+
+     ping  <IP_address>
+
+
+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 ixgb [<option>=<VAL1>,<VAL2>,...]
+
+     insmod ixgb [<option>=<VAL1>,<VAL2>,...]
+
+For example, with two PRO/10GbE PCI adapters, entering:
+
+     insmod ixgb TxDescriptors=80,128
+
+loads the ixgb 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.
+
+
+FlowControl
+Valid Range: 0-3 (0=none, 1=Rx only, 2=Tx only, 3=Rx&Tx)
+Default: Read from the EEPROM
+         If EEPROM is not detected, default is 3
+    This parameter controls the automatic generation(Tx) and response(Rx) to
+    Ethernet PAUSE frames.
+
+RxDescriptors
+Valid Range: 64-4096
+Default Value: 1024
+    This value is the number of receive descriptors allocated by the driver.
+    Increasing this value allows the driver to buffer more incoming packets.
+    Each descriptor is 16 bytes.  A receive buffer is also allocated for
+    each descriptor and can be either 2048, 4056, 8192, or 16384 bytes,
+    depending on the MTU setting. When the MTU size is 1500 or less, the
+    receive buffer size is 2048 bytes. When the MTU is greater than 1500 the
+    receive buffer size will be either 4056, 8192, or 16384 bytes. The
+    maximum MTU size is 16114.
+
+RxIntDelay
+Valid Range: 0-65535 (0=off)
+Default Value: 72
+    This value delays the generation of receive interrupts in units of
+    0.8192 microseconds.  Receive interrupt reduction can improve CPU
+    efficiency if properly tuned for specific network traffic. Increasing
+    this value adds extra latency to frame reception and can end up
+    decreasing the throughput of TCP traffic. If the system is reporting
+    dropped receives, this value may be set too high, causing the driver to
+    run out of available receive descriptors.
+
+TxDescriptors
+Valid Range: 64-4096
+Default Value: 256
+    This value is the number of transmit descriptors allocated by the driver.
+    Increasing this value allows the driver to queue more transmits. Each
+    descriptor is 16 bytes.
+
+XsumRX
+Valid Range: 0-1
+Default Value: 1
+    A value of '1' indicates that the driver should enable IP checksum
+    offload for received packets (both UDP and TCP) to the adapter hardware.
+
+
+Improving Performance
+=====================
+
+With the Intel PRO/10 GbE adapter, the default Linux configuration will very
+likely limit the total available throughput artificially.  There is a set of
+things that when applied together increase the ability of Linux to transmit
+and receive data.  The following enhancements were originally acquired from
+settings published at http://www.spec.org/web99/ for various submitted results
+using Linux.
+
+NOTE: These changes are only suggestions, and serve as a starting point for
+tuning your network performance.
+
+The changes are made in three major ways, listed in order of greatest effect:
+- Use ifconfig to modify the mtu (maximum transmission unit) and the txqueuelen
+  parameter.
+- Use sysctl to modify /proc parameters (essentially kernel tuning)
+- Use setpci to modify the MMRBC field in PCI-X configuration space to increase
+  transmit burst lengths on the bus.
+
+NOTE: setpci modifies the adapter's configuration registers to allow it to read
+up to 4k bytes at a time (for transmits).  However, for some systems the
+behavior after modifying this register may be undefined (possibly errors of some
+kind). A power-cycle, hard reset or explicitly setting the e6 register back to
+22 (setpci -d 8086:1a48 e6.b=22) may be required to get back to a stable
+configuration.
+
+- COPY these lines and paste them into ixgb_perf.sh:
+#!/bin/bash
+echo "configuring network performance , edit this file to change the interface
+or device ID of 10GbE card"
+# set mmrbc to 4k reads, modify only Intel 10GbE device IDs
+# replace 1a48 with appropriate 10GbE device's ID installed on the system, if needed.
+setpci -d 8086:1a48 e6.b=2e
+# set the MTU (max transmission unit) - it requires your switch and clients to change too!
+# set the txqueuelen
+# your ixgb adapter should be loaded as eth1 for this to work, change if needed
+ifconfig eth1 mtu 9000 txqueuelen 1000 up
+# call the sysctl utility to modify /proc/sys entries
+sysctl -p ./sysctl_ixgb.conf
+- END ixgb_perf.sh
+
+- COPY these lines and paste them into sysctl_ixgb.conf:
+# some of the defaults may be different for your kernel
+# call this file with sysctl -p <this file>
+# these are just suggested values that worked well to increase throughput in
+# several network benchmark tests, your mileage may vary
+
+### IPV4 specific settings
+net.ipv4.tcp_timestamps = 0 # turns TCP timestamp support off, default 1, reduces CPU use
+net.ipv4.tcp_sack = 0 # turn SACK support off, default on
+# on systems with a VERY fast bus -> memory interface this is the big gainer
+net.ipv4.tcp_rmem = 10000000 10000000 10000000 # sets min/default/max TCP read buffer, default 4096 87380 174760
+net.ipv4.tcp_wmem = 10000000 10000000 10000000 # sets min/pressure/max TCP write buffer, default 4096 16384 131072
+net.ipv4.tcp_mem = 10000000 10000000 10000000 # sets min/pressure/max TCP buffer space, default 31744 32256 32768
+
+### CORE settings (mostly for socket and UDP effect)
+net.core.rmem_max = 524287 # maximum receive socket buffer size, default 131071
+net.core.wmem_max = 524287 # maximum send socket buffer size, default 131071
+net.core.rmem_default = 524287 # default receive socket buffer size, default 65535
+net.core.wmem_default = 524287 # default send socket buffer size, default 65535
+net.core.optmem_max = 524287 # maximum amount of option memory buffers, default 10240
+net.core.netdev_max_backlog = 300000 # number of unprocessed input packets before kernel starts dropping them, default 300
+- END sysctl_ixgb.conf
+
+Edit the ixgb_perf.sh script if necessary to change eth1 to whatever interface
+your ixgb driver is using and/or replace '1a48' with appropriate 10GbE device's 
+ID installed on the system.
+
+NOTE: Unless these scripts are added to the boot process, these changes will
+only last only until the next system reboot.
+
+
+Resolving Slow UDP Traffic
+--------------------------
+
+If your server does not seem to be able to receive UDP traffic as fast as it
+can receive TCP traffic, it could be because Linux, by default, does not set
+the network stack buffers as large as they need to be to support high UDP
+transfer rates. One way to alleviate this problem is to allow more memory to
+be used by the IP stack to store incoming data.
+
+For instance, use the commands:
+    sysctl -w net.core.rmem_max=262143
+and
+    sysctl -w net.core.rmem_default=262143
+to increase the read buffer memory max and default to 262143 (256k - 1) from
+defaults of max=131071 (128k - 1) and default=65535 (64k - 1). These variables
+will increase the amount of memory used by the network stack for receives, and
+can be increased significantly more if necessary for your application.
+
+
+Additional Configurations
+=========================
+
+  Configuring the Driver on Different Distributions
+  -------------------------------------------------
+
+  Configuring a network driver to load properly when the system is started is
+  distribution dependent. Typically, the configuration process involves adding
+  an alias line to /etc/modules.conf as well as editing other system startup
+  scripts and/or configuration files. Many popular Linux distributions ship
+  with tools to make these changes for you. To learn the proper way to
+  configure a network device for your system, refer to your distribution
+  documentation. If during this process you are asked for the driver or module
+  name, the name for the Linux Base Driver for the Intel PRO/10GbE Family of
+  Adapters is ixgb.
+
+  Viewing Link Messages
+  ---------------------
+
+  Link messages will not be displayed to the console if the distribution is
+  restricting system messages. In order to see network driver link messages on
+  your console, set dmesg to eight by entering the following:
+
+       dmesg -n 8
+
+  NOTE: This setting is not saved across reboots.
+
+  Jumbo Frames
+  ------------
+
+  The driver supports Jumbo Frames for all adapters. Jumbo Frames support is
+  enabled by changing the MTU to a value larger than the default of 1500.
+  The maximum value for the MTU is 16114. 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.
+
+  Ethtool
+  -------
+
+  The driver utilizes the ethtool interface for driver configuration and
+  diagnostics, as well as displaying statistical information.  Ethtool
+  version 1.6 or later is required for this functionality.
+
+  The latest release of ethtool can be found from
+  http://sf.net/projects/gkernel.  After ethtool is installed,
+  ethtool-copy.h must be copied and renamed to ethtool.h in your kernel
+  source tree at <linux_kernel_src>/include/linux.  Backup the original
+  ethtool.h as needed before copying.  The driver then must be recompiled
+  in order to take advantage of the latest ethtool features.
+
+  NAPI
+  ----
+
+  NAPI (Rx polling mode) is supported in the ixgb driver, but is turned off
+  by default. To enable NAPI, compile the driver module, passing in a
+  configuration option:
+
+       make CFLAGS_EXTRA=-DCONFIG_IXGB_NAPI install
+
+  See www.cyberus.ca/~hadi/usenix-paper.tgz for more information on NAPI.
+
+
+
+Known Issues
+============
+
+NOTE: For distribution-specific information, see the ldistrib.txt file
+      included in the driver tar.
+
+  Driver Compilation
+  ------------------
+
+  When trying to compile the driver by running make install, the following
+  error may occur:
+
+      "Linux kernel source not configured - missing version.h"
+
+  To solve this issue, create the version.h file by going to the Linux source
+  tree and entering:
+
+      make include/linux/version.h.
+
+
+  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
+  requirement of 64 MB of system memory.
+
+
+  Performance Degradation with Jumbo Frames
+  -----------------------------------------
+
+  Degradation in throughput performance may be observed in some Jumbo frames
+  environments. If this is observed, increasing the application's socket buffer
+  size and/or increasing the /proc/sys/net/ipv4/tcp_*mem entry values may help.
+  See the specific application manual and /usr/src/linux*/Documentation/
+  networking/ip-sysctl.txt for more details.
+
+
+  Multiple Interfaces on Same Ethernet Broadcast Network
+  ------------------------------------------------------
+
+  Due to the default ARP behavior on Linux, it is not possible to have
+  one system on two IP networks in the same Ethernet broadcast domain
+  (non-partitioned switch) behave as expected. All Ethernet interfaces
+  will respond to IP traffic for any IP address assigned to the system.
+  This results in unbalanced receive traffic.
+
+  If you have multiple interfaces in a server, either turn on ARP
+  filtering by entering:
+
+      echo 1 > /proc/sys/net/ipv4/conf/all/arp_filter
+  (this only works if your kernel's version is higher than 2.4.5),
+
+      or,
+
+  install the interfaces in separate broadcast domains (either
+  in different switches or in a switch partitioned to VLANs).
+
+
+
+Support
+=======
+
+For general information, 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
+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
+install or use the Software.
+
+* Other names and brands may be claimed as the property of others.
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/lr/Changelog linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/lr/Changelog
--- linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/lr/Changelog	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/lr/Changelog	2004-09-05 16:00:19.000000000 +0200
@@ -0,0 +1,67 @@
+lr-0.8.5 (2004/6/16)
+ * Non-privilege user operation
+ * Fixed: lr.ko is invalid module format on linux-2.6.6.
+
+lr-0.8.4 (2004/3/2)
+ * Ethernet device sticky mechanism introduced (w/ ethmap).
+
+lr-0.8.3 (2004/2/21)
+ * No changes functionally.
+ * ioctl returns error code.
+
+lr-0.8.2 (2004/2/1)
+ * linux-2.6 supported
+
+lr-0.8.0 (2002/9/14)
+ * Introduced port level and group level link status reporting via ioctl()
+
+lr-0.7.0 (2002/8/30)
+ * Phase III implementation
+ * Phase II compatibility mode
+ * configuration file introduced for lrcfg.
+
+lr-0.6.5 (2002/3/24)
+ * After topoloogy changed, BFI sub-entry is not updated by RCF -- fixed.
+ * After the first port of the first group deletion, system id is not
+   updated --fixed.
+
+lr-0.6.4 (2002/3/9)
+ * No changes functionally.
+ * Remaining BFI entry for neighbor LRCP nodes which no longer exist. -- fixed.
+ * FAULT while "showport" with vif which does not exist. -- fixed.
+
+lr-0.6.3 (2002/2/24)
+ * No changes functionally.
+ * Duplicate physical i/f registeration with plural virtual i/f -- fixed.
+ 
+lr-0.6.2
+ * No changes functionally.
+ * Compilation issue on linux-2.2 fixed
+
+lr-0.6.1
+ * No changes functionally.
+ * /proc resource leak bug fixed.
+
+lr-0.6.0
+ * Protocol enhancement. BFU implemented. Frame forwarding facility
+   rejected.
+
+lr-0.5.0
+ * Protocol enhancement. Frame forwarding facility is added to avoid
+   multiple active paths to other LRCP nodes.
+ * Critical bug(OOPS) in SMP -- fixed.
+ * No subgroup for all the ports forever -- fixed.
+ * lrcfg command structure changed.
+
+lr-0.4.0
+ * No changes functionally.
+ * Solved device locking issue on linux-2.4.
+ * Corrected pseudo packet type. 
+ * Hided many symbols in order to avoid conflict with veth module.
+
+lr-0.3.1
+ * No changes functionally.
+ * Fix critical bug in lr_group_distribution().
+
+lr-0.3.0
+ Initial release
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/lr/Makefile linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/lr/Makefile
--- linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/lr/Makefile	2004-06-29 11:25:31.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/lr/Makefile	2004-09-05 16:00:20.000000000 +0200
@@ -49,12 +49,25 @@ prep:
 	ln -s $(LINUX_SRC)/include include
 	sed -e "/^all:/d" -e "/^install/d" \
 		$(LINUX_SRC)/arch/$(ARCH)/Makefile > make.defs
-	make lr.o
+#	if [ $(LINUX_VER_SUB) = 2.2 ]; then \
+#		make lr.o; \
+#	elif [ $(LINUX_VER_SUB) = 2.4 ]; then \
+#		make lr.o; \
+#	else \
+#		make lr.ko; \
+#	fi
 	make lrcfg
 	make lrcfg.8
 
 
-lr.o: lr.c lr.h
+lr.ko: lr.o lr.mod.o
+	ld -r -o lr.ko lr.o lr.mod.o
+
+lr.mod.o: lr.o
+	$(LINUX_SRC)/scripts/modpost $(LINUX_SRC)/vmlinux lr.o
+	gcc -nostdinc -iwithprefix include -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -O2 -fomit-frame-pointer $(CFLAGS) -DMODULE -DKBUILD_BASENAME=lr -DKBUILD_MODNAME=lr -c -o lr.mod.o lr.mod.c
+
+lr.o: lr.c lrlink.h
 	gcc -nostdinc -iwithprefix include -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -O2 -fomit-frame-pointer $(CFLAGS) -DMODULE -DKBUILD_BASENAME=lr -DKBUILD_MODNAME=lr -c -o lr.o lr.c
 
 lrcfg: lrcfg.o lrcmd.o
@@ -73,7 +86,7 @@ lrcfg.8: lrcfg.8.in lrcfg.h
 	cpp -P $< | sed -e "/^$$/d" > $@
 
 clean:
-	rm -f *.o *.ko lrcfg lrcfg.8 make.defs include
+	rm -f *.o *.ko *.mmd.c lrcfg lrcfg.8 make.defs include
 
 
 install:
@@ -85,7 +98,6 @@ install:
 		mkdir -p /lib/modules/$(LINUX_VER)/lr; \
 		ginstall -o root -g root -m 644 lr.o /lib/modules/$(LINUX_VER)/lr; \
 	else \
-		mv lr.o lr.ko; \
 		mkdir -p /lib/modules/$(LINUX_VER)/lr; \
 		ginstall -o root -g root -m 644 lr.ko /lib/modules/$(LINUX_VER)/lr; \
 	fi
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/lr/lr.c linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/lr/lr.c
--- linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/lr/lr.c	2004-06-29 11:25:31.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/lr/lr.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,3471 +0,0 @@
-/* $Id: lr.c,v 1.16 2004/02/21 08:41:28 yumo Exp $ */
-/* LR: A virtual ethernet device driver for Linux. 
- *
- * This device driver is implementation of Redundancy of
- * Link Segment (Yumo's original protocol).
- *
- * Author: Yumo (Katsuyuki Yumoto) 2001-2004
- *         yumo@st.rim.or.jp
- *
- * 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  02111-1307, USA.
- */
-
-#include <linux/config.h>
-#include <linux/version.h>
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/types.h>
-#include <linux/fcntl.h>
-#include <linux/interrupt.h>
-#include <linux/string.h>
-#include <linux/ptrace.h>
-#include <linux/if_ether.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-#include <net/sock.h>
-#endif
-#include <asm/system.h>
-#include <asm/uaccess.h>
-#include <asm/io.h>
-#include <linux/in.h>
-#include <linux/errno.h>
-#include <linux/delay.h>
-#include <linux/lp.h>
-#include <linux/init.h>
-
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/inetdevice.h>
-#include <linux/skbuff.h>
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-#include <linux/tqueue.h>
-#endif
-#include <linux/ioport.h>
-#include <asm/bitops.h>
-#include <asm/irq.h>
-#include <asm/byteorder.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-#include <asm/spinlock.h>
-#else
-#include <linux/spinlock.h>
-#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,5)
-#include "miicompat.h"
-#else
-#include <linux/mii.h>
-#endif
-#include <linux/proc_fs.h>
-
-#include <linux/timer.h>
-
-#include "lr.h"
-
-int nlr = 1;
-
-MODULE_PARM(nlr, "1-" __MODULE_STRING(MAX_PHYIF) "i");
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-MODULE_PARM_DESC(nlr, "lr" " number of groups (1-MAX_PHYIF)");
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-/* 
- * Linux module subsystem does not provide module handling
- * facility by corresponding device name.
- * I don't want to make lr driver depend on module name
- * but it depends on device name (e.g. eth0).
- * However there are no way to lock/unlock the module by device name.
- * Therefore I need to convert device name into module name, and
- * then lock/unlock the module...
- */
-/* find_module() is exported by patch */
-extern struct module *find_module(const char *name);
-
-#define MAX_MODNAME 16
-#endif
-
-/* interface name length */
-#define MAX_NAME 7
-
-static u16 get_link_stat(struct net_device *dev)
-{
-	static int (* ioctl)(struct net_device *, struct ifreq *, int);
-	struct ifreq ifr;
-	struct mii_ioctl_data *data = (struct mii_ioctl_data *)&ifr.ifr_data;
-		
-	/* Status register is mapped at address 1 in 
-	 * MII management register set space.
-	 * (IEEE Std 802.3, 1998)*/
-	data->reg_num = MII_BMSR; 
-
-	ioctl = dev->do_ioctl;
-	if (ioctl && (ioctl(dev, &ifr, SIOCGMIIPHY) == 0)) {
-		/* m->val_out contains status
-		 * bit 2: 1 = link is up (BMSR_LSTATUS)
-		 * bit 5: 1 = auto-negotiation process completed (BMSR_ANEGCOMPLETE)
-		 */
-		return data->val_out & (BMSR_LSTATUS | BMSR_ANEGCOMPLETE);
-	}
-	else {
-		return BMSR_LSTATUS | BMSR_ANEGCOMPLETE;  /* assume link up... */
-	}
-}
-
-static u16 get_group_link_stat(struct net_device *dev)
-{
-	struct lr_private *vp;
-	struct group_var *gv;
-	int i;
-	u16 ret = 0;
-
-	if (!dev)
-		return 0;
-
-	vp = (struct lr_private *)dev->priv;
-	gv = &(vp->group->var);
-
-	for (i = 0; i < MAX_PHYIF; i++){
-		if (gv->port_list[i]){
-			ret |= get_link_stat(lr_ports[gv->port_list[i]-1].dev);
-		}
-	}
-	return ret;
-}
-
-static int dev_to_port_num(struct net_device *dev)
-{
-	int i;
-	int pn;
-
-	for (i = 0, pn = 0; i < MAX_PHYIF; i++){
-		if (lr_ports[i].dev == dev){
-			pn = i + 1;
-			break;
-		}
-	}
-
-	return pn;
-}
-
-static int hash_mac_addr(u8 *addr)
-{
-	u32 hash;
-
-	hash = *((u32 *)addr);
-	hash ^= hash >>16;
-	hash ^= hash >> 8;
-	hash %= 32;
-
-	return hash;
-}
-
-static struct lr_group *lr_get_group_by_num(int n)
-{
-	if (n < 1 || MAX_PHYIF < n)
-		return NULL;
-
-	return lr_groups + n - 1;
-}
-
-static struct lr_group *lr_get_head_group(void)
-{
-	return lr_groups;
-}
-
-static struct lr_group *lr_get_next_group(struct lr_group *g)
-{
-	int n = ++g - lr_groups;
-	if (n < 0 || MAX_PHYIF <= n)
-		return NULL;
-	return g;
-}
-
-static struct lr_port *lr_get_port_by_num(int n)
-{
-	if (n < 1 || MAX_PHYIF < n)
-		return NULL;
-
-	return lr_ports + n - 1;
-}
-
-static struct lr_port *lr_get_head_port(void)
-{
-	return lr_ports;
-}
-
-static struct lr_port *lr_get_next_port(struct lr_port *p)
-{
-	int n = ++p - lr_ports;
-	if (n < 0 || MAX_PHYIF <= n)
-		return NULL;
-	return p;
-}
-
-/********************************************************
- *
- *   Link Redundancy Configuration Protocol
- *
- ********************************************************/
-
-/* Group level functions */
-static u16 lr_search_for_subg(u8 *da, struct group_var *gv)
-{
-	int i;
-
-	struct dist_info *h, *p;
-	u16 ret = 0;
-
-	i = hash_mac_addr(da);
-
-	/* we need to lock hash list here */
-	spin_lock(&gv->dist_lock);
-
-	h = gv->dist_info[i];
-	/* then do access */
-	for (p = h; p; p = p->next){
-		if (!memcmp(da, p->m_addr, ETH_ALEN)){
-			ret = p->sgid;
-			break;
-		}
-	}
-
-	/* we need to unlock hash list here */
-	spin_unlock(&gv->dist_lock);
-
-	return ret;
-}
-
-
-/* Sub group level functions */
-static void
-lr_update_distinfo(u8 *sa, int sgid, int is_bfu, u16 age, struct group_var *gv)
-{
-	struct dist_info *h, *p;
-	int i;
-
-	i = hash_mac_addr(sa);
-
-	/* we need to lock hash list here */
-	spin_lock(&gv->dist_lock);
-
-	h = gv->dist_info[i];
-	/* search for same address on the list */
-	for (p = h; p; p = p->next){
-		if (!memcmp(sa, p->m_addr, ETH_ALEN)){
-			/* found. already registered */
-			if (is_bfu){
-				p->bfu_mark = _TRUE;
-				p->sgid = sgid;
-				p->age = age;
-			} else {
-				if (!p->bfu_mark){
-					p->sgid = sgid;
-					p->age = age;
-				}
-			}
-
-			/* we need to unlock hash list here */
-			spin_unlock(&gv->dist_lock);
-			return;
-		}
-	}
-
-	/* registering new distributing information */
-	h = kmalloc(sizeof(struct dist_info), GFP_ATOMIC);
-	if (!h){
-		spin_unlock(&gv->dist_lock);
-		return;
-	}
-	memcpy(h->m_addr, sa, ETH_ALEN);
-	if (is_bfu){
-		h->bfu_mark = 1;
-	} else {
-		h->bfu_mark = 0;
-	}
-	h->sgid = sgid;
-	h->age = age;
-	atomic_set(&h->use_count, 1);
-
-	h->next = gv->dist_info[i];
-	gv->dist_info[i] = h;
-
-	/* we need to unlock hash list here */
-	spin_unlock(&gv->dist_lock);
-
-	return;
-}
-
-static void lr_clear_distinfo(struct group_var *gv)
-{
-	struct dist_info *h, *p;
-	int i;
-
-	/* we need to lock hash list here */
-	spin_lock(&gv->dist_lock);
-
-	for (i = 0; i < 32; i++){
-
-		/* then do access */
-		h = gv->dist_info[i];
-		for (p = h; p; p = h){
-			h = p->next;
-			if (atomic_dec_and_test(&p->use_count))
-				kfree(p);
-		}
-		gv->dist_info[i] = NULL; /* Don't forget this */
-
-	}
-
-	/* we need to unlock hash list here */
-	spin_unlock(&gv->dist_lock);
-
-	return;
-}
-
-static void lr_age_distinfo(struct group_var *gv)
-{
-	struct dist_info *h, *p, **pp;
-	int i;
-
-	/* we need to lock hash list here */
-	spin_lock(&gv->dist_lock);
-
-	for (i = 0; i < 32; i++){
-
-		/* then do access */
-		h = gv->dist_info[i];
-		for (p = h, pp = &(gv->dist_info[i]); p; p = h){
-			h = p->next;
-			if (!p->age--){
-				*pp = h;
-				if (atomic_dec_and_test(&p->use_count)){
-					kfree(p);
-				}
-				if (h)
-					pp = &(h->next);
-			} else {
-				pp = &(p->next);
-			}
-		}
-
-	}
-
-	/* we need to unlock hash list here */
-	spin_unlock(&gv->dist_lock);
-
-	return;
-}
-
-
-static void
-lr_update_sgmt_temp(u16 active_id, u16 port_id, struct group_var *gv)
-{
-	struct sgmte *sp;
-	int i, j, k;
-
-	sp = gv->temp_sgmt;
-
-	/* search for same port_id on the temp SGMT */
-	for (i = 0; i < MAX_PHYIF && sp[i].port_id; i++){
-		if (sp[i].port_id == port_id){
-			/* found. already registered. override it.*/
-			sp[i].active_id = active_id;
-			return;
-		}
-	}
-
-	/* registering new sgmt entry */
-	for (i = 0; i < MAX_PHYIF; i++){
-		if (!sp[i].port_id || sp[i].port_id > port_id){
-			for (j = MAX_PHYIF-1, k = MAX_PHYIF-2; j != i; j--, k--){
-				sp[j] = sp[k];
-			}
-			sp[i].active_id = active_id;
-			sp[i].port_id = port_id;
-			return;
-		}
-	}
-
-	return;
-}
-
-static void lr_clear_sgmt_temp(struct group_var *gv)
-{
-	struct sgmte *sp;
-
-	sp = gv->temp_sgmt;
-	memset(sp, 0, sizeof(struct sgmte)*MAX_PHYIF);
-
-	return;
-}
-static void lr_clear_sgmt_master(struct group_var *gv)
-{
-	struct sgmte *sp;
-
-	sp = gv->master_sgmt;
-	memset(sp, 0, sizeof(struct sgmte)*MAX_PHYIF);
-
-	return;
-}
-
-static void lr_mark_active(struct group_var *gv)
-{
-	struct sgmte *sp;
-	int i, j;
-	int sgid = 1;
-
-	sp = gv->temp_sgmt;
-
-	for (i = 0; i < MAX_PHYIF; i++){
-		if (sp[i].port_id == sp[i].active_id){
-			/* marking active flag */
-			sp[i].active = _TRUE;
-			/* then set sgid */
-			sp[i].sgid = sgid++;
-			/* set the sgid to other sgmte which has same active_id */
-			for (j = 0; j < MAX_PHYIF; j++){
-				if (sp[i].active_id == sp[j].active_id){
-					sp[j].sgid = sp[i].sgid;
-				}
-			}
-		}
-	}
-
-	return;
-}
-
-static bool lr_comp_sgmt(struct group_var *gv)
-{
-	struct sgmte *msp;
-	struct sgmte *tsp;
-	int i;
-
-	tsp = gv->temp_sgmt;
-	msp = gv->master_sgmt;
-
-	for (i = 0; i < MAX_PHYIF; i++){
-		if (memcmp(tsp+i, msp+i, sizeof(struct sgmte)) != 0){
-			return _FALSE;
-		}
-	}
-
-	return _TRUE;
-}
-
-static void lr_update_sgmt_master(struct group_var *gv)
-{
-	struct sgmte *msp;
-	struct sgmte *tsp;
-
-	tsp = gv->temp_sgmt;
-	msp = gv->master_sgmt;
-
-	memcpy(msp, tsp, sizeof(struct sgmte)*MAX_PHYIF);
-
-	return;
-}
-
-static void lr_update_sg_param(struct group_var *gv)
-{
-	struct sgmte *msp;
-	struct subgroup_var *sgp;
-	int i, j;
-
-	sgp = gv->subg_list;
-	msp = gv->master_sgmt;
-
-	memset(sgp, 0, sizeof(struct subgroup_var)*MAX_PHYIF);
-
-	for (i = 0; i < MAX_PHYIF; i++){
-		j = msp[i].sgid;
-		if (j){
-			j--;
-			sgp[j].active_id = msp[i].active_id;
-		}
-	}
-
-	return;
-}
-
-static void lr_update_port_param(struct group_var *gv)
-{
-	struct sgmte *msp;
-	struct lr_port *pe;
-	int *pp;
-	int i, j;
-
-	pp = gv->port_list;
-	msp = gv->master_sgmt;
-
-	for (i = 0; i < MAX_PHYIF && pp[i]; i++){
-		for (j = 0; j < MAX_PHYIF; j++){
-			if (pp[i] == (msp[j].port_id & 0xff)){
-				/* update port's local SGMT */
-				pe = lr_get_port_by_num(pp[i]);
-				memcpy(&pe->pv.local_sgmt, msp+j, sizeof(struct sgmte));
-				break;
-			}
-		}
-	}
-
-	return;
-}
-
-static void lr_init_rct_each(struct lr_port *lrp, u16 port_id)
-{
-	struct rcte *h, *r;
-	struct lr_port *p;
-
-	if (!port_id)
-		return;
-	
-	h = lrp->pv.rct;
-	/* free all elements */
-	for (r = h; r; r = h){
-		h = r->next;
-		kfree(r);
-	}
-	lrp->pv.rct = NULL;
-
-	p = lr_get_port_by_num(port_id);
-	if (!p->dev)
-		return;
-
-	/* alloc new entry */
-	lrp->pv.rct = h = kmalloc(sizeof (struct rcte), GFP_ATOMIC);
-	if (!h){
-		return;
-	}
-	memset(h, 0, sizeof(struct rcte));
-
-	/* then set port_id */
-	h->port_id = port_id;
-	h->next = NULL;
-
-	return;
-}
-
-static void lr_init_rct(struct group_var *gv)
-{
-	struct sgmte *msp;
-	int *pp;
-	int i;
-
-	pp = gv->port_list;
-	msp = gv->master_sgmt;
-
-	for (i = 0; i < MAX_PHYIF; i++){
-		if (pp[i]){
-			lr_init_rct_each(lr_get_port_by_num(pp[i]), pp[i]);
-		}
-	}
-
-	return;
-}
-
-static void lr_register_rcf(struct lr_port *lrp, u16 port_id)
-{
-	struct rcte *h, *r;
-
-	h = lrp->pv.rct;
-	/* search for same port_id in the list */
-	for (r = h; r; r = r->next){
-		if (r->port_id == port_id){
-			/* already registered. do nothing. */
-			return;
-		}
-	}
-
-	/* alloc new entry */
-	h = kmalloc(sizeof (struct rcte), GFP_ATOMIC);
-	if (!h){
-		return;
-	}
-	memset(h, 0, sizeof(struct rcte));
-	h->next = lrp->pv.rct;
-	lrp->pv.rct = h;
-
-	/* then set port_id */
-	h->port_id = port_id;
-
-	return;
-}
-
-
-/* make all SgN: active_id 0 */
-static void lr_clear_sg_active_id(struct group_var *gv)
-{
-	int i;
-
-	for (i = 0; i < MAX_PHYIF; i++){
-		gv->subg_list[i].active_id = 0;
-	}
-};
-
-
-/* make all PortN: sgid 0 */
-static void lr_clear_port_sgid(struct group_var *gv)
-{
-	int i;
-	int port;
-	struct lr_port *p;
-
-	for (i = 0; i < MAX_PHYIF && (port = gv->port_list[i]); i++){
-		p = lr_get_port_by_num(port);
-		p->pv.local_sgmt.sgid = 0;
-	}
-};
-
-static void lr_notify_rcf(struct group_var *gv)
-{
-	int i, j;
-	int pn;
-	int *pp;
-	struct nrcf val;
-	struct rcte *r, *h;
-	struct lr_port *p;
-	int min_id;
-
-	pp = gv->port_list;
-
-	for (i = 0; i < MAX_PHYIF; i++){
-		pn = pp[i];
-		if (!pn)
-			continue;
-
-		p = lr_get_port_by_num(pn);
-		if (!p->dev)
-			continue;
-
-		val.port_id = p->pv.local_sgmt.port_id;
-		min_id = val.port_id;
-		
-		h = p->pv.rct;
-		for (r = h, j = 0; r; r = r->next, j++){
-			if (min_id > r->port_id){
-				min_id = r->port_id;
-			}
-		}
-
-		val.active_id = p->pv.local_sgmt.active_id = min_id;
-		ring_put(&(gv->rb), (char *)&val, sizeof(struct nrcf));
-	}
-
-	return;
-}
-
-
-static void lr_tchg_detected(struct group_var *gv)
-{
-	unsigned long t_perio;
-
-	gv->tchg_detected = _TRUE;
-
-	if (gv->pii_live && gv->pii_opt){
-		gv->perio_time = Periodic_Time;
-		return;
-	}
-
-	t_perio = gv->admin_perio_time;
-
-	if (gv->tchg_opt && !gv->tchg_notified){
-		/* In order to notify topology change to neighbors ASAP,
-		   temporarily make perio_time 1/10. */
-		gv->perio_time = net_random()%(t_perio/10) + One_Sec;
-	} else
-		gv->perio_time = net_random()%(t_perio) + One_Sec;
-
-	gv->tchg_notified = _FALSE;
-	return;
-}
-
-
-static void lr_tchg_not_detected(struct group_var *gv)
-{
-	gv->tchg_detected = _FALSE;
-	gv->tchg_notified = _FALSE;
-
-	if (gv->pii_live && gv->pii_opt)
-		gv->perio_time = Periodic_Time;
-	else
-		gv->perio_time = gv->admin_perio_time;
-
-	return;
-}
-
-static void lr_tchg_notified(struct group_var *gv)
-{
-	unsigned long t_perio;
-
-	if (gv->pii_live && gv->pii_opt){
-		gv->tchg_notified = _FALSE;
-		gv->perio_time = Periodic_Time;
-		return;
-	}
-
-	gv->tchg_notified = _TRUE;
-	if (!gv->tchg_detected){
-		/* After topology change is notified, in order to make sure
-		   it, temporarily make perio_time 1/10 or less. */
-		t_perio = gv->admin_perio_time;
-		gv->perio_time = net_random()%(t_perio/10) + One_Sec;
-	}
-}
-
-static struct net_device *lr_search_for_port(u16 port_id)
-{
-	struct lr_port *p;
-
-	if (!port_id)
-		goto nodev;
-
-	for (p = lr_get_head_port(); p; p = lr_get_next_port(p)){
-		if (p->pv.local_sgmt.port_id == port_id){
-			return p->dev;
-		}
-	}
-
-nodev:
-	return NULL;
-}
-
-static bool
-lr_subg_distribution(struct sk_buff *skb, struct subgroup_var *sl, u16 sg)
-{
-	struct net_device *tdev;
-
-	sg--;
-	if (!sl[sg].active_id)
-		goto freeandout;
-
-	tdev = lr_search_for_port(sl[sg].active_id);
-	if (!tdev)
-		goto freeandout;
-
-	skb->dev = tdev;
-	/* Don't set skb->trans_start ! */
-	dev_queue_xmit(skb);
-	return _TRUE;
-
-freeandout:
-	kfree_skb(skb);
-	return _FALSE;
-}
-
-static bool
-lr_all_subg_distribution(struct sk_buff *skb, struct subgroup_var *sl)
-{
-	bool ret = _FALSE;
-	struct sk_buff *nskb;
-	int i;
-
-	if (!sl)
-		goto freeandout;
-
-	for (i = 1; i <= MAX_PHYIF; i++){
-		nskb = skb_clone(skb, GFP_ATOMIC);
-		if (!nskb){
-			break;
-		}
-		ret |= lr_subg_distribution(nskb, sl, i);
-		if (!ret)
-			break;
-	}
-freeandout:
-	kfree_skb(skb);
-	return ret;
-}
-
-
-static int lr_group_distribution(struct sk_buff *skb, struct net_device *dev)
-{
-	struct lr_private *vp;
-	struct ethhdr *eh;
-	struct sk_buff *nskb;
-	int len;
-
-	u16 sgid; /* sub-group */
-	struct group_var *gv;
-
-	if (!skb){
-		printk(KERN_CRIT "lr_frame_distribution(): skb is NULL!\n");
-		return NET_XMIT_DROP;
-	}
-	if (!dev){
-		printk(KERN_CRIT "lr_frame_distribution(): dev is NULL!\n");
-		kfree_skb(skb);
-		return NET_XMIT_DROP;
-	}
-
-	vp = dev->priv;
-	gv = &(vp->group->var);
-
-	/* Search for proper subgroup for transmitting this skb. */
-
-	/* don't use skb->mac.* */
-	eh = (struct ethhdr *)skb->data;
-	if (eh->h_dest[0]&1)
-		sgid = 0;
-	else
-		sgid = lr_search_for_subg(eh->h_dest, gv);
-
-	/* There may be no ports for distributing this skb. so we need
-	 * to clone skb to remove such skb */
-	nskb = skb;
-	skb = skb_clone(nskb, GFP_ATOMIC);
-
-	if (!skb){
-		return NET_XMIT_DROP;
-	}
-
-	len = skb->len;
-
-	switch (sgid){
-	case 0:
-		/* Unknown subgroup for distributing this skb. So, forward
-         * this to all the sug-groups.
-		 */
-		if (!lr_all_subg_distribution(skb, vp->group->var.subg_list)){
-			return NET_XMIT_DROP;
-		}
-		break;
-	default:
-		if (!lr_subg_distribution(skb, vp->group->var.subg_list, sgid)){
-			return NET_XMIT_DROP;
-		}
-		break;
-	}
-	kfree_skb(nskb);
-
-	vp->enet_stats.tx_bytes += len;
-	vp->enet_stats.tx_packets++;
-
-	return NET_XMIT_SUCCESS;
-}
-
-static void inline lr_pass_to_upper(struct sk_buff *skb)
-{
-	netif_rx(skb);
-}
-
-static void
-lr_group_collector(struct sk_buff *skb, struct net_device *dev, struct group_var *gv)
-{
-	struct ethhdr *eh;
-	bool is_local_skb;
-	struct lr_private *vp;
-
-	vp = dev->priv;
-
-	eh = (struct ethhdr *)skb->mac.raw;
-	is_local_skb = 
-		(!memcmp(gv->group_addr, eh->h_dest, ETH_ALEN) ||
-		eh->h_dest[0]&1)?_TRUE:_FALSE;
-
-	skb->dev = dev;
-
-	if (is_local_skb)
-		skb->pkt_type = PACKET_HOST;
-	else
-		skb->pkt_type = PACKET_OTHERHOST;
-		
-	if (is_local_skb || dev->flags&IFF_PROMISC){
-		vp->enet_stats.rx_bytes += skb->len;
-		vp->enet_stats.rx_packets++;
-		lr_pass_to_upper(skb);
-	} else 
-		kfree_skb(skb);
-
-	return;
-	
-}
-
-
-
-static void lr_submit_ntr(struct group_var *gv)
-{
-	spin_lock(&gv->lock);
-
-	/* make all PortN: sgid 0 */
-	lr_clear_sg_active_id(gv);
-
-	/* make ntr true */
-	gv->ntr = _TRUE;
-
-	/* make all PortN: sgid 0 */
-	lr_clear_port_sgid(gv);
-
-	/* reset all the state machines */
-	gv->begin = _TRUE;
-
-	spin_unlock(&gv->lock);
-
-	return;
-}
-
-/* BFU */
-static bool
-lr_bfu_pass(unsigned char *sa, unsigned short sg, struct group_var *gv)
-{
-	int hash;
-	struct glist_ent *p;
-	int ret = _TRUE;
-
-	hash = hash_mac_addr(sa);
-
-	spin_lock(&gv->bfu_lock);
-
-	for (p = gv->gl[hash]; p; p = p->next2){
-		if (memcmp(p->gaddr, sa, ETH_ALEN) == 0)
-			if (p->min_sgid != sg)
-				ret = _FALSE;
-	}
-
-	spin_unlock(&gv->bfu_lock);
-
-	return ret;
-}
-
-static void
-lr_subg_collector(struct sk_buff *skb, struct net_device *dev, int sg)
-{
-	struct ethhdr *eh;
-	struct group_var *gv;
-	struct lr_private *vp;
-
-	eh = (struct ethhdr *)skb->mac.raw;
-	vp = (struct lr_private *)dev->priv;
-	gv = &(vp->group->var);
-
-	if (!memcmp(eh->h_source, dev->dev_addr, ETH_ALEN)){
-		/* loopback packet is detected. Submit NTR immediately. */
-		lr_submit_ntr(gv);
-		goto freeandout;
-	}
-
-	/* BFU */
-	if (eh->h_dest[0]&1)
-		if (!lr_bfu_pass(eh->h_source, sg, gv))
-			goto freeandout;
-
-	lr_update_distinfo(eh->h_source, sg, 0, gv->age_time, gv);
-	lr_group_collector(skb, dev, gv);
-	return;
-
-freeandout:
-	kfree_skb(skb);
-	return;
-}
-
-
-static int lr_nf_receiver(struct sk_buff *skb, struct net_device *dev)
-{
-	unsigned char *buf;
-	int grp, sg, port;
-	struct lacpdu *pdu;
-	struct lr_port *p;
-	struct lr_group *g;
-
-	buf = skb->mac.raw + ETH_HLEN;
-	pdu = (struct lacpdu *)buf;
-
-	/* calculate port num */
-	port = dev_to_port_num(dev);
-	if (!port)
-		goto freeandout;
-	p = lr_get_port_by_num(port);
-
-	if (!p->pv.local_sgmt.active)
-		goto freeandout;
-
-	grp = p->pv.group_id;
-	if (!grp)
-		goto freeandout;
-
-	g = lr_get_group_by_num(grp);
-	sg = p->pv.local_sgmt.sgid;
-	if (!sg)
-		goto freeandout;
-
-	lr_subg_collector(skb, g->dev, sg);
-	return NET_RX_SUCCESS;
-
-freeandout:
-	kfree_skb(skb);
-	return NET_RX_DROP;
-}
-
-/* Broadcast Filtering Unit (BFU) */
-static struct sysid_ent *
-lr_search_sysid_bfu (unsigned char *sysid, struct group_var *gv)
-{
-	struct sysid_ent *p;
-
-	for (p = gv->sysidl; p; p = p->next)
-		if (memcmp(p->sysid, sysid, ETH_ALEN) == 0)
-			return p;
-
-	return NULL;
-}
-
-static struct glist_ent *
-lr_search_gle_bfu (unsigned short gid, struct sysid_ent *syside)
-{
-	struct glist_ent *p;
-
-	for (p = syside->gl; p; p = p->next)
-		if (p->gid == gid)
-			return p;
-
-	return NULL;
-}
-
-static struct sglist_ent *
-lr_search_sgle_bfu(unsigned short sgid, struct glist_ent *gle)
-{
-	struct sglist_ent *p;
-
-	for (p = gle->sgl; p; p = p->next)
-		if (p->sgid == sgid)
-			return p;
-
-	return NULL;
-}
-
-static struct sysid_ent *lr_alloc_syside(struct group_var *gv)
-{
-	struct sysid_ent *p;
-
-	p = (struct sysid_ent *)kmalloc(sizeof(struct sysid_ent), GFP_ATOMIC);
-	if (!p)
-		return NULL;
-
-	p->next = gv->sysidl;
-	gv->sysidl = p;
-
-	p->gv = gv;
-	p->gl = NULL;
-
-	return p;
-}
-
-static struct glist_ent *
-lr_alloc_gle(unsigned char *sa, struct sysid_ent *syside)
-{
-	struct glist_ent *p;
-	int hash;
-
-	hash = hash_mac_addr(sa);
-
-	p = (struct glist_ent *)kmalloc(sizeof(struct glist_ent), GFP_ATOMIC);
-	if (!p)
-		return NULL;
-
-	p->next = syside->gl;
-	syside->gl = p;
-
-	p->next2 = syside->gv->gl[hash];
-	syside->gv->gl[hash] = p;
-	memcpy(p->gaddr, sa, ETH_ALEN);
-
-	p->gv = syside->gv;
-	p->sgl = NULL;
-	p->syside = syside;
-	atomic_set(&p->use_count, 1);
-
-	return p;
-}
-
-static struct sglist_ent *lr_alloc_sgle(struct glist_ent *gle)
-{
-	struct sglist_ent *p;
-
-	p = (struct sglist_ent *)kmalloc(sizeof(struct sglist_ent), GFP_ATOMIC);
-	if (!p)
-		return NULL;
-
-	p->next = gle->sgl;
-	gle->sgl = p;
-
-	p->gle = gle;
-
-	return p;
-}
-
-static void lr_dealloc_sgle(struct sglist_ent *sgle)
-{
-	struct sglist_ent *p;
-
-	for (p = sgle->gle->sgl; p; p = p->next){
-		if (p == sgle){
-			sgle->gle->sgl = p->next;
-			kfree(sgle);
-			return;
-		}
-		if (p->next == sgle){
-			p->next = p->next->next;
-			kfree(sgle);
-			return;
-		}
-	}
-
-	return;
-}
-
-static void lr_dealloc_gle(struct glist_ent *gle)
-{
-	struct glist_ent *p;
-	int hash;
-
-	hash = hash_mac_addr(gle->gaddr);
-
-	for (p = gle->gv->gl[hash]; p; p = p->next2){
-		if (p == gle){
-			gle->gv->gl[hash] = p->next2;
-			break;
-		}
-		if (p->next2 == gle){
-			p->next2 = p->next2->next2;
-			break;
-		}
-	}
-
-	for (p = gle->syside->gl; p; p = p->next){
-		if (p == gle){
-			gle->syside->gl = p->next;
-			break;
-		}
-		if (p->next == gle){
-			p->next = p->next->next;
-			break;
-		}
-	}
-
-	for (;gle->sgl;)
-		lr_dealloc_sgle(gle->sgl);
-	if (atomic_dec_and_test(&gle->use_count))
-		kfree(gle);
-	return;
-}
-
-static void lr_dealloc_syside(struct sysid_ent *syside)
-{
-	struct sysid_ent *p;
-
-	for (p = syside->gv->sysidl; p; p = p->next){
-		if (p == syside){
-			syside->gv->sysidl = p->next;
-			for (;syside->gl;)
-				lr_dealloc_gle(syside->gl);
-			kfree(syside);
-			break;
-		}
-		if (p->next == syside){
-			p->next = p->next->next;
-			for (;syside->gl;)
-				lr_dealloc_gle(syside->gl);
-			kfree(syside);
-			break;
-		}
-	}
-	return;
-}
-
-static unsigned short lr_min_sgid_bfu(struct glist_ent *gle)
-{
-	struct sglist_ent *p;
-	unsigned short min_sgid = 0xffff;
-
-	for (p = gle->sgl; p; p = p->next)
-		if (p->rcv_sgid < min_sgid)
-			min_sgid = p->rcv_sgid;
-
-	gle->min_sgid = min_sgid;
-	return min_sgid;
-}
-
-static void lr_cleanup_bfu(struct group_var *gv)
-{
-	for (;gv->sysidl;)
-		lr_dealloc_syside(gv->sysidl);
-}
-
-static bool 
-lr_bfu(struct lrcpdu *lrcpdu, unsigned short sgid, struct group_var *gv)
-{
-	struct sysid_ent *syside;
-	struct glist_ent *gle;
-	struct sglist_ent *sgle;
-	unsigned short perio_time;
-
-	if (!sgid)
-		return _FALSE;
-
-	spin_lock(&gv->bfu_lock);
-
-	syside = lr_search_sysid_bfu(lrcpdu->system_id, gv);
-	if (!syside){
-		syside = lr_alloc_syside(gv);
-		if (!syside)
-			goto bfufail;
-		memcpy(syside->sysid, lrcpdu->system_id, ETH_ALEN);
-	}
-
-	gle = lr_search_gle_bfu(lrcpdu->group_id, syside);
-	if (!gle){
-		gle = lr_alloc_gle(lrcpdu->group_address, syside);
-		if (!gle){
-			lr_dealloc_syside(syside);
-			goto bfufail;
-		}
-		gle->gid = lrcpdu->group_id;
-	}
-
-	sgle = lr_search_sgle_bfu(lrcpdu->subgroup_id, gle);
-	if (!sgle){
-		sgle = lr_alloc_sgle(gle);
-		if (!sgle){
-			lr_dealloc_syside(syside);
-			goto bfufail;
-		}
-	}
-	sgle->sgid = lrcpdu->subgroup_id;
-	sgle->rcv_sgid = sgid;
-
-	gle->min_sgid = lr_min_sgid_bfu(gle);
-
-	/* phase II compatibility */
-	if (lrcpdu->version_number < 3 && gv->admin_perio_time > One_Sec){
-		gv->pii_live = PII_Live_Time;
-		gv->perio_time = One_Sec;
-	}
-	perio_time = ntohs(lrcpdu->perio_time);
-	if (!perio_time)
-		perio_time = 1;
-	/* end of phase II compatibility */
-
-	if (gle->min_sgid){
-		lr_update_distinfo(gle->gaddr, gle->min_sgid, 1, perio_time*4, gv);
-	}
-	sgle->age = perio_time*4;
-
-	spin_unlock(&gv->bfu_lock);
-
-	return _TRUE;
-
-bfufail:
-	spin_unlock(&gv->bfu_lock);
-	return _FALSE;
-}
-
-static void lr_age_bfu(struct group_var *gv)
-{
-	struct sglist_ent *sgle;
-	struct glist_ent *gle;
-	struct sysid_ent *syside;
-	int i;
-
-	spin_lock(&gv->bfu_lock);
-
-	for (i = 0; i < 32; i++)
-		for (gle = gv->gl[i]; gle; gle = gle->next2){
-			for (sgle = gle->sgl; sgle; sgle = sgle->next)
-				if (!sgle->age--)
-					lr_dealloc_sgle(sgle);
-			if (!gle->sgl){
-				syside = gle->syside;
-				lr_dealloc_gle(gle);
-				if (!syside->gl)
-					lr_dealloc_syside(syside);
-			}
-		}
-
-	spin_unlock(&gv->bfu_lock);
-
-	return;
-}
-
-static int lr_rcf_receiver(struct sk_buff *skb, struct net_device *dev)
-{
-
-	struct lr_port *p;
-	unsigned char *buf;
-	struct lrcpdu *lrcpdu;
-	int pn = 0;
-
-	buf = skb->mac.raw + ETH_HLEN;
-	lrcpdu = (struct lrcpdu *)buf;
-
-	pn = dev_to_port_num(skb->dev);
-	if (!pn || !lrcpdu->port_id)
-		goto freeandout;
-
-	p = lr_get_port_by_num(pn);
-	if (memcmp(lrcpdu->system_id, lr_sysvar.system_id, ETH_ALEN) != 0){
-		/* other host's RCF */
-		int grp = p->pv.group_id;
-		struct lr_group *g = lr_get_group_by_num(grp);
-		struct lr_private *vp;
-		struct group_var *gv;
-
-		vp = (struct lr_private *)(g->dev->priv);
-		gv = &(vp->group->var);
-
-		lr_bfu(lrcpdu, p->pv.local_sgmt.sgid, gv);
-		if ((lrcpdu->flags & RCFFL_TOPOCHG) &&
-			gv->tchg_opt &&
-			!gv->tchg_notified)
-			lr_tchg_notified(gv);
-		kfree_skb(skb);
-
-		return NET_RX_SUCCESS;
-	}
-
-	if (p->pv.group_id != lrcpdu->group_id)
-		goto freeandout; /* ignore other group RCF */
-
-	if (!p->pv.rcft_running)
-		goto freeandout; /* ignore RCF if RCF timer not running */
-
-	lr_register_rcf(p, lrcpdu->port_id);
-	kfree_skb(skb);
-	return NET_RX_SUCCESS;
-
-freeandout:
-	kfree_skb(skb);
-	return NET_RX_DROP;
-}
-
-/* port parser  */
-static int 
-lr_port_parser(struct sk_buff *skb, struct net_device *dev, 
-			   struct packet_type *pt)
-{
-	unsigned char *buf;
-	int ret;
-
-	if (!skb){
-		return NET_RX_BAD;
-	}
-
-	buf = skb->mac.raw + ETH_HLEN;
-	if (!memcmp(skb->mac.ethernet->h_dest, Slow_Protocols_Multicast, ETH_ALEN) &&
-		ntohs(skb->mac.ethernet->h_proto) == Slow_Protocols_Type &&
-		buf[0] == LRCP_Subtype){
-		ret = lr_rcf_receiver(skb, dev);
-	} else {
-		ret = lr_nf_receiver(skb, dev);
-	}
-
-	return ret;
-}
-
-
-/*-------------- Flush Frame transmitter ---------*/
-
-/* Purpose of this is update filtering info of all the bridges which
- * is conneced to ports belong to the link redundancy group. */
-
-
-static void lr_xmit_ff_all(struct group_var *gv)
-{
-	int grp;
-	struct lrcpdu pdu;
-	struct sk_buff *skb;
-	struct ethhdr *eh;
-	struct lr_group *g;
-	int pdu_len = LRCPDU_LEN;
-	int len = pdu_len + ETH_HLEN;
-
-	/* makeup LRCPDU */
-	memset(&pdu, 0, sizeof(struct lrcpdu));
-	pdu.subtype = FF_Subtype;
-	pdu.version_number = LRCP_Version;
-	memcpy(pdu.system_id, lr_sysvar.system_id, ETH_ALEN);
-	pdu.sys_priority = htons(lr_sysvar.priority);
-	pdu.group_id = grp = gv->group_id;
-	pdu.subgroup_id = 0;
-	pdu.port_id = 0;
-
-	if (!grp)
-		return;
-
-	g = lr_get_group_by_num(grp);
-	if (!g || !g->dev)
-		return;
-
-
-	skb = dev_alloc_skb(len);
-
-	if (!skb){
-		return;
-	}
-	skb->dev = g->dev;
-	skb->mac.raw = skb_put(skb, len);
-	eh = (struct ethhdr *)skb->mac.raw;
-
-	memcpy(eh->h_dest, Slow_Protocols_Multicast, ETH_ALEN);
-	memcpy(eh->h_source, g->dev->dev_addr, ETH_ALEN);
-	eh->h_proto = htons(Slow_Protocols_Type);
-
-	skb->nh.raw = skb->mac.raw + ETH_HLEN;
-	memcpy(skb->nh.raw, &pdu, pdu_len);
-
-	lr_all_subg_distribution(skb, gv->subg_list);
-
-	return;
-}
-
-
-
-
-
-/*-------------------- Timers ---------------------*/
-/* vt_start(), vt_stop(), is_vt_active() and vt_count()
- * are protected under lr spinlock.
- */
-static void inline vt_start(struct lr_timer *vt, int exp)
-{
-	vt->active = _TRUE;
-	vt->exp = exp;
-	vt->tim = 0;
-
-	return;
-}
-
-static void inline vt_stop(struct lr_timer *vt)
-{
-	vt->tim = 0;
-	vt->active = _FALSE;
-
-	return;
-}
-
-static int inline is_vt_active(struct lr_timer *vt)
-{
-	return vt->active;
-}
-
-
-
-static void vt_count(struct lr_timer *vt)
-{
-	if (vt->active){
-		if (vt->tim == vt->exp){
-			vt->tim = 0;					
-			vt->active = _FALSE;
-		} else {
-			vt->tim++;
-		}
-	}
-
-	return;
-}
-
-#define lr_clear_timer(gv, mem) \
-	__lr_clear_timer(&(gv)->mem)
-#define lr_register_timer(gv, mem) \
-	__lr_register_timer((gv), &(gv)->mem)
-#define lr_unregister_timer(gv, mem) \
-	__lr_unregister_timer((gv), &(gv)->mem)
-
-static void __lr_clear_timer(struct lr_timer *vt)
-{
-	memset(vt, 0, sizeof(struct lr_timer));
-	return;
-}
-
-static void __lr_unregister_timer(struct group_var *gv, struct lr_timer *vt)
-{
-	struct lr_timer *p, *q;
-
-	if (!vt){
-		return;
-	}
-
-	if (gv->vth == vt){
-		p = gv->vth->next;
-		gv->vth->next = 0;
-		gv->vth = p;
-		return;
-	}
-
-	p = gv->vth->next;
-	q = gv->vth;
-	for (; p; p = p->next, q = q->next){
-		if (vt == p){
-			q->next = p->next;
-			p->next = 0;
-		}
-	}
-
-	return;
-}
-
-static void __lr_register_timer(struct group_var *gv, struct lr_timer *vt)
-{
-	if (!vt){
-		return;
-	}
-
-	vt->tick_func = vt_count;
-	vt->next = gv->vth;
-	gv->vth = vt;
-
-	return;
-}
-
-/*-------------------- end of Timers --------------*/
-
-
-
-
-/*-------------- Periodic Machine ---------------*/
-
-
-/* action at DISABLED state */
-static void lr_prm_disabled(struct group_var *gv)
-{
-	vt_stop(&(gv->periodic_timer));
-	return;
-}
-
-/* action at WAIT_FOR_TIMEOUT state */
-static void lr_prm_wait_timeout(struct group_var *gv)
-{
-	vt_start(&(gv->periodic_timer), gv->perio_time);
-	return;
-}
-
-/* action at EXPIRED state */
-static void lr_prm_expired(struct group_var *gv)
-{
-	vt_stop(&(gv->rcf_timer));
-	gv->ntr = _TRUE;
-	return;
-}
-
-
-
-static void lr_prm_tick(struct group_var *gv)
-{
-	struct perio_mach *m = &(gv->prm);
-	bool go_init;
-
-	go_init = gv->begin;
-
-	/* state machine */
-	if (m->state == DISABLED){
-		DO_IT(lr_prm_disabled(gv))
-
-		if (!go_init){
-			GO_NEXT_STATE(WAIT_FOR_TIMEOUT)
-		}
-	} else if (m->state == WAIT_FOR_TIMEOUT){
-		if (go_init){
-			GO_NEXT_STATE(DISABLED)
-		} else {
-			DO_IT(lr_prm_wait_timeout(gv))
-			if (!is_vt_active(&(gv->periodic_timer))){
-				GO_NEXT_STATE(EXPIRED)
-			}
-		}
-	} else if (m->state == EXPIRED){
-		if (go_init){
-			GO_NEXT_STATE(DISABLED)
-		} else {
-			DO_IT(lr_prm_expired(gv))
-			GO_NEXT_STATE(WAIT_FOR_TIMEOUT)
-		}
-	}
-	return;
-}
-/*-------------- Periodic Machine ---------------*/
-
-/*-------------- RCF Timer Machine ---------------*/
-
-static void lr_set_port_rcft_running(struct group_var *gv, bool val)
-{
-	int i, j;
-	struct lr_port *p;
-
-	for (i = 0; i < MAX_PHYIF; i++){
-		j = gv->port_list[i];
-		if (!j)
-			break;
-
-		p = lr_get_port_by_num(j);
-		if (!p->dev)
-			continue;
-		p->pv.rcft_running = val;
-	}
-}
-
-/* action at NOT_RUNNING state */
-static void lr_rcftm_not_running(struct group_var *gv)
-{
-	/* make all PortN:rcft_running FALSE */
-	lr_set_port_rcft_running(gv, _FALSE);
-	/* make GrpN:rcft_running FALSE */
-	gv->rcft_running = _FALSE;
-
-	vt_stop(&(gv->rcf_timer));
-	return;
-}
-
-/* action at RUNNING state */
-static void lr_rcftm_running(struct group_var *gv)
-{
-	/* make PortN:rcft_running TRUE */
-	lr_set_port_rcft_running(gv, _TRUE);
-	/* make GrpN:rcft_running TRUE */
-	gv->rcft_running = _TRUE;
-
-	lr_init_rct(gv);
-
-	vt_start(&(gv->rcf_timer), Timeout_Time);
-
-	return;
-}
-
-/* action at TIMEOUT state */
-static void lr_rcftm_timeout(struct group_var *gv)
-{
-	vt_stop(&(gv->rcf_timer));
-
-	/* make PortN:rcft_running FALSE */
-	lr_set_port_rcft_running(gv, _FALSE);
-
-	lr_notify_rcf(gv);
-	vt_start(&(gv->rcf_timer), Timeout2_Time - Timeout_Time);
-	return;
-}
-
-/* action at TIMEOUT2 state */
-static void lr_rcftm_timeout2(struct group_var *gv)
-{
-	vt_stop(&(gv->rcf_timer));
-
-	/* make GrpN:rcft_running FALSE */
-	gv->rcft_running = _FALSE;
-	return;
-}
-
-static void lr_rcftm_tick(struct group_var *gv)
-{
-	struct rcft_mach *m = &(gv->rcftm);
-
-	bool go_init;
-
-	go_init = gv->begin;
-
-	if (m->state == NOT_RUNNING){
-		DO_IT(lr_rcftm_not_running(gv))
-		if (!go_init && gv->ntt){
-			GO_NEXT_STATE(RUNNING)
-		}
-	} else if (m->state == RUNNING){
-		if (go_init){
-			GO_NEXT_STATE(INITIALIZE);
-		} else {
-			DO_IT(lr_rcftm_running(gv))
-
-			/* timeout */
-			if (!is_vt_active(&(gv->rcf_timer))){
-				GO_NEXT_STATE(TIMEOUT)
-			}
-		}
-	} else if (m->state == TIMEOUT){
-		if (go_init){
-			GO_NEXT_STATE(INITIALIZE)
-		} else {
-			DO_IT(lr_rcftm_timeout(gv))
-
-			if (!is_vt_active(&(gv->rcf_timer))){
-				GO_NEXT_STATE(TIMEOUT2)
-			}
-		}
-	} else if (m->state == TIMEOUT2){
-		if (go_init){
-			GO_NEXT_STATE(INITIALIZE)
-		} else {
-			DO_IT(lr_rcftm_timeout2(gv))
-			GO_NEXT_STATE(NOT_RUNNING)
-		}
-	}
-
-	return;
-}
-
-/*-------------- RCF Timer Machine ---------------*/
-
-/*-------------- SGM machine -------------------*/
-
-/* 
- * SGM machine
- */
-
-/* action at INITIALIZE state */
-static void lr_sgmm_init(struct group_var *gv)
-{
-	gv->sgmm.cnt = 5;
-	lr_clear_sg_active_id(gv);
-	lr_clear_port_sgid(gv);
-	lr_clear_sgmt_temp(gv);
-	lr_clear_sgmt_master(gv);
-	lr_clear_distinfo(gv);
-	return;
-}
-
-/* action at WAIT_FOR_NTR state */
-static void lr_sgmm_wait_ntr(struct group_var *gv)
-{
-	return;
-}
-
-/* action at REBUILD_START state */
-static void lr_sgmm_rebuild_start(struct group_var *gv)
-{
-	gv->ntt = _TRUE;
-	lr_clear_sgmt_temp(gv);
-	return;
-}
-
-/* action at WAIT_FOR_RCF_NOTIFY state */
-static void lr_sgmm_wait_notify(struct group_var *gv)
-{
-	return;
-}
-
-/* action at RCF_RECEIVED state */
-static void lr_sgmm_rcf_received(struct group_var *gv)
-{
-	struct nrcf *nr;
-	char buf[sizeof(struct nrcf)+10];
-
-	while (!ring_empty(&(gv->rb))){
-		ring_get(&(gv->rb), buf, sizeof(struct nrcf));
-		nr = (struct nrcf *)buf;
-		lr_update_sgmt_temp(nr->active_id, nr->port_id, gv);
-	}
-	return;
-}
-
-/* action at RCF_TIMEOUT state */
-static void lr_sgmm_rcf_timeout(struct group_var *gv)
-{
-	lr_mark_active(gv);
-	gv->sgmt_match = lr_comp_sgmt(gv);
-	return;
-}
-
-
-/* action at NOT_CHANGED state */
-static void lr_sgmm_not_changed(struct group_var *gv)
-{
-	lr_tchg_not_detected(gv);
-	gv->ntr = _FALSE;
-	return;
-}
-
-/* action at CHANGED state */
-static void lr_sgmm_changed(struct group_var *gv)
-{
-	/* make all PortN: sgid 0 */
-	lr_clear_sg_active_id(gv);
-	lr_clear_port_sgid(gv);
-	lr_update_sgmt_master(gv);
-	lr_clear_distinfo(gv);
-	lr_update_sg_param(gv);
-	lr_update_port_param(gv);
-	lr_xmit_ff_all(gv);
-	lr_tchg_detected(gv);
-	gv->ntr = _FALSE;
-	return;
-}
-
-static void lr_sgmm_tick(struct group_var *gv)
-{
-	struct sgm_mach *m = &(gv->sgmm);
-
-	bool go_init;
-
-	go_init = gv->begin;
-
-	if (m->state == INITIALIZE){
-		DO_IT(lr_sgmm_init(gv))
-		if (m->cnt)
-			m->cnt--;
-		else
-			gv->begin = _FALSE;
-
-		if (!go_init){
-			GO_NEXT_STATE(WAIT_FOR_NTR)
-		}
-	} else if (m->state == WAIT_FOR_NTR){
-		if (go_init){
-			GO_NEXT_STATE(INITIALIZE);
-		} else {
-			DO_IT(lr_sgmm_wait_ntr(gv))
-
-			if (gv->ntr){
-				GO_NEXT_STATE(REBUILD_START)
-			}
-		}
-	} else if (m->state == REBUILD_START){
-		if (go_init){
-			GO_NEXT_STATE(INITIALIZE)
-		} else {
-			DO_IT(lr_sgmm_rebuild_start(gv))
-
-			if (is_vt_active(&(gv->rcf_timer))){
-				GO_NEXT_STATE(WAIT_FOR_RCF_NOTIFY)
-			}
-		}
-	} else if (m->state == WAIT_FOR_RCF_NOTIFY){
-		if (go_init){
-			GO_NEXT_STATE(INITIALIZE)
-		} else {
-			DO_IT(lr_sgmm_wait_notify(gv))
-			GO_NEXT_STATE(WAIT_FOR_RCF_NOTIFY)
-
-			if (!ring_empty(&(gv->rb))){ /* incoming */
-				GO_NEXT_STATE(RCF_RECEIVED)
-			}
-			if (!is_vt_active(&(gv->rcf_timer))){
-				GO_NEXT_STATE(RCF_TIMEOUT)
-			}
-		}
-	} else if (m->state == RCF_RECEIVED){
-		if (go_init){
-			GO_NEXT_STATE(INITIALIZE)
-		} else {
-			DO_IT(lr_sgmm_rcf_received(gv))
-
-			GO_NEXT_STATE(WAIT_FOR_RCF_NOTIFY)
-		}
-	} else if (m->state == RCF_TIMEOUT){
-		if (go_init){
-			GO_NEXT_STATE(INITIALIZE)
-		} else {
-			DO_IT(lr_sgmm_rcf_timeout(gv))
-			if (gv->sgmt_match){
-				GO_NEXT_STATE(NOT_CHANGED)
-			} else {
-				GO_NEXT_STATE(CHANGED)
-			}
-		}
-	} else if (m->state == NOT_CHANGED){
-		if (go_init){
-			GO_NEXT_STATE(INITIALIZE)
-		} else {
-			DO_IT(lr_sgmm_not_changed(gv))
-			GO_NEXT_STATE(WAIT_FOR_NTR)
-		}
-	} else if (m->state == CHANGED){
-		if (go_init){
-			GO_NEXT_STATE(INITIALIZE)
-		} else {
-			DO_IT(lr_sgmm_changed(gv))
-			GO_NEXT_STATE(WAIT_FOR_NTR)
-		}
-	}
-
-	return;
-}
-
-/*--------------- end of SGM machine -----------*/
-
-/*-------------- RCF Generator Machine ---------------*/
-
-
-static void lr_xmit_rcf(struct net_device *dev, struct lrcpdu *buf)
-{
-	int pdu_len = LRCPDU_LEN;
-	int len = pdu_len + ETH_HLEN;
-	struct ethhdr *eh;
-	struct sk_buff *skb;
-
-	if (!dev){
-		return;
-	}
-
-	skb = dev_alloc_skb(len);
-
-	if (!skb){
-		return;
-	}
-	skb->dev = dev;
-	skb->mac.raw = skb_put(skb, len);
-	eh = (struct ethhdr *)skb->mac.raw;
-
-	memcpy(eh->h_dest, Slow_Protocols_Multicast, ETH_ALEN);
-	memcpy(eh->h_source, dev->dev_addr, ETH_ALEN);
-	eh->h_proto = htons(Slow_Protocols_Type);
-
-	skb->nh.raw = skb->mac.raw + ETH_HLEN;
-	memcpy(skb->nh.raw, buf, pdu_len);
-
-/*	skb->dev->trans_start = jiffies;*/
-	dev_queue_xmit(skb);
-
-	return;
-}
-
-
-static void lr_xmit_rcf_all(struct group_var *gv, struct lrcpdu *pdu)
-{
-	int i, n;
-	struct lr_port *p;
-
-	for (i = 0; (n = gv->port_list[i]) && (i < MAX_PHYIF); i++){
-		if (!n)
-			break;
-
-		p = lr_get_port_by_num(n);
-		if (!p->dev)
-			continue;
-		pdu->subgroup_id = p->pv.local_sgmt.sgid;
-		pdu->port_id = p->pv.local_sgmt.port_id;
-		lr_xmit_rcf(p->dev, pdu);
-	}
-
-	return;
-}
-
-/* action at WAIT_FOR_NTT state */
-static void lr_rcfgm_wait_ntt(struct group_var *gv)
-{
-	return;
-}
-
-/* action at RCF_GENERATE state */
-static void lr_rcfgm_generate(struct group_var *gv)
-{
-
-	struct lrcpdu pdu;
-
-	/* makeup LRCPDU */
-	memset(&pdu, 0, sizeof(struct lrcpdu));
-	pdu.subtype = LRCP_Subtype;
-	pdu.version_number = LRCP_Version;
-	memcpy(pdu.system_id, lr_sysvar.system_id, ETH_ALEN);
-	memcpy(pdu.group_address, gv->group_addr, ETH_ALEN);
-	pdu.sys_priority = htons(lr_sysvar.priority);
-	pdu.group_id = gv->group_id;
-	pdu.subgroup_id = 0;
-	pdu.port_id = 0;
-
-	if (!gv->pii_live || !gv->pii_opt)
-		pdu.perio_time = htons(gv->admin_perio_time/One_Sec);
-	else
-		/* Phase II compatibility */
-		pdu.perio_time = Periodic_Time/One_Sec;
-
-	if (gv->tchg_opt)
-		pdu.flags = (gv->tchg_detected && !gv->tchg_notified)?RCFFL_TOPOCHG:0;
-
-
-	lr_xmit_rcf_all(gv, &pdu);
-
-	gv->ntt = _FALSE;
-	return;
-
-}
-
-
-static void lr_rcfgm_tick(struct group_var *gv)
-{
-	struct rcfg_mach *m = &(gv->rcfgm);
-	bool go_init;
-
-	go_init = gv->begin;
-
-	/* state machine */
-	if (m->state == WAIT_FOR_NTT){
-		DO_IT(lr_rcfgm_wait_ntt(gv))
-
-		if (!go_init && gv->ntt){
-			GO_NEXT_STATE(RCF_GENERATE)
-		}
-	} else if (m->state == RCF_GENERATE){
-		if (!go_init){
-			DO_IT(lr_rcfgm_generate(gv))
-		}
-		GO_NEXT_STATE(WAIT_FOR_NTT)
-	}
-	return;
-}
-/*-------------- RCF Generator Machine ---------------*/
-
-/*------- Distributing Information aging --------*/
-static void lr_age_tick(struct group_var *gv)
-{
-	if (gv->agecnt++ >= Age_Periodic_Time){
-		gv->agecnt = 0;
-		lr_age_distinfo(gv);
-		lr_age_bfu(gv);
-	}
-}
-/*------- Distributing Information aging --------*/
-
-/*------- Phase II compatibility --------*/
-/*------- Phase II absent timer ---------*/
-static void lr_pii_tick(struct group_var *gv)
-{
-	if (gv->pii_live){
-		gv->pii_live--;
-	}
-}
-/*------- Phase II live timer    --------*/
-
-
-static void lr_tick(unsigned long ngrp)
-{
-	struct lr_group *group;
-	struct lr_timer *vt;
-	struct group_var *gv;
-	int i;
-
-	group = lr_get_group_by_num(ngrp);
-
-	if (!group->dev || !group->dev->priv)
-		return;
-
-	gv = &group->var;
-
-	spin_lock(&gv->lock);
-
-	/* periodic machine and other timers */
-	for (i = 0, vt = gv->vth; vt;i++, vt = vt->next){
-		if (vt->tick_func){
-			vt->tick_func(vt);
-		}
-	}
-
-	/* sgm machine */
-	lr_sgmm_tick(gv);
-
-	/* periodic timer machine */
-	lr_prm_tick(gv);
-
-	/* RCF generator machine */
-	lr_rcfgm_tick(gv);
-
-	/* RCF timer machine */
-	lr_rcftm_tick(gv);
-
-	/* Distributing Information aging */
-	lr_age_tick(gv);
-
-	/* Phase II compatibility */
-	lr_pii_tick(gv);
-
-	group->tl.expires = jiffies + HZ/One_Sec; /* 50 msec */
-	add_timer(&group->tl);
-
-	spin_unlock(&gv->lock);
-
-	return;
-}
-
-/***************************************************************
- *              End of LRCP
- ***************************************************************/
-
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-struct packet_type lr_packet_type __initdata = {
-	__constant_htons(ETH_P_LR),
-	NULL,           /* Listen to all devices */
-	lr_port_parser,
-	NULL,
-	NULL,
-};
-#else
-struct packet_type lr_packet_type = {
-   .type = __constant_htons(ETH_P_LR),
-   .func = lr_port_parser,
- };
-#endif
-
- inline void ic_lr_init(void)
-{
-	dev_add_pack(&lr_packet_type);
-}
- inline void ic_lr_cleanup(void)
-{
-	dev_remove_pack(&lr_packet_type);
-}
-
-
-
-/*
- *  Open/initialize the i/f.  This is called (in the current kernel)
- *  sometime after booting when the 'ifconfig' program is run.
- */
-static int lr_open(struct net_device *dev)
-{
-	/* start transmitting */
-	netif_start_queue(dev);
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-	MOD_INC_USE_COUNT;
-#endif
-
-	return 0;
-}
-
-/* The inverse routine to lr_open (). */
-static int lr_close(struct net_device *dev)
-{
-
-	/* can't transmit any more */
-	netif_stop_queue(dev);
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-	MOD_DEC_USE_COUNT;
-#endif
-
-	return 0;
-}
-
-
-
-static struct net_device_stats *lr_get_stats(struct net_device *dev)
-{
-	struct lr_private *vp = (struct lr_private *)dev->priv;
-	struct net_device_stats *r = &vp->enet_stats;
-
-	return r;
-}
-
-
-
-static void lr_group_vars_init(struct group_var *gv)
-{
-	gv->begin = _TRUE;
-	
-	/* state machines */
-	gv->sgmm.state = INITIALIZE;
-	gv->rcftm.state = NOT_RUNNING;
-	gv->prm.state = DISABLED;
-
-	gv->sgmm.do_it = _TRUE;
-	gv->rcftm.do_it = _TRUE;
-	gv->prm.do_it = _TRUE;
-
-	gv->admin_perio_time = Periodic_Time;
-	gv->perio_time = Periodic_Time;
-	gv->age_time = Age_Max;
-	gv->tchg_opt = _FALSE;
-	gv->pii_opt = _TRUE;
-	gv->pii_live = 0;
-
-	memset(gv->port_list, 0, sizeof(int)*MAX_PHYIF);
-	memset(gv->subg_list, 0, sizeof(struct subgroup_var)*MAX_PHYIF);
-
-	memset(gv->master_sgmt, 0, sizeof(struct sgmte)*MAX_PHYIF);
-	memset(gv->temp_sgmt, 0, sizeof(struct sgmte)*MAX_PHYIF);
-	memset(gv->dist_info, 0, sizeof(struct dist_info *)*32);
-
-	gv->ntt = _FALSE;
-	gv->ntr = _FALSE;
-	gv->rcft_running = _FALSE;
-	gv->sgmt_match = _FALSE;
-
-	gv->tchg_notified = _FALSE;
-	gv->tchg_detected = _FALSE;
-	gv->tchg_opt = _FALSE;
-
-	/* BFU */
-	gv->sysidl = NULL;
-	memset(gv->gl, 0, sizeof(struct glist_ent *)*32);
-
-	gv->lock = SPIN_LOCK_UNLOCKED;
-	gv->dist_lock = SPIN_LOCK_UNLOCKED;
-	gv->bfu_lock = SPIN_LOCK_UNLOCKED;
-
-	ring_init(&gv->rb);
-
-	gv->agecnt = 0;
-
-	/* register timers */
-
-	lr_clear_timer(gv, rcf_timer);
-	lr_clear_timer(gv, periodic_timer);
-
-
-	lr_register_timer(gv, rcf_timer);
-	lr_register_timer(gv, periodic_timer);
-	
-	/* start state machines */
-	gv->begin = _FALSE;
-
-}
-
-
-/********************************
- *
- * ioctl() support functions
- *
- ********************************/
-static int lr_get_group_id_by_name(char *name)
-{
-	int i;
-	struct lr_group *g;
-
-	if (!name || strlen(name) > MAX_NAME)
-		goto exit;
-
-	for (g = lr_get_head_group(), i = 1; g; g = lr_get_next_group(g), i++){
-		if (g->dev && g->dev->name)
-			if ((strcmp(g->dev->name, name) == 0))
-				return i;
-	}
-
-exit:
-	return 0; /* fail */
-}
-
-
-
-static void lr_register_port(struct group_var *gv, int n)
-{
-	int *pl;
-	int i, j, k;
-
-	if (!gv || n > MAX_PHYIF || n < 0 )
-		return;
-
-	pl = gv->port_list;
-	for (i = 0; i < MAX_PHYIF; i++){
-		if (pl[i] == n){
-			/* already registered */
-			return;
-		}
-	}
-
-	pl = gv->port_list;
-	for (i = 0; i < MAX_PHYIF; i++){
-		if (!pl[i] || pl[i] > n){
-			for (j = MAX_PHYIF-1, k = MAX_PHYIF-2; j != i; j--, k--){
-				pl[j] = pl[k];
-			}
-			pl[i] = n;
-			return;
-		}
-	}
-	return;
-}
-
-static void lr_unregister_port(struct group_var *gv, int n)
-{
-	int *pl;
-	int j;
-
-	if (!gv || n > MAX_PHYIF || n < 0 )
-		return;
-
-	pl = gv->port_list;
-	for (j = 0; j < MAX_PHYIF; pl++, j++){
-		if ((*pl) == n){
-			break;
-		}
-	}
-	for (;j < MAX_PHYIF-1; j++){
-		*pl = *(pl+1);
-		pl++;
-	}
-	*pl = 0;
-	return;
-}
-
-
-static int lr_get_port_id_by_name(char *ifname)
-{
-	int i;
-	struct lr_port *p;
-
-	if (!ifname || strlen(ifname) > MAX_NAME)
-		goto exit;
-
-	/* scan physical i/f name */
-	for (p = lr_get_head_port(), i = 1; p; p = lr_get_next_port(p), i++){
-		if (p->dev && p->dev->name)
-			if (strcmp(p->dev->name, ifname) == 0)
-				return i; /* found */
-	}
-
-exit:
-	return 0; /* not found */
-}
-
-
-static int lr_get_vacant_lr_port(void)
-{
-	int i;
-	struct lr_port *p;
-
-	for (p = lr_get_head_port(), i = 1; p; p = lr_get_next_port(p), i++){
-		if (!p->dev)
-			return i;
-	}
-	return 0;
-}
-
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-static int lr_catch_device(struct lr_port *p, char *ifname, char *modname)
-#else
-static int lr_catch_device(struct lr_port *p, char *ifname)
-#endif
-{
-	int ret;
-
-	ret = -EFAULT;
-	if (!ifname || !p)
-		goto exit;
-
-	ret = -ENODEV;
-	if (strlen(ifname) > MAX_NAME)
-		goto exit;
-
-	memset(p, 0, sizeof(struct lr_port));
-
-	/* remember this locks device in 2.4 */
-	p->dev = dev_get_by_name(ifname);
-	if (!p->dev)
-		goto exit;		/* invalid ifname */
-
-	if (p->dev->intercepted_ptype ||
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
-		p->dev->br_port){
-		dev_put(p->dev);
-#else
-		p->dev->bridge_port_id){
-#endif
-		p->dev = NULL;
-		goto exit;		/* already used by a virtual device driver */
-	}
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-	if (modname && modname[0]){
-		strcpy(p->module_name, modname);
-		__MOD_INC_USE_COUNT(find_module(p->module_name));
-	} else {
-		p->module_name[0] = '\0';
-	}
-#endif
-
-	p->dev->intercepted_ptype = ETH_P_LR;
-
-	/* make the interface to promiscuous mode */
-	dev_set_promiscuity(p->dev, 1);
-#if 0
-	/* Demand loaded and "unused" device driver 
-	 * module causes OOPS even though 
-	 * set_multicast_list is not NULL!!! */
-	if (p->dev->set_multicast_list != NULL){
-		p->dev->set_multicast_list(p->dev);
-	}
-#endif
-
-	ret = 0;
-
-exit:
-	return ret;
-}
-
-static int lr_release_device(struct lr_port *p)
-{
-	if (!p || !p->dev)
-		return -EFAULT;
-
-	p->dev->intercepted_ptype = 0;
-
-	/* make the interface to promiscuous mode */
-	dev_set_promiscuity(p->dev, -1);
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
-	dev_put(p->dev);
-#else
-	if (p->module_name[0]){
-		__MOD_DEC_USE_COUNT(find_module(p->module_name));
-		p->module_name[0] = '\0';
-	}
-#endif
-	p->dev = NULL;
-
-	return 0;
-}
-
-
-/* add physical i/f to pool */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
-static int lr_add_phyif(char *ifname, int grp)
-#else
-static int lr_add_phyif(char *ifname, char *modname, int grp)
-#endif
-{
-	int i;
-	struct lr_port *p;
-	struct lr_group *g;
-	struct lr_private *vp;
-	int ret;
-
-
-	ret = -EFAULT;
-	if (!ifname)
-		goto exit;
-
-	ret = -ENODEV;
-	if (strlen(ifname) > MAX_NAME)
-		goto exit;
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-	ret = -EFAULT;
-	if (!modname)
-		goto exit;
-	ret = -ENODEV;
-	if (strlen(modname) > MAX_MODNAME)
-		goto exit;
-#endif
-
-	/* We cannot add a lr i/f to lr
-	 * We cannot add a phy i/f already registered
-	 * search for vacant lr_ports entry */
-	if (lr_get_group_id_by_name(ifname) ||
-		lr_get_port_id_by_name(ifname) ||
-		!(i = lr_get_vacant_lr_port()))
-		goto exit;
-
-	p = lr_get_port_by_num(i);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
-	ret = lr_catch_device(p, ifname);
-#else
-	ret = lr_catch_device(p, ifname, modname);
-#endif
-	if (ret)
-		return ret;
-
-	if (i == 1){
-		memcpy(lr_sysvar.system_id, p->dev->dev_addr, ETH_ALEN);
-	}
-
-	p->pv.group_id = grp;
-	p->pv.local_sgmt.port_id = i;
-
-	g = lr_get_group_by_num(grp);
-	vp = (struct lr_private *)g->dev->priv;
-	lr_register_port(&vp->group->var, i);
-
-	if (vp->group->var.port_list[0] == i){
-		memcpy(vp->group->var.group_addr, p->dev->dev_addr, ETH_ALEN);
-		memcpy(g->dev->dev_addr, p->dev->dev_addr, ETH_ALEN);
-	}
-
-	ret = 0;
-
-exit:
-	return ret;
-}
-
-
-/* delete physical i/f from pool */
-static int lr_del_phyif(char *ifname)
-{
-	int i, j;
-	int grp;
-	struct lr_port *p;
-	struct lr_group *g;
-	struct rcte *r, *h;
-	struct lr_private *vp;
-	struct group_var *gv;
-	int ret;
-
-	ret = -EFAULT;
-	if (!ifname)
-		goto exit;
-
-	ret = -ENODEV;
-	if (strlen(ifname) > MAX_NAME)
-		goto exit;
-
-	/* We cannot delete a lr i/f 
-	 * We cannot delete a phy i/f not registered */
-	if (lr_get_group_id_by_name(ifname) ||
-		!(i = lr_get_port_id_by_name(ifname)))
-		goto exit;
-
-	p = lr_get_port_by_num(i);
-	lr_release_device(p);
-
-	grp = p->pv.group_id;
-
-	if (!grp)
-		goto exit;
-
-	g = lr_get_group_by_num(grp);
-	vp = (struct lr_private *)g->dev->priv;
-	gv = &(vp->group->var);
-	lr_unregister_port(gv, i);
-
-	j = gv->port_list[0];
-	if (j){
-		struct net_device *tdev = lr_get_port_by_num(j)->dev;
-		memcpy(gv->group_addr, tdev->dev_addr, ETH_ALEN);
-		memcpy(g->dev->dev_addr, tdev->dev_addr, ETH_ALEN);
-		if (grp == 1)
-			memcpy(lr_sysvar.system_id, g->dev->dev_addr, ETH_ALEN);
-	}
-
-	h = p->pv.rct;
-	for(r = h; r; r = h){
-		h = r->next;
-		kfree(h);
-	}
-	memset(p, 0, sizeof(struct lr_port));
-	gv->begin = _TRUE;
-
-	ret = 0;
-
-exit:
-	return ret;
-}
-
-static int lr_get_version(struct u_drv_info *di)
-{
- 	struct u_drv_info kdi;
- 	
-	if (!di)
-		return -EFAULT;
-
- 	kdi.major = LR_VER_MAJOR;
- 	kdi.minor = LR_VER_MINOR;
- 	kdi.patch = LR_VER_PATCH;
- 	strcpy(kdi.name, "LR");
- 	strcpy(kdi.author, "Katsuyuki Yumoto");
- 
- 	if (copy_to_user(di, &kdi, sizeof(struct u_drv_info)))
- 		return -EFAULT;
- 
- 	return 0;
-}
-
-struct net_device *lr_searchfor_vdev(char *vif)
-{
-	struct net_device *dev = NULL;
-	struct lr_group *g;
-
-	if (!vif || strlen(vif) > MAX_NAME)
-		return NULL;
-
-	for (g = lr_get_head_group(); g; g = lr_get_next_group(g)){
-		if (g->dev && strcmp(vif, g->dev->name) == 0){
-			dev = g->dev;
-			break;
-		}
-	}
-	return dev;
-}
-
-
-static int lr_get_group_info(struct u_group_info *gi, char *vif)
-{
-	struct lr_private *vp;
-	struct group_var *gv;
-	struct net_device *dev;
- 	struct u_group_info kgi;
-	int ret;
-
-	ret = -EFAULT;
-	if (!vif || !gi)
-		goto exit;
-
-	ret = -ENODEV;
-	if (strlen(vif) > MAX_NAME)
-		goto exit;
-
-	dev = lr_searchfor_vdev(vif);
-	if (!dev){
-		goto exit;
-	}
-
-	vp = (struct lr_private *)dev->priv;
-	gv = &vp->group->var;
-
-	spin_lock_irq(&gv->lock);
-
- 	kgi.gid = gv->group_id;
- 	memcpy(kgi.gaddr, gv->group_addr, ETH_ALEN);
-	kgi.perio_time = gv->admin_perio_time/One_Sec;
-	kgi.age_time = gv->age_time;
-	kgi.tchg_opt = gv->tchg_opt;
-	kgi.pii_opt = gv->pii_opt;
-	kgi.lstat = get_group_link_stat(dev);
-
-	spin_unlock_irq(&gv->lock);
-
-	ret = -EFAULT;
- 	if (copy_to_user(gi, &kgi, sizeof(struct u_group_info)))
- 		goto exit;
-
-	ret = 0;
-exit:
-	return ret;
-}
-
-static int lr_set_group_info(struct u_group_info *gi, char *vif)
-{
-	struct lr_private *vp;
-	struct group_var *gv;
-	struct net_device *dev;
-	struct u_group_info kgi;
-	int ret;
-	
-	ret = -EFAULT;
-	if (!vif || !gi)
-		goto exit;
-
-	ret = -ENODEV;
-	if (strlen(vif) > MAX_NAME)
-		goto exit;
-
-	dev = lr_searchfor_vdev(vif);
-	if (!dev){
-		goto exit;
-	}
-
-	vp = (struct lr_private *)dev->priv;
-	gv = &vp->group->var;
-
-	ret = -EFAULT;
-	if (copy_from_user(&kgi, gi, sizeof(struct u_group_info)))
-		goto exit;
-
-	spin_lock_irq(&gv->lock);
-
-	gv->admin_perio_time = kgi.perio_time*One_Sec;
-	gv->age_time = kgi.age_time;
-	gv->tchg_opt = kgi.tchg_opt;
-	gv->pii_opt = kgi.pii_opt;
-
-	spin_unlock_irq(&gv->lock);
-
-	ret = 0;
-
-exit:
-	return ret;
-}
-
-static int lr_get_port_list(struct u_port_info *pl, char *vif)
-{
-	struct lr_private *vp;
-	struct group_var *gv;
-	struct net_device *dev;
-	int i, n;
-	struct sgmte *sp;
-	struct lr_port *p;
- 	struct u_port_info kpi;
-	int ret = -ENODEV;
-
-	if (!vif || !pl){
-		ret = -EFAULT;
-		goto out;
-	}
-
-	if (strlen(vif) > MAX_NAME)
-		goto out;
-
-	dev = lr_searchfor_vdev(vif);
-	if (!dev)
-		goto out;
-
-	vp = (struct lr_private *)dev->priv;
-	gv = &vp->group->var;
-
-	spin_lock_irq(&gv->lock);
-
-	for (i = 0; i < MAX_PHYIF; i++){
-		n = gv->port_list[i];
-		if (!n || n < 0 || n >= MAX_PHYIF)
-			break;
-
-		p = lr_get_port_by_num(n);
-		sp = &p->pv.local_sgmt;
- 		kpi.gid = p->pv.group_id;
- 		kpi.pid = sp->port_id;
- 		kpi.aid = sp->active_id;
- 		kpi.sgid = sp->sgid;
- 		kpi.lstat = get_link_stat(p->dev);
- 		strcpy(kpi.dev_name, p->dev->name);
-		spin_unlock_irq(&gv->lock);
- 		if (copy_to_user(pl, &kpi, sizeof(struct u_port_info))){
- 			ret = -EFAULT;
-			goto out;
- 		}
-		spin_lock_irq(&gv->lock);
-		pl++;
-	}
-
-	spin_unlock_irq(&gv->lock);
-	ret = i;
-out:
-	return ret;
-}
-
-static int lr_get_dist_info(struct u_dist_info *di, int size, char *vif)
-{
-	struct lr_private *vp;
-	struct group_var *gv;
-	struct net_device *dev;
-	struct dist_info *p;
- 	struct u_dist_info kdi;
-	int i, j;
-	unsigned int limit;
-	int ret = -ENODEV;
-
-	if (!vif || !di){
-		ret = -EFAULT;
-		goto out;
-	}
-	if (size <= 0){
-		ret = -EFAULT;
-		goto out;
-	}
-
-	limit = size/sizeof(struct u_dist_info);
-
-	if (strlen(vif) > MAX_NAME)
-		goto out;
-
-	dev = lr_searchfor_vdev(vif);
-	if (!dev){
-		return -ENODEV;
-	}
-
-	vp = (struct lr_private *)dev->priv;
-	gv = &vp->group->var;
-
-	spin_lock_irq(&gv->dist_lock);
-	for (i = 0, j = 0; i < 32 && j <= limit; i++){
-		p = gv->dist_info[i];
-		for (; p && j <= limit; p = p->next){
- 			memcpy(kdi.m_addr, p->m_addr, ETH_ALEN);
- 			kdi.sgid = p->sgid;
- 			kdi.age = p->age;
- 			kdi.is_bfu = p->bfu_mark;
-
-			atomic_inc(&p->use_count);
-			spin_unlock_irq(&gv->dist_lock);
- 			if (copy_to_user(di+j, &kdi, sizeof(struct u_dist_info))){
- 				spin_unlock_irq(&gv->dist_lock);
- 				return -EFAULT;
- 			}
-			spin_lock_irq(&gv->dist_lock);
-			if (atomic_dec_and_test(&p->use_count)){
-				/* entry was deleted */
-				kfree(p);
-				spin_unlock_irq(&gv->dist_lock);
-				ret = -EAGAIN;
-				goto out;
-			}
-			j++;
-		}
-	}
-	spin_unlock_irq(&gv->dist_lock);
-	ret = j;
-
-out:
-	return ret;
-}
-
-static int lr_get_bfu_info(struct u_bfu_info *bi, int size, char *vif)
-{
-	struct lr_private *vp;
-	struct group_var *gv;
-	struct net_device *dev;
-	struct glist_ent *p;
-	struct sglist_ent *q;
- 	struct u_bfu_info kbi;
-	int i, j;
-	unsigned int limit;
-	int ret;
-
-	ret = -EFAULT;
-	if (!vif || !bi){
-		goto out;
-	}
-	if (size <= 0){
-		goto out;
-	}
-
-	limit = size/sizeof(struct u_dist_info);
-
-	ret = -ENODEV;
-	if (strlen(vif) > MAX_NAME)
-		goto out;
-
-	dev = lr_searchfor_vdev(vif);
-	if (!dev)
-		goto out;
-
-	vp = (struct lr_private *)dev->priv;
-	gv = &vp->group->var;
-
-	spin_lock_irq(&gv->bfu_lock);
-
-	for (i = 0, j = 0; i < 32 && j <= limit; i++){
-		p = gv->gl[i];
-		for (; p && j <= limit; p = p->next){
- 			memcpy(kbi.gaddr, p->gaddr, ETH_ALEN);
- 			kbi.min_sgid = p->min_sgid;
- 			kbi.age = 0;
-			for (q = p->sgl; q && p->min_sgid; q = q->next)
-				if (p->min_sgid == q->rcv_sgid)
- 					kbi.age = q->age;
-			atomic_inc(&p->use_count);
-			spin_unlock_irq(&gv->bfu_lock);
-
- 			if (copy_to_user(bi+j, &kbi, sizeof(struct u_bfu_info))){
- 				spin_unlock_irq(&gv->bfu_lock);
- 				ret = -EFAULT;
-				goto out;
- 			}
-
-			spin_lock_irq(&gv->bfu_lock);
-			if (atomic_dec_and_test(&p->use_count)){
-				/* entry was deleted */
-				kfree(p);
-				spin_unlock_irq(&gv->bfu_lock);
-				ret = -EAGAIN;
-				goto out;
-			}
-			j++;
-		}
-	}
-
-	spin_unlock_irq(&gv->bfu_lock);
-	ret = j;
-out:
-	return ret;
-}
-
-static int lr_get_sys_info(struct u_sys_info *si)
-{
- 	struct u_sys_info ksi;
- 
-	if (!si)
-		return -EFAULT;
-
- 	memcpy(ksi.sys_id, lr_sysvar.system_id, ETH_ALEN);
- 	ksi.prio = lr_sysvar.priority;
- 
- 	if (copy_to_user(si, &ksi, sizeof(struct u_sys_info)))
- 		return -EFAULT;
- 
- 	return 0;
-}
-
-int lr_alloc_private(struct lr_group *g)
-{
-	struct lr_private *vp;
-
-	if (!g)
-		return _FALSE;
-
-	vp = g->dev->priv = 
-		(struct lr_private *)kmalloc(sizeof(struct lr_private), GFP_KERNEL);
-	
-	if (vp == NULL) {
-		printk(KERN_ERR "%s: out of memory.\n", g->dev->name);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-		kfree(g->dev->name);
-#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-		kfree(g->dev);
-#else
-       free_netdev(g->dev);
-#endif
-		g->dev = NULL;
-		return _FALSE;
-	}
-	memset(vp, 0, sizeof(struct lr_private));
-
-	vp->group = g;
-
-	return _TRUE;
-}
-
-static int lr_accept_fastpath(struct net_device *dev, struct dst_entry *dst)
-{
-	return -1;
-}
-
-extern int lr_ioctl(struct net_device *, struct ifreq *, int );
-
-static int lr_init_group(int n)
-{
-	struct lr_group *g;
-	struct group_var *gv;
-	int ret;
-
-	ret = -ENODEV;
-	if (n < 0 || n > MAX_PHYIF)
-		return ret;
-
-	g = lr_get_group_by_num(n);
-	if (!g)
-		return ret;
-
-	ret = -ENOMEM;
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-	g->dev = kmalloc(sizeof(struct net_device), GFP_KERNEL);
-#else
-	g->dev = alloc_etherdev(sizeof(struct net_device));
-#endif
-	if (!g->dev)
-		goto freeandout3;
-
-	memset(g->dev, 0, sizeof(struct net_device));
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-	g->dev->name = kmalloc(strlen("lrXXX"), GFP_KERNEL);
-	
-	if (!g->dev->name)
-		goto freeandout2;
-#endif	
-	sprintf(g->dev->name, "lr%d", n-1);
-
-
-	/* Set the private structure */
-	if (!lr_alloc_private(g))
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-		goto freeandout1;
-#else
-		goto freeandout2;
-#endif
-
-	gv = &g->var;
-	lr_group_vars_init(gv);
-	gv->group_id = n;
-
-	/* Fill in the generic fields of the device structure. */
-	ether_setup(g->dev);
-
-	/* Then, override parts of it */
-	g->dev->hard_start_xmit	= lr_group_distribution;
-	g->dev->open		= lr_open;
-	g->dev->stop		= lr_close;
-	g->dev->get_stats 		= lr_get_stats;
-	g->dev->accept_fastpath	= lr_accept_fastpath;
-	g->dev->set_mac_address		= NULL;
-	g->dev->do_ioctl		= lr_ioctl;
-/*	g->dev->flags	        = IFF_BROADCAST | IFF_MULTICAST;*/
-	memset(g->dev->dev_addr, 0xfc, ETH_ALEN/2);
-	g->dev->dev_addr[ETH_ALEN-1] = n;
-	g->dev->tx_queue_len = 0;
-
-	ret = register_netdev(g->dev);
-	if (ret)
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-		goto freeandout1;
-#else
-		goto freeandout2;
-#endif
-	init_timer(&g->tl);
-
-	g->tl.expires = jiffies + HZ/One_Sec; /* 50 msec */
-	g->tl.function = lr_tick;
-	g->tl.data = n;
-	add_timer(&g->tl);
-
-	return ret;
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-freeandout1:
-	kfree(g->dev->name);
-#endif
-freeandout2:
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-    kfree(g->dev);
-#else
-	free_netdev(g->dev);
-#endif
-	g->dev = NULL;
-freeandout3:
-	printk(KERN_ERR "lr: out of memory.\n");
-	return ret;
-}
-
-
-static int lr_cleanup_group(struct lr_group *g)
-{
-	struct group_var *gv;
-
-	if (!g)
-		return -EFAULT;
-
-	gv = &g->var;
-	/* unregister timers */
-	lr_unregister_timer(gv, rcf_timer);
-	lr_unregister_timer(gv, periodic_timer);
-	ring_flush(&gv->rb);
-	unregister_netdev(g->dev);
-
-	lr_cleanup_bfu(gv);
-	lr_clear_distinfo(gv);
-
-	kfree(g->dev->priv);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-	kfree(g->dev->name);
-#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-	kfree(g->dev);
-#else
-	free_netdev(g->dev);
-#endif
-	g->dev = NULL;
-	del_timer_sync(&g->tl);
-
-	return 0;
-}
-
-#if 0
-static int lr_add_group((struct u_group_info *)gi)
-{
-}
-
-static int lr_del_group((struct u_group_info *)gi)
-{
-}
-#endif
-
-static int lr_ioctl_dispatch(struct lrconf *vc)
-{
-	int n;
-
-	switch (vc->action){
-		case LRCTL_VERSION: /* get device driver version */
- 			return lr_get_version((struct u_drv_info *)vc->buf);
-
-		case LRCTL_ADD_PHYIF: /* add physical i/f to pool*/
-			n = lr_get_group_id_by_name(vc->vif_name);
-			if (!n)
-				return -ENODEV;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
-			n = lr_add_phyif(vc->pif_name, n);
-#else
-			n = lr_add_phyif(vc->pif_name, vc->pif_module, n)
-#endif
-			return n;
-
-		case LRCTL_DEL_PHYIF: /* delete physical i/f from pool */
-			n = lr_del_phyif(vc->pif_name);
-			return n;
-
-		case LRCTL_GET_PORTLIST: /* get physical i/f array */
-			n = lr_get_port_list((struct u_port_info *)vc->buf, vc->vif_name);
-			if (n < 0)
-				return n;
-			vc->size = n;
-			break;
-		case LRCTL_GET_DISTINFO:
-			n = lr_get_dist_info((struct u_dist_info *)vc->buf, vc->size, vc->vif_name);
-			if (n < 0)
-				return n;
-			vc->size = n;
-			break;
-		case LRCTL_GET_BFUINFO:
-			n = lr_get_bfu_info((struct u_bfu_info *)vc->buf, vc->size, vc->vif_name);
-			if (n < 0)
-				return n;
-			vc->size = n;
-			break;
-		case LRCTL_GET_SYSINFO:
-			return lr_get_sys_info((struct u_sys_info *)vc->buf);
-
-		case LRCTL_GET_GRPINFO:
-			n = lr_get_group_info((struct u_group_info *)vc->buf, vc->vif_name);
-			if (n < 0)
-				return n;
-			vc->size = n;
-			break;
-		case LRCTL_SET_GRPINFO:
-			n = lr_set_group_info((struct u_group_info *)vc->buf, vc->vif_name);
-			if (n < 0)
-				return n;
-			vc->size = n;
-			break;
-#if 0
-		case LRCTL_ADD_GRP:
-			n = lr_add_group((struct u_group_info *)vc->buf);
-			if (n < 0)
-				return -EINVAL;
-			vc->size = n;
-			break;
-		case LRCTL_DEL_GRP:
-			n = lr_del_group((struct u_group_info *)vc->buf);
-			if (n < 0)
-				return -EINVAL;
-			vc->size = n;
-			break;
-#endif
-	}
-	return 0;
-}
-
-int lr_ioctl(struct net_device *adev, struct ifreq *rq, int cmd)
-{
-	struct mii_ioctl_data *data;
-
-	if (!rq || !rq->ifr_data || !adev)
-		return -EFAULT;
-
-	data = (struct mii_ioctl_data *)&rq->ifr_data;
-
-	if (cmd == SIOCDEVPRIVATE){
-		struct lrconf *vc = (struct lrconf *) rq->ifr_data;
-		struct lrconf kvc;
-		if (!copy_from_user(&kvc, vc, sizeof(struct lrconf)) &&
-			(kvc.magic == LR_MAGIC))
-			return lr_ioctl_dispatch(vc);
-		/* else
-		 *    fall through to keep ioctl() compatibility
-		 *    with many ethernet device drivers. They provides
-		 *    MII functions commonly using SIOCDEVPRIVATE space. */
-	}
-	switch (cmd){
-		case SIOCGMIIPHY:
-			data->phy_id = 0;	
-		case SIOCGMIIREG:
-			printk("adev->name = %s\n", adev->name);
-			data->val_out = get_group_link_stat(adev);
-			break;
-		default:
-			return -EOPNOTSUPP;
-	}
-	return 0;
-}
-
-
-/* Write the buffer (contents of the port statuses) to a PROCfs file */
-
-static char *state2str_sgm(enum sgmm_state s)
-{
-	switch (s){
-	case INITIALIZE:
-		return "INIT";
-	case WAIT_FOR_NTR:
-		return "W_NTR";
-	case REBUILD_START:
-		return "RBLD_ST";
-	case WAIT_FOR_RCF_NOTIFY:
-		return "W_NOTFY";
-	case RCF_RECEIVED:
-		return "RCF_REC";
-	case RCF_TIMEOUT:
-		return "RCF_TMO";
-	case NOT_CHANGED:
-		return "NOT_CHG";
-	case CHANGED:
-		return "CHANGED";
-	}
-	return NULL;
-}
-
-static char *state2str_rcft(enum rcftm_state s)
-{
-	switch (s){
-	case NOT_RUNNING:
-		return "NOT_RUN";
-	case RUNNING:
-		return "RUNNING";
-	case TIMEOUT:
-		return "TMOUT";
-	case TIMEOUT2:
-		return "TMOUT2";
-	}
-	return NULL;
-}
-
-static char *state2str_pr(enum perio_state s)
-{
-	switch (s){
-	case DISABLED:
-		return "DISABLE";
-	case WAIT_FOR_TIMEOUT:
-		return "W_TMOUT";
-	case EXPIRED:
-		return "EXPIRED";
-	}
-	return NULL;
-}
-
-static int sprintf_a_line(char *buf, struct net_device *devlr)
-{
-	int len;
-
-	struct lr_private *vp = (struct lr_private *)devlr->priv;
-	struct group_var *gv = &(vp->group->var);
-
-	len =  sprintf(buf, "%-8s", devlr->name);
-	len += sprintf(buf+len, "%-8s", state2str_sgm(gv->sgmm.state));
-	len += sprintf(buf+len, "%-8s", state2str_rcft(gv->rcftm.state));
-	len += sprintf(buf+len, "%-8s", state2str_pr(gv->prm.state));
-	len += sprintf(buf+len, "\n");
-
-	return len;
-}
-
-
-static int sprintf_a_line_port(char *buf, struct net_device *devlr)
-{
-	int len = 0;
-	int i, n;
-	struct sgmte *sp;
-	struct lr_private *vp = (struct lr_private *)devlr->priv;
-	struct group_var *gv = &(vp->group->var);
-	struct lr_port *p;
-
-	spin_lock_irq(&gv->lock);
-	for (i = 0; i < MAX_PHYIF; i++){
-		n = gv->port_list[i];
-		if (!n || n < 0 || n >= MAX_PHYIF)
-			break;
-
-		p = lr_get_port_by_num(n);
-		sp = &p->pv.local_sgmt;
-		len += sprintf(buf+len, "%-8s%c%s(%d) : %d\n",
-			devlr->name,
-			sp->active?'*':' ',
-			lr_get_port_by_num(sp->port_id)->dev->name,
-			sp->port_id, sp->sgid);
-	}
-	spin_unlock_irq(&gv->lock);
-	len += sprintf(buf+len, "\n");
-
-	return len;
-}
-static int sprintf_a_line_distinfo(char *buf, struct net_device *devlr)
-{
-	int len;
-	int i;
-	struct dist_info *p;
-	struct lr_private *vp = (struct lr_private *)devlr->priv;
-	struct group_var *gv = &(vp->group->var);
-	char strbuf[16];
-
-	sprintf(strbuf, "%-8s", devlr->name);
-	len = sprintf(buf, "%s", "GRP     Neighbors    SubGRP\n");
-
-	spin_lock_irq(&gv->dist_lock);
-	for (i = 0; i < 32; i++){
-		p = gv->dist_info[i];
-		for (; p; p = p->next){
-			len += sprintf(buf+len, "%s%02x%02x%02x-%02x%02x%02x %4d %4d\n",
-				strbuf,
-				p->m_addr[0],
-				p->m_addr[1],
-				p->m_addr[2],
-				p->m_addr[3],
-				p->m_addr[4],
-				p->m_addr[5],
-				p->sgid, p->age);
-		}
-	}
-	spin_unlock_irq(&gv->dist_lock);
-	len += sprintf(buf+len, "\n");
-
-	return len;
-}
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-static int 
-lr_get_info(char *pbuf, char **start, off_t offset, int length, int unused)
-#else
-static int lr_get_info(char *pbuf, char **start, off_t offset, int length)
-#endif
-{
-#define LIMIT (PAGE_SIZE-80);
-
-	int size;
-	int len = 0;
-	struct lr_group *g;
-
-	if(!offset){
-		/* first time write the header */
-		size = sprintf(pbuf,"%s","GRP     SGM     RCFM    PERIO   \n");
-		len = size;
-	}
-
-	for (g = lr_get_head_group(); g; g = lr_get_next_group(g)){
-		if (g->dev){
-			len += sprintf_a_line(pbuf+len, g->dev);
-		}
-	}
-
-	len += sprintf(pbuf+len, "\n Port-Subgroup Mapping\n");
-	for (g = lr_get_head_group(); g; g = lr_get_next_group(g)){
-		if (g->dev){
-			len += sprintf_a_line_port(pbuf+len, g->dev);
-		}
-	}
-	len += sprintf(pbuf+len, "\n Distributing Information\n");
-	for (g = lr_get_head_group(); g; g = lr_get_next_group(g)){
-		if (g->dev){
-			len += sprintf_a_line_distinfo(pbuf+len, g->dev);
-		}
-	}
-
-	if (len > PAGE_SIZE-80){
-		len = PAGE_SIZE-80;
-	}
-
-	return len;
-}
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-#ifdef CONFIG_PROC_FS
-struct proc_dir_entry proc_net_lr= {
-	0, 4, "lrcp",
-	S_IFREG | S_IRUGO, 1, 0, 0,
-	0, &proc_net_inode_operations,
-	lr_get_info
-};
-#endif
-#endif
-
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-void cleanup_module(void)
-#else
- void __exit lr_cleanup_module(void)
-#endif
-{
-	struct lr_port *p;
-	struct lr_group *g;
-
-	for (p = lr_get_head_port(); p; p = lr_get_next_port(p)){
-		if (p->dev)
-			lr_del_phyif(p->dev->name);
-	}
-
-	/*
-	 * Physical interfaces are already released. 
-	 * Now we shouldn't receive any packet on given group.
-	 */
-	for (g = lr_get_head_group(); g; g = lr_get_next_group(g)) {
-		if (!g->dev)
-			continue;
-
-		lr_cleanup_group(g);
-	}
-
-#ifdef CONFIG_PROC_FS
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-	proc_net_unregister(proc_net_lr.low_ino);
-#else
-	proc_net_remove("lrcp");
-#endif
-#endif
-
-	/* remove packet handler */
-	ic_lr_cleanup();
-}
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-#define lr_init  init_module
-#endif
-
-
-/* 
- * Entry point of LRCP driver.
- * Register/initialize the driver.
- */
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-__initfunc(int lr_init(void))
-#else
- int __init lr_init_module(void)
-#endif
-{
-	int i;
-	int ret;
-	struct lr_group *g;
-	struct lr_port *p;
-
-	printk(KERN_INFO "LRCP %d.%d.%d Yumo (Katsuyuki Yumoto) yumo@st.rim.or.jp\n",
-		   (int)LR_VER_MAJOR, (int)LR_VER_MINOR, (int)LR_VER_PATCH);
-
-	for (g = lr_get_head_group(); g; g = lr_get_next_group(g)){
-		g->dev = NULL;
-	}
-
-	for (p = lr_get_head_port(); p; p = lr_get_next_port(p)){
-		p->dev = NULL;
-	}
-
-	/* nlr comes from module parameter and it is default to 1 */
-	for (i = 1; i <= nlr; i++){
-		ret = lr_init_group(i);
-		if (ret){
-			printk(KERN_INFO "lr: lr%d device not registered\n", i-1);
-			return ret;
-		}
-	}
-
-	lr_sysvar.priority = 0x8000;
-	
-#ifdef CONFIG_PROC_FS
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-	proc_net_register(&proc_net_lr);
-#else
-	proc_net_create("lrcp", 0, lr_get_info);
-#endif
-#endif
-
-	/* packet handler registration for receiving */
-	ic_lr_init();
-
-	return 0;
-}
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
-module_init(lr_init_module);
-module_exit(lr_cleanup_module);
-
-MODULE_LICENSE("GPL");
-#endif
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-#include <linux/vermagic.h>
-#include <linux/compiler.h>
-MODULE_INFO(vermagic, VERMAGIC_STRING);
-MODULE_DESCRIPTION("Link redundancy configuration protocol driver");
-MODULE_AUTHOR("Katsuyuki Yumoto");
-#endif
-
-/*
- * Local variables:
- * compile-command: "gcc -DMODULE -DMODVERSIONS -D__KERNEL__ -Wall -Wstrict-prototypes -O2 -g -fomit-frame-pointer -pipe -c lr.c"
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- *  indent-tabs-mode: t
- * End:
- */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/lr/lr.h linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/lr/lr.h
--- linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/lr/lr.h	2004-06-29 11:25:31.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/lr/lr.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,526 +0,0 @@
-/* $Id: lr.h,v 1.11 2004/03/01 13:48:57 yumo Exp $ */
-/* LRCP: A virtual ethernet device driver for Linux header file. 
- *
- * This device driver is an implementation of Redundancy of Multiple
- * Link Segments (Yumo's original protocol).
- *
- * Author: Yumo (Katsuyuki Yumoto) 2001-2004
- *         yumo@st.rim.or.jp
- *
- * 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  02111-1307, USA.
- */
-
-#ifndef LR_H
-#define LR_H
-
-#define MAX_LR  8
-#define MAX_PHYIF 8
-
-#define LR_VER_MAJOR 0
-#define LR_VER_MINOR 8
-#define LR_VER_PATCH 4
-
-#define LR_MAGIC 0x3eac
-
-/* actions */
-#define LRCTL_ADD_PHYIF 1
-#define LRCTL_DEL_PHYIF 2
-#define LRCTL_GET_PORTLIST 3
-#define LRCTL_VERSION 4
-#define LRCTL_GET_DISTINFO 5
-#define LRCTL_GET_SYSINFO 6
-#define LRCTL_GET_GRPINFO 7
-#define LRCTL_GET_BFUINFO 8
-#define LRCTL_SET_GRPINFO 9
-
-/* for ioctl() */
-struct u_dist_info {
-	unsigned char m_addr[6];
-	unsigned short sgid;
-	unsigned short age;
-	unsigned char is_bfu;
-};
-
-struct u_bfu_info {
-	unsigned char gaddr[6];
-	unsigned short min_sgid;
-	unsigned short age;
-};
-
-struct u_sys_info {
-	unsigned char sys_id[6];
-	unsigned short prio;
-};
-
-struct u_group_info {
-	unsigned short gid; 
-	unsigned char gaddr[6];
-	unsigned short perio_time;
-	unsigned short age_time;
-	int tchg_opt;
-	int pii_opt;
-	unsigned short lstat; /* group link status */
-};
-
-struct u_port_info {
-	unsigned short gid; /* group id */
-	unsigned short pid; /* port id */
-	unsigned short aid; /* active id */
-	unsigned short sgid; /* sub-group id */
-	char dev_name[8];
-	unsigned short lstat; /* link status */
-};
-
-struct u_drv_info {
-	unsigned char major;
-	unsigned char minor;
-	unsigned char patch;
-	char name[20]; /* driver name */
-	char author[50];
-};
-
-struct lrconf {
-	unsigned short magic;
-	int action;
-
-	char pif_name[8];
-	char vif_name[8];
-	char pif_module[40];
-	unsigned int size;
-	unsigned char *buf;
-};
-
-
-#ifdef __KERNEL__
-
-/* Linux version dependency */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-/* for 2.2.x */
-#define netdevice_start(dev) dev->start = 1
-#define netdevice_stop(dev) dev->start = 0
-#define netif_start_queue(dev) dev->tbusy = 0
-#define netif_stop_queue(dev) dev->tbusy = 1
-#define net_device device
-#define dev_get_by_name dev_get
-
-#define NET_XMIT_DROP 0
-#define NET_XMIT_SUCCESS 0
-#define NET_RX_SUCCESS 0
-#define NET_RX_DROP 0
-#define NET_RX_BAD 0
-#else
-#define netdevice_start(dev)
-#define netdevice_stop(dev)
-#endif
-
-
-
-
-/* LRCP constants */
-
-typedef enum _bool {
-	_TRUE = 1,
-	_FALSE = 0
-}bool;
-
-#if 0
-static char Slow_Protocols_Multicast[ETH_ALEN] = 
-{0x01,0x80,0xc2,0x00,0x00,0x02}; /* Tbl 43B-1 */
-#else
-static char Slow_Protocols_Multicast[ETH_ALEN] = 
-{0xff,0xff,0xff,0xff,0xff,0xff};
-#endif
-static unsigned short Slow_Protocols_Type = 0x8809; /* Tbl 43B-2 */
-
-static unsigned char LRCP_Subtype = 0x20; /* Link Redundancy Control Protocol */
-static unsigned char LRCP_Version = 0x3; /* LRCP version */
-static unsigned char FF_Subtype = 0x21; /* Flush Frame */
-
-
-/* LRCPDU structure */
-/* LRCP nodes need to talk each other in order to avoid multiple paths
- * 2001/12/25.
- * 2002/1/5 Introduced priority field. */
-struct lrcpdu {
-	u8  subtype;			/* 0 */
-	u8  version_number;		/* 1 */
-	u8	system_id[ETH_ALEN]; /* 2 */
-	u16	group_id;			/* 8 */
-	u16	subgroup_id;		/* 10 */
-	u16 port_id;			/* 12 */
-	u16 sys_priority;		/* 14 */
-	u8	group_address[ETH_ALEN];	/* 16 */
-	u8  pad[1];				/* 22 */
-	u8  flags;				/* 23 */
-#define RCFFL_TOPOCHG  0x01
-	u16	perio_time;			/* 24 */
-	u8	pad1[28];			/* 26 */
-	/* total length is 64 */
-};
-
-#define LRCPDU_LEN sizeof(struct lrcpdu) /* 64 */
-
-#ifndef ETH_P_LR
-#define ETH_P_LR	0x001b		/* Linux Link Redundancy */
-#endif
-
-
-/* Timer values */
-#define One_Sec 20			/* must be GE 10 */
-#define Periodic_Time 1*One_Sec		/* 1 sec */
-#define Timeout_Time 3*One_Sec/10	/* 300 msec */
-#define Timeout2_Time 5*One_Sec/10	/* 500 msec */
-#define Age_Periodic_Time 1*One_Sec	/* 1 sec */
-#define Age_Max 300			/* 300 sec */
-#define PII_Live_Time 5*One_Sec		/* 5 sec */
-
-/* RCF timer machine */
-enum rcftm_state {
-	NOT_RUNNING,
-	RUNNING,
-	TIMEOUT,
-	TIMEOUT2
-};
-
-/* RCF generator machine */
-enum rcfgm_state {
-	WAIT_FOR_NTT,
-	RCF_GENERATE
-};
-
-/* periodic timer machine */
-enum perio_state {
-	DISABLED,
-	WAIT_FOR_TIMEOUT,
-	EXPIRED
-};
-
-/* Sub group manager machine */
-enum sgmm_state {
-	INITIALIZE,
-	WAIT_FOR_NTR,
-	REBUILD_START,
-	WAIT_FOR_RCF_NOTIFY,
-	RCF_RECEIVED,
-	RCF_TIMEOUT,
-	NOT_CHANGED,
-	CHANGED
-};
-
-
-/* timers */
-struct lr_timer {
-	struct lr_timer *next;
-	int exp;
-	int tim;
-	bool active;
-	void (*tick_func)(struct lr_timer *vtp); /* tick function */
-};
-
-
-
-#define MAX_RING 128
-
-
-struct ring_buf {
-	int r;
-	int w;
-	unsigned char *buf[MAX_RING];
-};
-
-static void ring_init(struct ring_buf *rb)
-{
-	rb->r = 0;
-	rb->w = 0;
-	memset(rb->buf, 0, MAX_RING*(sizeof(char *)));
-}
-
-static void ring_flush(struct ring_buf *rb)
-{
-	int i;
-	rb->r = 0;
-	rb->w = 0;
-	for(i = 0; i < MAX_RING; i++){
-		if (rb->buf[i]){
-			kfree(rb->buf[i]);
-			rb->buf[i] = NULL;
-		}
-	}
-}
-static bool ring_empty(struct ring_buf *rb)
-{
-	return (rb->r == rb->w)?_TRUE:_FALSE;
-}
-
-static void ring_put(struct ring_buf *rb, char *buf, int n)
-{
-	if (rb->buf[rb->w]){
-		kfree(rb->buf[rb->w]);
-		rb->buf[rb->w] = NULL;
-	}
-
-	rb->buf[rb->w] = kmalloc(n+5, GFP_ATOMIC);
-	if (!rb->buf[rb->w]){
-		return;
-	}
-	memcpy(rb->buf[rb->w], buf, n);
-	if (++rb->w == MAX_RING){
-		rb->w = 0;
-	}
-	if (rb->w == rb->r){
-		if (++rb->r == MAX_RING){
-			rb->r = 0;
-		}
-	}
-	return;
-}
-
-
-static bool ring_get(struct ring_buf *rb, char *buf, int n)
-{
-	if (ring_empty(rb))
-		return _FALSE;
-
-	memcpy(buf, rb->buf[rb->r], n);
-	kfree(rb->buf[rb->r]);
-	rb->buf[rb->r] = NULL;
-	if (++rb->r == MAX_RING){
-		rb->r = 0;
-	}
-	return _TRUE;
-}
-
-
-#define DO_IT(x) \
-	if (m->do_it){ \
-		x; \
-		m->do_it = _FALSE; \
-	}
-
-#define GO_NEXT_STATE(x) \
-	m->do_it = _TRUE; \
-	m->state = x;
-
-
-/* state machines */
-struct sgm_mach { /* each group has this */
-	enum sgmm_state state;
-	bool do_it;
-	int cnt;
-};
-
-struct rcft_mach { /* each group has this */
-	enum rcftm_state state;
-	bool do_it;
-};
-
-struct rcfg_mach { /* each group has this */
-	enum rcfgm_state state;
-	bool do_it;
-};
-
-struct perio_mach { /* each group has this */
-	enum perio_state state;
-	bool do_it;
-};
-
-
-/* Broadcast Filtering Unit (BFU) */
-#if 0
-extern struct glist_ent {};
-extern struct group_var {};
-#endif
-struct sglist_ent {
-	struct sglist_ent *next;
-	struct glist_ent *gle;
-
-	unsigned short sgid;
-	unsigned short rcv_sgid;
-	int age;
-};
-
-struct glist_ent {
-	struct glist_ent *next;
-	struct glist_ent *next2;
-	struct sglist_ent *sgl;
-	struct sysid_ent *syside;
-	struct group_var *gv;
-
-	unsigned short gid;
-	unsigned short min_sgid;
-	unsigned char gaddr[ETH_ALEN];
-
-	atomic_t use_count;
-};
-
-struct sysid_ent {
-	struct sysid_ent *next;
-	struct group_var *gv;
-
-	struct glist_ent *gl;
-	unsigned char sysid[ETH_ALEN];
-};
-
-
-
-
-
-struct dist_info {
-	struct dist_info *next;
-	u8	m_addr[ETH_ALEN];
-	u16	sgid;
-	u16 age;
-	u8	bfu_mark;
-
-	atomic_t use_count;
-};
-
-
-
-/* SGMT entry */
-struct sgmte {
-	struct sgmte *next;
-	u16		port_id;
-	u16		active_id;
-	u16		sgid;
-	bool	active;
-};
-
-/* RCT entry */
-struct rcte {
-	struct rcte *next;
-	u16		port_id;
-};
-
-
-
-/* System scope variables */
-struct system_var {
-	u8 system_id[ETH_ALEN];
-	u16 priority;
-} lr_sysvar;
-
-
-
-/* Port scope variables */
-struct port_var {
-	struct sgmte local_sgmt;
-	struct rcte *rct;
-	int prev_rcf_cnt;
-	u16 group_id;
-	bool	rcft_running;
-};
-
-struct nrcf {
-	unsigned short port_id;
-	unsigned short active_id;
-};
-	
-/* Sub-group scope variables */
-struct subgroup_var {
-	unsigned short sgid;
-	unsigned short active_id;
-};
-
-
-/* Group scope variables */
-struct group_var {
-	int group_id;
-	u8	group_addr[ETH_ALEN];
-	int	port_list[MAX_PHYIF];
-	struct subgroup_var	subg_list[MAX_PHYIF];
-	int perio_time;
-	int admin_perio_time;
-	int age_time;
-
-	/* Phase II compatibility */
-	int pii_live;
-
-	struct sgmte	master_sgmt[MAX_PHYIF];
-	struct sgmte	temp_sgmt[MAX_PHYIF];
-	struct dist_info	*dist_info[32];
-	bool	ntt;
-	bool	ntr;
-	bool	rcft_running;
-	bool	sgmt_match;
-	bool	begin;
-
-	/* BFU */
-	struct sysid_ent *sysidl;
-	struct glist_ent *gl[32];
-
-	bool	tchg_notified;
-	bool	tchg_detected;
-	bool	tchg_opt;
-
-	bool	pii_opt;
-	u16		agecnt;
-
-	struct ring_buf rb;
-
-	/* state machines */
-	struct rcft_mach rcftm;
-	struct rcfg_mach rcfgm;
-	struct perio_mach prm;
-	struct sgm_mach sgmm;
-
-	/* timers */
-	struct lr_timer *vth;
-	struct lr_timer rcf_timer;
-	struct lr_timer periodic_timer;
-
-	spinlock_t lock; /* lr device scope lock */
-	spinlock_t dist_lock; /* distinfo lock */
-	spinlock_t bfu_lock; /* BFU */
-};
-
-
-
-/* lr port structure */
-struct lr_port {
-	struct port_var pv;
-	struct net_device *dev;
-	char module_name[40]; /* module name of physical i/f */
-};
-
-/* lr group structure */
-struct lr_group {
-	struct group_var var;
-	struct net_device *dev;
-	struct timer_list tl;
-};
-
-
-/* lr_private is built-in device structure */
-struct lr_private {
-	struct net_device_stats enet_stats;
-	struct lr_group *group;
-};
-
-/* These are pool of ports */
-static struct lr_port lr_ports[MAX_PHYIF];
-static struct lr_group lr_groups[MAX_PHYIF];
-
-#endif /* __KERNEL__ */
-#endif /* LR_H */
-
-/*
- * Local variables:
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- *  indent-tabs-mode: t
- * End:
- */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/lr/lrcmd.c linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/lr/lrcmd.c
--- linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/lr/lrcmd.c	2004-06-29 11:25:31.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/lr/lrcmd.c	2004-09-05 16:00:20.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- * $Id: lrcmd.c,v 1.8 2004/03/02 11:59:43 yumo Exp $
+ * $Id: lrcmd.c,v 1.9 2004/03/06 14:45:11 yumo Exp $
  * lrcfg -- lr device driver configurator program
  *
  * Author: Yumo (Katsuyuki Yumoto) 2001-2004
@@ -45,7 +45,7 @@ typedef unsigned short u16;
 #endif
 
 #include <linux/sockios.h>
-#include "lr.h"
+#include "lrlink.h"
 #include "lrcfg.h"
 
 /* internal error codes */
@@ -777,7 +777,8 @@ int lr_command(int argc, char **argv)
 	}
 	
 	/* a silly raw socket just for ioctl()ling it */
-	sock = socket(AF_INET, SOCK_RAW, IPPROTO_RAW);
+//	sock = socket(AF_INET, SOCK_RAW, IPPROTO_RAW);
+	sock = socket(AF_INET, SOCK_DGRAM, 0);
 	if (sock < 0) {
 		perror(PROG_NAME);
 		print_general_info("");
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/lr/lrlink.h linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/lr/lrlink.h
--- linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/lr/lrlink.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/lr/lrlink.h	2004-09-05 16:00:19.000000000 +0200
@@ -0,0 +1,526 @@
+/* $Id: lr.h,v 1.12 2004/03/06 14:47:32 yumo Exp $ */
+/* LRCP: A virtual ethernet device driver for Linux header file. 
+ *
+ * This device driver is an implementation of Redundancy of Multiple
+ * Link Segments (Yumo's original protocol).
+ *
+ * Author: Yumo (Katsuyuki Yumoto) 2001-2004
+ *         yumo@st.rim.or.jp
+ *
+ * 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  02111-1307, USA.
+ */
+
+#ifndef LR_H
+#define LR_H
+
+#define MAX_LR  8
+#define MAX_PHYIF 8
+
+#define LR_VER_MAJOR 0
+#define LR_VER_MINOR 8
+#define LR_VER_PATCH 5
+
+#define LR_MAGIC 0x3eac
+
+/* actions */
+#define LRCTL_ADD_PHYIF 1
+#define LRCTL_DEL_PHYIF 2
+#define LRCTL_GET_PORTLIST 3
+#define LRCTL_VERSION 4
+#define LRCTL_GET_DISTINFO 5
+#define LRCTL_GET_SYSINFO 6
+#define LRCTL_GET_GRPINFO 7
+#define LRCTL_GET_BFUINFO 8
+#define LRCTL_SET_GRPINFO 9
+
+/* for ioctl() */
+struct u_dist_info {
+	unsigned char m_addr[6];
+	unsigned short sgid;
+	unsigned short age;
+	unsigned char is_bfu;
+};
+
+struct u_bfu_info {
+	unsigned char gaddr[6];
+	unsigned short min_sgid;
+	unsigned short age;
+};
+
+struct u_sys_info {
+	unsigned char sys_id[6];
+	unsigned short prio;
+};
+
+struct u_group_info {
+	unsigned short gid; 
+	unsigned char gaddr[6];
+	unsigned short perio_time;
+	unsigned short age_time;
+	int tchg_opt;
+	int pii_opt;
+	unsigned short lstat; /* group link status */
+};
+
+struct u_port_info {
+	unsigned short gid; /* group id */
+	unsigned short pid; /* port id */
+	unsigned short aid; /* active id */
+	unsigned short sgid; /* sub-group id */
+	char dev_name[8];
+	unsigned short lstat; /* link status */
+};
+
+struct u_drv_info {
+	unsigned char major;
+	unsigned char minor;
+	unsigned char patch;
+	char name[20]; /* driver name */
+	char author[50];
+};
+
+struct lrconf {
+	unsigned short magic;
+	int action;
+
+	char pif_name[8];
+	char vif_name[8];
+	char pif_module[40];
+	unsigned int size;
+	unsigned char *buf;
+};
+
+
+#ifdef __KERNEL__
+
+/* Linux version dependency */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
+/* for 2.2.x */
+#define netdevice_start(dev) dev->start = 1
+#define netdevice_stop(dev) dev->start = 0
+#define netif_start_queue(dev) dev->tbusy = 0
+#define netif_stop_queue(dev) dev->tbusy = 1
+#define net_device device
+#define dev_get_by_name dev_get
+
+#define NET_XMIT_DROP 0
+#define NET_XMIT_SUCCESS 0
+#define NET_RX_SUCCESS 0
+#define NET_RX_DROP 0
+#define NET_RX_BAD 0
+#else
+#define netdevice_start(dev)
+#define netdevice_stop(dev)
+#endif
+
+
+
+
+/* LRCP constants */
+
+typedef enum _bool {
+	_TRUE = 1,
+	_FALSE = 0
+}bool;
+
+#if 0
+static char Slow_Protocols_Multicast[ETH_ALEN] = 
+{0x01,0x80,0xc2,0x00,0x00,0x02}; /* Tbl 43B-1 */
+#else
+static char Slow_Protocols_Multicast[ETH_ALEN] = 
+{0xff,0xff,0xff,0xff,0xff,0xff};
+#endif
+static unsigned short Slow_Protocols_Type = 0x8809; /* Tbl 43B-2 */
+
+static unsigned char LRCP_Subtype = 0x20; /* Link Redundancy Control Protocol */
+static unsigned char LRCP_Version = 0x3; /* LRCP version */
+static unsigned char FF_Subtype = 0x21; /* Flush Frame */
+
+
+/* LRCPDU structure */
+/* LRCP nodes need to talk each other in order to avoid multiple paths
+ * 2001/12/25.
+ * 2002/1/5 Introduced priority field. */
+struct lrcpdu {
+	u8  subtype;			/* 0 */
+	u8  version_number;		/* 1 */
+	u8	system_id[ETH_ALEN]; /* 2 */
+	u16	group_id;			/* 8 */
+	u16	subgroup_id;		/* 10 */
+	u16 port_id;			/* 12 */
+	u16 sys_priority;		/* 14 */
+	u8	group_address[ETH_ALEN];	/* 16 */
+	u8  pad[1];				/* 22 */
+	u8  flags;				/* 23 */
+#define RCFFL_TOPOCHG  0x01
+	u16	perio_time;			/* 24 */
+	u8	pad1[28];			/* 26 */
+	/* total length is 64 */
+};
+
+#define LRCPDU_LEN sizeof(struct lrcpdu) /* 64 */
+
+#ifndef ETH_P_LR
+#define ETH_P_LR	0x001b		/* Linux Link Redundancy */
+#endif
+
+
+/* Timer values */
+#define One_Sec 20			/* must be GE 10 */
+#define Periodic_Time 1*One_Sec		/* 1 sec */
+#define Timeout_Time 3*One_Sec/10	/* 300 msec */
+#define Timeout2_Time 5*One_Sec/10	/* 500 msec */
+#define Age_Periodic_Time 1*One_Sec	/* 1 sec */
+#define Age_Max 300			/* 300 sec */
+#define PII_Live_Time 5*One_Sec		/* 5 sec */
+
+/* RCF timer machine */
+enum rcftm_state {
+	NOT_RUNNING,
+	RUNNING,
+	TIMEOUT,
+	TIMEOUT2
+};
+
+/* RCF generator machine */
+enum rcfgm_state {
+	WAIT_FOR_NTT,
+	RCF_GENERATE
+};
+
+/* periodic timer machine */
+enum perio_state {
+	DISABLED,
+	WAIT_FOR_TIMEOUT,
+	EXPIRED
+};
+
+/* Sub group manager machine */
+enum sgmm_state {
+	INITIALIZE,
+	WAIT_FOR_NTR,
+	REBUILD_START,
+	WAIT_FOR_RCF_NOTIFY,
+	RCF_RECEIVED,
+	RCF_TIMEOUT,
+	NOT_CHANGED,
+	CHANGED
+};
+
+
+/* timers */
+struct lr_timer {
+	struct lr_timer *next;
+	int exp;
+	int tim;
+	bool active;
+	void (*tick_func)(struct lr_timer *vtp); /* tick function */
+};
+
+
+
+#define MAX_RING 128
+
+
+struct ring_buf {
+	int r;
+	int w;
+	unsigned char *buf[MAX_RING];
+};
+
+static void ring_init(struct ring_buf *rb)
+{
+	rb->r = 0;
+	rb->w = 0;
+	memset(rb->buf, 0, MAX_RING*(sizeof(char *)));
+}
+
+static void ring_flush(struct ring_buf *rb)
+{
+	int i;
+	rb->r = 0;
+	rb->w = 0;
+	for(i = 0; i < MAX_RING; i++){
+		if (rb->buf[i]){
+			kfree(rb->buf[i]);
+			rb->buf[i] = NULL;
+		}
+	}
+}
+static bool ring_empty(struct ring_buf *rb)
+{
+	return (rb->r == rb->w)?_TRUE:_FALSE;
+}
+
+static void ring_put(struct ring_buf *rb, char *buf, int n)
+{
+	if (rb->buf[rb->w]){
+		kfree(rb->buf[rb->w]);
+		rb->buf[rb->w] = NULL;
+	}
+
+	rb->buf[rb->w] = kmalloc(n+5, GFP_ATOMIC);
+	if (!rb->buf[rb->w]){
+		return;
+	}
+	memcpy(rb->buf[rb->w], buf, n);
+	if (++rb->w == MAX_RING){
+		rb->w = 0;
+	}
+	if (rb->w == rb->r){
+		if (++rb->r == MAX_RING){
+			rb->r = 0;
+		}
+	}
+	return;
+}
+
+
+static bool ring_get(struct ring_buf *rb, char *buf, int n)
+{
+	if (ring_empty(rb))
+		return _FALSE;
+
+	memcpy(buf, rb->buf[rb->r], n);
+	kfree(rb->buf[rb->r]);
+	rb->buf[rb->r] = NULL;
+	if (++rb->r == MAX_RING){
+		rb->r = 0;
+	}
+	return _TRUE;
+}
+
+
+#define DO_IT(x) \
+	if (m->do_it){ \
+		x; \
+		m->do_it = _FALSE; \
+	}
+
+#define GO_NEXT_STATE(x) \
+	m->do_it = _TRUE; \
+	m->state = x;
+
+
+/* state machines */
+struct sgm_mach { /* each group has this */
+	enum sgmm_state state;
+	bool do_it;
+	int cnt;
+};
+
+struct rcft_mach { /* each group has this */
+	enum rcftm_state state;
+	bool do_it;
+};
+
+struct rcfg_mach { /* each group has this */
+	enum rcfgm_state state;
+	bool do_it;
+};
+
+struct perio_mach { /* each group has this */
+	enum perio_state state;
+	bool do_it;
+};
+
+
+/* Broadcast Filtering Unit (BFU) */
+#if 0
+extern struct glist_ent {};
+extern struct group_var {};
+#endif
+struct sglist_ent {
+	struct sglist_ent *next;
+	struct glist_ent *gle;
+
+	unsigned short sgid;
+	unsigned short rcv_sgid;
+	int age;
+};
+
+struct glist_ent {
+	struct glist_ent *next;
+	struct glist_ent *next2;
+	struct sglist_ent *sgl;
+	struct sysid_ent *syside;
+	struct group_var *gv;
+
+	unsigned short gid;
+	unsigned short min_sgid;
+	unsigned char gaddr[ETH_ALEN];
+
+	atomic_t use_count;
+};
+
+struct sysid_ent {
+	struct sysid_ent *next;
+	struct group_var *gv;
+
+	struct glist_ent *gl;
+	unsigned char sysid[ETH_ALEN];
+};
+
+
+
+
+
+struct dist_info {
+	struct dist_info *next;
+	u8	m_addr[ETH_ALEN];
+	u16	sgid;
+	u16 age;
+	u8	bfu_mark;
+
+	atomic_t use_count;
+};
+
+
+
+/* SGMT entry */
+struct sgmte {
+	struct sgmte *next;
+	u16		port_id;
+	u16		active_id;
+	u16		sgid;
+	bool	active;
+};
+
+/* RCT entry */
+struct rcte {
+	struct rcte *next;
+	u16		port_id;
+};
+
+
+
+/* System scope variables */
+struct system_var {
+	u8 system_id[ETH_ALEN];
+	u16 priority;
+} lr_sysvar;
+
+
+
+/* Port scope variables */
+struct port_var {
+	struct sgmte local_sgmt;
+	struct rcte *rct;
+	int prev_rcf_cnt;
+	u16 group_id;
+	bool	rcft_running;
+};
+
+struct nrcf {
+	unsigned short port_id;
+	unsigned short active_id;
+};
+	
+/* Sub-group scope variables */
+struct subgroup_var {
+	unsigned short sgid;
+	unsigned short active_id;
+};
+
+
+/* Group scope variables */
+struct group_var {
+	int group_id;
+	u8	group_addr[ETH_ALEN];
+	int	port_list[MAX_PHYIF];
+	struct subgroup_var	subg_list[MAX_PHYIF];
+	int perio_time;
+	int admin_perio_time;
+	int age_time;
+
+	/* Phase II compatibility */
+	int pii_live;
+
+	struct sgmte	master_sgmt[MAX_PHYIF];
+	struct sgmte	temp_sgmt[MAX_PHYIF];
+	struct dist_info	*dist_info[32];
+	bool	ntt;
+	bool	ntr;
+	bool	rcft_running;
+	bool	sgmt_match;
+	bool	begin;
+
+	/* BFU */
+	struct sysid_ent *sysidl;
+	struct glist_ent *gl[32];
+
+	bool	tchg_notified;
+	bool	tchg_detected;
+	bool	tchg_opt;
+
+	bool	pii_opt;
+	u16		agecnt;
+
+	struct ring_buf rb;
+
+	/* state machines */
+	struct rcft_mach rcftm;
+	struct rcfg_mach rcfgm;
+	struct perio_mach prm;
+	struct sgm_mach sgmm;
+
+	/* timers */
+	struct lr_timer *vth;
+	struct lr_timer rcf_timer;
+	struct lr_timer periodic_timer;
+
+	spinlock_t lock; /* lr device scope lock */
+	spinlock_t dist_lock; /* distinfo lock */
+	spinlock_t bfu_lock; /* BFU */
+};
+
+
+
+/* lr port structure */
+struct lr_port {
+	struct port_var pv;
+	struct net_device *dev;
+	char module_name[40]; /* module name of physical i/f */
+};
+
+/* lr group structure */
+struct lr_group {
+	struct group_var var;
+	struct net_device *dev;
+	struct timer_list tl;
+};
+
+
+/* lr_private is built-in device structure */
+struct lr_private {
+	struct net_device_stats enet_stats;
+	struct lr_group *group;
+};
+
+/* These are pool of ports */
+static struct lr_port lr_ports[MAX_PHYIF];
+static struct lr_group lr_groups[MAX_PHYIF];
+
+#endif /* __KERNEL__ */
+#endif /* LR_H */
+
+/*
+ * Local variables:
+ *  c-indent-level: 4
+ *  c-basic-offset: 4
+ *  tab-width: 4
+ *  indent-tabs-mode: t
+ * End:
+ */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/lr/miicompat.h linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/lr/miicompat.h
--- linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/lr/miicompat.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/lr/miicompat.h	2004-09-05 16:00:19.000000000 +0200
@@ -0,0 +1,197 @@
+#ifndef SIOCGMIIPHY /* Old linux does not define this */
+#define SIOCGMIIPHY SIOCDEVPRIVATE
+#define SIOCGMIIREG SIOCDEVPRIVATE+1
+#define SIOCSMIIREG SIOCDEVPRIVATE+2
+
+/* following definitions come from in linux-2.4.18 */
+
+/*
+ * linux/mii.h: definitions for MII-compatible transceivers
+ * Originally drivers/net/sunhme.h.
+ *
+ * Copyright (C) 1996, 1999, 2001 David S. Miller (davem@redhat.com)
+ */
+
+#ifndef __LINUX_MII_H__
+#define __LINUX_MII_H__
+
+#include <linux/types.h>
+
+/* Generic MII registers. */
+
+#define MII_BMCR            0x00        /* Basic mode control register */
+#define MII_BMSR            0x01        /* Basic mode status register  */
+#define MII_PHYSID1         0x02        /* PHYS ID 1                   */
+#define MII_PHYSID2         0x03        /* PHYS ID 2                   */
+#define MII_ADVERTISE       0x04        /* Advertisement control reg   */
+#define MII_LPA             0x05        /* Link partner ability reg    */
+#define MII_EXPANSION       0x06        /* Expansion register          */
+#define MII_DCOUNTER        0x12        /* Disconnect counter          */
+#define MII_FCSCOUNTER      0x13        /* False carrier counter       */
+#define MII_NWAYTEST        0x14        /* N-way auto-neg test reg     */
+#define MII_RERRCOUNTER     0x15        /* Receive error counter       */
+#define MII_SREVISION       0x16        /* Silicon revision            */
+#define MII_RESV1           0x17        /* Reserved...                 */
+#define MII_LBRERROR        0x18        /* Lpback, rx, bypass error    */
+#define MII_PHYADDR         0x19        /* PHY address                 */
+#define MII_RESV2           0x1a        /* Reserved...                 */
+#define MII_TPISTATUS       0x1b        /* TPI status for 10mbps       */
+#define MII_NCONFIG         0x1c        /* Network interface config    */
+
+/* Basic mode control register. */
+#define BMCR_RESV               0x007f  /* Unused...                   */
+#define BMCR_CTST               0x0080  /* Collision test              */
+#define BMCR_FULLDPLX           0x0100  /* Full duplex                 */
+#define BMCR_ANRESTART          0x0200  /* Auto negotiation restart    */
+#define BMCR_ISOLATE            0x0400  /* Disconnect DP83840 from MII */
+#define BMCR_PDOWN              0x0800  /* Powerdown the DP83840       */
+#define BMCR_ANENABLE           0x1000  /* Enable auto negotiation     */
+#define BMCR_SPEED100           0x2000  /* Select 100Mbps              */
+#define BMCR_LOOPBACK           0x4000  /* TXD loopback bits           */
+#define BMCR_RESET              0x8000  /* Reset the DP83840           */
+
+/* Basic mode status register. */
+#define BMSR_ERCAP              0x0001  /* Ext-reg capability          */
+#define BMSR_JCD                0x0002  /* Jabber detected             */
+#define BMSR_LSTATUS            0x0004  /* Link status                 */
+#define BMSR_ANEGCAPABLE        0x0008  /* Able to do auto-negotiation */
+#define BMSR_RFAULT             0x0010  /* Remote fault detected       */
+#define BMSR_ANEGCOMPLETE       0x0020  /* Auto-negotiation complete   */
+#define BMSR_RESV               0x07c0  /* Unused...                   */
+#define BMSR_10HALF             0x0800  /* Can do 10mbps, half-duplex  */
+#define BMSR_10FULL             0x1000  /* Can do 10mbps, full-duplex  */
+#define BMSR_100HALF            0x2000  /* Can do 100mbps, half-duplex */
+#define BMSR_100FULL            0x4000  /* Can do 100mbps, full-duplex */
+#define BMSR_100BASE4           0x8000  /* Can do 100mbps, 4k packets  */
+
+/* Advertisement control register. */
+#define ADVERTISE_SLCT          0x001f  /* Selector bits               */
+#define ADVERTISE_CSMA          0x0001  /* Only selector supported     */
+#define ADVERTISE_10HALF        0x0020  /* Try for 10mbps half-duplex  */
+#define ADVERTISE_10FULL        0x0040  /* Try for 10mbps full-duplex  */
+#define ADVERTISE_100HALF       0x0080  /* Try for 100mbps half-duplex */
+#define ADVERTISE_100FULL       0x0100  /* Try for 100mbps full-duplex */
+#define ADVERTISE_100BASE4      0x0200  /* Try for 100mbps 4k packets  */
+#define ADVERTISE_RESV          0x1c00  /* Unused...                   */
+#define ADVERTISE_RFAULT        0x2000  /* Say we can detect faults    */
+#define ADVERTISE_LPACK         0x4000  /* Ack link partners response  */
+#define ADVERTISE_NPAGE         0x8000  /* Next page bit               */
+
+#define ADVERTISE_FULL (ADVERTISE_100FULL | ADVERTISE_10FULL | \
+			ADVERTISE_CSMA)
+#define ADVERTISE_ALL (ADVERTISE_10HALF | ADVERTISE_10FULL | \
+                       ADVERTISE_100HALF | ADVERTISE_100FULL)
+
+/* Link partner ability register. */
+#define LPA_SLCT                0x001f  /* Same as advertise selector  */
+#define LPA_10HALF              0x0020  /* Can do 10mbps half-duplex   */
+#define LPA_10FULL              0x0040  /* Can do 10mbps full-duplex   */
+#define LPA_100HALF             0x0080  /* Can do 100mbps half-duplex  */
+#define LPA_100FULL             0x0100  /* Can do 100mbps full-duplex  */
+#define LPA_100BASE4            0x0200  /* Can do 100mbps 4k packets   */
+#define LPA_RESV                0x1c00  /* Unused...                   */
+#define LPA_RFAULT              0x2000  /* Link partner faulted        */
+#define LPA_LPACK               0x4000  /* Link partner acked us       */
+#define LPA_NPAGE               0x8000  /* Next page bit               */
+
+#define LPA_DUPLEX		(LPA_10FULL | LPA_100FULL)
+#define LPA_100			(LPA_100FULL | LPA_100HALF | LPA_100BASE4)
+
+/* Expansion register for auto-negotiation. */
+#define EXPANSION_NWAY          0x0001  /* Can do N-way auto-nego      */
+#define EXPANSION_LCWP          0x0002  /* Got new RX page code word   */
+#define EXPANSION_ENABLENPAGE   0x0004  /* This enables npage words    */
+#define EXPANSION_NPCAPABLE     0x0008  /* Link partner supports npage */
+#define EXPANSION_MFAULTS       0x0010  /* Multiple faults detected    */
+#define EXPANSION_RESV          0xffe0  /* Unused...                   */
+
+/* N-way test register. */
+#define NWAYTEST_RESV1          0x00ff  /* Unused...                   */
+#define NWAYTEST_LOOPBACK       0x0100  /* Enable loopback for N-way   */
+#define NWAYTEST_RESV2          0xfe00  /* Unused...                   */
+
+
+struct mii_if_info {
+	int phy_id;
+	int advertising;
+
+	unsigned int full_duplex : 1;
+	unsigned int duplex_lock : 1;
+
+	struct net_device *dev;
+	int (*mdio_read) (struct net_device *dev, int phy_id, int location);
+	void (*mdio_write) (struct net_device *dev, int phy_id, int location, int val);
+};
+
+struct ethtool_cmd;
+
+int mii_link_ok (struct mii_if_info *mii);
+int mii_nway_restart (struct mii_if_info *mii);
+int mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd);
+int mii_ethtool_sset(struct mii_if_info *mii, struct ethtool_cmd *ecmd);
+
+
+/* This structure is used in all SIOCxMIIxxx ioctl calls */
+struct mii_ioctl_data {
+	u16		phy_id;
+	u16		reg_num;
+	u16		val_in;
+	u16		val_out;
+};
+
+
+/**
+ * mii_nway_result
+ * @negotiated: value of MII ANAR and'd with ANLPAR
+ *
+ * Given a set of MII abilities, check each bit and returns the
+ * currently supported media, in the priority order defined by
+ * IEEE 802.3u.  We use LPA_xxx constants but note this is not the
+ * value of LPA solely, as described above.
+ *
+ * The one exception to IEEE 802.3u is that 100baseT4 is placed
+ * between 100T-full and 100T-half.  If your phy does not support
+ * 100T4 this is fine.  If your phy places 100T4 elsewhere in the
+ * priority order, you will need to roll your own function.
+ */
+static inline unsigned int mii_nway_result (unsigned int negotiated)
+{
+	unsigned int ret;
+
+	if (negotiated & LPA_100FULL)
+		ret = LPA_100FULL;
+	else if (negotiated & LPA_100BASE4)
+		ret = LPA_100BASE4;
+	else if (negotiated & LPA_100HALF)
+		ret = LPA_100HALF;
+	else if (negotiated & LPA_10FULL)
+		ret = LPA_10FULL;
+	else
+		ret = LPA_10HALF;
+
+	return ret;
+}
+
+/**
+ * mii_duplex
+ * @duplex_lock: Non-zero if duplex is locked at full
+ * @negotiated: value of MII ANAR and'd with ANLPAR
+ *
+ * A small helper function for a common case.  Returns one
+ * if the media is operating or locked at full duplex, and
+ * returns zero otherwise.
+ */
+static inline unsigned int mii_duplex (unsigned int duplex_lock,
+				       unsigned int negotiated)
+{
+	if (duplex_lock)
+		return 1;
+	if (mii_nway_result(negotiated) & LPA_DUPLEX)
+		return 1;
+	return 0;
+}
+
+
+#endif /* __LINUX_MII_H__ */
+
+#endif /* SIOCGMIIPHY */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/sk98lin.txt linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/sk98lin.txt
--- linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/sk98lin.txt	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/sk98lin.txt	2004-09-09 13:20:49.000000000 +0200
@@ -2,10 +2,10 @@
 All rights reserved
 ===========================================================================
 
-sk98lin.txt created 20-Feb-2004
+sk98lin.txt created 26-Aug-2004
 
-Readme File for sk98lin v6.24
-Marvell Yukon/SysKonnect SK-98xx Gigabit Ethernet Adapter family driver for LINUX
+Readme File for sk98lin v7.07
+Marvell Yukon/SysKonnect SK-98xx Gigabit Ethernet Adapter driver for LINUX
 
 This file contains
  1  Overview
@@ -110,13 +110,13 @@ To load the module manually, proceed as 
    
    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.
+           '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.
+           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'.
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/veth/Changelog linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/veth/Changelog
--- linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/veth/Changelog	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/veth/Changelog	2004-09-05 15:59:36.000000000 +0200
@@ -0,0 +1,84 @@
+veth-0.6.5 (2004/6/20)
+ * Add comparing Port_State.Synchronization flag in update_ntt().
+ * Fixed: partner_oper_aggregator_key is never updated.
+ * Non-privilege user operation
+
+veth-0.6.4 (2004/6/15)
+ * Fixed: Deadlock while no ports attach aggregator.
+ * Fixed: Actor's admin port status manipulates partner's one.
+ * Fixed: Operator cannot specify "distalgo" parameter.
+ * Fixed: veth.ko is invalid module format on linux-2.6.6.
+
+veth-0.6.3 (2004/3/2)
+ * ethernet device name sticky mechanism (w/ ethmap).
+
+veth-0.6.2 (2004/2/22)
+ * No changes functionally
+ * ioctl returns error code.
+
+veth-0.6.1 (2004/1/22)
+ * linux-2.6 Supported
+
+veth-0.6.0 (2002/9/23)
+ * Added port level and aggregator level link status monitoring
+
+veth-0.5.2 (2002/7/1)
+ * As far as physical i/f supports large MTU, it can be set on logical i/f too.
+
+veth-0.5.1 (2002/6/16)
+ * Introduced configuration file for vethcfg.
+ * Fixed bug in selection logic which may make distributing performance wrong.
+ * Introduced weighted round robbin distribution scheme instead of 
+   simple round robbin.
+
+veth-0.5.0 (2002/2/24)
+ * vethcfg command structure changed.
+ * Distributing algorithm can be changed individually on the each aggregator.
+ * Duplicate physical i/f registeration with plural virtual i/f -- fixed.
+
+veth-0.4.2 (2002/2/11)
+ * No changes functionally.
+ * Simplify some codes
+
+veth-0.4.1 (2001/10/30)
+ * Added round robbing distribution scheme as OPTION (Module parameter "rr=1").
+   Note: IEEE 802.3ad does not allow round robbing distribution. Because
+   transmitted frame order may change. If unsure, DON'T use this.
+
+veth-0.4.0 (2001/10/13)
+ * No changes functionally.
+ * Hide many symbols in order to avoid conflict with lr module.
+ * Solved device locking issue on linux-2.4.
+
+veth-0.3.1 (2001/8/10)
+ * TCP/UDP port number based hash algorithm is introduced for
+   distributing frames.
+ * DA only hash algorithm is replaced to DA/SA based hash algorithm.
+
+veth-0.3.0 (2001/5/1)
+ * Locking mechanism for physical i/f module while logical i/f holds it.
+   (This avoids accidentally removing "down" state ethX i/f which still
+    belongs to a logical i/f)
+ * For above locking mechanism, vethcfg notifies physical device module name 
+   to the veth driver with "add" directive.
+ * vethcfg "list" directive shows /proc/net/veth.
+
+veth-0.2.2 (2001/4/25)
+ * Fixed compilation problem on RedHat Linux 6 / 7.
+ * Fixed OOPS on adding moduled "unused" ethernet device driver to logical i/f.
+   (Not fixed OOPS on removing "down" state ethX i/f (module) which 
+    still belongs to logical i/f...)
+ * Package extract path changed.
+
+veth-0.2.1
+ * Reduce memory usage
+ * Man page for vethcfg
+ * Correct install path of veth.o for Linux-2.4.0
+ * Remove link status checking using IFF_RUNNING while link
+   status is unknown (But still it remains as an option macro
+   "VETH_USE_IFF_RUNNING". see veth.c). Since some device drivers do
+   not set IFF_RUNNING flag, such ports cannot exit P_DIS
+   (PORT_DISABLED) state forever.
+
+veth-0.2.0
+ Initial release
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/veth/Makefile linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/veth/Makefile
--- linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/veth/Makefile	2004-06-29 11:25:30.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/veth/Makefile	2004-09-05 16:00:20.000000000 +0200
@@ -48,21 +48,34 @@ prep:
 	ln -s $(LINUX_SRC)/include include
 	sed -e "/^all:/d" -e "/^install/d" \
 		$(LINUX_SRC)/arch/$(ARCH)/Makefile > make.defs
-#	make veth.o
+#	if [ $(LINUX_VER_SUB) = 2.2 ]; then \
+#		make veth.o; \
+#	elif [ $(LINUX_VER_SUB) = 2.4 ]; then \
+#		make veth.o; \
+#	else \
+#		make veth.ko; \
+#	fi
 	make vethcfg
 	make vethcfg.8
 
 
-veth.o: veth.c veth.h 
+veth.ko: veth.o veth.mod.o 
+	ld -r -o veth.ko veth.o veth.mod.o
+
+veth.mod.o: veth.o
+	$(LINUX_SRC)/scripts/modpost $(LINUX_SRC)/vmlinux veth.o
+	gcc -nostdinc -iwithprefix include -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -O2 -fomit-frame-pointer $(CFLAGS) -DMODULE -DKBUILD_BASENAME=veth -DKBUILD_MODNAME=veth -c -o veth.mod.o veth.mod.c
+
+veth.o: veth.c vether.h 
 	gcc -nostdinc -iwithprefix include -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -O2 -fomit-frame-pointer $(CFLAGS) -DMODULE -DKBUILD_BASENAME=veth -DKBUILD_MODNAME=veth -c -o veth.o veth.c
 
 vethcfg: $(VETHCFG_OBJS)
 	gcc -g -o $@ $(VETHCFG_OBJS) $(EXTRALDFLAGS)
 
-vethcfg.o: vethcfg.c veth.h vethcfg.h
+vethcfg.o: vethcfg.c vether.h vethcfg.h
 	gcc -g $(EXTRACFLAGS) -c $<
 
-vethcmd.o: vethcmd.c veth.h vethcfg.h
+vethcmd.o: vethcmd.c vether.h vethcfg.h
 	gcc -g $(EXTRACFLAGS) -c $<
 
 vethcfg.8: vethcfg.8.in vethcfg.h
@@ -80,7 +93,6 @@ install:
 		mkdir -p /lib/modules/$(LINUX_VER)/veth; \
 		ginstall -o root -g root -m 644 veth.o /lib/modules/$(LINUX_VER)/veth; \
 	else \
-		mv veth.o veth.ko; \
 		mkdir -p /lib/modules/$(LINUX_VER)/veth; \
 		ginstall -o root -g root -m 644 veth.ko /lib/modules/$(LINUX_VER)/veth; \
 	fi
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/veth/miicompat.h linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/veth/miicompat.h
--- linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/veth/miicompat.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/veth/miicompat.h	2004-09-05 15:59:36.000000000 +0200
@@ -0,0 +1,197 @@
+#ifndef SIOCGMIIPHY /* Old linux does not define this */
+#define SIOCGMIIPHY SIOCDEVPRIVATE
+#define SIOCGMIIREG SIOCDEVPRIVATE+1
+#define SIOCSMIIREG SIOCDEVPRIVATE+2
+
+/* following definitions come from in linux-2.4.18 */
+
+/*
+ * linux/mii.h: definitions for MII-compatible transceivers
+ * Originally drivers/net/sunhme.h.
+ *
+ * Copyright (C) 1996, 1999, 2001 David S. Miller (davem@redhat.com)
+ */
+
+#ifndef __LINUX_MII_H__
+#define __LINUX_MII_H__
+
+#include <linux/types.h>
+
+/* Generic MII registers. */
+
+#define MII_BMCR            0x00        /* Basic mode control register */
+#define MII_BMSR            0x01        /* Basic mode status register  */
+#define MII_PHYSID1         0x02        /* PHYS ID 1                   */
+#define MII_PHYSID2         0x03        /* PHYS ID 2                   */
+#define MII_ADVERTISE       0x04        /* Advertisement control reg   */
+#define MII_LPA             0x05        /* Link partner ability reg    */
+#define MII_EXPANSION       0x06        /* Expansion register          */
+#define MII_DCOUNTER        0x12        /* Disconnect counter          */
+#define MII_FCSCOUNTER      0x13        /* False carrier counter       */
+#define MII_NWAYTEST        0x14        /* N-way auto-neg test reg     */
+#define MII_RERRCOUNTER     0x15        /* Receive error counter       */
+#define MII_SREVISION       0x16        /* Silicon revision            */
+#define MII_RESV1           0x17        /* Reserved...                 */
+#define MII_LBRERROR        0x18        /* Lpback, rx, bypass error    */
+#define MII_PHYADDR         0x19        /* PHY address                 */
+#define MII_RESV2           0x1a        /* Reserved...                 */
+#define MII_TPISTATUS       0x1b        /* TPI status for 10mbps       */
+#define MII_NCONFIG         0x1c        /* Network interface config    */
+
+/* Basic mode control register. */
+#define BMCR_RESV               0x007f  /* Unused...                   */
+#define BMCR_CTST               0x0080  /* Collision test              */
+#define BMCR_FULLDPLX           0x0100  /* Full duplex                 */
+#define BMCR_ANRESTART          0x0200  /* Auto negotiation restart    */
+#define BMCR_ISOLATE            0x0400  /* Disconnect DP83840 from MII */
+#define BMCR_PDOWN              0x0800  /* Powerdown the DP83840       */
+#define BMCR_ANENABLE           0x1000  /* Enable auto negotiation     */
+#define BMCR_SPEED100           0x2000  /* Select 100Mbps              */
+#define BMCR_LOOPBACK           0x4000  /* TXD loopback bits           */
+#define BMCR_RESET              0x8000  /* Reset the DP83840           */
+
+/* Basic mode status register. */
+#define BMSR_ERCAP              0x0001  /* Ext-reg capability          */
+#define BMSR_JCD                0x0002  /* Jabber detected             */
+#define BMSR_LSTATUS            0x0004  /* Link status                 */
+#define BMSR_ANEGCAPABLE        0x0008  /* Able to do auto-negotiation */
+#define BMSR_RFAULT             0x0010  /* Remote fault detected       */
+#define BMSR_ANEGCOMPLETE       0x0020  /* Auto-negotiation complete   */
+#define BMSR_RESV               0x07c0  /* Unused...                   */
+#define BMSR_10HALF             0x0800  /* Can do 10mbps, half-duplex  */
+#define BMSR_10FULL             0x1000  /* Can do 10mbps, full-duplex  */
+#define BMSR_100HALF            0x2000  /* Can do 100mbps, half-duplex */
+#define BMSR_100FULL            0x4000  /* Can do 100mbps, full-duplex */
+#define BMSR_100BASE4           0x8000  /* Can do 100mbps, 4k packets  */
+
+/* Advertisement control register. */
+#define ADVERTISE_SLCT          0x001f  /* Selector bits               */
+#define ADVERTISE_CSMA          0x0001  /* Only selector supported     */
+#define ADVERTISE_10HALF        0x0020  /* Try for 10mbps half-duplex  */
+#define ADVERTISE_10FULL        0x0040  /* Try for 10mbps full-duplex  */
+#define ADVERTISE_100HALF       0x0080  /* Try for 100mbps half-duplex */
+#define ADVERTISE_100FULL       0x0100  /* Try for 100mbps full-duplex */
+#define ADVERTISE_100BASE4      0x0200  /* Try for 100mbps 4k packets  */
+#define ADVERTISE_RESV          0x1c00  /* Unused...                   */
+#define ADVERTISE_RFAULT        0x2000  /* Say we can detect faults    */
+#define ADVERTISE_LPACK         0x4000  /* Ack link partners response  */
+#define ADVERTISE_NPAGE         0x8000  /* Next page bit               */
+
+#define ADVERTISE_FULL (ADVERTISE_100FULL | ADVERTISE_10FULL | \
+			ADVERTISE_CSMA)
+#define ADVERTISE_ALL (ADVERTISE_10HALF | ADVERTISE_10FULL | \
+                       ADVERTISE_100HALF | ADVERTISE_100FULL)
+
+/* Link partner ability register. */
+#define LPA_SLCT                0x001f  /* Same as advertise selector  */
+#define LPA_10HALF              0x0020  /* Can do 10mbps half-duplex   */
+#define LPA_10FULL              0x0040  /* Can do 10mbps full-duplex   */
+#define LPA_100HALF             0x0080  /* Can do 100mbps half-duplex  */
+#define LPA_100FULL             0x0100  /* Can do 100mbps full-duplex  */
+#define LPA_100BASE4            0x0200  /* Can do 100mbps 4k packets   */
+#define LPA_RESV                0x1c00  /* Unused...                   */
+#define LPA_RFAULT              0x2000  /* Link partner faulted        */
+#define LPA_LPACK               0x4000  /* Link partner acked us       */
+#define LPA_NPAGE               0x8000  /* Next page bit               */
+
+#define LPA_DUPLEX		(LPA_10FULL | LPA_100FULL)
+#define LPA_100			(LPA_100FULL | LPA_100HALF | LPA_100BASE4)
+
+/* Expansion register for auto-negotiation. */
+#define EXPANSION_NWAY          0x0001  /* Can do N-way auto-nego      */
+#define EXPANSION_LCWP          0x0002  /* Got new RX page code word   */
+#define EXPANSION_ENABLENPAGE   0x0004  /* This enables npage words    */
+#define EXPANSION_NPCAPABLE     0x0008  /* Link partner supports npage */
+#define EXPANSION_MFAULTS       0x0010  /* Multiple faults detected    */
+#define EXPANSION_RESV          0xffe0  /* Unused...                   */
+
+/* N-way test register. */
+#define NWAYTEST_RESV1          0x00ff  /* Unused...                   */
+#define NWAYTEST_LOOPBACK       0x0100  /* Enable loopback for N-way   */
+#define NWAYTEST_RESV2          0xfe00  /* Unused...                   */
+
+
+struct mii_if_info {
+	int phy_id;
+	int advertising;
+
+	unsigned int full_duplex : 1;
+	unsigned int duplex_lock : 1;
+
+	struct net_device *dev;
+	int (*mdio_read) (struct net_device *dev, int phy_id, int location);
+	void (*mdio_write) (struct net_device *dev, int phy_id, int location, int val);
+};
+
+struct ethtool_cmd;
+
+int mii_link_ok (struct mii_if_info *mii);
+int mii_nway_restart (struct mii_if_info *mii);
+int mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd);
+int mii_ethtool_sset(struct mii_if_info *mii, struct ethtool_cmd *ecmd);
+
+
+/* This structure is used in all SIOCxMIIxxx ioctl calls */
+struct mii_ioctl_data {
+	u16		phy_id;
+	u16		reg_num;
+	u16		val_in;
+	u16		val_out;
+};
+
+
+/**
+ * mii_nway_result
+ * @negotiated: value of MII ANAR and'd with ANLPAR
+ *
+ * Given a set of MII abilities, check each bit and returns the
+ * currently supported media, in the priority order defined by
+ * IEEE 802.3u.  We use LPA_xxx constants but note this is not the
+ * value of LPA solely, as described above.
+ *
+ * The one exception to IEEE 802.3u is that 100baseT4 is placed
+ * between 100T-full and 100T-half.  If your phy does not support
+ * 100T4 this is fine.  If your phy places 100T4 elsewhere in the
+ * priority order, you will need to roll your own function.
+ */
+static inline unsigned int mii_nway_result (unsigned int negotiated)
+{
+	unsigned int ret;
+
+	if (negotiated & LPA_100FULL)
+		ret = LPA_100FULL;
+	else if (negotiated & LPA_100BASE4)
+		ret = LPA_100BASE4;
+	else if (negotiated & LPA_100HALF)
+		ret = LPA_100HALF;
+	else if (negotiated & LPA_10FULL)
+		ret = LPA_10FULL;
+	else
+		ret = LPA_10HALF;
+
+	return ret;
+}
+
+/**
+ * mii_duplex
+ * @duplex_lock: Non-zero if duplex is locked at full
+ * @negotiated: value of MII ANAR and'd with ANLPAR
+ *
+ * A small helper function for a common case.  Returns one
+ * if the media is operating or locked at full duplex, and
+ * returns zero otherwise.
+ */
+static inline unsigned int mii_duplex (unsigned int duplex_lock,
+				       unsigned int negotiated)
+{
+	if (duplex_lock)
+		return 1;
+	if (mii_nway_result(negotiated) & LPA_DUPLEX)
+		return 1;
+	return 0;
+}
+
+
+#endif /* __LINUX_MII_H__ */
+
+#endif /* SIOCGMIIPHY */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/veth/veth.c linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/veth/veth.c
--- linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/veth/veth.c	2004-06-29 11:25:30.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/veth/veth.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,3508 +0,0 @@
-/* $Id: veth.c,v 1.33 2004/03/02 12:13:02 yumo Exp $ */
-/* VETH: A virtual ethernet device driver for Linux. 
- *
- * This device driver is an implementation of Aggregation of Multiple
- * Link Segments (IEEE 802.3ad).
- *
- * Author: Yumo (Katsuyuki Yumoto) 2000-2004
- *         yumo@st.rim.or.jp
- *
- * 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  02111-1307, USA.
- */
-#include <linux/config.h>
-#include <linux/version.h>
-#include <linux/module.h>
-
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/types.h>
-#include <linux/fcntl.h>
-#include <linux/interrupt.h>
-#include <linux/string.h>
-#include <linux/ptrace.h>
-#include <linux/if_ether.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-#include <net/sock.h>
-#endif
-#include <asm/system.h>
-#include <asm/uaccess.h>
-#include <asm/io.h>
-#include <linux/in.h>
-#include <linux/errno.h>
-#include <linux/delay.h>
-#include <linux/lp.h>
-#include <linux/init.h>
-
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/inetdevice.h>
-#include <linux/skbuff.h>
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-#include <linux/tqueue.h>
-#endif
-#include <linux/ioport.h>
-#include <asm/bitops.h>
-#include <asm/irq.h>
-#include <asm/byteorder.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-#include <asm/spinlock.h>
-#else
-#include <linux/spinlock.h>
-#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,5)
-#include "miicompat.h"
-#else
-#include <linux/mii.h>
-#endif
-#include <linux/proc_fs.h>
-#include <linux/smp_lock.h>
-
-#include <linux/timer.h>
-
-#include "veth.h"
-
-/* If it is sure all the LAN adapters report IFF_RUNNING correctly,
- * define following line. E.g. eepro100 device driver report link
- * status by using IFF_RUNNING.  */
-#undef VETH_USE_IFF_RUNNING
-
-int nveth = 1;
-int nport = MAX_PHYIF;
-
-/* Aggregator wildcard. This shall be changed to 0 after most of
- * Ethernet device drivers report their status correctly */
-int agg_wc = 1;
-
-MODULE_PARM(nveth, "1-" __MODULE_STRING(MAX_VETH) "i");
-MODULE_PARM(agg_wc, "1-" __MODULE_STRING(1) "i");
-MODULE_PARM(nport, "1-" __MODULE_STRING(MAX_PHYIF) "i");
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-MODULE_PARM_DESC(nveth, "veth" " Number of aggregators (1-MAX_PHYIF)");
-MODULE_PARM_DESC(agg_wc, "veth" "Aggregator wildcard 1=enabled(default), 0=disabled");
-MODULE_PARM_DESC(nport, "veth" "Number of ports (physical i/f's)");
-#endif
-
-/* Round robing distribution. !!!Attention!!! IEEE 802.3ad does not
- * allow round robbing on frame distribution. Distributed frame order
- * may change.  Don't use this feature if you don't want to allow
- * frame order changing. This is disabled by default. */
-int rr = 0;
-MODULE_PARM(rr, "1-" __MODULE_STRING(1) "i");
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-MODULE_PARM_DESC(rr, "veth" "Round robbing. 1=enabled, 0=disabled(default)");
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-/* 
- * Linux module subsystem does not provide module handling
- * facility by corresponding device name.
- * I don't want to make veth driver depend on module name
- * but it depends on device name (e.g. eth0).
- * However there are no way to lock/unlock the module by device name.
- * Therefore I need to convert device name into module name, and
- * then lock/unlock the module...
- */
-/* find_module() is exported by patch */
-extern struct module *find_module(const char *name);
-
-#define MAX_MODNAME 16
-#endif
-
-#define MAX_NAME 7
-
-static u16 get_link_stat(struct net_device *dev)
-{
-	static int (* ioctl)(struct net_device *, struct ifreq *, int);
-	struct ifreq ifr;
-	struct mii_ioctl_data *data = (struct mii_ioctl_data *)&ifr.ifr_data;
-
-	if (!dev)
-		return 0;
-
-	/* Status register is mapped at address 1 in 
-	 * MII management register set space.
-	 * (IEEE Std 802.3, 1998)*/
-	data->reg_num = MII_BMSR; 
-
-	ioctl = dev->do_ioctl;
-	if (ioctl &&
-		((ioctl(dev, &ifr, SIOCGMIIPHY) == 0) ||
-		 (ioctl(dev, &ifr, SIOCDEVPRIVATE) == 0))) {
-		/* m->val_out contains status
-		 * bit 2: 1 = link is up (BMSR_LSTATUS)
-		 * bit 5: 1 = auto-negotiation process completed (BMSR_ANEGCOMPLETE)
-		 */
-		return data->val_out & (BMSR_LSTATUS | BMSR_ANEGCOMPLETE);
-	}
-	else {
-		return BMSR_LSTATUS | BMSR_ANEGCOMPLETE;  /* regard as link up... */
-	}
-}
-
-static u16 get_agg_link_stat(struct net_device *dev)
-{
-	struct veth_private *vp;
-	struct agg_var *av;
-	int i;
-	u16 ret = 0;
-
-	if (!dev)
-		return 0;
-
-	vp = (struct veth_private *)dev->priv;
-	av = &(vp->agg->av);
-
-	for (i = 0; i < MAX_PHYIF; i++){
-		if (av->lag_ports[i]){
-			ret |= get_link_stat(veth_ports[av->lag_ports[i]-1].dev);
-		}
-	}
-	return ret;
-}
-#if 0
-static u16 get_media(struct net_device *dev)
-{
-	static int (* ioctl)(struct net_device *, struct ifreq *, int);
-	struct ifreq ifr;
-	struct mii_ioctl_data *data = (struct mii_ioctl_data *)&ifr.ifr_data;
-		
-	/* Link partner ability register is mapped at address 5 in 
-	 * MII management register set space.
-	 * (IEEE Std 802.3, 1998)*/
-	data->reg_num = MII_LPA; 
-
-	ioctl = dev->do_ioctl;
-	if (ioctl &&
-		((ioctl(dev, &ifr, SIOCGMIIPHY) == 0) ||
-		 (ioctl(dev, &ifr, SIOCDEVPRIVATE) == 0))) {
-		/* m->val_out contains auto-negotiation result
-		 */
-		return mii_nway_result(data->val_out);
-	}
-	else {
-		return LPA_SLCT;
-	}
-}
-#endif
-
-static int dev_to_port_num(struct net_device *dev)
-{
-	int i;
-	int pn;
-
-	for (i = 0, pn = 0; i < MAX_PHYIF; i++){
-		if (veth_ports[i].dev == dev){
-			pn = i + 1;
-			break;
-		}
-	}
-
-	return pn;
-}
-
-static int veth_check_new_mtu(struct net_device *dev, int new_mtu)
-{
-	int old_mtu;
-
-	old_mtu = dev->mtu;
-	if (dev->change_mtu(dev, new_mtu)){
-		return _FALSE;
-	}
-	dev->change_mtu(dev, old_mtu);
-	return _TRUE;
-}
-
-/********************************************************
- *
- *   Link Aggregation Control Protocol
- *
- ********************************************************/
-
-
-/* 43.4.9 */
-static void veth_record_pdu(struct lacpdu *buf, struct veth_port *p)
-{
-	int param_match;
-	int is_active_link;
-
-	p->pv.partner_oper_port_num = ntohs(buf->actor_port);
-	p->pv.partner_oper_port_pri = ntohs(buf->actor_port_pri);
-	memcpy(p->pv.partner_oper_sys, buf->actor_sys, ETH_ALEN);
-
-	if (VETH_DEBUG(VETH_DEBUG_RCVM, 1)){
-		printk(KERN_INFO "veth_record_pdu(): port:%d, partn:%02x%02x%02x-%02x%02x%02x\n",
-			   p->pv.actor_port_num,
-			   p->pv.partner_oper_sys[0],
-			   p->pv.partner_oper_sys[1],
-			   p->pv.partner_oper_sys[2],
-			   p->pv.partner_oper_sys[3],
-			   p->pv.partner_oper_sys[4],
-			   p->pv.partner_oper_sys[5]);
-	}
-
-	p->pv.partner_oper_sys_pri = ntohs(buf->actor_sys_pri);
-	p->pv.partner_oper_key = ntohs(buf->actor_key);
-	p->pv.partner_oper_port_state = buf->actor_state;
-
-	p->pv.actor_oper_port_state &= ~PS_DEFAULTED;
-
-
-	/* param_match shows whether partner recognizes actor's parameters
-       correctly */
-
-	param_match = 
-		(p->pv.actor_port_num == ntohs(buf->partner_port)) &&
-		(p->pv.actor_port_pri == ntohs(buf->partner_port_pri)) &&
-		(memcmp(veth_sysvar.actor_sys, buf->partner_sys, ETH_ALEN) == 0) &&
-		(veth_sysvar.actor_sys_pri == ntohs(buf->partner_sys_pri)) &&
-		(p->pv.actor_oper_port_key == ntohs(buf->partner_key)) &&
-		((p->pv.actor_oper_port_state & PS_AGGREGATION) ==
-		 (buf->partner_state & PS_AGGREGATION));
-
-	is_active_link = (buf->actor_state & PS_LACP_ACTIVITY) ||
-		((p->pv.actor_oper_port_state & PS_LACP_ACTIVITY) && 
-		(buf->partner_state & PS_LACP_ACTIVITY));
-
-
-	if (is_active_link &&
-		((param_match && (buf->actor_state & PS_SYNCHRONIZATION)) ||
-		((buf->actor_state & (PS_AGGREGATION | PS_SYNCHRONIZATION)) ==
-		 PS_SYNCHRONIZATION))){
-		p->pv.partner_oper_port_state |= PS_SYNCHRONIZATION;
-	} else {
-		p->pv.partner_oper_port_state &= ~PS_SYNCHRONIZATION;
-	}
-
-
-	/* update aggregator's partner_sys if this port attaches an
-     * aggregator */
-	if (p->pv.actor_port_agg_id){
-
-		VP(p->pv.actor_port_agg_id-1);
-
-		memcpy(vp->agg->av.partner_sys, p->pv.partner_oper_sys, ETH_ALEN);
-		vp->agg->av.partner_sys_pri = p->pv.partner_oper_sys_pri;
-	}
-	
-	return;
-}
-
-
-/* copy operational partner's parameter values from administrative
-   parameter values */
-static void veth_record_default(struct veth_port *p)
-{
-	p->pv.partner_oper_port_num = p->pv.partner_admin_port_num;
-	p->pv.partner_oper_port_pri = p->pv.partner_admin_port_pri;
-	memcpy(p->pv.partner_oper_sys, p->pv.partner_admin_sys, ETH_ALEN);
-	p->pv.partner_oper_sys_pri = p->pv.partner_admin_sys_pri;
-	p->pv.partner_oper_key = p->pv.partner_admin_key;
-	p->pv.partner_oper_port_state = p->pv.partner_admin_port_state;
-
-	p->pv.actor_oper_port_state |= PS_DEFAULTED;
-	return;
-}
-
-static void veth_update_selected(struct lacpdu *buf, struct veth_port *p)
-{
-	int param_match;
-
-	/* param_match shows whether actor recognizes partner's parameters
-       correctly */
-	param_match = 
-		(p->pv.partner_oper_port_num == ntohs(buf->actor_port)) &&
-		(p->pv.partner_oper_port_pri == ntohs(buf->actor_port_pri)) &&
-		(memcmp(p->pv.partner_oper_sys, buf->actor_sys, ETH_ALEN) == 0) &&
-		(p->pv.partner_oper_sys_pri == ntohs(buf->actor_sys_pri)) &&
-		(p->pv.partner_oper_key == ntohs(buf->actor_key)) &&
-		((p->pv.partner_oper_port_state & PS_AGGREGATION) ==
-		(buf->actor_state & PS_AGGREGATION));
-
-	if (!param_match){
-		if (VETH_DEBUG(VETH_DEBUG_RCVM, 1)){
-			printk (KERN_INFO "p_num:%d p_pri:%d sys:%d s_pri:%d key:%d p_st:%d\n",
-					(p->pv.partner_oper_port_num == ntohs(buf->actor_port))?1:0,
-					(p->pv.partner_oper_port_pri == ntohs(buf->actor_port_pri))?1:0,
-					(memcmp(p->pv.partner_oper_sys, buf->actor_sys, ETH_ALEN) == 0)?1:0,
-					(p->pv.partner_oper_sys_pri == ntohs(buf->actor_sys_pri))?1:0,
-					(p->pv.partner_oper_key == ntohs(buf->actor_key))?1:0,
-					((p->pv.partner_oper_port_state & PS_AGGREGATION) ==
-					 (buf->actor_state & PS_AGGREGATION))?1:0
-					);
-		}
-		p->pv.selected = UNSELECTED;
-	}
-
-	return;
-}
-
-static void veth_update_default_selected(struct veth_port *p)
-{
-	int param_match;
-
-	/* param_match shows whether administrative parameter values match
-       partner's parameters which actor recognizes */
-	param_match = 
-		(p->pv.partner_admin_port_num == p->pv.partner_oper_port_num) &&
-		(p->pv.partner_admin_port_pri == p->pv.partner_oper_port_pri) &&
-		(memcmp(p->pv.partner_admin_sys, p->pv.partner_oper_sys, ETH_ALEN) == 0) &&
-		(p->pv.partner_admin_sys_pri == p->pv.partner_oper_sys_pri) &&
-		(p->pv.partner_admin_key == p->pv.partner_oper_key) &&
-		((p->pv.partner_admin_port_state & PS_AGGREGATION) ==
-		(p->pv.partner_oper_port_state & PS_AGGREGATION));
-
-	if (!param_match){
-		p->pv.selected = UNSELECTED;
-	} else {
-		/* 43.4.12 
-		 *
-		 * Since all operational parameters are now set to locally
-		 * administrated values, there can be no disagreement as to
-		 * the Link Aggregation Group, so the
-		 * partner_oper_port_state.synchronization variable is set to
-		 * _TRUE.*/
-		p->pv.partner_oper_port_state |= PS_SYNCHRONIZATION;
-	}
-
-	return;
-}
-
-static void veth_update_ntt(struct lacpdu *buf, struct veth_port *p)
-{
-	int param_match;
-
-	/* param_match shows partner recognizes actor's parameters correctly */
-	param_match = 
-		(p->pv.actor_port_num == ntohs(buf->partner_port)) &&
-		(p->pv.actor_port_pri == ntohs(buf->partner_port_pri)) &&
-		(memcmp(veth_sysvar.actor_sys, buf->partner_sys, ETH_ALEN) == 0) &&
-		(veth_sysvar.actor_sys_pri == ntohs(buf->partner_sys_pri)) &&
-		(p->pv.actor_oper_port_key == ntohs(buf->partner_key)) &&
-		((p->pv.actor_oper_port_state & (PS_LACP_ACTIVITY | PS_LACP_TIMEOUT | PS_AGGREGATION)) ==
-		(buf->partner_state & (PS_LACP_ACTIVITY | PS_LACP_TIMEOUT | PS_AGGREGATION)));
-
-	if (!param_match){
-		p->pv.need_to_xmit = _TRUE;
-	}
-	return;
-}
-
-static void veth_attach_mux_to_agg(struct veth_port *p)
-{
-	p->pv.attached = _TRUE;
-	return;
-}
-
-static void veth_detach_mux_from_agg(struct veth_port *p)
-{
-	int agg, port, i, m, n;
-	int *lp;
-	struct veth_agg *ag;
-
-	p->pv.attached = _FALSE;
-
-	/* get aggregator selected for this port */
-	agg = p->pv.actor_port_agg_id;
-
-	if (!agg){
-		/* already detached */
-		return;
-	}
-
-	/* get port id */
-	port = p->pv.actor_port_num;
-
-	if (!port){
-		/* it shall not come here... */
-		return;
-	}
-
-	agg--;
-
-	/* find the port from lag_port list */
-	ag = veth_aggs+agg;
-	lp = ag->av.lag_ports;
-	for (i = 0; i < MAX_PHYIF; i++){
-		if (lp[i] == port && p->pv.selected == UNSELECTED){
-			/* found. detach it */
-			p->pv.actor_port_agg_id = 0;
-			for (m = i, n = i+1; n < MAX_PHYIF; m++, n++){
-				lp[m] = lp[n];
-			}
-			lp[m] = 0;
-			if (m == 0){ /* last one */
-				memset(ag->av.partner_sys, 0, ETH_ALEN);
-				ag->av.partner_sys_pri = 0;
-			}
-			break;
-		}
-	}
-
-}
-
-static void veth_ena_collect(struct veth_port *p)
-{
-	p->pv.actor_oper_port_state |= PS_COLLECTING;
-	return;
-}
-
-static void veth_dis_collect(struct veth_port *p)
-{
-	p->pv.actor_oper_port_state &= ~PS_COLLECTING;
-	return;
-}
-
-
-/* Search for proper device (port) for transmitting this skb.
- *
- * Distribution algorithm shall not cause mis-ordering of frames
- * that are part of any given conversation (43.2.4). So this 
- * implementation uses hash by destination MAC address */
-static void veth_find_distrib_port(struct veth_agg *ag)
-{
-	int i, j;
-	int k; /* num of ports which attaches this aggregator */
-	int ports[MAX_PHYIF]; /* keeps port which state is really "distributing" */
-	struct veth_port *p;
-
-	for (i = 0, k = 0; i < MAX_PHYIF; i++){
-		if (!ag->av.lag_ports[i]){ /* lag_ports is built by selection logic */
-			ports[k] = 0;
-			break;
-		} else {
-			j = ag->av.lag_ports[i]-1;
-			p = veth_ports+j;
-
-			if (p->pv.attached && (p->pv.actor_oper_port_state & PS_DISTRIBUTING)){
-				ports[k++] = j;
-			}
-		}
-	}
-
-	spin_lock(&ag->lock);
-	memcpy(ag->ports, ports, k*sizeof(int));
-	ag->n_ports = k;
-	spin_unlock(&ag->lock);
-}
-
-static void veth_ena_distrib(struct veth_port *p)
-{
-	struct veth_agg *ag;
-	int agg_id;
-
-	agg_id = p->pv.actor_port_agg_id;
-	ag = veth_aggs + agg_id - 1;
-
-	p->pv.actor_oper_port_state |= PS_DISTRIBUTING;
-
-	if (agg_id){
-		veth_find_distrib_port(ag);
-
-		/* MTU check */
-		if (!veth_check_new_mtu(p->dev, ag->dev->mtu)){
-			printk(KERN_INFO "veth: Port does not accept aggregator's MTU.\n"
-				"veth: Attempt to make aggregator's MTU %d.\n", p->dev->mtu);
-			ag->dev->change_mtu(ag->dev, p->dev->mtu);
-		} else {
-			p->dev->change_mtu(p->dev, ag->dev->mtu);
-		}
-	}
-
-	return;
-}
-
-static void veth_dis_distrib(struct veth_port *p)
-{
-	struct veth_agg *ag;
-	int agg_id;
-
-	agg_id = p->pv.actor_port_agg_id;
-	ag = veth_aggs + agg_id - 1;
-
-	p->pv.actor_oper_port_state &= ~PS_DISTRIBUTING;
-
-	if (agg_id)
-		veth_find_distrib_port(ag);
-
-	return;
-}
-
-#if 0
-/* These two functions are not used for independent control model */
-static void veth_ena_dist_coll(struct sk_buff *skb)
-{
-	veth_ena_collect(skb);
-	veth_ena_distrib(skb);
-}
-
-static void veth_dis_dist_coll(struct sk_buff *skb)
-{
-	veth_dis_collect(skb);
-	veth_dis_distrib(skb);
-}
-#endif
-/* end of 43.4.9 */
-
-/* 43.2.4 */
-#include <linux/if_ether.h>
-static int hash_mac(unsigned char *mac_h, int k)
-{
-	int ret;
-	__u32 hash;
-	struct ethhdr *eh;
-
-	eh = (struct ethhdr *)mac_h;
-	hash = *(__u32 *)(&eh->h_dest[ETH_ALEN-4]) ^
-		*(__u32 *)(&eh->h_source[ETH_ALEN-4]);
-	hash ^= hash >> 16;
-	hash ^= hash >> 8;
-	ret = hash%k;
-	return ret;
-}
-
-#include <linux/ip.h>
-#include <linux/tcp.h>
-#include <linux/udp.h>
-
-/* This function is used for solving correct hash value of IP fragments */
-/* For TCP/UDP port number based hashing, it needs to distribute a datagrams
- * which consists of fragments via single port. This function unifies hash
- * value through all the fragments */ 
-
-#define IPH_MF 0x2000
-
-static int veth_get_previous_hash(struct iphdr *iph, int hash, struct veth_agg *ag)
-{
-	struct dist_hash_table **dt, *dp, *dpp;
-	int ret = hash;
-
-	dt = &ag->dht[iph->id%32];
-	for (dp = *dt; dp; dp = dp->next){
-		if (dp->id == iph->id &&
-		    dp->daddr == iph->daddr &&
-		    dp->saddr == iph->saddr){
-			/* may be a 2'nd or later fragment */
-			if (dp->hash >= ag->n_ports)
-				dp->hash = 0;
-			ret = dp->hash;
-
-			if (!(iph->frag_off & IPH_MF))
-				/* delete entry */
-				for (dpp = *dt; dpp; dpp = dpp->next)
-					if (dpp->next == dp){
-						dpp->next = dp->next;
-						kfree(dp);
-						break;
-					}
-			return ret;
-		}
-	}
-
-	/* not found in the table. register it if some fragments follow it. */
-	if (iph->frag_off & IPH_MF){
-		dp = *dt;
-		*dt = kmalloc(sizeof(struct dist_hash_table), GFP_ATOMIC);
-		(*dt)->next = dp;
-		(*dt)->hash = hash;
-		(*dt)->id = iph->id;
-		(*dt)->saddr = iph->saddr;
-		(*dt)->daddr = iph->daddr;
-	}
-
-	return ret;
-}
-
-static int veth_sel_distport_balanced(int len, struct veth_agg *ag)
-{
-	struct veth_port *p;
-	int min_port = 0;
-	int min = 1500;
-	int i, j;
-
-	for (i = 0; i < ag->n_ports; i++){
-		j = ag->ports[i];
-		p = veth_ports + j;
-
-		if (p->avrlen < min){
-			min = p->avrlen;
-			min_port = j;
-		}
-	}
-
-	for (i = 0; i < ag->n_ports; i++){
-		j = ag->ports[i];
-		p = veth_ports + j;
-
-		p->avrlen -= (p->avrlen >> 3);
-		if (j == min_port){
-			p->avrlen += (len >> 3);
-		}
-	}
-	return min_port;
-}
-
-static int veth_hash(unsigned char *mac, int len, struct veth_agg *ag)
-{
-	int ret;
-	__u32 hash;
-	struct ethhdr *eh;
-	struct iphdr *iph;
-	struct tcphdr *tcph;
-	struct udphdr *udph;
-
-	if ((ag->distmode & DIST_ROUNDROBIN) || rr){
-	/*
-	 * Round robbing distribution (disabled by default. because the
-	 * standard does not allow this)
-	 */
-#if 1
-		ret = veth_sel_distport_balanced(len, ag);
-#else
-		++ag->count;
-		ag->count %= ag->n_ports;
-		ret = ag->count;
-#endif
-		return ret;
-	}
-
-	eh = (struct ethhdr *)mac;
-
-	/* check if IP datagram is contained */
-	if (ntohs(eh->h_proto) != ETH_P_IP ||
-	    !(ag->distmode & DIST_TCPUDPHASH)){
-		return hash_mac(mac, ag->n_ports);
-	}
-
-	iph = (struct iphdr *)(mac+ETH_HLEN);
-
-	/* check if TCP segment or UDP datagram is contained */
-	if (iph->protocol == IPPROTO_TCP){
-		tcph = (struct tcphdr *)(mac+ETH_HLEN+iph->ihl*4);
-		hash = tcph->source ^ tcph->dest;
-		hash ^= hash >> 8;
-		ret = hash%ag->n_ports;
-		return veth_get_previous_hash(iph, ret, ag);
-	} else if (iph->protocol == IPPROTO_UDP){
-		udph = (struct udphdr *)(mac+ETH_HLEN+iph->ihl*4);
-		hash = udph->source ^ udph->dest;
-		hash ^= hash >> 8;
-		ret = hash%ag->n_ports;
-		return veth_get_previous_hash(iph, ret, ag);
-	}
-
-	return hash_mac(mac, ag->n_ports);
-}
-
-static int veth_frame_distribution(struct sk_buff *skb, struct net_device *dev)
-{
-	struct net_device *tdev;
-	struct veth_private *vp;
-	unsigned char *mac_h;
-	struct veth_agg *ag;
-	struct veth_port *p;
-	struct sk_buff *nskb;
-	int len;
-	unsigned long flags;
-
-	vp = dev->priv;
-	ag = vp->agg;
-
-	/* There may be no ports for distributing this skb. so we need
-	 * to clone skb to remove such skb */
-	nskb = skb_clone(skb, GFP_ATOMIC);
-	kfree_skb(skb);
-
-	if (!nskb){
-		return 0;
-	}
-
-
-	spin_lock_irqsave(&ag->lock, flags);
-
-	switch (ag->n_ports){
-	case 0:
-		/* There are no ports for distributing this skb. */
-		goto freeandout;
-	case 1:
-		p = veth_ports + ag->ports[0];
-		tdev = p->dev;
-		break;
-	default:
-		/* don't use skb->mac.* */
-		mac_h = skb->data;
-		p = veth_ports + ag->ports[veth_hash(mac_h, nskb->len, ag)];
-		tdev = p->dev;
-		break;
-	}
-
-	spin_unlock_irqrestore(&ag->lock, flags);
-
-	if (!tdev || !(tdev->flags & IFF_UP))
-		goto freeandout;
-
-	nskb->priority = 1;
-
-	nskb->dev = tdev;
-
-	len = nskb->len;
-	vp->enet_stats.tx_bytes += len;
-	vp->enet_stats.tx_packets++;
-
-	dev_queue_xmit(nskb);
-
-	return 0;
-
-freeandout:
-	kfree_skb(nskb);
-	return 0;
-}
-
-/* end of 43.2.4 */
-
-
-
-static void veth_frame_collector(struct sk_buff *skb, struct net_device *dev)
-{
-	bool is_local_skb;
-	struct veth_private *vp;
-	struct ethhdr *eh;
-
-	vp = (struct veth_private *)(dev->priv);
-
-	eh = (struct ethhdr *)skb->mac.raw;
-	is_local_skb = (!memcmp(dev->dev_addr, eh->h_dest, ETH_ALEN) ||
-		eh->h_dest[0]&1)?_TRUE:_FALSE;
-
-	if (is_local_skb)
-		skb->pkt_type = PACKET_HOST; /* all frames go to upper layer */
-	else
-		skb->pkt_type = PACKET_OTHERHOST;
-
-	if (is_local_skb || dev->flags&IFF_PROMISC){
-		skb->dev = dev;
-		netif_rx(skb);
-		vp->enet_stats.rx_bytes += skb->len;
-		vp->enet_stats.rx_packets++;
-	} else 
-		kfree_skb(skb);
-
-	return;
-	
-}
-
-/* This is an optional function */
-static void veth_marker_receiver(struct sk_buff *skb, struct net_device *dev)
-{
-	/* veth_marker_receiver is not implemented yet */
-	/* discard */
-	kfree_skb(skb);
-	return;
-}
-
-static void veth_marker_responder(struct sk_buff *skb, struct net_device *dev)
-{
-
-	struct lacpdu *buf;
-
-	if (!skb){
-		printk(KERN_CRIT "veth: veth_rx_frame: skb is null!\n");
-		return;
-	}
-
-	buf = (struct lacpdu *)skb->mac.raw;
-
-	/* modify TLV_type */
-	buf->first_tlv_type = 0x02; /* marker response info */
-	skb_push(skb, skb->data - skb->mac.raw);
-	skb->protocol = eth_type_trans(skb, skb->dev);
-	dev_queue_xmit(skb);
-
-	return;
-}
-
-
-
-
-/*-------------------- Selection logic ---------------------*/
-
-static void sort_ports_by_pri(void)
-{
-	int i, j, max;
-	struct veth_port **p, **q, **t;
-	static struct veth_port *t_opl[MAX_PHYIF];
-
-	for (j = 0; j < MAX_PHYIF; j++){
-		t_opl[j] = NULL;
-	}
-
-	p = t_opl;
-	for (j = 0, max = 0; j < MAX_PHYIF; j++){
-		if (veth_ports[j].dev){
-			*(p++) = veth_ports+j;
-			max++;
-		}
-	}
-
-	for (j = 0, q = t_opl; j < max; j++, q++){
-		for (i = j+1, p = q+1; i < max; i++, p++){
-			if ((*p)->pv.actor_port_pri < (*q)->pv.actor_port_pri){
-				t = p; p = q; q = t;
-			}
-		}
-	}
-
-	memcpy(opl, t_opl, MAX_PHYIF*sizeof(struct veth_port *));
-	need_to_rebuild_opl = _FALSE;
-
-	return;
-}
-
-static int get_num_of_port_attached(int an)
-{
-	int i;
-	int ret = -1;
-
-	if (!an){
-		return ret;
-	}
-
-	if (!veth_aggs[an-1].dev){
-		return ret;
-	}
-
-	for (i = 0, ret = 0; i < MAX_PHYIF; i++){
-		if (veth_ports[i].pv.actor_port_agg_id == an &&
-			veth_ports[i].pv.attached){
-			ret++;
-		}
-	}
-
-	return ret;
-}
-
-
-static bool not_assigned_mac(unsigned char *ad)
-{
-	bool ret = _FALSE;
-	int i;
-
-	for (i = 0; i < ETH_ALEN/2; i++){
-		if (ad[i] == 0xfc){
-			ret = _TRUE;
-		}
-	}
-
-	return ret;
-}
-
-
-
-/* This function search for ports which ready_n is _TRUE, then
-   caluculate each aggregator's Ready variable */
-
-/* NOTE.  At this time point, there are no ethernet device driver report
- * media speed, link status and duplex mode by standard way. Therefore
- * veth cannot recognize correct status of such devices. On the other
- * hand, if veth follows the standard, veth cannot handle such
- * "unknown" status devices. i.e. there are no places where veth can
- * work. Therefore I decided to implement a wildcard option (agg_wc)
- * for aggregator until most of ethernet devices report their status
- * correctly... I've introduced media, link_status and duplex
- * mode field in the net_device_stats structure with veth. I hope
- * ethernet device drivers report their status using it in the
- * future... */
-
-static void veth_scan_ready_n(struct veth_port *p)
-{
-	int i, j, k;
-	int key;
-	struct veth_agg *ag;
-
-	/* loopback detection (links may be on the shared media) */
-	if (memcmp(veth_sysvar.actor_sys, p->pv.partner_oper_sys, ETH_ALEN) == 0 &&
-		(p->pv.partner_oper_key & SUBKEY_MASK_UPPER) == (p->pv.actor_oper_port_key & SUBKEY_MASK_UPPER)){
-		i = p->pv.actor_port_agg_id;
-		if (i){
-			p->pv.selected = UNSELECTED;
-			p->pv.loop = _TRUE; /* 43.6.4 */
-			p->pv.actor_oper_port_state &= ~PS_AGGREGATION; /* 43.6.4 */
-		}
-		return;
-	}
-
-	if (!p->dev || p->pv.tbd_cnt){
-		return;
-	}
-
-	if (p->muxm.state == DETACHED &&
-		p->pv.selected == UNSELECTED &&
-		p->pv.ready_n &&
-		!p->pv.actor_port_agg_id){
-		
-		/* If agg_wc is disabled, veth does not allow unknown media
-		 * speed device */
-		if (!agg_wc && ((p->pv.actor_oper_port_key & SUBKEY_MASK_LOWER) == SUBKEY_UNKNOWN)){
-			return;
-		}
-
-		/* apply admin params to oper params */
-		p->pv.actor_oper_port_key &= 
-			SUBKEY_MASK_LOWER; /* comes from veth_port_mon() */
-		p->pv.actor_oper_port_key |= 
-			(p->pv.actor_admin_port_key & SUBKEY_MASK_UPPER);
-		key = p->pv.actor_oper_port_key;
-
-		/* search for proper aggregator */
-		for (i = 0, ag = veth_aggs; i < MAX_VETH && ag->dev; i++, ag++){
-
-			if (!ag->av.lag_ports[0] &&
-				ag->av.actor_oper_agg_key != ag->av.actor_admin_agg_key){
-				/* There are no ports belong to this
-				 * aggregator. So it is safe to change
-				 * operational aggregator key.  */
-				ag->av.actor_oper_agg_key = ag->av.actor_admin_agg_key;
-			}
-
-			if ((ag->av.actor_oper_agg_key & SUBKEY_MASK_UPPER) == (key & SUBKEY_MASK_UPPER)){
-
-
-				/* goto tail (k never reach MAX_PHYIF) */
-				for (k = 0; k < MAX_PHYIF; k++){
-					if (!ag->av.lag_ports[k]){
-						break;
-					}
-				}
-
-				if (k > 0){
-					struct veth_port *q;
-					unsigned char s0, sn;
-
-
-					/* If an individual port has been assigned, or if
-					 * this port is an individual port and a port has
-					 * been assigned, then not select. */
-					q = veth_ports + ag->av.lag_ports[0] - 1;
-					s0 = (q->pv.actor_oper_port_state & q->pv.partner_oper_port_state)
-						& PS_AGGREGATION;
-					sn = (p->pv.actor_oper_port_state & p->pv.partner_oper_port_state)
-						& PS_AGGREGATION;
-					if (!s0 || !sn){
-						continue;
-					}
-
-					/* If LAG_ID is different from first
-					 * port's one, not aggregate each other */
-					if ((q->pv.partner_oper_key != p->pv.partner_oper_key) ||
-						(q->pv.actor_oper_port_key != p->pv.actor_oper_port_key) ||
-						(memcmp(q->pv.partner_oper_sys, p->pv.partner_oper_sys, ETH_ALEN) != 0)){
-						continue;
-					}
-
-				}
-
-				/* media speed of the first port is applied to the aggregator.
-				 * It will be used until all the ports detach MUX from the aggregator. */
-				if (!k){
-					ag->av.actor_oper_agg_key &= SUBKEY_MASK_UPPER;
-					ag->av.actor_oper_agg_key |= (key & SUBKEY_MASK_LOWER);
-				}
-
-				if (not_assigned_mac(ag->dev->dev_addr)){
-					if (!veth_ports[i].dev){
-#if 0
-						printk(KERN_INFO "veth: %s does not have correct MAC address! (Too many aggregators)\n",
-							   ag->dev->name);
-#endif
-						break;
-					} else {
-						memcpy(ag->dev->dev_addr, veth_ports[i].dev->dev_addr, ETH_ALEN);
-						memcpy(ag->av.agg_mac, ag->dev->dev_addr, ETH_ALEN);
-					}
-				}
-
-				ag->av.lag_ports[k] = p->pv.actor_port_num;
-				p->pv.actor_port_agg_id = i+1;
-					
-				/* make it SELECTED after make sure no restriction for
-				   attaching */
-				p->pv.selected = STANDBY;
-				break;
-			}
-		}
-	}
-
-
-	if (p->pv.selected == STANDBY){
-		int n = get_num_of_port_attached(p->pv.actor_port_agg_id);
-
-		if (n < 0){
-			printk(KERN_CRIT "veth_scan_ready_n(): unexpected agg_id\n");
-			return;
-		}
-
-		if (n < nport){
-			if (VETH_DEBUG(VETH_DEBUG_SEL, 1)){
-				printk(KERN_INFO "port:%d act_sys:%02x%02x%02x-%02x%02x%02x, partn_sys:%02x%02x%02x-%02x%02x%02x\n",
-					   p->pv.actor_port_num,
-					   veth_sysvar.actor_sys[0],
-					   veth_sysvar.actor_sys[1],
-					   veth_sysvar.actor_sys[2],
-					   veth_sysvar.actor_sys[3],
-					   veth_sysvar.actor_sys[4],
-					   veth_sysvar.actor_sys[5],
-					   p->pv.partner_oper_sys[0],
-					   p->pv.partner_oper_sys[1],
-					   p->pv.partner_oper_sys[2],
-					   p->pv.partner_oper_sys[3],
-					   p->pv.partner_oper_sys[4],
-					   p->pv.partner_oper_sys[5]);
-			}
-			p->pv.selected = SELECTED;
-			p->pv.need_to_xmit = _TRUE;
-		} else {
-			/* remain STANDBY because of restriction (43.6.1) */
-		}
-	}
-
-
-	/* calculate ready value from ready_N value of each port which
-       belongs to the aggregator. */
-
-	i = p->pv.actor_port_agg_id - 1;
-	if (i < 0){
-		return;
-	}
-
-	ag = veth_aggs + i;
-
-	for (j = 0; j < MAX_PHYIF && ag->av.lag_ports[j]; j++){
-		p = veth_ports + (ag->av.lag_ports[j]-1);
-		if (p->pv.ready_n){
-			ag->av.ready = _TRUE;
-			break;
-		}
-	}
-
-	return;
-}
-
-
-/*-------------------- End of Selection logic ---------------------*/
-
-
-/*-------------------- Timers ---------------------*/
-
-static void vt_start(struct veth_timer *vt, int exp)
-{
-	vt->active = _TRUE;
-	vt->exp = exp;
-	vt->tim = 0;
-
-	return;
-}
-
-static void vt_stop(struct veth_timer *vt)
-{
-	vt->tim = 0;
-	vt->active = _FALSE;
-
-	return;
-}
-
-static int is_vt_active(struct veth_timer *vt)
-{
-	return vt->active;
-}
-
-
-
-
-static void vt_count(struct veth_timer *vt)
-{
-	if (vt->active){
-		if (vt->tim == vt->exp){
-			vt->tim = 0;					
-			vt->active = _FALSE;
-		} else {
-			vt->tim++;
-		}
-	}
-
-	return;
-}
-
-
-static void veth_clear_timer(struct veth_timer *vt)
-{
-	memset(vt, 0, sizeof(struct veth_timer));
-	return;
-}
-
-static void veth_unregister_timer(struct veth_timer *vt)
-{
-	struct veth_timer *p, *q;
-
-	if (!vt){
-		return;
-	}
-
-	if (vth == vt){
-		p = vth->next;
-		vth->next = 0;
-		vth = p;
-		return;
-	}
-
-	p = vth->next;
-	q = vth;
-	for (; p; p = p->next, q = q->next){
-		if (vt == p){
-			q->next = p->next;
-			p->next = 0;
-		}
-	}
-	return;
-}
-
-static void veth_register_timer(struct veth_timer *vt)
-{
-	if (!vt){
-		return;
-	}
-
-	vt->tick_func = vt_count;
-	vt->next = vth;
-	vth = vt;
-	return;
-}
-
-/*-------------------- end of Timers --------------*/
-
-
-/*-------------- Periodic Xmit Machine ---------------*/
-/* 43.4.13 */
-static void veth_prm_tick(struct veth_port *p)
-{
-	struct perio_mach *m = &(p->prm);
-	bool go_no_perio;
-
-	go_no_perio = p->pv.begin || !p->pv.lacp_ena || !p->pv.port_enabled ||
-		(!(p->pv.actor_oper_port_state & PS_LACP_ACTIVITY) &&
-		 !(p->pv.partner_oper_port_state & PS_LACP_ACTIVITY));
-
-	/* state machine */
-	if (m->state == NO_PERIODIC){
-		if (m->do_it){
-			vt_stop(&(p->periodic_timer));
-			m->do_it = _FALSE;
-		}
-		if (!go_no_perio){
-			m->state = FAST_PERIODIC;
-			m->do_it = _TRUE;
-		}
-	} else if (m->state == FAST_PERIODIC){
-		if (go_no_perio){
-			m->state = NO_PERIODIC;
-			m->do_it = _FALSE;
-		} else {
-			if (m->do_it){
-				vt_start(&(p->periodic_timer), Fast_Periodic_Time);
-				/* 43.4.16 */
-				p->pv.xmit_tim_update = Fast_Periodic_Time;
-				p->pv.xmit_ena = _TRUE;
-				m->do_it = _FALSE;
-			}
-			if (!(p->pv.partner_oper_port_state & PS_LACP_TIMEOUT)){
-				/* long timeout */
-				m->state = SLOW_PERIODIC;
-				m->do_it = _TRUE;
-			}
-			/* short timeout */
-			if (!is_vt_active(&(p->periodic_timer))){
-				m->state = PERIODIC_TX;
-				m->do_it = _TRUE;
-			}
-		}
-	} else if (m->state == SLOW_PERIODIC){
-		if (go_no_perio){
-			m->state = NO_PERIODIC;
-			m->do_it = _FALSE;
-		} else {
-			if (m->do_it){
-				vt_start(&(p->periodic_timer), Slow_Periodic_Time);
-				/* 43.4.16 */
-				p->pv.xmit_tim_update = Fast_Periodic_Time;
-				p->pv.xmit_ena = _TRUE;
-				m->do_it = _FALSE;
-			}
-			if ((p->pv.partner_oper_port_state & PS_LACP_TIMEOUT) ||
-				!is_vt_active(&(p->periodic_timer))){
-				m->state = PERIODIC_TX;
-				m->do_it = _TRUE;
-			}
-		}
-	} else if (m->state == PERIODIC_TX){
-		if (go_no_perio){
-			m->state = NO_PERIODIC;
-			m->do_it = _FALSE;
-		} else {
-			if (m->do_it){
-				p->pv.need_to_xmit = _TRUE;
-				m->do_it = _FALSE;
-			}
-			if (p->pv.partner_oper_port_state & PS_LACP_TIMEOUT){
-				/* short timeout */
-				m->state = FAST_PERIODIC;
-				m->do_it = _TRUE;
-			} else {
-				m->state = SLOW_PERIODIC;
-				m->do_it = _TRUE;
-			}
-		}
-	}
-	return;
-}
-/*-------------- Periodic Xmit Machine ---------------*/
-
-
-/*-------------- receive machine -------------------*/
-
-/* 
- * 43.4.12 (receive machine) 
- * This describes state machine for each port
- */
-
-/* action at INITIALIZE state */
-static void veth_rcvm_init(struct veth_port *p)
-{
-	p->pv.selected = UNSELECTED;
-	veth_record_default(p);
-	p->pv.port_moved = _FALSE;
-	p->pv.actor_oper_port_state &= ~PS_EXPIRED;
-
-	return;
-}
-
-/* action at PORT_DISABLED state */
-static void veth_rcvm_port_dis(struct veth_port *p)
-{
-
-	p->pv.partner_oper_port_state &= ~PS_SYNCHRONIZATION;
-
-	/* The standard does not mention explicitly where PS_LACP_ACTIVITY
-	 * shall be set...  */
-	p->pv.actor_oper_port_state |= PS_LACP_ACTIVITY;
-
-	/* reset "loop condition" */
-	p->pv.loop = _FALSE;
-	p->pv.actor_oper_port_state |= PS_AGGREGATION;
-
-	return;
-}
-
-static void veth_check_if_port_moved(struct veth_port *p)
-{
-	int i;
-
-	for (i = 0; i < MAX_PHYIF; i++){
-		if (veth_ports[i].dev &&
-			p != veth_ports+i &&
-			(veth_ports[i].pv.partner_oper_port_num == p->pv.partner_oper_port_num) &&
-			(memcmp(veth_ports[i].pv.partner_oper_sys, p->pv.partner_oper_sys, ETH_ALEN) == 0)){
-			p->pv.port_moved = _TRUE;
-		}
-	}
-	return;
-}
-
-/* action at EXPIRED state */
-static void veth_rcvm_exp(struct veth_port *p)
-{
-	p->pv.partner_oper_port_state &= ~PS_SYNCHRONIZATION;
-	p->pv.partner_oper_port_state |= PS_LACP_TIMEOUT; /* short */
-	vt_start(&(p->current_while_timer), Short_Timeout_Time);
-	p->pv.actor_oper_port_state |= PS_EXPIRED;
-	return;
-}
-
-/* action at LACP_DISABLED state */
-static void veth_rcvm_lacp_dis(struct veth_port *p)
-{
-	p->pv.selected = UNSELECTED;
-	veth_record_default(p);
-	p->pv.partner_oper_port_state &= ~(PS_AGGREGATION | PS_EXPIRED);
-
-	/* The standard does not mention explicitly when PS_LACP_ACTIVITY
-	 * shall be set...  */
-	p->pv.actor_oper_port_state &= ~PS_LACP_ACTIVITY;
-	return;
-}
-
-/* action at DEFAULTED state */
-static void veth_rcvm_def(struct veth_port *p)
-{
-	veth_update_default_selected(p);
-	veth_record_default(p);
-	p->pv.actor_oper_port_state &= ~PS_EXPIRED;
-	return;
-}
-
-/* action at CURRENT state */
-static void veth_rcvm_cur(struct veth_port *p)
-{
-	if (p->pv.actor_oper_port_state & PS_LACP_TIMEOUT){
-		vt_start(&(p->current_while_timer), Short_Timeout_Time);
-	} else {
-		vt_start(&(p->current_while_timer), Long_Timeout_Time);
-	}
-	p->pv.actor_oper_port_state &= ~PS_EXPIRED;
-	return;
-}
-
-static unsigned long get_phyif_link_stats(struct net_device *dev)
-{
-#if 0
-	struct net_device_stats *r;
-#endif
-
-	/* Recently, some Ethernet device drivers report link
-	 * status using MII library. */
-	if (get_link_stat(dev))
-		return IF_PORT_LINK_UP; /* This includes unknown link status..*/
-	else
-		return IF_PORT_LINK_DOWN;
-#if 0
-	if (dev->get_stats){
-		r = dev->get_stats(dev);
-		return r->link_stat;
-	}
-	return IF_PORT_LINK_UNKNOWN;
-#endif
-}
-
-static unsigned long get_phyif_media(struct net_device *dev)
-{
-	struct net_device_stats *r;
-
-	if (dev->get_stats){
-		r = dev->get_stats(dev);
-		return r->media;
-	}
-	return IF_PORT_UNKNOWN;
-}
-
-
-static unsigned long get_phyif_duplex_mode(struct net_device *dev)
-{
-	struct net_device_stats *r;
-
-	if (dev->get_stats){
-		r = dev->get_stats(dev);
-		return r->duplex_mode;
-	}
-	return IF_PORT_DUPLEX_UNKNOWN;
-}
-
-static void veth_drop_lacpdu_buf(struct veth_port *p)
-{
-	for (;p->rcvm.ring.r != p->rcvm.ring.w;){
-		/* LACPDU arrives (drop it)*/
-		kfree(p->rcvm.ring.buf[p->rcvm.ring.r]);
-		p->rcvm.ring.buf[p->rcvm.ring.r] = NULL;
-		p->rcvm.ring.r++;
-		if (p->rcvm.ring.r == MAX_RING){
-			p->rcvm.ring.r = 0;
-		}
-	}
-	return;
-}
-
-static void veth_rcvm_tick(struct veth_port *p)
-{
-	struct rcv_mach *m = &(p->rcvm);
-
-	bool go_init;
-	bool go_port_dis;
-
-	go_init = p->pv.begin;
-	go_port_dis = !p->pv.begin &&
-		!p->pv.port_enabled &&
-		!p->pv.port_moved;
-
-	if (m->state == INITIALIZE){
-		if (m->do_it){
-			veth_rcvm_init(p);
-			m->do_it = _FALSE;
-		}
-		if (!go_init){
-			m->do_it = _TRUE;
-			m->state = PORT_DISABLED;
-		}
-		veth_drop_lacpdu_buf(p);
-	} else if (m->state == PORT_DISABLED){
-		if (go_init){
-			m->do_it = _TRUE;
-			m->state = INITIALIZE;
-		} else {
-			if (m->do_it){
-				veth_rcvm_port_dis(p);
-				m->do_it = _FALSE;
-			}
-
-			if (!go_port_dis){
-				if (p->pv.port_enabled &&
-					p->pv.lacp_ena){
-					m->do_it = _TRUE;
-					m->state = EXPIRED;
-				} else if (p->pv.port_moved){
-					m->do_it = _TRUE;
-					m->state = INITIALIZE;
-				} else if (p->pv.port_enabled &&
-						   !p->pv.lacp_ena){
-					m->do_it = _TRUE;
-					m->state = LACP_DISABLED;
-				}
-			}
-			veth_check_if_port_moved(p);
-			veth_drop_lacpdu_buf(p);
-		}
-	} else if (m->state == EXPIRED){
-		if (go_init){
-			m->do_it = _TRUE;
-			m->state = INITIALIZE;
-		} else if (go_port_dis){
-			m->do_it = _TRUE;
-			m->state = PORT_DISABLED;
-		} else {
-			if (m->do_it){
-				veth_rcvm_exp(p);
-				m->do_it = _FALSE;
-
-				if (VETH_DEBUG(VETH_DEBUG_RCVM, 1)){
-					printk(KERN_INFO "veth_rcvm_tick(): vt started\n");
-				}
-
-			}
-			if (!is_vt_active(&p->current_while_timer)){
-				/* stay this state until current_while_timer expires */
-
-				if (VETH_DEBUG(VETH_DEBUG_RCVM, 1)){
-					printk(KERN_INFO "veth_rcvm_tick(): vt expired\n");
-				}
-
-				m->state = DEFAULTED;
-				m->do_it = _TRUE;
-			}
-			if (p->rcvm.ring.r != p->rcvm.ring.w){
-				/* LACPDU arrives */
-				m->state = CURRENT;
-				m->do_it = _TRUE;
-			}
-
-		}
-		/* stay this state until LACPDU received */
-	} else if (m->state == LACP_DISABLED){
-		if (go_init){
-			m->do_it = _TRUE;
-			m->state = INITIALIZE;
-		} else if (go_port_dis){
-			m->do_it = _TRUE;
-			m->state = PORT_DISABLED;
-		} else {
-			if (m->do_it){
-				veth_rcvm_lacp_dis(p);
-				m->do_it = _FALSE;
-			}
-			veth_drop_lacpdu_buf(p);
-		}
-	} else if (m->state == DEFAULTED){
-		if (go_init){
-			m->do_it = _TRUE;
-			m->state = INITIALIZE;
-		} else if (go_port_dis){
-			m->do_it = _TRUE;
-			m->state = PORT_DISABLED;
-		} else {
-			if (m->do_it){
-				veth_rcvm_def(p);
-				m->do_it = _FALSE;
-			}
-			if (p->rcvm.ring.r != p->rcvm.ring.w){
-				/* LACPDU arrives */
-				m->state = CURRENT;
-				m->do_it = _TRUE;
-			}
-		}
-	} else if (m->state == CURRENT){
-		if (go_init){
-			m->do_it = _TRUE;
-			m->state = INITIALIZE;
-		} else if (go_port_dis){
-			m->do_it = _TRUE;
-			m->state = PORT_DISABLED;
-		} else {
-
-			if (m->do_it){
-				struct lacpdu *buf;
-				
-				for (; p->rcvm.ring.r != p->rcvm.ring.w;){
-					buf = (struct lacpdu *)p->rcvm.ring.buf[p->rcvm.ring.r];
-					
-					/* update_selected() should be done before
-					 * record_pdu(). Because update_selected()
-					 * compares actor's "partner information" with
-					 * PDU's "actor information". If record_pdu() is
-					 * done before update_selected(), above comparison
-					 * cannot detect PDU's (partner's) information
-					 * does not match one which actor holds. */
-					veth_update_selected(buf, p);
-					veth_update_ntt(buf, p);
-					veth_record_pdu(buf, p);
-					
-					kfree(p->rcvm.ring.buf[p->rcvm.ring.r]);
-					p->rcvm.ring.buf[p->rcvm.ring.r] = NULL;
-					if (p->rcvm.ring.r == MAX_RING-1){
-						p->rcvm.ring.r = 0;
-					} else {
-						p->rcvm.ring.r++;
-					}
-				}
-				
-				veth_rcvm_cur(p);
-				m->do_it = _FALSE;
-			}
-
-			if (p->rcvm.ring.r != p->rcvm.ring.w){
-				/* LACPDU arrives */
-				m->do_it = _TRUE;
-			}
-
-			if (!is_vt_active(&p->current_while_timer)){
-				m->state = EXPIRED;
-				m->do_it = _TRUE;
-			}
-		}
-	}
-
-	return;
-}
-
-/*--------------- end of receive machine -----------*/
-
-/*------ xmit machine ----------*/
-
-static void xmit_lacpdu(struct veth_port *p)
-{
-	struct sk_buff *skb;
-	struct lacpdu buf;
-	struct ethhdr *eh;
-
-	int pdu_len = LACPDU_LEN;
-	int len = LACPDU_LEN + ETH_HLEN;
-
-	memset(&buf, 0x0, pdu_len);
-
-	/* build LACPDU */
-	buf.subtype = LACP_Subtype;
-	buf.version_number = LACP_Version;
-
-	buf.first_tlv_type = 0x1; /* Actor Information */
-	buf.actor_info_len = 0x14;
-	buf.actor_sys_pri = htons(veth_sysvar.actor_sys_pri);
-	memcpy(buf.actor_sys, veth_sysvar.actor_sys, ETH_ALEN);
-	buf.actor_key = htons(p->pv.actor_oper_port_key);
-	buf.actor_port_pri = htons(p->pv.actor_port_pri);
-	buf.actor_port = htons(p->pv.actor_port_num);
-	buf.actor_state = p->pv.actor_oper_port_state;
-
-	buf.second_tlv_type = 0x2; /* Partner Information */
-	buf.partner_info_len = 0x14;
-	buf.partner_sys_pri = htons(p->pv.partner_oper_sys_pri);
-	memcpy(buf.partner_sys, p->pv.partner_oper_sys, ETH_ALEN);
-	buf.partner_key = htons(p->pv.partner_oper_key);
-	buf.partner_port_pri = htons(p->pv.partner_oper_port_pri);
-	buf.partner_port = htons(p->pv.partner_oper_port_num);
-	buf.partner_state = p->pv.partner_oper_port_state;
-
-	buf.third_tlv_type = 0x3; /* Collector Information */
-	buf.collector_info_len = 0x10;
-	buf.collector_max_del = htons(veth_sysvar.collector_max_del);
-
-	buf.fourth_tlv_type = 0x0; /* Terminator */
-	buf.terminator_len = 0x0;
-
-	skb = dev_alloc_skb(len);
-
-	if (!skb){
-		return;
-	}
-	skb->dev = p->dev;
-	skb->mac.raw = skb_put(skb, len);
-
-	memcpy(skb->mac.raw, Slow_Protocols_Multicast, ETH_ALEN);
-	memcpy(skb->mac.raw+ETH_ALEN, p->dev->dev_addr, ETH_ALEN);
-	eh = (struct ethhdr *)skb->mac.raw;
-	eh->h_proto = Slow_Protocols_Type;
-
-	skb->nh.raw = skb->mac.raw + ETH_HLEN;
-	memcpy(skb->nh.raw, &buf, pdu_len);
-
-	dev_queue_xmit(skb);
-
-	return;
-}
-
-
-static void veth_xmit_tick(struct veth_port *p)
-{
-	/* pv.xmit_ena is controlled by periodic machine */
-	/* If lacp_ena is _FALSE, do not xmit LACPDU (43.4.16)*/
-	if (!p->pv.xmit_ena || !p->pv.lacp_ena){
-		p->pv.need_to_xmit = _FALSE;
-		p->xmit_timer.tim = 0;
-		return;
-	}
-
-	/* pv.xmit_update is controlled by periodic machine */
-	/* 43.4.16 */
-	if (p->pv.xmit_tim_update){
-		p->xmit_timer.exp = p->pv.xmit_tim_update;
-		p->pv.xmit_tim_update = 0;
-		p->xmit_timer.tim = 0;
-	}
-
-	/* pv.xmit_count indicates LACPDU xmit count in a timer lifetime */
-	if (p->xmit_timer.tim == p->xmit_timer.exp){
-		p->pv.xmit_count = 0;
-		p->xmit_timer.tim = 0;
-	}
-
-	if (p->pv.need_to_xmit && p->pv.xmit_count < 3){
-		p->pv.xmit_count++;
-		xmit_lacpdu(p);
-	}
-	p->pv.need_to_xmit = _FALSE;
-
-	p->xmit_timer.tim++;
-
-	return;
-}
-/*------ end of xmit machine ---*/
-
-
-/*--------------- mux machine -----------*/
-
-/* DETACHED state */
-static void veth_muxm_detached(struct veth_port *p)
-{
-	veth_detach_mux_from_agg(p);
-	p->pv.actor_oper_port_state &= ~PS_SYNCHRONIZATION;
-	veth_dis_distrib(p);
-	veth_dis_collect(p);
-	p->pv.need_to_xmit = _TRUE;
-
-	/*
-	 * Tell selection logic this port is waiting for selection
-	 * if this port is under STANDBY state, do nothing because
-	 * selection is already done.
-	 */
-	if (p->pv.selected == UNSELECTED){
-		p->pv.ready_n = _TRUE;
-	}
-	return;
-}
-
-/* WAITING state */
-static void veth_muxm_waiting(struct veth_port *p)
-{
-	vt_start(&(p->wait_while_timer), Aggregate_Wait_Time);
-	return;
-}
-
-/* ATTACHED state */
-static void veth_muxm_attached(struct veth_port *p)
-{
-	veth_attach_mux_to_agg(p);
-	p->pv.actor_oper_port_state |= PS_SYNCHRONIZATION;
-	p->pv.actor_oper_port_state &= ~PS_COLLECTING;
-	veth_dis_collect(p);
-	p->pv.need_to_xmit = _TRUE;
-	p->pv.ready_n = _FALSE; /* because this port attached to the aggregator */
-	return;
-}
-
-/* COLLECTING state */
-static void veth_muxm_collect(struct veth_port *p)
-{
-	veth_ena_collect(p);
-	veth_dis_distrib(p);
-	p->pv.need_to_xmit = _TRUE;
-	return;
-}
-
-/* DISTRIBUTING state */
-static void veth_muxm_distrib(struct veth_port *p)
-{
-	veth_ena_distrib(p);
-}
-
-
-static void veth_muxm_tick(struct veth_port *p)
-{
-	struct mux_mach *m = &(p->muxm);
-	struct veth_agg *ag;
-	bool go_detached;
-
-	go_detached = p->pv.begin;
-
-	if (m->state == DETACHED){
-		if (m->do_it){
-			veth_muxm_detached(p);
-			m->do_it = _FALSE;
-		}
-		if (!go_detached){
-			if (p->pv.selected == SELECTED ||
-				p->pv.selected == STANDBY){
-				m->state = WAITING;
-				m->do_it = _TRUE;
-			}
-		}
-	} else if (m->state == WAITING){
-		if (go_detached){
-			m->state = DETACHED;
-			m->do_it = _TRUE;
-		} else {
-			if (m->do_it){
-				veth_muxm_waiting(p);
-				m->do_it = _FALSE;
-			}
-			if (!is_vt_active(&p->wait_while_timer)){
-
-				ag = veth_aggs + p->pv.actor_port_agg_id-1;
-
-				if (p->pv.selected == SELECTED &&
-					ag->av.ready == _TRUE){
-					m->state = ATTACHED;
-					m->do_it = _TRUE;
-				} else if (p->pv.selected == UNSELECTED){
-					m->state = DETACHED;
-					m->do_it = _TRUE;
-				}
-			}
-		}
-		/* stay this state while wait_while_timer does not expire */
-	} else if (m->state == ATTACHED){
-		if (go_detached){
-			m->state = DETACHED;
-			m->do_it = _TRUE;
-		} else {
-			if (m->do_it){
-				veth_muxm_attached(p);
-				m->do_it = _FALSE;
-			}
-			if (p->pv.selected == SELECTED &&
-				p->pv.partner_oper_port_state & PS_SYNCHRONIZATION){
-				m->state = COLLECTING;
-				m->do_it = _TRUE;
-			} else if (p->pv.selected == UNSELECTED ||
-					   p->pv.selected == STANDBY){
-				m->state = DETACHED;
-				m->do_it = _TRUE;
-			}
-		}
-	} else if (m->state == COLLECTING){
-		if (go_detached){
-			m->state = DETACHED;
-			m->do_it = _TRUE;
-		} else {
-			if (m->do_it){
-				veth_muxm_collect(p);
-				m->do_it = _FALSE;
-			}
-			if (p->pv.selected == UNSELECTED ||
-				p->pv.selected == STANDBY ||
-				!(p->pv.partner_oper_port_state & PS_SYNCHRONIZATION)){
-				m->state = ATTACHED;
-				m->do_it = _TRUE;
-			} else if (p->pv.selected == SELECTED &&
-					   p->pv.partner_oper_port_state & PS_SYNCHRONIZATION &&
-					   p->pv.partner_oper_port_state & PS_COLLECTING ){
-				m->state = DISTRIBUTING;
-				m->do_it = _TRUE;
-			}
-		}
-	} else if (m->state == DISTRIBUTING){
-		if (go_detached){
-			m->state = DETACHED;
-			m->do_it = _TRUE;
-		} else {
-			if (m->do_it){
-				veth_muxm_distrib(p);
-				m->do_it = _FALSE;
-			}
-			if (p->pv.selected == UNSELECTED ||
-				p->pv.selected == STANDBY ||
-				!(p->pv.partner_oper_port_state & PS_SYNCHRONIZATION) ||
-				!(p->pv.partner_oper_port_state & PS_COLLECTING)){
-				m->state = COLLECTING;
-				m->do_it = _TRUE;
-			}		
-		}
-	}
-	return;
-}
-
-
-/*--------------- end of mux machine -----------*/
-
-/*--------------- actor churn machine -----------*/
-
-static void veth_acm_no_actor_churn(struct veth_port *p)
-{
-		p->pv.actor_churn = _FALSE;
-		return;
-}
-
-static void veth_acm_actor_churn_mon(struct veth_port *p)
-{
-		p->pv.actor_churn = _FALSE;
-		vt_start(&(p->actor_churn_timer), Churn_Detection_Time);
-		return;
-}
-
-static void veth_acm_actor_churn(struct veth_port *p)
-{
-		p->pv.actor_churn = _TRUE;
-		return;
-}
-
-static void veth_acm_tick(struct veth_port *p)
-{
-	struct ac_mach *m = &(p->acm);
-	bool go_churn_mon;
-
-	go_churn_mon = p->pv.begin ||
-		!p->pv.port_enabled;
-
-	if (m->state == NO_ACTOR_CHURN){
-		if (m->do_it){
-			veth_acm_no_actor_churn(p);
-			m->do_it = _FALSE;
-		}
-		if (go_churn_mon){
-			m->state = ACTOR_CHURN_MONITOR;
-			m->do_it = _TRUE;
-		} else {
-			if (!p->pv.actor_oper_port_state & PS_SYNCHRONIZATION){
-				m->state = ACTOR_CHURN_MONITOR;
-				m->do_it = _TRUE;
-			}
-		}
-	} else if (m->state == ACTOR_CHURN_MONITOR){
-		if (m->do_it){
-			veth_acm_actor_churn_mon(p);
-			m->do_it = _FALSE;
-		}
-		if (!go_churn_mon){
-			if (p->pv.actor_oper_port_state & PS_SYNCHRONIZATION){
-				m->state = NO_ACTOR_CHURN;
-				m->do_it = _TRUE;
-			}
-			if (!is_vt_active(&p->actor_churn_timer)){
-				m->state = ACTOR_CHURN;
-				m->do_it = _TRUE;
-			}
-		}
-		/* stay this state while wait_while_timer does not expire */
-	} else if (m->state == ACTOR_CHURN){
-		if (m->do_it){
-			veth_acm_actor_churn(p);
-			m->do_it = _FALSE;
-		}
-		if (go_churn_mon){
-			m->state = ACTOR_CHURN_MONITOR;
-			m->do_it = _TRUE;
-		} else {
-			if (p->pv.actor_oper_port_state & PS_SYNCHRONIZATION){
-				m->state = NO_ACTOR_CHURN;
-				m->do_it = _TRUE;
-			}
-		}
-	}
-	return;
-}
-/*--------------- end of actor churn machine -----------*/
-
-/*--------------- partner churn machine -----------*/
-
-static void veth_pcm_no_partner_churn(struct veth_port *p)
-{
-		p->pv.partner_churn = _FALSE;
-		return;
-}
-
-static void veth_pcm_partner_churn_mon(struct veth_port *p)
-{
-		p->pv.partner_churn = _FALSE;
-		vt_start(&(p->partner_churn_timer), Churn_Detection_Time);
-		return;
-}
-
-static void veth_pcm_partner_churn(struct veth_port *p)
-{
-		p->pv.partner_churn = _TRUE;
-		return;
-}
-
-static void veth_pcm_tick(struct veth_port *p)
-{
-	struct pc_mach *m = &(p->pcm);
-	bool go_churn_mon;
-
-	go_churn_mon = p->pv.begin ||
-		!p->pv.port_enabled;
-
-	if (m->state == NO_PARTNER_CHURN){
-		if (m->do_it){
-			veth_pcm_no_partner_churn(p);
-			m->do_it = _FALSE;
-		}
-		if (go_churn_mon){
-			m->state = PARTNER_CHURN_MONITOR;
-			m->do_it = _TRUE;
-		} else {
-			if (!p->pv.partner_oper_port_state & PS_SYNCHRONIZATION){
-				m->state = PARTNER_CHURN_MONITOR;
-				m->do_it = _TRUE;
-			}
-		}
-	} else if (m->state == PARTNER_CHURN_MONITOR){
-		if (m->do_it){
-			veth_pcm_partner_churn_mon(p);
-			m->do_it = _FALSE;
-		}
-		if (!go_churn_mon){
-			if (p->pv.partner_oper_port_state & PS_SYNCHRONIZATION){
-				m->state = NO_PARTNER_CHURN;
-				m->do_it = _TRUE;
-			}
-			if (!is_vt_active(&p->partner_churn_timer)){
-				m->state = PARTNER_CHURN;
-				m->do_it = _TRUE;
-			}
-		}
-		/* stay this state while wait_while_timer does not expire */
-	} else if (m->state == PARTNER_CHURN){
-		if (m->do_it){
-			veth_pcm_partner_churn(p);
-			m->do_it = _FALSE;
-		}
-		if (go_churn_mon){
-			m->state = PARTNER_CHURN_MONITOR;
-			m->do_it = _TRUE;
-		} else {
-			if (p->pv.partner_oper_port_state & PS_SYNCHRONIZATION){
-				m->state = NO_PARTNER_CHURN;
-				m->do_it = _TRUE;
-			}
-		}
-	}
-	return;
-}
-
-/*--------------- end of partner churn machine -----------*/
-
-/*--------------- port deletion machine -----------*/
-/* This machine is not defined by the standard */
-
-static void veth_port_del(struct veth_port *p)
-{
-	/* unregister timers */
-	veth_unregister_timer(&(p->current_while_timer));
-	veth_unregister_timer(&(p->actor_churn_timer));
-	veth_unregister_timer(&(p->periodic_timer));
-	veth_unregister_timer(&(p->partner_churn_timer));
-	veth_unregister_timer(&(p->wait_while_timer));
-	veth_unregister_timer(&(p->xmit_timer));
-
-	/* make the physical i/f's non-promiscuous mode */
-	dev_set_promiscuity(p->dev, -1);
-
-	p->dev->intercepted_ptype = 0;
-
-	if (p->dev->set_multicast_list != NULL){
-		p->dev->set_multicast_list(p->dev);
-	}
-
-	p->pv.actor_port_num = 0;
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-	if (p->module_name[0]){
-		__MOD_DEC_USE_COUNT(find_module(p->module_name));
-		p->module_name[0] = '\0';
-	}
-#else
-	dev_put(p->dev);
-#endif
-
-	p->dev = NULL;
-
-	return;
-}
-
-
-static void veth_port_del_tick(struct veth_port *p)
-{
-	if (!p->pv.tbd_cnt){
-		return;
-	}
-
-	p->pv.tbd_cnt--;
-
-	if (p->pv.tbd_cnt < 3){
-		p->pv.begin = _TRUE; /* reset this port */
-
-		vt_stop(&(p->current_while_timer));
-		vt_stop(&(p->actor_churn_timer));
-		vt_stop(&(p->periodic_timer));
-		vt_stop(&(p->partner_churn_timer));
-		vt_stop(&(p->wait_while_timer));
-		vt_stop(&(p->xmit_timer));
-		
-		if (p->pv.tbd_cnt){
-			return;
-		} else {
-			veth_port_del(p);
-			need_to_rebuild_opl = _TRUE;
-		}
-	}
-}
-/*--------------- end of port deletion machine -----------*/
-
-
-/*--------- port status monitor -----------*/
-/* Purpose of this block is periodic calculation of operational key
- * values and monitoring link status */
-
-static void veth_port_mon(struct veth_port *p)
-{
-	unsigned long ls;
-	unsigned short key;
-
-	ls = get_phyif_link_stats(p->dev);
-
-	/* Since most of Ethernet device drivers do not report link
-	 * status, IF_PORT_LINK_UNKNOWN is regarded as IF_PORT_LINK_UP at
-	 * this time point...  */
-	if (ls == IF_PORT_LINK_UNKNOWN){
-		p->pv.port_enabled = (p->dev->flags & IFF_UP)
-#ifdef VETH_USE_IFF_RUNNING
-					  &&(p->dev->flags & IFF_RUNNING)
-#endif
-			;
-	} else {
-		p->pv.port_enabled =
-			(p->dev->flags&IFF_UP) && (ls == IF_PORT_LINK_UP);
-	}
-
-	if (!p->pv.loop){
-		/* If the link is half duplex mode, we cannot enable LACP on
-		 * the link... 43.1.2 (p) */
-		switch(get_phyif_duplex_mode(p->dev)){
-		case IF_PORT_DUPLEX_UNKNOWN:
-			if (!agg_wc){
-				p->pv.lacp_ena = _FALSE;
-			} else {
-				p->pv.lacp_ena = _TRUE;
-			}
-			break;
-		case IF_PORT_DUPLEX_FULL:
-			p->pv.lacp_ena = _TRUE;
-			break;
-		default:
-			p->pv.lacp_ena = _FALSE;
-			break;
-		}
-	} else { /* 43.6.3 */
-			p->pv.lacp_ena = _FALSE;
-	}
-
-	/* In this implementation, Lower 8-bit of key means media speed. If
-     * lower 8-bit of an aggregator's key is zero, it means the
-     * aggregator accepts any media speed. See selection logic
-     * comments...  */
-
-	switch(get_phyif_media(p->dev)){
-	case IF_PORT_10BASET:
-		key = SUBKEY_10M;
-		break;
-	case IF_PORT_100BASET:
-	case IF_PORT_100BASETX:
-	case IF_PORT_100BASEFX:
-		key = SUBKEY_100M;
-		break;
-	case IF_PORT_1000BASET:
-	case IF_PORT_1000BASESX:
-	case IF_PORT_1000BASELX:
-		key = SUBKEY_1000M;
-		break;
-	default: /* unknown */
-		key = SUBKEY_UNKNOWN;
-		break;
-	}
-
-	/* agg_wc comes from module parameter */
-	if (agg_wc == 1){
-		key = SUBKEY_UNKNOWN;
-	}
-		
-	if (key == SUBKEY_UNKNOWN && agg_wc){
-		p->pv.actor_oper_port_key &= SUBKEY_MASK_UPPER;
-		return;
-	}
-
-	/* if port's media speed is known and key has changed, then
-     * unselects aggregator */
-	if ((p->pv.actor_oper_port_key & SUBKEY_MASK_LOWER) != key){
-		p->pv.actor_oper_port_key &= SUBKEY_MASK_UPPER;
-		p->pv.actor_oper_port_key |= key;
-		p->pv.selected = UNSELECTED;
-	}
-
-	return;
-}
-
-static void veth_port_mon_tick(struct veth_port *p)
-{
-	if (p->pv.pm_intval > VETH_PORT_MON_INTERVAL){
-		p->pv.pm_intval = VETH_PORT_MON_INTERVAL;
-	}
-
-	if (!p->pv.pm_intval){
-		p->pv.pm_intval = VETH_PORT_MON_INTERVAL;
-		veth_port_mon(p);
-	} else {
-		p->pv.pm_intval--;
-	}
-	return;
-}
-
-/*--------- end of port status monitor ----*/
-
-static void veth_tick(unsigned long data)
-{
-	struct veth_timer *vt;
-	struct veth_port *p;
-	int i;
-
-
-	/* periodic machine and other timers */
-	for (i = 0, vt = vth; vt;i++, vt = vt->next){
-		if (vt->tick_func){
-			vt->tick_func(vt);
-		}
-	}
-
-	if (need_to_rebuild_opl){
-		sort_ports_by_pri();
-	}
-
-	for (i = 0; opl[i] && i < MAX_PHYIF; i++){
-
-		p = opl[i];
-
-		/* port status monitor */
-		veth_port_mon_tick(p);
-
-		/* receive machine */
-		veth_rcvm_tick(p);
-
-		/* mux machine */
-		veth_muxm_tick(p);
-
-		/* actor churn machine */
-		veth_acm_tick(p);
-
-		/* partner churn machine */
-		veth_pcm_tick(p);
-
-		/* periodic xmit machine */
-		veth_prm_tick(p);
-
-		/* xmit machine */
-		veth_xmit_tick(p);
-
-		/* selection logic */
-		veth_scan_ready_n(p);
-	}
-
-
-	for (p = veth_ports, i = 0; i < MAX_PHYIF; p++, i++){
-		if (!veth_ports[i].dev){
-			continue;
-		}
-		/* port deletion machine */
-		veth_port_del_tick(p);
-	}
-
-	tl.expires = jiffies + HZ/10; /* 100 msec */
-	add_timer(&tl);
-
-	return;
-}
-
-
-
-/*----------- aggregator parser (43.2.8.1) --------------------*/
-
-static struct veth_port *get_port_by_dev(struct net_device *dev)
-{
-	struct veth_port *p;
-	int i;
-	/* calculate port num */
-	for (i = 0, p = NULL; i < MAX_PHYIF; i++){
-		if (veth_ports[i].dev == dev){
-			p = veth_ports+i;
-			break;
-		}
-	}
-	return p;
-}
-		
-static void veth_aggregator_parser(struct sk_buff *skb, int b_slowp, struct net_device *dev)
-{
-	unsigned char *buf;
-	int b_subtype;
-	int agg;
-	struct veth_port *p;
-
-
-	buf = skb->mac.raw + ETH_HLEN;
-	b_subtype = (buf[0] == Marker_Subtype);
-
-	if (b_slowp && b_subtype && buf[2] == Marker_Information){
-		veth_marker_responder(skb, dev);
-	} else if (b_slowp && b_subtype && buf[2] == Marker_Response_Information){
-		veth_marker_receiver(skb, dev);
-	} else if (b_slowp && (buf[0] < 1 || 10 < buf[0])){
-		goto freeandout;
-	} else {
-		p = get_port_by_dev(dev);
-		if (!p)
-			/* corresponding port not found */
-			goto freeandout;
-	
-		/* calculate agg num */
-		agg = p->pv.actor_port_agg_id - 1;
-		if (agg < 0)
-			/* proper aggregator not assigned */
-			goto freeandout;
-
-		/* If the port state is not COLLECTING then discards this skb */
-		if (!p->pv.actor_oper_port_state & PS_COLLECTING)
-			goto freeandout;
-
-		veth_frame_collector(skb, veth_aggs[agg].dev);
-	}
-	return;
-
-freeandout:
-	kfree_skb(skb);
-	return;
-}
-
-static void veth_lacp(struct sk_buff *skb, struct net_device *dev)
-{
-
-	struct veth_port *p;
-	unsigned char *buf;
-	int pn = 0;
-
-	buf = skb->mac.raw + ETH_HLEN;
-
-	pn = dev_to_port_num(skb->dev);
-	if (!pn)
-		goto freeandout;
-
-	p = veth_ports + pn - 1;
-
-	if (p->pv.tbd_cnt)
-		goto freeandout;
-
-	p->rcvm.ring.buf[p->rcvm.ring.w] = kmalloc(LACPDU_LEN+ETH_HLEN+5, GFP_ATOMIC);
-	memcpy(p->rcvm.ring.buf[p->rcvm.ring.w++], buf, LACPDU_LEN+ETH_HLEN);
-	if (p->rcvm.ring.w == MAX_RING){
-		p->rcvm.ring.w = 0;
-		if (p->rcvm.ring.r == p->rcvm.ring.w){
-			/* Overwriting oldest entry.. This should not occur! */
-			p->rcvm.ring.r++;
-		}
-	}
-
-freeandout:
-	kfree_skb(skb);
-	return;
-}
-
-/* control parser (43.2.9.1.4) */
-static int veth_control_parser(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt)
-{
-	unsigned char *buf;
-	struct sk_buff *nskb;
-	int b_mac_addr;
-	int b_mac_type;
-
-	if (!skb)
-		return 1;
-
-	nskb = skb;
-	skb = skb_clone(nskb, GFP_ATOMIC);
-	kfree_skb(nskb);
-
-	if (!skb)
-		return 0;
-
-	buf = skb->mac.raw + ETH_HLEN;
-
-	if (VETH_DEBUG(VETH_DEBUG_CTLP, 1)){
-		printk(KERN_INFO "h_dest:%02x%02x%02x-%02x%02x%02x, h_proto:%04x, lacp-sub:%02x\n",
-			   skb->mac.ethernet->h_dest[0],
-			   skb->mac.ethernet->h_dest[1],
-			   skb->mac.ethernet->h_dest[2],
-			   skb->mac.ethernet->h_dest[3],
-			   skb->mac.ethernet->h_dest[4],
-			   skb->mac.ethernet->h_dest[5],
-			   skb->mac.ethernet->h_proto,
-			   buf[0]);
-	}
-
-	b_mac_addr = (memcmp(skb->mac.ethernet->h_dest, Slow_Protocols_Multicast, ETH_ALEN) == 0)?_TRUE:_FALSE;
-	b_mac_type = (skb->mac.ethernet->h_proto == Slow_Protocols_Type);
-
-	if (b_mac_addr && b_mac_type)
-		if (buf[0] == LACP_Subtype)
-			veth_lacp(skb, dev);
-		else
-			veth_aggregator_parser(skb, _TRUE, dev);
-	else
-		veth_aggregator_parser(skb, _FALSE, dev);
-
-	return 0;
-}
-
-/***************************************************************
- *              End of LACP
- ***************************************************************/
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-static struct packet_type veth_packet_type __initdata = {
-	__constant_htons(ETH_P_VETH),
-	NULL,           /* Listen to all devices */
-	veth_control_parser,
-	NULL,
-	NULL
-};
-#else
-static struct packet_type veth_packet_type = {
-	.type = __constant_htons(ETH_P_VETH),
-	.func = veth_control_parser,
-};
-#endif
-
-static inline void ic_veth_init(void)
-{
-	dev_add_pack(&veth_packet_type);
-}
-static inline void ic_veth_cleanup(void)
-{
-	dev_remove_pack(&veth_packet_type);
-}
-
-
-
-/*
- *  Open/initialize the i/f.  This is called (in the current kernel)
- *  sometime after booting when the 'ifconfig' program is run.
- */
-static int veth_open(struct net_device *dev)
-{
-	/* start transmitting */
-	netif_start_queue(dev);
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-	MOD_INC_USE_COUNT;
-#endif
-
-	return 0;
-}
-
-/* The inverse routine to veth_open (). */
-static int veth_close(struct net_device *dev)
-{
-
-	/* can't transmit any more */
-	netif_stop_queue(dev);
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-	MOD_DEC_USE_COUNT;
-#endif
-
-	return 0;
-}
-
-
-
-static struct net_device_stats *veth_get_stats(struct net_device *dev)
-{
-	struct veth_private *vp = (struct veth_private *)dev->priv;
-	struct net_device_stats *r = &vp->enet_stats;
-
-	return r;
-}
-
-static int veth_config(struct net_device *dev, struct ifmap *map)
-{
-	/*struct veth_private *vp = (struct veth_private *) dev->priv;*/
-
-	if (dev->flags & IFF_UP)
-		return -EBUSY;
-
-	return 0;
-}
-
-static int veth_change_mtu(struct net_device *dev, int new_mtu)
-{
-	struct veth_private *vp = (struct veth_private *) dev->priv;
-	struct veth_agg *ag;
-	struct veth_port *p;
-	int err;
-	int i, *pn;
-
-	ag = vp->agg;
-	pn = ag->av.lag_ports;
-
-	/* Check if all the ports allow new_mtu value */
-	for (err = 0, i = 0; *pn && (i < MAX_PHYIF); pn++, i++){
-		p = veth_ports + *pn - 1;
-		if (!veth_check_new_mtu(p->dev, new_mtu)){
-			printk(KERN_INFO "veth: Port \"%s\" does not allow MTU %d\n",
-				   dev->name, new_mtu);
-			err |= 1;
-		}
-	}
-
-	if (err){
-		printk(KERN_INFO "veth: Cannot change MTU. "
-			   "Because at least one port does not allow new MTU\n");
-		return -EINVAL;
-	}
-
-	/* Now make each port's MTU same as aggregator's one */
-	for (err = 0, i = 0; *pn && (i < MAX_PHYIF); pn++, i++){
-		p = veth_ports + *pn - 1;
-		p->dev->change_mtu(p->dev, new_mtu);
-	}
-
-	/* Now change given aggregator's MTU. */
-	ag->dev->mtu = new_mtu;
-	return 0;
-}
-
-
-static void veth_set_admin_port_vars(struct veth_port *p, unsigned short key)
-{
-	p->pv.actor_admin_port_key = p->pv.actor_oper_port_key = key;
-	p->pv.actor_admin_port_state = PS_DEFAULTED | PS_AGGREGATION;
-	p->pv.actor_oper_port_state |= PS_AGGREGATION;
-	p->pv.partner_admin_key = key;
-	memset(p->pv.partner_admin_sys, 0, ETH_ALEN);
-	p->pv.partner_admin_sys_pri = 0x8000;
-	p->pv.partner_admin_port_num = p->pv.actor_port_num;
-	p->pv.partner_admin_port_pri = 0x8000;
-	p->pv.partner_admin_port_state = PS_DEFAULTED | PS_SYNCHRONIZATION | PS_COLLECTING | PS_AGGREGATION | PS_LACP_TIMEOUT;
-	return;
-}
-
-static void veth_port_vars_init(struct veth_port *p)
-{
-	/* state machines */
-	p->rcvm.state = INITIALIZE;
-	p->acm.state = NO_ACTOR_CHURN;
-	p->pcm.state = NO_PARTNER_CHURN;
-	p->muxm.state = DETACHED;
-	p->prm.state = NO_PERIODIC;
-
-	p->rcvm.do_it = _TRUE;
-	p->acm.do_it = _TRUE;
-	p->pcm.do_it = _TRUE;
-	p->muxm.do_it = _TRUE;
-	p->prm.do_it = _TRUE;
-
-	p->pv.tbd_cnt = 0;
-	p->pv.selected = UNSELECTED;
-
-	p->avrlen = 750;
-}
-
-
-/*
- * ioctl() support functions
- */
-static int veth_get_group_id_by_name(char *name)
-{
-	int i;
-
-	if (!name)
-		goto exit;
-
-	for (i = 0; i < MAX_PHYIF; i++)
-		if (veth_aggs[i].dev && veth_aggs[i].dev->name)
-			if ((strcmp(veth_aggs[i].dev->name, name) == 0))
-				return i+1;
-
-exit:
-	return 0; /* fail */
-}
-
-static int veth_get_port_id_by_name(char *ifname)
-{
-	int i;
-
-	if (!ifname || strlen(ifname) > MAX_NAME)
-		goto exit;
-
-	/* scan physical i/f name */
-	for (i = 0; i < MAX_PHYIF; i++)
-		if (veth_ports[i].dev && veth_ports[i].dev->name)
-			if (strcmp(veth_ports[i].dev->name, ifname) == 0)
-				return i+1; /* found */
-
-exit:
-	return 0; /* not found */
-}
-
-
-static int veth_get_vacant_veth_port(void)
-{
-	int i;
-
-	for (i = 0; i < MAX_PHYIF; i++)
-		if (!veth_ports[i].dev)
-			return i+1;
-
-	return 0;
-}
-
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
-static int veth_catch_device(struct veth_port *p, char *ifname)
-#else
-static int veth_catch_device(struct veth_port *p, char *ifname, char *modname)
-#endif
-{
-	int ret;
-
-	ret = -EFAULT;
-	if (!p || !ifname){
-		goto exit;
-	}
-	ret = -ENODEV;
-	if (strlen(ifname) > MAX_NAME)
-		goto exit;
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-	ret = -EFAULT;
-	if (!modname){
-		goto exit;
-	}
-	ret = -ENODEV;
-	if (strlen(modname) > MAX_MODNAME)
-		goto exit;
-#endif
-
-	memset(p, 0, sizeof(struct veth_port));
-
-	/* remember this locks device in 2.4 */
-	p->dev = dev_get_by_name(ifname);
-	if (!p->dev)
-		goto exit;		/* invalid ifname */
-
-	if (p->dev->intercepted_ptype ||
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
-		p->dev->br_port){
-		dev_put(p->dev);
-#else
-		p->dev->bridge_port_id){
-#endif
-		p->dev = NULL;
-		goto exit;		/* already used by a virtual device driver */
-	}
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-	if (modname && modname[0]){
-		strcpy(p->module_name, modname);
-		__MOD_INC_USE_COUNT(find_module(p->module_name));
-	} else {
-		p->module_name[0] = '\0';
-	}
-#endif
-
-	p->dev->intercepted_ptype = ETH_P_VETH;
-
-	/* make the interface to promiscuous mode */
-	dev_set_promiscuity(p->dev, 1);
-#if 0
-	/* Demand loaded and "unused" device driver 
-	 * module causes OOPS even though 
-	 * set_multicast_list is not NULL!!! */
-	if (p->dev->set_multicast_list != NULL){
-		p->dev->set_multicast_list(p->dev);
-	}
-#endif
-
-	ret = 0;
-exit:
-	return ret;
-}
-
-static int veth_release_device(struct veth_port *p)
-{
-	if (!p)
-		return -EFAULT;
-
-	p->pv.selected = UNSELECTED;
-	p->pv.tbd_cnt = 7; /* delete this phyif 7 ticks later... */
-
-	return 0;
-}
-
-/* add physical i/f to pool */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-static int veth_add_phyif(char *ifname, char *modname, unsigned short key)
-#else
-static int veth_add_phyif(char *ifname, unsigned short key)
-#endif
-{
-	int i;
-	struct veth_port *p;
-	int ret;
-
-	ret = -EFAULT;
-	if (!ifname)
-		goto exit;
-
-	ret = -ENODEV;
-	if (strlen(ifname) > MAX_NAME)
-		goto exit;
-
-	/* We cannot add a veth i/f to veth
-	 * We cannot add a phy i/f already registered
-	 * search for vacant veth_ports entry */
-	if (veth_get_group_id_by_name(ifname) ||
-		veth_get_port_id_by_name(ifname) ||
-		!(i = veth_get_vacant_veth_port()))
-		goto exit;
-
-	p = veth_ports+i-1;
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-	if (veth_catch_device(p, ifname, modname))
-#else
-	if (veth_catch_device(p, ifname))
-#endif
-		goto exit;
-
-	if (i == 1){
-		memcpy(veth_sysvar.actor_sys, p->dev->dev_addr, ETH_ALEN);
-		veth_sysvar.actor_sys_pri = 0x8000;
-	}
-
-	p->pv.begin = _TRUE;
-
-	/* register timers */
-
-	veth_clear_timer(&(p->current_while_timer));
-	veth_clear_timer(&(p->actor_churn_timer));
-	veth_clear_timer(&(p->periodic_timer));
-	veth_clear_timer(&(p->partner_churn_timer));
-	veth_clear_timer(&(p->wait_while_timer));
-	veth_clear_timer(&(p->xmit_timer));
-	
-	veth_register_timer(&(p->current_while_timer));
-	veth_register_timer(&(p->actor_churn_timer));
-	veth_register_timer(&(p->periodic_timer));
-	veth_register_timer(&(p->partner_churn_timer));
-	veth_register_timer(&(p->wait_while_timer));
-	veth_register_timer(&(p->xmit_timer));
-
-	veth_port_vars_init(p);
-	
-	p->pv.actor_port_num = i;
-	p->pv.actor_port_pri = 0x8000;
-	need_to_rebuild_opl = _TRUE;
-	
-	p->pv.lacp_ena = _TRUE;
-	
-	veth_set_admin_port_vars(p, key);
-	
-	/* start state machines */
-	p->pv.begin = _FALSE;
-	
-	ret = 0;
-
-exit:
-	return ret;
-}
-
-
-/* delete physical i/f from pool */
-static int veth_del_phyif(char *ifname)
-{
-	int i;
-	struct veth_port *p;
-	int ret;
-
-	ret = -EFAULT;
-	if (!ifname)
-		goto exit;
-
-	ret = -ENODEV;
-	if (strlen(ifname) > MAX_NAME)
-		goto exit;
-
-	/* We cannot delete a veth i/f 
-	 * We cannot delete a phy i/f not registered */
-	if (veth_get_group_id_by_name(ifname) ||
-		!(i = veth_get_port_id_by_name(ifname)))
-		goto exit;
-
-	p = veth_ports+i-1;
-	veth_release_device(p);
-
-	ret = 0;
-
-exit:
-	return ret;
-}
-
-static int veth_get_agg_info(struct u_agg_info *u, char *vif_name)
-{
-	int i;
-	struct veth_agg *ag;
-	struct u_agg_info ku;
-	int ret;
-
-	ret = -EFAULT;
-	if (!vif_name || !u)
-		goto exit;
-
-	ret = -ENODEV;
-	if (strlen(vif_name) > MAX_NAME)
-		goto exit;
-
-	ret = -EFAULT;
-	for (i = 0, ag = veth_aggs; i < MAX_VETH && ag->dev; i++, ag++){
-		if (strcmp(ag->dev->name, vif_name) == 0){
-			memcpy(ku.agg_mac, ag->av.agg_mac, ETH_ALEN);
-			ku.agg_id = ag->av.agg_id;
-			ku.ind_agg = ag->av.ind_agg;
-			ku.actor_admin_agg_key = ag->av.actor_admin_agg_key;
-			ku.actor_oper_agg_key = ag->av.actor_oper_agg_key;
-			memcpy(ku.partner_sys, ag->av.partner_sys, ETH_ALEN);
-			ku.partner_sys_pri = ag->av.partner_sys_pri;
-			ku.partner_oper_agg_key = ag->av.partner_oper_agg_key;
-			ku.ready = ag->av.ready;
-			ku.distmode = ag->distmode;
-
-			if (copy_to_user(u, &ku, sizeof(struct u_agg_info)))
-				goto exit;
-
-			ret = sizeof(struct u_agg_info);
-			goto exit;
-		}
-	}
-	ret = -ENODEV;
-
-exit:
-	return ret;
-}
-
-static int veth_set_agg_info(struct u_agg_info *u, char *vif_name)
-{
-	int i;
-	struct veth_agg *ag;
-	struct u_agg_info ku;
-	int ret;
-
-	ret = -EFAULT;
-	if (!vif_name || !u)
-		goto exit;
-
-	ret = -ENODEV;
-	if (strlen(vif_name) > MAX_NAME)
-		goto exit;
-
-	ret = -EFAULT;
-	if (copy_from_user(&ku, u, sizeof(struct u_agg_info)))
-		goto exit;
-
-	for (i = 0, ag = veth_aggs; i < MAX_VETH && ag->dev; i++, ag++){
-		if (strcmp(ag->dev->name, vif_name) == 0){
-			ag->av.actor_admin_agg_key = ku.actor_admin_agg_key;
-			ag->distmode = ku.distmode;
-
-			ret = sizeof(struct u_agg_info);
-			goto exit;
-		}
-	}
-	ret = -ENODEV;
-
-exit:
-	return ret;
-}
-
-
-
-
-static int veth_get_port_info(struct u_port_info *u, char *pif_name)
-{
-	int i;
-	struct veth_port *p;
-	struct u_port_info ku;
-	int ret;
-
-	ret = -EFAULT;
-	if (!pif_name || !u)
-		goto exit;
-
-	ret = -ENODEV;
-	if (strlen(pif_name) > MAX_NAME)
-		goto exit;
-
-	ret = -EFAULT;
-	for (i = 0, p = veth_ports; i < MAX_PHYIF; i++, p++){
-		if (p->dev && (strcmp(p->dev->name, pif_name) == 0)){
-			ku.actor_port_num = p->pv.actor_port_num;
-			ku.actor_port_pri = p->pv.actor_port_pri;
-			ku.actor_port_agg_id = p->pv.actor_port_agg_id;
-			ku.actor_admin_port_key = p->pv.actor_admin_port_key;
-			ku.actor_oper_port_key = p->pv.actor_oper_port_key;
-			ku.actor_admin_port_state = p->pv.actor_admin_port_state;
-			ku.actor_oper_port_state = p->pv.actor_oper_port_state;
-
-			memcpy(ku.partner_admin_sys, p->pv.partner_admin_sys, ETH_ALEN);
-			memcpy(ku.partner_oper_sys, p->pv.partner_oper_sys, ETH_ALEN);
-			ku.partner_admin_sys_pri = p->pv.partner_admin_sys_pri;
-			ku.partner_oper_sys_pri = p->pv.partner_oper_sys_pri;
-			ku.partner_admin_key = p->pv.partner_admin_key;
-			ku.partner_oper_key = p->pv.partner_oper_key;
-			ku.partner_admin_port_num = p->pv.partner_admin_port_num;
-			ku.partner_oper_port_num = p->pv.partner_oper_port_num;
-			ku.partner_admin_port_pri = p->pv.partner_admin_port_pri;
-			ku.partner_oper_port_pri = p->pv.partner_oper_port_pri;
-			ku.partner_admin_port_state = p->pv.partner_admin_port_state;
-			ku.partner_oper_port_state = p->pv.partner_oper_port_state;
-
-			ku.selected = p->pv.selected;
-
-			if (copy_to_user(u, &ku, sizeof(struct u_port_info)))
-				goto exit;
-
-			ret = sizeof(struct u_port_info);
-			goto exit;
-		}
-	}
-	ret = -ENODEV;
-
-exit:
-	return ret;
-}
-
-
-static int veth_set_port_info(struct u_port_info *u, char *pif_name)
-{
-	int i;
-	struct veth_port *p;
-	struct u_port_info ku;
-	int ret;
-
-	ret = -EFAULT;
-	if (!pif_name || !u)
-		goto exit;
-
-	ret = -ENODEV;
-	if (strlen(pif_name) > MAX_NAME)
-		goto exit;
-
-	ret = -EFAULT;
-	if (copy_from_user(&ku, u, sizeof(struct u_port_info)))
-		goto exit;
-
-	for (i = 0, p = veth_ports; i < MAX_PHYIF; i++, p++){
-		if (p->dev && (strcmp(p->dev->name, pif_name) == 0)){
-			p->pv.actor_admin_port_key = ku.actor_admin_port_key;
-			p->pv.selected = UNSELECTED;
-			p->pv.actor_admin_port_state = ku.actor_admin_port_state;
-			memcpy(p->pv.partner_admin_sys, ku.partner_admin_sys, ETH_ALEN);
-			p->pv.partner_admin_sys_pri = ku.partner_admin_sys_pri;
-			p->pv.partner_admin_key = ku.partner_admin_key;
-			p->pv.partner_admin_port_num = ku.partner_admin_port_num;
-			p->pv.partner_admin_port_pri = ku.partner_admin_port_pri;
-			p->pv.partner_admin_port_state = ku.partner_admin_port_state;
-
-			ret = sizeof(struct u_port_info); /* success */
-			goto exit;
-		}
-	}
-	ret = -ENODEV;
-
-exit:
-	return ret;
-}
-
-
-static int veth_get_version(struct u_drv_info *u)
-{
-	struct u_drv_info ku;
-
-	if (!u)
-		return -EFAULT;
-
-	ku.major = VETH_VER_MAJOR;
-	ku.minor = VETH_VER_MINOR;
-	ku.patch = VETH_VER_PATCH;
-	strcpy(ku.name, "VETH");
-	strcpy(ku.author, "Yumo (Katsuyuki Yumoto)");
-
-	if (copy_to_user(u, &ku, sizeof(struct u_drv_info)))
-		return -EFAULT;
-
-	return sizeof(struct u_drv_info);
-}
-
-static int veth_ioctl_dispatch(struct vethconf *vc)
-{
-	int n;
-	int ret = 0;
-
-	if (!vc)
-		return -EFAULT;
-
-	switch (vc->action){
-	case VETHCTL_VERSION:
-		n = veth_get_version((struct u_drv_info *)vc->buf);
-		(n < 0)?  (ret = n) : (vc->size = n);
-		break;
-
-	case VETHCTL_ADD_PHYIF:
-		{
-			struct u_port_info *u = (struct u_port_info *)vc->buf;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-			ret = veth_add_phyif(vc->pif_name, vc->pif_module, u->actor_admin_port_key);
-#else
-			ret = veth_add_phyif(vc->pif_name, u->actor_admin_port_key);
-#endif
-		}
-		break;
-
-	case VETHCTL_DEL_PHYIF:
-		ret = veth_del_phyif(vc->pif_name);
-		break;
-
-	case VETHCTL_GET_AGG_INFO:
-		n = veth_get_agg_info((struct u_agg_info *)vc->buf, vc->vif_name);
-		(n < 0)? (ret = n) : (vc->size = n);
-		break;
-
-	case VETHCTL_SET_AGG_INFO:
-		n = veth_set_agg_info((struct u_agg_info *)vc->buf, vc->vif_name);
-		(n < 0)? (ret = n) : (vc->size = n);
-		break;
-
-	case VETHCTL_GET_PORT_INFO:
-		n = veth_get_port_info((struct u_port_info *)vc->buf, vc->pif_name);
-		(n < 0)? (ret = n) : (vc->size = n);
-		break;
-
-	case VETHCTL_SET_PORT_INFO:
-		n = veth_set_port_info((struct u_port_info *)vc->buf, vc->pif_name);
-		(n < 0)? (ret = n) : (vc->size = n);
-		break;
-
-	default:
-		ret = -EOPNOTSUPP;
-		break;
-	}
-
-	return ret;
-}
-
-static int veth_ioctl(struct net_device *adev, struct ifreq *rq, int cmd)
-{
-	struct mii_ioctl_data *data;
-
-	if (!adev || !rq || !rq->ifr_data)
-		return -EFAULT;
-
-	data = (struct mii_ioctl_data *)&rq->ifr_data;
-
-	if (cmd == SIOCDEVPRIVATE){
-		struct vethconf *vc = (struct vethconf *) rq->ifr_data;
-		struct vethconf kvc;
-		if (!copy_from_user(&kvc, vc, sizeof(struct vethconf)) &&
-			(kvc.magic == VETH_MAGIC))
-			return veth_ioctl_dispatch(vc);
-		/* else
-		 *    fall through to keep ioctl() compatibility
-		 *    with many ethernet device drivers. They provides
-		 *    MII functions commonly using SIOCDEVPRIVATE space. */
-	}
-	switch (cmd){
-		case SIOCGMIIPHY:
-			data->phy_id = 0;	
-		case SIOCGMIIREG:
-			printk("adev->name = %s\n", adev->name);
-			data->val_out = get_agg_link_stat(adev);
-			break;
-		default:
-			return -EOPNOTSUPP;
-	}
-	return 0;
-}
-
-static int inline veth_searchfor(int list[], int a)
-{
-	int i;
-	for (i = 0; i < MAX_VETH && list[i] != -1; i++) {
-		if (list[i] == a) return 1;
-	}
-	return 0;
-}
-
-
-
-
-/* Write the buffer (contents of the port statuses) to a PROCfs file */
-
-static char *state2str_mux(enum muxm_state s)
-{
-	switch (s){
-	case DETACHED:
-		return "DETCH";
-	case WAITING:
-		return "WAIT";
-	case ATTACHED:
-		return "ATTACH";
-	case COLLECTING:
-		return "COLL";
-	case DISTRIBUTING:
-		return "DIST";
-	}
-	return NULL;
-}
-
-static char *state2str_rcv(enum rcvm_state s)
-{
-	switch (s){
-	case INITIALIZE:
-		return "INIT";
-	case PORT_DISABLED:
-		return "P_DIS";
-	case EXPIRED:
-		return "EXPIRE";
-	case LACP_DISABLED:
-		return "L_DIS";
-	case DEFAULTED:
-		return "DEFLT";
-	case CURRENT:
-		return "CURRNT";
-	}
-	return NULL;
-}
-
-static char *state2str_pr(enum perio_state s)
-{
-	switch (s){
-	case NO_PERIODIC:
-		return "NO_PER";
-	case FAST_PERIODIC:
-		return "FAST_P";
-	case SLOW_PERIODIC:
-		return "SLOW_P";
-	case PERIODIC_TX:
-		return "PER_TX";
-	}
-	return NULL;
-}
-
-#if 0
-static char *state2str_ac(enum acm_state s)
-{
-	switch (s){
-	case NO_ACTOR_CHURN:
-		return "NO_ACT";
-	case ACTOR_CHURN_MONITOR:
-		return "AC_MON";
-	case ACTOR_CHURN:
-		return "ACT_CHU";
-	}
-	return NULL;
-}
-
-
-static char *state2str_pc(enum pcm_state s)
-{
-	switch (s){
-	case NO_PARTNER_CHURN:
-		return "NO_PTN";
-	case PARTNER_CHURN_MONITOR:
-		return "PC_MON";
-	case PARTNER_CHURN:
-		return "PTN_CHU";
-	}
-	return NULL;
-}
-#endif
-
-static int sprintf_a_line(char *buf, struct veth_port *p)
-{
-	int len;
-	int j;
-	unsigned char uc;
-	char c;
-
-	j = p->pv.actor_port_agg_id-1;
-
-	if (p->pv.selected == UNSELECTED){
-		c = 'U';
-	} else if (p->pv.selected == STANDBY){
-		c = 'B';
-	} else if (p->pv.selected == SELECTED){
-		c = 'S';
-	} else {
-		c = '?';
-	}
-	len =  sprintf(buf, "%c%5s", c, p->dev->name);
-	len += sprintf(buf+len, "%6s", (j >= 0)?veth_aggs[j].dev->name:"none");
-	len += sprintf(buf+len, "  %04x", p->pv.actor_oper_port_key);
-	len += sprintf(buf+len, "  %04x", p->pv.partner_oper_key);
-	len += sprintf(buf+len, " %02x%02x%02x%02x%02x%02x",
-				p->pv.partner_oper_sys[0],
-				p->pv.partner_oper_sys[1],
-				p->pv.partner_oper_sys[2],
-				p->pv.partner_oper_sys[3],
-				p->pv.partner_oper_sys[4],
-				p->pv.partner_oper_sys[5]);
-	len += sprintf(buf+len, "%8s", state2str_mux(p->muxm.state));
-	len += sprintf(buf+len, "%8s", state2str_rcv(p->rcvm.state));
-	len += sprintf(buf+len, "%8s", state2str_pr(p->prm.state));
-
-	uc = p->pv.actor_oper_port_state;
-	len += sprintf(buf+len, " %c%c%c%c%c%c%c%c",
-				   uc&1?'L':'_',
-				   uc&2?'T':'_',
-				   uc&4?'A':'_',
-				   uc&8?'S':'_',
-				   uc&16?'C':'_',
-				   uc&32?'D':'_',
-				   uc&64?'F':'_',
-				   uc&128?'E':'_'
-				   );
-	uc = p->pv.partner_oper_port_state;
-	len += sprintf(buf+len, " %c%c%c%c%c%c%c%c\n",
-				   uc&1?'L':'_',
-				   uc&2?'T':'_',
-				   uc&4?'A':'_',
-				   uc&8?'S':'_',
-				   uc&16?'C':'_',
-				   uc&32?'D':'_',
-				   uc&64?'F':'_',
-				   uc&128?'E':'_'
-				   );
-	return len;
-}
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-static int veth_get_info(char *pbuf, char **start, off_t offset, int length, int unused)
-#else
-static int veth_get_info(char *pbuf, char **start, off_t offset, int length)
-#endif
-{
-#define LIMIT (PAGE_SIZE-80);
-
-	int size;
-	int len = 0;
-	int i;
-
-	if(!offset){
-		/* first time write the header */
-		size = sprintf(pbuf,"%s","S Port   Agg A_KEY P_KEY  PARTNER_SYS     MUX    RECV   PERIO   A_STAT   P_STAT\n");
-		len = size;
-	}
-
-	for (i = 0; i < MAX_PHYIF; i++){
-		if (veth_ports[i].dev){
-			len += sprintf_a_line(pbuf+len, veth_ports+i);
-		}
-	}
-
-	if (len > PAGE_SIZE-80){
-		len = PAGE_SIZE-80;
-	}
-
-	return len;
-}
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-#ifdef CONFIG_PROC_FS
-struct proc_dir_entry proc_net_veth= {
-	0, 4, "veth",
-	S_IFREG | S_IRUGO, 1, 0, 0,
-	0, &proc_net_inode_operations,
-	veth_get_info
-};
-#endif
-#endif
-
-
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-void cleanup_module(void)
-#else
-static void __exit veth_cleanup_module(void)
-#endif
-{
-	int i;
-
-	for (i = 0; i < MAX_PHYIF; i++){
-		if (veth_ports[i].dev){
-			/* make the physical i/f's non-promiscuous mode */
-			dev_set_promiscuity(veth_ports[i].dev, -1);
-			
-			if (veth_ports[i].dev->set_multicast_list != NULL){
-				veth_ports[i].dev->set_multicast_list(veth_ports[i].dev);
-			}
-			veth_ports[i].dev->intercepted_ptype = 0;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
-			dev_put(veth_ports[i].dev);
-#endif
-		}
-	}
-
-	for (i = 0; i < MAX_VETH; i++) {
-		if (veth_aggs[i].dev) {
-			unregister_netdev(veth_aggs[i].dev);
-
-			kfree(veth_aggs[i].dev->priv);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-			kfree(veth_aggs[i].dev->name);
-#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-			kfree(veth_aggs[i].dev);
-#else
-			free_netdev(veth_aggs[i].dev);
-#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-			if (veth_ports[i].module_name[0]){
-				__MOD_DEC_USE_COUNT(find_module(veth_ports[i].module_name));
-				veth_ports[i].module_name[0] = '\0';
-			}
-#endif
-			veth_aggs[i].dev = NULL;
-		}
-	}
-
-	del_timer(&tl);
-#ifdef CONFIG_PROC_FS
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-	proc_net_unregister(proc_net_veth.low_ino);
-#else
-	proc_net_remove("veth");
-#endif
-#endif
-
-	/* remove packet handler */
-	ic_veth_cleanup();
-
-}
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-#define veth_init  init_module
-#endif
-
-static int veth_init_agg(int agn)
-{
-	struct veth_private *vp;
-	struct veth_agg *ag;
-	int i;
-
-	i = agn;
-	ag = veth_aggs + i;
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-	ag->dev = kmalloc(sizeof(struct net_device),  GFP_KERNEL);
-#else
-	ag->dev = alloc_etherdev(sizeof(struct net_device));
-#endif
-	if (!ag->dev) {
-		printk(KERN_ERR "veth: out of memory.\n");
-		return -ENOMEM;
-	}
-	
-	memset(ag->dev, 0, sizeof(struct net_device));
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-	ag->dev->name = kmalloc(strlen("vethXXX"), GFP_KERNEL);
-	
-	if (!ag->dev->name) {
-		printk(KERN_ERR "veth: out of memory.\n");
-		kfree(ag->dev);
-		ag->dev = NULL;
-		return -ENOMEM;
-	}
-#endif	
-	sprintf(ag->dev->name, "veth%d", i);
-
-
-	/* Set the private structure */
-
-	vp = ag->dev->priv = 
-		(struct veth_private *)kmalloc(sizeof(struct veth_private), GFP_KERNEL);
-	
-	if (vp == NULL) {
-		printk(KERN_ERR "%s: out of memory.\n", ag->dev->name);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-		kfree(ag->dev->name);
-#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-		kfree(ag->dev);
-#else
-		free_netdev(ag->dev);
-#endif
-		ag->dev = NULL;
-		return -ENOMEM;
-	}
-	memset(vp, 0, sizeof(struct veth_private));
-	vp->agg = veth_aggs+i;
-	ag->av.actor_admin_agg_key = (i+1) << 8;
-
-
-	/* Fill in the generic fields of the device structure. */
-	ether_setup(ag->dev);
-
-	/* Then, override parts of it */
-	ag->dev->hard_start_xmit	= veth_frame_distribution;
-	ag->dev->open		= veth_open;
-	ag->dev->stop		= veth_close;
-	ag->dev->get_stats 		= veth_get_stats;
-	ag->dev->set_config		= veth_config;
-	ag->dev->change_mtu	= veth_change_mtu;
-	ag->dev->do_ioctl		= veth_ioctl;
-	memset(ag->dev->dev_addr, 0xfc, ETH_ALEN/2);
-	ag->dev->dev_addr[ETH_ALEN-1] = i+1;
-	memcpy(ag->av.agg_mac, ag->dev->dev_addr, ETH_ALEN);
-	ag->av.agg_id = i+1;
-	ag->dev->tx_queue_len = 0;
-
-	ag->count = 0;
-	ag->distmode = DIST_TCPUDPHASH;
-	memset(ag->dht, 0, 32*sizeof(struct dist_hash_table *));
-	ag->lock = SPIN_LOCK_UNLOCKED;
-
-	return 0;
-}
-
-/* 
- * Entry point of VETH driver.
- * Register/initialize the driver.
- */
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-__initfunc(int veth_init(void))
-#else
-static int __init veth_init_module(void)
-#endif
-{
-	int i;
-	int ret;
-
-	printk(KERN_INFO "VETH %d.%d.%d Yumo (Katsuyuki Yumoto) yumo@st.rim.or.jp\n",
-		   VETH_VER_MAJOR, VETH_VER_MINOR, VETH_VER_PATCH);
-
-	for (i = 0; i < MAX_VETH; i++){
-		veth_aggs[i].dev = NULL;
-	}
-
-	for (i = 0; i < MAX_PHYIF; i++){
-		veth_ports[i].dev = NULL;
-	}
-
-	/* nveth comes from module parameter and it is default to 1 */
-	for (i = 0; i < nveth; i++){
-
-		ret = veth_init_agg(i);
-		if (ret){
-			printk(KERN_INFO "veth: no devices registered\n");
-			return ret;
-		}
-
-		ret = register_netdev(veth_aggs[i].dev);
-		if (ret){
-			printk(KERN_INFO "veth: no devices registered\n");
-			return ret;
-		}
-	}
-
-	init_timer(&tl);
-	tl.expires = jiffies + HZ/10; /* 100 msec */
-	tl.function = veth_tick;
-	add_timer(&tl);
-	
-#ifdef CONFIG_PROC_FS
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-	proc_net_register(&proc_net_veth);
-#else
-	proc_net_create("veth", 0, veth_get_info);
-#endif
-#endif
-
-	/* packet handler registration for receiving */
-	ic_veth_init();
-
-	return 0;
-}
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
-module_init(veth_init_module);
-module_exit(veth_cleanup_module);
-
-MODULE_LICENSE("GPL");
-#endif
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-#include <linux/vermagic.h>
-#include <linux/compiler.h>
-MODULE_INFO(vermagic, VERMAGIC_STRING);
-MODULE_DESCRIPTION("IEEE 802.3ad link aggregation driver");
-MODULE_AUTHOR("Katsuyuki Yumoto");
-#endif
-/*
- * Local variables:
- * compile-command: "gcc -DMODULE -DMODVERSIONS -D__KERNEL__ -Wall -Wstrict-prototypes -O2 -g -fomit-frame-pointer -pipe -c veth.c"
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- *  indent-tabs-mode: t
- * End:
- */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/veth/veth.h linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/veth/veth.h
--- linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/veth/veth.h	2004-06-29 11:25:30.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/veth/veth.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,488 +0,0 @@
-/* $Id: veth.h,v 1.20 2004/03/03 14:16:33 yumo Exp $ */
-/* VETH: A virtual ethernet device driver for Linux header file. 
- *
- * This device driver is an implementation of Aggregation of Multiple
- * Link Segments (IEEE 802.3ad).
- *
- * Author: Yumo (Katsuyuki Yumoto) 2000-2004
- *         yumo@st.rim.or.jp
- *
- * 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  02111-1307, USA.
- */
-
-#ifndef VETH_H
-#define VETH_H
-
-/* Maximum number of devices to support. */
-#define MAX_VETH  8
-#define MAX_PHYIF 8
-
-#define VETH_VER_MAJOR 0
-#define VETH_VER_MINOR 6
-#define VETH_VER_PATCH 3
-
-#define VETH_MAGIC 0x3be5
-
-/* actions */
-#define VETHCTL_ADD_PHYIF 1
-#define VETHCTL_DEL_PHYIF 2
-#define VETHCTL_GET_PORT_INFO 3
-#define VETHCTL_SET_PORT_INFO 4
-#define VETHCTL_GET_AGG_INFO 5
-#define VETHCTL_SET_AGG_INFO 6
-#define VETHCTL_VERSION 7
-
-#define SUBKEY_UNKNOWN 0
-#define SUBKEY_10M 1
-#define SUBKEY_100M 2
-#define SUBKEY_1000M 3
-
-#define SUBKEY_MASK_UPPER 0xff00
-#define SUBKEY_MASK_LOWER 0x00ff
-
-	/* 43.4.2.2 */
-#define PS_LACP_ACTIVITY    0x1
-#define PS_LACP_TIMEOUT     0x2
-#define PS_AGGREGATION      0x4
-#define PS_SYNCHRONIZATION  0x8
-#define PS_COLLECTING      0x10
-#define PS_DISTRIBUTING    0x20
-#define PS_DEFAULTED       0x40
-#define PS_EXPIRED         0x80
-
-
-/* Distributing Algorithm */
-#define DIST_TCPUDPHASH 0x1
-#define DIST_ROUNDROBIN 0x2
-
-enum selected_val {
-		SELECTED,
-		UNSELECTED,
-		STANDBY
-};
-
-struct u_port_info
-{
-	unsigned short actor_port_num; /* this is the port # assigned to this port */
-	unsigned short actor_port_pri;
-	int actor_port_agg_id;
-	unsigned short actor_admin_port_key;
-	unsigned short actor_oper_port_key;
-	unsigned char actor_admin_port_state;
-	unsigned char actor_oper_port_state;
-
-	unsigned char partner_admin_sys[ETH_ALEN];
-	unsigned char partner_oper_sys[ETH_ALEN];
-	unsigned short partner_admin_sys_pri;
-	unsigned short partner_oper_sys_pri;
-	unsigned short partner_admin_key;
-	unsigned short partner_oper_key;
-	unsigned short partner_admin_port_num;
-	unsigned short partner_oper_port_num;
-	unsigned short partner_admin_port_pri;
-	unsigned short partner_oper_port_pri;
-	unsigned char partner_admin_port_state;
-	unsigned char partner_oper_port_state;
-
-	enum selected_val selected;
-};
-
-
-struct u_agg_info
-{
-	unsigned char agg_mac[ETH_ALEN];
-	int agg_id;
-	int ind_agg;
-	int actor_admin_agg_key;
-	int actor_oper_agg_key;
-	unsigned char partner_sys[ETH_ALEN];
-	int partner_sys_pri;
-	int partner_oper_agg_key;
-	int ready; /* calculated from ready_N of each port */
-
-	unsigned long distmode;
-};
-
-
-struct u_drv_info {
-	unsigned char major;
-	unsigned char minor;
-	unsigned char patch;
-	char name[20]; /* driver name */
-	char author[50];
-};
-
-
-
-/* vethconf is used for adding or removing physical i/f to/from
-   virtual i/f by using ioctl() */
-
-struct vethconf {
-	unsigned short magic;
-	int action;
-
-	char pif_name[8];
-	char vif_name[8];
-	char pif_module[40];
-	unsigned int size;
-	unsigned char *buf;
-};
-
-#ifdef __KERNEL__
-/* debug section */
-#define VETH_DEBUG_LEVEL_MASK 0xf
-#define VETH_DEBUG_RCVM 0x1 << 4
-#define VETH_DEBUG_MUXM 0x2 << 4
-#define VETH_DEBUG_CHUM 0x4 << 4
-#define VETH_DEBUG_PERM 0x8 << 4
-#define VETH_DEBUG_SEL  0x10 << 4
-#define VETH_DEBUG_CTLP 0x20 << 4
-
-#define VETH_DEBUG_NONE 0x0
-#define VETH_DEBUG_ALL  0xfffffff0
-#define VETH_DEBUG_STATE VETH_DEBUG_RCVM | VETH_DEBUG_MUXM | VETH_DEBUG_CHUM | VETH_DEBUG_PERM
-
-static unsigned int veth_debug = VETH_DEBUG_NONE;
-
-#define VETH_DEBUG(x,y) (((x)&veth_debug)&&((VETH_DEBUG_LEVEL_MASK&veth_debug)>=(y)))
-/* end of debug section */
-
-
-/* Linux version dependency */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-/* for 2.2.x */
-#define netdevice_start(dev) dev->start = 1
-#define netdevice_stop(dev) dev->start = 0
-#define netif_start_queue(dev) dev->tbusy = 0
-#define netif_stop_queue(dev) dev->tbusy = 1
-#define net_device device
-#define dev_get_by_name dev_get
-#else
-#define netdevice_start(dev)
-#define netdevice_stop(dev)
-#endif
-
-
-
-/* Distributing Algorithm */
-#define DIST_TCPIPHASH 0x1
-#define DIST_ROUNDROBIN 0x2
-
-
-
-/* IEEE 802.3ad constants */
-
-typedef enum _bool {
-	_TRUE = 1,
-	_FALSE = 0
-}bool;
-
-static char Slow_Protocols_Multicast[ETH_ALEN] = {0x01,0x80,0xc2,0x00,0x00,0x02}; /* Tbl 43B-1 */
-static unsigned short Slow_Protocols_Type = __constant_htons(0x8809); /* Tbl 43B-2 */
-
-static unsigned char Marker_Subtype = 0x2; /* 43.2.7.1.1 */
-static unsigned char LACP_Subtype = 0x1; /* 43.2.9.1.1 */
-static unsigned char LACP_Version = 0x1; /* 43.4.2.2 */
-
-static unsigned char Marker_Information = 0x1; /* 43.2.7.1.1 */
-static unsigned char Marker_Response_Information = 0x2; /* 43.2.7.1.1 */
-
-
-/* 43.4.2.2 (LACPDU structure) */
-struct lacpdu {
-	u8 subtype; /* 0 */
-	u8 version_number; /* 1 */
-	u8 first_tlv_type; /* 2 */
-	u8 actor_info_len; /* 3 */
-	u16 actor_sys_pri; /* 4 */
-	u8 actor_sys[ETH_ALEN]; /* 6 */
-	u16 actor_key; /* 12 */
-	u16 actor_port_pri; /* 14 */
-	u16 actor_port; /* 16 */
-	u8 actor_state; /* 18 */
-	u8 pad1[3];
-	u8 second_tlv_type; /* 22 */
-	u8 partner_info_len; /* 23 */
-	u16 partner_sys_pri; /* 24 */
-	u8 partner_sys[ETH_ALEN]; /* 26 */
-	u16 partner_key; /* 32 */
-	u16 partner_port_pri; /* 34 */
-	u16 partner_port; /* 36 */
-	u8 partner_state; /* 38 */
-	u8 pad2[3];
-	u8 third_tlv_type; /* 42 */
-	u8 collector_info_len; /* 43 */
-	u8 collector_max_del; /* 44 */
-	u8 pad3[13];
-	u8 fourth_tlv_type; /* 58 */
-	u8 terminator_len; /* 59 */
-	u8 pad4[50];
-};
-#define LACPDU_LEN sizeof(struct lacpdu)
-
-
-
-/* 43.4.4 */
-static int Fast_Periodic_Time = 1*10; /* 1 sec */
-static int Slow_Periodic_Time = 30*10;   /* 30 sec */
-static int Short_Timeout_Time = 3*10; /* 3 sec */
-static int Long_Timeout_Time = 90*10; /* 90 sec */
-static int Churn_Detection_Time = 60*10; /* 60 sec */
-static int Aggregate_Wait_Time = 2*10; /* 2 sec */
-
-/* 43.4.5 */
-struct system_var {
-	unsigned char actor_sys[ETH_ALEN];
-	unsigned short actor_sys_pri;
-	int collector_max_del;
-} veth_sysvar;
-
-/* 43.4.6 */
-struct agg_var {
-	unsigned char agg_mac[ETH_ALEN];
-	int agg_id;
-	int ind_agg;
-	int actor_admin_agg_key;
-	int actor_oper_agg_key;
-	unsigned char partner_sys[ETH_ALEN];
-	int partner_sys_pri;
-	int partner_oper_agg_key;
-	enum _ena_dis {
-		ENABLED = 1,
-		DISABLED = 0
-	} recv_state, xmit_state;
-	int lag_ports[MAX_PHYIF];
-	bool ready; /* calculated from ready_N of each port */
-
-};
-	
-/* 43.4.7 */
-struct port_var {
-	unsigned short actor_port_num; /* this is the port # assigned to this port */
-	unsigned short actor_port_pri;
-	int actor_port_agg_id;
-	int need_to_xmit;
-	unsigned short actor_admin_port_key;
-	unsigned short actor_oper_port_key;
-	unsigned char actor_admin_port_state;
-	unsigned char actor_oper_port_state;
-
-	unsigned char partner_admin_sys[ETH_ALEN];
-	unsigned char partner_oper_sys[ETH_ALEN];
-	unsigned short partner_admin_sys_pri;
-	unsigned short partner_oper_sys_pri;
-	unsigned short partner_admin_key;
-	unsigned short partner_oper_key;
-	unsigned short partner_admin_port_num;
-	unsigned short partner_oper_port_num;
-	unsigned short partner_admin_port_pri;
-	unsigned short partner_oper_port_pri;
-	unsigned char partner_admin_port_state;
-	unsigned char partner_oper_port_state;
-	int port_enabled;
-
-	/* vars for managing the operation of the state machine */
-	/* 43.4.8 */
-	bool begin;
-	bool lacp_ena;
-	bool actor_churn;
-	bool partner_churn;
-	bool ready_n;
-	enum selected_val selected;
-	bool port_moved;
-
-	/* following variables are not defined in the standard */
-	bool attached;
-	bool xmit_ena;
-	int xmit_tim_update;
-	int xmit_count;
-	bool tbd_cnt; /* "to be deleted" counter */
-#define VETH_PORT_MON_INTERVAL 10 /* 1 sec */
-	int pm_intval;
-	bool loop; /* loopback connection detection */
-};
-
-/* 43.4.12 (receive machine) */
-enum rcvm_state {
-	INITIALIZE,
-	PORT_DISABLED,
-	EXPIRED,
-	LACP_DISABLED,
-	DEFAULTED,
-	CURRENT
-};
-
-enum acm_state {
-	NO_ACTOR_CHURN,
-	ACTOR_CHURN_MONITOR,
-	ACTOR_CHURN
-};
-
-enum pcm_state {
-	NO_PARTNER_CHURN,
-	PARTNER_CHURN_MONITOR,
-	PARTNER_CHURN
-};
-
-/* (independent control model) */
-enum muxm_state {
-	DETACHED,
-	WAITING,
-	ATTACHED,
-	COLLECTING,
-	DISTRIBUTING
-};
-
-/* (periodic timer) */
-enum perio_state {
-	NO_PERIODIC,
-	FAST_PERIODIC,
-	SLOW_PERIODIC,
-	PERIODIC_TX
-};
-
-
-/* 43.4.10 (timers) */
-struct veth_timer {
-	struct veth_timer *next;
-	int exp;
-	int tim;
-	bool active;
-	void (*tick_func)(struct veth_timer *vtp); /* tick function */
-};
-
-static struct veth_timer *vth = NULL;
-
-static struct timer_list tl;
-
-
-#define MAX_RING 128
-
-struct ring_buf {
-	int r;
-	int w;
-	unsigned char *buf[MAX_RING];
-};
-
-
-/* state machines */
-struct rcv_mach {
-	enum rcvm_state state;
-	bool do_it;
-	struct ring_buf ring;
-};
-
-struct mux_mach {
-	enum muxm_state state;
-	bool do_it;
-};
-
-struct pc_mach {
-	enum pcm_state state;
-	bool do_it;
-};
-
-struct ac_mach {
-	enum acm_state state;
-	bool do_it;
-};
-
-struct perio_mach {
-	enum perio_state state;
-	bool do_it;
-};
-
-
-struct veth_port {
-
-	struct port_var pv;
-
-	/* timers */
-	struct veth_timer current_while_timer;
-	struct veth_timer actor_churn_timer;
-	struct veth_timer periodic_timer;
-	struct veth_timer partner_churn_timer;
-	struct veth_timer wait_while_timer;
-
-	struct veth_timer xmit_timer;
-
-	/* state machines */
-	struct rcv_mach rcvm;
-	struct mux_mach muxm;
-	struct pc_mach pcm;
-	struct ac_mach acm;
-	struct perio_mach prm;
-
-	struct net_device *dev;
-	char module_name[40]; /* module name of physical i/f */
-
-	int avrlen;
-};
-
-
-/* for solving correct hash value for IP fragments 
- * in TCP/IP port based hash algorithm */
-struct dist_hash_table {
-	struct dist_hash_table *next;
-	u16 id; /* packet id */
-	u32 saddr; /* source IPv4 address */
-	u32 daddr; /* destination IPv4 address */
-	int hash;
-};
-
-struct veth_agg {
-	struct net_device *dev;
-	struct agg_var av;
-	unsigned long distmode;
-	unsigned long count;
-	struct dist_hash_table *dht[32];
-
-	int ports[MAX_PHYIF];/* which holds ports which is in DIST state */
-	int n_ports; /* which holds number of ports which is in DIST state */
-	spinlock_t lock;
-};
-
-/* veth_private is built-in device structure */
-struct veth_private {
-	struct net_device_stats enet_stats;
-	struct veth_agg *agg;
-};
-
-
-
-/* These are pool of ports used by aggregators */
-static struct veth_port veth_ports[MAX_PHYIF];
-static struct veth_agg veth_aggs[MAX_VETH];
-
-/* for port prioritizing */
-static struct veth_port *opl[MAX_PHYIF];
-static bool need_to_rebuild_opl = _FALSE;
-
-
-#define VP(n) \
-		struct veth_private *vp; \
-		vp = (struct veth_private *)veth_aggs[(n)].dev->priv 
-
-#endif /* __KERNEL__ */
-#endif /* VETH_H */
-
-/*
- * Local variables:
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- *  indent-tabs-mode: t
- * End:
- */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/veth/vethcmd.c linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/veth/vethcmd.c
--- linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/veth/vethcmd.c	2004-06-29 11:25:31.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/veth/vethcmd.c	2004-09-05 16:00:20.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- * $Id: vethcmd.c,v 1.7 2004/03/02 14:47:04 yumo Exp $
+ * $Id: vethcmd.c,v 1.9 2004/06/19 12:42:37 yumo Exp $
  * vethcfg -- veth device driver configurator program
  *
  * Author: Yumo (Katsuyuki Yumoto) 2000-2004
@@ -37,7 +37,7 @@
 #include <ethmap.h>
 #endif
 
-#include "veth.h"
+#include "vether.h"
 #include "vethcfg.h"
 
 
@@ -55,7 +55,7 @@
 #define ERR_UNKNCOMM -11
 
 /* maximum name length */
-#define MAX_NAME 7
+#define MAX_NAME 8
 
 char *get_field_n(char *d, char *s, int n)
 {
@@ -775,8 +775,8 @@ int port_param_set(struct u_port_info *u
 	if (strcmp(pnam, "akey") == 0){
 		u->actor_admin_port_key = atoi(pval)&0xff00;
 	} else if (strcmp(pnam, "aps_ac") == 0){
-		atoi(pval)?(u->partner_admin_port_state|=PS_LACP_ACTIVITY):
-			(u->partner_admin_port_state&=~PS_LACP_ACTIVITY);
+		atoi(pval)?(u->actor_admin_port_state|=PS_LACP_ACTIVITY):
+			(u->actor_admin_port_state&=~PS_LACP_ACTIVITY);
 	} else if (strcmp(pnam, "aps_to") == 0){
 		atoi(pval)?(u->actor_admin_port_state|=PS_LACP_TIMEOUT):
 			(u->actor_admin_port_state&=~PS_LACP_TIMEOUT);
@@ -925,7 +925,7 @@ int veth_command(int argc, char **argv)
 
 
 	/* a silly raw socket just for ioctl()ling it */
-	sock = socket(AF_INET, SOCK_RAW, IPPROTO_RAW);
+	sock = socket(AF_INET, SOCK_DGRAM, 0);
 	if (sock < 0) {
 		perror(PROG_NAME);
 		print_general_info("");
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/veth/vether.h linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/veth/vether.h
--- linux-2.4.20-wolk4.15-fullkernel/Documentation/networking/veth/vether.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/Documentation/networking/veth/vether.h	2004-09-05 15:59:36.000000000 +0200
@@ -0,0 +1,488 @@
+/* $Id: veth.h,v 1.21 2004/06/19 12:49:26 yumo Exp $ */
+/* VETH: A virtual ethernet device driver for Linux header file. 
+ *
+ * This device driver is an implementation of Aggregation of Multiple
+ * Link Segments (IEEE 802.3ad).
+ *
+ * Author: Yumo (Katsuyuki Yumoto) 2000-2004
+ *         yumo@st.rim.or.jp
+ *
+ * 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  02111-1307, USA.
+ */
+
+#ifndef VETH_H
+#define VETH_H
+
+/* Maximum number of devices to support. */
+#define MAX_VETH  8
+#define MAX_PHYIF 8
+
+#define VETH_VER_MAJOR 0
+#define VETH_VER_MINOR 6
+#define VETH_VER_PATCH 5
+
+#define VETH_MAGIC 0x3be5
+
+/* actions */
+#define VETHCTL_ADD_PHYIF 1
+#define VETHCTL_DEL_PHYIF 2
+#define VETHCTL_GET_PORT_INFO 3
+#define VETHCTL_SET_PORT_INFO 4
+#define VETHCTL_GET_AGG_INFO 5
+#define VETHCTL_SET_AGG_INFO 6
+#define VETHCTL_VERSION 7
+
+#define SUBKEY_UNKNOWN 0
+#define SUBKEY_10M 1
+#define SUBKEY_100M 2
+#define SUBKEY_1000M 3
+
+#define SUBKEY_MASK_UPPER 0xff00
+#define SUBKEY_MASK_LOWER 0x00ff
+
+	/* 43.4.2.2 */
+#define PS_LACP_ACTIVITY    0x1
+#define PS_LACP_TIMEOUT     0x2
+#define PS_AGGREGATION      0x4
+#define PS_SYNCHRONIZATION  0x8
+#define PS_COLLECTING      0x10
+#define PS_DISTRIBUTING    0x20
+#define PS_DEFAULTED       0x40
+#define PS_EXPIRED         0x80
+
+
+/* Distributing Algorithm */
+#define DIST_TCPUDPHASH 0x1
+#define DIST_ROUNDROBIN 0x2
+
+enum selected_val {
+		SELECTED,
+		UNSELECTED,
+		STANDBY
+};
+
+struct u_port_info
+{
+	unsigned short actor_port_num; /* this is the port # assigned to this port */
+	unsigned short actor_port_pri;
+	int actor_port_agg_id;
+	unsigned short actor_admin_port_key;
+	unsigned short actor_oper_port_key;
+	unsigned char actor_admin_port_state;
+	unsigned char actor_oper_port_state;
+
+	unsigned char partner_admin_sys[ETH_ALEN];
+	unsigned char partner_oper_sys[ETH_ALEN];
+	unsigned short partner_admin_sys_pri;
+	unsigned short partner_oper_sys_pri;
+	unsigned short partner_admin_key;
+	unsigned short partner_oper_key;
+	unsigned short partner_admin_port_num;
+	unsigned short partner_oper_port_num;
+	unsigned short partner_admin_port_pri;
+	unsigned short partner_oper_port_pri;
+	unsigned char partner_admin_port_state;
+	unsigned char partner_oper_port_state;
+
+	enum selected_val selected;
+};
+
+
+struct u_agg_info
+{
+	unsigned char agg_mac[ETH_ALEN];
+	int agg_id;
+	int ind_agg;
+	int actor_admin_agg_key;
+	int actor_oper_agg_key;
+	unsigned char partner_sys[ETH_ALEN];
+	int partner_sys_pri;
+	int partner_oper_agg_key;
+	int ready; /* calculated from ready_N of each port */
+
+	unsigned long distmode;
+};
+
+
+struct u_drv_info {
+	unsigned char major;
+	unsigned char minor;
+	unsigned char patch;
+	char name[20]; /* driver name */
+	char author[50];
+};
+
+
+
+/* vethconf is used for adding or removing physical i/f to/from
+   virtual i/f by using ioctl() */
+
+struct vethconf {
+	unsigned short magic;
+	int action;
+
+	char pif_name[8];
+	char vif_name[8];
+	char pif_module[40];
+	unsigned int size;
+	unsigned char *buf;
+};
+
+#ifdef __KERNEL__
+/* debug section */
+#define VETH_DEBUG_LEVEL_MASK 0xf
+#define VETH_DEBUG_RCVM 0x1 << 4
+#define VETH_DEBUG_MUXM 0x2 << 4
+#define VETH_DEBUG_CHUM 0x4 << 4
+#define VETH_DEBUG_PERM 0x8 << 4
+#define VETH_DEBUG_SEL  0x10 << 4
+#define VETH_DEBUG_CTLP 0x20 << 4
+
+#define VETH_DEBUG_NONE 0x0
+#define VETH_DEBUG_ALL  0xfffffff0
+#define VETH_DEBUG_STATE VETH_DEBUG_RCVM | VETH_DEBUG_MUXM | VETH_DEBUG_CHUM | VETH_DEBUG_PERM
+
+static unsigned int veth_debug = VETH_DEBUG_NONE;
+
+#define VETH_DEBUG(x,y) (((x)&veth_debug)&&((VETH_DEBUG_LEVEL_MASK&veth_debug)>=(y)))
+/* end of debug section */
+
+
+/* Linux version dependency */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
+/* for 2.2.x */
+#define netdevice_start(dev) dev->start = 1
+#define netdevice_stop(dev) dev->start = 0
+#define netif_start_queue(dev) dev->tbusy = 0
+#define netif_stop_queue(dev) dev->tbusy = 1
+#define net_device device
+#define dev_get_by_name dev_get
+#else
+#define netdevice_start(dev)
+#define netdevice_stop(dev)
+#endif
+
+
+
+/* Distributing Algorithm */
+#define DIST_TCPIPHASH 0x1
+#define DIST_ROUNDROBIN 0x2
+
+
+
+/* IEEE 802.3ad constants */
+
+typedef enum _bool {
+	_TRUE = 1,
+	_FALSE = 0
+}bool;
+
+static char Slow_Protocols_Multicast[ETH_ALEN] = {0x01,0x80,0xc2,0x00,0x00,0x02}; /* Tbl 43B-1 */
+static unsigned short Slow_Protocols_Type = __constant_htons(0x8809); /* Tbl 43B-2 */
+
+static unsigned char Marker_Subtype = 0x2; /* 43.2.7.1.1 */
+static unsigned char LACP_Subtype = 0x1; /* 43.2.9.1.1 */
+static unsigned char LACP_Version = 0x1; /* 43.4.2.2 */
+
+static unsigned char Marker_Information = 0x1; /* 43.2.7.1.1 */
+static unsigned char Marker_Response_Information = 0x2; /* 43.2.7.1.1 */
+
+
+/* 43.4.2.2 (LACPDU structure) */
+struct lacpdu {
+	u8 subtype; /* 0 */
+	u8 version_number; /* 1 */
+	u8 first_tlv_type; /* 2 */
+	u8 actor_info_len; /* 3 */
+	u16 actor_sys_pri; /* 4 */
+	u8 actor_sys[ETH_ALEN]; /* 6 */
+	u16 actor_key; /* 12 */
+	u16 actor_port_pri; /* 14 */
+	u16 actor_port; /* 16 */
+	u8 actor_state; /* 18 */
+	u8 pad1[3];
+	u8 second_tlv_type; /* 22 */
+	u8 partner_info_len; /* 23 */
+	u16 partner_sys_pri; /* 24 */
+	u8 partner_sys[ETH_ALEN]; /* 26 */
+	u16 partner_key; /* 32 */
+	u16 partner_port_pri; /* 34 */
+	u16 partner_port; /* 36 */
+	u8 partner_state; /* 38 */
+	u8 pad2[3];
+	u8 third_tlv_type; /* 42 */
+	u8 collector_info_len; /* 43 */
+	u8 collector_max_del; /* 44 */
+	u8 pad3[13];
+	u8 fourth_tlv_type; /* 58 */
+	u8 terminator_len; /* 59 */
+	u8 pad4[50];
+};
+#define LACPDU_LEN sizeof(struct lacpdu)
+
+
+
+/* 43.4.4 */
+static int Fast_Periodic_Time = 1*10; /* 1 sec */
+static int Slow_Periodic_Time = 30*10;   /* 30 sec */
+static int Short_Timeout_Time = 3*10; /* 3 sec */
+static int Long_Timeout_Time = 90*10; /* 90 sec */
+static int Churn_Detection_Time = 60*10; /* 60 sec */
+static int Aggregate_Wait_Time = 2*10; /* 2 sec */
+
+/* 43.4.5 */
+struct system_var {
+	unsigned char actor_sys[ETH_ALEN];
+	unsigned short actor_sys_pri;
+	int collector_max_del;
+} veth_sysvar;
+
+/* 43.4.6 */
+struct agg_var {
+	unsigned char agg_mac[ETH_ALEN];
+	int agg_id;
+	int ind_agg;
+	int actor_admin_agg_key;
+	int actor_oper_agg_key;
+	unsigned char partner_sys[ETH_ALEN];
+	int partner_sys_pri;
+	int partner_oper_agg_key;
+	enum _ena_dis {
+		ENABLED = 1,
+		DISABLED = 0
+	} recv_state, xmit_state;
+	int lag_ports[MAX_PHYIF];
+	bool ready; /* calculated from ready_N of each port */
+
+};
+	
+/* 43.4.7 */
+struct port_var {
+	unsigned short actor_port_num; /* this is the port # assigned to this port */
+	unsigned short actor_port_pri;
+	int actor_port_agg_id;
+	int need_to_xmit;
+	unsigned short actor_admin_port_key;
+	unsigned short actor_oper_port_key;
+	unsigned char actor_admin_port_state;
+	unsigned char actor_oper_port_state;
+
+	unsigned char partner_admin_sys[ETH_ALEN];
+	unsigned char partner_oper_sys[ETH_ALEN];
+	unsigned short partner_admin_sys_pri;
+	unsigned short partner_oper_sys_pri;
+	unsigned short partner_admin_key;
+	unsigned short partner_oper_key;
+	unsigned short partner_admin_port_num;
+	unsigned short partner_oper_port_num;
+	unsigned short partner_admin_port_pri;
+	unsigned short partner_oper_port_pri;
+	unsigned char partner_admin_port_state;
+	unsigned char partner_oper_port_state;
+	int port_enabled;
+
+	/* vars for managing the operation of the state machine */
+	/* 43.4.8 */
+	bool begin;
+	bool lacp_ena;
+	bool actor_churn;
+	bool partner_churn;
+	bool ready_n;
+	enum selected_val selected;
+	bool port_moved;
+
+	/* following variables are not defined in the standard */
+	bool attached;
+	bool xmit_ena;
+	int xmit_tim_update;
+	int xmit_count;
+	bool tbd_cnt; /* "to be deleted" counter */
+#define VETH_PORT_MON_INTERVAL 10 /* 1 sec */
+	int pm_intval;
+	bool loop; /* loopback connection detection */
+};
+
+/* 43.4.12 (receive machine) */
+enum rcvm_state {
+	INITIALIZE,
+	PORT_DISABLED,
+	EXPIRED,
+	LACP_DISABLED,
+	DEFAULTED,
+	CURRENT
+};
+
+enum acm_state {
+	NO_ACTOR_CHURN,
+	ACTOR_CHURN_MONITOR,
+	ACTOR_CHURN
+};
+
+enum pcm_state {
+	NO_PARTNER_CHURN,
+	PARTNER_CHURN_MONITOR,
+	PARTNER_CHURN
+};
+
+/* (independent control model) */
+enum muxm_state {
+	DETACHED,
+	WAITING,
+	ATTACHED,
+	COLLECTING,
+	DISTRIBUTING
+};
+
+/* (periodic timer) */
+enum perio_state {
+	NO_PERIODIC,
+	FAST_PERIODIC,
+	SLOW_PERIODIC,
+	PERIODIC_TX
+};
+
+
+/* 43.4.10 (timers) */
+struct veth_timer {
+	struct veth_timer *next;
+	int exp;
+	int tim;
+	bool active;
+	void (*tick_func)(struct veth_timer *vtp); /* tick function */
+};
+
+static struct veth_timer *vth = NULL;
+
+static struct timer_list tl;
+
+
+#define MAX_RING 128
+
+struct ring_buf {
+	int r;
+	int w;
+	unsigned char *buf[MAX_RING];
+};
+
+
+/* state machines */
+struct rcv_mach {
+	enum rcvm_state state;
+	bool do_it;
+	struct ring_buf ring;
+};
+
+struct mux_mach {
+	enum muxm_state state;
+	bool do_it;
+};
+
+struct pc_mach {
+	enum pcm_state state;
+	bool do_it;
+};
+
+struct ac_mach {
+	enum acm_state state;
+	bool do_it;
+};
+
+struct perio_mach {
+	enum perio_state state;
+	bool do_it;
+};
+
+
+struct veth_port {
+
+	struct port_var pv;
+
+	/* timers */
+	struct veth_timer current_while_timer;
+	struct veth_timer actor_churn_timer;
+	struct veth_timer periodic_timer;
+	struct veth_timer partner_churn_timer;
+	struct veth_timer wait_while_timer;
+
+	struct veth_timer xmit_timer;
+
+	/* state machines */
+	struct rcv_mach rcvm;
+	struct mux_mach muxm;
+	struct pc_mach pcm;
+	struct ac_mach acm;
+	struct perio_mach prm;
+
+	struct net_device *dev;
+	char module_name[40]; /* module name of physical i/f */
+
+	int avrlen;
+};
+
+
+/* for solving correct hash value for IP fragments 
+ * in TCP/IP port based hash algorithm */
+struct dist_hash_table {
+	struct dist_hash_table *next;
+	u16 id; /* packet id */
+	u32 saddr; /* source IPv4 address */
+	u32 daddr; /* destination IPv4 address */
+	int hash;
+};
+
+struct veth_agg {
+	struct net_device *dev;
+	struct agg_var av;
+	unsigned long distmode;
+	unsigned long count;
+	struct dist_hash_table *dht[32];
+
+	int ports[MAX_PHYIF];/* which holds ports which is in DIST state */
+	int n_ports; /* which holds number of ports which is in DIST state */
+	spinlock_t lock;
+};
+
+/* veth_private is built-in device structure */
+struct veth_private {
+	struct net_device_stats enet_stats;
+	struct veth_agg *agg;
+};
+
+
+
+/* These are pool of ports used by aggregators */
+static struct veth_port veth_ports[MAX_PHYIF];
+static struct veth_agg veth_aggs[MAX_VETH];
+
+/* for port prioritizing */
+static struct veth_port *opl[MAX_PHYIF];
+static bool need_to_rebuild_opl = _FALSE;
+
+
+#define VP(n) \
+		struct veth_private *vp; \
+		vp = (struct veth_private *)veth_aggs[(n)].dev->priv 
+
+#endif /* __KERNEL__ */
+#endif /* VETH_H */
+
+/*
+ * Local variables:
+ *  c-indent-level: 4
+ *  c-basic-offset: 4
+ *  tab-width: 4
+ *  indent-tabs-mode: t
+ * End:
+ */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/Documentation/rmdev_dyn.cciss linux-2.4.20-wolk4.16-fullkernel/Documentation/rmdev_dyn.cciss
--- linux-2.4.20-wolk4.15-fullkernel/Documentation/rmdev_dyn.cciss	2004-06-29 11:24:47.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/Documentation/rmdev_dyn.cciss	1970-01-01 01:00:00.000000000 +0100
@@ -1,87 +0,0 @@
-#!/bin/sh 
-#
-# Author: Francis Wiran <Francis.Wiran@hp.com>
-#
-# Script to remove device nodes for SMART Array controllers. This will
-# be the device nodes with major numbers which are dynamically allocated
-# by the kernel. This script will not attempt to remove the device
-# nodes with major number 104 thru 111 (c0 thru c7), which are 
-# the major numbers that's allocated for cciss controllers by kernel.org.
-#
-# Usage:
-# rmdev_dyn.cciss [ctlr num]
-#
-# With no arguments, the script will check to see if there are any nodes
-# under /dev/cciss, whose major number no longer shows in /proc/partitions,
-# or to be exact, no longer shows to be owned by cciss driver.
-# If there is, then it will be removed.
-#
-# Note that it is a good idea to run rmdev_dyn.cciss script if you remove
-# those controllers (the ones which major numbers were dynamically allocated)
-# This will unclutter /dev, as well as preventing possible problems due to
-# referenced devices and major numbers no longer available or taken by
-# other non-cciss drivers.
-#
-# Passing arguments:
-# If you know that one of your controllers, say cciss8, has been removed
-# and the nodes are no longer valid, you could do
-#
-# rmdev_dyn.cciss 8 
-#
-# This is the same as doing `rm -f /dev/cciss/c8*` 
-
-# Inputs
-NR_CTLR=${1}
-
-echo_usage()
-{
-	echo "Usage: rmdev_dyn.cciss [ctlr num]"
-	echo "The script will not attempt to remove nodes for controllers"
-	echo "0 thru 7, therefore if you want to pass an argument,"
-	echo "make sure that ctlr num is equal or greater than 8"
-}
-
-rm_nod1()
-{
-	if [ $1 -lt 8 ]; then
-		echo_usage;
-		exit
-	else
-		rm -f /dev/cciss/c${1}*
-		echo "removed /dev/cciss/c${1}*"
-	fi
-}
-
-rm_nod2()
-{
-	for X in `ls -l /dev/cciss/c* |\
-		awk '{print $5-i}' |\
-		uniq`; do
-		if [ \( $X -ge 104 \) -a \( $X -le 111 \) ]; then
-			:
-		elif [ `cat /proc/devices |\
-			grep cciss |\
-			grep $X |\
-			wc -l` -eq 0 ]; then
-
-			Y=`ls -l /dev/cciss/ |\
-				awk '{print $5-i ":"  $10}'|\
-				tr d ':' |\
-				grep $X |\
-				awk -F: '{print $2}' |\
-				uniq`
-
-			Z="/dev/cciss/${Y}*"
-
-			rm -f $Z
-			echo "removed $Z"
-		fi
-	done
-}
-
-# Start here
-if [ $# -gt 0 ]; then
-	rm_nod1 $NR_CTLR;
-else
-	rm_nod2;
-fi
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/Documentation/sysctl/vm.txt linux-2.4.20-wolk4.16-fullkernel/Documentation/sysctl/vm.txt
--- linux-2.4.20-wolk4.15-fullkernel/Documentation/sysctl/vm.txt	2004-06-29 11:31:15.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/Documentation/sysctl/vm.txt	2004-09-05 16:05:56.000000000 +0200
@@ -378,7 +378,7 @@ every anon page allocation.
 Low ram machines that swaps all the time want to turn
 this on (i.e. set to 1).
 
-The default value is 1.
+The default value is 0.
 =============================================================
 
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/MAINTAINERS linux-2.4.20-wolk4.16-fullkernel/MAINTAINERS
--- linux-2.4.20-wolk4.15-fullkernel/MAINTAINERS	2004-06-29 11:26:15.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/MAINTAINERS	2004-09-05 16:08:32.000000000 +0200
@@ -70,6 +70,19 @@ S: Status, one of the following:
 			it has been replaced by a better system and you
 			should be using that.
 
+WOLK (2.2, 2.4 and 2.6 TREE)
+P:	Marc-Christian Petersen
+M:	m.c.p@wolk.linux-systeme.com
+L:	wolk-devel@lists.sourceforge.net
+W:	http://www.kernel.org/pub/linux/kernel/people/mcp/
+S:	Maintained
+
+WOLK FIXES (2.2, 2.4 and 2.6 TREE)
+P:	Marc-Christian Petersen
+M:	m.c.p@wolk.linux-systeme.com
+L:	wolk-devel@lists.sourceforge.net
+S:	Maintained
+
 3C359 NETWORK DRIVER
 P:	Mike Phillips
 M:	mikep@linuxtr.net
@@ -294,75 +307,87 @@ L:	linux-kernel@vger.kernel.org
 S:	Maintained
 
 BLUETOOTH SUBSYSTEM
+P:	Marcel Holtmann
+M:	marcel@holtmann.org
 P:	Maxim Krasnyansky
 M:	maxk@qualcomm.com
+L:	bluez-devel@lists.sf.net
 W:	http://bluez.sf.net
+W:	http://www.bluez.org
+W:	http://www.holtmann.org/linux/bluetooth/
 S:	Maintained
 
 BLUETOOTH RFCOMM LAYER
+P:	Marcel Holtmann
+M:	marcel@holtmann.org
 P:	Maxim Krasnyansky
 M:	maxk@qualcomm.com
-W:	http://bluez.sf.net
 S:	Maintained
 
 BLUETOOTH BNEP LAYER
+P:	Marcel Holtmann
+M:	marcel@holtmann.org
 P:	Maxim Krasnyansky
 M:	maxk@qualcomm.com
-W:	http://bluez.sf.net
 S:	Maintained
 
 BLUETOOTH CMTP LAYER
 P:	Marcel Holtmann
 M:	marcel@holtmann.org
-W:	http://www.holtmann.org/linux/bluetooth/
 S:	Maintained
 
-BLUETOOTH HCI USB DRIVER
+BLUETOOTH HIDP LAYER
+P:	Marcel Holtmann
+M:	marcel@holtmann.org
+S:	Maintained
+
+BLUETOOTH HCI UART DRIVER
+P:	Marcel Holtmann
+M:	marcel@holtmann.org
 P:	Maxim Krasnyansky
 M:	maxk@qualcomm.com
-W:	http://bluez.sf.net
 S:	Maintained
 
-BLUETOOTH HCI UART DRIVER
+BLUETOOTH HCI USB DRIVER
+P:	Marcel Holtmann
+M:	marcel@holtmann.org
 P:	Maxim Krasnyansky
 M:	maxk@qualcomm.com
-W:	http://bluez.sf.net
+S:	Maintained
+
+BLUETOOTH HCI BCM203X DRIVER
+P:	Marcel Holtmann
+M:	marcel@holtmann.org
 S:	Maintained
 
 BLUETOOTH HCI BFUSB DRIVER
 P:	Marcel Holtmann
 M:	marcel@holtmann.org
-W:	http://www.holtmann.org/linux/bluetooth/
 S:	Maintained
 
 BLUETOOTH HCI DTL1 DRIVER
 P:	Marcel Holtmann
 M:	marcel@holtmann.org
-W:	http://www.holtmann.org/linux/bluetooth/
 S:	Maintained
 
 BLUETOOTH HCI BLUECARD DRIVER
 P:	Marcel Holtmann
 M:	marcel@holtmann.org
-W:	http://www.holtmann.org/linux/bluetooth/
 S:	Maintained
 
 BLUETOOTH HCI BT3C DRIVER
 P:	Marcel Holtmann
 M:	marcel@holtmann.org
-W:	http://www.holtmann.org/linux/bluetooth/
 S:	Maintained
 
 BLUETOOTH HCI BTUART DRIVER
 P:	Marcel Holtmann
 M:	marcel@holtmann.org
-W:	http://www.holtmann.org/linux/bluetooth/
 S:	Maintained
 
 BLUETOOTH HCI VHCI DRIVER
 P:	Maxim Krasnyansky
 M:	maxk@qualcomm.com
-W:	http://bluez.sf.net
 S:	Maintained
 
 BTTV VIDEO4LINUX DRIVER
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/Makefile linux-2.4.20-wolk4.16-fullkernel/Makefile
--- linux-2.4.20-wolk4.15-fullkernel/Makefile	2004-06-29 11:31:52.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/Makefile	2004-09-06 13:42:47.000000000 +0200
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 20
-EXTRAVERSION = -wolk4.15s
+EXTRAVERSION = -wolk4.16s
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
@@ -242,9 +242,8 @@ DRIVERS := $(DRIVERS-y)
 # files removed with 'make clean'
 CLEAN_FILES = \
 	kernel/ksyms.lst include/linux/compile.h \
-	vmlinux System.map include/linux/config_data.h \
+	vmlinux System.map \
 	$(TMPPREFIX).tmp* \
-	kernel/ikconfig.h \
 	drivers/char/consolemap_deftbl.c drivers/video/promcon_tbl.c \
 	drivers/char/conmakehash \
 	drivers/char/drm/*-mod.c \
@@ -262,9 +261,10 @@ CLEAN_FILES = \
 	drivers/scsi/aic7xxx/aicasm/aicdb.h \
 	drivers/scsi/aic7xxx/aicasm/y.tab.h \
 	drivers/scsi/53c700_d.h \
+	fs/proc/confdata.h \
 	net/khttpd/make_times_h \
 	net/khttpd/times.h \
-	mm/modparse mm/badmem_modules.c mm/kernel_badmemlib.o mm/badmemlib_version mm/badmemkernellib_version\
+	mm/modparse mm/badmem_modules.c mm/kernel_badmemlib.o mm/badmemlib_version mm/badmemkernellib_version \
 	submenu*
 # directories removed with 'make clean'
 CLEAN_DIRS = \
@@ -285,13 +285,12 @@ MRPROPER_FILES = \
 	drivers/atm/fore200e_*_fw.c drivers/atm/.fore200e_*.fw \
 	.version .config* config.in config.old \
 	scripts/tkparse scripts/kconfig.tk scripts/kconfig.tmp \
-	scripts/lxdialog/*.o scripts/lxdialog/lxdialog \
+	scripts/lxdialog/*.o scripts/lxdialog/lxdialog scripts/carray \
 	.menuconfig.log \
 	include/asm \
 	kdb/gen-kdb_cmds.c \
-	.hdepend scripts/mkdep scripts/split-include scripts/docproc scripts/bin2c \
+	.hdepend scripts/mkdep scripts/split-include scripts/docproc \
 	$(TOPDIR)/include/linux/modversions.h \
-	kernel/ikconfig.h \
 	net/ipsec/alg/ipsec_alg_static_init.c \
 	net/ipsec/libdes/asm/dx86unix.S \
 	net/ipsec/libdes/asm/yx86unix.S \
@@ -313,7 +312,7 @@ MRPROPER_DIRS = \
 	net/ipsec/alg/libsha2 \
 	net/ipsec/alg/libtwofish \
 	net/ipsec/alg/perlasm \
-	net/ipsec/libfreeswan/version.c \
+	net/ipsec/libopenswan/version.c \
 	$(TOPDIR)/include/linux/modules
 
 
@@ -417,15 +416,6 @@ menuconfig: include/linux/version.h syml
 config: symlinks
 	$(CONFIG_SHELL) scripts/Configure arch/$(ARCH)/config.in
 
-cloneconfig: symlinks
-	@if [ -f "/proc/config.gz" ]; then \
-		mv -f .config .config.bak; \
-	    	gzip -d < /proc/config.gz > .config; \
-		$(CONFIG_SHELL) scripts/Configure -d arch/$(ARCH)/config.in; \
-	else \
-		echo "Sorry, your current kernel was built without cloning support."; \
-	fi
-
 include/config/MARKER: scripts/split-include include/linux/autoconf.h
 	scripts/split-include include/linux/autoconf.h include/config
 	@ touch include/config/MARKER
@@ -475,10 +465,7 @@ include/linux/version.h: ./Makefile
 
 comma	:= ,
 
-include/linux/config_data.h: newversion scripts/bin2c
-	gzip -9 < .config | scripts/bin2c kernel_config_data > $@
-
-init/version.o: init/version.c include/linux/compile.h include/config/MARKER include/linux/config_data.h
+init/version.o: init/version.c include/linux/compile.h include/config/MARKER
 	$(CC) $(CFLAGS) $(CFLAGS_KERNEL) -DUTS_MACHINE='"$(ARCH)"' -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o init/version.o init/version.c
 
 init/main.o: init/main.c include/config/MARKER
@@ -669,9 +656,6 @@ scripts/mkdep: scripts/mkdep.c
 scripts/split-include: scripts/split-include.c
 	$(HOSTCC) $(HOSTCFLAGS) -o scripts/split-include scripts/split-include.c
 
-scripts/bin2c: scripts/bin2c.c
-	$(HOSTCC) $(HOSTCFLAGS) -o scripts/bin2c scripts/bin2c.c
-
 #
 # RPM target
 #
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/VERSION linux-2.4.20-wolk4.16-fullkernel/VERSION
--- linux-2.4.20-wolk4.15-fullkernel/VERSION	2004-06-29 11:31:52.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/VERSION	2004-09-05 16:08:32.000000000 +0200
@@ -1 +1 @@
-WOLK v4.15s "Server Edition" FINAL, based on 2.4.20
+WOLK v4.16s "Server Edition" FINAL, based on 2.4.20
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/all/Config-SECURITY.in linux-2.4.20-wolk4.16-fullkernel/arch/all/Config-SECURITY.in
--- linux-2.4.20-wolk4.15-fullkernel/arch/all/Config-SECURITY.in	2004-06-29 11:30:39.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/all/Config-SECURITY.in	2004-09-05 16:04:55.000000000 +0200
@@ -27,10 +27,10 @@ fi
 
 # Hardcoded kernel command line
 if [ "$CONFIG_X86" = "y" -o "$CONFIG_X86_64" = "y" ]; then
-   bool 'Hardcoded kernel command line' CONFIG_CMDLINE_ENABLE
-   if [ "$CONFIG_CMDLINE_ENABLE" = "y" ]; then
-      bool '    Bootloader overrides hardcoded' CONFIG_CMDLINE_OVERRIDE
-      string '   Initial kernel command line' CONFIG_CMDLINE "root=301 ro"
+  bool 'Hardcoded kernel command line' CONFIG_CMDLINE_ENABLE
+  if [ "$CONFIG_CMDLINE_ENABLE" = "y" ]; then
+    bool '  Bootloader overrides hardcoded' CONFIG_CMDLINE_OVERRIDE
+    string ' Initial kernel command line' CONFIG_CMDLINE "root=301 ro"
    fi
 fi
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/alpha/defconfig linux-2.4.20-wolk4.16-fullkernel/arch/alpha/defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/alpha/defconfig	2004-06-29 11:31:52.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/alpha/defconfig	2004-09-05 16:08:32.000000000 +0200
@@ -574,7 +574,6 @@ CONFIG_ISO9660_FS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/a5k linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/a5k
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/a5k	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/a5k	2000-11-28 02:07:59.000000000 +0100
@@ -394,7 +394,6 @@ CONFIG_MSDOS_FS=m
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/adsbitsy linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/adsbitsy
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/adsbitsy	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/adsbitsy	2002-08-03 02:39:42.000000000 +0200
@@ -488,7 +488,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/anakin linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/anakin
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/anakin	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/anakin	2002-08-03 02:39:42.000000000 +0200
@@ -372,7 +372,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/assabet linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/assabet
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/assabet	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/assabet	2002-08-03 02:39:42.000000000 +0200
@@ -667,7 +667,6 @@ CONFIG_TMPFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_FREEVXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/badge4 linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/badge4
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/badge4	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/badge4	2002-08-03 02:39:42.000000000 +0200
@@ -837,7 +837,6 @@ CONFIG_TMPFS=y
 CONFIG_MINIX_FS=m
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/brutus linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/brutus
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/brutus	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/brutus	2001-08-12 20:13:59.000000000 +0200
@@ -222,7 +222,6 @@ CONFIG_UNIX98_PTY_COUNT=32
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/cerfcube linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/cerfcube
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/cerfcube	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/cerfcube	2002-08-03 02:39:42.000000000 +0200
@@ -660,7 +660,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_FREEVXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/cerfpda linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/cerfpda
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/cerfpda	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/cerfpda	2002-08-03 02:39:42.000000000 +0200
@@ -698,7 +698,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_FREEVXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/cerfpod linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/cerfpod
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/cerfpod	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/cerfpod	2002-08-03 02:39:42.000000000 +0200
@@ -662,7 +662,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_FREEVXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/clps7500 linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/clps7500
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/clps7500	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/clps7500	2002-08-03 02:39:42.000000000 +0200
@@ -420,8 +420,6 @@ CONFIG_CLPS7500_FLASH=y
 # CONFIG_ISO9660_FS is not set
 CONFIG_MINIX_FS=y
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/ebsa110 linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/ebsa110
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/ebsa110	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/ebsa110	2002-08-03 02:39:42.000000000 +0200
@@ -530,7 +530,6 @@ CONFIG_AUTOFS4_FS=y
 CONFIG_MINIX_FS=y
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/edb7211 linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/edb7211
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/edb7211	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/edb7211	2001-10-25 22:53:44.000000000 +0200
@@ -329,7 +329,6 @@ CONFIG_RAMFS=y
 # CONFIG_JOLIET is not set
 CONFIG_MINIX_FS=y
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/empeg linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/empeg
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/empeg	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/empeg	1999-10-21 01:29:08.000000000 +0200
@@ -221,8 +221,6 @@ CONFIG_PPP=y
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_QNX4FS_FS is not set
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/epxa10db linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/epxa10db
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/epxa10db	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/epxa10db	2002-08-03 02:39:42.000000000 +0200
@@ -533,7 +533,6 @@ CONFIG_JFFS_FS_VERBOSE=0
 # CONFIG_MINIX_FS is not set
 # CONFIG_FREEVXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/flexanet linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/flexanet
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/flexanet	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/flexanet	2002-08-03 02:39:42.000000000 +0200
@@ -651,7 +651,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/footbridge linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/footbridge
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/footbridge	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/footbridge	2000-11-28 02:07:59.000000000 +0100
@@ -627,7 +627,6 @@ CONFIG_ISO9660_FS=m
 CONFIG_JOLIET=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/fortunet linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/fortunet
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/fortunet	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/fortunet	2002-08-03 02:39:42.000000000 +0200
@@ -454,7 +454,6 @@ CONFIG_JFFS_FS_VERBOSE=0
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/freebird linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/freebird
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/freebird	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/freebird	2002-08-03 02:39:42.000000000 +0200
@@ -501,7 +501,6 @@ CONFIG_RAMFS=y
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/freebird_new linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/freebird_new
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/freebird_new	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/freebird_new	2002-08-03 02:39:42.000000000 +0200
@@ -521,7 +521,6 @@ CONFIG_RAMFS=y
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/frodo linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/frodo
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/frodo	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/frodo	2002-08-03 02:39:42.000000000 +0200
@@ -440,7 +440,6 @@ CONFIG_SA1100_RTC=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/graphicsclient linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/graphicsclient
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/graphicsclient	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/graphicsclient	2002-08-03 02:39:42.000000000 +0200
@@ -594,7 +594,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/graphicsmaster linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/graphicsmaster
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/graphicsmaster	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/graphicsmaster	2002-08-03 02:39:42.000000000 +0200
@@ -569,7 +569,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/h3600 linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/h3600
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/h3600	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/h3600	2002-08-03 02:39:42.000000000 +0200
@@ -659,7 +659,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_FREEVXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/huw_webpanel linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/huw_webpanel
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/huw_webpanel	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/huw_webpanel	2001-08-12 20:13:59.000000000 +0200
@@ -335,7 +335,6 @@ CONFIG_CRAMFS=y
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/integrator linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/integrator
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/integrator	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/integrator	2002-08-03 02:39:42.000000000 +0200
@@ -542,7 +542,6 @@ CONFIG_JFFS2_FS_DEBUG=0
 CONFIG_MINIX_FS=y
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/jornada720 linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/jornada720
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/jornada720	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/jornada720	2002-08-03 02:39:42.000000000 +0200
@@ -676,7 +676,6 @@ CONFIG_ISO9660_FS=m
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/lart linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/lart
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/lart	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/lart	2002-08-03 02:39:42.000000000 +0200
@@ -664,7 +664,6 @@ CONFIG_JOLIET=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_FREEVXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/lusl7200 linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/lusl7200
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/lusl7200	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/lusl7200	2000-06-20 02:59:33.000000000 +0200
@@ -188,7 +188,6 @@ CONFIG_SERIAL_L7200_CONSOLE=y
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/neponset linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/neponset
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/neponset	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/neponset	2002-08-03 02:39:42.000000000 +0200
@@ -653,7 +653,6 @@ CONFIG_JFFS2_FS_DEBUG=0
 # CONFIG_MINIX_FS is not set
 # CONFIG_FREEVXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/omnimeter linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/omnimeter
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/omnimeter	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/omnimeter	2001-08-12 20:13:59.000000000 +0200
@@ -431,7 +431,6 @@ CONFIG_MSDOS_FS=y
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/pangolin linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/pangolin
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/pangolin	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/pangolin	2002-08-03 02:39:42.000000000 +0200
@@ -568,7 +568,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/pfs168_mqtft linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/pfs168_mqtft
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/pfs168_mqtft	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/pfs168_mqtft	2002-08-03 02:39:42.000000000 +0200
@@ -608,7 +608,6 @@ CONFIG_JFFS_FS_VERBOSE=0
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/pfs168_mqvga linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/pfs168_mqvga
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/pfs168_mqvga	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/pfs168_mqvga	2002-08-03 02:39:42.000000000 +0200
@@ -608,7 +608,6 @@ CONFIG_JFFS_FS_VERBOSE=0
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/pfs168_sastn linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/pfs168_sastn
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/pfs168_sastn	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/pfs168_sastn	2002-08-03 02:39:42.000000000 +0200
@@ -601,7 +601,6 @@ CONFIG_JFFS_FS_VERBOSE=0
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/pfs168_satft linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/pfs168_satft
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/pfs168_satft	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/pfs168_satft	2002-08-03 02:39:42.000000000 +0200
@@ -608,7 +608,6 @@ CONFIG_JFFS_FS_VERBOSE=0
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/pleb linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/pleb
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/pleb	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/pleb	2002-08-03 02:39:42.000000000 +0200
@@ -459,7 +459,6 @@ CONFIG_TMPFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/rpc linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/rpc
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/rpc	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/rpc	2002-08-03 02:39:42.000000000 +0200
@@ -629,7 +629,6 @@ CONFIG_JOLIET=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/shannon linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/shannon
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/shannon	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/shannon	2002-08-03 02:39:42.000000000 +0200
@@ -537,8 +537,6 @@ CONFIG_RAMFS=y
 CONFIG_MINIX_FS=y
 # CONFIG_FREEVXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/shark linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/shark
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/shark	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/shark	2002-08-03 02:39:42.000000000 +0200
@@ -637,7 +637,6 @@ CONFIG_JOLIET=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_FREEVXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/sherman linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/sherman
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/sherman	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/sherman	2001-08-12 20:13:59.000000000 +0200
@@ -148,8 +148,6 @@ CONFIG_SERIAL_SA1100_CONSOLE=y
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_QNX4FS_FS is not set
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/system3 linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/system3
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/system3	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/system3	2002-08-03 02:39:42.000000000 +0200
@@ -693,7 +693,6 @@ CONFIG_TMPFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/victor linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/victor
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/def-configs/victor	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/def-configs/victor	2000-06-20 02:59:33.000000000 +0200
@@ -141,8 +141,6 @@ CONFIG_ISO9660_FS=y
 CONFIG_JOLIET=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_PROC_FS is not set
 # CONFIG_QNX4FS_FS is not set
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/arm/defconfig linux-2.4.20-wolk4.16-fullkernel/arch/arm/defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/arm/defconfig	2004-06-29 11:31:52.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/arm/defconfig	2004-09-05 16:08:32.000000000 +0200
@@ -426,7 +426,6 @@ CONFIG_PSMOUSE=y
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/cris/defconfig linux-2.4.20-wolk4.16-fullkernel/arch/cris/defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/cris/defconfig	2004-06-29 11:31:52.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/cris/defconfig	2004-09-05 16:08:32.000000000 +0200
@@ -457,7 +457,6 @@ CONFIG_RAMFS=y
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/i386/Makefile linux-2.4.20-wolk4.16-fullkernel/arch/i386/Makefile
--- linux-2.4.20-wolk4.15-fullkernel/arch/i386/Makefile	2004-06-29 11:32:25.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/i386/Makefile	2004-09-05 17:10:50.000000000 +0200
@@ -22,13 +22,13 @@ LDFLAGS=-e stext
 LINKFLAGS =-T $(TOPDIR)/arch/i386/vmlinux.lds $(LDFLAGS)
 
 # NWFS, DavFS are broken with -msoft-float. Fix it!
-ifndef CONFIG_NWFS_FS
- ifndef CONFIG_DAV_FS
-  CFLAGS += -pipe -msoft-float
- endif
-else
+#ifndef CONFIG_NWFS_FS
+# ifndef CONFIG_DAV_FS
+#  CFLAGS += -pipe -msoft-float
+# endif
+#else
  CFLAGS += -pipe
-endif
+#endif
 
 check_gcc = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi)
 
@@ -118,7 +118,11 @@ endif
 
 # Enable unit-at-a-time mode when possible. It shrinks the
 # kernel considerably.
-CFLAGS += $(call check_gcc,-funit-at-a-time,)
+#CFLAGS += $(call check_gcc,-funit-at-a-time,)
+
+# Disable unit-at-a-time mode, it makes gcc use a lot more stack
+# due to the lack of sharing of stacklots.
+CFLAGS += $(call check_gcc,-fno-unit-at-a-time,)
 
 HEAD := arch/i386/kernel/head.o arch/i386/kernel/init_task.o
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/i386/config.in linux-2.4.20-wolk4.16-fullkernel/arch/i386/config.in
--- linux-2.4.20-wolk4.15-fullkernel/arch/i386/config.in	2004-06-29 11:32:25.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/i386/config.in	2004-09-05 16:28:06.000000000 +0200
@@ -413,6 +413,7 @@ if [ "$CONFIG_HIGHMEM64G" = "y" ]; then
      choice 'User address space size' \
 	"3GB		CONFIG_3GB \
 	 2GB		CONFIG_2GB \
+	 1GB.REAL	CONFIG_1GB_REAL \
 	 1GB		CONFIG_1GB" 1GB
    else
      define_bool CONFIG_1GB y
@@ -425,6 +426,7 @@ else
 	"3.5GB		CONFIG_05GB \
 	 3GB		CONFIG_3GB \
 	 2GB		CONFIG_2GB \
+	 1GB.REAL	CONFIG_1GB_REAL \
 	 1GB		CONFIG_1GB" 1GB
    else
      define_bool CONFIG_1GB y
@@ -446,7 +448,7 @@ bool 'Support for big physical area rese
 bool 'Symmetric multi-processing support' CONFIG_SMP
 if [ "$CONFIG_SMP" != "y" ]; then
    bool 'Local APIC support on uniprocessors' CONFIG_X86_UP_APIC
-   dep_bool '  Do not report APIC errors on CPU' CONFIG_X86_UP_APIC_ERRORS $CONFIG_X86_UP_APIC
+   dep_bool '  Do not report APIC errors on CPU' CONFIG_X86_FUCK_DIFFERENT_NAMINGS_BC_XCONFIG_IS_FUCKED_ERRORS $CONFIG_X86_UP_APIC
    dep_bool 'IO-APIC support on uniprocessors' CONFIG_X86_UP_IOAPIC $CONFIG_X86_UP_APIC
    if [ "$CONFIG_X86_UP_APIC" = "y" ]; then
       define_bool CONFIG_X86_LOCAL_APIC y
@@ -455,7 +457,7 @@ if [ "$CONFIG_SMP" != "y" ]; then
       define_bool CONFIG_X86_IO_APIC y
    fi
 else
-   dep_bool '  Do not report APIC errors on CPUs' CONFIG_X86_UP_APIC_ERRORS $CONFIG_X86_UP_APIC
+   bool '  Do not report APIC errors on CPUs' CONFIG_X86_FUCK_DIFFERENT_NAMINGS_BC_XCONFIG_IS_FUCKED_ERRORS
    int  'Maximum number of CPUs (2-32)' CONFIG_NR_CPUS 2
    bool 'Multi-node NUMA system support' CONFIG_X86_NUMA
    if [ "$CONFIG_X86_NUMA" = "y" ]; then
@@ -480,9 +482,9 @@ if [ "$CONFIG_X86_NUMA" != "y" ]; then
 fi
 
 if [ "$CONFIG_SMP" = "y" -o "$CONFIG_PREEMPT" = "y" ]; then
-	if [ "$CONFIG_X86_CMPXCHG" = "y" ]; then
-		define_bool CONFIG_HAVE_DEC_LOCK y
-	fi
+   if [ "$CONFIG_X86_CMPXCHG" = "y" ]; then
+      define_bool CONFIG_HAVE_DEC_LOCK y
+   fi
 fi
 
 if [ "$CONFIG_EXPERIMENTAL" = "y" -a "$CONFIG_MK7" = "y" ]; then
@@ -582,7 +584,7 @@ fi
 
 mainmenu_option next_comment
 comment 'Executable file formats'
-tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF
+bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF
 if [ "$CONFIG_BINFMT_ELF" != "n" ]; then
    bool '  ELF binaries with a.out format interpreters or a.out libraries' CONFIG_BINFMT_ELF_AOUT
 fi
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/apic.c linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/apic.c
--- linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/apic.c	2004-06-29 11:31:12.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/apic.c	2004-09-05 16:28:06.000000000 +0200
@@ -1181,7 +1181,7 @@ asmlinkage void smp_error_interrupt(void
 	   6: Received illegal vector
 	   7: Illegal register address
 	*/
-#ifndef CONFIG_X86_UP_APIC_ERRORS
+#ifndef CONFIG_X86_FUCK_DIFFERENT_NAMINGS_BC_XCONFIG_IS_FUCKED_ERRORS
 	printk (KERN_INFO "APIC error on CPU%d: %02lx(%02lx)\n",
 	        smp_processor_id(), v , v1);
 #endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/entry.S linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/entry.S
--- linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/entry.S	2004-06-29 11:31:44.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/entry.S	2004-09-05 16:09:14.000000000 +0200
@@ -82,8 +82,28 @@ tsk_ptrace	= 24
 cpu		= 32
 systrace	= 56
 
+/* These are offsets into the irq_stat structure
+ * There is one per cpu and it is aligned to 32
+ * byte boundry (we put that here as a shift count)
+ */
+irq_array_shift			= CONFIG_X86_L1_CACHE_SHIFT
+
+irq_stat_local_irq_count	= 4
+irq_stat_local_bh_count		= 8
+
 ENOSYS = 38
 
+#ifdef CONFIG_SMP
+#define GET_CPU_INDX	movl processor(%ebx),%eax;  \
+			shll $irq_array_shift,%eax
+#define GET_CURRENT_CPU_INDX GET_CURRENT(%ebx); \
+			GET_CPU_INDX
+#define CPU_INDX (,%eax)
+#else
+#define GET_CPU_INDX
+#define GET_CURRENT_CPU_INDX GET_CURRENT(%ebx)
+#define CPU_INDX
+#endif
 
 #define SAVE_ALL \
 	cld; \
@@ -296,12 +316,10 @@ badsys:
 ENTRY(ret_from_intr)
 	GET_CURRENT(%ebx)
 #ifdef CONFIG_PREEMPT
-	decl preempt_count(%ebx)
-ret_from_exception:
 	cli
-#else
-ret_from_exception:
+	decl preempt_count(%ebx)
 #endif
+ret_from_exception:
 	movl EFLAGS(%esp),%eax		# mix EFLAGS and CS
 	movb CS(%esp),%al
 	testl $(VM_MASK | 3),%eax	# return to VM86 mode or non-supervisor?
@@ -311,8 +329,9 @@ ret_from_exception:
 	jnz restore_all
 	cmpl $0,need_resched(%ebx)
 	jz restore_all
-	testl $IF_MASK,EFLAGS(%esp)     # Ints off (execption path) ?
-	jz restore_all
+	movl SYMBOL_NAME(irq_stat)+irq_stat_local_bh_count CPU_INDX,%ecx
+	addl SYMBOL_NAME(irq_stat)+irq_stat_local_irq_count CPU_INDX,%ecx
+	jnz restore_all
 	incl preempt_count(%ebx)
 	sti
 	call SYMBOL_NAME(preempt_schedule)
@@ -809,7 +828,7 @@ ENTRY(sys_call_table)
 	.long SYMBOL_NAME(sys_epoll_create)
 	.long SYMBOL_NAME(sys_epoll_ctl)	/* 255 sys_epoll_ctl */
 	.long SYMBOL_NAME(sys_epoll_wait)
-	.long SYMBOL_NAME(sys_remap_file_pages)
+	.long SYMBOL_NAME(sys_ni_syscall)
 	.long SYMBOL_NAME(sys_ni_syscall)
 	.long SYMBOL_NAME(sys_ni_syscall)
 	.long SYMBOL_NAME(sys_setcpucap)	/* 260 - Broege's CPU */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/head.S linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/head.S
--- linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/head.S	2004-06-29 11:31:07.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/head.S	2004-09-05 16:05:40.000000000 +0200
@@ -481,49 +481,49 @@ ENTRY(gdt_table)
 	.quad 0x0000000000000000	/* NULL descriptor */
 
 #if defined(CONFIG_GRKERNSEC_PAX_KERNEXEC) && defined(CONFIG_PCI_BIOS)
-	.quad 0x00cf9b000000ffff        /* 0x08 kernel 4GB code at 0x00000000 */
+	.quad 0x00cf9b000000ffff	/* 0x08 kernel 4GB code at 0x00000000 */
 #else
-	.quad 0x0000000000000000        /* not used */
+	.quad 0x0000000000000000	/* not used */
 #endif
 #ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
-	.quad 0xc0cf9b400000ffff        /* 0x10 kernel 4GB code at 0xc0400000 */
+	.quad 0xc0cf9b400000ffff	/* 0x10 kernel 4GB code at 0xc0400000 */
 #else
-	.quad 0x00cf9b000000ffff        /* 0x10 kernel 4GB code at 0x00000000 */
+	.quad 0x00cf9b000000ffff	/* 0x10 kernel 4GB code at 0x00000000 */
 #endif
 
 	.quad 0x00cf93000000ffff	/* 0x18 kernel 4GB data at 0x00000000 */
 	.quad 0x00cffb000000ffff	/* 0x23 user   4GB code at 0x00000000 */
 	.quad 0x00cff3000000ffff	/* 0x2b user   4GB data at 0x00000000 */
-	.quad 0x0000000000000000        /* not used */
-	.quad 0x0000000000000000        /* not used */
+	.quad 0x0000000000000000	/* not used */
+	.quad 0x0000000000000000	/* not used */
 	/*
 	 * The APM segments have byte granularity and their bases
 	 * and limits are set at run time.
 	 */
-	.quad 0x0040930000000000        /* 0x40 APM set up for bad BIOS's */
-	.quad 0x00409b0000000000        /* 0x48 APM CS    code */
-	.quad 0x00009b0000000000        /* 0x50 APM CS 16 code (16 bit) */
-	.quad 0x0040930000000000        /* 0x58 APM DS    data */
-	.fill NR_CPUS*4,8,0             /* space for TSS's and LDT's */
+	.quad 0x0040930000000000	/* 0x40 APM set up for bad BIOS's */
+	.quad 0x00409b0000000000	/* 0x48 APM CS    code */
+	.quad 0x00009b0000000000	/* 0x50 APM CS 16 code (16 bit) */
+	.quad 0x0040930000000000	/* 0x58 APM DS    data */
+	.fill NR_CPUS*4,8,0		/* space for TSS's and LDT's */
 
 #ifdef CONFIG_GRKERNSEC_PAX_SEGMEXEC
 ENTRY(gdt_table2)
-	.quad 0x0000000000000000        /* NULL descriptor */
+	.quad 0x0000000000000000	/* NULL descriptor */
 
 #if defined(CONFIG_GRKERNSEC_PAX_KERNEXEC) && defined(CONFIG_PCI_BIOS)
-	.quad 0x00cf9b000000ffff        /* 0x08 kernel 4GB code at 0x00000000 */
+	.quad 0x00cf9b000000ffff	/* 0x08 kernel 4GB code at 0x00000000 */
 #else
-	.quad 0x0000000000000000        /* not used */
+	.quad 0x0000000000000000	/* not used */
 #endif
 #ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
-	.quad 0xc0cf9b400000ffff        /* 0x10 kernel 4GB code at 0xc0400000 */
+	.quad 0xc0cf9b400000ffff	/* 0x10 kernel 4GB code at 0xc0400000 */
 #else
-	.quad 0x00cf9b000000ffff        /* 0x10 kernel 4GB code at 0x00000000 */
+	.quad 0x00cf9b000000ffff	/* 0x10 kernel 4GB code at 0x00000000 */
 #endif
 
-	.quad 0x00cf93000000ffff        /* 0x18 kernel 4GB data at 0x00000000 */
-	.quad 0x60c5fb000000ffff        /* 0x23 user 1.5GB code at 0x60000000 */
-	.quad 0x00c5f3000000ffff        /* 0x2b user 1.5GB data at 0x00000000 */
+	.quad 0x00cf93000000ffff	/* 0x18 kernel 4GB data at 0x00000000 */
+	.quad 0x60c5fb000000ffff	/* 0x23 user 1.5GB code at 0x60000000 */
+	.quad 0x00c5f3000000ffff	/* 0x2b user 1.5GB data at 0x00000000 */
 
 	.quad 0x0000000000000000	/* not used */
 	.quad 0x0000000000000000	/* not used */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/i386_ksyms.c linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/i386_ksyms.c
--- linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/i386_ksyms.c	2004-06-29 11:26:00.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/i386_ksyms.c	2004-09-05 16:06:22.000000000 +0200
@@ -127,10 +127,8 @@ EXPORT_SYMBOL(pcibios_penalize_isa_irq);
 EXPORT_SYMBOL(pci_mem_start);
 #endif
 
-#ifdef CONFIG_PCI_BIOS
 EXPORT_SYMBOL(pcibios_set_irq_routing);
 EXPORT_SYMBOL(pcibios_get_irq_routing_table);
-#endif
 
 #ifdef CONFIG_X86_USE_3DNOW
 EXPORT_SYMBOL(_mmx_memcpy);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/init_task.c linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/init_task.c
--- linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/init_task.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/init_task.c	2004-09-05 17:09:43.000000000 +0200
@@ -30,5 +30,9 @@ union task_union init_task_union 
  * section. Since TSS's are completely CPU-local, we want them
  * on exact cacheline boundaries, to eliminate cacheline ping-pong.
  */ 
-struct tss_struct init_tss[NR_CPUS] __cacheline_aligned = { [0 ... NR_CPUS-1] = INIT_TSS };
 
+#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
+struct tss_struct init_tss[NR_CPUS] __attribute__((__aligned__(SMP_CACHE_BYTES), __section__(".rodata"))) = { [0 ... NR_CPUS-1] = INIT_TSS };
+#else
+struct tss_struct init_tss[NR_CPUS] __cacheline_aligned = { [0 ... NR_CPUS-1] = INIT_TSS };
+#endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/ioport.c linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/ioport.c
--- linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/ioport.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/ioport.c	2004-09-05 17:09:43.000000000 +0200
@@ -15,6 +15,7 @@
 #include <linux/smp_lock.h>
 #include <linux/stddef.h>
 #include <linux/grsecurity.h>
+#include <asm/desc.h>
 
 /* RSBAC */
 #ifdef CONFIG_RSBAC
@@ -63,6 +64,10 @@ asmlinkage int sys_ioperm(unsigned long 
 	struct thread_struct * t = &current->thread;
 	struct tss_struct * tss;
 
+#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
+	unsigned long flags, cr3;
+#endif
+
         /* RSBAC */
         #ifdef CONFIG_RSBAC
         union rsbac_target_id_t       rsbac_target_id;
@@ -126,6 +131,11 @@ asmlinkage int sys_ioperm(unsigned long 
 	 * do it in the per-thread copy and in the TSS ...
 	 */
 	set_bitmap(t->io_bitmap, from, num, !turn_on);
+
+#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
+	pax_open_kernel(flags, cr3);
+#endif
+
 	if (tss->bitmap == IO_BITMAP_OFFSET) { /* already active? */
 		set_bitmap(tss->io_bitmap, from, num, !turn_on);
 	} else {
@@ -133,6 +143,10 @@ asmlinkage int sys_ioperm(unsigned long 
 		tss->bitmap = IO_BITMAP_OFFSET; /* Activate it in the TSS */
 	}
 
+#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
+	pax_close_kernel(flags, cr3);
+#endif
+
 	preempt_enable();
 
 	return 0;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/mtrr.c linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/mtrr.c
--- linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/mtrr.c	2004-06-29 11:26:12.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/mtrr.c	2004-09-05 16:06:00.000000000 +0200
@@ -1677,11 +1677,17 @@ static int mtrr_file_del (unsigned long 
 static ssize_t mtrr_read (struct file *file, char *buf, size_t len,
 			  loff_t *ppos)
 {
-    if (*ppos >= ascii_buf_bytes) return 0;
-    if (*ppos + len > ascii_buf_bytes) len = ascii_buf_bytes - *ppos;
-    if ( copy_to_user (buf, ascii_buffer + *ppos, len) ) return -EFAULT;
-    *ppos += len;
-    return len;
+	loff_t pos = *ppos;
+	if (pos < 0 || pos >= ascii_buf_bytes)
+		return 0;
+	if (len > ascii_buf_bytes - pos)
+		len = ascii_buf_bytes - pos;
+	if (copy_to_user(buf, ascii_buffer + pos, len))
+		return -EFAULT;
+	pos += len;
+	*ppos = pos;
+
+	return len;
 }   /*  End Function mtrr_read  */
 
 static ssize_t mtrr_write (struct file *file, const char *buf, size_t len,
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/pci-pc.c linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/pci-pc.c
--- linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/pci-pc.c	2004-06-29 11:31:27.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/pci-pc.c	2004-09-05 16:06:32.000000000 +0200
@@ -516,8 +516,6 @@ static struct pci_ops * __devinit pci_ch
  * BIOS32 and PCI BIOS handling.
  */
 
-#ifdef CONFIG_PCI_BIOS
-
 #define PCIBIOS_PCI_FUNCTION_ID 	0xb1XX
 #define PCIBIOS_PCI_BIOS_PRESENT 	0xb101
 #define PCIBIOS_FIND_PCI_DEVICE		0xb102
@@ -1065,7 +1063,6 @@ int pcibios_set_irq_routing(struct pci_d
 	return !(ret & 0xff00);
 }
 
-#endif
 
 /*
  * Several buggy motherboards address only 16 devices and mirror
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/process.c linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/process.c
--- linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/process.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/process.c	2004-09-05 17:09:43.000000000 +0200
@@ -29,6 +29,7 @@
 #include <linux/a.out.h>
 #include <linux/interrupt.h>
 #include <linux/config.h>
+#include <linux/version.h>
 #include <linux/delay.h>
 #include <linux/reboot.h>
 #include <linux/init.h>
@@ -801,7 +802,7 @@ void show_regs(struct pt_regs * regs)
 	printk("EIP: %04x:[<%08lx>] CPU: %d",0xffff & regs->xcs,regs->eip, smp_processor_id());
 	if (regs->xcs & 3)
 		printk(" ESP: %04x:%08lx",0xffff & regs->xss,regs->esp);
-	printk(" EFLAGS: %08lx    %s\n",regs->eflags, print_tainted());
+	printk(" EFLAGS: %08lx    %s  (%s)\n",regs->eflags, print_tainted(),UTS_RELEASE);
 	printk("EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
 		regs->eax,regs->ebx,regs->ecx,regs->edx);
 	printk("ESI: %08lx EDI: %08lx EBP: %08lx",
@@ -1008,6 +1009,10 @@ void __switch_to(struct task_struct *pre
 				 *next = &next_p->thread;
 	struct tss_struct *tss = init_tss + smp_processor_id();
 
+#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
+	unsigned long flags, cr3;
+#endif
+
 	unlazy_fpu(prev_p);
 
 #ifdef CONFIG_GRKERNSEC_PAX_SEGMEXEC
@@ -1015,11 +1020,6 @@ void __switch_to(struct task_struct *pre
 #endif
 
 	/*
-	 * Reload esp0, LDT and the page table pointer:
-	 */
-	tss->esp0 = next->esp0;
-
-	/*
 	 * Save away %fs and %gs. No need to save %es and %ds, as
 	 * those are always kernel segments while inside the kernel.
 	 */
@@ -1047,6 +1047,15 @@ void __switch_to(struct task_struct *pre
 		loaddebug(next, 7);
 	}
 
+#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
+	pax_open_kernel(flags, cr3);
+#endif
+
+	/*
+	 * Reload esp0, LDT and the page table pointer:
+	 */
+	tss->esp0 = next->esp0;
+
 	if (unlikely(prev->ioperm || next->ioperm)) {
 		if (next->ioperm) {
 			/*
@@ -1069,6 +1078,11 @@ void __switch_to(struct task_struct *pre
 			 */
 			tss->bitmap = INVALID_IO_BITMAP_OFFSET;
 	}
+
+#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
+	pax_close_kernel(flags, cr3);
+#endif
+
 }
 
 asmlinkage int sys_fork(struct pt_regs regs)
@@ -1163,6 +1177,10 @@ asmlinkage void pax_randomize_kstack(voi
 	struct tss_struct *tss = init_tss + smp_processor_id();
 	unsigned long time;
 
+#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
+	unsigned long flags, cr3;
+#endif
+
 #ifdef CONFIG_GRKERNSEC_PAX_SOFTMODE
 	if (!pax_aslr)
 		return;
@@ -1179,7 +1197,16 @@ asmlinkage void pax_randomize_kstack(voi
 	time <<= 2;
 #endif
 
+#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
+	pax_open_kernel(flags, cr3);
+#endif
+
 	tss->esp0 ^= time;
 	current->thread.esp0 = tss->esp0;
+
+#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
+	pax_close_kernel(flags, cr3);
+#endif
+
 }
 #endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/semaphore.c linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/semaphore.c
--- linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/semaphore.c	2004-06-29 11:23:39.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/semaphore.c	2004-09-05 15:46:44.000000000 +0200
@@ -56,6 +56,7 @@ void __up(struct semaphore *sem)
 static spinlock_t semaphore_lock = SPIN_LOCK_UNLOCKED;
 
 void __wtd_down(struct semaphore * sem, struct worktodo *wtd);
+void __wtd_down_from_wakeup(struct semaphore * sem, struct worktodo *wtd);
 
 void __wtd_down_action(void *data)
 {
@@ -65,7 +66,7 @@ void __wtd_down_action(void *data)
 	wtd_pop(wtd);
 	sem = wtd->data;
 
-	__wtd_down(sem, wtd);
+	__wtd_down_from_wakeup(sem, wtd);
 }
 
 void __wtd_down_waiter(wait_queue_t *wait)
@@ -78,7 +79,8 @@ void __wtd_down_waiter(wait_queue_t *wai
 	wtd_queue(wtd);
 }
 
-void __wtd_down(struct semaphore * sem, struct worktodo *wtd)
+void wtd_down_common(struct semaphore * sem, struct worktodo *wtd,
+                       int do_incr)
 {
 	int gotit;
 	int sleepers;
@@ -87,7 +89,7 @@ void __wtd_down(struct semaphore * sem, 
 	wtd->data = sem;
 
 	spin_lock_irq(&semaphore_lock);
-	sem->sleepers++;
+	sem->sleepers += do_incr;
 	sleepers = sem->sleepers;
 	gotit = add_wait_queue_exclusive_cond(&sem->wait, &wtd->wait,
 			atomic_add_negative(sleepers - 1, &sem->count));
@@ -102,6 +104,20 @@ void __wtd_down(struct semaphore * sem, 
 		wtd_queue(wtd);
 	}
 }
+ 
+void __wtd_down(struct semaphore * sem, struct worktodo *wtd)
+{
+	wtd_down_common(sem, wtd, 1);
+}
+
+/*
+ * Same as __wtd_down, but sem->sleepers is not incremented when
+ * coming from a wakeup.
+ */
+void __wtd_down_from_wakeup(struct semaphore * sem, struct worktodo *wtd)
+{
+	wtd_down_common(sem, wtd, 0);
+}
 
 void __down(struct semaphore * sem)
 {
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/setup.c linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/setup.c
--- linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/setup.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/setup.c	2004-09-05 17:09:43.000000000 +0200
@@ -177,7 +177,7 @@ unsigned char aux_device_present;
 extern void mcheck_init(struct cpuinfo_x86 *c);
 extern void dmi_scan_machine(void);
 extern int root_mountflags;
-extern char _text, _etext, _edata, _end;
+extern char _text, _etext, _data, _edata, _end;
 
 static int have_cpuid_p(void) __init;
 
@@ -1299,7 +1299,9 @@ static __init void parse_apic_cmdline(ch
 void __init setup_arch(char **cmdline_p)
 {
 	unsigned long max_low_pfn;
+	void init_trap_gates(void);
 
+	init_trap_gates();
 #ifdef CONFIG_VISWS
 	visws_get_board_type_and_rev();
 #endif
@@ -1341,7 +1343,7 @@ void __init setup_arch(char **cmdline_p)
 
 	code_resource.start = virt_to_bus(&_text);
 	code_resource.end = virt_to_bus(&_etext)-1;
-	data_resource.start = virt_to_bus(&_etext);
+	data_resource.start = virt_to_bus(&_data);
 	data_resource.end = virt_to_bus(&_edata)-1;
 
 	parse_cmdline_early(cmdline_p);
@@ -2510,10 +2512,13 @@ static struct _cache_table cache_table[]
 	{ 0x70, LVL_TRACE,  12 },
 	{ 0x71, LVL_TRACE,  16 },
 	{ 0x72, LVL_TRACE,  32 },
+	{ 0x78, LVL_2,      1024 },
 	{ 0x79, LVL_2,      128 },
 	{ 0x7A, LVL_2,      256 },
 	{ 0x7B, LVL_2,      512 },
 	{ 0x7C, LVL_2,      1024 },
+	{ 0x7D, LVL_2,      2048 },
+	{ 0x7F, LVL_2,      512 },
 	{ 0x82, LVL_2,      256 },
 	{ 0x83, LVL_2,      512 },
 	{ 0x84, LVL_2,      1024 },
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/traps.c linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/traps.c
--- linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/traps.c	2004-06-29 11:32:31.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/traps.c	2004-09-05 16:09:02.000000000 +0200
@@ -17,6 +17,7 @@
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/ptrace.h>
+#include <linux/version.h>
 #include <linux/timer.h>
 #include <linux/mm.h>
 #include <linux/init.h>
@@ -140,24 +141,25 @@ static inline int kernel_text_address(un
 
 void show_trace(unsigned long * stack)
 {
-	int i;
 	unsigned long addr;
+	int i = kstack_depth_to_print;
 
 	if (!stack)
 		stack = (unsigned long*)&stack;
 
-	printk("\nCall Trace:\n");
-	i = 1;
-	while (((long) stack & (THREAD_SIZE-1)) != 0) {
+	printk("Call Trace:");
+#ifdef CONFIG_KALLSYMS
+	printk("\n");
+#endif
+	while (i && (((long) stack & (THREAD_SIZE-1)) != 0)) {
 		addr = *stack++;
 		if (kernel_text_address(addr)) {
-			if (i && ((i % 6) == 0))
-				printk("\n ");
-			printk(" [<%08lx>]", addr);
-			printk("\n");
-			i++;
+			printk("  [<%08lx>] ", addr);
+			print_symbol("%s\n", addr);
+			--i;
 		}
 	}
+	printk("\n");
 }
 
 void show_trace_task(struct task_struct *tsk)
@@ -182,7 +184,7 @@ void show_stack(unsigned long * esp)
 		esp=(unsigned long*)&esp;
 
 	stack = esp;
-	for(i=0; i < kstack_depth_to_print; i++) {
+	for(i = 0; i < kstack_depth_to_print; i++) {
 		if (((long) stack & (THREAD_SIZE-1)) == 0)
 			break;
 		if (i && ((i % 8) == 0))
@@ -218,10 +220,12 @@ void show_registers(struct pt_regs *regs
 	}
 	module_oops_tracking_init();
 	kernel_text_address(regs->eip);
-	printk("CPU:    %d\nEIP:    %04x:[<%08lx>]    %s\nEFLAGS: %08lx\n",
+	print_modules();
+	printk("CPU:    %d\nEIP:    %04x:[<%08lx>]    %s VLI\nEFLAGS: %08lx"
+			"   (%s) \n",
 		smp_processor_id(), 0xffff & regs->xcs, regs->eip,
-		print_tainted(), regs->eflags);
-
+		print_tainted(), regs->eflags, UTS_RELEASE);
+	print_symbol("EIP is at %s\n", regs->eip);
 	printk("eax: %08lx   ebx: %08lx   ecx: %08lx   edx: %08lx\n",
 		regs->eax, regs->ebx, regs->ecx, regs->edx);
 	printk("esi: %08lx   edi: %08lx   ebp: %08lx   esp: %08lx\n",
@@ -240,7 +244,7 @@ void show_registers(struct pt_regs *regs
 		show_stack((unsigned long*)esp);
 		module_oops_tracking_print();
 
-		printk("\nCode: ");
+		printk("Code: ");
 #ifndef CONFIG_GRKERNSEC_PAX_KERNEXEC
 		if(regs->eip < PAGE_OFFSET)
 			goto bad;
@@ -319,6 +323,7 @@ spinlock_t die_lock = SPIN_LOCK_UNLOCKED
 
 void die(const char * str, struct pt_regs * regs, long err)
 {
+	static int die_counter;
 	int nl = 0;
 
 	console_verbose();
@@ -336,8 +341,7 @@ void die(const char * str, struct pt_reg
 		);
 */
 	handle_BUG(regs);
-	printk("%s: %04lx ", str, err & 0xffff);
-	printk(oops_id);
+	printk("%s: %04lx [#%d]\n", str, err & 0xffff, ++die_counter);
 
 #ifdef CONFIG_PREEMPT
 	printk("PREEMPT ");
@@ -347,6 +351,38 @@ void die(const char * str, struct pt_reg
 	printk("SMP ");
 	nl = 1;
 #endif
+#ifdef CONFIG_HIGHPTE
+	printk("HIGHPTE ");
+	nl = 1;
+#endif
+#ifdef CONFIG_DEBUG_HIGHMEM
+	printk("DEBUG_HIGHMEM ");
+	nl = 1;
+#endif
+#ifdef CONFIG_DEBUG_SLAB
+	printk("DEBUG_SLAB ");
+	nl = 1;
+#endif
+#ifdef CONFIG_DEBUG_IOVIRT
+	printk("DEBUG_IOVIRT ");
+	nl = 1;
+#endif
+#ifdef CONFIG_DEBUG_SPINLOCK
+	printk("DEBUG_SPINLOCK ");
+	nl = 1;
+#endif
+#ifdef CONFIG_FRAME_POINTER
+	printk("FRAME_POINTER ");
+	nl = 1;
+#endif
+#ifdef CONFIG_KDB
+	printk("KDB ");
+	nl = 1;
+#endif
+#ifdef CONFIG_GRKERNSEC
+	printk("GRSECURITY ");
+	nl = 1;
+#endif
 	if (nl)
 		printk("\n");
 
@@ -577,7 +613,7 @@ asmlinkage void do_nmi(struct pt_regs * 
 	}
 #endif	/* defined(CONFIG_SMP) && defined(CONFIG_KDB) */
 	if (!(reason & 0xc0)) {
-#if CONFIG_X86_LOCAL_APIC
+#ifdef CONFIG_X86_LOCAL_APIC
 		/*
 		 * Ok, so this is none of the documented NMI sources,
 		 * so it must be the NMI watchdog.
@@ -1101,25 +1137,9 @@ cobalt_init(void)
 	printk("Cobalt APIC enabled: ID reg %lx\n", co_apic_read(CO_APIC_ID));
 }
 #endif
-void __init trap_init(void)
-{
-#ifdef CONFIG_X86_LOCAL_APIC
-#ifndef CONFIG_SMP
-	extern int enable_apic_up;
-#endif
-#endif
-#ifdef CONFIG_EISA
-	if (isa_readl(0x0FFFD9) == 'E'+('I'<<8)+('S'<<16)+('A'<<24))
-		EISA_bus = 1;
-#endif
-
-#ifdef CONFIG_X86_LOCAL_APIC
-#ifndef CONFIG_SMP
-	if(enable_apic_up)
-#endif
-	init_apic_mappings();
-#endif
 
+void __init init_trap_gates(void)
+{
 	set_trap_gate(0,&divide_error);
 	set_trap_gate(1,&debug);
 	set_intr_gate(2,&nmi);
@@ -1167,6 +1187,26 @@ void __init trap_init(void)
 	 */
 	set_call_gate(&default_ldt[0],lcall7);
 	set_call_gate(&default_ldt[4],lcall27);
+}
+
+void __init trap_init(void)
+{
+#ifdef CONFIG_X86_LOCAL_APIC
+#ifndef CONFIG_SMP
+	extern int enable_apic_up;
+#endif
+#endif
+#ifdef CONFIG_EISA
+	if (isa_readl(0x0FFFD9) == 'E'+('I'<<8)+('S'<<16)+('A'<<24))
+		EISA_bus = 1;
+#endif
+
+#ifdef CONFIG_X86_LOCAL_APIC
+#ifndef CONFIG_SMP
+	if(enable_apic_up)
+#endif
+	init_apic_mappings();
+#endif
 
 	/*
 	 * Should be a barrier for any external CPU state.
@@ -1182,7 +1222,7 @@ void __init trap_init(void)
 
 EXPORT_SYMBOL_GPL(netdump_func);
 EXPORT_SYMBOL_GPL(netdump_mode);
-#if CONFIG_X86_LOCAL_APIC
+#ifdef CONFIG_X86_LOCAL_APIC
 EXPORT_SYMBOL_GPL(nmi_watchdog);
 #endif
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/vm86.c linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/vm86.c
--- linux-2.4.20-wolk4.15-fullkernel/arch/i386/kernel/vm86.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/i386/kernel/vm86.c	2004-09-05 17:09:43.000000000 +0200
@@ -45,6 +45,7 @@
 #include <asm/pgalloc.h>
 #include <asm/io.h>
 #include <asm/irq.h>
+#include <asm/desc.h>
 
 /*
  * Known problems:
@@ -98,6 +99,10 @@ struct pt_regs * save_v86_state(struct k
 	struct pt_regs *ret;
 	unsigned long tmp;
 
+#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
+	unsigned long flags, cr3;
+#endif
+
 	if (!current->thread.vm86_info) {
 		printk("no vm86_info: BAD\n");
 		do_exit(SIGSEGV);
@@ -112,7 +117,17 @@ struct pt_regs * save_v86_state(struct k
 		do_exit(SIGSEGV);
 	}
 	tss = init_tss + smp_processor_id();
+
+#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
+	pax_open_kernel(flags, cr3);
+#endif
+
 	tss->esp0 = current->thread.esp0 = current->thread.saved_esp0;
+
+#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
+	pax_close_kernel(flags, cr3);
+#endif
+
 	current->thread.saved_esp0 = 0;
 	ret = KVM86->regs32;
 	return ret;
@@ -239,6 +254,11 @@ out:
 static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk)
 {
 	struct tss_struct *tss;
+
+#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
+	unsigned long flags, cr3;
+#endif
+
 /*
  * make sure the vm86() system call doesn't try to do anything silly
  */
@@ -280,8 +300,17 @@ static void do_sys_vm86(struct kernel_vm
 	info->regs32->eax = 0;
 	tsk->thread.saved_esp0 = tsk->thread.esp0;
 	tss = init_tss + smp_processor_id();
+
+#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
+	pax_open_kernel(flags, cr3);
+#endif
+
 	tss->esp0 = tsk->thread.esp0 = (unsigned long) &info->VM86_TSS_ESP0;
 
+#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
+	pax_close_kernel(flags, cr3);
+#endif
+
 	tsk->thread.screen_bitmap = info->screen_bitmap;
 	if (info->flags & VM86_SCREEN_BITMAP)
 		mark_screen_rdonly(tsk);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/i386/vmlinux.lds.S linux-2.4.20-wolk4.16-fullkernel/arch/i386/vmlinux.lds.S
--- linux-2.4.20-wolk4.15-fullkernel/arch/i386/vmlinux.lds.S	2004-06-29 11:32:25.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/i386/vmlinux.lds.S	2004-09-05 16:08:59.000000000 +0200
@@ -13,10 +13,6 @@ SECTIONS
 	SHORT(__KERNEL_CS)
 	}
 
-  __start___kallsyms = .;	/* All kernel symbols */
-  __kallsyms : { *(__kallsyms) }
-  __stop___kallsyms = .;
-
   . = ALIGN(32);
   _data = .;
   .data : {			/* Data */
@@ -108,6 +104,10 @@ SECTIONS
   __ksymtab : { *(__ksymtab) }
   __stop___ksymtab = .;
 
+  __start___kallsyms = .;	/* All kernel symbols */
+  __kallsyms : { *(__kallsyms) }
+  __stop___kallsyms = .;
+
 #ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
   _end = ALIGN(4*1024*1024);
 #else
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/ia64/defconfig linux-2.4.20-wolk4.16-fullkernel/arch/ia64/defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/ia64/defconfig	2004-06-29 11:31:52.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/ia64/defconfig	2004-09-05 16:08:32.000000000 +0200
@@ -686,7 +686,6 @@ CONFIG_ISO9660_FS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/m68k/defconfig linux-2.4.20-wolk4.16-fullkernel/arch/m68k/defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/m68k/defconfig	2004-06-29 11:31:52.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/m68k/defconfig	2004-09-05 16:08:32.000000000 +0200
@@ -234,8 +234,6 @@ CONFIG_MSDOS_FS=y
 # CONFIG_JOLIET is not set
 CONFIG_MINIX_FS=y
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 # CONFIG_DEVFS_FS is not set
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig	2004-06-29 11:31:52.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig	2004-09-05 16:08:32.000000000 +0200
@@ -536,7 +536,6 @@ CONFIG_ISO9660_FS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-atlas linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-atlas
--- linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-atlas	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-atlas	2002-11-29 00:53:10.000000000 +0100
@@ -540,7 +540,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-cobalt linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-cobalt
--- linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-cobalt	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-cobalt	2002-11-29 00:53:10.000000000 +0100
@@ -539,8 +539,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_RW is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-ddb5476 linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-ddb5476
--- linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-ddb5476	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-ddb5476	2002-11-29 00:53:10.000000000 +0100
@@ -557,7 +557,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-ddb5477 linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-ddb5477
--- linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-ddb5477	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-ddb5477	2002-11-29 00:53:10.000000000 +0100
@@ -465,7 +465,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-decstation linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-decstation
--- linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-decstation	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-decstation	2002-11-29 00:53:10.000000000 +0100
@@ -485,7 +485,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-ev64120 linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-ev64120
--- linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-ev64120	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-ev64120	2002-11-29 00:53:10.000000000 +0100
@@ -474,7 +474,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-ev96100 linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-ev96100
--- linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-ev96100	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-ev96100	2002-11-29 00:53:10.000000000 +0100
@@ -468,7 +468,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-hp-lj linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-hp-lj
--- linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-hp-lj	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-hp-lj	2002-08-03 02:39:43.000000000 +0200
@@ -489,7 +489,6 @@ CONFIG_EFS_FS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-ip22 linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-ip22
--- linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-ip22	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-ip22	2002-11-29 00:53:10.000000000 +0100
@@ -526,7 +526,6 @@ CONFIG_ISO9660_FS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-it8172 linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-it8172
--- linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-it8172	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-it8172	2002-08-03 02:39:43.000000000 +0200
@@ -581,7 +581,6 @@ CONFIG_RTC=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-ivr linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-ivr
--- linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-ivr	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-ivr	2002-08-03 02:39:43.000000000 +0200
@@ -549,7 +549,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-jmr3927 linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-jmr3927
--- linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-jmr3927	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-jmr3927	2002-08-03 02:39:43.000000000 +0200
@@ -444,7 +444,6 @@ CONFIG_TXX927_SERIAL_CONSOLE=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-malta linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-malta
--- linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-malta	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-malta	2002-11-29 00:53:10.000000000 +0100
@@ -533,7 +533,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-nino linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-nino
--- linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-nino	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-nino	2002-08-03 02:39:43.000000000 +0200
@@ -350,7 +350,6 @@ CONFIG_SERIAL_TX3912_CONSOLE=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-ocelot linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-ocelot
--- linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-ocelot	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-ocelot	2002-08-03 02:39:43.000000000 +0200
@@ -422,7 +422,6 @@ CONFIG_UNIX98_PTY_COUNT=256
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-osprey linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-osprey
--- linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-osprey	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-osprey	2002-08-03 02:39:43.000000000 +0200
@@ -393,7 +393,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-pb1000 linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-pb1000
--- linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-pb1000	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-pb1000	2002-11-29 00:53:10.000000000 +0100
@@ -649,7 +649,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-pb1500 linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-pb1500
--- linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-pb1500	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-pb1500	2002-11-29 00:53:10.000000000 +0100
@@ -720,7 +720,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-rm200 linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-rm200
--- linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-rm200	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-rm200	2002-08-03 02:39:43.000000000 +0200
@@ -349,7 +349,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-sb1250-swarm linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-sb1250-swarm
--- linux-2.4.20-wolk4.15-fullkernel/arch/mips/defconfig-sb1250-swarm	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/mips/defconfig-sb1250-swarm	2002-11-29 00:53:10.000000000 +0100
@@ -459,7 +459,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/mips64/defconfig linux-2.4.20-wolk4.16-fullkernel/arch/mips64/defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/mips64/defconfig	2004-06-29 11:31:52.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/mips64/defconfig	2004-09-05 16:08:32.000000000 +0200
@@ -500,7 +500,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/mips64/defconfig-atlas linux-2.4.20-wolk4.16-fullkernel/arch/mips64/defconfig-atlas
--- linux-2.4.20-wolk4.15-fullkernel/arch/mips64/defconfig-atlas	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/mips64/defconfig-atlas	2002-11-29 00:53:10.000000000 +0100
@@ -501,7 +501,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/mips64/defconfig-ip22 linux-2.4.20-wolk4.16-fullkernel/arch/mips64/defconfig-ip22
--- linux-2.4.20-wolk4.15-fullkernel/arch/mips64/defconfig-ip22	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/mips64/defconfig-ip22	2002-11-29 00:53:10.000000000 +0100
@@ -522,7 +522,6 @@ CONFIG_ISO9660_FS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/mips64/defconfig-ip27 linux-2.4.20-wolk4.16-fullkernel/arch/mips64/defconfig-ip27
--- linux-2.4.20-wolk4.15-fullkernel/arch/mips64/defconfig-ip27	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/mips64/defconfig-ip27	2002-11-29 00:53:10.000000000 +0100
@@ -489,7 +489,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/mips64/defconfig-ip32 linux-2.4.20-wolk4.16-fullkernel/arch/mips64/defconfig-ip32
--- linux-2.4.20-wolk4.15-fullkernel/arch/mips64/defconfig-ip32	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/mips64/defconfig-ip32	2002-11-29 00:53:10.000000000 +0100
@@ -511,7 +511,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/mips64/defconfig-malta linux-2.4.20-wolk4.16-fullkernel/arch/mips64/defconfig-malta
--- linux-2.4.20-wolk4.15-fullkernel/arch/mips64/defconfig-malta	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/mips64/defconfig-malta	2002-11-29 00:53:10.000000000 +0100
@@ -500,7 +500,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/mips64/defconfig-sb1250-swarm linux-2.4.20-wolk4.16-fullkernel/arch/mips64/defconfig-sb1250-swarm
--- linux-2.4.20-wolk4.15-fullkernel/arch/mips64/defconfig-sb1250-swarm	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/mips64/defconfig-sb1250-swarm	2002-11-29 00:53:10.000000000 +0100
@@ -459,7 +459,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/parisc/defconfig linux-2.4.20-wolk4.16-fullkernel/arch/parisc/defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/parisc/defconfig	2004-06-29 11:31:52.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/parisc/defconfig	2004-09-05 16:08:32.000000000 +0200
@@ -598,7 +598,6 @@ CONFIG_JOLIET=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/IVMS8_defconfig linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/IVMS8_defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/IVMS8_defconfig	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/IVMS8_defconfig	2002-11-29 00:53:11.000000000 +0100
@@ -440,7 +440,6 @@ CONFIG_ISO9660_FS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/SM850_defconfig linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/SM850_defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/SM850_defconfig	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/SM850_defconfig	2002-11-29 00:53:11.000000000 +0100
@@ -396,7 +396,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/SPD823TS_defconfig linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/SPD823TS_defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/SPD823TS_defconfig	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/SPD823TS_defconfig	2002-11-29 00:53:11.000000000 +0100
@@ -395,7 +395,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/TQM823L_defconfig linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/TQM823L_defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/TQM823L_defconfig	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/TQM823L_defconfig	2002-11-29 00:53:11.000000000 +0100
@@ -396,7 +396,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/TQM850L_defconfig linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/TQM850L_defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/TQM850L_defconfig	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/TQM850L_defconfig	2002-11-29 00:53:11.000000000 +0100
@@ -396,7 +396,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/TQM860L_defconfig linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/TQM860L_defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/TQM860L_defconfig	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/TQM860L_defconfig	2002-11-29 00:53:11.000000000 +0100
@@ -441,7 +441,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/apus_defconfig linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/apus_defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/apus_defconfig	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/apus_defconfig	2002-11-29 00:53:11.000000000 +0100
@@ -716,7 +716,6 @@ CONFIG_JOLIET=y
 CONFIG_MINIX_FS=y
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/bseip_defconfig linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/bseip_defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/bseip_defconfig	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/bseip_defconfig	2002-11-29 00:53:11.000000000 +0100
@@ -395,7 +395,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/common_defconfig linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/common_defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/common_defconfig	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/common_defconfig	2002-11-29 00:53:11.000000000 +0100
@@ -768,7 +768,6 @@ CONFIG_ISO9660_FS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/est8260_defconfig linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/est8260_defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/est8260_defconfig	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/est8260_defconfig	2002-11-29 00:53:11.000000000 +0100
@@ -379,7 +379,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/gemini_defconfig linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/gemini_defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/gemini_defconfig	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/gemini_defconfig	2002-11-29 00:53:11.000000000 +0100
@@ -476,7 +476,6 @@ CONFIG_ISO9660_FS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/ibmchrp_defconfig linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/ibmchrp_defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/ibmchrp_defconfig	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/ibmchrp_defconfig	2002-11-29 00:53:11.000000000 +0100
@@ -636,7 +636,6 @@ CONFIG_JFS_FS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/mbx_defconfig linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/mbx_defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/mbx_defconfig	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/mbx_defconfig	2002-11-29 00:53:11.000000000 +0100
@@ -391,7 +391,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/oak_defconfig linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/oak_defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/oak_defconfig	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/oak_defconfig	2002-11-29 00:53:11.000000000 +0100
@@ -378,7 +378,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/pmac_defconfig linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/pmac_defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/pmac_defconfig	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/pmac_defconfig	2002-11-29 00:53:11.000000000 +0100
@@ -875,7 +875,6 @@ CONFIG_ISO9660_FS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/power3_defconfig linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/power3_defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/power3_defconfig	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/power3_defconfig	2002-11-29 00:53:11.000000000 +0100
@@ -608,7 +608,6 @@ CONFIG_JFS_FS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/rpxcllf_defconfig linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/rpxcllf_defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/rpxcllf_defconfig	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/rpxcllf_defconfig	2002-11-29 00:53:11.000000000 +0100
@@ -395,7 +395,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/rpxlite_defconfig linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/rpxlite_defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/rpxlite_defconfig	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/rpxlite_defconfig	2002-11-29 00:53:11.000000000 +0100
@@ -395,7 +395,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/walnut_defconfig linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/walnut_defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/ppc/configs/walnut_defconfig	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/ppc/configs/walnut_defconfig	2002-11-29 00:53:11.000000000 +0100
@@ -382,7 +382,6 @@ CONFIG_RAMFS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/ppc/defconfig linux-2.4.20-wolk4.16-fullkernel/arch/ppc/defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/ppc/defconfig	2004-06-29 11:31:52.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/ppc/defconfig	2004-09-05 16:08:32.000000000 +0200
@@ -778,7 +778,6 @@ CONFIG_ISO9660_FS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/ppc/kernel/ppc_ksyms.c linux-2.4.20-wolk4.16-fullkernel/arch/ppc/kernel/ppc_ksyms.c
--- linux-2.4.20-wolk4.15-fullkernel/arch/ppc/kernel/ppc_ksyms.c	2004-06-29 11:25:09.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/ppc/kernel/ppc_ksyms.c	2004-09-05 15:55:01.000000000 +0200
@@ -347,8 +347,6 @@ EXPORT_SYMBOL(__res);
 EXPORT_SYMBOL(request_8xxirq);
 EXPORT_SYMBOL(cpm_install_handler);
 EXPORT_SYMBOL(cpm_free_handler);
-#else
-EXPORT_SYMBOL(local_flush_tlb_page);
 #endif /* CONFIG_8xx */
 
 EXPORT_SYMBOL(ret_to_user_hook);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/ppc64/configs/iSeries_devfs_defconfig linux-2.4.20-wolk4.16-fullkernel/arch/ppc64/configs/iSeries_devfs_defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/ppc64/configs/iSeries_devfs_defconfig	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/ppc64/configs/iSeries_devfs_defconfig	2002-11-29 00:53:11.000000000 +0100
@@ -491,7 +491,6 @@ CONFIG_JOLIET=y
 # CONFIG_JFS_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/ppc64/configs/iSeries_nodevfs_ideemul_defconfig linux-2.4.20-wolk4.16-fullkernel/arch/ppc64/configs/iSeries_nodevfs_ideemul_defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/ppc64/configs/iSeries_nodevfs_ideemul_defconfig	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/ppc64/configs/iSeries_nodevfs_ideemul_defconfig	2002-11-29 00:53:11.000000000 +0100
@@ -521,7 +521,6 @@ CONFIG_JOLIET=y
 # CONFIG_JFS_DEBUG is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/ppc64/configs/pSeries_defconfig linux-2.4.20-wolk4.16-fullkernel/arch/ppc64/configs/pSeries_defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/ppc64/configs/pSeries_defconfig	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/ppc64/configs/pSeries_defconfig	2002-11-29 00:53:11.000000000 +0100
@@ -612,7 +612,6 @@ CONFIG_ISO9660_FS=y
 # CONFIG_JFS_DEBUG is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/ppc64/defconfig linux-2.4.20-wolk4.16-fullkernel/arch/ppc64/defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/ppc64/defconfig	2004-06-29 11:31:52.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/ppc64/defconfig	2004-09-05 16:08:32.000000000 +0200
@@ -618,7 +618,6 @@ CONFIG_ISO9660_FS=y
 # CONFIG_JFS_DEBUG is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/s390/defconfig linux-2.4.20-wolk4.16-fullkernel/arch/s390/defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/s390/defconfig	2004-06-29 11:31:52.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/s390/defconfig	2004-09-05 16:08:32.000000000 +0200
@@ -218,7 +218,6 @@ CONFIG_VLAN_8021Q=m
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/s390x/defconfig linux-2.4.20-wolk4.16-fullkernel/arch/s390x/defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/s390x/defconfig	2004-06-29 11:31:52.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/s390x/defconfig	2004-09-05 16:08:32.000000000 +0200
@@ -218,7 +218,6 @@ CONFIG_VLAN_8021Q=m
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/sh/defconfig linux-2.4.20-wolk4.16-fullkernel/arch/sh/defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/sh/defconfig	2004-06-29 11:31:52.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/sh/defconfig	2004-09-05 16:08:32.000000000 +0200
@@ -171,7 +171,6 @@ CONFIG_SERIAL_CONSOLE=y
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/sparc/defconfig linux-2.4.20-wolk4.16-fullkernel/arch/sparc/defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/sparc/defconfig	2004-06-29 11:31:52.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/sparc/defconfig	2004-09-05 16:08:32.000000000 +0200
@@ -318,7 +318,6 @@ CONFIG_ISO9660_FS=m
 CONFIG_MINIX_FS=m
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 CONFIG_HPFS_FS=m
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/sparc64/defconfig linux-2.4.20-wolk4.16-fullkernel/arch/sparc64/defconfig
--- linux-2.4.20-wolk4.15-fullkernel/arch/sparc64/defconfig	2004-06-29 11:31:52.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/sparc64/defconfig	2004-09-05 16:08:32.000000000 +0200
@@ -638,7 +638,6 @@ CONFIG_JFS_FS=m
 CONFIG_MINIX_FS=m
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 CONFIG_HPFS_FS=m
 CONFIG_PROC_FS=y
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/sparc64/kernel/ioctl32.c linux-2.4.20-wolk4.16-fullkernel/arch/sparc64/kernel/ioctl32.c
--- linux-2.4.20-wolk4.15-fullkernel/arch/sparc64/kernel/ioctl32.c	2004-06-29 11:26:15.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/sparc64/kernel/ioctl32.c	2004-09-05 15:48:20.000000000 +0200
@@ -96,7 +96,6 @@
 
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci.h>
-#include <net/bluetooth/rfcomm.h>
 
 #include <linux/usb.h>
 #include <linux/usbdevice_fs.h>
@@ -4367,20 +4366,6 @@ chio_gstatus(unsigned int fd, unsigned i
 	return err;
 }
 
-/* Bluetooth ioctls */
-#define HCIUARTSETPROTO	_IOW('U', 200, int)
-#define HCIUARTGETPROTO	_IOR('U', 201, int)
-
-#define BNEPCONNADD	_IOW('B', 200, int)
-#define BNEPCONNDEL	_IOW('B', 201, int)
-#define BNEPGETCONNLIST	_IOR('B', 210, int)
-#define BNEPGETCONNINFO	_IOR('B', 211, int)
-
-#define CMTPCONNADD	_IOW('C', 200, int)
-#define CMTPCONNDEL	_IOW('C', 201, int)
-#define CMTPGETCONNLIST	_IOR('C', 210, int)
-#define CMTPGETCONNINFO	_IOR('C', 211, int)
-
 struct ioctl_trans {
 	unsigned int cmd;
 	unsigned int handler;
@@ -5089,21 +5074,6 @@ COMPATIBLE_IOCTL(HCISETLINKMODE)
 COMPATIBLE_IOCTL(HCISETACLMTU)
 COMPATIBLE_IOCTL(HCISETSCOMTU)
 COMPATIBLE_IOCTL(HCIINQUIRY)
-COMPATIBLE_IOCTL(HCIUARTSETPROTO)
-COMPATIBLE_IOCTL(HCIUARTGETPROTO)
-COMPATIBLE_IOCTL(RFCOMMCREATEDEV)
-COMPATIBLE_IOCTL(RFCOMMRELEASEDEV)
-COMPATIBLE_IOCTL(RFCOMMGETDEVLIST)
-COMPATIBLE_IOCTL(RFCOMMGETDEVINFO)
-COMPATIBLE_IOCTL(RFCOMMSTEALDLC)
-COMPATIBLE_IOCTL(BNEPCONNADD)
-COMPATIBLE_IOCTL(BNEPCONNDEL)
-COMPATIBLE_IOCTL(BNEPGETCONNLIST)
-COMPATIBLE_IOCTL(BNEPGETCONNINFO)
-COMPATIBLE_IOCTL(CMTPCONNADD)
-COMPATIBLE_IOCTL(CMTPCONNDEL)
-COMPATIBLE_IOCTL(CMTPGETCONNLIST)
-COMPATIBLE_IOCTL(CMTPGETCONNINFO)
 /* Misc. */
 COMPATIBLE_IOCTL(0x41545900)		/* ATYIO_CLKR */
 COMPATIBLE_IOCTL(0x41545901)		/* ATYIO_CLKW */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/arch/x86_64/kernel/semaphore.c linux-2.4.20-wolk4.16-fullkernel/arch/x86_64/kernel/semaphore.c
--- linux-2.4.20-wolk4.15-fullkernel/arch/x86_64/kernel/semaphore.c	2004-06-29 11:23:39.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/arch/x86_64/kernel/semaphore.c	2004-09-05 15:46:44.000000000 +0200
@@ -169,6 +169,7 @@ int __down_trylock(struct semaphore * se
 }
 
 void __wtd_down(struct semaphore * sem, struct worktodo *wtd);
+void __wtd_down_from_wakeup(struct semaphore * sem, struct worktodo *wtd);
 
 void __wtd_down_action(void *data)
 {
@@ -178,7 +179,7 @@ void __wtd_down_action(void *data)
 	wtd_pop(wtd);
 	sem = wtd->data;
 
-	__wtd_down(sem, wtd);
+	__wtd_down_from_wakeup(sem, wtd);
 }
 
 void __wtd_down_waiter(wait_queue_t *wait)
@@ -191,7 +192,8 @@ void __wtd_down_waiter(wait_queue_t *wai
 	wtd_queue(wtd);
 }
 
-void __wtd_down(struct semaphore * sem, struct worktodo *wtd)
+void wtd_down_common(struct semaphore * sem, struct worktodo *wtd,
+                       int do_incr)
 {
 	int gotit;
 	int sleepers;
@@ -200,7 +202,7 @@ void __wtd_down(struct semaphore * sem, 
 	wtd->data = sem;
 
 	spin_lock_irq(&semaphore_lock);
-	sem->sleepers++;
+	sem->sleepers += do_incr;
 	sleepers = sem->sleepers;
 	gotit = add_wait_queue_exclusive_cond(&sem->wait, &wtd->wait,
 			atomic_add_negative(sleepers - 1, &sem->count));
@@ -215,4 +217,18 @@ void __wtd_down(struct semaphore * sem, 
 		wtd_queue(wtd);
 	}
 }
+ 
+void __wtd_down(struct semaphore * sem, struct worktodo *wtd)
+{
+	wtd_down_common(sem, wtd, 1);
+}
+
+/*
+ * Same as __wtd_down, but sem->sleepers is not incremented when
+ * coming from a wakeup.
+ */
+void __wtd_down_from_wakeup(struct semaphore * sem, struct worktodo *wtd)
+{
+	wtd_down_common(sem, wtd, 0);
+}
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/crypto/Config.in linux-2.4.20-wolk4.16-fullkernel/crypto/Config.in
--- linux-2.4.20-wolk4.15-fullkernel/crypto/Config.in	2004-06-29 11:24:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/crypto/Config.in	2004-09-05 15:47:28.000000000 +0200
@@ -60,6 +60,7 @@ if [ "$CONFIG_CRYPTO" = "y" ]; then
   fi
   tristate       '  SHA256 digest algorithm' CONFIG_CRYPTO_SHA256
   tristate       '  SHA384 and SHA512 digest algorithms' CONFIG_CRYPTO_SHA512
+  tristate       '  Whirlpool digest algorithm' CONFIG_CRYPTO_WHIRLPOOL
   if [ "$CONFIG_INET_ESP" = "y" -o \
        "$CONFIG_INET_ESP" = "m" -o \
        "$CONFIG_INET6_ESP" = "y" -o \
@@ -80,6 +81,8 @@ if [ "$CONFIG_CRYPTO" = "y" ]; then
   fi
   tristate       '  CAST5 (CAST-128) cipher algorithm' CONFIG_CRYPTO_CAST5
   tristate       '  CAST6 (CAST-256) cipher algorithm' CONFIG_CRYPTO_CAST6
+  tristate       '  TEA and XTEA cipher algorithms' CONFIG_CRYPTO_TEA
+  tristate       '  Khazad cipher algorithm' CONFIG_CRYPTO_KHAZAD
   tristate       '  ARC4 cipher algorithm' CONFIG_CRYPTO_ARC4
   if [ "$CONFIG_INET_IPCOMP" = "y" -o \
        "$CONFIG_INET_IPCOMP" = "m" -o \
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/crypto/Makefile linux-2.4.20-wolk4.16-fullkernel/crypto/Makefile
--- linux-2.4.20-wolk4.15-fullkernel/crypto/Makefile	2004-06-29 11:24:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/crypto/Makefile	2004-09-05 15:47:28.000000000 +0200
@@ -19,6 +19,7 @@ obj-$(CONFIG_CRYPTO_MD5) += md5.o
 obj-$(CONFIG_CRYPTO_SHA1) += sha1.o
 obj-$(CONFIG_CRYPTO_SHA256) += sha256.o
 obj-$(CONFIG_CRYPTO_SHA512) += sha512.o
+obj-$(CONFIG_CRYPTO_WHIRLPOOL) += whirlpool.o
 obj-$(CONFIG_CRYPTO_DES) += des.o
 obj-$(CONFIG_CRYPTO_BLOWFISH) += blowfish.o
 obj-$(CONFIG_CRYPTO_TWOFISH) += twofish.o
@@ -27,6 +28,8 @@ obj-$(CONFIG_CRYPTO_AES) += aes.o
 obj-$(CONFIG_CRYPTO_CAST5) += cast5.o
 obj-$(CONFIG_CRYPTO_CAST6) += cast6.o
 obj-$(CONFIG_CRYPTO_ARC4) += arc4.o
+obj-$(CONFIG_CRYPTO_TEA) += tea.o
+obj-$(CONFIG_CRYPTO_KHAZAD) += khazad.o
 obj-$(CONFIG_CRYPTO_DEFLATE) += deflate.o
 obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += michael_mic.o
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/crypto/aes.c linux-2.4.20-wolk4.16-fullkernel/crypto/aes.c
--- linux-2.4.20-wolk4.15-fullkernel/crypto/aes.c	2004-06-29 11:24:04.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/crypto/aes.c	2004-09-05 15:47:28.000000000 +0200
@@ -160,7 +160,7 @@ gen_tabs (void)
 	u8 p, q;
 
 	/* log and power tables for GF(2**8) finite field with
-	   0x011b as modular polynomial - the simplest prmitive
+	   0x011b as modular polynomial - the simplest primitive
 	   root is 0x03, used here to generate the tables */
 
 	for (i = 0, p = 1; i < 256; ++i) {
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/crypto/arc4.c linux-2.4.20-wolk4.16-fullkernel/crypto/arc4.c
--- linux-2.4.20-wolk4.15-fullkernel/crypto/arc4.c	2004-06-29 11:24:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/crypto/arc4.c	2004-09-05 15:47:28.000000000 +0200
@@ -3,7 +3,7 @@
  *
  * ARC4 Cipher Algorithm
  *
- * Jon Oberheide <jon@focalhost.com>
+ * Jon Oberheide <jon@oberheide.org>
  *
  * 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
@@ -100,4 +100,4 @@ module_exit(arc4_exit);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("ARC4 Cipher Algorithm");
-MODULE_AUTHOR("Jon Oberheide <jon@focalhost.com>");
+MODULE_AUTHOR("Jon Oberheide <jon@oberheide.org>");
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/crypto/blowfish.c linux-2.4.20-wolk4.16-fullkernel/crypto/blowfish.c
--- linux-2.4.20-wolk4.15-fullkernel/crypto/blowfish.c	2004-06-29 11:24:04.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/crypto/blowfish.c	2004-09-05 15:47:28.000000000 +0200
@@ -3,9 +3,9 @@
  *
  * Blowfish Cipher Algorithm, by Bruce Schneier.
  * http://www.counterpane.com/blowfish.html
- * 
- * Adapated from Kerneli implementation.
- * 
+ *
+ * Adapted from Kerneli implementation.
+ *
  * Copyright (c) Herbert Valerio Riedel <hvr@hvrlab.org>
  * Copyright (c) Kyle McMartin <kyle@debian.org>
  * Copyright (c) 2002 James Morris <jmorris@intercode.com.au>
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/crypto/cipher.c linux-2.4.20-wolk4.16-fullkernel/crypto/cipher.c
--- linux-2.4.20-wolk4.15-fullkernel/crypto/cipher.c	2004-06-29 11:24:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/crypto/cipher.c	2004-09-05 15:47:28.000000000 +0200
@@ -52,8 +52,8 @@ static int crypt(struct crypto_tfm *tfm,
 {
 	struct scatter_walk walk_in, walk_out;
 	const unsigned int bsize = crypto_tfm_alg_blocksize(tfm);
-	u8 tmp_src[nbytes > src->length ? bsize : 0];
-	u8 tmp_dst[nbytes > dst->length ? bsize : 0];
+	u8 tmp_src[bsize];
+	u8 tmp_dst[bsize];
 
 	if (!nbytes)
 		return 0;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/crypto/digest.c linux-2.4.20-wolk4.16-fullkernel/crypto/digest.c
--- linux-2.4.20-wolk4.15-fullkernel/crypto/digest.c	2004-06-29 11:24:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/crypto/digest.c	2004-09-05 15:47:28.000000000 +0200
@@ -27,13 +27,28 @@ static void update(struct crypto_tfm *tf
                    struct scatterlist *sg, unsigned int nsg)
 {
 	unsigned int i;
-	
+
 	for (i = 0; i < nsg; i++) {
-		char *p = crypto_kmap(sg[i].page, 0) + sg[i].offset;
-		tfm->__crt_alg->cra_digest.dia_update(crypto_tfm_ctx(tfm),
-		                                      p, sg[i].length);
-		crypto_kunmap(p, 0);
-		crypto_yield(tfm);
+
+		struct page *pg = sg[i].page;
+		unsigned int offset = sg[i].offset;
+		unsigned int l = sg[i].length;
+
+		do {
+			unsigned int bytes_from_page = min(l, ((unsigned int)
+							   (PAGE_SIZE)) - 
+							   offset);
+			char *p = crypto_kmap(pg, 0) + offset;
+
+			tfm->__crt_alg->cra_digest.dia_update
+					(crypto_tfm_ctx(tfm), p,
+					 bytes_from_page);
+			crypto_kunmap(p, 0);
+			crypto_yield(tfm);
+			offset = 0;
+			pg++;
+			l -= bytes_from_page;
+		} while (l > 0);
 	}
 }
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/crypto/khazad.c linux-2.4.20-wolk4.16-fullkernel/crypto/khazad.c
--- linux-2.4.20-wolk4.15-fullkernel/crypto/khazad.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/crypto/khazad.c	2004-09-05 15:47:28.000000000 +0200
@@ -0,0 +1,915 @@
+/*
+ * Cryptographic API.
+ *
+ * Khazad Algorithm
+ *
+ * The Khazad algorithm was developed by Paulo S. L. M. Barreto and
+ * Vincent Rijmen.  It was a finalist in the NESSIE encryption contest.
+ *
+ * The original authors have disclaimed all copyright interest in this
+ * code and thus put it in the public domain. The subsequent authors
+ * have put this under the GNU General Public License.
+ *
+ * By Aaron Grothe ajgrothe@yahoo.com, August 1, 2004
+ *
+ * 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.
+ *
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/mm.h>
+#include <asm/scatterlist.h>
+#include <linux/crypto.h>
+
+#define KHAZAD_KEY_SIZE		16
+#define KHAZAD_BLOCK_SIZE	8
+#define KHAZAD_ROUNDS		8
+
+struct khazad_ctx {
+	u64 E[KHAZAD_ROUNDS + 1];
+	u64 D[KHAZAD_ROUNDS + 1];
+};
+
+static const u64 T0[256] = {
+	0xbad3d268bbb96a01ULL, 0x54fc4d19e59a66b1ULL, 0x2f71bc93e26514cdULL,
+	0x749ccdb925871b51ULL, 0x53f55102f7a257a4ULL, 0xd3686bb8d0d6be03ULL,
+	0xd26b6fbdd6deb504ULL, 0x4dd72964b35285feULL, 0x50f05d0dfdba4aadULL,
+	0xace98a26cf09e063ULL, 0x8d8a0e83091c9684ULL, 0xbfdcc679a5914d1aULL,
+	0x7090ddad3da7374dULL, 0x52f65507f1aa5ca3ULL, 0x9ab352c87ba417e1ULL,
+	0x4cd42d61b55a8ef9ULL, 0xea238f65460320acULL, 0xd56273a6c4e68411ULL,
+	0x97a466f155cc68c2ULL, 0xd16e63b2dcc6a80dULL, 0x3355ccffaa85d099ULL,
+	0x51f35908fbb241aaULL, 0x5bed712ac7e20f9cULL, 0xa6f7a204f359ae55ULL,
+	0xde7f5f81febec120ULL, 0x48d83d75ad7aa2e5ULL, 0xa8e59a32d729cc7fULL,
+	0x99b65ec771bc0ae8ULL, 0xdb704b90e096e63bULL, 0x3256c8faac8ddb9eULL,
+	0xb7c4e65195d11522ULL, 0xfc19d72b32b3aaceULL, 0xe338ab48704b7393ULL,
+	0x9ebf42dc63843bfdULL, 0x91ae7eef41fc52d0ULL, 0x9bb056cd7dac1ce6ULL,
+	0xe23baf4d76437894ULL, 0xbbd0d66dbdb16106ULL, 0x41c319589b32f1daULL,
+	0x6eb2a5cb7957e517ULL, 0xa5f2ae0bf941b35cULL, 0xcb400bc08016564bULL,
+	0x6bbdb1da677fc20cULL, 0x95a26efb59dc7eccULL, 0xa1febe1fe1619f40ULL,
+	0xf308eb1810cbc3e3ULL, 0xb1cefe4f81e12f30ULL, 0x0206080a0c10160eULL,
+	0xcc4917db922e675eULL, 0xc45137f3a26e3f66ULL, 0x1d2774694ee8cf53ULL,
+	0x143c504478a09c6cULL, 0xc3582be8b0560e73ULL, 0x63a591f2573f9a34ULL,
+	0xda734f95e69eed3cULL, 0x5de76934d3d2358eULL, 0x5fe1613edfc22380ULL,
+	0xdc79578bf2aed72eULL, 0x7d87e99413cf486eULL, 0xcd4a13de94266c59ULL,
+	0x7f81e19e1fdf5e60ULL, 0x5aee752fc1ea049bULL, 0x6cb4adc17547f319ULL,
+	0x5ce46d31d5da3e89ULL, 0xf704fb0c08ebefffULL, 0x266a98bed42d47f2ULL,
+	0xff1cdb2438abb7c7ULL, 0xed2a937e543b11b9ULL, 0xe825876f4a1336a2ULL,
+	0x9dba4ed3699c26f4ULL, 0x6fb1a1ce7f5fee10ULL, 0x8e8f028c03048b8dULL,
+	0x192b647d56c8e34fULL, 0xa0fdba1ae7699447ULL, 0xf00de7171ad3deeaULL,
+	0x89861e97113cba98ULL, 0x0f113c332278692dULL, 0x07091c1b12383115ULL,
+	0xafec8629c511fd6aULL, 0xfb10cb30208b9bdbULL, 0x0818202830405838ULL,
+	0x153f54417ea8976bULL, 0x0d1734392e687f23ULL, 0x040c101418202c1cULL,
+	0x0103040506080b07ULL, 0x64ac8de94507ab21ULL, 0xdf7c5b84f8b6ca27ULL,
+	0x769ac5b329970d5fULL, 0x798bf9800bef6472ULL, 0xdd7a538ef4a6dc29ULL,
+	0x3d47f4c98ef5b2b3ULL, 0x163a584e74b08a62ULL, 0x3f41fcc382e5a4bdULL,
+	0x3759dcebb2a5fc85ULL, 0x6db7a9c4734ff81eULL, 0x3848e0d890dd95a8ULL,
+	0xb9d6de67b1a17708ULL, 0x7395d1a237bf2a44ULL, 0xe926836a4c1b3da5ULL,
+	0x355fd4e1beb5ea8bULL, 0x55ff491ce3926db6ULL, 0x7193d9a83baf3c4aULL,
+	0x7b8df18a07ff727cULL, 0x8c890a860f149d83ULL, 0x7296d5a731b72143ULL,
+	0x88851a921734b19fULL, 0xf607ff090ee3e4f8ULL, 0x2a7ea882fc4d33d6ULL,
+	0x3e42f8c684edafbaULL, 0x5ee2653bd9ca2887ULL, 0x27699cbbd2254cf5ULL,
+	0x46ca0543890ac0cfULL, 0x0c14303c28607424ULL, 0x65af89ec430fa026ULL,
+	0x68b8bdd56d67df05ULL, 0x61a399f85b2f8c3aULL, 0x03050c0f0a181d09ULL,
+	0xc15e23e2bc46187dULL, 0x57f94116ef827bb8ULL, 0xd6677fa9cefe9918ULL,
+	0xd976439aec86f035ULL, 0x58e87d25cdfa1295ULL, 0xd875479fea8efb32ULL,
+	0x66aa85e34917bd2fULL, 0xd7647bacc8f6921fULL, 0x3a4ee8d29ccd83a6ULL,
+	0xc84507cf8a0e4b42ULL, 0x3c44f0cc88fdb9b4ULL, 0xfa13cf35268390dcULL,
+	0x96a762f453c463c5ULL, 0xa7f4a601f551a552ULL, 0x98b55ac277b401efULL,
+	0xec29977b52331abeULL, 0xb8d5da62b7a97c0fULL, 0xc7543bfca876226fULL,
+	0xaeef822cc319f66dULL, 0x69bbb9d06b6fd402ULL, 0x4bdd317aa762bfecULL,
+	0xabe0963ddd31d176ULL, 0xa9e69e37d121c778ULL, 0x67a981e64f1fb628ULL,
+	0x0a1e28223c504e36ULL, 0x47c901468f02cbc8ULL, 0xf20bef1d16c3c8e4ULL,
+	0xb5c2ee5b99c1032cULL, 0x226688aacc0d6beeULL, 0xe532b356647b4981ULL,
+	0xee2f9f715e230cb0ULL, 0xbedfc27ca399461dULL, 0x2b7dac87fa4538d1ULL,
+	0x819e3ebf217ce2a0ULL, 0x1236485a6c90a67eULL, 0x839836b52d6cf4aeULL,
+	0x1b2d6c775ad8f541ULL, 0x0e1238362470622aULL, 0x23658cafca0560e9ULL,
+	0xf502f30604fbf9f1ULL, 0x45cf094c8312ddc6ULL, 0x216384a5c61576e7ULL,
+	0xce4f1fd19e3e7150ULL, 0x49db3970ab72a9e2ULL, 0x2c74b09ce87d09c4ULL,
+	0xf916c33a2c9b8dd5ULL, 0xe637bf596e635488ULL, 0xb6c7e25493d91e25ULL,
+	0x2878a088f05d25d8ULL, 0x17395c4b72b88165ULL, 0x829b32b02b64ffa9ULL,
+	0x1a2e68725cd0fe46ULL, 0x8b80169d1d2cac96ULL, 0xfe1fdf213ea3bcc0ULL,
+	0x8a8312981b24a791ULL, 0x091b242d3648533fULL, 0xc94603ca8c064045ULL,
+	0x879426a1354cd8b2ULL, 0x4ed2256bb94a98f7ULL, 0xe13ea3427c5b659dULL,
+	0x2e72b896e46d1fcaULL, 0xe431b75362734286ULL, 0xe03da7477a536e9aULL,
+	0xeb208b60400b2babULL, 0x90ad7aea47f459d7ULL, 0xa4f1aa0eff49b85bULL,
+	0x1e22786644f0d25aULL, 0x85922eab395ccebcULL, 0x60a09dfd5d27873dULL,
+	0x0000000000000000ULL, 0x256f94b1de355afbULL, 0xf401f70302f3f2f6ULL,
+	0xf10ee3121cdbd5edULL, 0x94a16afe5fd475cbULL, 0x0b1d2c273a584531ULL,
+	0xe734bb5c686b5f8fULL, 0x759fc9bc238f1056ULL, 0xef2c9b74582b07b7ULL,
+	0x345cd0e4b8bde18cULL, 0x3153c4f5a695c697ULL, 0xd46177a3c2ee8f16ULL,
+	0xd06d67b7dacea30aULL, 0x869722a43344d3b5ULL, 0x7e82e59b19d75567ULL,
+	0xadea8e23c901eb64ULL, 0xfd1ad32e34bba1c9ULL, 0x297ba48df6552edfULL,
+	0x3050c0f0a09dcd90ULL, 0x3b4decd79ac588a1ULL, 0x9fbc46d9658c30faULL,
+	0xf815c73f2a9386d2ULL, 0xc6573ff9ae7e2968ULL, 0x13354c5f6a98ad79ULL,
+	0x060a181e14303a12ULL, 0x050f14111e28271bULL, 0xc55233f6a4663461ULL,
+	0x113344556688bb77ULL, 0x7799c1b62f9f0658ULL, 0x7c84ed9115c74369ULL,
+	0x7a8ef58f01f7797bULL, 0x7888fd850de76f75ULL, 0x365ad8eeb4adf782ULL,
+	0x1c24706c48e0c454ULL, 0x394be4dd96d59eafULL, 0x59eb7920cbf21992ULL,
+	0x1828607850c0e848ULL, 0x56fa4513e98a70bfULL, 0xb3c8f6458df1393eULL,
+	0xb0cdfa4a87e92437ULL, 0x246c90b4d83d51fcULL, 0x206080a0c01d7de0ULL,
+	0xb2cbf2408bf93239ULL, 0x92ab72e04be44fd9ULL, 0xa3f8b615ed71894eULL,
+	0xc05d27e7ba4e137aULL, 0x44cc0d49851ad6c1ULL, 0x62a695f751379133ULL,
+	0x103040506080b070ULL, 0xb4c1ea5e9fc9082bULL, 0x84912aae3f54c5bbULL,
+	0x43c511529722e7d4ULL, 0x93a876e54dec44deULL, 0xc25b2fedb65e0574ULL,
+	0x4ade357fa16ab4ebULL, 0xbddace73a9815b14ULL, 0x8f8c0689050c808aULL,
+	0x2d77b499ee7502c3ULL, 0xbcd9ca76af895013ULL, 0x9cb94ad66f942df3ULL,
+	0x6abeb5df6177c90bULL, 0x40c01d5d9d3afaddULL, 0xcf4c1bd498367a57ULL,
+	0xa2fbb210eb798249ULL, 0x809d3aba2774e9a7ULL, 0x4fd1216ebf4293f0ULL,
+	0x1f217c6342f8d95dULL, 0xca430fc5861e5d4cULL, 0xaae39238db39da71ULL,
+	0x42c61557912aecd3ULL
+};
+
+static const u64 T1[256] = {
+	0xd3ba68d2b9bb016aULL, 0xfc54194d9ae5b166ULL, 0x712f93bc65e2cd14ULL,
+	0x9c74b9cd8725511bULL, 0xf5530251a2f7a457ULL, 0x68d3b86bd6d003beULL,
+	0x6bd2bd6fded604b5ULL, 0xd74d642952b3fe85ULL, 0xf0500d5dbafdad4aULL,
+	0xe9ac268a09cf63e0ULL, 0x8a8d830e1c098496ULL, 0xdcbf79c691a51a4dULL,
+	0x9070addda73d4d37ULL, 0xf6520755aaf1a35cULL, 0xb39ac852a47be117ULL,
+	0xd44c612d5ab5f98eULL, 0x23ea658f0346ac20ULL, 0x62d5a673e6c41184ULL,
+	0xa497f166cc55c268ULL, 0x6ed1b263c6dc0da8ULL, 0x5533ffcc85aa99d0ULL,
+	0xf3510859b2fbaa41ULL, 0xed5b2a71e2c79c0fULL, 0xf7a604a259f355aeULL,
+	0x7fde815fbefe20c1ULL, 0xd848753d7aade5a2ULL, 0xe5a8329a29d77fccULL,
+	0xb699c75ebc71e80aULL, 0x70db904b96e03be6ULL, 0x5632fac88dac9edbULL,
+	0xc4b751e6d1952215ULL, 0x19fc2bd7b332ceaaULL, 0x38e348ab4b709373ULL,
+	0xbf9edc428463fd3bULL, 0xae91ef7efc41d052ULL, 0xb09bcd56ac7de61cULL,
+	0x3be24daf43769478ULL, 0xd0bb6dd6b1bd0661ULL, 0xc3415819329bdaf1ULL,
+	0xb26ecba5577917e5ULL, 0xf2a50bae41f95cb3ULL, 0x40cbc00b16804b56ULL,
+	0xbd6bdab17f670cc2ULL, 0xa295fb6edc59cc7eULL, 0xfea11fbe61e1409fULL,
+	0x08f318ebcb10e3c3ULL, 0xceb14ffee181302fULL, 0x06020a08100c0e16ULL,
+	0x49ccdb172e925e67ULL, 0x51c4f3376ea2663fULL, 0x271d6974e84e53cfULL,
+	0x3c144450a0786c9cULL, 0x58c3e82b56b0730eULL, 0xa563f2913f57349aULL,
+	0x73da954f9ee63cedULL, 0xe75d3469d2d38e35ULL, 0xe15f3e61c2df8023ULL,
+	0x79dc8b57aef22ed7ULL, 0x877d94e9cf136e48ULL, 0x4acdde132694596cULL,
+	0x817f9ee1df1f605eULL, 0xee5a2f75eac19b04ULL, 0xb46cc1ad477519f3ULL,
+	0xe45c316ddad5893eULL, 0x04f70cfbeb08ffefULL, 0x6a26be982dd4f247ULL,
+	0x1cff24dbab38c7b7ULL, 0x2aed7e933b54b911ULL, 0x25e86f87134aa236ULL,
+	0xba9dd34e9c69f426ULL, 0xb16fcea15f7f10eeULL, 0x8f8e8c0204038d8bULL,
+	0x2b197d64c8564fe3ULL, 0xfda01aba69e74794ULL, 0x0df017e7d31aeadeULL,
+	0x8689971e3c1198baULL, 0x110f333c78222d69ULL, 0x09071b1c38121531ULL,
+	0xecaf298611c56afdULL, 0x10fb30cb8b20db9bULL, 0x1808282040303858ULL,
+	0x3f154154a87e6b97ULL, 0x170d3934682e237fULL, 0x0c04141020181c2cULL,
+	0x030105040806070bULL, 0xac64e98d074521abULL, 0x7cdf845bb6f827caULL,
+	0x9a76b3c597295f0dULL, 0x8b7980f9ef0b7264ULL, 0x7add8e53a6f429dcULL,
+	0x473dc9f4f58eb3b2ULL, 0x3a164e58b074628aULL, 0x413fc3fce582bda4ULL,
+	0x5937ebdca5b285fcULL, 0xb76dc4a94f731ef8ULL, 0x4838d8e0dd90a895ULL,
+	0xd6b967dea1b10877ULL, 0x9573a2d1bf37442aULL, 0x26e96a831b4ca53dULL,
+	0x5f35e1d4b5be8beaULL, 0xff551c4992e3b66dULL, 0x9371a8d9af3b4a3cULL,
+	0x8d7b8af1ff077c72ULL, 0x898c860a140f839dULL, 0x9672a7d5b7314321ULL,
+	0x8588921a34179fb1ULL, 0x07f609ffe30ef8e4ULL, 0x7e2a82a84dfcd633ULL,
+	0x423ec6f8ed84baafULL, 0xe25e3b65cad98728ULL, 0x6927bb9c25d2f54cULL,
+	0xca4643050a89cfc0ULL, 0x140c3c3060282474ULL, 0xaf65ec890f4326a0ULL,
+	0xb868d5bd676d05dfULL, 0xa361f8992f5b3a8cULL, 0x05030f0c180a091dULL,
+	0x5ec1e22346bc7d18ULL, 0xf957164182efb87bULL, 0x67d6a97ffece1899ULL,
+	0x76d99a4386ec35f0ULL, 0xe858257dfacd9512ULL, 0x75d89f478eea32fbULL,
+	0xaa66e38517492fbdULL, 0x64d7ac7bf6c81f92ULL, 0x4e3ad2e8cd9ca683ULL,
+	0x45c8cf070e8a424bULL, 0x443cccf0fd88b4b9ULL, 0x13fa35cf8326dc90ULL,
+	0xa796f462c453c563ULL, 0xf4a701a651f552a5ULL, 0xb598c25ab477ef01ULL,
+	0x29ec7b973352be1aULL, 0xd5b862daa9b70f7cULL, 0x54c7fc3b76a86f22ULL,
+	0xefae2c8219c36df6ULL, 0xbb69d0b96f6b02d4ULL, 0xdd4b7a3162a7ecbfULL,
+	0xe0ab3d9631dd76d1ULL, 0xe6a9379e21d178c7ULL, 0xa967e6811f4f28b6ULL,
+	0x1e0a2228503c364eULL, 0xc9474601028fc8cbULL, 0x0bf21defc316e4c8ULL,
+	0xc2b55beec1992c03ULL, 0x6622aa880dccee6bULL, 0x32e556b37b648149ULL,
+	0x2fee719f235eb00cULL, 0xdfbe7cc299a31d46ULL, 0x7d2b87ac45fad138ULL,
+	0x9e81bf3e7c21a0e2ULL, 0x36125a48906c7ea6ULL, 0x9883b5366c2daef4ULL,
+	0x2d1b776cd85a41f5ULL, 0x120e363870242a62ULL, 0x6523af8c05cae960ULL,
+	0x02f506f3fb04f1f9ULL, 0xcf454c091283c6ddULL, 0x6321a58415c6e776ULL,
+	0x4fced11f3e9e5071ULL, 0xdb49703972abe2a9ULL, 0x742c9cb07de8c409ULL,
+	0x16f93ac39b2cd58dULL, 0x37e659bf636e8854ULL, 0xc7b654e2d993251eULL,
+	0x782888a05df0d825ULL, 0x39174b5cb8726581ULL, 0x9b82b032642ba9ffULL,
+	0x2e1a7268d05c46feULL, 0x808b9d162c1d96acULL, 0x1ffe21dfa33ec0bcULL,
+	0x838a9812241b91a7ULL, 0x1b092d2448363f53ULL, 0x46c9ca03068c4540ULL,
+	0x9487a1264c35b2d8ULL, 0xd24e6b254ab9f798ULL, 0x3ee142a35b7c9d65ULL,
+	0x722e96b86de4ca1fULL, 0x31e453b773628642ULL, 0x3de047a7537a9a6eULL,
+	0x20eb608b0b40ab2bULL, 0xad90ea7af447d759ULL, 0xf1a40eaa49ff5bb8ULL,
+	0x221e6678f0445ad2ULL, 0x9285ab2e5c39bcceULL, 0xa060fd9d275d3d87ULL,
+	0x0000000000000000ULL, 0x6f25b19435defb5aULL, 0x01f403f7f302f6f2ULL,
+	0x0ef112e3db1cedd5ULL, 0xa194fe6ad45fcb75ULL, 0x1d0b272c583a3145ULL,
+	0x34e75cbb6b688f5fULL, 0x9f75bcc98f235610ULL, 0x2cef749b2b58b707ULL,
+	0x5c34e4d0bdb88ce1ULL, 0x5331f5c495a697c6ULL, 0x61d4a377eec2168fULL,
+	0x6dd0b767ceda0aa3ULL, 0x9786a4224433b5d3ULL, 0x827e9be5d7196755ULL,
+	0xeaad238e01c964ebULL, 0x1afd2ed3bb34c9a1ULL, 0x7b298da455f6df2eULL,
+	0x5030f0c09da090cdULL, 0x4d3bd7ecc59aa188ULL, 0xbc9fd9468c65fa30ULL,
+	0x15f83fc7932ad286ULL, 0x57c6f93f7eae6829ULL, 0x35135f4c986a79adULL,
+	0x0a061e183014123aULL, 0x0f051114281e1b27ULL, 0x52c5f63366a46134ULL,
+	0x33115544886677bbULL, 0x9977b6c19f2f5806ULL, 0x847c91edc7156943ULL,
+	0x8e7a8ff5f7017b79ULL, 0x887885fde70d756fULL, 0x5a36eed8adb482f7ULL,
+	0x241c6c70e04854c4ULL, 0x4b39dde4d596af9eULL, 0xeb592079f2cb9219ULL,
+	0x28187860c05048e8ULL, 0xfa5613458ae9bf70ULL, 0xc8b345f6f18d3e39ULL,
+	0xcdb04afae9873724ULL, 0x6c24b4903dd8fc51ULL, 0x6020a0801dc0e07dULL,
+	0xcbb240f2f98b3932ULL, 0xab92e072e44bd94fULL, 0xf8a315b671ed4e89ULL,
+	0x5dc0e7274eba7a13ULL, 0xcc44490d1a85c1d6ULL, 0xa662f79537513391ULL,
+	0x30105040806070b0ULL, 0xc1b45eeac99f2b08ULL, 0x9184ae2a543fbbc5ULL,
+	0xc54352112297d4e7ULL, 0xa893e576ec4dde44ULL, 0x5bc2ed2f5eb67405ULL,
+	0xde4a7f356aa1ebb4ULL, 0xdabd73ce81a9145bULL, 0x8c8f89060c058a80ULL,
+	0x772d99b475eec302ULL, 0xd9bc76ca89af1350ULL, 0xb99cd64a946ff32dULL,
+	0xbe6adfb577610bc9ULL, 0xc0405d1d3a9dddfaULL, 0x4ccfd41b3698577aULL,
+	0xfba210b279eb4982ULL, 0x9d80ba3a7427a7e9ULL, 0xd14f6e2142bff093ULL,
+	0x211f637cf8425dd9ULL, 0x43cac50f1e864c5dULL, 0xe3aa389239db71daULL,
+	0xc64257152a91d3ecULL
+};
+
+static const u64 T2[256] = {
+	0xd268bad36a01bbb9ULL, 0x4d1954fc66b1e59aULL, 0xbc932f7114cde265ULL,
+	0xcdb9749c1b512587ULL, 0x510253f557a4f7a2ULL, 0x6bb8d368be03d0d6ULL,
+	0x6fbdd26bb504d6deULL, 0x29644dd785feb352ULL, 0x5d0d50f04aadfdbaULL,
+	0x8a26ace9e063cf09ULL, 0x0e838d8a9684091cULL, 0xc679bfdc4d1aa591ULL,
+	0xddad7090374d3da7ULL, 0x550752f65ca3f1aaULL, 0x52c89ab317e17ba4ULL,
+	0x2d614cd48ef9b55aULL, 0x8f65ea2320ac4603ULL, 0x73a6d5628411c4e6ULL,
+	0x66f197a468c255ccULL, 0x63b2d16ea80ddcc6ULL, 0xccff3355d099aa85ULL,
+	0x590851f341aafbb2ULL, 0x712a5bed0f9cc7e2ULL, 0xa204a6f7ae55f359ULL,
+	0x5f81de7fc120febeULL, 0x3d7548d8a2e5ad7aULL, 0x9a32a8e5cc7fd729ULL,
+	0x5ec799b60ae871bcULL, 0x4b90db70e63be096ULL, 0xc8fa3256db9eac8dULL,
+	0xe651b7c4152295d1ULL, 0xd72bfc19aace32b3ULL, 0xab48e3387393704bULL,
+	0x42dc9ebf3bfd6384ULL, 0x7eef91ae52d041fcULL, 0x56cd9bb01ce67dacULL,
+	0xaf4de23b78947643ULL, 0xd66dbbd06106bdb1ULL, 0x195841c3f1da9b32ULL,
+	0xa5cb6eb2e5177957ULL, 0xae0ba5f2b35cf941ULL, 0x0bc0cb40564b8016ULL,
+	0xb1da6bbdc20c677fULL, 0x6efb95a27ecc59dcULL, 0xbe1fa1fe9f40e161ULL,
+	0xeb18f308c3e310cbULL, 0xfe4fb1ce2f3081e1ULL, 0x080a0206160e0c10ULL,
+	0x17dbcc49675e922eULL, 0x37f3c4513f66a26eULL, 0x74691d27cf534ee8ULL,
+	0x5044143c9c6c78a0ULL, 0x2be8c3580e73b056ULL, 0x91f263a59a34573fULL,
+	0x4f95da73ed3ce69eULL, 0x69345de7358ed3d2ULL, 0x613e5fe12380dfc2ULL,
+	0x578bdc79d72ef2aeULL, 0xe9947d87486e13cfULL, 0x13decd4a6c599426ULL,
+	0xe19e7f815e601fdfULL, 0x752f5aee049bc1eaULL, 0xadc16cb4f3197547ULL,
+	0x6d315ce43e89d5daULL, 0xfb0cf704efff08ebULL, 0x98be266a47f2d42dULL,
+	0xdb24ff1cb7c738abULL, 0x937eed2a11b9543bULL, 0x876fe82536a24a13ULL,
+	0x4ed39dba26f4699cULL, 0xa1ce6fb1ee107f5fULL, 0x028c8e8f8b8d0304ULL,
+	0x647d192be34f56c8ULL, 0xba1aa0fd9447e769ULL, 0xe717f00ddeea1ad3ULL,
+	0x1e978986ba98113cULL, 0x3c330f11692d2278ULL, 0x1c1b070931151238ULL,
+	0x8629afecfd6ac511ULL, 0xcb30fb109bdb208bULL, 0x2028081858383040ULL,
+	0x5441153f976b7ea8ULL, 0x34390d177f232e68ULL, 0x1014040c2c1c1820ULL,
+	0x040501030b070608ULL, 0x8de964acab214507ULL, 0x5b84df7cca27f8b6ULL,
+	0xc5b3769a0d5f2997ULL, 0xf980798b64720befULL, 0x538edd7adc29f4a6ULL,
+	0xf4c93d47b2b38ef5ULL, 0x584e163a8a6274b0ULL, 0xfcc33f41a4bd82e5ULL,
+	0xdceb3759fc85b2a5ULL, 0xa9c46db7f81e734fULL, 0xe0d8384895a890ddULL,
+	0xde67b9d67708b1a1ULL, 0xd1a273952a4437bfULL, 0x836ae9263da54c1bULL,
+	0xd4e1355fea8bbeb5ULL, 0x491c55ff6db6e392ULL, 0xd9a871933c4a3bafULL,
+	0xf18a7b8d727c07ffULL, 0x0a868c899d830f14ULL, 0xd5a77296214331b7ULL,
+	0x1a928885b19f1734ULL, 0xff09f607e4f80ee3ULL, 0xa8822a7e33d6fc4dULL,
+	0xf8c63e42afba84edULL, 0x653b5ee22887d9caULL, 0x9cbb27694cf5d225ULL,
+	0x054346cac0cf890aULL, 0x303c0c1474242860ULL, 0x89ec65afa026430fULL,
+	0xbdd568b8df056d67ULL, 0x99f861a38c3a5b2fULL, 0x0c0f03051d090a18ULL,
+	0x23e2c15e187dbc46ULL, 0x411657f97bb8ef82ULL, 0x7fa9d6679918cefeULL,
+	0x439ad976f035ec86ULL, 0x7d2558e81295cdfaULL, 0x479fd875fb32ea8eULL,
+	0x85e366aabd2f4917ULL, 0x7bacd764921fc8f6ULL, 0xe8d23a4e83a69ccdULL,
+	0x07cfc8454b428a0eULL, 0xf0cc3c44b9b488fdULL, 0xcf35fa1390dc2683ULL,
+	0x62f496a763c553c4ULL, 0xa601a7f4a552f551ULL, 0x5ac298b501ef77b4ULL,
+	0x977bec291abe5233ULL, 0xda62b8d57c0fb7a9ULL, 0x3bfcc754226fa876ULL,
+	0x822caeeff66dc319ULL, 0xb9d069bbd4026b6fULL, 0x317a4bddbfeca762ULL,
+	0x963dabe0d176dd31ULL, 0x9e37a9e6c778d121ULL, 0x81e667a9b6284f1fULL,
+	0x28220a1e4e363c50ULL, 0x014647c9cbc88f02ULL, 0xef1df20bc8e416c3ULL,
+	0xee5bb5c2032c99c1ULL, 0x88aa22666beecc0dULL, 0xb356e5324981647bULL,
+	0x9f71ee2f0cb05e23ULL, 0xc27cbedf461da399ULL, 0xac872b7d38d1fa45ULL,
+	0x3ebf819ee2a0217cULL, 0x485a1236a67e6c90ULL, 0x36b58398f4ae2d6cULL,
+	0x6c771b2df5415ad8ULL, 0x38360e12622a2470ULL, 0x8caf236560e9ca05ULL,
+	0xf306f502f9f104fbULL, 0x094c45cfddc68312ULL, 0x84a5216376e7c615ULL,
+	0x1fd1ce4f71509e3eULL, 0x397049dba9e2ab72ULL, 0xb09c2c7409c4e87dULL,
+	0xc33af9168dd52c9bULL, 0xbf59e63754886e63ULL, 0xe254b6c71e2593d9ULL,
+	0xa088287825d8f05dULL, 0x5c4b1739816572b8ULL, 0x32b0829bffa92b64ULL,
+	0x68721a2efe465cd0ULL, 0x169d8b80ac961d2cULL, 0xdf21fe1fbcc03ea3ULL,
+	0x12988a83a7911b24ULL, 0x242d091b533f3648ULL, 0x03cac94640458c06ULL,
+	0x26a18794d8b2354cULL, 0x256b4ed298f7b94aULL, 0xa342e13e659d7c5bULL,
+	0xb8962e721fcae46dULL, 0xb753e43142866273ULL, 0xa747e03d6e9a7a53ULL,
+	0x8b60eb202bab400bULL, 0x7aea90ad59d747f4ULL, 0xaa0ea4f1b85bff49ULL,
+	0x78661e22d25a44f0ULL, 0x2eab8592cebc395cULL, 0x9dfd60a0873d5d27ULL,
+	0x0000000000000000ULL, 0x94b1256f5afbde35ULL, 0xf703f401f2f602f3ULL,
+	0xe312f10ed5ed1cdbULL, 0x6afe94a175cb5fd4ULL, 0x2c270b1d45313a58ULL,
+	0xbb5ce7345f8f686bULL, 0xc9bc759f1056238fULL, 0x9b74ef2c07b7582bULL,
+	0xd0e4345ce18cb8bdULL, 0xc4f53153c697a695ULL, 0x77a3d4618f16c2eeULL,
+	0x67b7d06da30adaceULL, 0x22a48697d3b53344ULL, 0xe59b7e82556719d7ULL,
+	0x8e23adeaeb64c901ULL, 0xd32efd1aa1c934bbULL, 0xa48d297b2edff655ULL,
+	0xc0f03050cd90a09dULL, 0xecd73b4d88a19ac5ULL, 0x46d99fbc30fa658cULL,
+	0xc73ff81586d22a93ULL, 0x3ff9c6572968ae7eULL, 0x4c5f1335ad796a98ULL,
+	0x181e060a3a121430ULL, 0x1411050f271b1e28ULL, 0x33f6c5523461a466ULL,
+	0x44551133bb776688ULL, 0xc1b6779906582f9fULL, 0xed917c84436915c7ULL,
+	0xf58f7a8e797b01f7ULL, 0xfd8578886f750de7ULL, 0xd8ee365af782b4adULL,
+	0x706c1c24c45448e0ULL, 0xe4dd394b9eaf96d5ULL, 0x792059eb1992cbf2ULL,
+	0x60781828e84850c0ULL, 0x451356fa70bfe98aULL, 0xf645b3c8393e8df1ULL,
+	0xfa4ab0cd243787e9ULL, 0x90b4246c51fcd83dULL, 0x80a020607de0c01dULL,
+	0xf240b2cb32398bf9ULL, 0x72e092ab4fd94be4ULL, 0xb615a3f8894eed71ULL,
+	0x27e7c05d137aba4eULL, 0x0d4944ccd6c1851aULL, 0x95f762a691335137ULL,
+	0x40501030b0706080ULL, 0xea5eb4c1082b9fc9ULL, 0x2aae8491c5bb3f54ULL,
+	0x115243c5e7d49722ULL, 0x76e593a844de4decULL, 0x2fedc25b0574b65eULL,
+	0x357f4adeb4eba16aULL, 0xce73bdda5b14a981ULL, 0x06898f8c808a050cULL,
+	0xb4992d7702c3ee75ULL, 0xca76bcd95013af89ULL, 0x4ad69cb92df36f94ULL,
+	0xb5df6abec90b6177ULL, 0x1d5d40c0fadd9d3aULL, 0x1bd4cf4c7a579836ULL,
+	0xb210a2fb8249eb79ULL, 0x3aba809de9a72774ULL, 0x216e4fd193f0bf42ULL,
+	0x7c631f21d95d42f8ULL, 0x0fc5ca435d4c861eULL, 0x9238aae3da71db39ULL,
+	0x155742c6ecd3912aULL
+};
+
+static const u64 T3[256] = {
+	0x68d2d3ba016ab9bbULL, 0x194dfc54b1669ae5ULL, 0x93bc712fcd1465e2ULL,
+	0xb9cd9c74511b8725ULL, 0x0251f553a457a2f7ULL, 0xb86b68d303bed6d0ULL,
+	0xbd6f6bd204b5ded6ULL, 0x6429d74dfe8552b3ULL, 0x0d5df050ad4abafdULL,
+	0x268ae9ac63e009cfULL, 0x830e8a8d84961c09ULL, 0x79c6dcbf1a4d91a5ULL,
+	0xaddd90704d37a73dULL, 0x0755f652a35caaf1ULL, 0xc852b39ae117a47bULL,
+	0x612dd44cf98e5ab5ULL, 0x658f23eaac200346ULL, 0xa67362d51184e6c4ULL,
+	0xf166a497c268cc55ULL, 0xb2636ed10da8c6dcULL, 0xffcc553399d085aaULL,
+	0x0859f351aa41b2fbULL, 0x2a71ed5b9c0fe2c7ULL, 0x04a2f7a655ae59f3ULL,
+	0x815f7fde20c1befeULL, 0x753dd848e5a27aadULL, 0x329ae5a87fcc29d7ULL,
+	0xc75eb699e80abc71ULL, 0x904b70db3be696e0ULL, 0xfac856329edb8dacULL,
+	0x51e6c4b72215d195ULL, 0x2bd719fcceaab332ULL, 0x48ab38e393734b70ULL,
+	0xdc42bf9efd3b8463ULL, 0xef7eae91d052fc41ULL, 0xcd56b09be61cac7dULL,
+	0x4daf3be294784376ULL, 0x6dd6d0bb0661b1bdULL, 0x5819c341daf1329bULL,
+	0xcba5b26e17e55779ULL, 0x0baef2a55cb341f9ULL, 0xc00b40cb4b561680ULL,
+	0xdab1bd6b0cc27f67ULL, 0xfb6ea295cc7edc59ULL, 0x1fbefea1409f61e1ULL,
+	0x18eb08f3e3c3cb10ULL, 0x4ffeceb1302fe181ULL, 0x0a0806020e16100cULL,
+	0xdb1749cc5e672e92ULL, 0xf33751c4663f6ea2ULL, 0x6974271d53cfe84eULL,
+	0x44503c146c9ca078ULL, 0xe82b58c3730e56b0ULL, 0xf291a563349a3f57ULL,
+	0x954f73da3ced9ee6ULL, 0x3469e75d8e35d2d3ULL, 0x3e61e15f8023c2dfULL,
+	0x8b5779dc2ed7aef2ULL, 0x94e9877d6e48cf13ULL, 0xde134acd596c2694ULL,
+	0x9ee1817f605edf1fULL, 0x2f75ee5a9b04eac1ULL, 0xc1adb46c19f34775ULL,
+	0x316de45c893edad5ULL, 0x0cfb04f7ffefeb08ULL, 0xbe986a26f2472dd4ULL,
+	0x24db1cffc7b7ab38ULL, 0x7e932aedb9113b54ULL, 0x6f8725e8a236134aULL,
+	0xd34eba9df4269c69ULL, 0xcea1b16f10ee5f7fULL, 0x8c028f8e8d8b0403ULL,
+	0x7d642b194fe3c856ULL, 0x1abafda0479469e7ULL, 0x17e70df0eaded31aULL,
+	0x971e868998ba3c11ULL, 0x333c110f2d697822ULL, 0x1b1c090715313812ULL,
+	0x2986ecaf6afd11c5ULL, 0x30cb10fbdb9b8b20ULL, 0x2820180838584030ULL,
+	0x41543f156b97a87eULL, 0x3934170d237f682eULL, 0x14100c041c2c2018ULL,
+	0x05040301070b0806ULL, 0xe98dac6421ab0745ULL, 0x845b7cdf27cab6f8ULL,
+	0xb3c59a765f0d9729ULL, 0x80f98b797264ef0bULL, 0x8e537add29dca6f4ULL,
+	0xc9f4473db3b2f58eULL, 0x4e583a16628ab074ULL, 0xc3fc413fbda4e582ULL,
+	0xebdc593785fca5b2ULL, 0xc4a9b76d1ef84f73ULL, 0xd8e04838a895dd90ULL,
+	0x67ded6b90877a1b1ULL, 0xa2d19573442abf37ULL, 0x6a8326e9a53d1b4cULL,
+	0xe1d45f358beab5beULL, 0x1c49ff55b66d92e3ULL, 0xa8d993714a3caf3bULL,
+	0x8af18d7b7c72ff07ULL, 0x860a898c839d140fULL, 0xa7d596724321b731ULL,
+	0x921a85889fb13417ULL, 0x09ff07f6f8e4e30eULL, 0x82a87e2ad6334dfcULL,
+	0xc6f8423ebaafed84ULL, 0x3b65e25e8728cad9ULL, 0xbb9c6927f54c25d2ULL,
+	0x4305ca46cfc00a89ULL, 0x3c30140c24746028ULL, 0xec89af6526a00f43ULL,
+	0xd5bdb86805df676dULL, 0xf899a3613a8c2f5bULL, 0x0f0c0503091d180aULL,
+	0xe2235ec17d1846bcULL, 0x1641f957b87b82efULL, 0xa97f67d61899feceULL,
+	0x9a4376d935f086ecULL, 0x257de8589512facdULL, 0x9f4775d832fb8eeaULL,
+	0xe385aa662fbd1749ULL, 0xac7b64d71f92f6c8ULL, 0xd2e84e3aa683cd9cULL,
+	0xcf0745c8424b0e8aULL, 0xccf0443cb4b9fd88ULL, 0x35cf13fadc908326ULL,
+	0xf462a796c563c453ULL, 0x01a6f4a752a551f5ULL, 0xc25ab598ef01b477ULL,
+	0x7b9729ecbe1a3352ULL, 0x62dad5b80f7ca9b7ULL, 0xfc3b54c76f2276a8ULL,
+	0x2c82efae6df619c3ULL, 0xd0b9bb6902d46f6bULL, 0x7a31dd4becbf62a7ULL,
+	0x3d96e0ab76d131ddULL, 0x379ee6a978c721d1ULL, 0xe681a96728b61f4fULL,
+	0x22281e0a364e503cULL, 0x4601c947c8cb028fULL, 0x1def0bf2e4c8c316ULL,
+	0x5beec2b52c03c199ULL, 0xaa886622ee6b0dccULL, 0x56b332e581497b64ULL,
+	0x719f2feeb00c235eULL, 0x7cc2dfbe1d4699a3ULL, 0x87ac7d2bd13845faULL,
+	0xbf3e9e81a0e27c21ULL, 0x5a4836127ea6906cULL, 0xb5369883aef46c2dULL,
+	0x776c2d1b41f5d85aULL, 0x3638120e2a627024ULL, 0xaf8c6523e96005caULL,
+	0x06f302f5f1f9fb04ULL, 0x4c09cf45c6dd1283ULL, 0xa5846321e77615c6ULL,
+	0xd11f4fce50713e9eULL, 0x7039db49e2a972abULL, 0x9cb0742cc4097de8ULL,
+	0x3ac316f9d58d9b2cULL, 0x59bf37e68854636eULL, 0x54e2c7b6251ed993ULL,
+	0x88a07828d8255df0ULL, 0x4b5c39176581b872ULL, 0xb0329b82a9ff642bULL,
+	0x72682e1a46fed05cULL, 0x9d16808b96ac2c1dULL, 0x21df1ffec0bca33eULL,
+	0x9812838a91a7241bULL, 0x2d241b093f534836ULL, 0xca0346c94540068cULL,
+	0xa1269487b2d84c35ULL, 0x6b25d24ef7984ab9ULL, 0x42a33ee19d655b7cULL,
+	0x96b8722eca1f6de4ULL, 0x53b731e486427362ULL, 0x47a73de09a6e537aULL,
+	0x608b20ebab2b0b40ULL, 0xea7aad90d759f447ULL, 0x0eaaf1a45bb849ffULL,
+	0x6678221e5ad2f044ULL, 0xab2e9285bcce5c39ULL, 0xfd9da0603d87275dULL,
+	0x0000000000000000ULL, 0xb1946f25fb5a35deULL, 0x03f701f4f6f2f302ULL,
+	0x12e30ef1edd5db1cULL, 0xfe6aa194cb75d45fULL, 0x272c1d0b3145583aULL,
+	0x5cbb34e78f5f6b68ULL, 0xbcc99f7556108f23ULL, 0x749b2cefb7072b58ULL,
+	0xe4d05c348ce1bdb8ULL, 0xf5c4533197c695a6ULL, 0xa37761d4168feec2ULL,
+	0xb7676dd00aa3cedaULL, 0xa4229786b5d34433ULL, 0x9be5827e6755d719ULL,
+	0x238eeaad64eb01c9ULL, 0x2ed31afdc9a1bb34ULL, 0x8da47b29df2e55f6ULL,
+	0xf0c0503090cd9da0ULL, 0xd7ec4d3ba188c59aULL, 0xd946bc9ffa308c65ULL,
+	0x3fc715f8d286932aULL, 0xf93f57c668297eaeULL, 0x5f4c351379ad986aULL,
+	0x1e180a06123a3014ULL, 0x11140f051b27281eULL, 0xf63352c5613466a4ULL,
+	0x5544331177bb8866ULL, 0xb6c1997758069f2fULL, 0x91ed847c6943c715ULL,
+	0x8ff58e7a7b79f701ULL, 0x85fd8878756fe70dULL, 0xeed85a3682f7adb4ULL,
+	0x6c70241c54c4e048ULL, 0xdde44b39af9ed596ULL, 0x2079eb599219f2cbULL,
+	0x7860281848e8c050ULL, 0x1345fa56bf708ae9ULL, 0x45f6c8b33e39f18dULL,
+	0x4afacdb03724e987ULL, 0xb4906c24fc513dd8ULL, 0xa0806020e07d1dc0ULL,
+	0x40f2cbb23932f98bULL, 0xe072ab92d94fe44bULL, 0x15b6f8a34e8971edULL,
+	0xe7275dc07a134ebaULL, 0x490dcc44c1d61a85ULL, 0xf795a66233913751ULL,
+	0x5040301070b08060ULL, 0x5eeac1b42b08c99fULL, 0xae2a9184bbc5543fULL,
+	0x5211c543d4e72297ULL, 0xe576a893de44ec4dULL, 0xed2f5bc274055eb6ULL,
+	0x7f35de4aebb46aa1ULL, 0x73cedabd145b81a9ULL, 0x89068c8f8a800c05ULL,
+	0x99b4772dc30275eeULL, 0x76cad9bc135089afULL, 0xd64ab99cf32d946fULL,
+	0xdfb5be6a0bc97761ULL, 0x5d1dc040ddfa3a9dULL, 0xd41b4ccf577a3698ULL,
+	0x10b2fba2498279ebULL, 0xba3a9d80a7e97427ULL, 0x6e21d14ff09342bfULL,
+	0x637c211f5dd9f842ULL, 0xc50f43ca4c5d1e86ULL, 0x3892e3aa71da39dbULL,
+	0x5715c642d3ec2a91ULL
+};
+
+static const u64 T4[256] = {
+	0xbbb96a01bad3d268ULL, 0xe59a66b154fc4d19ULL, 0xe26514cd2f71bc93ULL,
+	0x25871b51749ccdb9ULL, 0xf7a257a453f55102ULL, 0xd0d6be03d3686bb8ULL,
+	0xd6deb504d26b6fbdULL, 0xb35285fe4dd72964ULL, 0xfdba4aad50f05d0dULL,
+	0xcf09e063ace98a26ULL, 0x091c96848d8a0e83ULL, 0xa5914d1abfdcc679ULL,
+	0x3da7374d7090ddadULL, 0xf1aa5ca352f65507ULL, 0x7ba417e19ab352c8ULL,
+	0xb55a8ef94cd42d61ULL, 0x460320acea238f65ULL, 0xc4e68411d56273a6ULL,
+	0x55cc68c297a466f1ULL, 0xdcc6a80dd16e63b2ULL, 0xaa85d0993355ccffULL,
+	0xfbb241aa51f35908ULL, 0xc7e20f9c5bed712aULL, 0xf359ae55a6f7a204ULL,
+	0xfebec120de7f5f81ULL, 0xad7aa2e548d83d75ULL, 0xd729cc7fa8e59a32ULL,
+	0x71bc0ae899b65ec7ULL, 0xe096e63bdb704b90ULL, 0xac8ddb9e3256c8faULL,
+	0x95d11522b7c4e651ULL, 0x32b3aacefc19d72bULL, 0x704b7393e338ab48ULL,
+	0x63843bfd9ebf42dcULL, 0x41fc52d091ae7eefULL, 0x7dac1ce69bb056cdULL,
+	0x76437894e23baf4dULL, 0xbdb16106bbd0d66dULL, 0x9b32f1da41c31958ULL,
+	0x7957e5176eb2a5cbULL, 0xf941b35ca5f2ae0bULL, 0x8016564bcb400bc0ULL,
+	0x677fc20c6bbdb1daULL, 0x59dc7ecc95a26efbULL, 0xe1619f40a1febe1fULL,
+	0x10cbc3e3f308eb18ULL, 0x81e12f30b1cefe4fULL, 0x0c10160e0206080aULL,
+	0x922e675ecc4917dbULL, 0xa26e3f66c45137f3ULL, 0x4ee8cf531d277469ULL,
+	0x78a09c6c143c5044ULL, 0xb0560e73c3582be8ULL, 0x573f9a3463a591f2ULL,
+	0xe69eed3cda734f95ULL, 0xd3d2358e5de76934ULL, 0xdfc223805fe1613eULL,
+	0xf2aed72edc79578bULL, 0x13cf486e7d87e994ULL, 0x94266c59cd4a13deULL,
+	0x1fdf5e607f81e19eULL, 0xc1ea049b5aee752fULL, 0x7547f3196cb4adc1ULL,
+	0xd5da3e895ce46d31ULL, 0x08ebeffff704fb0cULL, 0xd42d47f2266a98beULL,
+	0x38abb7c7ff1cdb24ULL, 0x543b11b9ed2a937eULL, 0x4a1336a2e825876fULL,
+	0x699c26f49dba4ed3ULL, 0x7f5fee106fb1a1ceULL, 0x03048b8d8e8f028cULL,
+	0x56c8e34f192b647dULL, 0xe7699447a0fdba1aULL, 0x1ad3deeaf00de717ULL,
+	0x113cba9889861e97ULL, 0x2278692d0f113c33ULL, 0x1238311507091c1bULL,
+	0xc511fd6aafec8629ULL, 0x208b9bdbfb10cb30ULL, 0x3040583808182028ULL,
+	0x7ea8976b153f5441ULL, 0x2e687f230d173439ULL, 0x18202c1c040c1014ULL,
+	0x06080b0701030405ULL, 0x4507ab2164ac8de9ULL, 0xf8b6ca27df7c5b84ULL,
+	0x29970d5f769ac5b3ULL, 0x0bef6472798bf980ULL, 0xf4a6dc29dd7a538eULL,
+	0x8ef5b2b33d47f4c9ULL, 0x74b08a62163a584eULL, 0x82e5a4bd3f41fcc3ULL,
+	0xb2a5fc853759dcebULL, 0x734ff81e6db7a9c4ULL, 0x90dd95a83848e0d8ULL,
+	0xb1a17708b9d6de67ULL, 0x37bf2a447395d1a2ULL, 0x4c1b3da5e926836aULL,
+	0xbeb5ea8b355fd4e1ULL, 0xe3926db655ff491cULL, 0x3baf3c4a7193d9a8ULL,
+	0x07ff727c7b8df18aULL, 0x0f149d838c890a86ULL, 0x31b721437296d5a7ULL,
+	0x1734b19f88851a92ULL, 0x0ee3e4f8f607ff09ULL, 0xfc4d33d62a7ea882ULL,
+	0x84edafba3e42f8c6ULL, 0xd9ca28875ee2653bULL, 0xd2254cf527699cbbULL,
+	0x890ac0cf46ca0543ULL, 0x286074240c14303cULL, 0x430fa02665af89ecULL,
+	0x6d67df0568b8bdd5ULL, 0x5b2f8c3a61a399f8ULL, 0x0a181d0903050c0fULL,
+	0xbc46187dc15e23e2ULL, 0xef827bb857f94116ULL, 0xcefe9918d6677fa9ULL,
+	0xec86f035d976439aULL, 0xcdfa129558e87d25ULL, 0xea8efb32d875479fULL,
+	0x4917bd2f66aa85e3ULL, 0xc8f6921fd7647bacULL, 0x9ccd83a63a4ee8d2ULL,
+	0x8a0e4b42c84507cfULL, 0x88fdb9b43c44f0ccULL, 0x268390dcfa13cf35ULL,
+	0x53c463c596a762f4ULL, 0xf551a552a7f4a601ULL, 0x77b401ef98b55ac2ULL,
+	0x52331abeec29977bULL, 0xb7a97c0fb8d5da62ULL, 0xa876226fc7543bfcULL,
+	0xc319f66daeef822cULL, 0x6b6fd40269bbb9d0ULL, 0xa762bfec4bdd317aULL,
+	0xdd31d176abe0963dULL, 0xd121c778a9e69e37ULL, 0x4f1fb62867a981e6ULL,
+	0x3c504e360a1e2822ULL, 0x8f02cbc847c90146ULL, 0x16c3c8e4f20bef1dULL,
+	0x99c1032cb5c2ee5bULL, 0xcc0d6bee226688aaULL, 0x647b4981e532b356ULL,
+	0x5e230cb0ee2f9f71ULL, 0xa399461dbedfc27cULL, 0xfa4538d12b7dac87ULL,
+	0x217ce2a0819e3ebfULL, 0x6c90a67e1236485aULL, 0x2d6cf4ae839836b5ULL,
+	0x5ad8f5411b2d6c77ULL, 0x2470622a0e123836ULL, 0xca0560e923658cafULL,
+	0x04fbf9f1f502f306ULL, 0x8312ddc645cf094cULL, 0xc61576e7216384a5ULL,
+	0x9e3e7150ce4f1fd1ULL, 0xab72a9e249db3970ULL, 0xe87d09c42c74b09cULL,
+	0x2c9b8dd5f916c33aULL, 0x6e635488e637bf59ULL, 0x93d91e25b6c7e254ULL,
+	0xf05d25d82878a088ULL, 0x72b8816517395c4bULL, 0x2b64ffa9829b32b0ULL,
+	0x5cd0fe461a2e6872ULL, 0x1d2cac968b80169dULL, 0x3ea3bcc0fe1fdf21ULL,
+	0x1b24a7918a831298ULL, 0x3648533f091b242dULL, 0x8c064045c94603caULL,
+	0x354cd8b2879426a1ULL, 0xb94a98f74ed2256bULL, 0x7c5b659de13ea342ULL,
+	0xe46d1fca2e72b896ULL, 0x62734286e431b753ULL, 0x7a536e9ae03da747ULL,
+	0x400b2babeb208b60ULL, 0x47f459d790ad7aeaULL, 0xff49b85ba4f1aa0eULL,
+	0x44f0d25a1e227866ULL, 0x395ccebc85922eabULL, 0x5d27873d60a09dfdULL,
+	0x0000000000000000ULL, 0xde355afb256f94b1ULL, 0x02f3f2f6f401f703ULL,
+	0x1cdbd5edf10ee312ULL, 0x5fd475cb94a16afeULL, 0x3a5845310b1d2c27ULL,
+	0x686b5f8fe734bb5cULL, 0x238f1056759fc9bcULL, 0x582b07b7ef2c9b74ULL,
+	0xb8bde18c345cd0e4ULL, 0xa695c6973153c4f5ULL, 0xc2ee8f16d46177a3ULL,
+	0xdacea30ad06d67b7ULL, 0x3344d3b5869722a4ULL, 0x19d755677e82e59bULL,
+	0xc901eb64adea8e23ULL, 0x34bba1c9fd1ad32eULL, 0xf6552edf297ba48dULL,
+	0xa09dcd903050c0f0ULL, 0x9ac588a13b4decd7ULL, 0x658c30fa9fbc46d9ULL,
+	0x2a9386d2f815c73fULL, 0xae7e2968c6573ff9ULL, 0x6a98ad7913354c5fULL,
+	0x14303a12060a181eULL, 0x1e28271b050f1411ULL, 0xa4663461c55233f6ULL,
+	0x6688bb7711334455ULL, 0x2f9f06587799c1b6ULL, 0x15c743697c84ed91ULL,
+	0x01f7797b7a8ef58fULL, 0x0de76f757888fd85ULL, 0xb4adf782365ad8eeULL,
+	0x48e0c4541c24706cULL, 0x96d59eaf394be4ddULL, 0xcbf2199259eb7920ULL,
+	0x50c0e84818286078ULL, 0xe98a70bf56fa4513ULL, 0x8df1393eb3c8f645ULL,
+	0x87e92437b0cdfa4aULL, 0xd83d51fc246c90b4ULL, 0xc01d7de0206080a0ULL,
+	0x8bf93239b2cbf240ULL, 0x4be44fd992ab72e0ULL, 0xed71894ea3f8b615ULL,
+	0xba4e137ac05d27e7ULL, 0x851ad6c144cc0d49ULL, 0x5137913362a695f7ULL,
+	0x6080b07010304050ULL, 0x9fc9082bb4c1ea5eULL, 0x3f54c5bb84912aaeULL,
+	0x9722e7d443c51152ULL, 0x4dec44de93a876e5ULL, 0xb65e0574c25b2fedULL,
+	0xa16ab4eb4ade357fULL, 0xa9815b14bddace73ULL, 0x050c808a8f8c0689ULL,
+	0xee7502c32d77b499ULL, 0xaf895013bcd9ca76ULL, 0x6f942df39cb94ad6ULL,
+	0x6177c90b6abeb5dfULL, 0x9d3afadd40c01d5dULL, 0x98367a57cf4c1bd4ULL,
+	0xeb798249a2fbb210ULL, 0x2774e9a7809d3abaULL, 0xbf4293f04fd1216eULL,
+	0x42f8d95d1f217c63ULL, 0x861e5d4cca430fc5ULL, 0xdb39da71aae39238ULL,
+	0x912aecd342c61557ULL
+};
+
+static const u64 T5[256] = {
+	0xb9bb016ad3ba68d2ULL, 0x9ae5b166fc54194dULL, 0x65e2cd14712f93bcULL,
+	0x8725511b9c74b9cdULL, 0xa2f7a457f5530251ULL, 0xd6d003be68d3b86bULL,
+	0xded604b56bd2bd6fULL, 0x52b3fe85d74d6429ULL, 0xbafdad4af0500d5dULL,
+	0x09cf63e0e9ac268aULL, 0x1c0984968a8d830eULL, 0x91a51a4ddcbf79c6ULL,
+	0xa73d4d379070adddULL, 0xaaf1a35cf6520755ULL, 0xa47be117b39ac852ULL,
+	0x5ab5f98ed44c612dULL, 0x0346ac2023ea658fULL, 0xe6c4118462d5a673ULL,
+	0xcc55c268a497f166ULL, 0xc6dc0da86ed1b263ULL, 0x85aa99d05533ffccULL,
+	0xb2fbaa41f3510859ULL, 0xe2c79c0fed5b2a71ULL, 0x59f355aef7a604a2ULL,
+	0xbefe20c17fde815fULL, 0x7aade5a2d848753dULL, 0x29d77fcce5a8329aULL,
+	0xbc71e80ab699c75eULL, 0x96e03be670db904bULL, 0x8dac9edb5632fac8ULL,
+	0xd1952215c4b751e6ULL, 0xb332ceaa19fc2bd7ULL, 0x4b70937338e348abULL,
+	0x8463fd3bbf9edc42ULL, 0xfc41d052ae91ef7eULL, 0xac7de61cb09bcd56ULL,
+	0x437694783be24dafULL, 0xb1bd0661d0bb6dd6ULL, 0x329bdaf1c3415819ULL,
+	0x577917e5b26ecba5ULL, 0x41f95cb3f2a50baeULL, 0x16804b5640cbc00bULL,
+	0x7f670cc2bd6bdab1ULL, 0xdc59cc7ea295fb6eULL, 0x61e1409ffea11fbeULL,
+	0xcb10e3c308f318ebULL, 0xe181302fceb14ffeULL, 0x100c0e1606020a08ULL,
+	0x2e925e6749ccdb17ULL, 0x6ea2663f51c4f337ULL, 0xe84e53cf271d6974ULL,
+	0xa0786c9c3c144450ULL, 0x56b0730e58c3e82bULL, 0x3f57349aa563f291ULL,
+	0x9ee63ced73da954fULL, 0xd2d38e35e75d3469ULL, 0xc2df8023e15f3e61ULL,
+	0xaef22ed779dc8b57ULL, 0xcf136e48877d94e9ULL, 0x2694596c4acdde13ULL,
+	0xdf1f605e817f9ee1ULL, 0xeac19b04ee5a2f75ULL, 0x477519f3b46cc1adULL,
+	0xdad5893ee45c316dULL, 0xeb08ffef04f70cfbULL, 0x2dd4f2476a26be98ULL,
+	0xab38c7b71cff24dbULL, 0x3b54b9112aed7e93ULL, 0x134aa23625e86f87ULL,
+	0x9c69f426ba9dd34eULL, 0x5f7f10eeb16fcea1ULL, 0x04038d8b8f8e8c02ULL,
+	0xc8564fe32b197d64ULL, 0x69e74794fda01abaULL, 0xd31aeade0df017e7ULL,
+	0x3c1198ba8689971eULL, 0x78222d69110f333cULL, 0x3812153109071b1cULL,
+	0x11c56afdecaf2986ULL, 0x8b20db9b10fb30cbULL, 0x4030385818082820ULL,
+	0xa87e6b973f154154ULL, 0x682e237f170d3934ULL, 0x20181c2c0c041410ULL,
+	0x0806070b03010504ULL, 0x074521abac64e98dULL, 0xb6f827ca7cdf845bULL,
+	0x97295f0d9a76b3c5ULL, 0xef0b72648b7980f9ULL, 0xa6f429dc7add8e53ULL,
+	0xf58eb3b2473dc9f4ULL, 0xb074628a3a164e58ULL, 0xe582bda4413fc3fcULL,
+	0xa5b285fc5937ebdcULL, 0x4f731ef8b76dc4a9ULL, 0xdd90a8954838d8e0ULL,
+	0xa1b10877d6b967deULL, 0xbf37442a9573a2d1ULL, 0x1b4ca53d26e96a83ULL,
+	0xb5be8bea5f35e1d4ULL, 0x92e3b66dff551c49ULL, 0xaf3b4a3c9371a8d9ULL,
+	0xff077c728d7b8af1ULL, 0x140f839d898c860aULL, 0xb73143219672a7d5ULL,
+	0x34179fb18588921aULL, 0xe30ef8e407f609ffULL, 0x4dfcd6337e2a82a8ULL,
+	0xed84baaf423ec6f8ULL, 0xcad98728e25e3b65ULL, 0x25d2f54c6927bb9cULL,
+	0x0a89cfc0ca464305ULL, 0x60282474140c3c30ULL, 0x0f4326a0af65ec89ULL,
+	0x676d05dfb868d5bdULL, 0x2f5b3a8ca361f899ULL, 0x180a091d05030f0cULL,
+	0x46bc7d185ec1e223ULL, 0x82efb87bf9571641ULL, 0xfece189967d6a97fULL,
+	0x86ec35f076d99a43ULL, 0xfacd9512e858257dULL, 0x8eea32fb75d89f47ULL,
+	0x17492fbdaa66e385ULL, 0xf6c81f9264d7ac7bULL, 0xcd9ca6834e3ad2e8ULL,
+	0x0e8a424b45c8cf07ULL, 0xfd88b4b9443cccf0ULL, 0x8326dc9013fa35cfULL,
+	0xc453c563a796f462ULL, 0x51f552a5f4a701a6ULL, 0xb477ef01b598c25aULL,
+	0x3352be1a29ec7b97ULL, 0xa9b70f7cd5b862daULL, 0x76a86f2254c7fc3bULL,
+	0x19c36df6efae2c82ULL, 0x6f6b02d4bb69d0b9ULL, 0x62a7ecbfdd4b7a31ULL,
+	0x31dd76d1e0ab3d96ULL, 0x21d178c7e6a9379eULL, 0x1f4f28b6a967e681ULL,
+	0x503c364e1e0a2228ULL, 0x028fc8cbc9474601ULL, 0xc316e4c80bf21defULL,
+	0xc1992c03c2b55beeULL, 0x0dccee6b6622aa88ULL, 0x7b64814932e556b3ULL,
+	0x235eb00c2fee719fULL, 0x99a31d46dfbe7cc2ULL, 0x45fad1387d2b87acULL,
+	0x7c21a0e29e81bf3eULL, 0x906c7ea636125a48ULL, 0x6c2daef49883b536ULL,
+	0xd85a41f52d1b776cULL, 0x70242a62120e3638ULL, 0x05cae9606523af8cULL,
+	0xfb04f1f902f506f3ULL, 0x1283c6ddcf454c09ULL, 0x15c6e7766321a584ULL,
+	0x3e9e50714fced11fULL, 0x72abe2a9db497039ULL, 0x7de8c409742c9cb0ULL,
+	0x9b2cd58d16f93ac3ULL, 0x636e885437e659bfULL, 0xd993251ec7b654e2ULL,
+	0x5df0d825782888a0ULL, 0xb872658139174b5cULL, 0x642ba9ff9b82b032ULL,
+	0xd05c46fe2e1a7268ULL, 0x2c1d96ac808b9d16ULL, 0xa33ec0bc1ffe21dfULL,
+	0x241b91a7838a9812ULL, 0x48363f531b092d24ULL, 0x068c454046c9ca03ULL,
+	0x4c35b2d89487a126ULL, 0x4ab9f798d24e6b25ULL, 0x5b7c9d653ee142a3ULL,
+	0x6de4ca1f722e96b8ULL, 0x7362864231e453b7ULL, 0x537a9a6e3de047a7ULL,
+	0x0b40ab2b20eb608bULL, 0xf447d759ad90ea7aULL, 0x49ff5bb8f1a40eaaULL,
+	0xf0445ad2221e6678ULL, 0x5c39bcce9285ab2eULL, 0x275d3d87a060fd9dULL,
+	0x0000000000000000ULL, 0x35defb5a6f25b194ULL, 0xf302f6f201f403f7ULL,
+	0xdb1cedd50ef112e3ULL, 0xd45fcb75a194fe6aULL, 0x583a31451d0b272cULL,
+	0x6b688f5f34e75cbbULL, 0x8f2356109f75bcc9ULL, 0x2b58b7072cef749bULL,
+	0xbdb88ce15c34e4d0ULL, 0x95a697c65331f5c4ULL, 0xeec2168f61d4a377ULL,
+	0xceda0aa36dd0b767ULL, 0x4433b5d39786a422ULL, 0xd7196755827e9be5ULL,
+	0x01c964ebeaad238eULL, 0xbb34c9a11afd2ed3ULL, 0x55f6df2e7b298da4ULL,
+	0x9da090cd5030f0c0ULL, 0xc59aa1884d3bd7ecULL, 0x8c65fa30bc9fd946ULL,
+	0x932ad28615f83fc7ULL, 0x7eae682957c6f93fULL, 0x986a79ad35135f4cULL,
+	0x3014123a0a061e18ULL, 0x281e1b270f051114ULL, 0x66a4613452c5f633ULL,
+	0x886677bb33115544ULL, 0x9f2f58069977b6c1ULL, 0xc7156943847c91edULL,
+	0xf7017b798e7a8ff5ULL, 0xe70d756f887885fdULL, 0xadb482f75a36eed8ULL,
+	0xe04854c4241c6c70ULL, 0xd596af9e4b39dde4ULL, 0xf2cb9219eb592079ULL,
+	0xc05048e828187860ULL, 0x8ae9bf70fa561345ULL, 0xf18d3e39c8b345f6ULL,
+	0xe9873724cdb04afaULL, 0x3dd8fc516c24b490ULL, 0x1dc0e07d6020a080ULL,
+	0xf98b3932cbb240f2ULL, 0xe44bd94fab92e072ULL, 0x71ed4e89f8a315b6ULL,
+	0x4eba7a135dc0e727ULL, 0x1a85c1d6cc44490dULL, 0x37513391a662f795ULL,
+	0x806070b030105040ULL, 0xc99f2b08c1b45eeaULL, 0x543fbbc59184ae2aULL,
+	0x2297d4e7c5435211ULL, 0xec4dde44a893e576ULL, 0x5eb674055bc2ed2fULL,
+	0x6aa1ebb4de4a7f35ULL, 0x81a9145bdabd73ceULL, 0x0c058a808c8f8906ULL,
+	0x75eec302772d99b4ULL, 0x89af1350d9bc76caULL, 0x946ff32db99cd64aULL,
+	0x77610bc9be6adfb5ULL, 0x3a9dddfac0405d1dULL, 0x3698577a4ccfd41bULL,
+	0x79eb4982fba210b2ULL, 0x7427a7e99d80ba3aULL, 0x42bff093d14f6e21ULL,
+	0xf8425dd9211f637cULL, 0x1e864c5d43cac50fULL, 0x39db71dae3aa3892ULL,
+	0x2a91d3ecc6425715ULL
+};
+
+static const u64 T6[256] = {
+	0x6a01bbb9d268bad3ULL, 0x66b1e59a4d1954fcULL, 0x14cde265bc932f71ULL,
+	0x1b512587cdb9749cULL, 0x57a4f7a2510253f5ULL, 0xbe03d0d66bb8d368ULL,
+	0xb504d6de6fbdd26bULL, 0x85feb35229644dd7ULL, 0x4aadfdba5d0d50f0ULL,
+	0xe063cf098a26ace9ULL, 0x9684091c0e838d8aULL, 0x4d1aa591c679bfdcULL,
+	0x374d3da7ddad7090ULL, 0x5ca3f1aa550752f6ULL, 0x17e17ba452c89ab3ULL,
+	0x8ef9b55a2d614cd4ULL, 0x20ac46038f65ea23ULL, 0x8411c4e673a6d562ULL,
+	0x68c255cc66f197a4ULL, 0xa80ddcc663b2d16eULL, 0xd099aa85ccff3355ULL,
+	0x41aafbb2590851f3ULL, 0x0f9cc7e2712a5bedULL, 0xae55f359a204a6f7ULL,
+	0xc120febe5f81de7fULL, 0xa2e5ad7a3d7548d8ULL, 0xcc7fd7299a32a8e5ULL,
+	0x0ae871bc5ec799b6ULL, 0xe63be0964b90db70ULL, 0xdb9eac8dc8fa3256ULL,
+	0x152295d1e651b7c4ULL, 0xaace32b3d72bfc19ULL, 0x7393704bab48e338ULL,
+	0x3bfd638442dc9ebfULL, 0x52d041fc7eef91aeULL, 0x1ce67dac56cd9bb0ULL,
+	0x78947643af4de23bULL, 0x6106bdb1d66dbbd0ULL, 0xf1da9b32195841c3ULL,
+	0xe5177957a5cb6eb2ULL, 0xb35cf941ae0ba5f2ULL, 0x564b80160bc0cb40ULL,
+	0xc20c677fb1da6bbdULL, 0x7ecc59dc6efb95a2ULL, 0x9f40e161be1fa1feULL,
+	0xc3e310cbeb18f308ULL, 0x2f3081e1fe4fb1ceULL, 0x160e0c10080a0206ULL,
+	0x675e922e17dbcc49ULL, 0x3f66a26e37f3c451ULL, 0xcf534ee874691d27ULL,
+	0x9c6c78a05044143cULL, 0x0e73b0562be8c358ULL, 0x9a34573f91f263a5ULL,
+	0xed3ce69e4f95da73ULL, 0x358ed3d269345de7ULL, 0x2380dfc2613e5fe1ULL,
+	0xd72ef2ae578bdc79ULL, 0x486e13cfe9947d87ULL, 0x6c59942613decd4aULL,
+	0x5e601fdfe19e7f81ULL, 0x049bc1ea752f5aeeULL, 0xf3197547adc16cb4ULL,
+	0x3e89d5da6d315ce4ULL, 0xefff08ebfb0cf704ULL, 0x47f2d42d98be266aULL,
+	0xb7c738abdb24ff1cULL, 0x11b9543b937eed2aULL, 0x36a24a13876fe825ULL,
+	0x26f4699c4ed39dbaULL, 0xee107f5fa1ce6fb1ULL, 0x8b8d0304028c8e8fULL,
+	0xe34f56c8647d192bULL, 0x9447e769ba1aa0fdULL, 0xdeea1ad3e717f00dULL,
+	0xba98113c1e978986ULL, 0x692d22783c330f11ULL, 0x311512381c1b0709ULL,
+	0xfd6ac5118629afecULL, 0x9bdb208bcb30fb10ULL, 0x5838304020280818ULL,
+	0x976b7ea85441153fULL, 0x7f232e6834390d17ULL, 0x2c1c18201014040cULL,
+	0x0b07060804050103ULL, 0xab2145078de964acULL, 0xca27f8b65b84df7cULL,
+	0x0d5f2997c5b3769aULL, 0x64720beff980798bULL, 0xdc29f4a6538edd7aULL,
+	0xb2b38ef5f4c93d47ULL, 0x8a6274b0584e163aULL, 0xa4bd82e5fcc33f41ULL,
+	0xfc85b2a5dceb3759ULL, 0xf81e734fa9c46db7ULL, 0x95a890dde0d83848ULL,
+	0x7708b1a1de67b9d6ULL, 0x2a4437bfd1a27395ULL, 0x3da54c1b836ae926ULL,
+	0xea8bbeb5d4e1355fULL, 0x6db6e392491c55ffULL, 0x3c4a3bafd9a87193ULL,
+	0x727c07fff18a7b8dULL, 0x9d830f140a868c89ULL, 0x214331b7d5a77296ULL,
+	0xb19f17341a928885ULL, 0xe4f80ee3ff09f607ULL, 0x33d6fc4da8822a7eULL,
+	0xafba84edf8c63e42ULL, 0x2887d9ca653b5ee2ULL, 0x4cf5d2259cbb2769ULL,
+	0xc0cf890a054346caULL, 0x74242860303c0c14ULL, 0xa026430f89ec65afULL,
+	0xdf056d67bdd568b8ULL, 0x8c3a5b2f99f861a3ULL, 0x1d090a180c0f0305ULL,
+	0x187dbc4623e2c15eULL, 0x7bb8ef82411657f9ULL, 0x9918cefe7fa9d667ULL,
+	0xf035ec86439ad976ULL, 0x1295cdfa7d2558e8ULL, 0xfb32ea8e479fd875ULL,
+	0xbd2f491785e366aaULL, 0x921fc8f67bacd764ULL, 0x83a69ccde8d23a4eULL,
+	0x4b428a0e07cfc845ULL, 0xb9b488fdf0cc3c44ULL, 0x90dc2683cf35fa13ULL,
+	0x63c553c462f496a7ULL, 0xa552f551a601a7f4ULL, 0x01ef77b45ac298b5ULL,
+	0x1abe5233977bec29ULL, 0x7c0fb7a9da62b8d5ULL, 0x226fa8763bfcc754ULL,
+	0xf66dc319822caeefULL, 0xd4026b6fb9d069bbULL, 0xbfeca762317a4bddULL,
+	0xd176dd31963dabe0ULL, 0xc778d1219e37a9e6ULL, 0xb6284f1f81e667a9ULL,
+	0x4e363c5028220a1eULL, 0xcbc88f02014647c9ULL, 0xc8e416c3ef1df20bULL,
+	0x032c99c1ee5bb5c2ULL, 0x6beecc0d88aa2266ULL, 0x4981647bb356e532ULL,
+	0x0cb05e239f71ee2fULL, 0x461da399c27cbedfULL, 0x38d1fa45ac872b7dULL,
+	0xe2a0217c3ebf819eULL, 0xa67e6c90485a1236ULL, 0xf4ae2d6c36b58398ULL,
+	0xf5415ad86c771b2dULL, 0x622a247038360e12ULL, 0x60e9ca058caf2365ULL,
+	0xf9f104fbf306f502ULL, 0xddc68312094c45cfULL, 0x76e7c61584a52163ULL,
+	0x71509e3e1fd1ce4fULL, 0xa9e2ab72397049dbULL, 0x09c4e87db09c2c74ULL,
+	0x8dd52c9bc33af916ULL, 0x54886e63bf59e637ULL, 0x1e2593d9e254b6c7ULL,
+	0x25d8f05da0882878ULL, 0x816572b85c4b1739ULL, 0xffa92b6432b0829bULL,
+	0xfe465cd068721a2eULL, 0xac961d2c169d8b80ULL, 0xbcc03ea3df21fe1fULL,
+	0xa7911b2412988a83ULL, 0x533f3648242d091bULL, 0x40458c0603cac946ULL,
+	0xd8b2354c26a18794ULL, 0x98f7b94a256b4ed2ULL, 0x659d7c5ba342e13eULL,
+	0x1fcae46db8962e72ULL, 0x42866273b753e431ULL, 0x6e9a7a53a747e03dULL,
+	0x2bab400b8b60eb20ULL, 0x59d747f47aea90adULL, 0xb85bff49aa0ea4f1ULL,
+	0xd25a44f078661e22ULL, 0xcebc395c2eab8592ULL, 0x873d5d279dfd60a0ULL,
+	0x0000000000000000ULL, 0x5afbde3594b1256fULL, 0xf2f602f3f703f401ULL,
+	0xd5ed1cdbe312f10eULL, 0x75cb5fd46afe94a1ULL, 0x45313a582c270b1dULL,
+	0x5f8f686bbb5ce734ULL, 0x1056238fc9bc759fULL, 0x07b7582b9b74ef2cULL,
+	0xe18cb8bdd0e4345cULL, 0xc697a695c4f53153ULL, 0x8f16c2ee77a3d461ULL,
+	0xa30adace67b7d06dULL, 0xd3b5334422a48697ULL, 0x556719d7e59b7e82ULL,
+	0xeb64c9018e23adeaULL, 0xa1c934bbd32efd1aULL, 0x2edff655a48d297bULL,
+	0xcd90a09dc0f03050ULL, 0x88a19ac5ecd73b4dULL, 0x30fa658c46d99fbcULL,
+	0x86d22a93c73ff815ULL, 0x2968ae7e3ff9c657ULL, 0xad796a984c5f1335ULL,
+	0x3a121430181e060aULL, 0x271b1e281411050fULL, 0x3461a46633f6c552ULL,
+	0xbb77668844551133ULL, 0x06582f9fc1b67799ULL, 0x436915c7ed917c84ULL,
+	0x797b01f7f58f7a8eULL, 0x6f750de7fd857888ULL, 0xf782b4add8ee365aULL,
+	0xc45448e0706c1c24ULL, 0x9eaf96d5e4dd394bULL, 0x1992cbf2792059ebULL,
+	0xe84850c060781828ULL, 0x70bfe98a451356faULL, 0x393e8df1f645b3c8ULL,
+	0x243787e9fa4ab0cdULL, 0x51fcd83d90b4246cULL, 0x7de0c01d80a02060ULL,
+	0x32398bf9f240b2cbULL, 0x4fd94be472e092abULL, 0x894eed71b615a3f8ULL,
+	0x137aba4e27e7c05dULL, 0xd6c1851a0d4944ccULL, 0x9133513795f762a6ULL,
+	0xb070608040501030ULL, 0x082b9fc9ea5eb4c1ULL, 0xc5bb3f542aae8491ULL,
+	0xe7d49722115243c5ULL, 0x44de4dec76e593a8ULL, 0x0574b65e2fedc25bULL,
+	0xb4eba16a357f4adeULL, 0x5b14a981ce73bddaULL, 0x808a050c06898f8cULL,
+	0x02c3ee75b4992d77ULL, 0x5013af89ca76bcd9ULL, 0x2df36f944ad69cb9ULL,
+	0xc90b6177b5df6abeULL, 0xfadd9d3a1d5d40c0ULL, 0x7a5798361bd4cf4cULL,
+	0x8249eb79b210a2fbULL, 0xe9a727743aba809dULL, 0x93f0bf42216e4fd1ULL,
+	0xd95d42f87c631f21ULL, 0x5d4c861e0fc5ca43ULL, 0xda71db399238aae3ULL,
+	0xecd3912a155742c6ULL
+};
+
+static const u64 T7[256] = {
+	0x016ab9bb68d2d3baULL, 0xb1669ae5194dfc54ULL, 0xcd1465e293bc712fULL,
+	0x511b8725b9cd9c74ULL, 0xa457a2f70251f553ULL, 0x03bed6d0b86b68d3ULL,
+	0x04b5ded6bd6f6bd2ULL, 0xfe8552b36429d74dULL, 0xad4abafd0d5df050ULL,
+	0x63e009cf268ae9acULL, 0x84961c09830e8a8dULL, 0x1a4d91a579c6dcbfULL,
+	0x4d37a73daddd9070ULL, 0xa35caaf10755f652ULL, 0xe117a47bc852b39aULL,
+	0xf98e5ab5612dd44cULL, 0xac200346658f23eaULL, 0x1184e6c4a67362d5ULL,
+	0xc268cc55f166a497ULL, 0x0da8c6dcb2636ed1ULL, 0x99d085aaffcc5533ULL,
+	0xaa41b2fb0859f351ULL, 0x9c0fe2c72a71ed5bULL, 0x55ae59f304a2f7a6ULL,
+	0x20c1befe815f7fdeULL, 0xe5a27aad753dd848ULL, 0x7fcc29d7329ae5a8ULL,
+	0xe80abc71c75eb699ULL, 0x3be696e0904b70dbULL, 0x9edb8dacfac85632ULL,
+	0x2215d19551e6c4b7ULL, 0xceaab3322bd719fcULL, 0x93734b7048ab38e3ULL,
+	0xfd3b8463dc42bf9eULL, 0xd052fc41ef7eae91ULL, 0xe61cac7dcd56b09bULL,
+	0x947843764daf3be2ULL, 0x0661b1bd6dd6d0bbULL, 0xdaf1329b5819c341ULL,
+	0x17e55779cba5b26eULL, 0x5cb341f90baef2a5ULL, 0x4b561680c00b40cbULL,
+	0x0cc27f67dab1bd6bULL, 0xcc7edc59fb6ea295ULL, 0x409f61e11fbefea1ULL,
+	0xe3c3cb1018eb08f3ULL, 0x302fe1814ffeceb1ULL, 0x0e16100c0a080602ULL,
+	0x5e672e92db1749ccULL, 0x663f6ea2f33751c4ULL, 0x53cfe84e6974271dULL,
+	0x6c9ca07844503c14ULL, 0x730e56b0e82b58c3ULL, 0x349a3f57f291a563ULL,
+	0x3ced9ee6954f73daULL, 0x8e35d2d33469e75dULL, 0x8023c2df3e61e15fULL,
+	0x2ed7aef28b5779dcULL, 0x6e48cf1394e9877dULL, 0x596c2694de134acdULL,
+	0x605edf1f9ee1817fULL, 0x9b04eac12f75ee5aULL, 0x19f34775c1adb46cULL,
+	0x893edad5316de45cULL, 0xffefeb080cfb04f7ULL, 0xf2472dd4be986a26ULL,
+	0xc7b7ab3824db1cffULL, 0xb9113b547e932aedULL, 0xa236134a6f8725e8ULL,
+	0xf4269c69d34eba9dULL, 0x10ee5f7fcea1b16fULL, 0x8d8b04038c028f8eULL,
+	0x4fe3c8567d642b19ULL, 0x479469e71abafda0ULL, 0xeaded31a17e70df0ULL,
+	0x98ba3c11971e8689ULL, 0x2d697822333c110fULL, 0x153138121b1c0907ULL,
+	0x6afd11c52986ecafULL, 0xdb9b8b2030cb10fbULL, 0x3858403028201808ULL,
+	0x6b97a87e41543f15ULL, 0x237f682e3934170dULL, 0x1c2c201814100c04ULL,
+	0x070b080605040301ULL, 0x21ab0745e98dac64ULL, 0x27cab6f8845b7cdfULL,
+	0x5f0d9729b3c59a76ULL, 0x7264ef0b80f98b79ULL, 0x29dca6f48e537addULL,
+	0xb3b2f58ec9f4473dULL, 0x628ab0744e583a16ULL, 0xbda4e582c3fc413fULL,
+	0x85fca5b2ebdc5937ULL, 0x1ef84f73c4a9b76dULL, 0xa895dd90d8e04838ULL,
+	0x0877a1b167ded6b9ULL, 0x442abf37a2d19573ULL, 0xa53d1b4c6a8326e9ULL,
+	0x8beab5bee1d45f35ULL, 0xb66d92e31c49ff55ULL, 0x4a3caf3ba8d99371ULL,
+	0x7c72ff078af18d7bULL, 0x839d140f860a898cULL, 0x4321b731a7d59672ULL,
+	0x9fb13417921a8588ULL, 0xf8e4e30e09ff07f6ULL, 0xd6334dfc82a87e2aULL,
+	0xbaafed84c6f8423eULL, 0x8728cad93b65e25eULL, 0xf54c25d2bb9c6927ULL,
+	0xcfc00a894305ca46ULL, 0x247460283c30140cULL, 0x26a00f43ec89af65ULL,
+	0x05df676dd5bdb868ULL, 0x3a8c2f5bf899a361ULL, 0x091d180a0f0c0503ULL,
+	0x7d1846bce2235ec1ULL, 0xb87b82ef1641f957ULL, 0x1899fecea97f67d6ULL,
+	0x35f086ec9a4376d9ULL, 0x9512facd257de858ULL, 0x32fb8eea9f4775d8ULL,
+	0x2fbd1749e385aa66ULL, 0x1f92f6c8ac7b64d7ULL, 0xa683cd9cd2e84e3aULL,
+	0x424b0e8acf0745c8ULL, 0xb4b9fd88ccf0443cULL, 0xdc90832635cf13faULL,
+	0xc563c453f462a796ULL, 0x52a551f501a6f4a7ULL, 0xef01b477c25ab598ULL,
+	0xbe1a33527b9729ecULL, 0x0f7ca9b762dad5b8ULL, 0x6f2276a8fc3b54c7ULL,
+	0x6df619c32c82efaeULL, 0x02d46f6bd0b9bb69ULL, 0xecbf62a77a31dd4bULL,
+	0x76d131dd3d96e0abULL, 0x78c721d1379ee6a9ULL, 0x28b61f4fe681a967ULL,
+	0x364e503c22281e0aULL, 0xc8cb028f4601c947ULL, 0xe4c8c3161def0bf2ULL,
+	0x2c03c1995beec2b5ULL, 0xee6b0dccaa886622ULL, 0x81497b6456b332e5ULL,
+	0xb00c235e719f2feeULL, 0x1d4699a37cc2dfbeULL, 0xd13845fa87ac7d2bULL,
+	0xa0e27c21bf3e9e81ULL, 0x7ea6906c5a483612ULL, 0xaef46c2db5369883ULL,
+	0x41f5d85a776c2d1bULL, 0x2a6270243638120eULL, 0xe96005caaf8c6523ULL,
+	0xf1f9fb0406f302f5ULL, 0xc6dd12834c09cf45ULL, 0xe77615c6a5846321ULL,
+	0x50713e9ed11f4fceULL, 0xe2a972ab7039db49ULL, 0xc4097de89cb0742cULL,
+	0xd58d9b2c3ac316f9ULL, 0x8854636e59bf37e6ULL, 0x251ed99354e2c7b6ULL,
+	0xd8255df088a07828ULL, 0x6581b8724b5c3917ULL, 0xa9ff642bb0329b82ULL,
+	0x46fed05c72682e1aULL, 0x96ac2c1d9d16808bULL, 0xc0bca33e21df1ffeULL,
+	0x91a7241b9812838aULL, 0x3f5348362d241b09ULL, 0x4540068cca0346c9ULL,
+	0xb2d84c35a1269487ULL, 0xf7984ab96b25d24eULL, 0x9d655b7c42a33ee1ULL,
+	0xca1f6de496b8722eULL, 0x8642736253b731e4ULL, 0x9a6e537a47a73de0ULL,
+	0xab2b0b40608b20ebULL, 0xd759f447ea7aad90ULL, 0x5bb849ff0eaaf1a4ULL,
+	0x5ad2f0446678221eULL, 0xbcce5c39ab2e9285ULL, 0x3d87275dfd9da060ULL,
+	0x0000000000000000ULL, 0xfb5a35deb1946f25ULL, 0xf6f2f30203f701f4ULL,
+	0xedd5db1c12e30ef1ULL, 0xcb75d45ffe6aa194ULL, 0x3145583a272c1d0bULL,
+	0x8f5f6b685cbb34e7ULL, 0x56108f23bcc99f75ULL, 0xb7072b58749b2cefULL,
+	0x8ce1bdb8e4d05c34ULL, 0x97c695a6f5c45331ULL, 0x168feec2a37761d4ULL,
+	0x0aa3cedab7676dd0ULL, 0xb5d34433a4229786ULL, 0x6755d7199be5827eULL,
+	0x64eb01c9238eeaadULL, 0xc9a1bb342ed31afdULL, 0xdf2e55f68da47b29ULL,
+	0x90cd9da0f0c05030ULL, 0xa188c59ad7ec4d3bULL, 0xfa308c65d946bc9fULL,
+	0xd286932a3fc715f8ULL, 0x68297eaef93f57c6ULL, 0x79ad986a5f4c3513ULL,
+	0x123a30141e180a06ULL, 0x1b27281e11140f05ULL, 0x613466a4f63352c5ULL,
+	0x77bb886655443311ULL, 0x58069f2fb6c19977ULL, 0x6943c71591ed847cULL,
+	0x7b79f7018ff58e7aULL, 0x756fe70d85fd8878ULL, 0x82f7adb4eed85a36ULL,
+	0x54c4e0486c70241cULL, 0xaf9ed596dde44b39ULL, 0x9219f2cb2079eb59ULL,
+	0x48e8c05078602818ULL, 0xbf708ae91345fa56ULL, 0x3e39f18d45f6c8b3ULL,
+	0x3724e9874afacdb0ULL, 0xfc513dd8b4906c24ULL, 0xe07d1dc0a0806020ULL,
+	0x3932f98b40f2cbb2ULL, 0xd94fe44be072ab92ULL, 0x4e8971ed15b6f8a3ULL,
+	0x7a134ebae7275dc0ULL, 0xc1d61a85490dcc44ULL, 0x33913751f795a662ULL,
+	0x70b0806050403010ULL, 0x2b08c99f5eeac1b4ULL, 0xbbc5543fae2a9184ULL,
+	0xd4e722975211c543ULL, 0xde44ec4de576a893ULL, 0x74055eb6ed2f5bc2ULL,
+	0xebb46aa17f35de4aULL, 0x145b81a973cedabdULL, 0x8a800c0589068c8fULL,
+	0xc30275ee99b4772dULL, 0x135089af76cad9bcULL, 0xf32d946fd64ab99cULL,
+	0x0bc97761dfb5be6aULL, 0xddfa3a9d5d1dc040ULL, 0x577a3698d41b4ccfULL,
+	0x498279eb10b2fba2ULL, 0xa7e97427ba3a9d80ULL, 0xf09342bf6e21d14fULL,
+	0x5dd9f842637c211fULL, 0x4c5d1e86c50f43caULL, 0x71da39db3892e3aaULL,
+	0xd3ec2a915715c642ULL
+};
+
+static const u64 c[KHAZAD_ROUNDS + 1] = {
+	0xba542f7453d3d24dULL, 0x50ac8dbf70529a4cULL, 0xead597d133515ba6ULL,
+	0xde48a899db32b7fcULL, 0xe39e919be2bb416eULL, 0xa5cb6b95a1f3b102ULL,
+	0xccc41d14c363da5dULL, 0x5fdc7dcd7f5a6c5cULL, 0xf726ffede89d6f8eULL
+};
+
+static int khazad_setkey(void *ctx_arg, const u8 *in_key,
+                       unsigned int key_len, u32 *flags)
+{
+
+	struct khazad_ctx *ctx = ctx_arg;
+	int r;
+	const u64 *S = T7;
+	u64 K2, K1;
+	
+	if (key_len != 16)
+	{
+		*flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
+		return -EINVAL;
+	}
+
+	K2 = ((u64)in_key[ 0] << 56) ^
+	     ((u64)in_key[ 1] << 48) ^
+	     ((u64)in_key[ 2] << 40) ^
+	     ((u64)in_key[ 3] << 32) ^
+	     ((u64)in_key[ 4] << 24) ^
+	     ((u64)in_key[ 5] << 16) ^
+	     ((u64)in_key[ 6] <<  8) ^
+	     ((u64)in_key[ 7]      );
+	K1 = ((u64)in_key[ 8] << 56) ^
+	     ((u64)in_key[ 9] << 48) ^
+	     ((u64)in_key[10] << 40) ^
+	     ((u64)in_key[11] << 32) ^
+	     ((u64)in_key[12] << 24) ^
+	     ((u64)in_key[13] << 16) ^
+	     ((u64)in_key[14] <<  8) ^
+	     ((u64)in_key[15]      );
+
+	/* setup the encrypt key */
+	for (r = 0; r <= KHAZAD_ROUNDS; r++) {
+		ctx->E[r] = T0[(int)(K1 >> 56)       ] ^
+			    T1[(int)(K1 >> 48) & 0xff] ^
+			    T2[(int)(K1 >> 40) & 0xff] ^
+			    T3[(int)(K1 >> 32) & 0xff] ^
+			    T4[(int)(K1 >> 24) & 0xff] ^
+			    T5[(int)(K1 >> 16) & 0xff] ^
+			    T6[(int)(K1 >>  8) & 0xff] ^
+			    T7[(int)(K1      ) & 0xff] ^
+			    c[r] ^ K2;
+		K2 = K1; 
+		K1 = ctx->E[r];
+	}
+	/* Setup the decrypt key */
+	ctx->D[0] = ctx->E[KHAZAD_ROUNDS];
+	for (r = 1; r < KHAZAD_ROUNDS; r++) {
+		K1 = ctx->E[KHAZAD_ROUNDS - r];
+		ctx->D[r] = T0[(int)S[(int)(K1 >> 56)       ] & 0xff] ^
+			    T1[(int)S[(int)(K1 >> 48) & 0xff] & 0xff] ^
+			    T2[(int)S[(int)(K1 >> 40) & 0xff] & 0xff] ^
+			    T3[(int)S[(int)(K1 >> 32) & 0xff] & 0xff] ^
+			    T4[(int)S[(int)(K1 >> 24) & 0xff] & 0xff] ^
+			    T5[(int)S[(int)(K1 >> 16) & 0xff] & 0xff] ^
+			    T6[(int)S[(int)(K1 >>  8) & 0xff] & 0xff] ^
+			    T7[(int)S[(int)(K1      ) & 0xff] & 0xff];
+	}
+	ctx->D[KHAZAD_ROUNDS] = ctx->E[0];
+
+	return 0;
+
+}
+
+static void khazad_crypt(const u64 roundKey[KHAZAD_ROUNDS + 1],
+		u8 *ciphertext, const u8 *plaintext)
+{
+
+	int r;
+	u64 state;
+
+	state = ((u64)plaintext[0] << 56) ^
+		((u64)plaintext[1] << 48) ^
+		((u64)plaintext[2] << 40) ^
+		((u64)plaintext[3] << 32) ^
+		((u64)plaintext[4] << 24) ^
+		((u64)plaintext[5] << 16) ^
+		((u64)plaintext[6] <<  8) ^
+		((u64)plaintext[7]      ) ^
+		roundKey[0];
+
+	for (r = 1; r < KHAZAD_ROUNDS; r++) {
+		state = T0[(int)(state >> 56)       ] ^
+			T1[(int)(state >> 48) & 0xff] ^
+			T2[(int)(state >> 40) & 0xff] ^
+			T3[(int)(state >> 32) & 0xff] ^
+			T4[(int)(state >> 24) & 0xff] ^
+			T5[(int)(state >> 16) & 0xff] ^
+			T6[(int)(state >>  8) & 0xff] ^
+			T7[(int)(state      ) & 0xff] ^
+			roundKey[r];
+    	}
+
+	state = (T0[(int)(state >> 56)       ] & 0xff00000000000000ULL) ^
+		(T1[(int)(state >> 48) & 0xff] & 0x00ff000000000000ULL) ^
+		(T2[(int)(state >> 40) & 0xff] & 0x0000ff0000000000ULL) ^
+		(T3[(int)(state >> 32) & 0xff] & 0x000000ff00000000ULL) ^
+		(T4[(int)(state >> 24) & 0xff] & 0x00000000ff000000ULL) ^
+		(T5[(int)(state >> 16) & 0xff] & 0x0000000000ff0000ULL) ^
+		(T6[(int)(state >>  8) & 0xff] & 0x000000000000ff00ULL) ^
+		(T7[(int)(state      ) & 0xff] & 0x00000000000000ffULL) ^
+		roundKey[KHAZAD_ROUNDS];
+
+	ciphertext[0] = (u8)(state >> 56);
+	ciphertext[1] = (u8)(state >> 48);
+	ciphertext[2] = (u8)(state >> 40);
+	ciphertext[3] = (u8)(state >> 32);
+	ciphertext[4] = (u8)(state >> 24);
+	ciphertext[5] = (u8)(state >> 16);
+	ciphertext[6] = (u8)(state >>  8);
+	ciphertext[7] = (u8)(state      );
+
+}
+
+static void khazad_encrypt(void *ctx_arg, u8 *dst, const u8 *src)
+{
+	struct khazad_ctx *ctx = ctx_arg;
+	khazad_crypt(ctx->E, dst, src);
+}
+
+static void khazad_decrypt(void *ctx_arg, u8 *dst, const u8 *src)
+{
+	struct khazad_ctx *ctx = ctx_arg;
+	khazad_crypt(ctx->D, dst, src);
+}
+
+static struct crypto_alg khazad_alg = {
+	.cra_name		=	"khazad",
+	.cra_flags		=	CRYPTO_ALG_TYPE_CIPHER,
+	.cra_blocksize		=	KHAZAD_BLOCK_SIZE,
+	.cra_ctxsize		=	sizeof (struct khazad_ctx),
+	.cra_module		=	THIS_MODULE,
+	.cra_list		=	LIST_HEAD_INIT(khazad_alg.cra_list),
+	.cra_u			=	{ .cipher = {
+	.cia_min_keysize	=	KHAZAD_KEY_SIZE,
+	.cia_max_keysize	=	KHAZAD_KEY_SIZE,
+	.cia_setkey		= 	khazad_setkey,
+	.cia_encrypt		=	khazad_encrypt,
+	.cia_decrypt		=	khazad_decrypt } }
+};
+
+static int __init init(void)
+{
+	int ret = 0;
+	
+	ret = crypto_register_alg(&khazad_alg);
+	return ret;
+}
+
+static void __exit fini(void)
+{
+	crypto_unregister_alg(&khazad_alg);
+}
+
+
+module_init(init);
+module_exit(fini);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Khazad Cryptographic Algorithm");
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/crypto/scatterwalk.c linux-2.4.20-wolk4.16-fullkernel/crypto/scatterwalk.c
--- linux-2.4.20-wolk4.15-fullkernel/crypto/scatterwalk.c	2004-06-29 11:24:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/crypto/scatterwalk.c	2004-09-05 15:47:28.000000000 +0200
@@ -70,7 +70,7 @@ static void scatterwalk_pagedone(struct 
 {
 	/* walk->data may be pointing the first byte of the next page;
 	   however, we know we transfered at least one byte.  So,
-	   walk->data - 1 will be a virutual address in the mapped page. */
+	   walk->data - 1 will be a virtual address in the mapped page. */
 
 	if (out)
 		flush_dcache_page(walk->page);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/crypto/tcrypt.c linux-2.4.20-wolk4.16-fullkernel/crypto/tcrypt.c
--- linux-2.4.20-wolk4.15-fullkernel/crypto/tcrypt.c	2004-06-29 11:24:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/crypto/tcrypt.c	2004-09-05 15:47:28.000000000 +0200
@@ -63,7 +63,7 @@ static char *tvmem;
 static char *check[] = {
 	"des", "md5", "des3_ede", "rot13", "sha1", "sha256", "blowfish",
 	"twofish", "serpent", "sha384", "sha512", "md4", "aes", "cast6", 
-	"arc4", "michael_mic", "deflate", NULL
+	"arc4", "michael_mic", "deflate", "tea", "xtea", "whirlpool", NULL
 };
 
 static void
@@ -566,8 +566,22 @@ do_test(void)
 		test_cipher ("arc4", MODE_ECB, ENCRYPT, arc4_enc_tv_template, ARC4_ENC_TEST_VECTORS);
 		test_cipher ("arc4", MODE_ECB, DECRYPT, arc4_dec_tv_template, ARC4_DEC_TEST_VECTORS);
 
+		//TEA
+		test_cipher ("tea", MODE_ECB, ENCRYPT, tea_enc_tv_template, TEA_ENC_TEST_VECTORS);
+		test_cipher ("tea", MODE_ECB, DECRYPT, tea_dec_tv_template, TEA_DEC_TEST_VECTORS);
+
+
+		//XTEA
+		test_cipher ("xtea", MODE_ECB, ENCRYPT, xtea_enc_tv_template, XTEA_ENC_TEST_VECTORS);
+		test_cipher ("xtea", MODE_ECB, DECRYPT, xtea_dec_tv_template, XTEA_DEC_TEST_VECTORS);
+
+		//KHAZAD
+		test_cipher ("khazad", MODE_ECB, ENCRYPT, khazad_enc_tv_template, KHAZAD_ENC_TEST_VECTORS);
+		test_cipher ("khazad", MODE_ECB, DECRYPT, khazad_dec_tv_template, KHAZAD_DEC_TEST_VECTORS);
+
 		test_hash("sha384", sha384_tv_template, SHA384_TEST_VECTORS);
 		test_hash("sha512", sha512_tv_template, SHA512_TEST_VECTORS);
+		test_hash("whirlpool", whirlpool_tv_template, WHIRLPOOL_TEST_VECTORS);
 		test_deflate();		
 #ifdef CONFIG_CRYPTO_HMAC
 		test_hmac("md5", hmac_md5_tv_template, HMAC_MD5_TEST_VECTORS);
@@ -659,6 +673,24 @@ do_test(void)
 		test_hash("michael_mic", michael_mic_tv_template, MICHAEL_MIC_TEST_VECTORS);
 		break;
 
+	case 19:
+		test_cipher ("tea", MODE_ECB, ENCRYPT, tea_enc_tv_template, TEA_ENC_TEST_VECTORS);
+		test_cipher ("tea", MODE_ECB, DECRYPT, tea_dec_tv_template, TEA_DEC_TEST_VECTORS);
+		break;
+
+	case 20:
+		test_cipher ("xtea", MODE_ECB, ENCRYPT, xtea_enc_tv_template, XTEA_ENC_TEST_VECTORS);
+		test_cipher ("xtea", MODE_ECB, DECRYPT, xtea_dec_tv_template, XTEA_DEC_TEST_VECTORS);
+		break;
+
+	case 21:
+		test_cipher ("khazad", MODE_ECB, ENCRYPT, khazad_enc_tv_template, KHAZAD_ENC_TEST_VECTORS);
+		test_cipher ("khazad", MODE_ECB, DECRYPT, khazad_dec_tv_template, KHAZAD_DEC_TEST_VECTORS);
+		break;
+	case 22:
+		test_hash("whirlpool", whirlpool_tv_template, WHIRLPOOL_TEST_VECTORS);
+		break;
+
 #ifdef CONFIG_CRYPTO_HMAC
 	case 100:
 		test_hmac("md5", hmac_md5_tv_template, HMAC_MD5_TEST_VECTORS);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/crypto/tcrypt.h linux-2.4.20-wolk4.16-fullkernel/crypto/tcrypt.h
--- linux-2.4.20-wolk4.15-fullkernel/crypto/tcrypt.h	2004-06-29 11:24:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/crypto/tcrypt.h	2004-09-05 15:47:28.000000000 +0200
@@ -551,6 +551,109 @@ struct hmac_testvec hmac_sha256_tv_templ
 #endif	/* CONFIG_CRYPTO_HMAC */
 
 /*
+ * WHIRLPOOL test vectors from Whirlpool package 
+ * by Vincent Rijmen and Paulo S. L. M. Barreto as part of the NESSIE
+ * submission
+ */
+#define WHIRLPOOL_TEST_VECTORS	8
+
+struct hash_testvec whirlpool_tv_template[] = {
+	{ 
+		.plaintext = "",
+		.psize	= 0,
+		.digest	= { 0x19, 0xFA, 0x61, 0xD7, 0x55, 0x22, 0xA4, 0x66,
+			    0x9B, 0x44, 0xE3, 0x9C, 0x1D, 0x2E, 0x17, 0x26,
+			    0xC5, 0x30, 0x23, 0x21, 0x30, 0xD4, 0x07, 0xF8,
+			    0x9A, 0xFE, 0xE0, 0x96, 0x49, 0x97, 0xF7, 0xA7,
+			    0x3E, 0x83, 0xBE, 0x69, 0x8B, 0x28, 0x8F, 0xEB,
+			    0xCF, 0x88, 0xE3, 0xE0, 0x3C, 0x4F, 0x07, 0x57,
+			    0xEA, 0x89, 0x64, 0xE5, 0x9B, 0x63, 0xD9, 0x37,
+			    0x08, 0xB1, 0x38, 0xCC, 0x42, 0xA6, 0x6E, 0xB3 },
+
+
+	}, {
+		.plaintext = "a",
+		.psize	= 1,
+		.digest	= { 0x8A, 0xCA, 0x26, 0x02, 0x79, 0x2A, 0xEC, 0x6F,
+			    0x11, 0xA6, 0x72, 0x06, 0x53, 0x1F, 0xB7, 0xD7,
+			    0xF0, 0xDF, 0xF5, 0x94, 0x13, 0x14, 0x5E, 0x69,
+			    0x73, 0xC4, 0x50, 0x01, 0xD0, 0x08, 0x7B, 0x42,
+			    0xD1, 0x1B, 0xC6, 0x45, 0x41, 0x3A, 0xEF, 0xF6,
+			    0x3A, 0x42, 0x39, 0x1A, 0x39, 0x14, 0x5A, 0x59,
+			    0x1A, 0x92, 0x20, 0x0D, 0x56, 0x01, 0x95, 0xE5,
+			    0x3B, 0x47, 0x85, 0x84, 0xFD, 0xAE, 0x23, 0x1A },
+	}, {
+		.plaintext = "abc",
+		.psize	= 3,
+		.digest	= { 0x4E, 0x24, 0x48, 0xA4, 0xC6, 0xF4, 0x86, 0xBB,
+			    0x16, 0xB6, 0x56, 0x2C, 0x73, 0xB4, 0x02, 0x0B,
+			    0xF3, 0x04, 0x3E, 0x3A, 0x73, 0x1B, 0xCE, 0x72,
+			    0x1A, 0xE1, 0xB3, 0x03, 0xD9, 0x7E, 0x6D, 0x4C,
+			    0x71, 0x81, 0xEE, 0xBD, 0xB6, 0xC5, 0x7E, 0x27,
+			    0x7D, 0x0E, 0x34, 0x95, 0x71, 0x14, 0xCB, 0xD6,
+			    0xC7, 0x97, 0xFC, 0x9D, 0x95, 0xD8, 0xB5, 0x82,
+			    0xD2, 0x25, 0x29, 0x20, 0x76, 0xD4, 0xEE, 0xF5 },
+	}, {
+		.plaintext = "message digest",
+		.psize	= 14,
+		.digest	= { 0x37, 0x8C, 0x84, 0xA4, 0x12, 0x6E, 0x2D, 0xC6, 
+			    0xE5, 0x6D, 0xCC, 0x74, 0x58, 0x37, 0x7A, 0xAC, 
+			    0x83, 0x8D, 0x00, 0x03, 0x22, 0x30, 0xF5, 0x3C, 
+			    0xE1, 0xF5, 0x70, 0x0C, 0x0F, 0xFB, 0x4D, 0x3B, 
+			    0x84, 0x21, 0x55, 0x76, 0x59, 0xEF, 0x55, 0xC1, 
+			    0x06, 0xB4, 0xB5, 0x2A, 0xC5, 0xA4, 0xAA, 0xA6, 
+			    0x92, 0xED, 0x92, 0x00, 0x52, 0x83, 0x8F, 0x33, 
+			    0x62, 0xE8, 0x6D, 0xBD, 0x37, 0xA8, 0x90, 0x3E },
+	}, {
+		.plaintext = "abcdefghijklmnopqrstuvwxyz",
+		.psize	= 26,
+		.digest	= { 0xF1, 0xD7, 0x54, 0x66, 0x26, 0x36, 0xFF, 0xE9,
+			    0x2C, 0x82, 0xEB, 0xB9, 0x21, 0x2A, 0x48, 0x4A,
+			    0x8D, 0x38, 0x63, 0x1E, 0xAD, 0x42, 0x38, 0xF5,
+			    0x44, 0x2E, 0xE1, 0x3B, 0x80, 0x54, 0xE4, 0x1B,
+			    0x08, 0xBF, 0x2A, 0x92, 0x51, 0xC3, 0x0B, 0x6A,
+			    0x0B, 0x8A, 0xAE, 0x86, 0x17, 0x7A, 0xB4, 0xA6,
+			    0xF6, 0x8F, 0x67, 0x3E, 0x72, 0x07, 0x86, 0x5D,
+			    0x5D, 0x98, 0x19, 0xA3, 0xDB, 0xA4, 0xEB, 0x3B },
+	}, {
+		.plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+			     "abcdefghijklmnopqrstuvwxyz0123456789",
+		.psize	= 62,
+		.digest	= { 0xDC, 0x37, 0xE0, 0x08, 0xCF, 0x9E, 0xE6, 0x9B,
+			    0xF1, 0x1F, 0x00, 0xED, 0x9A, 0xBA, 0x26, 0x90,
+			    0x1D, 0xD7, 0xC2, 0x8C, 0xDE, 0xC0, 0x66, 0xCC,
+			    0x6A, 0xF4, 0x2E, 0x40, 0xF8, 0x2F, 0x3A, 0x1E,
+			    0x08, 0xEB, 0xA2, 0x66, 0x29, 0x12, 0x9D, 0x8F,
+			    0xB7, 0xCB, 0x57, 0x21, 0x1B, 0x92, 0x81, 0xA6,
+			    0x55, 0x17, 0xCC, 0x87, 0x9D, 0x7B, 0x96, 0x21,
+			    0x42, 0xC6, 0x5F, 0x5A, 0x7A, 0xF0, 0x14, 0x67 },
+	}, {
+		.plaintext = "1234567890123456789012345678901234567890"
+			     "1234567890123456789012345678901234567890",
+		.psize	= 80,
+		.digest	= { 0x46, 0x6E, 0xF1, 0x8B, 0xAB, 0xB0, 0x15, 0x4D,
+			    0x25, 0xB9, 0xD3, 0x8A, 0x64, 0x14, 0xF5, 0xC0,
+			    0x87, 0x84, 0x37, 0x2B, 0xCC, 0xB2, 0x04, 0xD6,
+			    0x54, 0x9C, 0x4A, 0xFA, 0xDB, 0x60, 0x14, 0x29,
+			    0x4D, 0x5B, 0xD8, 0xDF, 0x2A, 0x6C, 0x44, 0xE5,
+			    0x38, 0xCD, 0x04, 0x7B, 0x26, 0x81, 0xA5, 0x1A,
+			    0x2C, 0x60, 0x48, 0x1E, 0x88, 0xC5, 0xA2, 0x0B,
+			    0x2C, 0x2A, 0x80, 0xCF, 0x3A, 0x9A, 0x08, 0x3B },
+	}, {
+		.plaintext = "abcdbcdecdefdefgefghfghighijhijk",
+		.psize	= 32,
+		.digest	= { 0x2A, 0x98, 0x7E, 0xA4, 0x0F, 0x91, 0x70, 0x61, 
+			    0xF5, 0xD6, 0xF0, 0xA0, 0xE4, 0x64, 0x4F, 0x48,
+			    0x8A, 0x7A, 0x5A, 0x52, 0xDE, 0xEE, 0x65, 0x62,
+			    0x07, 0xC5, 0x62, 0xF9, 0x88, 0xE9, 0x5C, 0x69,
+			    0x16, 0xBD, 0xC8, 0x03, 0x1B, 0xC5, 0xBE, 0x1B,
+			    0x7B, 0x94, 0x76, 0x39, 0xFE, 0x05, 0x0B, 0x56,
+			    0x93, 0x9B, 0xAA, 0xA0, 0xAD, 0xFF, 0x9A, 0xE6,
+			    0x74, 0x5B, 0x7B, 0x18, 0x1C, 0x3B, 0xE3, 0xFD },
+	},
+};
+
+/*
  * DES test vectors.
  */
 #define DES_ENC_TEST_VECTORS		10
@@ -1186,7 +1289,7 @@ struct cipher_testvec tf_cbc_dec_tv_temp
 
 /*
  * Serpent test vectors.  These are backwards because Serpent writes
- * octect sequences in right-to-left mode.
+ * octet sequences in right-to-left mode.
  */
 #define SERPENT_ENC_TEST_VECTORS	4
 #define SERPENT_DEC_TEST_VECTORS	4
@@ -1630,6 +1733,291 @@ struct cipher_testvec arc4_dec_tv_templa
 	},
 };
 
+/* 
+ * TEA test vectors
+ */
+#define TEA_ENC_TEST_VECTORS	4
+#define TEA_DEC_TEST_VECTORS	4
+
+struct cipher_testvec tea_enc_tv_template[] =
+{
+	{
+		.key    = { [0 ... 15] = 0x00 },
+		.klen	= 16,
+		.input  = { [0 ... 8] = 0x00 },
+		.ilen	= 8,
+		.result	= { 0x0a, 0x3a, 0xea, 0x41, 0x40, 0xa9, 0xba, 0x94 },
+		.rlen	= 8,
+	}, {
+		.key	= { 0x2b, 0x02, 0x05, 0x68, 0x06, 0x14, 0x49, 0x76,
+			    0x77, 0x5d, 0x0e, 0x26, 0x6c, 0x28, 0x78, 0x43 },
+		.klen	= 16,
+		.input	= { 0x74, 0x65, 0x73, 0x74, 0x20, 0x6d, 0x65, 0x2e },
+		.ilen	= 8,
+		.result	= { 0x77, 0x5d, 0x2a, 0x6a, 0xf6, 0xce, 0x92, 0x09 },
+		.rlen	= 8,
+	}, {
+		.key	= { 0x09, 0x65, 0x43, 0x11, 0x66, 0x44, 0x39, 0x25,
+			    0x51, 0x3a, 0x16, 0x10, 0x0a, 0x08, 0x12, 0x6e },
+		.klen	= 16,
+		.input	= { 0x6c, 0x6f, 0x6e, 0x67, 0x65, 0x72, 0x5f, 0x74, 
+			    0x65, 0x73, 0x74, 0x5f, 0x76, 0x65, 0x63, 0x74 },
+		.ilen	= 16,
+		.result	= { 0xbe, 0x7a, 0xbb, 0x81, 0x95, 0x2d, 0x1f, 0x1e, 
+			    0xdd, 0x89, 0xa1, 0x25, 0x04, 0x21, 0xdf, 0x95 },
+		.rlen	= 16,
+	}, {
+		.key	= { 0x4d, 0x76, 0x32, 0x17, 0x05, 0x3f, 0x75, 0x2c,
+			    0x5d, 0x04, 0x16, 0x36, 0x15, 0x72, 0x63, 0x2f },
+		.klen	= 16,
+		.input	= { 0x54, 0x65, 0x61, 0x20, 0x69, 0x73, 0x20, 0x67, 
+			    0x6f, 0x6f, 0x64, 0x20, 0x66, 0x6f, 0x72, 0x20, 
+			    0x79, 0x6f, 0x75, 0x21, 0x21, 0x21, 0x20, 0x72, 
+			    0x65, 0x61, 0x6c, 0x6c, 0x79, 0x21, 0x21, 0x21 },
+		.ilen	= 32,
+		.result	= { 0xe0, 0x4d, 0x5d, 0x3c, 0xb7, 0x8c, 0x36, 0x47, 
+			    0x94, 0x18, 0x95, 0x91, 0xa9, 0xfc, 0x49, 0xf8, 
+			    0x44, 0xd1, 0x2d, 0xc2, 0x99, 0xb8, 0x08, 0x2a, 
+			    0x07, 0x89, 0x73, 0xc2, 0x45, 0x92, 0xc6, 0x90 },
+		.rlen	= 32,
+	}
+};
+
+struct cipher_testvec tea_dec_tv_template[] =
+{
+	{
+		.key    = { [0 ... 15] = 0x00 },
+		.klen	= 16,
+		.input	= { 0x0a, 0x3a, 0xea, 0x41, 0x40, 0xa9, 0xba, 0x94 },
+		.ilen	= 8,
+		.result = { [0 ... 8] = 0x00 },
+		.rlen	= 8,
+	}, {
+		.key	= { 0x2b, 0x02, 0x05, 0x68, 0x06, 0x14, 0x49, 0x76,
+			    0x77, 0x5d, 0x0e, 0x26, 0x6c, 0x28, 0x78, 0x43 },
+		.klen	= 16,
+		.input	= { 0x77, 0x5d, 0x2a, 0x6a, 0xf6, 0xce, 0x92, 0x09 },
+		.ilen	= 8,
+		.result	= { 0x74, 0x65, 0x73, 0x74, 0x20, 0x6d, 0x65, 0x2e },
+		.rlen	= 8,
+	}, {
+		.key	= { 0x09, 0x65, 0x43, 0x11, 0x66, 0x44, 0x39, 0x25,
+			    0x51, 0x3a, 0x16, 0x10, 0x0a, 0x08, 0x12, 0x6e },
+		.klen	= 16,
+		.input	= { 0xbe, 0x7a, 0xbb, 0x81, 0x95, 0x2d, 0x1f, 0x1e,
+                            0xdd, 0x89, 0xa1, 0x25, 0x04, 0x21, 0xdf, 0x95 },
+                .ilen   = 16,
+		.result	= { 0x6c, 0x6f, 0x6e, 0x67, 0x65, 0x72, 0x5f, 0x74, 
+			    0x65, 0x73, 0x74, 0x5f, 0x76, 0x65, 0x63, 0x74 },
+		.rlen	= 16,
+	}, {
+		.key	= { 0x4d, 0x76, 0x32, 0x17, 0x05, 0x3f, 0x75, 0x2c,
+			    0x5d, 0x04, 0x16, 0x36, 0x15, 0x72, 0x63, 0x2f },
+		.klen	= 16,
+		.input	= { 0xe0, 0x4d, 0x5d, 0x3c, 0xb7, 0x8c, 0x36, 0x47,
+                            0x94, 0x18, 0x95, 0x91, 0xa9, 0xfc, 0x49, 0xf8,
+                            0x44, 0xd1, 0x2d, 0xc2, 0x99, 0xb8, 0x08, 0x2a,
+                            0x07, 0x89, 0x73, 0xc2, 0x45, 0x92, 0xc6, 0x90 },
+		.ilen	= 32,
+		.result	= { 0x54, 0x65, 0x61, 0x20, 0x69, 0x73, 0x20, 0x67, 
+			    0x6f, 0x6f, 0x64, 0x20, 0x66, 0x6f, 0x72, 0x20, 
+			    0x79, 0x6f, 0x75, 0x21, 0x21, 0x21, 0x20, 0x72, 
+			    0x65, 0x61, 0x6c, 0x6c, 0x79, 0x21, 0x21, 0x21 },
+		.rlen	= 32,
+	}
+};
+
+/* 
+ * XTEA test vectors 
+ */
+#define XTEA_ENC_TEST_VECTORS	4
+#define XTEA_DEC_TEST_VECTORS	4
+
+struct cipher_testvec xtea_enc_tv_template[] =
+{
+	{
+		.key    = { [0 ... 15] = 0x00 },
+		.klen	= 16,
+		.input  = { [0 ... 8] = 0x00 },
+		.ilen	= 8,
+		.result	= { 0xaa, 0x22, 0x96, 0xe5, 0x6c, 0x61, 0xf3, 0x45 },
+		.rlen	= 8,
+	}, {
+		.key	= { 0x2b, 0x02, 0x05, 0x68, 0x06, 0x14, 0x49, 0x76,
+			    0x77, 0x5d, 0x0e, 0x26, 0x6c, 0x28, 0x78, 0x43 },
+		.klen	= 16,
+		.input	= { 0x74, 0x65, 0x73, 0x74, 0x20, 0x6d, 0x65, 0x2e },
+		.ilen	= 8,
+		.result	= { 0x82, 0x3e, 0xeb, 0x35, 0xdc, 0xdd, 0xd9, 0xc3 },
+		.rlen	= 8,
+	}, {
+		.key	= { 0x09, 0x65, 0x43, 0x11, 0x66, 0x44, 0x39, 0x25,
+			    0x51, 0x3a, 0x16, 0x10, 0x0a, 0x08, 0x12, 0x6e },
+		.klen	= 16,
+		.input	= { 0x6c, 0x6f, 0x6e, 0x67, 0x65, 0x72, 0x5f, 0x74, 
+			    0x65, 0x73, 0x74, 0x5f, 0x76, 0x65, 0x63, 0x74 },
+		.ilen	= 16,
+		.result	= { 0xe2, 0x04, 0xdb, 0xf2, 0x89, 0x85, 0x9e, 0xea, 
+			    0x61, 0x35, 0xaa, 0xed, 0xb5, 0xcb, 0x71, 0x2c },
+		.rlen	= 16,
+	}, {
+		.key	= { 0x4d, 0x76, 0x32, 0x17, 0x05, 0x3f, 0x75, 0x2c,
+			    0x5d, 0x04, 0x16, 0x36, 0x15, 0x72, 0x63, 0x2f },
+		.klen	= 16,
+		.input	= { 0x54, 0x65, 0x61, 0x20, 0x69, 0x73, 0x20, 0x67, 
+			    0x6f, 0x6f, 0x64, 0x20, 0x66, 0x6f, 0x72, 0x20, 
+			    0x79, 0x6f, 0x75, 0x21, 0x21, 0x21, 0x20, 0x72, 
+			    0x65, 0x61, 0x6c, 0x6c, 0x79, 0x21, 0x21, 0x21 },
+		.ilen	= 32,
+		.result	= { 0x0b, 0x03, 0xcd, 0x8a, 0xbe, 0x95, 0xfd, 0xb1, 
+			    0xc1, 0x44, 0x91, 0x0b, 0xa5, 0xc9, 0x1b, 0xb4, 
+			    0xa9, 0xda, 0x1e, 0x9e, 0xb1, 0x3e, 0x2a, 0x8f, 
+			    0xea, 0xa5, 0x6a, 0x85, 0xd1, 0xf4, 0xa8, 0xa5 },
+		.rlen	= 32,
+	}
+};
+
+struct cipher_testvec xtea_dec_tv_template[] =
+{
+	{
+		.key    = { [0 ... 15] = 0x00 },
+		.klen	= 16,
+		.input	= { 0xaa, 0x22, 0x96, 0xe5, 0x6c, 0x61, 0xf3, 0x45 },
+		.ilen	= 8,
+		.result = { [0 ... 8] = 0x00 },
+		.rlen	= 8,
+	}, {
+		.key	= { 0x2b, 0x02, 0x05, 0x68, 0x06, 0x14, 0x49, 0x76,
+			    0x77, 0x5d, 0x0e, 0x26, 0x6c, 0x28, 0x78, 0x43 },
+		.klen	= 16,
+		.input	= { 0x82, 0x3e, 0xeb, 0x35, 0xdc, 0xdd, 0xd9, 0xc3 },
+		.ilen	= 8,
+		.result	= { 0x74, 0x65, 0x73, 0x74, 0x20, 0x6d, 0x65, 0x2e },
+		.rlen	= 8,
+	}, {
+		.key	= { 0x09, 0x65, 0x43, 0x11, 0x66, 0x44, 0x39, 0x25,
+			    0x51, 0x3a, 0x16, 0x10, 0x0a, 0x08, 0x12, 0x6e },
+		.klen	= 16,
+		.input	= { 0xe2, 0x04, 0xdb, 0xf2, 0x89, 0x85, 0x9e, 0xea, 
+			    0x61, 0x35, 0xaa, 0xed, 0xb5, 0xcb, 0x71, 0x2c },
+		.ilen	= 16,
+		.result	= { 0x6c, 0x6f, 0x6e, 0x67, 0x65, 0x72, 0x5f, 0x74, 
+			    0x65, 0x73, 0x74, 0x5f, 0x76, 0x65, 0x63, 0x74 },
+		.rlen	= 16,
+	}, {
+		.key	= { 0x4d, 0x76, 0x32, 0x17, 0x05, 0x3f, 0x75, 0x2c,
+			    0x5d, 0x04, 0x16, 0x36, 0x15, 0x72, 0x63, 0x2f },
+		.klen	= 16,
+		.input	= { 0x0b, 0x03, 0xcd, 0x8a, 0xbe, 0x95, 0xfd, 0xb1, 
+			    0xc1, 0x44, 0x91, 0x0b, 0xa5, 0xc9, 0x1b, 0xb4, 
+			    0xa9, 0xda, 0x1e, 0x9e, 0xb1, 0x3e, 0x2a, 0x8f, 
+			    0xea, 0xa5, 0x6a, 0x85, 0xd1, 0xf4, 0xa8, 0xa5 },
+		.ilen	= 32,
+		.result	= { 0x54, 0x65, 0x61, 0x20, 0x69, 0x73, 0x20, 0x67, 
+			    0x6f, 0x6f, 0x64, 0x20, 0x66, 0x6f, 0x72, 0x20, 
+			    0x79, 0x6f, 0x75, 0x21, 0x21, 0x21, 0x20, 0x72, 
+			    0x65, 0x61, 0x6c, 0x6c, 0x79, 0x21, 0x21, 0x21 },
+		.rlen	= 32,
+	}
+};
+
+/*
+ * KHAZAD test vectors.
+ */
+#define KHAZAD_ENC_TEST_VECTORS 5
+#define KHAZAD_DEC_TEST_VECTORS 5
+
+struct cipher_testvec khazad_enc_tv_template[] = { 
+	{ 
+		.key	= { 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+			    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+		.klen	= 16,
+		.input	= { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+		.ilen	= 8,
+		.result	= { 0x49, 0xa4, 0xce, 0x32, 0xac, 0x19, 0x0e, 0x3f },
+		.rlen	= 8,
+	}, {
+		.key	= { 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38,
+			    0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38 },
+		.klen	= 16,
+		.input	= { 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38 },
+		.ilen	= 8,
+		.result	= { 0x7e, 0x82, 0x12, 0xa1, 0Xd9, 0X5b, 0Xe4, 0Xf9 },
+		.rlen	= 8,
+	}, {
+		.key	= { 0Xa2, 0Xa2, 0Xa2, 0Xa2, 0Xa2, 0Xa2, 0Xa2, 0Xa2,
+			    0Xa2, 0Xa2, 0Xa2, 0Xa2, 0Xa2, 0Xa2, 0Xa2, 0Xa2 },
+		.klen	= 16,
+		.input	= { 0Xa2, 0Xa2, 0Xa2, 0Xa2, 0Xa2, 0Xa2, 0Xa2, 0Xa2 },
+		.ilen	= 8,
+		.result	= { 0Xaa, 0Xbe, 0Xc1, 0X95, 0Xc5, 0X94, 0X1a, 0X9c },
+		.rlen	= 8,
+	}, {
+		.key	= { 0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f,
+			    0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f },
+		.klen	= 16,
+		.input	= { 0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f },
+		.ilen	= 8,
+		.result = { 0X04, 0X74, 0Xf5, 0X70, 0X50, 0X16, 0Xd3, 0Xb8 },
+		.rlen	= 8,
+	}, {
+		.key	= { 0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f,
+			    0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f },
+		.klen	= 16,
+		.input	= { 0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f ,
+			    0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f },
+		.ilen	= 16,
+		.result = { 0X04, 0X74, 0Xf5, 0X70, 0X50, 0X16, 0Xd3, 0Xb8 ,
+			    0X04, 0X74, 0Xf5, 0X70, 0X50, 0X16, 0Xd3, 0Xb8 },
+		.rlen	= 16,
+	},
+};
+
+struct cipher_testvec khazad_dec_tv_template[] = { 
+	{
+		.key	= { 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+			    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+		.klen	= 16,
+		.input	= { 0X49, 0Xa4, 0Xce, 0X32, 0Xac, 0X19, 0X0e, 0X3f },
+		.ilen	= 8,
+		.result	= { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+		.rlen	= 8,
+	}, {
+		.key	= { 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38,
+			    0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38 },
+		.klen	= 16,
+		.input	= { 0X7e, 0X82, 0X12, 0Xa1, 0Xd9, 0X5b, 0Xe4, 0Xf9 },
+		.ilen	= 8,
+		.result	= { 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38 },
+		.rlen	= 8,
+	}, {
+		.key	= { 0Xa2, 0Xa2, 0Xa2, 0Xa2, 0Xa2, 0Xa2, 0Xa2, 0Xa2,
+			    0Xa2, 0Xa2, 0Xa2, 0Xa2, 0Xa2, 0Xa2, 0Xa2, 0Xa2 },
+		.klen	= 16,
+		.input	= { 0Xaa, 0Xbe, 0Xc1, 0X95, 0Xc5, 0X94, 0X1a, 0X9c },
+		.ilen	= 8,
+		.result	= { 0Xa2, 0Xa2, 0Xa2, 0Xa2, 0Xa2, 0Xa2, 0Xa2, 0Xa2 },
+		.rlen	= 8,
+	}, {
+		.key	= { 0x2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f,
+			    0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f },
+		.klen	= 16,
+		.input = { 0X04, 0X74, 0Xf5, 0X70, 0X50, 0X16, 0Xd3, 0Xb8 },
+		.ilen	= 8,
+		.result	= { 0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f },
+		.rlen	= 8,
+	}, {
+		.key	= { 0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f,
+			    0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f },
+		.klen	= 16,
+		.input = { 0X04, 0X74, 0Xf5, 0X70, 0X50, 0X16, 0Xd3, 0Xb8 ,
+			    0X04, 0X74, 0Xf5, 0X70, 0X50, 0X16, 0Xd3, 0Xb8 },
+		.ilen	= 16,
+		.result	= { 0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f ,
+			    0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f, 0X2f },
+		.rlen	= 16,
+	},
+};
 
 /*
  * Compression stuff.
@@ -1771,4 +2159,5 @@ struct hash_testvec michael_mic_tv_templ
 		.digest = { 0x0a, 0x94, 0x2b, 0x12, 0x4e, 0xca, 0xa5, 0x46 },
 	}
 };
+
 #endif	/* _CRYPTO_TCRYPT_H */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/crypto/tea.c linux-2.4.20-wolk4.16-fullkernel/crypto/tea.c
--- linux-2.4.20-wolk4.15-fullkernel/crypto/tea.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/crypto/tea.c	2004-09-05 15:47:28.000000000 +0200
@@ -0,0 +1,246 @@
+/* 
+ * Cryptographic API.
+ *
+ * TEA and Xtended TEA Algorithms
+ *
+ * The TEA and Xtended TEA algorithms were developed by David Wheeler 
+ * and Roger Needham at the Computer Laboratory of Cambridge University.
+ *
+ * Copyright (c) 2004 Aaron Grothe ajgrothe@yahoo.com
+ *
+ * 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.
+ *
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/mm.h>
+#include <asm/scatterlist.h>
+#include <linux/crypto.h>
+
+#define TEA_KEY_SIZE		16
+#define TEA_BLOCK_SIZE		8
+#define TEA_ROUNDS		32
+#define TEA_DELTA		0x9e3779b9
+
+#define XTEA_KEY_SIZE		16
+#define XTEA_BLOCK_SIZE		8
+#define XTEA_ROUNDS		32
+#define XTEA_DELTA		0x9e3779b9
+
+#define u32_in(x) le32_to_cpu(*(const u32 *)(x))
+#define u32_out(to, from) (*(u32 *)(to) = cpu_to_le32(from))
+
+struct tea_ctx {
+	u32 KEY[4];
+};
+
+struct xtea_ctx {
+	u32 KEY[4];
+};
+
+static int tea_setkey(void *ctx_arg, const u8 *in_key,
+                       unsigned int key_len, u32 *flags)
+{ 
+
+	struct tea_ctx *ctx = ctx_arg;
+	
+	if (key_len != 16)
+	{
+		*flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
+		return -EINVAL;
+	}
+
+	ctx->KEY[0] = u32_in (in_key);
+	ctx->KEY[1] = u32_in (in_key + 4);
+	ctx->KEY[2] = u32_in (in_key + 8);
+	ctx->KEY[3] = u32_in (in_key + 12);
+
+	return 0; 
+
+}
+
+static void tea_encrypt(void *ctx_arg, u8 *dst, const u8 *src)
+{ 
+	u32 y, z, n, sum = 0;
+	u32 k0, k1, k2, k3;
+
+	struct tea_ctx *ctx = ctx_arg;
+
+	y = u32_in (src);
+	z = u32_in (src + 4);
+
+	k0 = ctx->KEY[0];
+	k1 = ctx->KEY[1];
+	k2 = ctx->KEY[2];
+	k3 = ctx->KEY[3];
+
+	n = TEA_ROUNDS;
+
+	while (n-- > 0) {
+		sum += TEA_DELTA;
+		y += ((z << 4) + k0) ^ (z + sum) ^ ((z >> 5) + k1);
+		z += ((y << 4) + k2) ^ (y + sum) ^ ((y >> 5) + k3);
+	}
+	
+	u32_out (dst, y);
+	u32_out (dst + 4, z);
+}
+
+static void tea_decrypt(void *ctx_arg, u8 *dst, const u8 *src)
+{ 
+	u32 y, z, n, sum;
+	u32 k0, k1, k2, k3;
+
+	struct tea_ctx *ctx = ctx_arg;
+
+	y = u32_in (src);
+	z = u32_in (src + 4);
+
+	k0 = ctx->KEY[0];
+	k1 = ctx->KEY[1];
+	k2 = ctx->KEY[2];
+	k3 = ctx->KEY[3];
+
+	sum = TEA_DELTA << 5;
+
+	n = TEA_ROUNDS;
+
+	while (n-- > 0) {
+		z -= ((y << 4) + k2) ^ (y + sum) ^ ((y >> 5) + k3);
+		y -= ((z << 4) + k0) ^ (z + sum) ^ ((z >> 5) + k1);
+		sum -= TEA_DELTA;
+	}
+	
+	u32_out (dst, y);
+	u32_out (dst + 4, z);
+
+}
+
+static int xtea_setkey(void *ctx_arg, const u8 *in_key,
+                       unsigned int key_len, u32 *flags)
+{ 
+
+	struct xtea_ctx *ctx = ctx_arg;
+	
+	if (key_len != 16)
+	{
+		*flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
+		return -EINVAL;
+	}
+
+	ctx->KEY[0] = u32_in (in_key);
+	ctx->KEY[1] = u32_in (in_key + 4);
+	ctx->KEY[2] = u32_in (in_key + 8);
+	ctx->KEY[3] = u32_in (in_key + 12);
+
+	return 0; 
+
+}
+
+static void xtea_encrypt(void *ctx_arg, u8 *dst, const u8 *src)
+{ 
+
+	u32 y, z, sum = 0;
+	u32 limit = XTEA_DELTA * XTEA_ROUNDS;
+
+	struct xtea_ctx *ctx = ctx_arg;
+
+	y = u32_in (src);
+	z = u32_in (src + 4);
+
+	while (sum != limit) {
+		y += (z << 4 ^ z >> 5) + (z ^ sum) + ctx->KEY[sum&3]; 
+		sum += TEA_DELTA;
+		z += (y << 4 ^ y >> 5) + (y ^ sum) + ctx->KEY[sum>>11 &3]; 
+	}
+	
+	u32_out (dst, y);
+	u32_out (dst + 4, z);
+
+}
+
+static void xtea_decrypt(void *ctx_arg, u8 *dst, const u8 *src)
+{ 
+
+	u32 y, z, sum;
+	struct tea_ctx *ctx = ctx_arg;
+
+	y = u32_in (src);
+	z = u32_in (src + 4);
+
+	sum = XTEA_DELTA * XTEA_ROUNDS;
+
+	while (sum) {
+		z -= (y << 4 ^ y >> 5) + (y ^ sum) + ctx->KEY[sum>>11 & 3];
+		sum -= XTEA_DELTA;
+		y -= (z << 4 ^ z >> 5) + (z ^ sum) + ctx->KEY[sum & 3];
+	}
+	
+	u32_out (dst, y);
+	u32_out (dst + 4, z);
+
+}
+
+static struct crypto_alg tea_alg = {
+	.cra_name		=	"tea",
+	.cra_flags		=	CRYPTO_ALG_TYPE_CIPHER,
+	.cra_blocksize		=	TEA_BLOCK_SIZE,
+	.cra_ctxsize		=	sizeof (struct tea_ctx),
+	.cra_module		=	THIS_MODULE,
+	.cra_list		=	LIST_HEAD_INIT(tea_alg.cra_list),
+	.cra_u			=	{ .cipher = {
+	.cia_min_keysize	=	TEA_KEY_SIZE,
+	.cia_max_keysize	=	TEA_KEY_SIZE,
+	.cia_setkey		= 	tea_setkey,
+	.cia_encrypt		=	tea_encrypt,
+	.cia_decrypt		=	tea_decrypt } }
+};
+
+static struct crypto_alg xtea_alg = {
+	.cra_name		=	"xtea",
+	.cra_flags		=	CRYPTO_ALG_TYPE_CIPHER,
+	.cra_blocksize		=	XTEA_BLOCK_SIZE,
+	.cra_ctxsize		=	sizeof (struct xtea_ctx),
+	.cra_module		=	THIS_MODULE,
+	.cra_list		=	LIST_HEAD_INIT(xtea_alg.cra_list),
+	.cra_u			=	{ .cipher = {
+	.cia_min_keysize	=	XTEA_KEY_SIZE,
+	.cia_max_keysize	=	XTEA_KEY_SIZE,
+	.cia_setkey		= 	xtea_setkey,
+	.cia_encrypt		=	xtea_encrypt,
+	.cia_decrypt		=	xtea_decrypt } }
+};
+
+static int __init init(void)
+{
+	int ret = 0;
+	
+	ret = crypto_register_alg(&tea_alg);
+	if (ret < 0)
+		goto out;
+
+	ret = crypto_register_alg(&xtea_alg);
+	if (ret < 0) {
+		crypto_unregister_alg(&tea_alg);
+		goto out;
+	}
+
+out:	
+	return ret;
+}
+
+static void __exit fini(void)
+{
+	crypto_unregister_alg(&tea_alg);
+	crypto_unregister_alg(&xtea_alg);
+}
+
+module_init(init);
+module_exit(fini);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("TEA & XTEA Cryptographic Algorithms");
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/crypto/twofish.c linux-2.4.20-wolk4.16-fullkernel/crypto/twofish.c
--- linux-2.4.20-wolk4.15-fullkernel/crypto/twofish.c	2004-06-29 11:24:04.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/crypto/twofish.c	2004-09-05 15:47:28.000000000 +0200
@@ -1,7 +1,7 @@
 /*
  * Twofish for CryptoAPI
  *
- * Originaly Twofish for GPG
+ * Originally Twofish for GPG
  * By Matthew Skala <mskala@ansuz.sooke.bc.ca>, July 26, 1998
  * 256-bit key length added March 20, 1999
  * Some modifications to reduce the text size by Werner Koch, April, 1998
@@ -514,7 +514,7 @@ static const u8 calc_sb_tbl[512] = {
  * preprocessed through q0 and q1 respectively; for longer keys they are the
  * output of previous stages.  j is the index of the first key byte to use.
  * CALC_K computes a pair of subkeys for 128-bit Twofish, by calling CALC_K_2
- * twice, doing the Psuedo-Hadamard Transform, and doing the necessary
+ * twice, doing the Pseudo-Hadamard Transform, and doing the necessary
  * rotations.  Its parameters are: a, the array to write the results into,
  * j, the index of the first output entry, k and l, the preprocessed indices
  * for index 2i, and m and n, the preprocessed indices for index 2i+1.
@@ -663,7 +663,10 @@ static int twofish_setkey(void *cx, cons
 
 	/* Check key length. */
 	if (key_len != 16 && key_len != 24 && key_len != 32)
+	{
+		*flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
 		return -EINVAL; /* unsupported key length */
+	}
 
 	/* Compute the first two words of the S vector.  The magic numbers are
 	 * the entries of the RS matrix, preprocessed through poly_to_exp. The
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/crypto/whirlpool.c linux-2.4.20-wolk4.16-fullkernel/crypto/whirlpool.c
--- linux-2.4.20-wolk4.15-fullkernel/crypto/whirlpool.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/crypto/whirlpool.c	2004-09-05 15:47:28.000000000 +0200
@@ -0,0 +1,1131 @@
+/*
+ * Cryptographic API.
+ *
+ * Whirlpool hashing Algorithm
+ *
+ * The Whirlpool algorithm was developed by Paulo S. L. M. Barreto and
+ * Vincent Rijmen.  It has been selected as one of cryptographic
+ * primitives by the NESSIE project http://www.cryptonessie.org/
+ *
+ * The original authors have disclaimed all copyright interest in this
+ * code and thus put it in the public domain. The subsequent authors
+ * have put this under the GNU General Public License.
+ *
+ * By Aaron Grothe ajgrothe@yahoo.com, August 23, 2004
+ *
+ * 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.
+ *
+ */
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/mm.h>
+#include <asm/scatterlist.h>
+#include <linux/crypto.h>
+
+#define WHIRLPOOL_DIGEST_SIZE 64
+#define WHIRLPOOL_BLOCK_SIZE  64
+#define WHIRLPOOL_LENGTHBYTES 32
+
+#define WHIRLPOOL_ROUNDS 10
+
+struct whirlpool_ctx {
+	u8  bitLength[WHIRLPOOL_LENGTHBYTES];
+	u8  buffer[WHIRLPOOL_BLOCK_SIZE];
+	int bufferBits;
+	int bufferPos;
+	u64 hash[WHIRLPOOL_DIGEST_SIZE/8];
+};
+
+/*
+ * Though Whirlpool is endianness-neutral, the encryption tables are listed
+ * in BIG-ENDIAN format, which is adopted throughout this implementation
+ * (but little-endian notation would be equally suitable if consistently
+ * employed).
+ */
+
+static const u64 C0[256] = {
+	0x18186018c07830d8ULL, 0x23238c2305af4626ULL, 0xc6c63fc67ef991b8ULL,
+	0xe8e887e8136fcdfbULL, 0x878726874ca113cbULL, 0xb8b8dab8a9626d11ULL,
+	0x0101040108050209ULL, 0x4f4f214f426e9e0dULL, 0x3636d836adee6c9bULL,
+	0xa6a6a2a6590451ffULL, 0xd2d26fd2debdb90cULL, 0xf5f5f3f5fb06f70eULL,
+	0x7979f979ef80f296ULL, 0x6f6fa16f5fcede30ULL, 0x91917e91fcef3f6dULL,
+	0x52525552aa07a4f8ULL, 0x60609d6027fdc047ULL, 0xbcbccabc89766535ULL,
+	0x9b9b569baccd2b37ULL, 0x8e8e028e048c018aULL, 0xa3a3b6a371155bd2ULL,
+	0x0c0c300c603c186cULL, 0x7b7bf17bff8af684ULL, 0x3535d435b5e16a80ULL,
+	0x1d1d741de8693af5ULL, 0xe0e0a7e05347ddb3ULL, 0xd7d77bd7f6acb321ULL,
+	0xc2c22fc25eed999cULL, 0x2e2eb82e6d965c43ULL, 0x4b4b314b627a9629ULL,
+	0xfefedffea321e15dULL, 0x575741578216aed5ULL, 0x15155415a8412abdULL,
+	0x7777c1779fb6eee8ULL, 0x3737dc37a5eb6e92ULL, 0xe5e5b3e57b56d79eULL,
+	0x9f9f469f8cd92313ULL, 0xf0f0e7f0d317fd23ULL, 0x4a4a354a6a7f9420ULL,
+	0xdada4fda9e95a944ULL, 0x58587d58fa25b0a2ULL, 0xc9c903c906ca8fcfULL,
+	0x2929a429558d527cULL, 0x0a0a280a5022145aULL, 0xb1b1feb1e14f7f50ULL,
+	0xa0a0baa0691a5dc9ULL, 0x6b6bb16b7fdad614ULL, 0x85852e855cab17d9ULL,
+	0xbdbdcebd8173673cULL, 0x5d5d695dd234ba8fULL, 0x1010401080502090ULL,
+	0xf4f4f7f4f303f507ULL, 0xcbcb0bcb16c08bddULL, 0x3e3ef83eedc67cd3ULL,
+	0x0505140528110a2dULL, 0x676781671fe6ce78ULL, 0xe4e4b7e47353d597ULL,
+	0x27279c2725bb4e02ULL, 0x4141194132588273ULL, 0x8b8b168b2c9d0ba7ULL,
+	0xa7a7a6a7510153f6ULL, 0x7d7de97dcf94fab2ULL, 0x95956e95dcfb3749ULL,
+	0xd8d847d88e9fad56ULL, 0xfbfbcbfb8b30eb70ULL, 0xeeee9fee2371c1cdULL,
+	0x7c7ced7cc791f8bbULL, 0x6666856617e3cc71ULL, 0xdddd53dda68ea77bULL,
+	0x17175c17b84b2eafULL, 0x4747014702468e45ULL, 0x9e9e429e84dc211aULL,
+	0xcaca0fca1ec589d4ULL, 0x2d2db42d75995a58ULL, 0xbfbfc6bf9179632eULL,
+	0x07071c07381b0e3fULL, 0xadad8ead012347acULL, 0x5a5a755aea2fb4b0ULL,
+	0x838336836cb51befULL, 0x3333cc3385ff66b6ULL, 0x636391633ff2c65cULL,
+	0x02020802100a0412ULL, 0xaaaa92aa39384993ULL, 0x7171d971afa8e2deULL,
+	0xc8c807c80ecf8dc6ULL, 0x19196419c87d32d1ULL, 0x494939497270923bULL,
+	0xd9d943d9869aaf5fULL, 0xf2f2eff2c31df931ULL, 0xe3e3abe34b48dba8ULL,
+	0x5b5b715be22ab6b9ULL, 0x88881a8834920dbcULL, 0x9a9a529aa4c8293eULL,
+	0x262698262dbe4c0bULL, 0x3232c8328dfa64bfULL, 0xb0b0fab0e94a7d59ULL,
+	0xe9e983e91b6acff2ULL, 0x0f0f3c0f78331e77ULL, 0xd5d573d5e6a6b733ULL,
+	0x80803a8074ba1df4ULL, 0xbebec2be997c6127ULL, 0xcdcd13cd26de87ebULL,
+	0x3434d034bde46889ULL, 0x48483d487a759032ULL, 0xffffdbffab24e354ULL,
+	0x7a7af57af78ff48dULL, 0x90907a90f4ea3d64ULL, 0x5f5f615fc23ebe9dULL,
+	0x202080201da0403dULL, 0x6868bd6867d5d00fULL, 0x1a1a681ad07234caULL,
+	0xaeae82ae192c41b7ULL, 0xb4b4eab4c95e757dULL, 0x54544d549a19a8ceULL,
+	0x93937693ece53b7fULL, 0x222288220daa442fULL, 0x64648d6407e9c863ULL,
+	0xf1f1e3f1db12ff2aULL, 0x7373d173bfa2e6ccULL, 0x12124812905a2482ULL,
+	0x40401d403a5d807aULL, 0x0808200840281048ULL, 0xc3c32bc356e89b95ULL,
+	0xecec97ec337bc5dfULL, 0xdbdb4bdb9690ab4dULL, 0xa1a1bea1611f5fc0ULL,
+	0x8d8d0e8d1c830791ULL, 0x3d3df43df5c97ac8ULL, 0x97976697ccf1335bULL,
+	0x0000000000000000ULL, 0xcfcf1bcf36d483f9ULL, 0x2b2bac2b4587566eULL,
+	0x7676c57697b3ece1ULL, 0x8282328264b019e6ULL, 0xd6d67fd6fea9b128ULL,
+	0x1b1b6c1bd87736c3ULL, 0xb5b5eeb5c15b7774ULL, 0xafaf86af112943beULL,
+	0x6a6ab56a77dfd41dULL, 0x50505d50ba0da0eaULL, 0x45450945124c8a57ULL,
+	0xf3f3ebf3cb18fb38ULL, 0x3030c0309df060adULL, 0xefef9bef2b74c3c4ULL,
+	0x3f3ffc3fe5c37edaULL, 0x55554955921caac7ULL, 0xa2a2b2a2791059dbULL,
+	0xeaea8fea0365c9e9ULL, 0x656589650fecca6aULL, 0xbabad2bab9686903ULL,
+	0x2f2fbc2f65935e4aULL, 0xc0c027c04ee79d8eULL, 0xdede5fdebe81a160ULL,
+	0x1c1c701ce06c38fcULL, 0xfdfdd3fdbb2ee746ULL, 0x4d4d294d52649a1fULL,
+	0x92927292e4e03976ULL, 0x7575c9758fbceafaULL, 0x06061806301e0c36ULL,
+	0x8a8a128a249809aeULL, 0xb2b2f2b2f940794bULL, 0xe6e6bfe66359d185ULL,
+	0x0e0e380e70361c7eULL, 0x1f1f7c1ff8633ee7ULL, 0x6262956237f7c455ULL,
+	0xd4d477d4eea3b53aULL, 0xa8a89aa829324d81ULL, 0x96966296c4f43152ULL,
+	0xf9f9c3f99b3aef62ULL, 0xc5c533c566f697a3ULL, 0x2525942535b14a10ULL,
+	0x59597959f220b2abULL, 0x84842a8454ae15d0ULL, 0x7272d572b7a7e4c5ULL,
+	0x3939e439d5dd72ecULL, 0x4c4c2d4c5a619816ULL, 0x5e5e655eca3bbc94ULL,
+	0x7878fd78e785f09fULL, 0x3838e038ddd870e5ULL, 0x8c8c0a8c14860598ULL,
+	0xd1d163d1c6b2bf17ULL, 0xa5a5aea5410b57e4ULL, 0xe2e2afe2434dd9a1ULL,
+	0x616199612ff8c24eULL, 0xb3b3f6b3f1457b42ULL, 0x2121842115a54234ULL,
+	0x9c9c4a9c94d62508ULL, 0x1e1e781ef0663ceeULL, 0x4343114322528661ULL,
+	0xc7c73bc776fc93b1ULL, 0xfcfcd7fcb32be54fULL, 0x0404100420140824ULL,
+	0x51515951b208a2e3ULL, 0x99995e99bcc72f25ULL, 0x6d6da96d4fc4da22ULL,
+	0x0d0d340d68391a65ULL, 0xfafacffa8335e979ULL, 0xdfdf5bdfb684a369ULL,
+	0x7e7ee57ed79bfca9ULL, 0x242490243db44819ULL, 0x3b3bec3bc5d776feULL,
+	0xabab96ab313d4b9aULL, 0xcece1fce3ed181f0ULL, 0x1111441188552299ULL,
+	0x8f8f068f0c890383ULL, 0x4e4e254e4a6b9c04ULL, 0xb7b7e6b7d1517366ULL,
+	0xebeb8beb0b60cbe0ULL, 0x3c3cf03cfdcc78c1ULL, 0x81813e817cbf1ffdULL,
+	0x94946a94d4fe3540ULL, 0xf7f7fbf7eb0cf31cULL, 0xb9b9deb9a1676f18ULL,
+	0x13134c13985f268bULL, 0x2c2cb02c7d9c5851ULL, 0xd3d36bd3d6b8bb05ULL,
+	0xe7e7bbe76b5cd38cULL, 0x6e6ea56e57cbdc39ULL, 0xc4c437c46ef395aaULL,
+	0x03030c03180f061bULL, 0x565645568a13acdcULL, 0x44440d441a49885eULL,
+	0x7f7fe17fdf9efea0ULL, 0xa9a99ea921374f88ULL, 0x2a2aa82a4d825467ULL,
+	0xbbbbd6bbb16d6b0aULL, 0xc1c123c146e29f87ULL, 0x53535153a202a6f1ULL,
+	0xdcdc57dcae8ba572ULL, 0x0b0b2c0b58271653ULL, 0x9d9d4e9d9cd32701ULL,
+	0x6c6cad6c47c1d82bULL, 0x3131c43195f562a4ULL, 0x7474cd7487b9e8f3ULL,
+	0xf6f6fff6e309f115ULL, 0x464605460a438c4cULL, 0xacac8aac092645a5ULL,
+	0x89891e893c970fb5ULL, 0x14145014a04428b4ULL, 0xe1e1a3e15b42dfbaULL,
+	0x16165816b04e2ca6ULL, 0x3a3ae83acdd274f7ULL, 0x6969b9696fd0d206ULL,
+	0x09092409482d1241ULL, 0x7070dd70a7ade0d7ULL, 0xb6b6e2b6d954716fULL,
+	0xd0d067d0ceb7bd1eULL, 0xeded93ed3b7ec7d6ULL, 0xcccc17cc2edb85e2ULL,
+	0x424215422a578468ULL, 0x98985a98b4c22d2cULL, 0xa4a4aaa4490e55edULL,
+	0x2828a0285d885075ULL, 0x5c5c6d5cda31b886ULL, 0xf8f8c7f8933fed6bULL,
+	0x8686228644a411c2ULL,
+};
+
+static const u64 C1[256] = {
+	0xd818186018c07830ULL, 0x2623238c2305af46ULL, 0xb8c6c63fc67ef991ULL,
+	0xfbe8e887e8136fcdULL, 0xcb878726874ca113ULL, 0x11b8b8dab8a9626dULL,
+	0x0901010401080502ULL, 0x0d4f4f214f426e9eULL, 0x9b3636d836adee6cULL,
+	0xffa6a6a2a6590451ULL, 0x0cd2d26fd2debdb9ULL, 0x0ef5f5f3f5fb06f7ULL,
+	0x967979f979ef80f2ULL, 0x306f6fa16f5fcedeULL, 0x6d91917e91fcef3fULL,
+	0xf852525552aa07a4ULL, 0x4760609d6027fdc0ULL, 0x35bcbccabc897665ULL,
+	0x379b9b569baccd2bULL, 0x8a8e8e028e048c01ULL, 0xd2a3a3b6a371155bULL,
+	0x6c0c0c300c603c18ULL, 0x847b7bf17bff8af6ULL, 0x803535d435b5e16aULL,
+	0xf51d1d741de8693aULL, 0xb3e0e0a7e05347ddULL, 0x21d7d77bd7f6acb3ULL,
+	0x9cc2c22fc25eed99ULL, 0x432e2eb82e6d965cULL, 0x294b4b314b627a96ULL,
+	0x5dfefedffea321e1ULL, 0xd5575741578216aeULL, 0xbd15155415a8412aULL,
+	0xe87777c1779fb6eeULL, 0x923737dc37a5eb6eULL, 0x9ee5e5b3e57b56d7ULL,
+	0x139f9f469f8cd923ULL, 0x23f0f0e7f0d317fdULL, 0x204a4a354a6a7f94ULL,
+	0x44dada4fda9e95a9ULL, 0xa258587d58fa25b0ULL, 0xcfc9c903c906ca8fULL,
+	0x7c2929a429558d52ULL, 0x5a0a0a280a502214ULL, 0x50b1b1feb1e14f7fULL,
+	0xc9a0a0baa0691a5dULL, 0x146b6bb16b7fdad6ULL, 0xd985852e855cab17ULL,
+	0x3cbdbdcebd817367ULL, 0x8f5d5d695dd234baULL, 0x9010104010805020ULL,
+	0x07f4f4f7f4f303f5ULL, 0xddcbcb0bcb16c08bULL, 0xd33e3ef83eedc67cULL,
+	0x2d0505140528110aULL, 0x78676781671fe6ceULL, 0x97e4e4b7e47353d5ULL,
+	0x0227279c2725bb4eULL, 0x7341411941325882ULL, 0xa78b8b168b2c9d0bULL,
+	0xf6a7a7a6a7510153ULL, 0xb27d7de97dcf94faULL, 0x4995956e95dcfb37ULL,
+	0x56d8d847d88e9fadULL, 0x70fbfbcbfb8b30ebULL, 0xcdeeee9fee2371c1ULL,
+	0xbb7c7ced7cc791f8ULL, 0x716666856617e3ccULL, 0x7bdddd53dda68ea7ULL,
+	0xaf17175c17b84b2eULL, 0x454747014702468eULL, 0x1a9e9e429e84dc21ULL,
+	0xd4caca0fca1ec589ULL, 0x582d2db42d75995aULL, 0x2ebfbfc6bf917963ULL,
+	0x3f07071c07381b0eULL, 0xacadad8ead012347ULL, 0xb05a5a755aea2fb4ULL,
+	0xef838336836cb51bULL, 0xb63333cc3385ff66ULL, 0x5c636391633ff2c6ULL,
+	0x1202020802100a04ULL, 0x93aaaa92aa393849ULL, 0xde7171d971afa8e2ULL,
+	0xc6c8c807c80ecf8dULL, 0xd119196419c87d32ULL, 0x3b49493949727092ULL,
+	0x5fd9d943d9869aafULL, 0x31f2f2eff2c31df9ULL, 0xa8e3e3abe34b48dbULL,
+	0xb95b5b715be22ab6ULL, 0xbc88881a8834920dULL, 0x3e9a9a529aa4c829ULL,
+	0x0b262698262dbe4cULL, 0xbf3232c8328dfa64ULL, 0x59b0b0fab0e94a7dULL,
+	0xf2e9e983e91b6acfULL, 0x770f0f3c0f78331eULL, 0x33d5d573d5e6a6b7ULL,
+	0xf480803a8074ba1dULL, 0x27bebec2be997c61ULL, 0xebcdcd13cd26de87ULL,
+	0x893434d034bde468ULL, 0x3248483d487a7590ULL, 0x54ffffdbffab24e3ULL,
+	0x8d7a7af57af78ff4ULL, 0x6490907a90f4ea3dULL, 0x9d5f5f615fc23ebeULL,
+	0x3d202080201da040ULL, 0x0f6868bd6867d5d0ULL, 0xca1a1a681ad07234ULL,
+	0xb7aeae82ae192c41ULL, 0x7db4b4eab4c95e75ULL, 0xce54544d549a19a8ULL,
+	0x7f93937693ece53bULL, 0x2f222288220daa44ULL, 0x6364648d6407e9c8ULL,
+	0x2af1f1e3f1db12ffULL, 0xcc7373d173bfa2e6ULL, 0x8212124812905a24ULL,
+	0x7a40401d403a5d80ULL, 0x4808082008402810ULL, 0x95c3c32bc356e89bULL,
+	0xdfecec97ec337bc5ULL, 0x4ddbdb4bdb9690abULL, 0xc0a1a1bea1611f5fULL,
+	0x918d8d0e8d1c8307ULL, 0xc83d3df43df5c97aULL, 0x5b97976697ccf133ULL,
+	0x0000000000000000ULL, 0xf9cfcf1bcf36d483ULL, 0x6e2b2bac2b458756ULL,
+	0xe17676c57697b3ecULL, 0xe68282328264b019ULL, 0x28d6d67fd6fea9b1ULL,
+	0xc31b1b6c1bd87736ULL, 0x74b5b5eeb5c15b77ULL, 0xbeafaf86af112943ULL,
+	0x1d6a6ab56a77dfd4ULL, 0xea50505d50ba0da0ULL, 0x5745450945124c8aULL,
+	0x38f3f3ebf3cb18fbULL, 0xad3030c0309df060ULL, 0xc4efef9bef2b74c3ULL,
+	0xda3f3ffc3fe5c37eULL, 0xc755554955921caaULL, 0xdba2a2b2a2791059ULL,
+	0xe9eaea8fea0365c9ULL, 0x6a656589650feccaULL, 0x03babad2bab96869ULL,
+	0x4a2f2fbc2f65935eULL, 0x8ec0c027c04ee79dULL, 0x60dede5fdebe81a1ULL,
+	0xfc1c1c701ce06c38ULL, 0x46fdfdd3fdbb2ee7ULL, 0x1f4d4d294d52649aULL,
+	0x7692927292e4e039ULL, 0xfa7575c9758fbceaULL, 0x3606061806301e0cULL,
+	0xae8a8a128a249809ULL, 0x4bb2b2f2b2f94079ULL, 0x85e6e6bfe66359d1ULL,
+	0x7e0e0e380e70361cULL, 0xe71f1f7c1ff8633eULL, 0x556262956237f7c4ULL,
+	0x3ad4d477d4eea3b5ULL, 0x81a8a89aa829324dULL, 0x5296966296c4f431ULL,
+	0x62f9f9c3f99b3aefULL, 0xa3c5c533c566f697ULL, 0x102525942535b14aULL,
+	0xab59597959f220b2ULL, 0xd084842a8454ae15ULL, 0xc57272d572b7a7e4ULL,
+	0xec3939e439d5dd72ULL, 0x164c4c2d4c5a6198ULL, 0x945e5e655eca3bbcULL,
+	0x9f7878fd78e785f0ULL, 0xe53838e038ddd870ULL, 0x988c8c0a8c148605ULL,
+	0x17d1d163d1c6b2bfULL, 0xe4a5a5aea5410b57ULL, 0xa1e2e2afe2434dd9ULL,
+	0x4e616199612ff8c2ULL, 0x42b3b3f6b3f1457bULL, 0x342121842115a542ULL,
+	0x089c9c4a9c94d625ULL, 0xee1e1e781ef0663cULL, 0x6143431143225286ULL,
+	0xb1c7c73bc776fc93ULL, 0x4ffcfcd7fcb32be5ULL, 0x2404041004201408ULL,
+	0xe351515951b208a2ULL, 0x2599995e99bcc72fULL, 0x226d6da96d4fc4daULL,
+	0x650d0d340d68391aULL, 0x79fafacffa8335e9ULL, 0x69dfdf5bdfb684a3ULL,
+	0xa97e7ee57ed79bfcULL, 0x19242490243db448ULL, 0xfe3b3bec3bc5d776ULL,
+	0x9aabab96ab313d4bULL, 0xf0cece1fce3ed181ULL, 0x9911114411885522ULL,
+	0x838f8f068f0c8903ULL, 0x044e4e254e4a6b9cULL, 0x66b7b7e6b7d15173ULL,
+	0xe0ebeb8beb0b60cbULL, 0xc13c3cf03cfdcc78ULL, 0xfd81813e817cbf1fULL,
+	0x4094946a94d4fe35ULL, 0x1cf7f7fbf7eb0cf3ULL, 0x18b9b9deb9a1676fULL,
+	0x8b13134c13985f26ULL, 0x512c2cb02c7d9c58ULL, 0x05d3d36bd3d6b8bbULL,
+	0x8ce7e7bbe76b5cd3ULL, 0x396e6ea56e57cbdcULL, 0xaac4c437c46ef395ULL,
+	0x1b03030c03180f06ULL, 0xdc565645568a13acULL, 0x5e44440d441a4988ULL,
+	0xa07f7fe17fdf9efeULL, 0x88a9a99ea921374fULL, 0x672a2aa82a4d8254ULL,
+	0x0abbbbd6bbb16d6bULL, 0x87c1c123c146e29fULL, 0xf153535153a202a6ULL,
+	0x72dcdc57dcae8ba5ULL, 0x530b0b2c0b582716ULL, 0x019d9d4e9d9cd327ULL,
+	0x2b6c6cad6c47c1d8ULL, 0xa43131c43195f562ULL, 0xf37474cd7487b9e8ULL,
+	0x15f6f6fff6e309f1ULL, 0x4c464605460a438cULL, 0xa5acac8aac092645ULL,
+	0xb589891e893c970fULL, 0xb414145014a04428ULL, 0xbae1e1a3e15b42dfULL,
+	0xa616165816b04e2cULL, 0xf73a3ae83acdd274ULL, 0x066969b9696fd0d2ULL,
+	0x4109092409482d12ULL, 0xd77070dd70a7ade0ULL, 0x6fb6b6e2b6d95471ULL,
+	0x1ed0d067d0ceb7bdULL, 0xd6eded93ed3b7ec7ULL, 0xe2cccc17cc2edb85ULL,
+	0x68424215422a5784ULL, 0x2c98985a98b4c22dULL, 0xeda4a4aaa4490e55ULL,
+	0x752828a0285d8850ULL, 0x865c5c6d5cda31b8ULL, 0x6bf8f8c7f8933fedULL,
+	0xc28686228644a411ULL,
+};
+
+static const u64 C2[256] = {
+	0x30d818186018c078ULL, 0x462623238c2305afULL, 0x91b8c6c63fc67ef9ULL,
+	0xcdfbe8e887e8136fULL, 0x13cb878726874ca1ULL, 0x6d11b8b8dab8a962ULL,
+	0x0209010104010805ULL, 0x9e0d4f4f214f426eULL, 0x6c9b3636d836adeeULL,
+	0x51ffa6a6a2a65904ULL, 0xb90cd2d26fd2debdULL, 0xf70ef5f5f3f5fb06ULL,
+	0xf2967979f979ef80ULL, 0xde306f6fa16f5fceULL, 0x3f6d91917e91fcefULL,
+	0xa4f852525552aa07ULL, 0xc04760609d6027fdULL, 0x6535bcbccabc8976ULL,
+	0x2b379b9b569baccdULL, 0x018a8e8e028e048cULL, 0x5bd2a3a3b6a37115ULL,
+	0x186c0c0c300c603cULL, 0xf6847b7bf17bff8aULL, 0x6a803535d435b5e1ULL,
+	0x3af51d1d741de869ULL, 0xddb3e0e0a7e05347ULL, 0xb321d7d77bd7f6acULL,
+	0x999cc2c22fc25eedULL, 0x5c432e2eb82e6d96ULL, 0x96294b4b314b627aULL,
+	0xe15dfefedffea321ULL, 0xaed5575741578216ULL, 0x2abd15155415a841ULL,
+	0xeee87777c1779fb6ULL, 0x6e923737dc37a5ebULL, 0xd79ee5e5b3e57b56ULL,
+	0x23139f9f469f8cd9ULL, 0xfd23f0f0e7f0d317ULL, 0x94204a4a354a6a7fULL,
+	0xa944dada4fda9e95ULL, 0xb0a258587d58fa25ULL, 0x8fcfc9c903c906caULL,
+	0x527c2929a429558dULL, 0x145a0a0a280a5022ULL, 0x7f50b1b1feb1e14fULL,
+	0x5dc9a0a0baa0691aULL, 0xd6146b6bb16b7fdaULL, 0x17d985852e855cabULL,
+	0x673cbdbdcebd8173ULL, 0xba8f5d5d695dd234ULL, 0x2090101040108050ULL,
+	0xf507f4f4f7f4f303ULL, 0x8bddcbcb0bcb16c0ULL, 0x7cd33e3ef83eedc6ULL,
+	0x0a2d050514052811ULL, 0xce78676781671fe6ULL, 0xd597e4e4b7e47353ULL,
+	0x4e0227279c2725bbULL, 0x8273414119413258ULL, 0x0ba78b8b168b2c9dULL,
+	0x53f6a7a7a6a75101ULL, 0xfab27d7de97dcf94ULL, 0x374995956e95dcfbULL,
+	0xad56d8d847d88e9fULL, 0xeb70fbfbcbfb8b30ULL, 0xc1cdeeee9fee2371ULL,
+	0xf8bb7c7ced7cc791ULL, 0xcc716666856617e3ULL, 0xa77bdddd53dda68eULL,
+	0x2eaf17175c17b84bULL, 0x8e45474701470246ULL, 0x211a9e9e429e84dcULL,
+	0x89d4caca0fca1ec5ULL, 0x5a582d2db42d7599ULL, 0x632ebfbfc6bf9179ULL,
+	0x0e3f07071c07381bULL, 0x47acadad8ead0123ULL, 0xb4b05a5a755aea2fULL,
+	0x1bef838336836cb5ULL, 0x66b63333cc3385ffULL, 0xc65c636391633ff2ULL,
+	0x041202020802100aULL, 0x4993aaaa92aa3938ULL, 0xe2de7171d971afa8ULL,
+	0x8dc6c8c807c80ecfULL, 0x32d119196419c87dULL, 0x923b494939497270ULL,
+	0xaf5fd9d943d9869aULL, 0xf931f2f2eff2c31dULL, 0xdba8e3e3abe34b48ULL,
+	0xb6b95b5b715be22aULL, 0x0dbc88881a883492ULL, 0x293e9a9a529aa4c8ULL,
+	0x4c0b262698262dbeULL, 0x64bf3232c8328dfaULL, 0x7d59b0b0fab0e94aULL,
+	0xcff2e9e983e91b6aULL, 0x1e770f0f3c0f7833ULL, 0xb733d5d573d5e6a6ULL,
+	0x1df480803a8074baULL, 0x6127bebec2be997cULL, 0x87ebcdcd13cd26deULL,
+	0x68893434d034bde4ULL, 0x903248483d487a75ULL, 0xe354ffffdbffab24ULL,
+	0xf48d7a7af57af78fULL, 0x3d6490907a90f4eaULL, 0xbe9d5f5f615fc23eULL,
+	0x403d202080201da0ULL, 0xd00f6868bd6867d5ULL, 0x34ca1a1a681ad072ULL,
+	0x41b7aeae82ae192cULL, 0x757db4b4eab4c95eULL, 0xa8ce54544d549a19ULL,
+	0x3b7f93937693ece5ULL, 0x442f222288220daaULL, 0xc86364648d6407e9ULL,
+	0xff2af1f1e3f1db12ULL, 0xe6cc7373d173bfa2ULL, 0x248212124812905aULL,
+	0x807a40401d403a5dULL, 0x1048080820084028ULL, 0x9b95c3c32bc356e8ULL,
+	0xc5dfecec97ec337bULL, 0xab4ddbdb4bdb9690ULL, 0x5fc0a1a1bea1611fULL,
+	0x07918d8d0e8d1c83ULL, 0x7ac83d3df43df5c9ULL, 0x335b97976697ccf1ULL,
+	0x0000000000000000ULL, 0x83f9cfcf1bcf36d4ULL, 0x566e2b2bac2b4587ULL,
+	0xece17676c57697b3ULL, 0x19e68282328264b0ULL, 0xb128d6d67fd6fea9ULL,
+	0x36c31b1b6c1bd877ULL, 0x7774b5b5eeb5c15bULL, 0x43beafaf86af1129ULL,
+	0xd41d6a6ab56a77dfULL, 0xa0ea50505d50ba0dULL, 0x8a5745450945124cULL,
+	0xfb38f3f3ebf3cb18ULL, 0x60ad3030c0309df0ULL, 0xc3c4efef9bef2b74ULL,
+	0x7eda3f3ffc3fe5c3ULL, 0xaac755554955921cULL, 0x59dba2a2b2a27910ULL,
+	0xc9e9eaea8fea0365ULL, 0xca6a656589650fecULL, 0x6903babad2bab968ULL,
+	0x5e4a2f2fbc2f6593ULL, 0x9d8ec0c027c04ee7ULL, 0xa160dede5fdebe81ULL,
+	0x38fc1c1c701ce06cULL, 0xe746fdfdd3fdbb2eULL, 0x9a1f4d4d294d5264ULL,
+	0x397692927292e4e0ULL, 0xeafa7575c9758fbcULL, 0x0c3606061806301eULL,
+	0x09ae8a8a128a2498ULL, 0x794bb2b2f2b2f940ULL, 0xd185e6e6bfe66359ULL,
+	0x1c7e0e0e380e7036ULL, 0x3ee71f1f7c1ff863ULL, 0xc4556262956237f7ULL,
+	0xb53ad4d477d4eea3ULL, 0x4d81a8a89aa82932ULL, 0x315296966296c4f4ULL,
+	0xef62f9f9c3f99b3aULL, 0x97a3c5c533c566f6ULL, 0x4a102525942535b1ULL,
+	0xb2ab59597959f220ULL, 0x15d084842a8454aeULL, 0xe4c57272d572b7a7ULL,
+	0x72ec3939e439d5ddULL, 0x98164c4c2d4c5a61ULL, 0xbc945e5e655eca3bULL,
+	0xf09f7878fd78e785ULL, 0x70e53838e038ddd8ULL, 0x05988c8c0a8c1486ULL,
+	0xbf17d1d163d1c6b2ULL, 0x57e4a5a5aea5410bULL, 0xd9a1e2e2afe2434dULL,
+	0xc24e616199612ff8ULL, 0x7b42b3b3f6b3f145ULL, 0x42342121842115a5ULL,
+	0x25089c9c4a9c94d6ULL, 0x3cee1e1e781ef066ULL, 0x8661434311432252ULL,
+	0x93b1c7c73bc776fcULL, 0xe54ffcfcd7fcb32bULL, 0x0824040410042014ULL,
+	0xa2e351515951b208ULL, 0x2f2599995e99bcc7ULL, 0xda226d6da96d4fc4ULL,
+	0x1a650d0d340d6839ULL, 0xe979fafacffa8335ULL, 0xa369dfdf5bdfb684ULL,
+	0xfca97e7ee57ed79bULL, 0x4819242490243db4ULL, 0x76fe3b3bec3bc5d7ULL,
+	0x4b9aabab96ab313dULL, 0x81f0cece1fce3ed1ULL, 0x2299111144118855ULL,
+	0x03838f8f068f0c89ULL, 0x9c044e4e254e4a6bULL, 0x7366b7b7e6b7d151ULL,
+	0xcbe0ebeb8beb0b60ULL, 0x78c13c3cf03cfdccULL, 0x1ffd81813e817cbfULL,
+	0x354094946a94d4feULL, 0xf31cf7f7fbf7eb0cULL, 0x6f18b9b9deb9a167ULL,
+	0x268b13134c13985fULL, 0x58512c2cb02c7d9cULL, 0xbb05d3d36bd3d6b8ULL,
+	0xd38ce7e7bbe76b5cULL, 0xdc396e6ea56e57cbULL, 0x95aac4c437c46ef3ULL,
+	0x061b03030c03180fULL, 0xacdc565645568a13ULL, 0x885e44440d441a49ULL,
+	0xfea07f7fe17fdf9eULL, 0x4f88a9a99ea92137ULL, 0x54672a2aa82a4d82ULL,
+	0x6b0abbbbd6bbb16dULL, 0x9f87c1c123c146e2ULL, 0xa6f153535153a202ULL,
+	0xa572dcdc57dcae8bULL, 0x16530b0b2c0b5827ULL, 0x27019d9d4e9d9cd3ULL,
+	0xd82b6c6cad6c47c1ULL, 0x62a43131c43195f5ULL, 0xe8f37474cd7487b9ULL,
+	0xf115f6f6fff6e309ULL, 0x8c4c464605460a43ULL, 0x45a5acac8aac0926ULL,
+	0x0fb589891e893c97ULL, 0x28b414145014a044ULL, 0xdfbae1e1a3e15b42ULL,
+	0x2ca616165816b04eULL, 0x74f73a3ae83acdd2ULL, 0xd2066969b9696fd0ULL,
+	0x124109092409482dULL, 0xe0d77070dd70a7adULL, 0x716fb6b6e2b6d954ULL,
+	0xbd1ed0d067d0ceb7ULL, 0xc7d6eded93ed3b7eULL, 0x85e2cccc17cc2edbULL,
+	0x8468424215422a57ULL, 0x2d2c98985a98b4c2ULL, 0x55eda4a4aaa4490eULL,
+	0x50752828a0285d88ULL, 0xb8865c5c6d5cda31ULL, 0xed6bf8f8c7f8933fULL,
+	0x11c28686228644a4ULL,
+};
+
+static const u64 C3[256] = {
+	0x7830d818186018c0ULL, 0xaf462623238c2305ULL, 0xf991b8c6c63fc67eULL,
+	0x6fcdfbe8e887e813ULL, 0xa113cb878726874cULL, 0x626d11b8b8dab8a9ULL,
+	0x0502090101040108ULL, 0x6e9e0d4f4f214f42ULL, 0xee6c9b3636d836adULL,
+	0x0451ffa6a6a2a659ULL, 0xbdb90cd2d26fd2deULL, 0x06f70ef5f5f3f5fbULL,
+	0x80f2967979f979efULL, 0xcede306f6fa16f5fULL, 0xef3f6d91917e91fcULL,
+	0x07a4f852525552aaULL, 0xfdc04760609d6027ULL, 0x766535bcbccabc89ULL,
+	0xcd2b379b9b569bacULL, 0x8c018a8e8e028e04ULL, 0x155bd2a3a3b6a371ULL,
+	0x3c186c0c0c300c60ULL, 0x8af6847b7bf17bffULL, 0xe16a803535d435b5ULL,
+	0x693af51d1d741de8ULL, 0x47ddb3e0e0a7e053ULL, 0xacb321d7d77bd7f6ULL,
+	0xed999cc2c22fc25eULL, 0x965c432e2eb82e6dULL, 0x7a96294b4b314b62ULL,
+	0x21e15dfefedffea3ULL, 0x16aed55757415782ULL, 0x412abd15155415a8ULL,
+	0xb6eee87777c1779fULL, 0xeb6e923737dc37a5ULL, 0x56d79ee5e5b3e57bULL,
+	0xd923139f9f469f8cULL, 0x17fd23f0f0e7f0d3ULL, 0x7f94204a4a354a6aULL,
+	0x95a944dada4fda9eULL, 0x25b0a258587d58faULL, 0xca8fcfc9c903c906ULL,
+	0x8d527c2929a42955ULL, 0x22145a0a0a280a50ULL, 0x4f7f50b1b1feb1e1ULL,
+	0x1a5dc9a0a0baa069ULL, 0xdad6146b6bb16b7fULL, 0xab17d985852e855cULL,
+	0x73673cbdbdcebd81ULL, 0x34ba8f5d5d695dd2ULL, 0x5020901010401080ULL,
+	0x03f507f4f4f7f4f3ULL, 0xc08bddcbcb0bcb16ULL, 0xc67cd33e3ef83eedULL,
+	0x110a2d0505140528ULL, 0xe6ce78676781671fULL, 0x53d597e4e4b7e473ULL,
+	0xbb4e0227279c2725ULL, 0x5882734141194132ULL, 0x9d0ba78b8b168b2cULL,
+	0x0153f6a7a7a6a751ULL, 0x94fab27d7de97dcfULL, 0xfb374995956e95dcULL,
+	0x9fad56d8d847d88eULL, 0x30eb70fbfbcbfb8bULL, 0x71c1cdeeee9fee23ULL,
+	0x91f8bb7c7ced7cc7ULL, 0xe3cc716666856617ULL, 0x8ea77bdddd53dda6ULL,
+	0x4b2eaf17175c17b8ULL, 0x468e454747014702ULL, 0xdc211a9e9e429e84ULL,
+	0xc589d4caca0fca1eULL, 0x995a582d2db42d75ULL, 0x79632ebfbfc6bf91ULL,
+	0x1b0e3f07071c0738ULL, 0x2347acadad8ead01ULL, 0x2fb4b05a5a755aeaULL,
+	0xb51bef838336836cULL, 0xff66b63333cc3385ULL, 0xf2c65c636391633fULL,
+	0x0a04120202080210ULL, 0x384993aaaa92aa39ULL, 0xa8e2de7171d971afULL,
+	0xcf8dc6c8c807c80eULL, 0x7d32d119196419c8ULL, 0x70923b4949394972ULL,
+	0x9aaf5fd9d943d986ULL, 0x1df931f2f2eff2c3ULL, 0x48dba8e3e3abe34bULL,
+	0x2ab6b95b5b715be2ULL, 0x920dbc88881a8834ULL, 0xc8293e9a9a529aa4ULL,
+	0xbe4c0b262698262dULL, 0xfa64bf3232c8328dULL, 0x4a7d59b0b0fab0e9ULL,
+	0x6acff2e9e983e91bULL, 0x331e770f0f3c0f78ULL, 0xa6b733d5d573d5e6ULL,
+	0xba1df480803a8074ULL, 0x7c6127bebec2be99ULL, 0xde87ebcdcd13cd26ULL,
+	0xe468893434d034bdULL, 0x75903248483d487aULL, 0x24e354ffffdbffabULL,
+	0x8ff48d7a7af57af7ULL, 0xea3d6490907a90f4ULL, 0x3ebe9d5f5f615fc2ULL,
+	0xa0403d202080201dULL, 0xd5d00f6868bd6867ULL, 0x7234ca1a1a681ad0ULL,
+	0x2c41b7aeae82ae19ULL, 0x5e757db4b4eab4c9ULL, 0x19a8ce54544d549aULL,
+	0xe53b7f93937693ecULL, 0xaa442f222288220dULL, 0xe9c86364648d6407ULL,
+	0x12ff2af1f1e3f1dbULL, 0xa2e6cc7373d173bfULL, 0x5a24821212481290ULL,
+	0x5d807a40401d403aULL, 0x2810480808200840ULL, 0xe89b95c3c32bc356ULL,
+	0x7bc5dfecec97ec33ULL, 0x90ab4ddbdb4bdb96ULL, 0x1f5fc0a1a1bea161ULL,
+	0x8307918d8d0e8d1cULL, 0xc97ac83d3df43df5ULL, 0xf1335b97976697ccULL,
+	0x0000000000000000ULL, 0xd483f9cfcf1bcf36ULL, 0x87566e2b2bac2b45ULL,
+	0xb3ece17676c57697ULL, 0xb019e68282328264ULL, 0xa9b128d6d67fd6feULL,
+	0x7736c31b1b6c1bd8ULL, 0x5b7774b5b5eeb5c1ULL, 0x2943beafaf86af11ULL,
+	0xdfd41d6a6ab56a77ULL, 0x0da0ea50505d50baULL, 0x4c8a574545094512ULL,
+	0x18fb38f3f3ebf3cbULL, 0xf060ad3030c0309dULL, 0x74c3c4efef9bef2bULL,
+	0xc37eda3f3ffc3fe5ULL, 0x1caac75555495592ULL, 0x1059dba2a2b2a279ULL,
+	0x65c9e9eaea8fea03ULL, 0xecca6a656589650fULL, 0x686903babad2bab9ULL,
+	0x935e4a2f2fbc2f65ULL, 0xe79d8ec0c027c04eULL, 0x81a160dede5fdebeULL,
+	0x6c38fc1c1c701ce0ULL, 0x2ee746fdfdd3fdbbULL, 0x649a1f4d4d294d52ULL,
+	0xe0397692927292e4ULL, 0xbceafa7575c9758fULL, 0x1e0c360606180630ULL,
+	0x9809ae8a8a128a24ULL, 0x40794bb2b2f2b2f9ULL, 0x59d185e6e6bfe663ULL,
+	0x361c7e0e0e380e70ULL, 0x633ee71f1f7c1ff8ULL, 0xf7c4556262956237ULL,
+	0xa3b53ad4d477d4eeULL, 0x324d81a8a89aa829ULL, 0xf4315296966296c4ULL,
+	0x3aef62f9f9c3f99bULL, 0xf697a3c5c533c566ULL, 0xb14a102525942535ULL,
+	0x20b2ab59597959f2ULL, 0xae15d084842a8454ULL, 0xa7e4c57272d572b7ULL,
+	0xdd72ec3939e439d5ULL, 0x6198164c4c2d4c5aULL, 0x3bbc945e5e655ecaULL,
+	0x85f09f7878fd78e7ULL, 0xd870e53838e038ddULL, 0x8605988c8c0a8c14ULL,
+	0xb2bf17d1d163d1c6ULL, 0x0b57e4a5a5aea541ULL, 0x4dd9a1e2e2afe243ULL,
+	0xf8c24e616199612fULL, 0x457b42b3b3f6b3f1ULL, 0xa542342121842115ULL,
+	0xd625089c9c4a9c94ULL, 0x663cee1e1e781ef0ULL, 0x5286614343114322ULL,
+	0xfc93b1c7c73bc776ULL, 0x2be54ffcfcd7fcb3ULL, 0x1408240404100420ULL,
+	0x08a2e351515951b2ULL, 0xc72f2599995e99bcULL, 0xc4da226d6da96d4fULL,
+	0x391a650d0d340d68ULL, 0x35e979fafacffa83ULL, 0x84a369dfdf5bdfb6ULL,
+	0x9bfca97e7ee57ed7ULL, 0xb44819242490243dULL, 0xd776fe3b3bec3bc5ULL,
+	0x3d4b9aabab96ab31ULL, 0xd181f0cece1fce3eULL, 0x5522991111441188ULL,
+	0x8903838f8f068f0cULL, 0x6b9c044e4e254e4aULL, 0x517366b7b7e6b7d1ULL,
+	0x60cbe0ebeb8beb0bULL, 0xcc78c13c3cf03cfdULL, 0xbf1ffd81813e817cULL,
+	0xfe354094946a94d4ULL, 0x0cf31cf7f7fbf7ebULL, 0x676f18b9b9deb9a1ULL,
+	0x5f268b13134c1398ULL, 0x9c58512c2cb02c7dULL, 0xb8bb05d3d36bd3d6ULL,
+	0x5cd38ce7e7bbe76bULL, 0xcbdc396e6ea56e57ULL, 0xf395aac4c437c46eULL,
+	0x0f061b03030c0318ULL, 0x13acdc565645568aULL, 0x49885e44440d441aULL,
+	0x9efea07f7fe17fdfULL, 0x374f88a9a99ea921ULL, 0x8254672a2aa82a4dULL,
+	0x6d6b0abbbbd6bbb1ULL, 0xe29f87c1c123c146ULL, 0x02a6f153535153a2ULL,
+	0x8ba572dcdc57dcaeULL, 0x2716530b0b2c0b58ULL, 0xd327019d9d4e9d9cULL,
+	0xc1d82b6c6cad6c47ULL, 0xf562a43131c43195ULL, 0xb9e8f37474cd7487ULL,
+	0x09f115f6f6fff6e3ULL, 0x438c4c464605460aULL, 0x2645a5acac8aac09ULL,
+	0x970fb589891e893cULL, 0x4428b414145014a0ULL, 0x42dfbae1e1a3e15bULL,
+	0x4e2ca616165816b0ULL, 0xd274f73a3ae83acdULL, 0xd0d2066969b9696fULL,
+	0x2d12410909240948ULL, 0xade0d77070dd70a7ULL, 0x54716fb6b6e2b6d9ULL,
+	0xb7bd1ed0d067d0ceULL, 0x7ec7d6eded93ed3bULL, 0xdb85e2cccc17cc2eULL,
+	0x578468424215422aULL, 0xc22d2c98985a98b4ULL, 0x0e55eda4a4aaa449ULL,
+	0x8850752828a0285dULL, 0x31b8865c5c6d5cdaULL, 0x3fed6bf8f8c7f893ULL,
+	0xa411c28686228644ULL,
+};
+
+static const u64 C4[256] = {
+	0xc07830d818186018ULL, 0x05af462623238c23ULL, 0x7ef991b8c6c63fc6ULL,
+	0x136fcdfbe8e887e8ULL, 0x4ca113cb87872687ULL, 0xa9626d11b8b8dab8ULL,
+	0x0805020901010401ULL, 0x426e9e0d4f4f214fULL, 0xadee6c9b3636d836ULL,
+	0x590451ffa6a6a2a6ULL, 0xdebdb90cd2d26fd2ULL, 0xfb06f70ef5f5f3f5ULL,
+	0xef80f2967979f979ULL, 0x5fcede306f6fa16fULL, 0xfcef3f6d91917e91ULL,
+	0xaa07a4f852525552ULL, 0x27fdc04760609d60ULL, 0x89766535bcbccabcULL,
+	0xaccd2b379b9b569bULL, 0x048c018a8e8e028eULL, 0x71155bd2a3a3b6a3ULL,
+	0x603c186c0c0c300cULL, 0xff8af6847b7bf17bULL, 0xb5e16a803535d435ULL,
+	0xe8693af51d1d741dULL, 0x5347ddb3e0e0a7e0ULL, 0xf6acb321d7d77bd7ULL,
+	0x5eed999cc2c22fc2ULL, 0x6d965c432e2eb82eULL, 0x627a96294b4b314bULL,
+	0xa321e15dfefedffeULL, 0x8216aed557574157ULL, 0xa8412abd15155415ULL,
+	0x9fb6eee87777c177ULL, 0xa5eb6e923737dc37ULL, 0x7b56d79ee5e5b3e5ULL,
+	0x8cd923139f9f469fULL, 0xd317fd23f0f0e7f0ULL, 0x6a7f94204a4a354aULL,
+	0x9e95a944dada4fdaULL, 0xfa25b0a258587d58ULL, 0x06ca8fcfc9c903c9ULL,
+	0x558d527c2929a429ULL, 0x5022145a0a0a280aULL, 0xe14f7f50b1b1feb1ULL,
+	0x691a5dc9a0a0baa0ULL, 0x7fdad6146b6bb16bULL, 0x5cab17d985852e85ULL,
+	0x8173673cbdbdcebdULL, 0xd234ba8f5d5d695dULL, 0x8050209010104010ULL,
+	0xf303f507f4f4f7f4ULL, 0x16c08bddcbcb0bcbULL, 0xedc67cd33e3ef83eULL,
+	0x28110a2d05051405ULL, 0x1fe6ce7867678167ULL, 0x7353d597e4e4b7e4ULL,
+	0x25bb4e0227279c27ULL, 0x3258827341411941ULL, 0x2c9d0ba78b8b168bULL,
+	0x510153f6a7a7a6a7ULL, 0xcf94fab27d7de97dULL, 0xdcfb374995956e95ULL,
+	0x8e9fad56d8d847d8ULL, 0x8b30eb70fbfbcbfbULL, 0x2371c1cdeeee9feeULL,
+	0xc791f8bb7c7ced7cULL, 0x17e3cc7166668566ULL, 0xa68ea77bdddd53ddULL,
+	0xb84b2eaf17175c17ULL, 0x02468e4547470147ULL, 0x84dc211a9e9e429eULL,
+	0x1ec589d4caca0fcaULL, 0x75995a582d2db42dULL, 0x9179632ebfbfc6bfULL,
+	0x381b0e3f07071c07ULL, 0x012347acadad8eadULL, 0xea2fb4b05a5a755aULL,
+	0x6cb51bef83833683ULL, 0x85ff66b63333cc33ULL, 0x3ff2c65c63639163ULL,
+	0x100a041202020802ULL, 0x39384993aaaa92aaULL, 0xafa8e2de7171d971ULL,
+	0x0ecf8dc6c8c807c8ULL, 0xc87d32d119196419ULL, 0x7270923b49493949ULL,
+	0x869aaf5fd9d943d9ULL, 0xc31df931f2f2eff2ULL, 0x4b48dba8e3e3abe3ULL,
+	0xe22ab6b95b5b715bULL, 0x34920dbc88881a88ULL, 0xa4c8293e9a9a529aULL,
+	0x2dbe4c0b26269826ULL, 0x8dfa64bf3232c832ULL, 0xe94a7d59b0b0fab0ULL,
+	0x1b6acff2e9e983e9ULL, 0x78331e770f0f3c0fULL, 0xe6a6b733d5d573d5ULL,
+	0x74ba1df480803a80ULL, 0x997c6127bebec2beULL, 0x26de87ebcdcd13cdULL,
+	0xbde468893434d034ULL, 0x7a75903248483d48ULL, 0xab24e354ffffdbffULL,
+	0xf78ff48d7a7af57aULL, 0xf4ea3d6490907a90ULL, 0xc23ebe9d5f5f615fULL,
+	0x1da0403d20208020ULL, 0x67d5d00f6868bd68ULL, 0xd07234ca1a1a681aULL,
+	0x192c41b7aeae82aeULL, 0xc95e757db4b4eab4ULL, 0x9a19a8ce54544d54ULL,
+	0xece53b7f93937693ULL, 0x0daa442f22228822ULL, 0x07e9c86364648d64ULL,
+	0xdb12ff2af1f1e3f1ULL, 0xbfa2e6cc7373d173ULL, 0x905a248212124812ULL,
+	0x3a5d807a40401d40ULL, 0x4028104808082008ULL, 0x56e89b95c3c32bc3ULL,
+	0x337bc5dfecec97ecULL, 0x9690ab4ddbdb4bdbULL, 0x611f5fc0a1a1bea1ULL,
+	0x1c8307918d8d0e8dULL, 0xf5c97ac83d3df43dULL, 0xccf1335b97976697ULL,
+	0x0000000000000000ULL, 0x36d483f9cfcf1bcfULL, 0x4587566e2b2bac2bULL,
+	0x97b3ece17676c576ULL, 0x64b019e682823282ULL, 0xfea9b128d6d67fd6ULL,
+	0xd87736c31b1b6c1bULL, 0xc15b7774b5b5eeb5ULL, 0x112943beafaf86afULL,
+	0x77dfd41d6a6ab56aULL, 0xba0da0ea50505d50ULL, 0x124c8a5745450945ULL,
+	0xcb18fb38f3f3ebf3ULL, 0x9df060ad3030c030ULL, 0x2b74c3c4efef9befULL,
+	0xe5c37eda3f3ffc3fULL, 0x921caac755554955ULL, 0x791059dba2a2b2a2ULL,
+	0x0365c9e9eaea8feaULL, 0x0fecca6a65658965ULL, 0xb9686903babad2baULL,
+	0x65935e4a2f2fbc2fULL, 0x4ee79d8ec0c027c0ULL, 0xbe81a160dede5fdeULL,
+	0xe06c38fc1c1c701cULL, 0xbb2ee746fdfdd3fdULL, 0x52649a1f4d4d294dULL,
+	0xe4e0397692927292ULL, 0x8fbceafa7575c975ULL, 0x301e0c3606061806ULL,
+	0x249809ae8a8a128aULL, 0xf940794bb2b2f2b2ULL, 0x6359d185e6e6bfe6ULL,
+	0x70361c7e0e0e380eULL, 0xf8633ee71f1f7c1fULL, 0x37f7c45562629562ULL,
+	0xeea3b53ad4d477d4ULL, 0x29324d81a8a89aa8ULL, 0xc4f4315296966296ULL,
+	0x9b3aef62f9f9c3f9ULL, 0x66f697a3c5c533c5ULL, 0x35b14a1025259425ULL,
+	0xf220b2ab59597959ULL, 0x54ae15d084842a84ULL, 0xb7a7e4c57272d572ULL,
+	0xd5dd72ec3939e439ULL, 0x5a6198164c4c2d4cULL, 0xca3bbc945e5e655eULL,
+	0xe785f09f7878fd78ULL, 0xddd870e53838e038ULL, 0x148605988c8c0a8cULL,
+	0xc6b2bf17d1d163d1ULL, 0x410b57e4a5a5aea5ULL, 0x434dd9a1e2e2afe2ULL,
+	0x2ff8c24e61619961ULL, 0xf1457b42b3b3f6b3ULL, 0x15a5423421218421ULL,
+	0x94d625089c9c4a9cULL, 0xf0663cee1e1e781eULL, 0x2252866143431143ULL,
+	0x76fc93b1c7c73bc7ULL, 0xb32be54ffcfcd7fcULL, 0x2014082404041004ULL,
+	0xb208a2e351515951ULL, 0xbcc72f2599995e99ULL, 0x4fc4da226d6da96dULL,
+	0x68391a650d0d340dULL, 0x8335e979fafacffaULL, 0xb684a369dfdf5bdfULL,
+	0xd79bfca97e7ee57eULL, 0x3db4481924249024ULL, 0xc5d776fe3b3bec3bULL,
+	0x313d4b9aabab96abULL, 0x3ed181f0cece1fceULL, 0x8855229911114411ULL,
+	0x0c8903838f8f068fULL, 0x4a6b9c044e4e254eULL, 0xd1517366b7b7e6b7ULL,
+	0x0b60cbe0ebeb8bebULL, 0xfdcc78c13c3cf03cULL, 0x7cbf1ffd81813e81ULL,
+	0xd4fe354094946a94ULL, 0xeb0cf31cf7f7fbf7ULL, 0xa1676f18b9b9deb9ULL,
+	0x985f268b13134c13ULL, 0x7d9c58512c2cb02cULL, 0xd6b8bb05d3d36bd3ULL,
+	0x6b5cd38ce7e7bbe7ULL, 0x57cbdc396e6ea56eULL, 0x6ef395aac4c437c4ULL,
+	0x180f061b03030c03ULL, 0x8a13acdc56564556ULL, 0x1a49885e44440d44ULL,
+	0xdf9efea07f7fe17fULL, 0x21374f88a9a99ea9ULL, 0x4d8254672a2aa82aULL,
+	0xb16d6b0abbbbd6bbULL, 0x46e29f87c1c123c1ULL, 0xa202a6f153535153ULL,
+	0xae8ba572dcdc57dcULL, 0x582716530b0b2c0bULL, 0x9cd327019d9d4e9dULL,
+	0x47c1d82b6c6cad6cULL, 0x95f562a43131c431ULL, 0x87b9e8f37474cd74ULL,
+	0xe309f115f6f6fff6ULL, 0x0a438c4c46460546ULL, 0x092645a5acac8aacULL,
+	0x3c970fb589891e89ULL, 0xa04428b414145014ULL, 0x5b42dfbae1e1a3e1ULL,
+	0xb04e2ca616165816ULL, 0xcdd274f73a3ae83aULL, 0x6fd0d2066969b969ULL,
+	0x482d124109092409ULL, 0xa7ade0d77070dd70ULL, 0xd954716fb6b6e2b6ULL,
+	0xceb7bd1ed0d067d0ULL, 0x3b7ec7d6eded93edULL, 0x2edb85e2cccc17ccULL,
+	0x2a57846842421542ULL, 0xb4c22d2c98985a98ULL, 0x490e55eda4a4aaa4ULL,
+	0x5d8850752828a028ULL, 0xda31b8865c5c6d5cULL, 0x933fed6bf8f8c7f8ULL,
+	0x44a411c286862286ULL,
+};
+
+static const u64 C5[256] = {
+	0x18c07830d8181860ULL, 0x2305af462623238cULL, 0xc67ef991b8c6c63fULL,
+	0xe8136fcdfbe8e887ULL, 0x874ca113cb878726ULL, 0xb8a9626d11b8b8daULL,
+	0x0108050209010104ULL, 0x4f426e9e0d4f4f21ULL, 0x36adee6c9b3636d8ULL,
+	0xa6590451ffa6a6a2ULL, 0xd2debdb90cd2d26fULL, 0xf5fb06f70ef5f5f3ULL,
+	0x79ef80f2967979f9ULL, 0x6f5fcede306f6fa1ULL, 0x91fcef3f6d91917eULL,
+	0x52aa07a4f8525255ULL, 0x6027fdc04760609dULL, 0xbc89766535bcbccaULL,
+	0x9baccd2b379b9b56ULL, 0x8e048c018a8e8e02ULL, 0xa371155bd2a3a3b6ULL,
+	0x0c603c186c0c0c30ULL, 0x7bff8af6847b7bf1ULL, 0x35b5e16a803535d4ULL,
+	0x1de8693af51d1d74ULL, 0xe05347ddb3e0e0a7ULL, 0xd7f6acb321d7d77bULL,
+	0xc25eed999cc2c22fULL, 0x2e6d965c432e2eb8ULL, 0x4b627a96294b4b31ULL,
+	0xfea321e15dfefedfULL, 0x578216aed5575741ULL, 0x15a8412abd151554ULL,
+	0x779fb6eee87777c1ULL, 0x37a5eb6e923737dcULL, 0xe57b56d79ee5e5b3ULL,
+	0x9f8cd923139f9f46ULL, 0xf0d317fd23f0f0e7ULL, 0x4a6a7f94204a4a35ULL,
+	0xda9e95a944dada4fULL, 0x58fa25b0a258587dULL, 0xc906ca8fcfc9c903ULL,
+	0x29558d527c2929a4ULL, 0x0a5022145a0a0a28ULL, 0xb1e14f7f50b1b1feULL,
+	0xa0691a5dc9a0a0baULL, 0x6b7fdad6146b6bb1ULL, 0x855cab17d985852eULL,
+	0xbd8173673cbdbdceULL, 0x5dd234ba8f5d5d69ULL, 0x1080502090101040ULL,
+	0xf4f303f507f4f4f7ULL, 0xcb16c08bddcbcb0bULL, 0x3eedc67cd33e3ef8ULL,
+	0x0528110a2d050514ULL, 0x671fe6ce78676781ULL, 0xe47353d597e4e4b7ULL,
+	0x2725bb4e0227279cULL, 0x4132588273414119ULL, 0x8b2c9d0ba78b8b16ULL,
+	0xa7510153f6a7a7a6ULL, 0x7dcf94fab27d7de9ULL, 0x95dcfb374995956eULL,
+	0xd88e9fad56d8d847ULL, 0xfb8b30eb70fbfbcbULL, 0xee2371c1cdeeee9fULL,
+	0x7cc791f8bb7c7cedULL, 0x6617e3cc71666685ULL, 0xdda68ea77bdddd53ULL,
+	0x17b84b2eaf17175cULL, 0x4702468e45474701ULL, 0x9e84dc211a9e9e42ULL,
+	0xca1ec589d4caca0fULL, 0x2d75995a582d2db4ULL, 0xbf9179632ebfbfc6ULL,
+	0x07381b0e3f07071cULL, 0xad012347acadad8eULL, 0x5aea2fb4b05a5a75ULL,
+	0x836cb51bef838336ULL, 0x3385ff66b63333ccULL, 0x633ff2c65c636391ULL,
+	0x02100a0412020208ULL, 0xaa39384993aaaa92ULL, 0x71afa8e2de7171d9ULL,
+	0xc80ecf8dc6c8c807ULL, 0x19c87d32d1191964ULL, 0x497270923b494939ULL,
+	0xd9869aaf5fd9d943ULL, 0xf2c31df931f2f2efULL, 0xe34b48dba8e3e3abULL,
+	0x5be22ab6b95b5b71ULL, 0x8834920dbc88881aULL, 0x9aa4c8293e9a9a52ULL,
+	0x262dbe4c0b262698ULL, 0x328dfa64bf3232c8ULL, 0xb0e94a7d59b0b0faULL,
+	0xe91b6acff2e9e983ULL, 0x0f78331e770f0f3cULL, 0xd5e6a6b733d5d573ULL,
+	0x8074ba1df480803aULL, 0xbe997c6127bebec2ULL, 0xcd26de87ebcdcd13ULL,
+	0x34bde468893434d0ULL, 0x487a75903248483dULL, 0xffab24e354ffffdbULL,
+	0x7af78ff48d7a7af5ULL, 0x90f4ea3d6490907aULL, 0x5fc23ebe9d5f5f61ULL,
+	0x201da0403d202080ULL, 0x6867d5d00f6868bdULL, 0x1ad07234ca1a1a68ULL,
+	0xae192c41b7aeae82ULL, 0xb4c95e757db4b4eaULL, 0x549a19a8ce54544dULL,
+	0x93ece53b7f939376ULL, 0x220daa442f222288ULL, 0x6407e9c86364648dULL,
+	0xf1db12ff2af1f1e3ULL, 0x73bfa2e6cc7373d1ULL, 0x12905a2482121248ULL,
+	0x403a5d807a40401dULL, 0x0840281048080820ULL, 0xc356e89b95c3c32bULL,
+	0xec337bc5dfecec97ULL, 0xdb9690ab4ddbdb4bULL, 0xa1611f5fc0a1a1beULL,
+	0x8d1c8307918d8d0eULL, 0x3df5c97ac83d3df4ULL, 0x97ccf1335b979766ULL,
+	0x0000000000000000ULL, 0xcf36d483f9cfcf1bULL, 0x2b4587566e2b2bacULL,
+	0x7697b3ece17676c5ULL, 0x8264b019e6828232ULL, 0xd6fea9b128d6d67fULL,
+	0x1bd87736c31b1b6cULL, 0xb5c15b7774b5b5eeULL, 0xaf112943beafaf86ULL,
+	0x6a77dfd41d6a6ab5ULL, 0x50ba0da0ea50505dULL, 0x45124c8a57454509ULL,
+	0xf3cb18fb38f3f3ebULL, 0x309df060ad3030c0ULL, 0xef2b74c3c4efef9bULL,
+	0x3fe5c37eda3f3ffcULL, 0x55921caac7555549ULL, 0xa2791059dba2a2b2ULL,
+	0xea0365c9e9eaea8fULL, 0x650fecca6a656589ULL, 0xbab9686903babad2ULL,
+	0x2f65935e4a2f2fbcULL, 0xc04ee79d8ec0c027ULL, 0xdebe81a160dede5fULL,
+	0x1ce06c38fc1c1c70ULL, 0xfdbb2ee746fdfdd3ULL, 0x4d52649a1f4d4d29ULL,
+	0x92e4e03976929272ULL, 0x758fbceafa7575c9ULL, 0x06301e0c36060618ULL,
+	0x8a249809ae8a8a12ULL, 0xb2f940794bb2b2f2ULL, 0xe66359d185e6e6bfULL,
+	0x0e70361c7e0e0e38ULL, 0x1ff8633ee71f1f7cULL, 0x6237f7c455626295ULL,
+	0xd4eea3b53ad4d477ULL, 0xa829324d81a8a89aULL, 0x96c4f43152969662ULL,
+	0xf99b3aef62f9f9c3ULL, 0xc566f697a3c5c533ULL, 0x2535b14a10252594ULL,
+	0x59f220b2ab595979ULL, 0x8454ae15d084842aULL, 0x72b7a7e4c57272d5ULL,
+	0x39d5dd72ec3939e4ULL, 0x4c5a6198164c4c2dULL, 0x5eca3bbc945e5e65ULL,
+	0x78e785f09f7878fdULL, 0x38ddd870e53838e0ULL, 0x8c148605988c8c0aULL,
+	0xd1c6b2bf17d1d163ULL, 0xa5410b57e4a5a5aeULL, 0xe2434dd9a1e2e2afULL,
+	0x612ff8c24e616199ULL, 0xb3f1457b42b3b3f6ULL, 0x2115a54234212184ULL,
+	0x9c94d625089c9c4aULL, 0x1ef0663cee1e1e78ULL, 0x4322528661434311ULL,
+	0xc776fc93b1c7c73bULL, 0xfcb32be54ffcfcd7ULL, 0x0420140824040410ULL,
+	0x51b208a2e3515159ULL, 0x99bcc72f2599995eULL, 0x6d4fc4da226d6da9ULL,
+	0x0d68391a650d0d34ULL, 0xfa8335e979fafacfULL, 0xdfb684a369dfdf5bULL,
+	0x7ed79bfca97e7ee5ULL, 0x243db44819242490ULL, 0x3bc5d776fe3b3becULL,
+	0xab313d4b9aabab96ULL, 0xce3ed181f0cece1fULL, 0x1188552299111144ULL,
+	0x8f0c8903838f8f06ULL, 0x4e4a6b9c044e4e25ULL, 0xb7d1517366b7b7e6ULL,
+	0xeb0b60cbe0ebeb8bULL, 0x3cfdcc78c13c3cf0ULL, 0x817cbf1ffd81813eULL,
+	0x94d4fe354094946aULL, 0xf7eb0cf31cf7f7fbULL, 0xb9a1676f18b9b9deULL,
+	0x13985f268b13134cULL, 0x2c7d9c58512c2cb0ULL, 0xd3d6b8bb05d3d36bULL,
+	0xe76b5cd38ce7e7bbULL, 0x6e57cbdc396e6ea5ULL, 0xc46ef395aac4c437ULL,
+	0x03180f061b03030cULL, 0x568a13acdc565645ULL, 0x441a49885e44440dULL,
+	0x7fdf9efea07f7fe1ULL, 0xa921374f88a9a99eULL, 0x2a4d8254672a2aa8ULL,
+	0xbbb16d6b0abbbbd6ULL, 0xc146e29f87c1c123ULL, 0x53a202a6f1535351ULL,
+	0xdcae8ba572dcdc57ULL, 0x0b582716530b0b2cULL, 0x9d9cd327019d9d4eULL,
+	0x6c47c1d82b6c6cadULL, 0x3195f562a43131c4ULL, 0x7487b9e8f37474cdULL,
+	0xf6e309f115f6f6ffULL, 0x460a438c4c464605ULL, 0xac092645a5acac8aULL,
+	0x893c970fb589891eULL, 0x14a04428b4141450ULL, 0xe15b42dfbae1e1a3ULL,
+	0x16b04e2ca6161658ULL, 0x3acdd274f73a3ae8ULL, 0x696fd0d2066969b9ULL,
+	0x09482d1241090924ULL, 0x70a7ade0d77070ddULL, 0xb6d954716fb6b6e2ULL,
+	0xd0ceb7bd1ed0d067ULL, 0xed3b7ec7d6eded93ULL, 0xcc2edb85e2cccc17ULL,
+	0x422a578468424215ULL, 0x98b4c22d2c98985aULL, 0xa4490e55eda4a4aaULL,
+	0x285d8850752828a0ULL, 0x5cda31b8865c5c6dULL, 0xf8933fed6bf8f8c7ULL,
+	0x8644a411c2868622ULL,
+};
+
+static const u64 C6[256] = {
+	0x6018c07830d81818ULL, 0x8c2305af46262323ULL, 0x3fc67ef991b8c6c6ULL,
+	0x87e8136fcdfbe8e8ULL, 0x26874ca113cb8787ULL, 0xdab8a9626d11b8b8ULL,
+	0x0401080502090101ULL, 0x214f426e9e0d4f4fULL, 0xd836adee6c9b3636ULL,
+	0xa2a6590451ffa6a6ULL, 0x6fd2debdb90cd2d2ULL, 0xf3f5fb06f70ef5f5ULL,
+	0xf979ef80f2967979ULL, 0xa16f5fcede306f6fULL, 0x7e91fcef3f6d9191ULL,
+	0x5552aa07a4f85252ULL, 0x9d6027fdc0476060ULL, 0xcabc89766535bcbcULL,
+	0x569baccd2b379b9bULL, 0x028e048c018a8e8eULL, 0xb6a371155bd2a3a3ULL,
+	0x300c603c186c0c0cULL, 0xf17bff8af6847b7bULL, 0xd435b5e16a803535ULL,
+	0x741de8693af51d1dULL, 0xa7e05347ddb3e0e0ULL, 0x7bd7f6acb321d7d7ULL,
+	0x2fc25eed999cc2c2ULL, 0xb82e6d965c432e2eULL, 0x314b627a96294b4bULL,
+	0xdffea321e15dfefeULL, 0x41578216aed55757ULL, 0x5415a8412abd1515ULL,
+	0xc1779fb6eee87777ULL, 0xdc37a5eb6e923737ULL, 0xb3e57b56d79ee5e5ULL,
+	0x469f8cd923139f9fULL, 0xe7f0d317fd23f0f0ULL, 0x354a6a7f94204a4aULL,
+	0x4fda9e95a944dadaULL, 0x7d58fa25b0a25858ULL, 0x03c906ca8fcfc9c9ULL,
+	0xa429558d527c2929ULL, 0x280a5022145a0a0aULL, 0xfeb1e14f7f50b1b1ULL,
+	0xbaa0691a5dc9a0a0ULL, 0xb16b7fdad6146b6bULL, 0x2e855cab17d98585ULL,
+	0xcebd8173673cbdbdULL, 0x695dd234ba8f5d5dULL, 0x4010805020901010ULL,
+	0xf7f4f303f507f4f4ULL, 0x0bcb16c08bddcbcbULL, 0xf83eedc67cd33e3eULL,
+	0x140528110a2d0505ULL, 0x81671fe6ce786767ULL, 0xb7e47353d597e4e4ULL,
+	0x9c2725bb4e022727ULL, 0x1941325882734141ULL, 0x168b2c9d0ba78b8bULL,
+	0xa6a7510153f6a7a7ULL, 0xe97dcf94fab27d7dULL, 0x6e95dcfb37499595ULL,
+	0x47d88e9fad56d8d8ULL, 0xcbfb8b30eb70fbfbULL, 0x9fee2371c1cdeeeeULL,
+	0xed7cc791f8bb7c7cULL, 0x856617e3cc716666ULL, 0x53dda68ea77bddddULL,
+	0x5c17b84b2eaf1717ULL, 0x014702468e454747ULL, 0x429e84dc211a9e9eULL,
+	0x0fca1ec589d4cacaULL, 0xb42d75995a582d2dULL, 0xc6bf9179632ebfbfULL,
+	0x1c07381b0e3f0707ULL, 0x8ead012347acadadULL, 0x755aea2fb4b05a5aULL,
+	0x36836cb51bef8383ULL, 0xcc3385ff66b63333ULL, 0x91633ff2c65c6363ULL,
+	0x0802100a04120202ULL, 0x92aa39384993aaaaULL, 0xd971afa8e2de7171ULL,
+	0x07c80ecf8dc6c8c8ULL, 0x6419c87d32d11919ULL, 0x39497270923b4949ULL,
+	0x43d9869aaf5fd9d9ULL, 0xeff2c31df931f2f2ULL, 0xabe34b48dba8e3e3ULL,
+	0x715be22ab6b95b5bULL, 0x1a8834920dbc8888ULL, 0x529aa4c8293e9a9aULL,
+	0x98262dbe4c0b2626ULL, 0xc8328dfa64bf3232ULL, 0xfab0e94a7d59b0b0ULL,
+	0x83e91b6acff2e9e9ULL, 0x3c0f78331e770f0fULL, 0x73d5e6a6b733d5d5ULL,
+	0x3a8074ba1df48080ULL, 0xc2be997c6127bebeULL, 0x13cd26de87ebcdcdULL,
+	0xd034bde468893434ULL, 0x3d487a7590324848ULL, 0xdbffab24e354ffffULL,
+	0xf57af78ff48d7a7aULL, 0x7a90f4ea3d649090ULL, 0x615fc23ebe9d5f5fULL,
+	0x80201da0403d2020ULL, 0xbd6867d5d00f6868ULL, 0x681ad07234ca1a1aULL,
+	0x82ae192c41b7aeaeULL, 0xeab4c95e757db4b4ULL, 0x4d549a19a8ce5454ULL,
+	0x7693ece53b7f9393ULL, 0x88220daa442f2222ULL, 0x8d6407e9c8636464ULL,
+	0xe3f1db12ff2af1f1ULL, 0xd173bfa2e6cc7373ULL, 0x4812905a24821212ULL,
+	0x1d403a5d807a4040ULL, 0x2008402810480808ULL, 0x2bc356e89b95c3c3ULL,
+	0x97ec337bc5dfececULL, 0x4bdb9690ab4ddbdbULL, 0xbea1611f5fc0a1a1ULL,
+	0x0e8d1c8307918d8dULL, 0xf43df5c97ac83d3dULL, 0x6697ccf1335b9797ULL,
+	0x0000000000000000ULL, 0x1bcf36d483f9cfcfULL, 0xac2b4587566e2b2bULL,
+	0xc57697b3ece17676ULL, 0x328264b019e68282ULL, 0x7fd6fea9b128d6d6ULL,
+	0x6c1bd87736c31b1bULL, 0xeeb5c15b7774b5b5ULL, 0x86af112943beafafULL,
+	0xb56a77dfd41d6a6aULL, 0x5d50ba0da0ea5050ULL, 0x0945124c8a574545ULL,
+	0xebf3cb18fb38f3f3ULL, 0xc0309df060ad3030ULL, 0x9bef2b74c3c4efefULL,
+	0xfc3fe5c37eda3f3fULL, 0x4955921caac75555ULL, 0xb2a2791059dba2a2ULL,
+	0x8fea0365c9e9eaeaULL, 0x89650fecca6a6565ULL, 0xd2bab9686903babaULL,
+	0xbc2f65935e4a2f2fULL, 0x27c04ee79d8ec0c0ULL, 0x5fdebe81a160dedeULL,
+	0x701ce06c38fc1c1cULL, 0xd3fdbb2ee746fdfdULL, 0x294d52649a1f4d4dULL,
+	0x7292e4e039769292ULL, 0xc9758fbceafa7575ULL, 0x1806301e0c360606ULL,
+	0x128a249809ae8a8aULL, 0xf2b2f940794bb2b2ULL, 0xbfe66359d185e6e6ULL,
+	0x380e70361c7e0e0eULL, 0x7c1ff8633ee71f1fULL, 0x956237f7c4556262ULL,
+	0x77d4eea3b53ad4d4ULL, 0x9aa829324d81a8a8ULL, 0x6296c4f431529696ULL,
+	0xc3f99b3aef62f9f9ULL, 0x33c566f697a3c5c5ULL, 0x942535b14a102525ULL,
+	0x7959f220b2ab5959ULL, 0x2a8454ae15d08484ULL, 0xd572b7a7e4c57272ULL,
+	0xe439d5dd72ec3939ULL, 0x2d4c5a6198164c4cULL, 0x655eca3bbc945e5eULL,
+	0xfd78e785f09f7878ULL, 0xe038ddd870e53838ULL, 0x0a8c148605988c8cULL,
+	0x63d1c6b2bf17d1d1ULL, 0xaea5410b57e4a5a5ULL, 0xafe2434dd9a1e2e2ULL,
+	0x99612ff8c24e6161ULL, 0xf6b3f1457b42b3b3ULL, 0x842115a542342121ULL,
+	0x4a9c94d625089c9cULL, 0x781ef0663cee1e1eULL, 0x1143225286614343ULL,
+	0x3bc776fc93b1c7c7ULL, 0xd7fcb32be54ffcfcULL, 0x1004201408240404ULL,
+	0x5951b208a2e35151ULL, 0x5e99bcc72f259999ULL, 0xa96d4fc4da226d6dULL,
+	0x340d68391a650d0dULL, 0xcffa8335e979fafaULL, 0x5bdfb684a369dfdfULL,
+	0xe57ed79bfca97e7eULL, 0x90243db448192424ULL, 0xec3bc5d776fe3b3bULL,
+	0x96ab313d4b9aababULL, 0x1fce3ed181f0ceceULL, 0x4411885522991111ULL,
+	0x068f0c8903838f8fULL, 0x254e4a6b9c044e4eULL, 0xe6b7d1517366b7b7ULL,
+	0x8beb0b60cbe0ebebULL, 0xf03cfdcc78c13c3cULL, 0x3e817cbf1ffd8181ULL,
+	0x6a94d4fe35409494ULL, 0xfbf7eb0cf31cf7f7ULL, 0xdeb9a1676f18b9b9ULL,
+	0x4c13985f268b1313ULL, 0xb02c7d9c58512c2cULL, 0x6bd3d6b8bb05d3d3ULL,
+	0xbbe76b5cd38ce7e7ULL, 0xa56e57cbdc396e6eULL, 0x37c46ef395aac4c4ULL,
+	0x0c03180f061b0303ULL, 0x45568a13acdc5656ULL, 0x0d441a49885e4444ULL,
+	0xe17fdf9efea07f7fULL, 0x9ea921374f88a9a9ULL, 0xa82a4d8254672a2aULL,
+	0xd6bbb16d6b0abbbbULL, 0x23c146e29f87c1c1ULL, 0x5153a202a6f15353ULL,
+	0x57dcae8ba572dcdcULL, 0x2c0b582716530b0bULL, 0x4e9d9cd327019d9dULL,
+	0xad6c47c1d82b6c6cULL, 0xc43195f562a43131ULL, 0xcd7487b9e8f37474ULL,
+	0xfff6e309f115f6f6ULL, 0x05460a438c4c4646ULL, 0x8aac092645a5acacULL,
+	0x1e893c970fb58989ULL, 0x5014a04428b41414ULL, 0xa3e15b42dfbae1e1ULL,
+	0x5816b04e2ca61616ULL, 0xe83acdd274f73a3aULL, 0xb9696fd0d2066969ULL,
+	0x2409482d12410909ULL, 0xdd70a7ade0d77070ULL, 0xe2b6d954716fb6b6ULL,
+	0x67d0ceb7bd1ed0d0ULL, 0x93ed3b7ec7d6ededULL, 0x17cc2edb85e2ccccULL,
+	0x15422a5784684242ULL, 0x5a98b4c22d2c9898ULL, 0xaaa4490e55eda4a4ULL,
+	0xa0285d8850752828ULL, 0x6d5cda31b8865c5cULL, 0xc7f8933fed6bf8f8ULL,
+	0x228644a411c28686ULL,
+};
+
+static const u64 C7[256] = {
+	0x186018c07830d818ULL, 0x238c2305af462623ULL, 0xc63fc67ef991b8c6ULL,
+	0xe887e8136fcdfbe8ULL, 0x8726874ca113cb87ULL, 0xb8dab8a9626d11b8ULL,
+	0x0104010805020901ULL, 0x4f214f426e9e0d4fULL, 0x36d836adee6c9b36ULL,
+	0xa6a2a6590451ffa6ULL, 0xd26fd2debdb90cd2ULL, 0xf5f3f5fb06f70ef5ULL,
+	0x79f979ef80f29679ULL, 0x6fa16f5fcede306fULL, 0x917e91fcef3f6d91ULL,
+	0x525552aa07a4f852ULL, 0x609d6027fdc04760ULL, 0xbccabc89766535bcULL,
+	0x9b569baccd2b379bULL, 0x8e028e048c018a8eULL, 0xa3b6a371155bd2a3ULL,
+	0x0c300c603c186c0cULL, 0x7bf17bff8af6847bULL, 0x35d435b5e16a8035ULL,
+	0x1d741de8693af51dULL, 0xe0a7e05347ddb3e0ULL, 0xd77bd7f6acb321d7ULL,
+	0xc22fc25eed999cc2ULL, 0x2eb82e6d965c432eULL, 0x4b314b627a96294bULL,
+	0xfedffea321e15dfeULL, 0x5741578216aed557ULL, 0x155415a8412abd15ULL,
+	0x77c1779fb6eee877ULL, 0x37dc37a5eb6e9237ULL, 0xe5b3e57b56d79ee5ULL,
+	0x9f469f8cd923139fULL, 0xf0e7f0d317fd23f0ULL, 0x4a354a6a7f94204aULL,
+	0xda4fda9e95a944daULL, 0x587d58fa25b0a258ULL, 0xc903c906ca8fcfc9ULL,
+	0x29a429558d527c29ULL, 0x0a280a5022145a0aULL, 0xb1feb1e14f7f50b1ULL,
+	0xa0baa0691a5dc9a0ULL, 0x6bb16b7fdad6146bULL, 0x852e855cab17d985ULL,
+	0xbdcebd8173673cbdULL, 0x5d695dd234ba8f5dULL, 0x1040108050209010ULL,
+	0xf4f7f4f303f507f4ULL, 0xcb0bcb16c08bddcbULL, 0x3ef83eedc67cd33eULL,
+	0x05140528110a2d05ULL, 0x6781671fe6ce7867ULL, 0xe4b7e47353d597e4ULL,
+	0x279c2725bb4e0227ULL, 0x4119413258827341ULL, 0x8b168b2c9d0ba78bULL,
+	0xa7a6a7510153f6a7ULL, 0x7de97dcf94fab27dULL, 0x956e95dcfb374995ULL,
+	0xd847d88e9fad56d8ULL, 0xfbcbfb8b30eb70fbULL, 0xee9fee2371c1cdeeULL,
+	0x7ced7cc791f8bb7cULL, 0x66856617e3cc7166ULL, 0xdd53dda68ea77bddULL,
+	0x175c17b84b2eaf17ULL, 0x47014702468e4547ULL, 0x9e429e84dc211a9eULL,
+	0xca0fca1ec589d4caULL, 0x2db42d75995a582dULL, 0xbfc6bf9179632ebfULL,
+	0x071c07381b0e3f07ULL, 0xad8ead012347acadULL, 0x5a755aea2fb4b05aULL,
+	0x8336836cb51bef83ULL, 0x33cc3385ff66b633ULL, 0x6391633ff2c65c63ULL,
+	0x020802100a041202ULL, 0xaa92aa39384993aaULL, 0x71d971afa8e2de71ULL,
+	0xc807c80ecf8dc6c8ULL, 0x196419c87d32d119ULL, 0x4939497270923b49ULL,
+	0xd943d9869aaf5fd9ULL, 0xf2eff2c31df931f2ULL, 0xe3abe34b48dba8e3ULL,
+	0x5b715be22ab6b95bULL, 0x881a8834920dbc88ULL, 0x9a529aa4c8293e9aULL,
+	0x2698262dbe4c0b26ULL, 0x32c8328dfa64bf32ULL, 0xb0fab0e94a7d59b0ULL,
+	0xe983e91b6acff2e9ULL, 0x0f3c0f78331e770fULL, 0xd573d5e6a6b733d5ULL,
+	0x803a8074ba1df480ULL, 0xbec2be997c6127beULL, 0xcd13cd26de87ebcdULL,
+	0x34d034bde4688934ULL, 0x483d487a75903248ULL, 0xffdbffab24e354ffULL,
+	0x7af57af78ff48d7aULL, 0x907a90f4ea3d6490ULL, 0x5f615fc23ebe9d5fULL,
+	0x2080201da0403d20ULL, 0x68bd6867d5d00f68ULL, 0x1a681ad07234ca1aULL,
+	0xae82ae192c41b7aeULL, 0xb4eab4c95e757db4ULL, 0x544d549a19a8ce54ULL,
+	0x937693ece53b7f93ULL, 0x2288220daa442f22ULL, 0x648d6407e9c86364ULL,
+	0xf1e3f1db12ff2af1ULL, 0x73d173bfa2e6cc73ULL, 0x124812905a248212ULL,
+	0x401d403a5d807a40ULL, 0x0820084028104808ULL, 0xc32bc356e89b95c3ULL,
+	0xec97ec337bc5dfecULL, 0xdb4bdb9690ab4ddbULL, 0xa1bea1611f5fc0a1ULL,
+	0x8d0e8d1c8307918dULL, 0x3df43df5c97ac83dULL, 0x976697ccf1335b97ULL,
+	0x0000000000000000ULL, 0xcf1bcf36d483f9cfULL, 0x2bac2b4587566e2bULL,
+	0x76c57697b3ece176ULL, 0x82328264b019e682ULL, 0xd67fd6fea9b128d6ULL,
+	0x1b6c1bd87736c31bULL, 0xb5eeb5c15b7774b5ULL, 0xaf86af112943beafULL,
+	0x6ab56a77dfd41d6aULL, 0x505d50ba0da0ea50ULL, 0x450945124c8a5745ULL,
+	0xf3ebf3cb18fb38f3ULL, 0x30c0309df060ad30ULL, 0xef9bef2b74c3c4efULL,
+	0x3ffc3fe5c37eda3fULL, 0x554955921caac755ULL, 0xa2b2a2791059dba2ULL,
+	0xea8fea0365c9e9eaULL, 0x6589650fecca6a65ULL, 0xbad2bab9686903baULL,
+	0x2fbc2f65935e4a2fULL, 0xc027c04ee79d8ec0ULL, 0xde5fdebe81a160deULL,
+	0x1c701ce06c38fc1cULL, 0xfdd3fdbb2ee746fdULL, 0x4d294d52649a1f4dULL,
+	0x927292e4e0397692ULL, 0x75c9758fbceafa75ULL, 0x061806301e0c3606ULL,
+	0x8a128a249809ae8aULL, 0xb2f2b2f940794bb2ULL, 0xe6bfe66359d185e6ULL,
+	0x0e380e70361c7e0eULL, 0x1f7c1ff8633ee71fULL, 0x62956237f7c45562ULL,
+	0xd477d4eea3b53ad4ULL, 0xa89aa829324d81a8ULL, 0x966296c4f4315296ULL,
+	0xf9c3f99b3aef62f9ULL, 0xc533c566f697a3c5ULL, 0x25942535b14a1025ULL,
+	0x597959f220b2ab59ULL, 0x842a8454ae15d084ULL, 0x72d572b7a7e4c572ULL,
+	0x39e439d5dd72ec39ULL, 0x4c2d4c5a6198164cULL, 0x5e655eca3bbc945eULL,
+	0x78fd78e785f09f78ULL, 0x38e038ddd870e538ULL, 0x8c0a8c148605988cULL,
+	0xd163d1c6b2bf17d1ULL, 0xa5aea5410b57e4a5ULL, 0xe2afe2434dd9a1e2ULL,
+	0x6199612ff8c24e61ULL, 0xb3f6b3f1457b42b3ULL, 0x21842115a5423421ULL,
+	0x9c4a9c94d625089cULL, 0x1e781ef0663cee1eULL, 0x4311432252866143ULL,
+	0xc73bc776fc93b1c7ULL, 0xfcd7fcb32be54ffcULL, 0x0410042014082404ULL,
+	0x515951b208a2e351ULL, 0x995e99bcc72f2599ULL, 0x6da96d4fc4da226dULL,
+	0x0d340d68391a650dULL, 0xfacffa8335e979faULL, 0xdf5bdfb684a369dfULL,
+	0x7ee57ed79bfca97eULL, 0x2490243db4481924ULL, 0x3bec3bc5d776fe3bULL,
+	0xab96ab313d4b9aabULL, 0xce1fce3ed181f0ceULL, 0x1144118855229911ULL,
+	0x8f068f0c8903838fULL, 0x4e254e4a6b9c044eULL, 0xb7e6b7d1517366b7ULL,
+	0xeb8beb0b60cbe0ebULL, 0x3cf03cfdcc78c13cULL, 0x813e817cbf1ffd81ULL,
+	0x946a94d4fe354094ULL, 0xf7fbf7eb0cf31cf7ULL, 0xb9deb9a1676f18b9ULL,
+	0x134c13985f268b13ULL, 0x2cb02c7d9c58512cULL, 0xd36bd3d6b8bb05d3ULL,
+	0xe7bbe76b5cd38ce7ULL, 0x6ea56e57cbdc396eULL, 0xc437c46ef395aac4ULL,
+	0x030c03180f061b03ULL, 0x5645568a13acdc56ULL, 0x440d441a49885e44ULL,
+	0x7fe17fdf9efea07fULL, 0xa99ea921374f88a9ULL, 0x2aa82a4d8254672aULL,
+	0xbbd6bbb16d6b0abbULL, 0xc123c146e29f87c1ULL, 0x535153a202a6f153ULL,
+	0xdc57dcae8ba572dcULL, 0x0b2c0b582716530bULL, 0x9d4e9d9cd327019dULL,
+	0x6cad6c47c1d82b6cULL, 0x31c43195f562a431ULL, 0x74cd7487b9e8f374ULL,
+	0xf6fff6e309f115f6ULL, 0x4605460a438c4c46ULL, 0xac8aac092645a5acULL,
+	0x891e893c970fb589ULL, 0x145014a04428b414ULL, 0xe1a3e15b42dfbae1ULL,
+	0x165816b04e2ca616ULL, 0x3ae83acdd274f73aULL, 0x69b9696fd0d20669ULL,
+	0x092409482d124109ULL, 0x70dd70a7ade0d770ULL, 0xb6e2b6d954716fb6ULL,
+	0xd067d0ceb7bd1ed0ULL, 0xed93ed3b7ec7d6edULL, 0xcc17cc2edb85e2ccULL,
+	0x4215422a57846842ULL, 0x985a98b4c22d2c98ULL, 0xa4aaa4490e55eda4ULL,
+	0x28a0285d88507528ULL, 0x5c6d5cda31b8865cULL, 0xf8c7f8933fed6bf8ULL,
+	0x86228644a411c286ULL,
+};
+
+static const u64 rc[WHIRLPOOL_ROUNDS + 1] = {
+	0x0000000000000000ULL, 0x1823c6e887b8014fULL, 0x36a6d2f5796f9152ULL,
+	0x60bc9b8ea30c7b35ULL, 0x1de0d7c22e4bfe57ULL, 0x157737e59ff04adaULL,
+	0x58c9290ab1a06b85ULL, 0xbd5d10f4cb3e0567ULL, 0xe427418ba77d95d8ULL,
+	0xfbee7c66dd17479eULL, 0xca2dbf07ad5a8333ULL,
+};
+
+/**
+ * The core Whirlpool transform.
+ */
+
+static void whirlpool_process_buffer(struct whirlpool_ctx *wctx) {
+	int i, r;
+	u64 K[8];        /* the round key */
+	u64 block[8];    /* mu(buffer) */
+	u64 state[8];    /* the cipher state */
+	u64 L[8];
+	u8 *buffer = wctx->buffer;
+
+	for (i = 0; i < 8; i++, buffer += 8) {
+		block[i] =
+		(((u64)buffer[0]        ) << 56) ^
+		(((u64)buffer[1] & 0xffL) << 48) ^
+		(((u64)buffer[2] & 0xffL) << 40) ^
+		(((u64)buffer[3] & 0xffL) << 32) ^
+		(((u64)buffer[4] & 0xffL) << 24) ^
+		(((u64)buffer[5] & 0xffL) << 16) ^
+		(((u64)buffer[6] & 0xffL) <<  8) ^
+		(((u64)buffer[7] & 0xffL)      );
+	}
+
+	state[0] = block[0] ^ (K[0] = wctx->hash[0]);
+	state[1] = block[1] ^ (K[1] = wctx->hash[1]);
+	state[2] = block[2] ^ (K[2] = wctx->hash[2]);
+	state[3] = block[3] ^ (K[3] = wctx->hash[3]);
+	state[4] = block[4] ^ (K[4] = wctx->hash[4]);
+	state[5] = block[5] ^ (K[5] = wctx->hash[5]);
+	state[6] = block[6] ^ (K[6] = wctx->hash[6]);
+	state[7] = block[7] ^ (K[7] = wctx->hash[7]);
+
+	for (r = 1; r <= WHIRLPOOL_ROUNDS; r++) {
+
+		L[0] = C0[(int)(K[0] >> 56)       ] ^
+			   C1[(int)(K[7] >> 48) & 0xff] ^
+			   C2[(int)(K[6] >> 40) & 0xff] ^
+			   C3[(int)(K[5] >> 32) & 0xff] ^
+			   C4[(int)(K[4] >> 24) & 0xff] ^
+			   C5[(int)(K[3] >> 16) & 0xff] ^
+			   C6[(int)(K[2] >>  8) & 0xff] ^
+			   C7[(int)(K[1]      ) & 0xff] ^
+			   rc[r];
+
+		L[1] = C0[(int)(K[1] >> 56)       ] ^
+			   C1[(int)(K[0] >> 48) & 0xff] ^
+			   C2[(int)(K[7] >> 40) & 0xff] ^
+			   C3[(int)(K[6] >> 32) & 0xff] ^
+			   C4[(int)(K[5] >> 24) & 0xff] ^
+			   C5[(int)(K[4] >> 16) & 0xff] ^
+			   C6[(int)(K[3] >>  8) & 0xff] ^
+			   C7[(int)(K[2]      ) & 0xff];
+
+		L[2] = C0[(int)(K[2] >> 56)       ] ^
+			   C1[(int)(K[1] >> 48) & 0xff] ^
+			   C2[(int)(K[0] >> 40) & 0xff] ^
+			   C3[(int)(K[7] >> 32) & 0xff] ^
+			   C4[(int)(K[6] >> 24) & 0xff] ^
+			   C5[(int)(K[5] >> 16) & 0xff] ^
+			   C6[(int)(K[4] >>  8) & 0xff] ^
+			   C7[(int)(K[3]      ) & 0xff];
+
+		L[3] = C0[(int)(K[3] >> 56)       ] ^
+			   C1[(int)(K[2] >> 48) & 0xff] ^
+			   C2[(int)(K[1] >> 40) & 0xff] ^
+			   C3[(int)(K[0] >> 32) & 0xff] ^
+			   C4[(int)(K[7] >> 24) & 0xff] ^
+			   C5[(int)(K[6] >> 16) & 0xff] ^
+			   C6[(int)(K[5] >>  8) & 0xff] ^
+			   C7[(int)(K[4]      ) & 0xff];
+
+		L[4] = C0[(int)(K[4] >> 56)       ] ^
+			   C1[(int)(K[3] >> 48) & 0xff] ^
+			   C2[(int)(K[2] >> 40) & 0xff] ^
+			   C3[(int)(K[1] >> 32) & 0xff] ^
+			   C4[(int)(K[0] >> 24) & 0xff] ^
+			   C5[(int)(K[7] >> 16) & 0xff] ^
+			   C6[(int)(K[6] >>  8) & 0xff] ^
+			   C7[(int)(K[5]      ) & 0xff];
+
+		L[5] = C0[(int)(K[5] >> 56)       ] ^
+			   C1[(int)(K[4] >> 48) & 0xff] ^
+			   C2[(int)(K[3] >> 40) & 0xff] ^
+			   C3[(int)(K[2] >> 32) & 0xff] ^
+			   C4[(int)(K[1] >> 24) & 0xff] ^
+			   C5[(int)(K[0] >> 16) & 0xff] ^
+			   C6[(int)(K[7] >>  8) & 0xff] ^
+			   C7[(int)(K[6]      ) & 0xff];
+
+		L[6] = C0[(int)(K[6] >> 56)       ] ^
+			   C1[(int)(K[5] >> 48) & 0xff] ^
+			   C2[(int)(K[4] >> 40) & 0xff] ^
+			   C3[(int)(K[3] >> 32) & 0xff] ^
+			   C4[(int)(K[2] >> 24) & 0xff] ^
+			   C5[(int)(K[1] >> 16) & 0xff] ^
+			   C6[(int)(K[0] >>  8) & 0xff] ^
+			   C7[(int)(K[7]      ) & 0xff];
+
+		L[7] = C0[(int)(K[7] >> 56)       ] ^
+			   C1[(int)(K[6] >> 48) & 0xff] ^
+			   C2[(int)(K[5] >> 40) & 0xff] ^
+			   C3[(int)(K[4] >> 32) & 0xff] ^
+			   C4[(int)(K[3] >> 24) & 0xff] ^
+			   C5[(int)(K[2] >> 16) & 0xff] ^
+			   C6[(int)(K[1] >>  8) & 0xff] ^
+			   C7[(int)(K[0]      ) & 0xff];
+
+		K[0] = L[0];
+		K[1] = L[1];
+		K[2] = L[2];
+		K[3] = L[3];
+		K[4] = L[4];
+		K[5] = L[5];
+		K[6] = L[6];
+		K[7] = L[7];
+
+		L[0] = C0[(int)(state[0] >> 56)       ] ^
+			   C1[(int)(state[7] >> 48) & 0xff] ^
+			   C2[(int)(state[6] >> 40) & 0xff] ^
+			   C3[(int)(state[5] >> 32) & 0xff] ^
+			   C4[(int)(state[4] >> 24) & 0xff] ^
+			   C5[(int)(state[3] >> 16) & 0xff] ^
+			   C6[(int)(state[2] >>  8) & 0xff] ^
+			   C7[(int)(state[1]      ) & 0xff] ^
+			   K[0];
+
+		L[1] = C0[(int)(state[1] >> 56)       ] ^
+			   C1[(int)(state[0] >> 48) & 0xff] ^
+			   C2[(int)(state[7] >> 40) & 0xff] ^
+			   C3[(int)(state[6] >> 32) & 0xff] ^
+			   C4[(int)(state[5] >> 24) & 0xff] ^
+			   C5[(int)(state[4] >> 16) & 0xff] ^
+			   C6[(int)(state[3] >>  8) & 0xff] ^
+			   C7[(int)(state[2]      ) & 0xff] ^
+			   K[1];
+
+		L[2] = C0[(int)(state[2] >> 56)       ] ^
+			   C1[(int)(state[1] >> 48) & 0xff] ^
+			   C2[(int)(state[0] >> 40) & 0xff] ^
+			   C3[(int)(state[7] >> 32) & 0xff] ^
+			   C4[(int)(state[6] >> 24) & 0xff] ^
+			   C5[(int)(state[5] >> 16) & 0xff] ^
+			   C6[(int)(state[4] >>  8) & 0xff] ^
+			   C7[(int)(state[3]      ) & 0xff] ^
+			   K[2];
+
+		L[3] = C0[(int)(state[3] >> 56)       ] ^
+			   C1[(int)(state[2] >> 48) & 0xff] ^
+			   C2[(int)(state[1] >> 40) & 0xff] ^
+			   C3[(int)(state[0] >> 32) & 0xff] ^
+			   C4[(int)(state[7] >> 24) & 0xff] ^
+			   C5[(int)(state[6] >> 16) & 0xff] ^
+			   C6[(int)(state[5] >>  8) & 0xff] ^
+			   C7[(int)(state[4]      ) & 0xff] ^
+			   K[3];
+
+		L[4] = C0[(int)(state[4] >> 56)       ] ^
+			   C1[(int)(state[3] >> 48) & 0xff] ^
+			   C2[(int)(state[2] >> 40) & 0xff] ^
+			   C3[(int)(state[1] >> 32) & 0xff] ^
+			   C4[(int)(state[0] >> 24) & 0xff] ^
+			   C5[(int)(state[7] >> 16) & 0xff] ^
+			   C6[(int)(state[6] >>  8) & 0xff] ^
+			   C7[(int)(state[5]      ) & 0xff] ^
+			   K[4];
+
+		L[5] = C0[(int)(state[5] >> 56)       ] ^
+			   C1[(int)(state[4] >> 48) & 0xff] ^
+			   C2[(int)(state[3] >> 40) & 0xff] ^
+			   C3[(int)(state[2] >> 32) & 0xff] ^
+			   C4[(int)(state[1] >> 24) & 0xff] ^
+			   C5[(int)(state[0] >> 16) & 0xff] ^
+			   C6[(int)(state[7] >>  8) & 0xff] ^
+			   C7[(int)(state[6]      ) & 0xff] ^
+			   K[5];
+
+		L[6] = C0[(int)(state[6] >> 56)       ] ^
+			   C1[(int)(state[5] >> 48) & 0xff] ^
+			   C2[(int)(state[4] >> 40) & 0xff] ^
+			   C3[(int)(state[3] >> 32) & 0xff] ^
+			   C4[(int)(state[2] >> 24) & 0xff] ^
+			   C5[(int)(state[1] >> 16) & 0xff] ^
+			   C6[(int)(state[0] >>  8) & 0xff] ^
+			   C7[(int)(state[7]      ) & 0xff] ^
+			   K[6];
+
+		L[7] = C0[(int)(state[7] >> 56)       ] ^
+			   C1[(int)(state[6] >> 48) & 0xff] ^
+			   C2[(int)(state[5] >> 40) & 0xff] ^
+			   C3[(int)(state[4] >> 32) & 0xff] ^
+			   C4[(int)(state[3] >> 24) & 0xff] ^
+			   C5[(int)(state[2] >> 16) & 0xff] ^
+			   C6[(int)(state[1] >>  8) & 0xff] ^
+			   C7[(int)(state[0]      ) & 0xff] ^
+			   K[7];
+
+		state[0] = L[0];
+		state[1] = L[1];
+		state[2] = L[2];
+		state[3] = L[3];
+		state[4] = L[4];
+		state[5] = L[5];
+		state[6] = L[6];
+		state[7] = L[7];
+	}
+	/*
+	* apply the Miyaguchi-Preneel compression function:
+	*/
+	wctx->hash[0] ^= state[0] ^ block[0];
+	wctx->hash[1] ^= state[1] ^ block[1];
+	wctx->hash[2] ^= state[2] ^ block[2];
+	wctx->hash[3] ^= state[3] ^ block[3];
+	wctx->hash[4] ^= state[4] ^ block[4];
+	wctx->hash[5] ^= state[5] ^ block[5];
+	wctx->hash[6] ^= state[6] ^ block[6];
+	wctx->hash[7] ^= state[7] ^ block[7];
+
+}
+
+static void whirlpool_init (void *ctx) {
+	int i;
+	struct whirlpool_ctx *wctx = ctx;
+
+	memset(wctx->bitLength, 0, 32);
+	wctx->bufferBits = wctx->bufferPos = 0;
+	wctx->buffer[0] = 0;
+	for (i = 0; i < 8; i++) {
+		wctx->hash[i] = 0L;
+	}
+}
+
+static void whirlpool_update(void *ctx, const u8 *source, unsigned int len)
+{
+
+	struct whirlpool_ctx *wctx = ctx;
+	int sourcePos    = 0;
+	unsigned int bits_len = len * 8; // convert to number of bits
+	int sourceGap    = (8 - ((int)bits_len & 7)) & 7;
+	int bufferRem    = wctx->bufferBits & 7;
+	int i;
+	u32 b, carry;
+	u8 *buffer       = wctx->buffer;
+	u8 *bitLength    = wctx->bitLength;
+	int bufferBits   = wctx->bufferBits;
+	int bufferPos    = wctx->bufferPos;
+
+	u64 value = bits_len;
+	for (i = 31, carry = 0; i >= 0 && (carry != 0 || value != 0ULL); i--) {
+		carry += bitLength[i] + ((u32)value & 0xff);
+		bitLength[i] = (u8)carry;
+		carry >>= 8;
+		value >>= 8;
+	}
+	while (bits_len > 8) {
+		b = ((source[sourcePos] << sourceGap) & 0xff) |
+		((source[sourcePos + 1] & 0xff) >> (8 - sourceGap));
+		buffer[bufferPos++] |= (u8)(b >> bufferRem);
+		bufferBits += 8 - bufferRem;
+		if (bufferBits == WHIRLPOOL_DIGEST_SIZE * 8) {
+			whirlpool_process_buffer(wctx);
+			bufferBits = bufferPos = 0;
+		}
+		buffer[bufferPos] = b << (8 - bufferRem);
+		bufferBits += bufferRem;
+		bits_len -= 8;
+		sourcePos++;
+	}
+	if (bits_len > 0) {
+		b = (source[sourcePos] << sourceGap) & 0xff;
+		buffer[bufferPos] |= b >> bufferRem;
+	} else {
+		b = 0;
+	}
+	if (bufferRem + bits_len < 8) {
+		bufferBits += bits_len;
+	} else {
+		bufferPos++;
+		bufferBits += 8 - bufferRem;
+		bits_len -= 8 - bufferRem;
+		if (bufferBits == WHIRLPOOL_DIGEST_SIZE * 8) {
+			whirlpool_process_buffer(wctx);
+			bufferBits = bufferPos = 0;
+		}
+		buffer[bufferPos] = b << (8 - bufferRem);
+		bufferBits += (int)bits_len;
+	}
+
+	wctx->bufferBits   = bufferBits;
+	wctx->bufferPos    = bufferPos;
+
+}
+
+static void whirlpool_final(void *ctx, u8 *out)
+{
+	struct whirlpool_ctx *wctx = ctx;
+	int i;
+   	u8 *buffer      = wctx->buffer;
+   	u8 *bitLength   = wctx->bitLength;
+   	int bufferBits  = wctx->bufferBits;
+   	int bufferPos   = wctx->bufferPos;
+   	u8 *digest      = out;
+
+   	buffer[bufferPos] |= 0x80U >> (bufferBits & 7);
+   	bufferPos++;
+   	if (bufferPos > WHIRLPOOL_BLOCK_SIZE - WHIRLPOOL_LENGTHBYTES) {
+   		if (bufferPos < WHIRLPOOL_BLOCK_SIZE) {
+	   	memset(&buffer[bufferPos], 0, WHIRLPOOL_BLOCK_SIZE - bufferPos);
+   		}
+   		whirlpool_process_buffer(wctx);
+   		bufferPos = 0;
+   	}
+   	if (bufferPos < WHIRLPOOL_BLOCK_SIZE - WHIRLPOOL_LENGTHBYTES) {
+   		memset(&buffer[bufferPos], 0,
+			  (WHIRLPOOL_BLOCK_SIZE - WHIRLPOOL_LENGTHBYTES) - bufferPos);
+   	}
+   	bufferPos = WHIRLPOOL_BLOCK_SIZE - WHIRLPOOL_LENGTHBYTES;
+   	memcpy(&buffer[WHIRLPOOL_BLOCK_SIZE - WHIRLPOOL_LENGTHBYTES],
+		   bitLength, WHIRLPOOL_LENGTHBYTES);
+   	whirlpool_process_buffer(wctx);
+   	for (i = 0; i < WHIRLPOOL_DIGEST_SIZE/8; i++) {
+		digest[0] = (u8)(wctx->hash[i] >> 56);
+		digest[1] = (u8)(wctx->hash[i] >> 48);
+		digest[2] = (u8)(wctx->hash[i] >> 40);
+		digest[3] = (u8)(wctx->hash[i] >> 32);
+		digest[4] = (u8)(wctx->hash[i] >> 24);
+		digest[5] = (u8)(wctx->hash[i] >> 16);
+		digest[6] = (u8)(wctx->hash[i] >>  8);
+		digest[7] = (u8)(wctx->hash[i]      );
+		digest += 8;
+   	}
+   	wctx->bufferBits   = bufferBits;
+   	wctx->bufferPos    = bufferPos;
+}
+
+static struct crypto_alg alg = {
+	.cra_name	=	"whirlpool",
+	.cra_flags	=	CRYPTO_ALG_TYPE_DIGEST,
+	.cra_blocksize	=	WHIRLPOOL_BLOCK_SIZE,
+	.cra_ctxsize	=	sizeof(struct whirlpool_ctx),
+	.cra_module	=	THIS_MODULE,
+	.cra_list       =       LIST_HEAD_INIT(alg.cra_list),	
+	.cra_u		=	{ .digest = {
+	.dia_digestsize	=	WHIRLPOOL_DIGEST_SIZE,
+	.dia_init   	= 	whirlpool_init,
+	.dia_update 	=	whirlpool_update,
+	.dia_final  	=	whirlpool_final } }
+};
+
+static int __init init(void)
+{
+	return crypto_register_alg(&alg);
+}
+
+static void __exit fini(void)
+{
+	crypto_unregister_alg(&alg);
+}
+
+module_init(init);
+module_exit(fini);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Whirlpool Message Digest Algorithm");
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/acpi/asus_acpi.c linux-2.4.20-wolk4.16-fullkernel/drivers/acpi/asus_acpi.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/acpi/asus_acpi.c	2004-06-29 11:23:58.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/acpi/asus_acpi.c	2004-09-05 15:47:22.000000000 +0200
@@ -40,6 +40,7 @@
 #include <linux/proc_fs.h>
 #include <acpi/acpi_drivers.h>
 #include <acpi/acpi_bus.h>
+#include <asm/uaccess.h>
 
 #define ASUS_ACPI_VERSION "0.24a"
 
@@ -313,7 +314,21 @@ proc_read_mled(char *page, char **start,
 
 	return len;
 }
-
+ 
+static int parse_arg(const char *buf, unsigned long count, int *val)
+{
+	char s[32];
+	if (!count)
+		return 0;
+	if (count > 31)
+		return -EINVAL;
+	if (copy_from_user(s, buf, count))
+		return -EFAULT;
+	s[count] = 0;
+	if (sscanf(s, "%i", val) != 1)
+		return -EINVAL;
+	return count;
+}
 
 static int
 proc_write_mled(struct file *file, const char *buffer,
@@ -323,10 +338,8 @@ proc_write_mled(struct file *file, const
 	int led_out = 0;
 	struct asus_hotk *hotk = (struct asus_hotk *) data;
 
-
-
-	/* scan expression.  Multiple expressions may be delimited with ; */
-	if (sscanf(buffer, "%i", &value) == 1)
+	count = parse_arg(buffer, count, &value);
+	if (count > 0)
 		led_out = ~value & 1;
 
 	hotk->status =
@@ -378,7 +391,8 @@ proc_write_wled(struct file *file, const
 	struct asus_hotk *hotk = (struct asus_hotk *) data;
 
 	/* scan expression.  Multiple expressions may be delimited with ; */
-	if (sscanf(buffer, "%i", &value) == 1)
+	count = parse_arg(buffer, count, &value);
+	if (count > 0)
 		led_out = value & 1;
 
 	hotk->status =
@@ -428,7 +442,8 @@ proc_write_lcd(struct file *file, const 
 	struct asus_hotk *hotk = (struct asus_hotk *) data;
 
 	/* scan expression.  Multiple expressions may be delimited with ; */
-	if (sscanf(buffer, "%i", &value) == 1)
+	count = parse_arg(buffer, count, &value);
+	if (count > 0)
 		lcd = value & 1;
 
 	lcd_status = get_lcd_state(hotk);
@@ -508,7 +523,8 @@ proc_write_brn(struct file *file, const 
 	struct asus_hotk *hotk = (struct asus_hotk *) data;
 
 	/* scan expression.  Multiple expressions may be delimited with ; */
-	if (sscanf(buffer, "%d", &value) == 1) {
+	count = parse_arg(buffer, count, &value);
+	if (count > 0) {
 		value = (0 < value) ? ((15 < value) ? 15 : value) : 0;
 			/* 0 <= value <= 15 */
 		set_brightness(value, hotk);
@@ -560,7 +576,8 @@ proc_write_disp(struct file *file, const
 	struct asus_hotk *hotk = (struct asus_hotk *) data;
 
 	/* scan expression.  Multiple expressions may be delimited with ; */
-	if (sscanf(buffer, "%d", &value) == 1)
+	count = parse_arg(buffer, count, &value);
+	if (count > 0)
 		set_display(value, hotk);
 	else {
 		printk(KERN_NOTICE "Asus ACPI: Error reading user input\n");
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/block/Config.in linux-2.4.20-wolk4.16-fullkernel/drivers/block/Config.in
--- linux-2.4.20-wolk4.15-fullkernel/drivers/block/Config.in	2004-06-29 11:31:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/block/Config.in	2004-09-09 12:52:35.000000000 +0200
@@ -48,7 +48,8 @@ fi
 
 tristate 'Loopback device support' CONFIG_BLK_DEV_LOOP
 if [ "$CONFIG_BLK_DEV_LOOP" != "n" ]; then
-  bool     '  AES encrypted loop device support' CONFIG_BLK_DEV_LOOP_AES $CONFIG_BLK_DEV_LOOP
+  bool     '  AES encrypted loop device support' CONFIG_BLK_DEV_LOOP_AES
+  dep_bool     '    loop encryption key scrubbing support' CONFIG_BLK_DEV_LOOP_KEYSCRUB $CONFIG_BLK_DEV_LOOP_AES
   dep_tristate '    Blowfish encryption for loop device' CONFIG_CIPHER_BLOWFISH_LOOP $CONFIG_BLK_DEV_LOOP $CONFIG_BLK_DEV_LOOP_AES
   dep_tristate '    Twofish encryption for loop device' CONFIG_CIPHER_TWOFISH_LOOP $CONFIG_BLK_DEV_LOOP $CONFIG_BLK_DEV_LOOP_AES
   dep_tristate '    Serpent encryption for loop device' CONFIG_CIPHER_SERPENT_LOOP $CONFIG_BLK_DEV_LOOP $CONFIG_BLK_DEV_LOOP_AES
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/block/acsi_slm.c linux-2.4.20-wolk4.16-fullkernel/drivers/block/acsi_slm.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/block/acsi_slm.c	2002-11-29 00:53:12.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/block/acsi_slm.c	2004-09-05 16:06:00.000000000 +0200
@@ -367,6 +367,7 @@ static ssize_t slm_read( struct file *fi
 
 {
 	struct inode *node = file->f_dentry->d_inode;
+	loff_t pos = *ppos;
 	unsigned long page;
 	int length;
 	int end;
@@ -381,18 +382,18 @@ static ssize_t slm_read( struct file *fi
 		count = length;
 		goto out;
 	}
-	if (file->f_pos >= length) {
+	if (pos != (unsigned) pos || pos >= length) {
 		count = 0;
 		goto out;
 	}
-	if (count + file->f_pos > length)
-		count = length - file->f_pos;
-	end = count + file->f_pos;
-	if (copy_to_user(buf, (char *)page + file->f_pos, count)) {
+	if (count > length - pos)
+		count = length - pos;
+	end = count + pos;
+	if (copy_to_user(buf, (char *)page + pos, count)) {
 		count = -EFAULT;
 		goto out;
 	}
-	file->f_pos = end;
+	*ppos = end;
 out:	free_page( page );
 	return( count );
 }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/block/cciss.c linux-2.4.20-wolk4.16-fullkernel/drivers/block/cciss.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/block/cciss.c	2004-06-29 11:31:10.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/block/cciss.c	2004-09-05 15:48:32.000000000 +0200
@@ -80,7 +80,7 @@ const struct pci_device_id cciss_pci_dev
                         0x0E11, 0x4091, 0, 0, 0},
 	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC,
                         0x0E11, 0x409E, 0, 0, 0},
-	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC,
+	{ PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISS,
                         0x103C, 0x3211, 0, 0, 0},
 	{0,}
 };
@@ -125,12 +125,13 @@ static struct board_type products[] = {
 /* Originally cciss driver only supports 8 major number */
 #define MAX_CTLR_ORIG  COMPAQ_CISS_MAJOR7 - COMPAQ_CISS_MAJOR + 1
 
-#define CCISS_DMA_MASK 0xFFFFFFFFFFFFFFFF /* 64 bit DMA */
+#define CCISS_DMA_MASK 0xFFFFFFFFFFFFFFFFULL /* 64 bit DMA */
 
 #ifdef CONFIG_CISS_MONITOR_THREAD
 static int cciss_monitor(void *ctlr);
 static int start_monitor_thread(ctlr_info_t *h, unsigned char *cmd, 
 		unsigned long count, int (*cciss_monitor)(void *), int *rc);
+static u32 heartbeat_timer = 0;
 #else
 #define cciss_monitor(x)
 #define kill_monitor_thead(x)
@@ -138,8 +139,6 @@ static int start_monitor_thread(ctlr_inf
 
 static ctlr_info_t *hba[MAX_CTLR];
 static int map_major_to_ctlr[MAX_BLKDEV] = {0}; /* gets ctlr num from maj num */
-static u32 heartbeat_timer = 0;
-
 static struct proc_dir_entry *proc_cciss;
 
 static void do_cciss_request(request_queue_t *q);
@@ -169,6 +168,35 @@ static int cciss_proc_get_info(char *buf
 static void cciss_procinit(int i) {}
 #endif /* CONFIG_PROC_FS */
 
+/*
+ * Enqueuing and dequeuing functions for cmdlists.
+ */
+static inline void addQ(CommandList_struct **Qptr, CommandList_struct *c)
+{
+        if (*Qptr == NULL) {
+                *Qptr = c;
+                c->next = c->prev = c;
+        } else {
+                c->prev = (*Qptr)->prev;
+                c->next = (*Qptr);
+                (*Qptr)->prev->next = c;
+                (*Qptr)->prev = c;
+        }
+}
+
+static inline CommandList_struct *removeQ(CommandList_struct **Qptr, 
+						CommandList_struct *c)
+{
+        if (c && c->next != c) {
+                if (*Qptr == c) *Qptr = c->next;
+                c->prev->next = c->next;
+                c->next->prev = c->prev;
+        } else {
+                *Qptr = NULL;
+        }
+        return c;
+}
+
 static struct block_device_operations cciss_fops  = {
 	owner:			THIS_MODULE,
 	open:			cciss_open, 
@@ -494,6 +522,143 @@ static int cciss_release(struct inode *i
 	return 0;
 }
 
+#ifdef __x86_64__
+/* for AMD 64 bit kernel compatibility with 32-bit userland ioctls */
+extern int sys_ioctl(unsigned int fd, unsigned cmd, unsigned long arg);
+
+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);
+
+static int cciss_ioctl32_passthru(unsigned int fd, unsigned cmd, unsigned long arg, struct file *file);
+static int cciss_ioctl32_big_passthru(unsigned int fd, unsigned cmd, unsigned long arg, 
+	struct file *file);
+
+typedef long (*handler type) (unsigned int, unsigned int, unsigned long,
+				struct file *);
+
+static struct ioctl32_map {
+	unsigned int cmd; 
+	handler_type handler;
+	int registered;
+} cciss_ioctl32_map[] = {
+	{ CCISS_GETPCIINFO,	(handler_type) sys_ioctl, 0 },
+	{ CCISS_GETINTINFO,	(handler_type) sys_ioctl, 0 },
+	{ CCISS_SETINTINFO,	(handler_type) sys_ioctl, 0 },
+	{ CCISS_GETNODENAME,	(handler_type) sys_ioctl, 0 },
+	{ CCISS_SETNODENAME,	(handler_type) sys_ioctl, 0 },
+	{ CCISS_GETHEARTBEAT,	(handler_type) sys_ioctl, 0 },
+	{ CCISS_GETBUSTYPES,	(handler_type) sys_ioctl, 0 },
+	{ CCISS_GETFIRMVER,	(handler_type) sys_ioctl, 0 },
+	{ CCISS_GETDRIVVER,	(handler_type) sys_ioctl, 0 },
+	{ CCISS_REVALIDVOLS,	(handler_type) sys_ioctl, 0 },
+	{ CCISS_PASSTHRU32,	cciss_ioctl32_passthru, 0 },
+	{ CCISS_DEREGDISK,	(handler_type) sys_ioctl, 0 },
+	{ CCISS_REGNEWDISK,	(handler_type) sys_ioctl, 0 },
+	{ CCISS_REGNEWD,	(handler_type) sys_ioctl, 0 },
+	{ CCISS_RESCANDISK,	(handler_type) sys_ioctl, 0 },
+	{ CCISS_GETLUNINFO,	(handler_type) sys_ioctl, 0 },
+	{ CCISS_BIG_PASSTHRU32,	cciss_ioctl32_big_passthru, 0 },
+};
+#define NCCISS_IOCTL32_ENTRIES (sizeof(cciss_ioctl32_map) / sizeof(cciss_ioctl32_map[0]))
+static void register_cciss_ioctl32(void)
+{
+	int i, rc;
+
+	for (i=0; i < NCCISS_IOCTL32_ENTRIES; i++) {
+		rc = register_ioctl32_conversion(
+			cciss_ioctl32_map[i].cmd,
+			cciss_ioctl32_map[i].handler);
+		if (rc != 0) {
+			printk(KERN_WARNING "cciss: failed to register "
+				"32 bit compatible ioctl 0x%08x\n", 
+				cciss_ioctl32_map[i].cmd);
+			cciss_ioctl32_map[i].registered = 0;
+		} else
+			cciss_ioctl32_map[i].registered = 1;
+	}
+}
+static void unregister_cciss_ioctl32(void)
+{
+	int i, rc;
+
+	for (i=0; i < NCCISS_IOCTL32_ENTRIES; i++) {
+		if (!cciss_ioctl32_map[i].registered)
+			continue;
+		rc = unregister_ioctl32_conversion(
+			cciss_ioctl32_map[i].cmd);
+		if (rc == 0) {
+			cciss_ioctl32_map[i].registered = 0;
+			continue;
+		}
+		printk(KERN_WARNING "cciss: failed to unregister "
+			"32 bit compatible ioctl 0x%08x\n",
+			cciss_ioctl32_map[i].cmd);
+	}
+}
+int cciss_ioctl32_passthru(unsigned int fd, unsigned cmd, unsigned long arg, 
+				struct file *file)
+{
+	IOCTL32_Command_struct *arg32 = 
+		(IOCTL32_Command_struct *) arg;
+	IOCTL_Command_struct arg64;
+	mm_segment_t old_fs; 
+	int err;
+
+	err = 0;
+	err |= copy_from_user(&arg64.LUN_info, &arg32->LUN_info, sizeof(arg64.LUN_info));
+	err |= copy_from_user(&arg64.Request, &arg32->Request, sizeof(arg64.Request));
+	err |= copy_from_user(&arg64.error_info, &arg32->error_info, sizeof(arg64.error_info));
+	err |= get_user(arg64.buf_size, &arg32->buf_size);
+	err |= get_user(arg64.buf, &arg32->buf);
+	if (err) 
+		return -EFAULT; 
+
+	old_fs = get_fs();
+	set_fs(KERNEL_DS);
+	err = sys_ioctl(fd, CCISS_PASSTHRU, (unsigned long) &arg64);
+	set_fs(old_fs);
+	if (err)
+		return err;
+	err |= copy_to_user(&arg32->error_info, &arg64.error_info, sizeof(arg32->error_info));
+	if (err) 
+		return -EFAULT; 
+	return err;
+}
+int cciss_ioctl32_big_passthru(unsigned int fd, unsigned cmd, unsigned long arg,
+					struct file *file)
+{
+	BIG_IOCTL32_Command_struct *arg32 = 
+		(BIG_IOCTL32_Command_struct *) arg;
+	BIG_IOCTL_Command_struct arg64;
+	mm_segment_t old_fs; 
+	int err;
+
+	err = 0;
+	err |= copy_from_user(&arg64.LUN_info, &arg32->LUN_info, sizeof(arg64.LUN_info));
+	err |= copy_from_user(&arg64.Request, &arg32->Request, sizeof(arg64.Request));
+	err |= copy_from_user(&arg64.error_info, &arg32->error_info, sizeof(arg64.error_info));
+	err |= get_user(arg64.buf_size, &arg32->buf_size);
+	err |= get_user(arg64.malloc_size, &arg32->malloc_size);
+	err |= get_user(arg64.buf, &arg32->buf);
+	if (err) return -EFAULT; 
+	old_fs = get_fs();
+	set_fs(KERNEL_DS);
+	err = sys_ioctl(fd, CCISS_BIG_PASSTHRU, (unsigned long) &arg64);
+	set_fs(old_fs);
+	if (err)
+		return err;
+	err |= copy_to_user(&arg32->error_info, &arg64.error_info, sizeof(arg32->error_info));
+	if (err) 
+		return -EFAULT; 
+	return err;
+}
+#else 
+static inline void register_cciss_ioctl32(void) {}
+static inline void unregister_cciss_ioctl32(void) {}
+#endif
+
 /*
  * ioctl 
  */
@@ -515,12 +680,8 @@ static int cciss_ioctl(struct inode *ino
 			driver_geo.heads = hba[ctlr]->drv[dsk].heads;
 			driver_geo.sectors = hba[ctlr]->drv[dsk].sectors;
 			driver_geo.cylinders = hba[ctlr]->drv[dsk].cylinders;
-		} else {
-			driver_geo.heads = 0xff;
-			driver_geo.sectors = 0x3f;
-			driver_geo.cylinders = 
-				hba[ctlr]->drv[dsk].nr_blocks / (0xff*0x3f);
-		}
+		} else 
+			return -ENXIO;
 		driver_geo.start=
 			hba[ctlr]->hd[MINOR(inode->i_rdev)].start_sect;
 		if (copy_to_user((void *) arg, &driver_geo,
@@ -535,12 +696,8 @@ static int cciss_ioctl(struct inode *ino
 			driver_geo.heads = hba[ctlr]->drv[dsk].heads;
 			driver_geo.sectors = hba[ctlr]->drv[dsk].sectors;
 			driver_geo.cylinders = hba[ctlr]->drv[dsk].cylinders;
-		} else {
-			driver_geo.heads = 0xff;
-			driver_geo.sectors = 0x3f;
-			driver_geo.cylinders = 
-				hba[ctlr]->drv[dsk].nr_blocks / (0xff*0x3f);
-		}
+		} else 
+			return -ENXIO;
 		driver_geo.start= 
 		hba[ctlr]->hd[MINOR(inode->i_rdev)].start_sect;
 		if (copy_to_user((void *) arg, &driver_geo,  
@@ -815,6 +972,8 @@ static int cciss_ioctl(struct inode *ino
 			{
 				kfree(buff);
 				return -EFAULT;
+			} else {
+				memset(buff, 0, iocommand.buf_size);
 			}
 		}
 		if ((c = cmd_alloc(h , 0)) == NULL) {
@@ -933,12 +1092,15 @@ static int cciss_ioctl(struct inode *ino
 					goto cleanup1;
 				}
 				if (iocommand.Request.Type.Direction == 
-						XFER_WRITE)
+						XFER_WRITE) {
 				   /* Copy the data into the buffer created */
 				   if (copy_from_user(buff[sg_used], data_ptr, 
 						buff_size[sg_used])) {
 					status = -ENOMEM;
 					goto cleanup1;			
+				   } else {
+					memset(buff[sg_used], 0, buff_size[sg_used]);
+				   }
 				   }
 				size_left_alloc -= buff_size[sg_used];
 				data_ptr += buff_size[sg_used];
@@ -2002,35 +2164,6 @@ static ulong remap_pci_mem(ulong base, u
         return (ulong) (page_remapped ? (page_remapped + page_offs) : 0UL);
 }
 
-/*
- * Enqueuing and dequeuing functions for cmdlists.
- */
-static inline void addQ(CommandList_struct **Qptr, CommandList_struct *c)
-{
-        if (*Qptr == NULL) {
-                *Qptr = c;
-                c->next = c->prev = c;
-        } else {
-                c->prev = (*Qptr)->prev;
-                c->next = (*Qptr);
-                (*Qptr)->prev->next = c;
-                (*Qptr)->prev = c;
-        }
-}
-
-static inline CommandList_struct *removeQ(CommandList_struct **Qptr, 
-						CommandList_struct *c)
-{
-        if (c && c->next != c) {
-                if (*Qptr == c) *Qptr = c->next;
-                c->prev->next = c->next;
-                c->next->prev = c->prev;
-        } else {
-                *Qptr = NULL;
-        }
-        return c;
-}
-
 /* 
  * Takes jobs of the Q and sends them to the hardware, then puts it on 
  * the Q to wait for completion. 
@@ -2310,6 +2443,8 @@ next:
 
 	blkdev_dequeue_request(creq);
 
+	spin_unlock_irq(&io_request_lock);
+
 	c->cmd_type = CMD_RWREQ;      
 	c->rq = creq;
 	bh = creq->bh;
@@ -2386,6 +2521,8 @@ next:
 	c->Request.CDB[8]= creq->nr_sectors & 0xff; 
 	c->Request.CDB[9] = c->Request.CDB[11] = c->Request.CDB[12] = 0;
 
+	spin_lock_irq(&io_request_lock);
+
 	addQ(&(h->reqQ),c);
 	h->Qdepth++;
 	if (h->Qdepth > h->maxQsinceinit)
@@ -2540,8 +2677,8 @@ static int find_PCI_BAR_index(struct pci
 static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
 {
 	ushort subsystem_vendor_id, subsystem_device_id, command;
-	unchar irq = pdev->irq;
-	__u32 board_id;
+	int ready = 0;
+	__u32 board_id, scratchpad;
 	__u64 cfg_offset;
 	__u32 cfg_base_addr;
 	__u64 cfg_base_addr_index;
@@ -2596,11 +2733,11 @@ static int cciss_pci_init(ctlr_info_t *c
 
 #ifdef CCISS_DEBUG
 	printk("command = %x\n", command);
-	printk("irq = %x\n", irq);
+	printk("irq = %x\n", pdev->irq);
 	printk("board_id = %x\n", board_id);
 #endif /* CCISS_DEBUG */ 
 
-	c->intr = irq;
+	c->intr = pdev->irq;
 
 	/*
 	 * Memory base addr is first addr , the second points to the config
@@ -2612,10 +2749,24 @@ static int cciss_pci_init(ctlr_info_t *c
 	printk("address 0 = %x\n", c->paddr);
 #endif /* CCISS_DEBUG */ 
 	c->vaddr = remap_pci_mem(c->paddr, 200);
+	/* Wait for the board to become ready.  (PCI hotplug needs this.)
+	 * We poll for up to 120 secs, once per 100ms. */
+	for (i=0; i < 1200; i++) {
+		scratchpad = readl(c->vaddr + SA5_SCRATCHPAD_OFFSET);
+		if (scratchpad == 0xffff0000) {
+			ready = 1;
+			break;
+		}
+		set_current_state(TASK_UNINTERRUPTIBLE);
+		schedule_timeout(HZ / 10); /* wait 100ms */
+	}
+	if (!ready) {
+		printk(KERN_WARNING "cciss: Board not ready.  Timed out.\n");
+		return -1;
+	}
 
 	/* get the address index number */
 	cfg_base_addr = readl(c->vaddr + SA5_CTCFG_OFFSET);
-	/* I am not prepared to deal with a 64 bit address value */
 	cfg_base_addr &= (__u32) 0x0000ffff;
 #ifdef CCISS_DEBUG
 	printk("cfg base address = %x\n", cfg_base_addr);
@@ -2627,7 +2778,7 @@ static int cciss_pci_init(ctlr_info_t *c
 #endif /* CCISS_DEBUG */
 	if (cfg_base_addr_index == -1) {
 		printk(KERN_WARNING "cciss: Cannot find cfg_base_addr_index\n");
-		release_io_mem(hba[i]);
+		release_io_mem(c);
 		return -1;
 	}
 
@@ -2664,6 +2815,17 @@ static int cciss_pci_init(ctlr_info_t *c
 		printk("Does not appear to be a valid CISS config table\n");
 		return -1;
 	}
+
+#ifdef CONFIG_X86
+{
+	/* Need to enable prefetch in the SCSI core for 6400 in x86 */
+	__u32 prefetch;
+	prefetch = readl(&(c->cfgtable->SCSI_Prefetch));
+	prefetch |= 0x100;
+	writel(prefetch, &(c->cfgtable->SCSI_Prefetch));
+}
+#endif
+
 #ifdef CCISS_DEBUG
 	printk("Trying to put board into Simple mode\n");
 #endif /* CCISS_DEBUG */ 
@@ -3303,7 +3465,7 @@ int __init cciss_init(void)
 EXPORT_NO_SYMBOLS;
 static int __init init_cciss_module(void)
 {
-
+	register_cciss_ioctl32();
 	return cciss_init();
 }
 
@@ -3311,6 +3473,7 @@ static void __exit cleanup_cciss_module(
 {
 	int i;
 
+	unregister_cciss_ioctl32();
 	pci_unregister_driver(&cciss_pci_driver);
 	/* double check that all controller entrys have been removed */
 	for (i=0; i< MAX_CTLR; i++) {
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/block/cciss.h linux-2.4.20-wolk4.16-fullkernel/drivers/block/cciss.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/block/cciss.h	2004-06-29 11:24:47.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/block/cciss.h	2004-09-05 15:48:32.000000000 +0200
@@ -51,7 +51,7 @@ struct ctlr_info 
 	unsigned long io_mem_addr;
 	unsigned long io_mem_length;
 	CfgTable_struct *cfgtable;
-	int	intr;
+	unsigned int	intr;
 	int	interrupts_enabled;
 	int 	max_commands;
 	int	commands_outstanding;
@@ -137,6 +137,7 @@ struct ctlr_info 
 #define SA5_REPLY_INTR_MASK_OFFSET	0x34
 #define SA5_REPLY_PORT_OFFSET		0x44
 #define SA5_INTR_STATUS		0x30
+#define SA5_SCRATCHPAD_OFFSET	0xB0
 
 #define SA5_CTCFG_OFFSET	0xB4
 #define SA5_CTMEM_OFFSET	0xB8
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/block/cciss_cmd.h linux-2.4.20-wolk4.16-fullkernel/drivers/block/cciss_cmd.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/block/cciss_cmd.h	2004-06-29 11:24:46.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/block/cciss_cmd.h	2004-09-05 15:48:30.000000000 +0200
@@ -266,6 +266,7 @@ typedef struct _CfgTable_struct {
   DWORD            Reserved; 
   BYTE             ServerName[16];
   DWORD            HeartBeat;
+  DWORD            SCSI_Prefetch;
 } CfgTable_struct;
 #pragma pack()	 
 #endif /* CCISS_CMD_H */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/block/cciss_scsi.c linux-2.4.20-wolk4.16-fullkernel/drivers/block/cciss_scsi.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/block/cciss_scsi.c	2004-06-29 11:24:47.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/block/cciss_scsi.c	2004-09-05 15:48:30.000000000 +0200
@@ -589,6 +589,8 @@ cciss_find_non_disk_devices(int cntl_num
 
 	for(i=0; i<num_luns; i++) {
 		/* Execute an inquiry to figure the device type */
+		/* Skip over masked devices */
+		if (ld_buff->LUN[i][3] & 0xC0) continue;
 		memset(inq_buff, 0, sizeof(InquiryData_struct));
 		memcpy(scsi3addr, ld_buff->LUN[i], 8); /* ugly... */
 		return_code = sendcmd(CISS_INQUIRY, cntl_num, inq_buff,
@@ -1148,6 +1150,7 @@ cciss_update_non_disk_devices(int cntl_n
 		int devtype;
 
 		/* for each physical lun, do an inquiry */
+		if (ld_buff->LUN[i][3] & 0xC0) continue;
 		memset(inq_buff, 0, sizeof(InquiryData_struct));
 		memcpy(&scsi3addr[0], &ld_buff->LUN[i][0], 8);
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/block/cpqarray.c linux-2.4.20-wolk4.16-fullkernel/drivers/block/cpqarray.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/block/cpqarray.c	2004-06-29 11:24:47.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/block/cpqarray.c	2004-09-05 15:48:32.000000000 +0200
@@ -41,13 +41,13 @@
 
 #define SMART2_DRIVER_VERSION(maj,min,submin) ((maj<<16)|(min<<8)|(submin))
 
-#define DRIVER_NAME "Compaq SMART2 Driver (v 2.4.26)"
-#define DRIVER_VERSION SMART2_DRIVER_VERSION(2,4,26)
+#define DRIVER_NAME "Compaq SMART2 Driver (v 2.4.28)"
+#define DRIVER_VERSION SMART2_DRIVER_VERSION(2,4,28)
 
 /* Embedded module documentation macros - see modules.h */
 /* Original author Chris Frantz - Compaq Computer Corporation */
 MODULE_AUTHOR("Compaq Computer Corporation");
-MODULE_DESCRIPTION("Driver for Compaq Smart2 Array Controllers version 2.4.26");
+MODULE_DESCRIPTION("Driver for Compaq Smart2 Array Controllers version 2.4.28");
 MODULE_LICENSE("GPL");
 
 #define MAJOR_NR COMPAQ_SMART2_MAJOR
@@ -180,6 +180,7 @@ static int revalidate_allvol(kdev_t dev)
 
 static int deregister_disk(int ctlr, int logvol);
 static int register_new_disk(int cltr,int logvol);
+static int cpqarray_register_ctlr(int ctlr, int type);
 
 #ifdef CONFIG_PROC_FS
 static void ida_procinit(int i);
@@ -330,6 +331,14 @@ static int ida_proc_get_info(char *buffe
 MODULE_PARM(eisa, "1-8i");
 EXPORT_NO_SYMBOLS;
 
+/* This is a bit of a hack... */
+int __init init_cpqarray_module(void)
+{
+	if (cpqarray_init() == 0) /* all the block dev numbers already used */
+		return -ENODEV;	  /* or no controllers were found */
+	return 0;
+}
+
 static void release_io_mem(ctlr_info_t *c)
 {
 	/* if IO mem was not protected do nothing */
@@ -462,10 +471,111 @@ static int cpq_merge_requests_fn(request
 	return 1;
 }
 
+static int cpqarray_register_ctlr(int ctlr, int type)
+{
+	request_queue_t *q;
+	int j;
+	
+	/*
+	 * register block devices
+	 * Find disks and fill in structs
+	 * Get an interrupt, set the Q depth and get into /proc
+	 */
+
+	/* If this successful it should insure that we are the only */
+	/* instance of the driver for this card */
+	if (register_blkdev(MAJOR_NR+ctlr, hba[ctlr]->devname, &ida_fops)) {
+		printk(KERN_ERR "cpqarray: Unable to get major number %d\n", MAJOR_NR+ctlr);
+		goto err_out;
+	}
+
+	hba[ctlr]->access.set_intr_mask(hba[ctlr], 0);
+	if (request_irq(hba[ctlr]->intr, do_ida_intr,
+		SA_INTERRUPT|SA_SHIRQ|SA_SAMPLE_RANDOM,
+		hba[ctlr]->devname, hba[ctlr])) {
+		printk(KERN_ERR "cpqarray: Unable to get irq %d for %s\n",
+			hba[ctlr]->intr, hba[ctlr]->devname);
+		unregister_blkdev(MAJOR_NR+ctlr, hba[ctlr]->devname);
+		goto err_out;
+	}
+	hba[ctlr]->cmd_pool = (cmdlist_t *)pci_alloc_consistent(
+		hba[ctlr]->pci_dev, NR_CMDS * sizeof(cmdlist_t),
+		&(hba[ctlr]->cmd_pool_dhandle));
+	hba[ctlr]->cmd_pool_bits = (__u32*)kmalloc(
+		((NR_CMDS+31)/32)*sizeof(__u32), GFP_KERNEL);
+
+	if (hba[ctlr]->cmd_pool_bits == NULL || hba[ctlr]->cmd_pool == NULL) {
+		if (hba[ctlr]->cmd_pool_bits)
+			kfree(hba[ctlr]->cmd_pool_bits);
+		if (hba[ctlr]->cmd_pool)
+			pci_free_consistent(hba[ctlr]->pci_dev,
+				NR_CMDS * sizeof(cmdlist_t),
+				hba[ctlr]->cmd_pool,
+				hba[ctlr]->cmd_pool_dhandle);
+
+		free_irq(hba[ctlr]->intr, hba[ctlr]);
+		unregister_blkdev(MAJOR_NR+ctlr, hba[ctlr]->devname);
+		printk( KERN_ERR "cpqarray: out of memory");
+		goto err_out;
+	}
+	memset(hba[ctlr]->cmd_pool, 0, NR_CMDS * sizeof(cmdlist_t));
+	memset(hba[ctlr]->cmd_pool_bits, 0, ((NR_CMDS+31)/32)*sizeof(__u32));
+	printk(KERN_INFO "cpqarray: Finding drives on %s", hba[ctlr]->devname);
+	getgeometry(ctlr);
+	start_fwbk(ctlr);
+
+	hba[ctlr]->access.set_intr_mask(hba[ctlr], FIFO_NOT_EMPTY);
+
+	ida_procinit(ctlr);
+
+	q = BLK_DEFAULT_QUEUE(MAJOR_NR + ctlr);
+	q->queuedata = hba[ctlr];
+	blk_init_queue(q, do_ida_request);
+	if (type)
+		blk_queue_bounce_limit(q, hba[ctlr]->pci_dev->dma_mask);
+	blk_queue_headactive(q, 0);
+	blksize_size[MAJOR_NR+ctlr] = hba[ctlr]->blocksizes;
+	hardsect_size[MAJOR_NR+ctlr] = hba[ctlr]->hardsizes;
+	read_ahead[MAJOR_NR+ctlr] = READ_AHEAD;
+
+	q->back_merge_fn = cpq_back_merge_fn;
+	q->front_merge_fn = cpq_front_merge_fn;
+	q->merge_requests_fn = cpq_merge_requests_fn;
+
+	hba[ctlr]->gendisk.major = MAJOR_NR + ctlr;
+	hba[ctlr]->gendisk.major_name = "ida";
+	hba[ctlr]->gendisk.minor_shift = NWD_SHIFT;
+	hba[ctlr]->gendisk.max_p = IDA_MAX_PART;
+	hba[ctlr]->gendisk.part = hba[ctlr]->hd;
+	hba[ctlr]->gendisk.sizes = hba[ctlr]->sizes;
+	hba[ctlr]->gendisk.nr_real = hba[ctlr]->highest_lun+1;
+	hba[ctlr]->gendisk.fops = &ida_fops;
+
+	/* Get on the disk list */
+	add_gendisk(&(hba[ctlr]->gendisk));
+
+	init_timer(&hba[ctlr]->timer);
+	hba[ctlr]->timer.expires = jiffies + IDA_TIMER;
+	hba[ctlr]->timer.data = (unsigned long)hba[ctlr];
+	hba[ctlr]->timer.function = ida_timer;
+	add_timer(&hba[ctlr]->timer);
+
+	ida_geninit(ctlr);
+	for(j=0; j<NWD; j++)
+		register_disk(&(hba[ctlr]->gendisk), MKDEV(MAJOR_NR+ctlr,j<<4),
+			IDA_MAX_PART, &ida_fops, hba[ctlr]->drv[j].nr_blks);
+	return(ctlr);
+
+err_out:
+	release_io_mem(hba[ctlr]);
+	free_hba(ctlr);
+	return (-1);
+}
+
+
 static int __init cpqarray_init_one( struct pci_dev *pdev,
 	const struct pci_device_id *ent)
 {
-	request_queue_t *q;
         int i,j;
 
 
@@ -492,102 +602,7 @@ static int __init cpqarray_init_one( str
 		return (-1);
 	}
 			
-	/* 
-	 * register block devices
-	 * Find disks and fill in structs
-	 * Get an interrupt, set the Q depth and get into /proc
-	 */
-	
-	/* If this successful it should insure that we are the only */
-	/* instance of the driver */	
-	if (register_blkdev(MAJOR_NR+i, hba[i]->devname, &ida_fops)) {
-        	printk(KERN_ERR "cpqarray: Unable to get major number %d for ida\n",
-                                MAJOR_NR+i);
-                release_io_mem(hba[i]);
-                free_hba(i);
-                return (-1);
-        }
-
-	
-	hba[i]->access.set_intr_mask(hba[i], 0);
-	if (request_irq(hba[i]->intr, do_ida_intr,
-		SA_INTERRUPT | SA_SHIRQ | SA_SAMPLE_RANDOM, 
-				hba[i]->devname, hba[i])) {
-
-		printk(KERN_ERR "cpqarray: Unable to get irq %d for %s\n", 
-				hba[i]->intr, hba[i]->devname);
-		unregister_blkdev(MAJOR_NR+i, hba[i]->devname);
-		release_io_mem(hba[i]);
-                free_hba(i);
-                return (-1);
-	}
-	hba[i]->cmd_pool = (cmdlist_t *)pci_alloc_consistent(
-	hba[i]->pci_dev, NR_CMDS * sizeof(cmdlist_t), 
-				&(hba[i]->cmd_pool_dhandle));
-	hba[i]->cmd_pool_bits = (__u32*)kmalloc(
-				((NR_CMDS+31)/32)*sizeof(__u32), GFP_KERNEL);
-		
-	if(hba[i]->cmd_pool_bits == NULL || hba[i]->cmd_pool == NULL) {
-		if(hba[i]->cmd_pool_bits)
-			kfree(hba[i]->cmd_pool_bits);
-		if(hba[i]->cmd_pool)
-			pci_free_consistent(hba[i]->pci_dev, 
-				NR_CMDS * sizeof(cmdlist_t), 
-				hba[i]->cmd_pool, hba[i]->cmd_pool_dhandle);
-		free_irq(hba[i]->intr, hba[i]);
-		unregister_blkdev(MAJOR_NR+i, hba[i]->devname);
-                printk( KERN_ERR "cpqarray: out of memory");
-		release_io_mem(hba[i]);
-                free_hba(i);
-                return (-1);
-	}
-	memset(hba[i]->cmd_pool, 0, NR_CMDS * sizeof(cmdlist_t));
-	memset(hba[i]->cmd_pool_bits, 0, ((NR_CMDS+31)/32)*sizeof(__u32));
-	printk(KERN_INFO "cpqarray: Finding drives on %s", hba[i]->devname);
-	getgeometry(i);
-	start_fwbk(i); 
-
-	hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
-
-	ida_procinit(i);
-
-	q = BLK_DEFAULT_QUEUE(MAJOR_NR + i);
-	q->queuedata = hba[i];
-	blk_init_queue(q, do_ida_request);
-	blk_queue_bounce_limit(q, hba[i]->pci_dev->dma_mask);
-	blk_queue_headactive(q, 0);
-	blksize_size[MAJOR_NR+i] = hba[i]->blocksizes;
-	hardsect_size[MAJOR_NR+i] = hba[i]->hardsizes;
-	read_ahead[MAJOR_NR+i] = READ_AHEAD;
-
-	q->back_merge_fn = cpq_back_merge_fn;
-	q->front_merge_fn = cpq_front_merge_fn;
-	q->merge_requests_fn = cpq_merge_requests_fn;
-
-	hba[i]->gendisk.major = MAJOR_NR + i;
-	hba[i]->gendisk.major_name = "ida";
-	hba[i]->gendisk.minor_shift = NWD_SHIFT;
-	hba[i]->gendisk.max_p = IDA_MAX_PART;
-	hba[i]->gendisk.part = hba[i]->hd;
-	hba[i]->gendisk.sizes = hba[i]->sizes;
-	hba[i]->gendisk.nr_real = hba[i]->highest_lun+1; 
-	hba[i]->gendisk.fops = &ida_fops;
-	
-		/* Get on the disk list */
-	add_gendisk(&(hba[i]->gendisk));
-
-	init_timer(&hba[i]->timer);
-	hba[i]->timer.expires = jiffies + IDA_TIMER;
-	hba[i]->timer.data = (unsigned long)hba[i];
-	hba[i]->timer.function = ida_timer;
-	add_timer(&hba[i]->timer);
-
-	ida_geninit(i);
-	for(j=0; j<NWD; j++)	
-		register_disk(&(hba[i]->gendisk), MKDEV(MAJOR_NR+i,j<<4),
-			IDA_MAX_PART, &ida_fops, hba[i]->drv[j].nr_blks);
-
-	return(i);
+	return (cpqarray_register_ctlr(i, 1));
 }
 static struct pci_driver cpqarray_pci_driver = {
         name:   "cpqarray",
@@ -608,7 +623,7 @@ int __init cpqarray_init(void)
 
 	/* detect controllers */
 	printk(DRIVER_NAME "\n");
-	pci_register_driver(&cpqarray_pci_driver);
+	pci_module_init(&cpqarray_pci_driver);
 	cpqarray_eisa_detect();
 
 	for(i=0; i< MAX_CTLR; i++) {
@@ -649,8 +664,9 @@ static void free_hba(int i)
  */
 static int cpqarray_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
 {
-	ushort subsystem_vendor_id, subsystem_device_id, command;
-	unchar irq;
+	ushort vendor_id, device_id, command;
+	unchar cache_line_size, latency_timer;
+	unchar irq, revision;
 	unsigned long addr[6];
 	__u32 board_id;
 
@@ -664,13 +680,10 @@ static int cpqarray_pci_init(ctlr_info_t
 	}
 	
 	c->pci_dev = pdev;
-	subsystem_vendor_id = pdev->subsystem_vendor;
-	subsystem_device_id = pdev->subsystem_device;
+	vendor_id = pdev->vendor;
+	device_id = pdev->device;
 	irq = pdev->irq;
 
-	board_id = (((__u32) (subsystem_device_id) << 16) & 0xffff0000) |
-			(__u32) (subsystem_vendor_id);
-	
 	for(i=0; i<6; i++)
 		addr[i] = pci_resource_start(pdev, i);
 
@@ -683,6 +696,25 @@ static int cpqarray_pci_init(ctlr_info_t
 		return -1;
 	}
 
+	pci_read_config_byte(pdev, PCI_CLASS_REVISION, &revision);
+	pci_read_config_byte(pdev, PCI_CACHE_LINE_SIZE, &cache_line_size);
+	pci_read_config_byte(pdev, PCI_LATENCY_TIMER, &latency_timer);
+
+	pci_read_config_dword(pdev, 0x2c, &board_id);
+
+DBGINFO(
+	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] = %lx\n", i, addr[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);
+);
+
 	c->intr = irq;
 	for(i=0; i<6; i++) {
 		if (pci_resource_flags(pdev, i) & PCI_BASE_ADDRESS_SPACE_IO) { 
@@ -843,6 +875,11 @@ DBGINFO(
 
 		num_ctlr++;
 		i++;
+
+		if (cpqarray_register_ctlr(ctlr, 0) == -1)
+			printk(KERN_WARNING 
+				"cpqarray%d: Can't register EISA controller\n",
+				ctlr);
 	}
 
 	return num_ctlr;
@@ -923,6 +960,20 @@ static inline cmdlist_t *removeQ(cmdlist
 	return c;
 }
 
+static inline void complete_buffers(struct buffer_head *bh, int ok)
+{
+	struct buffer_head *xbh;
+	while(bh) {
+		xbh = bh->b_reqnext;
+		bh->b_reqnext = NULL;
+		
+		blk_finished_io(bh->b_size >> 9);
+		bh->b_end_io(bh, ok);
+
+		bh = xbh;
+	}
+}
+
 /*
  * Get a request and submit it to the controller.
  * This routine needs to grab all the requests it possibly can from the
@@ -1057,19 +1108,6 @@ static void start_io(ctlr_info_t *h)
 	}
 }
 
-static inline void complete_buffers(struct buffer_head *bh, int ok)
-{
-	struct buffer_head *xbh;
-	while(bh) {
-		xbh = bh->b_reqnext;
-		bh->b_reqnext = NULL;
-		
-		blk_finished_io(bh->b_size >> 9);
-		bh->b_end_io(bh, ok);
-
-		bh = xbh;
-	}
-}
 /*
  * Mark all buffers that cmd was responsible for
  */
@@ -1108,6 +1146,7 @@ static inline void complete_command(cmdl
 
 	complete_buffers(cmd->rq->bh, ok);
 	DBGPX(printk("Done with %p\n", cmd->rq););
+	req_finished_io(cmd->rq);
 	end_that_request_last(cmd->rq);
 }
 
@@ -1352,6 +1391,7 @@ static int ida_ioctl(struct inode *inode
 	case BLKFLSBUF:
 	case BLKBSZSET:
 	case BLKBSZGET:
+	case BLKSSZGET:
 	case BLKROSET:
 	case BLKROGET:
 	case BLKRASET:
@@ -1626,10 +1666,9 @@ static int ida_ctlr_big_ioctl(int ctlr, 
 	/* Wait for completion */
 	wait_for_completion(&wait);
 	/* Unmap the DMA  */
-	for (i=0; i<c->req.hdr.sg_cnt; i++) {
+	for(i=0; i<c->req.hdr.sg_cnt; i++) {
 		pci_unmap_single(h->pci_dev, c->req.sg[i].addr, 
 				c->req.sg[i].size, PCI_DMA_BIDIRECTIONAL);
-		c->req.sg[i].addr = 0;
 	}
 
 	/* if we are reading data from the hardware copy it back to user */
@@ -1650,26 +1689,31 @@ static int ida_ctlr_big_ioctl(int ctlr, 
 
 	io->rcode = c->req.hdr.rcode;
 
-ida_alloc_cleanup:
-	if (scsi_param) {
+	if(scsi_param) {
 		pci_unmap_single(h->pci_dev, c->req.hdr.blk,
 			sizeof(scsi_param_t), PCI_DMA_BIDIRECTIONAL);
 		/* copy the scsi_params back to the user */ 
-		if (error == 0 &&
-			copy_to_user(io->scsi_param, scsi_param, 
+		if( copy_to_user(io->scsi_param, scsi_param, 
 					sizeof(scsi_param_t))) {
 			error = -EFAULT;	
 		}
 		kfree(scsi_param);
 	}
+	cmd_free(h, c, 0);
+	return(error);
 	
+ida_alloc_cleanup:
+	if(scsi_param) {
+		pci_unmap_single(h->pci_dev, c->req.hdr.blk,
+			sizeof(scsi_param_t), PCI_DMA_BIDIRECTIONAL);
+		kfree(scsi_param);
+	}
 	for (i=0; i<sg_used; i++) {
-		if (c->req.sg[i].addr != 0)
-			pci_unmap_single(h->pci_dev, c->req.sg[i].addr,
-					buff_size[i], PCI_DMA_BIDIRECTIONAL);
-		
-		if (buff[i] != NULL)
-			kfree(buff[i]);
+		if(buff[sg_used] != NULL) {	
+			pci_unmap_single(h->pci_dev, c->req.sg[i].addr, 
+				buff_size[sg_used], PCI_DMA_BIDIRECTIONAL);
+			kfree(buff[sg_used]);
+		}
 	}	
 	cmd_free(h, c, 0);
 	return(error);
@@ -2425,18 +2469,6 @@ static void getgeometry(int ctlr)
 
 }
 
-/* This is a bit of a hack... */
-int __init init_cpqarray_module(void)
-{
-	if (cpqarray_init() == 0) {
-		/* all the block dev numbers already used
-		 * or no controllers were found */
-        	pci_unregister_driver(&cpqarray_pci_driver);
-		return -ENODEV;	 
-	}
-	return 0;
-}
-
 static void __exit cleanup_cpqarray_module(void)
 {
         int i;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/block/elevator.c linux-2.4.20-wolk4.16-fullkernel/drivers/block/elevator.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/block/elevator.c	2004-06-29 11:26:19.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/block/elevator.c	2004-09-05 16:09:22.000000000 +0200
@@ -74,91 +74,33 @@ inline int bh_rq_in_between(struct buffe
 	return 0;
 }
 
-static int rq_mergeable(struct request *req, struct buffer_head *bh,
-			request_queue_t *q, int rw, int count, int max_sectors)
-{
-#if 0
-	if (q->head_active && !q->plugged) {
-		struct request *next;
-		next = blkdev_entry_next_request(&q->queue_head);
-		if (next == req)
-			return 0;
-	}
-#endif
-	if (q->head_active)
-		return 0;
-	if (req->waiting)
-		return 0;
-	if (req->rq_dev != bh->b_rdev)
-		return 0;
-	if (req->cmd != rw)
-		return 0;
-	if (req->nr_sectors + count > max_sectors)
-		return 0;
-	if (bh_elv_seq(bh) != bh_elv_seq(req->bh))
-		return 0;
-
-	return 1;
-}
 
 int elevator_linus_merge(request_queue_t *q, struct request **req,
 			 struct list_head * head,
 			 struct buffer_head *bh, int rw,
 			 int max_sectors)
 {
-	struct list_head *entry, *real_head;
+	struct list_head *entry = &q->queue_head;
 	unsigned int count = bh->b_size >> 9, ret = ELEVATOR_NO_MERGE;
 	const int max_bomb_segments = q->elevator.max_bomb_segments;
 	struct request *__rq;
 	int passed_a_read = 0;
 	int backmerge_only = 0;
 
-	if (!bh_elv_seq(bh))
-		entry = &q->queue_head;
-	else
-		entry = &q->atomic_head;
-	real_head = entry;
-
-#if 0
-	/*
-	 * check last merge hint
-	 */
-	if (q->last_merge) {
-		__rq = q->last_merge;
-
-		if (rq_mergeable(__rq, bh, q, rw, count, max_sectors)) {
-			if (__rq->sector + __rq->nr_sectors == bh->b_rsector) {
-				*req = __rq;
-				ret = ELEVATOR_BACK_MERGE;
-				goto out;
-			} else if (__rq->sector - count == bh->b_rsector) {
-				*req = __rq;
-				ret = ELEVATOR_FRONT_MERGE;
-				goto out;
-			}
-		}
-	}
-#endif
-
 	while (!backmerge_only && (entry = entry->prev) != head) {
 		__rq = blkdev_entry_to_request(entry);
 
 		/*
 		 * we can't insert beyond a zero sequence point
 		 */
-		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.
-			 */
+		if (__rq->elevator_sequence <= 0)
 			backmerge_only = 1;
 
 		if (__rq->waiting)
 			continue;
 		if (__rq->rq_dev != bh->b_rdev)
 			continue;
-		if (!*req && bh_rq_in_between(bh, __rq, real_head) && !backmerge_only)
+		if (!*req && bh_rq_in_between(bh, __rq, &q->queue_head) && !backmerge_only)
 			*req = __rq;
 		if (__rq->cmd != WRITE)
 			passed_a_read = 1;
@@ -166,30 +108,18 @@ int elevator_linus_merge(request_queue_t
 			continue;
 		if (__rq->nr_sectors + count > max_sectors)
 			continue;
-		/*
-		 * possibly move this inside the merge path and make it a break
-		 */
-		if (bh_elv_seq(bh) != bh_elv_seq(__rq->bh))
-			continue;
 		if (__rq->sector + __rq->nr_sectors == bh->b_rsector) {
-			/*
-			 * Really here we could re-increase the elevator_latency of __rq,
-			 * but it's not so important.
-			 */
 			ret = ELEVATOR_BACK_MERGE;
 			*req = __rq;
-			q->last_merge = __rq;
 			break;
 		} else if (__rq->sector - count == bh->b_rsector && !backmerge_only) {
 			ret = ELEVATOR_FRONT_MERGE;
 			__rq->elevator_sequence--;
 			*req = __rq;
-			q->last_merge = __rq;
 			break;
 		}
 	}
 
-out:
 	/*
 	 * account merge (ret != 0, cost is 1) or seeky insert (*req is set,
 	 * cost is ELV_LINUS_SEEK_COST
@@ -198,7 +128,7 @@ out:
 		int scan_cost = ret ? 1 : ELV_LINUS_SEEK_COST;
 		struct list_head *entry = &(*req)->queue;
 
-		while ((entry = entry->next) != real_head) {
+		while ((entry = entry->next) != &q->queue_head) {
 			__rq = blkdev_entry_to_request(entry);
 			__rq->elevator_sequence -= scan_cost;
 		}
@@ -262,8 +192,6 @@ void elevator_linus_merge_req(struct req
 {
 	if (next->elevator_sequence < req->elevator_sequence)
 		req->elevator_sequence = next->elevator_sequence;
-	if (req->q)
-		req->q->last_merge = req;
 }
 
 /*
@@ -274,18 +202,13 @@ int elevator_noop_merge(request_queue_t 
 			struct buffer_head *bh, int rw,
 			int max_sectors)
 {
-	struct list_head *entry, *real_head;
+	struct list_head *entry;
 	unsigned int count = bh->b_size >> 9;
 
-	if (!bh_elv_seq(bh))
-		entry = &q->queue_head;
-	else
-		entry = &q->atomic_head;
-	real_head = entry;
-
-	if (list_empty(real_head))
+	if (list_empty(&q->queue_head))
 		return ELEVATOR_NO_MERGE;
 
+	entry = &q->queue_head;
 	while ((entry = entry->prev) != head) {
 		struct request *__rq = blkdev_entry_to_request(entry);
 
@@ -297,11 +220,6 @@ int elevator_noop_merge(request_queue_t 
 			continue;
 		if (__rq->waiting)
 			continue;
-		/*
-		 * possibly move this inside the merge path and make it a break
-		 */
-		if (bh_elv_seq(bh) != bh_elv_seq(__rq->bh))
-			continue;
 		if (__rq->sector + __rq->nr_sectors == bh->b_rsector) {
 			*req = __rq;
 			return ELEVATOR_BACK_MERGE;
@@ -311,7 +229,7 @@ int elevator_noop_merge(request_queue_t 
 		}
 	}
 
-	*req = blkdev_entry_to_request(real_head->prev);
+	*req = blkdev_entry_to_request(q->queue_head.prev);
 	return ELEVATOR_NO_MERGE;
 }
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/block/ll_rw_blk.c linux-2.4.20-wolk4.16-fullkernel/drivers/block/ll_rw_blk.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/block/ll_rw_blk.c	2004-06-29 11:31:48.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/block/ll_rw_blk.c	2004-09-05 16:09:22.000000000 +0200
@@ -51,8 +51,6 @@ static kmem_cache_t *request_cachep;
  */
 DECLARE_TASK_QUEUE(tq_disk);
 
-LIST_HEAD(blk_atomic_head);
-
 /*
  * Protect the request list against multiple users..
  *
@@ -127,25 +125,6 @@ int * max_sectors[MAX_BLKDEV];
  */
 char * blkdev_varyio[MAX_BLKDEV];
 
-/*
- * only allow merging of buffer_heads with identical sequence, for transparent
- * support for writing atomic blocks larger than what a single bh can hold
- */
-static unsigned int blk_atomic_seq;
-static spinlock_cacheline_t blk_atomic_lock_cacheline = {SPIN_LOCK_UNLOCKED};
-static spinlock_cacheline_t blk_atomic_queue_lock_cacheline = {SPIN_LOCK_UNLOCKED};
-
-#ifdef CONFIG_SMP
-struct blk_atomic_cpu {
-	unsigned int seq;
-	unsigned int left;
-} ____cacheline_aligned_in_smp;
-
-struct blk_atomic_cpu __cacheline_aligned_in_smp blk_atomic_cpu[NR_CPUS];
-
-#define BLK_ATOMIC_SEQ_GRAB	1024
-#endif
-
 unsigned long blk_max_low_pfn, blk_max_pfn;
 int blk_nohighio = 0;
 
@@ -153,41 +132,6 @@ int block_dump = 0;
 
 static struct timer_list writeback_timer;
 
-unsigned int blk_get_atomic_seq(void)
-{
-	unsigned int ret;
-
-#ifdef CONFIG_SMP
-	{
-		struct blk_atomic_cpu *bcpu = &blk_atomic_cpu[smp_processor_id()];
-
-restart:
-		if (unlikely(!bcpu->left)) {
-			spin_lock_irq(&blk_atomic_lock);
-			bcpu->seq = blk_atomic_seq;
-			blk_atomic_seq += BLK_ATOMIC_SEQ_GRAB;
-			spin_unlock_irq(&blk_atomic_lock);
-			bcpu->left = BLK_ATOMIC_SEQ_GRAB;
-		}
-		bcpu->seq++;
-		bcpu->left--;
-		if (unlikely(!bcpu->seq))
-			goto restart;
-
-		ret = bcpu->seq;
-	}
-#else
-	spin_lock_irq(&blk_atomic_lock);
-	ret = ++blk_atomic_seq;
-	if (unlikely(!ret)) {
-		ret = 1;
-		++blk_atomic_seq;
-	}
-	spin_unlock_irq(&blk_atomic_lock);
-#endif
-	return ret;
-}
-
 static inline int get_max_sectors(kdev_t dev)
 {
 	if (!max_sectors[MAJOR(dev)])
@@ -428,18 +372,10 @@ static void generic_plug_device(request_
  */
 static inline void __generic_unplug_device(request_queue_t *q)
 {
-	struct request *next;
-
 	if (q->plugged) {
 		q->plugged = 0;
-		if (!list_empty(&q->queue_head)) {
-			next = blkdev_entry_next_request(&q->queue_head);
-
-			if (next == q->last_merge)
-				q->last_merge = NULL;
-
+		if (!list_empty(&q->queue_head))
 			q->request_fn(q);
-		}
 	}
 }
 
@@ -453,91 +389,6 @@ void generic_unplug_device(void *data)
 	spin_unlock_irqrestore(q->queue_lock, flags);
 }
 
-static void blk_atomic_add(request_queue_t *q)
-{
-	spin_lock_irq(&blk_atomic_queue_lock);
-	/* it's empty only when it's out of the blk_atomic_head queue */
-	if (list_empty(&q->atomic_entry))
-		list_add_tail(&q->atomic_entry, &blk_atomic_head);
-	spin_unlock_irq(&blk_atomic_queue_lock);
-}
-
-static struct list_head *blk_find_insert_point(request_queue_t *q,
-					       struct request *rq)
-{
-	struct list_head *head = &q->queue_head, *insert = q->queue_head.prev;
-	struct buffer_head *bh;
-	int elv_seq;
-	struct request *dummy;
-
-	if (list_empty(head))
-		goto done;
-	else if (q->head_active && !q->plugged)
-		head = head->next;
-
-	dummy = NULL;
-	bh = rq->bh;
-
-	elv_seq = bh_elv_seq(bh);
-	bh_elv_seq(bh) = 0;
-
-	q->elevator.elevator_merge_fn(q, &dummy, head, bh,
-				      -1 /* non cmd -> no merge */,
-				      0 /* too small max_sectors -> no merge */);
-
-	bh_elv_seq(bh) = elv_seq;
-
-	if (dummy)
-		insert = &dummy->queue;
-
-done:
-	return insert;
-}
-
-void blk_refile_atomic_queue(int sequence)
-{
-	request_queue_t *q;
-	struct request * rq;
-	unsigned long flags;
-	struct list_head * q_entry, * rq_entry;
-	int __sequence;
-
-	spin_lock_irqsave(&blk_atomic_queue_lock, flags);
-
-	q_entry = blk_atomic_head.next;
-	while (q_entry != &blk_atomic_head) {
-		q = list_entry(q_entry, request_queue_t, atomic_entry);
-		q_entry = q_entry->next;
-
-		spin_lock(q->queue_lock);
-		rq_entry = q->atomic_head.next;
-		while (rq_entry != &q->atomic_head) {
-			rq = list_entry(rq_entry, struct request, queue);
-			rq_entry = rq_entry->next;
-
-			BUG_ON(!rq->q);
-			BUG_ON(!rq->bh);
-			__sequence = bh_elv_seq(rq->bh);
-			BUG_ON(!__sequence);
-			if (__sequence == sequence) {
-				struct list_head *ipoint;
-
-				list_del(&rq->queue);
-				if (list_empty(&q->queue_head))
-					q->plug_device_fn(q, rq->bh->b_rdev);
-
-				ipoint = blk_find_insert_point(q, rq);
-				list_add(&rq->queue, ipoint);
-			}
-		}
-		if (list_empty(&q->atomic_head))
-			list_del_init(&q->atomic_entry);
-		spin_unlock(q->queue_lock);
-	}
-
-	spin_unlock_irqrestore(&blk_atomic_queue_lock, flags);
-}
-
 /** blk_grow_request_list
  *  @q: The &request_queue_t
  *  @nr_requests: how many requests are desired
@@ -612,8 +463,8 @@ static void blk_init_free_list(request_q
 		nr_requests /= 2;
 	if (nr_requests < 32)
 		nr_requests = 32;
-	if (nr_requests > 1024)
-		nr_requests = 1024;
+	if (nr_requests > 512)
+		nr_requests = 512;
 	/* notice early if anybody screwed the defaults */
 	BUG_ON(!nr_requests);
 	BUG_ON(!max_queue_sectors);
@@ -661,8 +512,6 @@ static int __make_request(request_queue_
 void blk_init_queue(request_queue_t * q, request_fn_proc * rfn)
 {
 	INIT_LIST_HEAD(&q->queue_head);
-	INIT_LIST_HEAD(&q->atomic_head);
-	INIT_LIST_HEAD(&q->atomic_entry);
 	elevator_init(&q->elevator, ELEVATOR_LINUS);
 	q->queue_lock		= &io_request_lock;
 	blk_init_free_list(q);
@@ -676,7 +525,6 @@ void blk_init_queue(request_queue_t * q,
 	q->plug_tq.data		= q;
 	q->plugged        	= 0;
 	q->can_throttle		= 0;
-	q->last_merge		= NULL;
 
 	/*
 	 * These booleans describe the queue properties.  We set the
@@ -1011,14 +859,16 @@ static inline void add_request(request_q
 {
 	drive_stat_acct(req->rq_dev, req->cmd, req->nr_sectors, 1);
 
+	if (!q->plugged && q->head_active && insert_here == &q->queue_head) {
+		spin_unlock_irq(q->queue_lock);
+		BUG();
+	}
+
 	/*
 	 * elevator indicated where it wants this request to be
 	 * inserted at elevator_merge time
 	 */
 	list_add(&req->queue, insert_here);
-
-	if (!q->last_merge)
-		q->last_merge = req;
 }
 
 /*
@@ -1088,8 +938,6 @@ static void attempt_merge(request_queue_
 	    || req->nr_sectors + next->nr_sectors > max_sectors
 	    || next->waiting)
 		return;
-	if (bh_elv_seq(req->bh) != bh_elv_seq(next->bh))
-		return;
 	/*
 	 * If we are not allowed to merge these requests, then
 	 * return.  If we are allowed to merge, then the count
@@ -1122,12 +970,11 @@ static void attempt_merge(request_queue_
 }
 
 static inline void attempt_back_merge(request_queue_t * q,
-				      struct list_head * head,
 				      struct request *req,
 				      int max_sectors,
 				      int max_segments)
 {
-	if (&req->queue == head->prev)
+	if (&req->queue == q->queue_head.prev)
 		return;
 	attempt_merge(q, req, max_sectors, max_segments);
 }
@@ -1153,11 +1000,10 @@ static int __make_request(request_queue_
 	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;
+	struct list_head *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;
@@ -1200,7 +1046,7 @@ static int __make_request(request_queue_
 	max_sectors = get_max_sectors(bh->b_rdev);
 
 	req = NULL;
-	real_head = head = !atomic ? &q->queue_head : &q->atomic_head;
+	head = &q->queue_head;
 	/*
 	 * Now we acquire the request spinlock, we have to be mega careful
 	 * not to schedule or do something nonatomic
@@ -1210,14 +1056,11 @@ 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 */
-			goto get_rq;
-		} else if (q->head_active && !q->plugged)
-			head = head->next;
-	} else if (list_empty(head))
+	if (list_empty(head)) {
+		q->plug_device_fn(q, bh->b_rdev); /* is atomic */
 		goto get_rq;
+	} else if (q->head_active && !q->plugged)
+		head = head->next;
 
 	el_ret = elevator->elevator_merge_fn(q, &req, head, bh, rw,max_sectors);
 	switch (el_ret) {
@@ -1234,7 +1077,7 @@ again:
 			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);
+			attempt_back_merge(q, req, max_sectors, max_segments);
 			goto out;
 
 		case ELEVATOR_FRONT_MERGE:
@@ -1298,10 +1141,8 @@ get_rq:
 			req = get_request(q, rw);
 			if (req == NULL) {
 				spin_unlock_irq(q->queue_lock);
-				if (atomic)
-					blk_refile_atomic_queue(atomic);
 				freereq = __get_request_wait(q, rw);
-				head = real_head;
+				head = &q->queue_head;
 				spin_lock_irq(q->queue_lock);
 				should_wake = 1;
 				goto again;
@@ -1328,7 +1169,6 @@ get_rq:
 	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);
@@ -1337,8 +1177,6 @@ out:
 	if (sync)
 		__generic_unplug_device(q);
 	spin_unlock_irq(q->queue_lock);
-	if (atomic_add)
-		blk_atomic_add(q);
 	return 0;
 end_io:
 	bh->b_end_io(bh, test_bit(BH_Uptodate, &bh->b_state));
@@ -1387,8 +1225,6 @@ void generic_make_request (int rw, struc
 
 	if (!bh->b_end_io)
 		BUG();
-	if (!buffer_atomic(bh))
-		bh->b_elv_sequence = 0;
 
 	/* Test device size, when known. */
 	if (blk_size[major])
@@ -1697,10 +1533,6 @@ int __init blk_dev_init(void)
 	memset(max_readahead, 0, sizeof(max_readahead));
 	memset(max_sectors, 0, sizeof(max_sectors));
 
-#ifdef CONFIG_SMP
-	memset(blk_atomic_cpu, 0, sizeof(blk_atomic_cpu));
-#endif
-
 	blk_max_low_pfn = max_low_pfn - 1;
 	blk_max_pfn = max_pfn - 1;
 
@@ -1824,5 +1656,3 @@ EXPORT_SYMBOL(blk_max_low_pfn);
 EXPORT_SYMBOL(blk_max_pfn);
 EXPORT_SYMBOL(blk_seg_merge_ok);
 EXPORT_SYMBOL(blk_nohighio);
-EXPORT_SYMBOL(blk_get_atomic_seq);
-EXPORT_SYMBOL(blk_refile_atomic_queue);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/block/loop.c linux-2.4.20-wolk4.16-fullkernel/drivers/block/loop.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/block/loop.c	2004-06-29 11:31:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/block/loop.c	2004-09-09 12:49:52.000000000 +0200
@@ -81,6 +81,7 @@
 #include <linux/smp_lock.h>
 #include <linux/swap.h>
 #include <linux/slab.h>
+#include <linux/spinlock.h>
 
 #include <asm/uaccess.h>
 #include <asm/byteorder.h>
@@ -107,6 +108,12 @@ static devfs_handle_t devfs_handle;     
 # include <asm/ioctl32.h>
 # define IOCTL32_COMPATIBLE_PTR ((void*)sys_ioctl)
 #endif
+#if (defined(__sparc__) || defined(__sparc64__)) && defined(CONFIG_SPARC32_COMPAT)
+  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);
+  extern int sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg);
+# define IOCTL32_COMPATIBLE_PTR ((void*)sys_ioctl)
+#endif
 
 /*
  * Transfer functions
@@ -170,37 +177,127 @@ struct loop_func_table xor_funcs = {
 }; 	
 
 #if CONFIG_BLK_DEV_LOOP_AES
+#if CONFIG_BLK_DEV_LOOP_KEYSCRUB
+# define KEY_ALLOC_COUNT  128
+#else
+# define KEY_ALLOC_COUNT  64
+#endif
+
 typedef struct {
-    aes_context *keyPtr[64];
+    aes_context *keyPtr[KEY_ALLOC_COUNT];
     unsigned    keyMask;
+#if CONFIG_BLK_DEV_LOOP_KEYSCRUB
+    rwlock_t    rwlock;
+    unsigned    reversed;
+    unsigned    blocked;
+    struct timer_list timer;
+#endif
 } AESmultiKey;
 
+#if CONFIG_BLK_DEV_LOOP_KEYSCRUB
+static void keyScrubWork(AESmultiKey *m)
+{
+    aes_context *a0, *a1;
+    u_int32_t *p;
+    int x, y, z;
+
+    z = m->keyMask + 1;
+    for(x = 0; x < z; x++) {
+        a0 = m->keyPtr[x];
+        a1 = m->keyPtr[x + z];
+        memcpy(a1, a0, sizeof(aes_context));
+        m->keyPtr[x] = a1;
+        m->keyPtr[x + z] = a0;
+        p = (u_int32_t *) a0;
+        y = sizeof(aes_context) / sizeof(u_int32_t);
+        while(y > 0) {
+            *p ^= 0xFFFFFFFF;
+            p++;
+            y--;
+        }
+    }
+    m->reversed ^= 1;
+
+    /* try to flush dirty cache data to RAM */
+#if defined(CONFIG_X86_64) || (defined(CONFIG_X86) && !defined(CONFIG_M386) && !defined(CONFIG_CPU_386))
+    __asm__ __volatile__ ("wbinvd": : :"memory");
+#else
+    mb();
+#endif
+}
+
+/* called only from loop thread process context */
+static void keyScrubThreadFn(AESmultiKey *m)
+{
+    write_lock(&m->rwlock);
+    if(!m->blocked) keyScrubWork(m);
+    write_unlock(&m->rwlock);
+}
+
+static void keyScrubTimerInit(struct loop_device *lo)
+{
+    AESmultiKey     *m;
+    unsigned long   expire;
+    static void keyScrubTimerFn(unsigned long);
+
+    m = (AESmultiKey *)lo->key_data;
+    expire = jiffies + HZ;
+    init_timer(&m->timer);
+    m->timer.expires = expire;
+    m->timer.data = (unsigned long)lo;
+    m->timer.function = keyScrubTimerFn;
+    add_timer(&m->timer);
+}
+
+/* called only from timer handler context */
+static void keyScrubTimerFn(unsigned long d)
+{
+    struct loop_device *lo = (struct loop_device *)d;
+    extern void loop_add_keyscrub_fn(struct loop_device *, void (*)(void *), void *);
+
+    /* rw lock needs process context, so make loop thread do scrubbing */
+    loop_add_keyscrub_fn(lo, (void (*)(void*))keyScrubThreadFn, lo->key_data);
+    /* start timer again */
+    keyScrubTimerInit(lo);
+}
+#endif
+
 static AESmultiKey *allocMultiKey(void)
 {
     AESmultiKey *m;
     aes_context *a;
-    int x, n;
+    int x = 0, n;
 
     m = (AESmultiKey *) kmalloc(sizeof(AESmultiKey), GFP_KERNEL);
     if(!m) return 0;
     memset(m, 0, sizeof(AESmultiKey));
+#if CONFIG_BLK_DEV_LOOP_KEYSCRUB
+    rwlock_init(&m->rwlock);
+    init_timer(&m->timer);
+    again:
+#endif
 
     n = PAGE_SIZE / sizeof(aes_context);
     if(!n) n = 1;
 
     a = (aes_context *) kmalloc(sizeof(aes_context) * n, GFP_KERNEL);
     if(!a) {
+#if CONFIG_BLK_DEV_LOOP_KEYSCRUB
+        if(x) kfree(m->keyPtr[0]);
+#endif
         kfree(m);
         return 0;
     }
 
-    x = 0;
-    while((x < 64) && n) {
+    while((x < KEY_ALLOC_COUNT) && n) {
         m->keyPtr[x] = a;
         a++;
         x++;
         n--;
     }
+#if CONFIG_BLK_DEV_LOOP_KEYSCRUB
+    if(x < 2) goto again;
+#endif
     return m;
 }
 
@@ -209,11 +306,17 @@ static void clearAndFreeMultiKey(AESmult
     aes_context *a;
     int x, n;
 
+#if CONFIG_BLK_DEV_LOOP_KEYSCRUB
+    /* stop scrub timer. loop thread was killed earlier */
+    del_timer_sync(&m->timer);
+    /* make sure allocated keys are in original order */
+    if(m->reversed) keyScrubWork(m);
+#endif
     n = PAGE_SIZE / sizeof(aes_context);
     if(!n) n = 1;
 
     x = 0;
-    while(x < 64) {
+    while(x < KEY_ALLOC_COUNT) {
         a = m->keyPtr[x];
         if(!a) break;
         memset(a, 0, sizeof(aes_context) * n);
@@ -228,7 +331,7 @@ static int multiKeySetup(struct loop_dev
 {
     AESmultiKey *m;
     aes_context *a;
-    int x, y, n;
+    int x, y, n, err = 0;
     union {
         u_int32_t     w[8]; /* needed for 4 byte alignment for b[] */
         unsigned char b[32];
@@ -240,22 +343,42 @@ static int multiKeySetup(struct loop_dev
     m = (AESmultiKey *)lo->key_data;
     if(!m) return -ENXIO;
 
+#if CONFIG_BLK_DEV_LOOP_KEYSCRUB
+    /* temporarily prevent loop thread from messing with keys */
+    write_lock(&m->rwlock);
+    m->blocked = 1;
+    /* make sure allocated keys are in original order */
+    if(m->reversed) keyScrubWork(m);
+    write_unlock(&m->rwlock);
+#endif
     n = PAGE_SIZE / sizeof(aes_context);
     if(!n) n = 1;
 
     x = 0;
-    while(x < 64) {
+    while(x < KEY_ALLOC_COUNT) {
         if(!m->keyPtr[x]) {
             a = (aes_context *) kmalloc(sizeof(aes_context) * n, GFP_KERNEL);
-            if(!a) return -ENOMEM;
+            if(!a) {
+                err = -ENOMEM;
+                goto error_out;
+            }
             y = x;
-            while((y < (x + n)) && (y < 64)) {
+            while((y < (x + n)) && (y < KEY_ALLOC_COUNT)) {
                 m->keyPtr[y] = a;
                 a++;
                 y++;
             }
         }
-        if(copy_from_user(&un.b[0], k, 32)) return -EFAULT;
+#if CONFIG_BLK_DEV_LOOP_KEYSCRUB
+        if(x >= 64) {
+            x++;
+            continue;
+        }
+#endif
+        if(copy_from_user(&un.b[0], k, 32)) {
+            err = -EFAULT;
+            goto error_out;
+        }
         aes_set_key(m->keyPtr[x], &un.b[0], lo->lo_encrypt_key_size, 0);
         k += 32;
         x++;
@@ -263,7 +386,14 @@ static int multiKeySetup(struct loop_dev
     m->keyMask = 0x3F;          /* range 0...63 */
     lo->lo_flags |= 0x100000;   /* multi-key (info exported to user space) */
     memset(&un.b[0], 0, 32);
-    return 0;
+error_out:
+#if CONFIG_BLK_DEV_LOOP_KEYSCRUB
+    /* re-enable loop thread key scrubbing */
+    write_lock(&m->rwlock);
+    m->blocked = 0;
+    write_unlock(&m->rwlock);
+#endif
+    return err;
 }
 
 void loop_compute_sector_iv(int devSect, u_int32_t *ivout)
@@ -350,6 +480,9 @@ static int transfer_aes(struct loop_devi
     y = m->keyMask;
     if(cmd == READ) {
         while(size) {
+#if CONFIG_BLK_DEV_LOOP_KEYSCRUB
+            read_lock(&m->rwlock);
+#endif
             a = m->keyPtr[((unsigned)devSect) & y];
             if(y) {
                 memcpy(&iv[0], raw_buf, 16);
@@ -388,14 +521,22 @@ static int transfer_aes(struct loop_devi
                     loop_buf += 16;
                 }
             } while(--x >= 0);
+#if CONFIG_BLK_DEV_LOOP_KEYSCRUB
+            read_unlock(&m->rwlock);
+#endif
             if(current->need_resched) {set_current_state(TASK_RUNNING);schedule();}
             size -= 512;
             devSect++;
         }
     } else {
         while(size) {
+#if CONFIG_BLK_DEV_LOOP_KEYSCRUB
+            read_lock(&m->rwlock);
+#endif
             a = m->keyPtr[((unsigned)devSect) & y];
             if(y) {
+                /* on 2.4 and later kernels, real raw_buf is not doing */
+                /* any writes now so it can be used as temp buffer */
                 memcpy(raw_buf, loop_buf, 512);
                 loop_compute_md5_iv(devSect, &iv[0], (u_int32_t *)(&raw_buf[16]));
                 x = 15;
@@ -438,6 +579,9 @@ static int transfer_aes(struct loop_devi
                     raw_buf += 16;
                 } while(--x >= 0);
             }
+#if CONFIG_BLK_DEV_LOOP_KEYSCRUB
+            read_unlock(&m->rwlock);
+#endif
             if(current->need_resched) {set_current_state(TASK_RUNNING);schedule();}
             size -= 512;
             devSect++;
@@ -460,6 +604,9 @@ static int keySetup_aes(struct loop_devi
     aes_set_key(m->keyPtr[0], &un.b[0], info->lo_encrypt_key_size, 0);
     memset(&info->lo_encrypt_key[0], 0, sizeof(info->lo_encrypt_key));
     memset(&un.b[0], 0, 32);
+#if CONFIG_BLK_DEV_LOOP_KEYSCRUB
+    keyScrubTimerInit(lo);
+#endif
     return(0);
 }
 
@@ -882,6 +1029,7 @@ static int do_bh_filebacked(struct loop_
 				printk(KERN_ERR "loop%d: read transfer error, sector %lu\n", lo->lo_number, IV);
 				goto kunmap_and_out;
 			}
+			flush_dcache_page(bh->b_page);
 		}
 		data += size;
 		len -= size;
@@ -1051,6 +1199,9 @@ static int loop_thread(void *data)
 
 			x = 0;
 			spin_lock_irq(&lo->lo_lock);
+#if CONFIG_BLK_DEV_LOOP_KEYSCRUB
+			if(lo->lo_keyscrub_fn) x = 1;
+#endif
 			if (lo->lo_bh_que0) {
 				x = 1;
 			} else if (lo->lo_bh_que1 || lo->lo_bh_que2) {
@@ -1067,6 +1218,12 @@ static int loop_thread(void *data)
 		set_current_state(TASK_RUNNING);
 		remove_wait_queue(&lo->lo_bh_wait, &waitq);
 
+#if CONFIG_BLK_DEV_LOOP_KEYSCRUB
+		if(lo->lo_keyscrub_fn) {
+			(*lo->lo_keyscrub_fn)(lo->lo_keyscrub_ptr);
+			lo->lo_keyscrub_fn = 0;
+		}
+#endif
 		/*
 		 * could be woken because of tear-down, not because of
 		 * pending work
@@ -1139,6 +1296,7 @@ static int loop_thread(void *data)
 			/* instead, recompute IV from original request */
 			md = bh_kmap(xbh);
 			x = lo_do_transfer(lo, READ, bh->b_data, md, bh->b_size, xbh->b_rsector + lo->lo_offs_sec - lo->lo_iv_remove);
+			flush_dcache_page(xbh->b_page);
 			bh_kunmap(xbh);
 			xbh->b_reqnext = NULL;
 			xbh->b_end_io(xbh, !x);
@@ -1210,6 +1368,9 @@ static int loop_set_fd(struct loop_devic
 	if (!(file->f_mode & FMODE_WRITE))
 		lo_flags |= LO_FLAGS_READ_ONLY;
 
+#if CONFIG_BLK_DEV_LOOP_KEYSCRUB
+	lo->lo_keyscrub_fn = 0;
+#endif
 	lo->lo_offset = lo->lo_sizelimit = 0;
 	lo->lo_offs_sec = lo->lo_iv_remove = 0;
 	lo->lo_bh_free = lo->lo_bh_que2 = lo->lo_bh_que1 = lo->lo_bh_que0 = NULL;
@@ -1466,6 +1627,9 @@ static int loop_clr_fd(struct loop_devic
 	lo->ioctl = NULL;
 	lo->lo_device = 0;
 	lo->lo_encrypt_type = 0;
+#if CONFIG_BLK_DEV_LOOP_KEYSCRUB
+	lo->lo_keyscrub_fn = 0;
+#endif
 	lo->lo_offset = lo->lo_sizelimit = 0;
 	lo->lo_offs_sec = lo->lo_iv_remove = 0;
 	lo->lo_encrypt_key_size = 0;
@@ -1893,9 +2057,11 @@ int __init loop_init(void)
 	}
 
 #if defined(IOCTL32_COMPATIBLE_PTR)
+	lock_kernel();
 	register_ioctl32_conversion(LOOP_SET_STATUS64, IOCTL32_COMPATIBLE_PTR);
 	register_ioctl32_conversion(LOOP_GET_STATUS64, IOCTL32_COMPATIBLE_PTR);
 	register_ioctl32_conversion(LOOP_MULTI_KEY_SETUP, IOCTL32_COMPATIBLE_PTR);
+	unlock_kernel();
 #endif
 
 	devfs_handle = devfs_mk_dir(NULL, "loop", NULL);
@@ -1904,6 +2070,11 @@ int __init loop_init(void)
 			      S_IFBLK | S_IRUSR | S_IWUSR | S_IRGRP,
 			      &lo_fops, NULL);
 
+#if CONFIG_BLK_DEV_LOOP_AES
+#if CONFIG_BLK_DEV_LOOP_KEYSCRUB
+	printk(KERN_INFO "loop: AES key scrubbing enabled\n");
+#endif
+#endif
 	printk(KERN_INFO "loop: loaded (max %d devices)\n", max_loop);
 	return 0;
 
@@ -1935,9 +2106,11 @@ void loop_exit(void)
 	kfree(loop_hardsizes);
 
 #if defined(IOCTL32_COMPATIBLE_PTR)
+	lock_kernel();
 	unregister_ioctl32_conversion(LOOP_SET_STATUS64);
 	unregister_ioctl32_conversion(LOOP_GET_STATUS64);
 	unregister_ioctl32_conversion(LOOP_MULTI_KEY_SETUP);
+	unlock_kernel();
 #endif
 }
 
@@ -1953,3 +2126,14 @@ static int __init max_loop_setup(char *s
 
 __setup("max_loop=", max_loop_setup);
 #endif
+
+#if CONFIG_BLK_DEV_LOOP_KEYSCRUB
+void loop_add_keyscrub_fn(struct loop_device *lo, void (*fn)(void *), void *ptr)
+{
+    lo->lo_keyscrub_ptr = ptr;
+    wmb();
+    lo->lo_keyscrub_fn = fn;
+    wake_up_interruptible(&lo->lo_bh_wait);
+}
+EXPORT_SYMBOL(loop_add_keyscrub_fn);
+#endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/block/rd.c linux-2.4.20-wolk4.16-fullkernel/drivers/block/rd.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/block/rd.c	2004-06-29 11:31:10.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/block/rd.c	2004-09-05 16:06:00.000000000 +0200
@@ -320,14 +320,19 @@ out:
 static ssize_t initrd_read(struct file *file, char *buf,
 			   size_t count, loff_t *ppos)
 {
-	int left;
+	loff_t n = *ppos;
+	unsigned pos = n;
+	unsigned left = initrd_end - initrd_start;
 
-	left = initrd_end - initrd_start - *ppos;
+	if (pos != n || pos >= left)
+		return 0;
+
+	left -= pos;
 	if (count > left) count = left;
 	if (count == 0) return 0;
-	if (copy_to_user(buf, (char *)initrd_start + *ppos, count))
+	if (copy_to_user(buf, (char *)initrd_start + pos, count))
 		return -EFAULT;
-	*ppos += count;
+	*ppos = pos + count;
 	return count;
 }
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/bluetooth/Config.in linux-2.4.20-wolk4.16-fullkernel/drivers/bluetooth/Config.in
--- linux-2.4.20-wolk4.15-fullkernel/drivers/bluetooth/Config.in	2004-06-29 11:26:15.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/bluetooth/Config.in	2004-09-05 16:04:42.000000000 +0200
@@ -7,8 +7,7 @@ comment 'Bluetooth device drivers'
 
 dep_tristate 'HCI USB driver' CONFIG_BLUEZ_HCIUSB $CONFIG_BLUEZ $CONFIG_USB
 if [ "$CONFIG_BLUEZ_HCIUSB" != "n" ]; then
-   bool '  SCO (voice) support'  CONFIG_BLUEZ_USB_SCO
-   bool '  USB zero packet support'  CONFIG_BLUEZ_USB_ZERO_PACKET
+   bool '  SCO (voice) support'  CONFIG_BLUEZ_HCIUSB_SCO
 fi
 
 dep_tristate 'HCI UART driver' CONFIG_BLUEZ_HCIUART $CONFIG_BLUEZ
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/bluetooth/Makefile.lib linux-2.4.20-wolk4.16-fullkernel/drivers/bluetooth/Makefile.lib
--- linux-2.4.20-wolk4.15-fullkernel/drivers/bluetooth/Makefile.lib	2004-06-29 11:26:15.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/bluetooth/Makefile.lib	2004-09-05 16:04:42.000000000 +0200
@@ -1 +1,2 @@
-obj-$(CONFIG_BLUEZ_HCIBFUSB) += firmware_class.o
+obj-$(CONFIG_BLUEZ_HCIBFUSB)	+= firmware_class.o
+obj-$(CONFIG_BLUEZ_HCIBT3C)	+= firmware_class.o
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/bluetooth/bfusb.c linux-2.4.20-wolk4.16-fullkernel/drivers/bluetooth/bfusb.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/bluetooth/bfusb.c	2004-06-29 11:26:15.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/bluetooth/bfusb.c	2004-09-05 16:04:42.000000000 +0200
@@ -359,11 +359,11 @@ static void bfusb_rx_complete(struct urb
 
 	BT_DBG("bfusb %p urb %p skb %p len %d", bfusb, urb, skb, skb->len);
 
-	if (!test_bit(HCI_RUNNING, &bfusb->hdev.flags))
-		return;
-
 	read_lock(&bfusb->lock);
 
+	if (!test_bit(HCI_RUNNING, &bfusb->hdev.flags))
+		goto unlock;
+
 	if (urb->status || !count)
 		goto resubmit;
 
@@ -414,6 +414,7 @@ resubmit:
 					bfusb->hdev.name, urb, err);
 	}
 
+unlock:
 	read_unlock(&bfusb->lock);
 }
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/bluetooth/bluecard_cs.c linux-2.4.20-wolk4.16-fullkernel/drivers/bluetooth/bluecard_cs.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/bluetooth/bluecard_cs.c	2002-11-29 00:53:12.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/bluetooth/bluecard_cs.c	2004-09-05 16:04:42.000000000 +0200
@@ -803,6 +803,9 @@ int bluecard_close(bluecard_info_t *info
 	unsigned int iobase = info->link.io.BasePort1;
 	struct hci_dev *hdev = &(info->hdev);
 
+	if (info->link.state & DEV_CONFIG_PENDING)
+		return -ENODEV;
+
 	bluecard_hci_close(hdev);
 
 	clear_bit(CARD_READY, &(info->hw_state));
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/bluetooth/bt3c_cs.c linux-2.4.20-wolk4.16-fullkernel/drivers/bluetooth/bt3c_cs.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/bluetooth/bt3c_cs.c	2002-11-29 00:53:12.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/bluetooth/bt3c_cs.c	2004-09-05 16:04:42.000000000 +0200
@@ -24,8 +24,6 @@
 #include <linux/config.h>
 #include <linux/module.h>
 
-#define __KERNEL_SYSCALLS__
-
 #include <linux/kernel.h>
 #include <linux/kmod.h>
 #include <linux/init.h>
@@ -48,6 +46,8 @@
 #include <asm/bitops.h>
 #include <asm/io.h>
 
+#include <linux/firmware.h>
+
 #include <pcmcia/version.h>
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
@@ -485,78 +485,101 @@ static int bt3c_hci_ioctl(struct hci_dev
 
 
 
-/* ======================== User mode firmware loader ======================== */
+/* ======================== Card services HCI interaction ======================== */
 
 
-#define FW_LOADER  "/sbin/bluefw"
-static int errno;
+static int bt3c_load_firmware(bt3c_info_t *info, unsigned char *firmware, int count)
+{
+	char *ptr = (char *) firmware;
+	char b[9];
+	unsigned int iobase, size, addr, fcs, tmp;
+	int i, err = 0;
 
+	iobase = info->link.io.BasePort1;
 
-static int bt3c_fw_loader_exec(void *dev)
-{
-	char *argv[] = { FW_LOADER, "pccard", dev, NULL };
-	char *envp[] = { "HOME=/", "TERM=linux", "PATH=/sbin:/usr/sbin:/bin:/usr/bin", NULL };
-	int err;
+	/* Reset */
 
-	err = exec_usermodehelper(FW_LOADER, argv, envp);
-	if (err)
-		printk(KERN_WARNING "bt3c_cs: Failed to exec \"%s pccard %s\".\n", FW_LOADER, (char *)dev);
+	bt3c_io_write(iobase, 0x8040, 0x0404);
+	bt3c_io_write(iobase, 0x8040, 0x0400);
 
-	return err;
-}
+	udelay(1);
 
+	bt3c_io_write(iobase, 0x8040, 0x0404);
 
-static int bt3c_firmware_load(bt3c_info_t *info)
-{
-	sigset_t tmpsig;
-	char dev[16];
-	pid_t pid;
-	int result;
+	udelay(17);
 
-	/* Check if root fs is mounted */
-	if (!current->fs->root) {
-		printk(KERN_WARNING "bt3c_cs: Root filesystem is not mounted.\n");
-		return -EPERM;
-	}
+	/* Load */
 
-	sprintf(dev, "%04x", info->link.io.BasePort1);
+	while (count) {
+		if (ptr[0] != 'S') {
+			printk(KERN_WARNING "bt3c_cs: Bad address in firmware.\n");
+			err = -EFAULT;
+			goto error;
+		}
 
-	pid = kernel_thread(bt3c_fw_loader_exec, (void *)dev, 0);
-	if (pid < 0) {
-		printk(KERN_WARNING "bt3c_cs: Forking of kernel thread failed (errno=%d).\n", -pid);
-		return pid;
-	}
+		memset(b, 0, sizeof(b));
+		memcpy(b, ptr + 2, 2);
+		size = simple_strtol(b, NULL, 16);
+
+		memset(b, 0, sizeof(b));
+		memcpy(b, ptr + 4, 8);
+		addr = simple_strtol(b, NULL, 16);
+
+		memset(b, 0, sizeof(b));
+		memcpy(b, ptr + (size * 2) + 2, 2);
+		fcs = simple_strtol(b, NULL, 16);
+
+		memset(b, 0, sizeof(b));
+		for (tmp = 0, i = 0; i < size; i++) {
+			memcpy(b, ptr + (i * 2) + 2, 2);
+			tmp += simple_strtol(b, NULL, 16);
+		}
 
-	/* Block signals, everything but SIGKILL/SIGSTOP */
-	spin_lock_irq(&current->sigmask_lock);
-	tmpsig = current->blocked;
-	siginitsetinv(&current->blocked, sigmask(SIGKILL) | sigmask(SIGSTOP));
-	recalc_sigpending(current);
-	spin_unlock_irq(&current->sigmask_lock);
+		if (((tmp + fcs) & 0xff) != 0xff) {
+			printk(KERN_WARNING "bt3c_cs: Checksum error in firmware.\n");
+			err = -EILSEQ;
+			goto error;
+		}
 
-	result = waitpid(pid, NULL, __WCLONE);
+		if (ptr[1] == '3') {
+			bt3c_address(iobase, addr);
 
-	/* Allow signals again */
-	spin_lock_irq(&current->sigmask_lock);
-	current->blocked = tmpsig;
-	recalc_sigpending(current);
-	spin_unlock_irq(&current->sigmask_lock);
+			memset(b, 0, sizeof(b));
+			for (i = 0; i < (size - 4) / 2; i++) {
+				memcpy(b, ptr + (i * 4) + 12, 4);
+				tmp = simple_strtol(b, NULL, 16);
+				bt3c_put(iobase, tmp);
+			}
+		}
 
-	if (result != pid) {
-		printk(KERN_WARNING "bt3c_cs: Waiting for pid %d failed (errno=%d).\n", pid, -result);
-		return -result;
+		ptr   += (size * 2) + 6;
+		count -= (size * 2) + 6;
 	}
 
-	return 0;
-}
+	udelay(17);
 
+	/* Boot */
 
+	bt3c_address(iobase, 0x3000);
+	outb(inb(iobase + CONTROL) | 0x40, iobase + CONTROL);
 
-/* ======================== Card services HCI interaction ======================== */
+error:
+	udelay(17);
+
+	/* Clear */
+
+	bt3c_io_write(iobase, 0x7006, 0x0000);
+	bt3c_io_write(iobase, 0x7005, 0x0000);
+	bt3c_io_write(iobase, 0x7001, 0x0000);
+
+	return err;
+}
 
 
 int bt3c_open(bt3c_info_t *info)
 {
+	const struct firmware *firmware;
+	char device[16];
 	struct hci_dev *hdev;
 	int err;
 
@@ -570,8 +593,22 @@ int bt3c_open(bt3c_info_t *info)
 
 	/* Load firmware */
 
-	if ((err = bt3c_firmware_load(info)) < 0)
+	snprintf(device, sizeof(device), "bt3c%4.4x", info->link.io.BasePort1);
+
+	err = request_firmware(&firmware, "BT3CPCC.bin", device);
+	if (err < 0) {
+		printk(KERN_WARNING "bt3c_cs: Firmware request failed.\n");
 		return err;
+	}
+
+	err = bt3c_load_firmware(info, firmware->data, firmware->size);
+
+	release_firmware(firmware);
+
+	if (err < 0) {
+		printk(KERN_WARNING "bt3c_cs: Firmware loading failed.\n");
+		return err;
+	}
 
 	/* Timeout before it is safe to send the first HCI packet */
 
@@ -606,6 +643,9 @@ int bt3c_close(bt3c_info_t *info)
 {
 	struct hci_dev *hdev = &(info->hdev);
 
+	if (info->link.state & DEV_CONFIG_PENDING)
+		return -ENODEV;
+
 	bt3c_hci_close(hdev);
 
 	if (hci_unregister_dev(hdev) < 0)
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/bluetooth/btuart_cs.c linux-2.4.20-wolk4.16-fullkernel/drivers/bluetooth/btuart_cs.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/bluetooth/btuart_cs.c	2004-06-29 11:26:15.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/bluetooth/btuart_cs.c	2004-09-05 16:04:42.000000000 +0200
@@ -556,6 +556,9 @@ int btuart_close(btuart_info_t *info)
 	unsigned int iobase = info->link.io.BasePort1;
 	struct hci_dev *hdev = &(info->hdev);
 
+	if (info->link.state & DEV_CONFIG_PENDING)
+		return -ENODEV;
+
 	btuart_hci_close(hdev);
 
 	spin_lock_irqsave(&(info->lock), flags);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/bluetooth/dtl1_cs.c linux-2.4.20-wolk4.16-fullkernel/drivers/bluetooth/dtl1_cs.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/bluetooth/dtl1_cs.c	2002-11-29 00:53:12.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/bluetooth/dtl1_cs.c	2004-09-05 16:04:42.000000000 +0200
@@ -535,6 +535,9 @@ int dtl1_close(dtl1_info_t *info)
 	unsigned int iobase = info->link.io.BasePort1;
 	struct hci_dev *hdev = &(info->hdev);
 
+	if (info->link.state & DEV_CONFIG_PENDING)
+		return -ENODEV;
+
 	dtl1_hci_close(hdev);
 
 	spin_lock_irqsave(&(info->lock), flags);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/bluetooth/hci_bcsp.c linux-2.4.20-wolk4.16-fullkernel/drivers/bluetooth/hci_bcsp.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/bluetooth/hci_bcsp.c	2004-06-29 11:26:15.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/bluetooth/hci_bcsp.c	2004-09-05 16:04:42.000000000 +0200
@@ -34,7 +34,6 @@
 #include <linux/module.h>
 
 #include <linux/version.h>
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/sched.h>
@@ -635,7 +634,8 @@ static void bcsp_timed_event(unsigned lo
 	struct sk_buff *skb;
 	unsigned long flags;
 
-	BT_ERR("Timeout, retransmitting %u pkts", bcsp->unack.qlen);
+	BT_DBG("hu %p retransmitting %u pkts", hu, bcsp->unack.qlen);
+
 	spin_lock_irqsave(&bcsp->unack.lock, flags);
 
 	while ((skb = __skb_dequeue_tail(&bcsp->unack)) != NULL) {
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/bluetooth/hci_ldisc.c linux-2.4.20-wolk4.16-fullkernel/drivers/bluetooth/hci_ldisc.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/bluetooth/hci_ldisc.c	2004-06-29 11:26:15.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/bluetooth/hci_ldisc.c	2004-09-05 16:04:42.000000000 +0200
@@ -33,7 +33,6 @@
 #include <linux/module.h>
 
 #include <linux/version.h>
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/sched.h>
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/bluetooth/hci_uart.h linux-2.4.20-wolk4.16-fullkernel/drivers/bluetooth/hci_uart.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/bluetooth/hci_uart.h	2004-06-29 11:26:15.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/bluetooth/hci_uart.h	2004-09-05 16:04:42.000000000 +0200
@@ -35,11 +35,12 @@
 #define HCIUARTGETPROTO	_IOR('U', 201, int)
 
 /* UART protocols */
-#define HCI_UART_MAX_PROTO	3
+#define HCI_UART_MAX_PROTO	4
 
 #define HCI_UART_H4	0
 #define HCI_UART_BCSP	1
-#define HCI_UART_NCSP	2
+#define HCI_UART_3WIRE	2
+#define HCI_UART_H4DS	3
 
 #ifdef __KERNEL__
 struct hci_uart;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/bluetooth/hci_usb.c linux-2.4.20-wolk4.16-fullkernel/drivers/bluetooth/hci_usb.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/bluetooth/hci_usb.c	2004-06-29 11:26:15.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/bluetooth/hci_usb.c	2004-09-05 16:04:42.000000000 +0200
@@ -30,7 +30,7 @@
  *
  * $Id: hci_usb.c,v 1.8 2002/07/18 17:23:09 maxk Exp $    
  */
-#define VERSION "2.4"
+#define VERSION "2.7"
 
 #include <linux/config.h>
 #include <linux/module.h>
@@ -62,7 +62,7 @@
 #define BT_DMP( A... )
 #endif
 
-#ifndef CONFIG_BLUEZ_USB_ZERO_PACKET
+#ifndef CONFIG_BLUEZ_HCIUSB_ZERO_PACKET
 #undef  USB_ZERO_PACKET
 #define USB_ZERO_PACKET 0
 #endif
@@ -73,20 +73,39 @@ static struct usb_device_id bluetooth_id
 	/* Generic Bluetooth USB device */
 	{ USB_DEVICE_INFO(HCI_DEV_CLASS, HCI_DEV_SUBCLASS, HCI_DEV_PROTOCOL) },
 
-	/* Ericsson with non-standard id */
-	{ USB_DEVICE(0x0bdb, 0x1002) },
+	/* AVM BlueFRITZ! USB v2.0 */
+	{ USB_DEVICE(0x057c, 0x3800) },
 
 	/* Bluetooth Ultraport Module from IBM */
 	{ USB_DEVICE(0x04bf, 0x030a) },
 
+	/* ALPS Modules with non-standard id */
+	{ USB_DEVICE(0x044e, 0x3001) },
+	{ USB_DEVICE(0x044e, 0x3002) },
+
+	/* Ericsson with non-standard id */
+	{ USB_DEVICE(0x0bdb, 0x1002) },
+
 	{ }	/* Terminating entry */
 };
 
 MODULE_DEVICE_TABLE (usb, bluetooth_ids);
 
-static struct usb_device_id ignore_ids[] = {
+static struct usb_device_id blacklist_ids[] = {
 	/* Broadcom BCM2033 without firmware */
-	{ USB_DEVICE(0x0a5c, 0x2033) },
+	{ USB_DEVICE(0x0a5c, 0x2033), driver_info: HCI_IGNORE },
+
+	/* Broadcom BCM2035 */
+	{ USB_DEVICE(0x0a5c, 0x200a), driver_info: HCI_RESET },
+
+	/* ISSC Bluetooth Adapter v3.1 */
+	{ USB_DEVICE(0x1131, 0x1001), driver_info: HCI_RESET },
+
+	/* Digianswer device */
+	{ USB_DEVICE(0x08fd, 0x0001), driver_info: HCI_DIGIANSWER },
+
+	/* RTX Telecom based adapter with buggy SCO support */
+	{ USB_DEVICE(0x0400, 0x0807), driver_info: HCI_BROKEN_ISOC },
 
 	{ }	/* Terminating entry */
 };
@@ -133,6 +152,7 @@ static inline struct _urb *__get_complet
 	return _urb_dequeue(__completed_q(husb, type)); 
 }
 
+#ifdef CONFIG_BLUEZ_HCIUSB_SCO
 static void __fill_isoc_desc(struct urb *urb, int len, int mtu)
 {
 	int offset = 0, i;
@@ -152,6 +172,7 @@ static void __fill_isoc_desc(struct urb 
 	}
 	urb->number_of_packets = i;
 }
+#endif
 
 static int hci_usb_intr_rx_submit(struct hci_usb *husb)
 {
@@ -229,7 +250,7 @@ static int hci_usb_bulk_rx_submit(struct
 	return err;
 }
 
-#ifdef CONFIG_BLUEZ_USB_SCO
+#ifdef CONFIG_BLUEZ_HCIUSB_SCO
 static int hci_usb_isoc_rx_submit(struct hci_usb *husb)
 {
 	struct _urb *_urb;
@@ -300,7 +321,7 @@ static int hci_usb_open(struct hci_dev *
 		for (i = 0; i < HCI_MAX_BULK_RX; i++)
 			hci_usb_bulk_rx_submit(husb);
 
-#ifdef CONFIG_BLUEZ_USB_SCO
+#ifdef CONFIG_BLUEZ_HCIUSB_SCO
 		if (husb->isoc_iface)
 			for (i = 0; i < HCI_MAX_ISOC_RX; i++)
 				hci_usb_isoc_rx_submit(husb);
@@ -428,7 +449,7 @@ static inline int hci_usb_send_ctrl(stru
 	} else
 		dr = (void *) _urb->urb.setup_packet;
 
-	dr->bRequestType = HCI_CTRL_REQ;
+	dr->bRequestType = husb->ctrl_req;
 	dr->bRequest = 0;
 	dr->wIndex   = 0;
 	dr->wValue   = 0;
@@ -469,7 +490,7 @@ static inline int hci_usb_send_bulk(stru
 	return __tx_submit(husb, _urb);
 }
 
-#ifdef CONFIG_BLUEZ_USB_SCO
+#ifdef CONFIG_BLUEZ_HCIUSB_SCO
 static inline int hci_usb_send_isoc(struct hci_usb *husb, struct sk_buff *skb)
 {
 	struct _urb *_urb = __get_completed(husb, skb->pkt_type);
@@ -520,7 +541,7 @@ static void hci_usb_tx_process(struct hc
 				skb_queue_head(q, skb);
 		}
 
-#ifdef CONFIG_BLUEZ_USB_SCO
+#ifdef CONFIG_BLUEZ_HCIUSB_SCO
 		/* Process SCO queue */
 		q = __transmit_q(husb, HCI_SCODATA_PKT);
 		if (atomic_read(__pending_tx(husb, HCI_SCODATA_PKT)) < HCI_MAX_ISOC_TX &&
@@ -579,7 +600,7 @@ static int hci_usb_send_frame(struct sk_
 		hdev->stat.acl_tx++;
 		break;
 
-#ifdef CONFIG_BLUEZ_USB_SCO
+#ifdef CONFIG_BLUEZ_HCIUSB_SCO
 	case HCI_SCODATA_PKT:
 		hdev->stat.sco_tx++;
 		break;
@@ -629,7 +650,7 @@ static inline int __recv_frame(struct hc
 				} else
 					return -EILSEQ;
 				break;
-#ifdef CONFIG_BLUEZ_USB_SCO
+#ifdef CONFIG_BLUEZ_HCIUSB_SCO
 			case HCI_SCODATA_PKT:
 				if (count >= HCI_SCO_HDR_SIZE) {
 					hci_sco_hdr *h = data;
@@ -640,7 +661,7 @@ static inline int __recv_frame(struct hc
 #endif
 			}
 			BT_DBG("new packet len %d", len);
-				
+
 			skb = bluez_skb_alloc(len, GFP_ATOMIC);
 			if (!skb) {
 				BT_ERR("%s no memory for the packet", husb->hdev.name);
@@ -685,16 +706,16 @@ static void hci_usb_rx_complete(struct u
 	BT_DBG("%s urb %p type %d status %d count %d flags %x", hdev->name, urb,
 			_urb->type, urb->status, count, urb->transfer_flags);
 
-	if (!test_bit(HCI_RUNNING, &hdev->flags))
-		return;
-
 	read_lock(&husb->completion_lock);
 
+	if (!test_bit(HCI_RUNNING, &hdev->flags))
+		goto unlock;
+
 	if (urb->status || !count)
 		goto resubmit;
 
 	if (_urb->type == HCI_SCODATA_PKT) {
-#ifdef CONFIG_BLUEZ_USB_SCO
+#ifdef CONFIG_BLUEZ_HCIUSB_SCO
 		int i;
 		for (i=0; i < urb->number_of_packets; i++) {
 			BT_DBG("desc %d status %d offset %d len %d", i,
@@ -726,6 +747,8 @@ resubmit:
 		BT_DBG("%s urb %p type %d resubmit status %d", hdev->name, urb,
 				_urb->type, err);
 	}
+
+unlock:
 	read_unlock(&husb->completion_lock);
 }
 
@@ -788,8 +811,14 @@ static void *hci_usb_probe(struct usb_de
 
 	iface = &udev->actconfig->interface[0];
 
-	/* Check our black list */
-	if (usb_match_id(udev, iface, ignore_ids))
+	if (!id->driver_info) {
+		const struct usb_device_id *match;
+		match = usb_match_id(udev, iface, blacklist_ids);
+		if (match)
+			id = match;
+	}
+
+	if (id->driver_info & HCI_IGNORE)
 		return NULL;
 
 	/* Check number of endpoints */
@@ -829,7 +858,7 @@ static void *hci_usb_probe(struct usb_de
 						bulk_out_ep[i] = ep;
 					break;
 
-#ifdef CONFIG_BLUEZ_USB_SCO
+#ifdef CONFIG_BLUEZ_HCIUSB_SCO
 				case USB_ENDPOINT_XFER_ISOC:
 					if (ep->wMaxPacketSize < size || a > 2)
 						break;
@@ -855,8 +884,8 @@ static void *hci_usb_probe(struct usb_de
 		goto done;
 	}
 
-#ifdef CONFIG_BLUEZ_USB_SCO
-	if (!isoc_in_ep[1] || !isoc_out_ep[1]) {
+#ifdef CONFIG_BLUEZ_HCIUSB_SCO
+	if (id->driver_info & HCI_BROKEN_ISOC || !isoc_in_ep[1] || !isoc_out_ep[1]) {
 		BT_DBG("Isoc endpoints not found");
 		isoc_iface = NULL;
 	}
@@ -874,7 +903,12 @@ static void *hci_usb_probe(struct usb_de
 	husb->bulk_in_ep  = bulk_in_ep[0];
 	husb->intr_in_ep  = intr_in_ep[0];
 
-#ifdef CONFIG_BLUEZ_USB_SCO
+	if (id->driver_info & HCI_DIGIANSWER)
+		husb->ctrl_req = HCI_DIGI_REQ;
+	else
+		husb->ctrl_req = HCI_CTRL_REQ;
+
+#ifdef CONFIG_BLUEZ_HCIUSB_SCO
 	if (isoc_iface) {
 		BT_DBG("isoc ifnum %d alts %d", isoc_ifnum, isoc_alts);
 		if (usb_set_interface(udev, isoc_ifnum, isoc_alts)) {
@@ -908,6 +942,9 @@ static void *hci_usb_probe(struct usb_de
 	hdev->send  = hci_usb_send_frame;
 	hdev->destruct = hci_usb_destruct;
 
+	if (id->driver_info & HCI_RESET)
+		set_bit(HCI_QUIRK_RESET_ON_INIT, &hdev->quirks);
+
 	if (hci_register_dev(hdev) < 0) {
 		BT_ERR("Can't register HCI device");
 		goto probe_error;
@@ -970,6 +1007,6 @@ void hci_usb_cleanup(void)
 module_init(hci_usb_init);
 module_exit(hci_usb_cleanup);
 
-MODULE_AUTHOR("Maxim Krasnyansky <maxk@qualcomm.com>");
+MODULE_AUTHOR("Maxim Krasnyansky <maxk@qualcomm.com>, Marcel Holtmann <marcel@holtmann.org>");
 MODULE_DESCRIPTION("BlueZ HCI USB driver ver " VERSION);
 MODULE_LICENSE("GPL");
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/bluetooth/hci_usb.h linux-2.4.20-wolk4.16-fullkernel/drivers/bluetooth/hci_usb.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/bluetooth/hci_usb.h	2004-06-29 11:26:15.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/bluetooth/hci_usb.h	2004-09-05 16:04:42.000000000 +0200
@@ -35,6 +35,12 @@
 #define HCI_DEV_PROTOCOL     0x01	/* Bluetooth programming protocol */
 
 #define HCI_CTRL_REQ	     0x20
+#define HCI_DIGI_REQ	     0x40
+
+#define HCI_IGNORE           0x01
+#define HCI_RESET            0x02
+#define HCI_DIGIANSWER       0x04
+#define HCI_BROKEN_ISOC      0x08
 
 #define HCI_MAX_IFACE_NUM	3 
 
@@ -122,6 +128,8 @@ struct hci_usb {
 	struct usb_endpoint_descriptor	*isoc_out_ep;
 	struct usb_endpoint_descriptor	*isoc_in_ep;
 
+	__u8			ctrl_req;
+
 	struct sk_buff_head	transmit_q[4];
 	struct sk_buff		*reassembly[4]; // Reassembly buffers
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/char/Config.in linux-2.4.20-wolk4.16-fullkernel/drivers/char/Config.in
--- linux-2.4.20-wolk4.15-fullkernel/drivers/char/Config.in	2004-06-29 11:31:52.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/char/Config.in	2004-09-07 10:46:59.000000000 +0200
@@ -5,7 +5,7 @@ mainmenu_option next_comment
 comment 'Character devices'
 
 bool 'Virtual terminal' CONFIG_VT
-dep_tristate '   ECC memory monitoring' CONFIG_ECC m
+dep_tristate '  ECC memory monitoring' CONFIG_ECC m
 if [ "$CONFIG_VT" = "y" ]; then
    bool '  Support for console on virtual terminal' CONFIG_VT_CONSOLE
    if [ "$CONFIG_GSC_LASI" = "y" ]; then
@@ -188,18 +188,6 @@ endmenu
 
 source drivers/char/joystick/Config.in
 
-tristate 'QIC-02 tape support' CONFIG_QIC02_TAPE
-if [ "$CONFIG_QIC02_TAPE" != "n" ]; then
-   bool '  Do you want runtime configuration for QIC-02' CONFIG_QIC02_DYNCONF
-   if [ "$CONFIG_QIC02_DYNCONF" != "y" ]; then
-      comment '  Edit configuration parameters in ./include/linux/tpqic02.h!'
-   else
-      comment '  Setting runtime QIC-02 configuration is done with qic02conf'
-      comment '  from the tpqic02-support package.  It is available at'
-      comment '  metalab.unc.edu or ftp://titus.cfw.com/pub/Linux/util/'
-   fi
-fi
-
 tristate 'IPMI top-level message handler' CONFIG_IPMI_HANDLER
 dep_mbool '  Generate a panic event to all BMCs on a panic' CONFIG_IPMI_PANIC_EVENT $CONFIG_IPMI_HANDLER
 dep_tristate '  Device interface for IPMI' CONFIG_IPMI_DEVICE_INTERFACE $CONFIG_IPMI_HANDLER
@@ -333,20 +321,14 @@ 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 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
+   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
    else
-      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
+      comment 'DRM 4.1/4.2/4.3 drivers'
+      define_bool CONFIG_DRM_NEW y
+      source drivers/char/drm/Config.in
    fi
 fi
 endmenu
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/char/Makefile linux-2.4.20-wolk4.16-fullkernel/drivers/char/Makefile
--- linux-2.4.20-wolk4.15-fullkernel/drivers/char/Makefile	2004-06-29 11:31:29.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/char/Makefile	2004-09-05 17:02:13.000000000 +0200
@@ -27,7 +27,7 @@ export-objs     :=	busmouse.o console.o 
 			au1000_gpio.o hp_psaux.o nvram.o rtc.o scx200.o \
 			frandom.o
 
-mod-subdirs	:=	joystick ftape drm-4.3 drm drm-4.0 pcmcia ibmasm omnibook
+mod-subdirs	:=	joystick ftape drm drm-4.0 pcmcia ibmasm omnibook
 
 list-multi	:=	
 
@@ -164,6 +164,7 @@ endif
 
 obj-$(CONFIG_VT) += vt.o vc_screen.o consolemap.o consolemap_deftbl.o $(CONSOLE) selection.o
 obj-$(CONFIG_SERIAL) += $(SERIAL)
+obj-$(CONFIG_PARPORT_SERIAL) += parport_serial.o
 obj-$(CONFIG_SERIAL_HCDP) += hcdp_serial.o
 obj-$(CONFIG_SERIAL_21285) += serial_21285.o
 obj-$(CONFIG_SERIAL_SA1100) += serial_sa1100.o
@@ -258,9 +259,8 @@ obj-$(CONFIG_COBALT_LCD) += lcd.o
 obj-$(CONFIG_QIC02_TAPE) += tpqic02.o
 
 subdir-$(CONFIG_FTAPE) += ftape
-subdir-$(CONFIG_DRM_43) += drm-4.3
-subdir-$(CONFIG_DRM_41) += drm
-subdir-$(CONFIG_DRM_40) += drm-4.0
+subdir-$(CONFIG_DRM_OLD) += drm-4.0
+subdir-$(CONFIG_DRM_NEW) += drm
 subdir-$(CONFIG_PCMCIA) += pcmcia
 subdir-$(CONFIG_AGP) += agp
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/char/agp/agp.h linux-2.4.20-wolk4.16-fullkernel/drivers/char/agp/agp.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/char/agp/agp.h	2004-06-29 11:30:54.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/char/agp/agp.h	2004-09-05 16:05:57.000000000 +0200
@@ -208,6 +208,12 @@ struct agp_bridge_data {
 #ifndef PCI_DEVICE_ID_INTEL_865_G_1
 #define PCI_DEVICE_ID_INTEL_865_G_1	0x2572
 #endif
+#ifndef PCI_DEVICE_ID_INTEL_915_G_0
+#define PCI_DEVICE_ID_INTEL_915_G_0	0x2580
+#endif
+#ifndef PCI_DEVICE_ID_INTEL_915_G_1
+#define PCI_DEVICE_ID_INTEL_915_G_1	0x2582
+#endif
 #ifndef PCI_DEVICE_ID_INTEL_820_0
 #define PCI_DEVICE_ID_INTEL_820_0       0x2500
 #endif
@@ -421,6 +427,12 @@ struct agp_bridge_data {
 #define I810_DRAM_ROW_0        0x00000001
 #define I810_DRAM_ROW_0_SDRAM  0x00000001
 
+/* intel I915 registers */
+#define I915_GMADDR 0x18
+#define I915_MMADDR 0x10
+#define I915_PTEADDR 0x1C
+#define I915_GMCH_GMS_STOLEN_48M    (0x6 << 4)
+#define I915_GMCH_GMS_STOLEN_64M    (0x7 << 4)
 
 
 /* VIA register */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/char/agp/agpgart_be.c linux-2.4.20-wolk4.16-fullkernel/drivers/char/agp/agpgart_be.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/char/agp/agpgart_be.c	2004-06-29 11:30:54.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/char/agp/agpgart_be.c	2004-09-05 16:05:57.000000000 +0200
@@ -794,7 +794,29 @@ static unsigned long agp_generic_alloc_p
 	}
 #endif
 	get_page(page);
-	LockPage(page);
+	set_bit(PG_locked, &page->flags);
+	atomic_inc(&agp_bridge.current_memory_agp);
+	return (unsigned long)page_address(page);
+}
+
+/* Exists to support ARGB cursors */
+static unsigned long i830_alloc_pages(void)
+{
+	struct page * page;
+	
+	page = alloc_pages(GFP_KERNEL, 2);
+	if (page == NULL) {
+		return 0;
+	}
+
+#ifdef CONFIG_X86
+	if (change_page_attr(page, 4, PAGE_KERNEL_NOCACHE) < 0) {
+		__free_page(page); 
+		return 0;
+	}
+#endif
+	get_page(page);
+	set_bit(PG_locked, &page->flags);
 	atomic_inc(&agp_bridge.current_memory_agp);
 	return (unsigned long)page_address(page);
 }
@@ -818,6 +840,25 @@ static void agp_generic_destroy_page(uns
 	atomic_dec(&agp_bridge.current_memory_agp);
 }
 
+static void i830_destroy_pages(unsigned long addr)
+{
+	void *pt = (void *) addr;
+	struct page *page;
+
+	if (pt == NULL) {
+		return;
+	}
+	
+	page = virt_to_page(pt);
+#ifdef CONFIG_X86
+	change_page_attr(page, 4, PAGE_KERNEL); 
+#endif	
+	put_page(page);
+	UnlockPage(page);
+	free_pages((unsigned long) pt, 2);
+	atomic_dec(&agp_bridge.current_memory_agp);
+}
+
 /* End Basic Page Allocation Routines */
 
 void agp_enable(u32 mode)
@@ -1022,33 +1063,49 @@ static agp_memory *intel_i810_alloc_by_t
 		return new;
 	}
 	if(type == AGP_PHYS_MEMORY) {
+		unsigned long physical;
+
 		/* The I810 requires a physical address to program
 		 * it's mouse pointer into hardware.  However the
 		 * Xserver still writes to it through the agp
 		 * aperture
 		 */
-	   	if (pg_count != 1) {
-		   	return NULL;
-		}
-	   	new = agp_create_memory(1);
+		if (pg_count != 1 && pg_count != 4) return(NULL);
 
-		if (new == NULL) {
-			return NULL;
+		new = agp_create_memory(pg_count);
+
+		if (new == NULL) return(NULL);
+
+		MOD_INC_USE_COUNT;
+		if (pg_count == 1)
+			new->memory[0] = agp_bridge.agp_alloc_page();
+		else {
+			/* kludge to get 4 physical pages for ARGB cursor */
+			new->memory[0] = i830_alloc_pages();
+			new->memory[1] = new->memory[0] + PAGE_SIZE;
+			new->memory[2] = new->memory[1] + PAGE_SIZE;
+			new->memory[3] = new->memory[2] + PAGE_SIZE;
 		}
-	   	MOD_INC_USE_COUNT;
-		new->memory[0] = agp_bridge.agp_alloc_page();
 
 		if (new->memory[0] == 0) {
 			/* Free this structure */
 			agp_free_memory(new);
 			return NULL;
 		}
+		physical = new->memory[0];
+
 		new->memory[0] = virt_to_phys((void *) new->memory[0]);
-		new->page_count = 1;
-	   	new->num_scratch_pages = 1;
-	   	new->type = AGP_PHYS_MEMORY;
-	        new->physical = virt_to_phys((void *) new->memory[0]);
-	   	return new;
+		if (pg_count == 4) {
+			/* kludge to enable 4 physical pages for ARGB cursor */
+			new->memory[1] = virt_to_phys((void *) new->memory[1]);
+			new->memory[2] = virt_to_phys((void *) new->memory[2]);
+			new->memory[3] = virt_to_phys((void *) new->memory[3]);
+		}
+		new->page_count = pg_count;
+		new->num_scratch_pages = pg_count;
+		new->type = AGP_PHYS_MEMORY;
+		new->physical = virt_to_phys((void *) physical);
+		return(new);
 	}
    
 	return NULL;
@@ -1058,7 +1115,11 @@ static void intel_i810_free_by_type(agp_
 {
 	agp_free_key(curr->key);
    	if(curr->type == AGP_PHYS_MEMORY) {
-	   	agp_bridge.agp_destroy_page((unsigned long)
+		if (curr->page_count == 4)
+			i830_destroy_pages((unsigned long)
+				 phys_to_virt(curr->memory[0]));
+		else
+	   		agp_bridge.agp_destroy_page((unsigned long)
 				 phys_to_virt(curr->memory[0]));
 		vfree(curr->memory);
 	}
@@ -1108,15 +1169,20 @@ static aper_size_info_fixed intel_i830_s
 {
 	{128, 32768, 5},
 	/* The 64M mode still requires a 128k gatt */
-	{64, 16384, 5}
+	{64, 16384, 5},
+	/* For I915G */
+	{256, 65536, 6}
 };
 
 static struct _intel_i830_private {
 	struct pci_dev *i830_dev;   /* device one */
 	volatile u8 *registers;
+	volatile u32 *gtt;	/* I915G */
 	int gtt_entries;
 } intel_i830_private;
 
+static int intel_i830_fetch_size(void);
+
 static void intel_i830_init_gtt_entries(void)
 {
 	u16 gmch_ctrl;
@@ -1124,26 +1190,47 @@ static void intel_i830_init_gtt_entries(
 	u8 rdct;
 	int local = 0;
 	static const int ddt[4] = { 0, 16, 32, 64 };
+        int size;
+ 
 
 	pci_read_config_word(agp_bridge.dev,I830_GMCH_CTRL,&gmch_ctrl);
 
+	/* We obtain the size of the GTT, which is also stored (for some
+	 * reason) at the top of stolen memory. Then we add 4KB to that
+  	 * for the video BIOS popup, which is also stored in there. */
+	size = intel_i830_fetch_size() + 4;
+
 	if (agp_bridge.dev->device != PCI_DEVICE_ID_INTEL_830_M_0 &&
 	    agp_bridge.dev->device != PCI_DEVICE_ID_INTEL_845_G_0) {
 		switch (gmch_ctrl & I855_GMCH_GMS_MASK) {
 		case I855_GMCH_GMS_STOLEN_1M:
-			gtt_entries = MB(1) - KB(132);
+			gtt_entries = MB(1) - KB(size);
 			break;
 		case I855_GMCH_GMS_STOLEN_4M:
-			gtt_entries = MB(4) - KB(132);
+			gtt_entries = MB(4) - KB(size);
 			break;
 		case I855_GMCH_GMS_STOLEN_8M:
-			gtt_entries = MB(8) - KB(132);
+			gtt_entries = MB(8) - KB(size);
 			break;
 		case I855_GMCH_GMS_STOLEN_16M:
-			gtt_entries = MB(16) - KB(132);
+			gtt_entries = MB(16) - KB(size);
 			break;
 		case I855_GMCH_GMS_STOLEN_32M:
-			gtt_entries = MB(32) - KB(132);
+			gtt_entries = MB(32) - KB(size);
+			break;
+		case I915_GMCH_GMS_STOLEN_48M:
+			/* Check it's really I915 */
+			if (agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_G_0)
+				gtt_entries = MB(48) - KB(size);
+			else
+				gtt_entries = 0;
+			break;
+		case I915_GMCH_GMS_STOLEN_64M:
+			/* Check it's really I915 */
+			if (agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_G_0)
+				gtt_entries = MB(64) - KB(size);
+			else
+				gtt_entries = 0;
 			break;
 		default:
 			gtt_entries = 0;
@@ -1153,13 +1240,13 @@ static void intel_i830_init_gtt_entries(
 	{
 		switch (gmch_ctrl & I830_GMCH_GMS_MASK) {
 		case I830_GMCH_GMS_STOLEN_512:
-			gtt_entries = KB(512) - KB(132);
+			gtt_entries = KB(512) - KB(size);
 			break;
 		case I830_GMCH_GMS_STOLEN_1024:
-			gtt_entries = MB(1) - KB(132);
+			gtt_entries = MB(1) - KB(size);
 			break;
 		case I830_GMCH_GMS_STOLEN_8192:
-			gtt_entries = MB(8) - KB(132);
+			gtt_entries = MB(8) - KB(size);
 			break;
 		case I830_GMCH_GMS_LOCAL:
 			rdct = INREG8(intel_i830_private.registers,
@@ -1193,14 +1280,24 @@ static int intel_i830_create_gatt_table(
 	int page_order;
 	aper_size_info_fixed *size;
 	int num_entries;
-	u32 temp;
+	u32 temp, temp2;
 
 	size = agp_bridge.current_size;
 	page_order = size->page_order;
 	num_entries = size->num_entries;
 	agp_bridge.gatt_table_real = 0;
 
-	pci_read_config_dword(intel_i830_private.i830_dev,I810_MMADDR,&temp);
+	if (agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_G_0) {
+		pci_read_config_dword(intel_i830_private.i830_dev,
+							I915_MMADDR,&temp);
+		pci_read_config_dword(intel_i830_private.i830_dev,
+							I915_PTEADDR,&temp2);
+		intel_i830_private.gtt = (volatile u32 *) ioremap(temp2, 256 * 1024);
+		if (!intel_i830_private.gtt) return (-ENOMEM);
+	} else
+		pci_read_config_dword(intel_i830_private.i830_dev,	
+							I810_MMADDR,&temp);
+
 	temp &= 0xfff80000;
 
 	intel_i830_private.registers = (volatile u8 *) ioremap(temp,128 * 4096);
@@ -1234,6 +1331,20 @@ static int intel_i830_fetch_size(void)
 
 	values = A_SIZE_FIX(agp_bridge.aperture_sizes);
 
+	if (agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_G_0) {
+		u32 temp, offset = 0;
+		pci_read_config_dword(intel_i830_private.i830_dev,
+							I915_GMADDR,&temp);
+#define I915_256MB_ADDRESS_MASK (1<<27)
+		if (temp & I915_256MB_ADDRESS_MASK)
+			offset = 0;	/* 128MB aperture */
+		else
+			offset = 2;	/* 256MB aperture */
+		agp_bridge.previous_size = agp_bridge.current_size = (void *)(values + offset);
+		agp_bridge.aperture_size_idx = offset;
+		return(values[offset].size);
+	}
+
 	if (agp_bridge.dev->device != PCI_DEVICE_ID_INTEL_830_M_0 &&
 	    agp_bridge.dev->device != PCI_DEVICE_ID_INTEL_845_G_0) {
 		agp_bridge.previous_size = agp_bridge.current_size = (void *) values;
@@ -1247,7 +1358,7 @@ static int intel_i830_fetch_size(void)
 		agp_bridge.aperture_size_idx = 0;
 		return(values[0].size);
 	} else {
-		agp_bridge.previous_size = agp_bridge.current_size = (void *) values;
+		agp_bridge.previous_size = agp_bridge.current_size = (void *)(values + 1);
 		agp_bridge.aperture_size_idx = 1;
 		return(values[1].size);
 	}
@@ -1264,7 +1375,13 @@ static int intel_i830_configure(void)
 
 	current_size = A_SIZE_FIX(agp_bridge.current_size);
 
-	pci_read_config_dword(intel_i830_private.i830_dev,I810_GMADDR,&temp);
+	if (agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_G_0)
+		pci_read_config_dword(intel_i830_private.i830_dev,
+							I915_GMADDR,&temp);
+	else
+		pci_read_config_dword(intel_i830_private.i830_dev,
+							I810_GMADDR,&temp);
+
 	agp_bridge.gart_bus_addr = (temp & PCI_BASE_ADDRESS_MEM_MASK);
 
 	pci_read_config_word(agp_bridge.dev,I830_GMCH_CTRL,&gmch_ctrl);
@@ -1274,15 +1391,24 @@ static int intel_i830_configure(void)
 	OUTREG32(intel_i830_private.registers,I810_PGETBL_CTL,agp_bridge.gatt_bus_addr | I810_PGETBL_ENABLED);
 	CACHE_FLUSH();
 
-	if (agp_bridge.needs_scratch_page == TRUE)
-		for (i = intel_i830_private.gtt_entries; i < current_size->num_entries; i++)
-			OUTREG32(intel_i830_private.registers,I810_PTE_BASE + (i * 4),agp_bridge.scratch_page);
+	if (agp_bridge.needs_scratch_page == TRUE) {
+		if (agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_G_0) {
+			for (i = intel_i830_private.gtt_entries; i < current_size->num_entries; i++)
+				OUTREG32(intel_i830_private.gtt, i, agp_bridge.scratch_page);
+		} else {
+			for (i = intel_i830_private.gtt_entries; i < current_size->num_entries; i++)
+				OUTREG32(intel_i830_private.registers,I810_PTE_BASE + (i * 4),agp_bridge.scratch_page);
+		}
+	}
 
 	return (0);
 }
 
 static void intel_i830_cleanup(void)
 {
+	if (agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_G_0)
+		iounmap((void *)intel_i830_private.gtt);
+
 	iounmap((void *) intel_i830_private.registers);
 }
 
@@ -1315,9 +1441,13 @@ static int intel_i830_insert_entries(agp
 
 	CACHE_FLUSH();
 
-	for (i = 0, j = pg_start; i < mem->page_count; i++, j++)
-		OUTREG32(intel_i830_private.registers,I810_PTE_BASE + (j * 4),
-			 agp_bridge.mask_memory(mem->memory[i], mem->type));
+	if (agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_G_0) {
+		for (i = 0, j = pg_start; i < mem->page_count; i++, j++)
+			OUTREG32(intel_i830_private.gtt, j, agp_bridge.mask_memory(mem->memory[i], mem->type));
+	} else {
+		for (i = 0, j = pg_start; i < mem->page_count; i++, j++)
+			OUTREG32(intel_i830_private.registers,I810_PTE_BASE + (j * 4),agp_bridge.mask_memory(mem->memory[i], mem->type));
+	}
 
 	CACHE_FLUSH();
 
@@ -1337,8 +1467,13 @@ static int intel_i830_remove_entries(agp
 		return (-EINVAL);
 	}
 
-	for (i = pg_start; i < (mem->page_count + pg_start); i++)
-		OUTREG32(intel_i830_private.registers,I810_PTE_BASE + (i * 4),agp_bridge.scratch_page);
+	if (agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_G_0) {
+		for (i = pg_start; i < (mem->page_count + pg_start); i++)
+			OUTREG32(intel_i830_private.gtt, i, agp_bridge.scratch_page);
+	} else {
+		for (i = pg_start; i < (mem->page_count + pg_start); i++)
+			OUTREG32(intel_i830_private.registers,I810_PTE_BASE + (i * 4),agp_bridge.scratch_page);
+	}
 
 	CACHE_FLUSH();
 
@@ -1363,24 +1498,40 @@ static agp_memory *intel_i830_alloc_by_t
 		 * aperture
 		 */
 
-		if (pg_count != 1) return(NULL);
+		if (pg_count != 1 && pg_count != 4) return(NULL);
 
-		nw = agp_create_memory(1);
+		nw = agp_create_memory(pg_count);
 
 		if (nw == NULL) return(NULL);
 
 		MOD_INC_USE_COUNT;
-		nw->memory[0] = agp_bridge.agp_alloc_page();
-		physical = nw->memory[0];
+		if (pg_count == 1)
+			nw->memory[0] = agp_bridge.agp_alloc_page();
+		else {
+			/* kludge to get 4 physical pages for ARGB cursor */
+			nw->memory[0] = i830_alloc_pages();
+			nw->memory[1] = nw->memory[0] + PAGE_SIZE;
+			nw->memory[2] = nw->memory[1] + PAGE_SIZE;
+			nw->memory[3] = nw->memory[2] + PAGE_SIZE;
+		}
+
 		if (nw->memory[0] == 0) {
 			/* free this structure */
 			agp_free_memory(nw);
 			return(NULL);
 		}
 
+		physical = nw->memory[0];
+
 		nw->memory[0] = virt_to_phys((void *) nw->memory[0]);
-		nw->page_count = 1;
-		nw->num_scratch_pages = 1;
+		if (pg_count == 4) {
+			/* kludge to enable 4 physical pages for ARGB cursor */
+			nw->memory[1] = virt_to_phys((void *) nw->memory[1]);
+			nw->memory[2] = virt_to_phys((void *) nw->memory[2]);
+			nw->memory[3] = virt_to_phys((void *) nw->memory[3]);
+		}
+		nw->page_count = pg_count;
+		nw->num_scratch_pages = pg_count;
 		nw->type = AGP_PHYS_MEMORY;
 		nw->physical = virt_to_phys((void *) physical);
 		return(nw);
@@ -5553,24 +5704,30 @@ static struct {
 		 "Intel(R)",
 		 "845G",
 		 intel_845_setup },
-       { PCI_DEVICE_ID_INTEL_855_GM_0,
-                PCI_VENDOR_ID_INTEL,
-                INTEL_I855_PM,
-                "Intel(R)",
-                "855PM",
-                intel_845_setup },
-       { PCI_DEVICE_ID_INTEL_855_PM_0,
-                PCI_VENDOR_ID_INTEL,
-                INTEL_I855_PM,
-                "Intel(R)",
-                "855PM",
-                intel_845_setup },
-       { PCI_DEVICE_ID_INTEL_865_G_0,
-               PCI_VENDOR_ID_INTEL,
-               INTEL_I865_G,
-               "Intel(R)",
-               "865G",
-                intel_845_setup },
+	{ PCI_DEVICE_ID_INTEL_855_GM_0,
+		PCI_VENDOR_ID_INTEL,
+		INTEL_I855_PM,
+		"Intel(R)",
+		"855PM",
+		 intel_845_setup },
+	{ PCI_DEVICE_ID_INTEL_855_PM_0,
+		PCI_VENDOR_ID_INTEL,
+		INTEL_I855_PM,
+		"Intel(R)",
+		"855PM",
+		 intel_845_setup },
+	{ PCI_DEVICE_ID_INTEL_865_G_0,
+		PCI_VENDOR_ID_INTEL,
+		INTEL_I865_G,
+		"Intel(R)",
+		"865G",
+		 intel_845_setup },
+	{ PCI_DEVICE_ID_INTEL_915_G_0,
+		PCI_VENDOR_ID_INTEL,
+		INTEL_I915_G,
+		"Intel(R)",
+		"915G",
+		 intel_845_setup },
 	{ PCI_DEVICE_ID_INTEL_840_0,
 		PCI_VENDOR_ID_INTEL,
 		INTEL_I840,
@@ -6221,6 +6378,34 @@ static int __init agp_init_one(struct pc
 				   "865G Chipset.\n");
 			agp_bridge.type = INTEL_I810;
 			return intel_i830_setup(i810_dev);
+
+		case PCI_DEVICE_ID_INTEL_915_G_0:
+			i810_dev = pci_find_device(PCI_VENDOR_ID_INTEL,
+					PCI_DEVICE_ID_INTEL_915_G_1, NULL);
+			if(i810_dev && PCI_FUNC(i810_dev->devfn) != 0) {
+				i810_dev = pci_find_device(PCI_VENDOR_ID_INTEL,
+					PCI_DEVICE_ID_INTEL_915_G_1, i810_dev);
+			}
+
+			if (i810_dev == NULL) {
+                                /* 
+                                 * We probably have a 915G chipset
+                                 * with an external graphics
+                                 * card. It will be initialized later 
+                                 */
+				printk(KERN_ERR PFX "Detected an "
+				       "Intel(R) 915G, but could not"
+				       " find the"
+				       " secondary device. Assuming a "
+				       "non-integrated video card.\n");
+				agp_bridge.type = INTEL_I915_G;
+				break;
+			}
+			printk(KERN_INFO PFX "Detected an Intel(R) "
+				   "915G Chipset.\n");
+			agp_bridge.type = INTEL_I810;
+			return intel_i830_setup(i810_dev);
+
 		default:
 			break;
 		}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/char/drm/Config.in linux-2.4.20-wolk4.16-fullkernel/drivers/char/drm/Config.in
--- linux-2.4.20-wolk4.15-fullkernel/drivers/char/drm/Config.in	2004-06-29 11:26:07.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/char/drm/Config.in	2004-09-05 16:34:10.000000000 +0200
@@ -24,9 +24,9 @@ dep_tristate '  VIA CLE266' CONFIG_DRM_V
 # I already posted this to lkml but absolute full ignorance and
 # flaming. But what a luck, we have WOLK and it will work :-)
 
-    if [ "$CONFIG_DRM_SIS" = "y" ]; then
-	define_bool CONFIG_FB_SIS y
-    fi
-    if [ "$CONFIG_DRM_SIS" = "m" ]; then
-	define_bool CONFIG_FB_SIS m
-    fi
+if [ "$CONFIG_DRM_SIS" = "y" ]; then
+  define_bool CONFIG_FB_SIS y
+fi
+if [ "$CONFIG_DRM_SIS" = "m" ]; then
+  define_bool CONFIG_FB_SIS m
+fi
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/char/drm/i810_dma.c linux-2.4.20-wolk4.16-fullkernel/drivers/char/drm/i810_dma.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/char/drm/i810_dma.c	2004-06-29 11:26:07.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/char/drm/i810_dma.c	2004-09-05 16:04:29.000000000 +0200
@@ -1184,6 +1184,9 @@ int i810_dma_mc(struct inode *inode, str
 		return -EINVAL;
 	}
 
+	if (mc.idx >= dma->buf_count || mc.idx < 0)
+		return -EINVAL;
+
 	i810_dma_dispatch_mc(dev, dma->buflist[mc.idx], mc.used,
 		mc.last_render );
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/char/i8k.c linux-2.4.20-wolk4.16-fullkernel/drivers/char/i8k.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/char/i8k.c	2002-11-29 00:53:12.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/char/i8k.c	2004-09-05 16:06:00.000000000 +0200
@@ -493,6 +493,7 @@ static int i8k_get_info(char *buffer, ch
 
 static ssize_t i8k_read(struct file *f, char *buffer, size_t len, loff_t *fpos)
 {
+    loff_t pos = *fpos;
     int n;
     char info[128];
 
@@ -501,19 +502,19 @@ static ssize_t i8k_read(struct file *f, 
 	return n;
     }
 
-    if (*fpos >= n) {
+    if (pos != (unsigned)pos || pos >= n) {
 	return 0;
     }
 
-    if ((*fpos + len) >= n) {
-	len = n - *fpos;
+    if (len >= n - pos) {
+	len = n - pos;
     }
 
     if (copy_to_user(buffer, info, len) != 0) {
 	return -EFAULT;
     }
 
-    *fpos += len;
+    *fpos = pos + len;
     return len;
 }
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/char/istallion.c linux-2.4.20-wolk4.16-fullkernel/drivers/char/istallion.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/char/istallion.c	2002-08-03 02:39:43.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/char/istallion.c	2004-09-05 16:06:00.000000000 +0200
@@ -4854,6 +4854,7 @@ static ssize_t stli_memread(struct file 
 	void		*memptr;
 	stlibrd_t	*brdp;
 	int		brdnr, size, n;
+	loff_t		pos = *offp;
 
 #if DEBUG
 	printk(KERN_DEBUG "stli_memread(fp=%x,buf=%x,count=%x,offp=%x)\n",
@@ -4868,25 +4869,26 @@ static ssize_t stli_memread(struct file 
 		return(-ENODEV);
 	if (brdp->state == 0)
 		return(-ENODEV);
-	if (fp->f_pos >= brdp->memsize)
+	if (pos != (unsigned)pos || pos >= brdp->memsize)
 		return(0);
 
-	size = MIN(count, (brdp->memsize - fp->f_pos));
+	size = MIN(count, (brdp->memsize - pos));
 
 	save_flags(flags);
 	cli();
 	EBRDENABLE(brdp);
 	while (size > 0) {
-		memptr = (void *) EBRDGETMEMPTR(brdp, fp->f_pos);
-		n = MIN(size, (brdp->pagesize - (((unsigned long) fp->f_pos) % brdp->pagesize)));
+		memptr = (void *) EBRDGETMEMPTR(brdp, pos);
+		n = MIN(size, (brdp->pagesize - (((unsigned long) pos) % brdp->pagesize)));
 		if (copy_to_user(buf, memptr, n)) {
 			count = -EFAULT;
 			goto out;
 		}
-		fp->f_pos += n;
+		pos += n;
 		buf += n;
 		size -= n;
 	}
+	*offp = pos;
 out:
 	EBRDDISABLE(brdp);
 	restore_flags(flags);
@@ -4909,6 +4911,7 @@ static ssize_t stli_memwrite(struct file
 	stlibrd_t	*brdp;
 	char		*chbuf;
 	int		brdnr, size, n;
+	loff_t		pos = *offp;
 
 #if DEBUG
 	printk(KERN_DEBUG "stli_memwrite(fp=%x,buf=%x,count=%x,offp=%x)\n",
@@ -4923,26 +4926,27 @@ static ssize_t stli_memwrite(struct file
 		return(-ENODEV);
 	if (brdp->state == 0)
 		return(-ENODEV);
-	if (fp->f_pos >= brdp->memsize)
+	if (pos != (unsigned)pos || pos >= brdp->memsize)
 		return(0);
 
 	chbuf = (char *) buf;
-	size = MIN(count, (brdp->memsize - fp->f_pos));
+	size = MIN(count, (brdp->memsize - pos));
 
 	save_flags(flags);
 	cli();
 	EBRDENABLE(brdp);
 	while (size > 0) {
-		memptr = (void *) EBRDGETMEMPTR(brdp, fp->f_pos);
-		n = MIN(size, (brdp->pagesize - (((unsigned long) fp->f_pos) % brdp->pagesize)));
+		memptr = (void *) EBRDGETMEMPTR(brdp, pos);
+		n = MIN(size, (brdp->pagesize - (((unsigned long) pos) % brdp->pagesize)));
 		if (copy_from_user(memptr, chbuf, n)) {
 			count = -EFAULT;
 			goto out;
 		}
-		fp->f_pos += n;
+		pos += n;
 		chbuf += n;
 		size -= n;
 	}
+	*offp = pos;
 out:
 	EBRDDISABLE(brdp);
 	restore_flags(flags);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/char/mem.c linux-2.4.20-wolk4.16-fullkernel/drivers/char/mem.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/char/mem.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/char/mem.c	2004-09-05 17:09:43.000000000 +0200
@@ -11,7 +11,6 @@
 #include <linux/config.h>
 #include <linux/mm.h>
 #include <linux/miscdevice.h>
-#include <linux/tpqic02.h>
 #include <linux/ftape.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
@@ -42,7 +41,11 @@ extern void mda_console_init(void);
 #if defined(CONFIG_S390_TAPE) && defined(CONFIG_S390_TAPE_CHAR)
 extern void tapechar_init(void);
 #endif
-     
+
+#ifdef CONFIG_GRKERNSEC
+extern struct file_operations grsec_fops;
+#endif
+
 /* RSBAC */
 #ifdef CONFIG_RSBAC
 #include <rsbac/adf.h>
@@ -69,7 +72,7 @@ static ssize_t do_write_mem(struct file 
 	if (copy_from_user(p, buf, count))
 		return -EFAULT;
 	written += count;
-	*ppos += written;
+	*ppos = realp + written;
 	return written;
 }
 
@@ -110,7 +113,7 @@ static ssize_t read_mem(struct file * fi
 	if (copy_to_user(buf, __va(p), count))
 		return -EFAULT;
 	read += count;
-	*ppos += read;
+	*ppos = p + read;
 	return read;
 }
 
@@ -312,11 +315,13 @@ static ssize_t write_kmem(struct file * 
 #endif
 
 	if (p < (unsigned long) high_memory) {
-		wrote = count;
+		ssize_t towrite = count;
 		if (count > (unsigned long) high_memory - p)
-			wrote = (unsigned long) high_memory - p;
+			towrite = (unsigned long) high_memory - p;
 
-		wrote = do_write_mem(file, (void*)p, p, buf, wrote, ppos);
+		wrote = do_write_mem(file, (void*)p, p, buf, towrite, ppos);
+		if (wrote != towrite)
+			return wrote;
 
 		p += wrote;
 		buf += wrote;
@@ -769,6 +774,11 @@ static int memory_open(struct inode * in
 		case 10:
 		        filp->f_op = &anon_file_operations;
 			break;
+#ifdef CONFIG_GRKERNSEC
+		case 12:
+			filp->f_op = &grsec_fops;
+			break;
+#endif
 		default:
 			return -ENXIO;
 	}
@@ -796,7 +806,10 @@ void __init memory_devfs_register (void)
 	{7, "full",    S_IRUGO | S_IWUGO,           &full_fops},
 	{8, "random",  S_IRUGO | S_IWUSR,           &random_fops},
 	{9, "urandom", S_IRUGO | S_IWUSR,           &urandom_fops},
-	{10, "anon",   S_IRUGO | S_IWUSR,           &anon_file_operations}
+	{10, "anon",   S_IRUGO | S_IWUSR,           &anon_file_operations},
+#ifdef CONFIG_GRKERNSEC
+	{12, "grsec",  S_IRUSR | S_IWUGO,           &grsec_fops}
+#endif
     };
     int i;
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/char/n_hdlc.c linux-2.4.20-wolk4.16-fullkernel/drivers/char/n_hdlc.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/char/n_hdlc.c	2002-02-25 20:37:57.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/char/n_hdlc.c	2004-09-05 16:06:01.000000000 +0200
@@ -9,7 +9,7 @@
  *	Al Longyear <longyear@netcom.com>, Paul Mackerras <Paul.Mackerras@cs.anu.edu.au>
  *
  * Original release 01/11/99
- * $Id: n_hdlc.c,v 3.3 2001/11/08 16:16:03 paulkf Exp $
+ * $Id: n_hdlc.c,v 3.7 2003/05/01 15:45:29 paulkf Exp $
  *
  * This code is released under the GNU General Public License (GPL)
  *
@@ -78,7 +78,7 @@
  */
 
 #define HDLC_MAGIC 0x239e
-#define HDLC_VERSION "$Revision: 3.3 $"
+#define HDLC_VERSION "$Revision: 3.7 $"
 
 #include <linux/version.h>
 #include <linux/config.h>
@@ -172,9 +172,9 @@ struct n_hdlc {
 /*
  * HDLC buffer list manipulation functions
  */
-void n_hdlc_buf_list_init(N_HDLC_BUF_LIST *list);
-void n_hdlc_buf_put(N_HDLC_BUF_LIST *list,N_HDLC_BUF *buf);
-N_HDLC_BUF* n_hdlc_buf_get(N_HDLC_BUF_LIST *list);
+static void n_hdlc_buf_list_init(N_HDLC_BUF_LIST *list);
+static void n_hdlc_buf_put(N_HDLC_BUF_LIST *list,N_HDLC_BUF *buf);
+static N_HDLC_BUF* n_hdlc_buf_get(N_HDLC_BUF_LIST *list);
 
 /* Local functions */
 
@@ -183,13 +183,16 @@ static struct n_hdlc *n_hdlc_alloc (void
 MODULE_PARM(debuglevel, "i");
 MODULE_PARM(maxframe, "i");
 
+#ifdef MODULE_LICENSE
+MODULE_LICENSE("GPL");
+#endif
 
 /* debug level can be set by insmod for debugging purposes */
 #define DEBUG_LEVEL_INFO	1
-int debuglevel=0;
+static int debuglevel=0;
 
 /* max frame size for memory allocations */
-ssize_t	maxframe=4096;
+static ssize_t	maxframe=4096;
 
 /* TTY callbacks */
 
@@ -265,7 +268,8 @@ static void n_hdlc_release (struct n_hdl
 		} else
 			break;
 	}
-	
+	if (n_hdlc->tbuf)
+		kfree(n_hdlc->tbuf);
 	kfree(n_hdlc);
 	
 }	/* end of n_hdlc_release() */
@@ -905,7 +909,7 @@ static struct n_hdlc *n_hdlc_alloc (void
  * Arguments:	 	list	pointer to buffer list
  * Return Value:	None	
  */
-void n_hdlc_buf_list_init(N_HDLC_BUF_LIST *list)
+static void n_hdlc_buf_list_init(N_HDLC_BUF_LIST *list)
 {
 	memset(list,0,sizeof(N_HDLC_BUF_LIST));
 	spin_lock_init(&list->spinlock);
@@ -922,7 +926,7 @@ void n_hdlc_buf_list_init(N_HDLC_BUF_LIS
  * 
  * Return Value:	None	
  */
-void n_hdlc_buf_put(N_HDLC_BUF_LIST *list,N_HDLC_BUF *buf)
+static void n_hdlc_buf_put(N_HDLC_BUF_LIST *list,N_HDLC_BUF *buf)
 {
 	unsigned long flags;
 	spin_lock_irqsave(&list->spinlock,flags);
@@ -952,7 +956,7 @@ void n_hdlc_buf_put(N_HDLC_BUF_LIST *lis
  * 
  * 	pointer to HDLC buffer if available, otherwise NULL
  */
-N_HDLC_BUF* n_hdlc_buf_get(N_HDLC_BUF_LIST *list)
+static N_HDLC_BUF* n_hdlc_buf_get(N_HDLC_BUF_LIST *list)
 {
 	unsigned long flags;
 	N_HDLC_BUF *buf;
@@ -1025,5 +1029,4 @@ static void __exit n_hdlc_exit(void)
 module_init(n_hdlc_init);
 module_exit(n_hdlc_exit);
 
-MODULE_LICENSE("GPL");
 EXPORT_NO_SYMBOLS;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/char/nvram.c linux-2.4.20-wolk4.16-fullkernel/drivers/char/nvram.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/char/nvram.c	2002-11-29 00:53:12.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/char/nvram.c	2004-09-05 16:06:00.000000000 +0200
@@ -250,9 +250,13 @@ static ssize_t
 nvram_read(struct file *file, char *buf, size_t count, loff_t *ppos)
 {
 	unsigned char contents[NVRAM_BYTES];
-	unsigned i = *ppos;
+	loff_t n = *ppos;
+	unsigned i = n;
 	unsigned char *tmp;
 
+	if (i != n || i >= NVRAM_BYTES)
+		return 0;
+
 	spin_lock_irq(&rtc_lock);
 
 	if (!__nvram_check_checksum())
@@ -279,10 +283,14 @@ static ssize_t
 nvram_write(struct file *file, const char *buf, size_t count, loff_t *ppos)
 {
 	unsigned char contents[NVRAM_BYTES];
-	unsigned i = *ppos;
+	loff_t n = *ppos;
+	unsigned i = n;
 	unsigned char *tmp;
 	int len;
 
+	if (i != n || i >= NVRAM_BYTES)
+		return 0;
+
 	len = (NVRAM_BYTES - i) < count ? (NVRAM_BYTES - i) : count;
 	if (copy_from_user(contents, buf, len))
 		return -EFAULT;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/char/nwflash.c linux-2.4.20-wolk4.16-fullkernel/drivers/char/nwflash.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/char/nwflash.c	2001-10-12 22:48:42.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/char/nwflash.c	2004-09-05 16:06:00.000000000 +0200
@@ -133,7 +133,8 @@ static int flash_ioctl(struct inode *ino
 
 static ssize_t flash_read(struct file *file, char *buf, size_t size, loff_t * ppos)
 {
-	unsigned long p = *ppos;
+	loff_t n = *ppos;
+	unsigned long p = n;
 	unsigned int count = size;
 	int ret = 0;
 
@@ -144,7 +145,7 @@ static ssize_t flash_read(struct file *f
 	if (count)
 		ret = -ENXIO;
 
-	if (p < gbFlashSize) {
+	if (n == p && p < gbFlashSize) {
 		if (count > gbFlashSize - p)
 			count = gbFlashSize - p;
 
@@ -157,7 +158,7 @@ static ssize_t flash_read(struct file *f
 		ret = copy_to_user(buf, (void *)(FLASH_BASE + p), count);
 		if (ret == 0) {
 			ret = count;
-			*ppos += count;
+			*ppos = p + count;
 		}
 		up(&nwflash_sem);
 	}
@@ -166,7 +167,8 @@ static ssize_t flash_read(struct file *f
 
 static ssize_t flash_write(struct file *file, const char *buf, size_t size, loff_t * ppos)
 {
-	unsigned long p = *ppos;
+	loff_t n = *ppos;
+	unsigned long p = n;
 	unsigned int count = size;
 	int written;
 	int nBlock, temp, rc;
@@ -185,7 +187,7 @@ static ssize_t flash_write(struct file *
 	/*
 	 * check for out of range pos or count
 	 */
-	if (p >= gbFlashSize)
+	if (p != n || p >= gbFlashSize)
 		return count ? -ENXIO : 0;
 
 	if (count > gbFlashSize - p)
@@ -274,7 +276,7 @@ static ssize_t flash_write(struct file *
 		p += rc;
 		buf += rc;
 		written += rc;
-		*ppos += rc;
+		*ppos = p;
 
 		if (flashdebug)
 			printk(KERN_DEBUG "flash_write: written 0x%X bytes OK.\n", written);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/char/parport_serial.c linux-2.4.20-wolk4.16-fullkernel/drivers/char/parport_serial.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/char/parport_serial.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/char/parport_serial.c	2004-09-05 16:05:53.000000000 +0200
@@ -0,0 +1,436 @@
+/*
+ * Support for common PCI multi-I/O cards (which is most of them)
+ *
+ * Copyright (C) 2001  Tim Waugh <twaugh@redhat.com>
+ *
+ * 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.
+ *
+ *
+ * Multi-function PCI cards are supposed to present separate logical
+ * devices on the bus.  A common thing to do seems to be to just use
+ * one logical device with lots of base address registers for both
+ * parallel ports and serial ports.  This driver is for dealing with
+ * that.
+ *
+ */
+
+#include <linux/types.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/parport.h>
+#include <linux/parport_pc.h>
+#include <linux/serial.h>
+#include <linux/serialP.h>
+#include <linux/list.h>
+
+#include <asm/serial.h>
+
+enum parport_pc_pci_cards {
+	titan_110l = 0,
+	titan_210l,
+	netmos_9735,
+	netmos_9835,
+	avlab_1s1p,
+	avlab_1s1p_650,
+	avlab_1s1p_850,
+	avlab_1s2p,
+	avlab_1s2p_650,
+	avlab_1s2p_850,
+	avlab_2s1p,
+	avlab_2s1p_650,
+	avlab_2s1p_850,
+	siig_1s1p_10x,
+	siig_2s1p_10x,
+	siig_2p1s_20x,
+	siig_1s1p_20x,
+	siig_2s1p_20x,
+};
+
+
+/* each element directly indexed from enum list, above */
+static struct parport_pc_pci {
+	int numports;
+	struct { /* BAR (base address registers) numbers in the config
+                    space header */
+		int lo;
+		int hi; /* -1 if not there, >6 for offset-method (max
+                           BAR is 6) */
+	} addr[4];
+
+	/* If set, this is called immediately after pci_enable_device.
+	 * If it returns non-zero, no probing will take place and the
+	 * ports will not be used. */
+	int (*preinit_hook) (struct pci_dev *pdev, int autoirq, int autodma);
+
+	/* If set, this is called after probing for ports.  If 'failed'
+	 * is non-zero we couldn't use any of the ports. */
+	void (*postinit_hook) (struct pci_dev *pdev, int failed);
+} cards[] __devinitdata = {
+	/* titan_110l */		{ 1, { { 3, -1 }, } },
+	/* titan_210l */		{ 1, { { 3, -1 }, } },
+	/* netmos_9735 (not tested) */	{ 1, { { 2, -1 }, } },
+	/* netmos_9835 */		{ 1, { { 2, -1 }, } },
+	/* avlab_1s1p     */		{ 1, { { 1, 2}, } },
+	/* avlab_1s1p_650 */		{ 1, { { 1, 2}, } },
+	/* avlab_1s1p_850 */		{ 1, { { 1, 2}, } },
+	/* avlab_1s2p     */		{ 2, { { 1, 2}, { 3, 4 },} },
+	/* avlab_1s2p_650 */		{ 2, { { 1, 2}, { 3, 4 },} },
+	/* avlab_1s2p_850 */		{ 2, { { 1, 2}, { 3, 4 },} },
+	/* avlab_2s1p     */		{ 1, { { 2, 3}, } },
+	/* avlab_2s1p_650 */		{ 1, { { 2, 3}, } },
+	/* avlab_2s1p_850 */		{ 1, { { 2, 3}, } },
+	/* siig_1s1p_10x */		{ 1, { { 3, 4 }, } },
+	/* siig_2s1p_10x */		{ 1, { { 4, 5 }, } },
+	/* siig_2p1s_20x */		{ 2, { { 1, 2 }, { 3, 4 }, } },
+	/* siig_1s1p_20x */		{ 1, { { 1, 2 }, } },
+	/* siig_2s1p_20x */		{ 1, { { 2, 3 }, } },
+};
+
+static struct pci_device_id parport_serial_pci_tbl[] __devinitdata = {
+	/* PCI cards */
+	{ PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_110L,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_110l },
+	{ PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_210L,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_210l },
+	{ PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9735,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9735 },
+	{ PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9835,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9835 },
+	/* PCI_VENDOR_ID_AVLAB/Intek21 has another bunch of cards ...*/
+	{ 0x14db, 0x2110, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p},
+	{ 0x14db, 0x2111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p_650},
+	{ 0x14db, 0x2112, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p_850},
+	{ 0x14db, 0x2140, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p},
+	{ 0x14db, 0x2141, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p_650},
+	{ 0x14db, 0x2142, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p_850},
+	{ 0x14db, 0x2160, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p},
+	{ 0x14db, 0x2161, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p_650},
+	{ 0x14db, 0x2162, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p_850},
+	{ PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_550,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x },
+	{ PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_650,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x },
+	{ PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_850,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x },
+	{ PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_550,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x },
+	{ PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_650,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x },
+	{ PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_850,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x },
+	{ PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_550,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x },
+	{ PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_650,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x },
+	{ PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_850,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x },
+	{ PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_550,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x },
+	{ PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_650,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_20x },
+	{ PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_850,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_20x },
+	{ PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_550,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x },
+	{ PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_650,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x },
+	{ PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_850,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x },
+
+	{ 0, } /* terminate list */
+};
+MODULE_DEVICE_TABLE(pci,parport_serial_pci_tbl);
+
+struct pci_board_no_ids {
+	int flags;
+	int num_ports;
+	int base_baud;
+	int uart_offset;
+	int reg_shift;
+	int (*init_fn)(struct pci_dev *dev, struct pci_board_no_ids *board,
+			int enable);
+	int first_uart_offset;
+};
+
+static int __devinit siig10x_init_fn(struct pci_dev *dev, struct pci_board_no_ids *board, int enable)
+{
+	return pci_siig10x_fn(dev, NULL, enable);
+}
+
+static int __devinit siig20x_init_fn(struct pci_dev *dev, struct pci_board_no_ids *board, int enable)
+{
+	return pci_siig20x_fn(dev, NULL, enable);
+}
+
+static struct pci_board_no_ids pci_boards[] __devinitdata = {
+	/*
+	 * PCI Flags, Number of Ports, Base (Maximum) Baud Rate,
+	 * Offset to get to next UART's registers,
+	 * Register shift to use for memory-mapped I/O,
+	 * Initialization function, first UART offset
+	 */
+
+// Cards not tested are marked n/t
+// If you have one of these cards and it works for you, please tell me..
+
+/* titan_110l */	{ SPCI_FL_BASE1 | SPCI_FL_BASE_TABLE, 1, 921600 },
+/* titan_210l */	{ SPCI_FL_BASE1 | SPCI_FL_BASE_TABLE, 2, 921600 },
+/* netmos_9735 (n/t)*/	{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 },
+/* netmos_9835 */	{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 },
+/* avlab_1s1p (n/t) */	{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 },
+/* avlab_1s1p_650 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 },
+/* avlab_1s1p_850 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 },
+/* avlab_1s2p (n/t) */	{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 },
+/* avlab_1s2p_650 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 },
+/* avlab_1s2p_850 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 },
+/* avlab_2s1p (n/t) */	{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 },
+/* avlab_2s1p_650 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 },
+/* avlab_2s1p_850 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 },
+/* siig_1s1p_10x */	{ SPCI_FL_BASE2, 1, 460800, 0, 0, siig10x_init_fn },
+/* siig_2s1p_10x */	{ SPCI_FL_BASE2, 1, 921600, 0, 0, siig10x_init_fn },
+/* siig_2p1s_20x */	{ SPCI_FL_BASE0, 1, 921600, 0, 0, siig20x_init_fn },
+/* siig_1s1p_20x */	{ SPCI_FL_BASE0, 1, 921600, 0, 0, siig20x_init_fn },
+/* siig_2s1p_20x */	{ SPCI_FL_BASE0, 1, 921600, 0, 0, siig20x_init_fn },
+};
+
+struct parport_serial_private {
+	int num_ser;
+	int line[20];
+	struct pci_board_no_ids ser;
+	int num_par;
+	struct parport *port[PARPORT_MAX];
+};
+
+static int __devinit get_pci_port (struct pci_dev *dev,
+				   struct pci_board_no_ids *board,
+				   struct serial_struct *req,
+				   int idx)
+{
+	unsigned long port;
+	int base_idx;
+	int max_port;
+	int offset;
+
+	base_idx = SPCI_FL_GET_BASE(board->flags);
+	if (board->flags & SPCI_FL_BASE_TABLE)
+		base_idx += idx;
+
+	if (board->flags & SPCI_FL_REGION_SZ_CAP) {
+		max_port = pci_resource_len(dev, base_idx) / 8;
+		if (idx >= max_port)
+			return 1;
+	}
+
+	offset = board->first_uart_offset;
+
+	/* Timedia/SUNIX uses a mixture of BARs and offsets */
+	/* Ugh, this is ugly as all hell --- TYT */
+	if(dev->vendor == PCI_VENDOR_ID_TIMEDIA )  /* 0x1409 */
+		switch(idx) {
+			case 0: base_idx=0;
+				break;
+			case 1: base_idx=0; offset=8;
+				break;
+			case 2: base_idx=1;
+				break;
+			case 3: base_idx=1; offset=8;
+				break;
+			case 4: /* BAR 2*/
+			case 5: /* BAR 3 */
+			case 6: /* BAR 4*/
+			case 7: base_idx=idx-2; /* BAR 5*/
+		}
+
+	port =  pci_resource_start(dev, base_idx) + offset;
+
+	if ((board->flags & SPCI_FL_BASE_TABLE) == 0)
+		port += idx * (board->uart_offset ? board->uart_offset : 8);
+
+	if (pci_resource_flags (dev, base_idx) & IORESOURCE_IO) {
+		int high_bits_offset = ((sizeof(long)-sizeof(int))*8);
+		req->port = port;
+		if (high_bits_offset)
+			req->port_high = port >> high_bits_offset;
+		else
+			req->port_high = 0;
+		return 0;
+	}
+	req->io_type = SERIAL_IO_MEM;
+	req->iomem_base = ioremap(port, board->uart_offset);
+	req->iomem_reg_shift = board->reg_shift;
+	req->port = 0;
+	return req->iomem_base ? 0 : 1;
+}
+
+/* Register the serial port(s) of a PCI card. */
+static int __devinit serial_register (struct pci_dev *dev,
+				      const struct pci_device_id *id)
+{
+	struct pci_board_no_ids *board = &pci_boards[id->driver_data];
+	struct parport_serial_private *priv = pci_get_drvdata (dev);
+	struct serial_struct serial_req;
+	int base_baud;
+	int k;
+	int success = 0;
+
+	priv->ser = *board;
+	if (board->init_fn && ((board->init_fn) (dev, board, 1) != 0))
+		return 1;
+
+	base_baud = board->base_baud;
+	if (!base_baud)
+		base_baud = BASE_BAUD;
+	memset (&serial_req, 0, sizeof (serial_req));
+
+	for (k = 0; k < board->num_ports; k++) {
+		int line;
+		serial_req.irq = dev->irq;
+		if (get_pci_port (dev, board, &serial_req, k))
+			break;
+		serial_req.flags = ASYNC_SKIP_TEST | ASYNC_AUTOPROBE;
+		serial_req.baud_base = base_baud;
+		line = register_serial (&serial_req);
+		if (line < 0) {
+			printk (KERN_DEBUG
+				"parport_serial: register_serial failed\n");
+			continue;
+		}
+		priv->line[priv->num_ser++] = line;
+		success = 1;
+	}
+
+	return success ? 0 : 1;
+}
+
+/* Register the parallel port(s) of a PCI card. */
+static int __devinit parport_register (struct pci_dev *dev,
+				       const struct pci_device_id *id)
+{
+	struct parport_serial_private *priv = pci_get_drvdata (dev);
+	int i = id->driver_data, n;
+	int success = 0;
+
+	if (cards[i].preinit_hook &&
+	    cards[i].preinit_hook (dev, PARPORT_IRQ_NONE, PARPORT_DMA_NONE))
+		return -ENODEV;
+
+	for (n = 0; n < cards[i].numports; n++) {
+		struct parport *port;
+		int lo = cards[i].addr[n].lo;
+		int hi = cards[i].addr[n].hi;
+		unsigned long io_lo, io_hi;
+		io_lo = pci_resource_start (dev, lo);
+		io_hi = 0;
+		if ((hi >= 0) && (hi <= 6))
+			io_hi = pci_resource_start (dev, hi);
+		else if (hi > 6)
+			io_lo += hi; /* Reinterpret the meaning of
+                                        "hi" as an offset (see SYBA
+                                        def.) */
+		/* TODO: test if sharing interrupts works */
+		printk (KERN_DEBUG "PCI parallel port detected: %04x:%04x, "
+			"I/O at %#lx(%#lx)\n",
+			parport_serial_pci_tbl[i].vendor,
+			parport_serial_pci_tbl[i].device, io_lo, io_hi);
+		port = parport_pc_probe_port (io_lo, io_hi, PARPORT_IRQ_NONE,
+					      PARPORT_DMA_NONE, dev);
+		if (port) {
+			priv->port[priv->num_par++] = port;
+			success = 1;
+		}
+	}
+
+	if (cards[i].postinit_hook)
+		cards[i].postinit_hook (dev, !success);
+
+	return success ? 0 : 1;
+}
+
+static int __devinit parport_serial_pci_probe (struct pci_dev *dev,
+					       const struct pci_device_id *id)
+{
+	struct parport_serial_private *priv;
+	int err;
+
+	priv = kmalloc (sizeof *priv, GFP_KERNEL);
+	if (!priv)
+		return -ENOMEM;
+	priv->num_ser = priv->num_par = 0;
+	pci_set_drvdata (dev, priv);
+
+	err = pci_enable_device (dev);
+	if (err) {
+		pci_set_drvdata (dev, NULL);
+		kfree (priv);
+		return err;
+	}
+
+	if (parport_register (dev, id)) {
+		pci_set_drvdata (dev, NULL);
+		kfree (priv);
+		return -ENODEV;
+	}
+
+	if (serial_register (dev, id)) {
+		int i;
+		for (i = 0; i < priv->num_par; i++)
+			parport_pc_unregister_port (priv->port[i]);
+		pci_set_drvdata (dev, NULL);
+		kfree (priv);
+		return -ENODEV;
+	}
+
+	return 0;
+}
+
+static void __devexit parport_serial_pci_remove (struct pci_dev *dev)
+{
+	struct parport_serial_private *priv = pci_get_drvdata (dev);
+	int i;
+
+	// Serial ports
+	for (i = 0; i < priv->num_ser; i++) {
+		unregister_serial (priv->line[i]);
+
+		if (priv->ser.init_fn)
+			(priv->ser.init_fn) (dev, &priv->ser, 0);
+	}
+	pci_set_drvdata (dev, NULL);
+
+	// Parallel ports
+	for (i = 0; i < priv->num_par; i++)
+		parport_pc_unregister_port (priv->port[i]);
+
+	kfree (priv);
+	return;
+}
+
+static struct pci_driver parport_serial_pci_driver = {
+	name:		"parport_serial",
+	id_table:	parport_serial_pci_tbl,
+	probe:		parport_serial_pci_probe,
+	remove:		__devexit_p(parport_serial_pci_remove),
+};
+
+
+static int __init parport_serial_init (void)
+{
+	return pci_module_init (&parport_serial_pci_driver);
+}
+
+static void __exit parport_serial_exit (void)
+{
+	pci_unregister_driver (&parport_serial_pci_driver);
+	return;
+}
+
+MODULE_AUTHOR("Tim Waugh <twaugh@redhat.com>");
+MODULE_DESCRIPTION("Driver for common parallel+serial multi-I/O PCI cards");
+MODULE_LICENSE("GPL");
+
+module_init(parport_serial_init);
+module_exit(parport_serial_exit);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/char/raw.c linux-2.4.20-wolk4.16-fullkernel/drivers/char/raw.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/char/raw.c	2004-06-29 11:25:53.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/char/raw.c	2004-09-05 16:09:21.000000000 +0200
@@ -327,6 +327,7 @@ ssize_t	rw_raw_dev(int rw, struct file *
 	int		minor;
 	kdev_t		dev;
 	unsigned long	limit;
+	loff_t		off = *offp;
 
 	int		sector_size, sector_bits, sector_mask;
 	int		max_sectors;
@@ -356,12 +357,12 @@ ssize_t	rw_raw_dev(int rw, struct file *
 		 MAJOR(dev), MINOR(dev), limit);
 	
 	err = -EINVAL;
-	if ((*offp & sector_mask) || (size & sector_mask))
+	if ((off & sector_mask) || (size & sector_mask))
 		goto out_free;
 	err = 0;
 	if (size)
 		err = -ENXIO;
-	if ((*offp >> sector_bits) >= limit)
+	if ((off >> sector_bits) >= limit)
 		goto out_free;
 
 	/*
@@ -371,7 +372,7 @@ ssize_t	rw_raw_dev(int rw, struct file *
 	 */
 
 	transferred = 0;
-	blocknr = *offp >> sector_bits;
+	blocknr = off >> sector_bits;
 	while (size > 0) {
 		blocks = size >> sector_bits;
 		if (blocks > max_sectors)
@@ -408,7 +409,7 @@ ssize_t	rw_raw_dev(int rw, struct file *
 	}
 	
 	if (transferred) {
-		*offp += transferred;
+		*offp = off + transferred;
 		err = transferred;
 	}
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/char/tpqic02.c linux-2.4.20-wolk4.16-fullkernel/drivers/char/tpqic02.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/char/tpqic02.c	2002-11-29 00:53:12.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/char/tpqic02.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,2980 +0,0 @@
-/* $Id: tpqic02.c,v 1.10 1997/01/26 07:13:20 davem Exp $
- *
- * Driver for tape drive support for Linux-i386
- *
- * Copyright (c) 1992--1996 by H. H. Bergman. All rights reserved.
- * Current e-mail address: hennus@cybercomm.nl
- *
- * Distribution of this program in executable form is only allowed if
- * all of the corresponding source files are made available through the same
- * medium at no extra cost.
- *
- * I will not accept any responsibility for damage caused directly or
- * indirectly by this program, or code derived from this program.
- *
- * Use this code at your own risk. Don't blame me if it destroys your data!
- * Make sure you have a backup before you try this code.
- *
- * If you make changes to my code and redistribute it in source or binary
- * form you must make it clear to even casual users of your code that you
- * have modified my code, clearly point out what the changes exactly are
- * (preferably in the form of a context diff file), how to undo your changes,
- * where the original can be obtained, and that complaints/requests about the
- * modified code should be directed to you instead of me.
- *
- * This driver was partially inspired by the 'wt' driver in the 386BSD
- * source distribution, which carries the following copyright notice:
- *
- *  Copyright (c) 1991 The Regents of the University of California.
- *  All rights reserved.
- *
- * You are not allowed to change this line nor the text above.
- *
- * 2001/02/26	Minor s/suser/capable/
- *
- * 1996/10/10   Emerald changes
- *
- * 1996/05/21	Misc changes+merges+cleanups + I/O reservations
- *
- * 1996/05/20	Module support patches submitted by Brian McCauley.
- *
- * 1994/05/03	Initial attempt at Mountain support for the Mountain 7150.
- * Based on patches provided by Erik Jacobson. Still incomplete, I suppose.
- *
- * 1994/02/07	Archive changes & some cleanups by Eddy Olk.
- *
- * 1994/01/19	Speed measuring stuff moved from aperf.h to delay.h.
- *		BogoMips (tm) introduced by Linus.
- *
- * 1993/01/25	Kernel udelay. Eof fixups.
- * 
- * 1992/09/19	Some changes based on patches by Eddy Olk to support
- * 		Archive SC402/SC499R controller cards.
- *
- * 1992/05/27	First release.
- *
- * 1992/05/26	Initial version. Copyright H. H. Bergman 1992
- */
-
-/* After the legalese, now the important bits:
- * 
- * This is a driver for the Wangtek 5150 tape drive with 
- * a QIC-02 controller for ISA-PC type computers.
- * Hopefully it will work with other QIC-02 tape drives as well.
- *
- * Make sure your setup matches the configuration parameters.
- * Also, be careful to avoid IO conflicts with other devices!
- */
-
-
-/*
-#define TDEBUG
-*/
-
-#define REALLY_SLOW_IO		/* it sure is ... */
-
-#include <linux/module.h>
-
-#include <linux/config.h>
-
-#include <linux/sched.h>
-#include <linux/timer.h>
-#include <linux/fs.h>
-#include <linux/kernel.h>
-#include <linux/major.h>
-#include <linux/errno.h>
-#include <linux/mtio.h>
-#include <linux/fcntl.h>
-#include <linux/delay.h>
-#include <linux/ioport.h>
-#include <linux/tpqic02.h>
-#include <linux/mm.h>
-#include <linux/slab.h>
-#include <linux/init.h>
-#include <linux/smp_lock.h>
-#include <linux/devfs_fs_kernel.h>
-
-#include <asm/dma.h>
-#include <asm/system.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
-
-/* check existence of required configuration parameters */
-#if !defined(QIC02_CMD_PORT) || !defined(QIC02_TAPE_IRQ) || !defined(QIC02_TAPE_DMA)
-# error qic02_tape configuration error
-#endif
-
-
-#define TPQIC02_NAME	"tpqic02"
-
-/* Linux outb() commands have (value,port) as parameters.
- * One might expect (port,value) instead, so beware!
- */
-
-#ifdef CONFIG_QIC02_DYNCONF
-/* This holds the dynamic configuration info for the interface
- * card+drive info if runtime configuration has been selected.
- */
-
-static struct mtconfiginfo qic02_tape_dynconf =	/* user settable */
-{ 0, 0, BOGUS_IRQ, 0, 0, TPQD_DEFAULT_FLAGS, };
-static struct qic02_ccb qic02_tape_ccb;	/* private stuff */
-
-#else
-
-unsigned long qic02_tape_debug = TPQD_DEFAULT_FLAGS;
-
-# if ((QIC02_TAPE_IFC!=WANGTEK) && (QIC02_TAPE_IFC!=ARCHIVE) && (QIC02_TAPE_IFC!=MOUNTAIN))
-#  error No valid interface card specified
-# endif
-#endif				/* CONFIG_QIC02_DYNCONF */
-
-static volatile int ctlbits;	/* control reg bits for tape interface */
-
-static wait_queue_head_t qic02_tape_transfer;	/* sync rw with interrupts */
-
-static volatile struct mtget ioctl_status;	/* current generic status */
-
-static volatile struct tpstatus tperror;	/* last drive status */
-
-static char rcs_revision[] = "$Revision: 1.10 $";
-static char rcs_date[] = "$Date: 1997/01/26 07:13:20 $";
-
-/* Flag bits for status and outstanding requests.
- * (Could all be put in one bit-field-struct.)
- * Some variables need `volatile' because they may be modified
- * by an interrupt.
- */
-static volatile flag status_dead = YES;	/* device is legally dead until proven alive */
-static flag status_zombie = YES;	/* it's `zombie' until irq/dma allocated */
-
-static volatile flag status_bytes_wr = NO;	/* write FM at close or not */
-static volatile flag status_bytes_rd = NO;	/* (rd|wr) used for rewinding */
-
-static volatile unsigned long status_cmd_pending;	/* cmd in progress */
-static volatile flag status_expect_int = NO;	/* ready for interrupts */
-static volatile flag status_timer_on = NO;	/* using time-out */
-static volatile int status_error;	/* int handler may detect error */
-static volatile flag status_eof_detected = NO;	/* end of file */
-static volatile flag status_eom_detected = NO;	/* end of recorded media */
-static volatile flag status_eot_detected = NO;	/* end of tape */
-static volatile flag doing_read = NO;
-static volatile flag doing_write = NO;
-
-static volatile unsigned long dma_bytes_todo;
-static volatile unsigned long dma_bytes_done;
-static volatile unsigned dma_mode;	/* !=0 also means DMA in use */
-static flag need_rewind = YES;
-
-static kdev_t current_tape_dev;
-static int extra_blocks_left = BLOCKS_BEYOND_EW;
-
-static struct timer_list tp_timer;
-
-/* return_*_eof:
- *	NO:	not at EOF,
- *	YES:	tell app EOF was reached (return 0).
- *
- * return_*_eof==YES && reported_*_eof==NO  ==>
- *	return current buffer, next time(s) return EOF.
- *
- * return_*_eof==YES && reported_*_eof==YES  ==>
- *	at EOF and application knows it, so we can
- *	move on to the next file.
- *
- */
-static flag return_read_eof = NO;	/* set to signal app EOF was reached */
-static flag return_write_eof = NO;
-static flag reported_read_eof = NO;	/* set when we've done that */
-static flag reported_write_eof = NO;
-
-
-/* This is for doing `mt seek <blocknr>' */
-static char seek_addr_buf[AR_SEEK_BUF_SIZE];
-
-
-/* In write mode, we have to write a File Mark after the last block written, 
- * when the tape device is closed. Tape repositioning and reading in write
- * mode is allowed as long as no actual writing has been done. After writing
- * the File Mark, repositioning and reading are allowed again.
- */
-static int mode_access;		/* access mode: READ or WRITE */
-
-static int qic02_get_resources(void);
-static void qic02_release_resources(void);
-
-/* This is a pointer to the actual kernel buffer where the interrupt routines
- * read from/write to. It is needed because the DMA channels 1 and 3 cannot
- * always access the user buffers. [The kernel buffer must reside in the
- * lower 16MBytes of system memory because of the DMA controller.] The user
- * must ensure that a large enough buffer is passed to the kernel, in order
- * to reduce tape repositioning wear and tear.
- */
-static void *buffaddr;		/* virtual address of buffer */
-
-/* This translates minor numbers to the corresponding recording format: */
-static const char *format_names[] = {
-	"not set",		/* for dumb drives unable to handle format selection */
-	"11",			/* extinct */
-	"24",
-	"120",
-	"150",
-	"300",			/* untested. */
-	"600"			/* untested. */
-};
-
-
-/* `exception_list' is needed for exception status reporting.
- * Exceptions 1..14 are defined by QIC-02 rev F.
- * The drive status is matched sequentially to each entry,
- * ignoring irrelevant bits, until a match is found. If no
- * match is found, exception number 0 is used. (That should of
- * course never happen...) The original table was based on the
- * "Exception Status Summary" in QIC-02 rev F, but some changes
- * were required to make it work with real-world drives.
- *
- * Exception 2 (CNI) is changed to also cover status 0x00e0 (mask USL),
- * Exception 4 (EOM) is changed to also cover status 0x8288 (mask EOR),
- * Exception 11 (FIL) is changed to also cover status 0x0089 (mask EOM).
- * Exception 15 (EOR) is added for seek-to-end-of-data (catch EOR),
- * Exception 16 (BOM) is added for beginning-of-media (catch BOM).
- *
- * Had to swap EXC_NDRV and EXC_NCART to ensure that extended EXC_NCART
- * (because of the incorrect Wangtek status code) doesn't catch the
- * EXC_NDRV first.
- */
-static struct exception_list_type {
-	unsigned short mask, code;
-	const char *msg;
-	/* EXC_nr attribute should match with tpqic02.h */
-} exception_list[] = {
-	{
-	0, 0, "Unknown exception status code", /* extra: 0 */ },
-	{
-	~(0), TP_ST0 | TP_CNI | TP_USL | TP_WRP,
-		    "Drive not online" /* 1 */ },
-	    /* Drive presence goes before cartridge presence. */
-	{
-		~(TP_WRP | TP_USL), TP_ST0 | TP_CNI,
-		    /* My Wangtek 5150EQ sometimes reports a status code
-		     * of 0x00e0, which is not a valid exception code, but
-		     * I think it should be recognized as "NO CARTRIDGE".
-		     */
-	"Cartridge not in place" /* 2 */ },
-	{
-	(unsigned short) ~(TP_ST1 | TP_BOM), (TP_ST0 | TP_WRP),
-		    "Write protected cartridge" /* 3 */ },
-	{
-	(unsigned short) ~(TP_ST1 | TP_EOR), (TP_ST0 | TP_EOM),
-		    "End of media" /* 4 */ },
-	{
-	~TP_WRP, TP_ST0 | TP_UDA | TP_ST1 | TP_BOM,
-		    "Read or Write abort. Rewind tape." /* 5 */ },
-	{
-	~TP_WRP, TP_ST0 | TP_UDA,
-		    "Read error. Bad block transferred." /* 6 */ },
-	{
-	~TP_WRP, TP_ST0 | TP_UDA | TP_BNL,
-		    "Read error. Filler block transferred." /* 7 */ },
-	{
-	~TP_WRP, TP_ST0 | TP_UDA | TP_BNL | TP_ST1 | TP_NDT,
-		    "Read error. No data detected." /* 8 */ },
-	{
-	~TP_WRP,
-		    TP_ST0 | TP_EOM | TP_UDA | TP_BNL | TP_ST1 |
-		    TP_NDT, "Read error. No data detected. EOM." /* 9 */ },
-	{
-	~(TP_WRP | TP_MBD | TP_PAR | TP_EOR),
-		    TP_ST0 | TP_UDA | TP_BNL | TP_ST1 | TP_NDT |
-		    TP_BOM,
-		    "Read error. No data detected. BOM." /* 10 */ },
-	{
-		~(TP_WRP | TP_EOM), TP_ST0 | TP_FIL,
-		    /* Status 0x0089 (EOM & FM) is viewed as an FM,
-		     * because it can only happen during a read.
-		     * EOM is checked separately for an FM condition.
-		     */
-	"File mark detected" /* 11 */ },
-	{
-	~(TP_ST0 | TP_CNI | TP_USL | TP_WRP | TP_BOM),
-		    TP_ST1 | TP_ILL, "Illegal command" /* 12 */ },
-	{
-	~(TP_ST0 | TP_CNI | TP_USL | TP_WRP | TP_BOM),
-		    TP_ST1 | TP_POR, "Reset occurred" /* 13 */ },
-	{
-		~TP_WRP, TP_ST0 | TP_FIL | TP_MBD,	/* NOTE: ST1 not set! */
-	"Marginal block detected" /* 14 */ },
-	{
-		~(TP_ST0 | TP_WRP | TP_EOM | TP_UDA | TP_BNL | TP_FIL |
-		  TP_NDT), TP_ST1 | TP_EOR,
-		/********** Is the extra TP_NDT really needed Eddy? **********/
-	"End of recorded media" /* extra: 15 */ },
-	    /* 15 is returned when SEEKEOD completes successfully */
-	{
-	~(TP_WRP | TP_ST0), TP_ST1 | TP_BOM, "Beginning of media" /* extra: 16 */ }
-};
-
-#define NR_OF_EXC	(sizeof(exception_list)/sizeof(struct exception_list_type))
-
-/* Compare expected struct size and actual struct size. This
- * is useful to catch programs compiled with old #includes.
- */
-#define CHECK_IOC_SIZE(structure) \
-	if (_IOC_SIZE(iocmd) != sizeof(struct structure)) { \
-		tpqputs(TPQD_ALWAYS, "sizeof(struct " #structure \
-			") does not match!"); \
-		return -EFAULT; \
-	} \
-
-static void tpqputs(unsigned long flags, const char *s)
-{
-	if ((flags & TPQD_ALWAYS) || (flags & QIC02_TAPE_DEBUG))
-		printk(TPQIC02_NAME ": %s\n", s);
-}				/* tpqputs */
-
-
-/* Perform byte order swapping for a 16-bit word.
- *
- * [FIXME] This should probably be in include/asm/
- * ([FIXME] i486 can do this faster)
- */
-static inline void byte_swap_w(volatile unsigned short *w)
-{
-	int t = *w;
-	*w = (t >> 8) | ((t & 0xff) << 8);
-}
-
-
-
-/* Init control register bits on interface card.
- * For Archive, interrupts must be enabled explicitly.
- * Wangtek interface card requires ONLINE to be set, Archive SC402/SC499R
- * cards keep it active all the time.
- */
-static void ifc_init(void)
-{
-	if (QIC02_TAPE_IFC == WANGTEK) {	/* || (QIC02_TAPE_IFC == EVEREX) */
-		ctlbits = WT_CTL_ONLINE;	/* online */
-		outb_p(ctlbits, QIC02_CTL_PORT);
-	} else if (QIC02_TAPE_IFC == ARCHIVE) {
-		ctlbits = 0;	/* no interrupts yet */
-		outb_p(ctlbits, QIC02_CTL_PORT);
-		outb_p(0, AR_RESET_DMA_PORT);	/* dummy write to reset DMA */
-	} else {		/* MOUNTAIN */
-
-		ctlbits = MTN_CTL_ONLINE;	/* online, and logic enabled */
-		outb_p(ctlbits, QIC02_CTL_PORT);
-	}
-}				/* ifc_init */
-
-
-static void report_qic_exception(unsigned n)
-{
-	if (n >= NR_OF_EXC) {
-		tpqputs(TPQD_ALWAYS, "Oops -- report_qic_exception");
-		n = 0;
-	}
-	if (TPQDBG(SENSE_TEXT) || n == 0) {
-		printk(TPQIC02_NAME ": sense: %s\n",
-		       exception_list[n].msg);
-	}
-}				/* report_qic_exception */
-
-
-/* Try to map the drive-exception bits `s' to a predefined "exception number",
- * by comparing the significant exception bits for each entry in the
- * exception table (`exception_list[]').
- * It is assumed that s!=0.
- */
-static int decode_qic_exception_nr(unsigned s)
-{
-	int i;
-
-	for (i = 1; i < NR_OF_EXC; i++) {
-		if ((s & exception_list[i].mask) == exception_list[i].code) {
-			return i;
-		}
-	}
-	printk(TPQIC02_NAME
-	       ": decode_qic_exception_nr: exception(%x) not recognized\n",
-	       s);
-	return 0;
-}				/* decode_qic_exception_nr */
-
-
-
-/* Perform appropriate action for certain exceptions.
- * should return a value to indicate stop/continue (in case of bad blocks)
- */
-static void handle_qic_exception(int exnr, int exbits)
-{
-	if (exnr == EXC_NCART) {
-		/* Cartridge was changed. Redo sense().
-		 * EXC_NCART should be handled in open().
-		 * It is not permitted to remove the tape while
-		 * the tape driver has open files. 
-		 */
-		need_rewind = YES;
-		status_eof_detected = NO;
-		status_eom_detected = NO;
-	} else if (exnr == EXC_XFILLER) {
-		tpqputs(TPQD_ALWAYS,
-			"[Bad block -- filler data transferred.]");
-	} else if (exnr == EXC_XBAD) {
-		tpqputs(TPQD_ALWAYS, "[CRC failed!]");
-	} else if (exnr == EXC_MARGINAL) {
-		/* A marginal block behaves much like a FM.
-		 * User may continue reading, if desired.
-		 */
-		tpqputs(TPQD_ALWAYS, "[Marginal block]");
-		doing_read = NO;
-	} else if (exnr == EXC_FM) {
-		doing_read = NO;
-	}
-}				/* handle_qic_exception */
-
-
-static inline int is_exception(void)
-{
-	return (inb(QIC02_STAT_PORT) & QIC02_STAT_EXCEPTION) == 0;
-}				/* is_exception */
-
-
-/* Reset the tape drive and controller.
- * When reset fails, it marks  the drive as dead and all
- * requests (except reset) are to be ignored (ENXIO).
- */
-static int tape_reset(int verbose)
-{
-	ifc_init();		/* reset interface card */
-
-	/* assert reset */
-	if (QIC02_TAPE_IFC == MOUNTAIN) {
-		outb_p(ctlbits & ~MTN_QIC02_CTL_RESET_NOT, QIC02_CTL_PORT);
-	} else {		/* WANGTEK, ARCHIVE */
-
-		outb_p(ctlbits | QIC02_CTL_RESET, QIC02_CTL_PORT);
-	}
-
-	/* Next, we need to wait >=25 usec. */
-	udelay(30);
-
-	/* after reset, we will be at BOT (modulo an automatic rewind) */
-	status_eof_detected = NO;
-	status_eom_detected = NO;
-	status_cmd_pending = 0;
-	need_rewind = YES;
-	doing_read = doing_write = NO;
-	ioctl_status.mt_fileno = ioctl_status.mt_blkno = 0;
-
-	/* de-assert reset */
-	if (QIC02_TAPE_IFC == MOUNTAIN) {
-		outb_p(ctlbits | MTN_QIC02_CTL_RESET_NOT, QIC02_CTL_PORT);
-	} else {
-		outb_p(ctlbits & ~QIC02_CTL_RESET, QIC02_CTL_PORT);
-	}
-
-	/* KLUDGE FOR G++ BUG */
-	{
-		int stat = inb_p(QIC02_STAT_PORT);
-		status_dead =
-		    ((stat & QIC02_STAT_RESETMASK) != QIC02_STAT_RESETVAL);
-	}
-	/* if successful, inb(STAT) returned RESETVAL */
-	if (status_dead == YES) {
-		printk(TPQIC02_NAME ": reset failed!\n");
-	} else if (verbose) {
-		printk(TPQIC02_NAME ": reset successful\n");
-	}
-
-	return (status_dead == YES) ? TE_DEAD : TE_OK;
-}				/* tape_reset */
-
-
-
-/* Notify tape drive of a new command. It only waits for the
- * command to be accepted, not for the actual command to complete.
- *
- * Before calling this routine, QIC02_CMD_PORT must have been loaded
- * with the command to be executed.
- * After this routine, the exception bit must be checked.
- * This routine is also used by rdstatus(), so in that case, any exception
- * must be ignored (`ignore_ex' flag).
- */
-static int notify_cmd(char cmd, short ignore_ex)
-{
-	int i;
-
-	outb_p(cmd, QIC02_CMD_PORT);	/* output the command */
-
-	/* wait 1 usec before asserting /REQUEST */
-	udelay(1);
-
-	if ((!ignore_ex) && is_exception()) {
-		tpqputs(TPQD_ALWAYS, "*** exception detected in notify_cmd");
-		/** force a reset here **/
-		if (tape_reset(1) == TE_DEAD)
-			return TE_DEAD;
-		if (is_exception()) {
-			tpqputs(TPQD_ALWAYS, "exception persists after reset.");
-			tpqputs(TPQD_ALWAYS, " ^ exception ignored.");
-		}
-	}
-
-	outb_p(ctlbits | QIC02_CTL_REQUEST, QIC02_CTL_PORT);	/* set request bit */
-	i = TAPE_NOTIFY_TIMEOUT;
-	/* The specs say this takes about 500 usec, but there is no upper limit!
-	 * If the drive were busy retensioning or something like that,
-	 * it could be *much* longer!
-	 */
-	while ((inb_p(QIC02_STAT_PORT) & QIC02_STAT_READY) && (--i > 0))
-		/*skip */ ;
-	/* wait for ready */
-	if (i == 0) {
-		tpqputs(TPQD_ALWAYS,
-			"timed out waiting for ready in notify_cmd");
-		status_dead = YES;
-		return TE_TIM;
-	}
-
-	outb_p(ctlbits & ~QIC02_CTL_REQUEST, QIC02_CTL_PORT);	/* reset request bit */
-	i = TAPE_NOTIFY_TIMEOUT;
-	/* according to the specs this one should never time-out */
-	while (((inb_p(QIC02_STAT_PORT) & QIC02_STAT_READY) == 0) && (--i > 0))
-		/*skip */ ;
-	/* wait for not ready */
-	if (i == 0) {
-		tpqputs(TPQD_ALWAYS, "timed out waiting for !ready in notify_cmd");
-		status_dead = YES;
-		return TE_TIM;
-	}
-	/* command accepted */
-	return TE_OK;
-}				/* notify_cmd */
-
-
-
-/* Wait for a command to complete, with timeout */
-static int wait_for_ready(time_t timeout)
-{
-	int stat;
-	time_t spin_t;
-
-	/* Wait for ready or exception, without driving the loadavg up too much.
-	 * In most cases, the tape drive already has READY asserted,
-	 * so optimize for that case.
-	 *
-	 * First, busy wait a few usec:
-	 */
-	spin_t = 50;
-	while (((stat = inb_p(QIC02_STAT_PORT) & QIC02_STAT_MASK) == QIC02_STAT_MASK) && (--spin_t > 0))
-		/*SKIP*/;
-	if ((stat & QIC02_STAT_READY) == 0)
-		return TE_OK;	/* covers 99.99% of all calls */
-
-	/* Then use schedule() a few times */
-	spin_t = 3;		/* max 0.03 sec busy waiting */
-	if (spin_t > timeout)
-		spin_t = timeout;
-	timeout -= spin_t;
-	spin_t += jiffies;
-
-	/* FIXME...*/
-	while (((stat = inb_p(QIC02_STAT_PORT) & QIC02_STAT_MASK) == QIC02_STAT_MASK) 
-		&& time_before(jiffies, spin_t))
-		schedule();	/* don't waste all the CPU time */
-	if ((stat & QIC02_STAT_READY) == 0)
-		return TE_OK;
-
-	/* If we reach this point, we probably need to wait much longer, or
-	 * an exception occurred. Either case is not very time-critical.
-	 * Check the status port only a few times every second.
-	 * A interval of less than 0.10 sec will not be noticed by the user,
-	 * more than 0.40 sec may give noticeable delays.
-	 */
-	spin_t += timeout;
-	TPQDEB({printk("wait_for_ready: additional timeout: %d\n", spin_t);})
-
-	    /* not ready and no exception && timeout not expired yet */
-	while (((stat = inb_p(QIC02_STAT_PORT) & QIC02_STAT_MASK) == QIC02_STAT_MASK) && time_before(jiffies, spin_t)) {
-		/* be `nice` to other processes on long operations... */
-		current->state = TASK_INTERRUPTIBLE;
-		/* nap 0.30 sec between checks, */
-		/* but could be woken up earlier by signals... */
-		schedule_timeout(3 * HZ / 10);
-	}
-
-	/* don't use jiffies for this test because it may have changed by now */
-	if ((stat & QIC02_STAT_MASK) == QIC02_STAT_MASK) {
-		tpqputs(TPQD_ALWAYS, "wait_for_ready() timed out");
-		return TE_TIM;
-	}
-
-	if ((stat & QIC02_STAT_EXCEPTION) == 0) {
-		tpqputs(TPQD_ALWAYS,
-			"exception detected after waiting_for_ready");
-		return TE_EX;
-	} else {
-		return TE_OK;
-	}
-}				/* wait_for_ready */
-
-
-
-/* Send some data to the drive */
-static int send_qic02_data(char sb[], unsigned size, int ignore_ex)
-{
-	int i, stat;
-
-	for (i = 0; i < size; i++) {
-
-		stat = wait_for_ready(TIM_S);
-		if (stat != TE_OK)
-			return stat;
-
-		stat = notify_cmd(sb[i], ignore_ex);
-		if (stat != TE_OK)
-			return stat;
-	}
-	return TE_OK;
-
-}				/* send_qic02_data */
-
-
-/* Send a QIC-02 command (`cmd') to the tape drive, with
- * a time-out (`timeout').
- * This one is also used by tp_sense(), so we must have
- * a flag to disable exception checking (`ignore_ex'). 
- *
- * On entry, the controller is supposed to be READY.
- */
-static int send_qic02_cmd(int cmd, time_t timeout, int ignore_ex)
-{
-	int stat;
-
-	stat = inb_p(QIC02_STAT_PORT);
-	if ((stat & QIC02_STAT_EXCEPTION) == 0) {	/* if exception */
-		tpqputs(TPQD_ALWAYS, "send_qic02_cmd: Exception!");
-		return TE_EX;
-	}
-	if (stat & QIC02_STAT_READY) {	/* if not ready */
-		tpqputs(TPQD_ALWAYS, "send_qic02_cmd: not Ready!");
-		return TE_ERR;
-	}
-
-	/* assert(ready & !exception) */
-
-	/* Remember current command for later re-use with dma transfers.
-	 * (For reading/writing multiple blocks.)
-	 */
-	status_cmd_pending = cmd;
-
-	stat = notify_cmd(cmd, ignore_ex);	/* tell drive new command was loaded, */
-	/* inherit exception check. */
-	if (TP_HAVE_SEEK && (cmd == AR_QCMDV_SEEK_BLK)) {
-		/* This one needs to send 3 more bytes, MSB first */
-		stat = send_qic02_data(seek_addr_buf, sizeof(seek_addr_buf), ignore_ex);
-	}
-
-	if (stat != TE_OK) {
-		tpqputs(TPQD_ALWAYS, "send_qic02_cmd failed");
-	}
-	return stat;
-}				/* send_qic02_cmd */
-
-
-
-/* Get drive status. Assume drive is ready or has exception set.
- * (or will be in <1000 usec.)
- * Extra parameters added because of 'Read Extended Status 3' command.
- */
-static int rdstatus(char *stp, unsigned size, char qcmd)
-{
-	int s, n;
-	char *q = stp;
-
-	/* Try to busy-wait a few (700) usec, after that de-schedule.
-	 *
-	 * The problem is, if we don't de-schedule, performance will
-	 * drop to zero when the drive is not responding and if we
-	 * de-schedule immediately, we waste a lot of time because a
-	 * task switch is much longer than we usually have to wait here.
-	 */
-	n = 1000;		/* 500 is not enough on a 486/33 */
-	while ((n > 0) && ((inb_p(QIC02_STAT_PORT) & QIC02_STAT_MASK) == QIC02_STAT_MASK))
-		n--;		/* wait for ready or exception or timeout */
-	if (n == 0) {
-		/* n (above) should be chosen such that on your machine
-		 * you rarely ever see the message below, and it should
-		 * be small enough to give reasonable response time.]
-		 */
-	 	/* FIXME */
-		tpqputs(TPQD_ALWAYS, "waiting looong in rdstatus() -- drive dead?");
-		while ((inb_p(QIC02_STAT_PORT) & QIC02_STAT_MASK) == QIC02_STAT_MASK)
-			schedule();
-		tpqputs(TPQD_ALWAYS, "finished waiting in rdstatus()");
-	}
-
-	(void) notify_cmd(qcmd, 1);	/* send read status command */
-	/* ignore return code -- should always be ok, STAT may contain 
-	 * exception flag from previous exception which we are trying to clear.
-	 */
-
-	if (TP_DIAGS(current_tape_dev))
-		printk(TPQIC02_NAME ": reading status bytes: ");
-
-	for (q = stp; q < stp + size; q++) {
-		do
-			s = inb_p(QIC02_STAT_PORT);
-		while ((s & QIC02_STAT_MASK) == QIC02_STAT_MASK);	/* wait for ready or exception */
-
-		if ((s & QIC02_STAT_EXCEPTION) == 0) {	/* if exception */
-			tpqputs(TPQD_ALWAYS, "rdstatus: exception error");
-			ioctl_status.mt_erreg = 0;	/* dunno... */
-			return TE_NS;	/* error, shouldn't happen... */
-		}
-
-		*q = inb_p(QIC02_DATA_PORT);	/* read status byte */
-
-		if (TP_DIAGS(current_tape_dev))
-			printk("[%1d]=0x%x  ", q - stp,
-			       (unsigned) (*q) & 0xff);
-
-		outb_p(ctlbits | QIC02_CTL_REQUEST, QIC02_CTL_PORT);	/* set request */
-
-		while ((inb_p(QIC02_STAT_PORT) & QIC02_STAT_READY) == 0);	/* wait for not ready */
-
-		udelay(22);	/* delay >20 usec */
-
-		outb_p(ctlbits & ~QIC02_CTL_REQUEST, QIC02_CTL_PORT);	/* un-set request */
-
-	}
-
-	/* Specs say we should wait for READY here.
-	 * My drive doesn't seem to need it here yet, but others do?
-	 */
-	while (inb_p(QIC02_STAT_PORT) & QIC02_STAT_READY)
-		/*skip */ ;
-	/* wait for ready */
-
-	if (TP_DIAGS(current_tape_dev))
-		printk("\n");
-
-	return TE_OK;
-}				/* rdstatus */
-
-
-
-/* Get standard status (6 bytes).
- * The `.dec' and `.urc' fields are in MSB-first byte-order,
- * so they have to be swapped first.
- */
-static int get_status(volatile struct tpstatus *stp)
-{
-	int stat = rdstatus((char *) stp, TPSTATSIZE, QCMD_RD_STAT);
-#if defined(__i386__) || defined (__x86_64__)
-	byte_swap_w(&(stp->dec));
-	byte_swap_w(&(stp->urc));
-#else
-#warning Undefined architecture
-	/* should probably swap status bytes #definition */
-#endif
-	return stat;
-}				/* get_status */
-
-
-#if 0
-/* This fails for my Wangtek drive */
-/* get "Extended Status Register 3" (64 bytes)
- *
- * If the meaning of the returned bytes were known, the MT_TYPE
- * identifier could be used to decode them, since they are
- * "vendor unique". :-(
- */
-static int get_ext_status3(void)
-{
-	char vus[64];		/* vendor unique status */
-	int stat, i;
-
-	tpqputs(TPQD_ALWAYS, "Attempting to read Extended Status 3...");
-	stat = rdstatus(vus, sizeof(vus), QCMD_RD_STAT_X3);
-	if (stat != TE_OK)
-		return stat;
-
-	tpqputs(TPQD_ALWAYS, "Returned status bytes:");
-	for (i = 0; i < sizeof(vus); i++) {
-		if (i % 8 == 0)
-			printk("\n" TPQIC02_NAME ": %2d:");
-		printk(" %2x", vus[i] & 0xff);
-	}
-	printk("\n");
-
-	return TE_OK;
-}				/* get_ext_status3 */
-#endif
-
-
-/* Read drive status and set generic status too.
- * NOTE: Once we do a tp_sense(), read/write transfers are killed.
- */
-static int tp_sense(int ignore)
-{
-	unsigned err = 0, exnr = 0, gs = 0;
-	static void finish_rw(int cmd);
-
-	if (TPQDBG(SENSE_TEXT))
-		printk(TPQIC02_NAME ": tp_sense(ignore=0x%x) enter\n",
-		       ignore);
-
-	/* sense() is not allowed during a read or write cycle */
-	if (doing_write == YES)
-		tpqputs(TPQD_ALWAYS, "Warning: File Mark inserted because of sense() request");
-	/* The extra test is to avoid calling finish_rw during booting */
-	if ((doing_read != NO) || (doing_write != NO))
-		finish_rw(QCMD_RD_STAT);
-
-	if (get_status(&tperror) != TE_OK) {
-		tpqputs(TPQD_ALWAYS, "tp_sense: could not read tape drive status");
-		return TE_ERR;
-	}
-
-	err = tperror.exs;	/* get exception status bits */
-	if (err & (TP_ST0 | TP_ST1))
-		printk(TPQIC02_NAME ": tp_sense: status: %x, error count: %d, underruns: %d\n",
-		       tperror.exs, tperror.dec, tperror.urc);
-	else if ((tperror.dec != 0) || (tperror.urc != 0)
-		 || TPQDBG(SENSE_CNTS))
-		printk(TPQIC02_NAME
-		       ": tp_sense: no hard errors, soft error count: %d, underruns: %d\n",
-		       tperror.dec, tperror.urc);
-
-	/* Set generic status. HP-UX defines these, but some extra would 
-	 * be useful. Problem is to remain compatible. [Do we want to be
-	 * compatible??]
-	 */
-	if (err & TP_ST0) {
-		if (err & TP_CNI)	/* no cartridge */
-			gs |= GMT_DR_OPEN(-1);
-		if (status_dead == NO)
-			gs |= GMT_ONLINE(-1);	/* always online */
-		if (err & TP_USL)	/* not online */
-			gs &= ~GMT_ONLINE(-1);
-		if (err & TP_WRP)
-			gs |= GMT_WR_PROT(-1);
-		if (err & TP_EOM) {	/* end of media */
-			gs |= GMT_EOT(-1);	/* not sure this is correct for writes */
-			status_eom_detected = YES;
-			/* I don't know whether drive always reports EOF at or before EOM. */
-			status_eof_detected = YES;
-		}
-		/** if (err & TP_UDA) "Unrecoverable data error" **/
-		/** if (err & TP_BNL) "Bad block not located" **/
-		if (err & TP_FIL) {
-			gs |= GMT_EOF(-1);
-			status_eof_detected = YES;
-		}
-	}
-	if (err & TP_ST1) {
-		/** if (err & TP_ILL) "Illegal command" **/
-		/** if (err & TP_NDT) "No data detected" **/
-		/** if (err & TP_MBD) "Marginal block detected" **/
-		if (err & TP_BOM)
-			gs |= GMT_BOT(-1);	/* beginning of tape */
-	}
-	ioctl_status.mt_gstat = gs;
-	ioctl_status.mt_dsreg = tperror.exs;	/* "drive status" */
-	ioctl_status.mt_erreg = tperror.dec;	/* "sense key error" */
-
-	if (err & (TP_ST0 | TP_ST1)) {
-		/* My Wangtek occasionally reports `status' 1212 which should be ignored. */
-		exnr = decode_qic_exception_nr(err);
-		handle_qic_exception(exnr, err);	/* update driver state wrt drive status */
-		report_qic_exception(exnr);
-	}
-	err &= ~ignore;		/* mask unwanted errors -- not the correct way, use exception nrs?? */
-	if (((err & TP_ST0) && (err & REPORT_ERR0)) ||
-	    ((err & TP_ST1) && (err & REPORT_ERR1)))
-		return TE_ERR;
-	return TE_OK;
-}				/* tp_sense */
-
-
-
-/* Wait for a wind or rewind operation to finish or
- * to time-out. (May take very long).
- */
-static int wait_for_rewind(time_t timeout)
-{
-	int stat;
-
-	stat = inb(QIC02_STAT_PORT) & QIC02_STAT_MASK;
-	if (TPQDBG(REWIND))
-		printk(TPQIC02_NAME
-		       ": Waiting for (re-)wind to finish: stat=0x%x\n",
-		       stat);
-
-	stat = wait_for_ready(timeout);
-
-	if (stat != TE_OK) {
-		tpqputs(TPQD_ALWAYS, "(re-) winding failed\n");
-	}
-	return stat;
-}				/* wait_for_rewind */
-
-
-
-/* Perform a full QIC02 command, and wait for completion,
- * check status when done. Complain about exceptions.
- *
- * This function should return an OS error code when
- * something goes wrong, 0 otherwise.
- */
-static int ll_do_qic_cmd(int cmd, time_t timeout)
-{
-	int stat;
-
-	if (status_dead == YES) {
-		tpqputs(TPQD_ALWAYS, "Drive is dead. Do a `mt reset`.");
-		return -ENXIO;	/* User should do an MTRESET. */
-	}
-
-	stat = wait_for_ready(timeout);	/* wait for ready or exception */
-	if (stat == TE_EX) {
-		if (tp_sense(TP_WRP | TP_BOM | TP_EOM | TP_FIL) != TE_OK)
-			return -EIO;
-		/* else nothing to worry about, I hope */
-		stat = TE_OK;
-	}
-	if (stat != TE_OK) {
-		printk(TPQIC02_NAME ": ll_do_qic_cmd(%x, %ld) failed\n",
-		       cmd, (long) timeout);
-		return -EIO;
-	}
-#if OBSOLETE
-	/* wait for ready since it may not be active immediately after reading status */
-	while ((inb_p(QIC02_STAT_PORT) & QIC02_STAT_READY) != 0);
-#endif
-
-	stat = send_qic02_cmd(cmd, timeout, 0);	/* (checks for exceptions) */
-
-	if (cmd == QCMD_RD_FM) {
-		status_eof_detected = NO;
-		ioctl_status.mt_fileno++;
-		/* Should update block count as well, but can't.
-		 * Can do a `read address' for some drives, when MTNOP is done.
-		 */
-	} else if (cmd == QCMD_WRT_FM) {
-		status_eof_detected = NO;
-		ioctl_status.mt_fileno++;
-	} else if ((cmd == QCMD_REWIND) || (cmd == QCMD_ERASE)
-		   || (cmd == QCMD_RETEN)) {
-		status_eof_detected = NO;
-		status_eom_detected = NO;
-		status_eot_detected = NO;
-		need_rewind = NO;
-		ioctl_status.mt_fileno = ioctl_status.mt_blkno = 0;
-		extra_blocks_left = BLOCKS_BEYOND_EW;
-		return_write_eof = NO;
-		return_read_eof = NO;
-		reported_read_eof = NO;
-		reported_write_eof = NO;
-	}
-	/* sense() will set eof/eom as required */
-	if (stat == TE_EX) {
-		if (tp_sense(TP_WRP | TP_BOM | TP_EOM | TP_FIL) != TE_OK) {
-			printk(TPQIC02_NAME
-			       ": Exception persist in ll_do_qic_cmd[1](%x, %ld)",
-			       cmd, (long) timeout);
-			status_dead = YES;
-			return -ENXIO;
-			/* if rdstatus fails too, we're in trouble */
-		}
-	} else if (stat != TE_OK) {
-		printk(TPQIC02_NAME
-		       ": ll_do_qic_cmd: send_qic02_cmd failed, stat = 0x%x\n",
-		       stat);
-		return -EIO;	/*** -EIO is probably not always appropriate */
-	}
-
-
-	if (timeout == TIM_R)
-		stat = wait_for_rewind(timeout);
-	else
-		stat = wait_for_ready(timeout);
-
-	if (stat == TE_EX) {
-		if (tp_sense((cmd == QCMD_SEEK_EOD ?		/*****************************/
-			      TP_EOR | TP_NDT | TP_UDA | TP_BNL | TP_WRP |
-			      TP_BOM | TP_EOM | TP_FIL : TP_WRP | TP_BOM |
-			      TP_EOM | TP_FIL)) != TE_OK) {
-			printk(TPQIC02_NAME
-			       ": Exception persist in ll_do_qic_cmd[2](%x, %ld)\n",
-			       cmd, (long) timeout);
-			if (cmd != QCMD_RD_FM)
-				status_dead = YES;
-			return -ENXIO;
-			/* if rdstatus fails too, we're in trouble */
-		}
-	} else if (stat != TE_OK) {
-		printk(TPQIC02_NAME
-		       ": ll_do_qic_cmd %x: wait failed, stat == 0x%x\n",
-		       cmd, stat);
-		return -EIO;
-	}
-	return 0;
-}				/* ll_do_qic_cmd */
-
-
-/* 
- * Problem: What to do when the user cancels a read/write operation
- * in-progress?
- *
- * "Deactivating ONLINE during a READ also causes the"
- * "tape to be rewound to BOT." Ditto for WRITEs, except
- * a FM is written first. "The host may alternatively terminate
- * the READ/WRITE command by issuing a RFM/WFM command."
- *
- * For READs:
- * Neither option will leave the tape positioned where it was.
- * Another (better?) solution is to terminate the READ by two
- * subsequent sense() operations, the first to stop the current
- * READ cycle, the second to clear the `Illegal command' exception,
- * because the QIC-02 specs didn't anticipate this. This is
- * delayed until actually needed, so a tar listing can be aborted
- * by the user and continued later.
- * If anybody has a better solution, let me know! [Also, let me
- * know if your drive (mine is a Wangtek5150EQ) does not accept
- * this sequence for canceling the read-cycle.]
- *
- * For WRITEs it's simple: Just do a WRITE_FM, leaving the tape
- * positioned after the FM.
- */
-
-static void terminate_read(int cmd)
-{
-	if (doing_read == YES) {
-		doing_read = NO;
-		if (cmd != QCMD_RD_FM) {
-			/* if the command is a RFM, there is no need to do this
-			 * because a RFM will legally terminate the read-cycle.
-			 */
-			tpqputs(TPQD_ALWAYS, "terminating pending read-cycle");
-
-			/* I'm not too sure about this part  -- hhb */
-			if (QIC02_TAPE_IFC == MOUNTAIN) {
-				/* Mountain reference says can terminate by de-asserting online */
-				ctlbits &= ~MTN_QIC02_CTL_ONLINE;
-			}
-
-			if (tp_sense(TP_FIL | TP_EOM | TP_WRP) != TE_OK) {
-				tpqputs(TPQD_ALWAYS,
-					"finish_rw[read1]: ignore the 2 lines above");
-				if (is_exception()) {
-					if (tp_sense
-					    (TP_ILL | TP_FIL | TP_EOM |
-					     TP_WRP) != TE_OK)
-						tpqputs(TPQD_ALWAYS,"finish_rw[read2]: read cycle error");
-				}
-			}
-		}
-	}
-}				/* terminate_read */
-
-
-static void terminate_write(int cmd)
-{
-	int stat;
-
-	if (doing_write == YES) {
-		doing_write = NO;
-		/* Finish writing by appending a FileMark at the end. */
-		if (cmd != QCMD_WRT_FM) {
-			/* finish off write cycle */
-			stat = ll_do_qic_cmd(QCMD_WRT_FM, TIM_M);
-			if (stat != TE_OK)
-				tpqputs(TPQD_ALWAYS,
-					"Couldn't finish write cycle properly");
-			(void) tp_sense(0);
-		}
-		/* If there is an EOF token waiting to be returned to
-		 * the (writing) application, discard it now.
-		 * We could be at EOT, so don't reset return_write_eof.
-		 */
-		reported_write_eof = YES;
-	}
-}				/* terminate_write */
-
-
-/* terminate read or write cycle because of command `cmd' */
-static void finish_rw(int cmd)
-{
-	if (wait_for_ready(TIM_S) != TE_OK) {
-		tpqputs(TPQD_ALWAYS,
-			"error: drive not ready in finish_rw() !");
-		return;
-	}
-	terminate_read(cmd);
-	terminate_write(cmd);
-}				/* finish_rw */
-
-
-/* Perform a QIC command through ll_do_qic_cmd().
- * If necessary, rewind the tape first.
- * Return an OS error code if something goes wrong, 0 if all is well.
- */
-static int do_qic_cmd(int cmd, time_t timeout)
-{
-	int stat;
-
-
-	finish_rw(cmd);
-
-	if (need_rewind) {
-		tpqputs(TPQD_REWIND, "Rewinding tape...");
-		stat = ll_do_qic_cmd(QCMD_REWIND, TIM_R);
-		if (stat != 0) {
-			printk(TPQIC02_NAME ": rewind failed in do_qic_cmd(). stat=0x%2x", stat);
-			return stat;
-		}
-		need_rewind = NO;
-		if (cmd == QCMD_REWIND)	/* don't wind beyond BOT ;-) */
-			return 0;
-	}
-
-	return ll_do_qic_cmd(cmd, timeout);
-}				/* do_qic_cmd */
-
-
-/* Not all ioctls are supported for all drives. Some rely on
- * optional QIC-02 commands. Check tpqic02.h for configuration.
- * Some of these commands may require ONLINE to be active.
- */
-static int do_ioctl_cmd(int cmd)
-{
-	int stat;
-
-	/* It is not permitted to read or wind the tape after bytes have
-	 * been written. It is not permitted to write the tape while in
-	 * read mode.
-	 * We try to be kind and allow reading again after writing a FM...
-	 */
-
-	switch (cmd) {
-	case MTRESET:
-		/* reset verbose */
-		return (tape_reset(1) == TE_OK) ? 0 : -EIO;
-
-	case MTFSF:
-		tpqputs(TPQD_IOCTLS, "MTFSF forward searching filemark");
-		if ((mode_access == WRITE) && status_bytes_wr)
-			return -EACCES;
-		return do_qic_cmd(QCMD_RD_FM, TIM_F);
-
-	case MTBSF:
-		if (TP_HAVE_BSF) {
-			tpqputs(TPQD_IOCTLS,
-				"MTBSF backward searching filemark -- optional command");
-			if ((mode_access == WRITE) && status_bytes_wr)
-				return -EACCES;
-			stat = do_qic_cmd(QCMD_RD_FM_BCK, TIM_F);
-		} else {
-			stat = -ENXIO;
-		}
-		status_eom_detected = status_eof_detected = NO;
-		return stat;
-
-	case MTFSR:
-		if (TP_HAVE_FSR) {	/* This is an optional QIC-02 command */
-			tpqputs(TPQD_IOCTLS, "MTFSR forward space record");
-			if ((mode_access == WRITE) && status_bytes_wr)
-				return -EACCES;
-			stat = do_qic_cmd(QCMD_SPACE_FWD, TIM_F);
-		} else {
-				/**** fake it by doing a read data block command? ******/
-			tpqputs(TPQD_IOCTLS, "MTFSR not supported");
-			stat = -ENXIO;
-		}
-		return stat;
-
-	case MTBSR:
-		if (TP_HAVE_BSR) {	/* This is an optional QIC-02 command */
-			/* we need this for appending files with GNU tar!! */
-			tpqputs(TPQD_IOCTLS, "MTFSR backward space record");
-			if ((mode_access == WRITE) && status_bytes_wr)
-				return -EACCES;
-			stat = do_qic_cmd(QCMD_SPACE_BCK, TIM_F);
-		} else {
-			tpqputs(TPQD_IOCTLS, "MTBSR not supported");
-			stat = -ENXIO;
-		}
-		status_eom_detected = status_eof_detected = NO;
-		return stat;
-
-	case MTWEOF:
-		tpqputs(TPQD_IOCTLS, "MTWEOF write eof mark");
-		/* Plain GNU mt(1) 2.2 uses read-only mode for writing FM. :-( */
-		if (mode_access == READ)
-			return -EACCES;
-
-		/* allow tape movement after writing FM */
-		status_bytes_rd = status_bytes_wr;	/* Kludge-O-Matic */
-		status_bytes_wr = NO;
-		return do_qic_cmd(QCMD_WRT_FM, TIM_M);
-		/* not sure what to do with status_bytes when WFM should fail */
-
-	case MTREW:
-		tpqputs(TPQD_IOCTLS, "MTREW rewinding tape");
-		if ((mode_access == WRITE) && status_bytes_wr)
-			return -EACCES;
-		status_eom_detected = status_eof_detected = NO;
-		return do_qic_cmd(QCMD_REWIND, TIM_R);
-
-	case MTOFFL:
-		tpqputs(TPQD_IOCTLS, "MTOFFL rewinding & going offline");
-		/* Doing a drive select will clear (unlock) the current drive.
-		 * But that requires support for multiple drives and locking.
-		 */
-		if ((mode_access == WRITE) && status_bytes_wr)
-			return -EACCES;
-		status_eom_detected = status_eof_detected = NO;
-			/**** do rewind depending on minor bits??? ***/
-		stat = do_qic_cmd(QCMD_REWIND, TIM_R);
-		return stat;
-
-	case MTNOP:
-		tpqputs(TPQD_IOCTLS, "MTNOP setting status only");
-			/********** should do `read position' for drives that support it **********/
-		return (tp_sense(-1) == TE_OK) ? 0 : -EIO;	/**** check return codes ****/
-
-	case MTRETEN:
-		tpqputs(TPQD_IOCTLS, "MTRETEN retension tape");
-		if ((mode_access == WRITE) && status_bytes_wr)
-			return -EACCES;
-		status_eom_detected = status_eof_detected = NO;
-		return do_qic_cmd(QCMD_RETEN, TIM_R);
-
-	case MTBSFM:
-		/* Think think is like MTBSF, except that
-		 * we shouldn't skip the FM. Tricky.
-		 * Maybe use RD_FM_BCK, then do a SPACE_FWD?
-		 */
-		tpqputs(TPQD_IOCTLS, "MTBSFM not supported");
-		if ((mode_access == WRITE) && status_bytes_wr)
-			return -EACCES;
-		return -ENXIO;
-
-	case MTFSFM:
-		/* I think this is like MTFSF, except that
-		 * we shouldn't skip the FM. Tricky.
-		 * Maybe use QCMD_RD_DATA until we get a TP_FIL exception?
-		 * But then the FM will have been skipped...
-		 * Maybe use RD_FM, then RD_FM_BCK, but not all
-		 * drives will support that!
-		 */
-		tpqputs(TPQD_IOCTLS, "MTFSFM not supported");
-		if ((mode_access == WRITE) && status_bytes_wr)
-			return -EACCES;
-		return -ENXIO;
-
-	case MTEOM:
-		/* This should leave the tape ready for appending
-		 * another file to the end, such that it would append
-		 * after the last FM on tape.
-		 */
-		tpqputs(TPQD_IOCTLS, "MTEOM search for End Of recorded Media");
-		if ((mode_access == WRITE) && status_bytes_wr)
-			return -EACCES;
-		if (TP_HAVE_EOD) {
-			/* Use faster seeking when possible.
-			 * This requires the absence of data beyond the EOM.
-			 * It seems that my drive does not always perform the
-			 * SEEK_EOD correctly, unless it is preceded by a
-			 * rewind command.
-			 */
-# if 0
-			status_eom_detected = status_eof_detected = NO;
-# endif
-			stat = do_qic_cmd(QCMD_REWIND, TIM_R);
-			if (stat)
-				return stat;
-			stat = do_qic_cmd(QCMD_SEEK_EOD, TIM_F);
-			/* After a successful seek, TP_EOR should be returned */
-		} else {
-			/* else just seek until the drive returns exception "No Data" */
-			stat = 0;
-			while ((stat == 0) && (!status_eom_detected)) {
-				stat = do_qic_cmd(QCMD_RD_FM, TIM_F);	      /***** should use MTFSFM here???? ******/
-			}
-			if (tperror.exs & TP_NDT)
-				return 0;
-		}
-		return stat;
-
-	case MTERASE:
-		tpqputs(TPQD_IOCTLS, "MTERASE -- ERASE TAPE !");
-		if ((tperror.exs & TP_ST0) && (tperror.exs & TP_WRP)) {
-			tpqputs(TPQD_ALWAYS, "Cartridge is write-protected.");
-			return -EACCES;
-		} else {
-			time_t t = jiffies;
-
-			/* Plain GNU mt(1) 2.2 erases a tape in O_RDONLY. :-( */
-			if (mode_access == READ)
-				return -EACCES;
-
-			/* FIXME */
-			/* give user a few seconds to pull out tape */
-			while (jiffies - t < 4 * HZ)
-				schedule();
-		}
-
-		/* don't bother writing filemark first */
-		status_eom_detected = status_eof_detected = NO;
-		return do_qic_cmd(QCMD_ERASE, TIM_R);
-
-	case MTRAS1:
-		if (TP_HAVE_RAS1) {
-			tpqputs(TPQD_IOCTLS, "MTRAS1: non-destructive self test");
-			stat = do_qic_cmd(QCMD_SELF_TST1, TIM_R);
-			if (stat != 0) {
-				tpqputs(TPQD_ALWAYS, "RAS1 failed");
-				return stat;
-			}
-			return (tp_sense(0) == TE_OK) ? 0 : -EIO;	/* get_ext_status3(); */
-		}
-		tpqputs(TPQD_IOCTLS, "RAS1 not supported");
-		return -ENXIO;
-
-	case MTRAS2:
-		if (TP_HAVE_RAS2) {
-			tpqputs(TPQD_IOCTLS, "MTRAS2: destructive self test");
-			stat = do_qic_cmd(QCMD_SELF_TST2, TIM_R);
-			if (stat != 0) {
-				tpqputs(TPQD_ALWAYS, "RAS2 failed");
-				return stat;
-			}
-			return (tp_sense(0) == TE_OK) ? 0 : -EIO;	/* get_ext_status3(); */
-		}
-		tpqputs(TPQD_IOCTLS, "RAS2 not supported");
-		return -ENXIO;
-
-	case MTSEEK:
-		if (TP_HAVE_SEEK && (QIC02_TAPE_IFC == ARCHIVE)) {
-			tpqputs(TPQD_IOCTLS, "MTSEEK seeking block");
-			if ((mode_access == WRITE) && status_bytes_wr)
-				return -EACCES;
-			/* NOTE: address (24 bits) is in seek_addr_buf[] */
-			return do_qic_cmd(AR_QCMDV_SEEK_BLK, TIM_F);
-		} else
-			return -ENOTTY;
-
-	default:
-		return -ENOTTY;
-	}
-}				/* do_ioctl_cmd */
-
-
-/* dma_transfer(): This routine is called for every 512 bytes to be read
- * from/written to the tape controller. Speed is important here!
- * (There must be enough time left for the hd controller!)
- * When other devices use DMA they must ensure they use un-interruptible
- * double byte accesses to the DMA controller. Floppy.c is ok.
- * Must have interrupts disabled when this function is invoked,
- * otherwise, the double-byte transfers to the DMA controller will not
- * be atomic. That could lead to nasty problems when they are interrupted
- * by other DMA interrupt-routines.
- *
- * This routine merely does the least possible to keep
- * the transfers going:
- *	- set the DMA count register for the next 512 bytes
- *	- adjust the DMA address and page registers
- *	- adjust the timeout
- *	- tell the tape controller to start transferring
- * We assume the dma address and mode are, and remain, valid.
- */
-static inline void dma_transfer(void)
-{
-	unsigned long flags;
-
-	if (QIC02_TAPE_IFC == WANGTEK)	/* or EVEREX */
-		outb_p(WT_CTL_ONLINE, QIC02_CTL_PORT);	/* back to normal */
-	else if (QIC02_TAPE_IFC == ARCHIVE)
-		outb_p(0, AR_RESET_DMA_PORT);
-	else			/* QIC02_TAPE_IFC == MOUNTAIN */
-		outb_p(ctlbits, QIC02_CTL_PORT);
-
-
-	flags = claim_dma_lock();
-	clear_dma_ff(QIC02_TAPE_DMA);
-	set_dma_mode(QIC02_TAPE_DMA, dma_mode);
-	set_dma_addr(QIC02_TAPE_DMA,
-		     virt_to_bus(buffaddr) + dma_bytes_done);
-	set_dma_count(QIC02_TAPE_DMA, TAPE_BLKSIZE);
-
-	/* start tape DMA controller */
-	if (QIC02_TAPE_IFC == WANGTEK)	/* or EVEREX */
-		outb_p(WT_CTL_DMA | WT_CTL_ONLINE, QIC02_CTL_PORT);	/* trigger DMA transfer */
-
-	else if (QIC02_TAPE_IFC == ARCHIVE) {
-		outb_p(AR_CTL_IEN | AR_CTL_DNIEN, QIC02_CTL_PORT);	/* enable interrupts again */
-		outb_p(0, AR_START_DMA_PORT);	/* start DMA transfer */
-		/* In dma_end() AR_RESET_DMA_PORT is written too. */
-
-	} else {		/* QIC02_TAPE_IFC == MOUNTAIN */
-
-		inb(MTN_R_DESELECT_DMA_PORT);
-		outb_p(ctlbits | (MTN_CTL_EXC_IEN | MTN_CTL_DNIEN),
-		       QIC02_CTL_PORT);
-		outb_p(0, MTN_W_SELECT_DMA_PORT);	/* start DMA transfer */
-		if (dma_mode == DMA_MODE_WRITE)
-			outb_p(0, MTN_W_DMA_WRITE_PORT);	/* start DMA transfer */
-	}
-
-	/* start computer DMA controller */
-	enable_dma(QIC02_TAPE_DMA);
-
-	release_dma_lock(flags);
-
-	/* block transfer should start now, jumping to the 
-	 * interrupt routine when done or an exception was detected.
-	 */
-}				/* dma_transfer */
-
-
-/* start_dma() sets a DMA transfer up between the tape controller and
- * the kernel qic02_tape_buf buffer.
- * Normally bytes_todo==dma_bytes_done at the end of a DMA transfer. If not,
- * a filemark was read, or an attempt to write beyond the End Of Tape 
- * was made. [Or some other bad thing happened.]
- * Must do a sense() before returning error.
- */
-static int start_dma(short mode, unsigned long bytes_todo)
-/* assume 'bytes_todo'>0 */
-{
-	int stat;
-	unsigned long flags;
-
-	tpqputs(TPQD_DEBUG, "start_dma() enter");
-	TPQDEB( {printk(TPQIC02_NAME ": doing_read==%d, doing_write==%d\n",
-		      doing_read, doing_write);})
-
-	    dma_bytes_done = 0;
-	dma_bytes_todo = bytes_todo;
-	status_error = NO;
-	/* dma_mode!=0 indicates that the dma controller is in use */
-	dma_mode = (mode == WRITE) ? DMA_MODE_WRITE : DMA_MODE_READ;
-
-	/* Only give READ/WRITE DATA command to tape drive if we haven't
-	 * done that already. Otherwise the drive will rewind to the beginning
-	 * of the current file on tape. Any QIC command given other than
-	 * R/W FM will break the read/write transfer cycle.
-	 * do_qic_cmd() will terminate doing_{read,write}
-	 */
-	if ((doing_read == NO) && (doing_write == NO)) {
-		/* First, we have to clear the status -- maybe remove TP_FIL???
-		 */
-
-#if 0
-		/* Next dummy get status is to make sure CNI is valid,
-		   since we're only just starting a read/write it doesn't
-		   matter some exceptions are cleared by reading the status;
-		   we're only interested in CNI and WRP. -Eddy */
-		get_status(&tperror);
-#else
-		/* TP_CNI should now be handled in open(). -Hennus */
-#endif
-
-		stat =
-		    tp_sense(((mode ==
-			       WRITE) ? 0 : TP_WRP) | TP_BOM | TP_FIL);
-		if (stat != TE_OK)
-			return stat;
-
-#if OBSOLETE
-		/************* not needed iff rd_status() would wait for ready!!!!!! **********/
-		if (wait_for_ready(TIM_S) != TE_OK) {	/*** not sure this is needed ***/
-			tpqputs(TPQD_ALWAYS,
-				"wait_for_ready failed in start_dma");
-			return -EIO;
-		}
-#endif
-
-		if (QIC02_TAPE_IFC == MOUNTAIN) {
-			/* Set control bits to select ONLINE during command */
-			ctlbits |= MTN_QIC02_CTL_ONLINE;
-		}
-
-		/* Tell the controller the data direction */
-
-		/* r/w, timeout medium, check exceptions, sets status_cmd_pending. */
-		stat = send_qic02_cmd((mode == WRITE) 
-					? QCMD_WRT_DATA : QCMD_RD_DATA, TIM_M, 0);
-		if (stat != TE_OK) {
-			printk(TPQIC02_NAME ": start_dma: init %s failed\n",
-			       (mode == WRITE) ? "write" : "read");
-			(void) tp_sense(0);
-			return stat;
-		}
-
-		/* Do this last, because sense() will clear the doing_{read,write}
-		 * flags, causing trouble next time around.
-		 */
-		if (wait_for_ready(TIM_M) != TE_OK)
-			return -EIO;
-		switch (mode) {
-		case READ:
-			doing_read = YES;
-			break;
-		case WRITE:
-			doing_write = YES;
-			break;
-		default:
-			printk(TPQIC02_NAME
-			       ": requested unknown mode %d\n", mode);
-			panic(TPQIC02_NAME
-			      ": invalid mode in start_dma()");
-		}
-
-	} else if (is_exception()) {
-		/* This is for Archive drives, to handle reads with 0 bytes
-		 * left for the last read request.
-		 *
-		 * ******** this also affects EOF/EOT handling! ************
-		 */
-		tpqputs(TPQD_ALWAYS,
-			"detected exception in start_dma() while transfer in progress");
-		status_error = YES;
-		return TE_END;
-	}
-
-
-	status_expect_int = YES;
-
-	/* This assumes tape is already positioned, but these
-	 * semi-'intelligent' drives are unpredictable...
-	 */
-	TIMERON(TIM_M * 2);
-
-	/* initiate first data block read from/write to the tape controller */
-
-	save_flags(flags);
-	cli();
-	dma_transfer();
-	restore_flags(flags);
-
-	TPQPUTS("start_dma() end");
-	return TE_OK;
-}				/* start_dma */
-
-
-/* This cleans up after the dma transfer has completed
- * (or failed). If an exception occurred, a sense()
- * must be done. If the exception was caused by a FM,
- * sense() will set `status_eof_detected' and
- * `status_eom_detected', as required.
- */
-static void end_dma(unsigned long *bytes_done)
-{
-	int stat = TE_OK;
-	unsigned long flags;
-
-	TIMEROFF;
-
-	TPQPUTS("end_dma() enter");
-
-	flags = claim_dma_lock();
-
-	disable_dma(QIC02_TAPE_DMA);
-	clear_dma_ff(QIC02_TAPE_DMA);
-
-	release_dma_lock(flags);
-
-	if (QIC02_TAPE_IFC == WANGTEK)	/* or EVEREX */
-		outb_p(WT_CTL_ONLINE, QIC02_CTL_PORT);	/* back to normal */
-	else if (QIC02_TAPE_IFC == ARCHIVE)
-		outb_p(0, AR_RESET_DMA_PORT);
-	else {			/* QIC02_TAPE_IFC == MOUNTAIN */
-
-		/* Clear control bits, de-select ONLINE during tp_sense */
-		ctlbits &= ~MTN_QIC02_CTL_ONLINE;
-	}
-
-	stat = wait_for_ready(TIM_M);
-	if (status_error || (stat != TE_OK)) {
-		tpqputs(TPQD_DMAX, "DMA transfer exception");
-		stat = tp_sense((dma_mode == READ) ? TP_WRP : 0);
-		/* no return here -- got to clean up first! */
-	} else {		/* if (QIC02_TAPE_IFC == MOUNTAIN) */
-
-		outb_p(ctlbits, QIC02_CTL_PORT);
-	}
-
-	if (QIC02_TAPE_IFC == MOUNTAIN)
-		inb(MTN_R_DESELECT_DMA_PORT);
-
-	/* take the tape controller offline */
-
-	/* finish off DMA stuff */
-
-
-	dma_mode = 0;
-	/* Note: The drive is left on-line, ready for the next
-	 * data transfer.
-	 * If the next command to the drive does not continue
-	 * the pending cycle, it must do 2 sense()s first.
-	 */
-
-	*bytes_done = dma_bytes_done;
-	status_expect_int = NO;
-	ioctl_status.mt_blkno += (dma_bytes_done / TAPE_BLKSIZE);
-
-	TPQPUTS("end_dma() exit");
-	/*** could return stat here ***/
-}				/* end_dma */
-
-/*********** Below are the (public) OS-interface procedures ***********/
-
-
-/* qic02_tape_times_out() is called when a DMA transfer doesn't complete
- * quickly enough. Usually this means there is something seriously wrong
- * with the hardware/software, but it could just be that the controller
- * has decided to do a long rewind, just when I didn't expect it.
- * Just try again.
- */
-static void qic02_tape_times_out(unsigned long dummy)
-{
-	printk("time-out in %s driver\n", TPQIC02_NAME);
-	if ((status_cmd_pending > 0) || dma_mode) {
-		/* takes tooo long, shut it down */
-		status_dead = YES;
-		status_cmd_pending = 0;
-		status_timer_on = NO;
-		status_expect_int = NO;
-		status_error = YES;
-		if (dma_mode) {
-			dma_mode = 0;	/* signal end to read/write routine */
-			wake_up(&qic02_tape_transfer);
-		}
-	}
-}				/* qic02_tape_times_out */
-
-/*
- * Interrupt handling:
- *
- * 1) Interrupt is generated iff at the end of 
- *    a 512-DMA-block transfer.
- * 2) EXCEPTION is not raised unless something 
- *    is wrong or EOT/FM is detected.
- * 3) FM EXCEPTION is set *after* the last byte has
- *    been transferred by DMA. By the time the interrupt
- *    is handled, the EXCEPTION may already be set.
- *
- * So,
- * 1) On EXCEPTION, assume data has been transferred, so
- *    continue as usual, but set a flag to indicate the
- *    exception was detected.
- *    Do a sense status when the flag is found set.
- * 2) Do not attempt to continue a transfer after an exception.
- *    [??? What about marginal blocks???????]
- */
-
-
-/* qic02_tape_interrupt() is called when the tape controller completes 
- * a DMA transfer.
- * We are not allowed to sleep here! 
- *
- * Check if the transfer was successful, check if we need to transfer
- * more. If the buffer contains enough data/is empty enough, signal the
- * read/write() thread to copy to/from user space.
- * When we are finished, set flags to indicate end, disable timer.
- * NOTE: This *must* be fast! 
- */
-static void qic02_tape_interrupt(int irq, void *dev_id,
-				 struct pt_regs *regs)
-{
-	int stat, r, i;
-	unsigned long flags;
-
-	TIMEROFF;
-
-	if (status_expect_int) {
-#ifdef WANT_EXTRA_FULL_DEBUGGING
-		if (TP_DIAGS(current_tape_dev))
-			printk("@");
-#endif
-		stat = inb(QIC02_STAT_PORT);	/* Knock, knock */
-		if (QIC02_TAPE_IFC == ARCHIVE) {	/* "Who's there?" */
-			if (((stat & (AR_STAT_DMADONE)) == 0) &&
-			    ((stat & (QIC02_STAT_EXCEPTION)) != 0)) {
-				TIMERCONT;
-				return;	/* "Linux with IRQ sharing" */
-			}
-		}
-
-		if ((stat & QIC02_STAT_EXCEPTION) == 0) {	/* exception occurred */
-			/* Possible causes for an exception during a transfer:
-			 *      - during a write-cycle: end of tape (EW) hole detected.
-			 *      - during a read-cycle: filemark or EOD detected.
-			 *      - something went wrong
-			 * So don't continue with the next block.
-			 */
-			tpqputs(TPQD_ALWAYS,
-				"isr: exception on tape controller");
-			printk("      status %02x\n", stat);
-			status_error = TE_EX;
-
-			dma_bytes_done += TAPE_BLKSIZE;
-
-			dma_mode = 0;	/* wake up rw() */
-			status_expect_int = NO;
-			wake_up(&qic02_tape_transfer);
-			return;
-		}
-		/* return if tape controller not ready, or
-		 * if dma channel hasn't finished last byte yet.
-		 */
-		r = 0;
-
-		/* Skip next ready check for Archive controller because
-		 * it may be busy reading ahead. Weird. --hhb
-		 */
-		if (QIC02_TAPE_IFC == WANGTEK)	/* I think this is a drive-dependency, not IFC -- hhb */
-			if (stat & QIC02_STAT_READY) {	/* not ready */
-				tpqputs(TPQD_ALWAYS,
-					"isr: ? Tape controller not ready");
-				r = 1;
-			}
-
-		flags = claim_dma_lock();
-
-		if ((i = get_dma_residue(QIC02_TAPE_DMA)) != 0) {
-			printk(TPQIC02_NAME ": dma_residue == %x !!!\n",
-			       i);
-			r = 1;	/* big trouble, but can't do much about it... */
-		}
-
-		release_dma_lock(flags);
-
-		if (r)
-			return;
-
-		/* finish DMA cycle */
-
-		/* no errors detected, continue */
-		dma_bytes_done += TAPE_BLKSIZE;
-		if (dma_bytes_done >= dma_bytes_todo) {
-			/* finished! Wakeup rw() */
-			dma_mode = 0;
-			status_expect_int = NO;
-			TPQPUTS("isr: dma_bytes_done");
-			wake_up(&qic02_tape_transfer);
-		} else {
-			/* start next transfer, account for track-switching time */
-			mod_timer(&tp_timer, jiffies + 6 * HZ);
-			dma_transfer();
-		}
-	} else {
-		printk(TPQIC02_NAME ": Unexpected interrupt, stat == %x\n",
-		       inb(QIC02_STAT_PORT));
-	}
-}				/* qic02_tape_interrupt */
-
-
-/* read/write routines:
- * This code copies between a kernel buffer and a user buffer. The 
- * actual data transfer is done using DMA and interrupts. Time-outs
- * are also used.
- *
- * When a filemark is read, we return '0 bytes read' and continue with the
- * next file after that.
- * When EOM is read, we return '0 bytes read' twice.
- * When the EOT marker is detected on writes, '0 bytes read' should be
- * returned twice. If user program does a MTNOP after that, 2 additional
- * blocks may be written.	------- FIXME: Implement this correctly  *************************************************
- *
- * Only read/writes in multiples of 512 bytes are accepted.
- * When no bytes are available, we sleep() until they are. The controller will
- * generate an interrupt, and we (should) get a wake_up() call.
- *
- * Simple buffering is used. User program should ensure that a large enough
- * buffer is used. Usually the drive does some buffering as well (something
- * like 4k or so).
- *
- * Scott S. Bertilson suggested to continue filling the user buffer, rather
- * than waste time on a context switch, when the kernel buffer fills up.
- */
-
-/*
- * Problem: tar(1) doesn't always read the entire file. Sometimes the entire file
- * has been read, but the EOF token is never returned to tar(1), simply because
- * tar(1) knows it has already read all of the data it needs. So we must use
- * open/release to reset the `reported_read_eof' flag. If we don't, the next read
- * request would return the EOF flag for the previous file.
- */
-
-static ssize_t qic02_tape_read(struct file *filp, char *buf, size_t count,
-			       loff_t * ppos)
-{
-	kdev_t dev = filp->f_dentry->d_inode->i_rdev;
-	unsigned short flags = filp->f_flags;
-	unsigned long bytes_todo, bytes_done, total_bytes_done = 0;
-	int stat;
-
-	if (status_zombie == YES) {
-		tpqputs(TPQD_ALWAYS, "configs not set");
-		return -ENXIO;
-	}
-
-	if (TP_DIAGS(current_tape_dev))
-		/* can't print a ``long long'' (for filp->f_pos), so chop it */
-		printk(TPQIC02_NAME
-		       ": request READ, minor=%x, buf=%p, count=%lx"
-		       ", pos=%lx, flags=%x\n", MINOR(dev), buf,
-		       (long) count, (unsigned long) filp->f_pos, flags);
-
-	if (count % TAPE_BLKSIZE) {	/* Only allow mod 512 bytes at a time. */
-		tpqputs(TPQD_BLKSZ, "Wrong block size");
-		return -EINVAL;
-	}
-
-	/* Just assume everything is ok. Controller will scream if not. */
-
-	if (status_bytes_wr) {	/* Once written, no more reads, 'till after WFM. */
-		return -EACCES;
-	}
-
-	/* This is rather ugly because it has to implement a finite state
-	 * machine in order to handle the EOF situations properly.
-	 */
-	while ((signed) count >= 0) {
-		bytes_done = 0;
-		/* see how much fits in the kernel buffer */
-		bytes_todo = TPQBUF_SIZE;
-		if (bytes_todo > count) {
-			bytes_todo = count;
-		}
-
-		/* Must ensure that user program sees exactly one EOF token (==0) */
-		if (return_read_eof == YES) {
-			if (TPQDBG(DEBUG)) {
-				printk
-				    ("read: return_read_eof==%d, reported_read_eof==%d, total_bytes_done==%lu\n",
-				     return_read_eof, reported_read_eof,
-				     total_bytes_done);
-			}
-
-			if (reported_read_eof == NO) {
-				/* have not yet returned EOF to user program */
-				if (total_bytes_done > 0) {
-					return total_bytes_done;	/* next time return EOF */
-				} else {
-					reported_read_eof = YES;	/* move on next time */
-					return 0;	/* return EOF */
-				}
-			} else {
-				/* Application program has already received EOF
-				 * (above), now continue with next file on tape,
-				 * if possible.
-				 * When the FM is reached, EXCEPTION is set,
-				 * causing a sense(). Subsequent read/writes will
-				 * continue after the FM.
-				 */
-		/*********** ?????????? this should check for (EOD|NDT), not EOM, 'cause we can read past EW: ************/
-				if (status_eom_detected) {
-					/* If EOM, nothing left to read, so keep returning EOFs.
-					 *** should probably set some flag to avoid clearing
-					 *** status_eom_detected through ioctls or something
-					 */
-					return 0;
-				} else {
-					/* just eof, there may be more files ahead... */
-					return_read_eof = NO;
-					reported_read_eof = NO;
-					status_eof_detected = NO;	/* reset this too */
-					/*fall through */
-				}
-			}
-		}
-
-	/*****************************/
-		if (bytes_todo == 0) {
-			return total_bytes_done;
-		}
-
-		if (bytes_todo > 0) {
-			/* start reading data */
-			if (is_exception()) {
-/****************************************/
-				tpqputs(TPQD_DMAX,
-					"is_exception() before start_dma()!");
-			}
-
-/******************************************************************
- ***** if start_dma() fails because the head is positioned 0 bytes
- ***** before the FM, (causing EXCEPTION to be set) return_read_eof should
- ***** be set to YES, and we should return total_bytes_done, rather than -ENXIO.
- ***** The app should recognize this as an EOF condition.
- ***************************************************************************/
-			stat = start_dma(READ, bytes_todo);
-			if (stat == TE_OK) {
-				/* Wait for transfer to complete, interrupt should wake us */
-				while (dma_mode != 0) {
-					sleep_on(&qic02_tape_transfer);
-				}
-				if (status_error) {
-					return_read_eof = YES;
-				}
-
-			} else if (stat != TE_END) {
-				/* should do sense() on error here */
-#if 0
-				return -ENXIO;
-#else
-				printk("Trouble: stat==%02x\n", stat);
-				return_read_eof = YES;
-		/*************** check EOF/EOT handling!!!!!! **/
-#endif
-			}
-			end_dma(&bytes_done);
-			if (bytes_done > bytes_todo) {
-				tpqputs(TPQD_ALWAYS,
-					"read: Oops, read more bytes than requested");
-				return -EIO;
-			}
-			/* copy buffer to user-space in one go */
-			if (bytes_done > 0) {
-				if (copy_to_user(buf, buffaddr, bytes_done))
-					return -EFAULT;
-			}
-#if 1
-			/* Checks Ton's patch below */
-			if ((return_read_eof == NO)
-			    && (status_eof_detected == YES)) {
-				printk(TPQIC02_NAME
-				       ": read(): return_read_eof=%d, status_eof_detected=YES. return_read_eof:=YES\n",
-				       return_read_eof);
-			}
-#endif
-			if ((bytes_todo != bytes_done)
-			    || (status_eof_detected == YES)) {
-				/* EOF or EOM detected. return EOF next time. */
-				return_read_eof = YES;
-			}
-
-		}
-		/* else: ignore read request for 0 bytes */
-		if (bytes_done > 0) {
-			status_bytes_rd = YES;
-			buf += bytes_done;
-			*ppos += bytes_done;
-			total_bytes_done += bytes_done;
-			count -= bytes_done;
-		}
-	}
-	tpqputs(TPQD_ALWAYS, "read request for <0 bytes");
-	return -EINVAL;
-}				/* qic02_tape_read */
-
-
-
-/* The drive detects near-EOT by means of the holes in the tape.
- * When the holes are detected, there is some space left. The drive
- * reports this as a TP_EOM exception. After clearing the exception,
- * the drive should accept two extra blocks.
- *
- * It seems there are some archiver programs that would like to use the
- * extra space for writing a continuation marker. The driver should return
- * end-of-file to the user program on writes, when the holes are detected.
- * If the user-program wants to use the extra space, it should use the
- * MTNOP ioctl() to get the generic status register and may then continue
- * writing (max 1kB).	----------- doesn't work yet...............
- *
- * EOF behaviour on writes:
- * If there is enough room, write all of the data.
- * If there is insufficient room, write as much as will fit and
- * return the amount written. If the requested amount differs from the
- * written amount, the application program should recognize that as the
- * end of file. Subsequent writes will return -ENOSPC.
- * Unless the minor bits specify a rewind-on-close, the tape will not
- * be rewound when it is full. The user-program should do that, if desired.
- * If the driver were to do that automatically, a user-program could be 
- * confused about the EOT/BOT condition after re-opening the tape device.
- *
- * Multiple volume support: Tar closes the tape device before prompting for
- * the next tape. The user may then insert a new tape and tar will open the
- * tape device again. The driver will detect an exception status in (No Cartridge)
- * and force a rewind. After that tar may continue writing.
- */
-static ssize_t qic02_tape_write(struct file *filp, const char *buf,
-				size_t count, loff_t * ppos)
-{
-	kdev_t dev = filp->f_dentry->d_inode->i_rdev;
-	unsigned short flags = filp->f_flags;
-	unsigned long bytes_todo, bytes_done, total_bytes_done = 0;
-
-	if (status_zombie == YES) {
-		tpqputs(TPQD_ALWAYS, "configs not set");
-		return -ENXIO;
-	}
-
-	if (TP_DIAGS(current_tape_dev)) {
-		/* can't print a ``long long'' (for filp->f_pos), so chop it */
-		printk(TPQIC02_NAME ": request WRITE, minor=%x, buf=%p"
-		       ", count=%lx, pos=%lx, flags=%x\n",
-		       MINOR(dev), buf,
-		       (long) count, (unsigned long) filp->f_pos, flags);
-	}
-
-	if (count % TAPE_BLKSIZE) {	/* only allow mod 512 bytes at a time */
-		tpqputs(TPQD_BLKSZ, "Wrong block size");
-		return -EINVAL;
-	}
-
-	if (mode_access == READ) {
-		tpqputs(TPQD_ALWAYS, "Not in write mode");
-		return -EACCES;
-	}
-
-	/* open() does a sense() and we can assume the tape isn't changed
-	 * between open() and release(), so the tperror.exs bits will still
-	 * be valid.
-	 */
-	if ((tperror.exs & TP_ST0) && (tperror.exs & TP_WRP)) {
-		tpqputs(TPQD_ALWAYS, "Cartridge is write-protected.");
-		return -EACCES;	/* don't even try when write protected */
-	}
-
-	if (doing_read == YES) {
-		terminate_read(0);
-	}
-
-	while ((signed) count >= 0) {
-		/* see how much fits in the kernel buffer */
-		bytes_done = 0;
-		bytes_todo = TPQBUF_SIZE;
-		if (bytes_todo > count) {
-			bytes_todo = count;
-		}
-
-		if (return_write_eof == YES) {
-			/* return_write_eof should be reset on reverse tape movements. */
-
-			if (reported_write_eof == NO) {
-				if (bytes_todo > 0) {
-					tpqputs(TPQD_ALWAYS,
-						"partial write");
-					/* partial write signals EOF to user program */
-				}
-				reported_write_eof = YES;
-				return total_bytes_done;
-			} else {
-				return -ENOSPC;	/* return error */
-			}
-		}
-
-		/* Quit when done. */
-		if (bytes_todo == 0) {
-			return total_bytes_done;
-		}
-
-		/* copy from user to DMA buffer and initiate transfer. */
-		if (bytes_todo > 0) {
-			if (copy_from_user(buffaddr, buf, bytes_todo))
-				return -EFAULT;
-
-/****************** similar problem with read() at FM could happen here at EOT.
- ******************/
-
-/***** if at EOT, 0 bytes can be written. start_dma() will
- ***** fail and write() will return ENXIO error
- *****/
-			if (start_dma(WRITE, bytes_todo) != TE_OK) {
-				tpqputs(TPQD_ALWAYS,
-					"write: start_dma() failed");
-				/* should do sense() on error here */
-				return -ENXIO;
-				/*********** FIXTHIS **************/
-			}
-
-			/* Wait for write to complete, interrupt should wake us. */
-			while ((status_error == 0) && (dma_mode != 0)) {
-				sleep_on(&qic02_tape_transfer);
-			}
-
-			end_dma(&bytes_done);
-			if (bytes_done > bytes_todo) {
-				tpqputs(TPQD_ALWAYS,
-					"write: Oops, wrote more bytes than requested");
-				return -EIO;
-			}
-			/* If the dma-transfer was aborted because of an exception,
-			 * status_error will have been set in the interrupt handler.
-			 * Then end_dma() will do a sense().
-			 * If the exception was EXC_EOM, the EW-hole was encountered
-			 * and two more blocks could be written. For the time being we'll
-			 * just consider this to be the EOT.
-			 * Otherwise, something Bad happened, such as the maximum number
-			 * of block-rewrites was exceeded. [e.g. A very bad spot on tape was
-			 * encountered. Normally short dropouts are compensated for by
-			 * rewriting the block in error, up to 16 times. I'm not sure
-			 * QIC-24 drives can do this.]
-			 */
-			if (status_error) {
-				if (status_eom_detected == YES) {
-					tpqputs(TPQD_ALWAYS,
-						"write: EW detected");
-					return_write_eof = YES;
-				} else {
-					/* probably EXC_RWA */
-					tpqputs(TPQD_ALWAYS,
-						"write: dma: error in writing");
-					return -EIO;
-				}
-			}
-			if (bytes_todo != bytes_done) {
-				/* EOF or EOM detected. return EOT next time. */
-				return_write_eof = YES;
-			}
-		}
-		/* else: ignore write request for 0 bytes. */
-
-		if (bytes_done > 0) {
-			status_bytes_wr = YES;
-			buf += bytes_done;
-			*ppos += bytes_done;
-			total_bytes_done += bytes_done;
-			count -= bytes_done;
-		}
-	}
-
-	tpqputs(TPQD_ALWAYS, "write request for <0 bytes");
-	if (TPQDBG(DEBUG)) {
-		printk(TPQIC02_NAME ": status_bytes_wr %x, buf %p"
-		       ", total_bytes_done %lx, count %lx\n",
-		       status_bytes_wr, buf, total_bytes_done,
-		       (long) count);
-	}
-	return -EINVAL;
-}				/* qic02_tape_write */
-
-
-
-/* qic02_tape_open()
- * We allow the device to be opened, even if it is marked 'dead' because
- * we want to be able to reset the tape device without rebooting.
- * Only one open tape file at a time, except when minor=255.
- * Minor 255 is only allowed for resetting and always returns <0.
- * 
- * The density command is only allowed when TP_BOM is set. Thus, remember
- * the most recently used minor bits. When they are different from the
- * remembered values, rewind the tape and set the required density.
- * Don't rewind if the minor bits specify density 0.
- */
-
-static int qic02_tape_open(struct inode *inode, struct file *filp)
-{
-	static int qic02_tape_open_no_use_count(struct inode *,
-						struct file *);
-	int open_error;
-
-	open_error = qic02_tape_open_no_use_count(inode, filp);
-	return open_error;
-}
-
-static int qic02_tape_open_no_use_count(struct inode *inode,
-					struct file *filp)
-{
-	kdev_t dev = inode->i_rdev;
-	unsigned short flags = filp->f_flags;
-	unsigned short dens = 0;
-	int s;
-
-
-	if (TP_DIAGS(dev)) {
-		printk("qic02_tape_open: dev=%s, flags=%x     ",
-		       kdevname(dev), flags);
-	}
-
-	if (MINOR(dev) == 255) {	/* special case for resetting */
-		if (capable(CAP_SYS_ADMIN)) {
-			return (tape_reset(1) == TE_OK) ? -EAGAIN : -ENXIO;
-		} else {
-			return -EPERM;
-		}
-	}
-
-	if (status_dead == YES) {
-		/* Allow `mt reset' ioctl() even when already open()ed. */
-		return 0;
-	}
-
-	/* Only one at a time from here on... */
-	if (file_count(filp) > 1) {	/* filp->f_count==1 for the first open() */
-		return -EBUSY;
-	}
-
-	if (status_zombie == YES) {
-		/* no irq/dma/port stuff allocated yet, no reset done
-		 * yet, so return until MTSETCONFIG has been done.
-		 */
-		return 0;
-	}
-
-	status_bytes_rd = NO;
-	status_bytes_wr = NO;
-
-	return_read_eof = NO;	/********????????????????*****/
-	return_write_eof = (status_eot_detected) ? YES : NO;
-
-	/* Clear this in case user app close()d before reading EOF token */
-	status_eof_detected = NO;
-
-	reported_read_eof = NO;
-	reported_write_eof = NO;
-
-
-	switch (flags & O_ACCMODE) {
-	case O_RDONLY:
-		mode_access = READ;
-		break;
-	case O_WRONLY:		/* Fallthru... Strictly speaking this is not correct... */
-	case O_RDWR:		/* Reads are allowed as long as nothing is written */
-		mode_access = WRITE;
-		break;
-	}
-
-	/* This is to avoid tape-changed problems (TP_CNI exception).
-	 *
-	 * Since removing the cartridge will not raise an exception,
-	 * we always do a tp_sense() to make sure we have the proper
-	 * CNI status, the 2150L may need an additional sense.... - Eddy
-	 */
-	s = tp_sense(TP_WRP | TP_EOM | TP_BOM | TP_CNI | TP_EOR);
-
-	if (s == TE_OK) {
-		/* Try to clear cartridge-changed status for Archive-2150L */
-		if ((tperror.exs & TP_ST0) && (tperror.exs & TP_CNI)) {
-			s = tp_sense(TP_WRP | TP_EOM | TP_BOM | TP_CNI |
-				     TP_EOR);
-		}
-	}
-
-	if (s != TE_OK) {
-		tpqputs(TPQD_ALWAYS, "open: sense() failed");
-		return -EIO;
-	}
-
-	/* exception bits should be up-to-date now, so check for
-	 * tape presence and exit if absent.
-	 * Even `mt stat' will fail without a tape.
-	 */
-	if ((tperror.exs & TP_ST0) && (tperror.exs & TP_CNI)) {
-		tpqputs(TPQD_ALWAYS, "No tape present.");
-		return -EIO;
-	}
-
-	/* At this point we can assume that a tape is present and
-	 * that it will remain present until release() is called.
-	 */
-
-	/* not allowed to do QCMD_DENS_* unless tape is rewound */
-	if ((TP_DENS(dev) != 0)
-	    && (TP_DENS(current_tape_dev) != TP_DENS(dev))) {
-		/* force rewind if minor bits have changed,
-		 * i.e. user wants to use tape in different format.
-		 * [assuming single drive operation]
-		 */
-		if (TP_HAVE_DENS) {
-			tpqputs(TPQD_REWIND,
-				"Density minor bits have changed. Forcing rewind.");
-			need_rewind = YES;
-		}
-	} else {
-		/* density bits still the same, but TP_DIAGS bit 
-		 * may have changed.
-		 */
-		current_tape_dev = dev;
-	}
-
-	if (need_rewind == YES) {
-/***************** CHECK THIS!!!!!!!! **********/
-		s = do_qic_cmd(QCMD_REWIND, TIM_R);
-		if (s != 0) {
-			tpqputs(TPQD_ALWAYS, "open: rewind failed");
-			return -EIO;
-		}
-	}
-
-
-/* Note: After a reset command, the controller will rewind the tape
- *	 just before performing any tape movement operation! ************ SO SET need_rewind flag!!!!!
- */
-	if (status_dead == YES) {
-		tpqputs(TPQD_ALWAYS, "open: tape dead, attempting reset");
-		if (tape_reset(1) != TE_OK) {
-			return -ENXIO;
-		} else {
-			status_dead = NO;
-			if (tp_sense(~(TP_ST1 | TP_ILL)) != TE_OK) {
-				tpqputs(TPQD_ALWAYS,
-					"open: tp_sense() failed\n");
-				status_dead = YES;	/* try reset next time */
-				return -EIO;
-			}
-		}
-	}
-
-	/* things should be ok, once we get here */
-
-
-	/* set density: only allowed when TP_BOM status bit is set,
-	 * so we must have done a rewind by now. If not, just skip over.
-	 * Only give set density command when minor bits have changed.
-	 */
-	if (TP_DENS(current_tape_dev) == TP_DENS(dev)) {
-		return 0;
-	}
-
-	current_tape_dev = dev;
-	need_rewind = NO;
-	if (TP_HAVE_DENS) {
-		dens = TP_DENS(dev);
-	}
-
-	if (dens < sizeof(format_names) / sizeof(char *)) {
-		printk(TPQIC02_NAME ": format: %s%s\n",
-		       (dens != 0) ? "QIC-" : "", format_names[dens]);
-	} else {
-		tpqputs(TPQD_REWIND, "Wait for retensioning...");
-	}
-
-	switch (TP_DENS(dev)) {
-	case 0:		/* Minor 0 is for drives without set-density support */
-		s = 0;
-		break;
-	case 1:
-		s = do_qic_cmd(QCMD_DENS_11, TIM_S);
-		break;
-	case 2:
-		s = do_qic_cmd(QCMD_DENS_24, TIM_S);
-		break;
-	case 3:
-		s = do_qic_cmd(QCMD_DENS_120, TIM_S);
-		break;
-	case 4:
-		s = do_qic_cmd(QCMD_DENS_150, TIM_S);
-		break;
-	case 5:
-		s = do_qic_cmd(QCMD_DENS_300, TIM_S);
-		break;
-	case 6:
-		s = do_qic_cmd(QCMD_DENS_600, TIM_S);
-		break;
-	default:		/* otherwise do a retension before anything else */
-		s = do_qic_cmd(QCMD_RETEN, TIM_R);
-	}
-	if (s != 0) {
-		status_dead = YES;	/* force reset */
-		current_tape_dev = 0;	/* earlier 0xff80 */
-		return -EIO;
-	}
-
-	return 0;
-}				/* qic02_tape_open */
-
-
-static int qic02_tape_release(struct inode *inode, struct file *filp)
-{
-	kdev_t dev = inode->i_rdev;
-
-	lock_kernel();
-	if (TP_DIAGS(dev)) {
-		printk("qic02_tape_release: dev=%s\n", kdevname(dev));
-	}
-
-	if (status_zombie == NO) {	/* don't rewind in zombie mode */
-		/* Terminate any pending write cycle. Terminating the read-cycle
-		 * is delayed until it is required to do so for a new command.
-		 */
-		terminate_write(-1);
-
-		if (status_dead == YES) {
-			tpqputs(TPQD_ALWAYS, "release: device dead!?");
-		}
-
-		/* Rewind only if minor number requires it AND 
-		 * read/writes have been done. ************* IS THIS CORRECT??????????
-		 */
-		if ((TP_REWCLOSE(dev))
-		    && (status_bytes_rd | status_bytes_wr)) {
-			tpqputs(TPQD_REWIND, "release: Doing rewind...");
-			(void) do_qic_cmd(QCMD_REWIND, TIM_R);
-		}
-	}
-	unlock_kernel();
-	return 0;
-}				/* qic02_tape_release */
-
-
-#ifdef CONFIG_QIC02_DYNCONF
-/* Set masks etc. based on the interface card type. */
-static int update_ifc_masks(int ifc)
-{
-	QIC02_TAPE_IFC = ifc;
-
-	if ((QIC02_TAPE_IFC == WANGTEK) || (QIC02_TAPE_IFC == EVEREX)) {
-		QIC02_STAT_PORT = QIC02_TAPE_PORT;
-		QIC02_CTL_PORT = QIC02_TAPE_PORT;
-		QIC02_CMD_PORT = QIC02_TAPE_PORT + 1;
-		QIC02_DATA_PORT = QIC02_TAPE_PORT + 1;
-		QIC02_STAT_READY = WT_QIC02_STAT_READY;
-		QIC02_STAT_EXCEPTION = WT_QIC02_STAT_EXCEPTION;
-		QIC02_STAT_MASK = WT_QIC02_STAT_MASK;
-
-		QIC02_STAT_RESETMASK = WT_QIC02_STAT_RESETMASK;
-		QIC02_STAT_RESETVAL = WT_QIC02_STAT_RESETVAL;
-
-		QIC02_CTL_RESET = WT_QIC02_CTL_RESET;
-		QIC02_CTL_REQUEST = WT_QIC02_CTL_REQUEST;
-
-		if (QIC02_TAPE_DMA == 3) {
-			WT_CTL_DMA = WT_CTL_DMA3;
-		} else if (QIC02_TAPE_DMA == 1) {
-			WT_CTL_DMA = WT_CTL_DMA1;
-		} else {
-			tpqputs(TPQD_ALWAYS,
-				"Unsupported or incorrect DMA channel");
-			return -EIO;
-		}
-
-		if (QIC02_TAPE_IFC == EVEREX) {
-			/* Everex is a special case for Wangtek (actually
-			 * it's the other way 'round, but I saw Wangtek first)
-			 */
-			if (QIC02_TAPE_DMA == 3) {
-				WT_CTL_DMA = WT_CTL_DMA1;
-			}
-
-			/* Fixup the kernel copy of the IFC type to that
-			 * we don't have to distinguish between Wangtek and
-			 * and Everex at runtime.
-			 */
-			QIC02_TAPE_IFC = WANGTEK;
-		}
-	} else if (QIC02_TAPE_IFC == ARCHIVE) {
-		QIC02_STAT_PORT = QIC02_TAPE_PORT + 1;
-		QIC02_CTL_PORT = QIC02_TAPE_PORT + 1;
-		QIC02_CMD_PORT = QIC02_TAPE_PORT;
-		QIC02_DATA_PORT = QIC02_TAPE_PORT;
-		QIC02_STAT_READY = AR_QIC02_STAT_READY;
-		QIC02_STAT_EXCEPTION = AR_QIC02_STAT_EXCEPTION;
-		QIC02_STAT_MASK = AR_QIC02_STAT_MASK;
-
-		QIC02_STAT_RESETMASK = AR_QIC02_STAT_RESETMASK;
-		QIC02_STAT_RESETVAL = AR_QIC02_STAT_RESETVAL;
-
-		QIC02_CTL_RESET = AR_QIC02_CTL_RESET;
-		QIC02_CTL_REQUEST = AR_QIC02_CTL_REQUEST;
-
-		if (QIC02_TAPE_DMA > 3) {
-			tpqputs(TPQD_ALWAYS,
-				"Unsupported or incorrect DMA channel");
-			return -EIO;
-		}
-	} else if (QIC02_TAPE_IFC == MOUNTAIN) {
-		QIC02_STAT_PORT = QIC02_TAPE_PORT + 1;
-		QIC02_CTL_PORT = QIC02_TAPE_PORT + 1;
-		QIC02_CMD_PORT = QIC02_TAPE_PORT;
-		QIC02_DATA_PORT = QIC02_TAPE_PORT;
-
-		QIC02_STAT_READY = MTN_QIC02_STAT_READY;
-		QIC02_STAT_EXCEPTION = MTN_QIC02_STAT_EXCEPTION;
-		QIC02_STAT_MASK = MTN_QIC02_STAT_MASK;
-
-		QIC02_STAT_RESETMASK = MTN_QIC02_STAT_RESETMASK;
-		QIC02_STAT_RESETVAL = MTN_QIC02_STAT_RESETVAL;
-
-		QIC02_CTL_RESET = MTN_QIC02_CTL_RESET;
-		QIC02_CTL_REQUEST = MTN_QIC02_CTL_REQUEST;
-
-		if (QIC02_TAPE_DMA > 3) {
-			tpqputs(TPQD_ALWAYS,
-				"Unsupported or incorrect DMA channel");
-			return -EIO;
-		}
-	} else {
-		tpqputs(TPQD_ALWAYS, "Invalid interface type");
-		return -ENXIO;
-	}
-	return qic02_get_resources();
-}				/* update_ifc_masks */
-#endif
-
-
-/* ioctl allows user programs to rewind the tape and stuff like that */
-static int qic02_tape_ioctl(struct inode *inode, struct file *filp,
-			    unsigned int iocmd, unsigned long ioarg)
-{
-	int error;
-	int dev_maj = MAJOR(inode->i_rdev);
-	int c;
-	struct mtop operation;
-	unsigned char blk_addr[6];
-	struct mtpos ioctl_tell;
-
-
-	if (TP_DIAGS(current_tape_dev)) {
-		printk(TPQIC02_NAME ": ioctl(%4x, %4x, %4lx)\n", dev_maj,
-		       iocmd, ioarg);
-	}
-
-	if (!inode || !ioarg) {
-		return -EINVAL;
-	}
-
-	/* check iocmd first */
-
-	if (dev_maj != QIC02_TAPE_MAJOR) {
-		printk(TPQIC02_NAME ": Oops! Wrong device?\n");
-		/* A panic() would be appropriate here */
-		return -ENODEV;
-	}
-
-	c = _IOC_NR(iocmd);
-
-#ifdef CONFIG_QIC02_DYNCONF
-	if (c == _IOC_NR(MTIOCGETCONFIG)) {
-		CHECK_IOC_SIZE(mtconfiginfo);
-
-		if (copy_to_user
-		    ((char *) ioarg, (char *) &qic02_tape_dynconf,
-		     sizeof(qic02_tape_dynconf))) {
-			return -EFAULT;
-		}
-		return 0;
-
-	} else if (c == _IOC_NR(MTIOCSETCONFIG)) {
-		/* One should always do a MTIOCGETCONFIG first, then update
-		 * user-settings, then write back with MTIOCSETCONFIG.
-		 * The qic02conf program should re-open() the device before actual
-		 * use, to make sure everything is initialized.
-		 */
-
-		CHECK_IOC_SIZE(mtconfiginfo);
-
-		if (!capable(CAP_SYS_ADMIN)) {
-			return -EPERM;
-		}
-
-		if ((doing_read != NO) || (doing_write != NO)) {
-			return -EBUSY;
-		}
-
-		if (status_zombie == NO) {
-			qic02_release_resources();	/* and go zombie */
-		}
-
-		/* copy struct from user space to kernel space */
-		if (copy_from_user
-		    ((char *) &qic02_tape_dynconf, (char *) ioarg,
-		     sizeof(qic02_tape_dynconf))) {
-			return -EFAULT;
-		}
-		return update_ifc_masks(qic02_tape_dynconf.ifc_type);
-	}
-	if (status_zombie == YES) {
-		tpqputs(TPQD_ALWAYS, "Configs not set");
-		return -ENXIO;
-	}
-#endif
-	if (c == _IOC_NR(MTIOCTOP)) {
-		CHECK_IOC_SIZE(mtop);
-
-		/* copy mtop struct from user space to kernel space */
-		if (copy_from_user
-		    ((char *) &operation, (char *) ioarg,
-		     sizeof(operation))) {
-			return -EFAULT;
-		}
-
-		/* ---note: mt_count is signed, negative seeks must be
-		 * ---      translated to seeks in opposite direction!
-		 * (only needed for Sun-programs, I think.)
-		 */
-		/* ---note: MTFSF with count 0 should position the
-		 * ---      tape at the beginning of the current file.
-		 */
-
-		if (TP_DIAGS(current_tape_dev)) {
-			printk("OP op=%4x, count=%4x\n", operation.mt_op,
-			       operation.mt_count);
-		}
-
-		if (operation.mt_count < 0) {
-			tpqputs(TPQD_ALWAYS,
-				"Warning: negative mt_count ignored");
-		}
-
-		ioctl_status.mt_resid = operation.mt_count;
-		if (operation.mt_op == MTSEEK) {
-			if (!TP_HAVE_SEEK) {
-				return -ENOTTY;
-			}
-
-			seek_addr_buf[0] =
-			    (operation.mt_count >> 16) & 0xff;
-			seek_addr_buf[1] =
-			    (operation.mt_count >> 8) & 0xff;
-			seek_addr_buf[2] = (operation.mt_count) & 0xff;
-			if (operation.mt_count >> 24) {
-				return -EINVAL;
-			}
-			if ((error = do_ioctl_cmd(operation.mt_op)) != 0) {
-				return error;
-			}
-
-			ioctl_status.mt_resid = 0;
-		} else {
-			while (operation.mt_count > 0) {
-				operation.mt_count--;
-				if ((error =
-				     do_ioctl_cmd(operation.mt_op)) != 0) {
-					return error;
-				}
-
-				ioctl_status.mt_resid = operation.mt_count;
-			}
-		}
-		return 0;
-
-	} else if (c == _IOC_NR(MTIOCGET)) {
-		if (TP_DIAGS(current_tape_dev)) {
-			printk("GET ");
-		}
-
-		CHECK_IOC_SIZE(mtget);
-
-		/* It appears (gmt(1)) that it is normal behaviour to
-		 * first set the status with MTNOP, and then to read
-		 * it out with MTIOCGET
-		 */
-
-		/* copy results to user space */
-		if (copy_to_user
-		    ((char *) ioarg, (char *) &ioctl_status,
-		     sizeof(ioctl_status))) {
-			return -EFAULT;
-		}
-		return 0;
-	} else if (TP_HAVE_TELL && (c == _IOC_NR(MTIOCPOS))) {
-		if (TP_DIAGS(current_tape_dev)) {
-			printk("POS ");
-		}
-
-		CHECK_IOC_SIZE(mtpos);
-
-		tpqputs(TPQD_IOCTLS, "MTTELL reading block address");
-		if ((doing_read == YES) || (doing_write == YES)) {
-			finish_rw(AR_QCMDV_TELL_BLK);
-		}
-
-		c = rdstatus((char *) blk_addr, sizeof(blk_addr),
-			     AR_QCMDV_TELL_BLK);
-		if (c != TE_OK) {
-			return -EIO;
-		}
-
-		ioctl_tell.mt_blkno =
-		    (blk_addr[3] << 16) | (blk_addr[4] << 8) | blk_addr[5];
-
-		/* copy results to user space */
-		if (copy_to_user
-		    ((char *) ioarg, (char *) &ioctl_tell,
-		     sizeof(ioctl_tell))) {
-			return -EFAULT;
-		}
-		return 0;
-
-	} else {
-		return -ENOTTY;	/* Other cmds not supported. */
-	}
-}				/* qic02_tape_ioctl */
-
-
-
-/* These are (most) of the interface functions: */
-static struct file_operations qic02_tape_fops = {
-	owner:THIS_MODULE,
-	llseek:no_llseek,
-	read:qic02_tape_read,
-	write:qic02_tape_write,
-	ioctl:qic02_tape_ioctl,
-	open:qic02_tape_open,
-	release:qic02_tape_release,
-};
-
-
-static void qic02_release_resources(void)
-{
-	free_irq(QIC02_TAPE_IRQ, NULL);
-	free_dma(QIC02_TAPE_DMA);
-	release_region(QIC02_TAPE_PORT, QIC02_TAPE_PORT_RANGE);
-	if (buffaddr) {
-		free_pages((unsigned long) buffaddr,
-			   get_order(TPQBUF_SIZE));
-	}
-	buffaddr = 0;		/* Better to cause a panic than overwite someone else */
-	status_zombie = YES;
-}				/* qic02_release_resources */
-
-
-static int qic02_get_resources(void)
-{
-	/* First perform some checks. If one of them fails,
-	 * the tape driver will not be registered to the system.
-	 */
-	if (QIC02_TAPE_IRQ > 16) {
-		tpqputs(TPQD_ALWAYS, "Bogus interrupt number.");
-		return -ENXIO;
-	}
-
-	/* for DYNCONF, allocating IO, DMA and IRQ should not be done until 
-	 * the config parameters have been set using MTSETCONFIG.
-	 */
-
-	/* Grab the IO region. */
-	if (!request_region(QIC02_TAPE_PORT, QIC02_TAPE_PORT_RANGE,
-			   TPQIC02_NAME)) {
-		printk(TPQIC02_NAME
-		       ": IO space at 0x%x [%d ports] already reserved\n",
-		       QIC02_TAPE_PORT, QIC02_TAPE_PORT_RANGE);
-		return -ENXIO;
-	}
-
-	/* get IRQ */
-	if (request_irq
-	    (QIC02_TAPE_IRQ, qic02_tape_interrupt, SA_INTERRUPT, "QIC-02",
-	     NULL)) {
-		printk(TPQIC02_NAME
-		       ": can't allocate IRQ%d for QIC-02 tape\n",
-		       QIC02_TAPE_IRQ);
-		release_region(QIC02_TAPE_PORT, QIC02_TAPE_PORT_RANGE);
-		return -EBUSY;
-	}
-
-	/* After IRQ, allocate DMA channel */
-	if (request_dma(QIC02_TAPE_DMA, "QIC-02")) {
-		printk(TPQIC02_NAME
-		       ": can't allocate DMA%d for QIC-02 tape\n",
-		       QIC02_TAPE_DMA);
-		free_irq(QIC02_TAPE_IRQ, NULL);
-		release_region(QIC02_TAPE_PORT, QIC02_TAPE_PORT_RANGE);
-		return -EBUSY;
-	}
-
-	/* Setup the page-address for the dma transfer. */
-	buffaddr =
-	    (void *) __get_dma_pages(GFP_KERNEL, get_order(TPQBUF_SIZE));
-
-	if (!buffaddr) {
-		qic02_release_resources();
-		return -EBUSY;	/* Not ideal, EAGAIN perhaps? */
-	}
-
-	memset(buffaddr, 0, TPQBUF_SIZE);
-
-	printk(TPQIC02_NAME
-	       ": Settings: IRQ %d, DMA %d, IO 0x%x, IFC %s\n",
-	       QIC02_TAPE_IRQ, QIC02_TAPE_DMA, ((QIC02_TAPE_IFC == ARCHIVE)
-						|| (QIC02_TAPE_IFC ==
-						    MOUNTAIN)) ?
-	       QIC02_CMD_PORT : QIC02_STAT_PORT,
-	       (QIC02_TAPE_IFC ==
-		MOUNTAIN) ? "Mountain" : ((QIC02_TAPE_IFC ==
-					   ARCHIVE) ? "Archive" :
-					  "Wangtek"));
-
-	if (tape_reset(0) != TE_OK
-	    || tp_sense(TP_WRP | TP_POR | TP_CNI) != TE_OK) {
-		/* No drive detected, so vanish */
-		tpqputs(TPQD_ALWAYS,
-			"No drive detected -- releasing IO/IRQ/DMA.");
-		status_dead = YES;
-		qic02_release_resources();
-		return -EIO;
-	}
-
-	/* All should be ok now */
-	status_zombie = NO;
-	return 0;
-}				/* qic02_get_resources */
-
-int __init qic02_tape_init(void)
-{
-	if (TPSTATSIZE != 6) {
-		printk(TPQIC02_NAME
-		       ": internal error: tpstatus struct incorrect!\n");
-		return -ENODEV;
-	}
-	if ((TPQBUF_SIZE < 512) || (TPQBUF_SIZE >= 0x10000)) {
-		printk(TPQIC02_NAME
-		       ": internal error: DMA buffer size out of range\n");
-		return -ENODEV;
-	}
-
-	current_tape_dev = MKDEV(QIC02_TAPE_MAJOR, 0);
-
-#ifndef CONFIG_QIC02_DYNCONF
-	printk(TPQIC02_NAME ": IRQ %d, DMA %d, IO 0x%x, IFC %s, %s, %s\n",
-	       QIC02_TAPE_IRQ, QIC02_TAPE_DMA,
-# if QIC02_TAPE_IFC == WANGTEK
-	       QIC02_STAT_PORT, "Wangtek",
-# elif QIC02_TAPE_IFC == ARCHIVE
-	       QIC02_CMD_PORT, "Archive",
-# elif QIC02_TAPE_IFC == MOUNTAIN
-	       QIC02_CMD_PORT, "Mountain",
-# else
-#  error
-# endif
-	       rcs_revision, rcs_date);
-	if (qic02_get_resources()) {
-		return -ENODEV;
-	}
-#else
-	printk(TPQIC02_NAME ": Runtime config, %s, %s\n",
-	       rcs_revision, rcs_date);
-#endif
-	printk(TPQIC02_NAME ": DMA buffers: %u blocks\n", NR_BLK_BUF);
-	/* If we got this far, install driver functions */
-	if (devfs_register_chrdev
-	    (QIC02_TAPE_MAJOR, TPQIC02_NAME, &qic02_tape_fops)) {
-		printk(TPQIC02_NAME ": Unable to get chrdev major %d\n",
-		       QIC02_TAPE_MAJOR);
-#ifndef CONFIG_QIC02_DYNCONF
-		qic02_release_resources();
-#endif
-		return -ENODEV;
-	}
-	devfs_register(NULL, "ntpqic11", DEVFS_FL_DEFAULT,
-		       QIC02_TAPE_MAJOR, 2,
-		       S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
-		       &qic02_tape_fops, NULL);
-	devfs_register(NULL, "tpqic11", DEVFS_FL_DEFAULT,
-		       QIC02_TAPE_MAJOR, 3,
-		       S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
-		       &qic02_tape_fops, NULL);
-	devfs_register(NULL, "ntpqic24", DEVFS_FL_DEFAULT,
-		       QIC02_TAPE_MAJOR, 4,
-		       S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
-		       &qic02_tape_fops, NULL);
-	devfs_register(NULL, "tpqic24", DEVFS_FL_DEFAULT,
-		       QIC02_TAPE_MAJOR, 5,
-		       S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
-		       &qic02_tape_fops, NULL);
-	devfs_register(NULL, "ntpqic120", DEVFS_FL_DEFAULT,
-		       QIC02_TAPE_MAJOR, 6,
-		       S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
-		       &qic02_tape_fops, NULL);
-	devfs_register(NULL, "tpqic120", DEVFS_FL_DEFAULT,
-		       QIC02_TAPE_MAJOR, 7,
-		       S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
-		       &qic02_tape_fops, NULL);
-	devfs_register(NULL, "ntpqic150", DEVFS_FL_DEFAULT,
-		       QIC02_TAPE_MAJOR, 8,
-		       S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
-		       &qic02_tape_fops, NULL);
-	devfs_register(NULL, "tpqic150", DEVFS_FL_DEFAULT,
-		       QIC02_TAPE_MAJOR, 9,
-		       S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
-		       &qic02_tape_fops, NULL);
-	init_waitqueue_head(&qic02_tape_transfer);
-	/* prepare timer */
-	TIMEROFF;
-	init_timer(&tp_timer);
-	tp_timer.function = qic02_tape_times_out;
-
-#ifndef CONFIG_QIC02_DYNCONF
-	if (tape_reset(0) != TE_OK
-	    || tp_sense(TP_WRP | TP_POR | TP_CNI) != TE_OK) {
-		/* No drive detected, so vanish */
-		tpqputs(TPQD_ALWAYS,
-			"No drive detected -- driver going on vacation...");
-		qic02_release_resources();
-		status_dead = YES;
-		return -ENODEV;
-	} else {
-		if (is_exception()) {
-			tpqputs(TPQD_ALWAYS, "exception detected\n");
-			(void) tp_sense(TP_WRP | TP_POR | TP_CNI);
-		}
-	}
-#endif
-
-	/* initialize generic status for ioctl requests */
-
-	ioctl_status.mt_type = QIC02_TAPE_DRIVE;	/* MT_IS* id nr */
-
-	ioctl_status.mt_resid = 0;	/* ---residual count */
-	ioctl_status.mt_gstat = 0;	/* ---generic status */
-	ioctl_status.mt_erreg = 0;	/* not used */
-	ioctl_status.mt_fileno = 0;	/* number of current file on tape */
-	ioctl_status.mt_blkno = 0;	/* number of current (logical) block */
-
-	return 0;
-}				/* qic02_tape_init */
-
-#ifdef MODULE
-
-void cleanup_module(void)
-{
-	if (status_zombie == NO) {
-		qic02_release_resources();
-	}
-	devfs_unregister_chrdev(QIC02_TAPE_MAJOR, TPQIC02_NAME);
-	devfs_unregister(devfs_find_handle
-			 (NULL, "ntpqic11", QIC02_TAPE_MAJOR, 2,
-			  DEVFS_SPECIAL_CHR, 0));
-	devfs_unregister(devfs_find_handle
-			 (NULL, "tpqic11", QIC02_TAPE_MAJOR, 3,
-			  DEVFS_SPECIAL_CHR, 0));
-	devfs_unregister(devfs_find_handle
-			 (NULL, "ntpqic24", QIC02_TAPE_MAJOR, 4,
-			  DEVFS_SPECIAL_CHR, 0));
-	devfs_unregister(devfs_find_handle
-			 (NULL, "tpqic24", QIC02_TAPE_MAJOR, 5,
-			  DEVFS_SPECIAL_CHR, 0));
-	devfs_unregister(devfs_find_handle
-			 (NULL, "ntpqic120", QIC02_TAPE_MAJOR, 6,
-			  DEVFS_SPECIAL_CHR, 0));
-	devfs_unregister(devfs_find_handle
-			 (NULL, "tpqic120", QIC02_TAPE_MAJOR, 7,
-			  DEVFS_SPECIAL_CHR, 0));
-	devfs_unregister(devfs_find_handle
-			 (NULL, "ntpqic150", QIC02_TAPE_MAJOR, 8,
-			  DEVFS_SPECIAL_CHR, 0));
-	devfs_unregister(devfs_find_handle
-			 (NULL, "tpqic150", QIC02_TAPE_MAJOR, 9,
-			  DEVFS_SPECIAL_CHR, 0));
-}
-
-int init_module(void)
-{
-	int retval;
-	retval = qic02_tape_init();
-# ifdef CONFIG_QIC02_DYNCONF
-	/* This allows the dynamic config program to setup the card
-	 * by presetting qic02_tape_dynconf via insmod
-	 */
-	if (!retval && qic02_tape_dynconf.ifc_type) {
-		retval = update_ifc_masks(qic02_tape_dynconf.ifc_type);
-		if (retval) {
-			cleanup_module();
-		}
-	}
-# endif
-	return retval;
-}
-#endif
-
-MODULE_LICENSE("GPL");
-EXPORT_NO_SYMBOLS;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/char/vc_screen.c linux-2.4.20-wolk4.16-fullkernel/drivers/char/vc_screen.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/char/vc_screen.c	2001-09-17 06:22:40.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/char/vc_screen.c	2004-09-05 16:06:00.000000000 +0200
@@ -64,12 +64,25 @@ vcs_size(struct inode *inode)
 	return size;
 }
 
+/* We share this temporary buffer with the console write code
+ * so that we can easily avoid touching user space while holding the
+ * console spinlock.
+ */
+extern char con_buf[PAGE_SIZE];
+#define CON_BUF_SIZE	PAGE_SIZE
+extern struct semaphore con_buf_sem;
+
 static loff_t vcs_lseek(struct file *file, loff_t offset, int orig)
 {
-	int size = vcs_size(file->f_dentry->d_inode);
+	int size;
+
+	down(&con_buf_sem);
+
+	size = vcs_size(file->f_dentry->d_inode);
 
 	switch (orig) {
 		default:
+			up(&con_buf_sem);
 			return -EINVAL;
 		case 2:
 			offset += size;
@@ -79,26 +92,22 @@ static loff_t vcs_lseek(struct file *fil
 		case 0:
 			break;
 	}
-	if (offset < 0 || offset > size)
+	if (offset < 0 || offset > size) {
+		up(&con_buf_sem);
 		return -EINVAL;
+	}
 	file->f_pos = offset;
+	up (&con_buf_sem);
 	return file->f_pos;
 }
 
-/* We share this temporary buffer with the console write code
- * so that we can easily avoid touching user space while holding the
- * console spinlock.
- */
-extern char con_buf[PAGE_SIZE];
-#define CON_BUF_SIZE	PAGE_SIZE
-extern struct semaphore con_buf_sem;
-
 static ssize_t
 vcs_read(struct file *file, char *buf, size_t count, loff_t *ppos)
 {
 	struct inode *inode = file->f_dentry->d_inode;
 	unsigned int currcons = MINOR(inode->i_rdev);
-	long pos = *ppos;
+	loff_t n;
+	unsigned pos;
 	long viewed, attr, read;
 	int col, maxcol;
 	unsigned short *org = NULL;
@@ -106,6 +115,9 @@ vcs_read(struct file *file, char *buf, s
 
 	down(&con_buf_sem);
 
+	n = *ppos; 
+	pos = n;
+
 	/* Select the proper current console and verify
 	 * sanity of the situation under the console lock.
 	 */
@@ -124,11 +136,10 @@ vcs_read(struct file *file, char *buf, s
 	if (!vc_cons_allocated(currcons))
 		goto unlock_out;
 
-	ret = -EINVAL;
-	if (pos < 0)
-		goto unlock_out;
 	read = 0;
 	ret = 0;
+	if (pos != n)
+		goto unlock_out;
 	while (count) {
 		char *con_buf0, *con_buf_start;
 		long this_round, size;
@@ -244,16 +255,15 @@ vcs_read(struct file *file, char *buf, s
 		acquire_console_sem();
 
 		if (ret) {
-			read += (orig_count - ret);
 			ret = -EFAULT;
-			break;
+			goto unlock_out;
 		}
 		buf += orig_count;
 		pos += orig_count;
 		read += orig_count;
 		count -= orig_count;
 	}
-	*ppos += read;
+	*ppos = pos;
 	if (read)
 		ret = read;
 unlock_out:
@@ -267,7 +277,8 @@ vcs_write(struct file *file, const char 
 {
 	struct inode *inode = file->f_dentry->d_inode;
 	unsigned int currcons = MINOR(inode->i_rdev);
-	long pos = *ppos;
+	loff_t n;
+	unsigned pos;
 	long viewed, attr, size, written;
 	char *con_buf0;
 	int col, maxcol;
@@ -276,6 +287,9 @@ vcs_write(struct file *file, const char 
 
 	down(&con_buf_sem);
 
+	n = *ppos;
+	pos = n;
+
 	/* Select the proper current console and verify
 	 * sanity of the situation under the console lock.
 	 */
@@ -297,7 +311,7 @@ vcs_write(struct file *file, const char 
 
 	size = vcs_size(inode);
 	ret = -EINVAL;
-	if (pos < 0 || pos > size)
+	if (pos != n || pos > size)
 		goto unlock_out;
 	if (count > size - pos)
 		count = size - pos;
@@ -435,7 +449,7 @@ vcs_write(struct file *file, const char 
 		if (org0)
 			update_region(currcons, (unsigned long)(org0), org-org0);
 	}
-	*ppos += written;
+	*ppos = pos;
 	ret = written;
 
 unlock_out:
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/char/vt.c linux-2.4.20-wolk4.16-fullkernel/drivers/char/vt.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/char/vt.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/char/vt.c	2004-09-05 17:09:43.000000000 +0200
@@ -179,6 +179,11 @@ do_kdsk_ioctl(int cmd, struct kbentry *u
 	case KDSKBENT:
 		if (!perm)
 			return -EPERM;
+#ifdef CONFIG_GRKERNSEC
+		if (!capable(CAP_SYS_TTY_CONFIG))
+			return -EPERM;
+#endif
+
 		if (!i && v == K_NOSUCHMAP) {
 			/* disallocate map */
 			key_map = key_maps[s];
@@ -301,6 +306,11 @@ do_kdgkb_ioctl(int cmd, struct kbsentry 
 		if (!perm)
 			return -EPERM;
 
+#ifdef CONFIG_GRKERNSEC
+		if (!capable(CAP_SYS_TTY_CONFIG))
+			return -EPERM;
+#endif
+
 		q = func_table[i];
 		first_free = funcbufptr + (funcbufsize - funcbufleft);
 		for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++) 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/gsc/eisa_eeprom.c linux-2.4.20-wolk4.16-fullkernel/drivers/gsc/eisa_eeprom.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/gsc/eisa_eeprom.c	2002-11-29 00:53:12.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/gsc/eisa_eeprom.c	2004-09-05 16:06:00.000000000 +0200
@@ -34,24 +34,30 @@ static ssize_t eisa_eeprom_read(struct f
 	unsigned char *tmp;
 	ssize_t ret;
 	int i;
+	loff_t n = *ppos;
+	unsigned pos = n;
 	
-	if (*ppos >= HPEE_MAX_LENGTH)
+	if (n != pos || pos >= HPEE_MAX_LENGTH)
 		return 0;
 	
-	count = *ppos + count < HPEE_MAX_LENGTH ? count : HPEE_MAX_LENGTH - *ppos;
+	if (count > HPEE_MAX_LENGTH - pos)
+		count = HPEE_MAX_LENGTH - pos;
+
 	tmp = kmalloc(count, GFP_KERNEL);
 	if (tmp) {
 		for (i = 0; i < count; i++)
-			tmp[i] = gsc_readb(eeprom_addr+(*ppos)++);
+			tmp[i] = gsc_readb(eeprom_addr+(pos)++);
 
 		if (copy_to_user (buf, tmp, count))
 			ret = -EFAULT;
-		else
+		else {
 			ret = count;
+			*ppos = pos;
+		}
 		kfree (tmp);
 	} else
 		ret = -ENOMEM;
-	
+
 	return ret;
 }
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/hotplug/acpiphp_pci.c linux-2.4.20-wolk4.16-fullkernel/drivers/hotplug/acpiphp_pci.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/hotplug/acpiphp_pci.c	2004-06-29 11:23:58.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/hotplug/acpiphp_pci.c	2004-09-05 15:47:23.000000000 +0200
@@ -78,8 +78,8 @@ static int init_config_space (struct acp
 		if (bar & PCI_BASE_ADDRESS_SPACE_IO) {
 			/* This is IO */
 
-			len = bar & 0xFFFFFFFC;
-			len = ~len + 1;
+			len = bar & (PCI_BASE_ADDRESS_IO_MASK & 0xFFFF);
+			len = len & ~(len-1);
 
 			dbg("len in IO %x, BAR %d\n", len, count);
 
@@ -340,8 +340,9 @@ static int detect_used_resource (struct 
 		if (len & PCI_BASE_ADDRESS_SPACE_IO) {
 			/* This is IO */
 			base = bar & 0xFFFFFFFC;
-			len &= 0xFFFFFFFC;
-			len = ~len + 1;
+
+			len = len & (PCI_BASE_ADDRESS_IO_MASK & 0xFFFF);
+			len = len & ~(len-1);
 
 			dbg("BAR[%d] %08x - %08x (IO)\n", count, (u32)base, (u32)base + len - 1);
 
@@ -465,8 +466,9 @@ int acpiphp_init_func_resource (struct a
 		if (len & PCI_BASE_ADDRESS_SPACE_IO) {
 			/* This is IO */
 			base = bar & 0xFFFFFFFC;
-			len &= 0xFFFFFFFC;
-			len = ~len + 1;
+
+			len = len & (PCI_BASE_ADDRESS_IO_MASK & 0xFFFF);
+			len = len & ~(len-1);
 
 			dbg("BAR[%d] %08x - %08x (IO)\n", count, (u32)base, (u32)base + len - 1);
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/hotplug/acpiphp_res.c linux-2.4.20-wolk4.16-fullkernel/drivers/hotplug/acpiphp_res.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/hotplug/acpiphp_res.c	2004-06-29 11:23:58.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/hotplug/acpiphp_res.c	2004-09-05 15:47:23.000000000 +0200
@@ -225,7 +225,7 @@ struct pci_resource *acpiphp_get_io_reso
 		}  /* End of too big on top end */
 
 		/* For IO make sure it's not in the ISA aliasing space */
-		if (node->base & 0x300L)
+		if ((node->base & 0x300L) && !(node->base & 0xfffff000))
 			continue;
 
 		/* If we got here, then it is the right size
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/i2c/Config.in linux-2.4.20-wolk4.16-fullkernel/drivers/i2c/Config.in
--- linux-2.4.20-wolk4.15-fullkernel/drivers/i2c/Config.in	2004-06-29 11:23:48.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/i2c/Config.in	2004-09-05 16:04:57.000000000 +0200
@@ -62,6 +62,7 @@ if [ "$CONFIG_I2C" != "n" ]; then
     dep_tristate '  Intel 82801AA, AB, BA, DB' CONFIG_I2C_I801 $CONFIG_I2C
     dep_tristate '  Intel i810AA/AB/E and i815' CONFIG_I2C_I810 $CONFIG_I2C_ALGOBIT
     dep_tristate '  Intel 82371AB PIIX4(E), 443MX, ServerWorks OSB4/CSB5, SMSC Victory66' CONFIG_I2C_PIIX4 $CONFIG_I2C
+    dep_tristate '  nVidia nForce2' CONFIG_I2C_NFORCE2 $CONFIG_I2C
     dep_tristate '  SiS 5595' CONFIG_I2C_SIS5595 $CONFIG_I2C
     dep_tristate '  SiS 630/730' CONFIG_I2C_SIS630 $CONFIG_I2C
     dep_tristate '  SiS 645/961,645DX/961,735' CONFIG_I2C_SIS645 $CONFIG_I2C $CONFIG_HOTPLUG
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/i2c/Makefile linux-2.4.20-wolk4.16-fullkernel/drivers/i2c/Makefile
--- linux-2.4.20-wolk4.15-fullkernel/drivers/i2c/Makefile	2004-06-29 11:23:48.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/i2c/Makefile	2004-09-05 16:04:57.000000000 +0200
@@ -37,6 +37,7 @@ obj-$(CONFIG_I2C_HYDRA)			+= i2c-hydra.o
 obj-$(CONFIG_I2C_I801)			+= i2c-i801.o
 obj-$(CONFIG_I2C_I810)			+= i2c-i810.o
 obj-$(CONFIG_I2C_ISA)			+= i2c-isa.o
+obj-$(CONFIG_I2C_NFORCE2)		+= i2c-nforce2.o
 obj-$(CONFIG_I2C_PIIX4)			+= i2c-piix4.o dmi_scan.o
 obj-$(CONFIG_I2C_SIS5595)		+= i2c-sis5595.o
 obj-$(CONFIG_I2C_SIS630)		+= i2c-sis630.o
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/i2c/i2c-nforce2.c linux-2.4.20-wolk4.16-fullkernel/drivers/i2c/i2c-nforce2.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/i2c/i2c-nforce2.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/i2c/i2c-nforce2.c	2004-09-05 16:04:57.000000000 +0200
@@ -0,0 +1,405 @@
+/*
+    SMBus driver for nVidia nForce2 MCP
+
+    Copyright (c) 2003  Hans-Frieder Vogt <hfvogt@arcor.de>,
+    Based on
+    SMBus 2.0 driver for AMD-8111 IO-Hub
+    Copyright (c) 2002 Vojtech Pavlik
+
+    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., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+/*
+    SUPPORTED DEVICES	PCI ID
+    nForce2 MCP		0064       
+
+    This driver supports the 2 SMBuses that are included in the MCP2 of the
+    nForce2 chipset.
+*/
+
+/* Note: we assume there can only be one nForce2, with two SMBus interfaces */
+
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/kernel.h>
+#include <linux/stddef.h>
+#include <linux/sched.h>
+#include <linux/ioport.h>
+#include <linux/init.h>
+#include <linux/i2c.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+#include <asm/io.h>
+/* #include "version.h" */
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR ("Hans-Frieder Vogt <hfvogt@arcor.de>");
+MODULE_DESCRIPTION("nForce2 SMBus driver");
+
+#ifndef PCI_DEVICE_ID_NVIDIA_NFORCE2_SMBUS
+#define PCI_DEVICE_ID_NVIDIA_NFORCE2_SMBUS   0x0064
+#endif
+
+#define LM_DATE "20040207"
+#define LM_VERSION "2.8.4"
+
+struct nforce2_smbus {
+	struct pci_dev *dev;
+	struct i2c_adapter adapter;
+	int base;
+	int size;
+};
+
+
+/*
+ * nVidia nForce2 SMBus control register definitions
+ */
+#define NFORCE_PCI_SMB1	0x50
+#define NFORCE_PCI_SMB2	0x54
+
+
+/*
+ * ACPI 2.0 chapter 13 SMBus 2.0 EC register model
+ */
+#define NVIDIA_SMB_PRTCL	(smbus->base + 0x00)	/* protocol, PEC */
+#define NVIDIA_SMB_STS		(smbus->base + 0x01)	/* status */
+#define NVIDIA_SMB_ADDR		(smbus->base + 0x02)	/* address */
+#define NVIDIA_SMB_CMD		(smbus->base + 0x03)	/* command */
+#define NVIDIA_SMB_DATA		(smbus->base + 0x04)	/* 32 data registers */
+#define NVIDIA_SMB_BCNT		(smbus->base + 0x24)	/* number of data bytes */
+#define NVIDIA_SMB_ALRM_A	(smbus->base + 0x25)	/* alarm address */
+#define NVIDIA_SMB_ALRM_D	(smbus->base + 0x26)	/* 2 bytes alarm data */
+
+#define NVIDIA_SMB_STS_DONE	0x80
+#define NVIDIA_SMB_STS_ALRM	0x40
+#define NVIDIA_SMB_STS_RES	0x20
+#define NVIDIA_SMB_STS_STATUS	0x1f
+
+#define NVIDIA_SMB_PRTCL_WRITE			0x00
+#define NVIDIA_SMB_PRTCL_READ			0x01
+#define NVIDIA_SMB_PRTCL_QUICK			0x02
+#define NVIDIA_SMB_PRTCL_BYTE			0x04
+#define NVIDIA_SMB_PRTCL_BYTE_DATA		0x06
+#define NVIDIA_SMB_PRTCL_WORD_DATA		0x08
+#define NVIDIA_SMB_PRTCL_BLOCK_DATA		0x0a
+#define NVIDIA_SMB_PRTCL_PROC_CALL		0x0c
+#define NVIDIA_SMB_PRTCL_BLOCK_PROC_CALL	0x0d
+#define NVIDIA_SMB_PRTCL_I2C_BLOCK_DATA		0x4a
+#define NVIDIA_SMB_PRTCL_PEC			0x80
+
+
+/* Other settings */
+#define MAX_TIMEOUT 256
+
+
+
+static s32 nforce2_access(struct i2c_adapter *adap, u16 addr,
+		       unsigned short flags, char read_write,
+		       u8 command, int size, union i2c_smbus_data *data);
+/*
+static int nforce2_block_transaction(union i2c_smbus_data *data,
+				  char read_write, int i2c_enable);
+ */
+static u32 nforce2_func(struct i2c_adapter *adapter);
+
+
+static struct i2c_algorithm smbus_algorithm = {
+	.name = "Non-I2C SMBus adapter",
+	.id = I2C_ALGO_SMBUS,
+	.smbus_xfer = nforce2_access,
+	.functionality = nforce2_func,
+};
+
+/* Return -1 on error. See smbus.h for more information */
+s32 nforce2_access(struct i2c_adapter * adap, u16 addr, unsigned short flags,
+		char read_write, u8 command, int size,
+		union i2c_smbus_data * data)
+{
+	struct nforce2_smbus *smbus = adap->algo_data;
+	unsigned char protocol, pec, temp;
+	unsigned char len = 0; /* to keep the compiler quiet */
+	int timeout = 0;
+	int i;
+
+	protocol = (read_write == I2C_SMBUS_READ) ? NVIDIA_SMB_PRTCL_READ : NVIDIA_SMB_PRTCL_WRITE;
+	pec = (flags & I2C_CLIENT_PEC) ? NVIDIA_SMB_PRTCL_PEC : 0;
+
+	switch (size) {
+
+		case I2C_SMBUS_QUICK:
+			protocol |= NVIDIA_SMB_PRTCL_QUICK;
+			read_write = I2C_SMBUS_WRITE;
+			break;
+
+		case I2C_SMBUS_BYTE:
+			if (read_write == I2C_SMBUS_WRITE)
+				outb_p(command, NVIDIA_SMB_CMD);
+			protocol |= NVIDIA_SMB_PRTCL_BYTE;
+			break;
+
+		case I2C_SMBUS_BYTE_DATA:
+			outb_p(command, NVIDIA_SMB_CMD);
+			if (read_write == I2C_SMBUS_WRITE)
+				outb_p(data->byte, NVIDIA_SMB_DATA);
+			protocol |= NVIDIA_SMB_PRTCL_BYTE_DATA;
+			break;
+
+		case I2C_SMBUS_WORD_DATA:
+			outb_p(command, NVIDIA_SMB_CMD);
+			if (read_write == I2C_SMBUS_WRITE) {
+				 outb_p(data->word, NVIDIA_SMB_DATA);
+				 outb_p(data->word >> 8, NVIDIA_SMB_DATA+1);
+			}
+			protocol |= NVIDIA_SMB_PRTCL_WORD_DATA | pec;
+			break;
+
+		case I2C_SMBUS_BLOCK_DATA:
+			outb_p(command, NVIDIA_SMB_CMD);
+			if (read_write == I2C_SMBUS_WRITE) {
+				len = min_t(u8, data->block[0], 32);
+				outb_p(len, NVIDIA_SMB_BCNT);
+				for (i = 0; i < len; i++)
+					outb_p(data->block[i + 1], NVIDIA_SMB_DATA+i);
+			}
+			protocol |= NVIDIA_SMB_PRTCL_BLOCK_DATA | pec;
+			break;
+
+		case I2C_SMBUS_I2C_BLOCK_DATA:
+			len = min_t(u8, data->block[0], 32);
+			outb_p(command, NVIDIA_SMB_CMD);
+			outb_p(len, NVIDIA_SMB_BCNT);
+			if (read_write == I2C_SMBUS_WRITE)
+				for (i = 0; i < len; i++)
+					outb_p(data->block[i + 1], NVIDIA_SMB_DATA+i);
+			protocol |= NVIDIA_SMB_PRTCL_I2C_BLOCK_DATA;
+			break;
+
+		case I2C_SMBUS_PROC_CALL:
+			printk(KERN_WARNING "i2c-nforce2.o: I2C_SMBUS_PROC_CALL not supported!\n");
+			return -1;
+			/*
+			outb_p(command, NVIDIA_SMB_CMD);
+			outb_p(data->word, NVIDIA_SMB_DATA);
+			outb_p(data->word >> 8, NVIDIA_SMB_DATA + 1);
+			protocol = NVIDIA_SMB_PRTCL_PROC_CALL | pec;
+			read_write = I2C_SMBUS_READ;
+			break;
+			 */
+
+		case I2C_SMBUS_BLOCK_PROC_CALL:
+			printk(KERN_WARNING "i2c-nforce2.o: I2C_SMBUS_BLOCK_PROC_CALL not supported!\n");
+			return -1;
+			/*
+			protocol |= pec;
+			len = min_t(u8, data->block[0], 31);
+			outb_p(command, NVIDIA_SMB_CMD);
+			outb_p(len, NVIDIA_SMB_BCNT);
+			for (i = 0; i < len; i++)
+				outb_p(data->block[i + 1], NVIDIA_SMB_DATA + i);
+			protocol = NVIDIA_SMB_PRTCL_BLOCK_PROC_CALL | pec;
+			read_write = I2C_SMBUS_READ;
+			break;
+			*/
+
+		case I2C_SMBUS_WORD_DATA_PEC:
+		case I2C_SMBUS_BLOCK_DATA_PEC:
+		case I2C_SMBUS_PROC_CALL_PEC:
+		case I2C_SMBUS_BLOCK_PROC_CALL_PEC:
+			printk(KERN_WARNING "i2c-nforce2.c: Unexpected software PEC transaction %d\n.", size);
+			return -1;
+
+		default:
+			printk(KERN_WARNING "i2c-nforce2.c: Unsupported transaction %d\n", size);
+			return -1;
+	}
+
+	outb_p((addr & 0x7f) << 1, NVIDIA_SMB_ADDR);
+	outb_p(protocol, NVIDIA_SMB_PRTCL);
+
+	temp = inb_p(NVIDIA_SMB_STS);
+
+#if 0
+	do {
+		i2c_delay(1);
+		temp = inb_p(NVIDIA_SMB_STS);
+	} while (((temp & NVIDIA_SMB_STS_DONE) == 0) && (timeout++ < MAX_TIMEOUT));
+#endif
+	if (~temp & NVIDIA_SMB_STS_DONE) {
+		udelay(500);
+		temp = inb_p(NVIDIA_SMB_STS);
+	}
+//	if (~temp & NVIDIA_SMB_STS_DONE) {
+//		i2c_delay(HZ/100);
+//		temp = inb_p(NVIDIA_SMB_STS);
+//	}
+
+	if ((timeout >= MAX_TIMEOUT) || (~temp & NVIDIA_SMB_STS_DONE) || (temp & NVIDIA_SMB_STS_STATUS))
+		return -1;
+
+	if (read_write == I2C_SMBUS_WRITE)
+		return 0;
+
+	switch (size) {
+
+		case I2C_SMBUS_BYTE:
+		case I2C_SMBUS_BYTE_DATA:
+			data->byte = inb_p(NVIDIA_SMB_DATA);
+			break;
+
+		case I2C_SMBUS_WORD_DATA:
+		/* case I2C_SMBUS_PROC_CALL: not supported */
+			data->word = inb_p(NVIDIA_SMB_DATA) | (inb_p(NVIDIA_SMB_DATA+1) << 8);
+			break;
+
+		case I2C_SMBUS_BLOCK_DATA:
+		/* case I2C_SMBUS_BLOCK_PROC_CALL: not supported */
+			len = inb_p(NVIDIA_SMB_BCNT);
+			len = min_t(u8, len, 32);
+		case I2C_SMBUS_I2C_BLOCK_DATA:
+			for (i = 0; i < len; i++)
+				data->block[i+1] = inb_p(NVIDIA_SMB_DATA + i);
+			data->block[0] = len;
+			break;
+	}
+
+	return 0;
+}
+
+
+u32 nforce2_func(struct i2c_adapter *adapter)
+{
+	/* other functionality might be possible, but is not tested */
+	return I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE |
+	    I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA /* |
+	    I2C_FUNC_SMBUS_BLOCK_DATA */;
+}
+
+
+static struct pci_device_id nforce2_ids[] = {
+	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2_SMBUS,
+	       	PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+	{ 0 }
+};
+
+
+static int __devinit nforce2_probe_smb (struct pci_dev *dev, int reg, struct nforce2_smbus *smbus, char *name)
+{
+	u16 iobase;
+	int error;
+
+	if (pci_read_config_word(dev, reg, &iobase) != PCIBIOS_SUCCESSFUL) {
+		printk (KERN_ERR "i2c-nforce2.o: Error reading PCI config for %s\n", name);
+		return -1;
+	}
+	smbus->dev  = dev;
+	smbus->base = iobase & 0xfffc;
+	smbus->size = 8;
+
+	if (!request_region(smbus->base, smbus->size, "nForce2 SMBus")) {
+		printk (KERN_ERR "i2c-nforce2.o: Error requesting region %02x .. %02X for %s\n", smbus->base, smbus->base+smbus->size-1, name);
+		return -1;
+	}
+
+	/* TODO: find a better way to find out whether this file is compiled
+	 * with i2c 2.7.0 of earlier
+	 */
+#ifdef I2C_HW_SMBUS_AMD8111
+	smbus->adapter.owner = THIS_MODULE;
+#endif
+	sprintf(smbus->adapter.name, "SMBus nForce2 adapter at %04x", smbus->base);
+	smbus->adapter.id = I2C_ALGO_SMBUS | I2C_HW_SMBUS_NFORCE2;
+	smbus->adapter.algo = &smbus_algorithm;
+	smbus->adapter.algo_data = smbus;
+
+	error = i2c_add_adapter(&smbus->adapter);
+	if (error) {
+		printk(KERN_WARNING "i2c-nforce2.o: Failed to register adapter.\n");
+		release_region(smbus->base, smbus->size);
+		return -1;
+	}
+	printk(KERN_INFO "i2c-nforce2.o: nForce2 SMBus adapter at %#x\n", smbus->base);
+	return 0;
+}
+
+
+static int __devinit nforce2_probe(struct pci_dev *dev, const struct pci_device_id *id)
+{
+	struct nforce2_smbus *smbuses;
+	int res1, res2;
+
+	/* we support 2 SMBus adapters */
+	if (!(smbuses = (void *)kmalloc(2*sizeof(struct nforce2_smbus),
+				       	GFP_KERNEL)))
+		return -ENOMEM;
+	memset (smbuses, 0, 2*sizeof(struct nforce2_smbus));
+	pci_set_drvdata(dev, smbuses);
+
+	/* SMBus adapter 1 */
+	res1 = nforce2_probe_smb (dev, NFORCE_PCI_SMB1, &smbuses[0], "SMB1");
+	if (res1 < 0) {
+		printk (KERN_ERR "i2c-nforce2.o: Error probing SMB1.\n");
+		smbuses[0].base = 0;	/* to have a check value */
+	}
+	res2 = nforce2_probe_smb (dev, NFORCE_PCI_SMB2, &smbuses[1], "SMB2");
+	if (res2 < 0) {
+		printk (KERN_ERR "i2c-nforce2.o: Error probing SMB2.\n");
+		smbuses[1].base = 0;	/* to have a check value */
+	}
+	if ((res1 < 0) && (res2 < 0)) {
+		/* we did not find even one of the SMBuses, so we give up */
+		kfree(smbuses);
+		return -ENODEV;
+	}
+
+	return 0;
+}
+
+
+static void __devexit nforce2_remove(struct pci_dev *dev)
+{
+	struct nforce2_smbus *smbuses = (void*) pci_get_drvdata(dev);
+
+	if (smbuses[0].base) {
+		i2c_del_adapter(&smbuses[0].adapter);
+		release_region(smbuses[0].base, smbuses[0].size);
+	}
+	if (smbuses[1].base) {
+		i2c_del_adapter(&smbuses[1].adapter);
+		release_region(smbuses[1].base, smbuses[1].size);
+	}
+	kfree(smbuses);
+}
+
+static struct pci_driver nforce2_driver = {
+	.name		= "nForce2 SMBus",
+	.id_table	= nforce2_ids,
+	.probe		= nforce2_probe,
+	.remove		= __devexit_p(nforce2_remove),
+};
+
+int __init nforce2_init(void)
+{
+	printk(KERN_INFO "i2c-nforce2.o version %s (%s)\n", LM_VERSION, LM_DATE);
+	return pci_module_init(&nforce2_driver);
+}
+
+void __exit nforce2_exit(void)
+{
+	pci_unregister_driver(&nforce2_driver);
+}
+
+module_init(nforce2_init);
+module_exit(nforce2_exit);
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/ide/Config.in linux-2.4.20-wolk4.16-fullkernel/drivers/ide/Config.in
--- linux-2.4.20-wolk4.15-fullkernel/drivers/ide/Config.in	2004-06-29 11:31:14.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/ide/Config.in	2004-09-05 16:05:53.000000000 +0200
@@ -63,11 +63,11 @@ if [ "$CONFIG_BLK_DEV_IDE" != "n" ]; the
 	    fi
 	    dep_tristate '    NS87415 chipset support' CONFIG_BLK_DEV_NS87415 $CONFIG_BLK_DEV_IDEDMA_PCI
 	    dep_tristate '    OPTi 82C621 chipset enhanced support (EXPERIMENTAL)' CONFIG_BLK_DEV_OPTI621 $CONFIG_EXPERIMENTAL
-	    dep_tristate '    PROMISE PDC202{46|62|65|67} support' CONFIG_BLK_DEV_PDC202XX_OLD $CONFIG_BLK_DEV_IDEDMA_PCI
-	    dep_mbool     '      Special UDMA Feature' CONFIG_PDC202XX_BURST $CONFIG_BLK_DEV_PDC202XX_OLD $CONFIG_BLK_DEV_IDEDMA_PCI
-	    dep_tristate '    PROMISE PDC202{68|69|70|71|75|76|77} support' CONFIG_BLK_DEV_PDC202XX_NEW $CONFIG_BLK_DEV_IDEDMA_PCI
+	    dep_tristate '    Promise PDC202{46|62|65|67} support' CONFIG_BLK_DEV_PDC202XX_OLD $CONFIG_BLK_DEV_IDEDMA_PCI
+	    dep_mbool     '      Force (U)DMA burst transfers' CONFIG_PDC202XX_BURST $CONFIG_BLK_DEV_PDC202XX_OLD
+	    dep_tristate '    Promise PDC202{68|69|70|71|75|76|77} support' CONFIG_BLK_DEV_PDC202XX_NEW $CONFIG_BLK_DEV_IDEDMA_PCI
 	    if [ "$CONFIG_BLK_DEV_PDC202XX_OLD" = "y" -o "$CONFIG_BLK_DEV_PDC202XX_OLD" = "m" -o "$CONFIG_BLK_DEV_PDC202XX_NEW" = "y" -o "$CONFIG_BLK_DEV_PDC202XX_NEW" = "m" ]; then
-	        bool     '    Special FastTrak Feature' CONFIG_PDC202XX_FORCE
+	        bool     '    Ignore BIOS port disabled setting on FastTrak' CONFIG_PDC202XX_FORCE
 	    fi
 	    dep_tristate '    RZ1000 chipset bugfix/support' CONFIG_BLK_DEV_RZ1000 $CONFIG_X86
 	    dep_tristate '    SCx200 chipset support' CONFIG_BLK_DEV_SC1200 $CONFIG_BLK_DEV_IDEDMA_PCI
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/ide/ide-cd.c linux-2.4.20-wolk4.16-fullkernel/drivers/ide/ide-cd.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/ide/ide-cd.c	2004-06-29 11:31:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/ide/ide-cd.c	2004-09-05 16:08:40.000000000 +0200
@@ -2214,27 +2214,33 @@ static int cdrom_read_toc(ide_drive_t *d
 	/* Read the multisession information. */
 	if (toc->hdr.first_track != CDROM_LEADOUT) {
 		/* Read the multisession information. */
-		stat = cdrom_read_tocentry(drive, 0, 1, 1, (char *)&ms_tmp,
+		int ask_for_msf=0;
+#if ! STANDARD_ATAPI
+		if (CDROM_CONFIG_FLAGS(drive)->tocaddr_as_bcd)
+			ask_for_msf=1;
+#endif
+		stat = cdrom_read_tocentry(drive, 0, ask_for_msf, 1,
+					   (char *)&ms_tmp,
 					   sizeof(ms_tmp), sense);
 		if (stat) return stat;
 	} else {
-		ms_tmp.ent.addr.msf.minute = 0;
-		ms_tmp.ent.addr.msf.second = 2;
-		ms_tmp.ent.addr.msf.frame  = 0;
+		ms_tmp.ent.addr.lba = 0;
 		ms_tmp.hdr.first_track = ms_tmp.hdr.last_track = CDROM_LEADOUT;
 	}
 
+	toc->last_session_lba = be32_to_cpu(ms_tmp.ent.addr.lba);
+	toc->xa_flag = (ms_tmp.hdr.first_track != ms_tmp.hdr.last_track);
+
 #if ! STANDARD_ATAPI
-	if (CDROM_CONFIG_FLAGS(drive)->tocaddr_as_bcd)
+	if (CDROM_CONFIG_FLAGS(drive)->tocaddr_as_bcd
+	    && toc->hdr.first_track != CDROM_LEADOUT) {
 		msf_from_bcd (&ms_tmp.ent.addr.msf);
+		toc->last_session_lba = msf_to_lba (ms_tmp.ent.addr.msf.minute,
+						    ms_tmp.ent.addr.msf.second,
+						    ms_tmp.ent.addr.msf.frame);
+	}
 #endif  /* not STANDARD_ATAPI */
 
-	toc->last_session_lba = msf_to_lba (ms_tmp.ent.addr.msf.minute,
-					    ms_tmp.ent.addr.msf.second,
-					    ms_tmp.ent.addr.msf.frame);
-
-	toc->xa_flag = (ms_tmp.hdr.first_track != ms_tmp.hdr.last_track);
-
 	/* Now try to get the total cdrom capacity. */
 	minor = (drive->select.b.unit) << PARTN_BITS;
 	dev = MKDEV(HWIF(drive)->major, minor);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/ide/ide-lib.c linux-2.4.20-wolk4.16-fullkernel/drivers/ide/ide-lib.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/ide/ide-lib.c	2004-06-29 11:22:42.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/ide/ide-lib.c	2004-09-05 15:45:27.000000000 +0200
@@ -107,6 +107,10 @@ u8 ide_dma_speed(ide_drive_t *drive, u8 
 			if ((id->dma_ultra & 0x0008) &&
 			    (id->dma_ultra & hwif->ultra_mask))
 				{ speed = XFER_UDMA_3; break; }
+		case 0x05:
+			if ((id->dma_ultra & 0x0008) &&
+			    (id->dma_ultra & hwif->ultra_mask))
+				{ speed = XFER_UDMA_3; break; }
 		case 0x01:
 			if ((id->dma_ultra & 0x0004) &&
 			    (id->dma_ultra & hwif->ultra_mask))
@@ -161,13 +165,13 @@ u8 ide_rate_filter (u8 mode, u8 speed) 
 #ifdef CONFIG_BLK_DEV_IDEDMA
 	static u8 speed_max[] = {
 		XFER_MW_DMA_2, XFER_UDMA_2, XFER_UDMA_4,
-		XFER_UDMA_5, XFER_UDMA_6
+		XFER_UDMA_5, XFER_UDMA_6, XFER_UDMA_3
 	};
 
 //	printk("%s: mode 0x%02x, speed 0x%02x\n", __FUNCTION__, mode, speed);
 
 	/* So that we remember to update this if new modes appear */
-	if (mode > 4)
+	if (mode > 5)
 		BUG();
 	return min(speed, speed_max[mode]);
 #else /* !CONFIG_BLK_DEV_IDEDMA */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/ide/pci/hpt366.c linux-2.4.20-wolk4.16-fullkernel/drivers/ide/pci/hpt366.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/ide/pci/hpt366.c	2004-06-29 11:22:48.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/ide/pci/hpt366.c	2004-09-05 15:45:26.000000000 +0200
@@ -123,7 +123,7 @@ static int hpt366_get_info (char *buffer
 				"                             %s\n",
 			(c0 & 0x80) ? "no" : "yes",
 			(c1 & 0x80) ? "no" : "yes");
-
+#if 0
 		if (hpt_minimum_revision(dev, 3)) {
 			u8 cbl;
 			cbl = inb(iobase + 0x7b);
@@ -136,7 +136,7 @@ static int hpt366_get_info (char *buffer
 				(cbl & 0x01) ? 33 : 66);
 			p += sprintf(p, "\n");
 		}
-
+#endif
 		p += sprintf(p, "--------------- drive0 --------- drive1 "
 				"------- drive0 ---------- drive1 -------\n");
 		p += sprintf(p, "DMA capable:    %s              %s" 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/ide/pci/piix.c linux-2.4.20-wolk4.16-fullkernel/drivers/ide/pci/piix.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/ide/pci/piix.c	2004-06-29 11:22:48.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/ide/pci/piix.c	2004-09-05 15:45:27.000000000 +0200
@@ -301,8 +301,11 @@ static u8 piix_ratemask (ide_drive_t *dr
 		case PCI_DEVICE_ID_INTEL_82372FB_1:
 			mode = 2;
 			break;
-		/* UDMA 33 capable */
+		/* UDMA 44 capable */
 		case PCI_DEVICE_ID_INTEL_82371AB:
+			mode = 5;
+			break;
+		/* UDMA 33 capable */
 		case PCI_DEVICE_ID_INTEL_82443MX_1:
 		case PCI_DEVICE_ID_INTEL_82451NX:
 		case PCI_DEVICE_ID_INTEL_82801AB_1:
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/ieee1394/pcilynx.c linux-2.4.20-wolk4.16-fullkernel/drivers/ieee1394/pcilynx.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/ieee1394/pcilynx.c	2004-06-29 11:30:47.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/ieee1394/pcilynx.c	2004-09-05 16:06:00.000000000 +0200
@@ -1065,12 +1065,15 @@ static ssize_t mem_read(struct file *fil
         ssize_t retval;
         void *membase;
 
-        if ((off + count) > PCILYNX_MAX_MEMORY+1) {
-                count = PCILYNX_MAX_MEMORY+1 - off;
-        }
-        if (count == 0 || off > PCILYNX_MAX_MEMORY) {
+	if (!count)
+		return 0;
+	if (off < 0)
+		return -EINVAL;
+	if (off > PCILYNX_MAX_MEMORY)
                 return -ENOSPC;
-        }
+
+	if (count > PCILYNX_MAX_MEMORY + 1 - off)
+		count = PCILYNX_MAX_MEMORY + 1 - off;
 
         switch (md->type) {
         case rom:
@@ -1091,6 +1094,7 @@ static ssize_t mem_read(struct file *fil
 
         if (count < mem_mindma) {
                 memcpy_fromio(md->lynx->mem_dma_buffer, membase+off, count);
+		off += count;
                 goto out;
         }
 
@@ -1121,6 +1125,7 @@ static ssize_t mem_read(struct file *fil
         if (bcount) {
                 memcpy_fromio(md->lynx->mem_dma_buffer + count - bcount,
                               membase+off, bcount);
+		off += bcount;
         }
 
  out:
@@ -1128,7 +1133,7 @@ static ssize_t mem_read(struct file *fil
         up(&md->lynx->mem_dma_mutex);
 
 	if (retval) return -EFAULT;
-        *offset += count;
+        *offset = off;
         return count;
 }
 
@@ -1137,32 +1142,36 @@ static ssize_t mem_write(struct file *fi
                          loff_t *offset)
 {
         struct memdata *md = (struct memdata *)file->private_data;
+	loff_t off = *offset;
 
-        if (((*offset) + count) > PCILYNX_MAX_MEMORY+1) {
-                count = PCILYNX_MAX_MEMORY+1 - *offset;
-        }
-        if (count == 0 || *offset > PCILYNX_MAX_MEMORY) {
-                return -ENOSPC;
-        }
+	if (!count)
+		return 0;
+	if (off < 0)
+		return -EINVAL;
+	if (off > PCILYNX_MAX_MEMORY)
+		return -ENOSPC;
+
+	if (count > PCILYNX_MAX_MEMORY + 1 - off)
+		count = PCILYNX_MAX_MEMORY + 1 - off;
 
         /* FIXME: dereferencing pointers to PCI mem doesn't work everywhere */
         switch (md->type) {
         case aux:
-		if (copy_from_user(md->lynx->aux_port+(*offset), buffer, count))
+		if (copy_from_user(md->lynx->aux_port+off, buffer, count))
 			return -EFAULT;
                 break;
         case ram:
-		if (copy_from_user(md->lynx->local_ram+(*offset), buffer, count))
+		if (copy_from_user(md->lynx->local_ram+off, buffer, count))
 			return -EFAULT;
                 break;
         case rom:
                 /* the ROM may be writeable */
-		if (copy_from_user(md->lynx->local_rom+(*offset), buffer, count))
+		if (copy_from_user(md->lynx->local_rom+off, buffer, count))
 			return -EFAULT;
                 break;
         }
 
-        file->f_pos += count;
+	*offset = off + count;
         return count;
 }
 #endif /* CONFIG_IEEE1394_PCILYNX_PORTS */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/ieee1394/raw1394.c linux-2.4.20-wolk4.16-fullkernel/drivers/ieee1394/raw1394.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/ieee1394/raw1394.c	2004-06-29 11:30:47.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/ieee1394/raw1394.c	2004-09-05 16:05:09.000000000 +0200
@@ -1989,7 +1989,8 @@ static ssize_t raw1394_write(struct file
         }
         req->file_info = fi;
 
-        if (copy_from_user(&req->req, buffer, sizeof(struct raw1394_request))) {
+        if (copy_from_user(&req->req, buffer, sizeof(struct raw1394_request))
+	    || (ssize_t)req->req.length < 0) {
                 free_pending_request(req);
                 return -EFAULT;
         }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/input/Config.in linux-2.4.20-wolk4.16-fullkernel/drivers/input/Config.in
--- linux-2.4.20-wolk4.15-fullkernel/drivers/input/Config.in	2001-09-13 00:34:06.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/input/Config.in	2004-09-05 16:04:42.000000000 +0200
@@ -14,5 +14,6 @@ if [ "$CONFIG_INPUT_MOUSEDEV" != "n" ]; 
 fi
 dep_tristate '  Joystick support' CONFIG_INPUT_JOYDEV $CONFIG_INPUT
 dep_tristate '  Event interface support' CONFIG_INPUT_EVDEV $CONFIG_INPUT
+dep_tristate '  User level driver support' CONFIG_INPUT_UINPUT $CONFIG_INPUT
 
 endmenu
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/input/Makefile linux-2.4.20-wolk4.16-fullkernel/drivers/input/Makefile
--- linux-2.4.20-wolk4.15-fullkernel/drivers/input/Makefile	2000-12-29 23:07:22.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/input/Makefile	2004-09-05 16:04:42.000000000 +0200
@@ -24,6 +24,7 @@ obj-$(CONFIG_INPUT_KEYBDEV)	+= keybdev.o
 obj-$(CONFIG_INPUT_MOUSEDEV)	+= mousedev.o
 obj-$(CONFIG_INPUT_JOYDEV)	+= joydev.o
 obj-$(CONFIG_INPUT_EVDEV)	+= evdev.o
+obj-$(CONFIG_INPUT_UINPUT)	+= uinput.o
 
 # The global Rules.make.
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/input/keybdev.c linux-2.4.20-wolk4.16-fullkernel/drivers/input/keybdev.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/input/keybdev.c	2001-10-11 18:14:32.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/input/keybdev.c	2004-09-05 16:04:42.000000000 +0200
@@ -154,16 +154,18 @@ static int emulate_raw(unsigned int keyc
 
 static struct input_handler keybdev_handler;
 
+static unsigned int ledstate = 0xff;
+
 void keybdev_ledfunc(unsigned int led)
 {
 	struct input_handle *handle;	
 
-	for (handle = keybdev_handler.handle; handle; handle = handle->hnext) {
+	ledstate = led;
 
+	for (handle = keybdev_handler.handle; handle; handle = handle->hnext) {
 		input_event(handle->dev, EV_LED, LED_SCROLLL, !!(led & 0x01));
 		input_event(handle->dev, EV_LED, LED_NUML,    !!(led & 0x02));
 		input_event(handle->dev, EV_LED, LED_CAPSL,   !!(led & 0x04));
-
 	}
 }
 
@@ -202,6 +204,12 @@ static struct input_handle *keybdev_conn
 
 //	printk(KERN_INFO "keybdev.c: Adding keyboard: input%d\n", dev->number);
 
+	if (ledstate != 0xff) {
+		input_event(dev, EV_LED, LED_SCROLLL, !!(ledstate & 0x01));
+		input_event(dev, EV_LED, LED_NUML,    !!(ledstate & 0x02));
+		input_event(dev, EV_LED, LED_CAPSL,   !!(ledstate & 0x04));
+	}
+
 	return handle;
 }
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/input/uinput.c linux-2.4.20-wolk4.16-fullkernel/drivers/input/uinput.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/input/uinput.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/input/uinput.c	2004-09-05 16:04:42.000000000 +0200
@@ -0,0 +1,428 @@
+/*
+ *  User level driver support for input subsystem
+ *
+ * Heavily based on evdev.c by Vojtech Pavlik
+ *
+ * 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 02111-1307 USA
+ *
+ * Author: Aristeu Sergio Rozanski Filho <aris@cathedrallabs.org>
+ * 
+ * Changes/Revisions:
+ *	0.1	20/06/2002
+ *		- first public version
+ */
+
+#include <linux/poll.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/input.h>
+#include <linux/smp_lock.h>
+#include <linux/fs.h>
+#include <linux/miscdevice.h>
+#include <linux/uinput.h>
+
+static int uinput_dev_open(struct input_dev *dev)
+{
+	return 0;
+}
+
+static void uinput_dev_close(struct input_dev *dev)
+{
+}
+
+static int uinput_dev_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
+{
+	struct uinput_device	*udev;
+
+	udev = (struct uinput_device *)dev->private;
+
+	udev->buff[udev->head].type = type;
+	udev->buff[udev->head].code = code;
+	udev->buff[udev->head].value = value;
+	do_gettimeofday(&udev->buff[udev->head].time);
+	udev->head = (udev->head + 1) % UINPUT_BUFFER_SIZE;
+
+	wake_up_interruptible(&udev->waitq);
+
+	return 0;
+}
+
+static int uinput_dev_upload_effect(struct input_dev *dev, struct ff_effect *effect)
+{
+	return 0;
+}
+
+static int uinput_dev_erase_effect(struct input_dev *dev, int effect_id)
+{
+	return 0;
+}					
+
+static int uinput_create_device(struct uinput_device *udev)
+{
+	if (!udev->dev->name) {
+		printk(KERN_DEBUG "%s: write device info first\n", UINPUT_NAME);
+		return -EINVAL;
+	}
+
+	udev->dev->open = uinput_dev_open;
+	udev->dev->close = uinput_dev_close;
+	udev->dev->event = uinput_dev_event;
+	udev->dev->upload_effect = uinput_dev_upload_effect;
+	udev->dev->erase_effect = uinput_dev_erase_effect;
+	udev->dev->private = udev;
+
+	init_waitqueue_head(&(udev->waitq));
+
+	input_register_device(udev->dev);
+
+	set_bit(UIST_CREATED, &(udev->state));
+
+	return 0;
+}
+
+static int uinput_destroy_device(struct uinput_device *udev)
+{
+	if (!test_bit(UIST_CREATED, &(udev->state))) {
+		printk(KERN_WARNING "%s: create the device first\n", UINPUT_NAME);
+		return -EINVAL;
+	}
+
+	input_unregister_device(udev->dev);
+
+	clear_bit(UIST_CREATED, &(udev->state));
+
+	return 0;
+}
+
+static int uinput_open(struct inode *inode, struct file *file)
+{
+	struct uinput_device	*newdev;
+	struct input_dev	*newinput;
+
+	newdev = kmalloc(sizeof(struct uinput_device), GFP_KERNEL);
+	if (!newdev)
+		goto error;
+	memset(newdev, 0, sizeof(struct uinput_device));
+
+	newinput = kmalloc(sizeof(struct input_dev), GFP_KERNEL);
+	if (!newinput)
+		goto cleanup;
+	memset(newinput, 0, sizeof(struct input_dev));
+
+	newdev->dev = newinput;
+	
+	file->private_data = newdev;
+
+	return 0;
+cleanup:
+	kfree(newdev);
+error:
+	return -ENOMEM;
+}
+
+static int uinput_validate_absbits(struct input_dev *dev)
+{
+	unsigned int cnt;
+	int retval = 0;
+	
+	for (cnt = 0; cnt < ABS_MAX; cnt++) {
+		if (!test_bit(cnt, dev->absbit)) 
+			continue;
+		
+		if (/*!dev->absmin[cnt] || !dev->absmax[cnt] || */
+		    (dev->absmax[cnt] <= dev->absmin[cnt])) {
+			printk(KERN_DEBUG 
+				"%s: invalid abs[%02x] min:%d max:%d\n",
+				UINPUT_NAME, cnt, 
+				dev->absmin[cnt], dev->absmax[cnt]);
+			retval = -EINVAL;
+			break;
+		}
+
+		if ((dev->absflat[cnt] < dev->absmin[cnt]) ||
+		    (dev->absflat[cnt] > dev->absmax[cnt])) {
+			printk(KERN_DEBUG 
+				"%s: absflat[%02x] out of range: %d "
+				"(min:%d/max:%d)\n",
+				UINPUT_NAME, cnt, dev->absflat[cnt],
+				dev->absmin[cnt], dev->absmax[cnt]);
+			retval = -EINVAL;
+			break;
+		}
+	}
+	return retval;
+}
+
+static int uinput_alloc_device(struct file *file, const char *buffer, size_t count)
+{
+	struct uinput_user_dev	*user_dev;
+	struct input_dev	*dev;
+	struct uinput_device	*udev;
+	int			size,
+				retval;
+
+	retval = count;
+
+	udev = (struct uinput_device *)file->private_data;
+	dev = udev->dev;
+
+	user_dev = kmalloc(sizeof(*user_dev), GFP_KERNEL);
+	if (!user_dev) {
+		retval = -ENOMEM;
+		goto exit;
+	}
+
+	if (copy_from_user(user_dev, buffer, sizeof(struct uinput_user_dev))) {
+		retval = -EFAULT;
+		goto exit;
+	}
+
+	if (NULL != dev->name) 
+		kfree(dev->name);
+
+	size = strnlen(user_dev->name, UINPUT_MAX_NAME_SIZE) + 1;
+	dev->name = kmalloc(size, GFP_KERNEL);
+	if (!dev->name) {
+		retval = -ENOMEM;
+		goto exit;
+	}
+
+	strncpy(dev->name, user_dev->name, size);
+	dev->idbus	= user_dev->idbus;
+	dev->idvendor	= user_dev->idvendor;
+	dev->idproduct	= user_dev->idproduct;
+	dev->idversion	= user_dev->idversion;
+	dev->ff_effects_max = user_dev->ff_effects_max;
+
+	size = sizeof(int) * (ABS_MAX + 1);
+	memcpy(dev->absmax, user_dev->absmax, size);
+	memcpy(dev->absmin, user_dev->absmin, size);
+	memcpy(dev->absfuzz, user_dev->absfuzz, size);
+	memcpy(dev->absflat, user_dev->absflat, size);
+
+	/* check if absmin/absmax/absfuzz/absflat are filled as
+	 * told in Documentation/input/input-programming.txt */
+	if (test_bit(EV_ABS, dev->evbit)) {
+		retval = uinput_validate_absbits(dev);
+		if (retval < 0)
+			kfree(dev->name);
+	}
+
+exit:
+	kfree(user_dev);
+	return retval;
+}
+
+static ssize_t uinput_write(struct file *file, const char *buffer, size_t count, loff_t *ppos)
+{
+	struct uinput_device	*udev = file->private_data;
+	
+	if (test_bit(UIST_CREATED, &(udev->state))) {
+		struct input_event	ev;
+
+		if (copy_from_user(&ev, buffer, sizeof(struct input_event)))
+			return -EFAULT;
+		input_event(udev->dev, ev.type, ev.code, ev.value);
+	}
+	else
+		count = uinput_alloc_device(file, buffer, count);
+
+	return count;
+}
+
+static ssize_t uinput_read(struct file *file, char *buffer, size_t count, loff_t *ppos)
+{
+	struct uinput_device *udev = file->private_data;
+	int retval = 0;
+	
+	if (!test_bit(UIST_CREATED, &(udev->state)))
+		return -ENODEV;
+
+	if ((udev->head == udev->tail) && (file->f_flags & O_NONBLOCK))
+		return -EAGAIN;
+
+	retval = wait_event_interruptible(udev->waitq,
+			(udev->head != udev->tail) || 
+			!test_bit(UIST_CREATED, &(udev->state)));
+	
+	if (retval)
+		return retval;
+
+	if (!test_bit(UIST_CREATED, &(udev->state)))
+		return -ENODEV;
+
+	while ((udev->head != udev->tail) && 
+	    (retval + sizeof(struct input_event) <= count)) {
+		if (copy_to_user(buffer + retval, &(udev->buff[udev->tail]),
+		    sizeof(struct input_event))) return -EFAULT;
+		udev->tail = (udev->tail + 1) % UINPUT_BUFFER_SIZE;
+		retval += sizeof(struct input_event);
+	}
+
+	return retval;
+}
+
+static unsigned int uinput_poll(struct file *file, poll_table *wait)
+{
+	struct uinput_device *udev = file->private_data;
+
+	poll_wait(file, &udev->waitq, wait);
+
+	if (udev->head != udev->tail)
+		return POLLIN | POLLRDNORM;
+
+	return 0;			
+}
+
+static int uinput_burn_device(struct uinput_device *udev)
+{
+	if (test_bit(UIST_CREATED, &(udev->state)))
+		uinput_destroy_device(udev);
+
+	kfree(udev->dev);
+	kfree(udev);
+
+	return 0;
+}
+
+static int uinput_close(struct inode *inode, struct file *file)
+{
+	return uinput_burn_device((struct uinput_device *)file->private_data);
+}
+
+static int uinput_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
+{
+	int			retval = 0;
+	struct uinput_device	*udev;
+
+	udev = (struct uinput_device *)file->private_data;
+
+	/* device attributes can not be changed after the device is created */
+	if (cmd >= UI_SET_EVBIT && test_bit(UIST_CREATED, &(udev->state)))
+		return -EINVAL;
+
+	switch (cmd) {
+		case UI_DEV_CREATE:
+			retval = uinput_create_device(udev);
+			break;
+			
+		case UI_DEV_DESTROY:
+			retval = uinput_destroy_device(udev);
+			break;
+
+		case UI_SET_EVBIT:
+			if (arg > EV_MAX) {
+				retval = -EINVAL;
+				break;
+			}
+			set_bit(arg, udev->dev->evbit);
+			break;
+			
+		case UI_SET_KEYBIT:
+			if (arg > KEY_MAX) {
+				retval = -EINVAL;
+				break;
+			}
+			set_bit(arg, udev->dev->keybit);
+			break;
+			
+		case UI_SET_RELBIT:
+			if (arg > REL_MAX) {
+				retval = -EINVAL;
+				break;
+			}
+			set_bit(arg, udev->dev->relbit);
+			break;
+			
+		case UI_SET_ABSBIT:
+			if (arg > ABS_MAX) {
+				retval = -EINVAL;
+				break;
+			}
+			set_bit(arg, udev->dev->absbit);
+			break;
+			
+		case UI_SET_MSCBIT:
+			if (arg > MSC_MAX) {
+				retval = -EINVAL;
+				break;
+			}
+			set_bit(arg, udev->dev->mscbit);
+			break;
+			
+		case UI_SET_LEDBIT:
+			if (arg > LED_MAX) {
+				retval = -EINVAL;
+				break;
+			}
+			set_bit(arg, udev->dev->ledbit);
+			break;
+			
+		case UI_SET_SNDBIT:
+			if (arg > SND_MAX) {
+				retval = -EINVAL;
+				break;
+			}
+			set_bit(arg, udev->dev->sndbit);
+			break;
+			
+		case UI_SET_FFBIT:
+			if (arg > FF_MAX) {
+				retval = -EINVAL;
+				break;
+			}
+			set_bit(arg, udev->dev->ffbit);
+			break;
+			
+		default:
+			retval = -EFAULT;
+	}
+	return retval;
+}
+
+struct file_operations uinput_fops = {
+	owner:		THIS_MODULE,
+	open:		uinput_open,
+	release:	uinput_close,
+	read:		uinput_read,
+	write:		uinput_write,
+	poll:		uinput_poll,
+	ioctl:		uinput_ioctl,
+};
+
+static struct miscdevice uinput_misc = {
+	fops:		&uinput_fops,
+	minor:		UINPUT_MINOR,
+	name:		UINPUT_NAME,
+};
+
+static int __init uinput_init(void)
+{
+	return misc_register(&uinput_misc);
+}
+
+static void __exit uinput_exit(void)
+{
+	misc_deregister(&uinput_misc);
+}
+
+MODULE_AUTHOR("Aristeu Sergio Rozanski Filho");
+MODULE_DESCRIPTION("User level driver support for input subsystem");
+MODULE_LICENSE("GPL");
+
+module_init(uinput_init);
+module_exit(uinput_exit);
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/isdn/divert/divert_procfs.c linux-2.4.20-wolk4.16-fullkernel/drivers/isdn/divert/divert_procfs.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/isdn/divert/divert_procfs.c	2001-12-21 18:41:54.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/isdn/divert/divert_procfs.c	2004-09-05 16:06:00.000000000 +0200
@@ -80,6 +80,7 @@ static ssize_t
 isdn_divert_read(struct file *file, char *buf, size_t count, loff_t * off)
 {
 	struct divert_info *inf;
+	loff_t pos = *off;
 	int len;
 
 	if (!*((struct divert_info **) file->private_data)) {
@@ -95,7 +96,7 @@ isdn_divert_read(struct file *file, char
 	if ((len = strlen(inf->info_start)) <= count) {
 		if (copy_to_user(buf, inf->info_start, len))
 			return -EFAULT;
-		file->f_pos += len;
+		*off = pos + len;
 		return (len);
 	}
 	return (0);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/isdn/hisax/Makefile linux-2.4.20-wolk4.16-fullkernel/drivers/isdn/hisax/Makefile
--- linux-2.4.20-wolk4.15-fullkernel/drivers/isdn/hisax/Makefile	2002-11-29 00:53:13.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/isdn/hisax/Makefile	2004-09-05 16:06:35.000000000 +0200
@@ -66,9 +66,6 @@ obj-$(CONFIG_HISAX_AVM_A1_CS)		+= avma1_
 obj-$(CONFIG_HISAX_ST5481)		+= hisax_st5481.o
 obj-$(CONFIG_HISAX_FRITZ_PCIPNP)        += hisax_isac.o hisax_fcpcipnp.o
 
-CERT := $(shell md5sum -c md5sums.asc >> /dev/null;echo $$?)
-CFLAGS_cert.o := -DCERTIFICATION=$(CERT)
-
 include $(TOPDIR)/Rules.make
 
 # Link rules for multi-part drivers.
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/isdn/hisax/nj_s.c linux-2.4.20-wolk4.16-fullkernel/drivers/isdn/hisax/nj_s.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/isdn/hisax/nj_s.c	2004-06-29 11:25:20.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/isdn/hisax/nj_s.c	2004-09-05 16:06:31.000000000 +0200
@@ -123,6 +123,7 @@ NETjet_S_card_msg(struct IsdnCardState *
 			release_io_netjet(cs);
 			return(0);
 		case CARD_INIT:
+			reset_netjet_s(cs);
 			inittiger(cs);
 			clear_pending_isac_ints(cs);
 			initisac(cs);
@@ -245,7 +246,6 @@ setup_netjet_s(struct IsdnCard *card)
 	} else {
 		request_region(cs->hw.njet.base, bytecnt, "netjet-s isdn");
 	}
-	reset_netjet_s(cs);
 	cs->readisac  = &NETjet_ReadIC;
 	cs->writeisac = &NETjet_WriteIC;
 	cs->readisacfifo  = &NETjet_ReadICfifo;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/isdn/hysdn/hysdn_procconf.c linux-2.4.20-wolk4.16-fullkernel/drivers/isdn/hysdn/hysdn_procconf.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/isdn/hysdn/hysdn_procconf.c	2001-12-21 18:41:54.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/isdn/hysdn/hysdn_procconf.c	2004-09-05 16:06:00.000000000 +0200
@@ -212,29 +212,27 @@ hysdn_conf_write(struct file *file, cons
 static ssize_t
 hysdn_conf_read(struct file *file, char *buf, size_t count, loff_t * off)
 {
+	loff_t pos = *off;
 	char *cp;
 	int i;
 
 	if (off != &file->f_pos)	/* fs error check */
 		return -ESPIPE;
 
-	if (file->f_mode & FMODE_READ) {
-		if (!(cp = file->private_data))
-			return (-EFAULT);	/* should never happen */
-		i = strlen(cp);	/* get total string length */
-		if (*off < i) {
-			/* still bytes to transfer */
-			cp += *off;	/* point to desired data offset */
-			i -= *off;	/* remaining length */
-			if (i > count)
-				i = count;	/* limit length to transfer */
-			if (copy_to_user(buf, cp, i))
-				return (-EFAULT);	/* copy error */
-			*off += i;	/* adjust offset */
-		} else
-			return (0);
+	if (!(cp = file->private_data))
+		return (-EFAULT);	/* should never happen */
+	i = strlen(cp);	/* get total string length */
+	if (pos == (unsigned)pos && pos < i) {
+		/* still bytes to transfer */
+		cp += pos;	/* point to desired data offset */
+		i -= pos;	/* remaining length */
+		if (i > count)
+			i = count;	/* limit length to transfer */
+		if (copy_to_user(buf, cp, i))
+			return (-EFAULT);	/* copy error */
+		*off = pos + i;	/* adjust offset */
 	} else
-		return (-EPERM);	/* no permission to read */
+		return (0);
 
 	return (i);
 }				/* hysdn_conf_read */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/isdn/hysdn/hysdn_proclog.c linux-2.4.20-wolk4.16-fullkernel/drivers/isdn/hysdn/hysdn_proclog.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/isdn/hysdn/hysdn_proclog.c	2001-12-21 18:41:54.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/isdn/hysdn/hysdn_proclog.c	2004-09-05 16:06:00.000000000 +0200
@@ -210,6 +210,7 @@ hysdn_log_read(struct file *file, char *
 	word ino;
 	struct procdata *pd = NULL;
 	hysdn_card *card;
+	loff_t pos = *off;
 
 	if (!*((struct log_data **) file->private_data)) {
 		if (file->f_flags & O_NONBLOCK)
@@ -238,7 +239,7 @@ hysdn_log_read(struct file *file, char *
 	if ((len = strlen(inf->log_start)) <= count) {
 		if (copy_to_user(buf, inf->log_start, len))
 			return -EFAULT;
-		file->f_pos += len;
+		*off = pos + len;
 		return (len);
 	}
 	return (0);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/isdn/isdn_common.c linux-2.4.20-wolk4.16-fullkernel/drivers/isdn/isdn_common.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/isdn/isdn_common.c	2004-06-29 11:31:12.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/isdn/isdn_common.c	2004-09-05 16:06:00.000000000 +0200
@@ -1005,10 +1005,14 @@ isdn_read(struct file *file, char *buf, 
 	int chidx;
 	int retval;
 	char *p;
+	loff_t pos = *off;
 
 	if (off != &file->f_pos)
 		return -ESPIPE;
 
+	if (pos != (unsigned) pos)
+		return -EINVAL;
+
 	lock_kernel();
 	if (minor == ISDN_MINOR_STATUS) {
 		if (!file->private_data) {
@@ -1025,7 +1029,7 @@ isdn_read(struct file *file, char *buf, 
 				retval = -EFAULT;
 				goto out;
 			}
-			*off += len;
+			*off = pos + len;
 			retval = len;
 			goto out;
 		}
@@ -1056,7 +1060,7 @@ isdn_read(struct file *file, char *buf, 
 		cli();
 		len = isdn_readbchan(drvidx, chidx, p, 0, count,
 				     &dev->drv[drvidx]->rcv_waitq[chidx]);
-		*off += len;
+		*off = pos + len;
 		restore_flags(flags);
 		if (copy_to_user(buf,p,len)) 
 			len = -EFAULT;
@@ -1093,7 +1097,7 @@ isdn_read(struct file *file, char *buf, 
 		else
 			dev->drv[drvidx]->stavail = 0;
 		restore_flags(flags);
-		*off += len;
+		*off = pos + len;
 		retval = len;
 		goto out;
 	}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/macintosh/ans-lcd.c linux-2.4.20-wolk4.16-fullkernel/drivers/macintosh/ans-lcd.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/macintosh/ans-lcd.c	2002-02-25 20:37:58.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/macintosh/ans-lcd.c	2004-09-05 16:06:00.000000000 +0200
@@ -53,7 +53,6 @@ anslcd_write( struct file * file, const 
 				size_t count, loff_t *ppos )
 {
 	const char * p = buf;
-	int i;
 
 #ifdef DEBUG
 	printk(KERN_DEBUG "LCD: write\n");
@@ -61,13 +60,13 @@ anslcd_write( struct file * file, const 
 
 	if ( verify_area(VERIFY_READ, buf, count) )
 		return -EFAULT;
-	for ( i = *ppos; count > 0; ++i, ++p, --count ) 
-	{
+	while (count--) {
 		char c;
-		__get_user(c, p);
+		if (__get_user(c, p++))
+			return -EFAULT;
 		anslcd_write_byte_data( c );
 	}
-	*ppos = i;
+	*ppos = p - buf;
 	return p - buf;
 }
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/macintosh/nvram.c linux-2.4.20-wolk4.16-fullkernel/drivers/macintosh/nvram.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/macintosh/nvram.c	2001-10-15 22:43:24.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/macintosh/nvram.c	2004-09-05 16:06:01.000000000 +0200
@@ -37,14 +37,15 @@ static loff_t nvram_llseek(struct file *
 static ssize_t read_nvram(struct file *file, char *buf,
 			  size_t count, loff_t *ppos)
 {
-	unsigned int i;
+	loff_t n = *ppos;
+	unsigned int i = n;
 	char *p = buf;
 
 	if (verify_area(VERIFY_WRITE, buf, count))
 		return -EFAULT;
-	if (*ppos >= NVRAM_SIZE)
+	if (i != n || i >= NVRAM_SIZE)
 		return 0;
-	for (i = *ppos; count > 0 && i < NVRAM_SIZE; ++i, ++p, --count)
+	for (; count > 0 && i < NVRAM_SIZE; ++i, ++p, --count)
 		if (__put_user(nvram_read_byte(i), p))
 			return -EFAULT;
 	*ppos = i;
@@ -54,15 +55,16 @@ static ssize_t read_nvram(struct file *f
 static ssize_t write_nvram(struct file *file, const char *buf,
 			   size_t count, loff_t *ppos)
 {
-	unsigned int i;
+	loff_t n = *ppos;
+	unsigned int i = n;
 	const char *p = buf;
 	char c;
 
 	if (verify_area(VERIFY_READ, buf, count))
 		return -EFAULT;
-	if (*ppos >= NVRAM_SIZE)
+	if (i != n || i >= NVRAM_SIZE)
 		return 0;
-	for (i = *ppos; count > 0 && i < NVRAM_SIZE; ++i, ++p, --count) {
+	for (; count > 0 && i < NVRAM_SIZE; ++i, ++p, --count) {
 		if (__get_user(c, p))
 			return -EFAULT;
 		nvram_write_byte(c, i);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/md/lvm.c linux-2.4.20-wolk4.16-fullkernel/drivers/md/lvm.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/md/lvm.c	2004-06-29 11:24:16.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/md/lvm.c	2004-09-05 15:47:48.000000000 +0200
@@ -2912,6 +2912,10 @@ static int lvm_do_lv_status_byname(vg_t 
 			    (&lv_status_byname_req.lv->lv_current_pe,
 			     &saved_ptr1, sizeof(void *)) != 0)
 				return -EFAULT;
+			if (copy_to_user
+			    (&lv_status_byname_req.lv->lv_block_exception,
+			     &saved_ptr2, sizeof(void *)) != 0)
+				return -EFAULT;
 			return 0;
 		}
 	}
@@ -2980,6 +2984,10 @@ static int lvm_do_lv_status_byindex(vg_t
 	    (&lv_status_byindex_req.lv->lv_current_pe, &saved_ptr1,
 	     sizeof(void *)) != 0)
 		return -EFAULT;
+	if (copy_to_user
+	    (&lv_status_byindex_req.lv->lv_block_exception, &saved_ptr2,
+	     sizeof(void *)) != 0)
+		return -EFAULT;
 
 	return 0;
 }				/* lvm_do_lv_status_byindex() */
@@ -3052,6 +3060,10 @@ static int lvm_do_lv_status_bydev(vg_t *
 	    (&lv_status_bydev_req.lv->lv_current_pe, &saved_ptr1,
 	     sizeof(void *)) != 0)
 		return -EFAULT;
+	if (copy_to_user
+	    (&lv_status_bydev_req.lv->lv_block_exception, &saved_ptr2,
+	     sizeof(void *)) != 0)
+		return -EFAULT;
 
 	return 0;
 }				/* lvm_do_lv_status_bydev() */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/md/md.c linux-2.4.20-wolk4.16-fullkernel/drivers/md/md.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/md/md.c	2004-06-29 11:23:41.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/md/md.c	2004-09-05 16:09:18.000000000 +0200
@@ -494,7 +494,6 @@ static int sync_page_io(kdev_t dev, unsi
 	bh.b_page = page;
 	bh.b_reqnext = NULL;
 	bh.b_data = page_address(page);
-	bh.b_elv_sequence = 0;
 	generic_make_request(rw, &bh);
 
 	run_task_queue(&tq_disk);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/md/raid1.c linux-2.4.20-wolk4.16-fullkernel/drivers/md/raid1.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/md/raid1.c	2004-06-29 11:23:41.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/md/raid1.c	2004-09-05 16:09:18.000000000 +0200
@@ -697,7 +697,6 @@ static int raid1_make_request (mddev_t *
  		mbh->b_list       = BUF_LOCKED;
  		mbh->b_end_io     = raid1_end_request;
  		mbh->b_private    = r1_bh;
-		mbh->b_elv_sequence = bh->b_elv_sequence;
 
 		mbh->b_next = r1_bh->mirror_bh_list;
 		r1_bh->mirror_bh_list = mbh;
@@ -1467,7 +1466,6 @@ static int raid1_sync_request (mddev_t *
 	bh->b_private = r1_bh;
 	bh->b_blocknr = sector_nr;
 	bh->b_rsector = sector_nr;
-	bh->b_elv_sequence = 0;
 	init_waitqueue_head(&bh->b_wait);
 
 	generic_make_request(READ, bh);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/md/raid5.c linux-2.4.20-wolk4.16-fullkernel/drivers/md/raid5.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/md/raid5.c	2004-06-29 11:23:41.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/md/raid5.c	2004-09-05 16:09:18.000000000 +0200
@@ -151,7 +151,7 @@ static void shrink_buffers(struct stripe
 			return;
 		sh->bh_cache[i] = NULL;
 		free_page((unsigned long) bh->b_data);
-		kmem_cache_free(bh_cachep, bh);
+		kfree(bh);
 	}
 }
 
@@ -162,7 +162,7 @@ static int grow_buffers(struct stripe_he
 
 	for (i=0; i<num; i++) {
 		struct page *page;
-		bh = kmem_cache_alloc(bh_cachep, priority);
+		bh = kmalloc(sizeof(struct buffer_head), priority);
 		if (!bh)
 			return 1;
 		memset(bh, 0, sizeof (struct buffer_head));
@@ -170,7 +170,7 @@ static int grow_buffers(struct stripe_he
 		if ((page = alloc_page(priority)))
 			bh->b_data = page_address(page);
 		else {
-			kmem_cache_free(bh_cachep, bh);
+			kfree(bh);
 			return 1;
 		}
 		atomic_set(&bh->b_count, 0);
@@ -488,7 +488,6 @@ static struct buffer_head *raid5_build_b
 	bh->b_state	= (1 << BH_Req) | (1 << BH_Mapped);
 	bh->b_size	= sh->size;
 	bh->b_list	= BUF_LOCKED;
-	bh->b_elv_sequence = 0;
 	return bh;
 }
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/misc/Makefile linux-2.4.20-wolk4.16-fullkernel/drivers/misc/Makefile
--- linux-2.4.20-wolk4.15-fullkernel/drivers/misc/Makefile	2004-06-29 11:31:54.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/misc/Makefile	2004-09-09 12:48:49.000000000 +0200
@@ -15,26 +15,28 @@
 O_TARGET := misc.o
 
 ifeq ($(CONFIG_BLK_DEV_LOOP_AES),y)
-AES_PENTIUM_ASM=n
+AES_X86_ASM=n
 ifeq ($(CONFIG_X86),y)
 ifneq ($(CONFIG_X86_64),y)
-ifneq ($(CONFIG_M386),y)
-ifneq ($(CONFIG_M486),y)
-  AES_PENTIUM_ASM=y
+  AES_X86_ASM=y
 endif
 endif
-endif
-endif
-ifeq ($(AES_PENTIUM_ASM),y)
+ifeq ($(AES_X86_ASM),y)
   export-objs += crypto-ksym.o
-  obj-y       += aes-i586.o md5-i586.o crypto-ksym.o
-  AFLAGS_aes-i586.o := -DUSE_UNDERLINE=1
+  obj-y       += aes-x86.o md5-x86.o crypto-ksym.o
+  AFLAGS_aes-x86.o := -DUSE_UNDERLINE=1
+else
+ifeq ($(CONFIG_X86_64),y)
+  export-objs += crypto-ksym.o
+  obj-y       += aes-amd64.o md5-amd64.o crypto-ksym.o
+  AFLAGS_aes-amd64.o := -DUSE_UNDERLINE=1
 else
   export-objs += crypto-ksym.o
   obj-y       += aes.o md5.o crypto-ksym.o
   CFLAGS_aes.o := -DDATA_ALWAYS_ALIGNED=1
 endif
 endif
+endif
 
 include $(TOPDIR)/Rules.make
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/misc/aes-amd64.S linux-2.4.20-wolk4.16-fullkernel/drivers/misc/aes-amd64.S
--- linux-2.4.20-wolk4.15-fullkernel/drivers/misc/aes-amd64.S	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/misc/aes-amd64.S	2004-09-09 12:48:49.000000000 +0200
@@ -0,0 +1,893 @@
+//
+// Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK.
+// All rights reserved.
+//
+// TERMS
+//
+//  Redistribution and use in source and binary forms, with or without
+//  modification, are permitted subject to the following conditions:
+//
+//  1. Redistributions of source code must retain the above copyright
+//     notice, this list of conditions and the following disclaimer.
+//
+//  2. Redistributions in binary form must reproduce the above copyright
+//     notice, this list of conditions and the following disclaimer in the
+//     documentation and/or other materials provided with the distribution.
+//
+//  3. The copyright holder's name must not be used to endorse or promote
+//     any products derived from this software without his specific prior
+//     written permission.
+//
+//  This software is provided 'as is' with no express or implied warranties
+//  of correctness or fitness for purpose.
+
+// Modified by Jari Ruusu,  December 24 2001
+//  - Converted syntax to GNU CPP/assembler syntax
+//  - C programming interface converted back to "old" API
+//  - Minor portability cleanups and speed optimizations
+
+// Modified by Jari Ruusu,  April 11 2002
+//  - Added above copyright and terms to resulting object code so that
+//    binary distributions can avoid legal trouble
+
+// Modified by Jari Ruusu,  June 12 2004
+//  - Converted 32 bit x86 code to 64 bit AMD64 code
+//  - Re-wrote encrypt and decrypt code from scratch
+
+// An AES (Rijndael) implementation for the AMD64. This version only
+// implements the standard AES block length (128 bits, 16 bytes). This code
+// does not preserve the rax, rcx, rdx, rsi, rdi or r8-r11 registers or the
+// artihmetic status flags. However, the rbx, rbp and r12-r15 registers are
+// preserved across calls.
+
+// void aes_set_key(aes_context *cx, const unsigned char key[], const int key_len, const int f)
+// void aes_encrypt(const aes_context *cx, const unsigned char in_blk[], unsigned char out_blk[])
+// void aes_decrypt(const aes_context *cx, const unsigned char in_blk[], unsigned char out_blk[])
+
+#if defined(USE_UNDERLINE)
+# define aes_set_key _aes_set_key
+# define aes_encrypt _aes_encrypt
+# define aes_decrypt _aes_decrypt
+#endif
+#if !defined(ALIGN64BYTES)
+# define ALIGN64BYTES 64
+#endif
+
+	.file	"aes-amd64.S"
+	.globl	aes_set_key
+	.globl	aes_encrypt
+	.globl	aes_decrypt
+
+	.section .rodata
+copyright:
+	.ascii "    \000"
+	.ascii "Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK.\000"
+	.ascii "All rights reserved.\000"
+	.ascii "    \000"
+	.ascii "TERMS\000"
+	.ascii "    \000"
+	.ascii " Redistribution and use in source and binary forms, with or without\000"
+	.ascii " modification, are permitted subject to the following conditions:\000"
+	.ascii "    \000"
+	.ascii " 1. Redistributions of source code must retain the above copyright\000"
+	.ascii "    notice, this list of conditions and the following disclaimer.\000"
+	.ascii "    \000"
+	.ascii " 2. Redistributions in binary form must reproduce the above copyright\000"
+	.ascii "    notice, this list of conditions and the following disclaimer in the\000"
+	.ascii "    documentation and/or other materials provided with the distribution.\000"
+	.ascii "    \000"
+	.ascii " 3. The copyright holder's name must not be used to endorse or promote\000"
+	.ascii "    any products derived from this software without his specific prior\000"
+	.ascii "    written permission.\000"
+	.ascii "    \000"
+	.ascii " This software is provided 'as is' with no express or implied warranties\000"
+	.ascii " of correctness or fitness for purpose.\000"
+	.ascii "    \000"
+
+#define tlen	1024	// length of each of 4 'xor' arrays (256 32-bit words)
+
+// offsets in context structure
+
+#define nkey	0	// key length, size 4
+#define nrnd	4	// number of rounds, size 4
+#define ekey	8	// encryption key schedule base address, size 256
+#define dkey	264	// decryption key schedule base address, size 256
+
+// This macro performs a forward encryption cycle. It is entered with
+// the first previous round column values in I1E, I2E, I3E and I4E and
+// exits with the final values OU1, OU2, OU3 and OU4 registers.
+
+#define fwd_rnd(p1,p2,I1E,I1B,I1H,I2E,I2B,I2H,I3E,I3B,I3R,I4E,I4B,I4R,OU1,OU2,OU3,OU4) \
+	movl	p2(%rbp),OU1		;\
+	movl	p2+4(%rbp),OU2		;\
+	movl	p2+8(%rbp),OU3		;\
+	movl	p2+12(%rbp),OU4		;\
+	movzbl	I1B,%edi		;\
+	movzbl	I2B,%esi		;\
+	movzbl	I3B,%r8d		;\
+	movzbl	I4B,%r13d		;\
+	shrl	$8,I3E			;\
+	shrl	$8,I4E			;\
+	xorl	p1(,%rdi,4),OU1		;\
+	xorl	p1(,%rsi,4),OU2		;\
+	xorl	p1(,%r8,4),OU3		;\
+	xorl	p1(,%r13,4),OU4		;\
+	movzbl	I2H,%esi		;\
+	movzbl	I3B,%r8d		;\
+	movzbl	I4B,%r13d		;\
+	movzbl	I1H,%edi		;\
+	shrl	$8,I3E			;\
+	shrl	$8,I4E			;\
+	xorl	p1+tlen(,%rsi,4),OU1	;\
+	xorl	p1+tlen(,%r8,4),OU2	;\
+	xorl	p1+tlen(,%r13,4),OU3	;\
+	xorl	p1+tlen(,%rdi,4),OU4	;\
+	shrl	$16,I1E			;\
+	shrl	$16,I2E			;\
+	movzbl	I3B,%r8d		;\
+	movzbl	I4B,%r13d		;\
+	movzbl	I1B,%edi		;\
+	movzbl	I2B,%esi		;\
+	xorl	p1+2*tlen(,%r8,4),OU1	;\
+	xorl	p1+2*tlen(,%r13,4),OU2	;\
+	xorl	p1+2*tlen(,%rdi,4),OU3	;\
+	xorl	p1+2*tlen(,%rsi,4),OU4	;\
+	shrl	$8,I4E			;\
+	movzbl	I1H,%edi		;\
+	movzbl	I2H,%esi		;\
+	shrl	$8,I3E			;\
+	xorl	p1+3*tlen(,I4R,4),OU1	;\
+	xorl	p1+3*tlen(,%rdi,4),OU2	;\
+	xorl	p1+3*tlen(,%rsi,4),OU3	;\
+	xorl	p1+3*tlen(,I3R,4),OU4
+
+// This macro performs an inverse encryption cycle. It is entered with
+// the first previous round column values in I1E, I2E, I3E and I4E and
+// exits with the final values OU1, OU2, OU3 and OU4 registers.
+
+#define inv_rnd(p1,p2,I1E,I1B,I1R,I2E,I2B,I2R,I3E,I3B,I3H,I4E,I4B,I4H,OU1,OU2,OU3,OU4) \
+	movl	p2+12(%rbp),OU4		;\
+	movl	p2+8(%rbp),OU3		;\
+	movl	p2+4(%rbp),OU2		;\
+	movl	p2(%rbp),OU1		;\
+	movzbl	I4B,%edi		;\
+	movzbl	I3B,%esi		;\
+	movzbl	I2B,%r8d		;\
+	movzbl	I1B,%r13d		;\
+	shrl	$8,I2E			;\
+	shrl	$8,I1E			;\
+	xorl	p1(,%rdi,4),OU4		;\
+	xorl	p1(,%rsi,4),OU3		;\
+	xorl	p1(,%r8,4),OU2		;\
+	xorl	p1(,%r13,4),OU1		;\
+	movzbl	I3H,%esi		;\
+	movzbl	I2B,%r8d		;\
+	movzbl	I1B,%r13d		;\
+	movzbl	I4H,%edi		;\
+	shrl	$8,I2E			;\
+	shrl	$8,I1E			;\
+	xorl	p1+tlen(,%rsi,4),OU4	;\
+	xorl	p1+tlen(,%r8,4),OU3	;\
+	xorl	p1+tlen(,%r13,4),OU2	;\
+	xorl	p1+tlen(,%rdi,4),OU1	;\
+	shrl	$16,I4E			;\
+	shrl	$16,I3E			;\
+	movzbl	I2B,%r8d		;\
+	movzbl	I1B,%r13d		;\
+	movzbl	I4B,%edi		;\
+	movzbl	I3B,%esi		;\
+	xorl	p1+2*tlen(,%r8,4),OU4	;\
+	xorl	p1+2*tlen(,%r13,4),OU3	;\
+	xorl	p1+2*tlen(,%rdi,4),OU2	;\
+	xorl	p1+2*tlen(,%rsi,4),OU1	;\
+	shrl	$8,I1E			;\
+	movzbl	I4H,%edi		;\
+	movzbl	I3H,%esi		;\
+	shrl	$8,I2E			;\
+	xorl	p1+3*tlen(,I1R,4),OU4	;\
+	xorl	p1+3*tlen(,%rdi,4),OU3	;\
+	xorl	p1+3*tlen(,%rsi,4),OU2	;\
+	xorl	p1+3*tlen(,I2R,4),OU1
+
+// AES (Rijndael) Encryption Subroutine
+
+// rdi = pointer to AES context
+// rsi = pointer to input plaintext bytes
+// rdx = pointer to output ciphertext bytes
+
+	.text
+	.align	ALIGN64BYTES
+aes_encrypt:
+	movl	(%rsi),%eax		// read in plaintext
+	movl	4(%rsi),%ecx
+	movl	8(%rsi),%r10d
+	movl	12(%rsi),%r11d
+
+	pushq	%rbp
+	leaq	ekey+16(%rdi),%rbp	// encryption key pointer
+	movq	%rdx,%r9		// pointer to out block
+	movl	nrnd(%rdi),%edx		// number of rounds
+	pushq	%rbx
+	pushq	%r13
+	pushq	%r14
+	pushq	%r15
+
+	xorl	-16(%rbp),%eax		// xor in first round key
+	xorl	-12(%rbp),%ecx
+	xorl	-8(%rbp),%r10d
+	xorl	-4(%rbp),%r11d
+
+	subl	$10,%edx
+	je	aes_15
+	addq	$32,%rbp
+	subl	$2,%edx
+	je	aes_13
+	addq	$32,%rbp
+
+	fwd_rnd(aes_ft_tab,-64,%eax,%al,%ah,%ecx,%cl,%ch,%r10d,%r10b,%r10,%r11d,%r11b,%r11,%ebx,%edx,%r14d,%r15d)
+	fwd_rnd(aes_ft_tab,-48,%ebx,%bl,%bh,%edx,%dl,%dh,%r14d,%r14b,%r14,%r15d,%r15b,%r15,%eax,%ecx,%r10d,%r11d)
+	jmp	aes_13
+	.align	ALIGN64BYTES
+aes_13:	fwd_rnd(aes_ft_tab,-32,%eax,%al,%ah,%ecx,%cl,%ch,%r10d,%r10b,%r10,%r11d,%r11b,%r11,%ebx,%edx,%r14d,%r15d)
+	fwd_rnd(aes_ft_tab,-16,%ebx,%bl,%bh,%edx,%dl,%dh,%r14d,%r14b,%r14,%r15d,%r15b,%r15,%eax,%ecx,%r10d,%r11d)
+	jmp	aes_15
+	.align	ALIGN64BYTES
+aes_15:	fwd_rnd(aes_ft_tab,0,  %eax,%al,%ah,%ecx,%cl,%ch,%r10d,%r10b,%r10,%r11d,%r11b,%r11,%ebx,%edx,%r14d,%r15d)
+	fwd_rnd(aes_ft_tab,16, %ebx,%bl,%bh,%edx,%dl,%dh,%r14d,%r14b,%r14,%r15d,%r15b,%r15,%eax,%ecx,%r10d,%r11d)
+	fwd_rnd(aes_ft_tab,32, %eax,%al,%ah,%ecx,%cl,%ch,%r10d,%r10b,%r10,%r11d,%r11b,%r11,%ebx,%edx,%r14d,%r15d)
+	fwd_rnd(aes_ft_tab,48, %ebx,%bl,%bh,%edx,%dl,%dh,%r14d,%r14b,%r14,%r15d,%r15b,%r15,%eax,%ecx,%r10d,%r11d)
+	fwd_rnd(aes_ft_tab,64, %eax,%al,%ah,%ecx,%cl,%ch,%r10d,%r10b,%r10,%r11d,%r11b,%r11,%ebx,%edx,%r14d,%r15d)
+	fwd_rnd(aes_ft_tab,80, %ebx,%bl,%bh,%edx,%dl,%dh,%r14d,%r14b,%r14,%r15d,%r15b,%r15,%eax,%ecx,%r10d,%r11d)
+	fwd_rnd(aes_ft_tab,96, %eax,%al,%ah,%ecx,%cl,%ch,%r10d,%r10b,%r10,%r11d,%r11b,%r11,%ebx,%edx,%r14d,%r15d)
+	fwd_rnd(aes_ft_tab,112,%ebx,%bl,%bh,%edx,%dl,%dh,%r14d,%r14b,%r14,%r15d,%r15b,%r15,%eax,%ecx,%r10d,%r11d)
+	fwd_rnd(aes_ft_tab,128,%eax,%al,%ah,%ecx,%cl,%ch,%r10d,%r10b,%r10,%r11d,%r11b,%r11,%ebx,%edx,%r14d,%r15d)
+	fwd_rnd(aes_fl_tab,144,%ebx,%bl,%bh,%edx,%dl,%dh,%r14d,%r14b,%r14,%r15d,%r15b,%r15,%eax,%ecx,%r10d,%r11d)
+
+	popq	%r15
+	popq	%r14
+	popq	%r13
+	popq	%rbx
+	popq	%rbp
+
+	movl	%eax,(%r9)		// move final values to the output array.
+	movl	%ecx,4(%r9)
+	movl	%r10d,8(%r9)
+	movl	%r11d,12(%r9)
+	ret
+
+// AES (Rijndael) Decryption Subroutine
+
+// rdi = pointer to AES context
+// rsi = pointer to input ciphertext bytes
+// rdx = pointer to output plaintext bytes
+
+	.align	ALIGN64BYTES
+aes_decrypt:
+	movl	12(%rsi),%eax		// read in ciphertext
+	movl	8(%rsi),%ecx
+	movl	4(%rsi),%r10d
+	movl	(%rsi),%r11d
+
+	pushq	%rbp
+	leaq	dkey+16(%rdi),%rbp	// decryption key pointer
+	movq	%rdx,%r9		// pointer to out block
+	movl	nrnd(%rdi),%edx		// number of rounds
+	pushq	%rbx
+	pushq	%r13
+	pushq	%r14
+	pushq	%r15
+
+	xorl	-4(%rbp),%eax		// xor in first round key
+	xorl	-8(%rbp),%ecx
+	xorl	-12(%rbp),%r10d
+	xorl	-16(%rbp),%r11d
+
+	subl	$10,%edx
+	je	aes_25
+	addq	$32,%rbp
+	subl	$2,%edx
+	je	aes_23
+	addq	$32,%rbp
+
+	inv_rnd(aes_it_tab,-64,%r11d,%r11b,%r11,%r10d,%r10b,%r10,%ecx,%cl,%ch,%eax,%al,%ah,%r15d,%r14d,%edx,%ebx)
+	inv_rnd(aes_it_tab,-48,%r15d,%r15b,%r15,%r14d,%r14b,%r14,%edx,%dl,%dh,%ebx,%bl,%bh,%r11d,%r10d,%ecx,%eax)
+	jmp	aes_23
+	.align	ALIGN64BYTES
+aes_23:	inv_rnd(aes_it_tab,-32,%r11d,%r11b,%r11,%r10d,%r10b,%r10,%ecx,%cl,%ch,%eax,%al,%ah,%r15d,%r14d,%edx,%ebx)
+	inv_rnd(aes_it_tab,-16,%r15d,%r15b,%r15,%r14d,%r14b,%r14,%edx,%dl,%dh,%ebx,%bl,%bh,%r11d,%r10d,%ecx,%eax)
+	jmp	aes_25
+	.align	ALIGN64BYTES
+aes_25:	inv_rnd(aes_it_tab,0,  %r11d,%r11b,%r11,%r10d,%r10b,%r10,%ecx,%cl,%ch,%eax,%al,%ah,%r15d,%r14d,%edx,%ebx)
+	inv_rnd(aes_it_tab,16, %r15d,%r15b,%r15,%r14d,%r14b,%r14,%edx,%dl,%dh,%ebx,%bl,%bh,%r11d,%r10d,%ecx,%eax)
+	inv_rnd(aes_it_tab,32, %r11d,%r11b,%r11,%r10d,%r10b,%r10,%ecx,%cl,%ch,%eax,%al,%ah,%r15d,%r14d,%edx,%ebx)
+	inv_rnd(aes_it_tab,48, %r15d,%r15b,%r15,%r14d,%r14b,%r14,%edx,%dl,%dh,%ebx,%bl,%bh,%r11d,%r10d,%ecx,%eax)
+	inv_rnd(aes_it_tab,64, %r11d,%r11b,%r11,%r10d,%r10b,%r10,%ecx,%cl,%ch,%eax,%al,%ah,%r15d,%r14d,%edx,%ebx)
+	inv_rnd(aes_it_tab,80, %r15d,%r15b,%r15,%r14d,%r14b,%r14,%edx,%dl,%dh,%ebx,%bl,%bh,%r11d,%r10d,%ecx,%eax)
+	inv_rnd(aes_it_tab,96, %r11d,%r11b,%r11,%r10d,%r10b,%r10,%ecx,%cl,%ch,%eax,%al,%ah,%r15d,%r14d,%edx,%ebx)
+	inv_rnd(aes_it_tab,112,%r15d,%r15b,%r15,%r14d,%r14b,%r14,%edx,%dl,%dh,%ebx,%bl,%bh,%r11d,%r10d,%ecx,%eax)
+	inv_rnd(aes_it_tab,128,%r11d,%r11b,%r11,%r10d,%r10b,%r10,%ecx,%cl,%ch,%eax,%al,%ah,%r15d,%r14d,%edx,%ebx)
+	inv_rnd(aes_il_tab,144,%r15d,%r15b,%r15,%r14d,%r14b,%r14,%edx,%dl,%dh,%ebx,%bl,%bh,%r11d,%r10d,%ecx,%eax)
+
+	popq	%r15
+	popq	%r14
+	popq	%r13
+	popq	%rbx
+	popq	%rbp
+
+	movl	%eax,12(%r9)		// move final values to the output array.
+	movl	%ecx,8(%r9)
+	movl	%r10d,4(%r9)
+	movl	%r11d,(%r9)
+	ret
+
+// AES (Rijndael) Key Schedule Subroutine
+
+// This macro performs a column mixing operation on an input 32-bit
+// word to give a 32-bit result. It uses each of the 4 bytes in the
+// the input column to index 4 different tables of 256 32-bit words
+// that are xored together to form the output value.
+
+#define mix_col(p1)			 \
+	movzbl	%bl,%ecx		;\
+	movl	p1(,%rcx,4),%eax	;\
+	movzbl	%bh,%ecx		;\
+	ror	$16,%ebx		;\
+	xorl	p1+tlen(,%rcx,4),%eax	;\
+	movzbl	%bl,%ecx		;\
+	xorl	p1+2*tlen(,%rcx,4),%eax	;\
+	movzbl	%bh,%ecx		;\
+	xorl	p1+3*tlen(,%rcx,4),%eax
+
+// Key Schedule Macros
+
+#define ksc4(p1)			 \
+	rol	$24,%ebx		;\
+	mix_col(aes_fl_tab)		;\
+	ror	$8,%ebx			;\
+	xorl	4*p1+aes_rcon_tab,%eax	;\
+	xorl	%eax,%esi		;\
+	xorl	%esi,%ebp		;\
+	movl	%esi,16*p1(%rdi)	;\
+	movl	%ebp,16*p1+4(%rdi)	;\
+	xorl	%ebp,%edx		;\
+	xorl	%edx,%ebx		;\
+	movl	%edx,16*p1+8(%rdi)	;\
+	movl	%ebx,16*p1+12(%rdi)
+
+#define ksc6(p1)			 \
+	rol	$24,%ebx		;\
+	mix_col(aes_fl_tab)		;\
+	ror	$8,%ebx			;\
+	xorl	4*p1+aes_rcon_tab,%eax	;\
+	xorl	24*p1-24(%rdi),%eax	;\
+	movl	%eax,24*p1(%rdi)	;\
+	xorl	24*p1-20(%rdi),%eax	;\
+	movl	%eax,24*p1+4(%rdi)	;\
+	xorl	%eax,%esi		;\
+	xorl	%esi,%ebp		;\
+	movl	%esi,24*p1+8(%rdi)	;\
+	movl	%ebp,24*p1+12(%rdi)	;\
+	xorl	%ebp,%edx		;\
+	xorl	%edx,%ebx		;\
+	movl	%edx,24*p1+16(%rdi)	;\
+	movl	%ebx,24*p1+20(%rdi)
+
+#define ksc8(p1)			 \
+	rol	$24,%ebx		;\
+	mix_col(aes_fl_tab)		;\
+	ror	$8,%ebx			;\
+	xorl	4*p1+aes_rcon_tab,%eax	;\
+	xorl	32*p1-32(%rdi),%eax	;\
+	movl	%eax,32*p1(%rdi)	;\
+	xorl	32*p1-28(%rdi),%eax	;\
+	movl	%eax,32*p1+4(%rdi)	;\
+	xorl	32*p1-24(%rdi),%eax	;\
+	movl	%eax,32*p1+8(%rdi)	;\
+	xorl	32*p1-20(%rdi),%eax	;\
+	movl	%eax,32*p1+12(%rdi)	;\
+	pushq	%rbx			;\
+	movl	%eax,%ebx		;\
+	mix_col(aes_fl_tab)		;\
+	popq	%rbx			;\
+	xorl	%eax,%esi		;\
+	xorl	%esi,%ebp		;\
+	movl	%esi,32*p1+16(%rdi)	;\
+	movl	%ebp,32*p1+20(%rdi)	;\
+	xorl	%ebp,%edx		;\
+	xorl	%edx,%ebx		;\
+	movl	%edx,32*p1+24(%rdi)	;\
+	movl	%ebx,32*p1+28(%rdi)
+
+// rdi = pointer to AES context
+// rsi = pointer to key bytes
+// rdx = key length, bytes or bits
+// rcx = ed_flag, 1=encrypt only, 0=both encrypt and decrypt
+
+	.align	ALIGN64BYTES
+aes_set_key:
+	pushfq
+	pushq	%rbp
+	pushq	%rbx
+
+	movq	%rcx,%r11		// ed_flg
+	movq	%rdx,%rcx		// key length
+	movq	%rdi,%r10		// AES context
+
+	cmpl	$128,%ecx
+	jb	aes_30
+	shrl	$3,%ecx
+aes_30:	cmpl	$32,%ecx
+	je	aes_32
+	cmpl	$24,%ecx
+	je	aes_32
+	movl	$16,%ecx
+aes_32:	shrl	$2,%ecx
+	movl	%ecx,nkey(%r10)
+	leaq	6(%rcx),%rax		// 10/12/14 for 4/6/8 32-bit key length
+	movl	%eax,nrnd(%r10)
+	leaq	ekey(%r10),%rdi		// key position in AES context
+	cld
+	movl	%ecx,%eax		// save key length in eax
+	rep ;	movsl			// words in the key schedule
+	movl	-4(%rsi),%ebx		// put some values in registers
+	movl	-8(%rsi),%edx		// to allow faster code
+	movl	-12(%rsi),%ebp
+	movl	-16(%rsi),%esi
+
+	cmpl	$4,%eax			// jump on key size
+	je	aes_36
+	cmpl	$6,%eax
+	je	aes_35
+
+	ksc8(0)
+	ksc8(1)
+	ksc8(2)
+	ksc8(3)
+	ksc8(4)
+	ksc8(5)
+	ksc8(6)
+	jmp	aes_37
+aes_35:	ksc6(0)
+	ksc6(1)
+	ksc6(2)
+	ksc6(3)
+	ksc6(4)
+	ksc6(5)
+	ksc6(6)
+	ksc6(7)
+	jmp	aes_37
+aes_36:	ksc4(0)
+	ksc4(1)
+	ksc4(2)
+	ksc4(3)
+	ksc4(4)
+	ksc4(5)
+	ksc4(6)
+	ksc4(7)
+	ksc4(8)
+	ksc4(9)
+aes_37:	cmpl	$0,%r11d		// ed_flg
+	jne	aes_39
+
+// compile decryption key schedule from encryption schedule - reverse
+// order and do mix_column operation on round keys except first and last
+
+	movl	nrnd(%r10),%eax		// kt = cx->d_key + nc * cx->Nrnd
+	shl	$2,%rax
+	leaq	dkey(%r10,%rax,4),%rdi
+	leaq	ekey(%r10),%rsi		// kf = cx->e_key
+
+	movsq				// copy first round key (unmodified)
+	movsq
+	subq	$32,%rdi
+	movl	$1,%r9d
+aes_38:					// do mix column on each column of
+	lodsl				// each round key
+	movl	%eax,%ebx
+	mix_col(aes_im_tab)
+	stosl
+	lodsl
+	movl	%eax,%ebx
+	mix_col(aes_im_tab)
+	stosl
+	lodsl
+	movl	%eax,%ebx
+	mix_col(aes_im_tab)
+	stosl
+	lodsl
+	movl	%eax,%ebx
+	mix_col(aes_im_tab)
+	stosl
+	subq	$32,%rdi
+
+	incl	%r9d
+	cmpl	nrnd(%r10),%r9d
+	jb	aes_38
+
+	movsq				// copy last round key (unmodified)
+	movsq
+aes_39:	popq	%rbx
+	popq	%rbp
+	popfq
+	ret
+
+
+// finite field multiplies by {02}, {04} and {08}
+
+#define f2(x)	((x<<1)^(((x>>7)&1)*0x11b))
+#define f4(x)	((x<<2)^(((x>>6)&1)*0x11b)^(((x>>6)&2)*0x11b))
+#define f8(x)	((x<<3)^(((x>>5)&1)*0x11b)^(((x>>5)&2)*0x11b)^(((x>>5)&4)*0x11b))
+
+// finite field multiplies required in table generation
+
+#define f3(x)	(f2(x) ^ x)
+#define f9(x)	(f8(x) ^ x)
+#define fb(x)	(f8(x) ^ f2(x) ^ x)
+#define fd(x)	(f8(x) ^ f4(x) ^ x)
+#define fe(x)	(f8(x) ^ f4(x) ^ f2(x))
+
+// These defines generate the forward table entries
+
+#define u0(x)	((f3(x) << 24) | (x << 16) | (x << 8) | f2(x))
+#define u1(x)	((x << 24) | (x << 16) | (f2(x) << 8) | f3(x))
+#define u2(x)	((x << 24) | (f2(x) << 16) | (f3(x) << 8) | x)
+#define u3(x)	((f2(x) << 24) | (f3(x) << 16) | (x << 8) | x)
+
+// These defines generate the inverse table entries
+
+#define v0(x)	((fb(x) << 24) | (fd(x) << 16) | (f9(x) << 8) | fe(x))
+#define v1(x)	((fd(x) << 24) | (f9(x) << 16) | (fe(x) << 8) | fb(x))
+#define v2(x)	((f9(x) << 24) | (fe(x) << 16) | (fb(x) << 8) | fd(x))
+#define v3(x)	((fe(x) << 24) | (fb(x) << 16) | (fd(x) << 8) | f9(x))
+
+// These defines generate entries for the last round tables
+
+#define w0(x)	(x)
+#define w1(x)	(x <<  8)
+#define w2(x)	(x << 16)
+#define w3(x)	(x << 24)
+
+// macro to generate inverse mix column tables (needed for the key schedule)
+
+#define im_data0(p1) \
+	.long	p1(0x00),p1(0x01),p1(0x02),p1(0x03),p1(0x04),p1(0x05),p1(0x06),p1(0x07) ;\
+	.long	p1(0x08),p1(0x09),p1(0x0a),p1(0x0b),p1(0x0c),p1(0x0d),p1(0x0e),p1(0x0f) ;\
+	.long	p1(0x10),p1(0x11),p1(0x12),p1(0x13),p1(0x14),p1(0x15),p1(0x16),p1(0x17) ;\
+	.long	p1(0x18),p1(0x19),p1(0x1a),p1(0x1b),p1(0x1c),p1(0x1d),p1(0x1e),p1(0x1f)
+#define im_data1(p1) \
+	.long	p1(0x20),p1(0x21),p1(0x22),p1(0x23),p1(0x24),p1(0x25),p1(0x26),p1(0x27) ;\
+	.long	p1(0x28),p1(0x29),p1(0x2a),p1(0x2b),p1(0x2c),p1(0x2d),p1(0x2e),p1(0x2f) ;\
+	.long	p1(0x30),p1(0x31),p1(0x32),p1(0x33),p1(0x34),p1(0x35),p1(0x36),p1(0x37) ;\
+	.long	p1(0x38),p1(0x39),p1(0x3a),p1(0x3b),p1(0x3c),p1(0x3d),p1(0x3e),p1(0x3f)
+#define im_data2(p1) \
+	.long	p1(0x40),p1(0x41),p1(0x42),p1(0x43),p1(0x44),p1(0x45),p1(0x46),p1(0x47) ;\
+	.long	p1(0x48),p1(0x49),p1(0x4a),p1(0x4b),p1(0x4c),p1(0x4d),p1(0x4e),p1(0x4f) ;\
+	.long	p1(0x50),p1(0x51),p1(0x52),p1(0x53),p1(0x54),p1(0x55),p1(0x56),p1(0x57) ;\
+	.long	p1(0x58),p1(0x59),p1(0x5a),p1(0x5b),p1(0x5c),p1(0x5d),p1(0x5e),p1(0x5f)
+#define im_data3(p1) \
+	.long	p1(0x60),p1(0x61),p1(0x62),p1(0x63),p1(0x64),p1(0x65),p1(0x66),p1(0x67) ;\
+	.long	p1(0x68),p1(0x69),p1(0x6a),p1(0x6b),p1(0x6c),p1(0x6d),p1(0x6e),p1(0x6f) ;\
+	.long	p1(0x70),p1(0x71),p1(0x72),p1(0x73),p1(0x74),p1(0x75),p1(0x76),p1(0x77) ;\
+	.long	p1(0x78),p1(0x79),p1(0x7a),p1(0x7b),p1(0x7c),p1(0x7d),p1(0x7e),p1(0x7f)
+#define im_data4(p1) \
+	.long	p1(0x80),p1(0x81),p1(0x82),p1(0x83),p1(0x84),p1(0x85),p1(0x86),p1(0x87) ;\
+	.long	p1(0x88),p1(0x89),p1(0x8a),p1(0x8b),p1(0x8c),p1(0x8d),p1(0x8e),p1(0x8f) ;\
+	.long	p1(0x90),p1(0x91),p1(0x92),p1(0x93),p1(0x94),p1(0x95),p1(0x96),p1(0x97) ;\
+	.long	p1(0x98),p1(0x99),p1(0x9a),p1(0x9b),p1(0x9c),p1(0x9d),p1(0x9e),p1(0x9f)
+#define im_data5(p1) \
+	.long	p1(0xa0),p1(0xa1),p1(0xa2),p1(0xa3),p1(0xa4),p1(0xa5),p1(0xa6),p1(0xa7) ;\
+	.long	p1(0xa8),p1(0xa9),p1(0xaa),p1(0xab),p1(0xac),p1(0xad),p1(0xae),p1(0xaf) ;\
+	.long	p1(0xb0),p1(0xb1),p1(0xb2),p1(0xb3),p1(0xb4),p1(0xb5),p1(0xb6),p1(0xb7) ;\
+	.long	p1(0xb8),p1(0xb9),p1(0xba),p1(0xbb),p1(0xbc),p1(0xbd),p1(0xbe),p1(0xbf)
+#define im_data6(p1) \
+	.long	p1(0xc0),p1(0xc1),p1(0xc2),p1(0xc3),p1(0xc4),p1(0xc5),p1(0xc6),p1(0xc7) ;\
+	.long	p1(0xc8),p1(0xc9),p1(0xca),p1(0xcb),p1(0xcc),p1(0xcd),p1(0xce),p1(0xcf) ;\
+	.long	p1(0xd0),p1(0xd1),p1(0xd2),p1(0xd3),p1(0xd4),p1(0xd5),p1(0xd6),p1(0xd7) ;\
+	.long	p1(0xd8),p1(0xd9),p1(0xda),p1(0xdb),p1(0xdc),p1(0xdd),p1(0xde),p1(0xdf)
+#define im_data7(p1) \
+	.long	p1(0xe0),p1(0xe1),p1(0xe2),p1(0xe3),p1(0xe4),p1(0xe5),p1(0xe6),p1(0xe7) ;\
+	.long	p1(0xe8),p1(0xe9),p1(0xea),p1(0xeb),p1(0xec),p1(0xed),p1(0xee),p1(0xef) ;\
+	.long	p1(0xf0),p1(0xf1),p1(0xf2),p1(0xf3),p1(0xf4),p1(0xf5),p1(0xf6),p1(0xf7) ;\
+	.long	p1(0xf8),p1(0xf9),p1(0xfa),p1(0xfb),p1(0xfc),p1(0xfd),p1(0xfe),p1(0xff)
+
+// S-box data - 256 entries
+
+#define sb_data0(p1) \
+	.long	p1(0x63),p1(0x7c),p1(0x77),p1(0x7b),p1(0xf2),p1(0x6b),p1(0x6f),p1(0xc5) ;\
+	.long	p1(0x30),p1(0x01),p1(0x67),p1(0x2b),p1(0xfe),p1(0xd7),p1(0xab),p1(0x76) ;\
+	.long	p1(0xca),p1(0x82),p1(0xc9),p1(0x7d),p1(0xfa),p1(0x59),p1(0x47),p1(0xf0) ;\
+	.long	p1(0xad),p1(0xd4),p1(0xa2),p1(0xaf),p1(0x9c),p1(0xa4),p1(0x72),p1(0xc0)
+#define sb_data1(p1) \
+	.long	p1(0xb7),p1(0xfd),p1(0x93),p1(0x26),p1(0x36),p1(0x3f),p1(0xf7),p1(0xcc) ;\
+	.long	p1(0x34),p1(0xa5),p1(0xe5),p1(0xf1),p1(0x71),p1(0xd8),p1(0x31),p1(0x15) ;\
+	.long	p1(0x04),p1(0xc7),p1(0x23),p1(0xc3),p1(0x18),p1(0x96),p1(0x05),p1(0x9a) ;\
+	.long	p1(0x07),p1(0x12),p1(0x80),p1(0xe2),p1(0xeb),p1(0x27),p1(0xb2),p1(0x75)
+#define sb_data2(p1) \
+	.long	p1(0x09),p1(0x83),p1(0x2c),p1(0x1a),p1(0x1b),p1(0x6e),p1(0x5a),p1(0xa0) ;\
+	.long	p1(0x52),p1(0x3b),p1(0xd6),p1(0xb3),p1(0x29),p1(0xe3),p1(0x2f),p1(0x84) ;\
+	.long	p1(0x53),p1(0xd1),p1(0x00),p1(0xed),p1(0x20),p1(0xfc),p1(0xb1),p1(0x5b) ;\
+	.long	p1(0x6a),p1(0xcb),p1(0xbe),p1(0x39),p1(0x4a),p1(0x4c),p1(0x58),p1(0xcf)
+#define sb_data3(p1) \
+	.long	p1(0xd0),p1(0xef),p1(0xaa),p1(0xfb),p1(0x43),p1(0x4d),p1(0x33),p1(0x85) ;\
+	.long	p1(0x45),p1(0xf9),p1(0x02),p1(0x7f),p1(0x50),p1(0x3c),p1(0x9f),p1(0xa8) ;\
+	.long	p1(0x51),p1(0xa3),p1(0x40),p1(0x8f),p1(0x92),p1(0x9d),p1(0x38),p1(0xf5) ;\
+	.long	p1(0xbc),p1(0xb6),p1(0xda),p1(0x21),p1(0x10),p1(0xff),p1(0xf3),p1(0xd2)
+#define sb_data4(p1) \
+	.long	p1(0xcd),p1(0x0c),p1(0x13),p1(0xec),p1(0x5f),p1(0x97),p1(0x44),p1(0x17) ;\
+	.long	p1(0xc4),p1(0xa7),p1(0x7e),p1(0x3d),p1(0x64),p1(0x5d),p1(0x19),p1(0x73) ;\
+	.long	p1(0x60),p1(0x81),p1(0x4f),p1(0xdc),p1(0x22),p1(0x2a),p1(0x90),p1(0x88) ;\
+	.long	p1(0x46),p1(0xee),p1(0xb8),p1(0x14),p1(0xde),p1(0x5e),p1(0x0b),p1(0xdb)
+#define sb_data5(p1) \
+	.long	p1(0xe0),p1(0x32),p1(0x3a),p1(0x0a),p1(0x49),p1(0x06),p1(0x24),p1(0x5c) ;\
+	.long	p1(0xc2),p1(0xd3),p1(0xac),p1(0x62),p1(0x91),p1(0x95),p1(0xe4),p1(0x79) ;\
+	.long	p1(0xe7),p1(0xc8),p1(0x37),p1(0x6d),p1(0x8d),p1(0xd5),p1(0x4e),p1(0xa9) ;\
+	.long	p1(0x6c),p1(0x56),p1(0xf4),p1(0xea),p1(0x65),p1(0x7a),p1(0xae),p1(0x08)
+#define sb_data6(p1) \
+	.long	p1(0xba),p1(0x78),p1(0x25),p1(0x2e),p1(0x1c),p1(0xa6),p1(0xb4),p1(0xc6) ;\
+	.long	p1(0xe8),p1(0xdd),p1(0x74),p1(0x1f),p1(0x4b),p1(0xbd),p1(0x8b),p1(0x8a) ;\
+	.long	p1(0x70),p1(0x3e),p1(0xb5),p1(0x66),p1(0x48),p1(0x03),p1(0xf6),p1(0x0e) ;\
+	.long	p1(0x61),p1(0x35),p1(0x57),p1(0xb9),p1(0x86),p1(0xc1),p1(0x1d),p1(0x9e)
+#define sb_data7(p1) \
+	.long	p1(0xe1),p1(0xf8),p1(0x98),p1(0x11),p1(0x69),p1(0xd9),p1(0x8e),p1(0x94) ;\
+	.long	p1(0x9b),p1(0x1e),p1(0x87),p1(0xe9),p1(0xce),p1(0x55),p1(0x28),p1(0xdf) ;\
+	.long	p1(0x8c),p1(0xa1),p1(0x89),p1(0x0d),p1(0xbf),p1(0xe6),p1(0x42),p1(0x68) ;\
+	.long	p1(0x41),p1(0x99),p1(0x2d),p1(0x0f),p1(0xb0),p1(0x54),p1(0xbb),p1(0x16)
+
+// Inverse S-box data - 256 entries
+
+#define ib_data0(p1) \
+	.long	p1(0x52),p1(0x09),p1(0x6a),p1(0xd5),p1(0x30),p1(0x36),p1(0xa5),p1(0x38) ;\
+	.long	p1(0xbf),p1(0x40),p1(0xa3),p1(0x9e),p1(0x81),p1(0xf3),p1(0xd7),p1(0xfb) ;\
+	.long	p1(0x7c),p1(0xe3),p1(0x39),p1(0x82),p1(0x9b),p1(0x2f),p1(0xff),p1(0x87) ;\
+	.long	p1(0x34),p1(0x8e),p1(0x43),p1(0x44),p1(0xc4),p1(0xde),p1(0xe9),p1(0xcb)
+#define ib_data1(p1) \
+	.long	p1(0x54),p1(0x7b),p1(0x94),p1(0x32),p1(0xa6),p1(0xc2),p1(0x23),p1(0x3d) ;\
+	.long	p1(0xee),p1(0x4c),p1(0x95),p1(0x0b),p1(0x42),p1(0xfa),p1(0xc3),p1(0x4e) ;\
+	.long	p1(0x08),p1(0x2e),p1(0xa1),p1(0x66),p1(0x28),p1(0xd9),p1(0x24),p1(0xb2) ;\
+	.long	p1(0x76),p1(0x5b),p1(0xa2),p1(0x49),p1(0x6d),p1(0x8b),p1(0xd1),p1(0x25)
+#define ib_data2(p1) \
+	.long	p1(0x72),p1(0xf8),p1(0xf6),p1(0x64),p1(0x86),p1(0x68),p1(0x98),p1(0x16) ;\
+	.long	p1(0xd4),p1(0xa4),p1(0x5c),p1(0xcc),p1(0x5d),p1(0x65),p1(0xb6),p1(0x92) ;\
+	.long	p1(0x6c),p1(0x70),p1(0x48),p1(0x50),p1(0xfd),p1(0xed),p1(0xb9),p1(0xda) ;\
+	.long	p1(0x5e),p1(0x15),p1(0x46),p1(0x57),p1(0xa7),p1(0x8d),p1(0x9d),p1(0x84)
+#define ib_data3(p1) \
+	.long	p1(0x90),p1(0xd8),p1(0xab),p1(0x00),p1(0x8c),p1(0xbc),p1(0xd3),p1(0x0a) ;\
+	.long	p1(0xf7),p1(0xe4),p1(0x58),p1(0x05),p1(0xb8),p1(0xb3),p1(0x45),p1(0x06) ;\
+	.long	p1(0xd0),p1(0x2c),p1(0x1e),p1(0x8f),p1(0xca),p1(0x3f),p1(0x0f),p1(0x02) ;\
+	.long	p1(0xc1),p1(0xaf),p1(0xbd),p1(0x03),p1(0x01),p1(0x13),p1(0x8a),p1(0x6b)
+#define ib_data4(p1) \
+	.long	p1(0x3a),p1(0x91),p1(0x11),p1(0x41),p1(0x4f),p1(0x67),p1(0xdc),p1(0xea) ;\
+	.long	p1(0x97),p1(0xf2),p1(0xcf),p1(0xce),p1(0xf0),p1(0xb4),p1(0xe6),p1(0x73) ;\
+	.long	p1(0x96),p1(0xac),p1(0x74),p1(0x22),p1(0xe7),p1(0xad),p1(0x35),p1(0x85) ;\
+	.long	p1(0xe2),p1(0xf9),p1(0x37),p1(0xe8),p1(0x1c),p1(0x75),p1(0xdf),p1(0x6e)
+#define ib_data5(p1) \
+	.long	p1(0x47),p1(0xf1),p1(0x1a),p1(0x71),p1(0x1d),p1(0x29),p1(0xc5),p1(0x89) ;\
+	.long	p1(0x6f),p1(0xb7),p1(0x62),p1(0x0e),p1(0xaa),p1(0x18),p1(0xbe),p1(0x1b) ;\
+	.long	p1(0xfc),p1(0x56),p1(0x3e),p1(0x4b),p1(0xc6),p1(0xd2),p1(0x79),p1(0x20) ;\
+	.long	p1(0x9a),p1(0xdb),p1(0xc0),p1(0xfe),p1(0x78),p1(0xcd),p1(0x5a),p1(0xf4)
+#define ib_data6(p1) \
+	.long	p1(0x1f),p1(0xdd),p1(0xa8),p1(0x33),p1(0x88),p1(0x07),p1(0xc7),p1(0x31) ;\
+	.long	p1(0xb1),p1(0x12),p1(0x10),p1(0x59),p1(0x27),p1(0x80),p1(0xec),p1(0x5f) ;\
+	.long	p1(0x60),p1(0x51),p1(0x7f),p1(0xa9),p1(0x19),p1(0xb5),p1(0x4a),p1(0x0d) ;\
+	.long	p1(0x2d),p1(0xe5),p1(0x7a),p1(0x9f),p1(0x93),p1(0xc9),p1(0x9c),p1(0xef)
+#define ib_data7(p1) \
+	.long	p1(0xa0),p1(0xe0),p1(0x3b),p1(0x4d),p1(0xae),p1(0x2a),p1(0xf5),p1(0xb0) ;\
+	.long	p1(0xc8),p1(0xeb),p1(0xbb),p1(0x3c),p1(0x83),p1(0x53),p1(0x99),p1(0x61) ;\
+	.long	p1(0x17),p1(0x2b),p1(0x04),p1(0x7e),p1(0xba),p1(0x77),p1(0xd6),p1(0x26) ;\
+	.long	p1(0xe1),p1(0x69),p1(0x14),p1(0x63),p1(0x55),p1(0x21),p1(0x0c),p1(0x7d)
+
+// The rcon_table (needed for the key schedule)
+//
+// Here is original Dr Brian Gladman's source code:
+//	_rcon_tab:
+//	%assign x   1
+//	%rep 29
+//	    dd  x
+//	%assign x f2(x)
+//	%endrep
+//
+// Here is precomputed output (it's more portable this way):
+
+	.section .rodata
+	.align	ALIGN64BYTES
+aes_rcon_tab:
+	.long	0x01,0x02,0x04,0x08,0x10,0x20,0x40,0x80
+	.long	0x1b,0x36,0x6c,0xd8,0xab,0x4d,0x9a,0x2f
+	.long	0x5e,0xbc,0x63,0xc6,0x97,0x35,0x6a,0xd4
+	.long	0xb3,0x7d,0xfa,0xef,0xc5
+
+// The forward xor tables
+
+	.align	ALIGN64BYTES
+aes_ft_tab:
+	sb_data0(u0)
+	sb_data1(u0)
+	sb_data2(u0)
+	sb_data3(u0)
+	sb_data4(u0)
+	sb_data5(u0)
+	sb_data6(u0)
+	sb_data7(u0)
+
+	sb_data0(u1)
+	sb_data1(u1)
+	sb_data2(u1)
+	sb_data3(u1)
+	sb_data4(u1)
+	sb_data5(u1)
+	sb_data6(u1)
+	sb_data7(u1)
+
+	sb_data0(u2)
+	sb_data1(u2)
+	sb_data2(u2)
+	sb_data3(u2)
+	sb_data4(u2)
+	sb_data5(u2)
+	sb_data6(u2)
+	sb_data7(u2)
+
+	sb_data0(u3)
+	sb_data1(u3)
+	sb_data2(u3)
+	sb_data3(u3)
+	sb_data4(u3)
+	sb_data5(u3)
+	sb_data6(u3)
+	sb_data7(u3)
+
+	.align	ALIGN64BYTES
+aes_fl_tab:
+	sb_data0(w0)
+	sb_data1(w0)
+	sb_data2(w0)
+	sb_data3(w0)
+	sb_data4(w0)
+	sb_data5(w0)
+	sb_data6(w0)
+	sb_data7(w0)
+
+	sb_data0(w1)
+	sb_data1(w1)
+	sb_data2(w1)
+	sb_data3(w1)
+	sb_data4(w1)
+	sb_data5(w1)
+	sb_data6(w1)
+	sb_data7(w1)
+
+	sb_data0(w2)
+	sb_data1(w2)
+	sb_data2(w2)
+	sb_data3(w2)
+	sb_data4(w2)
+	sb_data5(w2)
+	sb_data6(w2)
+	sb_data7(w2)
+
+	sb_data0(w3)
+	sb_data1(w3)
+	sb_data2(w3)
+	sb_data3(w3)
+	sb_data4(w3)
+	sb_data5(w3)
+	sb_data6(w3)
+	sb_data7(w3)
+
+// The inverse xor tables
+
+	.align	ALIGN64BYTES
+aes_it_tab:
+	ib_data0(v0)
+	ib_data1(v0)
+	ib_data2(v0)
+	ib_data3(v0)
+	ib_data4(v0)
+	ib_data5(v0)
+	ib_data6(v0)
+	ib_data7(v0)
+
+	ib_data0(v1)
+	ib_data1(v1)
+	ib_data2(v1)
+	ib_data3(v1)
+	ib_data4(v1)
+	ib_data5(v1)
+	ib_data6(v1)
+	ib_data7(v1)
+
+	ib_data0(v2)
+	ib_data1(v2)
+	ib_data2(v2)
+	ib_data3(v2)
+	ib_data4(v2)
+	ib_data5(v2)
+	ib_data6(v2)
+	ib_data7(v2)
+
+	ib_data0(v3)
+	ib_data1(v3)
+	ib_data2(v3)
+	ib_data3(v3)
+	ib_data4(v3)
+	ib_data5(v3)
+	ib_data6(v3)
+	ib_data7(v3)
+
+	.align	ALIGN64BYTES
+aes_il_tab:
+	ib_data0(w0)
+	ib_data1(w0)
+	ib_data2(w0)
+	ib_data3(w0)
+	ib_data4(w0)
+	ib_data5(w0)
+	ib_data6(w0)
+	ib_data7(w0)
+
+	ib_data0(w1)
+	ib_data1(w1)
+	ib_data2(w1)
+	ib_data3(w1)
+	ib_data4(w1)
+	ib_data5(w1)
+	ib_data6(w1)
+	ib_data7(w1)
+
+	ib_data0(w2)
+	ib_data1(w2)
+	ib_data2(w2)
+	ib_data3(w2)
+	ib_data4(w2)
+	ib_data5(w2)
+	ib_data6(w2)
+	ib_data7(w2)
+
+	ib_data0(w3)
+	ib_data1(w3)
+	ib_data2(w3)
+	ib_data3(w3)
+	ib_data4(w3)
+	ib_data5(w3)
+	ib_data6(w3)
+	ib_data7(w3)
+
+// The inverse mix column tables
+
+	.align	ALIGN64BYTES
+aes_im_tab:
+	im_data0(v0)
+	im_data1(v0)
+	im_data2(v0)
+	im_data3(v0)
+	im_data4(v0)
+	im_data5(v0)
+	im_data6(v0)
+	im_data7(v0)
+
+	im_data0(v1)
+	im_data1(v1)
+	im_data2(v1)
+	im_data3(v1)
+	im_data4(v1)
+	im_data5(v1)
+	im_data6(v1)
+	im_data7(v1)
+
+	im_data0(v2)
+	im_data1(v2)
+	im_data2(v2)
+	im_data3(v2)
+	im_data4(v2)
+	im_data5(v2)
+	im_data6(v2)
+	im_data7(v2)
+
+	im_data0(v3)
+	im_data1(v3)
+	im_data2(v3)
+	im_data3(v3)
+	im_data4(v3)
+	im_data5(v3)
+	im_data6(v3)
+	im_data7(v3)
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/misc/aes-i586.S linux-2.4.20-wolk4.16-fullkernel/drivers/misc/aes-i586.S
--- linux-2.4.20-wolk4.15-fullkernel/drivers/misc/aes-i586.S	2004-06-29 11:31:54.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/misc/aes-i586.S	1970-01-01 01:00:00.000000000 +0100
@@ -1,922 +0,0 @@
-//
-// Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK.
-// All rights reserved.
-//
-// TERMS
-//
-//  Redistribution and use in source and binary forms, with or without
-//  modification, are permitted subject to the following conditions:
-//
-//  1. Redistributions of source code must retain the above copyright
-//     notice, this list of conditions and the following disclaimer.
-//
-//  2. Redistributions in binary form must reproduce the above copyright
-//     notice, this list of conditions and the following disclaimer in the
-//     documentation and/or other materials provided with the distribution.
-//
-//  3. The copyright holder's name must not be used to endorse or promote
-//     any products derived from this software without his specific prior
-//     written permission.
-//
-//  This software is provided 'as is' with no express or implied warranties
-//  of correctness or fitness for purpose.
-
-// Modified by Jari Ruusu,  December 24 2001
-//  - Converted syntax to GNU CPP/assembler syntax
-//  - C programming interface converted back to "old" API
-//  - Minor portability cleanups and speed optimizations
-
-// Modified by Jari Ruusu,  April 11 2002
-//  - Added above copyright and terms to resulting object code so that
-//    binary distributions can avoid legal trouble
-
-// An AES (Rijndael) implementation for the Pentium. This version only
-// implements the standard AES block length (128 bits, 16 bytes). This code
-// does not preserve the eax, ecx or edx registers or the artihmetic status
-// flags. However, the ebx, esi, edi, and ebp registers are preserved across
-// calls.
-
-// void aes_set_key(aes_context *cx, const unsigned char key[], const int key_len, const int f)
-// void aes_encrypt(const aes_context *cx, const unsigned char in_blk[], unsigned char out_blk[])
-// void aes_decrypt(const aes_context *cx, const unsigned char in_blk[], unsigned char out_blk[])
-
-#if defined(USE_UNDERLINE)
-# define aes_set_key _aes_set_key
-# define aes_encrypt _aes_encrypt
-# define aes_decrypt _aes_decrypt
-#endif
-#if !defined(ALIGN32BYTES)
-# define ALIGN32BYTES 32
-#endif
-
-	.file	"aes-i586.S"
-	.globl	aes_set_key
-	.globl	aes_encrypt
-	.globl	aes_decrypt
-
-	.text
-copyright:
-	.ascii "    \000"
-	.ascii "Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK.\000"
-	.ascii "All rights reserved.\000"
-	.ascii "    \000"
-	.ascii "TERMS\000"
-	.ascii "    \000"
-	.ascii " Redistribution and use in source and binary forms, with or without\000"
-	.ascii " modification, are permitted subject to the following conditions:\000"
-	.ascii "    \000"
-	.ascii " 1. Redistributions of source code must retain the above copyright\000"
-	.ascii "    notice, this list of conditions and the following disclaimer.\000"
-	.ascii "    \000"
-	.ascii " 2. Redistributions in binary form must reproduce the above copyright\000"
-	.ascii "    notice, this list of conditions and the following disclaimer in the\000"
-	.ascii "    documentation and/or other materials provided with the distribution.\000"
-	.ascii "    \000"
-	.ascii " 3. The copyright holder's name must not be used to endorse or promote\000"
-	.ascii "    any products derived from this software without his specific prior\000"
-	.ascii "    written permission.\000"
-	.ascii "    \000"
-	.ascii " This software is provided 'as is' with no express or implied warranties\000"
-	.ascii " of correctness or fitness for purpose.\000"
-	.ascii "    \000"
-
-#define tlen	1024	// length of each of 4 'xor' arrays (256 32-bit words)
-
-// offsets to parameters with one register pushed onto stack
-
-#define ctx	8	// AES context structure
-#define in_blk	12	// input byte array address parameter
-#define out_blk	16	// output byte array address parameter
-
-// offsets in context structure
-
-#define nkey	0	// key length, size 4
-#define nrnd	4	// number of rounds, size 4
-#define ekey	8	// encryption key schedule base address, size 256
-#define dkey	264	// decryption key schedule base address, size 256
-
-// This macro performs a forward encryption cycle. It is entered with
-// the first previous round column values in %eax, %ebx, %esi and %edi and
-// exits with the final values in the same registers.
-
-#define fwd_rnd(p1,p2)			 \
-	mov	%ebx,(%esp)		;\
-	movzbl	%al,%edx		;\
-	mov	%eax,%ecx		;\
-	mov	p2(%ebp),%eax		;\
-	mov	%edi,4(%esp)		;\
-	mov	p2+12(%ebp),%edi	;\
-	xor	p1(,%edx,4),%eax	;\
-	movzbl	%ch,%edx		;\
-	shr	$16,%ecx		;\
-	mov	p2+4(%ebp),%ebx		;\
-	xor	p1+tlen(,%edx,4),%edi	;\
-	movzbl	%cl,%edx		;\
-	movzbl	%ch,%ecx		;\
-	xor	p1+3*tlen(,%ecx,4),%ebx	;\
-	mov	%esi,%ecx		;\
-	mov	p1+2*tlen(,%edx,4),%esi	;\
-	movzbl	%cl,%edx		;\
-	xor	p1(,%edx,4),%esi	;\
-	movzbl	%ch,%edx		;\
-	shr	$16,%ecx		;\
-	xor	p1+tlen(,%edx,4),%ebx	;\
-	movzbl	%cl,%edx		;\
-	movzbl	%ch,%ecx		;\
-	xor	p1+2*tlen(,%edx,4),%eax	;\
-	mov	(%esp),%edx		;\
-	xor	p1+3*tlen(,%ecx,4),%edi ;\
-	movzbl	%dl,%ecx		;\
-	xor	p2+8(%ebp),%esi		;\
-	xor	p1(,%ecx,4),%ebx	;\
-	movzbl	%dh,%ecx		;\
-	shr	$16,%edx		;\
-	xor	p1+tlen(,%ecx,4),%eax	;\
-	movzbl	%dl,%ecx		;\
-	movzbl	%dh,%edx		;\
-	xor	p1+2*tlen(,%ecx,4),%edi	;\
-	mov	4(%esp),%ecx		;\
-	xor	p1+3*tlen(,%edx,4),%esi ;\
-	movzbl	%cl,%edx		;\
-	xor	p1(,%edx,4),%edi	;\
-	movzbl	%ch,%edx		;\
-	shr	$16,%ecx		;\
-	xor	p1+tlen(,%edx,4),%esi	;\
-	movzbl	%cl,%edx		;\
-	movzbl	%ch,%ecx		;\
-	xor	p1+2*tlen(,%edx,4),%ebx	;\
-	xor	p1+3*tlen(,%ecx,4),%eax
-
-// This macro performs an inverse encryption cycle. It is entered with
-// the first previous round column values in %eax, %ebx, %esi and %edi and
-// exits with the final values in the same registers.
-
-#define inv_rnd(p1,p2)			 \
-	movzbl	%al,%edx		;\
-	mov	%ebx,(%esp)		;\
-	mov	%eax,%ecx		;\
-	mov	p2(%ebp),%eax		;\
-	mov	%edi,4(%esp)		;\
-	mov	p2+4(%ebp),%ebx		;\
-	xor	p1(,%edx,4),%eax	;\
-	movzbl	%ch,%edx		;\
-	shr	$16,%ecx		;\
-	mov	p2+12(%ebp),%edi	;\
-	xor	p1+tlen(,%edx,4),%ebx	;\
-	movzbl	%cl,%edx		;\
-	movzbl	%ch,%ecx		;\
-	xor	p1+3*tlen(,%ecx,4),%edi	;\
-	mov	%esi,%ecx		;\
-	mov	p1+2*tlen(,%edx,4),%esi	;\
-	movzbl	%cl,%edx		;\
-	xor	p1(,%edx,4),%esi	;\
-	movzbl	%ch,%edx		;\
-	shr	$16,%ecx		;\
-	xor	p1+tlen(,%edx,4),%edi	;\
-	movzbl	%cl,%edx		;\
-	movzbl	%ch,%ecx		;\
-	xor	p1+2*tlen(,%edx,4),%eax	;\
-	mov	(%esp),%edx		;\
-	xor	p1+3*tlen(,%ecx,4),%ebx ;\
-	movzbl	%dl,%ecx		;\
-	xor	p2+8(%ebp),%esi		;\
-	xor	p1(,%ecx,4),%ebx	;\
-	movzbl	%dh,%ecx		;\
-	shr	$16,%edx		;\
-	xor	p1+tlen(,%ecx,4),%esi	;\
-	movzbl	%dl,%ecx		;\
-	movzbl	%dh,%edx		;\
-	xor	p1+2*tlen(,%ecx,4),%edi	;\
-	mov	4(%esp),%ecx		;\
-	xor	p1+3*tlen(,%edx,4),%eax ;\
-	movzbl	%cl,%edx		;\
-	xor	p1(,%edx,4),%edi	;\
-	movzbl	%ch,%edx		;\
-	shr	$16,%ecx		;\
-	xor	p1+tlen(,%edx,4),%eax	;\
-	movzbl	%cl,%edx		;\
-	movzbl	%ch,%ecx		;\
-	xor	p1+2*tlen(,%edx,4),%ebx	;\
-	xor	p1+3*tlen(,%ecx,4),%esi
-
-// AES (Rijndael) Encryption Subroutine
-
-	.text
-	.align	ALIGN32BYTES
-aes_encrypt:
-	push	%ebp
-	mov	ctx(%esp),%ebp		// pointer to context
-	mov	in_blk(%esp),%ecx
-	push	%ebx
-	push	%esi
-	push	%edi
-	mov	nrnd(%ebp),%edx		// number of rounds
-	lea	ekey+16(%ebp),%ebp	// key pointer
-
-// input four columns and xor in first round key
-
-	mov	(%ecx),%eax
-	mov	4(%ecx),%ebx
-	mov	8(%ecx),%esi
-	mov	12(%ecx),%edi
-	xor	-16(%ebp),%eax
-	xor	-12(%ebp),%ebx
-	xor	-8(%ebp),%esi
-	xor	-4(%ebp),%edi
-
-	sub	$8,%esp			// space for register saves on stack
-
-	sub	$10,%edx
-	je	aes_15
-	add	$32,%ebp
-	sub	$2,%edx
-	je	aes_13
-	add	$32,%ebp
-
-	fwd_rnd(aes_ft_tab,-64)		// 14 rounds for 256-bit key
-	fwd_rnd(aes_ft_tab,-48)
-aes_13:	fwd_rnd(aes_ft_tab,-32)		// 12 rounds for 192-bit key
-	fwd_rnd(aes_ft_tab,-16)
-aes_15:	fwd_rnd(aes_ft_tab,0)		// 10 rounds for 128-bit key
-	fwd_rnd(aes_ft_tab,16)
-	fwd_rnd(aes_ft_tab,32)
-	fwd_rnd(aes_ft_tab,48)
-	fwd_rnd(aes_ft_tab,64)
-	fwd_rnd(aes_ft_tab,80)
-	fwd_rnd(aes_ft_tab,96)
-	fwd_rnd(aes_ft_tab,112)
-	fwd_rnd(aes_ft_tab,128)
-	fwd_rnd(aes_fl_tab,144)		// last round uses a different table
-
-// move final values to the output array.
-
-	mov	out_blk+20(%esp),%ebp
-	add	$8,%esp
-	mov	%eax,(%ebp)
-	mov	%ebx,4(%ebp)
-	mov	%esi,8(%ebp)
-	mov	%edi,12(%ebp)
-	pop	%edi
-	pop	%esi
-	pop	%ebx
-	pop	%ebp
-	ret
-
-
-// AES (Rijndael) Decryption Subroutine
-
-	.align	ALIGN32BYTES
-aes_decrypt:
-	push	%ebp
-	mov	ctx(%esp),%ebp		// pointer to context
-	mov	in_blk(%esp),%ecx
-	push	%ebx
-	push	%esi
-	push	%edi
-	mov	nrnd(%ebp),%edx		// number of rounds
-	lea	dkey+16(%ebp),%ebp	// key pointer
-
-// input four columns and xor in first round key
-
-	mov	(%ecx),%eax
-	mov	4(%ecx),%ebx
-	mov	8(%ecx),%esi
-	mov	12(%ecx),%edi
-	xor	-16(%ebp),%eax
-	xor	-12(%ebp),%ebx
-	xor	-8(%ebp),%esi
-	xor	-4(%ebp),%edi
-
-	sub	$8,%esp			// space for register saves on stack
-
-	sub	$10,%edx
-	je	aes_25
-	add	$32,%ebp
-	sub	$2,%edx
-	je	aes_23
-	add	$32,%ebp
-
-	inv_rnd(aes_it_tab,-64)		// 14 rounds for 256-bit key
-	inv_rnd(aes_it_tab,-48)
-aes_23:	inv_rnd(aes_it_tab,-32)		// 12 rounds for 192-bit key
-	inv_rnd(aes_it_tab,-16)
-aes_25:	inv_rnd(aes_it_tab,0)		// 10 rounds for 128-bit key
-	inv_rnd(aes_it_tab,16)
-	inv_rnd(aes_it_tab,32)
-	inv_rnd(aes_it_tab,48)
-	inv_rnd(aes_it_tab,64)
-	inv_rnd(aes_it_tab,80)
-	inv_rnd(aes_it_tab,96)
-	inv_rnd(aes_it_tab,112)
-	inv_rnd(aes_it_tab,128)
-	inv_rnd(aes_il_tab,144)		// last round uses a different table
-
-// move final values to the output array.
-
-	mov	out_blk+20(%esp),%ebp
-	add	$8,%esp
-	mov	%eax,(%ebp)
-	mov	%ebx,4(%ebp)
-	mov	%esi,8(%ebp)
-	mov	%edi,12(%ebp)
-	pop	%edi
-	pop	%esi
-	pop	%ebx
-	pop	%ebp
-	ret
-
-// AES (Rijndael) Key Schedule Subroutine
-
-// input/output parameters
-
-#define aes_cx	12	// AES context
-#define in_key	16	// key input array address
-#define key_ln	20	// key length, bytes (16,24,32) or bits (128,192,256)
-#define ed_flg	24	// 0=create both encr/decr keys, 1=create encr key only
-
-// offsets for locals
-
-#define cnt	-4
-#define kpf	-8
-#define slen	8
-
-// This macro performs a column mixing operation on an input 32-bit
-// word to give a 32-bit result. It uses each of the 4 bytes in the
-// the input column to index 4 different tables of 256 32-bit words
-// that are xored together to form the output value.
-
-#define mix_col(p1)			 \
-	movzbl	%bl,%ecx		;\
-	mov	p1(,%ecx,4),%eax	;\
-	movzbl	%bh,%ecx		;\
-	ror	$16,%ebx		;\
-	xor	p1+tlen(,%ecx,4),%eax	;\
-	movzbl	%bl,%ecx		;\
-	xor	p1+2*tlen(,%ecx,4),%eax	;\
-	movzbl	%bh,%ecx		;\
-	xor	p1+3*tlen(,%ecx,4),%eax
-
-// Key Schedule Macros
-
-#define ksc4(p1)			 \
-	rol	$24,%ebx		;\
-	mix_col(aes_fl_tab)		;\
-	ror	$8,%ebx			;\
-	xor	4*p1+aes_rcon_tab,%eax	;\
-	xor	%eax,%esi		;\
-	xor	%esi,%ebp		;\
-	mov	%esi,16*p1(%edi)	;\
-	mov	%ebp,16*p1+4(%edi)	;\
-	xor	%ebp,%edx		;\
-	xor	%edx,%ebx		;\
-	mov	%edx,16*p1+8(%edi)	;\
-	mov	%ebx,16*p1+12(%edi)
-
-#define ksc6(p1)			 \
-	rol	$24,%ebx		;\
-	mix_col(aes_fl_tab)		;\
-	ror	$8,%ebx			;\
-	xor	4*p1+aes_rcon_tab,%eax	;\
-	xor	24*p1-24(%edi),%eax	;\
-	mov	%eax,24*p1(%edi)	;\
-	xor	24*p1-20(%edi),%eax	;\
-	mov	%eax,24*p1+4(%edi)	;\
-	xor	%eax,%esi		;\
-	xor	%esi,%ebp		;\
-	mov	%esi,24*p1+8(%edi)	;\
-	mov	%ebp,24*p1+12(%edi)	;\
-	xor	%ebp,%edx		;\
-	xor	%edx,%ebx		;\
-	mov	%edx,24*p1+16(%edi)	;\
-	mov	%ebx,24*p1+20(%edi)
-
-#define ksc8(p1)			 \
-	rol	$24,%ebx		;\
-	mix_col(aes_fl_tab)		;\
-	ror	$8,%ebx			;\
-	xor	4*p1+aes_rcon_tab,%eax	;\
-	xor	32*p1-32(%edi),%eax	;\
-	mov	%eax,32*p1(%edi)	;\
-	xor	32*p1-28(%edi),%eax	;\
-	mov	%eax,32*p1+4(%edi)	;\
-	xor	32*p1-24(%edi),%eax	;\
-	mov	%eax,32*p1+8(%edi)	;\
-	xor	32*p1-20(%edi),%eax	;\
-	mov	%eax,32*p1+12(%edi)	;\
-	push	%ebx			;\
-	mov	%eax,%ebx		;\
-	mix_col(aes_fl_tab)		;\
-	pop	%ebx			;\
-	xor	%eax,%esi		;\
-	xor	%esi,%ebp		;\
-	mov	%esi,32*p1+16(%edi)	;\
-	mov	%ebp,32*p1+20(%edi)	;\
-	xor	%ebp,%edx		;\
-	xor	%edx,%ebx		;\
-	mov	%edx,32*p1+24(%edi)	;\
-	mov	%ebx,32*p1+28(%edi)
-
-	.align	ALIGN32BYTES
-aes_set_key:
-	pushfl
-	push	%ebp
-	mov	%esp,%ebp
-	sub	$slen,%esp
-	push	%ebx
-	push	%esi
-	push	%edi
-
-	mov	aes_cx(%ebp),%edx	// edx -> AES context
-
-	mov	key_ln(%ebp),%ecx	// key length
-	cmpl	$128,%ecx
-	jb	aes_30
-	shr	$3,%ecx
-aes_30:	cmpl	$32,%ecx
-	je	aes_32
-	cmpl	$24,%ecx
-	je	aes_32
-	mov	$16,%ecx
-aes_32:	shr	$2,%ecx
-	mov	%ecx,nkey(%edx)
-
-	lea	6(%ecx),%eax		// 10/12/14 for 4/6/8 32-bit key length
-	mov	%eax,nrnd(%edx)
-
-	mov	in_key(%ebp),%esi	// key input array
-	lea	ekey(%edx),%edi		// key position in AES context
-	cld
-	push	%ebp
-	mov	%ecx,%eax		// save key length in eax
-	rep ;	movsl			// words in the key schedule
-	mov	-4(%esi),%ebx		// put some values in registers
-	mov	-8(%esi),%edx		// to allow faster code
-	mov	-12(%esi),%ebp
-	mov	-16(%esi),%esi
-
-	cmpl	$4,%eax			// jump on key size
-	je	aes_36
-	cmpl	$6,%eax
-	je	aes_35
-
-	ksc8(0)
-	ksc8(1)
-	ksc8(2)
-	ksc8(3)
-	ksc8(4)
-	ksc8(5)
-	ksc8(6)
-	jmp	aes_37
-aes_35:	ksc6(0)
-	ksc6(1)
-	ksc6(2)
-	ksc6(3)
-	ksc6(4)
-	ksc6(5)
-	ksc6(6)
-	ksc6(7)
-	jmp	aes_37
-aes_36:	ksc4(0)
-	ksc4(1)
-	ksc4(2)
-	ksc4(3)
-	ksc4(4)
-	ksc4(5)
-	ksc4(6)
-	ksc4(7)
-	ksc4(8)
-	ksc4(9)
-aes_37:	pop	%ebp
-	mov	aes_cx(%ebp),%edx	// edx -> AES context
-	cmpl	$0,ed_flg(%ebp)
-	jne	aes_39
-
-// compile decryption key schedule from encryption schedule - reverse
-// order and do mix_column operation on round keys except first and last
-
-	mov	nrnd(%edx),%eax		// kt = cx->d_key + nc * cx->Nrnd
-	shl	$2,%eax
-	lea	dkey(%edx,%eax,4),%edi
-	lea	ekey(%edx),%esi		// kf = cx->e_key
-
-	movsl				// copy first round key (unmodified)
-	movsl
-	movsl
-	movsl
-	sub	$32,%edi
-	movl	$1,cnt(%ebp)
-aes_38:					// do mix column on each column of
-	lodsl				// each round key
-	mov	%eax,%ebx
-	mix_col(aes_im_tab)
-	stosl
-	lodsl
-	mov	%eax,%ebx
-	mix_col(aes_im_tab)
-	stosl
-	lodsl
-	mov	%eax,%ebx
-	mix_col(aes_im_tab)
-	stosl
-	lodsl
-	mov	%eax,%ebx
-	mix_col(aes_im_tab)
-	stosl
-	sub	$32,%edi
-
-	incl	cnt(%ebp)
-	mov	cnt(%ebp),%eax
-	cmp	nrnd(%edx),%eax
-	jb	aes_38
-
-	movsl				// copy last round key (unmodified)
-	movsl
-	movsl
-	movsl
-aes_39:	pop	%edi
-	pop	%esi
-	pop	%ebx
-	mov	%ebp,%esp
-	pop	%ebp
-	popfl
-	ret
-
-
-// finite field multiplies by {02}, {04} and {08}
-
-#define f2(x)	((x<<1)^(((x>>7)&1)*0x11b))
-#define f4(x)	((x<<2)^(((x>>6)&1)*0x11b)^(((x>>6)&2)*0x11b))
-#define f8(x)	((x<<3)^(((x>>5)&1)*0x11b)^(((x>>5)&2)*0x11b)^(((x>>5)&4)*0x11b))
-
-// finite field multiplies required in table generation
-
-#define f3(x)	(f2(x) ^ x)
-#define f9(x)	(f8(x) ^ x)
-#define fb(x)	(f8(x) ^ f2(x) ^ x)
-#define fd(x)	(f8(x) ^ f4(x) ^ x)
-#define fe(x)	(f8(x) ^ f4(x) ^ f2(x))
-
-// These defines generate the forward table entries
-
-#define u0(x)	((f3(x) << 24) | (x << 16) | (x << 8) | f2(x))
-#define u1(x)	((x << 24) | (x << 16) | (f2(x) << 8) | f3(x))
-#define u2(x)	((x << 24) | (f2(x) << 16) | (f3(x) << 8) | x)
-#define u3(x)	((f2(x) << 24) | (f3(x) << 16) | (x << 8) | x)
-
-// These defines generate the inverse table entries
-
-#define v0(x)	((fb(x) << 24) | (fd(x) << 16) | (f9(x) << 8) | fe(x))
-#define v1(x)	((fd(x) << 24) | (f9(x) << 16) | (fe(x) << 8) | fb(x))
-#define v2(x)	((f9(x) << 24) | (fe(x) << 16) | (fb(x) << 8) | fd(x))
-#define v3(x)	((fe(x) << 24) | (fb(x) << 16) | (fd(x) << 8) | f9(x))
-
-// These defines generate entries for the last round tables
-
-#define w0(x)	(x)
-#define w1(x)	(x <<  8)
-#define w2(x)	(x << 16)
-#define w3(x)	(x << 24)
-
-// macro to generate inverse mix column tables (needed for the key schedule)
-
-#define im_data0(p1) \
-	.long	p1(0x00),p1(0x01),p1(0x02),p1(0x03),p1(0x04),p1(0x05),p1(0x06),p1(0x07) ;\
-	.long	p1(0x08),p1(0x09),p1(0x0a),p1(0x0b),p1(0x0c),p1(0x0d),p1(0x0e),p1(0x0f) ;\
-	.long	p1(0x10),p1(0x11),p1(0x12),p1(0x13),p1(0x14),p1(0x15),p1(0x16),p1(0x17) ;\
-	.long	p1(0x18),p1(0x19),p1(0x1a),p1(0x1b),p1(0x1c),p1(0x1d),p1(0x1e),p1(0x1f)
-#define im_data1(p1) \
-	.long	p1(0x20),p1(0x21),p1(0x22),p1(0x23),p1(0x24),p1(0x25),p1(0x26),p1(0x27) ;\
-	.long	p1(0x28),p1(0x29),p1(0x2a),p1(0x2b),p1(0x2c),p1(0x2d),p1(0x2e),p1(0x2f) ;\
-	.long	p1(0x30),p1(0x31),p1(0x32),p1(0x33),p1(0x34),p1(0x35),p1(0x36),p1(0x37) ;\
-	.long	p1(0x38),p1(0x39),p1(0x3a),p1(0x3b),p1(0x3c),p1(0x3d),p1(0x3e),p1(0x3f)
-#define im_data2(p1) \
-	.long	p1(0x40),p1(0x41),p1(0x42),p1(0x43),p1(0x44),p1(0x45),p1(0x46),p1(0x47) ;\
-	.long	p1(0x48),p1(0x49),p1(0x4a),p1(0x4b),p1(0x4c),p1(0x4d),p1(0x4e),p1(0x4f) ;\
-	.long	p1(0x50),p1(0x51),p1(0x52),p1(0x53),p1(0x54),p1(0x55),p1(0x56),p1(0x57) ;\
-	.long	p1(0x58),p1(0x59),p1(0x5a),p1(0x5b),p1(0x5c),p1(0x5d),p1(0x5e),p1(0x5f)
-#define im_data3(p1) \
-	.long	p1(0x60),p1(0x61),p1(0x62),p1(0x63),p1(0x64),p1(0x65),p1(0x66),p1(0x67) ;\
-	.long	p1(0x68),p1(0x69),p1(0x6a),p1(0x6b),p1(0x6c),p1(0x6d),p1(0x6e),p1(0x6f) ;\
-	.long	p1(0x70),p1(0x71),p1(0x72),p1(0x73),p1(0x74),p1(0x75),p1(0x76),p1(0x77) ;\
-	.long	p1(0x78),p1(0x79),p1(0x7a),p1(0x7b),p1(0x7c),p1(0x7d),p1(0x7e),p1(0x7f)
-#define im_data4(p1) \
-	.long	p1(0x80),p1(0x81),p1(0x82),p1(0x83),p1(0x84),p1(0x85),p1(0x86),p1(0x87) ;\
-	.long	p1(0x88),p1(0x89),p1(0x8a),p1(0x8b),p1(0x8c),p1(0x8d),p1(0x8e),p1(0x8f) ;\
-	.long	p1(0x90),p1(0x91),p1(0x92),p1(0x93),p1(0x94),p1(0x95),p1(0x96),p1(0x97) ;\
-	.long	p1(0x98),p1(0x99),p1(0x9a),p1(0x9b),p1(0x9c),p1(0x9d),p1(0x9e),p1(0x9f)
-#define im_data5(p1) \
-	.long	p1(0xa0),p1(0xa1),p1(0xa2),p1(0xa3),p1(0xa4),p1(0xa5),p1(0xa6),p1(0xa7) ;\
-	.long	p1(0xa8),p1(0xa9),p1(0xaa),p1(0xab),p1(0xac),p1(0xad),p1(0xae),p1(0xaf) ;\
-	.long	p1(0xb0),p1(0xb1),p1(0xb2),p1(0xb3),p1(0xb4),p1(0xb5),p1(0xb6),p1(0xb7) ;\
-	.long	p1(0xb8),p1(0xb9),p1(0xba),p1(0xbb),p1(0xbc),p1(0xbd),p1(0xbe),p1(0xbf)
-#define im_data6(p1) \
-	.long	p1(0xc0),p1(0xc1),p1(0xc2),p1(0xc3),p1(0xc4),p1(0xc5),p1(0xc6),p1(0xc7) ;\
-	.long	p1(0xc8),p1(0xc9),p1(0xca),p1(0xcb),p1(0xcc),p1(0xcd),p1(0xce),p1(0xcf) ;\
-	.long	p1(0xd0),p1(0xd1),p1(0xd2),p1(0xd3),p1(0xd4),p1(0xd5),p1(0xd6),p1(0xd7) ;\
-	.long	p1(0xd8),p1(0xd9),p1(0xda),p1(0xdb),p1(0xdc),p1(0xdd),p1(0xde),p1(0xdf)
-#define im_data7(p1) \
-	.long	p1(0xe0),p1(0xe1),p1(0xe2),p1(0xe3),p1(0xe4),p1(0xe5),p1(0xe6),p1(0xe7) ;\
-	.long	p1(0xe8),p1(0xe9),p1(0xea),p1(0xeb),p1(0xec),p1(0xed),p1(0xee),p1(0xef) ;\
-	.long	p1(0xf0),p1(0xf1),p1(0xf2),p1(0xf3),p1(0xf4),p1(0xf5),p1(0xf6),p1(0xf7) ;\
-	.long	p1(0xf8),p1(0xf9),p1(0xfa),p1(0xfb),p1(0xfc),p1(0xfd),p1(0xfe),p1(0xff)
-
-// S-box data - 256 entries
-
-#define sb_data0(p1) \
-	.long	p1(0x63),p1(0x7c),p1(0x77),p1(0x7b),p1(0xf2),p1(0x6b),p1(0x6f),p1(0xc5) ;\
-	.long	p1(0x30),p1(0x01),p1(0x67),p1(0x2b),p1(0xfe),p1(0xd7),p1(0xab),p1(0x76) ;\
-	.long	p1(0xca),p1(0x82),p1(0xc9),p1(0x7d),p1(0xfa),p1(0x59),p1(0x47),p1(0xf0) ;\
-	.long	p1(0xad),p1(0xd4),p1(0xa2),p1(0xaf),p1(0x9c),p1(0xa4),p1(0x72),p1(0xc0)
-#define sb_data1(p1) \
-	.long	p1(0xb7),p1(0xfd),p1(0x93),p1(0x26),p1(0x36),p1(0x3f),p1(0xf7),p1(0xcc) ;\
-	.long	p1(0x34),p1(0xa5),p1(0xe5),p1(0xf1),p1(0x71),p1(0xd8),p1(0x31),p1(0x15) ;\
-	.long	p1(0x04),p1(0xc7),p1(0x23),p1(0xc3),p1(0x18),p1(0x96),p1(0x05),p1(0x9a) ;\
-	.long	p1(0x07),p1(0x12),p1(0x80),p1(0xe2),p1(0xeb),p1(0x27),p1(0xb2),p1(0x75)
-#define sb_data2(p1) \
-	.long	p1(0x09),p1(0x83),p1(0x2c),p1(0x1a),p1(0x1b),p1(0x6e),p1(0x5a),p1(0xa0) ;\
-	.long	p1(0x52),p1(0x3b),p1(0xd6),p1(0xb3),p1(0x29),p1(0xe3),p1(0x2f),p1(0x84) ;\
-	.long	p1(0x53),p1(0xd1),p1(0x00),p1(0xed),p1(0x20),p1(0xfc),p1(0xb1),p1(0x5b) ;\
-	.long	p1(0x6a),p1(0xcb),p1(0xbe),p1(0x39),p1(0x4a),p1(0x4c),p1(0x58),p1(0xcf)
-#define sb_data3(p1) \
-	.long	p1(0xd0),p1(0xef),p1(0xaa),p1(0xfb),p1(0x43),p1(0x4d),p1(0x33),p1(0x85) ;\
-	.long	p1(0x45),p1(0xf9),p1(0x02),p1(0x7f),p1(0x50),p1(0x3c),p1(0x9f),p1(0xa8) ;\
-	.long	p1(0x51),p1(0xa3),p1(0x40),p1(0x8f),p1(0x92),p1(0x9d),p1(0x38),p1(0xf5) ;\
-	.long	p1(0xbc),p1(0xb6),p1(0xda),p1(0x21),p1(0x10),p1(0xff),p1(0xf3),p1(0xd2)
-#define sb_data4(p1) \
-	.long	p1(0xcd),p1(0x0c),p1(0x13),p1(0xec),p1(0x5f),p1(0x97),p1(0x44),p1(0x17) ;\
-	.long	p1(0xc4),p1(0xa7),p1(0x7e),p1(0x3d),p1(0x64),p1(0x5d),p1(0x19),p1(0x73) ;\
-	.long	p1(0x60),p1(0x81),p1(0x4f),p1(0xdc),p1(0x22),p1(0x2a),p1(0x90),p1(0x88) ;\
-	.long	p1(0x46),p1(0xee),p1(0xb8),p1(0x14),p1(0xde),p1(0x5e),p1(0x0b),p1(0xdb)
-#define sb_data5(p1) \
-	.long	p1(0xe0),p1(0x32),p1(0x3a),p1(0x0a),p1(0x49),p1(0x06),p1(0x24),p1(0x5c) ;\
-	.long	p1(0xc2),p1(0xd3),p1(0xac),p1(0x62),p1(0x91),p1(0x95),p1(0xe4),p1(0x79) ;\
-	.long	p1(0xe7),p1(0xc8),p1(0x37),p1(0x6d),p1(0x8d),p1(0xd5),p1(0x4e),p1(0xa9) ;\
-	.long	p1(0x6c),p1(0x56),p1(0xf4),p1(0xea),p1(0x65),p1(0x7a),p1(0xae),p1(0x08)
-#define sb_data6(p1) \
-	.long	p1(0xba),p1(0x78),p1(0x25),p1(0x2e),p1(0x1c),p1(0xa6),p1(0xb4),p1(0xc6) ;\
-	.long	p1(0xe8),p1(0xdd),p1(0x74),p1(0x1f),p1(0x4b),p1(0xbd),p1(0x8b),p1(0x8a) ;\
-	.long	p1(0x70),p1(0x3e),p1(0xb5),p1(0x66),p1(0x48),p1(0x03),p1(0xf6),p1(0x0e) ;\
-	.long	p1(0x61),p1(0x35),p1(0x57),p1(0xb9),p1(0x86),p1(0xc1),p1(0x1d),p1(0x9e)
-#define sb_data7(p1) \
-	.long	p1(0xe1),p1(0xf8),p1(0x98),p1(0x11),p1(0x69),p1(0xd9),p1(0x8e),p1(0x94) ;\
-	.long	p1(0x9b),p1(0x1e),p1(0x87),p1(0xe9),p1(0xce),p1(0x55),p1(0x28),p1(0xdf) ;\
-	.long	p1(0x8c),p1(0xa1),p1(0x89),p1(0x0d),p1(0xbf),p1(0xe6),p1(0x42),p1(0x68) ;\
-	.long	p1(0x41),p1(0x99),p1(0x2d),p1(0x0f),p1(0xb0),p1(0x54),p1(0xbb),p1(0x16)
-
-// Inverse S-box data - 256 entries
-
-#define ib_data0(p1) \
-	.long	p1(0x52),p1(0x09),p1(0x6a),p1(0xd5),p1(0x30),p1(0x36),p1(0xa5),p1(0x38) ;\
-	.long	p1(0xbf),p1(0x40),p1(0xa3),p1(0x9e),p1(0x81),p1(0xf3),p1(0xd7),p1(0xfb) ;\
-	.long	p1(0x7c),p1(0xe3),p1(0x39),p1(0x82),p1(0x9b),p1(0x2f),p1(0xff),p1(0x87) ;\
-	.long	p1(0x34),p1(0x8e),p1(0x43),p1(0x44),p1(0xc4),p1(0xde),p1(0xe9),p1(0xcb)
-#define ib_data1(p1) \
-	.long	p1(0x54),p1(0x7b),p1(0x94),p1(0x32),p1(0xa6),p1(0xc2),p1(0x23),p1(0x3d) ;\
-	.long	p1(0xee),p1(0x4c),p1(0x95),p1(0x0b),p1(0x42),p1(0xfa),p1(0xc3),p1(0x4e) ;\
-	.long	p1(0x08),p1(0x2e),p1(0xa1),p1(0x66),p1(0x28),p1(0xd9),p1(0x24),p1(0xb2) ;\
-	.long	p1(0x76),p1(0x5b),p1(0xa2),p1(0x49),p1(0x6d),p1(0x8b),p1(0xd1),p1(0x25)
-#define ib_data2(p1) \
-	.long	p1(0x72),p1(0xf8),p1(0xf6),p1(0x64),p1(0x86),p1(0x68),p1(0x98),p1(0x16) ;\
-	.long	p1(0xd4),p1(0xa4),p1(0x5c),p1(0xcc),p1(0x5d),p1(0x65),p1(0xb6),p1(0x92) ;\
-	.long	p1(0x6c),p1(0x70),p1(0x48),p1(0x50),p1(0xfd),p1(0xed),p1(0xb9),p1(0xda) ;\
-	.long	p1(0x5e),p1(0x15),p1(0x46),p1(0x57),p1(0xa7),p1(0x8d),p1(0x9d),p1(0x84)
-#define ib_data3(p1) \
-	.long	p1(0x90),p1(0xd8),p1(0xab),p1(0x00),p1(0x8c),p1(0xbc),p1(0xd3),p1(0x0a) ;\
-	.long	p1(0xf7),p1(0xe4),p1(0x58),p1(0x05),p1(0xb8),p1(0xb3),p1(0x45),p1(0x06) ;\
-	.long	p1(0xd0),p1(0x2c),p1(0x1e),p1(0x8f),p1(0xca),p1(0x3f),p1(0x0f),p1(0x02) ;\
-	.long	p1(0xc1),p1(0xaf),p1(0xbd),p1(0x03),p1(0x01),p1(0x13),p1(0x8a),p1(0x6b)
-#define ib_data4(p1) \
-	.long	p1(0x3a),p1(0x91),p1(0x11),p1(0x41),p1(0x4f),p1(0x67),p1(0xdc),p1(0xea) ;\
-	.long	p1(0x97),p1(0xf2),p1(0xcf),p1(0xce),p1(0xf0),p1(0xb4),p1(0xe6),p1(0x73) ;\
-	.long	p1(0x96),p1(0xac),p1(0x74),p1(0x22),p1(0xe7),p1(0xad),p1(0x35),p1(0x85) ;\
-	.long	p1(0xe2),p1(0xf9),p1(0x37),p1(0xe8),p1(0x1c),p1(0x75),p1(0xdf),p1(0x6e)
-#define ib_data5(p1) \
-	.long	p1(0x47),p1(0xf1),p1(0x1a),p1(0x71),p1(0x1d),p1(0x29),p1(0xc5),p1(0x89) ;\
-	.long	p1(0x6f),p1(0xb7),p1(0x62),p1(0x0e),p1(0xaa),p1(0x18),p1(0xbe),p1(0x1b) ;\
-	.long	p1(0xfc),p1(0x56),p1(0x3e),p1(0x4b),p1(0xc6),p1(0xd2),p1(0x79),p1(0x20) ;\
-	.long	p1(0x9a),p1(0xdb),p1(0xc0),p1(0xfe),p1(0x78),p1(0xcd),p1(0x5a),p1(0xf4)
-#define ib_data6(p1) \
-	.long	p1(0x1f),p1(0xdd),p1(0xa8),p1(0x33),p1(0x88),p1(0x07),p1(0xc7),p1(0x31) ;\
-	.long	p1(0xb1),p1(0x12),p1(0x10),p1(0x59),p1(0x27),p1(0x80),p1(0xec),p1(0x5f) ;\
-	.long	p1(0x60),p1(0x51),p1(0x7f),p1(0xa9),p1(0x19),p1(0xb5),p1(0x4a),p1(0x0d) ;\
-	.long	p1(0x2d),p1(0xe5),p1(0x7a),p1(0x9f),p1(0x93),p1(0xc9),p1(0x9c),p1(0xef)
-#define ib_data7(p1) \
-	.long	p1(0xa0),p1(0xe0),p1(0x3b),p1(0x4d),p1(0xae),p1(0x2a),p1(0xf5),p1(0xb0) ;\
-	.long	p1(0xc8),p1(0xeb),p1(0xbb),p1(0x3c),p1(0x83),p1(0x53),p1(0x99),p1(0x61) ;\
-	.long	p1(0x17),p1(0x2b),p1(0x04),p1(0x7e),p1(0xba),p1(0x77),p1(0xd6),p1(0x26) ;\
-	.long	p1(0xe1),p1(0x69),p1(0x14),p1(0x63),p1(0x55),p1(0x21),p1(0x0c),p1(0x7d)
-
-// The rcon_table (needed for the key schedule)
-//
-// Here is original Dr Brian Gladman's source code:
-//	_rcon_tab:
-//	%assign x   1
-//	%rep 29
-//	    dd  x
-//	%assign x f2(x)
-//	%endrep
-//
-// Here is precomputed output (it's more portable this way):
-
-	.align	ALIGN32BYTES
-aes_rcon_tab:
-	.long	0x01,0x02,0x04,0x08,0x10,0x20,0x40,0x80
-	.long	0x1b,0x36,0x6c,0xd8,0xab,0x4d,0x9a,0x2f
-	.long	0x5e,0xbc,0x63,0xc6,0x97,0x35,0x6a,0xd4
-	.long	0xb3,0x7d,0xfa,0xef,0xc5
-
-// The forward xor tables
-
-	.align	ALIGN32BYTES
-aes_ft_tab:
-	sb_data0(u0)
-	sb_data1(u0)
-	sb_data2(u0)
-	sb_data3(u0)
-	sb_data4(u0)
-	sb_data5(u0)
-	sb_data6(u0)
-	sb_data7(u0)
-
-	sb_data0(u1)
-	sb_data1(u1)
-	sb_data2(u1)
-	sb_data3(u1)
-	sb_data4(u1)
-	sb_data5(u1)
-	sb_data6(u1)
-	sb_data7(u1)
-
-	sb_data0(u2)
-	sb_data1(u2)
-	sb_data2(u2)
-	sb_data3(u2)
-	sb_data4(u2)
-	sb_data5(u2)
-	sb_data6(u2)
-	sb_data7(u2)
-
-	sb_data0(u3)
-	sb_data1(u3)
-	sb_data2(u3)
-	sb_data3(u3)
-	sb_data4(u3)
-	sb_data5(u3)
-	sb_data6(u3)
-	sb_data7(u3)
-
-	.align	ALIGN32BYTES
-aes_fl_tab:
-	sb_data0(w0)
-	sb_data1(w0)
-	sb_data2(w0)
-	sb_data3(w0)
-	sb_data4(w0)
-	sb_data5(w0)
-	sb_data6(w0)
-	sb_data7(w0)
-
-	sb_data0(w1)
-	sb_data1(w1)
-	sb_data2(w1)
-	sb_data3(w1)
-	sb_data4(w1)
-	sb_data5(w1)
-	sb_data6(w1)
-	sb_data7(w1)
-
-	sb_data0(w2)
-	sb_data1(w2)
-	sb_data2(w2)
-	sb_data3(w2)
-	sb_data4(w2)
-	sb_data5(w2)
-	sb_data6(w2)
-	sb_data7(w2)
-
-	sb_data0(w3)
-	sb_data1(w3)
-	sb_data2(w3)
-	sb_data3(w3)
-	sb_data4(w3)
-	sb_data5(w3)
-	sb_data6(w3)
-	sb_data7(w3)
-
-// The inverse xor tables
-
-	.align	ALIGN32BYTES
-aes_it_tab:
-	ib_data0(v0)
-	ib_data1(v0)
-	ib_data2(v0)
-	ib_data3(v0)
-	ib_data4(v0)
-	ib_data5(v0)
-	ib_data6(v0)
-	ib_data7(v0)
-
-	ib_data0(v1)
-	ib_data1(v1)
-	ib_data2(v1)
-	ib_data3(v1)
-	ib_data4(v1)
-	ib_data5(v1)
-	ib_data6(v1)
-	ib_data7(v1)
-
-	ib_data0(v2)
-	ib_data1(v2)
-	ib_data2(v2)
-	ib_data3(v2)
-	ib_data4(v2)
-	ib_data5(v2)
-	ib_data6(v2)
-	ib_data7(v2)
-
-	ib_data0(v3)
-	ib_data1(v3)
-	ib_data2(v3)
-	ib_data3(v3)
-	ib_data4(v3)
-	ib_data5(v3)
-	ib_data6(v3)
-	ib_data7(v3)
-
-	.align	ALIGN32BYTES
-aes_il_tab:
-	ib_data0(w0)
-	ib_data1(w0)
-	ib_data2(w0)
-	ib_data3(w0)
-	ib_data4(w0)
-	ib_data5(w0)
-	ib_data6(w0)
-	ib_data7(w0)
-
-	ib_data0(w1)
-	ib_data1(w1)
-	ib_data2(w1)
-	ib_data3(w1)
-	ib_data4(w1)
-	ib_data5(w1)
-	ib_data6(w1)
-	ib_data7(w1)
-
-	ib_data0(w2)
-	ib_data1(w2)
-	ib_data2(w2)
-	ib_data3(w2)
-	ib_data4(w2)
-	ib_data5(w2)
-	ib_data6(w2)
-	ib_data7(w2)
-
-	ib_data0(w3)
-	ib_data1(w3)
-	ib_data2(w3)
-	ib_data3(w3)
-	ib_data4(w3)
-	ib_data5(w3)
-	ib_data6(w3)
-	ib_data7(w3)
-
-// The inverse mix column tables
-
-	.align	ALIGN32BYTES
-aes_im_tab:
-	im_data0(v0)
-	im_data1(v0)
-	im_data2(v0)
-	im_data3(v0)
-	im_data4(v0)
-	im_data5(v0)
-	im_data6(v0)
-	im_data7(v0)
-
-	im_data0(v1)
-	im_data1(v1)
-	im_data2(v1)
-	im_data3(v1)
-	im_data4(v1)
-	im_data5(v1)
-	im_data6(v1)
-	im_data7(v1)
-
-	im_data0(v2)
-	im_data1(v2)
-	im_data2(v2)
-	im_data3(v2)
-	im_data4(v2)
-	im_data5(v2)
-	im_data6(v2)
-	im_data7(v2)
-
-	im_data0(v3)
-	im_data1(v3)
-	im_data2(v3)
-	im_data3(v3)
-	im_data4(v3)
-	im_data5(v3)
-	im_data6(v3)
-	im_data7(v3)
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/misc/aes-x86.S linux-2.4.20-wolk4.16-fullkernel/drivers/misc/aes-x86.S
--- linux-2.4.20-wolk4.15-fullkernel/drivers/misc/aes-x86.S	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/misc/aes-x86.S	2004-09-09 12:48:49.000000000 +0200
@@ -0,0 +1,922 @@
+//
+// Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK.
+// All rights reserved.
+//
+// TERMS
+//
+//  Redistribution and use in source and binary forms, with or without
+//  modification, are permitted subject to the following conditions:
+//
+//  1. Redistributions of source code must retain the above copyright
+//     notice, this list of conditions and the following disclaimer.
+//
+//  2. Redistributions in binary form must reproduce the above copyright
+//     notice, this list of conditions and the following disclaimer in the
+//     documentation and/or other materials provided with the distribution.
+//
+//  3. The copyright holder's name must not be used to endorse or promote
+//     any products derived from this software without his specific prior
+//     written permission.
+//
+//  This software is provided 'as is' with no express or implied warranties
+//  of correctness or fitness for purpose.
+
+// Modified by Jari Ruusu,  December 24 2001
+//  - Converted syntax to GNU CPP/assembler syntax
+//  - C programming interface converted back to "old" API
+//  - Minor portability cleanups and speed optimizations
+
+// Modified by Jari Ruusu,  April 11 2002
+//  - Added above copyright and terms to resulting object code so that
+//    binary distributions can avoid legal trouble
+
+// An AES (Rijndael) implementation for x86 compatible processors. This
+// version uses i386 instruction set but instruction scheduling is optimized
+// for Pentium-2. This version only implements the standard AES block length
+// (128 bits, 16 bytes). This code does not preserve the eax, ecx or edx
+// registers or the artihmetic status flags. However, the ebx, esi, edi, and
+// ebp registers are preserved across calls.
+
+// void aes_set_key(aes_context *cx, const unsigned char key[], const int key_len, const int f)
+// void aes_encrypt(const aes_context *cx, const unsigned char in_blk[], unsigned char out_blk[])
+// void aes_decrypt(const aes_context *cx, const unsigned char in_blk[], unsigned char out_blk[])
+
+#if defined(USE_UNDERLINE)
+# define aes_set_key _aes_set_key
+# define aes_encrypt _aes_encrypt
+# define aes_decrypt _aes_decrypt
+#endif
+#if !defined(ALIGN32BYTES)
+# define ALIGN32BYTES 32
+#endif
+
+	.file	"aes-x86.S"
+	.globl	aes_set_key
+	.globl	aes_encrypt
+	.globl	aes_decrypt
+
+	.text
+copyright:
+	.ascii "    \000"
+	.ascii "Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK.\000"
+	.ascii "All rights reserved.\000"
+	.ascii "    \000"
+	.ascii "TERMS\000"
+	.ascii "    \000"
+	.ascii " Redistribution and use in source and binary forms, with or without\000"
+	.ascii " modification, are permitted subject to the following conditions:\000"
+	.ascii "    \000"
+	.ascii " 1. Redistributions of source code must retain the above copyright\000"
+	.ascii "    notice, this list of conditions and the following disclaimer.\000"
+	.ascii "    \000"
+	.ascii " 2. Redistributions in binary form must reproduce the above copyright\000"
+	.ascii "    notice, this list of conditions and the following disclaimer in the\000"
+	.ascii "    documentation and/or other materials provided with the distribution.\000"
+	.ascii "    \000"
+	.ascii " 3. The copyright holder's name must not be used to endorse or promote\000"
+	.ascii "    any products derived from this software without his specific prior\000"
+	.ascii "    written permission.\000"
+	.ascii "    \000"
+	.ascii " This software is provided 'as is' with no express or implied warranties\000"
+	.ascii " of correctness or fitness for purpose.\000"
+	.ascii "    \000"
+
+#define tlen	1024	// length of each of 4 'xor' arrays (256 32-bit words)
+
+// offsets to parameters with one register pushed onto stack
+
+#define ctx	8	// AES context structure
+#define in_blk	12	// input byte array address parameter
+#define out_blk	16	// output byte array address parameter
+
+// offsets in context structure
+
+#define nkey	0	// key length, size 4
+#define nrnd	4	// number of rounds, size 4
+#define ekey	8	// encryption key schedule base address, size 256
+#define dkey	264	// decryption key schedule base address, size 256
+
+// This macro performs a forward encryption cycle. It is entered with
+// the first previous round column values in %eax, %ebx, %esi and %edi and
+// exits with the final values in the same registers.
+
+#define fwd_rnd(p1,p2)			 \
+	mov	%ebx,(%esp)		;\
+	movzbl	%al,%edx		;\
+	mov	%eax,%ecx		;\
+	mov	p2(%ebp),%eax		;\
+	mov	%edi,4(%esp)		;\
+	mov	p2+12(%ebp),%edi	;\
+	xor	p1(,%edx,4),%eax	;\
+	movzbl	%ch,%edx		;\
+	shr	$16,%ecx		;\
+	mov	p2+4(%ebp),%ebx		;\
+	xor	p1+tlen(,%edx,4),%edi	;\
+	movzbl	%cl,%edx		;\
+	movzbl	%ch,%ecx		;\
+	xor	p1+3*tlen(,%ecx,4),%ebx	;\
+	mov	%esi,%ecx		;\
+	mov	p1+2*tlen(,%edx,4),%esi	;\
+	movzbl	%cl,%edx		;\
+	xor	p1(,%edx,4),%esi	;\
+	movzbl	%ch,%edx		;\
+	shr	$16,%ecx		;\
+	xor	p1+tlen(,%edx,4),%ebx	;\
+	movzbl	%cl,%edx		;\
+	movzbl	%ch,%ecx		;\
+	xor	p1+2*tlen(,%edx,4),%eax	;\
+	mov	(%esp),%edx		;\
+	xor	p1+3*tlen(,%ecx,4),%edi ;\
+	movzbl	%dl,%ecx		;\
+	xor	p2+8(%ebp),%esi		;\
+	xor	p1(,%ecx,4),%ebx	;\
+	movzbl	%dh,%ecx		;\
+	shr	$16,%edx		;\
+	xor	p1+tlen(,%ecx,4),%eax	;\
+	movzbl	%dl,%ecx		;\
+	movzbl	%dh,%edx		;\
+	xor	p1+2*tlen(,%ecx,4),%edi	;\
+	mov	4(%esp),%ecx		;\
+	xor	p1+3*tlen(,%edx,4),%esi ;\
+	movzbl	%cl,%edx		;\
+	xor	p1(,%edx,4),%edi	;\
+	movzbl	%ch,%edx		;\
+	shr	$16,%ecx		;\
+	xor	p1+tlen(,%edx,4),%esi	;\
+	movzbl	%cl,%edx		;\
+	movzbl	%ch,%ecx		;\
+	xor	p1+2*tlen(,%edx,4),%ebx	;\
+	xor	p1+3*tlen(,%ecx,4),%eax
+
+// This macro performs an inverse encryption cycle. It is entered with
+// the first previous round column values in %eax, %ebx, %esi and %edi and
+// exits with the final values in the same registers.
+
+#define inv_rnd(p1,p2)			 \
+	movzbl	%al,%edx		;\
+	mov	%ebx,(%esp)		;\
+	mov	%eax,%ecx		;\
+	mov	p2(%ebp),%eax		;\
+	mov	%edi,4(%esp)		;\
+	mov	p2+4(%ebp),%ebx		;\
+	xor	p1(,%edx,4),%eax	;\
+	movzbl	%ch,%edx		;\
+	shr	$16,%ecx		;\
+	mov	p2+12(%ebp),%edi	;\
+	xor	p1+tlen(,%edx,4),%ebx	;\
+	movzbl	%cl,%edx		;\
+	movzbl	%ch,%ecx		;\
+	xor	p1+3*tlen(,%ecx,4),%edi	;\
+	mov	%esi,%ecx		;\
+	mov	p1+2*tlen(,%edx,4),%esi	;\
+	movzbl	%cl,%edx		;\
+	xor	p1(,%edx,4),%esi	;\
+	movzbl	%ch,%edx		;\
+	shr	$16,%ecx		;\
+	xor	p1+tlen(,%edx,4),%edi	;\
+	movzbl	%cl,%edx		;\
+	movzbl	%ch,%ecx		;\
+	xor	p1+2*tlen(,%edx,4),%eax	;\
+	mov	(%esp),%edx		;\
+	xor	p1+3*tlen(,%ecx,4),%ebx ;\
+	movzbl	%dl,%ecx		;\
+	xor	p2+8(%ebp),%esi		;\
+	xor	p1(,%ecx,4),%ebx	;\
+	movzbl	%dh,%ecx		;\
+	shr	$16,%edx		;\
+	xor	p1+tlen(,%ecx,4),%esi	;\
+	movzbl	%dl,%ecx		;\
+	movzbl	%dh,%edx		;\
+	xor	p1+2*tlen(,%ecx,4),%edi	;\
+	mov	4(%esp),%ecx		;\
+	xor	p1+3*tlen(,%edx,4),%eax ;\
+	movzbl	%cl,%edx		;\
+	xor	p1(,%edx,4),%edi	;\
+	movzbl	%ch,%edx		;\
+	shr	$16,%ecx		;\
+	xor	p1+tlen(,%edx,4),%eax	;\
+	movzbl	%cl,%edx		;\
+	movzbl	%ch,%ecx		;\
+	xor	p1+2*tlen(,%edx,4),%ebx	;\
+	xor	p1+3*tlen(,%ecx,4),%esi
+
+// AES (Rijndael) Encryption Subroutine
+
+	.text
+	.align	ALIGN32BYTES
+aes_encrypt:
+	push	%ebp
+	mov	ctx(%esp),%ebp		// pointer to context
+	mov	in_blk(%esp),%ecx
+	push	%ebx
+	push	%esi
+	push	%edi
+	mov	nrnd(%ebp),%edx		// number of rounds
+	lea	ekey+16(%ebp),%ebp	// key pointer
+
+// input four columns and xor in first round key
+
+	mov	(%ecx),%eax
+	mov	4(%ecx),%ebx
+	mov	8(%ecx),%esi
+	mov	12(%ecx),%edi
+	xor	-16(%ebp),%eax
+	xor	-12(%ebp),%ebx
+	xor	-8(%ebp),%esi
+	xor	-4(%ebp),%edi
+
+	sub	$8,%esp			// space for register saves on stack
+
+	sub	$10,%edx
+	je	aes_15
+	add	$32,%ebp
+	sub	$2,%edx
+	je	aes_13
+	add	$32,%ebp
+
+	fwd_rnd(aes_ft_tab,-64)		// 14 rounds for 256-bit key
+	fwd_rnd(aes_ft_tab,-48)
+aes_13:	fwd_rnd(aes_ft_tab,-32)		// 12 rounds for 192-bit key
+	fwd_rnd(aes_ft_tab,-16)
+aes_15:	fwd_rnd(aes_ft_tab,0)		// 10 rounds for 128-bit key
+	fwd_rnd(aes_ft_tab,16)
+	fwd_rnd(aes_ft_tab,32)
+	fwd_rnd(aes_ft_tab,48)
+	fwd_rnd(aes_ft_tab,64)
+	fwd_rnd(aes_ft_tab,80)
+	fwd_rnd(aes_ft_tab,96)
+	fwd_rnd(aes_ft_tab,112)
+	fwd_rnd(aes_ft_tab,128)
+	fwd_rnd(aes_fl_tab,144)		// last round uses a different table
+
+// move final values to the output array.
+
+	mov	out_blk+20(%esp),%ebp
+	add	$8,%esp
+	mov	%eax,(%ebp)
+	mov	%ebx,4(%ebp)
+	mov	%esi,8(%ebp)
+	mov	%edi,12(%ebp)
+	pop	%edi
+	pop	%esi
+	pop	%ebx
+	pop	%ebp
+	ret
+
+
+// AES (Rijndael) Decryption Subroutine
+
+	.align	ALIGN32BYTES
+aes_decrypt:
+	push	%ebp
+	mov	ctx(%esp),%ebp		// pointer to context
+	mov	in_blk(%esp),%ecx
+	push	%ebx
+	push	%esi
+	push	%edi
+	mov	nrnd(%ebp),%edx		// number of rounds
+	lea	dkey+16(%ebp),%ebp	// key pointer
+
+// input four columns and xor in first round key
+
+	mov	(%ecx),%eax
+	mov	4(%ecx),%ebx
+	mov	8(%ecx),%esi
+	mov	12(%ecx),%edi
+	xor	-16(%ebp),%eax
+	xor	-12(%ebp),%ebx
+	xor	-8(%ebp),%esi
+	xor	-4(%ebp),%edi
+
+	sub	$8,%esp			// space for register saves on stack
+
+	sub	$10,%edx
+	je	aes_25
+	add	$32,%ebp
+	sub	$2,%edx
+	je	aes_23
+	add	$32,%ebp
+
+	inv_rnd(aes_it_tab,-64)		// 14 rounds for 256-bit key
+	inv_rnd(aes_it_tab,-48)
+aes_23:	inv_rnd(aes_it_tab,-32)		// 12 rounds for 192-bit key
+	inv_rnd(aes_it_tab,-16)
+aes_25:	inv_rnd(aes_it_tab,0)		// 10 rounds for 128-bit key
+	inv_rnd(aes_it_tab,16)
+	inv_rnd(aes_it_tab,32)
+	inv_rnd(aes_it_tab,48)
+	inv_rnd(aes_it_tab,64)
+	inv_rnd(aes_it_tab,80)
+	inv_rnd(aes_it_tab,96)
+	inv_rnd(aes_it_tab,112)
+	inv_rnd(aes_it_tab,128)
+	inv_rnd(aes_il_tab,144)		// last round uses a different table
+
+// move final values to the output array.
+
+	mov	out_blk+20(%esp),%ebp
+	add	$8,%esp
+	mov	%eax,(%ebp)
+	mov	%ebx,4(%ebp)
+	mov	%esi,8(%ebp)
+	mov	%edi,12(%ebp)
+	pop	%edi
+	pop	%esi
+	pop	%ebx
+	pop	%ebp
+	ret
+
+// AES (Rijndael) Key Schedule Subroutine
+
+// input/output parameters
+
+#define aes_cx	12	// AES context
+#define in_key	16	// key input array address
+#define key_ln	20	// key length, bytes (16,24,32) or bits (128,192,256)
+#define ed_flg	24	// 0=create both encr/decr keys, 1=create encr key only
+
+// offsets for locals
+
+#define cnt	-4
+#define slen	8
+
+// This macro performs a column mixing operation on an input 32-bit
+// word to give a 32-bit result. It uses each of the 4 bytes in the
+// the input column to index 4 different tables of 256 32-bit words
+// that are xored together to form the output value.
+
+#define mix_col(p1)			 \
+	movzbl	%bl,%ecx		;\
+	mov	p1(,%ecx,4),%eax	;\
+	movzbl	%bh,%ecx		;\
+	ror	$16,%ebx		;\
+	xor	p1+tlen(,%ecx,4),%eax	;\
+	movzbl	%bl,%ecx		;\
+	xor	p1+2*tlen(,%ecx,4),%eax	;\
+	movzbl	%bh,%ecx		;\
+	xor	p1+3*tlen(,%ecx,4),%eax
+
+// Key Schedule Macros
+
+#define ksc4(p1)			 \
+	rol	$24,%ebx		;\
+	mix_col(aes_fl_tab)		;\
+	ror	$8,%ebx			;\
+	xor	4*p1+aes_rcon_tab,%eax	;\
+	xor	%eax,%esi		;\
+	xor	%esi,%ebp		;\
+	mov	%esi,16*p1(%edi)	;\
+	mov	%ebp,16*p1+4(%edi)	;\
+	xor	%ebp,%edx		;\
+	xor	%edx,%ebx		;\
+	mov	%edx,16*p1+8(%edi)	;\
+	mov	%ebx,16*p1+12(%edi)
+
+#define ksc6(p1)			 \
+	rol	$24,%ebx		;\
+	mix_col(aes_fl_tab)		;\
+	ror	$8,%ebx			;\
+	xor	4*p1+aes_rcon_tab,%eax	;\
+	xor	24*p1-24(%edi),%eax	;\
+	mov	%eax,24*p1(%edi)	;\
+	xor	24*p1-20(%edi),%eax	;\
+	mov	%eax,24*p1+4(%edi)	;\
+	xor	%eax,%esi		;\
+	xor	%esi,%ebp		;\
+	mov	%esi,24*p1+8(%edi)	;\
+	mov	%ebp,24*p1+12(%edi)	;\
+	xor	%ebp,%edx		;\
+	xor	%edx,%ebx		;\
+	mov	%edx,24*p1+16(%edi)	;\
+	mov	%ebx,24*p1+20(%edi)
+
+#define ksc8(p1)			 \
+	rol	$24,%ebx		;\
+	mix_col(aes_fl_tab)		;\
+	ror	$8,%ebx			;\
+	xor	4*p1+aes_rcon_tab,%eax	;\
+	xor	32*p1-32(%edi),%eax	;\
+	mov	%eax,32*p1(%edi)	;\
+	xor	32*p1-28(%edi),%eax	;\
+	mov	%eax,32*p1+4(%edi)	;\
+	xor	32*p1-24(%edi),%eax	;\
+	mov	%eax,32*p1+8(%edi)	;\
+	xor	32*p1-20(%edi),%eax	;\
+	mov	%eax,32*p1+12(%edi)	;\
+	push	%ebx			;\
+	mov	%eax,%ebx		;\
+	mix_col(aes_fl_tab)		;\
+	pop	%ebx			;\
+	xor	%eax,%esi		;\
+	xor	%esi,%ebp		;\
+	mov	%esi,32*p1+16(%edi)	;\
+	mov	%ebp,32*p1+20(%edi)	;\
+	xor	%ebp,%edx		;\
+	xor	%edx,%ebx		;\
+	mov	%edx,32*p1+24(%edi)	;\
+	mov	%ebx,32*p1+28(%edi)
+
+	.align	ALIGN32BYTES
+aes_set_key:
+	pushfl
+	push	%ebp
+	mov	%esp,%ebp
+	sub	$slen,%esp
+	push	%ebx
+	push	%esi
+	push	%edi
+
+	mov	aes_cx(%ebp),%edx	// edx -> AES context
+
+	mov	key_ln(%ebp),%ecx	// key length
+	cmpl	$128,%ecx
+	jb	aes_30
+	shr	$3,%ecx
+aes_30:	cmpl	$32,%ecx
+	je	aes_32
+	cmpl	$24,%ecx
+	je	aes_32
+	mov	$16,%ecx
+aes_32:	shr	$2,%ecx
+	mov	%ecx,nkey(%edx)
+
+	lea	6(%ecx),%eax		// 10/12/14 for 4/6/8 32-bit key length
+	mov	%eax,nrnd(%edx)
+
+	mov	in_key(%ebp),%esi	// key input array
+	lea	ekey(%edx),%edi		// key position in AES context
+	cld
+	push	%ebp
+	mov	%ecx,%eax		// save key length in eax
+	rep ;	movsl			// words in the key schedule
+	mov	-4(%esi),%ebx		// put some values in registers
+	mov	-8(%esi),%edx		// to allow faster code
+	mov	-12(%esi),%ebp
+	mov	-16(%esi),%esi
+
+	cmpl	$4,%eax			// jump on key size
+	je	aes_36
+	cmpl	$6,%eax
+	je	aes_35
+
+	ksc8(0)
+	ksc8(1)
+	ksc8(2)
+	ksc8(3)
+	ksc8(4)
+	ksc8(5)
+	ksc8(6)
+	jmp	aes_37
+aes_35:	ksc6(0)
+	ksc6(1)
+	ksc6(2)
+	ksc6(3)
+	ksc6(4)
+	ksc6(5)
+	ksc6(6)
+	ksc6(7)
+	jmp	aes_37
+aes_36:	ksc4(0)
+	ksc4(1)
+	ksc4(2)
+	ksc4(3)
+	ksc4(4)
+	ksc4(5)
+	ksc4(6)
+	ksc4(7)
+	ksc4(8)
+	ksc4(9)
+aes_37:	pop	%ebp
+	mov	aes_cx(%ebp),%edx	// edx -> AES context
+	cmpl	$0,ed_flg(%ebp)
+	jne	aes_39
+
+// compile decryption key schedule from encryption schedule - reverse
+// order and do mix_column operation on round keys except first and last
+
+	mov	nrnd(%edx),%eax		// kt = cx->d_key + nc * cx->Nrnd
+	shl	$2,%eax
+	lea	dkey(%edx,%eax,4),%edi
+	lea	ekey(%edx),%esi		// kf = cx->e_key
+
+	movsl				// copy first round key (unmodified)
+	movsl
+	movsl
+	movsl
+	sub	$32,%edi
+	movl	$1,cnt(%ebp)
+aes_38:					// do mix column on each column of
+	lodsl				// each round key
+	mov	%eax,%ebx
+	mix_col(aes_im_tab)
+	stosl
+	lodsl
+	mov	%eax,%ebx
+	mix_col(aes_im_tab)
+	stosl
+	lodsl
+	mov	%eax,%ebx
+	mix_col(aes_im_tab)
+	stosl
+	lodsl
+	mov	%eax,%ebx
+	mix_col(aes_im_tab)
+	stosl
+	sub	$32,%edi
+
+	incl	cnt(%ebp)
+	mov	cnt(%ebp),%eax
+	cmp	nrnd(%edx),%eax
+	jb	aes_38
+
+	movsl				// copy last round key (unmodified)
+	movsl
+	movsl
+	movsl
+aes_39:	pop	%edi
+	pop	%esi
+	pop	%ebx
+	mov	%ebp,%esp
+	pop	%ebp
+	popfl
+	ret
+
+
+// finite field multiplies by {02}, {04} and {08}
+
+#define f2(x)	((x<<1)^(((x>>7)&1)*0x11b))
+#define f4(x)	((x<<2)^(((x>>6)&1)*0x11b)^(((x>>6)&2)*0x11b))
+#define f8(x)	((x<<3)^(((x>>5)&1)*0x11b)^(((x>>5)&2)*0x11b)^(((x>>5)&4)*0x11b))
+
+// finite field multiplies required in table generation
+
+#define f3(x)	(f2(x) ^ x)
+#define f9(x)	(f8(x) ^ x)
+#define fb(x)	(f8(x) ^ f2(x) ^ x)
+#define fd(x)	(f8(x) ^ f4(x) ^ x)
+#define fe(x)	(f8(x) ^ f4(x) ^ f2(x))
+
+// These defines generate the forward table entries
+
+#define u0(x)	((f3(x) << 24) | (x << 16) | (x << 8) | f2(x))
+#define u1(x)	((x << 24) | (x << 16) | (f2(x) << 8) | f3(x))
+#define u2(x)	((x << 24) | (f2(x) << 16) | (f3(x) << 8) | x)
+#define u3(x)	((f2(x) << 24) | (f3(x) << 16) | (x << 8) | x)
+
+// These defines generate the inverse table entries
+
+#define v0(x)	((fb(x) << 24) | (fd(x) << 16) | (f9(x) << 8) | fe(x))
+#define v1(x)	((fd(x) << 24) | (f9(x) << 16) | (fe(x) << 8) | fb(x))
+#define v2(x)	((f9(x) << 24) | (fe(x) << 16) | (fb(x) << 8) | fd(x))
+#define v3(x)	((fe(x) << 24) | (fb(x) << 16) | (fd(x) << 8) | f9(x))
+
+// These defines generate entries for the last round tables
+
+#define w0(x)	(x)
+#define w1(x)	(x <<  8)
+#define w2(x)	(x << 16)
+#define w3(x)	(x << 24)
+
+// macro to generate inverse mix column tables (needed for the key schedule)
+
+#define im_data0(p1) \
+	.long	p1(0x00),p1(0x01),p1(0x02),p1(0x03),p1(0x04),p1(0x05),p1(0x06),p1(0x07) ;\
+	.long	p1(0x08),p1(0x09),p1(0x0a),p1(0x0b),p1(0x0c),p1(0x0d),p1(0x0e),p1(0x0f) ;\
+	.long	p1(0x10),p1(0x11),p1(0x12),p1(0x13),p1(0x14),p1(0x15),p1(0x16),p1(0x17) ;\
+	.long	p1(0x18),p1(0x19),p1(0x1a),p1(0x1b),p1(0x1c),p1(0x1d),p1(0x1e),p1(0x1f)
+#define im_data1(p1) \
+	.long	p1(0x20),p1(0x21),p1(0x22),p1(0x23),p1(0x24),p1(0x25),p1(0x26),p1(0x27) ;\
+	.long	p1(0x28),p1(0x29),p1(0x2a),p1(0x2b),p1(0x2c),p1(0x2d),p1(0x2e),p1(0x2f) ;\
+	.long	p1(0x30),p1(0x31),p1(0x32),p1(0x33),p1(0x34),p1(0x35),p1(0x36),p1(0x37) ;\
+	.long	p1(0x38),p1(0x39),p1(0x3a),p1(0x3b),p1(0x3c),p1(0x3d),p1(0x3e),p1(0x3f)
+#define im_data2(p1) \
+	.long	p1(0x40),p1(0x41),p1(0x42),p1(0x43),p1(0x44),p1(0x45),p1(0x46),p1(0x47) ;\
+	.long	p1(0x48),p1(0x49),p1(0x4a),p1(0x4b),p1(0x4c),p1(0x4d),p1(0x4e),p1(0x4f) ;\
+	.long	p1(0x50),p1(0x51),p1(0x52),p1(0x53),p1(0x54),p1(0x55),p1(0x56),p1(0x57) ;\
+	.long	p1(0x58),p1(0x59),p1(0x5a),p1(0x5b),p1(0x5c),p1(0x5d),p1(0x5e),p1(0x5f)
+#define im_data3(p1) \
+	.long	p1(0x60),p1(0x61),p1(0x62),p1(0x63),p1(0x64),p1(0x65),p1(0x66),p1(0x67) ;\
+	.long	p1(0x68),p1(0x69),p1(0x6a),p1(0x6b),p1(0x6c),p1(0x6d),p1(0x6e),p1(0x6f) ;\
+	.long	p1(0x70),p1(0x71),p1(0x72),p1(0x73),p1(0x74),p1(0x75),p1(0x76),p1(0x77) ;\
+	.long	p1(0x78),p1(0x79),p1(0x7a),p1(0x7b),p1(0x7c),p1(0x7d),p1(0x7e),p1(0x7f)
+#define im_data4(p1) \
+	.long	p1(0x80),p1(0x81),p1(0x82),p1(0x83),p1(0x84),p1(0x85),p1(0x86),p1(0x87) ;\
+	.long	p1(0x88),p1(0x89),p1(0x8a),p1(0x8b),p1(0x8c),p1(0x8d),p1(0x8e),p1(0x8f) ;\
+	.long	p1(0x90),p1(0x91),p1(0x92),p1(0x93),p1(0x94),p1(0x95),p1(0x96),p1(0x97) ;\
+	.long	p1(0x98),p1(0x99),p1(0x9a),p1(0x9b),p1(0x9c),p1(0x9d),p1(0x9e),p1(0x9f)
+#define im_data5(p1) \
+	.long	p1(0xa0),p1(0xa1),p1(0xa2),p1(0xa3),p1(0xa4),p1(0xa5),p1(0xa6),p1(0xa7) ;\
+	.long	p1(0xa8),p1(0xa9),p1(0xaa),p1(0xab),p1(0xac),p1(0xad),p1(0xae),p1(0xaf) ;\
+	.long	p1(0xb0),p1(0xb1),p1(0xb2),p1(0xb3),p1(0xb4),p1(0xb5),p1(0xb6),p1(0xb7) ;\
+	.long	p1(0xb8),p1(0xb9),p1(0xba),p1(0xbb),p1(0xbc),p1(0xbd),p1(0xbe),p1(0xbf)
+#define im_data6(p1) \
+	.long	p1(0xc0),p1(0xc1),p1(0xc2),p1(0xc3),p1(0xc4),p1(0xc5),p1(0xc6),p1(0xc7) ;\
+	.long	p1(0xc8),p1(0xc9),p1(0xca),p1(0xcb),p1(0xcc),p1(0xcd),p1(0xce),p1(0xcf) ;\
+	.long	p1(0xd0),p1(0xd1),p1(0xd2),p1(0xd3),p1(0xd4),p1(0xd5),p1(0xd6),p1(0xd7) ;\
+	.long	p1(0xd8),p1(0xd9),p1(0xda),p1(0xdb),p1(0xdc),p1(0xdd),p1(0xde),p1(0xdf)
+#define im_data7(p1) \
+	.long	p1(0xe0),p1(0xe1),p1(0xe2),p1(0xe3),p1(0xe4),p1(0xe5),p1(0xe6),p1(0xe7) ;\
+	.long	p1(0xe8),p1(0xe9),p1(0xea),p1(0xeb),p1(0xec),p1(0xed),p1(0xee),p1(0xef) ;\
+	.long	p1(0xf0),p1(0xf1),p1(0xf2),p1(0xf3),p1(0xf4),p1(0xf5),p1(0xf6),p1(0xf7) ;\
+	.long	p1(0xf8),p1(0xf9),p1(0xfa),p1(0xfb),p1(0xfc),p1(0xfd),p1(0xfe),p1(0xff)
+
+// S-box data - 256 entries
+
+#define sb_data0(p1) \
+	.long	p1(0x63),p1(0x7c),p1(0x77),p1(0x7b),p1(0xf2),p1(0x6b),p1(0x6f),p1(0xc5) ;\
+	.long	p1(0x30),p1(0x01),p1(0x67),p1(0x2b),p1(0xfe),p1(0xd7),p1(0xab),p1(0x76) ;\
+	.long	p1(0xca),p1(0x82),p1(0xc9),p1(0x7d),p1(0xfa),p1(0x59),p1(0x47),p1(0xf0) ;\
+	.long	p1(0xad),p1(0xd4),p1(0xa2),p1(0xaf),p1(0x9c),p1(0xa4),p1(0x72),p1(0xc0)
+#define sb_data1(p1) \
+	.long	p1(0xb7),p1(0xfd),p1(0x93),p1(0x26),p1(0x36),p1(0x3f),p1(0xf7),p1(0xcc) ;\
+	.long	p1(0x34),p1(0xa5),p1(0xe5),p1(0xf1),p1(0x71),p1(0xd8),p1(0x31),p1(0x15) ;\
+	.long	p1(0x04),p1(0xc7),p1(0x23),p1(0xc3),p1(0x18),p1(0x96),p1(0x05),p1(0x9a) ;\
+	.long	p1(0x07),p1(0x12),p1(0x80),p1(0xe2),p1(0xeb),p1(0x27),p1(0xb2),p1(0x75)
+#define sb_data2(p1) \
+	.long	p1(0x09),p1(0x83),p1(0x2c),p1(0x1a),p1(0x1b),p1(0x6e),p1(0x5a),p1(0xa0) ;\
+	.long	p1(0x52),p1(0x3b),p1(0xd6),p1(0xb3),p1(0x29),p1(0xe3),p1(0x2f),p1(0x84) ;\
+	.long	p1(0x53),p1(0xd1),p1(0x00),p1(0xed),p1(0x20),p1(0xfc),p1(0xb1),p1(0x5b) ;\
+	.long	p1(0x6a),p1(0xcb),p1(0xbe),p1(0x39),p1(0x4a),p1(0x4c),p1(0x58),p1(0xcf)
+#define sb_data3(p1) \
+	.long	p1(0xd0),p1(0xef),p1(0xaa),p1(0xfb),p1(0x43),p1(0x4d),p1(0x33),p1(0x85) ;\
+	.long	p1(0x45),p1(0xf9),p1(0x02),p1(0x7f),p1(0x50),p1(0x3c),p1(0x9f),p1(0xa8) ;\
+	.long	p1(0x51),p1(0xa3),p1(0x40),p1(0x8f),p1(0x92),p1(0x9d),p1(0x38),p1(0xf5) ;\
+	.long	p1(0xbc),p1(0xb6),p1(0xda),p1(0x21),p1(0x10),p1(0xff),p1(0xf3),p1(0xd2)
+#define sb_data4(p1) \
+	.long	p1(0xcd),p1(0x0c),p1(0x13),p1(0xec),p1(0x5f),p1(0x97),p1(0x44),p1(0x17) ;\
+	.long	p1(0xc4),p1(0xa7),p1(0x7e),p1(0x3d),p1(0x64),p1(0x5d),p1(0x19),p1(0x73) ;\
+	.long	p1(0x60),p1(0x81),p1(0x4f),p1(0xdc),p1(0x22),p1(0x2a),p1(0x90),p1(0x88) ;\
+	.long	p1(0x46),p1(0xee),p1(0xb8),p1(0x14),p1(0xde),p1(0x5e),p1(0x0b),p1(0xdb)
+#define sb_data5(p1) \
+	.long	p1(0xe0),p1(0x32),p1(0x3a),p1(0x0a),p1(0x49),p1(0x06),p1(0x24),p1(0x5c) ;\
+	.long	p1(0xc2),p1(0xd3),p1(0xac),p1(0x62),p1(0x91),p1(0x95),p1(0xe4),p1(0x79) ;\
+	.long	p1(0xe7),p1(0xc8),p1(0x37),p1(0x6d),p1(0x8d),p1(0xd5),p1(0x4e),p1(0xa9) ;\
+	.long	p1(0x6c),p1(0x56),p1(0xf4),p1(0xea),p1(0x65),p1(0x7a),p1(0xae),p1(0x08)
+#define sb_data6(p1) \
+	.long	p1(0xba),p1(0x78),p1(0x25),p1(0x2e),p1(0x1c),p1(0xa6),p1(0xb4),p1(0xc6) ;\
+	.long	p1(0xe8),p1(0xdd),p1(0x74),p1(0x1f),p1(0x4b),p1(0xbd),p1(0x8b),p1(0x8a) ;\
+	.long	p1(0x70),p1(0x3e),p1(0xb5),p1(0x66),p1(0x48),p1(0x03),p1(0xf6),p1(0x0e) ;\
+	.long	p1(0x61),p1(0x35),p1(0x57),p1(0xb9),p1(0x86),p1(0xc1),p1(0x1d),p1(0x9e)
+#define sb_data7(p1) \
+	.long	p1(0xe1),p1(0xf8),p1(0x98),p1(0x11),p1(0x69),p1(0xd9),p1(0x8e),p1(0x94) ;\
+	.long	p1(0x9b),p1(0x1e),p1(0x87),p1(0xe9),p1(0xce),p1(0x55),p1(0x28),p1(0xdf) ;\
+	.long	p1(0x8c),p1(0xa1),p1(0x89),p1(0x0d),p1(0xbf),p1(0xe6),p1(0x42),p1(0x68) ;\
+	.long	p1(0x41),p1(0x99),p1(0x2d),p1(0x0f),p1(0xb0),p1(0x54),p1(0xbb),p1(0x16)
+
+// Inverse S-box data - 256 entries
+
+#define ib_data0(p1) \
+	.long	p1(0x52),p1(0x09),p1(0x6a),p1(0xd5),p1(0x30),p1(0x36),p1(0xa5),p1(0x38) ;\
+	.long	p1(0xbf),p1(0x40),p1(0xa3),p1(0x9e),p1(0x81),p1(0xf3),p1(0xd7),p1(0xfb) ;\
+	.long	p1(0x7c),p1(0xe3),p1(0x39),p1(0x82),p1(0x9b),p1(0x2f),p1(0xff),p1(0x87) ;\
+	.long	p1(0x34),p1(0x8e),p1(0x43),p1(0x44),p1(0xc4),p1(0xde),p1(0xe9),p1(0xcb)
+#define ib_data1(p1) \
+	.long	p1(0x54),p1(0x7b),p1(0x94),p1(0x32),p1(0xa6),p1(0xc2),p1(0x23),p1(0x3d) ;\
+	.long	p1(0xee),p1(0x4c),p1(0x95),p1(0x0b),p1(0x42),p1(0xfa),p1(0xc3),p1(0x4e) ;\
+	.long	p1(0x08),p1(0x2e),p1(0xa1),p1(0x66),p1(0x28),p1(0xd9),p1(0x24),p1(0xb2) ;\
+	.long	p1(0x76),p1(0x5b),p1(0xa2),p1(0x49),p1(0x6d),p1(0x8b),p1(0xd1),p1(0x25)
+#define ib_data2(p1) \
+	.long	p1(0x72),p1(0xf8),p1(0xf6),p1(0x64),p1(0x86),p1(0x68),p1(0x98),p1(0x16) ;\
+	.long	p1(0xd4),p1(0xa4),p1(0x5c),p1(0xcc),p1(0x5d),p1(0x65),p1(0xb6),p1(0x92) ;\
+	.long	p1(0x6c),p1(0x70),p1(0x48),p1(0x50),p1(0xfd),p1(0xed),p1(0xb9),p1(0xda) ;\
+	.long	p1(0x5e),p1(0x15),p1(0x46),p1(0x57),p1(0xa7),p1(0x8d),p1(0x9d),p1(0x84)
+#define ib_data3(p1) \
+	.long	p1(0x90),p1(0xd8),p1(0xab),p1(0x00),p1(0x8c),p1(0xbc),p1(0xd3),p1(0x0a) ;\
+	.long	p1(0xf7),p1(0xe4),p1(0x58),p1(0x05),p1(0xb8),p1(0xb3),p1(0x45),p1(0x06) ;\
+	.long	p1(0xd0),p1(0x2c),p1(0x1e),p1(0x8f),p1(0xca),p1(0x3f),p1(0x0f),p1(0x02) ;\
+	.long	p1(0xc1),p1(0xaf),p1(0xbd),p1(0x03),p1(0x01),p1(0x13),p1(0x8a),p1(0x6b)
+#define ib_data4(p1) \
+	.long	p1(0x3a),p1(0x91),p1(0x11),p1(0x41),p1(0x4f),p1(0x67),p1(0xdc),p1(0xea) ;\
+	.long	p1(0x97),p1(0xf2),p1(0xcf),p1(0xce),p1(0xf0),p1(0xb4),p1(0xe6),p1(0x73) ;\
+	.long	p1(0x96),p1(0xac),p1(0x74),p1(0x22),p1(0xe7),p1(0xad),p1(0x35),p1(0x85) ;\
+	.long	p1(0xe2),p1(0xf9),p1(0x37),p1(0xe8),p1(0x1c),p1(0x75),p1(0xdf),p1(0x6e)
+#define ib_data5(p1) \
+	.long	p1(0x47),p1(0xf1),p1(0x1a),p1(0x71),p1(0x1d),p1(0x29),p1(0xc5),p1(0x89) ;\
+	.long	p1(0x6f),p1(0xb7),p1(0x62),p1(0x0e),p1(0xaa),p1(0x18),p1(0xbe),p1(0x1b) ;\
+	.long	p1(0xfc),p1(0x56),p1(0x3e),p1(0x4b),p1(0xc6),p1(0xd2),p1(0x79),p1(0x20) ;\
+	.long	p1(0x9a),p1(0xdb),p1(0xc0),p1(0xfe),p1(0x78),p1(0xcd),p1(0x5a),p1(0xf4)
+#define ib_data6(p1) \
+	.long	p1(0x1f),p1(0xdd),p1(0xa8),p1(0x33),p1(0x88),p1(0x07),p1(0xc7),p1(0x31) ;\
+	.long	p1(0xb1),p1(0x12),p1(0x10),p1(0x59),p1(0x27),p1(0x80),p1(0xec),p1(0x5f) ;\
+	.long	p1(0x60),p1(0x51),p1(0x7f),p1(0xa9),p1(0x19),p1(0xb5),p1(0x4a),p1(0x0d) ;\
+	.long	p1(0x2d),p1(0xe5),p1(0x7a),p1(0x9f),p1(0x93),p1(0xc9),p1(0x9c),p1(0xef)
+#define ib_data7(p1) \
+	.long	p1(0xa0),p1(0xe0),p1(0x3b),p1(0x4d),p1(0xae),p1(0x2a),p1(0xf5),p1(0xb0) ;\
+	.long	p1(0xc8),p1(0xeb),p1(0xbb),p1(0x3c),p1(0x83),p1(0x53),p1(0x99),p1(0x61) ;\
+	.long	p1(0x17),p1(0x2b),p1(0x04),p1(0x7e),p1(0xba),p1(0x77),p1(0xd6),p1(0x26) ;\
+	.long	p1(0xe1),p1(0x69),p1(0x14),p1(0x63),p1(0x55),p1(0x21),p1(0x0c),p1(0x7d)
+
+// The rcon_table (needed for the key schedule)
+//
+// Here is original Dr Brian Gladman's source code:
+//	_rcon_tab:
+//	%assign x   1
+//	%rep 29
+//	    dd  x
+//	%assign x f2(x)
+//	%endrep
+//
+// Here is precomputed output (it's more portable this way):
+
+	.align	ALIGN32BYTES
+aes_rcon_tab:
+	.long	0x01,0x02,0x04,0x08,0x10,0x20,0x40,0x80
+	.long	0x1b,0x36,0x6c,0xd8,0xab,0x4d,0x9a,0x2f
+	.long	0x5e,0xbc,0x63,0xc6,0x97,0x35,0x6a,0xd4
+	.long	0xb3,0x7d,0xfa,0xef,0xc5
+
+// The forward xor tables
+
+	.align	ALIGN32BYTES
+aes_ft_tab:
+	sb_data0(u0)
+	sb_data1(u0)
+	sb_data2(u0)
+	sb_data3(u0)
+	sb_data4(u0)
+	sb_data5(u0)
+	sb_data6(u0)
+	sb_data7(u0)
+
+	sb_data0(u1)
+	sb_data1(u1)
+	sb_data2(u1)
+	sb_data3(u1)
+	sb_data4(u1)
+	sb_data5(u1)
+	sb_data6(u1)
+	sb_data7(u1)
+
+	sb_data0(u2)
+	sb_data1(u2)
+	sb_data2(u2)
+	sb_data3(u2)
+	sb_data4(u2)
+	sb_data5(u2)
+	sb_data6(u2)
+	sb_data7(u2)
+
+	sb_data0(u3)
+	sb_data1(u3)
+	sb_data2(u3)
+	sb_data3(u3)
+	sb_data4(u3)
+	sb_data5(u3)
+	sb_data6(u3)
+	sb_data7(u3)
+
+	.align	ALIGN32BYTES
+aes_fl_tab:
+	sb_data0(w0)
+	sb_data1(w0)
+	sb_data2(w0)
+	sb_data3(w0)
+	sb_data4(w0)
+	sb_data5(w0)
+	sb_data6(w0)
+	sb_data7(w0)
+
+	sb_data0(w1)
+	sb_data1(w1)
+	sb_data2(w1)
+	sb_data3(w1)
+	sb_data4(w1)
+	sb_data5(w1)
+	sb_data6(w1)
+	sb_data7(w1)
+
+	sb_data0(w2)
+	sb_data1(w2)
+	sb_data2(w2)
+	sb_data3(w2)
+	sb_data4(w2)
+	sb_data5(w2)
+	sb_data6(w2)
+	sb_data7(w2)
+
+	sb_data0(w3)
+	sb_data1(w3)
+	sb_data2(w3)
+	sb_data3(w3)
+	sb_data4(w3)
+	sb_data5(w3)
+	sb_data6(w3)
+	sb_data7(w3)
+
+// The inverse xor tables
+
+	.align	ALIGN32BYTES
+aes_it_tab:
+	ib_data0(v0)
+	ib_data1(v0)
+	ib_data2(v0)
+	ib_data3(v0)
+	ib_data4(v0)
+	ib_data5(v0)
+	ib_data6(v0)
+	ib_data7(v0)
+
+	ib_data0(v1)
+	ib_data1(v1)
+	ib_data2(v1)
+	ib_data3(v1)
+	ib_data4(v1)
+	ib_data5(v1)
+	ib_data6(v1)
+	ib_data7(v1)
+
+	ib_data0(v2)
+	ib_data1(v2)
+	ib_data2(v2)
+	ib_data3(v2)
+	ib_data4(v2)
+	ib_data5(v2)
+	ib_data6(v2)
+	ib_data7(v2)
+
+	ib_data0(v3)
+	ib_data1(v3)
+	ib_data2(v3)
+	ib_data3(v3)
+	ib_data4(v3)
+	ib_data5(v3)
+	ib_data6(v3)
+	ib_data7(v3)
+
+	.align	ALIGN32BYTES
+aes_il_tab:
+	ib_data0(w0)
+	ib_data1(w0)
+	ib_data2(w0)
+	ib_data3(w0)
+	ib_data4(w0)
+	ib_data5(w0)
+	ib_data6(w0)
+	ib_data7(w0)
+
+	ib_data0(w1)
+	ib_data1(w1)
+	ib_data2(w1)
+	ib_data3(w1)
+	ib_data4(w1)
+	ib_data5(w1)
+	ib_data6(w1)
+	ib_data7(w1)
+
+	ib_data0(w2)
+	ib_data1(w2)
+	ib_data2(w2)
+	ib_data3(w2)
+	ib_data4(w2)
+	ib_data5(w2)
+	ib_data6(w2)
+	ib_data7(w2)
+
+	ib_data0(w3)
+	ib_data1(w3)
+	ib_data2(w3)
+	ib_data3(w3)
+	ib_data4(w3)
+	ib_data5(w3)
+	ib_data6(w3)
+	ib_data7(w3)
+
+// The inverse mix column tables
+
+	.align	ALIGN32BYTES
+aes_im_tab:
+	im_data0(v0)
+	im_data1(v0)
+	im_data2(v0)
+	im_data3(v0)
+	im_data4(v0)
+	im_data5(v0)
+	im_data6(v0)
+	im_data7(v0)
+
+	im_data0(v1)
+	im_data1(v1)
+	im_data2(v1)
+	im_data3(v1)
+	im_data4(v1)
+	im_data5(v1)
+	im_data6(v1)
+	im_data7(v1)
+
+	im_data0(v2)
+	im_data1(v2)
+	im_data2(v2)
+	im_data3(v2)
+	im_data4(v2)
+	im_data5(v2)
+	im_data6(v2)
+	im_data7(v2)
+
+	im_data0(v3)
+	im_data1(v3)
+	im_data2(v3)
+	im_data3(v3)
+	im_data4(v3)
+	im_data5(v3)
+	im_data6(v3)
+	im_data7(v3)
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/misc/aes.c linux-2.4.20-wolk4.16-fullkernel/drivers/misc/aes.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/misc/aes.c	2004-06-29 11:31:54.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/misc/aes.c	2004-09-09 12:48:49.000000000 +0200
@@ -112,7 +112,7 @@
 #elif defined(__hppa__)||defined(__hppa)||defined(__HPPA__)||defined(__HPPA)||defined(__parisc__)||defined(__parisc)||defined(__sparc__)||defined(__sparc)||defined(__sparc_v9__)||defined(__sparc_v9)||defined(__sparc64__)||defined(__sparc64)||defined(__mc68000__)||defined(__mc68000)
 # define INTERNAL_BYTE_ORDER 2
 #elif defined(CONFIGURE_DETECTS_BYTE_ORDER)
-# if defined(WORDS_BIGENDIAN)
+# if WORDS_BIGENDIAN
 #  define INTERNAL_BYTE_ORDER 2
 # else
 #  define INTERNAL_BYTE_ORDER 1
@@ -128,7 +128,7 @@
 # include <sys/param.h>
 # if (defined(BYTE_ORDER) && defined(LITTLE_ENDIAN) && (BYTE_ORDER == LITTLE_ENDIAN)) || (defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && (__BYTE_ORDER == __LITTLE_ENDIAN))
 #  define INTERNAL_BYTE_ORDER 1
-# elif defined(WORDS_BIGENDIAN) || defined(__BIG_ENDIAN__) || (defined(BYTE_ORDER) && defined(BIG_ENDIAN) && (BYTE_ORDER == BIG_ENDIAN)) || (defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && (__BYTE_ORDER == __BIG_ENDIAN))
+# elif WORDS_BIGENDIAN || defined(__BIG_ENDIAN__) || (defined(BYTE_ORDER) && defined(BIG_ENDIAN) && (BYTE_ORDER == BIG_ENDIAN)) || (defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && (__BYTE_ORDER == __BIG_ENDIAN))
 #  define INTERNAL_BYTE_ORDER 2
 # else
 #  define INTERNAL_BYTE_ORDER 0
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/misc/aes.h linux-2.4.20-wolk4.16-fullkernel/drivers/misc/aes.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/misc/aes.h	2004-06-29 11:31:54.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/misc/aes.h	2004-09-09 12:48:49.000000000 +0200
@@ -90,17 +90,17 @@ typedef struct
 extern void aes_set_blk(aes_context *, const int);
 #endif
 
-#if defined(CONFIG_X86) && !defined(CONFIG_X86_64) && !defined(CONFIG_M386) && !defined(CONFIG_M486)
+#if defined(CONFIG_X86) || defined(CONFIG_X86_64)
  asmlinkage
 #endif
 extern void aes_set_key(aes_context *, const unsigned char [], const int, const int);
 
-#if defined(CONFIG_X86) && !defined(CONFIG_X86_64) && !defined(CONFIG_M386) && !defined(CONFIG_M486)
+#if defined(CONFIG_X86) || defined(CONFIG_X86_64)
  asmlinkage
 #endif
 extern void aes_encrypt(const aes_context *, const unsigned char [], unsigned char []);
 
-#if defined(CONFIG_X86) && !defined(CONFIG_X86_64) && !defined(CONFIG_M386) && !defined(CONFIG_M486)
+#if defined(CONFIG_X86) || defined(CONFIG_X86_64)
  asmlinkage
 #endif
 extern void aes_decrypt(const aes_context *, const unsigned char [], unsigned char []);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/misc/md5-amd64.S linux-2.4.20-wolk4.16-fullkernel/drivers/misc/md5-amd64.S
--- linux-2.4.20-wolk4.15-fullkernel/drivers/misc/md5-amd64.S	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/misc/md5-amd64.S	2004-09-09 12:48:49.000000000 +0200
@@ -0,0 +1,200 @@
+//
+//  md5-amd64.S
+//
+//  Written by Jari Ruusu, October 1 2003
+//
+//  Copyright 2003 by Jari Ruusu.
+//  Redistribution of this file is permitted under the GNU Public License.
+//
+
+//  Modified by Jari Ruusu,  June 12 2004
+//   - Converted 32 bit x86 code to 64 bit AMD64 code
+
+// A MD5 transform implementation for AMD64 compatible processors.
+// This code does not preserve the rax, rcx, rdx, rsi, rdi or r8-r11
+// registers or the artihmetic status flags. However, the rbx, rbp and
+// r12-r15 registers are preserved across calls.
+
+// void md5_transform_CPUbyteorder(u_int32_t *hash, u_int32_t *in)
+
+#if defined(USE_UNDERLINE)
+# define md5_transform_CPUbyteorder _md5_transform_CPUbyteorder
+#endif
+#if !defined(ALIGN64BYTES)
+# define ALIGN64BYTES 64
+#endif
+
+	.file	"md5-amd64.S"
+	.globl	md5_transform_CPUbyteorder
+
+// rdi = pointer to hash[4] array which is read and written
+// rsi = pointer to in[16] array which is read only
+
+	.text
+	.align	ALIGN64BYTES
+md5_transform_CPUbyteorder:
+	movl	12(%rdi),%eax
+	movl	8(%rdi),%ecx
+	movl	(%rdi),%r8d
+	movl	4(%rdi),%r9d
+	movl	(%rsi),%r10d
+	prefetcht0 60(%rsi)
+	movl	%eax,%edx
+	xorl	%ecx,%eax
+
+#define REPEAT1(p1w,p2x,p3z,p4c,p5s,p6Nin,p7Nz,p8Ny) \
+	addl	$p4c,p1w		;\
+	andl	p2x,%eax		;\
+	addl	%r10d,p1w		;\
+	xorl	p3z,%eax		;\
+	movl	p6Nin*4(%rsi),%r10d	;\
+	addl	%eax,p1w		;\
+	movl	p7Nz,%eax		;\
+	roll	$p5s,p1w		;\
+	xorl	p8Ny,%eax		;\
+	addl	p2x,p1w
+
+	REPEAT1(%r8d,%r9d,%edx,0xd76aa478, 7, 1,%ecx,%r9d)
+	REPEAT1(%edx,%r8d,%ecx,0xe8c7b756,12, 2,%r9d,%r8d)
+	REPEAT1(%ecx,%edx,%r9d,0x242070db,17, 3,%r8d,%edx)
+	REPEAT1(%r9d,%ecx,%r8d,0xc1bdceee,22, 4,%edx,%ecx)
+	REPEAT1(%r8d,%r9d,%edx,0xf57c0faf, 7, 5,%ecx,%r9d)
+	REPEAT1(%edx,%r8d,%ecx,0x4787c62a,12, 6,%r9d,%r8d)
+	REPEAT1(%ecx,%edx,%r9d,0xa8304613,17, 7,%r8d,%edx)
+	REPEAT1(%r9d,%ecx,%r8d,0xfd469501,22, 8,%edx,%ecx)
+	REPEAT1(%r8d,%r9d,%edx,0x698098d8, 7, 9,%ecx,%r9d)
+	REPEAT1(%edx,%r8d,%ecx,0x8b44f7af,12,10,%r9d,%r8d)
+	REPEAT1(%ecx,%edx,%r9d,0xffff5bb1,17,11,%r8d,%edx)
+	REPEAT1(%r9d,%ecx,%r8d,0x895cd7be,22,12,%edx,%ecx)
+	REPEAT1(%r8d,%r9d,%edx,0x6b901122, 7,13,%ecx,%r9d)
+	REPEAT1(%edx,%r8d,%ecx,0xfd987193,12,14,%r9d,%r8d)
+	REPEAT1(%ecx,%edx,%r9d,0xa679438e,17,15,%r8d,%edx)
+
+	addl	$0x49b40821,%r9d
+	andl	%ecx,%eax
+	addl	%r10d,%r9d
+	xorl	%r8d,%eax
+	movl	1*4(%rsi),%r10d
+	addl	%eax,%r9d
+	movl	%ecx,%eax
+	roll	$22,%r9d
+	addl	%ecx,%r9d
+
+#define REPEAT2(p1w,p2x,p3y,p4z,p5c,p6s,p7Nin,p8Ny) \
+	xorl	p2x,%eax		;\
+	addl	$p5c,p1w		;\
+	andl	p4z,%eax		;\
+	addl	%r10d,p1w		;\
+	xorl	p3y,%eax		;\
+	movl	p7Nin*4(%rsi),%r10d	;\
+	addl	%eax,p1w		;\
+	movl	p8Ny,%eax		;\
+	roll	$p6s,p1w		;\
+	addl	p2x,p1w
+
+	REPEAT2(%r8d,%r9d,%ecx,%edx,0xf61e2562, 5, 6,%r9d)
+	REPEAT2(%edx,%r8d,%r9d,%ecx,0xc040b340, 9,11,%r8d)
+	REPEAT2(%ecx,%edx,%r8d,%r9d,0x265e5a51,14, 0,%edx)
+	REPEAT2(%r9d,%ecx,%edx,%r8d,0xe9b6c7aa,20, 5,%ecx)
+	REPEAT2(%r8d,%r9d,%ecx,%edx,0xd62f105d, 5,10,%r9d)
+	REPEAT2(%edx,%r8d,%r9d,%ecx,0x02441453, 9,15,%r8d)
+	REPEAT2(%ecx,%edx,%r8d,%r9d,0xd8a1e681,14, 4,%edx)
+	REPEAT2(%r9d,%ecx,%edx,%r8d,0xe7d3fbc8,20, 9,%ecx)
+	REPEAT2(%r8d,%r9d,%ecx,%edx,0x21e1cde6, 5,14,%r9d)
+	REPEAT2(%edx,%r8d,%r9d,%ecx,0xc33707d6, 9, 3,%r8d)
+	REPEAT2(%ecx,%edx,%r8d,%r9d,0xf4d50d87,14, 8,%edx)
+	REPEAT2(%r9d,%ecx,%edx,%r8d,0x455a14ed,20,13,%ecx)
+	REPEAT2(%r8d,%r9d,%ecx,%edx,0xa9e3e905, 5, 2,%r9d)
+	REPEAT2(%edx,%r8d,%r9d,%ecx,0xfcefa3f8, 9, 7,%r8d)
+	REPEAT2(%ecx,%edx,%r8d,%r9d,0x676f02d9,14,12,%edx)
+
+	xorl	%ecx,%eax
+	addl	$0x8d2a4c8a,%r9d
+	andl	%r8d,%eax
+	addl	%r10d,%r9d
+	xorl	%edx,%eax
+	movl	5*4(%rsi),%r10d
+	addl	%eax,%r9d
+	movl	%ecx,%eax
+	roll	$20,%r9d
+	xorl	%edx,%eax
+	addl	%ecx,%r9d
+
+#define REPEAT3(p1w,p2x,p3c,p4s,p5Nin,p6Ny,p7Nz) \
+	addl	$p3c,p1w		;\
+	xorl	p2x,%eax		;\
+	addl	%r10d,p1w		;\
+	movl	p5Nin*4(%rsi),%r10d	;\
+	addl	%eax,p1w		;\
+	movl	p6Ny,%eax		;\
+	roll	$p4s,p1w		;\
+	xorl	p7Nz,%eax		;\
+	addl	p2x,p1w
+
+	REPEAT3(%r8d,%r9d,0xfffa3942, 4, 8,%r9d,%ecx)
+	REPEAT3(%edx,%r8d,0x8771f681,11,11,%r8d,%r9d)
+	REPEAT3(%ecx,%edx,0x6d9d6122,16,14,%edx,%r8d)
+	REPEAT3(%r9d,%ecx,0xfde5380c,23, 1,%ecx,%edx)
+	REPEAT3(%r8d,%r9d,0xa4beea44, 4, 4,%r9d,%ecx)
+	REPEAT3(%edx,%r8d,0x4bdecfa9,11, 7,%r8d,%r9d)
+	REPEAT3(%ecx,%edx,0xf6bb4b60,16,10,%edx,%r8d)
+	REPEAT3(%r9d,%ecx,0xbebfbc70,23,13,%ecx,%edx)
+	REPEAT3(%r8d,%r9d,0x289b7ec6, 4, 0,%r9d,%ecx)
+	REPEAT3(%edx,%r8d,0xeaa127fa,11, 3,%r8d,%r9d)
+	REPEAT3(%ecx,%edx,0xd4ef3085,16, 6,%edx,%r8d)
+	REPEAT3(%r9d,%ecx,0x04881d05,23, 9,%ecx,%edx)
+	REPEAT3(%r8d,%r9d,0xd9d4d039, 4,12,%r9d,%ecx)
+	REPEAT3(%edx,%r8d,0xe6db99e5,11,15,%r8d,%r9d)
+	REPEAT3(%ecx,%edx,0x1fa27cf8,16, 2,%edx,%r8d)
+
+	addl	$0xc4ac5665,%r9d
+	xorl	%ecx,%eax
+	addl	%r10d,%r9d
+	movl	(%rsi),%r10d
+	addl	%eax,%r9d
+	movl	%edx,%eax
+	roll	$23,%r9d
+	notl	%eax
+	addl	%ecx,%r9d
+
+#define REPEAT4(p1w,p2x,p3y,p4c,p5s,p6Nin,p7Nz) \
+	addl	$p4c,p1w		;\
+	orl	p2x,%eax		;\
+	addl	%r10d,p1w		;\
+	xorl	p3y,%eax		;\
+	movl	p6Nin*4(%rsi),%r10d	;\
+	addl	%eax,p1w		;\
+	movl	p7Nz,%eax		;\
+	roll	$p5s,p1w		;\
+	notl	%eax			;\
+	addl	p2x,p1w
+
+	REPEAT4(%r8d,%r9d,%ecx,0xf4292244, 6, 7,%ecx)
+	REPEAT4(%edx,%r8d,%r9d,0x432aff97,10,14,%r9d)
+	REPEAT4(%ecx,%edx,%r8d,0xab9423a7,15, 5,%r8d)
+	REPEAT4(%r9d,%ecx,%edx,0xfc93a039,21,12,%edx)
+	REPEAT4(%r8d,%r9d,%ecx,0x655b59c3, 6, 3,%ecx)
+	REPEAT4(%edx,%r8d,%r9d,0x8f0ccc92,10,10,%r9d)
+	REPEAT4(%ecx,%edx,%r8d,0xffeff47d,15, 1,%r8d)
+	REPEAT4(%r9d,%ecx,%edx,0x85845dd1,21, 8,%edx)
+	REPEAT4(%r8d,%r9d,%ecx,0x6fa87e4f, 6,15,%ecx)
+	REPEAT4(%edx,%r8d,%r9d,0xfe2ce6e0,10, 6,%r9d)
+	REPEAT4(%ecx,%edx,%r8d,0xa3014314,15,13,%r8d)
+	REPEAT4(%r9d,%ecx,%edx,0x4e0811a1,21, 4,%edx)
+	REPEAT4(%r8d,%r9d,%ecx,0xf7537e82, 6,11,%ecx)
+	REPEAT4(%edx,%r8d,%r9d,0xbd3af235,10, 2,%r9d)
+	REPEAT4(%ecx,%edx,%r8d,0x2ad7d2bb,15, 9,%r8d)
+
+	addl	$0xeb86d391,%r9d
+	orl	%ecx,%eax
+	addl	%r10d,%r9d
+	xorl	%edx,%eax
+	addl	%eax,%r9d
+	roll	$21,%r9d
+	addl	%ecx,%r9d
+
+	addl	%r8d,(%rdi)
+	addl	%r9d,4(%rdi)
+	addl	%ecx,8(%rdi)
+	addl	%edx,12(%rdi)
+	ret
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/misc/md5-i586.S linux-2.4.20-wolk4.16-fullkernel/drivers/misc/md5-i586.S
--- linux-2.4.20-wolk4.15-fullkernel/drivers/misc/md5-i586.S	2004-06-29 11:31:54.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/misc/md5-i586.S	1970-01-01 01:00:00.000000000 +0100
@@ -1,201 +0,0 @@
-//
-//  md5-i586.S
-//
-//  Written by Jari Ruusu, October 1 2003
-//
-//  Copyright 2003 by Jari Ruusu.
-//  Redistribution of this file is permitted under the GNU Public License.
-//
-
-// void md5_transform_CPUbyteorder(u_int32_t *hash, u_int32_t *in)
-
-#if defined(USE_UNDERLINE)
-# define md5_transform_CPUbyteorder _md5_transform_CPUbyteorder
-#endif
-#if !defined(ALIGN32BYTES)
-# define ALIGN32BYTES 32
-#endif
-
-	.file	"md5-i586.S"
-	.globl	md5_transform_CPUbyteorder
-	.text
-	.align	ALIGN32BYTES
-
-md5_transform_CPUbyteorder:
-	push	%ebp
-	mov	4+4(%esp),%eax		// pointer to 'hash' input
-	mov	8+4(%esp),%ebp		// pointer to 'in' array
-	push	%ebx
-	push	%esi
-	push	%edi
-
-	mov	(%eax),%esi
-	mov	4(%eax),%edi
-	mov	8(%eax),%ecx
-	mov	12(%eax),%eax
-	mov	(%ebp),%ebx
-	mov	%eax,%edx
-	xor	%ecx,%eax
-
-#define REPEAT1(p1w,p2x,p3z,p4c,p5s,p6Nin,p7Nz,p8Ny) \
-	add	$p4c,p1w		;\
-	and	p2x,%eax		;\
-	add	%ebx,p1w		;\
-	xor	p3z,%eax		;\
-	mov	p6Nin*4(%ebp),%ebx	;\
-	add	%eax,p1w		;\
-	mov	p7Nz,%eax		;\
-	rol	$p5s,p1w		;\
-	xor	p8Ny,%eax		;\
-	add	p2x,p1w
-
-	REPEAT1(%esi,%edi,%edx,0xd76aa478, 7, 1,%ecx,%edi)
-	REPEAT1(%edx,%esi,%ecx,0xe8c7b756,12, 2,%edi,%esi)
-	REPEAT1(%ecx,%edx,%edi,0x242070db,17, 3,%esi,%edx)
-	REPEAT1(%edi,%ecx,%esi,0xc1bdceee,22, 4,%edx,%ecx)
-	REPEAT1(%esi,%edi,%edx,0xf57c0faf, 7, 5,%ecx,%edi)
-	REPEAT1(%edx,%esi,%ecx,0x4787c62a,12, 6,%edi,%esi)
-	REPEAT1(%ecx,%edx,%edi,0xa8304613,17, 7,%esi,%edx)
-	REPEAT1(%edi,%ecx,%esi,0xfd469501,22, 8,%edx,%ecx)
-	REPEAT1(%esi,%edi,%edx,0x698098d8, 7, 9,%ecx,%edi)
-	REPEAT1(%edx,%esi,%ecx,0x8b44f7af,12,10,%edi,%esi)
-	REPEAT1(%ecx,%edx,%edi,0xffff5bb1,17,11,%esi,%edx)
-	REPEAT1(%edi,%ecx,%esi,0x895cd7be,22,12,%edx,%ecx)
-	REPEAT1(%esi,%edi,%edx,0x6b901122, 7,13,%ecx,%edi)
-	REPEAT1(%edx,%esi,%ecx,0xfd987193,12,14,%edi,%esi)
-	REPEAT1(%ecx,%edx,%edi,0xa679438e,17,15,%esi,%edx)
-
-	add	$0x49b40821,%edi
-	and	%ecx,%eax
-	add	%ebx,%edi
-	xor	%esi,%eax
-	mov	1*4(%ebp),%ebx
-	add	%eax,%edi
-	mov	%ecx,%eax
-	rol	$22,%edi
-	add	%ecx,%edi
-
-#define REPEAT2(p1w,p2x,p3y,p4z,p5c,p6s,p7Nin,p8Ny) \
-	xor	p2x,%eax		;\
-	add	$p5c,p1w		;\
-	and	p4z,%eax		;\
-	add	%ebx,p1w		;\
-	xor	p3y,%eax		;\
-	mov	p7Nin*4(%ebp),%ebx	;\
-	add	%eax,p1w		;\
-	mov	p8Ny,%eax		;\
-	rol	$p6s,p1w		;\
-	add	p2x,p1w
-
-	REPEAT2(%esi,%edi,%ecx,%edx,0xf61e2562, 5, 6,%edi)
-	REPEAT2(%edx,%esi,%edi,%ecx,0xc040b340, 9,11,%esi)
-	REPEAT2(%ecx,%edx,%esi,%edi,0x265e5a51,14, 0,%edx)
-	REPEAT2(%edi,%ecx,%edx,%esi,0xe9b6c7aa,20, 5,%ecx)
-	REPEAT2(%esi,%edi,%ecx,%edx,0xd62f105d, 5,10,%edi)
-	REPEAT2(%edx,%esi,%edi,%ecx,0x02441453, 9,15,%esi)
-	REPEAT2(%ecx,%edx,%esi,%edi,0xd8a1e681,14, 4,%edx)
-	REPEAT2(%edi,%ecx,%edx,%esi,0xe7d3fbc8,20, 9,%ecx)
-	REPEAT2(%esi,%edi,%ecx,%edx,0x21e1cde6, 5,14,%edi)
-	REPEAT2(%edx,%esi,%edi,%ecx,0xc33707d6, 9, 3,%esi)
-	REPEAT2(%ecx,%edx,%esi,%edi,0xf4d50d87,14, 8,%edx)
-	REPEAT2(%edi,%ecx,%edx,%esi,0x455a14ed,20,13,%ecx)
-	REPEAT2(%esi,%edi,%ecx,%edx,0xa9e3e905, 5, 2,%edi)
-	REPEAT2(%edx,%esi,%edi,%ecx,0xfcefa3f8, 9, 7,%esi)
-	REPEAT2(%ecx,%edx,%esi,%edi,0x676f02d9,14,12,%edx)
-
-	xor	%ecx,%eax
-	add	$0x8d2a4c8a,%edi
-	and	%esi,%eax
-	add	%ebx,%edi
-	xor	%edx,%eax
-	mov	5*4(%ebp),%ebx
-	add	%eax,%edi
-	mov	%ecx,%eax
-	rol	$20,%edi
-	xor	%edx,%eax
-	add	%ecx,%edi
-
-#define REPEAT3(p1w,p2x,p3c,p4s,p5Nin,p6Ny,p7Nz) \
-	add	$p3c,p1w		;\
-	xor	p2x,%eax		;\
-	add	%ebx,p1w		;\
-	mov	p5Nin*4(%ebp),%ebx	;\
-	add	%eax,p1w		;\
-	mov	p6Ny,%eax		;\
-	rol	$p4s,p1w		;\
-	xor	p7Nz,%eax		;\
-	add	p2x,p1w
-
-	REPEAT3(%esi,%edi,0xfffa3942, 4, 8,%edi,%ecx)
-	REPEAT3(%edx,%esi,0x8771f681,11,11,%esi,%edi)
-	REPEAT3(%ecx,%edx,0x6d9d6122,16,14,%edx,%esi)
-	REPEAT3(%edi,%ecx,0xfde5380c,23, 1,%ecx,%edx)
-	REPEAT3(%esi,%edi,0xa4beea44, 4, 4,%edi,%ecx)
-	REPEAT3(%edx,%esi,0x4bdecfa9,11, 7,%esi,%edi)
-	REPEAT3(%ecx,%edx,0xf6bb4b60,16,10,%edx,%esi)
-	REPEAT3(%edi,%ecx,0xbebfbc70,23,13,%ecx,%edx)
-	REPEAT3(%esi,%edi,0x289b7ec6, 4, 0,%edi,%ecx)
-	REPEAT3(%edx,%esi,0xeaa127fa,11, 3,%esi,%edi)
-	REPEAT3(%ecx,%edx,0xd4ef3085,16, 6,%edx,%esi)
-	REPEAT3(%edi,%ecx,0x04881d05,23, 9,%ecx,%edx)
-	REPEAT3(%esi,%edi,0xd9d4d039, 4,12,%edi,%ecx)
-	REPEAT3(%edx,%esi,0xe6db99e5,11,15,%esi,%edi)
-	REPEAT3(%ecx,%edx,0x1fa27cf8,16, 2,%edx,%esi)
-
-	add	$0xc4ac5665,%edi
-	xor	%ecx,%eax
-	add	%ebx,%edi
-	mov	(%ebp),%ebx
-	add	%eax,%edi
-	mov	%edx,%eax
-	rol	$23,%edi
-	not	%eax
-	add	%ecx,%edi
-
-#define REPEAT4(p1w,p2x,p3y,p4c,p5s,p6Nin,p7Nz) \
-	add	$p4c,p1w		;\
-	or	p2x,%eax		;\
-	add	%ebx,p1w		;\
-	xor	p3y,%eax		;\
-	mov	p6Nin*4(%ebp),%ebx	;\
-	add	%eax,p1w		;\
-	mov	p7Nz,%eax		;\
-	rol	$p5s,p1w		;\
-	not	%eax			;\
-	add	p2x,p1w
-
-	REPEAT4(%esi,%edi,%ecx,0xf4292244, 6, 7,%ecx)
-	REPEAT4(%edx,%esi,%edi,0x432aff97,10,14,%edi)
-	REPEAT4(%ecx,%edx,%esi,0xab9423a7,15, 5,%esi)
-	REPEAT4(%edi,%ecx,%edx,0xfc93a039,21,12,%edx)
-	REPEAT4(%esi,%edi,%ecx,0x655b59c3, 6, 3,%ecx)
-	REPEAT4(%edx,%esi,%edi,0x8f0ccc92,10,10,%edi)
-	REPEAT4(%ecx,%edx,%esi,0xffeff47d,15, 1,%esi)
-	REPEAT4(%edi,%ecx,%edx,0x85845dd1,21, 8,%edx)
-	REPEAT4(%esi,%edi,%ecx,0x6fa87e4f, 6,15,%ecx)
-	REPEAT4(%edx,%esi,%edi,0xfe2ce6e0,10, 6,%edi)
-	REPEAT4(%ecx,%edx,%esi,0xa3014314,15,13,%esi)
-	REPEAT4(%edi,%ecx,%edx,0x4e0811a1,21, 4,%edx)
-	REPEAT4(%esi,%edi,%ecx,0xf7537e82, 6,11,%ecx)
-	REPEAT4(%edx,%esi,%edi,0xbd3af235,10, 2,%edi)
-	REPEAT4(%ecx,%edx,%esi,0x2ad7d2bb,15, 9,%esi)
-
-	add	$0xeb86d391,%edi
-	or	%ecx,%eax
-	add	%ebx,%edi
-	xor	%edx,%eax
-	mov	4+16(%esp),%ebp		// pointer to 'hash' output
-	add	%eax,%edi
-	rol	$21,%edi
-	add	%ecx,%edi
-
-	add	%esi,(%ebp)
-	add	%edi,4(%ebp)
-	add	%ecx,8(%ebp)
-	add	%edx,12(%ebp)
-
-	pop	%edi
-	pop	%esi
-	pop	%ebx
-	pop	%ebp
-	ret
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/misc/md5-x86.S linux-2.4.20-wolk4.16-fullkernel/drivers/misc/md5-x86.S
--- linux-2.4.20-wolk4.15-fullkernel/drivers/misc/md5-x86.S	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/misc/md5-x86.S	2004-09-09 12:48:49.000000000 +0200
@@ -0,0 +1,207 @@
+//
+//  md5-x86.S
+//
+//  Written by Jari Ruusu, October 1 2003
+//
+//  Copyright 2003 by Jari Ruusu.
+//  Redistribution of this file is permitted under the GNU Public License.
+//
+
+// A MD5 transform implementation for x86 compatible processors. This
+// version uses i386 instruction set but instruction scheduling is optimized
+// for Pentium-2. This code does not preserve the eax, ecx or edx registers
+// or the artihmetic status flags. However, the ebx, esi, edi, and ebp
+// registers are preserved across calls.
+
+// void md5_transform_CPUbyteorder(u_int32_t *hash, u_int32_t *in)
+
+#if defined(USE_UNDERLINE)
+# define md5_transform_CPUbyteorder _md5_transform_CPUbyteorder
+#endif
+#if !defined(ALIGN32BYTES)
+# define ALIGN32BYTES 32
+#endif
+
+	.file	"md5-x86.S"
+	.globl	md5_transform_CPUbyteorder
+	.text
+	.align	ALIGN32BYTES
+
+md5_transform_CPUbyteorder:
+	push	%ebp
+	mov	4+4(%esp),%eax		// pointer to 'hash' input
+	mov	8+4(%esp),%ebp		// pointer to 'in' array
+	push	%ebx
+	push	%esi
+	push	%edi
+
+	mov	(%eax),%esi
+	mov	4(%eax),%edi
+	mov	8(%eax),%ecx
+	mov	12(%eax),%eax
+	mov	(%ebp),%ebx
+	mov	%eax,%edx
+	xor	%ecx,%eax
+
+#define REPEAT1(p1w,p2x,p3z,p4c,p5s,p6Nin,p7Nz,p8Ny) \
+	add	$p4c,p1w		;\
+	and	p2x,%eax		;\
+	add	%ebx,p1w		;\
+	xor	p3z,%eax		;\
+	mov	p6Nin*4(%ebp),%ebx	;\
+	add	%eax,p1w		;\
+	mov	p7Nz,%eax		;\
+	rol	$p5s,p1w		;\
+	xor	p8Ny,%eax		;\
+	add	p2x,p1w
+
+	REPEAT1(%esi,%edi,%edx,0xd76aa478, 7, 1,%ecx,%edi)
+	REPEAT1(%edx,%esi,%ecx,0xe8c7b756,12, 2,%edi,%esi)
+	REPEAT1(%ecx,%edx,%edi,0x242070db,17, 3,%esi,%edx)
+	REPEAT1(%edi,%ecx,%esi,0xc1bdceee,22, 4,%edx,%ecx)
+	REPEAT1(%esi,%edi,%edx,0xf57c0faf, 7, 5,%ecx,%edi)
+	REPEAT1(%edx,%esi,%ecx,0x4787c62a,12, 6,%edi,%esi)
+	REPEAT1(%ecx,%edx,%edi,0xa8304613,17, 7,%esi,%edx)
+	REPEAT1(%edi,%ecx,%esi,0xfd469501,22, 8,%edx,%ecx)
+	REPEAT1(%esi,%edi,%edx,0x698098d8, 7, 9,%ecx,%edi)
+	REPEAT1(%edx,%esi,%ecx,0x8b44f7af,12,10,%edi,%esi)
+	REPEAT1(%ecx,%edx,%edi,0xffff5bb1,17,11,%esi,%edx)
+	REPEAT1(%edi,%ecx,%esi,0x895cd7be,22,12,%edx,%ecx)
+	REPEAT1(%esi,%edi,%edx,0x6b901122, 7,13,%ecx,%edi)
+	REPEAT1(%edx,%esi,%ecx,0xfd987193,12,14,%edi,%esi)
+	REPEAT1(%ecx,%edx,%edi,0xa679438e,17,15,%esi,%edx)
+
+	add	$0x49b40821,%edi
+	and	%ecx,%eax
+	add	%ebx,%edi
+	xor	%esi,%eax
+	mov	1*4(%ebp),%ebx
+	add	%eax,%edi
+	mov	%ecx,%eax
+	rol	$22,%edi
+	add	%ecx,%edi
+
+#define REPEAT2(p1w,p2x,p3y,p4z,p5c,p6s,p7Nin,p8Ny) \
+	xor	p2x,%eax		;\
+	add	$p5c,p1w		;\
+	and	p4z,%eax		;\
+	add	%ebx,p1w		;\
+	xor	p3y,%eax		;\
+	mov	p7Nin*4(%ebp),%ebx	;\
+	add	%eax,p1w		;\
+	mov	p8Ny,%eax		;\
+	rol	$p6s,p1w		;\
+	add	p2x,p1w
+
+	REPEAT2(%esi,%edi,%ecx,%edx,0xf61e2562, 5, 6,%edi)
+	REPEAT2(%edx,%esi,%edi,%ecx,0xc040b340, 9,11,%esi)
+	REPEAT2(%ecx,%edx,%esi,%edi,0x265e5a51,14, 0,%edx)
+	REPEAT2(%edi,%ecx,%edx,%esi,0xe9b6c7aa,20, 5,%ecx)
+	REPEAT2(%esi,%edi,%ecx,%edx,0xd62f105d, 5,10,%edi)
+	REPEAT2(%edx,%esi,%edi,%ecx,0x02441453, 9,15,%esi)
+	REPEAT2(%ecx,%edx,%esi,%edi,0xd8a1e681,14, 4,%edx)
+	REPEAT2(%edi,%ecx,%edx,%esi,0xe7d3fbc8,20, 9,%ecx)
+	REPEAT2(%esi,%edi,%ecx,%edx,0x21e1cde6, 5,14,%edi)
+	REPEAT2(%edx,%esi,%edi,%ecx,0xc33707d6, 9, 3,%esi)
+	REPEAT2(%ecx,%edx,%esi,%edi,0xf4d50d87,14, 8,%edx)
+	REPEAT2(%edi,%ecx,%edx,%esi,0x455a14ed,20,13,%ecx)
+	REPEAT2(%esi,%edi,%ecx,%edx,0xa9e3e905, 5, 2,%edi)
+	REPEAT2(%edx,%esi,%edi,%ecx,0xfcefa3f8, 9, 7,%esi)
+	REPEAT2(%ecx,%edx,%esi,%edi,0x676f02d9,14,12,%edx)
+
+	xor	%ecx,%eax
+	add	$0x8d2a4c8a,%edi
+	and	%esi,%eax
+	add	%ebx,%edi
+	xor	%edx,%eax
+	mov	5*4(%ebp),%ebx
+	add	%eax,%edi
+	mov	%ecx,%eax
+	rol	$20,%edi
+	xor	%edx,%eax
+	add	%ecx,%edi
+
+#define REPEAT3(p1w,p2x,p3c,p4s,p5Nin,p6Ny,p7Nz) \
+	add	$p3c,p1w		;\
+	xor	p2x,%eax		;\
+	add	%ebx,p1w		;\
+	mov	p5Nin*4(%ebp),%ebx	;\
+	add	%eax,p1w		;\
+	mov	p6Ny,%eax		;\
+	rol	$p4s,p1w		;\
+	xor	p7Nz,%eax		;\
+	add	p2x,p1w
+
+	REPEAT3(%esi,%edi,0xfffa3942, 4, 8,%edi,%ecx)
+	REPEAT3(%edx,%esi,0x8771f681,11,11,%esi,%edi)
+	REPEAT3(%ecx,%edx,0x6d9d6122,16,14,%edx,%esi)
+	REPEAT3(%edi,%ecx,0xfde5380c,23, 1,%ecx,%edx)
+	REPEAT3(%esi,%edi,0xa4beea44, 4, 4,%edi,%ecx)
+	REPEAT3(%edx,%esi,0x4bdecfa9,11, 7,%esi,%edi)
+	REPEAT3(%ecx,%edx,0xf6bb4b60,16,10,%edx,%esi)
+	REPEAT3(%edi,%ecx,0xbebfbc70,23,13,%ecx,%edx)
+	REPEAT3(%esi,%edi,0x289b7ec6, 4, 0,%edi,%ecx)
+	REPEAT3(%edx,%esi,0xeaa127fa,11, 3,%esi,%edi)
+	REPEAT3(%ecx,%edx,0xd4ef3085,16, 6,%edx,%esi)
+	REPEAT3(%edi,%ecx,0x04881d05,23, 9,%ecx,%edx)
+	REPEAT3(%esi,%edi,0xd9d4d039, 4,12,%edi,%ecx)
+	REPEAT3(%edx,%esi,0xe6db99e5,11,15,%esi,%edi)
+	REPEAT3(%ecx,%edx,0x1fa27cf8,16, 2,%edx,%esi)
+
+	add	$0xc4ac5665,%edi
+	xor	%ecx,%eax
+	add	%ebx,%edi
+	mov	(%ebp),%ebx
+	add	%eax,%edi
+	mov	%edx,%eax
+	rol	$23,%edi
+	not	%eax
+	add	%ecx,%edi
+
+#define REPEAT4(p1w,p2x,p3y,p4c,p5s,p6Nin,p7Nz) \
+	add	$p4c,p1w		;\
+	or	p2x,%eax		;\
+	add	%ebx,p1w		;\
+	xor	p3y,%eax		;\
+	mov	p6Nin*4(%ebp),%ebx	;\
+	add	%eax,p1w		;\
+	mov	p7Nz,%eax		;\
+	rol	$p5s,p1w		;\
+	not	%eax			;\
+	add	p2x,p1w
+
+	REPEAT4(%esi,%edi,%ecx,0xf4292244, 6, 7,%ecx)
+	REPEAT4(%edx,%esi,%edi,0x432aff97,10,14,%edi)
+	REPEAT4(%ecx,%edx,%esi,0xab9423a7,15, 5,%esi)
+	REPEAT4(%edi,%ecx,%edx,0xfc93a039,21,12,%edx)
+	REPEAT4(%esi,%edi,%ecx,0x655b59c3, 6, 3,%ecx)
+	REPEAT4(%edx,%esi,%edi,0x8f0ccc92,10,10,%edi)
+	REPEAT4(%ecx,%edx,%esi,0xffeff47d,15, 1,%esi)
+	REPEAT4(%edi,%ecx,%edx,0x85845dd1,21, 8,%edx)
+	REPEAT4(%esi,%edi,%ecx,0x6fa87e4f, 6,15,%ecx)
+	REPEAT4(%edx,%esi,%edi,0xfe2ce6e0,10, 6,%edi)
+	REPEAT4(%ecx,%edx,%esi,0xa3014314,15,13,%esi)
+	REPEAT4(%edi,%ecx,%edx,0x4e0811a1,21, 4,%edx)
+	REPEAT4(%esi,%edi,%ecx,0xf7537e82, 6,11,%ecx)
+	REPEAT4(%edx,%esi,%edi,0xbd3af235,10, 2,%edi)
+	REPEAT4(%ecx,%edx,%esi,0x2ad7d2bb,15, 9,%esi)
+
+	add	$0xeb86d391,%edi
+	or	%ecx,%eax
+	add	%ebx,%edi
+	xor	%edx,%eax
+	mov	4+16(%esp),%ebp		// pointer to 'hash' output
+	add	%eax,%edi
+	rol	$21,%edi
+	add	%ecx,%edi
+
+	add	%esi,(%ebp)
+	add	%edi,4(%ebp)
+	add	%ecx,8(%ebp)
+	add	%edx,12(%ebp)
+
+	pop	%edi
+	pop	%esi
+	pop	%ebx
+	pop	%ebp
+	ret
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/misc/md5.h linux-2.4.20-wolk4.16-fullkernel/drivers/misc/md5.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/misc/md5.h	2004-06-29 11:31:54.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/misc/md5.h	2004-09-09 12:48:49.000000000 +0200
@@ -5,7 +5,7 @@
 #include <linux/config.h>
 #include <linux/module.h>
 
-#if defined(CONFIG_X86) && !defined(CONFIG_X86_64) && !defined(CONFIG_M386) && !defined(CONFIG_M486)
+#if defined(CONFIG_X86) || defined(CONFIG_X86_64)
  asmlinkage
 #endif
 extern void md5_transform_CPUbyteorder(u_int32_t *, u_int32_t const *);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/mtd/mtdchar.c linux-2.4.20-wolk4.16-fullkernel/drivers/mtd/mtdchar.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/mtd/mtdchar.c	2001-10-05 00:14:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/mtd/mtdchar.c	2004-09-05 16:06:00.000000000 +0200
@@ -125,11 +125,15 @@ static ssize_t mtd_read(struct file *fil
 	int ret=0;
 	int len;
 	char *kbuf;
+	loff_t pos = *ppos;
 	
 	DEBUG(MTD_DEBUG_LEVEL0,"MTD_read\n");
 
-	if (*ppos + count > mtd->size)
-		count = mtd->size - *ppos;
+	if (pos < 0 || pos > mtd->size)
+		return 0;
+
+	if (count > mtd->size - pos)
+		count = mtd->size - pos;
 
 	if (!count)
 		return 0;
@@ -146,9 +150,9 @@ static ssize_t mtd_read(struct file *fil
 		if (!kbuf)
 			return -ENOMEM;
 		
-		ret = MTD_READ(mtd, *ppos, len, &retlen, kbuf);
+		ret = MTD_READ(mtd, pos, len, &retlen, kbuf);
 		if (!ret) {
-			*ppos += retlen;
+			pos += retlen;
 			if (copy_to_user(buf, kbuf, retlen)) {
 			        kfree(kbuf);
 				return -EFAULT;
@@ -167,6 +171,8 @@ static ssize_t mtd_read(struct file *fil
 		kfree(kbuf);
 	}
 	
+	*ppos = pos;
+	
 	return total_retlen;
 } /* mtd_read */
 
@@ -176,17 +182,18 @@ static ssize_t mtd_write(struct file *fi
 	char *kbuf;
 	size_t retlen;
 	size_t total_retlen=0;
+	loff_t pos = *ppos;
 	int ret=0;
 	int len;
 
 	DEBUG(MTD_DEBUG_LEVEL0,"MTD_write\n");
 	
-	if (*ppos == mtd->size)
+	if (pos < 0 || pos >= mtd->size)
 		return -ENOSPC;
-	
-	if (*ppos + count > mtd->size)
-		count = mtd->size - *ppos;
 
+	if (count > mtd->size - pos)
+		count = mtd->size - pos;
+	
 	if (!count)
 		return 0;
 
@@ -207,9 +214,9 @@ static ssize_t mtd_write(struct file *fi
 			return -EFAULT;
 		}
 		
-	        ret = (*(mtd->write))(mtd, *ppos, len, &retlen, kbuf);
+	        ret = (*(mtd->write))(mtd, pos, len, &retlen, kbuf);
 		if (!ret) {
-			*ppos += retlen;
+			pos += retlen;
 			total_retlen += retlen;
 			count -= retlen;
 			buf += retlen;
@@ -221,6 +228,7 @@ static ssize_t mtd_write(struct file *fi
 		
 		kfree(kbuf);
 	}
+	*ppos = pos;
 
 	return total_retlen;
 } /* mtd_write */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/3c59x.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/3c59x.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/3c59x.c	2004-06-29 11:31:17.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/3c59x.c	2004-09-05 16:06:05.000000000 +0200
@@ -447,6 +447,7 @@ enum vortex_chips {
 	CH_3CCFEM656_1,
 	CH_3C450,
 	CH_3C920,
+	CH_ATI,
 	CH_3C982A,
 	CH_3C982B,
 
@@ -545,6 +546,8 @@ static struct vortex_chip_info {
 	 PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|HAS_HWCKSM, 128, },
 	{"3c920 Tornado",
 	 PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|HAS_HWCKSM, 128, },
+	{"3c920n CH_ATI 9100 IGP",
+	 PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_MII|HAS_HWCKSM, 128,},
 	{"3c982 Hydra Dual Port A",
 	 PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_HWCKSM|HAS_NWAY, 128, },
 	{"3c982 Hydra Dual Port B",
@@ -599,6 +602,7 @@ static struct pci_device_id vortex_pci_t
 	{ 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 },
+	{ 0x10B7, 0x9202, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_ATI },
 	{ 0x10B7, 0x1201, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C982A },
 	{ 0x10B7, 0x1202, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C982B },
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/Config.in linux-2.4.20-wolk4.16-fullkernel/drivers/net/Config.in
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/Config.in	2004-06-29 11:30:52.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/Config.in	2004-09-09 13:21:58.000000000 +0200
@@ -177,7 +177,8 @@ if [ "$CONFIG_NET_ETHERNET" = "y" ]; the
       fi
 
       dep_tristate '    Apricot Xen-II on board Ethernet' CONFIG_APRICOT $CONFIG_ISA
-      dep_tristate '    Broadcom BCM4400 support' CONFIG_NET_BCM4400 $CONFIG_PCI
+      dep_tristate '    Broadcom BCM4400 support (bcm4440, original Broadcom driver)' CONFIG_NET_BCM4400 $CONFIG_PCI
+      dep_tristate '    Broadcom BCM4400 support (b44, alternate driver)' CONFIG_NET_B44 $CONFIG_PCI
       dep_tristate '    CS89x0 support' CONFIG_CS89x0 $CONFIG_ISA
       dep_tristate '    DECchip Tulip (dc21x4x) PCI support' CONFIG_TULIP $CONFIG_PCI
       if [ "$CONFIG_TULIP" = "y" -o "$CONFIG_TULIP" = "m" ]; then
@@ -200,6 +201,7 @@ if [ "$CONFIG_NET_ETHERNET" = "y" ]; the
       dep_tristate '    Myson MTD-8xx PCI Ethernet support' CONFIG_FEALNX $CONFIG_PCI
       dep_tristate '    National Semiconductor DP8381x series PCI Ethernet support' CONFIG_NATSEMI $CONFIG_PCI
       dep_tristate '    PCI NE2000 and clones support (see help)' CONFIG_NE2K_PCI $CONFIG_PCI
+      dep_tristate '    nForce Ethernet support (EXPERIMENTAL)' CONFIG_NET_FORCEDETH $CONFIG_PCI $CONFIG_EXPERIMENTAL
       dep_tristate '    Novell/Eagle/Microdyne NE3210 EISA support (EXPERIMENTAL)' CONFIG_NE3210 $CONFIG_EISA $CONFIG_EXPERIMENTAL
       dep_tristate '    Racal-Interlan EISA ES3210 support (EXPERIMENTAL)' CONFIG_ES3210 $CONFIG_EISA $CONFIG_EXPERIMENTAL
       dep_tristate '    RealTek RTL-8139 C+ PCI Fast Ethernet Adapter support (EXPERIMENTAL)' CONFIG_8139CP $CONFIG_PCI $CONFIG_EXPERIMENTAL
@@ -257,35 +259,54 @@ endmenu
 
 mainmenu_option next_comment
 comment 'Ethernet (1000 Mbit)'
-bool 'Ethernet (1000 Mbit)' CONFIG_NET_GIGABIT_ETH
+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
+  if [ "$CONFIG_ACENIC" != "n" ]; then
+     bool '    Omit support for old Tigon I based AceNICs' CONFIG_ACENIC_OMIT_TIGON_I
+  fi
+  dep_tristate '  Broadcom BCM5700 support' CONFIG_NET_BCM5700 $CONFIG_PCI
+  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
+  if [ "$CONFIG_E1000" != "n" ]; then
+    bool '    Use Rx Polling (NAPI)' CONFIG_E1000_NAPI
+  fi
+  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 '  Realtek 8169 Gigabit Ethernet support' CONFIG_R8169 $CONFIG_PCI
+  dep_tristate '  SysKonnect SK-98xx / SK-95xx / Marvell Yukon Chipset Support' CONFIG_SK98LIN $CONFIG_PCI
+  if [ "$CONFIG_SK98LIN" != "n" ]; then
+	bool '    Use Rx polling (NAPI)' CONFIG_SK98LIN_NAPI
+	if [ "$CONFIG_SK98LIN" = "y" ]; then
+	  bool '    Use DualNET' CONFIG_SK98LIN_DUAL
+	  choice '        Autonegotiation' \
+	  "Sense		CONFIG_SK98LIN_AUTONEG_SENSE \
+	   On		CONFIG_SK98LIN_AUTONEG_ON \
+	   Off		CONFIG_SK98LIN_AUTONEG_OFF" Sense
+	fi
+  fi
+  dep_tristate '  SysKonnect SK-9Dxx support' CONFIG_SK9DLIN $CONFIG_PCI m
+fi
+endmenu
 
-   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
-   fi
-   dep_tristate '  Broadcom BCM5700 support' CONFIG_NET_BROADCOM $CONFIG_PCI
-   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
-   if [ "$CONFIG_E1000" != "n" ]; then
-      bool '    Use Rx Polling (NAPI)' CONFIG_E1000_NAPI
-   fi
-   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 '  Realtek 8169 Gigabit Ethernet support' CONFIG_R8169 $CONFIG_PCI
-   dep_tristate '  SysKonnect SK-98xx / SK-95xx / Marvell Yukon Chipset Support' CONFIG_SK98LIN $CONFIG_PCI
-   if [ "$CONFIG_SK98LIN" = "y" ]; then
-      bool '    Use DualNET' CONFIG_SK98LIN_DUAL
-   fi
-   dep_tristate '  SysKonnect SK-9Dxx support' CONFIG_SK9DLIN $CONFIG_PCI m
+#
+#	10 Gigabit Ethernet
+#
+
+mainmenu_option next_comment
+comment 'Ethernet (10000 Mbit)'
+bool 'Ethernet (10000 Mbit)' CONFIG_NET_10GIGABIT_ETH 
+if [ "$CONFIG_NET_10GIGABIT_ETH" = "y" ]; then
+  dep_tristate '  Intel(R) PRO/10GbE support' CONFIG_IXGB $CONFIG_PCI
 fi
 endmenu
 
+
 if [ "$CONFIG_PPC_ISERIES" = "y" ]; then
    dep_tristate 'iSeries Virtual Ethernet driver support' CONFIG_VETH $CONFIG_PPC_ISERIES
 fi
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/Makefile linux-2.4.20-wolk4.16-fullkernel/drivers/net/Makefile
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/Makefile	2004-06-29 11:30:52.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/Makefile	2004-09-09 13:21:58.000000000 +0200
@@ -40,8 +40,8 @@ ifeq ($(CONFIG_ISDN_PPP),y)
   obj-$(CONFIG_ISDN) += slhc.o
 endif
 
-ifeq ($(CONFIG_NET_BROADCOM),y)
-  obj-y += bcm/bcm5700.o
+ifeq ($(CONFIG_NET_BCM5700),y)
+  obj-y += bcm5700/bcm5700.o
 endif
 
 ifeq ($(CONFIG_NET_BCM4400),y)
@@ -61,10 +61,11 @@ subdir-$(CONFIG_DEV_APPLETALK) += applet
 subdir-$(CONFIG_SK98LIN) += sk98lin
 subdir-$(CONFIG_SK9DLIN) += sk9dlin
 subdir-$(CONFIG_SKFP) += skfp
-subdir-$(CONFIG_NET_BROADCOM) += bcm
+subdir-$(CONFIG_NET_BCM5700) += bcm5700
 subdir-$(CONFIG_NET_BCM4400) += bcm4400
 subdir-$(CONFIG_E100) += e100
 subdir-$(CONFIG_E1000) += e1000
+subdir-$(CONFIG_IXGB) += ixgb
 subdir-$(CONFIG_BONDING) += bonding
 
 #
@@ -175,6 +176,8 @@ obj-$(CONFIG_ES3210) += es3210.o 8390.o
 obj-$(CONFIG_LNE390) += lne390.o 8390.o
 obj-$(CONFIG_NE3210) += ne3210.o 8390.o
 obj-$(CONFIG_NET_SB1250_MAC) += sb1250-mac.o
+obj-$(CONFIG_NET_FORCEDETH) += forcedeth.o
+obj-$(CONFIG_NET_B44) += b44.o
 
 obj-$(CONFIG_PPP) += ppp_generic.o slhc.o
 obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/b44.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/b44.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/b44.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/b44.c	2004-09-05 15:54:48.000000000 +0200
@@ -0,0 +1,1924 @@
+/* b44.c: Broadcom 4400 device driver.
+ *
+ * Copyright (C) 2002 David S. Miller (davem@redhat.com)
+ * Fixed by Pekka Pietikainen (pp@ee.oulu.fi)
+ *
+ * Distribute under GPL.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/netdevice.h>
+#include <linux/ethtool.h>
+#include <linux/mii.h>
+#include <linux/if_ether.h>
+#include <linux/etherdevice.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/version.h>
+
+#include <asm/uaccess.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+
+#include "b44.h"
+
+#define DRV_MODULE_NAME		"b44"
+#define PFX DRV_MODULE_NAME	": "
+#define DRV_MODULE_VERSION	"0.93"
+#define DRV_MODULE_RELDATE	"Mar, 2004"
+
+#define B44_DEF_MSG_ENABLE	  \
+	(NETIF_MSG_DRV		| \
+	 NETIF_MSG_PROBE	| \
+	 NETIF_MSG_LINK		| \
+	 NETIF_MSG_TIMER	| \
+	 NETIF_MSG_IFDOWN	| \
+	 NETIF_MSG_IFUP		| \
+	 NETIF_MSG_RX_ERR	| \
+	 NETIF_MSG_TX_ERR)
+
+/* length of time before we decide the hardware is borked,
+ * and dev->tx_timeout() should be called to fix the problem
+ */
+#define B44_TX_TIMEOUT			(5 * HZ)
+
+/* hardware minimum and maximum for a single frame's data payload */
+#define B44_MIN_MTU			60
+#define B44_MAX_MTU			1500
+
+#define B44_RX_RING_SIZE		512
+#define B44_DEF_RX_RING_PENDING		200
+#define B44_RX_RING_BYTES	(sizeof(struct dma_desc) * \
+				 B44_RX_RING_SIZE)
+#define B44_TX_RING_SIZE		512
+#define B44_DEF_TX_RING_PENDING		(B44_TX_RING_SIZE - 1)
+#define B44_TX_RING_BYTES	(sizeof(struct dma_desc) * \
+				 B44_TX_RING_SIZE)
+
+#define TX_RING_GAP(BP)	\
+	(B44_TX_RING_SIZE - (BP)->tx_pending)
+#define TX_BUFFS_AVAIL(BP)						\
+	(((BP)->tx_cons <= (BP)->tx_prod) ?				\
+	  (BP)->tx_cons + (BP)->tx_pending - (BP)->tx_prod :		\
+	  (BP)->tx_cons - (BP)->tx_prod - TX_RING_GAP(BP))
+#define NEXT_TX(N)		(((N) + 1) & (B44_TX_RING_SIZE - 1))
+
+#define RX_PKT_BUF_SZ		(1536 + bp->rx_offset + 64)
+
+/* minimum number of free TX descriptors required to wake up TX process */
+#define B44_TX_WAKEUP_THRESH		(B44_TX_RING_SIZE / 4)
+
+static char version[] __devinitdata =
+	DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
+
+MODULE_AUTHOR("David S. Miller (davem@redhat.com)");
+MODULE_DESCRIPTION("Broadcom 4400 10/100 PCI ethernet driver");
+MODULE_LICENSE("GPL");
+MODULE_PARM(b44_debug, "i");
+MODULE_PARM_DESC(b44_debug, "B44 bitmapped debugging message enable value");
+
+static int b44_debug = -1;	/* -1 == use B44_DEF_MSG_ENABLE as value */
+
+static struct pci_device_id b44_pci_tbl[] = {
+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4401,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4401B0,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4401B1,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+	{ }	/* terminate list with empty entry */
+};
+
+MODULE_DEVICE_TABLE(pci, b44_pci_tbl);
+
+static void b44_halt(struct b44 *);
+static void b44_init_rings(struct b44 *);
+static void b44_init_hw(struct b44 *);
+
+static int b44_wait_bit(struct b44 *bp, unsigned long reg,
+			u32 bit, unsigned long timeout, const int clear)
+{
+	unsigned long i;
+
+	for (i = 0; i < timeout; i++) {
+		u32 val = br32(reg);
+
+		if (clear && !(val & bit))
+			break;
+		if (!clear && (val & bit))
+			break;
+		udelay(10);
+	}
+	if (i == timeout) {
+		printk(KERN_ERR PFX "%s: BUG!  Timeout waiting for bit %08x of register "
+		       "%lx to %s.\n",
+		       bp->dev->name,
+		       bit, reg,
+		       (clear ? "clear" : "set"));
+		return -ENODEV;
+	}
+	return 0;
+}
+
+/* Sonics SiliconBackplane support routines.  ROFL, you should see all the
+ * buzz words used on this company's website :-)
+ *
+ * All of these routines must be invoked with bp->lock held and
+ * interrupts disabled.
+ */
+
+#define SBID_SDRAM		0
+#define SBID_PCI_MEM		1
+#define SBID_PCI_CFG		2
+#define SBID_PCI_DMA		3
+#define	SBID_SDRAM_SWAPPED	4
+#define SBID_ENUM		5
+#define SBID_REG_SDRAM		6
+#define SBID_REG_ILINE20	7
+#define SBID_REG_EMAC		8
+#define SBID_REG_CODEC		9
+#define SBID_REG_USB		10
+#define SBID_REG_PCI		11
+#define SBID_REG_MIPS		12
+#define SBID_REG_EXTIF		13
+#define	SBID_EXTIF		14
+#define	SBID_EJTAG		15
+#define	SBID_MAX		16
+
+static u32 ssb_get_addr(struct b44 *bp, u32 id, u32 instance)
+{
+	switch (id) {
+	case SBID_PCI_DMA:
+		return 0x40000000;
+	case SBID_ENUM:
+		return 0x18000000;
+	case SBID_REG_EMAC:
+		return 0x18000000;
+	case SBID_REG_CODEC:
+		return 0x18001000;
+	case SBID_REG_PCI:
+		return 0x18002000;
+	default:
+		return 0;
+	};
+}
+
+static u32 ssb_get_core_rev(struct b44 *bp)
+{
+	return (br32(B44_SBIDHIGH) & SBIDHIGH_RC_MASK);
+}
+
+static u32 ssb_pci_setup(struct b44 *bp, u32 cores)
+{
+	u32 bar_orig, pci_rev, val;
+
+	pci_read_config_dword(bp->pdev, SSB_BAR0_WIN, &bar_orig);
+	pci_write_config_dword(bp->pdev, SSB_BAR0_WIN,
+			       ssb_get_addr(bp, SBID_REG_PCI, 0));
+	pci_rev = ssb_get_core_rev(bp);
+
+	val = br32(B44_SBINTVEC);
+	val |= cores;
+	bw32(B44_SBINTVEC, val);
+
+	val = br32(SSB_PCI_TRANS_2);
+	val |= SSB_PCI_PREF | SSB_PCI_BURST;
+	bw32(SSB_PCI_TRANS_2, val);
+
+	pci_write_config_dword(bp->pdev, SSB_BAR0_WIN, bar_orig);
+
+	return pci_rev;
+}
+
+static void ssb_core_disable(struct b44 *bp)
+{
+	if (br32(B44_SBTMSLOW) & SBTMSLOW_RESET)
+		return;
+
+	bw32(B44_SBTMSLOW, (SBTMSLOW_REJECT | SBTMSLOW_CLOCK));
+	b44_wait_bit(bp, B44_SBTMSLOW, SBTMSLOW_REJECT, 100000, 0);
+	b44_wait_bit(bp, B44_SBTMSHIGH, SBTMSHIGH_BUSY, 100000, 1);
+	bw32(B44_SBTMSLOW, (SBTMSLOW_FGC | SBTMSLOW_CLOCK |
+			    SBTMSLOW_REJECT | SBTMSLOW_RESET));
+	br32(B44_SBTMSLOW);
+	udelay(1);
+	bw32(B44_SBTMSLOW, (SBTMSLOW_REJECT | SBTMSLOW_RESET));
+	br32(B44_SBTMSLOW);
+	udelay(1);
+}
+
+static void ssb_core_reset(struct b44 *bp)
+{
+	u32 val;
+
+	ssb_core_disable(bp);
+	bw32(B44_SBTMSLOW, (SBTMSLOW_RESET | SBTMSLOW_CLOCK | SBTMSLOW_FGC));
+	br32(B44_SBTMSLOW);
+	udelay(1);
+
+	/* Clear SERR if set, this is a hw bug workaround.  */
+	if (br32(B44_SBTMSHIGH) & SBTMSHIGH_SERR)
+		bw32(B44_SBTMSHIGH, 0);
+
+	val = br32(B44_SBIMSTATE);
+	if (val & (SBIMSTATE_IBE | SBIMSTATE_TO))
+		bw32(B44_SBIMSTATE, val & ~(SBIMSTATE_IBE | SBIMSTATE_TO));
+
+	bw32(B44_SBTMSLOW, (SBTMSLOW_CLOCK | SBTMSLOW_FGC));
+	br32(B44_SBTMSLOW);
+	udelay(1);
+
+	bw32(B44_SBTMSLOW, (SBTMSLOW_CLOCK));
+	br32(B44_SBTMSLOW);
+	udelay(1);
+}
+
+static int ssb_core_unit(struct b44 *bp)
+{
+#if 0
+	u32 val = br32(B44_SBADMATCH0);
+	u32 base;
+
+	type = val & SBADMATCH0_TYPE_MASK;
+	switch (type) {
+	case 0:
+		base = val & SBADMATCH0_BS0_MASK;
+		break;
+
+	case 1:
+		base = val & SBADMATCH0_BS1_MASK;
+		break;
+
+	case 2:
+	default:
+		base = val & SBADMATCH0_BS2_MASK;
+		break;
+	};
+#endif
+	return 0;
+}
+
+static int ssb_is_core_up(struct b44 *bp)
+{
+	return ((br32(B44_SBTMSLOW) & (SBTMSLOW_RESET | SBTMSLOW_REJECT | SBTMSLOW_CLOCK))
+		== SBTMSLOW_CLOCK);
+}
+
+static void __b44_cam_write(struct b44 *bp, unsigned char *data, int index)
+{
+	u32 val;
+
+	val  = ((u32) data[2]) << 24;
+	val |= ((u32) data[3]) << 16;
+	val |= ((u32) data[4]) <<  8;
+	val |= ((u32) data[5]) <<  0;
+	bw32(B44_CAM_DATA_LO, val);
+	val = (CAM_DATA_HI_VALID | 
+	       (((u32) data[0]) << 8) |
+	       (((u32) data[1]) << 0));
+	bw32(B44_CAM_DATA_HI, val);
+	bw32(B44_CAM_CTRL, (CAM_CTRL_WRITE |
+			    (index << CAM_CTRL_INDEX_SHIFT)));
+	b44_wait_bit(bp, B44_CAM_CTRL, CAM_CTRL_BUSY, 100, 1);	
+}
+
+static inline void __b44_disable_ints(struct b44 *bp)
+{
+	bw32(B44_IMASK, 0);
+}
+
+static void b44_disable_ints(struct b44 *bp)
+{
+	__b44_disable_ints(bp);
+
+	/* Flush posted writes. */
+	br32(B44_IMASK);
+}
+
+static void b44_enable_ints(struct b44 *bp)
+{
+	bw32(B44_IMASK, bp->imask);
+}
+
+static int b44_readphy(struct b44 *bp, int reg, u32 *val)
+{
+	int err;
+
+	bw32(B44_EMAC_ISTAT, EMAC_INT_MII);
+	bw32(B44_MDIO_DATA, (MDIO_DATA_SB_START |
+			     (MDIO_OP_READ << MDIO_DATA_OP_SHIFT) |
+			     (bp->phy_addr << MDIO_DATA_PMD_SHIFT) |
+			     (reg << MDIO_DATA_RA_SHIFT) |
+			     (MDIO_TA_VALID << MDIO_DATA_TA_SHIFT)));
+	err = b44_wait_bit(bp, B44_EMAC_ISTAT, EMAC_INT_MII, 100, 0);
+	*val = br32(B44_MDIO_DATA) & MDIO_DATA_DATA;
+
+	return err;
+}
+
+static int b44_writephy(struct b44 *bp, int reg, u32 val)
+{
+	bw32(B44_EMAC_ISTAT, EMAC_INT_MII);
+	bw32(B44_MDIO_DATA, (MDIO_DATA_SB_START |
+			     (MDIO_OP_WRITE << MDIO_DATA_OP_SHIFT) |
+			     (bp->phy_addr << MDIO_DATA_PMD_SHIFT) |
+			     (reg << MDIO_DATA_RA_SHIFT) |
+			     (MDIO_TA_VALID << MDIO_DATA_TA_SHIFT) |
+			     (val & MDIO_DATA_DATA)));
+	return b44_wait_bit(bp, B44_EMAC_ISTAT, EMAC_INT_MII, 100, 0);
+}
+
+static int b44_phy_reset(struct b44 *bp)
+{
+	u32 val;
+	int err;
+
+	err = b44_writephy(bp, MII_BMCR, BMCR_RESET);
+	if (err)
+		return err;
+	udelay(100);
+	err = b44_readphy(bp, MII_BMCR, &val);
+	if (!err) {
+		if (val & BMCR_RESET) {
+			printk(KERN_ERR PFX "%s: PHY Reset would not complete.\n",
+			       bp->dev->name);
+			err = -ENODEV;
+		}
+	}
+
+	return 0;
+}
+
+static void __b44_set_flow_ctrl(struct b44 *bp, u32 pause_flags)
+{
+	u32 val;
+
+	bp->flags &= ~(B44_FLAG_TX_PAUSE | B44_FLAG_RX_PAUSE);
+	bp->flags |= pause_flags;
+
+	val = br32(B44_RXCONFIG);
+	if (pause_flags & B44_FLAG_RX_PAUSE)
+		val |= RXCONFIG_FLOW;
+	else
+		val &= ~RXCONFIG_FLOW;
+	bw32(B44_RXCONFIG, val);
+
+	val = br32(B44_MAC_FLOW);
+	if (pause_flags & B44_FLAG_TX_PAUSE)
+		val |= (MAC_FLOW_PAUSE_ENAB |
+			(0xc0 & MAC_FLOW_RX_HI_WATER));
+	else
+		val &= ~MAC_FLOW_PAUSE_ENAB;
+	bw32(B44_MAC_FLOW, val);
+}
+
+static void b44_set_flow_ctrl(struct b44 *bp, u32 local, u32 remote)
+{
+	u32 pause_enab = bp->flags & (B44_FLAG_TX_PAUSE |
+				      B44_FLAG_RX_PAUSE);
+
+	if (local & ADVERTISE_PAUSE_CAP) {
+		if (local & ADVERTISE_PAUSE_ASYM) {
+			if (remote & LPA_PAUSE_CAP)
+				pause_enab |= (B44_FLAG_TX_PAUSE |
+					       B44_FLAG_RX_PAUSE);
+			else if (remote & LPA_PAUSE_ASYM)
+				pause_enab |= B44_FLAG_RX_PAUSE;
+		} else {
+			if (remote & LPA_PAUSE_CAP)
+				pause_enab |= (B44_FLAG_TX_PAUSE |
+					       B44_FLAG_RX_PAUSE);
+		}
+	} else if (local & ADVERTISE_PAUSE_ASYM) {
+		if ((remote & LPA_PAUSE_CAP) &&
+		    (remote & LPA_PAUSE_ASYM))
+			pause_enab |= B44_FLAG_TX_PAUSE;
+	}
+
+	__b44_set_flow_ctrl(bp, pause_enab);
+}
+
+static int b44_setup_phy(struct b44 *bp)
+{
+	u32 val;
+	int err;
+
+	if ((err = b44_readphy(bp, B44_MII_ALEDCTRL, &val)) != 0)
+		goto out;
+	if ((err = b44_writephy(bp, B44_MII_ALEDCTRL,
+				val & MII_ALEDCTRL_ALLMSK)) != 0)
+		goto out;
+	if ((err = b44_readphy(bp, B44_MII_TLEDCTRL, &val)) != 0)
+		goto out;
+	if ((err = b44_writephy(bp, B44_MII_TLEDCTRL,
+				val | MII_TLEDCTRL_ENABLE)) != 0)
+		goto out;
+
+	if (!(bp->flags & B44_FLAG_FORCE_LINK)) {
+		u32 adv = ADVERTISE_CSMA;
+
+		if (bp->flags & B44_FLAG_ADV_10HALF)
+			adv |= ADVERTISE_10HALF;
+		if (bp->flags & B44_FLAG_ADV_10FULL)
+			adv |= ADVERTISE_10FULL;
+		if (bp->flags & B44_FLAG_ADV_100HALF)
+			adv |= ADVERTISE_100HALF;
+		if (bp->flags & B44_FLAG_ADV_100FULL)
+			adv |= ADVERTISE_100FULL;
+
+		if (bp->flags & B44_FLAG_PAUSE_AUTO)
+			adv |= ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM;
+
+		if ((err = b44_writephy(bp, MII_ADVERTISE, adv)) != 0)
+			goto out;
+		if ((err = b44_writephy(bp, MII_BMCR, (BMCR_ANENABLE |
+						       BMCR_ANRESTART))) != 0)
+			goto out;
+	} else {
+		u32 bmcr;
+
+		if ((err = b44_readphy(bp, MII_BMCR, &bmcr)) != 0)
+			goto out;
+		bmcr &= ~(BMCR_FULLDPLX | BMCR_ANENABLE | BMCR_SPEED100);
+		if (bp->flags & B44_FLAG_100_BASE_T)
+			bmcr |= BMCR_SPEED100;
+		if (bp->flags & B44_FLAG_FULL_DUPLEX)
+			bmcr |= BMCR_FULLDPLX;
+		if ((err = b44_writephy(bp, MII_BMCR, bmcr)) != 0)
+			goto out;
+
+		/* Since we will not be negotiating there is no safe way
+		 * to determine if the link partner supports flow control
+		 * or not.  So just disable it completely in this case.
+		 */
+		b44_set_flow_ctrl(bp, 0, 0);
+	}
+
+out:
+	return err;
+}
+
+static void b44_stats_update(struct b44 *bp)
+{
+	unsigned long reg;
+	u32 *val;
+
+	val = &bp->hw_stats.tx_good_octets;
+	for (reg = B44_TX_GOOD_O; reg <= B44_TX_PAUSE; reg += 4UL) {
+		*val++ += br32(reg);
+	}
+	val = &bp->hw_stats.rx_good_octets;
+	for (reg = B44_RX_GOOD_O; reg <= B44_RX_NPAUSE; reg += 4UL) {
+		*val++ += br32(reg);
+	}
+}
+
+static void b44_link_report(struct b44 *bp)
+{
+	if (!netif_carrier_ok(bp->dev)) {
+		printk(KERN_INFO PFX "%s: Link is down.\n", bp->dev->name);
+	} else {
+		printk(KERN_INFO PFX "%s: Link is up at %d Mbps, %s duplex.\n",
+		       bp->dev->name,
+		       (bp->flags & B44_FLAG_100_BASE_T) ? 100 : 10,
+		       (bp->flags & B44_FLAG_FULL_DUPLEX) ? "full" : "half");
+
+		printk(KERN_INFO PFX "%s: Flow control is %s for TX and "
+		       "%s for RX.\n",
+		       bp->dev->name,
+		       (bp->flags & B44_FLAG_TX_PAUSE) ? "on" : "off",
+		       (bp->flags & B44_FLAG_RX_PAUSE) ? "on" : "off");
+	}
+}
+
+static void b44_check_phy(struct b44 *bp)
+{
+	u32 bmsr, aux;
+
+	if (!b44_readphy(bp, MII_BMSR, &bmsr) &&
+	    !b44_readphy(bp, B44_MII_AUXCTRL, &aux) &&
+	    (bmsr != 0xffff)) {
+		if (aux & MII_AUXCTRL_SPEED)
+			bp->flags |= B44_FLAG_100_BASE_T;
+		else
+			bp->flags &= ~B44_FLAG_100_BASE_T;
+		if (aux & MII_AUXCTRL_DUPLEX)
+			bp->flags |= B44_FLAG_FULL_DUPLEX;
+		else
+			bp->flags &= ~B44_FLAG_FULL_DUPLEX;
+
+		if (!netif_carrier_ok(bp->dev) &&
+		    (bmsr & BMSR_LSTATUS)) {
+			u32 val = br32(B44_TX_CTRL);
+			u32 local_adv, remote_adv;
+
+			if (bp->flags & B44_FLAG_FULL_DUPLEX)
+				val |= TX_CTRL_DUPLEX;
+			else
+				val &= ~TX_CTRL_DUPLEX;
+			bw32(B44_TX_CTRL, val);
+
+			if (!(bp->flags & B44_FLAG_FORCE_LINK) &&
+			    !b44_readphy(bp, MII_ADVERTISE, &local_adv) &&
+			    !b44_readphy(bp, MII_LPA, &remote_adv))
+				b44_set_flow_ctrl(bp, local_adv, remote_adv);
+
+			/* Link now up */
+			netif_carrier_on(bp->dev);
+			b44_link_report(bp);
+		} else if (netif_carrier_ok(bp->dev) && !(bmsr & BMSR_LSTATUS)) {
+			/* Link now down */
+			netif_carrier_off(bp->dev);
+			b44_link_report(bp);
+		}
+
+		if (bmsr & BMSR_RFAULT)
+			printk(KERN_WARNING PFX "%s: Remote fault detected in PHY\n",
+			       bp->dev->name);
+		if (bmsr & BMSR_JCD)
+			printk(KERN_WARNING PFX "%s: Jabber detected in PHY\n",
+			       bp->dev->name);
+	}
+}
+
+static void b44_timer(unsigned long __opaque)
+{
+	struct b44 *bp = (struct b44 *) __opaque;
+
+	spin_lock_irq(&bp->lock);
+
+	b44_check_phy(bp);
+
+	b44_stats_update(bp);
+
+	spin_unlock_irq(&bp->lock);
+
+	bp->timer.expires = jiffies + HZ;
+	add_timer(&bp->timer);
+}
+
+static void b44_tx(struct b44 *bp)
+{
+	u32 cur, cons;
+
+	cur  = br32(B44_DMATX_STAT) & DMATX_STAT_CDMASK;
+	cur /= sizeof(struct dma_desc);
+
+	/* XXX needs updating when NETIF_F_SG is supported */
+	for (cons = bp->tx_cons; cons != cur; cons = NEXT_TX(cons)) {
+		struct ring_info *rp = &bp->tx_buffers[cons];
+		struct sk_buff *skb = rp->skb;
+
+		if (unlikely(skb == NULL))
+			BUG();
+
+		pci_unmap_single(bp->pdev,
+				 pci_unmap_addr(rp, mapping),
+				 skb->len,
+				 PCI_DMA_TODEVICE);
+		rp->skb = NULL;
+		dev_kfree_skb_irq(skb);
+	}
+
+	bp->tx_cons = cons;
+	if (netif_queue_stopped(bp->dev) &&
+	    TX_BUFFS_AVAIL(bp) > B44_TX_WAKEUP_THRESH)
+		netif_wake_queue(bp->dev);
+
+	bw32(B44_GPTIMER, 0);
+}
+
+/* Works like this.  This chip writes a 'struct rx_header" 30 bytes
+ * before the DMA address you give it.  So we allocate 30 more bytes
+ * for the RX buffer, DMA map all of it, skb_reserve the 30 bytes, then
+ * point the chip at 30 bytes past where the rx_header will go.
+ */
+static int b44_alloc_rx_skb(struct b44 *bp, int src_idx, u32 dest_idx_unmasked)
+{
+	struct dma_desc *dp;
+	struct ring_info *src_map, *map;
+	struct rx_header *rh;
+	struct sk_buff *skb;
+	dma_addr_t mapping;
+	int dest_idx;
+	u32 ctrl;
+
+	src_map = NULL;
+	if (src_idx >= 0)
+		src_map = &bp->rx_buffers[src_idx];
+	dest_idx = dest_idx_unmasked & (B44_RX_RING_SIZE - 1);
+	map = &bp->rx_buffers[dest_idx];
+	skb = dev_alloc_skb(RX_PKT_BUF_SZ);
+	if (skb == NULL)
+		return -ENOMEM;
+
+	skb->dev = bp->dev;
+	mapping = pci_map_single(bp->pdev, skb->data,
+				 RX_PKT_BUF_SZ,
+				 PCI_DMA_FROMDEVICE);
+	skb_reserve(skb, bp->rx_offset);
+
+	rh = (struct rx_header *)
+		(skb->data - bp->rx_offset);
+	rh->len = 0;
+	rh->flags = 0;
+
+	map->skb = skb;
+	pci_unmap_addr_set(map, mapping, mapping);
+
+	if (src_map != NULL)
+		src_map->skb = NULL;
+
+	ctrl  = (DESC_CTRL_LEN & (RX_PKT_BUF_SZ - bp->rx_offset));
+	if (dest_idx == (B44_RX_RING_SIZE - 1))
+		ctrl |= DESC_CTRL_EOT;
+
+	dp = &bp->rx_ring[dest_idx];
+	dp->ctrl = cpu_to_le32(ctrl);
+	dp->addr = cpu_to_le32((u32) mapping + bp->rx_offset + bp->dma_offset);
+
+	return RX_PKT_BUF_SZ;
+}
+
+static void b44_recycle_rx(struct b44 *bp, int src_idx, u32 dest_idx_unmasked)
+{
+	struct dma_desc *src_desc, *dest_desc;
+	struct ring_info *src_map, *dest_map;
+	struct rx_header *rh;
+	int dest_idx;
+	u32 ctrl;
+
+	dest_idx = dest_idx_unmasked & (B44_RX_RING_SIZE - 1);
+	dest_desc = &bp->rx_ring[dest_idx];
+	dest_map = &bp->rx_buffers[dest_idx];
+	src_desc = &bp->rx_ring[src_idx];
+	src_map = &bp->rx_buffers[src_idx];
+
+	dest_map->skb = src_map->skb;
+	rh = (struct rx_header *) src_map->skb->data;
+	rh->len = 0;
+	rh->flags = 0;
+	pci_unmap_addr_set(dest_map, mapping,
+			   pci_unmap_addr(src_map, mapping));
+
+	ctrl = src_desc->ctrl;
+	if (dest_idx == (B44_RX_RING_SIZE - 1))
+		ctrl |= cpu_to_le32(DESC_CTRL_EOT);
+	else
+		ctrl &= cpu_to_le32(~DESC_CTRL_EOT);
+
+	dest_desc->ctrl = ctrl;
+	dest_desc->addr = src_desc->addr;
+	src_map->skb = NULL;
+}
+
+static int b44_rx(struct b44 *bp, int budget)
+{
+	int received;
+	u32 cons, prod;
+
+	received = 0;
+	prod  = br32(B44_DMARX_STAT) & DMARX_STAT_CDMASK;
+	prod /= sizeof(struct dma_desc);
+	cons = bp->rx_cons;
+
+	while (cons != prod && budget > 0) {
+		struct ring_info *rp = &bp->rx_buffers[cons];
+		struct sk_buff *skb = rp->skb;
+		dma_addr_t map = pci_unmap_addr(rp, mapping);
+		struct rx_header *rh;
+		u16 len;
+
+		pci_dma_sync_single(bp->pdev, map,
+				    RX_PKT_BUF_SZ,
+				    PCI_DMA_FROMDEVICE);
+		rh = (struct rx_header *) skb->data;
+		len = cpu_to_le16(rh->len);
+		if ((len > (RX_PKT_BUF_SZ - bp->rx_offset)) ||
+		    (rh->flags & cpu_to_le16(RX_FLAG_ERRORS))) {
+		drop_it:
+			b44_recycle_rx(bp, cons, bp->rx_prod);
+		drop_it_no_recycle:
+			bp->stats.rx_dropped++;
+			goto next_pkt;
+		}
+
+		if (len == 0) {
+			int i = 0;
+
+			do {
+				udelay(2);
+				barrier();
+				len = cpu_to_le16(rh->len);
+			} while (len == 0 && i++ < 5);
+			if (len == 0)
+				goto drop_it;
+		}
+
+		/* Omit CRC. */
+		len -= 4;
+
+		if (len > RX_COPY_THRESHOLD) {
+			int skb_size;
+			skb_size = b44_alloc_rx_skb(bp, cons, bp->rx_prod);
+			if (skb_size < 0)
+				goto drop_it;
+			pci_unmap_single(bp->pdev, map,
+					 skb_size, PCI_DMA_FROMDEVICE);
+			/* Leave out rx_header */
+                	skb_put(skb, len+bp->rx_offset);
+            	        skb_pull(skb,bp->rx_offset);
+		} else {
+			struct sk_buff *copy_skb;
+
+			b44_recycle_rx(bp, cons, bp->rx_prod);
+			copy_skb = dev_alloc_skb(len + 2);
+			if (copy_skb == NULL)
+				goto drop_it_no_recycle;
+
+			copy_skb->dev = bp->dev;
+			skb_reserve(copy_skb, 2);
+			skb_put(copy_skb, len);
+			/* DMA sync done above, copy just the actual packet */
+			memcpy(copy_skb->data, skb->data+bp->rx_offset, len);
+
+			skb = copy_skb;
+		}
+		skb->ip_summed = CHECKSUM_NONE;
+		skb->protocol = eth_type_trans(skb, bp->dev);
+		netif_receive_skb(skb);
+		bp->dev->last_rx = jiffies;
+		received++;
+		budget--;
+	next_pkt:
+		bp->rx_prod = (bp->rx_prod + 1) &
+			(B44_RX_RING_SIZE - 1);
+		cons = (cons + 1) & (B44_RX_RING_SIZE - 1);
+	}
+
+	bp->rx_cons = cons;
+	bw32(B44_DMARX_PTR, cons * sizeof(struct dma_desc));
+
+	return received;
+}
+
+static int b44_poll(struct net_device *netdev, int *budget)
+{
+	struct b44 *bp = netdev->priv;
+	int done;
+
+	spin_lock_irq(&bp->lock);
+
+	if (bp->istat & (ISTAT_TX | ISTAT_TO)) {
+		/* spin_lock(&bp->tx_lock); */
+		b44_tx(bp);
+		/* spin_unlock(&bp->tx_lock); */
+	}
+	spin_unlock_irq(&bp->lock);
+
+	done = 1;
+	if (bp->istat & ISTAT_RX) {
+		int orig_budget = *budget;
+		int work_done;
+
+		if (orig_budget > netdev->quota)
+			orig_budget = netdev->quota;
+
+		work_done = b44_rx(bp, orig_budget);
+
+		*budget -= work_done;
+		netdev->quota -= work_done;
+
+		if (work_done >= orig_budget)
+			done = 0;
+	}
+
+	if (bp->istat & ISTAT_ERRORS) {
+		spin_lock_irq(&bp->lock);
+		b44_halt(bp);
+		b44_init_rings(bp);
+		b44_init_hw(bp);
+		netif_wake_queue(bp->dev);
+		spin_unlock_irq(&bp->lock);
+		done = 1;
+	}
+
+	if (done) {
+		netif_rx_complete(netdev);
+		b44_enable_ints(bp);
+	}
+
+	return (done ? 0 : 1);
+}
+
+static irqreturn_t b44_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+	struct net_device *dev = dev_id;
+	struct b44 *bp = dev->priv;
+	unsigned long flags;
+	u32 istat, imask;
+	int handled = 0;
+
+	spin_lock_irqsave(&bp->lock, flags);
+
+	istat = br32(B44_ISTAT);
+	imask = br32(B44_IMASK);
+
+	/* ??? What the fuck is the purpose of the interrupt mask
+	 * ??? register if we have to mask it out by hand anyways?
+	 */
+	istat &= imask;
+	if (istat) {
+		handled = 1;
+		if (netif_rx_schedule_prep(dev)) {
+			/* NOTE: These writes are posted by the readback of
+			 *       the ISTAT register below.
+			 */
+			bp->istat = istat;
+			__b44_disable_ints(bp);
+			__netif_rx_schedule(dev);
+		} else {
+			printk(KERN_ERR PFX "%s: Error, poll already scheduled\n",
+			       dev->name);
+		}
+
+		bw32(B44_ISTAT, istat);
+		br32(B44_ISTAT);
+	}
+	spin_unlock_irqrestore(&bp->lock, flags);
+	return IRQ_RETVAL(handled);
+}
+
+static void b44_tx_timeout(struct net_device *dev)
+{
+	struct b44 *bp = dev->priv;
+
+	printk(KERN_ERR PFX "%s: transmit timed out, resetting\n",
+	       dev->name);
+
+	spin_lock_irq(&bp->lock);
+
+	b44_halt(bp);
+	b44_init_rings(bp);
+	b44_init_hw(bp);
+
+	spin_unlock_irq(&bp->lock);
+
+	b44_enable_ints(bp);
+
+	netif_wake_queue(dev);
+}
+
+static int b44_start_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+	struct b44 *bp = dev->priv;
+	dma_addr_t mapping;
+	u32 len, entry, ctrl;
+
+	len = skb->len;
+	spin_lock_irq(&bp->lock);
+
+	/* This is a hard error, log it. */
+	if (unlikely(TX_BUFFS_AVAIL(bp) < 1)) {
+		netif_stop_queue(dev);
+		spin_unlock_irq(&bp->lock);
+		printk(KERN_ERR PFX "%s: BUG! Tx Ring full when queue awake!\n",
+		       dev->name);
+		return 1;
+	}
+
+	entry = bp->tx_prod;
+	mapping = pci_map_single(bp->pdev, skb->data, len, PCI_DMA_TODEVICE);
+
+	bp->tx_buffers[entry].skb = skb;
+	pci_unmap_addr_set(&bp->tx_buffers[entry], mapping, mapping);
+
+	ctrl  = (len & DESC_CTRL_LEN);
+	ctrl |= DESC_CTRL_IOC | DESC_CTRL_SOF | DESC_CTRL_EOF;
+	if (entry == (B44_TX_RING_SIZE - 1))
+		ctrl |= DESC_CTRL_EOT;
+
+	bp->tx_ring[entry].ctrl = cpu_to_le32(ctrl);
+	bp->tx_ring[entry].addr = cpu_to_le32((u32) mapping+bp->dma_offset);
+
+	entry = NEXT_TX(entry);
+
+	bp->tx_prod = entry;
+
+	wmb();
+
+	bw32(B44_DMATX_PTR, entry * sizeof(struct dma_desc));
+	if (bp->flags & B44_FLAG_BUGGY_TXPTR)
+		bw32(B44_DMATX_PTR, entry * sizeof(struct dma_desc));
+	if (bp->flags & B44_FLAG_REORDER_BUG)
+		br32(B44_DMATX_PTR);
+
+	if (TX_BUFFS_AVAIL(bp) < 1)
+		netif_stop_queue(dev);
+
+	spin_unlock_irq(&bp->lock);
+
+	dev->trans_start = jiffies;
+
+	return 0;
+}
+
+static int b44_change_mtu(struct net_device *dev, int new_mtu)
+{
+	struct b44 *bp = dev->priv;
+
+	if (new_mtu < B44_MIN_MTU || new_mtu > B44_MAX_MTU)
+		return -EINVAL;
+
+	if (!netif_running(dev)) {
+		/* We'll just catch it later when the
+		 * device is up'd.
+		 */
+		dev->mtu = new_mtu;
+		return 0;
+	}
+
+	spin_lock_irq(&bp->lock);
+	b44_halt(bp);
+	dev->mtu = new_mtu;
+	b44_init_rings(bp);
+	b44_init_hw(bp);
+	spin_unlock_irq(&bp->lock);
+
+	b44_enable_ints(bp);
+	
+	return 0;
+}
+
+/* Free up pending packets in all rx/tx rings.
+ *
+ * The chip has been shut down and the driver detached from
+ * the networking, so no interrupts or new tx packets will
+ * end up in the driver.  bp->lock is not held and we are not
+ * in an interrupt context and thus may sleep.
+ */
+static void b44_free_rings(struct b44 *bp)
+{
+	struct ring_info *rp;
+	int i;
+
+	for (i = 0; i < B44_RX_RING_SIZE; i++) {
+		rp = &bp->rx_buffers[i];
+
+		if (rp->skb == NULL)
+			continue;
+		pci_unmap_single(bp->pdev,
+				 pci_unmap_addr(rp, mapping),
+				 RX_PKT_BUF_SZ,
+				 PCI_DMA_FROMDEVICE);
+		dev_kfree_skb_any(rp->skb);
+		rp->skb = NULL;
+	}
+
+	/* XXX needs changes once NETIF_F_SG is set... */
+	for (i = 0; i < B44_TX_RING_SIZE; i++) {
+		rp = &bp->tx_buffers[i];
+
+		if (rp->skb == NULL)
+			continue;
+		pci_unmap_single(bp->pdev,
+				 pci_unmap_addr(rp, mapping),
+				 rp->skb->len,
+				 PCI_DMA_TODEVICE);
+		dev_kfree_skb_any(rp->skb);
+		rp->skb = NULL;
+	}
+}
+
+/* Initialize tx/rx rings for packet processing.
+ *
+ * The chip has been shut down and the driver detached from
+ * the networking, so no interrupts or new tx packets will
+ * end up in the driver.  bp->lock is not held and we are not
+ * in an interrupt context and thus may sleep.
+ */
+static void b44_init_rings(struct b44 *bp)
+{
+	int i;
+
+	b44_free_rings(bp);
+
+	memset(bp->rx_ring, 0, B44_RX_RING_BYTES);
+	memset(bp->tx_ring, 0, B44_TX_RING_BYTES);
+
+	for (i = 0; i < bp->rx_pending; i++) {
+		if (b44_alloc_rx_skb(bp, -1, i) < 0)
+			break;
+	}
+}
+
+/*
+ * Must not be invoked with interrupt sources disabled and
+ * the hardware shutdown down.
+ */
+static void b44_free_consistent(struct b44 *bp)
+{
+	if (bp->rx_buffers) {
+		kfree(bp->rx_buffers);
+		bp->rx_buffers = NULL;
+	}
+	if (bp->tx_buffers) {
+		kfree(bp->tx_buffers);
+		bp->tx_buffers = NULL;
+	}
+	if (bp->rx_ring) {
+		pci_free_consistent(bp->pdev, DMA_TABLE_BYTES,
+				    bp->rx_ring, bp->rx_ring_dma);
+		bp->rx_ring = NULL;
+	}
+	if (bp->tx_ring) {
+		pci_free_consistent(bp->pdev, DMA_TABLE_BYTES,
+				    bp->tx_ring, bp->tx_ring_dma);
+		bp->tx_ring = NULL;
+	}
+}
+
+/*
+ * Must not be invoked with interrupt sources disabled and
+ * the hardware shutdown down.  Can sleep.
+ */
+static int b44_alloc_consistent(struct b44 *bp)
+{
+	int size;
+
+	size  = B44_RX_RING_SIZE * sizeof(struct ring_info);
+	bp->rx_buffers = kmalloc(size, GFP_KERNEL);
+	if (!bp->rx_buffers)
+		goto out_err;
+	memset(bp->rx_buffers, 0, size);
+
+	size = B44_TX_RING_SIZE * sizeof(struct ring_info);
+	bp->tx_buffers = kmalloc(size, GFP_KERNEL);
+	if (!bp->tx_buffers)
+		goto out_err;
+	memset(bp->tx_buffers, 0, size);
+
+	size = DMA_TABLE_BYTES;
+	bp->rx_ring = pci_alloc_consistent(bp->pdev, size, &bp->rx_ring_dma);
+	if (!bp->rx_ring)
+		goto out_err;
+
+	bp->tx_ring = pci_alloc_consistent(bp->pdev, size, &bp->tx_ring_dma);
+	if (!bp->tx_ring)
+		goto out_err;
+
+	return 0;
+
+out_err:
+	b44_free_consistent(bp);
+	return -ENOMEM;
+}
+
+/* bp->lock is held. */
+static void b44_clear_stats(struct b44 *bp)
+{
+	unsigned long reg;
+
+	bw32(B44_MIB_CTRL, MIB_CTRL_CLR_ON_READ);
+	for (reg = B44_TX_GOOD_O; reg <= B44_TX_PAUSE; reg += 4UL)
+		br32(reg);
+	for (reg = B44_RX_GOOD_O; reg <= B44_RX_NPAUSE; reg += 4UL)
+		br32(reg);
+}
+
+/* bp->lock is held. */
+static void b44_chip_reset(struct b44 *bp)
+{
+	if (ssb_is_core_up(bp)) {
+		bw32(B44_RCV_LAZY, 0);
+		bw32(B44_ENET_CTRL, ENET_CTRL_DISABLE);
+		b44_wait_bit(bp, B44_ENET_CTRL, ENET_CTRL_DISABLE, 100, 1);
+		bw32(B44_DMATX_CTRL, 0);
+		bp->tx_prod = bp->tx_cons = 0;
+		if (br32(B44_DMARX_STAT) & DMARX_STAT_EMASK) {
+			b44_wait_bit(bp, B44_DMARX_STAT, DMARX_STAT_SIDLE,
+				     100, 0);
+		}
+		bw32(B44_DMARX_CTRL, 0);
+		bp->rx_prod = bp->rx_cons = 0;
+	} else {
+		ssb_pci_setup(bp, (bp->core_unit == 0 ?
+				   SBINTVEC_ENET0 :
+				   SBINTVEC_ENET1));
+	}
+
+	ssb_core_reset(bp);
+
+	b44_clear_stats(bp);
+
+	/* Make PHY accessible. */
+	bw32(B44_MDIO_CTRL, (MDIO_CTRL_PREAMBLE |
+			     (0x0d & MDIO_CTRL_MAXF_MASK)));
+	br32(B44_MDIO_CTRL);
+
+	if (!(br32(B44_DEVCTRL) & DEVCTRL_IPP)) {
+		bw32(B44_ENET_CTRL, ENET_CTRL_EPSEL);
+		br32(B44_ENET_CTRL);
+		bp->flags &= ~B44_FLAG_INTERNAL_PHY;
+	} else {
+		u32 val = br32(B44_DEVCTRL);
+
+		if (val & DEVCTRL_EPR) {
+			bw32(B44_DEVCTRL, (val & ~DEVCTRL_EPR));
+			br32(B44_DEVCTRL);
+			udelay(100);
+		}
+		bp->flags |= B44_FLAG_INTERNAL_PHY;
+	}
+}
+
+/* bp->lock is held. */
+static void b44_halt(struct b44 *bp)
+{
+	b44_disable_ints(bp);
+	b44_chip_reset(bp);
+}
+
+/* bp->lock is held. */
+static void __b44_set_mac_addr(struct b44 *bp)
+{
+	bw32(B44_CAM_CTRL, 0);
+	if (!(bp->dev->flags & IFF_PROMISC)) {
+		u32 val;
+
+		__b44_cam_write(bp, bp->dev->dev_addr, 0);
+		val = br32(B44_CAM_CTRL);
+		bw32(B44_CAM_CTRL, val | CAM_CTRL_ENABLE);
+	}
+}
+
+static int b44_set_mac_addr(struct net_device *dev, void *p)
+{
+	struct b44 *bp = dev->priv;
+	struct sockaddr *addr = p;
+
+	if (netif_running(dev))
+		return -EBUSY;
+
+	memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
+
+	spin_lock_irq(&bp->lock);
+	__b44_set_mac_addr(bp);
+	spin_unlock_irq(&bp->lock);
+
+	return 0;
+}
+
+/* Called at device open time to get the chip ready for
+ * packet processing.  Invoked with bp->lock held.
+ */
+static void __b44_set_rx_mode(struct net_device *);
+static void b44_init_hw(struct b44 *bp)
+{
+	u32 val;
+
+	b44_chip_reset(bp);
+	b44_phy_reset(bp);
+	b44_setup_phy(bp);
+	val = br32(B44_MAC_CTRL);
+	bw32(B44_MAC_CTRL, val | MAC_CTRL_CRC32_ENAB);
+	bw32(B44_RCV_LAZY, (1 << RCV_LAZY_FC_SHIFT));
+
+	/* This sets the MAC address too.  */
+	__b44_set_rx_mode(bp->dev);
+
+	/* MTU + eth header + possible VLAN tag + struct rx_header */
+	bw32(B44_RXMAXLEN, bp->dev->mtu + ETH_HLEN + 8 + RX_HEADER_LEN);
+	bw32(B44_TXMAXLEN, bp->dev->mtu + ETH_HLEN + 8 + RX_HEADER_LEN);
+
+	bw32(B44_TX_WMARK, 56); /* XXX magic */
+	bw32(B44_DMATX_CTRL, DMATX_CTRL_ENABLE);
+	bw32(B44_DMATX_ADDR, bp->tx_ring_dma + bp->dma_offset);
+	bw32(B44_DMARX_CTRL, (DMARX_CTRL_ENABLE |
+			      (bp->rx_offset << DMARX_CTRL_ROSHIFT)));
+	bw32(B44_DMARX_ADDR, bp->rx_ring_dma + bp->dma_offset);
+
+	bw32(B44_DMARX_PTR, bp->rx_pending);
+	bp->rx_prod = bp->rx_pending;	
+
+	bw32(B44_MIB_CTRL, MIB_CTRL_CLR_ON_READ);
+
+	val = br32(B44_ENET_CTRL);
+	bw32(B44_ENET_CTRL, (val | ENET_CTRL_ENABLE));
+}
+
+static int b44_open(struct net_device *dev)
+{
+	struct b44 *bp = dev->priv;
+	int err;
+
+	err = b44_alloc_consistent(bp);
+	if (err)
+		return err;
+
+	err = request_irq(dev->irq, b44_interrupt, SA_SHIRQ, dev->name, dev);
+	if (err)
+		goto err_out_free;
+
+	spin_lock_irq(&bp->lock);
+
+	b44_init_rings(bp);
+	b44_init_hw(bp);
+	bp->flags |= B44_FLAG_INIT_COMPLETE;
+
+	spin_unlock_irq(&bp->lock);
+
+	init_timer(&bp->timer);
+	bp->timer.expires = jiffies + HZ;
+	bp->timer.data = (unsigned long) bp;
+	bp->timer.function = b44_timer;
+	add_timer(&bp->timer);
+
+	b44_enable_ints(bp);
+
+	return 0;
+
+err_out_free:
+	b44_free_consistent(bp);
+	return err;
+}
+
+#if 0
+/*static*/ void b44_dump_state(struct b44 *bp)
+{
+	u32 val32, val32_2, val32_3, val32_4, val32_5;
+	u16 val16;
+
+	pci_read_config_word(bp->pdev, PCI_STATUS, &val16);
+	printk("DEBUG: PCI status [%04x] \n", val16);
+
+}
+#endif
+
+static int b44_close(struct net_device *dev)
+{
+	struct b44 *bp = dev->priv;
+
+	netif_stop_queue(dev);
+
+	del_timer_sync(&bp->timer);
+
+	spin_lock_irq(&bp->lock);
+
+#if 0
+	b44_dump_state(bp);
+#endif
+	b44_halt(bp);
+	b44_free_rings(bp);
+	bp->flags &= ~B44_FLAG_INIT_COMPLETE;
+	netif_carrier_off(bp->dev);
+
+	spin_unlock_irq(&bp->lock);
+
+	free_irq(dev->irq, dev);
+
+	b44_free_consistent(bp);
+
+	return 0;
+}
+
+static struct net_device_stats *b44_get_stats(struct net_device *dev)
+{
+	struct b44 *bp = dev->priv;
+	struct net_device_stats *nstat = &bp->stats;
+	struct b44_hw_stats *hwstat = &bp->hw_stats;
+
+	/* Convert HW stats into netdevice stats. */
+	nstat->rx_packets = hwstat->rx_pkts;
+	nstat->tx_packets = hwstat->tx_pkts;
+	nstat->rx_bytes   = hwstat->rx_octets;
+	nstat->tx_bytes   = hwstat->tx_octets;
+	nstat->tx_errors  = (hwstat->tx_jabber_pkts +
+			     hwstat->tx_oversize_pkts +
+			     hwstat->tx_underruns +
+			     hwstat->tx_excessive_cols +
+			     hwstat->tx_late_cols);
+	nstat->multicast  = hwstat->tx_multicast_pkts;
+	nstat->collisions = hwstat->tx_total_cols;
+
+	nstat->rx_length_errors = (hwstat->rx_oversize_pkts +
+				   hwstat->rx_undersize);
+	nstat->rx_over_errors   = hwstat->rx_missed_pkts;
+	nstat->rx_frame_errors  = hwstat->rx_align_errs;
+	nstat->rx_crc_errors    = hwstat->rx_crc_errs;
+	nstat->rx_errors        = (hwstat->rx_jabber_pkts +
+				   hwstat->rx_oversize_pkts +
+				   hwstat->rx_missed_pkts +
+				   hwstat->rx_crc_align_errs +
+				   hwstat->rx_undersize +
+				   hwstat->rx_crc_errs +
+				   hwstat->rx_align_errs +
+				   hwstat->rx_symbol_errs);
+
+	nstat->tx_aborted_errors = hwstat->tx_underruns;
+	nstat->tx_carrier_errors = hwstat->tx_carrier_lost;
+
+	return nstat;
+}
+
+static void __b44_load_mcast(struct b44 *bp, struct net_device *dev)
+{
+	struct dev_mc_list *mclist;
+	int i, num_ents;
+
+	num_ents = min_t(int, dev->mc_count, B44_MCAST_TABLE_SIZE);
+	mclist = dev->mc_list;
+	for (i = 0; mclist && i < num_ents; i++, mclist = mclist->next) {
+		__b44_cam_write(bp, mclist->dmi_addr, i + 1);
+	}
+}
+
+static void __b44_set_rx_mode(struct net_device *dev)
+{
+	struct b44 *bp = dev->priv;
+	u32 val;
+
+	val = br32(B44_RXCONFIG);
+	val &= ~(RXCONFIG_PROMISC | RXCONFIG_ALLMULTI);
+	if (dev->flags & IFF_PROMISC) {
+		val |= RXCONFIG_PROMISC;
+		bw32(B44_RXCONFIG, val);
+	} else {
+		__b44_set_mac_addr(bp);
+
+		if (dev->flags & IFF_ALLMULTI)
+			val |= RXCONFIG_ALLMULTI;
+		else
+			__b44_load_mcast(bp, dev);
+
+		bw32(B44_RXCONFIG, val);
+        	val = br32(B44_CAM_CTRL);
+	        bw32(B44_CAM_CTRL, val | CAM_CTRL_ENABLE);
+	}
+}
+
+static void b44_set_rx_mode(struct net_device *dev)
+{
+	struct b44 *bp = dev->priv;
+
+	spin_lock_irq(&bp->lock);
+	__b44_set_rx_mode(dev);
+	spin_unlock_irq(&bp->lock);
+}
+
+static int b44_ethtool_ioctl (struct net_device *dev, void __user *useraddr)
+{
+	struct b44 *bp = dev->priv;
+	struct pci_dev *pci_dev = bp->pdev;
+	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_MODULE_NAME);
+		strcpy (info.version, DRV_MODULE_VERSION);
+		memset(&info.fw_version, 0, sizeof(info.fw_version));
+		strcpy (info.bus_info, pci_name(pci_dev));
+		info.eedump_len = 0;
+		info.regdump_len = 0;
+		if (copy_to_user (useraddr, &info, sizeof (info)))
+			return -EFAULT;
+		return 0;
+	}
+
+	case ETHTOOL_GSET: {
+		struct ethtool_cmd cmd = { ETHTOOL_GSET };
+
+		if (!(bp->flags & B44_FLAG_INIT_COMPLETE))
+			return -EAGAIN;
+		cmd.supported = (SUPPORTED_Autoneg);
+		cmd.supported |= (SUPPORTED_100baseT_Half |
+				  SUPPORTED_100baseT_Full |
+				  SUPPORTED_10baseT_Half |
+				  SUPPORTED_10baseT_Full |
+				  SUPPORTED_MII);
+
+		cmd.advertising = 0;
+		if (bp->flags & B44_FLAG_ADV_10HALF)
+			cmd.advertising |= ADVERTISE_10HALF;
+		if (bp->flags & B44_FLAG_ADV_10FULL)
+			cmd.advertising |= ADVERTISE_10FULL;
+		if (bp->flags & B44_FLAG_ADV_100HALF)
+			cmd.advertising |= ADVERTISE_100HALF;
+		if (bp->flags & B44_FLAG_ADV_100FULL)
+			cmd.advertising |= ADVERTISE_100FULL;
+		cmd.advertising |= ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM;
+		cmd.speed = (bp->flags & B44_FLAG_100_BASE_T) ?
+			SPEED_100 : SPEED_10;
+		cmd.duplex = (bp->flags & B44_FLAG_FULL_DUPLEX) ?
+			DUPLEX_FULL : DUPLEX_HALF;
+		cmd.port = 0;
+		cmd.phy_address = bp->phy_addr;
+		cmd.transceiver = (bp->flags & B44_FLAG_INTERNAL_PHY) ?
+			XCVR_INTERNAL : XCVR_EXTERNAL;
+		cmd.autoneg = (bp->flags & B44_FLAG_FORCE_LINK) ?
+			AUTONEG_DISABLE : AUTONEG_ENABLE;
+		cmd.maxtxpkt = 0;
+		cmd.maxrxpkt = 0;
+		if (copy_to_user(useraddr, &cmd, sizeof(cmd)))
+			return -EFAULT;
+		return 0;
+	}
+	case ETHTOOL_SSET: {
+		struct ethtool_cmd cmd;
+
+		if (!(bp->flags & B44_FLAG_INIT_COMPLETE))
+			return -EAGAIN;
+
+		if (copy_from_user(&cmd, useraddr, sizeof(cmd)))
+			return -EFAULT;
+
+		/* We do not support gigabit. */
+		if (cmd.autoneg == AUTONEG_ENABLE) {
+			if (cmd.advertising &
+			    (ADVERTISED_1000baseT_Half |
+			     ADVERTISED_1000baseT_Full))
+				return -EINVAL;
+		} else if ((cmd.speed != SPEED_100 &&
+			    cmd.speed != SPEED_10) ||
+			   (cmd.duplex != DUPLEX_HALF &&
+			    cmd.duplex != DUPLEX_FULL)) {
+				return -EINVAL;
+		}
+
+		spin_lock_irq(&bp->lock);
+
+		if (cmd.autoneg == AUTONEG_ENABLE) {
+			bp->flags &= ~B44_FLAG_FORCE_LINK;
+			bp->flags &= ~(B44_FLAG_ADV_10HALF |
+				       B44_FLAG_ADV_10FULL |
+				       B44_FLAG_ADV_100HALF |
+				       B44_FLAG_ADV_100FULL);
+			if (cmd.advertising & ADVERTISE_10HALF)
+				bp->flags |= B44_FLAG_ADV_10HALF;
+			if (cmd.advertising & ADVERTISE_10FULL)
+				bp->flags |= B44_FLAG_ADV_10FULL;
+			if (cmd.advertising & ADVERTISE_100HALF)
+				bp->flags |= B44_FLAG_ADV_100HALF;
+			if (cmd.advertising & ADVERTISE_100FULL)
+				bp->flags |= B44_FLAG_ADV_100FULL;
+		} else {
+			bp->flags |= B44_FLAG_FORCE_LINK;
+			if (cmd.speed == SPEED_100)
+				bp->flags |= B44_FLAG_100_BASE_T;
+			if (cmd.duplex == DUPLEX_FULL)
+				bp->flags |= B44_FLAG_FULL_DUPLEX;
+		}
+
+		b44_setup_phy(bp);
+
+		spin_unlock_irq(&bp->lock);
+
+		return 0;
+	}
+
+	case ETHTOOL_GMSGLVL: {
+		struct ethtool_value edata = { ETHTOOL_GMSGLVL };
+		edata.data = bp->msg_enable;
+		if (copy_to_user(useraddr, &edata, sizeof(edata)))
+			return -EFAULT;
+		return 0;
+	}
+	case ETHTOOL_SMSGLVL: {
+		struct ethtool_value edata;
+		if (copy_from_user(&edata, useraddr, sizeof(edata)))
+			return -EFAULT;
+		bp->msg_enable = edata.data;
+		return 0;
+	}
+	case ETHTOOL_NWAY_RST: {
+		u32 bmcr;
+		int r;
+
+		spin_lock_irq(&bp->lock);
+		b44_readphy(bp, MII_BMCR, &bmcr);
+		b44_readphy(bp, MII_BMCR, &bmcr);
+		r = -EINVAL;
+		if (bmcr & BMCR_ANENABLE) {
+			b44_writephy(bp, MII_BMCR,
+				     bmcr | BMCR_ANRESTART);
+			r = 0;
+		}
+		spin_unlock_irq(&bp->lock);
+
+		return r;
+	}
+	case ETHTOOL_GLINK: {
+		struct ethtool_value edata = { ETHTOOL_GLINK };
+		edata.data = netif_carrier_ok(bp->dev) ? 1 : 0;
+		if (copy_to_user(useraddr, &edata, sizeof(edata)))
+			return -EFAULT;
+		return 0;
+	}
+	case ETHTOOL_GRINGPARAM: {
+		struct ethtool_ringparam ering = { ETHTOOL_GRINGPARAM };
+
+		ering.rx_max_pending = B44_RX_RING_SIZE - 1;
+		ering.rx_pending = bp->rx_pending;
+
+		/* XXX ethtool lacks a tx_max_pending, oops... */
+
+		if (copy_to_user(useraddr, &ering, sizeof(ering)))
+			return -EFAULT;
+		return 0;
+	}
+	case ETHTOOL_SRINGPARAM: {
+		struct ethtool_ringparam ering;
+
+		if (copy_from_user(&ering, useraddr, sizeof(ering)))
+			return -EFAULT;
+
+		if ((ering.rx_pending > B44_RX_RING_SIZE - 1) ||
+		    (ering.rx_mini_pending != 0) ||
+		    (ering.rx_jumbo_pending != 0) ||
+		    (ering.tx_pending > B44_TX_RING_SIZE - 1))
+			return -EINVAL;
+
+		spin_lock_irq(&bp->lock);
+
+		bp->rx_pending = ering.rx_pending;
+		bp->tx_pending = ering.tx_pending;
+
+		b44_halt(bp);
+		b44_init_rings(bp);
+		b44_init_hw(bp);
+		netif_wake_queue(bp->dev);
+		spin_unlock_irq(&bp->lock);
+
+		b44_enable_ints(bp);
+		
+		return 0;
+	}
+	case ETHTOOL_GPAUSEPARAM: {
+		struct ethtool_pauseparam epause = { ETHTOOL_GPAUSEPARAM };
+
+		epause.autoneg =
+			(bp->flags & B44_FLAG_PAUSE_AUTO) != 0;
+		epause.rx_pause =
+			(bp->flags & B44_FLAG_RX_PAUSE) != 0;
+		epause.tx_pause =
+			(bp->flags & B44_FLAG_TX_PAUSE) != 0;
+		if (copy_to_user(useraddr, &epause, sizeof(epause)))
+			return -EFAULT;
+		return 0;
+	}
+	case ETHTOOL_SPAUSEPARAM: {
+		struct ethtool_pauseparam epause;
+
+		if (copy_from_user(&epause, useraddr, sizeof(epause)))
+			return -EFAULT;
+
+		spin_lock_irq(&bp->lock);
+		if (epause.autoneg)
+			bp->flags |= B44_FLAG_PAUSE_AUTO;
+		else
+			bp->flags &= ~B44_FLAG_PAUSE_AUTO;
+		if (epause.rx_pause)
+			bp->flags |= B44_FLAG_RX_PAUSE;
+		else
+			bp->flags &= ~B44_FLAG_RX_PAUSE;
+		if (epause.tx_pause)
+			bp->flags |= B44_FLAG_TX_PAUSE;
+		else
+			bp->flags &= ~B44_FLAG_TX_PAUSE;
+		if (bp->flags & B44_FLAG_PAUSE_AUTO) {
+			b44_halt(bp);
+			b44_init_rings(bp);
+			b44_init_hw(bp);
+		} else {
+			__b44_set_flow_ctrl(bp, bp->flags);
+		}
+		spin_unlock_irq(&bp->lock);
+
+		b44_enable_ints(bp);
+		
+		return 0;
+	}
+	};
+
+	return -EOPNOTSUPP;
+}
+
+static int b44_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+{
+	struct mii_ioctl_data __user *data = (struct mii_ioctl_data __user *)&ifr->ifr_data;
+	struct b44 *bp = dev->priv;
+	int err;
+
+	switch (cmd) {
+	case SIOCETHTOOL:
+		return b44_ethtool_ioctl(dev, (void __user*) ifr->ifr_data);
+
+	case SIOCGMIIPHY:
+		data->phy_id = bp->phy_addr;
+
+		/* fallthru */
+	case SIOCGMIIREG: {
+		u32 mii_regval;
+
+		spin_lock_irq(&bp->lock);
+		err = b44_readphy(bp, data->reg_num & 0x1f, &mii_regval);
+		spin_unlock_irq(&bp->lock);
+
+		data->val_out = mii_regval;
+
+		return err;
+	}
+
+	case SIOCSMIIREG:
+		if (!capable(CAP_NET_ADMIN))
+			return -EPERM;
+
+		spin_lock_irq(&bp->lock);
+		err = b44_writephy(bp, data->reg_num & 0x1f, data->val_in);
+		spin_unlock_irq(&bp->lock);
+
+		return err;
+
+	default:
+		/* do nothing */
+		break;
+	};
+	return -EOPNOTSUPP;
+}
+
+/* Read 128-bytes of EEPROM. */
+static int b44_read_eeprom(struct b44 *bp, u8 *data)
+{
+	long i;
+	u16 *ptr = (u16 *) data;
+
+	for (i = 0; i < 128; i += 2)
+		ptr[i / 2] = readw(bp->regs + 4096 + i);
+
+	return 0;
+}
+
+static int __devinit b44_get_invariants(struct b44 *bp)
+{
+	u8 eeprom[128];
+	int err;
+
+	err = b44_read_eeprom(bp, &eeprom[0]);
+	if (err)
+		goto out;
+
+	bp->dev->dev_addr[0] = eeprom[79];
+	bp->dev->dev_addr[1] = eeprom[78];
+	bp->dev->dev_addr[2] = eeprom[81];
+	bp->dev->dev_addr[3] = eeprom[80];
+	bp->dev->dev_addr[4] = eeprom[83];
+	bp->dev->dev_addr[5] = eeprom[82];
+
+	bp->phy_addr = eeprom[90] & 0x1f;
+	bp->mdc_port = (eeprom[90] >> 14) & 0x1;
+
+	/* With this, plus the rx_header prepended to the data by the
+	 * hardware, we'll land the ethernet header on a 2-byte boundary.
+	 */
+	bp->rx_offset = 30;
+
+	bp->imask = IMASK_DEF;
+
+	bp->core_unit = ssb_core_unit(bp);
+	bp->dma_offset = ssb_get_addr(bp, SBID_PCI_DMA, 0);
+
+	/* XXX - really required? 
+	   bp->flags |= B44_FLAG_BUGGY_TXPTR;
+         */
+out:
+	return err;
+}
+
+static int __devinit b44_init_one(struct pci_dev *pdev,
+				  const struct pci_device_id *ent)
+{
+	static int b44_version_printed = 0;
+	unsigned long b44reg_base, b44reg_len;
+	struct net_device *dev;
+	struct b44 *bp;
+	int err, i;
+
+	if (b44_version_printed++ == 0)
+		printk(KERN_INFO "%s", version);
+
+	err = pci_enable_device(pdev);
+	if (err) {
+		printk(KERN_ERR PFX "Cannot enable PCI device, "
+		       "aborting.\n");
+		return err;
+	}
+
+	if (!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM)) {
+		printk(KERN_ERR PFX "Cannot find proper PCI device "
+		       "base address, aborting.\n");
+		err = -ENODEV;
+		goto err_out_disable_pdev;
+	}
+
+	err = pci_request_regions(pdev, DRV_MODULE_NAME);
+	if (err) {
+		printk(KERN_ERR PFX "Cannot obtain PCI resources, "
+		       "aborting.\n");
+		goto err_out_disable_pdev;
+	}
+
+	pci_set_master(pdev);
+
+	err = pci_set_dma_mask(pdev, (u64) 0xffffffff);
+	if (err) {
+		printk(KERN_ERR PFX "No usable DMA configuration, "
+		       "aborting.\n");
+		goto err_out_free_res;
+	}
+
+	b44reg_base = pci_resource_start(pdev, 0);
+	b44reg_len = pci_resource_len(pdev, 0);
+
+	dev = alloc_etherdev(sizeof(*bp));
+	if (!dev) {
+		printk(KERN_ERR PFX "Etherdev alloc failed, aborting.\n");
+		err = -ENOMEM;
+		goto err_out_free_res;
+	}
+
+	SET_MODULE_OWNER(dev);
+	SET_NETDEV_DEV(dev,&pdev->dev);
+
+	/* No interesting netdevice features in this card... */
+	dev->features |= 0;
+
+	bp = dev->priv;
+	bp->pdev = pdev;
+	bp->dev = dev;
+	if (b44_debug >= 0)
+		bp->msg_enable = (1 << b44_debug) - 1;
+	else
+		bp->msg_enable = B44_DEF_MSG_ENABLE;
+
+	spin_lock_init(&bp->lock);
+
+	bp->regs = (unsigned long) ioremap(b44reg_base, b44reg_len);
+	if (bp->regs == 0UL) {
+		printk(KERN_ERR PFX "Cannot map device registers, "
+		       "aborting.\n");
+		err = -ENOMEM;
+		goto err_out_free_dev;
+	}
+
+	bp->rx_pending = B44_DEF_RX_RING_PENDING;
+	bp->tx_pending = B44_DEF_TX_RING_PENDING;
+
+	dev->open = b44_open;
+	dev->stop = b44_close;
+	dev->hard_start_xmit = b44_start_xmit;
+	dev->get_stats = b44_get_stats;
+	dev->set_multicast_list = b44_set_rx_mode;
+	dev->set_mac_address = b44_set_mac_addr;
+	dev->do_ioctl = b44_ioctl;
+	dev->tx_timeout = b44_tx_timeout;
+	dev->poll = b44_poll;
+	dev->weight = 64;
+	dev->watchdog_timeo = B44_TX_TIMEOUT;
+	dev->change_mtu = b44_change_mtu;
+	dev->irq = pdev->irq;
+
+	err = b44_get_invariants(bp);
+	if (err) {
+		printk(KERN_ERR PFX "Problem fetching invariants of chip, "
+		       "aborting.\n");
+		goto err_out_iounmap;
+	}
+
+	/* By default, advertise all speed/duplex settings. */
+	bp->flags |= (B44_FLAG_ADV_10HALF | B44_FLAG_ADV_10FULL |
+		      B44_FLAG_ADV_100HALF | B44_FLAG_ADV_100FULL);
+
+	/* By default, auto-negotiate PAUSE. */
+	bp->flags |= B44_FLAG_PAUSE_AUTO;
+
+	err = register_netdev(dev);
+	if (err) {
+		printk(KERN_ERR PFX "Cannot register net device, "
+		       "aborting.\n");
+		goto err_out_iounmap;
+	}
+
+	pci_set_drvdata(pdev, dev);
+
+	pci_save_state(bp->pdev, bp->pci_cfg_state);
+
+	printk(KERN_INFO "%s: Broadcom 4400 10/100BaseT Ethernet ", dev->name);
+	for (i = 0; i < 6; i++)
+		printk("%2.2x%c", dev->dev_addr[i],
+		       i == 5 ? '\n' : ':');
+
+	return 0;
+
+err_out_iounmap:
+	iounmap((void *) bp->regs);
+
+err_out_free_dev:
+	free_netdev(dev);
+
+err_out_free_res:
+	pci_release_regions(pdev);
+
+err_out_disable_pdev:
+	pci_disable_device(pdev);
+	pci_set_drvdata(pdev, NULL);
+	return err;
+}
+
+static void __devexit b44_remove_one(struct pci_dev *pdev)
+{
+	struct net_device *dev = pci_get_drvdata(pdev);
+
+	if (dev) {
+		unregister_netdev(dev);
+		iounmap((void *) ((struct b44 *)(dev->priv))->regs);
+		free_netdev(dev);
+		pci_release_regions(pdev);
+		pci_disable_device(pdev);
+		pci_set_drvdata(pdev, NULL);
+	}
+}
+
+static int b44_suspend(struct pci_dev *pdev, u32 state)
+{
+	struct net_device *dev = pci_get_drvdata(pdev);
+	struct b44 *bp = dev->priv;
+
+        if (!netif_running(dev))
+                 return 0;
+
+	del_timer_sync(&bp->timer);
+
+	spin_lock_irq(&bp->lock); 
+
+	b44_halt(bp);
+	netif_carrier_off(bp->dev); 
+	netif_device_detach(bp->dev);
+	b44_free_rings(bp);
+
+	spin_unlock_irq(&bp->lock);
+	return 0;
+}
+
+static int b44_resume(struct pci_dev *pdev)
+{
+	struct net_device *dev = pci_get_drvdata(pdev);
+	struct b44 *bp = dev->priv;
+
+	pci_restore_state(pdev, bp->pci_cfg_state);
+
+	if (!netif_running(dev))
+		return 0;
+
+	spin_lock_irq(&bp->lock);
+
+	b44_init_rings(bp);
+	b44_init_hw(bp);
+	netif_device_attach(bp->dev);
+	spin_unlock_irq(&bp->lock);
+
+	bp->timer.expires = jiffies + HZ;
+	add_timer(&bp->timer);
+
+	b44_enable_ints(bp);
+	return 0;
+}
+
+static struct pci_driver b44_driver = {
+	.name		= DRV_MODULE_NAME,
+	.id_table	= b44_pci_tbl,
+	.probe		= b44_init_one,
+	.remove		= __devexit_p(b44_remove_one),
+        .suspend        = b44_suspend,
+        .resume         = b44_resume,
+};
+
+static int __init b44_init(void)
+{
+	return pci_module_init(&b44_driver);
+}
+
+static void __exit b44_cleanup(void)
+{
+	pci_unregister_driver(&b44_driver);
+}
+
+module_init(b44_init);
+module_exit(b44_cleanup);
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/b44.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/b44.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/b44.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/b44.h	2004-09-05 15:54:48.000000000 +0200
@@ -0,0 +1,543 @@
+#ifndef _B44_H
+#define _B44_H
+
+/* Register layout. */
+#define	B44_DEVCTRL	0x0000UL /* Device Control */
+#define  DEVCTRL_PFE		0x00000080 /* Pattern Filtering Enable */
+#define  DEVCTRL_IPP		0x00000400 /* Internal EPHY Present */
+#define  DEVCTRL_EPR		0x00008000 /* EPHY Reset */
+#define  DEVCTRL_PME		0x00001000 /* PHY Mode Enable */
+#define  DEVCTRL_PMCE		0x00002000 /* PHY Mode Clocks Enable */
+#define  DEVCTRL_PADDR		0x0007c000 /* PHY Address */
+#define  DEVCTRL_PADDR_SHIFT	18
+#define B44_BIST_STAT	0x000CUL /* Built-In Self-Test Status */
+#define B44_WKUP_LEN	0x0010UL /* Wakeup Length */
+#define  WKUP_LEN_P0_MASK	0x0000007f /* Pattern 0 */
+#define  WKUP_LEN_D0		0x00000080
+#define  WKUP_LEN_P1_MASK	0x00007f00 /* Pattern 1 */
+#define  WKUP_LEN_P1_SHIFT	8
+#define  WKUP_LEN_D1		0x00008000
+#define  WKUP_LEN_P2_MASK	0x007f0000 /* Pattern 2 */
+#define  WKUP_LEN_P2_SHIFT	16
+#define  WKUP_LEN_D2		0x00000000
+#define  WKUP_LEN_P3_MASK	0x7f000000 /* Pattern 3 */
+#define  WKUP_LEN_P3_SHIFT	24
+#define  WKUP_LEN_D3		0x80000000
+#define B44_ISTAT	0x0020UL /* Interrupt Status */
+#define  ISTAT_PME		0x00000040 /* Power Management Event */
+#define  ISTAT_TO		0x00000080 /* General Purpose Timeout */
+#define  ISTAT_DSCE		0x00000400 /* Descriptor Error */
+#define  ISTAT_DATAE		0x00000800 /* Data Error */
+#define  ISTAT_DPE		0x00001000 /* Descr. Protocol Error */
+#define  ISTAT_RDU		0x00002000 /* Receive Descr. Underflow */
+#define  ISTAT_RFO		0x00004000 /* Receive FIFO Overflow */
+#define  ISTAT_TFU		0x00008000 /* Transmit FIFO Underflow */
+#define  ISTAT_RX		0x00010000 /* RX Interrupt */
+#define  ISTAT_TX		0x01000000 /* TX Interrupt */
+#define  ISTAT_EMAC		0x04000000 /* EMAC Interrupt */
+#define  ISTAT_MII_WRITE	0x08000000 /* MII Write Interrupt */
+#define  ISTAT_MII_READ		0x10000000 /* MII Read Interrupt */
+#define  ISTAT_ERRORS (ISTAT_DSCE|ISTAT_DATAE|ISTAT_DPE|ISTAT_RDU|ISTAT_RFO|ISTAT_TFU)
+#define B44_IMASK	0x0024UL /* Interrupt Mask */
+#define  IMASK_DEF		(ISTAT_ERRORS | ISTAT_TO | ISTAT_RX | ISTAT_TX)
+#define B44_GPTIMER	0x0028UL /* General Purpose Timer */
+#define B44_FILT_ADDR	0x0090UL /* ENET Filter Address */
+#define B44_FILT_DATA	0x0094UL /* ENET Filter Data */
+#define B44_TXBURST	0x00A0UL /* TX Max Burst Length */
+#define B44_RXBURST	0x00A4UL /* RX Max Burst Length */
+#define B44_MAC_CTRL	0x00A8UL /* MAC Control */
+#define  MAC_CTRL_CRC32_ENAB	0x00000001 /* CRC32 Generation Enable */
+#define  MAC_CTRL_PHY_PDOWN	0x00000004 /* Onchip EPHY Powerdown */
+#define  MAC_CTRL_PHY_EDET	0x00000008 /* Onchip EPHY Energy Detected */
+#define  MAC_CTRL_PHY_LEDCTRL	0x000000e0 /* Onchip EPHY LED Control */
+#define  MAC_CTRL_PHY_LEDCTRL_SHIFT 5
+#define B44_MAC_FLOW	0x00ACUL /* MAC Flow Control */
+#define  MAC_FLOW_RX_HI_WATER	0x000000ff /* Receive FIFO HI Water Mark */
+#define  MAC_FLOW_PAUSE_ENAB	0x00008000 /* Enable Pause Frame Generation */
+#define B44_RCV_LAZY	0x0100UL /* Lazy Interrupt Control */
+#define  RCV_LAZY_TO_MASK	0x00ffffff /* Timeout */
+#define  RCV_LAZY_FC_MASK	0xff000000 /* Frame Count */
+#define  RCV_LAZY_FC_SHIFT	24
+#define B44_DMATX_CTRL	0x0200UL /* DMA TX Control */
+#define  DMATX_CTRL_ENABLE	0x00000001 /* Enable */
+#define  DMATX_CTRL_SUSPEND	0x00000002 /* Suepend Request */
+#define  DMATX_CTRL_LPBACK	0x00000004 /* Loopback Enable */
+#define  DMATX_CTRL_FAIRPRIOR	0x00000008 /* Fair Priority */
+#define  DMATX_CTRL_FLUSH	0x00000010 /* Flush Request */
+#define B44_DMATX_ADDR	0x0204UL /* DMA TX Descriptor Ring Address */
+#define B44_DMATX_PTR	0x0208UL /* DMA TX Last Posted Descriptor */
+#define B44_DMATX_STAT	0x020CUL /* DMA TX Current Active Desc. + Status */
+#define  DMATX_STAT_CDMASK	0x00000fff /* Current Descriptor Mask */
+#define  DMATX_STAT_SMASK	0x0000f000 /* State Mask */
+#define  DMATX_STAT_SDISABLED	0x00000000 /* State Disabled */
+#define  DMATX_STAT_SACTIVE	0x00001000 /* State Active */
+#define  DMATX_STAT_SIDLE	0x00002000 /* State Idle Wait */
+#define  DMATX_STAT_SSTOPPED	0x00003000 /* State Stopped */
+#define  DMATX_STAT_SSUSP	0x00004000 /* State Suspend Pending */
+#define  DMATX_STAT_EMASK	0x000f0000 /* Error Mask */
+#define  DMATX_STAT_ENONE	0x00000000 /* Error None */
+#define  DMATX_STAT_EDPE	0x00010000 /* Error Desc. Protocol Error */
+#define  DMATX_STAT_EDFU	0x00020000 /* Error Data FIFO Underrun */
+#define  DMATX_STAT_EBEBR	0x00030000 /* Error Bus Error on Buffer Read */
+#define  DMATX_STAT_EBEDA	0x00040000 /* Error Bus Error on Desc. Access */
+#define  DMATX_STAT_FLUSHED	0x00100000 /* Flushed */
+#define B44_DMARX_CTRL	0x0210UL /* DMA RX Control */
+#define  DMARX_CTRL_ENABLE	0x00000001 /* Enable */
+#define  DMARX_CTRL_ROMASK	0x000000fe /* Receive Offset Mask */
+#define  DMARX_CTRL_ROSHIFT	1 	   /* Receive Offset Shift */
+#define B44_DMARX_ADDR	0x0214UL /* DMA RX Descriptor Ring Address */
+#define B44_DMARX_PTR	0x0218UL /* DMA RX Last Posted Descriptor */
+#define B44_DMARX_STAT	0x021CUL /* DMA RX Current Active Desc. + Status */
+#define  DMARX_STAT_CDMASK	0x00000fff /* Current Descriptor Mask */
+#define  DMARX_STAT_SMASK	0x0000f000 /* State Mask */
+#define  DMARX_STAT_SDISABLED	0x00000000 /* State Disbaled */
+#define  DMARX_STAT_SACTIVE	0x00001000 /* State Active */
+#define  DMARX_STAT_SIDLE	0x00002000 /* State Idle Wait */
+#define  DMARX_STAT_SSTOPPED	0x00003000 /* State Stopped */
+#define  DMARX_STAT_EMASK	0x000f0000 /* Error Mask */
+#define  DMARX_STAT_ENONE	0x00000000 /* Error None */
+#define  DMARX_STAT_EDPE	0x00010000 /* Error Desc. Protocol Error */
+#define  DMARX_STAT_EDFO	0x00020000 /* Error Data FIFO Overflow */
+#define  DMARX_STAT_EBEBW	0x00030000 /* Error Bus Error on Buffer Write */
+#define  DMARX_STAT_EBEDA	0x00040000 /* Error Bus Error on Desc. Access */
+#define B44_DMAFIFO_AD	0x0220UL /* DMA FIFO Diag Address */
+#define  DMAFIFO_AD_OMASK	0x0000ffff /* Offset Mask */
+#define  DMAFIFO_AD_SMASK	0x000f0000 /* Select Mask */
+#define  DMAFIFO_AD_SXDD	0x00000000 /* Select Transmit DMA Data */
+#define  DMAFIFO_AD_SXDP	0x00010000 /* Select Transmit DMA Pointers */
+#define  DMAFIFO_AD_SRDD	0x00040000 /* Select Receive DMA Data */
+#define  DMAFIFO_AD_SRDP	0x00050000 /* Select Receive DMA Pointers */
+#define  DMAFIFO_AD_SXFD	0x00080000 /* Select Transmit FIFO Data */
+#define  DMAFIFO_AD_SXFP	0x00090000 /* Select Transmit FIFO Pointers */
+#define  DMAFIFO_AD_SRFD	0x000c0000 /* Select Receive FIFO Data */
+#define  DMAFIFO_AD_SRFP	0x000c0000 /* Select Receive FIFO Pointers */
+#define B44_DMAFIFO_LO	0x0224UL /* DMA FIFO Diag Low Data */
+#define B44_DMAFIFO_HI	0x0228UL /* DMA FIFO Diag High Data */
+#define B44_RXCONFIG	0x0400UL /* EMAC RX Config */
+#define  RXCONFIG_DBCAST	0x00000001 /* Disable Broadcast */
+#define  RXCONFIG_ALLMULTI	0x00000002 /* Accept All Multicast */
+#define  RXCONFIG_NORX_WHILE_TX	0x00000004 /* Receive Disable While Transmitting */
+#define  RXCONFIG_PROMISC	0x00000008 /* Promiscuous Enable */
+#define  RXCONFIG_LPBACK	0x00000010 /* Loopback Enable */
+#define  RXCONFIG_FLOW		0x00000020 /* Flow Control Enable */
+#define  RXCONFIG_FLOW_ACCEPT	0x00000040 /* Accept Unicast Flow Control Frame */
+#define  RXCONFIG_RFILT		0x00000080 /* Reject Filter */
+#define B44_RXMAXLEN	0x0404UL /* EMAC RX Max Packet Length */
+#define B44_TXMAXLEN	0x0408UL /* EMAC TX Max Packet Length */
+#define B44_MDIO_CTRL	0x0410UL /* EMAC MDIO Control */
+#define  MDIO_CTRL_MAXF_MASK	0x0000007f /* MDC Frequency */
+#define  MDIO_CTRL_PREAMBLE	0x00000080 /* MII Preamble Enable */
+#define B44_MDIO_DATA	0x0414UL /* EMAC MDIO Data */
+#define  MDIO_DATA_DATA		0x0000ffff /* R/W Data */
+#define  MDIO_DATA_TA_MASK	0x00030000 /* Turnaround Value */
+#define  MDIO_DATA_TA_SHIFT	16
+#define  MDIO_TA_VALID		2
+#define  MDIO_DATA_RA_MASK	0x007c0000 /* Register Address */
+#define  MDIO_DATA_RA_SHIFT	18
+#define  MDIO_DATA_PMD_MASK	0x0f800000 /* Physical Media Device */
+#define  MDIO_DATA_PMD_SHIFT	23
+#define  MDIO_DATA_OP_MASK	0x30000000 /* Opcode */
+#define  MDIO_DATA_OP_SHIFT	28
+#define  MDIO_OP_WRITE		1
+#define  MDIO_OP_READ		2
+#define  MDIO_DATA_SB_MASK	0xc0000000 /* Start Bits */
+#define  MDIO_DATA_SB_SHIFT	30
+#define  MDIO_DATA_SB_START	0x40000000 /* Start Of Frame */
+#define B44_EMAC_IMASK	0x0418UL /* EMAC Interrupt Mask */
+#define B44_EMAC_ISTAT	0x041CUL /* EMAC Interrupt Status */
+#define  EMAC_INT_MII		0x00000001 /* MII MDIO Interrupt */
+#define  EMAC_INT_MIB		0x00000002 /* MIB Interrupt */
+#define  EMAC_INT_FLOW		0x00000003 /* Flow Control Interrupt */
+#define B44_CAM_DATA_LO	0x0420UL /* EMAC CAM Data Low */
+#define B44_CAM_DATA_HI	0x0424UL /* EMAC CAM Data High */
+#define  CAM_DATA_HI_VALID	0x00010000 /* Valid Bit */
+#define B44_CAM_CTRL	0x0428UL /* EMAC CAM Control */
+#define  CAM_CTRL_ENABLE	0x00000001 /* CAM Enable */
+#define  CAM_CTRL_MSEL		0x00000002 /* Mask Select */
+#define  CAM_CTRL_READ		0x00000004 /* Read */
+#define  CAM_CTRL_WRITE		0x00000008 /* Read */
+#define  CAM_CTRL_INDEX_MASK	0x003f0000 /* Index Mask */
+#define  CAM_CTRL_INDEX_SHIFT	16
+#define  CAM_CTRL_BUSY		0x80000000 /* CAM Busy */
+#define B44_ENET_CTRL	0x042CUL /* EMAC ENET Control */
+#define  ENET_CTRL_ENABLE	0x00000001 /* EMAC Enable */
+#define  ENET_CTRL_DISABLE	0x00000002 /* EMAC Disable */
+#define  ENET_CTRL_SRST		0x00000004 /* EMAC Soft Reset */
+#define  ENET_CTRL_EPSEL	0x00000008 /* External PHY Select */
+#define B44_TX_CTRL	0x0430UL /* EMAC TX Control */
+#define  TX_CTRL_DUPLEX		0x00000001 /* Full Duplex */
+#define  TX_CTRL_FMODE		0x00000002 /* Flow Mode */
+#define  TX_CTRL_SBENAB		0x00000004 /* Single Backoff Enable */
+#define  TX_CTRL_SMALL_SLOT	0x00000008 /* Small Slottime */
+#define B44_TX_WMARK	0x0434UL /* EMAC TX Watermark */
+#define B44_MIB_CTRL	0x0438UL /* EMAC MIB Control */
+#define  MIB_CTRL_CLR_ON_READ	0x00000001 /* Autoclear on Read */
+#define B44_TX_GOOD_O	0x0500UL /* MIB TX Good Octets */
+#define B44_TX_GOOD_P	0x0504UL /* MIB TX Good Packets */
+#define B44_TX_O	0x0508UL /* MIB TX Octets */
+#define B44_TX_P	0x050CUL /* MIB TX Packets */
+#define B44_TX_BCAST	0x0510UL /* MIB TX Broadcast Packets */
+#define B44_TX_MCAST	0x0514UL /* MIB TX Multicast Packets */
+#define B44_TX_64	0x0518UL /* MIB TX <= 64 byte Packets */
+#define B44_TX_65_127	0x051CUL /* MIB TX 65 to 127 byte Packets */
+#define B44_TX_128_255	0x0520UL /* MIB TX 128 to 255 byte Packets */
+#define B44_TX_256_511	0x0524UL /* MIB TX 256 to 511 byte Packets */
+#define B44_TX_512_1023	0x0528UL /* MIB TX 512 to 1023 byte Packets */
+#define B44_TX_1024_MAX	0x052CUL /* MIB TX 1024 to max byte Packets */
+#define B44_TX_JABBER	0x0530UL /* MIB TX Jabber Packets */
+#define B44_TX_OSIZE	0x0534UL /* MIB TX Oversize Packets */
+#define B44_TX_FRAG	0x0538UL /* MIB TX Fragment Packets */
+#define B44_TX_URUNS	0x053CUL /* MIB TX Underruns */
+#define B44_TX_TCOLS	0x0540UL /* MIB TX Total Collisions */
+#define B44_TX_SCOLS	0x0544UL /* MIB TX Single Collisions */
+#define B44_TX_MCOLS	0x0548UL /* MIB TX Multiple Collisions */
+#define B44_TX_ECOLS	0x054CUL /* MIB TX Excessive Collisions */
+#define B44_TX_LCOLS	0x0550UL /* MIB TX Late Collisions */
+#define B44_TX_DEFERED	0x0554UL /* MIB TX Defered Packets */
+#define B44_TX_CLOST	0x0558UL /* MIB TX Carrier Lost */
+#define B44_TX_PAUSE	0x055CUL /* MIB TX Pause Packets */
+#define B44_RX_GOOD_O	0x0580UL /* MIB RX Good Octets */
+#define B44_RX_GOOD_P	0x0584UL /* MIB RX Good Packets */
+#define B44_RX_O	0x0588UL /* MIB RX Octets */
+#define B44_RX_P	0x058CUL /* MIB RX Packets */
+#define B44_RX_BCAST	0x0590UL /* MIB RX Broadcast Packets */
+#define B44_RX_MCAST	0x0594UL /* MIB RX Multicast Packets */
+#define B44_RX_64	0x0598UL /* MIB RX <= 64 byte Packets */
+#define B44_RX_65_127	0x059CUL /* MIB RX 65 to 127 byte Packets */
+#define B44_RX_128_255	0x05A0UL /* MIB RX 128 to 255 byte Packets */
+#define B44_RX_256_511	0x05A4UL /* MIB RX 256 to 511 byte Packets */
+#define B44_RX_512_1023	0x05A8UL /* MIB RX 512 to 1023 byte Packets */
+#define B44_RX_1024_MAX	0x05ACUL /* MIB RX 1024 to max byte Packets */
+#define B44_RX_JABBER	0x05B0UL /* MIB RX Jabber Packets */
+#define B44_RX_OSIZE	0x05B4UL /* MIB RX Oversize Packets */
+#define B44_RX_FRAG	0x05B8UL /* MIB RX Fragment Packets */
+#define B44_RX_MISS	0x05BCUL /* MIB RX Missed Packets */
+#define B44_RX_CRCA	0x05C0UL /* MIB RX CRC Align Errors */
+#define B44_RX_USIZE	0x05C4UL /* MIB RX Undersize Packets */
+#define B44_RX_CRC	0x05C8UL /* MIB RX CRC Errors */
+#define B44_RX_ALIGN	0x05CCUL /* MIB RX Align Errors */
+#define B44_RX_SYM	0x05D0UL /* MIB RX Symbol Errors */
+#define B44_RX_PAUSE	0x05D4UL /* MIB RX Pause Packets */
+#define B44_RX_NPAUSE	0x05D8UL /* MIB RX Non-Pause Packets */
+#define B44_SBIPSFLAG	0x0F08UL /* SB Initiator Port OCP Slave Flag */
+#define  SBIPSFLAG_IMASK1	0x0000003f /* Which sbflags --> mips interrupt 1 */
+#define  SBIPSFLAG_ISHIFT1	0
+#define  SBIPSFLAG_IMASK2	0x00003f00 /* Which sbflags --> mips interrupt 2 */
+#define  SBIPSFLAG_ISHIFT2	8
+#define  SBIPSFLAG_IMASK3	0x003f0000 /* Which sbflags --> mips interrupt 3 */
+#define  SBIPSFLAG_ISHIFT3	16
+#define  SBIPSFLAG_IMASK4	0x3f000000 /* Which sbflags --> mips interrupt 4 */
+#define  SBIPSFLAG_ISHIFT4	24
+#define B44_SBTPSFLAG	0x0F18UL /* SB Target Port OCP Slave Flag */
+#define  SBTPS_NUM0_MASK	0x0000003f
+#define  SBTPS_F0EN0		0x00000040
+#define B44_SBADMATCH3	0x0F60UL /* SB Address Match 3 */
+#define B44_SBADMATCH2	0x0F68UL /* SB Address Match 2 */
+#define B44_SBADMATCH1	0x0F70UL /* SB Address Match 1 */
+#define B44_SBIMSTATE	0x0F90UL /* SB Initiator Agent State */
+#define  SBIMSTATE_PC		0x0000000f /* Pipe Count */
+#define  SBIMSTATE_AP_MASK	0x00000030 /* Arbitration Priority */
+#define  SBIMSTATE_AP_BOTH	0x00000000 /* Use both timeslices and token */
+#define  SBIMSTATE_AP_TS	0x00000010 /* Use timeslices only */
+#define  SBIMSTATE_AP_TK	0x00000020 /* Use token only */
+#define  SBIMSTATE_AP_RSV	0x00000030 /* Reserved */
+#define  SBIMSTATE_IBE		0x00020000 /* In Band Error */
+#define  SBIMSTATE_TO		0x00040000 /* Timeout */
+#define B44_SBINTVEC	0x0F94UL /* SB Interrupt Mask */
+#define  SBINTVEC_PCI		0x00000001 /* Enable interrupts for PCI */
+#define  SBINTVEC_ENET0		0x00000002 /* Enable interrupts for enet 0 */
+#define  SBINTVEC_ILINE20	0x00000004 /* Enable interrupts for iline20 */
+#define  SBINTVEC_CODEC		0x00000008 /* Enable interrupts for v90 codec */
+#define  SBINTVEC_USB		0x00000010 /* Enable interrupts for usb */
+#define  SBINTVEC_EXTIF		0x00000020 /* Enable interrupts for external i/f */
+#define  SBINTVEC_ENET1		0x00000040 /* Enable interrupts for enet 1 */
+#define B44_SBTMSLOW	0x0F98UL /* SB Target State Low */
+#define  SBTMSLOW_RESET		0x00000001 /* Reset */
+#define  SBTMSLOW_REJECT	0x00000002 /* Reject */
+#define  SBTMSLOW_CLOCK		0x00010000 /* Clock Enable */
+#define  SBTMSLOW_FGC		0x00020000 /* Force Gated Clocks On */
+#define  SBTMSLOW_PE		0x40000000 /* Power Management Enable */
+#define  SBTMSLOW_BE		0x80000000 /* BIST Enable */
+#define B44_SBTMSHIGH	0x0F9CUL /* SB Target State High */
+#define  SBTMSHIGH_SERR		0x00000001 /* S-error */
+#define  SBTMSHIGH_INT		0x00000002 /* Interrupt */
+#define  SBTMSHIGH_BUSY		0x00000004 /* Busy */
+#define  SBTMSHIGH_GCR		0x20000000 /* Gated Clock Request */
+#define  SBTMSHIGH_BISTF	0x40000000 /* BIST Failed */
+#define  SBTMSHIGH_BISTD	0x80000000 /* BIST Done */
+#define B44_SBBWA0	0x0FA0UL /* SB Bandwidth Allocation Table 0 */
+#define  SBBWA0_TAB0_MASK	0x0000ffff /* Lookup Table 0 */
+#define  SBBWA0_TAB0_SHIFT	0
+#define  SBBWA0_TAB1_MASK	0xffff0000 /* Lookup Table 0 */
+#define  SBBWA0_TAB1_SHIFT	16
+#define B44_SBIMCFGLOW	0x0FA8UL /* SB Initiator Configuration Low */
+#define  SBIMCFGLOW_STO_MASK	0x00000003 /* Service Timeout */
+#define  SBIMCFGLOW_RTO_MASK	0x00000030 /* Request Timeout */
+#define  SBIMCFGLOW_RTO_SHIFT	4
+#define  SBIMCFGLOW_CID_MASK	0x00ff0000 /* Connection ID */
+#define  SBIMCFGLOW_CID_SHIFT	16
+#define B44_SBIMCFGHIGH	0x0FACUL /* SB Initiator Configuration High */
+#define  SBIMCFGHIGH_IEM_MASK	0x0000000c /* Inband Error Mode */
+#define  SBIMCFGHIGH_TEM_MASK	0x00000030 /* Timeout Error Mode */
+#define  SBIMCFGHIGH_TEM_SHIFT	4
+#define  SBIMCFGHIGH_BEM_MASK	0x000000c0 /* Bus Error Mode */
+#define  SBIMCFGHIGH_BEM_SHIFT	6
+#define B44_SBADMATCH0	0x0FB0UL /* SB Address Match 0 */
+#define  SBADMATCH0_TYPE_MASK	0x00000003 /* Address Type */
+#define  SBADMATCH0_AD64	0x00000004 /* Reserved */
+#define  SBADMATCH0_AI0_MASK	0x000000f8 /* Type0 Size */
+#define  SBADMATCH0_AI0_SHIFT	3
+#define  SBADMATCH0_AI1_MASK	0x000001f8 /* Type1 Size */
+#define  SBADMATCH0_AI1_SHIFT	3
+#define  SBADMATCH0_AI2_MASK	0x000001f8 /* Type2 Size */
+#define  SBADMATCH0_AI2_SHIFT	3
+#define  SBADMATCH0_ADEN	0x00000400 /* Enable */
+#define  SBADMATCH0_ADNEG	0x00000800 /* Negative Decode */
+#define  SBADMATCH0_BS0_MASK	0xffffff00 /* Type0 Base Address */
+#define  SBADMATCH0_BS0_SHIFT	8
+#define  SBADMATCH0_BS1_MASK	0xfffff000 /* Type1 Base Address */
+#define  SBADMATCH0_BS1_SHIFT	12
+#define  SBADMATCH0_BS2_MASK	0xffff0000 /* Type2 Base Address */
+#define  SBADMATCH0_BS2_SHIFT	16
+#define B44_SBTMCFGLOW	0x0FB8UL /* SB Target Configuration Low */
+#define  SBTMCFGLOW_CD_MASK	0x000000ff /* Clock Divide Mask */
+#define  SBTMCFGLOW_CO_MASK	0x0000f800 /* Clock Offset Mask */
+#define  SBTMCFGLOW_CO_SHIFT	11
+#define  SBTMCFGLOW_IF_MASK	0x00fc0000 /* Interrupt Flags Mask */
+#define  SBTMCFGLOW_IF_SHIFT	18
+#define  SBTMCFGLOW_IM_MASK	0x03000000 /* Interrupt Mode Mask */
+#define  SBTMCFGLOW_IM_SHIFT	24
+#define B44_SBTMCFGHIGH	0x0FBCUL /* SB Target Configuration High */
+#define  SBTMCFGHIGH_BM_MASK	0x00000003 /* Busy Mode */
+#define  SBTMCFGHIGH_RM_MASK	0x0000000C /* Retry Mode */
+#define  SBTMCFGHIGH_RM_SHIFT	2
+#define  SBTMCFGHIGH_SM_MASK	0x00000030 /* Stop Mode */
+#define  SBTMCFGHIGH_SM_SHIFT	4
+#define  SBTMCFGHIGH_EM_MASK	0x00000300 /* Error Mode */
+#define  SBTMCFGHIGH_EM_SHIFT	8
+#define  SBTMCFGHIGH_IM_MASK	0x00000c00 /* Interrupt Mode */
+#define  SBTMCFGHIGH_IM_SHIFT	10
+#define B44_SBBCFG	0x0FC0UL /* SB Broadcast Configuration */
+#define  SBBCFG_LAT_MASK	0x00000003 /* SB Latency */
+#define  SBBCFG_MAX0_MASK	0x000f0000 /* MAX Counter 0 */
+#define  SBBCFG_MAX0_SHIFT	16
+#define  SBBCFG_MAX1_MASK	0x00f00000 /* MAX Counter 1 */
+#define  SBBCFG_MAX1_SHIFT	20
+#define B44_SBBSTATE	0x0FC8UL /* SB Broadcast State */
+#define  SBBSTATE_SRD		0x00000001 /* ST Reg Disable */
+#define  SBBSTATE_HRD		0x00000002 /* Hold Reg Disable */
+#define B44_SBACTCNFG	0x0FD8UL /* SB Activate Configuration */
+#define B44_SBFLAGST	0x0FE8UL /* SB Current SBFLAGS */
+#define B44_SBIDLOW	0x0FF8UL /* SB Identification Low */
+#define  SBIDLOW_CS_MASK	0x00000003 /* Config Space Mask */
+#define  SBIDLOW_AR_MASK	0x00000038 /* Num Address Ranges Supported */
+#define  SBIDLOW_AR_SHIFT	3
+#define  SBIDLOW_SYNCH		0x00000040 /* Sync */
+#define  SBIDLOW_INIT		0x00000080 /* Initiator */
+#define  SBIDLOW_MINLAT_MASK	0x00000f00 /* Minimum Backplane Latency */
+#define  SBIDLOW_MINLAT_SHIFT	8
+#define  SBIDLOW_MAXLAT_MASK	0x0000f000 /* Maximum Backplane Latency */
+#define  SBIDLOW_MAXLAT_SHIFT	12
+#define  SBIDLOW_FIRST		0x00010000 /* This Initiator is First */
+#define  SBIDLOW_CW_MASK	0x000c0000 /* Cycle Counter Width */
+#define  SBIDLOW_CW_SHIFT	18
+#define  SBIDLOW_TP_MASK	0x00f00000 /* Target Ports */
+#define  SBIDLOW_TP_SHIFT	20
+#define  SBIDLOW_IP_MASK	0x0f000000 /* Initiator Ports */
+#define  SBIDLOW_IP_SHIFT	24
+#define B44_SBIDHIGH	0x0FFCUL /* SB Identification High */
+#define  SBIDHIGH_RC_MASK	0x0000000f /* Revision Code */
+#define  SBIDHIGH_CC_MASK	0x0000fff0 /* Core Code */
+#define  SBIDHIGH_CC_SHIFT	4
+#define  SBIDHIGH_VC_MASK	0xffff0000 /* Vendor Code */
+#define  SBIDHIGH_VC_SHIFT	16
+
+#define  CORE_CODE_ILINE20	0x801
+#define  CORE_CODE_SDRAM	0x803
+#define  CORE_CODE_PCI		0x804
+#define  CORE_CODE_MIPS		0x805
+#define  CORE_CODE_ENET		0x806
+#define  CORE_CODE_CODEC	0x807
+#define  CORE_CODE_USB		0x808
+#define  CORE_CODE_ILINE100	0x80a
+#define  CORE_CODE_EXTIF	0x811
+
+/* SSB PCI config space registers.  */
+#define	SSB_BAR0_WIN		0x80
+#define	SSB_BAR1_WIN		0x84
+#define	SSB_SPROM_CONTROL	0x88
+#define	SSB_BAR1_CONTROL	0x8c
+
+/* SSB core and hsot control registers.  */
+#define SSB_CONTROL		0x0000UL
+#define SSB_ARBCONTROL		0x0010UL
+#define SSB_ISTAT		0x0020UL
+#define SSB_IMASK		0x0024UL
+#define SSB_MBOX		0x0028UL
+#define SSB_BCAST_ADDR		0x0050UL
+#define SSB_BCAST_DATA		0x0054UL
+#define SSB_PCI_TRANS_0		0x0100UL
+#define SSB_PCI_TRANS_1		0x0104UL
+#define SSB_PCI_TRANS_2		0x0108UL
+#define SSB_SPROM		0x0800UL
+
+#define SSB_PCI_MEM		0x00000000
+#define SSB_PCI_IO		0x00000001
+#define SSB_PCI_CFG0		0x00000002
+#define SSB_PCI_CFG1		0x00000003
+#define SSB_PCI_PREF		0x00000004
+#define SSB_PCI_BURST		0x00000008
+#define SSB_PCI_MASK0		0xfc000000
+#define SSB_PCI_MASK1		0xfc000000
+#define SSB_PCI_MASK2		0xc0000000
+
+#define br32(REG)	readl(bp->regs + (REG))
+#define bw32(REG,VAL)	writel((VAL), bp->regs + (REG))
+
+/* 4400 PHY registers */
+#define B44_MII_AUXCTRL		24	/* Auxiliary Control */
+#define  MII_AUXCTRL_DUPLEX	0x0001  /* Full Duplex */
+#define  MII_AUXCTRL_SPEED	0x0002  /* 1=100Mbps, 0=10Mbps */
+#define  MII_AUXCTRL_FORCED	0x0004	/* Forced 10/100 */
+#define B44_MII_ALEDCTRL	26	/* Activity LED */
+#define  MII_ALEDCTRL_ALLMSK	0x7fff
+#define B44_MII_TLEDCTRL	27	/* Traffic Meter LED */
+#define  MII_TLEDCTRL_ENABLE	0x0040
+
+/* XXX Add this to mii.h */
+#ifndef ADVERTISE_PAUSE
+#define ADVERTISE_PAUSE_CAP		0x0400
+#endif
+#ifndef ADVERTISE_PAUSE_ASYM
+#define ADVERTISE_PAUSE_ASYM		0x0800
+#endif
+#ifndef LPA_PAUSE
+#define LPA_PAUSE_CAP			0x0400
+#endif
+#ifndef LPA_PAUSE_ASYM
+#define LPA_PAUSE_ASYM			0x0800
+#endif
+
+struct dma_desc {
+	u32	ctrl;
+	u32	addr;
+};
+
+/* There are only 12 bits in the DMA engine for descriptor offsetting
+ * so the table must be aligned on a boundary of this.
+ */
+#define DMA_TABLE_BYTES		4096
+
+#define DESC_CTRL_LEN	0x00001fff
+#define DESC_CTRL_CMASK	0x0ff00000 /* Core specific bits */
+#define DESC_CTRL_EOT	0x10000000 /* End of Table */
+#define DESC_CTRL_IOC	0x20000000 /* Interrupt On Completion */
+#define DESC_CTRL_EOF	0x40000000 /* End of Frame */
+#define DESC_CTRL_SOF	0x80000000 /* Start of Frame */
+
+#define RX_COPY_THRESHOLD  	256
+
+struct rx_header {
+	u16	len;
+	u16	flags;
+	u16	pad[12];
+};
+#define RX_HEADER_LEN	28
+
+#define RX_FLAG_OFIFO	0x00000001 /* FIFO Overflow */
+#define RX_FLAG_CRCERR	0x00000002 /* CRC Error */
+#define RX_FLAG_SERR	0x00000004 /* Receive Symbol Error */
+#define RX_FLAG_ODD	0x00000008 /* Frame has odd number of nibbles */
+#define RX_FLAG_LARGE	0x00000010 /* Frame is > RX MAX Length */
+#define RX_FLAG_MCAST	0x00000020 /* Dest is Multicast Address */
+#define RX_FLAG_BCAST	0x00000040 /* Dest is Broadcast Address */
+#define RX_FLAG_MISS	0x00000080 /* Received due to promisc mode */
+#define RX_FLAG_LAST	0x00000800 /* Last buffer in frame */
+#define RX_FLAG_ERRORS	(RX_FLAG_ODD | RX_FLAG_SERR | RX_FLAG_CRCERR | RX_FLAG_OFIFO)
+
+struct ring_info {
+	struct sk_buff		*skb;
+	DECLARE_PCI_UNMAP_ADDR(mapping);
+};
+
+#define B44_MCAST_TABLE_SIZE	32
+
+/* SW copy of device statistics, kept up to date by periodic timer
+ * which probes HW values.  Must have same relative layout as HW
+ * register above, because b44_stats_update depends upon this.
+ */
+struct b44_hw_stats {
+	u32 tx_good_octets, tx_good_pkts, tx_octets;
+	u32 tx_pkts, tx_broadcast_pkts, tx_multicast_pkts;
+	u32 tx_len_64, tx_len_65_to_127, tx_len_128_to_255;
+	u32 tx_len_256_to_511, tx_len_512_to_1023, tx_len_1024_to_max;
+	u32 tx_jabber_pkts, tx_oversize_pkts, tx_fragment_pkts;
+	u32 tx_underruns, tx_total_cols, tx_single_cols;
+	u32 tx_multiple_cols, tx_excessive_cols, tx_late_cols;
+	u32 tx_defered, tx_carrier_lost, tx_pause_pkts;
+	u32 __pad1[8];
+
+	u32 rx_good_octets, rx_good_pkts, rx_octets;
+	u32 rx_pkts, rx_broadcast_pkts, rx_multicast_pkts;
+	u32 rx_len_64, rx_len_65_to_127, rx_len_128_to_255;
+	u32 rx_len_256_to_511, rx_len_512_to_1023, rx_len_1024_to_max;
+	u32 rx_jabber_pkts, rx_oversize_pkts, rx_fragment_pkts;
+	u32 rx_missed_pkts, rx_crc_align_errs, rx_undersize;
+	u32 rx_crc_errs, rx_align_errs, rx_symbol_errs;
+	u32 rx_pause_pkts, rx_nonpause_pkts;
+};
+
+struct b44 {
+	spinlock_t		lock;
+
+	u32			imask, istat;
+
+	struct dma_desc		*rx_ring, *tx_ring;
+
+	u32			tx_prod, tx_cons;
+	u32			rx_prod, rx_cons;
+
+	struct ring_info	*rx_buffers;
+	struct ring_info	*tx_buffers;
+
+	u32			dma_offset;
+	u32			flags;
+#define B44_FLAG_INIT_COMPLETE	0x00000001
+#define B44_FLAG_BUGGY_TXPTR	0x00000002
+#define B44_FLAG_REORDER_BUG	0x00000004
+#define B44_FLAG_PAUSE_AUTO	0x00008000
+#define B44_FLAG_FULL_DUPLEX	0x00010000
+#define B44_FLAG_100_BASE_T	0x00020000
+#define B44_FLAG_TX_PAUSE	0x00040000
+#define B44_FLAG_RX_PAUSE	0x00080000
+#define B44_FLAG_FORCE_LINK	0x00100000
+#define B44_FLAG_ADV_10HALF	0x01000000
+#define B44_FLAG_ADV_10FULL	0x02000000
+#define B44_FLAG_ADV_100HALF	0x04000000
+#define B44_FLAG_ADV_100FULL	0x08000000
+#define B44_FLAG_INTERNAL_PHY	0x10000000
+
+	u32			rx_offset;
+
+	u32			msg_enable;
+
+	struct timer_list	timer;
+
+	struct net_device_stats	stats;
+	struct b44_hw_stats	hw_stats;
+
+	unsigned long		regs;
+	struct pci_dev		*pdev;
+	struct net_device	*dev;
+
+	dma_addr_t		rx_ring_dma, tx_ring_dma;
+
+	u32			rx_pending;
+	u32			tx_pending;
+	u32			pci_cfg_state[64 / sizeof(u32)];
+	u8			phy_addr;
+	u8			mdc_port;
+	u8			core_unit;
+};
+
+#endif /* _B44_H */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm/5701rls.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm/5701rls.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm/5701rls.c	2004-06-29 11:24:56.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm/5701rls.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,46 +0,0 @@
-/******************************************************************************/
-/*                                                                            */
-/* Broadcom BCM5700 Linux Network Driver, Copyright (c) 2000 - 2003 Broadcom  */
-/* 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, located in the file LICENSE.                 */
-/*                                                                            */
-/* History:                                                                   */
-/*                                                                            */
-/******************************************************************************/
-
-#if INCLUDE_5701_AX_FIX
-
-#include "mm.h"
-#include "5701rls.h"
-
-LM_STATUS LM_LoadRlsFirmware(PLM_DEVICE_BLOCK pDevice)
-{
-  T3_FWIMG_INFO FwImgInfo;
-
-  FwImgInfo.StartAddress = t3FwStartAddr;
-  FwImgInfo.Text.Buffer = (PLM_UINT8)t3FwText;
-  FwImgInfo.Text.Offset  = t3FwTextAddr;
-  FwImgInfo.Text.Length  = t3FwTextLen;
-  FwImgInfo.ROnlyData.Buffer = (PLM_UINT8)t3FwRodata;
-  FwImgInfo.ROnlyData.Offset  = t3FwRodataAddr;
-  FwImgInfo.ROnlyData.Length  = t3FwRodataLen;
-  FwImgInfo.Data.Buffer = (PLM_UINT8)t3FwData;
-  FwImgInfo.Data.Offset  = t3FwDataAddr;
-  FwImgInfo.Data.Length  = t3FwDataLen;
-
-  if (LM_LoadFirmware(pDevice,
-                      &FwImgInfo,
-                      T3_RX_CPU_ID | T3_TX_CPU_ID,
-                      T3_RX_CPU_ID) != LM_STATUS_SUCCESS)
-    {
-      return LM_STATUS_FAILURE;
-    }
-  
-  return LM_STATUS_SUCCESS;
-}
-
-#endif /* INCLUDE_5701_AX_FIX */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm/5701rls.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm/5701rls.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm/5701rls.h	2004-06-29 11:24:56.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm/5701rls.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,198 +0,0 @@
-/******************************************************************************/
-/*                                                                            */
-/* Broadcom BCM5700 Linux Network Driver, Copyright (c) 2000 - 2003 Broadcom  */
-/* 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, located in the file LICENSE.                 */
-/*                                                                            */
-/* History:                                                                   */
-/******************************************************************************/
-
-typedef unsigned long U32;
-int t3FwReleaseMajor = 0x0;
-int t3FwReleaseMinor = 0x0;
-int t3FwReleaseFix = 0x0;
-U32 t3FwStartAddr = 0x08000000;
-U32 t3FwTextAddr = 0x08000000;
-int t3FwTextLen = 0x9c0;
-U32 t3FwRodataAddr = 0x080009c0;
-int t3FwRodataLen = 0x60;
-U32 t3FwDataAddr = 0x08000a40;
-int t3FwDataLen = 0x20;
-U32 t3FwSbssAddr = 0x08000a60;
-int t3FwSbssLen = 0xc;
-U32 t3FwBssAddr = 0x08000a70;
-int t3FwBssLen = 0x10;
-U32 t3FwText[(0x9c0/4) + 1] = {
-0x0, 
-0x10000003, 0x0, 0xd, 0xd, 
-0x3c1d0800, 0x37bd3ffc, 0x3a0f021, 0x3c100800, 
-0x26100000, 0xe000018, 0x0, 0xd, 
-0x3c1d0800, 0x37bd3ffc, 0x3a0f021, 0x3c100800, 
-0x26100034, 0xe00021c, 0x0, 0xd, 
-0x0, 0x0, 0x0, 0x27bdffe0, 
-0x3c1cc000, 0xafbf0018, 0xaf80680c, 0xe00004c, 
-0x241b2105, 0x97850000, 0x97870002, 0x9782002c, 
-0x9783002e, 0x3c040800, 0x248409c0, 0xafa00014, 
-0x21400, 0x621825, 0x52c00, 0xafa30010, 
-0x8f860010, 0xe52825, 0xe000060, 0x24070102, 
-0x3c02ac00, 0x34420100, 0x3c03ac01, 0x34630100, 
-0xaf820490, 0x3c02ffff, 0xaf820494, 0xaf830498, 
-0xaf82049c, 0x24020001, 0xaf825ce0, 0xe00003f, 
-0xaf825d00, 0xe000140, 0x0, 0x8fbf0018, 
-0x3e00008, 0x27bd0020, 0x2402ffff, 0xaf825404, 
-0x8f835400, 0x34630400, 0xaf835400, 0xaf825404, 
-0x3c020800, 0x24420034, 0xaf82541c, 0x3e00008, 
-0xaf805400, 0x0, 0x0, 0x3c020800, 
-0x34423000, 0x3c030800, 0x34633000, 0x3c040800, 
-0x348437ff, 0x3c010800, 0xac220a64, 0x24020040, 
-0x3c010800, 0xac220a68, 0x3c010800, 0xac200a60, 
-0xac600000, 0x24630004, 0x83102b, 0x5040fffd, 
-0xac600000, 0x3e00008, 0x0, 0x804821, 
-0x8faa0010, 0x3c020800, 0x8c420a60, 0x3c040800, 
-0x8c840a68, 0x8fab0014, 0x24430001, 0x44102b, 
-0x3c010800, 0xac230a60, 0x14400003, 0x4021, 
-0x3c010800, 0xac200a60, 0x3c020800, 0x8c420a60, 
-0x3c030800, 0x8c630a64, 0x91240000, 0x21140, 
-0x431021, 0x481021, 0x25080001, 0xa0440000, 
-0x29020008, 0x1440fff4, 0x25290001, 0x3c020800, 
-0x8c420a60, 0x3c030800, 0x8c630a64, 0x8f84680c, 
-0x21140, 0x431021, 0xac440008, 0xac45000c, 
-0xac460010, 0xac470014, 0xac4a0018, 0x3e00008, 
-0xac4b001c, 0x0, 0x0, 0x0, 
-0x0, 0x0, 0x0, 0x0, 
-0x0, 0x0, 0x0, 0x0, 
-0x0, 0x0, 0x0, 0x0, 
-0x0, 0x0, 0x0, 0x0, 
-0x0, 0x0, 0x0, 0x0, 
-0x0, 0x0, 0x0, 0x0, 
-0x0, 0x0, 0x0, 0x0, 
-0x0, 0x0, 0x0, 0x0, 
-0x0, 0x0, 0x0, 0x0, 
-0x0, 0x0, 0x0, 0x0, 
-0x0, 0x0, 0x0, 0x0, 
-0x0, 0x0, 0x0, 0x0, 
-0x0, 0x0, 0x0, 0x2000008, 
-0x0, 0xa0001e3, 0x3c0a0001, 0xa0001e3, 
-0x3c0a0002, 0xa0001e3, 0x0, 0xa0001e3, 
-0x0, 0xa0001e3, 0x0, 0xa0001e3, 
-0x0, 0xa0001e3, 0x0, 0xa0001e3, 
-0x0, 0xa0001e3, 0x0, 0xa0001e3, 
-0x0, 0xa0001e3, 0x0, 0xa0001e3, 
-0x3c0a0007, 0xa0001e3, 0x3c0a0008, 0xa0001e3, 
-0x3c0a0009, 0xa0001e3, 0x0, 0xa0001e3, 
-0x0, 0xa0001e3, 0x3c0a000b, 0xa0001e3, 
-0x3c0a000c, 0xa0001e3, 0x3c0a000d, 0xa0001e3, 
-0x0, 0xa0001e3, 0x0, 0xa0001e3, 
-0x3c0a000e, 0xa0001e3, 0x0, 0xa0001e3, 
-0x0, 0xa0001e3, 0x0, 0xa0001e3, 
-0x0, 0xa0001e3, 0x0, 0xa0001e3, 
-0x0, 0xa0001e3, 0x0, 0xa0001e3, 
-0x0, 0xa0001e3, 0x3c0a0013, 0xa0001e3, 
-0x3c0a0014, 0x0, 0x0, 0x0, 
-0x0, 0x0, 0x0, 0x0, 
-0x0, 0x0, 0x0, 0x0, 
-0x0, 0x0, 0x0, 0x0, 
-0x0, 0x0, 0x0, 0x0, 
-0x0, 0x0, 0x0, 0x0, 
-0x0, 0x0, 0x0, 0x0, 
-0x0, 0x0, 0x0, 0x0, 
-0x0, 0x0, 0x0, 0x0, 
-0x0, 0x0, 0x0, 0x0, 
-0x0, 0x0, 0x0, 0x0, 
-0x0, 0x0, 0x0, 0x0, 
-0x0, 0x0, 0x0, 0x0, 
-0x0, 0x0, 0x0, 0x0, 
-0x0, 0x0, 0x0, 0x0, 
-0x0, 0x0, 0x0, 0x27bdffe0, 
-0x1821, 0x1021, 0xafbf0018, 0xafb10014, 
-0xafb00010, 0x3c010800, 0x220821, 0xac200a70, 
-0x3c010800, 0x220821, 0xac200a74, 0x3c010800, 
-0x220821, 0xac200a78, 0x24630001, 0x1860fff5, 
-0x2442000c, 0x24110001, 0x8f906810, 0x32020004, 
-0x14400005, 0x24040001, 0x3c020800, 0x8c420a78, 
-0x18400003, 0x2021, 0xe000182, 0x0, 
-0x32020001, 0x10400003, 0x0, 0xe000169, 
-0x0, 0xa000153, 0xaf915028, 0x8fbf0018, 
-0x8fb10014, 0x8fb00010, 0x3e00008, 0x27bd0020, 
-0x3c050800, 0x8ca50a70, 0x3c060800, 0x8cc60a80, 
-0x3c070800, 0x8ce70a78, 0x27bdffe0, 0x3c040800, 
-0x248409d0, 0xafbf0018, 0xafa00010, 0xe000060, 
-0xafa00014, 0xe00017b, 0x2021, 0x8fbf0018, 
-0x3e00008, 0x27bd0020, 0x24020001, 0x8f836810, 
-0x821004, 0x21027, 0x621824, 0x3e00008, 
-0xaf836810, 0x27bdffd8, 0xafbf0024, 0x1080002e, 
-0xafb00020, 0x8f825cec, 0xafa20018, 0x8f825cec, 
-0x3c100800, 0x26100a78, 0xafa2001c, 0x34028000, 
-0xaf825cec, 0x8e020000, 0x18400016, 0x0, 
-0x3c020800, 0x94420a74, 0x8fa3001c, 0x221c0, 
-0xac830004, 0x8fa2001c, 0x3c010800, 0xe000201, 
-0xac220a74, 0x10400005, 0x0, 0x8e020000, 
-0x24420001, 0xa0001df, 0xae020000, 0x3c020800, 
-0x8c420a70, 0x21c02, 0x321c0, 0xa0001c5, 
-0xafa2001c, 0xe000201, 0x0, 0x1040001f, 
-0x0, 0x8e020000, 0x8fa3001c, 0x24420001, 
-0x3c010800, 0xac230a70, 0x3c010800, 0xac230a74, 
-0xa0001df, 0xae020000, 0x3c100800, 0x26100a78, 
-0x8e020000, 0x18400028, 0x0, 0xe000201, 
-0x0, 0x14400024, 0x0, 0x8e020000, 
-0x3c030800, 0x8c630a70, 0x2442ffff, 0xafa3001c, 
-0x18400006, 0xae020000, 0x31402, 0x221c0, 
-0x8c820004, 0x3c010800, 0xac220a70, 0x97a2001e, 
-0x2442ff00, 0x2c420300, 0x1440000b, 0x24024000, 
-0x3c040800, 0x248409dc, 0xafa00010, 0xafa00014, 
-0x8fa6001c, 0x24050008, 0xe000060, 0x3821, 
-0xa0001df, 0x0, 0xaf825cf8, 0x3c020800, 
-0x8c420a40, 0x8fa3001c, 0x24420001, 0xaf835cf8, 
-0x3c010800, 0xac220a40, 0x8fbf0024, 0x8fb00020, 
-0x3e00008, 0x27bd0028, 0x27bdffe0, 0x3c040800, 
-0x248409e8, 0x2821, 0x3021, 0x3821, 
-0xafbf0018, 0xafa00010, 0xe000060, 0xafa00014, 
-0x8fbf0018, 0x3e00008, 0x27bd0020, 0x8f82680c, 
-0x8f85680c, 0x21827, 0x3182b, 0x31823, 
-0x431024, 0x441021, 0xa2282b, 0x10a00006, 
-0x0, 0x401821, 0x8f82680c, 0x43102b, 
-0x1440fffd, 0x0, 0x3e00008, 0x0, 
-0x3c040800, 0x8c840000, 0x3c030800, 0x8c630a40, 
-0x64102b, 0x54400002, 0x831023, 0x641023, 
-0x2c420008, 0x3e00008, 0x38420001, 0x27bdffe0, 
-0x802821, 0x3c040800, 0x24840a00, 0x3021, 
-0x3821, 0xafbf0018, 0xafa00010, 0xe000060, 
-0xafa00014, 0xa000216, 0x0, 0x8fbf0018, 
-0x3e00008, 0x27bd0020, 0x0, 0x27bdffe0, 
-0x3c1cc000, 0xafbf0018, 0xe00004c, 0xaf80680c, 
-0x3c040800, 0x24840a10, 0x3802821, 0x3021, 
-0x3821, 0xafa00010, 0xe000060, 0xafa00014, 
-0x2402ffff, 0xaf825404, 0x3c0200aa, 0xe000234, 
-0xaf825434, 0x8fbf0018, 0x3e00008, 0x27bd0020, 
-0x0, 0x0, 0x0, 0x27bdffe8, 
-0xafb00010, 0x24100001, 0xafbf0014, 0x3c01c003, 
-0xac200000, 0x8f826810, 0x30422000, 0x10400003, 
-0x0, 0xe000246, 0x0, 0xa00023a, 
-0xaf905428, 0x8fbf0014, 0x8fb00010, 0x3e00008, 
-0x27bd0018, 0x27bdfff8, 0x8f845d0c, 0x3c0200ff, 
-0x3c030800, 0x8c630a50, 0x3442fff8, 0x821024, 
-0x1043001e, 0x3c0500ff, 0x34a5fff8, 0x3c06c003, 
-0x3c074000, 0x851824, 0x8c620010, 0x3c010800, 
-0xac230a50, 0x30420008, 0x10400005, 0x871025, 
-0x8cc20000, 0x24420001, 0xacc20000, 0x871025, 
-0xaf825d0c, 0x8fa20000, 0x24420001, 0xafa20000, 
-0x8fa20000, 0x8fa20000, 0x24420001, 0xafa20000, 
-0x8fa20000, 0x8f845d0c, 0x3c030800, 0x8c630a50, 
-0x851024, 0x1443ffe8, 0x851824, 0x27bd0008, 
-0x3e00008, 0x0, 0x0, 0x0 };
-U32 t3FwRodata[(0x60/4) + 1] = {
-0x35373031, 0x726c7341, 0x0, 
-0x0, 0x53774576, 0x656e7430, 0x0, 
-0x726c7045, 0x76656e74, 0x31000000, 0x556e6b6e, 
-0x45766e74, 0x0, 0x0, 0x0, 
-0x0, 0x66617461, 0x6c457272, 0x0, 
-0x0, 0x4d61696e, 0x43707542, 0x0, 
-0x0, 0x0 };
-U32 t3FwData[(0x20/4) + 1] = {
-0x0, 0x0, 0x0, 
-0x0, 0x0, 0x0, 0x0, 
-0x0, 0x0 };
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm/Makefile linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm/Makefile
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm/Makefile	2004-06-29 11:24:56.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm/Makefile	1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-
-#
-# Makefile for linux/drivers/net/bcm
-#
-
-O_TARGET := bcm5700.o
-obj-y    := b57um.o b57proc.o tigon3.o autoneg.o 5701rls.o tcp_seg.o
-obj-m    := $(O_TARGET)
-
-EXTRA_CFLAGS = -DDBG=0 -DT3_JUMBO_RCV_RCB_ENTRY_COUNT=256 -DNICE_SUPPORT -DPCIX_TARGET_WORKAROUND=1 -DINCLUDE_TBI_SUPPORT -DINCLUDE_5701_AX_FIX=1
-
-include $(TOPDIR)/Rules.make
-
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm/autoneg.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm/autoneg.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm/autoneg.c	2004-06-29 11:24:56.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm/autoneg.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,438 +0,0 @@
-/******************************************************************************/
-/*                                                                            */
-/* Broadcom BCM5700 Linux Network Driver, Copyright (c) 2000 - 2003 Broadcom  */
-/* 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, located in the file LICENSE.                 */
-/*                                                                            */
-/* History:                                                                   */
-/******************************************************************************/
-
-#if INCLUDE_TBI_SUPPORT
-#include "mm.h"
-
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-void
-MM_AnTxConfig(
-    PAN_STATE_INFO pAnInfo)
-{
-    PLM_DEVICE_BLOCK pDevice;
-
-    pDevice = (PLM_DEVICE_BLOCK) pAnInfo->pContext;
-
-    REG_WR(pDevice, MacCtrl.TxAutoNeg, (LM_UINT32) pAnInfo->TxConfig.AsUSHORT);
-
-    pDevice->MacMode |= MAC_MODE_SEND_CONFIGS;
-    REG_WR(pDevice, MacCtrl.Mode, pDevice->MacMode);
-}
-
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-void
-MM_AnTxIdle(
-    PAN_STATE_INFO pAnInfo)
-{
-    PLM_DEVICE_BLOCK pDevice;
-
-    pDevice = (PLM_DEVICE_BLOCK) pAnInfo->pContext;
-
-    pDevice->MacMode &= ~MAC_MODE_SEND_CONFIGS;
-    REG_WR(pDevice, MacCtrl.Mode, pDevice->MacMode);
-}
-
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-char
-MM_AnRxConfig(
-    PAN_STATE_INFO pAnInfo,
-    unsigned short *pRxConfig)
-{
-    PLM_DEVICE_BLOCK pDevice;
-    LM_UINT32 Value32;
-    char Retcode;
-
-    Retcode = AN_FALSE;
-
-    pDevice = (PLM_DEVICE_BLOCK) pAnInfo->pContext;
-
-    Value32 = REG_RD(pDevice, MacCtrl.Status);
-    if(Value32 & MAC_STATUS_RECEIVING_CFG)
-    {
-        Value32 = REG_RD(pDevice, MacCtrl.RxAutoNeg);
-        *pRxConfig = (unsigned short) Value32;
-
-        Retcode = AN_TRUE;
-    }
-
-    return Retcode;
-}
-
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-void
-AutonegInit(
-    PAN_STATE_INFO pAnInfo)
-{
-    unsigned long j;
-
-    for(j = 0; j < sizeof(AN_STATE_INFO); j++)
-    {
-        ((unsigned char *) pAnInfo)[j] = 0;
-    }
-
-    /* Initialize the default advertisement register. */
-    pAnInfo->mr_adv_full_duplex = 1;
-    pAnInfo->mr_adv_sym_pause = 1;
-    pAnInfo->mr_adv_asym_pause = 1;
-    pAnInfo->mr_an_enable = 1;
-}
-
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-AUTONEG_STATUS
-Autoneg8023z(
-    PAN_STATE_INFO pAnInfo)
-{
-    unsigned short RxConfig;
-    unsigned long Delta_us;
-    AUTONEG_STATUS AnRet;
-
-    /* Get the current time. */
-    if(pAnInfo->State == AN_STATE_UNKNOWN)
-    {
-        pAnInfo->RxConfig.AsUSHORT = 0;
-        pAnInfo->CurrentTime_us = 0;
-        pAnInfo->LinkTime_us = 0;
-        pAnInfo->AbilityMatchCfg = 0;
-        pAnInfo->AbilityMatchCnt = 0;
-        pAnInfo->AbilityMatch = AN_FALSE;
-        pAnInfo->IdleMatch = AN_FALSE;
-        pAnInfo->AckMatch = AN_FALSE;
-    }
-
-    /* Increment the timer tick.  This function is called every microsecon. */
-//    pAnInfo->CurrentTime_us++;
-
-    /* Set the AbilityMatch, IdleMatch, and AckMatch flags if their */
-    /* corresponding conditions are satisfied. */
-    if(MM_AnRxConfig(pAnInfo, &RxConfig))
-    {
-        if(RxConfig != pAnInfo->AbilityMatchCfg)
-        {
-            pAnInfo->AbilityMatchCfg = RxConfig;
-            pAnInfo->AbilityMatch = AN_FALSE;
-            pAnInfo->AbilityMatchCnt = 0;
-        }
-        else
-        {
-            pAnInfo->AbilityMatchCnt++;
-            if(pAnInfo->AbilityMatchCnt > 1)
-            {
-                pAnInfo->AbilityMatch = AN_TRUE;
-                pAnInfo->AbilityMatchCfg = RxConfig;
-            }
-        }
-
-        if(RxConfig & AN_CONFIG_ACK)
-        {
-            pAnInfo->AckMatch = AN_TRUE;
-        }
-        else
-        {
-            pAnInfo->AckMatch = AN_FALSE;
-        }
-
-        pAnInfo->IdleMatch = AN_FALSE;
-    }
-    else
-    {
-        pAnInfo->IdleMatch = AN_TRUE;
-
-        pAnInfo->AbilityMatchCfg = 0;
-        pAnInfo->AbilityMatchCnt = 0;
-        pAnInfo->AbilityMatch = AN_FALSE;
-        pAnInfo->AckMatch = AN_FALSE;
-
-        RxConfig = 0;
-    }
-
-    /* Save the last Config. */
-    pAnInfo->RxConfig.AsUSHORT = RxConfig;
-
-    /* Default return code. */
-    AnRet = AUTONEG_STATUS_OK;
-
-    /* Autoneg state machine as defined in 802.3z section 37.3.1.5. */
-    switch(pAnInfo->State)
-    {
-        case AN_STATE_UNKNOWN:
-            if(pAnInfo->mr_an_enable || pAnInfo->mr_restart_an)
-            {
-                pAnInfo->CurrentTime_us = 0;
-                pAnInfo->State = AN_STATE_AN_ENABLE;
-            }
-
-            /* Fall through.*/
-
-        case AN_STATE_AN_ENABLE:
-            pAnInfo->mr_an_complete = AN_FALSE;
-            pAnInfo->mr_page_rx = AN_FALSE;
-
-            if(pAnInfo->mr_an_enable)
-            {
-                pAnInfo->LinkTime_us = 0;
-                pAnInfo->AbilityMatchCfg = 0;
-                pAnInfo->AbilityMatchCnt = 0;
-                pAnInfo->AbilityMatch = AN_FALSE;
-                pAnInfo->IdleMatch = AN_FALSE;
-                pAnInfo->AckMatch = AN_FALSE;
-
-                pAnInfo->State = AN_STATE_AN_RESTART_INIT;
-            }
-            else
-            {
-                pAnInfo->State = AN_STATE_DISABLE_LINK_OK;
-            }
-            break;
-
-        case AN_STATE_AN_RESTART_INIT:
-            pAnInfo->LinkTime_us = pAnInfo->CurrentTime_us;
-            pAnInfo->mr_np_loaded = AN_FALSE;
-
-            pAnInfo->TxConfig.AsUSHORT = 0;
-            MM_AnTxConfig(pAnInfo);
-
-            AnRet = AUTONEG_STATUS_TIMER_ENABLED;
-
-            pAnInfo->State = AN_STATE_AN_RESTART;
-
-            /* Fall through.*/
-
-        case AN_STATE_AN_RESTART:
-            /* Get the current time and compute the delta with the saved */
-            /* link timer. */
-            Delta_us = pAnInfo->CurrentTime_us - pAnInfo->LinkTime_us;
-            if(Delta_us > AN_LINK_TIMER_INTERVAL_US)
-            {
-                pAnInfo->State = AN_STATE_ABILITY_DETECT_INIT;
-            }
-            else
-            {
-                AnRet = AUTONEG_STATUS_TIMER_ENABLED;
-            }
-            break;
-
-        case AN_STATE_DISABLE_LINK_OK:
-            AnRet = AUTONEG_STATUS_DONE;
-            break;
-
-        case AN_STATE_ABILITY_DETECT_INIT:
-            /* Note: in the state diagram, this variable is set to */
-            /* mr_adv_ability<12>.  Is this right?. */
-            pAnInfo->mr_toggle_tx = AN_FALSE;
-
-            /* Send the config as advertised in the advertisement register. */
-            pAnInfo->TxConfig.AsUSHORT = 0;
-            pAnInfo->TxConfig.D5_FD = pAnInfo->mr_adv_full_duplex;
-            pAnInfo->TxConfig.D6_HD = pAnInfo->mr_adv_half_duplex;
-            pAnInfo->TxConfig.D7_PS1 = pAnInfo->mr_adv_sym_pause;
-            pAnInfo->TxConfig.D8_PS2 = pAnInfo->mr_adv_asym_pause;
-            pAnInfo->TxConfig.D12_RF1 = pAnInfo->mr_adv_remote_fault1;
-            pAnInfo->TxConfig.D13_RF2 = pAnInfo->mr_adv_remote_fault2;
-            pAnInfo->TxConfig.D15_NP = pAnInfo->mr_adv_next_page;
-
-            MM_AnTxConfig(pAnInfo);
-
-            pAnInfo->State = AN_STATE_ABILITY_DETECT;
-
-            break;
-
-        case AN_STATE_ABILITY_DETECT:
-            if(pAnInfo->AbilityMatch == AN_TRUE &&
-                pAnInfo->RxConfig.AsUSHORT != 0)
-            {
-                pAnInfo->State = AN_STATE_ACK_DETECT_INIT;
-            }
-
-            break;
-
-        case AN_STATE_ACK_DETECT_INIT:
-            pAnInfo->TxConfig.D14_ACK = 1;
-            MM_AnTxConfig(pAnInfo);
-
-            pAnInfo->State = AN_STATE_ACK_DETECT;
-
-            /* Fall through. */
-
-        case AN_STATE_ACK_DETECT:
-            if(pAnInfo->AckMatch == AN_TRUE)
-            {
-                if((pAnInfo->RxConfig.AsUSHORT & ~AN_CONFIG_ACK) ==
-                    (pAnInfo->AbilityMatchCfg & ~AN_CONFIG_ACK))
-                {
-                    pAnInfo->State = AN_STATE_COMPLETE_ACK_INIT;
-                }
-                else
-                {
-                    pAnInfo->State = AN_STATE_AN_ENABLE;
-                }
-            }
-            else if(pAnInfo->AbilityMatch == AN_TRUE &&
-                pAnInfo->RxConfig.AsUSHORT == 0)
-            {
-                pAnInfo->State = AN_STATE_AN_ENABLE;
-            }
-
-            break;
-
-        case AN_STATE_COMPLETE_ACK_INIT:
-            /* Make sure invalid bits are not set. */
-            if(pAnInfo->RxConfig.bits.D0 || pAnInfo->RxConfig.bits.D1 ||
-                pAnInfo->RxConfig.bits.D2 || pAnInfo->RxConfig.bits.D3 ||
-                pAnInfo->RxConfig.bits.D4 || pAnInfo->RxConfig.bits.D9 ||
-                pAnInfo->RxConfig.bits.D10 || pAnInfo->RxConfig.bits.D11)
-            {
-                AnRet = AUTONEG_STATUS_FAILED;
-                break;
-            }
-
-            /* Set up the link partner advertisement register. */
-            pAnInfo->mr_lp_adv_full_duplex = pAnInfo->RxConfig.D5_FD;
-            pAnInfo->mr_lp_adv_half_duplex = pAnInfo->RxConfig.D6_HD;
-            pAnInfo->mr_lp_adv_sym_pause = pAnInfo->RxConfig.D7_PS1;
-            pAnInfo->mr_lp_adv_asym_pause = pAnInfo->RxConfig.D8_PS2;
-            pAnInfo->mr_lp_adv_remote_fault1 = pAnInfo->RxConfig.D12_RF1;
-            pAnInfo->mr_lp_adv_remote_fault2 = pAnInfo->RxConfig.D13_RF2;
-            pAnInfo->mr_lp_adv_next_page = pAnInfo->RxConfig.D15_NP;
-
-            pAnInfo->LinkTime_us = pAnInfo->CurrentTime_us;
-
-            pAnInfo->mr_toggle_tx = !pAnInfo->mr_toggle_tx;
-            pAnInfo->mr_toggle_rx = pAnInfo->RxConfig.bits.D11;
-            pAnInfo->mr_np_rx = pAnInfo->RxConfig.D15_NP;
-            pAnInfo->mr_page_rx = AN_TRUE;
-
-            pAnInfo->State = AN_STATE_COMPLETE_ACK;
-            AnRet = AUTONEG_STATUS_TIMER_ENABLED;
-
-            break;
-
-        case AN_STATE_COMPLETE_ACK:
-            if(pAnInfo->AbilityMatch == AN_TRUE &&
-                pAnInfo->RxConfig.AsUSHORT == 0)
-            {
-                pAnInfo->State = AN_STATE_AN_ENABLE;
-                break;
-            }
-
-            Delta_us = pAnInfo->CurrentTime_us - pAnInfo->LinkTime_us;
-
-            if(Delta_us > AN_LINK_TIMER_INTERVAL_US)
-            {
-                if(pAnInfo->mr_adv_next_page == 0 ||
-                    pAnInfo->mr_lp_adv_next_page == 0)
-                {
-                    pAnInfo->State = AN_STATE_IDLE_DETECT_INIT;
-                }
-                else
-                {
-                    if(pAnInfo->TxConfig.bits.D15 == 0 &&
-                        pAnInfo->mr_np_rx == 0)
-                    {
-                        pAnInfo->State = AN_STATE_IDLE_DETECT_INIT;
-                    }
-                    else
-                    {
-                        AnRet = AUTONEG_STATUS_FAILED;
-                    }
-                }
-            }
-
-            break;
-
-        case AN_STATE_IDLE_DETECT_INIT:
-            pAnInfo->LinkTime_us = pAnInfo->CurrentTime_us;
-
-            MM_AnTxIdle(pAnInfo);
-
-            pAnInfo->State = AN_STATE_IDLE_DETECT;
-
-            AnRet = AUTONEG_STATUS_TIMER_ENABLED;
-
-            break;
-
-        case AN_STATE_IDLE_DETECT:
-            if(pAnInfo->AbilityMatch == AN_TRUE &&
-                pAnInfo->RxConfig.AsUSHORT == 0)
-            {
-                pAnInfo->State = AN_STATE_AN_ENABLE;
-                break;
-            }
-
-            Delta_us = pAnInfo->CurrentTime_us - pAnInfo->LinkTime_us;
-            if(Delta_us > AN_LINK_TIMER_INTERVAL_US)
-            {
-//                if(pAnInfo->IdleMatch == AN_TRUE)
-//                {
-                    pAnInfo->State = AN_STATE_LINK_OK;
-//                }
-//                else
-//                {
-//                    AnRet = AUTONEG_STATUS_FAILED;
-//                    break;
-//                }
-            }
-
-            break;
-
-        case AN_STATE_LINK_OK:
-            pAnInfo->mr_an_complete = AN_TRUE;
-            pAnInfo->mr_link_ok = AN_TRUE;
-            AnRet = AUTONEG_STATUS_DONE;
-
-            break;
-
-        case AN_STATE_NEXT_PAGE_WAIT_INIT:
-            break;
-
-        case AN_STATE_NEXT_PAGE_WAIT:
-            break;
-
-        default:
-            AnRet = AUTONEG_STATUS_FAILED;
-            break;
-    }
-
-    return AnRet;
-}
-#endif /* INCLUDE_TBI_SUPPORT */
-
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm/autoneg.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm/autoneg.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm/autoneg.h	2004-06-29 11:24:56.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm/autoneg.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,418 +0,0 @@
-/******************************************************************************/
-/*                                                                            */
-/* Broadcom BCM5700 Linux Network Driver, Copyright (c) 2000 - 2003 Broadcom  */
-/* 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, located in the file LICENSE.                 */
-/*                                                                            */
-/* History:                                                                   */
-/******************************************************************************/
-
-
-#ifndef AUTONEG_H
-#define AUTONEG_H
-
-
-
-/******************************************************************************/
-/* Constants. */
-/******************************************************************************/
-
-#define AN_LINK_TIMER_INTERVAL_US           12000       /* 10ms */
-
-/* TRUE, FALSE */
-#define AN_TRUE                             1
-#define AN_FALSE                            0
-
-
-
-/******************************************************************************/
-/* Main data structure for keeping track of 802.3z auto-negotation state */
-/* variables as shown in Figure 37-6 of the IEEE 802.3z specification. */
-/******************************************************************************/
-
-typedef struct
-{
-    /* Pointer to the operating system specific data structure. */
-    void *pContext;
-
-    /* Current auto-negotiation state. */
-    unsigned long State;
-    #define AN_STATE_UNKNOWN                        0
-    #define AN_STATE_AN_ENABLE                      1
-    #define AN_STATE_AN_RESTART_INIT                2
-    #define AN_STATE_AN_RESTART                     3
-    #define AN_STATE_DISABLE_LINK_OK                4
-    #define AN_STATE_ABILITY_DETECT_INIT            5
-    #define AN_STATE_ABILITY_DETECT                 6
-    #define AN_STATE_ACK_DETECT_INIT                7
-    #define AN_STATE_ACK_DETECT                     8
-    #define AN_STATE_COMPLETE_ACK_INIT              9
-    #define AN_STATE_COMPLETE_ACK                   10
-    #define AN_STATE_IDLE_DETECT_INIT               11
-    #define AN_STATE_IDLE_DETECT                    12
-    #define AN_STATE_LINK_OK                        13
-    #define AN_STATE_NEXT_PAGE_WAIT_INIT            14
-    #define AN_STATE_NEXT_PAGE_WAIT                 16
-
-    /* Link timer. */
-    unsigned long LinkTime_us;
-
-    /* Current time. */
-    unsigned long CurrentTime_us;
-
-    /* Ability, idle, and ack match functions. */
-    unsigned long AbilityMatchCnt;
-
-    /* Need these values for consistency check. */
-    unsigned short AbilityMatchCfg;
-
-    unsigned short reserved;
-
-    char AbilityMatch;
-    char IdleMatch;
-    char AckMatch;
-    char reserved1;
-
-    /* Tx config data */
-    union
-    {
-        /* The TxConfig register is arranged as follows:                      */
-        /*                                                                    */
-        /* MSB                                                           LSB  */
-        /* +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+  */
-        /* | D7| D6| D5| D4| D3| D2| D1| D0|D15|D14|D13|D12|D11|D10| D9| D8|  */
-        /* +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+  */
-        struct
-        {
-#ifdef BIG_ENDIAN_HOST
-            unsigned short D7:1;        /* PS1 */
-            unsigned short D6:1;        /* HD */
-            unsigned short D5:1;        /* FD */
-            unsigned short D4:1;
-            unsigned short D3:1;
-            unsigned short D2:1;
-            unsigned short D1:1;
-            unsigned short D0:1;
-            unsigned short D15:1;       /* NP */
-            unsigned short D14:1;       /* ACK */
-            unsigned short D13:1;       /* RF2 */
-            unsigned short D12:1;       /* RF1 */
-            unsigned short D11:1;
-            unsigned short D10:1;
-            unsigned short D9:1;
-            unsigned short D8:1;        /* PS2 */
-#else /* BIG_ENDIAN_HOST */
-            unsigned int D8:1;        /* PS2 */
-            unsigned int D9:1;
-            unsigned int D10:1;
-            unsigned int D11:1;
-            unsigned int D12:1;       /* RF1 */
-            unsigned int D13:1;       /* RF2 */
-            unsigned int D14:1;       /* ACK */
-            unsigned int D15:1;       /* NP */
-            unsigned int D0:1;
-            unsigned int D1:1;
-            unsigned int D2:1;
-            unsigned int D3:1;
-            unsigned int D4:1;
-            unsigned int D5:1;        /* FD */
-            unsigned int D6:1;        /* HD */
-            unsigned int D7:1;        /* PS1 */
-#endif
-        } bits;
-
-        unsigned short AsUSHORT;
-
-        #define D8_PS2                      bits.D8
-        #define D12_RF1                     bits.D12
-        #define D13_RF2                     bits.D13
-        #define D14_ACK                     bits.D14
-        #define D15_NP                      bits.D15
-        #define D5_FD                       bits.D5
-        #define D6_HD                       bits.D6
-        #define D7_PS1                      bits.D7
-    } TxConfig;
-
-    /* Rx config data */
-    union
-    {
-        /* The RxConfig register is arranged as follows:                      */
-        /*                                                                    */
-        /* MSB                                                           LSB  */
-        /* +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+  */
-        /* | D7| D6| D5| D4| D3| D2| D1| D0|D15|D14|D13|D12|D11|D10| D9| D8|  */
-        /* +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+  */
-        struct
-        {
-#ifdef BIG_ENDIAN_HOST
-	    unsigned short D7:1;        /* PS1 */
-            unsigned short D6:1;        /* HD */
-	    unsigned short D5:1;        /* FD */
-            unsigned short D4:1;
-            unsigned short D3:1;
-            unsigned short D2:1;
-            unsigned short D1:1;
-            unsigned short D0:1;
-  	    unsigned short D15:1;       /* NP */
-            unsigned short D14:1;       /* ACK */
-            unsigned short D13:1;       /* RF2 */    
-            unsigned short D12:1;       /* RF1 */
-            unsigned short D11:1;
-            unsigned short D10:1;
-            unsigned short D9:1;
-            unsigned short D8:1;        /* PS2 */
-#else /* BIG_ENDIAN_HOST */
-            unsigned int D8:1;        /* PS2 */
-            unsigned int D9:1;
-            unsigned int D10:1;
-            unsigned int D11:1;
-            unsigned int D12:1;       /* RF1 */
-            unsigned int D13:1;       /* RF2 */
-            unsigned int D14:1;       /* ACK */
-            unsigned int D15:1;       /* NP */
-            unsigned int D0:1;
-            unsigned int D1:1;
-            unsigned int D2:1;
-            unsigned int D3:1;
-            unsigned int D4:1;
-            unsigned int D5:1;        /* FD */
-            unsigned int D6:1;        /* HD */
-            unsigned int D7:1;        /* PS1 */
-#endif
-        } bits;
-
-        unsigned short AsUSHORT;
-    } RxConfig;
-
-    #define AN_CONFIG_NP                            0x0080
-    #define AN_CONFIG_ACK                           0x0040
-    #define AN_CONFIG_RF2                           0x0020
-    #define AN_CONFIG_RF1                           0x0010
-    #define AN_CONFIG_PS2                           0x0001
-    #define AN_CONFIG_PS1                           0x8000
-    #define AN_CONFIG_HD                            0x4000
-    #define AN_CONFIG_FD                            0x2000
-
-
-    /* Management registers. */
-
-    /* Control register. */
-    union
-    {
-        struct
-        {
-            unsigned int an_enable:1;
-            unsigned int loopback:1;
-            unsigned int reset:1;
-            unsigned int restart_an:1;
-        } bits;
-
-        unsigned short AsUSHORT;
-
-        #define mr_an_enable                Mr0.bits.an_enable
-        #define mr_loopback                 Mr0.bits.loopback
-        #define mr_main_reset               Mr0.bits.reset
-        #define mr_restart_an               Mr0.bits.restart_an
-    } Mr0;
-
-    /* Status register. */
-    union
-    {
-        struct
-        {
-            unsigned int an_complete:1;
-            unsigned int link_ok:1;
-        } bits;
-
-        unsigned short AsUSHORT;
-
-        #define mr_an_complete              Mr1.bits.an_complete
-        #define mr_link_ok                  Mr1.bits.link_ok
-    } Mr1;
-
-    /* Advertisement register. */
-    union
-    {
-        struct
-        {
-            unsigned int reserved_4:5;
-            unsigned int full_duplex:1;
-            unsigned int half_duplex:1;
-            unsigned int sym_pause:1;
-            unsigned int asym_pause:1;
-            unsigned int reserved_11:3;
-            unsigned int remote_fault1:1;
-            unsigned int remote_fault2:1;
-            unsigned int reserved_14:1;
-            unsigned int next_page:1;
-        } bits;
-
-        unsigned short AsUSHORT;
-
-        #define mr_adv_full_duplex          Mr4.bits.full_duplex
-        #define mr_adv_half_duplex          Mr4.bits.half_duplex
-        #define mr_adv_sym_pause            Mr4.bits.sym_pause
-        #define mr_adv_asym_pause           Mr4.bits.asym_pause
-        #define mr_adv_remote_fault1        Mr4.bits.remote_fault1
-        #define mr_adv_remote_fault2        Mr4.bits.remote_fault2
-        #define mr_adv_next_page            Mr4.bits.next_page
-    } Mr4;
-
-    /* Link partner advertisement register. */
-    union
-    {
-        struct
-        {
-            unsigned int reserved_4:5;
-            unsigned int lp_full_duplex:1;
-            unsigned int lp_half_duplex:1;
-            unsigned int lp_sym_pause:1;
-            unsigned int lp_asym_pause:1;
-            unsigned int reserved_11:3;
-            unsigned int lp_remote_fault1:1;
-            unsigned int lp_remote_fault2:1;
-            unsigned int lp_ack:1;
-            unsigned int lp_next_page:1;
-        } bits;
-
-        unsigned short AsUSHORT;
-
-        #define mr_lp_adv_full_duplex       Mr5.bits.lp_full_duplex
-        #define mr_lp_adv_half_duplex       Mr5.bits.lp_half_duplex
-        #define mr_lp_adv_sym_pause         Mr5.bits.lp_sym_pause
-        #define mr_lp_adv_asym_pause        Mr5.bits.lp_asym_pause
-        #define mr_lp_adv_remote_fault1     Mr5.bits.lp_remote_fault1
-        #define mr_lp_adv_remote_fault2     Mr5.bits.lp_remote_fault2
-        #define mr_lp_adv_next_page         Mr5.bits.lp_next_page
-    } Mr5;
-
-    /* Auto-negotiation expansion register. */
-    union
-    {
-        struct
-        {
-            unsigned int reserved_0:1;
-            unsigned int page_received:1;
-            unsigned int next_pageable:1;
-            unsigned int reserved_15:13;
-        } bits;
-
-        unsigned short AsUSHORT;
-    } Mr6;
-
-    /* Auto-negotiation next page transmit register. */
-    union
-    {
-        struct
-        {
-            unsigned int code_field:11;
-            unsigned int toggle:1;
-            unsigned int ack2:1;
-            unsigned int message_page:1;
-            unsigned int reserved_14:1;
-            unsigned int next_page:1;
-        } bits;
-
-        unsigned short AsUSHORT;
-
-        #define mr_np_tx                    Mr7.AsUSHORT
-    } Mr7;
-
-    /* Auto-negotiation link partner ability register. */
-    union
-    {
-        struct
-        {
-            unsigned int code_field:11;
-            unsigned int toggle:1;
-            unsigned int ack2:1;
-            unsigned int message_page:1;
-            unsigned int ack:1;
-            unsigned int next_page:1;
-        } bits;
-
-        unsigned short AsUSHORT;
-        
-        #define mr_lp_np_rx                 Mr8.AsUSHORT
-    } Mr8;
-
-    /* Extended status register. */
-    union
-    {
-        struct
-        {
-            unsigned int reserved_11:12;
-            unsigned int base1000_t_hd:1;
-            unsigned int base1000_t_fd:1;
-            unsigned int base1000_x_hd:1;
-            unsigned int base1000_x_fd:1;
-        } bits;      
-
-        unsigned short AsUSHORT;
-    } Mr15;
-
-    /* Miscellaneous state variables. */
-    union
-    {
-        struct
-        {
-            unsigned int toggle_tx:1;
-            unsigned int toggle_rx:1;
-            unsigned int np_rx:1;
-            unsigned int page_rx:1;
-            unsigned int np_loaded:1;
-        } bits;
-
-        unsigned short AsUSHORT;
-
-        #define mr_toggle_tx                MrMisc.bits.toggle_tx
-        #define mr_toggle_rx                MrMisc.bits.toggle_rx
-        #define mr_np_rx                    MrMisc.bits.np_rx
-        #define mr_page_rx                  MrMisc.bits.page_rx
-        #define mr_np_loaded                MrMisc.bits.np_loaded
-    } MrMisc;
-
-} AN_STATE_INFO, *PAN_STATE_INFO;
-
-
-
-/******************************************************************************/
-/* Return code of Autoneg8023z. */
-/******************************************************************************/
-
-typedef enum
-{
-    AUTONEG_STATUS_OK               = 0,
-    AUTONEG_STATUS_DONE             = 1,
-    AUTONEG_STATUS_TIMER_ENABLED    = 2,
-//    AUTONEG_STATUS_FAILED           = 0xffffffff,
-    AUTONEG_STATUS_FAILED           = 0xfffffff
-} AUTONEG_STATUS, *PAUTONEG_STATUS;
-
-
-
-/******************************************************************************/
-/* Function prototypes. */
-/******************************************************************************/
-
-AUTONEG_STATUS Autoneg8023z(PAN_STATE_INFO pAnInfo);
-void AutonegInit(PAN_STATE_INFO pAnInfo);
-
-
-
-/******************************************************************************/
-/* The following functions are defined in the os-dependent module. */
-/******************************************************************************/
-
-void MM_AnTxConfig(PAN_STATE_INFO pAnInfo);
-void MM_AnTxIdle(PAN_STATE_INFO pAnInfo);
-char MM_AnRxConfig(PAN_STATE_INFO pAnInfo, unsigned short *pRxConfig);
-
-
-
-#endif /* AUTONEG_H */
-
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm/b57proc.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm/b57proc.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm/b57proc.c	2004-06-29 11:24:56.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm/b57proc.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,470 +0,0 @@
-/******************************************************************************/
-/*                                                                            */
-/* Broadcom BCM5700 Linux Network Driver, Copyright (c) 2000 - 2003 Broadcom  */
-/* 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, located in the file LICENSE.                 */
-/*                                                                            */
-/* /proc file system handling code.                                           */
-/*                                                                            */
-/******************************************************************************/
-
-#include "mm.h"
-#ifdef BCM_PROC_FS
-
-#define NICINFO_PROC_DIR "nicinfo"
-
-static struct proc_dir_entry *bcm5700_procfs_dir;
-
-extern char bcm5700_driver[], bcm5700_version[];
-
-extern unsigned long bcm5700_crc_count(PUM_DEVICE_BLOCK pUmDevice);
-
-static char *na_str = "n/a";
-static char *pause_str = "pause ";
-static char *asym_pause_str = "asym_pause ";
-static char *on_str = "on";
-static char *off_str = "off";
-static char *up_str = "up";
-static char *down_str = "down";
-
-static struct proc_dir_entry *
-proc_getdir(char *name, struct proc_dir_entry *proc_dir)
-{
-	struct proc_dir_entry *pde = proc_dir;
-
-	lock_kernel();
-	for (pde=pde->subdir; pde; pde = pde->next) {
-		if (pde->namelen && (strcmp(name, pde->name) == 0)) {
-			/* directory exists */
-			break;
-		}
-	}
-	if (pde == (struct proc_dir_entry *) 0)
-	{
-		/* create the directory */
-#if (LINUX_VERSION_CODE > 0x20300)
-		pde = proc_mkdir(name, proc_dir);
-#else
-		pde = create_proc_entry(name, S_IFDIR, proc_dir);
-#endif
-		if (pde == (struct proc_dir_entry *) 0) {
-			unlock_kernel();
-			return (pde);
-		}
-	}
-	unlock_kernel();
-	return (pde);
-}
-
-int
-bcm5700_proc_create(void)
-{
-	bcm5700_procfs_dir = proc_getdir(NICINFO_PROC_DIR, proc_net);
-
-	if (bcm5700_procfs_dir == (struct proc_dir_entry *) 0) {
-		printk(KERN_DEBUG "Could not create procfs nicinfo directory %s\n", NICINFO_PROC_DIR);
-		return -1;
-	}
-	return 0;
-}
-
-void
-b57_get_speed_adv(PUM_DEVICE_BLOCK pUmDevice, char *str)
-{
-	PLM_DEVICE_BLOCK pDevice = &pUmDevice->lm_dev;
-
-	if (pDevice->DisableAutoNeg == TRUE) {
-		strcpy(str, na_str);
-		return;
-	}
-	if (pDevice->EnableTbi) {
-		strcpy(str, "1000full");
-		return;
-	}
-	str[0] = 0;
-	if (pDevice->advertising & PHY_AN_AD_10BASET_HALF) {
-		strcat(str, "10half ");
-	}
-	if (pDevice->advertising & PHY_AN_AD_10BASET_FULL) {
-		strcat(str, "10full ");
-	}
-	if (pDevice->advertising & PHY_AN_AD_100BASETX_HALF) {
-		strcat(str, "100half ");
-	}
-	if (pDevice->advertising & PHY_AN_AD_100BASETX_FULL) {
-		strcat(str, "100full ");
-	}
-	if (pDevice->advertising1000 & BCM540X_AN_AD_1000BASET_HALF) {
-		strcat(str, "1000half ");
-	}
-	if (pDevice->advertising1000 & BCM540X_AN_AD_1000BASET_FULL) {
-		strcat(str, "1000full ");
-	}
-}
-
-void
-b57_get_fc_adv(PUM_DEVICE_BLOCK pUmDevice, char *str)
-{
-	PLM_DEVICE_BLOCK pDevice = &pUmDevice->lm_dev;
-
-	if (pDevice->DisableAutoNeg == TRUE) {
-		strcpy(str, na_str);
-		return;
-	}
-	str[0] = 0;
-	if (pDevice->EnableTbi) {
-		if(pDevice->DisableAutoNeg == FALSE ||
-			pDevice->RequestedLineSpeed == LM_LINE_SPEED_AUTO) {
-			if (pDevice->FlowControlCap &
-				LM_FLOW_CONTROL_RECEIVE_PAUSE) {
-
-				strcpy(str, pause_str);
-				if (!(pDevice->FlowControlCap &
-					LM_FLOW_CONTROL_TRANSMIT_PAUSE)) {
-
-					strcpy(str, asym_pause_str);
-				}
-			}
-			else if (pDevice->FlowControlCap &
-				LM_FLOW_CONTROL_TRANSMIT_PAUSE) {
-
-				strcpy(str, asym_pause_str);
-			}
-		}
-		return;
-	}
-	if (pDevice->advertising & PHY_AN_AD_PAUSE_CAPABLE) {
-		strcat(str, pause_str);
-	}
-	if (pDevice->advertising & PHY_AN_AD_ASYM_PAUSE) {
-		strcat(str, asym_pause_str);
-	}
-}
-
-int
-bcm5700_read_pfs(char *page, char **start, off_t off, int count,
-	int *eof, void *data)
-{
-	struct net_device *dev = (struct net_device *) data;
-	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK) dev->priv;
-	PLM_DEVICE_BLOCK pDevice = &pUmDevice->lm_dev;
-	PT3_STATS_BLOCK pStats = (PT3_STATS_BLOCK) pDevice->pStatsBlkVirt;
-	int len = 0;
-	unsigned long rx_mac_errors, rx_crc_errors, rx_align_errors;
-	unsigned long rx_runt_errors, rx_frag_errors, rx_long_errors;
-	unsigned long rx_overrun_errors, rx_jabber_errors;
-	char str[64];
-
-	if (pUmDevice->opened == 0)
-		pStats = 0;
-
-	len += sprintf(page+len, "Description\t\t\t%s\n", pUmDevice->name);
-	len += sprintf(page+len, "Driver_Name\t\t\t%s\n", bcm5700_driver);
-	len += sprintf(page+len, "Driver_Version\t\t\t%s\n", bcm5700_version);
-	len += sprintf(page+len, "Bootcode_Version\t\t%s\n", pDevice->BootCodeVer);
-	len += sprintf(page+len, "PCI_Vendor\t\t\t0x%04x\n", pDevice->PciVendorId);
-	len += sprintf(page+len, "PCI_Device_ID\t\t\t0x%04x\n",
-		pDevice->PciDeviceId);
-	len += sprintf(page+len, "PCI_Subsystem_Vendor\t\t0x%04x\n",
-		pDevice->SubsystemVendorId);
-	len += sprintf(page+len, "PCI_Subsystem_ID\t\t0x%04x\n",
-		pDevice->SubsystemId);
-	len += sprintf(page+len, "PCI_Revision_ID\t\t\t0x%02x\n",
-		pDevice->PciRevId);
-	len += sprintf(page+len, "PCI_Slot\t\t\t%d\n",
-		PCI_SLOT(pUmDevice->pdev->devfn));
-	if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5704) {
-		len += sprintf(page+len, "PCI_Function\t\t\t%d\n",
-			pDevice->FunctNum);
-	}
-	len += sprintf(page+len, "PCI_Bus\t\t\t\t%d\n",
-		pUmDevice->pdev->bus->number);
-
-	len += sprintf(page+len, "PCI_Bus_Speed\t\t\t%s\n",
-		pDevice->BusSpeedStr);
-
-	len += sprintf(page+len, "Memory\t\t\t\t0x%lx\n", pUmDevice->dev->base_addr);
-	len += sprintf(page+len, "IRQ\t\t\t\t%d\n", dev->irq);
-	len += sprintf(page+len, "System_Device_Name\t\t%s\n", dev->name);
-	len += sprintf(page+len, "Current_HWaddr\t\t\t%02x:%02x:%02x:%02x:%02x:%02x\n",
-		dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
-		dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
-	len += sprintf(page+len,
-		"Permanent_HWaddr\t\t%02x:%02x:%02x:%02x:%02x:%02x\n",
-		pDevice->NodeAddress[0], pDevice->NodeAddress[1],
-		pDevice->NodeAddress[2], pDevice->NodeAddress[3],
-		pDevice->NodeAddress[4], pDevice->NodeAddress[5]);
-	len += sprintf(page+len, "Part_Number\t\t\t%s\n\n", pDevice->PartNo);
-
-	len += sprintf(page+len, "Link\t\t\t\t%s\n", 
-		(pUmDevice->opened == 0) ? "unknown" :
-    		((pDevice->LinkStatus == LM_STATUS_LINK_ACTIVE) ? up_str :
-		down_str));
-	len += sprintf(page+len, "Auto_Negotiate\t\t\t%s\n", 
-    		(pDevice->DisableAutoNeg == TRUE) ? off_str : on_str);
-	b57_get_speed_adv(pUmDevice, str);
-	len += sprintf(page+len, "Speed_Advertisement\t\t%s\n", str);
-	b57_get_fc_adv(pUmDevice, str);
-	len += sprintf(page+len, "Flow_Control_Advertisement\t%s\n", str);
-	len += sprintf(page+len, "Speed\t\t\t\t%s\n", 
-    		((pDevice->LinkStatus == LM_STATUS_LINK_DOWN) ||
-		(pUmDevice->opened == 0)) ? na_str :
-    		((pDevice->LineSpeed == LM_LINE_SPEED_1000MBPS) ? "1000" :
-    		((pDevice->LineSpeed == LM_LINE_SPEED_100MBPS) ? "100" :
-    		(pDevice->LineSpeed == LM_LINE_SPEED_10MBPS) ? "10" : na_str)));
-	len += sprintf(page+len, "Duplex\t\t\t\t%s\n", 
-    		((pDevice->LinkStatus == LM_STATUS_LINK_DOWN) ||
-		(pUmDevice->opened == 0)) ? na_str :
-		((pDevice->DuplexMode == LM_DUPLEX_MODE_FULL) ? "full" :
-			"half"));
-	len += sprintf(page+len, "Flow_Control\t\t\t%s\n", 
-    		((pDevice->LinkStatus == LM_STATUS_LINK_DOWN) ||
-		(pUmDevice->opened == 0)) ? na_str :
-		((pDevice->FlowControl == LM_FLOW_CONTROL_NONE) ? off_str :
-		(((pDevice->FlowControl & LM_FLOW_CONTROL_RX_TX_PAUSE) ==
-			LM_FLOW_CONTROL_RX_TX_PAUSE) ? "receive/transmit" :
-		(pDevice->FlowControl & LM_FLOW_CONTROL_RECEIVE_PAUSE) ?
-			"receive" : "transmit")));
-	len += sprintf(page+len, "State\t\t\t\t%s\n", 
-		(pUmDevice->suspended ? "suspended" :
-    		((dev->flags & IFF_UP) ? up_str : down_str)));
-	len += sprintf(page+len, "MTU_Size\t\t\t%d\n\n", dev->mtu);
-	len += sprintf(page+len, "Rx_Packets\t\t\t%lu\n", 
-			((pStats == 0) ? 0 :
-			MM_GETSTATS(pStats->ifHCInUcastPkts) +
-			MM_GETSTATS(pStats->ifHCInMulticastPkts) +
-			MM_GETSTATS(pStats->ifHCInBroadcastPkts)));
-#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
-	if (dev->mtu > 1500) {
-		len += sprintf(page+len, "Rx_Jumbo_Packets\t\t%lu\n", 
-			((pStats == 0) ? 0 :
-			MM_GETSTATS(
-				pStats->etherStatsPkts1523Octetsto2047Octets) +
-			MM_GETSTATS(
-				pStats->etherStatsPkts2048Octetsto4095Octets) +
-			MM_GETSTATS(
-				pStats->etherStatsPkts4096Octetsto8191Octets) +
-			MM_GETSTATS(
-				pStats->etherStatsPkts8192Octetsto9022Octets)));
-	}
-#endif
-	len += sprintf(page+len, "Tx_Packets\t\t\t%lu\n",
-		((pStats == 0) ? 0 :
-		MM_GETSTATS(pStats->ifHCOutUcastPkts) +
-		MM_GETSTATS(pStats->ifHCOutMulticastPkts) +
-		MM_GETSTATS(pStats->ifHCOutBroadcastPkts)));
-#ifdef BCM_TSO
-	len += sprintf(page+len, "TSO_Large_Packets\t\t%lu\n",
-		pUmDevice->tso_pkt_count);
-#endif
-	len += sprintf(page+len, "Rx_Bytes\t\t\t%lu\n",
-		((pStats == 0) ? 0 :
-		MM_GETSTATS(pStats->ifHCInOctets)));
-	len += sprintf(page+len, "Tx_Bytes\t\t\t%lu\n",
-		((pStats == 0) ? 0 :
-		MM_GETSTATS(pStats->ifHCOutOctets)));
-	if (pStats == 0) {
-		rx_crc_errors = 0;
-		rx_align_errors = 0;
-		rx_runt_errors = 0;
-		rx_frag_errors = 0;
-		rx_long_errors = 0;
-		rx_overrun_errors = 0;
-		rx_jabber_errors = 0;
-	}
-	else {
-		rx_crc_errors = bcm5700_crc_count(pUmDevice);
-		rx_align_errors = MM_GETSTATS(pStats->dot3StatsAlignmentErrors);
-		rx_runt_errors = MM_GETSTATS(pStats->etherStatsUndersizePkts);
-		rx_frag_errors = MM_GETSTATS(pStats->etherStatsFragments);
-		rx_long_errors = MM_GETSTATS(pStats->dot3StatsFramesTooLong);
-		rx_overrun_errors = MM_GETSTATS(pStats->nicNoMoreRxBDs);
-		rx_jabber_errors = MM_GETSTATS(pStats->etherStatsJabbers);
-	}
-	rx_mac_errors = rx_crc_errors + rx_align_errors + rx_runt_errors +
-		rx_frag_errors + rx_long_errors + rx_jabber_errors;
-	len += sprintf(page+len, "Rx_Errors\t\t\t%lu\n",
-		((pStats == 0) ? 0 :
-		rx_mac_errors + rx_overrun_errors + pUmDevice->rx_misc_errors));
-	len += sprintf(page+len, "Tx_Errors\t\t\t%lu\n",
-		((pStats == 0) ? 0 :
-		MM_GETSTATS(pStats->ifOutErrors)));
-	len += sprintf(page+len, "\nTx_Carrier_Errors\t\t%lu\n",
-		((pStats == 0) ? 0 :
-		MM_GETSTATS(pStats->dot3StatsCarrierSenseErrors)));
-	len += sprintf(page+len, "Tx_Abort_Excess_Coll\t\t%lu\n",
-		((pStats == 0) ? 0 :
-    		MM_GETSTATS(pStats->dot3StatsExcessiveCollisions)));
-	len += sprintf(page+len, "Tx_Abort_Late_Coll\t\t%lu\n",
-		((pStats == 0) ? 0 :
-    		MM_GETSTATS(pStats->dot3StatsLateCollisions)));
-	len += sprintf(page+len, "Tx_Deferred_Ok\t\t\t%lu\n",
-		((pStats == 0) ? 0 :
-    		MM_GETSTATS(pStats->dot3StatsDeferredTransmissions)));
-	len += sprintf(page+len, "Tx_Single_Coll_Ok\t\t%lu\n",
-		((pStats == 0) ? 0 :
-    		MM_GETSTATS(pStats->dot3StatsSingleCollisionFrames)));
-	len += sprintf(page+len, "Tx_Multi_Coll_Ok\t\t%lu\n",
-		((pStats == 0) ? 0 :
-    		MM_GETSTATS(pStats->dot3StatsMultipleCollisionFrames)));
-	len += sprintf(page+len, "Tx_Total_Coll_Ok\t\t%lu\n",
-		((pStats == 0) ? 0 :
-		MM_GETSTATS(pStats->etherStatsCollisions)));
-	len += sprintf(page+len, "Tx_XON_Pause_Frames\t\t%lu\n",
-		((pStats == 0) ? 0 :
-		MM_GETSTATS(pStats->outXonSent)));
-	len += sprintf(page+len, "Tx_XOFF_Pause_Frames\t\t%lu\n",
-		((pStats == 0) ? 0 :
-		MM_GETSTATS(pStats->outXoffSent)));
-	len += sprintf(page+len, "\nRx_CRC_Errors\t\t\t%lu\n", rx_crc_errors);
-	len += sprintf(page+len, "Rx_Short_Fragment_Errors\t%lu\n",
-		rx_frag_errors);
-	len += sprintf(page+len, "Rx_Short_Length_Errors\t\t%lu\n",
-		rx_runt_errors);
-	len += sprintf(page+len, "Rx_Long_Length_Errors\t\t%lu\n",
-		rx_long_errors);
-	len += sprintf(page+len, "Rx_Align_Errors\t\t\t%lu\n",
-		rx_align_errors);
-	len += sprintf(page+len, "Rx_Overrun_Errors\t\t%lu\n",
-		rx_overrun_errors);
-	len += sprintf(page+len, "Rx_XON_Pause_Frames\t\t%lu\n",
-		((pStats == 0) ? 0 :
-		MM_GETSTATS(pStats->xonPauseFramesReceived)));
-	len += sprintf(page+len, "Rx_XOFF_Pause_Frames\t\t%lu\n",
-		((pStats == 0) ? 0 :
-		MM_GETSTATS(pStats->xoffPauseFramesReceived)));
-	len += sprintf(page+len, "\nTx_MAC_Errors\t\t\t%lu\n",
-		((pStats == 0) ? 0 :
-		MM_GETSTATS(pStats->dot3StatsInternalMacTransmitErrors)));
-	len += sprintf(page+len, "Rx_MAC_Errors\t\t\t%lu\n\n",
-		rx_mac_errors);
-
-	len += sprintf(page+len, "Tx_Checksum\t\t\t%s\n",
-		((pDevice->TaskToOffload & LM_TASK_OFFLOAD_TX_TCP_CHECKSUM) ?
-		on_str : off_str));
-	len += sprintf(page+len, "Rx_Checksum\t\t\t%s\n",
-		((pDevice->TaskToOffload & LM_TASK_OFFLOAD_RX_TCP_CHECKSUM) ?
-		on_str : off_str));
-	len += sprintf(page+len, "Scatter_Gather\t\t\t%s\n",
-#if (LINUX_VERSION_CODE >= 0x20400)
-		((dev->features & NETIF_F_SG) ? on_str : off_str));
-#else
-		off_str);
-#endif
-#ifdef BCM_TSO
-	len += sprintf(page+len, "TSO\t\t\t\t%s\n",
-		((dev->features & NETIF_F_TSO) ? on_str : off_str));
-#endif
-	len += sprintf(page+len, "VLAN\t\t\t\t%s\n\n",
-		((pDevice->RxMode & RX_MODE_KEEP_VLAN_TAG) ? off_str : on_str));
-
-#ifdef BCM_NIC_SEND_BD
-	len += sprintf(page+len, "NIC_Tx_BDs\t\t\t%s\n",
-		pDevice->NicSendBd ? on_str : off_str);
-#endif
-	len += sprintf(page+len, "Tx_Desc_Count\t\t\t%u\n",
-		pDevice->TxPacketDescCnt);
-	len += sprintf(page+len, "Rx_Desc_Count\t\t\t%u\n",
-		pDevice->RxStdDescCnt);
-#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
-	len += sprintf(page+len, "Rx_Jumbo_Desc_Count\t\t%u\n",
-		pDevice->RxJumboDescCnt);
-#endif
-#ifdef BCM_INT_COAL
-	len += sprintf(page+len, "Adaptive_Coalescing\t\t%s\n",
-		(pUmDevice->adaptive_coalesce ? on_str : off_str));
-	len += sprintf(page+len, "Rx_Coalescing_Ticks\t\t%u\n",
-		pUmDevice->rx_curr_coalesce_ticks);
-	len += sprintf(page+len, "Rx_Coalesced_Frames\t\t%u\n",
-		pUmDevice->rx_curr_coalesce_frames);
-	len += sprintf(page+len, "Tx_Coalescing_Ticks\t\t%u\n",
-		pDevice->TxCoalescingTicks);
-	len += sprintf(page+len, "Tx_Coalesced_Frames\t\t%u\n",
-		pUmDevice->tx_curr_coalesce_frames);
-	len += sprintf(page+len, "Stats_Coalescing_Ticks\t\t%u\n",
-		pDevice->StatsCoalescingTicks);
-#endif
-#ifdef BCM_WOL
-	len += sprintf(page+len, "Wake_On_LAN\t\t\t%s\n",
-        	((pDevice->WakeUpMode & LM_WAKE_UP_MODE_MAGIC_PACKET) ?
-		on_str : off_str));
-#endif
-#if TIGON3_DEBUG
-	len += sprintf(page+len, "\nDmaReadWriteCtrl\t\t%x\n",
-		pDevice->DmaReadWriteCtrl);
-	len += sprintf(page+len, "\nTx_Zero_Copy_Packets\t\t%u\n",
-		pUmDevice->tx_zc_count);
-	len += sprintf(page+len, "Tx_Chksum_Packets\t\t%u\n",
-		pUmDevice->tx_chksum_count);
-	len += sprintf(page+len, "Tx_Highmem_Fragments\t\t%u\n",
-		pUmDevice->tx_himem_count);
-	len += sprintf(page+len, "Rx_Good_Chksum_Packets\t\t%u\n",
-		pUmDevice->rx_good_chksum_count);
-	len += sprintf(page+len, "Rx_Bad_Chksum_Packets\t\t%u\n",
-		pUmDevice->rx_bad_chksum_count);
-	if (!pDevice->EnableTbi) {
-		LM_UINT32 value32;
-		unsigned long flags;
-
-		BCM5700_PHY_LOCK(pUmDevice, flags);
-        	LM_ReadPhy(pDevice, 0, &value32);
-		len += sprintf(page+len, "\nPhy_Register_0x00\t\t0x%x\n", value32);
-        	LM_ReadPhy(pDevice, 1, &value32);
-		len += sprintf(page+len, "Phy_Register_0x01\t\t0x%x\n", value32);
-        	LM_ReadPhy(pDevice, 2, &value32);
-		len += sprintf(page+len, "Phy_Register_0x02\t\t0x%x\n", value32);
-        	LM_ReadPhy(pDevice, 3, &value32);
-		len += sprintf(page+len, "Phy_Register_0x03\t\t0x%x\n", value32);
-        	LM_ReadPhy(pDevice, 4, &value32);
-		len += sprintf(page+len, "Phy_Register_0x04\t\t0x%x\n", value32);
-        	LM_ReadPhy(pDevice, 5, &value32);
-		len += sprintf(page+len, "Phy_Register_0x05\t\t0x%x\n", value32);
-        	LM_ReadPhy(pDevice, 9, &value32);
-		len += sprintf(page+len, "Phy_Register_0x09\t\t0x%x\n", value32);
-        	LM_ReadPhy(pDevice, 0xa, &value32);
-		len += sprintf(page+len, "Phy_Register_0x0A\t\t0x%x\n", value32);
-        	LM_ReadPhy(pDevice, 0xf, &value32);
-		len += sprintf(page+len, "Phy_Register_0x0F\t\t0x%x\n", value32);
-        	LM_ReadPhy(pDevice, 0x10, &value32);
-		len += sprintf(page+len, "Phy_Register_0x10\t\t0x%x\n", value32);
-        	LM_ReadPhy(pDevice, 0x19, &value32);
-		len += sprintf(page+len, "Phy_Register_0x19\t\t0x%x\n", value32);
-		BCM5700_PHY_UNLOCK(pUmDevice, flags);
-	}
-#endif
-
-	*eof = 1;
-	return len;
-}
-
-int
-bcm5700_proc_create_dev(struct net_device *dev)
-{
-	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK) dev->priv;
-
-	if (!bcm5700_procfs_dir)
-		return -1;
-
-	sprintf(pUmDevice->pfs_name, "%s.info", dev->name);
-	pUmDevice->pfs_entry = create_proc_entry(pUmDevice->pfs_name,
-		S_IFREG, bcm5700_procfs_dir);
-	if (pUmDevice->pfs_entry == 0)
-		return -1;
-	pUmDevice->pfs_entry->read_proc = bcm5700_read_pfs;
-	pUmDevice->pfs_entry->data = dev;
-	return 0;
-}
-int
-bcm5700_proc_remove_dev(struct net_device *dev)
-{
-	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK) dev->priv;
-
-	remove_proc_entry(pUmDevice->pfs_name, bcm5700_procfs_dir);
-	return 0;
-}
-
-#endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm/b57um.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm/b57um.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm/b57um.c	2004-06-29 11:24:56.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm/b57um.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,4522 +0,0 @@
-/******************************************************************************/
-/*                                                                            */
-/* Broadcom BCM5700 Linux Network Driver, Copyright (c) 2000 - 2003 Broadcom  */
-/* 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, located in the file LICENSE.                 */
-/*                                                                            */
-/******************************************************************************/
-
-
-char bcm5700_driver[] = "bcm5700";
-char bcm5700_version[] = "7.1.22";
-char bcm5700_date[] = "(01/07/04)";
-
-#define B57UM
-#include "mm.h"
-
-/* A few user-configurable values. */
-
-#define MAX_UNITS 16
-/* Used to pass the full-duplex flag, etc. */
-static int line_speed[MAX_UNITS] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-static int auto_speed[MAX_UNITS] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
-static int full_duplex[MAX_UNITS] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
-static int rx_flow_control[MAX_UNITS] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
-static int tx_flow_control[MAX_UNITS] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
-static int auto_flow_control[MAX_UNITS] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
-#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
-static int mtu[MAX_UNITS] = {1500,1500,1500,1500,1500,1500,1500,1500,1500,1500,1500,1500,1500,1500,1500,1500};	/* Jumbo MTU for interfaces. */
-#endif
-static int tx_checksum[MAX_UNITS] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
-static int rx_checksum[MAX_UNITS] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
-static int scatter_gather[MAX_UNITS] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
-
-#define TX_DESC_CNT DEFAULT_TX_PACKET_DESC_COUNT
-static unsigned int tx_pkt_desc_cnt[MAX_UNITS] =
-	{TX_DESC_CNT,TX_DESC_CNT,TX_DESC_CNT,TX_DESC_CNT,TX_DESC_CNT,
-	TX_DESC_CNT,TX_DESC_CNT,TX_DESC_CNT,TX_DESC_CNT,TX_DESC_CNT,
-	TX_DESC_CNT,TX_DESC_CNT,TX_DESC_CNT,TX_DESC_CNT,TX_DESC_CNT,
-	TX_DESC_CNT};
-
-#define RX_DESC_CNT DEFAULT_STD_RCV_DESC_COUNT
-static unsigned int rx_std_desc_cnt[MAX_UNITS] =
-	{RX_DESC_CNT,RX_DESC_CNT,RX_DESC_CNT,RX_DESC_CNT,RX_DESC_CNT,
-	RX_DESC_CNT,RX_DESC_CNT,RX_DESC_CNT,RX_DESC_CNT,RX_DESC_CNT,
-	RX_DESC_CNT,RX_DESC_CNT,RX_DESC_CNT,RX_DESC_CNT,RX_DESC_CNT,
-	RX_DESC_CNT };
-
-#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
-#define JBO_DESC_CNT DEFAULT_JUMBO_RCV_DESC_COUNT
-static unsigned int rx_jumbo_desc_cnt[MAX_UNITS] =
-	{JBO_DESC_CNT,JBO_DESC_CNT,JBO_DESC_CNT,JBO_DESC_CNT,JBO_DESC_CNT,
-	JBO_DESC_CNT,JBO_DESC_CNT,JBO_DESC_CNT,JBO_DESC_CNT,JBO_DESC_CNT,
-	JBO_DESC_CNT,JBO_DESC_CNT,JBO_DESC_CNT,JBO_DESC_CNT,JBO_DESC_CNT,
-	JBO_DESC_CNT };
-#endif
-
-#ifdef BCM_INT_COAL
-#ifdef BCM_NAPI_RXPOLL
-static unsigned int adaptive_coalesce[MAX_UNITS] =
-	{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-#else
-static unsigned int adaptive_coalesce[MAX_UNITS] =
-	{1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
-#endif
-
-#define RX_COAL_TK DEFAULT_RX_COALESCING_TICKS
-static unsigned int rx_coalesce_ticks[MAX_UNITS] =
-	{RX_COAL_TK,RX_COAL_TK,RX_COAL_TK,RX_COAL_TK,RX_COAL_TK,
-	RX_COAL_TK, RX_COAL_TK,RX_COAL_TK,RX_COAL_TK,RX_COAL_TK,
-	RX_COAL_TK,RX_COAL_TK, RX_COAL_TK,RX_COAL_TK,RX_COAL_TK,
-	RX_COAL_TK};
-
-#define RX_COAL_FM DEFAULT_RX_MAX_COALESCED_FRAMES
-static unsigned int rx_max_coalesce_frames[MAX_UNITS] =
-	{RX_COAL_FM,RX_COAL_FM,RX_COAL_FM,RX_COAL_FM,RX_COAL_FM,
-	RX_COAL_FM,RX_COAL_FM,RX_COAL_FM,RX_COAL_FM,RX_COAL_FM,
-	RX_COAL_FM,RX_COAL_FM,RX_COAL_FM,RX_COAL_FM,RX_COAL_FM,
-	RX_COAL_FM};
-
-#define TX_COAL_TK DEFAULT_TX_COALESCING_TICKS
-static unsigned int tx_coalesce_ticks[MAX_UNITS] =
-	{TX_COAL_TK,TX_COAL_TK,TX_COAL_TK,TX_COAL_TK,TX_COAL_TK,
-	TX_COAL_TK, TX_COAL_TK,TX_COAL_TK,TX_COAL_TK,TX_COAL_TK,
-	TX_COAL_TK,TX_COAL_TK, TX_COAL_TK,TX_COAL_TK,TX_COAL_TK,
-	TX_COAL_TK};
-
-#define TX_COAL_FM DEFAULT_TX_MAX_COALESCED_FRAMES
-static unsigned int tx_max_coalesce_frames[MAX_UNITS] =
-	{TX_COAL_FM,TX_COAL_FM,TX_COAL_FM,TX_COAL_FM,TX_COAL_FM,
-	TX_COAL_FM,TX_COAL_FM,TX_COAL_FM,TX_COAL_FM,TX_COAL_FM,
-	TX_COAL_FM,TX_COAL_FM,TX_COAL_FM,TX_COAL_FM,TX_COAL_FM,
-	TX_COAL_FM};
-
-#define ST_COAL_TK DEFAULT_STATS_COALESCING_TICKS
-static unsigned int stats_coalesce_ticks[MAX_UNITS] =
-	{ST_COAL_TK,ST_COAL_TK,ST_COAL_TK,ST_COAL_TK,ST_COAL_TK,
-	ST_COAL_TK,ST_COAL_TK,ST_COAL_TK,ST_COAL_TK,ST_COAL_TK,
-	ST_COAL_TK,ST_COAL_TK,ST_COAL_TK,ST_COAL_TK,ST_COAL_TK,
-	ST_COAL_TK,};
-
-#endif
-#ifdef BCM_WOL
-static int enable_wol[MAX_UNITS] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-#endif
-#ifdef BCM_TSO
-static int enable_tso[MAX_UNITS] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
-#endif
-
-#ifdef BCM_NIC_SEND_BD
-static int nic_tx_bd[MAX_UNITS] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-#endif
-
-#ifdef BCM_ASF
-static int vlan_tag_mode[MAX_UNITS] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-#endif
-
-/* Operational parameters that usually are not changed. */
-/* Time in jiffies before concluding the transmitter is hung. */
-#define TX_TIMEOUT  (2*HZ)
-
-#if (LINUX_VERSION_CODE < 0x02030d)
-#define pci_resource_start(dev, bar)	(dev->base_address[bar] & PCI_BASE_ADDRESS_MEM_MASK)
-#elif (LINUX_VERSION_CODE < 0x02032b)
-#define pci_resource_start(dev, bar)	(dev->resource[bar] & PCI_BASE_ADDRESS_MEM_MASK)
-#endif
-
-#if (LINUX_VERSION_CODE < 0x02032b)
-#define dev_kfree_skb_irq(skb)  dev_kfree_skb(skb)
-#define netif_wake_queue(dev)	clear_bit(0, &dev->tbusy); mark_bh(NET_BH)
-#define netif_stop_queue(dev)	set_bit(0, &dev->tbusy)
-
-static inline void netif_start_queue(struct net_device *dev)
-{
-	dev->tbusy = 0;
-	dev->interrupt = 0;
-	dev->start = 1;
-}
-
-#define netif_queue_stopped(dev)	dev->tbusy
-#define netif_running(dev)		dev->start
-
-static inline void tasklet_schedule(struct tasklet_struct *tasklet)
-{
-	queue_task(tasklet, &tq_immediate);
-	mark_bh(IMMEDIATE_BH);
-}
-
-static inline void tasklet_init(struct tasklet_struct *tasklet,
-				void (*func)(unsigned long),
-				unsigned long data)
-{
-        tasklet->next = NULL;
-        tasklet->sync = 0;
-        tasklet->routine = (void (*)(void *))func;
-        tasklet->data = (void *)data;
-}
-
-#define tasklet_kill(tasklet)
-
-#endif
-
-#if (LINUX_VERSION_CODE < 0x020300)
-struct pci_device_id {
-	unsigned int vendor, device;		/* Vendor and device ID or PCI_ANY_ID */
-	unsigned int subvendor, subdevice;	/* Subsystem ID's or PCI_ANY_ID */
-	unsigned int class, class_mask;		/* (class,subclass,prog-if) triplet */
-	unsigned long driver_data;		/* Data private to the driver */
-};
-
-#define PCI_ANY_ID		0
-
-#define pci_set_drvdata(pdev, dev)
-#define pci_get_drvdata(pdev) 0
-
-#define pci_enable_device(pdev) 0
-
-#define __devinit		__init
-#define __devinitdata		__initdata
-#define __devexit
-
-#define SET_MODULE_OWNER(dev)
-#define MODULE_DEVICE_TABLE(pci, pci_tbl)
-
-#endif
-
-#if (LINUX_VERSION_CODE < 0x020411)
-#ifndef __devexit_p
-#define __devexit_p(x)	x
-#endif
-#endif
-
-#ifndef MODULE_LICENSE
-#define MODULE_LICENSE(license)
-#endif
-
-#ifndef IRQ_RETVAL
-typedef void irqreturn_t;
-#define IRQ_RETVAL(x)
-#endif
-
-#if (LINUX_VERSION_CODE < 0x02032a)
-static inline void *pci_alloc_consistent(struct pci_dev *pdev, size_t size,
-					 dma_addr_t *dma_handle)
-{
-	void *virt_ptr;
-
-	/* Maximum in slab.c */
-	if (size > 131072)
-		return 0;
-
-	virt_ptr = kmalloc(size, GFP_KERNEL);
-	*dma_handle = virt_to_bus(virt_ptr);
-	return virt_ptr;
-}
-#define pci_free_consistent(dev, size, ptr, dma_ptr)	kfree(ptr)
-
-#endif /*#if (LINUX_VERSION_CODE < 0x02032a) */
-
-
-#if (LINUX_VERSION_CODE < 0x02040d)
-
-#if (LINUX_VERSION_CODE >= 0x020409) && defined(RED_HAT_LINUX_KERNEL)
-
-#define BCM_32BIT_DMA_MASK ((u64) 0x00000000ffffffff)
-#define BCM_64BIT_DMA_MASK ((u64) 0xffffffffffffffff)
-
-#else
-/* pci_set_dma_mask is using dma_addr_t */
-
-#define BCM_32BIT_DMA_MASK ((dma_addr_t) 0xffffffff)
-#define BCM_64BIT_DMA_MASK ((dma_addr_t) 0xffffffff)
-
-#endif
-
-#else /* (LINUX_VERSION_CODE < 0x02040d) */
-
-#define BCM_32BIT_DMA_MASK ((u64) 0x00000000ffffffff)
-#define BCM_64BIT_DMA_MASK ((u64) 0xffffffffffffffff)
-#endif
-
-#if (LINUX_VERSION_CODE < 0x020329)
-#define pci_set_dma_mask(pdev, mask) (0)
-#else
-#if (LINUX_VERSION_CODE < 0x020403)
-int
-pci_set_dma_mask(struct pci_dev *dev, dma_addr_t mask)
-{
-    if(! pci_dma_supported(dev, mask))
-        return -EIO;
-
-    dev->dma_mask = mask;
-
-    return 0;
-}
-#endif
-#endif
-
-#if (LINUX_VERSION_CODE < 0x020547)
-#define pci_set_consistent_dma_mask(pdev, mask)
-#endif
-
-#if (LINUX_VERSION_CODE < 0x020402)
-#define pci_request_regions(pdev, name) (0)
-#define pci_release_regions(pdev)
-#endif
-
-#if ! defined(spin_is_locked)
-#define spin_is_locked(lock)    (test_bit(0,(lock)))
-#endif
-
-#define BCM5700_LOCK(pUmDevice, flags)					\
-	if ((pUmDevice)->do_global_lock) {				\
-		spin_lock_irqsave(&(pUmDevice)->global_lock, flags);	\
-	}
-
-#define BCM5700_UNLOCK(pUmDevice, flags)				\
-	if ((pUmDevice)->do_global_lock) {				\
-		spin_unlock_irqrestore(&(pUmDevice)->global_lock, flags);\
-	}
-
-inline void
-bcm5700_intr_lock(PUM_DEVICE_BLOCK pUmDevice)
-{
-	if (pUmDevice->do_global_lock) {
-		spin_lock(&pUmDevice->global_lock);
-	}
-}
-
-inline void
-bcm5700_intr_unlock(PUM_DEVICE_BLOCK pUmDevice)
-{
-	if (pUmDevice->do_global_lock) {
-		spin_unlock(&pUmDevice->global_lock);
-	}
-}
-
-void
-bcm5700_intr_off(PUM_DEVICE_BLOCK pUmDevice)
-{
-	atomic_inc(&pUmDevice->intr_sem);
-	LM_DisableInterrupt(&pUmDevice->lm_dev);
-#if (LINUX_VERSION_CODE >= 0x2051c)
-	synchronize_irq(pUmDevice->dev->irq);
-#else
-	synchronize_irq();
-#endif
-	LM_DisableInterrupt(&pUmDevice->lm_dev);
-}
-
-void
-bcm5700_intr_on(PUM_DEVICE_BLOCK pUmDevice)
-{
-	if (atomic_dec_and_test(&pUmDevice->intr_sem)) {
-		LM_EnableInterrupt(&pUmDevice->lm_dev);
-	}
-}
-
-/*
- * Broadcom NIC Extension support
- * -ffan
- */
-#ifdef NICE_SUPPORT
-#include "nicext.h"
-
-typedef struct {
-	ushort  tag;
-	ushort  signature;
-} vlan_tag_t;
-
-#endif /* NICE_SUPPORT */
-
-int MM_Packet_Desc_Size = sizeof(UM_PACKET);
-
-#if defined(MODULE)
-MODULE_AUTHOR("Michael Chan <mchan@broadcom.com>");
-MODULE_DESCRIPTION("BCM5700 Driver");
-MODULE_LICENSE("GPL");
-MODULE_PARM(debug, "i");
-MODULE_PARM(line_speed, "1-" __MODULE_STRING(MAX_UNITS) "i");
-MODULE_PARM(auto_speed, "1-" __MODULE_STRING(MAX_UNITS) "i");
-MODULE_PARM(full_duplex, "1-" __MODULE_STRING(MAX_UNITS) "i");
-MODULE_PARM(rx_flow_control, "1-" __MODULE_STRING(MAX_UNITS) "i");
-MODULE_PARM(tx_flow_control, "1-" __MODULE_STRING(MAX_UNITS) "i");
-MODULE_PARM(auto_flow_control, "1-" __MODULE_STRING(MAX_UNITS) "i");
-#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
-MODULE_PARM(mtu, "1-" __MODULE_STRING(MAX_UNITS) "i");
-#endif
-MODULE_PARM(tx_checksum, "1-" __MODULE_STRING(MAX_UNITS) "i");
-MODULE_PARM(rx_checksum, "1-" __MODULE_STRING(MAX_UNITS) "i");
-MODULE_PARM(scatter_gather, "1-" __MODULE_STRING(MAX_UNITS) "i");
-MODULE_PARM(tx_pkt_desc_cnt, "1-" __MODULE_STRING(MAX_UNITS) "i");
-MODULE_PARM(rx_std_desc_cnt, "1-" __MODULE_STRING(MAX_UNITS) "i");
-#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
-MODULE_PARM(rx_jumbo_desc_cnt, "1-" __MODULE_STRING(MAX_UNITS) "i");
-#endif
-#ifdef BCM_INT_COAL
-MODULE_PARM(adaptive_coalesce, "1-" __MODULE_STRING(MAX_UNITS) "i");
-MODULE_PARM(rx_coalesce_ticks, "1-" __MODULE_STRING(MAX_UNITS) "i");
-MODULE_PARM(rx_max_coalesce_frames, "1-" __MODULE_STRING(MAX_UNITS) "i");
-MODULE_PARM(tx_coalesce_ticks, "1-" __MODULE_STRING(MAX_UNITS) "i");
-MODULE_PARM(tx_max_coalesce_frames, "1-" __MODULE_STRING(MAX_UNITS) "i");
-MODULE_PARM(stats_coalesce_ticks, "1-" __MODULE_STRING(MAX_UNITS) "i");
-#endif
-#ifdef BCM_WOL
-MODULE_PARM(enable_wol, "1-" __MODULE_STRING(MAX_UNITS) "i");
-#endif
-#ifdef BCM_TSO
-MODULE_PARM(enable_tso, "1-" __MODULE_STRING(MAX_UNITS) "i");
-#endif
-#ifdef BCM_NIC_SEND_BD
-MODULE_PARM(nic_tx_bd, "1-" __MODULE_STRING(MAX_UNITS) "i");
-#endif
-#ifdef BCM_ASF
-MODULE_PARM(vlan_tag_mode, "1-" __MODULE_STRING(MAX_UNITS) "i");
-#endif
-#endif
-
-#define RUN_AT(x) (jiffies + (x))
-
-char kernel_version[] = UTS_RELEASE;
-
-#define PCI_SUPPORT_VER2
-
-#if ! defined(CAP_NET_ADMIN)
-#define capable(CAP_XXX) (suser())
-#endif
-
-#define tigon3_debug debug
-#if TIGON3_DEBUG
-static int tigon3_debug = TIGON3_DEBUG;
-#else
-static int tigon3_debug = 0;
-#endif
-
-
-STATIC int bcm5700_open(struct net_device *dev);
-STATIC void bcm5700_timer(unsigned long data);
-STATIC void bcm5700_reset(struct net_device *dev);
-STATIC int bcm5700_start_xmit(struct sk_buff *skb, struct net_device *dev);
-STATIC irqreturn_t bcm5700_interrupt(int irq, void *dev_instance, struct pt_regs *regs);
-#ifdef BCM_TASKLET
-STATIC void bcm5700_tasklet(unsigned long data);
-#endif
-STATIC int bcm5700_close(struct net_device *dev);
-STATIC struct net_device_stats *bcm5700_get_stats(struct net_device *dev);
-STATIC int bcm5700_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
-STATIC void bcm5700_set_rx_mode(struct net_device *dev);
-STATIC int bcm5700_set_mac_addr(struct net_device *dev, void *p);
-#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
-STATIC int bcm5700_change_mtu(struct net_device *dev, int new_mtu);
-#endif
-#ifdef BCM_NAPI_RXPOLL
-STATIC int bcm5700_poll(struct net_device *dev, int *budget);
-#endif
-STATIC int replenish_rx_buffers(PUM_DEVICE_BLOCK pUmDevice, int max);
-STATIC int bcm5700_freemem(struct net_device *dev);
-#ifdef NICE_SUPPORT
-STATIC int bcm5700_freemem2(UM_DEVICE_BLOCK *pUmDevice, int index);
-#endif
-#ifdef BCM_INT_COAL
-#ifndef BCM_NAPI_RXPOLL
-STATIC int bcm5700_adapt_coalesce(PUM_DEVICE_BLOCK pUmDevice);
-#endif
-#endif
-STATIC void bcm5700_set_vlan_mode(UM_DEVICE_BLOCK *pUmDevice);
-STATIC int bcm5700_init_counters(PUM_DEVICE_BLOCK pUmDevice);
-#ifdef BCM_VLAN
-STATIC void bcm5700_vlan_rx_register(struct net_device *dev, struct vlan_group *vlgrp);
-STATIC void bcm5700_vlan_rx_kill_vid(struct net_device *dev, uint16_t vid);
-#endif
-void bcm5700_shutdown(UM_DEVICE_BLOCK *pUmDevice);
-void bcm5700_free_remaining_rx_bufs(UM_DEVICE_BLOCK *pUmDevice);
-void bcm5700_validate_param_range(UM_DEVICE_BLOCK *pUmDevice, int *param,
-	char *param_name, int min, int max, int deflt);
-
-#ifdef HAVE_POLL_CONTROLLER
-STATIC void poll_bcm5700(struct net_device *dev);
-#endif
-
-/* A list of all installed bcm5700 devices. */
-static struct net_device *root_tigon3_dev = NULL;
-
-#if defined(CONFIG_SPARC64) || defined(CONFIG_X86_64) ||defined(CONFIG_PPC64)
-
-#ifdef NICE_SUPPORT
-#if (LINUX_VERSION_CODE < 0x20500)
-extern int register_ioctl32_conversion(unsigned int cmd,
-	int (*handler)(unsigned int, unsigned int, unsigned long,
-	struct file *));
-int unregister_ioctl32_conversion(unsigned int cmd);
-#else
-#include <linux/ioctl32.h>
-#endif
-
-#define BCM_IOCTL32 1
-
-atomic_t bcm5700_load_count = ATOMIC_INIT(0);
-
-static int
-bcm5700_ioctl32(unsigned int fd, unsigned int cmd, unsigned long arg,
-	struct file *filep)
-{
-	struct ifreq rq;
-	struct net_device *tmp_dev = root_tigon3_dev;
-	int ret;
-	struct nice_req* nrq;
-	struct ifreq_nice32 {
-		char ifnr_name[16];
-		__u32 cmd;
-		__u32 nrq1;
-		__u32 nrq2;
-		__u32 nrq3;
-	} nrq32;
-
-	if (!capable(CAP_NET_ADMIN))
-		return -EPERM;
-
-	if (copy_from_user(&nrq32, (char *) arg, 32))
-		return -EFAULT;
-
-	memcpy(rq.ifr_name, nrq32.ifnr_name, 16);
-
-	nrq = (struct nice_req*) &rq.ifr_ifru;
-	nrq->cmd = nrq32.cmd;
-	if (nrq->cmd == NICE_CMD_GET_STATS_BLOCK) {
-		nrq->nrq_stats_useraddr = (void *) ((__u64) nrq32.nrq1);
-		nrq->nrq_stats_size = nrq32.nrq2;
-	}
-	else {
-		memcpy(&nrq->nrq_speed, &nrq32.nrq1, 12);
-	}
-	while (tmp_dev) {
-		if (strcmp(rq.ifr_name, tmp_dev->name) == 0) {
-			ret = bcm5700_ioctl(tmp_dev, &rq, cmd);
-			if (ret == 0) {
-				if (nrq->cmd == NICE_CMD_GET_STATS_BLOCK)
-					return ret;
-
-				memcpy(&nrq32.nrq1, &nrq->nrq_speed, 12);
-				if (copy_to_user((char *) arg, &nrq32, 32))
-					return -EFAULT;
-			}
-			return ret;
-		}
-		tmp_dev = ((UM_DEVICE_BLOCK *)(tmp_dev->priv))->next_module;
-	}
-	return -ENODEV;
-}
-#endif /* NICE_SUPPORT */
-#endif
-
-typedef enum {
-	BCM5700A6 = 0,
-	BCM5700T6,
-	BCM5700A9,
-	BCM5700T9,
-	BCM5700,
-	BCM5701A5,
-	BCM5701T1,
-	BCM5701T8,
-	BCM5701A7,
-	BCM5701A10,
-	BCM5701A12,
-	BCM5701,
-	BCM5702,
-	BCM5703,
-	BCM5703A31,
-	BCM5703ARBUCKLE,
-	TC996T,
-	TC996ST,
-	TC996SSX,
-	TC996SX,
-	TC996BT,
-	TC997T,
-	TC997SX,
-	TC1000T,
-	TC1000BT,
-	TC940BR01,
-	TC942BR01,
-	TC998T,
-	TC998SX,
-	TC999T,
-	NC6770,
-	NC1020,
-	NC7760,
-	NC7761,
-	NC7770,
-	NC7771,
-	NC7780,
-	NC7781,
-	NC7772,
-	NC7782,
-	NC7783,
-	BCM5704CIOBE,
-	BCM5704,
-	BCM5704S,
-	BCM5705,
-	BCM5705M,
-	BCM5705F,
-	BCM5901,
-	BCM5782,
-	BCM5788
-} board_t;
-
-
-/* indexed by board_t, above */
-static struct {
-	char *name;
-} board_info[] __devinitdata = {
-	{ "Broadcom BCM5700 1000Base-T" },
-	{ "Broadcom BCM5700 1000Base-SX" },
-	{ "Broadcom BCM5700 1000Base-SX" },
-	{ "Broadcom BCM5700 1000Base-T" },
-	{ "Broadcom BCM5700" },
-	{ "Broadcom BCM5701 1000Base-T" },
-	{ "Broadcom BCM5701 1000Base-T" },
-	{ "Broadcom BCM5701 1000Base-T" },
-	{ "Broadcom BCM5701 1000Base-SX" },
-	{ "Broadcom BCM5701 1000Base-T" },
-	{ "Broadcom BCM5701 1000Base-T" },
-	{ "Broadcom BCM5701" },
-	{ "Broadcom BCM5702 1000Base-T" },
-	{ "Broadcom BCM5703 1000Base-T" },
-	{ "Broadcom BCM5703 1000Base-SX" },
-	{ "Broadcom B5703 1000Base-SX" },
-	{ "3Com 3C996 10/100/1000 Server NIC" },
-	{ "3Com 3C996 10/100/1000 Server NIC" },
-	{ "3Com 3C996 Gigabit Fiber-SX Server NIC" },
-	{ "3Com 3C996 Gigabit Fiber-SX Server NIC" },
-	{ "3Com 3C996B Gigabit Server NIC" },
-	{ "3Com 3C997 Gigabit Server NIC" },
-	{ "3Com 3C997 Gigabit Fiber-SX Server NIC" },
-	{ "3Com 3C1000 Gigabit NIC" },
-	{ "3Com 3C1000B-T 10/100/1000 PCI" },
-	{ "3Com 3C940 Gigabit LOM (21X21)" },
-	{ "3Com 3C942 Gigabit LOM (31X31)" },
-	{ "3Com 3C998-T Dual Port 10/100/1000 PCI-X Server NIC" },
-	{ "3Com 3C998-SX Dual Port 1000-SX PCI-X Server NIC" },
-	{ "3Com 3C999-T Quad Port 10/100/1000 PCI-X Server NIC" },
-	{ "HP NC6770 Gigabit Server Adapter" },
-	{ "NC1020 HP ProLiant Gigabit Server Adapter 32 PCI" },
-	{ "HP NC7760 Gigabit Server Adapter" },
-	{ "HP NC7761 Gigabit Server Adapter" },
-	{ "HP NC7770 Gigabit Server Adapter" },
-	{ "HP NC7771 Gigabit Server Adapter" },
-	{ "HP NC7780 Gigabit Server Adapter" },
-	{ "HP NC7781 Gigabit Server Adapter" },
-	{ "HP NC7772 Gigabit Server Adapter" },
-	{ "HP NC7782 Gigabit Server Adapter" },
-	{ "HP NC7783 Gigabit Server Adapter" },
-	{ "Broadcom BCM5704 CIOB-E 1000Base-T" },
-	{ "Broadcom BCM5704 1000Base-T" },
-	{ "Broadcom BCM5704 1000Base-SX" },
-	{ "Broadcom BCM5705 1000Base-T" },
-	{ "Broadcom BCM5705M 1000Base-T" },
-	{ "Broadcom 570x 10/100 Integrated Controller" },
-	{ "Broadcom BCM5901 100Base-TX" },
-	{ "Broadcom NetXtreme Gigabit Ethernet for hp" },
-	{ "Broadcom BCM5788 1000Base-T" },
-	{ 0 },
-	};
-
-static struct pci_device_id bcm5700_pci_tbl[] __devinitdata = {
-	{0x14e4, 0x1644, 0x14e4, 0x1644, 0, 0, BCM5700A6 },
-	{0x14e4, 0x1644, 0x14e4, 0x2, 0, 0, BCM5700T6 },
-	{0x14e4, 0x1644, 0x14e4, 0x3, 0, 0, BCM5700A9 },
-	{0x14e4, 0x1644, 0x14e4, 0x4, 0, 0, BCM5700T9 },
-	{0x14e4, 0x1644, 0x1028, 0xd1, 0, 0, BCM5700 },
-	{0x14e4, 0x1644, 0x1028, 0x0106, 0, 0, BCM5700 },
-	{0x14e4, 0x1644, 0x1028, 0x0109, 0, 0, BCM5700 },
-	{0x14e4, 0x1644, 0x1028, 0x010a, 0, 0, BCM5700 },
-	{0x14e4, 0x1644, 0x10b7, 0x1000, 0, 0, TC996T },
-	{0x14e4, 0x1644, 0x10b7, 0x1001, 0, 0, TC996ST },
-	{0x14e4, 0x1644, 0x10b7, 0x1002, 0, 0, TC996SSX },
-	{0x14e4, 0x1644, 0x10b7, 0x1003, 0, 0, TC997T },
-	{0x14e4, 0x1644, 0x10b7, 0x1005, 0, 0, TC997SX },
-	{0x14e4, 0x1644, 0x10b7, 0x1008, 0, 0, TC942BR01 },
-	{0x14e4, 0x1644, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5700 },
-	{0x14e4, 0x1645, 0x14e4, 1, 0, 0, BCM5701A5 },
-	{0x14e4, 0x1645, 0x14e4, 5, 0, 0, BCM5701T1 },
-	{0x14e4, 0x1645, 0x14e4, 6, 0, 0, BCM5701T8 },
-	{0x14e4, 0x1645, 0x14e4, 7, 0, 0, BCM5701A7 },
-	{0x14e4, 0x1645, 0x14e4, 8, 0, 0, BCM5701A10 },
-	{0x14e4, 0x1645, 0x14e4, 0x8008, 0, 0, BCM5701A12 },
-	{0x14e4, 0x1645, 0x0e11, 0xc1, 0, 0, NC6770 },
-	{0x14e4, 0x1645, 0x0e11, 0x7c, 0, 0, NC7770 },
-	{0x14e4, 0x1645, 0x0e11, 0x85, 0, 0, NC7780 },
-	{0x14e4, 0x1645, 0x1028, 0x0121, 0, 0, BCM5701 },
-	{0x14e4, 0x1645, 0x10b7, 0x1004, 0, 0, TC996SX },
-	{0x14e4, 0x1645, 0x10b7, 0x1006, 0, 0, TC996BT },
-	{0x14e4, 0x1645, 0x10b7, 0x1007, 0, 0, TC1000T },
-	{0x14e4, 0x1645, 0x10b7, 0x1008, 0, 0, TC940BR01 },
-	{0x14e4, 0x1645, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5701 },
-	{0x14e4, 0x1646, 0x14e4, 0x8009, 0, 0, BCM5702 },
-	{0x14e4, 0x1646, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5702 },
-	{0x14e4, 0x16a6, 0x14e4, 0x8009, 0, 0, BCM5702 },
-	{0x14e4, 0x16a6, 0x14e4, 0x000c, 0, 0, BCM5702 },
-	{0x14e4, 0x16a6, 0x0e11, 0xbb, 0, 0, NC7760 },
-	{0x14e4, 0x16a6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5702 },
-	{0x14e4, 0x16c6, 0x10b7, 0x1100, 0, 0, TC1000BT },
-	{0x14e4, 0x16c6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5702 },
-	{0x14e4, 0x1647, 0x14e4, 0x0009, 0, 0, BCM5703 },
-	{0x14e4, 0x1647, 0x14e4, 0x000a, 0, 0, BCM5703A31 },
-	{0x14e4, 0x1647, 0x14e4, 0x000b, 0, 0, BCM5703 },
-	{0x14e4, 0x1647, 0x14e4, 0x800a, 0, 0, BCM5703 },
-	{0x14e4, 0x1647, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5703 },
-	{0x14e4, 0x16a7, 0x14e4, 0x0009, 0, 0, BCM5703 },
-	{0x14e4, 0x16a7, 0x14e4, 0x000a, 0, 0, BCM5703A31 },
-	{0x14e4, 0x16a7, 0x14e4, 0x000b, 0, 0, BCM5703 },
-	{0x14e4, 0x16a7, 0x14e4, 0x800a, 0, 0, BCM5703 },
-	{0x14e4, 0x16a7, 0x0e11, 0xca, 0, 0, NC7771 },
-	{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 },
-	{0x14e4, 0x1648, 0x0e11, 0xd1, 0, 0, NC7783 },
-	{0x14e4, 0x1648, 0x10b7, 0x2000, 0, 0, TC998T },
-	{0x14e4, 0x1648, 0x10b7, 0x3000, 0, 0, TC999T },
-	{0x14e4, 0x1648, 0x1166, 0x1648, 0, 0, BCM5704CIOBE },
-	{0x14e4, 0x1648, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5704 },
-	{0x14e4, 0x1649, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5704S },
-	{0x14e4, 0x16a8, 0x14e4, 0x16a8, 0, 0, BCM5704S },
-	{0x14e4, 0x16a8, 0x10b7, 0x2001, 0, 0, TC998SX },
-	{0x14e4, 0x16a8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5704S },
-	{0x14e4, 0x1653, 0x0e11, 0x00e3, 0, 0, NC7761 },
-	{0x14e4, 0x1653, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5705 },
-	{0x14e4, 0x1654, 0x0e11, 0x00e3, 0, 0, NC7761 },
-	{0x14e4, 0x1654, 0x103c, 0x3100, 0, 0, NC1020 },
-	{0x14e4, 0x1654, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5705 },
-	{0x14e4, 0x165d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5705M },
-	{0x14e4, 0x165e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5705M },
-	{0x14e4, 0x166e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5705F },
-	{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,}
-};
-
-MODULE_DEVICE_TABLE(pci, bcm5700_pci_tbl);
-
-#ifdef BCM_PROC_FS
-extern int bcm5700_proc_create(void);
-extern int bcm5700_proc_create_dev(struct net_device *dev);
-extern int bcm5700_proc_remove_dev(struct net_device *dev);
-#endif
-
-static int __devinit bcm5700_init_board(struct pci_dev *pdev,
-					struct net_device **dev_out,
-					int board_idx)
-{
-	struct net_device *dev;
-	PUM_DEVICE_BLOCK pUmDevice;
-	PLM_DEVICE_BLOCK pDevice;
-	int rc;
-
-	*dev_out = NULL;
-
-	/* dev zeroed in init_etherdev */
-#if (LINUX_VERSION_CODE >= 0x20600)
-	dev = alloc_etherdev(sizeof(*pUmDevice));
-#else
-	dev = init_etherdev(NULL, sizeof(*pUmDevice));
-#endif
-	if (dev == NULL) {
-		printk (KERN_ERR "%s: unable to alloc new ethernet\n",
-			bcm5700_driver);
-		return -ENOMEM;
-	}
-	SET_MODULE_OWNER(dev);
-#if (LINUX_VERSION_CODE >= 0x20600)
-	SET_NETDEV_DEV(dev, &pdev->dev);
-#endif
-	pUmDevice = (PUM_DEVICE_BLOCK) dev->priv;
-
-	/* enable device (incl. PCI PM wakeup), and bus-mastering */
-	rc = pci_enable_device (pdev);
-	if (rc)
-		goto err_out;
-
-	rc = pci_request_regions(pdev, bcm5700_driver);
-	if (rc)
-		goto err_out;
-
-	pci_set_master(pdev);
-
-	if (pci_set_dma_mask(pdev, BCM_64BIT_DMA_MASK) == 0) {
-		pUmDevice->using_dac = 1;
-		pci_set_consistent_dma_mask(pdev, BCM_64BIT_DMA_MASK);
-	}
-	else if (pci_set_dma_mask(pdev, BCM_32BIT_DMA_MASK) == 0) {
-		pUmDevice->using_dac = 0;
-	}
-	else {
-		printk(KERN_ERR "System does not support DMA\n");
-		pci_release_regions(pdev);
-		goto err_out;
-	}
-
-	pUmDevice->dev = dev;
-	pUmDevice->pdev = pdev;
-	pUmDevice->mem_list_num = 0;
-	pUmDevice->next_module = root_tigon3_dev;
-	pUmDevice->index = board_idx;
-	root_tigon3_dev = dev;
-
-	spin_lock_init(&pUmDevice->global_lock);
-
-	spin_lock_init(&pUmDevice->undi_lock);
-
-	spin_lock_init(&pUmDevice->phy_lock);
-
-	pDevice = (PLM_DEVICE_BLOCK) pUmDevice;
-	pDevice->FunctNum = PCI_FUNC(pUmDevice->pdev->devfn);
-
-#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
-	bcm5700_validate_param_range(pUmDevice, &mtu[board_idx], "mtu", 1500, 9000, 1500);
-	dev->mtu = mtu[board_idx];
-#endif
-
-	if (pci_find_device(0x8086, 0x2418, NULL) ||
-		pci_find_device(0x8086, 0x2428, NULL) ||
-		pci_find_device(0x8086, 0x244e, NULL) ||
-		pci_find_device(0x8086, 0x2448, NULL)) {
-
-		/* Found ICH, ICH0, or ICH2 */
-		pDevice->UndiFix = 1;
-	}
-
-	if (LM_GetAdapterInfo(pDevice) != LM_STATUS_SUCCESS) {
-		printk(KERN_ERR "Get Adapter info failed\n");
-		rc = -ENODEV;
-		goto err_out_unmap;
-	}
-
-	if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705) {
-		if (dev->mtu > 1500) {
-			dev->mtu = 1500;
-			printk(KERN_WARNING "%s-%d: Jumbo mtu sizes not supported, using mtu=1500\n", bcm5700_driver, pUmDevice->index);
-		}
-	}
-
-	if (pci_find_device(0x1022, 0x700c, NULL)) {
-		/* AMD762 writes I/O out of order */
-		/* Setting bit 1 in 762's register 0x4C still doesn't work */
-		/* in all cases */
-		pDevice->FlushPostedWrites = TRUE;
-		pDevice->NicSendBd = FALSE;
-	}
-	pUmDevice->do_global_lock = 0;
-	if (T3_ASIC_REV(pUmDevice->lm_dev.ChipRevId) == T3_ASIC_REV_5700) {
-		/* The 5700 chip works best without interleaved register */
-		/* accesses on certain machines. */
-		pUmDevice->do_global_lock = 1;
-	}
-	if ((T3_ASIC_REV(pUmDevice->lm_dev.ChipRevId) == T3_ASIC_REV_5701) &&
-		((pDevice->PciState & T3_PCI_STATE_NOT_PCI_X_BUS) == 0)) {
-
-		pUmDevice->rx_buf_align = 0;
-	}
-	else {
-		pUmDevice->rx_buf_align = 2;
-	}
-/*	dev->base_addr = pci_resource_start(pdev, 0);*/
-	dev->mem_start = pci_resource_start(pdev, 0);
-	dev->mem_end = dev->mem_start + sizeof(T3_STD_MEM_MAP); 
-	dev->irq = pdev->irq;
-
-	*dev_out = dev;
-	return 0;
-
-err_out_unmap:
-	pci_release_regions(pdev);
-	bcm5700_freemem(dev);
-
-err_out:
-#if (LINUX_VERSION_CODE < 0x020600)
-	unregister_netdev(dev);
-	kfree(dev);
-#else
-	free_netdev(dev);
-#endif
-	return rc;
-}
-
-static int __devinit
-bcm5700_print_ver(void)
-{
-	printk(KERN_INFO "Broadcom Gigabit Ethernet Driver %s ",
-		bcm5700_driver);
-#ifdef NICE_SUPPORT
-	printk("with Broadcom NIC Extension (NICE) ");
-#endif
-	printk("ver. %s %s\n", bcm5700_version, bcm5700_date);
-	return 0;
-}
-
-static int __devinit
-bcm5700_init_one(struct pci_dev *pdev,
-				       const struct pci_device_id *ent)
-{
-	struct net_device *dev = NULL;
-	PUM_DEVICE_BLOCK pUmDevice;
-	PLM_DEVICE_BLOCK pDevice;
-	int i;
-	static int board_idx = -1;
-	static int printed_version = 0;
-	struct pci_dev *amd_dev;
-
-	board_idx++;
-
-	if (!printed_version) {
-		bcm5700_print_ver();
-#ifdef BCM_PROC_FS
-		bcm5700_proc_create();
-#endif
-		printed_version = 1;
-	}
-
-	i = bcm5700_init_board(pdev, &dev, board_idx);
-	if (i < 0) {
-		return i;
-	}
-
-	if (dev == NULL)
-		return -ENOMEM;
-
-#ifdef BCM_IOCTL32
-	if (atomic_read(&bcm5700_load_count) == 0) {
-		register_ioctl32_conversion(SIOCNICE, bcm5700_ioctl32);
-	}
-	atomic_inc(&bcm5700_load_count);
-#endif
-	dev->open = bcm5700_open;
-	dev->hard_start_xmit = bcm5700_start_xmit;
-	dev->stop = bcm5700_close;
-	dev->get_stats = bcm5700_get_stats;
-	dev->set_multicast_list = bcm5700_set_rx_mode;
-	dev->do_ioctl = bcm5700_ioctl;
-	dev->set_mac_address = &bcm5700_set_mac_addr;
-#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
-	dev->change_mtu = &bcm5700_change_mtu;
-#endif
-#if (LINUX_VERSION_CODE >= 0x20400)
-	dev->tx_timeout = bcm5700_reset;
-	dev->watchdog_timeo = TX_TIMEOUT;
-#endif
-#ifdef BCM_VLAN
-	dev->vlan_rx_register = &bcm5700_vlan_rx_register;
-	dev->vlan_rx_kill_vid = &bcm5700_vlan_rx_kill_vid;
-#endif
-#ifdef BCM_NAPI_RXPOLL
-	dev->poll = bcm5700_poll;
-	dev->weight = 64;
-#endif
-
-	pUmDevice = (PUM_DEVICE_BLOCK) dev->priv;
-	pDevice = (PLM_DEVICE_BLOCK) pUmDevice;
-
-	dev->base_addr = pci_resource_start(pdev, 0);
-	dev->irq = pdev->irq;
-#ifdef HAVE_POLL_CONTROLLER
-	dev->poll_controller = poll_bcm5700;
-#endif
-
-#if (LINUX_VERSION_CODE >= 0x20600)
-	if ((i = register_netdev(dev))) {
-		printk(KERN_ERR "%s: Cannot register net device\n",
-			bcm5700_driver);
-		if (pUmDevice->lm_dev.pMappedMemBase)
-			iounmap(pUmDevice->lm_dev.pMappedMemBase);
-		pci_release_regions(pdev);
-		bcm5700_freemem(dev);
-		free_netdev(dev);
-		return i;
-	}
-#endif
-
-	pci_set_drvdata(pdev, dev);
-
-	memcpy(dev->dev_addr, pDevice->NodeAddress, 6);
-	pUmDevice->name = board_info[ent->driver_data].name,
-	printk(KERN_INFO "%s: %s found at mem %lx, IRQ %d, ",
-		dev->name, pUmDevice->name, dev->base_addr,
-		dev->irq);
-	printk("node addr ");
-	for (i = 0; i < 6; i++) {
-		printk("%2.2x", dev->dev_addr[i]);
-	}
-	printk("\n");
-
-	printk(KERN_INFO "%s: ", dev->name);
-	if ((pDevice->PhyId & PHY_ID_MASK) == PHY_BCM5400_PHY_ID)
-		printk("Broadcom BCM5400 Copper ");
-	else if ((pDevice->PhyId & PHY_ID_MASK) == PHY_BCM5401_PHY_ID)
-		printk("Broadcom BCM5401 Copper ");
-	else if ((pDevice->PhyId & PHY_ID_MASK) == PHY_BCM5411_PHY_ID)
-		printk("Broadcom BCM5411 Copper ");
-	else if (((pDevice->PhyId & PHY_ID_MASK) == PHY_BCM5701_PHY_ID) &&
-		!pDevice->EnableTbi) {
-		printk("Broadcom BCM5701 Integrated Copper ");
-	}
-	else if ((pDevice->PhyId & PHY_ID_MASK) == PHY_BCM5703_PHY_ID) {
-		printk("Broadcom BCM5703 Integrated ");
-		if (pDevice->EnableTbi)
-			printk("SerDes ");
-		else
-			printk("Copper ");
-	}
-	else if ((pDevice->PhyId & PHY_ID_MASK) == PHY_BCM5704_PHY_ID) {
-		printk("Broadcom BCM5704 Integrated ");
-		if (pDevice->EnableTbi)
-			printk("SerDes ");
-		else
-			printk("Copper ");
-	}
-	else if ((pDevice->PhyId & PHY_ID_MASK) == PHY_BCM5705_PHY_ID)
-		printk("Broadcom BCM5705 Integrated Copper ");
-	else if ((pDevice->PhyId & PHY_ID_MASK) == PHY_BCM8002_PHY_ID)
-		printk("Broadcom BCM8002 SerDes ");
-	else if (pDevice->EnableTbi) {
-		if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5703) {
-			printk("Broadcom BCM5703 Integrated SerDes ");
-		}
-		else if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5704) {
-			printk("Broadcom BCM5704 Integrated SerDes ");
-		}
-		else {
-			printk("Agilent HDMP-1636 SerDes ");
-		}
-	}
-	else {
-		printk("Unknown ");
-	}
-	printk("transceiver found\n");
-
-	printk(KERN_INFO "%s: ", dev->name);
-#if (LINUX_VERSION_CODE >= 0x20400)
-	if (scatter_gather[board_idx]) {
-		dev->features |= NETIF_F_SG;
-		if (pUmDevice->using_dac && !pDevice->Bcm5788)
-			dev->features |= NETIF_F_HIGHDMA;
-	}
-	if ((pDevice->TaskOffloadCap & LM_TASK_OFFLOAD_TX_TCP_CHECKSUM) &&
-		tx_checksum[board_idx]) {
-		dev->features |= NETIF_F_IP_CSUM;
-	}
-#ifdef BCM_VLAN
-	dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
-#endif
-#ifdef BCM_TSO
-	if ((pDevice->TaskToOffload & LM_TASK_OFFLOAD_TCP_SEGMENTATION) &&
-		enable_tso[board_idx]) {
-		dev->features |= NETIF_F_TSO;
-	}
-#endif
-
-	printk("Scatter-gather %s, 64-bit DMA %s, Tx Checksum %s, ",
-		(char *) ((dev->features & NETIF_F_SG) ? "ON" : "OFF"),
-		(char *) ((dev->features & NETIF_F_HIGHDMA) ? "ON" : "OFF"),
-		(char *) ((dev->features & NETIF_F_IP_CSUM) ? "ON" : "OFF"));
-#endif
-	if ((pDevice->ChipRevId != T3_CHIP_ID_5700_B0) &&
-		rx_checksum[board_idx])
-		printk("Rx Checksum ON");
-	else
-		printk("Rx Checksum OFF");
-#ifdef BCM_VLAN
-	printk(", 802.1Q VLAN ON");
-#endif
-#ifdef BCM_TSO
-	if (dev->features & NETIF_F_TSO) {
-		printk(", TSO ON");
-	}
-	else
-#endif
-#ifdef BCM_NAPI_RXPOLL
-	printk(", NAPI ON");
-#endif
-	printk("\n");
-
-#ifdef BCM_PROC_FS
-	bcm5700_proc_create_dev(dev);
-#endif
-#ifdef BCM_TASKLET
-	tasklet_init(&pUmDevice->tasklet, bcm5700_tasklet,
-		(unsigned long) pUmDevice);
-#endif
-	if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5704) {
-		if ((REG_RD(pDevice, PciCfg.DualMacCtrl) &
-			T3_DUAL_MAC_CH_CTRL_MASK) == 3) {
-
-			printk(KERN_WARNING "%s: Device is configured for Hardware Based Teaming which is not supported with this operating system. Please consult the user diagnostic guide to disable Turbo Teaming.\n", dev->name);
-		}
-	}
-
-	if ((amd_dev = pci_find_device(0x1022, 0x700c, NULL))) {
-		u32 val;
-
-		/* Found AMD 762 North bridge */
-		pci_read_config_dword(amd_dev, 0x4c, &val);
-		if ((val & 0x02) == 0) {
-			pci_write_config_dword(amd_dev, 0x4c, val | 0x02);
-			printk(KERN_INFO "%s: Setting AMD762 Northbridge to enable PCI ordering compliance\n", bcm5700_driver);
-		}
-	}
-	return 0;
-
-}
-
-
-static void __devexit
-bcm5700_remove_one (struct pci_dev *pdev)
-{
-	struct net_device *dev = pci_get_drvdata (pdev);
-	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK)dev->priv;
-
-#ifdef BCM_PROC_FS
-	bcm5700_proc_remove_dev(dev); 
-#endif
-#ifdef BCM_IOCTL32
-	atomic_dec(&bcm5700_load_count);
-	if (atomic_read(&bcm5700_load_count) == 0)
-		unregister_ioctl32_conversion(SIOCNICE);
-#endif
-	unregister_netdev(dev);
-
-	if (pUmDevice->lm_dev.pMappedMemBase)
-		iounmap(pUmDevice->lm_dev.pMappedMemBase);
-
-	pci_release_regions(pdev);
-
-#if (LINUX_VERSION_CODE < 0x020600)
-	kfree(dev);
-#else
-	free_netdev(dev);
-#endif
-
-	pci_set_drvdata(pdev, NULL);
-
-/*	pci_power_off(pdev, -1);*/
-
-}
-
-
-
-STATIC int
-bcm5700_open(struct net_device *dev)
-{
-	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK)dev->priv;
-	PLM_DEVICE_BLOCK pDevice = (PLM_DEVICE_BLOCK) pUmDevice;
-
-	if (pUmDevice->suspended)
-		return -EAGAIN;
-
-	/* delay for 6 seconds */
-	pUmDevice->delayed_link_ind = (6 * HZ) / pUmDevice->timer_interval;
-
-#ifdef BCM_INT_COAL
-#ifndef BCM_NAPI_RXPOLL
-	pUmDevice->adaptive_expiry = HZ / pUmDevice->timer_interval;
-#endif
-#endif
-
-#if INCLUDE_TBI_SUPPORT
-	if (pDevice->EnableTbi && pDevice->PollTbiLink) {
-		pUmDevice->poll_tbi_interval = HZ / pUmDevice->timer_interval;
-		if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5703) {
-			pUmDevice->poll_tbi_interval /= 4;
-		}
-		pUmDevice->poll_tbi_expiry = pUmDevice->poll_tbi_interval;
-	}
-#endif
-
-	pUmDevice->asf_heartbeat = (120 * HZ) / pUmDevice->timer_interval;
-
-	/* Sometimes we get spurious ints. after reset when link is down. */
-	/* This field tells the isr to service the int. even if there is */
-	/* no status block update. */
-	if (pDevice->LedMode != LED_MODE_LINK10) {
-		pUmDevice->adapter_just_inited = (3 * HZ) /
-			pUmDevice->timer_interval;
-	}
-	else {
-		pUmDevice->adapter_just_inited = 0;
-	}
-
-	if (request_irq(dev->irq, &bcm5700_interrupt, SA_SHIRQ, dev->name, dev)) {
-		return -EAGAIN;
-	}
-
-	pUmDevice->opened = 1;
-	if (LM_InitializeAdapter(pDevice) != LM_STATUS_SUCCESS) {
-		pUmDevice->opened = 0;
-		free_irq(dev->irq, dev);
-		bcm5700_freemem(dev);
-		return -EAGAIN;
-	}
-
-	bcm5700_set_vlan_mode(pUmDevice);
-	bcm5700_init_counters(pUmDevice);
-
-	if (pDevice->UndiFix) {
-		printk(KERN_INFO "%s: Using indirect register access\n", dev->name);
-	}
-
-	if (memcmp(dev->dev_addr, pDevice->NodeAddress, 6)) {
-		LM_SetMacAddress(pDevice, dev->dev_addr);
-	}
-
-	if (tigon3_debug > 1)
-		printk(KERN_DEBUG "%s: tigon3_open() irq %d.\n", dev->name, dev->irq);
-
-	QQ_InitQueue(&pUmDevice->rx_out_of_buf_q.Container,
-        MAX_RX_PACKET_DESC_COUNT);
-	netif_start_queue(dev);
-
-#if (LINUX_VERSION_CODE < 0x020300)
-	MOD_INC_USE_COUNT;
-#endif
-
-	init_timer(&pUmDevice->timer);
-	pUmDevice->timer.expires = RUN_AT(pUmDevice->timer_interval);
-	pUmDevice->timer.data = (unsigned long)dev;
-	pUmDevice->timer.function = &bcm5700_timer;
-	add_timer(&pUmDevice->timer);
-
-	atomic_set(&pUmDevice->intr_sem, 0);
-	LM_EnableInterrupt(pDevice);
-
-	return 0;
-}
-
-
-STATIC void
-bcm5700_timer(unsigned long data)
-{
-	struct net_device *dev = (struct net_device *)data;
-	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK)dev->priv;
-	PLM_DEVICE_BLOCK pDevice = (PLM_DEVICE_BLOCK) pUmDevice;
-	unsigned long flags = 0;
-	LM_UINT32 value32;
-
-	if (!pUmDevice->opened)
-		return;
-
-	if (atomic_read(&pUmDevice->intr_sem) || pUmDevice->suspended) {
-		pUmDevice->timer.expires = RUN_AT(pUmDevice->timer_interval);
-		add_timer(&pUmDevice->timer);
-		return;
-	}
-
-	if ((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705) &&
-		(pDevice->LinkStatus == LM_STATUS_LINK_ACTIVE)) {
-
-		LM_GetStats(pDevice);
-	}
-
-#if INCLUDE_TBI_SUPPORT
-	if(pDevice->PollTbiLink && (--pUmDevice->poll_tbi_expiry <= 0)) {
-		BCM5700_PHY_LOCK(pUmDevice, flags);
-		value32 = REG_RD(pDevice, MacCtrl.Status);
-		if (((pDevice->LinkStatus == LM_STATUS_LINK_ACTIVE) &&
-			((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))))
-		{
-			LM_SetupPhy(pDevice);
-		}
-		BCM5700_PHY_UNLOCK(pUmDevice, flags);
-		pUmDevice->poll_tbi_expiry = pUmDevice->poll_tbi_interval;
-		
-        }
-#endif
-
-	if (pUmDevice->delayed_link_ind > 0) {
-		if (pUmDevice->delayed_link_ind == 1)
-			MM_IndicateStatus(pDevice, pDevice->LinkStatus);
-		else
-			pUmDevice->delayed_link_ind--;
-	}
-	if (pUmDevice->adapter_just_inited > 0) {
-		pUmDevice->adapter_just_inited--;
-	}
-
-	if (pUmDevice->crc_counter_expiry > 0)
-		pUmDevice->crc_counter_expiry--;
-
-	if (!pUmDevice->interrupt) {
-		if (!pDevice->UseTaggedStatus) {
-			BCM5700_LOCK(pUmDevice, flags);
-			if (pDevice->pStatusBlkVirt->Status & STATUS_BLOCK_UPDATED) {
-				/* This will generate an interrupt */
-				REG_WR(pDevice, Grc.LocalCtrl,
-					pDevice->GrcLocalCtrl |
-					GRC_MISC_LOCAL_CTRL_SET_INT);
-			}
-			else {
-				REG_WR(pDevice, HostCoalesce.Mode,
-					pDevice->CoalesceMode |
-					HOST_COALESCE_ENABLE |
-					HOST_COALESCE_NOW);
-			}
-			if (!(REG_RD(pDevice, DmaWrite.Mode) &
-				DMA_WRITE_MODE_ENABLE)) {
-				BCM5700_UNLOCK(pUmDevice, flags);
-				bcm5700_reset(dev);
-			}
-			else {
-				BCM5700_UNLOCK(pUmDevice, flags);
-			}
-			if (pUmDevice->tx_queued) {
-				pUmDevice->tx_queued = 0;
-				netif_wake_queue(dev);
-			}
-		}
-#if (LINUX_VERSION_CODE < 0x02032b)
-		if ((QQ_GetEntryCnt(&pDevice->TxPacketFreeQ.Container) !=
-			pDevice->TxPacketDescCnt) &&
-			((jiffies - dev->trans_start) > TX_TIMEOUT)) {
-
-			printk(KERN_WARNING "%s: Tx hung\n", dev->name);
-			bcm5700_reset(dev);
-		}
-#endif
-	}
-#ifdef BCM_INT_COAL
-#ifndef BCM_NAPI_RXPOLL
-	if (pUmDevice->adaptive_coalesce) {
-		pUmDevice->adaptive_expiry--;
-		if (pUmDevice->adaptive_expiry == 0) {	
-			pUmDevice->adaptive_expiry = HZ /
-				pUmDevice->timer_interval;
-			bcm5700_adapt_coalesce(pUmDevice);
-		}
-	}
-#endif
-#endif
-	if (QQ_GetEntryCnt(&pUmDevice->rx_out_of_buf_q.Container) >
-		(unsigned int) pUmDevice->rx_buf_repl_panic_thresh) {
-		/* Generate interrupt and let isr allocate buffers */
-		REG_WR(pDevice, HostCoalesce.Mode, pDevice->CoalesceMode |
-			HOST_COALESCE_ENABLE | HOST_COALESCE_NOW);
-	}
-
-#ifdef BCM_ASF
-	if (pDevice->EnableAsf) {
-		pUmDevice->asf_heartbeat--;
-		if (pUmDevice->asf_heartbeat == 0) {
-			MEM_WR_OFFSET(pDevice, T3_CMD_MAILBOX,
-				T3_CMD_NICDRV_ALIVE);
-			MEM_WR_OFFSET(pDevice, T3_CMD_LENGTH_MAILBOX, 4);
-			MEM_WR_OFFSET(pDevice, T3_CMD_DATA_MAILBOX, 3);
-			value32 = REG_RD(pDevice, Grc.RxCpuEvent);
-			REG_WR(pDevice, Grc.RxCpuEvent, value32 | BIT_14);
-			pUmDevice->asf_heartbeat = (120 * HZ) /
-				pUmDevice->timer_interval;
-		}
-	}
-#endif
-
-	pUmDevice->timer.expires = RUN_AT(pUmDevice->timer_interval);
-	add_timer(&pUmDevice->timer);
-}
-
-STATIC int
-bcm5700_init_counters(PUM_DEVICE_BLOCK pUmDevice)
-{
-	PLM_DEVICE_BLOCK pDevice = &pUmDevice->lm_dev;
-
-#ifdef BCM_INT_COAL
-#ifndef BCM_NAPI_RXPOLL
-	pUmDevice->rx_curr_coalesce_frames = pDevice->RxMaxCoalescedFrames;
-	pUmDevice->rx_curr_coalesce_ticks = pDevice->RxCoalescingTicks;
-	pUmDevice->tx_curr_coalesce_frames = pDevice->TxMaxCoalescedFrames;
-	pUmDevice->rx_last_cnt = 0;
-	pUmDevice->tx_last_cnt = 0;
-#endif
-#endif
-	pDevice->PhyCrcCount = 0;
-#if TIGON3_DEBUG
-	pUmDevice->tx_zc_count = 0;
-	pUmDevice->tx_chksum_count = 0;
-	pUmDevice->tx_himem_count = 0;
-	pUmDevice->rx_good_chksum_count = 0;
-	pUmDevice->rx_bad_chksum_count = 0;
-#endif
-#ifdef BCM_TSO
-	pUmDevice->tso_pkt_count = 0;
-#endif
-	return 0;
-}
-
-#ifdef BCM_INT_COAL
-#ifndef BCM_NAPI_RXPOLL
-STATIC int
-bcm5700_do_adapt_coalesce(PUM_DEVICE_BLOCK pUmDevice,
-	int rx_frames, int rx_ticks, int tx_frames, int rx_frames_intr)
-{
-	unsigned long flags = 0;
-	LM_DEVICE_BLOCK *pDevice = &pUmDevice->lm_dev;
-
-	if (pUmDevice->do_global_lock) {
-		if (spin_is_locked(&pUmDevice->global_lock))
-			return 0;
-		spin_lock_irqsave(&pUmDevice->global_lock, flags);
-	}
-	pUmDevice->rx_curr_coalesce_frames = rx_frames;
-	pUmDevice->rx_curr_coalesce_ticks = rx_ticks;
-	pUmDevice->tx_curr_coalesce_frames = tx_frames;
-	pUmDevice->rx_curr_coalesce_frames_intr = rx_frames_intr;
-	REG_WR(pDevice, HostCoalesce.RxMaxCoalescedFrames, rx_frames);
-
-	REG_WR(pDevice, HostCoalesce.RxCoalescingTicks, rx_ticks);
-
-	REG_WR(pDevice, HostCoalesce.TxMaxCoalescedFrames, tx_frames);
-
-	REG_WR(pDevice, HostCoalesce.RxMaxCoalescedFramesDuringInt,
-		rx_frames_intr);
-
-	BCM5700_UNLOCK(pUmDevice, flags);
-	return 0;
-}
-
-STATIC int
-bcm5700_adapt_coalesce(PUM_DEVICE_BLOCK pUmDevice)
-{
-	PLM_DEVICE_BLOCK pDevice = &pUmDevice->lm_dev;
-	uint rx_curr_cnt, tx_curr_cnt, rx_delta, tx_delta, total_delta;
-
-	rx_curr_cnt = pDevice->pStatsBlkVirt->ifHCInUcastPkts.Low;
-	tx_curr_cnt = pDevice->pStatsBlkVirt->ifHCOutUcastPkts.Low;
-	if ((rx_curr_cnt <= pUmDevice->rx_last_cnt) ||
-		(tx_curr_cnt < pUmDevice->tx_last_cnt)) {
-
-		/* skip if there is counter rollover */
-		pUmDevice->rx_last_cnt = rx_curr_cnt;
-		pUmDevice->tx_last_cnt = tx_curr_cnt;
-		return 0;
-	}
-
-	rx_delta = rx_curr_cnt - pUmDevice->rx_last_cnt;
-	tx_delta = tx_curr_cnt - pUmDevice->tx_last_cnt;
-	total_delta = (((rx_delta + rx_delta) + tx_delta) / 3) << 1;
-
-	pUmDevice->rx_last_cnt = rx_curr_cnt;
-	pUmDevice->tx_last_cnt = tx_curr_cnt;
-
-	if (total_delta < ADAPTIVE_LO_PKT_THRESH) {
-		if (pUmDevice->rx_curr_coalesce_frames !=
-			ADAPTIVE_LO_RX_MAX_COALESCED_FRAMES) {
-
-			bcm5700_do_adapt_coalesce(pUmDevice,
-				ADAPTIVE_LO_RX_MAX_COALESCED_FRAMES,
-				ADAPTIVE_LO_RX_COALESCING_TICKS,
-				ADAPTIVE_LO_TX_MAX_COALESCED_FRAMES,
-				ADAPTIVE_LO_RX_MAX_COALESCED_FRAMES_DURING_INT);
-		}
-	}
-	else if (total_delta < ADAPTIVE_HI_PKT_THRESH) {
-		if (pUmDevice->rx_curr_coalesce_frames !=
-			DEFAULT_RX_MAX_COALESCED_FRAMES) {
-
-			bcm5700_do_adapt_coalesce(pUmDevice,
-				DEFAULT_RX_MAX_COALESCED_FRAMES,
-				DEFAULT_RX_COALESCING_TICKS,
-				DEFAULT_TX_MAX_COALESCED_FRAMES,
-				DEFAULT_RX_MAX_COALESCED_FRAMES_DURING_INT);
-		}
-	}
-	else {
-		if (pUmDevice->rx_curr_coalesce_frames !=
-			ADAPTIVE_HI_RX_MAX_COALESCED_FRAMES) {
-
-			bcm5700_do_adapt_coalesce(pUmDevice,
-				ADAPTIVE_HI_RX_MAX_COALESCED_FRAMES,
-				ADAPTIVE_HI_RX_COALESCING_TICKS,
-				ADAPTIVE_HI_TX_MAX_COALESCED_FRAMES,
-				ADAPTIVE_HI_RX_MAX_COALESCED_FRAMES_DURING_INT);
-		}
-	}
-	return 0;
-}
-#endif
-#endif
-
-STATIC void
-bcm5700_reset(struct net_device *dev)
-{
-	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK)dev->priv;
-	PLM_DEVICE_BLOCK pDevice = (PLM_DEVICE_BLOCK) pUmDevice;
-	unsigned long flags;
-
-	netif_stop_queue(dev);
-	bcm5700_intr_off(pUmDevice);
-	BCM5700_PHY_LOCK(pUmDevice, flags);
-	LM_ResetAdapter(pDevice);	
-	bcm5700_set_vlan_mode(pUmDevice);
-	bcm5700_init_counters(pUmDevice);
-	if (memcmp(dev->dev_addr, pDevice->NodeAddress, 6)) {
-		LM_SetMacAddress(pDevice, dev->dev_addr);
-	}
-	BCM5700_PHY_UNLOCK(pUmDevice, flags);
-	atomic_set(&pUmDevice->intr_sem, 1);
-	bcm5700_intr_on(pUmDevice);
-	netif_wake_queue(dev);
-}
-
-STATIC void
-bcm5700_set_vlan_mode(UM_DEVICE_BLOCK *pUmDevice)
-{
-	LM_DEVICE_BLOCK *pDevice = &pUmDevice->lm_dev;
-	LM_UINT32 ReceiveMask = pDevice->ReceiveMask;
-	int vlan_tag_mode = pUmDevice->vlan_tag_mode;
-
-	if (vlan_tag_mode == VLAN_TAG_MODE_AUTO_STRIP) {
-		if (pDevice->EnableAsf) {
-			vlan_tag_mode = VLAN_TAG_MODE_FORCED_STRIP;
-		}
-		else {
-			vlan_tag_mode = VLAN_TAG_MODE_NORMAL_STRIP;
-		}
-	}
-	if (vlan_tag_mode == VLAN_TAG_MODE_NORMAL_STRIP) {
-		ReceiveMask |= LM_KEEP_VLAN_TAG;
-#ifdef BCM_VLAN
-		if (pUmDevice->vlgrp)
-			ReceiveMask &= ~LM_KEEP_VLAN_TAG;
-#endif
-#ifdef NICE_SUPPORT
-		if (pUmDevice->nice_rx)
-			ReceiveMask &= ~LM_KEEP_VLAN_TAG;
-#endif
-	}
-	else if (vlan_tag_mode == VLAN_TAG_MODE_FORCED_STRIP) {
-		ReceiveMask &= ~LM_KEEP_VLAN_TAG;
-	}
-	if (ReceiveMask != pDevice->ReceiveMask)
-		LM_SetReceiveMask(pDevice, ReceiveMask);
-}
-
-#ifdef BCM_VLAN
-STATIC void
-bcm5700_vlan_rx_register(struct net_device *dev, struct vlan_group *vlgrp)
-{
-	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK) dev->priv;
-
-	bcm5700_intr_off(pUmDevice);
-	pUmDevice->vlgrp = vlgrp;
-	bcm5700_set_vlan_mode(pUmDevice);
-	bcm5700_intr_on(pUmDevice);
-}
-
-STATIC void
-bcm5700_vlan_rx_kill_vid(struct net_device *dev, uint16_t vid)
-{
-	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK) dev->priv;
-
-	bcm5700_intr_off(pUmDevice);
-	if (pUmDevice->vlgrp) {
-		pUmDevice->vlgrp->vlan_devices[vid] = NULL;
-	}
-	bcm5700_intr_on(pUmDevice);
-}
-#endif
-
-STATIC int
-bcm5700_start_xmit(struct sk_buff *skb, struct net_device *dev)
-{
-	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK)dev->priv;
-	PLM_DEVICE_BLOCK pDevice = (PLM_DEVICE_BLOCK) pUmDevice;
-	PLM_PACKET pPacket;
-	PUM_PACKET pUmPacket;
-	unsigned long flags = 0;
-	int frag_no;
-#ifdef NICE_SUPPORT
-	vlan_tag_t *vlan_tag;
-#endif
-#ifdef BCM_TSO
-	LM_UINT32 mss;
-	uint16_t ip_tcp_len, tcp_opt_len, tcp_seg_flags;
-#endif
-
-	if ((pDevice->LinkStatus == LM_STATUS_LINK_DOWN) ||
-		!pDevice->InitDone || pUmDevice->suspended)
-	{
-		dev_kfree_skb(skb);
-		return 0;
-	}
-	
-#if (LINUX_VERSION_CODE < 0x02032b)
-	if (test_and_set_bit(0, &dev->tbusy)) {
-		return 1;
-	}
-#endif
-
-	if (pUmDevice->do_global_lock && pUmDevice->interrupt) {
-		netif_stop_queue(dev);
-		pUmDevice->tx_queued = 1;
-		if (!pUmDevice->interrupt) {
-			netif_wake_queue(dev);
-			pUmDevice->tx_queued = 0;
-		}
-		return 1;
-	}
-
-	pPacket = (PLM_PACKET)
-		QQ_PopHead(&pDevice->TxPacketFreeQ.Container);
-	if (pPacket == 0) {
-		netif_stop_queue(dev);
-		pUmDevice->tx_full = 1;
-		if (QQ_GetEntryCnt(&pDevice->TxPacketFreeQ.Container)) {
-			netif_wake_queue(dev);
-			pUmDevice->tx_full = 0;
-		}
-		return 1;
-	}
-	pUmPacket = (PUM_PACKET) pPacket;
-	pUmPacket->skbuff = skb;
-
-	if (skb->ip_summed == CHECKSUM_HW) {
-		pPacket->Flags = SND_BD_FLAG_TCP_UDP_CKSUM;
-#if TIGON3_DEBUG
-		pUmDevice->tx_chksum_count++;
-#endif
-	}
-	else {
-		pPacket->Flags = 0;
-	}
-#if MAX_SKB_FRAGS
-	frag_no = skb_shinfo(skb)->nr_frags;
-#else
-	frag_no = 0;
-#endif
-	if (atomic_read(&pDevice->SendBdLeft) < (frag_no + 1)) {
-		netif_stop_queue(dev);
-		pUmDevice->tx_full = 1;
-		QQ_PushHead(&pDevice->TxPacketFreeQ.Container, pPacket);
-		if (atomic_read(&pDevice->SendBdLeft) >= (frag_no + 1)) {
-			netif_wake_queue(dev);
-			pUmDevice->tx_full = 0;
-		}
-		return 1;
-	}
-
-	pPacket->u.Tx.FragCount = frag_no + 1;
-#if TIGON3_DEBUG
-	if (pPacket->u.Tx.FragCount > 1)
-		pUmDevice->tx_zc_count++;
-#endif
-
-#ifdef BCM_VLAN
-	if (pUmDevice->vlgrp && vlan_tx_tag_present(skb)) {
-		pPacket->VlanTag = vlan_tx_tag_get(skb);
-		pPacket->Flags |= SND_BD_FLAG_VLAN_TAG;
-	}
-#endif
-#ifdef NICE_SUPPORT
-	vlan_tag = (vlan_tag_t *) &skb->cb[0];
-	if (vlan_tag->signature == 0x5555) {
-		pPacket->VlanTag = vlan_tag->tag;
-		pPacket->Flags |= SND_BD_FLAG_VLAN_TAG;
-		vlan_tag->signature = 0;
-	}
-#endif
-
-#ifdef BCM_TSO
-	if ((mss = (LM_UINT32) skb_shinfo(skb)->tso_size) &&
-		(skb->len > pDevice->TxMtu)) {
-
-		pUmDevice->tso_pkt_count++;
-
-		pPacket->Flags |= SND_BD_FLAG_CPU_PRE_DMA |
-			SND_BD_FLAG_CPU_POST_DMA;
-
-		tcp_opt_len = 0;
-		if (skb->h.th->doff > 5) {
-			tcp_opt_len = (skb->h.th->doff - 5) << 2;
-		}
-		ip_tcp_len = (skb->nh.iph->ihl << 2) + sizeof(struct tcphdr);
-		skb->nh.iph->check = 0;
-		skb->h.th->check = ~csum_tcpudp_magic(skb->nh.iph->saddr,
-			skb->nh.iph->daddr, 0, IPPROTO_TCP, 0);
-
-		skb->nh.iph->tot_len = htons(mss + ip_tcp_len + tcp_opt_len);
-		tcp_seg_flags = 0;
-		if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705) {
-			if (tcp_opt_len || (skb->nh.iph->ihl > 5)) {
-				tcp_seg_flags =
-					((skb->nh.iph->ihl - 5) +
-					(tcp_opt_len >> 2)) << 11;
-			}
-		}
-		else {
-			if (tcp_opt_len || (skb->nh.iph->ihl > 5)) {
-				pPacket->Flags |=
-					((skb->nh.iph->ihl - 5) +
-					(tcp_opt_len >> 2)) << 12;
-			}
-		}
-		pPacket->u.Tx.MaxSegmentSize = mss | tcp_seg_flags;
-	}
-	else
-	{
-		pPacket->u.Tx.MaxSegmentSize = 0;
-	}
-#endif
-	BCM5700_LOCK(pUmDevice, flags);
-	LM_SendPacket(pDevice, pPacket);
-	BCM5700_UNLOCK(pUmDevice, flags);
-
-#if (LINUX_VERSION_CODE < 0x02032b)
-	netif_wake_queue(dev);
-#endif
-	dev->trans_start = jiffies;
-	return 0;
-}
-
-#ifdef BCM_NAPI_RXPOLL
-STATIC int
-bcm5700_poll(struct net_device *dev, int *budget)
-{
-	int orig_budget = *budget;
-	int work_done;
-	UM_DEVICE_BLOCK *pUmDevice = (UM_DEVICE_BLOCK *) dev->priv;
-	LM_DEVICE_BLOCK *pDevice = &pUmDevice->lm_dev;
-
-	if (orig_budget > dev->quota)
-		orig_budget = dev->quota;
-
-	work_done = LM_ServiceRxPoll(pDevice, orig_budget);
-	*budget -= work_done;
-	dev->quota -= work_done;
-
-	if (QQ_GetEntryCnt(&pUmDevice->rx_out_of_buf_q.Container)) {
-		replenish_rx_buffers(pUmDevice, 0);
-	}
-	if (work_done) {
-		MM_IndicateRxPackets(pDevice);
-		LM_QueueRxPackets(pDevice);
-	}
-	if ((work_done < orig_budget) || atomic_read(&pUmDevice->intr_sem) ||
-		pUmDevice->suspended) {
-
-		netif_rx_complete(dev);
-		REG_WR(pDevice, Grc.Mode, pDevice->GrcMode);
-		pDevice->RxPoll = FALSE;
-		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);
-		}
-		return 0;
-	}
-	return 1;
-}
-#endif /* BCM_NAPI_RXPOLL */
-
-STATIC irqreturn_t
-bcm5700_interrupt(int irq, void *dev_instance, struct pt_regs *regs)
-{
-	struct net_device *dev = (struct net_device *)dev_instance;
-	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK)dev->priv;
-	PLM_DEVICE_BLOCK pDevice = (PLM_DEVICE_BLOCK) pUmDevice;
-	LM_UINT32 oldtag, newtag;
-	int i, max_intr_loop;
-#ifdef BCM_TASKLET
-	int repl_buf_count;
-#endif
-	unsigned int handled = 1;
-
-	if (!pDevice->InitDone) {
-		handled = 0;
-		return IRQ_RETVAL(handled);
-	}
-
-	if (atomic_read(&pUmDevice->intr_sem)) {
-		MB_REG_WR(pDevice, Mailbox.Interrupt[0].Low, 1);
-		handled = 0;
-		return IRQ_RETVAL(handled);
-	}
-
-	bcm5700_intr_lock(pUmDevice);
-	if (test_and_set_bit(0, (void*)&pUmDevice->interrupt)) {
-		printk(KERN_ERR "%s: Duplicate entry of the interrupt handler by "
-			   "processor %d.\n",
-			   dev->name, hard_smp_processor_id());
-		bcm5700_intr_unlock(pUmDevice);
-		handled = 0;
-		return IRQ_RETVAL(handled);
-	}
-
-	if ((pDevice->pStatusBlkVirt->Status & STATUS_BLOCK_UPDATED) ||
-#ifdef NICE_SUPPORT
-		pUmDevice->adapter_just_inited || pUmDevice->intr_test)
-#else
-		pUmDevice->adapter_just_inited)
-#endif
-	{
-
-#ifdef NICE_SUPPORT
-		if (pUmDevice->intr_test) {
-			if (!(REG_RD(pDevice, PciCfg.PciState) &
-				T3_PCI_STATE_INTERRUPT_NOT_ACTIVE)) {
-				pUmDevice->intr_test_result = 1;
-			}
-			pUmDevice->intr_test = 0;
-		}
-#endif
-#ifdef BCM_NAPI_RXPOLL
-		max_intr_loop = 1;
-#else
-		max_intr_loop = 50;
-#endif
-		if (pDevice->UseTaggedStatus) {
-			MB_REG_WR(pDevice, Mailbox.Interrupt[0].Low, 1);
-			oldtag = pDevice->pStatusBlkVirt->StatusTag;
-
-			for (i = 0; ; i++) {
-   				pDevice->pStatusBlkVirt->Status &=
-					~STATUS_BLOCK_UPDATED;
-
-				LM_ServiceInterrupts(pDevice);
-				newtag = pDevice->pStatusBlkVirt->StatusTag;
-				if ((newtag == oldtag) || (i > max_intr_loop)) {
-					MB_REG_WR(pDevice,
-						Mailbox.Interrupt[0].Low,
-						oldtag << 24);
-					pDevice->LastTag = oldtag;
-					if (pDevice->UndiFix) {
-						REG_WR(pDevice, Grc.LocalCtrl,
-						pDevice->GrcLocalCtrl | 0x2);
-					}
-					break;
-				}
-				oldtag = newtag;
-			}
-		}
-		else {
-			i = 0;
-			do {
-				uint dummy;
-
-				MB_REG_WR(pDevice, Mailbox.Interrupt[0].Low, 1);
-   				pDevice->pStatusBlkVirt->Status &=
-					~STATUS_BLOCK_UPDATED;
-				LM_ServiceInterrupts(pDevice);
-				MB_REG_WR(pDevice, Mailbox.Interrupt[0].Low, 0);
-				dummy = MB_REG_RD(pDevice,
-					Mailbox.Interrupt[0].Low);
-				i++;
-			}
-			while ((pDevice->pStatusBlkVirt->Status &
-				STATUS_BLOCK_UPDATED) && (i < max_intr_loop));
-			if (pDevice->UndiFix) {
-				REG_WR(pDevice, Grc.LocalCtrl,
-					pDevice->GrcLocalCtrl | 0x2);
-			}
-		}
-	}
-	else {
-		handled = 0;
-	}
-#ifdef BCM_TASKLET
-	repl_buf_count = QQ_GetEntryCnt(&pUmDevice->rx_out_of_buf_q.Container);
-	if (((repl_buf_count > pUmDevice->rx_buf_repl_panic_thresh) ||
-		pDevice->QueueAgain) &&
-		(!test_and_set_bit(0, &pUmDevice->tasklet_busy))) {
-
-		replenish_rx_buffers(pUmDevice,
-			pUmDevice->rx_buf_repl_isr_limit);
-		clear_bit(0, (void*)&pUmDevice->tasklet_busy);
-	}
-	else if ((repl_buf_count > pUmDevice->rx_buf_repl_thresh) &&
-		!pUmDevice->tasklet_pending) {
-
-		pUmDevice->tasklet_pending = 1;
-		tasklet_schedule(&pUmDevice->tasklet);
-	}
-#else
-#ifdef BCM_NAPI_RXPOLL
-	if (!pDevice->RxPoll &&
-		QQ_GetEntryCnt(&pUmDevice->rx_out_of_buf_q.Container)) {
-		pDevice->RxPoll = 1;
-		MM_ScheduleRxPoll(pDevice);
-	}
-#else
-	if (QQ_GetEntryCnt(&pUmDevice->rx_out_of_buf_q.Container)) {
-		replenish_rx_buffers(pUmDevice, 0);
-	}
-
-	if (QQ_GetEntryCnt(&pDevice->RxPacketFreeQ.Container) ||
-		pDevice->QueueAgain) {
-
-		LM_QueueRxPackets(pDevice);
-	}
-#endif
-#endif
-
-	clear_bit(0, (void*)&pUmDevice->interrupt);
-	bcm5700_intr_unlock(pUmDevice);
-	if (pUmDevice->tx_queued) {
-		pUmDevice->tx_queued = 0;
-		netif_wake_queue(dev);
-	}
-	return IRQ_RETVAL(handled);
-}
-
-
-#ifdef BCM_TASKLET
-STATIC void
-bcm5700_tasklet(unsigned long data)
-{
-	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK)data;
-
-	/* RH 7.2 Beta 3 tasklets are reentrant */
-	if (test_and_set_bit(0, &pUmDevice->tasklet_busy)) {
-		pUmDevice->tasklet_pending = 0;
-		return;
-	}
-
-	pUmDevice->tasklet_pending = 0;
-	if (pUmDevice->opened && !pUmDevice->suspended)
-		replenish_rx_buffers(pUmDevice, 0);
-
-	clear_bit(0, &pUmDevice->tasklet_busy);
-}
-#endif
-
-STATIC int
-bcm5700_close(struct net_device *dev)
-{
-	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK)dev->priv;
-	PLM_DEVICE_BLOCK pDevice = (PLM_DEVICE_BLOCK) pUmDevice;
-
-#if (LINUX_VERSION_CODE < 0x02032b)
-	dev->start = 0;
-#endif
-	netif_stop_queue(dev);
-	pUmDevice->opened = 0;
-
-	if (tigon3_debug > 1)
-		printk(KERN_DEBUG "%s: Shutting down Tigon3\n",
-			   dev->name);
-
-	LM_MulticastClear(pDevice);
-	bcm5700_shutdown(pUmDevice);
-	del_timer(&pUmDevice->timer);
-
-	free_irq(dev->irq, dev);
-#if (LINUX_VERSION_CODE < 0x020300)
-	MOD_DEC_USE_COUNT;
-#endif
-	LM_SetPowerState(pDevice, LM_POWER_STATE_D3);
-	bcm5700_freemem(dev);
-
-	return 0;
-}
-
-STATIC int
-bcm5700_freemem(struct net_device *dev)
-{
-	int i;
-	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK)dev->priv;
-
-	for (i = 0; i < pUmDevice->mem_list_num; i++) {
-		if (pUmDevice->mem_size_list[i] == 0) {
-			kfree(pUmDevice->mem_list[i]);
-		}
-		else {
-			pci_free_consistent(pUmDevice->pdev,
-				(size_t) pUmDevice->mem_size_list[i],
-				pUmDevice->mem_list[i],
-				pUmDevice->dma_list[i]);
-		}
-	}
-	pUmDevice->mem_list_num = 0;
-
-#ifdef NICE_SUPPORT
-	if (!pUmDevice->opened) {
-		for (i = 0; i < MAX_MEM2; i++) {
-			if (pUmDevice->mem_size_list2[i]) {
-				bcm5700_freemem2(pUmDevice, i);
-			}
-		}
-	}
-#endif
-	return 0;
-}
-
-#ifdef NICE_SUPPORT
-/* Frees consistent memory allocated through ioctl */
-/* The memory to be freed is in mem_list2[index] */
-STATIC int
-bcm5700_freemem2(UM_DEVICE_BLOCK *pUmDevice, int index)
-{
-#if (LINUX_VERSION_CODE >= 0x020400)
-	void *ptr;
-	struct page *pg, *last_pg;
-
-	/* Probably won't work on some architectures */
-	ptr = pUmDevice->mem_list2[index],
-	pg = virt_to_page(ptr);
-	last_pg = virt_to_page(ptr + pUmDevice->mem_size_list2[index] - 1);
-	for (; ; pg++) {
-#if (LINUX_VERSION_CODE > 0x020500)
-		ClearPageReserved(pg);
-#else
-		mem_map_unreserve(pg);
-#endif
-		if (pg == last_pg)
-			break;
-	}
-	pci_free_consistent(pUmDevice->pdev,
-		(size_t) pUmDevice->mem_size_list2[index],
-		pUmDevice->mem_list2[index],
-		pUmDevice->dma_list2[index]);
-	pUmDevice->mem_size_list2[index] = 0;
-#endif
-	return 0;
-}
-#endif
-
-unsigned long
-bcm5700_crc_count(PUM_DEVICE_BLOCK pUmDevice)
-{
-	PLM_DEVICE_BLOCK pDevice = &pUmDevice->lm_dev;
-	LM_UINT32 Value32;
-	PT3_STATS_BLOCK pStats = (PT3_STATS_BLOCK) pDevice->pStatsBlkVirt;
-	unsigned long flags;
-
-	if ((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700 ||
-		T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701) &&
-		!pDevice->EnableTbi) { 
-
-		if (!pUmDevice->opened || !pDevice->InitDone ||
-			pUmDevice->adapter_just_inited) {
-
-			return 0;
-		}
-
-		/* regulate MDIO access during run time */
-		if (pUmDevice->crc_counter_expiry > 0)
-			return pDevice->PhyCrcCount;
-
-		pUmDevice->crc_counter_expiry = (5 * HZ) /
-			pUmDevice->timer_interval;
-
-		BCM5700_PHY_LOCK(pUmDevice, flags);
-		LM_ReadPhy(pDevice, 0x1e, &Value32);
-		if ((Value32 & 0x8000) == 0)
-			LM_WritePhy(pDevice, 0x1e, Value32 | 0x8000);
-		LM_ReadPhy(pDevice, 0x14, &Value32);
-		BCM5700_PHY_UNLOCK(pUmDevice, flags);
-		/* Sometimes data on the MDIO bus can be corrupted */
-		if (Value32 != 0xffff)
-			pDevice->PhyCrcCount += Value32;
-		return pDevice->PhyCrcCount;
-	}
-	else if (pStats == 0) {
-		return 0;
-	}
-	else {
-		return (MM_GETSTATS(pStats->dot3StatsFCSErrors));
-	}
-}
-
-STATIC struct net_device_stats *
-bcm5700_get_stats(struct net_device *dev)
-{
-	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK)dev->priv;
-	PLM_DEVICE_BLOCK pDevice = (PLM_DEVICE_BLOCK) pUmDevice;
-	PT3_STATS_BLOCK pStats = (PT3_STATS_BLOCK) pDevice->pStatsBlkVirt;
-	struct net_device_stats *p_netstats = &pUmDevice->stats;
-
-	if (pStats == 0)
-		return p_netstats;
-
-	/* Get stats from LM */
-	p_netstats->rx_packets =
-		MM_GETSTATS(pStats->ifHCInUcastPkts) +
-		MM_GETSTATS(pStats->ifHCInMulticastPkts) +
-		MM_GETSTATS(pStats->ifHCInBroadcastPkts);
-	p_netstats->tx_packets = 
-		MM_GETSTATS(pStats->ifHCOutUcastPkts) +
-		MM_GETSTATS(pStats->ifHCOutMulticastPkts) +
-		MM_GETSTATS(pStats->ifHCOutBroadcastPkts);
-	p_netstats->rx_bytes = MM_GETSTATS(pStats->ifHCInOctets);
-	p_netstats->tx_bytes = MM_GETSTATS(pStats->ifHCOutOctets);
-	p_netstats->tx_errors =
-		MM_GETSTATS(pStats->dot3StatsInternalMacTransmitErrors) +
-		MM_GETSTATS(pStats->dot3StatsCarrierSenseErrors) +
-		MM_GETSTATS(pStats->ifOutDiscards) +
-		MM_GETSTATS(pStats->ifOutErrors);
-	p_netstats->multicast = MM_GETSTATS(pStats->ifHCInMulticastPkts);
-	p_netstats->collisions = MM_GETSTATS(pStats->etherStatsCollisions);
-	p_netstats->rx_length_errors =
-		MM_GETSTATS(pStats->dot3StatsFramesTooLong) +
-		MM_GETSTATS(pStats->etherStatsUndersizePkts);
-	p_netstats->rx_over_errors = MM_GETSTATS(pStats->nicNoMoreRxBDs);
-	p_netstats->rx_frame_errors =
-		MM_GETSTATS(pStats->dot3StatsAlignmentErrors);
-	p_netstats->rx_crc_errors = bcm5700_crc_count(pUmDevice);
-	p_netstats->rx_errors =
-		p_netstats->rx_length_errors +
-		p_netstats->rx_over_errors +
-		p_netstats->rx_frame_errors +
-		p_netstats->rx_crc_errors +
-		MM_GETSTATS(pStats->etherStatsFragments) +
-		MM_GETSTATS(pStats->etherStatsJabbers);
-	
-	p_netstats->tx_aborted_errors = MM_GETSTATS(pStats->ifOutDiscards);
-	p_netstats->tx_carrier_errors =
-		MM_GETSTATS(pStats->dot3StatsCarrierSenseErrors);
-
-	return p_netstats;
-}
-
-#ifdef SIOCETHTOOL
-
-#ifdef ETHTOOL_GSTRINGS
-
-#define ETH_NUM_STATS 26
-
-struct {
-	char string[ETH_GSTRING_LEN];
-} bcm5700_stats_str_arr[ETH_NUM_STATS] = {
-	{ "rx_unicast_packets" },
-	{ "rx_multicast_packets" },
-	{ "rx_broadcast_packets" },
-	{ "rx_bytes" },
-	{ "rx_fragments" },
-	{ "rx_crc_errors" },
-	{ "rx_align_errors" },
-	{ "rx_xon_frames" },
-	{ "rx_xoff_frames" },
-	{ "rx_long_frames" },
-	{ "rx_short_frames" },
-	{ "rx_discards" },
-	{ "rx_errors" },
-	{ "tx_unicast_packets" },
-	{ "tx_multicast_packets" },
-	{ "tx_broadcast_packets" },
-	{ "tx_bytes" },
-	{ "tx_collisions" },
-	{ "tx_deferred" },
-	{ "tx_excess_collisions" },
-	{ "tx_late_collisions" },
-	{ "tx_xon_frames" },
-	{ "tx_xoff_frames" },
-	{ "tx_internal_mac_errors" },
-	{ "tx_carrier_errors" },
-	{ "tx_errors" },
-};
-
-#define STATS_OFFSET(offset_name) ((OFFSETOF(T3_STATS_BLOCK, offset_name)) / sizeof(uint64_t))
-
-#ifdef __BIG_ENDIAN
-#define SWAP_DWORD_64(x) (x)
-#else
-#define SWAP_DWORD_64(x) ((x << 32) | (x >> 32))
-#endif
-
-unsigned long bcm5700_stats_offset_arr[ETH_NUM_STATS] = {
-	STATS_OFFSET(ifHCInUcastPkts),
-	STATS_OFFSET(ifHCInMulticastPkts),
-	STATS_OFFSET(ifHCInBroadcastPkts),
-	STATS_OFFSET(ifHCInOctets),
-	STATS_OFFSET(etherStatsFragments),
-	STATS_OFFSET(dot3StatsFCSErrors),
-	STATS_OFFSET(dot3StatsAlignmentErrors),
-	STATS_OFFSET(xonPauseFramesReceived),
-	STATS_OFFSET(xoffPauseFramesReceived),
-	STATS_OFFSET(dot3StatsFramesTooLong),
-	STATS_OFFSET(etherStatsUndersizePkts),
-	STATS_OFFSET(ifInDiscards),
-	STATS_OFFSET(ifInErrors),
-	STATS_OFFSET(ifHCOutUcastPkts),
-	STATS_OFFSET(ifHCOutMulticastPkts),
-	STATS_OFFSET(ifHCOutBroadcastPkts),
-	STATS_OFFSET(ifHCOutOctets),
-	STATS_OFFSET(etherStatsCollisions),
-	STATS_OFFSET(dot3StatsDeferredTransmissions),
-	STATS_OFFSET(dot3StatsExcessiveCollisions),
-	STATS_OFFSET(dot3StatsLateCollisions),
-	STATS_OFFSET(outXonSent),
-	STATS_OFFSET(outXoffSent),
-	STATS_OFFSET(dot3StatsInternalMacTransmitErrors),
-	STATS_OFFSET(dot3StatsCarrierSenseErrors),
-	STATS_OFFSET(ifOutErrors),
-};
-
-#endif /* ETHTOOL_GSTRINGS */
-
-static int netdev_ethtool_ioctl(struct net_device *dev, void *useraddr)
-{
-	struct ethtool_cmd ethcmd;
-	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK)dev->priv;
-	PLM_DEVICE_BLOCK pDevice = (PLM_DEVICE_BLOCK) pUmDevice;
-		
-	if (copy_from_user(&ethcmd, useraddr, sizeof(ethcmd)))
-		return -EFAULT;
-
-        switch (ethcmd.cmd) {
-#ifdef ETHTOOL_GDRVINFO
-        case ETHTOOL_GDRVINFO: {
-		struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO};
-
-		strcpy(info.driver,  bcm5700_driver);
-#if INCLUDE_5701_AX_FIX
-		if(pDevice->ChipRevId == T3_CHIP_ID_5701_A0) {
-			extern int t3FwReleaseMajor;
-			extern int t3FwReleaseMinor;
-			extern int t3FwReleaseFix;
-
-			sprintf(info.fw_version, "%i.%i.%i",
-				t3FwReleaseMajor, t3FwReleaseMinor, 
-				t3FwReleaseFix);
-		}
-#endif
-		strcpy(info.version, bcm5700_version);
-		strcpy(info.bus_info, pUmDevice->pdev->slot_name);
-#ifdef ETHTOOL_GEEPROM
-		BCM_EEDUMP_LEN(&info, pDevice->NvramSize);
-#endif
-#ifdef ETHTOOL_GREGS
-		/* dump everything, including holes in the register space */
-		info.regdump_len = 0x6c00;
-#endif
-#ifdef ETHTOOL_GSTATS
-		info.n_stats = ETH_NUM_STATS;
-#endif
-		if (copy_to_user(useraddr, &info, sizeof(info)))
-			return -EFAULT;
-		return 0;
-	}
-#endif
-        case ETHTOOL_GSET: {
-		if (pDevice->EnableTbi) {
-			ethcmd.supported =
-				(SUPPORTED_1000baseT_Full |
-				SUPPORTED_Autoneg);
-			ethcmd.supported |= SUPPORTED_FIBRE;
-			ethcmd.port = PORT_FIBRE;
-		}
-		else {
-			ethcmd.supported =
-				(SUPPORTED_10baseT_Half |
-				SUPPORTED_10baseT_Full |
-				SUPPORTED_100baseT_Half |
-				SUPPORTED_100baseT_Full |
-				SUPPORTED_1000baseT_Half |
-				SUPPORTED_1000baseT_Full |
-				SUPPORTED_Autoneg);
-			ethcmd.supported |= SUPPORTED_TP;
-			ethcmd.port = PORT_TP;
-		}
-
-		ethcmd.transceiver = XCVR_INTERNAL;
-		ethcmd.phy_address = 0;
-
-		if (pUmDevice->line_speed == 1000)
-			ethcmd.speed = SPEED_1000;
-		else if (pUmDevice->line_speed == 100)
-			ethcmd.speed = SPEED_100;
-		else if (pUmDevice->line_speed == 10)
-			ethcmd.speed = SPEED_10;
-		else
-			ethcmd.speed = 0;
-
-		if (pDevice->DuplexMode == LM_DUPLEX_MODE_FULL)
-			ethcmd.duplex = DUPLEX_FULL;
-		else
-			ethcmd.duplex = DUPLEX_HALF;
-
-		if (pDevice->DisableAutoNeg == FALSE) {
-			ethcmd.autoneg = AUTONEG_ENABLE;
-			ethcmd.advertising = ADVERTISED_Autoneg;
-			if (pDevice->EnableTbi) {
-				ethcmd.advertising |=
-					ADVERTISED_1000baseT_Full |
-					ADVERTISED_FIBRE;
-			}
-			else {
-				ethcmd.advertising |=
-					ADVERTISED_TP;
-				if (pDevice->advertising &
-					PHY_AN_AD_10BASET_HALF) {
-
-					ethcmd.advertising |=
-						ADVERTISED_10baseT_Half;
-				}
-				if (pDevice->advertising &
-					PHY_AN_AD_10BASET_FULL) {
-
-					ethcmd.advertising |=
-						ADVERTISED_10baseT_Full;
-				}
-				if (pDevice->advertising &
-					PHY_AN_AD_100BASETX_HALF) {
-
-					ethcmd.advertising |=
-						ADVERTISED_100baseT_Half;
-				}
-				if (pDevice->advertising &
-					PHY_AN_AD_100BASETX_FULL) {
-
-					ethcmd.advertising |=
-						ADVERTISED_100baseT_Full;
-				}
-				if (pDevice->advertising1000 &
-					BCM540X_AN_AD_1000BASET_HALF) {
-
-					ethcmd.advertising |=
-						ADVERTISED_1000baseT_Half;
-				}
-				if (pDevice->advertising1000 &
-					BCM540X_AN_AD_1000BASET_FULL) {
-
-					ethcmd.advertising |=
-						ADVERTISED_1000baseT_Full;
-				}
-			}
-		}
-		else {
-			ethcmd.autoneg = AUTONEG_DISABLE;
-			ethcmd.advertising = 0;
-		}
-
-		ethcmd.maxtxpkt = pDevice->TxMaxCoalescedFrames;
-		ethcmd.maxrxpkt = pDevice->RxMaxCoalescedFrames;
-
-		if(copy_to_user(useraddr, &ethcmd, sizeof(ethcmd)))
-			return -EFAULT;
-		return 0;
-	}
-	case ETHTOOL_SSET: {
-		unsigned long flags;
-
-		if(!capable(CAP_NET_ADMIN))
-			return -EPERM;
-		if (ethcmd.autoneg == AUTONEG_ENABLE) {
-			pDevice->RequestedLineSpeed = LM_LINE_SPEED_AUTO;
-			pDevice->RequestedDuplexMode = LM_DUPLEX_MODE_UNKNOWN;
-			pDevice->DisableAutoNeg = FALSE;
-		}
-		else {
-			if (ethcmd.speed == SPEED_1000) {
-				if (!pDevice->EnableTbi || pDevice->No1000)
-					return -EINVAL;
-
-				pDevice->RequestedLineSpeed =
-					LM_LINE_SPEED_1000MBPS;
-
-				pDevice->RequestedDuplexMode =
-					LM_DUPLEX_MODE_FULL;
-			}
-			else if (ethcmd.speed == SPEED_100) {
-				pDevice->RequestedLineSpeed =
-					LM_LINE_SPEED_100MBPS;
-			}
-			else if (ethcmd.speed == SPEED_10) {
-				pDevice->RequestedLineSpeed =
-					LM_LINE_SPEED_10MBPS;
-			}
-			else {
-				return -EINVAL;
-			}
-
-			pDevice->DisableAutoNeg = TRUE;
-			if (ethcmd.duplex == DUPLEX_FULL) {
-				pDevice->RequestedDuplexMode =
-					LM_DUPLEX_MODE_FULL;
-			}
-			else {
-				pDevice->RequestedDuplexMode =
-					LM_DUPLEX_MODE_HALF;
-			}
-		}
-		BCM5700_PHY_LOCK(pUmDevice, flags);
-		LM_SetupPhy(pDevice);
-		BCM5700_PHY_UNLOCK(pUmDevice, flags);
-		return 0;
-	}
-#ifdef ETHTOOL_GWOL
-#ifdef BCM_WOL
-	case ETHTOOL_GWOL: {
-		struct ethtool_wolinfo wol = {ETHTOOL_GWOL};
-
-		if (pDevice->EnableTbi && !pDevice->FiberWolCapable) {
-			wol.supported = 0;
-			wol.wolopts = 0;
-		}
-		else {
-			wol.supported = WAKE_MAGIC;
-			if (pDevice->WakeUpMode == LM_WAKE_UP_MODE_MAGIC_PACKET)
-			{
-				wol.wolopts = WAKE_MAGIC;
-			}
-			else {
-				wol.wolopts = 0;
-			}
-		}
-		if (copy_to_user(useraddr, &wol, sizeof(wol)))
-			return -EFAULT;
-		return 0;
-	}
-	case ETHTOOL_SWOL: {
-		struct ethtool_wolinfo wol;
-
-		if(!capable(CAP_NET_ADMIN))
-			return -EPERM;
-		if (copy_from_user(&wol, useraddr, sizeof(wol)))
-			return -EFAULT;
-		if (pDevice->EnableTbi && !pDevice->FiberWolCapable &&
-			wol.wolopts) {
-			return -EINVAL;
-		}
-		
-		if ((wol.wolopts & ~WAKE_MAGIC) != 0) {
-			return -EINVAL;
-		}
-		if (wol.wolopts & WAKE_MAGIC) {
-			pDevice->WakeUpModeCap = LM_WAKE_UP_MODE_MAGIC_PACKET;
-			pDevice->WakeUpMode = LM_WAKE_UP_MODE_MAGIC_PACKET;
-		}
-		else {
-			pDevice->WakeUpModeCap = LM_WAKE_UP_MODE_NONE;
-			pDevice->WakeUpMode = LM_WAKE_UP_MODE_NONE;
-		}
-		return 0;
-        }
-#endif
-#endif
-#ifdef ETHTOOL_GLINK
-	case ETHTOOL_GLINK: {
-		struct ethtool_value edata = {ETHTOOL_GLINK};
-
-		if (pUmDevice->delayed_link_ind > 0)
-			return -EOPNOTSUPP;
-
-		if (pDevice->LinkStatus == LM_STATUS_LINK_ACTIVE) {
-			edata.data =  1;
-		}
-		else {
-			edata.data =  0;
-		}
-		if (copy_to_user(useraddr, &edata, sizeof(edata)))
-			return -EFAULT;
-		return 0;
-	}
-#endif
-#ifdef ETHTOOL_NWAY_RST
-	case ETHTOOL_NWAY_RST: {
-		LM_UINT32 phyctrl;
-		unsigned long flags;
-
-		if(!capable(CAP_NET_ADMIN))
-			return -EPERM;
-		if (pDevice->DisableAutoNeg) {
-			return -EINVAL;
-		}
-		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 |
-				PHY_CTRL_RESTART_AUTO_NEG);
-		}
-		BCM5700_PHY_UNLOCK(pUmDevice, flags);
-		return 0;
-	}
-#endif
-#ifdef ETHTOOL_GEEPROM
-	case ETHTOOL_GEEPROM: {
-		struct ethtool_eeprom eeprom;
-		LM_UINT32 *buf = 0;
-		LM_UINT32 buf1[64/4];
-		int i, j, offset, len;
-
-		if (copy_from_user(&eeprom, useraddr, sizeof(eeprom)))
-			return -EFAULT;
-		
-		if (eeprom.offset >= pDevice->NvramSize)
-			return -EFAULT;
-
-		/* maximum data limited */
-		/* to read more, call again with a different offset */
-		if (eeprom.len > 0x800) {
-			eeprom.len = 0x800;
-			if (copy_to_user(useraddr, &eeprom, sizeof(eeprom)))
-				return -EFAULT;
-		}
-
-		if (eeprom.len > 64) {
-			buf = kmalloc(eeprom.len, GFP_KERNEL);
-			if (!buf)
-				return -ENOMEM;
-		}
-		else {
-			buf = buf1;
-		}
-		useraddr += offsetof(struct ethtool_eeprom, data);
-
-		offset = eeprom.offset;
-		len = eeprom.len;
-		if (offset & 3) {
-			offset &= 0xfffffffc;
-			len += (offset & 3);
-		}
-		len = (len + 3) & 0xfffffffc;
-		for (i = 0, j = 0; j < len; i++, j += 4) {
-			if (LM_NvramRead(pDevice, offset + j, buf + i) !=
-				LM_STATUS_SUCCESS) {
-				break;
-			}
-		}
-		if (j >= len) {
-			buf += (eeprom.offset & 3);
-			i = copy_to_user(useraddr, buf, eeprom.len);
-		}
-		if (eeprom.len > 64) {
-			kfree(buf);
-		}
-		if ((j < len) || i)
-			return -EFAULT;
-		return 0;
-	}
-	case ETHTOOL_SEEPROM: {
-		struct ethtool_eeprom eeprom;
-		LM_UINT32 buf[64/4];
-		int i, offset, len;
-
-		if(!capable(CAP_NET_ADMIN))
-			return -EPERM;
-		if (copy_from_user(&eeprom, useraddr, sizeof(eeprom)))
-			return -EFAULT;
-		
-		if ((eeprom.offset & 3) || (eeprom.len & 3) ||
-			(eeprom.offset >= pDevice->NvramSize)) {
-			return -EFAULT;
-		}
-
-		if ((eeprom.offset + eeprom.len) >= pDevice->NvramSize) {
-			eeprom.len = pDevice->NvramSize - eeprom.offset;
-		}
-
-		useraddr += offsetof(struct ethtool_eeprom, data);
-
-		len = eeprom.len;
-		offset = eeprom.offset;
-		for (; len > 0; ) {
-			if (len < 64)
-				i = len;
-			else
-				i = 64;
-			if (copy_from_user(&buf, useraddr, i))
-				return -EFAULT;
-
-			bcm5700_intr_off(pUmDevice);
-#ifdef BCM_NAPI_RXPOLL
-			/* Prevent race condition on Grc.Mode register */
-			while (pDevice->RxPoll)
-				yield();
-#endif
-			if (LM_NvramWriteBlock(pDevice, offset, buf, i/4) !=
-				LM_STATUS_SUCCESS) {
-				bcm5700_intr_on(pUmDevice);
-				return -EFAULT;
-			}
-			bcm5700_intr_on(pUmDevice);
-			len -= i;
-			offset += i;
-			useraddr += i;
-		}
-		return 0;
-	}
-#endif
-#ifdef ETHTOOL_GREGS
-#if (LINUX_VERSION_CODE >= 0x02040f)
-	case ETHTOOL_GREGS: {
-		struct ethtool_regs eregs;
-		LM_UINT32 *buf, *buf1;
-		unsigned int i;
-
-		if(!capable(CAP_NET_ADMIN))
-			return -EPERM;
-		if (pDevice->UndiFix)
-			return -EOPNOTSUPP;
-		if (copy_from_user(&eregs, useraddr, sizeof(eregs)))
-			return -EFAULT;
-		if (eregs.len > 0x6c00)
-			eregs.len = 0x6c00;
-		eregs.version = 0x0;
-		if (copy_to_user(useraddr, &eregs, sizeof(eregs)))
-			return -EFAULT;
-		buf = buf1 = kmalloc(eregs.len, GFP_KERNEL);
-		if (!buf)
-			return -ENOMEM;
-		for (i = 0; i < eregs.len; i = i + 4) {
-			if ((i >= 0x5c00) && (i < 0x6000)) {
-				/* skip FTQ register block */
-				*buf1++ = 0;
-				continue;
-			}
-			*buf1++ = REG_RD_OFFSET(pDevice, i);
-		}
-		i = copy_to_user(useraddr + sizeof(eregs), buf, eregs.len);
-		kfree(buf);
-		if (i)
-			return -EFAULT;
-		return 0;
-	}
-#endif
-#endif
-#ifdef ETHTOOL_GPAUSEPARAM
-	case ETHTOOL_GPAUSEPARAM: {
-		struct ethtool_pauseparam epause = { ETHTOOL_GPAUSEPARAM };
-
-		epause.autoneg = !pDevice->DisableAutoNeg;
-		epause.rx_pause = 
-			(pDevice->FlowControlCap &
-			LM_FLOW_CONTROL_RECEIVE_PAUSE) != 0;
-		epause.tx_pause = 
-			(pDevice->FlowControlCap &
-			LM_FLOW_CONTROL_TRANSMIT_PAUSE) != 0;
-		if (copy_to_user(useraddr, &epause, sizeof(epause)))
-			return -EFAULT;
-
-		return 0;
-	}
-	case ETHTOOL_SPAUSEPARAM: {
-		struct ethtool_pauseparam epause;
-		unsigned long flags;
-
-		if(!capable(CAP_NET_ADMIN))
-			return -EPERM;
-		if (copy_from_user(&epause, useraddr, sizeof(epause)))
-			return -EFAULT;
-		pDevice->FlowControlCap = 0;
-		if (epause.autoneg && !pDevice->DisableAutoNeg) {
-			pDevice->FlowControlCap |= LM_FLOW_CONTROL_AUTO_PAUSE;
-		}
-		if (epause.rx_pause)  {
-			pDevice->FlowControlCap |=
-				LM_FLOW_CONTROL_RECEIVE_PAUSE;
-		}
-		if (epause.tx_pause)  {
-			pDevice->FlowControlCap |=
-				LM_FLOW_CONTROL_TRANSMIT_PAUSE;
-		}
-		BCM5700_PHY_LOCK(pUmDevice, flags);
-		LM_SetupPhy(pDevice);
-		BCM5700_PHY_UNLOCK(pUmDevice, flags);
-
-		return 0;
-	}
-#endif
-#ifdef ETHTOOL_GRXCSUM
-	case ETHTOOL_GRXCSUM: {
-		struct ethtool_value edata = { ETHTOOL_GRXCSUM };
-
-		edata.data = 
-			(pDevice->TaskToOffload &
-			LM_TASK_OFFLOAD_RX_TCP_CHECKSUM) != 0;
-		if (copy_to_user(useraddr, &edata, sizeof(edata)))
-			return -EFAULT;
-
-		return 0;
-	}
-	case ETHTOOL_SRXCSUM: {
-		struct ethtool_value edata;
-
-		if(!capable(CAP_NET_ADMIN))
-			return -EPERM;
-		if (copy_from_user(&edata, useraddr, sizeof(edata)))
-			return -EFAULT;
-		if (edata.data) {
-			if (!(pDevice->TaskOffloadCap &
-				LM_TASK_OFFLOAD_TX_TCP_CHECKSUM)) {
-
-				return -EINVAL;
-			}
-			pDevice->TaskToOffload |=
-				LM_TASK_OFFLOAD_RX_TCP_CHECKSUM |
-				LM_TASK_OFFLOAD_RX_UDP_CHECKSUM;
-		}
-		else {
-			pDevice->TaskToOffload &=
-				~(LM_TASK_OFFLOAD_RX_TCP_CHECKSUM |
-				LM_TASK_OFFLOAD_RX_UDP_CHECKSUM);
-		}
-		return 0;
-	}
-	case ETHTOOL_GTXCSUM: {
-		struct ethtool_value edata = { ETHTOOL_GTXCSUM };
-
-		edata.data = 
-			(dev->features & NETIF_F_IP_CSUM) != 0;
-		if (copy_to_user(useraddr, &edata, sizeof(edata)))
-			return -EFAULT;
-
-		return 0;
-	}
-	case ETHTOOL_STXCSUM: {
-		struct ethtool_value edata;
-
-		if(!capable(CAP_NET_ADMIN))
-			return -EPERM;
-		if (copy_from_user(&edata, useraddr, sizeof(edata)))
-			return -EFAULT;
-		if (edata.data) {
-			if (!(pDevice->TaskOffloadCap &
-				LM_TASK_OFFLOAD_TX_TCP_CHECKSUM)) {
-
-				return -EINVAL;
-			}
-			dev->features |= NETIF_F_IP_CSUM;
-			pDevice->TaskToOffload |=
-				LM_TASK_OFFLOAD_TX_TCP_CHECKSUM |
-				LM_TASK_OFFLOAD_TX_UDP_CHECKSUM;
-		}
-		else {
-			dev->features &= ~NETIF_F_IP_CSUM;
-			pDevice->TaskToOffload &=
-				~(LM_TASK_OFFLOAD_TX_TCP_CHECKSUM |
-				LM_TASK_OFFLOAD_TX_UDP_CHECKSUM);
-		}
-		return 0;
-	}
-	case ETHTOOL_GSG: {
-		struct ethtool_value edata = { ETHTOOL_GSG };
-
-		edata.data = 
-			(dev->features & NETIF_F_SG) != 0;
-		if (copy_to_user(useraddr, &edata, sizeof(edata)))
-			return -EFAULT;
-		return 0;
-	}
-	case ETHTOOL_SSG: {
-		struct ethtool_value edata;
-
-		if(!capable(CAP_NET_ADMIN))
-			return -EPERM;
-		if (copy_from_user(&edata, useraddr, sizeof(edata)))
-			return -EFAULT;
-		if (edata.data) {
-			dev->features |= NETIF_F_SG;
-		}
-		else {
-			dev->features &= ~NETIF_F_SG;
-		}
-		return 0;
-	}
-#endif
-#ifdef ETHTOOL_GRINGPARAM
-	case ETHTOOL_GRINGPARAM: {
-		struct ethtool_ringparam ering = { ETHTOOL_GRINGPARAM };
-
-		ering.rx_max_pending = T3_STD_RCV_RCB_ENTRY_COUNT - 1;
-		ering.rx_pending = pDevice->RxStdDescCnt;
-		ering.rx_mini_max_pending = 0;
-		ering.rx_mini_pending = 0;
-#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
-		ering.rx_jumbo_max_pending = T3_JUMBO_RCV_RCB_ENTRY_COUNT - 1;
-		ering.rx_jumbo_pending = pDevice->RxJumboDescCnt;
-#else
-		ering.rx_jumbo_max_pending = 0;
-		ering.rx_jumbo_pending = 0;
-#endif
-		ering.tx_max_pending = MAX_TX_PACKET_DESC_COUNT - 1;
-		ering.tx_pending = pDevice->TxPacketDescCnt;
-		if (copy_to_user(useraddr, &ering, sizeof(ering)))
-			return -EFAULT;
-		return 0;
-	}
-#endif
-#ifdef ETHTOOL_PHYS_ID
-	case ETHTOOL_PHYS_ID: {
-		struct ethtool_value edata;
-
-		if(!capable(CAP_NET_ADMIN))
-			return -EPERM;
-		if (copy_from_user(&edata, useraddr, sizeof(edata)))
-			return -EFAULT;
-		if (LM_BlinkLED(pDevice, edata.data) == LM_STATUS_SUCCESS)
-			return 0;
-		return -EINTR;
-	}
-#endif
-#ifdef ETHTOOL_GSTRINGS
-	case ETHTOOL_GSTRINGS: {
-		struct ethtool_gstrings egstr = { ETHTOOL_GSTRINGS };
-
-		if (copy_from_user(&egstr, useraddr, sizeof(egstr)))
-			return -EFAULT;
-		if (egstr.string_set != ETH_SS_STATS)
-			return -EINVAL;
-		egstr.len = ETH_NUM_STATS;
-		if (copy_to_user(useraddr, &egstr, sizeof(egstr)))
-			return -EFAULT;
-		if (copy_to_user(useraddr + sizeof(egstr), 
-			bcm5700_stats_str_arr, sizeof(bcm5700_stats_str_arr)))
-			return -EFAULT;
-		return 0;
-	}
-#endif
-#ifdef ETHTOOL_GSTATS
-	case ETHTOOL_GSTATS: {
-		struct ethtool_stats estats = { ETHTOOL_GSTATS };
-		uint64_t stats[ETH_NUM_STATS];
-		int i;
-		uint64_t *pStats =
-			(uint64_t *) pDevice->pStatsBlkVirt;
-
-		if (copy_to_user(useraddr, &estats, sizeof(estats)))
-			return -EFAULT;
-
-		estats.n_stats = ETH_NUM_STATS;
-		if (pStats == 0) {
-			memset(stats, 0, sizeof(stats));
-		}
-		else {
-			for (i = 0; i < ETH_NUM_STATS; i++) {
-				stats[i] = SWAP_DWORD_64(*(pStats +
-					bcm5700_stats_offset_arr[i]));
-			}
-		}
-		if (copy_to_user(useraddr + sizeof(estats), &stats,
-			sizeof(stats)))
-			return -EFAULT;
-		return 0;
-	}
-#endif
-#ifdef BCM_TSO
-#ifdef ETHTOOL_GTSO
-	case ETHTOOL_GTSO: {
-		struct ethtool_value edata = { ETHTOOL_GTSO };
-
-		edata.data = 
-			(dev->features & NETIF_F_TSO) != 0;
-		if (copy_to_user(useraddr, &edata, sizeof(edata)))
-			return -EFAULT;
-		return 0;
-	}
-#endif
-#ifdef ETHTOOL_STSO
-	case ETHTOOL_STSO: {
-		struct ethtool_value edata;
-
-		if(!capable(CAP_NET_ADMIN))
-			return -EPERM;
-		if (copy_from_user(&edata, useraddr, sizeof(edata)))
-			return -EFAULT;
-		if (!(pDevice->TaskToOffload &
-			LM_TASK_OFFLOAD_TCP_SEGMENTATION))
-		{
-			return -EINVAL;
-		}
-		if (edata.data) {
-			dev->features |= NETIF_F_TSO;
-		}
-		else {
-			dev->features &= ~NETIF_F_TSO;
-		}
-		return 0;
-	}
-#endif
-#endif /* #ifdef BCM_TSO */
-	}
-
-	return -EOPNOTSUPP;
-}
-#endif /* #ifdef SIOCETHTOOL */
-
-/* Provide ioctl() calls to examine the MII xcvr state. */
-STATIC int bcm5700_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
-{
-	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK)dev->priv;
-	PLM_DEVICE_BLOCK pDevice = (PLM_DEVICE_BLOCK) pUmDevice;
-	u16 *data = (u16 *)&rq->ifr_data;
-	u32 value;
-	unsigned long flags;
-
-	switch(cmd) {
-#ifdef SIOCGMIIPHY
-	case SIOCGMIIPHY:
-#endif
-	case SIOCDEVPRIVATE:		/* Get the address of the PHY in use. */
-		data[0] = pDevice->PhyAddr;
-
-#ifdef SIOCGMIIREG
-	case SIOCGMIIREG:
-#endif
-	case SIOCDEVPRIVATE+1:		/* Read the specified MII register. */
-		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);
-		data[3] = value & 0xffff;
-		return 0;
-
-#ifdef SIOCSMIIREG
-	case SIOCSMIIREG:
-#endif
-	case SIOCDEVPRIVATE+2:		/* Write the specified MII register */
-		if (!capable(CAP_NET_ADMIN))
-			return -EPERM;
-
-		if (pDevice->EnableTbi)
-			return -EOPNOTSUPP;
-
-		BCM5700_PHY_LOCK(pUmDevice, flags);
-		LM_WritePhy(pDevice, data[1] & 0x1f, data[2]);
-		BCM5700_PHY_UNLOCK(pUmDevice, flags);
-		return 0;
-
-#ifdef NICE_SUPPORT
-	case SIOCNICE:
-	{
-		struct nice_req* nrq;
-
-		if (!capable(CAP_NET_ADMIN))
-			return -EPERM;
-
-		nrq = (struct nice_req*)&rq->ifr_ifru;
-		if( nrq->cmd == NICE_CMD_QUERY_SUPPORT ) {
-			nrq->nrq_magic = NICE_DEVICE_MAGIC;
-			nrq->nrq_support_rx = 1;
-			nrq->nrq_support_vlan = 1;
-			nrq->nrq_support_get_speed = 1;
-#ifdef BCM_NAPI_RXPOLL
-			nrq->nrq_support_rx_napi = 1;
-#endif
-			return 0;
-		}
-#ifdef BCM_NAPI_RXPOLL
-		else if( nrq->cmd == NICE_CMD_SET_RX_NAPI )
-#else
-		else if( nrq->cmd == NICE_CMD_SET_RX )
-#endif
-		{
-			pUmDevice->nice_rx = nrq->nrq_rx;
-			pUmDevice->nice_ctx = nrq->nrq_ctx;
-			bcm5700_set_vlan_mode(pUmDevice);
-			return 0;
-		}
-#ifdef BCM_NAPI_RXPOLL
-		else if( nrq->cmd == NICE_CMD_GET_RX_NAPI )
-#else
-		else if( nrq->cmd == NICE_CMD_GET_RX )
-#endif
-		{
-			nrq->nrq_rx = pUmDevice->nice_rx;
-			nrq->nrq_ctx = pUmDevice->nice_ctx;
-			return 0;
-		}
-		else if( nrq->cmd == NICE_CMD_GET_SPEED ) {
-			nrq->nrq_speed = pUmDevice->line_speed;
-			return 0;
-		}
-		else {
-			int j;
-
-			if (!pUmDevice->opened)
-				return -EINVAL;
-
-			switch (nrq->cmd) {
-			case NICE_CMD_BLINK_LED:
-				if (LM_BlinkLED(pDevice, nrq->nrq_blink_time) ==
-					LM_STATUS_SUCCESS) {
-					return 0;
-				}
-				return -EINTR;
-
-			case NICE_CMD_DIAG_SUSPEND:
-				bcm5700_intr_off(pUmDevice);
-				pUmDevice->suspended = 1;
-				netif_carrier_off(dev);
-				netif_stop_queue(dev);
-#ifdef BCM_TASKLET
-				tasklet_kill(&pUmDevice->tasklet);
-#endif
-#ifdef BCM_NAPI_RXPOLL
-				while (pDevice->RxPoll)
-					yield();
-#endif
-				LM_Abort(pDevice);
-				LM_ResetChip(pDevice);
-				return 0;
-
-			case NICE_CMD_DIAG_RESUME:
-				if (pUmDevice->suspended) {
-					pUmDevice->suspended = 0;
-					bcm5700_reset(dev);
-				}
-				return 0;
-
-			case NICE_CMD_REG_READ:
-				if (nrq->nrq_offset >= 0x10000) {
-					nrq->nrq_data = LM_RegRdInd(pDevice,
-						nrq->nrq_offset);
-				}
-				else {
-					nrq->nrq_data = LM_RegRd(pDevice,
-						nrq->nrq_offset);
-				}
-				return 0;
-
-			case NICE_CMD_REG_WRITE:
-				if (nrq->nrq_offset >= 0x10000) {
-					LM_RegWrInd(pDevice, nrq->nrq_offset,
-						nrq->nrq_data);
-				}
-				else {
-					LM_RegWr(pDevice, nrq->nrq_offset,
-						nrq->nrq_data, FALSE);
-				}
-				return 0;
-
-			case NICE_CMD_REG_READ_DIRECT:
-			case NICE_CMD_REG_WRITE_DIRECT:
-				if ((nrq->nrq_offset >= 0x10000) ||
-					pDevice->UndiFix) {
-					return -EINVAL;
-				}
-
-				if (nrq->cmd == NICE_CMD_REG_READ_DIRECT) {
-					nrq->nrq_data = REG_RD_OFFSET(pDevice,
-						nrq->nrq_offset);
-				}
-				else {
-					REG_WR_OFFSET(pDevice, nrq->nrq_offset,
-							nrq->nrq_data);
-				}
-				return 0;
-
-			case NICE_CMD_MEM_READ:
-				nrq->nrq_data = LM_MemRdInd(pDevice,
-					nrq->nrq_offset);
-				return 0;
-
-			case NICE_CMD_MEM_WRITE:
-				LM_MemWrInd(pDevice, nrq->nrq_offset,
-					nrq->nrq_data);
-				return 0;
-
-			case NICE_CMD_CFG_READ32:
-				pci_read_config_dword(pUmDevice->pdev,
-					nrq->nrq_offset, (u32 *)&nrq->nrq_data);
-				return 0;
-
-			case NICE_CMD_CFG_READ16:
-				pci_read_config_word(pUmDevice->pdev,
-					nrq->nrq_offset, (u16 *)&nrq->nrq_data);
-				return 0;
-
-			case NICE_CMD_CFG_READ8:
-				pci_read_config_byte(pUmDevice->pdev,
-					nrq->nrq_offset, (u8 *)&nrq->nrq_data);
-				return 0;
-
-			case NICE_CMD_CFG_WRITE32:
-				pci_write_config_dword(pUmDevice->pdev,
-					nrq->nrq_offset, (u32)nrq->nrq_data);
-				return 0;
-
-			case NICE_CMD_CFG_WRITE16:
-				pci_write_config_word(pUmDevice->pdev,
-					nrq->nrq_offset, (u16)nrq->nrq_data);
-				return 0;
-
-			case NICE_CMD_CFG_WRITE8:
-				pci_write_config_byte(pUmDevice->pdev,
-					nrq->nrq_offset, (u8)nrq->nrq_data);
-				return 0;
-
-			case NICE_CMD_RESET:
-				bcm5700_reset(dev);
-				return 0;
-
-			case NICE_CMD_ENABLE_MAC_LOOPBACK:
-				if (pDevice->LoopBackMode != 0) {
-					return -EINVAL;
-				}
-
-				BCM5700_PHY_LOCK(pUmDevice, flags);
-				LM_EnableMacLoopBack(pDevice);
-				BCM5700_PHY_UNLOCK(pUmDevice, flags);
-				return 0;
-
-			case NICE_CMD_DISABLE_MAC_LOOPBACK:
-				if (pDevice->LoopBackMode !=
-					LM_MAC_LOOP_BACK_MODE) {
-					return -EINVAL;
-				}
-
-				BCM5700_PHY_LOCK(pUmDevice, flags);
-				LM_DisableMacLoopBack(pDevice);
-				BCM5700_PHY_UNLOCK(pUmDevice, flags);
-				return 0;
-
-			case NICE_CMD_ENABLE_PHY_LOOPBACK:
-				if (pDevice->LoopBackMode != 0) {
-					return -EINVAL;
-				}
-
-				BCM5700_PHY_LOCK(pUmDevice, flags);
-				LM_EnablePhyLoopBack(pDevice);
-				BCM5700_PHY_UNLOCK(pUmDevice, flags);
-				return 0;
-
-			case NICE_CMD_DISABLE_PHY_LOOPBACK:
-				if (pDevice->LoopBackMode !=
-					LM_PHY_LOOP_BACK_MODE) {
-					return -EINVAL;
-				}
-
-				BCM5700_PHY_LOCK(pUmDevice, flags);
-				LM_DisablePhyLoopBack(pDevice);
-				BCM5700_PHY_UNLOCK(pUmDevice, flags);
-				return 0;
-
-			case NICE_CMD_ENABLE_EXT_LOOPBACK:
-				if (pDevice->LoopBackMode != 0) {
-					return -EINVAL;
-				}
-
-				if (pDevice->EnableTbi) {
-					if (nrq->nrq_speed != 1000)
-						return -EINVAL;
-				}
-				else {
-					if ((nrq->nrq_speed != 1000) &&
-						(nrq->nrq_speed != 100) &&
-						(nrq->nrq_speed != 10)) {
-						return -EINVAL;
-					}
-				}
-				BCM5700_PHY_LOCK(pUmDevice, flags);
-				LM_EnableExtLoopBack(pDevice, nrq->nrq_speed);
-				BCM5700_PHY_UNLOCK(pUmDevice, flags);
-				return 0;
-
-			case NICE_CMD_DISABLE_EXT_LOOPBACK:
-				if (pDevice->LoopBackMode !=
-					LM_EXT_LOOP_BACK_MODE) {
-					return -EINVAL;
-				}
-
-				BCM5700_PHY_LOCK(pUmDevice, flags);
-				LM_DisableExtLoopBack(pDevice);
-				BCM5700_PHY_UNLOCK(pUmDevice, flags);
-				return 0;
-
-			case NICE_CMD_INTERRUPT_TEST:
-				pUmDevice->intr_test_result = 0;
-				pUmDevice->intr_test = 1;
-				REG_WR(pDevice, Grc.LocalCtrl,
-					pDevice->GrcLocalCtrl |
-					GRC_MISC_LOCAL_CTRL_SET_INT);
-				for (j = 0; j < 10; j++) {
-					if (pUmDevice->intr_test_result)
-						break;
-					REG_WR(pDevice, Grc.LocalCtrl,
-						pDevice->GrcLocalCtrl |
-						GRC_MISC_LOCAL_CTRL_SET_INT);
-					MM_Sleep(pDevice, 1);
-				}
-				nrq->nrq_intr_test_result =
-					pUmDevice->intr_test_result;
-				return 0;
-
-			case NICE_CMD_KMALLOC_PHYS: {
-#if (LINUX_VERSION_CODE >= 0x020400)
-				dma_addr_t mapping;
-				__u64 cpu_pa;
-				void *ptr;
-				int i;
-				struct page *pg, *last_pg;
-
-				for (i = 0; i < MAX_MEM2; i++) {
-					if (pUmDevice->mem_size_list2[i] == 0)
-						break;
-				}
-				if (i >= MAX_MEM2)
-					return -EFAULT;
-				ptr = pci_alloc_consistent(pUmDevice->pdev,
-					nrq->nrq_size, &mapping);
-				if (!ptr) {
-					return -EFAULT;
-				}
-				pUmDevice->mem_size_list2[i] = nrq->nrq_size;
-				pUmDevice->mem_list2[i] = ptr;
-				pUmDevice->dma_list2[i] = mapping;
-
-				/* put pci mapping at the beginning of buffer */
-				*((__u64 *) ptr) = (__u64) mapping;
-
-				/* Probably won't work on some architectures */
-				/* get CPU mapping */
-				cpu_pa = (__u64) virt_to_phys(ptr);
-				pUmDevice->cpu_pa_list2[i] = cpu_pa;
-				nrq->nrq_phys_addr_lo = (__u32) cpu_pa;
-				nrq->nrq_phys_addr_hi = (__u32) (cpu_pa >> 32);
-
-				pg = virt_to_page(ptr);
-				last_pg = virt_to_page(ptr + nrq->nrq_size - 1);
-				for (; ; pg++) {
-#if (LINUX_VERSION_CODE > 0x020500)
-					SetPageReserved(pg);
-#else
-					mem_map_reserve(pg);
-#endif
-					if (pg == last_pg)
-						break;
-				}
-				return 0;
-#else
-				return -EOPNOTSUPP;
-#endif
-			}
-			case NICE_CMD_KFREE_PHYS: {
-				int i;
-				__u64 cpu_pa;
-
-				cpu_pa = (__u64) nrq->nrq_phys_addr_lo +
-					((__u64) nrq->nrq_phys_addr_hi << 32);
-				for (i = 0; i < MAX_MEM2; i++) {
-					if (pUmDevice->cpu_pa_list2[i] ==
-						cpu_pa)
-					{
-						break;
-					}
-				}
-				if (i >= MAX_MEM2)
-					return -EFAULT;
-
-				bcm5700_freemem2(pUmDevice, i);
-				return 0;
-			}
-			case NICE_CMD_SET_WRITE_PROTECT:
-				pDevice->EepromWp = nrq->nrq_write_protect;
-				return 0;
-			case NICE_CMD_GET_STATS_BLOCK: {
-				PT3_STATS_BLOCK pStats =
-					(PT3_STATS_BLOCK)pDevice->pStatsBlkVirt;
-				if (copy_to_user(nrq->nrq_stats_useraddr,
-					pStats, nrq->nrq_stats_size)) {
-					return -EFAULT;
-				}
-				return 0;
-			}
-			case NICE_CMD_CLR_STATS_BLOCK: {
-				int j;
-				PT3_STATS_BLOCK pStats =
-					(PT3_STATS_BLOCK)pDevice->pStatsBlkVirt;
-
-				memset(pStats, 0, sizeof(T3_STATS_BLOCK));
-				if (T3_ASIC_REV(pDevice->ChipRevId) ==
-					T3_ASIC_REV_5705) {
-					return 0;
-				}
-				for(j = 0x0300; j < 0x0b00; j = j + 4) {
-					MEM_WR_OFFSET(pDevice, j, 0);
-				}
-
-				return 0;
-			}
-			}
-		}
-		return -EOPNOTSUPP;
-	}
-#endif /* NICE_SUPPORT */
-#ifdef SIOCETHTOOL
-	case SIOCETHTOOL:
-		return netdev_ethtool_ioctl(dev, (void *) rq->ifr_data);
-#endif
-	default:
-		return -EOPNOTSUPP;
-	}
-	return -EOPNOTSUPP;
-}
-
-STATIC void bcm5700_set_rx_mode(struct net_device *dev)
-{
-	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK)dev->priv;
-	PLM_DEVICE_BLOCK pDevice = (PLM_DEVICE_BLOCK) pUmDevice;
-	int i;
-	struct dev_mc_list *mclist;
-
-	LM_MulticastClear(pDevice);
-	for (i = 0, mclist = dev->mc_list; mclist && i < dev->mc_count;
-			 i++, mclist = mclist->next) {
-		LM_MulticastAdd(pDevice, (PLM_UINT8) &mclist->dmi_addr);
-	}
-	if (dev->flags & IFF_ALLMULTI) {
-		if (!(pDevice->ReceiveMask & LM_ACCEPT_ALL_MULTICAST)) {
-			LM_SetReceiveMask(pDevice,
-				pDevice->ReceiveMask | LM_ACCEPT_ALL_MULTICAST);
-		}
-	}
-	else if (pDevice->ReceiveMask & LM_ACCEPT_ALL_MULTICAST) {
-		LM_SetReceiveMask(pDevice,
-			pDevice->ReceiveMask & ~LM_ACCEPT_ALL_MULTICAST);
-	}
-	if (dev->flags & IFF_PROMISC) {
-		if (!(pDevice->ReceiveMask & LM_PROMISCUOUS_MODE)) {
-			LM_SetReceiveMask(pDevice,
-				pDevice->ReceiveMask | LM_PROMISCUOUS_MODE);
-		}
-	}
-	else if (pDevice->ReceiveMask & LM_PROMISCUOUS_MODE) {
-		LM_SetReceiveMask(pDevice,
-			pDevice->ReceiveMask & ~LM_PROMISCUOUS_MODE);
-	}
-}
-
-/*
- * Set the hardware MAC address.
- */
-STATIC int bcm5700_set_mac_addr(struct net_device *dev, void *p)
-{
-	struct sockaddr *addr=p;
-	PLM_DEVICE_BLOCK pDevice = (PLM_DEVICE_BLOCK) dev->priv;
-	UM_DEVICE_BLOCK *pUmDevice = (UM_DEVICE_BLOCK *) pDevice;
-
-	memcpy(dev->dev_addr, addr->sa_data,dev->addr_len);
-	if (pUmDevice->opened)
-		LM_SetMacAddress(pDevice, dev->dev_addr);
-	return 0;
-}
-
-#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
-STATIC int bcm5700_change_mtu(struct net_device *dev, int new_mtu)
-{
-	int pkt_size = new_mtu + ETHERNET_PACKET_HEADER_SIZE;
-	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK)dev->priv;
-	PLM_DEVICE_BLOCK pDevice = &pUmDevice->lm_dev;
-	unsigned long flags;
-	int reinit = 0;
-
-	if ((pkt_size < MIN_ETHERNET_PACKET_SIZE_NO_CRC) || 
-		(pkt_size > MAX_ETHERNET_JUMBO_PACKET_SIZE_NO_CRC)) {
-
-		return -EINVAL;
-	}
-	if ((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705) &&
-		(pkt_size > MAX_ETHERNET_PACKET_SIZE_NO_CRC)) {
-
-		return -EINVAL;
-	}
-	if (pUmDevice->suspended)
-		return -EAGAIN;
-
-	if (pUmDevice->opened && (new_mtu != dev->mtu) &&
-		(T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5705)) {
-		reinit = 1;
-	}
-
-	BCM5700_PHY_LOCK(pUmDevice, flags);
-	if (reinit) {
-		netif_stop_queue(dev);
-		bcm5700_shutdown(pUmDevice);
-		bcm5700_freemem(dev);
-	}
-
-	dev->mtu = new_mtu;
-	if (pkt_size < MAX_ETHERNET_PACKET_SIZE_NO_CRC) {
-		pDevice->RxMtu = pDevice->TxMtu =
-			MAX_ETHERNET_PACKET_SIZE_NO_CRC;
-	}
-	else {
-		pDevice->RxMtu = pDevice->TxMtu = pkt_size;
-	}
-
-	if (dev->mtu <= 1514) {
-		pDevice->RxJumboDescCnt = 0;
-	}
-	else {
-		pDevice->RxJumboDescCnt =
-			rx_jumbo_desc_cnt[pUmDevice->index];
-	}
-	pDevice->RxPacketDescCnt = pDevice->RxJumboDescCnt +
-		pDevice->RxStdDescCnt;
-
-	pDevice->RxJumboBufferSize = (pDevice->RxMtu + 8 /* CRC + VLAN */ +
-		COMMON_CACHE_LINE_SIZE-1) & ~COMMON_CACHE_LINE_MASK;
-
-	if (reinit) {
-		LM_InitializeAdapter(pDevice);
-		bcm5700_set_vlan_mode(pUmDevice);
-		bcm5700_init_counters(pUmDevice);
-		if (memcmp(dev->dev_addr, pDevice->NodeAddress, 6)) {
-			LM_SetMacAddress(pDevice, dev->dev_addr);
-		}
-		netif_start_queue(dev);
-		bcm5700_intr_on(pUmDevice);
-	}
-	BCM5700_PHY_UNLOCK(pUmDevice, flags);
-
-	return 0;
-}
-#endif
-
-
-#if (LINUX_VERSION_CODE < 0x020300)
-
-int
-bcm5700_probe(struct net_device *dev)
-{
-	int cards_found = 0;
-	struct pci_dev *pdev = NULL;
-	struct pci_device_id *pci_tbl;
-	u16 ssvid, ssid;
-
-	if ( ! pci_present())
-		return -ENODEV;
-
-	pci_tbl = bcm5700_pci_tbl;
-	while ((pdev = pci_find_class(PCI_CLASS_NETWORK_ETHERNET << 8, pdev))) {
-		int idx;
-
-		pci_read_config_word(pdev, PCI_SUBSYSTEM_VENDOR_ID, &ssvid);
-		pci_read_config_word(pdev, PCI_SUBSYSTEM_ID, &ssid);
-		for (idx = 0; pci_tbl[idx].vendor; idx++) {
-			if ((pci_tbl[idx].vendor == PCI_ANY_ID ||
-				pci_tbl[idx].vendor == pdev->vendor) &&
-				(pci_tbl[idx].device == PCI_ANY_ID ||
-				pci_tbl[idx].device == pdev->device) &&
-				(pci_tbl[idx].subvendor == PCI_ANY_ID ||
-				pci_tbl[idx].subvendor == ssvid) &&
-				(pci_tbl[idx].subdevice == PCI_ANY_ID ||
-				pci_tbl[idx].subdevice == ssid))
-			{
-
-				break;
-			}
-		}
-		if (pci_tbl[idx].vendor == 0)
-			continue;
-
-
-		if (bcm5700_init_one(pdev, &pci_tbl[idx]) == 0)
-			cards_found++;
-	}
-
-	return cards_found ? 0 : -ENODEV;
-}
-
-#ifdef MODULE
-int init_module(void)
-{
-	return bcm5700_probe(NULL);
-}
-
-void cleanup_module(void)
-{
-	struct net_device *next_dev;
-	PUM_DEVICE_BLOCK pUmDevice;
-
-	/* No need to check MOD_IN_USE, as sys_delete_module() checks. */
-	while (root_tigon3_dev) {
-		pUmDevice = (PUM_DEVICE_BLOCK)root_tigon3_dev->priv;
-#ifdef BCM_PROC_FS
-		bcm5700_proc_remove_dev(root_tigon3_dev); 
-#endif
-		next_dev = pUmDevice->next_module;
-		unregister_netdev(root_tigon3_dev);
-		if (pUmDevice->lm_dev.pMappedMemBase)
-			iounmap(pUmDevice->lm_dev.pMappedMemBase);
-#if (LINUX_VERSION_CODE < 0x020600)
-		kfree(root_tigon3_dev);
-#else
-		free_netdev(root_tigon3_dev);
-#endif
-		root_tigon3_dev = next_dev;
-	}
-#ifdef BCM_IOCTL32
-	unregister_ioctl32_conversion(SIOCNICE);
-#endif
-}
-
-#endif  /* MODULE */
-#else	/* LINUX_VERSION_CODE < 0x020300 */
-
-#if (LINUX_VERSION_CODE >= 0x020406)
-static int bcm5700_suspend (struct pci_dev *pdev, u32 state)
-#else
-static void bcm5700_suspend (struct pci_dev *pdev)
-#endif
-{
-	struct net_device *dev = (struct net_device *) pci_get_drvdata(pdev);
-	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK) dev->priv;
-	PLM_DEVICE_BLOCK pDevice = &pUmDevice->lm_dev;
-
-	if (!netif_running(dev))
-#if (LINUX_VERSION_CODE >= 0x020406)
-		return 0;
-#else
-		return;
-#endif
-
-	netif_device_detach (dev);
-	bcm5700_shutdown(pUmDevice);
-	LM_SetPowerState(pDevice, LM_POWER_STATE_D3);
-
-/*	pci_power_off(pdev, -1);*/
-#if (LINUX_VERSION_CODE >= 0x020406)
-	return 0;
-#endif
-}
-
-
-#if (LINUX_VERSION_CODE >= 0x020406)
-static int bcm5700_resume(struct pci_dev *pdev)
-#else
-static void bcm5700_resume(struct pci_dev *pdev)
-#endif
-{
-	struct net_device *dev = (struct net_device *) pci_get_drvdata(pdev);
-	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK) dev->priv;
-	PLM_DEVICE_BLOCK pDevice = &pUmDevice->lm_dev;
-
-	if (!netif_running(dev))
-#if (LINUX_VERSION_CODE >= 0x020406)
-		return 0;
-#else
-		return;
-#endif
-/*	pci_power_on(pdev);*/
-	netif_device_attach(dev);
-	LM_SetPowerState(pDevice, LM_POWER_STATE_D0);
-	MM_InitializeUmPackets(pDevice);
-	bcm5700_reset(dev);
-#if (LINUX_VERSION_CODE >= 0x020406)
-	return 0;
-#endif
-}
-
-
-static struct pci_driver bcm5700_pci_driver = {
-	name:		bcm5700_driver,
-	id_table:	bcm5700_pci_tbl,
-	probe:		bcm5700_init_one,
-	remove:		__devexit_p(bcm5700_remove_one),
-	suspend:	bcm5700_suspend,
-	resume:		bcm5700_resume,
-};
-
-
-static int __init bcm5700_init_module (void)
-{
-	return pci_module_init(&bcm5700_pci_driver);
-}
-
-
-static void __exit bcm5700_cleanup_module (void)
-{
-	pci_unregister_driver(&bcm5700_pci_driver);
-}
-
-
-module_init(bcm5700_init_module);
-module_exit(bcm5700_cleanup_module);
-#endif
-
-/*
- * Middle Module
- *
- */
-
-
-#ifdef BCM_NAPI_RXPOLL
-LM_STATUS
-MM_ScheduleRxPoll(LM_DEVICE_BLOCK *pDevice)
-{
-	struct net_device *dev = ((UM_DEVICE_BLOCK *) pDevice)->dev;
-
-	if (netif_rx_schedule_prep(dev)) {
-		__netif_rx_schedule(dev);
-		return LM_STATUS_SUCCESS;
-	}
-	return LM_STATUS_FAILURE;
-}
-#endif
-
-LM_STATUS
-MM_ReadConfig16(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Offset,
-	LM_UINT16 *pValue16)
-{
-	UM_DEVICE_BLOCK *pUmDevice;
-
-	pUmDevice = (UM_DEVICE_BLOCK *) pDevice;
-	pci_read_config_word(pUmDevice->pdev, Offset, (u16 *) pValue16);
-	return LM_STATUS_SUCCESS;
-}
-
-LM_STATUS
-MM_ReadConfig32(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Offset,
-	LM_UINT32 *pValue32)
-{
-	UM_DEVICE_BLOCK *pUmDevice;
-
-	pUmDevice = (UM_DEVICE_BLOCK *) pDevice;
-	pci_read_config_dword(pUmDevice->pdev, Offset, (u32 *) pValue32);
-	return LM_STATUS_SUCCESS;
-}
-
-LM_STATUS
-MM_WriteConfig16(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Offset,
-	LM_UINT16 Value16)
-{
-	UM_DEVICE_BLOCK *pUmDevice;
-
-	pUmDevice = (UM_DEVICE_BLOCK *) pDevice;
-	pci_write_config_word(pUmDevice->pdev, Offset, Value16);
-	return LM_STATUS_SUCCESS;
-}
-
-LM_STATUS
-MM_WriteConfig32(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Offset,
-	LM_UINT32 Value32)
-{
-	UM_DEVICE_BLOCK *pUmDevice;
-
-	pUmDevice = (UM_DEVICE_BLOCK *) pDevice;
-	pci_write_config_dword(pUmDevice->pdev, Offset, Value32);
-	return LM_STATUS_SUCCESS;
-}
-
-LM_STATUS
-MM_AllocateSharedMemory(PLM_DEVICE_BLOCK pDevice, LM_UINT32 BlockSize,
-	PLM_VOID *pMemoryBlockVirt, PLM_PHYSICAL_ADDRESS pMemoryBlockPhy,
-	LM_BOOL Cached)
-{
-	PLM_VOID pvirt;
-	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK) pDevice;
-	dma_addr_t mapping;
-
-	pvirt = pci_alloc_consistent(pUmDevice->pdev, BlockSize,
-					       &mapping);
-	if (!pvirt) {
-		return LM_STATUS_FAILURE;
-	}
-	pUmDevice->mem_list[pUmDevice->mem_list_num] = pvirt;
-	pUmDevice->dma_list[pUmDevice->mem_list_num] = mapping;
-	pUmDevice->mem_size_list[pUmDevice->mem_list_num++] = BlockSize;
-	memset(pvirt, 0, BlockSize);
-	*pMemoryBlockVirt = (PLM_VOID) pvirt;
-	MM_SetAddr(pMemoryBlockPhy, mapping);
-	return LM_STATUS_SUCCESS;
-}
-
-LM_STATUS
-MM_AllocateMemory(PLM_DEVICE_BLOCK pDevice, LM_UINT32 BlockSize,
-	PLM_VOID *pMemoryBlockVirt)
-{
-	PLM_VOID pvirt;
-	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK) pDevice;
-
-
-	/* Maximum in slab.c */
-	if (BlockSize > 131072) {
-		goto MM_Alloc_error;
-	}
-
-	pvirt = kmalloc(BlockSize, GFP_KERNEL);
-	if (!pvirt) {
-		goto MM_Alloc_error;
-	}
-	pUmDevice->mem_list[pUmDevice->mem_list_num] = pvirt;
-	pUmDevice->dma_list[pUmDevice->mem_list_num] = 0;
-	pUmDevice->mem_size_list[pUmDevice->mem_list_num++] = 0;
-	/* mem_size_list[i] == 0 indicates that the memory should be freed */
-	/* using kfree */
-	memset(pvirt, 0, BlockSize);
-	*pMemoryBlockVirt = pvirt;
-	return LM_STATUS_SUCCESS;
-
-MM_Alloc_error:
-	printk(KERN_WARNING "%s: Memory allocation failed - buffer parameters may be set too high\n", pUmDevice->dev->name);
-	return LM_STATUS_FAILURE;
-}
-
-LM_STATUS
-MM_MapMemBase(PLM_DEVICE_BLOCK pDevice)
-{
-	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK) pDevice;
-
-	pDevice->pMappedMemBase = ioremap_nocache(
-		pci_resource_start(pUmDevice->pdev, 0), sizeof(T3_STD_MEM_MAP));
-	return LM_STATUS_SUCCESS;
-}
-
-LM_STATUS
-MM_InitializeUmPackets(PLM_DEVICE_BLOCK pDevice)
-{
-	unsigned int i;
-	struct sk_buff *skb;
-	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK) pDevice;
-	PUM_PACKET pUmPacket;
-	PLM_PACKET pPacket;
-
-	for (i = 0; i < pDevice->RxPacketDescCnt; i++) {
-		pPacket = QQ_PopHead(&pDevice->RxPacketFreeQ.Container);
-		pUmPacket = (PUM_PACKET) pPacket;
-		if (pPacket == 0) {
-			printk(KERN_DEBUG "Bad RxPacketFreeQ\n");
-		}
-		if (pUmPacket->skbuff == 0) {
-			skb = dev_alloc_skb(pPacket->u.Rx.RxBufferSize + 2);
-			if (skb == 0) {
-				pUmPacket->skbuff = 0;
-				QQ_PushTail(
-					&pUmDevice->rx_out_of_buf_q.Container,
-					pPacket);
-				continue;
-			}
-			pUmPacket->skbuff = skb;
-			skb->dev = pUmDevice->dev;
-			skb_reserve(skb, pUmDevice->rx_buf_align);
-		}
-		QQ_PushTail(&pDevice->RxPacketFreeQ.Container, pPacket);
-	}
-	if (T3_ASIC_REV(pUmDevice->lm_dev.ChipRevId) == T3_ASIC_REV_5700) {
-		/* reallocate buffers in the ISR */
-		pUmDevice->rx_buf_repl_thresh = 0;
-		pUmDevice->rx_buf_repl_panic_thresh = 0;
-		pUmDevice->rx_buf_repl_isr_limit = 0;
-	}
-	else {
-		pUmDevice->rx_buf_repl_thresh = pDevice->RxPacketDescCnt / 8;
-		pUmDevice->rx_buf_repl_panic_thresh =
-			pDevice->RxPacketDescCnt  * 7 / 8;
-
-		/* This limits the time spent in the ISR when the receiver */
-		/* is in a steady state of being overrun. */
-		pUmDevice->rx_buf_repl_isr_limit = pDevice->RxPacketDescCnt / 8;
-
-#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
-		if (pDevice->RxJumboDescCnt != 0) {
-			if (pUmDevice->rx_buf_repl_thresh >=
-				pDevice->RxJumboDescCnt) {
-
-				pUmDevice->rx_buf_repl_thresh = 
-				pUmDevice->rx_buf_repl_panic_thresh = 
-					pDevice->RxJumboDescCnt - 1;
-			}
-			if (pUmDevice->rx_buf_repl_thresh >=
-				pDevice->RxStdDescCnt) {
-
-				pUmDevice->rx_buf_repl_thresh = 
-				pUmDevice->rx_buf_repl_panic_thresh = 
-					pDevice->RxStdDescCnt - 1;
-			}
-		}
-#endif
-	}
-	return LM_STATUS_SUCCESS;
-}
-
-LM_STATUS
-MM_GetConfig(PLM_DEVICE_BLOCK pDevice)
-{
-	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK) pDevice;
-	int index = pUmDevice->index;
-	struct net_device *dev = pUmDevice->dev;
-
-	bcm5700_validate_param_range(pUmDevice, &auto_speed[index], "auto_speed",
-		0, 1, 1);
-	if (auto_speed[index] == 0)
-		pDevice->DisableAutoNeg = TRUE;
-	else
-		pDevice->DisableAutoNeg = FALSE;
-
-	if (line_speed[index] == 0) {
-		pDevice->RequestedLineSpeed = LM_LINE_SPEED_AUTO;
-		pDevice->DisableAutoNeg = FALSE;
-	}
-	else {
-		bcm5700_validate_param_range(pUmDevice, &full_duplex[index],
-			"full_duplex", 0, 1, 1);
-		if (full_duplex[index]) {
-			pDevice->RequestedDuplexMode = LM_DUPLEX_MODE_FULL;
-		}
-		else {
-			pDevice->RequestedDuplexMode = LM_DUPLEX_MODE_HALF;
-		}
-
-		if (line_speed[index] == 1000) {
-			pDevice->RequestedLineSpeed = LM_LINE_SPEED_1000MBPS;
-			if (pDevice->No1000) {
-				pDevice->RequestedLineSpeed =
-					LM_LINE_SPEED_100MBPS;
-				printk(KERN_WARNING "%s-%d: Invalid line_speed parameter (1000), using 100\n", bcm5700_driver, index);
-			}
-			else {
-				if (pDevice->EnableTbi && !full_duplex[index]) {
-
-					printk(KERN_WARNING "%s-%d: Invalid full_duplex parameter (0) for fiber, using 1\n", bcm5700_driver, index);
-					pDevice->RequestedDuplexMode =
-						LM_DUPLEX_MODE_FULL;
-				}
-
-				if (!pDevice->EnableTbi && !auto_speed[index]) {
-					printk(KERN_WARNING "%s-%d: Invalid auto_speed parameter (0) for copper, using 1\n", bcm5700_driver, index);
-					pDevice->DisableAutoNeg = FALSE;
-				}
-			}
-		}
-		else if (line_speed[index] == 100) {
-			pDevice->RequestedLineSpeed = LM_LINE_SPEED_100MBPS;
-		}
-		else if (line_speed[index] == 10) {
-			pDevice->RequestedLineSpeed = LM_LINE_SPEED_10MBPS;
-		}
-		else {
-			pDevice->RequestedLineSpeed = LM_LINE_SPEED_AUTO;
-			pDevice->DisableAutoNeg = FALSE;
-			printk(KERN_WARNING "%s-%d: Invalid line_speed parameter (%d), using 0\n", bcm5700_driver, index, line_speed[index]);
-		}
-
-	}
-	pDevice->FlowControlCap = 0;
-	bcm5700_validate_param_range(pUmDevice, &rx_flow_control[index],
-		"rx_flow_control", 0, 1, 0);
-	if (rx_flow_control[index] != 0) {
-		pDevice->FlowControlCap |= LM_FLOW_CONTROL_RECEIVE_PAUSE;
-	}
-	bcm5700_validate_param_range(pUmDevice, &tx_flow_control[index],
-		"tx_flow_control", 0, 1, 0);
-	if (tx_flow_control[index] != 0) {
-		pDevice->FlowControlCap |= LM_FLOW_CONTROL_TRANSMIT_PAUSE;
-	}
-	bcm5700_validate_param_range(pUmDevice, &auto_flow_control[index],
-		"auto_flow_control", 0, 1, 0);
-	if (auto_flow_control[index] != 0) {
-		if (pDevice->DisableAutoNeg == FALSE) {
-
-			pDevice->FlowControlCap |= LM_FLOW_CONTROL_AUTO_PAUSE;
-			if ((tx_flow_control[index] == 0) &&
-				(rx_flow_control[index] == 0)) {
-
-				pDevice->FlowControlCap |=
-					LM_FLOW_CONTROL_TRANSMIT_PAUSE |
-					LM_FLOW_CONTROL_RECEIVE_PAUSE;
-			}
-		}
-	}
-
-	if (dev->mtu > 1500) {
-		pDevice->RxMtu = dev->mtu + 14;
-	}
-
-	if (T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5700) {
-		pDevice->UseTaggedStatus = TRUE;
-		pUmDevice->timer_interval = HZ;
-		if ((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5703) &&
-			pDevice->EnableTbi) {
-			pUmDevice->timer_interval = HZ/4;
-		}
-	}
-	else {
-		pUmDevice->timer_interval = HZ/10;
-	}
-
-	bcm5700_validate_param_range(pUmDevice, &tx_pkt_desc_cnt[index],
-		"tx_pkt_desc_cnt", 1, MAX_TX_PACKET_DESC_COUNT-1, TX_DESC_CNT);
-	pDevice->TxPacketDescCnt = tx_pkt_desc_cnt[index];
-	bcm5700_validate_param_range(pUmDevice, &rx_std_desc_cnt[index],
-		"rx_std_desc_cnt", 1, T3_STD_RCV_RCB_ENTRY_COUNT-1,
-		RX_DESC_CNT);
-	pDevice->RxStdDescCnt = rx_std_desc_cnt[index];
-
-#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
-	bcm5700_validate_param_range(pUmDevice, &rx_jumbo_desc_cnt[index],
-		"rx_jumbo_desc_cnt", 1, T3_JUMBO_RCV_RCB_ENTRY_COUNT-1,
-		JBO_DESC_CNT);
-
-	if (mtu[index] <= 1514)
-		pDevice->RxJumboDescCnt = 0;
-	else
-		pDevice->RxJumboDescCnt = rx_jumbo_desc_cnt[index];
-#endif
-
-#ifdef BCM_INT_COAL
-	bcm5700_validate_param_range(pUmDevice, &adaptive_coalesce[index],
-		"adaptive_coalesce", 0, 1, 1);
-#ifdef BCM_NAPI_RXPOLL
-	if (adaptive_coalesce[index]) {
-		printk(KERN_WARNING "%s-%d: adaptive_coalesce not used in NAPI mode\n", bcm5700_driver, index);
-		adaptive_coalesce[index] = 0;
-
-	}
-#endif
-	pUmDevice->adaptive_coalesce = adaptive_coalesce[index];
-	if (!pUmDevice->adaptive_coalesce) {
-		bcm5700_validate_param_range(pUmDevice,
-			&rx_coalesce_ticks[index], "rx_coalesce_ticks", 0,
-			MAX_RX_COALESCING_TICKS, RX_COAL_TK);
-		if ((rx_coalesce_ticks[index] == 0) &&
-			(rx_max_coalesce_frames[index] == 0)) {
-
-			printk(KERN_WARNING "%s-%d: Conflicting rx_coalesce_ticks (0) and rx_max_coalesce_frames (0) parameters, using %d and %d respectively\n",
-				bcm5700_driver, index, RX_COAL_TK, RX_COAL_FM);
-
-			rx_coalesce_ticks[index] = RX_COAL_TK;
-			rx_max_coalesce_frames[index] = RX_COAL_FM;
-		}
-		pDevice->RxCoalescingTicks = rx_coalesce_ticks[index];
-		pUmDevice->rx_curr_coalesce_ticks = pDevice->RxCoalescingTicks;
-
-		bcm5700_validate_param_range(pUmDevice,
-			&rx_max_coalesce_frames[index],
-			"rx_max_coalesce_frames", 0,
-			MAX_RX_MAX_COALESCED_FRAMES, RX_COAL_FM);
-
-		pDevice->RxMaxCoalescedFrames = rx_max_coalesce_frames[index];
-		pUmDevice->rx_curr_coalesce_frames =
-			pDevice->RxMaxCoalescedFrames;
-
-		bcm5700_validate_param_range(pUmDevice,
-			&tx_coalesce_ticks[index], "tx_coalesce_ticks", 0,
-			MAX_TX_COALESCING_TICKS, TX_COAL_TK);
-		if ((tx_coalesce_ticks[index] == 0) &&
-			(tx_max_coalesce_frames[index] == 0)) {
-
-			printk(KERN_WARNING "%s-%d: Conflicting tx_coalesce_ticks (0) and tx_max_coalesce_frames (0) parameters, using %d and %d respectively\n",
-				bcm5700_driver, index, TX_COAL_TK, TX_COAL_FM);
-
-			tx_coalesce_ticks[index] = TX_COAL_TK;
-			tx_max_coalesce_frames[index] = TX_COAL_FM;
-		}
-		pDevice->TxCoalescingTicks = tx_coalesce_ticks[index];
-		bcm5700_validate_param_range(pUmDevice,
-			&tx_max_coalesce_frames[index],
-			"tx_max_coalesce_frames", 0,
-			MAX_TX_MAX_COALESCED_FRAMES, TX_COAL_FM);
-		pDevice->TxMaxCoalescedFrames = tx_max_coalesce_frames[index];
-		pUmDevice->tx_curr_coalesce_frames =
-			pDevice->TxMaxCoalescedFrames;
-
-		bcm5700_validate_param_range(pUmDevice,
-			&stats_coalesce_ticks[index], "stats_coalesce_ticks",
-			0, MAX_STATS_COALESCING_TICKS, ST_COAL_TK);
-		if ((stats_coalesce_ticks[index] > 0) &&
-			(stats_coalesce_ticks[index] < 100)) {
-			printk(KERN_WARNING "%s-%d: Invalid stats_coalesce_ticks parameter (%u), using 100\n", bcm5700_driver, index, (unsigned int) stats_coalesce_ticks[index]);
-			stats_coalesce_ticks[index] = 100;
-		}
-		pDevice->StatsCoalescingTicks = stats_coalesce_ticks[index];
-		pDevice->StatsCoalescingTicks = stats_coalesce_ticks[index];
-	}
-	else {
-		pUmDevice->rx_curr_coalesce_frames = RX_COAL_FM;
-		pUmDevice->rx_curr_coalesce_ticks = RX_COAL_TK;
-		pUmDevice->tx_curr_coalesce_frames = TX_COAL_FM;
-	}
-#endif
-
-#ifdef BCM_WOL
-	bcm5700_validate_param_range(pUmDevice, &enable_wol[index],
-		"enable_wol", 0, 1, 0);
-	if (enable_wol[index]) {
-		pDevice->WakeUpModeCap = LM_WAKE_UP_MODE_MAGIC_PACKET;
-		pDevice->WakeUpMode = LM_WAKE_UP_MODE_MAGIC_PACKET;
-	}
-#endif
-#ifdef BCM_NIC_SEND_BD
-	bcm5700_validate_param_range(pUmDevice, &nic_tx_bd[index], "nic_tx_bd",
-		0, 1, 0);
-	pDevice->NicSendBd = nic_tx_bd[index];
-	if ((pDevice->EnablePciXFix) ||
-		(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705)) {
-		if (pDevice->NicSendBd) {
-			pDevice->NicSendBd = FALSE;
-			printk(KERN_WARNING "%s-%d: Nic Send BDs not available on this NIC or not possible on this system\n", bcm5700_driver, index);
-		}
-	}
-#endif
-#if INCLUDE_TBI_SUPPORT
-	pDevice->PollTbiLink = TRUE;
-	if (((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5704) ||
-	    (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5703))
-		 && pDevice->EnableTbi)
-	{
-		/* just poll since we have hardware autoneg. in 5704 */
-		pDevice->NoTbiInterrupt = TRUE;
-	}
-#endif
-	bcm5700_validate_param_range(pUmDevice, &scatter_gather[index],
-		"scatter_gather", 0, 1, 1);
-	bcm5700_validate_param_range(pUmDevice, &tx_checksum[index],
-		"tx_checksum", 0, 1, 1);
-	bcm5700_validate_param_range(pUmDevice, &rx_checksum[index],
-		"rx_checksum", 0, 1, 1);
-	if (!(pDevice->TaskOffloadCap & LM_TASK_OFFLOAD_TX_TCP_CHECKSUM)) {
-		if (tx_checksum[index] || rx_checksum[index]) {
-
-			pDevice->TaskToOffload = LM_TASK_OFFLOAD_NONE; 
-			printk(KERN_WARNING "%s-%d: Checksum offload not available on this NIC\n", bcm5700_driver, index);
-		}
-	}
-	else {
-		if (rx_checksum[index]) {
-			pDevice->TaskToOffload |=
-				LM_TASK_OFFLOAD_RX_TCP_CHECKSUM |
-				LM_TASK_OFFLOAD_RX_UDP_CHECKSUM;
-		}
-		if (tx_checksum[index]) {
-			pDevice->TaskToOffload |=
-				LM_TASK_OFFLOAD_TX_TCP_CHECKSUM |
-				LM_TASK_OFFLOAD_TX_UDP_CHECKSUM;
-			pDevice->NoTxPseudoHdrChksum = TRUE;
-		}
-	}
-#ifdef BCM_TSO
-	bcm5700_validate_param_range(pUmDevice, &enable_tso[index],
-		"enable_tso", 0, 1, 1);
-
-	/* Always enable TSO firmware if supported */
-	/* This way we can turn it on or off on the fly */
-	if (pDevice->TaskOffloadCap & LM_TASK_OFFLOAD_TCP_SEGMENTATION)
-	{
-		pDevice->TaskToOffload |=
-			LM_TASK_OFFLOAD_TCP_SEGMENTATION;
-	}
-	if (enable_tso[index] &&
-		!(pDevice->TaskToOffload & LM_TASK_OFFLOAD_TCP_SEGMENTATION))
-	{
-		printk(KERN_WARNING "%s-%d: TSO not available on this NIC\n", bcm5700_driver, index);
-	}
-#endif
-#ifdef BCM_ASF
-	bcm5700_validate_param_range(pUmDevice, &vlan_tag_mode[index],
-		"vlan_strip_mode", 0, 2, 0);
-	pUmDevice->vlan_tag_mode = vlan_tag_mode[index];
-#else
-	pUmDevice->vlan_tag_mode = VLAN_TAG_MODE_NORMAL_STRIP;
-#endif
-	return LM_STATUS_SUCCESS;
-}
-
-LM_STATUS
-MM_IndicateRxPackets(PLM_DEVICE_BLOCK pDevice)
-{
-	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK) pDevice;
-	PLM_PACKET pPacket;
-	PUM_PACKET pUmPacket;
-	struct sk_buff *skb;
-	int size;
-	int vlan_tag_size = 0;
-
-	if (pDevice->ReceiveMask & LM_KEEP_VLAN_TAG)
-		vlan_tag_size = 4;
-
-	while (1) {
-		pPacket = (PLM_PACKET)
-			QQ_PopHead(&pDevice->RxPacketReceivedQ.Container);
-		if (pPacket == 0)
-			break;
-		pUmPacket = (PUM_PACKET) pPacket;
-#if ! defined(NO_PCI_UNMAP)
-		pci_unmap_single(pUmDevice->pdev,
-				pci_unmap_addr(pUmPacket, map[0]),
-				pPacket->u.Rx.RxBufferSize,
-				PCI_DMA_FROMDEVICE);
-#endif
-		if ((pPacket->PacketStatus != LM_STATUS_SUCCESS) ||
-			((size = pPacket->PacketSize) >
-			(pDevice->RxMtu + vlan_tag_size))) {
-
-			/* reuse skb */
-#ifdef BCM_TASKLET
-			QQ_PushTail(&pUmDevice->rx_out_of_buf_q.Container, pPacket);
-#else
-			QQ_PushTail(&pDevice->RxPacketFreeQ.Container, pPacket);
-#endif
-			pUmDevice->rx_misc_errors++;
-			continue;
-		}
-		skb = pUmPacket->skbuff;
-		skb_put(skb, size);
-		skb->pkt_type = 0;
-		skb->protocol = eth_type_trans(skb, skb->dev);
-		if (size > pDevice->RxMtu) {
-			/* Make sure we have a valid VLAN tag */
-			if (htons(skb->protocol) != 0x8100) {
-				dev_kfree_skb_irq(skb);
-				pUmDevice->rx_misc_errors++;
-				goto drop_rx;
-			}
-		}
-		if ((pPacket->Flags & RCV_BD_FLAG_TCP_UDP_CHKSUM_FIELD) &&
-			(pDevice->TaskToOffload &
-				LM_TASK_OFFLOAD_RX_TCP_CHECKSUM)) {
-			if (pPacket->u.Rx.TcpUdpChecksum == 0xffff) {
-
-				skb->ip_summed = CHECKSUM_UNNECESSARY;
-#if TIGON3_DEBUG
-				pUmDevice->rx_good_chksum_count++;
-#endif
-			}
-			else {
-				skb->ip_summed = CHECKSUM_NONE;
-				pUmDevice->rx_bad_chksum_count++;
-			}
-		}
-		else {
-			skb->ip_summed = CHECKSUM_NONE;
-		}
-#ifdef NICE_SUPPORT
-		if( pUmDevice->nice_rx ) {
-			vlan_tag_t *vlan_tag;
-
-			vlan_tag = (vlan_tag_t *) &skb->cb[0];
-			if (pPacket->Flags & RCV_BD_FLAG_VLAN_TAG) {
-				vlan_tag->signature = 0x7777;
-				vlan_tag->tag = pPacket->VlanTag;
-			}
-			else {
-				vlan_tag->signature = 0;
-			}
-			pUmDevice->nice_rx(skb, pUmDevice->nice_ctx);
-		}
-		else
-#endif
-		{
-#ifdef BCM_VLAN
-			if (pUmDevice->vlgrp &&
-				(pPacket->Flags & RCV_BD_FLAG_VLAN_TAG)) {
-
-#ifdef BCM_NAPI_RXPOLL
-				vlan_hwaccel_receive_skb(skb, pUmDevice->vlgrp,
-					pPacket->VlanTag);
-#else
-				vlan_hwaccel_rx(skb, pUmDevice->vlgrp,
-					pPacket->VlanTag);
-#endif
-			}
-			else
-#endif
-			{
-#ifdef BCM_NAPI_RXPOLL
-				netif_receive_skb(skb);
-#else
-				netif_rx(skb);
-#endif
-			}
-		}
-		pUmDevice->dev->last_rx = jiffies;
-
-drop_rx:
-#ifdef BCM_TASKLET
-		pUmPacket->skbuff = 0;
-		QQ_PushTail(&pUmDevice->rx_out_of_buf_q.Container, pPacket);
-#else
-		skb = dev_alloc_skb(pPacket->u.Rx.RxBufferSize + 2);
-		if (skb == 0) {
-			pUmPacket->skbuff = 0;
-			QQ_PushTail(&pUmDevice->rx_out_of_buf_q.Container, pPacket);
-		}
-		else {
-			pUmPacket->skbuff = skb;
-			skb->dev = pUmDevice->dev;
-			skb_reserve(skb, pUmDevice->rx_buf_align);
-			QQ_PushTail(&pDevice->RxPacketFreeQ.Container, pPacket);
-		}
-#endif
-	}
-	return LM_STATUS_SUCCESS;
-}
-
-LM_STATUS
-MM_CoalesceTxBuffer(PLM_DEVICE_BLOCK pDevice, PLM_PACKET pPacket)
-{
-	PUM_PACKET pUmPacket = (PUM_PACKET) pPacket;
-	struct sk_buff *skb = pUmPacket->skbuff;
-	struct sk_buff *nskb;
-#if ! defined(NO_PCI_UNMAP)
-	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK) pDevice;
-
-	pci_unmap_single(pUmDevice->pdev,
-			pci_unmap_addr(pUmPacket, map[0]),
-			pci_unmap_len(pUmPacket, map_len[0]),
-			PCI_DMA_TODEVICE);
-#if MAX_SKB_FRAGS
-	{
-		int i;
-
-		for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
-			pci_unmap_page(pUmDevice->pdev,
-				pci_unmap_addr(pUmPacket, map[i + 1]),
-				pci_unmap_len(pUmPacket, map_len[i + 1]),
-				PCI_DMA_TODEVICE);
-		}
-	}
-#endif
-#endif
-	if ((nskb = skb_copy(skb, GFP_ATOMIC))) {
-		pUmPacket->lm_packet.u.Tx.FragCount = 1;
-		dev_kfree_skb(skb);
-		pUmPacket->skbuff = nskb;
-		return LM_STATUS_SUCCESS;
-	}
-	dev_kfree_skb(skb);
-	pUmPacket->skbuff = 0;
-	return LM_STATUS_FAILURE;
-}
-
-/* Returns 1 if not all buffers are allocated */
-STATIC int
-replenish_rx_buffers(PUM_DEVICE_BLOCK pUmDevice, int max)
-{
-	PLM_PACKET pPacket;
-	PUM_PACKET pUmPacket;
-	PLM_DEVICE_BLOCK pDevice = (PLM_DEVICE_BLOCK) pUmDevice;
-	struct sk_buff *skb;
-	int queue_rx = 0;
-	int alloc_cnt = 0;
-	int ret = 0;
-
-	while ((pUmPacket = (PUM_PACKET)
-		QQ_PopHead(&pUmDevice->rx_out_of_buf_q.Container)) != 0) {
-		pPacket = (PLM_PACKET) pUmPacket;
-		if (pUmPacket->skbuff) {
-			/* reuse an old skb */
-			QQ_PushTail(&pDevice->RxPacketFreeQ.Container, pPacket);
-			queue_rx = 1;
-			continue;
-		}
-		if ((skb = dev_alloc_skb(pPacket->u.Rx.RxBufferSize + 2)) == 0) {
-			QQ_PushHead(&pUmDevice->rx_out_of_buf_q.Container,
-				pPacket);
-			ret = 1;
-			break;
-		}
-		pUmPacket->skbuff = skb;
-		skb->dev = pUmDevice->dev;
-		skb_reserve(skb, pUmDevice->rx_buf_align);
-		QQ_PushTail(&pDevice->RxPacketFreeQ.Container, pPacket);
-		queue_rx = 1;
-		if (max > 0) {
-			alloc_cnt++;
-			if (alloc_cnt >= max)
-				break;
-		}
-	}
-	if (queue_rx || pDevice->QueueAgain) {
-		LM_QueueRxPackets(pDevice);
-	}
-	return ret;
-}
-
-LM_STATUS
-MM_IndicateTxPackets(PLM_DEVICE_BLOCK pDevice)
-{
-	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK) pDevice;
-	PLM_PACKET pPacket;
-	PUM_PACKET pUmPacket;
-	struct sk_buff *skb;
-#if ! defined(NO_PCI_UNMAP) && MAX_SKB_FRAGS
-	int i;
-#endif
-
-	while (1) {
-		pPacket = (PLM_PACKET)
-			QQ_PopHead(&pDevice->TxPacketXmittedQ.Container);
-		if (pPacket == 0)
-			break;
-		pUmPacket = (PUM_PACKET) pPacket;
-		skb = pUmPacket->skbuff;
-#if ! defined(NO_PCI_UNMAP)
-		pci_unmap_single(pUmDevice->pdev,
-				pci_unmap_addr(pUmPacket, map[0]),
-				pci_unmap_len(pUmPacket, map_len[0]),
-				PCI_DMA_TODEVICE);
-#if MAX_SKB_FRAGS
-		for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
-			pci_unmap_page(pUmDevice->pdev,
-				pci_unmap_addr(pUmPacket, map[i + 1]),
-				pci_unmap_len(pUmPacket, map_len[i + 1]),
-				PCI_DMA_TODEVICE);
-		}
-#endif
-#endif
-		dev_kfree_skb_irq(skb);
-		pUmPacket->skbuff = 0;
-		QQ_PushTail(&pDevice->TxPacketFreeQ.Container, pPacket);
-	}
-	if (pUmDevice->tx_full) {
-		if (QQ_GetEntryCnt(&pDevice->TxPacketFreeQ.Container) >=
-			(pDevice->TxPacketDescCnt >> 1)) {
-
-			pUmDevice->tx_full = 0;
-			netif_wake_queue(pUmDevice->dev);
-		}
-	}
-	return LM_STATUS_SUCCESS;
-}
-
-LM_STATUS
-MM_IndicateStatus(PLM_DEVICE_BLOCK pDevice, LM_STATUS Status)
-{
-	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK) pDevice;
-	struct net_device *dev = pUmDevice->dev;
-	LM_FLOW_CONTROL flow_control;
-
-	if (!pUmDevice->opened)
-		return LM_STATUS_SUCCESS;
-
-	if (pUmDevice->delayed_link_ind > 0) {
-		pUmDevice->delayed_link_ind = 0;
-		if (Status == LM_STATUS_LINK_DOWN) {
-			pUmDevice->line_speed = 0;
-			netif_carrier_off(dev);
-			printk(KERN_ERR "%s: %s NIC Link is DOWN\n", bcm5700_driver, dev->name);
-		}
-		else if (Status == LM_STATUS_LINK_ACTIVE) {
-			netif_carrier_on(dev);
-			printk(KERN_INFO "%s: %s NIC Link is UP, ", bcm5700_driver, dev->name);
-		}
-	}
-	else {
-		if (Status == LM_STATUS_LINK_DOWN) {
-			pUmDevice->line_speed = 0;
-			netif_carrier_off(dev);
-			printk(KERN_ERR "%s: %s NIC Link is Down\n", bcm5700_driver, dev->name);
-		}
-		else if (Status == LM_STATUS_LINK_ACTIVE) {
-			netif_carrier_on(dev);
-			printk(KERN_INFO "%s: %s NIC Link is Up, ", bcm5700_driver, dev->name);
-		}
-	}
-
-	if (Status == LM_STATUS_LINK_ACTIVE) {
-		if (pDevice->LineSpeed == LM_LINE_SPEED_1000MBPS)
-			pUmDevice->line_speed = 1000;
-		else if (pDevice->LineSpeed == LM_LINE_SPEED_100MBPS)
-			pUmDevice->line_speed = 100;
-		else if (pDevice->LineSpeed == LM_LINE_SPEED_10MBPS)
-			pUmDevice->line_speed = 10;
-
-		printk("%d Mbps ", pUmDevice->line_speed);
-
-		if (pDevice->DuplexMode == LM_DUPLEX_MODE_FULL)
-			printk("full duplex");
-		else
-			printk("half duplex");
-
-		flow_control = pDevice->FlowControl &
-			(LM_FLOW_CONTROL_RECEIVE_PAUSE |
-			LM_FLOW_CONTROL_TRANSMIT_PAUSE);
-		if (flow_control) {
-			if (flow_control & LM_FLOW_CONTROL_RECEIVE_PAUSE) {
-				printk(", receive ");
-				if (flow_control & LM_FLOW_CONTROL_TRANSMIT_PAUSE)
-					printk("& transmit ");
-			}
-			else {
-				printk(", transmit ");
-			}
-			printk("flow control ON");
-		}
-		printk("\n");
-	}
-	return LM_STATUS_SUCCESS;
-}
-
-void
-MM_UnmapRxDma(LM_DEVICE_BLOCK *pDevice, LM_PACKET *pPacket)
-{
-#if ! defined(NO_PCI_UNMAP)
-	UM_DEVICE_BLOCK *pUmDevice = (UM_DEVICE_BLOCK *) pDevice;
-	UM_PACKET *pUmPacket = (UM_PACKET *) pPacket;
-
-	if (!pUmPacket->skbuff)
-		return;
-
-	pci_unmap_single(pUmDevice->pdev,
-			pci_unmap_addr(pUmPacket, map[0]),
-			pPacket->u.Rx.RxBufferSize,
-			PCI_DMA_FROMDEVICE);
-#endif
-}
-
-LM_STATUS
-MM_FreeRxBuffer(PLM_DEVICE_BLOCK pDevice, PLM_PACKET pPacket)
-{
-	PUM_PACKET pUmPacket;
-	struct sk_buff *skb;
-
-	if (pPacket == 0)
-		return LM_STATUS_SUCCESS;
-	pUmPacket = (PUM_PACKET) pPacket;
-	if ((skb = pUmPacket->skbuff)) {
-		/* DMA address already unmapped */
-		dev_kfree_skb(skb);
-	}
-	pUmPacket->skbuff = 0;
-	return LM_STATUS_SUCCESS;
-}
-
-LM_STATUS
-MM_Sleep(LM_DEVICE_BLOCK *pDevice, LM_UINT32 msec)
-{
-	current->state = TASK_INTERRUPTIBLE;
-	if (schedule_timeout(HZ * msec / 1000) != 0) {
-		return LM_STATUS_FAILURE;
-	}
-	if (signal_pending(current))
-		return LM_STATUS_FAILURE;
-
-	return LM_STATUS_SUCCESS;
-}
-
-void
-bcm5700_shutdown(UM_DEVICE_BLOCK *pUmDevice)
-{
-	LM_DEVICE_BLOCK *pDevice = (LM_DEVICE_BLOCK *) pUmDevice;
-
-	bcm5700_intr_off(pUmDevice);
-	netif_carrier_off(pUmDevice->dev);
-#ifdef BCM_TASKLET
-	tasklet_kill(&pUmDevice->tasklet);
-#endif
-	LM_Halt(pDevice);
-	pDevice->InitDone = 0;
-	bcm5700_free_remaining_rx_bufs(pUmDevice);
-}
-
-void
-bcm5700_free_remaining_rx_bufs(UM_DEVICE_BLOCK *pUmDevice)
-{
-	LM_DEVICE_BLOCK *pDevice = &pUmDevice->lm_dev;
-	UM_PACKET *pUmPacket;
-	int cnt, i;
-
-	cnt = QQ_GetEntryCnt(&pUmDevice->rx_out_of_buf_q.Container);
-	for (i = 0; i < cnt; i++) {
-		if ((pUmPacket =
-			QQ_PopHead(&pUmDevice->rx_out_of_buf_q.Container))
-			!= 0) {
-
-			MM_UnmapRxDma(pDevice, (LM_PACKET *) pUmPacket);
-			MM_FreeRxBuffer(pDevice, &pUmPacket->lm_packet);
-			QQ_PushTail(&pDevice->RxPacketFreeQ.Container,
-				pUmPacket);
-		}
-	}
-}
-
-void
-bcm5700_validate_param_range(UM_DEVICE_BLOCK *pUmDevice, int *param,
-	char *param_name, int min, int max, int deflt)
-{
-	if (((unsigned int) *param < (unsigned int) min) ||
-		((unsigned int) *param > (unsigned int) max)) {
-
-		printk(KERN_WARNING "%s-%d: Invalid %s parameter (%u), using %u\n", bcm5700_driver, pUmDevice->index, param_name, (unsigned int) *param, (unsigned int) deflt);
-		*param = deflt;
-	}
-}
-
-struct net_device *
-bcm5700_find_peer(struct net_device *dev)
-{
-	struct net_device *tmp_dev;
-	UM_DEVICE_BLOCK *pUmDevice, *pUmTmp;
-	LM_DEVICE_BLOCK *pDevice;
-
-	tmp_dev = 0;
-	pUmDevice = (UM_DEVICE_BLOCK *) dev->priv;
-	pDevice = &pUmDevice->lm_dev;
-	if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5704) {
-		tmp_dev = root_tigon3_dev;
-		while (tmp_dev) {
-			pUmTmp = (PUM_DEVICE_BLOCK) tmp_dev->priv;
-			if ((tmp_dev != dev) &&
-				(pUmDevice->pdev->bus->number ==
-				pUmTmp->pdev->bus->number) &&
-				PCI_SLOT(pUmDevice->pdev->devfn) ==
-				PCI_SLOT(pUmTmp->pdev->devfn)) {
-
-				break;
-			}
-			tmp_dev = pUmTmp->next_module;
-		}
-	}
-	return tmp_dev;
-}
-
-LM_DEVICE_BLOCK *
-MM_FindPeerDev(LM_DEVICE_BLOCK *pDevice)
-{
-	UM_DEVICE_BLOCK *pUmDevice = (UM_DEVICE_BLOCK *) pDevice;
-	struct net_device *dev = pUmDevice->dev;
-	struct net_device *peer_dev;
-
-	peer_dev = bcm5700_find_peer(dev);
-	if (!peer_dev)
-		return 0;
-	return ((LM_DEVICE_BLOCK *) peer_dev->priv);
-}
-
-#ifdef HAVE_POLL_CONTROLLER
-STATIC void
-poll_bcm5700(struct net_device *dev)
-{
-#ifdef RED_HAT_LINUX_KERNEL
-	if (!netdump_mode)
-#endif
-		disable_irq(dev->irq);
-	bcm5700_interrupt(dev->irq, dev, NULL);
-#ifdef RED_HAT_LINUX_KERNEL
-	if (!netdump_mode)
-#endif
-		enable_irq(dev->irq);
-}
-#endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm/bits.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm/bits.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm/bits.h	2004-06-29 11:24:56.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm/bits.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,61 +0,0 @@
-/******************************************************************************/
-/*                                                                            */
-/* Broadcom BCM5700 Linux Network Driver, Copyright (c) 2000 - 2003 Broadcom  */
-/* 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, located in the file LICENSE.                 */
-/*                                                                            */
-/* History:                                                                   */
-/*    02/25/00 Hav Khauv        Initial version.                              */
-/******************************************************************************/
-
-#ifndef BITS_H
-#define BITS_H
-
-
-
-/******************************************************************************/
-/* Bit Mask definitions */
-/******************************************************************************/
-
-#define BIT_NONE            0x00
-#define BIT_0               0x01
-#define BIT_1               0x02
-#define BIT_2               0x04
-#define BIT_3               0x08
-#define BIT_4               0x10
-#define BIT_5               0x20
-#define BIT_6               0x40
-#define BIT_7               0x80
-#define BIT_8               0x0100
-#define BIT_9               0x0200
-#define BIT_10              0x0400
-#define BIT_11              0x0800
-#define BIT_12              0x1000
-#define BIT_13              0x2000
-#define BIT_14              0x4000
-#define BIT_15              0x8000
-#define BIT_16              0x010000
-#define BIT_17              0x020000
-#define BIT_18              0x040000
-#define BIT_19              0x080000
-#define BIT_20              0x100000
-#define BIT_21              0x200000
-#define BIT_22              0x400000
-#define BIT_23              0x800000
-#define BIT_24              0x01000000
-#define BIT_25              0x02000000
-#define BIT_26              0x04000000
-#define BIT_27              0x08000000
-#define BIT_28              0x10000000
-#define BIT_29              0x20000000
-#define BIT_30              0x40000000
-#define BIT_31              0x80000000
-
-
-
-#endif /* BITS_H */
-
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm/fw_lso05.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm/fw_lso05.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm/fw_lso05.h	2004-06-29 11:24:56.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm/fw_lso05.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,288 +0,0 @@
-/******************************************************************************/
-/*                                                                            */
-/* Broadcom BCM5700 Linux Network Driver, Copyright (c) 2000 - 2003 Broadcom  */
-/* 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, located in the file LICENSE.                 */
-/*                                                                            */
-/*                                                                            */
-/*  Name: F W _ L S O 0 5. H                                                  */
-/*  Author : Kevin Tran                                                       */
-/*                                                                            */
-/* Module Description:  This file contains firmware binary code of TCP        */
-/* Segmentation firmware (BCM5705).                                           */
-/*                                                                            */
-/* History:                                                                   */
-/*    08/10/02 Kevin Tran       Incarnation.                                  */
-/******************************************************************************/
-
-#ifndef __FW_LSO05_H__ 
-#define __FW_LSO05_H__ 
-
-int t3StkOffLd05FwReleaseMajor = 0x1;
-int t3StkOffLd05FwReleaseMinor = 0x1;
-int t3StkOffLd05FwReleaseFix = 0x0;
-U32 t3StkOffLd05FwStartAddr = 0x00010000;
-U32 t3StkOffLd05FwTextAddr = 0x00010000;
-int t3StkOffLd05FwTextLen = 0xeb0;
-U32 t3StkOffLd05FwRodataAddr = 0x00010eb0;
-int t3StkOffLd05FwRodataLen = 0x50;
-U32 t3StkOffLd05FwDataAddr = 0x00010f20;
-int t3StkOffLd05FwDataLen = 0x20;
-U32 t3StkOffLd05FwSbssAddr = 0x00010f40;
-int t3StkOffLd05FwSbssLen = 0x28;
-U32 t3StkOffLd05FwBssAddr = 0x00010f70;
-int t3StkOffLd05FwBssLen = 0x88;
-U32 t3StkOffLd05FwText[(0xeb0/4) + 1] = {
-0xc004003, 0x0, 0x10f30, 
-0x0, 0x10000003, 0x0, 0xd, 
-0xd, 0x3c1d0001, 0x37bde000, 0x3a0f021, 
-0x3c100001, 0x26100000, 0xc004010, 0x0, 
-0xd, 0x27bdffe0, 0x3c04fefe, 0xafbf0018, 
-0xc0042f0, 0x34840002, 0xc00436c, 0x0, 
-0x3c030001, 0x90630f54, 0x24020002, 0x3c040001, 
-0x24840ebc, 0x14620003, 0x24050001, 0x3c040001, 
-0x24840eb0, 0x24060001, 0x3821, 0xafa00010, 
-0xc004380, 0xafa00014, 0xc00402c, 0x0, 
-0x8fbf0018, 0x3e00008, 0x27bd0020, 0x0, 
-0x0, 0x27bdffe0, 0xafbf001c, 0xafb20018, 
-0xafb10014, 0xc0042d3, 0xafb00010, 0x3c128000, 
-0x24110001, 0x8f706810, 0x32020400, 0x10400007, 
-0x0, 0x8f641008, 0x921024, 0x14400003, 
-0x0, 0xc004064, 0x0, 0x3c020001, 
-0x90420f76, 0x10510003, 0x32020200, 0x1040fff1, 
-0x0, 0xc0041b4, 0x0, 0x8004034, 
-0x0, 0x8fbf001c, 0x8fb20018, 0x8fb10014, 
-0x8fb00010, 0x3e00008, 0x27bd0020, 0x27bdffe0, 
-0x3c040001, 0x24840ed0, 0x2821, 0x3021, 
-0x3821, 0xafbf0018, 0xafa00010, 0xc004380, 
-0xafa00014, 0xd021, 0x24020130, 0xaf625000, 
-0x3c010001, 0xa4200f70, 0x3c010001, 0xa0200f77, 
-0x8fbf0018, 0x3e00008, 0x27bd0020, 0x0, 
-0x0, 0x3c030001, 0x24630f80, 0x90620000, 
-0x27bdfff0, 0x14400003, 0x80c021, 0x8004073, 
-0x4821, 0x3c022000, 0x3021024, 0x10400003, 
-0x24090002, 0x8004073, 0xa0600000, 0x24090001, 
-0x181040, 0x30431f80, 0x346f8008, 0x1520004b, 
-0x25eb0028, 0x3c040001, 0x832021, 0x8c848010, 
-0x3c050001, 0x24a50f9a, 0x41402, 0xa0a20000, 
-0x3c010001, 0xa0240f9b, 0x3c020001, 0x431021, 
-0x94428014, 0x3c010001, 0xa0220f9c, 0x3c0c0001, 
-0x1836021, 0x8d8c8018, 0x304200ff, 0x24420008, 
-0x220c3, 0x24020001, 0x3c010001, 0xa0220f80, 
-0x124102b, 0x1040000c, 0x3821, 0x24a6000e, 
-0x1602821, 0x8ca20000, 0x8ca30004, 0x24a50008, 
-0x24e70001, 0xacc20000, 0xacc30004, 0xe4102b, 
-0x1440fff8, 0x24c60008, 0x3821, 0x3c080001, 
-0x25080f9b, 0x91060000, 0x3c020001, 0x90420f9c, 
-0x2503000d, 0xc32821, 0x461023, 0x21fc2, 
-0x431021, 0x21043, 0x1840000c, 0x2021, 
-0x91020001, 0x461023, 0x21fc2, 0x431021, 
-0x21843, 0x94a20000, 0x24e70001, 0x822021, 
-0xe3102a, 0x1440fffb, 0x24a50002, 0x41c02, 
-0x3082ffff, 0x622021, 0x41402, 0x822021, 
-0x3c02ffff, 0x1821024, 0x3083ffff, 0x431025, 
-0x3c010001, 0x80040fa, 0xac220fa0, 0x3c050001, 
-0x24a50f9c, 0x90a20000, 0x3c0c0001, 0x1836021, 
-0x8d8c8018, 0x220c2, 0x1080000e, 0x3821, 
-0x1603021, 0x24a5000c, 0x8ca20000, 0x8ca30004, 
-0x24a50008, 0x24e70001, 0xacc20000, 0xacc30004, 
-0xe4102b, 0x1440fff8, 0x24c60008, 0x3c050001, 
-0x24a50f9c, 0x90a20000, 0x30430007, 0x24020004, 
-0x10620011, 0x28620005, 0x10400005, 0x24020002, 
-0x10620008, 0x710c0, 0x80040fa, 0x0, 
-0x24020006, 0x1062000e, 0x710c0, 0x80040fa, 
-0x0, 0xa21821, 0x9463000c, 0x4b1021, 
-0x80040fa, 0xa4430000, 0x710c0, 0xa21821, 
-0x8c63000c, 0x4b1021, 0x80040fa, 0xac430000, 
-0xa21821, 0x8c63000c, 0x4b2021, 0xa21021, 
-0xac830000, 0x94420010, 0xa4820004, 0x95e70006, 
-0x3c020001, 0x90420f9c, 0x3c030001, 0x90630f9a, 
-0xe2c823, 0x3c020001, 0x90420f9b, 0x24630028, 
-0x1e34021, 0x24420028, 0x15200012, 0x1e23021, 
-0x94c2000c, 0x3c010001, 0xa4220f98, 0x94c20004, 
-0x94c30006, 0x3c010001, 0xa4200f96, 0x3c010001, 
-0xa4200f92, 0x21400, 0x431025, 0x3c010001, 
-0xac220f8c, 0x95020004, 0x3c010001, 0x8004124, 
-0xa4220f90, 0x3c020001, 0x94420f90, 0x3c030001, 
-0x94630f92, 0x431021, 0xa5020004, 0x3c020001, 
-0x94420f8c, 0xa4c20004, 0x3c020001, 0x8c420f8c, 
-0xa4c20006, 0x3c040001, 0x94840f92, 0x3c020001, 
-0x94420f90, 0x3c0a0001, 0x954a0f96, 0x441821, 
-0x3063ffff, 0x62182a, 0x24020002, 0x1122000b, 
-0x832023, 0x3c030001, 0x94630f98, 0x30620009, 
-0x10400006, 0x3062fff6, 0xa4c2000c, 0x3c020001, 
-0x94420f98, 0x30420009, 0x1425023, 0x24020001, 
-0x1122001b, 0x29220002, 0x50400005, 0x24020002, 
-0x11200007, 0x31a2ffff, 0x8004197, 0x0, 
-0x1122001d, 0x24020016, 0x8004197, 0x31a2ffff, 
-0x3c0e0001, 0x95ce0fa0, 0x10800005, 0x1806821, 
-0x1c42021, 0x41c02, 0x3082ffff, 0x627021, 
-0xe1027, 0xa502000a, 0x3c030001, 0x90630f9b, 
-0x31a2ffff, 0xe21021, 0x800418d, 0x432023, 
-0x3c020001, 0x94420fa0, 0x442021, 0x41c02, 
-0x3082ffff, 0x622021, 0x807021, 0x41027, 
-0x8004185, 0xa502000a, 0x3c050001, 0x24a50f9a, 
-0x90a30000, 0x14620002, 0x24e2fff2, 0xa5e20034, 
-0x90a20000, 0xe21023, 0xa5020002, 0x3c030001, 
-0x94630fa0, 0x3c020001, 0x94420f7a, 0x30e5ffff, 
-0x641821, 0x451023, 0x622023, 0x41c02, 
-0x3082ffff, 0x622021, 0x41027, 0xa502000a, 
-0x3c030001, 0x90630f9c, 0x24620001, 0x14a20005, 
-0x807021, 0x1631021, 0x90420000, 0x8004185, 
-0x26200, 0x24620002, 0x14a20003, 0x306200fe, 
-0x4b1021, 0x944c0000, 0x3c020001, 0x94420fa2, 
-0x3183ffff, 0x3c040001, 0x90840f9b, 0x431021, 
-0xe21021, 0x442023, 0x8a2021, 0x41c02, 
-0x3082ffff, 0x622021, 0x41402, 0x822021, 
-0x806821, 0x41027, 0xa4c20010, 0x31a2ffff, 
-0xe1c00, 0x431025, 0x3c040001, 0x24840f92, 
-0xade20010, 0x94820000, 0x3c050001, 0x94a50f96, 
-0x3c030001, 0x8c630f8c, 0x24420001, 0xb92821, 
-0xa4820000, 0x3322ffff, 0x622021, 0x83182b, 
-0x3c010001, 0xa4250f96, 0x10600003, 0x24a2ffff, 
-0x3c010001, 0xa4220f96, 0x3c024000, 0x3021025, 
-0x3c010001, 0xac240f8c, 0xaf621008, 0x3e00008, 
-0x27bd0010, 0x3c030001, 0x90630f76, 0x27bdffe8, 
-0x24020001, 0xafbf0014, 0x10620026, 0xafb00010, 
-0x8f620cf4, 0x2442ffff, 0x3042007f, 0x21100, 
-0x8c434000, 0x3c010001, 0xac230f84, 0x8c434008, 
-0x24444000, 0x8c5c4004, 0x30620040, 0x14400002, 
-0x24020088, 0x24020008, 0x3c010001, 0xa4220f88, 
-0x30620004, 0x10400005, 0x24020001, 0x3c010001, 
-0xa0220f77, 0x80041d5, 0x31402, 0x3c010001, 
-0xa0200f77, 0x31402, 0x3c010001, 0xa4220f74, 
-0x9483000c, 0x24020001, 0x3c010001, 0xa4200f70, 
-0x3c010001, 0xa0220f76, 0x3c010001, 0xa4230f82, 
-0x24020001, 0x1342001e, 0x0, 0x13400005, 
-0x24020003, 0x13420067, 0x0, 0x80042cf, 
-0x0, 0x3c020001, 0x94420f82, 0x241a0001, 
-0x3c010001, 0xa4200f7e, 0x3c010001, 0xa4200f72, 
-0x304407ff, 0x21bc2, 0x31823, 0x3063003e, 
-0x34630036, 0x21242, 0x3042003c, 0x621821, 
-0x3c010001, 0xa4240f78, 0x832021, 0x24630030, 
-0x3c010001, 0xa4240f7a, 0x3c010001, 0xa4230f7c, 
-0x3c060001, 0x24c60f72, 0x94c50000, 0x94c30002, 
-0x3c040001, 0x94840f7a, 0x651021, 0x44102a, 
-0x10400013, 0x3c108000, 0xa31021, 0xa4c20000, 
-0x3c02a000, 0xaf620cf4, 0x3c010001, 0xa0200f76, 
-0x8f641008, 0x901024, 0x14400003, 0x0, 
-0xc004064, 0x0, 0x8f620cf4, 0x501024, 
-0x104000b7, 0x0, 0x800420f, 0x0, 
-0x3c030001, 0x94630f70, 0x851023, 0xa4c40000, 
-0x621821, 0x3042ffff, 0x3c010001, 0xa4230f70, 
-0xaf620ce8, 0x3c020001, 0x94420f88, 0x34420024, 
-0xaf620cec, 0x94c30002, 0x3c020001, 0x94420f70, 
-0x14620012, 0x3c028000, 0x3c108000, 0x3c02a000, 
-0xaf620cf4, 0x3c010001, 0xa0200f76, 0x8f641008, 
-0x901024, 0x14400003, 0x0, 0xc004064, 
-0x0, 0x8f620cf4, 0x501024, 0x1440fff7, 
-0x0, 0x80042cf, 0x241a0003, 0xaf620cf4, 
-0x3c108000, 0x8f641008, 0x901024, 0x14400003, 
-0x0, 0xc004064, 0x0, 0x8f620cf4, 
-0x501024, 0x1440fff7, 0x0, 0x80042cf, 
-0x241a0003, 0x3c070001, 0x24e70f70, 0x94e20000, 
-0x3821021, 0xaf620ce0, 0x3c020001, 0x8c420f84, 
-0xaf620ce4, 0x3c050001, 0x94a50f74, 0x94e30000, 
-0x3c040001, 0x94840f78, 0x3c020001, 0x94420f7e, 
-0xa32823, 0x822023, 0x30a6ffff, 0x3083ffff, 
-0xc3102b, 0x14400043, 0x0, 0x3c020001, 
-0x94420f7c, 0x21400, 0x621025, 0xaf620ce8, 
-0x94e20000, 0x3c030001, 0x94630f74, 0x441021, 
-0xa4e20000, 0x3042ffff, 0x14430021, 0x3c020008, 
-0x3c020001, 0x90420f77, 0x10400006, 0x3c03000c, 
-0x3c020001, 0x94420f88, 0x34630624, 0x800427c, 
-0xd021, 0x3c020001, 0x94420f88, 0x3c030008, 
-0x34630624, 0x431025, 0xaf620cec, 0x3c108000, 
-0x3c02a000, 0xaf620cf4, 0x3c010001, 0xa0200f76, 
-0x8f641008, 0x901024, 0x14400003, 0x0, 
-0xc004064, 0x0, 0x8f620cf4, 0x501024, 
-0x10400015, 0x0, 0x8004283, 0x0, 
-0x3c030001, 0x94630f88, 0x34420624, 0x3c108000, 
-0x621825, 0x3c028000, 0xaf630cec, 0xaf620cf4, 
-0x8f641008, 0x901024, 0x14400003, 0x0, 
-0xc004064, 0x0, 0x8f620cf4, 0x501024, 
-0x1440fff7, 0x0, 0x3c010001, 0x80042cf, 
-0xa4200f7e, 0x3c020001, 0x94420f7c, 0x21400, 
-0xc21025, 0xaf620ce8, 0x3c020001, 0x90420f77, 
-0x10400009, 0x3c03000c, 0x3c020001, 0x94420f88, 
-0x34630624, 0xd021, 0x431025, 0xaf620cec, 
-0x80042c1, 0x3c108000, 0x3c020001, 0x94420f88, 
-0x3c030008, 0x34630604, 0x431025, 0xaf620cec, 
-0x3c020001, 0x94420f7e, 0x451021, 0x3c010001, 
-0xa4220f7e, 0x3c108000, 0x3c02a000, 0xaf620cf4, 
-0x3c010001, 0xa0200f76, 0x8f641008, 0x901024, 
-0x14400003, 0x0, 0xc004064, 0x0, 
-0x8f620cf4, 0x501024, 0x1440fff7, 0x0, 
-0x8fbf0014, 0x8fb00010, 0x3e00008, 0x27bd0018, 
-0x27bdffe0, 0x3c040001, 0x24840ee0, 0x2821, 
-0x3021, 0x3821, 0xafbf0018, 0xafa00010, 
-0xc004380, 0xafa00014, 0xd021, 0x24020130, 
-0xaf625000, 0x3c010001, 0xa4200f70, 0x3c010001, 
-0xa0200f77, 0x8f636804, 0x3c020001, 0x3442e000, 
-0x621824, 0x3c020001, 0x14620003, 0x0, 
-0x80042eb, 0x0, 0x8fbf0018, 0x3e00008, 
-0x27bd0020, 0x27bdffe8, 0x3c1bc000, 0xafbf0014, 
-0xafb00010, 0xaf60680c, 0x8f626804, 0x34420082, 
-0xaf626804, 0x8f634000, 0x24020b50, 0x3c010001, 
-0xac220f40, 0x24020b78, 0x3c010001, 0xac220f50, 
-0x34630002, 0xaf634000, 0xc00431d, 0x808021, 
-0x3c010001, 0xa0220f54, 0x304200ff, 0x24030002, 
-0x14430005, 0x0, 0x3c020001, 0x8c420f40, 
-0x8004310, 0xac5000c0, 0x3c020001, 0x8c420f40, 
-0xac5000bc, 0x8f624434, 0x8f634438, 0x8f644410, 
-0x3c010001, 0xac220f48, 0x3c010001, 0xac230f58, 
-0x3c010001, 0xac240f44, 0x8fbf0014, 0x8fb00010, 
-0x3e00008, 0x27bd0018, 0x3e00008, 0x24020001, 
-0x27bdfff8, 0x18800009, 0x2821, 0x8f63680c, 
-0x8f62680c, 0x1043fffe, 0x0, 0x24a50001, 
-0xa4102a, 0x1440fff9, 0x0, 0x3e00008, 
-0x27bd0008, 0x8f634450, 0x3c020001, 0x8c420f48, 
-0x31c02, 0x43102b, 0x14400008, 0x3c038000, 
-0x3c040001, 0x8c840f58, 0x8f624450, 0x21c02, 
-0x83102b, 0x1040fffc, 0x3c038000, 0xaf634444, 
-0x8f624444, 0x431024, 0x1440fffd, 0x0, 
-0x8f624448, 0x3e00008, 0x3042ffff, 0x3082ffff, 
-0x2442e000, 0x2c422001, 0x14400003, 0x3c024000, 
-0x800434f, 0x2402ffff, 0x822025, 0xaf645c38, 
-0x8f625c30, 0x30420002, 0x1440fffc, 0x1021, 
-0x3e00008, 0x0, 0x8f624450, 0x3c030001, 
-0x8c630f44, 0x8004358, 0x3042ffff, 0x8f624450, 
-0x3042ffff, 0x43102b, 0x1440fffc, 0x0, 
-0x3e00008, 0x0, 0x27bdffe0, 0x802821, 
-0x3c040001, 0x24840ef0, 0x3021, 0x3821, 
-0xafbf0018, 0xafa00010, 0xc004380, 0xafa00014, 
-0x8004367, 0x0, 0x8fbf0018, 0x3e00008, 
-0x27bd0020, 0x3c020001, 0x3442d600, 0x3c030001, 
-0x3463d600, 0x3c040001, 0x3484ddff, 0x3c010001, 
-0xac220f60, 0x24020040, 0x3c010001, 0xac220f64, 
-0x3c010001, 0xac200f5c, 0xac600000, 0x24630004, 
-0x83102b, 0x5040fffd, 0xac600000, 0x3e00008, 
-0x0, 0x804821, 0x8faa0010, 0x3c020001, 
-0x8c420f5c, 0x3c040001, 0x8c840f64, 0x8fab0014, 
-0x24430001, 0x44102b, 0x3c010001, 0xac230f5c, 
-0x14400003, 0x4021, 0x3c010001, 0xac200f5c, 
-0x3c020001, 0x8c420f5c, 0x3c030001, 0x8c630f60, 
-0x91240000, 0x21140, 0x431021, 0x481021, 
-0x25080001, 0xa0440000, 0x29020008, 0x1440fff4, 
-0x25290001, 0x3c020001, 0x8c420f5c, 0x3c030001, 
-0x8c630f60, 0x8f64680c, 0x21140, 0x431021, 
-0xac440008, 0xac45000c, 0xac460010, 0xac470014, 
-0xac4a0018, 0x3e00008, 0xac4b001c, 0x0, 
-0x0, 0x0 };
-U32 t3StkOffLd05FwRodata[(0x50/4) + 1] = {
-0x4d61696e, 
-0x43707542, 0x0, 0x4d61696e, 0x43707541, 
-0x0, 0x0, 0x0, 0x73746b6f, 
-0x66666c64, 0x0, 0x0, 0x73746b6f, 
-0x66666c64, 0x0, 0x0, 0x66617461, 
-0x6c457272, 0x0, 0x0, 0x0 };
-U32 t3StkOffLd05FwData[(0x20/4) + 1] = {
-0x0, 
-0x0, 0x0, 0x0, 0x73746b6f, 
-0x66666c64, 0x5f76312e, 0x312e3000, 0x0 };
-
-#endif /* __FW_LSO05_H__   */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm/fw_stkoffld.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm/fw_stkoffld.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm/fw_stkoffld.h	2004-06-29 11:24:56.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm/fw_stkoffld.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,508 +0,0 @@
-/******************************************************************************/
-/*                                                                            */
-/* Broadcom BCM5700 Linux Network Driver, Copyright (c) 2000 - 2003 Broadcom  */
-/* 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, located in the file LICENSE.                 */
-/*                                                                            */
-/*                                                                            */
-/*  Name: F W _ S T K O F F L D . H                                           */
-/*  Author : Kevin Tran                                                       */
-/*                                                                            */
-/* Module Description:  This file contains firmware binary code of for TCP/IP */
-/* stack offload support.  Currently, this firmware supports the following    */
-/* features:                                                                  */
-/*     1. TCP segmentation (aka Large Send Offload -- LSO)                    */
-/*     2. UDP Checksum offload support for IP fragmented UDP frames.          */
-/*                                                                            */
-/* History:                                                                   */
-/*    07/17/01 Kevin Tran       Incarnation.                                  */
-/*    10/10/01 Kevin Tran       Added UDP checksum offload support.           */
-/*    10/20/01 Kevin Tran       Fixed a problem where pseudo checksum is not  */
-/*                              calculated correctly in case of IP            */
-/*                              fragmentation case.                           */
-/*    10/30/01 Kevin Tran       Fixed a problem where checksum is incorrectly */
-/*                              computed if bit BD_FLAG_TCP_UDP_CKSUM is set  */
-/*                              in Send BDs.                                  */
-/*    05/30/02 Kevin Tran       Fixed a problem where UDP checksum is         */
-/*                              incorrectly computed if the length of data is */
-/*                              less than 6 bytes in the last packetst of     */
-/*                              of a chain of fragmented IP/UDP packets.      */
-/*    12/01/02 Kevin Tran       Fixed a problem where firmware might lockup   */
-/*                              in a certain test scenario with BCM5704.      */
-/*    12/10/02 Kevin Tran       Fixed a problem where IP checksum might be    */
-/*                              incorrectly calculated in some corner cases.  */
-/*                              This problem should ONLY happen with BCM5702/ */
-/*                              BCM5703/BCM5704 ASICs.                        */
-/*    06/20/03 Kevin Tran       Optimized performance so that pre-DMA code    */
-/*                              doesn't have to wait until the first packet   */
-/*                              is completely DMAed before it can setup DMAs  */
-/*                              for subsequent packets.  This requires host   */
-/*                              driver to pass IP/TCP option lengths if any   */
-/*                              to F/W via bit 15..12 of Send BD flag.        */
-/*                                                                            */
-/******************************************************************************/
-
-#ifndef __FW_STKOFFLD_H__ 
-#define __FW_STKOFFLD_H__ 
-
-typedef LM_UINT32 U32;
-
-int t3StkOffLdFwReleaseMajor = 0x1;
-int t3StkOffLdFwReleaseMinor = 0x4;
-int t3StkOffLdFwReleaseFix = 0x0;
-U32 t3StkOffLdFwStartAddr = 0x08000000;
-U32 t3StkOffLdFwTextAddr = 0x08000000;
-int t3StkOffLdFwTextLen = 0x1a90;
-U32 t3StkOffLdFwRodataAddr = 0x08001a90;
-int t3StkOffLdFwRodataLen = 0x60;
-U32 t3StkOffLdFwDataAddr = 0x08001b20;
-int t3StkOffLdFwDataLen = 0x20;
-U32 t3StkOffLdFwSbssAddr = 0x08001b40;
-int t3StkOffLdFwSbssLen = 0x2c;
-U32 t3StkOffLdFwBssAddr = 0x08001b70;
-int t3StkOffLdFwBssLen = 0x894;
-U32 t3StkOffLdFwText[(0x1a90/4) + 1] = {
-0x0, 0x10000003, 0x0, 
-0xd, 0xd, 0x3c1d0800, 0x37bd4000, 
-0x3a0f021, 0x3c100800, 0x26100000, 0xe000010, 
-0x0, 0xd, 0x0, 0x0, 
-0x0, 0x27bdffe0, 0x3c04fefe, 0xafbf0018, 
-0xe0005d4, 0x34840002, 0xe000664, 0x0, 
-0x3c030800, 0x90631b58, 0x24020002, 0x3c040800, 
-0x24841a9c, 0x14620003, 0x24050001, 0x3c040800, 
-0x24841a90, 0x24060003, 0x3821, 0xafa00010, 
-0xe000678, 0xafa00014, 0x8f625c50, 0x34420001, 
-0xaf625c50, 0x8f625c90, 0x34420001, 0xaf625c90, 
-0x2402ffff, 0xe000034, 0xaf625404, 0x8fbf0018, 
-0x3e00008, 0x27bd0020, 0x0, 0x0, 
-0x0, 0x27bdffe0, 0xafbf001c, 0xafb20018, 
-0xafb10014, 0xe00005b, 0xafb00010, 0x24120002, 
-0x24110001, 0x8f706820, 0x32020100, 0x10400003, 
-0x0, 0xe0000bb, 0x0, 0x8f706820, 
-0x32022000, 0x10400004, 0x32020001, 0xe0001ef, 
-0x24040001, 0x32020001, 0x10400003, 0x0, 
-0xe0000a3, 0x0, 0x3c020800, 0x90421b88, 
-0x14520003, 0x0, 0xe0004bf, 0x0, 
-0xa00003c, 0xaf715028, 0x8fbf001c, 0x8fb20018, 
-0x8fb10014, 0x8fb00010, 0x3e00008, 0x27bd0020, 
-0x27bdffe0, 0x3c040800, 0x24841ab0, 0x2821, 
-0x3021, 0x3821, 0xafbf0018, 0xafa00010, 
-0xe000678, 0xafa00014, 0x3c040800, 0x248423c8, 
-0xa4800000, 0x3c010800, 0xa0201b88, 0x3c010800, 
-0xac201b8c, 0x3c010800, 0xac201b90, 0x3c010800, 
-0xac201b94, 0x3c010800, 0xac201b9c, 0x3c010800, 
-0xac201ba8, 0x3c010800, 0xac201bac, 0x8f624434, 
-0x3c010800, 0xac221b78, 0x8f624438, 0x3c010800, 
-0xac221b7c, 0x8f624410, 0xac80f7a8, 0x3c010800, 
-0xac201b74, 0x3c010800, 0xac2023d0, 0x3c010800, 
-0xac2023b8, 0x3c010800, 0xac2023bc, 0x3c010800, 
-0xac2023f0, 0x3c010800, 0xac221b80, 0x8f620068, 
-0x24030007, 0x21702, 0x10430005, 0x0, 
-0x8f620068, 0x21702, 0x14400004, 0x24020001, 
-0x3c010800, 0xa000097, 0xac2023fc, 0xac820034, 
-0x3c040800, 0x24841abc, 0x3c050800, 0x8ca523fc, 
-0x3021, 0x3821, 0xafa00010, 0xe000678, 
-0xafa00014, 0x8fbf0018, 0x3e00008, 0x27bd0020, 
-0x27bdffe0, 0x3c040800, 0x24841ac8, 0x2821, 
-0x3021, 0x3821, 0xafbf0018, 0xafa00010, 
-0xe000678, 0xafa00014, 0xe00005b, 0x0, 
-0xe0000b4, 0x2021, 0x8fbf0018, 0x3e00008, 
-0x27bd0020, 0x24020001, 0x8f636820, 0x821004, 
-0x21027, 0x621824, 0x3e00008, 0xaf636820, 
-0x27bdffd0, 0xafbf002c, 0xafb60028, 0xafb50024, 
-0xafb40020, 0xafb3001c, 0xafb20018, 0xafb10014, 
-0xafb00010, 0x8f675c5c, 0x3c030800, 0x24631bac, 
-0x8c620000, 0x14470005, 0x3c0200ff, 0x3c020800, 
-0x90421b88, 0x14400118, 0x3c0200ff, 0x3442fff8, 
-0xe28824, 0xac670000, 0x111902, 0x306300ff, 
-0x30e20003, 0x211c0, 0x622825, 0xa04021, 
-0x71602, 0x3c030800, 0x90631b88, 0x3044000f, 
-0x14600036, 0x804821, 0x24020001, 0x3c010800, 
-0xa0221b88, 0x51100, 0x821025, 0x3c010800, 
-0xac201b8c, 0x3c010800, 0xac201b90, 0x3c010800, 
-0xac201b94, 0x3c010800, 0xac201b9c, 0x3c010800, 
-0xac201ba8, 0x3c010800, 0xac201ba0, 0x3c010800, 
-0xac201ba4, 0x3c010800, 0xa42223c8, 0x9622000c, 
-0x30437fff, 0x3c010800, 0xa4222400, 0x30428000, 
-0x3c010800, 0xa4231bb6, 0x10400005, 0x24020001, 
-0x3c010800, 0xac2223e4, 0xa000102, 0x2406003e, 
-0x24060036, 0x3c010800, 0xac2023e4, 0x9622000a, 
-0x3c030800, 0x94631bb6, 0x3c010800, 0xac2023e0, 
-0x3c010800, 0xac2023e8, 0x21302, 0x21080, 
-0xc21021, 0x621821, 0x3c010800, 0xa42223c0, 
-0x3c010800, 0xa000115, 0xa4231b86, 0x9622000c, 
-0x3c010800, 0xa42223dc, 0x3c040800, 0x24841b8c, 
-0x8c820000, 0x21100, 0x3c010800, 0x220821, 
-0xac311bb8, 0x8c820000, 0x21100, 0x3c010800, 
-0x220821, 0xac271bbc, 0x8c820000, 0x25030001, 
-0x306601ff, 0x21100, 0x3c010800, 0x220821, 
-0xac261bc0, 0x8c820000, 0x21100, 0x3c010800, 
-0x220821, 0xac291bc4, 0x96230008, 0x3c020800, 
-0x8c421b9c, 0x432821, 0x3c010800, 0xac251b9c, 
-0x9622000a, 0x30420004, 0x14400018, 0x61100, 
-0x8f630c14, 0x3063000f, 0x2c620002, 0x1440000b, 
-0x3c02c000, 0x8f630c14, 0x3c020800, 0x8c421b30, 
-0x3063000f, 0x24420001, 0x3c010800, 0xac221b30, 
-0x2c620002, 0x1040fff7, 0x3c02c000, 0xe21825, 
-0xaf635c5c, 0x8f625c50, 0x30420002, 0x10400014, 
-0x0, 0xa000147, 0x0, 0x3c030800, 
-0x8c631b70, 0x3c040800, 0x94841b84, 0x1221025, 
-0x3c010800, 0xa42223ca, 0x24020001, 0x3c010800, 
-0xac221ba8, 0x24630001, 0x85202a, 0x3c010800, 
-0x10800003, 0xac231b70, 0x3c010800, 0xa4251b84, 
-0x3c060800, 0x24c61b8c, 0x8cc20000, 0x24420001, 
-0xacc20000, 0x28420080, 0x14400005, 0x0, 
-0xe000652, 0x24040002, 0xa0001e5, 0x0, 
-0x3c020800, 0x8c421ba8, 0x10400077, 0x24020001, 
-0x3c050800, 0x90a51b88, 0x14a20071, 0x0, 
-0x3c150800, 0x96b51b86, 0x3c040800, 0x8c841b9c, 
-0x32a3ffff, 0x83102a, 0x1440006b, 0x0, 
-0x14830003, 0x0, 0x3c010800, 0xac2523e0, 
-0x1060005b, 0x9021, 0x24d60004, 0x60a021, 
-0x24d30014, 0x8ec20000, 0x28100, 0x3c110800, 
-0x2308821, 0xe000621, 0x8e311bb8, 0x402821, 
-0x10a00053, 0x0, 0x9628000a, 0x31020040, 
-0x10400004, 0x2407180c, 0x8e22000c, 0x2407188c, 
-0xaca20018, 0x3c030800, 0x701821, 0x8c631bc0, 
-0x3c020800, 0x501021, 0x8c421bc4, 0x31d00, 
-0x21400, 0x621825, 0xaca30014, 0x8ec30004, 
-0x96220008, 0x432023, 0x3242ffff, 0x3083ffff, 
-0x431021, 0x282102a, 0x14400002, 0x2b23023, 
-0x803021, 0x8e620000, 0x30c4ffff, 0x441021, 
-0xae620000, 0x8e220000, 0xaca20000, 0x8e220004, 
-0x8e63fff4, 0x431021, 0xaca20004, 0xa4a6000e, 
-0x8e62fff4, 0x441021, 0xae62fff4, 0x96230008, 
-0x43102a, 0x14400005, 0x2469021, 0x8e62fff0, 
-0xae60fff4, 0x24420001, 0xae62fff0, 0xaca00008, 
-0x3242ffff, 0x14540008, 0x24020305, 0x31020080, 
-0x54400001, 0x34e70010, 0x24020905, 0xa4a2000c, 
-0xa0001ca, 0x34e70020, 0xa4a2000c, 0x3c020800, 
-0x8c4223e0, 0x10400003, 0x3c024b65, 0xa0001d2, 
-0x34427654, 0x3c02b49a, 0x344289ab, 0xaca2001c, 
-0x30e2ffff, 0xaca20010, 0xe00059f, 0xa02021, 
-0x3242ffff, 0x54102b, 0x1440ffaa, 0x0, 
-0x24020002, 0x3c010800, 0xa0001e5, 0xa0221b88, 
-0x8ec2083c, 0x24420001, 0xa0001e5, 0xaec2083c, 
-0xe0004bf, 0x0, 0x8fbf002c, 0x8fb60028, 
-0x8fb50024, 0x8fb40020, 0x8fb3001c, 0x8fb20018, 
-0x8fb10014, 0x8fb00010, 0x3e00008, 0x27bd0030, 
-0x27bdffd0, 0xafbf0028, 0xafb30024, 0xafb20020, 
-0xafb1001c, 0xafb00018, 0x8f725c9c, 0x3c0200ff, 
-0x3442fff8, 0x3c060800, 0x24c61ba4, 0x2428824, 
-0x9623000e, 0x8cc20000, 0x431021, 0xacc20000, 
-0x8e220010, 0x30420020, 0x14400011, 0x809821, 
-0xe000637, 0x2202021, 0x3c02c000, 0x2421825, 
-0xaf635c9c, 0x8f625c90, 0x30420002, 0x10400121, 
-0x0, 0xaf635c9c, 0x8f625c90, 0x30420002, 
-0x1040011c, 0x0, 0xa00020c, 0x0, 
-0x8e240008, 0x8e230014, 0x41402, 0x241c0, 
-0x31502, 0x304201ff, 0x2442ffff, 0x3042007f, 
-0x31942, 0x30637800, 0x21100, 0x24424000, 
-0x625021, 0x9542000a, 0x3084ffff, 0x30420008, 
-0x104000b3, 0x429c0, 0x3c020800, 0x8c4223f0, 
-0x1440002d, 0x25050008, 0x95020014, 0x3c010800, 
-0xa42223c0, 0x8d070010, 0x71402, 0x3c010800, 
-0xa42223c2, 0x3c010800, 0xa42723c4, 0x9502000e, 
-0x30e3ffff, 0x431023, 0x3c010800, 0xac2223f8, 
-0x8f626800, 0x3c030010, 0x431024, 0x10400005, 
-0x0, 0x9503001a, 0x9502001c, 0xa000241, 
-0x431021, 0x9502001a, 0x3c010800, 0xac2223ec, 
-0x3c02c000, 0x2421825, 0x3c010800, 0xac2823f0, 
-0x3c010800, 0xac3223f4, 0xaf635c9c, 0x8f625c90, 
-0x30420002, 0x104000df, 0x0, 0xaf635c9c, 
-0x8f625c90, 0x30420002, 0x104000da, 0x0, 
-0xa00024e, 0x0, 0x9502000e, 0x3c030800, 
-0x946323c4, 0x434823, 0x3123ffff, 0x2c620008, 
-0x1040001c, 0x0, 0x95020014, 0x24420028, 
-0xa22821, 0x31042, 0x1840000b, 0x2021, 
-0x24c60848, 0x403821, 0x94a30000, 0x8cc20000, 
-0x24840001, 0x431021, 0xacc20000, 0x87102a, 
-0x1440fff9, 0x24a50002, 0x31220001, 0x1040001f, 
-0x3c024000, 0x3c040800, 0x248423ec, 0xa0a00001, 
-0x94a30000, 0x8c820000, 0x431021, 0xa00028d, 
-0xac820000, 0x8f626800, 0x3c030010, 0x431024, 
-0x10400009, 0x0, 0x9502001a, 0x3c030800, 
-0x8c6323ec, 0x431021, 0x3c010800, 0xac2223ec, 
-0xa00028e, 0x3c024000, 0x9502001a, 0x9504001c, 
-0x3c030800, 0x8c6323ec, 0x441023, 0x621821, 
-0x3c010800, 0xac2323ec, 0x3c024000, 0x2421825, 
-0xaf635c9c, 0x8f625c90, 0x30420002, 0x1440fffc, 
-0x0, 0x9542000a, 0x30420010, 0x10400095, 
-0x0, 0x3c060800, 0x24c623f0, 0x3c020800, 
-0x944223c4, 0x8cc50000, 0x3c040800, 0x8c8423f8, 
-0x24420030, 0xa22821, 0x94a20004, 0x3c030800, 
-0x8c6323ec, 0x441023, 0x621821, 0x603821, 
-0x32402, 0x30e2ffff, 0x823821, 0x71402, 
-0xe23821, 0x71027, 0x3c010800, 0xac2323ec, 
-0xa4a20006, 0x3c030800, 0x8c6323f4, 0x3c0200ff, 
-0x3442fff8, 0x628824, 0x96220008, 0x24040001, 
-0x24034000, 0x241c0, 0xe01021, 0xa502001a, 
-0xa500001c, 0xacc00000, 0x3c010800, 0xac241b50, 
-0xaf635cb8, 0x8f625cb0, 0x30420002, 0x10400003, 
-0x0, 0x3c010800, 0xac201b50, 0x8e220008, 
-0xaf625cb8, 0x8f625cb0, 0x30420002, 0x10400003, 
-0x0, 0x3c010800, 0xac201b50, 0x3c020800, 
-0x8c421b50, 0x1040ffec, 0x0, 0x3c040800, 
-0xe000637, 0x8c8423f4, 0xa00032c, 0x0, 
-0x3c030800, 0x90631b88, 0x24020002, 0x14620003, 
-0x3c034b65, 0xa0002e3, 0x8021, 0x8e22001c, 
-0x34637654, 0x10430002, 0x24100002, 0x24100001, 
-0x1002021, 0xe000352, 0x2003021, 0x24020003, 
-0x3c010800, 0xa0221b88, 0x24020002, 0x1202000a, 
-0x24020001, 0x3c030800, 0x8c6323e0, 0x10620006, 
-0x0, 0x3c020800, 0x944223c8, 0x21400, 
-0xa000321, 0xae220014, 0x3c040800, 0x248423ca, 
-0x94820000, 0x21400, 0xae220014, 0x3c020800, 
-0x8c421bac, 0x3c03c000, 0x3c010800, 0xa0201b88, 
-0x431025, 0xaf625c5c, 0x8f625c50, 0x30420002, 
-0x10400009, 0x0, 0x2484f7e2, 0x8c820000, 
-0x431025, 0xaf625c5c, 0x8f625c50, 0x30420002, 
-0x1440fffa, 0x0, 0x3c020800, 0x24421b74, 
-0x8c430000, 0x24630001, 0xac430000, 0x8f630c14, 
-0x3063000f, 0x2c620002, 0x1440000c, 0x3c024000, 
-0x8f630c14, 0x3c020800, 0x8c421b30, 0x3063000f, 
-0x24420001, 0x3c010800, 0xac221b30, 0x2c620002, 
-0x1040fff7, 0x0, 0x3c024000, 0x2421825, 
-0xaf635c9c, 0x8f625c90, 0x30420002, 0x1440fffc, 
-0x0, 0x12600003, 0x0, 0xe0004bf, 
-0x0, 0x8fbf0028, 0x8fb30024, 0x8fb20020, 
-0x8fb1001c, 0x8fb00018, 0x3e00008, 0x27bd0030, 
-0x8f634450, 0x3c040800, 0x24841b78, 0x8c820000, 
-0x31c02, 0x43102b, 0x14400007, 0x3c038000, 
-0x8c840004, 0x8f624450, 0x21c02, 0x83102b, 
-0x1040fffc, 0x3c038000, 0xaf634444, 0x8f624444, 
-0x431024, 0x1440fffd, 0x0, 0x8f624448, 
-0x3e00008, 0x3042ffff, 0x3c024000, 0x822025, 
-0xaf645c38, 0x8f625c30, 0x30420002, 0x1440fffc, 
-0x0, 0x3e00008, 0x0, 0x27bdffe0, 
-0x805821, 0x14c00011, 0x256e0008, 0x3c020800, 
-0x8c4223e4, 0x10400007, 0x24020016, 0x3c010800, 
-0xa42223c2, 0x2402002a, 0x3c010800, 0xa000366, 
-0xa42223c4, 0x8d670010, 0x71402, 0x3c010800, 
-0xa42223c2, 0x3c010800, 0xa42723c4, 0x3c040800, 
-0x948423c4, 0x3c030800, 0x946323c2, 0x95cf0006, 
-0x3c020800, 0x944223c0, 0x832023, 0x1e2c023, 
-0x3065ffff, 0x24a20028, 0x1c24821, 0x3082ffff, 
-0x14c0001a, 0x1226021, 0x9582000c, 0x3042003f, 
-0x3c010800, 0xa42223c6, 0x95820004, 0x95830006, 
-0x3c010800, 0xac2023d4, 0x3c010800, 0xac2023d8, 
-0x21400, 0x431025, 0x3c010800, 0xac221bb0, 
-0x95220004, 0x3c010800, 0xa4221bb4, 0x95230002, 
-0x1e51023, 0x43102a, 0x10400010, 0x24020001, 
-0x3c010800, 0xa00039a, 0xac2223e8, 0x3c030800, 
-0x8c6323d8, 0x3c020800, 0x94421bb4, 0x431021, 
-0xa5220004, 0x3c020800, 0x94421bb0, 0xa5820004, 
-0x3c020800, 0x8c421bb0, 0xa5820006, 0x3c020800, 
-0x8c4223e0, 0x3c0d0800, 0x8dad23d4, 0x3c0a0800, 
-0x144000e5, 0x8d4a23d8, 0x3c020800, 0x94421bb4, 
-0x4a1821, 0x3063ffff, 0x62182b, 0x24020002, 
-0x10c2000d, 0x1435023, 0x3c020800, 0x944223c6, 
-0x30420009, 0x10400008, 0x0, 0x9582000c, 
-0x3042fff6, 0xa582000c, 0x3c020800, 0x944223c6, 
-0x30420009, 0x1a26823, 0x3c020800, 0x8c4223e8, 
-0x1040004a, 0x1203821, 0x3c020800, 0x944223c2, 
-0x4021, 0xa520000a, 0x1e21023, 0xa5220002, 
-0x3082ffff, 0x21042, 0x18400008, 0x3021, 
-0x401821, 0x94e20000, 0x25080001, 0xc23021, 
-0x103102a, 0x1440fffb, 0x24e70002, 0x61c02, 
-0x30c2ffff, 0x623021, 0x61402, 0xc23021, 
-0xc02821, 0x61027, 0xa522000a, 0x3021, 
-0x2527000c, 0x4021, 0x94e20000, 0x25080001, 
-0xc23021, 0x2d020004, 0x1440fffb, 0x24e70002, 
-0x95220002, 0x4021, 0x91230009, 0x442023, 
-0x1803821, 0x3082ffff, 0xa4e00010, 0x621821, 
-0x21042, 0x18400010, 0xc33021, 0x404821, 
-0x94e20000, 0x24e70002, 0xc23021, 0x30e2007f, 
-0x14400006, 0x25080001, 0x8d630000, 0x3c02007f, 
-0x3442ff80, 0x625824, 0x25670008, 0x109102a, 
-0x1440fff3, 0x0, 0x30820001, 0x10400005, 
-0x61c02, 0xa0e00001, 0x94e20000, 0xc23021, 
-0x61c02, 0x30c2ffff, 0x623021, 0x61402, 
-0xc23021, 0xa00047f, 0x30c6ffff, 0x24020002, 
-0x14c20081, 0x0, 0x3c020800, 0x8c4223fc, 
-0x14400007, 0x0, 0x3c020800, 0x944223c2, 
-0x95230002, 0x1e21023, 0x10620077, 0x0, 
-0x3c020800, 0x944223c2, 0x1e21023, 0xa5220002, 
-0x3c020800, 0x8c4223fc, 0x1040001a, 0x31e3ffff, 
-0x8dc70010, 0x3c020800, 0x94421b86, 0xe04021, 
-0x72c02, 0xaa2021, 0x431023, 0x823823, 
-0x72402, 0x30e2ffff, 0x823821, 0x71027, 
-0xa522000a, 0x3102ffff, 0x3c040800, 0x948423c4, 
-0x453023, 0xe02821, 0x641823, 0x6d1821, 
-0xc33021, 0x61c02, 0x30c2ffff, 0xa00047f, 
-0x623021, 0x1203821, 0x4021, 0x3082ffff, 
-0x21042, 0x18400008, 0x3021, 0x401821, 
-0x94e20000, 0x25080001, 0xc23021, 0x103102a, 
-0x1440fffb, 0x24e70002, 0x61c02, 0x30c2ffff, 
-0x623021, 0x61402, 0xc23021, 0xc02821, 
-0x61027, 0xa522000a, 0x3021, 0x2527000c, 
-0x4021, 0x94e20000, 0x25080001, 0xc23021, 
-0x2d020004, 0x1440fffb, 0x24e70002, 0x95220002, 
-0x4021, 0x91230009, 0x442023, 0x1803821, 
-0x3082ffff, 0xa4e00010, 0x3c040800, 0x948423c4, 
-0x621821, 0xc33021, 0x61c02, 0x30c2ffff, 
-0x623021, 0x61c02, 0x3c020800, 0x944223c0, 
-0xc34821, 0x441023, 0x21fc2, 0x431021, 
-0x21043, 0x18400010, 0x3021, 0x402021, 
-0x94e20000, 0x24e70002, 0xc23021, 0x30e2007f, 
-0x14400006, 0x25080001, 0x8d630000, 0x3c02007f, 
-0x3442ff80, 0x625824, 0x25670008, 0x104102a, 
-0x1440fff3, 0x0, 0x3c020800, 0x944223dc, 
-0xc23021, 0x3122ffff, 0xc23021, 0x61c02, 
-0x30c2ffff, 0x623021, 0x61402, 0xc23021, 
-0xc04021, 0x61027, 0xa5820010, 0xadc00014, 
-0xa00049f, 0xadc00000, 0x8dc70010, 0xe04021, 
-0x11400007, 0x72c02, 0xaa3021, 0x61402, 
-0x30c3ffff, 0x433021, 0x61402, 0xc22821, 
-0x51027, 0xa522000a, 0x3c030800, 0x946323c4, 
-0x3102ffff, 0x1e21021, 0x433023, 0xcd3021, 
-0x61c02, 0x30c2ffff, 0x623021, 0x61402, 
-0xc23021, 0xc04021, 0x61027, 0xa5820010, 
-0x3102ffff, 0x51c00, 0x431025, 0xadc20010, 
-0x3c020800, 0x8c4223e4, 0x10400002, 0x25e2fff2, 
-0xa5c20034, 0x3c020800, 0x8c4223d8, 0x3c040800, 
-0x8c8423d4, 0x24420001, 0x3c010800, 0xac2223d8, 
-0x3c020800, 0x8c421bb0, 0x3303ffff, 0x832021, 
-0x3c010800, 0xac2423d4, 0x431821, 0x62102b, 
-0x10400003, 0x2482ffff, 0x3c010800, 0xac2223d4, 
-0x3c010800, 0xac231bb0, 0x3e00008, 0x27bd0020, 
-0x27bdffb8, 0x3c050800, 0x24a51b86, 0xafbf0044, 
-0xafbe0040, 0xafb7003c, 0xafb60038, 0xafb50034, 
-0xafb40030, 0xafb3002c, 0xafb20028, 0xafb10024, 
-0xafb00020, 0x94a90000, 0x3c020800, 0x944223c0, 
-0x3c030800, 0x8c631ba0, 0x3c040800, 0x8c841b9c, 
-0x1221023, 0x64182a, 0xa7a9001e, 0x106000bc, 
-0xa7a20016, 0x24be0022, 0x97b6001e, 0x24b3001a, 
-0x24b70016, 0x8fc20000, 0x14400008, 0x0, 
-0x8fc2fff8, 0x97a30016, 0x8fc4fff4, 0x431021, 
-0x82202a, 0x148000ae, 0x0, 0x97d50818, 
-0x32a2ffff, 0x104000a1, 0x9021, 0x40a021, 
-0x8821, 0xe000621, 0x0, 0x403021, 
-0x14c00007, 0x0, 0x3c020800, 0x8c4223cc, 
-0x24420001, 0x3c010800, 0xa000593, 0xac2223cc, 
-0x3c100800, 0x2118021, 0x8e101bb8, 0x9608000a, 
-0x31020040, 0x10400004, 0x2407180c, 0x8e02000c, 
-0x2407188c, 0xacc20018, 0x31020080, 0x54400001, 
-0x34e70010, 0x3c020800, 0x511021, 0x8c421bc0, 
-0x3c030800, 0x711821, 0x8c631bc4, 0x21500, 
-0x31c00, 0x431025, 0xacc20014, 0x96040008, 
-0x3242ffff, 0x821021, 0x282102a, 0x14400002, 
-0x2b22823, 0x802821, 0x8e020000, 0x2459021, 
-0xacc20000, 0x8e020004, 0xc02021, 0x26310010, 
-0xac820004, 0x30e2ffff, 0xac800008, 0xa485000e, 
-0xac820010, 0x24020305, 0xe00059f, 0xa482000c, 
-0x3242ffff, 0x54102b, 0x1440ffc6, 0x3242ffff, 
-0xa00058b, 0x0, 0x8e620000, 0x8e63fffc, 
-0x43102a, 0x10400066, 0x0, 0x8e62fff0, 
-0x28900, 0x3c100800, 0x2118021, 0xe000621, 
-0x8e101bb8, 0x403021, 0x14c00005, 0x0, 
-0x8e62082c, 0x24420001, 0xa000593, 0xae62082c, 
-0x9608000a, 0x31020040, 0x10400004, 0x2407180c, 
-0x8e02000c, 0x2407188c, 0xacc20018, 0x3c020800, 
-0x511021, 0x8c421bc0, 0x3c030800, 0x711821, 
-0x8c631bc4, 0x21500, 0x31c00, 0x431025, 
-0xacc20014, 0x8e63fff4, 0x96020008, 0x432023, 
-0x3242ffff, 0x3083ffff, 0x431021, 0x2c2102a, 
-0x10400003, 0x802821, 0x97a9001e, 0x1322823, 
-0x8e620000, 0x30a4ffff, 0x441021, 0xae620000, 
-0xa4c5000e, 0x8e020000, 0xacc20000, 0x8e020004, 
-0x8e63fff4, 0x431021, 0xacc20004, 0x8e63fff4, 
-0x96020008, 0x641821, 0x62102a, 0x14400006, 
-0x2459021, 0x8e62fff0, 0xae60fff4, 0x24420001, 
-0xa00056e, 0xae62fff0, 0xae63fff4, 0xacc00008, 
-0x3242ffff, 0x10560003, 0x31020004, 0x10400006, 
-0x24020305, 0x31020080, 0x54400001, 0x34e70010, 
-0x34e70020, 0x24020905, 0xa4c2000c, 0x8ee30000, 
-0x8ee20004, 0x14620007, 0x3c02b49a, 0x8ee20860, 
-0x54400001, 0x34e70400, 0x3c024b65, 0xa000585, 
-0x34427654, 0x344289ab, 0xacc2001c, 0x30e2ffff, 
-0xacc20010, 0xe00059f, 0xc02021, 0x3242ffff, 
-0x56102b, 0x1440ff9c, 0x0, 0x8e620000, 
-0x8e63fffc, 0x43102a, 0x1440ff4a, 0x0, 
-0x8fbf0044, 0x8fbe0040, 0x8fb7003c, 0x8fb60038, 
-0x8fb50034, 0x8fb40030, 0x8fb3002c, 0x8fb20028, 
-0x8fb10024, 0x8fb00020, 0x3e00008, 0x27bd0048, 
-0x27bdffe8, 0xafbf0014, 0xafb00010, 0x8f624450, 
-0x8f634410, 0xa0005ae, 0x808021, 0x8f626820, 
-0x30422000, 0x10400003, 0x0, 0xe0001ef, 
-0x2021, 0x8f624450, 0x8f634410, 0x3042ffff, 
-0x43102b, 0x1440fff5, 0x0, 0x8f630c14, 
-0x3063000f, 0x2c620002, 0x1440000b, 0x0, 
-0x8f630c14, 0x3c020800, 0x8c421b30, 0x3063000f, 
-0x24420001, 0x3c010800, 0xac221b30, 0x2c620002, 
-0x1040fff7, 0x0, 0xaf705c18, 0x8f625c10, 
-0x30420002, 0x10400009, 0x0, 0x8f626820, 
-0x30422000, 0x1040fff8, 0x0, 0xe0001ef, 
-0x2021, 0xa0005c1, 0x0, 0x8fbf0014, 
-0x8fb00010, 0x3e00008, 0x27bd0018, 0x0, 
-0x0, 0x27bdffe8, 0x3c1bc000, 0xafbf0014, 
-0xafb00010, 0xaf60680c, 0x8f626804, 0x34420082, 
-0xaf626804, 0x8f634000, 0x24020b50, 0x3c010800, 
-0xac221b44, 0x24020b78, 0x3c010800, 0xac221b54, 
-0x34630002, 0xaf634000, 0xe000601, 0x808021, 
-0x3c010800, 0xa0221b58, 0x304200ff, 0x24030002, 
-0x14430005, 0x0, 0x3c020800, 0x8c421b44, 
-0xa0005f4, 0xac5000c0, 0x3c020800, 0x8c421b44, 
-0xac5000bc, 0x8f624434, 0x8f634438, 0x8f644410, 
-0x3c010800, 0xac221b4c, 0x3c010800, 0xac231b5c, 
-0x3c010800, 0xac241b48, 0x8fbf0014, 0x8fb00010, 
-0x3e00008, 0x27bd0018, 0x3c040800, 0x8c870000, 
-0x3c03aa55, 0x3463aa55, 0x3c06c003, 0xac830000, 
-0x8cc20000, 0x14430007, 0x24050002, 0x3c0355aa, 
-0x346355aa, 0xac830000, 0x8cc20000, 0x50430001, 
-0x24050001, 0x3c020800, 0xac470000, 0x3e00008, 
-0xa01021, 0x27bdfff8, 0x18800009, 0x2821, 
-0x8f63680c, 0x8f62680c, 0x1043fffe, 0x0, 
-0x24a50001, 0xa4102a, 0x1440fff9, 0x0, 
-0x3e00008, 0x27bd0008, 0x8f634450, 0x3c020800, 
-0x8c421b4c, 0x31c02, 0x43102b, 0x14400008, 
-0x3c038000, 0x3c040800, 0x8c841b5c, 0x8f624450, 
-0x21c02, 0x83102b, 0x1040fffc, 0x3c038000, 
-0xaf634444, 0x8f624444, 0x431024, 0x1440fffd, 
-0x0, 0x8f624448, 0x3e00008, 0x3042ffff, 
-0x3082ffff, 0x2442e000, 0x2c422001, 0x14400003, 
-0x3c024000, 0xa000644, 0x2402ffff, 0x822025, 
-0xaf645c38, 0x8f625c30, 0x30420002, 0x1440fffc, 
-0x1021, 0x3e00008, 0x0, 0x8f624450, 
-0x3c030800, 0x8c631b48, 0xa00064d, 0x3042ffff, 
-0x8f624450, 0x3042ffff, 0x43102b, 0x1440fffc, 
-0x0, 0x3e00008, 0x0, 0x27bdffe0, 
-0x802821, 0x3c040800, 0x24841ae0, 0x3021, 
-0x3821, 0xafbf0018, 0xafa00010, 0xe000678, 
-0xafa00014, 0xa00065c, 0x0, 0x8fbf0018, 
-0x3e00008, 0x27bd0020, 0x0, 0x0, 
-0x0, 0x3c020800, 0x34423000, 0x3c030800, 
-0x34633000, 0x3c040800, 0x348437ff, 0x3c010800, 
-0xac221b64, 0x24020040, 0x3c010800, 0xac221b68, 
-0x3c010800, 0xac201b60, 0xac600000, 0x24630004, 
-0x83102b, 0x5040fffd, 0xac600000, 0x3e00008, 
-0x0, 0x804821, 0x8faa0010, 0x3c020800, 
-0x8c421b60, 0x3c040800, 0x8c841b68, 0x8fab0014, 
-0x24430001, 0x44102b, 0x3c010800, 0xac231b60, 
-0x14400003, 0x4021, 0x3c010800, 0xac201b60, 
-0x3c020800, 0x8c421b60, 0x3c030800, 0x8c631b64, 
-0x91240000, 0x21140, 0x431021, 0x481021, 
-0x25080001, 0xa0440000, 0x29020008, 0x1440fff4, 
-0x25290001, 0x3c020800, 0x8c421b60, 0x3c030800, 
-0x8c631b64, 0x8f64680c, 0x21140, 0x431021, 
-0xac440008, 0xac45000c, 0xac460010, 0xac470014, 
-0xac4a0018, 0x3e00008, 0xac4b001c, 0x0, 
-0x0, 0x0 };
-U32 t3StkOffLdFwRodata[(0x60/4) + 1] = {
-0x4d61696e, 
-0x43707542, 0x0, 0x4d61696e, 0x43707541, 
-0x0, 0x0, 0x0, 0x73746b6f, 
-0x66666c64, 0x496e0000, 0x73746b6f, 0x66662a2a, 
-0x0, 0x53774576, 0x656e7430, 0x0, 
-0x0, 0x0, 0x0, 0x66617461, 
-0x6c457272, 0x0, 0x0, 0x0 };
-U32 t3StkOffLdFwData[(0x20/4) + 1] = {
-0x0, 
-0x0, 0x0, 0x0, 0x0, 
-0x0, 0x0, 0x0, 0x0 };
-
-#endif /* __FW_STKOFFLD_H__  */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm/lm.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm/lm.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm/lm.h	2004-06-29 11:24:56.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm/lm.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,459 +0,0 @@
-/******************************************************************************/
-/*                                                                            */
-/* Broadcom BCM5700 Linux Network Driver, Copyright (c) 2000 - 2003 Broadcom  */
-/* 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, located in the file LICENSE.                 */
-/*                                                                            */
-/* History:                                                                   */
-/*    02/25/00 Hav Khauv        Initial version.                              */
-/******************************************************************************/
-
-#ifndef LM_H
-#define LM_H
-
-#include "queue.h"
-#include "bits.h"
-
-
-
-/******************************************************************************/
-/* Basic types. */
-/******************************************************************************/
-
-typedef char           LM_CHAR,    *PLM_CHAR;
-typedef unsigned int   LM_UINT,    *PLM_UINT;
-typedef unsigned char  LM_UINT8,   *PLM_UINT8;
-typedef unsigned short LM_UINT16,  *PLM_UINT16;
-typedef unsigned int   LM_UINT32,  *PLM_UINT32;
-typedef unsigned int   LM_COUNTER, *PLM_COUNTER;
-typedef void           LM_VOID,    *PLM_VOID;
-typedef char           LM_BOOL,    *PLM_BOOL;
-
-/* 64bit value. */
-typedef struct {
-#ifdef BIG_ENDIAN_HOST
-    LM_UINT32 High;
-    LM_UINT32 Low;
-#else /* BIG_ENDIAN_HOST */
-    LM_UINT32 Low;
-    LM_UINT32 High;
-#endif /* !BIG_ENDIAN_HOST */
-} LM_UINT64, *PLM_UINT64;
-
-typedef LM_UINT64 LM_PHYSICAL_ADDRESS, *PLM_PHYSICAL_ADDRESS;
-
-/* void LM_INC_PHYSICAL_ADDRESS(PLM_PHYSICAL_ADDRESS pAddr,LM_UINT32 IncSize) */
-#define LM_INC_PHYSICAL_ADDRESS(pAddr, IncSize)             \
-    {                                                       \
-        LM_UINT32 OrgLow;                                   \
-                                                            \
-        OrgLow = (pAddr)->Low;                              \
-        (pAddr)->Low += IncSize;                            \
-        if((pAddr)->Low < OrgLow) {                         \
-            (pAddr)->High++; /* Wrap around. */             \
-        }                                                   \
-    }
-    
-
-#ifndef TRUE
-#define TRUE           1
-#endif /* TRUE */
-
-#ifndef FALSE
-#define FALSE          0
-#endif /* FALSE */
-
-#ifndef NULL
-#define NULL                ((void *) 0)
-#endif /* NULL */
-
-#ifndef OFFSETOF
-#define OFFSETOF(_s, _m)    (MM_UINT_PTR(&(((_s *) 0)->_m)))
-#endif /* OFFSETOF */
-
-
-
-/******************************************************************************/
-/* Simple macros. */
-/******************************************************************************/
-
-#define IS_ETH_BROADCAST(_pEthAddr)                                         \
-    (((unsigned char *) (_pEthAddr))[0] == ((unsigned char) 0xff))
-
-#define IS_ETH_MULTICAST(_pEthAddr)                                         \
-    (((unsigned char *) (_pEthAddr))[0] & ((unsigned char) 0x01))
-
-#define IS_ETH_ADDRESS_EQUAL(_pEtherAddr1, _pEtherAddr2)                    \
-    ((((unsigned char *) (_pEtherAddr1))[0] ==                              \
-    ((unsigned char *) (_pEtherAddr2))[0]) &&                               \
-    (((unsigned char *) (_pEtherAddr1))[1] ==                               \
-    ((unsigned char *) (_pEtherAddr2))[1]) &&                               \
-    (((unsigned char *) (_pEtherAddr1))[2] ==                               \
-    ((unsigned char *) (_pEtherAddr2))[2]) &&                               \
-    (((unsigned char *) (_pEtherAddr1))[3] ==                               \
-    ((unsigned char *) (_pEtherAddr2))[3]) &&                               \
-    (((unsigned char *) (_pEtherAddr1))[4] ==                               \
-    ((unsigned char *) (_pEtherAddr2))[4]) &&                               \
-    (((unsigned char *) (_pEtherAddr1))[5] ==                               \
-    ((unsigned char *) (_pEtherAddr2))[5]))
-
-#define COPY_ETH_ADDRESS(_Src, _Dst)                                        \
-    ((unsigned char *) (_Dst))[0] = ((unsigned char *) (_Src))[0];          \
-    ((unsigned char *) (_Dst))[1] = ((unsigned char *) (_Src))[1];          \
-    ((unsigned char *) (_Dst))[2] = ((unsigned char *) (_Src))[2];          \
-    ((unsigned char *) (_Dst))[3] = ((unsigned char *) (_Src))[3];          \
-    ((unsigned char *) (_Dst))[4] = ((unsigned char *) (_Src))[4];          \
-    ((unsigned char *) (_Dst))[5] = ((unsigned char *) (_Src))[5];
-
-
-
-/******************************************************************************/
-/* Constants. */
-/******************************************************************************/
-
-#define ETHERNET_ADDRESS_SIZE           6
-#define ETHERNET_PACKET_HEADER_SIZE     14
-#define MIN_ETHERNET_PACKET_SIZE        64      /* with 4 byte crc. */
-#define MAX_ETHERNET_PACKET_SIZE        1518    /* with 4 byte crc. */
-#define MIN_ETHERNET_PACKET_SIZE_NO_CRC 60
-#define MAX_ETHERNET_PACKET_SIZE_NO_CRC 1514
-#define MAX_ETHERNET_PACKET_BUFFER_SIZE 1536    /* A nice even number. */
-#define MAX_ETHERNET_JUMBO_PACKET_SIZE_NO_CRC 9014
-
-#ifndef LM_MAX_MC_TABLE_SIZE
-#define LM_MAX_MC_TABLE_SIZE            32
-#endif /* LM_MAX_MC_TABLE_SIZE */
-#define LM_MC_ENTRY_SIZE                (ETHERNET_ADDRESS_SIZE+1)
-#define LM_MC_INSTANCE_COUNT_INDEX      (LM_MC_ENTRY_SIZE-1)
-
-
-/* Receive filter masks. */
-#define LM_ACCEPT_UNICAST               0x0001
-#define LM_ACCEPT_MULTICAST             0x0002
-#define LM_ACCEPT_ALL_MULTICAST         0x0004
-#define LM_ACCEPT_BROADCAST             0x0008
-#define LM_ACCEPT_ERROR_PACKET          0x0010
-#define LM_KEEP_VLAN_TAG                0x0020
-
-#define LM_PROMISCUOUS_MODE             0x10000
-
-
-
-/******************************************************************************/
-/* PCI registers. */
-/******************************************************************************/
-
-#define PCI_VENDOR_ID_REG               0x00
-#define PCI_DEVICE_ID_REG               0x02
-
-#define PCI_COMMAND_REG                 0x04
-#define PCI_IO_SPACE_ENABLE             0x0001
-#define PCI_MEM_SPACE_ENABLE            0x0002
-#define PCI_BUSMASTER_ENABLE            0x0004
-#define PCI_MEMORY_WRITE_INVALIDATE     0x0010
-#define PCI_PARITY_ERROR_ENABLE         0x0040
-#define PCI_SYSTEM_ERROR_ENABLE         0x0100
-#define PCI_FAST_BACK_TO_BACK_ENABLE    0x0200
-
-#define PCI_STATUS_REG                  0x06
-#define PCI_REV_ID_REG                  0x08
-
-#define PCI_CACHE_LINE_SIZE_REG         0x0c
-
-#define PCI_IO_BASE_ADDR_REG            0x10
-#define PCI_IO_BASE_ADDR_MASK           0xfffffff0
-
-#define PCI_MEM_BASE_ADDR_LOW           0x10
-#define PCI_MEM_BASE_ADDR_HIGH          0x14
-
-#define PCI_SUBSYSTEM_VENDOR_ID_REG     0x2c
-#define PCI_SUBSYSTEM_ID_REG            0x2e
-#define PCI_INT_LINE_REG                0x3c
-
-#define PCIX_CAP_REG                    0x40
-#define PCIX_ENABLE_RELAXED_ORDERING    BIT_17
-
-/******************************************************************************/
-/* Fragment structure. */
-/******************************************************************************/
-
-typedef struct {
-    LM_UINT32 FragSize;
-    LM_PHYSICAL_ADDRESS FragBuf;
-} LM_FRAG, *PLM_FRAG;
-
-typedef struct {
-    /* FragCount is initialized for the caller to the maximum array size, on */
-    /* return FragCount is the number of the actual fragments in the array. */
-    LM_UINT32 FragCount;
-
-    /* Total buffer size. */
-    LM_UINT32 TotalSize;
-
-    /* Fragment array buffer. */
-    LM_FRAG Fragments[1];
-} LM_FRAG_LIST, *PLM_FRAG_LIST;
-
-#define DECLARE_FRAG_LIST_BUFFER_TYPE(_FRAG_LIST_TYPE_NAME, _MAX_FRAG_COUNT) \
-    typedef struct {                                                         \
-        LM_FRAG_LIST FragList;                                               \
-        LM_FRAG FragListBuffer[_MAX_FRAG_COUNT-1];                           \
-    } _FRAG_LIST_TYPE_NAME, *P##_FRAG_LIST_TYPE_NAME
-
-
-
-/******************************************************************************/
-/* Status codes. */
-/******************************************************************************/
-
-#define LM_STATUS_SUCCESS                                       0
-#define LM_STATUS_FAILURE                                       1
-
-#define LM_STATUS_INTERRUPT_ACTIVE                              2
-#define LM_STATUS_INTERRUPT_NOT_ACTIVE                          3
-
-#define LM_STATUS_LINK_ACTIVE                                   4
-#define LM_STATUS_LINK_DOWN                                     5
-#define LM_STATUS_LINK_SETTING_MISMATCH                         6
-
-#define LM_STATUS_TOO_MANY_FRAGMENTS                            7
-#define LM_STATUS_TRANSMIT_ABORTED                              8
-#define LM_STATUS_TRANSMIT_ERROR                                9
-#define LM_STATUS_RECEIVE_ABORTED                               10
-#define LM_STATUS_RECEIVE_ERROR                                 11
-#define LM_STATUS_INVALID_PACKET_SIZE                           12
-#define LM_STATUS_OUT_OF_MAP_REGISTERS                          13
-#define LM_STATUS_UNKNOWN_ADAPTER                               14
-
-typedef LM_UINT LM_STATUS, *PLM_STATUS;
-
-
-/******************************************************************************/
-/* Line speed. */
-/******************************************************************************/
-
-#define LM_LINE_SPEED_UNKNOWN                                   0
-#define LM_LINE_SPEED_AUTO                  LM_LINE_SPEED_UNKNOWN
-#define LM_LINE_SPEED_10MBPS                                    10
-#define LM_LINE_SPEED_100MBPS                                   100
-#define LM_LINE_SPEED_1000MBPS                                  1000
-
-typedef LM_UINT32 LM_LINE_SPEED, *PLM_LINE_SPEED;
-
-
-
-/******************************************************************************/
-/* Duplex mode. */
-/******************************************************************************/
-
-#define LM_DUPLEX_MODE_UNKNOWN                                  0
-#define LM_DUPLEX_MODE_HALF                                     1
-#define LM_DUPLEX_MODE_FULL                                     2
-
-typedef LM_UINT32 LM_DUPLEX_MODE, *PLM_DUPLEX_MODE;
-
-
-
-/******************************************************************************/
-/* Power state. */
-/******************************************************************************/
-
-#define LM_POWER_STATE_D0       0
-#define LM_POWER_STATE_D1       1
-#define LM_POWER_STATE_D2       2
-#define LM_POWER_STATE_D3       3
-
-typedef LM_UINT32 LM_POWER_STATE, *PLM_POWER_STATE;
-
-
-
-/******************************************************************************/
-/* Task offloading. */
-/******************************************************************************/
-
-#define LM_TASK_OFFLOAD_NONE                    0x0000
-#define LM_TASK_OFFLOAD_TX_IP_CHECKSUM          0x0001
-#define LM_TASK_OFFLOAD_RX_IP_CHECKSUM          0x0002
-#define LM_TASK_OFFLOAD_TX_TCP_CHECKSUM         0x0004
-#define LM_TASK_OFFLOAD_RX_TCP_CHECKSUM         0x0008
-#define LM_TASK_OFFLOAD_TX_UDP_CHECKSUM         0x0010
-#define LM_TASK_OFFLOAD_RX_UDP_CHECKSUM         0x0020
-#define LM_TASK_OFFLOAD_TCP_SEGMENTATION        0x0040
-
-typedef LM_UINT32 LM_TASK_OFFLOAD, *PLM_TASK_OFFLOAD;
-
-
-
-/******************************************************************************/
-/* Flow control. */
-/******************************************************************************/
-
-#define LM_FLOW_CONTROL_NONE                    0x00
-#define LM_FLOW_CONTROL_RECEIVE_PAUSE           0x01
-#define LM_FLOW_CONTROL_TRANSMIT_PAUSE          0x02
-#define LM_FLOW_CONTROL_RX_TX_PAUSE (LM_FLOW_CONTROL_RECEIVE_PAUSE | \
-    LM_FLOW_CONTROL_TRANSMIT_PAUSE)
-
-/* This value can be or-ed with RECEIVE_PAUSE and TRANSMIT_PAUSE.  If the */
-/* auto-negotiation is disabled and the RECEIVE_PAUSE and TRANSMIT_PAUSE */
-/* bits are set, then flow control is enabled regardless of link partner's */
-/* flow control capability. */
-#define LM_FLOW_CONTROL_AUTO_PAUSE              0x80000000
-
-typedef LM_UINT32 LM_FLOW_CONTROL, *PLM_FLOW_CONTROL;
-
-
-
-/******************************************************************************/
-/* Wake up mode. */
-/******************************************************************************/
-
-#define LM_WAKE_UP_MODE_NONE                    0
-#define LM_WAKE_UP_MODE_MAGIC_PACKET            1
-#define LM_WAKE_UP_MODE_NWUF                    2
-#define LM_WAKE_UP_MODE_LINK_CHANGE             4
-
-typedef LM_UINT32 LM_WAKE_UP_MODE, *PLM_WAKE_UP_MODE;
-
-
-
-/******************************************************************************/
-/* Counters. */
-/******************************************************************************/
-
-#define LM_COUNTER_FRAMES_XMITTED_OK                            0
-#define LM_COUNTER_FRAMES_RECEIVED_OK                           1
-#define LM_COUNTER_ERRORED_TRANSMIT_COUNT                       2
-#define LM_COUNTER_ERRORED_RECEIVE_COUNT                        3
-#define LM_COUNTER_RCV_CRC_ERROR                                4
-#define LM_COUNTER_ALIGNMENT_ERROR                              5
-#define LM_COUNTER_SINGLE_COLLISION_FRAMES                      6
-#define LM_COUNTER_MULTIPLE_COLLISION_FRAMES                    7
-#define LM_COUNTER_FRAMES_DEFERRED                              8
-#define LM_COUNTER_MAX_COLLISIONS                               9
-#define LM_COUNTER_RCV_OVERRUN                                  10
-#define LM_COUNTER_XMIT_UNDERRUN                                11
-#define LM_COUNTER_UNICAST_FRAMES_XMIT                          12
-#define LM_COUNTER_MULTICAST_FRAMES_XMIT                        13
-#define LM_COUNTER_BROADCAST_FRAMES_XMIT                        14
-#define LM_COUNTER_UNICAST_FRAMES_RCV                           15
-#define LM_COUNTER_MULTICAST_FRAMES_RCV                         16
-#define LM_COUNTER_BROADCAST_FRAMES_RCV                         17
-
-typedef LM_UINT32 LM_COUNTER_TYPE, *PLM_COUNTER_TYPE;
-
-
-
-/******************************************************************************/
-/* Forward definition. */
-/******************************************************************************/
-
-typedef struct _LM_DEVICE_BLOCK *PLM_DEVICE_BLOCK;
-typedef struct _LM_PACKET *PLM_PACKET;
-
-
-
-/******************************************************************************/
-/* Function prototypes. */
-/******************************************************************************/
-
-LM_STATUS LM_GetAdapterInfo(PLM_DEVICE_BLOCK pDevice);
-LM_STATUS LM_InitializeAdapter(PLM_DEVICE_BLOCK pDevice);
-LM_STATUS LM_ResetAdapter(PLM_DEVICE_BLOCK pDevice);
-LM_STATUS LM_DisableInterrupt(PLM_DEVICE_BLOCK pDevice);
-LM_STATUS LM_EnableInterrupt(PLM_DEVICE_BLOCK pDevice);
-LM_STATUS LM_SendPacket(PLM_DEVICE_BLOCK pDevice, PLM_PACKET pPacket);
-LM_STATUS LM_ServiceInterrupts(PLM_DEVICE_BLOCK pDevice);
-#ifdef BCM_NAPI_RXPOLL
-int LM_ServiceRxPoll(PLM_DEVICE_BLOCK pDevice, int limit);
-#endif
-LM_STATUS LM_QueueRxPackets(PLM_DEVICE_BLOCK pDevice);
-LM_STATUS LM_SetReceiveMask(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Mask);
-LM_STATUS LM_Halt(PLM_DEVICE_BLOCK pDevice);
-LM_STATUS LM_Abort(PLM_DEVICE_BLOCK pDevice);
-LM_STATUS LM_ResetChip(PLM_DEVICE_BLOCK pDevice);
-LM_STATUS LM_MulticastAdd(PLM_DEVICE_BLOCK pDevice, PLM_UINT8 pMcAddress);
-LM_STATUS LM_MulticastDel(PLM_DEVICE_BLOCK pDevice, PLM_UINT8 pMcAddress);
-LM_STATUS LM_MulticastClear(PLM_DEVICE_BLOCK pDevice);
-LM_STATUS LM_SetMacAddress(PLM_DEVICE_BLOCK pDevice, PLM_UINT8 pMacAddress);
-LM_STATUS LM_LoopbackAddress(PLM_DEVICE_BLOCK pDevice, PLM_UINT8 pAddress);
-
-LM_UINT32 LM_GetCrcCounter(PLM_DEVICE_BLOCK pDevice);
-
-LM_WAKE_UP_MODE LM_PMCapabilities(PLM_DEVICE_BLOCK pDevice);
-LM_STATUS LM_NwufAdd(PLM_DEVICE_BLOCK pDevice, LM_UINT32 ByteMaskSize,
-    LM_UINT8 *pByteMask, LM_UINT8 *pPattern);
-LM_STATUS LM_NwufRemove(PLM_DEVICE_BLOCK pDevice, LM_UINT32 ByteMaskSize,
-    LM_UINT8 *pByteMask, LM_UINT8 *pPattern);
-LM_STATUS LM_SetPowerState(PLM_DEVICE_BLOCK pDevice, LM_POWER_STATE PowerLevel);
-
-LM_VOID LM_ReadPhy(PLM_DEVICE_BLOCK pDevice, LM_UINT32 PhyReg,
-    PLM_UINT32 pData32);
-LM_VOID LM_WritePhy(PLM_DEVICE_BLOCK pDevice, LM_UINT32 PhyReg,
-    LM_UINT32 Data32);
-
-LM_STATUS LM_EnableMacLoopBack(PLM_DEVICE_BLOCK pDevice);
-LM_STATUS LM_DisableMacLoopBack(PLM_DEVICE_BLOCK pDevice);
-LM_STATUS LM_EnablePhyLoopBack(PLM_DEVICE_BLOCK pDevice);
-LM_STATUS LM_DisablePhyLoopBack(PLM_DEVICE_BLOCK pDevice);
-LM_STATUS LM_EnableExtLoopBack(PLM_DEVICE_BLOCK pDevice, LM_LINE_SPEED Speed);
-LM_STATUS LM_DisableExtLoopBack(PLM_DEVICE_BLOCK pDevice);
-
-LM_STATUS LM_SetupPhy(PLM_DEVICE_BLOCK pDevice);
-LM_STATUS LM_BlinkLED(PLM_DEVICE_BLOCK pDevice, LM_UINT32 BlinkDuration);
-LM_STATUS LM_GetStats(PLM_DEVICE_BLOCK pDevice);
-LM_STATUS LM_NvramRead(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Offset,
-    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);
-
-
-
-/******************************************************************************/
-/* These are the OS specific functions called by LMAC. */
-/******************************************************************************/
-
-LM_STATUS MM_ReadConfig16(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Offset,
-    LM_UINT16 *pValue16);
-LM_STATUS MM_WriteConfig16(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Offset,
-    LM_UINT16 Value16);
-LM_STATUS MM_ReadConfig32(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Offset,
-    LM_UINT32 *pValue32);
-LM_STATUS MM_WriteConfig32(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Offset,
-    LM_UINT32 Value32);
-LM_STATUS MM_MapMemBase(PLM_DEVICE_BLOCK pDevice);
-LM_STATUS MM_MapIoBase(PLM_DEVICE_BLOCK pDevice);
-LM_STATUS MM_IndicateRxPackets(PLM_DEVICE_BLOCK pDevice);
-LM_STATUS MM_IndicateTxPackets(PLM_DEVICE_BLOCK pDevice);
-LM_STATUS MM_StartTxDma(PLM_DEVICE_BLOCK pDevice, PLM_PACKET pPacket);
-LM_STATUS MM_CompleteTxDma(PLM_DEVICE_BLOCK pDevice, PLM_PACKET pPacket);
-LM_STATUS MM_AllocateMemory(PLM_DEVICE_BLOCK pDevice, LM_UINT32 BlockSize, 
-    PLM_VOID *pMemoryBlockVirt);
-LM_STATUS MM_AllocateSharedMemory(PLM_DEVICE_BLOCK pDevice, LM_UINT32 BlockSize,
-    PLM_VOID *pMemoryBlockVirt, PLM_PHYSICAL_ADDRESS pMemoryBlockPhy,
-    LM_BOOL Cached);
-LM_STATUS MM_GetConfig(PLM_DEVICE_BLOCK pDevice);
-LM_STATUS MM_IndicateStatus(PLM_DEVICE_BLOCK pDevice, LM_STATUS Status);
-LM_STATUS MM_InitializeUmPackets(PLM_DEVICE_BLOCK pDevice);
-LM_STATUS MM_FreeRxBuffer(PLM_DEVICE_BLOCK pDevice, PLM_PACKET pPacket);
-LM_STATUS MM_CoalesceTxBuffer(PLM_DEVICE_BLOCK pDevice, PLM_PACKET pPacket);
-PLM_DEVICE_BLOCK MM_FindPeerDev(PLM_DEVICE_BLOCK pDevice);
-LM_VOID MM_UnmapRxDma(PLM_DEVICE_BLOCK pDevice, PLM_PACKET pPacket);
-#ifdef BCM_NAPI_RXPOLL
-LM_STATUS MM_ScheduleRxPoll(PLM_DEVICE_BLOCK pDevice);
-#endif
-LM_STATUS MM_Sleep(PLM_DEVICE_BLOCK pDevice, LM_UINT32 msec);
-LM_STATUS LM_MbufWorkAround(PLM_DEVICE_BLOCK pDevice);
-
-#if INCLUDE_5703_A0_FIX
-LM_STATUS LM_Load5703DmaWFirmware(PLM_DEVICE_BLOCK pDevice);
-#endif
-
-
-#endif /* LM_H */
-
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm/mm.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm/mm.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm/mm.h	2004-06-29 11:24:56.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm/mm.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,554 +0,0 @@
-/******************************************************************************/
-/*                                                                            */
-/* Broadcom BCM5700 Linux Network Driver, Copyright (c) 2000 - 2003 Broadcom  */
-/* 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, located in the file LICENSE.                 */
-/*                                                                            */
-/******************************************************************************/
-
-#ifndef MM_H
-#define MM_H
-
-#include <linux/config.h>
-#if defined(CONFIG_SMP) && ! defined(__SMP__)
-#define __SMP__
-#endif
-#if defined(CONFIG_MODVERSIONS) && defined(MODULE) && ! defined(MODVERSIONS)
-#define MODVERSIONS
-#endif
-
-#ifndef B57UM
-#define __NO_VERSION__
-#endif
-#include <linux/version.h>
-#ifdef MODULE
-#if defined(MODVERSIONS) && (LINUX_VERSION_CODE < 0x020500)
-#include <linux/modversions.h>
-#endif
-#include <linux/module.h>
-#else
-#define MOD_INC_USE_COUNT
-#define MOD_DEC_USE_COUNT
-#define SET_MODULE_OWNER(dev)
-#define MODULE_DEVICE_TABLE(pci, pci_tbl)
-#endif
-
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/string.h>
-#include <linux/timer.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
-#include <linux/slab.h>
-#include <linux/interrupt.h>
-#include <linux/pci.h>
-#include <linux/init.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/skbuff.h>
-#include <asm/processor.h>		/* Processor type for cache alignment. */
-#include <asm/bitops.h>
-#include <asm/io.h>
-#include <asm/unaligned.h>
-#include <linux/delay.h>
-#include <asm/byteorder.h>
-#include <linux/time.h>
-#include <asm/uaccess.h>
-#if (LINUX_VERSION_CODE >= 0x020400)
-#if (LINUX_VERSION_CODE < 0x020500)
-#include <linux/wrapper.h>
-#endif
-#include <linux/ethtool.h>
-#endif
-#ifdef CONFIG_PROC_FS
-#include <linux/smp_lock.h>
-#include <linux/proc_fs.h>
-#define BCM_PROC_FS 1
-#endif
-#ifdef NETIF_F_HW_VLAN_TX
-#include <linux/if_vlan.h>
-#define BCM_VLAN 1
-#endif
-#ifdef NETIF_F_TSO
-#define BCM_TSO 1
-#define INCLUDE_TCP_SEG_SUPPORT 1
-#include <net/ip.h>
-#include <net/tcp.h>
-#include <net/checksum.h>
-#endif
-
-#if (LINUX_VERSION_CODE >= 0x020400)
-#ifndef ETHTOOL_GEEPROM
-
-#define ETHTOOL_GEEPROM		0x0000000b /* Get EEPROM data */
-#define ETHTOOL_SEEPROM		0x0000000c /* Set EEPROM data */
-
-/* for passing EEPROM chunks */
-struct ethtool_eeprom {
-	u32	cmd;
-	u32	magic;
-	u32	offset; /* in bytes */
-	u32	len; /* in bytes */
-	u8	data[0];
-};
-#define BCM_EEDUMP_LEN(info_p, size) *((u32 *) &((info_p)->reserved1[24]))=size
-
-#else
-
-#define BCM_EEDUMP_LEN(info_p, size) (info_p)->eedump_len=size
-
-#endif
-#endif
-
-#define BCM_INT_COAL 1
-#define BCM_NIC_SEND_BD 1
-#define BCM_ASF 1
-#define BCM_WOL 1
-#define BCM_TASKLET 1
-
-#if HAVE_NETIF_RECEIVE_SKB
-#define BCM_NAPI_RXPOLL 1
-#undef BCM_TASKLET
-#endif
-
-#ifdef BCM_SMALL_DRV
-#undef BCM_PROC_FS
-#undef ETHTOOL_GEEPROM
-#undef ETHTOOL_SEEPROM
-#undef ETHTOOL_GREGS
-#undef ETHTOOL_GPAUSEPARAM
-#undef ETHTOOL_GRXCSUM
-#undef BCM_INT_COAL
-#undef BCM_NIC_SEND_BD
-#undef BCM_WOL
-#undef NICE_SUPPORT
-#undef BCM_TASKLET
-#undef BCM_TSO
-#endif
-
-#ifdef __BIG_ENDIAN
-#define BIG_ENDIAN_HOST 1
-#endif
-
-#define MM_SWAP_LE32(x) cpu_to_le32(x)
-#define MM_SWAP_BE32(x) cpu_to_be32(x)
-
-#if (LINUX_VERSION_CODE < 0x020327)
-#define __raw_readl readl
-#define __raw_writel writel
-#endif
-
-#define MM_MEMWRITEL(ptr, val) __raw_writel(val, ptr)
-#define MM_MEMREADL(ptr) __raw_readl(ptr)
-
-typedef atomic_t MM_ATOMIC_T;
-
-#define MM_ATOMIC_SET(ptr, val) atomic_set(ptr, val)
-#define MM_ATOMIC_READ(ptr) atomic_read(ptr)
-#define MM_ATOMIC_INC(ptr) atomic_inc(ptr)
-#define MM_ATOMIC_ADD(ptr, val) atomic_add(val, ptr)
-#define MM_ATOMIC_DEC(ptr) atomic_dec(ptr)
-#define MM_ATOMIC_SUB(ptr, val) atomic_sub(val, ptr)
-
-#define MM_MB() mb()
-#define MM_WMB() wmb()
-
-#include "lm.h"
-#include "queue.h"
-#include "tigon3.h"
-
-#if DBG
-#define STATIC
-#else
-#define STATIC static
-#endif
-
-extern int MM_Packet_Desc_Size;
-
-#define MM_PACKET_DESC_SIZE MM_Packet_Desc_Size
-
-DECLARE_QUEUE_TYPE(UM_RX_PACKET_Q, MAX_RX_PACKET_DESC_COUNT+1);
-
-#define MAX_MEM 16
-#define MAX_MEM2 4
-
-#if (LINUX_VERSION_CODE < 0x020211)
-typedef u32 dma_addr_t;
-#endif
-
-#if (LINUX_VERSION_CODE < 0x02032a)
-#define pci_map_single(dev, address, size, dir) virt_to_bus(address)
-#define pci_unmap_single(dev, dma_addr, size, dir)
-#endif
-
-#if MAX_SKB_FRAGS
-#if (LINUX_VERSION_CODE >= 0x02040d)
-
-typedef dma_addr_t dmaaddr_high_t;
-
-#else
-
-#if defined(CONFIG_HIGHMEM) && defined(CONFIG_X86) && ! defined(CONFIG_X86_64)
-
-#if defined(CONFIG_HIGHMEM64G)
-typedef unsigned long long dmaaddr_high_t;
-#else
-typedef dma_addr_t dmaaddr_high_t;
-#endif
-
-#ifndef pci_map_page
-#define pci_map_page bcm_pci_map_page
-#endif
-
-static inline dmaaddr_high_t
-bcm_pci_map_page(struct pci_dev *dev, struct page *page,
-		    int offset, size_t size, int dir)
-{
-	dmaaddr_high_t phys;
-
-	phys = (page-mem_map) *	(dmaaddr_high_t) PAGE_SIZE + offset;
-
-	return phys;
-}
-
-#ifndef pci_unmap_page
-#define pci_unmap_page(dev, map, size, dir)
-#endif
-
-#else /* #if defined(CONFIG_HIGHMEM) && defined(CONFIG_X86) && ! defined(CONFIG_X86_64)*/
-
-typedef dma_addr_t dmaaddr_high_t;
-
-/* Warning - This may not work for all architectures if HIGHMEM is defined */
-
-#ifndef pci_map_page
-#define pci_map_page(dev, page, offset, size, dir) \
-	pci_map_single(dev, page_address(page) + (offset), size, dir)
-#endif
-#ifndef pci_unmap_page
-#define pci_unmap_page(dev, map, size, dir) \
-	pci_unmap_single(dev, map, size, dir)
-#endif
-
-#endif /* #if defined(CONFIG_HIGHMEM) && defined(CONFIG_X86) && ! defined(CONFIG_X86_64)*/
-
-#endif /* #if (LINUX_VERSION_CODE >= 0x02040d)*/
-#endif /* #if MAX_SKB_FRAGS*/
-
-#if defined (CONFIG_X86) && ! defined(CONFIG_X86_64)
-#define NO_PCI_UNMAP 1
-#endif
-
-#if (LINUX_VERSION_CODE < 0x020412)
-#if ! defined (NO_PCI_UNMAP)
-#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) dma_addr_t ADDR_NAME;
-#define DECLARE_PCI_UNMAP_LEN(LEN_NAME) __u32 LEN_NAME;
-
-#define pci_unmap_addr(PTR, ADDR_NAME)	\
-	((PTR)->ADDR_NAME)
-
-#define pci_unmap_len(PTR, LEN_NAME)	\
-	((PTR)->LEN_NAME)
-
-#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)	\
-	(((PTR)->ADDR_NAME) = (VAL))
-
-#define pci_unmap_len_set(PTR, LEN_NAME, VAL)	\
-	(((PTR)->LEN_NAME) = (VAL))
-#else
-#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)
-#define DECLARE_PCI_UNMAP_LEN(ADDR_NAME)
-
-#define pci_unmap_addr(PTR, ADDR_NAME)	0
-#define pci_unmap_len(PTR, LEN_NAME)	0
-#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) do { } while (0)
-#define pci_unmap_len_set(PTR, LEN_NAME, VAL) do { } while (0)
-#endif
-#endif
-
-#if (LINUX_VERSION_CODE < 0x02030e)
-#define net_device device
-#define netif_carrier_on(dev)
-#define netif_carrier_off(dev)
-#endif
-
-#if (LINUX_VERSION_CODE < 0x02032b)
-#define tasklet_struct			tq_struct
-#endif
-
-typedef struct _UM_DEVICE_BLOCK {
-	LM_DEVICE_BLOCK lm_dev;
-	struct net_device *dev;
-	struct pci_dev *pdev;
-	struct net_device *next_module;
-	char *name;
-#ifdef BCM_PROC_FS
-	struct proc_dir_entry *pfs_entry;
-	char pfs_name[32];
-#endif
-	void *mem_list[MAX_MEM];
-	dma_addr_t dma_list[MAX_MEM];
-	int mem_size_list[MAX_MEM];
-	int mem_list_num;
-
-#ifdef NICE_SUPPORT
-	void *mem_list2[MAX_MEM2];		/* for diagnostics ioctl */
-	dma_addr_t dma_list2[MAX_MEM2];
-	__u64 cpu_pa_list2[MAX_MEM2];
-	int mem_size_list2[MAX_MEM2];
-#endif
-	int index;
-	int opened;
-	int suspended;
-	int using_dac;		/* dual address cycle */
-	int delayed_link_ind; /* Delay link status during initial load */
-	int adapter_just_inited; /* the first few seconds after init. */
-	int timer_interval;
-	int adaptive_expiry;
-	int crc_counter_expiry;
-	int poll_tbi_interval;
-	int poll_tbi_expiry;
-	int asf_heartbeat;
-	int tx_full;
-	int tx_queued;
-	int line_speed;		/* in Mbps, 0 if link is down */
-	UM_RX_PACKET_Q rx_out_of_buf_q;
-	int rx_out_of_buf;
-	int rx_buf_repl_thresh;
-	int rx_buf_repl_panic_thresh;
-	int rx_buf_repl_isr_limit;
-	int rx_buf_align;
-	struct timer_list timer;
-	int do_global_lock;
-	spinlock_t global_lock;
-	spinlock_t undi_lock;
-	spinlock_t phy_lock;
-	unsigned long undi_flags;
-	volatile unsigned long interrupt;
-	atomic_t intr_sem;
-	int tasklet_pending;
-	volatile unsigned long tasklet_busy;
-	struct tasklet_struct tasklet;
-	struct net_device_stats stats;
-#ifdef NICE_SUPPORT
-	void (*nice_rx)( struct sk_buff*, void* );
-	void* nice_ctx;
-	int intr_test;
-	int intr_test_result;
-#endif /* NICE_SUPPORT */
-#ifdef NETIF_F_HW_VLAN_TX
-	struct vlan_group *vlgrp;
-#endif
-	int vlan_tag_mode;	/* Setting to allow ASF to work properly with */
-				/* VLANs                                      */
-	#define VLAN_TAG_MODE_AUTO_STRIP              0
-	#define VLAN_TAG_MODE_NORMAL_STRIP            1
-	#define VLAN_TAG_MODE_FORCED_STRIP            2
-
-	/* Auto mode - VLAN TAGs are always stripped if ASF is enabled,   */
-	/*             If ASF is not enabled, it will be in normal mode.  */
-	/* Normal mode - VLAN TAGs are stripped when VLANs are registered */
-	/* Forced mode - VLAN TAGs are always stripped.                   */
-
-	int adaptive_coalesce;
-	uint rx_last_cnt;
-	uint tx_last_cnt;
-	uint rx_curr_coalesce_frames;
-	uint rx_curr_coalesce_frames_intr;
-	uint rx_curr_coalesce_ticks;
-	uint tx_curr_coalesce_frames;
-#if TIGON3_DEBUG
-	unsigned long tx_zc_count;
-	unsigned long tx_chksum_count;
-	unsigned long tx_himem_count;
-	unsigned long rx_good_chksum_count;
-#endif
-	unsigned long rx_bad_chksum_count;
-#ifdef BCM_TSO
-	unsigned long tso_pkt_count;
-#endif
-	unsigned long rx_misc_errors;
-} UM_DEVICE_BLOCK, *PUM_DEVICE_BLOCK;
-
-typedef struct _UM_PACKET {
-	LM_PACKET lm_packet;
-	struct sk_buff *skbuff;
-#if MAX_SKB_FRAGS
-	DECLARE_PCI_UNMAP_ADDR(map[MAX_SKB_FRAGS + 1])
-	DECLARE_PCI_UNMAP_LEN(map_len[MAX_SKB_FRAGS + 1])
-#else
-	DECLARE_PCI_UNMAP_ADDR(map[1])
-	DECLARE_PCI_UNMAP_LEN(map_len[1])
-#endif
-} UM_PACKET, *PUM_PACKET;
-
-static inline void MM_SetAddr(LM_PHYSICAL_ADDRESS *paddr, dma_addr_t addr)
-{
-#if (BITS_PER_LONG == 64)
-	paddr->High = ((unsigned long) addr) >> 32;
-	paddr->Low = ((unsigned long) addr) & 0xffffffff;
-#else
-	paddr->High = 0;
-	paddr->Low = (unsigned long) addr;
-#endif
-}
-
-static inline void MM_SetT3Addr(T3_64BIT_HOST_ADDR *paddr, dma_addr_t addr)
-{
-#if (BITS_PER_LONG == 64)
-	paddr->High = ((unsigned long) addr) >> 32;
-	paddr->Low = ((unsigned long) addr) & 0xffffffff;
-#else
-	paddr->High = 0;
-	paddr->Low = (unsigned long) addr;
-#endif
-}
-
-#if MAX_SKB_FRAGS
-static inline void MM_SetT3AddrHigh(T3_64BIT_HOST_ADDR *paddr,
-	dmaaddr_high_t addr)
-{
-#if defined(CONFIG_HIGHMEM64G) && defined(CONFIG_X86) && ! defined(CONFIG_X86_64)
-	paddr->High = (unsigned long) (addr >> 32);
-	paddr->Low = (unsigned long) (addr & 0xffffffff);
-#else
-	MM_SetT3Addr(paddr, (dma_addr_t) addr);
-#endif
-}
-#endif
-
-static inline void MM_MapRxDma(PLM_DEVICE_BLOCK pDevice,
-	struct _LM_PACKET *pPacket,
-	T3_64BIT_HOST_ADDR *paddr)
-{
-	dma_addr_t map;
-	struct sk_buff *skb = ((struct _UM_PACKET *) pPacket)->skbuff;
-
-	map = pci_map_single(((struct _UM_DEVICE_BLOCK *)pDevice)->pdev,
-			skb->tail,
-			pPacket->u.Rx.RxBufferSize,
-			PCI_DMA_FROMDEVICE);
-	pci_unmap_addr_set(((struct _UM_PACKET *) pPacket), map[0], map);
-	MM_SetT3Addr(paddr, map);
-}
-
-static inline void MM_MapTxDma(PLM_DEVICE_BLOCK pDevice,
-	struct _LM_PACKET *pPacket,
-	T3_64BIT_HOST_ADDR *paddr,
-	LM_UINT32 *len,
-	int frag)
-{
-	dma_addr_t map;
-	struct sk_buff *skb = ((struct _UM_PACKET *) pPacket)->skbuff;
-	unsigned int length;
-
-	if (frag == 0) {
-#if MAX_SKB_FRAGS
-		if (skb_shinfo(skb)->nr_frags)
-			length = skb->len - skb->data_len;
-		else
-#endif
-			length = skb->len;
-		map = pci_map_single(((struct _UM_DEVICE_BLOCK *)pDevice)->pdev,
-			skb->data, length, PCI_DMA_TODEVICE);
-		MM_SetT3Addr(paddr, map);
-		pci_unmap_addr_set(((struct _UM_PACKET *)pPacket), map[0], map);
-		pci_unmap_len_set(((struct _UM_PACKET *) pPacket), map_len[0],
-			length);
-		*len = length;
-	}
-#if MAX_SKB_FRAGS
-	else {
-		skb_frag_t *sk_frag;
-		dmaaddr_high_t hi_map;
-
-		sk_frag = &skb_shinfo(skb)->frags[frag - 1];
-			
-		hi_map = pci_map_page(
-				((struct _UM_DEVICE_BLOCK *)pDevice)->pdev,
-				sk_frag->page,
-				sk_frag->page_offset,
-				sk_frag->size, PCI_DMA_TODEVICE);
-
-		MM_SetT3AddrHigh(paddr, hi_map);
-		pci_unmap_addr_set(((struct _UM_PACKET *) pPacket), map[frag],
-			hi_map);
-		pci_unmap_len_set(((struct _UM_PACKET *) pPacket),
-			map_len[frag], sk_frag->size);
-		*len = sk_frag->size;
-	}
-#endif
-}
-
-#define BCM5700_PHY_LOCK(pUmDevice, flags) {				\
-	spinlock_t *lock;						\
-	if ((pUmDevice)->do_global_lock) {				\
-		lock = &(pUmDevice)->global_lock;			\
-	}								\
-	else {								\
-		lock = &(pUmDevice)->phy_lock;				\
-	}								\
-	spin_lock_irqsave(lock, flags);					\
-}
-
-#define BCM5700_PHY_UNLOCK(pUmDevice, flags) {				\
-	spinlock_t *lock;						\
-	if ((pUmDevice)->do_global_lock) {				\
-		lock = &(pUmDevice)->global_lock;			\
-	}								\
-	else {								\
-		lock = &(pUmDevice)->phy_lock;				\
-	}								\
-	spin_unlock_irqrestore(lock, flags);				\
-}
-
-
-#define MM_ACQUIRE_UNDI_LOCK(_pDevice) \
-	if (!(((PUM_DEVICE_BLOCK)(_pDevice))->do_global_lock)) {	\
-		unsigned long flags;					\
-		spin_lock_irqsave(&((PUM_DEVICE_BLOCK)(_pDevice))->undi_lock, flags);	\
-		((PUM_DEVICE_BLOCK)(_pDevice))->undi_flags = flags; \
-	}
-
-#define MM_RELEASE_UNDI_LOCK(_pDevice) \
-	if (!(((PUM_DEVICE_BLOCK)(_pDevice))->do_global_lock)) {	\
-		unsigned long flags = ((PUM_DEVICE_BLOCK) (_pDevice))->undi_flags; \
-		spin_unlock_irqrestore(&((PUM_DEVICE_BLOCK)(_pDevice))->undi_lock, flags); \
-	}
-
-#define MM_ACQUIRE_PHY_LOCK_IN_IRQ(_pDevice) \
-	if (!(((PUM_DEVICE_BLOCK)(_pDevice))->do_global_lock)) {	\
-		spin_lock(&((PUM_DEVICE_BLOCK)(_pDevice))->phy_lock);	\
-	}
-
-#define MM_RELEASE_PHY_LOCK_IN_IRQ(_pDevice) \
-	if (!(((PUM_DEVICE_BLOCK)(_pDevice))->do_global_lock)) {	\
-		spin_unlock(&((PUM_DEVICE_BLOCK)(_pDevice))->phy_lock); \
-	}
-
-#define MM_UINT_PTR(_ptr)   ((unsigned long) (_ptr))
-
-#if (BITS_PER_LONG == 64)
-#define MM_GETSTATS(_Ctr) \
-	(unsigned long) (_Ctr).Low + ((unsigned long) (_Ctr).High << 32)
-#else
-#define MM_GETSTATS(_Ctr) \
-	(unsigned long) (_Ctr).Low
-#endif
-
-
-#define printf(fmt, args...) printk(KERN_WARNING fmt, ##args)
-
-#define DbgPrint(fmt, arg...) printk(KERN_DEBUG fmt, ##arg)
-#if defined(CONFIG_X86)
-#define DbgBreakPoint() __asm__("int $129")
-#else
-#define DbgBreakPoint()
-#endif
-#define MM_Wait(time) udelay(time)
-
-#endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm/nicext.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm/nicext.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm/nicext.h	2004-06-29 11:24:56.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm/nicext.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,214 +0,0 @@
-/****************************************************************************
- * Copyright(c) 2000-2003 Broadcom 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.          
- *
- * Name:        nicext.h
- *
- * Description: Broadcom Network Interface Card Extension (NICE) is an 
- *              extension to Linux NET device kernel mode drivers. 
- *              NICE is designed to provide additional functionalities, 
- *              such as receive packet intercept. To support Broadcom NICE, 
- *              the network device driver can be modified by adding an 
- *              device ioctl handler and by indicating receiving packets 
- *              to the NICE receive handler. Broadcom NICE will only be 
- *              enabled by a NICE-aware intermediate driver, such as 
- *              Broadcom Advanced Server Program Driver (BASP). When NICE 
- *              is not enabled, the modified network device drivers 
- *              functions exactly as other non-NICE aware drivers.
- *
- * Author:      Frankie Fan
- *
- * Created:     September 17, 2000
- *
- ****************************************************************************/
-#ifndef _nicext_h_
-#define _nicext_h_
-
-/*
- * ioctl for NICE
- */
-#define SIOCNICE                   	SIOCDEVPRIVATE+7
-
-/*
- * SIOCNICE: 
- *
- * The following structure needs to be less than IFNAMSIZ (16 bytes) because
- * we're overloading ifreq.ifr_ifru.
- *
- * If 16 bytes is not enough, we should consider relaxing this because
- * this is no field after ifr_ifru in the ifreq structure. But we may
- * run into future compatiability problem in case of changing struct ifreq.
- */
-struct nice_req
-{
-    __u32 cmd;
-    
-    union
-    {
-#ifdef __KERNEL__
-        /* cmd = NICE_CMD_SET_RX or NICE_CMD_GET_RX */
-        /* cmd = NICE_CMD_SET_RX_NAPI or NICE_CMD_GET_RX_NAPI */
-        struct
-        {
-            void (*nrqus1_rx)( struct sk_buff*, void* );
-            void* nrqus1_ctx;
-        } nrqu_nrqus1;
-
-        /* cmd = NICE_CMD_QUERY_SUPPORT */
-        struct
-        {
-            __u32 nrqus2_magic;
-            __u32 nrqus2_support_rx:1;
-            __u32 nrqus2_support_vlan:1;
-            __u32 nrqus2_support_get_speed:1;
-            __u32 nrqus2_support_rx_napi:1;
-        } nrqu_nrqus2;
-#endif
-
-        void *align_ptr;  /* this field is not used, it is to align the union */
-                          /* in 64-bit user mode */
-
-        /* cmd = NICE_CMD_GET_SPEED - in Mbps or 0 if link down */
-        /* cmd = NICE_CMD_ENABLE_EXT_LOOPBACK  - in Mbps */
-        struct
-        {
-            unsigned int nrqus3_speed;   /* 1000 = Gb, 100 = 100mbs, 10 = 10mbs */
-        } nrqu_nrqus3;
-
-        /* cmd = NICE_CMD_BLINK_LED */
-        struct
-        {
-            unsigned int nrqus4_blink_time; /* blink duration in seconds */
-        } nrqu_nrqus4;
-
-        /* cmd = NICE_CMD_REG_READ */
-        /* cmd = NICE_CMD_REG_WRITE */
-        /* cmd = NICE_CMD_MEM_READ */
-        /* cmd = NICE_CMD_MEM_WRITE */
-        /* cmd = NICE_CMD_REG_READ_DIRECT */
-        /* cmd = NICE_CMD_REG_WRITE_DIRECT */
-        /* cmd = NICE_CMD_CFG_READ32 */
-        /* cmd = NICE_CMD_CFG_READ16 */
-        /* cmd = NICE_CMD_CFG_READ8 */
-        /* cmd = NICE_CMD_CFG_WRITE32 */
-        /* cmd = NICE_CMD_CFG_WRITE16 */
-        /* cmd = NICE_CMD_CFG_WRITE8 */
-        struct
-        {
-            unsigned int nrqus5_offset; /* offset */
-            unsigned int nrqus5_data; /* value */
-        } nrqu_nrqus5;
-
-        /* cmd = NICE_CMD_INTERRUPT_TEST */
-        struct
-        {
-            unsigned int nrqus6_intr_test_result; /* 1 == pass */
-        } nrqu_nrqus6;
-
-        /* cmd = NICE_CMD_KMALLOC_PHYS */
-        /* cmd = NICE_CMD_KFREE_PHYS */
-        /* These commands allow the diagnostics app. to allocate and free */
-        /* PCI consistent memory for DMA tests */
-        struct
-        {
-            unsigned int nrqus7_size; /* size(bytes) to allocate, not used    */
-                                      /* when cmd is NICE_CMD_KFREE_PHYS.     */
-            __u32 nrqus7_phys_addr_lo;/* CPU physical address allocated or    */
-            __u32 nrqus7_phys_addr_hi;/* to be freed.                         */
-                                      /* PCI physical address is contained in */
-                                      /* the 1st 64 bit of the allocated      */
-                                      /* buffer. Use open("/dev/mem")/lseek() */
-                                      /* and read()/write() to a access       */
-                                      /* buffer in user space.                */
-                                      /* mmap() only works on x86.            */
-        } nrqu_nrqus7;
-        
-        /* cmd = NICE_CMD_SET_WRITE_PROTECT */
-        struct
-        {
-            unsigned int nrqus8_data; /* 1 == set write protect, 0 == clear write protect */
-        } nrqu_nrqus8;
-
-        /* cmd = NICE_CMD_GET_STATS_BLOCK */
-        struct
-        {
-            void *nrqus9_useraddr; /* user space address for the stats block */
-            unsigned int nrqus9_size;/* size (in bytes)                      */
-                                     /* (0x6c0 for the whole block)          */
-        } nrqu_nrqus9;
-        
-    } nrq_nrqu;
-};
-
-#define nrq_rx           nrq_nrqu.nrqu_nrqus1.nrqus1_rx
-#define nrq_ctx          nrq_nrqu.nrqu_nrqus1.nrqus1_ctx
-#define nrq_support_rx   nrq_nrqu.nrqu_nrqus2.nrqus2_support_rx
-#define nrq_magic        nrq_nrqu.nrqu_nrqus2.nrqus2_magic
-#define nrq_support_vlan nrq_nrqu.nrqu_nrqus2.nrqus2_support_vlan
-#define nrq_support_get_speed nrq_nrqu.nrqu_nrqus2.nrqus2_support_get_speed
-#define nrq_support_rx_napi nrq_nrqu.nrqu_nrqus2.nrqus2_support_rx_napi
-#define nrq_speed        nrq_nrqu.nrqu_nrqus3.nrqus3_speed
-#define nrq_blink_time   nrq_nrqu.nrqu_nrqus4.nrqus4_blink_time
-#define nrq_offset       nrq_nrqu.nrqu_nrqus5.nrqus5_offset
-#define nrq_data         nrq_nrqu.nrqu_nrqus5.nrqus5_data
-#define nrq_intr_test_result  nrq_nrqu.nrqu_nrqus6.nrqus6_intr_test_result
-#define nrq_size         nrq_nrqu.nrqu_nrqus7.nrqus7_size
-#define nrq_phys_addr_lo nrq_nrqu.nrqu_nrqus7.nrqus7_phys_addr_lo
-#define nrq_phys_addr_hi nrq_nrqu.nrqu_nrqus7.nrqus7_phys_addr_hi
-#define nrq_write_protect nrq_nrqu.nrqu_nrqus8.nrqus8_data
-#define nrq_stats_useraddr nrq_nrqu.nrqu_nrqus9.nrqus9_useraddr
-#define nrq_stats_size    nrq_nrqu.nrqu_nrqus9.nrqus9_size
-
-/*
- * magic constants
- */
-#define NICE_REQUESTOR_MAGIC            0x4543494E // NICE in ascii
-#define NICE_DEVICE_MAGIC               0x4E494345 // ECIN in ascii
-
-/*
- * command field
- */
-typedef enum {
-    NICE_CMD_QUERY_SUPPORT         = 0x00000001,
-    NICE_CMD_SET_RX                = 0x00000002,
-    NICE_CMD_GET_RX                = 0x00000003,
-    NICE_CMD_GET_SPEED             = 0x00000004,
-    NICE_CMD_BLINK_LED             = 0x00000005,
-    NICE_CMD_DIAG_SUSPEND          = 0x00000006,
-    NICE_CMD_DIAG_RESUME           = 0x00000007,
-    NICE_CMD_REG_READ              = 0x00000008,
-    NICE_CMD_REG_WRITE             = 0x00000009,
-    NICE_CMD_MEM_READ              = 0x0000000a,
-    NICE_CMD_MEM_WRITE             = 0x0000000b,
-    NICE_CMD_ENABLE_MAC_LOOPBACK   = 0x0000000c,
-    NICE_CMD_DISABLE_MAC_LOOPBACK  = 0x0000000d,
-    NICE_CMD_ENABLE_PHY_LOOPBACK   = 0x0000000e,
-    NICE_CMD_DISABLE_PHY_LOOPBACK  = 0x0000000f,
-    NICE_CMD_INTERRUPT_TEST        = 0x00000010,
-    NICE_CMD_SET_WRITE_PROTECT     = 0x00000011,
-    NICE_CMD_SET_RX_NAPI           = 0x00000012,
-    NICE_CMD_GET_RX_NAPI           = 0x00000013,
-    NICE_CMD_ENABLE_EXT_LOOPBACK   = 0x00000014,
-    NICE_CMD_DISABLE_EXT_LOOPBACK  = 0x00000015,
-    NICE_CMD_CFG_READ32            = 0x00000016,
-    NICE_CMD_CFG_READ16            = 0x00000017,
-    NICE_CMD_CFG_READ8             = 0x00000018,
-    NICE_CMD_CFG_WRITE32           = 0x00000019,
-    NICE_CMD_CFG_WRITE16           = 0x0000001a,
-    NICE_CMD_CFG_WRITE8            = 0x0000001b,
-                                   
-    NICE_CMD_REG_READ_DIRECT       = 0x0000001e,
-    NICE_CMD_REG_WRITE_DIRECT      = 0x0000001f,
-    NICE_CMD_RESET                 = 0x00000020,
-    NICE_CMD_KMALLOC_PHYS          = 0x00000021,
-    NICE_CMD_KFREE_PHYS            = 0x00000022,
-    NICE_CMD_GET_STATS_BLOCK       = 0x00000023,
-    NICE_CMD_CLR_STATS_BLOCK       = 0x00000024,
-    NICE_CMD_MAX
-} nice_cmds;                           
-
-#endif  // _nicext_h_ 
-
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm/queue.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm/queue.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm/queue.h	2004-06-29 11:24:56.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm/queue.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,347 +0,0 @@
-/******************************************************************************/
-/*                                                                            */
-/* Broadcom BCM5700 Linux Network Driver, Copyright (c) 2000 - 2003 Broadcom  */
-/* 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, located in the file LICENSE.                 */
-/*                                                                            */
-/* Queue functions.                                                           */
-/*    void          QQ_InitQueue(PQQ_CONTAINER pQueue)                        */
-/*    char          QQ_Full(PQQ_CONTAINER pQueue)                             */
-/*    char          QQ_Empty(PQQ_CONTAINER pQueue)                            */
-/*    unsigned int QQ_GetSize(PQQ_CONTAINER pQueue)                          */
-/*    unsigned int QQ_GetEntryCnt(PQQ_CONTAINER pQueue)                      */
-/*    char          QQ_PushHead(PQQ_CONTAINER pQueue, PQQ_ENTRY pEntry)       */
-/*    char          QQ_PushTail(PQQ_CONTAINER pQueue, PQQ_ENTRY pEntry)       */
-/*    PQQ_ENTRY     QQ_PopHead(PQQ_CONTAINER pQueue)                          */
-/*    PQQ_ENTRY     QQ_PopTail(PQQ_CONTAINER pQueue)                          */
-/*    PQQ_ENTRY     QQ_GetHead(PQQ_CONTAINER pQueue, unsigned int Idx)       */
-/*    PQQ_ENTRY     QQ_GetTail(PQQ_CONTAINER pQueue, unsigned int Idx)       */
-/*                                                                            */
-/*                                                                            */
-/* History:                                                                   */
-/*    02/25/00 Hav Khauv        Initial version.                              */
-/******************************************************************************/
-
-#ifndef BCM_QUEUE_H
-#define BCM_QUEUE_H
-
-
-
-/******************************************************************************/
-/* Queue definitions. */
-/******************************************************************************/
-
-/* Entry for queueing. */
-typedef void *PQQ_ENTRY;
-
-
-/* Queue header -- base type. */
-typedef struct {
-    unsigned int Head;
-    unsigned int Tail;
-    unsigned int Size;
-    MM_ATOMIC_T EntryCnt;
-    PQQ_ENTRY Array[1];
-} QQ_CONTAINER, *PQQ_CONTAINER;
-
-
-/* Declare queue type macro. */
-#define DECLARE_QUEUE_TYPE(_QUEUE_TYPE, _QUEUE_SIZE)            \
-                                                                \
-    typedef struct {                                            \
-        QQ_CONTAINER Container;                                 \
-        PQQ_ENTRY EntryBuffer[_QUEUE_SIZE];                     \
-    } _QUEUE_TYPE, *P##_QUEUE_TYPE
-
-
-
-/******************************************************************************/
-/* Compilation switches. */
-/******************************************************************************/
-
-#if DBG
-#undef QQ_NO_OVERFLOW_CHECK
-#undef QQ_NO_UNDERFLOW_CHECK
-#endif /* DBG */
-
-#ifdef QQ_USE_MACROS
-/* notdone */
-#else
-
-#ifdef QQ_NO_INLINE
-#define __inline
-#endif /* QQ_NO_INLINE */
-
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-__inline static void 
-QQ_InitQueue(
-PQQ_CONTAINER pQueue,
-unsigned int QueueSize) {
-    pQueue->Head = 0;
-    pQueue->Tail = 0;
-    pQueue->Size = QueueSize+1;
-    MM_ATOMIC_SET(&pQueue->EntryCnt, 0);
-} /* QQ_InitQueue */
-
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-__inline static char 
-QQ_Full(
-PQQ_CONTAINER pQueue) {
-    unsigned int NewHead;
-
-    NewHead = (pQueue->Head + 1) % pQueue->Size;
-
-    return(NewHead == pQueue->Tail);
-} /* QQ_Full */
-
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-__inline static char 
-QQ_Empty(
-PQQ_CONTAINER pQueue) {
-    return(pQueue->Head == pQueue->Tail);
-} /* QQ_Empty */
-
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-__inline static unsigned int 
-QQ_GetSize(
-PQQ_CONTAINER pQueue) {
-    return pQueue->Size;
-} /* QQ_GetSize */
-
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-__inline static unsigned int 
-QQ_GetEntryCnt(
-PQQ_CONTAINER pQueue) {
-    return MM_ATOMIC_READ(&pQueue->EntryCnt);
-} /* QQ_GetEntryCnt */
-
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/*    TRUE entry was added successfully.                                      */
-/*    FALSE queue is full.                                                    */
-/******************************************************************************/
-__inline static char 
-QQ_PushHead(
-PQQ_CONTAINER pQueue, 
-PQQ_ENTRY pEntry) {
-    unsigned int Head;
-
-    Head = (pQueue->Head + 1) % pQueue->Size;
-
-#if !defined(QQ_NO_OVERFLOW_CHECK)
-    if(Head == pQueue->Tail) {
-        return 0;
-    } /* if */
-#endif /* QQ_NO_OVERFLOW_CHECK */
-
-    pQueue->Array[pQueue->Head] = pEntry;
-    MM_WMB();
-    pQueue->Head = Head;
-    MM_ATOMIC_INC(&pQueue->EntryCnt);
-
-    return -1;
-} /* QQ_PushHead */
-
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/*    TRUE entry was added successfully.                                      */
-/*    FALSE queue is full.                                                    */
-/******************************************************************************/
-__inline static char 
-QQ_PushTail(
-PQQ_CONTAINER pQueue,
-PQQ_ENTRY pEntry) {
-    unsigned int Tail;
-
-    Tail = pQueue->Tail;
-    if(Tail == 0) {
-        Tail = pQueue->Size;
-    } /* if */
-    Tail--;
-
-#if !defined(QQ_NO_OVERFLOW_CHECK)
-    if(Tail == pQueue->Head) {
-        return 0;
-    } /* if */
-#endif /* QQ_NO_OVERFLOW_CHECK */
-
-    pQueue->Array[Tail] = pEntry;
-    MM_WMB();
-    pQueue->Tail = Tail;
-    MM_ATOMIC_INC(&pQueue->EntryCnt);
-
-    return -1;
-} /* QQ_PushTail */
-
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-__inline static PQQ_ENTRY
-QQ_PopHead(
-PQQ_CONTAINER pQueue) {
-    unsigned int Head;
-    unsigned int Tail;
-    PQQ_ENTRY Entry;
-
-    Head = pQueue->Head;
-    Tail = pQueue->Tail;
-
-    MM_MB();
-#if !defined(QQ_NO_UNDERFLOW_CHECK)
-    if(Head == Tail) {
-        return (PQQ_ENTRY) 0;
-    } /* if */
-#endif /* QQ_NO_UNDERFLOW_CHECK */
-
-    if(Head == 0) {
-        Head = pQueue->Size;
-    } /* if */
-    Head--;
-
-    Entry = pQueue->Array[Head];
-    MM_MB();
-    pQueue->Head = Head;
-    MM_ATOMIC_DEC(&pQueue->EntryCnt);
-
-    return Entry;
-} /* QQ_PopHead */
-
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-__inline static PQQ_ENTRY
-QQ_PopTail(
-PQQ_CONTAINER pQueue) {
-    unsigned int Head;
-    unsigned int Tail;
-    PQQ_ENTRY Entry;
-
-    Head = pQueue->Head;
-    Tail = pQueue->Tail;
-
-    MM_MB();
-#if !defined(QQ_NO_UNDERFLOW_CHECK)
-    if(Tail == Head) {
-        return (PQQ_ENTRY) 0;
-    } /* if */
-#endif /* QQ_NO_UNDERFLOW_CHECK */
-
-    Entry = pQueue->Array[Tail];
-    MM_MB();
-    pQueue->Tail = (Tail + 1) % pQueue->Size;
-    MM_ATOMIC_DEC(&pQueue->EntryCnt);
-
-    return Entry;
-} /* QQ_PopTail */
-
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-__inline static PQQ_ENTRY
-QQ_GetHead(
-    PQQ_CONTAINER pQueue,
-    unsigned int Idx)
-{
-    if(Idx >= (unsigned int) MM_ATOMIC_READ(&pQueue->EntryCnt))
-    {
-        return (PQQ_ENTRY) 0;
-    }
-
-    if(pQueue->Head > Idx)
-    {
-        Idx = pQueue->Head - Idx;
-    }
-    else
-    {
-        Idx = pQueue->Size - (Idx - pQueue->Head);
-    }
-    Idx--;
-
-    return pQueue->Array[Idx];
-}
-
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-__inline static PQQ_ENTRY
-QQ_GetTail(
-    PQQ_CONTAINER pQueue,
-    unsigned int Idx)
-{
-    if(Idx >= (unsigned int) MM_ATOMIC_READ(&pQueue->EntryCnt))
-    {
-        return (PQQ_ENTRY) 0;
-    }
-
-    Idx += pQueue->Tail;
-    if(Idx >= pQueue->Size)
-    {
-        Idx = Idx - pQueue->Size;
-    }
-
-    return pQueue->Array[Idx];
-}
-
-#endif /* QQ_USE_MACROS */
-
-
-
-#endif /* QUEUE_H */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm/tcp_seg.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm/tcp_seg.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm/tcp_seg.c	2004-06-29 11:24:56.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm/tcp_seg.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,98 +0,0 @@
-/******************************************************************************/
-/*                                                                            */
-/* Broadcom BCM5700 Linux Network Driver, Copyright (c) 2002 - 2003 Broadcom  */
-/* 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, located in the file LICENSE.                 */
-/*                                                                            */
-/* History:                                                                   */
-/*                                                                            */
-/******************************************************************************/
-
-#include "mm.h"
-
-#if INCLUDE_TCP_SEG_SUPPORT
-#include "fw_stkoffld.h"
-#include "fw_lso05.h"
-
-LM_UINT32 LM_GetStkOffLdFirmwareSize(PLM_DEVICE_BLOCK pDevice)
-{
-  LM_UINT32 FwSize;
-
-  if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705) 
-    {
-      FwSize =  (LM_UINT32)(t3StkOffLd05FwTextLen + 
-			    t3StkOffLd05FwRodataLen + 
-			    t3StkOffLd05FwDataLen +
-			    t3StkOffLd05FwSbssLen +
-			    t3StkOffLd05FwBssLen);
-    }
-  else
-    {
-      FwSize = (LM_UINT32)(t3StkOffLdFwTextLen +
-			   t3StkOffLdFwRodataLen +
-			   t3StkOffLdFwDataLen +
-			   t3StkOffLdFwSbssLen +
-			   t3StkOffLdFwBssLen);
-    }
-
-  return FwSize;
-}
-
-LM_STATUS LM_LoadStkOffLdFirmware(PLM_DEVICE_BLOCK pDevice)
-{
-  T3_FWIMG_INFO FwImgInfo;
-  LM_UINT32 Cpu;
-
-  if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705) 
-    {
-      FwImgInfo.StartAddress = t3StkOffLd05FwStartAddr;
-      FwImgInfo.Text.Buffer = (PLM_UINT8)t3StkOffLd05FwText;
-      FwImgInfo.Text.Offset  = t3StkOffLd05FwTextAddr;
-      FwImgInfo.Text.Length  = t3StkOffLd05FwTextLen;
-      FwImgInfo.ROnlyData.Buffer = (PLM_UINT8)t3StkOffLd05FwRodata;
-      FwImgInfo.ROnlyData.Offset  = t3StkOffLd05FwRodataAddr;
-      FwImgInfo.ROnlyData.Length  = t3StkOffLd05FwRodataLen;
-      FwImgInfo.Data.Buffer = (PLM_UINT8)t3StkOffLd05FwData;
-      FwImgInfo.Data.Offset  = t3StkOffLd05FwDataAddr;
-      FwImgInfo.Data.Length  = t3StkOffLd05FwDataLen;
-      FwImgInfo.Sbss.Offset = t3StkOffLd05FwSbssAddr;
-      FwImgInfo.Sbss.Length = t3StkOffLd05FwSbssLen;
-      FwImgInfo.Bss.Offset = t3StkOffLd05FwBssAddr;
-      FwImgInfo.Bss.Length = t3StkOffLd05FwBssLen;
-      Cpu = T3_RX_CPU_ID;
-    }
-  else
-    {
-      FwImgInfo.StartAddress = t3StkOffLdFwStartAddr;
-      FwImgInfo.Text.Buffer = (PLM_UINT8)t3StkOffLdFwText;
-      FwImgInfo.Text.Offset  = t3StkOffLdFwTextAddr;
-      FwImgInfo.Text.Length  = t3StkOffLdFwTextLen;
-      FwImgInfo.ROnlyData.Buffer = (PLM_UINT8)t3StkOffLdFwRodata;
-      FwImgInfo.ROnlyData.Offset  = t3StkOffLdFwRodataAddr;
-      FwImgInfo.ROnlyData.Length  = t3StkOffLdFwRodataLen;
-      FwImgInfo.Data.Buffer = (PLM_UINT8)t3StkOffLdFwData;
-      FwImgInfo.Data.Offset  = t3StkOffLdFwDataAddr;
-      FwImgInfo.Data.Length  = t3StkOffLdFwDataLen;
-      FwImgInfo.Sbss.Offset = t3StkOffLdFwSbssAddr;
-      FwImgInfo.Sbss.Length = t3StkOffLdFwSbssLen;
-      FwImgInfo.Bss.Offset = t3StkOffLdFwBssAddr;
-      FwImgInfo.Bss.Length = t3StkOffLdFwBssLen;
-      Cpu = T3_TX_CPU_ID;
-    }
-
-  if (LM_LoadFirmware(pDevice,
-                      &FwImgInfo,
-                      Cpu,
-                      Cpu) != LM_STATUS_SUCCESS)
-    {
-      return LM_STATUS_FAILURE;
-    }
-  
-  return LM_STATUS_SUCCESS;
-}
-
-#endif /* INCLUDE_TCP_SEG_SUPPORT */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm/tigon3.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm/tigon3.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm/tigon3.c	2004-06-29 11:24:56.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm/tigon3.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,7456 +0,0 @@
-/******************************************************************************/
-/*                                                                            */
-/* Broadcom BCM5700 Linux Network Driver, Copyright (c) 2000 - 2003 Broadcom  */
-/* 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, located in the file LICENSE.                 */
-/*                                                                            */
-/* History:                                                                   */
-/******************************************************************************/
-
-#include "mm.h"
-
-
-
-/******************************************************************************/
-/* Local functions. */
-/******************************************************************************/
-
-LM_STATUS LM_Abort(PLM_DEVICE_BLOCK pDevice);
-LM_STATUS LM_QueueRxPackets(PLM_DEVICE_BLOCK pDevice);
-
-static LM_STATUS LM_InitBcm540xPhy(PLM_DEVICE_BLOCK pDevice);
-
-LM_VOID LM_ServiceRxInterrupt(PLM_DEVICE_BLOCK pDevice);
-LM_VOID LM_ServiceTxInterrupt(PLM_DEVICE_BLOCK pDevice);
-
-static LM_STATUS LM_ForceAutoNeg(PLM_DEVICE_BLOCK pDevice);
-static LM_UINT32 GetPhyAdFlowCntrlSettings(PLM_DEVICE_BLOCK pDevice);
-STATIC LM_STATUS LM_SetFlowControl(PLM_DEVICE_BLOCK pDevice,
-    LM_UINT32 LocalPhyAd, LM_UINT32 RemotePhyAd);
-#if INCLUDE_TBI_SUPPORT
-STATIC LM_STATUS LM_SetupFiberPhy(PLM_DEVICE_BLOCK pDevice);
-STATIC LM_STATUS LM_InitBcm800xPhy(PLM_DEVICE_BLOCK pDevice);
-#endif
-STATIC LM_STATUS LM_SetupCopperPhy(PLM_DEVICE_BLOCK pDevice);
-STATIC LM_VOID LM_SetEthWireSpeed(LM_DEVICE_BLOCK *pDevice);
-STATIC LM_STATUS LM_PhyAdvertiseAll(LM_DEVICE_BLOCK *pDevice);
-STATIC PLM_ADAPTER_INFO LM_GetAdapterInfoBySsid(LM_UINT16 Svid, LM_UINT16 Ssid);
-STATIC LM_STATUS LM_SwitchClocks(PLM_DEVICE_BLOCK pDevice);
-LM_VOID LM_SwitchVaux(PLM_DEVICE_BLOCK pDevice, PLM_DEVICE_BLOCK pDevice2);
-STATIC LM_STATUS LM_DmaTest(PLM_DEVICE_BLOCK pDevice, PLM_UINT8 pBufferVirt,
-           LM_PHYSICAL_ADDRESS BufferPhy, LM_UINT32 BufferSize);
-STATIC LM_STATUS LM_HaltCpu(PLM_DEVICE_BLOCK pDevice,LM_UINT32 cpu_number);
-STATIC LM_STATUS LM_DisableChip(PLM_DEVICE_BLOCK pDevice);
-STATIC LM_STATUS LM_DisableFW(PLM_DEVICE_BLOCK pDevice);
-STATIC LM_STATUS LM_Test4GBoundary(PLM_DEVICE_BLOCK pDevice, PLM_PACKET pPacket,
-    PT3_SND_BD pSendBd);
-
-
-/******************************************************************************/
-/* External functions. */
-/******************************************************************************/
-
-LM_STATUS LM_LoadRlsFirmware(PLM_DEVICE_BLOCK pDevice);
-#if INCLUDE_TCP_SEG_SUPPORT
-LM_STATUS LM_LoadStkOffLdFirmware(PLM_DEVICE_BLOCK pDevice);
-LM_UINT32 LM_GetStkOffLdFirmwareSize(PLM_DEVICE_BLOCK pDevice);
-#endif
-
-LM_UINT32
-LM_RegRd(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Register)
-{
-#if PCIX_TARGET_WORKAROUND
-    if (pDevice->UndiFix)
-    {
-        return (LM_RegRdInd(pDevice, Register));
-    }
-    else
-#endif
-    {
-        return (REG_RD_OFFSET(pDevice, Register));
-    }
-}
-
-LM_VOID
-LM_RegWr(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Register, LM_UINT32 Value32,
-    LM_UINT32 ReadBack)
-{
-#if PCIX_TARGET_WORKAROUND
-    if (pDevice->EnablePciXFix)
-    {
-        LM_RegWrInd(pDevice, Register, Value32);
-    }
-    else
-#endif
-    {
-        LM_UINT32 dummy;
-
-        REG_WR_OFFSET(pDevice, Register, Value32);
-        if (ReadBack && pDevice->RegReadBack)
-        {
-            dummy = REG_RD_OFFSET(pDevice, Register);
-        }
-    }
-}
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-LM_UINT32
-LM_RegRdInd(
-PLM_DEVICE_BLOCK pDevice,
-LM_UINT32 Register) {
-    LM_UINT32 Value32;
-
-    MM_ACQUIRE_UNDI_LOCK(pDevice);
-    MM_WriteConfig32(pDevice, T3_PCI_REG_ADDR_REG, Register);
-    MM_ReadConfig32(pDevice, T3_PCI_REG_DATA_REG, &Value32);
-    MM_RELEASE_UNDI_LOCK(pDevice);
-
-    return MM_SWAP_LE32(Value32);
-} /* LM_RegRdInd */
-
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-LM_VOID
-LM_RegWrInd(
-PLM_DEVICE_BLOCK pDevice,
-LM_UINT32 Register,
-LM_UINT32 Value32) {
-
-    MM_ACQUIRE_UNDI_LOCK(pDevice);
-    MM_WriteConfig32(pDevice, T3_PCI_REG_ADDR_REG, Register);
-    MM_WriteConfig32(pDevice, T3_PCI_REG_DATA_REG, MM_SWAP_LE32(Value32));
-    MM_RELEASE_UNDI_LOCK(pDevice);
-} /* LM_RegWrInd */
-
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-LM_UINT32
-LM_MemRdInd(
-PLM_DEVICE_BLOCK pDevice,
-LM_UINT32 MemAddr) {
-    LM_UINT32 Value32;
-
-    MM_ACQUIRE_UNDI_LOCK(pDevice);
-    MM_WriteConfig32(pDevice, T3_PCI_MEM_WIN_ADDR_REG, MemAddr);
-    MM_ReadConfig32(pDevice, T3_PCI_MEM_WIN_DATA_REG, &Value32);
-    MM_RELEASE_UNDI_LOCK(pDevice);
-
-    return MM_SWAP_LE32(Value32);
-} /* LM_MemRdInd */
-
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-LM_VOID
-LM_MemWrInd(
-PLM_DEVICE_BLOCK pDevice,
-LM_UINT32 MemAddr,
-LM_UINT32 Value32) {
-    MM_ACQUIRE_UNDI_LOCK(pDevice);
-    MM_WriteConfig32(pDevice, T3_PCI_MEM_WIN_ADDR_REG, MemAddr);
-    MM_WriteConfig32(pDevice, T3_PCI_MEM_WIN_DATA_REG, MM_SWAP_LE32(Value32));
-    MM_RELEASE_UNDI_LOCK(pDevice);
-} /* LM_MemWrInd */
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-LM_STATUS
-LM_QueueRxPackets(
-PLM_DEVICE_BLOCK pDevice) {
-    LM_STATUS Lmstatus;
-    PLM_PACKET pPacket;
-    PT3_RCV_BD pRcvBd = 0;
-    LM_UINT32 StdBdAdded = 0;
-#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
-    LM_UINT32 JumboBdAdded = 0;
-#endif /* T3_JUMBO_RCV_RCB_ENTRY_COUNT */
-    LM_UINT32 ConIdx;
-    LM_UINT32 Diff = 0;
-
-    Lmstatus = LM_STATUS_SUCCESS;
-
-    if (pDevice->RxBDLimit64)
-    {
-        ConIdx = pDevice->pStatusBlkVirt->RcvStdConIdx;
-        Diff = (pDevice->RxStdProdIdx - ConIdx) &
-            T3_STD_RCV_RCB_ENTRY_COUNT_MASK;
-        if (Diff >= 56)
-        {
-            if (QQ_GetEntryCnt(&pDevice->RxPacketFreeQ.Container))
-            {
-                pDevice->QueueAgain = TRUE;
-            }
-            return LM_STATUS_SUCCESS;
-        }
-    }
-
-    pDevice->QueueAgain = FALSE;
-
-    pPacket = (PLM_PACKET) QQ_PopHead(&pDevice->RxPacketFreeQ.Container);
-    while(pPacket) {
-        switch(pPacket->u.Rx.RcvProdRing) {
-#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
-            case T3_JUMBO_RCV_PROD_RING:        /* Jumbo Receive Ring. */
-                /* Initialize the buffer descriptor. */
-                pRcvBd = 
-                    &pDevice->pRxJumboBdVirt[pDevice->RxJumboProdIdx];
-                pRcvBd->Flags = RCV_BD_FLAG_END | RCV_BD_FLAG_JUMBO_RING;
-                pRcvBd->Len = (LM_UINT16) pDevice->RxJumboBufferSize;
-
-                /* Update the producer index. */
-                pDevice->RxJumboProdIdx = (pDevice->RxJumboProdIdx + 1) & 
-                    T3_JUMBO_RCV_RCB_ENTRY_COUNT_MASK;
-
-                JumboBdAdded++;
-                break;
-#endif /* T3_JUMBO_RCV_RCB_ENTRY_COUNT */
-
-            case T3_STD_RCV_PROD_RING:      /* Standard Receive Ring. */
-                /* Initialize the buffer descriptor. */
-                pRcvBd = &pDevice->pRxStdBdVirt[pDevice->RxStdProdIdx];
-                pRcvBd->Flags = RCV_BD_FLAG_END;
-                pRcvBd->Len = MAX_STD_RCV_BUFFER_SIZE;
-
-                /* Update the producer index. */
-                pDevice->RxStdProdIdx = (pDevice->RxStdProdIdx + 1) & 
-                    T3_STD_RCV_RCB_ENTRY_COUNT_MASK;
-
-                StdBdAdded++;
-                break;
-
-            case T3_UNKNOWN_RCV_PROD_RING:
-            default:
-                Lmstatus = LM_STATUS_FAILURE;
-                break;
-        } /* switch */
-
-        /* Bail out if there is any error. */
-        if(Lmstatus != LM_STATUS_SUCCESS)
-        {
-            break;
-        }
-
-        /* Initialize the receive buffer pointer */
-        MM_MapRxDma(pDevice, pPacket, &pRcvBd->HostAddr);
-
-        /* The opaque field may point to an offset from a fix addr. */
-        pRcvBd->Opaque = (LM_UINT32) (MM_UINT_PTR(pPacket) - 
-            MM_UINT_PTR(pDevice->pPacketDescBase));
-
-        if (pDevice->RxBDLimit64 && ((Diff + StdBdAdded) >= 63))
-        {
-            if (QQ_GetEntryCnt(&pDevice->RxPacketFreeQ.Container))
-            {
-                pDevice->QueueAgain = TRUE;
-            }
-            break;
-        }
-        pPacket = (PLM_PACKET) QQ_PopHead(&pDevice->RxPacketFreeQ.Container);
-    } /* while */
-
-    MM_WMB();
-    /* Update the procedure index. */
-    if(StdBdAdded)
-    {
-        MB_REG_WR(pDevice, Mailbox.RcvStdProdIdx.Low,
-            pDevice->RxStdProdIdx);
-        if (pDevice->FlushPostedWrites)
-        {
-            MB_REG_RD(pDevice, Mailbox.RcvStdProdIdx.Low);
-        }
-    }
-#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
-    if(JumboBdAdded)
-    {
-        MB_REG_WR(pDevice, Mailbox.RcvJumboProdIdx.Low,
-            pDevice->RxJumboProdIdx);
-        if (pDevice->FlushPostedWrites)
-        {
-            MB_REG_RD(pDevice, Mailbox.RcvJumboProdIdx.Low);
-        }
-    }
-#endif /* T3_JUMBO_RCV_RCB_ENTRY_COUNT */
-
-    return Lmstatus;
-} /* LM_QueueRxPackets */
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-STATIC LM_VOID
-LM_NvramInit(
-    PLM_DEVICE_BLOCK pDevice)
-{
-    LM_UINT32 Value32;
-
-    pDevice->NvramSize = 0;
-    /* Intialize clock period and state machine. */
-    Value32 = SEEPROM_ADDR_CLK_PERD(SEEPROM_CLOCK_PERIOD) |
-        SEEPROM_ADDR_FSM_RESET;
-    REG_WR(pDevice, Grc.EepromAddr, Value32);
-
-    MM_Wait(100);
-
-    /* Serial eeprom access using the Grc.EepromAddr/EepromData registers. */
-    Value32 = REG_RD(pDevice, Grc.LocalCtrl);
-    REG_WR(pDevice, Grc.LocalCtrl, Value32 | GRC_MISC_LOCAL_CTRL_AUTO_SEEPROM);
-
-    /* Set the 5701 compatibility mode if we are using EEPROM. */
-    if(T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5700 &&
-        T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5701)
-    {
-        Value32 = REG_RD(pDevice, Nvram.Config1);
-        if((Value32 & FLASH_INTERFACE_ENABLE) == 0)
-        {
-            /* Use the new interface to read EEPROM. */
-            Value32 &= ~FLASH_COMPAT_BYPASS;
-
-            REG_WR(pDevice, Nvram.Config1, Value32);
-        }
-        else {
-            pDevice->NvramSize = 0x20000;
-            pDevice->Flash = TRUE;
-        }
-    }
-
-    MM_Wait(100);
-
-    if (pDevice->NvramSize == 0)
-    {
-        Value32 = 0;
-        LM_NvramRead(pDevice, 0, &Value32);
-        Value32 = MM_SWAP_BE32(Value32);
-        if (Value32 != 0x669955aa) {
-            pDevice->NvramSize = SEEPROM_CHIP_SIZE;
-            return;
-        }
-
-        /* size eeprom */
-        pDevice->NvramSize = 0x800;
-        while (pDevice->NvramSize < SEEPROM_CHIP_SIZE) {
-            if (LM_NvramRead(pDevice, pDevice->NvramSize, &Value32) !=
-                LM_STATUS_SUCCESS) {
-                pDevice->NvramSize = SEEPROM_CHIP_SIZE;
-                break;
-            }
-            Value32 = MM_SWAP_BE32(Value32);
-            if (Value32 == 0x669955aa)
-                break;
-            pDevice->NvramSize <<= 1;
-        }
-    }
-} /* LM_NvRamInit */
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-STATIC LM_STATUS
-LM_EepromRead(
-    PLM_DEVICE_BLOCK pDevice,
-    LM_UINT32 Offset,
-    LM_UINT32 *pData)
-{
-    LM_UINT32 Value32;
-    LM_UINT32 Addr;
-    LM_UINT32 Dev;
-    LM_UINT32 j;
-
-    if(Offset > SEEPROM_CHIP_SIZE)
-    {
-        return LM_STATUS_FAILURE;
-    }
-
-    Dev = Offset / SEEPROM_CHIP_SIZE;
-    Addr = Offset % SEEPROM_CHIP_SIZE;
-    
-    Value32 = REG_RD(pDevice, Grc.EepromAddr);
-    Value32 &= ~(SEEPROM_ADDR_ADDRESS_MASK | SEEPROM_ADDR_DEV_ID_MASK |
-        SEEPROM_ADDR_RW_MASK);
-    REG_WR(pDevice, Grc.EepromAddr, Value32 | SEEPROM_ADDR_DEV_ID(Dev) |
-        SEEPROM_ADDR_ADDRESS(Addr) | SEEPROM_ADDR_START | SEEPROM_ADDR_READ);
-
-    for(j = 0; j < 1000; j++)
-    {
-        Value32 = REG_RD(pDevice, Grc.EepromAddr);
-        if(Value32 & SEEPROM_ADDR_COMPLETE)
-        {
-            break;
-        }
-        MM_Wait(20);
-    }
-
-    if(Value32 & SEEPROM_ADDR_COMPLETE)
-    {
-        Value32 = REG_RD(pDevice, Grc.EepromData);
-        /* The endianess of the eeprom and flash interface is different */
-        *pData = MM_SWAP_LE32(Value32);
-
-        return LM_STATUS_SUCCESS;
-    }
-
-    return LM_STATUS_FAILURE;
-} /* LM_EepromRead */
-
-#ifdef ETHTOOL_SEEPROM
-
-STATIC LM_STATUS
-LM_EepromWriteBlock(
-    PLM_DEVICE_BLOCK pDevice,
-    LM_UINT32 Offset,
-    LM_UINT32 *pData,
-    LM_UINT32 Size)
-{
-    LM_UINT32 Value32 = 0;
-    LM_UINT32 Addr;
-    LM_UINT32 Dev;
-    LM_UINT32 i, j;
-
-    if(Offset > SEEPROM_CHIP_SIZE)
-    {
-        return LM_STATUS_FAILURE;
-    }
-
-    /* Enable EEPROM write. */
-    if(pDevice->EepromWp)
-    {
-        REG_WR(pDevice, Grc.LocalCtrl, pDevice->GrcLocalCtrl |
-                    GRC_MISC_LOCAL_CTRL_GPIO_OE1);
-        MM_Wait(40);
-
-        Value32 = REG_RD(pDevice, Grc.LocalCtrl);
-        if(Value32 & GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT1)
-        {
-            return LM_STATUS_FAILURE;
-        }
-    }
-
-    for (i = 0; i < Size ; i++, pData++, Offset += 4) {
-
-        Dev = Offset / SEEPROM_CHIP_SIZE;
-        Addr = Offset % SEEPROM_CHIP_SIZE;
-
-        /* Set the write value to the eeprom */    
-        REG_WR(pDevice, Grc.EepromData, MM_SWAP_LE32(*pData));  
-
-        Value32 = REG_RD(pDevice, Grc.EepromAddr);
-        Value32 &= ~(SEEPROM_ADDR_ADDRESS_MASK | SEEPROM_ADDR_DEV_ID_MASK |
-                            SEEPROM_ADDR_RW_MASK);
-
-        REG_WR(pDevice, Grc.EepromAddr, Value32 | SEEPROM_ADDR_DEV_ID(Dev) |
-                        SEEPROM_ADDR_ADDRESS(Addr) | SEEPROM_ADDR_START | SEEPROM_ADDR_WRITE);
-
-        for(j = 0; j < 1000; j++)
-        {
-            Value32 = REG_RD(pDevice, Grc.EepromAddr);
-            if(Value32 & SEEPROM_ADDR_COMPLETE)
-            {
-                break;
-            }
-            MM_Wait(10);
-        }
-    } 
-
-    /* Write-protect EEPROM. */
-    if(pDevice->EepromWp)
-    {
-        REG_WR(pDevice, Grc.LocalCtrl, pDevice->GrcLocalCtrl |
-            GRC_MISC_LOCAL_CTRL_GPIO_OE1 | GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT1);
-        MM_Wait(40);
-    }
-
-    if(Value32 & SEEPROM_ADDR_COMPLETE)
-    {
-        return LM_STATUS_SUCCESS;
-    }
-
-    return LM_STATUS_FAILURE;
-} /* LM_EepromWriteBlock */
-#endif
-
-LM_STATUS
-LM_NvramGetLock(LM_DEVICE_BLOCK *pDevice)
-{
-    int j;
-
-    REG_WR(pDevice, Nvram.SwArb, SW_ARB_REQ_SET1);
-    /* worst case wait time for Nvram arbitration using serial eprom is */
-    /* about 45 msec on a 5704 with the other channel loading boot code */
-    for (j = 0; j < 3000; j++)
-    {
-        if (REG_RD(pDevice, Nvram.SwArb) & SW_ARB_GNT1)
-        {
-            break;
-        }
-        MM_Wait(20);
-    }
-    if (j == 3000)
-    {
-        return LM_STATUS_FAILURE;
-    }
-    return LM_STATUS_SUCCESS;
-}
-
-LM_STATUS
-LM_NvramReleaseLock(LM_DEVICE_BLOCK *pDevice)
-{
-    REG_WR(pDevice, Nvram.SwArb, SW_ARB_REQ_CLR1);
-    return LM_STATUS_SUCCESS;
-}
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-LM_STATUS
-LM_NvramRead(
-    PLM_DEVICE_BLOCK pDevice,
-    LM_UINT32 Offset,
-    LM_UINT32 *pData)
-{
-    LM_UINT32 Value32;
-    LM_STATUS Status;
-    LM_UINT32 j;
-
-    if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700 ||
-        T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701)
-    {
-        Status = LM_EepromRead(pDevice, Offset, pData);
-    }
-    else
-    {
-        /* Determine if we have flash or EEPROM. */
-        Value32 = REG_RD(pDevice, Nvram.Config1);
-        if(Value32 & FLASH_INTERFACE_ENABLE)
-        {
-            if(Value32 & FLASH_SSRAM_BUFFERED_MODE)
-            {
-                Offset = ((Offset/BUFFERED_FLASH_PAGE_SIZE) <<
-                    BUFFERED_FLASH_PAGE_POS) +
-                    (Offset % BUFFERED_FLASH_PAGE_SIZE);
-            }
-        }
-
-        if (LM_NvramGetLock(pDevice) != LM_STATUS_SUCCESS)
-        {
-            return LM_STATUS_FAILURE;
-	}
-
-        /* Read from flash or EEPROM with the new 5703/02 interface. */
-        REG_WR(pDevice, Nvram.Addr, Offset & NVRAM_ADDRESS_MASK);
-
-        REG_WR(pDevice, Nvram.Cmd, NVRAM_CMD_RD | NVRAM_CMD_DO_IT |
-            NVRAM_CMD_FIRST | NVRAM_CMD_LAST | NVRAM_CMD_DONE);
-
-        /* Wait for the done bit to clear. */
-        for(j = 0; j < 1000; j++)
-        {
-            MM_Wait(10);
-
-            Value32 = REG_RD(pDevice, Nvram.Cmd);
-            if(Value32 & NVRAM_CMD_DONE)
-            {
-                MM_Wait(10);
-
-                *pData = REG_RD(pDevice, Nvram.ReadData);
-
-                /* Data is swapped so that the byte stream is the same */
-                /* in big and little endian systems. */
-                /* Caller will do additional swapping depending on */
-                /* how it wants to look at the data. */
-                *pData = MM_SWAP_BE32(*pData);
-
-                break;
-            }
-        }
-
-        LM_NvramReleaseLock(pDevice);
-        if(Value32 & NVRAM_CMD_DONE)
-        {
-            Status = LM_STATUS_SUCCESS;
-        }
-        else
-        {
-            Status = LM_STATUS_FAILURE;
-        }
-    }
-
-    return Status;
-} /* LM_NvramRead */
-
-
-#ifdef ETHTOOL_SEEPROM
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-LM_STATUS
-LM_NvramWriteBlock(
-    PLM_DEVICE_BLOCK pDevice,
-    LM_UINT32 Offset,
-    LM_UINT32 *pData,
-    LM_UINT32 Size)
-{
-    LM_UINT32 Value32 = 0;
-    LM_UINT32 ControlReg;
-    LM_UINT32 AddrOffset;
-    LM_STATUS Status;
-    LM_UINT32  i , j;
-    LM_UINT32 BufferedFlash;
-
-    if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700 ||
-        T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701)
-    {
-        Status = LM_EepromWriteBlock(pDevice, Offset, pData, Size);
-    }
-    else
-    {
-        if (LM_NvramGetLock(pDevice) != LM_STATUS_SUCCESS)
-        {
-            return LM_STATUS_FAILURE;
-	}
-
-        /* Enable EEPROM write. */
-        if(pDevice->EepromWp)
-        {
-            REG_WR(pDevice, Grc.LocalCtrl, pDevice->GrcLocalCtrl |
-                        GRC_MISC_LOCAL_CTRL_GPIO_OE1);
-            MM_Wait(40);
-
-            Value32 = REG_RD(pDevice, Grc.LocalCtrl);
-            if(Value32 & GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT1)
-            {
-                return LM_STATUS_FAILURE;
-             }
-        }
-
-        REG_WR(pDevice, Grc.Mode, pDevice->GrcMode |
-            GRC_MODE_NVRAM_WRITE_ENABLE);
-
-        BufferedFlash = FALSE;
-        Value32 = REG_RD(pDevice, Nvram.Config1);
-        if(Value32 & FLASH_INTERFACE_ENABLE)
-        {
-            if(Value32 & FLASH_SSRAM_BUFFERED_MODE)
-            {
-                BufferedFlash = TRUE;
-            }
-        }
-
-        for (i = 0 ; i < Size ; i++, pData++, Offset += 4) {
-
-            /* Swap the data so that the byte stream will */
-            /* be written the same in little and big endian systems */
-            Value32 = MM_SWAP_BE32(*pData);
-
-            /* set the desired write data value to the flash */
-            REG_WR(pDevice, Nvram.WriteData, Value32);
-
-            /* set targeted address */
-            AddrOffset = Offset;
-
-            /* Determine if we have flash or buffered flash. */
-            if(BufferedFlash)
-            {
-                AddrOffset = ((Offset/BUFFERED_FLASH_PAGE_SIZE) <<
-                                        BUFFERED_FLASH_PAGE_POS) +
-                                    (Offset % BUFFERED_FLASH_PAGE_SIZE);
-            }
-
-            /* Write to flash or EEPROM with the new 5703/02 interface. */
-            REG_WR(pDevice, Nvram.Addr, AddrOffset & NVRAM_ADDRESS_MASK);
-
-            ControlReg = NVRAM_CMD_DO_IT | NVRAM_CMD_DONE | NVRAM_CMD_WR;
-            if(i == 0)
-            {
-                ControlReg |= NVRAM_CMD_FIRST;
-            }
-            if(i == (Size - 1))  
-            {
-                ControlReg |= NVRAM_CMD_LAST;
-            }
-
-            if(BufferedFlash)
-            {
-                /* Set CMD_FIRST when we are at the beginning of a page. */
-                if(!(AddrOffset & BUFFERED_FLASH_BYTE_ADDR_MASK))
-                {
-                    ControlReg |= NVRAM_CMD_FIRST;
-                }
-                else if((AddrOffset & BUFFERED_FLASH_BYTE_ADDR_MASK) ==
-                    (BUFFERED_FLASH_PAGE_SIZE - 4))
-                {
-                    ControlReg |=  NVRAM_CMD_LAST;
-                }
-            }
-
-            REG_WR(pDevice, Nvram.Cmd,  ControlReg);
-
-            /* Wait for the done bit to go High. */
-            for(j = 0; j < 4000 ; j++)
-            {
-                MM_Wait(10);
-
-                Value32 = REG_RD(pDevice, Nvram.Cmd);
-
-                if(Value32 & NVRAM_CMD_DONE)
-                {
-                    MM_Wait(5);
-                    break;
-                }
-            }
-        }  
-
-        REG_WR(pDevice, Grc.Mode, pDevice->GrcMode);
-
-        /* Write-protect EEPROM. */
-        if(pDevice->EepromWp)
-        {
-            REG_WR(pDevice, Grc.LocalCtrl, pDevice->GrcLocalCtrl |
-                GRC_MISC_LOCAL_CTRL_GPIO_OE1 | GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT1);
-            MM_Wait(40);
-        }
-
-        /* Relinquish nvram interface. */
-        LM_NvramReleaseLock(pDevice);
-
-        if(Value32 & NVRAM_CMD_DONE)
-        {
-            Status = LM_STATUS_SUCCESS;
-        }
-        else
-        {
-            Status = LM_STATUS_FAILURE;
-        }
-    }
-
-    return Status;
-} /* LM_NvramWriteBlock */
-#endif
-
-STATIC void
-LM_ReadVPD(PLM_DEVICE_BLOCK pDevice)
-{
-#ifdef BCM_PROC_FS
-    LM_UINT32 Vpd_arr[256/4];
-    LM_UINT8 *Vpd = (LM_UINT8 *) &Vpd_arr[0];
-    LM_UINT32 *Vpd_dptr = &Vpd_arr[0];
-    LM_UINT32 Value32;
-    unsigned int j;
-
-    /* Read PN from VPD */
-    for (j = 0; j < 256; j += 4, Vpd_dptr++ )
-    {
-        if (LM_NvramRead(pDevice, 0x100 + j, &Value32) != LM_STATUS_SUCCESS) {
-            printf("VPD read failed\n");
-            return;
-        }
-        *Vpd_dptr = Value32;
-    }
-    for (j = 0; j < 256; )
-    {
-        unsigned int Vpd_r_len;
-        unsigned int Vpd_r_end;
-
-        if ((Vpd[j] == 0x82) || (Vpd[j] == 0x91))
-        {
-            j = j + 3 + Vpd[j + 1] + (Vpd[j + 2] << 8);
-        }
-        else if (Vpd[j] == 0x90)
-        {
-            Vpd_r_len =  Vpd[j + 1] + (Vpd[j + 2] << 8);
-            j += 3;
-            Vpd_r_end = Vpd_r_len + j;
-            while (j < Vpd_r_end)
-            {
-                if ((Vpd[j] == 'P') && (Vpd[j + 1] == 'N'))
-                {
-                    unsigned int len = Vpd[j + 2];
-
-                    if (len <= 24)
-                    {
-                        memcpy(pDevice->PartNo, &Vpd[j + 3], len);
-                    }
-                    break;
-                }
-                else
-                {
-                    if (Vpd[j + 2] == 0)
-                    {
-                        break;
-                    }
-                    j = j + Vpd[j + 2];
-                }
-            }
-            break;
-        }
-        else {
-            break;
-        }
-    }
-#endif
-}
-
-STATIC void
-LM_ReadBootCodeVersion(PLM_DEVICE_BLOCK pDevice)
-{
-#ifdef BCM_PROC_FS
-    LM_UINT32 Value32, offset, ver_offset, start_addr;
-    int i;
-
-    if (LM_NvramRead(pDevice, 0x0, &Value32) != LM_STATUS_SUCCESS)
-        return;
-    Value32 = MM_SWAP_BE32(Value32);
-    if (Value32 != 0x669955aa)
-        return;
-    if (LM_NvramRead(pDevice, 0xc, &offset) != LM_STATUS_SUCCESS)
-        return;
-
-    offset = MM_SWAP_BE32(offset);
-
-    if((T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5700) &&
-        (T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5701) &&
-        ((REG_RD(pDevice, Nvram.Config1) & BUFFERED_FLASH) == BUFFERED_FLASH))
-    {
-        offset = (offset >> BUFFERED_FLASH_PAGE_POS) *
-            BUFFERED_FLASH_PAGE_SIZE + (offset & BUFFERED_FLASH_BYTE_ADDR_MASK);
-    }
-    if (LM_NvramRead(pDevice, offset, &Value32) != LM_STATUS_SUCCESS)
-        return;
-
-    Value32 = MM_SWAP_BE32(Value32);
-    if ((((Value32 & ~0x0f00) == 0x0e000003) ||
-        ((Value32 & ~0xff00) == 0x0c000003)) &&
-        (LM_NvramRead(pDevice, offset + 4, &Value32) == LM_STATUS_SUCCESS) &&
-        (Value32 == 0)) {
-
-        if (LM_NvramRead(pDevice, offset + 8, &ver_offset) != LM_STATUS_SUCCESS)
-            return;
-        if (LM_NvramRead(pDevice, 4, &start_addr) != LM_STATUS_SUCCESS)
-            return;
-        ver_offset = MM_SWAP_BE32(ver_offset);
-        start_addr = MM_SWAP_BE32(start_addr);
-        offset += ver_offset - start_addr;
-        for (i = 0; i < 16; i += 4) {
-            if (LM_NvramRead(pDevice, offset + i, &Value32) !=
-                LM_STATUS_SUCCESS)
-            {
-                return;
-            }
-            *((LM_UINT32 *) &pDevice->BootCodeVer[i]) = Value32;
-        }
-    }
-    else {
-        char c;
-
-        if (LM_NvramRead(pDevice, 0x94, &Value32) != LM_STATUS_SUCCESS)
-            return;
-
-        Value32 = MM_SWAP_BE32(Value32);
-        i = 0;
-        c = ((Value32 & 0xff00) >> 8);
-
-        if (c < 10) {
-            pDevice->BootCodeVer[i++] = c + '0';
-        }
-        else {
-            pDevice->BootCodeVer[i++] = (c / 10) + '0';
-            pDevice->BootCodeVer[i++] = (c % 10) + '0';
-        }
-        pDevice->BootCodeVer[i++] = '.';
-        c = Value32 & 0xff;
-        if (c < 10) {
-            pDevice->BootCodeVer[i++] = '0';
-            pDevice->BootCodeVer[i++] = c + '0';
-        }
-        else {
-            pDevice->BootCodeVer[i++] = (c / 10) + '0';
-            pDevice->BootCodeVer[i++] = (c % 10) + '0';
-        }
-        pDevice->BootCodeVer[i] = 0;
-    }
-#endif
-}
-
-STATIC void
-LM_GetBusSpeed(PLM_DEVICE_BLOCK pDevice)
-{
-#ifdef BCM_PROC_FS
-    LM_UINT32 PciState = pDevice->PciState;
-    LM_UINT32 ClockCtrl;
-    char *SpeedStr = "";
-
-    if (PciState & T3_PCI_STATE_32BIT_PCI_BUS)
-    {
-        strcpy(pDevice->BusSpeedStr, "32-bit ");
-    }
-    else
-    {
-        strcpy(pDevice->BusSpeedStr, "64-bit ");
-    }
-    if (PciState & T3_PCI_STATE_CONVENTIONAL_PCI_MODE)
-    {
-        strcat(pDevice->BusSpeedStr, "PCI ");
-        if (PciState & T3_PCI_STATE_HIGH_BUS_SPEED) 
-        {
-            SpeedStr = "66MHz";
-        }
-        else
-        {
-            SpeedStr = "33MHz";
-        }
-    }
-    else
-    {
-        strcat(pDevice->BusSpeedStr, "PCIX ");
-        if (pDevice->BondId == GRC_MISC_BD_ID_5704CIOBE)
-        {
-            SpeedStr = "133MHz";
-        }
-        else
-        {
-            ClockCtrl = pDevice->ClockCtrl & 0x1f;
-            switch (ClockCtrl)
-            {
-            case 0:
-                SpeedStr = "33MHz";
-                break;
-
-            case 2:
-                SpeedStr = "50MHz";
-                break;
-
-            case 4:
-                SpeedStr = "66MHz";
-                break;
-
-            case 6:
-                SpeedStr = "100MHz";
-                break;
-
-            case 7:
-                SpeedStr = "133MHz";
-                break;
-            }
-        }
-    }
-    strcat(pDevice->BusSpeedStr, SpeedStr);
-#endif
-}
-
-/******************************************************************************/
-/* Description:                                                               */
-/*    This routine initializes default parameters and reads the PCI           */
-/*    configurations.                                                         */
-/*                                                                            */
-/* Return:                                                                    */
-/*    LM_STATUS_SUCCESS                                                       */
-/******************************************************************************/
-LM_STATUS
-LM_GetAdapterInfo(
-PLM_DEVICE_BLOCK pDevice)
-{
-    PLM_ADAPTER_INFO pAdapterInfo;
-    LM_UINT32 Value32;
-    LM_STATUS Status;
-    LM_UINT32 EeSigFound;
-    LM_UINT32 EePhyTypeSerdes = 0;
-    LM_UINT32 EePhyLedMode = 0;
-    LM_UINT32 EePhyId = 0;
-
-    /* Get Device Id and Vendor Id */
-    Status = MM_ReadConfig32(pDevice, PCI_VENDOR_ID_REG, &Value32);
-    if(Status != LM_STATUS_SUCCESS)
-    {
-        return Status;
-    }
-    pDevice->PciVendorId = (LM_UINT16) Value32;
-    pDevice->PciDeviceId = (LM_UINT16) (Value32 >> 16);
-
-    Status = MM_ReadConfig32(pDevice, PCI_REV_ID_REG, &Value32);
-    if(Status != LM_STATUS_SUCCESS)
-    {
-        return Status;
-    }
-    pDevice->PciRevId = (LM_UINT8) Value32;
-
-    /* Get chip revision id. */
-    Status = MM_ReadConfig32(pDevice, T3_PCI_MISC_HOST_CTRL_REG, &Value32);
-    pDevice->ChipRevId = Value32 >> 16;
-
-    /* Get subsystem vendor. */
-    Status = MM_ReadConfig32(pDevice, PCI_SUBSYSTEM_VENDOR_ID_REG, &Value32);
-    if(Status != LM_STATUS_SUCCESS)
-    {
-        return Status;
-    }
-    pDevice->SubsystemVendorId = (LM_UINT16) Value32;
-
-    /* Get PCI subsystem id. */
-    pDevice->SubsystemId = (LM_UINT16) (Value32 >> 16);
-
-    /* Get the cache line size. */
-    MM_ReadConfig32(pDevice, PCI_CACHE_LINE_SIZE_REG, &Value32);
-    pDevice->CacheLineSize = (LM_UINT8) Value32;
-    pDevice->SavedCacheLineReg = Value32;
-
-    if(pDevice->ChipRevId != T3_CHIP_ID_5703_A1 &&
-        pDevice->ChipRevId != T3_CHIP_ID_5703_A2 &&
-        pDevice->ChipRevId != T3_CHIP_ID_5704_A0)
-    {
-        pDevice->UndiFix = FALSE;
-    }
-#if !PCIX_TARGET_WORKAROUND
-    pDevice->UndiFix = FALSE;
-#endif
-    /* Map the memory base to system address space. */
-    if (!pDevice->UndiFix)
-    {
-        Status = MM_MapMemBase(pDevice);
-        if(Status != LM_STATUS_SUCCESS)
-        {
-            return Status;
-        }
-        /* Initialize the memory view pointer. */
-        pDevice->pMemView = (PT3_STD_MEM_MAP) pDevice->pMappedMemBase;
-    }
-
-    if ((T3_CHIP_REV(pDevice->ChipRevId) == T3_CHIP_REV_5700_BX) ||
-        (T3_CHIP_REV(pDevice->ChipRevId) == T3_CHIP_REV_5704_AX))
-    {
-        pDevice->Tx4GWorkaround = TRUE;
-    }
-    if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701)
-    {
-        pDevice->RegReadBack = TRUE;
-    }
-#if PCIX_TARGET_WORKAROUND
-    /* store whether we are in PCI are PCI-X mode */
-    pDevice->EnablePciXFix = FALSE;
-
-    MM_ReadConfig32(pDevice, T3_PCI_STATE_REG, &Value32);
-    if((Value32 & T3_PCI_STATE_CONVENTIONAL_PCI_MODE) == 0)
-    {
-        /* Enable PCI-X workaround only if we are running on 5700 BX. */
-        if(T3_CHIP_REV(pDevice->ChipRevId) == T3_CHIP_REV_5700_BX)
-        {
-            pDevice->EnablePciXFix = TRUE;
-        }
-    }
-    if (pDevice->UndiFix)
-    {
-        pDevice->EnablePciXFix = TRUE;
-    }
-#endif
-    /* Bx bug: due to the "byte_enable bug" in PCI-X mode, the power */
-    /* management register may be clobbered which may cause the */
-    /* BCM5700 to go into D3 state.  While in this state, we will */
-    /* not have memory mapped register access.  As a workaround, we */
-    /* need to restore the device to D0 state. */
-    MM_ReadConfig32(pDevice, T3_PCI_PM_STATUS_CTRL_REG, &Value32);
-    Value32 |= T3_PM_PME_ASSERTED;
-    Value32 &= ~T3_PM_POWER_STATE_MASK;
-    Value32 |= T3_PM_POWER_STATE_D0;
-    MM_WriteConfig32(pDevice, T3_PCI_PM_STATUS_CTRL_REG, Value32);
-
-    /* read the current PCI command word */
-    MM_ReadConfig32(pDevice, PCI_COMMAND_REG, &Value32);
-
-    /* Make sure bus-mastering is enabled. */
-    Value32 |= PCI_BUSMASTER_ENABLE;
-
-#if PCIX_TARGET_WORKAROUND
-    /* if we are in PCI-X mode, also make sure mem-mapping and SERR#/PERR#
-        are enabled */
-    if (pDevice->EnablePciXFix == TRUE) {
-        Value32 |= (PCI_MEM_SPACE_ENABLE | PCI_SYSTEM_ERROR_ENABLE | 
-                    PCI_PARITY_ERROR_ENABLE);
-    }
-    if (pDevice->UndiFix)
-    {
-        Value32 &= ~PCI_MEM_SPACE_ENABLE;
-    }
-
-#endif
-
-    if(pDevice->EnableMWI)
-    {
-        Value32 |= PCI_MEMORY_WRITE_INVALIDATE;
-    }
-    else {
-        Value32 &= (~PCI_MEMORY_WRITE_INVALIDATE);
-    }
-
-    /* save the value we are going to write into the PCI command word */	
-    pDevice->PciCommandStatusWords = Value32;	
-
-    Status = MM_WriteConfig32(pDevice, PCI_COMMAND_REG, Value32);
-    if(Status != LM_STATUS_SUCCESS)
-    {
-        return Status;
-    }
-
-    /* Setup the mode registers. */
-    pDevice->MiscHostCtrl = 
-        MISC_HOST_CTRL_MASK_PCI_INT | 
-        MISC_HOST_CTRL_ENABLE_ENDIAN_WORD_SWAP | 
-#ifdef BIG_ENDIAN_HOST
-        MISC_HOST_CTRL_ENABLE_ENDIAN_BYTE_SWAP |  
-#endif /* BIG_ENDIAN_HOST */
-        MISC_HOST_CTRL_ENABLE_INDIRECT_ACCESS |
-        MISC_HOST_CTRL_ENABLE_PCI_STATE_REG_RW;
-	/* write to PCI misc host ctr first in order to enable indirect accesses */
-    MM_WriteConfig32(pDevice, T3_PCI_MISC_HOST_CTRL_REG, pDevice->MiscHostCtrl);
-
-    /* Set power state to D0. */
-    LM_SetPowerState(pDevice, LM_POWER_STATE_D0);
-
-    /* Preserve HOST_STACK_UP bit in case ASF firmware is running */
-    Value32 = REG_RD(pDevice, Grc.Mode) & GRC_MODE_HOST_STACK_UP;
-#ifdef BIG_ENDIAN_HOST
-    Value32 |= GRC_MODE_BYTE_SWAP_NON_FRAME_DATA | 
-              GRC_MODE_WORD_SWAP_NON_FRAME_DATA;
-#else
-    Value32 |= GRC_MODE_BYTE_SWAP_NON_FRAME_DATA | GRC_MODE_BYTE_SWAP_DATA;
-#endif
-    REG_WR(pDevice, Grc.Mode, Value32);
-
-    if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700)
-    {
-        REG_WR(pDevice, Grc.LocalCtrl, GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT1 |
-            GRC_MISC_LOCAL_CTRL_GPIO_OE1);
-    }
-    MM_Wait(40);
-
-    /* Enable indirect memory access */
-    REG_WR(pDevice, MemArbiter.Mode, T3_MEM_ARBITER_MODE_ENABLE);
-
-    LM_SwitchClocks(pDevice);
-
-    REG_WR(pDevice, PciCfg.MemWindowBaseAddr, 0);
-
-    /* Check to see if PXE ran and did not shutdown properly */
-    if ((REG_RD(pDevice, DmaWrite.Mode) & DMA_WRITE_MODE_ENABLE) ||
-        !(REG_RD(pDevice, PciCfg.MiscHostCtrl) & MISC_HOST_CTRL_MASK_PCI_INT))
-    {
-        LM_DisableInterrupt(pDevice);
-        /* assume ASF is enabled */
-        pDevice->EnableAsf = TRUE;
-        LM_DisableFW(pDevice);
-        LM_DisableChip(pDevice);
-        LM_ResetChip(pDevice);
-        MEM_WR_OFFSET(pDevice, T3_DRV_STATE_MAILBOX, T3_DRV_STATE_UNLOAD);
-    }
-#if PCIX_TARGET_WORKAROUND
-    MM_ReadConfig32(pDevice, T3_PCI_STATE_REG, &Value32);
-    if ((pDevice->EnablePciXFix == FALSE) &&
-        ((Value32 & T3_PCI_STATE_CONVENTIONAL_PCI_MODE) == 0))
-    {
-        if (pDevice->ChipRevId == T3_CHIP_ID_5701_A0 ||
-            pDevice->ChipRevId == T3_CHIP_ID_5701_B0 ||
-            pDevice->ChipRevId == T3_CHIP_ID_5701_B2 ||
-            pDevice->ChipRevId == T3_CHIP_ID_5701_B5)
-        {
-            MM_MEMWRITEL(&(pDevice->pMemView->uIntMem.MemBlock32K[0x300]), 0);
-            MM_MEMWRITEL(&(pDevice->pMemView->uIntMem.MemBlock32K[0x301]), 0);
-            MM_MEMWRITEL(&(pDevice->pMemView->uIntMem.MemBlock32K[0x301]),
-                0xffffffff);
-            if (MM_MEMREADL(&(pDevice->pMemView->uIntMem.MemBlock32K[0x300])))
-            {
-                pDevice->EnablePciXFix = TRUE;
-            }
-        }
-    }
-#endif
-
-    LM_NvramInit(pDevice);
-
-    Status = LM_STATUS_FAILURE;
-    /* Get the node address.  First try to get in from the shared memory. */
-    /* If the signature is not present, then get it from the NVRAM. */
-    Value32 = MEM_RD_OFFSET(pDevice, T3_MAC_ADDR_HIGH_MAILBOX);
-    if((Value32 >> 16) == 0x484b)
-    {
-        int i;
-
-        pDevice->NodeAddress[0] = (LM_UINT8) (Value32 >> 8);
-        pDevice->NodeAddress[1] = (LM_UINT8) Value32;
-
-        Value32 = MEM_RD_OFFSET(pDevice, T3_MAC_ADDR_LOW_MAILBOX);
-
-        pDevice->NodeAddress[2] = (LM_UINT8) (Value32 >> 24);
-        pDevice->NodeAddress[3] = (LM_UINT8) (Value32 >> 16);
-        pDevice->NodeAddress[4] = (LM_UINT8) (Value32 >> 8);
-        pDevice->NodeAddress[5] = (LM_UINT8) Value32;
-
-        /* Check for null MAC address which can happen with older boot code */
-        for (i = 0; i < 6; i++)
-        {
-            if (pDevice->NodeAddress[i] != 0)
-            {
-                Status = LM_STATUS_SUCCESS;
-                break;
-            }
-        }
-    }
-    if (Status != LM_STATUS_SUCCESS)
-    {
-        int MacOffset;
-
-        MacOffset = 0x7c;
-        if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5704)
-        {
-            if (REG_RD(pDevice, PciCfg.DualMacCtrl) & T3_DUAL_MAC_ID)
-            {
-                MacOffset = 0xcc;
-            }
-            /* workaround - need to reset nvram if */
-            /* the boot code is not running */
-            if (LM_NvramGetLock(pDevice) != LM_STATUS_SUCCESS)
-            {
-                REG_WR(pDevice, Nvram.Cmd, NVRAM_CMD_RESET);
-            }
-            else
-            {
-                LM_NvramReleaseLock(pDevice);
-            }
-        }
-        Status = LM_NvramRead(pDevice, MacOffset, &Value32);
-        if(Status == LM_STATUS_SUCCESS)
-        {
-            LM_UINT8 *c = (LM_UINT8 *) &Value32;
-
-            pDevice->NodeAddress[0] = c[2];
-            pDevice->NodeAddress[1] = c[3];
-
-            Status = LM_NvramRead(pDevice, MacOffset + 4, &Value32);
-
-            c = (LM_UINT8 *) &Value32;
-            pDevice->NodeAddress[2] = c[0];
-            pDevice->NodeAddress[3] = c[1];
-            pDevice->NodeAddress[4] = c[2];
-            pDevice->NodeAddress[5] = c[3];
-        }
-    }
-
-    if(Status != LM_STATUS_SUCCESS)
-    {
-        Value32 = REG_RD(pDevice, MacCtrl.MacAddr[0].High);
-        pDevice->NodeAddress[0] = (Value32 >> 8) & 0xff;
-        pDevice->NodeAddress[1] = Value32 & 0xff;
-        Value32 = REG_RD(pDevice, MacCtrl.MacAddr[0].Low);
-        pDevice->NodeAddress[2] = (Value32 >> 24) & 0xff;
-        pDevice->NodeAddress[3] = (Value32 >> 16) & 0xff;
-        pDevice->NodeAddress[4] = (Value32 >> 8) & 0xff;
-        pDevice->NodeAddress[5] = Value32 & 0xff;
-        printf("WARNING: Cannot get MAC addr from NVRAM, using %2.2x%2.2x%2.2x%2.2x%2.2x%2.2x\n",
-            pDevice->NodeAddress[0], pDevice->NodeAddress[1],
-            pDevice->NodeAddress[2], pDevice->NodeAddress[3],
-            pDevice->NodeAddress[4], pDevice->NodeAddress[5]);
-    }
-
-    memcpy(pDevice->PermanentNodeAddress, pDevice->NodeAddress, 6);
-
-    /* Initialize the default values. */
-    pDevice->NoTxPseudoHdrChksum = FALSE;
-    pDevice->NoRxPseudoHdrChksum = FALSE;
-    pDevice->NicSendBd = FALSE;
-    pDevice->TxPacketDescCnt = DEFAULT_TX_PACKET_DESC_COUNT;
-    pDevice->RxStdDescCnt = DEFAULT_STD_RCV_DESC_COUNT;
-    pDevice->RxCoalescingTicks = DEFAULT_RX_COALESCING_TICKS;
-    pDevice->TxCoalescingTicks = DEFAULT_TX_COALESCING_TICKS;
-    pDevice->RxMaxCoalescedFrames = DEFAULT_RX_MAX_COALESCED_FRAMES;
-    pDevice->TxMaxCoalescedFrames = DEFAULT_TX_MAX_COALESCED_FRAMES;
-    pDevice->RxCoalescingTicksDuringInt = BAD_DEFAULT_VALUE;
-    pDevice->TxCoalescingTicksDuringInt = BAD_DEFAULT_VALUE;
-    pDevice->RxMaxCoalescedFramesDuringInt = BAD_DEFAULT_VALUE;
-    pDevice->TxMaxCoalescedFramesDuringInt = BAD_DEFAULT_VALUE;
-    pDevice->StatsCoalescingTicks = DEFAULT_STATS_COALESCING_TICKS;
-    pDevice->EnableMWI = FALSE;
-    pDevice->TxMtu = MAX_ETHERNET_PACKET_SIZE_NO_CRC;
-    pDevice->RxMtu = MAX_ETHERNET_PACKET_SIZE_NO_CRC;
-    pDevice->DisableAutoNeg = FALSE;
-    pDevice->PhyIntMode = T3_PHY_INT_MODE_AUTO;
-    pDevice->LinkChngMode = T3_LINK_CHNG_MODE_AUTO;
-    pDevice->LedMode = LED_MODE_AUTO;
-    pDevice->PhyFlags = 0;
-    pDevice->DelayPciGrant = TRUE;
-    pDevice->UseTaggedStatus = FALSE;
-    pDevice->OneDmaAtOnce = FALSE;
-
-    pDevice->RequestedLineSpeed = LM_LINE_SPEED_AUTO;
-    pDevice->TaskOffloadCap = LM_TASK_OFFLOAD_NONE;
-    pDevice->TaskToOffload = LM_TASK_OFFLOAD_NONE;
-    pDevice->FlowControlCap = LM_FLOW_CONTROL_AUTO_PAUSE;
-    pDevice->EnableTbi = FALSE;
-#if INCLUDE_TBI_SUPPORT
-    pDevice->PollTbiLink = BAD_DEFAULT_VALUE;
-    pDevice->IgnoreTbiLinkChange = FALSE;
-    pDevice->NoTbiInterrupt = FALSE;
-#endif
-#if INCLUDE_TCP_SEG_SUPPORT
-    pDevice->LargeSendMaxSize = T3_TCP_SEG_MAX_OFFLOAD_SIZE;
-    pDevice->LargeSendMinNumSeg = T3_TCP_SEG_MIN_NUM_SEG;
-#endif
-
-    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))
-    {
-        pDevice->PhyFlags |= PHY_RESET_ON_LINKDOWN;
-        pDevice->PhyFlags |= PHY_CHECK_TAPS_AFTER_RESET;
-    }
-    if ((T3_CHIP_REV(pDevice->ChipRevId) == T3_CHIP_REV_5703_AX) ||
-        (T3_CHIP_REV(pDevice->ChipRevId) == T3_CHIP_REV_5704_AX))
-    {
-        pDevice->PhyFlags |= PHY_ADC_FIX;
-    }
-    if (pDevice->ChipRevId == T3_CHIP_ID_5704_A0)
-    {
-        pDevice->PhyFlags |= PHY_5704_A0_FIX;
-    }
-    /* Ethernet@Wirespeed is supported on 5701,5702,5703,5704,5705a0,5705a1 */
-    if ((T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5700) &&
-        !((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705) &&
-        (pDevice->ChipRevId != T3_CHIP_ID_5705_A0) &&
-        (pDevice->ChipRevId != T3_CHIP_ID_5705_A1)))
-    {
-        pDevice->PhyFlags |= PHY_ETHERNET_WIRESPEED;
-    }
-
-    switch (T3_ASIC_REV(pDevice->ChipRevId))
-    {
-    case T3_ASIC_REV_5704:
-        pDevice->MbufBase = T3_NIC_MBUF_POOL_ADDR;
-        pDevice->MbufSize = T3_NIC_MBUF_POOL_SIZE64;
-        break;
-    default:
-        pDevice->MbufBase = T3_NIC_MBUF_POOL_ADDR;
-        pDevice->MbufSize = T3_NIC_MBUF_POOL_SIZE96;
-        break;
-    }
-
-    pDevice->LinkStatus = LM_STATUS_LINK_DOWN;
-    pDevice->QueueRxPackets = TRUE;
-
-#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
-    pDevice->RxJumboDescCnt = DEFAULT_JUMBO_RCV_DESC_COUNT;
-    if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705)
-    {
-        pDevice->RxJumboDescCnt = 0;
-    }
-#endif /* T3_JUMBO_RCV_RCB_ENTRY_COUNT */
-
-    pDevice->BondId = REG_RD(pDevice, Grc.MiscCfg) & GRC_MISC_BD_ID_MASK;
-
-    if(((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701) &&
-        ((pDevice->BondId == 0x10000) || (pDevice->BondId == 0x18000))) ||
-        ((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5703) &&
-        ((pDevice->BondId == 0x14000) || (pDevice->BondId == 0x1c000))))
-    {
-        return LM_STATUS_UNKNOWN_ADAPTER;
-    }
-    if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5703)
-    {
-        if ((pDevice->BondId == 0x8000) || (pDevice->BondId == 0x4000))
-        {
-            pDevice->No1000 = TRUE;
-        }
-    }
-    if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705)
-    {
-        pDevice->Bcm5788 = FALSE;
-        if ((pDevice->BondId == GRC_MISC_BD_ID_5788) ||
-            (pDevice->BondId == GRC_MISC_BD_ID_5788M))
-        {
-            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->PciDeviceId == T3_PCI_DEVICE_ID(T3_PCI_ID_BCM5705F)))
-        {
-            pDevice->No1000 = TRUE;
-        }
-    }
-
-    pDevice->SplitModeEnable = SPLIT_MODE_DISABLE;
-    if ((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5704) &&
-        (pDevice->BondId == GRC_MISC_BD_ID_5704CIOBE))
-    {
-        pDevice->SplitModeEnable = SPLIT_MODE_ENABLE;
-        pDevice->SplitModeMaxReq = SPLIT_MODE_5704_MAX_REQ;
-    }
-
-    /* Get Eeprom info. */
-    Value32 = MEM_RD_OFFSET(pDevice, T3_NIC_DATA_SIG_ADDR);
-    if (Value32 == T3_NIC_DATA_SIG)
-    {
-        EeSigFound = TRUE;
-        Value32 = MEM_RD_OFFSET(pDevice, T3_NIC_DATA_NIC_CFG_ADDR);
-
-        if (Value32 & T3_NIC_MINI_PCI)
-        {
-            pDevice->MiniPci = TRUE;
-        }
-        /* Determine PHY type. */
-        switch (Value32 & T3_NIC_CFG_PHY_TYPE_MASK)
-        {
-            case T3_NIC_CFG_PHY_TYPE_COPPER:
-                EePhyTypeSerdes = FALSE;
-                break;
-
-            case T3_NIC_CFG_PHY_TYPE_FIBER:
-                EePhyTypeSerdes = TRUE;
-                break;
-
-            default:
-                EePhyTypeSerdes = FALSE;
-                break;
-        }
-
-        /* Determine PHY led mode. */
-        if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700 ||
-            T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701)
-        {
-            switch(Value32 & T3_NIC_CFG_LED_MODE_MASK)
-            {
-                case T3_NIC_CFG_LED_MODE_TRIPLE_SPEED:
-                    EePhyLedMode = LED_MODE_THREE_LINK;
-                    break;
-
-                case T3_NIC_CFG_LED_MODE_LINK_SPEED:
-                    EePhyLedMode = LED_MODE_LINK10;
-                    break;
-
-                default:
-                    EePhyLedMode = LED_MODE_AUTO;
-                    break;
-            }
-        }
-        else
-        {
-            switch(Value32 & T3_NIC_CFG_LED_MODE_MASK)
-            {
-                case T3_NIC_CFG_LED_MODE_OPEN_DRAIN:
-                    EePhyLedMode = LED_MODE_OPEN_DRAIN;
-                    break;
-
-                case T3_NIC_CFG_LED_MODE_OUTPUT:
-                    EePhyLedMode = LED_MODE_OUTPUT;
-                    break;
-
-                default:
-                    EePhyLedMode = LED_MODE_AUTO;
-                    break;
-            }
-        }
-        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))
-        {
-            /* Enable EEPROM write protection. */
-            if(Value32 & T3_NIC_EEPROM_WP)
-            {
-                pDevice->EepromWp = TRUE;
-            }
-        }
-        pDevice->EnableAsf = FALSE;
-#ifdef BCM_ASF
-        if (Value32 & T3_NIC_CFG_ENABLE_ASF)
-        {
-            pDevice->EnableAsf = TRUE;
-        }
-#endif
-        if (Value32 & T3_NIC_FIBER_WOL_CAPABLE)
-        {
-            pDevice->FiberWolCapable = 1;
-        }
-        if (Value32 & T3_NIC_WOL_LIMIT_10)
-        {
-            pDevice->WolLimit10 = TRUE;
-        }
-
-        /* Get the PHY Id. */
-        Value32 = MEM_RD_OFFSET(pDevice, T3_NIC_DATA_PHY_ID_ADDR);
-        if (Value32)
-        {
-            EePhyId = (((Value32 & T3_NIC_PHY_ID1_MASK) >> 16) &
-                PHY_ID1_OUI_MASK) << 10;
-
-            Value32 = Value32 & T3_NIC_PHY_ID2_MASK;
-
-            EePhyId |= ((Value32 & PHY_ID2_OUI_MASK) << 16) |
-              (Value32 & PHY_ID2_MODEL_MASK) | (Value32 & PHY_ID2_REV_MASK);
-        }
-        else
-        {
-            EePhyId = 0;
-        }
-    }
-    else
-    {
-        EeSigFound = FALSE;
-    }
-
-    /* Set the PHY address. */
-    pDevice->PhyAddr = PHY_DEVICE_ID;
-
-    /* Disable auto polling. */
-    pDevice->MiMode = 0xc0000;
-    REG_WR(pDevice, MacCtrl.MiMode, pDevice->MiMode);
-    MM_Wait(40);
-
-    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)
-    {
-        case PHY_BCM5400_PHY_ID:
-        case PHY_BCM5401_PHY_ID:
-        case PHY_BCM5411_PHY_ID:
-        case PHY_BCM5701_PHY_ID:
-        case PHY_BCM5703_PHY_ID:
-        case PHY_BCM5704_PHY_ID:
-        case PHY_BCM5705_PHY_ID:
-            pDevice->EnableTbi = FALSE;
-            break;
-
-        case PHY_BCM8002_PHY_ID:
-            pDevice->EnableTbi = TRUE;
-            break;
-
-        default:
-
-            if (EeSigFound)
-            {
-                pDevice->PhyId = EePhyId;
-                pDevice->EnableTbi = EePhyTypeSerdes;
-            }
-            else if ((pAdapterInfo = LM_GetAdapterInfoBySsid(
-                pDevice->SubsystemVendorId,
-                pDevice->SubsystemId)))
-            {
-                pDevice->PhyId = pAdapterInfo->PhyId;
-                pDevice->EnableTbi = pAdapterInfo->Serdes;
-            }
-            break;
-    }
-
-    if(UNKNOWN_PHY_ID(pDevice->PhyId) && !pDevice->EnableTbi)
-    {
-        pDevice->EnableTbi = TRUE;
-        printf("PHY ID unknown, assume it is SerDes\n");
-    }
-
-    if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5703)
-    {
-        if((pDevice->SavedCacheLineReg & 0xff00) < 0x4000)
-        {
-            pDevice->SavedCacheLineReg &= 0xffff00ff;
-            pDevice->SavedCacheLineReg |= 0x4000;
-        }
-    }
-
-    pDevice->ReceiveMask = LM_ACCEPT_MULTICAST | LM_ACCEPT_BROADCAST |
-        LM_ACCEPT_UNICAST;
-
-    pDevice->TaskOffloadCap = LM_TASK_OFFLOAD_TX_TCP_CHECKSUM |
-        LM_TASK_OFFLOAD_TX_UDP_CHECKSUM | LM_TASK_OFFLOAD_RX_TCP_CHECKSUM |
-        LM_TASK_OFFLOAD_RX_UDP_CHECKSUM;
-
-    if (pDevice->ChipRevId == T3_CHIP_ID_5700_B0)
-    {
-       	pDevice->TaskOffloadCap &= ~(LM_TASK_OFFLOAD_TX_TCP_CHECKSUM |
-            LM_TASK_OFFLOAD_TX_UDP_CHECKSUM);
-    }
-
-#if INCLUDE_TCP_SEG_SUPPORT
-    pDevice->TaskOffloadCap |= LM_TASK_OFFLOAD_TCP_SEGMENTATION;
-
-    if ((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700) ||
-        (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701) ||
-        (pDevice->ChipRevId == T3_CHIP_ID_5705_A0) ||
-        (pDevice->Bcm5788))
-    {
-        pDevice->TaskOffloadCap &= ~LM_TASK_OFFLOAD_TCP_SEGMENTATION;
-    }
-#endif
-
-#ifdef BCM_ASF
-    if (pDevice->EnableAsf)
-    {
-       	pDevice->TaskOffloadCap &= ~LM_TASK_OFFLOAD_TCP_SEGMENTATION;
-    }
-#endif
-
-    /* Change driver parameters. */
-    Status = MM_GetConfig(pDevice);
-    if(Status != LM_STATUS_SUCCESS)
-    {
-        return Status;
-    }
-
-    if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705)
-    {
-        pDevice->NicSendBd = FALSE;
-    }
-
-    /* Save the current phy link status. */
-    if ((!pDevice->EnableTbi) && (!pDevice->EnableAsf))
-    {
-        LM_ReadPhy(pDevice, PHY_STATUS_REG, &Value32);
-        LM_ReadPhy(pDevice, PHY_STATUS_REG, &Value32);
-
-        /* If we don't have link reset the PHY. */
-        if(!(Value32 & PHY_STATUS_LINK_PASS) ||
-            (pDevice->PhyFlags & PHY_RESET_ON_INIT))
-        {
-
-            LM_ResetPhy(pDevice);
-
-            if (LM_PhyAdvertiseAll(pDevice) != LM_STATUS_SUCCESS)
-            {
-                Value32 = PHY_AN_AD_PROTOCOL_802_3_CSMA_CD |
-                    PHY_AN_AD_ALL_SPEEDS;
-                Value32 |= GetPhyAdFlowCntrlSettings(pDevice);
-                LM_WritePhy(pDevice, PHY_AN_AD_REG, Value32);
-
-                Value32 = BCM540X_AN_AD_ALL_1G_SPEEDS ;
-#if INCLUDE_5701_AX_FIX
-                if(pDevice->ChipRevId == T3_CHIP_ID_5701_A0 ||
-                    pDevice->ChipRevId == T3_CHIP_ID_5701_B0)
-                {
-                    Value32 |= BCM540X_CONFIG_AS_MASTER |
-                        BCM540X_ENABLE_CONFIG_AS_MASTER;
-                }
-#endif
-                LM_WritePhy(pDevice, BCM540X_1000BASET_CTRL_REG, Value32);
-
-                LM_WritePhy(pDevice, PHY_CTRL_REG, PHY_CTRL_AUTO_NEG_ENABLE |
-                    PHY_CTRL_RESTART_AUTO_NEG);
-            }
-
-        }
-        LM_SetEthWireSpeed(pDevice);
-
-        LM_ReadPhy(pDevice, PHY_AN_AD_REG, &pDevice->advertising);
-        LM_ReadPhy(pDevice, BCM540X_1000BASET_CTRL_REG,
-            &pDevice->advertising1000);
-    }
-    /* Turn off tap power management. */
-    if((pDevice->PhyId & PHY_ID_MASK) == PHY_BCM5401_PHY_ID)
-    {
-        LM_WritePhy(pDevice, BCM5401_AUX_CTRL, 0x0c20);
-        LM_WritePhy(pDevice, BCM540X_DSP_ADDRESS_REG, 0x0012);
-        LM_WritePhy(pDevice, BCM540X_DSP_RW_PORT, 0x1804);
-        LM_WritePhy(pDevice, BCM540X_DSP_ADDRESS_REG, 0x0013);
-        LM_WritePhy(pDevice, BCM540X_DSP_RW_PORT, 0x1204);
-        LM_WritePhy(pDevice, BCM540X_DSP_ADDRESS_REG, 0x8006);
-        LM_WritePhy(pDevice, BCM540X_DSP_RW_PORT, 0x0132);
-        LM_WritePhy(pDevice, BCM540X_DSP_ADDRESS_REG, 0x8006);
-        LM_WritePhy(pDevice, BCM540X_DSP_RW_PORT, 0x0232);
-        LM_WritePhy(pDevice, BCM540X_DSP_ADDRESS_REG, 0x201f);
-        LM_WritePhy(pDevice, BCM540X_DSP_RW_PORT, 0x0a20);
-
-        MM_Wait(40);
-    }
-
-#if INCLUDE_TBI_SUPPORT
-    if(pDevice->EnableTbi)
-    {
-        if (!pDevice->FiberWolCapable)
-        {
-            pDevice->WakeUpModeCap = LM_WAKE_UP_MODE_NONE;
-        }
-        pDevice->PhyIntMode = T3_PHY_INT_MODE_LINK_READY;
-        if (pDevice->PollTbiLink == BAD_DEFAULT_VALUE)
-        {
-            pDevice->PollTbiLink = FALSE;
-        }
-        if (pDevice->PollTbiLink == TRUE)
-        {
-            if (pDevice->NoTbiInterrupt == TRUE) /* Always poll */
-            {
-                pDevice->IgnoreTbiLinkChange = TRUE;
-            }
-        }
-    }
-    else
-    {
-        pDevice->PollTbiLink = FALSE;
-    }
-#endif /* INCLUDE_TBI_SUPPORT */
-
-    /* UseTaggedStatus is only valid for 5701 and later. */
-    if ((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700) ||
-        ((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705) &&
-        ((pDevice->BondId == GRC_MISC_BD_ID_5788) ||
-        (pDevice->BondId == GRC_MISC_BD_ID_5788M))))
-    {
-        pDevice->UseTaggedStatus = FALSE;
-        pDevice->CoalesceMode = 0;
-    }
-    else
-    {
-        pDevice->CoalesceMode = HOST_COALESCE_CLEAR_TICKS_ON_RX_BD_EVENT |
-            HOST_COALESCE_CLEAR_TICKS_ON_TX_BD_EVENT;
-    }
-
-    /* Set the status block size. */
-    if(T3_CHIP_REV(pDevice->ChipRevId) != T3_CHIP_REV_5700_AX &&
-        T3_CHIP_REV(pDevice->ChipRevId) != T3_CHIP_REV_5700_BX)
-    {
-        pDevice->CoalesceMode |= HOST_COALESCE_32_BYTE_STATUS_MODE;
-    }
-
-    /* Check the DURING_INT coalescing ticks parameters. */
-    if(pDevice->UseTaggedStatus)
-    {
-        if(pDevice->RxCoalescingTicksDuringInt == BAD_DEFAULT_VALUE)
-        {
-            pDevice->RxCoalescingTicksDuringInt =
-                DEFAULT_RX_COALESCING_TICKS_DURING_INT;
-        }
-
-        if(pDevice->TxCoalescingTicksDuringInt == BAD_DEFAULT_VALUE)
-        {
-            pDevice->TxCoalescingTicksDuringInt =
-                DEFAULT_TX_COALESCING_TICKS_DURING_INT;
-        }
-
-        if(pDevice->RxMaxCoalescedFramesDuringInt == BAD_DEFAULT_VALUE)
-        {
-            pDevice->RxMaxCoalescedFramesDuringInt =
-                DEFAULT_RX_MAX_COALESCED_FRAMES_DURING_INT;
-        }
-
-        if(pDevice->TxMaxCoalescedFramesDuringInt == BAD_DEFAULT_VALUE)
-        {
-            pDevice->TxMaxCoalescedFramesDuringInt =
-                DEFAULT_TX_MAX_COALESCED_FRAMES_DURING_INT;
-        }
-    }
-    else
-    {
-        if(pDevice->RxCoalescingTicksDuringInt == BAD_DEFAULT_VALUE)
-        {
-            pDevice->RxCoalescingTicksDuringInt = 0;
-        }
-
-        if(pDevice->TxCoalescingTicksDuringInt == BAD_DEFAULT_VALUE)
-        {
-            pDevice->TxCoalescingTicksDuringInt = 0;
-        }
-
-        if(pDevice->RxMaxCoalescedFramesDuringInt == BAD_DEFAULT_VALUE)
-        {
-            pDevice->RxMaxCoalescedFramesDuringInt = 0;
-        }
-
-        if(pDevice->TxMaxCoalescedFramesDuringInt == BAD_DEFAULT_VALUE)
-        {
-            pDevice->TxMaxCoalescedFramesDuringInt = 0;
-        }
-    }
-
-#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
-    if(pDevice->RxMtu <= (MAX_STD_RCV_BUFFER_SIZE - 8 /* CRC */))
-    {
-        pDevice->RxJumboDescCnt = 0;
-        if(pDevice->RxMtu <= MAX_ETHERNET_PACKET_SIZE_NO_CRC)
-        {
-            pDevice->RxMtu = MAX_ETHERNET_PACKET_SIZE_NO_CRC;
-        }
-    }
-    else if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705)
-    {
-        pDevice->RxMtu = MAX_ETHERNET_PACKET_SIZE_NO_CRC;
-        pDevice->RxJumboDescCnt = 0;
-    }
-    else
-    {
-        pDevice->RxJumboBufferSize = (pDevice->RxMtu + 8 /* CRC + VLAN */ +
-            COMMON_CACHE_LINE_SIZE-1) & ~COMMON_CACHE_LINE_MASK;
-
-        if(pDevice->RxJumboBufferSize > MAX_JUMBO_RCV_BUFFER_SIZE)
-        {
-            pDevice->RxJumboBufferSize = DEFAULT_JUMBO_RCV_BUFFER_SIZE;
-            pDevice->RxMtu = pDevice->RxJumboBufferSize - 8 /* CRC + VLAN */;
-        }
-        pDevice->TxMtu = pDevice->RxMtu;
-
-    }
-#else
-    pDevice->RxMtu = MAX_ETHERNET_PACKET_SIZE_NO_CRC;
-#endif /* T3_JUMBO_RCV_RCB_ENTRY_COUNT */
-
-    pDevice->RxPacketDescCnt = 
-#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
-        pDevice->RxJumboDescCnt +
-#endif /* T3_JUMBO_RCV_RCB_ENTRY_COUNT */
-        pDevice->RxStdDescCnt;
-
-    if(pDevice->TxMtu < MAX_ETHERNET_PACKET_SIZE_NO_CRC)
-    {
-        pDevice->TxMtu = MAX_ETHERNET_PACKET_SIZE_NO_CRC;
-    }
-
-    if(pDevice->TxMtu > MAX_JUMBO_TX_BUFFER_SIZE)
-    {
-        pDevice->TxMtu = MAX_JUMBO_TX_BUFFER_SIZE;
-    }
-
-    /* Configure the proper ways to get link change interrupt. */
-    if(pDevice->PhyIntMode == T3_PHY_INT_MODE_AUTO)
-    {
-        if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700)
-        {
-            pDevice->PhyIntMode = T3_PHY_INT_MODE_MI_INTERRUPT;
-        }
-        else
-        {
-            pDevice->PhyIntMode = T3_PHY_INT_MODE_LINK_READY;
-        }
-    }
-    else if(pDevice->PhyIntMode == T3_PHY_INT_MODE_AUTO_POLLING)
-    {
-        /* Auto-polling does not work on 5700_AX and 5700_BX. */
-        if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700)
-        {
-            pDevice->PhyIntMode = T3_PHY_INT_MODE_MI_INTERRUPT;
-        }
-    }
-
-    /* Determine the method to get link change status. */
-    if(pDevice->LinkChngMode == T3_LINK_CHNG_MODE_AUTO)
-    {
-        /* The link status bit in the status block does not work on 5700_AX */
-        /* and 5700_BX chips. */
-        if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700)
-        {
-            pDevice->LinkChngMode = T3_LINK_CHNG_MODE_USE_STATUS_REG;
-        }
-        else
-        {
-            pDevice->LinkChngMode = T3_LINK_CHNG_MODE_USE_STATUS_BLOCK;
-        }
-    }
-
-    if(pDevice->PhyIntMode == T3_PHY_INT_MODE_MI_INTERRUPT ||
-        T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700)
-    {
-        pDevice->LinkChngMode = T3_LINK_CHNG_MODE_USE_STATUS_REG;
-    }
-
-    /* Configure PHY led mode. */
-    if(pDevice->LedMode == LED_MODE_AUTO)
-    {
-        if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700 ||
-            T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701)
-        {
-            if(pDevice->SubsystemVendorId == T3_SVID_DELL)
-            {
-                pDevice->LedMode = LED_MODE_LINK10;
-            }
-            else
-            {
-                pDevice->LedMode = LED_MODE_THREE_LINK;
-
-                if(EeSigFound && EePhyLedMode != LED_MODE_AUTO)
-                {
-                    pDevice->LedMode = EePhyLedMode;
-                }
-            }
-
-            /* bug? 5701 in LINK10 mode does not seem to work when */
-            /* PhyIntMode is LINK_READY. */
-            if(T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5700 &&
-#if INCLUDE_TBI_SUPPORT
-                pDevice->EnableTbi == FALSE &&
-#endif
-                pDevice->LedMode == LED_MODE_LINK10)
-            {
-                pDevice->PhyIntMode = T3_PHY_INT_MODE_MI_INTERRUPT;
-                pDevice->LinkChngMode = T3_LINK_CHNG_MODE_USE_STATUS_REG;
-            }
-
-            if(pDevice->EnableTbi)
-            {
-                pDevice->LedMode = LED_MODE_THREE_LINK;
-            }
-        }
-        else
-        {
-            if(EeSigFound && EePhyLedMode != LED_MODE_AUTO)
-            {
-                pDevice->LedMode = EePhyLedMode;
-            }
-            else
-            {
-                pDevice->LedMode = LED_MODE_OPEN_DRAIN;
-            }
-        }
-    }
-
-#ifdef BCM_WOL
-    if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700 ||
-        pDevice->ChipRevId == T3_CHIP_ID_5701_A0 ||
-        pDevice->ChipRevId == T3_CHIP_ID_5701_B0 ||
-        pDevice->ChipRevId == T3_CHIP_ID_5701_B2)
-    {
-        pDevice->WolSpeed = WOL_SPEED_10MB;
-    }
-    else
-    {
-        if (pDevice->WolLimit10)
-        {
-            pDevice->WolSpeed = WOL_SPEED_10MB;
-        }
-	else
-        {
-            pDevice->WolSpeed = WOL_SPEED_100MB;
-        }
-    }
-#endif
-
-    pDevice->PciState = REG_RD(pDevice, PciCfg.PciState);
-
-    pDevice->RxBDLimit64 = FALSE;
-    pDevice->DmaReadFifoSize = 0;
-    if ((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705) &&
-        (pDevice->ChipRevId != T3_CHIP_ID_5705_A0))
-    {
-#if INCLUDE_TCP_SEG_SUPPORT
-        if ((pDevice->TaskToOffload & LM_TASK_OFFLOAD_TCP_SEGMENTATION) &&
-            ((pDevice->ChipRevId == T3_CHIP_ID_5705_A1) ||
-            (pDevice->ChipRevId == T3_CHIP_ID_5705_A2)))
-        {
-            pDevice->DmaReadFifoSize = DMA_READ_MODE_FIFO_SIZE_128;
-        }
-        else
-#endif
-        {
-            if (!(pDevice->PciState & T3_PCI_STATE_HIGH_BUS_SPEED) &&
-                !pDevice->Bcm5788)
-            {
-                pDevice->DmaReadFifoSize = DMA_READ_MODE_FIFO_LONG_BURST;
-                if (pDevice->ChipRevId == T3_CHIP_ID_5705_A1)
-                {
-                    pDevice->RxBDLimit64 = TRUE;
-                }
-            }
-        }
-    }
-
-    LM_ReadVPD(pDevice);
-    LM_ReadBootCodeVersion(pDevice);
-    LM_GetBusSpeed(pDevice);
-
-    return LM_STATUS_SUCCESS;
-} /* LM_GetAdapterInfo */
-
-STATIC PLM_ADAPTER_INFO
-LM_GetAdapterInfoBySsid(
-    LM_UINT16 Svid,
-    LM_UINT16 Ssid)
-{
-    static LM_ADAPTER_INFO AdapterArr[] =
-    {
-        { T3_SVID_BROADCOM, T3_SSID_BROADCOM_BCM95700A6, PHY_BCM5401_PHY_ID, 0},
-        { T3_SVID_BROADCOM, T3_SSID_BROADCOM_BCM95701A5, PHY_BCM5701_PHY_ID, 0},
-        { T3_SVID_BROADCOM, T3_SSID_BROADCOM_BCM95700T6, PHY_BCM8002_PHY_ID, 1},
-        { T3_SVID_BROADCOM, T3_SSID_BROADCOM_BCM95700A9, 0, 1 },
-        { T3_SVID_BROADCOM, T3_SSID_BROADCOM_BCM95701T1, PHY_BCM5701_PHY_ID, 0},
-        { T3_SVID_BROADCOM, T3_SSID_BROADCOM_BCM95701T8, PHY_BCM5701_PHY_ID, 0},
-        { T3_SVID_BROADCOM, T3_SSID_BROADCOM_BCM95701A7, 0, 1},
-        { T3_SVID_BROADCOM, T3_SSID_BROADCOM_BCM95701A10, PHY_BCM5701_PHY_ID, 0},
-        { T3_SVID_BROADCOM, T3_SSID_BROADCOM_BCM95701A12, PHY_BCM5701_PHY_ID, 0},
-        { T3_SVID_BROADCOM, T3_SSID_BROADCOM_BCM95703Ax1, PHY_BCM5703_PHY_ID, 0},
-        { T3_SVID_BROADCOM, T3_SSID_BROADCOM_BCM95703Ax2, PHY_BCM5703_PHY_ID, 0},
-
-        { T3_SVID_3COM, T3_SSID_3COM_3C996T, PHY_BCM5401_PHY_ID, 0 },
-        { T3_SVID_3COM, T3_SSID_3COM_3C996BT, PHY_BCM5701_PHY_ID, 0 },
-        { T3_SVID_3COM, T3_SSID_3COM_3C996SX, 0, 1 },
-        { T3_SVID_3COM, T3_SSID_3COM_3C1000T, PHY_BCM5701_PHY_ID, 0 },
-        { T3_SVID_3COM, T3_SSID_3COM_3C940BR01, PHY_BCM5701_PHY_ID, 0 },
-
-        { T3_SVID_DELL, T3_SSID_DELL_VIPER, PHY_BCM5401_PHY_ID, 0 },
-        { T3_SVID_DELL, T3_SSID_DELL_JAGUAR, PHY_BCM5401_PHY_ID, 0 },
-        { T3_SVID_DELL, T3_SSID_DELL_MERLOT, PHY_BCM5411_PHY_ID, 0 },
-        { T3_SVID_DELL, T3_SSID_DELL_SLIM_MERLOT, PHY_BCM5411_PHY_ID, 0 },
-
-        { T3_SVID_COMPAQ, T3_SSID_COMPAQ_BANSHEE, PHY_BCM5701_PHY_ID, 0 },
-        { T3_SVID_COMPAQ, T3_SSID_COMPAQ_BANSHEE_2, PHY_BCM5701_PHY_ID, 0 },
-        { T3_SVID_COMPAQ, T3_SSID_COMPAQ_CHANGELING, 0, 1 },
-        { T3_SVID_COMPAQ, T3_SSID_COMPAQ_NC7780, PHY_BCM5701_PHY_ID, 0 },
-        { T3_SVID_COMPAQ, T3_SSID_COMPAQ_NC7780_2, PHY_BCM5701_PHY_ID, 0 },
-
-        { 0x1014, 0x0281, 0, 1 },
-    };
-    LM_UINT32 j;
-
-    for(j = 0; j < sizeof(AdapterArr)/sizeof(LM_ADAPTER_INFO); j++)
-    {
-        if(AdapterArr[j].Svid == Svid && AdapterArr[j].Ssid == Ssid)
-        {
-            return &AdapterArr[j];
-        }
-    }
-
-    return NULL;
-}
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*    This routine sets up receive/transmit buffer descriptions queues.       */
-/*                                                                            */
-/* Return:                                                                    */
-/*    LM_STATUS_SUCCESS                                                       */
-/******************************************************************************/
-LM_STATUS
-LM_InitializeAdapter(
-PLM_DEVICE_BLOCK pDevice)
-{
-    LM_PHYSICAL_ADDRESS MemPhy;
-    PLM_UINT8 pMemVirt;
-    PLM_PACKET pPacket;
-    LM_STATUS Status;
-    LM_UINT32 Size;
-    LM_UINT32 Value32, j;
-
-    /* Set power state to D0. */
-    LM_SetPowerState(pDevice, LM_POWER_STATE_D0);
-
-    /* Intialize the queues. */
-    QQ_InitQueue(&pDevice->RxPacketReceivedQ.Container, 
-        MAX_RX_PACKET_DESC_COUNT);
-    QQ_InitQueue(&pDevice->RxPacketFreeQ.Container,
-        MAX_RX_PACKET_DESC_COUNT);
-
-    QQ_InitQueue(&pDevice->TxPacketFreeQ.Container,MAX_TX_PACKET_DESC_COUNT);
-    QQ_InitQueue(&pDevice->TxPacketActiveQ.Container,MAX_TX_PACKET_DESC_COUNT);
-    QQ_InitQueue(&pDevice->TxPacketXmittedQ.Container,MAX_TX_PACKET_DESC_COUNT);
-
-    if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705)
-    {
-        pDevice->RcvRetRcbEntryCount = 512;
-        pDevice->RcvRetRcbEntryCountMask = 511;
-    }
-    else
-    {
-        pDevice->RcvRetRcbEntryCount = T3_RCV_RETURN_RCB_ENTRY_COUNT;
-        pDevice->RcvRetRcbEntryCountMask = T3_RCV_RETURN_RCB_ENTRY_COUNT_MASK;
-    }
-
-    /* Allocate shared memory for: status block, the buffers for receive */
-    /* rings -- standard, mini, jumbo, and return rings. */
-    Size = T3_STATUS_BLOCK_SIZE + sizeof(T3_STATS_BLOCK) +
-        T3_STD_RCV_RCB_ENTRY_COUNT * sizeof(T3_RCV_BD) +
-#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
-        T3_JUMBO_RCV_RCB_ENTRY_COUNT * sizeof(T3_RCV_BD) +
-#endif /* T3_JUMBO_RCV_RCB_ENTRY_COUNT */
-        (pDevice->RcvRetRcbEntryCount * sizeof(T3_RCV_BD));
-
-    /* Memory for host based Send BD. */
-    if(pDevice->NicSendBd == FALSE)
-    {
-        Size += sizeof(T3_SND_BD) * T3_SEND_RCB_ENTRY_COUNT;
-    }
-
-    /* Allocate the memory block. */
-    Status = MM_AllocateSharedMemory(pDevice, Size, (PLM_VOID) &pMemVirt, &MemPhy, FALSE);
-    if(Status != LM_STATUS_SUCCESS)
-    {
-        return Status;
-    }
-
-    /* Program DMA Read/Write */
-    if (pDevice->PciState & T3_PCI_STATE_NOT_PCI_X_BUS)
-    {
-        if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705)
-        {
-            pDevice->DmaReadWriteCtrl = 0x763f0000;
-        }
-        else
-        {
-            pDevice->DmaReadWriteCtrl = 0x763f000f;    
-        }
-    }
-    else
-    {
-        if((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5703) ||
-            (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5704))
-        {
-            pDevice->DmaReadWriteCtrl = 0x761f0000; 
-
-            Value32 = REG_RD(pDevice, PciCfg.ClockCtrl) & 0x1f;
-            if ((Value32 == 0x6) || (Value32 == 0x7))
-            {
-                pDevice->OneDmaAtOnce = TRUE;
-            }
-        }
-        else
-        {
-            pDevice->DmaReadWriteCtrl = 0x761b000f;    
-        }
-    }
-    if((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5703) ||
-        (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5704))
-    {
-        pDevice->DmaReadWriteCtrl &= 0xfffffff0;
-    }
-
-    if(pDevice->OneDmaAtOnce)
-    {
-        pDevice->DmaReadWriteCtrl |= DMA_CTRL_WRITE_ONE_DMA_AT_ONCE;
-    }
-    REG_WR(pDevice, PciCfg.DmaReadWriteCtrl, pDevice->DmaReadWriteCtrl);
-
-    LM_SwitchClocks(pDevice);
-
-    if (LM_DmaTest(pDevice, pMemVirt, MemPhy, 0x400) != LM_STATUS_SUCCESS)
-    {
-        return LM_STATUS_FAILURE;
-    }
-
-    /* Status block. */
-    pDevice->pStatusBlkVirt = (PT3_STATUS_BLOCK) pMemVirt;
-    pDevice->StatusBlkPhy = MemPhy;
-    pMemVirt += T3_STATUS_BLOCK_SIZE;
-    LM_INC_PHYSICAL_ADDRESS(&MemPhy, T3_STATUS_BLOCK_SIZE);
-
-    /* Statistics block. */
-    pDevice->pStatsBlkVirt = (PT3_STATS_BLOCK) pMemVirt;
-    pDevice->StatsBlkPhy = MemPhy;
-    pMemVirt += sizeof(T3_STATS_BLOCK);
-    LM_INC_PHYSICAL_ADDRESS(&MemPhy, sizeof(T3_STATS_BLOCK));
-
-    /* Receive standard BD buffer. */
-    pDevice->pRxStdBdVirt = (PT3_RCV_BD) pMemVirt;
-    pDevice->RxStdBdPhy = MemPhy;
-
-    pMemVirt += T3_STD_RCV_RCB_ENTRY_COUNT * sizeof(T3_RCV_BD);
-    LM_INC_PHYSICAL_ADDRESS(&MemPhy, 
-        T3_STD_RCV_RCB_ENTRY_COUNT * sizeof(T3_RCV_BD));
-
-#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
-    /* Receive jumbo BD buffer. */
-    pDevice->pRxJumboBdVirt = (PT3_RCV_BD) pMemVirt;
-    pDevice->RxJumboBdPhy = MemPhy;
-
-    pMemVirt += T3_JUMBO_RCV_RCB_ENTRY_COUNT * sizeof(T3_RCV_BD);
-    LM_INC_PHYSICAL_ADDRESS(&MemPhy, 
-        T3_JUMBO_RCV_RCB_ENTRY_COUNT * sizeof(T3_RCV_BD));
-#endif /* T3_JUMBO_RCV_RCB_ENTRY_COUNT */
-
-    /* Receive return BD buffer. */
-    pDevice->pRcvRetBdVirt = (PT3_RCV_BD) pMemVirt;
-    pDevice->RcvRetBdPhy = MemPhy;
-
-    pMemVirt += pDevice->RcvRetRcbEntryCount * sizeof(T3_RCV_BD);
-    LM_INC_PHYSICAL_ADDRESS(&MemPhy, 
-        pDevice->RcvRetRcbEntryCount * sizeof(T3_RCV_BD));
-
-    /* Set up Send BD. */
-    if(pDevice->NicSendBd == FALSE)
-    {
-        pDevice->pSendBdVirt = (PT3_SND_BD) pMemVirt;
-        pDevice->SendBdPhy = MemPhy;
-
-        pMemVirt += sizeof(T3_SND_BD) * T3_SEND_RCB_ENTRY_COUNT;
-        LM_INC_PHYSICAL_ADDRESS(&MemPhy, 
-            sizeof(T3_SND_BD) * T3_SEND_RCB_ENTRY_COUNT);
-    }
-#ifdef BCM_NIC_SEND_BD
-    else
-    {
-        pDevice->pSendBdVirt = (PT3_SND_BD)
-            pDevice->pMemView->uIntMem.First32k.BufferDesc;
-        pDevice->SendBdPhy.High = 0;
-        pDevice->SendBdPhy.Low = T3_NIC_SND_BUFFER_DESC_ADDR;
-    }
-#endif
-
-    /* Allocate memory for packet descriptors. */
-    Size = (pDevice->RxPacketDescCnt + 
-        pDevice->TxPacketDescCnt) * MM_PACKET_DESC_SIZE;
-    Status = MM_AllocateMemory(pDevice, Size, (PLM_VOID *) &pPacket);
-    if(Status != LM_STATUS_SUCCESS)
-    {
-        return Status;
-    }
-    pDevice->pPacketDescBase = (PLM_VOID) pPacket;
-
-    /* Create transmit packet descriptors from the memory block and add them */
-    /* to the TxPacketFreeQ for each send ring. */
-    for(j = 0; j < pDevice->TxPacketDescCnt; j++)
-    {
-        /* Ring index. */
-        pPacket->Flags = 0;
-
-        /* Queue the descriptor in the TxPacketFreeQ of the 'k' ring. */
-        QQ_PushTail(&pDevice->TxPacketFreeQ.Container, pPacket);
-
-        /* Get the pointer to the next descriptor.  MM_PACKET_DESC_SIZE */
-        /* is the total size of the packet descriptor including the */
-        /* os-specific extensions in the UM_PACKET structure. */
-        pPacket = (PLM_PACKET) ((PLM_UINT8) pPacket + MM_PACKET_DESC_SIZE);
-    } /* for(j.. */
-
-    /* Create receive packet descriptors from the memory block and add them */
-    /* to the RxPacketFreeQ.  Create the Standard packet descriptors. */
-    for(j = 0; j < pDevice->RxStdDescCnt; j++)
-    {
-        /* Receive producer ring. */
-        pPacket->u.Rx.RcvProdRing = T3_STD_RCV_PROD_RING;
-
-        /* Receive buffer size. */
-        pPacket->u.Rx.RxBufferSize = MAX_STD_RCV_BUFFER_SIZE;
-
-        /* Add the descriptor to RxPacketFreeQ. */
-        QQ_PushTail(&pDevice->RxPacketFreeQ.Container, pPacket);
-
-        /* Get the pointer to the next descriptor.  MM_PACKET_DESC_SIZE */
-        /* is the total size of the packet descriptor including the */
-        /* os-specific extensions in the UM_PACKET structure. */
-        pPacket = (PLM_PACKET) ((PLM_UINT8) pPacket + MM_PACKET_DESC_SIZE);
-    } /* for */
-
-#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
-    /* Create the Jumbo packet descriptors. */
-    for(j = 0; j < pDevice->RxJumboDescCnt; j++)
-    {
-        /* Receive producer ring. */
-        pPacket->u.Rx.RcvProdRing = T3_JUMBO_RCV_PROD_RING;
-
-        /* Receive buffer size. */
-        pPacket->u.Rx.RxBufferSize = pDevice->RxJumboBufferSize;
-
-        /* Add the descriptor to RxPacketFreeQ. */
-        QQ_PushTail(&pDevice->RxPacketFreeQ.Container, pPacket);
-
-        /* Get the pointer to the next descriptor.  MM_PACKET_DESC_SIZE */
-        /* is the total size of the packet descriptor including the */
-        /* os-specific extensions in the UM_PACKET structure. */
-        pPacket = (PLM_PACKET) ((PLM_UINT8) pPacket + MM_PACKET_DESC_SIZE);
-    } /* for */
-#endif /* T3_JUMBO_RCV_RCB_ENTRY_COUNT */
-
-    /* Initialize the rest of the packet descriptors. */
-    Status = MM_InitializeUmPackets(pDevice);
-    if(Status != LM_STATUS_SUCCESS)
-    {
-        return Status;
-    } /* if */
-
-    /* Default receive mask. */
-    pDevice->ReceiveMask &= LM_KEEP_VLAN_TAG;
-    pDevice->ReceiveMask |= LM_ACCEPT_MULTICAST | LM_ACCEPT_BROADCAST |
-        LM_ACCEPT_UNICAST;
-
-    /* Make sure we are in the first 32k memory window or NicSendBd. */
-    REG_WR(pDevice, PciCfg.MemWindowBaseAddr, 0);
-
-    /* Initialize the hardware. */
-    Status = LM_ResetAdapter(pDevice);
-    if(Status != LM_STATUS_SUCCESS)
-    {
-        return Status;
-    }
-
-    /* We are done with initialization. */
-    pDevice->InitDone = TRUE;
-
-    return LM_STATUS_SUCCESS;
-} /* LM_InitializeAdapter */
-
-
-LM_STATUS
-LM_DisableChip(PLM_DEVICE_BLOCK pDevice)
-{
-    LM_UINT32 data;
-
-    pDevice->RxMode &= ~RX_MODE_ENABLE;
-    REG_WR(pDevice, MacCtrl.RxMode, pDevice->RxMode);
-    if(!(REG_RD(pDevice, MacCtrl.RxMode) & RX_MODE_ENABLE))
-    {
-        MM_Wait(20);
-    }
-    data = REG_RD(pDevice, RcvBdIn.Mode);
-    data &= ~RCV_BD_IN_MODE_ENABLE;
-    REG_WR(pDevice, RcvBdIn.Mode,data);
-    if(!(REG_RD(pDevice, RcvBdIn.Mode) & RCV_BD_IN_MODE_ENABLE))
-    {
-        MM_Wait(20);
-    }
-    data = REG_RD(pDevice, RcvListPlmt.Mode);
-    data &= ~RCV_LIST_PLMT_MODE_ENABLE;
-    REG_WR(pDevice, RcvListPlmt.Mode,data);
-    if(!(REG_RD(pDevice, RcvListPlmt.Mode) & RCV_LIST_PLMT_MODE_ENABLE))
-    {
-        MM_Wait(20);
-    }
-    if(T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5705)
-    {
-        data = REG_RD(pDevice, RcvListSel.Mode);
-        data &= ~RCV_LIST_SEL_MODE_ENABLE;
-        REG_WR(pDevice, RcvListSel.Mode,data);
-        if(!(REG_RD(pDevice, RcvListSel.Mode) & RCV_LIST_SEL_MODE_ENABLE))
-        {
-            MM_Wait(20);
-        }
-    }
-    data = REG_RD(pDevice, RcvDataBdIn.Mode);
-    data &= ~RCV_DATA_BD_IN_MODE_ENABLE;
-    REG_WR(pDevice, RcvDataBdIn.Mode,data);
-    if(!(REG_RD(pDevice, RcvDataBdIn.Mode) & RCV_DATA_BD_IN_MODE_ENABLE))
-    {
-        MM_Wait(20);
-    }
-    data = REG_RD(pDevice, RcvDataComp.Mode);
-    data &= ~RCV_DATA_COMP_MODE_ENABLE;
-    REG_WR(pDevice, RcvDataComp.Mode,data);
-    if(!(REG_RD(pDevice, RcvDataBdIn.Mode) & RCV_DATA_COMP_MODE_ENABLE))
-    {
-        MM_Wait(20);
-    }
-    data = REG_RD(pDevice, RcvBdComp.Mode);
-    data &= ~RCV_BD_COMP_MODE_ENABLE;
-    REG_WR(pDevice, RcvBdComp.Mode,data);
-    if(!(REG_RD(pDevice, RcvBdComp.Mode) & RCV_BD_COMP_MODE_ENABLE))
-    {
-        MM_Wait(20);
-    }     
-    data = REG_RD(pDevice, SndBdSel.Mode);
-    data &= ~SND_BD_SEL_MODE_ENABLE;
-    REG_WR(pDevice, SndBdSel.Mode, data);
-    if(!(REG_RD(pDevice, SndBdSel.Mode) & SND_BD_SEL_MODE_ENABLE))
-    {
-        MM_Wait(20);
-    }
-    data = REG_RD(pDevice, SndBdIn.Mode);
-    data &= ~SND_BD_IN_MODE_ENABLE;
-    REG_WR(pDevice, SndBdIn.Mode, data);
-    if(!(REG_RD(pDevice, SndBdIn.Mode) & SND_BD_IN_MODE_ENABLE))
-    {
-        MM_Wait(20);
-    }
-    data = REG_RD(pDevice, SndDataIn.Mode);
-    data &= ~T3_SND_DATA_IN_MODE_ENABLE;
-    REG_WR(pDevice, SndDataIn.Mode,data);
-    if(!(REG_RD(pDevice, SndDataIn.Mode) & T3_SND_DATA_IN_MODE_ENABLE))
-    {
-        MM_Wait(20);
-    }
-    data = REG_RD(pDevice, DmaRead.Mode);
-    data &= ~DMA_READ_MODE_ENABLE;
-    REG_WR(pDevice, DmaRead.Mode, data);
-    if(!(REG_RD(pDevice, DmaRead.Mode) & DMA_READ_MODE_ENABLE))
-    {
-        MM_Wait(20);
-    }
-    data = REG_RD(pDevice, SndDataComp.Mode);
-    data &= ~SND_DATA_COMP_MODE_ENABLE;
-    REG_WR(pDevice, SndDataComp.Mode, data);
-    if(!(REG_RD(pDevice, SndDataComp.Mode) & SND_DATA_COMP_MODE_ENABLE))
-    {
-        MM_Wait(20);
-    }
-    if(T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5705)
-    {
-        data = REG_RD(pDevice,DmaComp.Mode);
-        data &= ~DMA_COMP_MODE_ENABLE;
-        REG_WR(pDevice, DmaComp.Mode, data);
-        if(!(REG_RD(pDevice, DmaComp.Mode) & DMA_COMP_MODE_ENABLE))
-        {
-            MM_Wait(20);
-        }
-    }
-    data = REG_RD(pDevice, SndBdComp.Mode);
-    data &= ~SND_BD_COMP_MODE_ENABLE;
-    REG_WR(pDevice, SndBdComp.Mode, data);
-    if(!(REG_RD(pDevice, SndBdComp.Mode) & SND_BD_COMP_MODE_ENABLE))
-    {
-        MM_Wait(20);
-    }
-    /* Clear TDE bit */
-    pDevice->MacMode &= ~MAC_MODE_ENABLE_TDE;
-    REG_WR(pDevice, MacCtrl.Mode, pDevice->MacMode);
-    pDevice->TxMode &= ~TX_MODE_ENABLE;
-    REG_WR(pDevice, MacCtrl.TxMode, pDevice->TxMode);
-    if(!(REG_RD(pDevice, MacCtrl.TxMode) & TX_MODE_ENABLE))
-    {
-        MM_Wait(20);
-    }
-    data = REG_RD(pDevice, HostCoalesce.Mode);
-    data &= ~HOST_COALESCE_ENABLE;
-    REG_WR(pDevice, HostCoalesce.Mode, data);
-    if(!(REG_RD(pDevice, SndBdIn.Mode) & HOST_COALESCE_ENABLE))
-    {
-        MM_Wait(20);
-    }
-    data = REG_RD(pDevice, DmaWrite.Mode);
-    data &= ~DMA_WRITE_MODE_ENABLE;
-    REG_WR(pDevice, DmaWrite.Mode,data);
-    if(!(REG_RD(pDevice, DmaWrite.Mode) & DMA_WRITE_MODE_ENABLE))
-    {
-        MM_Wait(20);
-    }
-    if(T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5705)
-    {
-        data = REG_RD(pDevice, MbufClusterFree.Mode);
-        data &= ~MBUF_CLUSTER_FREE_MODE_ENABLE;
-        REG_WR(pDevice, MbufClusterFree.Mode,data);
-        if(!(REG_RD(pDevice, MbufClusterFree.Mode) & MBUF_CLUSTER_FREE_MODE_ENABLE))
-        {
-            MM_Wait(20);
-        }
-    }
-    /* Reset all FTQs */
-    REG_WR(pDevice, Ftq.Reset, 0xffffffff);
-    REG_WR(pDevice, Ftq.Reset, 0x0);
-
-    if(T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5705)
-    {
-        data = REG_RD(pDevice, BufMgr.Mode);
-        data &= ~BUFMGR_MODE_ENABLE;
-        REG_WR(pDevice, BufMgr.Mode,data);
-        if(!(REG_RD(pDevice, BufMgr.Mode) & BUFMGR_MODE_ENABLE))
-        {
-            MM_Wait(20);
-        }
-        data = REG_RD(pDevice, MemArbiter.Mode);
-        data &= ~T3_MEM_ARBITER_MODE_ENABLE;
-        REG_WR(pDevice, MemArbiter.Mode, data);
-        if(!(REG_RD(pDevice, MemArbiter.Mode) & T3_MEM_ARBITER_MODE_ENABLE)) 
-        {
-            MM_Wait(20);
-        }       
-    }
-    return LM_STATUS_SUCCESS;
-}
-
-LM_STATUS
-LM_DisableFW(PLM_DEVICE_BLOCK pDevice)
-{
-#ifdef BCM_ASF
-    int j;
-    LM_UINT32 Value32;
-
-    if (pDevice->EnableAsf)
-    {
-        MEM_WR_OFFSET(pDevice, T3_CMD_MAILBOX, T3_CMD_NICDRV_PAUSE_FW);
-        Value32 = REG_RD(pDevice, Grc.RxCpuEvent);
-        REG_WR(pDevice, Grc.RxCpuEvent, Value32 | BIT_14);
-        for (j = 0; j < 100; j++)
-        {
-            Value32 = REG_RD(pDevice, Grc.RxCpuEvent);
-            if (!(Value32 & BIT_14))
-            {
-                break;
-            }
-            MM_Wait(1);
-        }
-    }
-#endif
-    return LM_STATUS_SUCCESS;
-}
-
-/******************************************************************************/
-/* Description:                                                               */
-/*    This function reinitializes the adapter.                                */
-/*                                                                            */
-/* Return:                                                                    */
-/*    LM_STATUS_SUCCESS                                                       */
-/******************************************************************************/
-LM_STATUS
-LM_ResetAdapter(
-PLM_DEVICE_BLOCK pDevice)
-{
-    LM_UINT32 Value32;
-    LM_UINT32 j, k;
-    int reset_count = 0;
-
-    /* Disable interrupt. */
-    LM_DisableInterrupt(pDevice);
-
-restart_reset:
-    LM_DisableFW(pDevice);
-
-    /* May get a spurious interrupt */
-    pDevice->pStatusBlkVirt->Status = STATUS_BLOCK_UPDATED;
-
-    /* Disable transmit and receive DMA engines.  Abort all pending requests. */
-    if(pDevice->InitDone)
-    {
-        LM_Abort(pDevice);
-    }
-
-    pDevice->ShuttingDown = FALSE;
-
-    LM_ResetChip(pDevice);
-
-#ifdef BCM_ASF
-    if (pDevice->EnableAsf)
-    {
-        MEM_WR_OFFSET(pDevice, T3_DRV_STATE_MAILBOX, T3_DRV_STATE_START);
-    }
-    else
-#endif
-    {
-        MEM_WR_OFFSET(pDevice, T3_DRV_STATE_MAILBOX, T3_DRV_STATE_SUSPEND);
-    }
-
-    /* Bug: Athlon fix for B3 silicon only.  This bit does not do anything */
-    /* in other chip revisions. */
-    if(pDevice->DelayPciGrant)
-    {
-        REG_WR(pDevice, PciCfg.ClockCtrl, pDevice->ClockCtrl | BIT_31);
-    }
-
-    if(pDevice->ChipRevId == T3_CHIP_ID_5704_A0)
-    {
-        if (!(pDevice->PciState & T3_PCI_STATE_CONVENTIONAL_PCI_MODE))
-        {
-            Value32 = REG_RD(pDevice, PciCfg.PciState);
-            Value32 |= T3_PCI_STATE_RETRY_SAME_DMA;
-            REG_WR(pDevice, PciCfg.PciState, Value32);
-        }
-    }
-    if (T3_CHIP_REV(pDevice->ChipRevId) == T3_CHIP_REV_5704_BX)
-    {
-        /* New bits defined in register 0x64 to enable some h/w fixes */
-        /* These new bits are 'write-only' */
-        Value32 = REG_RD(pDevice, PciCfg.MsiData);
-        REG_WR(pDevice, PciCfg.MsiData, Value32 | BIT_26 | BIT_28 | BIT_29);
-    }
-
-    /* Enable TaggedStatus mode. */
-    if(pDevice->UseTaggedStatus)
-    {
-        pDevice->MiscHostCtrl |= MISC_HOST_CTRL_ENABLE_TAGGED_STATUS_MODE;
-    }
-
-    /* Restore PCI configuration registers. */
-    MM_WriteConfig32(pDevice, PCI_CACHE_LINE_SIZE_REG,
-        pDevice->SavedCacheLineReg);
-//    LM_RegWrInd(pDevice, PCI_SUBSYSTEM_VENDOR_ID_REG, 
-//        (pDevice->SubsystemId << 16) | pDevice->SubsystemVendorId);
-    MM_WriteConfig32(pDevice, PCI_SUBSYSTEM_VENDOR_ID_REG, 
-        (pDevice->SubsystemId << 16) | pDevice->SubsystemVendorId);
-
-    /* Initialize the statistis Block */
-    pDevice->pStatusBlkVirt->Status = 0;
-    pDevice->pStatusBlkVirt->RcvStdConIdx = 0;
-    pDevice->pStatusBlkVirt->RcvJumboConIdx = 0;
-    pDevice->pStatusBlkVirt->RcvMiniConIdx = 0;
-
-    for(j = 0; j < 16; j++)
-    {
-       pDevice->pStatusBlkVirt->Idx[j].RcvProdIdx = 0;
-       pDevice->pStatusBlkVirt->Idx[j].SendConIdx = 0;
-    }
-
-    for(k = 0; k < T3_STD_RCV_RCB_ENTRY_COUNT ;k++)
-    {
-       pDevice->pRxStdBdVirt[k].HostAddr.High = 0;
-       pDevice->pRxStdBdVirt[k].HostAddr.Low = 0;
-    }
-
-#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
-    /* Receive jumbo BD buffer. */
-    for(k = 0; k < T3_JUMBO_RCV_RCB_ENTRY_COUNT; k++)
-    {
-        pDevice->pRxJumboBdVirt[k].HostAddr.High = 0;
-        pDevice->pRxJumboBdVirt[k].HostAddr.Low = 0;
-    }
-#endif
-
-    REG_WR(pDevice, PciCfg.DmaReadWriteCtrl, pDevice->DmaReadWriteCtrl);    
-
-    /* GRC mode control register. */
-    Value32 = 
-#ifdef BIG_ENDIAN_HOST
-        GRC_MODE_BYTE_SWAP_NON_FRAME_DATA | 
-        GRC_MODE_WORD_SWAP_NON_FRAME_DATA |
-        GRC_MODE_BYTE_SWAP_DATA |
-        GRC_MODE_WORD_SWAP_DATA |
-#else
-        GRC_MODE_WORD_SWAP_NON_FRAME_DATA |
-        GRC_MODE_BYTE_SWAP_DATA |
-        GRC_MODE_WORD_SWAP_DATA |
-#endif
-        GRC_MODE_INT_ON_MAC_ATTN |
-        GRC_MODE_HOST_STACK_UP;
-
-    /* Configure send BD mode. */
-    if(pDevice->NicSendBd == FALSE)
-    {
-        Value32 |= GRC_MODE_HOST_SEND_BDS;
-    }
-#ifdef BCM_NIC_SEND_BD
-    else
-    {
-        Value32 |= GRC_MODE_4X_NIC_BASED_SEND_RINGS;
-    }
-#endif
-
-    /* Configure pseudo checksum mode. */
-    if(pDevice->NoTxPseudoHdrChksum)
-    {
-        Value32 |= GRC_MODE_TX_NO_PSEUDO_HEADER_CHKSUM;
-    }
-
-    if(pDevice->NoRxPseudoHdrChksum)
-    {
-        Value32 |= GRC_MODE_RX_NO_PSEUDO_HEADER_CHKSUM;
-    }
-
-    pDevice->GrcMode = Value32;
-    REG_WR(pDevice, Grc.Mode, Value32);
-
-    /* Setup the timer prescalar register. */
-    Value32 = REG_RD(pDevice, Grc.MiscCfg) & ~0xff;
-    /* Clock is always 66Mhz. */
-    REG_WR(pDevice, Grc.MiscCfg, Value32 | (65 << 1));
-
-    /* Set up the MBUF pool base address and size. */
-    if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705)
-    {
-#if INCLUDE_TCP_SEG_SUPPORT
-        if (pDevice->TaskToOffload & LM_TASK_OFFLOAD_TCP_SEGMENTATION)
-        {
-            Value32 = LM_GetStkOffLdFirmwareSize(pDevice);
-            Value32 = (Value32 + 0x7f) & ~0x7f;
-            pDevice->MbufBase = T3_NIC_BCM5705_MBUF_POOL_ADDR + Value32;
-            pDevice->MbufSize = T3_NIC_BCM5705_MBUF_POOL_SIZE - Value32 - 0xa00;
-            REG_WR(pDevice, BufMgr.MbufPoolAddr, pDevice->MbufBase);
-            REG_WR(pDevice, BufMgr.MbufPoolSize, pDevice->MbufSize);
-        }
-#endif
-    }
-    else
-    {
-        REG_WR(pDevice, BufMgr.MbufPoolAddr, pDevice->MbufBase);
-        REG_WR(pDevice, BufMgr.MbufPoolSize, pDevice->MbufSize);
-
-        /* Set up the DMA descriptor pool base address and size. */
-        REG_WR(pDevice, BufMgr.DmaDescPoolAddr, T3_NIC_DMA_DESC_POOL_ADDR);
-        REG_WR(pDevice, BufMgr.DmaDescPoolSize, T3_NIC_DMA_DESC_POOL_SIZE);
-    
-    }
-
-    /* Configure MBUF and Threshold watermarks */
-    /* Configure the DMA read MBUF low water mark. */
-    if(pDevice->TxMtu < MAX_ETHERNET_PACKET_BUFFER_SIZE)
-    {
-        if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705)
-        {
-            REG_WR(pDevice, BufMgr.MbufReadDmaLowWaterMark,
-                T3_DEF_DMA_MBUF_LOW_WMARK_5705);
-            REG_WR(pDevice, BufMgr.MbufMacRxLowWaterMark,
-                T3_DEF_RX_MAC_MBUF_LOW_WMARK_5705);
-            REG_WR(pDevice, BufMgr.MbufHighWaterMark,
-                T3_DEF_MBUF_HIGH_WMARK_5705);
-        }
-        else
-        {
-            REG_WR(pDevice, BufMgr.MbufReadDmaLowWaterMark,
-                T3_DEF_DMA_MBUF_LOW_WMARK);
-            REG_WR(pDevice, BufMgr.MbufMacRxLowWaterMark,
-                T3_DEF_RX_MAC_MBUF_LOW_WMARK);
-            REG_WR(pDevice, BufMgr.MbufHighWaterMark,
-                T3_DEF_MBUF_HIGH_WMARK);
-        }
-    }
-    else
-    {
-        REG_WR(pDevice, BufMgr.MbufReadDmaLowWaterMark,
-            T3_DEF_DMA_MBUF_LOW_WMARK_JUMBO);
-        REG_WR(pDevice, BufMgr.MbufMacRxLowWaterMark,
-            T3_DEF_RX_MAC_MBUF_LOW_WMARK_JUMBO);
-        REG_WR(pDevice, BufMgr.MbufHighWaterMark,
-            T3_DEF_MBUF_HIGH_WMARK_JUMBO);
-    }
-
-    REG_WR(pDevice, BufMgr.DmaLowWaterMark, T3_DEF_DMA_DESC_LOW_WMARK);
-    REG_WR(pDevice, BufMgr.DmaHighWaterMark, T3_DEF_DMA_DESC_HIGH_WMARK);
-
-    /* Enable buffer manager. */
-    REG_WR(pDevice, BufMgr.Mode, BUFMGR_MODE_ENABLE | BUFMGR_MODE_ATTN_ENABLE);
-
-    for(j = 0 ;j < 2000; j++)
-    {
-        if(REG_RD(pDevice, BufMgr.Mode) & BUFMGR_MODE_ENABLE)
-            break;
-        MM_Wait(10);
-    }
-
-    if(j >= 2000)
-    {
-        return LM_STATUS_FAILURE;
-    }
-
-    /* Enable the FTQs. */
-    REG_WR(pDevice, Ftq.Reset, 0xffffffff);
-    REG_WR(pDevice, Ftq.Reset, 0);
-
-    /* Wait until FTQ is ready */
-    for(j = 0; j < 2000; j++)
-    {
-        if(REG_RD(pDevice, Ftq.Reset) == 0)
-            break;
-        MM_Wait(10);
-    }
-
-    if(j >= 2000)
-    {
-        return LM_STATUS_FAILURE;
-    }
-
-    /* Receive BD Ring replenish threshold. */
-    REG_WR(pDevice, RcvBdIn.StdRcvThreshold, pDevice->RxStdDescCnt/8);
-
-    /* Initialize the Standard Receive RCB. */
-    REG_WR(pDevice, RcvDataBdIn.StdRcvRcb.HostRingAddr.High, 
-        pDevice->RxStdBdPhy.High);
-    REG_WR(pDevice, RcvDataBdIn.StdRcvRcb.HostRingAddr.Low, 
-        pDevice->RxStdBdPhy.Low);
-    REG_WR(pDevice, RcvDataBdIn.StdRcvRcb.NicRingAddr,
-        (LM_UINT32) T3_NIC_STD_RCV_BUFFER_DESC_ADDR);
-
-    if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705)
-    {
-        REG_WR(pDevice, RcvDataBdIn.StdRcvRcb.u.MaxLen_Flags,
-            512 << 16);
-    }
-    else
-    {
-        REG_WR(pDevice, RcvDataBdIn.StdRcvRcb.u.MaxLen_Flags,
-            MAX_STD_RCV_BUFFER_SIZE << 16);
-
-        /* Initialize the Jumbo Receive RCB. */
-        REG_WR(pDevice, RcvDataBdIn.JumboRcvRcb.u.MaxLen_Flags,
-            T3_RCB_FLAG_RING_DISABLED);
-#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
-        REG_WR(pDevice, RcvDataBdIn.JumboRcvRcb.HostRingAddr.High, 
-            pDevice->RxJumboBdPhy.High);
-        REG_WR(pDevice, RcvDataBdIn.JumboRcvRcb.HostRingAddr.Low, 
-            pDevice->RxJumboBdPhy.Low);
-        REG_WR(pDevice, RcvDataBdIn.JumboRcvRcb.u.MaxLen_Flags, 0);
-        REG_WR(pDevice, RcvDataBdIn.JumboRcvRcb.NicRingAddr,
-            (LM_UINT32) T3_NIC_JUMBO_RCV_BUFFER_DESC_ADDR);
-
-        REG_WR(pDevice, RcvBdIn.JumboRcvThreshold, pDevice->RxJumboDescCnt/8);
-
-#endif /* T3_JUMBO_RCV_RCB_ENTRY_COUNT */
-
-        /* Initialize the Mini Receive RCB. */
-        REG_WR(pDevice, RcvDataBdIn.MiniRcvRcb.u.MaxLen_Flags,
-            T3_RCB_FLAG_RING_DISABLED);
-
-        /* Disable all the unused rings. */
-        for(j = 0; j < T3_MAX_SEND_RCB_COUNT; j++) {
-            MEM_WR(pDevice, SendRcb[j].u.MaxLen_Flags,
-                T3_RCB_FLAG_RING_DISABLED);
-        } /* for */
-
-    }
-
-    /* Initialize the indices. */
-    pDevice->SendProdIdx = 0;
-    pDevice->SendConIdx = 0;
-
-    MB_REG_WR(pDevice, Mailbox.SendHostProdIdx[0].Low, 0); 
-    MB_REG_WR(pDevice, Mailbox.SendNicProdIdx[0].Low, 0);
-
-    /* Set up host or NIC based send RCB. */
-    if(pDevice->NicSendBd == FALSE)
-    {
-        MEM_WR(pDevice, SendRcb[0].HostRingAddr.High, 
-            pDevice->SendBdPhy.High);
-        MEM_WR(pDevice, SendRcb[0].HostRingAddr.Low, 
-            pDevice->SendBdPhy.Low);
-
-        /* Setup the RCB. */
-        MEM_WR(pDevice, SendRcb[0].u.MaxLen_Flags,
-            T3_SEND_RCB_ENTRY_COUNT << 16);
-
-        if(T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5705)
-        {
-            /* Set up the NIC ring address in the RCB. */
-            MEM_WR(pDevice, SendRcb[0].NicRingAddr,T3_NIC_SND_BUFFER_DESC_ADDR);
-
-            for(k = 0; k < T3_SEND_RCB_ENTRY_COUNT; k++)
-            {
-                pDevice->pSendBdVirt[k].HostAddr.High = 0;
-                pDevice->pSendBdVirt[k].HostAddr.Low = 0;
-            }
-        }
-    }
-#ifdef BCM_NIC_SEND_BD
-    else
-    {
-        MEM_WR(pDevice, SendRcb[0].HostRingAddr.High, 0);
-        MEM_WR(pDevice, SendRcb[0].HostRingAddr.Low, 0);
-        MEM_WR(pDevice, SendRcb[0].NicRingAddr,
-            pDevice->SendBdPhy.Low);
-
-        for(k = 0; k < T3_SEND_RCB_ENTRY_COUNT; k++)
-        {
-            MM_MEMWRITEL(&(pDevice->pSendBdVirt[k].HostAddr.High), 0);
-            MM_MEMWRITEL(&(pDevice->pSendBdVirt[k].HostAddr.Low), 0);
-            MM_MEMWRITEL(&(pDevice->pSendBdVirt[k].u1.Len_Flags), 0);
-            pDevice->ShadowSendBd[k].HostAddr.High = 0;
-            pDevice->ShadowSendBd[k].u1.Len_Flags = 0;
-        }
-    }
-#endif
-    MM_ATOMIC_SET(&pDevice->SendBdLeft, T3_SEND_RCB_ENTRY_COUNT-1);
-
-    /* Configure the receive return rings. */
-    for(j = 0; j < T3_MAX_RCV_RETURN_RCB_COUNT; j++)
-    {
-        MEM_WR(pDevice, RcvRetRcb[j].u.MaxLen_Flags, T3_RCB_FLAG_RING_DISABLED);
-    }
-
-    pDevice->RcvRetConIdx = 0;
-
-    MEM_WR(pDevice, RcvRetRcb[0].HostRingAddr.High, 
-        pDevice->RcvRetBdPhy.High);
-    MEM_WR(pDevice, RcvRetRcb[0].HostRingAddr.Low,
-        pDevice->RcvRetBdPhy.Low);
-
-    MEM_WR(pDevice, RcvRetRcb[0].NicRingAddr, 0);
-
-    /* Setup the RCB. */
-    MEM_WR(pDevice, RcvRetRcb[0].u.MaxLen_Flags,
-        pDevice->RcvRetRcbEntryCount << 16);
-
-    /* Reinitialize RX ring producer index */
-    MB_REG_WR(pDevice, Mailbox.RcvStdProdIdx.Low, 0);
-    MB_REG_WR(pDevice, Mailbox.RcvJumboProdIdx.Low, 0);
-    MB_REG_WR(pDevice, Mailbox.RcvMiniProdIdx.Low, 0);
-
-#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
-    pDevice->RxJumboProdIdx = 0;
-    pDevice->RxJumboQueuedCnt = 0;
-#endif
-
-    /* Reinitialize our copy of the indices. */
-    pDevice->RxStdProdIdx = 0;
-    pDevice->RxStdQueuedCnt = 0;
-
-#if T3_JUMBO_RCV_ENTRY_COUNT
-    pDevice->RxJumboProdIdx = 0;
-#endif /* T3_JUMBO_RCV_ENTRY_COUNT */
-
-    /* Configure the MAC address. */
-    LM_SetMacAddress(pDevice, pDevice->NodeAddress);
-
-    /* Initialize the transmit random backoff seed. */
-    Value32 = (pDevice->NodeAddress[0] + pDevice->NodeAddress[1] + 
-        pDevice->NodeAddress[2] + pDevice->NodeAddress[3] + 
-        pDevice->NodeAddress[4] + pDevice->NodeAddress[5]) & 
-        MAC_TX_BACKOFF_SEED_MASK;
-    REG_WR(pDevice, MacCtrl.TxBackoffSeed, Value32);
-
-    /* Receive MTU.  Frames larger than the MTU is marked as oversized. */
-    REG_WR(pDevice, MacCtrl.MtuSize, pDevice->RxMtu + 8);   /* CRC + VLAN. */
-
-    /* Configure Time slot/IPG per 802.3 */
-    REG_WR(pDevice, MacCtrl.TxLengths, 0x2620);
-
-    /*
-     * Configure Receive Rules so that packets don't match 
-     * Programmble rule will be queued to Return Ring 1 
-     */
-    REG_WR(pDevice, MacCtrl.RcvRuleCfg, RX_RULE_DEFAULT_CLASS);
-
-    /* 
-     * Configure to have 16 Classes of Services (COS) and one
-     * queue per class.  Bad frames are queued to RRR#1.
-     * And frames don't match rules are also queued to COS#1.
-     */
-    REG_WR(pDevice, RcvListPlmt.Config, 0x181);
-
-    /* Enable Receive Placement Statistics */
-    if ((pDevice->DmaReadFifoSize == DMA_READ_MODE_FIFO_LONG_BURST) &&
-        (pDevice->TaskToOffload & LM_TASK_OFFLOAD_TCP_SEGMENTATION))
-    {
-        Value32 = REG_RD(pDevice, RcvListPlmt.StatsEnableMask);
-        Value32 &= ~T3_DISABLE_LONG_BURST_READ_DYN_FIX;
-        REG_WR(pDevice, RcvListPlmt.StatsEnableMask, Value32);
-    }
-    else
-    {
-        REG_WR(pDevice, RcvListPlmt.StatsEnableMask,0xffffff);
-    }
-    REG_WR(pDevice, RcvListPlmt.StatsCtrl, RCV_LIST_STATS_ENABLE);
-
-    /* Enable Send Data Initator Statistics */
-    REG_WR(pDevice, SndDataIn.StatsEnableMask,0xffffff);
-    REG_WR(pDevice, SndDataIn.StatsCtrl,
-        T3_SND_DATA_IN_STATS_CTRL_ENABLE | \
-        T3_SND_DATA_IN_STATS_CTRL_FASTER_UPDATE);
-
-    /* Disable the host coalescing state machine before configuring it's */
-    /* parameters. */
-    REG_WR(pDevice, HostCoalesce.Mode, 0); 
-    for(j = 0; j < 2000; j++)
-    {
-        Value32 = REG_RD(pDevice, HostCoalesce.Mode);
-        if(!(Value32 & HOST_COALESCE_ENABLE))
-        {
-            break;
-        }
-        MM_Wait(10);
-    }
-
-    /* Host coalescing configurations. */
-    REG_WR(pDevice, HostCoalesce.RxCoalescingTicks, pDevice->RxCoalescingTicks);
-    REG_WR(pDevice, HostCoalesce.TxCoalescingTicks, pDevice->TxCoalescingTicks);
-    REG_WR(pDevice, HostCoalesce.RxMaxCoalescedFrames,
-        pDevice->RxMaxCoalescedFrames);
-    REG_WR(pDevice, HostCoalesce.TxMaxCoalescedFrames,
-        pDevice->TxMaxCoalescedFrames);
-    if(T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5705)
-    {
-        REG_WR(pDevice, HostCoalesce.RxCoalescedTickDuringInt,
-            pDevice->RxCoalescingTicksDuringInt);
-        REG_WR(pDevice, HostCoalesce.TxCoalescedTickDuringInt,
-            pDevice->TxCoalescingTicksDuringInt);
-    }
-    REG_WR(pDevice, HostCoalesce.RxMaxCoalescedFramesDuringInt,
-        pDevice->RxMaxCoalescedFramesDuringInt);
-    REG_WR(pDevice, HostCoalesce.TxMaxCoalescedFramesDuringInt,
-        pDevice->TxMaxCoalescedFramesDuringInt);
-
-    /* Initialize the address of the status block.  The NIC will DMA */
-    /* the status block to this memory which resides on the host. */
-    REG_WR(pDevice, HostCoalesce.StatusBlkHostAddr.High, 
-        pDevice->StatusBlkPhy.High);
-    REG_WR(pDevice, HostCoalesce.StatusBlkHostAddr.Low,
-        pDevice->StatusBlkPhy.Low);
-
-    /* Initialize the address of the statistics block.  The NIC will DMA */
-    /* the statistics to this block of memory. */
-    if(T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5705)
-    {
-        REG_WR(pDevice, HostCoalesce.StatsBlkHostAddr.High, 
-            pDevice->StatsBlkPhy.High);
-        REG_WR(pDevice, HostCoalesce.StatsBlkHostAddr.Low,
-            pDevice->StatsBlkPhy.Low);
-
-        REG_WR(pDevice, HostCoalesce.StatsCoalescingTicks,
-            pDevice->StatsCoalescingTicks);
-
-        REG_WR(pDevice, HostCoalesce.StatsBlkNicAddr, 0x300);
-        REG_WR(pDevice, HostCoalesce.StatusBlkNicAddr,0xb00);
-    }
-
-    /* Enable Host Coalesing state machine */
-    REG_WR(pDevice, HostCoalesce.Mode, HOST_COALESCE_ENABLE |
-        pDevice->CoalesceMode);
-
-    /* Enable the Receive BD Completion state machine. */
-    REG_WR(pDevice, RcvBdComp.Mode, RCV_BD_COMP_MODE_ENABLE |
-        RCV_BD_COMP_MODE_ATTN_ENABLE);
-
-    /* Enable the Receive List Placement state machine. */
-    REG_WR(pDevice, RcvListPlmt.Mode, RCV_LIST_PLMT_MODE_ENABLE);
-
-    if(T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5705)
-    {
-        /* Enable the Receive List Selector state machine. */
-        REG_WR(pDevice, RcvListSel.Mode, RCV_LIST_SEL_MODE_ENABLE |
-            RCV_LIST_SEL_MODE_ATTN_ENABLE);
-    }
-
-    /* Clear the statistics block. */
-    for(j = 0x0300; j < 0x0b00; j = j + 4)
-    {
-        MEM_WR_OFFSET(pDevice, j, 0);
-    }
-
-    /* Enable transmit DMA, clear statistics. */
-    pDevice->MacMode =  MAC_MODE_ENABLE_TX_STATISTICS |
-        MAC_MODE_ENABLE_RX_STATISTICS | MAC_MODE_ENABLE_TDE |
-        MAC_MODE_ENABLE_RDE | MAC_MODE_ENABLE_FHDE;
-    REG_WR(pDevice, MacCtrl.Mode, pDevice->MacMode |
-        MAC_MODE_CLEAR_RX_STATISTICS | MAC_MODE_CLEAR_TX_STATISTICS);
-
-    /* GRC miscellaneous local control register. */
-    pDevice->GrcLocalCtrl = GRC_MISC_LOCAL_CTRL_INT_ON_ATTN |
-        GRC_MISC_LOCAL_CTRL_AUTO_SEEPROM;
-
-    if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700)
-    {
-        pDevice->GrcLocalCtrl |= GRC_MISC_LOCAL_CTRL_GPIO_OE1 |
-            GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT1;
-    }
-
-    REG_WR(pDevice, Grc.LocalCtrl, pDevice->GrcLocalCtrl);
-    MM_Wait(40);
-
-    /* Reset RX counters. */
-    for(j = 0; j < sizeof(LM_RX_COUNTERS); j++)
-    {
-        ((PLM_UINT8) &pDevice->RxCounters)[j] = 0;
-    }
-
-    /* Reset TX counters. */
-    for(j = 0; j < sizeof(LM_TX_COUNTERS); j++)
-    {
-        ((PLM_UINT8) &pDevice->TxCounters)[j] = 0;
-    }
-
-    MB_REG_WR(pDevice, Mailbox.Interrupt[0].Low, 0);
-    pDevice->LastTag = 0;
-
-    if(T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5705)
-    {
-        /* Enable the DMA Completion state machine. */
-        REG_WR(pDevice, DmaComp.Mode, DMA_COMP_MODE_ENABLE);
-    }
-
-    /* Enable the DMA Write state machine. */
-    Value32 = DMA_WRITE_MODE_ENABLE |
-        DMA_WRITE_MODE_TARGET_ABORT_ATTN_ENABLE |
-        DMA_WRITE_MODE_MASTER_ABORT_ATTN_ENABLE |
-        DMA_WRITE_MODE_PARITY_ERROR_ATTN_ENABLE |
-        DMA_WRITE_MODE_ADDR_OVERFLOW_ATTN_ENABLE |
-        DMA_WRITE_MODE_FIFO_OVERRUN_ATTN_ENABLE |
-        DMA_WRITE_MODE_FIFO_UNDERRUN_ATTN_ENABLE |
-        DMA_WRITE_MODE_FIFO_OVERREAD_ATTN_ENABLE |
-        DMA_WRITE_MODE_LONG_READ_ATTN_ENABLE;
-
-    if ((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705) &&
-        (pDevice->ChipRevId != T3_CHIP_ID_5705_A0))
-    {
-        if (!(pDevice->PciState & T3_PCI_STATE_HIGH_BUS_SPEED) &&
-            !pDevice->Bcm5788)
-        {
-            Value32 |= DMA_WRITE_MODE_RECEIVE_ACCELERATE;
-        }
-    }
-    REG_WR(pDevice, DmaWrite.Mode, Value32);
-
-    if (!(pDevice->PciState & T3_PCI_STATE_CONVENTIONAL_PCI_MODE))
-    {
-        if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5703)
-        {
-            Value32 = REG_RD(pDevice, PciCfg.PciXCapabilities);
-            Value32 &= ~PCIX_CMD_MAX_BURST_MASK;
-            Value32 |= PCIX_CMD_MAX_BURST_CPIOB << PCIX_CMD_MAX_BURST_SHL;
-            REG_WR(pDevice, PciCfg.PciXCapabilities, Value32);
-        }
-        else if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5704)
-        {
-            Value32 = REG_RD(pDevice, PciCfg.PciXCapabilities);
-            Value32 &= ~(PCIX_CMD_MAX_SPLIT_MASK | PCIX_CMD_MAX_BURST_MASK);
-            Value32 |= ((PCIX_CMD_MAX_BURST_CPIOB << PCIX_CMD_MAX_BURST_SHL) &
-                PCIX_CMD_MAX_BURST_MASK);
-            if (pDevice->SplitModeEnable == SPLIT_MODE_ENABLE)
-            {
-                Value32 |= (pDevice->SplitModeMaxReq << PCIX_CMD_MAX_SPLIT_SHL)
-                   & PCIX_CMD_MAX_SPLIT_MASK;
-            }
-            REG_WR(pDevice, PciCfg.PciXCapabilities, Value32);
-        }
-    }
-
-    /* Enable the Read DMA state machine. */
-    Value32 = DMA_READ_MODE_ENABLE |
-        DMA_READ_MODE_TARGET_ABORT_ATTN_ENABLE |
-        DMA_READ_MODE_MASTER_ABORT_ATTN_ENABLE |
-        DMA_READ_MODE_PARITY_ERROR_ATTN_ENABLE |
-        DMA_READ_MODE_ADDR_OVERFLOW_ATTN_ENABLE |
-        DMA_READ_MODE_FIFO_OVERRUN_ATTN_ENABLE |
-        DMA_READ_MODE_FIFO_UNDERRUN_ATTN_ENABLE |
-        DMA_READ_MODE_FIFO_OVERREAD_ATTN_ENABLE |
-        DMA_READ_MODE_LONG_READ_ATTN_ENABLE;
-
-    if (pDevice->SplitModeEnable == SPLIT_MODE_ENABLE)
-    {
-        Value32 |= DMA_READ_MODE_SPLIT_ENABLE;
-    }
-
-    if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705)
-    {
-        Value32 |= pDevice->DmaReadFifoSize;
-    }
-
-    REG_WR(pDevice, DmaRead.Mode, Value32);
-
-    /* Enable the Receive Data Completion state machine. */
-    REG_WR(pDevice, RcvDataComp.Mode, RCV_DATA_COMP_MODE_ENABLE |
-        RCV_DATA_COMP_MODE_ATTN_ENABLE);
-
-    if(T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5705)
-    {
-        /* Enable the Mbuf Cluster Free state machine. */
-        REG_WR(pDevice, MbufClusterFree.Mode, MBUF_CLUSTER_FREE_MODE_ENABLE);
-    }
-
-    /* Enable the Send Data Completion state machine. */
-    REG_WR(pDevice, SndDataComp.Mode, SND_DATA_COMP_MODE_ENABLE);
-
-    /* Enable the Send BD Completion state machine. */
-    REG_WR(pDevice, SndBdComp.Mode, SND_BD_COMP_MODE_ENABLE |
-        SND_BD_COMP_MODE_ATTN_ENABLE);
-
-    /* Enable the Receive BD Initiator state machine. */
-    REG_WR(pDevice, RcvBdIn.Mode, RCV_BD_IN_MODE_ENABLE |
-        RCV_BD_IN_MODE_BD_IN_DIABLED_RCB_ATTN_ENABLE);
-
-    /* Enable the Receive Data and Receive BD Initiator state machine. */
-    REG_WR(pDevice, RcvDataBdIn.Mode, RCV_DATA_BD_IN_MODE_ENABLE |
-        RCV_DATA_BD_IN_MODE_INVALID_RING_SIZE);
-
-    /* Enable the Send Data Initiator state machine. */
-    REG_WR(pDevice, SndDataIn.Mode, T3_SND_DATA_IN_MODE_ENABLE);
-
-    /* Enable the Send BD Initiator state machine. */
-    REG_WR(pDevice, SndBdIn.Mode, SND_BD_IN_MODE_ENABLE |
-        SND_BD_IN_MODE_ATTN_ENABLE);
-
-    /* Enable the Send BD Selector state machine. */
-    REG_WR(pDevice, SndBdSel.Mode, SND_BD_SEL_MODE_ENABLE |
-        SND_BD_SEL_MODE_ATTN_ENABLE);
-
-#if INCLUDE_5701_AX_FIX
-    /* Load the firmware for the 5701_A0 workaround. */
-    if(pDevice->ChipRevId == T3_CHIP_ID_5701_A0)
-    {
-        LM_LoadRlsFirmware(pDevice);
-    }
-#endif
-
-    /* Queue Rx packet buffers. */
-    if(pDevice->QueueRxPackets)
-    {
-        LM_QueueRxPackets(pDevice);
-    }
-
-    if (pDevice->ChipRevId == T3_CHIP_ID_5705_A0)
-    {
-        Value32 = MEM_RD_OFFSET(pDevice, T3_NIC_STD_RCV_BUFFER_DESC_ADDR + 8);
-        j = 0;
-        while ((Value32 != MAX_STD_RCV_BUFFER_SIZE) && (j < 10))
-        {
-            MM_Wait(20);
-            Value32 = MEM_RD_OFFSET(pDevice, T3_NIC_STD_RCV_BUFFER_DESC_ADDR + 8);
-            j++;
-        }
-        if (j >= 10)
-        {
-            reset_count++;
-            LM_Abort(pDevice);
-            if (reset_count > 5)
-                return LM_STATUS_FAILURE;
-            goto restart_reset;
-        }
-    }
-
-    /* Enable the transmitter. */
-    pDevice->TxMode = TX_MODE_ENABLE;
-    REG_WR(pDevice, MacCtrl.TxMode, pDevice->TxMode);
-    
-    /* Enable the receiver. */
-    pDevice->RxMode = (pDevice->RxMode & RX_MODE_KEEP_VLAN_TAG) |
-        RX_MODE_ENABLE;
-    REG_WR(pDevice, MacCtrl.RxMode, pDevice->RxMode);
-
-#ifdef BCM_WOL
-    if (pDevice->RestoreOnWakeUp)
-    {
-        pDevice->RestoreOnWakeUp = FALSE;
-        pDevice->DisableAutoNeg = pDevice->WakeUpDisableAutoNeg;
-        pDevice->RequestedLineSpeed = pDevice->WakeUpRequestedLineSpeed;
-        pDevice->RequestedDuplexMode = pDevice->WakeUpRequestedDuplexMode;
-    }
-#endif
-
-    /* Disable auto polling. */
-    pDevice->MiMode = 0xc0000;
-    REG_WR(pDevice, MacCtrl.MiMode, pDevice->MiMode);
-
-    if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700 ||
-        T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701)
-    {
-        Value32 = LED_CTRL_PHY_MODE_1;
-    }
-    else
-    {
-        if(pDevice->LedMode == LED_MODE_OUTPUT)
-        {
-            Value32 = LED_CTRL_PHY_MODE_2;
-        }
-        else
-        {
-            Value32 = LED_CTRL_PHY_MODE_1;
-        }
-    }
-    REG_WR(pDevice, MacCtrl.LedCtrl, Value32);
-    
-    /* Activate Link to enable MAC state machine */
-    REG_WR(pDevice, MacCtrl.MiStatus, MI_STATUS_ENABLE_LINK_STATUS_ATTN);
-
-    if (pDevice->EnableTbi)
-    {
-        REG_WR(pDevice, MacCtrl.RxMode, RX_MODE_RESET);
-        MM_Wait(10);
-        REG_WR(pDevice, MacCtrl.RxMode, pDevice->RxMode);
-        if (pDevice->ChipRevId == T3_CHIP_ID_5703_A1)
-        {
-            REG_WR(pDevice, MacCtrl.SerdesCfg, 0x616000);
-        }
-        if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5704)
-        {
-            /* Set SerDes drive transmission level to 1.2V */
-            Value32 = REG_RD(pDevice, MacCtrl.SerdesCfg) & 0xfffff000;
-            REG_WR(pDevice, MacCtrl.SerdesCfg, Value32 | 0x880);
-        }
-    }
-
-    REG_WR(pDevice, MacCtrl.LowWaterMarkMaxRxFrame, 2);
-
-    pDevice->LinkStatus = LM_STATUS_LINK_DOWN;
-
-    if (!pDevice->EnableTbi)
-    {
-        LM_ResetPhy(pDevice);
-    }
-
-    /* Setup the phy chip. */
-    LM_SetupPhy(pDevice);
-
-    if (!pDevice->EnableTbi) {
-        /* Clear CRC stats */
-        LM_ReadPhy(pDevice, 0x1e, &Value32);
-        LM_WritePhy(pDevice, 0x1e, Value32 | 0x8000);
-        LM_ReadPhy(pDevice, 0x14, &Value32);
-    }
-
-    /* Set up the receive mask. */
-    LM_SetReceiveMask(pDevice, pDevice->ReceiveMask);
-
-#if INCLUDE_TCP_SEG_SUPPORT
-    if (pDevice->TaskToOffload & LM_TASK_OFFLOAD_TCP_SEGMENTATION)
-    {
-        if (LM_LoadStkOffLdFirmware(pDevice) == LM_STATUS_FAILURE)
-        {
-            return LM_STATUS_FAILURE;
-        }
-    }
-#endif
-
-    return LM_STATUS_SUCCESS;
-} /* LM_ResetAdapter */
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*    This routine disables the adapter from generating interrupts.           */
-/*                                                                            */
-/* Return:                                                                    */
-/*    LM_STATUS_SUCCESS                                                       */
-/******************************************************************************/
-LM_STATUS
-LM_DisableInterrupt(
-    PLM_DEVICE_BLOCK pDevice)
-{
-    REG_WR(pDevice, PciCfg.MiscHostCtrl, pDevice->MiscHostCtrl | 
-        MISC_HOST_CTRL_MASK_PCI_INT);
-    MB_REG_WR(pDevice, Mailbox.Interrupt[0].Low, 1);
-    if (pDevice->FlushPostedWrites)
-    {
-        MB_REG_RD(pDevice, Mailbox.Interrupt[0].Low);
-    }
-
-    return LM_STATUS_SUCCESS;
-}
-
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*    This routine enables the adapter to generate interrupts.                */
-/*                                                                            */
-/* Return:                                                                    */
-/*    LM_STATUS_SUCCESS                                                       */
-/******************************************************************************/
-LM_STATUS
-LM_EnableInterrupt(
-    PLM_DEVICE_BLOCK pDevice)
-{
-    MB_REG_WR(pDevice, Mailbox.Interrupt[0].Low, pDevice->LastTag << 24);
-    REG_WR(pDevice, PciCfg.MiscHostCtrl, pDevice->MiscHostCtrl &
-        ~MISC_HOST_CTRL_MASK_PCI_INT);
-
-    REG_WR(pDevice, HostCoalesce.Mode, pDevice->CoalesceMode |
-        HOST_COALESCE_ENABLE | HOST_COALESCE_NOW);
-
-    if (pDevice->FlushPostedWrites)
-    {
-        MB_REG_RD(pDevice, Mailbox.Interrupt[0].Low);
-    }
-
-    return LM_STATUS_SUCCESS;
-}
-
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*    This routine puts a packet on the wire if there is a transmit DMA       */
-/*    descriptor available; otherwise the packet is queued for later          */
-/*    transmission.  If the second argue is NULL, this routine will put       */
-/*    the queued packet on the wire if possible.                              */
-/*                                                                            */
-/* Return:                                                                    */
-/*    LM_STATUS_SUCCESS                                                       */
-/******************************************************************************/
-LM_STATUS
-LM_SendPacket(PLM_DEVICE_BLOCK pDevice, PLM_PACKET pPacket)
-{
-    LM_UINT32 FragCount;
-    PT3_SND_BD pSendBd, pTmpSendBd;
-#ifdef BCM_NIC_SEND_BD
-    PT3_SND_BD pShadowSendBd;
-    T3_SND_BD NicSendBdArr[MAX_FRAGMENT_COUNT];
-#endif
-    LM_UINT32 StartIdx, Idx;
-
-    while (1)
-    {
-        /* Initalize the send buffer descriptors. */
-        StartIdx = Idx = pDevice->SendProdIdx;
-
-#ifdef BCM_NIC_SEND_BD
-        if (pDevice->NicSendBd)
-        {
-            pTmpSendBd = pSendBd = &NicSendBdArr[0];
-        }
-        else
-#endif
-        {
-            pTmpSendBd = pSendBd = &pDevice->pSendBdVirt[Idx];
-        }
-
-        /* Next producer index. */
-        for(FragCount = 0; ; )
-        {
-            LM_UINT32 Value32, Len;
-
-            /* Initialize the pointer to the send buffer fragment. */
-            MM_MapTxDma(pDevice, pPacket, &pSendBd->HostAddr, &Len, FragCount);
-
-            pSendBd->u2.VlanTag = pPacket->VlanTag;
-
-            /* Setup the control flags and send buffer size. */
-            Value32 = (Len << 16) | pPacket->Flags;
-
-#if INCLUDE_TCP_SEG_SUPPORT
-            if (Value32 & (SND_BD_FLAG_CPU_PRE_DMA | SND_BD_FLAG_CPU_POST_DMA))
-            {
-                if (FragCount == 0)
-                {
-                    pSendBd->u2.s2.Reserved = pPacket->u.Tx.MaxSegmentSize;
-                }
-                else
-                {
-                    pSendBd->u2.s2.Reserved = 0;
-                    Value32 &= 0xffff0fff;
-                }
-            }
-#endif
-            Idx = (Idx + 1) & T3_SEND_RCB_ENTRY_COUNT_MASK;
-                
-            FragCount++;
-            if (FragCount >= pPacket->u.Tx.FragCount)
-            {
-                pSendBd->u1.Len_Flags = Value32 | SND_BD_FLAG_END;
-                break;
-            }
-            else
-            {
-                pSendBd->u1.Len_Flags = Value32;
-            }
-
-            pSendBd++;
-            if ((Idx == 0) && !pDevice->NicSendBd)
-            {
-                pSendBd = &pDevice->pSendBdVirt[0];
-            }
-        } /* for */
-        if (pDevice->Tx4GWorkaround == TRUE)
-        {
-            if (LM_Test4GBoundary(pDevice, pPacket, pTmpSendBd) ==
-                LM_STATUS_SUCCESS)
-            {
-                if (MM_CoalesceTxBuffer(pDevice, pPacket) != LM_STATUS_SUCCESS)
-                {
-                    QQ_PushHead(&pDevice->TxPacketFreeQ.Container, pPacket);
-                    return LM_STATUS_FAILURE;
-                }
-                continue;
-            }
-        }
-        break;
-    }
-    /* Put the packet descriptor in the ActiveQ. */
-    QQ_PushTail(&pDevice->TxPacketActiveQ.Container, pPacket);
-
-#ifdef BCM_NIC_SEND_BD
-    if (pDevice->NicSendBd)
-    {
-        pSendBd = &pDevice->pSendBdVirt[StartIdx];
-        pShadowSendBd = &pDevice->ShadowSendBd[StartIdx];
-
-        while (StartIdx != Idx)
-        {
-            LM_UINT32 Value32;
-
-            if ((Value32 = pTmpSendBd->HostAddr.High) !=
-                pShadowSendBd->HostAddr.High)
-            {
-                MM_MEMWRITEL(&(pSendBd->HostAddr.High), Value32);
-                pShadowSendBd->HostAddr.High = Value32;
-            }
-
-            MM_MEMWRITEL(&(pSendBd->HostAddr.Low), pTmpSendBd->HostAddr.Low);
-
-            if ((Value32 = pTmpSendBd->u1.Len_Flags) !=
-                pShadowSendBd->u1.Len_Flags)
-            {
-                MM_MEMWRITEL(&(pSendBd->u1.Len_Flags), Value32);
-                pShadowSendBd->u1.Len_Flags = Value32;
-            }
-
-            if (pPacket->Flags & SND_BD_FLAG_VLAN_TAG)
-            {
-                MM_MEMWRITEL(&(pSendBd->u2.VlanTag), pTmpSendBd->u2.VlanTag);
-            }
-
-            StartIdx = (StartIdx + 1) & T3_SEND_RCB_ENTRY_COUNT_MASK;
-            if (StartIdx == 0)
-            {
-                pSendBd = &pDevice->pSendBdVirt[0];
-                pShadowSendBd = &pDevice->ShadowSendBd[0];
-            }
-            else
-            {
-                pSendBd++;
-                pShadowSendBd++;
-            }
-            pTmpSendBd++;
-        }
-        MM_WMB();
-        MB_REG_WR(pDevice, Mailbox.SendNicProdIdx[0].Low, Idx);
-
-        if(T3_CHIP_REV(pDevice->ChipRevId) == T3_CHIP_REV_5700_BX)
-        {
-            MB_REG_WR(pDevice, Mailbox.SendNicProdIdx[0].Low, Idx);
-        }
-        if (pDevice->FlushPostedWrites)
-        {
-            MB_REG_RD(pDevice, Mailbox.SendNicProdIdx[0].Low);
-        }
-    }
-    else
-#endif
-    {
-        MM_WMB();
-        MB_REG_WR(pDevice, Mailbox.SendHostProdIdx[0].Low, Idx);
-
-        if(T3_CHIP_REV(pDevice->ChipRevId) == T3_CHIP_REV_5700_BX)
-        {
-            MB_REG_WR(pDevice, Mailbox.SendHostProdIdx[0].Low, Idx);
-        }
-        if (pDevice->FlushPostedWrites)
-        {
-            MB_REG_RD(pDevice, Mailbox.SendHostProdIdx[0].Low);
-        }
-    }
-
-    /* Update the SendBdLeft count. */
-    MM_ATOMIC_SUB(&pDevice->SendBdLeft, pPacket->u.Tx.FragCount);
-
-    /* Update the producer index. */
-    pDevice->SendProdIdx = Idx;
-
-    return LM_STATUS_SUCCESS;
-}
-
-STATIC LM_STATUS
-LM_Test4GBoundary(PLM_DEVICE_BLOCK pDevice, PLM_PACKET pPacket,
-    PT3_SND_BD pSendBd)
-{
-    int FragCount;
-    LM_UINT32 Idx, Base, Len;
-
-    Idx = pDevice->SendProdIdx;
-    for(FragCount = 0; ; )
-    {
-        Len = pSendBd->u1.Len_Flags >> 16;
-        if (((Base = pSendBd->HostAddr.Low) > 0xffffdcc0) &&
-            ((Base + 8 + Len) < Base))
-        {
-            return LM_STATUS_SUCCESS;
-        }
-        FragCount++;
-        if (FragCount >= pPacket->u.Tx.FragCount)
-        {
-            break;
-        }
-        pSendBd++;
-        if (!pDevice->NicSendBd)
-        {
-            Idx = (Idx + 1) & T3_SEND_RCB_ENTRY_COUNT_MASK;
-            if (Idx == 0)
-            {
-                pSendBd = &pDevice->pSendBdVirt[0];
-            }
-        }
-    }
-    return LM_STATUS_FAILURE;
-}
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-__inline static unsigned long
-ComputeCrc32(
-unsigned char *pBuffer,
-unsigned long BufferSize) {
-    unsigned long Reg;
-    unsigned long Tmp;
-    unsigned long j, k;
-
-    Reg = 0xffffffff;
-
-    for(j = 0; j < BufferSize; j++)
-    {
-        Reg ^= pBuffer[j];
-
-        for(k = 0; k < 8; k++)
-        {
-            Tmp = Reg & 0x01;
-
-            Reg >>= 1;
-
-            if(Tmp)
-            {
-                Reg ^= 0xedb88320;
-            }
-        }
-    }
-
-    return ~Reg;
-} /* ComputeCrc32 */
-
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*    This routine sets the receive control register according to ReceiveMask */
-/*                                                                            */
-/* Return:                                                                    */
-/*    LM_STATUS_SUCCESS                                                       */
-/******************************************************************************/
-LM_STATUS
-LM_SetReceiveMask(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Mask)
-{
-    LM_UINT32 ReceiveMask;
-    LM_UINT32 RxMode;
-    LM_UINT32 j, k;
-
-    ReceiveMask = Mask;
-
-    RxMode = pDevice->RxMode;
-
-    if(Mask & LM_ACCEPT_UNICAST)
-    {
-        Mask &= ~LM_ACCEPT_UNICAST;
-    }
-
-    if(Mask & LM_ACCEPT_MULTICAST)
-    {
-        Mask &= ~LM_ACCEPT_MULTICAST;
-    }
-
-    if(Mask & LM_ACCEPT_ALL_MULTICAST)
-    {
-        Mask &= ~LM_ACCEPT_ALL_MULTICAST;
-    }
-
-    if(Mask & LM_ACCEPT_BROADCAST)
-    {
-        Mask &= ~LM_ACCEPT_BROADCAST;
-    }
-
-    RxMode &= ~RX_MODE_KEEP_VLAN_TAG;
-    if (Mask & LM_KEEP_VLAN_TAG)
-    {
-        RxMode |= RX_MODE_KEEP_VLAN_TAG;
-        Mask &= ~LM_KEEP_VLAN_TAG;
-    }
-
-    RxMode &= ~RX_MODE_PROMISCUOUS_MODE;
-    if(Mask & LM_PROMISCUOUS_MODE)
-    {
-        RxMode |= RX_MODE_PROMISCUOUS_MODE;
-        Mask &= ~LM_PROMISCUOUS_MODE;
-    }
-
-    RxMode &= ~(RX_MODE_ACCEPT_RUNTS | RX_MODE_ACCEPT_OVERSIZED);
-    if(Mask & LM_ACCEPT_ERROR_PACKET)
-    {
-        RxMode |= RX_MODE_ACCEPT_RUNTS | RX_MODE_ACCEPT_OVERSIZED;
-        Mask &= ~LM_ACCEPT_ERROR_PACKET;
-    }
-
-    /* Make sure all the bits are valid before committing changes. */
-    if(Mask)
-    {
-        return LM_STATUS_FAILURE;
-    }
-
-    /* Commit the new filter. */
-    pDevice->ReceiveMask = ReceiveMask;
-
-    pDevice->RxMode = RxMode;
-
-    if (pDevice->PowerLevel != LM_POWER_STATE_D0)
-    {
-        return LM_STATUS_SUCCESS;
-    }
-
-    REG_WR(pDevice, MacCtrl.RxMode, RxMode);
-
-    /* Set up the MC hash table. */
-    if(ReceiveMask & LM_ACCEPT_ALL_MULTICAST)
-    {
-        for(k = 0; k < 4; k++)
-        {
-            REG_WR(pDevice, MacCtrl.HashReg[k], 0xffffffff);
-        }
-    }
-    else if(ReceiveMask & LM_ACCEPT_MULTICAST)
-    {
-        for(k = 0; k < 4; k++)
-        {
-            REG_WR(pDevice, MacCtrl.HashReg[k], pDevice->MulticastHash[k]);
-        }
-    }
-    else
-    {
-        /* Reject all multicast frames. */
-        for(j = 0; j < 4; j++)
-        {
-            REG_WR(pDevice, MacCtrl.HashReg[j], 0);
-        }
-    }
-
-    /* By default, Tigon3 will accept broadcast frames.  We need to setup */
-    if(ReceiveMask & LM_ACCEPT_BROADCAST)
-    {
-        REG_WR(pDevice, MacCtrl.RcvRules[RCV_RULE1_REJECT_BROADCAST_IDX].Rule,
-            REJECT_BROADCAST_RULE1_RULE & RCV_DISABLE_RULE_MASK);
-        REG_WR(pDevice, MacCtrl.RcvRules[RCV_RULE1_REJECT_BROADCAST_IDX].Value,
-            REJECT_BROADCAST_RULE1_VALUE & RCV_DISABLE_RULE_MASK);
-        REG_WR(pDevice, MacCtrl.RcvRules[RCV_RULE2_REJECT_BROADCAST_IDX].Rule,
-            REJECT_BROADCAST_RULE1_RULE & RCV_DISABLE_RULE_MASK);
-        REG_WR(pDevice, MacCtrl.RcvRules[RCV_RULE2_REJECT_BROADCAST_IDX].Value,
-            REJECT_BROADCAST_RULE1_VALUE & RCV_DISABLE_RULE_MASK);
-    }
-    else
-    {
-        REG_WR(pDevice, MacCtrl.RcvRules[RCV_RULE1_REJECT_BROADCAST_IDX].Rule, 
-            REJECT_BROADCAST_RULE1_RULE);
-        REG_WR(pDevice, MacCtrl.RcvRules[RCV_RULE1_REJECT_BROADCAST_IDX].Value, 
-            REJECT_BROADCAST_RULE1_VALUE);
-        REG_WR(pDevice, MacCtrl.RcvRules[RCV_RULE2_REJECT_BROADCAST_IDX].Rule, 
-            REJECT_BROADCAST_RULE2_RULE);
-        REG_WR(pDevice, MacCtrl.RcvRules[RCV_RULE2_REJECT_BROADCAST_IDX].Value, 
-            REJECT_BROADCAST_RULE2_VALUE);
-    }
-
-    if(T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5705)
-    {
-        k = 16;
-    }
-    else
-    {
-        k = 8;
-    }
-#ifdef BCM_ASF
-    if (pDevice->EnableAsf)
-    {
-        k -= 4;
-    }
-#endif
-
-    /* disable the rest of the rules. */
-    for(j = RCV_LAST_RULE_IDX; j < k; j++)
-    {
-        REG_WR(pDevice, MacCtrl.RcvRules[j].Rule, 0);
-        REG_WR(pDevice, MacCtrl.RcvRules[j].Value, 0);
-    }
-
-    return LM_STATUS_SUCCESS;
-} /* LM_SetReceiveMask */
-
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*    Disable the interrupt and put the transmitter and receiver engines in   */
-/*    an idle state.  Also aborts all pending send requests and receive       */
-/*    buffers.                                                                */
-/*                                                                            */
-/* Return:                                                                    */
-/*    LM_STATUS_SUCCESS                                                       */
-/******************************************************************************/
-LM_STATUS
-LM_Abort(
-PLM_DEVICE_BLOCK pDevice)
-{
-    PLM_PACKET pPacket;
-    LM_UINT Idx;
-
-    LM_DisableInterrupt(pDevice);
-
-    LM_DisableChip(pDevice);
-
-    /* Abort packets that have already queued to go out. */
-    pPacket = (PLM_PACKET) QQ_PopHead(&pDevice->TxPacketActiveQ.Container);
-    while(pPacket)
-    {
-
-        pPacket->PacketStatus = LM_STATUS_TRANSMIT_ABORTED;
-        pDevice->TxCounters.TxPacketAbortedCnt++;
-
-        MM_ATOMIC_ADD(&pDevice->SendBdLeft, pPacket->u.Tx.FragCount);
-
-        QQ_PushTail(&pDevice->TxPacketXmittedQ.Container, pPacket);
-
-        pPacket = (PLM_PACKET) 
-            QQ_PopHead(&pDevice->TxPacketActiveQ.Container);
-    }
-
-    /* Cleanup the receive return rings. */
-    LM_ServiceRxInterrupt(pDevice);
-
-    /* Don't want to indicate rx packets in Ndis miniport shutdown context. */
-    /* Doing so may cause system crash. */
-    if(!pDevice->ShuttingDown)
-    {
-        /* Indicate packets to the protocol. */
-        MM_IndicateTxPackets(pDevice);
-
-        /* Indicate received packets to the protocols. */
-        MM_IndicateRxPackets(pDevice);
-    }
-    else
-    {
-        /* Move the receive packet descriptors in the ReceivedQ to the */
-        /* free queue. */
-        for(; ;)
-        {
-            pPacket = (PLM_PACKET) QQ_PopHead(
-                &pDevice->RxPacketReceivedQ.Container);
-            if(pPacket == NULL)
-            {
-                break;
-            }
-            MM_UnmapRxDma(pDevice, pPacket);
-            QQ_PushTail(&pDevice->RxPacketFreeQ.Container, pPacket);
-        }
-    }
-
-    /* Clean up the Std Receive Producer ring. */
-    Idx = pDevice->pStatusBlkVirt->RcvStdConIdx;
-
-    while(Idx != pDevice->RxStdProdIdx) {
-        pPacket = (PLM_PACKET) (MM_UINT_PTR(pDevice->pPacketDescBase) +
-            MM_UINT_PTR(pDevice->pRxStdBdVirt[Idx].Opaque));
-
-        MM_UnmapRxDma(pDevice, pPacket);
-        QQ_PushTail(&pDevice->RxPacketFreeQ.Container, pPacket);
-
-        Idx = (Idx + 1) & T3_STD_RCV_RCB_ENTRY_COUNT_MASK;
-    } /* while */
-
-    /* Reinitialize our copy of the indices. */
-    pDevice->RxStdProdIdx = 0;
-
-#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
-    /* Clean up the Jumbo Receive Producer ring. */
-    Idx = pDevice->pStatusBlkVirt->RcvJumboConIdx;
-
-    while(Idx != pDevice->RxJumboProdIdx) {
-        pPacket = (PLM_PACKET) (MM_UINT_PTR(pDevice->pPacketDescBase) +
-            MM_UINT_PTR(pDevice->pRxJumboBdVirt[Idx].Opaque));
-
-        MM_UnmapRxDma(pDevice, pPacket);
-        QQ_PushTail(&pDevice->RxPacketFreeQ.Container, pPacket);
-
-        Idx = (Idx + 1) & T3_JUMBO_RCV_RCB_ENTRY_COUNT_MASK;
-    } /* while */
-
-    /* Reinitialize our copy of the indices. */
-    pDevice->RxJumboProdIdx = 0;
-#endif /* T3_JUMBO_RCV_RCB_ENTRY_COUNT */
-
-    /* Initialize the statistis Block */
-    pDevice->pStatusBlkVirt->Status = 0;
-    pDevice->pStatusBlkVirt->RcvStdConIdx = 0;
-    pDevice->pStatusBlkVirt->RcvJumboConIdx = 0;
-    pDevice->pStatusBlkVirt->RcvMiniConIdx = 0;
-
-    return LM_STATUS_SUCCESS;
-} /* LM_Abort */
-
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*    Disable the interrupt and put the transmitter and receiver engines in   */
-/*    an idle state.  Aborts all pending send requests and receive buffers.   */
-/*    Also free all the receive buffers.                                      */
-/*                                                                            */
-/* Return:                                                                    */
-/*    LM_STATUS_SUCCESS                                                       */
-/******************************************************************************/
-LM_STATUS
-LM_Halt(
-PLM_DEVICE_BLOCK pDevice) {
-    PLM_PACKET pPacket;
-    LM_UINT32 EntryCnt;
-
-    LM_DisableFW(pDevice);
-
-    LM_Abort(pDevice);
-
-    /* Get the number of entries in the queue. */
-    EntryCnt = QQ_GetEntryCnt(&pDevice->RxPacketFreeQ.Container);
-
-    /* Make sure all the packets have been accounted for. */
-    for(EntryCnt = 0; EntryCnt < pDevice->RxPacketDescCnt; EntryCnt++)
-    {
-        pPacket = (PLM_PACKET) QQ_PopHead(&pDevice->RxPacketFreeQ.Container);
-        if (pPacket == 0)
-            break;
-
-        MM_FreeRxBuffer(pDevice, pPacket);
-
-        QQ_PushTail(&pDevice->RxPacketFreeQ.Container, pPacket);
-    }
-
-    LM_ResetChip(pDevice);
-
-#ifdef BCM_ASF
-    if (pDevice->EnableAsf)
-    {
-        MEM_WR_OFFSET(pDevice, T3_DRV_STATE_MAILBOX, T3_DRV_STATE_UNLOAD);
-    }
-#endif
-    /* Restore PCI configuration registers. */
-    MM_WriteConfig32(pDevice, PCI_CACHE_LINE_SIZE_REG,
-        pDevice->SavedCacheLineReg);
-    LM_RegWrInd(pDevice, PCI_SUBSYSTEM_VENDOR_ID_REG, 
-        (pDevice->SubsystemId << 16) | pDevice->SubsystemVendorId);
-
-    /* Reprogram the MAC address. */
-    LM_SetMacAddress(pDevice, pDevice->NodeAddress);
-
-    return LM_STATUS_SUCCESS;
-} /* LM_Halt */
-
-
-LM_STATUS
-LM_ResetChip(PLM_DEVICE_BLOCK pDevice)
-{
-    LM_UINT32 Value32;
-    LM_UINT32 j, MaxWait;
-
-    /* Wait for access to the nvram interface before resetting.  This is */
-    /* a workaround to prevent EEPROM corruption. */
-    if(T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5700 &&
-        T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5701)
-    {
-        /* Request access to the flash interface. */
-        LM_NvramGetLock(pDevice);
-    }
-
-    Value32 = GRC_MISC_CFG_CORE_CLOCK_RESET;
-    if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705)
-    {
-        Value32 |= GRC_MISC_GPHY_KEEP_POWER_DURING_RESET;
-    }
-
-    /* Global reset. */
-    RAW_REG_WR(pDevice, Grc.MiscCfg, Value32);
-    MM_Wait(40); MM_Wait(40); MM_Wait(40);
-
-    /* make sure we re-enable indirect accesses */
-    MM_WriteConfig32(pDevice, T3_PCI_MISC_HOST_CTRL_REG,
-        pDevice->MiscHostCtrl);
-
-    /* Set MAX PCI retry to zero. */
-    Value32 = T3_PCI_STATE_PCI_ROM_ENABLE | T3_PCI_STATE_PCI_ROM_RETRY_ENABLE;
-    if (pDevice->ChipRevId == T3_CHIP_ID_5704_A0)
-    {
-        if (!(pDevice->PciState & T3_PCI_STATE_CONVENTIONAL_PCI_MODE))
-        {
-            Value32 |= T3_PCI_STATE_RETRY_SAME_DMA;
-        }
-    }
-    MM_WriteConfig32(pDevice, T3_PCI_STATE_REG, Value32);
-
-    /* Restore PCI command register. */
-    MM_WriteConfig32(pDevice, PCI_COMMAND_REG,
-        pDevice->PciCommandStatusWords);
-
-    /* Disable PCI-X relaxed ordering bit. */
-    MM_ReadConfig32(pDevice, PCIX_CAP_REG, &Value32);
-    Value32 &= ~PCIX_ENABLE_RELAXED_ORDERING;
-    MM_WriteConfig32(pDevice, PCIX_CAP_REG, Value32);
-
-    /* Enable memory arbiter. */
-    REG_WR(pDevice, MemArbiter.Mode, T3_MEM_ARBITER_MODE_ENABLE);
-
-#ifdef BIG_ENDIAN_HOST
-    /* Reconfigure the mode register. */
-    Value32 = GRC_MODE_BYTE_SWAP_NON_FRAME_DATA | 
-              GRC_MODE_WORD_SWAP_NON_FRAME_DATA |
-              GRC_MODE_BYTE_SWAP_DATA |
-              GRC_MODE_WORD_SWAP_DATA;
-#else
-    /* Reconfigure the mode register. */
-    Value32 = GRC_MODE_BYTE_SWAP_NON_FRAME_DATA | GRC_MODE_BYTE_SWAP_DATA;
-#endif
-    REG_WR(pDevice, Grc.Mode, Value32);
-
-    if (pDevice->MiniPci &&
-        (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705))
-    {
-        pDevice->ClockCtrl |= T3_PCI_CLKRUN_OUTPUT_EN;
-        if (pDevice->ChipRevId == T3_CHIP_ID_5705_A0)
-        {
-            pDevice->ClockCtrl |= T3_PCI_FORCE_CLKRUN;
-        }
-        REG_WR(pDevice, PciCfg.ClockCtrl, pDevice->ClockCtrl);
-    }
-
-    /* Prevent PXE from restarting. */
-    MEM_WR_OFFSET(pDevice, T3_FIRMWARE_MAILBOX,T3_MAGIC_NUM_FIRMWARE_INIT_DONE);
-
-    if(pDevice->EnableTbi) {
-        pDevice->MacMode = MAC_MODE_PORT_MODE_TBI;
-        REG_WR(pDevice, MacCtrl.Mode, MAC_MODE_PORT_MODE_TBI);
-    }
-    else {
-        REG_WR(pDevice, MacCtrl.Mode, 0);
-    }
-
-    /* Wait for the firmware to finish initialization. */
-    if (pDevice->Flash)
-    {
-        MaxWait = 1000;
-    }
-    else
-    {
-        MaxWait = 10000;
-    }
-    for(j = 0; j < MaxWait; j++)
-    {
-        MM_Wait(100);
-
-        if (j < 50)
-            continue;
-
-        Value32 = MEM_RD_OFFSET(pDevice, T3_FIRMWARE_MAILBOX);
-        if(Value32 == ~T3_MAGIC_NUM_FIRMWARE_INIT_DONE)
-        {
-            break;
-        }
-    }
-    if ((j >= MaxWait) && (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5704))
-    {
-        /* workaround - need to reset nvram of both devices at the same time */
-        /* if the boot code is not running */
-        if (LM_NvramGetLock(pDevice) != LM_STATUS_SUCCESS)
-        {
-            LM_DEVICE_BLOCK *pDevice2;
-
-            REG_WR(pDevice, Nvram.Cmd, NVRAM_CMD_RESET);
-            pDevice2 = MM_FindPeerDev(pDevice);
-            if (pDevice2 && !pDevice2->InitDone)
-            {
-                REG_WR(pDevice2, Nvram.Cmd, NVRAM_CMD_RESET);
-	    }
-	}
-        else
-        {
-            LM_NvramReleaseLock(pDevice);
-        }
-    }
-
-#ifdef BCM_ASF
-    pDevice->EnableAsf = FALSE;
-    Value32 = MEM_RD_OFFSET(pDevice, T3_NIC_DATA_SIG_ADDR);
-    if (Value32 == T3_NIC_DATA_SIG)
-    {
-        Value32 = MEM_RD_OFFSET(pDevice, T3_NIC_DATA_NIC_CFG_ADDR);
-        if (Value32 & T3_NIC_CFG_ENABLE_ASF)
-        {
-            pDevice->EnableAsf = TRUE;
-        }
-    }
-#endif
-
-    return LM_STATUS_SUCCESS;
-}
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-void
-LM_ServiceTxInterrupt(
-PLM_DEVICE_BLOCK pDevice) {
-    PLM_PACKET pPacket;
-    LM_UINT32 HwConIdx;
-    LM_UINT32 SwConIdx;
-
-    HwConIdx = pDevice->pStatusBlkVirt->Idx[0].SendConIdx;
-
-    /* Get our copy of the consumer index.  The buffer descriptors */
-    /* that are in between the consumer indices are freed. */
-    SwConIdx = pDevice->SendConIdx;
-
-    /* Move the packets from the TxPacketActiveQ that are sent out to */
-    /* the TxPacketXmittedQ.  Packets that are sent use the */
-    /* descriptors that are between SwConIdx and HwConIdx. */
-    while(SwConIdx != HwConIdx)
-    {
-        /* Get the packet that was sent from the TxPacketActiveQ. */
-        pPacket = (PLM_PACKET) QQ_PopHead(
-            &pDevice->TxPacketActiveQ.Container);
-
-        /* Set the return status. */
-        pPacket->PacketStatus = LM_STATUS_SUCCESS;
-
-        /* Put the packet in the TxPacketXmittedQ for indication later. */
-        QQ_PushTail(&pDevice->TxPacketXmittedQ.Container, pPacket);
-
-        /* Move to the next packet's BD. */
-        SwConIdx = (SwConIdx + pPacket->u.Tx.FragCount) & 
-            T3_SEND_RCB_ENTRY_COUNT_MASK;
-
-        /* Update the number of unused BDs. */
-        MM_ATOMIC_ADD(&pDevice->SendBdLeft, pPacket->u.Tx.FragCount);
-
-        /* Get the new updated HwConIdx. */
-        HwConIdx = pDevice->pStatusBlkVirt->Idx[0].SendConIdx;
-    } /* while */
-
-    /* Save the new SwConIdx. */
-    pDevice->SendConIdx = SwConIdx;
-
-} /* LM_ServiceTxInterrupt */
-
-
-#ifdef BCM_NAPI_RXPOLL
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-int
-LM_ServiceRxPoll(PLM_DEVICE_BLOCK pDevice, int limit)
-{
-    PLM_PACKET pPacket;
-    PT3_RCV_BD pRcvBd;
-    LM_UINT32 HwRcvRetProdIdx;
-    LM_UINT32 SwRcvRetConIdx;
-    int received = 0;
-
-    /* Loop thru the receive return rings for received packets. */
-    HwRcvRetProdIdx = pDevice->pStatusBlkVirt->Idx[0].RcvProdIdx;
-
-    SwRcvRetConIdx = pDevice->RcvRetConIdx;
-    while (SwRcvRetConIdx != HwRcvRetProdIdx) 
-    {
-        pRcvBd = &pDevice->pRcvRetBdVirt[SwRcvRetConIdx];
-
-        /* Get the received packet descriptor. */
-        pPacket = (PLM_PACKET) (MM_UINT_PTR(pDevice->pPacketDescBase) +
-            MM_UINT_PTR(pRcvBd->Opaque));
-
-        /* Check the error flag. */
-        if(pRcvBd->ErrorFlag &&
-            pRcvBd->ErrorFlag != RCV_BD_ERR_ODD_NIBBLED_RCVD_MII)
-        {
-            pPacket->PacketStatus = LM_STATUS_FAILURE;
-
-            pDevice->RxCounters.RxPacketErrCnt++;
-
-            if(pRcvBd->ErrorFlag & RCV_BD_ERR_BAD_CRC)
-            {
-                pDevice->RxCounters.RxErrCrcCnt++;
-            }
-
-            if(pRcvBd->ErrorFlag & RCV_BD_ERR_COLL_DETECT)
-            {
-                pDevice->RxCounters.RxErrCollCnt++;
-            }
-
-            if(pRcvBd->ErrorFlag & RCV_BD_ERR_LINK_LOST_DURING_PKT)
-            {
-                pDevice->RxCounters.RxErrLinkLostCnt++;
-            }
-
-            if(pRcvBd->ErrorFlag & RCV_BD_ERR_PHY_DECODE_ERR)
-            {
-                pDevice->RxCounters.RxErrPhyDecodeCnt++;
-            }
-
-            if(pRcvBd->ErrorFlag & RCV_BD_ERR_ODD_NIBBLED_RCVD_MII)
-            {
-                pDevice->RxCounters.RxErrOddNibbleCnt++;
-            }
-
-            if(pRcvBd->ErrorFlag & RCV_BD_ERR_MAC_ABORT)
-            {
-                pDevice->RxCounters.RxErrMacAbortCnt++;
-            }
-
-            if(pRcvBd->ErrorFlag & RCV_BD_ERR_LEN_LT_64)
-            {
-                pDevice->RxCounters.RxErrShortPacketCnt++;
-            }
-
-            if(pRcvBd->ErrorFlag & RCV_BD_ERR_TRUNC_NO_RESOURCES)
-            {
-                pDevice->RxCounters.RxErrNoResourceCnt++;
-            }
-
-            if(pRcvBd->ErrorFlag & RCV_BD_ERR_GIANT_FRAME_RCVD)
-            {
-                pDevice->RxCounters.RxErrLargePacketCnt++;
-            }
-        }
-        else
-        {
-            pPacket->PacketStatus = LM_STATUS_SUCCESS;
-            pPacket->PacketSize = pRcvBd->Len - 4;
-
-            pPacket->Flags = pRcvBd->Flags;
-            if(pRcvBd->Flags & RCV_BD_FLAG_VLAN_TAG)
-            {
-                pPacket->VlanTag = pRcvBd->VlanTag;
-            }
-
-            pPacket->u.Rx.TcpUdpChecksum = pRcvBd->TcpUdpCksum;
-        }
-
-        /* Put the packet descriptor containing the received packet */
-        /* buffer in the RxPacketReceivedQ for indication later. */
-        QQ_PushTail(&pDevice->RxPacketReceivedQ.Container, pPacket);
-
-        /* Go to the next buffer descriptor. */
-        SwRcvRetConIdx = (SwRcvRetConIdx + 1) &
-            pDevice->RcvRetRcbEntryCountMask;
-
-        if (++received >= limit)
-        {
-            break;
-        }
-        /* Get the updated HwRcvRetProdIdx. */
-        HwRcvRetProdIdx = pDevice->pStatusBlkVirt->Idx[0].RcvProdIdx;
-    } /* while */
-
-    pDevice->RcvRetConIdx = SwRcvRetConIdx;
-
-    /* Update the receive return ring consumer index. */
-    MB_REG_WR(pDevice, Mailbox.RcvRetConIdx[0].Low, SwRcvRetConIdx);
-    if (pDevice->FlushPostedWrites)
-    {
-        MB_REG_RD(pDevice, Mailbox.RcvRetConIdx[0].Low);
-    }
-    return received;
-} /* LM_ServiceRxPoll */
-#endif /* BCM_NAPI_RXPOLL */
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-void
-LM_ServiceRxInterrupt(PLM_DEVICE_BLOCK pDevice)
-{
-#ifndef BCM_NAPI_RXPOLL
-    PLM_PACKET pPacket;
-    PT3_RCV_BD pRcvBd;
-#endif
-    LM_UINT32 HwRcvRetProdIdx;
-    LM_UINT32 SwRcvRetConIdx;
-
-    /* Loop thru the receive return rings for received packets. */
-    HwRcvRetProdIdx = pDevice->pStatusBlkVirt->Idx[0].RcvProdIdx;
-
-    SwRcvRetConIdx = pDevice->RcvRetConIdx;
-#ifdef BCM_NAPI_RXPOLL
-    if (!pDevice->RxPoll)
-    {
-        if (SwRcvRetConIdx != HwRcvRetProdIdx)
-        {
-            if (MM_ScheduleRxPoll(pDevice) == LM_STATUS_SUCCESS)
-            {
-                pDevice->RxPoll = TRUE;
-                REG_WR(pDevice, Grc.Mode,
-                    pDevice->GrcMode | GRC_MODE_NO_INTERRUPT_ON_RECEIVE);
-            }
-        }
-    }
-#else
-    while(SwRcvRetConIdx != HwRcvRetProdIdx)
-    {
-        pRcvBd = &pDevice->pRcvRetBdVirt[SwRcvRetConIdx];
-
-        /* Get the received packet descriptor. */
-        pPacket = (PLM_PACKET) (MM_UINT_PTR(pDevice->pPacketDescBase) +
-            MM_UINT_PTR(pRcvBd->Opaque));
-
-        /* Check the error flag. */
-        if(pRcvBd->ErrorFlag &&
-            pRcvBd->ErrorFlag != RCV_BD_ERR_ODD_NIBBLED_RCVD_MII)
-        {
-            pPacket->PacketStatus = LM_STATUS_FAILURE;
-
-            pDevice->RxCounters.RxPacketErrCnt++;
-
-            if(pRcvBd->ErrorFlag & RCV_BD_ERR_BAD_CRC)
-            {
-                pDevice->RxCounters.RxErrCrcCnt++;
-            }
-
-            if(pRcvBd->ErrorFlag & RCV_BD_ERR_COLL_DETECT)
-            {
-                pDevice->RxCounters.RxErrCollCnt++;
-            }
-
-            if(pRcvBd->ErrorFlag & RCV_BD_ERR_LINK_LOST_DURING_PKT)
-            {
-                pDevice->RxCounters.RxErrLinkLostCnt++;
-            }
-
-            if(pRcvBd->ErrorFlag & RCV_BD_ERR_PHY_DECODE_ERR)
-            {
-                pDevice->RxCounters.RxErrPhyDecodeCnt++;
-            }
-
-            if(pRcvBd->ErrorFlag & RCV_BD_ERR_ODD_NIBBLED_RCVD_MII)
-            {
-                pDevice->RxCounters.RxErrOddNibbleCnt++;
-            }
-
-            if(pRcvBd->ErrorFlag & RCV_BD_ERR_MAC_ABORT)
-            {
-                pDevice->RxCounters.RxErrMacAbortCnt++;
-            }
-
-            if(pRcvBd->ErrorFlag & RCV_BD_ERR_LEN_LT_64)
-            {
-                pDevice->RxCounters.RxErrShortPacketCnt++;
-            }
-
-            if(pRcvBd->ErrorFlag & RCV_BD_ERR_TRUNC_NO_RESOURCES)
-            {
-                pDevice->RxCounters.RxErrNoResourceCnt++;
-            }
-
-            if(pRcvBd->ErrorFlag & RCV_BD_ERR_GIANT_FRAME_RCVD)
-            {
-                pDevice->RxCounters.RxErrLargePacketCnt++;
-            }
-        }
-        else
-        {
-            pPacket->PacketStatus = LM_STATUS_SUCCESS;
-            pPacket->PacketSize = pRcvBd->Len - 4;
-
-            pPacket->Flags = pRcvBd->Flags;
-            if(pRcvBd->Flags & RCV_BD_FLAG_VLAN_TAG)
-            {
-                pPacket->VlanTag = pRcvBd->VlanTag;
-            }
-
-            pPacket->u.Rx.TcpUdpChecksum = pRcvBd->TcpUdpCksum;
-        }
-
-        /* Put the packet descriptor containing the received packet */
-        /* buffer in the RxPacketReceivedQ for indication later. */
-        QQ_PushTail(&pDevice->RxPacketReceivedQ.Container, pPacket);
-
-        /* Go to the next buffer descriptor. */
-        SwRcvRetConIdx = (SwRcvRetConIdx + 1) &
-            pDevice->RcvRetRcbEntryCountMask;
-
-        /* Get the updated HwRcvRetProdIdx. */
-        HwRcvRetProdIdx = pDevice->pStatusBlkVirt->Idx[0].RcvProdIdx;
-    } /* while */
-
-    pDevice->RcvRetConIdx = SwRcvRetConIdx;
-
-    /* Update the receive return ring consumer index. */
-    MB_REG_WR(pDevice, Mailbox.RcvRetConIdx[0].Low, SwRcvRetConIdx);
-    if (pDevice->FlushPostedWrites)
-    {
-        MB_REG_RD(pDevice, Mailbox.RcvRetConIdx[0].Low);
-    }
-#endif
-} /* LM_ServiceRxInterrupt */
-
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*    This is the interrupt event handler routine. It acknowledges all        */
-/*    pending interrupts and process all pending events.                      */
-/*                                                                            */
-/* Return:                                                                    */
-/*    LM_STATUS_SUCCESS                                                       */
-/******************************************************************************/
-LM_STATUS
-LM_ServiceInterrupts(
-    PLM_DEVICE_BLOCK pDevice)
-{
-    LM_UINT32 Value32;
-    int ServicePhyInt = FALSE;
-
-    /* Setup the phy chip whenever the link status changes. */
-    if(pDevice->LinkChngMode == T3_LINK_CHNG_MODE_USE_STATUS_REG)
-    {
-        Value32 = REG_RD(pDevice, MacCtrl.Status);
-        if(pDevice->PhyIntMode == T3_PHY_INT_MODE_MI_INTERRUPT)
-        {
-            if (Value32 & MAC_STATUS_MI_INTERRUPT)
-            {
-                ServicePhyInt = TRUE;
-            }
-        }
-        else if(Value32 & MAC_STATUS_LINK_STATE_CHANGED)
-        {
-            ServicePhyInt = TRUE;
-        }
-    }
-    else
-    {
-        if(pDevice->pStatusBlkVirt->Status & STATUS_BLOCK_LINK_CHANGED_STATUS)
-        {
-            pDevice->pStatusBlkVirt->Status = STATUS_BLOCK_UPDATED |
-                (pDevice->pStatusBlkVirt->Status & ~STATUS_BLOCK_LINK_CHANGED_STATUS);
-            ServicePhyInt = TRUE;
-        }
-    }
-#if INCLUDE_TBI_SUPPORT
-    if (pDevice->IgnoreTbiLinkChange == TRUE)
-    {
-        ServicePhyInt = FALSE;
-    }
-#endif
-    if (ServicePhyInt == TRUE)
-    {
-        MM_ACQUIRE_PHY_LOCK_IN_IRQ(pDevice);
-        LM_SetupPhy(pDevice);
-        MM_RELEASE_PHY_LOCK_IN_IRQ(pDevice);
-    }
-
-    /* Service receive and transmit interrupts. */
-    LM_ServiceRxInterrupt(pDevice);
-    LM_ServiceTxInterrupt(pDevice);
-        
-#ifndef BCM_NAPI_RXPOLL
-    /* No spinlock for this queue since this routine is serialized. */
-    if(!QQ_Empty(&pDevice->RxPacketReceivedQ.Container))
-    {
-        /* Indicate receive packets. */
-        MM_IndicateRxPackets(pDevice);
-//        LM_QueueRxPackets(pDevice);
-    }
-#endif
-
-    /* No spinlock for this queue since this routine is serialized. */
-    if(!QQ_Empty(&pDevice->TxPacketXmittedQ.Container))
-    {
-        MM_IndicateTxPackets(pDevice);
-    }
-
-    return LM_STATUS_SUCCESS;
-} /* LM_ServiceInterrupts */
-
-
-/******************************************************************************/
-/* Description:  Add a Multicast address. Note that MC addresses, once added, */
-/*               cannot be individually deleted. All addresses must be        */
-/*               cleared.                                                     */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-LM_STATUS
-LM_MulticastAdd(LM_DEVICE_BLOCK *pDevice, PLM_UINT8 pMcAddress)
-{
-
-    LM_UINT32 RegIndex;
-    LM_UINT32 Bitpos;
-    LM_UINT32 Crc32;
-
-    Crc32 = ComputeCrc32(pMcAddress, ETHERNET_ADDRESS_SIZE);
-
-    /* The most significant 7 bits of the CRC32 (no inversion), */
-    /* are used to index into one of the possible 128 bit positions. */
-    Bitpos = ~Crc32 & 0x7f;
-
-    /* Hash register index. */
-    RegIndex = (Bitpos & 0x60) >> 5;
-
-    /* Bit to turn on within a hash register. */
-    Bitpos &= 0x1f;
-
-    /* Enable the multicast bit. */
-    pDevice->MulticastHash[RegIndex] |= (1 << Bitpos);
-
-    LM_SetReceiveMask(pDevice, pDevice->ReceiveMask | LM_ACCEPT_MULTICAST);
-
-    return LM_STATUS_SUCCESS;
-}
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-LM_STATUS
-LM_MulticastDel(LM_DEVICE_BLOCK *pDevice, PLM_UINT8 pMcAddress)
-{
-    return LM_STATUS_FAILURE;
-} /* LM_MulticastDel */
-
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-LM_STATUS
-LM_MulticastClear(LM_DEVICE_BLOCK *pDevice)
-{
-    int i;
-
-    for (i = 0; i < 4; i++)
-    {
-        pDevice->MulticastHash[i] = 0;
-    }
-    LM_SetReceiveMask(pDevice, pDevice->ReceiveMask & ~LM_ACCEPT_MULTICAST);
-
-    return LM_STATUS_SUCCESS;
-} /* LM_MulticastClear */
-
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-LM_STATUS
-LM_SetMacAddress(
-    PLM_DEVICE_BLOCK pDevice,
-    PLM_UINT8 pMacAddress)
-{
-    LM_UINT32 j;
-
-    for(j = 0; j < 4; j++)
-    {
-        REG_WR(pDevice, MacCtrl.MacAddr[j].High,
-            (pMacAddress[0] << 8) | pMacAddress[1]);
-        REG_WR(pDevice, MacCtrl.MacAddr[j].Low,
-            (pMacAddress[2] << 24) | (pMacAddress[3] << 16) |
-            (pMacAddress[4] << 8) | pMacAddress[5]);
-    }
-
-    if ((T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5700) &&
-        (T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5701) &&
-        (T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5705))
-    {
-        for (j = 0; j < 12; j++)
-        {
-            REG_WR(pDevice, MacCtrl.MacAddrExt[j].High,
-                (pMacAddress[0] << 8) | pMacAddress[1]);
-            REG_WR(pDevice, MacCtrl.MacAddrExt[j].Low,
-                (pMacAddress[2] << 24) | (pMacAddress[3] << 16) |
-                (pMacAddress[4] << 8) | pMacAddress[5]);
-        }
-    }
-    return LM_STATUS_SUCCESS;
-}
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/*    LM_STATUS_LINK_ACTIVE                                                   */
-/*    LM_STATUS_LINK_DOWN                                                     */
-/******************************************************************************/
-static LM_STATUS
-LM_InitBcm540xPhy(
-PLM_DEVICE_BLOCK pDevice)
-{
-    LM_LINE_SPEED CurrentLineSpeed;
-    LM_DUPLEX_MODE CurrentDuplexMode;
-    LM_STATUS CurrentLinkStatus;
-    LM_UINT32 Value32;
-    LM_UINT32 j;
-
-    LM_WritePhy(pDevice, BCM5401_AUX_CTRL, 0x02);
-
-    if ((pDevice->PhyFlags & PHY_RESET_ON_LINKDOWN) &&
-        (pDevice->LinkStatus == LM_STATUS_LINK_ACTIVE))
-    {
-        LM_ReadPhy(pDevice, PHY_STATUS_REG, &Value32);
-        LM_ReadPhy(pDevice, PHY_STATUS_REG, &Value32);
-        if(!(Value32 & PHY_STATUS_LINK_PASS))
-        {
-            LM_ResetPhy(pDevice);
-        }
-    }
-    if((pDevice->PhyId & PHY_ID_MASK) == PHY_BCM5401_PHY_ID)
-    {
-        LM_ReadPhy(pDevice, PHY_STATUS_REG, &Value32);
-        LM_ReadPhy(pDevice, PHY_STATUS_REG, &Value32);
-
-        if(!pDevice->InitDone)
-        {
-            Value32 = 0;
-        }
-
-        if(!(Value32 & PHY_STATUS_LINK_PASS))
-        {
-            LM_WritePhy(pDevice, BCM5401_AUX_CTRL,  0x0c20);
-
-            LM_WritePhy(pDevice, BCM540X_DSP_ADDRESS_REG, 0x0012);
-            LM_WritePhy(pDevice, BCM540X_DSP_RW_PORT, 0x1804);
-                
-            LM_WritePhy(pDevice, BCM540X_DSP_ADDRESS_REG, 0x0013);
-            LM_WritePhy(pDevice, BCM540X_DSP_RW_PORT, 0x1204);
-                
-            LM_WritePhy(pDevice, BCM540X_DSP_ADDRESS_REG, 0x8006);
-            LM_WritePhy(pDevice, BCM540X_DSP_RW_PORT, 0x0132);
-
-            LM_WritePhy(pDevice, BCM540X_DSP_ADDRESS_REG, 0x8006);
-            LM_WritePhy(pDevice, BCM540X_DSP_RW_PORT, 0x0232);
-                
-            LM_WritePhy(pDevice, BCM540X_DSP_ADDRESS_REG, 0x201f);
-            LM_WritePhy(pDevice, BCM540X_DSP_RW_PORT, 0x0a20);
-
-            LM_ReadPhy(pDevice, PHY_STATUS_REG, &Value32);
-            for(j = 0; j < 1000; j++)
-            {
-                MM_Wait(10);
-
-                LM_ReadPhy(pDevice, PHY_STATUS_REG, &Value32);
-                if(Value32 & PHY_STATUS_LINK_PASS)
-                {
-                    MM_Wait(40);
-                    break;
-                }
-            }
-
-            if((pDevice->PhyId & PHY_ID_REV_MASK) == PHY_BCM5401_B0_REV)
-            {
-                if(!(Value32 & PHY_STATUS_LINK_PASS) &&
-                    (pDevice->OldLineSpeed == LM_LINE_SPEED_1000MBPS))
-                {
-                    LM_WritePhy(pDevice, PHY_CTRL_REG, PHY_CTRL_PHY_RESET);
-                    for(j = 0; j < 100; j++)
-                    {
-                        MM_Wait(10);
-
-                        LM_ReadPhy(pDevice, PHY_CTRL_REG, &Value32);
-                        if(!(Value32 & PHY_CTRL_PHY_RESET))
-                        {
-                            MM_Wait(40);
-                            break;
-                        }
-                    }
-
-                    LM_WritePhy(pDevice, BCM5401_AUX_CTRL,  0x0c20);
-
-                    LM_WritePhy(pDevice, BCM540X_DSP_ADDRESS_REG, 0x0012);
-                    LM_WritePhy(pDevice, BCM540X_DSP_RW_PORT, 0x1804);
-                        
-                    LM_WritePhy(pDevice, BCM540X_DSP_ADDRESS_REG, 0x0013);
-                    LM_WritePhy(pDevice, BCM540X_DSP_RW_PORT, 0x1204);
-                        
-                    LM_WritePhy(pDevice, BCM540X_DSP_ADDRESS_REG, 0x8006);
-                    LM_WritePhy(pDevice, BCM540X_DSP_RW_PORT, 0x0132);
-
-                    LM_WritePhy(pDevice, BCM540X_DSP_ADDRESS_REG, 0x8006);
-                    LM_WritePhy(pDevice, BCM540X_DSP_RW_PORT, 0x0232);
-                        
-                    LM_WritePhy(pDevice, BCM540X_DSP_ADDRESS_REG, 0x201f);
-                    LM_WritePhy(pDevice, BCM540X_DSP_RW_PORT, 0x0a20);
-                }
-            }
-        }
-    }
-    else if(pDevice->ChipRevId == T3_CHIP_ID_5701_A0 ||
-        pDevice->ChipRevId == T3_CHIP_ID_5701_B0)
-    {
-        /* Bug: 5701 A0, B0 TX CRC workaround. */
-        LM_WritePhy(pDevice, 0x15, 0x0a75);
-        LM_WritePhy(pDevice, 0x1c, 0x8c68);
-        LM_WritePhy(pDevice, 0x1c, 0x8d68);
-        LM_WritePhy(pDevice, 0x1c, 0x8c68);
-    }
-
-    /* Acknowledge interrupts. */
-    LM_ReadPhy(pDevice, BCM540X_INT_STATUS_REG, &Value32);
-    LM_ReadPhy(pDevice, BCM540X_INT_STATUS_REG, &Value32);
-
-    /* Configure the interrupt mask. */
-    if(pDevice->PhyIntMode == T3_PHY_INT_MODE_MI_INTERRUPT)
-    {
-        LM_WritePhy(pDevice, BCM540X_INT_MASK_REG, ~BCM540X_INT_LINK_CHANGE);
-    }
-
-    /* Configure PHY led mode. */
-    if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701 ||
-        (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700))
-    {
-        if(pDevice->LedMode == LED_MODE_THREE_LINK)
-        {
-            LM_WritePhy(pDevice, BCM540X_EXT_CTRL_REG, 
-                BCM540X_EXT_CTRL_LINK3_LED_MODE);
-        }
-        else
-        {
-            LM_WritePhy(pDevice, BCM540X_EXT_CTRL_REG, 0);
-        }
-    }
-
-    CurrentLinkStatus = LM_STATUS_LINK_DOWN;
-
-    /* Get current link and duplex mode. */
-    for(j = 0; j < 100; j++)
-    {
-        LM_ReadPhy(pDevice, PHY_STATUS_REG, &Value32);
-        LM_ReadPhy(pDevice, PHY_STATUS_REG, &Value32);
-
-        if(Value32 & PHY_STATUS_LINK_PASS)
-        {
-            break;
-        }
-        MM_Wait(40);
-    }
-
-    if(Value32 & PHY_STATUS_LINK_PASS)
-    {
-
-        /* Determine the current line and duplex settings. */
-        LM_ReadPhy(pDevice, BCM540X_AUX_STATUS_REG, &Value32);
-        for(j = 0; j < 2000; j++)
-        {
-            MM_Wait(10);
-
-            LM_ReadPhy(pDevice, BCM540X_AUX_STATUS_REG, &Value32);
-            if(Value32)
-            {
-                break;
-            }
-        }
-
-        switch(Value32 & BCM540X_AUX_SPEED_MASK)
-        {
-            case BCM540X_AUX_10BASET_HD:
-                CurrentLineSpeed = LM_LINE_SPEED_10MBPS;
-                CurrentDuplexMode = LM_DUPLEX_MODE_HALF;
-                break;
-
-            case BCM540X_AUX_10BASET_FD:
-                CurrentLineSpeed = LM_LINE_SPEED_10MBPS;
-                CurrentDuplexMode = LM_DUPLEX_MODE_FULL;
-                break;
-
-            case BCM540X_AUX_100BASETX_HD:
-                CurrentLineSpeed = LM_LINE_SPEED_100MBPS;
-                CurrentDuplexMode = LM_DUPLEX_MODE_HALF;
-                break;
-
-            case BCM540X_AUX_100BASETX_FD:
-                CurrentLineSpeed = LM_LINE_SPEED_100MBPS;
-                CurrentDuplexMode = LM_DUPLEX_MODE_FULL;
-                break;
-
-            case BCM540X_AUX_100BASET_HD:
-                CurrentLineSpeed = LM_LINE_SPEED_1000MBPS;
-                CurrentDuplexMode = LM_DUPLEX_MODE_HALF;
-                break;
-
-            case BCM540X_AUX_100BASET_FD:
-                CurrentLineSpeed = LM_LINE_SPEED_1000MBPS;
-                CurrentDuplexMode = LM_DUPLEX_MODE_FULL;
-                break;
-
-            default:
-
-                CurrentLineSpeed = LM_LINE_SPEED_UNKNOWN;
-                CurrentDuplexMode = LM_DUPLEX_MODE_UNKNOWN;
-                break;
-        }
-
-        /* Make sure we are in auto-neg mode. */
-        for (j = 0; j < 200; j++)
-        {
-            LM_ReadPhy(pDevice, PHY_CTRL_REG, &Value32);
-            if(Value32 && Value32 != 0x7fff)
-            {
-                break;
-            }
-
-            if(Value32 == 0 &&
-                pDevice->RequestedLineSpeed == LM_LINE_SPEED_10MBPS &&
-                pDevice->RequestedDuplexMode == LM_DUPLEX_MODE_HALF)
-            {
-                break;
-            }
-
-            MM_Wait(10);
-        }
-
-        /* Use the current line settings for "auto" mode. */
-        if(pDevice->RequestedLineSpeed == LM_LINE_SPEED_AUTO)
-        {
-            if(Value32 & PHY_CTRL_AUTO_NEG_ENABLE)
-            {
-                CurrentLinkStatus = LM_STATUS_LINK_ACTIVE;
-
-                /* We may be exiting low power mode and the link is in */
-                /* 10mb.  In this case, we need to restart autoneg. */
-
-                if (LM_PhyAdvertiseAll(pDevice) != LM_STATUS_SUCCESS)
-                {
-                    CurrentLinkStatus = LM_STATUS_LINK_SETTING_MISMATCH;
-                }
-            }
-            else
-            {
-                CurrentLinkStatus = LM_STATUS_LINK_SETTING_MISMATCH;
-            }
-        }
-        else
-        {
-            /* Force line settings. */
-            /* Use the current setting if it matches the user's requested */
-            /* setting. */
-            LM_ReadPhy(pDevice, PHY_CTRL_REG, &Value32);
-            if((pDevice->LineSpeed == CurrentLineSpeed) &&
-                (pDevice->DuplexMode == CurrentDuplexMode))
-            {
-                if ((pDevice->DisableAutoNeg &&
-                    !(Value32 & PHY_CTRL_AUTO_NEG_ENABLE)) ||
-                    (!pDevice->DisableAutoNeg &&
-                    (Value32 & PHY_CTRL_AUTO_NEG_ENABLE)))
-                {
-                    CurrentLinkStatus = LM_STATUS_LINK_ACTIVE;
-                }
-                else
-                {
-                    CurrentLinkStatus = LM_STATUS_LINK_SETTING_MISMATCH;
-                } 
-            }
-            else
-            {
-                CurrentLinkStatus = LM_STATUS_LINK_SETTING_MISMATCH;
-            } 
-        }
-
-        /* Save line settings. */
-        pDevice->LineSpeed = CurrentLineSpeed;
-        pDevice->DuplexMode = CurrentDuplexMode;
-    }
-
-    return CurrentLinkStatus;
-} /* LM_InitBcm540xPhy */
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-LM_STATUS
-LM_SetFlowControl(
-    PLM_DEVICE_BLOCK pDevice,
-    LM_UINT32 LocalPhyAd,
-    LM_UINT32 RemotePhyAd)
-{
-    LM_FLOW_CONTROL FlowCap;
-
-    /* Resolve flow control. */
-    FlowCap = LM_FLOW_CONTROL_NONE;
-
-    /* See Table 28B-3 of 802.3ab-1999 spec. */
-    if(pDevice->FlowControlCap & LM_FLOW_CONTROL_AUTO_PAUSE)
-    {
-        if(LocalPhyAd & PHY_AN_AD_PAUSE_CAPABLE)
-        {
-            if(LocalPhyAd & PHY_AN_AD_ASYM_PAUSE)
-            {
-                if(RemotePhyAd & PHY_LINK_PARTNER_PAUSE_CAPABLE)
-                {
-                    FlowCap = LM_FLOW_CONTROL_TRANSMIT_PAUSE |
-                        LM_FLOW_CONTROL_RECEIVE_PAUSE;
-                }
-                else if(RemotePhyAd & PHY_LINK_PARTNER_ASYM_PAUSE)
-                {
-                    FlowCap = LM_FLOW_CONTROL_RECEIVE_PAUSE;
-                }
-            }
-            else
-            {
-                if(RemotePhyAd & PHY_LINK_PARTNER_PAUSE_CAPABLE)
-                {
-                    FlowCap = LM_FLOW_CONTROL_TRANSMIT_PAUSE |
-                        LM_FLOW_CONTROL_RECEIVE_PAUSE;
-                }
-            }
-        }
-        else if(LocalPhyAd & PHY_AN_AD_ASYM_PAUSE)
-        {
-            if((RemotePhyAd & PHY_LINK_PARTNER_PAUSE_CAPABLE) &&
-                (RemotePhyAd & PHY_LINK_PARTNER_ASYM_PAUSE))
-            {
-                FlowCap = LM_FLOW_CONTROL_TRANSMIT_PAUSE;
-            }
-        }
-    }
-    else
-    {
-        FlowCap = pDevice->FlowControlCap;
-    }
-
-    pDevice->FlowControl = LM_FLOW_CONTROL_NONE;
-
-    /* Enable/disable rx PAUSE. */
-    pDevice->RxMode &= ~RX_MODE_ENABLE_FLOW_CONTROL;
-    if(FlowCap & LM_FLOW_CONTROL_RECEIVE_PAUSE &&
-        (pDevice->FlowControlCap == LM_FLOW_CONTROL_AUTO_PAUSE ||
-        pDevice->FlowControlCap & LM_FLOW_CONTROL_RECEIVE_PAUSE))
-    {
-        pDevice->FlowControl |= LM_FLOW_CONTROL_RECEIVE_PAUSE;
-        pDevice->RxMode |= RX_MODE_ENABLE_FLOW_CONTROL;
-
-    }
-    REG_WR(pDevice, MacCtrl.RxMode, pDevice->RxMode);
-
-    /* Enable/disable tx PAUSE. */
-    pDevice->TxMode &= ~TX_MODE_ENABLE_FLOW_CONTROL;
-    if(FlowCap & LM_FLOW_CONTROL_TRANSMIT_PAUSE &&
-        (pDevice->FlowControlCap == LM_FLOW_CONTROL_AUTO_PAUSE ||
-        pDevice->FlowControlCap & LM_FLOW_CONTROL_TRANSMIT_PAUSE))
-    {
-        pDevice->FlowControl |= LM_FLOW_CONTROL_TRANSMIT_PAUSE;
-        pDevice->TxMode |= TX_MODE_ENABLE_FLOW_CONTROL;
-
-    }
-    REG_WR(pDevice, MacCtrl.TxMode, pDevice->TxMode);
-
-    return LM_STATUS_SUCCESS;
-}
-
-
-#if INCLUDE_TBI_SUPPORT
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-STATIC LM_STATUS
-LM_InitBcm800xPhy(
-    PLM_DEVICE_BLOCK pDevice)
-{
-    LM_UINT32 Value32;
-    LM_UINT32 j;
-
-    Value32 = REG_RD(pDevice, MacCtrl.Status);
-
-    /* Reset the SERDES during init and when we have link. */
-    if(!pDevice->InitDone || Value32 & MAC_STATUS_PCS_SYNCED)
-    {
-        /* Set PLL lock range. */
-        LM_WritePhy(pDevice, 0x16, 0x8007);
-
-        /* Software reset. */
-        LM_WritePhy(pDevice, 0x00, 0x8000);
-
-        /* Wait for reset to complete. */
-        for(j = 0; j < 500; j++)
-        {
-            MM_Wait(10);
-        }
-
-        /* Config mode; seletct PMA/Ch 1 regs. */
-        LM_WritePhy(pDevice, 0x10, 0x8411);
-
-        /* Enable auto-lock and comdet, select txclk for tx. */
-        LM_WritePhy(pDevice, 0x11, 0x0a10);
-
-        LM_WritePhy(pDevice, 0x18, 0x00a0);
-        LM_WritePhy(pDevice, 0x16, 0x41ff);
-
-        /* Assert and deassert POR. */
-        LM_WritePhy(pDevice, 0x13, 0x0400);
-        MM_Wait(40);
-        LM_WritePhy(pDevice, 0x13, 0x0000);
-
-        LM_WritePhy(pDevice, 0x11, 0x0a50);
-        MM_Wait(40);
-        LM_WritePhy(pDevice, 0x11, 0x0a10);
-
-        /* Delay for signal to stabilize. */
-        for(j = 0; j < 15000; j++)
-        {
-            MM_Wait(10);
-        }
-
-        /* Deselect the channel register so we can read the PHY id later. */
-        LM_WritePhy(pDevice, 0x10, 0x8011);
-    }
-
-    return LM_STATUS_SUCCESS;
-}
-
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-STATIC LM_STATUS
-LM_SetupFiberPhy(
-    PLM_DEVICE_BLOCK pDevice)
-{
-    LM_STATUS CurrentLinkStatus;
-    AUTONEG_STATUS AnStatus = 0;
-    LM_UINT32 Value32;
-    LM_UINT32 Cnt;
-    LM_UINT32 j, k;
-    LM_UINT32 MacStatus, RemotePhyAd, LocalPhyAd;
-    LM_FLOW_CONTROL PreviousFlowControl = pDevice->FlowControl;
-
-    if (pDevice->LoopBackMode == LM_MAC_LOOP_BACK_MODE)
-    {
-        pDevice->LinkStatus = LM_STATUS_LINK_ACTIVE;
-        MM_IndicateStatus(pDevice, LM_STATUS_LINK_ACTIVE);
-        return LM_STATUS_SUCCESS;
-    }
-
-    if ((T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5704) &&
-        (pDevice->LinkStatus == LM_STATUS_LINK_ACTIVE) && pDevice->InitDone)
-    {
-        MacStatus = REG_RD(pDevice, MacCtrl.Status);
-        if ((MacStatus & (MAC_STATUS_PCS_SYNCED | MAC_STATUS_SIGNAL_DETECTED |
-            MAC_STATUS_CFG_CHANGED | MAC_STATUS_RECEIVING_CFG))
-            == (MAC_STATUS_PCS_SYNCED | MAC_STATUS_SIGNAL_DETECTED))
-        {
-      
-            REG_WR(pDevice, MacCtrl.Status, MAC_STATUS_SYNC_CHANGED |
-                MAC_STATUS_CFG_CHANGED);
-            return LM_STATUS_SUCCESS;
-        }
-    }
-    pDevice->MacMode &= ~(MAC_MODE_HALF_DUPLEX | MAC_MODE_PORT_MODE_MASK);
-
-    /* Initialize the send_config register. */
-    REG_WR(pDevice, MacCtrl.TxAutoNeg, 0);
-
-    /* Enable TBI and full duplex mode. */
-    pDevice->MacMode |= MAC_MODE_PORT_MODE_TBI;
-    REG_WR(pDevice, MacCtrl.Mode, pDevice->MacMode);
-
-    /* Initialize the BCM8002 SERDES PHY. */
-    switch(pDevice->PhyId & PHY_ID_MASK)
-    {
-        case PHY_BCM8002_PHY_ID:
-            LM_InitBcm800xPhy(pDevice);
-            break;
-
-        default:
-            break;
-    }
-
-    /* Enable link change interrupt. */
-    REG_WR(pDevice, MacCtrl.MacEvent, MAC_EVENT_ENABLE_LINK_STATE_CHANGED_ATTN);
-
-    /* Default to link down. */
-    CurrentLinkStatus = LM_STATUS_LINK_DOWN;
-
-    /* Get the link status. */
-    MacStatus = REG_RD(pDevice, MacCtrl.Status);
-
-    if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5704)
-    {
-        LM_UINT32 SgDigCtrl, SgDigStatus;
-        LM_UINT32 SerdesCfg = 0;
-        LM_UINT32 ExpectedSgDigCtrl = 0;
-        LM_UINT32 WorkAround = 0;
-        LM_UINT32 PortA = 1;
-
-        if ((pDevice->ChipRevId != T3_CHIP_ID_5704_A0) &&
-            (pDevice->ChipRevId != T3_CHIP_ID_5704_A1))
-        {
-            WorkAround = 1;
-            if (REG_RD(pDevice, PciCfg.DualMacCtrl) & T3_DUAL_MAC_ID)
-            {
-                PortA = 0;
-            }
-            /* preserve the voltage regulator bits */
-            SerdesCfg = REG_RD(pDevice, MacCtrl.SerdesCfg) &
-                (BIT_23 | BIT_22 | BIT_21 | BIT_20);
-        }
-        SgDigCtrl = REG_RD(pDevice, MacCtrl.SgDigControl);
-        if((pDevice->RequestedLineSpeed == LM_LINE_SPEED_AUTO) ||
-            (pDevice->DisableAutoNeg == FALSE))
-        {
-        
-            ExpectedSgDigCtrl = 0x81388400;
-            LocalPhyAd = GetPhyAdFlowCntrlSettings(pDevice);
-            if(LocalPhyAd & PHY_AN_AD_PAUSE_CAPABLE)
-            {
-                ExpectedSgDigCtrl |= BIT_11;
-            }
-            if(LocalPhyAd & PHY_AN_AD_ASYM_PAUSE)
-            {
-                ExpectedSgDigCtrl |= BIT_12;
-            }
-            if (SgDigCtrl != ExpectedSgDigCtrl)
-            {
-                if (WorkAround)
-                {
-                    REG_WR(pDevice, MacCtrl.SerdesCfg, 0xc011880 | SerdesCfg);
-                }
-                REG_WR(pDevice, MacCtrl.SgDigControl, ExpectedSgDigCtrl |
-                    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 |
-                MAC_STATUS_SIGNAL_DETECTED))
-            {
-                SgDigStatus = REG_RD(pDevice, MacCtrl.SgDigStatus);
-                if ((SgDigStatus & BIT_1) &&
-                    (MacStatus & MAC_STATUS_PCS_SYNCED))
-                {
-                    /* autoneg. completed */
-                    RemotePhyAd = 0;
-                    if(SgDigStatus & BIT_19)
-                    {
-                        RemotePhyAd |= PHY_LINK_PARTNER_PAUSE_CAPABLE;
-                    }
-
-                    if(SgDigStatus & BIT_20)
-                    {
-                        RemotePhyAd |= PHY_LINK_PARTNER_ASYM_PAUSE;
-                    }
-
-                    LM_SetFlowControl(pDevice, LocalPhyAd, RemotePhyAd);
-                    CurrentLinkStatus = LM_STATUS_LINK_ACTIVE;
-                    pDevice->AutoNegJustInited = FALSE;
-                }
-                else if (!(SgDigStatus & BIT_1))
-                {
-                    if (pDevice->AutoNegJustInited == TRUE)
-                    {
-                        /* we may be checking too soon, so check again */
-                        /* at the next poll interval */
-                        pDevice->AutoNegJustInited = FALSE;
-                    }
-                    else
-                    {
-                        /* autoneg. failed */
-                        if (WorkAround)
-                        {
-                            if (PortA)
-                            {
-                                REG_WR(pDevice, MacCtrl.SerdesCfg,
-                                    0xc010880 | SerdesCfg);
-                            }
-                            else
-                            {
-                                REG_WR(pDevice, MacCtrl.SerdesCfg,
-                                    0x4010880 | SerdesCfg);
-                            }
-                        }
-                        /* 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;
-                        }
-                    }
-                }
-            }
-        }
-        else
-        {
-            if (SgDigCtrl & BIT_31) {
-                if (WorkAround)
-                {
-                    if (PortA)
-                    {
-                        REG_WR(pDevice, MacCtrl.SerdesCfg,
-                            0xc010880 | SerdesCfg);
-                    }
-                    else
-                    {
-                        REG_WR(pDevice, MacCtrl.SerdesCfg,
-                            0x4010880 | SerdesCfg);
-                    }
-                }
-                REG_WR(pDevice, MacCtrl.SgDigControl, 0x01388400);
-            }
-            if(MacStatus & MAC_STATUS_PCS_SYNCED)
-            {
-                LM_SetFlowControl(pDevice, 0, 0);
-                CurrentLinkStatus = LM_STATUS_LINK_ACTIVE;
-            }
-        }
-    }
-    else if(MacStatus & MAC_STATUS_PCS_SYNCED)
-    {
-        if((pDevice->RequestedLineSpeed == LM_LINE_SPEED_AUTO) ||
-            (pDevice->DisableAutoNeg == FALSE))
-        {
-            /* auto-negotiation mode. */
-            /* Initialize the autoneg default capaiblities. */
-            AutonegInit(&pDevice->AnInfo);
-
-            /* Set the context pointer to point to the main device structure. */
-            pDevice->AnInfo.pContext = pDevice;
-
-            /* Setup flow control advertisement register. */
-            Value32 = GetPhyAdFlowCntrlSettings(pDevice);
-            if(Value32 & PHY_AN_AD_PAUSE_CAPABLE)
-            {
-                pDevice->AnInfo.mr_adv_sym_pause = 1;
-            }
-            else
-            {
-                pDevice->AnInfo.mr_adv_sym_pause = 0;
-            }
-
-            if(Value32 & PHY_AN_AD_ASYM_PAUSE)
-            {
-                pDevice->AnInfo.mr_adv_asym_pause = 1;
-            }
-            else
-            {
-                pDevice->AnInfo.mr_adv_asym_pause = 0;
-            }
-
-            /* Try to autoneg up to six times. */
-            if (pDevice->IgnoreTbiLinkChange)
-            {
-                Cnt = 1;
-            }
-            else
-            {
-                Cnt = 6;
-            }
-            for (j = 0; j < Cnt; j++)
-            {
-                REG_WR(pDevice, MacCtrl.TxAutoNeg, 0);
-
-                Value32 = pDevice->MacMode & ~MAC_MODE_PORT_MODE_MASK;
-                REG_WR(pDevice, MacCtrl.Mode, Value32);
-                MM_Wait(20);
-
-                REG_WR(pDevice, MacCtrl.Mode, pDevice->MacMode |
-                    MAC_MODE_SEND_CONFIGS);
-
-                MM_Wait(20);
-
-                pDevice->AnInfo.State = AN_STATE_UNKNOWN;
-                pDevice->AnInfo.CurrentTime_us = 0;
-
-                REG_WR(pDevice, Grc.Timer, 0);
-                for(k = 0; (pDevice->AnInfo.CurrentTime_us < 75000) &&
-                    (k < 75000); k++)
-                {
-                    AnStatus = Autoneg8023z(&pDevice->AnInfo);
-
-                    if((AnStatus == AUTONEG_STATUS_DONE) || 
-                        (AnStatus == AUTONEG_STATUS_FAILED))
-                    {
-                        break;
-                    }
-
-                    pDevice->AnInfo.CurrentTime_us = REG_RD(pDevice, Grc.Timer);
-                
-                }
-                if((AnStatus == AUTONEG_STATUS_DONE) || 
-                    (AnStatus == AUTONEG_STATUS_FAILED))
-                {
-                    break;
-                }
-                if (j >= 1)
-                {
-                    if (!(REG_RD(pDevice, MacCtrl.Status) &
-                        MAC_STATUS_PCS_SYNCED)) {
-                        break;
-                    }
-                }
-            }
-
-            /* Stop sending configs. */
-            MM_AnTxIdle(&pDevice->AnInfo);
-
-            /* Resolve flow control settings. */
-            if((AnStatus == AUTONEG_STATUS_DONE) &&
-                pDevice->AnInfo.mr_an_complete && pDevice->AnInfo.mr_link_ok &&
-                pDevice->AnInfo.mr_lp_adv_full_duplex)
-                {
-                LM_UINT32 RemotePhyAd;
-                LM_UINT32 LocalPhyAd;
-
-                LocalPhyAd = 0;
-                if(pDevice->AnInfo.mr_adv_sym_pause)
-                {
-                    LocalPhyAd |= PHY_AN_AD_PAUSE_CAPABLE;
-                }
-
-                if(pDevice->AnInfo.mr_adv_asym_pause)
-                {
-                    LocalPhyAd |= PHY_AN_AD_ASYM_PAUSE;
-                }
-
-                RemotePhyAd = 0;
-                if(pDevice->AnInfo.mr_lp_adv_sym_pause)
-                {
-                    RemotePhyAd |= PHY_LINK_PARTNER_PAUSE_CAPABLE;
-                }
-
-                if(pDevice->AnInfo.mr_lp_adv_asym_pause)
-                {
-                    RemotePhyAd |= PHY_LINK_PARTNER_ASYM_PAUSE;
-                }
-
-                LM_SetFlowControl(pDevice, LocalPhyAd, RemotePhyAd);
-
-                CurrentLinkStatus = LM_STATUS_LINK_ACTIVE;
-            }
-            else
-            {
-                LM_SetFlowControl(pDevice, 0, 0);
-            }
-            for (j = 0; j < 30; j++)
-            {
-                MM_Wait(20);
-                REG_WR(pDevice, MacCtrl.Status, MAC_STATUS_SYNC_CHANGED |
-                    MAC_STATUS_CFG_CHANGED);
-                MM_Wait(20);
-                if ((REG_RD(pDevice, MacCtrl.Status) &
-                    (MAC_STATUS_SYNC_CHANGED | MAC_STATUS_CFG_CHANGED)) == 0)
-                    break;
-            }
-            if (pDevice->PollTbiLink)
-            {
-                Value32 = REG_RD(pDevice, MacCtrl.Status);
-                if (Value32 & MAC_STATUS_RECEIVING_CFG)
-                {
-                    pDevice->IgnoreTbiLinkChange = TRUE;
-                }
-                else if (pDevice->NoTbiInterrupt == FALSE)
-                {
-                    pDevice->IgnoreTbiLinkChange = FALSE;
-                }
-            }
-            Value32 = REG_RD(pDevice, MacCtrl.Status);
-            if (CurrentLinkStatus == LM_STATUS_LINK_DOWN &&
-                 (Value32 & MAC_STATUS_PCS_SYNCED) &&
-                 ((Value32 & MAC_STATUS_RECEIVING_CFG) == 0))
-            {
-                CurrentLinkStatus = LM_STATUS_LINK_ACTIVE;
-            }
-        }
-        else
-        {
-            /* We are forcing line speed. */
-            pDevice->FlowControlCap &= ~LM_FLOW_CONTROL_AUTO_PAUSE;
-            LM_SetFlowControl(pDevice, 0, 0);
-
-            CurrentLinkStatus = LM_STATUS_LINK_ACTIVE;
-            REG_WR(pDevice, MacCtrl.Mode, pDevice->MacMode |
-                MAC_MODE_SEND_CONFIGS);
-        }
-    }
-    /* Set the link polarity bit. */
-    pDevice->MacMode &= ~MAC_MODE_LINK_POLARITY;
-    REG_WR(pDevice, MacCtrl.Mode, pDevice->MacMode);
-
-    pDevice->pStatusBlkVirt->Status = STATUS_BLOCK_UPDATED |
-        (pDevice->pStatusBlkVirt->Status & ~STATUS_BLOCK_LINK_CHANGED_STATUS);
-
-    for (j = 0; j < 100; j++)
-    {
-        REG_WR(pDevice, MacCtrl.Status, MAC_STATUS_SYNC_CHANGED |
-            MAC_STATUS_CFG_CHANGED);
-        MM_Wait(5);
-        if ((REG_RD(pDevice, MacCtrl.Status) &
-            (MAC_STATUS_SYNC_CHANGED | MAC_STATUS_CFG_CHANGED)) == 0)
-            break;
-    }
-
-    Value32 = REG_RD(pDevice, MacCtrl.Status);
-    if((Value32 & MAC_STATUS_PCS_SYNCED) == 0)
-    {
-        CurrentLinkStatus = LM_STATUS_LINK_DOWN;
-        if (pDevice->DisableAutoNeg == FALSE)
-        {
-            REG_WR(pDevice, MacCtrl.Mode, pDevice->MacMode |
-                MAC_MODE_SEND_CONFIGS);
-            MM_Wait(1);
-            REG_WR(pDevice, MacCtrl.Mode, pDevice->MacMode);
-        }
-    }
-
-    Value32 = REG_RD(pDevice, MacCtrl.LedCtrl) & (LED_CTRL_PHY_MODE_1 |
-        LED_CTRL_PHY_MODE_2);
-    /* Initialize the current link status. */
-    if(CurrentLinkStatus == LM_STATUS_LINK_ACTIVE)
-    {
-        pDevice->LineSpeed = LM_LINE_SPEED_1000MBPS;
-        pDevice->DuplexMode = LM_DUPLEX_MODE_FULL;
-        REG_WR(pDevice, MacCtrl.LedCtrl, LED_CTRL_OVERRIDE_LINK_LED |
-            LED_CTRL_1000MBPS_LED_ON | Value32);
-    }
-    else
-    {
-        pDevice->LineSpeed = LM_LINE_SPEED_UNKNOWN;
-        pDevice->DuplexMode = LM_DUPLEX_MODE_UNKNOWN;
-        REG_WR(pDevice, MacCtrl.LedCtrl, LED_CTRL_OVERRIDE_LINK_LED |
-            LED_CTRL_OVERRIDE_TRAFFIC_LED | Value32);
-    }
-
-    /* Indicate link status. */
-    if ((pDevice->LinkStatus != CurrentLinkStatus) ||
-        ((CurrentLinkStatus == LM_STATUS_LINK_ACTIVE) &&
-        (PreviousFlowControl != pDevice->FlowControl)))
-    {
-        pDevice->LinkStatus = CurrentLinkStatus;
-        MM_IndicateStatus(pDevice, CurrentLinkStatus);
-    }
-
-    return LM_STATUS_SUCCESS;
-}
-#endif /* INCLUDE_TBI_SUPPORT */
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-LM_STATUS
-LM_SetupCopperPhy(
-    PLM_DEVICE_BLOCK pDevice)
-{
-    LM_STATUS CurrentLinkStatus;
-    LM_UINT32 Value32;
-
-    /* Assume there is not link first. */
-    CurrentLinkStatus = LM_STATUS_LINK_DOWN;
-
-    /* Disable phy link change attention. */
-    REG_WR(pDevice, MacCtrl.MacEvent, 0);
-
-    /* Clear link change attention. */
-    REG_WR(pDevice, MacCtrl.Status, MAC_STATUS_SYNC_CHANGED |
-        MAC_STATUS_CFG_CHANGED | MAC_STATUS_MI_COMPLETION |
-        MAC_STATUS_LINK_STATE_CHANGED);
-
-    /* Disable auto-polling for the moment. */
-    pDevice->MiMode = 0xc0000;
-    REG_WR(pDevice, MacCtrl.MiMode, pDevice->MiMode);
-    MM_Wait(40);
-
-    /* Determine the requested line speed and duplex. */
-    pDevice->OldLineSpeed = pDevice->LineSpeed;
-    pDevice->LineSpeed = pDevice->RequestedLineSpeed;
-    pDevice->DuplexMode = pDevice->RequestedDuplexMode;
-
-    /* Set the phy to loopback mode. */
-    if ((pDevice->LoopBackMode == LM_PHY_LOOP_BACK_MODE) ||
-        (pDevice->LoopBackMode == LM_MAC_LOOP_BACK_MODE))
-    {
-        LM_ReadPhy(pDevice, PHY_CTRL_REG, &Value32);
-        if(!(Value32 & PHY_CTRL_LOOPBACK_MODE) &&
-            (pDevice->LoopBackMode == LM_PHY_LOOP_BACK_MODE))
-        {
-            /* Disable link change and PHY interrupts. */
-            REG_WR(pDevice, MacCtrl.MacEvent, 0);
-
-            /* Clear link change attention. */
-            REG_WR(pDevice, MacCtrl.Status, MAC_STATUS_SYNC_CHANGED |
-                MAC_STATUS_CFG_CHANGED);
-
-            LM_WritePhy(pDevice, PHY_CTRL_REG, 0x4140);
-            MM_Wait(40);
-
-            pDevice->MacMode &= ~MAC_MODE_LINK_POLARITY;
-            if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701 ||
-                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 ||
-                (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700 &&
-                (pDevice->PhyId & PHY_ID_MASK) == PHY_BCM5411_PHY_ID))
-            {
-                pDevice->MacMode |= MAC_MODE_LINK_POLARITY;
-            }
-
-            /* Prevent the interrupt handling from being called. */
-            pDevice->pStatusBlkVirt->Status = STATUS_BLOCK_UPDATED |
-                (pDevice->pStatusBlkVirt->Status &
-                ~STATUS_BLOCK_LINK_CHANGED_STATUS);
-
-            /* GMII interface. */
-            pDevice->MacMode &= ~MAC_MODE_PORT_MODE_MASK;
-            pDevice->MacMode |= MAC_MODE_PORT_MODE_GMII;
-            REG_WR(pDevice, MacCtrl.Mode, pDevice->MacMode);
-            MM_Wait(40);
-
-            /* Configure PHY led mode. */
-            if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701 ||
-                (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700))
-            {
-                LM_WritePhy(pDevice, BCM540X_EXT_CTRL_REG, 
-                    BCM540X_EXT_CTRL_LINK3_LED_MODE);
-                MM_Wait(40);
-            }
-
-            if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700)
-            {
-                int j = 0;
-
-                while (REG_RD(pDevice, DmaWrite.Mode) & DMA_WRITE_MODE_ENABLE)
-                {
-                    MM_Wait(40);
-                    j++;
-                    if (j > 20)
-                        break;
-                }
-
-                Value32 = DMA_WRITE_MODE_ENABLE |
-                    DMA_WRITE_MODE_TARGET_ABORT_ATTN_ENABLE |
-                    DMA_WRITE_MODE_MASTER_ABORT_ATTN_ENABLE |
-                    DMA_WRITE_MODE_PARITY_ERROR_ATTN_ENABLE |
-                    DMA_WRITE_MODE_ADDR_OVERFLOW_ATTN_ENABLE |
-                    DMA_WRITE_MODE_FIFO_OVERRUN_ATTN_ENABLE |
-                    DMA_WRITE_MODE_FIFO_UNDERRUN_ATTN_ENABLE |
-                    DMA_WRITE_MODE_FIFO_OVERREAD_ATTN_ENABLE |
-                    DMA_WRITE_MODE_LONG_READ_ATTN_ENABLE;
-                REG_WR(pDevice, DmaWrite.Mode, Value32);
-            }
-        }
-
-        pDevice->LinkStatus = LM_STATUS_LINK_ACTIVE;
-        MM_IndicateStatus(pDevice, LM_STATUS_LINK_ACTIVE);
-
-        return LM_STATUS_SUCCESS;
-    }
-
-    LM_ReadPhy(pDevice, PHY_CTRL_REG, &Value32);
-    if(Value32 & PHY_CTRL_LOOPBACK_MODE)
-    {
-        CurrentLinkStatus = LM_STATUS_LINK_DOWN;
-
-        /* Re-enable link change interrupt.  This was disabled when we */
-        /* enter loopback mode. */
-        if(pDevice->PhyIntMode == T3_PHY_INT_MODE_MI_INTERRUPT)
-        {
-            REG_WR(pDevice, MacCtrl.MacEvent, MAC_EVENT_ENABLE_MI_INTERRUPT);
-        }
-        else
-        {
-            REG_WR(pDevice, MacCtrl.MacEvent, 
-                MAC_EVENT_ENABLE_LINK_STATE_CHANGED_ATTN);
-        }
-    }
-    else
-    {
-        /* Initialize the phy chip. */
-        CurrentLinkStatus = LM_InitBcm540xPhy(pDevice);
-    }
-
-    if(CurrentLinkStatus == LM_STATUS_LINK_SETTING_MISMATCH)
-    {
-        CurrentLinkStatus = LM_STATUS_LINK_DOWN;
-    }
-    
-    /* Setup flow control. */
-    pDevice->FlowControl = LM_FLOW_CONTROL_NONE;
-    if(CurrentLinkStatus == LM_STATUS_LINK_ACTIVE)
-    {
-        LM_FLOW_CONTROL FlowCap;     /* Flow control capability. */
-
-        FlowCap = LM_FLOW_CONTROL_NONE;
-
-        if(pDevice->DuplexMode == LM_DUPLEX_MODE_FULL)
-        {
-            if(pDevice->DisableAutoNeg == FALSE ||
-                pDevice->RequestedLineSpeed == LM_LINE_SPEED_AUTO)
-            {
-                LM_UINT32 ExpectedPhyAd;
-                LM_UINT32 LocalPhyAd;
-                LM_UINT32 RemotePhyAd;
-
-                LM_ReadPhy(pDevice, PHY_AN_AD_REG, &LocalPhyAd);
-		pDevice->advertising = LocalPhyAd;
-                LocalPhyAd &= (PHY_AN_AD_ASYM_PAUSE | PHY_AN_AD_PAUSE_CAPABLE);
-
-                ExpectedPhyAd = GetPhyAdFlowCntrlSettings(pDevice);
-
-                if(LocalPhyAd != ExpectedPhyAd)
-                {
-                    CurrentLinkStatus = LM_STATUS_LINK_DOWN;
-                }
-                else
-                {
-                    LM_ReadPhy(pDevice, PHY_LINK_PARTNER_ABILITY_REG,
-                        &RemotePhyAd);
-
-                    LM_SetFlowControl(pDevice, LocalPhyAd, RemotePhyAd);
-                }
-            }
-            else
-            {
-                pDevice->FlowControlCap &= ~LM_FLOW_CONTROL_AUTO_PAUSE;
-                LM_SetFlowControl(pDevice, 0, 0);
-            }
-        }
-    }
-
-    if(CurrentLinkStatus == LM_STATUS_LINK_DOWN)
-    {
-        LM_ForceAutoNeg(pDevice);
-
-        /* If we force line speed, we make get link right away. */
-        LM_ReadPhy(pDevice, PHY_STATUS_REG, &Value32);
-        LM_ReadPhy(pDevice, PHY_STATUS_REG, &Value32);
-        if(Value32 & PHY_STATUS_LINK_PASS)
-        {
-            CurrentLinkStatus = LM_STATUS_LINK_ACTIVE;
-        }
-    }
-
-    /* GMII interface. */
-    pDevice->MacMode &= ~MAC_MODE_PORT_MODE_MASK;
-    if(CurrentLinkStatus == LM_STATUS_LINK_ACTIVE)
-    {
-        if(pDevice->LineSpeed == LM_LINE_SPEED_100MBPS ||
-            pDevice->LineSpeed == LM_LINE_SPEED_10MBPS)
-        {
-            pDevice->MacMode |= MAC_MODE_PORT_MODE_MII;
-        }
-        else
-        {
-            pDevice->MacMode |= MAC_MODE_PORT_MODE_GMII;
-        }
-    }
-    else {
-        pDevice->MacMode |= MAC_MODE_PORT_MODE_GMII;
-    }
-
-    /* Set the MAC to operate in the appropriate duplex mode. */
-    pDevice->MacMode &= ~MAC_MODE_HALF_DUPLEX;
-    if(pDevice->DuplexMode == LM_DUPLEX_MODE_HALF)
-    {
-        pDevice->MacMode |= MAC_MODE_HALF_DUPLEX;
-    }
-
-    /* Set the link polarity bit. */
-    pDevice->MacMode &= ~MAC_MODE_LINK_POLARITY;
-    if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700)
-    {
-        if((pDevice->LedMode == LED_MODE_LINK10) ||
-             (CurrentLinkStatus == LM_STATUS_LINK_ACTIVE &&
-             pDevice->LineSpeed == LM_LINE_SPEED_10MBPS))
-        {
-            pDevice->MacMode |= MAC_MODE_LINK_POLARITY;
-        }
-    }
-    else
-    {
-        if (CurrentLinkStatus == LM_STATUS_LINK_ACTIVE)
-        {
-            pDevice->MacMode |= MAC_MODE_LINK_POLARITY;
-        }
-
-        /* Set LED mode. */
-        if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700 ||
-            T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701)
-        {
-            Value32 = LED_CTRL_PHY_MODE_1;
-        }
-        else
-        {
-            if(pDevice->LedMode == LED_MODE_OUTPUT)
-            {
-                Value32 = LED_CTRL_PHY_MODE_2;
-            }
-            else
-            {
-                Value32 = LED_CTRL_PHY_MODE_1;
-            }
-        }
-        REG_WR(pDevice, MacCtrl.LedCtrl, Value32);
-    }
-
-    REG_WR(pDevice, MacCtrl.Mode, pDevice->MacMode);
-
-    /* Enable auto polling. */
-    if(pDevice->PhyIntMode == T3_PHY_INT_MODE_AUTO_POLLING)
-    {
-        pDevice->MiMode |= MI_MODE_AUTO_POLLING_ENABLE;
-        REG_WR(pDevice, MacCtrl.MiMode, pDevice->MiMode);
-    }
-
-    /* Enable phy link change attention. */
-    if(pDevice->PhyIntMode == T3_PHY_INT_MODE_MI_INTERRUPT)
-    {
-        REG_WR(pDevice, MacCtrl.MacEvent, MAC_EVENT_ENABLE_MI_INTERRUPT);
-    }
-    else
-    {
-        REG_WR(pDevice, MacCtrl.MacEvent, 
-            MAC_EVENT_ENABLE_LINK_STATE_CHANGED_ATTN);
-    }
-    if ((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700) &&
-        (CurrentLinkStatus == LM_STATUS_LINK_ACTIVE) &&
-        (pDevice->LineSpeed == LM_LINE_SPEED_1000MBPS) &&
-        (((pDevice->PciState & T3_PCI_STATE_CONVENTIONAL_PCI_MODE) &&
-          (pDevice->PciState & T3_PCI_STATE_BUS_SPEED_HIGH)) ||
-         !(pDevice->PciState & T3_PCI_STATE_CONVENTIONAL_PCI_MODE)))
-    {
-        MM_Wait(120);
-        REG_WR(pDevice, MacCtrl.Status, MAC_STATUS_SYNC_CHANGED |
-            MAC_STATUS_CFG_CHANGED);
-        MEM_WR_OFFSET(pDevice, T3_FIRMWARE_MAILBOX,
-            T3_MAGIC_NUM_DISABLE_DMAW_ON_LINK_CHANGE);
-    }
-
-    /* Indicate link status. */
-    if (pDevice->LinkStatus != CurrentLinkStatus) {
-        pDevice->LinkStatus = CurrentLinkStatus;
-        MM_IndicateStatus(pDevice, CurrentLinkStatus);
-    }
-
-    return LM_STATUS_SUCCESS;
-} /* LM_SetupCopperPhy */
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-LM_STATUS
-LM_SetupPhy(
-    PLM_DEVICE_BLOCK pDevice)
-{
-    LM_STATUS LmStatus;
-    LM_UINT32 Value32;
-
-#if INCLUDE_TBI_SUPPORT
-    if(pDevice->EnableTbi)
-    {
-        LmStatus = LM_SetupFiberPhy(pDevice);
-    }
-    else
-#endif /* INCLUDE_TBI_SUPPORT */
-    {
-        LmStatus = LM_SetupCopperPhy(pDevice);
-    }
-    if (pDevice->ChipRevId == T3_CHIP_ID_5704_A0)
-    {
-        if (!(pDevice->PciState & T3_PCI_STATE_CONVENTIONAL_PCI_MODE))
-        {
-            Value32 = REG_RD(pDevice, PciCfg.PciState);
-            REG_WR(pDevice, PciCfg.PciState,
-                Value32 | T3_PCI_STATE_RETRY_SAME_DMA);
-        }
-    }
-    if ((pDevice->LineSpeed == LM_LINE_SPEED_1000MBPS) &&
-        (pDevice->DuplexMode == LM_DUPLEX_MODE_HALF))
-    {
-        REG_WR(pDevice, MacCtrl.TxLengths, 0x26ff);
-    }
-    else
-    {
-        REG_WR(pDevice, MacCtrl.TxLengths, 0x2620);
-    }
-    if (pDevice->LinkStatus == LM_STATUS_LINK_DOWN)
-    {
-        REG_WR(pDevice, HostCoalesce.StatsCoalescingTicks, 0);
-    }
-    else
-    {
-        REG_WR(pDevice, HostCoalesce.StatsCoalescingTicks,
-            pDevice->StatsCoalescingTicks);
-    }
-
-    return LmStatus;
-}
-
-
-/* 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;
-
-    if (pDevice->PhyFlags & PHY_CHECK_TAPS_AFTER_RESET)
-    {
-        LM_ResetPhy_5703_4_5(pDevice, 5, 1);
-    }
-    else
-    {
-        LM_WritePhy(pDevice, PHY_CTRL_REG, PHY_CTRL_PHY_RESET);
-
-        for(j = 0; j < 100; j++)
-        {
-            MM_Wait(10);
-
-            LM_ReadPhy(pDevice, PHY_CTRL_REG, &miireg);
-            if(miireg && !(miireg & PHY_CTRL_PHY_RESET))
-            {
-                MM_Wait(20);
-                break;
-            }
-        }
-    }
-    if (pDevice->PhyFlags & PHY_ADC_FIX)
-    {
-        LM_WritePhy(pDevice, 0x18, 0x0c00);
-        LM_WritePhy(pDevice, 0x17, 0x201f);
-        LM_WritePhy(pDevice, 0x15, 0x2aaa);
-        LM_WritePhy(pDevice, 0x17, 0x000a);
-        LM_WritePhy(pDevice, 0x15, 0x0323);
-        LM_WritePhy(pDevice, 0x18, 0x0400);
-    }
-    if (pDevice->PhyFlags & PHY_5704_A0_FIX)
-    {
-        LM_WritePhy(pDevice, 0x1c, 0x8d68);
-        LM_WritePhy(pDevice, 0x1c, 0x8d68);
-    }
-    LM_SetEthWireSpeed(pDevice);
-}
-
-STATIC LM_VOID
-LM_SetEthWireSpeed(LM_DEVICE_BLOCK *pDevice)
-{
-    LM_UINT32 Value32;
-
-    /* Enable Ethernet@WireSpeed. */
-    if (pDevice->PhyFlags & PHY_ETHERNET_WIRESPEED)
-    {
-        LM_WritePhy(pDevice, 0x18, 0x7007);
-        LM_ReadPhy(pDevice, 0x18, &Value32);
-        LM_WritePhy(pDevice, 0x18, Value32 | BIT_15 | BIT_4);
-    }
-}
-
-STATIC LM_STATUS
-LM_PhyAdvertiseAll(LM_DEVICE_BLOCK *pDevice)
-{
-    LM_UINT32 miireg;
-
-    LM_ReadPhy(pDevice, PHY_AN_AD_REG, &miireg);
-    pDevice->advertising = miireg;
-    if ((miireg & PHY_AN_AD_ALL_SPEEDS) != PHY_AN_AD_ALL_SPEEDS)
-    {
-        return LM_STATUS_FAILURE;
-    }
-    if(!pDevice->No1000)
-    {
-        LM_ReadPhy(pDevice, BCM540X_1000BASET_CTRL_REG, &miireg);
-        pDevice->advertising1000 = miireg;
-        if ((miireg & BCM540X_AN_AD_ALL_1G_SPEEDS) !=
-            BCM540X_AN_AD_ALL_1G_SPEEDS)
-        {
-            return LM_STATUS_FAILURE;
-        }
-    }
-    return LM_STATUS_SUCCESS;
-}
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-LM_VOID
-LM_ReadPhy(
-PLM_DEVICE_BLOCK pDevice,
-LM_UINT32 PhyReg,
-PLM_UINT32 pData32) {
-    LM_UINT32 Value32;
-    LM_UINT32 j;
-
-    if(pDevice->PhyIntMode == T3_PHY_INT_MODE_AUTO_POLLING)
-    {
-        REG_WR(pDevice, MacCtrl.MiMode, pDevice->MiMode &
-            ~MI_MODE_AUTO_POLLING_ENABLE);
-        MM_Wait(40);
-    }
-
-    Value32 = (pDevice->PhyAddr << MI_COM_FIRST_PHY_ADDR_BIT) |
-        ((PhyReg & MI_COM_PHY_REG_ADDR_MASK) << MI_COM_FIRST_PHY_REG_ADDR_BIT) |
-        MI_COM_CMD_READ | MI_COM_START;
-
-    REG_WR(pDevice, MacCtrl.MiCom, Value32);
-    
-    for(j = 0; j < 200; j++)
-    {
-        MM_Wait(1);
-
-        Value32 = REG_RD(pDevice, MacCtrl.MiCom);
-
-        if(!(Value32 & MI_COM_BUSY))
-        {
-            MM_Wait(5);
-            Value32 = REG_RD(pDevice, MacCtrl.MiCom);
-            Value32 &= MI_COM_PHY_DATA_MASK;
-            break;
-        }
-    }
-
-    if(Value32 & MI_COM_BUSY)
-    {
-        Value32 = 0;
-    }
-
-    *pData32 = Value32;
-
-    if(pDevice->PhyIntMode == T3_PHY_INT_MODE_AUTO_POLLING)
-    {
-        REG_WR(pDevice, MacCtrl.MiMode, pDevice->MiMode);
-        MM_Wait(40);
-    }
-} /* LM_ReadPhy */
-
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-LM_VOID
-LM_WritePhy(
-PLM_DEVICE_BLOCK pDevice,
-LM_UINT32 PhyReg,
-LM_UINT32 Data32) {
-    LM_UINT32 Value32;
-    LM_UINT32 j;
-
-    if(pDevice->PhyIntMode == T3_PHY_INT_MODE_AUTO_POLLING)
-    {
-        REG_WR(pDevice, MacCtrl.MiMode, pDevice->MiMode &
-            ~MI_MODE_AUTO_POLLING_ENABLE);
-        MM_Wait(40);
-    }
-
-    Value32 = (pDevice->PhyAddr << MI_COM_FIRST_PHY_ADDR_BIT) |
-        ((PhyReg & MI_COM_PHY_REG_ADDR_MASK) << MI_COM_FIRST_PHY_REG_ADDR_BIT) |
-        (Data32 & MI_COM_PHY_DATA_MASK) | MI_COM_CMD_WRITE | MI_COM_START;
-
-    REG_WR(pDevice, MacCtrl.MiCom, Value32);
-    
-    for(j = 0; j < 200; j++)
-    {
-        MM_Wait(1);
-
-        Value32 = REG_RD(pDevice, MacCtrl.MiCom);
-
-        if(!(Value32 & MI_COM_BUSY))
-        {
-            MM_Wait(5);
-            break;
-        }
-    }
-
-    if(pDevice->PhyIntMode == T3_PHY_INT_MODE_AUTO_POLLING)
-    {
-        REG_WR(pDevice, MacCtrl.MiMode, pDevice->MiMode);
-        MM_Wait(40);
-    }
-} /* LM_WritePhy */
-
-LM_STATUS
-LM_EnableMacLoopBack(PLM_DEVICE_BLOCK pDevice)
-{
-    pDevice->LoopBackMode = LM_MAC_LOOP_BACK_MODE;
-    pDevice->MacMode &= ~MAC_MODE_PORT_MODE_MASK;
-    pDevice->MacMode |= MAC_MODE_PORT_INTERNAL_LOOPBACK |
-        MAC_MODE_LINK_POLARITY | MAC_MODE_PORT_MODE_GMII;
-    REG_WR(pDevice, MacCtrl.Mode, pDevice->MacMode);
-    LM_SetupPhy(pDevice);
-    return LM_STATUS_SUCCESS;
-}
-
-LM_STATUS
-LM_DisableMacLoopBack(PLM_DEVICE_BLOCK pDevice)
-{
-    pDevice->LoopBackMode = 0;
-    pDevice->MacMode &= ~(MAC_MODE_PORT_INTERNAL_LOOPBACK |
-        MAC_MODE_LINK_POLARITY | MAC_MODE_PORT_MODE_MASK);
-    REG_WR(pDevice, MacCtrl.Mode, pDevice->MacMode);
-    LM_SetupPhy(pDevice);
-    return LM_STATUS_SUCCESS;
-}
-
-LM_STATUS
-LM_EnablePhyLoopBack(PLM_DEVICE_BLOCK pDevice)
-{
-    pDevice->LoopBackMode = LM_PHY_LOOP_BACK_MODE;
-    LM_SetupPhy(pDevice);
-    return LM_STATUS_SUCCESS;
-}
-
-LM_STATUS
-LM_DisablePhyLoopBack(PLM_DEVICE_BLOCK pDevice)
-{
-    pDevice->LoopBackMode = 0;
-    LM_SetupPhy(pDevice);
-    return LM_STATUS_SUCCESS;
-}
-
-LM_STATUS
-LM_EnableExtLoopBack(PLM_DEVICE_BLOCK pDevice, LM_LINE_SPEED LineSpeed)
-{
-    pDevice->LoopBackMode = LM_EXT_LOOP_BACK_MODE;
-
-    pDevice->SavedDisableAutoNeg = pDevice->DisableAutoNeg;
-    pDevice->SavedRequestedLineSpeed = pDevice->RequestedLineSpeed;
-    pDevice->SavedRequestedDuplexMode = pDevice->RequestedDuplexMode;
-
-    pDevice->DisableAutoNeg = TRUE;
-    pDevice->RequestedLineSpeed = LineSpeed;
-    pDevice->RequestedDuplexMode = LM_DUPLEX_MODE_FULL;
-    LM_SetupPhy(pDevice);
-    return LM_STATUS_SUCCESS;
-}
-
-LM_STATUS
-LM_DisableExtLoopBack(PLM_DEVICE_BLOCK pDevice)
-{
-    pDevice->LoopBackMode = 0;
-
-    pDevice->DisableAutoNeg = pDevice->SavedDisableAutoNeg;
-    pDevice->RequestedLineSpeed = pDevice->SavedRequestedLineSpeed;
-    pDevice->RequestedDuplexMode = pDevice->SavedRequestedDuplexMode;
-
-    LM_SetupPhy(pDevice);
-    return LM_STATUS_SUCCESS;
-}
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-LM_STATUS
-LM_SetPowerState(
-PLM_DEVICE_BLOCK pDevice,
-LM_POWER_STATE PowerLevel)
-{
-#ifdef BCM_WOL
-    LM_UINT32 PmeSupport;
-    PLM_DEVICE_BLOCK pDevice2 = 0;
-    int j;
-#endif
-    LM_UINT32 Value32;
-    LM_UINT32 PmCtrl;
-
-    /* make sureindirect accesses are enabled*/
-    MM_WriteConfig32(pDevice, T3_PCI_MISC_HOST_CTRL_REG, pDevice->MiscHostCtrl);
-
-    /* Clear the PME_ASSERT bit and the power state bits.  Also enable */
-    /* the PME bit. */
-    MM_ReadConfig32(pDevice, T3_PCI_PM_STATUS_CTRL_REG, &PmCtrl);
-
-    PmCtrl |= T3_PM_PME_ASSERTED;
-    PmCtrl &= ~T3_PM_POWER_STATE_MASK;
-
-    /* Set the appropriate power state. */
-    if(PowerLevel == LM_POWER_STATE_D0)
-    {
-
-        /* Bring the card out of low power mode. */
-        PmCtrl |= T3_PM_POWER_STATE_D0;
-        MM_WriteConfig32(pDevice, T3_PCI_PM_STATUS_CTRL_REG, PmCtrl);
-
-        Value32 = REG_RD(pDevice, Grc.LocalCtrl);
-        REG_WR(pDevice, Grc.LocalCtrl, Value32 &
-            ~(GRC_MISC_LOCAL_CTRL_GPIO_OE0 | 
-              GRC_MISC_LOCAL_CTRL_GPIO_OE1 |
-              GRC_MISC_LOCAL_CTRL_GPIO_OE2 |
-              GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT0 |
-              GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT1 |
-              GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT2));
-
-        MM_Wait(40);    /* Required delay is about 20us. */
-
-        pDevice->PowerLevel = PowerLevel;
-        return LM_STATUS_SUCCESS;
-    }
-#ifdef BCM_WOL
-    else if(PowerLevel == LM_POWER_STATE_D1)
-    {
-        PmCtrl |= T3_PM_POWER_STATE_D1;
-    }
-    else if(PowerLevel == LM_POWER_STATE_D2)
-    {
-        PmCtrl |= T3_PM_POWER_STATE_D2;
-    }
-    else if(PowerLevel == LM_POWER_STATE_D3)
-    {
-        PmCtrl |= T3_PM_POWER_STATE_D3;
-    }
-    else
-    {
-        return LM_STATUS_FAILURE;
-    }
-    PmCtrl |= T3_PM_PME_ENABLE;
-
-    /* Mask out all interrupts so LM_SetupPhy won't be called while we are */
-    /* setting new line speed. */
-    Value32 = REG_RD(pDevice, PciCfg.MiscHostCtrl);
-    REG_WR(pDevice, PciCfg.MiscHostCtrl, Value32 | MISC_HOST_CTRL_MASK_PCI_INT);
-
-    if(!pDevice->RestoreOnWakeUp)
-    {
-        pDevice->RestoreOnWakeUp = TRUE;
-        pDevice->WakeUpDisableAutoNeg = pDevice->DisableAutoNeg;
-        pDevice->WakeUpRequestedLineSpeed = pDevice->RequestedLineSpeed;
-        pDevice->WakeUpRequestedDuplexMode = pDevice->RequestedDuplexMode;
-    }
-
-    /* Force auto-negotiation to 10 line speed. */
-    pDevice->DisableAutoNeg = FALSE;
-
-    if (!pDevice->EnableTbi)
-    {
-        pDevice->RequestedLineSpeed = LM_LINE_SPEED_10MBPS;
-        LM_SetupPhy(pDevice);
-    }
-
-    /* Put the driver in the initial state, and go through the power down */
-    /* sequence. */
-    LM_Halt(pDevice);
-
-    if (!pDevice->EnableAsf)
-    {
-        for(j = 0; j < 20000; j++)
-        {
-            MM_Wait(10);
-
-            Value32 = MEM_RD_OFFSET(pDevice, T3_ASF_FW_STATUS_MAILBOX);
-            if(Value32 == ~T3_MAGIC_NUM_FIRMWARE_INIT_DONE)
-            {
-                break;
-            }
-        }
-    }
-
-    MEM_WR_OFFSET(pDevice, DRV_WOL_MAILBOX, DRV_WOL_SIGNATURE |
-        DRV_DOWN_STATE_SHUTDOWN | 0x2 | DRV_WOL_SET_MAGIC_PKT);
-
-    MM_ReadConfig32(pDevice, T3_PCI_PM_CAP_REG, &PmeSupport);
-
-    if (pDevice->WakeUpModeCap != LM_WAKE_UP_MODE_NONE)
-    {
-
-        /* Enable WOL. */
-        if (!pDevice->EnableTbi)
-        {
-            LM_WritePhy(pDevice, BCM5401_AUX_CTRL, 0x5a);
-            MM_Wait(40);
-        }
-
-        Value32 = REG_RD(pDevice, MacCtrl.Mode);
-        Value32 &= ~(LED_CTRL_PHY_MODE_1 | LED_CTRL_PHY_MODE_2 |
-            MAC_MODE_PORT_MODE_MASK);
-
-        /* Set LED mode. */
-        if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700 ||
-            T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701)
-        {
-            Value32 |= LED_CTRL_PHY_MODE_1;
-        }
-        else
-        {
-            if(pDevice->LedMode == LED_MODE_OUTPUT)
-            {
-                Value32 |= LED_CTRL_PHY_MODE_2;
-            }
-            else
-            {
-                Value32 |= LED_CTRL_PHY_MODE_1;
-            }
-        }
-
-        if (pDevice->EnableTbi)
-        {
-            Value32 |= MAC_MODE_PORT_MODE_TBI;
-        }
-        else
-        {
-            Value32 |= MAC_MODE_PORT_MODE_MII;
-            if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700)
-            {
-                if(pDevice->LedMode == LED_MODE_LINK10 ||
-                    pDevice->WolSpeed == WOL_SPEED_10MB)
-                {
-                    Value32 |= MAC_MODE_LINK_POLARITY;
-                }
-            }
-            else
-            {
-                Value32 |= MAC_MODE_LINK_POLARITY;
-            }
-        }
-        REG_WR(pDevice, MacCtrl.Mode, Value32);
-        MM_Wait(40); MM_Wait(40); MM_Wait(40);
-
-        /* Always enable magic packet wake-up if we have vaux. */
-        if((PmeSupport & T3_PCI_PM_CAP_PME_D3COLD) && 
-            (pDevice->WakeUpModeCap & LM_WAKE_UP_MODE_MAGIC_PACKET))
-        {
-            Value32 |= MAC_MODE_DETECT_MAGIC_PACKET_ENABLE;
-        }
-
-#ifdef BCM_ASF
-        if (pDevice->EnableAsf)
-        {
-            Value32 &= ~MAC_MODE_ACPI_POWER_ON_ENABLE;
-        }
-#endif
-        REG_WR(pDevice, MacCtrl.Mode, Value32);
-
-        /* Enable the receiver. */
-        REG_WR(pDevice, MacCtrl.RxMode, RX_MODE_ENABLE);
-    }
-    else if (!pDevice->EnableAsf)
-    {
-        if (pDevice->EnableTbi)
-        {
-            REG_WR(pDevice, MacCtrl.LedCtrl, LED_CTRL_OVERRIDE_LINK_LED |
-                LED_CTRL_OVERRIDE_TRAFFIC_LED);
-        }
-        else
-        {
-            LM_WritePhy(pDevice, BCM540X_EXT_CTRL_REG,
-                BCM540X_EXT_CTRL_FORCE_LED_OFF);
-            LM_WritePhy(pDevice, 0x18, 0x01b2);
-            if ((T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5700) &&
-                (T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5704) &&
-                (T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5705))
-            {
-                LM_WritePhy(pDevice, PHY_CTRL_REG, PHY_CTRL_LOWER_POWER_MODE);
-            }
-        }
-    }
-
-    /* Disable tx/rx clocks, and select an alternate clock. */
-    if ((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700) ||
-        ((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701) &&
-        (pDevice->WolSpeed == WOL_SPEED_10MB)))
-    {
-        Value32 = T3_PCI_DISABLE_RX_CLOCK | T3_PCI_DISABLE_TX_CLOCK |
-            T3_PCI_SELECT_ALTERNATE_CLOCK |
-            T3_PCI_POWER_DOWN_PCI_PLL133;
-
-        REG_WR(pDevice, PciCfg.ClockCtrl, pDevice->ClockCtrl | Value32);
-    }
-    else
-    {
-        if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701)
-        {
-            Value32 = T3_PCI_DISABLE_RX_CLOCK | T3_PCI_DISABLE_TX_CLOCK |
-                T3_PCI_SELECT_ALTERNATE_CLOCK;
-        }
-        else if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705)
-        {
-            Value32 = T3_PCI_625_CORE_CLOCK;
-        }
-        else
-        {
-            Value32 = T3_PCI_SELECT_ALTERNATE_CLOCK;
-        }
-        REG_WR(pDevice, PciCfg.ClockCtrl, pDevice->ClockCtrl | Value32);
-
-        MM_Wait(40);
-
-        if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700 ||
-            T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701)
-        {
-            Value32 = T3_PCI_DISABLE_RX_CLOCK | T3_PCI_DISABLE_TX_CLOCK |
-                T3_PCI_SELECT_ALTERNATE_CLOCK | T3_PCI_44MHZ_CORE_CLOCK;
-        }
-        else if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705)
-        {
-            Value32 = T3_PCI_SELECT_ALTERNATE_CLOCK | T3_PCI_625_CORE_CLOCK;
-        }
-        else
-        {
-            Value32 = T3_PCI_SELECT_ALTERNATE_CLOCK | T3_PCI_44MHZ_CORE_CLOCK;
-        }
-
-        REG_WR(pDevice, PciCfg.ClockCtrl, pDevice->ClockCtrl | Value32);
-
-        if(T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5705)
-        {
-            MM_Wait(40);
-
-            if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700 ||
-                T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701)
-            {
-                Value32 = T3_PCI_DISABLE_RX_CLOCK | T3_PCI_DISABLE_TX_CLOCK |
-                    T3_PCI_44MHZ_CORE_CLOCK;
-            }
-            else
-            {
-                Value32 = T3_PCI_44MHZ_CORE_CLOCK;
-            }
-
-            REG_WR(pDevice, PciCfg.ClockCtrl, pDevice->ClockCtrl | Value32);
-        }
-    }
-
-    MM_Wait(40);
-
-    if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5704)
-    {
-        pDevice2 = MM_FindPeerDev(pDevice);
-    }
-    if(!pDevice->EepromWp)
-    {
-        LM_SwitchVaux(pDevice, pDevice2);
-    }
-
-    /* Set the phy to low power mode. */
-    /* Put the the hardware in low power mode. */
-    MM_WriteConfig32(pDevice, T3_PCI_PM_STATUS_CTRL_REG, PmCtrl);
-    pDevice->PowerLevel = PowerLevel;
-#endif
-    return LM_STATUS_SUCCESS;
-} /* LM_SetPowerState */
-
-
-LM_VOID
-LM_SwitchVaux(PLM_DEVICE_BLOCK pDevice, PLM_DEVICE_BLOCK pDevice2)
-{
-    /* Switch adapter to auxilliary power if WOL enabled */
-    if ((pDevice->WakeUpModeCap != LM_WAKE_UP_MODE_NONE) ||
-        (pDevice->EnableAsf) ||
-        (pDevice2 && ((pDevice2->WakeUpModeCap != LM_WAKE_UP_MODE_NONE) ||
-        pDevice2->EnableAsf)))
-    {
-        if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700 ||
-            T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701)
-        {
-            /* GPIO0 = 1, GPIO1 = 1, GPIO2 = 0. */
-            REG_WR(pDevice, Grc.LocalCtrl, pDevice->GrcLocalCtrl |
-                GRC_MISC_LOCAL_CTRL_GPIO_OE0 |
-                GRC_MISC_LOCAL_CTRL_GPIO_OE1 |
-                GRC_MISC_LOCAL_CTRL_GPIO_OE2 | 
-                GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT0 |
-                GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT1);
-            MM_Wait(40);
-        }
-        else
-        {
-            if (pDevice2 && pDevice2->InitDone)
-            {
-                return;
-            }
-
-            /* GPIO0 = 0, GPIO1 = 1, GPIO2 = 1. */
-            REG_WR(pDevice, Grc.LocalCtrl, pDevice->GrcLocalCtrl |
-                GRC_MISC_LOCAL_CTRL_GPIO_OE0 |
-                GRC_MISC_LOCAL_CTRL_GPIO_OE1 |
-                GRC_MISC_LOCAL_CTRL_GPIO_OE2 | 
-                GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT1 | 
-                GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT2);
-            MM_Wait(40);
-
-            /* GPIO0 = 1, GPIO1 = 1, GPIO2 = 1. */
-            REG_WR(pDevice, Grc.LocalCtrl, pDevice->GrcLocalCtrl |
-                GRC_MISC_LOCAL_CTRL_GPIO_OE0 |
-                GRC_MISC_LOCAL_CTRL_GPIO_OE1 |
-                GRC_MISC_LOCAL_CTRL_GPIO_OE2 | 
-                GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT0 |
-                GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT1 |
-                GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT2);
-            MM_Wait(40);
-
-            /* GPIO0 = 1, GPIO1 = 1, GPIO2 = 0. */
-            REG_WR(pDevice, Grc.LocalCtrl, pDevice->GrcLocalCtrl |
-                GRC_MISC_LOCAL_CTRL_GPIO_OE0 | 
-                GRC_MISC_LOCAL_CTRL_GPIO_OE1 |
-                GRC_MISC_LOCAL_CTRL_GPIO_OE2 | 
-                GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT0 |
-                GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT1);
-            MM_Wait(40);
-        }
-    }
-    else /* WOL disabled */
-    {
-        if ((T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5700) &&
-            (T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5701))
-        {
-            if (pDevice2 && pDevice2->InitDone)
-            {
-                return;
-            }
-
-            /* GPIO1 = 1 */
-            REG_WR(pDevice, Grc.LocalCtrl, pDevice->GrcLocalCtrl |
-                GRC_MISC_LOCAL_CTRL_GPIO_OE1 |
-                GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT1);
-            MM_Wait(40);
-
-            /* GPIO1 = 0 */
-            REG_WR(pDevice, Grc.LocalCtrl, pDevice->GrcLocalCtrl |
-                GRC_MISC_LOCAL_CTRL_GPIO_OE1);
-            MM_Wait(40);
-
-            /* GPIO1 = 1 */
-            REG_WR(pDevice, Grc.LocalCtrl, pDevice->GrcLocalCtrl |
-                GRC_MISC_LOCAL_CTRL_GPIO_OE1 |
-                GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT1);
-            MM_Wait(40);
-        }
-    }
-}
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-static LM_UINT32
-GetPhyAdFlowCntrlSettings(
-    PLM_DEVICE_BLOCK pDevice)
-{
-    LM_UINT32 Value32;
-
-    Value32 = 0;
-
-    /* Auto negotiation flow control only when autonegotiation is enabled. */
-    if(pDevice->DisableAutoNeg == FALSE ||
-        pDevice->RequestedLineSpeed == LM_LINE_SPEED_AUTO)
-    {
-        /* Please refer to Table 28B-3 of the 802.3ab-1999 spec. */
-        if((pDevice->FlowControlCap == LM_FLOW_CONTROL_AUTO_PAUSE) ||
-            ((pDevice->FlowControlCap & LM_FLOW_CONTROL_RECEIVE_PAUSE) &&
-            (pDevice->FlowControlCap & LM_FLOW_CONTROL_TRANSMIT_PAUSE)))
-        {
-            Value32 |= PHY_AN_AD_PAUSE_CAPABLE;
-        }
-        else if(pDevice->FlowControlCap & LM_FLOW_CONTROL_TRANSMIT_PAUSE)
-        {
-            Value32 |= PHY_AN_AD_ASYM_PAUSE;
-        }
-        else if(pDevice->FlowControlCap & LM_FLOW_CONTROL_RECEIVE_PAUSE)
-        {
-            Value32 |= PHY_AN_AD_PAUSE_CAPABLE | PHY_AN_AD_ASYM_PAUSE;
-        }
-    }
-
-    return Value32;
-}
-
-
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/*    LM_STATUS_FAILURE                                                       */
-/*    LM_STATUS_SUCCESS                                                       */
-/*                                                                            */
-/******************************************************************************/
-static LM_STATUS
-LM_ForceAutoNeg(PLM_DEVICE_BLOCK pDevice) 
-{
-    LM_LINE_SPEED LineSpeed;
-    LM_DUPLEX_MODE DuplexMode;
-    LM_UINT32 NewPhyCtrl;
-    LM_UINT32 Value32;
-    LM_UINT32 Cnt;
-
-    /* Get the interface type, line speed, and duplex mode. */
-    LineSpeed = pDevice->RequestedLineSpeed;
-    DuplexMode = pDevice->RequestedDuplexMode;
-
-    /* Exit ext. loop back, in case it was in ext. loopback mode */
-    if((pDevice->PhyId & PHY_ID_MASK) == PHY_BCM5401_PHY_ID)
-    {
-        LM_WritePhy(pDevice, BCM5401_AUX_CTRL, 0x0c20);
-    }
-    else
-    {
-        LM_WritePhy(pDevice, BCM5401_AUX_CTRL, 0x0400);
-    }
-
-#ifdef BCM_WOL
-    if (pDevice->RestoreOnWakeUp)
-    {
-        LM_WritePhy(pDevice, BCM540X_1000BASET_CTRL_REG, 0);
-        pDevice->advertising1000 = 0;
-        Value32 = PHY_AN_AD_10BASET_FULL | PHY_AN_AD_10BASET_HALF;
-        if (pDevice->WolSpeed == WOL_SPEED_100MB)
-        {
-            Value32 |= PHY_AN_AD_100BASETX_FULL | PHY_AN_AD_100BASETX_HALF;
-        }
-        Value32 |= PHY_AN_AD_PROTOCOL_802_3_CSMA_CD;
-        Value32 |= GetPhyAdFlowCntrlSettings(pDevice);
-        LM_WritePhy(pDevice, PHY_AN_AD_REG, Value32);
-        pDevice->advertising = Value32;
-    }
-    /* Setup the auto-negotiation advertisement register. */
-    else if(LineSpeed == LM_LINE_SPEED_UNKNOWN)
-#else
-    /* Setup the auto-negotiation advertisement register. */
-    if(LineSpeed == LM_LINE_SPEED_UNKNOWN)
-#endif
-    {
-        /* Setup the 10/100 Mbps auto-negotiation advertisement register. */
-        Value32 = PHY_AN_AD_PROTOCOL_802_3_CSMA_CD | PHY_AN_AD_ALL_SPEEDS;
-        Value32 |= GetPhyAdFlowCntrlSettings(pDevice);
-
-        LM_WritePhy(pDevice, PHY_AN_AD_REG, Value32);
-        pDevice->advertising = Value32;
-
-        /* Advertise 1000Mbps */
-        if (!pDevice->No1000)
-        {
-            Value32 = BCM540X_AN_AD_ALL_1G_SPEEDS;
-
-#if INCLUDE_5701_AX_FIX
-            /* Bug: workaround for CRC error in gigabit mode when we are in */
-            /* slave mode.  This will force the PHY to operate in */
-            /* master mode. */
-            if(pDevice->ChipRevId == T3_CHIP_ID_5701_A0 ||
-                pDevice->ChipRevId == T3_CHIP_ID_5701_B0)
-            {
-                Value32 |= BCM540X_CONFIG_AS_MASTER |
-                    BCM540X_ENABLE_CONFIG_AS_MASTER;
-            }
-#endif
-
-            LM_WritePhy(pDevice, BCM540X_1000BASET_CTRL_REG, Value32);
-            pDevice->advertising1000 = Value32;
-        }
-    }
-    else
-    {
-        if(pDevice->No1000 && (LineSpeed == LM_LINE_SPEED_1000MBPS))
-        {
-            LineSpeed = LM_LINE_SPEED_100MBPS;
-        }
-        if(LineSpeed == LM_LINE_SPEED_1000MBPS)
-        {
-            Value32 = PHY_AN_AD_PROTOCOL_802_3_CSMA_CD;
-            Value32 |= GetPhyAdFlowCntrlSettings(pDevice);
-
-            LM_WritePhy(pDevice, PHY_AN_AD_REG, Value32);
-            pDevice->advertising = Value32;
-
-            if(DuplexMode != LM_DUPLEX_MODE_FULL)
-            {
-                Value32 = BCM540X_AN_AD_1000BASET_HALF;
-            }
-            else
-            {
-                Value32 = BCM540X_AN_AD_1000BASET_FULL;
-            }
-
-#if INCLUDE_5701_AX_FIX
-            if ((pDevice->LoopBackMode == LM_EXT_LOOP_BACK_MODE) ||
-                (pDevice->ChipRevId == T3_CHIP_ID_5701_A0 ||
-                pDevice->ChipRevId == T3_CHIP_ID_5701_B0))
-#else
-            if (pDevice->LoopBackMode == LM_EXT_LOOP_BACK_MODE)
-#endif
-            {
-                Value32 |= BCM540X_CONFIG_AS_MASTER |
-                    BCM540X_ENABLE_CONFIG_AS_MASTER;
-            }
-            LM_WritePhy(pDevice, BCM540X_1000BASET_CTRL_REG, Value32);
-            pDevice->advertising1000 = Value32;
-            if (pDevice->LoopBackMode == LM_EXT_LOOP_BACK_MODE)
-            {
-                if((pDevice->PhyId & PHY_ID_MASK) == PHY_BCM5401_PHY_ID)
-                {
-                    LM_WritePhy(pDevice, BCM5401_AUX_CTRL, 0x8c20);
-                }
-                else
-                {
-                    LM_WritePhy(pDevice, BCM5401_AUX_CTRL, 0x8400);
-                }
-            }
-        }
-        else if(LineSpeed == LM_LINE_SPEED_100MBPS)
-        {
-            LM_WritePhy(pDevice, BCM540X_1000BASET_CTRL_REG, 0);
-            pDevice->advertising1000 = 0;
-
-            if(DuplexMode != LM_DUPLEX_MODE_FULL)
-            {
-                Value32 = PHY_AN_AD_100BASETX_HALF;
-            }
-            else
-            {
-                Value32 = PHY_AN_AD_100BASETX_FULL;
-            }
-
-            Value32 |= PHY_AN_AD_PROTOCOL_802_3_CSMA_CD;
-            Value32 |= GetPhyAdFlowCntrlSettings(pDevice);
-
-            LM_WritePhy(pDevice, PHY_AN_AD_REG, Value32);
-            pDevice->advertising = Value32;
-        }
-        else if(LineSpeed == LM_LINE_SPEED_10MBPS)
-        {
-            LM_WritePhy(pDevice, BCM540X_1000BASET_CTRL_REG, 0);
-            pDevice->advertising1000 = 0;
-
-            if(DuplexMode != LM_DUPLEX_MODE_FULL)
-            {
-                Value32 = PHY_AN_AD_10BASET_HALF;
-            }
-            else
-            {
-                Value32 = PHY_AN_AD_10BASET_FULL;
-            }
-
-            Value32 |= PHY_AN_AD_PROTOCOL_802_3_CSMA_CD;
-            Value32 |= GetPhyAdFlowCntrlSettings(pDevice);
-
-            LM_WritePhy(pDevice, PHY_AN_AD_REG, Value32);
-            pDevice->advertising = Value32;
-        }
-    }
-
-    /* Force line speed if auto-negotiation is disabled. */
-    if(pDevice->DisableAutoNeg && LineSpeed != LM_LINE_SPEED_UNKNOWN)
-    {
-        /* This code path is executed only when there is link. */
-        pDevice->LineSpeed = LineSpeed;
-        pDevice->DuplexMode = DuplexMode;
-
-        /* Force line seepd. */
-        NewPhyCtrl = 0;
-        switch(LineSpeed)
-        {
-            case LM_LINE_SPEED_10MBPS:
-                NewPhyCtrl |= PHY_CTRL_SPEED_SELECT_10MBPS;
-                break;
-            case LM_LINE_SPEED_100MBPS:
-                NewPhyCtrl |= PHY_CTRL_SPEED_SELECT_100MBPS;
-                break;
-            case LM_LINE_SPEED_1000MBPS:
-                NewPhyCtrl |= PHY_CTRL_SPEED_SELECT_1000MBPS;
-                break;
-            default:
-                NewPhyCtrl |= PHY_CTRL_SPEED_SELECT_1000MBPS;
-                break;
-        }
-
-        if(DuplexMode == LM_DUPLEX_MODE_FULL)
-        {
-            NewPhyCtrl |= PHY_CTRL_FULL_DUPLEX_MODE;
-        }
-
-        /* Don't do anything if the PHY_CTRL is already what we wanted. */
-        LM_ReadPhy(pDevice, PHY_CTRL_REG, &Value32);
-        if(Value32 != NewPhyCtrl)
-        {
-            /* Temporary bring the link down before forcing line speed. */
-            LM_WritePhy(pDevice, PHY_CTRL_REG, PHY_CTRL_LOOPBACK_MODE);
-            
-            /* Wait for link to go down. */
-            for(Cnt = 0; Cnt < 1500; Cnt++)
-            {
-                MM_Wait(10);
-
-                LM_ReadPhy(pDevice, PHY_STATUS_REG, &Value32);
-                LM_ReadPhy(pDevice, PHY_STATUS_REG, &Value32);
-
-                if(!(Value32 & PHY_STATUS_LINK_PASS))
-                {
-                    MM_Wait(40);
-                    break;
-                }
-            }
-
-            LM_WritePhy(pDevice, PHY_CTRL_REG, NewPhyCtrl);
-            MM_Wait(40);
-        }
-    }
-    else
-    {
-        LM_WritePhy(pDevice, PHY_CTRL_REG, PHY_CTRL_AUTO_NEG_ENABLE |
-            PHY_CTRL_RESTART_AUTO_NEG);
-    }
-
-    return LM_STATUS_SUCCESS;
-} /* LM_ForceAutoNegBcm540xPhy */
-
-/******************************************************************************/
-/* Description:                                                               */
-/*                                                                            */
-/* Return:                                                                    */
-/******************************************************************************/
-LM_STATUS LM_LoadFirmware(PLM_DEVICE_BLOCK pDevice,
-                          PT3_FWIMG_INFO pFwImg,
-                          LM_UINT32 LoadCpu,
-                          LM_UINT32 StartCpu)
-{
-    LM_UINT32 i;
-    LM_UINT32 address;
-    LM_VOID (*Wr_fn)(PLM_DEVICE_BLOCK pDevice,LM_UINT32 Register,LM_UINT32 Value32);
-    LM_UINT32 (*Rd_fn)(PLM_DEVICE_BLOCK pDevice,LM_UINT32 Register);
-    LM_UINT32 len;
-    LM_UINT32 base_addr;
-
-#if INCLUDE_TCP_SEG_SUPPORT
-    if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705)
-      {
-	Wr_fn = LM_MemWrInd;
-	Rd_fn = LM_MemRdInd;
-	len = LM_GetStkOffLdFirmwareSize(pDevice);
-	base_addr = T3_NIC_BCM5705_MBUF_POOL_ADDR;
-      }
-    else
-#endif
-      {
-	Wr_fn = LM_RegWrInd;
-	Rd_fn = LM_RegRdInd;
-	len = T3_RX_CPU_SPAD_SIZE;
-	base_addr = T3_RX_CPU_SPAD_ADDR;
-      }
-
-    if (LoadCpu & T3_RX_CPU_ID)
-    {
-        if (LM_HaltCpu(pDevice,T3_RX_CPU_ID) != LM_STATUS_SUCCESS)
-        {
-            return LM_STATUS_FAILURE;
-        }
-
-        /* First of all clear scrach pad memory */
-        for (i = 0; i < len; i+=4)
-        { 
-	    Wr_fn(pDevice,base_addr+i,0);
-        }
-
-        /* Copy code first */
-        address = base_addr + (pFwImg->Text.Offset & 0xffff);
-        for (i = 0; i <= pFwImg->Text.Length; i+=4)
-        {
-            Wr_fn(pDevice,address+i,
-                        ((LM_UINT32 *)pFwImg->Text.Buffer)[i/4]);
-        }
-
-        address = base_addr + (pFwImg->ROnlyData.Offset & 0xffff);
-        for (i = 0; i <= pFwImg->ROnlyData.Length; i+=4)
-        {
-            Wr_fn(pDevice,address+i,
-                        ((LM_UINT32 *)pFwImg->ROnlyData.Buffer)[i/4]);
-        }
-
-        address = base_addr + (pFwImg->Data.Offset & 0xffff);
-        for (i= 0; i <= pFwImg->Data.Length; i+=4)
-        {
-            Wr_fn(pDevice,address+i,
-                        ((LM_UINT32 *)pFwImg->Data.Buffer)[i/4]);
-        }
-    }
-
-    if ((LoadCpu & T3_TX_CPU_ID) &&
-        (T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5705))
-    {
-        if (LM_HaltCpu(pDevice,T3_TX_CPU_ID) != LM_STATUS_SUCCESS)
-        {
-            return LM_STATUS_FAILURE;
-        }
-
-        /* First of all clear scrach pad memory */
-        for (i = 0; i < T3_TX_CPU_SPAD_SIZE; i+=4)
-        { 
-            Wr_fn(pDevice,T3_TX_CPU_SPAD_ADDR+i,0);
-        }
-
-        /* Copy code first */
-        address = T3_TX_CPU_SPAD_ADDR + (pFwImg->Text.Offset & 0xffff);
-        for (i= 0; i <= pFwImg->Text.Length; i+=4)
-        {
-            Wr_fn(pDevice,address+i,
-                        ((LM_UINT32 *)pFwImg->Text.Buffer)[i/4]);
-        }
-
-        address = T3_TX_CPU_SPAD_ADDR + (pFwImg->ROnlyData.Offset & 0xffff);
-        for (i= 0; i <= pFwImg->ROnlyData.Length; i+=4)
-        {
-            Wr_fn(pDevice,address+i,
-                        ((LM_UINT32 *)pFwImg->ROnlyData.Buffer)[i/4]);
-        }
-
-        address = T3_TX_CPU_SPAD_ADDR + (pFwImg->Data.Offset & 0xffff);
-        for (i= 0; i <= pFwImg->Data.Length; i+=4)
-        {
-            Wr_fn(pDevice,address+i,
-                        ((LM_UINT32 *)pFwImg->Data.Buffer)[i/4]);
-        }
-    }
-
-    if (StartCpu & T3_RX_CPU_ID)
-    {
-        /* Start Rx CPU */
-        REG_WR(pDevice,rxCpu.reg.state, 0xffffffff);
-        REG_WR(pDevice,rxCpu.reg.PC,pFwImg->StartAddress);
-        for (i = 0 ; i < 5; i++)
-        {
-          if (pFwImg->StartAddress == REG_RD(pDevice,rxCpu.reg.PC))
-             break;
-
-          REG_WR(pDevice,rxCpu.reg.state, 0xffffffff);
-          REG_WR(pDevice,rxCpu.reg.mode,CPU_MODE_HALT);
-          REG_WR(pDevice,rxCpu.reg.PC,pFwImg->StartAddress);
-          MM_Wait(1000);
-        }
-
-        REG_WR(pDevice,rxCpu.reg.state, 0xffffffff);
-        REG_WR(pDevice,rxCpu.reg.mode, 0);
-    }
-
-    if ((StartCpu & T3_TX_CPU_ID) &&
-        (T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5705))
-    {
-        /* Start Tx CPU */
-        REG_WR(pDevice,txCpu.reg.state, 0xffffffff);
-        REG_WR(pDevice,txCpu.reg.PC,pFwImg->StartAddress);
-        for (i = 0 ; i < 5; i++)
-        {
-          if (pFwImg->StartAddress == REG_RD(pDevice,txCpu.reg.PC))
-             break;
-
-          REG_WR(pDevice,txCpu.reg.state, 0xffffffff);
-          REG_WR(pDevice,txCpu.reg.mode,CPU_MODE_HALT);
-          REG_WR(pDevice,txCpu.reg.PC,pFwImg->StartAddress);
-          MM_Wait(1000);
-        }
-        
-        REG_WR(pDevice,txCpu.reg.state, 0xffffffff);
-        REG_WR(pDevice,txCpu.reg.mode, 0);
-    }
-    
-    return LM_STATUS_SUCCESS;
-}
-
-LM_STATUS LM_HaltCpu(PLM_DEVICE_BLOCK pDevice,LM_UINT32 cpu_number)
-{
-    LM_UINT32 i;
-
-    if((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705) &&
-       (cpu_number != T3_RX_CPU_ID))
-    {
-        return LM_STATUS_SUCCESS;
-    }
-
-    if (cpu_number == T3_RX_CPU_ID)
-    {
-        for (i = 0 ; i < 10000; i++)
-        {
-            REG_WR(pDevice,rxCpu.reg.state, 0xffffffff);
-            REG_WR(pDevice,rxCpu.reg.mode,CPU_MODE_HALT);
-
-            if (REG_RD(pDevice,rxCpu.reg.mode) & CPU_MODE_HALT)
-              break;
-        }
-
-        REG_WR(pDevice,rxCpu.reg.state, 0xffffffff);
-        REG_WR(pDevice,rxCpu.reg.mode,CPU_MODE_HALT);
-        MM_Wait(10);
-    }
-    else
-    {
-        for (i = 0 ; i < 10000; i++)
-        {
-            REG_WR(pDevice,txCpu.reg.state, 0xffffffff);
-            REG_WR(pDevice,txCpu.reg.mode,CPU_MODE_HALT);
-
-            if (REG_RD(pDevice,txCpu.reg.mode) & CPU_MODE_HALT)
-               break;
-        }
-    }
-
-  return (( i == 10000) ? LM_STATUS_FAILURE : LM_STATUS_SUCCESS);
-}
-
-
-LM_STATUS
-LM_BlinkLED(PLM_DEVICE_BLOCK pDevice, LM_UINT32 BlinkDurationSec)
-{
-	LM_UINT32 Oldcfg;
-	int j;
-	int ret = LM_STATUS_SUCCESS;
-
-	if(BlinkDurationSec == 0)
-	{
-		BlinkDurationSec = 1;
-        }
-	if(BlinkDurationSec > 120)
-        {
-	        BlinkDurationSec = 120;
-	}
-
-	Oldcfg = REG_RD(pDevice, MacCtrl.LedCtrl) & (LED_CTRL_PHY_MODE_1 |
-		LED_CTRL_PHY_MODE_2);
-	for(j = 0; j < BlinkDurationSec * 2; j++)
-	{
-		if(j % 2)
-		{
-			// Turn on the LEDs.
-			REG_WR(pDevice, MacCtrl.LedCtrl,
-				LED_CTRL_OVERRIDE_LINK_LED |
-				LED_CTRL_1000MBPS_LED_ON |
-				LED_CTRL_100MBPS_LED_ON |
-				LED_CTRL_10MBPS_LED_ON |
-				LED_CTRL_OVERRIDE_TRAFFIC_LED |
-				LED_CTRL_BLINK_TRAFFIC_LED |
-				LED_CTRL_TRAFFIC_LED);
-		}
-		else
-		{
-			// Turn off the LEDs.
-			REG_WR(pDevice, MacCtrl.LedCtrl,
-				LED_CTRL_OVERRIDE_LINK_LED |
-				LED_CTRL_OVERRIDE_TRAFFIC_LED);
-		}
-                if (MM_Sleep(pDevice, 500) != LM_STATUS_SUCCESS)/* 0.5 second */
-                {
-                    ret = LM_STATUS_FAILURE;
-                    break;
-                }
-	}
-	REG_WR(pDevice, MacCtrl.LedCtrl, Oldcfg);
-	return ret;
-}
-
-STATIC LM_STATUS
-LM_SwitchClocks(PLM_DEVICE_BLOCK pDevice)
-{
-    LM_UINT32 ClockCtrl;
-
-    ClockCtrl = REG_RD(pDevice, PciCfg.ClockCtrl);
-    pDevice->ClockCtrl = ClockCtrl & (T3_PCI_FORCE_CLKRUN |
-        T3_PCI_CLKRUN_OUTPUT_EN | 0x1f);
-    if (T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5705)
-    {
-        if (ClockCtrl & T3_PCI_44MHZ_CORE_CLOCK)
-        {
-            REG_WR(pDevice, PciCfg.ClockCtrl, pDevice->ClockCtrl |
-                T3_PCI_44MHZ_CORE_CLOCK | T3_PCI_SELECT_ALTERNATE_CLOCK);
-            MM_Wait(40);  /* required delay is 27usec */
-            REG_WR(pDevice, PciCfg.ClockCtrl, pDevice->ClockCtrl |
-                T3_PCI_SELECT_ALTERNATE_CLOCK);
-            MM_Wait(40);  /* required delay is 27usec */
-        }
-    }
-
-    REG_WR(pDevice, PciCfg.ClockCtrl, pDevice->ClockCtrl);
-    MM_Wait(40);  /* required delay is 27usec */
-    return LM_STATUS_SUCCESS;
-}
-
-int t3_do_dma(PLM_DEVICE_BLOCK pDevice, 
-                   LM_PHYSICAL_ADDRESS host_addr_phy, int length,
-                   int dma_read)
-{
-    T3_DMA_DESC dma_desc;
-    int i;
-    LM_UINT32 dma_desc_addr;
-    LM_UINT32 value32;
-
-    REG_WR(pDevice, BufMgr.Mode, 0);
-    REG_WR(pDevice, Ftq.Reset, 0);
-
-    dma_desc.host_addr.High = host_addr_phy.High;
-    dma_desc.host_addr.Low = host_addr_phy.Low;
-    dma_desc.nic_mbuf = 0x2100;
-    dma_desc.len = length;
-    dma_desc.flags = 0x00000004; /* Generate Rx-CPU event */
-
-    if (dma_read)
-    {
-        dma_desc.cqid_sqid = (T3_QID_RX_BD_COMP << 8) |
-            T3_QID_DMA_HIGH_PRI_READ;
-        REG_WR(pDevice, DmaRead.Mode, DMA_READ_MODE_ENABLE);
-    }
-    else
-    {
-        dma_desc.cqid_sqid = (T3_QID_RX_DATA_COMP << 8) |
-            T3_QID_DMA_HIGH_PRI_WRITE;
-        REG_WR(pDevice, DmaWrite.Mode, DMA_WRITE_MODE_ENABLE);
-    }
-
-    dma_desc_addr = T3_NIC_DMA_DESC_POOL_ADDR;
-
-    /* Writing this DMA descriptor to DMA memory */
-    for (i = 0; i < sizeof(T3_DMA_DESC); i += 4)
-    {
-        value32 = *((PLM_UINT32) (((PLM_UINT8) &dma_desc) + i));
-        MM_WriteConfig32(pDevice, T3_PCI_MEM_WIN_ADDR_REG, dma_desc_addr+i);
-        MM_WriteConfig32(pDevice, T3_PCI_MEM_WIN_DATA_REG,
-            MM_SWAP_LE32(value32));
-    }
-    MM_WriteConfig32(pDevice, T3_PCI_MEM_WIN_ADDR_REG, 0);
-
-    if (dma_read)
-        REG_WR(pDevice, Ftq.DmaHighReadFtqFifoEnqueueDequeue, dma_desc_addr);
-    else
-        REG_WR(pDevice, Ftq.DmaHighWriteFtqFifoEnqueueDequeue, dma_desc_addr);
-
-    for (i = 0; i < 40; i++)
-    {
-        if (dma_read)
-            value32 = REG_RD(pDevice, Ftq.RcvBdCompFtqFifoEnqueueDequeue);
-        else
-            value32 = REG_RD(pDevice, Ftq.RcvDataCompFtqFifoEnqueueDequeue);
-
-        if ((value32 & 0xffff) == dma_desc_addr)
-            break;
-
-        MM_Wait(10);
-    }
-
-    return LM_STATUS_SUCCESS;
-}
-
-STATIC LM_STATUS
-LM_DmaTest(PLM_DEVICE_BLOCK pDevice, PLM_UINT8 pBufferVirt,
-           LM_PHYSICAL_ADDRESS BufferPhy, LM_UINT32 BufferSize)
-{
-    int j;
-    LM_UINT32 *ptr;
-    int dma_success = 0;
-    LM_STATUS ret = LM_STATUS_FAILURE;
-
-    if(T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5700 &&
-        T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5701)
-    {
-        return LM_STATUS_SUCCESS;
-    }
-    while (!dma_success)
-    {
-        /* Fill data with incremental patterns */
-        ptr = (LM_UINT32 *)pBufferVirt;
-        for (j = 0; j < BufferSize/4; j++)
-            *ptr++ = j;
-
-        if (t3_do_dma(pDevice,BufferPhy,BufferSize, 1) == LM_STATUS_FAILURE)
-        {
-            goto LM_DmaTestDone;
-        }
-
-        MM_Wait(40);
-        ptr = (LM_UINT32 *)pBufferVirt;
-        /* Fill data with zero */
-        for (j = 0; j < BufferSize/4; j++)
-            *ptr++ = 0;
-
-        if (t3_do_dma(pDevice,BufferPhy,BufferSize, 0) == LM_STATUS_FAILURE)
-        {
-            goto LM_DmaTestDone;
-        }
-
-        MM_Wait(40);
-        /* Check for data */
-        ptr = (LM_UINT32 *)pBufferVirt;
-        for (j = 0; j < BufferSize/4; j++)
-        {
-            if (*ptr++ != j)
-            {
-                if ((pDevice->DmaReadWriteCtrl & DMA_CTRL_WRITE_BOUNDARY_MASK)
-                    == DMA_CTRL_WRITE_BOUNDARY_DISABLE)
-                {
-                    pDevice->DmaReadWriteCtrl = (pDevice->DmaReadWriteCtrl &
-                         ~DMA_CTRL_WRITE_BOUNDARY_MASK) |
-                          DMA_CTRL_WRITE_BOUNDARY_16;
-                    REG_WR(pDevice, PciCfg.DmaReadWriteCtrl,
-                           pDevice->DmaReadWriteCtrl);
-                    break;
-                 }
-                 else
-                 {
-                     goto LM_DmaTestDone;
-                 }
-            }
-        }
-        if (j == (BufferSize/4))
-            dma_success = 1;
-    }
-    ret = LM_STATUS_SUCCESS;
-LM_DmaTestDone:
-    memset(pBufferVirt, 0, BufferSize);
-    return ret;
-}
-
-void
-LM_Add32To64Counter(LM_UINT32 Counter32, T3_64BIT_REGISTER *Counter64)
-{
-    Counter64->Low += Counter32;
-    if (Counter64->Low < Counter32)
-    {
-        Counter64->High++;
-    }
-}
-
-LM_STATUS
-LM_GetStats(PLM_DEVICE_BLOCK pDevice)
-{
-    PT3_STATS_BLOCK pStats = (PT3_STATS_BLOCK) pDevice->pStatsBlkVirt;
-
-    if(T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5705)
-    {
-        return LM_STATUS_FAILURE;
-    }
-
-    if (pStats == 0)
-    {
-        return LM_STATUS_FAILURE;
-    }
-    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.ifHCOutOctets),
-        &pStats->ifHCOutOctets);
-    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.etherStatsCollisions),
-        &pStats->etherStatsCollisions);
-    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.outXonSent),
-        &pStats->outXonSent);
-    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.outXoffSent),
-        &pStats->outXoffSent);
-    LM_Add32To64Counter(REG_RD(pDevice,
-	MacCtrl.dot3StatsInternalMacTransmitErrors),
-        &pStats->dot3StatsInternalMacTransmitErrors);
-    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.dot3StatsSingleCollisionFrames),
-        &pStats->dot3StatsSingleCollisionFrames);
-    LM_Add32To64Counter(REG_RD(pDevice,
-	MacCtrl.dot3StatsMultipleCollisionFrames),
-        &pStats->dot3StatsMultipleCollisionFrames);
-    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.dot3StatsDeferredTransmissions),
-        &pStats->dot3StatsDeferredTransmissions);
-    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.dot3StatsExcessiveCollisions),
-        &pStats->dot3StatsExcessiveCollisions);
-    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.dot3StatsLateCollisions),
-        &pStats->dot3StatsLateCollisions);
-    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.ifHCOutUcastPkts),
-        &pStats->ifHCOutUcastPkts);
-    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.ifHCOutMulticastPkts),
-        &pStats->ifHCOutMulticastPkts);
-    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.ifHCOutBroadcastPkts),
-        &pStats->ifHCOutBroadcastPkts);
-    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.ifHCInOctets),
-        &pStats->ifHCInOctets);
-    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.etherStatsFragments),
-        &pStats->etherStatsFragments);
-    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.ifHCInUcastPkts),
-        &pStats->ifHCInUcastPkts);
-    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.ifHCInMulticastPkts),
-        &pStats->ifHCInMulticastPkts);
-    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.ifHCInBroadcastPkts),
-        &pStats->ifHCInBroadcastPkts);
-    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.dot3StatsFCSErrors),
-        &pStats->dot3StatsFCSErrors);
-    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.dot3StatsAlignmentErrors),
-        &pStats->dot3StatsAlignmentErrors);
-    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.xonPauseFramesReceived),
-        &pStats->xonPauseFramesReceived);
-    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.xoffPauseFramesReceived),
-        &pStats->xoffPauseFramesReceived);
-    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.macControlFramesReceived),
-        &pStats->macControlFramesReceived);
-    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.xoffStateEntered),
-        &pStats->xoffStateEntered);
-    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.dot3StatsFramesTooLong),
-        &pStats->dot3StatsFramesTooLong);
-    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.etherStatsJabbers),
-        &pStats->etherStatsJabbers);
-    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.etherStatsUndersizePkts),
-        &pStats->etherStatsUndersizePkts);
-
-    return LM_STATUS_SUCCESS;
-}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm/tigon3.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm/tigon3.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm/tigon3.h	2004-06-29 11:24:56.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm/tigon3.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,3512 +0,0 @@
-/******************************************************************************/
-/*                                                                            */
-/* Broadcom BCM5700 Linux Network Driver, Copyright (c) 2000 - 2003 Broadcom  */
-/* 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, located in the file LICENSE.                 */
-/*                                                                            */
-/* History:                                                                   */
-/*                                                                            */
-/******************************************************************************/
-
-#ifndef TIGON3_H
-#define TIGON3_H
-
-#include "lm.h"
-#if INCLUDE_TBI_SUPPORT
-#include "autoneg.h"
-#endif
-
-
-
-/******************************************************************************/
-/* Constants. */
-/******************************************************************************/
-
-/* Maxim number of packet descriptors used for sending packets. */
-#define MAX_TX_PACKET_DESC_COUNT            T3_SEND_RCB_ENTRY_COUNT
-#define DEFAULT_TX_PACKET_DESC_COUNT        120
-
-/* Maximum number of packet descriptors used for receiving packets. */
-#if T3_JUMBO_RCB_ENTRY_COUNT
-#define MAX_RX_PACKET_DESC_COUNT                                            \
-    (T3_STD_RCV_RCB_ENTRY_COUNT + T3_JUMBO_RCV_RCB_ENTRY_COUNT)
-#else
-#define MAX_RX_PACKET_DESC_COUNT            T3_STD_RCV_RCB_ENTRY_COUNT
-#endif
-#define DEFAULT_RX_PACKET_DESC_COUNT        200
-
-/* Threshhold for double copying small tx packets.  0 will disable double */
-/* copying of small Tx packets. */
-#define DEFAULT_TX_COPY_BUFFER_SIZE         0
-#define MIN_TX_COPY_BUFFER_SIZE             64 
-#define MAX_TX_COPY_BUFFER_SIZE             512
-
-/* Cache line. */
-#define COMMON_CACHE_LINE_SIZE              0x20
-#define COMMON_CACHE_LINE_MASK              (COMMON_CACHE_LINE_SIZE-1)
-
-/* Maximum number of fragment we can handle. */
-#ifndef MAX_FRAGMENT_COUNT
-#define MAX_FRAGMENT_COUNT                  32
-#endif
-
-/* B0 bug. */
-#define BCM5700_BX_MIN_FRAG_SIZE            10
-#define BCM5700_BX_MIN_FRAG_BUF_SIZE        16  /* nice aligned size. */
-#define BCM5700_BX_MIN_FRAG_BUF_SIZE_MASK   (BCM5700_BX_MIN_FRAG_BUF_SIZE-1)
-#define BCM5700_BX_TX_COPY_BUF_SIZE         (BCM5700_BX_MIN_FRAG_BUF_SIZE * \
-                                            MAX_FRAGMENT_COUNT)
-
-/* MAGIC number. */
-//#define T3_MAGIC_NUM                        'KevT'
-#define T3_FIRMWARE_MAILBOX                0x0b50
-#define T3_MAGIC_NUM_FIRMWARE_INIT_DONE    0x4B657654 
-#define T3_MAGIC_NUM_DISABLE_DMAW_ON_LINK_CHANGE 0x4861764b
-
-#define T3_NIC_DATA_SIG_ADDR               0x0b54
-#define T3_NIC_DATA_SIG                    0x4b657654
-
-#define T3_NIC_DATA_NIC_CFG_ADDR           0x0b58
-#define T3_NIC_CFG_LED_MODE_UNKNOWN        BIT_NONE
-#define T3_NIC_CFG_LED_MODE_TRIPLE_SPEED   BIT_2
-#define T3_NIC_CFG_LED_MODE_LINK_SPEED     BIT_3
-#define T3_NIC_CFG_LED_MODE_OPEN_DRAIN     BIT_2
-#define T3_NIC_CFG_LED_MODE_OUTPUT         BIT_3
-#define T3_NIC_CFG_LED_MODE_MASK           (BIT_2 | BIT_3)
-#define T3_NIC_CFG_PHY_TYPE_UNKNOWN         BIT_NONE
-#define T3_NIC_CFG_PHY_TYPE_COPPER          BIT_4
-#define T3_NIC_CFG_PHY_TYPE_FIBER           BIT_5
-#define T3_NIC_CFG_PHY_TYPE_MASK            (BIT_4 | BIT_5)
-#define T3_NIC_CFG_ENABLE_WOL               BIT_6
-#define T3_NIC_CFG_ENABLE_ASF               BIT_7
-#define T3_NIC_EEPROM_WP                    BIT_8
-#define T3_NIC_WOL_LIMIT_10                 BIT_10
-#define T3_NIC_MINI_PCI                     BIT_12
-#define T3_NIC_FIBER_WOL_CAPABLE            BIT_14
-
-#define T3_NIC_DATA_PHY_ID_ADDR            0x0b74
-#define T3_NIC_PHY_ID1_MASK                0xffff0000
-#define T3_NIC_PHY_ID2_MASK                0x0000ffff
-
-#define T3_CMD_MAILBOX                      0x0b78
-#define T3_CMD_NICDRV_ALIVE                 0x01
-#define T3_CMD_NICDRV_PAUSE_FW              0x02
-#define T3_CMD_NICDRV_IPV4ADDR_CHANGE       0x03
-#define T3_CMD_NICDRV_IPV6ADDR_CHANGE       0x04
-#define T3_CMD_5703A0_FIX_DMAFW_DMAR        0x05
-#define T3_CMD_5703A0_FIX_DMAFW_DMAW        0x06
-
-#define T3_CMD_LENGTH_MAILBOX               0x0b7c
-#define T3_CMD_DATA_MAILBOX                 0x0b80
-
-#define T3_ASF_FW_STATUS_MAILBOX            0x0c00
-
-#define T3_DRV_STATE_MAILBOX                0x0c04
-#define T3_DRV_STATE_START                  0x01
-#define T3_DRV_STATE_UNLOAD                 0x02
-#define T3_DRV_STATE_WOL                    0x03
-#define T3_DRV_STATE_SUSPEND                0x04
-
-#define T3_FW_RESET_TYPE_MAILBOX            0x0c08
-
-#define T3_MAC_ADDR_HIGH_MAILBOX            0x0c14
-#define T3_MAC_ADDR_LOW_MAILBOX             0x0c18
-
-#define DRV_WOL_MAILBOX                     0xd30
-#define DRV_WOL_SIGNATURE                   0x474c0000
-
-#define DRV_DOWN_STATE_SHUTDOWN             0x1
-
-#define DRV_WOL_SET_MAGIC_PKT               BIT_2
-
-/******************************************************************************/
-/* Hardware constants. */
-/******************************************************************************/
-
-/* Number of entries in the send ring:  must be 512. */
-#define T3_SEND_RCB_ENTRY_COUNT             512     
-#define T3_SEND_RCB_ENTRY_COUNT_MASK        (T3_SEND_RCB_ENTRY_COUNT-1)
-
-/* Number of send RCBs.  May be 1-16 but for now, only support one. */
-#define T3_MAX_SEND_RCB_COUNT               16
-
-/* Number of entries in the Standard Receive RCB.  Must be 512 entries. */
-#define T3_STD_RCV_RCB_ENTRY_COUNT          512
-#define T3_STD_RCV_RCB_ENTRY_COUNT_MASK     (T3_STD_RCV_RCB_ENTRY_COUNT-1)
-#define DEFAULT_STD_RCV_DESC_COUNT          200    /* Must be < 512. */
-#define MAX_STD_RCV_BUFFER_SIZE             0x600
-
-/* Number of entries in the Mini Receive RCB.  This value can either be */
-/* 0, 1024.  Currently Mini Receive RCB is disabled. */
-#ifndef T3_MINI_RCV_RCB_ENTRY_COUNT
-#define T3_MINI_RCV_RCB_ENTRY_COUNT         0
-#endif /* T3_MINI_RCV_RCB_ENTRY_COUNT */
-#define T3_MINI_RCV_RCB_ENTRY_COUNT_MASK    (T3_MINI_RCV_RCB_ENTRY_COUNT-1)
-#define MAX_MINI_RCV_BUFFER_SIZE            512
-#define DEFAULT_MINI_RCV_BUFFER_SIZE        64
-#define DEFAULT_MINI_RCV_DESC_COUNT         100    /* Must be < 1024. */
-
-/* Number of entries in the Jumbo Receive RCB.  This value must 256 or 0. */
-/* Currently, Jumbo Receive RCB is disabled. */
-#ifndef T3_JUMBO_RCV_RCB_ENTRY_COUNT
-#define T3_JUMBO_RCV_RCB_ENTRY_COUNT        0
-#endif /* T3_JUMBO_RCV_RCB_ENTRY_COUNT */
-#define T3_JUMBO_RCV_RCB_ENTRY_COUNT_MASK   (T3_JUMBO_RCV_RCB_ENTRY_COUNT-1)
-
-#define MAX_JUMBO_RCV_BUFFER_SIZE           (10 * 1024) /* > 1514 */
-#define DEFAULT_JUMBO_RCV_BUFFER_SIZE       (4 * 1024) /* > 1514 */
-#define DEFAULT_JUMBO_RCV_DESC_COUNT        128     /* Must be < 256. */
-
-#define MAX_JUMBO_TX_BUFFER_SIZE            (8 * 1024) /* > 1514 */
-#define DEFAULT_JUMBO_TX_BUFFER_SIZE        (4 * 1024) /* > 1514 */
-
-/* Number of receive return RCBs.  Maybe 1-16 but for now, only support one. */
-#define T3_MAX_RCV_RETURN_RCB_COUNT         16
-
-/* Number of entries in a Receive Return ring.  This value is either 1024 */
-/* or 2048. */
-#ifndef T3_RCV_RETURN_RCB_ENTRY_COUNT 
-#define T3_RCV_RETURN_RCB_ENTRY_COUNT       1024
-#endif /* T3_RCV_RETURN_RCB_ENTRY_COUNT */
-#define T3_RCV_RETURN_RCB_ENTRY_COUNT_MASK  (T3_RCV_RETURN_RCB_ENTRY_COUNT-1)
-
-
-/* Default coalescing parameters. */
-#ifdef BCM_NAPI_RXPOLL
-#define DEFAULT_RX_COALESCING_TICKS         18
-#define DEFAULT_RX_MAX_COALESCED_FRAMES     6
-#else
-#define DEFAULT_RX_COALESCING_TICKS         60
-#define DEFAULT_RX_MAX_COALESCED_FRAMES     15
-#endif
-
-#define DEFAULT_TX_COALESCING_TICKS         200
-#define DEFAULT_TX_MAX_COALESCED_FRAMES     35
-
-#define MAX_RX_COALESCING_TICKS             500
-#define MAX_TX_COALESCING_TICKS             500
-#define MAX_RX_MAX_COALESCED_FRAMES         100
-#define MAX_TX_MAX_COALESCED_FRAMES         100
-
-#define ADAPTIVE_LO_RX_MAX_COALESCED_FRAMES    5
-#define ADAPTIVE_HI_RX_MAX_COALESCED_FRAMES    48
-#define ADAPTIVE_LO_RX_COALESCING_TICKS         25
-#define ADAPTIVE_HI_RX_COALESCING_TICKS         120
-#define ADAPTIVE_LO_PKT_THRESH              52000
-#define ADAPTIVE_HI_PKT_THRESH              112000
-#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
-#define ADAPTIVE_HI_RX_MAX_COALESCED_FRAMES_DURING_INT  5
-#define DEFAULT_TX_MAX_COALESCED_FRAMES_DURING_INT      5
-
-#define BAD_DEFAULT_VALUE                               0xffffffff
-
-#define DEFAULT_STATS_COALESCING_TICKS      1000000
-#define MIN_STATS_COALESCING_TICKS          100
-#define MAX_STATS_COALESCING_TICKS          3600000000U
-
-
-/* Receive BD Replenish thresholds. */
-#define DEFAULT_RCV_STD_BD_REPLENISH_THRESHOLD      4
-#define DEFAULT_RCV_JUMBO_BD_REPLENISH_THRESHOLD    4
-
-#define SPLIT_MODE_DISABLE                          0
-#define SPLIT_MODE_ENABLE                           1
-
-#define SPLIT_MODE_5704_MAX_REQ                     3
-
-/* Maximum physical fragment size. */
-#define MAX_FRAGMENT_SIZE                   (64 * 1024)
-
-
-/* Standard view. */
-#define T3_STD_VIEW_SIZE                    (64 * 1024)
-#define T3_FLAT_VIEW_SIZE                   (32 * 1024 * 1024)
-
-
-/* Buffer descriptor base address on the NIC's memory. */
-
-#define T3_NIC_SND_BUFFER_DESC_ADDR         0x4000
-#define T3_NIC_STD_RCV_BUFFER_DESC_ADDR     0x6000
-#define T3_NIC_JUMBO_RCV_BUFFER_DESC_ADDR   0x7000
-
-#define T3_NIC_STD_RCV_BUFFER_DESC_ADDR_EXT_MEM     0xc000
-#define T3_NIC_JUMBO_RCV_BUFFER_DESC_ADDR_EXT_MEM   0xd000
-#define T3_NIC_MINI_RCV_BUFFER_DESC_ADDR_EXT_MEM    0xe000
-
-#define T3_NIC_SND_BUFFER_DESC_SIZE         (T3_SEND_RCB_ENTRY_COUNT * \
-                                            sizeof(T3_SND_BD) / 4)
-
-#define T3_NIC_STD_RCV_BUFFER_DESC_SIZE     (T3_STD_RCV_RCB_ENTRY_COUNT * \
-                                            sizeof(T3_RCV_BD) / 4)
-
-#define T3_NIC_JUMBO_RCV_BUFFER_DESC_SIZE   (T3_JUMBO_RCV_RCB_ENTRY_COUNT * \
-                                            sizeof(T3_EXT_RCV_BD) / 4)
-
-
-/* MBUF pool. */
-#define T3_NIC_MBUF_POOL_ADDR               0x8000
-#define T3_NIC_MBUF_POOL_SIZE96             0x18000
-#define T3_NIC_MBUF_POOL_SIZE64             0x10000
-
-#define T3_NIC_MBUF_POOL_ADDR_EXT_MEM       0x20000
-
-#define T3_NIC_BCM5705_MBUF_POOL_ADDR               0x10000
-#define T3_NIC_BCM5705_MBUF_POOL_SIZE               0xe000
-
-/* DMA descriptor pool */
-#define T3_NIC_DMA_DESC_POOL_ADDR           0x2000
-#define T3_NIC_DMA_DESC_POOL_SIZE           0x2000      /* 8KB. */
-
-#define T3_DEF_DMA_MBUF_LOW_WMARK           0x50
-#define T3_DEF_RX_MAC_MBUF_LOW_WMARK        0x20
-#define T3_DEF_MBUF_HIGH_WMARK              0x60
-
-#define T3_DEF_DMA_MBUF_LOW_WMARK_5705       0x0
-#define T3_DEF_RX_MAC_MBUF_LOW_WMARK_5705    0x10
-#define T3_DEF_MBUF_HIGH_WMARK_5705          0x60
-
-#define T3_DEF_DMA_MBUF_LOW_WMARK_JUMBO     304
-#define T3_DEF_RX_MAC_MBUF_LOW_WMARK_JUMBO  152
-#define T3_DEF_MBUF_HIGH_WMARK_JUMBO        380
-
-#define T3_DEF_DMA_DESC_LOW_WMARK           5
-#define T3_DEF_DMA_DESC_HIGH_WMARK          10
-
-/* Maximum size of giant TCP packet can be sent */
-#define T3_TCP_SEG_MAX_OFFLOAD_SIZE         64*1000
-#define T3_TCP_SEG_MIN_NUM_SEG              20
-
-#define T3_RX_CPU_ID    0x1
-#define T3_TX_CPU_ID    0x2
-#define T3_RX_CPU_SPAD_ADDR  0x30000
-#define T3_RX_CPU_SPAD_SIZE  0x4000
-#define T3_TX_CPU_SPAD_ADDR  0x34000
-#define T3_TX_CPU_SPAD_SIZE  0x4000
-
-typedef struct T3_DIR_ENTRY
-{
-  PLM_UINT8 Buffer;
-  LM_UINT32 Offset;
-  LM_UINT32 Length;
-} T3_DIR_ENTRY,*PT3_DIR_ENTRY;
-
-typedef struct T3_FWIMG_INFO
-{
-  LM_UINT32 StartAddress;
-  T3_DIR_ENTRY Text;
-  T3_DIR_ENTRY ROnlyData;
-  T3_DIR_ENTRY Data;
-  T3_DIR_ENTRY Sbss;
-  T3_DIR_ENTRY Bss;
-} T3_FWIMG_INFO, *PT3_FWIMG_INFO;
-
-
-
-/******************************************************************************/
-/* Tigon3 PCI Registers. */
-/******************************************************************************/
-#define T3_PCI_ID_BCM5700                   0x164414e4
-#define T3_PCI_ID_BCM5701                   0x164514e4
-#define T3_PCI_ID_BCM5702                   0x164614e4
-#define T3_PCI_ID_BCM5702x                  0x16A614e4
-#define T3_PCI_ID_BCM5703                   0x164714e4
-#define T3_PCI_ID_BCM5703x                  0x16A714e4
-#define T3_PCI_ID_BCM5702FE                 0x164D14e4
-#define T3_PCI_ID_BCM5704                   0x164814e4
-#define T3_PCI_ID_BCM5705                   0x165314e4
-#define T3_PCI_ID_BCM5705M                  0x165D14e4
-#define T3_PCI_ID_BCM5705F                  0x166E14e4
-#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)
-
-#define T3_PCI_MISC_HOST_CTRL_REG           0x68
-
-/* The most significant 16bit of register 0x68. */
-/* ChipId:4, ChipRev:4, MetalRev:8 */
-#define T3_CHIP_ID_5700_A0                  0x7000
-#define T3_CHIP_ID_5700_A1                  0x7001
-#define T3_CHIP_ID_5700_B0                  0x7100
-#define T3_CHIP_ID_5700_B1                  0x7101
-#define T3_CHIP_ID_5700_C0                  0x7200
-
-#define T3_CHIP_ID_5701_A0                  0x0000
-#define T3_CHIP_ID_5701_B0                  0x0100
-#define T3_CHIP_ID_5701_B2                  0x0102
-#define T3_CHIP_ID_5701_B5                  0x0105
-
-#define T3_CHIP_ID_5703_A0                  0x1000
-#define T3_CHIP_ID_5703_A1                  0x1001
-#define T3_CHIP_ID_5703_A2                  0x1002
-#define T3_CHIP_ID_5703_A3                  0x1003
-
-#define T3_CHIP_ID_5704_A0                  0x2000
-#define T3_CHIP_ID_5704_A1                  0x2001
-#define T3_CHIP_ID_5704_A2                  0x2002
-
-#define T3_CHIP_ID_5705_A0                  0x3000
-#define T3_CHIP_ID_5705_A1                  0x3001
-#define T3_CHIP_ID_5705_A2                  0x3002
-#define T3_CHIP_ID_5705_A3                  0x3003
-
-/* Chip Id. */
-#define T3_ASIC_REV(_ChipRevId)             ((_ChipRevId) >> 12)
-#define T3_ASIC_REV_5700                    0x07
-#define T3_ASIC_REV_5701                    0x00
-#define T3_ASIC_REV_5703                    0x01
-#define T3_ASIC_REV_5704                    0x02
-#define T3_ASIC_REV_5705                    0x03
-
-/* Chip id and revision. */
-#define T3_CHIP_REV(_ChipRevId)             ((_ChipRevId) >> 8)
-#define T3_CHIP_REV_5700_AX                 0x70
-#define T3_CHIP_REV_5700_BX                 0x71
-#define T3_CHIP_REV_5700_CX                 0x72
-#define T3_CHIP_REV_5701_AX                 0x00
-#define T3_CHIP_REV_5703_AX                 0x10
-#define T3_CHIP_REV_5704_AX                 0x20
-#define T3_CHIP_REV_5704_BX                 0x21
-
-/* Metal revision. */
-#define T3_METAL_REV(_ChipRevId)            ((_ChipRevId) & 0xff)
-#define T3_METAL_REV_A0                     0x00
-#define T3_METAL_REV_A1                     0x01
-#define T3_METAL_REV_B0                     0x00
-#define T3_METAL_REV_B1                     0x01
-#define T3_METAL_REV_B2                     0x02
-
-#define T3_PCI_REG_CLOCK_CTRL               0x74
-
-#define T3_PCI_DISABLE_RX_CLOCK             BIT_10
-#define T3_PCI_DISABLE_TX_CLOCK             BIT_11
-#define T3_PCI_SELECT_ALTERNATE_CLOCK       BIT_12
-#define T3_PCI_POWER_DOWN_PCI_PLL133        BIT_15
-#define T3_PCI_44MHZ_CORE_CLOCK             BIT_18
-#define T3_PCI_625_CORE_CLOCK               BIT_20
-#define T3_PCI_FORCE_CLKRUN                 BIT_21
-#define T3_PCI_CLKRUN_OUTPUT_EN             BIT_22
-
-
-#define T3_PCI_REG_ADDR_REG                 0x78
-#define T3_PCI_REG_DATA_REG                 0x80
-
-#define T3_PCI_MEM_WIN_ADDR_REG             0x7c
-#define T3_PCI_MEM_WIN_DATA_REG             0x84
-
-#define T3_PCI_PM_CAP_REG                   0x48
-
-#define T3_PCI_PM_CAP_PME_D3COLD            BIT_31
-#define T3_PCI_PM_CAP_PME_D3HOT             BIT_30
-
-#define T3_PCI_PM_STATUS_CTRL_REG           0x4c
-
-#define T3_PM_POWER_STATE_MASK              (BIT_0 | BIT_1)
-#define T3_PM_POWER_STATE_D0                BIT_NONE
-#define T3_PM_POWER_STATE_D1                BIT_0
-#define T3_PM_POWER_STATE_D2                BIT_1
-#define T3_PM_POWER_STATE_D3                (BIT_0 | BIT_1)
-
-#define T3_PM_PME_ENABLE                    BIT_8
-#define T3_PM_PME_ASSERTED                  BIT_15
-
-
-/* PCI state register. */
-#define T3_PCI_STATE_REG                    0x70
-
-#define T3_PCI_STATE_FORCE_RESET            BIT_0
-#define T3_PCI_STATE_INT_NOT_ACTIVE         BIT_1
-#define T3_PCI_STATE_CONVENTIONAL_PCI_MODE  BIT_2
-#define T3_PCI_STATE_BUS_SPEED_HIGH         BIT_3
-#define T3_PCI_STATE_32BIT_PCI_BUS          BIT_4
-
-
-/* Broadcom subsystem/subvendor IDs. */
-#define T3_SVID_BROADCOM                            0x14e4
-
-#define T3_SSID_BROADCOM_BCM95700A6                 0x1644
-#define T3_SSID_BROADCOM_BCM95701A5                 0x0001
-#define T3_SSID_BROADCOM_BCM95700T6                 0x0002  /* BCM8002 */
-#define T3_SSID_BROADCOM_BCM95700A9                 0x0003  /* Agilent */
-#define T3_SSID_BROADCOM_BCM95701T1                 0x0005
-#define T3_SSID_BROADCOM_BCM95701T8                 0x0006
-#define T3_SSID_BROADCOM_BCM95701A7                 0x0007  /* Agilent */
-#define T3_SSID_BROADCOM_BCM95701A10                0x0008
-#define T3_SSID_BROADCOM_BCM95701A12                0x8008
-#define T3_SSID_BROADCOM_BCM95703Ax1                0x0009
-#define T3_SSID_BROADCOM_BCM95703Ax2                0x8009
-
-/* 3COM subsystem/subvendor IDs. */
-#define T3_SVID_3COM                                0x10b7
-
-#define T3_SSID_3COM_3C996T                         0x1000
-#define T3_SSID_3COM_3C996BT                        0x1006
-#define T3_SSID_3COM_3C996CT                        0x1002
-#define T3_SSID_3COM_3C997T                         0x1003
-#define T3_SSID_3COM_3C1000T                        0x1007
-#define T3_SSID_3COM_3C940BR01                      0x1008
-
-/* Fiber boards. */
-#define T3_SSID_3COM_3C996SX                        0x1004
-#define T3_SSID_3COM_3C997SX                        0x1005
-
-
-/* Dell subsystem/subvendor IDs. */
-
-#define T3_SVID_DELL                                0x1028
-
-#define T3_SSID_DELL_VIPER                          0x00d1
-#define T3_SSID_DELL_JAGUAR                         0x0106
-#define T3_SSID_DELL_MERLOT                         0x0109
-#define T3_SSID_DELL_SLIM_MERLOT                    0x010a
-
-/* Compaq subsystem/subvendor IDs */
-
-#define T3_SVID_COMPAQ                              0x0e11
-
-#define T3_SSID_COMPAQ_BANSHEE                      0x007c
-#define T3_SSID_COMPAQ_BANSHEE_2                    0x009a
-#define T3_SSID_COMPAQ_CHANGELING                   0x007d
-#define T3_SSID_COMPAQ_NC7780                       0x0085
-#define T3_SSID_COMPAQ_NC7780_2                     0x0099
-
-
-/******************************************************************************/
-/* MII registers. */
-/******************************************************************************/
-
-/* Control register. */
-#define PHY_CTRL_REG                                0x00
-
-#define PHY_CTRL_SPEED_MASK                         (BIT_6 | BIT_13)
-#define PHY_CTRL_SPEED_SELECT_10MBPS                BIT_NONE
-#define PHY_CTRL_SPEED_SELECT_100MBPS               BIT_13
-#define PHY_CTRL_SPEED_SELECT_1000MBPS              BIT_6
-#define PHY_CTRL_COLLISION_TEST_ENABLE              BIT_7
-#define PHY_CTRL_FULL_DUPLEX_MODE                   BIT_8
-#define PHY_CTRL_RESTART_AUTO_NEG                   BIT_9
-#define PHY_CTRL_ISOLATE_PHY                        BIT_10
-#define PHY_CTRL_LOWER_POWER_MODE                   BIT_11
-#define PHY_CTRL_AUTO_NEG_ENABLE                    BIT_12
-#define PHY_CTRL_LOOPBACK_MODE                      BIT_14
-#define PHY_CTRL_PHY_RESET                          BIT_15
-
-
-/* Status register. */
-#define PHY_STATUS_REG                              0x01
-
-#define PHY_STATUS_LINK_PASS                        BIT_2
-#define PHY_STATUS_AUTO_NEG_COMPLETE                BIT_5
-
-
-/* Phy Id registers. */
-#define PHY_ID1_REG                                 0x02
-#define PHY_ID1_OUI_MASK                            0xffff
-
-#define PHY_ID2_REG                                 0x03
-#define PHY_ID2_REV_MASK                            0x000f
-#define PHY_ID2_MODEL_MASK                          0x03f0
-#define PHY_ID2_OUI_MASK                            0xfc00
-
-
-/* Auto-negotiation advertisement register. */
-#define PHY_AN_AD_REG                               0x04
-
-#define PHY_AN_AD_ASYM_PAUSE                        BIT_11
-#define PHY_AN_AD_PAUSE_CAPABLE                     BIT_10
-#define PHY_AN_AD_10BASET_HALF                      BIT_5
-#define PHY_AN_AD_10BASET_FULL                      BIT_6
-#define PHY_AN_AD_100BASETX_HALF                    BIT_7
-#define PHY_AN_AD_100BASETX_FULL                    BIT_8
-#define PHY_AN_AD_PROTOCOL_802_3_CSMA_CD            0x01
-
-#define PHY_AN_AD_ALL_SPEEDS (PHY_AN_AD_10BASET_HALF | PHY_AN_AD_10BASET_FULL |\
-    PHY_AN_AD_100BASETX_HALF | PHY_AN_AD_100BASETX_FULL)
-
-/* Auto-negotiation Link Partner Ability register. */
-#define PHY_LINK_PARTNER_ABILITY_REG                0x05
-
-#define PHY_LINK_PARTNER_ASYM_PAUSE                 BIT_11
-#define PHY_LINK_PARTNER_PAUSE_CAPABLE              BIT_10
-
-
-/* Auto-negotiation expansion register. */
-#define PHY_AN_EXPANSION_REG                        0x06
-
-
-
-/******************************************************************************/
-/* BCM5400 and BCM5401 phy info. */
-/******************************************************************************/
-
-#define PHY_DEVICE_ID           1
-
-/* OUI: bit 31-10;   Model#: bit 9-4;   Rev# bit 3-0. */
-#define PHY_UNKNOWN_PHY                             0x00000000
-#define PHY_BCM5400_PHY_ID                          0x60008040
-#define PHY_BCM5401_PHY_ID                          0x60008050
-#define PHY_BCM5411_PHY_ID                          0x60008070
-#define PHY_BCM5701_PHY_ID                          0x60008110
-#define PHY_BCM5703_PHY_ID                          0x60008160
-#define PHY_BCM5704_PHY_ID                          0x60008190
-#define PHY_BCM5705_PHY_ID                          0x600081a0
-#define PHY_BCM8002_PHY_ID                          0x60010140
-
-#define PHY_BCM5401_B0_REV                          0x1
-#define PHY_BCM5401_B2_REV                          0x3
-#define PHY_BCM5401_C0_REV                          0x6
-
-#define PHY_ID_OUI_MASK                             0xfffffc00
-#define PHY_ID_MODEL_MASK                           0x000003f0
-#define PHY_ID_REV_MASK                             0x0000000f
-#define PHY_ID_MASK                                 (PHY_ID_OUI_MASK |      \
-                                                    PHY_ID_MODEL_MASK)
-
-
-#define UNKNOWN_PHY_ID(x)   ((((x) & PHY_ID_MASK) != PHY_BCM5400_PHY_ID) && \
-                            (((x) & PHY_ID_MASK) != PHY_BCM5401_PHY_ID) && \
-                            (((x) & PHY_ID_MASK) != PHY_BCM5411_PHY_ID) && \
-                            (((x) & PHY_ID_MASK) != PHY_BCM5701_PHY_ID) && \
-                            (((x) & PHY_ID_MASK) != PHY_BCM5703_PHY_ID) && \
-                            (((x) & PHY_ID_MASK) != PHY_BCM5704_PHY_ID) && \
-                            (((x) & PHY_ID_MASK) != PHY_BCM5705_PHY_ID) && \
-                            (((x) & PHY_ID_MASK) != PHY_BCM8002_PHY_ID))
-
-
-
-/* 1000Base-T control register. */
-#define BCM540X_1000BASET_CTRL_REG                  0x09
-
-#define BCM540X_AN_AD_1000BASET_HALF                BIT_8
-#define BCM540X_AN_AD_1000BASET_FULL                BIT_9
-#define BCM540X_CONFIG_AS_MASTER                    BIT_11
-#define BCM540X_ENABLE_CONFIG_AS_MASTER             BIT_12
-
-#define BCM540X_AN_AD_ALL_1G_SPEEDS (BCM540X_AN_AD_1000BASET_HALF | \
-    BCM540X_AN_AD_1000BASET_FULL)
-
-/* Extended control register. */
-#define BCM540X_EXT_CTRL_REG                        0x10
-
-#define BCM540X_EXT_CTRL_LINK3_LED_MODE             BIT_1
-#define BCM540X_EXT_CTRL_FORCE_LED_OFF              BIT_3
-#define BCM540X_EXT_CTRL_TBI                        BIT_15
-
-/* PHY extended status register. */
-#define BCM540X_EXT_STATUS_REG                      0x11
-
-#define BCM540X_EXT_STATUS_LINK_PASS                BIT_8
-
-
-/* DSP Coefficient Read/Write Port. */
-#define BCM540X_DSP_RW_PORT                         0x15
-
-
-/* DSP Coeficient Address Register. */
-#define BCM540X_DSP_ADDRESS_REG                     0x17
-
-#define BCM540X_DSP_TAP_NUMBER_MASK                 0x00
-#define BCM540X_DSP_AGC_A                           0x00
-#define BCM540X_DSP_AGC_B                           0x01
-#define BCM540X_DSP_MSE_PAIR_STATUS                 0x02
-#define BCM540X_DSP_SOFT_DECISION                   0x03
-#define BCM540X_DSP_PHASE_REG                       0x04
-#define BCM540X_DSP_SKEW                            0x05
-#define BCM540X_DSP_POWER_SAVER_UPPER_BOUND         0x06
-#define BCM540X_DSP_POWER_SAVER_LOWER_BOUND         0x07
-#define BCM540X_DSP_LAST_ECHO                       0x08
-#define BCM540X_DSP_FREQUENCY                       0x09
-#define BCM540X_DSP_PLL_BANDWIDTH                   0x0a
-#define BCM540X_DSP_PLL_PHASE_OFFSET                0x0b
-
-#define BCM540X_DSP_FILTER_DCOFFSET                 (BIT_10 | BIT_11)
-#define BCM540X_DSP_FILTER_FEXT3                    (BIT_8 | BIT_9 | BIT_11)
-#define BCM540X_DSP_FILTER_FEXT2                    (BIT_9 | BIT_11)
-#define BCM540X_DSP_FILTER_FEXT1                    (BIT_8 | BIT_11)
-#define BCM540X_DSP_FILTER_FEXT0                    BIT_11
-#define BCM540X_DSP_FILTER_NEXT3                    (BIT_8 | BIT_9 | BIT_10)
-#define BCM540X_DSP_FILTER_NEXT2                    (BIT_9 | BIT_10)
-#define BCM540X_DSP_FILTER_NEXT1                    (BIT_8 | BIT_10)
-#define BCM540X_DSP_FILTER_NEXT0                    BIT_10
-#define BCM540X_DSP_FILTER_ECHO                     (BIT_8 | BIT_9)
-#define BCM540X_DSP_FILTER_DFE                      BIT_9
-#define BCM540X_DSP_FILTER_FFE                      BIT_8
-
-#define BCM540X_DSP_CONTROL_ALL_FILTERS             BIT_12
-
-#define BCM540X_DSP_SEL_CH_0                        BIT_NONE
-#define BCM540X_DSP_SEL_CH_1                        BIT_13
-#define BCM540X_DSP_SEL_CH_2                        BIT_14
-#define BCM540X_DSP_SEL_CH_3                        (BIT_13 | BIT_14)
-
-#define BCM540X_CONTROL_ALL_CHANNELS                BIT_15
-
-
-/* Auxilliary Control Register (Shadow Register) */
-#define BCM5401_AUX_CTRL                            0x18
-
-#define BCM5401_SHADOW_SEL_MASK                     0x7
-#define BCM5401_SHADOW_SEL_NORMAL                   0x00
-#define BCM5401_SHADOW_SEL_10BASET                  0x01
-#define BCM5401_SHADOW_SEL_POWER_CONTROL            0x02
-#define BCM5401_SHADOW_SEL_IP_PHONE                 0x03
-#define BCM5401_SHADOW_SEL_MISC_TEST1               0x04
-#define BCM5401_SHADOW_SEL_MISC_TEST2               0x05
-#define BCM5401_SHADOW_SEL_IP_PHONE_SEED            0x06
-
-
-/* Shadow register selector == '000' */
-#define BCM5401_SHDW_NORMAL_DIAG_MODE               BIT_3
-#define BCM5401_SHDW_NORMAL_DISABLE_MBP             BIT_4
-#define BCM5401_SHDW_NORMAL_DISABLE_LOW_PWR         BIT_5
-#define BCM5401_SHDW_NORMAL_DISABLE_INV_PRF         BIT_6
-#define BCM5401_SHDW_NORMAL_DISABLE_PRF             BIT_7
-#define BCM5401_SHDW_NORMAL_RX_SLICING_NORMAL       BIT_NONE
-#define BCM5401_SHDW_NORMAL_RX_SLICING_4D           BIT_8
-#define BCM5401_SHDW_NORMAL_RX_SLICING_3LVL_1D      BIT_9
-#define BCM5401_SHDW_NORMAL_RX_SLICING_5LVL_1D      (BIT_8 | BIT_9)
-#define BCM5401_SHDW_NORMAL_TX_6DB_CODING           BIT_10
-#define BCM5401_SHDW_NORMAL_ENABLE_SM_DSP_CLOCK     BIT_11
-#define BCM5401_SHDW_NORMAL_EDGERATE_CTRL_4NS       BIT_NONE
-#define BCM5401_SHDW_NORMAL_EDGERATE_CTRL_5NS       BIT_12
-#define BCM5401_SHDW_NORMAL_EDGERATE_CTRL_3NS       BIT_13
-#define BCM5401_SHDW_NORMAL_EDGERATE_CTRL_0NS       (BIT_12 | BIT_13)
-#define BCM5401_SHDW_NORMAL_EXT_PACKET_LENGTH       BIT_14
-#define BCM5401_SHDW_NORMAL_EXTERNAL_LOOPBACK       BIT_15
-
-
-/* Auxilliary status summary. */
-#define BCM540X_AUX_STATUS_REG                      0x19
-
-#define BCM540X_AUX_LINK_PASS                       BIT_2
-#define BCM540X_AUX_SPEED_MASK                      (BIT_8 | BIT_9 | BIT_10)
-#define BCM540X_AUX_10BASET_HD                      BIT_8
-#define BCM540X_AUX_10BASET_FD                      BIT_9
-#define BCM540X_AUX_100BASETX_HD                    (BIT_8 | BIT_9)
-#define BCM540X_AUX_100BASET4                       BIT_10
-#define BCM540X_AUX_100BASETX_FD                    (BIT_8 | BIT_10)
-#define BCM540X_AUX_100BASET_HD                     (BIT_9 | BIT_10)
-#define BCM540X_AUX_100BASET_FD                     (BIT_8 | BIT_9 | BIT_10)
-
-
-/* Interrupt status. */
-#define BCM540X_INT_STATUS_REG                      0x1a
-
-#define BCM540X_INT_LINK_CHANGE                     BIT_1
-#define BCM540X_INT_SPEED_CHANGE                    BIT_2
-#define BCM540X_INT_DUPLEX_CHANGE                   BIT_3
-#define BCM540X_INT_AUTO_NEG_PAGE_RX                BIT_10
-
-
-/* Interrupt mask register. */
-#define BCM540X_INT_MASK_REG                        0x1b
-
-
-
-/******************************************************************************/
-/* Register definitions. */
-/******************************************************************************/
-
-typedef volatile LM_UINT8 T3_8BIT_REGISTER, *PT3_8BIT_REGISTER;
-typedef volatile LM_UINT16 T3_16BIT_REGISTER, *PT3_16BIT_REGISTER;
-typedef volatile LM_UINT32 T3_32BIT_REGISTER, *PT3_32BIT_REGISTER;
-
-typedef struct {
-    /* Big endian format. */
-    T3_32BIT_REGISTER High;
-    T3_32BIT_REGISTER Low;
-} T3_64BIT_REGISTER, *PT3_64BIT_REGISTER;
-
-typedef T3_64BIT_REGISTER T3_64BIT_HOST_ADDR, *PT3_64BIT_HOST_ADDR;
-
-#define T3_NUM_OF_DMA_DESC    256
-#define T3_NUM_OF_MBUF        768
-
-typedef struct 
-{
-  T3_64BIT_REGISTER host_addr;
-  T3_32BIT_REGISTER nic_mbuf;
-  T3_16BIT_REGISTER len;
-  T3_16BIT_REGISTER cqid_sqid;
-  T3_32BIT_REGISTER flags;
-  T3_32BIT_REGISTER opaque1;
-  T3_32BIT_REGISTER opaque2;
-  T3_32BIT_REGISTER opaque3;
-}T3_DMA_DESC, *PT3_DMA_DESC;
-
-
-
-/******************************************************************************/
-/* Ring control block. */
-/******************************************************************************/
-
-typedef struct {
-    T3_64BIT_REGISTER HostRingAddr;
-
-    union {
-        struct {
-#ifdef BIG_ENDIAN_HOST
-            T3_16BIT_REGISTER MaxLen;
-            T3_16BIT_REGISTER Flags;
-#else /* BIG_ENDIAN_HOST */
-            T3_16BIT_REGISTER Flags;
-            T3_16BIT_REGISTER MaxLen;
-#endif
-        } s;
-
-        T3_32BIT_REGISTER MaxLen_Flags;
-    } u;
-
-    T3_32BIT_REGISTER NicRingAddr;
-} T3_RCB, *PT3_RCB;
-
-#define T3_RCB_FLAG_USE_EXT_RECV_BD                     BIT_0
-#define T3_RCB_FLAG_RING_DISABLED                       BIT_1
-
-
-
-/******************************************************************************/
-/* Status block. */
-/******************************************************************************/
-
-/* 
- * Size of status block is actually 0x50 bytes.  Use 0x80 bytes for
- * cache line alignment. 
- */
-#define T3_STATUS_BLOCK_SIZE                                    0x80
-
-typedef struct {
-    volatile LM_UINT32 Status;
-    #define STATUS_BLOCK_UPDATED                                BIT_0
-    #define STATUS_BLOCK_LINK_CHANGED_STATUS                    BIT_1
-    #define STATUS_BLOCK_ERROR                                  BIT_2
-
-    volatile LM_UINT32 StatusTag;
-
-#ifdef BIG_ENDIAN_HOST
-    volatile LM_UINT16 RcvStdConIdx;
-    volatile LM_UINT16 RcvJumboConIdx;
-
-    volatile LM_UINT16 Reserved2;
-    volatile LM_UINT16 RcvMiniConIdx;
-
-    struct {
-        volatile LM_UINT16 SendConIdx;   /* Send consumer index. */
-        volatile LM_UINT16 RcvProdIdx;   /* Receive producer index. */
-    } Idx[16];
-#else /* BIG_ENDIAN_HOST */
-    volatile LM_UINT16 RcvJumboConIdx;
-    volatile LM_UINT16 RcvStdConIdx;
-
-    volatile LM_UINT16 RcvMiniConIdx;
-    volatile LM_UINT16 Reserved2;
-
-    struct {
-        volatile LM_UINT16 RcvProdIdx;   /* Receive producer index. */
-        volatile LM_UINT16 SendConIdx;   /* Send consumer index. */
-    } Idx[16];
-#endif
-} T3_STATUS_BLOCK, *PT3_STATUS_BLOCK;
-
-
-
-/******************************************************************************/
-/* Receive buffer descriptors. */
-/******************************************************************************/
-
-typedef struct {
-    T3_64BIT_HOST_ADDR HostAddr;
-
-#ifdef BIG_ENDIAN_HOST
-    volatile LM_UINT16 Index;
-    volatile LM_UINT16 Len;
-
-    volatile LM_UINT16 Type;
-    volatile LM_UINT16 Flags;
-
-    volatile LM_UINT16 IpCksum;
-    volatile LM_UINT16 TcpUdpCksum;
-
-    volatile LM_UINT16 ErrorFlag;
-    volatile LM_UINT16 VlanTag;
-#else /* BIG_ENDIAN_HOST */
-    volatile LM_UINT16 Len;
-    volatile LM_UINT16 Index;
-
-    volatile LM_UINT16 Flags;
-    volatile LM_UINT16 Type;
-
-    volatile LM_UINT16 TcpUdpCksum;
-    volatile LM_UINT16 IpCksum;
-
-    volatile LM_UINT16 VlanTag;
-    volatile LM_UINT16 ErrorFlag;
-#endif
-
-    volatile LM_UINT32 Reserved;
-    volatile LM_UINT32 Opaque;
-} T3_RCV_BD, *PT3_RCV_BD;
-
-
-typedef struct {
-    T3_64BIT_HOST_ADDR HostAddr[3];
-
-#ifdef BIG_ENDIAN_HOST
-    LM_UINT16 Len1;
-    LM_UINT16 Len2;
-
-    LM_UINT16 Len3;
-    LM_UINT16 Reserved1;
-#else /* BIG_ENDIAN_HOST */
-    LM_UINT16 Len2;
-    LM_UINT16 Len1;
-
-    LM_UINT16 Reserved1;
-    LM_UINT16 Len3;
-#endif
-
-    T3_RCV_BD StdRcvBd;
-} T3_EXT_RCV_BD, *PT3_EXT_RCV_BD;
-
-
-/* Error flags. */
-#define RCV_BD_ERR_BAD_CRC                          0x0001
-#define RCV_BD_ERR_COLL_DETECT                      0x0002
-#define RCV_BD_ERR_LINK_LOST_DURING_PKT             0x0004
-#define RCV_BD_ERR_PHY_DECODE_ERR                   0x0008
-#define RCV_BD_ERR_ODD_NIBBLED_RCVD_MII             0x0010
-#define RCV_BD_ERR_MAC_ABORT                        0x0020
-#define RCV_BD_ERR_LEN_LT_64                        0x0040
-#define RCV_BD_ERR_TRUNC_NO_RESOURCES               0x0080
-#define RCV_BD_ERR_GIANT_FRAME_RCVD                 0x0100
-
-
-/* Buffer descriptor flags. */
-#define RCV_BD_FLAG_END                             0x0004
-#define RCV_BD_FLAG_JUMBO_RING                      0x0020
-#define RCV_BD_FLAG_VLAN_TAG                        0x0040
-#define RCV_BD_FLAG_FRAME_HAS_ERROR                 0x0400
-#define RCV_BD_FLAG_MINI_RING                       0x0800
-#define RCV_BD_FLAG_IP_CHKSUM_FIELD                 0x1000
-#define RCV_BD_FLAG_TCP_UDP_CHKSUM_FIELD            0x2000
-#define RCV_BD_FLAG_TCP_PACKET                      0x4000
-
-
-
-/******************************************************************************/
-/* Send buffer descriptor. */
-/******************************************************************************/
-
-typedef struct {
-    T3_64BIT_HOST_ADDR HostAddr;
-
-    union {
-        struct {
-#ifdef BIG_ENDIAN_HOST
-            LM_UINT16 Len;
-            LM_UINT16 Flags;
-#else /* BIG_ENDIAN_HOST */
-            LM_UINT16 Flags;
-            LM_UINT16 Len;
-#endif
-        } s1;
-
-        LM_UINT32 Len_Flags;
-    } u1;
-
-    union {
-        struct {
-#ifdef BIG_ENDIAN_HOST
-            LM_UINT16 Reserved;
-            LM_UINT16 VlanTag;
-#else /* BIG_ENDIAN_HOST */
-            LM_UINT16 VlanTag;
-            LM_UINT16 Reserved;
-#endif
-        } s2;
-
-        LM_UINT32 VlanTag;
-    } u2;
-} T3_SND_BD, *PT3_SND_BD;
-
-
-/* Send buffer descriptor flags. */
-#define SND_BD_FLAG_TCP_UDP_CKSUM                   0x0001
-#define SND_BD_FLAG_IP_CKSUM                        0x0002
-#define SND_BD_FLAG_END                             0x0004
-#define SND_BD_FLAG_IP_FRAG                         0x0008
-#define SND_BD_FLAG_IP_FRAG_END                     0x0010
-#define SND_BD_FLAG_VLAN_TAG                        0x0040
-#define SND_BD_FLAG_COAL_NOW                        0x0080
-#define SND_BD_FLAG_CPU_PRE_DMA                     0x0100
-#define SND_BD_FLAG_CPU_POST_DMA                    0x0200
-#define SND_BD_FLAG_INSERT_SRC_ADDR                 0x1000
-#define SND_BD_FLAG_CHOOSE_SRC_ADDR                 0x6000
-#define SND_BD_FLAG_DONT_GEN_CRC                    0x8000
-
-/* MBUFs */
-typedef struct T3_MBUF_FRAME_DESC {
-#ifdef BIG_ENDIAN_HOST
-  LM_UINT32 status_control;
-  union {
-    struct {
-      LM_UINT8 cqid;
-      LM_UINT8 reserved1;
-      LM_UINT16 length;
-    }s1;
-    LM_UINT32 word;
-  }u1;
-  union {
-    struct 
-    {
-      LM_UINT16 ip_hdr_start;
-      LM_UINT16 tcp_udp_hdr_start;
-    }s2;
-
-    LM_UINT32 word;
-  }u2;
-
-  union {
-    struct {
-      LM_UINT16 data_start;
-      LM_UINT16 vlan_id;
-    }s3;
-    
-    LM_UINT32 word;
-  }u3;
-
-  union {
-    struct {
-      LM_UINT16 ip_checksum;
-      LM_UINT16 tcp_udp_checksum;
-    }s4;
-
-    LM_UINT32 word;
-  }u4;
-
-  union {
-    struct {
-      LM_UINT16 pseudo_checksum;
-      LM_UINT16 checksum_status;
-    }s5;
-
-    LM_UINT32 word;
-  }u5;
-  
-  union {
-    struct {
-      LM_UINT16 rule_match;
-      LM_UINT8 class;
-      LM_UINT8 rupt;
-    }s6;
-
-    LM_UINT32 word;
-  }u6;
-
-  union {
-    struct {
-      LM_UINT16 reserved2;
-      LM_UINT16 mbuf_num;
-    }s7;
-
-    LM_UINT32 word;
-  }u7;
-
-  LM_UINT32 reserved3;
-  LM_UINT32 reserved4;
-#else
-  LM_UINT32 status_control;
-  union {
-    struct {
-      LM_UINT16 length;
-      LM_UINT8  reserved1;
-      LM_UINT8  cqid;
-    }s1;
-    LM_UINT32 word;
-  }u1;
-  union {
-    struct 
-    {
-      LM_UINT16 tcp_udp_hdr_start;
-      LM_UINT16 ip_hdr_start;
-    }s2;
-
-    LM_UINT32 word;
-  }u2;
-
-  union {
-    struct {
-      LM_UINT16 vlan_id;
-      LM_UINT16 data_start;
-    }s3;
-    
-    LM_UINT32 word;
-  }u3;
-
-  union {
-    struct {
-      LM_UINT16 tcp_udp_checksum;
-      LM_UINT16 ip_checksum;
-    }s4;
-
-    LM_UINT32 word;
-  }u4;
-
-  union {
-    struct {
-      LM_UINT16 checksum_status;
-      LM_UINT16 pseudo_checksum;
-    }s5;
-
-    LM_UINT32 word;
-  }u5;
-  
-  union {
-    struct {
-      LM_UINT8 rupt;
-      LM_UINT8 class;
-      LM_UINT16 rule_match;
-    }s6;
-
-    LM_UINT32 word;
-  }u6;
-
-  union {
-    struct {
-      LM_UINT16 mbuf_num;
-      LM_UINT16 reserved2;
-    }s7;
-
-    LM_UINT32 word;
-  }u7;
-
-  LM_UINT32 reserved3;
-  LM_UINT32 reserved4;
-#endif
-}T3_MBUF_FRAME_DESC,*PT3_MBUF_FRAME_DESC;
-
-typedef struct T3_MBUF_HDR {
-  union {
-    struct {
-      unsigned int C:1;
-      unsigned int F:1;
-      unsigned int reserved1:7;
-      unsigned int next_mbuf:16;
-      unsigned int length:7;
-    }s1;
-    
-    LM_UINT32 word;
-  }u1;
-  
-  LM_UINT32 next_frame_ptr;
-}T3_MBUF_HDR, *PT3_MBUF_HDR;
-
-typedef struct T3_MBUF
-{
-  T3_MBUF_HDR hdr;
-  union
-  {
-    struct {
-      T3_MBUF_FRAME_DESC frame_hdr;
-      LM_UINT32 data[20];
-    }s1;
-
-    struct {
-      LM_UINT32 data[30];
-    }s2;
-  }body;
-}T3_MBUF, *PT3_MBUF;
-
-#define T3_MBUF_BASE   (T3_NIC_MBUF_POOL_ADDR >> 7)
-#define T3_MBUF_END    ((T3_NIC_MBUF_POOL_ADDR + T3_NIC_MBUF_POOL_SIZE) >> 7)
-
-
-
-/******************************************************************************/
-/* Statistics block. */
-/******************************************************************************/
-
-typedef struct {
-    LM_UINT8 Reserved0[0x400-0x300];
-
-    /* Statistics maintained by Receive MAC. */
-    T3_64BIT_REGISTER ifHCInOctets;
-    T3_64BIT_REGISTER Reserved1;
-    T3_64BIT_REGISTER etherStatsFragments;
-    T3_64BIT_REGISTER ifHCInUcastPkts;
-    T3_64BIT_REGISTER ifHCInMulticastPkts;
-    T3_64BIT_REGISTER ifHCInBroadcastPkts;
-    T3_64BIT_REGISTER dot3StatsFCSErrors;
-    T3_64BIT_REGISTER dot3StatsAlignmentErrors;
-    T3_64BIT_REGISTER xonPauseFramesReceived;
-    T3_64BIT_REGISTER xoffPauseFramesReceived;
-    T3_64BIT_REGISTER macControlFramesReceived;
-    T3_64BIT_REGISTER xoffStateEntered;
-    T3_64BIT_REGISTER dot3StatsFramesTooLong;
-    T3_64BIT_REGISTER etherStatsJabbers;
-    T3_64BIT_REGISTER etherStatsUndersizePkts;
-    T3_64BIT_REGISTER inRangeLengthError;
-    T3_64BIT_REGISTER outRangeLengthError;
-    T3_64BIT_REGISTER etherStatsPkts64Octets;
-    T3_64BIT_REGISTER etherStatsPkts65Octetsto127Octets;
-    T3_64BIT_REGISTER etherStatsPkts128Octetsto255Octets;
-    T3_64BIT_REGISTER etherStatsPkts256Octetsto511Octets;
-    T3_64BIT_REGISTER etherStatsPkts512Octetsto1023Octets;
-    T3_64BIT_REGISTER etherStatsPkts1024Octetsto1522Octets;
-    T3_64BIT_REGISTER etherStatsPkts1523Octetsto2047Octets;
-    T3_64BIT_REGISTER etherStatsPkts2048Octetsto4095Octets;
-    T3_64BIT_REGISTER etherStatsPkts4096Octetsto8191Octets;
-    T3_64BIT_REGISTER etherStatsPkts8192Octetsto9022Octets;
-
-    T3_64BIT_REGISTER Unused1[37];
-
-    /* Statistics maintained by Transmit MAC. */
-    T3_64BIT_REGISTER ifHCOutOctets;
-    T3_64BIT_REGISTER Reserved2;
-    T3_64BIT_REGISTER etherStatsCollisions;
-    T3_64BIT_REGISTER outXonSent;
-    T3_64BIT_REGISTER outXoffSent;
-    T3_64BIT_REGISTER flowControlDone;
-    T3_64BIT_REGISTER dot3StatsInternalMacTransmitErrors;
-    T3_64BIT_REGISTER dot3StatsSingleCollisionFrames;
-    T3_64BIT_REGISTER dot3StatsMultipleCollisionFrames;
-    T3_64BIT_REGISTER dot3StatsDeferredTransmissions;
-    T3_64BIT_REGISTER Reserved3;
-    T3_64BIT_REGISTER dot3StatsExcessiveCollisions;
-    T3_64BIT_REGISTER dot3StatsLateCollisions;
-    T3_64BIT_REGISTER dot3Collided2Times;
-    T3_64BIT_REGISTER dot3Collided3Times;
-    T3_64BIT_REGISTER dot3Collided4Times;
-    T3_64BIT_REGISTER dot3Collided5Times;
-    T3_64BIT_REGISTER dot3Collided6Times;
-    T3_64BIT_REGISTER dot3Collided7Times;
-    T3_64BIT_REGISTER dot3Collided8Times;
-    T3_64BIT_REGISTER dot3Collided9Times;
-    T3_64BIT_REGISTER dot3Collided10Times;
-    T3_64BIT_REGISTER dot3Collided11Times;
-    T3_64BIT_REGISTER dot3Collided12Times;
-    T3_64BIT_REGISTER dot3Collided13Times;
-    T3_64BIT_REGISTER dot3Collided14Times;
-    T3_64BIT_REGISTER dot3Collided15Times;
-    T3_64BIT_REGISTER ifHCOutUcastPkts;
-    T3_64BIT_REGISTER ifHCOutMulticastPkts;
-    T3_64BIT_REGISTER ifHCOutBroadcastPkts;
-    T3_64BIT_REGISTER dot3StatsCarrierSenseErrors;
-    T3_64BIT_REGISTER ifOutDiscards;
-    T3_64BIT_REGISTER ifOutErrors;
-
-    T3_64BIT_REGISTER Unused2[31];
-
-    /* Statistics maintained by Receive List Placement. */
-    T3_64BIT_REGISTER COSIfHCInPkts[16];
-    T3_64BIT_REGISTER COSFramesDroppedDueToFilters;
-    T3_64BIT_REGISTER nicDmaWriteQueueFull;
-    T3_64BIT_REGISTER nicDmaWriteHighPriQueueFull;
-    T3_64BIT_REGISTER nicNoMoreRxBDs;
-    T3_64BIT_REGISTER ifInDiscards;
-    T3_64BIT_REGISTER ifInErrors;
-    T3_64BIT_REGISTER nicRecvThresholdHit;
-
-    T3_64BIT_REGISTER Unused3[9];
-
-    /* Statistics maintained by Send Data Initiator. */
-    T3_64BIT_REGISTER COSIfHCOutPkts[16];
-    T3_64BIT_REGISTER nicDmaReadQueueFull;
-    T3_64BIT_REGISTER nicDmaReadHighPriQueueFull;
-    T3_64BIT_REGISTER nicSendDataCompQueueFull;
-
-    /* Statistics maintained by Host Coalescing. */
-    T3_64BIT_REGISTER nicRingSetSendProdIndex;
-    T3_64BIT_REGISTER nicRingStatusUpdate;
-    T3_64BIT_REGISTER nicInterrupts;
-    T3_64BIT_REGISTER nicAvoidedInterrupts;
-    T3_64BIT_REGISTER nicSendThresholdHit;
-
-    LM_UINT8 Reserved4[0xb00-0x9c0];
-} T3_STATS_BLOCK, *PT3_STATS_BLOCK;
-
-
-
-/******************************************************************************/
-/* PCI configuration registers. */
-/******************************************************************************/
-
-typedef struct {
-    T3_16BIT_REGISTER VendorId;
-    T3_16BIT_REGISTER DeviceId;
-
-    T3_16BIT_REGISTER Command;
-    T3_16BIT_REGISTER Status;
-
-    T3_32BIT_REGISTER ClassCodeRevId;
-
-    T3_8BIT_REGISTER CacheLineSize;
-    T3_8BIT_REGISTER LatencyTimer;
-    T3_8BIT_REGISTER HeaderType;
-    T3_8BIT_REGISTER Bist;
-
-    T3_32BIT_REGISTER MemBaseAddrLow;
-    T3_32BIT_REGISTER MemBaseAddrHigh;
-
-    LM_UINT8 Unused1[20];
-
-    T3_16BIT_REGISTER SubsystemVendorId;
-    T3_16BIT_REGISTER SubsystemId;
-
-    T3_32BIT_REGISTER RomBaseAddr;
-
-    T3_8BIT_REGISTER PciXCapiblityPtr;
-    LM_UINT8 Unused2[7];
-
-    T3_8BIT_REGISTER IntLine;
-    T3_8BIT_REGISTER IntPin;
-    T3_8BIT_REGISTER MinGnt;
-    T3_8BIT_REGISTER MaxLat;
-
-    T3_8BIT_REGISTER PciXCapabilities;
-    T3_8BIT_REGISTER PmCapabilityPtr;
-    T3_16BIT_REGISTER PciXCommand;
-
-    T3_32BIT_REGISTER PciXStatus;
-
-    T3_8BIT_REGISTER PmCapabilityId;
-    T3_8BIT_REGISTER VpdCapabilityPtr;
-    T3_16BIT_REGISTER PmCapabilities;
-
-    T3_16BIT_REGISTER PmCtrlStatus;
-    #define PM_CTRL_PME_STATUS            BIT_15
-    #define PM_CTRL_PME_ENABLE            BIT_8
-    #define PM_CTRL_PME_POWER_STATE_D0    0
-    #define PM_CTRL_PME_POWER_STATE_D1    1
-    #define PM_CTRL_PME_POWER_STATE_D2    2
-    #define PM_CTRL_PME_POWER_STATE_D3H   3
-
-    T3_8BIT_REGISTER BridgeSupportExt;
-    T3_8BIT_REGISTER PmData;
-
-    T3_8BIT_REGISTER VpdCapabilityId;
-    T3_8BIT_REGISTER MsiCapabilityPtr;
-    T3_16BIT_REGISTER VpdAddrFlag;
-    #define VPD_FLAG_WRITE      (1 << 15)
-    #define VPD_FLAG_RW_MASK    (1 << 15)
-    #define VPD_FLAG_READ       0
-
-
-    T3_32BIT_REGISTER VpdData;
-
-    T3_8BIT_REGISTER MsiCapabilityId;
-    T3_8BIT_REGISTER NextCapabilityPtr;
-    T3_16BIT_REGISTER MsiCtrl;
-    #define MSI_CTRL_64BIT_CAP     (1 << 7)
-    #define MSI_CTRL_MSG_ENABLE(x) (x << 4)
-    #define MSI_CTRL_MSG_CAP(x)    (x << 1)
-    #define MSI_CTRL_ENABLE        (1 << 0)
-  
-
-    T3_32BIT_REGISTER MsiAddrLow;
-    T3_32BIT_REGISTER MsiAddrHigh;
-
-    T3_16BIT_REGISTER MsiData;
-    T3_16BIT_REGISTER Unused3;
-
-    T3_32BIT_REGISTER MiscHostCtrl;
-    #define MISC_HOST_CTRL_CLEAR_INT                        BIT_0
-    #define MISC_HOST_CTRL_MASK_PCI_INT                     BIT_1
-    #define MISC_HOST_CTRL_ENABLE_ENDIAN_BYTE_SWAP          BIT_2
-    #define MISC_HOST_CTRL_ENABLE_ENDIAN_WORD_SWAP          BIT_3
-    #define MISC_HOST_CTRL_ENABLE_PCI_STATE_REG_RW          BIT_4
-    #define MISC_HOST_CTRL_ENABLE_CLK_REG_RW                BIT_5
-    #define MISC_HOST_CTRL_ENABLE_REG_WORD_SWAP             BIT_6
-    #define MISC_HOST_CTRL_ENABLE_INDIRECT_ACCESS           BIT_7
-    #define MISC_HOST_CTRL_ENABLE_INT_MASK_MODE             BIT_8
-    #define MISC_HOST_CTRL_ENABLE_TAGGED_STATUS_MODE        BIT_9
-
-    T3_32BIT_REGISTER DmaReadWriteCtrl;
-    #define DMA_CTRL_WRITE_BOUNDARY_MASK            (BIT_11 | BIT_12 | BIT_13)
-    #define DMA_CTRL_WRITE_BOUNDARY_DISABLE         0
-    #define DMA_CTRL_WRITE_BOUNDARY_16              BIT_11
-    #define DMA_CTRL_WRITE_BOUNDARY_32              BIT_12
-    #define DMA_CTRL_WRITE_BOUNDARY_64              (BIT_12 | BIT_11)
-    #define DMA_CTRL_WRITE_BOUNDARY_128             BIT_13
-    #define DMA_CTRL_WRITE_BOUNDARY_256             (BIT_13 | BIT_11)
-    #define DMA_CTRL_WRITE_BOUNDARY_512             (BIT_13 | BIT_12)
-    #define DMA_CTRL_WRITE_BOUNDARY_1024            (BIT_13 | BIT_12 | BIT_11)
-    #define DMA_CTRL_WRITE_ONE_DMA_AT_ONCE          BIT_14
-
-
-    T3_32BIT_REGISTER PciState;
-    #define T3_PCI_STATE_FORCE_PCI_RESET                    BIT_0
-    #define T3_PCI_STATE_INTERRUPT_NOT_ACTIVE               BIT_1
-    #define T3_PCI_STATE_NOT_PCI_X_BUS                      BIT_2
-    #define T3_PCI_STATE_HIGH_BUS_SPEED                     BIT_3
-    #define T3_PCI_STATE_32BIT_PCI_BUS                      BIT_4
-    #define T3_PCI_STATE_PCI_ROM_ENABLE                     BIT_5
-    #define T3_PCI_STATE_PCI_ROM_RETRY_ENABLE               BIT_6
-    #define T3_PCI_STATE_FLAT_VIEW                          BIT_8
-    #define T3_PCI_STATE_RETRY_SAME_DMA                     BIT_13
-
-    T3_32BIT_REGISTER ClockCtrl;
-    #define T3_PCI_CLKCTRL_TXCPU_CLK_DISABLE                BIT_11
-    #define T3_PCI_CLKCTRL_RXCPU_CLK_DISABLE                BIT_10
-    #define T3_PCI_CLKCTRL_CORE_CLK_DISABLE                 BIT_9
-
-    T3_32BIT_REGISTER RegBaseAddr;
-
-    T3_32BIT_REGISTER MemWindowBaseAddr;
-    
-#ifdef NIC_CPU_VIEW
-  /* These registers are ONLY visible to NIC CPU */
-    T3_32BIT_REGISTER PowerConsumed;
-    T3_32BIT_REGISTER PowerDissipated;
-#else /* NIC_CPU_VIEW */
-    T3_32BIT_REGISTER RegData;
-    T3_32BIT_REGISTER MemWindowData;
-#endif /* !NIC_CPU_VIEW */
-
-    T3_32BIT_REGISTER ModeCtrl;
-
-    T3_32BIT_REGISTER MiscCfg;
-
-    T3_32BIT_REGISTER MiscLocalCtrl;
-
-    T3_32BIT_REGISTER Unused4;
-
-    /* NOTE: Big/Little-endian clarification needed.  Are these register */
-    /* in big or little endian formate. */
-    T3_64BIT_REGISTER StdRingProdIdx;
-    T3_64BIT_REGISTER RcvRetRingConIdx;
-    T3_64BIT_REGISTER SndProdIdx;
-
-    T3_32BIT_REGISTER Unused5[2];
-
-    T3_32BIT_REGISTER DualMacCtrl;
-    #define T3_DUAL_MAC_CH_CTRL_MASK     (BIT_1 | BIT_0)
-    #define T3_DUAL_MAC_ID               BIT_2
-
-    LM_UINT8 Unused6[68];
-
-} T3_PCI_CONFIGURATION, *PT3_PCI_CONFIGURATION;
-
-#define PCIX_CMD_MAX_SPLIT_MASK                         0x00700000
-#define PCIX_CMD_MAX_SPLIT_SHL                          20
-#define PCIX_CMD_MAX_BURST_MASK                         0x000c0000
-#define PCIX_CMD_MAX_BURST_SHL                          18
-#define PCIX_CMD_MAX_BURST_CPIOB                        2
-
-/******************************************************************************/
-/* Mac control registers. */
-/******************************************************************************/
-
-typedef struct {
-    /* MAC mode control. */
-    T3_32BIT_REGISTER Mode;
-    #define MAC_MODE_GLOBAL_RESET                       BIT_0
-    #define MAC_MODE_HALF_DUPLEX                        BIT_1
-    #define MAC_MODE_PORT_MODE_MASK                     (BIT_2 | BIT_3)
-    #define MAC_MODE_PORT_MODE_TBI                      (BIT_2 | BIT_3)
-    #define MAC_MODE_PORT_MODE_GMII                     BIT_3
-    #define MAC_MODE_PORT_MODE_MII                      BIT_2
-    #define MAC_MODE_PORT_MODE_NONE                     BIT_NONE
-    #define MAC_MODE_PORT_INTERNAL_LOOPBACK             BIT_4
-    #define MAC_MODE_TAGGED_MAC_CONTROL                 BIT_7
-    #define MAC_MODE_TX_BURSTING                        BIT_8
-    #define MAC_MODE_MAX_DEFER                          BIT_9
-    #define MAC_MODE_LINK_POLARITY                      BIT_10
-    #define MAC_MODE_ENABLE_RX_STATISTICS               BIT_11
-    #define MAC_MODE_CLEAR_RX_STATISTICS                BIT_12
-    #define MAC_MODE_FLUSH_RX_STATISTICS                BIT_13
-    #define MAC_MODE_ENABLE_TX_STATISTICS               BIT_14
-    #define MAC_MODE_CLEAR_TX_STATISTICS                BIT_15
-    #define MAC_MODE_FLUSH_TX_STATISTICS                BIT_16
-    #define MAC_MODE_SEND_CONFIGS                       BIT_17
-    #define MAC_MODE_DETECT_MAGIC_PACKET_ENABLE         BIT_18
-    #define MAC_MODE_ACPI_POWER_ON_ENABLE               BIT_19
-    #define MAC_MODE_ENABLE_MIP                         BIT_20
-    #define MAC_MODE_ENABLE_TDE                         BIT_21
-    #define MAC_MODE_ENABLE_RDE                         BIT_22
-    #define MAC_MODE_ENABLE_FHDE                        BIT_23
-
-    /* MAC status */
-    T3_32BIT_REGISTER Status;
-    #define MAC_STATUS_PCS_SYNCED                       BIT_0
-    #define MAC_STATUS_SIGNAL_DETECTED                  BIT_1
-    #define MAC_STATUS_RECEIVING_CFG                    BIT_2
-    #define MAC_STATUS_CFG_CHANGED                      BIT_3
-    #define MAC_STATUS_SYNC_CHANGED                     BIT_4
-    #define MAC_STATUS_PORT_DECODE_ERROR                BIT_10
-    #define MAC_STATUS_LINK_STATE_CHANGED               BIT_12
-    #define MAC_STATUS_MI_COMPLETION                    BIT_22
-    #define MAC_STATUS_MI_INTERRUPT                     BIT_23
-    #define MAC_STATUS_AP_ERROR                         BIT_24
-    #define MAC_STATUS_ODI_ERROR                        BIT_25
-    #define MAC_STATUS_RX_STATS_OVERRUN                 BIT_26
-    #define MAC_STATUS_TX_STATS_OVERRUN                 BIT_27
-
-    /* Event Enable */
-    T3_32BIT_REGISTER MacEvent;
-    #define MAC_EVENT_ENABLE_PORT_DECODE_ERR            BIT_10
-    #define MAC_EVENT_ENABLE_LINK_STATE_CHANGED_ATTN    BIT_12
-    #define MAC_EVENT_ENABLE_MI_COMPLETION              BIT_22
-    #define MAC_EVENT_ENABLE_MI_INTERRUPT               BIT_23
-    #define MAC_EVENT_ENABLE_AP_ERROR                   BIT_24
-    #define MAC_EVENT_ENABLE_ODI_ERROR                  BIT_25
-    #define MAC_EVENT_ENABLE_RX_STATS_OVERRUN           BIT_26
-    #define MAC_EVENT_ENABLE_TX_STATS_OVERRUN           BIT_27
-
-    /* Led control. */
-    T3_32BIT_REGISTER LedCtrl;
-    #define LED_CTRL_OVERRIDE_LINK_LED                  BIT_0
-    #define LED_CTRL_1000MBPS_LED_ON                    BIT_1
-    #define LED_CTRL_100MBPS_LED_ON                     BIT_2
-    #define LED_CTRL_10MBPS_LED_ON                      BIT_3
-    #define LED_CTRL_OVERRIDE_TRAFFIC_LED               BIT_4
-    #define LED_CTRL_BLINK_TRAFFIC_LED                  BIT_5
-    #define LED_CTRL_TRAFFIC_LED                        BIT_6
-    #define LED_CTRL_1000MBPS_LED_STATUS                BIT_7
-    #define LED_CTRL_100MBPS_LED_STATUS                 BIT_8
-    #define LED_CTRL_10MBPS_LED_STATUS                  BIT_9
-    #define LED_CTRL_TRAFFIC_LED_STATUS                 BIT_10
-    #define LED_CTRL_MAC_MODE                           BIT_NONE
-    #define LED_CTRL_PHY_MODE_1                         BIT_11
-    #define LED_CTRL_PHY_MODE_2                         BIT_12
-    #define LED_CTRL_BLINK_RATE_MASK                    0x7ff80000
-    #define LED_CTRL_OVERRIDE_BLINK_PERIOD              BIT_19
-    #define LED_CTRL_OVERRIDE_BLINK_RATE                BIT_31
-
-    /* MAC addresses. */
-    struct {
-        T3_32BIT_REGISTER High;             /* Upper 2 bytes. */
-        T3_32BIT_REGISTER Low;              /* Lower 4 bytes. */
-    } MacAddr[4];
-
-    /* ACPI Mbuf pointer. */
-    T3_32BIT_REGISTER AcpiMbufPtr;
-
-    /* ACPI Length and Offset. */
-    T3_32BIT_REGISTER AcpiLengthOffset;
-    #define ACPI_LENGTH_MASK                            0xffff
-    #define ACPI_OFFSET_MASK                            0x0fff0000
-    #define ACPI_LENGTH(x)                              x
-    #define ACPI_OFFSET(x)                              ((x) << 16)
-
-    /* Transmit random backoff. */
-    T3_32BIT_REGISTER TxBackoffSeed;
-    #define MAC_TX_BACKOFF_SEED_MASK                    0x3ff
-
-    /* Receive MTU */
-    T3_32BIT_REGISTER MtuSize;
-    #define MAC_RX_MTU_MASK                             0xffff
-
-    /* Gigabit PCS Test. */
-    T3_32BIT_REGISTER PcsTest;
-    #define MAC_PCS_TEST_DATA_PATTERN_MASK              0x0fffff
-    #define MAC_PCS_TEST_ENABLE                         BIT_20
-
-    /* Transmit Gigabit Auto-Negotiation. */
-    T3_32BIT_REGISTER TxAutoNeg;
-    #define MAC_AN_TX_AN_DATA_MASK                      0xffff
-
-    /* Receive Gigabit Auto-Negotiation. */
-    T3_32BIT_REGISTER RxAutoNeg;
-    #define MAC_AN_RX_AN_DATA_MASK                      0xffff
-
-    /* MI Communication. */
-    T3_32BIT_REGISTER MiCom;
-    #define MI_COM_CMD_MASK                             (BIT_26 | BIT_27)
-    #define MI_COM_CMD_WRITE                            BIT_26
-    #define MI_COM_CMD_READ                             BIT_27
-    #define MI_COM_READ_FAILED                          BIT_28
-    #define MI_COM_START                                BIT_29
-    #define MI_COM_BUSY                                 BIT_29
-
-    #define MI_COM_PHY_ADDR_MASK                        0x1f
-    #define MI_COM_FIRST_PHY_ADDR_BIT                   21
-
-    #define MI_COM_PHY_REG_ADDR_MASK                    0x1f
-    #define MI_COM_FIRST_PHY_REG_ADDR_BIT               16
-
-    #define MI_COM_PHY_DATA_MASK                        0xffff
-
-    /* MI Status. */
-    T3_32BIT_REGISTER MiStatus;
-    #define MI_STATUS_ENABLE_LINK_STATUS_ATTN           BIT_0
-
-    /* MI Mode. */
-    T3_32BIT_REGISTER MiMode;
-    #define MI_MODE_CLOCK_SPEED_10MHZ                   BIT_0
-    #define MI_MODE_USE_SHORT_PREAMBLE                  BIT_1
-    #define MI_MODE_AUTO_POLLING_ENABLE                 BIT_4
-    #define MI_MODE_CORE_CLOCK_SPEED_62MHZ              BIT_15
-
-    /* Auto-polling status. */
-    T3_32BIT_REGISTER AutoPollStatus;
-    #define AUTO_POLL_ERROR                             BIT_0
-
-    /* Transmit MAC mode. */
-    T3_32BIT_REGISTER TxMode;
-    #define TX_MODE_RESET                               BIT_0
-    #define TX_MODE_ENABLE                              BIT_1
-    #define TX_MODE_ENABLE_FLOW_CONTROL                 BIT_4
-    #define TX_MODE_ENABLE_BIG_BACKOFF                  BIT_5
-    #define TX_MODE_ENABLE_LONG_PAUSE                   BIT_6
-
-    /* Transmit MAC status. */
-    T3_32BIT_REGISTER TxStatus;
-    #define TX_STATUS_RX_CURRENTLY_XOFFED               BIT_0
-    #define TX_STATUS_SENT_XOFF                         BIT_1
-    #define TX_STATUS_SENT_XON                          BIT_2
-    #define TX_STATUS_LINK_UP                           BIT_3
-    #define TX_STATUS_ODI_UNDERRUN                      BIT_4
-    #define TX_STATUS_ODI_OVERRUN                       BIT_5
-
-    /* Transmit MAC length. */
-    T3_32BIT_REGISTER TxLengths;
-    #define TX_LEN_SLOT_TIME_MASK                       0xff
-    #define TX_LEN_IPG_MASK                             0x0f00
-    #define TX_LEN_IPG_CRS_MASK                         (BIT_12 | BIT_13)
-
-    /* Receive MAC mode. */
-    T3_32BIT_REGISTER RxMode;
-    #define RX_MODE_RESET                               BIT_0
-    #define RX_MODE_ENABLE                              BIT_1
-    #define RX_MODE_ENABLE_FLOW_CONTROL                 BIT_2
-    #define RX_MODE_KEEP_MAC_CONTROL                    BIT_3
-    #define RX_MODE_KEEP_PAUSE                          BIT_4
-    #define RX_MODE_ACCEPT_OVERSIZED                    BIT_5
-    #define RX_MODE_ACCEPT_RUNTS                        BIT_6
-    #define RX_MODE_LENGTH_CHECK                        BIT_7
-    #define RX_MODE_PROMISCUOUS_MODE                    BIT_8
-    #define RX_MODE_NO_CRC_CHECK                        BIT_9
-    #define RX_MODE_KEEP_VLAN_TAG                       BIT_10
-
-    /* Receive MAC status. */
-    T3_32BIT_REGISTER RxStatus;
-    #define RX_STATUS_REMOTE_TRANSMITTER_XOFFED         BIT_0
-    #define RX_STATUS_XOFF_RECEIVED                     BIT_1
-    #define RX_STATUS_XON_RECEIVED                      BIT_2
-
-    /* Hash registers. */
-    T3_32BIT_REGISTER HashReg[4];
-
-    /* Receive placement rules registers. */
-    struct {
-        T3_32BIT_REGISTER Rule;
-        T3_32BIT_REGISTER Value;
-    } RcvRules[16];
-
-    #define RCV_DISABLE_RULE_MASK                       0x7fffffff
-
-    #define RCV_RULE1_REJECT_BROADCAST_IDX              0x00
-    #define REJECT_BROADCAST_RULE1_RULE                 0xc2000000
-    #define REJECT_BROADCAST_RULE1_VALUE                0xffffffff
-
-    #define RCV_RULE2_REJECT_BROADCAST_IDX              0x01
-    #define REJECT_BROADCAST_RULE2_RULE                 0x86000004
-    #define REJECT_BROADCAST_RULE2_VALUE                0xffffffff
-
-#if INCLUDE_5701_AX_FIX
-    #define RCV_LAST_RULE_IDX                           0x04
-#else
-    #define RCV_LAST_RULE_IDX                           0x02
-#endif
-
-    T3_32BIT_REGISTER RcvRuleCfg;
-    #define RX_RULE_DEFAULT_CLASS                       (1 << 3)
-
-    T3_32BIT_REGISTER LowWaterMarkMaxRxFrame;
-
-    LM_UINT8 Reserved1[24];
-
-    T3_32BIT_REGISTER HashRegU[4];
-
-    struct {
-        T3_32BIT_REGISTER High;
-        T3_32BIT_REGISTER Low;
-    } MacAddrExt[12];
-
-    T3_32BIT_REGISTER SerdesCfg;
-    T3_32BIT_REGISTER SerdesStatus;
-
-    LM_UINT8 Reserved2[24];
-
-    T3_32BIT_REGISTER SgDigControl;
-    T3_32BIT_REGISTER SgDigStatus;
-
-    LM_UINT8 Reserved3[72];
-
-    volatile LM_UINT8 TxMacState[16];
-    volatile LM_UINT8 RxMacState[20];
-
-    LM_UINT8 Reserved4[476];
-
-    T3_32BIT_REGISTER ifHCOutOctets;
-    T3_32BIT_REGISTER Reserved5;
-    T3_32BIT_REGISTER etherStatsCollisions;
-    T3_32BIT_REGISTER outXonSent;
-    T3_32BIT_REGISTER outXoffSent;
-    T3_32BIT_REGISTER Reserved6;
-    T3_32BIT_REGISTER dot3StatsInternalMacTransmitErrors;
-    T3_32BIT_REGISTER dot3StatsSingleCollisionFrames;
-    T3_32BIT_REGISTER dot3StatsMultipleCollisionFrames;
-    T3_32BIT_REGISTER dot3StatsDeferredTransmissions;
-    T3_32BIT_REGISTER Reserved7;
-    T3_32BIT_REGISTER dot3StatsExcessiveCollisions;
-    T3_32BIT_REGISTER dot3StatsLateCollisions;
-    T3_32BIT_REGISTER Reserved8[14];
-    T3_32BIT_REGISTER ifHCOutUcastPkts;
-    T3_32BIT_REGISTER ifHCOutMulticastPkts;
-    T3_32BIT_REGISTER ifHCOutBroadcastPkts;
-    T3_32BIT_REGISTER Reserved9[2];
-    T3_32BIT_REGISTER ifHCInOctets;
-    T3_32BIT_REGISTER Reserved10;
-    T3_32BIT_REGISTER etherStatsFragments;
-    T3_32BIT_REGISTER ifHCInUcastPkts;
-    T3_32BIT_REGISTER ifHCInMulticastPkts;
-    T3_32BIT_REGISTER ifHCInBroadcastPkts;
-    T3_32BIT_REGISTER dot3StatsFCSErrors;
-    T3_32BIT_REGISTER dot3StatsAlignmentErrors;
-    T3_32BIT_REGISTER xonPauseFramesReceived;
-    T3_32BIT_REGISTER xoffPauseFramesReceived;
-    T3_32BIT_REGISTER macControlFramesReceived;
-    T3_32BIT_REGISTER xoffStateEntered;
-    T3_32BIT_REGISTER dot3StatsFramesTooLong;
-    T3_32BIT_REGISTER etherStatsJabbers;
-    T3_32BIT_REGISTER etherStatsUndersizePkts;
-
-    T3_32BIT_REGISTER Reserved11[209];
-
-} T3_MAC_CONTROL, *PT3_MAC_CONTROL;
-
-
-
-/******************************************************************************/
-/* Send data initiator control registers. */
-/******************************************************************************/
-
-typedef struct {
-    T3_32BIT_REGISTER Mode;
-    #define T3_SND_DATA_IN_MODE_RESET                       BIT_0
-    #define T3_SND_DATA_IN_MODE_ENABLE                      BIT_1
-    #define T3_SND_DATA_IN_MODE_STATS_OFLW_ATTN_ENABLE      BIT_2
-
-    T3_32BIT_REGISTER Status;
-    #define T3_SND_DATA_IN_STATUS_STATS_OFLW_ATTN           BIT_2
-
-    T3_32BIT_REGISTER StatsCtrl;
-    #define T3_SND_DATA_IN_STATS_CTRL_ENABLE                BIT_0
-    #define T3_SND_DATA_IN_STATS_CTRL_FASTER_UPDATE         BIT_1
-    #define T3_SND_DATA_IN_STATS_CTRL_CLEAR                 BIT_2
-    #define T3_SND_DATA_IN_STATS_CTRL_FLUSH                 BIT_3
-    #define T3_SND_DATA_IN_STATS_CTRL_FORCE_ZERO            BIT_4
-
-    T3_32BIT_REGISTER StatsEnableMask;
-
-    T3_32BIT_REGISTER StatsIncMask;
-
-    LM_UINT8 Reserved[108];
-
-    T3_32BIT_REGISTER ClassOfServCnt[16];
-    T3_32BIT_REGISTER DmaReadQFullCnt;
-    T3_32BIT_REGISTER DmaPriorityReadQFullCnt;
-    T3_32BIT_REGISTER SdcQFullCnt;
-
-    T3_32BIT_REGISTER NicRingSetSendProdIdxCnt;
-    T3_32BIT_REGISTER StatusUpdatedCnt;
-    T3_32BIT_REGISTER InterruptsCnt;
-    T3_32BIT_REGISTER AvoidInterruptsCnt;
-    T3_32BIT_REGISTER SendThresholdHitCnt;
-
-    /* Unused space. */
-    LM_UINT8 Unused[800];
-} T3_SEND_DATA_INITIATOR, *PT3_SEND_DATA_INITIATOR;
-
-
-
-/******************************************************************************/
-/* Send data completion control registers. */
-/******************************************************************************/
-
-typedef struct {
-    T3_32BIT_REGISTER Mode;
-    #define SND_DATA_COMP_MODE_RESET                        BIT_0
-    #define SND_DATA_COMP_MODE_ENABLE                       BIT_1
-
-    /* Unused space. */
-    LM_UINT8 Unused[1020];
-} T3_SEND_DATA_COMPLETION, *PT3_SEND_DATA_COMPLETION;
-
-
-
-/******************************************************************************/
-/* Send BD Ring Selector Control Registers. */
-/******************************************************************************/
-
-typedef struct {
-    T3_32BIT_REGISTER Mode;
-    #define SND_BD_SEL_MODE_RESET                           BIT_0
-    #define SND_BD_SEL_MODE_ENABLE                          BIT_1
-    #define SND_BD_SEL_MODE_ATTN_ENABLE                     BIT_2
-
-    T3_32BIT_REGISTER Status;
-    #define SND_BD_SEL_STATUS_ERROR_ATTN                    BIT_2
-
-    T3_32BIT_REGISTER HwDiag;
-
-    /* Unused space. */
-    LM_UINT8 Unused1[52];
-
-    /* Send BD Ring Selector Local NIC Send BD Consumer Index. */
-    T3_32BIT_REGISTER NicSendBdSelConIdx[16];
-
-    /* Unused space. */
-    LM_UINT8 Unused2[896];
-} T3_SEND_BD_SELECTOR, *PT3_SEND_BD_SELECTOR;
-
-
-
-/******************************************************************************/
-/* Send BD initiator control registers. */
-/******************************************************************************/
-
-typedef struct {
-    T3_32BIT_REGISTER Mode;
-    #define SND_BD_IN_MODE_RESET                            BIT_0
-    #define SND_BD_IN_MODE_ENABLE                           BIT_1
-    #define SND_BD_IN_MODE_ATTN_ENABLE                      BIT_2
-
-    T3_32BIT_REGISTER Status;
-    #define SND_BD_IN_STATUS_ERROR_ATTN                     BIT_2
-
-    /* Send BD initiator local NIC send BD producer index. */
-    T3_32BIT_REGISTER NicSendBdInProdIdx[16];
-
-    /* Unused space. */
-    LM_UINT8 Unused2[952];
-} T3_SEND_BD_INITIATOR, *PT3_SEND_BD_INITIATOR;
-
-
-
-/******************************************************************************/
-/* Send BD Completion Control. */
-/******************************************************************************/
-
-typedef struct {
-    T3_32BIT_REGISTER Mode;
-    #define SND_BD_COMP_MODE_RESET                          BIT_0
-    #define SND_BD_COMP_MODE_ENABLE                         BIT_1
-    #define SND_BD_COMP_MODE_ATTN_ENABLE                    BIT_2
-
-    /* Unused space. */
-    LM_UINT8 Unused2[1020];
-} T3_SEND_BD_COMPLETION, *PT3_SEND_BD_COMPLETION;
-
-
-
-/******************************************************************************/
-/* Receive list placement control registers. */
-/******************************************************************************/
-
-typedef struct {
-    /* Mode. */
-    T3_32BIT_REGISTER Mode;
-    #define RCV_LIST_PLMT_MODE_RESET                        BIT_0
-    #define RCV_LIST_PLMT_MODE_ENABLE                       BIT_1
-    #define RCV_LIST_PLMT_MODE_CLASS0_ATTN_ENABLE           BIT_2
-    #define RCV_LIST_PLMT_MODE_MAPPING_OOR_ATTN_ENABLE      BIT_3
-    #define RCV_LIST_PLMT_MODE_STATS_OFLOW_ATTN_ENABLE      BIT_4
-
-    /* Status. */
-    T3_32BIT_REGISTER Status;
-    #define RCV_LIST_PLMT_STATUS_CLASS0_ATTN                BIT_2
-    #define RCV_LIST_PLMT_STATUS_MAPPING_ATTN               BIT_3
-    #define RCV_LIST_PLMT_STATUS_STATS_OFLOW_ATTN           BIT_4
-
-    /* Receive selector list lock register. */
-    T3_32BIT_REGISTER Lock;
-    #define RCV_LIST_SEL_LOCK_REQUEST_MASK                  0xffff
-    #define RCV_LIST_SEL_LOCK_GRANT_MASK                    0xffff0000
-
-    /* Selector non-empty bits. */
-    T3_32BIT_REGISTER NonEmptyBits;
-    #define RCV_LIST_SEL_NON_EMPTY_MASK                     0xffff
-
-    /* Receive list placement configuration register. */
-    T3_32BIT_REGISTER Config;
-
-    /* Receive List Placement statistics Control. */
-    T3_32BIT_REGISTER StatsCtrl;
-#define RCV_LIST_STATS_ENABLE                               BIT_0
-#define RCV_LIST_STATS_FAST_UPDATE                          BIT_1
-
-    /* Receive List Placement statistics Enable Mask. */
-    T3_32BIT_REGISTER StatsEnableMask;
-    #define T3_DISABLE_LONG_BURST_READ_DYN_FIX              BIT_22
-
-    /* Receive List Placement statistics Increment Mask. */
-    T3_32BIT_REGISTER StatsIncMask;
-
-    /* Unused space. */
-    LM_UINT8 Unused1[224];
-
-    struct {
-        T3_32BIT_REGISTER Head;
-        T3_32BIT_REGISTER Tail;
-        T3_32BIT_REGISTER Count;
-
-        /* Unused space. */
-        LM_UINT8 Unused[4];
-    } RcvSelectorList[16];
-
-    /* Local statistics counter. */
-    T3_32BIT_REGISTER ClassOfServCnt[16];
-
-    T3_32BIT_REGISTER DropDueToFilterCnt;
-    T3_32BIT_REGISTER DmaWriteQFullCnt;
-    T3_32BIT_REGISTER DmaHighPriorityWriteQFullCnt;
-    T3_32BIT_REGISTER NoMoreReceiveBdCnt;
-    T3_32BIT_REGISTER IfInDiscardsCnt;
-    T3_32BIT_REGISTER IfInErrorsCnt;
-    T3_32BIT_REGISTER RcvThresholdHitCnt;
-
-    /* Another unused space. */
-    LM_UINT8 Unused2[420];
-} T3_RCV_LIST_PLACEMENT, *PT3_RCV_LIST_PLACEMENT;
-
-
-
-/******************************************************************************/
-/* Receive Data and Receive BD Initiator Control. */
-/******************************************************************************/
-
-typedef struct {
-    /* Mode. */
-    T3_32BIT_REGISTER Mode;
-    #define RCV_DATA_BD_IN_MODE_RESET                   BIT_0
-    #define RCV_DATA_BD_IN_MODE_ENABLE                  BIT_1
-    #define RCV_DATA_BD_IN_MODE_JUMBO_BD_NEEDED         BIT_2
-    #define RCV_DATA_BD_IN_MODE_FRAME_TOO_BIG           BIT_3
-    #define RCV_DATA_BD_IN_MODE_INVALID_RING_SIZE       BIT_4
-
-    /* Status. */
-    T3_32BIT_REGISTER Status;
-    #define RCV_DATA_BD_IN_STATUS_JUMBO_BD_NEEDED       BIT_2
-    #define RCV_DATA_BD_IN_STATUS_FRAME_TOO_BIG         BIT_3
-    #define RCV_DATA_BD_IN_STATUS_INVALID_RING_SIZE     BIT_4
-
-    /* Split frame minium size. */
-    T3_32BIT_REGISTER SplitFrameMinSize;
-
-    /* Unused space. */
-    LM_UINT8 Unused1[0x2440-0x240c];
-
-    /* Receive RCBs. */
-    T3_RCB JumboRcvRcb;
-    T3_RCB StdRcvRcb;
-    T3_RCB MiniRcvRcb;
-
-    /* Receive Data and Receive BD Ring Initiator Local NIC Receive */
-    /* BD Consumber Index. */
-    T3_32BIT_REGISTER NicJumboConIdx;
-    T3_32BIT_REGISTER NicStdConIdx;
-    T3_32BIT_REGISTER NicMiniConIdx;
-
-    /* Unused space. */
-    LM_UINT8 Unused2[4];
-
-    /* Receive Data and Receive BD Initiator Local Receive Return ProdIdx. */
-    T3_32BIT_REGISTER RcvDataBdProdIdx[16];
-
-    /* Receive Data and Receive BD Initiator Hardware Diagnostic. */
-    T3_32BIT_REGISTER HwDiag;
-
-    /* Unused space. */
-    LM_UINT8 Unused3[828];
-} T3_RCV_DATA_BD_INITIATOR, *PT3_RCV_DATA_BD_INITIATOR;
-
-
-
-/******************************************************************************/
-/* Receive Data Completion Control Registes. */
-/******************************************************************************/
-
-typedef struct {
-    T3_32BIT_REGISTER Mode;
-    #define RCV_DATA_COMP_MODE_RESET                        BIT_0
-    #define RCV_DATA_COMP_MODE_ENABLE                       BIT_1
-    #define RCV_DATA_COMP_MODE_ATTN_ENABLE                  BIT_2
-
-    /* Unused spaced. */
-    LM_UINT8 Unused[1020];
-} T3_RCV_DATA_COMPLETION, *PT3_RCV_DATA_COMPLETION;
-
-
-
-/******************************************************************************/
-/* Receive BD Initiator Control. */
-/******************************************************************************/
-
-typedef struct {
-    T3_32BIT_REGISTER Mode;
-    #define RCV_BD_IN_MODE_RESET                            BIT_0
-    #define RCV_BD_IN_MODE_ENABLE                           BIT_1
-    #define RCV_BD_IN_MODE_BD_IN_DIABLED_RCB_ATTN_ENABLE    BIT_2
-
-    T3_32BIT_REGISTER Status;
-    #define RCV_BD_IN_STATUS_BD_IN_DIABLED_RCB_ATTN         BIT_2
-
-    T3_32BIT_REGISTER NicJumboRcvProdIdx;
-    T3_32BIT_REGISTER NicStdRcvProdIdx;
-    T3_32BIT_REGISTER NicMiniRcvProdIdx;
-
-    T3_32BIT_REGISTER MiniRcvThreshold;
-    T3_32BIT_REGISTER StdRcvThreshold;
-    T3_32BIT_REGISTER JumboRcvThreshold;
-
-    /* Unused space. */
-    LM_UINT8 Unused[992];
-} T3_RCV_BD_INITIATOR, *PT3_RCV_BD_INITIATOR;
-
-
-
-/******************************************************************************/
-/* Receive BD Completion Control Registers. */
-/******************************************************************************/
-
-typedef struct {
-    T3_32BIT_REGISTER Mode;
-    #define RCV_BD_COMP_MODE_RESET                          BIT_0
-    #define RCV_BD_COMP_MODE_ENABLE                         BIT_1
-    #define RCV_BD_COMP_MODE_ATTN_ENABLE                    BIT_2
-
-    T3_32BIT_REGISTER Status;
-    #define RCV_BD_COMP_STATUS_ERROR_ATTN                   BIT_2
-
-    T3_32BIT_REGISTER  NicJumboRcvBdProdIdx;
-    T3_32BIT_REGISTER  NicStdRcvBdProdIdx;
-    T3_32BIT_REGISTER  NicMiniRcvBdProdIdx;
-
-    /* Unused space. */
-    LM_UINT8 Unused[1004];
-} T3_RCV_BD_COMPLETION, *PT3_RCV_BD_COMPLETION;
-
-
-
-/******************************************************************************/
-/* Receive list selector control register. */
-/******************************************************************************/
-
-typedef struct {
-    T3_32BIT_REGISTER Mode;
-    #define RCV_LIST_SEL_MODE_RESET                         BIT_0
-    #define RCV_LIST_SEL_MODE_ENABLE                        BIT_1
-    #define RCV_LIST_SEL_MODE_ATTN_ENABLE                   BIT_2
-
-    T3_32BIT_REGISTER Status;
-    #define RCV_LIST_SEL_STATUS_ERROR_ATTN                  BIT_2
-
-    /* Unused space. */
-    LM_UINT8 Unused[1016];
-} T3_RCV_LIST_SELECTOR, *PT3_RCV_LIST_SELECTOR;
-
-
-
-/******************************************************************************/
-/* Mbuf cluster free registers. */
-/******************************************************************************/
-
-typedef struct {
-    T3_32BIT_REGISTER Mode;
-#define MBUF_CLUSTER_FREE_MODE_RESET    BIT_0
-#define MBUF_CLUSTER_FREE_MODE_ENABLE   BIT_1
-
-    T3_32BIT_REGISTER Status;
-
-    /* Unused space. */
-    LM_UINT8 Unused[1016];
-} T3_MBUF_CLUSTER_FREE, *PT3_MBUF_CLUSTER_FREE;
-
-
-
-/******************************************************************************/
-/* Host coalescing control registers. */
-/******************************************************************************/
-
-typedef struct {
-    /* Mode. */
-    T3_32BIT_REGISTER Mode;
-    #define HOST_COALESCE_RESET                         BIT_0
-    #define HOST_COALESCE_ENABLE                        BIT_1
-    #define HOST_COALESCE_ATTN                          BIT_2
-    #define HOST_COALESCE_NOW                           BIT_3
-    #define HOST_COALESCE_FULL_STATUS_MODE              BIT_NONE
-    #define HOST_COALESCE_64_BYTE_STATUS_MODE           BIT_7
-    #define HOST_COALESCE_32_BYTE_STATUS_MODE           BIT_8
-    #define HOST_COALESCE_CLEAR_TICKS_ON_RX_BD_EVENT    BIT_9
-    #define HOST_COALESCE_CLEAR_TICKS_ON_TX_BD_EVENT    BIT_10
-    #define HOST_COALESCE_NO_INT_ON_COALESCE_NOW_MODE   BIT_11
-    #define HOST_COALESCE_NO_INT_ON_FORCE_DMAD_MODE     BIT_12
-
-    /* Status. */
-    T3_32BIT_REGISTER Status;
-    #define HOST_COALESCE_ERROR_ATTN                    BIT_2
-
-    /* Receive coalescing ticks. */
-    T3_32BIT_REGISTER RxCoalescingTicks;
-
-    /* Send coalescing ticks. */
-    T3_32BIT_REGISTER TxCoalescingTicks;
-
-    /* Receive max coalesced frames. */
-    T3_32BIT_REGISTER RxMaxCoalescedFrames;
-
-    /* Send max coalesced frames. */
-    T3_32BIT_REGISTER TxMaxCoalescedFrames;
-
-    /* Receive coalescing ticks during interrupt. */
-    T3_32BIT_REGISTER RxCoalescedTickDuringInt;
-
-    /* Send coalescing ticks during interrupt. */
-    T3_32BIT_REGISTER TxCoalescedTickDuringInt;
-
-    /* Receive max coalesced frames during interrupt. */
-    T3_32BIT_REGISTER RxMaxCoalescedFramesDuringInt;
-
-    /* Send max coalesced frames during interrupt. */
-    T3_32BIT_REGISTER TxMaxCoalescedFramesDuringInt;
-
-    /* Statistics tick. */
-    T3_32BIT_REGISTER StatsCoalescingTicks;
-
-    /* Unused space. */
-    LM_UINT8 Unused2[4];
-
-    /* Statistics host address. */
-    T3_64BIT_REGISTER StatsBlkHostAddr;
-
-    /* Status block host address.*/
-    T3_64BIT_REGISTER StatusBlkHostAddr;
-
-    /* Statistics NIC address. */
-    T3_32BIT_REGISTER StatsBlkNicAddr;
-
-    /* Statust block NIC address. */
-    T3_32BIT_REGISTER StatusBlkNicAddr;
-
-    /* Flow attention registers. */
-    T3_32BIT_REGISTER FlowAttn;
-
-    /* Unused space. */
-    LM_UINT8 Unused3[4];
-
-    T3_32BIT_REGISTER NicJumboRcvBdConIdx;
-    T3_32BIT_REGISTER NicStdRcvBdConIdx;
-    T3_32BIT_REGISTER NicMiniRcvBdConIdx;
-
-    /* Unused space. */
-    LM_UINT8 Unused4[36];
-
-    T3_32BIT_REGISTER NicRetProdIdx[16];
-    T3_32BIT_REGISTER NicSndBdConIdx[16];
-
-    /* Unused space. */
-    LM_UINT8 Unused5[768];
-} T3_HOST_COALESCING, *PT3_HOST_COALESCING;
-
-
-
-/******************************************************************************/
-/* Memory arbiter registers. */
-/******************************************************************************/
-
-typedef struct {
-    T3_32BIT_REGISTER Mode;
-#define T3_MEM_ARBITER_MODE_RESET       BIT_0
-#define T3_MEM_ARBITER_MODE_ENABLE      BIT_1
-
-    T3_32BIT_REGISTER Status;
-
-    T3_32BIT_REGISTER ArbTrapAddrLow;
-    T3_32BIT_REGISTER ArbTrapAddrHigh;
-
-    /* Unused space. */
-    LM_UINT8 Unused[1008];
-} T3_MEM_ARBITER, *PT3_MEM_ARBITER;
-
-
-
-/******************************************************************************/
-/* Buffer manager control register. */
-/******************************************************************************/
-
-typedef struct {
-    T3_32BIT_REGISTER Mode;
-    #define BUFMGR_MODE_RESET                           BIT_0
-    #define BUFMGR_MODE_ENABLE                          BIT_1
-    #define BUFMGR_MODE_ATTN_ENABLE                     BIT_2
-    #define BUFMGR_MODE_BM_TEST                         BIT_3
-    #define BUFMGR_MODE_MBUF_LOW_ATTN_ENABLE            BIT_4
-
-    T3_32BIT_REGISTER Status;
-    #define BUFMGR_STATUS_ERROR                         BIT_2
-    #define BUFMGR_STATUS_MBUF_LOW                      BIT_4
-
-    T3_32BIT_REGISTER MbufPoolAddr;
-    T3_32BIT_REGISTER MbufPoolSize;
-    T3_32BIT_REGISTER MbufReadDmaLowWaterMark;
-    T3_32BIT_REGISTER MbufMacRxLowWaterMark;
-    T3_32BIT_REGISTER MbufHighWaterMark;
-
-    T3_32BIT_REGISTER RxCpuMbufAllocReq;
-    #define BUFMGR_MBUF_ALLOC_BIT                     BIT_31
-    T3_32BIT_REGISTER RxCpuMbufAllocResp;
-    T3_32BIT_REGISTER TxCpuMbufAllocReq;
-    T3_32BIT_REGISTER TxCpuMbufAllocResp;
-
-    T3_32BIT_REGISTER DmaDescPoolAddr;
-    T3_32BIT_REGISTER DmaDescPoolSize;
-    T3_32BIT_REGISTER DmaLowWaterMark;
-    T3_32BIT_REGISTER DmaHighWaterMark;
-
-    T3_32BIT_REGISTER RxCpuDmaAllocReq;
-    T3_32BIT_REGISTER RxCpuDmaAllocResp;
-    T3_32BIT_REGISTER TxCpuDmaAllocReq;
-    T3_32BIT_REGISTER TxCpuDmaAllocResp;
-
-    T3_32BIT_REGISTER Hwdiag[3];
-
-    /* Unused space. */
-    LM_UINT8 Unused[936];
-} T3_BUFFER_MANAGER, *PT3_BUFFER_MANAGER;
-
-
-
-/******************************************************************************/
-/* Read DMA control registers. */
-/******************************************************************************/
-
-typedef struct {
-    T3_32BIT_REGISTER Mode;
-    #define DMA_READ_MODE_RESET                         BIT_0
-    #define DMA_READ_MODE_ENABLE                        BIT_1
-    #define DMA_READ_MODE_TARGET_ABORT_ATTN_ENABLE      BIT_2
-    #define DMA_READ_MODE_MASTER_ABORT_ATTN_ENABLE      BIT_3
-    #define DMA_READ_MODE_PARITY_ERROR_ATTN_ENABLE      BIT_4
-    #define DMA_READ_MODE_ADDR_OVERFLOW_ATTN_ENABLE     BIT_5
-    #define DMA_READ_MODE_FIFO_OVERRUN_ATTN_ENABLE      BIT_6
-    #define DMA_READ_MODE_FIFO_UNDERRUN_ATTN_ENABLE     BIT_7
-    #define DMA_READ_MODE_FIFO_OVERREAD_ATTN_ENABLE     BIT_8
-    #define DMA_READ_MODE_LONG_READ_ATTN_ENABLE         BIT_9
-    #define DMA_READ_MODE_SPLIT_ENABLE                  BIT_11
-    #define DMA_READ_MODE_SPLIT_RESET                   BIT_12
-    #define DMA_READ_MODE_FIFO_SIZE_128                 BIT_17
-    #define DMA_READ_MODE_FIFO_LONG_BURST               (BIT_16 | BIT_17)
-
-    T3_32BIT_REGISTER Status;
-    #define DMA_READ_STATUS_TARGET_ABORT_ATTN           BIT_2
-    #define DMA_READ_STATUS_MASTER_ABORT_ATTN           BIT_3
-    #define DMA_READ_STATUS_PARITY_ERROR_ATTN           BIT_4
-    #define DMA_READ_STATUS_ADDR_OVERFLOW_ATTN          BIT_5
-    #define DMA_READ_STATUS_FIFO_OVERRUN_ATTN           BIT_6
-    #define DMA_READ_STATUS_FIFO_UNDERRUN_ATTN          BIT_7
-    #define DMA_READ_STATUS_FIFO_OVERREAD_ATTN          BIT_8
-    #define DMA_READ_STATUS_LONG_READ_ATTN              BIT_9
-
-    /* Unused space. */
-    LM_UINT8 Unused[1016];
-} T3_DMA_READ, *PT3_DMA_READ;
-
-typedef union T3_CPU 
-{
-  struct
-  {
-    T3_32BIT_REGISTER mode;
-    #define CPU_MODE_HALT   BIT_10
-    #define CPU_MODE_RESET  BIT_0 
-    T3_32BIT_REGISTER state;
-    T3_32BIT_REGISTER EventMask;
-    T3_32BIT_REGISTER reserved1[4];
-    T3_32BIT_REGISTER PC;
-    T3_32BIT_REGISTER Instruction;
-    T3_32BIT_REGISTER SpadUnderflow;
-    T3_32BIT_REGISTER WatchdogClear;
-    T3_32BIT_REGISTER WatchdogVector;
-    T3_32BIT_REGISTER WatchdogSavedPC;
-    T3_32BIT_REGISTER HardwareBp;
-    T3_32BIT_REGISTER reserved2[3];
-    T3_32BIT_REGISTER WatchdogSavedState;    
-    T3_32BIT_REGISTER LastBrchAddr;    
-    T3_32BIT_REGISTER SpadUnderflowSet;    
-    T3_32BIT_REGISTER reserved3[(0x200-0x50)/4];
-    T3_32BIT_REGISTER Regs[32];
-    T3_32BIT_REGISTER reserved4[(0x400-0x280)/4];
-  }reg;
-}T3_CPU, *PT3_CPU;
-
-/******************************************************************************/
-/* Write DMA control registers. */
-/******************************************************************************/
-
-typedef struct {
-    T3_32BIT_REGISTER Mode;
-    #define DMA_WRITE_MODE_RESET                        BIT_0
-    #define DMA_WRITE_MODE_ENABLE                       BIT_1
-    #define DMA_WRITE_MODE_TARGET_ABORT_ATTN_ENABLE     BIT_2
-    #define DMA_WRITE_MODE_MASTER_ABORT_ATTN_ENABLE     BIT_3
-    #define DMA_WRITE_MODE_PARITY_ERROR_ATTN_ENABLE     BIT_4
-    #define DMA_WRITE_MODE_ADDR_OVERFLOW_ATTN_ENABLE    BIT_5
-    #define DMA_WRITE_MODE_FIFO_OVERRUN_ATTN_ENABLE     BIT_6
-    #define DMA_WRITE_MODE_FIFO_UNDERRUN_ATTN_ENABLE    BIT_7
-    #define DMA_WRITE_MODE_FIFO_OVERREAD_ATTN_ENABLE    BIT_8
-    #define DMA_WRITE_MODE_LONG_READ_ATTN_ENABLE        BIT_9
-    #define DMA_WRITE_MODE_RECEIVE_ACCELERATE           BIT_10
-
-    T3_32BIT_REGISTER Status;
-    #define DMA_WRITE_STATUS_TARGET_ABORT_ATTN          BIT_2
-    #define DMA_WRITE_STATUS_MASTER_ABORT_ATTN          BIT_3
-    #define DMA_WRITE_STATUS_PARITY_ERROR_ATTN          BIT_4
-    #define DMA_WRITE_STATUS_ADDR_OVERFLOW_ATTN         BIT_5
-    #define DMA_WRITE_STATUS_FIFO_OVERRUN_ATTN          BIT_6
-    #define DMA_WRITE_STATUS_FIFO_UNDERRUN_ATTN         BIT_7
-    #define DMA_WRITE_STATUS_FIFO_OVERREAD_ATTN         BIT_8
-    #define DMA_WRITE_STATUS_LONG_READ_ATTN             BIT_9
-
-    /* Unused space. */
-    LM_UINT8 Unused[1016];
-} T3_DMA_WRITE, *PT3_DMA_WRITE;
-
-
-
-/******************************************************************************/
-/* Mailbox registers. */
-/******************************************************************************/
-
-typedef struct {
-    /* Interrupt mailbox registers. */
-    T3_64BIT_REGISTER Interrupt[4];
-
-    /* General mailbox registers. */
-    T3_64BIT_REGISTER General[8];
-
-    /* Reload statistics mailbox. */
-    T3_64BIT_REGISTER ReloadStat;
-
-    /* Receive BD ring producer index registers. */
-    T3_64BIT_REGISTER RcvStdProdIdx;
-    T3_64BIT_REGISTER RcvJumboProdIdx;
-    T3_64BIT_REGISTER RcvMiniProdIdx;
-
-    /* Receive return ring consumer index registers. */
-    T3_64BIT_REGISTER RcvRetConIdx[16];
-
-    /* Send BD ring host producer index registers. */
-    T3_64BIT_REGISTER SendHostProdIdx[16];
-
-    /* Send BD ring nic producer index registers. */
-    T3_64BIT_REGISTER SendNicProdIdx[16];
-}T3_MAILBOX, *PT3_MAILBOX;
-
-typedef struct {
-    T3_MAILBOX Mailbox;
-
-    /* Priority mailbox registers. */
-    T3_32BIT_REGISTER HighPriorityEventVector;
-    T3_32BIT_REGISTER HighPriorityEventMask;
-    T3_32BIT_REGISTER LowPriorityEventVector;
-    T3_32BIT_REGISTER LowPriorityEventMask;
-
-    /* Unused space. */
-    LM_UINT8 Unused[496];
-} T3_GRC_MAILBOX, *PT3_GRC_MAILBOX;
-
-
-/******************************************************************************/
-/* Flow through queues. */
-/******************************************************************************/
-
-typedef struct {
-    T3_32BIT_REGISTER Reset;
-    
-    LM_UINT8 Unused[12];
-
-    T3_32BIT_REGISTER DmaNormalReadFtqCtrl;
-    T3_32BIT_REGISTER DmaNormalReadFtqFullCnt;
-    T3_32BIT_REGISTER DmaNormalReadFtqFifoEnqueueDequeue;
-    T3_32BIT_REGISTER DmaNormalReadFtqFifoWritePeek;
-
-    T3_32BIT_REGISTER DmaHighReadFtqCtrl;
-    T3_32BIT_REGISTER DmaHighReadFtqFullCnt;
-    T3_32BIT_REGISTER DmaHighReadFtqFifoEnqueueDequeue;
-    T3_32BIT_REGISTER DmaHighReadFtqFifoWritePeek;
-
-    T3_32BIT_REGISTER DmaCompDiscardFtqCtrl;
-    T3_32BIT_REGISTER DmaCompDiscardFtqFullCnt;
-    T3_32BIT_REGISTER DmaCompDiscardFtqFifoEnqueueDequeue;
-    T3_32BIT_REGISTER DmaCompDiscardFtqFifoWritePeek;
-
-    T3_32BIT_REGISTER SendBdCompFtqCtrl;
-    T3_32BIT_REGISTER SendBdCompFtqFullCnt;
-    T3_32BIT_REGISTER SendBdCompFtqFifoEnqueueDequeue;
-    T3_32BIT_REGISTER SendBdCompFtqFifoWritePeek;
-
-    T3_32BIT_REGISTER SendDataInitiatorFtqCtrl;
-    T3_32BIT_REGISTER SendDataInitiatorFtqFullCnt;
-    T3_32BIT_REGISTER SendDataInitiatorFtqFifoEnqueueDequeue;
-    T3_32BIT_REGISTER SendDataInitiatorFtqFifoWritePeek;
-
-    T3_32BIT_REGISTER DmaNormalWriteFtqCtrl;
-    T3_32BIT_REGISTER DmaNormalWriteFtqFullCnt;
-    T3_32BIT_REGISTER DmaNormalWriteFtqFifoEnqueueDequeue;
-    T3_32BIT_REGISTER DmaNormalWriteFtqFifoWritePeek;
-
-    T3_32BIT_REGISTER DmaHighWriteFtqCtrl;
-    T3_32BIT_REGISTER DmaHighWriteFtqFullCnt;
-    T3_32BIT_REGISTER DmaHighWriteFtqFifoEnqueueDequeue;
-    T3_32BIT_REGISTER DmaHighWriteFtqFifoWritePeek;
-
-    T3_32BIT_REGISTER SwType1FtqCtrl;
-    T3_32BIT_REGISTER SwType1FtqFullCnt;
-    T3_32BIT_REGISTER SwType1FtqFifoEnqueueDequeue;
-    T3_32BIT_REGISTER SwType1FtqFifoWritePeek;
-
-    T3_32BIT_REGISTER SendDataCompFtqCtrl;
-    T3_32BIT_REGISTER SendDataCompFtqFullCnt;
-    T3_32BIT_REGISTER SendDataCompFtqFifoEnqueueDequeue;
-    T3_32BIT_REGISTER SendDataCompFtqFifoWritePeek;
-
-    T3_32BIT_REGISTER HostCoalesceFtqCtrl;
-    T3_32BIT_REGISTER HostCoalesceFtqFullCnt;
-    T3_32BIT_REGISTER HostCoalesceFtqFifoEnqueueDequeue;
-    T3_32BIT_REGISTER HostCoalesceFtqFifoWritePeek;
-
-    T3_32BIT_REGISTER MacTxFtqCtrl;
-    T3_32BIT_REGISTER MacTxFtqFullCnt;
-    T3_32BIT_REGISTER MacTxFtqFifoEnqueueDequeue;
-    T3_32BIT_REGISTER MacTxFtqFifoWritePeek;
-
-    T3_32BIT_REGISTER MbufClustFreeFtqCtrl;
-    T3_32BIT_REGISTER MbufClustFreeFtqFullCnt;
-    T3_32BIT_REGISTER MbufClustFreeFtqFifoEnqueueDequeue;
-    T3_32BIT_REGISTER MbufClustFreeFtqFifoWritePeek;
-
-    T3_32BIT_REGISTER RcvBdCompFtqCtrl;
-    T3_32BIT_REGISTER RcvBdCompFtqFullCnt;
-    T3_32BIT_REGISTER RcvBdCompFtqFifoEnqueueDequeue;
-    T3_32BIT_REGISTER RcvBdCompFtqFifoWritePeek;
-
-    T3_32BIT_REGISTER RcvListPlmtFtqCtrl;
-    T3_32BIT_REGISTER RcvListPlmtFtqFullCnt;
-    T3_32BIT_REGISTER RcvListPlmtFtqFifoEnqueueDequeue;
-    T3_32BIT_REGISTER RcvListPlmtFtqFifoWritePeek;
-
-    T3_32BIT_REGISTER RcvDataBdInitiatorFtqCtrl;
-    T3_32BIT_REGISTER RcvDataBdInitiatorFtqFullCnt;
-    T3_32BIT_REGISTER RcvDataBdInitiatorFtqFifoEnqueueDequeue;
-    T3_32BIT_REGISTER RcvDataBdInitiatorFtqFifoWritePeek;
-
-    T3_32BIT_REGISTER RcvDataCompFtqCtrl;
-    T3_32BIT_REGISTER RcvDataCompFtqFullCnt;
-    T3_32BIT_REGISTER RcvDataCompFtqFifoEnqueueDequeue;
-    T3_32BIT_REGISTER RcvDataCompFtqFifoWritePeek;
-
-    T3_32BIT_REGISTER SwType2FtqCtrl;
-    T3_32BIT_REGISTER SwType2FtqFullCnt;
-    T3_32BIT_REGISTER SwType2FtqFifoEnqueueDequeue;
-    T3_32BIT_REGISTER SwType2FtqFifoWritePeek;
-
-    /* Unused space. */
-    LM_UINT8 Unused2[736];
-} T3_FTQ, *PT3_FTQ;
-
-
-
-/******************************************************************************/
-/* Message signaled interrupt registers. */
-/******************************************************************************/
-
-typedef struct {
-    T3_32BIT_REGISTER Mode;
-#define MSI_MODE_RESET       BIT_0
-#define MSI_MODE_ENABLE      BIT_1
-    T3_32BIT_REGISTER Status;
-
-    T3_32BIT_REGISTER MsiFifoAccess;
-
-    /* Unused space. */
-    LM_UINT8 Unused[1012];
-} T3_MSG_SIGNALED_INT, *PT3_MSG_SIGNALED_INT;
-
-
-
-/******************************************************************************/
-/* DMA Completion registes. */
-/******************************************************************************/
-
-typedef struct {
-    T3_32BIT_REGISTER Mode;
-    #define DMA_COMP_MODE_RESET                         BIT_0
-    #define DMA_COMP_MODE_ENABLE                        BIT_1
-
-    /* Unused space. */
-    LM_UINT8 Unused[1020];
-} T3_DMA_COMPLETION, *PT3_DMA_COMPLETION;
-
-
-
-/******************************************************************************/
-/* GRC registers. */
-/******************************************************************************/
-
-typedef struct {
-    /* Mode control register. */
-    T3_32BIT_REGISTER Mode;
-    #define GRC_MODE_UPDATE_ON_COALESCING               BIT_0
-    #define GRC_MODE_BYTE_SWAP_NON_FRAME_DATA           BIT_1
-    #define GRC_MODE_WORD_SWAP_NON_FRAME_DATA           BIT_2
-    #define GRC_MODE_BYTE_SWAP_DATA                     BIT_4
-    #define GRC_MODE_WORD_SWAP_DATA                     BIT_5
-    #define GRC_MODE_SPLIT_HEADER_MODE                  BIT_8
-    #define GRC_MODE_NO_FRAME_CRACKING                  BIT_9
-    #define GRC_MODE_INCLUDE_CRC                        BIT_10
-    #define GRC_MODE_ALLOW_BAD_FRAMES                   BIT_11
-    #define GRC_MODE_NO_INTERRUPT_ON_SENDS              BIT_13
-    #define GRC_MODE_NO_INTERRUPT_ON_RECEIVE            BIT_14
-    #define GRC_MODE_FORCE_32BIT_PCI_BUS_MODE           BIT_15
-    #define GRC_MODE_HOST_STACK_UP                      BIT_16
-    #define GRC_MODE_HOST_SEND_BDS                      BIT_17
-    #define GRC_MODE_TX_NO_PSEUDO_HEADER_CHKSUM         BIT_20
-    #define GRC_MODE_NVRAM_WRITE_ENABLE                 BIT_21
-    #define GRC_MODE_RX_NO_PSEUDO_HEADER_CHKSUM         BIT_23
-    #define GRC_MODE_INT_ON_TX_CPU_ATTN                 BIT_24
-    #define GRC_MODE_INT_ON_RX_CPU_ATTN                 BIT_25
-    #define GRC_MODE_INT_ON_MAC_ATTN                    BIT_26
-    #define GRC_MODE_INT_ON_DMA_ATTN                    BIT_27
-    #define GRC_MODE_INT_ON_FLOW_ATTN                   BIT_28
-    #define GRC_MODE_4X_NIC_BASED_SEND_RINGS            BIT_29
-    #define GRC_MODE_MULTICAST_FRAME_ENABLE             BIT_30
-
-    /* Misc configuration register. */
-    T3_32BIT_REGISTER MiscCfg;
-    #define GRC_MISC_CFG_CORE_CLOCK_RESET               BIT_0
-    #define GRC_MISC_PRESCALAR_TIMER_MASK               0xfe
-    #define GRC_MISC_BD_ID_MASK                         0x0001e000
-    #define GRC_MISC_BD_ID_5700                         0x0001e000
-    #define GRC_MISC_BD_ID_5701                         0x00000000
-    #define GRC_MISC_BD_ID_5703                         0x00000000
-    #define GRC_MISC_BD_ID_5703S                        0x00002000
-    #define GRC_MISC_BD_ID_5702FE                       0x00004000
-    #define GRC_MISC_BD_ID_5704                         0x00000000
-    #define GRC_MISC_BD_ID_5704CIOBE                    0x00004000
-    #define GRC_MISC_BD_ID_5788                         0x00010000
-    #define GRC_MISC_BD_ID_5788M                        0x00018000
-    #define GRC_MISC_GPHY_KEEP_POWER_DURING_RESET       BIT_26
-
-    /* Miscellaneous local control register. */
-    T3_32BIT_REGISTER LocalCtrl;
-    #define GRC_MISC_LOCAL_CTRL_INT_ACTIVE              BIT_0
-    #define GRC_MISC_LOCAL_CTRL_CLEAR_INT               BIT_1
-    #define GRC_MISC_LOCAL_CTRL_SET_INT                 BIT_2
-    #define GRC_MISC_LOCAL_CTRL_INT_ON_ATTN             BIT_3
-    #define GRC_MISC_LOCAL_CTRL_GPIO_INPUT0             BIT_8
-    #define GRC_MISC_LOCAL_CTRL_GPIO_INPUT1             BIT_9
-    #define GRC_MISC_LOCAL_CTRL_GPIO_INPUT2             BIT_10
-    #define GRC_MISC_LOCAL_CTRL_GPIO_OE0                BIT_11
-    #define GRC_MISC_LOCAL_CTRL_GPIO_OE1                BIT_12
-    #define GRC_MISC_LOCAL_CTRL_GPIO_OE2                BIT_13
-    #define GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT0            BIT_14
-    #define GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT1            BIT_15
-    #define GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT2            BIT_16
-    #define GRC_MISC_LOCAL_CTRL_ENABLE_EXT_MEMORY       BIT_17
-    #define GRC_MISC_LOCAL_CTRL_BANK_SELECT             BIT_21
-    #define GRC_MISC_LOCAL_CTRL_SSRAM_TYPE              BIT_22
-
-    #define GRC_MISC_MEMSIZE_256K     0
-    #define GRC_MISC_MEMSIZE_512K     (1 << 18)
-    #define GRC_MISC_MEMSIZE_1024K    (2 << 18)
-    #define GRC_MISC_MEMSIZE_2048K    (3 << 18)
-    #define GRC_MISC_MEMSIZE_4096K    (4 << 18)
-    #define GRC_MISC_MEMSIZE_8192K    (5 << 18)
-    #define GRC_MISC_MEMSIZE_16M      (6 << 18)
-    #define GRC_MISC_LOCAL_CTRL_AUTO_SEEPROM            BIT_24
-
-
-    T3_32BIT_REGISTER Timer;
-
-    T3_32BIT_REGISTER RxCpuEvent;
-    T3_32BIT_REGISTER RxTimerRef;
-    T3_32BIT_REGISTER RxCpuSemaphore;
-    T3_32BIT_REGISTER RemoteRxCpuAttn;
-
-    T3_32BIT_REGISTER TxCpuEvent;
-    T3_32BIT_REGISTER TxTimerRef;
-    T3_32BIT_REGISTER TxCpuSemaphore;
-    T3_32BIT_REGISTER RemoteTxCpuAttn;
-
-    T3_64BIT_REGISTER MemoryPowerUp;
-
-    T3_32BIT_REGISTER EepromAddr;
-    #define SEEPROM_ADDR_WRITE       0
-    #define SEEPROM_ADDR_READ        (1 << 31)
-    #define SEEPROM_ADDR_RW_MASK     0x80000000
-    #define SEEPROM_ADDR_COMPLETE    (1 << 30)
-    #define SEEPROM_ADDR_FSM_RESET   (1 << 29)
-    #define SEEPROM_ADDR_DEV_ID(x)   (x << 26)
-    #define SEEPROM_ADDR_DEV_ID_MASK 0x1c000000
-    #define SEEPROM_ADDR_START       (1 << 25)
-    #define SEEPROM_ADDR_CLK_PERD(x) (x << 16)
-    #define SEEPROM_ADDR_ADDRESS(x)  (x & 0xfffc)
-    #define SEEPROM_ADDR_ADDRESS_MASK 0x0000ffff
-
-    #define SEEPROM_CLOCK_PERIOD        60
-    #define SEEPROM_CHIP_SIZE           (64 * 1024)
-
-    T3_32BIT_REGISTER EepromData;
-    T3_32BIT_REGISTER EepromCtrl;
-
-    T3_32BIT_REGISTER MdiCtrl;
-    T3_32BIT_REGISTER SepromDelay;
-
-    /* Unused space. */
-    LM_UINT8 Unused[948];
-} T3_GRC, *PT3_GRC;
-
-
-/******************************************************************************/
-/* NVRAM control registers. */
-/******************************************************************************/
-
-typedef struct
-{
-    T3_32BIT_REGISTER Cmd;
-    #define NVRAM_CMD_RESET                             BIT_0
-    #define NVRAM_CMD_DONE                              BIT_3
-    #define NVRAM_CMD_DO_IT                             BIT_4
-    #define NVRAM_CMD_WR                                BIT_5
-    #define NVRAM_CMD_RD                                BIT_NONE
-    #define NVRAM_CMD_ERASE                             BIT_6
-    #define NVRAM_CMD_FIRST                             BIT_7
-    #define NVRAM_CMD_LAST                              BIT_8
-
-    T3_32BIT_REGISTER Status;
-    T3_32BIT_REGISTER WriteData;
-
-    T3_32BIT_REGISTER Addr;
-    #define NVRAM_ADDRESS_MASK                          0xffffff
-
-    T3_32BIT_REGISTER ReadData;
-
-    /* Flash config 1 register. */
-    T3_32BIT_REGISTER Config1;
-    #define FLASH_INTERFACE_ENABLE                      BIT_0
-    #define FLASH_SSRAM_BUFFERED_MODE                  BIT_1
-    #define FLASH_PASS_THRU_MODE                        BIT_2
-    #define FLASH_BIT_BANG_MODE                         BIT_3
-    #define FLASH_COMPAT_BYPASS                         BIT_31
-
-    #define BUFFERED_FLASH (FLASH_INTERFACE_ENABLE | FLASH_SSRAM_BUFFERED_MODE)
-
-    /* Buffered flash (Atmel: AT45DB011B) specific information */
-    #define BUFFERED_FLASH_PAGE_POS         9
-    #define BUFFERED_FLASH_BYTE_ADDR_MASK   ((1<<BUFFERED_FLASH_PAGE_POS) - 1)
-    #define BUFFERED_FLASH_PAGE_SIZE        264
-    #define BUFFERED_FLASH_PHY_PAGE_SIZE    512
-
-    T3_32BIT_REGISTER Config2;
-    T3_32BIT_REGISTER Config3;
-    T3_32BIT_REGISTER SwArb;
-    #define SW_ARB_REQ_SET0                             BIT_0
-    #define SW_ARB_REQ_SET1                             BIT_1
-    #define SW_ARB_REQ_SET2                             BIT_2
-    #define SW_ARB_REQ_SET3                             BIT_3
-    #define SW_ARB_REQ_CLR0                             BIT_4
-    #define SW_ARB_REQ_CLR1                             BIT_5
-    #define SW_ARB_REQ_CLR2                             BIT_6
-    #define SW_ARB_REQ_CLR3                             BIT_7
-    #define SW_ARB_GNT0                                 BIT_8
-    #define SW_ARB_GNT1                                 BIT_9
-    #define SW_ARB_GNT2                                 BIT_10
-    #define SW_ARB_GNT3                                 BIT_11
-    #define SW_ARB_REQ0                                 BIT_12
-    #define SW_ARB_REQ1                                 BIT_13
-    #define SW_ARB_REQ2                                 BIT_14
-    #define SW_ARB_REQ3                                 BIT_15
-
-    /* Unused space. */
-    LM_UINT8 Unused[988];
-} T3_NVRAM, *PT3_NVRAM;
-
-
-/******************************************************************************/
-/* NIC's internal memory. */
-/******************************************************************************/
-
-typedef struct {
-    /* Page zero for the internal CPUs. */
-    LM_UINT8 PageZero[0x100];               /* 0x0000 */
-
-    /* Send RCBs. */
-    T3_RCB SendRcb[16];                     /* 0x0100 */
-
-    /* Receive Return RCBs. */
-    T3_RCB RcvRetRcb[16];                   /* 0x0200 */
-
-    /* Statistics block. */
-    T3_STATS_BLOCK StatsBlk;                /* 0x0300 */
-
-    /* Status block. */
-    T3_STATUS_BLOCK StatusBlk;              /* 0x0b00 */
-
-    /* Reserved for software. */
-    LM_UINT8 Reserved[1200];                /* 0x0b50 */
-
-    /* Unmapped region. */
-    LM_UINT8 Unmapped[4096];                /* 0x1000 */
-
-    /* DMA descriptors. */
-    LM_UINT8 DmaDesc[8192];                 /* 0x2000 */
-
-    /* Buffer descriptors. */
-    LM_UINT8 BufferDesc[16384];             /* 0x4000 */
-} T3_FIRST_32K_SRAM, *PT3_FIRST_32K_SRAM;
-
-
-
-/******************************************************************************/
-/* Memory layout. */
-/******************************************************************************/
-
-typedef struct {
-    /* PCI configuration registers. */
-    T3_PCI_CONFIGURATION PciCfg;
-
-    /* Unused. */
-    LM_UINT8 Unused1[0x100];                            /* 0x0100 */
-
-    /* Mailbox . */
-    T3_MAILBOX Mailbox;                                 /* 0x0200 */
-
-    /* MAC control registers. */
-    T3_MAC_CONTROL MacCtrl;                             /* 0x0400 */
-
-    /* Send data initiator control registers. */
-    T3_SEND_DATA_INITIATOR SndDataIn;                   /* 0x0c00 */
-
-    /* Send data completion Control registers. */
-    T3_SEND_DATA_COMPLETION SndDataComp;                /* 0x1000 */
-
-    /* Send BD ring selector. */
-    T3_SEND_BD_SELECTOR SndBdSel;                       /* 0x1400 */
-
-    /* Send BD initiator control registers. */
-    T3_SEND_BD_INITIATOR SndBdIn;                       /* 0x1800 */
-
-    /* Send BD completion control registers. */
-    T3_SEND_BD_COMPLETION SndBdComp;                    /* 0x1c00 */
-
-    /* Receive list placement control registers. */
-    T3_RCV_LIST_PLACEMENT RcvListPlmt;                  /* 0x2000 */
-
-    /* Receive Data and Receive BD Initiator Control. */
-    T3_RCV_DATA_BD_INITIATOR RcvDataBdIn;               /* 0x2400 */
-
-    /* Receive Data Completion Control */
-    T3_RCV_DATA_COMPLETION RcvDataComp;                 /* 0x2800 */
-
-    /* Receive BD Initiator Control Registers. */
-    T3_RCV_BD_INITIATOR RcvBdIn;                        /* 0x2c00 */
-
-    /* Receive BD Completion Control Registers. */
-    T3_RCV_BD_COMPLETION RcvBdComp;                     /* 0x3000 */
-
-    /* Receive list selector control registers. */
-    T3_RCV_LIST_SELECTOR RcvListSel;                    /* 0x3400 */
-
-    /* Mbuf cluster free registers. */
-    T3_MBUF_CLUSTER_FREE MbufClusterFree;               /* 0x3800 */
-
-    /* Host coalescing control registers. */
-    T3_HOST_COALESCING HostCoalesce;                    /* 0x3c00 */
-
-    /* Memory arbiter control registers. */
-    T3_MEM_ARBITER MemArbiter;                          /* 0x4000 */
-    
-    /* Buffer manger control registers. */
-    T3_BUFFER_MANAGER BufMgr;                           /* 0x4400 */
-
-    /* Read DMA control registers. */
-    T3_DMA_READ DmaRead;                                /* 0x4800 */
-
-    /* Write DMA control registers. */
-    T3_DMA_WRITE DmaWrite;                              /* 0x4c00 */
-
-    T3_CPU rxCpu;                                       /* 0x5000 */
-    T3_CPU txCpu;                                       /* 0x5400 */
-
-    /* Mailboxes. */
-    T3_GRC_MAILBOX GrcMailbox;                          /* 0x5800 */
-
-    /* Flow Through queues. */
-    T3_FTQ Ftq;                                         /* 0x5c00 */
-
-    /* Message signaled interrupt registes. */
-    T3_MSG_SIGNALED_INT Msi;                            /* 0x6000 */
-
-    /* DMA completion registers. */
-    T3_DMA_COMPLETION DmaComp;                          /* 0x6400 */
-
-    /* GRC registers. */
-    T3_GRC Grc;                                         /* 0x6800 */
-
-    /* Unused space. */
-    LM_UINT8 Unused2[1024];                             /* 0x6c00 */
-
-    /* NVRAM registers. */
-    T3_NVRAM Nvram;                                     /* 0x7000 */
-
-    /* Unused space. */
-    LM_UINT8 Unused3[3072];                             /* 0x7400 */
-    
-    /* The 32k memory window into the NIC's */
-    /* internal memory.  The memory window is */
-    /* controlled by the Memory Window Base */
-    /* Address register.  This register is located */
-    /* in the PCI configuration space. */
-    union {                                             /* 0x8000 */
-        T3_FIRST_32K_SRAM First32k;
-
-        /* Use the memory window base address register to determine the */
-        /* MBUF segment. */
-        LM_UINT32 Mbuf[32768/4];
-        LM_UINT32 MemBlock32K[32768/4];
-    } uIntMem;
-} T3_STD_MEM_MAP, *PT3_STD_MEM_MAP;
-
-
-/******************************************************************************/
-/* Adapter info. */
-/******************************************************************************/
-
-typedef struct
-{
-    LM_UINT16 Svid;
-    LM_UINT16 Ssid;
-    LM_UINT32 PhyId;
-    LM_UINT32 Serdes;   /* 0 = copper PHY, 1 = Serdes */
-} LM_ADAPTER_INFO, *PLM_ADAPTER_INFO;
-
-
-/******************************************************************************/
-/* Packet queues. */
-/******************************************************************************/
-
-DECLARE_QUEUE_TYPE(LM_RX_PACKET_Q, MAX_RX_PACKET_DESC_COUNT);
-DECLARE_QUEUE_TYPE(LM_TX_PACKET_Q, MAX_TX_PACKET_DESC_COUNT);
-
-
-
-/******************************************************************************/
-/* Tx counters. */
-/******************************************************************************/
-
-typedef struct {
-    LM_COUNTER TxPacketGoodCnt;
-    LM_COUNTER TxBytesGoodCnt;
-    LM_COUNTER TxPacketAbortedCnt;
-    LM_COUNTER NoSendBdLeftCnt;
-    LM_COUNTER NoMapRegisterLeftCnt;
-    LM_COUNTER TooManyFragmentsCnt;
-    LM_COUNTER NoTxPacketDescCnt;
-} LM_TX_COUNTERS, *PLM_TX_COUNTERS;
-
-
-
-/******************************************************************************/
-/* Rx counters. */
-/******************************************************************************/
-
-typedef struct {
-    LM_COUNTER RxPacketGoodCnt;
-    LM_COUNTER RxBytesGoodCnt;
-    LM_COUNTER RxPacketErrCnt;
-    LM_COUNTER RxErrCrcCnt;
-    LM_COUNTER RxErrCollCnt;
-    LM_COUNTER RxErrLinkLostCnt;
-    LM_COUNTER RxErrPhyDecodeCnt;
-    LM_COUNTER RxErrOddNibbleCnt;
-    LM_COUNTER RxErrMacAbortCnt;
-    LM_COUNTER RxErrShortPacketCnt;
-    LM_COUNTER RxErrNoResourceCnt;
-    LM_COUNTER RxErrLargePacketCnt;
-} LM_RX_COUNTERS, *PLM_RX_COUNTERS;
-
-
-
-/******************************************************************************/
-/* Receive producer rings. */
-/******************************************************************************/
-
-typedef enum {
-    T3_UNKNOWN_RCV_PROD_RING    = 0,
-    T3_STD_RCV_PROD_RING        = 1,
-    T3_MINI_RCV_PROD_RING       = 2,
-    T3_JUMBO_RCV_PROD_RING      = 3
-} T3_RCV_PROD_RING, *PT3_RCV_PROD_RING;
-
-
-
-/******************************************************************************/
-/* Packet descriptor. */
-/******************************************************************************/
-
-#define LM_PACKET_SIGNATURE_TX              0x6861766b
-#define LM_PACKET_SIGNATURE_RX              0x6b766168
-
-typedef struct _LM_PACKET {
-    /* Set in LM. */
-    LM_STATUS PacketStatus;
-
-    /* Set in LM for Rx, in UM for Tx. */
-    LM_UINT32 PacketSize;
-
-    LM_UINT16 Flags;
-
-    LM_UINT16 VlanTag;
-
-    union {
-        /* Send info. */
-        struct {
-            /* Set up by UM. */
-            LM_UINT32 FragCount;
-
-#if INCLUDE_TCP_SEG_SUPPORT
-            LM_UINT32 MaxSegmentSize;
-            LM_UINT32 LastFragmentChksum;
-#endif
-        } Tx;
-
-        /* Receive info. */
-        struct {
-            /* This descriptor belongs to either Std, Mini, or Jumbo ring. */
-            T3_RCV_PROD_RING RcvProdRing;
-
-            /* Receive buffer size */
-            LM_UINT32 RxBufferSize;
-
-            /* Checksum information. */
-            LM_UINT16 IpChecksum;
-            LM_UINT16 TcpUdpChecksum;
-
-        } Rx;
-    } u;
-} LM_PACKET;
-
-
-
-/******************************************************************************/
-/* Tigon3 device block. */
-/******************************************************************************/
-
-typedef struct _LM_DEVICE_BLOCK {
-    /* Memory view. */
-    PT3_STD_MEM_MAP pMemView;
-
-    /* Base address of the block of memory in which the LM_PACKET descriptors */
-    /* are allocated from. */
-    PLM_VOID pPacketDescBase;
-
-    LM_UINT32 MiscHostCtrl;
-    LM_UINT32 GrcLocalCtrl;
-    LM_UINT32 DmaReadWriteCtrl;
-    LM_UINT32 PciState;
-    LM_UINT32 ClockCtrl;
-    LM_UINT32 DmaReadFifoSize;
-    LM_UINT32 GrcMode;
-
-    LM_UINT32 PowerLevel;
-    LM_UINT32 MiniPci;
-    LM_UINT32 Bcm5788;
-
-    /* Rx info */
-    LM_UINT32 RxStdDescCnt;
-    LM_UINT32 RxStdQueuedCnt;
-    LM_UINT32 RxStdProdIdx;
-
-    PT3_RCV_BD pRxStdBdVirt;
-    LM_PHYSICAL_ADDRESS RxStdBdPhy;
-
-    LM_UINT32 RxPacketDescCnt;
-    LM_RX_PACKET_Q RxPacketFreeQ;
-    LM_RX_PACKET_Q RxPacketReceivedQ;
-
-    /* Receive info. */
-    PT3_RCV_BD pRcvRetBdVirt;
-    LM_PHYSICAL_ADDRESS RcvRetBdPhy;
-    LM_UINT32 RcvRetConIdx;
-    LM_UINT32 RcvRetRcbEntryCount;
-    LM_UINT32 RcvRetRcbEntryCountMask;
-
-#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
-    LM_UINT32 RxJumboDescCnt;
-    LM_UINT32 RxJumboBufferSize;
-    LM_UINT32 RxJumboQueuedCnt;
-
-    LM_UINT32 RxJumboProdIdx;
-
-    PT3_RCV_BD pRxJumboBdVirt;
-    LM_PHYSICAL_ADDRESS RxJumboBdPhy;
-#endif /* T3_JUMBO_RCV_RCB_ENTRY_COUNT */
-
-    /* These values are used by the upper module to inform the protocol */
-    /* of the maximum transmit/receive packet size. */
-    LM_UINT32 TxMtu;    /* Does not include CRC. */
-    LM_UINT32 RxMtu;    /* Does not include CRC. */
-
-#if INCLUDE_TCP_SEG_SUPPORT
-    LM_UINT32 LargeSendMaxSize;
-    LM_UINT32 LargeSendMinNumSeg;
-#endif
-
-    /* We need to shadow the EMAC, Rx, Tx mode registers.  With B0 silicon, */
-    /* we may have problems reading any MAC registers in 10mb mode. */
-    LM_UINT32 MacMode;
-    LM_UINT32 RxMode;
-    LM_UINT32 TxMode;
-
-    /* MiMode register. */
-    LM_UINT32 MiMode;
-
-    /* Host coalesce mode register. */
-    LM_UINT32 CoalesceMode;
-
-    /* Send info. */
-    LM_UINT32 TxPacketDescCnt;
-
-    /* Tx info. */
-    LM_TX_PACKET_Q TxPacketFreeQ;
-    LM_TX_PACKET_Q TxPacketActiveQ;
-    LM_TX_PACKET_Q TxPacketXmittedQ;
-
-    /* Pointers to SendBd. */
-    PT3_SND_BD pSendBdVirt;
-    LM_PHYSICAL_ADDRESS SendBdPhy;  /* Only valid for Host based Send BD. */
-
-    /* Send producer and consumer indices. */
-    LM_UINT32 SendProdIdx;
-    LM_UINT32 SendConIdx;
-
-    /* Number of BD left. */
-    MM_ATOMIC_T SendBdLeft;
-
-    T3_SND_BD ShadowSendBd[T3_SEND_RCB_ENTRY_COUNT];
-
-    /* Counters. */
-    LM_RX_COUNTERS RxCounters;
-    LM_TX_COUNTERS TxCounters;
-
-    /* Host coalescing parameters. */
-    LM_UINT32 RxCoalescingTicks;
-    LM_UINT32 TxCoalescingTicks;
-    LM_UINT32 RxMaxCoalescedFrames;
-    LM_UINT32 TxMaxCoalescedFrames;
-    LM_UINT32 StatsCoalescingTicks;
-    LM_UINT32 RxCoalescingTicksDuringInt;
-    LM_UINT32 TxCoalescingTicksDuringInt;
-    LM_UINT32 RxMaxCoalescedFramesDuringInt;
-    LM_UINT32 TxMaxCoalescedFramesDuringInt;
-
-    /* DMA water marks. */
-    LM_UINT32 DmaMbufLowMark;
-    LM_UINT32 RxMacMbufLowMark;
-    LM_UINT32 MbufHighMark;
-
-    /* Status block. */
-    PT3_STATUS_BLOCK pStatusBlkVirt;
-    LM_PHYSICAL_ADDRESS StatusBlkPhy;
-
-    /* Statistics block. */
-    PT3_STATS_BLOCK pStatsBlkVirt;
-    LM_PHYSICAL_ADDRESS StatsBlkPhy;
-
-    /* Current receive mask. */
-    LM_UINT32 ReceiveMask;
-
-    /* Task offload capabilities. */
-    LM_TASK_OFFLOAD TaskOffloadCap;
-
-    /* Task offload selected. */
-    LM_TASK_OFFLOAD TaskToOffload;
-
-    LM_UINT32 FiberWolCapable;
-    LM_UINT32 WolLimit10;
-
-    /* Wake up capability. */
-    LM_WAKE_UP_MODE WakeUpModeCap;
-
-    /* Wake up capability. */
-    LM_WAKE_UP_MODE WakeUpMode;
-
-    /* Flow control. */
-    LM_FLOW_CONTROL FlowControlCap;
-    LM_FLOW_CONTROL FlowControl;
-
-    /* Enable or disable PCI MWI. */
-    LM_UINT32 EnableMWI;
-
-    /* Enable 5701 tagged status mode. */
-    LM_UINT32 UseTaggedStatus;
-
-    LM_UINT32 LastTag;
-
-    /* NIC will not compute the pseudo header checksum.  The driver or OS */
-    /* must seed the checksum field with the pseudo checksum. */
-    LM_UINT32 NoTxPseudoHdrChksum;
-
-    /* The receive checksum in the BD does not include the pseudo checksum. */
-    /* The OS or the driver must calculate the pseudo checksum and add it to */
-    /* the checksum in the BD. */
-    LM_UINT32 NoRxPseudoHdrChksum;
-
-    /* Current node address. */
-    LM_UINT8 NodeAddress[8];
-
-    /* The adapter's node address. */
-    LM_UINT8 PermanentNodeAddress[8];
-
-    /* Adapter info. */
-    LM_UINT16 BusNum;               // Init by the upper module.
-    LM_UINT8 DevNum;                // Init by the upper module.
-    LM_UINT8 FunctNum;              // Init by the upper module.
-    LM_UINT16 PciVendorId;
-    LM_UINT16 PciDeviceId;
-    LM_UINT32 BondId;
-    LM_UINT8 Irq;
-    LM_UINT8 IntPin;
-    LM_UINT8 CacheLineSize;
-    LM_UINT8 PciRevId;
-#if PCIX_TARGET_WORKAROUND
-    LM_UINT32 EnablePciXFix;
-#endif
-    LM_UINT32 Tx4GWorkaround;
-    LM_UINT32 UndiFix;
-    LM_UINT32 FlushPostedWrites;
-    LM_UINT32 RegReadBack;
-    LM_UINT32 PciCommandStatusWords;
-    LM_UINT32 ChipRevId;
-    LM_UINT16 SubsystemVendorId;
-    LM_UINT16 SubsystemId;
-    PLM_UINT8 pMappedMemBase;
-
-    /* Saved PCI configuration registers for restoring after a reset. */
-    LM_UINT32 SavedCacheLineReg;
-
-    /* Phy info. */
-    LM_UINT32 PhyAddr;
-    LM_UINT32 PhyId;
-
-    /* Requested phy settings. */
-    LM_LINE_SPEED RequestedLineSpeed;
-    LM_DUPLEX_MODE RequestedDuplexMode;
-
-    /* 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
-    #define T3_PHY_INT_MODE_MI_INTERRUPT                1
-    #define T3_PHY_INT_MODE_LINK_READY                  2
-    #define T3_PHY_INT_MODE_AUTO_POLLING                3
-
-    /* Ways to determine link change status. */
-    LM_UINT32 LinkChngMode;
-    #define T3_LINK_CHNG_MODE_AUTO                      0
-    #define T3_LINK_CHNG_MODE_USE_STATUS_REG            1
-    #define T3_LINK_CHNG_MODE_USE_STATUS_BLOCK          2
-
-    /* LED mode. */
-    LM_UINT32 LedMode;
-
-    #define LED_MODE_AUTO                               0
-
-    /* 5700/01 LED mode. */
-    #define LED_MODE_THREE_LINK                         1
-    #define LED_MODE_LINK10                             2
-
-    /* 5703/02/04 LED mode. */
-    #define LED_MODE_OPEN_DRAIN                         1
-    #define LED_MODE_OUTPUT                             2
-
-    /* WOL Speed */
-    LM_UINT32 WolSpeed;
-    #define WOL_SPEED_10MB                              1
-    #define WOL_SPEED_100MB                             2
-
-    LM_UINT32 PhyFlags;
-    #define PHY_RESET_ON_INIT                           0x01
-    #define PHY_RESET_ON_LINKDOWN                       0x02
-    #define PHY_ADC_FIX                                 0x04
-    #define PHY_CHECK_TAPS_AFTER_RESET                  0x08
-    #define PHY_5704_A0_FIX                             0x10
-    #define PHY_ETHERNET_WIRESPEED                      0x20
-
-    LM_UINT32 RestoreOnWakeUp;
-    LM_LINE_SPEED WakeUpRequestedLineSpeed;
-    LM_DUPLEX_MODE WakeUpRequestedDuplexMode;
-    LM_UINT32 WakeUpDisableAutoNeg;
-
-    /* Current phy settings. */
-    LM_LINE_SPEED LineSpeed;
-    LM_LINE_SPEED OldLineSpeed;
-    LM_DUPLEX_MODE DuplexMode;
-    LM_STATUS LinkStatus;
-    LM_UINT32 advertising;
-    LM_UINT32 advertising1000;
-    LM_UINT32 No1000;
-
-    LM_UINT32 LoopBackMode;
-
-#define LM_MAC_LOOP_BACK_MODE 1
-#define LM_PHY_LOOP_BACK_MODE 2
-#define LM_EXT_LOOP_BACK_MODE 3
-
-    LM_LINE_SPEED SavedRequestedLineSpeed;
-    LM_DUPLEX_MODE SavedRequestedDuplexMode;
-    LM_UINT32 SavedDisableAutoNeg;
-
-    LM_UINT32 MulticastHash[4];
-
-    /* Use NIC or Host based send BD. */
-    LM_UINT32 NicSendBd;
-
-    LM_UINT32 EnableAsf;
-
-    /* Athlon fix. */
-    LM_UINT32 DelayPciGrant;
-
-    /* Enable OneDmaAtOnce */
-    LM_UINT32 OneDmaAtOnce;
-
-    /* Split Mode flags */
-    LM_UINT32 SplitModeEnable;
-    LM_UINT32 SplitModeMaxReq;
-
-    /* Init flag. */
-    LM_BOOL InitDone;
-
-    /* Shutdown flag.  Set by the upper module. */
-    LM_BOOL ShuttingDown;
-
-    /* Flag to determine whether to call LM_QueueRxPackets or not in */
-    /* LM_ResetAdapter routine. */
-    LM_BOOL QueueRxPackets;
-    LM_BOOL QueueAgain;
-    LM_BOOL RxBDLimit64;
-
-    LM_UINT32 MbufBase;
-    LM_UINT32 MbufSize;
-
-    /* TRUE if we have a SERDES PHY. */
-    LM_UINT32 EnableTbi;
-
-    LM_UINT32 EepromWp;
-    LM_UINT32 NvramSize;
-    LM_UINT32 Flash;
-
-#if INCLUDE_TBI_SUPPORT
-    /* Autoneg state info. */
-    AN_STATE_INFO AnInfo;
-    LM_UINT32 PollTbiLink;
-    LM_UINT32 NoTbiInterrupt;
-    LM_UINT32 IgnoreTbiLinkChange;
-#endif
-#ifdef BCM_NAPI_RXPOLL
-    LM_UINT32 RxPoll;
-#endif
-    char PartNo[24];
-    char BootCodeVer[16];
-    char BusSpeedStr[24];
-    unsigned long PhyCrcCount;
-
-} LM_DEVICE_BLOCK;
-
-
-#define T3_REG_CPU_VIEW               0xc0000000
-
-#define T3_BLOCK_DMA_RD               (1 << 0)
-#define T3_BLOCK_DMA_COMP             (1 << 1)
-#define T3_BLOCK_RX_BD_INITIATOR      (1 << 2)
-#define T3_BLOCK_RX_BD_COMP           (1 << 3)
-#define T3_BLOCK_DMA_WR               (1 << 4)
-#define T3_BLOCK_MSI_HANDLER          (1 << 5)
-#define T3_BLOCK_RX_LIST_PLMT         (1 << 6)
-#define T3_BLOCK_RX_LIST_SELECTOR     (1 << 7)
-#define T3_BLOCK_RX_DATA_INITIATOR    (1 << 8)
-#define T3_BLOCK_RX_DATA_COMP         (1 << 9)
-#define T3_BLOCK_HOST_COALESING       (1 << 10)
-#define T3_BLOCK_MAC_RX_ENGINE        (1 << 11)
-#define T3_BLOCK_MBUF_CLUSTER_FREE    (1 << 12)
-#define T3_BLOCK_SEND_BD_INITIATOR    (1 << 13)
-#define T3_BLOCK_SEND_BD_COMP         (1 << 14)
-#define T3_BLOCK_SEND_BD_SELECTOR     (1 << 15)
-#define T3_BLOCK_SEND_DATA_INITIATOR  (1 << 16)
-#define T3_BLOCK_SEND_DATA_COMP       (1 << 17)
-#define T3_BLOCK_MAC_TX_ENGINE        (1 << 18)
-#define T3_BLOCK_MEM_ARBITOR          (1 << 19)
-#define T3_BLOCK_MBUF_MANAGER         (1 << 20)
-#define T3_BLOCK_MAC_GLOBAL           (1 << 21)
-
-#define LM_ENABLE               1
-#define LM_DISABLE              2
-
-#define RX_CPU_EVT_SW0              0
-#define RX_CPU_EVT_SW1              1
-#define RX_CPU_EVT_RLP              2
-#define RX_CPU_EVT_SW3              3
-#define RX_CPU_EVT_RLS              4
-#define RX_CPU_EVT_SW4              5
-#define RX_CPU_EVT_RX_BD_COMP       6
-#define RX_CPU_EVT_SW5              7
-#define RX_CPU_EVT_RDI              8
-#define RX_CPU_EVT_DMA_WR           9
-#define RX_CPU_EVT_DMA_RD           10
-#define RX_CPU_EVT_SWQ              11
-#define RX_CPU_EVT_SW6              12
-#define RX_CPU_EVT_RDC              13
-#define RX_CPU_EVT_SW7              14
-#define RX_CPU_EVT_HOST_COALES      15
-#define RX_CPU_EVT_SW8              16
-#define RX_CPU_EVT_HIGH_DMA_WR      17
-#define RX_CPU_EVT_HIGH_DMA_RD      18
-#define RX_CPU_EVT_SW9              19
-#define RX_CPU_EVT_DMA_ATTN         20
-#define RX_CPU_EVT_LOW_P_MBOX       21
-#define RX_CPU_EVT_HIGH_P_MBOX      22
-#define RX_CPU_EVT_SW10             23
-#define RX_CPU_EVT_TX_CPU_ATTN      24
-#define RX_CPU_EVT_MAC_ATTN         25
-#define RX_CPU_EVT_RX_CPU_ATTN      26
-#define RX_CPU_EVT_FLOW_ATTN        27
-#define RX_CPU_EVT_SW11             28
-#define RX_CPU_EVT_TIMER            29
-#define RX_CPU_EVT_SW12             30
-#define RX_CPU_EVT_SW13             31
-
-/* RX-CPU event */
-#define RX_CPU_EVENT_SW_EVENT0      (1 << RX_CPU_EVT_SW0)
-#define RX_CPU_EVENT_SW_EVENT1      (1 << RX_CPU_EVT_SW1)
-#define RX_CPU_EVENT_RLP            (1 << RX_CPU_EVT_RLP)
-#define RX_CPU_EVENT_SW_EVENT3      (1 << RX_CPU_EVT_SW3)
-#define RX_CPU_EVENT_RLS            (1 << RX_CPU_EVT_RLS)
-#define RX_CPU_EVENT_SW_EVENT4      (1 << RX_CPU_EVT_SW4)
-#define RX_CPU_EVENT_RX_BD_COMP     (1 << RX_CPU_EVT_RX_BD_COMP)
-#define RX_CPU_EVENT_SW_EVENT5      (1 << RX_CPU_EVT_SW5)
-#define RX_CPU_EVENT_RDI            (1 << RX_CPU_EVT_RDI)
-#define RX_CPU_EVENT_DMA_WR         (1 << RX_CPU_EVT_DMA_WR)
-#define RX_CPU_EVENT_DMA_RD         (1 << RX_CPU_EVT_DMA_RD)
-#define RX_CPU_EVENT_SWQ            (1 << RX_CPU_EVT_SWQ)
-#define RX_CPU_EVENT_SW_EVENT6      (1 << RX_CPU_EVT_SW6)
-#define RX_CPU_EVENT_RDC            (1 << RX_CPU_EVT_RDC)
-#define RX_CPU_EVENT_SW_EVENT7      (1 << RX_CPU_EVT_SW7)
-#define RX_CPU_EVENT_HOST_COALES    (1 << RX_CPU_EVT_HOST_COALES)
-#define RX_CPU_EVENT_SW_EVENT8      (1 << RX_CPU_EVT_SW8)
-#define RX_CPU_EVENT_HIGH_DMA_WR    (1 << RX_CPU_EVT_HIGH_DMA_WR)
-#define RX_CPU_EVENT_HIGH_DMA_RD    (1 << RX_CPU_EVT_HIGH_DMA_RD)
-#define RX_CPU_EVENT_SW_EVENT9      (1 << RX_CPU_EVT_SW9)
-#define RX_CPU_EVENT_DMA_ATTN       (1 << RX_CPU_EVT_DMA_ATTN)
-#define RX_CPU_EVENT_LOW_P_MBOX     (1 << RX_CPU_EVT_LOW_P_MBOX)
-#define RX_CPU_EVENT_HIGH_P_MBOX    (1 << RX_CPU_EVT_HIGH_P_MBOX)
-#define RX_CPU_EVENT_SW_EVENT10     (1 << RX_CPU_EVT_SW10)
-#define RX_CPU_EVENT_TX_CPU_ATTN    (1 << RX_CPU_EVT_TX_CPU_ATTN)
-#define RX_CPU_EVENT_MAC_ATTN       (1 << RX_CPU_EVT_MAC_ATTN)
-#define RX_CPU_EVENT_RX_CPU_ATTN    (1 << RX_CPU_EVT_RX_CPU_ATTN)
-#define RX_CPU_EVENT_FLOW_ATTN      (1 << RX_CPU_EVT_FLOW_ATTN)
-#define RX_CPU_EVENT_SW_EVENT11     (1 << RX_CPU_EVT_SW11)
-#define RX_CPU_EVENT_TIMER          (1 << RX_CPU_EVT_TIMER)
-#define RX_CPU_EVENT_SW_EVENT12     (1 << RX_CPU_EVT_SW12)
-#define RX_CPU_EVENT_SW_EVENT13     (1 << RX_CPU_EVT_SW13)
-
-#define RX_CPU_MASK (RX_CPU_EVENT_SW_EVENT0 | \
-		     RX_CPU_EVENT_RLP | \
-		     RX_CPU_EVENT_RDI | \
-		     RX_CPU_EVENT_RDC)
-
-#define TX_CPU_EVT_SW0              0
-#define TX_CPU_EVT_SW1              1
-#define TX_CPU_EVT_SW2              2
-#define TX_CPU_EVT_SW3              3
-#define TX_CPU_EVT_TX_MAC           4
-#define TX_CPU_EVT_SW4              5
-#define TX_CPU_EVT_SBDC             6
-#define TX_CPU_EVT_SW5              7
-#define TX_CPU_EVT_SDI              8
-#define TX_CPU_EVT_DMA_WR           9
-#define TX_CPU_EVT_DMA_RD           10
-#define TX_CPU_EVT_SWQ              11
-#define TX_CPU_EVT_SW6              12
-#define TX_CPU_EVT_SDC              13
-#define TX_CPU_EVT_SW7              14
-#define TX_CPU_EVT_HOST_COALES      15
-#define TX_CPU_EVT_SW8              16
-#define TX_CPU_EVT_HIGH_DMA_WR      17
-#define TX_CPU_EVT_HIGH_DMA_RD      18
-#define TX_CPU_EVT_SW9              19
-#define TX_CPU_EVT_DMA_ATTN         20
-#define TX_CPU_EVT_LOW_P_MBOX       21
-#define TX_CPU_EVT_HIGH_P_MBOX      22
-#define TX_CPU_EVT_SW10             23
-#define TX_CPU_EVT_RX_CPU_ATTN      24
-#define TX_CPU_EVT_MAC_ATTN         25
-#define TX_CPU_EVT_TX_CPU_ATTN      26
-#define TX_CPU_EVT_FLOW_ATTN        27
-#define TX_CPU_EVT_SW11             28
-#define TX_CPU_EVT_TIMER            29
-#define TX_CPU_EVT_SW12             30
-#define TX_CPU_EVT_SW13             31
-
-
-/* TX-CPU event */
-#define TX_CPU_EVENT_SW_EVENT0      (1 << TX_CPU_EVT_SW0)
-#define TX_CPU_EVENT_SW_EVENT1      (1 << TX_CPU_EVT_SW1)
-#define TX_CPU_EVENT_SW_EVENT2      (1 << TX_CPU_EVT_SW2)
-#define TX_CPU_EVENT_SW_EVENT3      (1 << TX_CPU_EVT_SW3)
-#define TX_CPU_EVENT_TX_MAC         (1 << TX_CPU_EVT_TX_MAC)
-#define TX_CPU_EVENT_SW_EVENT4      (1 << TX_CPU_EVT_SW4)
-#define TX_CPU_EVENT_SBDC           (1 << TX_CPU_EVT_SBDC)
-#define TX_CPU_EVENT_SW_EVENT5      (1 << TX_CPU_EVT_SW5)
-#define TX_CPU_EVENT_SDI            (1 << TX_CPU_EVT_SDI)
-#define TX_CPU_EVENT_DMA_WR         (1 << TX_CPU_EVT_DMA_WR)
-#define TX_CPU_EVENT_DMA_RD         (1 << TX_CPU_EVT_DMA_RD)
-#define TX_CPU_EVENT_SWQ            (1 << TX_CPU_EVT_SWQ)
-#define TX_CPU_EVENT_SW_EVENT6      (1 << TX_CPU_EVT_SW6)
-#define TX_CPU_EVENT_SDC            (1 << TX_CPU_EVT_SDC)
-#define TX_CPU_EVENT_SW_EVENT7      (1 << TX_CPU_EVT_SW7)
-#define TX_CPU_EVENT_HOST_COALES    (1 << TX_CPU_EVT_HOST_COALES)
-#define TX_CPU_EVENT_SW_EVENT8      (1 << TX_CPU_EVT_SW8)
-#define TX_CPU_EVENT_HIGH_DMA_WR    (1 << TX_CPU_EVT_HIGH_DMA_WR)
-#define TX_CPU_EVENT_HIGH_DMA_RD    (1 << TX_CPU_EVT_HIGH_DMA_RD)
-#define TX_CPU_EVENT_SW_EVENT9      (1 << TX_CPU_EVT_SW9)
-#define TX_CPU_EVENT_DMA_ATTN       (1 << TX_CPU_EVT_DMA_ATTN)
-#define TX_CPU_EVENT_LOW_P_MBOX     (1 << TX_CPU_EVT_LOW_P_MBOX)
-#define TX_CPU_EVENT_HIGH_P_MBOX    (1 << TX_CPU_EVT_HIGH_P_MBOX)
-#define TX_CPU_EVENT_SW_EVENT10     (1 << TX_CPU_EVT_SW10)
-#define TX_CPU_EVENT_RX_CPU_ATTN    (1 << TX_CPU_EVT_RX_CPU_ATTN)
-#define TX_CPU_EVENT_MAC_ATTN       (1 << TX_CPU_EVT_MAC_ATTN)
-#define TX_CPU_EVENT_TX_CPU_ATTN    (1 << TX_CPU_EVT_TX_CPU_ATTN)
-#define TX_CPU_EVENT_FLOW_ATTN      (1 << TX_CPU_EVT_FLOW_ATTN)
-#define TX_CPU_EVENT_SW_EVENT11     (1 << TX_CPU_EVT_SW11)
-#define TX_CPU_EVENT_TIMER          (1 << TX_CPU_EVT_TIMER)
-#define TX_CPU_EVENT_SW_EVENT12     (1 << TX_CPU_EVT_SW12)
-#define TX_CPU_EVENT_SW_EVENT13     (1 << TX_CPU_EVT_SW13)
-
-
-#define TX_CPU_MASK (TX_CPU_EVENT_SW_EVENT0 | \
-		     TX_CPU_EVENT_SDI  | \
-		     TX_CPU_EVENT_SDC)
-
-
-#define T3_FTQ_TYPE1_UNDERFLOW_BIT   (1 << 29)
-#define T3_FTQ_TYPE1_PASS_BIT        (1 << 30)
-#define T3_FTQ_TYPE1_SKIP_BIT        (1 << 31)
-
-#define T3_FTQ_TYPE2_UNDERFLOW_BIT   (1 << 13)
-#define T3_FTQ_TYPE2_PASS_BIT        (1 << 14)
-#define T3_FTQ_TYPE2_SKIP_BIT        (1 << 15)
-
-#define T3_QID_DMA_READ               1
-#define T3_QID_DMA_HIGH_PRI_READ      2
-#define T3_QID_DMA_COMP_DX            3
-#define T3_QID_SEND_BD_COMP           4
-#define T3_QID_SEND_DATA_INITIATOR    5
-#define T3_QID_DMA_WRITE              6
-#define T3_QID_DMA_HIGH_PRI_WRITE     7
-#define T3_QID_SW_TYPE_1              8
-#define T3_QID_SEND_DATA_COMP         9
-#define T3_QID_HOST_COALESCING        10
-#define T3_QID_MAC_TX                 11
-#define T3_QID_MBUF_CLUSTER_FREE      12
-#define T3_QID_RX_BD_COMP             13
-#define T3_QID_RX_LIST_PLM            14
-#define T3_QID_RX_DATA_BD_INITIATOR   15
-#define T3_QID_RX_DATA_COMP           16
-#define T3_QID_SW_TYPE2               17
-
-LM_STATUS LM_LoadFirmware(PLM_DEVICE_BLOCK pDevice,
-                          PT3_FWIMG_INFO pFwImg,
-                          LM_UINT32 LoadCpu,
-                          LM_UINT32 StartCpu);
-
-/******************************************************************************/
-/* NIC register read/write macros. */
-/******************************************************************************/
-
-/* MAC register access. */
-LM_UINT32 LM_RegRd(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Register);
-
-LM_VOID LM_RegWr(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Register,
-    LM_UINT32 Value32, LM_UINT32 ReadBack);
-
-LM_UINT32 LM_RegRdInd(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Register);
-LM_VOID LM_RegWrInd(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Register,
-    LM_UINT32 Value32);
-
-/* MAC memory access. */
-LM_UINT32 LM_MemRdInd(PLM_DEVICE_BLOCK pDevice, LM_UINT32 MemAddr);
-
-LM_VOID LM_MemWrInd(PLM_DEVICE_BLOCK pDevice, LM_UINT32 MemAddr,
-    LM_UINT32 Value32);
-
-#define MB_REG_WR(pDevice, OffsetName, Value32)                               \
-    ((pDevice)->UndiFix) ?                                                    \
-        LM_RegWrInd(pDevice, OFFSETOF(T3_STD_MEM_MAP, OffsetName)+0x5600,     \
-            Value32) :                                                        \
-        (void) MM_MEMWRITEL(&((pDevice)->pMemView->OffsetName), Value32)
-
-#define MB_REG_RD(pDevice, OffsetName)                                        \
-    (((pDevice)->UndiFix) ?                                                   \
-        LM_RegRdInd(pDevice, OFFSETOF(T3_STD_MEM_MAP, OffsetName)+0x5600) :   \
-        MM_MEMREADL(&((pDevice)->pMemView->OffsetName)))
-
-#define REG_RD(pDevice, OffsetName)                                         \
-    LM_RegRd(pDevice, OFFSETOF(T3_STD_MEM_MAP, OffsetName))
-
-#define REG_WR(pDevice, OffsetName, Value32)                                \
-    LM_RegWr(pDevice, OFFSETOF(T3_STD_MEM_MAP, OffsetName), Value32, TRUE)
-
-#define RAW_REG_WR(pDevice, OffsetName, Value32)                            \
-    LM_RegWr(pDevice, OFFSETOF(T3_STD_MEM_MAP, OffsetName), Value32, FALSE)
-
-#define REG_RD_OFFSET(pDevice, Offset)                                      \
-    MM_MEMREADL(((LM_UINT8 *) (pDevice)->pMemView + Offset))
-
-#define REG_WR_OFFSET(pDevice, Offset, Value32)                             \
-    MM_MEMWRITEL(((LM_UINT8 *) (pDevice)->pMemView + Offset), Value32)
-
-#define MEM_RD(pDevice, AddrName)                                           \
-    LM_MemRdInd(pDevice, OFFSETOF(T3_FIRST_32K_SRAM, AddrName))
-#define MEM_WR(pDevice, AddrName, Value32)                                  \
-    LM_MemWrInd(pDevice, OFFSETOF(T3_FIRST_32K_SRAM, AddrName), Value32)
-
-#define MEM_RD_OFFSET(pDevice, Offset)                                      \
-    LM_MemRdInd(pDevice, Offset)
-#define MEM_WR_OFFSET(pDevice, Offset, Value32)                             \
-    LM_MemWrInd(pDevice, Offset, Value32)
-				
-
-#endif /* TIGON3_H */
-
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/5701rls.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/5701rls.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/5701rls.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/5701rls.c	2004-09-05 15:48:48.000000000 +0200
@@ -0,0 +1,46 @@
+/******************************************************************************/
+/*                                                                            */
+/* Broadcom BCM5700 Linux Network Driver, Copyright (c) 2000 - 2003 Broadcom  */
+/* 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, located in the file LICENSE.                 */
+/*                                                                            */
+/* History:                                                                   */
+/*                                                                            */
+/******************************************************************************/
+
+#if INCLUDE_5701_AX_FIX
+
+#include "mm.h"
+#include "5701rls.h"
+
+LM_STATUS LM_LoadRlsFirmware(PLM_DEVICE_BLOCK pDevice)
+{
+  T3_FWIMG_INFO FwImgInfo;
+
+  FwImgInfo.StartAddress = t3FwStartAddr;
+  FwImgInfo.Text.Buffer = (PLM_UINT8)t3FwText;
+  FwImgInfo.Text.Offset  = t3FwTextAddr;
+  FwImgInfo.Text.Length  = t3FwTextLen;
+  FwImgInfo.ROnlyData.Buffer = (PLM_UINT8)t3FwRodata;
+  FwImgInfo.ROnlyData.Offset  = t3FwRodataAddr;
+  FwImgInfo.ROnlyData.Length  = t3FwRodataLen;
+  FwImgInfo.Data.Buffer = (PLM_UINT8)t3FwData;
+  FwImgInfo.Data.Offset  = t3FwDataAddr;
+  FwImgInfo.Data.Length  = t3FwDataLen;
+
+  if (LM_LoadFirmware(pDevice,
+                      &FwImgInfo,
+                      T3_RX_CPU_ID | T3_TX_CPU_ID,
+                      T3_RX_CPU_ID) != LM_STATUS_SUCCESS)
+    {
+      return LM_STATUS_FAILURE;
+    }
+  
+  return LM_STATUS_SUCCESS;
+}
+
+#endif /* INCLUDE_5701_AX_FIX */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/5701rls.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/5701rls.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/5701rls.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/5701rls.h	2004-09-05 15:48:48.000000000 +0200
@@ -0,0 +1,198 @@
+/******************************************************************************/
+/*                                                                            */
+/* Broadcom BCM5700 Linux Network Driver, Copyright (c) 2000 - 2003 Broadcom  */
+/* 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, located in the file LICENSE.                 */
+/*                                                                            */
+/* History:                                                                   */
+/******************************************************************************/
+
+typedef unsigned long U32;
+int t3FwReleaseMajor = 0x0;
+int t3FwReleaseMinor = 0x0;
+int t3FwReleaseFix = 0x0;
+U32 t3FwStartAddr = 0x08000000;
+U32 t3FwTextAddr = 0x08000000;
+int t3FwTextLen = 0x9c0;
+U32 t3FwRodataAddr = 0x080009c0;
+int t3FwRodataLen = 0x60;
+U32 t3FwDataAddr = 0x08000a40;
+int t3FwDataLen = 0x20;
+U32 t3FwSbssAddr = 0x08000a60;
+int t3FwSbssLen = 0xc;
+U32 t3FwBssAddr = 0x08000a70;
+int t3FwBssLen = 0x10;
+U32 t3FwText[(0x9c0/4) + 1] = {
+0x0, 
+0x10000003, 0x0, 0xd, 0xd, 
+0x3c1d0800, 0x37bd3ffc, 0x3a0f021, 0x3c100800, 
+0x26100000, 0xe000018, 0x0, 0xd, 
+0x3c1d0800, 0x37bd3ffc, 0x3a0f021, 0x3c100800, 
+0x26100034, 0xe00021c, 0x0, 0xd, 
+0x0, 0x0, 0x0, 0x27bdffe0, 
+0x3c1cc000, 0xafbf0018, 0xaf80680c, 0xe00004c, 
+0x241b2105, 0x97850000, 0x97870002, 0x9782002c, 
+0x9783002e, 0x3c040800, 0x248409c0, 0xafa00014, 
+0x21400, 0x621825, 0x52c00, 0xafa30010, 
+0x8f860010, 0xe52825, 0xe000060, 0x24070102, 
+0x3c02ac00, 0x34420100, 0x3c03ac01, 0x34630100, 
+0xaf820490, 0x3c02ffff, 0xaf820494, 0xaf830498, 
+0xaf82049c, 0x24020001, 0xaf825ce0, 0xe00003f, 
+0xaf825d00, 0xe000140, 0x0, 0x8fbf0018, 
+0x3e00008, 0x27bd0020, 0x2402ffff, 0xaf825404, 
+0x8f835400, 0x34630400, 0xaf835400, 0xaf825404, 
+0x3c020800, 0x24420034, 0xaf82541c, 0x3e00008, 
+0xaf805400, 0x0, 0x0, 0x3c020800, 
+0x34423000, 0x3c030800, 0x34633000, 0x3c040800, 
+0x348437ff, 0x3c010800, 0xac220a64, 0x24020040, 
+0x3c010800, 0xac220a68, 0x3c010800, 0xac200a60, 
+0xac600000, 0x24630004, 0x83102b, 0x5040fffd, 
+0xac600000, 0x3e00008, 0x0, 0x804821, 
+0x8faa0010, 0x3c020800, 0x8c420a60, 0x3c040800, 
+0x8c840a68, 0x8fab0014, 0x24430001, 0x44102b, 
+0x3c010800, 0xac230a60, 0x14400003, 0x4021, 
+0x3c010800, 0xac200a60, 0x3c020800, 0x8c420a60, 
+0x3c030800, 0x8c630a64, 0x91240000, 0x21140, 
+0x431021, 0x481021, 0x25080001, 0xa0440000, 
+0x29020008, 0x1440fff4, 0x25290001, 0x3c020800, 
+0x8c420a60, 0x3c030800, 0x8c630a64, 0x8f84680c, 
+0x21140, 0x431021, 0xac440008, 0xac45000c, 
+0xac460010, 0xac470014, 0xac4a0018, 0x3e00008, 
+0xac4b001c, 0x0, 0x0, 0x0, 
+0x0, 0x0, 0x0, 0x0, 
+0x0, 0x0, 0x0, 0x0, 
+0x0, 0x0, 0x0, 0x0, 
+0x0, 0x0, 0x0, 0x0, 
+0x0, 0x0, 0x0, 0x0, 
+0x0, 0x0, 0x0, 0x0, 
+0x0, 0x0, 0x0, 0x0, 
+0x0, 0x0, 0x0, 0x0, 
+0x0, 0x0, 0x0, 0x0, 
+0x0, 0x0, 0x0, 0x0, 
+0x0, 0x0, 0x0, 0x0, 
+0x0, 0x0, 0x0, 0x0, 
+0x0, 0x0, 0x0, 0x2000008, 
+0x0, 0xa0001e3, 0x3c0a0001, 0xa0001e3, 
+0x3c0a0002, 0xa0001e3, 0x0, 0xa0001e3, 
+0x0, 0xa0001e3, 0x0, 0xa0001e3, 
+0x0, 0xa0001e3, 0x0, 0xa0001e3, 
+0x0, 0xa0001e3, 0x0, 0xa0001e3, 
+0x0, 0xa0001e3, 0x0, 0xa0001e3, 
+0x3c0a0007, 0xa0001e3, 0x3c0a0008, 0xa0001e3, 
+0x3c0a0009, 0xa0001e3, 0x0, 0xa0001e3, 
+0x0, 0xa0001e3, 0x3c0a000b, 0xa0001e3, 
+0x3c0a000c, 0xa0001e3, 0x3c0a000d, 0xa0001e3, 
+0x0, 0xa0001e3, 0x0, 0xa0001e3, 
+0x3c0a000e, 0xa0001e3, 0x0, 0xa0001e3, 
+0x0, 0xa0001e3, 0x0, 0xa0001e3, 
+0x0, 0xa0001e3, 0x0, 0xa0001e3, 
+0x0, 0xa0001e3, 0x0, 0xa0001e3, 
+0x0, 0xa0001e3, 0x3c0a0013, 0xa0001e3, 
+0x3c0a0014, 0x0, 0x0, 0x0, 
+0x0, 0x0, 0x0, 0x0, 
+0x0, 0x0, 0x0, 0x0, 
+0x0, 0x0, 0x0, 0x0, 
+0x0, 0x0, 0x0, 0x0, 
+0x0, 0x0, 0x0, 0x0, 
+0x0, 0x0, 0x0, 0x0, 
+0x0, 0x0, 0x0, 0x0, 
+0x0, 0x0, 0x0, 0x0, 
+0x0, 0x0, 0x0, 0x0, 
+0x0, 0x0, 0x0, 0x0, 
+0x0, 0x0, 0x0, 0x0, 
+0x0, 0x0, 0x0, 0x0, 
+0x0, 0x0, 0x0, 0x0, 
+0x0, 0x0, 0x0, 0x0, 
+0x0, 0x0, 0x0, 0x27bdffe0, 
+0x1821, 0x1021, 0xafbf0018, 0xafb10014, 
+0xafb00010, 0x3c010800, 0x220821, 0xac200a70, 
+0x3c010800, 0x220821, 0xac200a74, 0x3c010800, 
+0x220821, 0xac200a78, 0x24630001, 0x1860fff5, 
+0x2442000c, 0x24110001, 0x8f906810, 0x32020004, 
+0x14400005, 0x24040001, 0x3c020800, 0x8c420a78, 
+0x18400003, 0x2021, 0xe000182, 0x0, 
+0x32020001, 0x10400003, 0x0, 0xe000169, 
+0x0, 0xa000153, 0xaf915028, 0x8fbf0018, 
+0x8fb10014, 0x8fb00010, 0x3e00008, 0x27bd0020, 
+0x3c050800, 0x8ca50a70, 0x3c060800, 0x8cc60a80, 
+0x3c070800, 0x8ce70a78, 0x27bdffe0, 0x3c040800, 
+0x248409d0, 0xafbf0018, 0xafa00010, 0xe000060, 
+0xafa00014, 0xe00017b, 0x2021, 0x8fbf0018, 
+0x3e00008, 0x27bd0020, 0x24020001, 0x8f836810, 
+0x821004, 0x21027, 0x621824, 0x3e00008, 
+0xaf836810, 0x27bdffd8, 0xafbf0024, 0x1080002e, 
+0xafb00020, 0x8f825cec, 0xafa20018, 0x8f825cec, 
+0x3c100800, 0x26100a78, 0xafa2001c, 0x34028000, 
+0xaf825cec, 0x8e020000, 0x18400016, 0x0, 
+0x3c020800, 0x94420a74, 0x8fa3001c, 0x221c0, 
+0xac830004, 0x8fa2001c, 0x3c010800, 0xe000201, 
+0xac220a74, 0x10400005, 0x0, 0x8e020000, 
+0x24420001, 0xa0001df, 0xae020000, 0x3c020800, 
+0x8c420a70, 0x21c02, 0x321c0, 0xa0001c5, 
+0xafa2001c, 0xe000201, 0x0, 0x1040001f, 
+0x0, 0x8e020000, 0x8fa3001c, 0x24420001, 
+0x3c010800, 0xac230a70, 0x3c010800, 0xac230a74, 
+0xa0001df, 0xae020000, 0x3c100800, 0x26100a78, 
+0x8e020000, 0x18400028, 0x0, 0xe000201, 
+0x0, 0x14400024, 0x0, 0x8e020000, 
+0x3c030800, 0x8c630a70, 0x2442ffff, 0xafa3001c, 
+0x18400006, 0xae020000, 0x31402, 0x221c0, 
+0x8c820004, 0x3c010800, 0xac220a70, 0x97a2001e, 
+0x2442ff00, 0x2c420300, 0x1440000b, 0x24024000, 
+0x3c040800, 0x248409dc, 0xafa00010, 0xafa00014, 
+0x8fa6001c, 0x24050008, 0xe000060, 0x3821, 
+0xa0001df, 0x0, 0xaf825cf8, 0x3c020800, 
+0x8c420a40, 0x8fa3001c, 0x24420001, 0xaf835cf8, 
+0x3c010800, 0xac220a40, 0x8fbf0024, 0x8fb00020, 
+0x3e00008, 0x27bd0028, 0x27bdffe0, 0x3c040800, 
+0x248409e8, 0x2821, 0x3021, 0x3821, 
+0xafbf0018, 0xafa00010, 0xe000060, 0xafa00014, 
+0x8fbf0018, 0x3e00008, 0x27bd0020, 0x8f82680c, 
+0x8f85680c, 0x21827, 0x3182b, 0x31823, 
+0x431024, 0x441021, 0xa2282b, 0x10a00006, 
+0x0, 0x401821, 0x8f82680c, 0x43102b, 
+0x1440fffd, 0x0, 0x3e00008, 0x0, 
+0x3c040800, 0x8c840000, 0x3c030800, 0x8c630a40, 
+0x64102b, 0x54400002, 0x831023, 0x641023, 
+0x2c420008, 0x3e00008, 0x38420001, 0x27bdffe0, 
+0x802821, 0x3c040800, 0x24840a00, 0x3021, 
+0x3821, 0xafbf0018, 0xafa00010, 0xe000060, 
+0xafa00014, 0xa000216, 0x0, 0x8fbf0018, 
+0x3e00008, 0x27bd0020, 0x0, 0x27bdffe0, 
+0x3c1cc000, 0xafbf0018, 0xe00004c, 0xaf80680c, 
+0x3c040800, 0x24840a10, 0x3802821, 0x3021, 
+0x3821, 0xafa00010, 0xe000060, 0xafa00014, 
+0x2402ffff, 0xaf825404, 0x3c0200aa, 0xe000234, 
+0xaf825434, 0x8fbf0018, 0x3e00008, 0x27bd0020, 
+0x0, 0x0, 0x0, 0x27bdffe8, 
+0xafb00010, 0x24100001, 0xafbf0014, 0x3c01c003, 
+0xac200000, 0x8f826810, 0x30422000, 0x10400003, 
+0x0, 0xe000246, 0x0, 0xa00023a, 
+0xaf905428, 0x8fbf0014, 0x8fb00010, 0x3e00008, 
+0x27bd0018, 0x27bdfff8, 0x8f845d0c, 0x3c0200ff, 
+0x3c030800, 0x8c630a50, 0x3442fff8, 0x821024, 
+0x1043001e, 0x3c0500ff, 0x34a5fff8, 0x3c06c003, 
+0x3c074000, 0x851824, 0x8c620010, 0x3c010800, 
+0xac230a50, 0x30420008, 0x10400005, 0x871025, 
+0x8cc20000, 0x24420001, 0xacc20000, 0x871025, 
+0xaf825d0c, 0x8fa20000, 0x24420001, 0xafa20000, 
+0x8fa20000, 0x8fa20000, 0x24420001, 0xafa20000, 
+0x8fa20000, 0x8f845d0c, 0x3c030800, 0x8c630a50, 
+0x851024, 0x1443ffe8, 0x851824, 0x27bd0008, 
+0x3e00008, 0x0, 0x0, 0x0 };
+U32 t3FwRodata[(0x60/4) + 1] = {
+0x35373031, 0x726c7341, 0x0, 
+0x0, 0x53774576, 0x656e7430, 0x0, 
+0x726c7045, 0x76656e74, 0x31000000, 0x556e6b6e, 
+0x45766e74, 0x0, 0x0, 0x0, 
+0x0, 0x66617461, 0x6c457272, 0x0, 
+0x0, 0x4d61696e, 0x43707542, 0x0, 
+0x0, 0x0 };
+U32 t3FwData[(0x20/4) + 1] = {
+0x0, 0x0, 0x0, 
+0x0, 0x0, 0x0, 0x0, 
+0x0, 0x0 };
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/Makefile linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/Makefile
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/Makefile	2004-09-05 15:48:48.000000000 +0200
@@ -0,0 +1,13 @@
+
+#
+# Makefile for linux/drivers/net/bcm
+#
+
+O_TARGET := bcm5700.o
+obj-y    := b57um.o b57proc.o tigon3.o autoneg.o 5701rls.o tcp_seg.o b57diag.o
+obj-m    := $(O_TARGET)
+
+EXTRA_CFLAGS = -DDBG=0 -DT3_JUMBO_RCV_RCB_ENTRY_COUNT=256 -DNICE_SUPPORT -DPCIX_TARGET_WORKAROUND=1 -DINCLUDE_TBI_SUPPORT -DINCLUDE_5701_AX_FIX=1
+
+include $(TOPDIR)/Rules.make
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/autoneg.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/autoneg.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/autoneg.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/autoneg.c	2004-09-05 15:48:48.000000000 +0200
@@ -0,0 +1,438 @@
+/******************************************************************************/
+/*                                                                            */
+/* Broadcom BCM5700 Linux Network Driver, Copyright (c) 2000 - 2003 Broadcom  */
+/* 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, located in the file LICENSE.                 */
+/*                                                                            */
+/* History:                                                                   */
+/******************************************************************************/
+
+#if INCLUDE_TBI_SUPPORT
+#include "mm.h"
+
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+void
+MM_AnTxConfig(
+    PAN_STATE_INFO pAnInfo)
+{
+    PLM_DEVICE_BLOCK pDevice;
+
+    pDevice = (PLM_DEVICE_BLOCK) pAnInfo->pContext;
+
+    REG_WR(pDevice, MacCtrl.TxAutoNeg, (LM_UINT32) pAnInfo->TxConfig.AsUSHORT);
+
+    pDevice->MacMode |= MAC_MODE_SEND_CONFIGS;
+    REG_WR(pDevice, MacCtrl.Mode, pDevice->MacMode);
+}
+
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+void
+MM_AnTxIdle(
+    PAN_STATE_INFO pAnInfo)
+{
+    PLM_DEVICE_BLOCK pDevice;
+
+    pDevice = (PLM_DEVICE_BLOCK) pAnInfo->pContext;
+
+    pDevice->MacMode &= ~MAC_MODE_SEND_CONFIGS;
+    REG_WR(pDevice, MacCtrl.Mode, pDevice->MacMode);
+}
+
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+char
+MM_AnRxConfig(
+    PAN_STATE_INFO pAnInfo,
+    unsigned short *pRxConfig)
+{
+    PLM_DEVICE_BLOCK pDevice;
+    LM_UINT32 Value32;
+    char Retcode;
+
+    Retcode = AN_FALSE;
+
+    pDevice = (PLM_DEVICE_BLOCK) pAnInfo->pContext;
+
+    Value32 = REG_RD(pDevice, MacCtrl.Status);
+    if(Value32 & MAC_STATUS_RECEIVING_CFG)
+    {
+        Value32 = REG_RD(pDevice, MacCtrl.RxAutoNeg);
+        *pRxConfig = (unsigned short) Value32;
+
+        Retcode = AN_TRUE;
+    }
+
+    return Retcode;
+}
+
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+void
+AutonegInit(
+    PAN_STATE_INFO pAnInfo)
+{
+    unsigned long j;
+
+    for(j = 0; j < sizeof(AN_STATE_INFO); j++)
+    {
+        ((unsigned char *) pAnInfo)[j] = 0;
+    }
+
+    /* Initialize the default advertisement register. */
+    pAnInfo->mr_adv_full_duplex = 1;
+    pAnInfo->mr_adv_sym_pause = 1;
+    pAnInfo->mr_adv_asym_pause = 1;
+    pAnInfo->mr_an_enable = 1;
+}
+
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+AUTONEG_STATUS
+Autoneg8023z(
+    PAN_STATE_INFO pAnInfo)
+{
+    unsigned short RxConfig;
+    unsigned long Delta_us;
+    AUTONEG_STATUS AnRet;
+
+    /* Get the current time. */
+    if(pAnInfo->State == AN_STATE_UNKNOWN)
+    {
+        pAnInfo->RxConfig.AsUSHORT = 0;
+        pAnInfo->CurrentTime_us = 0;
+        pAnInfo->LinkTime_us = 0;
+        pAnInfo->AbilityMatchCfg = 0;
+        pAnInfo->AbilityMatchCnt = 0;
+        pAnInfo->AbilityMatch = AN_FALSE;
+        pAnInfo->IdleMatch = AN_FALSE;
+        pAnInfo->AckMatch = AN_FALSE;
+    }
+
+    /* Increment the timer tick.  This function is called every microsecon. */
+//    pAnInfo->CurrentTime_us++;
+
+    /* Set the AbilityMatch, IdleMatch, and AckMatch flags if their */
+    /* corresponding conditions are satisfied. */
+    if(MM_AnRxConfig(pAnInfo, &RxConfig))
+    {
+        if(RxConfig != pAnInfo->AbilityMatchCfg)
+        {
+            pAnInfo->AbilityMatchCfg = RxConfig;
+            pAnInfo->AbilityMatch = AN_FALSE;
+            pAnInfo->AbilityMatchCnt = 0;
+        }
+        else
+        {
+            pAnInfo->AbilityMatchCnt++;
+            if(pAnInfo->AbilityMatchCnt > 1)
+            {
+                pAnInfo->AbilityMatch = AN_TRUE;
+                pAnInfo->AbilityMatchCfg = RxConfig;
+            }
+        }
+
+        if(RxConfig & AN_CONFIG_ACK)
+        {
+            pAnInfo->AckMatch = AN_TRUE;
+        }
+        else
+        {
+            pAnInfo->AckMatch = AN_FALSE;
+        }
+
+        pAnInfo->IdleMatch = AN_FALSE;
+    }
+    else
+    {
+        pAnInfo->IdleMatch = AN_TRUE;
+
+        pAnInfo->AbilityMatchCfg = 0;
+        pAnInfo->AbilityMatchCnt = 0;
+        pAnInfo->AbilityMatch = AN_FALSE;
+        pAnInfo->AckMatch = AN_FALSE;
+
+        RxConfig = 0;
+    }
+
+    /* Save the last Config. */
+    pAnInfo->RxConfig.AsUSHORT = RxConfig;
+
+    /* Default return code. */
+    AnRet = AUTONEG_STATUS_OK;
+
+    /* Autoneg state machine as defined in 802.3z section 37.3.1.5. */
+    switch(pAnInfo->State)
+    {
+        case AN_STATE_UNKNOWN:
+            if(pAnInfo->mr_an_enable || pAnInfo->mr_restart_an)
+            {
+                pAnInfo->CurrentTime_us = 0;
+                pAnInfo->State = AN_STATE_AN_ENABLE;
+            }
+
+            /* Fall through.*/
+
+        case AN_STATE_AN_ENABLE:
+            pAnInfo->mr_an_complete = AN_FALSE;
+            pAnInfo->mr_page_rx = AN_FALSE;
+
+            if(pAnInfo->mr_an_enable)
+            {
+                pAnInfo->LinkTime_us = 0;
+                pAnInfo->AbilityMatchCfg = 0;
+                pAnInfo->AbilityMatchCnt = 0;
+                pAnInfo->AbilityMatch = AN_FALSE;
+                pAnInfo->IdleMatch = AN_FALSE;
+                pAnInfo->AckMatch = AN_FALSE;
+
+                pAnInfo->State = AN_STATE_AN_RESTART_INIT;
+            }
+            else
+            {
+                pAnInfo->State = AN_STATE_DISABLE_LINK_OK;
+            }
+            break;
+
+        case AN_STATE_AN_RESTART_INIT:
+            pAnInfo->LinkTime_us = pAnInfo->CurrentTime_us;
+            pAnInfo->mr_np_loaded = AN_FALSE;
+
+            pAnInfo->TxConfig.AsUSHORT = 0;
+            MM_AnTxConfig(pAnInfo);
+
+            AnRet = AUTONEG_STATUS_TIMER_ENABLED;
+
+            pAnInfo->State = AN_STATE_AN_RESTART;
+
+            /* Fall through.*/
+
+        case AN_STATE_AN_RESTART:
+            /* Get the current time and compute the delta with the saved */
+            /* link timer. */
+            Delta_us = pAnInfo->CurrentTime_us - pAnInfo->LinkTime_us;
+            if(Delta_us > AN_LINK_TIMER_INTERVAL_US)
+            {
+                pAnInfo->State = AN_STATE_ABILITY_DETECT_INIT;
+            }
+            else
+            {
+                AnRet = AUTONEG_STATUS_TIMER_ENABLED;
+            }
+            break;
+
+        case AN_STATE_DISABLE_LINK_OK:
+            AnRet = AUTONEG_STATUS_DONE;
+            break;
+
+        case AN_STATE_ABILITY_DETECT_INIT:
+            /* Note: in the state diagram, this variable is set to */
+            /* mr_adv_ability<12>.  Is this right?. */
+            pAnInfo->mr_toggle_tx = AN_FALSE;
+
+            /* Send the config as advertised in the advertisement register. */
+            pAnInfo->TxConfig.AsUSHORT = 0;
+            pAnInfo->TxConfig.D5_FD = pAnInfo->mr_adv_full_duplex;
+            pAnInfo->TxConfig.D6_HD = pAnInfo->mr_adv_half_duplex;
+            pAnInfo->TxConfig.D7_PS1 = pAnInfo->mr_adv_sym_pause;
+            pAnInfo->TxConfig.D8_PS2 = pAnInfo->mr_adv_asym_pause;
+            pAnInfo->TxConfig.D12_RF1 = pAnInfo->mr_adv_remote_fault1;
+            pAnInfo->TxConfig.D13_RF2 = pAnInfo->mr_adv_remote_fault2;
+            pAnInfo->TxConfig.D15_NP = pAnInfo->mr_adv_next_page;
+
+            MM_AnTxConfig(pAnInfo);
+
+            pAnInfo->State = AN_STATE_ABILITY_DETECT;
+
+            break;
+
+        case AN_STATE_ABILITY_DETECT:
+            if(pAnInfo->AbilityMatch == AN_TRUE &&
+                pAnInfo->RxConfig.AsUSHORT != 0)
+            {
+                pAnInfo->State = AN_STATE_ACK_DETECT_INIT;
+            }
+
+            break;
+
+        case AN_STATE_ACK_DETECT_INIT:
+            pAnInfo->TxConfig.D14_ACK = 1;
+            MM_AnTxConfig(pAnInfo);
+
+            pAnInfo->State = AN_STATE_ACK_DETECT;
+
+            /* Fall through. */
+
+        case AN_STATE_ACK_DETECT:
+            if(pAnInfo->AckMatch == AN_TRUE)
+            {
+                if((pAnInfo->RxConfig.AsUSHORT & ~AN_CONFIG_ACK) ==
+                    (pAnInfo->AbilityMatchCfg & ~AN_CONFIG_ACK))
+                {
+                    pAnInfo->State = AN_STATE_COMPLETE_ACK_INIT;
+                }
+                else
+                {
+                    pAnInfo->State = AN_STATE_AN_ENABLE;
+                }
+            }
+            else if(pAnInfo->AbilityMatch == AN_TRUE &&
+                pAnInfo->RxConfig.AsUSHORT == 0)
+            {
+                pAnInfo->State = AN_STATE_AN_ENABLE;
+            }
+
+            break;
+
+        case AN_STATE_COMPLETE_ACK_INIT:
+            /* Make sure invalid bits are not set. */
+            if(pAnInfo->RxConfig.bits.D0 || pAnInfo->RxConfig.bits.D1 ||
+                pAnInfo->RxConfig.bits.D2 || pAnInfo->RxConfig.bits.D3 ||
+                pAnInfo->RxConfig.bits.D4 || pAnInfo->RxConfig.bits.D9 ||
+                pAnInfo->RxConfig.bits.D10 || pAnInfo->RxConfig.bits.D11)
+            {
+                AnRet = AUTONEG_STATUS_FAILED;
+                break;
+            }
+
+            /* Set up the link partner advertisement register. */
+            pAnInfo->mr_lp_adv_full_duplex = pAnInfo->RxConfig.D5_FD;
+            pAnInfo->mr_lp_adv_half_duplex = pAnInfo->RxConfig.D6_HD;
+            pAnInfo->mr_lp_adv_sym_pause = pAnInfo->RxConfig.D7_PS1;
+            pAnInfo->mr_lp_adv_asym_pause = pAnInfo->RxConfig.D8_PS2;
+            pAnInfo->mr_lp_adv_remote_fault1 = pAnInfo->RxConfig.D12_RF1;
+            pAnInfo->mr_lp_adv_remote_fault2 = pAnInfo->RxConfig.D13_RF2;
+            pAnInfo->mr_lp_adv_next_page = pAnInfo->RxConfig.D15_NP;
+
+            pAnInfo->LinkTime_us = pAnInfo->CurrentTime_us;
+
+            pAnInfo->mr_toggle_tx = !pAnInfo->mr_toggle_tx;
+            pAnInfo->mr_toggle_rx = pAnInfo->RxConfig.bits.D11;
+            pAnInfo->mr_np_rx = pAnInfo->RxConfig.D15_NP;
+            pAnInfo->mr_page_rx = AN_TRUE;
+
+            pAnInfo->State = AN_STATE_COMPLETE_ACK;
+            AnRet = AUTONEG_STATUS_TIMER_ENABLED;
+
+            break;
+
+        case AN_STATE_COMPLETE_ACK:
+            if(pAnInfo->AbilityMatch == AN_TRUE &&
+                pAnInfo->RxConfig.AsUSHORT == 0)
+            {
+                pAnInfo->State = AN_STATE_AN_ENABLE;
+                break;
+            }
+
+            Delta_us = pAnInfo->CurrentTime_us - pAnInfo->LinkTime_us;
+
+            if(Delta_us > AN_LINK_TIMER_INTERVAL_US)
+            {
+                if(pAnInfo->mr_adv_next_page == 0 ||
+                    pAnInfo->mr_lp_adv_next_page == 0)
+                {
+                    pAnInfo->State = AN_STATE_IDLE_DETECT_INIT;
+                }
+                else
+                {
+                    if(pAnInfo->TxConfig.bits.D15 == 0 &&
+                        pAnInfo->mr_np_rx == 0)
+                    {
+                        pAnInfo->State = AN_STATE_IDLE_DETECT_INIT;
+                    }
+                    else
+                    {
+                        AnRet = AUTONEG_STATUS_FAILED;
+                    }
+                }
+            }
+
+            break;
+
+        case AN_STATE_IDLE_DETECT_INIT:
+            pAnInfo->LinkTime_us = pAnInfo->CurrentTime_us;
+
+            MM_AnTxIdle(pAnInfo);
+
+            pAnInfo->State = AN_STATE_IDLE_DETECT;
+
+            AnRet = AUTONEG_STATUS_TIMER_ENABLED;
+
+            break;
+
+        case AN_STATE_IDLE_DETECT:
+            if(pAnInfo->AbilityMatch == AN_TRUE &&
+                pAnInfo->RxConfig.AsUSHORT == 0)
+            {
+                pAnInfo->State = AN_STATE_AN_ENABLE;
+                break;
+            }
+
+            Delta_us = pAnInfo->CurrentTime_us - pAnInfo->LinkTime_us;
+            if(Delta_us > AN_LINK_TIMER_INTERVAL_US)
+            {
+//                if(pAnInfo->IdleMatch == AN_TRUE)
+//                {
+                    pAnInfo->State = AN_STATE_LINK_OK;
+//                }
+//                else
+//                {
+//                    AnRet = AUTONEG_STATUS_FAILED;
+//                    break;
+//                }
+            }
+
+            break;
+
+        case AN_STATE_LINK_OK:
+            pAnInfo->mr_an_complete = AN_TRUE;
+            pAnInfo->mr_link_ok = AN_TRUE;
+            AnRet = AUTONEG_STATUS_DONE;
+
+            break;
+
+        case AN_STATE_NEXT_PAGE_WAIT_INIT:
+            break;
+
+        case AN_STATE_NEXT_PAGE_WAIT:
+            break;
+
+        default:
+            AnRet = AUTONEG_STATUS_FAILED;
+            break;
+    }
+
+    return AnRet;
+}
+#endif /* INCLUDE_TBI_SUPPORT */
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/autoneg.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/autoneg.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/autoneg.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/autoneg.h	2004-09-05 15:48:48.000000000 +0200
@@ -0,0 +1,418 @@
+/******************************************************************************/
+/*                                                                            */
+/* Broadcom BCM5700 Linux Network Driver, Copyright (c) 2000 - 2003 Broadcom  */
+/* 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, located in the file LICENSE.                 */
+/*                                                                            */
+/* History:                                                                   */
+/******************************************************************************/
+
+
+#ifndef AUTONEG_H
+#define AUTONEG_H
+
+
+
+/******************************************************************************/
+/* Constants. */
+/******************************************************************************/
+
+#define AN_LINK_TIMER_INTERVAL_US           12000       /* 10ms */
+
+/* TRUE, FALSE */
+#define AN_TRUE                             1
+#define AN_FALSE                            0
+
+
+
+/******************************************************************************/
+/* Main data structure for keeping track of 802.3z auto-negotation state */
+/* variables as shown in Figure 37-6 of the IEEE 802.3z specification. */
+/******************************************************************************/
+
+typedef struct
+{
+    /* Pointer to the operating system specific data structure. */
+    void *pContext;
+
+    /* Current auto-negotiation state. */
+    unsigned long State;
+    #define AN_STATE_UNKNOWN                        0
+    #define AN_STATE_AN_ENABLE                      1
+    #define AN_STATE_AN_RESTART_INIT                2
+    #define AN_STATE_AN_RESTART                     3
+    #define AN_STATE_DISABLE_LINK_OK                4
+    #define AN_STATE_ABILITY_DETECT_INIT            5
+    #define AN_STATE_ABILITY_DETECT                 6
+    #define AN_STATE_ACK_DETECT_INIT                7
+    #define AN_STATE_ACK_DETECT                     8
+    #define AN_STATE_COMPLETE_ACK_INIT              9
+    #define AN_STATE_COMPLETE_ACK                   10
+    #define AN_STATE_IDLE_DETECT_INIT               11
+    #define AN_STATE_IDLE_DETECT                    12
+    #define AN_STATE_LINK_OK                        13
+    #define AN_STATE_NEXT_PAGE_WAIT_INIT            14
+    #define AN_STATE_NEXT_PAGE_WAIT                 16
+
+    /* Link timer. */
+    unsigned long LinkTime_us;
+
+    /* Current time. */
+    unsigned long CurrentTime_us;
+
+    /* Ability, idle, and ack match functions. */
+    unsigned long AbilityMatchCnt;
+
+    /* Need these values for consistency check. */
+    unsigned short AbilityMatchCfg;
+
+    unsigned short reserved;
+
+    char AbilityMatch;
+    char IdleMatch;
+    char AckMatch;
+    char reserved1;
+
+    /* Tx config data */
+    union
+    {
+        /* The TxConfig register is arranged as follows:                      */
+        /*                                                                    */
+        /* MSB                                                           LSB  */
+        /* +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+  */
+        /* | D7| D6| D5| D4| D3| D2| D1| D0|D15|D14|D13|D12|D11|D10| D9| D8|  */
+        /* +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+  */
+        struct
+        {
+#ifdef BIG_ENDIAN_HOST
+            unsigned short D7:1;        /* PS1 */
+            unsigned short D6:1;        /* HD */
+            unsigned short D5:1;        /* FD */
+            unsigned short D4:1;
+            unsigned short D3:1;
+            unsigned short D2:1;
+            unsigned short D1:1;
+            unsigned short D0:1;
+            unsigned short D15:1;       /* NP */
+            unsigned short D14:1;       /* ACK */
+            unsigned short D13:1;       /* RF2 */
+            unsigned short D12:1;       /* RF1 */
+            unsigned short D11:1;
+            unsigned short D10:1;
+            unsigned short D9:1;
+            unsigned short D8:1;        /* PS2 */
+#else /* BIG_ENDIAN_HOST */
+            unsigned int D8:1;        /* PS2 */
+            unsigned int D9:1;
+            unsigned int D10:1;
+            unsigned int D11:1;
+            unsigned int D12:1;       /* RF1 */
+            unsigned int D13:1;       /* RF2 */
+            unsigned int D14:1;       /* ACK */
+            unsigned int D15:1;       /* NP */
+            unsigned int D0:1;
+            unsigned int D1:1;
+            unsigned int D2:1;
+            unsigned int D3:1;
+            unsigned int D4:1;
+            unsigned int D5:1;        /* FD */
+            unsigned int D6:1;        /* HD */
+            unsigned int D7:1;        /* PS1 */
+#endif
+        } bits;
+
+        unsigned short AsUSHORT;
+
+        #define D8_PS2                      bits.D8
+        #define D12_RF1                     bits.D12
+        #define D13_RF2                     bits.D13
+        #define D14_ACK                     bits.D14
+        #define D15_NP                      bits.D15
+        #define D5_FD                       bits.D5
+        #define D6_HD                       bits.D6
+        #define D7_PS1                      bits.D7
+    } TxConfig;
+
+    /* Rx config data */
+    union
+    {
+        /* The RxConfig register is arranged as follows:                      */
+        /*                                                                    */
+        /* MSB                                                           LSB  */
+        /* +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+  */
+        /* | D7| D6| D5| D4| D3| D2| D1| D0|D15|D14|D13|D12|D11|D10| D9| D8|  */
+        /* +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+  */
+        struct
+        {
+#ifdef BIG_ENDIAN_HOST
+	    unsigned short D7:1;        /* PS1 */
+            unsigned short D6:1;        /* HD */
+	    unsigned short D5:1;        /* FD */
+            unsigned short D4:1;
+            unsigned short D3:1;
+            unsigned short D2:1;
+            unsigned short D1:1;
+            unsigned short D0:1;
+  	    unsigned short D15:1;       /* NP */
+            unsigned short D14:1;       /* ACK */
+            unsigned short D13:1;       /* RF2 */    
+            unsigned short D12:1;       /* RF1 */
+            unsigned short D11:1;
+            unsigned short D10:1;
+            unsigned short D9:1;
+            unsigned short D8:1;        /* PS2 */
+#else /* BIG_ENDIAN_HOST */
+            unsigned int D8:1;        /* PS2 */
+            unsigned int D9:1;
+            unsigned int D10:1;
+            unsigned int D11:1;
+            unsigned int D12:1;       /* RF1 */
+            unsigned int D13:1;       /* RF2 */
+            unsigned int D14:1;       /* ACK */
+            unsigned int D15:1;       /* NP */
+            unsigned int D0:1;
+            unsigned int D1:1;
+            unsigned int D2:1;
+            unsigned int D3:1;
+            unsigned int D4:1;
+            unsigned int D5:1;        /* FD */
+            unsigned int D6:1;        /* HD */
+            unsigned int D7:1;        /* PS1 */
+#endif
+        } bits;
+
+        unsigned short AsUSHORT;
+    } RxConfig;
+
+    #define AN_CONFIG_NP                            0x0080
+    #define AN_CONFIG_ACK                           0x0040
+    #define AN_CONFIG_RF2                           0x0020
+    #define AN_CONFIG_RF1                           0x0010
+    #define AN_CONFIG_PS2                           0x0001
+    #define AN_CONFIG_PS1                           0x8000
+    #define AN_CONFIG_HD                            0x4000
+    #define AN_CONFIG_FD                            0x2000
+
+
+    /* Management registers. */
+
+    /* Control register. */
+    union
+    {
+        struct
+        {
+            unsigned int an_enable:1;
+            unsigned int loopback:1;
+            unsigned int reset:1;
+            unsigned int restart_an:1;
+        } bits;
+
+        unsigned short AsUSHORT;
+
+        #define mr_an_enable                Mr0.bits.an_enable
+        #define mr_loopback                 Mr0.bits.loopback
+        #define mr_main_reset               Mr0.bits.reset
+        #define mr_restart_an               Mr0.bits.restart_an
+    } Mr0;
+
+    /* Status register. */
+    union
+    {
+        struct
+        {
+            unsigned int an_complete:1;
+            unsigned int link_ok:1;
+        } bits;
+
+        unsigned short AsUSHORT;
+
+        #define mr_an_complete              Mr1.bits.an_complete
+        #define mr_link_ok                  Mr1.bits.link_ok
+    } Mr1;
+
+    /* Advertisement register. */
+    union
+    {
+        struct
+        {
+            unsigned int reserved_4:5;
+            unsigned int full_duplex:1;
+            unsigned int half_duplex:1;
+            unsigned int sym_pause:1;
+            unsigned int asym_pause:1;
+            unsigned int reserved_11:3;
+            unsigned int remote_fault1:1;
+            unsigned int remote_fault2:1;
+            unsigned int reserved_14:1;
+            unsigned int next_page:1;
+        } bits;
+
+        unsigned short AsUSHORT;
+
+        #define mr_adv_full_duplex          Mr4.bits.full_duplex
+        #define mr_adv_half_duplex          Mr4.bits.half_duplex
+        #define mr_adv_sym_pause            Mr4.bits.sym_pause
+        #define mr_adv_asym_pause           Mr4.bits.asym_pause
+        #define mr_adv_remote_fault1        Mr4.bits.remote_fault1
+        #define mr_adv_remote_fault2        Mr4.bits.remote_fault2
+        #define mr_adv_next_page            Mr4.bits.next_page
+    } Mr4;
+
+    /* Link partner advertisement register. */
+    union
+    {
+        struct
+        {
+            unsigned int reserved_4:5;
+            unsigned int lp_full_duplex:1;
+            unsigned int lp_half_duplex:1;
+            unsigned int lp_sym_pause:1;
+            unsigned int lp_asym_pause:1;
+            unsigned int reserved_11:3;
+            unsigned int lp_remote_fault1:1;
+            unsigned int lp_remote_fault2:1;
+            unsigned int lp_ack:1;
+            unsigned int lp_next_page:1;
+        } bits;
+
+        unsigned short AsUSHORT;
+
+        #define mr_lp_adv_full_duplex       Mr5.bits.lp_full_duplex
+        #define mr_lp_adv_half_duplex       Mr5.bits.lp_half_duplex
+        #define mr_lp_adv_sym_pause         Mr5.bits.lp_sym_pause
+        #define mr_lp_adv_asym_pause        Mr5.bits.lp_asym_pause
+        #define mr_lp_adv_remote_fault1     Mr5.bits.lp_remote_fault1
+        #define mr_lp_adv_remote_fault2     Mr5.bits.lp_remote_fault2
+        #define mr_lp_adv_next_page         Mr5.bits.lp_next_page
+    } Mr5;
+
+    /* Auto-negotiation expansion register. */
+    union
+    {
+        struct
+        {
+            unsigned int reserved_0:1;
+            unsigned int page_received:1;
+            unsigned int next_pageable:1;
+            unsigned int reserved_15:13;
+        } bits;
+
+        unsigned short AsUSHORT;
+    } Mr6;
+
+    /* Auto-negotiation next page transmit register. */
+    union
+    {
+        struct
+        {
+            unsigned int code_field:11;
+            unsigned int toggle:1;
+            unsigned int ack2:1;
+            unsigned int message_page:1;
+            unsigned int reserved_14:1;
+            unsigned int next_page:1;
+        } bits;
+
+        unsigned short AsUSHORT;
+
+        #define mr_np_tx                    Mr7.AsUSHORT
+    } Mr7;
+
+    /* Auto-negotiation link partner ability register. */
+    union
+    {
+        struct
+        {
+            unsigned int code_field:11;
+            unsigned int toggle:1;
+            unsigned int ack2:1;
+            unsigned int message_page:1;
+            unsigned int ack:1;
+            unsigned int next_page:1;
+        } bits;
+
+        unsigned short AsUSHORT;
+        
+        #define mr_lp_np_rx                 Mr8.AsUSHORT
+    } Mr8;
+
+    /* Extended status register. */
+    union
+    {
+        struct
+        {
+            unsigned int reserved_11:12;
+            unsigned int base1000_t_hd:1;
+            unsigned int base1000_t_fd:1;
+            unsigned int base1000_x_hd:1;
+            unsigned int base1000_x_fd:1;
+        } bits;      
+
+        unsigned short AsUSHORT;
+    } Mr15;
+
+    /* Miscellaneous state variables. */
+    union
+    {
+        struct
+        {
+            unsigned int toggle_tx:1;
+            unsigned int toggle_rx:1;
+            unsigned int np_rx:1;
+            unsigned int page_rx:1;
+            unsigned int np_loaded:1;
+        } bits;
+
+        unsigned short AsUSHORT;
+
+        #define mr_toggle_tx                MrMisc.bits.toggle_tx
+        #define mr_toggle_rx                MrMisc.bits.toggle_rx
+        #define mr_np_rx                    MrMisc.bits.np_rx
+        #define mr_page_rx                  MrMisc.bits.page_rx
+        #define mr_np_loaded                MrMisc.bits.np_loaded
+    } MrMisc;
+
+} AN_STATE_INFO, *PAN_STATE_INFO;
+
+
+
+/******************************************************************************/
+/* Return code of Autoneg8023z. */
+/******************************************************************************/
+
+typedef enum
+{
+    AUTONEG_STATUS_OK               = 0,
+    AUTONEG_STATUS_DONE             = 1,
+    AUTONEG_STATUS_TIMER_ENABLED    = 2,
+//    AUTONEG_STATUS_FAILED           = 0xffffffff,
+    AUTONEG_STATUS_FAILED           = 0xfffffff
+} AUTONEG_STATUS, *PAUTONEG_STATUS;
+
+
+
+/******************************************************************************/
+/* Function prototypes. */
+/******************************************************************************/
+
+AUTONEG_STATUS Autoneg8023z(PAN_STATE_INFO pAnInfo);
+void AutonegInit(PAN_STATE_INFO pAnInfo);
+
+
+
+/******************************************************************************/
+/* The following functions are defined in the os-dependent module. */
+/******************************************************************************/
+
+void MM_AnTxConfig(PAN_STATE_INFO pAnInfo);
+void MM_AnTxIdle(PAN_STATE_INFO pAnInfo);
+char MM_AnRxConfig(PAN_STATE_INFO pAnInfo, unsigned short *pRxConfig);
+
+
+
+#endif /* AUTONEG_H */
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/b57diag.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/b57diag.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/b57diag.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/b57diag.c	2004-09-05 15:48:48.000000000 +0200
@@ -0,0 +1,706 @@
+/******************************************************************************/
+/*                                                                            */
+/* Broadcom BCM5700 Linux Network Driver, Copyright (c) 2000 - 2004 Broadcom  */
+/* 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, located in the file LICENSE.                 */
+/*                                                                            */
+/* ethtool -t selftest code.                                                  */
+/*                                                                            */
+/******************************************************************************/
+
+#include "mm.h"
+#ifdef ETHTOOL_TEST
+
+typedef struct reg_entry
+{
+	LM_UINT16   offset;
+	LM_UINT16   flags;
+#define BCM5705_ONLY		1
+#define NOT_FOR_BCM5705		2
+#define NOT_FOR_BCM5788		4
+	LM_UINT32   read_mask;
+	LM_UINT32   write_mask;
+} reg_entry_t;
+
+typedef struct mem_entry
+{
+	LM_UINT32   offset;
+	LM_UINT32   len;
+} mem_entry_t;
+
+/* Returns 1 on success, 0 on failure */
+int
+b57_test_registers(UM_DEVICE_BLOCK *pUmDevice)
+{
+	LM_DEVICE_BLOCK *pDevice = &pUmDevice->lm_dev;
+	int ret;
+	int i, bcm5705;
+	LM_UINT32 offset, read_mask, write_mask, val, save_val, read_val;
+	static reg_entry_t reg_tbl[] = {
+		/* MAC block */
+		{ 0x0400, 0x0002, 0x00000000, 0x00ef6f8c },
+		{ 0x0400, 0x0001, 0x00000000, 0x01ef6b8c },	/* 5705 */
+		{ 0x0404, 0x0002, 0x03800107, 0x00000000 },
+		{ 0x0404, 0x0001, 0x03800100, 0x00000000 },	/* 5705 */
+		{ 0x0408, 0x0002, 0x00000000, 0x07c01400 },
+		{ 0x0408, 0x0001, 0x00000000, 0x07c01000 },	/* 5705 */
+		{ 0x040c, 0x0000, 0x00000000, 0xfff8007f },
+		{ 0x0410, 0x0000, 0x00000000, 0x0000ffff },
+		{ 0x0414, 0x0000, 0x00000000, 0xffffffff },
+		{ 0x0418, 0x0000, 0x00000000, 0x0000ffff },
+		{ 0x041c, 0x0000, 0x00000000, 0xffffffff },
+		{ 0x0420, 0x0000, 0x00000000, 0x0000ffff },
+		{ 0x0424, 0x0000, 0x00000000, 0xffffffff },
+		{ 0x0428, 0x0000, 0x00000000, 0x0000ffff },
+		{ 0x042c, 0x0000, 0x00000000, 0xffffffff },
+		{ 0x0430, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x0430, 0x0001, 0x00000000, 0x0fff03ff },	/* 5705 */
+		{ 0x0434, 0x0002, 0x00000000, 0x0fffffff },
+		{ 0x0434, 0x0001, 0x00000000, 0x000001ff },	/* 5705 */
+		{ 0x043c, 0x0000, 0x00000000, 0x0000ffff },
+		{ 0x0454, 0x0000, 0x00000000, 0x00000010 },
+		{ 0x045c, 0x0000, 0x00000000, 0x00000070 },
+		{ 0x0464, 0x0000, 0x00000000, 0x00003fff },
+		{ 0x0468, 0x0002, 0x00000000, 0x000007fc },
+		{ 0x0468, 0x0001, 0x00000000, 0x000007dc },	/* 5705 */
+		{ 0x0470, 0x0000, 0x00000000, 0xffffffff },
+		{ 0x0474, 0x0000, 0x00000000, 0xffffffff },
+		{ 0x0478, 0x0000, 0x00000000, 0xffffffff },
+		{ 0x047c, 0x0000, 0x00000000, 0xffffffff },
+		{ 0x0480, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x0480, 0x0001, 0x00000000, 0xe7ffffff },	/* 5705 */
+		{ 0x0484, 0x0000, 0x00000000, 0xffffffff },
+		{ 0x0488, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x0488, 0x0001, 0x00000000, 0xe7ffffff },	/* 5705 */
+		{ 0x048c, 0x0000, 0x00000000, 0xffffffff },
+		{ 0x0490, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x0490, 0x0001, 0x00000000, 0xe7ffffff },	/* 5705 */
+		{ 0x0494, 0x0000, 0x00000000, 0xffffffff },
+		{ 0x0498, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x0498, 0x0001, 0x00000000, 0xe7ffffff },	/* 5705 */
+		{ 0x049c, 0x0000, 0x00000000, 0xffffffff },
+		{ 0x04a0, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x04a0, 0x0001, 0x00000000, 0xe7ffffff },	/* 5705 */
+		{ 0x04a4, 0x0000, 0x00000000, 0xffffffff },
+		{ 0x04a8, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x04a8, 0x0001, 0x00000000, 0xe7ffffff },	/* 5705 */
+		{ 0x04ac, 0x0000, 0x00000000, 0xffffffff },
+		{ 0x04b0, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x04b0, 0x0001, 0x00000000, 0xe7ffffff },	/* 5705 */
+		{ 0x04b4, 0x0000, 0x00000000, 0xffffffff },
+		{ 0x04b8, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x04b8, 0x0001, 0x00000000, 0xe7ffffff },	/* 5705 */
+		{ 0x04bc, 0x0000, 0x00000000, 0xffffffff },
+		{ 0x04c0, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x04c4, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x04c8, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x04cc, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x04d0, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x04d4, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x04d8, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x04dc, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x04e0, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x04e4, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x04e8, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x04ec, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x04f0, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x04f4, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x04f8, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x04fc, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x0500, 0x0002, 0x00000000, 0x000000f8 },
+		{ 0x0500, 0x0001, 0x00000000, 0x00000008 },	/* 5705 */
+
+		/* Send Data Initiator Control Registers */
+		{ 0x0c00, 0x0000, 0x00000000, 0x00000006 },
+		{ 0x0c04, 0x0000, 0x00000004, 0x00000000 },
+		{ 0x0c08, 0x0000, 0x00000000, 0x0000001b },
+		{ 0x0c0c, 0x0002, 0x00000000, 0x00ffffff },
+		{ 0x0c0c, 0x0001, 0x00000000, 0x00000001 },
+		{ 0x0c80, 0x0000, 0x000003ff, 0x00000000 },
+		{ 0x0c84, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x0c88, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x0c8c, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x0c90, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x0c94, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x0c98, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x0c9c, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x0ca0, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x0ca4, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x0ca8, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x0cac, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x0cb0, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x0cb4, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x0cb8, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x0cbc, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x0cc0, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x0cc4, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x0cc8, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x0ccc, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x0cd0, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x0cd4, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x0cd8, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x0cdc, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x0ce0, 0x0001, 0x00000000, 0xffffffff },	/* 5705 */
+		{ 0x0ce4, 0x0001, 0x00000000, 0xffffffff },	/* 5705 */
+		{ 0x0ce8, 0x0001, 0x00000000, 0x00ffffff },	/* 5705 */
+		{ 0x0cec, 0x0001, 0x00000000, 0x000efcf7 },	/* 5705 */
+		{ 0x0cf0, 0x0001, 0x00000000, 0x0000ffff },	/* 5705 */
+		{ 0x0cf4, 0x0001, 0x00000000, 0x20000000 },	/* 5705 */
+
+		/* SDC Control Registers */
+		{ 0x1000, 0x0000, 0x00000000, 0x00000002 },
+		{ 0x1008, 0x0001, 0x00000000, 0x40000000 },	/* 5705 */
+
+		/* Send BD Ring Selector Control Registers. */
+		{ 0x1400, 0x0000, 0x00000000, 0x00000006 },
+		{ 0x1404, 0x0000, 0x00000004, 0x00000000 },
+		{ 0x1408, 0x0000, 0x0000ffff, 0x00000000 },
+		{ 0x1440, 0x0000, 0x0000000f, 0x00000000 },
+		{ 0x1444, 0x0002, 0x0000000f, 0x00000000 },
+		{ 0x1448, 0x0002, 0x0000000f, 0x00000000 },
+		{ 0x144c, 0x0002, 0x0000000f, 0x00000000 },
+		{ 0x1450, 0x0002, 0x0000000f, 0x00000000 },
+		{ 0x1454, 0x0002, 0x0000000f, 0x00000000 },
+		{ 0x1458, 0x0002, 0x0000000f, 0x00000000 },
+		{ 0x145c, 0x0002, 0x0000000f, 0x00000000 },
+		{ 0x1460, 0x0002, 0x0000000f, 0x00000000 },
+		{ 0x1464, 0x0002, 0x0000000f, 0x00000000 },
+		{ 0x1468, 0x0002, 0x0000000f, 0x00000000 },
+		{ 0x146c, 0x0002, 0x0000000f, 0x00000000 },
+		{ 0x1470, 0x0002, 0x0000000f, 0x00000000 },
+		{ 0x1474, 0x0002, 0x0000000f, 0x00000000 },
+		{ 0x1478, 0x0002, 0x0000000f, 0x00000000 },
+		{ 0x147c, 0x0002, 0x0000000f, 0x00000000 },
+
+		/* Send BD Inititor Control Registers.*/
+		{ 0x1800, 0x0000, 0x00000000, 0x00000006 },
+		{ 0x1804, 0x0000, 0x00000004, 0x00000000 },
+		{ 0x1808, 0x0000, 0xffffffff, 0x00000000 },
+		{ 0x180c, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x1810, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x1814, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x1818, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x181c, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x1820, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x1824, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x1828, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x182c, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x1830, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x1834, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x1838, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x183c, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x1840, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x1844, 0x0002, 0xffffffff, 0x00000000 },
+
+		/* Send BD Completion Control Registers */
+		{ 0x1c00, 0x0000, 0x00000000, 0x00000002 },
+
+		/* Receive List Placement Control Registers. */
+		{ 0x2000, 0x0000, 0x00000000, 0x0000001e },
+		{ 0x2004, 0x0000, 0x0000001c, 0x00000000 },
+		{ 0x2010, 0x0002, 0x00000000, 0x00007fff },
+		{ 0x2010, 0x0001, 0x00000000, 0x000060ff },	/* 5705 */
+		{ 0x2014, 0x0000, 0x00000000, 0x00000001 },
+		{ 0x2200, 0x0000, 0x000003ff, 0x00000000 },
+		{ 0x2204, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x2208, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x220c, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x2210, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x2214, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x2218, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x221c, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x2220, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x2224, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x2228, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x222c, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x2230, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x2234, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x2238, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x223c, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x2240, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x2244, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x2248, 0x0002, 0x000003ff, 0x00000000 },
+		{ 0x224c, 0x0000, 0x000003ff, 0x00000000 },
+		{ 0x2250, 0x0000, 0x000003ff, 0x00000000 },
+		{ 0x2254, 0x0000, 0x000003ff, 0x00000000 },
+		{ 0x2258, 0x0002, 0x000003ff, 0x00000000 },
+
+		/* Receive Data and Receive BD Initiator Control Registers. */
+		{ 0x2400, 0x0002, 0x00000000, 0x0000001e },
+		{ 0x2400, 0x0001, 0x00000000, 0x0000001a },	/* 5705 */
+		{ 0x2404, 0x0000, 0x0000001c, 0x00000000 },
+		{ 0x2408, 0x0002, 0x00000000, 0x0000ffff },
+		{ 0x2440, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x2444, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x2448, 0x0002, 0x00000000, 0x00000003 },
+		{ 0x244c, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x2450, 0x0000, 0x00000000, 0xffffffff },
+		{ 0x2454, 0x0000, 0x00000000, 0xffffffff },
+		{ 0x2458, 0x0000, 0x00000000, 0xffff0002 },
+		{ 0x245c, 0x0000, 0x00000000, 0xffffffff },
+		{ 0x2470, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x2474, 0x0000, 0xffffffff, 0x00000000 },
+		{ 0x2478, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x2480, 0x0000, 0xffffffff, 0x00000000 },
+		{ 0x2484, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x2488, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x248c, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x2490, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x2494, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x2498, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x249c, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x24a0, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x24a4, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x24a8, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x24ac, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x24b0, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x24b4, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x24b8, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x24bc, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x24c0, 0x0000, 0xffffffff, 0x00000000 },
+	
+		/* Receive Data Completion Control Registers */
+		{ 0x2800, 0x0000, 0x00000000, 0x00000002 },
+
+		/* Receive BD Initiator Control Registers. */
+		{ 0x2c00, 0x0000, 0x00000000, 0x00000006 },
+		{ 0x2c04, 0x0000, 0x00000004, 0x00000000 },
+		{ 0x2c18, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x2c18, 0x0001, 0x00000000, 0x000003ff },	/* 5705 */
+		{ 0x2c1c, 0x0002, 0x00000000, 0xffffffff },
+	
+		/* Receive BD Completion Control Registers. */
+		{ 0x3000, 0x0000, 0x00000000, 0x00000006 },
+		{ 0x3004, 0x0000, 0x00000004, 0x00000000 },
+		{ 0x3008, 0x0002, 0x00000000, 0x000000ff },
+		{ 0x300c, 0x0000, 0x00000000, 0x000001ff },
+
+		/* Host Coalescing Control Registers. */
+		{ 0x3c00, 0x0002, 0x00000000, 0x00000004 },
+		{ 0x3c00, 0x0001, 0x00000000, 0x000000f6 },	/* 5705 */
+		{ 0x3c04, 0x0000, 0x00000004, 0x00000000 },
+		{ 0x3c08, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x3c08, 0x0001, 0x00000000, 0x000003ff },	/* 5705 */
+		{ 0x3c0c, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x3c0c, 0x0001, 0x00000000, 0x000003ff },	/* 5705 */
+		{ 0x3c10, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x3c10, 0x0005, 0x00000000, 0x000000ff },	/* 5705 */
+		{ 0x3c14, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x3c14, 0x0005, 0x00000000, 0x000000ff },	/* 5705 */
+		{ 0x3c18, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x3c1c, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x3c20, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x3c20, 0x0005, 0x00000000, 0x000000ff },	/* 5705 */
+		{ 0x3c24, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x3c24, 0x0005, 0x00000000, 0x000000ff },	/* 5705 */
+		{ 0x3c28, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x3c30, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x3c34, 0x0002, 0x00000000, 0xffffffff },
+		{ 0x3c38, 0x0000, 0x00000000, 0xffffffff },
+		{ 0x3c3c, 0x0000, 0x00000000, 0xffffffff },
+		{ 0x3c40, 0x0000, 0xffffffff, 0x00000000 },
+		{ 0x3c44, 0x0000, 0xffffffff, 0x00000000 },
+		{ 0x3c50, 0x0002, 0x00000000, 0x000000ff },
+		{ 0x3c54, 0x0000, 0x00000000, 0x000000ff },
+		{ 0x3c80, 0x0002, 0x00000000, 0x000007ff },
+		{ 0x3c80, 0x0001, 0x00000000, 0x000001ff },	/* 5705 */
+		{ 0x3c84, 0x0002, 0x00000000, 0x000007ff },
+		{ 0x3c88, 0x0002, 0x00000000, 0x000007ff },
+		{ 0x3c8c, 0x0002, 0x00000000, 0x000007ff },
+		{ 0x3c90, 0x0002, 0x00000000, 0x000007ff },
+		{ 0x3c94, 0x0002, 0x00000000, 0x000007ff },
+		{ 0x3c98, 0x0002, 0x00000000, 0x000007ff },
+		{ 0x3c9c, 0x0002, 0x00000000, 0x000007ff },
+		{ 0x3ca0, 0x0002, 0x00000000, 0x000007ff },
+		{ 0x3ca4, 0x0002, 0x00000000, 0x000007ff },
+		{ 0x3ca8, 0x0002, 0x00000000, 0x000007ff },
+		{ 0x3cac, 0x0002, 0x00000000, 0x000007ff },
+		{ 0x3cb0, 0x0002, 0x00000000, 0x000007ff },
+		{ 0x3cb4, 0x0002, 0x00000000, 0x000007ff },
+		{ 0x3cb8, 0x0002, 0x00000000, 0x000007ff },
+		{ 0x3cbc, 0x0002, 0x00000000, 0x000007ff },
+		{ 0x3cc0, 0x0000, 0x00000000, 0x000001ff },
+		{ 0x3cc4, 0x0002, 0x00000000, 0x000001ff },
+		{ 0x3cc8, 0x0002, 0x00000000, 0x000001ff },
+		{ 0x3ccc, 0x0002, 0x00000000, 0x000001ff },
+		{ 0x3cd0, 0x0002, 0x00000000, 0x000001ff },
+		{ 0x3cd4, 0x0002, 0x00000000, 0x000001ff },
+		{ 0x3cd8, 0x0002, 0x00000000, 0x000001ff },
+		{ 0x3cdc, 0x0002, 0x00000000, 0x000001ff },
+		{ 0x3ce0, 0x0002, 0x00000000, 0x000001ff },
+		{ 0x3ce4, 0x0002, 0x00000000, 0x000001ff },
+		{ 0x3ce8, 0x0002, 0x00000000, 0x000001ff },
+		{ 0x3cec, 0x0002, 0x00000000, 0x000001ff },
+		{ 0x3cf0, 0x0002, 0x00000000, 0x000001ff },
+		{ 0x3cf4, 0x0002, 0x00000000, 0x000001ff },
+		{ 0x3cf8, 0x0002, 0x00000000, 0x000001ff },
+		{ 0x3cfc, 0x0002, 0x00000000, 0x000001ff },
+
+		/* Memory Arbiter Registers */
+		{ 0x4000, 0x0002, 0x00000000, 0x001ffffe },
+		{ 0x4000, 0x0001, 0x00000000, 0x38111e7e },
+		{ 0x4004, 0x0002, 0x001ffffc, 0x00000000 },
+		{ 0x4004, 0x0002, 0x00111dfc, 0x00000000 },
+		{ 0x4008, 0x0000, 0x00000000, 0x001fffff },
+		{ 0x400c, 0x0000, 0x00000000, 0x001fffff },
+
+		/* Buffer Manager Control Registers. */
+		{ 0x4400, 0x0000, 0x00000000, 0x0000001c },
+		{ 0x4404, 0x0000, 0x00000014, 0x00000000 },
+		{ 0x4408, 0x0000, 0x00000000, 0x007fff80 },
+		{ 0x440c, 0x0000, 0x00000000, 0x007fffff },
+		{ 0x4410, 0x0000, 0x00000000, 0x0000003f },
+		{ 0x4414, 0x0000, 0x00000000, 0x000001ff },
+		{ 0x4418, 0x0000, 0x00000000, 0x000001ff },
+		{ 0x4420, 0x0000, 0xffffffff, 0x00000000 },
+		{ 0x4428, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x442c, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x4430, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x4440, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x4448, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x444c, 0x0000, 0xffffffff, 0x00000000 },
+		{ 0x4450, 0x0000, 0xffffffff, 0x00000000 },
+		{ 0x4454, 0x0000, 0xffffffff, 0x00000000 },
+		{ 0x4458, 0x0001, 0x00000000, 0x000001ff },	/* 5705 */
+	
+		{ 0x4800, 0x0002, 0x00000000, 0x000003fe },
+		{ 0x4800, 0x0001, 0x00000000, 0xc00003fe },	/* 5705 */
+		{ 0x4804, 0x0000, 0x000003fc, 0x00000000 },
+		{ 0x4c00, 0x0002, 0x00000000, 0x000003fc },
+		{ 0x4c00, 0x0001, 0x00000000, 0x000007fc },	/* 5705 */
+		{ 0x4c04, 0x0000, 0x000003fc, 0x00000000 },
+
+		/* Mailbox Registers */
+		{ 0x5804, 0x0000, 0x00000000, 0xffffffff },
+		{ 0x586c, 0x0000, 0x00000000, 0x000001ff },
+		{ 0x5874, 0x0002, 0x00000000, 0x000001ff },
+		{ 0x5884, 0x0000, 0x00000000, 0x000007ff },
+		{ 0x5904, 0x0000, 0x00000000, 0x000001ff },
+		{ 0x5984, 0x0002, 0x00000000, 0x000001ff },
+		{ 0x5a04, 0x0000, 0x00000000, 0xffffffff },
+		{ 0x5a0c, 0x0000, 0x00000000, 0xffffffff },
+
+		/* Flow Through Queues. */
+		{ 0x5c14, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x5c24, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x5c34, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x5c44, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x5c54, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x5c64, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x5c74, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x5c84, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x5c94, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x5ca4, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x5cb4, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x5cc4, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x5cd4, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x5ce4, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x5cf4, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x5d04, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0x5d14, 0x0002, 0xffffffff, 0x00000000 },
+		{ 0xffff, 0x0000, 0x00000000, 0x00000000 },
+	};
+
+	if (T3_ASIC_5705_OR_5750(pDevice->ChipRevId)) {
+		bcm5705 = 1;
+	}
+	else {
+		bcm5705 = 0;
+	}
+
+	ret = 1;
+	for (i = 0; reg_tbl[i].offset != 0xffff; i++) {
+		if (bcm5705 && (reg_tbl[i].flags & NOT_FOR_BCM5705))
+			continue;
+		if (!bcm5705 && (reg_tbl[i].flags & BCM5705_ONLY))
+			continue;
+		if ((pDevice->Flags & BCM5788_FLAG) &&
+			(reg_tbl[i].flags & NOT_FOR_BCM5788))
+			continue;
+		offset = (LM_UINT32) reg_tbl[i].offset;
+		read_mask = reg_tbl[i].read_mask;
+		write_mask = reg_tbl[i].write_mask;
+
+		/* Save the original register content */
+		save_val = LM_RegRd(pDevice, offset);
+
+		/* Determine the read-only value. */
+		read_val = save_val & read_mask;
+
+		/* Write zero to the register, then make sure the read-only bits
+		   are not changed and the read/write bits are all zeros. */
+		LM_RegWr(pDevice, offset, 0, FALSE);
+
+		val = LM_RegRd(pDevice, offset);
+
+		/* Test the read-only and read/write bits. */
+		if (((val & read_mask) != read_val) ||
+			(val & write_mask)) {
+
+	                ret = 0;
+			LM_RegWr(pDevice, offset, save_val, FALSE);
+			break;
+		}
+
+
+		/* Write ones to all the bits defined by RdMask and WrMask, then
+		   make sure the read-only bits are not changed and the
+		   read/write bits are all ones. */
+		LM_RegWr(pDevice, offset, read_mask | write_mask, FALSE);
+
+		val = LM_RegRd(pDevice, offset);
+
+		/* Test the read-only bits. */
+		if ((val & read_mask) != read_val) {
+	                ret = 0;
+			LM_RegWr(pDevice, offset, save_val, FALSE);
+			break;
+		}
+
+		/* Test the read/write bits. */
+		if ((val & write_mask) != write_mask) {
+	                ret = 0;
+			LM_RegWr(pDevice, offset, save_val, FALSE);
+			break;
+		}
+
+		LM_RegWr(pDevice, offset, save_val, FALSE);
+	}
+
+	return ret;
+}
+
+
+/* Returns 1 on success, 0 on failure */
+int
+b57_do_memory_test(LM_DEVICE_BLOCK *pDevice, LM_UINT32 start, LM_UINT32 size)
+{
+	const LM_UINT32 test_pattern[] = { 0x00000000, 0xffffffff, 0x55555555,
+		0xaaaaaaaa , 0xaa55aa55, 0x55aa55aa };
+	LM_UINT32 offset;
+	int i;
+
+	for (i = 0; i < sizeof(test_pattern)/sizeof(LM_UINT32); i++) {
+		for (offset = 0; offset < size; offset += 4) {
+
+			LM_MemWrInd(pDevice, start + offset, test_pattern[i]);
+
+			if (LM_MemRdInd(pDevice, start + offset) !=
+				test_pattern[i]) {
+				return 0;
+			}
+		}
+	}
+	return 1;
+}
+
+/* Returns 1 on success, 0 on failure */
+int
+b57_test_memory(UM_DEVICE_BLOCK *pUmDevice)
+{
+	LM_DEVICE_BLOCK *pDevice = &pUmDevice->lm_dev;
+	int ret = 0;
+	int i;
+	mem_entry_t *mem_tbl;
+
+	static mem_entry_t mem_tbl_570x[] = {
+		{ 0x00000000, 0x01000},
+		{ 0x00002000, 0x1c000},
+		{ 0xffffffff, 0x00000}
+	};
+	static mem_entry_t mem_tbl_5705[] = {
+		{ 0x00000100, 0x0000c},
+		{ 0x00000200, 0x00008},
+		{ 0x00000b50, 0x00400},
+		{ 0x00004000, 0x00800},
+		{ 0x00006000, 0x01000},
+		{ 0x00008000, 0x02000},
+		{ 0x00010000, 0x0e000},
+		{ 0xffffffff, 0x00000}
+	};
+
+	if (T3_ASIC_5705_OR_5750(pDevice->ChipRevId)) {
+		mem_tbl = mem_tbl_5705;
+	}
+	else {
+		mem_tbl = mem_tbl_570x;
+	}
+	for (i = 0; mem_tbl[i].offset != 0xffffffff; i++) {
+		if ((ret = b57_do_memory_test(pDevice, mem_tbl[i].offset,
+			mem_tbl[i].len)) == 0) {
+			return ret;
+		}
+	}
+	
+	return ret;
+}
+
+#define EEPROM_SIZE 0x100
+
+/* Returns 1 on success, 0 on failure */
+int
+b57_test_nvram(UM_DEVICE_BLOCK *pUmDevice)
+{
+	LM_DEVICE_BLOCK *pDevice = &pUmDevice->lm_dev;
+	LM_UINT32 buf[EEPROM_SIZE/4];
+	LM_UINT8 *pdata = (LM_UINT8 *) buf;
+	int i;
+	LM_UINT32 magic, csum;
+
+	for (i = 0; i < EEPROM_SIZE; i += 4) {
+		if (LM_NvramRead(pDevice, i, (LM_UINT32 *) (pdata + i)) !=
+			LM_STATUS_SUCCESS) {
+			break;
+		}
+	}
+	if (i < EEPROM_SIZE) {
+		return 0;
+	}
+
+        magic = MM_SWAP_BE32(buf[0]);
+	if (magic != 0x669955aa) {
+		return 0;
+	}
+
+	csum = ComputeCrc32(pdata, 16);
+	if(csum != MM_SWAP_LE32(buf[0x10/4])) {
+		return 0;
+	}
+
+	csum = ComputeCrc32(&pdata[0x74], 136);
+	if (csum != MM_SWAP_LE32(buf[0xfc/4])) {
+		return 0;
+	}
+
+	return 1;
+}
+
+/* Returns 1 on success, 0 on failure */
+int
+b57_test_link(UM_DEVICE_BLOCK *pUmDevice)
+{
+	LM_DEVICE_BLOCK *pDevice = &pUmDevice->lm_dev;
+	LM_UINT32 phy_reg;
+
+	if (pDevice->TbiFlags & ENABLE_TBI_FLAG) {
+		if (REG_RD(pDevice, MacCtrl.Status) &
+			(MAC_STATUS_PCS_SYNCED | MAC_STATUS_SIGNAL_DETECTED)) {
+			return 1;
+		}
+		return 0;
+	}
+	LM_ReadPhy(pDevice, PHY_STATUS_REG, &phy_reg);
+	LM_ReadPhy(pDevice, PHY_STATUS_REG, &phy_reg);
+	if (phy_reg & PHY_STATUS_LINK_PASS)
+		return 1;
+	return 0;
+}
+
+/* Returns 1 on success, 0 on failure */
+int
+b57_test_loopback(UM_DEVICE_BLOCK *pUmDevice)
+{
+	LM_DEVICE_BLOCK *pDevice = &pUmDevice->lm_dev;
+	struct sk_buff *skb, *rx_skb;
+	unsigned char *packet;
+	dma_addr_t map;
+	LM_UINT32 send_idx, rx_start_idx, rx_idx;
+	int num_pkts, pkt_size, i, ret;
+	LM_PACKET *pPacket;
+	T3_SND_BD *pSendBd;
+	T3_RCV_BD *pRcvBd;
+
+	ret = 0;
+	if (!pUmDevice->opened)
+		return ret;
+	LM_ResetAdapter(pDevice);
+	LM_EnableMacLoopBack(pDevice);
+	pkt_size = 1514;
+	skb = dev_alloc_skb(pkt_size);
+	packet = skb_put(skb, pkt_size);
+	memcpy(packet, pDevice->NodeAddress, 6);
+	memset(packet + 6, 0x0, 8);
+	for (i = 14; i < pkt_size; i++)
+		packet[i] = (unsigned char) (i & 0xff);
+	map = pci_map_single(pUmDevice->pdev, skb->data, pkt_size,
+		PCI_DMA_TODEVICE);
+
+	REG_WR(pDevice, HostCoalesce.Mode,
+		pDevice->CoalesceMode | HOST_COALESCE_ENABLE |
+			HOST_COALESCE_NOW);
+	MM_Wait(10);
+	rx_start_idx = pDevice->pStatusBlkVirt->Idx[0].RcvProdIdx;
+
+	send_idx = 0;
+	num_pkts = 0;
+	pSendBd = &pDevice->pSendBdVirt[send_idx];
+	if (pDevice->Flags & NIC_SEND_BD_FLAG) {
+		T3_64BIT_HOST_ADDR HostAddr;
+
+		MM_SetT3Addr(&HostAddr, map);
+		MM_MEMWRITEL(&(pSendBd->HostAddr.High), HostAddr.High);
+		MM_MEMWRITEL(&(pSendBd->HostAddr.Low), HostAddr.Low);
+                MM_MEMWRITEL(&(pSendBd->u1.Len_Flags), 
+                	(pkt_size << 16) | SND_BD_FLAG_END);
+		send_idx++;
+		num_pkts++;
+	        MB_REG_WR(pDevice, Mailbox.SendNicProdIdx[0].Low, send_idx);
+		if (T3_CHIP_REV(pDevice->ChipRevId) == T3_CHIP_REV_5700_BX) {
+	        	MB_REG_WR(pDevice, Mailbox.SendNicProdIdx[0].Low,
+				send_idx);
+		}
+	        MB_REG_RD(pDevice, Mailbox.SendNicProdIdx[0].Low);
+	}
+	else {
+		MM_SetT3Addr(&pSendBd->HostAddr, map);
+                pSendBd->u1.Len_Flags = (pkt_size << 16) | SND_BD_FLAG_END;
+        	MM_WMB();
+		send_idx++;
+		num_pkts++;
+	        MB_REG_WR(pDevice, Mailbox.SendHostProdIdx[0].Low, send_idx);
+		if (T3_CHIP_REV(pDevice->ChipRevId) == T3_CHIP_REV_5700_BX) {
+	        	MB_REG_WR(pDevice, Mailbox.SendHostProdIdx[0].Low,
+				send_idx);
+		}
+	        MB_REG_RD(pDevice, Mailbox.SendHostProdIdx[0].Low);
+	}
+	MM_Wait(100);
+	REG_WR(pDevice, HostCoalesce.Mode,
+		pDevice->CoalesceMode | HOST_COALESCE_ENABLE |
+			HOST_COALESCE_NOW);
+	MM_Wait(10);
+	dev_kfree_skb_irq(skb);
+	if (pDevice->pStatusBlkVirt->Idx[0].SendConIdx != send_idx) {
+		goto loopback_test_done;
+	}
+	rx_idx = pDevice->pStatusBlkVirt->Idx[0].RcvProdIdx;
+	if (rx_idx != rx_start_idx + num_pkts) {
+		goto loopback_test_done;
+	}
+	pRcvBd = &pDevice->pRcvRetBdVirt[rx_start_idx];
+	pPacket = (PLM_PACKET) (MM_UINT_PTR(pDevice->pPacketDescBase) +
+		MM_UINT_PTR(pRcvBd->Opaque));
+
+	if (pRcvBd->ErrorFlag &&
+		pRcvBd->ErrorFlag != RCV_BD_ERR_ODD_NIBBLED_RCVD_MII) {
+		goto loopback_test_done;
+	}
+	if ((pRcvBd->Len - 4) != pkt_size) {
+		goto loopback_test_done;
+	}
+	rx_skb = ((UM_PACKET *) pPacket)->skbuff;
+	for (i = 14; i < pkt_size; i++) {
+		if (*(skb->data + i) != (unsigned char) (i & 0xff))
+			goto loopback_test_done;
+	}
+	ret = 1;
+	
+loopback_test_done:
+	LM_DisableMacLoopBack(pDevice);
+	return ret;
+}
+#endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/b57proc.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/b57proc.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/b57proc.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/b57proc.c	2004-09-05 15:48:48.000000000 +0200
@@ -0,0 +1,473 @@
+/******************************************************************************/
+/*                                                                            */
+/* Broadcom BCM5700 Linux Network Driver, Copyright (c) 2000 - 2003 Broadcom  */
+/* 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, located in the file LICENSE.                 */
+/*                                                                            */
+/* /proc file system handling code.                                           */
+/*                                                                            */
+/******************************************************************************/
+
+#include "mm.h"
+#ifdef BCM_PROC_FS
+
+#define NICINFO_PROC_DIR "nicinfo"
+
+static struct proc_dir_entry *bcm5700_procfs_dir;
+
+extern char bcm5700_driver[], bcm5700_version[];
+
+extern uint64_t bcm5700_crc_count(PUM_DEVICE_BLOCK pUmDevice);
+extern uint64_t bcm5700_rx_err_count(PUM_DEVICE_BLOCK pUmDevice);
+
+static char *na_str = "n/a";
+static char *pause_str = "pause ";
+static char *asym_pause_str = "asym_pause ";
+static char *on_str = "on";
+static char *off_str = "off";
+static char *up_str = "up";
+static char *down_str = "down";
+
+static struct proc_dir_entry *
+proc_getdir(char *name, struct proc_dir_entry *proc_dir)
+{
+	struct proc_dir_entry *pde = proc_dir;
+
+	lock_kernel();
+	for (pde=pde->subdir; pde; pde = pde->next) {
+		if (pde->namelen && (strcmp(name, pde->name) == 0)) {
+			/* directory exists */
+			break;
+		}
+	}
+	if (pde == (struct proc_dir_entry *) 0)
+	{
+		/* create the directory */
+#if (LINUX_VERSION_CODE > 0x20300)
+		pde = proc_mkdir(name, proc_dir);
+#else
+		pde = create_proc_entry(name, S_IFDIR, proc_dir);
+#endif
+		if (pde == (struct proc_dir_entry *) 0) {
+			unlock_kernel();
+			return (pde);
+		}
+	}
+	unlock_kernel();
+	return (pde);
+}
+
+int
+bcm5700_proc_create(void)
+{
+	bcm5700_procfs_dir = proc_getdir(NICINFO_PROC_DIR, proc_net);
+
+	if (bcm5700_procfs_dir == (struct proc_dir_entry *) 0) {
+		printk(KERN_DEBUG "Could not create procfs nicinfo directory %s\n", NICINFO_PROC_DIR);
+		return -1;
+	}
+	return 0;
+}
+
+void
+b57_get_speed_adv(PUM_DEVICE_BLOCK pUmDevice, char *str)
+{
+	PLM_DEVICE_BLOCK pDevice = &pUmDevice->lm_dev;
+
+	if (pDevice->DisableAutoNeg == TRUE) {
+		strcpy(str, na_str);
+		return;
+	}
+	if (pDevice->TbiFlags & ENABLE_TBI_FLAG) {
+		strcpy(str, "1000full");
+		return;
+	}
+	str[0] = 0;
+	if (pDevice->advertising & PHY_AN_AD_10BASET_HALF) {
+		strcat(str, "10half ");
+	}
+	if (pDevice->advertising & PHY_AN_AD_10BASET_FULL) {
+		strcat(str, "10full ");
+	}
+	if (pDevice->advertising & PHY_AN_AD_100BASETX_HALF) {
+		strcat(str, "100half ");
+	}
+	if (pDevice->advertising & PHY_AN_AD_100BASETX_FULL) {
+		strcat(str, "100full ");
+	}
+	if (pDevice->advertising1000 & BCM540X_AN_AD_1000BASET_HALF) {
+		strcat(str, "1000half ");
+	}
+	if (pDevice->advertising1000 & BCM540X_AN_AD_1000BASET_FULL) {
+		strcat(str, "1000full ");
+	}
+}
+
+void
+b57_get_fc_adv(PUM_DEVICE_BLOCK pUmDevice, char *str)
+{
+	PLM_DEVICE_BLOCK pDevice = &pUmDevice->lm_dev;
+
+	if (pDevice->DisableAutoNeg == TRUE) {
+		strcpy(str, na_str);
+		return;
+	}
+	str[0] = 0;
+	if (pDevice->TbiFlags & ENABLE_TBI_FLAG) {
+		if(pDevice->DisableAutoNeg == FALSE ||
+			pDevice->RequestedLineSpeed == LM_LINE_SPEED_AUTO) {
+			if (pDevice->FlowControlCap &
+				LM_FLOW_CONTROL_RECEIVE_PAUSE) {
+
+				strcpy(str, pause_str);
+				if (!(pDevice->FlowControlCap &
+					LM_FLOW_CONTROL_TRANSMIT_PAUSE)) {
+
+					strcpy(str, asym_pause_str);
+				}
+			}
+			else if (pDevice->FlowControlCap &
+				LM_FLOW_CONTROL_TRANSMIT_PAUSE) {
+
+				strcpy(str, asym_pause_str);
+			}
+		}
+		return;
+	}
+	if (pDevice->advertising & PHY_AN_AD_PAUSE_CAPABLE) {
+		strcat(str, pause_str);
+	}
+	if (pDevice->advertising & PHY_AN_AD_ASYM_PAUSE) {
+		strcat(str, asym_pause_str);
+	}
+}
+
+int
+bcm5700_read_pfs(char *page, char **start, off_t off, int count,
+	int *eof, void *data)
+{
+	struct net_device *dev = (struct net_device *) data;
+	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK) dev->priv;
+	PLM_DEVICE_BLOCK pDevice = &pUmDevice->lm_dev;
+	PT3_STATS_BLOCK pStats = (PT3_STATS_BLOCK) pDevice->pStatsBlkVirt;
+	int len = 0;
+	unsigned long rx_mac_errors, rx_crc_errors, rx_align_errors;
+	unsigned long rx_runt_errors, rx_frag_errors, rx_long_errors;
+	unsigned long rx_overrun_errors, rx_jabber_errors;
+	char str[64];
+
+	if (pUmDevice->opened == 0)
+		pStats = 0;
+
+	len += sprintf(page+len, "Description\t\t\t%s\n", pUmDevice->name);
+	len += sprintf(page+len, "Driver_Name\t\t\t%s\n", bcm5700_driver);
+	len += sprintf(page+len, "Driver_Version\t\t\t%s\n", bcm5700_version);
+	len += sprintf(page+len, "Bootcode_Version\t\t%s\n", pDevice->BootCodeVer);
+	len += sprintf(page+len, "PCI_Vendor\t\t\t0x%04x\n", pDevice->PciVendorId);
+	len += sprintf(page+len, "PCI_Device_ID\t\t\t0x%04x\n",
+		pDevice->PciDeviceId);
+	len += sprintf(page+len, "PCI_Subsystem_Vendor\t\t0x%04x\n",
+		pDevice->SubsystemVendorId);
+	len += sprintf(page+len, "PCI_Subsystem_ID\t\t0x%04x\n",
+		pDevice->SubsystemId);
+	len += sprintf(page+len, "PCI_Revision_ID\t\t\t0x%02x\n",
+		pDevice->PciRevId);
+	len += sprintf(page+len, "PCI_Slot\t\t\t%d\n",
+		PCI_SLOT(pUmDevice->pdev->devfn));
+	if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5704) {
+		len += sprintf(page+len, "PCI_Function\t\t\t%d\n",
+			pDevice->FunctNum);
+	}
+	len += sprintf(page+len, "PCI_Bus\t\t\t\t%d\n",
+		pUmDevice->pdev->bus->number);
+
+	len += sprintf(page+len, "PCI_Bus_Speed\t\t\t%s\n",
+		pDevice->BusSpeedStr);
+
+	len += sprintf(page+len, "Memory\t\t\t\t0x%lx\n", pUmDevice->dev->base_addr);
+	len += sprintf(page+len, "IRQ\t\t\t\t%d\n", dev->irq);
+	len += sprintf(page+len, "System_Device_Name\t\t%s\n", dev->name);
+	len += sprintf(page+len, "Current_HWaddr\t\t\t%02x:%02x:%02x:%02x:%02x:%02x\n",
+		dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
+		dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
+	len += sprintf(page+len,
+		"Permanent_HWaddr\t\t%02x:%02x:%02x:%02x:%02x:%02x\n",
+		pDevice->NodeAddress[0], pDevice->NodeAddress[1],
+		pDevice->NodeAddress[2], pDevice->NodeAddress[3],
+		pDevice->NodeAddress[4], pDevice->NodeAddress[5]);
+	len += sprintf(page+len, "Part_Number\t\t\t%s\n\n", pDevice->PartNo);
+
+	len += sprintf(page+len, "Link\t\t\t\t%s\n", 
+		(pUmDevice->opened == 0) ? "unknown" :
+    		((pDevice->LinkStatus == LM_STATUS_LINK_ACTIVE) ? up_str :
+		down_str));
+	len += sprintf(page+len, "Auto_Negotiate\t\t\t%s\n", 
+    		(pDevice->DisableAutoNeg == TRUE) ? off_str : on_str);
+	b57_get_speed_adv(pUmDevice, str);
+	len += sprintf(page+len, "Speed_Advertisement\t\t%s\n", str);
+	b57_get_fc_adv(pUmDevice, str);
+	len += sprintf(page+len, "Flow_Control_Advertisement\t%s\n", str);
+	len += sprintf(page+len, "Speed\t\t\t\t%s\n", 
+    		((pDevice->LinkStatus == LM_STATUS_LINK_DOWN) ||
+		(pUmDevice->opened == 0)) ? na_str :
+    		((pDevice->LineSpeed == LM_LINE_SPEED_1000MBPS) ? "1000" :
+    		((pDevice->LineSpeed == LM_LINE_SPEED_100MBPS) ? "100" :
+    		(pDevice->LineSpeed == LM_LINE_SPEED_10MBPS) ? "10" : na_str)));
+	len += sprintf(page+len, "Duplex\t\t\t\t%s\n", 
+    		((pDevice->LinkStatus == LM_STATUS_LINK_DOWN) ||
+		(pUmDevice->opened == 0)) ? na_str :
+		((pDevice->DuplexMode == LM_DUPLEX_MODE_FULL) ? "full" :
+			"half"));
+	len += sprintf(page+len, "Flow_Control\t\t\t%s\n", 
+    		((pDevice->LinkStatus == LM_STATUS_LINK_DOWN) ||
+		(pUmDevice->opened == 0)) ? na_str :
+		((pDevice->FlowControl == LM_FLOW_CONTROL_NONE) ? off_str :
+		(((pDevice->FlowControl & LM_FLOW_CONTROL_RX_TX_PAUSE) ==
+			LM_FLOW_CONTROL_RX_TX_PAUSE) ? "receive/transmit" :
+		(pDevice->FlowControl & LM_FLOW_CONTROL_RECEIVE_PAUSE) ?
+			"receive" : "transmit")));
+	len += sprintf(page+len, "State\t\t\t\t%s\n", 
+		(pUmDevice->suspended ? "suspended" :
+    		((dev->flags & IFF_UP) ? up_str : down_str)));
+	len += sprintf(page+len, "MTU_Size\t\t\t%d\n\n", dev->mtu);
+	len += sprintf(page+len, "Rx_Packets\t\t\t%lu\n", 
+			((pStats == 0) ? 0 :
+			MM_GETSTATS(pStats->ifHCInUcastPkts) +
+			MM_GETSTATS(pStats->ifHCInMulticastPkts) +
+			MM_GETSTATS(pStats->ifHCInBroadcastPkts)));
+#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
+	if (dev->mtu > 1500) {
+		len += sprintf(page+len, "Rx_Jumbo_Packets\t\t%lu\n", 
+			((pStats == 0) ? 0 :
+			MM_GETSTATS(
+				pStats->etherStatsPkts1523Octetsto2047Octets) +
+			MM_GETSTATS(
+				pStats->etherStatsPkts2048Octetsto4095Octets) +
+			MM_GETSTATS(
+				pStats->etherStatsPkts4096Octetsto8191Octets) +
+			MM_GETSTATS(
+				pStats->etherStatsPkts8192Octetsto9022Octets)));
+	}
+#endif
+	len += sprintf(page+len, "Tx_Packets\t\t\t%lu\n",
+		((pStats == 0) ? 0 :
+		MM_GETSTATS(pStats->ifHCOutUcastPkts) +
+		MM_GETSTATS(pStats->ifHCOutMulticastPkts) +
+		MM_GETSTATS(pStats->ifHCOutBroadcastPkts)));
+#ifdef BCM_TSO
+	len += sprintf(page+len, "TSO_Large_Packets\t\t%lu\n",
+		pUmDevice->tso_pkt_count);
+#endif
+	len += sprintf(page+len, "Rx_Bytes\t\t\t%lu\n",
+		((pStats == 0) ? 0 :
+		MM_GETSTATS(pStats->ifHCInOctets)));
+	len += sprintf(page+len, "Tx_Bytes\t\t\t%lu\n",
+		((pStats == 0) ? 0 :
+		MM_GETSTATS(pStats->ifHCOutOctets)));
+	if (pStats == 0) {
+		rx_crc_errors = 0;
+		rx_align_errors = 0;
+		rx_runt_errors = 0;
+		rx_frag_errors = 0;
+		rx_long_errors = 0;
+		rx_overrun_errors = 0;
+		rx_jabber_errors = 0;
+	}
+	else {
+		rx_crc_errors = (unsigned long) bcm5700_crc_count(pUmDevice);
+		rx_align_errors = MM_GETSTATS(pStats->dot3StatsAlignmentErrors);
+		rx_runt_errors = MM_GETSTATS(pStats->etherStatsUndersizePkts);
+		rx_frag_errors = MM_GETSTATS(pStats->etherStatsFragments);
+		rx_long_errors = MM_GETSTATS(pStats->dot3StatsFramesTooLong);
+		rx_overrun_errors = MM_GETSTATS(pStats->nicNoMoreRxBDs);
+		rx_jabber_errors = MM_GETSTATS(pStats->etherStatsJabbers);
+	}
+	rx_mac_errors = (unsigned long) bcm5700_rx_err_count(pUmDevice);
+	len += sprintf(page+len, "Rx_Errors\t\t\t%lu\n",
+		((pStats == 0) ? 0 :
+		rx_mac_errors + rx_overrun_errors + pUmDevice->rx_misc_errors));
+	len += sprintf(page+len, "Tx_Errors\t\t\t%lu\n",
+		((pStats == 0) ? 0 :
+		MM_GETSTATS(pStats->ifOutErrors)));
+	len += sprintf(page+len, "\nTx_Carrier_Errors\t\t%lu\n",
+		((pStats == 0) ? 0 :
+		MM_GETSTATS(pStats->dot3StatsCarrierSenseErrors)));
+	len += sprintf(page+len, "Tx_Abort_Excess_Coll\t\t%lu\n",
+		((pStats == 0) ? 0 :
+    		MM_GETSTATS(pStats->dot3StatsExcessiveCollisions)));
+	len += sprintf(page+len, "Tx_Abort_Late_Coll\t\t%lu\n",
+		((pStats == 0) ? 0 :
+    		MM_GETSTATS(pStats->dot3StatsLateCollisions)));
+	len += sprintf(page+len, "Tx_Deferred_Ok\t\t\t%lu\n",
+		((pStats == 0) ? 0 :
+    		MM_GETSTATS(pStats->dot3StatsDeferredTransmissions)));
+	len += sprintf(page+len, "Tx_Single_Coll_Ok\t\t%lu\n",
+		((pStats == 0) ? 0 :
+    		MM_GETSTATS(pStats->dot3StatsSingleCollisionFrames)));
+	len += sprintf(page+len, "Tx_Multi_Coll_Ok\t\t%lu\n",
+		((pStats == 0) ? 0 :
+    		MM_GETSTATS(pStats->dot3StatsMultipleCollisionFrames)));
+	len += sprintf(page+len, "Tx_Total_Coll_Ok\t\t%lu\n",
+		((pStats == 0) ? 0 :
+		MM_GETSTATS(pStats->etherStatsCollisions)));
+	len += sprintf(page+len, "Tx_XON_Pause_Frames\t\t%lu\n",
+		((pStats == 0) ? 0 :
+		MM_GETSTATS(pStats->outXonSent)));
+	len += sprintf(page+len, "Tx_XOFF_Pause_Frames\t\t%lu\n",
+		((pStats == 0) ? 0 :
+		MM_GETSTATS(pStats->outXoffSent)));
+	len += sprintf(page+len, "\nRx_CRC_Errors\t\t\t%lu\n", rx_crc_errors);
+	len += sprintf(page+len, "Rx_Short_Fragment_Errors\t%lu\n",
+		rx_frag_errors);
+	len += sprintf(page+len, "Rx_Short_Length_Errors\t\t%lu\n",
+		rx_runt_errors);
+	len += sprintf(page+len, "Rx_Long_Length_Errors\t\t%lu\n",
+		rx_long_errors);
+	len += sprintf(page+len, "Rx_Align_Errors\t\t\t%lu\n",
+		rx_align_errors);
+	len += sprintf(page+len, "Rx_Overrun_Errors\t\t%lu\n",
+		rx_overrun_errors);
+	len += sprintf(page+len, "Rx_XON_Pause_Frames\t\t%lu\n",
+		((pStats == 0) ? 0 :
+		MM_GETSTATS(pStats->xonPauseFramesReceived)));
+	len += sprintf(page+len, "Rx_XOFF_Pause_Frames\t\t%lu\n",
+		((pStats == 0) ? 0 :
+		MM_GETSTATS(pStats->xoffPauseFramesReceived)));
+	len += sprintf(page+len, "\nTx_MAC_Errors\t\t\t%lu\n",
+		((pStats == 0) ? 0 :
+		MM_GETSTATS(pStats->dot3StatsInternalMacTransmitErrors)));
+	len += sprintf(page+len, "Rx_MAC_Errors\t\t\t%lu\n\n",
+		rx_mac_errors);
+
+	len += sprintf(page+len, "Tx_Checksum\t\t\t%s\n",
+		((pDevice->TaskToOffload & LM_TASK_OFFLOAD_TX_TCP_CHECKSUM) ?
+		on_str : off_str));
+	len += sprintf(page+len, "Rx_Checksum\t\t\t%s\n",
+		((pDevice->TaskToOffload & LM_TASK_OFFLOAD_RX_TCP_CHECKSUM) ?
+		on_str : off_str));
+	len += sprintf(page+len, "Scatter_Gather\t\t\t%s\n",
+#if (LINUX_VERSION_CODE >= 0x20400)
+		((dev->features & NETIF_F_SG) ? on_str : off_str));
+#else
+		off_str);
+#endif
+#ifdef BCM_TSO
+	len += sprintf(page+len, "TSO\t\t\t\t%s\n",
+		((dev->features & NETIF_F_TSO) ? on_str : off_str));
+#endif
+	len += sprintf(page+len, "VLAN\t\t\t\t%s\n\n",
+		((pDevice->RxMode & RX_MODE_KEEP_VLAN_TAG) ? off_str : on_str));
+
+#ifdef BCM_NIC_SEND_BD
+	len += sprintf(page+len, "NIC_Tx_BDs\t\t\t%s\n",
+		(pDevice->Flags & NIC_SEND_BD_FLAG) ? on_str : off_str);
+#endif
+	len += sprintf(page+len, "Tx_Desc_Count\t\t\t%u\n",
+		pDevice->TxPacketDescCnt);
+	len += sprintf(page+len, "Rx_Desc_Count\t\t\t%u\n",
+		pDevice->RxStdDescCnt);
+#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
+	len += sprintf(page+len, "Rx_Jumbo_Desc_Count\t\t%u\n",
+		pDevice->RxJumboDescCnt);
+#endif
+#ifdef BCM_INT_COAL
+	len += sprintf(page+len, "Adaptive_Coalescing\t\t%s\n",
+		(pUmDevice->adaptive_coalesce ? on_str : off_str));
+	len += sprintf(page+len, "Rx_Coalescing_Ticks\t\t%u\n",
+		pUmDevice->rx_curr_coalesce_ticks);
+	len += sprintf(page+len, "Rx_Coalesced_Frames\t\t%u\n",
+		pUmDevice->rx_curr_coalesce_frames);
+	len += sprintf(page+len, "Tx_Coalescing_Ticks\t\t%u\n",
+		pDevice->TxCoalescingTicks);
+	len += sprintf(page+len, "Tx_Coalesced_Frames\t\t%u\n",
+		pUmDevice->tx_curr_coalesce_frames);
+	len += sprintf(page+len, "Stats_Coalescing_Ticks\t\t%u\n",
+		pDevice->StatsCoalescingTicks);
+#endif
+#ifdef BCM_WOL
+	len += sprintf(page+len, "Wake_On_LAN\t\t\t%s\n",
+        	((pDevice->WakeUpMode & LM_WAKE_UP_MODE_MAGIC_PACKET) ?
+		on_str : off_str));
+#endif
+#if TIGON3_DEBUG
+	len += sprintf(page+len, "\nDmaReadWriteCtrl\t\t%x\n",
+		pDevice->DmaReadWriteCtrl);
+	len += sprintf(page+len, "\nTx_Zero_Copy_Packets\t\t%u\n",
+		pUmDevice->tx_zc_count);
+	len += sprintf(page+len, "Tx_Chksum_Packets\t\t%u\n",
+		pUmDevice->tx_chksum_count);
+	len += sprintf(page+len, "Tx_Highmem_Fragments\t\t%u\n",
+		pUmDevice->tx_himem_count);
+	len += sprintf(page+len, "Rx_Good_Chksum_Packets\t\t%u\n",
+		pUmDevice->rx_good_chksum_count);
+	len += sprintf(page+len, "Rx_Bad_Chksum_Packets\t\t%u\n",
+		pUmDevice->rx_bad_chksum_count);
+	if (!(pDevice->TbiFlags & ENABLE_TBI_FLAG)) {
+		LM_UINT32 value32;
+		unsigned long flags;
+
+		BCM5700_PHY_LOCK(pUmDevice, flags);
+        	LM_ReadPhy(pDevice, 0, &value32);
+		len += sprintf(page+len, "\nPhy_Register_0x00\t\t0x%x\n", value32);
+        	LM_ReadPhy(pDevice, 1, &value32);
+		len += sprintf(page+len, "Phy_Register_0x01\t\t0x%x\n", value32);
+        	LM_ReadPhy(pDevice, 2, &value32);
+		len += sprintf(page+len, "Phy_Register_0x02\t\t0x%x\n", value32);
+        	LM_ReadPhy(pDevice, 3, &value32);
+		len += sprintf(page+len, "Phy_Register_0x03\t\t0x%x\n", value32);
+        	LM_ReadPhy(pDevice, 4, &value32);
+		len += sprintf(page+len, "Phy_Register_0x04\t\t0x%x\n", value32);
+        	LM_ReadPhy(pDevice, 5, &value32);
+		len += sprintf(page+len, "Phy_Register_0x05\t\t0x%x\n", value32);
+        	LM_ReadPhy(pDevice, 9, &value32);
+		len += sprintf(page+len, "Phy_Register_0x09\t\t0x%x\n", value32);
+        	LM_ReadPhy(pDevice, 0xa, &value32);
+		len += sprintf(page+len, "Phy_Register_0x0A\t\t0x%x\n", value32);
+        	LM_ReadPhy(pDevice, 0xf, &value32);
+		len += sprintf(page+len, "Phy_Register_0x0F\t\t0x%x\n", value32);
+        	LM_ReadPhy(pDevice, 0x10, &value32);
+		len += sprintf(page+len, "Phy_Register_0x10\t\t0x%x\n", value32);
+        	LM_ReadPhy(pDevice, 0x19, &value32);
+		len += sprintf(page+len, "Phy_Register_0x19\t\t0x%x\n", value32);
+        	LM_WritePhy(pDevice, 0x18, 0x0007);
+        	LM_ReadPhy(pDevice, 0x18, &value32);
+		len += sprintf(page+len, "Phy_Register_0x18_00\t\t0x%x\n", value32);
+		BCM5700_PHY_UNLOCK(pUmDevice, flags);
+	}
+#endif
+
+	*eof = 1;
+	return len;
+}
+
+int
+bcm5700_proc_create_dev(struct net_device *dev)
+{
+	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK) dev->priv;
+
+	if (!bcm5700_procfs_dir)
+		return -1;
+
+	sprintf(pUmDevice->pfs_name, "%s.info", dev->name);
+	pUmDevice->pfs_entry = create_proc_entry(pUmDevice->pfs_name,
+		S_IFREG, bcm5700_procfs_dir);
+	if (pUmDevice->pfs_entry == 0)
+		return -1;
+	pUmDevice->pfs_entry->read_proc = bcm5700_read_pfs;
+	pUmDevice->pfs_entry->data = dev;
+	return 0;
+}
+int
+bcm5700_proc_remove_dev(struct net_device *dev)
+{
+	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK) dev->priv;
+
+	remove_proc_entry(pUmDevice->pfs_name, bcm5700_procfs_dir);
+	return 0;
+}
+
+#endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/b57um.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/b57um.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/b57um.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/b57um.c	2004-09-05 15:48:48.000000000 +0200
@@ -0,0 +1,4981 @@
+/******************************************************************************/
+/*                                                                            */
+/* Broadcom BCM5700 Linux Network Driver, Copyright (c) 2000 - 2004 Broadcom  */
+/* 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, located in the file LICENSE.                 */
+/*                                                                            */
+/******************************************************************************/
+
+
+char bcm5700_driver[] = "bcm5700";
+char bcm5700_version[] = "7.3.5";
+char bcm5700_date[] = "(06/23/04)";
+
+#define B57UM
+#include "mm.h"
+
+/* A few user-configurable values. */
+
+#define MAX_UNITS 16
+/* Used to pass the full-duplex flag, etc. */
+static int line_speed[MAX_UNITS] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+static int auto_speed[MAX_UNITS] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
+static int full_duplex[MAX_UNITS] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
+static int rx_flow_control[MAX_UNITS] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
+static int tx_flow_control[MAX_UNITS] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
+static int auto_flow_control[MAX_UNITS] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
+#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
+static int mtu[MAX_UNITS] = {1500,1500,1500,1500,1500,1500,1500,1500,1500,1500,1500,1500,1500,1500,1500,1500};	/* Jumbo MTU for interfaces. */
+#endif
+static int tx_checksum[MAX_UNITS] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
+static int rx_checksum[MAX_UNITS] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
+static int scatter_gather[MAX_UNITS] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
+
+#define TX_DESC_CNT DEFAULT_TX_PACKET_DESC_COUNT
+static unsigned int tx_pkt_desc_cnt[MAX_UNITS] =
+	{TX_DESC_CNT,TX_DESC_CNT,TX_DESC_CNT,TX_DESC_CNT,TX_DESC_CNT,
+	TX_DESC_CNT,TX_DESC_CNT,TX_DESC_CNT,TX_DESC_CNT,TX_DESC_CNT,
+	TX_DESC_CNT,TX_DESC_CNT,TX_DESC_CNT,TX_DESC_CNT,TX_DESC_CNT,
+	TX_DESC_CNT};
+
+#define RX_DESC_CNT DEFAULT_STD_RCV_DESC_COUNT
+static unsigned int rx_std_desc_cnt[MAX_UNITS] =
+	{RX_DESC_CNT,RX_DESC_CNT,RX_DESC_CNT,RX_DESC_CNT,RX_DESC_CNT,
+	RX_DESC_CNT,RX_DESC_CNT,RX_DESC_CNT,RX_DESC_CNT,RX_DESC_CNT,
+	RX_DESC_CNT,RX_DESC_CNT,RX_DESC_CNT,RX_DESC_CNT,RX_DESC_CNT,
+	RX_DESC_CNT };
+
+#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
+#define JBO_DESC_CNT DEFAULT_JUMBO_RCV_DESC_COUNT
+static unsigned int rx_jumbo_desc_cnt[MAX_UNITS] =
+	{JBO_DESC_CNT,JBO_DESC_CNT,JBO_DESC_CNT,JBO_DESC_CNT,JBO_DESC_CNT,
+	JBO_DESC_CNT,JBO_DESC_CNT,JBO_DESC_CNT,JBO_DESC_CNT,JBO_DESC_CNT,
+	JBO_DESC_CNT,JBO_DESC_CNT,JBO_DESC_CNT,JBO_DESC_CNT,JBO_DESC_CNT,
+	JBO_DESC_CNT };
+#endif
+
+#ifdef BCM_INT_COAL
+#ifdef BCM_NAPI_RXPOLL
+static unsigned int adaptive_coalesce[MAX_UNITS] =
+	{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+#else
+static unsigned int adaptive_coalesce[MAX_UNITS] =
+	{1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
+#endif
+
+#define RX_COAL_TK DEFAULT_RX_COALESCING_TICKS
+static unsigned int rx_coalesce_ticks[MAX_UNITS] =
+	{RX_COAL_TK,RX_COAL_TK,RX_COAL_TK,RX_COAL_TK,RX_COAL_TK,
+	RX_COAL_TK, RX_COAL_TK,RX_COAL_TK,RX_COAL_TK,RX_COAL_TK,
+	RX_COAL_TK,RX_COAL_TK, RX_COAL_TK,RX_COAL_TK,RX_COAL_TK,
+	RX_COAL_TK};
+
+#define RX_COAL_FM DEFAULT_RX_MAX_COALESCED_FRAMES
+static unsigned int rx_max_coalesce_frames[MAX_UNITS] =
+	{RX_COAL_FM,RX_COAL_FM,RX_COAL_FM,RX_COAL_FM,RX_COAL_FM,
+	RX_COAL_FM,RX_COAL_FM,RX_COAL_FM,RX_COAL_FM,RX_COAL_FM,
+	RX_COAL_FM,RX_COAL_FM,RX_COAL_FM,RX_COAL_FM,RX_COAL_FM,
+	RX_COAL_FM};
+
+#define TX_COAL_TK DEFAULT_TX_COALESCING_TICKS
+static unsigned int tx_coalesce_ticks[MAX_UNITS] =
+	{TX_COAL_TK,TX_COAL_TK,TX_COAL_TK,TX_COAL_TK,TX_COAL_TK,
+	TX_COAL_TK, TX_COAL_TK,TX_COAL_TK,TX_COAL_TK,TX_COAL_TK,
+	TX_COAL_TK,TX_COAL_TK, TX_COAL_TK,TX_COAL_TK,TX_COAL_TK,
+	TX_COAL_TK};
+
+#define TX_COAL_FM DEFAULT_TX_MAX_COALESCED_FRAMES
+static unsigned int tx_max_coalesce_frames[MAX_UNITS] =
+	{TX_COAL_FM,TX_COAL_FM,TX_COAL_FM,TX_COAL_FM,TX_COAL_FM,
+	TX_COAL_FM,TX_COAL_FM,TX_COAL_FM,TX_COAL_FM,TX_COAL_FM,
+	TX_COAL_FM,TX_COAL_FM,TX_COAL_FM,TX_COAL_FM,TX_COAL_FM,
+	TX_COAL_FM};
+
+#define ST_COAL_TK DEFAULT_STATS_COALESCING_TICKS
+static unsigned int stats_coalesce_ticks[MAX_UNITS] =
+	{ST_COAL_TK,ST_COAL_TK,ST_COAL_TK,ST_COAL_TK,ST_COAL_TK,
+	ST_COAL_TK,ST_COAL_TK,ST_COAL_TK,ST_COAL_TK,ST_COAL_TK,
+	ST_COAL_TK,ST_COAL_TK,ST_COAL_TK,ST_COAL_TK,ST_COAL_TK,
+	ST_COAL_TK,};
+
+#endif
+#ifdef BCM_WOL
+static int enable_wol[MAX_UNITS] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+#endif
+#ifdef BCM_TSO
+static int enable_tso[MAX_UNITS] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
+#endif
+#ifdef BCM_NIC_SEND_BD
+static int nic_tx_bd[MAX_UNITS] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+#endif
+#ifdef BCM_ASF
+static int vlan_tag_mode[MAX_UNITS] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+#endif
+#ifdef INCLUDE_5750_A0_FIX
+static int shasta_smp_fix[MAX_UNITS] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
+#endif
+static int delay_link[MAX_UNITS] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+static int disable_d3hot[MAX_UNITS] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+
+/* Operational parameters that usually are not changed. */
+/* Time in jiffies before concluding the transmitter is hung. */
+#define TX_TIMEOUT  (2*HZ)
+
+#if (LINUX_VERSION_CODE < 0x02030d)
+#define pci_resource_start(dev, bar)	(dev->base_address[bar] & PCI_BASE_ADDRESS_MEM_MASK)
+#elif (LINUX_VERSION_CODE < 0x02032b)
+#define pci_resource_start(dev, bar)	(dev->resource[bar] & PCI_BASE_ADDRESS_MEM_MASK)
+#endif
+
+#if (LINUX_VERSION_CODE < 0x02032b)
+#define dev_kfree_skb_irq(skb)  dev_kfree_skb(skb)
+#define netif_wake_queue(dev)	clear_bit(0, &dev->tbusy); mark_bh(NET_BH)
+#define netif_stop_queue(dev)	set_bit(0, &dev->tbusy)
+
+static inline void netif_start_queue(struct net_device *dev)
+{
+	dev->tbusy = 0;
+	dev->interrupt = 0;
+	dev->start = 1;
+}
+
+#define netif_queue_stopped(dev)	dev->tbusy
+#define netif_running(dev)		dev->start
+
+static inline void tasklet_schedule(struct tasklet_struct *tasklet)
+{
+	queue_task(tasklet, &tq_immediate);
+	mark_bh(IMMEDIATE_BH);
+}
+
+static inline void tasklet_init(struct tasklet_struct *tasklet,
+				void (*func)(unsigned long),
+				unsigned long data)
+{
+        tasklet->next = NULL;
+        tasklet->sync = 0;
+        tasklet->routine = (void (*)(void *))func;
+        tasklet->data = (void *)data;
+}
+
+#define tasklet_kill(tasklet)
+
+#endif
+
+#if (LINUX_VERSION_CODE < 0x020300)
+struct pci_device_id {
+	unsigned int vendor, device;		/* Vendor and device ID or PCI_ANY_ID */
+	unsigned int subvendor, subdevice;	/* Subsystem ID's or PCI_ANY_ID */
+	unsigned int class, class_mask;		/* (class,subclass,prog-if) triplet */
+	unsigned long driver_data;		/* Data private to the driver */
+};
+
+#define PCI_ANY_ID		0
+
+#define pci_set_drvdata(pdev, dev)
+#define pci_get_drvdata(pdev) 0
+
+#define pci_enable_device(pdev) 0
+
+#define __devinit		__init
+#define __devinitdata		__initdata
+#define __devexit
+
+#define SET_MODULE_OWNER(dev)
+#define MODULE_DEVICE_TABLE(pci, pci_tbl)
+
+#endif
+
+#if (LINUX_VERSION_CODE < 0x020411)
+#ifndef __devexit_p
+#define __devexit_p(x)	x
+#endif
+#endif
+
+#ifndef MODULE_LICENSE
+#define MODULE_LICENSE(license)
+#endif
+
+#ifndef IRQ_RETVAL
+typedef void irqreturn_t;
+#define IRQ_RETVAL(x)
+#endif
+
+#if (LINUX_VERSION_CODE < 0x02032a)
+static inline void *pci_alloc_consistent(struct pci_dev *pdev, size_t size,
+					 dma_addr_t *dma_handle)
+{
+	void *virt_ptr;
+
+	/* Maximum in slab.c */
+	if (size > 131072)
+		return 0;
+
+	virt_ptr = kmalloc(size, GFP_KERNEL);
+	*dma_handle = virt_to_bus(virt_ptr);
+	return virt_ptr;
+}
+#define pci_free_consistent(dev, size, ptr, dma_ptr)	kfree(ptr)
+
+#endif /*#if (LINUX_VERSION_CODE < 0x02032a) */
+
+
+#if (LINUX_VERSION_CODE < 0x02040d)
+
+#if (LINUX_VERSION_CODE >= 0x020409) && defined(RED_HAT_LINUX_KERNEL)
+
+#define BCM_32BIT_DMA_MASK ((u64) 0x00000000ffffffffULL)
+#define BCM_64BIT_DMA_MASK ((u64) 0xffffffffffffffffULL)
+
+#else
+/* pci_set_dma_mask is using dma_addr_t */
+
+#define BCM_32BIT_DMA_MASK ((dma_addr_t) 0xffffffff)
+#define BCM_64BIT_DMA_MASK ((dma_addr_t) 0xffffffff)
+
+#endif
+
+#else /* (LINUX_VERSION_CODE < 0x02040d) */
+
+#define BCM_32BIT_DMA_MASK ((u64) 0x00000000ffffffffULL)
+#define BCM_64BIT_DMA_MASK ((u64) 0xffffffffffffffffULL)
+#endif
+
+#if (LINUX_VERSION_CODE < 0x020329)
+#define pci_set_dma_mask(pdev, mask) (0)
+#else
+#if (LINUX_VERSION_CODE < 0x020403)
+int
+pci_set_dma_mask(struct pci_dev *dev, dma_addr_t mask)
+{
+    if(! pci_dma_supported(dev, mask))
+        return -EIO;
+
+    dev->dma_mask = mask;
+
+    return 0;
+}
+#endif
+#endif
+
+#if (LINUX_VERSION_CODE < 0x020547)
+#define pci_set_consistent_dma_mask(pdev, mask) (0)
+#endif
+
+#if (LINUX_VERSION_CODE < 0x020402)
+#define pci_request_regions(pdev, name) (0)
+#define pci_release_regions(pdev)
+#endif
+
+#if ! defined(spin_is_locked)
+#define spin_is_locked(lock)    (test_bit(0,(lock)))
+#endif
+
+#define BCM5700_LOCK(pUmDevice, flags)					\
+	if ((pUmDevice)->do_global_lock) {				\
+		spin_lock_irqsave(&(pUmDevice)->global_lock, flags);	\
+	}
+
+#define BCM5700_UNLOCK(pUmDevice, flags)				\
+	if ((pUmDevice)->do_global_lock) {				\
+		spin_unlock_irqrestore(&(pUmDevice)->global_lock, flags);\
+	}
+
+inline void
+bcm5700_intr_lock(PUM_DEVICE_BLOCK pUmDevice)
+{
+	if (pUmDevice->do_global_lock) {
+		spin_lock(&pUmDevice->global_lock);
+	}
+}
+
+inline void
+bcm5700_intr_unlock(PUM_DEVICE_BLOCK pUmDevice)
+{
+	if (pUmDevice->do_global_lock) {
+		spin_unlock(&pUmDevice->global_lock);
+	}
+}
+
+void
+bcm5700_intr_off(PUM_DEVICE_BLOCK pUmDevice)
+{
+	atomic_inc(&pUmDevice->intr_sem);
+	LM_DisableInterrupt(&pUmDevice->lm_dev);
+#if (LINUX_VERSION_CODE >= 0x2051c)
+	synchronize_irq(pUmDevice->dev->irq);
+#else
+	synchronize_irq();
+#endif
+	LM_DisableInterrupt(&pUmDevice->lm_dev);
+}
+
+void
+bcm5700_intr_on(PUM_DEVICE_BLOCK pUmDevice)
+{
+	if (atomic_dec_and_test(&pUmDevice->intr_sem)) {
+		LM_EnableInterrupt(&pUmDevice->lm_dev);
+	}
+}
+
+/*
+ * Broadcom NIC Extension support
+ * -ffan
+ */
+#ifdef NICE_SUPPORT
+#include "nicext.h"
+
+typedef struct {
+	ushort  tag;
+	ushort  signature;
+} vlan_tag_t;
+
+#endif /* NICE_SUPPORT */
+
+int MM_Packet_Desc_Size = sizeof(UM_PACKET);
+
+#if defined(MODULE)
+MODULE_AUTHOR("Michael Chan <mchan@broadcom.com>");
+MODULE_DESCRIPTION("BCM5700 Driver");
+MODULE_LICENSE("GPL");
+MODULE_PARM(debug, "i");
+MODULE_PARM(line_speed, "1-" __MODULE_STRING(MAX_UNITS) "i");
+MODULE_PARM(auto_speed, "1-" __MODULE_STRING(MAX_UNITS) "i");
+MODULE_PARM(full_duplex, "1-" __MODULE_STRING(MAX_UNITS) "i");
+MODULE_PARM(rx_flow_control, "1-" __MODULE_STRING(MAX_UNITS) "i");
+MODULE_PARM(tx_flow_control, "1-" __MODULE_STRING(MAX_UNITS) "i");
+MODULE_PARM(auto_flow_control, "1-" __MODULE_STRING(MAX_UNITS) "i");
+#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
+MODULE_PARM(mtu, "1-" __MODULE_STRING(MAX_UNITS) "i");
+#endif
+MODULE_PARM(tx_checksum, "1-" __MODULE_STRING(MAX_UNITS) "i");
+MODULE_PARM(rx_checksum, "1-" __MODULE_STRING(MAX_UNITS) "i");
+MODULE_PARM(scatter_gather, "1-" __MODULE_STRING(MAX_UNITS) "i");
+MODULE_PARM(tx_pkt_desc_cnt, "1-" __MODULE_STRING(MAX_UNITS) "i");
+MODULE_PARM(rx_std_desc_cnt, "1-" __MODULE_STRING(MAX_UNITS) "i");
+#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
+MODULE_PARM(rx_jumbo_desc_cnt, "1-" __MODULE_STRING(MAX_UNITS) "i");
+#endif
+#ifdef BCM_INT_COAL
+MODULE_PARM(adaptive_coalesce, "1-" __MODULE_STRING(MAX_UNITS) "i");
+MODULE_PARM(rx_coalesce_ticks, "1-" __MODULE_STRING(MAX_UNITS) "i");
+MODULE_PARM(rx_max_coalesce_frames, "1-" __MODULE_STRING(MAX_UNITS) "i");
+MODULE_PARM(tx_coalesce_ticks, "1-" __MODULE_STRING(MAX_UNITS) "i");
+MODULE_PARM(tx_max_coalesce_frames, "1-" __MODULE_STRING(MAX_UNITS) "i");
+MODULE_PARM(stats_coalesce_ticks, "1-" __MODULE_STRING(MAX_UNITS) "i");
+#endif
+#ifdef BCM_WOL
+MODULE_PARM(enable_wol, "1-" __MODULE_STRING(MAX_UNITS) "i");
+#endif
+#ifdef BCM_TSO
+MODULE_PARM(enable_tso, "1-" __MODULE_STRING(MAX_UNITS) "i");
+#endif
+#ifdef BCM_NIC_SEND_BD
+MODULE_PARM(nic_tx_bd, "1-" __MODULE_STRING(MAX_UNITS) "i");
+#endif
+#ifdef BCM_ASF
+MODULE_PARM(vlan_tag_mode, "1-" __MODULE_STRING(MAX_UNITS) "i");
+#endif
+#ifdef INCLUDE_5750_A0_FIX
+MODULE_PARM(shasta_smp_fix, "1-" __MODULE_STRING(MAX_UNITS) "i");
+#endif
+MODULE_PARM(delay_link, "1-" __MODULE_STRING(MAX_UNITS) "i");
+MODULE_PARM(disable_d3hot, "1-" __MODULE_STRING(MAX_UNITS) "i");
+#endif
+
+#define RUN_AT(x) (jiffies + (x))
+
+char kernel_version[] = UTS_RELEASE;
+
+#define PCI_SUPPORT_VER2
+
+#if ! defined(CAP_NET_ADMIN)
+#define capable(CAP_XXX) (suser())
+#endif
+
+#define tigon3_debug debug
+#if TIGON3_DEBUG
+static int tigon3_debug = TIGON3_DEBUG;
+#else
+static int tigon3_debug = 0;
+#endif
+
+
+STATIC int bcm5700_open(struct net_device *dev);
+STATIC void bcm5700_timer(unsigned long data);
+STATIC void bcm5700_reset(struct net_device *dev);
+STATIC int bcm5700_start_xmit(struct sk_buff *skb, struct net_device *dev);
+STATIC irqreturn_t bcm5700_interrupt(int irq, void *dev_instance, struct pt_regs *regs);
+#ifdef BCM_TASKLET
+STATIC void bcm5700_tasklet(unsigned long data);
+#endif
+STATIC int bcm5700_close(struct net_device *dev);
+STATIC struct net_device_stats *bcm5700_get_stats(struct net_device *dev);
+STATIC int bcm5700_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
+STATIC void bcm5700_set_rx_mode(struct net_device *dev);
+STATIC int bcm5700_set_mac_addr(struct net_device *dev, void *p);
+#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
+STATIC int bcm5700_change_mtu(struct net_device *dev, int new_mtu);
+#endif
+#ifdef BCM_NAPI_RXPOLL
+STATIC int bcm5700_poll(struct net_device *dev, int *budget);
+#endif
+STATIC int replenish_rx_buffers(PUM_DEVICE_BLOCK pUmDevice, int max);
+STATIC int bcm5700_freemem(struct net_device *dev);
+#ifdef NICE_SUPPORT
+STATIC int bcm5700_freemem2(UM_DEVICE_BLOCK *pUmDevice, int index);
+#endif
+#ifdef BCM_INT_COAL
+#ifndef BCM_NAPI_RXPOLL
+STATIC int bcm5700_adapt_coalesce(PUM_DEVICE_BLOCK pUmDevice);
+#endif
+#endif
+STATIC void bcm5700_set_vlan_mode(UM_DEVICE_BLOCK *pUmDevice);
+STATIC int bcm5700_init_counters(PUM_DEVICE_BLOCK pUmDevice);
+#ifdef BCM_VLAN
+STATIC void bcm5700_vlan_rx_register(struct net_device *dev, struct vlan_group *vlgrp);
+STATIC void bcm5700_vlan_rx_kill_vid(struct net_device *dev, uint16_t vid);
+#endif
+void bcm5700_shutdown(UM_DEVICE_BLOCK *pUmDevice);
+void bcm5700_free_remaining_rx_bufs(UM_DEVICE_BLOCK *pUmDevice);
+void bcm5700_validate_param_range(UM_DEVICE_BLOCK *pUmDevice, int *param,
+	char *param_name, int min, int max, int deflt);
+
+#ifdef HAVE_POLL_CONTROLLER
+STATIC void poll_bcm5700(struct net_device *dev);
+#endif
+
+/* A list of all installed bcm5700 devices. */
+static struct net_device *root_tigon3_dev = NULL;
+
+#if defined(CONFIG_SPARC64) || defined(CONFIG_X86_64) ||defined(CONFIG_PPC64)
+
+#ifdef NICE_SUPPORT
+#if (LINUX_VERSION_CODE < 0x20500)
+extern int register_ioctl32_conversion(unsigned int cmd,
+	int (*handler)(unsigned int, unsigned int, unsigned long,
+	struct file *));
+int unregister_ioctl32_conversion(unsigned int cmd);
+#else
+#include <linux/ioctl32.h>
+#endif
+
+#define BCM_IOCTL32 1
+
+atomic_t bcm5700_load_count = ATOMIC_INIT(0);
+
+static int
+bcm5700_ioctl32(unsigned int fd, unsigned int cmd, unsigned long arg,
+	struct file *filep)
+{
+	struct ifreq rq;
+	struct net_device *tmp_dev = root_tigon3_dev;
+	int ret;
+	struct nice_req* nrq;
+	struct ifreq_nice32 {
+		char ifnr_name[16];
+		__u32 cmd;
+		__u32 nrq1;
+		__u32 nrq2;
+		__u32 nrq3;
+	} nrq32;
+
+	if (!capable(CAP_NET_ADMIN))
+		return -EPERM;
+
+	if (copy_from_user(&nrq32, (char *) arg, 32))
+		return -EFAULT;
+
+	memcpy(rq.ifr_name, nrq32.ifnr_name, 16);
+
+	nrq = (struct nice_req*) &rq.ifr_ifru;
+	nrq->cmd = nrq32.cmd;
+	if (nrq->cmd == NICE_CMD_GET_STATS_BLOCK) {
+		nrq->nrq_stats_useraddr = (void *) ((__u64) nrq32.nrq1);
+		nrq->nrq_stats_size = nrq32.nrq2;
+	}
+	else {
+		memcpy(&nrq->nrq_speed, &nrq32.nrq1, 12);
+	}
+	while (tmp_dev) {
+		if (strcmp(rq.ifr_name, tmp_dev->name) == 0) {
+			ret = bcm5700_ioctl(tmp_dev, &rq, cmd);
+			if (ret == 0) {
+				if (nrq->cmd == NICE_CMD_GET_STATS_BLOCK)
+					return ret;
+
+				memcpy(&nrq32.nrq1, &nrq->nrq_speed, 12);
+				if (copy_to_user((char *) arg, &nrq32, 32))
+					return -EFAULT;
+			}
+			return ret;
+		}
+		tmp_dev = ((UM_DEVICE_BLOCK *)(tmp_dev->priv))->next_module;
+	}
+	return -ENODEV;
+}
+#endif /* NICE_SUPPORT */
+#endif
+
+typedef enum {
+	BCM5700A6 = 0,
+	BCM5700T6,
+	BCM5700A9,
+	BCM5700T9,
+	BCM5700,
+	BCM5701A5,
+	BCM5701T1,
+	BCM5701T8,
+	BCM5701A7,
+	BCM5701A10,
+	BCM5701A12,
+	BCM5701,
+	BCM5702,
+	BCM5703,
+	BCM5703A31,
+	BCM5703ARBUCKLE,
+	TC996T,
+	TC996ST,
+	TC996SSX,
+	TC996SX,
+	TC996BT,
+	TC997T,
+	TC997SX,
+	TC1000T,
+	TC1000BT,
+	TC940BR01,
+	TC942BR01,
+	TC998T,
+	TC998SX,
+	TC999T,
+	NC6770,
+	NC1020,
+	NC150T,
+	NC7760,
+	NC7761,
+	NC7770,
+	NC7771,
+	NC7780,
+	NC7781,
+	NC7772,
+	NC7782,
+	NC7783,
+	NC320T,
+	BCM5704CIOBE,
+	BCM5704,
+	BCM5704S,
+	BCM5705,
+	BCM5705M,
+	BCM5705F,
+	BCM5901,
+	BCM5782,
+	BCM5788,
+	BCM5789,
+	BCM5750,
+	BCM5750M,
+	BCM5720,
+	BCM5751,
+	BCM5751M,
+	BCM5751F,
+	BCM5721,
+} board_t;
+
+
+/* indexed by board_t, above */
+static struct {
+	char *name;
+} board_info[] __devinitdata = {
+	{ "Broadcom BCM5700 1000Base-T" },
+	{ "Broadcom BCM5700 1000Base-SX" },
+	{ "Broadcom BCM5700 1000Base-SX" },
+	{ "Broadcom BCM5700 1000Base-T" },
+	{ "Broadcom BCM5700" },
+	{ "Broadcom BCM5701 1000Base-T" },
+	{ "Broadcom BCM5701 1000Base-T" },
+	{ "Broadcom BCM5701 1000Base-T" },
+	{ "Broadcom BCM5701 1000Base-SX" },
+	{ "Broadcom BCM5701 1000Base-T" },
+	{ "Broadcom BCM5701 1000Base-T" },
+	{ "Broadcom BCM5701" },
+	{ "Broadcom BCM5702 1000Base-T" },
+	{ "Broadcom BCM5703 1000Base-T" },
+	{ "Broadcom BCM5703 1000Base-SX" },
+	{ "Broadcom B5703 1000Base-SX" },
+	{ "3Com 3C996 10/100/1000 Server NIC" },
+	{ "3Com 3C996 10/100/1000 Server NIC" },
+	{ "3Com 3C996 Gigabit Fiber-SX Server NIC" },
+	{ "3Com 3C996 Gigabit Fiber-SX Server NIC" },
+	{ "3Com 3C996B Gigabit Server NIC" },
+	{ "3Com 3C997 Gigabit Server NIC" },
+	{ "3Com 3C997 Gigabit Fiber-SX Server NIC" },
+	{ "3Com 3C1000 Gigabit NIC" },
+	{ "3Com 3C1000B-T 10/100/1000 PCI" },
+	{ "3Com 3C940 Gigabit LOM (21X21)" },
+	{ "3Com 3C942 Gigabit LOM (31X31)" },
+	{ "3Com 3C998-T Dual Port 10/100/1000 PCI-X Server NIC" },
+	{ "3Com 3C998-SX Dual Port 1000-SX PCI-X Server NIC" },
+	{ "3Com 3C999-T Quad Port 10/100/1000 PCI-X Server NIC" },
+	{ "HP NC6770 Gigabit Server Adapter" },
+	{ "NC1020 HP ProLiant Gigabit Server Adapter 32 PCI" },
+	{ "HP ProLiant NC 150T PCI 4-port Gigabit Combo Switch Adapter" },
+	{ "HP NC7760 Gigabit Server Adapter" },
+	{ "HP NC7761 Gigabit Server Adapter" },
+	{ "HP NC7770 Gigabit Server Adapter" },
+	{ "HP NC7771 Gigabit Server Adapter" },
+	{ "HP NC7780 Gigabit Server Adapter" },
+	{ "HP NC7781 Gigabit Server Adapter" },
+	{ "HP NC7772 Gigabit Server Adapter" },
+	{ "HP NC7782 Gigabit Server Adapter" },
+	{ "HP NC7783 Gigabit Server Adapter" },
+	{ "HP ProLiant NC 320T PCI Express Gigabit Server Adapter" },
+	{ "Broadcom BCM5704 CIOB-E 1000Base-T" },
+	{ "Broadcom BCM5704 1000Base-T" },
+	{ "Broadcom BCM5704 1000Base-SX" },
+	{ "Broadcom BCM5705 1000Base-T" },
+	{ "Broadcom BCM5705M 1000Base-T" },
+	{ "Broadcom 570x 10/100 Integrated Controller" },
+	{ "Broadcom BCM5901 100Base-TX" },
+	{ "Broadcom NetXtreme Gigabit Ethernet for hp" },
+	{ "Broadcom BCM5788 NetLink 1000Base-T" },
+	{ "Broadcom BCM5789 NetLink 1000Base-T PCI Express" },
+	{ "Broadcom BCM5750 1000Base-T PCI" },
+	{ "Broadcom BCM5750M 1000Base-T PCI" },
+	{ "Broadcom BCM5720 1000Base-T PCI" },
+	{ "Broadcom BCM5751 1000Base-T PCI Express" },
+	{ "Broadcom BCM5751M 1000Base-T PCI Express" },
+	{ "Broadcom BCM5751F 100Base-TX PCI Express" },
+	{ "Broadcom BCM5721 1000Base-T PCI Express" },
+	{ 0 },
+	};
+
+static struct pci_device_id bcm5700_pci_tbl[] __devinitdata = {
+	{0x14e4, 0x1644, 0x14e4, 0x1644, 0, 0, BCM5700A6 },
+	{0x14e4, 0x1644, 0x14e4, 0x2, 0, 0, BCM5700T6 },
+	{0x14e4, 0x1644, 0x14e4, 0x3, 0, 0, BCM5700A9 },
+	{0x14e4, 0x1644, 0x14e4, 0x4, 0, 0, BCM5700T9 },
+	{0x14e4, 0x1644, 0x1028, 0xd1, 0, 0, BCM5700 },
+	{0x14e4, 0x1644, 0x1028, 0x0106, 0, 0, BCM5700 },
+	{0x14e4, 0x1644, 0x1028, 0x0109, 0, 0, BCM5700 },
+	{0x14e4, 0x1644, 0x1028, 0x010a, 0, 0, BCM5700 },
+	{0x14e4, 0x1644, 0x10b7, 0x1000, 0, 0, TC996T },
+	{0x14e4, 0x1644, 0x10b7, 0x1001, 0, 0, TC996ST },
+	{0x14e4, 0x1644, 0x10b7, 0x1002, 0, 0, TC996SSX },
+	{0x14e4, 0x1644, 0x10b7, 0x1003, 0, 0, TC997T },
+	{0x14e4, 0x1644, 0x10b7, 0x1005, 0, 0, TC997SX },
+	{0x14e4, 0x1644, 0x10b7, 0x1008, 0, 0, TC942BR01 },
+	{0x14e4, 0x1644, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5700 },
+	{0x14e4, 0x1645, 0x14e4, 1, 0, 0, BCM5701A5 },
+	{0x14e4, 0x1645, 0x14e4, 5, 0, 0, BCM5701T1 },
+	{0x14e4, 0x1645, 0x14e4, 6, 0, 0, BCM5701T8 },
+	{0x14e4, 0x1645, 0x14e4, 7, 0, 0, BCM5701A7 },
+	{0x14e4, 0x1645, 0x14e4, 8, 0, 0, BCM5701A10 },
+	{0x14e4, 0x1645, 0x14e4, 0x8008, 0, 0, BCM5701A12 },
+	{0x14e4, 0x1645, 0x0e11, 0xc1, 0, 0, NC6770 },
+	{0x14e4, 0x1645, 0x0e11, 0x7c, 0, 0, NC7770 },
+	{0x14e4, 0x1645, 0x0e11, 0x85, 0, 0, NC7780 },
+	{0x14e4, 0x1645, 0x1028, 0x0121, 0, 0, BCM5701 },
+	{0x14e4, 0x1645, 0x10b7, 0x1004, 0, 0, TC996SX },
+	{0x14e4, 0x1645, 0x10b7, 0x1006, 0, 0, TC996BT },
+	{0x14e4, 0x1645, 0x10b7, 0x1007, 0, 0, TC1000T },
+	{0x14e4, 0x1645, 0x10b7, 0x1008, 0, 0, TC940BR01 },
+	{0x14e4, 0x1645, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5701 },
+	{0x14e4, 0x1646, 0x14e4, 0x8009, 0, 0, BCM5702 },
+	{0x14e4, 0x1646, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5702 },
+	{0x14e4, 0x16a6, 0x14e4, 0x8009, 0, 0, BCM5702 },
+	{0x14e4, 0x16a6, 0x14e4, 0x000c, 0, 0, BCM5702 },
+	{0x14e4, 0x16a6, 0x0e11, 0xbb, 0, 0, NC7760 },
+	{0x14e4, 0x16a6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5702 },
+	{0x14e4, 0x16c6, 0x10b7, 0x1100, 0, 0, TC1000BT },
+	{0x14e4, 0x16c6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5702 },
+	{0x14e4, 0x1647, 0x14e4, 0x0009, 0, 0, BCM5703 },
+	{0x14e4, 0x1647, 0x14e4, 0x000a, 0, 0, BCM5703A31 },
+	{0x14e4, 0x1647, 0x14e4, 0x000b, 0, 0, BCM5703 },
+	{0x14e4, 0x1647, 0x14e4, 0x800a, 0, 0, BCM5703 },
+	{0x14e4, 0x1647, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5703 },
+	{0x14e4, 0x16a7, 0x14e4, 0x0009, 0, 0, BCM5703 },
+	{0x14e4, 0x16a7, 0x14e4, 0x000a, 0, 0, BCM5703A31 },
+	{0x14e4, 0x16a7, 0x14e4, 0x000b, 0, 0, BCM5703 },
+	{0x14e4, 0x16a7, 0x14e4, 0x800a, 0, 0, BCM5703 },
+	{0x14e4, 0x16a7, 0x0e11, 0xca, 0, 0, NC7771 },
+	{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 },
+	{0x14e4, 0x1648, 0x0e11, 0xd1, 0, 0, NC7783 },
+	{0x14e4, 0x1648, 0x10b7, 0x2000, 0, 0, TC998T },
+	{0x14e4, 0x1648, 0x10b7, 0x3000, 0, 0, TC999T },
+	{0x14e4, 0x1648, 0x1166, 0x1648, 0, 0, BCM5704CIOBE },
+	{0x14e4, 0x1648, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5704 },
+	{0x14e4, 0x1649, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5704S },
+	{0x14e4, 0x16a8, 0x14e4, 0x16a8, 0, 0, BCM5704S },
+	{0x14e4, 0x16a8, 0x10b7, 0x2001, 0, 0, TC998SX },
+	{0x14e4, 0x16a8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5704S },
+	{0x14e4, 0x1653, 0x0e11, 0x00e3, 0, 0, NC7761 },
+	{0x14e4, 0x1653, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5705 },
+	{0x14e4, 0x1654, 0x0e11, 0x00e3, 0, 0, NC7761 },
+	{0x14e4, 0x1654, 0x103c, 0x3100, 0, 0, NC1020 },
+	{0x14e4, 0x1654, 0x103c, 0x3226, 0, 0, NC150T },
+	{0x14e4, 0x1654, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5705 },
+	{0x14e4, 0x165d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5705M },
+	{0x14e4, 0x165e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5705M },
+	{0x14e4, 0x166e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5705F },
+	{0x14e4, 0x1696, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5782 },
+	{0x14e4, 0x169c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5788 },
+	{0x14e4, 0x169d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5789 },
+	{0x14e4, 0x170d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5901 },
+	{0x14e4, 0x170e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5901 },
+	{0x14e4, 0x1676, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5750 },
+	{0x14e4, 0x167c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5750M },
+	{0x14e4, 0x1677, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5751 },
+	{0x14e4, 0x167d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5751M },
+	{0x14e4, 0x167e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5751F },
+	{0x14e4, 0x1658, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5720 },
+	{0x14e4, 0x1659, 0x103c, 0x7031, 0, 0, NC320T },
+	{0x14e4, 0x1659, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5721 },
+	{0,}
+};
+
+MODULE_DEVICE_TABLE(pci, bcm5700_pci_tbl);
+
+#ifdef BCM_PROC_FS
+extern int bcm5700_proc_create(void);
+extern int bcm5700_proc_create_dev(struct net_device *dev);
+extern int bcm5700_proc_remove_dev(struct net_device *dev);
+#endif
+
+static int __devinit bcm5700_init_board(struct pci_dev *pdev,
+					struct net_device **dev_out,
+					int board_idx)
+{
+	struct net_device *dev;
+	PUM_DEVICE_BLOCK pUmDevice;
+	PLM_DEVICE_BLOCK pDevice;
+	int rc;
+
+	*dev_out = NULL;
+
+	/* dev zeroed in init_etherdev */
+#if (LINUX_VERSION_CODE >= 0x20600)
+	dev = alloc_etherdev(sizeof(*pUmDevice));
+#else
+	dev = init_etherdev(NULL, sizeof(*pUmDevice));
+#endif
+	if (dev == NULL) {
+		printk (KERN_ERR "%s: unable to alloc new ethernet\n",
+			bcm5700_driver);
+		return -ENOMEM;
+	}
+	SET_MODULE_OWNER(dev);
+#if (LINUX_VERSION_CODE >= 0x20600)
+	SET_NETDEV_DEV(dev, &pdev->dev);
+#endif
+	pUmDevice = (PUM_DEVICE_BLOCK) dev->priv;
+
+	/* enable device (incl. PCI PM wakeup), and bus-mastering */
+	rc = pci_enable_device (pdev);
+	if (rc)
+		goto err_out;
+
+	rc = pci_request_regions(pdev, bcm5700_driver);
+	if (rc)
+		goto err_out;
+
+	pci_set_master(pdev);
+
+	if (pci_set_dma_mask(pdev, BCM_64BIT_DMA_MASK) == 0) {
+		pUmDevice->using_dac = 1;
+		if (pci_set_consistent_dma_mask(pdev, BCM_64BIT_DMA_MASK) != 0)
+		{
+			printk(KERN_ERR "pci_set_consistent_dma_mask failed\n");
+			pci_release_regions(pdev);
+			goto err_out;
+		}
+	}
+	else if (pci_set_dma_mask(pdev, BCM_32BIT_DMA_MASK) == 0) {
+		pUmDevice->using_dac = 0;
+	}
+	else {
+		printk(KERN_ERR "System does not support DMA\n");
+		pci_release_regions(pdev);
+		goto err_out;
+	}
+
+	pUmDevice->dev = dev;
+	pUmDevice->pdev = pdev;
+	pUmDevice->mem_list_num = 0;
+	pUmDevice->next_module = root_tigon3_dev;
+	pUmDevice->index = board_idx;
+	root_tigon3_dev = dev;
+
+	spin_lock_init(&pUmDevice->global_lock);
+
+	spin_lock_init(&pUmDevice->undi_lock);
+
+	spin_lock_init(&pUmDevice->phy_lock);
+
+	pDevice = (PLM_DEVICE_BLOCK) pUmDevice;
+	pDevice->Flags = 0;
+	pDevice->FunctNum = PCI_FUNC(pUmDevice->pdev->devfn);
+
+#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
+	bcm5700_validate_param_range(pUmDevice, &mtu[board_idx], "mtu", 1500, 9000, 1500);
+	dev->mtu = mtu[board_idx];
+#endif
+
+	if (pci_find_device(0x8086, 0x2418, NULL) ||
+		pci_find_device(0x8086, 0x2428, NULL) ||
+		pci_find_device(0x8086, 0x244e, NULL) ||
+		pci_find_device(0x8086, 0x2448, NULL)) {
+
+		/* Found ICH, ICH0, or ICH2 */
+		pDevice->Flags |= UNDI_FIX_FLAG;
+	}
+
+	if (LM_GetAdapterInfo(pDevice) != LM_STATUS_SUCCESS) {
+		printk(KERN_ERR "Get Adapter info failed\n");
+		rc = -ENODEV;
+		goto err_out_unmap;
+	}
+
+	if (T3_ASIC_5705_OR_5750(pDevice->ChipRevId)) {
+		if (dev->mtu > 1500) {
+			dev->mtu = 1500;
+			printk(KERN_WARNING "%s-%d: Jumbo mtu sizes not supported, using mtu=1500\n", bcm5700_driver, pUmDevice->index);
+		}
+	}
+
+	if (pci_find_device(0x1022, 0x700c, NULL)) {
+		/* AMD762 writes I/O out of order */
+		/* Setting bit 1 in 762's register 0x4C still doesn't work */
+		/* in all cases */
+		pDevice->Flags |= FLUSH_POSTED_WRITE_FLAG;
+		pDevice->Flags &= ~NIC_SEND_BD_FLAG;
+	}
+	pUmDevice->do_global_lock = 0;
+	if (T3_ASIC_REV(pUmDevice->lm_dev.ChipRevId) == T3_ASIC_REV_5700) {
+		/* The 5700 chip works best without interleaved register */
+		/* accesses on certain machines. */
+		pUmDevice->do_global_lock = 1;
+	}
+#ifdef INCLUDE_5750_A0_FIX
+	if ((pDevice->Flags & PCI_EXPRESS_FLAG) &&
+		(pDevice->ChipRevId == T3_CHIP_ID_5750_A0))
+	{
+		if (shasta_smp_fix[pUmDevice->index]) {
+			pUmDevice->do_global_lock = 1;
+			pDevice->Flags |= (FLUSH_POSTED_WRITE_FLAG |
+					REG_RD_BACK_FLAG);
+		}
+		else {
+			pDevice->Flags &= ~REG_RD_BACK_FLAG;
+		}
+	}
+#endif
+	if ((T3_ASIC_REV(pUmDevice->lm_dev.ChipRevId) == T3_ASIC_REV_5701) &&
+		((pDevice->PciState & T3_PCI_STATE_NOT_PCI_X_BUS) == 0)) {
+
+		pUmDevice->rx_buf_align = 0;
+	}
+	else {
+		pUmDevice->rx_buf_align = 2;
+	}
+/*	dev->base_addr = pci_resource_start(pdev, 0);*/
+	dev->mem_start = pci_resource_start(pdev, 0);
+	dev->mem_end = dev->mem_start + sizeof(T3_STD_MEM_MAP); 
+	dev->irq = pdev->irq;
+
+	*dev_out = dev;
+	return 0;
+
+err_out_unmap:
+	pci_release_regions(pdev);
+	bcm5700_freemem(dev);
+
+err_out:
+#if (LINUX_VERSION_CODE < 0x020600)
+	unregister_netdev(dev);
+	kfree(dev);
+#else
+	free_netdev(dev);
+#endif
+	return rc;
+}
+
+static int __devinit
+bcm5700_print_ver(void)
+{
+	printk(KERN_INFO "Broadcom Gigabit Ethernet Driver %s ",
+		bcm5700_driver);
+#ifdef NICE_SUPPORT
+	printk("with Broadcom NIC Extension (NICE) ");
+#endif
+	printk("ver. %s %s\n", bcm5700_version, bcm5700_date);
+	return 0;
+}
+
+static int __devinit
+bcm5700_init_one(struct pci_dev *pdev,
+				       const struct pci_device_id *ent)
+{
+	struct net_device *dev = NULL;
+	PUM_DEVICE_BLOCK pUmDevice;
+	PLM_DEVICE_BLOCK pDevice;
+	int i;
+	static int board_idx = -1;
+	static int printed_version = 0;
+	struct pci_dev *amd_dev;
+
+	board_idx++;
+
+	if (!printed_version) {
+		bcm5700_print_ver();
+#ifdef BCM_PROC_FS
+		bcm5700_proc_create();
+#endif
+		printed_version = 1;
+	}
+
+	i = bcm5700_init_board(pdev, &dev, board_idx);
+	if (i < 0) {
+		return i;
+	}
+
+	if (dev == NULL)
+		return -ENOMEM;
+
+#ifdef BCM_IOCTL32
+	if (atomic_read(&bcm5700_load_count) == 0) {
+		register_ioctl32_conversion(SIOCNICE, bcm5700_ioctl32);
+	}
+	atomic_inc(&bcm5700_load_count);
+#endif
+	dev->open = bcm5700_open;
+	dev->hard_start_xmit = bcm5700_start_xmit;
+	dev->stop = bcm5700_close;
+	dev->get_stats = bcm5700_get_stats;
+	dev->set_multicast_list = bcm5700_set_rx_mode;
+	dev->do_ioctl = bcm5700_ioctl;
+	dev->set_mac_address = &bcm5700_set_mac_addr;
+#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
+	dev->change_mtu = &bcm5700_change_mtu;
+#endif
+#if (LINUX_VERSION_CODE >= 0x20400)
+	dev->tx_timeout = bcm5700_reset;
+	dev->watchdog_timeo = TX_TIMEOUT;
+#endif
+#ifdef BCM_VLAN
+	dev->vlan_rx_register = &bcm5700_vlan_rx_register;
+	dev->vlan_rx_kill_vid = &bcm5700_vlan_rx_kill_vid;
+#endif
+#ifdef BCM_NAPI_RXPOLL
+	dev->poll = bcm5700_poll;
+	dev->weight = 64;
+#endif
+
+	pUmDevice = (PUM_DEVICE_BLOCK) dev->priv;
+	pDevice = (PLM_DEVICE_BLOCK) pUmDevice;
+
+	dev->base_addr = pci_resource_start(pdev, 0);
+	dev->irq = pdev->irq;
+#ifdef HAVE_POLL_CONTROLLER
+	dev->poll_controller = poll_bcm5700;
+#endif
+
+#if (LINUX_VERSION_CODE >= 0x20600)
+	if ((i = register_netdev(dev))) {
+		printk(KERN_ERR "%s: Cannot register net device\n",
+			bcm5700_driver);
+		if (pUmDevice->lm_dev.pMappedMemBase)
+			iounmap(pUmDevice->lm_dev.pMappedMemBase);
+		pci_release_regions(pdev);
+		bcm5700_freemem(dev);
+		free_netdev(dev);
+		return i;
+	}
+#endif
+
+	pci_set_drvdata(pdev, dev);
+
+	memcpy(dev->dev_addr, pDevice->NodeAddress, 6);
+	pUmDevice->name = board_info[ent->driver_data].name,
+	printk(KERN_INFO "%s: %s found at mem %lx, IRQ %d, ",
+		dev->name, pUmDevice->name, dev->base_addr,
+		dev->irq);
+	printk("node addr ");
+	for (i = 0; i < 6; i++) {
+		printk("%2.2x", dev->dev_addr[i]);
+	}
+	printk("\n");
+
+	printk(KERN_INFO "%s: ", dev->name);
+	if ((pDevice->PhyId & PHY_ID_MASK) == PHY_BCM5400_PHY_ID)
+		printk("Broadcom BCM5400 Copper ");
+	else if ((pDevice->PhyId & PHY_ID_MASK) == PHY_BCM5401_PHY_ID)
+		printk("Broadcom BCM5401 Copper ");
+	else if ((pDevice->PhyId & PHY_ID_MASK) == PHY_BCM5411_PHY_ID)
+		printk("Broadcom BCM5411 Copper ");
+	else if (((pDevice->PhyId & PHY_ID_MASK) == PHY_BCM5701_PHY_ID) &&
+		!(pDevice->TbiFlags & ENABLE_TBI_FLAG)) {
+		printk("Broadcom BCM5701 Integrated Copper ");
+	}
+	else if ((pDevice->PhyId & PHY_ID_MASK) == PHY_BCM5703_PHY_ID) {
+		printk("Broadcom BCM5703 Integrated ");
+		if (pDevice->TbiFlags & ENABLE_TBI_FLAG)
+			printk("SerDes ");
+		else
+			printk("Copper ");
+	}
+	else if ((pDevice->PhyId & PHY_ID_MASK) == PHY_BCM5704_PHY_ID) {
+		printk("Broadcom BCM5704 Integrated ");
+		if (pDevice->TbiFlags & ENABLE_TBI_FLAG)
+			printk("SerDes ");
+		else
+			printk("Copper ");
+	}
+	else if ((pDevice->PhyId & PHY_ID_MASK) == PHY_BCM5705_PHY_ID)
+		printk("Broadcom BCM5705 Integrated Copper ");
+	else if ((pDevice->PhyId & PHY_ID_MASK) == PHY_BCM5750_PHY_ID)
+		printk("Broadcom BCM5750 Integrated Copper ");
+	else if ((pDevice->PhyId & PHY_ID_MASK) == PHY_BCM8002_PHY_ID)
+		printk("Broadcom BCM8002 SerDes ");
+	else if (pDevice->TbiFlags & ENABLE_TBI_FLAG) {
+		if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5703) {
+			printk("Broadcom BCM5703 Integrated SerDes ");
+		}
+		else if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5704) {
+			printk("Broadcom BCM5704 Integrated SerDes ");
+		}
+		else {
+			printk("Agilent HDMP-1636 SerDes ");
+		}
+	}
+	else {
+		printk("Unknown ");
+	}
+	printk("transceiver found\n");
+
+	printk(KERN_INFO "%s: ", dev->name);
+#if (LINUX_VERSION_CODE >= 0x20400)
+	if (scatter_gather[board_idx]) {
+		dev->features |= NETIF_F_SG;
+		if (pUmDevice->using_dac && !(pDevice->Flags & BCM5788_FLAG))
+			dev->features |= NETIF_F_HIGHDMA;
+	}
+	if ((pDevice->TaskOffloadCap & LM_TASK_OFFLOAD_TX_TCP_CHECKSUM) &&
+		tx_checksum[board_idx]) {
+		dev->features |= NETIF_F_IP_CSUM;
+	}
+#ifdef BCM_VLAN
+	dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
+#endif
+#ifdef BCM_TSO
+	if ((pDevice->TaskToOffload & LM_TASK_OFFLOAD_TCP_SEGMENTATION) &&
+		enable_tso[board_idx]) {
+		dev->features |= NETIF_F_TSO;
+	}
+#endif
+
+	printk("Scatter-gather %s, 64-bit DMA %s, Tx Checksum %s, ",
+		(char *) ((dev->features & NETIF_F_SG) ? "ON" : "OFF"),
+		(char *) ((dev->features & NETIF_F_HIGHDMA) ? "ON" : "OFF"),
+		(char *) ((dev->features & NETIF_F_IP_CSUM) ? "ON" : "OFF"));
+#endif
+	if ((pDevice->ChipRevId != T3_CHIP_ID_5700_B0) &&
+		rx_checksum[board_idx])
+		printk("Rx Checksum ON");
+	else
+		printk("Rx Checksum OFF");
+#ifdef BCM_VLAN
+	printk(", 802.1Q VLAN ON");
+#endif
+#ifdef BCM_TSO
+	if (dev->features & NETIF_F_TSO) {
+		printk(", TSO ON");
+	}
+	else
+#endif
+#ifdef BCM_NAPI_RXPOLL
+	printk(", NAPI ON");
+#endif
+	printk("\n");
+
+#ifdef BCM_PROC_FS
+	bcm5700_proc_create_dev(dev);
+#endif
+#ifdef BCM_TASKLET
+	tasklet_init(&pUmDevice->tasklet, bcm5700_tasklet,
+		(unsigned long) pUmDevice);
+#endif
+	if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5704) {
+		if ((REG_RD(pDevice, PciCfg.DualMacCtrl) &
+			T3_DUAL_MAC_CH_CTRL_MASK) == 3) {
+
+			printk(KERN_WARNING "%s: Device is configured for Hardware Based Teaming which is not supported with this operating system. Please consult the user diagnostic guide to disable Turbo Teaming.\n", dev->name);
+		}
+	}
+
+	if ((amd_dev = pci_find_device(0x1022, 0x700c, NULL))) {
+		u32 val;
+
+		/* Found AMD 762 North bridge */
+		pci_read_config_dword(amd_dev, 0x4c, &val);
+		if ((val & 0x02) == 0) {
+			pci_write_config_dword(amd_dev, 0x4c, val | 0x02);
+			printk(KERN_INFO "%s: Setting AMD762 Northbridge to enable PCI ordering compliance\n", bcm5700_driver);
+		}
+	}
+	return 0;
+
+}
+
+
+static void __devexit
+bcm5700_remove_one (struct pci_dev *pdev)
+{
+	struct net_device *dev = pci_get_drvdata (pdev);
+	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK)dev->priv;
+
+#ifdef BCM_PROC_FS
+	bcm5700_proc_remove_dev(dev); 
+#endif
+#ifdef BCM_IOCTL32
+	atomic_dec(&bcm5700_load_count);
+	if (atomic_read(&bcm5700_load_count) == 0)
+		unregister_ioctl32_conversion(SIOCNICE);
+#endif
+	unregister_netdev(dev);
+
+	if (pUmDevice->lm_dev.pMappedMemBase)
+		iounmap(pUmDevice->lm_dev.pMappedMemBase);
+
+	pci_release_regions(pdev);
+
+#if (LINUX_VERSION_CODE < 0x020600)
+	kfree(dev);
+#else
+	free_netdev(dev);
+#endif
+
+	pci_set_drvdata(pdev, NULL);
+
+/*	pci_power_off(pdev, -1);*/
+
+}
+
+
+
+STATIC int
+bcm5700_open(struct net_device *dev)
+{
+	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK)dev->priv;
+	PLM_DEVICE_BLOCK pDevice = (PLM_DEVICE_BLOCK) pUmDevice;
+
+	if (pUmDevice->suspended)
+		return -EAGAIN;
+
+	/* delay for 6 seconds */
+	pUmDevice->delayed_link_ind = (6 * HZ) / pUmDevice->timer_interval;
+
+#ifdef BCM_INT_COAL
+#ifndef BCM_NAPI_RXPOLL
+	pUmDevice->adaptive_expiry = HZ / pUmDevice->timer_interval;
+#endif
+#endif
+
+#if INCLUDE_TBI_SUPPORT
+	if ((pDevice->TbiFlags & ENABLE_TBI_FLAG) &&
+		(pDevice->TbiFlags & TBI_POLLING_FLAGS)) {
+		pUmDevice->poll_tbi_interval = HZ / pUmDevice->timer_interval;
+		if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5703) {
+			pUmDevice->poll_tbi_interval /= 4;
+		}
+		pUmDevice->poll_tbi_expiry = pUmDevice->poll_tbi_interval;
+	}
+#endif
+
+	pUmDevice->asf_heartbeat = (120 * HZ) / pUmDevice->timer_interval;
+
+	pUmDevice->stats_interval = HZ / pUmDevice->timer_interval;
+
+	/* Sometimes we get spurious ints. after reset when link is down. */
+	/* This field tells the isr to service the int. even if there is */
+	/* no status block update. */
+	if (pDevice->LedCtrl != LED_CTRL_PHY_MODE_2) {
+		pUmDevice->adapter_just_inited = (3 * HZ) /
+			pUmDevice->timer_interval;
+	}
+	else {
+		pUmDevice->adapter_just_inited = 0;
+	}
+
+	if (request_irq(dev->irq, &bcm5700_interrupt, SA_SHIRQ, dev->name, dev)) {
+		return -EAGAIN;
+	}
+
+	pUmDevice->opened = 1;
+	if (LM_InitializeAdapter(pDevice) != LM_STATUS_SUCCESS) {
+		pUmDevice->opened = 0;
+		free_irq(dev->irq, dev);
+		bcm5700_freemem(dev);
+		return -EAGAIN;
+	}
+
+	bcm5700_set_vlan_mode(pUmDevice);
+	bcm5700_init_counters(pUmDevice);
+
+	if (pDevice->Flags & UNDI_FIX_FLAG) {
+		printk(KERN_INFO "%s: Using indirect register access\n", dev->name);
+	}
+
+	if (memcmp(dev->dev_addr, pDevice->NodeAddress, 6)) {
+		LM_SetMacAddress(pDevice, dev->dev_addr);
+	}
+
+	if (tigon3_debug > 1)
+		printk(KERN_DEBUG "%s: tigon3_open() irq %d.\n", dev->name, dev->irq);
+
+	QQ_InitQueue(&pUmDevice->rx_out_of_buf_q.Container,
+        MAX_RX_PACKET_DESC_COUNT);
+	netif_start_queue(dev);
+
+#if (LINUX_VERSION_CODE < 0x020300)
+	MOD_INC_USE_COUNT;
+#endif
+
+	init_timer(&pUmDevice->timer);
+	pUmDevice->timer.expires = RUN_AT(pUmDevice->timer_interval);
+	pUmDevice->timer.data = (unsigned long)dev;
+	pUmDevice->timer.function = &bcm5700_timer;
+	add_timer(&pUmDevice->timer);
+
+	atomic_set(&pUmDevice->intr_sem, 0);
+	LM_EnableInterrupt(pDevice);
+
+	return 0;
+}
+
+
+STATIC void
+bcm5700_timer(unsigned long data)
+{
+	struct net_device *dev = (struct net_device *)data;
+	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK)dev->priv;
+	PLM_DEVICE_BLOCK pDevice = (PLM_DEVICE_BLOCK) pUmDevice;
+	unsigned long flags = 0;
+	LM_UINT32 value32;
+
+	if (!pUmDevice->opened)
+		return;
+
+	if (atomic_read(&pUmDevice->intr_sem) || pUmDevice->suspended) {
+		pUmDevice->timer.expires = RUN_AT(pUmDevice->timer_interval);
+		add_timer(&pUmDevice->timer);
+		return;
+	}
+
+	if (T3_ASIC_5705_OR_5750(pDevice->ChipRevId) &&
+		(pDevice->LinkStatus == LM_STATUS_LINK_ACTIVE) &&
+		(--pUmDevice->stats_interval <= 0)) {
+
+		BCM5700_LOCK(pUmDevice, flags);
+		LM_GetStats(pDevice);
+		BCM5700_UNLOCK(pUmDevice, flags);
+		pUmDevice->stats_interval = HZ / pUmDevice->timer_interval;
+	}
+
+#if INCLUDE_TBI_SUPPORT
+	if ((pDevice->TbiFlags & TBI_POLLING_FLAGS) &&
+		(--pUmDevice->poll_tbi_expiry <= 0)) {
+
+		BCM5700_PHY_LOCK(pUmDevice, flags);
+		value32 = REG_RD(pDevice, MacCtrl.Status);
+		if (((pDevice->LinkStatus == LM_STATUS_LINK_ACTIVE) &&
+			((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))))
+		{
+			LM_SetupPhy(pDevice);
+		}
+		BCM5700_PHY_UNLOCK(pUmDevice, flags);
+		pUmDevice->poll_tbi_expiry = pUmDevice->poll_tbi_interval;
+		
+        }
+#endif
+
+	if (pUmDevice->delayed_link_ind > 0) {
+		if (pUmDevice->delayed_link_ind == 1)
+			MM_IndicateStatus(pDevice, pDevice->LinkStatus);
+		else
+			pUmDevice->delayed_link_ind--;
+	}
+	if (pUmDevice->adapter_just_inited > 0) {
+		pUmDevice->adapter_just_inited--;
+	}
+
+	if (pUmDevice->crc_counter_expiry > 0)
+		pUmDevice->crc_counter_expiry--;
+
+	if (!pUmDevice->interrupt) {
+		if (!(pDevice->Flags & USE_TAGGED_STATUS_FLAG)) {
+			BCM5700_LOCK(pUmDevice, flags);
+			if (pDevice->pStatusBlkVirt->Status & STATUS_BLOCK_UPDATED) {
+				/* This will generate an interrupt */
+				REG_WR(pDevice, Grc.LocalCtrl,
+					pDevice->GrcLocalCtrl |
+					GRC_MISC_LOCAL_CTRL_SET_INT);
+			}
+			else {
+				REG_WR(pDevice, HostCoalesce.Mode,
+					pDevice->CoalesceMode |
+					HOST_COALESCE_ENABLE |
+					HOST_COALESCE_NOW);
+			}
+			if (!(REG_RD(pDevice, DmaWrite.Mode) &
+				DMA_WRITE_MODE_ENABLE)) {
+				BCM5700_UNLOCK(pUmDevice, flags);
+				bcm5700_reset(dev);
+			}
+			else {
+				BCM5700_UNLOCK(pUmDevice, flags);
+			}
+			if (pUmDevice->tx_queued) {
+				pUmDevice->tx_queued = 0;
+				netif_wake_queue(dev);
+			}
+		}
+#if (LINUX_VERSION_CODE < 0x02032b)
+		if ((QQ_GetEntryCnt(&pDevice->TxPacketFreeQ.Container) !=
+			pDevice->TxPacketDescCnt) &&
+			((jiffies - dev->trans_start) > TX_TIMEOUT)) {
+
+			printk(KERN_WARNING "%s: Tx hung\n", dev->name);
+			bcm5700_reset(dev);
+		}
+#endif
+	}
+#ifdef BCM_INT_COAL
+#ifndef BCM_NAPI_RXPOLL
+	if (pUmDevice->adaptive_coalesce) {
+		pUmDevice->adaptive_expiry--;
+		if (pUmDevice->adaptive_expiry == 0) {	
+			pUmDevice->adaptive_expiry = HZ /
+				pUmDevice->timer_interval;
+			bcm5700_adapt_coalesce(pUmDevice);
+		}
+	}
+#endif
+#endif
+	if (QQ_GetEntryCnt(&pUmDevice->rx_out_of_buf_q.Container) >
+		(unsigned int) pUmDevice->rx_buf_repl_panic_thresh) {
+		/* Generate interrupt and let isr allocate buffers */
+		REG_WR(pDevice, HostCoalesce.Mode, pDevice->CoalesceMode |
+			HOST_COALESCE_ENABLE | HOST_COALESCE_NOW);
+	}
+
+#ifdef BCM_ASF
+	if (pDevice->AsfFlags & ASF_ENABLED) {
+		pUmDevice->asf_heartbeat--;
+		if (pUmDevice->asf_heartbeat == 0) {
+			MEM_WR_OFFSET(pDevice, T3_CMD_MAILBOX,
+				T3_CMD_NICDRV_ALIVE);
+			MEM_WR_OFFSET(pDevice, T3_CMD_LENGTH_MAILBOX, 4);
+			MEM_WR_OFFSET(pDevice, T3_CMD_DATA_MAILBOX, 3);
+			value32 = REG_RD(pDevice, Grc.RxCpuEvent);
+			REG_WR(pDevice, Grc.RxCpuEvent, value32 | BIT_14);
+			pUmDevice->asf_heartbeat = (120 * HZ) /
+				pUmDevice->timer_interval;
+		}
+	}
+#endif
+
+	pUmDevice->timer.expires = RUN_AT(pUmDevice->timer_interval);
+	add_timer(&pUmDevice->timer);
+}
+
+STATIC int
+bcm5700_init_counters(PUM_DEVICE_BLOCK pUmDevice)
+{
+#ifdef BCM_INT_COAL
+#ifndef BCM_NAPI_RXPOLL
+	LM_DEVICE_BLOCK *pDevice = &pUmDevice->lm_dev;
+
+	pUmDevice->rx_curr_coalesce_frames = pDevice->RxMaxCoalescedFrames;
+	pUmDevice->rx_curr_coalesce_ticks = pDevice->RxCoalescingTicks;
+	pUmDevice->tx_curr_coalesce_frames = pDevice->TxMaxCoalescedFrames;
+	pUmDevice->rx_last_cnt = 0;
+	pUmDevice->tx_last_cnt = 0;
+#endif
+#endif
+	pUmDevice->phy_crc_count = 0;
+#if TIGON3_DEBUG
+	pUmDevice->tx_zc_count = 0;
+	pUmDevice->tx_chksum_count = 0;
+	pUmDevice->tx_himem_count = 0;
+	pUmDevice->rx_good_chksum_count = 0;
+	pUmDevice->rx_bad_chksum_count = 0;
+#endif
+#ifdef BCM_TSO
+	pUmDevice->tso_pkt_count = 0;
+#endif
+	return 0;
+}
+
+#ifdef BCM_INT_COAL
+#ifndef BCM_NAPI_RXPOLL
+STATIC int
+bcm5700_do_adapt_coalesce(PUM_DEVICE_BLOCK pUmDevice,
+	int rx_frames, int rx_ticks, int tx_frames, int rx_frames_intr)
+{
+	unsigned long flags = 0;
+	LM_DEVICE_BLOCK *pDevice = &pUmDevice->lm_dev;
+
+	if (pUmDevice->do_global_lock) {
+		if (spin_is_locked(&pUmDevice->global_lock))
+			return 0;
+		spin_lock_irqsave(&pUmDevice->global_lock, flags);
+	}
+	pUmDevice->rx_curr_coalesce_frames = rx_frames;
+	pUmDevice->rx_curr_coalesce_ticks = rx_ticks;
+	pUmDevice->tx_curr_coalesce_frames = tx_frames;
+	pUmDevice->rx_curr_coalesce_frames_intr = rx_frames_intr;
+	REG_WR(pDevice, HostCoalesce.RxMaxCoalescedFrames, rx_frames);
+
+	REG_WR(pDevice, HostCoalesce.RxCoalescingTicks, rx_ticks);
+
+	REG_WR(pDevice, HostCoalesce.TxMaxCoalescedFrames, tx_frames);
+
+	REG_WR(pDevice, HostCoalesce.RxMaxCoalescedFramesDuringInt,
+		rx_frames_intr);
+
+	BCM5700_UNLOCK(pUmDevice, flags);
+	return 0;
+}
+
+STATIC int
+bcm5700_adapt_coalesce(PUM_DEVICE_BLOCK pUmDevice)
+{
+	PLM_DEVICE_BLOCK pDevice = &pUmDevice->lm_dev;
+	uint rx_curr_cnt, tx_curr_cnt, rx_delta, tx_delta, total_delta;
+
+	rx_curr_cnt = pDevice->pStatsBlkVirt->ifHCInUcastPkts.Low;
+	tx_curr_cnt = pDevice->pStatsBlkVirt->ifHCOutUcastPkts.Low;
+	if ((rx_curr_cnt <= pUmDevice->rx_last_cnt) ||
+		(tx_curr_cnt < pUmDevice->tx_last_cnt)) {
+
+		/* skip if there is counter rollover */
+		pUmDevice->rx_last_cnt = rx_curr_cnt;
+		pUmDevice->tx_last_cnt = tx_curr_cnt;
+		return 0;
+	}
+
+	rx_delta = rx_curr_cnt - pUmDevice->rx_last_cnt;
+	tx_delta = tx_curr_cnt - pUmDevice->tx_last_cnt;
+	total_delta = (((rx_delta + rx_delta) + tx_delta) / 3) << 1;
+
+	pUmDevice->rx_last_cnt = rx_curr_cnt;
+	pUmDevice->tx_last_cnt = tx_curr_cnt;
+
+	if (total_delta < ADAPTIVE_LO_PKT_THRESH) {
+		if (pUmDevice->rx_curr_coalesce_frames !=
+			ADAPTIVE_LO_RX_MAX_COALESCED_FRAMES) {
+
+			bcm5700_do_adapt_coalesce(pUmDevice,
+				ADAPTIVE_LO_RX_MAX_COALESCED_FRAMES,
+				ADAPTIVE_LO_RX_COALESCING_TICKS,
+				ADAPTIVE_LO_TX_MAX_COALESCED_FRAMES,
+				ADAPTIVE_LO_RX_MAX_COALESCED_FRAMES_DURING_INT);
+		}
+	}
+	else if (total_delta < ADAPTIVE_HI_PKT_THRESH) {
+		if (pUmDevice->rx_curr_coalesce_frames !=
+			DEFAULT_RX_MAX_COALESCED_FRAMES) {
+
+			bcm5700_do_adapt_coalesce(pUmDevice,
+				DEFAULT_RX_MAX_COALESCED_FRAMES,
+				DEFAULT_RX_COALESCING_TICKS,
+				DEFAULT_TX_MAX_COALESCED_FRAMES,
+				DEFAULT_RX_MAX_COALESCED_FRAMES_DURING_INT);
+		}
+	}
+	else {
+		if (pUmDevice->rx_curr_coalesce_frames !=
+			ADAPTIVE_HI_RX_MAX_COALESCED_FRAMES) {
+
+			bcm5700_do_adapt_coalesce(pUmDevice,
+				ADAPTIVE_HI_RX_MAX_COALESCED_FRAMES,
+				ADAPTIVE_HI_RX_COALESCING_TICKS,
+				ADAPTIVE_HI_TX_MAX_COALESCED_FRAMES,
+				ADAPTIVE_HI_RX_MAX_COALESCED_FRAMES_DURING_INT);
+		}
+	}
+	return 0;
+}
+#endif
+#endif
+
+STATIC void
+bcm5700_reset(struct net_device *dev)
+{
+	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK)dev->priv;
+	PLM_DEVICE_BLOCK pDevice = (PLM_DEVICE_BLOCK) pUmDevice;
+	unsigned long flags;
+
+	netif_stop_queue(dev);
+	bcm5700_intr_off(pUmDevice);
+	BCM5700_PHY_LOCK(pUmDevice, flags);
+	LM_ResetAdapter(pDevice);	
+	pDevice->InitDone = TRUE;
+	bcm5700_set_vlan_mode(pUmDevice);
+	bcm5700_init_counters(pUmDevice);
+	if (memcmp(dev->dev_addr, pDevice->NodeAddress, 6)) {
+		LM_SetMacAddress(pDevice, dev->dev_addr);
+	}
+	BCM5700_PHY_UNLOCK(pUmDevice, flags);
+	atomic_set(&pUmDevice->intr_sem, 1);
+	bcm5700_intr_on(pUmDevice);
+	netif_wake_queue(dev);
+}
+
+STATIC void
+bcm5700_set_vlan_mode(UM_DEVICE_BLOCK *pUmDevice)
+{
+	LM_DEVICE_BLOCK *pDevice = &pUmDevice->lm_dev;
+	LM_UINT32 ReceiveMask = pDevice->ReceiveMask;
+	int vlan_tag_mode = pUmDevice->vlan_tag_mode;
+
+	if (vlan_tag_mode == VLAN_TAG_MODE_AUTO_STRIP) {
+	        if (pDevice->AsfFlags & ASF_ENABLED) {
+			vlan_tag_mode = VLAN_TAG_MODE_FORCED_STRIP;
+		}
+		else {
+			vlan_tag_mode = VLAN_TAG_MODE_NORMAL_STRIP;
+		}
+	}
+	if (vlan_tag_mode == VLAN_TAG_MODE_NORMAL_STRIP) {
+		ReceiveMask |= LM_KEEP_VLAN_TAG;
+#ifdef BCM_VLAN
+		if (pUmDevice->vlgrp)
+			ReceiveMask &= ~LM_KEEP_VLAN_TAG;
+#endif
+#ifdef NICE_SUPPORT
+		if (pUmDevice->nice_rx)
+			ReceiveMask &= ~LM_KEEP_VLAN_TAG;
+#endif
+	}
+	else if (vlan_tag_mode == VLAN_TAG_MODE_FORCED_STRIP) {
+		ReceiveMask &= ~LM_KEEP_VLAN_TAG;
+	}
+	if (ReceiveMask != pDevice->ReceiveMask)
+	{
+		LM_SetReceiveMask(pDevice, ReceiveMask);
+	}
+}
+
+static void
+bcm5700_poll_wait(UM_DEVICE_BLOCK *pUmDevice)
+{
+#ifdef BCM_NAPI_RXPOLL
+	while (pUmDevice->lm_dev.RxPoll) {
+		current->state = TASK_INTERRUPTIBLE;
+		schedule_timeout(1);
+	}
+#endif
+}
+
+
+#ifdef BCM_VLAN
+STATIC void
+bcm5700_vlan_rx_register(struct net_device *dev, struct vlan_group *vlgrp)
+{
+	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK) dev->priv;
+
+	bcm5700_intr_off(pUmDevice);
+	bcm5700_poll_wait(pUmDevice);
+	pUmDevice->vlgrp = vlgrp;
+	bcm5700_set_vlan_mode(pUmDevice);
+	bcm5700_intr_on(pUmDevice);
+}
+
+STATIC void
+bcm5700_vlan_rx_kill_vid(struct net_device *dev, uint16_t vid)
+{
+	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK) dev->priv;
+
+	bcm5700_intr_off(pUmDevice);
+	bcm5700_poll_wait(pUmDevice);
+	if (pUmDevice->vlgrp) {
+		pUmDevice->vlgrp->vlan_devices[vid] = NULL;
+	}
+	bcm5700_intr_on(pUmDevice);
+}
+#endif
+
+STATIC int
+bcm5700_start_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK)dev->priv;
+	PLM_DEVICE_BLOCK pDevice = (PLM_DEVICE_BLOCK) pUmDevice;
+	PLM_PACKET pPacket;
+	PUM_PACKET pUmPacket;
+	unsigned long flags = 0;
+	int frag_no;
+#ifdef NICE_SUPPORT
+	vlan_tag_t *vlan_tag;
+#endif
+#ifdef BCM_TSO
+	LM_UINT32 mss;
+	uint16_t ip_tcp_len, tcp_opt_len, tcp_seg_flags;
+#endif
+
+	if ((pDevice->LinkStatus == LM_STATUS_LINK_DOWN) ||
+		!pDevice->InitDone || pUmDevice->suspended)
+	{
+		dev_kfree_skb(skb);
+		return 0;
+	}
+	
+#if (LINUX_VERSION_CODE < 0x02032b)
+	if (test_and_set_bit(0, &dev->tbusy)) {
+		return 1;
+	}
+#endif
+
+	if (pUmDevice->do_global_lock && pUmDevice->interrupt) {
+		netif_stop_queue(dev);
+		pUmDevice->tx_queued = 1;
+		if (!pUmDevice->interrupt) {
+			netif_wake_queue(dev);
+			pUmDevice->tx_queued = 0;
+		}
+		return 1;
+	}
+
+	pPacket = (PLM_PACKET)
+		QQ_PopHead(&pDevice->TxPacketFreeQ.Container);
+	if (pPacket == 0) {
+		netif_stop_queue(dev);
+		pUmDevice->tx_full = 1;
+		if (QQ_GetEntryCnt(&pDevice->TxPacketFreeQ.Container)) {
+			netif_wake_queue(dev);
+			pUmDevice->tx_full = 0;
+		}
+		return 1;
+	}
+	pUmPacket = (PUM_PACKET) pPacket;
+	pUmPacket->skbuff = skb;
+
+	if (skb->ip_summed == CHECKSUM_HW) {
+		pPacket->Flags = SND_BD_FLAG_TCP_UDP_CKSUM;
+#if TIGON3_DEBUG
+		pUmDevice->tx_chksum_count++;
+#endif
+	}
+	else {
+		pPacket->Flags = 0;
+	}
+#if MAX_SKB_FRAGS
+	frag_no = skb_shinfo(skb)->nr_frags;
+#else
+	frag_no = 0;
+#endif
+	if (atomic_read(&pDevice->SendBdLeft) < (frag_no + 1)) {
+		netif_stop_queue(dev);
+		pUmDevice->tx_full = 1;
+		QQ_PushHead(&pDevice->TxPacketFreeQ.Container, pPacket);
+		if (atomic_read(&pDevice->SendBdLeft) >= (frag_no + 1)) {
+			netif_wake_queue(dev);
+			pUmDevice->tx_full = 0;
+		}
+		return 1;
+	}
+
+	pPacket->u.Tx.FragCount = frag_no + 1;
+#if TIGON3_DEBUG
+	if (pPacket->u.Tx.FragCount > 1)
+		pUmDevice->tx_zc_count++;
+#endif
+
+#ifdef BCM_VLAN
+	if (pUmDevice->vlgrp && vlan_tx_tag_present(skb)) {
+		pPacket->VlanTag = vlan_tx_tag_get(skb);
+		pPacket->Flags |= SND_BD_FLAG_VLAN_TAG;
+	}
+#endif
+#ifdef NICE_SUPPORT
+	vlan_tag = (vlan_tag_t *) &skb->cb[0];
+	if (vlan_tag->signature == 0x5555) {
+		pPacket->VlanTag = vlan_tag->tag;
+		pPacket->Flags |= SND_BD_FLAG_VLAN_TAG;
+		vlan_tag->signature = 0;
+	}
+#endif
+
+#ifdef BCM_TSO
+	if ((mss = (LM_UINT32) skb_shinfo(skb)->tso_size) &&
+		(skb->len > pDevice->TxMtu)) {
+
+		pUmDevice->tso_pkt_count++;
+
+		pPacket->Flags |= SND_BD_FLAG_CPU_PRE_DMA |
+			SND_BD_FLAG_CPU_POST_DMA;
+
+		tcp_opt_len = 0;
+		if (skb->h.th->doff > 5) {
+			tcp_opt_len = (skb->h.th->doff - 5) << 2;
+		}
+		ip_tcp_len = (skb->nh.iph->ihl << 2) + sizeof(struct tcphdr);
+		skb->nh.iph->check = 0;
+
+		if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5750) {
+			skb->h.th->check = 0;
+			pPacket->Flags &= ~SND_BD_FLAG_TCP_UDP_CKSUM;
+		}
+		else {
+			skb->h.th->check = ~csum_tcpudp_magic(
+				skb->nh.iph->saddr, skb->nh.iph->daddr,
+				0, IPPROTO_TCP, 0);
+		}
+
+		skb->nh.iph->tot_len = htons(mss + ip_tcp_len + tcp_opt_len);
+		tcp_seg_flags = 0;
+		if (tcp_opt_len || (skb->nh.iph->ihl > 5)) {
+			if (T3_ASIC_5705_OR_5750(pDevice->ChipRevId)) {
+				tcp_seg_flags =
+					((skb->nh.iph->ihl - 5) +
+					(tcp_opt_len >> 2)) << 11;
+			}
+			else {
+				pPacket->Flags |=
+					((skb->nh.iph->ihl - 5) +
+					(tcp_opt_len >> 2)) << 12;
+			}
+		}
+		pPacket->u.Tx.MaxSegmentSize = mss | tcp_seg_flags;
+	}
+	else
+	{
+		pPacket->u.Tx.MaxSegmentSize = 0;
+	}
+#endif
+	BCM5700_LOCK(pUmDevice, flags);
+	LM_SendPacket(pDevice, pPacket);
+	BCM5700_UNLOCK(pUmDevice, flags);
+
+#if (LINUX_VERSION_CODE < 0x02032b)
+	netif_wake_queue(dev);
+#endif
+	dev->trans_start = jiffies;
+	return 0;
+}
+
+#ifdef BCM_NAPI_RXPOLL
+STATIC int
+bcm5700_poll(struct net_device *dev, int *budget)
+{
+	int orig_budget = *budget;
+	int work_done;
+	UM_DEVICE_BLOCK *pUmDevice = (UM_DEVICE_BLOCK *) dev->priv;
+	LM_DEVICE_BLOCK *pDevice = &pUmDevice->lm_dev;
+	unsigned long flags = 0;
+	LM_UINT32 tag;
+
+	if (orig_budget > dev->quota)
+		orig_budget = dev->quota;
+
+	BCM5700_LOCK(pUmDevice, flags);
+	work_done = LM_ServiceRxPoll(pDevice, orig_budget);
+	*budget -= work_done;
+	dev->quota -= work_done;
+
+	if (QQ_GetEntryCnt(&pUmDevice->rx_out_of_buf_q.Container)) {
+		replenish_rx_buffers(pUmDevice, 0);
+	}
+	BCM5700_UNLOCK(pUmDevice, flags);
+	if (work_done) {
+		MM_IndicateRxPackets(pDevice);
+		BCM5700_LOCK(pUmDevice, flags);
+		LM_QueueRxPackets(pDevice);
+		BCM5700_UNLOCK(pUmDevice, flags);
+	}
+	if ((work_done < orig_budget) || atomic_read(&pUmDevice->intr_sem) ||
+		pUmDevice->suspended) {
+
+		netif_rx_complete(dev);
+		BCM5700_LOCK(pUmDevice, flags);
+		REG_WR(pDevice, Grc.Mode, pDevice->GrcMode);
+		pDevice->RxPoll = FALSE;
+		if (pDevice->RxPoll) {
+			BCM5700_UNLOCK(pUmDevice, flags);
+			return 0;
+		}
+		/* Take care of possible missed rx interrupts */
+		REG_RD_BACK(pDevice, Grc.Mode);	/* flush the register write */
+		tag = pDevice->pStatusBlkVirt->StatusTag;
+		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);
+		}
+		/* If a new status block is pending in the WDMA state machine */
+		/* before the register write to enable the rx interrupt,      */
+		/* the new status block may DMA with no interrupt. In this    */
+		/* scenario, the tag read above will be older than the tag in */
+		/* the pending status block and writing the older tag will    */
+		/* cause interrupt to be generated.                           */
+		else if (pDevice->Flags & USE_TAGGED_STATUS_FLAG) {
+			MB_REG_WR(pDevice, Mailbox.Interrupt[0].Low,
+				tag << 24);
+			/* Make sure we service tx in case some tx interrupts */
+			/* are cleared */
+			if (atomic_read(&pDevice->SendBdLeft) <
+				(T3_SEND_RCB_ENTRY_COUNT / 2)) {
+				REG_WR(pDevice, HostCoalesce.Mode,
+					pDevice->CoalesceMode |
+					HOST_COALESCE_ENABLE |
+					HOST_COALESCE_NOW);
+			}
+		}
+		BCM5700_UNLOCK(pUmDevice, flags);
+		return 0;
+	}
+	return 1;
+}
+#endif /* BCM_NAPI_RXPOLL */
+
+STATIC irqreturn_t
+bcm5700_interrupt(int irq, void *dev_instance, struct pt_regs *regs)
+{
+	struct net_device *dev = (struct net_device *)dev_instance;
+	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK)dev->priv;
+	PLM_DEVICE_BLOCK pDevice = (PLM_DEVICE_BLOCK) pUmDevice;
+	LM_UINT32 oldtag, newtag;
+	int i, max_intr_loop;
+#ifdef BCM_TASKLET
+	int repl_buf_count;
+#endif
+	unsigned int handled = 1;
+
+	if (!pDevice->InitDone) {
+		handled = 0;
+		return IRQ_RETVAL(handled);
+	}
+
+	bcm5700_intr_lock(pUmDevice);
+	if (atomic_read(&pUmDevice->intr_sem)) {
+		MB_REG_WR(pDevice, Mailbox.Interrupt[0].Low, 1);
+#ifdef INCLUDE_5750_A0_FIX
+		if (pDevice->Flags & FLUSH_POSTED_WRITE_FLAG) {
+			MB_REG_RD(pDevice, Mailbox.Interrupt[0].Low);
+		}
+#endif
+		bcm5700_intr_unlock(pUmDevice);
+		handled = 0;
+		return IRQ_RETVAL(handled);
+	}
+
+	if (test_and_set_bit(0, (void*)&pUmDevice->interrupt)) {
+		printk(KERN_ERR "%s: Duplicate entry of the interrupt handler\n",
+			   dev->name);
+		bcm5700_intr_unlock(pUmDevice);
+		handled = 0;
+		return IRQ_RETVAL(handled);
+	}
+
+	if ((pDevice->pStatusBlkVirt->Status & STATUS_BLOCK_UPDATED) ||
+		pUmDevice->adapter_just_inited || pUmDevice->intr_test ||
+		(pUmDevice->spurious_int > 100))
+	{
+
+		pUmDevice->spurious_int = 0;
+		if (pUmDevice->intr_test) {
+			if (!(REG_RD(pDevice, PciCfg.PciState) &
+				T3_PCI_STATE_INTERRUPT_NOT_ACTIVE)) {
+				pUmDevice->intr_test_result = 1;
+			}
+			pUmDevice->intr_test = 0;
+		}
+#ifdef BCM_NAPI_RXPOLL
+		max_intr_loop = 1;
+#else
+		max_intr_loop = 50;
+#endif
+		if (pDevice->Flags & USE_TAGGED_STATUS_FLAG) {
+			MB_REG_WR(pDevice, Mailbox.Interrupt[0].Low, 1);
+#ifdef INCLUDE_5750_A0_FIX
+			if (pDevice->Flags & FLUSH_POSTED_WRITE_FLAG) {
+				MB_REG_RD(pDevice, Mailbox.Interrupt[0].Low);
+			}
+#endif
+			oldtag = pDevice->pStatusBlkVirt->StatusTag;
+
+			for (i = 0; ; i++) {
+   				pDevice->pStatusBlkVirt->Status &=
+					~STATUS_BLOCK_UPDATED;
+
+				LM_ServiceInterrupts(pDevice);
+				newtag = pDevice->pStatusBlkVirt->StatusTag;
+				if ((newtag == oldtag) || (i > max_intr_loop)) {
+					MB_REG_WR(pDevice,
+						Mailbox.Interrupt[0].Low,
+						oldtag << 24);
+#ifdef INCLUDE_5750_A0_FIX
+					if (pDevice->Flags &
+						FLUSH_POSTED_WRITE_FLAG) {
+
+						MB_REG_RD(pDevice,
+						Mailbox.Interrupt[0].Low);
+					}
+#endif
+					pDevice->LastTag = oldtag;
+					if (pDevice->Flags & UNDI_FIX_FLAG) {
+						REG_WR(pDevice, Grc.LocalCtrl,
+						pDevice->GrcLocalCtrl | 0x2);
+					}
+					break;
+				}
+				oldtag = newtag;
+			}
+		}
+		else {
+			i = 0;
+			do {
+				uint dummy;
+
+				MB_REG_WR(pDevice, Mailbox.Interrupt[0].Low, 1);
+   				pDevice->pStatusBlkVirt->Status &=
+					~STATUS_BLOCK_UPDATED;
+				LM_ServiceInterrupts(pDevice);
+				MB_REG_WR(pDevice, Mailbox.Interrupt[0].Low, 0);
+				dummy = MB_REG_RD(pDevice,
+					Mailbox.Interrupt[0].Low);
+				i++;
+			}
+			while ((pDevice->pStatusBlkVirt->Status &
+				STATUS_BLOCK_UPDATED) && (i < max_intr_loop));
+			if (pDevice->Flags & UNDI_FIX_FLAG) {
+				REG_WR(pDevice, Grc.LocalCtrl,
+					pDevice->GrcLocalCtrl | 0x2);
+			}
+		}
+	}
+	else {
+		pUmDevice->spurious_int++;
+		handled = 0;
+	}
+#ifdef BCM_TASKLET
+	repl_buf_count = QQ_GetEntryCnt(&pUmDevice->rx_out_of_buf_q.Container);
+	if (((repl_buf_count > pUmDevice->rx_buf_repl_panic_thresh) ||
+		pDevice->QueueAgain) &&
+		(!test_and_set_bit(0, &pUmDevice->tasklet_busy))) {
+
+		replenish_rx_buffers(pUmDevice,
+			pUmDevice->rx_buf_repl_isr_limit);
+		clear_bit(0, (void*)&pUmDevice->tasklet_busy);
+	}
+	else if ((repl_buf_count > pUmDevice->rx_buf_repl_thresh) &&
+		!pUmDevice->tasklet_pending) {
+
+		pUmDevice->tasklet_pending = 1;
+		tasklet_schedule(&pUmDevice->tasklet);
+	}
+#else
+#ifdef BCM_NAPI_RXPOLL
+	if (!pDevice->RxPoll &&
+		QQ_GetEntryCnt(&pUmDevice->rx_out_of_buf_q.Container)) {
+		pDevice->RxPoll = 1;
+		MM_ScheduleRxPoll(pDevice);
+	}
+#else
+	if (QQ_GetEntryCnt(&pUmDevice->rx_out_of_buf_q.Container)) {
+		replenish_rx_buffers(pUmDevice, 0);
+	}
+
+	if (QQ_GetEntryCnt(&pDevice->RxPacketFreeQ.Container) ||
+		pDevice->QueueAgain) {
+
+		LM_QueueRxPackets(pDevice);
+	}
+#endif
+#endif
+
+	clear_bit(0, (void*)&pUmDevice->interrupt);
+	bcm5700_intr_unlock(pUmDevice);
+	if (pUmDevice->tx_queued) {
+		pUmDevice->tx_queued = 0;
+		netif_wake_queue(dev);
+	}
+	return IRQ_RETVAL(handled);
+}
+
+
+#ifdef BCM_TASKLET
+STATIC void
+bcm5700_tasklet(unsigned long data)
+{
+	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK)data;
+	unsigned long flags = 0;
+
+	/* RH 7.2 Beta 3 tasklets are reentrant */
+	if (test_and_set_bit(0, &pUmDevice->tasklet_busy)) {
+		pUmDevice->tasklet_pending = 0;
+		return;
+	}
+
+	pUmDevice->tasklet_pending = 0;
+	if (pUmDevice->opened && !pUmDevice->suspended) {
+		BCM5700_LOCK(pUmDevice, flags);
+		replenish_rx_buffers(pUmDevice, 0);
+		BCM5700_UNLOCK(pUmDevice, flags);
+	}
+
+	clear_bit(0, &pUmDevice->tasklet_busy);
+}
+#endif
+
+STATIC int
+bcm5700_close(struct net_device *dev)
+{
+	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK)dev->priv;
+	PLM_DEVICE_BLOCK pDevice = (PLM_DEVICE_BLOCK) pUmDevice;
+
+#if (LINUX_VERSION_CODE < 0x02032b)
+	dev->start = 0;
+#endif
+	netif_stop_queue(dev);
+	pUmDevice->opened = 0;
+
+	if (tigon3_debug > 1)
+		printk(KERN_DEBUG "%s: Shutting down Tigon3\n",
+			   dev->name);
+
+	LM_MulticastClear(pDevice);
+	bcm5700_shutdown(pUmDevice);
+	del_timer(&pUmDevice->timer);
+
+	free_irq(dev->irq, dev);
+#if (LINUX_VERSION_CODE < 0x020300)
+	MOD_DEC_USE_COUNT;
+#endif
+#ifdef INCLUDE_5750_A0_FIX
+	if (!((pDevice->Flags & PCI_EXPRESS_FLAG) &&
+		(pDevice->ChipRevId == T3_CHIP_ID_5750_A0)))
+#endif
+	{
+
+		LM_SetPowerState(pDevice, LM_POWER_STATE_D3);
+	}
+	bcm5700_freemem(dev);
+
+	return 0;
+}
+
+STATIC int
+bcm5700_freemem(struct net_device *dev)
+{
+	int i;
+	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK)dev->priv;
+
+	for (i = 0; i < pUmDevice->mem_list_num; i++) {
+		if (pUmDevice->mem_size_list[i] == 0) {
+			kfree(pUmDevice->mem_list[i]);
+		}
+		else {
+			pci_free_consistent(pUmDevice->pdev,
+				(size_t) pUmDevice->mem_size_list[i],
+				pUmDevice->mem_list[i],
+				pUmDevice->dma_list[i]);
+		}
+	}
+	pUmDevice->mem_list_num = 0;
+
+#ifdef NICE_SUPPORT
+	if (!pUmDevice->opened) {
+		for (i = 0; i < MAX_MEM2; i++) {
+			if (pUmDevice->mem_size_list2[i]) {
+				bcm5700_freemem2(pUmDevice, i);
+			}
+		}
+	}
+#endif
+	return 0;
+}
+
+#ifdef NICE_SUPPORT
+/* Frees consistent memory allocated through ioctl */
+/* The memory to be freed is in mem_list2[index] */
+STATIC int
+bcm5700_freemem2(UM_DEVICE_BLOCK *pUmDevice, int index)
+{
+#if (LINUX_VERSION_CODE >= 0x020400)
+	void *ptr;
+	struct page *pg, *last_pg;
+
+	/* Probably won't work on some architectures */
+	ptr = pUmDevice->mem_list2[index],
+	pg = virt_to_page(ptr);
+	last_pg = virt_to_page(ptr + pUmDevice->mem_size_list2[index] - 1);
+	for (; ; pg++) {
+#if (LINUX_VERSION_CODE > 0x020500)
+		ClearPageReserved(pg);
+#else
+		mem_map_unreserve(pg);
+#endif
+		if (pg == last_pg)
+			break;
+	}
+	pci_free_consistent(pUmDevice->pdev,
+		(size_t) pUmDevice->mem_size_list2[index],
+		pUmDevice->mem_list2[index],
+		pUmDevice->dma_list2[index]);
+	pUmDevice->mem_size_list2[index] = 0;
+#endif
+	return 0;
+}
+#endif
+
+uint64_t
+bcm5700_crc_count(PUM_DEVICE_BLOCK pUmDevice)
+{
+	PLM_DEVICE_BLOCK pDevice = &pUmDevice->lm_dev;
+	LM_UINT32 Value32;
+	PT3_STATS_BLOCK pStats = (PT3_STATS_BLOCK) pDevice->pStatsBlkVirt;
+	unsigned long flags;
+
+	if ((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700 ||
+		T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701) &&
+		!(pDevice->TbiFlags & ENABLE_TBI_FLAG)) {
+
+		if (!pUmDevice->opened || !pDevice->InitDone ||
+			pUmDevice->adapter_just_inited) {
+
+			return 0;
+		}
+
+		/* regulate MDIO access during run time */
+		if (pUmDevice->crc_counter_expiry > 0)
+			return pUmDevice->phy_crc_count;
+
+		pUmDevice->crc_counter_expiry = (5 * HZ) /
+			pUmDevice->timer_interval;
+
+		BCM5700_PHY_LOCK(pUmDevice, flags);
+		LM_ReadPhy(pDevice, 0x1e, &Value32);
+		if ((Value32 & 0x8000) == 0)
+			LM_WritePhy(pDevice, 0x1e, Value32 | 0x8000);
+		LM_ReadPhy(pDevice, 0x14, &Value32);
+		BCM5700_PHY_UNLOCK(pUmDevice, flags);
+		/* Sometimes data on the MDIO bus can be corrupted */
+		if (Value32 != 0xffff)
+			pUmDevice->phy_crc_count += Value32;
+		return pUmDevice->phy_crc_count;
+	}
+	else if (pStats == 0) {
+		return 0;
+	}
+	else {
+		return (MM_GETSTATS64(pStats->dot3StatsFCSErrors));
+	}
+}
+
+uint64_t
+bcm5700_rx_err_count(UM_DEVICE_BLOCK *pUmDevice)
+{
+	LM_DEVICE_BLOCK *pDevice = &pUmDevice->lm_dev;
+	T3_STATS_BLOCK *pStats = (T3_STATS_BLOCK *) pDevice->pStatsBlkVirt;
+
+	if (pStats == 0)
+		return 0;
+	return (bcm5700_crc_count(pUmDevice) +
+		MM_GETSTATS64(pStats->dot3StatsAlignmentErrors) +
+		MM_GETSTATS64(pStats->etherStatsUndersizePkts) +
+		MM_GETSTATS64(pStats->etherStatsFragments) +
+		MM_GETSTATS64(pStats->dot3StatsFramesTooLong) +
+		MM_GETSTATS64(pStats->etherStatsJabbers));
+}
+
+STATIC struct net_device_stats *
+bcm5700_get_stats(struct net_device *dev)
+{
+	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK)dev->priv;
+	PLM_DEVICE_BLOCK pDevice = (PLM_DEVICE_BLOCK) pUmDevice;
+	PT3_STATS_BLOCK pStats = (PT3_STATS_BLOCK) pDevice->pStatsBlkVirt;
+	struct net_device_stats *p_netstats = &pUmDevice->stats;
+
+	if (pStats == 0)
+		return p_netstats;
+
+	/* Get stats from LM */
+	p_netstats->rx_packets =
+		MM_GETSTATS(pStats->ifHCInUcastPkts) +
+		MM_GETSTATS(pStats->ifHCInMulticastPkts) +
+		MM_GETSTATS(pStats->ifHCInBroadcastPkts);
+	p_netstats->tx_packets = 
+		MM_GETSTATS(pStats->ifHCOutUcastPkts) +
+		MM_GETSTATS(pStats->ifHCOutMulticastPkts) +
+		MM_GETSTATS(pStats->ifHCOutBroadcastPkts);
+	p_netstats->rx_bytes = MM_GETSTATS(pStats->ifHCInOctets);
+	p_netstats->tx_bytes = MM_GETSTATS(pStats->ifHCOutOctets);
+	p_netstats->tx_errors =
+		MM_GETSTATS(pStats->dot3StatsInternalMacTransmitErrors) +
+		MM_GETSTATS(pStats->dot3StatsCarrierSenseErrors) +
+		MM_GETSTATS(pStats->ifOutDiscards) +
+		MM_GETSTATS(pStats->ifOutErrors);
+	p_netstats->multicast = MM_GETSTATS(pStats->ifHCInMulticastPkts);
+	p_netstats->collisions = MM_GETSTATS(pStats->etherStatsCollisions);
+	p_netstats->rx_length_errors =
+		MM_GETSTATS(pStats->dot3StatsFramesTooLong) +
+		MM_GETSTATS(pStats->etherStatsUndersizePkts);
+	p_netstats->rx_over_errors = MM_GETSTATS(pStats->nicNoMoreRxBDs);
+	p_netstats->rx_frame_errors =
+		MM_GETSTATS(pStats->dot3StatsAlignmentErrors);
+	p_netstats->rx_crc_errors = (unsigned long)
+		bcm5700_crc_count(pUmDevice);
+	p_netstats->rx_errors = (unsigned long)
+		bcm5700_rx_err_count(pUmDevice);
+	
+	p_netstats->tx_aborted_errors = MM_GETSTATS(pStats->ifOutDiscards);
+	p_netstats->tx_carrier_errors =
+		MM_GETSTATS(pStats->dot3StatsCarrierSenseErrors);
+
+	return p_netstats;
+}
+
+void
+b57_suspend_chip(UM_DEVICE_BLOCK *pUmDevice)
+{
+	LM_DEVICE_BLOCK *pDevice = &pUmDevice->lm_dev;
+
+	if (pUmDevice->opened) {
+		bcm5700_intr_off(pUmDevice);
+		netif_carrier_off(pUmDevice->dev);
+		netif_stop_queue(pUmDevice->dev);
+#ifdef BCM_TASKLET
+		tasklet_kill(&pUmDevice->tasklet);
+#endif
+		bcm5700_poll_wait(pUmDevice);
+	}
+	pUmDevice->suspended = 1;
+	LM_ShutdownChip(pDevice, LM_SUSPEND_RESET);
+}
+
+void
+b57_resume_chip(UM_DEVICE_BLOCK *pUmDevice)
+{
+	LM_DEVICE_BLOCK *pDevice = &pUmDevice->lm_dev;
+
+	if (pUmDevice->suspended) {
+		pUmDevice->suspended = 0;
+		if (pUmDevice->opened) {
+			bcm5700_reset(pUmDevice->dev);
+		}
+		else {
+			LM_ShutdownChip(pDevice, LM_SHUTDOWN_RESET);
+		}
+	}
+}
+
+/* Returns 0 on failure, 1 on success */
+int
+b57_test_intr(UM_DEVICE_BLOCK *pUmDevice)
+{
+	LM_DEVICE_BLOCK *pDevice = &pUmDevice->lm_dev;
+	int j;
+
+	if (!pUmDevice->opened)
+		return 0;
+	pUmDevice->intr_test_result = 0;
+	pUmDevice->intr_test = 1;
+	REG_WR(pDevice, Grc.LocalCtrl, pDevice->GrcLocalCtrl |
+		GRC_MISC_LOCAL_CTRL_SET_INT);
+	for (j = 0; j < 10; j++) {
+		if (pUmDevice->intr_test_result)
+			break;
+		REG_WR(pDevice, Grc.LocalCtrl, pDevice->GrcLocalCtrl |
+			GRC_MISC_LOCAL_CTRL_SET_INT);
+		MM_Sleep(pDevice, 1);
+	}
+	return pUmDevice->intr_test_result;
+}
+
+#ifdef SIOCETHTOOL
+
+#ifdef ETHTOOL_GSTRINGS
+
+#define ETH_NUM_STATS 30
+#define RX_CRC_IDX 5
+#define RX_MAC_ERR_IDX 14
+
+struct {
+	char string[ETH_GSTRING_LEN];
+} bcm5700_stats_str_arr[ETH_NUM_STATS] = {
+	{ "rx_unicast_packets" },
+	{ "rx_multicast_packets" },
+	{ "rx_broadcast_packets" },
+	{ "rx_bytes" },
+	{ "rx_fragments" },
+	{ "rx_crc_errors" },	/* this needs to be calculated */
+	{ "rx_align_errors" },
+	{ "rx_xon_frames" },
+	{ "rx_xoff_frames" },
+	{ "rx_long_frames" },
+	{ "rx_short_frames" },
+	{ "rx_jabber" },
+	{ "rx_discards" },
+	{ "rx_errors" },
+	{ "rx_mac_errors" },	/* this needs to be calculated */
+	{ "tx_unicast_packets" },
+	{ "tx_multicast_packets" },
+	{ "tx_broadcast_packets" },
+	{ "tx_bytes" },
+	{ "tx_deferred" },
+	{ "tx_single_collisions" },
+	{ "tx_multi_collisions" },
+	{ "tx_total_collisions" },
+	{ "tx_excess_collisions" },
+	{ "tx_late_collisions" },
+	{ "tx_xon_frames" },
+	{ "tx_xoff_frames" },
+	{ "tx_internal_mac_errors" },
+	{ "tx_carrier_errors" },
+	{ "tx_errors" },
+};
+
+#define STATS_OFFSET(offset_name) ((OFFSETOF(T3_STATS_BLOCK, offset_name)) / sizeof(uint64_t))
+
+#ifdef __BIG_ENDIAN
+#define SWAP_DWORD_64(x) (x)
+#else
+#define SWAP_DWORD_64(x) ((x << 32) | (x >> 32))
+#endif
+
+unsigned long bcm5700_stats_offset_arr[ETH_NUM_STATS] = {
+	STATS_OFFSET(ifHCInUcastPkts),
+	STATS_OFFSET(ifHCInMulticastPkts),
+	STATS_OFFSET(ifHCInBroadcastPkts),
+	STATS_OFFSET(ifHCInOctets),
+	STATS_OFFSET(etherStatsFragments),
+	0,
+	STATS_OFFSET(dot3StatsAlignmentErrors),
+	STATS_OFFSET(xonPauseFramesReceived),
+	STATS_OFFSET(xoffPauseFramesReceived),
+	STATS_OFFSET(dot3StatsFramesTooLong),
+	STATS_OFFSET(etherStatsUndersizePkts),
+	STATS_OFFSET(etherStatsJabbers),
+	STATS_OFFSET(ifInDiscards),
+	STATS_OFFSET(ifInErrors),
+	0,
+	STATS_OFFSET(ifHCOutUcastPkts),
+	STATS_OFFSET(ifHCOutMulticastPkts),
+	STATS_OFFSET(ifHCOutBroadcastPkts),
+	STATS_OFFSET(ifHCOutOctets),
+	STATS_OFFSET(dot3StatsDeferredTransmissions),
+	STATS_OFFSET(dot3StatsSingleCollisionFrames),
+	STATS_OFFSET(dot3StatsMultipleCollisionFrames),
+	STATS_OFFSET(etherStatsCollisions),
+	STATS_OFFSET(dot3StatsExcessiveCollisions),
+	STATS_OFFSET(dot3StatsLateCollisions),
+	STATS_OFFSET(outXonSent),
+	STATS_OFFSET(outXoffSent),
+	STATS_OFFSET(dot3StatsInternalMacTransmitErrors),
+	STATS_OFFSET(dot3StatsCarrierSenseErrors),
+	STATS_OFFSET(ifOutErrors),
+};
+
+#endif /* ETHTOOL_GSTRINGS */
+
+#ifdef ETHTOOL_TEST
+#define ETH_NUM_TESTS 6
+struct {
+	char string[ETH_GSTRING_LEN];
+} bcm5700_tests_str_arr[ETH_NUM_STATS] = {
+	{ "register test (offline)" },
+	{ "memory test (offline)" },
+	{ "loopback test (offline)" },
+	{ "nvram test (online)" },
+	{ "interrupt test (online)" },
+	{ "link test (online)" },
+};
+
+extern LM_STATUS b57_test_registers(UM_DEVICE_BLOCK *pUmDevice);
+extern LM_STATUS b57_test_memory(UM_DEVICE_BLOCK *pUmDevice);
+extern LM_STATUS b57_test_nvram(UM_DEVICE_BLOCK *pUmDevice);
+extern LM_STATUS b57_test_link(UM_DEVICE_BLOCK *pUmDevice);
+extern LM_STATUS b57_test_loopback(UM_DEVICE_BLOCK *pUmDevice);
+#endif
+
+#ifdef ETHTOOL_GREGS
+#if (LINUX_VERSION_CODE >= 0x02040f)
+static void
+bcm5700_get_reg_blk(UM_DEVICE_BLOCK *pUmDevice, u32 **buf, u32 start, u32 end,
+		int reserved)
+{
+	u32 offset;
+	LM_DEVICE_BLOCK *pDevice = &pUmDevice->lm_dev;
+
+	if (reserved) {
+		memset(*buf, 0, end - start);
+		*buf = *buf + (end - start)/4;
+		return;
+	}
+	for (offset = start; offset < end; offset+=4, *buf = *buf + 1) {
+		if (T3_ASIC_5705_OR_5750(pDevice->ChipRevId)) {
+			if (((offset >= 0x3400) && (offset < 0x3c00)) ||
+				((offset >= 0x5400) && (offset < 0x5800)) ||
+				((offset >= 0x6400) && (offset < 0x6800))) {
+				**buf = 0;
+				continue;
+			}
+		}
+		**buf = REG_RD_OFFSET(pDevice, offset);
+	}
+}
+#endif
+#endif
+
+static int netdev_ethtool_ioctl(struct net_device *dev, void *useraddr)
+{
+	struct ethtool_cmd ethcmd;
+	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK)dev->priv;
+	PLM_DEVICE_BLOCK pDevice = (PLM_DEVICE_BLOCK) pUmDevice;
+		
+	if (copy_from_user(&ethcmd, useraddr, sizeof(ethcmd)))
+		return -EFAULT;
+
+        switch (ethcmd.cmd) {
+#ifdef ETHTOOL_GDRVINFO
+        case ETHTOOL_GDRVINFO: {
+		struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO};
+
+		strcpy(info.driver,  bcm5700_driver);
+#if INCLUDE_5701_AX_FIX
+		if(pDevice->ChipRevId == T3_CHIP_ID_5701_A0) {
+			extern int t3FwReleaseMajor;
+			extern int t3FwReleaseMinor;
+			extern int t3FwReleaseFix;
+
+			sprintf(info.fw_version, "%i.%i.%i",
+				t3FwReleaseMajor, t3FwReleaseMinor, 
+				t3FwReleaseFix);
+		}
+#endif
+		strcpy(info.version, bcm5700_version);
+		strcpy(info.bus_info, pUmDevice->pdev->slot_name);
+#ifdef ETHTOOL_GEEPROM
+		BCM_EEDUMP_LEN(&info, pDevice->NvramSize);
+#endif
+#ifdef ETHTOOL_GREGS
+		/* dump everything, including holes in the register space */
+		info.regdump_len = 0x6c00;
+#endif
+#ifdef ETHTOOL_GSTATS
+		info.n_stats = ETH_NUM_STATS;
+#endif
+#ifdef ETHTOOL_TEST
+		info.testinfo_len = ETH_NUM_TESTS;
+#endif
+		if (copy_to_user(useraddr, &info, sizeof(info)))
+			return -EFAULT;
+		return 0;
+	}
+#endif
+        case ETHTOOL_GSET: {
+		if (pDevice->TbiFlags & ENABLE_TBI_FLAG) {
+			ethcmd.supported =
+				(SUPPORTED_1000baseT_Full |
+				SUPPORTED_Autoneg);
+			ethcmd.supported |= SUPPORTED_FIBRE;
+			ethcmd.port = PORT_FIBRE;
+		}
+		else {
+			ethcmd.supported =
+				(SUPPORTED_10baseT_Half |
+				SUPPORTED_10baseT_Full |
+				SUPPORTED_100baseT_Half |
+				SUPPORTED_100baseT_Full |
+				SUPPORTED_1000baseT_Half |
+				SUPPORTED_1000baseT_Full |
+				SUPPORTED_Autoneg);
+			ethcmd.supported |= SUPPORTED_TP;
+			ethcmd.port = PORT_TP;
+		}
+
+		ethcmd.transceiver = XCVR_INTERNAL;
+		ethcmd.phy_address = 0;
+
+		if (pUmDevice->line_speed == 1000)
+			ethcmd.speed = SPEED_1000;
+		else if (pUmDevice->line_speed == 100)
+			ethcmd.speed = SPEED_100;
+		else if (pUmDevice->line_speed == 10)
+			ethcmd.speed = SPEED_10;
+		else
+			ethcmd.speed = 0;
+
+		if (pDevice->DuplexMode == LM_DUPLEX_MODE_FULL)
+			ethcmd.duplex = DUPLEX_FULL;
+		else
+			ethcmd.duplex = DUPLEX_HALF;
+
+		if (pDevice->DisableAutoNeg == FALSE) {
+			ethcmd.autoneg = AUTONEG_ENABLE;
+			ethcmd.advertising = ADVERTISED_Autoneg;
+			if (pDevice->TbiFlags & ENABLE_TBI_FLAG) {
+				ethcmd.advertising |=
+					ADVERTISED_1000baseT_Full |
+					ADVERTISED_FIBRE;
+			}
+			else {
+				ethcmd.advertising |=
+					ADVERTISED_TP;
+				if (pDevice->advertising &
+					PHY_AN_AD_10BASET_HALF) {
+
+					ethcmd.advertising |=
+						ADVERTISED_10baseT_Half;
+				}
+				if (pDevice->advertising &
+					PHY_AN_AD_10BASET_FULL) {
+
+					ethcmd.advertising |=
+						ADVERTISED_10baseT_Full;
+				}
+				if (pDevice->advertising &
+					PHY_AN_AD_100BASETX_HALF) {
+
+					ethcmd.advertising |=
+						ADVERTISED_100baseT_Half;
+				}
+				if (pDevice->advertising &
+					PHY_AN_AD_100BASETX_FULL) {
+
+					ethcmd.advertising |=
+						ADVERTISED_100baseT_Full;
+				}
+				if (pDevice->advertising1000 &
+					BCM540X_AN_AD_1000BASET_HALF) {
+
+					ethcmd.advertising |=
+						ADVERTISED_1000baseT_Half;
+				}
+				if (pDevice->advertising1000 &
+					BCM540X_AN_AD_1000BASET_FULL) {
+
+					ethcmd.advertising |=
+						ADVERTISED_1000baseT_Full;
+				}
+			}
+		}
+		else {
+			ethcmd.autoneg = AUTONEG_DISABLE;
+			ethcmd.advertising = 0;
+		}
+
+		ethcmd.maxtxpkt = pDevice->TxMaxCoalescedFrames;
+		ethcmd.maxrxpkt = pDevice->RxMaxCoalescedFrames;
+
+		if(copy_to_user(useraddr, &ethcmd, sizeof(ethcmd)))
+			return -EFAULT;
+		return 0;
+	}
+	case ETHTOOL_SSET: {
+		unsigned long flags;
+
+		if(!capable(CAP_NET_ADMIN))
+			return -EPERM;
+		if (ethcmd.autoneg == AUTONEG_ENABLE) {
+			pDevice->RequestedLineSpeed = LM_LINE_SPEED_AUTO;
+			pDevice->RequestedDuplexMode = LM_DUPLEX_MODE_UNKNOWN;
+			pDevice->DisableAutoNeg = FALSE;
+		}
+		else {
+			if (ethcmd.speed == SPEED_1000) {
+				if (!(pDevice->TbiFlags & ENABLE_TBI_FLAG) ||
+					(pDevice->PhyFlags & PHY_NO_GIGABIT))
+					return -EINVAL;
+
+				pDevice->RequestedLineSpeed =
+					LM_LINE_SPEED_1000MBPS;
+
+				pDevice->RequestedDuplexMode =
+					LM_DUPLEX_MODE_FULL;
+			}
+			else if (ethcmd.speed == SPEED_100) {
+				pDevice->RequestedLineSpeed =
+					LM_LINE_SPEED_100MBPS;
+			}
+			else if (ethcmd.speed == SPEED_10) {
+				pDevice->RequestedLineSpeed =
+					LM_LINE_SPEED_10MBPS;
+			}
+			else {
+				return -EINVAL;
+			}
+
+			pDevice->DisableAutoNeg = TRUE;
+			if (ethcmd.duplex == DUPLEX_FULL) {
+				pDevice->RequestedDuplexMode =
+					LM_DUPLEX_MODE_FULL;
+			}
+			else {
+				pDevice->RequestedDuplexMode =
+					LM_DUPLEX_MODE_HALF;
+			}
+		}
+		BCM5700_PHY_LOCK(pUmDevice, flags);
+		LM_SetupPhy(pDevice);
+		BCM5700_PHY_UNLOCK(pUmDevice, flags);
+		return 0;
+	}
+#ifdef ETHTOOL_GWOL
+#ifdef BCM_WOL
+	case ETHTOOL_GWOL: {
+		struct ethtool_wolinfo wol = {ETHTOOL_GWOL};
+
+		if (((pDevice->TbiFlags & ENABLE_TBI_FLAG) &&
+			!(pDevice->Flags & FIBER_WOL_CAPABLE_FLAG)) ||
+			(pDevice->Flags & DISABLE_D3HOT_FLAG)) {
+			wol.supported = 0;
+			wol.wolopts = 0;
+		}
+		else {
+			wol.supported = WAKE_MAGIC;
+			if (pDevice->WakeUpMode == LM_WAKE_UP_MODE_MAGIC_PACKET)
+			{
+				wol.wolopts = WAKE_MAGIC;
+			}
+			else {
+				wol.wolopts = 0;
+			}
+		}
+		if (copy_to_user(useraddr, &wol, sizeof(wol)))
+			return -EFAULT;
+		return 0;
+	}
+	case ETHTOOL_SWOL: {
+		struct ethtool_wolinfo wol;
+
+		if(!capable(CAP_NET_ADMIN))
+			return -EPERM;
+		if (copy_from_user(&wol, useraddr, sizeof(wol)))
+			return -EFAULT;
+		if ((((pDevice->TbiFlags & ENABLE_TBI_FLAG) &&
+			!(pDevice->Flags & FIBER_WOL_CAPABLE_FLAG)) ||
+			(pDevice->Flags & DISABLE_D3HOT_FLAG)) &&
+			wol.wolopts) {
+			return -EINVAL;
+		}
+		
+		if ((wol.wolopts & ~WAKE_MAGIC) != 0) {
+			return -EINVAL;
+		}
+		if (wol.wolopts & WAKE_MAGIC) {
+			pDevice->WakeUpModeCap = LM_WAKE_UP_MODE_MAGIC_PACKET;
+			pDevice->WakeUpMode = LM_WAKE_UP_MODE_MAGIC_PACKET;
+		}
+		else {
+			pDevice->WakeUpModeCap = LM_WAKE_UP_MODE_NONE;
+			pDevice->WakeUpMode = LM_WAKE_UP_MODE_NONE;
+		}
+		return 0;
+        }
+#endif
+#endif
+#ifdef ETHTOOL_GLINK
+	case ETHTOOL_GLINK: {
+		struct ethtool_value edata = {ETHTOOL_GLINK};
+
+		/* workaround for DHCP using ifup script */
+		/* ifup only waits for 5 seconds for link up */
+		/* NIC may take more than 5 seconds to establish link */
+		if ((pUmDevice->delayed_link_ind > 0) &&
+			delay_link[pUmDevice->index])
+			return -EOPNOTSUPP;
+
+		if (pDevice->LinkStatus == LM_STATUS_LINK_ACTIVE) {
+			edata.data =  1;
+		}
+		else {
+			edata.data =  0;
+		}
+		if (copy_to_user(useraddr, &edata, sizeof(edata)))
+			return -EFAULT;
+		return 0;
+	}
+#endif
+#ifdef ETHTOOL_NWAY_RST
+	case ETHTOOL_NWAY_RST: {
+		LM_UINT32 phyctrl;
+		unsigned long flags;
+
+		if(!capable(CAP_NET_ADMIN))
+			return -EPERM;
+		if (pDevice->DisableAutoNeg) {
+			return -EINVAL;
+		}
+		BCM5700_PHY_LOCK(pUmDevice, flags);
+		if (pDevice->TbiFlags & ENABLE_TBI_FLAG) {
+			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 |
+				PHY_CTRL_RESTART_AUTO_NEG);
+		}
+		BCM5700_PHY_UNLOCK(pUmDevice, flags);
+		return 0;
+	}
+#endif
+#ifdef ETHTOOL_GEEPROM
+	case ETHTOOL_GEEPROM: {
+		struct ethtool_eeprom eeprom;
+		LM_UINT32 *buf = 0;
+		LM_UINT32 buf1[64/4];
+		int i, j, offset, len;
+
+		if (copy_from_user(&eeprom, useraddr, sizeof(eeprom)))
+			return -EFAULT;
+		
+		if (eeprom.offset >= pDevice->NvramSize)
+			return -EFAULT;
+
+		/* maximum data limited */
+		/* to read more, call again with a different offset */
+		if (eeprom.len > 0x800) {
+			eeprom.len = 0x800;
+			if (copy_to_user(useraddr, &eeprom, sizeof(eeprom)))
+				return -EFAULT;
+		}
+
+		if (eeprom.len > 64) {
+			buf = kmalloc(eeprom.len, GFP_KERNEL);
+			if (!buf)
+				return -ENOMEM;
+		}
+		else {
+			buf = buf1;
+		}
+		useraddr += offsetof(struct ethtool_eeprom, data);
+
+		offset = eeprom.offset;
+		len = eeprom.len;
+		if (offset & 3) {
+			offset &= 0xfffffffc;
+			len += (offset & 3);
+		}
+		len = (len + 3) & 0xfffffffc;
+		for (i = 0, j = 0; j < len; i++, j += 4) {
+			if (LM_NvramRead(pDevice, offset + j, buf + i) !=
+				LM_STATUS_SUCCESS) {
+				break;
+			}
+		}
+		if (j >= len) {
+			buf += (eeprom.offset & 3);
+			i = copy_to_user(useraddr, buf, eeprom.len);
+		}
+		if (eeprom.len > 64) {
+			kfree(buf);
+		}
+		if ((j < len) || i)
+			return -EFAULT;
+		return 0;
+	}
+	case ETHTOOL_SEEPROM: {
+		struct ethtool_eeprom eeprom;
+		LM_UINT32 buf[64/4];
+		int i, offset, len;
+
+		if(!capable(CAP_NET_ADMIN))
+			return -EPERM;
+		if (copy_from_user(&eeprom, useraddr, sizeof(eeprom)))
+			return -EFAULT;
+		
+		if ((eeprom.offset & 3) || (eeprom.len & 3) ||
+			(eeprom.offset >= pDevice->NvramSize)) {
+			return -EFAULT;
+		}
+
+		if ((eeprom.offset + eeprom.len) >= pDevice->NvramSize) {
+			eeprom.len = pDevice->NvramSize - eeprom.offset;
+		}
+
+		useraddr += offsetof(struct ethtool_eeprom, data);
+
+		len = eeprom.len;
+		offset = eeprom.offset;
+		for (; len > 0; ) {
+			if (len < 64)
+				i = len;
+			else
+				i = 64;
+			if (copy_from_user(&buf, useraddr, i))
+				return -EFAULT;
+
+			bcm5700_intr_off(pUmDevice);
+			/* Prevent race condition on Grc.Mode register */
+			bcm5700_poll_wait(pUmDevice);
+
+			if (LM_NvramWriteBlock(pDevice, offset, buf, i/4) !=
+				LM_STATUS_SUCCESS) {
+				bcm5700_intr_on(pUmDevice);
+				return -EFAULT;
+			}
+			bcm5700_intr_on(pUmDevice);
+			len -= i;
+			offset += i;
+			useraddr += i;
+		}
+		return 0;
+	}
+#endif
+#ifdef ETHTOOL_GREGS
+#if (LINUX_VERSION_CODE >= 0x02040f)
+	case ETHTOOL_GREGS: {
+		struct ethtool_regs eregs;
+		LM_UINT32 *buf, *buf1;
+		unsigned int i;
+
+		if(!capable(CAP_NET_ADMIN))
+			return -EPERM;
+		if (pDevice->Flags & UNDI_FIX_FLAG)
+			return -EOPNOTSUPP;
+		if (copy_from_user(&eregs, useraddr, sizeof(eregs)))
+			return -EFAULT;
+		if (eregs.len > 0x6c00)
+			eregs.len = 0x6c00;
+		eregs.version = 0x0;
+		if (copy_to_user(useraddr, &eregs, sizeof(eregs)))
+			return -EFAULT;
+		buf = buf1 = kmalloc(eregs.len, GFP_KERNEL);
+		if (!buf)
+			return -ENOMEM;
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0,      0xb0,   0);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0xb0,   0x200,  1);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x200,  0x8f0,  0);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x8f0,  0xc00,  1);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0xc00,  0xce0,  0);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0xce0,  0x1000, 1);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x1000, 0x1004, 0);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x1004, 0x1400, 1);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x1400, 0x1480, 0);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x1480, 0x1800, 1);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x1800, 0x1848, 0);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x1848, 0x1c00, 1);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x1c00, 0x1c04, 0);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x1c04, 0x2000, 1);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x2000, 0x225c, 0);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x225c, 0x2400, 1);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x2400, 0x24c4, 0);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x24c4, 0x2800, 1);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x2800, 0x2804, 0);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x2804, 0x2c00, 1);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x2c00, 0x2c20, 0);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x2c20, 0x3000, 1);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x3000, 0x3014, 0);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x3014, 0x3400, 1);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x3400, 0x3408, 0);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x3408, 0x3800, 1);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x3800, 0x3808, 0);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x3808, 0x3c00, 1);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x3c00, 0x3d00, 0);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x3d00, 0x4000, 1);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x4000, 0x4010, 0);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x4010, 0x4400, 1);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x4400, 0x4458, 0);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x4458, 0x4800, 1);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x4800, 0x4808, 0);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x4808, 0x4c00, 1);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x4c00, 0x4c08, 0);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x4c08, 0x5000, 1);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x5000, 0x5050, 0);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x5050, 0x5400, 1);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x5400, 0x5450, 0);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x5450, 0x5800, 1);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x5800, 0x5a10, 0);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x5a10, 0x6000, 1);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x6000, 0x600c, 0);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x600c, 0x6400, 1);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x6400, 0x6404, 0);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x6404, 0x6800, 1);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x6800, 0x6848, 0);
+		bcm5700_get_reg_blk(pUmDevice, &buf, 0x6848, 0x6c00, 1);
+
+		i = copy_to_user(useraddr + sizeof(eregs), buf1, eregs.len);
+		kfree(buf);
+		if (i)
+			return -EFAULT;
+		return 0;
+	}
+#endif
+#endif
+#ifdef ETHTOOL_GPAUSEPARAM
+	case ETHTOOL_GPAUSEPARAM: {
+		struct ethtool_pauseparam epause = { ETHTOOL_GPAUSEPARAM };
+
+		if (!pDevice->DisableAutoNeg) {
+			epause.autoneg = (pDevice->FlowControlCap &
+				LM_FLOW_CONTROL_AUTO_PAUSE) != 0;
+		}
+		else {
+			epause.autoneg = 0;
+		}
+		epause.rx_pause = 
+			(pDevice->FlowControl &
+			LM_FLOW_CONTROL_RECEIVE_PAUSE) != 0;
+		epause.tx_pause = 
+			(pDevice->FlowControl &
+			LM_FLOW_CONTROL_TRANSMIT_PAUSE) != 0;
+		if (copy_to_user(useraddr, &epause, sizeof(epause)))
+			return -EFAULT;
+
+		return 0;
+	}
+	case ETHTOOL_SPAUSEPARAM: {
+		struct ethtool_pauseparam epause;
+		unsigned long flags;
+
+		if(!capable(CAP_NET_ADMIN))
+			return -EPERM;
+		if (copy_from_user(&epause, useraddr, sizeof(epause)))
+			return -EFAULT;
+		pDevice->FlowControlCap = 0;
+		if (epause.autoneg && !pDevice->DisableAutoNeg) {
+			pDevice->FlowControlCap |= LM_FLOW_CONTROL_AUTO_PAUSE;
+		}
+		if (epause.rx_pause)  {
+			pDevice->FlowControlCap |=
+				LM_FLOW_CONTROL_RECEIVE_PAUSE;
+		}
+		if (epause.tx_pause)  {
+			pDevice->FlowControlCap |=
+				LM_FLOW_CONTROL_TRANSMIT_PAUSE;
+		}
+		BCM5700_PHY_LOCK(pUmDevice, flags);
+		LM_SetupPhy(pDevice);
+		BCM5700_PHY_UNLOCK(pUmDevice, flags);
+
+		return 0;
+	}
+#endif
+#ifdef ETHTOOL_GRXCSUM
+	case ETHTOOL_GRXCSUM: {
+		struct ethtool_value edata = { ETHTOOL_GRXCSUM };
+
+		edata.data = 
+			(pDevice->TaskToOffload &
+			LM_TASK_OFFLOAD_RX_TCP_CHECKSUM) != 0;
+		if (copy_to_user(useraddr, &edata, sizeof(edata)))
+			return -EFAULT;
+
+		return 0;
+	}
+	case ETHTOOL_SRXCSUM: {
+		struct ethtool_value edata;
+
+		if(!capable(CAP_NET_ADMIN))
+			return -EPERM;
+		if (copy_from_user(&edata, useraddr, sizeof(edata)))
+			return -EFAULT;
+		if (edata.data) {
+			if (!(pDevice->TaskOffloadCap &
+				LM_TASK_OFFLOAD_TX_TCP_CHECKSUM)) {
+
+				return -EINVAL;
+			}
+			pDevice->TaskToOffload |=
+				LM_TASK_OFFLOAD_RX_TCP_CHECKSUM |
+				LM_TASK_OFFLOAD_RX_UDP_CHECKSUM;
+		}
+		else {
+			pDevice->TaskToOffload &=
+				~(LM_TASK_OFFLOAD_RX_TCP_CHECKSUM |
+				LM_TASK_OFFLOAD_RX_UDP_CHECKSUM);
+		}
+		return 0;
+	}
+	case ETHTOOL_GTXCSUM: {
+		struct ethtool_value edata = { ETHTOOL_GTXCSUM };
+
+		edata.data = 
+			(dev->features & NETIF_F_IP_CSUM) != 0;
+		if (copy_to_user(useraddr, &edata, sizeof(edata)))
+			return -EFAULT;
+
+		return 0;
+	}
+	case ETHTOOL_STXCSUM: {
+		struct ethtool_value edata;
+
+		if(!capable(CAP_NET_ADMIN))
+			return -EPERM;
+		if (copy_from_user(&edata, useraddr, sizeof(edata)))
+			return -EFAULT;
+		if (edata.data) {
+			if (!(pDevice->TaskOffloadCap &
+				LM_TASK_OFFLOAD_TX_TCP_CHECKSUM)) {
+
+				return -EINVAL;
+			}
+			dev->features |= NETIF_F_IP_CSUM;
+			pDevice->TaskToOffload |=
+				LM_TASK_OFFLOAD_TX_TCP_CHECKSUM |
+				LM_TASK_OFFLOAD_TX_UDP_CHECKSUM;
+		}
+		else {
+			dev->features &= ~NETIF_F_IP_CSUM;
+			pDevice->TaskToOffload &=
+				~(LM_TASK_OFFLOAD_TX_TCP_CHECKSUM |
+				LM_TASK_OFFLOAD_TX_UDP_CHECKSUM);
+		}
+		return 0;
+	}
+	case ETHTOOL_GSG: {
+		struct ethtool_value edata = { ETHTOOL_GSG };
+
+		edata.data = 
+			(dev->features & NETIF_F_SG) != 0;
+		if (copy_to_user(useraddr, &edata, sizeof(edata)))
+			return -EFAULT;
+		return 0;
+	}
+	case ETHTOOL_SSG: {
+		struct ethtool_value edata;
+
+		if(!capable(CAP_NET_ADMIN))
+			return -EPERM;
+		if (copy_from_user(&edata, useraddr, sizeof(edata)))
+			return -EFAULT;
+		if (edata.data) {
+			dev->features |= NETIF_F_SG;
+		}
+		else {
+			dev->features &= ~NETIF_F_SG;
+		}
+		return 0;
+	}
+#endif
+#ifdef ETHTOOL_GRINGPARAM
+	case ETHTOOL_GRINGPARAM: {
+		struct ethtool_ringparam ering = { ETHTOOL_GRINGPARAM };
+
+		ering.rx_max_pending = T3_STD_RCV_RCB_ENTRY_COUNT - 1;
+		ering.rx_pending = pDevice->RxStdDescCnt;
+		ering.rx_mini_max_pending = 0;
+		ering.rx_mini_pending = 0;
+#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
+		ering.rx_jumbo_max_pending = T3_JUMBO_RCV_RCB_ENTRY_COUNT - 1;
+		ering.rx_jumbo_pending = pDevice->RxJumboDescCnt;
+#else
+		ering.rx_jumbo_max_pending = 0;
+		ering.rx_jumbo_pending = 0;
+#endif
+		ering.tx_max_pending = MAX_TX_PACKET_DESC_COUNT - 1;
+		ering.tx_pending = pDevice->TxPacketDescCnt;
+		if (copy_to_user(useraddr, &ering, sizeof(ering)))
+			return -EFAULT;
+		return 0;
+	}
+#endif
+#ifdef ETHTOOL_PHYS_ID
+	case ETHTOOL_PHYS_ID: {
+		struct ethtool_value edata;
+
+		if(!capable(CAP_NET_ADMIN))
+			return -EPERM;
+		if (copy_from_user(&edata, useraddr, sizeof(edata)))
+			return -EFAULT;
+		if (LM_BlinkLED(pDevice, edata.data) == LM_STATUS_SUCCESS)
+			return 0;
+		return -EINTR;
+	}
+#endif
+#ifdef ETHTOOL_GSTRINGS
+	case ETHTOOL_GSTRINGS: {
+		struct ethtool_gstrings egstr = { ETHTOOL_GSTRINGS };
+
+		if (copy_from_user(&egstr, useraddr, sizeof(egstr)))
+			return -EFAULT;
+		switch(egstr.string_set) {
+#ifdef ETHTOOL_GSTATS
+		case ETH_SS_STATS:
+			egstr.len = ETH_NUM_STATS;
+			if (copy_to_user(useraddr, &egstr, sizeof(egstr)))
+				return -EFAULT;
+			if (copy_to_user(useraddr + sizeof(egstr), 
+				bcm5700_stats_str_arr,
+				sizeof(bcm5700_stats_str_arr)))
+				return -EFAULT;
+			return 0;
+#endif
+#ifdef ETHTOOL_TEST
+		case ETH_SS_TEST:
+			egstr.len = ETH_NUM_TESTS;
+			if (copy_to_user(useraddr, &egstr, sizeof(egstr)))
+				return -EFAULT;
+			if (copy_to_user(useraddr + sizeof(egstr), 
+				bcm5700_tests_str_arr,
+				sizeof(bcm5700_tests_str_arr)))
+				return -EFAULT;
+			return 0;
+#endif
+		default:
+			return -EOPNOTSUPP;
+		}
+		}
+#endif
+#ifdef ETHTOOL_GSTATS
+	case ETHTOOL_GSTATS: {
+		struct ethtool_stats estats = { ETHTOOL_GSTATS };
+		uint64_t stats[ETH_NUM_STATS];
+		int i;
+		uint64_t *pStats =
+			(uint64_t *) pDevice->pStatsBlkVirt;
+
+		estats.n_stats = ETH_NUM_STATS;
+		if (pStats == 0) {
+			memset(stats, 0, sizeof(stats));
+		}
+		else {
+
+			for (i = 0; i < ETH_NUM_STATS; i++) {
+				if (bcm5700_stats_offset_arr[i] != 0) {
+					stats[i] = SWAP_DWORD_64(*(pStats +
+						bcm5700_stats_offset_arr[i]));
+				}
+				else if (i == RX_CRC_IDX) {
+					stats[i] = 
+						bcm5700_crc_count(pUmDevice);
+				}
+				else if (i == RX_MAC_ERR_IDX) {
+					stats[i] = 
+						bcm5700_rx_err_count(pUmDevice);
+				}
+			}
+		}
+		if (copy_to_user(useraddr, &estats, sizeof(estats))) {
+			return -EFAULT;
+		}
+		if (copy_to_user(useraddr + sizeof(estats), &stats,
+			sizeof(stats))) {
+			return -EFAULT;
+		}
+		return 0;
+	}
+#endif
+#ifdef ETHTOOL_TEST
+	case ETHTOOL_TEST: {
+		struct ethtool_test etest;
+		uint64_t tests[ETH_NUM_TESTS] = {0, 0, 0, 0, 0, 0};
+		LM_POWER_STATE old_power_level;
+
+		if (copy_from_user(&etest, useraddr, sizeof(etest)))
+			return -EFAULT;
+
+		etest.len = ETH_NUM_TESTS;
+		old_power_level = pDevice->PowerLevel;
+		if (old_power_level != LM_POWER_STATE_D0) {
+			LM_SetPowerState(pDevice, LM_POWER_STATE_D0);
+			LM_SwitchClocks(pDevice);
+		}
+		if (etest.flags & ETH_TEST_FL_OFFLINE) {
+			b57_suspend_chip(pUmDevice);
+			LM_HaltCpu(pDevice,T3_RX_CPU_ID);
+			if (!T3_ASIC_5705_OR_5750(pDevice->ChipRevId)) {
+				LM_HaltCpu(pDevice,T3_TX_CPU_ID);
+			}
+			if (b57_test_registers(pUmDevice) == 0) {
+				etest.flags |= ETH_TEST_FL_FAILED;
+				tests[0] = 1;
+			}
+			if (b57_test_memory(pUmDevice) == 0) {
+				etest.flags |= ETH_TEST_FL_FAILED;
+				tests[1] = 1;
+			}
+			if (b57_test_loopback(pUmDevice) == 0) {
+				etest.flags |= ETH_TEST_FL_FAILED;
+				tests[2] = 1;
+			}
+			b57_resume_chip(pUmDevice);
+			/* wait for link to come up for the link test */
+			MM_Sleep(pDevice, 4000);
+			if ((pDevice->LinkStatus != LM_STATUS_LINK_ACTIVE) &&
+				!(pDevice->TbiFlags & ENABLE_TBI_FLAG)) {
+
+				/* wait a little longer for linkup on copper */
+				MM_Sleep(pDevice, 3000);
+			}
+		}
+		if (b57_test_nvram(pUmDevice) == 0) {
+			etest.flags |= ETH_TEST_FL_FAILED;
+			tests[3] = 1;
+		}
+		if (b57_test_intr(pUmDevice) == 0) {
+			etest.flags |= ETH_TEST_FL_FAILED;
+			tests[4] = 1;
+		}
+		if (b57_test_link(pUmDevice) == 0) {
+			etest.flags |= ETH_TEST_FL_FAILED;
+			tests[5] = 1;
+		}
+		if (old_power_level != LM_POWER_STATE_D0) {
+			LM_SetPowerState(pDevice, old_power_level);
+		}
+		if (copy_to_user(useraddr, &etest, sizeof(etest))) {
+			return -EFAULT;
+		}
+		if (copy_to_user(useraddr + sizeof(etest), tests,
+			sizeof(tests))) {
+			return -EFAULT;
+		}
+		return 0;
+	}
+#endif
+#ifdef ETHTOOL_GTSO
+	case ETHTOOL_GTSO: {
+		struct ethtool_value edata = { ETHTOOL_GTSO };
+
+#ifdef BCM_TSO
+		edata.data = 
+			(dev->features & NETIF_F_TSO) != 0;
+#else
+		edata.data = 0;
+#endif
+		if (copy_to_user(useraddr, &edata, sizeof(edata)))
+			return -EFAULT;
+		return 0;
+	}
+#endif
+#ifdef ETHTOOL_STSO
+	case ETHTOOL_STSO: {
+#ifdef BCM_TSO
+		struct ethtool_value edata;
+
+		if(!capable(CAP_NET_ADMIN))
+			return -EPERM;
+		if (copy_from_user(&edata, useraddr, sizeof(edata)))
+			return -EFAULT;
+		if (!(pDevice->TaskToOffload &
+			LM_TASK_OFFLOAD_TCP_SEGMENTATION))
+		{
+			return -EINVAL;
+		}
+		if (edata.data) {
+			dev->features |= NETIF_F_TSO;
+		}
+		else {
+			dev->features &= ~NETIF_F_TSO;
+		}
+		return 0;
+#else
+		return -EINVAL;
+#endif
+	}
+#endif
+	}
+
+	return -EOPNOTSUPP;
+}
+#endif /* #ifdef SIOCETHTOOL */
+
+/* Provide ioctl() calls to examine the MII xcvr state. */
+STATIC int bcm5700_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+{
+	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK)dev->priv;
+	PLM_DEVICE_BLOCK pDevice = (PLM_DEVICE_BLOCK) pUmDevice;
+	u16 *data = (u16 *)&rq->ifr_data;
+	u32 value;
+	unsigned long flags;
+
+	switch(cmd) {
+#ifdef SIOCGMIIPHY
+	case SIOCGMIIPHY:
+#endif
+	case SIOCDEVPRIVATE:		/* Get the address of the PHY in use. */
+		data[0] = pDevice->PhyAddr;
+
+#ifdef SIOCGMIIREG
+	case SIOCGMIIREG:
+#endif
+	case SIOCDEVPRIVATE+1:		/* Read the specified MII register. */
+		if (pDevice->TbiFlags & ENABLE_TBI_FLAG)
+			return -EOPNOTSUPP;
+
+		/* workaround for DHCP using ifup script */
+		/* ifup only waits for 5 seconds for link up */
+		/* NIC may take more than 5 seconds to establish link */
+		if ((pUmDevice->delayed_link_ind > 0) &&
+			delay_link[pUmDevice->index]) {
+			return -EOPNOTSUPP;
+		}
+
+		BCM5700_PHY_LOCK(pUmDevice, flags);
+		LM_ReadPhy(pDevice, data[1] & 0x1f, (LM_UINT32 *) &value);
+		BCM5700_PHY_UNLOCK(pUmDevice, flags);
+		data[3] = value & 0xffff;
+		return 0;
+
+#ifdef SIOCSMIIREG
+	case SIOCSMIIREG:
+#endif
+	case SIOCDEVPRIVATE+2:		/* Write the specified MII register */
+		if (!capable(CAP_NET_ADMIN))
+			return -EPERM;
+
+		if (pDevice->TbiFlags & ENABLE_TBI_FLAG)
+			return -EOPNOTSUPP;
+
+		BCM5700_PHY_LOCK(pUmDevice, flags);
+		LM_WritePhy(pDevice, data[1] & 0x1f, data[2]);
+		BCM5700_PHY_UNLOCK(pUmDevice, flags);
+		return 0;
+
+#ifdef NICE_SUPPORT
+	case SIOCNICE:
+	{
+		struct nice_req* nrq;
+
+		if (!capable(CAP_NET_ADMIN))
+			return -EPERM;
+
+		nrq = (struct nice_req*)&rq->ifr_ifru;
+		if( nrq->cmd == NICE_CMD_QUERY_SUPPORT ) {
+			nrq->nrq_magic = NICE_DEVICE_MAGIC;
+			nrq->nrq_support_rx = 1;
+			nrq->nrq_support_vlan = 1;
+			nrq->nrq_support_get_speed = 1;
+#ifdef BCM_NAPI_RXPOLL
+			nrq->nrq_support_rx_napi = 1;
+#endif
+			return 0;
+		}
+#ifdef BCM_NAPI_RXPOLL
+		else if( nrq->cmd == NICE_CMD_SET_RX_NAPI )
+#else
+		else if( nrq->cmd == NICE_CMD_SET_RX )
+#endif
+		{
+			pUmDevice->nice_rx = nrq->nrq_rx;
+			pUmDevice->nice_ctx = nrq->nrq_ctx;
+			bcm5700_set_vlan_mode(pUmDevice);
+			return 0;
+		}
+#ifdef BCM_NAPI_RXPOLL
+		else if( nrq->cmd == NICE_CMD_GET_RX_NAPI )
+#else
+		else if( nrq->cmd == NICE_CMD_GET_RX )
+#endif
+		{
+			nrq->nrq_rx = pUmDevice->nice_rx;
+			nrq->nrq_ctx = pUmDevice->nice_ctx;
+			return 0;
+		}
+		else if( nrq->cmd == NICE_CMD_GET_SPEED ) {
+			nrq->nrq_speed = pUmDevice->line_speed;
+			return 0;
+		}
+		else {
+			if (!pUmDevice->opened)
+				return -EINVAL;
+
+			switch (nrq->cmd) {
+			case NICE_CMD_BLINK_LED:
+				if (LM_BlinkLED(pDevice, nrq->nrq_blink_time) ==
+					LM_STATUS_SUCCESS) {
+					return 0;
+				}
+				return -EINTR;
+
+			case NICE_CMD_DIAG_SUSPEND:
+				b57_suspend_chip(pUmDevice);
+				return 0;
+
+			case NICE_CMD_DIAG_RESUME:
+				b57_resume_chip(pUmDevice);
+				return 0;
+
+			case NICE_CMD_REG_READ:
+				if (nrq->nrq_offset >= 0x10000) {
+					nrq->nrq_data = LM_RegRdInd(pDevice,
+						nrq->nrq_offset);
+				}
+				else {
+					nrq->nrq_data = LM_RegRd(pDevice,
+						nrq->nrq_offset);
+				}
+				return 0;
+
+			case NICE_CMD_REG_WRITE:
+				if (nrq->nrq_offset >= 0x10000) {
+					LM_RegWrInd(pDevice, nrq->nrq_offset,
+						nrq->nrq_data);
+				}
+				else {
+					LM_RegWr(pDevice, nrq->nrq_offset,
+						nrq->nrq_data, FALSE);
+				}
+				return 0;
+
+			case NICE_CMD_REG_READ_DIRECT:
+			case NICE_CMD_REG_WRITE_DIRECT:
+				if ((nrq->nrq_offset >= 0x10000) ||
+					(pDevice->Flags & UNDI_FIX_FLAG)) {
+					return -EINVAL;
+				}
+
+				if (nrq->cmd == NICE_CMD_REG_READ_DIRECT) {
+					nrq->nrq_data = REG_RD_OFFSET(pDevice,
+						nrq->nrq_offset);
+				}
+				else {
+					REG_WR_OFFSET(pDevice, nrq->nrq_offset,
+							nrq->nrq_data);
+				}
+				return 0;
+
+			case NICE_CMD_MEM_READ:
+				nrq->nrq_data = LM_MemRdInd(pDevice,
+					nrq->nrq_offset);
+				return 0;
+
+			case NICE_CMD_MEM_WRITE:
+				LM_MemWrInd(pDevice, nrq->nrq_offset,
+					nrq->nrq_data);
+				return 0;
+
+			case NICE_CMD_CFG_READ32:
+				pci_read_config_dword(pUmDevice->pdev,
+					nrq->nrq_offset, (u32 *)&nrq->nrq_data);
+				return 0;
+
+			case NICE_CMD_CFG_READ16:
+				pci_read_config_word(pUmDevice->pdev,
+					nrq->nrq_offset, (u16 *)&nrq->nrq_data);
+				return 0;
+
+			case NICE_CMD_CFG_READ8:
+				pci_read_config_byte(pUmDevice->pdev,
+					nrq->nrq_offset, (u8 *)&nrq->nrq_data);
+				return 0;
+
+			case NICE_CMD_CFG_WRITE32:
+				pci_write_config_dword(pUmDevice->pdev,
+					nrq->nrq_offset, (u32)nrq->nrq_data);
+				return 0;
+
+			case NICE_CMD_CFG_WRITE16:
+				pci_write_config_word(pUmDevice->pdev,
+					nrq->nrq_offset, (u16)nrq->nrq_data);
+				return 0;
+
+			case NICE_CMD_CFG_WRITE8:
+				pci_write_config_byte(pUmDevice->pdev,
+					nrq->nrq_offset, (u8)nrq->nrq_data);
+				return 0;
+
+			case NICE_CMD_RESET:
+				bcm5700_reset(dev);
+				return 0;
+
+			case NICE_CMD_ENABLE_MAC_LOOPBACK:
+				if (pDevice->LoopBackMode != 0) {
+					return -EINVAL;
+				}
+
+				BCM5700_PHY_LOCK(pUmDevice, flags);
+				LM_EnableMacLoopBack(pDevice);
+				BCM5700_PHY_UNLOCK(pUmDevice, flags);
+				return 0;
+
+			case NICE_CMD_DISABLE_MAC_LOOPBACK:
+				if (pDevice->LoopBackMode !=
+					LM_MAC_LOOP_BACK_MODE) {
+					return -EINVAL;
+				}
+
+				BCM5700_PHY_LOCK(pUmDevice, flags);
+				LM_DisableMacLoopBack(pDevice);
+				BCM5700_PHY_UNLOCK(pUmDevice, flags);
+				return 0;
+
+			case NICE_CMD_ENABLE_PHY_LOOPBACK:
+				if (pDevice->LoopBackMode != 0) {
+					return -EINVAL;
+				}
+
+				BCM5700_PHY_LOCK(pUmDevice, flags);
+				LM_EnablePhyLoopBack(pDevice);
+				BCM5700_PHY_UNLOCK(pUmDevice, flags);
+				return 0;
+
+			case NICE_CMD_DISABLE_PHY_LOOPBACK:
+				if (pDevice->LoopBackMode !=
+					LM_PHY_LOOP_BACK_MODE) {
+					return -EINVAL;
+				}
+
+				BCM5700_PHY_LOCK(pUmDevice, flags);
+				LM_DisablePhyLoopBack(pDevice);
+				BCM5700_PHY_UNLOCK(pUmDevice, flags);
+				return 0;
+
+			case NICE_CMD_ENABLE_EXT_LOOPBACK:
+				if (pDevice->LoopBackMode != 0) {
+					return -EINVAL;
+				}
+
+				if (pDevice->TbiFlags & ENABLE_TBI_FLAG) {
+					if (nrq->nrq_speed != 1000)
+						return -EINVAL;
+				}
+				else {
+					if ((nrq->nrq_speed != 1000) &&
+						(nrq->nrq_speed != 100) &&
+						(nrq->nrq_speed != 10)) {
+						return -EINVAL;
+					}
+				}
+				BCM5700_PHY_LOCK(pUmDevice, flags);
+				LM_EnableExtLoopBack(pDevice, nrq->nrq_speed);
+				BCM5700_PHY_UNLOCK(pUmDevice, flags);
+				return 0;
+
+			case NICE_CMD_DISABLE_EXT_LOOPBACK:
+				if (pDevice->LoopBackMode !=
+					LM_EXT_LOOP_BACK_MODE) {
+					return -EINVAL;
+				}
+
+				BCM5700_PHY_LOCK(pUmDevice, flags);
+				LM_DisableExtLoopBack(pDevice);
+				BCM5700_PHY_UNLOCK(pUmDevice, flags);
+				return 0;
+
+			case NICE_CMD_INTERRUPT_TEST:
+				nrq->nrq_intr_test_result =
+					b57_test_intr(pUmDevice);
+				return 0;
+
+			case NICE_CMD_KMALLOC_PHYS: {
+#if (LINUX_VERSION_CODE >= 0x020400)
+				dma_addr_t mapping;
+				__u64 cpu_pa;
+				void *ptr;
+				int i;
+				struct page *pg, *last_pg;
+
+				for (i = 0; i < MAX_MEM2; i++) {
+					if (pUmDevice->mem_size_list2[i] == 0)
+						break;
+				}
+				if (i >= MAX_MEM2)
+					return -EFAULT;
+				ptr = pci_alloc_consistent(pUmDevice->pdev,
+					nrq->nrq_size, &mapping);
+				if (!ptr) {
+					return -EFAULT;
+				}
+				pUmDevice->mem_size_list2[i] = nrq->nrq_size;
+				pUmDevice->mem_list2[i] = ptr;
+				pUmDevice->dma_list2[i] = mapping;
+
+				/* put pci mapping at the beginning of buffer */
+				*((__u64 *) ptr) = (__u64) mapping;
+
+				/* Probably won't work on some architectures */
+				/* get CPU mapping */
+				cpu_pa = (__u64) virt_to_phys(ptr);
+				pUmDevice->cpu_pa_list2[i] = cpu_pa;
+				nrq->nrq_phys_addr_lo = (__u32) cpu_pa;
+				nrq->nrq_phys_addr_hi = (__u32) (cpu_pa >> 32);
+
+				pg = virt_to_page(ptr);
+				last_pg = virt_to_page(ptr + nrq->nrq_size - 1);
+				for (; ; pg++) {
+#if (LINUX_VERSION_CODE > 0x020500)
+					SetPageReserved(pg);
+#else
+					mem_map_reserve(pg);
+#endif
+					if (pg == last_pg)
+						break;
+				}
+				return 0;
+#else
+				return -EOPNOTSUPP;
+#endif
+			}
+			case NICE_CMD_KFREE_PHYS: {
+				int i;
+				__u64 cpu_pa;
+
+				cpu_pa = (__u64) nrq->nrq_phys_addr_lo +
+					((__u64) nrq->nrq_phys_addr_hi << 32);
+				for (i = 0; i < MAX_MEM2; i++) {
+					if (pUmDevice->cpu_pa_list2[i] ==
+						cpu_pa)
+					{
+						break;
+					}
+				}
+				if (i >= MAX_MEM2)
+					return -EFAULT;
+
+				bcm5700_freemem2(pUmDevice, i);
+				return 0;
+			}
+			case NICE_CMD_SET_WRITE_PROTECT:
+				if (nrq->nrq_write_protect)
+					pDevice->Flags |= EEPROM_WP_FLAG;
+				else
+					pDevice->Flags &= ~EEPROM_WP_FLAG;
+				return 0;
+			case NICE_CMD_GET_STATS_BLOCK: {
+				PT3_STATS_BLOCK pStats =
+					(PT3_STATS_BLOCK)pDevice->pStatsBlkVirt;
+				if (copy_to_user(nrq->nrq_stats_useraddr,
+					pStats, nrq->nrq_stats_size)) {
+					return -EFAULT;
+				}
+				return 0;
+			}
+			case NICE_CMD_CLR_STATS_BLOCK: {
+				int j;
+				PT3_STATS_BLOCK pStats =
+					(PT3_STATS_BLOCK)pDevice->pStatsBlkVirt;
+
+				memset(pStats, 0, sizeof(T3_STATS_BLOCK));
+				if (T3_ASIC_REV(pDevice->ChipRevId) ==
+					T3_ASIC_REV_5705) {
+					return 0;
+				}
+				for(j = 0x0300; j < 0x0b00; j = j + 4) {
+					MEM_WR_OFFSET(pDevice, j, 0);
+				}
+
+				return 0;
+			}
+			}
+		}
+		return -EOPNOTSUPP;
+	}
+#endif /* NICE_SUPPORT */
+#ifdef SIOCETHTOOL
+	case SIOCETHTOOL:
+		return netdev_ethtool_ioctl(dev, (void *) rq->ifr_data);
+#endif
+	default:
+		return -EOPNOTSUPP;
+	}
+	return -EOPNOTSUPP;
+}
+
+STATIC void bcm5700_set_rx_mode(struct net_device *dev)
+{
+	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK)dev->priv;
+	PLM_DEVICE_BLOCK pDevice = (PLM_DEVICE_BLOCK) pUmDevice;
+	int i;
+	struct dev_mc_list *mclist;
+	unsigned long flags;
+
+	BCM5700_PHY_LOCK(pUmDevice, flags);
+
+	LM_MulticastClear(pDevice);
+	for (i = 0, mclist = dev->mc_list; mclist && i < dev->mc_count;
+			 i++, mclist = mclist->next) {
+		LM_MulticastAdd(pDevice, (PLM_UINT8) &mclist->dmi_addr);
+	}
+	if (dev->flags & IFF_ALLMULTI) {
+		if (!(pDevice->ReceiveMask & LM_ACCEPT_ALL_MULTICAST)) {
+			LM_SetReceiveMask(pDevice,
+				pDevice->ReceiveMask | LM_ACCEPT_ALL_MULTICAST);
+		}
+	}
+	else if (pDevice->ReceiveMask & LM_ACCEPT_ALL_MULTICAST) {
+		LM_SetReceiveMask(pDevice,
+			pDevice->ReceiveMask & ~LM_ACCEPT_ALL_MULTICAST);
+	}
+	if (dev->flags & IFF_PROMISC) {
+		if (!(pDevice->ReceiveMask & LM_PROMISCUOUS_MODE)) {
+			LM_SetReceiveMask(pDevice,
+				pDevice->ReceiveMask | LM_PROMISCUOUS_MODE);
+		}
+	}
+	else if (pDevice->ReceiveMask & LM_PROMISCUOUS_MODE) {
+		LM_SetReceiveMask(pDevice,
+			pDevice->ReceiveMask & ~LM_PROMISCUOUS_MODE);
+	}
+
+	BCM5700_PHY_UNLOCK(pUmDevice, flags);
+}
+
+/*
+ * Set the hardware MAC address.
+ */
+STATIC int bcm5700_set_mac_addr(struct net_device *dev, void *p)
+{
+	struct sockaddr *addr=p;
+	PLM_DEVICE_BLOCK pDevice = (PLM_DEVICE_BLOCK) dev->priv;
+	UM_DEVICE_BLOCK *pUmDevice = (UM_DEVICE_BLOCK *) pDevice;
+
+	memcpy(dev->dev_addr, addr->sa_data,dev->addr_len);
+	if (pUmDevice->opened)
+		LM_SetMacAddress(pDevice, dev->dev_addr);
+	return 0;
+}
+
+#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
+STATIC int bcm5700_change_mtu(struct net_device *dev, int new_mtu)
+{
+	int pkt_size = new_mtu + ETHERNET_PACKET_HEADER_SIZE;
+	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK)dev->priv;
+	PLM_DEVICE_BLOCK pDevice = &pUmDevice->lm_dev;
+	unsigned long flags;
+	int reinit = 0;
+
+	if ((pkt_size < MIN_ETHERNET_PACKET_SIZE_NO_CRC) || 
+		(pkt_size > MAX_ETHERNET_JUMBO_PACKET_SIZE_NO_CRC)) {
+
+		return -EINVAL;
+	}
+	if ((T3_ASIC_5705_OR_5750(pDevice->ChipRevId)) &&
+		(pkt_size > MAX_ETHERNET_PACKET_SIZE_NO_CRC)) {
+
+		return -EINVAL;
+	}
+	if (pUmDevice->suspended)
+		return -EAGAIN;
+
+	if (pUmDevice->opened && (new_mtu != dev->mtu) &&
+		!(T3_ASIC_5705_OR_5750(pDevice->ChipRevId))) {
+		reinit = 1;
+	}
+
+	BCM5700_PHY_LOCK(pUmDevice, flags);
+	if (reinit) {
+		netif_stop_queue(dev);
+		bcm5700_shutdown(pUmDevice);
+		bcm5700_freemem(dev);
+	}
+
+	dev->mtu = new_mtu;
+	if (pkt_size < MAX_ETHERNET_PACKET_SIZE_NO_CRC) {
+		pDevice->RxMtu = pDevice->TxMtu =
+			MAX_ETHERNET_PACKET_SIZE_NO_CRC;
+	}
+	else {
+		pDevice->RxMtu = pDevice->TxMtu = pkt_size;
+	}
+
+	if (dev->mtu <= 1514) {
+		pDevice->RxJumboDescCnt = 0;
+	}
+	else {
+		pDevice->RxJumboDescCnt =
+			rx_jumbo_desc_cnt[pUmDevice->index];
+	}
+	pDevice->RxPacketDescCnt = pDevice->RxJumboDescCnt +
+		pDevice->RxStdDescCnt;
+
+	pDevice->RxJumboBufferSize = (pDevice->RxMtu + 8 /* CRC + VLAN */ +
+		COMMON_CACHE_LINE_SIZE-1) & ~COMMON_CACHE_LINE_MASK;
+
+	if (reinit) {
+		LM_InitializeAdapter(pDevice);
+		bcm5700_set_vlan_mode(pUmDevice);
+		bcm5700_init_counters(pUmDevice);
+		if (memcmp(dev->dev_addr, pDevice->NodeAddress, 6)) {
+			LM_SetMacAddress(pDevice, dev->dev_addr);
+		}
+		netif_start_queue(dev);
+		bcm5700_intr_on(pUmDevice);
+	}
+	BCM5700_PHY_UNLOCK(pUmDevice, flags);
+
+	return 0;
+}
+#endif
+
+
+#if (LINUX_VERSION_CODE < 0x020300)
+
+int
+bcm5700_probe(struct net_device *dev)
+{
+	int cards_found = 0;
+	struct pci_dev *pdev = NULL;
+	struct pci_device_id *pci_tbl;
+	u16 ssvid, ssid;
+
+	if ( ! pci_present())
+		return -ENODEV;
+
+	pci_tbl = bcm5700_pci_tbl;
+	while ((pdev = pci_find_class(PCI_CLASS_NETWORK_ETHERNET << 8, pdev))) {
+		int idx;
+
+		pci_read_config_word(pdev, PCI_SUBSYSTEM_VENDOR_ID, &ssvid);
+		pci_read_config_word(pdev, PCI_SUBSYSTEM_ID, &ssid);
+		for (idx = 0; pci_tbl[idx].vendor; idx++) {
+			if ((pci_tbl[idx].vendor == PCI_ANY_ID ||
+				pci_tbl[idx].vendor == pdev->vendor) &&
+				(pci_tbl[idx].device == PCI_ANY_ID ||
+				pci_tbl[idx].device == pdev->device) &&
+				(pci_tbl[idx].subvendor == PCI_ANY_ID ||
+				pci_tbl[idx].subvendor == ssvid) &&
+				(pci_tbl[idx].subdevice == PCI_ANY_ID ||
+				pci_tbl[idx].subdevice == ssid))
+			{
+
+				break;
+			}
+		}
+		if (pci_tbl[idx].vendor == 0)
+			continue;
+
+
+		if (bcm5700_init_one(pdev, &pci_tbl[idx]) == 0)
+			cards_found++;
+	}
+
+	return cards_found ? 0 : -ENODEV;
+}
+
+#ifdef MODULE
+int init_module(void)
+{
+	return bcm5700_probe(NULL);
+}
+
+void cleanup_module(void)
+{
+	struct net_device *next_dev;
+	PUM_DEVICE_BLOCK pUmDevice;
+
+	/* No need to check MOD_IN_USE, as sys_delete_module() checks. */
+	while (root_tigon3_dev) {
+		pUmDevice = (PUM_DEVICE_BLOCK)root_tigon3_dev->priv;
+#ifdef BCM_PROC_FS
+		bcm5700_proc_remove_dev(root_tigon3_dev); 
+#endif
+		next_dev = pUmDevice->next_module;
+		unregister_netdev(root_tigon3_dev);
+		if (pUmDevice->lm_dev.pMappedMemBase)
+			iounmap(pUmDevice->lm_dev.pMappedMemBase);
+#if (LINUX_VERSION_CODE < 0x020600)
+		kfree(root_tigon3_dev);
+#else
+		free_netdev(root_tigon3_dev);
+#endif
+		root_tigon3_dev = next_dev;
+	}
+#ifdef BCM_IOCTL32
+	unregister_ioctl32_conversion(SIOCNICE);
+#endif
+}
+
+#endif  /* MODULE */
+#else	/* LINUX_VERSION_CODE < 0x020300 */
+
+#if (LINUX_VERSION_CODE >= 0x020406)
+static int bcm5700_suspend (struct pci_dev *pdev, u32 state)
+#else
+static void bcm5700_suspend (struct pci_dev *pdev)
+#endif
+{
+	struct net_device *dev = (struct net_device *) pci_get_drvdata(pdev);
+	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK) dev->priv;
+	PLM_DEVICE_BLOCK pDevice = &pUmDevice->lm_dev;
+
+	if (!netif_running(dev))
+#if (LINUX_VERSION_CODE >= 0x020406)
+		return 0;
+#else
+		return;
+#endif
+
+	netif_device_detach (dev);
+	bcm5700_shutdown(pUmDevice);
+	LM_SetPowerState(pDevice, LM_POWER_STATE_D3);
+
+/*	pci_power_off(pdev, -1);*/
+#if (LINUX_VERSION_CODE >= 0x020406)
+	return 0;
+#endif
+}
+
+
+#if (LINUX_VERSION_CODE >= 0x020406)
+static int bcm5700_resume(struct pci_dev *pdev)
+#else
+static void bcm5700_resume(struct pci_dev *pdev)
+#endif
+{
+	struct net_device *dev = (struct net_device *) pci_get_drvdata(pdev);
+	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK) dev->priv;
+	PLM_DEVICE_BLOCK pDevice = &pUmDevice->lm_dev;
+
+	if (!netif_running(dev))
+#if (LINUX_VERSION_CODE >= 0x020406)
+		return 0;
+#else
+		return;
+#endif
+/*	pci_power_on(pdev);*/
+	netif_device_attach(dev);
+	LM_SetPowerState(pDevice, LM_POWER_STATE_D0);
+	MM_InitializeUmPackets(pDevice);
+	bcm5700_reset(dev);
+#if (LINUX_VERSION_CODE >= 0x020406)
+	return 0;
+#endif
+}
+
+
+static struct pci_driver bcm5700_pci_driver = {
+	name:		bcm5700_driver,
+	id_table:	bcm5700_pci_tbl,
+	probe:		bcm5700_init_one,
+	remove:		__devexit_p(bcm5700_remove_one),
+	suspend:	bcm5700_suspend,
+	resume:		bcm5700_resume,
+};
+
+
+static int __init bcm5700_init_module (void)
+{
+	return pci_module_init(&bcm5700_pci_driver);
+}
+
+
+static void __exit bcm5700_cleanup_module (void)
+{
+	pci_unregister_driver(&bcm5700_pci_driver);
+}
+
+
+module_init(bcm5700_init_module);
+module_exit(bcm5700_cleanup_module);
+#endif
+
+/*
+ * Middle Module
+ *
+ */
+
+
+#ifdef BCM_NAPI_RXPOLL
+LM_STATUS
+MM_ScheduleRxPoll(LM_DEVICE_BLOCK *pDevice)
+{
+	struct net_device *dev = ((UM_DEVICE_BLOCK *) pDevice)->dev;
+
+	if (netif_rx_schedule_prep(dev)) {
+		__netif_rx_schedule(dev);
+		return LM_STATUS_SUCCESS;
+	}
+	return LM_STATUS_FAILURE;
+}
+#endif
+
+LM_STATUS
+MM_ReadConfig16(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Offset,
+	LM_UINT16 *pValue16)
+{
+	UM_DEVICE_BLOCK *pUmDevice;
+
+	pUmDevice = (UM_DEVICE_BLOCK *) pDevice;
+	pci_read_config_word(pUmDevice->pdev, Offset, (u16 *) pValue16);
+	return LM_STATUS_SUCCESS;
+}
+
+LM_STATUS
+MM_ReadConfig32(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Offset,
+	LM_UINT32 *pValue32)
+{
+	UM_DEVICE_BLOCK *pUmDevice;
+
+	pUmDevice = (UM_DEVICE_BLOCK *) pDevice;
+	pci_read_config_dword(pUmDevice->pdev, Offset, (u32 *) pValue32);
+	return LM_STATUS_SUCCESS;
+}
+
+LM_STATUS
+MM_WriteConfig16(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Offset,
+	LM_UINT16 Value16)
+{
+	UM_DEVICE_BLOCK *pUmDevice;
+
+	pUmDevice = (UM_DEVICE_BLOCK *) pDevice;
+	pci_write_config_word(pUmDevice->pdev, Offset, Value16);
+	return LM_STATUS_SUCCESS;
+}
+
+LM_STATUS
+MM_WriteConfig32(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Offset,
+	LM_UINT32 Value32)
+{
+	UM_DEVICE_BLOCK *pUmDevice;
+
+	pUmDevice = (UM_DEVICE_BLOCK *) pDevice;
+	pci_write_config_dword(pUmDevice->pdev, Offset, Value32);
+	return LM_STATUS_SUCCESS;
+}
+
+LM_STATUS
+MM_AllocateSharedMemory(PLM_DEVICE_BLOCK pDevice, LM_UINT32 BlockSize,
+	PLM_VOID *pMemoryBlockVirt, PLM_PHYSICAL_ADDRESS pMemoryBlockPhy,
+	LM_BOOL Cached)
+{
+	PLM_VOID pvirt;
+	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK) pDevice;
+	dma_addr_t mapping;
+
+	pvirt = pci_alloc_consistent(pUmDevice->pdev, BlockSize,
+					       &mapping);
+	if (!pvirt) {
+		return LM_STATUS_FAILURE;
+	}
+	pUmDevice->mem_list[pUmDevice->mem_list_num] = pvirt;
+	pUmDevice->dma_list[pUmDevice->mem_list_num] = mapping;
+	pUmDevice->mem_size_list[pUmDevice->mem_list_num++] = BlockSize;
+	memset(pvirt, 0, BlockSize);
+	*pMemoryBlockVirt = (PLM_VOID) pvirt;
+	MM_SetAddr(pMemoryBlockPhy, mapping);
+	return LM_STATUS_SUCCESS;
+}
+
+LM_STATUS
+MM_AllocateMemory(PLM_DEVICE_BLOCK pDevice, LM_UINT32 BlockSize,
+	PLM_VOID *pMemoryBlockVirt)
+{
+	PLM_VOID pvirt;
+	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK) pDevice;
+
+
+	/* Maximum in slab.c */
+	if (BlockSize > 131072) {
+		goto MM_Alloc_error;
+	}
+
+	pvirt = kmalloc(BlockSize, GFP_KERNEL);
+	if (!pvirt) {
+		goto MM_Alloc_error;
+	}
+	pUmDevice->mem_list[pUmDevice->mem_list_num] = pvirt;
+	pUmDevice->dma_list[pUmDevice->mem_list_num] = 0;
+	pUmDevice->mem_size_list[pUmDevice->mem_list_num++] = 0;
+	/* mem_size_list[i] == 0 indicates that the memory should be freed */
+	/* using kfree */
+	memset(pvirt, 0, BlockSize);
+	*pMemoryBlockVirt = pvirt;
+	return LM_STATUS_SUCCESS;
+
+MM_Alloc_error:
+	printk(KERN_WARNING "%s: Memory allocation failed - buffer parameters may be set too high\n", pUmDevice->dev->name);
+	return LM_STATUS_FAILURE;
+}
+
+LM_STATUS
+MM_MapMemBase(PLM_DEVICE_BLOCK pDevice)
+{
+	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK) pDevice;
+
+	pDevice->pMappedMemBase = ioremap_nocache(
+		pci_resource_start(pUmDevice->pdev, 0), sizeof(T3_STD_MEM_MAP));
+	if (pDevice->pMappedMemBase == 0)
+		return LM_STATUS_FAILURE;
+
+	return LM_STATUS_SUCCESS;
+}
+
+LM_STATUS
+MM_InitializeUmPackets(PLM_DEVICE_BLOCK pDevice)
+{
+	unsigned int i;
+	struct sk_buff *skb;
+	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK) pDevice;
+	PUM_PACKET pUmPacket;
+	PLM_PACKET pPacket;
+
+	for (i = 0; i < pDevice->RxPacketDescCnt; i++) {
+		pPacket = QQ_PopHead(&pDevice->RxPacketFreeQ.Container);
+		pUmPacket = (PUM_PACKET) pPacket;
+		if (pPacket == 0) {
+			printk(KERN_DEBUG "Bad RxPacketFreeQ\n");
+		}
+		if (pUmPacket->skbuff == 0) {
+			skb = dev_alloc_skb(pPacket->u.Rx.RxBufferSize + 2);
+			if (skb == 0) {
+				pUmPacket->skbuff = 0;
+				QQ_PushTail(
+					&pUmDevice->rx_out_of_buf_q.Container,
+					pPacket);
+				continue;
+			}
+			pUmPacket->skbuff = skb;
+			skb->dev = pUmDevice->dev;
+			skb_reserve(skb, pUmDevice->rx_buf_align);
+		}
+		QQ_PushTail(&pDevice->RxPacketFreeQ.Container, pPacket);
+	}
+	if (T3_ASIC_REV(pUmDevice->lm_dev.ChipRevId) == T3_ASIC_REV_5700) {
+		/* reallocate buffers in the ISR */
+		pUmDevice->rx_buf_repl_thresh = 0;
+		pUmDevice->rx_buf_repl_panic_thresh = 0;
+		pUmDevice->rx_buf_repl_isr_limit = 0;
+	}
+	else {
+		pUmDevice->rx_buf_repl_thresh = pDevice->RxPacketDescCnt / 8;
+		pUmDevice->rx_buf_repl_panic_thresh =
+			pDevice->RxPacketDescCnt  * 7 / 8;
+
+		/* This limits the time spent in the ISR when the receiver */
+		/* is in a steady state of being overrun. */
+		pUmDevice->rx_buf_repl_isr_limit = pDevice->RxPacketDescCnt / 8;
+
+#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
+		if (pDevice->RxJumboDescCnt != 0) {
+			if (pUmDevice->rx_buf_repl_thresh >=
+				pDevice->RxJumboDescCnt) {
+
+				pUmDevice->rx_buf_repl_thresh = 
+				pUmDevice->rx_buf_repl_panic_thresh = 
+					pDevice->RxJumboDescCnt - 1;
+			}
+			if (pUmDevice->rx_buf_repl_thresh >=
+				pDevice->RxStdDescCnt) {
+
+				pUmDevice->rx_buf_repl_thresh = 
+				pUmDevice->rx_buf_repl_panic_thresh = 
+					pDevice->RxStdDescCnt - 1;
+			}
+		}
+#endif
+	}
+	return LM_STATUS_SUCCESS;
+}
+
+LM_STATUS
+MM_GetConfig(PLM_DEVICE_BLOCK pDevice)
+{
+	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK) pDevice;
+	int index = pUmDevice->index;
+	struct net_device *dev = pUmDevice->dev;
+
+	bcm5700_validate_param_range(pUmDevice, &auto_speed[index], "auto_speed",
+		0, 1, 1);
+	if (auto_speed[index] == 0)
+		pDevice->DisableAutoNeg = TRUE;
+	else
+		pDevice->DisableAutoNeg = FALSE;
+
+	if (line_speed[index] == 0) {
+		pDevice->RequestedLineSpeed = LM_LINE_SPEED_AUTO;
+		pDevice->DisableAutoNeg = FALSE;
+	}
+	else {
+		bcm5700_validate_param_range(pUmDevice, &full_duplex[index],
+			"full_duplex", 0, 1, 1);
+		if (full_duplex[index]) {
+			pDevice->RequestedDuplexMode = LM_DUPLEX_MODE_FULL;
+		}
+		else {
+			pDevice->RequestedDuplexMode = LM_DUPLEX_MODE_HALF;
+		}
+
+		if (line_speed[index] == 1000) {
+			pDevice->RequestedLineSpeed = LM_LINE_SPEED_1000MBPS;
+			if (pDevice->PhyFlags & PHY_NO_GIGABIT) {
+				pDevice->RequestedLineSpeed =
+					LM_LINE_SPEED_100MBPS;
+				printk(KERN_WARNING "%s-%d: Invalid line_speed parameter (1000), using 100\n", bcm5700_driver, index);
+			}
+			else {
+				if ((pDevice->TbiFlags & ENABLE_TBI_FLAG) &&
+					!full_duplex[index]) {
+
+					printk(KERN_WARNING "%s-%d: Invalid full_duplex parameter (0) for fiber, using 1\n", bcm5700_driver, index);
+					pDevice->RequestedDuplexMode =
+						LM_DUPLEX_MODE_FULL;
+				}
+
+				if ((pDevice->TbiFlags & ENABLE_TBI_FLAG) &&
+					!auto_speed[index]) {
+					printk(KERN_WARNING "%s-%d: Invalid auto_speed parameter (0) for copper, using 1\n", bcm5700_driver, index);
+					pDevice->DisableAutoNeg = FALSE;
+				}
+			}
+		}
+		else if (line_speed[index] == 100) {
+			pDevice->RequestedLineSpeed = LM_LINE_SPEED_100MBPS;
+		}
+		else if (line_speed[index] == 10) {
+			pDevice->RequestedLineSpeed = LM_LINE_SPEED_10MBPS;
+		}
+		else {
+			pDevice->RequestedLineSpeed = LM_LINE_SPEED_AUTO;
+			pDevice->DisableAutoNeg = FALSE;
+			printk(KERN_WARNING "%s-%d: Invalid line_speed parameter (%d), using 0\n", bcm5700_driver, index, line_speed[index]);
+		}
+
+	}
+	pDevice->FlowControlCap = 0;
+	bcm5700_validate_param_range(pUmDevice, &rx_flow_control[index],
+		"rx_flow_control", 0, 1, 0);
+	if (rx_flow_control[index] != 0) {
+		pDevice->FlowControlCap |= LM_FLOW_CONTROL_RECEIVE_PAUSE;
+	}
+	bcm5700_validate_param_range(pUmDevice, &tx_flow_control[index],
+		"tx_flow_control", 0, 1, 0);
+	if (tx_flow_control[index] != 0) {
+		pDevice->FlowControlCap |= LM_FLOW_CONTROL_TRANSMIT_PAUSE;
+	}
+	bcm5700_validate_param_range(pUmDevice, &auto_flow_control[index],
+		"auto_flow_control", 0, 1, 0);
+	if (auto_flow_control[index] != 0) {
+		if (pDevice->DisableAutoNeg == FALSE) {
+
+			pDevice->FlowControlCap |= LM_FLOW_CONTROL_AUTO_PAUSE;
+			if ((tx_flow_control[index] == 0) &&
+				(rx_flow_control[index] == 0)) {
+
+				pDevice->FlowControlCap |=
+					LM_FLOW_CONTROL_TRANSMIT_PAUSE |
+					LM_FLOW_CONTROL_RECEIVE_PAUSE;
+			}
+		}
+	}
+
+	if (dev->mtu > 1500) {
+		pDevice->RxMtu = dev->mtu + 14;
+	}
+
+	if ((T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5700) &&
+		!(pDevice->Flags & BCM5788_FLAG)) {
+		pDevice->Flags |= USE_TAGGED_STATUS_FLAG;
+		pUmDevice->timer_interval = HZ;
+		if ((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5703) &&
+			(pDevice->TbiFlags & ENABLE_TBI_FLAG)) {
+			pUmDevice->timer_interval = HZ/4;
+		}
+	}
+	else {
+		pUmDevice->timer_interval = HZ/10;
+	}
+
+	bcm5700_validate_param_range(pUmDevice, &tx_pkt_desc_cnt[index],
+		"tx_pkt_desc_cnt", 1, MAX_TX_PACKET_DESC_COUNT-1, TX_DESC_CNT);
+	pDevice->TxPacketDescCnt = tx_pkt_desc_cnt[index];
+	bcm5700_validate_param_range(pUmDevice, &rx_std_desc_cnt[index],
+		"rx_std_desc_cnt", 1, T3_STD_RCV_RCB_ENTRY_COUNT-1,
+		RX_DESC_CNT);
+	pDevice->RxStdDescCnt = rx_std_desc_cnt[index];
+
+#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
+	bcm5700_validate_param_range(pUmDevice, &rx_jumbo_desc_cnt[index],
+		"rx_jumbo_desc_cnt", 1, T3_JUMBO_RCV_RCB_ENTRY_COUNT-1,
+		JBO_DESC_CNT);
+
+	if (mtu[index] <= 1514)
+		pDevice->RxJumboDescCnt = 0;
+	else
+		pDevice->RxJumboDescCnt = rx_jumbo_desc_cnt[index];
+#endif
+
+#ifdef BCM_INT_COAL
+	bcm5700_validate_param_range(pUmDevice, &adaptive_coalesce[index],
+		"adaptive_coalesce", 0, 1, 1);
+#ifdef BCM_NAPI_RXPOLL
+	if (adaptive_coalesce[index]) {
+		printk(KERN_WARNING "%s-%d: adaptive_coalesce not used in NAPI mode\n", bcm5700_driver, index);
+		adaptive_coalesce[index] = 0;
+
+	}
+#endif
+	pUmDevice->adaptive_coalesce = adaptive_coalesce[index];
+	if (!pUmDevice->adaptive_coalesce) {
+		bcm5700_validate_param_range(pUmDevice,
+			&rx_coalesce_ticks[index], "rx_coalesce_ticks", 0,
+			MAX_RX_COALESCING_TICKS, RX_COAL_TK);
+		if ((rx_coalesce_ticks[index] == 0) &&
+			(rx_max_coalesce_frames[index] == 0)) {
+
+			printk(KERN_WARNING "%s-%d: Conflicting rx_coalesce_ticks (0) and rx_max_coalesce_frames (0) parameters, using %d and %d respectively\n",
+				bcm5700_driver, index, RX_COAL_TK, RX_COAL_FM);
+
+			rx_coalesce_ticks[index] = RX_COAL_TK;
+			rx_max_coalesce_frames[index] = RX_COAL_FM;
+		}
+		pDevice->RxCoalescingTicks = pUmDevice->rx_curr_coalesce_ticks =
+			rx_coalesce_ticks[index];
+#ifdef BCM_NAPI_RXPOLL
+		pDevice->RxCoalescingTicksDuringInt = rx_coalesce_ticks[index];
+#endif
+
+		bcm5700_validate_param_range(pUmDevice,
+			&rx_max_coalesce_frames[index],
+			"rx_max_coalesce_frames", 0,
+			MAX_RX_MAX_COALESCED_FRAMES, RX_COAL_FM);
+
+		pDevice->RxMaxCoalescedFrames =
+			pUmDevice->rx_curr_coalesce_frames =
+			rx_max_coalesce_frames[index];
+#ifdef BCM_NAPI_RXPOLL
+		pDevice->RxMaxCoalescedFramesDuringInt =
+			rx_max_coalesce_frames[index];
+#endif
+
+		bcm5700_validate_param_range(pUmDevice,
+			&tx_coalesce_ticks[index], "tx_coalesce_ticks", 0,
+			MAX_TX_COALESCING_TICKS, TX_COAL_TK);
+		if ((tx_coalesce_ticks[index] == 0) &&
+			(tx_max_coalesce_frames[index] == 0)) {
+
+			printk(KERN_WARNING "%s-%d: Conflicting tx_coalesce_ticks (0) and tx_max_coalesce_frames (0) parameters, using %d and %d respectively\n",
+				bcm5700_driver, index, TX_COAL_TK, TX_COAL_FM);
+
+			tx_coalesce_ticks[index] = TX_COAL_TK;
+			tx_max_coalesce_frames[index] = TX_COAL_FM;
+		}
+		pDevice->TxCoalescingTicks = tx_coalesce_ticks[index];
+		bcm5700_validate_param_range(pUmDevice,
+			&tx_max_coalesce_frames[index],
+			"tx_max_coalesce_frames", 0,
+			MAX_TX_MAX_COALESCED_FRAMES, TX_COAL_FM);
+		pDevice->TxMaxCoalescedFrames = tx_max_coalesce_frames[index];
+		pUmDevice->tx_curr_coalesce_frames =
+			pDevice->TxMaxCoalescedFrames;
+
+		bcm5700_validate_param_range(pUmDevice,
+			&stats_coalesce_ticks[index], "stats_coalesce_ticks",
+			0, MAX_STATS_COALESCING_TICKS, ST_COAL_TK);
+		if ((stats_coalesce_ticks[index] > 0) &&
+			(stats_coalesce_ticks[index] < 100)) {
+			printk(KERN_WARNING "%s-%d: Invalid stats_coalesce_ticks parameter (%u), using 100\n", bcm5700_driver, index, (unsigned int) stats_coalesce_ticks[index]);
+			stats_coalesce_ticks[index] = 100;
+		}
+		pDevice->StatsCoalescingTicks = stats_coalesce_ticks[index];
+		pDevice->StatsCoalescingTicks = stats_coalesce_ticks[index];
+	}
+	else {
+		pUmDevice->rx_curr_coalesce_frames = RX_COAL_FM;
+		pUmDevice->rx_curr_coalesce_ticks = RX_COAL_TK;
+		pUmDevice->tx_curr_coalesce_frames = TX_COAL_FM;
+	}
+#endif
+
+#ifdef BCM_WOL
+	bcm5700_validate_param_range(pUmDevice, &enable_wol[index],
+		"enable_wol", 0, 1, 0);
+	if (enable_wol[index]) {
+		pDevice->WakeUpModeCap = LM_WAKE_UP_MODE_MAGIC_PACKET;
+		pDevice->WakeUpMode = LM_WAKE_UP_MODE_MAGIC_PACKET;
+	}
+#endif
+#ifdef BCM_NIC_SEND_BD
+	bcm5700_validate_param_range(pUmDevice, &nic_tx_bd[index], "nic_tx_bd",
+		0, 1, 0);
+	if (nic_tx_bd[index])
+		pDevice->Flags |= NIC_SEND_BD_FLAG;
+	if ((pDevice->Flags & ENABLE_PCIX_FIX_FLAG) ||
+		(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705)) {
+		if (pDevice->Flags & NIC_SEND_BD_FLAG) {
+			pDevice->Flags &= ~NIC_SEND_BD_FLAG;
+			printk(KERN_WARNING "%s-%d: Nic Send BDs not available on this NIC or not possible on this system\n", bcm5700_driver, index);
+		}
+	}
+#endif
+#if INCLUDE_TBI_SUPPORT
+	if (pDevice->TbiFlags & ENABLE_TBI_FLAG) {
+		if ((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5704) ||
+			(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5703)) {
+			/* just poll since we have hardware autoneg. in 5704 */
+			pDevice->TbiFlags |= TBI_PURE_POLLING_FLAG;
+		}
+		else {
+			pDevice->TbiFlags |= TBI_POLLING_INTR_FLAG;
+		}
+	}
+#endif
+	bcm5700_validate_param_range(pUmDevice, &scatter_gather[index],
+		"scatter_gather", 0, 1, 1);
+	bcm5700_validate_param_range(pUmDevice, &tx_checksum[index],
+		"tx_checksum", 0, 1, 1);
+	bcm5700_validate_param_range(pUmDevice, &rx_checksum[index],
+		"rx_checksum", 0, 1, 1);
+	if (!(pDevice->TaskOffloadCap & LM_TASK_OFFLOAD_TX_TCP_CHECKSUM)) {
+		if (tx_checksum[index] || rx_checksum[index]) {
+
+			pDevice->TaskToOffload = LM_TASK_OFFLOAD_NONE; 
+			printk(KERN_WARNING "%s-%d: Checksum offload not available on this NIC\n", bcm5700_driver, index);
+		}
+	}
+	else {
+		if (rx_checksum[index]) {
+			pDevice->TaskToOffload |=
+				LM_TASK_OFFLOAD_RX_TCP_CHECKSUM |
+				LM_TASK_OFFLOAD_RX_UDP_CHECKSUM;
+		}
+		if (tx_checksum[index]) {
+			pDevice->TaskToOffload |=
+				LM_TASK_OFFLOAD_TX_TCP_CHECKSUM |
+				LM_TASK_OFFLOAD_TX_UDP_CHECKSUM;
+			pDevice->Flags |= NO_TX_PSEUDO_HDR_CSUM_FLAG;
+		}
+	}
+#ifdef BCM_TSO
+	bcm5700_validate_param_range(pUmDevice, &enable_tso[index],
+		"enable_tso", 0, 1, 1);
+
+	/* Always enable TSO firmware if supported */
+	/* This way we can turn it on or off on the fly */
+	if (pDevice->TaskOffloadCap & LM_TASK_OFFLOAD_TCP_SEGMENTATION)
+	{
+		pDevice->TaskToOffload |=
+			LM_TASK_OFFLOAD_TCP_SEGMENTATION;
+	}
+	if (enable_tso[index] &&
+		!(pDevice->TaskToOffload & LM_TASK_OFFLOAD_TCP_SEGMENTATION))
+	{
+		printk(KERN_WARNING "%s-%d: TSO not available on this NIC\n", bcm5700_driver, index);
+	}
+#endif
+#ifdef BCM_ASF
+	bcm5700_validate_param_range(pUmDevice, &vlan_tag_mode[index],
+		"vlan_strip_mode", 0, 2, 0);
+	pUmDevice->vlan_tag_mode = vlan_tag_mode[index];
+#else
+	pUmDevice->vlan_tag_mode = VLAN_TAG_MODE_NORMAL_STRIP;
+#endif
+	bcm5700_validate_param_range(pUmDevice, &delay_link[index],
+		"delay_link", 0, 1, 0);
+	bcm5700_validate_param_range(pUmDevice, &disable_d3hot[index],
+		"disable_d3hot", 0, 1, 0);
+	if (disable_d3hot[index]) {
+#ifdef BCM_WOL
+		if (enable_wol[index]) {
+			pDevice->WakeUpModeCap = LM_WAKE_UP_MODE_NONE;
+			pDevice->WakeUpMode = LM_WAKE_UP_MODE_NONE;
+			printk(KERN_WARNING "%s-%d: Wake-On-Lan disabled because D3Hot is disabled\n", bcm5700_driver, index);
+		}
+#endif
+		pDevice->Flags |= DISABLE_D3HOT_FLAG;
+	}
+	return LM_STATUS_SUCCESS;
+}
+
+LM_STATUS
+MM_IndicateRxPackets(PLM_DEVICE_BLOCK pDevice)
+{
+	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK) pDevice;
+	PLM_PACKET pPacket;
+	PUM_PACKET pUmPacket;
+	struct sk_buff *skb;
+	int size;
+	int vlan_tag_size = 0;
+
+	if (pDevice->ReceiveMask & LM_KEEP_VLAN_TAG)
+		vlan_tag_size = 4;
+
+	while (1) {
+		pPacket = (PLM_PACKET)
+			QQ_PopHead(&pDevice->RxPacketReceivedQ.Container);
+		if (pPacket == 0)
+			break;
+		pUmPacket = (PUM_PACKET) pPacket;
+#if ! defined(NO_PCI_UNMAP)
+		pci_unmap_single(pUmDevice->pdev,
+				pci_unmap_addr(pUmPacket, map[0]),
+				pPacket->u.Rx.RxBufferSize,
+				PCI_DMA_FROMDEVICE);
+#endif
+		if ((pPacket->PacketStatus != LM_STATUS_SUCCESS) ||
+			((size = pPacket->PacketSize) >
+			(pDevice->RxMtu + vlan_tag_size))) {
+
+			/* reuse skb */
+#ifdef BCM_TASKLET
+			QQ_PushTail(&pUmDevice->rx_out_of_buf_q.Container, pPacket);
+#else
+			QQ_PushTail(&pDevice->RxPacketFreeQ.Container, pPacket);
+#endif
+			pUmDevice->rx_misc_errors++;
+			continue;
+		}
+		skb = pUmPacket->skbuff;
+		skb_put(skb, size);
+		skb->pkt_type = 0;
+		skb->protocol = eth_type_trans(skb, skb->dev);
+		if (size > pDevice->RxMtu) {
+			/* Make sure we have a valid VLAN tag */
+			if (htons(skb->protocol) != 0x8100) {
+				dev_kfree_skb_irq(skb);
+				pUmDevice->rx_misc_errors++;
+				goto drop_rx;
+			}
+		}
+		if ((pPacket->Flags & RCV_BD_FLAG_TCP_UDP_CHKSUM_FIELD) &&
+			(pDevice->TaskToOffload &
+				LM_TASK_OFFLOAD_RX_TCP_CHECKSUM)) {
+			if (pPacket->u.Rx.TcpUdpChecksum == 0xffff) {
+
+				skb->ip_summed = CHECKSUM_UNNECESSARY;
+#if TIGON3_DEBUG
+				pUmDevice->rx_good_chksum_count++;
+#endif
+			}
+			else {
+				skb->ip_summed = CHECKSUM_NONE;
+				pUmDevice->rx_bad_chksum_count++;
+			}
+		}
+		else {
+			skb->ip_summed = CHECKSUM_NONE;
+		}
+#ifdef NICE_SUPPORT
+		if( pUmDevice->nice_rx ) {
+			vlan_tag_t *vlan_tag;
+
+			vlan_tag = (vlan_tag_t *) &skb->cb[0];
+			if (pPacket->Flags & RCV_BD_FLAG_VLAN_TAG) {
+				vlan_tag->signature = 0x7777;
+				vlan_tag->tag = pPacket->VlanTag;
+			}
+			else {
+				vlan_tag->signature = 0;
+			}
+			pUmDevice->nice_rx(skb, pUmDevice->nice_ctx);
+		}
+		else
+#endif
+		{
+#ifdef BCM_VLAN
+			if (pUmDevice->vlgrp &&
+				(pPacket->Flags & RCV_BD_FLAG_VLAN_TAG)) {
+
+#ifdef BCM_NAPI_RXPOLL
+				vlan_hwaccel_receive_skb(skb, pUmDevice->vlgrp,
+					pPacket->VlanTag);
+#else
+				vlan_hwaccel_rx(skb, pUmDevice->vlgrp,
+					pPacket->VlanTag);
+#endif
+			}
+			else
+#endif
+			{
+#ifdef BCM_NAPI_RXPOLL
+				netif_receive_skb(skb);
+#else
+				netif_rx(skb);
+#endif
+			}
+		}
+		pUmDevice->dev->last_rx = jiffies;
+
+drop_rx:
+#ifdef BCM_TASKLET
+		pUmPacket->skbuff = 0;
+		QQ_PushTail(&pUmDevice->rx_out_of_buf_q.Container, pPacket);
+#else
+		skb = dev_alloc_skb(pPacket->u.Rx.RxBufferSize + 2);
+		if (skb == 0) {
+			pUmPacket->skbuff = 0;
+			QQ_PushTail(&pUmDevice->rx_out_of_buf_q.Container, pPacket);
+		}
+		else {
+			pUmPacket->skbuff = skb;
+			skb->dev = pUmDevice->dev;
+			skb_reserve(skb, pUmDevice->rx_buf_align);
+			QQ_PushTail(&pDevice->RxPacketFreeQ.Container, pPacket);
+		}
+#endif
+	}
+	return LM_STATUS_SUCCESS;
+}
+
+LM_STATUS
+MM_CoalesceTxBuffer(PLM_DEVICE_BLOCK pDevice, PLM_PACKET pPacket)
+{
+	PUM_PACKET pUmPacket = (PUM_PACKET) pPacket;
+	struct sk_buff *skb = pUmPacket->skbuff;
+	struct sk_buff *nskb;
+#if ! defined(NO_PCI_UNMAP)
+	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK) pDevice;
+
+	pci_unmap_single(pUmDevice->pdev,
+			pci_unmap_addr(pUmPacket, map[0]),
+			pci_unmap_len(pUmPacket, map_len[0]),
+			PCI_DMA_TODEVICE);
+#if MAX_SKB_FRAGS
+	{
+		int i;
+
+		for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
+			pci_unmap_page(pUmDevice->pdev,
+				pci_unmap_addr(pUmPacket, map[i + 1]),
+				pci_unmap_len(pUmPacket, map_len[i + 1]),
+				PCI_DMA_TODEVICE);
+		}
+	}
+#endif
+#endif
+	if ((nskb = skb_copy(skb, GFP_ATOMIC))) {
+		pUmPacket->lm_packet.u.Tx.FragCount = 1;
+		dev_kfree_skb(skb);
+		pUmPacket->skbuff = nskb;
+		return LM_STATUS_SUCCESS;
+	}
+	dev_kfree_skb(skb);
+	pUmPacket->skbuff = 0;
+	return LM_STATUS_FAILURE;
+}
+
+/* Returns 1 if not all buffers are allocated */
+STATIC int
+replenish_rx_buffers(PUM_DEVICE_BLOCK pUmDevice, int max)
+{
+	PLM_PACKET pPacket;
+	PUM_PACKET pUmPacket;
+	PLM_DEVICE_BLOCK pDevice = (PLM_DEVICE_BLOCK) pUmDevice;
+	struct sk_buff *skb;
+	int queue_rx = 0;
+	int alloc_cnt = 0;
+	int ret = 0;
+
+	while ((pUmPacket = (PUM_PACKET)
+		QQ_PopHead(&pUmDevice->rx_out_of_buf_q.Container)) != 0) {
+		pPacket = (PLM_PACKET) pUmPacket;
+		if (pUmPacket->skbuff) {
+			/* reuse an old skb */
+			QQ_PushTail(&pDevice->RxPacketFreeQ.Container, pPacket);
+			queue_rx = 1;
+			continue;
+		}
+		if ((skb = dev_alloc_skb(pPacket->u.Rx.RxBufferSize + 2)) == 0) {
+			QQ_PushHead(&pUmDevice->rx_out_of_buf_q.Container,
+				pPacket);
+			ret = 1;
+			break;
+		}
+		pUmPacket->skbuff = skb;
+		skb->dev = pUmDevice->dev;
+		skb_reserve(skb, pUmDevice->rx_buf_align);
+		QQ_PushTail(&pDevice->RxPacketFreeQ.Container, pPacket);
+		queue_rx = 1;
+		if (max > 0) {
+			alloc_cnt++;
+			if (alloc_cnt >= max)
+				break;
+		}
+	}
+	if (queue_rx || pDevice->QueueAgain) {
+		LM_QueueRxPackets(pDevice);
+	}
+	return ret;
+}
+
+LM_STATUS
+MM_IndicateTxPackets(PLM_DEVICE_BLOCK pDevice)
+{
+	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK) pDevice;
+	PLM_PACKET pPacket;
+	PUM_PACKET pUmPacket;
+	struct sk_buff *skb;
+#if ! defined(NO_PCI_UNMAP) && MAX_SKB_FRAGS
+	int i;
+#endif
+
+	while (1) {
+		pPacket = (PLM_PACKET)
+			QQ_PopHead(&pDevice->TxPacketXmittedQ.Container);
+		if (pPacket == 0)
+			break;
+		pUmPacket = (PUM_PACKET) pPacket;
+		skb = pUmPacket->skbuff;
+#if ! defined(NO_PCI_UNMAP)
+		pci_unmap_single(pUmDevice->pdev,
+				pci_unmap_addr(pUmPacket, map[0]),
+				pci_unmap_len(pUmPacket, map_len[0]),
+				PCI_DMA_TODEVICE);
+#if MAX_SKB_FRAGS
+		for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
+			pci_unmap_page(pUmDevice->pdev,
+				pci_unmap_addr(pUmPacket, map[i + 1]),
+				pci_unmap_len(pUmPacket, map_len[i + 1]),
+				PCI_DMA_TODEVICE);
+		}
+#endif
+#endif
+		dev_kfree_skb_irq(skb);
+		pUmPacket->skbuff = 0;
+		QQ_PushTail(&pDevice->TxPacketFreeQ.Container, pPacket);
+	}
+	if (pUmDevice->tx_full) {
+		if (QQ_GetEntryCnt(&pDevice->TxPacketFreeQ.Container) >=
+			(pDevice->TxPacketDescCnt >> 1)) {
+
+			pUmDevice->tx_full = 0;
+			netif_wake_queue(pUmDevice->dev);
+		}
+	}
+	return LM_STATUS_SUCCESS;
+}
+
+LM_STATUS
+MM_IndicateStatus(PLM_DEVICE_BLOCK pDevice, LM_STATUS Status)
+{
+	PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK) pDevice;
+	struct net_device *dev = pUmDevice->dev;
+	LM_FLOW_CONTROL flow_control;
+
+	if (!pUmDevice->opened)
+		return LM_STATUS_SUCCESS;
+
+	if (pUmDevice->delayed_link_ind > 0) {
+		pUmDevice->delayed_link_ind = 0;
+		if (Status == LM_STATUS_LINK_DOWN) {
+			pUmDevice->line_speed = 0;
+			netif_carrier_off(dev);
+			printk(KERN_ERR "%s: %s NIC Link is DOWN\n", bcm5700_driver, dev->name);
+		}
+		else if (Status == LM_STATUS_LINK_ACTIVE) {
+			netif_carrier_on(dev);
+			printk(KERN_INFO "%s: %s NIC Link is UP, ", bcm5700_driver, dev->name);
+		}
+	}
+	else {
+		if (Status == LM_STATUS_LINK_DOWN) {
+			pUmDevice->line_speed = 0;
+			netif_carrier_off(dev);
+			printk(KERN_ERR "%s: %s NIC Link is Down\n", bcm5700_driver, dev->name);
+		}
+		else if (Status == LM_STATUS_LINK_ACTIVE) {
+			netif_carrier_on(dev);
+			printk(KERN_INFO "%s: %s NIC Link is Up, ", bcm5700_driver, dev->name);
+		}
+	}
+
+	if (Status == LM_STATUS_LINK_ACTIVE) {
+		if (pDevice->LineSpeed == LM_LINE_SPEED_1000MBPS)
+			pUmDevice->line_speed = 1000;
+		else if (pDevice->LineSpeed == LM_LINE_SPEED_100MBPS)
+			pUmDevice->line_speed = 100;
+		else if (pDevice->LineSpeed == LM_LINE_SPEED_10MBPS)
+			pUmDevice->line_speed = 10;
+
+		printk("%d Mbps ", pUmDevice->line_speed);
+
+		if (pDevice->DuplexMode == LM_DUPLEX_MODE_FULL)
+			printk("full duplex");
+		else
+			printk("half duplex");
+
+		flow_control = pDevice->FlowControl &
+			(LM_FLOW_CONTROL_RECEIVE_PAUSE |
+			LM_FLOW_CONTROL_TRANSMIT_PAUSE);
+		if (flow_control) {
+			if (flow_control & LM_FLOW_CONTROL_RECEIVE_PAUSE) {
+				printk(", receive ");
+				if (flow_control & LM_FLOW_CONTROL_TRANSMIT_PAUSE)
+					printk("& transmit ");
+			}
+			else {
+				printk(", transmit ");
+			}
+			printk("flow control ON");
+		}
+		printk("\n");
+	}
+	return LM_STATUS_SUCCESS;
+}
+
+void
+MM_UnmapRxDma(LM_DEVICE_BLOCK *pDevice, LM_PACKET *pPacket)
+{
+#if ! defined(NO_PCI_UNMAP)
+	UM_DEVICE_BLOCK *pUmDevice = (UM_DEVICE_BLOCK *) pDevice;
+	UM_PACKET *pUmPacket = (UM_PACKET *) pPacket;
+
+	if (!pUmPacket->skbuff)
+		return;
+
+	pci_unmap_single(pUmDevice->pdev,
+			pci_unmap_addr(pUmPacket, map[0]),
+			pPacket->u.Rx.RxBufferSize,
+			PCI_DMA_FROMDEVICE);
+#endif
+}
+
+LM_STATUS
+MM_FreeRxBuffer(PLM_DEVICE_BLOCK pDevice, PLM_PACKET pPacket)
+{
+	PUM_PACKET pUmPacket;
+	struct sk_buff *skb;
+
+	if (pPacket == 0)
+		return LM_STATUS_SUCCESS;
+	pUmPacket = (PUM_PACKET) pPacket;
+	if ((skb = pUmPacket->skbuff)) {
+		/* DMA address already unmapped */
+		dev_kfree_skb(skb);
+	}
+	pUmPacket->skbuff = 0;
+	return LM_STATUS_SUCCESS;
+}
+
+LM_STATUS
+MM_Sleep(LM_DEVICE_BLOCK *pDevice, LM_UINT32 msec)
+{
+	current->state = TASK_INTERRUPTIBLE;
+	if (schedule_timeout(HZ * msec / 1000) != 0) {
+		return LM_STATUS_FAILURE;
+	}
+	if (signal_pending(current))
+		return LM_STATUS_FAILURE;
+
+	return LM_STATUS_SUCCESS;
+}
+
+void
+bcm5700_shutdown(UM_DEVICE_BLOCK *pUmDevice)
+{
+	LM_DEVICE_BLOCK *pDevice = (LM_DEVICE_BLOCK *) pUmDevice;
+
+	bcm5700_intr_off(pUmDevice);
+	netif_carrier_off(pUmDevice->dev);
+#ifdef BCM_TASKLET
+	tasklet_kill(&pUmDevice->tasklet);
+#endif
+	bcm5700_poll_wait(pUmDevice);
+	LM_Halt(pDevice);
+	pDevice->InitDone = 0;
+	bcm5700_free_remaining_rx_bufs(pUmDevice);
+}
+
+void
+bcm5700_free_remaining_rx_bufs(UM_DEVICE_BLOCK *pUmDevice)
+{
+	LM_DEVICE_BLOCK *pDevice = &pUmDevice->lm_dev;
+	UM_PACKET *pUmPacket;
+	int cnt, i;
+
+	cnt = QQ_GetEntryCnt(&pUmDevice->rx_out_of_buf_q.Container);
+	for (i = 0; i < cnt; i++) {
+		if ((pUmPacket =
+			QQ_PopHead(&pUmDevice->rx_out_of_buf_q.Container))
+			!= 0) {
+
+			MM_UnmapRxDma(pDevice, (LM_PACKET *) pUmPacket);
+			MM_FreeRxBuffer(pDevice, &pUmPacket->lm_packet);
+			QQ_PushTail(&pDevice->RxPacketFreeQ.Container,
+				pUmPacket);
+		}
+	}
+}
+
+void
+bcm5700_validate_param_range(UM_DEVICE_BLOCK *pUmDevice, int *param,
+	char *param_name, int min, int max, int deflt)
+{
+	if (((unsigned int) *param < (unsigned int) min) ||
+		((unsigned int) *param > (unsigned int) max)) {
+
+		printk(KERN_WARNING "%s-%d: Invalid %s parameter (%u), using %u\n", bcm5700_driver, pUmDevice->index, param_name, (unsigned int) *param, (unsigned int) deflt);
+		*param = deflt;
+	}
+}
+
+struct net_device *
+bcm5700_find_peer(struct net_device *dev)
+{
+	struct net_device *tmp_dev;
+	UM_DEVICE_BLOCK *pUmDevice, *pUmTmp;
+	LM_DEVICE_BLOCK *pDevice;
+
+	tmp_dev = 0;
+	pUmDevice = (UM_DEVICE_BLOCK *) dev->priv;
+	pDevice = &pUmDevice->lm_dev;
+	if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5704) {
+		tmp_dev = root_tigon3_dev;
+		while (tmp_dev) {
+			pUmTmp = (PUM_DEVICE_BLOCK) tmp_dev->priv;
+			if ((tmp_dev != dev) &&
+				(pUmDevice->pdev->bus->number ==
+				pUmTmp->pdev->bus->number) &&
+				PCI_SLOT(pUmDevice->pdev->devfn) ==
+				PCI_SLOT(pUmTmp->pdev->devfn)) {
+
+				break;
+			}
+			tmp_dev = pUmTmp->next_module;
+		}
+	}
+	return tmp_dev;
+}
+
+LM_DEVICE_BLOCK *
+MM_FindPeerDev(LM_DEVICE_BLOCK *pDevice)
+{
+	UM_DEVICE_BLOCK *pUmDevice = (UM_DEVICE_BLOCK *) pDevice;
+	struct net_device *dev = pUmDevice->dev;
+	struct net_device *peer_dev;
+
+	peer_dev = bcm5700_find_peer(dev);
+	if (!peer_dev)
+		return 0;
+	return ((LM_DEVICE_BLOCK *) peer_dev->priv);
+}
+
+#ifdef HAVE_POLL_CONTROLLER
+STATIC void
+poll_bcm5700(struct net_device *dev)
+{
+#ifdef RED_HAT_LINUX_KERNEL
+	if (!netdump_mode)
+#endif
+	{
+		disable_irq(dev->irq);
+	}
+	bcm5700_interrupt(dev->irq, dev, NULL);
+#ifdef RED_HAT_LINUX_KERNEL
+	if (!netdump_mode)
+#endif
+	{
+		enable_irq(dev->irq);
+	}
+}
+#endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/bits.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/bits.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/bits.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/bits.h	2004-09-05 15:48:48.000000000 +0200
@@ -0,0 +1,61 @@
+/******************************************************************************/
+/*                                                                            */
+/* Broadcom BCM5700 Linux Network Driver, Copyright (c) 2000 - 2003 Broadcom  */
+/* 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, located in the file LICENSE.                 */
+/*                                                                            */
+/* History:                                                                   */
+/*    02/25/00 Hav Khauv        Initial version.                              */
+/******************************************************************************/
+
+#ifndef BITS_H
+#define BITS_H
+
+
+
+/******************************************************************************/
+/* Bit Mask definitions */
+/******************************************************************************/
+
+#define BIT_NONE            0x00
+#define BIT_0               0x01
+#define BIT_1               0x02
+#define BIT_2               0x04
+#define BIT_3               0x08
+#define BIT_4               0x10
+#define BIT_5               0x20
+#define BIT_6               0x40
+#define BIT_7               0x80
+#define BIT_8               0x0100
+#define BIT_9               0x0200
+#define BIT_10              0x0400
+#define BIT_11              0x0800
+#define BIT_12              0x1000
+#define BIT_13              0x2000
+#define BIT_14              0x4000
+#define BIT_15              0x8000
+#define BIT_16              0x010000
+#define BIT_17              0x020000
+#define BIT_18              0x040000
+#define BIT_19              0x080000
+#define BIT_20              0x100000
+#define BIT_21              0x200000
+#define BIT_22              0x400000
+#define BIT_23              0x800000
+#define BIT_24              0x01000000
+#define BIT_25              0x02000000
+#define BIT_26              0x04000000
+#define BIT_27              0x08000000
+#define BIT_28              0x10000000
+#define BIT_29              0x20000000
+#define BIT_30              0x40000000
+#define BIT_31              0x80000000
+
+
+
+#endif /* BITS_H */
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/fw_lso05.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/fw_lso05.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/fw_lso05.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/fw_lso05.h	2004-09-05 15:48:48.000000000 +0200
@@ -0,0 +1,289 @@
+/******************************************************************************/
+/*                                                                            */
+/* Broadcom BCM5700 Linux Network Driver, Copyright (c) 2000 - 2003 Broadcom  */
+/* 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, located in the file LICENSE.                 */
+/*                                                                            */
+/* (c) COPYRIGHT 2001-2004 Broadcom Corporation, ALL RIGHTS RESERVED.         */
+/*                                                                            */
+/*  Name: F W _ L S O 0 5. H                                                  */
+/*  Author : Kevin Tran                                                       */
+/*  Version: 1.2                                                              */
+/*                                                                            */
+/* Module Description:  This file contains firmware binary code of TCP        */
+/* Segmentation firmware (BCM5705).                                           */
+/*                                                                            */
+/* History:                                                                   */
+/*    08/10/02 Kevin Tran       Incarnation.                                  */
+/*    02/02/04 Kevin Tran       Added Support for BCM5788.                    */
+/******************************************************************************/
+
+#ifndef __FW_LSO05_H__ 
+#define __FW_LSO05_H__ 
+
+int t3StkOffLd05FwReleaseMajor = 0x1;
+int t3StkOffLd05FwReleaseMinor = 0x2;
+int t3StkOffLd05FwReleaseFix = 0x0;
+U32 t3StkOffLd05FwStartAddr = 0x00010000;
+U32 t3StkOffLd05FwTextAddr = 0x00010000;
+int t3StkOffLd05FwTextLen = 0xe90;
+U32 t3StkOffLd05FwRodataAddr = 0x00010e90;
+int t3StkOffLd05FwRodataLen = 0x50;
+U32 t3StkOffLd05FwDataAddr = 0x00010f00;
+int t3StkOffLd05FwDataLen = 0x20;
+U32 t3StkOffLd05FwSbssAddr = 0x00010f20;
+int t3StkOffLd05FwSbssLen = 0x28;
+U32 t3StkOffLd05FwBssAddr = 0x00010f50;
+int t3StkOffLd05FwBssLen = 0x88;
+U32 t3StkOffLd05FwText[(0xe90/4) + 1] = {
+0xc004003, 0x0, 0x10f04, 
+0x0, 0x10000003, 0x0, 0xd, 
+0xd, 0x3c1d0001, 0x37bde000, 0x3a0f021, 
+0x3c100001, 0x26100000, 0xc004010, 0x0, 
+0xd, 0x27bdffe0, 0x3c04fefe, 0xafbf0018, 
+0xc0042e8, 0x34840002, 0xc004364, 0x0, 
+0x3c030001, 0x90630f34, 0x24020002, 0x3c040001, 
+0x24840e9c, 0x14620003, 0x24050001, 0x3c040001, 
+0x24840e90, 0x24060002, 0x3821, 0xafa00010, 
+0xc004378, 0xafa00014, 0xc00402c, 0x0, 
+0x8fbf0018, 0x3e00008, 0x27bd0020, 0x0, 
+0x0, 0x27bdffe0, 0xafbf001c, 0xafb20018, 
+0xafb10014, 0xc0042d4, 0xafb00010, 0x3c128000, 
+0x24110001, 0x8f706810, 0x32020400, 0x10400007, 
+0x0, 0x8f641008, 0x921024, 0x14400003, 
+0x0, 0xc004064, 0x0, 0x3c020001, 
+0x90420f56, 0x10510003, 0x32020200, 0x1040fff1, 
+0x0, 0xc0041b4, 0x0, 0x8004034, 
+0x0, 0x8fbf001c, 0x8fb20018, 0x8fb10014, 
+0x8fb00010, 0x3e00008, 0x27bd0020, 0x27bdffe0, 
+0x3c040001, 0x24840eb0, 0x2821, 0x3021, 
+0x3821, 0xafbf0018, 0xafa00010, 0xc004378, 
+0xafa00014, 0xd021, 0x24020130, 0xaf625000, 
+0x3c010001, 0xa4200f50, 0x3c010001, 0xa0200f57, 
+0x8fbf0018, 0x3e00008, 0x27bd0020, 0x0, 
+0x0, 0x3c030001, 0x24630f60, 0x90620000, 
+0x27bdfff0, 0x14400003, 0x80c021, 0x8004073, 
+0x4821, 0x3c022000, 0x3021024, 0x10400003, 
+0x24090002, 0x8004073, 0xa0600000, 0x24090001, 
+0x181040, 0x30431f80, 0x346f8008, 0x1520004b, 
+0x25eb0028, 0x3c040001, 0x832021, 0x8c848010, 
+0x3c050001, 0x24a50f7a, 0x41402, 0xa0a20000, 
+0x3c010001, 0xa0240f7b, 0x3c020001, 0x431021, 
+0x94428014, 0x3c010001, 0xa0220f7c, 0x3c0c0001, 
+0x1836021, 0x8d8c8018, 0x304200ff, 0x24420008, 
+0x220c3, 0x24020001, 0x3c010001, 0xa0220f60, 
+0x124102b, 0x1040000c, 0x3821, 0x24a6000e, 
+0x1602821, 0x8ca20000, 0x8ca30004, 0x24a50008, 
+0x24e70001, 0xacc20000, 0xacc30004, 0xe4102b, 
+0x1440fff8, 0x24c60008, 0x3821, 0x3c080001, 
+0x25080f7b, 0x91060000, 0x3c020001, 0x90420f7c, 
+0x2503000d, 0xc32821, 0x461023, 0x21fc2, 
+0x431021, 0x21043, 0x1840000c, 0x2021, 
+0x91020001, 0x461023, 0x21fc2, 0x431021, 
+0x21843, 0x94a20000, 0x24e70001, 0x822021, 
+0xe3102a, 0x1440fffb, 0x24a50002, 0x41c02, 
+0x3082ffff, 0x622021, 0x41402, 0x822021, 
+0x3c02ffff, 0x1821024, 0x3083ffff, 0x431025, 
+0x3c010001, 0x80040fa, 0xac220f80, 0x3c050001, 
+0x24a50f7c, 0x90a20000, 0x3c0c0001, 0x1836021, 
+0x8d8c8018, 0x220c2, 0x1080000e, 0x3821, 
+0x1603021, 0x24a5000c, 0x8ca20000, 0x8ca30004, 
+0x24a50008, 0x24e70001, 0xacc20000, 0xacc30004, 
+0xe4102b, 0x1440fff8, 0x24c60008, 0x3c050001, 
+0x24a50f7c, 0x90a20000, 0x30430007, 0x24020004, 
+0x10620011, 0x28620005, 0x10400005, 0x24020002, 
+0x10620008, 0x710c0, 0x80040fa, 0x0, 
+0x24020006, 0x1062000e, 0x710c0, 0x80040fa, 
+0x0, 0xa21821, 0x9463000c, 0x4b1021, 
+0x80040fa, 0xa4430000, 0x710c0, 0xa21821, 
+0x8c63000c, 0x4b1021, 0x80040fa, 0xac430000, 
+0xa21821, 0x8c63000c, 0x4b2021, 0xa21021, 
+0xac830000, 0x94420010, 0xa4820004, 0x95e70006, 
+0x3c020001, 0x90420f7c, 0x3c030001, 0x90630f7a, 
+0xe2c823, 0x3c020001, 0x90420f7b, 0x24630028, 
+0x1e34021, 0x24420028, 0x15200012, 0x1e23021, 
+0x94c2000c, 0x3c010001, 0xa4220f78, 0x94c20004, 
+0x94c30006, 0x3c010001, 0xa4200f76, 0x3c010001, 
+0xa4200f72, 0x21400, 0x431025, 0x3c010001, 
+0xac220f6c, 0x95020004, 0x3c010001, 0x8004124, 
+0xa4220f70, 0x3c020001, 0x94420f70, 0x3c030001, 
+0x94630f72, 0x431021, 0xa5020004, 0x3c020001, 
+0x94420f6c, 0xa4c20004, 0x3c020001, 0x8c420f6c, 
+0xa4c20006, 0x3c040001, 0x94840f72, 0x3c020001, 
+0x94420f70, 0x3c0a0001, 0x954a0f76, 0x441821, 
+0x3063ffff, 0x62182a, 0x24020002, 0x1122000b, 
+0x832023, 0x3c030001, 0x94630f78, 0x30620009, 
+0x10400006, 0x3062fff6, 0xa4c2000c, 0x3c020001, 
+0x94420f78, 0x30420009, 0x1425023, 0x24020001, 
+0x1122001b, 0x29220002, 0x50400005, 0x24020002, 
+0x11200007, 0x31a2ffff, 0x8004197, 0x0, 
+0x1122001d, 0x24020016, 0x8004197, 0x31a2ffff, 
+0x3c0e0001, 0x95ce0f80, 0x10800005, 0x1806821, 
+0x1c42021, 0x41c02, 0x3082ffff, 0x627021, 
+0xe1027, 0xa502000a, 0x3c030001, 0x90630f7b, 
+0x31a2ffff, 0xe21021, 0x800418d, 0x432023, 
+0x3c020001, 0x94420f80, 0x442021, 0x41c02, 
+0x3082ffff, 0x622021, 0x807021, 0x41027, 
+0x8004185, 0xa502000a, 0x3c050001, 0x24a50f7a, 
+0x90a30000, 0x14620002, 0x24e2fff2, 0xa5e20034, 
+0x90a20000, 0xe21023, 0xa5020002, 0x3c030001, 
+0x94630f80, 0x3c020001, 0x94420f5a, 0x30e5ffff, 
+0x641821, 0x451023, 0x622023, 0x41c02, 
+0x3082ffff, 0x622021, 0x41027, 0xa502000a, 
+0x3c030001, 0x90630f7c, 0x24620001, 0x14a20005, 
+0x807021, 0x1631021, 0x90420000, 0x8004185, 
+0x26200, 0x24620002, 0x14a20003, 0x306200fe, 
+0x4b1021, 0x944c0000, 0x3c020001, 0x94420f82, 
+0x3183ffff, 0x3c040001, 0x90840f7b, 0x431021, 
+0xe21021, 0x442023, 0x8a2021, 0x41c02, 
+0x3082ffff, 0x622021, 0x41402, 0x822021, 
+0x806821, 0x41027, 0xa4c20010, 0x31a2ffff, 
+0xe1c00, 0x431025, 0x3c040001, 0x24840f72, 
+0xade20010, 0x94820000, 0x3c050001, 0x94a50f76, 
+0x3c030001, 0x8c630f6c, 0x24420001, 0xb92821, 
+0xa4820000, 0x3322ffff, 0x622021, 0x83182b, 
+0x3c010001, 0xa4250f76, 0x10600003, 0x24a2ffff, 
+0x3c010001, 0xa4220f76, 0x3c024000, 0x3021025, 
+0x3c010001, 0xac240f6c, 0xaf621008, 0x3e00008, 
+0x27bd0010, 0x3c030001, 0x90630f56, 0x27bdffe8, 
+0x24020001, 0xafbf0014, 0x10620026, 0xafb00010, 
+0x8f620cf4, 0x2442ffff, 0x3042007f, 0x21100, 
+0x8c434000, 0x3c010001, 0xac230f64, 0x8c434008, 
+0x24444000, 0x8c5c4004, 0x30620040, 0x14400002, 
+0x24020088, 0x24020008, 0x3c010001, 0xa4220f68, 
+0x30620004, 0x10400005, 0x24020001, 0x3c010001, 
+0xa0220f57, 0x80041d5, 0x31402, 0x3c010001, 
+0xa0200f57, 0x31402, 0x3c010001, 0xa4220f54, 
+0x9483000c, 0x24020001, 0x3c010001, 0xa4200f50, 
+0x3c010001, 0xa0220f56, 0x3c010001, 0xa4230f62, 
+0x24020001, 0x1342001e, 0x0, 0x13400005, 
+0x24020003, 0x13420067, 0x0, 0x80042cf, 
+0x0, 0x3c020001, 0x94420f62, 0x241a0001, 
+0x3c010001, 0xa4200f5e, 0x3c010001, 0xa4200f52, 
+0x304407ff, 0x21bc2, 0x31823, 0x3063003e, 
+0x34630036, 0x21242, 0x3042003c, 0x621821, 
+0x3c010001, 0xa4240f58, 0x832021, 0x24630030, 
+0x3c010001, 0xa4240f5a, 0x3c010001, 0xa4230f5c, 
+0x3c060001, 0x24c60f52, 0x94c50000, 0x94c30002, 
+0x3c040001, 0x94840f5a, 0x651021, 0x44102a, 
+0x10400013, 0x3c108000, 0xa31021, 0xa4c20000, 
+0x3c02a000, 0xaf620cf4, 0x3c010001, 0xa0200f56, 
+0x8f641008, 0x901024, 0x14400003, 0x0, 
+0xc004064, 0x0, 0x8f620cf4, 0x501024, 
+0x104000b7, 0x0, 0x800420f, 0x0, 
+0x3c030001, 0x94630f50, 0x851023, 0xa4c40000, 
+0x621821, 0x3042ffff, 0x3c010001, 0xa4230f50, 
+0xaf620ce8, 0x3c020001, 0x94420f68, 0x34420024, 
+0xaf620cec, 0x94c30002, 0x3c020001, 0x94420f50, 
+0x14620012, 0x3c028000, 0x3c108000, 0x3c02a000, 
+0xaf620cf4, 0x3c010001, 0xa0200f56, 0x8f641008, 
+0x901024, 0x14400003, 0x0, 0xc004064, 
+0x0, 0x8f620cf4, 0x501024, 0x1440fff7, 
+0x0, 0x80042cf, 0x241a0003, 0xaf620cf4, 
+0x3c108000, 0x8f641008, 0x901024, 0x14400003, 
+0x0, 0xc004064, 0x0, 0x8f620cf4, 
+0x501024, 0x1440fff7, 0x0, 0x80042cf, 
+0x241a0003, 0x3c070001, 0x24e70f50, 0x94e20000, 
+0x3821021, 0xaf620ce0, 0x3c020001, 0x8c420f64, 
+0xaf620ce4, 0x3c050001, 0x94a50f54, 0x94e30000, 
+0x3c040001, 0x94840f58, 0x3c020001, 0x94420f5e, 
+0xa32823, 0x822023, 0x30a6ffff, 0x3083ffff, 
+0xc3102b, 0x14400043, 0x0, 0x3c020001, 
+0x94420f5c, 0x21400, 0x621025, 0xaf620ce8, 
+0x94e20000, 0x3c030001, 0x94630f54, 0x441021, 
+0xa4e20000, 0x3042ffff, 0x14430021, 0x3c020008, 
+0x3c020001, 0x90420f57, 0x10400006, 0x3c03000c, 
+0x3c020001, 0x94420f68, 0x34630624, 0x800427c, 
+0xd021, 0x3c020001, 0x94420f68, 0x3c030008, 
+0x34630624, 0x431025, 0xaf620cec, 0x3c108000, 
+0x3c02a000, 0xaf620cf4, 0x3c010001, 0xa0200f56, 
+0x8f641008, 0x901024, 0x14400003, 0x0, 
+0xc004064, 0x0, 0x8f620cf4, 0x501024, 
+0x10400015, 0x0, 0x8004283, 0x0, 
+0x3c030001, 0x94630f68, 0x34420624, 0x3c108000, 
+0x621825, 0x3c028000, 0xaf630cec, 0xaf620cf4, 
+0x8f641008, 0x901024, 0x14400003, 0x0, 
+0xc004064, 0x0, 0x8f620cf4, 0x501024, 
+0x1440fff7, 0x0, 0x3c010001, 0x80042cf, 
+0xa4200f5e, 0x3c020001, 0x94420f5c, 0x21400, 
+0xc21025, 0xaf620ce8, 0x3c020001, 0x90420f57, 
+0x10400009, 0x3c03000c, 0x3c020001, 0x94420f68, 
+0x34630624, 0xd021, 0x431025, 0xaf620cec, 
+0x80042c1, 0x3c108000, 0x3c020001, 0x94420f68, 
+0x3c030008, 0x34630604, 0x431025, 0xaf620cec, 
+0x3c020001, 0x94420f5e, 0x451021, 0x3c010001, 
+0xa4220f5e, 0x3c108000, 0x3c02a000, 0xaf620cf4, 
+0x3c010001, 0xa0200f56, 0x8f641008, 0x901024, 
+0x14400003, 0x0, 0xc004064, 0x0, 
+0x8f620cf4, 0x501024, 0x1440fff7, 0x0, 
+0x8fbf0014, 0x8fb00010, 0x3e00008, 0x27bd0018, 
+0x0, 0x27bdffe0, 0x3c040001, 0x24840ec0, 
+0x2821, 0x3021, 0x3821, 0xafbf0018, 
+0xafa00010, 0xc004378, 0xafa00014, 0xd021, 
+0x24020130, 0xaf625000, 0x3c010001, 0xa4200f50, 
+0x3c010001, 0xa0200f57, 0x8fbf0018, 0x3e00008, 
+0x27bd0020, 0x27bdffe8, 0x3c1bc000, 0xafbf0014, 
+0xafb00010, 0xaf60680c, 0x8f626804, 0x34420082, 
+0xaf626804, 0x8f634000, 0x24020b50, 0x3c010001, 
+0xac220f20, 0x24020b78, 0x3c010001, 0xac220f30, 
+0x34630002, 0xaf634000, 0xc004315, 0x808021, 
+0x3c010001, 0xa0220f34, 0x304200ff, 0x24030002, 
+0x14430005, 0x0, 0x3c020001, 0x8c420f20, 
+0x8004308, 0xac5000c0, 0x3c020001, 0x8c420f20, 
+0xac5000bc, 0x8f624434, 0x8f634438, 0x8f644410, 
+0x3c010001, 0xac220f28, 0x3c010001, 0xac230f38, 
+0x3c010001, 0xac240f24, 0x8fbf0014, 0x8fb00010, 
+0x3e00008, 0x27bd0018, 0x3e00008, 0x24020001, 
+0x27bdfff8, 0x18800009, 0x2821, 0x8f63680c, 
+0x8f62680c, 0x1043fffe, 0x0, 0x24a50001, 
+0xa4102a, 0x1440fff9, 0x0, 0x3e00008, 
+0x27bd0008, 0x8f634450, 0x3c020001, 0x8c420f28, 
+0x31c02, 0x43102b, 0x14400008, 0x3c038000, 
+0x3c040001, 0x8c840f38, 0x8f624450, 0x21c02, 
+0x83102b, 0x1040fffc, 0x3c038000, 0xaf634444, 
+0x8f624444, 0x431024, 0x1440fffd, 0x0, 
+0x8f624448, 0x3e00008, 0x3042ffff, 0x3082ffff, 
+0x2442e000, 0x2c422001, 0x14400003, 0x3c024000, 
+0x8004347, 0x2402ffff, 0x822025, 0xaf645c38, 
+0x8f625c30, 0x30420002, 0x1440fffc, 0x1021, 
+0x3e00008, 0x0, 0x8f624450, 0x3c030001, 
+0x8c630f24, 0x8004350, 0x3042ffff, 0x8f624450, 
+0x3042ffff, 0x43102b, 0x1440fffc, 0x0, 
+0x3e00008, 0x0, 0x27bdffe0, 0x802821, 
+0x3c040001, 0x24840ed0, 0x3021, 0x3821, 
+0xafbf0018, 0xafa00010, 0xc004378, 0xafa00014, 
+0x800435f, 0x0, 0x8fbf0018, 0x3e00008, 
+0x27bd0020, 0x3c020001, 0x3442d600, 0x3c030001, 
+0x3463d600, 0x3c040001, 0x3484ddff, 0x3c010001, 
+0xac220f40, 0x24020040, 0x3c010001, 0xac220f44, 
+0x3c010001, 0xac200f3c, 0xac600000, 0x24630004, 
+0x83102b, 0x5040fffd, 0xac600000, 0x3e00008, 
+0x0, 0x804821, 0x8faa0010, 0x3c020001, 
+0x8c420f3c, 0x3c040001, 0x8c840f44, 0x8fab0014, 
+0x24430001, 0x44102b, 0x3c010001, 0xac230f3c, 
+0x14400003, 0x4021, 0x3c010001, 0xac200f3c, 
+0x3c020001, 0x8c420f3c, 0x3c030001, 0x8c630f40, 
+0x91240000, 0x21140, 0x431021, 0x481021, 
+0x25080001, 0xa0440000, 0x29020008, 0x1440fff4, 
+0x25290001, 0x3c020001, 0x8c420f3c, 0x3c030001, 
+0x8c630f40, 0x8f64680c, 0x21140, 0x431021, 
+0xac440008, 0xac45000c, 0xac460010, 0xac470014, 
+0xac4a0018, 0x3e00008, 0xac4b001c, 0x0, 
+0x0, 0x0 };
+U32 t3StkOffLd05FwRodata[(0x50/4) + 1] = {
+0x4d61696e, 
+0x43707542, 0x0, 0x4d61696e, 0x43707541, 
+0x0, 0x0, 0x0, 0x73746b6f, 
+0x66666c64, 0x0, 0x0, 0x73746b6f, 
+0x66666c64, 0x0, 0x0, 0x66617461, 
+0x6c457272, 0x0, 0x0, 0x0 };
+U32 t3StkOffLd05FwData[(0x20/4) + 1] = {
+0x0, 
+0x73746b6f, 0x66666c64, 0x5f76312e, 0x322e3000, 
+0x0, 0x0, 0x0, 0x0 };
+
+#endif /* __FW_LSO05_H__   */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/fw_stkoffld.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/fw_stkoffld.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/fw_stkoffld.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/fw_stkoffld.h	2004-09-05 15:48:48.000000000 +0200
@@ -0,0 +1,519 @@
+/******************************************************************************/
+/*                                                                            */
+/* Broadcom BCM5700 Linux Network Driver, Copyright (c) 2000 - 2003 Broadcom  */
+/* 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, located in the file LICENSE.                 */
+/*                                                                            */
+/* (c) COPYRIGHT 2000-2003 Broadcom Corporation, ALL RIGHTS RESERVED.         */
+/*                                                                            */
+/*  Name: F W _ S T K O F F L D . H                                           */
+/*  Author  : Kevin Tran                                                      */
+/*  Version : 1.6                                                             */
+/*                                                                            */
+/* Module Description:  This file contains firmware binary code of for TCP/IP */
+/* stack offload support.  Currently, this firmware supports the following    */
+/* features:                                                                  */
+/*     1. TCP segmentation (aka Large Send Offload -- LSO)                    */
+/*     2. UDP Checksum offload support for IP fragmented UDP frames.          */
+/*                                                                            */
+/* History:                                                                   */
+/*    07/17/01 Kevin Tran       Incarnation.                                  */
+/*    10/10/01 Kevin Tran       Added UDP checksum offload support.           */
+/*    10/20/01 Kevin Tran       Fixed a problem where pseudo checksum is not  */
+/*                              calculated correctly in case of IP            */
+/*                              fragmentation case.                           */
+/*    10/30/01 Kevin Tran       Fixed a problem where checksum is incorrectly */
+/*                              computed if bit BD_FLAG_TCP_UDP_CKSUM is set  */
+/*                              in Send BDs.                                  */
+/*    05/30/02 Kevin Tran       Fixed a problem where UDP checksum is         */
+/*                              incorrectly computed if the length of data is */
+/*                              less than 6 bytes in the last packetst of     */
+/*                              of a chain of fragmented IP/UDP packets.      */
+/*    12/01/02 Kevin Tran       Fixed a problem where firmware might lockup   */
+/*                              in a certain test scenario with BCM5704.      */
+/*    12/10/02 Kevin Tran       Fixed a problem where IP checksum might be    */
+/*                              incorrectly calculated in some corner cases.  */
+/*                              This problem should ONLY happen with BCM5702/ */
+/*                              BCM5703/BCM5704 ASICs.                        */
+/*    06/20/03 Kevin Tran       Optimized performance so that pre-DMA code    */
+/*                              doesn't have to wait until the first packet   */
+/*                              is completely DMAed before it can setup DMAs  */
+/*                              for subsequent packets.  This requires host   */
+/*                              driver to pass IP/TCP option lengths if any   */
+/*                              to F/W via bit 15..12 of Send BD flag.        */
+/*    08/12/03 Kevin Tran       Fixed a problem where UDP checksum doesn't    */
+/*                              work when the host driver seeds pseudo        */
+/*                              checksum.                                     */
+/*    12/24/03 Kevin Tran       Fixed a problem where VLAN tag is not         */
+/*                              inserted correctly in LSO mode.               */
+/*    01/16/04 Kevin Tran       Fixed a problem where Ethernet Type is not    */
+/*                              set to 0x8870 when the outgoing LSO packet is */
+/*                              jumbo frame with SNAP encapsulation.          */
+/******************************************************************************/
+
+#ifndef __FW_STKOFFLD_H__ 
+#define __FW_STKOFFLD_H__ 
+
+typedef LM_UINT32 U32;
+
+int t3StkOffLdFwReleaseMajor = 0x1;
+int t3StkOffLdFwReleaseMinor = 0x6;
+int t3StkOffLdFwReleaseFix = 0x0;
+U32 t3StkOffLdFwStartAddr = 0x08000000;
+U32 t3StkOffLdFwTextAddr = 0x08000000;
+int t3StkOffLdFwTextLen = 0x1aa0;
+U32 t3StkOffLdFwRodataAddr = 0x08001aa0;
+int t3StkOffLdFwRodataLen = 0x60;
+U32 t3StkOffLdFwDataAddr = 0x08001b20;
+int t3StkOffLdFwDataLen = 0x30;
+U32 t3StkOffLdFwSbssAddr = 0x08001b50;
+int t3StkOffLdFwSbssLen = 0x2c;
+U32 t3StkOffLdFwBssAddr = 0x08001b80;
+int t3StkOffLdFwBssLen = 0x894;
+U32 t3StkOffLdFwText[(0x1aa0/4) + 1] = {
+0xe000003, 0x0, 0x8001b24, 
+0x0, 0x10000003, 0x0, 0xd, 
+0xd, 0x3c1d0800, 0x37bd4000, 0x3a0f021, 
+0x3c100800, 0x26100000, 0xe000010, 0x0, 
+0xd, 0x27bdffe0, 0x3c04fefe, 0xafbf0018, 
+0xe0005d8, 0x34840002, 0xe000668, 0x0, 
+0x3c030800, 0x90631b68, 0x24020002, 0x3c040800, 
+0x24841aac, 0x14620003, 0x24050001, 0x3c040800, 
+0x24841aa0, 0x24060006, 0x3821, 0xafa00010, 
+0xe00067c, 0xafa00014, 0x8f625c50, 0x34420001, 
+0xaf625c50, 0x8f625c90, 0x34420001, 0xaf625c90, 
+0x2402ffff, 0xe000034, 0xaf625404, 0x8fbf0018, 
+0x3e00008, 0x27bd0020, 0x0, 0x0, 
+0x0, 0x27bdffe0, 0xafbf001c, 0xafb20018, 
+0xafb10014, 0xe00005b, 0xafb00010, 0x24120002, 
+0x24110001, 0x8f706820, 0x32020100, 0x10400003, 
+0x0, 0xe0000bb, 0x0, 0x8f706820, 
+0x32022000, 0x10400004, 0x32020001, 0xe0001f0, 
+0x24040001, 0x32020001, 0x10400003, 0x0, 
+0xe0000a3, 0x0, 0x3c020800, 0x90421b98, 
+0x14520003, 0x0, 0xe0004c0, 0x0, 
+0xa00003c, 0xaf715028, 0x8fbf001c, 0x8fb20018, 
+0x8fb10014, 0x8fb00010, 0x3e00008, 0x27bd0020, 
+0x27bdffe0, 0x3c040800, 0x24841ac0, 0x2821, 
+0x3021, 0x3821, 0xafbf0018, 0xafa00010, 
+0xe00067c, 0xafa00014, 0x3c040800, 0x248423d8, 
+0xa4800000, 0x3c010800, 0xa0201b98, 0x3c010800, 
+0xac201b9c, 0x3c010800, 0xac201ba0, 0x3c010800, 
+0xac201ba4, 0x3c010800, 0xac201bac, 0x3c010800, 
+0xac201bb8, 0x3c010800, 0xac201bbc, 0x8f624434, 
+0x3c010800, 0xac221b88, 0x8f624438, 0x3c010800, 
+0xac221b8c, 0x8f624410, 0xac80f7a8, 0x3c010800, 
+0xac201b84, 0x3c010800, 0xac2023e0, 0x3c010800, 
+0xac2023c8, 0x3c010800, 0xac2023cc, 0x3c010800, 
+0xac202400, 0x3c010800, 0xac221b90, 0x8f620068, 
+0x24030007, 0x21702, 0x10430005, 0x0, 
+0x8f620068, 0x21702, 0x14400004, 0x24020001, 
+0x3c010800, 0xa000097, 0xac20240c, 0xac820034, 
+0x3c040800, 0x24841acc, 0x3c050800, 0x8ca5240c, 
+0x3021, 0x3821, 0xafa00010, 0xe00067c, 
+0xafa00014, 0x8fbf0018, 0x3e00008, 0x27bd0020, 
+0x27bdffe0, 0x3c040800, 0x24841ad8, 0x2821, 
+0x3021, 0x3821, 0xafbf0018, 0xafa00010, 
+0xe00067c, 0xafa00014, 0xe00005b, 0x0, 
+0xe0000b4, 0x2021, 0x8fbf0018, 0x3e00008, 
+0x27bd0020, 0x24020001, 0x8f636820, 0x821004, 
+0x21027, 0x621824, 0x3e00008, 0xaf636820, 
+0x27bdffd0, 0xafbf002c, 0xafb60028, 0xafb50024, 
+0xafb40020, 0xafb3001c, 0xafb20018, 0xafb10014, 
+0xafb00010, 0x8f675c5c, 0x3c030800, 0x24631bbc, 
+0x8c620000, 0x14470005, 0x3c0200ff, 0x3c020800, 
+0x90421b98, 0x14400119, 0x3c0200ff, 0x3442fff8, 
+0xe28824, 0xac670000, 0x111902, 0x306300ff, 
+0x30e20003, 0x211c0, 0x622825, 0xa04021, 
+0x71602, 0x3c030800, 0x90631b98, 0x3044000f, 
+0x14600036, 0x804821, 0x24020001, 0x3c010800, 
+0xa0221b98, 0x51100, 0x821025, 0x3c010800, 
+0xac201b9c, 0x3c010800, 0xac201ba0, 0x3c010800, 
+0xac201ba4, 0x3c010800, 0xac201bac, 0x3c010800, 
+0xac201bb8, 0x3c010800, 0xac201bb0, 0x3c010800, 
+0xac201bb4, 0x3c010800, 0xa42223d8, 0x9622000c, 
+0x30437fff, 0x3c010800, 0xa4222410, 0x30428000, 
+0x3c010800, 0xa4231bc6, 0x10400005, 0x24020001, 
+0x3c010800, 0xac2223f4, 0xa000102, 0x2406003e, 
+0x24060036, 0x3c010800, 0xac2023f4, 0x9622000a, 
+0x3c030800, 0x94631bc6, 0x3c010800, 0xac2023f0, 
+0x3c010800, 0xac2023f8, 0x21302, 0x21080, 
+0xc21021, 0x621821, 0x3c010800, 0xa42223d0, 
+0x3c010800, 0xa000115, 0xa4231b96, 0x9622000c, 
+0x3c010800, 0xa42223ec, 0x3c040800, 0x24841b9c, 
+0x8c820000, 0x21100, 0x3c010800, 0x220821, 
+0xac311bc8, 0x8c820000, 0x21100, 0x3c010800, 
+0x220821, 0xac271bcc, 0x8c820000, 0x25030001, 
+0x306601ff, 0x21100, 0x3c010800, 0x220821, 
+0xac261bd0, 0x8c820000, 0x21100, 0x3c010800, 
+0x220821, 0xac291bd4, 0x96230008, 0x3c020800, 
+0x8c421bac, 0x432821, 0x3c010800, 0xac251bac, 
+0x9622000a, 0x30420004, 0x14400018, 0x61100, 
+0x8f630c14, 0x3063000f, 0x2c620002, 0x1440000b, 
+0x3c02c000, 0x8f630c14, 0x3c020800, 0x8c421b40, 
+0x3063000f, 0x24420001, 0x3c010800, 0xac221b40, 
+0x2c620002, 0x1040fff7, 0x3c02c000, 0xe21825, 
+0xaf635c5c, 0x8f625c50, 0x30420002, 0x10400014, 
+0x0, 0xa000147, 0x0, 0x3c030800, 
+0x8c631b80, 0x3c040800, 0x94841b94, 0x1221025, 
+0x3c010800, 0xa42223da, 0x24020001, 0x3c010800, 
+0xac221bb8, 0x24630001, 0x85202a, 0x3c010800, 
+0x10800003, 0xac231b80, 0x3c010800, 0xa4251b94, 
+0x3c060800, 0x24c61b9c, 0x8cc20000, 0x24420001, 
+0xacc20000, 0x28420080, 0x14400005, 0x0, 
+0xe000656, 0x24040002, 0xa0001e6, 0x0, 
+0x3c020800, 0x8c421bb8, 0x10400078, 0x24020001, 
+0x3c050800, 0x90a51b98, 0x14a20072, 0x0, 
+0x3c150800, 0x96b51b96, 0x3c040800, 0x8c841bac, 
+0x32a3ffff, 0x83102a, 0x1440006c, 0x0, 
+0x14830003, 0x0, 0x3c010800, 0xac2523f0, 
+0x1060005c, 0x9021, 0x24d60004, 0x60a021, 
+0x24d30014, 0x8ec20000, 0x28100, 0x3c110800, 
+0x2308821, 0xe000625, 0x8e311bc8, 0x402821, 
+0x10a00054, 0x0, 0x9628000a, 0x31020040, 
+0x10400005, 0x2407180c, 0x8e22000c, 0x2407188c, 
+0x21400, 0xaca20018, 0x3c030800, 0x701821, 
+0x8c631bd0, 0x3c020800, 0x501021, 0x8c421bd4, 
+0x31d00, 0x21400, 0x621825, 0xaca30014, 
+0x8ec30004, 0x96220008, 0x432023, 0x3242ffff, 
+0x3083ffff, 0x431021, 0x282102a, 0x14400002, 
+0x2b23023, 0x803021, 0x8e620000, 0x30c4ffff, 
+0x441021, 0xae620000, 0x8e220000, 0xaca20000, 
+0x8e220004, 0x8e63fff4, 0x431021, 0xaca20004, 
+0xa4a6000e, 0x8e62fff4, 0x441021, 0xae62fff4, 
+0x96230008, 0x43102a, 0x14400005, 0x2469021, 
+0x8e62fff0, 0xae60fff4, 0x24420001, 0xae62fff0, 
+0xaca00008, 0x3242ffff, 0x14540008, 0x24020305, 
+0x31020080, 0x54400001, 0x34e70010, 0x24020905, 
+0xa4a2000c, 0xa0001cb, 0x34e70020, 0xa4a2000c, 
+0x3c020800, 0x8c4223f0, 0x10400003, 0x3c024b65, 
+0xa0001d3, 0x34427654, 0x3c02b49a, 0x344289ab, 
+0xaca2001c, 0x30e2ffff, 0xaca20010, 0xe0005a2, 
+0xa02021, 0x3242ffff, 0x54102b, 0x1440ffa9, 
+0x0, 0x24020002, 0x3c010800, 0xa0001e6, 
+0xa0221b98, 0x8ec2083c, 0x24420001, 0xa0001e6, 
+0xaec2083c, 0xe0004c0, 0x0, 0x8fbf002c, 
+0x8fb60028, 0x8fb50024, 0x8fb40020, 0x8fb3001c, 
+0x8fb20018, 0x8fb10014, 0x8fb00010, 0x3e00008, 
+0x27bd0030, 0x27bdffd0, 0xafbf0028, 0xafb30024, 
+0xafb20020, 0xafb1001c, 0xafb00018, 0x8f725c9c, 
+0x3c0200ff, 0x3442fff8, 0x3c070800, 0x24e71bb4, 
+0x2428824, 0x9623000e, 0x8ce20000, 0x431021, 
+0xace20000, 0x8e220010, 0x30420020, 0x14400011, 
+0x809821, 0xe00063b, 0x2202021, 0x3c02c000, 
+0x2421825, 0xaf635c9c, 0x8f625c90, 0x30420002, 
+0x1040011e, 0x0, 0xaf635c9c, 0x8f625c90, 
+0x30420002, 0x10400119, 0x0, 0xa00020d, 
+0x0, 0x8e240008, 0x8e230014, 0x41402, 
+0x231c0, 0x31502, 0x304201ff, 0x2442ffff, 
+0x3042007f, 0x31942, 0x30637800, 0x21100, 
+0x24424000, 0x624821, 0x9522000a, 0x3084ffff, 
+0x30420008, 0x104000b0, 0x429c0, 0x3c020800, 
+0x8c422400, 0x14400024, 0x24c50008, 0x94c20014, 
+0x3c010800, 0xa42223d0, 0x8cc40010, 0x41402, 
+0x3c010800, 0xa42223d2, 0x3c010800, 0xa42423d4, 
+0x94c2000e, 0x3083ffff, 0x431023, 0x3c010800, 
+0xac222408, 0x94c2001a, 0x3c010800, 0xac262400, 
+0x3c010800, 0xac322404, 0x3c010800, 0xac2223fc, 
+0x3c02c000, 0x2421825, 0xaf635c9c, 0x8f625c90, 
+0x30420002, 0x104000e5, 0x0, 0xaf635c9c, 
+0x8f625c90, 0x30420002, 0x104000e0, 0x0, 
+0xa000246, 0x0, 0x94c2000e, 0x3c030800, 
+0x946323d4, 0x434023, 0x3103ffff, 0x2c620008, 
+0x1040001c, 0x0, 0x94c20014, 0x24420028, 
+0xa22821, 0x31042, 0x1840000b, 0x2021, 
+0x24e60848, 0x403821, 0x94a30000, 0x8cc20000, 
+0x24840001, 0x431021, 0xacc20000, 0x87102a, 
+0x1440fff9, 0x24a50002, 0x31020001, 0x1040001f, 
+0x3c024000, 0x3c040800, 0x248423fc, 0xa0a00001, 
+0x94a30000, 0x8c820000, 0x431021, 0xa000285, 
+0xac820000, 0x8f626800, 0x3c030010, 0x431024, 
+0x10400009, 0x0, 0x94c2001a, 0x3c030800, 
+0x8c6323fc, 0x431021, 0x3c010800, 0xac2223fc, 
+0xa000286, 0x3c024000, 0x94c2001a, 0x94c4001c, 
+0x3c030800, 0x8c6323fc, 0x441023, 0x621821, 
+0x3c010800, 0xac2323fc, 0x3c024000, 0x2421825, 
+0xaf635c9c, 0x8f625c90, 0x30420002, 0x1440fffc, 
+0x0, 0x9522000a, 0x30420010, 0x1040009b, 
+0x0, 0x3c030800, 0x946323d4, 0x3c070800, 
+0x24e72400, 0x8ce40000, 0x8f626800, 0x24630030, 
+0x832821, 0x3c030010, 0x431024, 0x1440000a, 
+0x0, 0x94a20004, 0x3c040800, 0x8c842408, 
+0x3c030800, 0x8c6323fc, 0x441023, 0x621821, 
+0x3c010800, 0xac2323fc, 0x3c040800, 0x8c8423fc, 
+0x41c02, 0x3082ffff, 0x622021, 0x41402, 
+0x822021, 0x41027, 0xa4a20006, 0x3c030800, 
+0x8c632404, 0x3c0200ff, 0x3442fff8, 0x628824, 
+0x96220008, 0x24050001, 0x24034000, 0x231c0, 
+0x801021, 0xa4c2001a, 0xa4c0001c, 0xace00000, 
+0x3c010800, 0xac251b60, 0xaf635cb8, 0x8f625cb0, 
+0x30420002, 0x10400003, 0x0, 0x3c010800, 
+0xac201b60, 0x8e220008, 0xaf625cb8, 0x8f625cb0, 
+0x30420002, 0x10400003, 0x0, 0x3c010800, 
+0xac201b60, 0x3c020800, 0x8c421b60, 0x1040ffec, 
+0x0, 0x3c040800, 0xe00063b, 0x8c842404, 
+0xa00032a, 0x0, 0x3c030800, 0x90631b98, 
+0x24020002, 0x14620003, 0x3c034b65, 0xa0002e1, 
+0x8021, 0x8e22001c, 0x34637654, 0x10430002, 
+0x24100002, 0x24100001, 0xc02021, 0xe000350, 
+0x2003021, 0x24020003, 0x3c010800, 0xa0221b98, 
+0x24020002, 0x1202000a, 0x24020001, 0x3c030800, 
+0x8c6323f0, 0x10620006, 0x0, 0x3c020800, 
+0x944223d8, 0x21400, 0xa00031f, 0xae220014, 
+0x3c040800, 0x248423da, 0x94820000, 0x21400, 
+0xae220014, 0x3c020800, 0x8c421bbc, 0x3c03c000, 
+0x3c010800, 0xa0201b98, 0x431025, 0xaf625c5c, 
+0x8f625c50, 0x30420002, 0x10400009, 0x0, 
+0x2484f7e2, 0x8c820000, 0x431025, 0xaf625c5c, 
+0x8f625c50, 0x30420002, 0x1440fffa, 0x0, 
+0x3c020800, 0x24421b84, 0x8c430000, 0x24630001, 
+0xac430000, 0x8f630c14, 0x3063000f, 0x2c620002, 
+0x1440000c, 0x3c024000, 0x8f630c14, 0x3c020800, 
+0x8c421b40, 0x3063000f, 0x24420001, 0x3c010800, 
+0xac221b40, 0x2c620002, 0x1040fff7, 0x0, 
+0x3c024000, 0x2421825, 0xaf635c9c, 0x8f625c90, 
+0x30420002, 0x1440fffc, 0x0, 0x12600003, 
+0x0, 0xe0004c0, 0x0, 0x8fbf0028, 
+0x8fb30024, 0x8fb20020, 0x8fb1001c, 0x8fb00018, 
+0x3e00008, 0x27bd0030, 0x8f634450, 0x3c040800, 
+0x24841b88, 0x8c820000, 0x31c02, 0x43102b, 
+0x14400007, 0x3c038000, 0x8c840004, 0x8f624450, 
+0x21c02, 0x83102b, 0x1040fffc, 0x3c038000, 
+0xaf634444, 0x8f624444, 0x431024, 0x1440fffd, 
+0x0, 0x8f624448, 0x3e00008, 0x3042ffff, 
+0x3c024000, 0x822025, 0xaf645c38, 0x8f625c30, 
+0x30420002, 0x1440fffc, 0x0, 0x3e00008, 
+0x0, 0x27bdffe0, 0x805821, 0x14c00011, 
+0x256e0008, 0x3c020800, 0x8c4223f4, 0x10400007, 
+0x24020016, 0x3c010800, 0xa42223d2, 0x2402002a, 
+0x3c010800, 0xa000364, 0xa42223d4, 0x8d670010, 
+0x71402, 0x3c010800, 0xa42223d2, 0x3c010800, 
+0xa42723d4, 0x3c040800, 0x948423d4, 0x3c030800, 
+0x946323d2, 0x95cf0006, 0x3c020800, 0x944223d0, 
+0x832023, 0x1e2c023, 0x3065ffff, 0x24a20028, 
+0x1c24821, 0x3082ffff, 0x14c0001a, 0x1226021, 
+0x9582000c, 0x3042003f, 0x3c010800, 0xa42223d6, 
+0x95820004, 0x95830006, 0x3c010800, 0xac2023e4, 
+0x3c010800, 0xac2023e8, 0x21400, 0x431025, 
+0x3c010800, 0xac221bc0, 0x95220004, 0x3c010800, 
+0xa4221bc4, 0x95230002, 0x1e51023, 0x43102a, 
+0x10400010, 0x24020001, 0x3c010800, 0xa000398, 
+0xac2223f8, 0x3c030800, 0x8c6323e8, 0x3c020800, 
+0x94421bc4, 0x431021, 0xa5220004, 0x3c020800, 
+0x94421bc0, 0xa5820004, 0x3c020800, 0x8c421bc0, 
+0xa5820006, 0x3c020800, 0x8c4223f0, 0x3c0d0800, 
+0x8dad23e4, 0x3c0a0800, 0x144000e5, 0x8d4a23e8, 
+0x3c020800, 0x94421bc4, 0x4a1821, 0x3063ffff, 
+0x62182b, 0x24020002, 0x10c2000d, 0x1435023, 
+0x3c020800, 0x944223d6, 0x30420009, 0x10400008, 
+0x0, 0x9582000c, 0x3042fff6, 0xa582000c, 
+0x3c020800, 0x944223d6, 0x30420009, 0x1a26823, 
+0x3c020800, 0x8c4223f8, 0x1040004a, 0x1203821, 
+0x3c020800, 0x944223d2, 0x4021, 0xa520000a, 
+0x1e21023, 0xa5220002, 0x3082ffff, 0x21042, 
+0x18400008, 0x3021, 0x401821, 0x94e20000, 
+0x25080001, 0xc23021, 0x103102a, 0x1440fffb, 
+0x24e70002, 0x61c02, 0x30c2ffff, 0x623021, 
+0x61402, 0xc23021, 0xc02821, 0x61027, 
+0xa522000a, 0x3021, 0x2527000c, 0x4021, 
+0x94e20000, 0x25080001, 0xc23021, 0x2d020004, 
+0x1440fffb, 0x24e70002, 0x95220002, 0x4021, 
+0x91230009, 0x442023, 0x1803821, 0x3082ffff, 
+0xa4e00010, 0x621821, 0x21042, 0x18400010, 
+0xc33021, 0x404821, 0x94e20000, 0x24e70002, 
+0xc23021, 0x30e2007f, 0x14400006, 0x25080001, 
+0x8d630000, 0x3c02007f, 0x3442ff80, 0x625824, 
+0x25670008, 0x109102a, 0x1440fff3, 0x0, 
+0x30820001, 0x10400005, 0x61c02, 0xa0e00001, 
+0x94e20000, 0xc23021, 0x61c02, 0x30c2ffff, 
+0x623021, 0x61402, 0xc23021, 0xa00047d, 
+0x30c6ffff, 0x24020002, 0x14c20081, 0x0, 
+0x3c020800, 0x8c42240c, 0x14400007, 0x0, 
+0x3c020800, 0x944223d2, 0x95230002, 0x1e21023, 
+0x10620077, 0x0, 0x3c020800, 0x944223d2, 
+0x1e21023, 0xa5220002, 0x3c020800, 0x8c42240c, 
+0x1040001a, 0x31e3ffff, 0x8dc70010, 0x3c020800, 
+0x94421b96, 0xe04021, 0x72c02, 0xaa2021, 
+0x431023, 0x823823, 0x72402, 0x30e2ffff, 
+0x823821, 0x71027, 0xa522000a, 0x3102ffff, 
+0x3c040800, 0x948423d4, 0x453023, 0xe02821, 
+0x641823, 0x6d1821, 0xc33021, 0x61c02, 
+0x30c2ffff, 0xa00047d, 0x623021, 0x1203821, 
+0x4021, 0x3082ffff, 0x21042, 0x18400008, 
+0x3021, 0x401821, 0x94e20000, 0x25080001, 
+0xc23021, 0x103102a, 0x1440fffb, 0x24e70002, 
+0x61c02, 0x30c2ffff, 0x623021, 0x61402, 
+0xc23021, 0xc02821, 0x61027, 0xa522000a, 
+0x3021, 0x2527000c, 0x4021, 0x94e20000, 
+0x25080001, 0xc23021, 0x2d020004, 0x1440fffb, 
+0x24e70002, 0x95220002, 0x4021, 0x91230009, 
+0x442023, 0x1803821, 0x3082ffff, 0xa4e00010, 
+0x3c040800, 0x948423d4, 0x621821, 0xc33021, 
+0x61c02, 0x30c2ffff, 0x623021, 0x61c02, 
+0x3c020800, 0x944223d0, 0xc34821, 0x441023, 
+0x21fc2, 0x431021, 0x21043, 0x18400010, 
+0x3021, 0x402021, 0x94e20000, 0x24e70002, 
+0xc23021, 0x30e2007f, 0x14400006, 0x25080001, 
+0x8d630000, 0x3c02007f, 0x3442ff80, 0x625824, 
+0x25670008, 0x104102a, 0x1440fff3, 0x0, 
+0x3c020800, 0x944223ec, 0xc23021, 0x3122ffff, 
+0xc23021, 0x61c02, 0x30c2ffff, 0x623021, 
+0x61402, 0xc23021, 0xc04021, 0x61027, 
+0xa5820010, 0xadc00014, 0xa00049d, 0xadc00000, 
+0x8dc70010, 0xe04021, 0x11400007, 0x72c02, 
+0xaa3021, 0x61402, 0x30c3ffff, 0x433021, 
+0x61402, 0xc22821, 0x51027, 0xa522000a, 
+0x3c030800, 0x946323d4, 0x3102ffff, 0x1e21021, 
+0x433023, 0xcd3021, 0x61c02, 0x30c2ffff, 
+0x623021, 0x61402, 0xc23021, 0xc04021, 
+0x61027, 0xa5820010, 0x3102ffff, 0x51c00, 
+0x431025, 0xadc20010, 0x3c020800, 0x8c4223f4, 
+0x10400005, 0x2de205eb, 0x14400002, 0x25e2fff2, 
+0x34028870, 0xa5c20034, 0x3c030800, 0x246323e8, 
+0x8c620000, 0x24420001, 0xac620000, 0x3c040800, 
+0x8c8423e4, 0x3c020800, 0x8c421bc0, 0x3303ffff, 
+0x832021, 0x431821, 0x62102b, 0x3c010800, 
+0xac2423e4, 0x10400003, 0x2482ffff, 0x3c010800, 
+0xac2223e4, 0x3c010800, 0xac231bc0, 0x3e00008, 
+0x27bd0020, 0x27bdffb8, 0x3c050800, 0x24a51b96, 
+0xafbf0044, 0xafbe0040, 0xafb7003c, 0xafb60038, 
+0xafb50034, 0xafb40030, 0xafb3002c, 0xafb20028, 
+0xafb10024, 0xafb00020, 0x94a90000, 0x3c020800, 
+0x944223d0, 0x3c030800, 0x8c631bb0, 0x3c040800, 
+0x8c841bac, 0x1221023, 0x64182a, 0xa7a9001e, 
+0x106000be, 0xa7a20016, 0x24be0022, 0x97b6001e, 
+0x24b3001a, 0x24b70016, 0x8fc20000, 0x14400008, 
+0x0, 0x8fc2fff8, 0x97a30016, 0x8fc4fff4, 
+0x431021, 0x82202a, 0x148000b0, 0x0, 
+0x97d50818, 0x32a2ffff, 0x104000a3, 0x9021, 
+0x40a021, 0x8821, 0xe000625, 0x0, 
+0x403021, 0x14c00007, 0x0, 0x3c020800, 
+0x8c4223dc, 0x24420001, 0x3c010800, 0xa000596, 
+0xac2223dc, 0x3c100800, 0x2118021, 0x8e101bc8, 
+0x9608000a, 0x31020040, 0x10400005, 0x2407180c, 
+0x8e02000c, 0x2407188c, 0x21400, 0xacc20018, 
+0x31020080, 0x54400001, 0x34e70010, 0x3c020800, 
+0x511021, 0x8c421bd0, 0x3c030800, 0x711821, 
+0x8c631bd4, 0x21500, 0x31c00, 0x431025, 
+0xacc20014, 0x96040008, 0x3242ffff, 0x821021, 
+0x282102a, 0x14400002, 0x2b22823, 0x802821, 
+0x8e020000, 0x2459021, 0xacc20000, 0x8e020004, 
+0xc02021, 0x26310010, 0xac820004, 0x30e2ffff, 
+0xac800008, 0xa485000e, 0xac820010, 0x24020305, 
+0xe0005a2, 0xa482000c, 0x3242ffff, 0x54102b, 
+0x1440ffc5, 0x3242ffff, 0xa00058e, 0x0, 
+0x8e620000, 0x8e63fffc, 0x43102a, 0x10400067, 
+0x0, 0x8e62fff0, 0x28900, 0x3c100800, 
+0x2118021, 0xe000625, 0x8e101bc8, 0x403021, 
+0x14c00005, 0x0, 0x8e62082c, 0x24420001, 
+0xa000596, 0xae62082c, 0x9608000a, 0x31020040, 
+0x10400005, 0x2407180c, 0x8e02000c, 0x2407188c, 
+0x21400, 0xacc20018, 0x3c020800, 0x511021, 
+0x8c421bd0, 0x3c030800, 0x711821, 0x8c631bd4, 
+0x21500, 0x31c00, 0x431025, 0xacc20014, 
+0x8e63fff4, 0x96020008, 0x432023, 0x3242ffff, 
+0x3083ffff, 0x431021, 0x2c2102a, 0x10400003, 
+0x802821, 0x97a9001e, 0x1322823, 0x8e620000, 
+0x30a4ffff, 0x441021, 0xae620000, 0xa4c5000e, 
+0x8e020000, 0xacc20000, 0x8e020004, 0x8e63fff4, 
+0x431021, 0xacc20004, 0x8e63fff4, 0x96020008, 
+0x641821, 0x62102a, 0x14400006, 0x2459021, 
+0x8e62fff0, 0xae60fff4, 0x24420001, 0xa000571, 
+0xae62fff0, 0xae63fff4, 0xacc00008, 0x3242ffff, 
+0x10560003, 0x31020004, 0x10400006, 0x24020305, 
+0x31020080, 0x54400001, 0x34e70010, 0x34e70020, 
+0x24020905, 0xa4c2000c, 0x8ee30000, 0x8ee20004, 
+0x14620007, 0x3c02b49a, 0x8ee20860, 0x54400001, 
+0x34e70400, 0x3c024b65, 0xa000588, 0x34427654, 
+0x344289ab, 0xacc2001c, 0x30e2ffff, 0xacc20010, 
+0xe0005a2, 0xc02021, 0x3242ffff, 0x56102b, 
+0x1440ff9b, 0x0, 0x8e620000, 0x8e63fffc, 
+0x43102a, 0x1440ff48, 0x0, 0x8fbf0044, 
+0x8fbe0040, 0x8fb7003c, 0x8fb60038, 0x8fb50034, 
+0x8fb40030, 0x8fb3002c, 0x8fb20028, 0x8fb10024, 
+0x8fb00020, 0x3e00008, 0x27bd0048, 0x27bdffe8, 
+0xafbf0014, 0xafb00010, 0x8f624450, 0x8f634410, 
+0xa0005b1, 0x808021, 0x8f626820, 0x30422000, 
+0x10400003, 0x0, 0xe0001f0, 0x2021, 
+0x8f624450, 0x8f634410, 0x3042ffff, 0x43102b, 
+0x1440fff5, 0x0, 0x8f630c14, 0x3063000f, 
+0x2c620002, 0x1440000b, 0x0, 0x8f630c14, 
+0x3c020800, 0x8c421b40, 0x3063000f, 0x24420001, 
+0x3c010800, 0xac221b40, 0x2c620002, 0x1040fff7, 
+0x0, 0xaf705c18, 0x8f625c10, 0x30420002, 
+0x10400009, 0x0, 0x8f626820, 0x30422000, 
+0x1040fff8, 0x0, 0xe0001f0, 0x2021, 
+0xa0005c4, 0x0, 0x8fbf0014, 0x8fb00010, 
+0x3e00008, 0x27bd0018, 0x0, 0x0, 
+0x0, 0x27bdffe8, 0x3c1bc000, 0xafbf0014, 
+0xafb00010, 0xaf60680c, 0x8f626804, 0x34420082, 
+0xaf626804, 0x8f634000, 0x24020b50, 0x3c010800, 
+0xac221b54, 0x24020b78, 0x3c010800, 0xac221b64, 
+0x34630002, 0xaf634000, 0xe000605, 0x808021, 
+0x3c010800, 0xa0221b68, 0x304200ff, 0x24030002, 
+0x14430005, 0x0, 0x3c020800, 0x8c421b54, 
+0xa0005f8, 0xac5000c0, 0x3c020800, 0x8c421b54, 
+0xac5000bc, 0x8f624434, 0x8f634438, 0x8f644410, 
+0x3c010800, 0xac221b5c, 0x3c010800, 0xac231b6c, 
+0x3c010800, 0xac241b58, 0x8fbf0014, 0x8fb00010, 
+0x3e00008, 0x27bd0018, 0x3c040800, 0x8c870000, 
+0x3c03aa55, 0x3463aa55, 0x3c06c003, 0xac830000, 
+0x8cc20000, 0x14430007, 0x24050002, 0x3c0355aa, 
+0x346355aa, 0xac830000, 0x8cc20000, 0x50430001, 
+0x24050001, 0x3c020800, 0xac470000, 0x3e00008, 
+0xa01021, 0x27bdfff8, 0x18800009, 0x2821, 
+0x8f63680c, 0x8f62680c, 0x1043fffe, 0x0, 
+0x24a50001, 0xa4102a, 0x1440fff9, 0x0, 
+0x3e00008, 0x27bd0008, 0x8f634450, 0x3c020800, 
+0x8c421b5c, 0x31c02, 0x43102b, 0x14400008, 
+0x3c038000, 0x3c040800, 0x8c841b6c, 0x8f624450, 
+0x21c02, 0x83102b, 0x1040fffc, 0x3c038000, 
+0xaf634444, 0x8f624444, 0x431024, 0x1440fffd, 
+0x0, 0x8f624448, 0x3e00008, 0x3042ffff, 
+0x3082ffff, 0x2442e000, 0x2c422001, 0x14400003, 
+0x3c024000, 0xa000648, 0x2402ffff, 0x822025, 
+0xaf645c38, 0x8f625c30, 0x30420002, 0x1440fffc, 
+0x1021, 0x3e00008, 0x0, 0x8f624450, 
+0x3c030800, 0x8c631b58, 0xa000651, 0x3042ffff, 
+0x8f624450, 0x3042ffff, 0x43102b, 0x1440fffc, 
+0x0, 0x3e00008, 0x0, 0x27bdffe0, 
+0x802821, 0x3c040800, 0x24841af0, 0x3021, 
+0x3821, 0xafbf0018, 0xafa00010, 0xe00067c, 
+0xafa00014, 0xa000660, 0x0, 0x8fbf0018, 
+0x3e00008, 0x27bd0020, 0x0, 0x0, 
+0x0, 0x3c020800, 0x34423000, 0x3c030800, 
+0x34633000, 0x3c040800, 0x348437ff, 0x3c010800, 
+0xac221b74, 0x24020040, 0x3c010800, 0xac221b78, 
+0x3c010800, 0xac201b70, 0xac600000, 0x24630004, 
+0x83102b, 0x5040fffd, 0xac600000, 0x3e00008, 
+0x0, 0x804821, 0x8faa0010, 0x3c020800, 
+0x8c421b70, 0x3c040800, 0x8c841b78, 0x8fab0014, 
+0x24430001, 0x44102b, 0x3c010800, 0xac231b70, 
+0x14400003, 0x4021, 0x3c010800, 0xac201b70, 
+0x3c020800, 0x8c421b70, 0x3c030800, 0x8c631b74, 
+0x91240000, 0x21140, 0x431021, 0x481021, 
+0x25080001, 0xa0440000, 0x29020008, 0x1440fff4, 
+0x25290001, 0x3c020800, 0x8c421b70, 0x3c030800, 
+0x8c631b74, 0x8f64680c, 0x21140, 0x431021, 
+0xac440008, 0xac45000c, 0xac460010, 0xac470014, 
+0xac4a0018, 0x3e00008, 0xac4b001c, 0x0, 
+0x0, 0x0 };
+U32 t3StkOffLdFwRodata[(0x60/4) + 1] = {
+0x4d61696e, 
+0x43707542, 0x0, 0x4d61696e, 0x43707541, 
+0x0, 0x0, 0x0, 0x73746b6f, 
+0x66666c64, 0x496e0000, 0x73746b6f, 0x66662a2a, 
+0x0, 0x53774576, 0x656e7430, 0x0, 
+0x0, 0x0, 0x0, 0x66617461, 
+0x6c457272, 0x0, 0x0, 0x0 };
+U32 t3StkOffLdFwData[(0x30/4) + 1] = {
+0x0, 0x73746b6f, 0x66666c64, 
+0x5f76312e, 0x362e3000, 0x0, 0x0, 
+0x0, 0x0, 0x0, 0x0, 
+0x0, 0x0 };
+
+#endif /* __FW_STKOFFLD_H__  */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/lm.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/lm.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/lm.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/lm.h	2004-09-05 15:48:48.000000000 +0200
@@ -0,0 +1,466 @@
+/******************************************************************************/
+/*                                                                            */
+/* Broadcom BCM5700 Linux Network Driver, Copyright (c) 2000 - 2003 Broadcom  */
+/* 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, located in the file LICENSE.                 */
+/*                                                                            */
+/* History:                                                                   */
+/*    02/25/00 Hav Khauv        Initial version.                              */
+/******************************************************************************/
+
+#ifndef LM_H
+#define LM_H
+
+#include "queue.h"
+#include "bits.h"
+
+
+
+/******************************************************************************/
+/* Basic types. */
+/******************************************************************************/
+
+typedef char           LM_CHAR,    *PLM_CHAR;
+typedef unsigned int   LM_UINT,    *PLM_UINT;
+typedef unsigned char  LM_UINT8,   *PLM_UINT8;
+typedef unsigned short LM_UINT16,  *PLM_UINT16;
+typedef unsigned int   LM_UINT32,  *PLM_UINT32;
+typedef unsigned int   LM_COUNTER, *PLM_COUNTER;
+typedef void           LM_VOID,    *PLM_VOID;
+typedef char           LM_BOOL,    *PLM_BOOL;
+
+/* 64bit value. */
+typedef struct {
+#ifdef BIG_ENDIAN_HOST
+    LM_UINT32 High;
+    LM_UINT32 Low;
+#else /* BIG_ENDIAN_HOST */
+    LM_UINT32 Low;
+    LM_UINT32 High;
+#endif /* !BIG_ENDIAN_HOST */
+} LM_UINT64, *PLM_UINT64;
+
+typedef LM_UINT64 LM_PHYSICAL_ADDRESS, *PLM_PHYSICAL_ADDRESS;
+
+/* void LM_INC_PHYSICAL_ADDRESS(PLM_PHYSICAL_ADDRESS pAddr,LM_UINT32 IncSize) */
+#define LM_INC_PHYSICAL_ADDRESS(pAddr, IncSize)             \
+    {                                                       \
+        LM_UINT32 OrgLow;                                   \
+                                                            \
+        OrgLow = (pAddr)->Low;                              \
+        (pAddr)->Low += IncSize;                            \
+        if((pAddr)->Low < OrgLow) {                         \
+            (pAddr)->High++; /* Wrap around. */             \
+        }                                                   \
+    }
+    
+
+#ifndef TRUE
+#define TRUE           1
+#endif /* TRUE */
+
+#ifndef FALSE
+#define FALSE          0
+#endif /* FALSE */
+
+#ifndef NULL
+#define NULL                ((void *) 0)
+#endif /* NULL */
+
+#ifndef OFFSETOF
+#define OFFSETOF(_s, _m)    (MM_UINT_PTR(&(((_s *) 0)->_m)))
+#endif /* OFFSETOF */
+
+
+
+/******************************************************************************/
+/* Simple macros. */
+/******************************************************************************/
+
+#define IS_ETH_BROADCAST(_pEthAddr)                                         \
+    (((unsigned char *) (_pEthAddr))[0] == ((unsigned char) 0xff))
+
+#define IS_ETH_MULTICAST(_pEthAddr)                                         \
+    (((unsigned char *) (_pEthAddr))[0] & ((unsigned char) 0x01))
+
+#define IS_ETH_ADDRESS_EQUAL(_pEtherAddr1, _pEtherAddr2)                    \
+    ((((unsigned char *) (_pEtherAddr1))[0] ==                              \
+    ((unsigned char *) (_pEtherAddr2))[0]) &&                               \
+    (((unsigned char *) (_pEtherAddr1))[1] ==                               \
+    ((unsigned char *) (_pEtherAddr2))[1]) &&                               \
+    (((unsigned char *) (_pEtherAddr1))[2] ==                               \
+    ((unsigned char *) (_pEtherAddr2))[2]) &&                               \
+    (((unsigned char *) (_pEtherAddr1))[3] ==                               \
+    ((unsigned char *) (_pEtherAddr2))[3]) &&                               \
+    (((unsigned char *) (_pEtherAddr1))[4] ==                               \
+    ((unsigned char *) (_pEtherAddr2))[4]) &&                               \
+    (((unsigned char *) (_pEtherAddr1))[5] ==                               \
+    ((unsigned char *) (_pEtherAddr2))[5]))
+
+#define COPY_ETH_ADDRESS(_Src, _Dst)                                        \
+    ((unsigned char *) (_Dst))[0] = ((unsigned char *) (_Src))[0];          \
+    ((unsigned char *) (_Dst))[1] = ((unsigned char *) (_Src))[1];          \
+    ((unsigned char *) (_Dst))[2] = ((unsigned char *) (_Src))[2];          \
+    ((unsigned char *) (_Dst))[3] = ((unsigned char *) (_Src))[3];          \
+    ((unsigned char *) (_Dst))[4] = ((unsigned char *) (_Src))[4];          \
+    ((unsigned char *) (_Dst))[5] = ((unsigned char *) (_Src))[5];
+
+
+
+/******************************************************************************/
+/* Constants. */
+/******************************************************************************/
+
+#define ETHERNET_ADDRESS_SIZE           6
+#define ETHERNET_PACKET_HEADER_SIZE     14
+#define MIN_ETHERNET_PACKET_SIZE        64      /* with 4 byte crc. */
+#define MAX_ETHERNET_PACKET_SIZE        1518    /* with 4 byte crc. */
+#define MIN_ETHERNET_PACKET_SIZE_NO_CRC 60
+#define MAX_ETHERNET_PACKET_SIZE_NO_CRC 1514
+#define MAX_ETHERNET_PACKET_BUFFER_SIZE 1536    /* A nice even number. */
+#define MAX_ETHERNET_JUMBO_PACKET_SIZE_NO_CRC 9014
+
+#ifndef LM_MAX_MC_TABLE_SIZE
+#define LM_MAX_MC_TABLE_SIZE            32
+#endif /* LM_MAX_MC_TABLE_SIZE */
+#define LM_MC_ENTRY_SIZE                (ETHERNET_ADDRESS_SIZE+1)
+#define LM_MC_INSTANCE_COUNT_INDEX      (LM_MC_ENTRY_SIZE-1)
+
+
+/* Receive filter masks. */
+#define LM_ACCEPT_UNICAST               0x0001
+#define LM_ACCEPT_MULTICAST             0x0002
+#define LM_ACCEPT_ALL_MULTICAST         0x0004
+#define LM_ACCEPT_BROADCAST             0x0008
+#define LM_ACCEPT_ERROR_PACKET          0x0010
+#define LM_KEEP_VLAN_TAG                0x0020
+
+#define LM_PROMISCUOUS_MODE             0x10000
+
+
+
+/******************************************************************************/
+/* PCI registers. */
+/******************************************************************************/
+
+#define PCI_VENDOR_ID_REG               0x00
+#define PCI_DEVICE_ID_REG               0x02
+
+#define PCI_COMMAND_REG                 0x04
+#define PCI_IO_SPACE_ENABLE             0x0001
+#define PCI_MEM_SPACE_ENABLE            0x0002
+#define PCI_BUSMASTER_ENABLE            0x0004
+#define PCI_MEMORY_WRITE_INVALIDATE     0x0010
+#define PCI_PARITY_ERROR_ENABLE         0x0040
+#define PCI_SYSTEM_ERROR_ENABLE         0x0100
+#define PCI_FAST_BACK_TO_BACK_ENABLE    0x0200
+
+#define PCI_STATUS_REG                  0x06
+#define PCI_REV_ID_REG                  0x08
+
+#define PCI_CACHE_LINE_SIZE_REG         0x0c
+
+#define PCI_IO_BASE_ADDR_REG            0x10
+#define PCI_IO_BASE_ADDR_MASK           0xfffffff0
+
+#define PCI_MEM_BASE_ADDR_LOW           0x10
+#define PCI_MEM_BASE_ADDR_HIGH          0x14
+
+#define PCI_SUBSYSTEM_VENDOR_ID_REG     0x2c
+#define PCI_SUBSYSTEM_ID_REG            0x2e
+#define PCI_INT_LINE_REG                0x3c
+
+#define PCIX_CAP_REG                    0x40
+#define PCIX_ENABLE_RELAXED_ORDERING    BIT_17
+
+/******************************************************************************/
+/* Fragment structure. */
+/******************************************************************************/
+
+typedef struct {
+    LM_UINT32 FragSize;
+    LM_PHYSICAL_ADDRESS FragBuf;
+} LM_FRAG, *PLM_FRAG;
+
+typedef struct {
+    /* FragCount is initialized for the caller to the maximum array size, on */
+    /* return FragCount is the number of the actual fragments in the array. */
+    LM_UINT32 FragCount;
+
+    /* Total buffer size. */
+    LM_UINT32 TotalSize;
+
+    /* Fragment array buffer. */
+    LM_FRAG Fragments[1];
+} LM_FRAG_LIST, *PLM_FRAG_LIST;
+
+#define DECLARE_FRAG_LIST_BUFFER_TYPE(_FRAG_LIST_TYPE_NAME, _MAX_FRAG_COUNT) \
+    typedef struct {                                                         \
+        LM_FRAG_LIST FragList;                                               \
+        LM_FRAG FragListBuffer[_MAX_FRAG_COUNT-1];                           \
+    } _FRAG_LIST_TYPE_NAME, *P##_FRAG_LIST_TYPE_NAME
+
+
+
+/******************************************************************************/
+/* Status codes. */
+/******************************************************************************/
+
+#define LM_STATUS_SUCCESS                                       0
+#define LM_STATUS_FAILURE                                       1
+
+#define LM_STATUS_INTERRUPT_ACTIVE                              2
+#define LM_STATUS_INTERRUPT_NOT_ACTIVE                          3
+
+#define LM_STATUS_LINK_ACTIVE                                   4
+#define LM_STATUS_LINK_DOWN                                     5
+#define LM_STATUS_LINK_SETTING_MISMATCH                         6
+
+#define LM_STATUS_TOO_MANY_FRAGMENTS                            7
+#define LM_STATUS_TRANSMIT_ABORTED                              8
+#define LM_STATUS_TRANSMIT_ERROR                                9
+#define LM_STATUS_RECEIVE_ABORTED                               10
+#define LM_STATUS_RECEIVE_ERROR                                 11
+#define LM_STATUS_INVALID_PACKET_SIZE                           12
+#define LM_STATUS_OUT_OF_MAP_REGISTERS                          13
+#define LM_STATUS_UNKNOWN_ADAPTER                               14
+
+typedef LM_UINT LM_STATUS, *PLM_STATUS;
+
+
+/******************************************************************************/
+/* Line speed. */
+/******************************************************************************/
+
+#define LM_LINE_SPEED_UNKNOWN                                   0
+#define LM_LINE_SPEED_AUTO                  LM_LINE_SPEED_UNKNOWN
+#define LM_LINE_SPEED_10MBPS                                    10
+#define LM_LINE_SPEED_100MBPS                                   100
+#define LM_LINE_SPEED_1000MBPS                                  1000
+
+typedef LM_UINT32 LM_LINE_SPEED, *PLM_LINE_SPEED;
+
+
+
+/******************************************************************************/
+/* Duplex mode. */
+/******************************************************************************/
+
+#define LM_DUPLEX_MODE_UNKNOWN                                  0
+#define LM_DUPLEX_MODE_HALF                                     1
+#define LM_DUPLEX_MODE_FULL                                     2
+
+typedef LM_UINT32 LM_DUPLEX_MODE, *PLM_DUPLEX_MODE;
+
+
+
+/******************************************************************************/
+/* Power state. */
+/******************************************************************************/
+
+#define LM_POWER_STATE_D0       0
+#define LM_POWER_STATE_D1       1
+#define LM_POWER_STATE_D2       2
+#define LM_POWER_STATE_D3       3
+
+typedef LM_UINT32 LM_POWER_STATE, *PLM_POWER_STATE;
+
+
+
+/******************************************************************************/
+/* Task offloading. */
+/******************************************************************************/
+
+#define LM_TASK_OFFLOAD_NONE                    0x0000
+#define LM_TASK_OFFLOAD_TX_IP_CHECKSUM          0x0001
+#define LM_TASK_OFFLOAD_RX_IP_CHECKSUM          0x0002
+#define LM_TASK_OFFLOAD_TX_TCP_CHECKSUM         0x0004
+#define LM_TASK_OFFLOAD_RX_TCP_CHECKSUM         0x0008
+#define LM_TASK_OFFLOAD_TX_UDP_CHECKSUM         0x0010
+#define LM_TASK_OFFLOAD_RX_UDP_CHECKSUM         0x0020
+#define LM_TASK_OFFLOAD_TCP_SEGMENTATION        0x0040
+
+typedef LM_UINT32 LM_TASK_OFFLOAD, *PLM_TASK_OFFLOAD;
+
+
+
+/******************************************************************************/
+/* Flow control. */
+/******************************************************************************/
+
+#define LM_FLOW_CONTROL_NONE                    0x00
+#define LM_FLOW_CONTROL_RECEIVE_PAUSE           0x01
+#define LM_FLOW_CONTROL_TRANSMIT_PAUSE          0x02
+#define LM_FLOW_CONTROL_RX_TX_PAUSE (LM_FLOW_CONTROL_RECEIVE_PAUSE | \
+    LM_FLOW_CONTROL_TRANSMIT_PAUSE)
+
+/* This value can be or-ed with RECEIVE_PAUSE and TRANSMIT_PAUSE.  If the */
+/* auto-negotiation is disabled and the RECEIVE_PAUSE and TRANSMIT_PAUSE */
+/* bits are set, then flow control is enabled regardless of link partner's */
+/* flow control capability. */
+#define LM_FLOW_CONTROL_AUTO_PAUSE              0x80000000
+
+typedef LM_UINT32 LM_FLOW_CONTROL, *PLM_FLOW_CONTROL;
+
+
+
+/******************************************************************************/
+/* Wake up mode. */
+/******************************************************************************/
+
+#define LM_WAKE_UP_MODE_NONE                    0
+#define LM_WAKE_UP_MODE_MAGIC_PACKET            1
+#define LM_WAKE_UP_MODE_NWUF                    2
+#define LM_WAKE_UP_MODE_LINK_CHANGE             4
+
+typedef LM_UINT32 LM_WAKE_UP_MODE, *PLM_WAKE_UP_MODE;
+
+
+
+/******************************************************************************/
+/* Counters. */
+/******************************************************************************/
+
+#define LM_COUNTER_FRAMES_XMITTED_OK                            0
+#define LM_COUNTER_FRAMES_RECEIVED_OK                           1
+#define LM_COUNTER_ERRORED_TRANSMIT_COUNT                       2
+#define LM_COUNTER_ERRORED_RECEIVE_COUNT                        3
+#define LM_COUNTER_RCV_CRC_ERROR                                4
+#define LM_COUNTER_ALIGNMENT_ERROR                              5
+#define LM_COUNTER_SINGLE_COLLISION_FRAMES                      6
+#define LM_COUNTER_MULTIPLE_COLLISION_FRAMES                    7
+#define LM_COUNTER_FRAMES_DEFERRED                              8
+#define LM_COUNTER_MAX_COLLISIONS                               9
+#define LM_COUNTER_RCV_OVERRUN                                  10
+#define LM_COUNTER_XMIT_UNDERRUN                                11
+#define LM_COUNTER_UNICAST_FRAMES_XMIT                          12
+#define LM_COUNTER_MULTICAST_FRAMES_XMIT                        13
+#define LM_COUNTER_BROADCAST_FRAMES_XMIT                        14
+#define LM_COUNTER_UNICAST_FRAMES_RCV                           15
+#define LM_COUNTER_MULTICAST_FRAMES_RCV                         16
+#define LM_COUNTER_BROADCAST_FRAMES_RCV                         17
+
+typedef LM_UINT32 LM_COUNTER_TYPE, *PLM_COUNTER_TYPE;
+
+
+typedef LM_UINT32 LM_RESET_TYPE;
+#define LM_SHUTDOWN_RESET     0
+#define LM_INIT_RESET         1
+#define LM_SUSPEND_RESET      2
+
+/******************************************************************************/
+/* Forward definition. */
+/******************************************************************************/
+
+typedef struct _LM_DEVICE_BLOCK *PLM_DEVICE_BLOCK;
+typedef struct _LM_PACKET *PLM_PACKET;
+
+
+
+/******************************************************************************/
+/* Function prototypes. */
+/******************************************************************************/
+
+LM_STATUS LM_GetAdapterInfo(PLM_DEVICE_BLOCK pDevice);
+LM_STATUS LM_InitializeAdapter(PLM_DEVICE_BLOCK pDevice);
+LM_STATUS LM_ResetAdapter(PLM_DEVICE_BLOCK pDevice);
+LM_STATUS LM_DisableInterrupt(PLM_DEVICE_BLOCK pDevice);
+LM_STATUS LM_EnableInterrupt(PLM_DEVICE_BLOCK pDevice);
+LM_STATUS LM_SendPacket(PLM_DEVICE_BLOCK pDevice, PLM_PACKET pPacket);
+LM_STATUS LM_ServiceInterrupts(PLM_DEVICE_BLOCK pDevice);
+#ifdef BCM_NAPI_RXPOLL
+int LM_ServiceRxPoll(PLM_DEVICE_BLOCK pDevice, int limit);
+#endif
+LM_STATUS LM_QueueRxPackets(PLM_DEVICE_BLOCK pDevice);
+LM_STATUS LM_SetReceiveMask(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Mask);
+LM_STATUS LM_Halt(PLM_DEVICE_BLOCK pDevice);
+LM_STATUS LM_Abort(PLM_DEVICE_BLOCK pDevice);
+LM_STATUS LM_MulticastAdd(PLM_DEVICE_BLOCK pDevice, PLM_UINT8 pMcAddress);
+LM_STATUS LM_MulticastDel(PLM_DEVICE_BLOCK pDevice, PLM_UINT8 pMcAddress);
+LM_STATUS LM_MulticastClear(PLM_DEVICE_BLOCK pDevice);
+LM_STATUS LM_SetMacAddress(PLM_DEVICE_BLOCK pDevice, PLM_UINT8 pMacAddress);
+LM_STATUS LM_LoopbackAddress(PLM_DEVICE_BLOCK pDevice, PLM_UINT8 pAddress);
+
+LM_UINT32 LM_GetCrcCounter(PLM_DEVICE_BLOCK pDevice);
+
+LM_WAKE_UP_MODE LM_PMCapabilities(PLM_DEVICE_BLOCK pDevice);
+LM_STATUS LM_NwufAdd(PLM_DEVICE_BLOCK pDevice, LM_UINT32 ByteMaskSize,
+    LM_UINT8 *pByteMask, LM_UINT8 *pPattern);
+LM_STATUS LM_NwufRemove(PLM_DEVICE_BLOCK pDevice, LM_UINT32 ByteMaskSize,
+    LM_UINT8 *pByteMask, LM_UINT8 *pPattern);
+LM_STATUS LM_SetPowerState(PLM_DEVICE_BLOCK pDevice, LM_POWER_STATE PowerLevel);
+
+LM_VOID LM_ReadPhy(PLM_DEVICE_BLOCK pDevice, LM_UINT32 PhyReg,
+    PLM_UINT32 pData32);
+LM_VOID LM_WritePhy(PLM_DEVICE_BLOCK pDevice, LM_UINT32 PhyReg,
+    LM_UINT32 Data32);
+
+LM_STATUS LM_EnableMacLoopBack(PLM_DEVICE_BLOCK pDevice);
+LM_STATUS LM_DisableMacLoopBack(PLM_DEVICE_BLOCK pDevice);
+LM_STATUS LM_EnablePhyLoopBack(PLM_DEVICE_BLOCK pDevice);
+LM_STATUS LM_DisablePhyLoopBack(PLM_DEVICE_BLOCK pDevice);
+LM_STATUS LM_EnableExtLoopBack(PLM_DEVICE_BLOCK pDevice, LM_LINE_SPEED Speed);
+LM_STATUS LM_DisableExtLoopBack(PLM_DEVICE_BLOCK pDevice);
+
+LM_STATUS LM_SetupPhy(PLM_DEVICE_BLOCK pDevice);
+LM_STATUS LM_BlinkLED(PLM_DEVICE_BLOCK pDevice, LM_UINT32 BlinkDuration);
+LM_STATUS LM_GetStats(PLM_DEVICE_BLOCK pDevice);
+LM_STATUS LM_NvramRead(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Offset,
+    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);
+LM_STATUS LM_ShutdownChip(PLM_DEVICE_BLOCK pDevice, LM_RESET_TYPE Mode);
+LM_STATUS LM_HaltCpu(PLM_DEVICE_BLOCK pDevice,LM_UINT32 cpu_number);
+LM_UINT32 ComputeCrc32(LM_UINT8 *pBuffer, LM_UINT32 BufferSize);
+LM_STATUS LM_SwitchClocks(PLM_DEVICE_BLOCK pDevice);
+
+
+
+/******************************************************************************/
+/* These are the OS specific functions called by LMAC. */
+/******************************************************************************/
+
+LM_STATUS MM_ReadConfig16(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Offset,
+    LM_UINT16 *pValue16);
+LM_STATUS MM_WriteConfig16(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Offset,
+    LM_UINT16 Value16);
+LM_STATUS MM_ReadConfig32(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Offset,
+    LM_UINT32 *pValue32);
+LM_STATUS MM_WriteConfig32(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Offset,
+    LM_UINT32 Value32);
+LM_STATUS MM_MapMemBase(PLM_DEVICE_BLOCK pDevice);
+LM_STATUS MM_MapIoBase(PLM_DEVICE_BLOCK pDevice);
+LM_STATUS MM_IndicateRxPackets(PLM_DEVICE_BLOCK pDevice);
+LM_STATUS MM_IndicateTxPackets(PLM_DEVICE_BLOCK pDevice);
+LM_STATUS MM_StartTxDma(PLM_DEVICE_BLOCK pDevice, PLM_PACKET pPacket);
+LM_STATUS MM_CompleteTxDma(PLM_DEVICE_BLOCK pDevice, PLM_PACKET pPacket);
+LM_STATUS MM_AllocateMemory(PLM_DEVICE_BLOCK pDevice, LM_UINT32 BlockSize, 
+    PLM_VOID *pMemoryBlockVirt);
+LM_STATUS MM_AllocateSharedMemory(PLM_DEVICE_BLOCK pDevice, LM_UINT32 BlockSize,
+    PLM_VOID *pMemoryBlockVirt, PLM_PHYSICAL_ADDRESS pMemoryBlockPhy,
+    LM_BOOL Cached);
+LM_STATUS MM_GetConfig(PLM_DEVICE_BLOCK pDevice);
+LM_STATUS MM_IndicateStatus(PLM_DEVICE_BLOCK pDevice, LM_STATUS Status);
+LM_STATUS MM_InitializeUmPackets(PLM_DEVICE_BLOCK pDevice);
+LM_STATUS MM_FreeRxBuffer(PLM_DEVICE_BLOCK pDevice, PLM_PACKET pPacket);
+LM_STATUS MM_CoalesceTxBuffer(PLM_DEVICE_BLOCK pDevice, PLM_PACKET pPacket);
+PLM_DEVICE_BLOCK MM_FindPeerDev(PLM_DEVICE_BLOCK pDevice);
+LM_VOID MM_UnmapRxDma(PLM_DEVICE_BLOCK pDevice, PLM_PACKET pPacket);
+#ifdef BCM_NAPI_RXPOLL
+LM_STATUS MM_ScheduleRxPoll(PLM_DEVICE_BLOCK pDevice);
+#endif
+LM_STATUS MM_Sleep(PLM_DEVICE_BLOCK pDevice, LM_UINT32 msec);
+LM_STATUS LM_MbufWorkAround(PLM_DEVICE_BLOCK pDevice);
+
+#if INCLUDE_5703_A0_FIX
+LM_STATUS LM_Load5703DmaWFirmware(PLM_DEVICE_BLOCK pDevice);
+#endif
+
+
+#endif /* LM_H */
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/mm.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/mm.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/mm.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/mm.h	2004-09-05 15:48:48.000000000 +0200
@@ -0,0 +1,569 @@
+/******************************************************************************/
+/*                                                                            */
+/* Broadcom BCM5700 Linux Network Driver, Copyright (c) 2000 - 2003 Broadcom  */
+/* 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, located in the file LICENSE.                 */
+/*                                                                            */
+/******************************************************************************/
+
+#ifndef MM_H
+#define MM_H
+
+#include <linux/config.h>
+#if defined(CONFIG_SMP) && ! defined(__SMP__)
+#define __SMP__
+#endif
+#if defined(CONFIG_MODVERSIONS) && defined(MODULE) && ! defined(MODVERSIONS)
+#define MODVERSIONS
+#endif
+
+#ifndef B57UM
+#define __NO_VERSION__
+#endif
+#include <linux/version.h>
+#ifdef MODULE
+#if defined(MODVERSIONS) && (LINUX_VERSION_CODE < 0x020500)
+#include <linux/modversions.h>
+#endif
+#include <linux/module.h>
+#else
+#define MOD_INC_USE_COUNT
+#define MOD_DEC_USE_COUNT
+#define SET_MODULE_OWNER(dev)
+#define MODULE_DEVICE_TABLE(pci, pci_tbl)
+#endif
+
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/string.h>
+#include <linux/timer.h>
+#include <linux/errno.h>
+#include <linux/ioport.h>
+#include <linux/slab.h>
+#include <linux/interrupt.h>
+#include <linux/pci.h>
+#include <linux/init.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/skbuff.h>
+#include <asm/processor.h>		/* Processor type for cache alignment. */
+#include <asm/bitops.h>
+#include <asm/io.h>
+#include <asm/unaligned.h>
+#include <linux/delay.h>
+#include <asm/byteorder.h>
+#include <linux/time.h>
+#include <asm/uaccess.h>
+#if (LINUX_VERSION_CODE >= 0x020400)
+#if (LINUX_VERSION_CODE < 0x020500)
+#include <linux/wrapper.h>
+#endif
+#include <linux/ethtool.h>
+#endif
+#ifdef CONFIG_PROC_FS
+#include <linux/smp_lock.h>
+#include <linux/proc_fs.h>
+#define BCM_PROC_FS 1
+#endif
+#ifdef NETIF_F_HW_VLAN_TX
+#include <linux/if_vlan.h>
+#define BCM_VLAN 1
+#endif
+#ifdef NETIF_F_TSO
+#define BCM_TSO 1
+#define INCLUDE_TCP_SEG_SUPPORT 1
+#include <net/ip.h>
+#include <net/tcp.h>
+#include <net/checksum.h>
+#endif
+
+#if (LINUX_VERSION_CODE >= 0x020400)
+#ifndef ETHTOOL_GEEPROM
+
+#define ETHTOOL_GEEPROM		0x0000000b /* Get EEPROM data */
+#define ETHTOOL_SEEPROM		0x0000000c /* Set EEPROM data */
+
+/* for passing EEPROM chunks */
+struct ethtool_eeprom {
+	u32	cmd;
+	u32	magic;
+	u32	offset; /* in bytes */
+	u32	len; /* in bytes */
+	u8	data[0];
+};
+#define BCM_EEDUMP_LEN(info_p, size) *((u32 *) &((info_p)->reserved1[24]))=size
+
+#else
+
+#define BCM_EEDUMP_LEN(info_p, size) (info_p)->eedump_len=size
+
+#endif
+#endif
+
+#define BCM_INT_COAL 1
+#define BCM_NIC_SEND_BD 1
+#define BCM_ASF 1
+#define BCM_WOL 1
+#define BCM_TASKLET 1
+
+#define INCLUDE_5750_A0_FIX 1
+
+#if HAVE_NETIF_RECEIVE_SKB
+#define BCM_NAPI_RXPOLL 1
+#undef BCM_TASKLET
+#endif
+
+#if defined(CONFIG_PPC64)
+#define BCM_DISCONNECT_AT_CACHELINE 1
+#endif
+
+#ifdef BCM_SMALL_DRV
+#undef BCM_PROC_FS
+#undef ETHTOOL_GEEPROM
+#undef ETHTOOL_SEEPROM
+#undef ETHTOOL_GREGS
+#undef ETHTOOL_GPAUSEPARAM
+#undef ETHTOOL_GRXCSUM
+#undef ETHTOOL_TEST
+#undef BCM_INT_COAL
+#undef BCM_NIC_SEND_BD
+#undef BCM_WOL
+#undef NICE_SUPPORT
+#undef BCM_TASKLET
+#undef BCM_TSO
+#endif
+
+#ifdef __BIG_ENDIAN
+#define BIG_ENDIAN_HOST 1
+#endif
+
+#define MM_SWAP_LE32(x) cpu_to_le32(x)
+#define MM_SWAP_BE32(x) cpu_to_be32(x)
+
+#if (LINUX_VERSION_CODE < 0x020327)
+#define __raw_readl readl
+#define __raw_writel writel
+#endif
+
+#define MM_MEMWRITEL(ptr, val) __raw_writel(val, ptr)
+#define MM_MEMREADL(ptr) __raw_readl(ptr)
+
+typedef atomic_t MM_ATOMIC_T;
+
+#define MM_ATOMIC_SET(ptr, val) atomic_set(ptr, val)
+#define MM_ATOMIC_READ(ptr) atomic_read(ptr)
+#define MM_ATOMIC_INC(ptr) atomic_inc(ptr)
+#define MM_ATOMIC_ADD(ptr, val) atomic_add(val, ptr)
+#define MM_ATOMIC_DEC(ptr) atomic_dec(ptr)
+#define MM_ATOMIC_SUB(ptr, val) atomic_sub(val, ptr)
+
+#define MM_MB() mb()
+#define MM_WMB() wmb()
+#define MM_RMB() rmb()
+
+#include "lm.h"
+#include "queue.h"
+#include "tigon3.h"
+
+#if DBG
+#define STATIC
+#else
+#define STATIC static
+#endif
+
+extern int MM_Packet_Desc_Size;
+
+#define MM_PACKET_DESC_SIZE MM_Packet_Desc_Size
+
+DECLARE_QUEUE_TYPE(UM_RX_PACKET_Q, MAX_RX_PACKET_DESC_COUNT+1);
+
+#define MAX_MEM 16
+#define MAX_MEM2 4
+
+#if (LINUX_VERSION_CODE < 0x020211)
+typedef u32 dma_addr_t;
+#endif
+
+#if (LINUX_VERSION_CODE < 0x02032a)
+#define pci_map_single(dev, address, size, dir) virt_to_bus(address)
+#define pci_unmap_single(dev, dma_addr, size, dir)
+#endif
+
+#if MAX_SKB_FRAGS
+#if (LINUX_VERSION_CODE >= 0x02040d)
+
+typedef dma_addr_t dmaaddr_high_t;
+
+#else
+
+#if defined(CONFIG_HIGHMEM) && defined(CONFIG_X86) && ! defined(CONFIG_X86_64)
+
+#if defined(CONFIG_HIGHMEM64G)
+typedef unsigned long long dmaaddr_high_t;
+#else
+typedef dma_addr_t dmaaddr_high_t;
+#endif
+
+#ifndef pci_map_page
+#define pci_map_page bcm_pci_map_page
+#endif
+
+static inline dmaaddr_high_t
+bcm_pci_map_page(struct pci_dev *dev, struct page *page,
+		    int offset, size_t size, int dir)
+{
+	dmaaddr_high_t phys;
+
+	phys = (page-mem_map) *	(dmaaddr_high_t) PAGE_SIZE + offset;
+
+	return phys;
+}
+
+#ifndef pci_unmap_page
+#define pci_unmap_page(dev, map, size, dir)
+#endif
+
+#else /* #if defined(CONFIG_HIGHMEM) && defined(CONFIG_X86) && ! defined(CONFIG_X86_64)*/
+
+typedef dma_addr_t dmaaddr_high_t;
+
+/* Warning - This may not work for all architectures if HIGHMEM is defined */
+
+#ifndef pci_map_page
+#define pci_map_page(dev, page, offset, size, dir) \
+	pci_map_single(dev, page_address(page) + (offset), size, dir)
+#endif
+#ifndef pci_unmap_page
+#define pci_unmap_page(dev, map, size, dir) \
+	pci_unmap_single(dev, map, size, dir)
+#endif
+
+#endif /* #if defined(CONFIG_HIGHMEM) && defined(CONFIG_X86) && ! defined(CONFIG_X86_64)*/
+
+#endif /* #if (LINUX_VERSION_CODE >= 0x02040d)*/
+#endif /* #if MAX_SKB_FRAGS*/
+
+#if defined (CONFIG_X86) && ! defined(CONFIG_X86_64)
+#define NO_PCI_UNMAP 1
+#endif
+
+#if (LINUX_VERSION_CODE < 0x020412)
+#if ! defined (NO_PCI_UNMAP)
+#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) dma_addr_t ADDR_NAME;
+#define DECLARE_PCI_UNMAP_LEN(LEN_NAME) __u32 LEN_NAME;
+
+#define pci_unmap_addr(PTR, ADDR_NAME)	\
+	((PTR)->ADDR_NAME)
+
+#define pci_unmap_len(PTR, LEN_NAME)	\
+	((PTR)->LEN_NAME)
+
+#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)	\
+	(((PTR)->ADDR_NAME) = (VAL))
+
+#define pci_unmap_len_set(PTR, LEN_NAME, VAL)	\
+	(((PTR)->LEN_NAME) = (VAL))
+#else
+#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)
+#define DECLARE_PCI_UNMAP_LEN(ADDR_NAME)
+
+#define pci_unmap_addr(PTR, ADDR_NAME)	0
+#define pci_unmap_len(PTR, LEN_NAME)	0
+#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) do { } while (0)
+#define pci_unmap_len_set(PTR, LEN_NAME, VAL) do { } while (0)
+#endif
+#endif
+
+#if (LINUX_VERSION_CODE < 0x02030e)
+#define net_device device
+#define netif_carrier_on(dev)
+#define netif_carrier_off(dev)
+#endif
+
+#if (LINUX_VERSION_CODE < 0x02032b)
+#define tasklet_struct			tq_struct
+#endif
+
+typedef struct _UM_DEVICE_BLOCK {
+	LM_DEVICE_BLOCK lm_dev;
+	struct net_device *dev;
+	struct pci_dev *pdev;
+	struct net_device *next_module;
+	char *name;
+#ifdef BCM_PROC_FS
+	struct proc_dir_entry *pfs_entry;
+	char pfs_name[32];
+#endif
+	void *mem_list[MAX_MEM];
+	dma_addr_t dma_list[MAX_MEM];
+	int mem_size_list[MAX_MEM];
+	int mem_list_num;
+
+#ifdef NICE_SUPPORT
+	void *mem_list2[MAX_MEM2];		/* for diagnostics ioctl */
+	dma_addr_t dma_list2[MAX_MEM2];
+	__u64 cpu_pa_list2[MAX_MEM2];
+	int mem_size_list2[MAX_MEM2];
+#endif
+	int index;
+	int opened;
+	int suspended;
+	int using_dac;		/* dual address cycle */
+	int delayed_link_ind; /* Delay link status during initial load */
+	int adapter_just_inited; /* the first few seconds after init. */
+	int timer_interval;
+	int adaptive_expiry;
+	int crc_counter_expiry;
+	int poll_tbi_interval;
+	int poll_tbi_expiry;
+	int asf_heartbeat;
+	int stats_interval;
+	int tx_full;
+	int tx_queued;
+	int line_speed;		/* in Mbps, 0 if link is down */
+	UM_RX_PACKET_Q rx_out_of_buf_q;
+	int rx_out_of_buf;
+	int rx_buf_repl_thresh;
+	int rx_buf_repl_panic_thresh;
+	int rx_buf_repl_isr_limit;
+	int rx_buf_align;
+	struct timer_list timer;
+	int do_global_lock;
+	spinlock_t global_lock;
+	spinlock_t undi_lock;
+	spinlock_t phy_lock;
+	unsigned long undi_flags;
+	volatile unsigned long interrupt;
+	atomic_t intr_sem;
+	int tasklet_pending;
+	volatile unsigned long tasklet_busy;
+	struct tasklet_struct tasklet;
+	struct net_device_stats stats;
+#ifdef NICE_SUPPORT
+	void (*nice_rx)( struct sk_buff*, void* );
+	void* nice_ctx;
+#endif /* NICE_SUPPORT */
+	int intr_test;
+	int intr_test_result;
+#ifdef NETIF_F_HW_VLAN_TX
+	struct vlan_group *vlgrp;
+#endif
+	int vlan_tag_mode;	/* Setting to allow ASF to work properly with */
+				/* VLANs                                      */
+	#define VLAN_TAG_MODE_AUTO_STRIP              0
+	#define VLAN_TAG_MODE_NORMAL_STRIP            1
+	#define VLAN_TAG_MODE_FORCED_STRIP            2
+
+	/* Auto mode - VLAN TAGs are always stripped if ASF is enabled,   */
+	/*             If ASF is not enabled, it will be in normal mode.  */
+	/* Normal mode - VLAN TAGs are stripped when VLANs are registered */
+	/* Forced mode - VLAN TAGs are always stripped.                   */
+
+	int adaptive_coalesce;
+	uint rx_last_cnt;
+	uint tx_last_cnt;
+	uint rx_curr_coalesce_frames;
+	uint rx_curr_coalesce_frames_intr;
+	uint rx_curr_coalesce_ticks;
+	uint tx_curr_coalesce_frames;
+#if TIGON3_DEBUG
+	unsigned long tx_zc_count;
+	unsigned long tx_chksum_count;
+	unsigned long tx_himem_count;
+	unsigned long rx_good_chksum_count;
+#endif
+	unsigned long rx_bad_chksum_count;
+#ifdef BCM_TSO
+	unsigned long tso_pkt_count;
+#endif
+	unsigned long rx_misc_errors;
+	uint64_t phy_crc_count;
+	unsigned int spurious_int;
+} UM_DEVICE_BLOCK, *PUM_DEVICE_BLOCK;
+
+typedef struct _UM_PACKET {
+	LM_PACKET lm_packet;
+	struct sk_buff *skbuff;
+#if MAX_SKB_FRAGS
+	DECLARE_PCI_UNMAP_ADDR(map[MAX_SKB_FRAGS + 1])
+	DECLARE_PCI_UNMAP_LEN(map_len[MAX_SKB_FRAGS + 1])
+#else
+	DECLARE_PCI_UNMAP_ADDR(map[1])
+	DECLARE_PCI_UNMAP_LEN(map_len[1])
+#endif
+} UM_PACKET, *PUM_PACKET;
+
+static inline void MM_SetAddr(LM_PHYSICAL_ADDRESS *paddr, dma_addr_t addr)
+{
+#if (BITS_PER_LONG == 64)
+	paddr->High = ((unsigned long) addr) >> 32;
+	paddr->Low = ((unsigned long) addr) & 0xffffffff;
+#else
+	paddr->High = 0;
+	paddr->Low = (unsigned long) addr;
+#endif
+}
+
+static inline void MM_SetT3Addr(T3_64BIT_HOST_ADDR *paddr, dma_addr_t addr)
+{
+#if (BITS_PER_LONG == 64)
+	paddr->High = ((unsigned long) addr) >> 32;
+	paddr->Low = ((unsigned long) addr) & 0xffffffff;
+#else
+	paddr->High = 0;
+	paddr->Low = (unsigned long) addr;
+#endif
+}
+
+#if MAX_SKB_FRAGS
+static inline void MM_SetT3AddrHigh(T3_64BIT_HOST_ADDR *paddr,
+	dmaaddr_high_t addr)
+{
+#if defined(CONFIG_HIGHMEM64G) && defined(CONFIG_X86) && ! defined(CONFIG_X86_64)
+	paddr->High = (unsigned long) (addr >> 32);
+	paddr->Low = (unsigned long) (addr & 0xffffffff);
+#else
+	MM_SetT3Addr(paddr, (dma_addr_t) addr);
+#endif
+}
+#endif
+
+static inline void MM_MapRxDma(PLM_DEVICE_BLOCK pDevice,
+	struct _LM_PACKET *pPacket,
+	T3_64BIT_HOST_ADDR *paddr)
+{
+	dma_addr_t map;
+	struct sk_buff *skb = ((struct _UM_PACKET *) pPacket)->skbuff;
+
+	map = pci_map_single(((struct _UM_DEVICE_BLOCK *)pDevice)->pdev,
+			skb->tail,
+			pPacket->u.Rx.RxBufferSize,
+			PCI_DMA_FROMDEVICE);
+	pci_unmap_addr_set(((struct _UM_PACKET *) pPacket), map[0], map);
+	MM_SetT3Addr(paddr, map);
+}
+
+static inline void MM_MapTxDma(PLM_DEVICE_BLOCK pDevice,
+	struct _LM_PACKET *pPacket,
+	T3_64BIT_HOST_ADDR *paddr,
+	LM_UINT32 *len,
+	int frag)
+{
+	dma_addr_t map;
+	struct sk_buff *skb = ((struct _UM_PACKET *) pPacket)->skbuff;
+	unsigned int length;
+
+	if (frag == 0) {
+#if MAX_SKB_FRAGS
+		if (skb_shinfo(skb)->nr_frags)
+			length = skb->len - skb->data_len;
+		else
+#endif
+			length = skb->len;
+		map = pci_map_single(((struct _UM_DEVICE_BLOCK *)pDevice)->pdev,
+			skb->data, length, PCI_DMA_TODEVICE);
+		MM_SetT3Addr(paddr, map);
+		pci_unmap_addr_set(((struct _UM_PACKET *)pPacket), map[0], map);
+		pci_unmap_len_set(((struct _UM_PACKET *) pPacket), map_len[0],
+			length);
+		*len = length;
+	}
+#if MAX_SKB_FRAGS
+	else {
+		skb_frag_t *sk_frag;
+		dmaaddr_high_t hi_map;
+
+		sk_frag = &skb_shinfo(skb)->frags[frag - 1];
+			
+		hi_map = pci_map_page(
+				((struct _UM_DEVICE_BLOCK *)pDevice)->pdev,
+				sk_frag->page,
+				sk_frag->page_offset,
+				sk_frag->size, PCI_DMA_TODEVICE);
+
+		MM_SetT3AddrHigh(paddr, hi_map);
+		pci_unmap_addr_set(((struct _UM_PACKET *) pPacket), map[frag],
+			hi_map);
+		pci_unmap_len_set(((struct _UM_PACKET *) pPacket),
+			map_len[frag], sk_frag->size);
+		*len = sk_frag->size;
+	}
+#endif
+}
+
+#define BCM5700_PHY_LOCK(pUmDevice, flags) {				\
+	spinlock_t *lock;						\
+	if ((pUmDevice)->do_global_lock) {				\
+		lock = &(pUmDevice)->global_lock;			\
+	}								\
+	else {								\
+		lock = &(pUmDevice)->phy_lock;				\
+	}								\
+	spin_lock_irqsave(lock, flags);					\
+}
+
+#define BCM5700_PHY_UNLOCK(pUmDevice, flags) {				\
+	spinlock_t *lock;						\
+	if ((pUmDevice)->do_global_lock) {				\
+		lock = &(pUmDevice)->global_lock;			\
+	}								\
+	else {								\
+		lock = &(pUmDevice)->phy_lock;				\
+	}								\
+	spin_unlock_irqrestore(lock, flags);				\
+}
+
+
+#define MM_ACQUIRE_UNDI_LOCK(_pDevice) \
+	if (!(((PUM_DEVICE_BLOCK)(_pDevice))->do_global_lock)) {	\
+		unsigned long flags;					\
+		spin_lock_irqsave(&((PUM_DEVICE_BLOCK)(_pDevice))->undi_lock, flags);	\
+		((PUM_DEVICE_BLOCK)(_pDevice))->undi_flags = flags; \
+	}
+
+#define MM_RELEASE_UNDI_LOCK(_pDevice) \
+	if (!(((PUM_DEVICE_BLOCK)(_pDevice))->do_global_lock)) {	\
+		unsigned long flags = ((PUM_DEVICE_BLOCK) (_pDevice))->undi_flags; \
+		spin_unlock_irqrestore(&((PUM_DEVICE_BLOCK)(_pDevice))->undi_lock, flags); \
+	}
+
+#define MM_ACQUIRE_PHY_LOCK_IN_IRQ(_pDevice) \
+	if (!(((PUM_DEVICE_BLOCK)(_pDevice))->do_global_lock)) {	\
+		spin_lock(&((PUM_DEVICE_BLOCK)(_pDevice))->phy_lock);	\
+	}
+
+#define MM_RELEASE_PHY_LOCK_IN_IRQ(_pDevice) \
+	if (!(((PUM_DEVICE_BLOCK)(_pDevice))->do_global_lock)) {	\
+		spin_unlock(&((PUM_DEVICE_BLOCK)(_pDevice))->phy_lock); \
+	}
+
+#define MM_UINT_PTR(_ptr)   ((unsigned long) (_ptr))
+
+#define MM_GETSTATS64(_Ctr) \
+	(uint64_t) (_Ctr).Low + ((uint64_t) (_Ctr).High << 32)
+
+#define MM_GETSTATS32(_Ctr) \
+	(uint32_t) (_Ctr).Low
+
+#if (BITS_PER_LONG == 64)
+#define MM_GETSTATS(_Ctr) (unsigned long) MM_GETSTATS64(_Ctr)
+#else
+#define MM_GETSTATS(_Ctr) (unsigned long) MM_GETSTATS32(_Ctr)
+#endif
+
+
+#define printf(fmt, args...) printk(KERN_WARNING fmt, ##args)
+
+#define DbgPrint(fmt, arg...) printk(KERN_DEBUG fmt, ##arg)
+#if defined(CONFIG_X86)
+#define DbgBreakPoint() __asm__("int $129")
+#else
+#define DbgBreakPoint()
+#endif
+#define MM_Wait(time) udelay(time)
+
+#endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/nicext.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/nicext.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/nicext.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/nicext.h	2004-09-05 15:48:48.000000000 +0200
@@ -0,0 +1,214 @@
+/****************************************************************************
+ * Copyright(c) 2000-2003 Broadcom 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.          
+ *
+ * Name:        nicext.h
+ *
+ * Description: Broadcom Network Interface Card Extension (NICE) is an 
+ *              extension to Linux NET device kernel mode drivers. 
+ *              NICE is designed to provide additional functionalities, 
+ *              such as receive packet intercept. To support Broadcom NICE, 
+ *              the network device driver can be modified by adding an 
+ *              device ioctl handler and by indicating receiving packets 
+ *              to the NICE receive handler. Broadcom NICE will only be 
+ *              enabled by a NICE-aware intermediate driver, such as 
+ *              Broadcom Advanced Server Program Driver (BASP). When NICE 
+ *              is not enabled, the modified network device drivers 
+ *              functions exactly as other non-NICE aware drivers.
+ *
+ * Author:      Frankie Fan
+ *
+ * Created:     September 17, 2000
+ *
+ ****************************************************************************/
+#ifndef _nicext_h_
+#define _nicext_h_
+
+/*
+ * ioctl for NICE
+ */
+#define SIOCNICE                   	SIOCDEVPRIVATE+7
+
+/*
+ * SIOCNICE: 
+ *
+ * The following structure needs to be less than IFNAMSIZ (16 bytes) because
+ * we're overloading ifreq.ifr_ifru.
+ *
+ * If 16 bytes is not enough, we should consider relaxing this because
+ * this is no field after ifr_ifru in the ifreq structure. But we may
+ * run into future compatiability problem in case of changing struct ifreq.
+ */
+struct nice_req
+{
+    __u32 cmd;
+    
+    union
+    {
+#ifdef __KERNEL__
+        /* cmd = NICE_CMD_SET_RX or NICE_CMD_GET_RX */
+        /* cmd = NICE_CMD_SET_RX_NAPI or NICE_CMD_GET_RX_NAPI */
+        struct
+        {
+            void (*nrqus1_rx)( struct sk_buff*, void* );
+            void* nrqus1_ctx;
+        } nrqu_nrqus1;
+
+        /* cmd = NICE_CMD_QUERY_SUPPORT */
+        struct
+        {
+            __u32 nrqus2_magic;
+            __u32 nrqus2_support_rx:1;
+            __u32 nrqus2_support_vlan:1;
+            __u32 nrqus2_support_get_speed:1;
+            __u32 nrqus2_support_rx_napi:1;
+        } nrqu_nrqus2;
+#endif
+
+        void *align_ptr;  /* this field is not used, it is to align the union */
+                          /* in 64-bit user mode */
+
+        /* cmd = NICE_CMD_GET_SPEED - in Mbps or 0 if link down */
+        /* cmd = NICE_CMD_ENABLE_EXT_LOOPBACK  - in Mbps */
+        struct
+        {
+            unsigned int nrqus3_speed;   /* 1000 = Gb, 100 = 100mbs, 10 = 10mbs */
+        } nrqu_nrqus3;
+
+        /* cmd = NICE_CMD_BLINK_LED */
+        struct
+        {
+            unsigned int nrqus4_blink_time; /* blink duration in seconds */
+        } nrqu_nrqus4;
+
+        /* cmd = NICE_CMD_REG_READ */
+        /* cmd = NICE_CMD_REG_WRITE */
+        /* cmd = NICE_CMD_MEM_READ */
+        /* cmd = NICE_CMD_MEM_WRITE */
+        /* cmd = NICE_CMD_REG_READ_DIRECT */
+        /* cmd = NICE_CMD_REG_WRITE_DIRECT */
+        /* cmd = NICE_CMD_CFG_READ32 */
+        /* cmd = NICE_CMD_CFG_READ16 */
+        /* cmd = NICE_CMD_CFG_READ8 */
+        /* cmd = NICE_CMD_CFG_WRITE32 */
+        /* cmd = NICE_CMD_CFG_WRITE16 */
+        /* cmd = NICE_CMD_CFG_WRITE8 */
+        struct
+        {
+            unsigned int nrqus5_offset; /* offset */
+            unsigned int nrqus5_data; /* value */
+        } nrqu_nrqus5;
+
+        /* cmd = NICE_CMD_INTERRUPT_TEST */
+        struct
+        {
+            unsigned int nrqus6_intr_test_result; /* 1 == pass */
+        } nrqu_nrqus6;
+
+        /* cmd = NICE_CMD_KMALLOC_PHYS */
+        /* cmd = NICE_CMD_KFREE_PHYS */
+        /* These commands allow the diagnostics app. to allocate and free */
+        /* PCI consistent memory for DMA tests */
+        struct
+        {
+            unsigned int nrqus7_size; /* size(bytes) to allocate, not used    */
+                                      /* when cmd is NICE_CMD_KFREE_PHYS.     */
+            __u32 nrqus7_phys_addr_lo;/* CPU physical address allocated or    */
+            __u32 nrqus7_phys_addr_hi;/* to be freed.                         */
+                                      /* PCI physical address is contained in */
+                                      /* the 1st 64 bit of the allocated      */
+                                      /* buffer. Use open("/dev/mem")/lseek() */
+                                      /* and read()/write() to a access       */
+                                      /* buffer in user space.                */
+                                      /* mmap() only works on x86.            */
+        } nrqu_nrqus7;
+        
+        /* cmd = NICE_CMD_SET_WRITE_PROTECT */
+        struct
+        {
+            unsigned int nrqus8_data; /* 1 == set write protect, 0 == clear write protect */
+        } nrqu_nrqus8;
+
+        /* cmd = NICE_CMD_GET_STATS_BLOCK */
+        struct
+        {
+            void *nrqus9_useraddr; /* user space address for the stats block */
+            unsigned int nrqus9_size;/* size (in bytes)                      */
+                                     /* (0x6c0 for the whole block)          */
+        } nrqu_nrqus9;
+        
+    } nrq_nrqu;
+};
+
+#define nrq_rx           nrq_nrqu.nrqu_nrqus1.nrqus1_rx
+#define nrq_ctx          nrq_nrqu.nrqu_nrqus1.nrqus1_ctx
+#define nrq_support_rx   nrq_nrqu.nrqu_nrqus2.nrqus2_support_rx
+#define nrq_magic        nrq_nrqu.nrqu_nrqus2.nrqus2_magic
+#define nrq_support_vlan nrq_nrqu.nrqu_nrqus2.nrqus2_support_vlan
+#define nrq_support_get_speed nrq_nrqu.nrqu_nrqus2.nrqus2_support_get_speed
+#define nrq_support_rx_napi nrq_nrqu.nrqu_nrqus2.nrqus2_support_rx_napi
+#define nrq_speed        nrq_nrqu.nrqu_nrqus3.nrqus3_speed
+#define nrq_blink_time   nrq_nrqu.nrqu_nrqus4.nrqus4_blink_time
+#define nrq_offset       nrq_nrqu.nrqu_nrqus5.nrqus5_offset
+#define nrq_data         nrq_nrqu.nrqu_nrqus5.nrqus5_data
+#define nrq_intr_test_result  nrq_nrqu.nrqu_nrqus6.nrqus6_intr_test_result
+#define nrq_size         nrq_nrqu.nrqu_nrqus7.nrqus7_size
+#define nrq_phys_addr_lo nrq_nrqu.nrqu_nrqus7.nrqus7_phys_addr_lo
+#define nrq_phys_addr_hi nrq_nrqu.nrqu_nrqus7.nrqus7_phys_addr_hi
+#define nrq_write_protect nrq_nrqu.nrqu_nrqus8.nrqus8_data
+#define nrq_stats_useraddr nrq_nrqu.nrqu_nrqus9.nrqus9_useraddr
+#define nrq_stats_size    nrq_nrqu.nrqu_nrqus9.nrqus9_size
+
+/*
+ * magic constants
+ */
+#define NICE_REQUESTOR_MAGIC            0x4543494E // NICE in ascii
+#define NICE_DEVICE_MAGIC               0x4E494345 // ECIN in ascii
+
+/*
+ * command field
+ */
+typedef enum {
+    NICE_CMD_QUERY_SUPPORT         = 0x00000001,
+    NICE_CMD_SET_RX                = 0x00000002,
+    NICE_CMD_GET_RX                = 0x00000003,
+    NICE_CMD_GET_SPEED             = 0x00000004,
+    NICE_CMD_BLINK_LED             = 0x00000005,
+    NICE_CMD_DIAG_SUSPEND          = 0x00000006,
+    NICE_CMD_DIAG_RESUME           = 0x00000007,
+    NICE_CMD_REG_READ              = 0x00000008,
+    NICE_CMD_REG_WRITE             = 0x00000009,
+    NICE_CMD_MEM_READ              = 0x0000000a,
+    NICE_CMD_MEM_WRITE             = 0x0000000b,
+    NICE_CMD_ENABLE_MAC_LOOPBACK   = 0x0000000c,
+    NICE_CMD_DISABLE_MAC_LOOPBACK  = 0x0000000d,
+    NICE_CMD_ENABLE_PHY_LOOPBACK   = 0x0000000e,
+    NICE_CMD_DISABLE_PHY_LOOPBACK  = 0x0000000f,
+    NICE_CMD_INTERRUPT_TEST        = 0x00000010,
+    NICE_CMD_SET_WRITE_PROTECT     = 0x00000011,
+    NICE_CMD_SET_RX_NAPI           = 0x00000012,
+    NICE_CMD_GET_RX_NAPI           = 0x00000013,
+    NICE_CMD_ENABLE_EXT_LOOPBACK   = 0x00000014,
+    NICE_CMD_DISABLE_EXT_LOOPBACK  = 0x00000015,
+    NICE_CMD_CFG_READ32            = 0x00000016,
+    NICE_CMD_CFG_READ16            = 0x00000017,
+    NICE_CMD_CFG_READ8             = 0x00000018,
+    NICE_CMD_CFG_WRITE32           = 0x00000019,
+    NICE_CMD_CFG_WRITE16           = 0x0000001a,
+    NICE_CMD_CFG_WRITE8            = 0x0000001b,
+                                   
+    NICE_CMD_REG_READ_DIRECT       = 0x0000001e,
+    NICE_CMD_REG_WRITE_DIRECT      = 0x0000001f,
+    NICE_CMD_RESET                 = 0x00000020,
+    NICE_CMD_KMALLOC_PHYS          = 0x00000021,
+    NICE_CMD_KFREE_PHYS            = 0x00000022,
+    NICE_CMD_GET_STATS_BLOCK       = 0x00000023,
+    NICE_CMD_CLR_STATS_BLOCK       = 0x00000024,
+    NICE_CMD_MAX
+} nice_cmds;                           
+
+#endif  // _nicext_h_ 
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/queue.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/queue.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/queue.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/queue.h	2004-09-05 15:48:48.000000000 +0200
@@ -0,0 +1,347 @@
+/******************************************************************************/
+/*                                                                            */
+/* Broadcom BCM5700 Linux Network Driver, Copyright (c) 2000 - 2003 Broadcom  */
+/* 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, located in the file LICENSE.                 */
+/*                                                                            */
+/* Queue functions.                                                           */
+/*    void          QQ_InitQueue(PQQ_CONTAINER pQueue)                        */
+/*    char          QQ_Full(PQQ_CONTAINER pQueue)                             */
+/*    char          QQ_Empty(PQQ_CONTAINER pQueue)                            */
+/*    unsigned int QQ_GetSize(PQQ_CONTAINER pQueue)                          */
+/*    unsigned int QQ_GetEntryCnt(PQQ_CONTAINER pQueue)                      */
+/*    char          QQ_PushHead(PQQ_CONTAINER pQueue, PQQ_ENTRY pEntry)       */
+/*    char          QQ_PushTail(PQQ_CONTAINER pQueue, PQQ_ENTRY pEntry)       */
+/*    PQQ_ENTRY     QQ_PopHead(PQQ_CONTAINER pQueue)                          */
+/*    PQQ_ENTRY     QQ_PopTail(PQQ_CONTAINER pQueue)                          */
+/*    PQQ_ENTRY     QQ_GetHead(PQQ_CONTAINER pQueue, unsigned int Idx)       */
+/*    PQQ_ENTRY     QQ_GetTail(PQQ_CONTAINER pQueue, unsigned int Idx)       */
+/*                                                                            */
+/*                                                                            */
+/* History:                                                                   */
+/*    02/25/00 Hav Khauv        Initial version.                              */
+/******************************************************************************/
+
+#ifndef BCM_QUEUE_H
+#define BCM_QUEUE_H
+
+
+
+/******************************************************************************/
+/* Queue definitions. */
+/******************************************************************************/
+
+/* Entry for queueing. */
+typedef void *PQQ_ENTRY;
+
+
+/* Queue header -- base type. */
+typedef struct {
+    unsigned int Head;
+    unsigned int Tail;
+    unsigned int Size;
+    MM_ATOMIC_T EntryCnt;
+    PQQ_ENTRY Array[1];
+} QQ_CONTAINER, *PQQ_CONTAINER;
+
+
+/* Declare queue type macro. */
+#define DECLARE_QUEUE_TYPE(_QUEUE_TYPE, _QUEUE_SIZE)            \
+                                                                \
+    typedef struct {                                            \
+        QQ_CONTAINER Container;                                 \
+        PQQ_ENTRY EntryBuffer[_QUEUE_SIZE];                     \
+    } _QUEUE_TYPE, *P##_QUEUE_TYPE
+
+
+
+/******************************************************************************/
+/* Compilation switches. */
+/******************************************************************************/
+
+#if DBG
+#undef QQ_NO_OVERFLOW_CHECK
+#undef QQ_NO_UNDERFLOW_CHECK
+#endif /* DBG */
+
+#ifdef QQ_USE_MACROS
+/* notdone */
+#else
+
+#ifdef QQ_NO_INLINE
+#define __inline
+#endif /* QQ_NO_INLINE */
+
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+__inline static void 
+QQ_InitQueue(
+PQQ_CONTAINER pQueue,
+unsigned int QueueSize) {
+    pQueue->Head = 0;
+    pQueue->Tail = 0;
+    pQueue->Size = QueueSize+1;
+    MM_ATOMIC_SET(&pQueue->EntryCnt, 0);
+} /* QQ_InitQueue */
+
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+__inline static char 
+QQ_Full(
+PQQ_CONTAINER pQueue) {
+    unsigned int NewHead;
+
+    NewHead = (pQueue->Head + 1) % pQueue->Size;
+
+    return(NewHead == pQueue->Tail);
+} /* QQ_Full */
+
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+__inline static char 
+QQ_Empty(
+PQQ_CONTAINER pQueue) {
+    return(pQueue->Head == pQueue->Tail);
+} /* QQ_Empty */
+
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+__inline static unsigned int 
+QQ_GetSize(
+PQQ_CONTAINER pQueue) {
+    return pQueue->Size;
+} /* QQ_GetSize */
+
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+__inline static unsigned int 
+QQ_GetEntryCnt(
+PQQ_CONTAINER pQueue) {
+    return MM_ATOMIC_READ(&pQueue->EntryCnt);
+} /* QQ_GetEntryCnt */
+
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/*    TRUE entry was added successfully.                                      */
+/*    FALSE queue is full.                                                    */
+/******************************************************************************/
+__inline static char 
+QQ_PushHead(
+PQQ_CONTAINER pQueue, 
+PQQ_ENTRY pEntry) {
+    unsigned int Head;
+
+    Head = (pQueue->Head + 1) % pQueue->Size;
+
+#if !defined(QQ_NO_OVERFLOW_CHECK)
+    if(Head == pQueue->Tail) {
+        return 0;
+    } /* if */
+#endif /* QQ_NO_OVERFLOW_CHECK */
+
+    pQueue->Array[pQueue->Head] = pEntry;
+    MM_WMB();
+    pQueue->Head = Head;
+    MM_ATOMIC_INC(&pQueue->EntryCnt);
+
+    return -1;
+} /* QQ_PushHead */
+
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/*    TRUE entry was added successfully.                                      */
+/*    FALSE queue is full.                                                    */
+/******************************************************************************/
+__inline static char 
+QQ_PushTail(
+PQQ_CONTAINER pQueue,
+PQQ_ENTRY pEntry) {
+    unsigned int Tail;
+
+    Tail = pQueue->Tail;
+    if(Tail == 0) {
+        Tail = pQueue->Size;
+    } /* if */
+    Tail--;
+
+#if !defined(QQ_NO_OVERFLOW_CHECK)
+    if(Tail == pQueue->Head) {
+        return 0;
+    } /* if */
+#endif /* QQ_NO_OVERFLOW_CHECK */
+
+    pQueue->Array[Tail] = pEntry;
+    MM_WMB();
+    pQueue->Tail = Tail;
+    MM_ATOMIC_INC(&pQueue->EntryCnt);
+
+    return -1;
+} /* QQ_PushTail */
+
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+__inline static PQQ_ENTRY
+QQ_PopHead(
+PQQ_CONTAINER pQueue) {
+    unsigned int Head;
+    unsigned int Tail;
+    PQQ_ENTRY Entry;
+
+    Head = pQueue->Head;
+    Tail = pQueue->Tail;
+
+    MM_MB();
+#if !defined(QQ_NO_UNDERFLOW_CHECK)
+    if(Head == Tail) {
+        return (PQQ_ENTRY) 0;
+    } /* if */
+#endif /* QQ_NO_UNDERFLOW_CHECK */
+
+    if(Head == 0) {
+        Head = pQueue->Size;
+    } /* if */
+    Head--;
+
+    Entry = pQueue->Array[Head];
+    MM_MB();
+    pQueue->Head = Head;
+    MM_ATOMIC_DEC(&pQueue->EntryCnt);
+
+    return Entry;
+} /* QQ_PopHead */
+
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+__inline static PQQ_ENTRY
+QQ_PopTail(
+PQQ_CONTAINER pQueue) {
+    unsigned int Head;
+    unsigned int Tail;
+    PQQ_ENTRY Entry;
+
+    Head = pQueue->Head;
+    Tail = pQueue->Tail;
+
+    MM_MB();
+#if !defined(QQ_NO_UNDERFLOW_CHECK)
+    if(Tail == Head) {
+        return (PQQ_ENTRY) 0;
+    } /* if */
+#endif /* QQ_NO_UNDERFLOW_CHECK */
+
+    Entry = pQueue->Array[Tail];
+    MM_MB();
+    pQueue->Tail = (Tail + 1) % pQueue->Size;
+    MM_ATOMIC_DEC(&pQueue->EntryCnt);
+
+    return Entry;
+} /* QQ_PopTail */
+
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+__inline static PQQ_ENTRY
+QQ_GetHead(
+    PQQ_CONTAINER pQueue,
+    unsigned int Idx)
+{
+    if(Idx >= (unsigned int) MM_ATOMIC_READ(&pQueue->EntryCnt))
+    {
+        return (PQQ_ENTRY) 0;
+    }
+
+    if(pQueue->Head > Idx)
+    {
+        Idx = pQueue->Head - Idx;
+    }
+    else
+    {
+        Idx = pQueue->Size - (Idx - pQueue->Head);
+    }
+    Idx--;
+
+    return pQueue->Array[Idx];
+}
+
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+__inline static PQQ_ENTRY
+QQ_GetTail(
+    PQQ_CONTAINER pQueue,
+    unsigned int Idx)
+{
+    if(Idx >= (unsigned int) MM_ATOMIC_READ(&pQueue->EntryCnt))
+    {
+        return (PQQ_ENTRY) 0;
+    }
+
+    Idx += pQueue->Tail;
+    if(Idx >= pQueue->Size)
+    {
+        Idx = Idx - pQueue->Size;
+    }
+
+    return pQueue->Array[Idx];
+}
+
+#endif /* QQ_USE_MACROS */
+
+
+
+#endif /* QUEUE_H */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/tcp_seg.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/tcp_seg.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/tcp_seg.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/tcp_seg.c	2004-09-05 15:48:48.000000000 +0200
@@ -0,0 +1,106 @@
+/******************************************************************************/
+/*                                                                            */
+/* Broadcom BCM5700 Linux Network Driver, Copyright (c) 2002 - 2003 Broadcom  */
+/* 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, located in the file LICENSE.                 */
+/*                                                                            */
+/* History:                                                                   */
+/*                                                                            */
+/******************************************************************************/
+
+#include "mm.h"
+
+#if INCLUDE_TCP_SEG_SUPPORT
+#include "fw_stkoffld.h"
+#include "fw_lso05.h"
+
+LM_UINT32 LM_GetStkOffLdFirmwareSize(PLM_DEVICE_BLOCK pDevice)
+{
+  LM_UINT32 FwSize;
+
+  if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5750)
+  {
+      return 0;
+  }
+  if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705) 
+    {
+      FwSize =  (LM_UINT32)(t3StkOffLd05FwTextLen + 
+			    t3StkOffLd05FwRodataLen + 
+			    t3StkOffLd05FwDataLen +
+			    t3StkOffLd05FwSbssLen +
+			    t3StkOffLd05FwBssLen);
+    }
+  else
+    {
+      FwSize = (LM_UINT32)(t3StkOffLdFwTextLen +
+			   t3StkOffLdFwRodataLen +
+			   t3StkOffLdFwDataLen +
+			   t3StkOffLdFwSbssLen +
+			   t3StkOffLdFwBssLen);
+    }
+
+  return FwSize;
+}
+
+LM_STATUS LM_LoadStkOffLdFirmware(PLM_DEVICE_BLOCK pDevice)
+{
+  T3_FWIMG_INFO FwImgInfo;
+  LM_UINT32 Cpu;
+
+  if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5750)
+  {
+      return LM_STATUS_SUCCESS;
+  }
+  if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705) 
+    {
+      FwImgInfo.StartAddress = t3StkOffLd05FwStartAddr;
+      FwImgInfo.Text.Buffer = (PLM_UINT8)t3StkOffLd05FwText;
+      FwImgInfo.Text.Offset  = t3StkOffLd05FwTextAddr;
+      FwImgInfo.Text.Length  = t3StkOffLd05FwTextLen;
+      FwImgInfo.ROnlyData.Buffer = (PLM_UINT8)t3StkOffLd05FwRodata;
+      FwImgInfo.ROnlyData.Offset  = t3StkOffLd05FwRodataAddr;
+      FwImgInfo.ROnlyData.Length  = t3StkOffLd05FwRodataLen;
+      FwImgInfo.Data.Buffer = (PLM_UINT8)t3StkOffLd05FwData;
+      FwImgInfo.Data.Offset  = t3StkOffLd05FwDataAddr;
+      FwImgInfo.Data.Length  = t3StkOffLd05FwDataLen;
+      FwImgInfo.Sbss.Offset = t3StkOffLd05FwSbssAddr;
+      FwImgInfo.Sbss.Length = t3StkOffLd05FwSbssLen;
+      FwImgInfo.Bss.Offset = t3StkOffLd05FwBssAddr;
+      FwImgInfo.Bss.Length = t3StkOffLd05FwBssLen;
+      Cpu = T3_RX_CPU_ID;
+    }
+  else
+    {
+      FwImgInfo.StartAddress = t3StkOffLdFwStartAddr;
+      FwImgInfo.Text.Buffer = (PLM_UINT8)t3StkOffLdFwText;
+      FwImgInfo.Text.Offset  = t3StkOffLdFwTextAddr;
+      FwImgInfo.Text.Length  = t3StkOffLdFwTextLen;
+      FwImgInfo.ROnlyData.Buffer = (PLM_UINT8)t3StkOffLdFwRodata;
+      FwImgInfo.ROnlyData.Offset  = t3StkOffLdFwRodataAddr;
+      FwImgInfo.ROnlyData.Length  = t3StkOffLdFwRodataLen;
+      FwImgInfo.Data.Buffer = (PLM_UINT8)t3StkOffLdFwData;
+      FwImgInfo.Data.Offset  = t3StkOffLdFwDataAddr;
+      FwImgInfo.Data.Length  = t3StkOffLdFwDataLen;
+      FwImgInfo.Sbss.Offset = t3StkOffLdFwSbssAddr;
+      FwImgInfo.Sbss.Length = t3StkOffLdFwSbssLen;
+      FwImgInfo.Bss.Offset = t3StkOffLdFwBssAddr;
+      FwImgInfo.Bss.Length = t3StkOffLdFwBssLen;
+      Cpu = T3_TX_CPU_ID;
+    }
+
+  if (LM_LoadFirmware(pDevice,
+                      &FwImgInfo,
+                      Cpu,
+                      Cpu) != LM_STATUS_SUCCESS)
+    {
+      return LM_STATUS_FAILURE;
+    }
+  
+  return LM_STATUS_SUCCESS;
+}
+
+#endif /* INCLUDE_TCP_SEG_SUPPORT */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/tigon3.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/tigon3.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/tigon3.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/tigon3.c	2004-09-05 15:48:48.000000000 +0200
@@ -0,0 +1,7905 @@
+/******************************************************************************/
+/*                                                                            */
+/* Broadcom BCM5700 Linux Network Driver, Copyright (c) 2000 - 2004 Broadcom  */
+/* 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, located in the file LICENSE.                 */
+/*                                                                            */
+/* History:                                                                   */
+/******************************************************************************/
+
+#include "mm.h"
+
+
+
+/******************************************************************************/
+/* Local functions. */
+/******************************************************************************/
+
+LM_STATUS LM_Abort(PLM_DEVICE_BLOCK pDevice);
+LM_STATUS LM_QueueRxPackets(PLM_DEVICE_BLOCK pDevice);
+
+static LM_STATUS LM_InitBcm540xPhy(PLM_DEVICE_BLOCK pDevice);
+static LM_VOID LM_PhyTapPowerMgmt(LM_DEVICE_BLOCK *pDevice);
+
+LM_VOID LM_ServiceRxInterrupt(PLM_DEVICE_BLOCK pDevice);
+LM_VOID LM_ServiceTxInterrupt(PLM_DEVICE_BLOCK pDevice);
+
+static LM_STATUS LM_ForceAutoNeg(PLM_DEVICE_BLOCK pDevice);
+static LM_UINT32 GetPhyAdFlowCntrlSettings(PLM_DEVICE_BLOCK pDevice);
+STATIC LM_STATUS LM_SetFlowControl(PLM_DEVICE_BLOCK pDevice,
+    LM_UINT32 LocalPhyAd, LM_UINT32 RemotePhyAd);
+#if INCLUDE_TBI_SUPPORT
+STATIC LM_STATUS LM_SetupFiberPhy(PLM_DEVICE_BLOCK pDevice);
+STATIC LM_STATUS LM_InitBcm800xPhy(PLM_DEVICE_BLOCK pDevice);
+#endif
+STATIC LM_STATUS LM_SetupCopperPhy(PLM_DEVICE_BLOCK pDevice);
+STATIC LM_VOID LM_SetEthWireSpeed(LM_DEVICE_BLOCK *pDevice);
+STATIC LM_STATUS LM_PhyAdvertiseAll(LM_DEVICE_BLOCK *pDevice);
+STATIC PLM_ADAPTER_INFO LM_GetAdapterInfoBySsid(LM_UINT16 Svid, LM_UINT16 Ssid);
+LM_VOID LM_SwitchVaux(PLM_DEVICE_BLOCK pDevice, PLM_DEVICE_BLOCK pDevice2);
+STATIC LM_STATUS LM_DmaTest(PLM_DEVICE_BLOCK pDevice, PLM_UINT8 pBufferVirt,
+           LM_PHYSICAL_ADDRESS BufferPhy, LM_UINT32 BufferSize);
+STATIC LM_STATUS LM_DisableChip(PLM_DEVICE_BLOCK pDevice);
+STATIC LM_STATUS LM_ResetChip(PLM_DEVICE_BLOCK pDevice);
+STATIC LM_STATUS LM_DisableFW(PLM_DEVICE_BLOCK pDevice);
+STATIC LM_STATUS LM_Test4GBoundary(PLM_DEVICE_BLOCK pDevice, PLM_PACKET pPacket,
+    PT3_SND_BD pSendBd);
+STATIC LM_VOID LM_WritePreResetSignatures(LM_DEVICE_BLOCK *pDevice,
+    LM_RESET_TYPE Mode);
+STATIC LM_VOID LM_WritePostResetSignatures(LM_DEVICE_BLOCK *pDevice,
+    LM_RESET_TYPE Mode);
+STATIC LM_VOID LM_WriteLegacySignatures(LM_DEVICE_BLOCK *pDevice,
+    LM_RESET_TYPE Mode);
+STATIC void LM_GetPhyId(LM_DEVICE_BLOCK *pDevice);
+
+/******************************************************************************/
+/* External functions. */
+/******************************************************************************/
+
+LM_STATUS LM_LoadRlsFirmware(PLM_DEVICE_BLOCK pDevice);
+#if INCLUDE_TCP_SEG_SUPPORT
+LM_STATUS LM_LoadStkOffLdFirmware(PLM_DEVICE_BLOCK pDevice);
+LM_UINT32 LM_GetStkOffLdFirmwareSize(PLM_DEVICE_BLOCK pDevice);
+#endif
+
+LM_UINT32
+LM_RegRd(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Register)
+{
+#if PCIX_TARGET_WORKAROUND
+    if (pDevice->Flags & UNDI_FIX_FLAG)
+    {
+        return (LM_RegRdInd(pDevice, Register));
+    }
+    else
+#endif
+    {
+        return (REG_RD_OFFSET(pDevice, Register));
+    }
+}
+
+/* Mainly used to flush posted write before delaying */
+LM_VOID
+LM_RegRdBack(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Register)
+{
+    LM_UINT32 dummy;
+
+#if PCIX_TARGET_WORKAROUND
+    if (pDevice->Flags & ENABLE_PCIX_FIX_FLAG)
+    {
+        return;
+    }
+    else
+#endif
+    {
+        if (pDevice->Flags & REG_RD_BACK_FLAG)
+            return;
+
+        dummy = REG_RD_OFFSET(pDevice, Register);
+    }
+}
+
+LM_VOID
+LM_RegWr(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Register, LM_UINT32 Value32,
+    LM_UINT32 ReadBack)
+{
+#if PCIX_TARGET_WORKAROUND
+    if (pDevice->Flags & ENABLE_PCIX_FIX_FLAG)
+    {
+        LM_RegWrInd(pDevice, Register, Value32);
+    }
+    else
+#endif
+    {
+        LM_UINT32 dummy;
+
+        REG_WR_OFFSET(pDevice, Register, Value32);
+        if (ReadBack && (pDevice->Flags & REG_RD_BACK_FLAG))
+        {
+            dummy = REG_RD_OFFSET(pDevice, Register);
+        }
+    }
+}
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+LM_UINT32
+LM_RegRdInd(
+PLM_DEVICE_BLOCK pDevice,
+LM_UINT32 Register) {
+    LM_UINT32 Value32;
+
+    MM_ACQUIRE_UNDI_LOCK(pDevice);
+    MM_WriteConfig32(pDevice, T3_PCI_REG_ADDR_REG, Register);
+    MM_ReadConfig32(pDevice, T3_PCI_REG_DATA_REG, &Value32);
+    MM_RELEASE_UNDI_LOCK(pDevice);
+
+    return MM_SWAP_LE32(Value32);
+} /* LM_RegRdInd */
+
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+LM_VOID
+LM_RegWrInd(
+PLM_DEVICE_BLOCK pDevice,
+LM_UINT32 Register,
+LM_UINT32 Value32) {
+
+    MM_ACQUIRE_UNDI_LOCK(pDevice);
+    MM_WriteConfig32(pDevice, T3_PCI_REG_ADDR_REG, Register);
+    MM_WriteConfig32(pDevice, T3_PCI_REG_DATA_REG, MM_SWAP_LE32(Value32));
+    MM_RELEASE_UNDI_LOCK(pDevice);
+} /* LM_RegWrInd */
+
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+LM_UINT32
+LM_MemRdInd(
+PLM_DEVICE_BLOCK pDevice,
+LM_UINT32 MemAddr) {
+    LM_UINT32 Value32;
+
+    MM_ACQUIRE_UNDI_LOCK(pDevice);
+    MM_WriteConfig32(pDevice, T3_PCI_MEM_WIN_ADDR_REG, MemAddr);
+    MM_ReadConfig32(pDevice, T3_PCI_MEM_WIN_DATA_REG, &Value32);
+    MM_RELEASE_UNDI_LOCK(pDevice);
+
+    return MM_SWAP_LE32(Value32);
+} /* LM_MemRdInd */
+
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+LM_VOID
+LM_MemWrInd(
+PLM_DEVICE_BLOCK pDevice,
+LM_UINT32 MemAddr,
+LM_UINT32 Value32) {
+    MM_ACQUIRE_UNDI_LOCK(pDevice);
+    MM_WriteConfig32(pDevice, T3_PCI_MEM_WIN_ADDR_REG, MemAddr);
+    MM_WriteConfig32(pDevice, T3_PCI_MEM_WIN_DATA_REG, MM_SWAP_LE32(Value32));
+    MM_RELEASE_UNDI_LOCK(pDevice);
+} /* LM_MemWrInd */
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+LM_STATUS
+LM_QueueRxPackets(
+PLM_DEVICE_BLOCK pDevice) {
+    LM_STATUS Lmstatus;
+    PLM_PACKET pPacket;
+    PT3_RCV_BD pRcvBd = 0;
+    LM_UINT32 StdBdAdded = 0;
+#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
+    LM_UINT32 JumboBdAdded = 0;
+#endif /* T3_JUMBO_RCV_RCB_ENTRY_COUNT */
+    LM_UINT32 ConIdx, Idx;
+    LM_UINT32 Diff = 0;
+
+    Lmstatus = LM_STATUS_SUCCESS;
+
+    if (pDevice->Flags & RX_BD_LIMIT_64_FLAG)
+    {
+        ConIdx = pDevice->pStatusBlkVirt->RcvStdConIdx;
+        Diff = (pDevice->RxStdProdIdx - ConIdx) &
+            T3_STD_RCV_RCB_ENTRY_COUNT_MASK;
+        if (Diff >= 56)
+        {
+            if (QQ_GetEntryCnt(&pDevice->RxPacketFreeQ.Container))
+            {
+                pDevice->QueueAgain = TRUE;
+            }
+            return LM_STATUS_SUCCESS;
+        }
+    }
+
+    pDevice->QueueAgain = FALSE;
+
+    pPacket = (PLM_PACKET) QQ_PopHead(&pDevice->RxPacketFreeQ.Container);
+    while(pPacket) {
+        switch(pPacket->u.Rx.RcvProdRing) {
+#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
+            case T3_JUMBO_RCV_PROD_RING:        /* Jumbo Receive Ring. */
+                /* Initialize the buffer descriptor. */
+                Idx = pDevice->RxJumboProdIdx;
+                pRcvBd = &pDevice->pRxJumboBdVirt[Idx];
+
+                pPacket->u.Rx.RcvRingProdIdx = Idx;
+                pDevice->RxJumboRing[Idx] = pPacket;
+                /* Update the producer index. */
+                pDevice->RxJumboProdIdx = (Idx + 1) & 
+                    T3_JUMBO_RCV_RCB_ENTRY_COUNT_MASK;
+
+                JumboBdAdded++;
+                break;
+#endif /* T3_JUMBO_RCV_RCB_ENTRY_COUNT */
+
+            case T3_STD_RCV_PROD_RING:      /* Standard Receive Ring. */
+                /* Initialize the buffer descriptor. */
+                Idx = pDevice->RxStdProdIdx;
+                pRcvBd = &pDevice->pRxStdBdVirt[Idx];
+
+                pPacket->u.Rx.RcvRingProdIdx = Idx;
+                pDevice->RxStdRing[Idx] = pPacket;
+                /* Update the producer index. */
+                pDevice->RxStdProdIdx = (Idx + 1) & 
+                    T3_STD_RCV_RCB_ENTRY_COUNT_MASK;
+
+                StdBdAdded++;
+                break;
+
+            case T3_UNKNOWN_RCV_PROD_RING:
+            default:
+                Lmstatus = LM_STATUS_FAILURE;
+                break;
+        } /* switch */
+
+        /* Bail out if there is any error. */
+        if(Lmstatus != LM_STATUS_SUCCESS)
+        {
+            break;
+        }
+
+        /* Initialize the receive buffer pointer */
+        MM_MapRxDma(pDevice, pPacket, &pRcvBd->HostAddr);
+
+        /* The opaque field may point to an offset from a fix addr. */
+        pRcvBd->Opaque = (LM_UINT32) (MM_UINT_PTR(pPacket) - 
+            MM_UINT_PTR(pDevice->pPacketDescBase));
+
+        if ((pDevice->Flags & RX_BD_LIMIT_64_FLAG) &&
+            ((Diff + StdBdAdded) >= 63))
+        {
+            if (QQ_GetEntryCnt(&pDevice->RxPacketFreeQ.Container))
+            {
+                pDevice->QueueAgain = TRUE;
+            }
+            break;
+        }
+        pPacket = (PLM_PACKET) QQ_PopHead(&pDevice->RxPacketFreeQ.Container);
+    } /* while */
+
+    MM_WMB();
+    /* Update the procedure index. */
+    if(StdBdAdded)
+    {
+        MB_REG_WR(pDevice, Mailbox.RcvStdProdIdx.Low,
+            pDevice->RxStdProdIdx);
+        if (pDevice->Flags & FLUSH_POSTED_WRITE_FLAG)
+        {
+            MB_REG_RD(pDevice, Mailbox.RcvStdProdIdx.Low);
+        }
+    }
+#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
+    if(JumboBdAdded)
+    {
+        MB_REG_WR(pDevice, Mailbox.RcvJumboProdIdx.Low,
+            pDevice->RxJumboProdIdx);
+        if (pDevice->Flags & FLUSH_POSTED_WRITE_FLAG)
+        {
+            MB_REG_RD(pDevice, Mailbox.RcvJumboProdIdx.Low);
+        }
+    }
+#endif /* T3_JUMBO_RCV_RCB_ENTRY_COUNT */
+
+    return Lmstatus;
+} /* LM_QueueRxPackets */
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+STATIC LM_VOID
+LM_NvramInit(
+    PLM_DEVICE_BLOCK pDevice)
+{
+    LM_UINT32 Value32;
+
+    pDevice->NvramSize = 0;
+    /* Intialize clock period and state machine. */
+    Value32 = SEEPROM_ADDR_CLK_PERD(SEEPROM_CLOCK_PERIOD) |
+        SEEPROM_ADDR_FSM_RESET;
+    REG_WR(pDevice, Grc.EepromAddr, Value32);
+    REG_RD_BACK(pDevice, Grc.EepromAddr);
+
+    MM_Wait(100);
+
+    /* Serial eeprom access using the Grc.EepromAddr/EepromData registers. */
+    Value32 = REG_RD(pDevice, Grc.LocalCtrl);
+    REG_WR(pDevice, Grc.LocalCtrl, Value32 | GRC_MISC_LOCAL_CTRL_AUTO_SEEPROM);
+
+    /* Set the 5701 compatibility mode if we are using EEPROM. */
+    if(T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5700 &&
+        T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5701)
+    {
+        Value32 = REG_RD(pDevice, Nvram.Config1);
+        if((Value32 & FLASH_INTERFACE_ENABLE) == 0)
+        {
+            if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5750)
+            {
+                REG_WR(pDevice, Nvram.NvmAccess,
+                    REG_RD(pDevice, Nvram.NvmAccess) | ACCESS_EN);
+            }
+            /* Use the new interface to read EEPROM. */
+            Value32 &= ~FLASH_COMPAT_BYPASS;
+
+            REG_WR(pDevice, Nvram.Config1, Value32);
+
+            if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5750)
+            {
+                REG_WR(pDevice, Nvram.NvmAccess,
+                    REG_RD(pDevice, Nvram.NvmAccess) & ~ACCESS_EN);
+            }
+        }
+        else {
+            pDevice->NvramSize = 0x20000;
+            pDevice->Flags |= FLASH_DETECTED_FLAG;
+        }
+    }
+
+    if (pDevice->NvramSize == 0)
+    {
+        Value32 = 0;
+        LM_NvramRead(pDevice, 0, &Value32);
+        Value32 = MM_SWAP_BE32(Value32);
+        if (Value32 != 0x669955aa) {
+            pDevice->NvramSize = SEEPROM_CHIP_SIZE;
+            return;
+        }
+
+        /* size eeprom */
+        pDevice->NvramSize = 0x800;
+        while (pDevice->NvramSize < SEEPROM_CHIP_SIZE) {
+            if (LM_NvramRead(pDevice, pDevice->NvramSize, &Value32) !=
+                LM_STATUS_SUCCESS) {
+                pDevice->NvramSize = SEEPROM_CHIP_SIZE;
+                break;
+            }
+            Value32 = MM_SWAP_BE32(Value32);
+            if (Value32 == 0x669955aa)
+                break;
+            pDevice->NvramSize <<= 1;
+        }
+    }
+} /* LM_NvRamInit */
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+STATIC LM_STATUS
+LM_EepromRead(
+    PLM_DEVICE_BLOCK pDevice,
+    LM_UINT32 Offset,
+    LM_UINT32 *pData)
+{
+    LM_UINT32 Value32;
+    LM_UINT32 Addr;
+    LM_UINT32 Dev;
+    LM_UINT32 j;
+
+    if(Offset > SEEPROM_CHIP_SIZE)
+    {
+        return LM_STATUS_FAILURE;
+    }
+
+    Dev = Offset / SEEPROM_CHIP_SIZE;
+    Addr = Offset % SEEPROM_CHIP_SIZE;
+    
+    Value32 = REG_RD(pDevice, Grc.EepromAddr);
+    Value32 &= ~(SEEPROM_ADDR_ADDRESS_MASK | SEEPROM_ADDR_DEV_ID_MASK |
+        SEEPROM_ADDR_RW_MASK);
+    REG_WR(pDevice, Grc.EepromAddr, Value32 | SEEPROM_ADDR_DEV_ID(Dev) |
+        SEEPROM_ADDR_ADDRESS(Addr) | SEEPROM_ADDR_START | SEEPROM_ADDR_READ);
+
+    for(j = 0; j < 1000; j++)
+    {
+        Value32 = REG_RD(pDevice, Grc.EepromAddr);
+        if(Value32 & SEEPROM_ADDR_COMPLETE)
+        {
+            break;
+        }
+        MM_Wait(20);
+    }
+
+    if(Value32 & SEEPROM_ADDR_COMPLETE)
+    {
+        Value32 = REG_RD(pDevice, Grc.EepromData);
+        /* The endianess of the eeprom and flash interface is different */
+        *pData = MM_SWAP_LE32(Value32);
+
+        return LM_STATUS_SUCCESS;
+    }
+
+    return LM_STATUS_FAILURE;
+} /* LM_EepromRead */
+
+#ifdef ETHTOOL_SEEPROM
+
+STATIC LM_STATUS
+LM_EepromWriteBlock(
+    PLM_DEVICE_BLOCK pDevice,
+    LM_UINT32 Offset,
+    LM_UINT32 *pData,
+    LM_UINT32 Size)
+{
+    LM_UINT32 Value32 = 0;
+    LM_UINT32 Addr;
+    LM_UINT32 Dev;
+    LM_UINT32 i, j;
+
+    if(Offset > SEEPROM_CHIP_SIZE)
+    {
+        return LM_STATUS_FAILURE;
+    }
+
+    /* Enable EEPROM write. */
+    if (pDevice->Flags & EEPROM_WP_FLAG)
+    {
+        REG_WR(pDevice, Grc.LocalCtrl, pDevice->GrcLocalCtrl |
+                    GRC_MISC_LOCAL_CTRL_GPIO_OE1);
+        REG_RD_BACK(pDevice, Grc.LocalCtrl);
+        MM_Wait(40);
+
+        Value32 = REG_RD(pDevice, Grc.LocalCtrl);
+        if(Value32 & GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT1)
+        {
+            return LM_STATUS_FAILURE;
+        }
+    }
+
+    for (i = 0; i < Size ; i++, pData++, Offset += 4) {
+
+        Dev = Offset / SEEPROM_CHIP_SIZE;
+        Addr = Offset % SEEPROM_CHIP_SIZE;
+
+        /* Set the write value to the eeprom */    
+        REG_WR(pDevice, Grc.EepromData, MM_SWAP_LE32(*pData));  
+
+        Value32 = REG_RD(pDevice, Grc.EepromAddr);
+        Value32 &= ~(SEEPROM_ADDR_ADDRESS_MASK | SEEPROM_ADDR_DEV_ID_MASK |
+                            SEEPROM_ADDR_RW_MASK);
+
+        REG_WR(pDevice, Grc.EepromAddr, Value32 | SEEPROM_ADDR_DEV_ID(Dev) |
+                        SEEPROM_ADDR_ADDRESS(Addr) | SEEPROM_ADDR_START | SEEPROM_ADDR_WRITE);
+
+        for(j = 0; j < 1000; j++)
+        {
+            Value32 = REG_RD(pDevice, Grc.EepromAddr);
+            if(Value32 & SEEPROM_ADDR_COMPLETE)
+            {
+                break;
+            }
+            MM_Wait(10);
+        }
+    } 
+
+    /* Write-protect EEPROM. */
+    if (pDevice->Flags & EEPROM_WP_FLAG)
+    {
+        REG_WR(pDevice, Grc.LocalCtrl, pDevice->GrcLocalCtrl |
+            GRC_MISC_LOCAL_CTRL_GPIO_OE1 | GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT1);
+        REG_RD_BACK(pDevice, Grc.LocalCtrl);
+        MM_Wait(40);
+    }
+
+    if(Value32 & SEEPROM_ADDR_COMPLETE)
+    {
+        return LM_STATUS_SUCCESS;
+    }
+
+    return LM_STATUS_FAILURE;
+} /* LM_EepromWriteBlock */
+#endif
+
+#define NVRAM_MAXWAIT 8000
+LM_STATUS
+LM_NvramGetLock(LM_DEVICE_BLOCK *pDevice)
+{
+    int j;
+
+    REG_WR(pDevice, Nvram.SwArb, SW_ARB_REQ_SET1);
+    /* worst case wait time for Nvram arbitration using serial eprom is */
+    /* about 45 msec on a 5704 with the other channel loading boot code */
+    for (j = 0; j < NVRAM_MAXWAIT; j++)
+    {
+        if (REG_RD(pDevice, Nvram.SwArb) & SW_ARB_GNT1)
+        {
+            break;
+        }
+        MM_Wait(20);
+    }
+    if (j == NVRAM_MAXWAIT)
+    {
+        return LM_STATUS_FAILURE;
+    }
+    return LM_STATUS_SUCCESS;
+}
+
+LM_STATUS
+LM_NvramReleaseLock(LM_DEVICE_BLOCK *pDevice)
+{
+    REG_WR(pDevice, Nvram.SwArb, SW_ARB_REQ_CLR1);
+    return LM_STATUS_SUCCESS;
+}
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+LM_STATUS
+LM_NvramRead(
+    PLM_DEVICE_BLOCK pDevice,
+    LM_UINT32 Offset,
+    LM_UINT32 *pData)
+{
+    LM_UINT32 Value32;
+    LM_STATUS Status;
+    LM_UINT32 j;
+
+    if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700 ||
+        T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701)
+    {
+        Status = LM_EepromRead(pDevice, Offset, pData);
+    }
+    else
+    {
+        /* Determine if we have flash or EEPROM. */
+        Value32 = REG_RD(pDevice, Nvram.Config1);
+        if(Value32 & FLASH_INTERFACE_ENABLE)
+        {
+            if(Value32 & FLASH_SSRAM_BUFFERED_MODE)
+            {
+                Offset = ((Offset/BUFFERED_FLASH_PAGE_SIZE) <<
+                    BUFFERED_FLASH_PAGE_POS) +
+                    (Offset % BUFFERED_FLASH_PAGE_SIZE);
+            }
+        }
+
+        if (LM_NvramGetLock(pDevice) != LM_STATUS_SUCCESS)
+        {
+            return LM_STATUS_FAILURE;
+	}
+
+        if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5750)
+        {
+            REG_WR(pDevice, Nvram.NvmAccess,
+                REG_RD(pDevice, Nvram.NvmAccess) | ACCESS_EN);
+        }
+
+        /* Read from flash or EEPROM with the new 5703/02 interface. */
+        REG_WR(pDevice, Nvram.Addr, Offset & NVRAM_ADDRESS_MASK);
+
+        REG_WR(pDevice, Nvram.Cmd, NVRAM_CMD_RD | NVRAM_CMD_DO_IT |
+            NVRAM_CMD_FIRST | NVRAM_CMD_LAST | NVRAM_CMD_DONE);
+
+        /* Wait for the done bit to clear. */
+        for(j = 0; j < 1000; j++)
+        {
+            MM_Wait(10);
+
+            Value32 = REG_RD(pDevice, Nvram.Cmd);
+            if(Value32 & NVRAM_CMD_DONE)
+            {
+                MM_Wait(10);
+
+                *pData = REG_RD(pDevice, Nvram.ReadData);
+
+                /* Data is swapped so that the byte stream is the same */
+                /* in big and little endian systems. */
+                /* Caller will do additional swapping depending on */
+                /* how it wants to look at the data. */
+                *pData = MM_SWAP_BE32(*pData);
+
+                break;
+            }
+        }
+
+        LM_NvramReleaseLock(pDevice);
+        if(Value32 & NVRAM_CMD_DONE)
+        {
+            Status = LM_STATUS_SUCCESS;
+        }
+        else
+        {
+            Status = LM_STATUS_FAILURE;
+        }
+    }
+
+    if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5750)
+    {
+        REG_WR(pDevice, Nvram.NvmAccess,
+            REG_RD(pDevice, Nvram.NvmAccess) & ~ACCESS_EN);
+    }
+
+    return Status;
+} /* LM_NvramRead */
+
+
+#ifdef ETHTOOL_SEEPROM
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+LM_STATUS
+LM_NvramWriteBlock(
+    PLM_DEVICE_BLOCK pDevice,
+    LM_UINT32 Offset,
+    LM_UINT32 *pData,
+    LM_UINT32 Size)
+{
+    LM_UINT32 Value32 = 0;
+    LM_UINT32 ControlReg;
+    LM_UINT32 AddrOffset;
+    LM_STATUS Status;
+    LM_UINT32  i , j;
+    LM_UINT32 BufferedFlash;
+
+    if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700 ||
+        T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701)
+    {
+        Status = LM_EepromWriteBlock(pDevice, Offset, pData, Size);
+    }
+    else
+    {
+        if (LM_NvramGetLock(pDevice) != LM_STATUS_SUCCESS)
+        {
+            return LM_STATUS_FAILURE;
+	}
+
+        if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5750)
+        {
+            REG_WR(pDevice, Nvram.NvmAccess,
+                REG_RD(pDevice, Nvram.NvmAccess) | ACCESS_EN);
+        }
+
+        /* Enable EEPROM write. */
+        if (pDevice->Flags & EEPROM_WP_FLAG)
+        {
+            REG_WR(pDevice, Grc.LocalCtrl, pDevice->GrcLocalCtrl |
+                        GRC_MISC_LOCAL_CTRL_GPIO_OE1);
+            REG_RD_BACK(pDevice, Grc.LocalCtrl);
+            MM_Wait(40);
+
+            Value32 = REG_RD(pDevice, Grc.LocalCtrl);
+            if(Value32 & GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT1)
+            {
+                if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5750)
+                {
+                    REG_WR(pDevice, Nvram.NvmAccess,
+                        REG_RD(pDevice, Nvram.NvmAccess) & ~ACCESS_EN);
+                }
+                return LM_STATUS_FAILURE;
+             }
+        }
+
+        REG_WR(pDevice, Grc.Mode, pDevice->GrcMode |
+            GRC_MODE_NVRAM_WRITE_ENABLE);
+
+        BufferedFlash = FALSE;
+        Value32 = REG_RD(pDevice, Nvram.Config1);
+        if(Value32 & FLASH_INTERFACE_ENABLE)
+        {
+            if(Value32 & FLASH_SSRAM_BUFFERED_MODE)
+            {
+                BufferedFlash = TRUE;
+            }
+        }
+
+        for (i = 0 ; i < Size ; i++, pData++, Offset += 4) {
+
+            /* Swap the data so that the byte stream will */
+            /* be written the same in little and big endian systems */
+            Value32 = MM_SWAP_BE32(*pData);
+
+            /* set the desired write data value to the flash */
+            REG_WR(pDevice, Nvram.WriteData, Value32);
+
+            /* set targeted address */
+            AddrOffset = Offset;
+
+            /* Determine if we have flash or buffered flash. */
+            if(BufferedFlash)
+            {
+                AddrOffset = ((Offset/BUFFERED_FLASH_PAGE_SIZE) <<
+                                        BUFFERED_FLASH_PAGE_POS) +
+                                    (Offset % BUFFERED_FLASH_PAGE_SIZE);
+            }
+
+            /* Write to flash or EEPROM with the new 5703/02 interface. */
+            REG_WR(pDevice, Nvram.Addr, AddrOffset & NVRAM_ADDRESS_MASK);
+
+            ControlReg = NVRAM_CMD_DO_IT | NVRAM_CMD_DONE | NVRAM_CMD_WR;
+            if(i == 0)
+            {
+                ControlReg |= NVRAM_CMD_FIRST;
+            }
+            if(i == (Size - 1))  
+            {
+                ControlReg |= NVRAM_CMD_LAST;
+            }
+
+            if(BufferedFlash)
+            {
+                /* Set CMD_FIRST when we are at the beginning of a page. */
+                if(!(AddrOffset & BUFFERED_FLASH_BYTE_ADDR_MASK))
+                {
+                    ControlReg |= NVRAM_CMD_FIRST;
+                }
+                else if((AddrOffset & BUFFERED_FLASH_BYTE_ADDR_MASK) ==
+                    (BUFFERED_FLASH_PAGE_SIZE - 4))
+                {
+                    ControlReg |=  NVRAM_CMD_LAST;
+                }
+            }
+
+            REG_WR(pDevice, Nvram.Cmd,  ControlReg);
+
+            /* Wait for the done bit to go High. */
+            for(j = 0; j < 4000 ; j++)
+            {
+                MM_Wait(10);
+
+                Value32 = REG_RD(pDevice, Nvram.Cmd);
+
+                if(Value32 & NVRAM_CMD_DONE)
+                {
+                    MM_Wait(5);
+                    break;
+                }
+            }
+        }  
+
+        REG_WR(pDevice, Grc.Mode, pDevice->GrcMode);
+
+        /* Write-protect EEPROM. */
+        if(pDevice->Flags & EEPROM_WP_FLAG)
+        {
+            REG_WR(pDevice, Grc.LocalCtrl, pDevice->GrcLocalCtrl |
+                GRC_MISC_LOCAL_CTRL_GPIO_OE1 | GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT1);
+            REG_RD_BACK(pDevice, Grc.LocalCtrl);
+            MM_Wait(40);
+        }
+
+        /* Relinquish nvram interface. */
+        LM_NvramReleaseLock(pDevice);
+
+        if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5750)
+        {
+            REG_WR(pDevice, Nvram.NvmAccess,
+                REG_RD(pDevice, Nvram.NvmAccess) & ~ACCESS_EN);
+        }
+
+        if(Value32 & NVRAM_CMD_DONE)
+        {
+            Status = LM_STATUS_SUCCESS;
+        }
+        else
+        {
+            Status = LM_STATUS_FAILURE;
+        }
+    }
+
+    return Status;
+} /* LM_NvramWriteBlock */
+#endif
+
+STATIC void
+LM_ReadVPD(PLM_DEVICE_BLOCK pDevice)
+{
+#ifdef BCM_PROC_FS
+    LM_UINT32 Vpd_arr[256/4];
+    LM_UINT8 *Vpd = (LM_UINT8 *) &Vpd_arr[0];
+    LM_UINT32 *Vpd_dptr = &Vpd_arr[0];
+    LM_UINT32 Value32;
+    unsigned int j;
+
+    /* Read PN from VPD */
+    for (j = 0; j < 256; j += 4, Vpd_dptr++ )
+    {
+        if (LM_NvramRead(pDevice, 0x100 + j, &Value32) != LM_STATUS_SUCCESS) {
+            printf("VPD read failed\n");
+            return;
+        }
+        *Vpd_dptr = Value32;
+    }
+    for (j = 0; j < 256; )
+    {
+        unsigned int Vpd_r_len;
+        unsigned int Vpd_r_end;
+
+        if ((Vpd[j] == 0x82) || (Vpd[j] == 0x91))
+        {
+            j = j + 3 + Vpd[j + 1] + (Vpd[j + 2] << 8);
+        }
+        else if (Vpd[j] == 0x90)
+        {
+            Vpd_r_len =  Vpd[j + 1] + (Vpd[j + 2] << 8);
+            j += 3;
+            Vpd_r_end = Vpd_r_len + j;
+            while (j < Vpd_r_end)
+            {
+                if ((Vpd[j] == 'P') && (Vpd[j + 1] == 'N'))
+                {
+                    unsigned int len = Vpd[j + 2];
+
+                    if (len <= 24)
+                    {
+                        memcpy(pDevice->PartNo, &Vpd[j + 3], len);
+                    }
+                    break;
+                }
+                else
+                {
+                    if (Vpd[j + 2] == 0)
+                    {
+                        break;
+                    }
+                    j = j + Vpd[j + 2];
+                }
+            }
+            break;
+        }
+        else {
+            break;
+        }
+    }
+#endif
+}
+
+STATIC void
+LM_ReadBootCodeVersion(PLM_DEVICE_BLOCK pDevice)
+{
+#ifdef BCM_PROC_FS
+    LM_UINT32 Value32, offset, ver_offset, start_addr;
+    int i;
+
+    if (LM_NvramRead(pDevice, 0x0, &Value32) != LM_STATUS_SUCCESS)
+        return;
+    Value32 = MM_SWAP_BE32(Value32);
+    if (Value32 != 0x669955aa)
+        return;
+    if (LM_NvramRead(pDevice, 0xc, &offset) != LM_STATUS_SUCCESS)
+        return;
+
+    offset = MM_SWAP_BE32(offset);
+
+    if((T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5700) &&
+        (T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5701) &&
+        ((REG_RD(pDevice, Nvram.Config1) & BUFFERED_FLASH) == BUFFERED_FLASH))
+    {
+        offset = (offset >> BUFFERED_FLASH_PAGE_POS) *
+            BUFFERED_FLASH_PAGE_SIZE + (offset & BUFFERED_FLASH_BYTE_ADDR_MASK);
+    }
+    if (LM_NvramRead(pDevice, offset, &Value32) != LM_STATUS_SUCCESS)
+        return;
+
+    Value32 = MM_SWAP_BE32(Value32);
+    if ((((Value32 & ~0x0f00) == 0x0e000003) ||
+        ((Value32 & ~0xff00) == 0x0c000003)) &&
+        (LM_NvramRead(pDevice, offset + 4, &Value32) == LM_STATUS_SUCCESS) &&
+        (Value32 == 0)) {
+
+        if (LM_NvramRead(pDevice, offset + 8, &ver_offset) != LM_STATUS_SUCCESS)
+            return;
+        if (LM_NvramRead(pDevice, 4, &start_addr) != LM_STATUS_SUCCESS)
+            return;
+        ver_offset = MM_SWAP_BE32(ver_offset);
+        start_addr = MM_SWAP_BE32(start_addr);
+        offset += ver_offset - start_addr;
+        for (i = 0; i < 16; i += 4) {
+            if (LM_NvramRead(pDevice, offset + i, &Value32) !=
+                LM_STATUS_SUCCESS)
+            {
+                return;
+            }
+            *((LM_UINT32 *) &pDevice->BootCodeVer[i]) = Value32;
+        }
+    }
+    else {
+        char c;
+
+        if (LM_NvramRead(pDevice, 0x94, &Value32) != LM_STATUS_SUCCESS)
+            return;
+
+        Value32 = MM_SWAP_BE32(Value32);
+        i = 0;
+        c = ((Value32 & 0xff00) >> 8);
+
+        if (c < 10) {
+            pDevice->BootCodeVer[i++] = c + '0';
+        }
+        else {
+            pDevice->BootCodeVer[i++] = (c / 10) + '0';
+            pDevice->BootCodeVer[i++] = (c % 10) + '0';
+        }
+        pDevice->BootCodeVer[i++] = '.';
+        c = Value32 & 0xff;
+        if (c < 10) {
+            pDevice->BootCodeVer[i++] = '0';
+            pDevice->BootCodeVer[i++] = c + '0';
+        }
+        else {
+            pDevice->BootCodeVer[i++] = (c / 10) + '0';
+            pDevice->BootCodeVer[i++] = (c % 10) + '0';
+        }
+        pDevice->BootCodeVer[i] = 0;
+    }
+#endif
+}
+
+STATIC void
+LM_GetBusSpeed(PLM_DEVICE_BLOCK pDevice)
+{
+#ifdef BCM_PROC_FS
+    LM_UINT32 PciState = pDevice->PciState;
+    LM_UINT32 ClockCtrl;
+    char *SpeedStr = "";
+
+    if (pDevice->Flags & PCI_EXPRESS_FLAG)
+    {
+        strcpy(pDevice->BusSpeedStr, "PCI Express");
+        return;
+    }
+    if (PciState & T3_PCI_STATE_32BIT_PCI_BUS)
+    {
+        strcpy(pDevice->BusSpeedStr, "32-bit ");
+    }
+    else
+    {
+        strcpy(pDevice->BusSpeedStr, "64-bit ");
+    }
+    if (PciState & T3_PCI_STATE_CONVENTIONAL_PCI_MODE)
+    {
+        strcat(pDevice->BusSpeedStr, "PCI ");
+        if (PciState & T3_PCI_STATE_HIGH_BUS_SPEED) 
+        {
+            SpeedStr = "66MHz";
+        }
+        else
+        {
+            SpeedStr = "33MHz";
+        }
+    }
+    else
+    {
+        strcat(pDevice->BusSpeedStr, "PCIX ");
+        if (pDevice->BondId == GRC_MISC_BD_ID_5704CIOBE)
+        {
+            SpeedStr = "133MHz";
+        }
+        else
+        {
+            ClockCtrl = pDevice->ClockCtrl & 0x1f;
+            switch (ClockCtrl)
+            {
+            case 0:
+                SpeedStr = "33MHz";
+                break;
+
+            case 2:
+                SpeedStr = "50MHz";
+                break;
+
+            case 4:
+                SpeedStr = "66MHz";
+                break;
+
+            case 6:
+                SpeedStr = "100MHz";
+                break;
+
+            case 7:
+                SpeedStr = "133MHz";
+                break;
+            }
+        }
+    }
+    strcat(pDevice->BusSpeedStr, SpeedStr);
+#endif
+}
+
+/******************************************************************************/
+/* Description:                                                               */
+/*    This routine initializes default parameters and reads the PCI           */
+/*    configurations.                                                         */
+/*                                                                            */
+/* Return:                                                                    */
+/*    LM_STATUS_SUCCESS                                                       */
+/******************************************************************************/
+LM_STATUS
+LM_GetAdapterInfo(
+PLM_DEVICE_BLOCK pDevice)
+{
+    PLM_ADAPTER_INFO pAdapterInfo;
+    LM_UINT32 Value32, LedCfg;
+    LM_STATUS Status;
+    LM_UINT32 EeSigFound;
+    LM_UINT32 EePhyTypeSerdes = 0;
+    LM_UINT32 EePhyId = 0;
+
+    /* Get Device Id and Vendor Id */
+    Status = MM_ReadConfig32(pDevice, PCI_VENDOR_ID_REG, &Value32);
+    if(Status != LM_STATUS_SUCCESS)
+    {
+        return Status;
+    }
+    pDevice->PciVendorId = (LM_UINT16) Value32;
+    pDevice->PciDeviceId = (LM_UINT16) (Value32 >> 16);
+
+    Status = MM_ReadConfig32(pDevice, PCI_REV_ID_REG, &Value32);
+    if(Status != LM_STATUS_SUCCESS)
+    {
+        return Status;
+    }
+    pDevice->PciRevId = (LM_UINT8) Value32;
+
+    /* Get chip revision id. */
+    Status = MM_ReadConfig32(pDevice, T3_PCI_MISC_HOST_CTRL_REG, &Value32);
+    pDevice->ChipRevId = Value32 >> 16;
+
+    /* detremine if it is PCIE system */
+    if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5750)
+    {
+        Status = MM_ReadConfig32(pDevice, T3_MSI_CAPABILITY_ID_REG, &Value32);
+        if (((Value32 >> 8) & 0xff) == T3_PCIE_CAPABILITY_ID_REG)
+        {
+            Status = MM_ReadConfig32(pDevice, T3_PCIE_CAPABILITY_ID_REG,
+                &Value32);
+            if ((Value32 & 0xff) == T3_PCIE_CAPABILITY_ID)
+            {
+                pDevice->Flags |= PCI_EXPRESS_FLAG;
+	    }
+        }
+    }
+
+    /* Get subsystem vendor. */
+    Status = MM_ReadConfig32(pDevice, PCI_SUBSYSTEM_VENDOR_ID_REG, &Value32);
+    if(Status != LM_STATUS_SUCCESS)
+    {
+        return Status;
+    }
+    pDevice->SubsystemVendorId = (LM_UINT16) Value32;
+
+    /* Get PCI subsystem id. */
+    pDevice->SubsystemId = (LM_UINT16) (Value32 >> 16);
+
+    /* Get the cache line size. */
+    MM_ReadConfig32(pDevice, PCI_CACHE_LINE_SIZE_REG, &Value32);
+    pDevice->CacheLineSize = (LM_UINT8) Value32;
+    pDevice->SavedCacheLineReg = Value32;
+
+    if(pDevice->ChipRevId != T3_CHIP_ID_5703_A1 &&
+        pDevice->ChipRevId != T3_CHIP_ID_5703_A2 &&
+        pDevice->ChipRevId != T3_CHIP_ID_5704_A0)
+    {
+        pDevice->Flags &= ~UNDI_FIX_FLAG;
+    }
+#if !PCIX_TARGET_WORKAROUND
+    pDevice->Flags &= ~UNDI_FIX_FLAG;
+#endif
+    /* Map the memory base to system address space. */
+    if (!(pDevice->Flags & UNDI_FIX_FLAG))
+    {
+        Status = MM_MapMemBase(pDevice);
+        if(Status != LM_STATUS_SUCCESS)
+        {
+            return Status;
+        }
+        /* Initialize the memory view pointer. */
+        pDevice->pMemView = (PT3_STD_MEM_MAP) pDevice->pMappedMemBase;
+    }
+
+    if ((T3_CHIP_REV(pDevice->ChipRevId) == T3_CHIP_REV_5700_BX) ||
+        (T3_CHIP_REV(pDevice->ChipRevId) == T3_CHIP_REV_5704_AX))
+    {
+        pDevice->Flags |= TX_4G_WORKAROUND_FLAG;
+    }
+    if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701)
+    {
+        pDevice->Flags |= REG_RD_BACK_FLAG;
+    }
+#ifdef INCLUDE_5750_A0_FIX
+    if ((pDevice->Flags & PCI_EXPRESS_FLAG) &&
+        (pDevice->ChipRevId == T3_CHIP_ID_5750_A0))
+    {
+        pDevice->Flags |= REG_RD_BACK_FLAG;
+    }
+#endif
+#if PCIX_TARGET_WORKAROUND
+    MM_ReadConfig32(pDevice, T3_PCI_STATE_REG, &Value32);
+    if((Value32 & T3_PCI_STATE_CONVENTIONAL_PCI_MODE) == 0)
+    {
+        /* Enable PCI-X workaround only if we are running on 5700 BX. */
+        if(T3_CHIP_REV(pDevice->ChipRevId) == T3_CHIP_REV_5700_BX)
+        {
+            pDevice->Flags |= ENABLE_PCIX_FIX_FLAG;
+        }
+    }
+    if (pDevice->Flags & UNDI_FIX_FLAG)
+    {
+        pDevice->Flags |= ENABLE_PCIX_FIX_FLAG;
+    }
+#endif
+    /* Bx bug: due to the "byte_enable bug" in PCI-X mode, the power */
+    /* management register may be clobbered which may cause the */
+    /* BCM5700 to go into D3 state.  While in this state, we will */
+    /* not have memory mapped register access.  As a workaround, we */
+    /* need to restore the device to D0 state. */
+    MM_ReadConfig32(pDevice, T3_PCI_PM_STATUS_CTRL_REG, &Value32);
+    Value32 |= T3_PM_PME_ASSERTED;
+    Value32 &= ~T3_PM_POWER_STATE_MASK;
+    Value32 |= T3_PM_POWER_STATE_D0;
+    MM_WriteConfig32(pDevice, T3_PCI_PM_STATUS_CTRL_REG, Value32);
+
+    /* read the current PCI command word */
+    MM_ReadConfig32(pDevice, PCI_COMMAND_REG, &Value32);
+
+    /* Make sure bus-mastering is enabled. */
+    Value32 |= PCI_BUSMASTER_ENABLE;
+
+#if PCIX_TARGET_WORKAROUND
+    /* if we are in PCI-X mode, also make sure mem-mapping and SERR#/PERR#
+        are enabled */
+    if (pDevice->Flags & ENABLE_PCIX_FIX_FLAG) {
+        Value32 |= (PCI_MEM_SPACE_ENABLE | PCI_SYSTEM_ERROR_ENABLE | 
+                    PCI_PARITY_ERROR_ENABLE);
+    }
+    if (pDevice->Flags & UNDI_FIX_FLAG)
+    {
+        Value32 &= ~PCI_MEM_SPACE_ENABLE;
+    }
+
+#endif
+
+    if (pDevice->Flags & ENABLE_MWI_FLAG)
+    {
+        Value32 |= PCI_MEMORY_WRITE_INVALIDATE;
+    }
+    else {
+        Value32 &= (~PCI_MEMORY_WRITE_INVALIDATE);
+    }
+
+    /* save the value we are going to write into the PCI command word */	
+    pDevice->PciCommandStatusWords = Value32;	
+
+    Status = MM_WriteConfig32(pDevice, PCI_COMMAND_REG, Value32);
+    if(Status != LM_STATUS_SUCCESS)
+    {
+        return Status;
+    }
+
+    /* Setup the mode registers. */
+    pDevice->MiscHostCtrl = 
+        MISC_HOST_CTRL_MASK_PCI_INT | 
+        MISC_HOST_CTRL_ENABLE_ENDIAN_WORD_SWAP | 
+#ifdef BIG_ENDIAN_HOST
+        MISC_HOST_CTRL_ENABLE_ENDIAN_BYTE_SWAP |  
+#endif /* BIG_ENDIAN_HOST */
+        MISC_HOST_CTRL_ENABLE_INDIRECT_ACCESS |
+        MISC_HOST_CTRL_ENABLE_PCI_STATE_REG_RW;
+	/* write to PCI misc host ctr first in order to enable indirect accesses */
+    MM_WriteConfig32(pDevice, T3_PCI_MISC_HOST_CTRL_REG, pDevice->MiscHostCtrl);
+
+    /* Set power state to D0. */
+    LM_SetPowerState(pDevice, LM_POWER_STATE_D0);
+
+    /* Preserve HOST_STACK_UP bit in case ASF firmware is running */
+    Value32 = REG_RD(pDevice, Grc.Mode) & GRC_MODE_HOST_STACK_UP;
+#ifdef BIG_ENDIAN_HOST
+    Value32 |= GRC_MODE_BYTE_SWAP_NON_FRAME_DATA | 
+              GRC_MODE_WORD_SWAP_NON_FRAME_DATA;
+#else
+    Value32 |= GRC_MODE_BYTE_SWAP_NON_FRAME_DATA | GRC_MODE_BYTE_SWAP_DATA;
+#endif
+    REG_WR(pDevice, Grc.Mode, Value32);
+
+    if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700)
+    {
+        REG_WR(pDevice, Grc.LocalCtrl, GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT1 |
+            GRC_MISC_LOCAL_CTRL_GPIO_OE1);
+        REG_RD_BACK(pDevice, Grc.LocalCtrl);
+    }
+    MM_Wait(40);
+
+    /* Enable indirect memory access */
+    REG_WR(pDevice, MemArbiter.Mode, T3_MEM_ARBITER_MODE_ENABLE);
+
+    LM_SwitchClocks(pDevice);
+
+    REG_WR(pDevice, PciCfg.MemWindowBaseAddr, 0);
+
+    /* Check to see if PXE ran and did not shutdown properly */
+    if ((REG_RD(pDevice, DmaWrite.Mode) & DMA_WRITE_MODE_ENABLE) ||
+        !(REG_RD(pDevice, PciCfg.MiscHostCtrl) & MISC_HOST_CTRL_MASK_PCI_INT))
+    {
+        LM_DisableInterrupt(pDevice);
+        /* assume ASF is enabled */
+        pDevice->AsfFlags = ASF_ENABLED;
+        if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5750)
+        {
+            pDevice->AsfFlags |= ASF_NEW_HANDSHAKE;
+        }
+        LM_ShutdownChip(pDevice, LM_SHUTDOWN_RESET);
+        pDevice->AsfFlags = 0;
+    }
+#if PCIX_TARGET_WORKAROUND
+    MM_ReadConfig32(pDevice, T3_PCI_STATE_REG, &Value32);
+    if (!(pDevice->Flags & ENABLE_PCIX_FIX_FLAG) &&
+        ((Value32 & T3_PCI_STATE_CONVENTIONAL_PCI_MODE) == 0))
+    {
+        if (pDevice->ChipRevId == T3_CHIP_ID_5701_A0 ||
+            pDevice->ChipRevId == T3_CHIP_ID_5701_B0 ||
+            pDevice->ChipRevId == T3_CHIP_ID_5701_B2 ||
+            pDevice->ChipRevId == T3_CHIP_ID_5701_B5)
+        {
+            MM_MEMWRITEL(&(pDevice->pMemView->uIntMem.MemBlock32K[0x300]), 0);
+            MM_MEMWRITEL(&(pDevice->pMemView->uIntMem.MemBlock32K[0x301]), 0);
+            MM_MEMWRITEL(&(pDevice->pMemView->uIntMem.MemBlock32K[0x301]),
+                0xffffffff);
+            if (MM_MEMREADL(&(pDevice->pMemView->uIntMem.MemBlock32K[0x300])))
+            {
+                pDevice->Flags |= ENABLE_PCIX_FIX_FLAG;
+            }
+        }
+    }
+#endif
+
+    LM_NvramInit(pDevice);
+
+    Status = LM_STATUS_FAILURE;
+    /* Get the node address.  First try to get in from the shared memory. */
+    /* If the signature is not present, then get it from the NVRAM. */
+    Value32 = MEM_RD_OFFSET(pDevice, T3_MAC_ADDR_HIGH_MAILBOX);
+    if((Value32 >> 16) == 0x484b)
+    {
+        int i;
+
+        pDevice->NodeAddress[0] = (LM_UINT8) (Value32 >> 8);
+        pDevice->NodeAddress[1] = (LM_UINT8) Value32;
+
+        Value32 = MEM_RD_OFFSET(pDevice, T3_MAC_ADDR_LOW_MAILBOX);
+
+        pDevice->NodeAddress[2] = (LM_UINT8) (Value32 >> 24);
+        pDevice->NodeAddress[3] = (LM_UINT8) (Value32 >> 16);
+        pDevice->NodeAddress[4] = (LM_UINT8) (Value32 >> 8);
+        pDevice->NodeAddress[5] = (LM_UINT8) Value32;
+
+        /* Check for null MAC address which can happen with older boot code */
+        for (i = 0; i < 6; i++)
+        {
+            if (pDevice->NodeAddress[i] != 0)
+            {
+                Status = LM_STATUS_SUCCESS;
+                break;
+            }
+        }
+    }
+    if (Status != LM_STATUS_SUCCESS)
+    {
+        int MacOffset;
+
+        MacOffset = 0x7c;
+        if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5704)
+        {
+            if (REG_RD(pDevice, PciCfg.DualMacCtrl) & T3_DUAL_MAC_ID)
+            {
+                MacOffset = 0xcc;
+            }
+            /* workaround - need to reset nvram if */
+            /* the boot code is not running */
+            if (LM_NvramGetLock(pDevice) != LM_STATUS_SUCCESS)
+            {
+                REG_WR(pDevice, Nvram.Cmd, NVRAM_CMD_RESET);
+            }
+            else
+            {
+                LM_NvramReleaseLock(pDevice);
+            }
+        }
+        Status = LM_NvramRead(pDevice, MacOffset, &Value32);
+        if(Status == LM_STATUS_SUCCESS)
+        {
+            LM_UINT8 *c = (LM_UINT8 *) &Value32;
+
+            pDevice->NodeAddress[0] = c[2];
+            pDevice->NodeAddress[1] = c[3];
+
+            Status = LM_NvramRead(pDevice, MacOffset + 4, &Value32);
+
+            c = (LM_UINT8 *) &Value32;
+            pDevice->NodeAddress[2] = c[0];
+            pDevice->NodeAddress[3] = c[1];
+            pDevice->NodeAddress[4] = c[2];
+            pDevice->NodeAddress[5] = c[3];
+        }
+    }
+
+    if(Status != LM_STATUS_SUCCESS)
+    {
+        Value32 = REG_RD(pDevice, MacCtrl.MacAddr[0].High);
+        pDevice->NodeAddress[0] = (Value32 >> 8) & 0xff;
+        pDevice->NodeAddress[1] = Value32 & 0xff;
+        Value32 = REG_RD(pDevice, MacCtrl.MacAddr[0].Low);
+        pDevice->NodeAddress[2] = (Value32 >> 24) & 0xff;
+        pDevice->NodeAddress[3] = (Value32 >> 16) & 0xff;
+        pDevice->NodeAddress[4] = (Value32 >> 8) & 0xff;
+        pDevice->NodeAddress[5] = Value32 & 0xff;
+        printf("WARNING: Cannot get MAC addr from NVRAM, using %2.2x%2.2x%2.2x%2.2x%2.2x%2.2x\n",
+            pDevice->NodeAddress[0], pDevice->NodeAddress[1],
+            pDevice->NodeAddress[2], pDevice->NodeAddress[3],
+            pDevice->NodeAddress[4], pDevice->NodeAddress[5]);
+    }
+
+    memcpy(pDevice->PermanentNodeAddress, pDevice->NodeAddress, 6);
+
+    /* Initialize the default values. */
+    pDevice->TxPacketDescCnt = DEFAULT_TX_PACKET_DESC_COUNT;
+    pDevice->RxStdDescCnt = DEFAULT_STD_RCV_DESC_COUNT;
+    pDevice->RxCoalescingTicks = DEFAULT_RX_COALESCING_TICKS;
+    pDevice->TxCoalescingTicks = DEFAULT_TX_COALESCING_TICKS;
+    pDevice->RxMaxCoalescedFrames = DEFAULT_RX_MAX_COALESCED_FRAMES;
+    pDevice->TxMaxCoalescedFrames = DEFAULT_TX_MAX_COALESCED_FRAMES;
+    pDevice->RxCoalescingTicksDuringInt = BAD_DEFAULT_VALUE;
+    pDevice->TxCoalescingTicksDuringInt = BAD_DEFAULT_VALUE;
+    pDevice->RxMaxCoalescedFramesDuringInt = BAD_DEFAULT_VALUE;
+    pDevice->TxMaxCoalescedFramesDuringInt = BAD_DEFAULT_VALUE;
+    pDevice->StatsCoalescingTicks = DEFAULT_STATS_COALESCING_TICKS;
+    pDevice->TxMtu = MAX_ETHERNET_PACKET_SIZE_NO_CRC;
+    pDevice->RxMtu = MAX_ETHERNET_PACKET_SIZE_NO_CRC;
+    pDevice->DisableAutoNeg = FALSE;
+    pDevice->PhyIntMode = T3_PHY_INT_MODE_AUTO;
+    pDevice->LinkChngMode = T3_LINK_CHNG_MODE_AUTO;
+
+    pDevice->PhyFlags = 0;
+
+    if (!(pDevice->Flags & PCI_EXPRESS_FLAG))
+        pDevice->Flags |= DELAY_PCI_GRANT_FLAG;
+
+    pDevice->RequestedLineSpeed = LM_LINE_SPEED_AUTO;
+    pDevice->TaskOffloadCap = LM_TASK_OFFLOAD_NONE;
+    pDevice->TaskToOffload = LM_TASK_OFFLOAD_NONE;
+    pDevice->FlowControlCap = LM_FLOW_CONTROL_AUTO_PAUSE;
+#if INCLUDE_TBI_SUPPORT
+    pDevice->TbiFlags = 0;
+    pDevice->IgnoreTbiLinkChange = FALSE;
+#endif
+#if INCLUDE_TCP_SEG_SUPPORT
+    pDevice->LargeSendMaxSize = T3_TCP_SEG_MAX_OFFLOAD_SIZE;
+    pDevice->LargeSendMinNumSeg = T3_TCP_SEG_MIN_NUM_SEG;
+#endif
+
+    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))
+    {
+        pDevice->PhyFlags |= PHY_RESET_ON_LINKDOWN;
+        pDevice->PhyFlags |= PHY_CHECK_TAPS_AFTER_RESET;
+    }
+    if ((T3_CHIP_REV(pDevice->ChipRevId) == T3_CHIP_REV_5703_AX) ||
+        (T3_CHIP_REV(pDevice->ChipRevId) == T3_CHIP_REV_5704_AX))
+    {
+        pDevice->PhyFlags |= PHY_ADC_FIX;
+    }
+    if (pDevice->ChipRevId == T3_CHIP_ID_5704_A0)
+    {
+        pDevice->PhyFlags |= PHY_5704_A0_FIX;
+    }
+    if (T3_ASIC_5705_OR_5750(pDevice->ChipRevId))
+    {
+        pDevice->PhyFlags |= PHY_5705_5750_FIX;
+    }
+    /* Ethernet@Wirespeed is supported on 5701,5702,5703,5704,5705a0,5705a1 */
+    if ((T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5700) &&
+        !((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705) &&
+        (pDevice->ChipRevId != T3_CHIP_ID_5705_A0) &&
+        (pDevice->ChipRevId != T3_CHIP_ID_5705_A1)))
+    {
+        pDevice->PhyFlags |= PHY_ETHERNET_WIRESPEED;
+    }
+
+    switch (T3_ASIC_REV(pDevice->ChipRevId))
+    {
+    case T3_ASIC_REV_5704:
+        pDevice->MbufBase = T3_NIC_MBUF_POOL_ADDR;
+        pDevice->MbufSize = T3_NIC_MBUF_POOL_SIZE64;
+        break;
+    default:
+        pDevice->MbufBase = T3_NIC_MBUF_POOL_ADDR;
+        pDevice->MbufSize = T3_NIC_MBUF_POOL_SIZE96;
+        break;
+    }
+
+    pDevice->LinkStatus = LM_STATUS_LINK_DOWN;
+    pDevice->QueueRxPackets = TRUE;
+
+#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
+    pDevice->RxJumboDescCnt = DEFAULT_JUMBO_RCV_DESC_COUNT;
+    if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705)
+    {
+        pDevice->RxJumboDescCnt = 0;
+    }
+#endif /* T3_JUMBO_RCV_RCB_ENTRY_COUNT */
+
+    pDevice->BondId = REG_RD(pDevice, Grc.MiscCfg) & GRC_MISC_BD_ID_MASK;
+
+    if(((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701) &&
+        ((pDevice->BondId == 0x10000) || (pDevice->BondId == 0x18000))) ||
+        ((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5703) &&
+        ((pDevice->BondId == 0x14000) || (pDevice->BondId == 0x1c000))))
+    {
+        return LM_STATUS_UNKNOWN_ADAPTER;
+    }
+    if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5703)
+    {
+        if ((pDevice->BondId == 0x8000) || (pDevice->BondId == 0x4000))
+        {
+            pDevice->PhyFlags |= PHY_NO_GIGABIT;
+        }
+    }
+    if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705)
+    {
+        if ((pDevice->BondId == GRC_MISC_BD_ID_5788) ||
+            (pDevice->BondId == GRC_MISC_BD_ID_5788M))
+        {
+            pDevice->Flags |= BCM5788_FLAG;
+        }
+        if ((pDevice->PciDeviceId == T3_PCI_DEVICE_ID(T3_PCI_ID_BCM5901)) ||
+            (pDevice->PciDeviceId == T3_PCI_DEVICE_ID(T3_PCI_ID_BCM5901A2)) ||
+            (pDevice->PciDeviceId == T3_PCI_DEVICE_ID(T3_PCI_ID_BCM5705F)))
+        {
+            pDevice->PhyFlags |= PHY_NO_GIGABIT;
+        }
+    }
+    if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5750)
+    {
+        if (pDevice->PciDeviceId == T3_PCI_DEVICE_ID(T3_PCI_ID_BCM5751F))
+        {
+            pDevice->PhyFlags |= PHY_NO_GIGABIT;
+        }
+    }
+
+    /* CIOBE multisplit has a bug */
+#if 0
+    if ((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5704) &&
+        (pDevice->BondId == GRC_MISC_BD_ID_5704CIOBE))
+    {
+        pDevice->Flags |= MULTI_SPLIT_ENABLE_FLAG;
+        pDevice->SplitModeMaxReq = SPLIT_MODE_5704_MAX_REQ;
+    }
+#endif
+
+    /* Get Eeprom info. */
+    Value32 = MEM_RD_OFFSET(pDevice, T3_NIC_DATA_SIG_ADDR);
+    if (Value32 == T3_NIC_DATA_SIG)
+    {
+        EeSigFound = TRUE;
+        Value32 = MEM_RD_OFFSET(pDevice, T3_NIC_DATA_NIC_CFG_ADDR);
+
+        if (Value32 & T3_NIC_MINI_PCI)
+        {
+            pDevice->Flags |= MINI_PCI_FLAG;
+        }
+        /* Determine PHY type. */
+        switch (Value32 & T3_NIC_CFG_PHY_TYPE_MASK)
+        {
+            case T3_NIC_CFG_PHY_TYPE_COPPER:
+                EePhyTypeSerdes = FALSE;
+                break;
+
+            case T3_NIC_CFG_PHY_TYPE_FIBER:
+                EePhyTypeSerdes = TRUE;
+                break;
+
+            default:
+                EePhyTypeSerdes = FALSE;
+                break;
+        }
+
+        if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5750)
+        {
+            LedCfg = MEM_RD_OFFSET(pDevice, T3_NIC_DATA_NIC_CFG_ADDR2);
+            LedCfg = LedCfg & (T3_NIC_CFG_LED_MODE_MASK |
+                T3_SHASTA_EXT_LED_MODE_MASK);
+        }
+        else
+        {
+            /* Determine PHY led mode. for legacy devices */
+            LedCfg = Value32 & T3_NIC_CFG_LED_MODE_MASK;
+        }
+
+        switch (LedCfg)
+        {
+            default:
+            case T3_NIC_CFG_LED_PHY_MODE_1:
+                pDevice->LedCtrl = LED_CTRL_PHY_MODE_1;
+                break;
+
+            case T3_NIC_CFG_LED_PHY_MODE_2:
+                pDevice->LedCtrl = LED_CTRL_PHY_MODE_2;
+                break;
+
+            case T3_NIC_CFG_LED_MAC_MODE:
+                pDevice->LedCtrl = LED_CTRL_MAC_MODE;
+                break;
+
+	    case T3_SHASTA_EXT_LED_SHARED_TRAFFIC_LINK_MODE:
+                pDevice->LedCtrl = LED_CTRL_SHARED_TRAFFIC_LINK;
+                if ((pDevice->ChipRevId != T3_CHIP_ID_5750_A0) &&
+                    (pDevice->ChipRevId != T3_CHIP_ID_5750_A1))
+                {
+                    pDevice->LedCtrl |= LED_CTRL_PHY_MODE_1 |
+                        LED_CTRL_PHY_MODE_2;
+		}
+                break;
+
+	    case T3_SHASTA_EXT_LED_MAC_MODE:
+                pDevice->LedCtrl = LED_CTRL_SHASTA_MAC_MODE;
+                break;
+
+            case T3_SHASTA_EXT_LED_WIRELESS_COMBO_MODE:
+                pDevice->LedCtrl = LED_CTRL_WIRELESS_COMBO;
+                if (pDevice->ChipRevId != T3_CHIP_ID_5750_A0)
+                {
+                    pDevice->LedCtrl |= LED_CTRL_PHY_MODE_1 |
+                        LED_CTRL_PHY_MODE_2;
+                }
+                break;
+
+        }
+
+        if (((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700 ||
+            T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701)) &&
+            (pDevice->SubsystemVendorId == T3_SVID_DELL))
+        {
+            pDevice->LedCtrl = LED_CTRL_PHY_MODE_2;
+        }
+
+        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))
+        {
+            /* Enable EEPROM write protection. */
+            if(Value32 & T3_NIC_EEPROM_WP)
+            {
+                pDevice->Flags |= EEPROM_WP_FLAG;
+            }
+        }
+        pDevice->AsfFlags = 0;
+#ifdef BCM_ASF
+        if (Value32 & T3_NIC_CFG_ENABLE_ASF)
+        {
+            pDevice->AsfFlags |= ASF_ENABLED;
+            if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5750)
+            {
+                pDevice->AsfFlags |= ASF_NEW_HANDSHAKE;
+	    }
+        }
+#endif
+        if (Value32 & T3_NIC_FIBER_WOL_CAPABLE)
+        {
+            pDevice->Flags |= FIBER_WOL_CAPABLE_FLAG;
+        }
+        if (Value32 & T3_NIC_WOL_LIMIT_10)
+        {
+            pDevice->Flags |= WOL_LIMIT_10MBPS_FLAG;
+        }
+
+        /* Get the PHY Id. */
+        Value32 = MEM_RD_OFFSET(pDevice, T3_NIC_DATA_PHY_ID_ADDR);
+        if (Value32)
+        {
+            EePhyId = (((Value32 & T3_NIC_PHY_ID1_MASK) >> 16) &
+                PHY_ID1_OUI_MASK) << 10;
+
+            Value32 = Value32 & T3_NIC_PHY_ID2_MASK;
+
+            EePhyId |= ((Value32 & PHY_ID2_OUI_MASK) << 16) |
+              (Value32 & PHY_ID2_MODEL_MASK) | (Value32 & PHY_ID2_REV_MASK);
+        }
+        else
+        {
+            EePhyId = 0;
+            if (!EePhyTypeSerdes && !(pDevice->AsfFlags & ASF_ENABLED))
+            {
+                /* reset PHY if boot code couldn't read the PHY ID */
+                LM_ResetPhy(pDevice);
+            }
+        }
+        if (MEM_RD_OFFSET(pDevice, T3_NIC_DATA_NIC_CFG_ADDR2) & BIT_17)
+        {
+            pDevice->PhyFlags |= PHY_CAPACITIVE_COUPLING;
+        }
+    }
+    else
+    {
+        EeSigFound = FALSE;
+    }
+
+    /* Set the PHY address. */
+    pDevice->PhyAddr = PHY_DEVICE_ID;
+
+    /* Disable auto polling. */
+    pDevice->MiMode = 0xc0000;
+    REG_WR(pDevice, MacCtrl.MiMode, pDevice->MiMode);
+    REG_RD_BACK(pDevice, MacCtrl.MiMode);
+    MM_Wait(80);
+
+    if (pDevice->AsfFlags & ASF_ENABLED)
+    {
+        /* Reading PHY registers will contend with ASF */
+        pDevice->PhyId = 0;
+    }
+    else
+    {
+        /* Get the PHY id. */
+        LM_GetPhyId(pDevice);
+    }
+
+    /* Set the EnableTbi flag to false if we have a copper PHY. */
+    switch(pDevice->PhyId & PHY_ID_MASK)
+    {
+        case PHY_BCM5400_PHY_ID:
+        case PHY_BCM5401_PHY_ID:
+        case PHY_BCM5411_PHY_ID:
+        case PHY_BCM5701_PHY_ID:
+        case PHY_BCM5703_PHY_ID:
+        case PHY_BCM5704_PHY_ID:
+        case PHY_BCM5705_PHY_ID:
+        case PHY_BCM5750_PHY_ID:
+            break;
+
+        case PHY_BCM8002_PHY_ID:
+            pDevice->TbiFlags |= ENABLE_TBI_FLAG;
+            break;
+
+        default:
+
+            if (EeSigFound)
+            {
+                pDevice->PhyId = EePhyId;
+                if (EePhyTypeSerdes)
+                {
+                    pDevice->TbiFlags |= ENABLE_TBI_FLAG;
+                }
+            }
+            else if ((pAdapterInfo = LM_GetAdapterInfoBySsid(
+                pDevice->SubsystemVendorId,
+                pDevice->SubsystemId)))
+            {
+                pDevice->PhyId = pAdapterInfo->PhyId;
+                if (pAdapterInfo->Serdes)
+                {
+                    pDevice->TbiFlags |= ENABLE_TBI_FLAG;
+                }
+            }
+            else
+	    {
+                if (UNKNOWN_PHY_ID(pDevice->PhyId))
+                {
+                    LM_ResetPhy(pDevice);
+                    LM_GetPhyId(pDevice);
+                }
+            }
+            break;
+    }
+
+    if(UNKNOWN_PHY_ID(pDevice->PhyId) && 
+        !(pDevice->TbiFlags & ENABLE_TBI_FLAG))
+    {
+        pDevice->TbiFlags |= ENABLE_TBI_FLAG;
+        printf("PHY ID unknown, assume it is SerDes\n");
+    }
+
+    if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5703)
+    {
+        if((pDevice->SavedCacheLineReg & 0xff00) < 0x4000)
+        {
+            pDevice->SavedCacheLineReg &= 0xffff00ff;
+            pDevice->SavedCacheLineReg |= 0x4000;
+        }
+    }
+
+    pDevice->ReceiveMask = LM_ACCEPT_MULTICAST | LM_ACCEPT_BROADCAST |
+        LM_ACCEPT_UNICAST;
+
+    pDevice->TaskOffloadCap = LM_TASK_OFFLOAD_TX_TCP_CHECKSUM |
+        LM_TASK_OFFLOAD_TX_UDP_CHECKSUM | LM_TASK_OFFLOAD_RX_TCP_CHECKSUM |
+        LM_TASK_OFFLOAD_RX_UDP_CHECKSUM;
+
+    if (pDevice->ChipRevId == T3_CHIP_ID_5700_B0)
+    {
+       	pDevice->TaskOffloadCap &= ~(LM_TASK_OFFLOAD_TX_TCP_CHECKSUM |
+            LM_TASK_OFFLOAD_TX_UDP_CHECKSUM);
+    }
+
+#if INCLUDE_TCP_SEG_SUPPORT
+    pDevice->TaskOffloadCap |= LM_TASK_OFFLOAD_TCP_SEGMENTATION;
+
+    if ((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700) ||
+        (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701) ||
+        (pDevice->ChipRevId == T3_CHIP_ID_5705_A0))
+    {
+        pDevice->TaskOffloadCap &= ~LM_TASK_OFFLOAD_TCP_SEGMENTATION;
+    }
+#endif
+
+#ifdef BCM_ASF
+    if (pDevice->AsfFlags & ASF_ENABLED)
+    {
+        if (T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5750)
+        {
+       	    pDevice->TaskOffloadCap &= ~LM_TASK_OFFLOAD_TCP_SEGMENTATION;
+	}
+    }
+#endif
+
+    /* Change driver parameters. */
+    Status = MM_GetConfig(pDevice);
+    if(Status != LM_STATUS_SUCCESS)
+    {
+        return Status;
+    }
+
+    if (T3_ASIC_5705_OR_5750(pDevice->ChipRevId))
+    {
+        pDevice->Flags &= ~NIC_SEND_BD_FLAG;
+    }
+
+    /* Save the current phy link status. */
+    if (!(pDevice->TbiFlags & ENABLE_TBI_FLAG) &&
+        !(pDevice->AsfFlags & ASF_ENABLED))
+    {
+        LM_ReadPhy(pDevice, PHY_STATUS_REG, &Value32);
+        LM_ReadPhy(pDevice, PHY_STATUS_REG, &Value32);
+
+        /* If we don't have link reset the PHY. */
+        if(!(Value32 & PHY_STATUS_LINK_PASS) ||
+            (pDevice->PhyFlags & PHY_RESET_ON_INIT))
+        {
+
+            LM_ResetPhy(pDevice);
+
+            if (LM_PhyAdvertiseAll(pDevice) != LM_STATUS_SUCCESS)
+            {
+                Value32 = PHY_AN_AD_PROTOCOL_802_3_CSMA_CD |
+                    PHY_AN_AD_ALL_SPEEDS;
+                Value32 |= GetPhyAdFlowCntrlSettings(pDevice);
+                LM_WritePhy(pDevice, PHY_AN_AD_REG, Value32);
+
+                Value32 = BCM540X_AN_AD_ALL_1G_SPEEDS ;
+#if INCLUDE_5701_AX_FIX
+                if(pDevice->ChipRevId == T3_CHIP_ID_5701_A0 ||
+                    pDevice->ChipRevId == T3_CHIP_ID_5701_B0)
+                {
+                    Value32 |= BCM540X_CONFIG_AS_MASTER |
+                        BCM540X_ENABLE_CONFIG_AS_MASTER;
+                }
+#endif
+                LM_WritePhy(pDevice, BCM540X_1000BASET_CTRL_REG, Value32);
+
+                LM_WritePhy(pDevice, PHY_CTRL_REG, PHY_CTRL_AUTO_NEG_ENABLE |
+                    PHY_CTRL_RESTART_AUTO_NEG);
+            }
+
+        }
+        LM_SetEthWireSpeed(pDevice);
+
+        LM_ReadPhy(pDevice, PHY_AN_AD_REG, &pDevice->advertising);
+        LM_ReadPhy(pDevice, BCM540X_1000BASET_CTRL_REG,
+            &pDevice->advertising1000);
+    }
+    LM_PhyTapPowerMgmt(pDevice);
+
+#if INCLUDE_TBI_SUPPORT
+    if(pDevice->TbiFlags & ENABLE_TBI_FLAG)
+    {
+        if (!(pDevice->Flags & FIBER_WOL_CAPABLE_FLAG))
+        {
+            pDevice->WakeUpModeCap = LM_WAKE_UP_MODE_NONE;
+        }
+        pDevice->PhyIntMode = T3_PHY_INT_MODE_LINK_READY;
+        if (pDevice->TbiFlags & TBI_PURE_POLLING_FLAG)
+        {
+            pDevice->IgnoreTbiLinkChange = TRUE;
+        }
+    }
+    else
+    {
+        pDevice->TbiFlags = 0;
+    }
+#endif /* INCLUDE_TBI_SUPPORT */
+
+    /* UseTaggedStatus is only valid for 5701 and later. */
+    if ((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700) ||
+        ((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705) &&
+        ((pDevice->BondId == GRC_MISC_BD_ID_5788) ||
+        (pDevice->BondId == GRC_MISC_BD_ID_5788M))))
+    {
+        pDevice->Flags &= ~USE_TAGGED_STATUS_FLAG;
+        pDevice->CoalesceMode = 0;
+    }
+    else
+    {
+        pDevice->CoalesceMode = HOST_COALESCE_CLEAR_TICKS_ON_RX_BD_EVENT |
+            HOST_COALESCE_CLEAR_TICKS_ON_TX_BD_EVENT;
+    }
+
+    /* Set the status block size. */
+    if(T3_CHIP_REV(pDevice->ChipRevId) != T3_CHIP_REV_5700_AX &&
+        T3_CHIP_REV(pDevice->ChipRevId) != T3_CHIP_REV_5700_BX)
+    {
+        pDevice->CoalesceMode |= HOST_COALESCE_32_BYTE_STATUS_MODE;
+    }
+
+    /* Check the DURING_INT coalescing ticks parameters. */
+    if (pDevice->Flags & USE_TAGGED_STATUS_FLAG)
+    {
+        if(pDevice->RxCoalescingTicksDuringInt == BAD_DEFAULT_VALUE)
+        {
+            pDevice->RxCoalescingTicksDuringInt =
+                DEFAULT_RX_COALESCING_TICKS_DURING_INT;
+        }
+
+        if(pDevice->TxCoalescingTicksDuringInt == BAD_DEFAULT_VALUE)
+        {
+            pDevice->TxCoalescingTicksDuringInt =
+                DEFAULT_TX_COALESCING_TICKS_DURING_INT;
+        }
+
+        if(pDevice->RxMaxCoalescedFramesDuringInt == BAD_DEFAULT_VALUE)
+        {
+            pDevice->RxMaxCoalescedFramesDuringInt =
+                DEFAULT_RX_MAX_COALESCED_FRAMES_DURING_INT;
+        }
+
+        if(pDevice->TxMaxCoalescedFramesDuringInt == BAD_DEFAULT_VALUE)
+        {
+            pDevice->TxMaxCoalescedFramesDuringInt =
+                DEFAULT_TX_MAX_COALESCED_FRAMES_DURING_INT;
+        }
+    }
+    else
+    {
+        if(pDevice->RxCoalescingTicksDuringInt == BAD_DEFAULT_VALUE)
+        {
+            pDevice->RxCoalescingTicksDuringInt = 0;
+        }
+
+        if(pDevice->TxCoalescingTicksDuringInt == BAD_DEFAULT_VALUE)
+        {
+            pDevice->TxCoalescingTicksDuringInt = 0;
+        }
+
+        if(pDevice->RxMaxCoalescedFramesDuringInt == BAD_DEFAULT_VALUE)
+        {
+            pDevice->RxMaxCoalescedFramesDuringInt = 0;
+        }
+
+        if(pDevice->TxMaxCoalescedFramesDuringInt == BAD_DEFAULT_VALUE)
+        {
+            pDevice->TxMaxCoalescedFramesDuringInt = 0;
+        }
+    }
+
+#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
+    if(pDevice->RxMtu <= (MAX_STD_RCV_BUFFER_SIZE - 8 /* CRC */))
+    {
+        pDevice->RxJumboDescCnt = 0;
+        if(pDevice->RxMtu <= MAX_ETHERNET_PACKET_SIZE_NO_CRC)
+        {
+            pDevice->RxMtu = MAX_ETHERNET_PACKET_SIZE_NO_CRC;
+        }
+    }
+    else if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705)
+    {
+        pDevice->RxMtu = MAX_ETHERNET_PACKET_SIZE_NO_CRC;
+        pDevice->RxJumboDescCnt = 0;
+    }
+    else
+    {
+        pDevice->RxJumboBufferSize = (pDevice->RxMtu + 8 /* CRC + VLAN */ +
+            COMMON_CACHE_LINE_SIZE-1) & ~COMMON_CACHE_LINE_MASK;
+
+        if(pDevice->RxJumboBufferSize > MAX_JUMBO_RCV_BUFFER_SIZE)
+        {
+            pDevice->RxJumboBufferSize = DEFAULT_JUMBO_RCV_BUFFER_SIZE;
+            pDevice->RxMtu = pDevice->RxJumboBufferSize - 8 /* CRC + VLAN */;
+        }
+        pDevice->TxMtu = pDevice->RxMtu;
+
+    }
+#else
+    pDevice->RxMtu = MAX_ETHERNET_PACKET_SIZE_NO_CRC;
+#endif /* T3_JUMBO_RCV_RCB_ENTRY_COUNT */
+
+    pDevice->RxPacketDescCnt = 
+#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
+        pDevice->RxJumboDescCnt +
+#endif /* T3_JUMBO_RCV_RCB_ENTRY_COUNT */
+        pDevice->RxStdDescCnt;
+
+    if(pDevice->TxMtu < MAX_ETHERNET_PACKET_SIZE_NO_CRC)
+    {
+        pDevice->TxMtu = MAX_ETHERNET_PACKET_SIZE_NO_CRC;
+    }
+
+    if(pDevice->TxMtu > MAX_JUMBO_TX_BUFFER_SIZE)
+    {
+        pDevice->TxMtu = MAX_JUMBO_TX_BUFFER_SIZE;
+    }
+
+    /* Configure the proper ways to get link change interrupt. */
+    if(pDevice->PhyIntMode == T3_PHY_INT_MODE_AUTO)
+    {
+        if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700)
+        {
+            pDevice->PhyIntMode = T3_PHY_INT_MODE_MI_INTERRUPT;
+        }
+        else
+        {
+            pDevice->PhyIntMode = T3_PHY_INT_MODE_LINK_READY;
+        }
+    }
+    else if(pDevice->PhyIntMode == T3_PHY_INT_MODE_AUTO_POLLING)
+    {
+        /* Auto-polling does not work on 5700_AX and 5700_BX. */
+        if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700)
+        {
+            pDevice->PhyIntMode = T3_PHY_INT_MODE_MI_INTERRUPT;
+        }
+    }
+
+    /* Determine the method to get link change status. */
+    if(pDevice->LinkChngMode == T3_LINK_CHNG_MODE_AUTO)
+    {
+        /* The link status bit in the status block does not work on 5700_AX */
+        /* and 5700_BX chips. */
+        if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700)
+        {
+            pDevice->LinkChngMode = T3_LINK_CHNG_MODE_USE_STATUS_REG;
+        }
+        else
+        {
+            pDevice->LinkChngMode = T3_LINK_CHNG_MODE_USE_STATUS_BLOCK;
+        }
+    }
+
+    if(pDevice->PhyIntMode == T3_PHY_INT_MODE_MI_INTERRUPT ||
+        T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700)
+    {
+        pDevice->LinkChngMode = T3_LINK_CHNG_MODE_USE_STATUS_REG;
+    }
+
+    if (!EeSigFound)
+    {
+        pDevice->LedCtrl = LED_CTRL_PHY_MODE_1;
+    }
+
+    if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700 ||
+        T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701)
+    {
+        /* bug? 5701 in LINK10 mode does not seem to work when */
+        /* PhyIntMode is LINK_READY. */
+        if(T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5700 &&
+#if INCLUDE_TBI_SUPPORT
+            !(pDevice->TbiFlags & ENABLE_TBI_FLAG) &&
+#endif
+            pDevice->LedCtrl == LED_CTRL_PHY_MODE_2)
+        {
+            pDevice->PhyIntMode = T3_PHY_INT_MODE_MI_INTERRUPT;
+            pDevice->LinkChngMode = T3_LINK_CHNG_MODE_USE_STATUS_REG;
+        }
+        if (pDevice->TbiFlags & ENABLE_TBI_FLAG)
+        {
+            pDevice->LedCtrl = LED_CTRL_PHY_MODE_1;
+        }
+    }
+
+#ifdef BCM_WOL
+    if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700 ||
+        pDevice->ChipRevId == T3_CHIP_ID_5701_A0 ||
+        pDevice->ChipRevId == T3_CHIP_ID_5701_B0 ||
+        pDevice->ChipRevId == T3_CHIP_ID_5701_B2)
+    {
+        pDevice->WolSpeed = WOL_SPEED_10MB;
+    }
+    else
+    {
+        if (pDevice->Flags & WOL_LIMIT_10MBPS_FLAG)
+        {
+            pDevice->WolSpeed = WOL_SPEED_10MB;
+        }
+	else
+        {
+            pDevice->WolSpeed = WOL_SPEED_100MB;
+        }
+    }
+#endif
+
+    pDevice->PciState = REG_RD(pDevice, PciCfg.PciState);
+
+    pDevice->DmaReadFifoSize = 0;
+    if (((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705) &&
+        (pDevice->ChipRevId != T3_CHIP_ID_5705_A0)) ||
+        (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5750))
+    {
+#if INCLUDE_TCP_SEG_SUPPORT
+        if ((pDevice->TaskToOffload & LM_TASK_OFFLOAD_TCP_SEGMENTATION) &&
+            ((pDevice->ChipRevId == T3_CHIP_ID_5705_A1) ||
+            (pDevice->ChipRevId == T3_CHIP_ID_5705_A2)))
+        {
+            pDevice->DmaReadFifoSize = DMA_READ_MODE_FIFO_SIZE_128;
+        }
+        else
+#endif
+        {
+            if (!(pDevice->PciState & T3_PCI_STATE_HIGH_BUS_SPEED) &&
+                !(pDevice->Flags & BCM5788_FLAG) &&
+                !(pDevice->Flags & PCI_EXPRESS_FLAG))
+            {
+                pDevice->DmaReadFifoSize = DMA_READ_MODE_FIFO_LONG_BURST;
+                if (pDevice->ChipRevId == T3_CHIP_ID_5705_A1)
+                {
+                    pDevice->Flags |= RX_BD_LIMIT_64_FLAG;
+                }
+                pDevice->Flags |= DMA_WR_MODE_RX_ACCELERATE_FLAG;
+            }
+	    else if (pDevice->Flags & PCI_EXPRESS_FLAG)
+            {
+                pDevice->DmaReadFifoSize = DMA_READ_MODE_FIFO_LONG_BURST;
+            }
+        }
+    }
+
+    LM_ReadVPD(pDevice);
+    LM_ReadBootCodeVersion(pDevice);
+    LM_GetBusSpeed(pDevice);
+
+    return LM_STATUS_SUCCESS;
+} /* LM_GetAdapterInfo */
+
+STATIC PLM_ADAPTER_INFO
+LM_GetAdapterInfoBySsid(
+    LM_UINT16 Svid,
+    LM_UINT16 Ssid)
+{
+    static LM_ADAPTER_INFO AdapterArr[] =
+    {
+        { T3_SVID_BROADCOM, T3_SSID_BROADCOM_BCM95700A6, PHY_BCM5401_PHY_ID, 0},
+        { T3_SVID_BROADCOM, T3_SSID_BROADCOM_BCM95701A5, PHY_BCM5701_PHY_ID, 0},
+        { T3_SVID_BROADCOM, T3_SSID_BROADCOM_BCM95700T6, PHY_BCM8002_PHY_ID, 1},
+        { T3_SVID_BROADCOM, T3_SSID_BROADCOM_BCM95700A9, 0, 1 },
+        { T3_SVID_BROADCOM, T3_SSID_BROADCOM_BCM95701T1, PHY_BCM5701_PHY_ID, 0},
+        { T3_SVID_BROADCOM, T3_SSID_BROADCOM_BCM95701T8, PHY_BCM5701_PHY_ID, 0},
+        { T3_SVID_BROADCOM, T3_SSID_BROADCOM_BCM95701A7, 0, 1},
+        { T3_SVID_BROADCOM, T3_SSID_BROADCOM_BCM95701A10, PHY_BCM5701_PHY_ID, 0},
+        { T3_SVID_BROADCOM, T3_SSID_BROADCOM_BCM95701A12, PHY_BCM5701_PHY_ID, 0},
+        { T3_SVID_BROADCOM, T3_SSID_BROADCOM_BCM95703Ax1, PHY_BCM5703_PHY_ID, 0},
+        { T3_SVID_BROADCOM, T3_SSID_BROADCOM_BCM95703Ax2, PHY_BCM5703_PHY_ID, 0},
+
+        { T3_SVID_3COM, T3_SSID_3COM_3C996T, PHY_BCM5401_PHY_ID, 0 },
+        { T3_SVID_3COM, T3_SSID_3COM_3C996BT, PHY_BCM5701_PHY_ID, 0 },
+        { T3_SVID_3COM, T3_SSID_3COM_3C996SX, 0, 1 },
+        { T3_SVID_3COM, T3_SSID_3COM_3C1000T, PHY_BCM5701_PHY_ID, 0 },
+        { T3_SVID_3COM, T3_SSID_3COM_3C940BR01, PHY_BCM5701_PHY_ID, 0 },
+
+        { T3_SVID_DELL, T3_SSID_DELL_VIPER, PHY_BCM5401_PHY_ID, 0 },
+        { T3_SVID_DELL, T3_SSID_DELL_JAGUAR, PHY_BCM5401_PHY_ID, 0 },
+        { T3_SVID_DELL, T3_SSID_DELL_MERLOT, PHY_BCM5411_PHY_ID, 0 },
+        { T3_SVID_DELL, T3_SSID_DELL_SLIM_MERLOT, PHY_BCM5411_PHY_ID, 0 },
+
+        { T3_SVID_COMPAQ, T3_SSID_COMPAQ_BANSHEE, PHY_BCM5701_PHY_ID, 0 },
+        { T3_SVID_COMPAQ, T3_SSID_COMPAQ_BANSHEE_2, PHY_BCM5701_PHY_ID, 0 },
+        { T3_SVID_COMPAQ, T3_SSID_COMPAQ_CHANGELING, 0, 1 },
+        { T3_SVID_COMPAQ, T3_SSID_COMPAQ_NC7780, PHY_BCM5701_PHY_ID, 0 },
+        { T3_SVID_COMPAQ, T3_SSID_COMPAQ_NC7780_2, PHY_BCM5701_PHY_ID, 0 },
+
+        { 0x1014, 0x0281, 0, 1 },
+    };
+    LM_UINT32 j;
+
+    for(j = 0; j < sizeof(AdapterArr)/sizeof(LM_ADAPTER_INFO); j++)
+    {
+        if(AdapterArr[j].Svid == Svid && AdapterArr[j].Ssid == Ssid)
+        {
+            return &AdapterArr[j];
+        }
+    }
+
+    return NULL;
+}
+
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*    This routine sets up receive/transmit buffer descriptions queues.       */
+/*                                                                            */
+/* Return:                                                                    */
+/*    LM_STATUS_SUCCESS                                                       */
+/******************************************************************************/
+LM_STATUS
+LM_InitializeAdapter(
+PLM_DEVICE_BLOCK pDevice)
+{
+    LM_PHYSICAL_ADDRESS MemPhy;
+    PLM_UINT8 pMemVirt;
+    PLM_PACKET pPacket;
+    LM_STATUS Status;
+    LM_UINT32 Size;
+    LM_UINT32 Value32, j;
+    LM_UINT32 DmaWrCmd, DmaRdCmd, DmaWrBdry, DmaRdBdry;
+
+    MM_ReadConfig32(pDevice, PCI_COMMAND_REG, &Value32);
+    j = 0;
+    while (((Value32 & 0x3ff) != (pDevice->PciCommandStatusWords & 0x3ff)) &&
+        (j < 1000))
+    {
+        /* On PCIE devices, there are some rare cases where the device */
+        /* is in the process of link-training at this point */
+        MM_Wait(200);
+        MM_WriteConfig32(pDevice, PCI_COMMAND_REG, pDevice->PciCommandStatusWords);
+        MM_ReadConfig32(pDevice, PCI_COMMAND_REG, &Value32);
+        j++;
+    }
+    MM_WriteConfig32(pDevice, T3_PCI_MISC_HOST_CTRL_REG, pDevice->MiscHostCtrl);
+    /* Set power state to D0. */
+    LM_SetPowerState(pDevice, LM_POWER_STATE_D0);
+
+    /* Intialize the queues. */
+    QQ_InitQueue(&pDevice->RxPacketReceivedQ.Container, 
+        MAX_RX_PACKET_DESC_COUNT);
+    QQ_InitQueue(&pDevice->RxPacketFreeQ.Container,
+        MAX_RX_PACKET_DESC_COUNT);
+
+    QQ_InitQueue(&pDevice->TxPacketFreeQ.Container,MAX_TX_PACKET_DESC_COUNT);
+    QQ_InitQueue(&pDevice->TxPacketXmittedQ.Container,MAX_TX_PACKET_DESC_COUNT);
+
+    if(T3_ASIC_5705_OR_5750(pDevice->ChipRevId))
+    {
+        pDevice->RcvRetRcbEntryCount = 512;
+        pDevice->RcvRetRcbEntryCountMask = 511;
+    }
+    else
+    {
+        pDevice->RcvRetRcbEntryCount = T3_RCV_RETURN_RCB_ENTRY_COUNT;
+        pDevice->RcvRetRcbEntryCountMask = T3_RCV_RETURN_RCB_ENTRY_COUNT_MASK;
+    }
+
+    /* Allocate shared memory for: status block, the buffers for receive */
+    /* rings -- standard, mini, jumbo, and return rings. */
+    Size = T3_STATUS_BLOCK_SIZE + sizeof(T3_STATS_BLOCK) +
+        T3_STD_RCV_RCB_ENTRY_COUNT * sizeof(T3_RCV_BD) +
+#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
+        T3_JUMBO_RCV_RCB_ENTRY_COUNT * sizeof(T3_RCV_BD) +
+#endif /* T3_JUMBO_RCV_RCB_ENTRY_COUNT */
+        (pDevice->RcvRetRcbEntryCount * sizeof(T3_RCV_BD));
+
+    /* Memory for host based Send BD. */
+    if (!(pDevice->Flags & NIC_SEND_BD_FLAG))
+    {
+        Size += sizeof(T3_SND_BD) * T3_SEND_RCB_ENTRY_COUNT;
+    }
+
+    /* Allocate the memory block. */
+    Status = MM_AllocateSharedMemory(pDevice, Size, (PLM_VOID) &pMemVirt, &MemPhy, FALSE);
+    if(Status != LM_STATUS_SUCCESS)
+    {
+        return Status;
+    }
+
+    DmaWrCmd = DMA_CTRL_WRITE_CMD;
+    DmaRdCmd = DMA_CTRL_READ_CMD;
+    DmaWrBdry = DMA_CTRL_WRITE_BOUNDARY_DISABLE;
+    DmaRdBdry = DMA_CTRL_READ_BOUNDARY_DISABLE;
+#ifdef BCM_DISCONNECT_AT_CACHELINE
+    /* This code is intended for PPC64 and other similar architectures */
+    /* Only the following chips support this */
+    if ((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700) ||
+        (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701) ||
+        (pDevice->Flags & PCI_EXPRESS_FLAG))
+    {
+        switch(pDevice->CacheLineSize * 4)
+        {
+            case 16:
+            case 32:
+            case 64:
+            case 128:
+                if (!(pDevice->PciState & T3_PCI_STATE_NOT_PCI_X_BUS) &&
+                    !(pDevice->Flags & PCI_EXPRESS_FLAG))
+                {
+                    /* PCI-X */
+                    /* use 384 which is a multiple of 16,32,64,128 */
+                    DmaWrBdry = DMA_CTRL_WRITE_BOUNDARY_384_PCIX;
+                    break;
+                }
+                else if (pDevice->Flags & PCI_EXPRESS_FLAG)
+                {
+                    /* PCI Express */
+                    /* use 128 which is a multiple of 16,32,64,128 */
+                    DmaWrCmd = DMA_CTRL_WRITE_BOUNDARY_128_PCIE;
+                    break;
+                }
+                /* fall through */
+            case 256:
+                /* use 256 which is a multiple of 16,32,64,128,256 */
+                if ((pDevice->PciState & T3_PCI_STATE_NOT_PCI_X_BUS) &&
+                    !(pDevice->Flags & PCI_EXPRESS_FLAG))
+                {
+                    /* PCI */
+                    DmaWrBdry = DMA_CTRL_WRITE_BOUNDARY_256;
+                }
+                else if (!(pDevice->Flags & PCI_EXPRESS_FLAG))
+                {
+                    /* PCI-X */
+                    DmaWrBdry = DMA_CTRL_WRITE_BOUNDARY_256_PCIX;
+                }
+                break;
+        }
+    }
+#endif
+    pDevice->DmaReadWriteCtrl = DmaWrCmd | DmaRdCmd | DmaWrBdry | DmaRdBdry;
+    /* Program DMA Read/Write */
+    if (pDevice->Flags & PCI_EXPRESS_FLAG)
+    {
+        pDevice->DmaReadWriteCtrl |= 0x001f0000;
+    }
+    else if (pDevice->PciState & T3_PCI_STATE_NOT_PCI_X_BUS)
+    {
+        if(T3_ASIC_5705_OR_5750(pDevice->ChipRevId))
+        {
+            pDevice->DmaReadWriteCtrl |= 0x003f0000;
+        }
+        else
+        {
+            pDevice->DmaReadWriteCtrl |= 0x003f000f;    
+        }
+    }
+    else
+    {
+        if((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5703) ||
+            (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5704))
+        {
+            /* set bit 23 to enable a PCIX hardware fix */
+            pDevice->DmaReadWriteCtrl |= 0x009f0000; 
+
+            Value32 = REG_RD(pDevice, PciCfg.ClockCtrl) & 0x1f;
+            if ((Value32 == 0x6) || (Value32 == 0x7))
+            {
+                pDevice->Flags |= ONE_DMA_AT_ONCE_FLAG;
+            }
+        }
+        else
+        {
+            pDevice->DmaReadWriteCtrl |= 0x001b000f;    
+        }
+    }
+    if((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5703) ||
+        (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5704))
+    {
+        pDevice->DmaReadWriteCtrl &= 0xfffffff0;
+    }
+
+    if (pDevice->Flags & ONE_DMA_AT_ONCE_FLAG)
+    {
+        pDevice->DmaReadWriteCtrl |= DMA_CTRL_WRITE_ONE_DMA_AT_ONCE;
+    }
+    REG_WR(pDevice, PciCfg.DmaReadWriteCtrl, pDevice->DmaReadWriteCtrl);
+
+    LM_SwitchClocks(pDevice);
+
+    if (LM_DmaTest(pDevice, pMemVirt, MemPhy, 0x400) != LM_STATUS_SUCCESS)
+    {
+        return LM_STATUS_FAILURE;
+    }
+
+    /* Status block. */
+    pDevice->pStatusBlkVirt = (PT3_STATUS_BLOCK) pMemVirt;
+    pDevice->StatusBlkPhy = MemPhy;
+    pMemVirt += T3_STATUS_BLOCK_SIZE;
+    LM_INC_PHYSICAL_ADDRESS(&MemPhy, T3_STATUS_BLOCK_SIZE);
+
+    /* Statistics block. */
+    pDevice->pStatsBlkVirt = (PT3_STATS_BLOCK) pMemVirt;
+    pDevice->StatsBlkPhy = MemPhy;
+    pMemVirt += sizeof(T3_STATS_BLOCK);
+    LM_INC_PHYSICAL_ADDRESS(&MemPhy, sizeof(T3_STATS_BLOCK));
+
+    /* Receive standard BD buffer. */
+    pDevice->pRxStdBdVirt = (PT3_RCV_BD) pMemVirt;
+    pDevice->RxStdBdPhy = MemPhy;
+
+    pMemVirt += T3_STD_RCV_RCB_ENTRY_COUNT * sizeof(T3_RCV_BD);
+    LM_INC_PHYSICAL_ADDRESS(&MemPhy, 
+        T3_STD_RCV_RCB_ENTRY_COUNT * sizeof(T3_RCV_BD));
+
+#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
+    /* Receive jumbo BD buffer. */
+    pDevice->pRxJumboBdVirt = (PT3_RCV_BD) pMemVirt;
+    pDevice->RxJumboBdPhy = MemPhy;
+
+    pMemVirt += T3_JUMBO_RCV_RCB_ENTRY_COUNT * sizeof(T3_RCV_BD);
+    LM_INC_PHYSICAL_ADDRESS(&MemPhy, 
+        T3_JUMBO_RCV_RCB_ENTRY_COUNT * sizeof(T3_RCV_BD));
+#endif /* T3_JUMBO_RCV_RCB_ENTRY_COUNT */
+
+    /* Receive return BD buffer. */
+    pDevice->pRcvRetBdVirt = (PT3_RCV_BD) pMemVirt;
+    pDevice->RcvRetBdPhy = MemPhy;
+
+    pMemVirt += pDevice->RcvRetRcbEntryCount * sizeof(T3_RCV_BD);
+    LM_INC_PHYSICAL_ADDRESS(&MemPhy, 
+        pDevice->RcvRetRcbEntryCount * sizeof(T3_RCV_BD));
+
+    /* Set up Send BD. */
+    if (!(pDevice->Flags & NIC_SEND_BD_FLAG))
+    {
+        pDevice->pSendBdVirt = (PT3_SND_BD) pMemVirt;
+        pDevice->SendBdPhy = MemPhy;
+
+        pMemVirt += sizeof(T3_SND_BD) * T3_SEND_RCB_ENTRY_COUNT;
+        LM_INC_PHYSICAL_ADDRESS(&MemPhy, 
+            sizeof(T3_SND_BD) * T3_SEND_RCB_ENTRY_COUNT);
+    }
+#ifdef BCM_NIC_SEND_BD
+    else
+    {
+        pDevice->pSendBdVirt = (PT3_SND_BD)
+            pDevice->pMemView->uIntMem.First32k.BufferDesc;
+        pDevice->SendBdPhy.High = 0;
+        pDevice->SendBdPhy.Low = T3_NIC_SND_BUFFER_DESC_ADDR;
+    }
+#endif
+
+    /* Allocate memory for packet descriptors. */
+    Size = (pDevice->RxPacketDescCnt + 
+        pDevice->TxPacketDescCnt) * MM_PACKET_DESC_SIZE;
+    Status = MM_AllocateMemory(pDevice, Size, (PLM_VOID *) &pPacket);
+    if(Status != LM_STATUS_SUCCESS)
+    {
+        return Status;
+    }
+    pDevice->pPacketDescBase = (PLM_VOID) pPacket;
+
+    /* Create transmit packet descriptors from the memory block and add them */
+    /* to the TxPacketFreeQ for each send ring. */
+    for(j = 0; j < pDevice->TxPacketDescCnt; j++)
+    {
+        /* Ring index. */
+        pPacket->Flags = 0;
+
+        /* Queue the descriptor in the TxPacketFreeQ of the 'k' ring. */
+        QQ_PushTail(&pDevice->TxPacketFreeQ.Container, pPacket);
+
+        /* Get the pointer to the next descriptor.  MM_PACKET_DESC_SIZE */
+        /* is the total size of the packet descriptor including the */
+        /* os-specific extensions in the UM_PACKET structure. */
+        pPacket = (PLM_PACKET) ((PLM_UINT8) pPacket + MM_PACKET_DESC_SIZE);
+    } /* for(j.. */
+
+    /* Create receive packet descriptors from the memory block and add them */
+    /* to the RxPacketFreeQ.  Create the Standard packet descriptors. */
+    for(j = 0; j < pDevice->RxStdDescCnt; j++)
+    {
+        /* Receive producer ring. */
+        pPacket->u.Rx.RcvProdRing = T3_STD_RCV_PROD_RING;
+
+        /* Receive buffer size. */
+        pPacket->u.Rx.RxBufferSize = MAX_STD_RCV_BUFFER_SIZE;
+
+        /* Add the descriptor to RxPacketFreeQ. */
+        QQ_PushTail(&pDevice->RxPacketFreeQ.Container, pPacket);
+
+        /* Get the pointer to the next descriptor.  MM_PACKET_DESC_SIZE */
+        /* is the total size of the packet descriptor including the */
+        /* os-specific extensions in the UM_PACKET structure. */
+        pPacket = (PLM_PACKET) ((PLM_UINT8) pPacket + MM_PACKET_DESC_SIZE);
+    } /* for */
+
+#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
+    /* Create the Jumbo packet descriptors. */
+    for(j = 0; j < pDevice->RxJumboDescCnt; j++)
+    {
+        /* Receive producer ring. */
+        pPacket->u.Rx.RcvProdRing = T3_JUMBO_RCV_PROD_RING;
+
+        /* Receive buffer size. */
+        pPacket->u.Rx.RxBufferSize = pDevice->RxJumboBufferSize;
+
+        /* Add the descriptor to RxPacketFreeQ. */
+        QQ_PushTail(&pDevice->RxPacketFreeQ.Container, pPacket);
+
+        /* Get the pointer to the next descriptor.  MM_PACKET_DESC_SIZE */
+        /* is the total size of the packet descriptor including the */
+        /* os-specific extensions in the UM_PACKET structure. */
+        pPacket = (PLM_PACKET) ((PLM_UINT8) pPacket + MM_PACKET_DESC_SIZE);
+    } /* for */
+#endif /* T3_JUMBO_RCV_RCB_ENTRY_COUNT */
+
+    /* Initialize the rest of the packet descriptors. */
+    Status = MM_InitializeUmPackets(pDevice);
+    if(Status != LM_STATUS_SUCCESS)
+    {
+        return Status;
+    } /* if */
+
+    /* Default receive mask. */
+    pDevice->ReceiveMask &= LM_KEEP_VLAN_TAG;
+    pDevice->ReceiveMask |= LM_ACCEPT_MULTICAST | LM_ACCEPT_BROADCAST |
+        LM_ACCEPT_UNICAST;
+
+    /* Make sure we are in the first 32k memory window or NicSendBd. */
+    REG_WR(pDevice, PciCfg.MemWindowBaseAddr, 0);
+
+    /* Initialize the hardware. */
+    Status = LM_ResetAdapter(pDevice);
+    if(Status != LM_STATUS_SUCCESS)
+    {
+        return Status;
+    }
+
+    /* We are done with initialization. */
+    pDevice->InitDone = TRUE;
+
+    return LM_STATUS_SUCCESS;
+} /* LM_InitializeAdapter */
+
+
+LM_STATUS
+LM_DisableChip(PLM_DEVICE_BLOCK pDevice)
+{
+    LM_UINT32 data;
+
+    pDevice->RxMode &= ~RX_MODE_ENABLE;
+    REG_WR(pDevice, MacCtrl.RxMode, pDevice->RxMode);
+    if(!(REG_RD(pDevice, MacCtrl.RxMode) & RX_MODE_ENABLE))
+    {
+        MM_Wait(20);
+    }
+    data = REG_RD(pDevice, RcvBdIn.Mode);
+    data &= ~RCV_BD_IN_MODE_ENABLE;
+    REG_WR(pDevice, RcvBdIn.Mode,data);
+    if(!(REG_RD(pDevice, RcvBdIn.Mode) & RCV_BD_IN_MODE_ENABLE))
+    {
+        MM_Wait(20);
+    }
+    data = REG_RD(pDevice, RcvListPlmt.Mode);
+    data &= ~RCV_LIST_PLMT_MODE_ENABLE;
+    REG_WR(pDevice, RcvListPlmt.Mode,data);
+    if(!(REG_RD(pDevice, RcvListPlmt.Mode) & RCV_LIST_PLMT_MODE_ENABLE))
+    {
+        MM_Wait(20);
+    }
+    if(!T3_ASIC_5705_OR_5750(pDevice->ChipRevId))
+    {
+        data = REG_RD(pDevice, RcvListSel.Mode);
+        data &= ~RCV_LIST_SEL_MODE_ENABLE;
+        REG_WR(pDevice, RcvListSel.Mode,data);
+        if(!(REG_RD(pDevice, RcvListSel.Mode) & RCV_LIST_SEL_MODE_ENABLE))
+        {
+            MM_Wait(20);
+        }
+    }
+    data = REG_RD(pDevice, RcvDataBdIn.Mode);
+    data &= ~RCV_DATA_BD_IN_MODE_ENABLE;
+    REG_WR(pDevice, RcvDataBdIn.Mode,data);
+    if(!(REG_RD(pDevice, RcvDataBdIn.Mode) & RCV_DATA_BD_IN_MODE_ENABLE))
+    {
+        MM_Wait(20);
+    }
+    data = REG_RD(pDevice, RcvDataComp.Mode);
+    data &= ~RCV_DATA_COMP_MODE_ENABLE;
+    REG_WR(pDevice, RcvDataComp.Mode,data);
+    if(!(REG_RD(pDevice, RcvDataBdIn.Mode) & RCV_DATA_COMP_MODE_ENABLE))
+    {
+        MM_Wait(20);
+    }
+    data = REG_RD(pDevice, RcvBdComp.Mode);
+    data &= ~RCV_BD_COMP_MODE_ENABLE;
+    REG_WR(pDevice, RcvBdComp.Mode,data);
+    if(!(REG_RD(pDevice, RcvBdComp.Mode) & RCV_BD_COMP_MODE_ENABLE))
+    {
+        MM_Wait(20);
+    }     
+    data = REG_RD(pDevice, SndBdSel.Mode);
+    data &= ~SND_BD_SEL_MODE_ENABLE;
+    REG_WR(pDevice, SndBdSel.Mode, data);
+    if(!(REG_RD(pDevice, SndBdSel.Mode) & SND_BD_SEL_MODE_ENABLE))
+    {
+        MM_Wait(20);
+    }
+    data = REG_RD(pDevice, SndBdIn.Mode);
+    data &= ~SND_BD_IN_MODE_ENABLE;
+    REG_WR(pDevice, SndBdIn.Mode, data);
+    if(!(REG_RD(pDevice, SndBdIn.Mode) & SND_BD_IN_MODE_ENABLE))
+    {
+        MM_Wait(20);
+    }
+    data = REG_RD(pDevice, SndDataIn.Mode);
+    data &= ~T3_SND_DATA_IN_MODE_ENABLE;
+    REG_WR(pDevice, SndDataIn.Mode,data);
+    if(!(REG_RD(pDevice, SndDataIn.Mode) & T3_SND_DATA_IN_MODE_ENABLE))
+    {
+        MM_Wait(20);
+    }
+    data = REG_RD(pDevice, DmaRead.Mode);
+    data &= ~DMA_READ_MODE_ENABLE;
+    REG_WR(pDevice, DmaRead.Mode, data);
+    if(!(REG_RD(pDevice, DmaRead.Mode) & DMA_READ_MODE_ENABLE))
+    {
+        MM_Wait(20);
+    }
+    data = REG_RD(pDevice, SndDataComp.Mode);
+    data &= ~SND_DATA_COMP_MODE_ENABLE;
+    REG_WR(pDevice, SndDataComp.Mode, data);
+    if(!(REG_RD(pDevice, SndDataComp.Mode) & SND_DATA_COMP_MODE_ENABLE))
+    {
+        MM_Wait(20);
+    }
+    if(!T3_ASIC_5705_OR_5750(pDevice->ChipRevId))
+    {
+        data = REG_RD(pDevice,DmaComp.Mode);
+        data &= ~DMA_COMP_MODE_ENABLE;
+        REG_WR(pDevice, DmaComp.Mode, data);
+        if(!(REG_RD(pDevice, DmaComp.Mode) & DMA_COMP_MODE_ENABLE))
+        {
+            MM_Wait(20);
+        }
+    }
+    data = REG_RD(pDevice, SndBdComp.Mode);
+    data &= ~SND_BD_COMP_MODE_ENABLE;
+    REG_WR(pDevice, SndBdComp.Mode, data);
+    if(!(REG_RD(pDevice, SndBdComp.Mode) & SND_BD_COMP_MODE_ENABLE))
+    {
+        MM_Wait(20);
+    }
+    /* Clear TDE bit */
+    pDevice->MacMode &= ~MAC_MODE_ENABLE_TDE;
+    REG_WR(pDevice, MacCtrl.Mode, pDevice->MacMode);
+    pDevice->TxMode &= ~TX_MODE_ENABLE;
+    REG_WR(pDevice, MacCtrl.TxMode, pDevice->TxMode);
+    if(!(REG_RD(pDevice, MacCtrl.TxMode) & TX_MODE_ENABLE))
+    {
+        MM_Wait(20);
+    }
+    data = REG_RD(pDevice, HostCoalesce.Mode);
+    data &= ~HOST_COALESCE_ENABLE;
+    REG_WR(pDevice, HostCoalesce.Mode, data);
+    if(!(REG_RD(pDevice, SndBdIn.Mode) & HOST_COALESCE_ENABLE))
+    {
+        MM_Wait(20);
+    }
+    data = REG_RD(pDevice, DmaWrite.Mode);
+    data &= ~DMA_WRITE_MODE_ENABLE;
+    REG_WR(pDevice, DmaWrite.Mode,data);
+    if(!(REG_RD(pDevice, DmaWrite.Mode) & DMA_WRITE_MODE_ENABLE))
+    {
+        MM_Wait(20);
+    }
+    if(!T3_ASIC_5705_OR_5750(pDevice->ChipRevId))
+    {
+        data = REG_RD(pDevice, MbufClusterFree.Mode);
+        data &= ~MBUF_CLUSTER_FREE_MODE_ENABLE;
+        REG_WR(pDevice, MbufClusterFree.Mode,data);
+        if(!(REG_RD(pDevice, MbufClusterFree.Mode) & MBUF_CLUSTER_FREE_MODE_ENABLE))
+        {
+            MM_Wait(20);
+        }
+    }
+    /* Reset all FTQs */
+    REG_WR(pDevice, Ftq.Reset, 0xffffffff);
+    REG_WR(pDevice, Ftq.Reset, 0x0);
+
+    if(!T3_ASIC_5705_OR_5750(pDevice->ChipRevId))
+    {
+        data = REG_RD(pDevice, BufMgr.Mode);
+        data &= ~BUFMGR_MODE_ENABLE;
+        REG_WR(pDevice, BufMgr.Mode,data);
+        if(!(REG_RD(pDevice, BufMgr.Mode) & BUFMGR_MODE_ENABLE))
+        {
+            MM_Wait(20);
+        }
+        data = REG_RD(pDevice, MemArbiter.Mode);
+        data &= ~T3_MEM_ARBITER_MODE_ENABLE;
+        REG_WR(pDevice, MemArbiter.Mode, data);
+        if(!(REG_RD(pDevice, MemArbiter.Mode) & T3_MEM_ARBITER_MODE_ENABLE)) 
+        {
+            MM_Wait(20);
+        }       
+    }
+    return LM_STATUS_SUCCESS;
+}
+
+LM_STATUS
+LM_DisableFW(PLM_DEVICE_BLOCK pDevice)
+{
+#ifdef BCM_ASF
+    int j;
+    LM_UINT32 Value32;
+
+    if (pDevice->AsfFlags & ASF_ENABLED)
+    {
+        MEM_WR_OFFSET(pDevice, T3_CMD_MAILBOX, T3_CMD_NICDRV_PAUSE_FW);
+        Value32 = REG_RD(pDevice, Grc.RxCpuEvent);
+        REG_WR(pDevice, Grc.RxCpuEvent, Value32 | BIT_14);
+        for (j = 0; j < 100; j++)
+        {
+            Value32 = REG_RD(pDevice, Grc.RxCpuEvent);
+            if (!(Value32 & BIT_14))
+            {
+                break;
+            }
+            MM_Wait(1);
+        }
+    }
+#endif
+    return LM_STATUS_SUCCESS;
+}
+
+/******************************************************************************/
+/* Description:                                                               */
+/*    This function reinitializes the adapter.                                */
+/*                                                                            */
+/* Return:                                                                    */
+/*    LM_STATUS_SUCCESS                                                       */
+/******************************************************************************/
+LM_STATUS
+LM_ResetAdapter(
+PLM_DEVICE_BLOCK pDevice)
+{
+    LM_UINT32 Value32;
+    LM_UINT32 j, k;
+    int reset_count = 0;
+
+    /* Disable interrupt. */
+    LM_DisableInterrupt(pDevice);
+
+restart_reset:
+    LM_DisableFW(pDevice);
+
+    /* May get a spurious interrupt */
+    pDevice->pStatusBlkVirt->Status = STATUS_BLOCK_UPDATED;
+
+    LM_WritePreResetSignatures(pDevice, LM_INIT_RESET);
+    /* Disable transmit and receive DMA engines.  Abort all pending requests. */
+    if(pDevice->InitDone)
+    {
+        LM_Abort(pDevice);
+    }
+
+    pDevice->ShuttingDown = FALSE;
+
+    LM_ResetChip(pDevice);
+
+    LM_WriteLegacySignatures(pDevice, LM_INIT_RESET);
+
+    /* Bug: Athlon fix for B3 silicon only.  This bit does not do anything */
+    /* in other chip revisions except 5750 */
+    if ((pDevice->Flags & DELAY_PCI_GRANT_FLAG) && 
+        !(pDevice->Flags & PCI_EXPRESS_FLAG))
+    {
+        REG_WR(pDevice, PciCfg.ClockCtrl, pDevice->ClockCtrl | BIT_31);
+    }
+
+    if(pDevice->ChipRevId == T3_CHIP_ID_5704_A0)
+    {
+        if (!(pDevice->PciState & T3_PCI_STATE_CONVENTIONAL_PCI_MODE))
+        {
+            Value32 = REG_RD(pDevice, PciCfg.PciState);
+            Value32 |= T3_PCI_STATE_RETRY_SAME_DMA;
+            REG_WR(pDevice, PciCfg.PciState, Value32);
+        }
+    }
+    if (T3_CHIP_REV(pDevice->ChipRevId) == T3_CHIP_REV_5704_BX)
+    {
+        /* New bits defined in register 0x64 to enable some h/w fixes */
+        /* These new bits are 'write-only' */
+        Value32 = REG_RD(pDevice, PciCfg.MsiData);
+        REG_WR(pDevice, PciCfg.MsiData, Value32 | BIT_26 | BIT_28 | BIT_29);
+    }
+
+    /* Enable TaggedStatus mode. */
+    if (pDevice->Flags & USE_TAGGED_STATUS_FLAG)
+    {
+        pDevice->MiscHostCtrl |= MISC_HOST_CTRL_ENABLE_TAGGED_STATUS_MODE;
+    }
+
+    /* Restore PCI configuration registers. */
+    MM_WriteConfig32(pDevice, PCI_CACHE_LINE_SIZE_REG,
+        pDevice->SavedCacheLineReg);
+//    LM_RegWrInd(pDevice, PCI_SUBSYSTEM_VENDOR_ID_REG, 
+//        (pDevice->SubsystemId << 16) | pDevice->SubsystemVendorId);
+    MM_WriteConfig32(pDevice, PCI_SUBSYSTEM_VENDOR_ID_REG, 
+        (pDevice->SubsystemId << 16) | pDevice->SubsystemVendorId);
+
+    /* Initialize the statistis Block */
+    pDevice->pStatusBlkVirt->Status = 0;
+    pDevice->pStatusBlkVirt->RcvStdConIdx = 0;
+    pDevice->pStatusBlkVirt->RcvJumboConIdx = 0;
+    pDevice->pStatusBlkVirt->RcvMiniConIdx = 0;
+
+    for(j = 0; j < 16; j++)
+    {
+       pDevice->pStatusBlkVirt->Idx[j].RcvProdIdx = 0;
+       pDevice->pStatusBlkVirt->Idx[j].SendConIdx = 0;
+    }
+
+    for(k = 0; k < T3_STD_RCV_RCB_ENTRY_COUNT ;k++)
+    {
+       pDevice->pRxStdBdVirt[k].HostAddr.High = 0;
+       pDevice->pRxStdBdVirt[k].HostAddr.Low = 0;
+       pDevice->pRxStdBdVirt[k].Flags = RCV_BD_FLAG_END;
+       pDevice->pRxStdBdVirt[k].Len = MAX_STD_RCV_BUFFER_SIZE;
+    }
+
+#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
+    /* Receive jumbo BD buffer. */
+    for(k = 0; k < T3_JUMBO_RCV_RCB_ENTRY_COUNT; k++)
+    {
+        pDevice->pRxJumboBdVirt[k].HostAddr.High = 0;
+        pDevice->pRxJumboBdVirt[k].HostAddr.Low = 0;
+        pDevice->pRxJumboBdVirt[k].Flags = RCV_BD_FLAG_END |
+            RCV_BD_FLAG_JUMBO_RING;
+        pDevice->pRxJumboBdVirt[k].Len = (LM_UINT16) pDevice->RxJumboBufferSize;
+    }
+#endif
+
+    REG_WR(pDevice, PciCfg.DmaReadWriteCtrl, pDevice->DmaReadWriteCtrl);    
+
+    /* GRC mode control register. */
+    Value32 = 
+#ifdef BIG_ENDIAN_HOST
+        GRC_MODE_BYTE_SWAP_NON_FRAME_DATA | 
+        GRC_MODE_WORD_SWAP_NON_FRAME_DATA |
+        GRC_MODE_BYTE_SWAP_DATA |
+        GRC_MODE_WORD_SWAP_DATA |
+#else
+        GRC_MODE_WORD_SWAP_NON_FRAME_DATA |
+        GRC_MODE_BYTE_SWAP_DATA |
+        GRC_MODE_WORD_SWAP_DATA |
+#endif
+        GRC_MODE_INT_ON_MAC_ATTN |
+        GRC_MODE_HOST_STACK_UP;
+
+    /* Configure send BD mode. */
+    if (!(pDevice->Flags & NIC_SEND_BD_FLAG))
+    {
+        Value32 |= GRC_MODE_HOST_SEND_BDS;
+    }
+#ifdef BCM_NIC_SEND_BD
+    else
+    {
+        Value32 |= GRC_MODE_4X_NIC_BASED_SEND_RINGS;
+    }
+#endif
+
+    /* Configure pseudo checksum mode. */
+    if (pDevice->Flags & NO_TX_PSEUDO_HDR_CSUM_FLAG)
+    {
+        Value32 |= GRC_MODE_TX_NO_PSEUDO_HEADER_CHKSUM;
+    }
+
+    if (pDevice->Flags & NO_RX_PSEUDO_HDR_CSUM_FLAG)
+    {
+        Value32 |= GRC_MODE_RX_NO_PSEUDO_HEADER_CHKSUM;
+    }
+
+    pDevice->GrcMode = Value32;
+    REG_WR(pDevice, Grc.Mode, Value32);
+
+    /* Setup the timer prescalar register. */
+    Value32 = REG_RD(pDevice, Grc.MiscCfg) & ~0xff;
+    /* Clock is always 66Mhz. */
+    REG_WR(pDevice, Grc.MiscCfg, Value32 | (65 << 1));
+
+    /* Set up the MBUF pool base address and size. */
+    if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705)
+    {
+#if INCLUDE_TCP_SEG_SUPPORT
+        if (pDevice->TaskToOffload & LM_TASK_OFFLOAD_TCP_SEGMENTATION)
+        {
+            Value32 = LM_GetStkOffLdFirmwareSize(pDevice);
+            Value32 = (Value32 + 0x7f) & ~0x7f;
+            pDevice->MbufBase = T3_NIC_BCM5705_MBUF_POOL_ADDR + Value32;
+            pDevice->MbufSize = T3_NIC_BCM5705_MBUF_POOL_SIZE - Value32 - 0xa00;
+            REG_WR(pDevice, BufMgr.MbufPoolAddr, pDevice->MbufBase);
+            REG_WR(pDevice, BufMgr.MbufPoolSize, pDevice->MbufSize);
+        }
+#endif
+    }
+    else if (T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5750)
+    {
+        REG_WR(pDevice, BufMgr.MbufPoolAddr, pDevice->MbufBase);
+        REG_WR(pDevice, BufMgr.MbufPoolSize, pDevice->MbufSize);
+
+        /* Set up the DMA descriptor pool base address and size. */
+        REG_WR(pDevice, BufMgr.DmaDescPoolAddr, T3_NIC_DMA_DESC_POOL_ADDR);
+        REG_WR(pDevice, BufMgr.DmaDescPoolSize, T3_NIC_DMA_DESC_POOL_SIZE);
+    
+    }
+
+    /* Configure MBUF and Threshold watermarks */
+    /* Configure the DMA read MBUF low water mark. */
+    if(pDevice->TxMtu < MAX_ETHERNET_PACKET_BUFFER_SIZE)
+    {
+        if(T3_ASIC_5705_OR_5750(pDevice->ChipRevId))
+        {
+            REG_WR(pDevice, BufMgr.MbufReadDmaLowWaterMark,
+                T3_DEF_DMA_MBUF_LOW_WMARK_5705);
+            REG_WR(pDevice, BufMgr.MbufMacRxLowWaterMark,
+                T3_DEF_RX_MAC_MBUF_LOW_WMARK_5705);
+            REG_WR(pDevice, BufMgr.MbufHighWaterMark,
+                T3_DEF_MBUF_HIGH_WMARK_5705);
+        }
+        else
+        {
+            REG_WR(pDevice, BufMgr.MbufReadDmaLowWaterMark,
+                T3_DEF_DMA_MBUF_LOW_WMARK);
+            REG_WR(pDevice, BufMgr.MbufMacRxLowWaterMark,
+                T3_DEF_RX_MAC_MBUF_LOW_WMARK);
+            REG_WR(pDevice, BufMgr.MbufHighWaterMark,
+                T3_DEF_MBUF_HIGH_WMARK);
+        }
+    }
+    else
+    {
+        REG_WR(pDevice, BufMgr.MbufReadDmaLowWaterMark,
+            T3_DEF_DMA_MBUF_LOW_WMARK_JUMBO);
+        REG_WR(pDevice, BufMgr.MbufMacRxLowWaterMark,
+            T3_DEF_RX_MAC_MBUF_LOW_WMARK_JUMBO);
+        REG_WR(pDevice, BufMgr.MbufHighWaterMark,
+            T3_DEF_MBUF_HIGH_WMARK_JUMBO);
+    }
+
+    REG_WR(pDevice, BufMgr.DmaLowWaterMark, T3_DEF_DMA_DESC_LOW_WMARK);
+    REG_WR(pDevice, BufMgr.DmaHighWaterMark, T3_DEF_DMA_DESC_HIGH_WMARK);
+
+    /* Enable buffer manager. */
+    REG_WR(pDevice, BufMgr.Mode, BUFMGR_MODE_ENABLE | BUFMGR_MODE_ATTN_ENABLE);
+
+    for(j = 0 ;j < 2000; j++)
+    {
+        if(REG_RD(pDevice, BufMgr.Mode) & BUFMGR_MODE_ENABLE)
+            break;
+        MM_Wait(10);
+    }
+
+    if(j >= 2000)
+    {
+        return LM_STATUS_FAILURE;
+    }
+
+/* GRC reset will reset FTQ */
+#if 0
+    /* Enable the FTQs. */
+    REG_WR(pDevice, Ftq.Reset, 0xffffffff);
+    REG_WR(pDevice, Ftq.Reset, 0);
+
+    /* Wait until FTQ is ready */
+    for(j = 0; j < 2000; j++)
+    {
+        if(REG_RD(pDevice, Ftq.Reset) == 0)
+            break;
+        MM_Wait(10);
+    }
+
+    if(j >= 2000)
+    {
+        return LM_STATUS_FAILURE;
+    }
+#endif
+
+    /* Receive BD Ring replenish threshold. */
+    REG_WR(pDevice, RcvBdIn.StdRcvThreshold, pDevice->RxStdDescCnt/8);
+
+    /* Initialize the Standard Receive RCB. */
+    REG_WR(pDevice, RcvDataBdIn.StdRcvRcb.HostRingAddr.High, 
+        pDevice->RxStdBdPhy.High);
+    REG_WR(pDevice, RcvDataBdIn.StdRcvRcb.HostRingAddr.Low, 
+        pDevice->RxStdBdPhy.Low);
+    REG_WR(pDevice, RcvDataBdIn.StdRcvRcb.NicRingAddr,
+        (LM_UINT32) T3_NIC_STD_RCV_BUFFER_DESC_ADDR);
+
+    if(T3_ASIC_5705_OR_5750(pDevice->ChipRevId))
+    {
+        REG_WR(pDevice, RcvDataBdIn.StdRcvRcb.u.MaxLen_Flags,
+            512 << 16);
+    }
+    else
+    {
+        REG_WR(pDevice, RcvDataBdIn.StdRcvRcb.u.MaxLen_Flags,
+            MAX_STD_RCV_BUFFER_SIZE << 16);
+
+        /* Initialize the Jumbo Receive RCB. */
+        REG_WR(pDevice, RcvDataBdIn.JumboRcvRcb.u.MaxLen_Flags,
+            T3_RCB_FLAG_RING_DISABLED);
+#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
+        REG_WR(pDevice, RcvDataBdIn.JumboRcvRcb.HostRingAddr.High, 
+            pDevice->RxJumboBdPhy.High);
+        REG_WR(pDevice, RcvDataBdIn.JumboRcvRcb.HostRingAddr.Low, 
+            pDevice->RxJumboBdPhy.Low);
+        REG_WR(pDevice, RcvDataBdIn.JumboRcvRcb.u.MaxLen_Flags, 0);
+        REG_WR(pDevice, RcvDataBdIn.JumboRcvRcb.NicRingAddr,
+            (LM_UINT32) T3_NIC_JUMBO_RCV_BUFFER_DESC_ADDR);
+
+        REG_WR(pDevice, RcvBdIn.JumboRcvThreshold, pDevice->RxJumboDescCnt/8);
+
+#endif /* T3_JUMBO_RCV_RCB_ENTRY_COUNT */
+
+        /* Initialize the Mini Receive RCB. */
+        REG_WR(pDevice, RcvDataBdIn.MiniRcvRcb.u.MaxLen_Flags,
+            T3_RCB_FLAG_RING_DISABLED);
+
+        /* Disable all the unused rings. */
+        for(j = 0; j < T3_MAX_SEND_RCB_COUNT; j++) {
+            MEM_WR(pDevice, SendRcb[j].u.MaxLen_Flags,
+                T3_RCB_FLAG_RING_DISABLED);
+        } /* for */
+
+    }
+
+    /* Initialize the indices. */
+    pDevice->SendProdIdx = 0;
+    pDevice->SendConIdx = 0;
+
+    MB_REG_WR(pDevice, Mailbox.SendHostProdIdx[0].Low, 0); 
+    MB_REG_RD(pDevice, Mailbox.SendHostProdIdx[0].Low); 
+    MB_REG_WR(pDevice, Mailbox.SendNicProdIdx[0].Low, 0);
+    MB_REG_RD(pDevice, Mailbox.SendNicProdIdx[0].Low); 
+
+    /* Set up host or NIC based send RCB. */
+    if (!(pDevice->Flags & NIC_SEND_BD_FLAG))
+    {
+        MEM_WR(pDevice, SendRcb[0].HostRingAddr.High, 
+            pDevice->SendBdPhy.High);
+        MEM_WR(pDevice, SendRcb[0].HostRingAddr.Low, 
+            pDevice->SendBdPhy.Low);
+
+        /* Setup the RCB. */
+        MEM_WR(pDevice, SendRcb[0].u.MaxLen_Flags,
+            T3_SEND_RCB_ENTRY_COUNT << 16);
+
+        if(!T3_ASIC_5705_OR_5750(pDevice->ChipRevId))
+        {
+            /* Set up the NIC ring address in the RCB. */
+            MEM_WR(pDevice, SendRcb[0].NicRingAddr,T3_NIC_SND_BUFFER_DESC_ADDR);
+        }
+        for(k = 0; k < T3_SEND_RCB_ENTRY_COUNT; k++)
+        {
+            pDevice->pSendBdVirt[k].HostAddr.High = 0;
+            pDevice->pSendBdVirt[k].HostAddr.Low = 0;
+        }
+    }
+#ifdef BCM_NIC_SEND_BD
+    else
+    {
+        MEM_WR(pDevice, SendRcb[0].HostRingAddr.High, 0);
+        MEM_WR(pDevice, SendRcb[0].HostRingAddr.Low, 0);
+        MEM_WR(pDevice, SendRcb[0].NicRingAddr,
+            pDevice->SendBdPhy.Low);
+
+        for(k = 0; k < T3_SEND_RCB_ENTRY_COUNT; k++)
+        {
+            MM_MEMWRITEL(&(pDevice->pSendBdVirt[k].HostAddr.High), 0);
+            MM_MEMWRITEL(&(pDevice->pSendBdVirt[k].HostAddr.Low), 0);
+            MM_MEMWRITEL(&(pDevice->pSendBdVirt[k].u1.Len_Flags), 0);
+            pDevice->ShadowSendBd[k].HostAddr.High = 0;
+            pDevice->ShadowSendBd[k].u1.Len_Flags = 0;
+        }
+    }
+#endif
+    MM_ATOMIC_SET(&pDevice->SendBdLeft, T3_SEND_RCB_ENTRY_COUNT-1);
+
+    /* Configure the receive return rings. */
+    for(j = 0; j < T3_MAX_RCV_RETURN_RCB_COUNT; j++)
+    {
+        MEM_WR(pDevice, RcvRetRcb[j].u.MaxLen_Flags, T3_RCB_FLAG_RING_DISABLED);
+    }
+
+    pDevice->RcvRetConIdx = 0;
+
+    MEM_WR(pDevice, RcvRetRcb[0].HostRingAddr.High, 
+        pDevice->RcvRetBdPhy.High);
+    MEM_WR(pDevice, RcvRetRcb[0].HostRingAddr.Low,
+        pDevice->RcvRetBdPhy.Low);
+
+    MEM_WR(pDevice, RcvRetRcb[0].NicRingAddr, 0);
+
+    /* Setup the RCB. */
+    MEM_WR(pDevice, RcvRetRcb[0].u.MaxLen_Flags,
+        pDevice->RcvRetRcbEntryCount << 16);
+
+    /* Reinitialize RX ring producer index */
+    MB_REG_WR(pDevice, Mailbox.RcvStdProdIdx.Low, 0);
+    MB_REG_RD(pDevice, Mailbox.RcvStdProdIdx.Low);
+    MB_REG_WR(pDevice, Mailbox.RcvJumboProdIdx.Low, 0);
+    MB_REG_RD(pDevice, Mailbox.RcvJumboProdIdx.Low);
+    MB_REG_WR(pDevice, Mailbox.RcvMiniProdIdx.Low, 0);
+    MB_REG_RD(pDevice, Mailbox.RcvMiniProdIdx.Low);
+
+#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
+    pDevice->RxJumboProdIdx = 0;
+    pDevice->RxJumboQueuedCnt = 0;
+#endif
+
+    /* Reinitialize our copy of the indices. */
+    pDevice->RxStdProdIdx = 0;
+    pDevice->RxStdQueuedCnt = 0;
+
+#if T3_JUMBO_RCV_ENTRY_COUNT
+    pDevice->RxJumboProdIdx = 0;
+#endif /* T3_JUMBO_RCV_ENTRY_COUNT */
+
+    /* Configure the MAC address. */
+    LM_SetMacAddress(pDevice, pDevice->NodeAddress);
+
+    /* Initialize the transmit random backoff seed. */
+    Value32 = (pDevice->NodeAddress[0] + pDevice->NodeAddress[1] + 
+        pDevice->NodeAddress[2] + pDevice->NodeAddress[3] + 
+        pDevice->NodeAddress[4] + pDevice->NodeAddress[5]) & 
+        MAC_TX_BACKOFF_SEED_MASK;
+    REG_WR(pDevice, MacCtrl.TxBackoffSeed, Value32);
+
+    /* Receive MTU.  Frames larger than the MTU is marked as oversized. */
+    REG_WR(pDevice, MacCtrl.MtuSize, pDevice->RxMtu + 8);   /* CRC + VLAN. */
+
+    /* Configure Time slot/IPG per 802.3 */
+    REG_WR(pDevice, MacCtrl.TxLengths, 0x2620);
+
+    /*
+     * Configure Receive Rules so that packets don't match 
+     * Programmble rule will be queued to Return Ring 1 
+     */
+    REG_WR(pDevice, MacCtrl.RcvRuleCfg, RX_RULE_DEFAULT_CLASS);
+
+    /* 
+     * Configure to have 16 Classes of Services (COS) and one
+     * queue per class.  Bad frames are queued to RRR#1.
+     * And frames don't match rules are also queued to COS#1.
+     */
+    REG_WR(pDevice, RcvListPlmt.Config, 0x181);
+
+    /* Enable Receive Placement Statistics */
+    if ((pDevice->DmaReadFifoSize == DMA_READ_MODE_FIFO_LONG_BURST) &&
+        (pDevice->TaskToOffload & LM_TASK_OFFLOAD_TCP_SEGMENTATION))
+    {
+        Value32 = REG_RD(pDevice, RcvListPlmt.StatsEnableMask);
+        Value32 &= ~T3_DISABLE_LONG_BURST_READ_DYN_FIX;
+        REG_WR(pDevice, RcvListPlmt.StatsEnableMask, Value32);
+    }
+    else
+    {
+        REG_WR(pDevice, RcvListPlmt.StatsEnableMask,0xffffff);
+    }
+    REG_WR(pDevice, RcvListPlmt.StatsCtrl, RCV_LIST_STATS_ENABLE);
+
+    /* Enable Send Data Initator Statistics */
+    REG_WR(pDevice, SndDataIn.StatsEnableMask,0xffffff);
+    REG_WR(pDevice, SndDataIn.StatsCtrl,
+        T3_SND_DATA_IN_STATS_CTRL_ENABLE | \
+        T3_SND_DATA_IN_STATS_CTRL_FASTER_UPDATE);
+
+    /* Disable the host coalescing state machine before configuring it's */
+    /* parameters. */
+    REG_WR(pDevice, HostCoalesce.Mode, 0); 
+    for(j = 0; j < 2000; j++)
+    {
+        Value32 = REG_RD(pDevice, HostCoalesce.Mode);
+        if(!(Value32 & HOST_COALESCE_ENABLE))
+        {
+            break;
+        }
+        MM_Wait(10);
+    }
+
+    /* Host coalescing configurations. */
+    REG_WR(pDevice, HostCoalesce.RxCoalescingTicks, pDevice->RxCoalescingTicks);
+    REG_WR(pDevice, HostCoalesce.TxCoalescingTicks, pDevice->TxCoalescingTicks);
+    REG_WR(pDevice, HostCoalesce.RxMaxCoalescedFrames,
+        pDevice->RxMaxCoalescedFrames);
+    REG_WR(pDevice, HostCoalesce.TxMaxCoalescedFrames,
+        pDevice->TxMaxCoalescedFrames);
+    if(!T3_ASIC_5705_OR_5750(pDevice->ChipRevId))
+    {
+        REG_WR(pDevice, HostCoalesce.RxCoalescedTickDuringInt,
+            pDevice->RxCoalescingTicksDuringInt);
+        REG_WR(pDevice, HostCoalesce.TxCoalescedTickDuringInt,
+            pDevice->TxCoalescingTicksDuringInt);
+    }
+    REG_WR(pDevice, HostCoalesce.RxMaxCoalescedFramesDuringInt,
+        pDevice->RxMaxCoalescedFramesDuringInt);
+    REG_WR(pDevice, HostCoalesce.TxMaxCoalescedFramesDuringInt,
+        pDevice->TxMaxCoalescedFramesDuringInt);
+
+    /* Initialize the address of the status block.  The NIC will DMA */
+    /* the status block to this memory which resides on the host. */
+    REG_WR(pDevice, HostCoalesce.StatusBlkHostAddr.High, 
+        pDevice->StatusBlkPhy.High);
+    REG_WR(pDevice, HostCoalesce.StatusBlkHostAddr.Low,
+        pDevice->StatusBlkPhy.Low);
+
+    /* Initialize the address of the statistics block.  The NIC will DMA */
+    /* the statistics to this block of memory. */
+    if(!T3_ASIC_5705_OR_5750(pDevice->ChipRevId))
+    {
+        REG_WR(pDevice, HostCoalesce.StatsBlkHostAddr.High, 
+            pDevice->StatsBlkPhy.High);
+        REG_WR(pDevice, HostCoalesce.StatsBlkHostAddr.Low,
+            pDevice->StatsBlkPhy.Low);
+
+        REG_WR(pDevice, HostCoalesce.StatsCoalescingTicks,
+            pDevice->StatsCoalescingTicks);
+
+        REG_WR(pDevice, HostCoalesce.StatsBlkNicAddr, 0x300);
+        REG_WR(pDevice, HostCoalesce.StatusBlkNicAddr,0xb00);
+    }
+
+    /* Enable Host Coalesing state machine */
+    REG_WR(pDevice, HostCoalesce.Mode, HOST_COALESCE_ENABLE |
+        pDevice->CoalesceMode);
+
+    /* Enable the Receive BD Completion state machine. */
+    REG_WR(pDevice, RcvBdComp.Mode, RCV_BD_COMP_MODE_ENABLE |
+        RCV_BD_COMP_MODE_ATTN_ENABLE);
+
+    /* Enable the Receive List Placement state machine. */
+    REG_WR(pDevice, RcvListPlmt.Mode, RCV_LIST_PLMT_MODE_ENABLE);
+
+    if(!T3_ASIC_5705_OR_5750(pDevice->ChipRevId))
+    {
+        /* Enable the Receive List Selector state machine. */
+        REG_WR(pDevice, RcvListSel.Mode, RCV_LIST_SEL_MODE_ENABLE |
+            RCV_LIST_SEL_MODE_ATTN_ENABLE);
+    }
+
+    /* Clear the statistics block. */
+    for(j = 0x0300; j < 0x0b00; j = j + 4)
+    {
+        MEM_WR_OFFSET(pDevice, j, 0);
+    }
+
+    /* Enable transmit DMA, clear statistics. */
+    pDevice->MacMode =  MAC_MODE_ENABLE_TX_STATISTICS |
+        MAC_MODE_ENABLE_RX_STATISTICS | MAC_MODE_ENABLE_TDE |
+        MAC_MODE_ENABLE_RDE | MAC_MODE_ENABLE_FHDE;
+    REG_WR(pDevice, MacCtrl.Mode, pDevice->MacMode |
+        MAC_MODE_CLEAR_RX_STATISTICS | MAC_MODE_CLEAR_TX_STATISTICS);
+
+    /* GRC miscellaneous local control register. */
+    pDevice->GrcLocalCtrl = GRC_MISC_LOCAL_CTRL_INT_ON_ATTN |
+        GRC_MISC_LOCAL_CTRL_AUTO_SEEPROM;
+
+    if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700)
+    {
+        pDevice->GrcLocalCtrl |= GRC_MISC_LOCAL_CTRL_GPIO_OE1 |
+            GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT1;
+    }
+    else if ((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5704) &&
+        !(pDevice->Flags & EEPROM_WP_FLAG))
+    {
+        /* Make sure we're on Vmain */
+        /* The other port may cause us to be on Vaux */
+        pDevice->GrcLocalCtrl |= GRC_MISC_LOCAL_CTRL_GPIO_OE2 |
+            GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT2;
+    }
+
+    RAW_REG_WR(pDevice, Grc.LocalCtrl, pDevice->GrcLocalCtrl);
+    MM_Wait(40);
+
+    /* Reset RX counters. */
+    for(j = 0; j < sizeof(LM_RX_COUNTERS); j++)
+    {
+        ((PLM_UINT8) &pDevice->RxCounters)[j] = 0;
+    }
+
+    /* Reset TX counters. */
+    for(j = 0; j < sizeof(LM_TX_COUNTERS); j++)
+    {
+        ((PLM_UINT8) &pDevice->TxCounters)[j] = 0;
+    }
+
+    MB_REG_WR(pDevice, Mailbox.Interrupt[0].Low, 0);
+    MB_REG_RD(pDevice, Mailbox.Interrupt[0].Low);
+    pDevice->LastTag = 0;
+
+    if(!T3_ASIC_5705_OR_5750(pDevice->ChipRevId))
+    {
+        /* Enable the DMA Completion state machine. */
+        REG_WR(pDevice, DmaComp.Mode, DMA_COMP_MODE_ENABLE);
+    }
+
+    /* Enable the DMA Write state machine. */
+    Value32 = DMA_WRITE_MODE_ENABLE |
+        DMA_WRITE_MODE_TARGET_ABORT_ATTN_ENABLE |
+        DMA_WRITE_MODE_MASTER_ABORT_ATTN_ENABLE |
+        DMA_WRITE_MODE_PARITY_ERROR_ATTN_ENABLE |
+        DMA_WRITE_MODE_ADDR_OVERFLOW_ATTN_ENABLE |
+        DMA_WRITE_MODE_FIFO_OVERRUN_ATTN_ENABLE |
+        DMA_WRITE_MODE_FIFO_UNDERRUN_ATTN_ENABLE |
+        DMA_WRITE_MODE_FIFO_OVERREAD_ATTN_ENABLE |
+        DMA_WRITE_MODE_LONG_READ_ATTN_ENABLE;
+
+    if (pDevice->Flags & DMA_WR_MODE_RX_ACCELERATE_FLAG)
+    {
+        Value32 |= DMA_WRITE_MODE_RECEIVE_ACCELERATE;
+    }
+    REG_WR(pDevice, DmaWrite.Mode, Value32);
+
+    if (!(pDevice->PciState & T3_PCI_STATE_CONVENTIONAL_PCI_MODE))
+    {
+        if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5703)
+        {
+            Value32 = REG_RD(pDevice, PciCfg.PciXCapabilities);
+            Value32 &= ~PCIX_CMD_MAX_BURST_MASK;
+            Value32 |= PCIX_CMD_MAX_BURST_CPIOB << PCIX_CMD_MAX_BURST_SHL;
+            REG_WR(pDevice, PciCfg.PciXCapabilities, Value32);
+        }
+        else if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5704)
+        {
+            Value32 = REG_RD(pDevice, PciCfg.PciXCapabilities);
+            Value32 &= ~(PCIX_CMD_MAX_SPLIT_MASK | PCIX_CMD_MAX_BURST_MASK);
+            Value32 |= ((PCIX_CMD_MAX_BURST_CPIOB << PCIX_CMD_MAX_BURST_SHL) &
+                PCIX_CMD_MAX_BURST_MASK);
+            if (pDevice->Flags & MULTI_SPLIT_ENABLE_FLAG)
+            {
+                Value32 |= (pDevice->SplitModeMaxReq << PCIX_CMD_MAX_SPLIT_SHL)
+                   & PCIX_CMD_MAX_SPLIT_MASK;
+            }
+            REG_WR(pDevice, PciCfg.PciXCapabilities, Value32);
+        }
+    }
+
+    /* Enable the Read DMA state machine. */
+    Value32 = DMA_READ_MODE_ENABLE |
+        DMA_READ_MODE_TARGET_ABORT_ATTN_ENABLE |
+        DMA_READ_MODE_MASTER_ABORT_ATTN_ENABLE |
+        DMA_READ_MODE_PARITY_ERROR_ATTN_ENABLE |
+        DMA_READ_MODE_ADDR_OVERFLOW_ATTN_ENABLE |
+        DMA_READ_MODE_FIFO_OVERRUN_ATTN_ENABLE |
+        DMA_READ_MODE_FIFO_UNDERRUN_ATTN_ENABLE |
+        DMA_READ_MODE_FIFO_OVERREAD_ATTN_ENABLE |
+        DMA_READ_MODE_LONG_READ_ATTN_ENABLE;
+
+    if (pDevice->Flags & MULTI_SPLIT_ENABLE_FLAG)
+    {
+        Value32 |= DMA_READ_MODE_MULTI_SPLIT_ENABLE;
+    }
+
+    if (T3_ASIC_5705_OR_5750(pDevice->ChipRevId))
+    {
+        Value32 |= pDevice->DmaReadFifoSize;
+    }
+#if INCLUDE_TCP_SEG_SUPPORT
+    if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5750)
+    {
+        Value32 |= BIT_27;
+    }
+#endif
+
+
+    REG_WR(pDevice, DmaRead.Mode, Value32);
+
+    /* Enable the Receive Data Completion state machine. */
+    REG_WR(pDevice, RcvDataComp.Mode, RCV_DATA_COMP_MODE_ENABLE |
+        RCV_DATA_COMP_MODE_ATTN_ENABLE);
+
+    if (!T3_ASIC_5705_OR_5750(pDevice->ChipRevId))
+    {
+        /* Enable the Mbuf Cluster Free state machine. */
+        REG_WR(pDevice, MbufClusterFree.Mode, MBUF_CLUSTER_FREE_MODE_ENABLE);
+    }
+
+    /* Enable the Send Data Completion state machine. */
+    REG_WR(pDevice, SndDataComp.Mode, SND_DATA_COMP_MODE_ENABLE);
+
+    /* Enable the Send BD Completion state machine. */
+    REG_WR(pDevice, SndBdComp.Mode, SND_BD_COMP_MODE_ENABLE |
+        SND_BD_COMP_MODE_ATTN_ENABLE);
+
+    /* Enable the Receive BD Initiator state machine. */
+    REG_WR(pDevice, RcvBdIn.Mode, RCV_BD_IN_MODE_ENABLE |
+        RCV_BD_IN_MODE_BD_IN_DIABLED_RCB_ATTN_ENABLE);
+
+    /* Enable the Receive Data and Receive BD Initiator state machine. */
+    REG_WR(pDevice, RcvDataBdIn.Mode, RCV_DATA_BD_IN_MODE_ENABLE |
+        RCV_DATA_BD_IN_MODE_INVALID_RING_SIZE);
+
+    /* Enable the Send Data Initiator state machine. */
+    REG_WR(pDevice, SndDataIn.Mode, T3_SND_DATA_IN_MODE_ENABLE);
+
+#if INCLUDE_TCP_SEG_SUPPORT
+    if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5750)
+    {
+        REG_WR(pDevice, SndDataIn.Mode, T3_SND_DATA_IN_MODE_ENABLE | 0x8);
+    }
+#endif
+
+    /* Enable the Send BD Initiator state machine. */
+    REG_WR(pDevice, SndBdIn.Mode, SND_BD_IN_MODE_ENABLE |
+        SND_BD_IN_MODE_ATTN_ENABLE);
+
+    /* Enable the Send BD Selector state machine. */
+    REG_WR(pDevice, SndBdSel.Mode, SND_BD_SEL_MODE_ENABLE |
+        SND_BD_SEL_MODE_ATTN_ENABLE);
+
+#if INCLUDE_5701_AX_FIX
+    /* Load the firmware for the 5701_A0 workaround. */
+    if(pDevice->ChipRevId == T3_CHIP_ID_5701_A0)
+    {
+        LM_LoadRlsFirmware(pDevice);
+    }
+#endif
+
+    /* Queue Rx packet buffers. */
+    if(pDevice->QueueRxPackets)
+    {
+        LM_QueueRxPackets(pDevice);
+    }
+
+    if (pDevice->ChipRevId == T3_CHIP_ID_5705_A0)
+    {
+        Value32 = MEM_RD_OFFSET(pDevice, T3_NIC_STD_RCV_BUFFER_DESC_ADDR + 8);
+        j = 0;
+        while ((Value32 != MAX_STD_RCV_BUFFER_SIZE) && (j < 10))
+        {
+            MM_Wait(20);
+            Value32 = MEM_RD_OFFSET(pDevice, T3_NIC_STD_RCV_BUFFER_DESC_ADDR + 8);
+            j++;
+        }
+        if (j >= 10)
+        {
+            reset_count++;
+            LM_Abort(pDevice);
+            if (reset_count > 5)
+                return LM_STATUS_FAILURE;
+            goto restart_reset;
+        }
+    }
+
+    /* Enable the transmitter. */
+    pDevice->TxMode = TX_MODE_ENABLE;
+    REG_WR(pDevice, MacCtrl.TxMode, pDevice->TxMode);
+    
+    /* Enable the receiver. */
+    pDevice->RxMode = (pDevice->RxMode & RX_MODE_KEEP_VLAN_TAG) |
+        RX_MODE_ENABLE;
+    REG_WR(pDevice, MacCtrl.RxMode, pDevice->RxMode);
+
+#ifdef BCM_WOL
+    if (pDevice->RestoreOnWakeUp)
+    {
+        pDevice->RestoreOnWakeUp = FALSE;
+        pDevice->DisableAutoNeg = pDevice->WakeUpDisableAutoNeg;
+        pDevice->RequestedLineSpeed = pDevice->WakeUpRequestedLineSpeed;
+        pDevice->RequestedDuplexMode = pDevice->WakeUpRequestedDuplexMode;
+    }
+#endif
+
+    /* Disable auto polling. */
+    pDevice->MiMode = 0xc0000;
+    REG_WR(pDevice, MacCtrl.MiMode, pDevice->MiMode);
+
+    REG_WR(pDevice, MacCtrl.LedCtrl, pDevice->LedCtrl);
+    
+    /* Activate Link to enable MAC state machine */
+    REG_WR(pDevice, MacCtrl.MiStatus, MI_STATUS_ENABLE_LINK_STATUS_ATTN);
+
+    if (pDevice->TbiFlags & ENABLE_TBI_FLAG)
+    {
+        REG_WR(pDevice, MacCtrl.RxMode, RX_MODE_RESET);
+        REG_RD_BACK(pDevice, MacCtrl.RxMode);
+        MM_Wait(10);
+        REG_WR(pDevice, MacCtrl.RxMode, pDevice->RxMode);
+        if (pDevice->ChipRevId == T3_CHIP_ID_5703_A1)
+        {
+            REG_WR(pDevice, MacCtrl.SerdesCfg, 0x616000);
+        }
+        if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5704)
+        {
+            /* Set SerDes drive transmission level to 1.2V */
+            Value32 = REG_RD(pDevice, MacCtrl.SerdesCfg) & 0xfffff000;
+            REG_WR(pDevice, MacCtrl.SerdesCfg, Value32 | 0x880);
+        }
+    }
+
+    REG_WR(pDevice, MacCtrl.LowWaterMarkMaxRxFrame, 2);
+
+    if (!pDevice->InitDone)
+    {
+        pDevice->LinkStatus = LM_STATUS_LINK_DOWN;
+    }
+
+    if (!(pDevice->TbiFlags & ENABLE_TBI_FLAG) &&
+        ((pDevice->PhyId & PHY_ID_MASK) != PHY_BCM5401_PHY_ID))
+    {
+        /* 5401 PHY needs a delay of about 1 second after PHY reset */
+        /* Without the delay, it has problem linking at forced 10 half */
+        /* So skip the reset... */
+        LM_ResetPhy(pDevice);
+    }
+
+    /* Setup the phy chip. */
+    LM_SetupPhy(pDevice);
+
+    if (!(pDevice->TbiFlags & ENABLE_TBI_FLAG)) {
+        /* Clear CRC stats */
+        LM_ReadPhy(pDevice, 0x1e, &Value32);
+        LM_WritePhy(pDevice, 0x1e, Value32 | 0x8000);
+        LM_ReadPhy(pDevice, 0x14, &Value32);
+    }
+
+    /* Set up the receive mask. */
+    LM_SetReceiveMask(pDevice, pDevice->ReceiveMask);
+
+#if INCLUDE_TCP_SEG_SUPPORT
+    if (pDevice->TaskToOffload & LM_TASK_OFFLOAD_TCP_SEGMENTATION)
+    {
+        if (LM_LoadStkOffLdFirmware(pDevice) == LM_STATUS_FAILURE)
+        {
+            return LM_STATUS_FAILURE;
+        }
+    }
+#endif
+    LM_WritePostResetSignatures(pDevice, LM_INIT_RESET);
+
+    return LM_STATUS_SUCCESS;
+} /* LM_ResetAdapter */
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*    This routine disables the adapter from generating interrupts.           */
+/*                                                                            */
+/* Return:                                                                    */
+/*    LM_STATUS_SUCCESS                                                       */
+/******************************************************************************/
+LM_STATUS
+LM_DisableInterrupt(
+    PLM_DEVICE_BLOCK pDevice)
+{
+    REG_WR(pDevice, PciCfg.MiscHostCtrl, pDevice->MiscHostCtrl | 
+        MISC_HOST_CTRL_MASK_PCI_INT);
+    MB_REG_WR(pDevice, Mailbox.Interrupt[0].Low, 1);
+    if (pDevice->Flags & FLUSH_POSTED_WRITE_FLAG)
+    {
+        MB_REG_RD(pDevice, Mailbox.Interrupt[0].Low);
+    }
+
+    return LM_STATUS_SUCCESS;
+}
+
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*    This routine enables the adapter to generate interrupts.                */
+/*                                                                            */
+/* Return:                                                                    */
+/*    LM_STATUS_SUCCESS                                                       */
+/******************************************************************************/
+LM_STATUS
+LM_EnableInterrupt(
+    PLM_DEVICE_BLOCK pDevice)
+{
+    MB_REG_WR(pDevice, Mailbox.Interrupt[0].Low, pDevice->LastTag << 24);
+    if (pDevice->Flags & FLUSH_POSTED_WRITE_FLAG)
+    {
+        MB_REG_RD(pDevice, Mailbox.Interrupt[0].Low);
+    }
+
+    REG_WR(pDevice, PciCfg.MiscHostCtrl, pDevice->MiscHostCtrl &
+        ~MISC_HOST_CTRL_MASK_PCI_INT);
+
+    REG_WR(pDevice, HostCoalesce.Mode, pDevice->CoalesceMode |
+        HOST_COALESCE_ENABLE | HOST_COALESCE_NOW);
+
+    return LM_STATUS_SUCCESS;
+}
+
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*    This routine puts a packet on the wire if there is a transmit DMA       */
+/*    descriptor available; otherwise the packet is queued for later          */
+/*    transmission.  If the second argue is NULL, this routine will put       */
+/*    the queued packet on the wire if possible.                              */
+/*                                                                            */
+/* Return:                                                                    */
+/*    LM_STATUS_SUCCESS                                                       */
+/******************************************************************************/
+LM_STATUS
+LM_SendPacket(PLM_DEVICE_BLOCK pDevice, PLM_PACKET pPacket)
+{
+    LM_UINT32 FragCount;
+    PT3_SND_BD pSendBd, pTmpSendBd;
+#ifdef BCM_NIC_SEND_BD
+    PT3_SND_BD pShadowSendBd;
+    T3_SND_BD NicSendBdArr[MAX_FRAGMENT_COUNT];
+#endif
+    LM_UINT32 StartIdx, Idx;
+
+    while (1)
+    {
+        /* Initalize the send buffer descriptors. */
+        StartIdx = Idx = pDevice->SendProdIdx;
+
+#ifdef BCM_NIC_SEND_BD
+        if (pDevice->Flags & NIC_SEND_BD_FLAG)
+        {
+            pTmpSendBd = pSendBd = &NicSendBdArr[0];
+        }
+        else
+#endif
+        {
+            pTmpSendBd = pSendBd = &pDevice->pSendBdVirt[Idx];
+        }
+
+        /* Next producer index. */
+        for(FragCount = 0; ; )
+        {
+            LM_UINT32 Value32, Len;
+
+            /* Initialize the pointer to the send buffer fragment. */
+            MM_MapTxDma(pDevice, pPacket, &pSendBd->HostAddr, &Len, FragCount);
+
+            pSendBd->u2.VlanTag = pPacket->VlanTag;
+
+            /* Setup the control flags and send buffer size. */
+            Value32 = (Len << 16) | pPacket->Flags;
+
+#if INCLUDE_TCP_SEG_SUPPORT
+            if (Value32 & (SND_BD_FLAG_CPU_PRE_DMA | SND_BD_FLAG_CPU_POST_DMA))
+            {
+                if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5750)
+                {
+                    pSendBd->u2.s2.Reserved = pPacket->u.Tx.MaxSegmentSize;
+                }
+		else if (FragCount == 0)
+                {
+                    pSendBd->u2.s2.Reserved = pPacket->u.Tx.MaxSegmentSize;
+                }
+                else
+                {
+                    pSendBd->u2.s2.Reserved = 0;
+                    Value32 &= 0xffff0fff;
+                }
+            }
+#endif
+            Idx = (Idx + 1) & T3_SEND_RCB_ENTRY_COUNT_MASK;
+                
+            FragCount++;
+            if (FragCount >= pPacket->u.Tx.FragCount)
+            {
+                pSendBd->u1.Len_Flags = Value32 | SND_BD_FLAG_END;
+                break;
+            }
+            else
+            {
+                pSendBd->u1.Len_Flags = Value32;
+            }
+
+            pSendBd++;
+            if ((Idx == 0) &&
+                !(pDevice->Flags & NIC_SEND_BD_FLAG))
+            {
+                pSendBd = &pDevice->pSendBdVirt[0];
+            }
+
+            pDevice->SendRing[Idx] = 0;
+
+        } /* for */
+        if (pDevice->Flags & TX_4G_WORKAROUND_FLAG)
+        {
+            if (LM_Test4GBoundary(pDevice, pPacket, pTmpSendBd) ==
+                LM_STATUS_SUCCESS)
+            {
+                if (MM_CoalesceTxBuffer(pDevice, pPacket) != LM_STATUS_SUCCESS)
+                {
+                    QQ_PushHead(&pDevice->TxPacketFreeQ.Container, pPacket);
+                    return LM_STATUS_FAILURE;
+                }
+                continue;
+            }
+        }
+        break;
+    }
+    /* Put the packet descriptor in the ActiveQ. */
+    pDevice->SendRing[StartIdx] = pPacket;
+
+#ifdef BCM_NIC_SEND_BD
+    if (pDevice->Flags & NIC_SEND_BD_FLAG)
+    {
+        pSendBd = &pDevice->pSendBdVirt[StartIdx];
+        pShadowSendBd = &pDevice->ShadowSendBd[StartIdx];
+
+        while (StartIdx != Idx)
+        {
+            LM_UINT32 Value32;
+
+            if ((Value32 = pTmpSendBd->HostAddr.High) !=
+                pShadowSendBd->HostAddr.High)
+            {
+                MM_MEMWRITEL(&(pSendBd->HostAddr.High), Value32);
+                pShadowSendBd->HostAddr.High = Value32;
+            }
+
+            MM_MEMWRITEL(&(pSendBd->HostAddr.Low), pTmpSendBd->HostAddr.Low);
+
+            if ((Value32 = pTmpSendBd->u1.Len_Flags) !=
+                pShadowSendBd->u1.Len_Flags)
+            {
+                MM_MEMWRITEL(&(pSendBd->u1.Len_Flags), Value32);
+                pShadowSendBd->u1.Len_Flags = Value32;
+            }
+
+            if (pPacket->Flags & SND_BD_FLAG_VLAN_TAG)
+            {
+                MM_MEMWRITEL(&(pSendBd->u2.VlanTag), pTmpSendBd->u2.VlanTag);
+            }
+
+            StartIdx = (StartIdx + 1) & T3_SEND_RCB_ENTRY_COUNT_MASK;
+            if (StartIdx == 0)
+            {
+                pSendBd = &pDevice->pSendBdVirt[0];
+                pShadowSendBd = &pDevice->ShadowSendBd[0];
+            }
+            else
+            {
+                pSendBd++;
+                pShadowSendBd++;
+            }
+            pTmpSendBd++;
+        }
+        MM_WMB();
+        MB_REG_WR(pDevice, Mailbox.SendNicProdIdx[0].Low, Idx);
+
+        if(T3_CHIP_REV(pDevice->ChipRevId) == T3_CHIP_REV_5700_BX)
+        {
+            MB_REG_WR(pDevice, Mailbox.SendNicProdIdx[0].Low, Idx);
+        }
+        if (pDevice->Flags & FLUSH_POSTED_WRITE_FLAG)
+        {
+            MB_REG_RD(pDevice, Mailbox.SendNicProdIdx[0].Low);
+        }
+    }
+    else
+#endif
+    {
+        MM_WMB();
+        MB_REG_WR(pDevice, Mailbox.SendHostProdIdx[0].Low, Idx);
+
+        if(T3_CHIP_REV(pDevice->ChipRevId) == T3_CHIP_REV_5700_BX)
+        {
+            MB_REG_WR(pDevice, Mailbox.SendHostProdIdx[0].Low, Idx);
+        }
+        if (pDevice->Flags & FLUSH_POSTED_WRITE_FLAG)
+        {
+            MB_REG_RD(pDevice, Mailbox.SendHostProdIdx[0].Low);
+        }
+    }
+
+    /* Update the SendBdLeft count. */
+    MM_ATOMIC_SUB(&pDevice->SendBdLeft, pPacket->u.Tx.FragCount);
+
+    /* Update the producer index. */
+    pDevice->SendProdIdx = Idx;
+
+    return LM_STATUS_SUCCESS;
+}
+
+STATIC LM_STATUS
+LM_Test4GBoundary(PLM_DEVICE_BLOCK pDevice, PLM_PACKET pPacket,
+    PT3_SND_BD pSendBd)
+{
+    int FragCount;
+    LM_UINT32 Idx, Base, Len;
+
+    Idx = pDevice->SendProdIdx;
+    for(FragCount = 0; ; )
+    {
+        Len = pSendBd->u1.Len_Flags >> 16;
+        if (((Base = pSendBd->HostAddr.Low) > 0xffffdcc0) &&
+            ((Base + 8 + Len) < Base))
+        {
+            return LM_STATUS_SUCCESS;
+        }
+        FragCount++;
+        if (FragCount >= pPacket->u.Tx.FragCount)
+        {
+            break;
+        }
+        pSendBd++;
+        if (!(pDevice->Flags & NIC_SEND_BD_FLAG))
+        {
+            Idx = (Idx + 1) & T3_SEND_RCB_ENTRY_COUNT_MASK;
+            if (Idx == 0)
+            {
+                pSendBd = &pDevice->pSendBdVirt[0];
+            }
+        }
+    }
+    return LM_STATUS_FAILURE;
+}
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+LM_UINT32
+ComputeCrc32(LM_UINT8 *pBuffer, LM_UINT32 BufferSize)
+{
+    LM_UINT32 Reg;
+    LM_UINT32 Tmp;
+    int j, k;
+
+    Reg = 0xffffffff;
+
+    for(j = 0; j < BufferSize; j++)
+    {
+        Reg ^= pBuffer[j];
+
+        for(k = 0; k < 8; k++)
+        {
+            Tmp = Reg & 0x01;
+
+            Reg >>= 1;
+
+            if(Tmp)
+            {
+                Reg ^= 0xedb88320;
+            }
+        }
+    }
+
+    return ~Reg;
+} /* ComputeCrc32 */
+
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*    This routine sets the receive control register according to ReceiveMask */
+/*                                                                            */
+/* Return:                                                                    */
+/*    LM_STATUS_SUCCESS                                                       */
+/******************************************************************************/
+LM_STATUS
+LM_SetReceiveMask(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Mask)
+{
+    LM_UINT32 ReceiveMask;
+    LM_UINT32 RxMode;
+    LM_UINT32 j, k;
+
+    ReceiveMask = Mask;
+
+    RxMode = pDevice->RxMode;
+
+    if(Mask & LM_ACCEPT_UNICAST)
+    {
+        Mask &= ~LM_ACCEPT_UNICAST;
+    }
+
+    if(Mask & LM_ACCEPT_MULTICAST)
+    {
+        Mask &= ~LM_ACCEPT_MULTICAST;
+    }
+
+    if(Mask & LM_ACCEPT_ALL_MULTICAST)
+    {
+        Mask &= ~LM_ACCEPT_ALL_MULTICAST;
+    }
+
+    if(Mask & LM_ACCEPT_BROADCAST)
+    {
+        Mask &= ~LM_ACCEPT_BROADCAST;
+    }
+
+    RxMode &= ~RX_MODE_KEEP_VLAN_TAG;
+    if (Mask & LM_KEEP_VLAN_TAG)
+    {
+        RxMode |= RX_MODE_KEEP_VLAN_TAG;
+        Mask &= ~LM_KEEP_VLAN_TAG;
+    }
+
+    RxMode &= ~RX_MODE_PROMISCUOUS_MODE;
+    if(Mask & LM_PROMISCUOUS_MODE)
+    {
+        RxMode |= RX_MODE_PROMISCUOUS_MODE;
+        Mask &= ~LM_PROMISCUOUS_MODE;
+    }
+
+    RxMode &= ~(RX_MODE_ACCEPT_RUNTS | RX_MODE_ACCEPT_OVERSIZED);
+    if(Mask & LM_ACCEPT_ERROR_PACKET)
+    {
+        RxMode |= RX_MODE_ACCEPT_RUNTS | RX_MODE_ACCEPT_OVERSIZED;
+        Mask &= ~LM_ACCEPT_ERROR_PACKET;
+    }
+
+    /* Make sure all the bits are valid before committing changes. */
+    if(Mask)
+    {
+        return LM_STATUS_FAILURE;
+    }
+
+    /* Commit the new filter. */
+    pDevice->ReceiveMask = ReceiveMask;
+
+    pDevice->RxMode = RxMode;
+
+    if (pDevice->PowerLevel != LM_POWER_STATE_D0)
+    {
+        return LM_STATUS_SUCCESS;
+    }
+
+    REG_WR(pDevice, MacCtrl.RxMode, RxMode);
+
+    /* Set up the MC hash table. */
+    if(ReceiveMask & LM_ACCEPT_ALL_MULTICAST)
+    {
+        for(k = 0; k < 4; k++)
+        {
+            REG_WR(pDevice, MacCtrl.HashReg[k], 0xffffffff);
+        }
+    }
+    else if(ReceiveMask & LM_ACCEPT_MULTICAST)
+    {
+        for(k = 0; k < 4; k++)
+        {
+            REG_WR(pDevice, MacCtrl.HashReg[k], pDevice->MulticastHash[k]);
+        }
+    }
+    else
+    {
+        /* Reject all multicast frames. */
+        for(j = 0; j < 4; j++)
+        {
+            REG_WR(pDevice, MacCtrl.HashReg[j], 0);
+        }
+    }
+
+    /* By default, Tigon3 will accept broadcast frames.  We need to setup */
+    if(ReceiveMask & LM_ACCEPT_BROADCAST)
+    {
+        REG_WR(pDevice, MacCtrl.RcvRules[RCV_RULE1_REJECT_BROADCAST_IDX].Rule,
+            REJECT_BROADCAST_RULE1_RULE & RCV_DISABLE_RULE_MASK);
+        REG_WR(pDevice, MacCtrl.RcvRules[RCV_RULE1_REJECT_BROADCAST_IDX].Value,
+            REJECT_BROADCAST_RULE1_VALUE & RCV_DISABLE_RULE_MASK);
+        REG_WR(pDevice, MacCtrl.RcvRules[RCV_RULE2_REJECT_BROADCAST_IDX].Rule,
+            REJECT_BROADCAST_RULE1_RULE & RCV_DISABLE_RULE_MASK);
+        REG_WR(pDevice, MacCtrl.RcvRules[RCV_RULE2_REJECT_BROADCAST_IDX].Value,
+            REJECT_BROADCAST_RULE1_VALUE & RCV_DISABLE_RULE_MASK);
+    }
+    else
+    {
+        REG_WR(pDevice, MacCtrl.RcvRules[RCV_RULE1_REJECT_BROADCAST_IDX].Rule, 
+            REJECT_BROADCAST_RULE1_RULE);
+        REG_WR(pDevice, MacCtrl.RcvRules[RCV_RULE1_REJECT_BROADCAST_IDX].Value, 
+            REJECT_BROADCAST_RULE1_VALUE);
+        REG_WR(pDevice, MacCtrl.RcvRules[RCV_RULE2_REJECT_BROADCAST_IDX].Rule, 
+            REJECT_BROADCAST_RULE2_RULE);
+        REG_WR(pDevice, MacCtrl.RcvRules[RCV_RULE2_REJECT_BROADCAST_IDX].Value, 
+            REJECT_BROADCAST_RULE2_VALUE);
+    }
+
+    if (!T3_ASIC_5705_OR_5750(pDevice->ChipRevId))
+    {
+        k = 16;
+    }
+    else
+    {
+        k = 8;
+    }
+#ifdef BCM_ASF
+    if (pDevice->AsfFlags & ASF_ENABLED)
+    {
+        k -= 4;
+    }
+#endif
+
+    /* disable the rest of the rules. */
+    for(j = RCV_LAST_RULE_IDX; j < k; j++)
+    {
+        REG_WR(pDevice, MacCtrl.RcvRules[j].Rule, 0);
+        REG_WR(pDevice, MacCtrl.RcvRules[j].Value, 0);
+    }
+
+    return LM_STATUS_SUCCESS;
+} /* LM_SetReceiveMask */
+
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*    Disable the interrupt and put the transmitter and receiver engines in   */
+/*    an idle state.  Also aborts all pending send requests and receive       */
+/*    buffers.                                                                */
+/*                                                                            */
+/* Return:                                                                    */
+/*    LM_STATUS_SUCCESS                                                       */
+/******************************************************************************/
+LM_STATUS
+LM_Abort(
+PLM_DEVICE_BLOCK pDevice)
+{
+    PLM_PACKET pPacket;
+    LM_UINT Idx;
+
+    LM_DisableInterrupt(pDevice);
+
+    LM_DisableChip(pDevice);
+
+    /* Abort packets that have already queued to go out. */
+    Idx = pDevice->SendConIdx; 
+    for ( ; ; )
+    {
+        if ((pPacket = pDevice->SendRing[Idx]))
+        {
+            pDevice->SendRing[Idx] = 0;
+            pPacket->PacketStatus = LM_STATUS_TRANSMIT_ABORTED;
+            pDevice->TxCounters.TxPacketAbortedCnt++;
+
+            MM_ATOMIC_ADD(&pDevice->SendBdLeft, pPacket->u.Tx.FragCount);
+            Idx = (Idx + pPacket->u.Tx.FragCount) & 
+                T3_SEND_RCB_ENTRY_COUNT_MASK;
+
+            QQ_PushTail(&pDevice->TxPacketXmittedQ.Container, pPacket);
+	}
+        else
+	{
+            break;
+	}
+    }
+
+    /* Cleanup the receive return rings. */
+#ifdef BCM_NAPI_RXPOLL
+    LM_ServiceRxPoll(pDevice, T3_RCV_RETURN_RCB_ENTRY_COUNT);
+#else
+    LM_ServiceRxInterrupt(pDevice);
+#endif
+
+    /* Indicate packets to the protocol. */
+    MM_IndicateTxPackets(pDevice);
+
+#ifdef BCM_NAPI_RXPOLL
+
+    /* Move the receive packet descriptors in the ReceivedQ to the */
+    /* free queue. */
+    for(; ;)
+    {
+        pPacket = (PLM_PACKET) QQ_PopHead(
+            &pDevice->RxPacketReceivedQ.Container);
+        if(pPacket == NULL)
+        {
+            break;
+        }
+        MM_UnmapRxDma(pDevice, pPacket);
+        QQ_PushTail(&pDevice->RxPacketFreeQ.Container, pPacket);
+    }
+#else
+    /* Indicate received packets to the protocols. */
+    MM_IndicateRxPackets(pDevice);
+#endif
+
+    /* Clean up the Std Receive Producer ring. */
+    /* Don't always trust the consumer idx in the status block in case of  */
+    /* hw failure */
+    Idx = 0;
+
+    while(Idx < T3_STD_RCV_RCB_ENTRY_COUNT)
+    {
+        if ((pPacket = pDevice->RxStdRing[Idx]))
+        {
+            MM_UnmapRxDma(pDevice, pPacket);
+            QQ_PushTail(&pDevice->RxPacketFreeQ.Container, pPacket);
+            pDevice->RxStdRing[Idx] = 0;
+        }
+
+        Idx++;
+    } /* while */
+
+    /* Reinitialize our copy of the indices. */
+    pDevice->RxStdProdIdx = 0;
+
+#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
+    /* Clean up the Jumbo Receive Producer ring. */
+    Idx = 0;
+
+    while(Idx < T3_JUMBO_RCV_RCB_ENTRY_COUNT)
+    {
+        if ((pPacket = pDevice->RxJumboRing[Idx]))
+        {
+            MM_UnmapRxDma(pDevice, pPacket);
+            QQ_PushTail(&pDevice->RxPacketFreeQ.Container, pPacket);
+            pDevice->RxJumboRing[Idx] = 0;
+        }
+        Idx++;
+    } /* while */
+
+    /* Reinitialize our copy of the indices. */
+    pDevice->RxJumboProdIdx = 0;
+#endif /* T3_JUMBO_RCV_RCB_ENTRY_COUNT */
+
+    /* Initialize the statistis Block */
+    pDevice->pStatusBlkVirt->Status = 0;
+    pDevice->pStatusBlkVirt->RcvStdConIdx = 0;
+    pDevice->pStatusBlkVirt->RcvJumboConIdx = 0;
+    pDevice->pStatusBlkVirt->RcvMiniConIdx = 0;
+
+    return LM_STATUS_SUCCESS;
+} /* LM_Abort */
+
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*    Disable the interrupt and put the transmitter and receiver engines in   */
+/*    an idle state.  Aborts all pending send requests and receive buffers.   */
+/*    Also free all the receive buffers.                                      */
+/*                                                                            */
+/* Return:                                                                    */
+/*    LM_STATUS_SUCCESS                                                       */
+/******************************************************************************/
+LM_STATUS
+LM_DoHalt(LM_DEVICE_BLOCK *pDevice)
+{
+    PLM_PACKET pPacket;
+    LM_UINT32 EntryCnt;
+
+    LM_DisableFW(pDevice);
+
+    LM_WritePreResetSignatures(pDevice, LM_SHUTDOWN_RESET);
+    LM_Abort(pDevice);
+
+    /* Get the number of entries in the queue. */
+    EntryCnt = QQ_GetEntryCnt(&pDevice->RxPacketFreeQ.Container);
+
+    /* Make sure all the packets have been accounted for. */
+    for(EntryCnt = 0; EntryCnt < pDevice->RxPacketDescCnt; EntryCnt++)
+    {
+        pPacket = (PLM_PACKET) QQ_PopHead(&pDevice->RxPacketFreeQ.Container);
+        if (pPacket == 0)
+            break;
+
+        MM_FreeRxBuffer(pDevice, pPacket);
+
+        QQ_PushTail(&pDevice->RxPacketFreeQ.Container, pPacket);
+    }
+
+    LM_ResetChip(pDevice);
+    LM_WriteLegacySignatures(pDevice, LM_SHUTDOWN_RESET);
+
+    /* Restore PCI configuration registers. */
+    MM_WriteConfig32(pDevice, PCI_CACHE_LINE_SIZE_REG,
+        pDevice->SavedCacheLineReg);
+    LM_RegWrInd(pDevice, PCI_SUBSYSTEM_VENDOR_ID_REG, 
+        (pDevice->SubsystemId << 16) | pDevice->SubsystemVendorId);
+
+    /* Reprogram the MAC address. */
+    LM_SetMacAddress(pDevice, pDevice->NodeAddress);
+
+    return LM_STATUS_SUCCESS;
+} /* LM_DoHalt */
+
+
+LM_STATUS
+LM_Halt(LM_DEVICE_BLOCK *pDevice)
+{
+    LM_STATUS status;
+
+    status = LM_DoHalt(pDevice);
+    LM_WritePostResetSignatures(pDevice, LM_SHUTDOWN_RESET);
+    return status;
+}
+
+
+STATIC LM_VOID
+LM_WritePreResetSignatures(LM_DEVICE_BLOCK *pDevice, LM_RESET_TYPE Mode)
+{
+    MEM_WR_OFFSET(pDevice, T3_FIRMWARE_MAILBOX,T3_MAGIC_NUM_FIRMWARE_INIT_DONE);
+#ifdef BCM_ASF
+    if (pDevice->AsfFlags & ASF_NEW_HANDSHAKE)
+    {
+        if (Mode == LM_INIT_RESET)
+        {
+            MEM_WR_OFFSET(pDevice, T3_DRV_STATE_MAILBOX, T3_DRV_STATE_START);
+        }
+	else if (Mode == LM_SHUTDOWN_RESET)
+        {
+            MEM_WR_OFFSET(pDevice, T3_DRV_STATE_MAILBOX, T3_DRV_STATE_UNLOAD);
+        }
+	else if (Mode == LM_SUSPEND_RESET)
+        {
+            MEM_WR_OFFSET(pDevice, T3_DRV_STATE_MAILBOX, T3_DRV_STATE_SUSPEND);
+        }
+    }
+#endif
+}
+
+STATIC LM_VOID
+LM_WritePostResetSignatures(LM_DEVICE_BLOCK *pDevice, LM_RESET_TYPE Mode)
+{
+#ifdef BCM_ASF
+    if (pDevice->AsfFlags & ASF_NEW_HANDSHAKE)
+    {
+        if (Mode == LM_INIT_RESET)
+        {
+            MEM_WR_OFFSET(pDevice, T3_DRV_STATE_MAILBOX,
+                T3_DRV_STATE_START_DONE);
+        }
+	else if (Mode == LM_SHUTDOWN_RESET)
+        {
+            MEM_WR_OFFSET(pDevice, T3_DRV_STATE_MAILBOX,
+                T3_DRV_STATE_UNLOAD_DONE);
+        }
+    }
+#endif
+}
+
+STATIC LM_VOID
+LM_WriteLegacySignatures(LM_DEVICE_BLOCK *pDevice, LM_RESET_TYPE Mode)
+{
+#ifdef BCM_ASF
+    if (pDevice->AsfFlags & ASF_ENABLED)
+    {
+        if (Mode == LM_INIT_RESET)
+        {
+            MEM_WR_OFFSET(pDevice, T3_DRV_STATE_MAILBOX, T3_DRV_STATE_START);
+        }
+	else if (Mode == LM_SHUTDOWN_RESET)
+        {
+            MEM_WR_OFFSET(pDevice, T3_DRV_STATE_MAILBOX, T3_DRV_STATE_UNLOAD);
+        }
+	else if (Mode == LM_SUSPEND_RESET)
+        {
+            MEM_WR_OFFSET(pDevice, T3_DRV_STATE_MAILBOX, T3_DRV_STATE_SUSPEND);
+        }
+    }
+#endif
+}
+
+STATIC LM_STATUS
+LM_ResetChip(PLM_DEVICE_BLOCK pDevice)
+{
+    LM_UINT32 Value32;
+    LM_UINT32 j, MaxWait;
+
+    /* Wait for access to the nvram interface before resetting.  This is */
+    /* a workaround to prevent EEPROM corruption. */
+    if(T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5700 &&
+        T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5701)
+    {
+        /* Request access to the flash interface. */
+        LM_NvramGetLock(pDevice);
+    }
+
+    Value32 = GRC_MISC_CFG_CORE_CLOCK_RESET;
+    if (pDevice->Flags & PCI_EXPRESS_FLAG)
+    {
+        if (REG_RD_OFFSET(pDevice, 0x7e2c) == 0x60)    /* PCIE 1.0 system */
+        {
+            REG_WR_OFFSET(pDevice, 0x7e2c, 0x20);
+	}
+        if (pDevice->ChipRevId != T3_CHIP_ID_5750_A0)
+        {
+            /* This bit prevents PCIE link training during GRC reset */
+            REG_WR(pDevice, Grc.MiscCfg, BIT_29);    /* Write bit 29 first */
+            Value32 |= BIT_29;       /* and keep bit 29 set during GRC reset */
+        }
+    }
+    if (T3_ASIC_5705_OR_5750(pDevice->ChipRevId))
+    {
+        Value32 |= GRC_MISC_GPHY_KEEP_POWER_DURING_RESET;
+    }
+    /* Global reset. */
+    RAW_REG_WR(pDevice, Grc.MiscCfg, Value32);
+    MM_Wait(40); MM_Wait(40); MM_Wait(40);
+
+#ifdef INCLUDE_5750_A0_FIX
+    if (pDevice->Flags & PCI_EXPRESS_FLAG)
+    {
+        if (pDevice->ChipRevId == T3_CHIP_ID_5750_A0)
+        {
+            /* 500 msec wait for link training to complete */
+            for (j = 0; j < 5000; j++)
+            {
+                MM_Wait(100);
+	    }
+            MM_ReadConfig32(pDevice, 0xc4, &Value32);
+            MM_WriteConfig32(pDevice, 0xc4, Value32 | BIT_15);
+        }
+        /* Set PCIE max payload size and clear error status */
+        MM_WriteConfig32(pDevice, 0xd8, 0xf5000);
+    }
+#endif
+
+    /* make sure we re-enable indirect accesses */
+    MM_WriteConfig32(pDevice, T3_PCI_MISC_HOST_CTRL_REG,
+        pDevice->MiscHostCtrl);
+
+    /* Set MAX PCI retry to zero. */
+    Value32 = T3_PCI_STATE_PCI_ROM_ENABLE | T3_PCI_STATE_PCI_ROM_RETRY_ENABLE;
+    if (pDevice->ChipRevId == T3_CHIP_ID_5704_A0)
+    {
+        if (!(pDevice->PciState & T3_PCI_STATE_CONVENTIONAL_PCI_MODE))
+        {
+            Value32 |= T3_PCI_STATE_RETRY_SAME_DMA;
+        }
+    }
+    MM_WriteConfig32(pDevice, T3_PCI_STATE_REG, Value32);
+
+    /* Restore PCI command register. */
+    MM_WriteConfig32(pDevice, PCI_COMMAND_REG,
+        pDevice->PciCommandStatusWords);
+
+    /* Disable PCI-X relaxed ordering bit. */
+    MM_ReadConfig32(pDevice, PCIX_CAP_REG, &Value32);
+    Value32 &= ~PCIX_ENABLE_RELAXED_ORDERING;
+    MM_WriteConfig32(pDevice, PCIX_CAP_REG, Value32);
+
+    /* Enable memory arbiter. */
+    REG_WR(pDevice, MemArbiter.Mode, T3_MEM_ARBITER_MODE_ENABLE);
+
+    if (pDevice->ChipRevId == T3_CHIP_ID_5750_A3)
+    {
+        /* Because of chip bug on A3, we need to kill the CPU */
+        LM_DisableFW(pDevice);
+        REG_WR_OFFSET(pDevice, 0x5000, 0x400);
+    }
+#ifdef BIG_ENDIAN_HOST
+    /* Reconfigure the mode register. */
+    Value32 = GRC_MODE_BYTE_SWAP_NON_FRAME_DATA | 
+              GRC_MODE_WORD_SWAP_NON_FRAME_DATA |
+              GRC_MODE_BYTE_SWAP_DATA |
+              GRC_MODE_WORD_SWAP_DATA;
+#else
+    /* Reconfigure the mode register. */
+    Value32 = GRC_MODE_BYTE_SWAP_NON_FRAME_DATA | GRC_MODE_BYTE_SWAP_DATA;
+#endif
+    REG_WR(pDevice, Grc.Mode, Value32);
+
+#ifdef INCLUDE_5750_A0_FIX
+    if (pDevice->ChipRevId == T3_CHIP_ID_5750_A0)
+    {
+        Value32 = REG_RD_OFFSET(pDevice, 0xc4);
+        REG_WR_OFFSET(pDevice, 0xc4, Value32 | BIT_15);
+    }
+#endif
+    if ((pDevice->Flags & MINI_PCI_FLAG) &&
+        (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705))
+    {
+        pDevice->ClockCtrl |= T3_PCI_CLKRUN_OUTPUT_EN;
+        if (pDevice->ChipRevId == T3_CHIP_ID_5705_A0)
+        {
+            pDevice->ClockCtrl |= T3_PCI_FORCE_CLKRUN;
+        }
+        REG_WR(pDevice, PciCfg.ClockCtrl, pDevice->ClockCtrl);
+    }
+
+    if (pDevice->TbiFlags & ENABLE_TBI_FLAG) {
+        pDevice->MacMode = MAC_MODE_PORT_MODE_TBI;
+        REG_WR(pDevice, MacCtrl.Mode, MAC_MODE_PORT_MODE_TBI);
+    }
+    else {
+        REG_WR(pDevice, MacCtrl.Mode, 0);
+    }
+
+    /* Wait for the firmware to finish initialization. */
+    if (pDevice->Flags & FLASH_DETECTED_FLAG)
+    {
+        MaxWait = 1000;
+    }
+    else
+    {
+        MaxWait = 10000;
+    }
+    for(j = 0; j < MaxWait; j++)
+    {
+        MM_Wait(100);
+
+        if (j < 50)
+            continue;
+
+        Value32 = MEM_RD_OFFSET(pDevice, T3_FIRMWARE_MAILBOX);
+        if(Value32 == ~T3_MAGIC_NUM_FIRMWARE_INIT_DONE)
+        {
+            break;
+        }
+    }
+    if ((j >= MaxWait) && (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5704))
+    {
+        /* workaround - need to reset nvram of both devices at the same time */
+        /* if the boot code is not running */
+        if (LM_NvramGetLock(pDevice) != LM_STATUS_SUCCESS)
+        {
+            LM_DEVICE_BLOCK *pDevice2;
+
+            REG_WR(pDevice, Nvram.Cmd, NVRAM_CMD_RESET);
+            pDevice2 = MM_FindPeerDev(pDevice);
+            if (pDevice2 && !pDevice2->InitDone)
+            {
+                REG_WR(pDevice2, Nvram.Cmd, NVRAM_CMD_RESET);
+	    }
+	}
+        else
+        {
+            LM_NvramReleaseLock(pDevice);
+        }
+    }
+
+    if ((pDevice->Flags & PCI_EXPRESS_FLAG) &&
+        (pDevice->ChipRevId != T3_CHIP_ID_5750_A0))
+    {
+        /* Enable PCIE bug fix */
+        Value32 = REG_RD_OFFSET(pDevice, 0x7c00);
+        REG_WR_OFFSET(pDevice, 0x7c00, Value32 | BIT_25);
+    }
+#ifdef BCM_ASF
+    pDevice->AsfFlags = 0;
+    Value32 = MEM_RD_OFFSET(pDevice, T3_NIC_DATA_SIG_ADDR);
+    if (Value32 == T3_NIC_DATA_SIG)
+    {
+        Value32 = MEM_RD_OFFSET(pDevice, T3_NIC_DATA_NIC_CFG_ADDR);
+        if (Value32 & T3_NIC_CFG_ENABLE_ASF)
+        {
+            pDevice->AsfFlags = ASF_ENABLED;
+            if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5750)
+            {
+                pDevice->AsfFlags |= ASF_NEW_HANDSHAKE;
+	    }
+        }
+    }
+#endif
+
+    return LM_STATUS_SUCCESS;
+}
+
+
+LM_STATUS
+LM_ShutdownChip(PLM_DEVICE_BLOCK pDevice, LM_RESET_TYPE Mode)
+{
+    LM_DisableFW(pDevice);
+    LM_WritePreResetSignatures(pDevice, Mode);
+    if (pDevice->InitDone)
+    {
+        LM_Abort(pDevice);
+    }
+    else
+    {
+        LM_DisableChip(pDevice);
+    }
+    LM_ResetChip(pDevice);
+    LM_WriteLegacySignatures(pDevice, Mode);
+    LM_WritePostResetSignatures(pDevice, Mode);
+    return LM_STATUS_SUCCESS;
+}
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+void
+LM_ServiceTxInterrupt(
+PLM_DEVICE_BLOCK pDevice) {
+    PLM_PACKET pPacket;
+    LM_UINT32 HwConIdx;
+    LM_UINT32 SwConIdx;
+
+    HwConIdx = pDevice->pStatusBlkVirt->Idx[0].SendConIdx;
+
+    /* Get our copy of the consumer index.  The buffer descriptors */
+    /* that are in between the consumer indices are freed. */
+    SwConIdx = pDevice->SendConIdx;
+
+    /* Move the packets from the TxPacketActiveQ that are sent out to */
+    /* the TxPacketXmittedQ.  Packets that are sent use the */
+    /* descriptors that are between SwConIdx and HwConIdx. */
+    while(SwConIdx != HwConIdx)
+    {
+        pPacket = pDevice->SendRing[SwConIdx];
+        pDevice->SendRing[SwConIdx] = 0;
+
+        /* Set the return status. */
+        pPacket->PacketStatus = LM_STATUS_SUCCESS;
+
+        /* Put the packet in the TxPacketXmittedQ for indication later. */
+        QQ_PushTail(&pDevice->TxPacketXmittedQ.Container, pPacket);
+
+        /* Move to the next packet's BD. */
+        SwConIdx = (SwConIdx + pPacket->u.Tx.FragCount) & 
+            T3_SEND_RCB_ENTRY_COUNT_MASK;
+
+        /* Update the number of unused BDs. */
+        MM_ATOMIC_ADD(&pDevice->SendBdLeft, pPacket->u.Tx.FragCount);
+
+        /* Get the new updated HwConIdx. */
+        HwConIdx = pDevice->pStatusBlkVirt->Idx[0].SendConIdx;
+    } /* while */
+
+    /* Save the new SwConIdx. */
+    pDevice->SendConIdx = SwConIdx;
+
+} /* LM_ServiceTxInterrupt */
+
+
+#ifdef BCM_NAPI_RXPOLL
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+int
+LM_ServiceRxPoll(PLM_DEVICE_BLOCK pDevice, int limit)
+{
+    PLM_PACKET pPacket;
+    PT3_RCV_BD pRcvBd;
+    LM_UINT32 HwRcvRetProdIdx;
+    LM_UINT32 SwRcvRetConIdx;
+    int received = 0;
+
+    /* Loop thru the receive return rings for received packets. */
+    HwRcvRetProdIdx = pDevice->pStatusBlkVirt->Idx[0].RcvProdIdx;
+
+    SwRcvRetConIdx = pDevice->RcvRetConIdx;
+    MM_RMB();
+    while (SwRcvRetConIdx != HwRcvRetProdIdx) 
+    {
+        pRcvBd = &pDevice->pRcvRetBdVirt[SwRcvRetConIdx];
+
+        /* Get the received packet descriptor. */
+        pPacket = (PLM_PACKET) (MM_UINT_PTR(pDevice->pPacketDescBase) +
+            MM_UINT_PTR(pRcvBd->Opaque));
+
+        switch(pPacket->u.Rx.RcvProdRing) {
+#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
+        case T3_JUMBO_RCV_PROD_RING:        /* Jumbo Receive Ring. */
+            pDevice->RxJumboRing[pPacket->u.Rx.RcvRingProdIdx] = 0;
+	    break;
+#endif
+        case T3_STD_RCV_PROD_RING:      /* Standard Receive Ring. */
+            pDevice->RxStdRing[pPacket->u.Rx.RcvRingProdIdx] = 0;
+	    break;
+        }
+
+        /* Check the error flag. */
+        if(pRcvBd->ErrorFlag &&
+            pRcvBd->ErrorFlag != RCV_BD_ERR_ODD_NIBBLED_RCVD_MII)
+        {
+            pPacket->PacketStatus = LM_STATUS_FAILURE;
+
+            pDevice->RxCounters.RxPacketErrCnt++;
+
+            if(pRcvBd->ErrorFlag & RCV_BD_ERR_BAD_CRC)
+            {
+                pDevice->RxCounters.RxErrCrcCnt++;
+            }
+
+            if(pRcvBd->ErrorFlag & RCV_BD_ERR_COLL_DETECT)
+            {
+                pDevice->RxCounters.RxErrCollCnt++;
+            }
+
+            if(pRcvBd->ErrorFlag & RCV_BD_ERR_LINK_LOST_DURING_PKT)
+            {
+                pDevice->RxCounters.RxErrLinkLostCnt++;
+            }
+
+            if(pRcvBd->ErrorFlag & RCV_BD_ERR_PHY_DECODE_ERR)
+            {
+                pDevice->RxCounters.RxErrPhyDecodeCnt++;
+            }
+
+            if(pRcvBd->ErrorFlag & RCV_BD_ERR_ODD_NIBBLED_RCVD_MII)
+            {
+                pDevice->RxCounters.RxErrOddNibbleCnt++;
+            }
+
+            if(pRcvBd->ErrorFlag & RCV_BD_ERR_MAC_ABORT)
+            {
+                pDevice->RxCounters.RxErrMacAbortCnt++;
+            }
+
+            if(pRcvBd->ErrorFlag & RCV_BD_ERR_LEN_LT_64)
+            {
+                pDevice->RxCounters.RxErrShortPacketCnt++;
+            }
+
+            if(pRcvBd->ErrorFlag & RCV_BD_ERR_TRUNC_NO_RESOURCES)
+            {
+                pDevice->RxCounters.RxErrNoResourceCnt++;
+            }
+
+            if(pRcvBd->ErrorFlag & RCV_BD_ERR_GIANT_FRAME_RCVD)
+            {
+                pDevice->RxCounters.RxErrLargePacketCnt++;
+            }
+        }
+        else
+        {
+            pPacket->PacketStatus = LM_STATUS_SUCCESS;
+            pPacket->PacketSize = pRcvBd->Len - 4;
+
+            pPacket->Flags = pRcvBd->Flags;
+            if(pRcvBd->Flags & RCV_BD_FLAG_VLAN_TAG)
+            {
+                pPacket->VlanTag = pRcvBd->VlanTag;
+            }
+
+            pPacket->u.Rx.TcpUdpChecksum = pRcvBd->TcpUdpCksum;
+        }
+
+        /* Put the packet descriptor containing the received packet */
+        /* buffer in the RxPacketReceivedQ for indication later. */
+        QQ_PushTail(&pDevice->RxPacketReceivedQ.Container, pPacket);
+
+        /* Go to the next buffer descriptor. */
+        SwRcvRetConIdx = (SwRcvRetConIdx + 1) &
+            pDevice->RcvRetRcbEntryCountMask;
+
+        if (++received >= limit)
+        {
+            break;
+        }
+    } /* while */
+
+    pDevice->RcvRetConIdx = SwRcvRetConIdx;
+
+    /* Update the receive return ring consumer index. */
+    MB_REG_WR(pDevice, Mailbox.RcvRetConIdx[0].Low, SwRcvRetConIdx);
+    if (pDevice->Flags & FLUSH_POSTED_WRITE_FLAG)
+    {
+        MB_REG_RD(pDevice, Mailbox.RcvRetConIdx[0].Low);
+    }
+    return received;
+} /* LM_ServiceRxPoll */
+#endif /* BCM_NAPI_RXPOLL */
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+void
+LM_ServiceRxInterrupt(PLM_DEVICE_BLOCK pDevice)
+{
+#ifndef BCM_NAPI_RXPOLL
+    PLM_PACKET pPacket;
+    PT3_RCV_BD pRcvBd;
+#endif
+    LM_UINT32 HwRcvRetProdIdx;
+    LM_UINT32 SwRcvRetConIdx;
+
+    /* Loop thru the receive return rings for received packets. */
+    HwRcvRetProdIdx = pDevice->pStatusBlkVirt->Idx[0].RcvProdIdx;
+
+    SwRcvRetConIdx = pDevice->RcvRetConIdx;
+#ifdef BCM_NAPI_RXPOLL
+    if (!pDevice->RxPoll)
+    {
+        if (SwRcvRetConIdx != HwRcvRetProdIdx)
+        {
+            if (MM_ScheduleRxPoll(pDevice) == LM_STATUS_SUCCESS)
+            {
+                pDevice->RxPoll = TRUE;
+                REG_WR(pDevice, Grc.Mode,
+                    pDevice->GrcMode | GRC_MODE_NO_INTERRUPT_ON_RECEIVE);
+            }
+        }
+    }
+#else
+    MM_RMB();
+    while(SwRcvRetConIdx != HwRcvRetProdIdx)
+    {
+        pRcvBd = &pDevice->pRcvRetBdVirt[SwRcvRetConIdx];
+
+        /* Get the received packet descriptor. */
+        pPacket = (PLM_PACKET) (MM_UINT_PTR(pDevice->pPacketDescBase) +
+            MM_UINT_PTR(pRcvBd->Opaque));
+
+        switch(pPacket->u.Rx.RcvProdRing) {
+#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
+        case T3_JUMBO_RCV_PROD_RING:        /* Jumbo Receive Ring. */
+            pDevice->RxJumboRing[pPacket->u.Rx.RcvRingProdIdx] = 0;
+	    break;
+#endif
+        case T3_STD_RCV_PROD_RING:      /* Standard Receive Ring. */
+            pDevice->RxStdRing[pPacket->u.Rx.RcvRingProdIdx] = 0;
+	    break;
+        }
+
+        /* Check the error flag. */
+        if(pRcvBd->ErrorFlag &&
+            pRcvBd->ErrorFlag != RCV_BD_ERR_ODD_NIBBLED_RCVD_MII)
+        {
+            pPacket->PacketStatus = LM_STATUS_FAILURE;
+
+            pDevice->RxCounters.RxPacketErrCnt++;
+
+            if(pRcvBd->ErrorFlag & RCV_BD_ERR_BAD_CRC)
+            {
+                pDevice->RxCounters.RxErrCrcCnt++;
+            }
+
+            if(pRcvBd->ErrorFlag & RCV_BD_ERR_COLL_DETECT)
+            {
+                pDevice->RxCounters.RxErrCollCnt++;
+            }
+
+            if(pRcvBd->ErrorFlag & RCV_BD_ERR_LINK_LOST_DURING_PKT)
+            {
+                pDevice->RxCounters.RxErrLinkLostCnt++;
+            }
+
+            if(pRcvBd->ErrorFlag & RCV_BD_ERR_PHY_DECODE_ERR)
+            {
+                pDevice->RxCounters.RxErrPhyDecodeCnt++;
+            }
+
+            if(pRcvBd->ErrorFlag & RCV_BD_ERR_ODD_NIBBLED_RCVD_MII)
+            {
+                pDevice->RxCounters.RxErrOddNibbleCnt++;
+            }
+
+            if(pRcvBd->ErrorFlag & RCV_BD_ERR_MAC_ABORT)
+            {
+                pDevice->RxCounters.RxErrMacAbortCnt++;
+            }
+
+            if(pRcvBd->ErrorFlag & RCV_BD_ERR_LEN_LT_64)
+            {
+                pDevice->RxCounters.RxErrShortPacketCnt++;
+            }
+
+            if(pRcvBd->ErrorFlag & RCV_BD_ERR_TRUNC_NO_RESOURCES)
+            {
+                pDevice->RxCounters.RxErrNoResourceCnt++;
+            }
+
+            if(pRcvBd->ErrorFlag & RCV_BD_ERR_GIANT_FRAME_RCVD)
+            {
+                pDevice->RxCounters.RxErrLargePacketCnt++;
+            }
+        }
+        else
+        {
+            pPacket->PacketStatus = LM_STATUS_SUCCESS;
+            pPacket->PacketSize = pRcvBd->Len - 4;
+
+            pPacket->Flags = pRcvBd->Flags;
+            if(pRcvBd->Flags & RCV_BD_FLAG_VLAN_TAG)
+            {
+                pPacket->VlanTag = pRcvBd->VlanTag;
+            }
+
+            pPacket->u.Rx.TcpUdpChecksum = pRcvBd->TcpUdpCksum;
+        }
+
+        /* Put the packet descriptor containing the received packet */
+        /* buffer in the RxPacketReceivedQ for indication later. */
+        QQ_PushTail(&pDevice->RxPacketReceivedQ.Container, pPacket);
+
+        /* Go to the next buffer descriptor. */
+        SwRcvRetConIdx = (SwRcvRetConIdx + 1) &
+            pDevice->RcvRetRcbEntryCountMask;
+
+    } /* while */
+
+    pDevice->RcvRetConIdx = SwRcvRetConIdx;
+
+    /* Update the receive return ring consumer index. */
+    MB_REG_WR(pDevice, Mailbox.RcvRetConIdx[0].Low, SwRcvRetConIdx);
+    if (pDevice->Flags & FLUSH_POSTED_WRITE_FLAG)
+    {
+        MB_REG_RD(pDevice, Mailbox.RcvRetConIdx[0].Low);
+    }
+#endif
+} /* LM_ServiceRxInterrupt */
+
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*    This is the interrupt event handler routine. It acknowledges all        */
+/*    pending interrupts and process all pending events.                      */
+/*                                                                            */
+/* Return:                                                                    */
+/*    LM_STATUS_SUCCESS                                                       */
+/******************************************************************************/
+LM_STATUS
+LM_ServiceInterrupts(
+    PLM_DEVICE_BLOCK pDevice)
+{
+    LM_UINT32 Value32;
+    int ServicePhyInt = FALSE;
+
+    /* Setup the phy chip whenever the link status changes. */
+    if(pDevice->LinkChngMode == T3_LINK_CHNG_MODE_USE_STATUS_REG)
+    {
+        Value32 = REG_RD(pDevice, MacCtrl.Status);
+        if(pDevice->PhyIntMode == T3_PHY_INT_MODE_MI_INTERRUPT)
+        {
+            if (Value32 & MAC_STATUS_MI_INTERRUPT)
+            {
+                ServicePhyInt = TRUE;
+            }
+        }
+        else if(Value32 & MAC_STATUS_LINK_STATE_CHANGED)
+        {
+            ServicePhyInt = TRUE;
+        }
+    }
+    else
+    {
+        if(pDevice->pStatusBlkVirt->Status & STATUS_BLOCK_LINK_CHANGED_STATUS)
+        {
+            pDevice->pStatusBlkVirt->Status = STATUS_BLOCK_UPDATED |
+                (pDevice->pStatusBlkVirt->Status & ~STATUS_BLOCK_LINK_CHANGED_STATUS);
+            ServicePhyInt = TRUE;
+        }
+    }
+#if INCLUDE_TBI_SUPPORT
+    if (pDevice->IgnoreTbiLinkChange == TRUE)
+    {
+        ServicePhyInt = FALSE;
+    }
+#endif
+    if (ServicePhyInt == TRUE)
+    {
+        MM_ACQUIRE_PHY_LOCK_IN_IRQ(pDevice);
+        LM_SetupPhy(pDevice);
+        MM_RELEASE_PHY_LOCK_IN_IRQ(pDevice);
+    }
+
+    /* Service receive and transmit interrupts. */
+    LM_ServiceRxInterrupt(pDevice);
+    LM_ServiceTxInterrupt(pDevice);
+        
+#ifndef BCM_NAPI_RXPOLL
+    /* No spinlock for this queue since this routine is serialized. */
+    if(!QQ_Empty(&pDevice->RxPacketReceivedQ.Container))
+    {
+        /* Indicate receive packets. */
+        MM_IndicateRxPackets(pDevice);
+//        LM_QueueRxPackets(pDevice);
+    }
+#endif
+
+    /* No spinlock for this queue since this routine is serialized. */
+    if(!QQ_Empty(&pDevice->TxPacketXmittedQ.Container))
+    {
+        MM_IndicateTxPackets(pDevice);
+    }
+
+    return LM_STATUS_SUCCESS;
+} /* LM_ServiceInterrupts */
+
+
+/******************************************************************************/
+/* Description:  Add a Multicast address. Note that MC addresses, once added, */
+/*               cannot be individually deleted. All addresses must be        */
+/*               cleared.                                                     */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+LM_STATUS
+LM_MulticastAdd(LM_DEVICE_BLOCK *pDevice, PLM_UINT8 pMcAddress)
+{
+
+    LM_UINT32 RegIndex;
+    LM_UINT32 Bitpos;
+    LM_UINT32 Crc32;
+
+    Crc32 = ComputeCrc32(pMcAddress, ETHERNET_ADDRESS_SIZE);
+
+    /* The most significant 7 bits of the CRC32 (no inversion), */
+    /* are used to index into one of the possible 128 bit positions. */
+    Bitpos = ~Crc32 & 0x7f;
+
+    /* Hash register index. */
+    RegIndex = (Bitpos & 0x60) >> 5;
+
+    /* Bit to turn on within a hash register. */
+    Bitpos &= 0x1f;
+
+    /* Enable the multicast bit. */
+    pDevice->MulticastHash[RegIndex] |= (1 << Bitpos);
+
+    LM_SetReceiveMask(pDevice, pDevice->ReceiveMask | LM_ACCEPT_MULTICAST);
+
+    return LM_STATUS_SUCCESS;
+}
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+LM_STATUS
+LM_MulticastDel(LM_DEVICE_BLOCK *pDevice, PLM_UINT8 pMcAddress)
+{
+    return LM_STATUS_FAILURE;
+} /* LM_MulticastDel */
+
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+LM_STATUS
+LM_MulticastClear(LM_DEVICE_BLOCK *pDevice)
+{
+    int i;
+
+    for (i = 0; i < 4; i++)
+    {
+        pDevice->MulticastHash[i] = 0;
+    }
+    LM_SetReceiveMask(pDevice, pDevice->ReceiveMask & ~LM_ACCEPT_MULTICAST);
+
+    return LM_STATUS_SUCCESS;
+} /* LM_MulticastClear */
+
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+LM_STATUS
+LM_SetMacAddress(
+    PLM_DEVICE_BLOCK pDevice,
+    PLM_UINT8 pMacAddress)
+{
+    LM_UINT32 j;
+
+    for(j = 0; j < 4; j++)
+    {
+        REG_WR(pDevice, MacCtrl.MacAddr[j].High,
+            (pMacAddress[0] << 8) | pMacAddress[1]);
+        REG_WR(pDevice, MacCtrl.MacAddr[j].Low,
+            (pMacAddress[2] << 24) | (pMacAddress[3] << 16) |
+            (pMacAddress[4] << 8) | pMacAddress[5]);
+    }
+
+    if ((T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5700) &&
+        (T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5701) &&
+        (T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5705))
+    {
+        for (j = 0; j < 12; j++)
+        {
+            REG_WR(pDevice, MacCtrl.MacAddrExt[j].High,
+                (pMacAddress[0] << 8) | pMacAddress[1]);
+            REG_WR(pDevice, MacCtrl.MacAddrExt[j].Low,
+                (pMacAddress[2] << 24) | (pMacAddress[3] << 16) |
+                (pMacAddress[4] << 8) | pMacAddress[5]);
+        }
+    }
+    return LM_STATUS_SUCCESS;
+}
+
+LM_VOID
+LM_PhyTapPowerMgmt(LM_DEVICE_BLOCK *pDevice)
+{
+    /* Turn off tap power management. */
+    if((pDevice->PhyId & PHY_ID_MASK) == PHY_BCM5401_PHY_ID)
+    {
+        LM_WritePhy(pDevice, BCM5401_AUX_CTRL, 0x4c20);
+        LM_WritePhy(pDevice, BCM540X_DSP_ADDRESS_REG, 0x0012);
+        LM_WritePhy(pDevice, BCM540X_DSP_RW_PORT, 0x1804);
+        LM_WritePhy(pDevice, BCM540X_DSP_ADDRESS_REG, 0x0013);
+        LM_WritePhy(pDevice, BCM540X_DSP_RW_PORT, 0x1204);
+        LM_WritePhy(pDevice, BCM540X_DSP_ADDRESS_REG, 0x8006);
+        LM_WritePhy(pDevice, BCM540X_DSP_RW_PORT, 0x0132);
+        LM_WritePhy(pDevice, BCM540X_DSP_ADDRESS_REG, 0x8006);
+        LM_WritePhy(pDevice, BCM540X_DSP_RW_PORT, 0x0232);
+        LM_WritePhy(pDevice, BCM540X_DSP_ADDRESS_REG, 0x201f);
+        LM_WritePhy(pDevice, BCM540X_DSP_RW_PORT, 0x0a20);
+
+        MM_Wait(40);
+    }
+}
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/*    LM_STATUS_LINK_ACTIVE                                                   */
+/*    LM_STATUS_LINK_DOWN                                                     */
+/******************************************************************************/
+static LM_STATUS
+LM_InitBcm540xPhy(
+PLM_DEVICE_BLOCK pDevice)
+{
+    LM_LINE_SPEED CurrentLineSpeed;
+    LM_DUPLEX_MODE CurrentDuplexMode;
+    LM_STATUS CurrentLinkStatus;
+    LM_UINT32 Value32;
+    LM_UINT32 j;
+
+    LM_WritePhy(pDevice, BCM5401_AUX_CTRL, 0x02);
+
+    if ((pDevice->PhyFlags & PHY_RESET_ON_LINKDOWN) &&
+        (pDevice->LinkStatus == LM_STATUS_LINK_ACTIVE))
+    {
+        LM_ReadPhy(pDevice, PHY_STATUS_REG, &Value32);
+        LM_ReadPhy(pDevice, PHY_STATUS_REG, &Value32);
+        if(!(Value32 & PHY_STATUS_LINK_PASS))
+        {
+            LM_ResetPhy(pDevice);
+        }
+    }
+    if((pDevice->PhyId & PHY_ID_MASK) == PHY_BCM5401_PHY_ID)
+    {
+        LM_ReadPhy(pDevice, PHY_STATUS_REG, &Value32);
+        LM_ReadPhy(pDevice, PHY_STATUS_REG, &Value32);
+
+        if(!pDevice->InitDone)
+        {
+            Value32 = 0;
+        }
+
+        if(!(Value32 & PHY_STATUS_LINK_PASS))
+        {
+            LM_PhyTapPowerMgmt(pDevice);
+
+            LM_ReadPhy(pDevice, PHY_STATUS_REG, &Value32);
+            for(j = 0; j < 1000; j++)
+            {
+                MM_Wait(10);
+
+                LM_ReadPhy(pDevice, PHY_STATUS_REG, &Value32);
+                if(Value32 & PHY_STATUS_LINK_PASS)
+                {
+                    MM_Wait(40);
+                    break;
+                }
+            }
+
+            if((pDevice->PhyId & PHY_ID_REV_MASK) == PHY_BCM5401_B0_REV)
+            {
+                if(!(Value32 & PHY_STATUS_LINK_PASS) &&
+                    (pDevice->OldLineSpeed == LM_LINE_SPEED_1000MBPS))
+                {
+                    LM_ResetPhy(pDevice);
+                }
+            }
+        }
+    }
+    else if(pDevice->ChipRevId == T3_CHIP_ID_5701_A0 ||
+        pDevice->ChipRevId == T3_CHIP_ID_5701_B0)
+    {
+        /* Bug: 5701 A0, B0 TX CRC workaround. */
+        LM_WritePhy(pDevice, 0x15, 0x0a75);
+        LM_WritePhy(pDevice, 0x1c, 0x8c68);
+        LM_WritePhy(pDevice, 0x1c, 0x8d68);
+        LM_WritePhy(pDevice, 0x1c, 0x8c68);
+    }
+
+    /* Acknowledge interrupts. */
+    LM_ReadPhy(pDevice, BCM540X_INT_STATUS_REG, &Value32);
+    LM_ReadPhy(pDevice, BCM540X_INT_STATUS_REG, &Value32);
+
+    /* Configure the interrupt mask. */
+    if(pDevice->PhyIntMode == T3_PHY_INT_MODE_MI_INTERRUPT)
+    {
+        LM_WritePhy(pDevice, BCM540X_INT_MASK_REG, ~BCM540X_INT_LINK_CHANGE);
+    }
+
+    /* Configure PHY led mode. */
+    if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701 ||
+        (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700))
+    {
+        if(pDevice->LedCtrl == LED_CTRL_PHY_MODE_1)
+        {
+            LM_WritePhy(pDevice, BCM540X_EXT_CTRL_REG, 
+                BCM540X_EXT_CTRL_LINK3_LED_MODE);
+        }
+        else
+        {
+            LM_WritePhy(pDevice, BCM540X_EXT_CTRL_REG, 0);
+        }
+    }
+
+    if (pDevice->PhyFlags & PHY_CAPACITIVE_COUPLING)
+    {
+        LM_WritePhy(pDevice, BCM5401_AUX_CTRL, 0x4007);
+        LM_ReadPhy(pDevice, BCM5401_AUX_CTRL, &Value32);
+        if (!(Value32 & BIT_10))
+        {
+            /* set the bit and re-link */
+            LM_WritePhy(pDevice, BCM5401_AUX_CTRL, Value32 | BIT_10);
+            return LM_STATUS_LINK_SETTING_MISMATCH;
+        }
+    }
+
+    CurrentLinkStatus = LM_STATUS_LINK_DOWN;
+
+    /* Get current link and duplex mode. */
+    for(j = 0; j < 100; j++)
+    {
+        LM_ReadPhy(pDevice, PHY_STATUS_REG, &Value32);
+        LM_ReadPhy(pDevice, PHY_STATUS_REG, &Value32);
+
+        if(Value32 & PHY_STATUS_LINK_PASS)
+        {
+            break;
+        }
+        MM_Wait(40);
+    }
+
+    if(Value32 & PHY_STATUS_LINK_PASS)
+    {
+
+        /* Determine the current line and duplex settings. */
+        LM_ReadPhy(pDevice, BCM540X_AUX_STATUS_REG, &Value32);
+        for(j = 0; j < 2000; j++)
+        {
+            MM_Wait(10);
+
+            LM_ReadPhy(pDevice, BCM540X_AUX_STATUS_REG, &Value32);
+            if(Value32)
+            {
+                break;
+            }
+        }
+
+        switch(Value32 & BCM540X_AUX_SPEED_MASK)
+        {
+            case BCM540X_AUX_10BASET_HD:
+                CurrentLineSpeed = LM_LINE_SPEED_10MBPS;
+                CurrentDuplexMode = LM_DUPLEX_MODE_HALF;
+                break;
+
+            case BCM540X_AUX_10BASET_FD:
+                CurrentLineSpeed = LM_LINE_SPEED_10MBPS;
+                CurrentDuplexMode = LM_DUPLEX_MODE_FULL;
+                break;
+
+            case BCM540X_AUX_100BASETX_HD:
+                CurrentLineSpeed = LM_LINE_SPEED_100MBPS;
+                CurrentDuplexMode = LM_DUPLEX_MODE_HALF;
+                break;
+
+            case BCM540X_AUX_100BASETX_FD:
+                CurrentLineSpeed = LM_LINE_SPEED_100MBPS;
+                CurrentDuplexMode = LM_DUPLEX_MODE_FULL;
+                break;
+
+            case BCM540X_AUX_100BASET_HD:
+                CurrentLineSpeed = LM_LINE_SPEED_1000MBPS;
+                CurrentDuplexMode = LM_DUPLEX_MODE_HALF;
+                break;
+
+            case BCM540X_AUX_100BASET_FD:
+                CurrentLineSpeed = LM_LINE_SPEED_1000MBPS;
+                CurrentDuplexMode = LM_DUPLEX_MODE_FULL;
+                break;
+
+            default:
+
+                CurrentLineSpeed = LM_LINE_SPEED_UNKNOWN;
+                CurrentDuplexMode = LM_DUPLEX_MODE_UNKNOWN;
+                break;
+        }
+
+        /* Make sure we are in auto-neg mode. */
+        for (j = 0; j < 200; j++)
+        {
+            LM_ReadPhy(pDevice, PHY_CTRL_REG, &Value32);
+            if(Value32 && Value32 != 0x7fff)
+            {
+                break;
+            }
+
+            if(Value32 == 0 &&
+                pDevice->RequestedLineSpeed == LM_LINE_SPEED_10MBPS &&
+                pDevice->RequestedDuplexMode == LM_DUPLEX_MODE_HALF)
+            {
+                break;
+            }
+
+            MM_Wait(10);
+        }
+
+        /* Use the current line settings for "auto" mode. */
+        if(pDevice->RequestedLineSpeed == LM_LINE_SPEED_AUTO)
+        {
+            if(Value32 & PHY_CTRL_AUTO_NEG_ENABLE)
+            {
+                CurrentLinkStatus = LM_STATUS_LINK_ACTIVE;
+
+                /* We may be exiting low power mode and the link is in */
+                /* 10mb.  In this case, we need to restart autoneg. */
+
+                if (LM_PhyAdvertiseAll(pDevice) != LM_STATUS_SUCCESS)
+                {
+                    CurrentLinkStatus = LM_STATUS_LINK_SETTING_MISMATCH;
+                }
+            }
+            else
+            {
+                CurrentLinkStatus = LM_STATUS_LINK_SETTING_MISMATCH;
+            }
+        }
+        else
+        {
+            /* Force line settings. */
+            /* Use the current setting if it matches the user's requested */
+            /* setting. */
+            LM_ReadPhy(pDevice, PHY_CTRL_REG, &Value32);
+            if((pDevice->LineSpeed == CurrentLineSpeed) &&
+                (pDevice->DuplexMode == CurrentDuplexMode))
+            {
+                if ((pDevice->DisableAutoNeg &&
+                    !(Value32 & PHY_CTRL_AUTO_NEG_ENABLE)) ||
+                    (!pDevice->DisableAutoNeg &&
+                    (Value32 & PHY_CTRL_AUTO_NEG_ENABLE)))
+                {
+                    CurrentLinkStatus = LM_STATUS_LINK_ACTIVE;
+                }
+                else
+                {
+                    CurrentLinkStatus = LM_STATUS_LINK_SETTING_MISMATCH;
+                } 
+            }
+            else
+            {
+                CurrentLinkStatus = LM_STATUS_LINK_SETTING_MISMATCH;
+            } 
+        }
+
+        /* Save line settings. */
+        pDevice->LineSpeed = CurrentLineSpeed;
+        pDevice->DuplexMode = CurrentDuplexMode;
+    }
+
+    return CurrentLinkStatus;
+} /* LM_InitBcm540xPhy */
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+LM_STATUS
+LM_SetFlowControl(
+    PLM_DEVICE_BLOCK pDevice,
+    LM_UINT32 LocalPhyAd,
+    LM_UINT32 RemotePhyAd)
+{
+    LM_FLOW_CONTROL FlowCap;
+
+    /* Resolve flow control. */
+    FlowCap = LM_FLOW_CONTROL_NONE;
+
+    /* See Table 28B-3 of 802.3ab-1999 spec. */
+    if(pDevice->FlowControlCap & LM_FLOW_CONTROL_AUTO_PAUSE)
+    {
+        if(LocalPhyAd & PHY_AN_AD_PAUSE_CAPABLE)
+        {
+            if(LocalPhyAd & PHY_AN_AD_ASYM_PAUSE)
+            {
+                if(RemotePhyAd & PHY_LINK_PARTNER_PAUSE_CAPABLE)
+                {
+                    FlowCap = LM_FLOW_CONTROL_TRANSMIT_PAUSE |
+                        LM_FLOW_CONTROL_RECEIVE_PAUSE;
+                }
+                else if(RemotePhyAd & PHY_LINK_PARTNER_ASYM_PAUSE)
+                {
+                    FlowCap = LM_FLOW_CONTROL_RECEIVE_PAUSE;
+                }
+            }
+            else
+            {
+                if(RemotePhyAd & PHY_LINK_PARTNER_PAUSE_CAPABLE)
+                {
+                    FlowCap = LM_FLOW_CONTROL_TRANSMIT_PAUSE |
+                        LM_FLOW_CONTROL_RECEIVE_PAUSE;
+                }
+            }
+        }
+        else if(LocalPhyAd & PHY_AN_AD_ASYM_PAUSE)
+        {
+            if((RemotePhyAd & PHY_LINK_PARTNER_PAUSE_CAPABLE) &&
+                (RemotePhyAd & PHY_LINK_PARTNER_ASYM_PAUSE))
+            {
+                FlowCap = LM_FLOW_CONTROL_TRANSMIT_PAUSE;
+            }
+        }
+    }
+    else
+    {
+        FlowCap = pDevice->FlowControlCap;
+    }
+
+    pDevice->FlowControl = LM_FLOW_CONTROL_NONE;
+
+    /* Enable/disable rx PAUSE. */
+    pDevice->RxMode &= ~RX_MODE_ENABLE_FLOW_CONTROL;
+    if(FlowCap & LM_FLOW_CONTROL_RECEIVE_PAUSE &&
+        (pDevice->FlowControlCap == LM_FLOW_CONTROL_AUTO_PAUSE ||
+        pDevice->FlowControlCap & LM_FLOW_CONTROL_RECEIVE_PAUSE))
+    {
+        pDevice->FlowControl |= LM_FLOW_CONTROL_RECEIVE_PAUSE;
+        pDevice->RxMode |= RX_MODE_ENABLE_FLOW_CONTROL;
+
+    }
+    REG_WR(pDevice, MacCtrl.RxMode, pDevice->RxMode);
+
+    /* Enable/disable tx PAUSE. */
+    pDevice->TxMode &= ~TX_MODE_ENABLE_FLOW_CONTROL;
+    if(FlowCap & LM_FLOW_CONTROL_TRANSMIT_PAUSE &&
+        (pDevice->FlowControlCap == LM_FLOW_CONTROL_AUTO_PAUSE ||
+        pDevice->FlowControlCap & LM_FLOW_CONTROL_TRANSMIT_PAUSE))
+    {
+        pDevice->FlowControl |= LM_FLOW_CONTROL_TRANSMIT_PAUSE;
+        pDevice->TxMode |= TX_MODE_ENABLE_FLOW_CONTROL;
+
+    }
+    REG_WR(pDevice, MacCtrl.TxMode, pDevice->TxMode);
+
+    return LM_STATUS_SUCCESS;
+}
+
+
+#if INCLUDE_TBI_SUPPORT
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+STATIC LM_STATUS
+LM_InitBcm800xPhy(
+    PLM_DEVICE_BLOCK pDevice)
+{
+    LM_UINT32 Value32;
+    LM_UINT32 j;
+
+    Value32 = REG_RD(pDevice, MacCtrl.Status);
+
+    /* Reset the SERDES during init and when we have link. */
+    if(!pDevice->InitDone || Value32 & MAC_STATUS_PCS_SYNCED)
+    {
+        /* Set PLL lock range. */
+        LM_WritePhy(pDevice, 0x16, 0x8007);
+
+        /* Software reset. */
+        LM_WritePhy(pDevice, 0x00, 0x8000);
+
+        /* Wait for reset to complete. */
+        for(j = 0; j < 500; j++)
+        {
+            MM_Wait(10);
+        }
+
+        /* Config mode; seletct PMA/Ch 1 regs. */
+        LM_WritePhy(pDevice, 0x10, 0x8411);
+
+        /* Enable auto-lock and comdet, select txclk for tx. */
+        LM_WritePhy(pDevice, 0x11, 0x0a10);
+
+        LM_WritePhy(pDevice, 0x18, 0x00a0);
+        LM_WritePhy(pDevice, 0x16, 0x41ff);
+
+        /* Assert and deassert POR. */
+        LM_WritePhy(pDevice, 0x13, 0x0400);
+        MM_Wait(40);
+        LM_WritePhy(pDevice, 0x13, 0x0000);
+
+        LM_WritePhy(pDevice, 0x11, 0x0a50);
+        MM_Wait(40);
+        LM_WritePhy(pDevice, 0x11, 0x0a10);
+
+        /* Delay for signal to stabilize. */
+        for(j = 0; j < 15000; j++)
+        {
+            MM_Wait(10);
+        }
+
+        /* Deselect the channel register so we can read the PHY id later. */
+        LM_WritePhy(pDevice, 0x10, 0x8011);
+    }
+
+    return LM_STATUS_SUCCESS;
+}
+
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+STATIC LM_STATUS
+LM_SetupFiberPhy(
+    PLM_DEVICE_BLOCK pDevice)
+{
+    LM_STATUS CurrentLinkStatus;
+    AUTONEG_STATUS AnStatus = 0;
+    LM_UINT32 Value32;
+    LM_UINT32 Cnt;
+    LM_UINT32 j, k;
+    LM_UINT32 MacStatus, RemotePhyAd, LocalPhyAd;
+    LM_FLOW_CONTROL PreviousFlowControl = pDevice->FlowControl;
+
+    if (pDevice->LoopBackMode == LM_MAC_LOOP_BACK_MODE)
+    {
+        pDevice->LinkStatus = LM_STATUS_LINK_ACTIVE;
+        MM_IndicateStatus(pDevice, LM_STATUS_LINK_ACTIVE);
+        return LM_STATUS_SUCCESS;
+    }
+
+    if ((T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5704) &&
+        (pDevice->LinkStatus == LM_STATUS_LINK_ACTIVE) && pDevice->InitDone)
+    {
+        MacStatus = REG_RD(pDevice, MacCtrl.Status);
+        if ((MacStatus & (MAC_STATUS_PCS_SYNCED | MAC_STATUS_SIGNAL_DETECTED |
+            MAC_STATUS_CFG_CHANGED | MAC_STATUS_RECEIVING_CFG))
+            == (MAC_STATUS_PCS_SYNCED | MAC_STATUS_SIGNAL_DETECTED))
+        {
+      
+            REG_WR(pDevice, MacCtrl.Status, MAC_STATUS_SYNC_CHANGED |
+                MAC_STATUS_CFG_CHANGED);
+            return LM_STATUS_SUCCESS;
+        }
+    }
+    pDevice->MacMode &= ~(MAC_MODE_HALF_DUPLEX | MAC_MODE_PORT_MODE_MASK);
+
+    /* Initialize the send_config register. */
+    REG_WR(pDevice, MacCtrl.TxAutoNeg, 0);
+
+    /* Enable TBI and full duplex mode. */
+    pDevice->MacMode |= MAC_MODE_PORT_MODE_TBI;
+    REG_WR(pDevice, MacCtrl.Mode, pDevice->MacMode);
+
+    /* Initialize the BCM8002 SERDES PHY. */
+    switch(pDevice->PhyId & PHY_ID_MASK)
+    {
+        case PHY_BCM8002_PHY_ID:
+            LM_InitBcm800xPhy(pDevice);
+            break;
+
+        default:
+            break;
+    }
+
+    /* Enable link change interrupt. */
+    REG_WR(pDevice, MacCtrl.MacEvent, MAC_EVENT_ENABLE_LINK_STATE_CHANGED_ATTN);
+
+    /* Default to link down. */
+    CurrentLinkStatus = LM_STATUS_LINK_DOWN;
+
+    /* Get the link status. */
+    MacStatus = REG_RD(pDevice, MacCtrl.Status);
+
+    if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5704)
+    {
+        LM_UINT32 SgDigCtrl, SgDigStatus;
+        LM_UINT32 SerdesCfg = 0;
+        LM_UINT32 ExpectedSgDigCtrl = 0;
+        LM_UINT32 WorkAround = 0;
+        LM_UINT32 PortA = 1;
+
+        if ((pDevice->ChipRevId != T3_CHIP_ID_5704_A0) &&
+            (pDevice->ChipRevId != T3_CHIP_ID_5704_A1))
+        {
+            WorkAround = 1;
+            if (REG_RD(pDevice, PciCfg.DualMacCtrl) & T3_DUAL_MAC_ID)
+            {
+                PortA = 0;
+            }
+            /* preserve the voltage regulator bits */
+            SerdesCfg = REG_RD(pDevice, MacCtrl.SerdesCfg) &
+                (BIT_23 | BIT_22 | BIT_21 | BIT_20);
+        }
+        SgDigCtrl = REG_RD(pDevice, MacCtrl.SgDigControl);
+        if((pDevice->RequestedLineSpeed == LM_LINE_SPEED_AUTO) ||
+            (pDevice->DisableAutoNeg == FALSE))
+        {
+        
+            ExpectedSgDigCtrl = 0x81388400;
+            LocalPhyAd = GetPhyAdFlowCntrlSettings(pDevice);
+            if(LocalPhyAd & PHY_AN_AD_PAUSE_CAPABLE)
+            {
+                ExpectedSgDigCtrl |= BIT_11;
+            }
+            if(LocalPhyAd & PHY_AN_AD_ASYM_PAUSE)
+            {
+                ExpectedSgDigCtrl |= BIT_12;
+            }
+            if (SgDigCtrl != ExpectedSgDigCtrl)
+            {
+                if (WorkAround)
+                {
+                    REG_WR(pDevice, MacCtrl.SerdesCfg, 0xc011880 | SerdesCfg);
+                }
+                REG_WR(pDevice, MacCtrl.SgDigControl, ExpectedSgDigCtrl |
+                    BIT_30);
+                REG_RD_BACK(pDevice, MacCtrl.SgDigControl);
+		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 |
+                MAC_STATUS_SIGNAL_DETECTED))
+            {
+                SgDigStatus = REG_RD(pDevice, MacCtrl.SgDigStatus);
+                if ((SgDigStatus & BIT_1) &&
+                    (MacStatus & MAC_STATUS_PCS_SYNCED))
+                {
+                    /* autoneg. completed */
+                    RemotePhyAd = 0;
+                    if(SgDigStatus & BIT_19)
+                    {
+                        RemotePhyAd |= PHY_LINK_PARTNER_PAUSE_CAPABLE;
+                    }
+
+                    if(SgDigStatus & BIT_20)
+                    {
+                        RemotePhyAd |= PHY_LINK_PARTNER_ASYM_PAUSE;
+                    }
+
+                    LM_SetFlowControl(pDevice, LocalPhyAd, RemotePhyAd);
+                    CurrentLinkStatus = LM_STATUS_LINK_ACTIVE;
+                    pDevice->AutoNegJustInited = FALSE;
+                }
+                else if (!(SgDigStatus & BIT_1))
+                {
+                    if (pDevice->AutoNegJustInited == TRUE)
+                    {
+                        /* we may be checking too soon, so check again */
+                        /* at the next poll interval */
+                        pDevice->AutoNegJustInited = FALSE;
+                    }
+                    else
+                    {
+                        /* autoneg. failed */
+                        if (WorkAround)
+                        {
+                            if (PortA)
+                            {
+                                REG_WR(pDevice, MacCtrl.SerdesCfg,
+                                    0xc010880 | SerdesCfg);
+                            }
+                            else
+                            {
+                                REG_WR(pDevice, MacCtrl.SerdesCfg,
+                                    0x4010880 | SerdesCfg);
+                            }
+                        }
+                        /* turn off autoneg. to allow traffic to pass */
+                        REG_WR(pDevice, MacCtrl.SgDigControl, 0x01388400);
+                        REG_RD_BACK(pDevice, MacCtrl.SgDigControl);
+                        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;
+                        }
+                    }
+                }
+            }
+        }
+        else
+        {
+            if (SgDigCtrl & BIT_31) {
+                if (WorkAround)
+                {
+                    if (PortA)
+                    {
+                        REG_WR(pDevice, MacCtrl.SerdesCfg,
+                            0xc010880 | SerdesCfg);
+                    }
+                    else
+                    {
+                        REG_WR(pDevice, MacCtrl.SerdesCfg,
+                            0x4010880 | SerdesCfg);
+                    }
+                }
+                REG_WR(pDevice, MacCtrl.SgDigControl, 0x01388400);
+            }
+            if(MacStatus & MAC_STATUS_PCS_SYNCED)
+            {
+                LM_SetFlowControl(pDevice, 0, 0);
+                CurrentLinkStatus = LM_STATUS_LINK_ACTIVE;
+            }
+        }
+    }
+    else if(MacStatus & MAC_STATUS_PCS_SYNCED)
+    {
+        if((pDevice->RequestedLineSpeed == LM_LINE_SPEED_AUTO) ||
+            (pDevice->DisableAutoNeg == FALSE))
+        {
+            /* auto-negotiation mode. */
+            /* Initialize the autoneg default capaiblities. */
+            AutonegInit(&pDevice->AnInfo);
+
+            /* Set the context pointer to point to the main device structure. */
+            pDevice->AnInfo.pContext = pDevice;
+
+            /* Setup flow control advertisement register. */
+            Value32 = GetPhyAdFlowCntrlSettings(pDevice);
+            if(Value32 & PHY_AN_AD_PAUSE_CAPABLE)
+            {
+                pDevice->AnInfo.mr_adv_sym_pause = 1;
+            }
+            else
+            {
+                pDevice->AnInfo.mr_adv_sym_pause = 0;
+            }
+
+            if(Value32 & PHY_AN_AD_ASYM_PAUSE)
+            {
+                pDevice->AnInfo.mr_adv_asym_pause = 1;
+            }
+            else
+            {
+                pDevice->AnInfo.mr_adv_asym_pause = 0;
+            }
+
+            /* Try to autoneg up to six times. */
+            if (pDevice->IgnoreTbiLinkChange)
+            {
+                Cnt = 1;
+            }
+            else
+            {
+                Cnt = 6;
+            }
+            for (j = 0; j < Cnt; j++)
+            {
+                REG_WR(pDevice, MacCtrl.TxAutoNeg, 0);
+
+                Value32 = pDevice->MacMode & ~MAC_MODE_PORT_MODE_MASK;
+                REG_WR(pDevice, MacCtrl.Mode, Value32);
+                REG_RD_BACK(pDevice, MacCtrl.Mode);
+                MM_Wait(20);
+
+                REG_WR(pDevice, MacCtrl.Mode, pDevice->MacMode |
+                    MAC_MODE_SEND_CONFIGS);
+                REG_RD_BACK(pDevice, MacCtrl.Mode);
+
+                MM_Wait(20);
+
+                pDevice->AnInfo.State = AN_STATE_UNKNOWN;
+                pDevice->AnInfo.CurrentTime_us = 0;
+
+                REG_WR(pDevice, Grc.Timer, 0);
+                for(k = 0; (pDevice->AnInfo.CurrentTime_us < 75000) &&
+                    (k < 75000); k++)
+                {
+                    AnStatus = Autoneg8023z(&pDevice->AnInfo);
+
+                    if((AnStatus == AUTONEG_STATUS_DONE) || 
+                        (AnStatus == AUTONEG_STATUS_FAILED))
+                    {
+                        break;
+                    }
+
+                    pDevice->AnInfo.CurrentTime_us = REG_RD(pDevice, Grc.Timer);
+                
+                }
+                if((AnStatus == AUTONEG_STATUS_DONE) || 
+                    (AnStatus == AUTONEG_STATUS_FAILED))
+                {
+                    break;
+                }
+                if (j >= 1)
+                {
+                    if (!(REG_RD(pDevice, MacCtrl.Status) &
+                        MAC_STATUS_PCS_SYNCED)) {
+                        break;
+                    }
+                }
+            }
+
+            /* Stop sending configs. */
+            MM_AnTxIdle(&pDevice->AnInfo);
+
+            /* Resolve flow control settings. */
+            if((AnStatus == AUTONEG_STATUS_DONE) &&
+                pDevice->AnInfo.mr_an_complete && pDevice->AnInfo.mr_link_ok &&
+                pDevice->AnInfo.mr_lp_adv_full_duplex)
+                {
+                LM_UINT32 RemotePhyAd;
+                LM_UINT32 LocalPhyAd;
+
+                LocalPhyAd = 0;
+                if(pDevice->AnInfo.mr_adv_sym_pause)
+                {
+                    LocalPhyAd |= PHY_AN_AD_PAUSE_CAPABLE;
+                }
+
+                if(pDevice->AnInfo.mr_adv_asym_pause)
+                {
+                    LocalPhyAd |= PHY_AN_AD_ASYM_PAUSE;
+                }
+
+                RemotePhyAd = 0;
+                if(pDevice->AnInfo.mr_lp_adv_sym_pause)
+                {
+                    RemotePhyAd |= PHY_LINK_PARTNER_PAUSE_CAPABLE;
+                }
+
+                if(pDevice->AnInfo.mr_lp_adv_asym_pause)
+                {
+                    RemotePhyAd |= PHY_LINK_PARTNER_ASYM_PAUSE;
+                }
+
+                LM_SetFlowControl(pDevice, LocalPhyAd, RemotePhyAd);
+
+                CurrentLinkStatus = LM_STATUS_LINK_ACTIVE;
+            }
+            else
+            {
+                LM_SetFlowControl(pDevice, 0, 0);
+            }
+            for (j = 0; j < 30; j++)
+            {
+                MM_Wait(20);
+                REG_WR(pDevice, MacCtrl.Status, MAC_STATUS_SYNC_CHANGED |
+                    MAC_STATUS_CFG_CHANGED);
+                REG_RD_BACK(pDevice, MacCtrl.Status);
+                MM_Wait(20);
+                if ((REG_RD(pDevice, MacCtrl.Status) &
+                    (MAC_STATUS_SYNC_CHANGED | MAC_STATUS_CFG_CHANGED)) == 0)
+                    break;
+            }
+            if (pDevice->TbiFlags & TBI_POLLING_FLAGS)
+            {
+                Value32 = REG_RD(pDevice, MacCtrl.Status);
+                if (Value32 & MAC_STATUS_RECEIVING_CFG)
+                {
+                    pDevice->IgnoreTbiLinkChange = TRUE;
+                }
+                else if (pDevice->TbiFlags & TBI_POLLING_INTR_FLAG)
+                {
+                    pDevice->IgnoreTbiLinkChange = FALSE;
+                }
+            }
+            Value32 = REG_RD(pDevice, MacCtrl.Status);
+            if (CurrentLinkStatus == LM_STATUS_LINK_DOWN &&
+                 (Value32 & MAC_STATUS_PCS_SYNCED) &&
+                 ((Value32 & MAC_STATUS_RECEIVING_CFG) == 0))
+            {
+                CurrentLinkStatus = LM_STATUS_LINK_ACTIVE;
+            }
+        }
+        else
+        {
+            /* We are forcing line speed. */
+            pDevice->FlowControlCap &= ~LM_FLOW_CONTROL_AUTO_PAUSE;
+            LM_SetFlowControl(pDevice, 0, 0);
+
+            CurrentLinkStatus = LM_STATUS_LINK_ACTIVE;
+            REG_WR(pDevice, MacCtrl.Mode, pDevice->MacMode |
+                MAC_MODE_SEND_CONFIGS);
+        }
+    }
+    /* Set the link polarity bit. */
+    pDevice->MacMode &= ~MAC_MODE_LINK_POLARITY;
+    REG_WR(pDevice, MacCtrl.Mode, pDevice->MacMode);
+
+    pDevice->pStatusBlkVirt->Status = STATUS_BLOCK_UPDATED |
+        (pDevice->pStatusBlkVirt->Status & ~STATUS_BLOCK_LINK_CHANGED_STATUS);
+
+    for (j = 0; j < 100; j++)
+    {
+        REG_WR(pDevice, MacCtrl.Status, MAC_STATUS_SYNC_CHANGED |
+            MAC_STATUS_CFG_CHANGED);
+        REG_RD_BACK(pDevice, MacCtrl.Status);
+        MM_Wait(5);
+        if ((REG_RD(pDevice, MacCtrl.Status) &
+            (MAC_STATUS_SYNC_CHANGED | MAC_STATUS_CFG_CHANGED)) == 0)
+            break;
+    }
+
+    Value32 = REG_RD(pDevice, MacCtrl.Status);
+    if((Value32 & MAC_STATUS_PCS_SYNCED) == 0)
+    {
+        CurrentLinkStatus = LM_STATUS_LINK_DOWN;
+        if (pDevice->DisableAutoNeg == FALSE)
+        {
+            REG_WR(pDevice, MacCtrl.Mode, pDevice->MacMode |
+                MAC_MODE_SEND_CONFIGS);
+            REG_RD_BACK(pDevice, MacCtrl.Mode);
+            MM_Wait(1);
+            REG_WR(pDevice, MacCtrl.Mode, pDevice->MacMode);
+        }
+    }
+
+    /* Initialize the current link status. */
+    if(CurrentLinkStatus == LM_STATUS_LINK_ACTIVE)
+    {
+        pDevice->LineSpeed = LM_LINE_SPEED_1000MBPS;
+        pDevice->DuplexMode = LM_DUPLEX_MODE_FULL;
+        REG_WR(pDevice, MacCtrl.LedCtrl, pDevice->LedCtrl |
+            LED_CTRL_OVERRIDE_LINK_LED |
+            LED_CTRL_1000MBPS_LED_ON);
+    }
+    else
+    {
+        pDevice->LineSpeed = LM_LINE_SPEED_UNKNOWN;
+        pDevice->DuplexMode = LM_DUPLEX_MODE_UNKNOWN;
+        REG_WR(pDevice, MacCtrl.LedCtrl, pDevice->LedCtrl |
+            LED_CTRL_OVERRIDE_LINK_LED |
+            LED_CTRL_OVERRIDE_TRAFFIC_LED);
+    }
+
+    /* Indicate link status. */
+    if ((pDevice->LinkStatus != CurrentLinkStatus) ||
+        ((CurrentLinkStatus == LM_STATUS_LINK_ACTIVE) &&
+        (PreviousFlowControl != pDevice->FlowControl)))
+    {
+        pDevice->LinkStatus = CurrentLinkStatus;
+        MM_IndicateStatus(pDevice, CurrentLinkStatus);
+    }
+
+    return LM_STATUS_SUCCESS;
+}
+#endif /* INCLUDE_TBI_SUPPORT */
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+LM_STATUS
+LM_SetupCopperPhy(
+    PLM_DEVICE_BLOCK pDevice)
+{
+    LM_STATUS CurrentLinkStatus;
+    LM_UINT32 Value32;
+
+    /* Assume there is not link first. */
+    CurrentLinkStatus = LM_STATUS_LINK_DOWN;
+
+    /* Disable phy link change attention. */
+    REG_WR(pDevice, MacCtrl.MacEvent, 0);
+
+    /* Clear link change attention. */
+    REG_WR(pDevice, MacCtrl.Status, MAC_STATUS_SYNC_CHANGED |
+        MAC_STATUS_CFG_CHANGED | MAC_STATUS_MI_COMPLETION |
+        MAC_STATUS_LINK_STATE_CHANGED);
+
+    /* Disable auto-polling for the moment. */
+    pDevice->MiMode = 0xc0000;
+    REG_WR(pDevice, MacCtrl.MiMode, pDevice->MiMode);
+    REG_RD_BACK(pDevice, MacCtrl.MiMode);
+    MM_Wait(40);
+
+    /* Determine the requested line speed and duplex. */
+    pDevice->OldLineSpeed = pDevice->LineSpeed;
+    pDevice->LineSpeed = pDevice->RequestedLineSpeed;
+    pDevice->DuplexMode = pDevice->RequestedDuplexMode;
+
+    /* Set the phy to loopback mode. */
+    if ((pDevice->LoopBackMode == LM_PHY_LOOP_BACK_MODE) ||
+        (pDevice->LoopBackMode == LM_MAC_LOOP_BACK_MODE))
+    {
+        LM_ReadPhy(pDevice, PHY_CTRL_REG, &Value32);
+        if(!(Value32 & PHY_CTRL_LOOPBACK_MODE) &&
+            (pDevice->LoopBackMode == LM_PHY_LOOP_BACK_MODE))
+        {
+            /* Disable link change and PHY interrupts. */
+            REG_WR(pDevice, MacCtrl.MacEvent, 0);
+
+            /* Clear link change attention. */
+            REG_WR(pDevice, MacCtrl.Status, MAC_STATUS_SYNC_CHANGED |
+                MAC_STATUS_CFG_CHANGED);
+
+            LM_WritePhy(pDevice, PHY_CTRL_REG, 0x4140);
+            MM_Wait(40);
+
+            pDevice->MacMode &= ~MAC_MODE_LINK_POLARITY;
+            if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701 ||
+                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 ||
+                (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700 &&
+                (pDevice->PhyId & PHY_ID_MASK) == PHY_BCM5411_PHY_ID))
+            {
+                pDevice->MacMode |= MAC_MODE_LINK_POLARITY;
+            }
+
+            /* Prevent the interrupt handling from being called. */
+            pDevice->pStatusBlkVirt->Status = STATUS_BLOCK_UPDATED |
+                (pDevice->pStatusBlkVirt->Status &
+                ~STATUS_BLOCK_LINK_CHANGED_STATUS);
+
+            /* GMII interface. */
+            pDevice->MacMode &= ~MAC_MODE_PORT_MODE_MASK;
+            pDevice->MacMode |= MAC_MODE_PORT_MODE_GMII;
+            REG_WR(pDevice, MacCtrl.Mode, pDevice->MacMode);
+            REG_RD_BACK(pDevice, MacCtrl.Mode);
+            MM_Wait(40);
+
+            /* Configure PHY led mode. */
+            if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701 ||
+                (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700))
+            {
+                LM_WritePhy(pDevice, BCM540X_EXT_CTRL_REG, 
+                    BCM540X_EXT_CTRL_LINK3_LED_MODE);
+                MM_Wait(40);
+            }
+
+            if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700)
+            {
+                int j = 0;
+
+                while (REG_RD(pDevice, DmaWrite.Mode) & DMA_WRITE_MODE_ENABLE)
+                {
+                    MM_Wait(40);
+                    j++;
+                    if (j > 20)
+                        break;
+                }
+
+                Value32 = DMA_WRITE_MODE_ENABLE |
+                    DMA_WRITE_MODE_TARGET_ABORT_ATTN_ENABLE |
+                    DMA_WRITE_MODE_MASTER_ABORT_ATTN_ENABLE |
+                    DMA_WRITE_MODE_PARITY_ERROR_ATTN_ENABLE |
+                    DMA_WRITE_MODE_ADDR_OVERFLOW_ATTN_ENABLE |
+                    DMA_WRITE_MODE_FIFO_OVERRUN_ATTN_ENABLE |
+                    DMA_WRITE_MODE_FIFO_UNDERRUN_ATTN_ENABLE |
+                    DMA_WRITE_MODE_FIFO_OVERREAD_ATTN_ENABLE |
+                    DMA_WRITE_MODE_LONG_READ_ATTN_ENABLE;
+                REG_WR(pDevice, DmaWrite.Mode, Value32);
+            }
+        }
+
+        pDevice->LinkStatus = LM_STATUS_LINK_ACTIVE;
+        MM_IndicateStatus(pDevice, LM_STATUS_LINK_ACTIVE);
+
+        return LM_STATUS_SUCCESS;
+    }
+
+    LM_ReadPhy(pDevice, PHY_CTRL_REG, &Value32);
+    if(Value32 & PHY_CTRL_LOOPBACK_MODE)
+    {
+        CurrentLinkStatus = LM_STATUS_LINK_DOWN;
+
+        /* Re-enable link change interrupt.  This was disabled when we */
+        /* enter loopback mode. */
+        if(pDevice->PhyIntMode == T3_PHY_INT_MODE_MI_INTERRUPT)
+        {
+            REG_WR(pDevice, MacCtrl.MacEvent, MAC_EVENT_ENABLE_MI_INTERRUPT);
+        }
+        else
+        {
+            REG_WR(pDevice, MacCtrl.MacEvent, 
+                MAC_EVENT_ENABLE_LINK_STATE_CHANGED_ATTN);
+        }
+    }
+    else
+    {
+        /* Initialize the phy chip. */
+        CurrentLinkStatus = LM_InitBcm540xPhy(pDevice);
+    }
+
+    if(CurrentLinkStatus == LM_STATUS_LINK_SETTING_MISMATCH)
+    {
+        CurrentLinkStatus = LM_STATUS_LINK_DOWN;
+    }
+    
+    /* Setup flow control. */
+    pDevice->FlowControl = LM_FLOW_CONTROL_NONE;
+    if(CurrentLinkStatus == LM_STATUS_LINK_ACTIVE)
+    {
+        LM_FLOW_CONTROL FlowCap;     /* Flow control capability. */
+
+        FlowCap = LM_FLOW_CONTROL_NONE;
+
+        if(pDevice->DuplexMode == LM_DUPLEX_MODE_FULL)
+        {
+            if(pDevice->DisableAutoNeg == FALSE ||
+                pDevice->RequestedLineSpeed == LM_LINE_SPEED_AUTO)
+            {
+                LM_UINT32 ExpectedPhyAd;
+                LM_UINT32 LocalPhyAd;
+                LM_UINT32 RemotePhyAd;
+
+                LM_ReadPhy(pDevice, PHY_AN_AD_REG, &LocalPhyAd);
+		pDevice->advertising = LocalPhyAd;
+                LocalPhyAd &= (PHY_AN_AD_ASYM_PAUSE | PHY_AN_AD_PAUSE_CAPABLE);
+
+                ExpectedPhyAd = GetPhyAdFlowCntrlSettings(pDevice);
+
+                if(LocalPhyAd != ExpectedPhyAd)
+                {
+                    CurrentLinkStatus = LM_STATUS_LINK_DOWN;
+                }
+                else
+                {
+                    LM_ReadPhy(pDevice, PHY_LINK_PARTNER_ABILITY_REG,
+                        &RemotePhyAd);
+
+                    LM_SetFlowControl(pDevice, LocalPhyAd, RemotePhyAd);
+                }
+            }
+            else
+            {
+                pDevice->FlowControlCap &= ~LM_FLOW_CONTROL_AUTO_PAUSE;
+                LM_SetFlowControl(pDevice, 0, 0);
+            }
+        }
+    }
+
+    if(CurrentLinkStatus == LM_STATUS_LINK_DOWN)
+    {
+        LM_ForceAutoNeg(pDevice);
+
+        /* If we force line speed, we make get link right away. */
+        LM_ReadPhy(pDevice, PHY_STATUS_REG, &Value32);
+        LM_ReadPhy(pDevice, PHY_STATUS_REG, &Value32);
+        if(Value32 & PHY_STATUS_LINK_PASS)
+        {
+            CurrentLinkStatus = LM_STATUS_LINK_ACTIVE;
+        }
+    }
+
+    /* GMII interface. */
+    pDevice->MacMode &= ~MAC_MODE_PORT_MODE_MASK;
+    if(CurrentLinkStatus == LM_STATUS_LINK_ACTIVE)
+    {
+        if(pDevice->LineSpeed == LM_LINE_SPEED_100MBPS ||
+            pDevice->LineSpeed == LM_LINE_SPEED_10MBPS)
+        {
+            pDevice->MacMode |= MAC_MODE_PORT_MODE_MII;
+        }
+        else
+        {
+            pDevice->MacMode |= MAC_MODE_PORT_MODE_GMII;
+        }
+    }
+    else {
+        pDevice->MacMode |= MAC_MODE_PORT_MODE_GMII;
+    }
+
+    /* Set the MAC to operate in the appropriate duplex mode. */
+    pDevice->MacMode &= ~MAC_MODE_HALF_DUPLEX;
+    if(pDevice->DuplexMode == LM_DUPLEX_MODE_HALF)
+    {
+        pDevice->MacMode |= MAC_MODE_HALF_DUPLEX;
+    }
+
+    /* Set the link polarity bit. */
+    pDevice->MacMode &= ~MAC_MODE_LINK_POLARITY;
+    if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700)
+    {
+        if((pDevice->LedCtrl == LED_CTRL_PHY_MODE_2) ||
+             (CurrentLinkStatus == LM_STATUS_LINK_ACTIVE &&
+             pDevice->LineSpeed == LM_LINE_SPEED_10MBPS))
+        {
+            pDevice->MacMode |= MAC_MODE_LINK_POLARITY;
+        }
+    }
+    else
+    {
+        if (CurrentLinkStatus == LM_STATUS_LINK_ACTIVE)
+        {
+            pDevice->MacMode |= MAC_MODE_LINK_POLARITY;
+        }
+    }
+
+    REG_WR(pDevice, MacCtrl.Mode, pDevice->MacMode);
+
+    /* Enable auto polling. */
+    if(pDevice->PhyIntMode == T3_PHY_INT_MODE_AUTO_POLLING)
+    {
+        pDevice->MiMode |= MI_MODE_AUTO_POLLING_ENABLE;
+        REG_WR(pDevice, MacCtrl.MiMode, pDevice->MiMode);
+    }
+    /* if using MAC led mode and not using auto polling, need to configure */
+    /* mi status register */
+    else if ((pDevice->LedCtrl &
+            (LED_CTRL_PHY_MODE_1 | LED_CTRL_PHY_MODE_2)) == 0)
+    {
+        if (CurrentLinkStatus != LM_STATUS_LINK_ACTIVE)
+        {
+            REG_WR(pDevice, MacCtrl.MiStatus, 0);
+        }
+        else if (pDevice->LineSpeed == LM_LINE_SPEED_10MBPS)
+        {
+            REG_WR(pDevice, MacCtrl.MiStatus,
+                MI_STATUS_ENABLE_LINK_STATUS_ATTN | MI_STATUS_10MBPS);
+        }
+        else
+        {
+            REG_WR(pDevice, MacCtrl.MiStatus,
+                MI_STATUS_ENABLE_LINK_STATUS_ATTN);
+        }
+    }
+
+    /* Enable phy link change attention. */
+    if(pDevice->PhyIntMode == T3_PHY_INT_MODE_MI_INTERRUPT)
+    {
+        REG_WR(pDevice, MacCtrl.MacEvent, MAC_EVENT_ENABLE_MI_INTERRUPT);
+    }
+    else
+    {
+        REG_WR(pDevice, MacCtrl.MacEvent, 
+            MAC_EVENT_ENABLE_LINK_STATE_CHANGED_ATTN);
+    }
+    if ((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700) &&
+        (CurrentLinkStatus == LM_STATUS_LINK_ACTIVE) &&
+        (pDevice->LineSpeed == LM_LINE_SPEED_1000MBPS) &&
+        (((pDevice->PciState & T3_PCI_STATE_CONVENTIONAL_PCI_MODE) &&
+          (pDevice->PciState & T3_PCI_STATE_BUS_SPEED_HIGH)) ||
+         !(pDevice->PciState & T3_PCI_STATE_CONVENTIONAL_PCI_MODE)))
+    {
+        MM_Wait(120);
+        REG_WR(pDevice, MacCtrl.Status, MAC_STATUS_SYNC_CHANGED |
+            MAC_STATUS_CFG_CHANGED);
+        MEM_WR_OFFSET(pDevice, T3_FIRMWARE_MAILBOX,
+            T3_MAGIC_NUM_DISABLE_DMAW_ON_LINK_CHANGE);
+    }
+
+    /* Indicate link status. */
+    if (pDevice->LinkStatus != CurrentLinkStatus) {
+        pDevice->LinkStatus = CurrentLinkStatus;
+        MM_IndicateStatus(pDevice, CurrentLinkStatus);
+    }
+
+    return LM_STATUS_SUCCESS;
+} /* LM_SetupCopperPhy */
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+LM_STATUS
+LM_SetupPhy(
+    PLM_DEVICE_BLOCK pDevice)
+{
+    LM_STATUS LmStatus;
+    LM_UINT32 Value32;
+
+#if INCLUDE_TBI_SUPPORT
+    if (pDevice->TbiFlags & ENABLE_TBI_FLAG)
+    {
+        LmStatus = LM_SetupFiberPhy(pDevice);
+    }
+    else
+#endif /* INCLUDE_TBI_SUPPORT */
+    {
+        LmStatus = LM_SetupCopperPhy(pDevice);
+    }
+    if (pDevice->ChipRevId == T3_CHIP_ID_5704_A0)
+    {
+        if (!(pDevice->PciState & T3_PCI_STATE_CONVENTIONAL_PCI_MODE))
+        {
+            Value32 = REG_RD(pDevice, PciCfg.PciState);
+            REG_WR(pDevice, PciCfg.PciState,
+                Value32 | T3_PCI_STATE_RETRY_SAME_DMA);
+        }
+    }
+    if ((pDevice->LineSpeed == LM_LINE_SPEED_1000MBPS) &&
+        (pDevice->DuplexMode == LM_DUPLEX_MODE_HALF))
+    {
+        REG_WR(pDevice, MacCtrl.TxLengths, 0x26ff);
+    }
+    else
+    {
+        REG_WR(pDevice, MacCtrl.TxLengths, 0x2620);
+    }
+    if(!T3_ASIC_5705_OR_5750(pDevice->ChipRevId))
+    {
+        if (pDevice->LinkStatus == LM_STATUS_LINK_DOWN)
+        {
+            REG_WR(pDevice, HostCoalesce.StatsCoalescingTicks, 0);
+        }
+        else
+        {
+            REG_WR(pDevice, HostCoalesce.StatsCoalescingTicks,
+                pDevice->StatsCoalescingTicks);
+        }
+    }
+
+    return LmStatus;
+}
+
+
+/* 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;
+
+    if (pDevice->PhyFlags & PHY_CHECK_TAPS_AFTER_RESET)
+    {
+        LM_ResetPhy_5703_4_5(pDevice, 5, 1);
+    }
+    else
+    {
+        LM_WritePhy(pDevice, PHY_CTRL_REG, PHY_CTRL_PHY_RESET);
+
+        for(j = 0; j < 100; j++)
+        {
+            MM_Wait(10);
+
+            LM_ReadPhy(pDevice, PHY_CTRL_REG, &miireg);
+            if(miireg && !(miireg & PHY_CTRL_PHY_RESET))
+            {
+                MM_Wait(20);
+                break;
+            }
+        }
+        LM_PhyTapPowerMgmt(pDevice);
+    }
+    if (pDevice->PhyFlags & PHY_ADC_FIX)
+    {
+        LM_WritePhy(pDevice, 0x18, 0x0c00);
+        LM_WritePhy(pDevice, 0x17, 0x201f);
+        LM_WritePhy(pDevice, 0x15, 0x2aaa);
+        LM_WritePhy(pDevice, 0x17, 0x000a);
+        LM_WritePhy(pDevice, 0x15, 0x0323);
+        LM_WritePhy(pDevice, 0x18, 0x0400);
+    }
+    if (pDevice->PhyFlags & PHY_5705_5750_FIX)
+    {
+        LM_WritePhy(pDevice, 0x18, 0x0c00);
+        LM_WritePhy(pDevice, 0x17, 0x000a);
+        LM_WritePhy(pDevice, 0x15, 0x310b);
+        LM_WritePhy(pDevice, 0x17, 0x201f);
+        LM_WritePhy(pDevice, 0x15, 0x9506);
+        LM_WritePhy(pDevice, 0x17, 0x401f);
+        LM_WritePhy(pDevice, 0x15, 0x14e2);
+        LM_WritePhy(pDevice, 0x18, 0x0400);
+    }
+    if (pDevice->PhyFlags & PHY_5704_A0_FIX)
+    {
+        LM_WritePhy(pDevice, 0x1c, 0x8d68);
+        LM_WritePhy(pDevice, 0x1c, 0x8d68);
+    }
+    if ((pDevice->PhyId & PHY_ID_MASK) == PHY_BCM5401_PHY_ID)
+    {
+        LM_WritePhy(pDevice, BCM5401_AUX_CTRL, 0x4c20);
+    }
+    else if (!T3_ASIC_5705_OR_5750(pDevice->ChipRevId))
+    {
+        LM_WritePhy(pDevice, BCM5401_AUX_CTRL, 0x0007);
+        LM_ReadPhy(pDevice, BCM5401_AUX_CTRL, &miireg);
+        miireg |= 0x4000;    /* set extended packet length */
+        LM_WritePhy(pDevice, BCM5401_AUX_CTRL, miireg);
+    }
+
+    LM_SetEthWireSpeed(pDevice);
+}
+
+STATIC LM_VOID
+LM_SetEthWireSpeed(LM_DEVICE_BLOCK *pDevice)
+{
+    LM_UINT32 Value32;
+
+    /* Enable Ethernet@WireSpeed. */
+    if (pDevice->PhyFlags & PHY_ETHERNET_WIRESPEED)
+    {
+        LM_WritePhy(pDevice, 0x18, 0x7007);
+        LM_ReadPhy(pDevice, 0x18, &Value32);
+        LM_WritePhy(pDevice, 0x18, Value32 | BIT_15 | BIT_4);
+    }
+}
+
+STATIC LM_STATUS
+LM_PhyAdvertiseAll(LM_DEVICE_BLOCK *pDevice)
+{
+    LM_UINT32 miireg;
+
+    LM_ReadPhy(pDevice, PHY_AN_AD_REG, &miireg);
+    pDevice->advertising = miireg;
+    if ((miireg & PHY_AN_AD_ALL_SPEEDS) != PHY_AN_AD_ALL_SPEEDS)
+    {
+        return LM_STATUS_FAILURE;
+    }
+    if (!(pDevice->PhyFlags & PHY_NO_GIGABIT))
+    {
+        LM_ReadPhy(pDevice, BCM540X_1000BASET_CTRL_REG, &miireg);
+        pDevice->advertising1000 = miireg;
+        if ((miireg & BCM540X_AN_AD_ALL_1G_SPEEDS) !=
+            BCM540X_AN_AD_ALL_1G_SPEEDS)
+        {
+            return LM_STATUS_FAILURE;
+        }
+    }
+    return LM_STATUS_SUCCESS;
+}
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+LM_VOID
+LM_ReadPhy(
+PLM_DEVICE_BLOCK pDevice,
+LM_UINT32 PhyReg,
+PLM_UINT32 pData32) {
+    LM_UINT32 Value32;
+    LM_UINT32 j;
+
+    if(pDevice->PhyIntMode == T3_PHY_INT_MODE_AUTO_POLLING)
+    {
+        REG_WR(pDevice, MacCtrl.MiMode, pDevice->MiMode &
+            ~MI_MODE_AUTO_POLLING_ENABLE);
+        REG_RD_BACK(pDevice, MacCtrl.MiMode);
+        MM_Wait(40);
+    }
+
+    Value32 = (pDevice->PhyAddr << MI_COM_FIRST_PHY_ADDR_BIT) |
+        ((PhyReg & MI_COM_PHY_REG_ADDR_MASK) << MI_COM_FIRST_PHY_REG_ADDR_BIT) |
+        MI_COM_CMD_READ | MI_COM_START;
+
+    REG_WR(pDevice, MacCtrl.MiCom, Value32);
+    
+    for(j = 0; j < 200; j++)
+    {
+        MM_Wait(1);
+
+        Value32 = REG_RD(pDevice, MacCtrl.MiCom);
+
+        if(!(Value32 & MI_COM_BUSY))
+        {
+            MM_Wait(5);
+            Value32 = REG_RD(pDevice, MacCtrl.MiCom);
+            Value32 &= MI_COM_PHY_DATA_MASK;
+            break;
+        }
+    }
+
+    if(Value32 & MI_COM_BUSY)
+    {
+        Value32 = 0;
+    }
+
+    *pData32 = Value32;
+
+    if(pDevice->PhyIntMode == T3_PHY_INT_MODE_AUTO_POLLING)
+    {
+        REG_WR(pDevice, MacCtrl.MiMode, pDevice->MiMode);
+        REG_RD_BACK(pDevice, MacCtrl.MiMode);
+        MM_Wait(40);
+    }
+} /* LM_ReadPhy */
+
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+LM_VOID
+LM_WritePhy(
+PLM_DEVICE_BLOCK pDevice,
+LM_UINT32 PhyReg,
+LM_UINT32 Data32) {
+    LM_UINT32 Value32;
+    LM_UINT32 j;
+
+    if(pDevice->PhyIntMode == T3_PHY_INT_MODE_AUTO_POLLING)
+    {
+        REG_WR(pDevice, MacCtrl.MiMode, pDevice->MiMode &
+            ~MI_MODE_AUTO_POLLING_ENABLE);
+        REG_RD_BACK(pDevice, MacCtrl.MiMode);
+        MM_Wait(40);
+    }
+
+    Value32 = (pDevice->PhyAddr << MI_COM_FIRST_PHY_ADDR_BIT) |
+        ((PhyReg & MI_COM_PHY_REG_ADDR_MASK) << MI_COM_FIRST_PHY_REG_ADDR_BIT) |
+        (Data32 & MI_COM_PHY_DATA_MASK) | MI_COM_CMD_WRITE | MI_COM_START;
+
+    REG_WR(pDevice, MacCtrl.MiCom, Value32);
+    
+    for(j = 0; j < 200; j++)
+    {
+        MM_Wait(1);
+
+        Value32 = REG_RD(pDevice, MacCtrl.MiCom);
+
+        if(!(Value32 & MI_COM_BUSY))
+        {
+            MM_Wait(5);
+            break;
+        }
+    }
+
+    if(pDevice->PhyIntMode == T3_PHY_INT_MODE_AUTO_POLLING)
+    {
+        REG_WR(pDevice, MacCtrl.MiMode, pDevice->MiMode);
+        REG_RD_BACK(pDevice, MacCtrl.MiMode);
+        MM_Wait(40);
+    }
+} /* LM_WritePhy */
+
+STATIC void
+LM_GetPhyId(LM_DEVICE_BLOCK *pDevice)
+{
+    LM_UINT32 Value32;
+
+    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);
+}
+
+LM_STATUS
+LM_EnableMacLoopBack(PLM_DEVICE_BLOCK pDevice)
+{
+    pDevice->LoopBackMode = LM_MAC_LOOP_BACK_MODE;
+    pDevice->MacMode &= ~MAC_MODE_PORT_MODE_MASK;
+    pDevice->MacMode |= MAC_MODE_PORT_INTERNAL_LOOPBACK |
+        MAC_MODE_LINK_POLARITY | MAC_MODE_PORT_MODE_GMII;
+    REG_WR(pDevice, MacCtrl.Mode, pDevice->MacMode);
+    LM_SetupPhy(pDevice);
+    return LM_STATUS_SUCCESS;
+}
+
+LM_STATUS
+LM_DisableMacLoopBack(PLM_DEVICE_BLOCK pDevice)
+{
+    pDevice->LoopBackMode = 0;
+    pDevice->MacMode &= ~(MAC_MODE_PORT_INTERNAL_LOOPBACK |
+        MAC_MODE_LINK_POLARITY | MAC_MODE_PORT_MODE_MASK);
+    REG_WR(pDevice, MacCtrl.Mode, pDevice->MacMode);
+    LM_SetupPhy(pDevice);
+    return LM_STATUS_SUCCESS;
+}
+
+LM_STATUS
+LM_EnablePhyLoopBack(PLM_DEVICE_BLOCK pDevice)
+{
+    pDevice->LoopBackMode = LM_PHY_LOOP_BACK_MODE;
+    LM_SetupPhy(pDevice);
+    return LM_STATUS_SUCCESS;
+}
+
+LM_STATUS
+LM_DisablePhyLoopBack(PLM_DEVICE_BLOCK pDevice)
+{
+    pDevice->LoopBackMode = 0;
+    LM_SetupPhy(pDevice);
+    return LM_STATUS_SUCCESS;
+}
+
+LM_STATUS
+LM_EnableExtLoopBack(PLM_DEVICE_BLOCK pDevice, LM_LINE_SPEED LineSpeed)
+{
+    pDevice->LoopBackMode = LM_EXT_LOOP_BACK_MODE;
+
+    pDevice->SavedDisableAutoNeg = pDevice->DisableAutoNeg;
+    pDevice->SavedRequestedLineSpeed = pDevice->RequestedLineSpeed;
+    pDevice->SavedRequestedDuplexMode = pDevice->RequestedDuplexMode;
+
+    pDevice->DisableAutoNeg = TRUE;
+    pDevice->RequestedLineSpeed = LineSpeed;
+    pDevice->RequestedDuplexMode = LM_DUPLEX_MODE_FULL;
+    LM_SetupPhy(pDevice);
+    return LM_STATUS_SUCCESS;
+}
+
+LM_STATUS
+LM_DisableExtLoopBack(PLM_DEVICE_BLOCK pDevice)
+{
+    pDevice->LoopBackMode = 0;
+
+    pDevice->DisableAutoNeg = pDevice->SavedDisableAutoNeg;
+    pDevice->RequestedLineSpeed = pDevice->SavedRequestedLineSpeed;
+    pDevice->RequestedDuplexMode = pDevice->SavedRequestedDuplexMode;
+
+    LM_SetupPhy(pDevice);
+    return LM_STATUS_SUCCESS;
+}
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+LM_STATUS
+LM_SetPowerState(
+PLM_DEVICE_BLOCK pDevice,
+LM_POWER_STATE PowerLevel)
+{
+#ifdef BCM_WOL
+    LM_UINT32 PmeSupport;
+    PLM_DEVICE_BLOCK pDevice2 = 0;
+    int j;
+#endif
+    LM_UINT32 Value32;
+    LM_UINT32 PmCtrl;
+
+    /* make sureindirect accesses are enabled*/
+    MM_WriteConfig32(pDevice, T3_PCI_MISC_HOST_CTRL_REG, pDevice->MiscHostCtrl);
+
+    /* Clear the PME_ASSERT bit and the power state bits.  Also enable */
+    /* the PME bit. */
+    MM_ReadConfig32(pDevice, T3_PCI_PM_STATUS_CTRL_REG, &PmCtrl);
+
+    PmCtrl |= T3_PM_PME_ASSERTED;
+    PmCtrl &= ~T3_PM_POWER_STATE_MASK;
+
+    /* Set the appropriate power state. */
+    if(PowerLevel == LM_POWER_STATE_D0)
+    {
+
+        /* Bring the card out of low power mode. */
+        PmCtrl |= T3_PM_POWER_STATE_D0;
+        MM_WriteConfig32(pDevice, T3_PCI_PM_STATUS_CTRL_REG, PmCtrl);
+
+        Value32 = REG_RD(pDevice, Grc.LocalCtrl);
+        RAW_REG_WR(pDevice, Grc.LocalCtrl, Value32 &
+            ~(GRC_MISC_LOCAL_CTRL_GPIO_OE0 | 
+              GRC_MISC_LOCAL_CTRL_GPIO_OE1 |
+              GRC_MISC_LOCAL_CTRL_GPIO_OE2 |
+              GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT0 |
+              GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT1 |
+              GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT2));
+
+        MM_Wait(40);    /* Required delay is about 20us. */
+
+        pDevice->PowerLevel = PowerLevel;
+        return LM_STATUS_SUCCESS;
+    }
+#ifdef BCM_WOL
+    else if(PowerLevel == LM_POWER_STATE_D1)
+    {
+        PmCtrl |= T3_PM_POWER_STATE_D1;
+    }
+    else if(PowerLevel == LM_POWER_STATE_D2)
+    {
+        PmCtrl |= T3_PM_POWER_STATE_D2;
+    }
+    else if(PowerLevel == LM_POWER_STATE_D3)
+    {
+        PmCtrl |= T3_PM_POWER_STATE_D3;
+    }
+    else
+    {
+        return LM_STATUS_FAILURE;
+    }
+    PmCtrl |= T3_PM_PME_ENABLE;
+
+    /* Mask out all interrupts so LM_SetupPhy won't be called while we are */
+    /* setting new line speed. */
+    Value32 = REG_RD(pDevice, PciCfg.MiscHostCtrl);
+    REG_WR(pDevice, PciCfg.MiscHostCtrl, Value32 | MISC_HOST_CTRL_MASK_PCI_INT);
+
+    if(!pDevice->RestoreOnWakeUp)
+    {
+        pDevice->RestoreOnWakeUp = TRUE;
+        pDevice->WakeUpDisableAutoNeg = pDevice->DisableAutoNeg;
+        pDevice->WakeUpRequestedLineSpeed = pDevice->RequestedLineSpeed;
+        pDevice->WakeUpRequestedDuplexMode = pDevice->RequestedDuplexMode;
+    }
+
+    /* Force auto-negotiation to 10 line speed. */
+    pDevice->DisableAutoNeg = FALSE;
+
+    if (!(pDevice->TbiFlags & ENABLE_TBI_FLAG))
+    {
+        pDevice->RequestedLineSpeed = LM_LINE_SPEED_10MBPS;
+        LM_SetupPhy(pDevice);
+    }
+
+    /* Put the driver in the initial state, and go through the power down */
+    /* sequence. */
+    LM_DoHalt(pDevice);
+
+    if (!(pDevice->AsfFlags & ASF_ENABLED))
+    {
+        for(j = 0; j < 20000; j++)
+        {
+            MM_Wait(10);
+
+            Value32 = MEM_RD_OFFSET(pDevice, T3_ASF_FW_STATUS_MAILBOX);
+            if(Value32 == ~T3_MAGIC_NUM_FIRMWARE_INIT_DONE)
+            {
+                break;
+            }
+        }
+    }
+
+    MEM_WR_OFFSET(pDevice, DRV_WOL_MAILBOX, DRV_WOL_SIGNATURE |
+        DRV_DOWN_STATE_SHUTDOWN | 0x2 | DRV_WOL_SET_MAGIC_PKT);
+
+    MM_ReadConfig32(pDevice, T3_PCI_PM_CAP_REG, &PmeSupport);
+
+    if (pDevice->WakeUpModeCap != LM_WAKE_UP_MODE_NONE)
+    {
+
+        /* Enable WOL. */
+        if (!(pDevice->TbiFlags & ENABLE_TBI_FLAG))
+        {
+            LM_WritePhy(pDevice, BCM5401_AUX_CTRL, 0x5a);
+            MM_Wait(40);
+        }
+
+        if (T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5750)
+        {
+            /* Let boot code deal with LED mode on shasta */
+            REG_WR(pDevice, MacCtrl.LedCtrl, pDevice->LedCtrl);
+        }
+
+        if (pDevice->TbiFlags & ENABLE_TBI_FLAG)
+        {
+            Value32 = MAC_MODE_PORT_MODE_TBI;
+        }
+        else
+        {
+            Value32 = MAC_MODE_PORT_MODE_MII;
+            if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700)
+            {
+                if(pDevice->LedCtrl == LED_CTRL_PHY_MODE_2 ||
+                    pDevice->WolSpeed == WOL_SPEED_10MB)
+                {
+                    Value32 |= MAC_MODE_LINK_POLARITY;
+                }
+            }
+            else
+            {
+                Value32 |= MAC_MODE_LINK_POLARITY;
+            }
+        }
+        REG_WR(pDevice, MacCtrl.Mode, Value32);
+        REG_RD_BACK(pDevice, MacCtrl.Mode);
+        MM_Wait(40); MM_Wait(40); MM_Wait(40);
+
+        /* Always enable magic packet wake-up if we have vaux. */
+        if((PmeSupport & T3_PCI_PM_CAP_PME_D3COLD) && 
+            (pDevice->WakeUpModeCap & LM_WAKE_UP_MODE_MAGIC_PACKET))
+        {
+            Value32 |= MAC_MODE_DETECT_MAGIC_PACKET_ENABLE;
+        }
+
+#ifdef BCM_ASF
+        if (pDevice->AsfFlags & ASF_ENABLED)
+        {
+            Value32 &= ~MAC_MODE_ACPI_POWER_ON_ENABLE;
+        }
+#endif
+        REG_WR(pDevice, MacCtrl.Mode, Value32);
+
+        /* Enable the receiver. */
+        REG_WR(pDevice, MacCtrl.RxMode, RX_MODE_ENABLE);
+    }
+    else if (!(pDevice->AsfFlags & ASF_ENABLED))
+    {
+        if (pDevice->TbiFlags & ENABLE_TBI_FLAG)
+        {
+            REG_WR(pDevice, MacCtrl.LedCtrl, LED_CTRL_OVERRIDE_LINK_LED |
+                LED_CTRL_OVERRIDE_TRAFFIC_LED);
+        }
+        else
+        {
+            LM_WritePhy(pDevice, BCM540X_EXT_CTRL_REG,
+                BCM540X_EXT_CTRL_FORCE_LED_OFF);
+            LM_WritePhy(pDevice, 0x18, 0x01b2);
+            if ((T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5700) &&
+                (T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5704) &&
+                (T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5705))
+            {
+                LM_WritePhy(pDevice, PHY_CTRL_REG, PHY_CTRL_LOWER_POWER_MODE);
+            }
+        }
+    }
+
+    /* Disable tx/rx clocks, and select an alternate clock. */
+    if ((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700) ||
+        ((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701) &&
+        (pDevice->WolSpeed == WOL_SPEED_10MB)))
+    {
+        Value32 = T3_PCI_DISABLE_RX_CLOCK | T3_PCI_DISABLE_TX_CLOCK |
+            T3_PCI_SELECT_ALTERNATE_CLOCK |
+            T3_PCI_POWER_DOWN_PCI_PLL133;
+
+        REG_WR(pDevice, PciCfg.ClockCtrl, pDevice->ClockCtrl | Value32);
+    }
+    /* ASF on 5750 will not run properly on slow core clock */
+    else if (!((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5750) &&
+        (pDevice->AsfFlags & ASF_ENABLED)))
+    {
+        if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701)
+        {
+            Value32 = T3_PCI_DISABLE_RX_CLOCK | T3_PCI_DISABLE_TX_CLOCK |
+                T3_PCI_SELECT_ALTERNATE_CLOCK;
+        }
+        else if (T3_ASIC_5705_OR_5750(pDevice->ChipRevId))
+        {
+            Value32 = T3_PCI_625_CORE_CLOCK;
+        }
+        else
+        {
+            Value32 = T3_PCI_SELECT_ALTERNATE_CLOCK;
+        }
+        RAW_REG_WR(pDevice, PciCfg.ClockCtrl, pDevice->ClockCtrl | Value32);
+
+        MM_Wait(40);
+
+        if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700 ||
+            T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701)
+        {
+            Value32 = T3_PCI_DISABLE_RX_CLOCK | T3_PCI_DISABLE_TX_CLOCK |
+                T3_PCI_SELECT_ALTERNATE_CLOCK | T3_PCI_44MHZ_CORE_CLOCK;
+        }
+        else if (T3_ASIC_5705_OR_5750(pDevice->ChipRevId))
+        {
+            Value32 = T3_PCI_SELECT_ALTERNATE_CLOCK | T3_PCI_625_CORE_CLOCK;
+        }
+        else
+        {
+            Value32 = T3_PCI_SELECT_ALTERNATE_CLOCK | T3_PCI_44MHZ_CORE_CLOCK;
+        }
+
+        RAW_REG_WR(pDevice, PciCfg.ClockCtrl, pDevice->ClockCtrl | Value32);
+
+        if (!T3_ASIC_5705_OR_5750(pDevice->ChipRevId))
+        {
+            MM_Wait(40);
+
+            if(T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700 ||
+                T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701)
+            {
+                Value32 = T3_PCI_DISABLE_RX_CLOCK | T3_PCI_DISABLE_TX_CLOCK |
+                    T3_PCI_44MHZ_CORE_CLOCK;
+            }
+            else
+            {
+                Value32 = T3_PCI_44MHZ_CORE_CLOCK;
+            }
+
+            RAW_REG_WR(pDevice, PciCfg.ClockCtrl, pDevice->ClockCtrl | Value32);
+        }
+    }
+
+    MM_Wait(40);
+
+    if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5704)
+    {
+        pDevice2 = MM_FindPeerDev(pDevice);
+    }
+    if (!(pDevice->Flags & EEPROM_WP_FLAG))
+    {
+        LM_SwitchVaux(pDevice, pDevice2);
+    }
+
+    LM_WritePostResetSignatures(pDevice, LM_SHUTDOWN_RESET);
+
+    /* Set the phy to low power mode. */
+    /* Put the the hardware in low power mode. */
+    if (!(pDevice->Flags & DISABLE_D3HOT_FLAG))
+    {
+        MM_WriteConfig32(pDevice, T3_PCI_PM_STATUS_CTRL_REG, PmCtrl);
+    }
+
+    pDevice->PowerLevel = PowerLevel;
+
+#else
+    LM_WritePostResetSignatures(pDevice, LM_SHUTDOWN_RESET);
+#endif /* BCM_WOL */
+
+    return LM_STATUS_SUCCESS;
+} /* LM_SetPowerState */
+
+
+LM_VOID
+LM_SwitchVaux(PLM_DEVICE_BLOCK pDevice, PLM_DEVICE_BLOCK pDevice2)
+{
+    pDevice->GrcLocalCtrl &= ~(GRC_MISC_LOCAL_CTRL_GPIO_OE0 |
+                               GRC_MISC_LOCAL_CTRL_GPIO_OE1 |
+                               GRC_MISC_LOCAL_CTRL_GPIO_OE2 |
+                               GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT0 |
+                               GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT1 |
+                               GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT2);
+
+    /* Switch adapter to auxilliary power if WOL enabled */
+    if ((pDevice->WakeUpModeCap != LM_WAKE_UP_MODE_NONE) ||
+        (pDevice->AsfFlags & ASF_ENABLED) ||
+        (pDevice2 && ((pDevice2->WakeUpModeCap != LM_WAKE_UP_MODE_NONE) ||
+        (pDevice2->AsfFlags & ASF_ENABLED))))
+    {
+        if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700 ||
+            T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5701)
+        {
+            /* GPIO0 = 1, GPIO1 = 1, GPIO2 = 0. */
+            RAW_REG_WR(pDevice, Grc.LocalCtrl, pDevice->GrcLocalCtrl |
+                GRC_MISC_LOCAL_CTRL_GPIO_OE0 |
+                GRC_MISC_LOCAL_CTRL_GPIO_OE1 |
+                GRC_MISC_LOCAL_CTRL_GPIO_OE2 | 
+                GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT0 |
+                GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT1);
+            MM_Wait(40);
+        }
+        else
+        {
+            if (pDevice2 && pDevice2->InitDone)
+            {
+                return;
+            }
+
+            /* GPIO0 = 0, GPIO1 = 1, GPIO2 = 1. */
+            RAW_REG_WR(pDevice, Grc.LocalCtrl, pDevice->GrcLocalCtrl |
+                GRC_MISC_LOCAL_CTRL_GPIO_OE0 |
+                GRC_MISC_LOCAL_CTRL_GPIO_OE1 |
+                GRC_MISC_LOCAL_CTRL_GPIO_OE2 | 
+                GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT1 | 
+                GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT2);
+            MM_Wait(40);
+
+            /* GPIO0 = 1, GPIO1 = 1, GPIO2 = 1. */
+            RAW_REG_WR(pDevice, Grc.LocalCtrl, pDevice->GrcLocalCtrl |
+                GRC_MISC_LOCAL_CTRL_GPIO_OE0 |
+                GRC_MISC_LOCAL_CTRL_GPIO_OE1 |
+                GRC_MISC_LOCAL_CTRL_GPIO_OE2 | 
+                GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT0 |
+                GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT1 |
+                GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT2);
+            MM_Wait(40);
+
+            /* GPIO0 = 1, GPIO1 = 1, GPIO2 = 0. */
+            RAW_REG_WR(pDevice, Grc.LocalCtrl, pDevice->GrcLocalCtrl |
+                GRC_MISC_LOCAL_CTRL_GPIO_OE0 | 
+                GRC_MISC_LOCAL_CTRL_GPIO_OE1 |
+                GRC_MISC_LOCAL_CTRL_GPIO_OE2 | 
+                GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT0 |
+                GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT1);
+            MM_Wait(40);
+        }
+    }
+    else /* WOL disabled */
+    {
+        if ((T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5700) &&
+            (T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5701))
+        {
+            if (pDevice2 && pDevice2->InitDone)
+            {
+                return;
+            }
+
+            /* GPIO1 = 1 */
+            RAW_REG_WR(pDevice, Grc.LocalCtrl, pDevice->GrcLocalCtrl |
+                GRC_MISC_LOCAL_CTRL_GPIO_OE1 |
+                GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT1);
+            MM_Wait(40);
+
+            /* GPIO1 = 0 */
+            RAW_REG_WR(pDevice, Grc.LocalCtrl, pDevice->GrcLocalCtrl |
+                GRC_MISC_LOCAL_CTRL_GPIO_OE1);
+            MM_Wait(40);
+
+            /* GPIO1 = 1 */
+            RAW_REG_WR(pDevice, Grc.LocalCtrl, pDevice->GrcLocalCtrl |
+                GRC_MISC_LOCAL_CTRL_GPIO_OE1 |
+                GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT1);
+            MM_Wait(40);
+        }
+    }
+}
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+static LM_UINT32
+GetPhyAdFlowCntrlSettings(
+    PLM_DEVICE_BLOCK pDevice)
+{
+    LM_UINT32 Value32;
+
+    Value32 = 0;
+
+    /* Auto negotiation flow control only when autonegotiation is enabled. */
+    if(pDevice->DisableAutoNeg == FALSE ||
+        pDevice->RequestedLineSpeed == LM_LINE_SPEED_AUTO)
+    {
+        /* Please refer to Table 28B-3 of the 802.3ab-1999 spec. */
+        if((pDevice->FlowControlCap == LM_FLOW_CONTROL_AUTO_PAUSE) ||
+            ((pDevice->FlowControlCap & LM_FLOW_CONTROL_RECEIVE_PAUSE) &&
+            (pDevice->FlowControlCap & LM_FLOW_CONTROL_TRANSMIT_PAUSE)))
+        {
+            Value32 |= PHY_AN_AD_PAUSE_CAPABLE;
+        }
+        else if(pDevice->FlowControlCap & LM_FLOW_CONTROL_TRANSMIT_PAUSE)
+        {
+            Value32 |= PHY_AN_AD_ASYM_PAUSE;
+        }
+        else if(pDevice->FlowControlCap & LM_FLOW_CONTROL_RECEIVE_PAUSE)
+        {
+            Value32 |= PHY_AN_AD_PAUSE_CAPABLE | PHY_AN_AD_ASYM_PAUSE;
+        }
+    }
+
+    return Value32;
+}
+
+
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/*    LM_STATUS_FAILURE                                                       */
+/*    LM_STATUS_SUCCESS                                                       */
+/*                                                                            */
+/******************************************************************************/
+static LM_STATUS
+LM_ForceAutoNeg(PLM_DEVICE_BLOCK pDevice) 
+{
+    LM_LINE_SPEED LineSpeed;
+    LM_DUPLEX_MODE DuplexMode;
+    LM_UINT32 NewPhyCtrl;
+    LM_UINT32 Value32, PhyReg18;
+    LM_UINT32 Cnt;
+
+    /* Get the interface type, line speed, and duplex mode. */
+    LineSpeed = pDevice->RequestedLineSpeed;
+    DuplexMode = pDevice->RequestedDuplexMode;
+
+    /* Exit ext. loop back, in case it was in ext. loopback mode */
+    /* Set Extended packet length bit on chips that support jumbo frames */
+    if ((pDevice->PhyId & PHY_ID_MASK) == PHY_BCM5401_PHY_ID)
+    {
+        LM_WritePhy(pDevice, BCM5401_AUX_CTRL, 0x4c20);
+    }
+    else
+    {
+        LM_WritePhy(pDevice, BCM5401_AUX_CTRL, 0x0007);
+        LM_ReadPhy(pDevice, BCM5401_AUX_CTRL, &PhyReg18);
+        PhyReg18 &= ~0x8000;       /* clear external loop back */
+        if (!T3_ASIC_5705_OR_5750(pDevice->ChipRevId))
+        {
+            PhyReg18 |= 0x4000;    /* set extended packet length */
+        }
+        LM_WritePhy(pDevice, BCM5401_AUX_CTRL, PhyReg18);
+    }
+
+#ifdef BCM_WOL
+    if (pDevice->RestoreOnWakeUp)
+    {
+        LM_WritePhy(pDevice, BCM540X_1000BASET_CTRL_REG, 0);
+        pDevice->advertising1000 = 0;
+        Value32 = PHY_AN_AD_10BASET_FULL | PHY_AN_AD_10BASET_HALF;
+        if (pDevice->WolSpeed == WOL_SPEED_100MB)
+        {
+            Value32 |= PHY_AN_AD_100BASETX_FULL | PHY_AN_AD_100BASETX_HALF;
+        }
+        Value32 |= PHY_AN_AD_PROTOCOL_802_3_CSMA_CD;
+        Value32 |= GetPhyAdFlowCntrlSettings(pDevice);
+        LM_WritePhy(pDevice, PHY_AN_AD_REG, Value32);
+        pDevice->advertising = Value32;
+    }
+    /* Setup the auto-negotiation advertisement register. */
+    else if(LineSpeed == LM_LINE_SPEED_UNKNOWN)
+#else
+    /* Setup the auto-negotiation advertisement register. */
+    if(LineSpeed == LM_LINE_SPEED_UNKNOWN)
+#endif
+    {
+        /* Setup the 10/100 Mbps auto-negotiation advertisement register. */
+        Value32 = PHY_AN_AD_PROTOCOL_802_3_CSMA_CD | PHY_AN_AD_ALL_SPEEDS;
+        Value32 |= GetPhyAdFlowCntrlSettings(pDevice);
+
+        LM_WritePhy(pDevice, PHY_AN_AD_REG, Value32);
+        pDevice->advertising = Value32;
+
+        /* Advertise 1000Mbps */
+        if (!(pDevice->PhyFlags & PHY_NO_GIGABIT))
+        {
+            Value32 = BCM540X_AN_AD_ALL_1G_SPEEDS;
+
+#if INCLUDE_5701_AX_FIX
+            /* Bug: workaround for CRC error in gigabit mode when we are in */
+            /* slave mode.  This will force the PHY to operate in */
+            /* master mode. */
+            if(pDevice->ChipRevId == T3_CHIP_ID_5701_A0 ||
+                pDevice->ChipRevId == T3_CHIP_ID_5701_B0)
+            {
+                Value32 |= BCM540X_CONFIG_AS_MASTER |
+                    BCM540X_ENABLE_CONFIG_AS_MASTER;
+            }
+#endif
+
+            LM_WritePhy(pDevice, BCM540X_1000BASET_CTRL_REG, Value32);
+            pDevice->advertising1000 = Value32;
+        }
+    }
+    else
+    {
+        if ((pDevice->PhyFlags & PHY_NO_GIGABIT) &&
+            (LineSpeed == LM_LINE_SPEED_1000MBPS))
+        {
+            LineSpeed = LM_LINE_SPEED_100MBPS;
+        }
+        if(LineSpeed == LM_LINE_SPEED_1000MBPS)
+        {
+            Value32 = PHY_AN_AD_PROTOCOL_802_3_CSMA_CD;
+            Value32 |= GetPhyAdFlowCntrlSettings(pDevice);
+
+            LM_WritePhy(pDevice, PHY_AN_AD_REG, Value32);
+            pDevice->advertising = Value32;
+
+            if(DuplexMode != LM_DUPLEX_MODE_FULL)
+            {
+                Value32 = BCM540X_AN_AD_1000BASET_HALF;
+            }
+            else
+            {
+                Value32 = BCM540X_AN_AD_1000BASET_FULL;
+            }
+
+#if INCLUDE_5701_AX_FIX
+            if ((pDevice->LoopBackMode == LM_EXT_LOOP_BACK_MODE) ||
+                (pDevice->ChipRevId == T3_CHIP_ID_5701_A0 ||
+                pDevice->ChipRevId == T3_CHIP_ID_5701_B0))
+#else
+            if (pDevice->LoopBackMode == LM_EXT_LOOP_BACK_MODE)
+#endif
+            {
+                Value32 |= BCM540X_CONFIG_AS_MASTER |
+                    BCM540X_ENABLE_CONFIG_AS_MASTER;
+            }
+            LM_WritePhy(pDevice, BCM540X_1000BASET_CTRL_REG, Value32);
+            pDevice->advertising1000 = Value32;
+            if (pDevice->LoopBackMode == LM_EXT_LOOP_BACK_MODE)
+            {
+                if ((pDevice->PhyId & PHY_ID_MASK) == PHY_BCM5401_PHY_ID)
+                {
+                    LM_WritePhy(pDevice, BCM5401_AUX_CTRL, 0x8c20);
+                }
+                else
+                {
+                    LM_WritePhy(pDevice, BCM5401_AUX_CTRL, 0x0007);
+                    LM_ReadPhy(pDevice, BCM5401_AUX_CTRL, &PhyReg18);
+                    Value32 |= 0x8000;    /* set loop back */
+                    LM_WritePhy(pDevice, BCM5401_AUX_CTRL, PhyReg18);
+                }
+            }
+        }
+        else if(LineSpeed == LM_LINE_SPEED_100MBPS)
+        {
+            LM_WritePhy(pDevice, BCM540X_1000BASET_CTRL_REG, 0);
+            pDevice->advertising1000 = 0;
+
+            if(DuplexMode != LM_DUPLEX_MODE_FULL)
+            {
+                Value32 = PHY_AN_AD_100BASETX_HALF;
+            }
+            else
+            {
+                Value32 = PHY_AN_AD_100BASETX_FULL;
+            }
+
+            Value32 |= PHY_AN_AD_PROTOCOL_802_3_CSMA_CD;
+            Value32 |= GetPhyAdFlowCntrlSettings(pDevice);
+
+            LM_WritePhy(pDevice, PHY_AN_AD_REG, Value32);
+            pDevice->advertising = Value32;
+        }
+        else if(LineSpeed == LM_LINE_SPEED_10MBPS)
+        {
+            LM_WritePhy(pDevice, BCM540X_1000BASET_CTRL_REG, 0);
+            pDevice->advertising1000 = 0;
+
+            if(DuplexMode != LM_DUPLEX_MODE_FULL)
+            {
+                Value32 = PHY_AN_AD_10BASET_HALF;
+            }
+            else
+            {
+                Value32 = PHY_AN_AD_10BASET_FULL;
+            }
+
+            Value32 |= PHY_AN_AD_PROTOCOL_802_3_CSMA_CD;
+            Value32 |= GetPhyAdFlowCntrlSettings(pDevice);
+
+            LM_WritePhy(pDevice, PHY_AN_AD_REG, Value32);
+            pDevice->advertising = Value32;
+        }
+    }
+
+    /* Force line speed if auto-negotiation is disabled. */
+    if(pDevice->DisableAutoNeg && LineSpeed != LM_LINE_SPEED_UNKNOWN)
+    {
+        /* This code path is executed only when there is link. */
+        pDevice->LineSpeed = LineSpeed;
+        pDevice->DuplexMode = DuplexMode;
+
+        /* Force line seepd. */
+        NewPhyCtrl = 0;
+        switch(LineSpeed)
+        {
+            case LM_LINE_SPEED_10MBPS:
+                NewPhyCtrl |= PHY_CTRL_SPEED_SELECT_10MBPS;
+                break;
+            case LM_LINE_SPEED_100MBPS:
+                NewPhyCtrl |= PHY_CTRL_SPEED_SELECT_100MBPS;
+                break;
+            case LM_LINE_SPEED_1000MBPS:
+                NewPhyCtrl |= PHY_CTRL_SPEED_SELECT_1000MBPS;
+                break;
+            default:
+                NewPhyCtrl |= PHY_CTRL_SPEED_SELECT_1000MBPS;
+                break;
+        }
+
+        if(DuplexMode == LM_DUPLEX_MODE_FULL)
+        {
+            NewPhyCtrl |= PHY_CTRL_FULL_DUPLEX_MODE;
+        }
+
+        /* Don't do anything if the PHY_CTRL is already what we wanted. */
+        LM_ReadPhy(pDevice, PHY_CTRL_REG, &Value32);
+        if(Value32 != NewPhyCtrl)
+        {
+            /* Temporary bring the link down before forcing line speed. */
+            LM_WritePhy(pDevice, PHY_CTRL_REG, PHY_CTRL_LOOPBACK_MODE);
+            
+            /* Wait for link to go down. */
+            for(Cnt = 0; Cnt < 1500; Cnt++)
+            {
+                MM_Wait(10);
+
+                LM_ReadPhy(pDevice, PHY_STATUS_REG, &Value32);
+                LM_ReadPhy(pDevice, PHY_STATUS_REG, &Value32);
+
+                if(!(Value32 & PHY_STATUS_LINK_PASS))
+                {
+                    MM_Wait(40);
+                    break;
+                }
+            }
+
+            LM_WritePhy(pDevice, PHY_CTRL_REG, NewPhyCtrl);
+            MM_Wait(40);
+        }
+    }
+    else
+    {
+        LM_WritePhy(pDevice, PHY_CTRL_REG, PHY_CTRL_AUTO_NEG_ENABLE |
+            PHY_CTRL_RESTART_AUTO_NEG);
+    }
+
+    return LM_STATUS_SUCCESS;
+} /* LM_ForceAutoNegBcm540xPhy */
+
+/******************************************************************************/
+/* Description:                                                               */
+/*                                                                            */
+/* Return:                                                                    */
+/******************************************************************************/
+LM_STATUS LM_LoadFirmware(PLM_DEVICE_BLOCK pDevice,
+                          PT3_FWIMG_INFO pFwImg,
+                          LM_UINT32 LoadCpu,
+                          LM_UINT32 StartCpu)
+{
+    LM_UINT32 i;
+    LM_UINT32 address;
+    LM_VOID (*Wr_fn)(PLM_DEVICE_BLOCK pDevice,LM_UINT32 Register,LM_UINT32 Value32);
+    LM_UINT32 (*Rd_fn)(PLM_DEVICE_BLOCK pDevice,LM_UINT32 Register);
+    LM_UINT32 len;
+    LM_UINT32 base_addr;
+
+#if INCLUDE_TCP_SEG_SUPPORT
+    if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705)
+      {
+	Wr_fn = LM_MemWrInd;
+	Rd_fn = LM_MemRdInd;
+	len = LM_GetStkOffLdFirmwareSize(pDevice);
+	base_addr = T3_NIC_BCM5705_MBUF_POOL_ADDR;
+      }
+    else
+#endif
+      {
+	Wr_fn = LM_RegWrInd;
+	Rd_fn = LM_RegRdInd;
+	len = T3_RX_CPU_SPAD_SIZE;
+	base_addr = T3_RX_CPU_SPAD_ADDR;
+      }
+
+    if (LoadCpu & T3_RX_CPU_ID)
+    {
+        if (LM_HaltCpu(pDevice,T3_RX_CPU_ID) != LM_STATUS_SUCCESS)
+        {
+            return LM_STATUS_FAILURE;
+        }
+
+        /* First of all clear scrach pad memory */
+        for (i = 0; i < len; i+=4)
+        { 
+	    Wr_fn(pDevice,base_addr+i,0);
+        }
+
+        /* Copy code first */
+        address = base_addr + (pFwImg->Text.Offset & 0xffff);
+        for (i = 0; i <= pFwImg->Text.Length; i+=4)
+        {
+            Wr_fn(pDevice,address+i,
+                        ((LM_UINT32 *)pFwImg->Text.Buffer)[i/4]);
+        }
+
+        address = base_addr + (pFwImg->ROnlyData.Offset & 0xffff);
+        for (i = 0; i <= pFwImg->ROnlyData.Length; i+=4)
+        {
+            Wr_fn(pDevice,address+i,
+                        ((LM_UINT32 *)pFwImg->ROnlyData.Buffer)[i/4]);
+        }
+
+        address = base_addr + (pFwImg->Data.Offset & 0xffff);
+        for (i= 0; i <= pFwImg->Data.Length; i+=4)
+        {
+            Wr_fn(pDevice,address+i,
+                        ((LM_UINT32 *)pFwImg->Data.Buffer)[i/4]);
+        }
+    }
+
+    if ((LoadCpu & T3_TX_CPU_ID) &&
+        (T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5705))
+    {
+        if (LM_HaltCpu(pDevice,T3_TX_CPU_ID) != LM_STATUS_SUCCESS)
+        {
+            return LM_STATUS_FAILURE;
+        }
+
+        /* First of all clear scrach pad memory */
+        for (i = 0; i < T3_TX_CPU_SPAD_SIZE; i+=4)
+        { 
+            Wr_fn(pDevice,T3_TX_CPU_SPAD_ADDR+i,0);
+        }
+
+        /* Copy code first */
+        address = T3_TX_CPU_SPAD_ADDR + (pFwImg->Text.Offset & 0xffff);
+        for (i= 0; i <= pFwImg->Text.Length; i+=4)
+        {
+            Wr_fn(pDevice,address+i,
+                        ((LM_UINT32 *)pFwImg->Text.Buffer)[i/4]);
+        }
+
+        address = T3_TX_CPU_SPAD_ADDR + (pFwImg->ROnlyData.Offset & 0xffff);
+        for (i= 0; i <= pFwImg->ROnlyData.Length; i+=4)
+        {
+            Wr_fn(pDevice,address+i,
+                        ((LM_UINT32 *)pFwImg->ROnlyData.Buffer)[i/4]);
+        }
+
+        address = T3_TX_CPU_SPAD_ADDR + (pFwImg->Data.Offset & 0xffff);
+        for (i= 0; i <= pFwImg->Data.Length; i+=4)
+        {
+            Wr_fn(pDevice,address+i,
+                        ((LM_UINT32 *)pFwImg->Data.Buffer)[i/4]);
+        }
+    }
+
+    if (StartCpu & T3_RX_CPU_ID)
+    {
+        /* Start Rx CPU */
+        REG_WR(pDevice,rxCpu.reg.state, 0xffffffff);
+        REG_WR(pDevice,rxCpu.reg.PC,pFwImg->StartAddress);
+        for (i = 0 ; i < 5; i++)
+        {
+          if (pFwImg->StartAddress == REG_RD(pDevice,rxCpu.reg.PC))
+             break;
+
+          REG_WR(pDevice,rxCpu.reg.state, 0xffffffff);
+          REG_WR(pDevice,rxCpu.reg.mode,CPU_MODE_HALT);
+          REG_WR(pDevice,rxCpu.reg.PC,pFwImg->StartAddress);
+          REG_RD_BACK(pDevice,rxCpu.reg.PC);
+          MM_Wait(1000);
+        }
+
+        REG_WR(pDevice,rxCpu.reg.state, 0xffffffff);
+        REG_WR(pDevice,rxCpu.reg.mode, 0);
+    }
+
+    if ((StartCpu & T3_TX_CPU_ID) &&
+        (T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5705))
+    {
+        /* Start Tx CPU */
+        REG_WR(pDevice,txCpu.reg.state, 0xffffffff);
+        REG_WR(pDevice,txCpu.reg.PC,pFwImg->StartAddress);
+        for (i = 0 ; i < 5; i++)
+        {
+          if (pFwImg->StartAddress == REG_RD(pDevice,txCpu.reg.PC))
+             break;
+
+          REG_WR(pDevice,txCpu.reg.state, 0xffffffff);
+          REG_WR(pDevice,txCpu.reg.mode,CPU_MODE_HALT);
+          REG_WR(pDevice,txCpu.reg.PC,pFwImg->StartAddress);
+          REG_RD_BACK(pDevice,txCpu.reg.PC);
+          MM_Wait(1000);
+        }
+        
+        REG_WR(pDevice,txCpu.reg.state, 0xffffffff);
+        REG_WR(pDevice,txCpu.reg.mode, 0);
+    }
+    
+    return LM_STATUS_SUCCESS;
+}
+
+LM_STATUS LM_HaltCpu(PLM_DEVICE_BLOCK pDevice,LM_UINT32 cpu_number)
+{
+    LM_UINT32 i;
+
+    if((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705) &&
+       (cpu_number != T3_RX_CPU_ID))
+    {
+        return LM_STATUS_SUCCESS;
+    }
+
+    if (cpu_number == T3_RX_CPU_ID)
+    {
+        for (i = 0 ; i < 10000; i++)
+        {
+            REG_WR(pDevice,rxCpu.reg.state, 0xffffffff);
+            REG_WR(pDevice,rxCpu.reg.mode,CPU_MODE_HALT);
+
+            if (REG_RD(pDevice,rxCpu.reg.mode) & CPU_MODE_HALT)
+              break;
+        }
+
+        REG_WR(pDevice,rxCpu.reg.state, 0xffffffff);
+        REG_WR(pDevice,rxCpu.reg.mode,CPU_MODE_HALT);
+        REG_RD_BACK(pDevice,rxCpu.reg.mode);
+        MM_Wait(10);
+    }
+    else
+    {
+        for (i = 0 ; i < 10000; i++)
+        {
+            REG_WR(pDevice,txCpu.reg.state, 0xffffffff);
+            REG_WR(pDevice,txCpu.reg.mode,CPU_MODE_HALT);
+
+            if (REG_RD(pDevice,txCpu.reg.mode) & CPU_MODE_HALT)
+               break;
+        }
+    }
+
+  return (( i == 10000) ? LM_STATUS_FAILURE : LM_STATUS_SUCCESS);
+}
+
+
+LM_STATUS
+LM_BlinkLED(PLM_DEVICE_BLOCK pDevice, LM_UINT32 BlinkDurationSec)
+{
+	int j;
+	int ret = LM_STATUS_SUCCESS;
+
+	if(BlinkDurationSec == 0)
+	{
+		BlinkDurationSec = 1;
+        }
+	if(BlinkDurationSec > 120)
+        {
+	        BlinkDurationSec = 120;
+	}
+
+	for(j = 0; j < BlinkDurationSec * 2; j++)
+	{
+		if(j % 2)
+		{
+			// Turn on the LEDs.
+			REG_WR(pDevice, MacCtrl.LedCtrl,
+				LED_CTRL_OVERRIDE_LINK_LED |
+				LED_CTRL_1000MBPS_LED_ON |
+				LED_CTRL_100MBPS_LED_ON |
+				LED_CTRL_10MBPS_LED_ON |
+				LED_CTRL_OVERRIDE_TRAFFIC_LED |
+				LED_CTRL_BLINK_TRAFFIC_LED |
+				LED_CTRL_TRAFFIC_LED);
+		}
+		else
+		{
+			// Turn off the LEDs.
+			REG_WR(pDevice, MacCtrl.LedCtrl,
+				LED_CTRL_OVERRIDE_LINK_LED |
+				LED_CTRL_OVERRIDE_TRAFFIC_LED);
+		}
+                if (MM_Sleep(pDevice, 500) != LM_STATUS_SUCCESS)/* 0.5 second */
+                {
+                    ret = LM_STATUS_FAILURE;
+                    break;
+                }
+	}
+	REG_WR(pDevice, MacCtrl.LedCtrl, pDevice->LedCtrl);
+	return ret;
+}
+
+LM_STATUS
+LM_SwitchClocks(PLM_DEVICE_BLOCK pDevice)
+{
+    LM_UINT32 ClockCtrl;
+
+    ClockCtrl = REG_RD(pDevice, PciCfg.ClockCtrl);
+    pDevice->ClockCtrl = ClockCtrl & (T3_PCI_FORCE_CLKRUN |
+        T3_PCI_CLKRUN_OUTPUT_EN | 0x1f);
+    if (T3_ASIC_5705_OR_5750(pDevice->ChipRevId))
+    {
+        if (ClockCtrl & T3_PCI_625_CORE_CLOCK)
+        {
+            /* clear ALT clock first */
+            RAW_REG_WR(pDevice, PciCfg.ClockCtrl, pDevice->ClockCtrl |
+                T3_PCI_625_CORE_CLOCK);
+            MM_Wait(40);  /* required delay is 27usec */
+        }
+    }
+    else
+    {
+        if (ClockCtrl & T3_PCI_44MHZ_CORE_CLOCK)
+        {
+            RAW_REG_WR(pDevice, PciCfg.ClockCtrl, pDevice->ClockCtrl |
+                T3_PCI_44MHZ_CORE_CLOCK | T3_PCI_SELECT_ALTERNATE_CLOCK);
+            MM_Wait(40);  /* required delay is 27usec */
+            RAW_REG_WR(pDevice, PciCfg.ClockCtrl, pDevice->ClockCtrl |
+                T3_PCI_SELECT_ALTERNATE_CLOCK);
+            MM_Wait(40);  /* required delay is 27usec */
+        }
+    }
+
+    RAW_REG_WR(pDevice, PciCfg.ClockCtrl, pDevice->ClockCtrl);
+    MM_Wait(40);  /* required delay is 27usec */
+    return LM_STATUS_SUCCESS;
+}
+
+int t3_do_dma(PLM_DEVICE_BLOCK pDevice, 
+                   LM_PHYSICAL_ADDRESS host_addr_phy, int length,
+                   int dma_read)
+{
+    T3_DMA_DESC dma_desc;
+    int i;
+    LM_UINT32 dma_desc_addr;
+    LM_UINT32 value32;
+
+    REG_WR(pDevice, BufMgr.Mode, 0);
+    REG_WR(pDevice, Ftq.Reset, 0);
+
+    dma_desc.host_addr.High = host_addr_phy.High;
+    dma_desc.host_addr.Low = host_addr_phy.Low;
+    dma_desc.nic_mbuf = 0x2100;
+    dma_desc.len = length;
+    dma_desc.flags = 0x00000005; /* Generate Rx-CPU event */
+
+    if (dma_read)
+    {
+        dma_desc.cqid_sqid = (T3_QID_RX_BD_COMP << 8) |
+            T3_QID_DMA_HIGH_PRI_READ;
+        REG_WR(pDevice, DmaRead.Mode, DMA_READ_MODE_ENABLE);
+    }
+    else
+    {
+        dma_desc.cqid_sqid = (T3_QID_RX_DATA_COMP << 8) |
+            T3_QID_DMA_HIGH_PRI_WRITE;
+        REG_WR(pDevice, DmaWrite.Mode, DMA_WRITE_MODE_ENABLE);
+    }
+
+    dma_desc_addr = T3_NIC_DMA_DESC_POOL_ADDR;
+
+    /* Writing this DMA descriptor to DMA memory */
+    for (i = 0; i < sizeof(T3_DMA_DESC); i += 4)
+    {
+        value32 = *((PLM_UINT32) (((PLM_UINT8) &dma_desc) + i));
+        MM_WriteConfig32(pDevice, T3_PCI_MEM_WIN_ADDR_REG, dma_desc_addr+i);
+        MM_WriteConfig32(pDevice, T3_PCI_MEM_WIN_DATA_REG,
+            MM_SWAP_LE32(value32));
+    }
+    MM_WriteConfig32(pDevice, T3_PCI_MEM_WIN_ADDR_REG, 0);
+
+    if (dma_read)
+        REG_WR(pDevice, Ftq.DmaHighReadFtqFifoEnqueueDequeue, dma_desc_addr);
+    else
+        REG_WR(pDevice, Ftq.DmaHighWriteFtqFifoEnqueueDequeue, dma_desc_addr);
+
+    for (i = 0; i < 40; i++)
+    {
+        if (dma_read)
+            value32 = REG_RD(pDevice, Ftq.RcvBdCompFtqFifoEnqueueDequeue);
+        else
+            value32 = REG_RD(pDevice, Ftq.RcvDataCompFtqFifoEnqueueDequeue);
+
+        if ((value32 & 0xffff) == dma_desc_addr)
+            break;
+
+        MM_Wait(10);
+    }
+
+    return LM_STATUS_SUCCESS;
+}
+
+STATIC LM_STATUS
+LM_DmaTest(PLM_DEVICE_BLOCK pDevice, PLM_UINT8 pBufferVirt,
+           LM_PHYSICAL_ADDRESS BufferPhy, LM_UINT32 BufferSize)
+{
+    int j;
+    LM_UINT32 *ptr;
+    int dma_success = 0;
+    LM_STATUS ret = LM_STATUS_FAILURE;
+
+    if(T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5700 &&
+        T3_ASIC_REV(pDevice->ChipRevId) != T3_ASIC_REV_5701)
+    {
+        return LM_STATUS_SUCCESS;
+    }
+    while (!dma_success)
+    {
+        /* Fill data with incremental patterns */
+        ptr = (LM_UINT32 *)pBufferVirt;
+        for (j = 0; j < BufferSize/4; j++)
+            *ptr++ = j;
+
+        if (t3_do_dma(pDevice,BufferPhy,BufferSize, 1) == LM_STATUS_FAILURE)
+        {
+            goto LM_DmaTestDone;
+        }
+
+        MM_Wait(40);
+        ptr = (LM_UINT32 *)pBufferVirt;
+        /* Fill data with zero */
+        for (j = 0; j < BufferSize/4; j++)
+            *ptr++ = 0;
+
+        if (t3_do_dma(pDevice,BufferPhy,BufferSize, 0) == LM_STATUS_FAILURE)
+        {
+            goto LM_DmaTestDone;
+        }
+
+        MM_Wait(40);
+        /* Check for data */
+        ptr = (LM_UINT32 *)pBufferVirt;
+        for (j = 0; j < BufferSize/4; j++)
+        {
+            if (*ptr++ != j)
+            {
+                if ((pDevice->DmaReadWriteCtrl & DMA_CTRL_WRITE_BOUNDARY_MASK)
+                    != DMA_CTRL_WRITE_BOUNDARY_16)
+                {
+                    pDevice->DmaReadWriteCtrl = (pDevice->DmaReadWriteCtrl &
+                         ~DMA_CTRL_WRITE_BOUNDARY_MASK) |
+                          DMA_CTRL_WRITE_BOUNDARY_16;
+                    REG_WR(pDevice, PciCfg.DmaReadWriteCtrl,
+                           pDevice->DmaReadWriteCtrl);
+                    break;
+                 }
+                 else
+                 {
+                     goto LM_DmaTestDone;
+                 }
+            }
+        }
+        if (j == (BufferSize/4))
+            dma_success = 1;
+    }
+    ret = LM_STATUS_SUCCESS;
+LM_DmaTestDone:
+    memset(pBufferVirt, 0, BufferSize);
+    return ret;
+}
+
+void
+LM_Add32To64Counter(LM_UINT32 Counter32, T3_64BIT_REGISTER *Counter64)
+{
+    Counter64->Low += Counter32;
+    if (Counter64->Low < Counter32)
+    {
+        Counter64->High++;
+    }
+}
+
+LM_STATUS
+LM_GetStats(PLM_DEVICE_BLOCK pDevice)
+{
+    PT3_STATS_BLOCK pStats = (PT3_STATS_BLOCK) pDevice->pStatsBlkVirt;
+
+    if (!T3_ASIC_5705_OR_5750(pDevice->ChipRevId))
+    {
+        return LM_STATUS_FAILURE;
+    }
+
+    if (pStats == 0)
+    {
+        return LM_STATUS_FAILURE;
+    }
+    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.ifHCOutOctets),
+        &pStats->ifHCOutOctets);
+    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.etherStatsCollisions),
+        &pStats->etherStatsCollisions);
+    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.outXonSent),
+        &pStats->outXonSent);
+    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.outXoffSent),
+        &pStats->outXoffSent);
+    LM_Add32To64Counter(REG_RD(pDevice,
+	MacCtrl.dot3StatsInternalMacTransmitErrors),
+        &pStats->dot3StatsInternalMacTransmitErrors);
+    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.dot3StatsSingleCollisionFrames),
+        &pStats->dot3StatsSingleCollisionFrames);
+    LM_Add32To64Counter(REG_RD(pDevice,
+	MacCtrl.dot3StatsMultipleCollisionFrames),
+        &pStats->dot3StatsMultipleCollisionFrames);
+    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.dot3StatsDeferredTransmissions),
+        &pStats->dot3StatsDeferredTransmissions);
+    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.dot3StatsExcessiveCollisions),
+        &pStats->dot3StatsExcessiveCollisions);
+    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.dot3StatsLateCollisions),
+        &pStats->dot3StatsLateCollisions);
+    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.ifHCOutUcastPkts),
+        &pStats->ifHCOutUcastPkts);
+    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.ifHCOutMulticastPkts),
+        &pStats->ifHCOutMulticastPkts);
+    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.ifHCOutBroadcastPkts),
+        &pStats->ifHCOutBroadcastPkts);
+    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.ifHCInOctets),
+        &pStats->ifHCInOctets);
+    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.etherStatsFragments),
+        &pStats->etherStatsFragments);
+    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.ifHCInUcastPkts),
+        &pStats->ifHCInUcastPkts);
+    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.ifHCInMulticastPkts),
+        &pStats->ifHCInMulticastPkts);
+    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.ifHCInBroadcastPkts),
+        &pStats->ifHCInBroadcastPkts);
+    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.dot3StatsFCSErrors),
+        &pStats->dot3StatsFCSErrors);
+    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.dot3StatsAlignmentErrors),
+        &pStats->dot3StatsAlignmentErrors);
+    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.xonPauseFramesReceived),
+        &pStats->xonPauseFramesReceived);
+    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.xoffPauseFramesReceived),
+        &pStats->xoffPauseFramesReceived);
+    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.macControlFramesReceived),
+        &pStats->macControlFramesReceived);
+    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.xoffStateEntered),
+        &pStats->xoffStateEntered);
+    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.dot3StatsFramesTooLong),
+        &pStats->dot3StatsFramesTooLong);
+    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.etherStatsJabbers),
+        &pStats->etherStatsJabbers);
+    LM_Add32To64Counter(REG_RD(pDevice, MacCtrl.etherStatsUndersizePkts),
+        &pStats->etherStatsUndersizePkts);
+
+    return LM_STATUS_SUCCESS;
+}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/tigon3.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/tigon3.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bcm5700/tigon3.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bcm5700/tigon3.h	2004-09-05 15:48:48.000000000 +0200
@@ -0,0 +1,3580 @@
+/******************************************************************************/
+/*                                                                            */
+/* Broadcom BCM5700 Linux Network Driver, Copyright (c) 2000 - 2003 Broadcom  */
+/* 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, located in the file LICENSE.                 */
+/*                                                                            */
+/* History:                                                                   */
+/*                                                                            */
+/******************************************************************************/
+
+#ifndef TIGON3_H
+#define TIGON3_H
+
+#include "lm.h"
+#if INCLUDE_TBI_SUPPORT
+#include "autoneg.h"
+#endif
+
+
+
+/******************************************************************************/
+/* Constants. */
+/******************************************************************************/
+
+/* Maxim number of packet descriptors used for sending packets. */
+#define MAX_TX_PACKET_DESC_COUNT            T3_SEND_RCB_ENTRY_COUNT
+#define DEFAULT_TX_PACKET_DESC_COUNT        120
+
+/* Maximum number of packet descriptors used for receiving packets. */
+#if T3_JUMBO_RCB_ENTRY_COUNT
+#define MAX_RX_PACKET_DESC_COUNT                                            \
+    (T3_STD_RCV_RCB_ENTRY_COUNT + T3_JUMBO_RCV_RCB_ENTRY_COUNT)
+#else
+#define MAX_RX_PACKET_DESC_COUNT            T3_STD_RCV_RCB_ENTRY_COUNT
+#endif
+#define DEFAULT_RX_PACKET_DESC_COUNT        200
+
+/* Threshhold for double copying small tx packets.  0 will disable double */
+/* copying of small Tx packets. */
+#define DEFAULT_TX_COPY_BUFFER_SIZE         0
+#define MIN_TX_COPY_BUFFER_SIZE             64 
+#define MAX_TX_COPY_BUFFER_SIZE             512
+
+/* Cache line. */
+#define COMMON_CACHE_LINE_SIZE              0x20
+#define COMMON_CACHE_LINE_MASK              (COMMON_CACHE_LINE_SIZE-1)
+
+/* Maximum number of fragment we can handle. */
+#ifndef MAX_FRAGMENT_COUNT
+#define MAX_FRAGMENT_COUNT                  32
+#endif
+
+/* B0 bug. */
+#define BCM5700_BX_MIN_FRAG_SIZE            10
+#define BCM5700_BX_MIN_FRAG_BUF_SIZE        16  /* nice aligned size. */
+#define BCM5700_BX_MIN_FRAG_BUF_SIZE_MASK   (BCM5700_BX_MIN_FRAG_BUF_SIZE-1)
+#define BCM5700_BX_TX_COPY_BUF_SIZE         (BCM5700_BX_MIN_FRAG_BUF_SIZE * \
+                                            MAX_FRAGMENT_COUNT)
+
+/* MAGIC number. */
+//#define T3_MAGIC_NUM                        'KevT'
+#define T3_FIRMWARE_MAILBOX                0x0b50
+#define T3_MAGIC_NUM_FIRMWARE_INIT_DONE    0x4B657654 
+#define T3_MAGIC_NUM_DISABLE_DMAW_ON_LINK_CHANGE 0x4861764b
+
+#define T3_NIC_DATA_SIG_ADDR               0x0b54
+#define T3_NIC_DATA_SIG                    0x4b657654
+
+#define T3_NIC_DATA_NIC_CFG_ADDR           0x0b58
+#define T3_NIC_CFG_LED_MAC_MODE            BIT_NONE
+#define T3_NIC_CFG_LED_PHY_MODE_1          BIT_2
+#define T3_NIC_CFG_LED_PHY_MODE_2          BIT_3
+#define T3_NIC_CFG_LED_MODE_MASK           (BIT_2 | BIT_3)
+#define T3_NIC_CFG_PHY_TYPE_UNKNOWN         BIT_NONE
+#define T3_NIC_CFG_PHY_TYPE_COPPER          BIT_4
+#define T3_NIC_CFG_PHY_TYPE_FIBER           BIT_5
+#define T3_NIC_CFG_PHY_TYPE_MASK            (BIT_4 | BIT_5)
+#define T3_NIC_CFG_ENABLE_WOL               BIT_6
+#define T3_NIC_CFG_ENABLE_ASF               BIT_7
+#define T3_NIC_EEPROM_WP                    BIT_8
+#define T3_NIC_WOL_LIMIT_10                 BIT_10
+#define T3_NIC_MINI_PCI                     BIT_12
+#define T3_NIC_FIBER_WOL_CAPABLE            BIT_14
+
+#define T3_NIC_DATA_PHY_ID_ADDR            0x0b74
+#define T3_NIC_PHY_ID1_MASK                0xffff0000
+#define T3_NIC_PHY_ID2_MASK                0x0000ffff
+
+#define T3_CMD_MAILBOX                      0x0b78
+#define T3_CMD_NICDRV_ALIVE                 0x01
+#define T3_CMD_NICDRV_PAUSE_FW              0x02
+#define T3_CMD_NICDRV_IPV4ADDR_CHANGE       0x03
+#define T3_CMD_NICDRV_IPV6ADDR_CHANGE       0x04
+#define T3_CMD_5703A0_FIX_DMAFW_DMAR        0x05
+#define T3_CMD_5703A0_FIX_DMAFW_DMAW        0x06
+
+#define T3_CMD_LENGTH_MAILBOX               0x0b7c
+#define T3_CMD_DATA_MAILBOX                 0x0b80
+
+#define T3_ASF_FW_STATUS_MAILBOX            0x0c00
+
+#define T3_DRV_STATE_MAILBOX                0x0c04
+#define T3_DRV_STATE_START                  0x01
+#define T3_DRV_STATE_START_DONE             0x80000001
+#define T3_DRV_STATE_UNLOAD                 0x02
+#define T3_DRV_STATE_UNLOAD_DONE            0x80000002
+#define T3_DRV_STATE_WOL                    0x03
+#define T3_DRV_STATE_SUSPEND                0x04
+
+#define T3_FW_RESET_TYPE_MAILBOX            0x0c08
+
+#define T3_MAC_ADDR_HIGH_MAILBOX            0x0c14
+#define T3_MAC_ADDR_LOW_MAILBOX             0x0c18
+
+#define DRV_WOL_MAILBOX                     0xd30
+#define DRV_WOL_SIGNATURE                   0x474c0000
+
+#define DRV_DOWN_STATE_SHUTDOWN             0x1
+
+#define DRV_WOL_SET_MAGIC_PKT               BIT_2
+
+#define T3_NIC_DATA_NIC_CFG_ADDR2           0x0d38 /* bit 2-3 are same as in */
+                                                   /* 0xb58 */
+#define T3_SHASTA_EXT_LED_MODE_MASK         (BIT_15 | BIT_16)
+#define T3_SHASTA_EXT_LED_LEGACY_MODE       BIT_NONE
+#define T3_SHASTA_EXT_LED_SHARED_TRAFFIC_LINK_MODE       BIT_15
+#define T3_SHASTA_EXT_LED_MAC_MODE          BIT_16
+#define T3_SHASTA_EXT_LED_WIRELESS_COMBO_MODE       (BIT_15 | BIT_16)
+
+/******************************************************************************/
+/* Hardware constants. */
+/******************************************************************************/
+
+/* Number of entries in the send ring:  must be 512. */
+#define T3_SEND_RCB_ENTRY_COUNT             512     
+#define T3_SEND_RCB_ENTRY_COUNT_MASK        (T3_SEND_RCB_ENTRY_COUNT-1)
+
+/* Number of send RCBs.  May be 1-16 but for now, only support one. */
+#define T3_MAX_SEND_RCB_COUNT               16
+
+/* Number of entries in the Standard Receive RCB.  Must be 512 entries. */
+#define T3_STD_RCV_RCB_ENTRY_COUNT          512
+#define T3_STD_RCV_RCB_ENTRY_COUNT_MASK     (T3_STD_RCV_RCB_ENTRY_COUNT-1)
+#define DEFAULT_STD_RCV_DESC_COUNT          200    /* Must be < 512. */
+#define MAX_STD_RCV_BUFFER_SIZE             0x600
+
+/* Number of entries in the Mini Receive RCB.  This value can either be */
+/* 0, 1024.  Currently Mini Receive RCB is disabled. */
+#ifndef T3_MINI_RCV_RCB_ENTRY_COUNT
+#define T3_MINI_RCV_RCB_ENTRY_COUNT         0
+#endif /* T3_MINI_RCV_RCB_ENTRY_COUNT */
+#define T3_MINI_RCV_RCB_ENTRY_COUNT_MASK    (T3_MINI_RCV_RCB_ENTRY_COUNT-1)
+#define MAX_MINI_RCV_BUFFER_SIZE            512
+#define DEFAULT_MINI_RCV_BUFFER_SIZE        64
+#define DEFAULT_MINI_RCV_DESC_COUNT         100    /* Must be < 1024. */
+
+/* Number of entries in the Jumbo Receive RCB.  This value must 256 or 0. */
+/* Currently, Jumbo Receive RCB is disabled. */
+#ifndef T3_JUMBO_RCV_RCB_ENTRY_COUNT
+#define T3_JUMBO_RCV_RCB_ENTRY_COUNT        0
+#endif /* T3_JUMBO_RCV_RCB_ENTRY_COUNT */
+#define T3_JUMBO_RCV_RCB_ENTRY_COUNT_MASK   (T3_JUMBO_RCV_RCB_ENTRY_COUNT-1)
+
+#define MAX_JUMBO_RCV_BUFFER_SIZE           (10 * 1024) /* > 1514 */
+#define DEFAULT_JUMBO_RCV_BUFFER_SIZE       (4 * 1024) /* > 1514 */
+#define DEFAULT_JUMBO_RCV_DESC_COUNT        128     /* Must be < 256. */
+
+#define MAX_JUMBO_TX_BUFFER_SIZE            (8 * 1024) /* > 1514 */
+#define DEFAULT_JUMBO_TX_BUFFER_SIZE        (4 * 1024) /* > 1514 */
+
+/* Number of receive return RCBs.  Maybe 1-16 but for now, only support one. */
+#define T3_MAX_RCV_RETURN_RCB_COUNT         16
+
+/* Number of entries in a Receive Return ring.  This value is either 1024 */
+/* or 2048. */
+#ifndef T3_RCV_RETURN_RCB_ENTRY_COUNT 
+#define T3_RCV_RETURN_RCB_ENTRY_COUNT       1024
+#endif /* T3_RCV_RETURN_RCB_ENTRY_COUNT */
+#define T3_RCV_RETURN_RCB_ENTRY_COUNT_MASK  (T3_RCV_RETURN_RCB_ENTRY_COUNT-1)
+
+
+/* Default coalescing parameters. */
+#ifdef BCM_NAPI_RXPOLL
+#define DEFAULT_RX_COALESCING_TICKS         18
+#define DEFAULT_RX_MAX_COALESCED_FRAMES     6
+#else
+#define DEFAULT_RX_COALESCING_TICKS         60
+#define DEFAULT_RX_MAX_COALESCED_FRAMES     15
+#endif
+
+#define DEFAULT_TX_COALESCING_TICKS         200
+#define DEFAULT_TX_MAX_COALESCED_FRAMES     35
+
+#define MAX_RX_COALESCING_TICKS             500
+#define MAX_TX_COALESCING_TICKS             500
+#define MAX_RX_MAX_COALESCED_FRAMES         100
+#define MAX_TX_MAX_COALESCED_FRAMES         100
+
+#define ADAPTIVE_LO_RX_MAX_COALESCED_FRAMES    5
+#define ADAPTIVE_HI_RX_MAX_COALESCED_FRAMES    48
+#define ADAPTIVE_LO_RX_COALESCING_TICKS         25
+#define ADAPTIVE_HI_RX_COALESCING_TICKS         120
+#define ADAPTIVE_LO_PKT_THRESH              52000
+#define ADAPTIVE_HI_PKT_THRESH              112000
+#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
+#define DEFAULT_RX_MAX_COALESCED_FRAMES_DURING_INT      6
+#else
+#define DEFAULT_RX_COALESCING_TICKS_DURING_INT          25
+#define DEFAULT_RX_MAX_COALESCED_FRAMES_DURING_INT      2
+#endif
+#define DEFAULT_TX_COALESCING_TICKS_DURING_INT          25
+#define ADAPTIVE_LO_RX_MAX_COALESCED_FRAMES_DURING_INT  1
+#define ADAPTIVE_HI_RX_MAX_COALESCED_FRAMES_DURING_INT  5
+#define DEFAULT_TX_MAX_COALESCED_FRAMES_DURING_INT      5
+
+#define BAD_DEFAULT_VALUE                               0xffffffff
+
+#define DEFAULT_STATS_COALESCING_TICKS      1000000
+#define MIN_STATS_COALESCING_TICKS          100
+#define MAX_STATS_COALESCING_TICKS          3600000000U
+
+
+/* Receive BD Replenish thresholds. */
+#define DEFAULT_RCV_STD_BD_REPLENISH_THRESHOLD      4
+#define DEFAULT_RCV_JUMBO_BD_REPLENISH_THRESHOLD    4
+
+/* Maximum physical fragment size. */
+#define MAX_FRAGMENT_SIZE                   (64 * 1024)
+
+
+/* Standard view. */
+#define T3_STD_VIEW_SIZE                    (64 * 1024)
+#define T3_FLAT_VIEW_SIZE                   (32 * 1024 * 1024)
+
+
+/* Buffer descriptor base address on the NIC's memory. */
+
+#define T3_NIC_SND_BUFFER_DESC_ADDR         0x4000
+#define T3_NIC_STD_RCV_BUFFER_DESC_ADDR     0x6000
+#define T3_NIC_JUMBO_RCV_BUFFER_DESC_ADDR   0x7000
+
+#define T3_NIC_STD_RCV_BUFFER_DESC_ADDR_EXT_MEM     0xc000
+#define T3_NIC_JUMBO_RCV_BUFFER_DESC_ADDR_EXT_MEM   0xd000
+#define T3_NIC_MINI_RCV_BUFFER_DESC_ADDR_EXT_MEM    0xe000
+
+#define T3_NIC_SND_BUFFER_DESC_SIZE         (T3_SEND_RCB_ENTRY_COUNT * \
+                                            sizeof(T3_SND_BD) / 4)
+
+#define T3_NIC_STD_RCV_BUFFER_DESC_SIZE     (T3_STD_RCV_RCB_ENTRY_COUNT * \
+                                            sizeof(T3_RCV_BD) / 4)
+
+#define T3_NIC_JUMBO_RCV_BUFFER_DESC_SIZE   (T3_JUMBO_RCV_RCB_ENTRY_COUNT * \
+                                            sizeof(T3_EXT_RCV_BD) / 4)
+
+
+/* MBUF pool. */
+#define T3_NIC_MBUF_POOL_ADDR               0x8000
+#define T3_NIC_MBUF_POOL_SIZE96             0x18000
+#define T3_NIC_MBUF_POOL_SIZE64             0x10000
+
+#define T3_NIC_MBUF_POOL_ADDR_EXT_MEM       0x20000
+
+#define T3_NIC_BCM5705_MBUF_POOL_ADDR               0x10000
+#define T3_NIC_BCM5705_MBUF_POOL_SIZE               0xe000
+
+/* DMA descriptor pool */
+#define T3_NIC_DMA_DESC_POOL_ADDR           0x2000
+#define T3_NIC_DMA_DESC_POOL_SIZE           0x2000      /* 8KB. */
+
+#define T3_DEF_DMA_MBUF_LOW_WMARK           0x50
+#define T3_DEF_RX_MAC_MBUF_LOW_WMARK        0x20
+#define T3_DEF_MBUF_HIGH_WMARK              0x60
+
+#define T3_DEF_DMA_MBUF_LOW_WMARK_5705       0x0
+#define T3_DEF_RX_MAC_MBUF_LOW_WMARK_5705    0x10
+#define T3_DEF_MBUF_HIGH_WMARK_5705          0x60
+
+#define T3_DEF_DMA_MBUF_LOW_WMARK_JUMBO     304
+#define T3_DEF_RX_MAC_MBUF_LOW_WMARK_JUMBO  152
+#define T3_DEF_MBUF_HIGH_WMARK_JUMBO        380
+
+#define T3_DEF_DMA_DESC_LOW_WMARK           5
+#define T3_DEF_DMA_DESC_HIGH_WMARK          10
+
+/* Maximum size of giant TCP packet can be sent */
+#define T3_TCP_SEG_MAX_OFFLOAD_SIZE         64*1000
+#define T3_TCP_SEG_MIN_NUM_SEG              20
+
+#define T3_RX_CPU_ID    0x1
+#define T3_TX_CPU_ID    0x2
+#define T3_RX_CPU_SPAD_ADDR  0x30000
+#define T3_RX_CPU_SPAD_SIZE  0x4000
+#define T3_TX_CPU_SPAD_ADDR  0x34000
+#define T3_TX_CPU_SPAD_SIZE  0x4000
+
+typedef struct T3_DIR_ENTRY
+{
+  PLM_UINT8 Buffer;
+  LM_UINT32 Offset;
+  LM_UINT32 Length;
+} T3_DIR_ENTRY,*PT3_DIR_ENTRY;
+
+typedef struct T3_FWIMG_INFO
+{
+  LM_UINT32 StartAddress;
+  T3_DIR_ENTRY Text;
+  T3_DIR_ENTRY ROnlyData;
+  T3_DIR_ENTRY Data;
+  T3_DIR_ENTRY Sbss;
+  T3_DIR_ENTRY Bss;
+} T3_FWIMG_INFO, *PT3_FWIMG_INFO;
+
+
+
+/******************************************************************************/
+/* Tigon3 PCI Registers. */
+/******************************************************************************/
+#define T3_PCI_ID_BCM5700                   0x164414e4
+#define T3_PCI_ID_BCM5701                   0x164514e4
+#define T3_PCI_ID_BCM5702                   0x164614e4
+#define T3_PCI_ID_BCM5702x                  0x16A614e4
+#define T3_PCI_ID_BCM5703                   0x164714e4
+#define T3_PCI_ID_BCM5703x                  0x16A714e4
+#define T3_PCI_ID_BCM5702FE                 0x164D14e4
+#define T3_PCI_ID_BCM5704                   0x164814e4
+#define T3_PCI_ID_BCM5705                   0x165314e4
+#define T3_PCI_ID_BCM5705M                  0x165D14e4
+#define T3_PCI_ID_BCM5705F                  0x166E14e4
+#define T3_PCI_ID_BCM5901                   0x170D14e4
+#define T3_PCI_ID_BCM5901A2                 0x170E14e4
+#define T3_PCI_ID_BCM5751F                  0x167E14e4
+
+#define T3_PCI_VENDOR_ID(x)                 ((x) & 0xffff)
+#define T3_PCI_DEVICE_ID(x)                 ((x) >> 16)
+
+#define T3_PCI_MISC_HOST_CTRL_REG           0x68
+
+/* The most significant 16bit of register 0x68. */
+/* ChipId:4, ChipRev:4, MetalRev:8 */
+#define T3_CHIP_ID_5700_A0                  0x7000
+#define T3_CHIP_ID_5700_A1                  0x7001
+#define T3_CHIP_ID_5700_B0                  0x7100
+#define T3_CHIP_ID_5700_B1                  0x7101
+#define T3_CHIP_ID_5700_C0                  0x7200
+
+#define T3_CHIP_ID_5701_A0                  0x0000
+#define T3_CHIP_ID_5701_B0                  0x0100
+#define T3_CHIP_ID_5701_B2                  0x0102
+#define T3_CHIP_ID_5701_B5                  0x0105
+
+#define T3_CHIP_ID_5703_A0                  0x1000
+#define T3_CHIP_ID_5703_A1                  0x1001
+#define T3_CHIP_ID_5703_A2                  0x1002
+#define T3_CHIP_ID_5703_A3                  0x1003
+
+#define T3_CHIP_ID_5704_A0                  0x2000
+#define T3_CHIP_ID_5704_A1                  0x2001
+#define T3_CHIP_ID_5704_A2                  0x2002
+
+#define T3_CHIP_ID_5705_A0                  0x3000
+#define T3_CHIP_ID_5705_A1                  0x3001
+#define T3_CHIP_ID_5705_A2                  0x3002
+#define T3_CHIP_ID_5705_A3                  0x3003
+
+#define T3_CHIP_ID_5750_A0                  0x4000
+#define T3_CHIP_ID_5750_A1                  0x4001
+#define T3_CHIP_ID_5750_A3                  0x4003
+
+/* Chip Id. */
+#define T3_ASIC_REV(_ChipRevId)             ((_ChipRevId) >> 12)
+#define T3_ASIC_REV_5700                    0x07
+#define T3_ASIC_REV_5701                    0x00
+#define T3_ASIC_REV_5703                    0x01
+#define T3_ASIC_REV_5704                    0x02
+#define T3_ASIC_REV_5705                    0x03
+#define T3_ASIC_REV_5750                    0x04
+
+#define T3_ASIC_5705_OR_5750(_ChipRevId)              \
+    ((T3_ASIC_REV(_ChipRevId) == T3_ASIC_REV_5705) || \
+    (T3_ASIC_REV(_ChipRevId) == T3_ASIC_REV_5750))
+
+/* Chip id and revision. */
+#define T3_CHIP_REV(_ChipRevId)             ((_ChipRevId) >> 8)
+#define T3_CHIP_REV_5700_AX                 0x70
+#define T3_CHIP_REV_5700_BX                 0x71
+#define T3_CHIP_REV_5700_CX                 0x72
+#define T3_CHIP_REV_5701_AX                 0x00
+#define T3_CHIP_REV_5703_AX                 0x10
+#define T3_CHIP_REV_5704_AX                 0x20
+#define T3_CHIP_REV_5704_BX                 0x21
+
+/* Metal revision. */
+#define T3_METAL_REV(_ChipRevId)            ((_ChipRevId) & 0xff)
+#define T3_METAL_REV_A0                     0x00
+#define T3_METAL_REV_A1                     0x01
+#define T3_METAL_REV_B0                     0x00
+#define T3_METAL_REV_B1                     0x01
+#define T3_METAL_REV_B2                     0x02
+
+#define T3_PCI_REG_CLOCK_CTRL               0x74
+
+#define T3_PCI_DISABLE_RX_CLOCK             BIT_10
+#define T3_PCI_DISABLE_TX_CLOCK             BIT_11
+#define T3_PCI_SELECT_ALTERNATE_CLOCK       BIT_12
+#define T3_PCI_POWER_DOWN_PCI_PLL133        BIT_15
+#define T3_PCI_44MHZ_CORE_CLOCK             BIT_18
+#define T3_PCI_625_CORE_CLOCK               BIT_20
+#define T3_PCI_FORCE_CLKRUN                 BIT_21
+#define T3_PCI_CLKRUN_OUTPUT_EN             BIT_22
+
+
+#define T3_PCI_REG_ADDR_REG                 0x78
+#define T3_PCI_REG_DATA_REG                 0x80
+
+#define T3_PCI_MEM_WIN_ADDR_REG             0x7c
+#define T3_PCI_MEM_WIN_DATA_REG             0x84
+
+#define T3_PCI_PM_CAP_REG                   0x48
+
+#define T3_PCI_PM_CAP_PME_D3COLD            BIT_31
+#define T3_PCI_PM_CAP_PME_D3HOT             BIT_30
+
+#define T3_PCI_PM_STATUS_CTRL_REG           0x4c
+
+#define T3_PM_POWER_STATE_MASK              (BIT_0 | BIT_1)
+#define T3_PM_POWER_STATE_D0                BIT_NONE
+#define T3_PM_POWER_STATE_D1                BIT_0
+#define T3_PM_POWER_STATE_D2                BIT_1
+#define T3_PM_POWER_STATE_D3                (BIT_0 | BIT_1)
+
+#define T3_PM_PME_ENABLE                    BIT_8
+#define T3_PM_PME_ASSERTED                  BIT_15
+
+#define T3_MSI_CAPABILITY_ID_REG            0x58
+#define T3_MSI_NEXT_CAPABILITY_PTR          0x59
+
+/* PCI state register. */
+#define T3_PCI_STATE_REG                    0x70
+
+#define T3_PCI_STATE_FORCE_RESET            BIT_0
+#define T3_PCI_STATE_INT_NOT_ACTIVE         BIT_1
+#define T3_PCI_STATE_CONVENTIONAL_PCI_MODE  BIT_2
+#define T3_PCI_STATE_BUS_SPEED_HIGH         BIT_3
+#define T3_PCI_STATE_32BIT_PCI_BUS          BIT_4
+
+
+/* Broadcom subsystem/subvendor IDs. */
+#define T3_SVID_BROADCOM                            0x14e4
+
+#define T3_SSID_BROADCOM_BCM95700A6                 0x1644
+#define T3_SSID_BROADCOM_BCM95701A5                 0x0001
+#define T3_SSID_BROADCOM_BCM95700T6                 0x0002  /* BCM8002 */
+#define T3_SSID_BROADCOM_BCM95700A9                 0x0003  /* Agilent */
+#define T3_SSID_BROADCOM_BCM95701T1                 0x0005
+#define T3_SSID_BROADCOM_BCM95701T8                 0x0006
+#define T3_SSID_BROADCOM_BCM95701A7                 0x0007  /* Agilent */
+#define T3_SSID_BROADCOM_BCM95701A10                0x0008
+#define T3_SSID_BROADCOM_BCM95701A12                0x8008
+#define T3_SSID_BROADCOM_BCM95703Ax1                0x0009
+#define T3_SSID_BROADCOM_BCM95703Ax2                0x8009
+
+/* 3COM subsystem/subvendor IDs. */
+#define T3_SVID_3COM                                0x10b7
+
+#define T3_SSID_3COM_3C996T                         0x1000
+#define T3_SSID_3COM_3C996BT                        0x1006
+#define T3_SSID_3COM_3C996CT                        0x1002
+#define T3_SSID_3COM_3C997T                         0x1003
+#define T3_SSID_3COM_3C1000T                        0x1007
+#define T3_SSID_3COM_3C940BR01                      0x1008
+
+/* Fiber boards. */
+#define T3_SSID_3COM_3C996SX                        0x1004
+#define T3_SSID_3COM_3C997SX                        0x1005
+
+
+/* Dell subsystem/subvendor IDs. */
+
+#define T3_SVID_DELL                                0x1028
+
+#define T3_SSID_DELL_VIPER                          0x00d1
+#define T3_SSID_DELL_JAGUAR                         0x0106
+#define T3_SSID_DELL_MERLOT                         0x0109
+#define T3_SSID_DELL_SLIM_MERLOT                    0x010a
+
+/* Compaq subsystem/subvendor IDs */
+
+#define T3_SVID_COMPAQ                              0x0e11
+
+#define T3_SSID_COMPAQ_BANSHEE                      0x007c
+#define T3_SSID_COMPAQ_BANSHEE_2                    0x009a
+#define T3_SSID_COMPAQ_CHANGELING                   0x007d
+#define T3_SSID_COMPAQ_NC7780                       0x0085
+#define T3_SSID_COMPAQ_NC7780_2                     0x0099
+
+#define T3_PCIE_CAPABILITY_ID_REG           0xD0
+#define T3_PCIE_CAPABILITY_ID               0x10
+
+#define T3_PCIE_CAPABILITY_REG              0xD2
+
+/******************************************************************************/
+/* MII registers. */
+/******************************************************************************/
+
+/* Control register. */
+#define PHY_CTRL_REG                                0x00
+
+#define PHY_CTRL_SPEED_MASK                         (BIT_6 | BIT_13)
+#define PHY_CTRL_SPEED_SELECT_10MBPS                BIT_NONE
+#define PHY_CTRL_SPEED_SELECT_100MBPS               BIT_13
+#define PHY_CTRL_SPEED_SELECT_1000MBPS              BIT_6
+#define PHY_CTRL_COLLISION_TEST_ENABLE              BIT_7
+#define PHY_CTRL_FULL_DUPLEX_MODE                   BIT_8
+#define PHY_CTRL_RESTART_AUTO_NEG                   BIT_9
+#define PHY_CTRL_ISOLATE_PHY                        BIT_10
+#define PHY_CTRL_LOWER_POWER_MODE                   BIT_11
+#define PHY_CTRL_AUTO_NEG_ENABLE                    BIT_12
+#define PHY_CTRL_LOOPBACK_MODE                      BIT_14
+#define PHY_CTRL_PHY_RESET                          BIT_15
+
+
+/* Status register. */
+#define PHY_STATUS_REG                              0x01
+
+#define PHY_STATUS_LINK_PASS                        BIT_2
+#define PHY_STATUS_AUTO_NEG_COMPLETE                BIT_5
+
+
+/* Phy Id registers. */
+#define PHY_ID1_REG                                 0x02
+#define PHY_ID1_OUI_MASK                            0xffff
+
+#define PHY_ID2_REG                                 0x03
+#define PHY_ID2_REV_MASK                            0x000f
+#define PHY_ID2_MODEL_MASK                          0x03f0
+#define PHY_ID2_OUI_MASK                            0xfc00
+
+
+/* Auto-negotiation advertisement register. */
+#define PHY_AN_AD_REG                               0x04
+
+#define PHY_AN_AD_ASYM_PAUSE                        BIT_11
+#define PHY_AN_AD_PAUSE_CAPABLE                     BIT_10
+#define PHY_AN_AD_10BASET_HALF                      BIT_5
+#define PHY_AN_AD_10BASET_FULL                      BIT_6
+#define PHY_AN_AD_100BASETX_HALF                    BIT_7
+#define PHY_AN_AD_100BASETX_FULL                    BIT_8
+#define PHY_AN_AD_PROTOCOL_802_3_CSMA_CD            0x01
+
+#define PHY_AN_AD_ALL_SPEEDS (PHY_AN_AD_10BASET_HALF | PHY_AN_AD_10BASET_FULL |\
+    PHY_AN_AD_100BASETX_HALF | PHY_AN_AD_100BASETX_FULL)
+
+/* Auto-negotiation Link Partner Ability register. */
+#define PHY_LINK_PARTNER_ABILITY_REG                0x05
+
+#define PHY_LINK_PARTNER_ASYM_PAUSE                 BIT_11
+#define PHY_LINK_PARTNER_PAUSE_CAPABLE              BIT_10
+
+
+/* Auto-negotiation expansion register. */
+#define PHY_AN_EXPANSION_REG                        0x06
+
+
+
+/******************************************************************************/
+/* BCM5400 and BCM5401 phy info. */
+/******************************************************************************/
+
+#define PHY_DEVICE_ID           1
+
+/* OUI: bit 31-10;   Model#: bit 9-4;   Rev# bit 3-0. */
+#define PHY_UNKNOWN_PHY                             0x00000000
+#define PHY_BCM5400_PHY_ID                          0x60008040
+#define PHY_BCM5401_PHY_ID                          0x60008050
+#define PHY_BCM5411_PHY_ID                          0x60008070
+#define PHY_BCM5701_PHY_ID                          0x60008110
+#define PHY_BCM5703_PHY_ID                          0x60008160
+#define PHY_BCM5704_PHY_ID                          0x60008190
+#define PHY_BCM5705_PHY_ID                          0x600081a0
+#define PHY_BCM5750_PHY_ID                          0x60008180
+#define PHY_BCM8002_PHY_ID                          0x60010140
+
+#define PHY_BCM5401_B0_REV                          0x1
+#define PHY_BCM5401_B2_REV                          0x3
+#define PHY_BCM5401_C0_REV                          0x6
+
+#define PHY_ID_OUI_MASK                             0xfffffc00
+#define PHY_ID_MODEL_MASK                           0x000003f0
+#define PHY_ID_REV_MASK                             0x0000000f
+#define PHY_ID_MASK                                 (PHY_ID_OUI_MASK |      \
+                                                    PHY_ID_MODEL_MASK)
+
+
+#define UNKNOWN_PHY_ID(x)   ((((x) & PHY_ID_MASK) != PHY_BCM5400_PHY_ID) && \
+                            (((x) & PHY_ID_MASK) != PHY_BCM5401_PHY_ID) && \
+                            (((x) & PHY_ID_MASK) != PHY_BCM5411_PHY_ID) && \
+                            (((x) & PHY_ID_MASK) != PHY_BCM5701_PHY_ID) && \
+                            (((x) & PHY_ID_MASK) != PHY_BCM5703_PHY_ID) && \
+                            (((x) & PHY_ID_MASK) != PHY_BCM5704_PHY_ID) && \
+                            (((x) & PHY_ID_MASK) != PHY_BCM5705_PHY_ID) && \
+                            (((x) & PHY_ID_MASK) != PHY_BCM5750_PHY_ID) && \
+                            (((x) & PHY_ID_MASK) != PHY_BCM8002_PHY_ID))
+
+
+
+/* 1000Base-T control register. */
+#define BCM540X_1000BASET_CTRL_REG                  0x09
+
+#define BCM540X_AN_AD_1000BASET_HALF                BIT_8
+#define BCM540X_AN_AD_1000BASET_FULL                BIT_9
+#define BCM540X_CONFIG_AS_MASTER                    BIT_11
+#define BCM540X_ENABLE_CONFIG_AS_MASTER             BIT_12
+
+#define BCM540X_AN_AD_ALL_1G_SPEEDS (BCM540X_AN_AD_1000BASET_HALF | \
+    BCM540X_AN_AD_1000BASET_FULL)
+
+/* Extended control register. */
+#define BCM540X_EXT_CTRL_REG                        0x10
+
+#define BCM540X_EXT_CTRL_LINK3_LED_MODE             BIT_1
+#define BCM540X_EXT_CTRL_FORCE_LED_OFF              BIT_3
+#define BCM540X_EXT_CTRL_TBI                        BIT_15
+
+/* PHY extended status register. */
+#define BCM540X_EXT_STATUS_REG                      0x11
+
+#define BCM540X_EXT_STATUS_LINK_PASS                BIT_8
+
+
+/* DSP Coefficient Read/Write Port. */
+#define BCM540X_DSP_RW_PORT                         0x15
+
+
+/* DSP Coeficient Address Register. */
+#define BCM540X_DSP_ADDRESS_REG                     0x17
+
+#define BCM540X_DSP_TAP_NUMBER_MASK                 0x00
+#define BCM540X_DSP_AGC_A                           0x00
+#define BCM540X_DSP_AGC_B                           0x01
+#define BCM540X_DSP_MSE_PAIR_STATUS                 0x02
+#define BCM540X_DSP_SOFT_DECISION                   0x03
+#define BCM540X_DSP_PHASE_REG                       0x04
+#define BCM540X_DSP_SKEW                            0x05
+#define BCM540X_DSP_POWER_SAVER_UPPER_BOUND         0x06
+#define BCM540X_DSP_POWER_SAVER_LOWER_BOUND         0x07
+#define BCM540X_DSP_LAST_ECHO                       0x08
+#define BCM540X_DSP_FREQUENCY                       0x09
+#define BCM540X_DSP_PLL_BANDWIDTH                   0x0a
+#define BCM540X_DSP_PLL_PHASE_OFFSET                0x0b
+
+#define BCM540X_DSP_FILTER_DCOFFSET                 (BIT_10 | BIT_11)
+#define BCM540X_DSP_FILTER_FEXT3                    (BIT_8 | BIT_9 | BIT_11)
+#define BCM540X_DSP_FILTER_FEXT2                    (BIT_9 | BIT_11)
+#define BCM540X_DSP_FILTER_FEXT1                    (BIT_8 | BIT_11)
+#define BCM540X_DSP_FILTER_FEXT0                    BIT_11
+#define BCM540X_DSP_FILTER_NEXT3                    (BIT_8 | BIT_9 | BIT_10)
+#define BCM540X_DSP_FILTER_NEXT2                    (BIT_9 | BIT_10)
+#define BCM540X_DSP_FILTER_NEXT1                    (BIT_8 | BIT_10)
+#define BCM540X_DSP_FILTER_NEXT0                    BIT_10
+#define BCM540X_DSP_FILTER_ECHO                     (BIT_8 | BIT_9)
+#define BCM540X_DSP_FILTER_DFE                      BIT_9
+#define BCM540X_DSP_FILTER_FFE                      BIT_8
+
+#define BCM540X_DSP_CONTROL_ALL_FILTERS             BIT_12
+
+#define BCM540X_DSP_SEL_CH_0                        BIT_NONE
+#define BCM540X_DSP_SEL_CH_1                        BIT_13
+#define BCM540X_DSP_SEL_CH_2                        BIT_14
+#define BCM540X_DSP_SEL_CH_3                        (BIT_13 | BIT_14)
+
+#define BCM540X_CONTROL_ALL_CHANNELS                BIT_15
+
+
+/* Auxilliary Control Register (Shadow Register) */
+#define BCM5401_AUX_CTRL                            0x18
+
+#define BCM5401_SHADOW_SEL_MASK                     0x7
+#define BCM5401_SHADOW_SEL_NORMAL                   0x00
+#define BCM5401_SHADOW_SEL_10BASET                  0x01
+#define BCM5401_SHADOW_SEL_POWER_CONTROL            0x02
+#define BCM5401_SHADOW_SEL_IP_PHONE                 0x03
+#define BCM5401_SHADOW_SEL_MISC_TEST1               0x04
+#define BCM5401_SHADOW_SEL_MISC_TEST2               0x05
+#define BCM5401_SHADOW_SEL_IP_PHONE_SEED            0x06
+
+
+/* Shadow register selector == '000' */
+#define BCM5401_SHDW_NORMAL_DIAG_MODE               BIT_3
+#define BCM5401_SHDW_NORMAL_DISABLE_MBP             BIT_4
+#define BCM5401_SHDW_NORMAL_DISABLE_LOW_PWR         BIT_5
+#define BCM5401_SHDW_NORMAL_DISABLE_INV_PRF         BIT_6
+#define BCM5401_SHDW_NORMAL_DISABLE_PRF             BIT_7
+#define BCM5401_SHDW_NORMAL_RX_SLICING_NORMAL       BIT_NONE
+#define BCM5401_SHDW_NORMAL_RX_SLICING_4D           BIT_8
+#define BCM5401_SHDW_NORMAL_RX_SLICING_3LVL_1D      BIT_9
+#define BCM5401_SHDW_NORMAL_RX_SLICING_5LVL_1D      (BIT_8 | BIT_9)
+#define BCM5401_SHDW_NORMAL_TX_6DB_CODING           BIT_10
+#define BCM5401_SHDW_NORMAL_ENABLE_SM_DSP_CLOCK     BIT_11
+#define BCM5401_SHDW_NORMAL_EDGERATE_CTRL_4NS       BIT_NONE
+#define BCM5401_SHDW_NORMAL_EDGERATE_CTRL_5NS       BIT_12
+#define BCM5401_SHDW_NORMAL_EDGERATE_CTRL_3NS       BIT_13
+#define BCM5401_SHDW_NORMAL_EDGERATE_CTRL_0NS       (BIT_12 | BIT_13)
+#define BCM5401_SHDW_NORMAL_EXT_PACKET_LENGTH       BIT_14
+#define BCM5401_SHDW_NORMAL_EXTERNAL_LOOPBACK       BIT_15
+
+
+/* Auxilliary status summary. */
+#define BCM540X_AUX_STATUS_REG                      0x19
+
+#define BCM540X_AUX_LINK_PASS                       BIT_2
+#define BCM540X_AUX_SPEED_MASK                      (BIT_8 | BIT_9 | BIT_10)
+#define BCM540X_AUX_10BASET_HD                      BIT_8
+#define BCM540X_AUX_10BASET_FD                      BIT_9
+#define BCM540X_AUX_100BASETX_HD                    (BIT_8 | BIT_9)
+#define BCM540X_AUX_100BASET4                       BIT_10
+#define BCM540X_AUX_100BASETX_FD                    (BIT_8 | BIT_10)
+#define BCM540X_AUX_100BASET_HD                     (BIT_9 | BIT_10)
+#define BCM540X_AUX_100BASET_FD                     (BIT_8 | BIT_9 | BIT_10)
+
+
+/* Interrupt status. */
+#define BCM540X_INT_STATUS_REG                      0x1a
+
+#define BCM540X_INT_LINK_CHANGE                     BIT_1
+#define BCM540X_INT_SPEED_CHANGE                    BIT_2
+#define BCM540X_INT_DUPLEX_CHANGE                   BIT_3
+#define BCM540X_INT_AUTO_NEG_PAGE_RX                BIT_10
+
+
+/* Interrupt mask register. */
+#define BCM540X_INT_MASK_REG                        0x1b
+
+
+
+/******************************************************************************/
+/* Register definitions. */
+/******************************************************************************/
+
+typedef volatile LM_UINT8 T3_8BIT_REGISTER, *PT3_8BIT_REGISTER;
+typedef volatile LM_UINT16 T3_16BIT_REGISTER, *PT3_16BIT_REGISTER;
+typedef volatile LM_UINT32 T3_32BIT_REGISTER, *PT3_32BIT_REGISTER;
+
+typedef struct {
+    /* Big endian format. */
+    T3_32BIT_REGISTER High;
+    T3_32BIT_REGISTER Low;
+} T3_64BIT_REGISTER, *PT3_64BIT_REGISTER;
+
+typedef T3_64BIT_REGISTER T3_64BIT_HOST_ADDR, *PT3_64BIT_HOST_ADDR;
+
+#define T3_NUM_OF_DMA_DESC    256
+#define T3_NUM_OF_MBUF        768
+
+typedef struct 
+{
+  T3_64BIT_REGISTER host_addr;
+  T3_32BIT_REGISTER nic_mbuf;
+  T3_16BIT_REGISTER len;
+  T3_16BIT_REGISTER cqid_sqid;
+  T3_32BIT_REGISTER flags;
+  T3_32BIT_REGISTER opaque1;
+  T3_32BIT_REGISTER opaque2;
+  T3_32BIT_REGISTER opaque3;
+}T3_DMA_DESC, *PT3_DMA_DESC;
+
+
+
+/******************************************************************************/
+/* Ring control block. */
+/******************************************************************************/
+
+typedef struct {
+    T3_64BIT_REGISTER HostRingAddr;
+
+    union {
+        struct {
+#ifdef BIG_ENDIAN_HOST
+            T3_16BIT_REGISTER MaxLen;
+            T3_16BIT_REGISTER Flags;
+#else /* BIG_ENDIAN_HOST */
+            T3_16BIT_REGISTER Flags;
+            T3_16BIT_REGISTER MaxLen;
+#endif
+        } s;
+
+        T3_32BIT_REGISTER MaxLen_Flags;
+    } u;
+
+    T3_32BIT_REGISTER NicRingAddr;
+} T3_RCB, *PT3_RCB;
+
+#define T3_RCB_FLAG_USE_EXT_RECV_BD                     BIT_0
+#define T3_RCB_FLAG_RING_DISABLED                       BIT_1
+
+
+
+/******************************************************************************/
+/* Status block. */
+/******************************************************************************/
+
+/* 
+ * Size of status block is actually 0x50 bytes.  Use 0x80 bytes for
+ * cache line alignment. 
+ */
+#define T3_STATUS_BLOCK_SIZE                                    0x80
+
+typedef struct {
+    volatile LM_UINT32 Status;
+    #define STATUS_BLOCK_UPDATED                                BIT_0
+    #define STATUS_BLOCK_LINK_CHANGED_STATUS                    BIT_1
+    #define STATUS_BLOCK_ERROR                                  BIT_2
+
+    volatile LM_UINT32 StatusTag;
+
+#ifdef BIG_ENDIAN_HOST
+    volatile LM_UINT16 RcvStdConIdx;
+    volatile LM_UINT16 RcvJumboConIdx;
+
+    volatile LM_UINT16 Reserved2;
+    volatile LM_UINT16 RcvMiniConIdx;
+
+    struct {
+        volatile LM_UINT16 SendConIdx;   /* Send consumer index. */
+        volatile LM_UINT16 RcvProdIdx;   /* Receive producer index. */
+    } Idx[16];
+#else /* BIG_ENDIAN_HOST */
+    volatile LM_UINT16 RcvJumboConIdx;
+    volatile LM_UINT16 RcvStdConIdx;
+
+    volatile LM_UINT16 RcvMiniConIdx;
+    volatile LM_UINT16 Reserved2;
+
+    struct {
+        volatile LM_UINT16 RcvProdIdx;   /* Receive producer index. */
+        volatile LM_UINT16 SendConIdx;   /* Send consumer index. */
+    } Idx[16];
+#endif
+} T3_STATUS_BLOCK, *PT3_STATUS_BLOCK;
+
+
+
+/******************************************************************************/
+/* Receive buffer descriptors. */
+/******************************************************************************/
+
+typedef struct {
+    T3_64BIT_HOST_ADDR HostAddr;
+
+#ifdef BIG_ENDIAN_HOST
+    volatile LM_UINT16 Index;
+    volatile LM_UINT16 Len;
+
+    volatile LM_UINT16 Type;
+    volatile LM_UINT16 Flags;
+
+    volatile LM_UINT16 IpCksum;
+    volatile LM_UINT16 TcpUdpCksum;
+
+    volatile LM_UINT16 ErrorFlag;
+    volatile LM_UINT16 VlanTag;
+#else /* BIG_ENDIAN_HOST */
+    volatile LM_UINT16 Len;
+    volatile LM_UINT16 Index;
+
+    volatile LM_UINT16 Flags;
+    volatile LM_UINT16 Type;
+
+    volatile LM_UINT16 TcpUdpCksum;
+    volatile LM_UINT16 IpCksum;
+
+    volatile LM_UINT16 VlanTag;
+    volatile LM_UINT16 ErrorFlag;
+#endif
+
+    volatile LM_UINT32 Reserved;
+    volatile LM_UINT32 Opaque;
+} T3_RCV_BD, *PT3_RCV_BD;
+
+
+typedef struct {
+    T3_64BIT_HOST_ADDR HostAddr[3];
+
+#ifdef BIG_ENDIAN_HOST
+    LM_UINT16 Len1;
+    LM_UINT16 Len2;
+
+    LM_UINT16 Len3;
+    LM_UINT16 Reserved1;
+#else /* BIG_ENDIAN_HOST */
+    LM_UINT16 Len2;
+    LM_UINT16 Len1;
+
+    LM_UINT16 Reserved1;
+    LM_UINT16 Len3;
+#endif
+
+    T3_RCV_BD StdRcvBd;
+} T3_EXT_RCV_BD, *PT3_EXT_RCV_BD;
+
+
+/* Error flags. */
+#define RCV_BD_ERR_BAD_CRC                          0x0001
+#define RCV_BD_ERR_COLL_DETECT                      0x0002
+#define RCV_BD_ERR_LINK_LOST_DURING_PKT             0x0004
+#define RCV_BD_ERR_PHY_DECODE_ERR                   0x0008
+#define RCV_BD_ERR_ODD_NIBBLED_RCVD_MII             0x0010
+#define RCV_BD_ERR_MAC_ABORT                        0x0020
+#define RCV_BD_ERR_LEN_LT_64                        0x0040
+#define RCV_BD_ERR_TRUNC_NO_RESOURCES               0x0080
+#define RCV_BD_ERR_GIANT_FRAME_RCVD                 0x0100
+
+
+/* Buffer descriptor flags. */
+#define RCV_BD_FLAG_END                             0x0004
+#define RCV_BD_FLAG_JUMBO_RING                      0x0020
+#define RCV_BD_FLAG_VLAN_TAG                        0x0040
+#define RCV_BD_FLAG_FRAME_HAS_ERROR                 0x0400
+#define RCV_BD_FLAG_MINI_RING                       0x0800
+#define RCV_BD_FLAG_IP_CHKSUM_FIELD                 0x1000
+#define RCV_BD_FLAG_TCP_UDP_CHKSUM_FIELD            0x2000
+#define RCV_BD_FLAG_TCP_PACKET                      0x4000
+
+
+
+/******************************************************************************/
+/* Send buffer descriptor. */
+/******************************************************************************/
+
+typedef struct {
+    T3_64BIT_HOST_ADDR HostAddr;
+
+    union {
+        struct {
+#ifdef BIG_ENDIAN_HOST
+            LM_UINT16 Len;
+            LM_UINT16 Flags;
+#else /* BIG_ENDIAN_HOST */
+            LM_UINT16 Flags;
+            LM_UINT16 Len;
+#endif
+        } s1;
+
+        LM_UINT32 Len_Flags;
+    } u1;
+
+    union {
+        struct {
+#ifdef BIG_ENDIAN_HOST
+            LM_UINT16 Reserved;
+            LM_UINT16 VlanTag;
+#else /* BIG_ENDIAN_HOST */
+            LM_UINT16 VlanTag;
+            LM_UINT16 Reserved;
+#endif
+        } s2;
+
+        LM_UINT32 VlanTag;
+    } u2;
+} T3_SND_BD, *PT3_SND_BD;
+
+
+/* Send buffer descriptor flags. */
+#define SND_BD_FLAG_TCP_UDP_CKSUM                   0x0001
+#define SND_BD_FLAG_IP_CKSUM                        0x0002
+#define SND_BD_FLAG_END                             0x0004
+#define SND_BD_FLAG_IP_FRAG                         0x0008
+#define SND_BD_FLAG_IP_FRAG_END                     0x0010
+#define SND_BD_FLAG_VLAN_TAG                        0x0040
+#define SND_BD_FLAG_COAL_NOW                        0x0080
+#define SND_BD_FLAG_CPU_PRE_DMA                     0x0100
+#define SND_BD_FLAG_CPU_POST_DMA                    0x0200
+#define SND_BD_FLAG_INSERT_SRC_ADDR                 0x1000
+#define SND_BD_FLAG_CHOOSE_SRC_ADDR                 0x6000
+#define SND_BD_FLAG_DONT_GEN_CRC                    0x8000
+
+/* MBUFs */
+typedef struct T3_MBUF_FRAME_DESC {
+#ifdef BIG_ENDIAN_HOST
+  LM_UINT32 status_control;
+  union {
+    struct {
+      LM_UINT8 cqid;
+      LM_UINT8 reserved1;
+      LM_UINT16 length;
+    }s1;
+    LM_UINT32 word;
+  }u1;
+  union {
+    struct 
+    {
+      LM_UINT16 ip_hdr_start;
+      LM_UINT16 tcp_udp_hdr_start;
+    }s2;
+
+    LM_UINT32 word;
+  }u2;
+
+  union {
+    struct {
+      LM_UINT16 data_start;
+      LM_UINT16 vlan_id;
+    }s3;
+    
+    LM_UINT32 word;
+  }u3;
+
+  union {
+    struct {
+      LM_UINT16 ip_checksum;
+      LM_UINT16 tcp_udp_checksum;
+    }s4;
+
+    LM_UINT32 word;
+  }u4;
+
+  union {
+    struct {
+      LM_UINT16 pseudo_checksum;
+      LM_UINT16 checksum_status;
+    }s5;
+
+    LM_UINT32 word;
+  }u5;
+  
+  union {
+    struct {
+      LM_UINT16 rule_match;
+      LM_UINT8 class;
+      LM_UINT8 rupt;
+    }s6;
+
+    LM_UINT32 word;
+  }u6;
+
+  union {
+    struct {
+      LM_UINT16 reserved2;
+      LM_UINT16 mbuf_num;
+    }s7;
+
+    LM_UINT32 word;
+  }u7;
+
+  LM_UINT32 reserved3;
+  LM_UINT32 reserved4;
+#else
+  LM_UINT32 status_control;
+  union {
+    struct {
+      LM_UINT16 length;
+      LM_UINT8  reserved1;
+      LM_UINT8  cqid;
+    }s1;
+    LM_UINT32 word;
+  }u1;
+  union {
+    struct 
+    {
+      LM_UINT16 tcp_udp_hdr_start;
+      LM_UINT16 ip_hdr_start;
+    }s2;
+
+    LM_UINT32 word;
+  }u2;
+
+  union {
+    struct {
+      LM_UINT16 vlan_id;
+      LM_UINT16 data_start;
+    }s3;
+    
+    LM_UINT32 word;
+  }u3;
+
+  union {
+    struct {
+      LM_UINT16 tcp_udp_checksum;
+      LM_UINT16 ip_checksum;
+    }s4;
+
+    LM_UINT32 word;
+  }u4;
+
+  union {
+    struct {
+      LM_UINT16 checksum_status;
+      LM_UINT16 pseudo_checksum;
+    }s5;
+
+    LM_UINT32 word;
+  }u5;
+  
+  union {
+    struct {
+      LM_UINT8 rupt;
+      LM_UINT8 class;
+      LM_UINT16 rule_match;
+    }s6;
+
+    LM_UINT32 word;
+  }u6;
+
+  union {
+    struct {
+      LM_UINT16 mbuf_num;
+      LM_UINT16 reserved2;
+    }s7;
+
+    LM_UINT32 word;
+  }u7;
+
+  LM_UINT32 reserved3;
+  LM_UINT32 reserved4;
+#endif
+}T3_MBUF_FRAME_DESC,*PT3_MBUF_FRAME_DESC;
+
+typedef struct T3_MBUF_HDR {
+  union {
+    struct {
+      unsigned int C:1;
+      unsigned int F:1;
+      unsigned int reserved1:7;
+      unsigned int next_mbuf:16;
+      unsigned int length:7;
+    }s1;
+    
+    LM_UINT32 word;
+  }u1;
+  
+  LM_UINT32 next_frame_ptr;
+}T3_MBUF_HDR, *PT3_MBUF_HDR;
+
+typedef struct T3_MBUF
+{
+  T3_MBUF_HDR hdr;
+  union
+  {
+    struct {
+      T3_MBUF_FRAME_DESC frame_hdr;
+      LM_UINT32 data[20];
+    }s1;
+
+    struct {
+      LM_UINT32 data[30];
+    }s2;
+  }body;
+}T3_MBUF, *PT3_MBUF;
+
+#define T3_MBUF_BASE   (T3_NIC_MBUF_POOL_ADDR >> 7)
+#define T3_MBUF_END    ((T3_NIC_MBUF_POOL_ADDR + T3_NIC_MBUF_POOL_SIZE) >> 7)
+
+
+
+/******************************************************************************/
+/* Statistics block. */
+/******************************************************************************/
+
+typedef struct {
+    LM_UINT8 Reserved0[0x400-0x300];
+
+    /* Statistics maintained by Receive MAC. */
+    T3_64BIT_REGISTER ifHCInOctets;
+    T3_64BIT_REGISTER Reserved1;
+    T3_64BIT_REGISTER etherStatsFragments;
+    T3_64BIT_REGISTER ifHCInUcastPkts;
+    T3_64BIT_REGISTER ifHCInMulticastPkts;
+    T3_64BIT_REGISTER ifHCInBroadcastPkts;
+    T3_64BIT_REGISTER dot3StatsFCSErrors;
+    T3_64BIT_REGISTER dot3StatsAlignmentErrors;
+    T3_64BIT_REGISTER xonPauseFramesReceived;
+    T3_64BIT_REGISTER xoffPauseFramesReceived;
+    T3_64BIT_REGISTER macControlFramesReceived;
+    T3_64BIT_REGISTER xoffStateEntered;
+    T3_64BIT_REGISTER dot3StatsFramesTooLong;
+    T3_64BIT_REGISTER etherStatsJabbers;
+    T3_64BIT_REGISTER etherStatsUndersizePkts;
+    T3_64BIT_REGISTER inRangeLengthError;
+    T3_64BIT_REGISTER outRangeLengthError;
+    T3_64BIT_REGISTER etherStatsPkts64Octets;
+    T3_64BIT_REGISTER etherStatsPkts65Octetsto127Octets;
+    T3_64BIT_REGISTER etherStatsPkts128Octetsto255Octets;
+    T3_64BIT_REGISTER etherStatsPkts256Octetsto511Octets;
+    T3_64BIT_REGISTER etherStatsPkts512Octetsto1023Octets;
+    T3_64BIT_REGISTER etherStatsPkts1024Octetsto1522Octets;
+    T3_64BIT_REGISTER etherStatsPkts1523Octetsto2047Octets;
+    T3_64BIT_REGISTER etherStatsPkts2048Octetsto4095Octets;
+    T3_64BIT_REGISTER etherStatsPkts4096Octetsto8191Octets;
+    T3_64BIT_REGISTER etherStatsPkts8192Octetsto9022Octets;
+
+    T3_64BIT_REGISTER Unused1[37];
+
+    /* Statistics maintained by Transmit MAC. */
+    T3_64BIT_REGISTER ifHCOutOctets;
+    T3_64BIT_REGISTER Reserved2;
+    T3_64BIT_REGISTER etherStatsCollisions;
+    T3_64BIT_REGISTER outXonSent;
+    T3_64BIT_REGISTER outXoffSent;
+    T3_64BIT_REGISTER flowControlDone;
+    T3_64BIT_REGISTER dot3StatsInternalMacTransmitErrors;
+    T3_64BIT_REGISTER dot3StatsSingleCollisionFrames;
+    T3_64BIT_REGISTER dot3StatsMultipleCollisionFrames;
+    T3_64BIT_REGISTER dot3StatsDeferredTransmissions;
+    T3_64BIT_REGISTER Reserved3;
+    T3_64BIT_REGISTER dot3StatsExcessiveCollisions;
+    T3_64BIT_REGISTER dot3StatsLateCollisions;
+    T3_64BIT_REGISTER dot3Collided2Times;
+    T3_64BIT_REGISTER dot3Collided3Times;
+    T3_64BIT_REGISTER dot3Collided4Times;
+    T3_64BIT_REGISTER dot3Collided5Times;
+    T3_64BIT_REGISTER dot3Collided6Times;
+    T3_64BIT_REGISTER dot3Collided7Times;
+    T3_64BIT_REGISTER dot3Collided8Times;
+    T3_64BIT_REGISTER dot3Collided9Times;
+    T3_64BIT_REGISTER dot3Collided10Times;
+    T3_64BIT_REGISTER dot3Collided11Times;
+    T3_64BIT_REGISTER dot3Collided12Times;
+    T3_64BIT_REGISTER dot3Collided13Times;
+    T3_64BIT_REGISTER dot3Collided14Times;
+    T3_64BIT_REGISTER dot3Collided15Times;
+    T3_64BIT_REGISTER ifHCOutUcastPkts;
+    T3_64BIT_REGISTER ifHCOutMulticastPkts;
+    T3_64BIT_REGISTER ifHCOutBroadcastPkts;
+    T3_64BIT_REGISTER dot3StatsCarrierSenseErrors;
+    T3_64BIT_REGISTER ifOutDiscards;
+    T3_64BIT_REGISTER ifOutErrors;
+
+    T3_64BIT_REGISTER Unused2[31];
+
+    /* Statistics maintained by Receive List Placement. */
+    T3_64BIT_REGISTER COSIfHCInPkts[16];
+    T3_64BIT_REGISTER COSFramesDroppedDueToFilters;
+    T3_64BIT_REGISTER nicDmaWriteQueueFull;
+    T3_64BIT_REGISTER nicDmaWriteHighPriQueueFull;
+    T3_64BIT_REGISTER nicNoMoreRxBDs;
+    T3_64BIT_REGISTER ifInDiscards;
+    T3_64BIT_REGISTER ifInErrors;
+    T3_64BIT_REGISTER nicRecvThresholdHit;
+
+    T3_64BIT_REGISTER Unused3[9];
+
+    /* Statistics maintained by Send Data Initiator. */
+    T3_64BIT_REGISTER COSIfHCOutPkts[16];
+    T3_64BIT_REGISTER nicDmaReadQueueFull;
+    T3_64BIT_REGISTER nicDmaReadHighPriQueueFull;
+    T3_64BIT_REGISTER nicSendDataCompQueueFull;
+
+    /* Statistics maintained by Host Coalescing. */
+    T3_64BIT_REGISTER nicRingSetSendProdIndex;
+    T3_64BIT_REGISTER nicRingStatusUpdate;
+    T3_64BIT_REGISTER nicInterrupts;
+    T3_64BIT_REGISTER nicAvoidedInterrupts;
+    T3_64BIT_REGISTER nicSendThresholdHit;
+
+    LM_UINT8 Reserved4[0xb00-0x9c0];
+} T3_STATS_BLOCK, *PT3_STATS_BLOCK;
+
+
+
+/******************************************************************************/
+/* PCI configuration registers. */
+/******************************************************************************/
+
+typedef struct {
+    T3_16BIT_REGISTER VendorId;
+    T3_16BIT_REGISTER DeviceId;
+
+    T3_16BIT_REGISTER Command;
+    T3_16BIT_REGISTER Status;
+
+    T3_32BIT_REGISTER ClassCodeRevId;
+
+    T3_8BIT_REGISTER CacheLineSize;
+    T3_8BIT_REGISTER LatencyTimer;
+    T3_8BIT_REGISTER HeaderType;
+    T3_8BIT_REGISTER Bist;
+
+    T3_32BIT_REGISTER MemBaseAddrLow;
+    T3_32BIT_REGISTER MemBaseAddrHigh;
+
+    LM_UINT8 Unused1[20];
+
+    T3_16BIT_REGISTER SubsystemVendorId;
+    T3_16BIT_REGISTER SubsystemId;
+
+    T3_32BIT_REGISTER RomBaseAddr;
+
+    T3_8BIT_REGISTER PciXCapiblityPtr;
+    LM_UINT8 Unused2[7];
+
+    T3_8BIT_REGISTER IntLine;
+    T3_8BIT_REGISTER IntPin;
+    T3_8BIT_REGISTER MinGnt;
+    T3_8BIT_REGISTER MaxLat;
+
+    T3_8BIT_REGISTER PciXCapabilities;
+    T3_8BIT_REGISTER PmCapabilityPtr;
+    T3_16BIT_REGISTER PciXCommand;
+
+    T3_32BIT_REGISTER PciXStatus;
+
+    T3_8BIT_REGISTER PmCapabilityId;
+    T3_8BIT_REGISTER VpdCapabilityPtr;
+    T3_16BIT_REGISTER PmCapabilities;
+
+    T3_16BIT_REGISTER PmCtrlStatus;
+    #define PM_CTRL_PME_STATUS            BIT_15
+    #define PM_CTRL_PME_ENABLE            BIT_8
+    #define PM_CTRL_PME_POWER_STATE_D0    0
+    #define PM_CTRL_PME_POWER_STATE_D1    1
+    #define PM_CTRL_PME_POWER_STATE_D2    2
+    #define PM_CTRL_PME_POWER_STATE_D3H   3
+
+    T3_8BIT_REGISTER BridgeSupportExt;
+    T3_8BIT_REGISTER PmData;
+
+    T3_8BIT_REGISTER VpdCapabilityId;
+    T3_8BIT_REGISTER MsiCapabilityPtr;
+    T3_16BIT_REGISTER VpdAddrFlag;
+    #define VPD_FLAG_WRITE      (1 << 15)
+    #define VPD_FLAG_RW_MASK    (1 << 15)
+    #define VPD_FLAG_READ       0
+
+
+    T3_32BIT_REGISTER VpdData;
+
+    T3_8BIT_REGISTER MsiCapabilityId;
+    T3_8BIT_REGISTER NextCapabilityPtr;
+    T3_16BIT_REGISTER MsiCtrl;
+    #define MSI_CTRL_64BIT_CAP     (1 << 7)
+    #define MSI_CTRL_MSG_ENABLE(x) (x << 4)
+    #define MSI_CTRL_MSG_CAP(x)    (x << 1)
+    #define MSI_CTRL_ENABLE        (1 << 0)
+  
+
+    T3_32BIT_REGISTER MsiAddrLow;
+    T3_32BIT_REGISTER MsiAddrHigh;
+
+    T3_16BIT_REGISTER MsiData;
+    T3_16BIT_REGISTER Unused3;
+
+    T3_32BIT_REGISTER MiscHostCtrl;
+    #define MISC_HOST_CTRL_CLEAR_INT                        BIT_0
+    #define MISC_HOST_CTRL_MASK_PCI_INT                     BIT_1
+    #define MISC_HOST_CTRL_ENABLE_ENDIAN_BYTE_SWAP          BIT_2
+    #define MISC_HOST_CTRL_ENABLE_ENDIAN_WORD_SWAP          BIT_3
+    #define MISC_HOST_CTRL_ENABLE_PCI_STATE_REG_RW          BIT_4
+    #define MISC_HOST_CTRL_ENABLE_CLK_REG_RW                BIT_5
+    #define MISC_HOST_CTRL_ENABLE_REG_WORD_SWAP             BIT_6
+    #define MISC_HOST_CTRL_ENABLE_INDIRECT_ACCESS           BIT_7
+    #define MISC_HOST_CTRL_ENABLE_INT_MASK_MODE             BIT_8
+    #define MISC_HOST_CTRL_ENABLE_TAGGED_STATUS_MODE        BIT_9
+
+    T3_32BIT_REGISTER DmaReadWriteCtrl;
+    #define DMA_CTRL_WRITE_CMD                      0x70000000
+    #define DMA_CTRL_WRITE_BOUNDARY_64_PCIE         0x10000000
+    #define DMA_CTRL_WRITE_BOUNDARY_128_PCIE        0x30000000
+    #define DMA_CTRL_WRITE_BOUNDARY_DISABLE_PCIE    0x70000000
+    #define DMA_CTRL_READ_CMD                       0x06000000
+
+    #define DMA_CTRL_WRITE_BOUNDARY_MASK            (BIT_11 | BIT_12 | BIT_13)
+    #define DMA_CTRL_WRITE_BOUNDARY_DISABLE         0
+    #define DMA_CTRL_WRITE_BOUNDARY_16              BIT_11
+    #define DMA_CTRL_WRITE_BOUNDARY_128_PCIX        BIT_11
+    #define DMA_CTRL_WRITE_BOUNDARY_32              BIT_12
+    #define DMA_CTRL_WRITE_BOUNDARY_256_PCIX        BIT_12
+    #define DMA_CTRL_WRITE_BOUNDARY_64              (BIT_12 | BIT_11)
+    #define DMA_CTRL_WRITE_BOUNDARY_384_PCIX        (BIT_12 | BIT_11)
+    #define DMA_CTRL_WRITE_BOUNDARY_128             BIT_13
+    #define DMA_CTRL_WRITE_BOUNDARY_256             (BIT_13 | BIT_11)
+    #define DMA_CTRL_WRITE_BOUNDARY_512             (BIT_13 | BIT_12)
+    #define DMA_CTRL_WRITE_BOUNDARY_1024            (BIT_13 | BIT_12 | BIT_11)
+    #define DMA_CTRL_WRITE_ONE_DMA_AT_ONCE          BIT_14
+
+    #define DMA_CTRL_READ_BOUNDARY_MASK             (BIT_10 | BIT_9 | BIT_8)
+    #define DMA_CTRL_READ_BOUNDARY_DISABLE          0
+    #define DMA_CTRL_READ_BOUNDARY_16               BIT_8
+    #define DMA_CTRL_READ_BOUNDARY_128_PCIX         BIT_8
+    #define DMA_CTRL_READ_BOUNDARY_32               BIT_9
+    #define DMA_CTRL_READ_BOUNDARY_256_PCIX         BIT_9
+    #define DMA_CTRL_READ_BOUNDARY_64               (BIT_9 | BIT_8)
+    #define DMA_CTRL_READ_BOUNDARY_384_PCIX         (BIT_9 | BIT_8)
+    #define DMA_CTRL_READ_BOUNDARY_128              BIT_10
+    #define DMA_CTRL_READ_BOUNDARY_256              (BIT_10 | BIT_8)
+    #define DMA_CTRL_READ_BOUNDARY_512              (BIT_10 | BIT_9)
+    #define DMA_CTRL_READ_BOUNDARY_1024             (BIT_10 | BIT_9 | BIT_8)
+
+    T3_32BIT_REGISTER PciState;
+    #define T3_PCI_STATE_FORCE_PCI_RESET                    BIT_0
+    #define T3_PCI_STATE_INTERRUPT_NOT_ACTIVE               BIT_1
+    #define T3_PCI_STATE_NOT_PCI_X_BUS                      BIT_2
+    #define T3_PCI_STATE_HIGH_BUS_SPEED                     BIT_3
+    #define T3_PCI_STATE_32BIT_PCI_BUS                      BIT_4
+    #define T3_PCI_STATE_PCI_ROM_ENABLE                     BIT_5
+    #define T3_PCI_STATE_PCI_ROM_RETRY_ENABLE               BIT_6
+    #define T3_PCI_STATE_FLAT_VIEW                          BIT_8
+    #define T3_PCI_STATE_RETRY_SAME_DMA                     BIT_13
+
+    T3_32BIT_REGISTER ClockCtrl;
+    #define T3_PCI_CLKCTRL_TXCPU_CLK_DISABLE                BIT_11
+    #define T3_PCI_CLKCTRL_RXCPU_CLK_DISABLE                BIT_10
+    #define T3_PCI_CLKCTRL_CORE_CLK_DISABLE                 BIT_9
+
+    T3_32BIT_REGISTER RegBaseAddr;
+
+    T3_32BIT_REGISTER MemWindowBaseAddr;
+    
+#ifdef NIC_CPU_VIEW
+  /* These registers are ONLY visible to NIC CPU */
+    T3_32BIT_REGISTER PowerConsumed;
+    T3_32BIT_REGISTER PowerDissipated;
+#else /* NIC_CPU_VIEW */
+    T3_32BIT_REGISTER RegData;
+    T3_32BIT_REGISTER MemWindowData;
+#endif /* !NIC_CPU_VIEW */
+
+    T3_32BIT_REGISTER ModeCtrl;
+
+    T3_32BIT_REGISTER MiscCfg;
+
+    T3_32BIT_REGISTER MiscLocalCtrl;
+
+    T3_32BIT_REGISTER Unused4;
+
+    /* NOTE: Big/Little-endian clarification needed.  Are these register */
+    /* in big or little endian formate. */
+    T3_64BIT_REGISTER StdRingProdIdx;
+    T3_64BIT_REGISTER RcvRetRingConIdx;
+    T3_64BIT_REGISTER SndProdIdx;
+
+    T3_32BIT_REGISTER Unused5[2];
+
+    T3_32BIT_REGISTER DualMacCtrl;
+    #define T3_DUAL_MAC_CH_CTRL_MASK     (BIT_1 | BIT_0)
+    #define T3_DUAL_MAC_ID               BIT_2
+
+    LM_UINT8 Unused6[68];
+
+} T3_PCI_CONFIGURATION, *PT3_PCI_CONFIGURATION;
+
+#define PCIX_CMD_MAX_SPLIT_MASK                         0x00700000
+#define PCIX_CMD_MAX_SPLIT_SHL                          20
+#define PCIX_CMD_MAX_BURST_MASK                         0x000c0000
+#define PCIX_CMD_MAX_BURST_SHL                          18
+#define PCIX_CMD_MAX_BURST_CPIOB                        2
+
+/******************************************************************************/
+/* Mac control registers. */
+/******************************************************************************/
+
+typedef struct {
+    /* MAC mode control. */
+    T3_32BIT_REGISTER Mode;
+    #define MAC_MODE_GLOBAL_RESET                       BIT_0
+    #define MAC_MODE_HALF_DUPLEX                        BIT_1
+    #define MAC_MODE_PORT_MODE_MASK                     (BIT_2 | BIT_3)
+    #define MAC_MODE_PORT_MODE_TBI                      (BIT_2 | BIT_3)
+    #define MAC_MODE_PORT_MODE_GMII                     BIT_3
+    #define MAC_MODE_PORT_MODE_MII                      BIT_2
+    #define MAC_MODE_PORT_MODE_NONE                     BIT_NONE
+    #define MAC_MODE_PORT_INTERNAL_LOOPBACK             BIT_4
+    #define MAC_MODE_TAGGED_MAC_CONTROL                 BIT_7
+    #define MAC_MODE_TX_BURSTING                        BIT_8
+    #define MAC_MODE_MAX_DEFER                          BIT_9
+    #define MAC_MODE_LINK_POLARITY                      BIT_10
+    #define MAC_MODE_ENABLE_RX_STATISTICS               BIT_11
+    #define MAC_MODE_CLEAR_RX_STATISTICS                BIT_12
+    #define MAC_MODE_FLUSH_RX_STATISTICS                BIT_13
+    #define MAC_MODE_ENABLE_TX_STATISTICS               BIT_14
+    #define MAC_MODE_CLEAR_TX_STATISTICS                BIT_15
+    #define MAC_MODE_FLUSH_TX_STATISTICS                BIT_16
+    #define MAC_MODE_SEND_CONFIGS                       BIT_17
+    #define MAC_MODE_DETECT_MAGIC_PACKET_ENABLE         BIT_18
+    #define MAC_MODE_ACPI_POWER_ON_ENABLE               BIT_19
+    #define MAC_MODE_ENABLE_MIP                         BIT_20
+    #define MAC_MODE_ENABLE_TDE                         BIT_21
+    #define MAC_MODE_ENABLE_RDE                         BIT_22
+    #define MAC_MODE_ENABLE_FHDE                        BIT_23
+
+    /* MAC status */
+    T3_32BIT_REGISTER Status;
+    #define MAC_STATUS_PCS_SYNCED                       BIT_0
+    #define MAC_STATUS_SIGNAL_DETECTED                  BIT_1
+    #define MAC_STATUS_RECEIVING_CFG                    BIT_2
+    #define MAC_STATUS_CFG_CHANGED                      BIT_3
+    #define MAC_STATUS_SYNC_CHANGED                     BIT_4
+    #define MAC_STATUS_PORT_DECODE_ERROR                BIT_10
+    #define MAC_STATUS_LINK_STATE_CHANGED               BIT_12
+    #define MAC_STATUS_MI_COMPLETION                    BIT_22
+    #define MAC_STATUS_MI_INTERRUPT                     BIT_23
+    #define MAC_STATUS_AP_ERROR                         BIT_24
+    #define MAC_STATUS_ODI_ERROR                        BIT_25
+    #define MAC_STATUS_RX_STATS_OVERRUN                 BIT_26
+    #define MAC_STATUS_TX_STATS_OVERRUN                 BIT_27
+
+    /* Event Enable */
+    T3_32BIT_REGISTER MacEvent;
+    #define MAC_EVENT_ENABLE_PORT_DECODE_ERR            BIT_10
+    #define MAC_EVENT_ENABLE_LINK_STATE_CHANGED_ATTN    BIT_12
+    #define MAC_EVENT_ENABLE_MI_COMPLETION              BIT_22
+    #define MAC_EVENT_ENABLE_MI_INTERRUPT               BIT_23
+    #define MAC_EVENT_ENABLE_AP_ERROR                   BIT_24
+    #define MAC_EVENT_ENABLE_ODI_ERROR                  BIT_25
+    #define MAC_EVENT_ENABLE_RX_STATS_OVERRUN           BIT_26
+    #define MAC_EVENT_ENABLE_TX_STATS_OVERRUN           BIT_27
+
+    /* Led control. */
+    T3_32BIT_REGISTER LedCtrl;
+    #define LED_CTRL_OVERRIDE_LINK_LED                  BIT_0
+    #define LED_CTRL_1000MBPS_LED_ON                    BIT_1
+    #define LED_CTRL_100MBPS_LED_ON                     BIT_2
+    #define LED_CTRL_10MBPS_LED_ON                      BIT_3
+    #define LED_CTRL_OVERRIDE_TRAFFIC_LED               BIT_4
+    #define LED_CTRL_BLINK_TRAFFIC_LED                  BIT_5
+    #define LED_CTRL_TRAFFIC_LED                        BIT_6
+    #define LED_CTRL_1000MBPS_LED_STATUS                BIT_7
+    #define LED_CTRL_100MBPS_LED_STATUS                 BIT_8
+    #define LED_CTRL_10MBPS_LED_STATUS                  BIT_9
+    #define LED_CTRL_TRAFFIC_LED_STATUS                 BIT_10
+    #define LED_CTRL_MAC_MODE                           BIT_NONE
+    #define LED_CTRL_PHY_MODE_1                         BIT_11
+    #define LED_CTRL_PHY_MODE_2                         BIT_12
+    #define LED_CTRL_SHASTA_MAC_MODE                    BIT_13
+    #define LED_CTRL_SHARED_TRAFFIC_LINK                BIT_14
+    #define LED_CTRL_WIRELESS_COMBO                     BIT_15
+    #define LED_CTRL_BLINK_RATE_MASK                    0x7ff80000
+    #define LED_CTRL_OVERRIDE_BLINK_PERIOD              BIT_19
+    #define LED_CTRL_OVERRIDE_BLINK_RATE                BIT_31
+
+    /* MAC addresses. */
+    struct {
+        T3_32BIT_REGISTER High;             /* Upper 2 bytes. */
+        T3_32BIT_REGISTER Low;              /* Lower 4 bytes. */
+    } MacAddr[4];
+
+    /* ACPI Mbuf pointer. */
+    T3_32BIT_REGISTER AcpiMbufPtr;
+
+    /* ACPI Length and Offset. */
+    T3_32BIT_REGISTER AcpiLengthOffset;
+    #define ACPI_LENGTH_MASK                            0xffff
+    #define ACPI_OFFSET_MASK                            0x0fff0000
+    #define ACPI_LENGTH(x)                              x
+    #define ACPI_OFFSET(x)                              ((x) << 16)
+
+    /* Transmit random backoff. */
+    T3_32BIT_REGISTER TxBackoffSeed;
+    #define MAC_TX_BACKOFF_SEED_MASK                    0x3ff
+
+    /* Receive MTU */
+    T3_32BIT_REGISTER MtuSize;
+    #define MAC_RX_MTU_MASK                             0xffff
+
+    /* Gigabit PCS Test. */
+    T3_32BIT_REGISTER PcsTest;
+    #define MAC_PCS_TEST_DATA_PATTERN_MASK              0x0fffff
+    #define MAC_PCS_TEST_ENABLE                         BIT_20
+
+    /* Transmit Gigabit Auto-Negotiation. */
+    T3_32BIT_REGISTER TxAutoNeg;
+    #define MAC_AN_TX_AN_DATA_MASK                      0xffff
+
+    /* Receive Gigabit Auto-Negotiation. */
+    T3_32BIT_REGISTER RxAutoNeg;
+    #define MAC_AN_RX_AN_DATA_MASK                      0xffff
+
+    /* MI Communication. */
+    T3_32BIT_REGISTER MiCom;
+    #define MI_COM_CMD_MASK                             (BIT_26 | BIT_27)
+    #define MI_COM_CMD_WRITE                            BIT_26
+    #define MI_COM_CMD_READ                             BIT_27
+    #define MI_COM_READ_FAILED                          BIT_28
+    #define MI_COM_START                                BIT_29
+    #define MI_COM_BUSY                                 BIT_29
+
+    #define MI_COM_PHY_ADDR_MASK                        0x1f
+    #define MI_COM_FIRST_PHY_ADDR_BIT                   21
+
+    #define MI_COM_PHY_REG_ADDR_MASK                    0x1f
+    #define MI_COM_FIRST_PHY_REG_ADDR_BIT               16
+
+    #define MI_COM_PHY_DATA_MASK                        0xffff
+
+    /* MI Status. */
+    T3_32BIT_REGISTER MiStatus;
+    #define MI_STATUS_ENABLE_LINK_STATUS_ATTN           BIT_0
+    #define MI_STATUS_10MBPS                            BIT_1
+
+    /* MI Mode. */
+    T3_32BIT_REGISTER MiMode;
+    #define MI_MODE_CLOCK_SPEED_10MHZ                   BIT_0
+    #define MI_MODE_USE_SHORT_PREAMBLE                  BIT_1
+    #define MI_MODE_AUTO_POLLING_ENABLE                 BIT_4
+    #define MI_MODE_CORE_CLOCK_SPEED_62MHZ              BIT_15
+
+    /* Auto-polling status. */
+    T3_32BIT_REGISTER AutoPollStatus;
+    #define AUTO_POLL_ERROR                             BIT_0
+
+    /* Transmit MAC mode. */
+    T3_32BIT_REGISTER TxMode;
+    #define TX_MODE_RESET                               BIT_0
+    #define TX_MODE_ENABLE                              BIT_1
+    #define TX_MODE_ENABLE_FLOW_CONTROL                 BIT_4
+    #define TX_MODE_ENABLE_BIG_BACKOFF                  BIT_5
+    #define TX_MODE_ENABLE_LONG_PAUSE                   BIT_6
+
+    /* Transmit MAC status. */
+    T3_32BIT_REGISTER TxStatus;
+    #define TX_STATUS_RX_CURRENTLY_XOFFED               BIT_0
+    #define TX_STATUS_SENT_XOFF                         BIT_1
+    #define TX_STATUS_SENT_XON                          BIT_2
+    #define TX_STATUS_LINK_UP                           BIT_3
+    #define TX_STATUS_ODI_UNDERRUN                      BIT_4
+    #define TX_STATUS_ODI_OVERRUN                       BIT_5
+
+    /* Transmit MAC length. */
+    T3_32BIT_REGISTER TxLengths;
+    #define TX_LEN_SLOT_TIME_MASK                       0xff
+    #define TX_LEN_IPG_MASK                             0x0f00
+    #define TX_LEN_IPG_CRS_MASK                         (BIT_12 | BIT_13)
+
+    /* Receive MAC mode. */
+    T3_32BIT_REGISTER RxMode;
+    #define RX_MODE_RESET                               BIT_0
+    #define RX_MODE_ENABLE                              BIT_1
+    #define RX_MODE_ENABLE_FLOW_CONTROL                 BIT_2
+    #define RX_MODE_KEEP_MAC_CONTROL                    BIT_3
+    #define RX_MODE_KEEP_PAUSE                          BIT_4
+    #define RX_MODE_ACCEPT_OVERSIZED                    BIT_5
+    #define RX_MODE_ACCEPT_RUNTS                        BIT_6
+    #define RX_MODE_LENGTH_CHECK                        BIT_7
+    #define RX_MODE_PROMISCUOUS_MODE                    BIT_8
+    #define RX_MODE_NO_CRC_CHECK                        BIT_9
+    #define RX_MODE_KEEP_VLAN_TAG                       BIT_10
+
+    /* Receive MAC status. */
+    T3_32BIT_REGISTER RxStatus;
+    #define RX_STATUS_REMOTE_TRANSMITTER_XOFFED         BIT_0
+    #define RX_STATUS_XOFF_RECEIVED                     BIT_1
+    #define RX_STATUS_XON_RECEIVED                      BIT_2
+
+    /* Hash registers. */
+    T3_32BIT_REGISTER HashReg[4];
+
+    /* Receive placement rules registers. */
+    struct {
+        T3_32BIT_REGISTER Rule;
+        T3_32BIT_REGISTER Value;
+    } RcvRules[16];
+
+    #define RCV_DISABLE_RULE_MASK                       0x7fffffff
+
+    #define RCV_RULE1_REJECT_BROADCAST_IDX              0x00
+    #define REJECT_BROADCAST_RULE1_RULE                 0xc2000000
+    #define REJECT_BROADCAST_RULE1_VALUE                0xffffffff
+
+    #define RCV_RULE2_REJECT_BROADCAST_IDX              0x01
+    #define REJECT_BROADCAST_RULE2_RULE                 0x86000004
+    #define REJECT_BROADCAST_RULE2_VALUE                0xffffffff
+
+#if INCLUDE_5701_AX_FIX
+    #define RCV_LAST_RULE_IDX                           0x04
+#else
+    #define RCV_LAST_RULE_IDX                           0x02
+#endif
+
+    T3_32BIT_REGISTER RcvRuleCfg;
+    #define RX_RULE_DEFAULT_CLASS                       (1 << 3)
+
+    T3_32BIT_REGISTER LowWaterMarkMaxRxFrame;
+
+    LM_UINT8 Reserved1[24];
+
+    T3_32BIT_REGISTER HashRegU[4];
+
+    struct {
+        T3_32BIT_REGISTER High;
+        T3_32BIT_REGISTER Low;
+    } MacAddrExt[12];
+
+    T3_32BIT_REGISTER SerdesCfg;
+    T3_32BIT_REGISTER SerdesStatus;
+
+    LM_UINT8 Reserved2[24];
+
+    T3_32BIT_REGISTER SgDigControl;
+    T3_32BIT_REGISTER SgDigStatus;
+
+    LM_UINT8 Reserved3[72];
+
+    volatile LM_UINT8 TxMacState[16];
+    volatile LM_UINT8 RxMacState[20];
+
+    LM_UINT8 Reserved4[476];
+
+    T3_32BIT_REGISTER ifHCOutOctets;
+    T3_32BIT_REGISTER Reserved5;
+    T3_32BIT_REGISTER etherStatsCollisions;
+    T3_32BIT_REGISTER outXonSent;
+    T3_32BIT_REGISTER outXoffSent;
+    T3_32BIT_REGISTER Reserved6;
+    T3_32BIT_REGISTER dot3StatsInternalMacTransmitErrors;
+    T3_32BIT_REGISTER dot3StatsSingleCollisionFrames;
+    T3_32BIT_REGISTER dot3StatsMultipleCollisionFrames;
+    T3_32BIT_REGISTER dot3StatsDeferredTransmissions;
+    T3_32BIT_REGISTER Reserved7;
+    T3_32BIT_REGISTER dot3StatsExcessiveCollisions;
+    T3_32BIT_REGISTER dot3StatsLateCollisions;
+    T3_32BIT_REGISTER Reserved8[14];
+    T3_32BIT_REGISTER ifHCOutUcastPkts;
+    T3_32BIT_REGISTER ifHCOutMulticastPkts;
+    T3_32BIT_REGISTER ifHCOutBroadcastPkts;
+    T3_32BIT_REGISTER Reserved9[2];
+    T3_32BIT_REGISTER ifHCInOctets;
+    T3_32BIT_REGISTER Reserved10;
+    T3_32BIT_REGISTER etherStatsFragments;
+    T3_32BIT_REGISTER ifHCInUcastPkts;
+    T3_32BIT_REGISTER ifHCInMulticastPkts;
+    T3_32BIT_REGISTER ifHCInBroadcastPkts;
+    T3_32BIT_REGISTER dot3StatsFCSErrors;
+    T3_32BIT_REGISTER dot3StatsAlignmentErrors;
+    T3_32BIT_REGISTER xonPauseFramesReceived;
+    T3_32BIT_REGISTER xoffPauseFramesReceived;
+    T3_32BIT_REGISTER macControlFramesReceived;
+    T3_32BIT_REGISTER xoffStateEntered;
+    T3_32BIT_REGISTER dot3StatsFramesTooLong;
+    T3_32BIT_REGISTER etherStatsJabbers;
+    T3_32BIT_REGISTER etherStatsUndersizePkts;
+
+    T3_32BIT_REGISTER Reserved11[209];
+
+} T3_MAC_CONTROL, *PT3_MAC_CONTROL;
+
+
+
+/******************************************************************************/
+/* Send data initiator control registers. */
+/******************************************************************************/
+
+typedef struct {
+    T3_32BIT_REGISTER Mode;
+    #define T3_SND_DATA_IN_MODE_RESET                       BIT_0
+    #define T3_SND_DATA_IN_MODE_ENABLE                      BIT_1
+    #define T3_SND_DATA_IN_MODE_STATS_OFLW_ATTN_ENABLE      BIT_2
+
+    T3_32BIT_REGISTER Status;
+    #define T3_SND_DATA_IN_STATUS_STATS_OFLW_ATTN           BIT_2
+
+    T3_32BIT_REGISTER StatsCtrl;
+    #define T3_SND_DATA_IN_STATS_CTRL_ENABLE                BIT_0
+    #define T3_SND_DATA_IN_STATS_CTRL_FASTER_UPDATE         BIT_1
+    #define T3_SND_DATA_IN_STATS_CTRL_CLEAR                 BIT_2
+    #define T3_SND_DATA_IN_STATS_CTRL_FLUSH                 BIT_3
+    #define T3_SND_DATA_IN_STATS_CTRL_FORCE_ZERO            BIT_4
+
+    T3_32BIT_REGISTER StatsEnableMask;
+
+    T3_32BIT_REGISTER StatsIncMask;
+
+    LM_UINT8 Reserved[108];
+
+    T3_32BIT_REGISTER ClassOfServCnt[16];
+    T3_32BIT_REGISTER DmaReadQFullCnt;
+    T3_32BIT_REGISTER DmaPriorityReadQFullCnt;
+    T3_32BIT_REGISTER SdcQFullCnt;
+
+    T3_32BIT_REGISTER NicRingSetSendProdIdxCnt;
+    T3_32BIT_REGISTER StatusUpdatedCnt;
+    T3_32BIT_REGISTER InterruptsCnt;
+    T3_32BIT_REGISTER AvoidInterruptsCnt;
+    T3_32BIT_REGISTER SendThresholdHitCnt;
+
+    /* Unused space. */
+    LM_UINT8 Unused[800];
+} T3_SEND_DATA_INITIATOR, *PT3_SEND_DATA_INITIATOR;
+
+
+
+/******************************************************************************/
+/* Send data completion control registers. */
+/******************************************************************************/
+
+typedef struct {
+    T3_32BIT_REGISTER Mode;
+    #define SND_DATA_COMP_MODE_RESET                        BIT_0
+    #define SND_DATA_COMP_MODE_ENABLE                       BIT_1
+
+    /* Unused space. */
+    LM_UINT8 Unused[1020];
+} T3_SEND_DATA_COMPLETION, *PT3_SEND_DATA_COMPLETION;
+
+
+
+/******************************************************************************/
+/* Send BD Ring Selector Control Registers. */
+/******************************************************************************/
+
+typedef struct {
+    T3_32BIT_REGISTER Mode;
+    #define SND_BD_SEL_MODE_RESET                           BIT_0
+    #define SND_BD_SEL_MODE_ENABLE                          BIT_1
+    #define SND_BD_SEL_MODE_ATTN_ENABLE                     BIT_2
+
+    T3_32BIT_REGISTER Status;
+    #define SND_BD_SEL_STATUS_ERROR_ATTN                    BIT_2
+
+    T3_32BIT_REGISTER HwDiag;
+
+    /* Unused space. */
+    LM_UINT8 Unused1[52];
+
+    /* Send BD Ring Selector Local NIC Send BD Consumer Index. */
+    T3_32BIT_REGISTER NicSendBdSelConIdx[16];
+
+    /* Unused space. */
+    LM_UINT8 Unused2[896];
+} T3_SEND_BD_SELECTOR, *PT3_SEND_BD_SELECTOR;
+
+
+
+/******************************************************************************/
+/* Send BD initiator control registers. */
+/******************************************************************************/
+
+typedef struct {
+    T3_32BIT_REGISTER Mode;
+    #define SND_BD_IN_MODE_RESET                            BIT_0
+    #define SND_BD_IN_MODE_ENABLE                           BIT_1
+    #define SND_BD_IN_MODE_ATTN_ENABLE                      BIT_2
+
+    T3_32BIT_REGISTER Status;
+    #define SND_BD_IN_STATUS_ERROR_ATTN                     BIT_2
+
+    /* Send BD initiator local NIC send BD producer index. */
+    T3_32BIT_REGISTER NicSendBdInProdIdx[16];
+
+    /* Unused space. */
+    LM_UINT8 Unused2[952];
+} T3_SEND_BD_INITIATOR, *PT3_SEND_BD_INITIATOR;
+
+
+
+/******************************************************************************/
+/* Send BD Completion Control. */
+/******************************************************************************/
+
+typedef struct {
+    T3_32BIT_REGISTER Mode;
+    #define SND_BD_COMP_MODE_RESET                          BIT_0
+    #define SND_BD_COMP_MODE_ENABLE                         BIT_1
+    #define SND_BD_COMP_MODE_ATTN_ENABLE                    BIT_2
+
+    /* Unused space. */
+    LM_UINT8 Unused2[1020];
+} T3_SEND_BD_COMPLETION, *PT3_SEND_BD_COMPLETION;
+
+
+
+/******************************************************************************/
+/* Receive list placement control registers. */
+/******************************************************************************/
+
+typedef struct {
+    /* Mode. */
+    T3_32BIT_REGISTER Mode;
+    #define RCV_LIST_PLMT_MODE_RESET                        BIT_0
+    #define RCV_LIST_PLMT_MODE_ENABLE                       BIT_1
+    #define RCV_LIST_PLMT_MODE_CLASS0_ATTN_ENABLE           BIT_2
+    #define RCV_LIST_PLMT_MODE_MAPPING_OOR_ATTN_ENABLE      BIT_3
+    #define RCV_LIST_PLMT_MODE_STATS_OFLOW_ATTN_ENABLE      BIT_4
+
+    /* Status. */
+    T3_32BIT_REGISTER Status;
+    #define RCV_LIST_PLMT_STATUS_CLASS0_ATTN                BIT_2
+    #define RCV_LIST_PLMT_STATUS_MAPPING_ATTN               BIT_3
+    #define RCV_LIST_PLMT_STATUS_STATS_OFLOW_ATTN           BIT_4
+
+    /* Receive selector list lock register. */
+    T3_32BIT_REGISTER Lock;
+    #define RCV_LIST_SEL_LOCK_REQUEST_MASK                  0xffff
+    #define RCV_LIST_SEL_LOCK_GRANT_MASK                    0xffff0000
+
+    /* Selector non-empty bits. */
+    T3_32BIT_REGISTER NonEmptyBits;
+    #define RCV_LIST_SEL_NON_EMPTY_MASK                     0xffff
+
+    /* Receive list placement configuration register. */
+    T3_32BIT_REGISTER Config;
+
+    /* Receive List Placement statistics Control. */
+    T3_32BIT_REGISTER StatsCtrl;
+#define RCV_LIST_STATS_ENABLE                               BIT_0
+#define RCV_LIST_STATS_FAST_UPDATE                          BIT_1
+
+    /* Receive List Placement statistics Enable Mask. */
+    T3_32BIT_REGISTER StatsEnableMask;
+    #define T3_DISABLE_LONG_BURST_READ_DYN_FIX              BIT_22
+
+    /* Receive List Placement statistics Increment Mask. */
+    T3_32BIT_REGISTER StatsIncMask;
+
+    /* Unused space. */
+    LM_UINT8 Unused1[224];
+
+    struct {
+        T3_32BIT_REGISTER Head;
+        T3_32BIT_REGISTER Tail;
+        T3_32BIT_REGISTER Count;
+
+        /* Unused space. */
+        LM_UINT8 Unused[4];
+    } RcvSelectorList[16];
+
+    /* Local statistics counter. */
+    T3_32BIT_REGISTER ClassOfServCnt[16];
+
+    T3_32BIT_REGISTER DropDueToFilterCnt;
+    T3_32BIT_REGISTER DmaWriteQFullCnt;
+    T3_32BIT_REGISTER DmaHighPriorityWriteQFullCnt;
+    T3_32BIT_REGISTER NoMoreReceiveBdCnt;
+    T3_32BIT_REGISTER IfInDiscardsCnt;
+    T3_32BIT_REGISTER IfInErrorsCnt;
+    T3_32BIT_REGISTER RcvThresholdHitCnt;
+
+    /* Another unused space. */
+    LM_UINT8 Unused2[420];
+} T3_RCV_LIST_PLACEMENT, *PT3_RCV_LIST_PLACEMENT;
+
+
+
+/******************************************************************************/
+/* Receive Data and Receive BD Initiator Control. */
+/******************************************************************************/
+
+typedef struct {
+    /* Mode. */
+    T3_32BIT_REGISTER Mode;
+    #define RCV_DATA_BD_IN_MODE_RESET                   BIT_0
+    #define RCV_DATA_BD_IN_MODE_ENABLE                  BIT_1
+    #define RCV_DATA_BD_IN_MODE_JUMBO_BD_NEEDED         BIT_2
+    #define RCV_DATA_BD_IN_MODE_FRAME_TOO_BIG           BIT_3
+    #define RCV_DATA_BD_IN_MODE_INVALID_RING_SIZE       BIT_4
+
+    /* Status. */
+    T3_32BIT_REGISTER Status;
+    #define RCV_DATA_BD_IN_STATUS_JUMBO_BD_NEEDED       BIT_2
+    #define RCV_DATA_BD_IN_STATUS_FRAME_TOO_BIG         BIT_3
+    #define RCV_DATA_BD_IN_STATUS_INVALID_RING_SIZE     BIT_4
+
+    /* Split frame minium size. */
+    T3_32BIT_REGISTER SplitFrameMinSize;
+
+    /* Unused space. */
+    LM_UINT8 Unused1[0x2440-0x240c];
+
+    /* Receive RCBs. */
+    T3_RCB JumboRcvRcb;
+    T3_RCB StdRcvRcb;
+    T3_RCB MiniRcvRcb;
+
+    /* Receive Data and Receive BD Ring Initiator Local NIC Receive */
+    /* BD Consumber Index. */
+    T3_32BIT_REGISTER NicJumboConIdx;
+    T3_32BIT_REGISTER NicStdConIdx;
+    T3_32BIT_REGISTER NicMiniConIdx;
+
+    /* Unused space. */
+    LM_UINT8 Unused2[4];
+
+    /* Receive Data and Receive BD Initiator Local Receive Return ProdIdx. */
+    T3_32BIT_REGISTER RcvDataBdProdIdx[16];
+
+    /* Receive Data and Receive BD Initiator Hardware Diagnostic. */
+    T3_32BIT_REGISTER HwDiag;
+
+    /* Unused space. */
+    LM_UINT8 Unused3[828];
+} T3_RCV_DATA_BD_INITIATOR, *PT3_RCV_DATA_BD_INITIATOR;
+
+
+
+/******************************************************************************/
+/* Receive Data Completion Control Registes. */
+/******************************************************************************/
+
+typedef struct {
+    T3_32BIT_REGISTER Mode;
+    #define RCV_DATA_COMP_MODE_RESET                        BIT_0
+    #define RCV_DATA_COMP_MODE_ENABLE                       BIT_1
+    #define RCV_DATA_COMP_MODE_ATTN_ENABLE                  BIT_2
+
+    /* Unused spaced. */
+    LM_UINT8 Unused[1020];
+} T3_RCV_DATA_COMPLETION, *PT3_RCV_DATA_COMPLETION;
+
+
+
+/******************************************************************************/
+/* Receive BD Initiator Control. */
+/******************************************************************************/
+
+typedef struct {
+    T3_32BIT_REGISTER Mode;
+    #define RCV_BD_IN_MODE_RESET                            BIT_0
+    #define RCV_BD_IN_MODE_ENABLE                           BIT_1
+    #define RCV_BD_IN_MODE_BD_IN_DIABLED_RCB_ATTN_ENABLE    BIT_2
+
+    T3_32BIT_REGISTER Status;
+    #define RCV_BD_IN_STATUS_BD_IN_DIABLED_RCB_ATTN         BIT_2
+
+    T3_32BIT_REGISTER NicJumboRcvProdIdx;
+    T3_32BIT_REGISTER NicStdRcvProdIdx;
+    T3_32BIT_REGISTER NicMiniRcvProdIdx;
+
+    T3_32BIT_REGISTER MiniRcvThreshold;
+    T3_32BIT_REGISTER StdRcvThreshold;
+    T3_32BIT_REGISTER JumboRcvThreshold;
+
+    /* Unused space. */
+    LM_UINT8 Unused[992];
+} T3_RCV_BD_INITIATOR, *PT3_RCV_BD_INITIATOR;
+
+
+
+/******************************************************************************/
+/* Receive BD Completion Control Registers. */
+/******************************************************************************/
+
+typedef struct {
+    T3_32BIT_REGISTER Mode;
+    #define RCV_BD_COMP_MODE_RESET                          BIT_0
+    #define RCV_BD_COMP_MODE_ENABLE                         BIT_1
+    #define RCV_BD_COMP_MODE_ATTN_ENABLE                    BIT_2
+
+    T3_32BIT_REGISTER Status;
+    #define RCV_BD_COMP_STATUS_ERROR_ATTN                   BIT_2
+
+    T3_32BIT_REGISTER  NicJumboRcvBdProdIdx;
+    T3_32BIT_REGISTER  NicStdRcvBdProdIdx;
+    T3_32BIT_REGISTER  NicMiniRcvBdProdIdx;
+
+    /* Unused space. */
+    LM_UINT8 Unused[1004];
+} T3_RCV_BD_COMPLETION, *PT3_RCV_BD_COMPLETION;
+
+
+
+/******************************************************************************/
+/* Receive list selector control register. */
+/******************************************************************************/
+
+typedef struct {
+    T3_32BIT_REGISTER Mode;
+    #define RCV_LIST_SEL_MODE_RESET                         BIT_0
+    #define RCV_LIST_SEL_MODE_ENABLE                        BIT_1
+    #define RCV_LIST_SEL_MODE_ATTN_ENABLE                   BIT_2
+
+    T3_32BIT_REGISTER Status;
+    #define RCV_LIST_SEL_STATUS_ERROR_ATTN                  BIT_2
+
+    /* Unused space. */
+    LM_UINT8 Unused[1016];
+} T3_RCV_LIST_SELECTOR, *PT3_RCV_LIST_SELECTOR;
+
+
+
+/******************************************************************************/
+/* Mbuf cluster free registers. */
+/******************************************************************************/
+
+typedef struct {
+    T3_32BIT_REGISTER Mode;
+#define MBUF_CLUSTER_FREE_MODE_RESET    BIT_0
+#define MBUF_CLUSTER_FREE_MODE_ENABLE   BIT_1
+
+    T3_32BIT_REGISTER Status;
+
+    /* Unused space. */
+    LM_UINT8 Unused[1016];
+} T3_MBUF_CLUSTER_FREE, *PT3_MBUF_CLUSTER_FREE;
+
+
+
+/******************************************************************************/
+/* Host coalescing control registers. */
+/******************************************************************************/
+
+typedef struct {
+    /* Mode. */
+    T3_32BIT_REGISTER Mode;
+    #define HOST_COALESCE_RESET                         BIT_0
+    #define HOST_COALESCE_ENABLE                        BIT_1
+    #define HOST_COALESCE_ATTN                          BIT_2
+    #define HOST_COALESCE_NOW                           BIT_3
+    #define HOST_COALESCE_FULL_STATUS_MODE              BIT_NONE
+    #define HOST_COALESCE_64_BYTE_STATUS_MODE           BIT_7
+    #define HOST_COALESCE_32_BYTE_STATUS_MODE           BIT_8
+    #define HOST_COALESCE_CLEAR_TICKS_ON_RX_BD_EVENT    BIT_9
+    #define HOST_COALESCE_CLEAR_TICKS_ON_TX_BD_EVENT    BIT_10
+    #define HOST_COALESCE_NO_INT_ON_COALESCE_NOW_MODE   BIT_11
+    #define HOST_COALESCE_NO_INT_ON_FORCE_DMAD_MODE     BIT_12
+
+    /* Status. */
+    T3_32BIT_REGISTER Status;
+    #define HOST_COALESCE_ERROR_ATTN                    BIT_2
+
+    /* Receive coalescing ticks. */
+    T3_32BIT_REGISTER RxCoalescingTicks;
+
+    /* Send coalescing ticks. */
+    T3_32BIT_REGISTER TxCoalescingTicks;
+
+    /* Receive max coalesced frames. */
+    T3_32BIT_REGISTER RxMaxCoalescedFrames;
+
+    /* Send max coalesced frames. */
+    T3_32BIT_REGISTER TxMaxCoalescedFrames;
+
+    /* Receive coalescing ticks during interrupt. */
+    T3_32BIT_REGISTER RxCoalescedTickDuringInt;
+
+    /* Send coalescing ticks during interrupt. */
+    T3_32BIT_REGISTER TxCoalescedTickDuringInt;
+
+    /* Receive max coalesced frames during interrupt. */
+    T3_32BIT_REGISTER RxMaxCoalescedFramesDuringInt;
+
+    /* Send max coalesced frames during interrupt. */
+    T3_32BIT_REGISTER TxMaxCoalescedFramesDuringInt;
+
+    /* Statistics tick. */
+    T3_32BIT_REGISTER StatsCoalescingTicks;
+
+    /* Unused space. */
+    LM_UINT8 Unused2[4];
+
+    /* Statistics host address. */
+    T3_64BIT_REGISTER StatsBlkHostAddr;
+
+    /* Status block host address.*/
+    T3_64BIT_REGISTER StatusBlkHostAddr;
+
+    /* Statistics NIC address. */
+    T3_32BIT_REGISTER StatsBlkNicAddr;
+
+    /* Statust block NIC address. */
+    T3_32BIT_REGISTER StatusBlkNicAddr;
+
+    /* Flow attention registers. */
+    T3_32BIT_REGISTER FlowAttn;
+
+    /* Unused space. */
+    LM_UINT8 Unused3[4];
+
+    T3_32BIT_REGISTER NicJumboRcvBdConIdx;
+    T3_32BIT_REGISTER NicStdRcvBdConIdx;
+    T3_32BIT_REGISTER NicMiniRcvBdConIdx;
+
+    /* Unused space. */
+    LM_UINT8 Unused4[36];
+
+    T3_32BIT_REGISTER NicRetProdIdx[16];
+    T3_32BIT_REGISTER NicSndBdConIdx[16];
+
+    /* Unused space. */
+    LM_UINT8 Unused5[768];
+} T3_HOST_COALESCING, *PT3_HOST_COALESCING;
+
+
+
+/******************************************************************************/
+/* Memory arbiter registers. */
+/******************************************************************************/
+
+typedef struct {
+    T3_32BIT_REGISTER Mode;
+#define T3_MEM_ARBITER_MODE_RESET       BIT_0
+#define T3_MEM_ARBITER_MODE_ENABLE      BIT_1
+
+    T3_32BIT_REGISTER Status;
+
+    T3_32BIT_REGISTER ArbTrapAddrLow;
+    T3_32BIT_REGISTER ArbTrapAddrHigh;
+
+    /* Unused space. */
+    LM_UINT8 Unused[1008];
+} T3_MEM_ARBITER, *PT3_MEM_ARBITER;
+
+
+
+/******************************************************************************/
+/* Buffer manager control register. */
+/******************************************************************************/
+
+typedef struct {
+    T3_32BIT_REGISTER Mode;
+    #define BUFMGR_MODE_RESET                           BIT_0
+    #define BUFMGR_MODE_ENABLE                          BIT_1
+    #define BUFMGR_MODE_ATTN_ENABLE                     BIT_2
+    #define BUFMGR_MODE_BM_TEST                         BIT_3
+    #define BUFMGR_MODE_MBUF_LOW_ATTN_ENABLE            BIT_4
+
+    T3_32BIT_REGISTER Status;
+    #define BUFMGR_STATUS_ERROR                         BIT_2
+    #define BUFMGR_STATUS_MBUF_LOW                      BIT_4
+
+    T3_32BIT_REGISTER MbufPoolAddr;
+    T3_32BIT_REGISTER MbufPoolSize;
+    T3_32BIT_REGISTER MbufReadDmaLowWaterMark;
+    T3_32BIT_REGISTER MbufMacRxLowWaterMark;
+    T3_32BIT_REGISTER MbufHighWaterMark;
+
+    T3_32BIT_REGISTER RxCpuMbufAllocReq;
+    #define BUFMGR_MBUF_ALLOC_BIT                     BIT_31
+    T3_32BIT_REGISTER RxCpuMbufAllocResp;
+    T3_32BIT_REGISTER TxCpuMbufAllocReq;
+    T3_32BIT_REGISTER TxCpuMbufAllocResp;
+
+    T3_32BIT_REGISTER DmaDescPoolAddr;
+    T3_32BIT_REGISTER DmaDescPoolSize;
+    T3_32BIT_REGISTER DmaLowWaterMark;
+    T3_32BIT_REGISTER DmaHighWaterMark;
+
+    T3_32BIT_REGISTER RxCpuDmaAllocReq;
+    T3_32BIT_REGISTER RxCpuDmaAllocResp;
+    T3_32BIT_REGISTER TxCpuDmaAllocReq;
+    T3_32BIT_REGISTER TxCpuDmaAllocResp;
+
+    T3_32BIT_REGISTER Hwdiag[3];
+
+    /* Unused space. */
+    LM_UINT8 Unused[936];
+} T3_BUFFER_MANAGER, *PT3_BUFFER_MANAGER;
+
+
+
+/******************************************************************************/
+/* Read DMA control registers. */
+/******************************************************************************/
+
+typedef struct {
+    T3_32BIT_REGISTER Mode;
+    #define DMA_READ_MODE_RESET                         BIT_0
+    #define DMA_READ_MODE_ENABLE                        BIT_1
+    #define DMA_READ_MODE_TARGET_ABORT_ATTN_ENABLE      BIT_2
+    #define DMA_READ_MODE_MASTER_ABORT_ATTN_ENABLE      BIT_3
+    #define DMA_READ_MODE_PARITY_ERROR_ATTN_ENABLE      BIT_4
+    #define DMA_READ_MODE_ADDR_OVERFLOW_ATTN_ENABLE     BIT_5
+    #define DMA_READ_MODE_FIFO_OVERRUN_ATTN_ENABLE      BIT_6
+    #define DMA_READ_MODE_FIFO_UNDERRUN_ATTN_ENABLE     BIT_7
+    #define DMA_READ_MODE_FIFO_OVERREAD_ATTN_ENABLE     BIT_8
+    #define DMA_READ_MODE_LONG_READ_ATTN_ENABLE         BIT_9
+    #define DMA_READ_MODE_MULTI_SPLIT_ENABLE            BIT_11
+    #define DMA_READ_MODE_MULTI_SPLIT_RESET             BIT_12
+    #define DMA_READ_MODE_FIFO_SIZE_128                 BIT_17
+    #define DMA_READ_MODE_FIFO_LONG_BURST               (BIT_16 | BIT_17)
+
+    T3_32BIT_REGISTER Status;
+    #define DMA_READ_STATUS_TARGET_ABORT_ATTN           BIT_2
+    #define DMA_READ_STATUS_MASTER_ABORT_ATTN           BIT_3
+    #define DMA_READ_STATUS_PARITY_ERROR_ATTN           BIT_4
+    #define DMA_READ_STATUS_ADDR_OVERFLOW_ATTN          BIT_5
+    #define DMA_READ_STATUS_FIFO_OVERRUN_ATTN           BIT_6
+    #define DMA_READ_STATUS_FIFO_UNDERRUN_ATTN          BIT_7
+    #define DMA_READ_STATUS_FIFO_OVERREAD_ATTN          BIT_8
+    #define DMA_READ_STATUS_LONG_READ_ATTN              BIT_9
+
+    /* Unused space. */
+    LM_UINT8 Unused[1016];
+} T3_DMA_READ, *PT3_DMA_READ;
+
+typedef union T3_CPU 
+{
+  struct
+  {
+    T3_32BIT_REGISTER mode;
+    #define CPU_MODE_HALT   BIT_10
+    #define CPU_MODE_RESET  BIT_0 
+    T3_32BIT_REGISTER state;
+    T3_32BIT_REGISTER EventMask;
+    T3_32BIT_REGISTER reserved1[4];
+    T3_32BIT_REGISTER PC;
+    T3_32BIT_REGISTER Instruction;
+    T3_32BIT_REGISTER SpadUnderflow;
+    T3_32BIT_REGISTER WatchdogClear;
+    T3_32BIT_REGISTER WatchdogVector;
+    T3_32BIT_REGISTER WatchdogSavedPC;
+    T3_32BIT_REGISTER HardwareBp;
+    T3_32BIT_REGISTER reserved2[3];
+    T3_32BIT_REGISTER WatchdogSavedState;    
+    T3_32BIT_REGISTER LastBrchAddr;    
+    T3_32BIT_REGISTER SpadUnderflowSet;    
+    T3_32BIT_REGISTER reserved3[(0x200-0x50)/4];
+    T3_32BIT_REGISTER Regs[32];
+    T3_32BIT_REGISTER reserved4[(0x400-0x280)/4];
+  }reg;
+}T3_CPU, *PT3_CPU;
+
+/******************************************************************************/
+/* Write DMA control registers. */
+/******************************************************************************/
+
+typedef struct {
+    T3_32BIT_REGISTER Mode;
+    #define DMA_WRITE_MODE_RESET                        BIT_0
+    #define DMA_WRITE_MODE_ENABLE                       BIT_1
+    #define DMA_WRITE_MODE_TARGET_ABORT_ATTN_ENABLE     BIT_2
+    #define DMA_WRITE_MODE_MASTER_ABORT_ATTN_ENABLE     BIT_3
+    #define DMA_WRITE_MODE_PARITY_ERROR_ATTN_ENABLE     BIT_4
+    #define DMA_WRITE_MODE_ADDR_OVERFLOW_ATTN_ENABLE    BIT_5
+    #define DMA_WRITE_MODE_FIFO_OVERRUN_ATTN_ENABLE     BIT_6
+    #define DMA_WRITE_MODE_FIFO_UNDERRUN_ATTN_ENABLE    BIT_7
+    #define DMA_WRITE_MODE_FIFO_OVERREAD_ATTN_ENABLE    BIT_8
+    #define DMA_WRITE_MODE_LONG_READ_ATTN_ENABLE        BIT_9
+    #define DMA_WRITE_MODE_RECEIVE_ACCELERATE           BIT_10
+
+    T3_32BIT_REGISTER Status;
+    #define DMA_WRITE_STATUS_TARGET_ABORT_ATTN          BIT_2
+    #define DMA_WRITE_STATUS_MASTER_ABORT_ATTN          BIT_3
+    #define DMA_WRITE_STATUS_PARITY_ERROR_ATTN          BIT_4
+    #define DMA_WRITE_STATUS_ADDR_OVERFLOW_ATTN         BIT_5
+    #define DMA_WRITE_STATUS_FIFO_OVERRUN_ATTN          BIT_6
+    #define DMA_WRITE_STATUS_FIFO_UNDERRUN_ATTN         BIT_7
+    #define DMA_WRITE_STATUS_FIFO_OVERREAD_ATTN         BIT_8
+    #define DMA_WRITE_STATUS_LONG_READ_ATTN             BIT_9
+
+    /* Unused space. */
+    LM_UINT8 Unused[1016];
+} T3_DMA_WRITE, *PT3_DMA_WRITE;
+
+
+
+/******************************************************************************/
+/* Mailbox registers. */
+/******************************************************************************/
+
+typedef struct {
+    /* Interrupt mailbox registers. */
+    T3_64BIT_REGISTER Interrupt[4];
+
+    /* General mailbox registers. */
+    T3_64BIT_REGISTER General[8];
+
+    /* Reload statistics mailbox. */
+    T3_64BIT_REGISTER ReloadStat;
+
+    /* Receive BD ring producer index registers. */
+    T3_64BIT_REGISTER RcvStdProdIdx;
+    T3_64BIT_REGISTER RcvJumboProdIdx;
+    T3_64BIT_REGISTER RcvMiniProdIdx;
+
+    /* Receive return ring consumer index registers. */
+    T3_64BIT_REGISTER RcvRetConIdx[16];
+
+    /* Send BD ring host producer index registers. */
+    T3_64BIT_REGISTER SendHostProdIdx[16];
+
+    /* Send BD ring nic producer index registers. */
+    T3_64BIT_REGISTER SendNicProdIdx[16];
+}T3_MAILBOX, *PT3_MAILBOX;
+
+typedef struct {
+    T3_MAILBOX Mailbox;
+
+    /* Priority mailbox registers. */
+    T3_32BIT_REGISTER HighPriorityEventVector;
+    T3_32BIT_REGISTER HighPriorityEventMask;
+    T3_32BIT_REGISTER LowPriorityEventVector;
+    T3_32BIT_REGISTER LowPriorityEventMask;
+
+    /* Unused space. */
+    LM_UINT8 Unused[496];
+} T3_GRC_MAILBOX, *PT3_GRC_MAILBOX;
+
+
+/******************************************************************************/
+/* Flow through queues. */
+/******************************************************************************/
+
+typedef struct {
+    T3_32BIT_REGISTER Reset;
+    
+    LM_UINT8 Unused[12];
+
+    T3_32BIT_REGISTER DmaNormalReadFtqCtrl;
+    T3_32BIT_REGISTER DmaNormalReadFtqFullCnt;
+    T3_32BIT_REGISTER DmaNormalReadFtqFifoEnqueueDequeue;
+    T3_32BIT_REGISTER DmaNormalReadFtqFifoWritePeek;
+
+    T3_32BIT_REGISTER DmaHighReadFtqCtrl;
+    T3_32BIT_REGISTER DmaHighReadFtqFullCnt;
+    T3_32BIT_REGISTER DmaHighReadFtqFifoEnqueueDequeue;
+    T3_32BIT_REGISTER DmaHighReadFtqFifoWritePeek;
+
+    T3_32BIT_REGISTER DmaCompDiscardFtqCtrl;
+    T3_32BIT_REGISTER DmaCompDiscardFtqFullCnt;
+    T3_32BIT_REGISTER DmaCompDiscardFtqFifoEnqueueDequeue;
+    T3_32BIT_REGISTER DmaCompDiscardFtqFifoWritePeek;
+
+    T3_32BIT_REGISTER SendBdCompFtqCtrl;
+    T3_32BIT_REGISTER SendBdCompFtqFullCnt;
+    T3_32BIT_REGISTER SendBdCompFtqFifoEnqueueDequeue;
+    T3_32BIT_REGISTER SendBdCompFtqFifoWritePeek;
+
+    T3_32BIT_REGISTER SendDataInitiatorFtqCtrl;
+    T3_32BIT_REGISTER SendDataInitiatorFtqFullCnt;
+    T3_32BIT_REGISTER SendDataInitiatorFtqFifoEnqueueDequeue;
+    T3_32BIT_REGISTER SendDataInitiatorFtqFifoWritePeek;
+
+    T3_32BIT_REGISTER DmaNormalWriteFtqCtrl;
+    T3_32BIT_REGISTER DmaNormalWriteFtqFullCnt;
+    T3_32BIT_REGISTER DmaNormalWriteFtqFifoEnqueueDequeue;
+    T3_32BIT_REGISTER DmaNormalWriteFtqFifoWritePeek;
+
+    T3_32BIT_REGISTER DmaHighWriteFtqCtrl;
+    T3_32BIT_REGISTER DmaHighWriteFtqFullCnt;
+    T3_32BIT_REGISTER DmaHighWriteFtqFifoEnqueueDequeue;
+    T3_32BIT_REGISTER DmaHighWriteFtqFifoWritePeek;
+
+    T3_32BIT_REGISTER SwType1FtqCtrl;
+    T3_32BIT_REGISTER SwType1FtqFullCnt;
+    T3_32BIT_REGISTER SwType1FtqFifoEnqueueDequeue;
+    T3_32BIT_REGISTER SwType1FtqFifoWritePeek;
+
+    T3_32BIT_REGISTER SendDataCompFtqCtrl;
+    T3_32BIT_REGISTER SendDataCompFtqFullCnt;
+    T3_32BIT_REGISTER SendDataCompFtqFifoEnqueueDequeue;
+    T3_32BIT_REGISTER SendDataCompFtqFifoWritePeek;
+
+    T3_32BIT_REGISTER HostCoalesceFtqCtrl;
+    T3_32BIT_REGISTER HostCoalesceFtqFullCnt;
+    T3_32BIT_REGISTER HostCoalesceFtqFifoEnqueueDequeue;
+    T3_32BIT_REGISTER HostCoalesceFtqFifoWritePeek;
+
+    T3_32BIT_REGISTER MacTxFtqCtrl;
+    T3_32BIT_REGISTER MacTxFtqFullCnt;
+    T3_32BIT_REGISTER MacTxFtqFifoEnqueueDequeue;
+    T3_32BIT_REGISTER MacTxFtqFifoWritePeek;
+
+    T3_32BIT_REGISTER MbufClustFreeFtqCtrl;
+    T3_32BIT_REGISTER MbufClustFreeFtqFullCnt;
+    T3_32BIT_REGISTER MbufClustFreeFtqFifoEnqueueDequeue;
+    T3_32BIT_REGISTER MbufClustFreeFtqFifoWritePeek;
+
+    T3_32BIT_REGISTER RcvBdCompFtqCtrl;
+    T3_32BIT_REGISTER RcvBdCompFtqFullCnt;
+    T3_32BIT_REGISTER RcvBdCompFtqFifoEnqueueDequeue;
+    T3_32BIT_REGISTER RcvBdCompFtqFifoWritePeek;
+
+    T3_32BIT_REGISTER RcvListPlmtFtqCtrl;
+    T3_32BIT_REGISTER RcvListPlmtFtqFullCnt;
+    T3_32BIT_REGISTER RcvListPlmtFtqFifoEnqueueDequeue;
+    T3_32BIT_REGISTER RcvListPlmtFtqFifoWritePeek;
+
+    T3_32BIT_REGISTER RcvDataBdInitiatorFtqCtrl;
+    T3_32BIT_REGISTER RcvDataBdInitiatorFtqFullCnt;
+    T3_32BIT_REGISTER RcvDataBdInitiatorFtqFifoEnqueueDequeue;
+    T3_32BIT_REGISTER RcvDataBdInitiatorFtqFifoWritePeek;
+
+    T3_32BIT_REGISTER RcvDataCompFtqCtrl;
+    T3_32BIT_REGISTER RcvDataCompFtqFullCnt;
+    T3_32BIT_REGISTER RcvDataCompFtqFifoEnqueueDequeue;
+    T3_32BIT_REGISTER RcvDataCompFtqFifoWritePeek;
+
+    T3_32BIT_REGISTER SwType2FtqCtrl;
+    T3_32BIT_REGISTER SwType2FtqFullCnt;
+    T3_32BIT_REGISTER SwType2FtqFifoEnqueueDequeue;
+    T3_32BIT_REGISTER SwType2FtqFifoWritePeek;
+
+    /* Unused space. */
+    LM_UINT8 Unused2[736];
+} T3_FTQ, *PT3_FTQ;
+
+
+
+/******************************************************************************/
+/* Message signaled interrupt registers. */
+/******************************************************************************/
+
+typedef struct {
+    T3_32BIT_REGISTER Mode;
+#define MSI_MODE_RESET       BIT_0
+#define MSI_MODE_ENABLE      BIT_1
+    T3_32BIT_REGISTER Status;
+
+    T3_32BIT_REGISTER MsiFifoAccess;
+
+    /* Unused space. */
+    LM_UINT8 Unused[1012];
+} T3_MSG_SIGNALED_INT, *PT3_MSG_SIGNALED_INT;
+
+
+
+/******************************************************************************/
+/* DMA Completion registes. */
+/******************************************************************************/
+
+typedef struct {
+    T3_32BIT_REGISTER Mode;
+    #define DMA_COMP_MODE_RESET                         BIT_0
+    #define DMA_COMP_MODE_ENABLE                        BIT_1
+
+    /* Unused space. */
+    LM_UINT8 Unused[1020];
+} T3_DMA_COMPLETION, *PT3_DMA_COMPLETION;
+
+
+
+/******************************************************************************/
+/* GRC registers. */
+/******************************************************************************/
+
+typedef struct {
+    /* Mode control register. */
+    T3_32BIT_REGISTER Mode;
+    #define GRC_MODE_UPDATE_ON_COALESCING               BIT_0
+    #define GRC_MODE_BYTE_SWAP_NON_FRAME_DATA           BIT_1
+    #define GRC_MODE_WORD_SWAP_NON_FRAME_DATA           BIT_2
+    #define GRC_MODE_BYTE_SWAP_DATA                     BIT_4
+    #define GRC_MODE_WORD_SWAP_DATA                     BIT_5
+    #define GRC_MODE_SPLIT_HEADER_MODE                  BIT_8
+    #define GRC_MODE_NO_FRAME_CRACKING                  BIT_9
+    #define GRC_MODE_INCLUDE_CRC                        BIT_10
+    #define GRC_MODE_ALLOW_BAD_FRAMES                   BIT_11
+    #define GRC_MODE_NO_INTERRUPT_ON_SENDS              BIT_13
+    #define GRC_MODE_NO_INTERRUPT_ON_RECEIVE            BIT_14
+    #define GRC_MODE_FORCE_32BIT_PCI_BUS_MODE           BIT_15
+    #define GRC_MODE_HOST_STACK_UP                      BIT_16
+    #define GRC_MODE_HOST_SEND_BDS                      BIT_17
+    #define GRC_MODE_TX_NO_PSEUDO_HEADER_CHKSUM         BIT_20
+    #define GRC_MODE_NVRAM_WRITE_ENABLE                 BIT_21
+    #define GRC_MODE_RX_NO_PSEUDO_HEADER_CHKSUM         BIT_23
+    #define GRC_MODE_INT_ON_TX_CPU_ATTN                 BIT_24
+    #define GRC_MODE_INT_ON_RX_CPU_ATTN                 BIT_25
+    #define GRC_MODE_INT_ON_MAC_ATTN                    BIT_26
+    #define GRC_MODE_INT_ON_DMA_ATTN                    BIT_27
+    #define GRC_MODE_INT_ON_FLOW_ATTN                   BIT_28
+    #define GRC_MODE_4X_NIC_BASED_SEND_RINGS            BIT_29
+    #define GRC_MODE_MULTICAST_FRAME_ENABLE             BIT_30
+
+    /* Misc configuration register. */
+    T3_32BIT_REGISTER MiscCfg;
+    #define GRC_MISC_CFG_CORE_CLOCK_RESET               BIT_0
+    #define GRC_MISC_PRESCALAR_TIMER_MASK               0xfe
+    #define GRC_MISC_BD_ID_MASK                         0x0001e000
+    #define GRC_MISC_BD_ID_5700                         0x0001e000
+    #define GRC_MISC_BD_ID_5701                         0x00000000
+    #define GRC_MISC_BD_ID_5703                         0x00000000
+    #define GRC_MISC_BD_ID_5703S                        0x00002000
+    #define GRC_MISC_BD_ID_5702FE                       0x00004000
+    #define GRC_MISC_BD_ID_5704                         0x00000000
+    #define GRC_MISC_BD_ID_5704CIOBE                    0x00004000
+    #define GRC_MISC_BD_ID_5788                         0x00010000
+    #define GRC_MISC_BD_ID_5788M                        0x00018000
+    #define GRC_MISC_GPHY_KEEP_POWER_DURING_RESET       BIT_26
+
+    /* Miscellaneous local control register. */
+    T3_32BIT_REGISTER LocalCtrl;
+    #define GRC_MISC_LOCAL_CTRL_INT_ACTIVE              BIT_0
+    #define GRC_MISC_LOCAL_CTRL_CLEAR_INT               BIT_1
+    #define GRC_MISC_LOCAL_CTRL_SET_INT                 BIT_2
+    #define GRC_MISC_LOCAL_CTRL_INT_ON_ATTN             BIT_3
+    #define GRC_MISC_LOCAL_CTRL_GPIO_INPUT0             BIT_8
+    #define GRC_MISC_LOCAL_CTRL_GPIO_INPUT1             BIT_9
+    #define GRC_MISC_LOCAL_CTRL_GPIO_INPUT2             BIT_10
+    #define GRC_MISC_LOCAL_CTRL_GPIO_OE0                BIT_11
+    #define GRC_MISC_LOCAL_CTRL_GPIO_OE1                BIT_12
+    #define GRC_MISC_LOCAL_CTRL_GPIO_OE2                BIT_13
+    #define GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT0            BIT_14
+    #define GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT1            BIT_15
+    #define GRC_MISC_LOCAL_CTRL_GPIO_OUTPUT2            BIT_16
+    #define GRC_MISC_LOCAL_CTRL_ENABLE_EXT_MEMORY       BIT_17
+    #define GRC_MISC_LOCAL_CTRL_BANK_SELECT             BIT_21
+    #define GRC_MISC_LOCAL_CTRL_SSRAM_TYPE              BIT_22
+
+    #define GRC_MISC_MEMSIZE_256K     0
+    #define GRC_MISC_MEMSIZE_512K     (1 << 18)
+    #define GRC_MISC_MEMSIZE_1024K    (2 << 18)
+    #define GRC_MISC_MEMSIZE_2048K    (3 << 18)
+    #define GRC_MISC_MEMSIZE_4096K    (4 << 18)
+    #define GRC_MISC_MEMSIZE_8192K    (5 << 18)
+    #define GRC_MISC_MEMSIZE_16M      (6 << 18)
+    #define GRC_MISC_LOCAL_CTRL_AUTO_SEEPROM            BIT_24
+
+
+    T3_32BIT_REGISTER Timer;
+
+    T3_32BIT_REGISTER RxCpuEvent;
+    T3_32BIT_REGISTER RxTimerRef;
+    T3_32BIT_REGISTER RxCpuSemaphore;
+    T3_32BIT_REGISTER RemoteRxCpuAttn;
+
+    T3_32BIT_REGISTER TxCpuEvent;
+    T3_32BIT_REGISTER TxTimerRef;
+    T3_32BIT_REGISTER TxCpuSemaphore;
+    T3_32BIT_REGISTER RemoteTxCpuAttn;
+
+    T3_64BIT_REGISTER MemoryPowerUp;
+
+    T3_32BIT_REGISTER EepromAddr;
+    #define SEEPROM_ADDR_WRITE       0
+    #define SEEPROM_ADDR_READ        (1 << 31)
+    #define SEEPROM_ADDR_RW_MASK     0x80000000
+    #define SEEPROM_ADDR_COMPLETE    (1 << 30)
+    #define SEEPROM_ADDR_FSM_RESET   (1 << 29)
+    #define SEEPROM_ADDR_DEV_ID(x)   (x << 26)
+    #define SEEPROM_ADDR_DEV_ID_MASK 0x1c000000
+    #define SEEPROM_ADDR_START       (1 << 25)
+    #define SEEPROM_ADDR_CLK_PERD(x) (x << 16)
+    #define SEEPROM_ADDR_ADDRESS(x)  (x & 0xfffc)
+    #define SEEPROM_ADDR_ADDRESS_MASK 0x0000ffff
+
+    #define SEEPROM_CLOCK_PERIOD        60
+    #define SEEPROM_CHIP_SIZE           (64 * 1024)
+
+    T3_32BIT_REGISTER EepromData;
+    T3_32BIT_REGISTER EepromCtrl;
+
+    T3_32BIT_REGISTER MdiCtrl;
+    T3_32BIT_REGISTER SepromDelay;
+
+    /* Unused space. */
+    LM_UINT8 Unused[948];
+} T3_GRC, *PT3_GRC;
+
+
+/******************************************************************************/
+/* NVRAM control registers. */
+/******************************************************************************/
+
+typedef struct
+{
+    T3_32BIT_REGISTER Cmd;
+    #define NVRAM_CMD_RESET                             BIT_0
+    #define NVRAM_CMD_DONE                              BIT_3
+    #define NVRAM_CMD_DO_IT                             BIT_4
+    #define NVRAM_CMD_WR                                BIT_5
+    #define NVRAM_CMD_RD                                BIT_NONE
+    #define NVRAM_CMD_ERASE                             BIT_6
+    #define NVRAM_CMD_FIRST                             BIT_7
+    #define NVRAM_CMD_LAST                              BIT_8
+
+    T3_32BIT_REGISTER Status;
+    T3_32BIT_REGISTER WriteData;
+
+    T3_32BIT_REGISTER Addr;
+    #define NVRAM_ADDRESS_MASK                          0xffffff
+
+    T3_32BIT_REGISTER ReadData;
+
+    /* Flash config 1 register. */
+    T3_32BIT_REGISTER Config1;
+    #define FLASH_INTERFACE_ENABLE                      BIT_0
+    #define FLASH_SSRAM_BUFFERED_MODE                  BIT_1
+    #define FLASH_PASS_THRU_MODE                        BIT_2
+    #define FLASH_BIT_BANG_MODE                         BIT_3
+    #define FLASH_COMPAT_BYPASS                         BIT_31
+
+    #define BUFFERED_FLASH (FLASH_INTERFACE_ENABLE | FLASH_SSRAM_BUFFERED_MODE)
+
+    /* Buffered flash (Atmel: AT45DB011B) specific information */
+    #define BUFFERED_FLASH_PAGE_POS         9
+    #define BUFFERED_FLASH_BYTE_ADDR_MASK   ((1<<BUFFERED_FLASH_PAGE_POS) - 1)
+    #define BUFFERED_FLASH_PAGE_SIZE        264
+    #define BUFFERED_FLASH_PHY_PAGE_SIZE    512
+
+    T3_32BIT_REGISTER Config2;
+    T3_32BIT_REGISTER Config3;
+    T3_32BIT_REGISTER SwArb;
+    #define SW_ARB_REQ_SET0                             BIT_0
+    #define SW_ARB_REQ_SET1                             BIT_1
+    #define SW_ARB_REQ_SET2                             BIT_2
+    #define SW_ARB_REQ_SET3                             BIT_3
+    #define SW_ARB_REQ_CLR0                             BIT_4
+    #define SW_ARB_REQ_CLR1                             BIT_5
+    #define SW_ARB_REQ_CLR2                             BIT_6
+    #define SW_ARB_REQ_CLR3                             BIT_7
+    #define SW_ARB_GNT0                                 BIT_8
+    #define SW_ARB_GNT1                                 BIT_9
+    #define SW_ARB_GNT2                                 BIT_10
+    #define SW_ARB_GNT3                                 BIT_11
+    #define SW_ARB_REQ0                                 BIT_12
+    #define SW_ARB_REQ1                                 BIT_13
+    #define SW_ARB_REQ2                                 BIT_14
+    #define SW_ARB_REQ3                                 BIT_15
+
+    T3_32BIT_REGISTER NvmAccess;
+    #define ACCESS_EN                                   BIT_0
+    #define ACCESS_WR_EN                                BIT_1
+
+    /* Unused space. */
+    LM_UINT8 Unused[984];
+} T3_NVRAM, *PT3_NVRAM;
+
+
+/******************************************************************************/
+/* NIC's internal memory. */
+/******************************************************************************/
+
+typedef struct {
+    /* Page zero for the internal CPUs. */
+    LM_UINT8 PageZero[0x100];               /* 0x0000 */
+
+    /* Send RCBs. */
+    T3_RCB SendRcb[16];                     /* 0x0100 */
+
+    /* Receive Return RCBs. */
+    T3_RCB RcvRetRcb[16];                   /* 0x0200 */
+
+    /* Statistics block. */
+    T3_STATS_BLOCK StatsBlk;                /* 0x0300 */
+
+    /* Status block. */
+    T3_STATUS_BLOCK StatusBlk;              /* 0x0b00 */
+
+    /* Reserved for software. */
+    LM_UINT8 Reserved[1200];                /* 0x0b50 */
+
+    /* Unmapped region. */
+    LM_UINT8 Unmapped[4096];                /* 0x1000 */
+
+    /* DMA descriptors. */
+    LM_UINT8 DmaDesc[8192];                 /* 0x2000 */
+
+    /* Buffer descriptors. */
+    LM_UINT8 BufferDesc[16384];             /* 0x4000 */
+} T3_FIRST_32K_SRAM, *PT3_FIRST_32K_SRAM;
+
+
+
+/******************************************************************************/
+/* Memory layout. */
+/******************************************************************************/
+
+typedef struct {
+    /* PCI configuration registers. */
+    T3_PCI_CONFIGURATION PciCfg;
+
+    /* Unused. */
+    LM_UINT8 Unused1[0x100];                            /* 0x0100 */
+
+    /* Mailbox . */
+    T3_MAILBOX Mailbox;                                 /* 0x0200 */
+
+    /* MAC control registers. */
+    T3_MAC_CONTROL MacCtrl;                             /* 0x0400 */
+
+    /* Send data initiator control registers. */
+    T3_SEND_DATA_INITIATOR SndDataIn;                   /* 0x0c00 */
+
+    /* Send data completion Control registers. */
+    T3_SEND_DATA_COMPLETION SndDataComp;                /* 0x1000 */
+
+    /* Send BD ring selector. */
+    T3_SEND_BD_SELECTOR SndBdSel;                       /* 0x1400 */
+
+    /* Send BD initiator control registers. */
+    T3_SEND_BD_INITIATOR SndBdIn;                       /* 0x1800 */
+
+    /* Send BD completion control registers. */
+    T3_SEND_BD_COMPLETION SndBdComp;                    /* 0x1c00 */
+
+    /* Receive list placement control registers. */
+    T3_RCV_LIST_PLACEMENT RcvListPlmt;                  /* 0x2000 */
+
+    /* Receive Data and Receive BD Initiator Control. */
+    T3_RCV_DATA_BD_INITIATOR RcvDataBdIn;               /* 0x2400 */
+
+    /* Receive Data Completion Control */
+    T3_RCV_DATA_COMPLETION RcvDataComp;                 /* 0x2800 */
+
+    /* Receive BD Initiator Control Registers. */
+    T3_RCV_BD_INITIATOR RcvBdIn;                        /* 0x2c00 */
+
+    /* Receive BD Completion Control Registers. */
+    T3_RCV_BD_COMPLETION RcvBdComp;                     /* 0x3000 */
+
+    /* Receive list selector control registers. */
+    T3_RCV_LIST_SELECTOR RcvListSel;                    /* 0x3400 */
+
+    /* Mbuf cluster free registers. */
+    T3_MBUF_CLUSTER_FREE MbufClusterFree;               /* 0x3800 */
+
+    /* Host coalescing control registers. */
+    T3_HOST_COALESCING HostCoalesce;                    /* 0x3c00 */
+
+    /* Memory arbiter control registers. */
+    T3_MEM_ARBITER MemArbiter;                          /* 0x4000 */
+    
+    /* Buffer manger control registers. */
+    T3_BUFFER_MANAGER BufMgr;                           /* 0x4400 */
+
+    /* Read DMA control registers. */
+    T3_DMA_READ DmaRead;                                /* 0x4800 */
+
+    /* Write DMA control registers. */
+    T3_DMA_WRITE DmaWrite;                              /* 0x4c00 */
+
+    T3_CPU rxCpu;                                       /* 0x5000 */
+    T3_CPU txCpu;                                       /* 0x5400 */
+
+    /* Mailboxes. */
+    T3_GRC_MAILBOX GrcMailbox;                          /* 0x5800 */
+
+    /* Flow Through queues. */
+    T3_FTQ Ftq;                                         /* 0x5c00 */
+
+    /* Message signaled interrupt registes. */
+    T3_MSG_SIGNALED_INT Msi;                            /* 0x6000 */
+
+    /* DMA completion registers. */
+    T3_DMA_COMPLETION DmaComp;                          /* 0x6400 */
+
+    /* GRC registers. */
+    T3_GRC Grc;                                         /* 0x6800 */
+
+    /* Unused space. */
+    LM_UINT8 Unused2[1024];                             /* 0x6c00 */
+
+    /* NVRAM registers. */
+    T3_NVRAM Nvram;                                     /* 0x7000 */
+
+    /* Unused space. */
+    LM_UINT8 Unused3[3072];                             /* 0x7400 */
+    
+    /* The 32k memory window into the NIC's */
+    /* internal memory.  The memory window is */
+    /* controlled by the Memory Window Base */
+    /* Address register.  This register is located */
+    /* in the PCI configuration space. */
+    union {                                             /* 0x8000 */
+        T3_FIRST_32K_SRAM First32k;
+
+        /* Use the memory window base address register to determine the */
+        /* MBUF segment. */
+        LM_UINT32 Mbuf[32768/4];
+        LM_UINT32 MemBlock32K[32768/4];
+    } uIntMem;
+} T3_STD_MEM_MAP, *PT3_STD_MEM_MAP;
+
+
+/******************************************************************************/
+/* Adapter info. */
+/******************************************************************************/
+
+typedef struct
+{
+    LM_UINT16 Svid;
+    LM_UINT16 Ssid;
+    LM_UINT32 PhyId;
+    LM_UINT32 Serdes;   /* 0 = copper PHY, 1 = Serdes */
+} LM_ADAPTER_INFO, *PLM_ADAPTER_INFO;
+
+
+/******************************************************************************/
+/* Packet queues. */
+/******************************************************************************/
+
+DECLARE_QUEUE_TYPE(LM_RX_PACKET_Q, MAX_RX_PACKET_DESC_COUNT);
+DECLARE_QUEUE_TYPE(LM_TX_PACKET_Q, MAX_TX_PACKET_DESC_COUNT);
+
+
+
+/******************************************************************************/
+/* Tx counters. */
+/******************************************************************************/
+
+typedef struct {
+    LM_COUNTER TxPacketGoodCnt;
+    LM_COUNTER TxBytesGoodCnt;
+    LM_COUNTER TxPacketAbortedCnt;
+    LM_COUNTER NoSendBdLeftCnt;
+    LM_COUNTER NoMapRegisterLeftCnt;
+    LM_COUNTER TooManyFragmentsCnt;
+    LM_COUNTER NoTxPacketDescCnt;
+} LM_TX_COUNTERS, *PLM_TX_COUNTERS;
+
+
+
+/******************************************************************************/
+/* Rx counters. */
+/******************************************************************************/
+
+typedef struct {
+    LM_COUNTER RxPacketGoodCnt;
+    LM_COUNTER RxBytesGoodCnt;
+    LM_COUNTER RxPacketErrCnt;
+    LM_COUNTER RxErrCrcCnt;
+    LM_COUNTER RxErrCollCnt;
+    LM_COUNTER RxErrLinkLostCnt;
+    LM_COUNTER RxErrPhyDecodeCnt;
+    LM_COUNTER RxErrOddNibbleCnt;
+    LM_COUNTER RxErrMacAbortCnt;
+    LM_COUNTER RxErrShortPacketCnt;
+    LM_COUNTER RxErrNoResourceCnt;
+    LM_COUNTER RxErrLargePacketCnt;
+} LM_RX_COUNTERS, *PLM_RX_COUNTERS;
+
+
+
+/******************************************************************************/
+/* Receive producer rings. */
+/******************************************************************************/
+
+typedef enum {
+    T3_UNKNOWN_RCV_PROD_RING    = 0,
+    T3_STD_RCV_PROD_RING        = 1,
+    T3_MINI_RCV_PROD_RING       = 2,
+    T3_JUMBO_RCV_PROD_RING      = 3
+} T3_RCV_PROD_RING, *PT3_RCV_PROD_RING;
+
+
+
+/******************************************************************************/
+/* Packet descriptor. */
+/******************************************************************************/
+
+#define LM_PACKET_SIGNATURE_TX              0x6861766b
+#define LM_PACKET_SIGNATURE_RX              0x6b766168
+
+typedef struct _LM_PACKET {
+    /* Set in LM. */
+    LM_STATUS PacketStatus;
+
+    /* Set in LM for Rx, in UM for Tx. */
+    LM_UINT32 PacketSize;
+
+    LM_UINT16 Flags;
+
+    LM_UINT16 VlanTag;
+
+    union {
+        /* Send info. */
+        struct {
+            /* Set up by UM. */
+            LM_UINT32 FragCount;
+
+#if INCLUDE_TCP_SEG_SUPPORT
+            LM_UINT32 MaxSegmentSize;
+#endif
+        } Tx;
+
+        /* Receive info. */
+        struct {
+            /* This descriptor belongs to either Std, Mini, or Jumbo ring. */
+            LM_UINT16 RcvProdRing;
+            LM_UINT16 RcvRingProdIdx;
+
+            /* Receive buffer size */
+            LM_UINT32 RxBufferSize;
+
+            /* Checksum information. */
+            LM_UINT16 IpChecksum;
+            LM_UINT16 TcpUdpChecksum;
+
+        } Rx;
+    } u;
+} LM_PACKET;
+
+
+
+/******************************************************************************/
+/* Tigon3 device block. */
+/******************************************************************************/
+
+typedef struct _LM_DEVICE_BLOCK {
+    /* Memory view. */
+    PT3_STD_MEM_MAP pMemView;
+
+    /* Base address of the block of memory in which the LM_PACKET descriptors */
+    /* are allocated from. */
+    PLM_VOID pPacketDescBase;
+
+    LM_UINT32 MiscHostCtrl;
+    LM_UINT32 GrcLocalCtrl;
+    LM_UINT32 DmaReadWriteCtrl;
+    LM_UINT32 PciState;
+    LM_UINT32 ClockCtrl;
+    LM_UINT32 DmaReadFifoSize;
+    LM_UINT32 GrcMode;
+
+    LM_UINT32 PowerLevel;
+
+    LM_UINT32 Flags;
+
+    #define MINI_PCI_FLAG              0x1
+    #define PCI_EXPRESS_FLAG           0x2
+    #define BCM5788_FLAG               0x4
+    #define FIBER_WOL_CAPABLE_FLAG     0x8
+    #define WOL_LIMIT_10MBPS_FLAG      0x10
+    #define ENABLE_MWI_FLAG            0x20
+    #define USE_TAGGED_STATUS_FLAG     0x40
+
+    /* NIC will not compute the pseudo header checksum.  The driver or OS */
+    /* must seed the checksum field with the pseudo checksum. */
+    #define NO_TX_PSEUDO_HDR_CSUM_FLAG 0x80
+
+    /* The receive checksum in the BD does not include the pseudo checksum. */
+    /* The OS or the driver must calculate the pseudo checksum and add it to */
+    /* the checksum in the BD. */
+    #define NO_RX_PSEUDO_HDR_CSUM_FLAG 0x100
+
+    #define ENABLE_PCIX_FIX_FLAG       0x200
+
+    #define TX_4G_WORKAROUND_FLAG      0x400
+    #define UNDI_FIX_FLAG              0x800
+    #define FLUSH_POSTED_WRITE_FLAG    0x1000
+    #define REG_RD_BACK_FLAG           0x2000
+
+    /* Use NIC or Host based send BD. */
+    #define NIC_SEND_BD_FLAG           0x4000
+
+    /* Athlon fix. */
+    #define DELAY_PCI_GRANT_FLAG       0x8000
+
+    /* Enable OneDmaAtOnce */
+    #define ONE_DMA_AT_ONCE_FLAG       0x10000
+
+    /* Enable PCI-X multi split */
+    #define MULTI_SPLIT_ENABLE_FLAG    0x20000
+
+    #define RX_BD_LIMIT_64_FLAG        0x40000
+
+    #define DMA_WR_MODE_RX_ACCELERATE_FLAG 0x80000
+
+    /* write protect */
+    #define EEPROM_WP_FLAG             0x100000
+    #define FLASH_DETECTED_FLAG        0x200000
+
+    #define DISABLE_D3HOT_FLAG         0x400000
+
+    /* Rx info */
+    LM_UINT32 RxStdDescCnt;
+    LM_UINT32 RxStdQueuedCnt;
+    LM_UINT32 RxStdProdIdx;
+
+    PT3_RCV_BD pRxStdBdVirt;
+    LM_PHYSICAL_ADDRESS RxStdBdPhy;
+
+    LM_UINT32 RxPacketDescCnt;
+    LM_RX_PACKET_Q RxPacketFreeQ;
+    LM_RX_PACKET_Q RxPacketReceivedQ;
+
+    LM_PACKET *RxStdRing[T3_STD_RCV_RCB_ENTRY_COUNT];
+#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
+    LM_PACKET *RxJumboRing[T3_JUMBO_RCV_RCB_ENTRY_COUNT];
+#endif
+
+    /* Receive info. */
+    PT3_RCV_BD pRcvRetBdVirt;
+    LM_PHYSICAL_ADDRESS RcvRetBdPhy;
+    LM_UINT32 RcvRetConIdx;
+    LM_UINT32 RcvRetRcbEntryCount;
+    LM_UINT32 RcvRetRcbEntryCountMask;
+
+#if T3_JUMBO_RCV_RCB_ENTRY_COUNT
+    LM_UINT32 RxJumboDescCnt;
+    LM_UINT32 RxJumboBufferSize;
+    LM_UINT32 RxJumboQueuedCnt;
+
+    LM_UINT32 RxJumboProdIdx;
+
+    PT3_RCV_BD pRxJumboBdVirt;
+    LM_PHYSICAL_ADDRESS RxJumboBdPhy;
+#endif /* T3_JUMBO_RCV_RCB_ENTRY_COUNT */
+
+    /* These values are used by the upper module to inform the protocol */
+    /* of the maximum transmit/receive packet size. */
+    LM_UINT32 TxMtu;    /* Does not include CRC. */
+    LM_UINT32 RxMtu;    /* Does not include CRC. */
+
+#if INCLUDE_TCP_SEG_SUPPORT
+    LM_UINT32 LargeSendMaxSize;
+    LM_UINT32 LargeSendMinNumSeg;
+#endif
+
+    /* We need to shadow the EMAC, Rx, Tx mode registers.  With B0 silicon, */
+    /* we may have problems reading any MAC registers in 10mb mode. */
+    LM_UINT32 MacMode;
+    LM_UINT32 RxMode;
+    LM_UINT32 TxMode;
+
+    /* MiMode register. */
+    LM_UINT32 MiMode;
+
+    /* Host coalesce mode register. */
+    LM_UINT32 CoalesceMode;
+
+    /* Send info. */
+    LM_UINT32 TxPacketDescCnt;
+
+    /* Tx info. */
+    LM_TX_PACKET_Q TxPacketFreeQ;
+    LM_TX_PACKET_Q TxPacketXmittedQ;
+
+    /* Pointers to SendBd. */
+    PT3_SND_BD pSendBdVirt;
+    LM_PHYSICAL_ADDRESS SendBdPhy;  /* Only valid for Host based Send BD. */
+
+    /* Send producer and consumer indices. */
+    LM_UINT32 SendProdIdx;
+    LM_UINT32 SendConIdx;
+
+    /* Number of BD left. */
+    MM_ATOMIC_T SendBdLeft;
+
+    T3_SND_BD ShadowSendBd[T3_SEND_RCB_ENTRY_COUNT];
+    LM_PACKET *SendRing[T3_SEND_RCB_ENTRY_COUNT];
+
+    /* Counters. */
+    LM_RX_COUNTERS RxCounters;
+    LM_TX_COUNTERS TxCounters;
+
+    /* Host coalescing parameters. */
+    LM_UINT32 RxCoalescingTicks;
+    LM_UINT32 TxCoalescingTicks;
+    LM_UINT32 RxMaxCoalescedFrames;
+    LM_UINT32 TxMaxCoalescedFrames;
+    LM_UINT32 StatsCoalescingTicks;
+    LM_UINT32 RxCoalescingTicksDuringInt;
+    LM_UINT32 TxCoalescingTicksDuringInt;
+    LM_UINT32 RxMaxCoalescedFramesDuringInt;
+    LM_UINT32 TxMaxCoalescedFramesDuringInt;
+
+    /* DMA water marks. */
+    LM_UINT32 DmaMbufLowMark;
+    LM_UINT32 RxMacMbufLowMark;
+    LM_UINT32 MbufHighMark;
+
+    /* Status block. */
+    PT3_STATUS_BLOCK pStatusBlkVirt;
+    LM_PHYSICAL_ADDRESS StatusBlkPhy;
+
+    /* Statistics block. */
+    PT3_STATS_BLOCK pStatsBlkVirt;
+    LM_PHYSICAL_ADDRESS StatsBlkPhy;
+
+    /* Current receive mask. */
+    LM_UINT32 ReceiveMask;
+
+    /* Task offload capabilities. */
+    LM_TASK_OFFLOAD TaskOffloadCap;
+
+    /* Task offload selected. */
+    LM_TASK_OFFLOAD TaskToOffload;
+
+    /* Wake up capability. */
+    LM_WAKE_UP_MODE WakeUpModeCap;
+
+    /* Wake up capability. */
+    LM_WAKE_UP_MODE WakeUpMode;
+
+    /* Flow control. */
+    LM_FLOW_CONTROL FlowControlCap;
+    LM_FLOW_CONTROL FlowControl;
+
+    /* interrupt status tag */
+    LM_UINT32 LastTag;
+
+    /* Current node address. */
+    LM_UINT8 NodeAddress[8];
+
+    /* The adapter's node address. */
+    LM_UINT8 PermanentNodeAddress[8];
+
+    /* Adapter info. */
+    LM_UINT16 BusNum;               // Init by the upper module.
+    LM_UINT8 DevNum;                // Init by the upper module.
+    LM_UINT8 FunctNum;              // Init by the upper module.
+    LM_UINT16 PciVendorId;
+    LM_UINT16 PciDeviceId;
+    LM_UINT32 BondId;
+    LM_UINT8 Irq;
+    LM_UINT8 IntPin;
+    LM_UINT8 CacheLineSize;
+    LM_UINT8 PciRevId;
+    LM_UINT32 PciCommandStatusWords;
+    LM_UINT32 ChipRevId;
+    LM_UINT16 SubsystemVendorId;
+    LM_UINT16 SubsystemId;
+    PLM_UINT8 pMappedMemBase;
+
+    /* Saved PCI configuration registers for restoring after a reset. */
+    LM_UINT32 SavedCacheLineReg;
+
+    /* Phy info. */
+    LM_UINT32 PhyAddr;
+    LM_UINT32 PhyId;
+
+    /* Requested phy settings. */
+    LM_LINE_SPEED RequestedLineSpeed;
+    LM_DUPLEX_MODE RequestedDuplexMode;
+
+    /* 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
+    #define T3_PHY_INT_MODE_MI_INTERRUPT                1
+    #define T3_PHY_INT_MODE_LINK_READY                  2
+    #define T3_PHY_INT_MODE_AUTO_POLLING                3
+
+    /* Ways to determine link change status. */
+    LM_UINT32 LinkChngMode;
+    #define T3_LINK_CHNG_MODE_AUTO                      0
+    #define T3_LINK_CHNG_MODE_USE_STATUS_REG            1
+    #define T3_LINK_CHNG_MODE_USE_STATUS_BLOCK          2
+
+    LM_UINT32 LedCtrl;
+
+    /* WOL Speed */
+    LM_UINT32 WolSpeed;
+    #define WOL_SPEED_10MB                              1
+    #define WOL_SPEED_100MB                             2
+
+    LM_UINT32 PhyFlags;
+    #define PHY_RESET_ON_INIT                           0x01
+    #define PHY_RESET_ON_LINKDOWN                       0x02
+    #define PHY_ADC_FIX                                 0x04
+    #define PHY_CHECK_TAPS_AFTER_RESET                  0x08
+    #define PHY_5704_A0_FIX                             0x10
+    #define PHY_ETHERNET_WIRESPEED                      0x20
+    #define PHY_5705_5750_FIX                           0x40
+    #define PHY_NO_GIGABIT                              0x80
+    #define PHY_CAPACITIVE_COUPLING                     0x100
+
+    LM_UINT32 RestoreOnWakeUp;
+    LM_LINE_SPEED WakeUpRequestedLineSpeed;
+    LM_DUPLEX_MODE WakeUpRequestedDuplexMode;
+    LM_UINT32 WakeUpDisableAutoNeg;
+
+    /* Current phy settings. */
+    LM_LINE_SPEED LineSpeed;
+    LM_LINE_SPEED OldLineSpeed;
+    LM_DUPLEX_MODE DuplexMode;
+    LM_STATUS LinkStatus;
+    LM_UINT32 advertising;
+    LM_UINT32 advertising1000;
+
+    LM_UINT32 LoopBackMode;
+
+#define LM_MAC_LOOP_BACK_MODE 1
+#define LM_PHY_LOOP_BACK_MODE 2
+#define LM_EXT_LOOP_BACK_MODE 3
+
+    LM_LINE_SPEED SavedRequestedLineSpeed;
+    LM_DUPLEX_MODE SavedRequestedDuplexMode;
+    LM_UINT32 SavedDisableAutoNeg;
+
+    LM_UINT32 MulticastHash[4];
+
+    LM_UINT32 AsfFlags;
+
+#define ASF_ENABLED         1
+#define ASF_NEW_HANDSHAKE   2 /* if set, this bit implies ASF enabled as well */
+
+    /* Split Mode flags */
+    LM_UINT32 SplitModeMaxReq;
+
+    #define SPLIT_MODE_5704_MAX_REQ                     3
+
+    /* Init flag. */
+    LM_BOOL InitDone;
+
+    /* Shutdown flag.  Set by the upper module. */
+    LM_BOOL ShuttingDown;
+
+    /* Flag to determine whether to call LM_QueueRxPackets or not in */
+    /* LM_ResetAdapter routine. */
+    LM_BOOL QueueRxPackets;
+    LM_BOOL QueueAgain;
+
+    LM_UINT32 MbufBase;
+    LM_UINT32 MbufSize;
+
+    LM_UINT32 NvramSize;
+
+#if INCLUDE_TBI_SUPPORT
+    /* Autoneg state info. */
+    AN_STATE_INFO AnInfo;
+
+    LM_UINT32 TbiFlags;
+    /* set if we have a SERDES PHY. */
+    #define ENABLE_TBI_FLAG            0x1
+    #define TBI_POLLING_INTR_FLAG      0x2
+    #define TBI_PURE_POLLING_FLAG      0x4
+    #define TBI_POLLING_FLAGS   (TBI_POLLING_INTR_FLAG | TBI_PURE_POLLING_FLAG)
+
+    LM_UINT32 IgnoreTbiLinkChange;
+#endif
+#ifdef BCM_NAPI_RXPOLL
+    volatile LM_UINT32 RxPoll;
+#endif
+    char PartNo[24];
+    char BootCodeVer[16];
+    char BusSpeedStr[24];
+
+} LM_DEVICE_BLOCK;
+
+
+#define T3_REG_CPU_VIEW               0xc0000000
+
+#define T3_BLOCK_DMA_RD               (1 << 0)
+#define T3_BLOCK_DMA_COMP             (1 << 1)
+#define T3_BLOCK_RX_BD_INITIATOR      (1 << 2)
+#define T3_BLOCK_RX_BD_COMP           (1 << 3)
+#define T3_BLOCK_DMA_WR               (1 << 4)
+#define T3_BLOCK_MSI_HANDLER          (1 << 5)
+#define T3_BLOCK_RX_LIST_PLMT         (1 << 6)
+#define T3_BLOCK_RX_LIST_SELECTOR     (1 << 7)
+#define T3_BLOCK_RX_DATA_INITIATOR    (1 << 8)
+#define T3_BLOCK_RX_DATA_COMP         (1 << 9)
+#define T3_BLOCK_HOST_COALESING       (1 << 10)
+#define T3_BLOCK_MAC_RX_ENGINE        (1 << 11)
+#define T3_BLOCK_MBUF_CLUSTER_FREE    (1 << 12)
+#define T3_BLOCK_SEND_BD_INITIATOR    (1 << 13)
+#define T3_BLOCK_SEND_BD_COMP         (1 << 14)
+#define T3_BLOCK_SEND_BD_SELECTOR     (1 << 15)
+#define T3_BLOCK_SEND_DATA_INITIATOR  (1 << 16)
+#define T3_BLOCK_SEND_DATA_COMP       (1 << 17)
+#define T3_BLOCK_MAC_TX_ENGINE        (1 << 18)
+#define T3_BLOCK_MEM_ARBITOR          (1 << 19)
+#define T3_BLOCK_MBUF_MANAGER         (1 << 20)
+#define T3_BLOCK_MAC_GLOBAL           (1 << 21)
+
+#define LM_ENABLE               1
+#define LM_DISABLE              2
+
+#define RX_CPU_EVT_SW0              0
+#define RX_CPU_EVT_SW1              1
+#define RX_CPU_EVT_RLP              2
+#define RX_CPU_EVT_SW3              3
+#define RX_CPU_EVT_RLS              4
+#define RX_CPU_EVT_SW4              5
+#define RX_CPU_EVT_RX_BD_COMP       6
+#define RX_CPU_EVT_SW5              7
+#define RX_CPU_EVT_RDI              8
+#define RX_CPU_EVT_DMA_WR           9
+#define RX_CPU_EVT_DMA_RD           10
+#define RX_CPU_EVT_SWQ              11
+#define RX_CPU_EVT_SW6              12
+#define RX_CPU_EVT_RDC              13
+#define RX_CPU_EVT_SW7              14
+#define RX_CPU_EVT_HOST_COALES      15
+#define RX_CPU_EVT_SW8              16
+#define RX_CPU_EVT_HIGH_DMA_WR      17
+#define RX_CPU_EVT_HIGH_DMA_RD      18
+#define RX_CPU_EVT_SW9              19
+#define RX_CPU_EVT_DMA_ATTN         20
+#define RX_CPU_EVT_LOW_P_MBOX       21
+#define RX_CPU_EVT_HIGH_P_MBOX      22
+#define RX_CPU_EVT_SW10             23
+#define RX_CPU_EVT_TX_CPU_ATTN      24
+#define RX_CPU_EVT_MAC_ATTN         25
+#define RX_CPU_EVT_RX_CPU_ATTN      26
+#define RX_CPU_EVT_FLOW_ATTN        27
+#define RX_CPU_EVT_SW11             28
+#define RX_CPU_EVT_TIMER            29
+#define RX_CPU_EVT_SW12             30
+#define RX_CPU_EVT_SW13             31
+
+/* RX-CPU event */
+#define RX_CPU_EVENT_SW_EVENT0      (1 << RX_CPU_EVT_SW0)
+#define RX_CPU_EVENT_SW_EVENT1      (1 << RX_CPU_EVT_SW1)
+#define RX_CPU_EVENT_RLP            (1 << RX_CPU_EVT_RLP)
+#define RX_CPU_EVENT_SW_EVENT3      (1 << RX_CPU_EVT_SW3)
+#define RX_CPU_EVENT_RLS            (1 << RX_CPU_EVT_RLS)
+#define RX_CPU_EVENT_SW_EVENT4      (1 << RX_CPU_EVT_SW4)
+#define RX_CPU_EVENT_RX_BD_COMP     (1 << RX_CPU_EVT_RX_BD_COMP)
+#define RX_CPU_EVENT_SW_EVENT5      (1 << RX_CPU_EVT_SW5)
+#define RX_CPU_EVENT_RDI            (1 << RX_CPU_EVT_RDI)
+#define RX_CPU_EVENT_DMA_WR         (1 << RX_CPU_EVT_DMA_WR)
+#define RX_CPU_EVENT_DMA_RD         (1 << RX_CPU_EVT_DMA_RD)
+#define RX_CPU_EVENT_SWQ            (1 << RX_CPU_EVT_SWQ)
+#define RX_CPU_EVENT_SW_EVENT6      (1 << RX_CPU_EVT_SW6)
+#define RX_CPU_EVENT_RDC            (1 << RX_CPU_EVT_RDC)
+#define RX_CPU_EVENT_SW_EVENT7      (1 << RX_CPU_EVT_SW7)
+#define RX_CPU_EVENT_HOST_COALES    (1 << RX_CPU_EVT_HOST_COALES)
+#define RX_CPU_EVENT_SW_EVENT8      (1 << RX_CPU_EVT_SW8)
+#define RX_CPU_EVENT_HIGH_DMA_WR    (1 << RX_CPU_EVT_HIGH_DMA_WR)
+#define RX_CPU_EVENT_HIGH_DMA_RD    (1 << RX_CPU_EVT_HIGH_DMA_RD)
+#define RX_CPU_EVENT_SW_EVENT9      (1 << RX_CPU_EVT_SW9)
+#define RX_CPU_EVENT_DMA_ATTN       (1 << RX_CPU_EVT_DMA_ATTN)
+#define RX_CPU_EVENT_LOW_P_MBOX     (1 << RX_CPU_EVT_LOW_P_MBOX)
+#define RX_CPU_EVENT_HIGH_P_MBOX    (1 << RX_CPU_EVT_HIGH_P_MBOX)
+#define RX_CPU_EVENT_SW_EVENT10     (1 << RX_CPU_EVT_SW10)
+#define RX_CPU_EVENT_TX_CPU_ATTN    (1 << RX_CPU_EVT_TX_CPU_ATTN)
+#define RX_CPU_EVENT_MAC_ATTN       (1 << RX_CPU_EVT_MAC_ATTN)
+#define RX_CPU_EVENT_RX_CPU_ATTN    (1 << RX_CPU_EVT_RX_CPU_ATTN)
+#define RX_CPU_EVENT_FLOW_ATTN      (1 << RX_CPU_EVT_FLOW_ATTN)
+#define RX_CPU_EVENT_SW_EVENT11     (1 << RX_CPU_EVT_SW11)
+#define RX_CPU_EVENT_TIMER          (1 << RX_CPU_EVT_TIMER)
+#define RX_CPU_EVENT_SW_EVENT12     (1 << RX_CPU_EVT_SW12)
+#define RX_CPU_EVENT_SW_EVENT13     (1 << RX_CPU_EVT_SW13)
+
+#define RX_CPU_MASK (RX_CPU_EVENT_SW_EVENT0 | \
+		     RX_CPU_EVENT_RLP | \
+		     RX_CPU_EVENT_RDI | \
+		     RX_CPU_EVENT_RDC)
+
+#define TX_CPU_EVT_SW0              0
+#define TX_CPU_EVT_SW1              1
+#define TX_CPU_EVT_SW2              2
+#define TX_CPU_EVT_SW3              3
+#define TX_CPU_EVT_TX_MAC           4
+#define TX_CPU_EVT_SW4              5
+#define TX_CPU_EVT_SBDC             6
+#define TX_CPU_EVT_SW5              7
+#define TX_CPU_EVT_SDI              8
+#define TX_CPU_EVT_DMA_WR           9
+#define TX_CPU_EVT_DMA_RD           10
+#define TX_CPU_EVT_SWQ              11
+#define TX_CPU_EVT_SW6              12
+#define TX_CPU_EVT_SDC              13
+#define TX_CPU_EVT_SW7              14
+#define TX_CPU_EVT_HOST_COALES      15
+#define TX_CPU_EVT_SW8              16
+#define TX_CPU_EVT_HIGH_DMA_WR      17
+#define TX_CPU_EVT_HIGH_DMA_RD      18
+#define TX_CPU_EVT_SW9              19
+#define TX_CPU_EVT_DMA_ATTN         20
+#define TX_CPU_EVT_LOW_P_MBOX       21
+#define TX_CPU_EVT_HIGH_P_MBOX      22
+#define TX_CPU_EVT_SW10             23
+#define TX_CPU_EVT_RX_CPU_ATTN      24
+#define TX_CPU_EVT_MAC_ATTN         25
+#define TX_CPU_EVT_TX_CPU_ATTN      26
+#define TX_CPU_EVT_FLOW_ATTN        27
+#define TX_CPU_EVT_SW11             28
+#define TX_CPU_EVT_TIMER            29
+#define TX_CPU_EVT_SW12             30
+#define TX_CPU_EVT_SW13             31
+
+
+/* TX-CPU event */
+#define TX_CPU_EVENT_SW_EVENT0      (1 << TX_CPU_EVT_SW0)
+#define TX_CPU_EVENT_SW_EVENT1      (1 << TX_CPU_EVT_SW1)
+#define TX_CPU_EVENT_SW_EVENT2      (1 << TX_CPU_EVT_SW2)
+#define TX_CPU_EVENT_SW_EVENT3      (1 << TX_CPU_EVT_SW3)
+#define TX_CPU_EVENT_TX_MAC         (1 << TX_CPU_EVT_TX_MAC)
+#define TX_CPU_EVENT_SW_EVENT4      (1 << TX_CPU_EVT_SW4)
+#define TX_CPU_EVENT_SBDC           (1 << TX_CPU_EVT_SBDC)
+#define TX_CPU_EVENT_SW_EVENT5      (1 << TX_CPU_EVT_SW5)
+#define TX_CPU_EVENT_SDI            (1 << TX_CPU_EVT_SDI)
+#define TX_CPU_EVENT_DMA_WR         (1 << TX_CPU_EVT_DMA_WR)
+#define TX_CPU_EVENT_DMA_RD         (1 << TX_CPU_EVT_DMA_RD)
+#define TX_CPU_EVENT_SWQ            (1 << TX_CPU_EVT_SWQ)
+#define TX_CPU_EVENT_SW_EVENT6      (1 << TX_CPU_EVT_SW6)
+#define TX_CPU_EVENT_SDC            (1 << TX_CPU_EVT_SDC)
+#define TX_CPU_EVENT_SW_EVENT7      (1 << TX_CPU_EVT_SW7)
+#define TX_CPU_EVENT_HOST_COALES    (1 << TX_CPU_EVT_HOST_COALES)
+#define TX_CPU_EVENT_SW_EVENT8      (1 << TX_CPU_EVT_SW8)
+#define TX_CPU_EVENT_HIGH_DMA_WR    (1 << TX_CPU_EVT_HIGH_DMA_WR)
+#define TX_CPU_EVENT_HIGH_DMA_RD    (1 << TX_CPU_EVT_HIGH_DMA_RD)
+#define TX_CPU_EVENT_SW_EVENT9      (1 << TX_CPU_EVT_SW9)
+#define TX_CPU_EVENT_DMA_ATTN       (1 << TX_CPU_EVT_DMA_ATTN)
+#define TX_CPU_EVENT_LOW_P_MBOX     (1 << TX_CPU_EVT_LOW_P_MBOX)
+#define TX_CPU_EVENT_HIGH_P_MBOX    (1 << TX_CPU_EVT_HIGH_P_MBOX)
+#define TX_CPU_EVENT_SW_EVENT10     (1 << TX_CPU_EVT_SW10)
+#define TX_CPU_EVENT_RX_CPU_ATTN    (1 << TX_CPU_EVT_RX_CPU_ATTN)
+#define TX_CPU_EVENT_MAC_ATTN       (1 << TX_CPU_EVT_MAC_ATTN)
+#define TX_CPU_EVENT_TX_CPU_ATTN    (1 << TX_CPU_EVT_TX_CPU_ATTN)
+#define TX_CPU_EVENT_FLOW_ATTN      (1 << TX_CPU_EVT_FLOW_ATTN)
+#define TX_CPU_EVENT_SW_EVENT11     (1 << TX_CPU_EVT_SW11)
+#define TX_CPU_EVENT_TIMER          (1 << TX_CPU_EVT_TIMER)
+#define TX_CPU_EVENT_SW_EVENT12     (1 << TX_CPU_EVT_SW12)
+#define TX_CPU_EVENT_SW_EVENT13     (1 << TX_CPU_EVT_SW13)
+
+
+#define TX_CPU_MASK (TX_CPU_EVENT_SW_EVENT0 | \
+		     TX_CPU_EVENT_SDI  | \
+		     TX_CPU_EVENT_SDC)
+
+
+#define T3_FTQ_TYPE1_UNDERFLOW_BIT   (1 << 29)
+#define T3_FTQ_TYPE1_PASS_BIT        (1 << 30)
+#define T3_FTQ_TYPE1_SKIP_BIT        (1 << 31)
+
+#define T3_FTQ_TYPE2_UNDERFLOW_BIT   (1 << 13)
+#define T3_FTQ_TYPE2_PASS_BIT        (1 << 14)
+#define T3_FTQ_TYPE2_SKIP_BIT        (1 << 15)
+
+#define T3_QID_DMA_READ               1
+#define T3_QID_DMA_HIGH_PRI_READ      2
+#define T3_QID_DMA_COMP_DX            3
+#define T3_QID_SEND_BD_COMP           4
+#define T3_QID_SEND_DATA_INITIATOR    5
+#define T3_QID_DMA_WRITE              6
+#define T3_QID_DMA_HIGH_PRI_WRITE     7
+#define T3_QID_SW_TYPE_1              8
+#define T3_QID_SEND_DATA_COMP         9
+#define T3_QID_HOST_COALESCING        10
+#define T3_QID_MAC_TX                 11
+#define T3_QID_MBUF_CLUSTER_FREE      12
+#define T3_QID_RX_BD_COMP             13
+#define T3_QID_RX_LIST_PLM            14
+#define T3_QID_RX_DATA_BD_INITIATOR   15
+#define T3_QID_RX_DATA_COMP           16
+#define T3_QID_SW_TYPE2               17
+
+LM_STATUS LM_LoadFirmware(PLM_DEVICE_BLOCK pDevice,
+                          PT3_FWIMG_INFO pFwImg,
+                          LM_UINT32 LoadCpu,
+                          LM_UINT32 StartCpu);
+
+/******************************************************************************/
+/* NIC register read/write macros. */
+/******************************************************************************/
+
+/* MAC register access. */
+LM_UINT32 LM_RegRd(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Register);
+
+LM_VOID LM_RegRdBack(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Register);
+
+LM_VOID LM_RegWr(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Register,
+    LM_UINT32 Value32, LM_UINT32 ReadBack);
+
+LM_UINT32 LM_RegRdInd(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Register);
+LM_VOID LM_RegWrInd(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Register,
+    LM_UINT32 Value32);
+
+/* MAC memory access. */
+LM_UINT32 LM_MemRdInd(PLM_DEVICE_BLOCK pDevice, LM_UINT32 MemAddr);
+
+LM_VOID LM_MemWrInd(PLM_DEVICE_BLOCK pDevice, LM_UINT32 MemAddr,
+    LM_UINT32 Value32);
+
+#define MB_REG_WR(pDevice, OffsetName, Value32)                               \
+    ((pDevice)->Flags & UNDI_FIX_FLAG) ?                                      \
+        LM_RegWrInd(pDevice, OFFSETOF(T3_STD_MEM_MAP, OffsetName)+0x5600,     \
+            Value32) :                                                        \
+        (void) MM_MEMWRITEL(&((pDevice)->pMemView->OffsetName), Value32)
+
+#define MB_REG_RD(pDevice, OffsetName)                                        \
+    (((pDevice)->Flags & UNDI_FIX_FLAG) ?                                     \
+        LM_RegRdInd(pDevice, OFFSETOF(T3_STD_MEM_MAP, OffsetName)+0x5600) :   \
+        MM_MEMREADL(&((pDevice)->pMemView->OffsetName)))
+
+#define REG_RD(pDevice, OffsetName)                                         \
+    LM_RegRd(pDevice, OFFSETOF(T3_STD_MEM_MAP, OffsetName))
+
+#define REG_RD_BACK(pDevice, OffsetName)                                    \
+    LM_RegRdBack(pDevice, OFFSETOF(T3_STD_MEM_MAP, OffsetName))
+
+#define REG_WR(pDevice, OffsetName, Value32)                                \
+    LM_RegWr(pDevice, OFFSETOF(T3_STD_MEM_MAP, OffsetName), Value32, TRUE)
+
+#define RAW_REG_WR(pDevice, OffsetName, Value32)                            \
+    LM_RegWr(pDevice, OFFSETOF(T3_STD_MEM_MAP, OffsetName), Value32, FALSE)
+
+#define REG_RD_OFFSET(pDevice, Offset)                                      \
+    MM_MEMREADL(((LM_UINT8 *) (pDevice)->pMemView + Offset))
+
+#define REG_WR_OFFSET(pDevice, Offset, Value32)                             \
+    MM_MEMWRITEL(((LM_UINT8 *) (pDevice)->pMemView + Offset), Value32)
+
+#define MEM_RD(pDevice, AddrName)                                           \
+    LM_MemRdInd(pDevice, OFFSETOF(T3_FIRST_32K_SRAM, AddrName))
+#define MEM_WR(pDevice, AddrName, Value32)                                  \
+    LM_MemWrInd(pDevice, OFFSETOF(T3_FIRST_32K_SRAM, AddrName), Value32)
+
+#define MEM_RD_OFFSET(pDevice, Offset)                                      \
+    LM_MemRdInd(pDevice, Offset)
+#define MEM_WR_OFFSET(pDevice, Offset, Value32)                             \
+    LM_MemWrInd(pDevice, Offset, Value32)
+				
+
+#endif /* TIGON3_H */
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bonding/Makefile linux-2.4.20-wolk4.16-fullkernel/drivers/net/bonding/Makefile
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bonding/Makefile	2004-06-29 11:25:04.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bonding/Makefile	2004-09-05 15:54:58.000000000 +0200
@@ -5,7 +5,7 @@
 O_TARGET := bonding.o
 
 obj-y	 := bond_main.o \
-	    bond_3ad.o \
+            bond_3ad.o  \
 	    bond_alb.o
 
 obj-m	 := $(O_TARGET)
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bonding/bond_3ad.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/bonding/bond_3ad.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bonding/bond_3ad.c	2004-06-29 11:25:07.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bonding/bond_3ad.c	2004-09-05 15:54:58.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved.
+ * Copyright(c) 1999 - 2004 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
@@ -48,7 +48,7 @@
  *	  problem on very high Tx traffic load where packets may get dropped
  *	  by the slave.
  *
- * 2003/09/24 - Shmulik Hen <shmulik.hen at intel dot com>
+ * 2003/12/01 - Shmulik Hen <shmulik.hen at intel dot com>
  *	- Code cleanup and style changes
  */
 
@@ -2362,6 +2362,7 @@ int bond_3ad_xmit_xor(struct sk_buff *sk
 	int agg_id;
 	int i;
 	struct ad_info ad_info;
+	int res = 1;
 
 	/* make sure that the slaves list will
 	 * not change during tx
@@ -2369,12 +2370,12 @@ int bond_3ad_xmit_xor(struct sk_buff *sk
 	read_lock(&bond->lock);
 
 	if (!BOND_IS_OK(bond)) {
-		goto free_out;
+		goto out;
 	}
 
 	if (bond_3ad_get_active_agg_info(bond, &ad_info)) {
 		printk(KERN_DEBUG "ERROR: bond_3ad_get_active_agg_info failed\n");
-		goto free_out;
+		goto out;
 	}
 
 	slaves_in_agg = ad_info.ports;
@@ -2383,7 +2384,7 @@ int bond_3ad_xmit_xor(struct sk_buff *sk
 	if (slaves_in_agg == 0) {
 		/*the aggregator is empty*/
 		printk(KERN_DEBUG "ERROR: active aggregator is empty\n");
-		goto free_out;
+		goto out;
 	}
 
 	slave_agg_no = (data->h_dest[5]^bond->dev->dev_addr[5]) % slaves_in_agg;
@@ -2401,7 +2402,7 @@ int bond_3ad_xmit_xor(struct sk_buff *sk
 
 	if (slave_agg_no >= 0) {
 		printk(KERN_ERR DRV_NAME ": Error: Couldn't find a slave to tx on for aggregator ID %d\n", agg_id);
-		goto free_out;
+		goto out;
 	}
 
 	start_at = slave;
@@ -2414,24 +2415,19 @@ int bond_3ad_xmit_xor(struct sk_buff *sk
 			slave_agg_id = agg->aggregator_identifier;
 		}
 
-		if (SLAVE_IS_OK(slave) && 
-		    agg && (slave_agg_id == agg_id)) {
-			skb->dev = slave->dev;			
-			skb->priority = 1;
-			dev_queue_xmit(skb);
-
-			goto out;
+		if (SLAVE_IS_OK(slave) && agg && (slave_agg_id == agg_id)) {
+			res = bond_dev_queue_xmit(bond, skb, slave->dev);
+			break;
 		}
 	}
 
 out:
+	if (res) {
+		/* no suitable interface, frame not sent */
+		dev_kfree_skb(skb);
+	}
 	read_unlock(&bond->lock);
 	return 0;
-
-free_out:
-	/* no suitable interface, frame not sent */
-	dev_kfree_skb(skb);
-	goto out;
 }
 
 int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type* ptype)
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bonding/bond_3ad.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/bonding/bond_3ad.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bonding/bond_3ad.h	2004-06-29 11:25:07.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bonding/bond_3ad.h	2004-09-05 15:54:58.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved.
+ * Copyright(c) 1999 - 2004 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
@@ -29,7 +29,7 @@
  *	- Renamed bond_3ad_link_status_changed() to
  *	  bond_3ad_handle_link_change() for compatibility with TLB.
  *
- * 2003/09/24 - Shmulik Hen <shmulik.hen at intel dot com>
+ * 2003/12/01 - Shmulik Hen <shmulik.hen at intel dot com>
  *	- Code cleanup and style changes
  */
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bonding/bond_alb.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/bonding/bond_alb.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bonding/bond_alb.c	2004-06-29 11:25:07.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bonding/bond_alb.c	2004-09-05 15:54:58.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved.
+ * Copyright(c) 1999 - 2004 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
@@ -29,8 +29,14 @@
  *	- Add support for setting bond's MAC address with special
  *	  handling required for ALB/TLB.
  *
- * 2003/09/24 - Shmulik Hen <shmulik.hen at intel dot com>
+ * 2003/12/01 - Shmulik Hen <shmulik.hen at intel dot com>
  *	- Code cleanup and style changes
+ *
+ * 2003/12/30 - Amir Noam <amir.noam at intel dot com>
+ *	- Fixed: Cannot remove and re-enslave the original active slave.
+ *
+ * 2004/01/14 - Shmulik Hen <shmulik.hen at intel dot com>
+ *	- Add capability to tag self generated packets in ALB/TLB modes.
  */
 
 //#define BONDING_DEBUG 1
@@ -47,6 +53,7 @@
 #include <linux/if_arp.h>
 #include <linux/if_ether.h>
 #include <linux/if_bonding.h>
+#include <linux/if_vlan.h>
 #include <net/ipx.h>
 #include <net/arp.h>
 #include <asm/byteorder.h>
@@ -76,7 +83,7 @@
 
 
 #define TLB_NULL_INDEX		0xffffffff
-#define MAX_LP_RETRY		3
+#define MAX_LP_BURST		3
 
 /* rlb defs */
 #define RLB_HASH_TABLE_SIZE	256
@@ -495,13 +502,33 @@ static void rlb_update_client(struct rlb
 	}
 
 	for (i = 0; i < RLB_ARP_BURST_SIZE; i++) {
-		arp_send(ARPOP_REPLY, ETH_P_ARP,
-			 client_info->ip_dst,
-			 client_info->slave->dev,
-			 client_info->ip_src,
-			 client_info->mac_dst,
-			 client_info->slave->dev->dev_addr,
-			 client_info->mac_dst);
+		struct sk_buff *skb;
+
+		skb = arp_create(ARPOP_REPLY, ETH_P_ARP,
+				 client_info->ip_dst,
+				 client_info->slave->dev,
+				 client_info->ip_src,
+				 client_info->mac_dst,
+				 client_info->slave->dev->dev_addr,
+				 client_info->mac_dst);
+		if (!skb) {
+			printk(KERN_ERR DRV_NAME
+			       ": Error: failed to create an ARP packet\n");
+			continue;
+		}
+
+		skb->dev = client_info->slave->dev;
+
+		if (client_info->tag) {
+			skb = vlan_put_tag(skb, client_info->vlan_id);
+			if (!skb) {
+				printk(KERN_ERR DRV_NAME
+				       ": Error: failed to insert VLAN tag\n");
+				continue;
+			}
+		}
+
+		arp_xmit(skb);
 	}
 }
 
@@ -600,9 +627,10 @@ static void rlb_req_update_subnet_client
 }
 
 /* Caller must hold both bond and ptr locks for read */
-struct slave *rlb_choose_channel(struct bonding *bond, struct arp_pkt *arp)
+struct slave *rlb_choose_channel(struct sk_buff *skb, struct bonding *bond)
 {
 	struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
+	struct arp_pkt *arp = (struct arp_pkt *)skb->nh.raw;
 	struct slave *assigned_slave;
 	struct rlb_client_info *client_info;
 	u32 hash_index = 0;
@@ -658,6 +686,15 @@ struct slave *rlb_choose_channel(struct 
 			client_info->ntt = 0;
 		}
 
+		if (!list_empty(&bond->vlan_list)) {
+			unsigned short vlan_id;
+			int res = vlan_get_tag(skb, &vlan_id);
+			if (!res) {
+				client_info->tag = 1;
+				client_info->vlan_id = vlan_id;
+			}
+		}
+
 		if (!client_info->assigned) {
 			u32 prev_tbl_head = bond_info->rx_hashtbl_head;
 			bond_info->rx_hashtbl_head = hash_index;
@@ -688,7 +725,7 @@ static struct slave *rlb_arp_xmit(struct
 		/* the arp must be sent on the selected
 		* rx channel
 		*/
-		tx_slave = rlb_choose_channel(bond, arp);
+		tx_slave = rlb_choose_channel(skb, bond);
 		if (tx_slave) {
 			memcpy(arp->mac_src,tx_slave->dev->dev_addr, ETH_ALEN);
 		}
@@ -699,7 +736,7 @@ static struct slave *rlb_arp_xmit(struct
 		 * When the arp reply is received the entry will be updated
 		 * with the correct unicast address of the client.
 		 */
-		rlb_choose_channel(bond, arp);
+		rlb_choose_channel(skb, bond);
 
 		/* The ARP relpy packets must be delayed so that
 		 * they can cancel out the influence of the ARP request.
@@ -806,6 +843,40 @@ static void rlb_deinitialize(struct bond
 
 	kfree(bond_info->rx_hashtbl);
 	bond_info->rx_hashtbl = NULL;
+	bond_info->rx_hashtbl_head = RLB_NULL_INDEX;
+
+	_unlock_rx_hashtbl(bond);
+}
+
+static void rlb_clear_vlan(struct bonding *bond, unsigned short vlan_id)
+{
+	struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
+	u32 curr_index;
+
+	_lock_rx_hashtbl(bond);
+
+	curr_index = bond_info->rx_hashtbl_head;
+	while (curr_index != RLB_NULL_INDEX) {
+		struct rlb_client_info *curr = &(bond_info->rx_hashtbl[curr_index]);
+		u32 next_index = bond_info->rx_hashtbl[curr_index].next;
+		u32 prev_index = bond_info->rx_hashtbl[curr_index].prev;
+
+		if (curr->tag && (curr->vlan_id == vlan_id)) {
+			if (curr_index == bond_info->rx_hashtbl_head) {
+				bond_info->rx_hashtbl_head = next_index;
+			}
+			if (prev_index != RLB_NULL_INDEX) {
+				bond_info->rx_hashtbl[prev_index].next = next_index;
+			}
+			if (next_index != RLB_NULL_INDEX) {
+				bond_info->rx_hashtbl[next_index].prev = prev_index;
+			}
+
+			rlb_init_table_entry(curr);
+		}
+
+		curr_index = next_index;
+	}
 
 	_unlock_rx_hashtbl(bond);
 }
@@ -814,6 +885,7 @@ static void rlb_deinitialize(struct bond
 
 static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[])
 {
+	struct bonding *bond = bond_get_bond_by_slave(slave);
 	struct learning_pkt pkt;
 	int size = sizeof(struct learning_pkt);
 	int i;
@@ -823,7 +895,7 @@ static void alb_send_learning_packets(st
 	memcpy(pkt.mac_src, mac_addr, ETH_ALEN);
 	pkt.type = __constant_htons(ETH_P_LOOP);
 
-	for (i = 0; i < MAX_LP_RETRY; i++) {
+	for (i = 0; i < MAX_LP_BURST; i++) {
 		struct sk_buff *skb;
 		char *data;
 
@@ -841,6 +913,26 @@ static void alb_send_learning_packets(st
 		skb->priority = TC_PRIO_CONTROL;
 		skb->dev = slave->dev;
 
+		if (!list_empty(&bond->vlan_list)) {
+			struct vlan_entry *vlan;
+
+			vlan = bond_next_vlan(bond,
+					      bond->alb_info.current_alb_vlan);
+
+			bond->alb_info.current_alb_vlan = vlan;
+			if (!vlan) {
+				kfree_skb(skb);
+				continue;
+			}
+
+			skb = vlan_put_tag(skb, vlan->vlan_id);
+			if (!skb) {
+				printk(KERN_ERR DRV_NAME
+				       ": Error: failed to insert VLAN tag\n");
+				continue;
+			}
+		}
+
 		dev_queue_xmit(skb);
 	}
 }
@@ -993,6 +1085,7 @@ static void alb_change_hw_addr_on_detach
 static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slave *slave)
 {
 	struct slave *tmp_slave1, *tmp_slave2, *free_mac_slave;
+	struct slave *has_bond_addr = bond->curr_active_slave;
 	int i, j, found = 0;
 
 	if (bond->slave_cnt == 0) {
@@ -1050,6 +1143,15 @@ static int alb_handle_addr_collision_on_
 			free_mac_slave = tmp_slave1;
 			break;
 		}
+
+		if (!has_bond_addr) {
+			if (!memcmp(tmp_slave1->dev->dev_addr,
+				    bond->dev->dev_addr,
+				    ETH_ALEN)) {
+
+				has_bond_addr = tmp_slave1;
+			}
+		}
 	}
 
 	if (free_mac_slave) {
@@ -1060,7 +1162,8 @@ static int alb_handle_addr_collision_on_
 		       ": Warning: the hw address of slave %s is in use by "
 		       "the bond; giving it the hw address of %s\n",
 		       slave->dev->name, free_mac_slave->dev->name);
-	} else {
+
+	} else if (has_bond_addr) {
 		printk(KERN_ERR DRV_NAME
 		       ": Error: the hw address of slave %s is in use by the "
 		       "bond; couldn't find a slave with a free hw address to "
@@ -1180,6 +1283,7 @@ int bond_alb_xmit(struct sk_buff *skb, s
 	int do_tx_balance = 1;
 	u32 hash_index = 0;
 	u8 *hash_start = NULL;
+	int res = 1;
 
 	/* make sure that the curr_active_slave and the slaves list do
 	 * not change during tx
@@ -1188,7 +1292,7 @@ int bond_alb_xmit(struct sk_buff *skb, s
 	read_lock(&bond->curr_slave_lock);
 
 	if (!BOND_IS_OK(bond)) {
-		goto free_out;
+		goto out;
 	}
 
 	switch (ntohs(skb->protocol)) {
@@ -1218,8 +1322,7 @@ int bond_alb_xmit(struct sk_buff *skb, s
 			break;
 		}
 
-		if (skb->nh.ipxh->ipx_type !=
-		    __constant_htons(IPX_TYPE_NCP)) {
+		if (skb->nh.ipxh->ipx_type != IPX_TYPE_NCP) {
 			/* The only protocol worth balancing in
 			 * this family since it has an "ARP" like
 			 * mechanism
@@ -1254,29 +1357,27 @@ int bond_alb_xmit(struct sk_buff *skb, s
 	}
 
 	if (tx_slave && SLAVE_IS_OK(tx_slave)) {
-		skb->dev = tx_slave->dev;
 		if (tx_slave != bond->curr_active_slave) {
 			memcpy(eth_data->h_source,
 			       tx_slave->dev->dev_addr,
 			       ETH_ALEN);
 		}
-		dev_queue_xmit(skb);
+
+		res = bond_dev_queue_xmit(bond, skb, tx_slave->dev);
 	} else {
-		/* no suitable interface, frame not sent */
 		if (tx_slave) {
 			tlb_clear_slave(bond, tx_slave, 0);
 		}
-		goto free_out;
 	}
 
 out:
+	if (res) {
+		/* no suitable interface, frame not sent */
+		dev_kfree_skb(skb);
+	}
 	read_unlock(&bond->curr_slave_lock);
 	read_unlock(&bond->lock);
 	return 0;
-
-free_out:
-	dev_kfree_skb(skb);
-	goto out;
 }
 
 void bond_alb_monitor(struct bonding *bond)
@@ -1577,3 +1678,15 @@ int bond_alb_set_mac_address(struct net_
 	return 0;
 }
 
+void bond_alb_clear_vlan(struct bonding *bond, unsigned short vlan_id)
+{
+	if (bond->alb_info.current_alb_vlan &&
+	    (bond->alb_info.current_alb_vlan->vlan_id == vlan_id)) {
+		bond->alb_info.current_alb_vlan = NULL;
+	}
+
+	if (bond->alb_info.rlb_enabled) {
+		rlb_clear_vlan(bond, vlan_id);
+	}
+}
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bonding/bond_alb.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/bonding/bond_alb.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bonding/bond_alb.h	2004-06-29 11:25:07.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bonding/bond_alb.h	2004-09-05 15:54:58.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved.
+ * Copyright(c) 1999 - 2004 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
@@ -25,7 +25,7 @@
  *	- Add support for setting bond's MAC address with special
  *	  handling required for ALB/TLB.
  *
- * 2003/09/24 - Shmulik Hen <shmulik.hen at intel dot com>
+ * 2003/12/01 - Shmulik Hen <shmulik.hen at intel dot com>
  *	- Code cleanup and style changes
  */
 
@@ -77,6 +77,8 @@ struct rlb_client_info {
 	u8  assigned;		/* checking whether this entry is assigned */
 	u8  ntt;		/* flag - need to transmit client info */
 	struct slave *slave;	/* the slave assigned to this client */
+	u8 tag;			/* flag - need to tag skb */
+	unsigned short vlan_id;	/* VLAN tag associated with IP address */
 };
 
 struct tlb_slave_info {
@@ -122,6 +124,7 @@ struct alb_bond_info {
 						 * rx traffic should be
 						 * rebalanced
 						 */
+	struct vlan_entry	*current_alb_vlan;
 };
 
 int bond_alb_initialize(struct bonding *bond, int rlb_enabled);
@@ -133,6 +136,6 @@ void bond_alb_handle_active_change(struc
 int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev);
 void bond_alb_monitor(struct bonding *bond);
 int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr);
-
+void bond_alb_clear_vlan(struct bonding *bond, unsigned short vlan_id);
 #endif /* __BOND_ALB_H__ */
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bonding/bond_main.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/bonding/bond_main.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bonding/bond_main.c	2004-06-29 11:25:07.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bonding/bond_main.c	2004-09-05 15:54:58.000000000 +0200
@@ -452,6 +452,23 @@
  *	  o Change struct member names and types.
  *	  o Chomp trailing spaces, remove empty lines, fix indentations.
  *	  o Re-organize code according to context.
+ *
+ * 2003/12/30 - Amir Noam <amir.noam at intel dot com>
+ *	- Fixed: Cannot remove and re-enslave the original active slave.
+ *	- Fixed: Releasing the original active slave causes mac address
+ *		 duplication.
+ *	- Add support for slaves that use ethtool_ops.
+ *	  Set version to 2.5.3.
+ *
+ * 2004/01/05 - Amir Noam <amir.noam at intel dot com>
+ *	- Save bonding parameters per bond instead of using the global values.
+ *	  Set version to 2.5.4.
+ *
+ * 2004/01/14 - Shmulik Hen <shmulik.hen at intel dot com>
+ *	- Enhance VLAN support:
+ *	  * Add support for VLAN hardware acceleration capable slaves.
+ *	  * Add capability to tag self generated packets in ALB/TLB modes.
+ *	  Set version to 2.6.0.
  */
 
 //#define BONDING_DEBUG 1
@@ -493,6 +510,7 @@
 #include <net/arp.h>
 #include <linux/mii.h>
 #include <linux/ethtool.h>
+#include <linux/if_vlan.h>
 #include <linux/if_bonding.h>
 #include "bonding.h"
 #include "bond_3ad.h"
@@ -503,7 +521,6 @@
 /* monitor all links that often (in milliseconds). <=0 disables monitoring */
 #define BOND_LINK_MON_INTERV	0
 #define BOND_LINK_ARP_INTERV	0
-#define MAX_ARP_IP_TARGETS	16
 
 static int max_bonds	= BOND_DEFAULT_MAX_BONDS;
 static int miimon	= BOND_LINK_MON_INTERV;
@@ -515,7 +532,7 @@ static char use_mpxor	= 0;
 static char *primary	= NULL;
 static char *lacp_rate	= NULL;
 static int arp_interval = BOND_LINK_ARP_INTERV;
-static char *arp_ip_target[MAX_ARP_IP_TARGETS] = { NULL, };
+static char *arp_ip_target[BOND_MAX_ARP_TARGETS] = { NULL, };
 
 MODULE_PARM(max_bonds, "i");
 MODULE_PARM_DESC(max_bonds, "Max number of bonded devices");
@@ -535,7 +552,7 @@ MODULE_PARM(lacp_rate, "s");
 MODULE_PARM_DESC(lacp_rate, "LACPDU tx rate to request from 802.3ad partner (slow/fast)");
 MODULE_PARM(arp_interval, "i");
 MODULE_PARM_DESC(arp_interval, "arp interval in milliseconds");
-MODULE_PARM(arp_ip_target, "1-" __MODULE_STRING(MAX_ARP_IP_TARGETS) "s");
+MODULE_PARM(arp_ip_target, "1-" __MODULE_STRING(BOND_MAX_ARP_TARGETS) "s");
 MODULE_PARM_DESC(arp_ip_target, "arp targets in n.n.n.n form");
 
 /*----------------------------- Global variables ----------------------------*/
@@ -549,7 +566,7 @@ static LIST_HEAD(bond_dev_list);
 static struct proc_dir_entry *bond_proc_dir = NULL;
 #endif
 
-static u32 arp_target[MAX_ARP_IP_TARGETS] = { 0, } ;
+static u32 arp_target[BOND_MAX_ARP_TARGETS] = { 0, } ;
 static int arp_ip_count	= 0;
 static u32 my_ip	= 0;
 static int bond_mode	= BOND_MODE_ROUNDROBIN;
@@ -586,11 +603,15 @@ static struct bond_parm_tbl bond_mode_tb
 {	NULL,			-1},
 };
 
+/*-------------------------- Forward declarations ---------------------------*/
+
+static inline void bond_set_mode_ops(struct net_device *bond_dev, int mode);
+
 /*---------------------------- General routines -----------------------------*/
 
-static const char *bond_mode_name(void)
+static const char *bond_mode_name(int mode)
 {
-	switch (bond_mode) {
+	switch (mode) {
 	case BOND_MODE_ROUNDROBIN :
 		return "load balancing (round-robin)";
 	case BOND_MODE_ACTIVEBACKUP :
@@ -612,6 +633,371 @@ static const char *bond_mode_name(void)
 	}
 }
 
+/*---------------------------------- VLAN -----------------------------------*/
+
+/**
+ * bond_add_vlan - add a new vlan id on bond
+ * @bond: bond that got the notification
+ * @vlan_id: the vlan id to add
+ *
+ * Returns -ENOMEM if allocation failed.
+ */
+static int bond_add_vlan(struct bonding *bond, unsigned short vlan_id)
+{
+	struct vlan_entry *vlan;
+
+	dprintk("bond: %s, vlan id %d\n",
+		(bond ? bond->dev->name: "None"), vlan_id);
+
+	vlan = kmalloc(sizeof(struct vlan_entry), GFP_KERNEL);
+	if (!vlan) {
+		return -ENOMEM;
+	}
+
+	INIT_LIST_HEAD(&vlan->vlan_list);
+	vlan->vlan_id = vlan_id;
+
+	write_lock_bh(&bond->lock);
+
+	list_add_tail(&vlan->vlan_list, &bond->vlan_list);
+
+	write_unlock_bh(&bond->lock);
+
+	dprintk("added VLAN ID %d on bond %s\n", vlan_id, bond->dev->name);
+
+	return 0;
+}
+
+/**
+ * bond_del_vlan - delete a vlan id from bond
+ * @bond: bond that got the notification
+ * @vlan_id: the vlan id to delete
+ *
+ * returns -ENODEV if @vlan_id was not found in @bond.
+ */
+static int bond_del_vlan(struct bonding *bond, unsigned short vlan_id)
+{
+	struct vlan_entry *vlan, *next;
+	int res = -ENODEV;
+
+	dprintk("bond: %s, vlan id %d\n", bond->dev->name, vlan_id);
+
+	write_lock_bh(&bond->lock);
+
+	list_for_each_entry_safe(vlan, next, &bond->vlan_list, vlan_list) {
+		if (vlan->vlan_id == vlan_id) {
+			list_del(&vlan->vlan_list);
+
+			if ((bond->params.mode == BOND_MODE_TLB) ||
+			    (bond->params.mode == BOND_MODE_ALB)) {
+				bond_alb_clear_vlan(bond, vlan_id);
+			}
+
+			dprintk("removed VLAN ID %d from bond %s\n", vlan_id,
+				bond->dev->name);
+
+			kfree(vlan);
+
+			if (list_empty(&bond->vlan_list) &&
+			    (bond->slave_cnt == 0)) {
+				/* Last VLAN removed and no slaves, so
+				 * restore block on adding VLANs. This will
+				 * be removed once new slaves that are not
+				 * VLAN challenged will be added.
+				 */
+				bond->dev->features |= NETIF_F_VLAN_CHALLENGED;
+			}
+
+			res = 0;
+			goto out;
+		}
+	}
+
+	dprintk("couldn't find VLAN ID %d in bond %s\n", vlan_id,
+		bond->dev->name);
+
+out:
+	write_unlock_bh(&bond->lock);
+	return res;
+}
+
+/**
+ * bond_has_challenged_slaves
+ * @bond: the bond we're working on
+ *
+ * Searches the slave list. Returns 1 if a vlan challenged slave
+ * was found, 0 otherwise.
+ *
+ * Assumes bond->lock is held.
+ */
+static int bond_has_challenged_slaves(struct bonding *bond)
+{
+	struct slave *slave;
+	int i;
+
+	bond_for_each_slave(bond, slave, i) {
+		if (slave->dev->features & NETIF_F_VLAN_CHALLENGED) {
+			dprintk("found VLAN challenged slave - %s\n",
+				slave->dev->name);
+			return 1;
+		}
+	}
+
+	dprintk("no VLAN challenged slaves found\n");
+	return 0;
+}
+
+/**
+ * bond_next_vlan - safely skip to the next item in the vlans list.
+ * @bond: the bond we're working on
+ * @curr: item we're advancing from
+ *
+ * Returns %NULL if list is empty, bond->next_vlan if @curr is %NULL,
+ * or @curr->next otherwise (even if it is @curr itself again).
+ * 
+ * Caller must hold bond->lock
+ */
+struct vlan_entry *bond_next_vlan(struct bonding *bond, struct vlan_entry *curr)
+{
+	struct vlan_entry *next, *last;
+
+	if (list_empty(&bond->vlan_list)) {
+		return NULL;
+	}
+
+	if (!curr) {
+		next = list_entry(bond->vlan_list.next,
+				  struct vlan_entry, vlan_list);
+	} else {
+		last = list_entry(bond->vlan_list.prev,
+				  struct vlan_entry, vlan_list);
+		if (last == curr) {
+			next = list_entry(bond->vlan_list.next,
+					  struct vlan_entry, vlan_list);
+		} else {
+			next = list_entry(curr->vlan_list.next,
+					  struct vlan_entry, vlan_list);
+		}
+	}
+
+	return next;
+}
+
+/**
+ * bond_dev_queue_xmit - Prepare skb for xmit.
+ * 
+ * @bond: bond device that got this skb for tx.
+ * @skb: hw accel VLAN tagged skb to transmit
+ * @slave_dev: slave that is supposed to xmit this skbuff
+ * 
+ * When the bond gets an skb to tarnsmit that is
+ * already hardware accelerated VLAN tagged, and it
+ * needs to relay this skb to a slave that is not
+ * hw accel capable, the skb needs to be "unaccelerated",
+ * i.e. strip the hwaccel tag and re-insert it as part
+ * of the payload.
+ * 
+ * Assumption - once a VLAN device is created over the bond device, all
+ * packets are going to be hardware accelerated VLAN tagged since the IP
+ * binding is done over the VLAN device
+ */
+int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_device *slave_dev)
+{
+	unsigned short vlan_id;
+	int res;
+
+	if (!list_empty(&bond->vlan_list) &&
+	    !(slave_dev->features & NETIF_F_HW_VLAN_TX)) {
+		res = vlan_get_tag(skb, &vlan_id);
+		if (res) {
+			return -EINVAL;
+		}
+
+		skb->dev = slave_dev;
+		skb = vlan_put_tag(skb, vlan_id);
+		if (!skb) {
+			/* vlan_put_tag() frees the skb in case of error,
+			 * so return success here so the calling functions
+			 * won't attempt to free is again.
+			 */
+			return 0;
+		}
+	} else {
+		skb->dev = slave_dev;
+	}
+
+	skb->priority = 1;
+	dev_queue_xmit(skb);
+
+	return 0;
+}
+
+/*
+ * In the following 3 functions, bond_vlan_rx_register(), bond_vlan_rx_add_vid
+ * and bond_vlan_rx_kill_vid, We don't protect the slave list iteration with a
+ * lock because:
+ * a. This operation is performed in IOCTL context,
+ * b. The operation is protected by the RTNL semaphore in the 8021q code,
+ * c. Holding a lock with BH disabled while directly calling a base driver
+ *    entry point is generally a BAD idea.
+ * 
+ * The design of synchronization/protection for this operation in the 8021q
+ * module is good for one or more VLAN devices over a single physical device
+ * and cannot be extended for a teaming solution like bonding, so there is a
+ * potential race condition here where a net device from the vlan group might
+ * be referenced (either by a base driver or the 8021q code) while it is being
+ * removed from the system. However, it turns out we're not making matters
+ * worse, and if it works for regular VLAN usage it will work here too.
+*/
+
+/**
+ * bond_vlan_rx_register - Propagates registration to slaves
+ * @bond_dev: bonding net device that got called
+ * @grp: vlan group being registered
+ */
+static void bond_vlan_rx_register(struct net_device *bond_dev, struct vlan_group *grp)
+{
+	struct bonding *bond = bond_dev->priv;
+	struct slave *slave;
+	int i;
+
+	bond->vlgrp = grp;
+
+	bond_for_each_slave(bond, slave, i) {
+		struct net_device *slave_dev = slave->dev;
+
+		if ((slave_dev->features & NETIF_F_HW_VLAN_RX) &&
+		    slave_dev->vlan_rx_register) {
+			slave_dev->vlan_rx_register(slave_dev, grp);
+		}
+	}
+}
+
+/**
+ * bond_vlan_rx_add_vid - Propagates adding an id to slaves
+ * @bond_dev: bonding net device that got called
+ * @vid: vlan id being added
+ */
+static void bond_vlan_rx_add_vid(struct net_device *bond_dev, uint16_t vid)
+{
+	struct bonding *bond = bond_dev->priv;
+	struct slave *slave;
+	int i, res;
+
+	bond_for_each_slave(bond, slave, i) {
+		struct net_device *slave_dev = slave->dev;
+
+		if ((slave_dev->features & NETIF_F_HW_VLAN_FILTER) &&
+		    slave_dev->vlan_rx_add_vid) {
+			slave_dev->vlan_rx_add_vid(slave_dev, vid);
+		}
+	}
+
+	res = bond_add_vlan(bond, vid);
+	if (res) {
+		printk(KERN_ERR DRV_NAME
+		       ": %s: Failed to add vlan id %d\n",
+		       bond_dev->name, vid);
+	}
+}
+
+/**
+ * bond_vlan_rx_kill_vid - Propagates deleting an id to slaves
+ * @bond_dev: bonding net device that got called
+ * @vid: vlan id being removed
+ */
+static void bond_vlan_rx_kill_vid(struct net_device *bond_dev, uint16_t vid)
+{
+	struct bonding *bond = bond_dev->priv;
+	struct slave *slave;
+	struct net_device *vlan_dev;
+	int i, res;
+
+	bond_for_each_slave(bond, slave, i) {
+		struct net_device *slave_dev = slave->dev;
+
+		if ((slave_dev->features & NETIF_F_HW_VLAN_FILTER) &&
+		    slave_dev->vlan_rx_kill_vid) {
+			/* Save and then restore vlan_dev in the grp array,
+			 * since the slave's driver might clear it.
+			 */
+			vlan_dev = bond->vlgrp->vlan_devices[vid];
+			slave_dev->vlan_rx_kill_vid(slave_dev, vid);
+			bond->vlgrp->vlan_devices[vid] = vlan_dev;
+		}
+	}
+
+	res = bond_del_vlan(bond, vid);
+	if (res) {
+		printk(KERN_ERR DRV_NAME
+		       ": %s: Failed to remove vlan id %d\n",
+		       bond_dev->name, vid);
+	}
+}
+
+static void bond_add_vlans_on_slave(struct bonding *bond, struct net_device *slave_dev)
+{
+	struct vlan_entry *vlan;
+
+	write_lock_bh(&bond->lock);
+
+	if (list_empty(&bond->vlan_list)) {
+		goto out;
+	}
+
+	if ((slave_dev->features & NETIF_F_HW_VLAN_RX) &&
+	    slave_dev->vlan_rx_register) {
+		slave_dev->vlan_rx_register(slave_dev, bond->vlgrp);
+	}
+
+	if (!(slave_dev->features & NETIF_F_HW_VLAN_FILTER) ||
+	    !(slave_dev->vlan_rx_add_vid)) {
+		goto out;
+	}
+
+	list_for_each_entry(vlan, &bond->vlan_list, vlan_list) {
+		slave_dev->vlan_rx_add_vid(slave_dev, vlan->vlan_id);
+	}
+
+out:
+	write_unlock_bh(&bond->lock);
+}
+
+static void bond_del_vlans_from_slave(struct bonding *bond, struct net_device *slave_dev)
+{
+	struct vlan_entry *vlan;
+	struct net_device *vlan_dev;
+
+	write_lock_bh(&bond->lock);
+
+	if (list_empty(&bond->vlan_list)) {
+		goto out;
+	}
+
+	if (!(slave_dev->features & NETIF_F_HW_VLAN_FILTER) ||
+	    !(slave_dev->vlan_rx_kill_vid)) {
+		goto unreg;
+	}
+
+	list_for_each_entry(vlan, &bond->vlan_list, vlan_list) {
+		/* Save and then restore vlan_dev in the grp array,
+		 * since the slave's driver might clear it.
+		 */
+		vlan_dev = bond->vlgrp->vlan_devices[vlan->vlan_id];
+		slave_dev->vlan_rx_kill_vid(slave_dev, vlan->vlan_id);
+		bond->vlgrp->vlan_devices[vlan->vlan_id] = vlan_dev;
+	}
+
+unreg:
+	if ((slave_dev->features & NETIF_F_HW_VLAN_RX) &&
+	    slave_dev->vlan_rx_register) {
+		slave_dev->vlan_rx_register(slave_dev, NULL);
+	}
+
+out:
+	write_unlock_bh(&bond->lock);
+}
+
 /*------------------------------- Link status -------------------------------*/
 
 /*
@@ -627,44 +1013,55 @@ static int bond_update_speed_duplex(stru
 	struct ifreq ifr;
 	struct ethtool_cmd etool;
 
-	ioctl = slave_dev->do_ioctl;
-	if (ioctl) {
-		etool.cmd = ETHTOOL_GSET;
-		ifr.ifr_data = (char*)&etool;
-		if (IOCTL(slave_dev, &ifr, SIOCETHTOOL) == 0) {
-			slave->speed = etool.speed;
-			slave->duplex = etool.duplex;
-		} else {
-			goto err_out;
+	/* Fake speed and duplex */
+	slave->speed = SPEED_100;
+	slave->duplex = DUPLEX_FULL;
+
+	if (slave_dev->ethtool_ops) {
+		u32 res;
+
+		if (!slave_dev->ethtool_ops->get_settings) {
+			return -1;
 		}
-	} else {
-		goto err_out;
+
+		res = slave_dev->ethtool_ops->get_settings(slave_dev, &etool);
+		if (res < 0) {
+			return -1;
+		}
+
+		goto verify;
+	}
+
+	ioctl = slave_dev->do_ioctl;
+	strncpy(ifr.ifr_name, slave_dev->name, IFNAMSIZ);
+	etool.cmd = ETHTOOL_GSET;
+	ifr.ifr_data = (char*)&etool;
+	if (!ioctl || (IOCTL(slave_dev, &ifr, SIOCETHTOOL) < 0)) {
+		return -1;
 	}
 
-	switch (slave->speed) {
+verify:
+	switch (etool.speed) {
 	case SPEED_10:
 	case SPEED_100:
 	case SPEED_1000:
 		break;
 	default:
-		goto err_out;
+		return -1;
 	}
 
-	switch (slave->duplex) {
+	switch (etool.duplex) {
 	case DUPLEX_FULL:
 	case DUPLEX_HALF:
 		break;
 	default:
-		goto err_out;
+		return -1;
 	}
 
-	return 0;
+	slave->speed = etool.speed;
+	slave->duplex = etool.duplex;
 
-err_out:
-	/* Fake speed and duplex */
-	slave->speed = SPEED_100;
-	slave->duplex = DUPLEX_FULL;
-	return -1;
+	return 0;
 }
 
 /*
@@ -683,14 +1080,14 @@ err_out:
  * It'd be nice if there was a good way to tell if a driver supports
  * netif_carrier, but there really isn't.
  */
-static int bond_check_dev_link(struct net_device *slave_dev, int reporting)
+static int bond_check_dev_link(struct bonding *bond, struct net_device *slave_dev, int reporting)
 {
 	static int (* ioctl)(struct net_device *, struct ifreq *, int);
 	struct ifreq ifr;
 	struct mii_ioctl_data *mii;
 	struct ethtool_value etool;
 
-	if (use_carrier) {
+	if (bond->params.use_carrier) {
 		return netif_carrier_ok(slave_dev) ? BMSR_LSTATUS : 0;
 	}
 
@@ -709,6 +1106,7 @@ static int bond_check_dev_link(struct ne
 		 */
 
 		/* Yes, the mii is overlaid on the ifreq.ifr_ifru */
+		strncpy(ifr.ifr_name, slave_dev->name, IFNAMSIZ);
 		mii = (struct mii_ioctl_data *)&ifr.ifr_data;
 		if (IOCTL(slave_dev, &ifr, SIOCGMIIPHY) == 0) {
 			mii->reg_num = MII_BMSR;
@@ -716,10 +1114,23 @@ static int bond_check_dev_link(struct ne
 				return (mii->val_out & BMSR_LSTATUS);
 			}
 		}
+	}
+
+	/* try SIOCETHTOOL ioctl, some drivers cache ETHTOOL_GLINK */
+	/* for a period of time so we attempt to get link status   */
+	/* from it last if the above MII ioctls fail...            */
+	if (slave_dev->ethtool_ops) {
+		if (slave_dev->ethtool_ops->get_link) {
+			u32 link;
+
+			link = slave_dev->ethtool_ops->get_link(slave_dev);
+
+			return link ? BMSR_LSTATUS : 0;
+		}
+	}
 
-		/* try SIOCETHTOOL ioctl, some drivers cache ETHTOOL_GLINK */
-		/* for a period of time so we attempt to get link status   */
-		/* from it last if the above MII ioctls fail...            */
+	if (ioctl) {
+		strncpy(ifr.ifr_name, slave_dev->name, IFNAMSIZ);
 		etool.cmd = ETHTOOL_GLINK;
 		ifr.ifr_data = (char*)&etool;
 		if (IOCTL(slave_dev, &ifr, SIOCETHTOOL) == 0) {
@@ -773,7 +1184,7 @@ static struct dev_mc_list *bond_mc_list_
  */
 static void bond_set_promiscuity(struct bonding *bond, int inc)
 {
-	if (USES_PRIMARY(bond_mode)) {
+	if (USES_PRIMARY(bond->params.mode)) {
 		/* write lock already acquired */
 		if (bond->curr_active_slave) {
 			dev_set_promiscuity(bond->curr_active_slave->dev, inc);
@@ -792,7 +1203,7 @@ static void bond_set_promiscuity(struct 
  */
 static void bond_set_allmulti(struct bonding *bond, int inc)
 {
-	if (USES_PRIMARY(bond_mode)) {
+	if (USES_PRIMARY(bond->params.mode)) {
 		/* write lock already acquired */
 		if (bond->curr_active_slave) {
 			dev_set_allmulti(bond->curr_active_slave->dev, inc);
@@ -812,7 +1223,7 @@ static void bond_set_allmulti(struct bon
  */
 static void bond_mc_add(struct bonding *bond, void *addr, int alen)
 {
-	if (USES_PRIMARY(bond_mode)) {
+	if (USES_PRIMARY(bond->params.mode)) {
 		/* write lock already acquired */
 		if (bond->curr_active_slave) {
 			dev_mc_add(bond->curr_active_slave->dev, addr, alen, 0);
@@ -832,7 +1243,7 @@ static void bond_mc_add(struct bonding *
  */
 static void bond_mc_delete(struct bonding *bond, void *addr, int alen)
 {
-	if (USES_PRIMARY(bond_mode)) {
+	if (USES_PRIMARY(bond->params.mode)) {
 		/* write lock already acquired */
 		if (bond->curr_active_slave) {
 			dev_mc_delete(bond->curr_active_slave->dev, addr, alen, 0);
@@ -892,13 +1303,14 @@ static int bond_mc_list_copy(struct dev_
  */
 static void bond_mc_list_flush(struct net_device *bond_dev, struct net_device *slave_dev)
 {
+	struct bonding *bond = bond_dev->priv;
 	struct dev_mc_list *dmi;
 
 	for (dmi = bond_dev->mc_list; dmi; dmi = dmi->next) {
 		dev_mc_delete(slave_dev, dmi->dmi_addr, dmi->dmi_addrlen, 0);
 	}
 
-	if (bond_mode == BOND_MODE_8023AD) {
+	if (bond->params.mode == BOND_MODE_8023AD) {
 		/* del lacpdu mc addr from mc list */
 		u8 lacpdu_multicast[ETH_ALEN] = MULTICAST_LACPDU_ADDR;
 
@@ -917,7 +1329,7 @@ static void bond_mc_swap(struct bonding 
 {
 	struct dev_mc_list *dmi;
 
-	if (!USES_PRIMARY(bond_mode)) {
+	if (!USES_PRIMARY(bond->params.mode)) {
 		/* nothing to do -  mc list is already up-to-date on
 		 * all slaves
 		 */
@@ -963,7 +1375,7 @@ static struct slave *bond_find_best_slav
 {
 	struct slave *new_active, *old_active;
 	struct slave *bestslave = NULL;
-	int mintime;
+	int mintime = bond->params.updelay;
 	int i;
 
 	new_active = old_active = bond->curr_active_slave;
@@ -976,15 +1388,13 @@ static struct slave *bond_find_best_slav
 		}
 	}
 
-	mintime = updelay;
-
 	/* first try the primary link; if arping, a link must tx/rx traffic
 	 * before it can be considered the curr_active_slave - also, we would skip
 	 * slaves between the curr_active_slave and primary_slave that may be up
 	 * and able to arp
 	 */
 	if ((bond->primary_slave) &&
-	    (!arp_interval) &&
+	    (!bond->params.arp_interval) &&
 	    (IS_UP(bond->primary_slave->dev))) {
 		new_active = bond->primary_slave;
 	}
@@ -1034,28 +1444,28 @@ static void bond_change_active_slave(str
 
 	if (new_active) {
 		if (new_active->link == BOND_LINK_BACK) {
-			if (USES_PRIMARY(bond_mode)) {
+			if (USES_PRIMARY(bond->params.mode)) {
 				printk(KERN_INFO DRV_NAME
 				       ": %s: making interface %s the new "
 				       "active one %d ms earlier.\n",
 				       bond->dev->name, new_active->dev->name,
-				       (updelay - new_active->delay) * miimon);
+				       (bond->params.updelay - new_active->delay) * bond->params.miimon);
 			}
 
 			new_active->delay = 0;
 			new_active->link = BOND_LINK_UP;
 			new_active->jiffies = jiffies;
 
-			if (bond_mode == BOND_MODE_8023AD) {
+			if (bond->params.mode == BOND_MODE_8023AD) {
 				bond_3ad_handle_link_change(new_active, BOND_LINK_UP);
 			}
 
-			if ((bond_mode == BOND_MODE_TLB) ||
-			    (bond_mode == BOND_MODE_ALB)) {
+			if ((bond->params.mode == BOND_MODE_TLB) ||
+			    (bond->params.mode == BOND_MODE_ALB)) {
 				bond_alb_handle_link_change(bond, new_active, BOND_LINK_UP);
 			}
 		} else {
-			if (USES_PRIMARY(bond_mode)) {
+			if (USES_PRIMARY(bond->params.mode)) {
 				printk(KERN_INFO DRV_NAME
 				       ": %s: making interface %s the new "
 				       "active one.\n",
@@ -1064,7 +1474,7 @@ static void bond_change_active_slave(str
 		}
 	}
 
-	if (bond_mode == BOND_MODE_ACTIVEBACKUP) {
+	if (bond->params.mode == BOND_MODE_ACTIVEBACKUP) {
 		if (old_active) {
 			bond_set_slave_inactive_flags(old_active);
 		}
@@ -1074,12 +1484,12 @@ static void bond_change_active_slave(str
 		}
 	}
 
-	if (USES_PRIMARY(bond_mode)) {
+	if (USES_PRIMARY(bond->params.mode)) {
 		bond_mc_swap(bond, new_active, old_active);
 	}
 
-	if ((bond_mode == BOND_MODE_TLB) ||
-	    (bond_mode == BOND_MODE_ALB)) {
+	if ((bond->params.mode == BOND_MODE_TLB) ||
+	    (bond->params.mode == BOND_MODE_ALB)) {
 		bond_alb_handle_active_change(bond, new_active);
 	} else {
 		bond->curr_active_slave = new_active;
@@ -1182,6 +1592,7 @@ static int bond_enslave(struct net_devic
 	struct dev_mc_list *dmi;
 	struct sockaddr addr;
 	int link_reporting;
+	int old_features = bond_dev->features;
 	int res = 0;
 
 	if (slave_dev->do_ioctl == NULL) {
@@ -1202,6 +1613,36 @@ static int bond_enslave(struct net_devic
 		return -EBUSY;
 	}
 
+	/* vlan challenged mutual exclusion */
+	/* no need to lock since we're protected by rtnl_lock */
+	if (slave_dev->features & NETIF_F_VLAN_CHALLENGED) {
+		dprintk("%s: NETIF_F_VLAN_CHALLENGED\n", slave_dev->name);
+		if (!list_empty(&bond->vlan_list)) {
+			printk(KERN_ERR DRV_NAME
+			       ": Error: cannot enslave VLAN "
+			       "challenged slave %s on VLAN enabled "
+			       "bond %s\n", slave_dev->name,
+			       bond_dev->name);
+			return -EPERM;
+		} else {
+			printk(KERN_WARNING DRV_NAME
+			       ": Warning: enslaved VLAN challenged "
+			       "slave %s. Adding VLANs will be blocked as "
+			       "long as %s is part of bond %s\n",
+			       slave_dev->name, slave_dev->name,
+			       bond_dev->name);
+			bond_dev->features |= NETIF_F_VLAN_CHALLENGED;
+		}
+	} else {
+		dprintk("%s: ! NETIF_F_VLAN_CHALLENGED\n", slave_dev->name);
+		if (bond->slave_cnt == 0) {
+			/* First slave, and it is not VLAN challenged,
+			 * so remove the block of adding VLANs over the bond.
+			 */
+			bond_dev->features &= ~NETIF_F_VLAN_CHALLENGED;
+		}
+	}
+
 	if (app_abi_ver >= 1) {
 		/* The application is using an ABI, which requires the
 		 * slave interface to be closed.
@@ -1210,7 +1651,8 @@ static int bond_enslave(struct net_devic
 			printk(KERN_ERR DRV_NAME
 			       ": Error: %s is up\n",
 			       slave_dev->name);
-			return -EPERM;
+			res = -EPERM;
+			goto err_undo_flags;
 		}
 
 		if (slave_dev->set_mac_address == NULL) {
@@ -1221,7 +1663,8 @@ static int bond_enslave(struct net_devic
 			       "Your kernel likely does not support slave "
 			       "devices.\n");
 
-			return -EOPNOTSUPP;
+			res = -EOPNOTSUPP;
+			goto err_undo_flags;
 		}
 	} else {
 		/* The application is not using an ABI, which requires the
@@ -1231,23 +1674,26 @@ static int bond_enslave(struct net_devic
 			printk(KERN_ERR DRV_NAME
 			       ": Error: %s is not running\n",
 			       slave_dev->name);
-			return -EINVAL;
+			res = -EINVAL;
+			goto err_undo_flags;
 		}
 
-		if ((bond_mode == BOND_MODE_8023AD) ||
-		    (bond_mode == BOND_MODE_TLB)    ||
-		    (bond_mode == BOND_MODE_ALB)) {
+		if ((bond->params.mode == BOND_MODE_8023AD) ||
+		    (bond->params.mode == BOND_MODE_TLB)    ||
+		    (bond->params.mode == BOND_MODE_ALB)) {
 			printk(KERN_ERR DRV_NAME
 			       ": Error: to use %s mode, you must upgrade "
 			       "ifenslave.\n",
-			       bond_mode_name());
-			return -EOPNOTSUPP;
+			       bond_mode_name(bond->params.mode));
+			res = -EOPNOTSUPP;
+			goto err_undo_flags;
 		}
 	}
 
 	new_slave = kmalloc(sizeof(struct slave), GFP_KERNEL);
 	if (!new_slave) {
-		return -ENOMEM;
+		res = -ENOMEM;
+		goto err_undo_flags;
 	}
 
 	memset(new_slave, 0, sizeof(struct slave));
@@ -1296,8 +1742,8 @@ static int bond_enslave(struct net_devic
 
 	new_slave->dev = slave_dev;
 
-	if ((bond_mode == BOND_MODE_TLB) ||
-	    (bond_mode == BOND_MODE_ALB)) {
+	if ((bond->params.mode == BOND_MODE_TLB) ||
+	    (bond->params.mode == BOND_MODE_ALB)) {
 		/* bond_alb_init_slave() must be called before all other stages since
 		 * it might fail and we do not want to have to undo everything
 		 */
@@ -1312,7 +1758,7 @@ static int bond_enslave(struct net_devic
 	 * curr_active_slave, and that is taken care of later when calling
 	 * bond_change_active()
 	 */
-	if (!USES_PRIMARY(bond_mode)) {
+	if (!USES_PRIMARY(bond->params.mode)) {
 		/* set promiscuity level to new slave */
 		if (bond_dev->flags & IFF_PROMISC) {
 			dev_set_promiscuity(slave_dev, 1);
@@ -1329,13 +1775,15 @@ static int bond_enslave(struct net_devic
 		}
 	}
 
-	if (bond_mode == BOND_MODE_8023AD) {
+	if (bond->params.mode == BOND_MODE_8023AD) {
 		/* add lacpdu mc addr to mc list */
 		u8 lacpdu_multicast[ETH_ALEN] = MULTICAST_LACPDU_ADDR;
 
 		dev_mc_add(slave_dev, lacpdu_multicast, ETH_ALEN, 0);
 	}
 
+	bond_add_vlans_on_slave(bond, slave_dev);
+
 	write_lock_bh(&bond->lock);
 
 	bond_attach_slave(bond, new_slave);
@@ -1343,10 +1791,10 @@ static int bond_enslave(struct net_devic
 	new_slave->delay = 0;
 	new_slave->link_failure_count = 0;
 
-	if (miimon && !use_carrier) {
-		link_reporting = bond_check_dev_link(slave_dev, 1);
+	if (bond->params.miimon && !bond->params.use_carrier) {
+		link_reporting = bond_check_dev_link(bond, slave_dev, 1);
 
-		if ((link_reporting == -1) && !arp_interval) {
+		if ((link_reporting == -1) && !bond->params.arp_interval) {
 			/*
 			 * miimon is set but a bonded network driver
 			 * does not support ETHTOOL/MII and
@@ -1376,13 +1824,13 @@ static int bond_enslave(struct net_devic
 	}
 
 	/* check for initial state */
-	if (!miimon ||
-	    (bond_check_dev_link(slave_dev, 0) == BMSR_LSTATUS)) {
-		if (updelay) {
+	if (!bond->params.miimon ||
+	    (bond_check_dev_link(bond, slave_dev, 0) == BMSR_LSTATUS)) {
+		if (bond->params.updelay) {
 			dprintk("Initial state of slave_dev is "
 				"BOND_LINK_BACK\n");
 			new_slave->link  = BOND_LINK_BACK;
-			new_slave->delay = updelay;
+			new_slave->delay = bond->params.updelay;
 		} else {
 			dprintk("Initial state of slave_dev is "
 				"BOND_LINK_UP\n");
@@ -1402,7 +1850,7 @@ static int bond_enslave(struct net_devic
 		       "forced to 100Mbps, duplex forced to Full.\n",
 		       new_slave->dev->name);
 
-		if (bond_mode == BOND_MODE_8023AD) {
+		if (bond->params.mode == BOND_MODE_8023AD) {
 			printk(KERN_WARNING
 			       "Operation of 802.3ad mode requires ETHTOOL "
 			       "support in base driver for proper aggregator "
@@ -1410,14 +1858,14 @@ static int bond_enslave(struct net_devic
 		}
 	}
 
-	if (USES_PRIMARY(bond_mode) && primary) {
+	if (USES_PRIMARY(bond->params.mode) && bond->params.primary[0]) {
 		/* if there is a primary slave, remember it */
-		if (strcmp(primary, new_slave->dev->name) == 0) {
+		if (strcmp(bond->params.primary, new_slave->dev->name) == 0) {
 			bond->primary_slave = new_slave;
 		}
 	}
 
-	switch (bond_mode) {
+	switch (bond->params.mode) {
 	case BOND_MODE_ACTIVEBACKUP:
 		/* if we're in active-backup mode, we need one and only one active
 		 * interface. The backup interfaces will have their NOARP flag set
@@ -1451,7 +1899,7 @@ static int bond_enslave(struct net_devic
 			 * can be called only after the mac address of the bond is set
 			 */
 			bond_3ad_initialize(bond, 1000/AD_TIMER_INTERVAL,
-					    lacp_fast);
+					    bond->params.lacp_fast);
 		} else {
 			SLAVE_AD_INFO(new_slave).id =
 				SLAVE_AD_INFO(new_slave->prev).id + 1;
@@ -1544,6 +1992,10 @@ err_restore_mac:
 
 err_free:
 	kfree(new_slave);
+
+err_undo_flags:
+	bond_dev->features = old_features;
+
 	return res;
 }
 
@@ -1561,7 +2013,7 @@ err_free:
 static int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
 {
 	struct bonding *bond = bond_dev->priv;
-	struct slave *slave;
+	struct slave *slave, *oldcurrent;
 	struct sockaddr addr;
 	int mac_addr_differ;
 
@@ -1607,7 +2059,7 @@ static int bond_release(struct net_devic
 	}
 
 	/* Inform AD package of unbinding of slave. */
-	if (bond_mode == BOND_MODE_8023AD) {
+	if (bond->params.mode == BOND_MODE_8023AD) {
 		/* must be called before the slave is
 		 * detached from the list
 		 */
@@ -1621,6 +2073,8 @@ static int bond_release(struct net_devic
 	       ? "active" : "backup",
 	       slave_dev->name);
 
+	oldcurrent = bond->curr_active_slave;
+
 	bond->current_arp_slave = NULL;
 
 	/* release the slave from its bond */
@@ -1630,34 +2084,67 @@ static int bond_release(struct net_devic
 		bond->primary_slave = NULL;
 	}
 
-	if (bond->curr_active_slave == slave) {
+	if (oldcurrent == slave) {
 		bond_change_active_slave(bond, NULL);
-		bond_select_active_slave(bond);
 	}
 
-	if (!bond->curr_active_slave) {
-		printk(KERN_INFO DRV_NAME
-		       ": %s: now running without any active "
-		       "interface !\n",
-		       bond_dev->name);
-	}
-
-	if ((bond_mode == BOND_MODE_TLB) ||
-	    (bond_mode == BOND_MODE_ALB)) {
-		/* must be called only after the slave has been
+	if ((bond->params.mode == BOND_MODE_TLB) ||
+	    (bond->params.mode == BOND_MODE_ALB)) {
+		/* Must be called only after the slave has been
 		 * detached from the list and the curr_active_slave
-		 * has been replaced (if our_slave == old_current)
+		 * has been cleared (if our_slave == old_current),
+		 * but before a new active slave is selected.
 		 */
 		bond_alb_deinit_slave(bond, slave);
 	}
 
+	if (oldcurrent == slave) {
+		bond_select_active_slave(bond);
+
+		if (!bond->curr_active_slave) {
+			printk(KERN_INFO DRV_NAME
+			       ": %s: now running without any active "
+			       "interface !\n",
+			       bond_dev->name);
+		}
+	}
+
+	if (bond->slave_cnt == 0) {
+		/* if the last slave was removed, zero the mac address
+		 * of the master so it will be set by the application
+		 * to the mac address of the first slave
+		 */
+		memset(bond_dev->dev_addr, 0, bond_dev->addr_len);
+
+		if (list_empty(&bond->vlan_list)) {
+			bond_dev->features |= NETIF_F_VLAN_CHALLENGED;
+		} else {
+			printk(KERN_WARNING DRV_NAME
+			       ": Warning: clearing HW address of %s while it "
+			       "still has VLANs.\n",
+			       bond_dev->name);
+			printk(KERN_WARNING DRV_NAME
+			       ": When re-adding slaves, make sure the bond's "
+			       "HW address matches its VLANs'.\n");
+		}
+	} else if ((bond_dev->features & NETIF_F_VLAN_CHALLENGED) &&
+		   !bond_has_challenged_slaves(bond)) {
+		printk(KERN_INFO DRV_NAME
+		       ": last VLAN challenged slave %s "
+		       "left bond %s. VLAN blocking is removed\n",
+		       slave_dev->name, bond_dev->name);
+		bond_dev->features &= ~NETIF_F_VLAN_CHALLENGED;
+	}
+
 	write_unlock_bh(&bond->lock);
 
+	bond_del_vlans_from_slave(bond, slave_dev);
+
 	/* If the mode USES_PRIMARY, then we should only remove its
 	 * promisc and mc settings if it was the curr_active_slave, but that was
 	 * already taken care of above when we detached the slave
 	 */
-	if (!USES_PRIMARY(bond_mode)) {
+	if (!USES_PRIMARY(bond->params.mode)) {
 		/* unset promiscuity level from slave */
 		if (bond_dev->flags & IFF_PROMISC) {
 			dev_set_promiscuity(slave_dev, -1);
@@ -1694,14 +2181,6 @@ static int bond_release(struct net_devic
 
 	kfree(slave);
 
-	/* if the last slave was removed, zero the mac address
-	 * of the master so it will be set by the application
-	 * to the mac address of the first slave
-	 */
-	if (bond->slave_cnt == 0) {
-		memset(bond_dev->dev_addr, 0, bond_dev->addr_len);
-	}
-
 	return 0;  /* deletion OK */
 }
 
@@ -1729,15 +2208,15 @@ static int bond_release_all(struct net_d
 		/* Inform AD package of unbinding of slave
 		 * before slave is detached from the list.
 		 */
-		if (bond_mode == BOND_MODE_8023AD) {
+		if (bond->params.mode == BOND_MODE_8023AD) {
 			bond_3ad_unbind_slave(slave);
 		}
 
 		slave_dev = slave->dev;
 		bond_detach_slave(bond, slave);
 
-		if ((bond_mode == BOND_MODE_TLB) ||
-		    (bond_mode == BOND_MODE_ALB)) {
+		if ((bond->params.mode == BOND_MODE_TLB) ||
+		    (bond->params.mode == BOND_MODE_ALB)) {
 			/* must be called only after the slave
 			 * has been detached from the list
 			 */
@@ -1750,11 +2229,13 @@ static int bond_release_all(struct net_d
 		 */
 		write_unlock_bh(&bond->lock);
 
+		bond_del_vlans_from_slave(bond, slave_dev);
+
 		/* If the mode USES_PRIMARY, then we should only remove its
 		 * promisc and mc settings if it was the curr_active_slave, but that was
 		 * already taken care of above when we detached the slave
 		 */
-		if (!USES_PRIMARY(bond_mode)) {
+		if (!USES_PRIMARY(bond->params.mode)) {
 			/* unset promiscuity level from slave */
 			if (bond_dev->flags & IFF_PROMISC) {
 				dev_set_promiscuity(slave_dev, -1);
@@ -1800,6 +2281,18 @@ static int bond_release_all(struct net_d
 	 */
 	memset(bond_dev->dev_addr, 0, bond_dev->addr_len);
 
+	if (list_empty(&bond->vlan_list)) {
+		bond_dev->features |= NETIF_F_VLAN_CHALLENGED;
+	} else {
+		printk(KERN_WARNING DRV_NAME
+		       ": Warning: clearing HW address of %s while it "
+		       "still has VLANs.\n",
+		       bond_dev->name);
+		printk(KERN_WARNING DRV_NAME
+		       ": When re-adding slaves, make sure the bond's "
+		       "HW address matches its VLANs'.\n");
+	}
+
 	printk(KERN_INFO DRV_NAME
 	       ": %s: released all slaves\n",
 	       bond_dev->name);
@@ -1828,6 +2321,10 @@ static int bond_ioctl_change_active(stru
 	struct slave *new_active = NULL;
 	int res = 0;
 
+	if (!USES_PRIMARY(bond->params.mode)) {
+		return -EINVAL;
+	}
+
 	/* Verify that master_dev is indeed the master of slave_dev */
 	if (!(slave_dev->flags & IFF_SLAVE) ||
 	    (slave_dev->master != bond_dev)) {
@@ -1916,8 +2413,8 @@ static int bond_info_query(struct net_de
 {
 	struct bonding *bond = bond_dev->priv;
 
-	info->bond_mode = bond_mode;
-	info->miimon = miimon;
+	info->bond_mode = bond->params.mode;
+	info->miimon = bond->params.miimon;
 
 	read_lock_bh(&bond->lock);
 	info->num_slaves = bond->slave_cnt;
@@ -1967,11 +2464,13 @@ static void bond_mii_monitor(struct net_
 	struct bonding *bond = bond_dev->priv;
 	struct slave *slave, *oldcurrent;
 	int do_failover = 0;
-	int delta_in_ticks = (miimon * HZ) / 1000;
+	int delta_in_ticks;
 	int i;
 
 	read_lock(&bond->lock);
 
+	delta_in_ticks = (bond->params.miimon * HZ) / 1000;
+
 	if (bond->kill_timers) {
 		goto out;
 	}
@@ -1996,7 +2495,7 @@ static void bond_mii_monitor(struct net_
 		u16 old_speed = slave->speed;
 		u8 old_duplex = slave->duplex;
 
-		link_state = bond_check_dev_link(slave_dev, 0);
+		link_state = bond_check_dev_link(bond, slave_dev, 0);
 
 		switch (slave->link) {
 		case BOND_LINK_UP:	/* the link was up */
@@ -2005,26 +2504,26 @@ static void bond_mii_monitor(struct net_
 				break;
 			} else { /* link going down */
 				slave->link  = BOND_LINK_FAIL;
-				slave->delay = downdelay;
+				slave->delay = bond->params.downdelay;
 
 				if (slave->link_failure_count < UINT_MAX) {
 					slave->link_failure_count++;
 				}
 
-				if (downdelay) {
+				if (bond->params.downdelay) {
 					printk(KERN_INFO DRV_NAME
 					       ": %s: link status down for %s "
 					       "interface %s, disabling it in "
 					       "%d ms.\n",
 					       bond_dev->name,
 					       IS_UP(slave_dev)
-					       ? ((bond_mode == BOND_MODE_ACTIVEBACKUP)
+					       ? ((bond->params.mode == BOND_MODE_ACTIVEBACKUP)
 						  ? ((slave == oldcurrent)
 						     ? "active " : "backup ")
 						  : "")
 					       : "idle ",
 					       slave_dev->name,
-					       downdelay * miimon);
+					       bond->params.downdelay * bond->params.miimon);
 				}
 			}
 			/* no break ! fall through the BOND_LINK_FAIL test to
@@ -2040,8 +2539,8 @@ static void bond_mii_monitor(struct net_
 					/* in active/backup mode, we must
 					 * completely disable this interface
 					 */
-					if ((bond_mode == BOND_MODE_ACTIVEBACKUP) ||
-					    (bond_mode == BOND_MODE_8023AD)) {
+					if ((bond->params.mode == BOND_MODE_ACTIVEBACKUP) ||
+					    (bond->params.mode == BOND_MODE_8023AD)) {
 						bond_set_slave_inactive_flags(slave);
 					}
 
@@ -2053,12 +2552,12 @@ static void bond_mii_monitor(struct net_
 					       slave_dev->name);
 
 					/* notify ad that the link status has changed */
-					if (bond_mode == BOND_MODE_8023AD) {
+					if (bond->params.mode == BOND_MODE_8023AD) {
 						bond_3ad_handle_link_change(slave, BOND_LINK_DOWN);
 					}
 
-					if ((bond_mode == BOND_MODE_TLB) ||
-					    (bond_mode == BOND_MODE_ALB)) {
+					if ((bond->params.mode == BOND_MODE_TLB) ||
+					    (bond->params.mode == BOND_MODE_ALB)) {
 						bond_alb_handle_link_change(bond, slave, BOND_LINK_DOWN);
 					}
 
@@ -2076,7 +2575,7 @@ static void bond_mii_monitor(struct net_
 				       ": %s: link status up again after %d "
 				       "ms for interface %s.\n",
 				       bond_dev->name,
-				       (downdelay - slave->delay) * miimon,
+				       (bond->params.downdelay - slave->delay) * bond->params.miimon,
 				       slave_dev->name);
 			}
 			break;
@@ -2086,9 +2585,9 @@ static void bond_mii_monitor(struct net_
 				break;
 			} else {	/* link going up */
 				slave->link  = BOND_LINK_BACK;
-				slave->delay = updelay;
+				slave->delay = bond->params.updelay;
 
-				if (updelay) {
+				if (bond->params.updelay) {
 					/* if updelay == 0, no need to
 					   advertise about a 0 ms delay */
 					printk(KERN_INFO DRV_NAME
@@ -2097,7 +2596,7 @@ static void bond_mii_monitor(struct net_
 					       "in %d ms.\n",
 					       bond_dev->name,
 					       slave_dev->name,
-					       updelay * miimon);
+					       bond->params.updelay * bond->params.miimon);
 				}
 			}
 			/* no break ! fall through the BOND_LINK_BACK state in
@@ -2112,7 +2611,7 @@ static void bond_mii_monitor(struct net_
 				       ": %s: link status down again after %d "
 				       "ms for interface %s.\n",
 				       bond_dev->name,
-				       (updelay - slave->delay) * miimon,
+				       (bond->params.updelay - slave->delay) * bond->params.miimon,
 				       slave_dev->name);
 			} else {
 				/* link stays up */
@@ -2121,10 +2620,10 @@ static void bond_mii_monitor(struct net_
 					slave->link = BOND_LINK_UP;
 					slave->jiffies = jiffies;
 
-					if (bond_mode == BOND_MODE_8023AD) {
+					if (bond->params.mode == BOND_MODE_8023AD) {
 						/* prevent it from being the active one */
 						slave->state = BOND_STATE_BACKUP;
-					} else if (bond_mode != BOND_MODE_ACTIVEBACKUP) {
+					} else if (bond->params.mode != BOND_MODE_ACTIVEBACKUP) {
 						/* make it immediately active */
 						slave->state = BOND_STATE_ACTIVE;
 					} else if (slave != bond->primary_slave) {
@@ -2139,12 +2638,12 @@ static void bond_mii_monitor(struct net_
 					       slave_dev->name);
 
 					/* notify ad that the link status has changed */
-					if (bond_mode == BOND_MODE_8023AD) {
+					if (bond->params.mode == BOND_MODE_8023AD) {
 						bond_3ad_handle_link_change(slave, BOND_LINK_UP);
 					}
 
-					if ((bond_mode == BOND_MODE_TLB) ||
-					    (bond_mode == BOND_MODE_ALB)) {
+					if ((bond->params.mode == BOND_MODE_TLB) ||
+					    (bond->params.mode == BOND_MODE_ALB)) {
 						bond_alb_handle_link_change(bond, slave, BOND_LINK_UP);
 					}
 
@@ -2166,7 +2665,7 @@ static void bond_mii_monitor(struct net_
 
 		bond_update_speed_duplex(slave);
 
-		if (bond_mode == BOND_MODE_8023AD) {
+		if (bond->params.mode == BOND_MODE_8023AD) {
 			if (old_speed != slave->speed) {
 				bond_3ad_adapter_speed_changed(slave);
 			}
@@ -2194,17 +2693,20 @@ static void bond_mii_monitor(struct net_
 	}
 
 re_arm:
-	mod_timer(&bond->mii_timer, jiffies + delta_in_ticks);
+	if (bond->params.miimon) {
+		mod_timer(&bond->mii_timer, jiffies + delta_in_ticks);
+	}
 out:
 	read_unlock(&bond->lock);
 }
 
-static void bond_arp_send_all(struct slave *slave)
+static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
 {
 	int i;
+	u32 *targets = bond->params.arp_targets;
 
-	for (i = 0; (i<MAX_ARP_IP_TARGETS) && arp_target[i]; i++) {
-		arp_send(ARPOP_REQUEST, ETH_P_ARP, arp_target[i], slave->dev,
+	for (i = 0; (i < BOND_MAX_ARP_TARGETS) && targets[i]; i++) {
+		arp_send(ARPOP_REQUEST, ETH_P_ARP, targets[i], slave->dev,
 			 my_ip, NULL, slave->dev->dev_addr,
 			 NULL);
 	}
@@ -2222,11 +2724,13 @@ static void bond_loadbalance_arp_mon(str
 	struct bonding *bond = bond_dev->priv;
 	struct slave *slave, *oldcurrent;
 	int do_failover = 0;
-	int delta_in_ticks = (arp_interval * HZ) / 1000;
+	int delta_in_ticks;
 	int i;
 
 	read_lock(&bond->lock);
 
+	delta_in_ticks = (bond->params.arp_interval * HZ) / 1000;
+
 	if (bond->kill_timers) {
 		goto out;
 	}
@@ -2311,7 +2815,7 @@ static void bond_loadbalance_arp_mon(str
 		 * to be unstable during low/no traffic periods
 		 */
 		if (IS_UP(slave->dev)) {
-			bond_arp_send_all(slave);
+			bond_arp_send_all(bond, slave);
 		}
 	}
 
@@ -2331,7 +2835,9 @@ static void bond_loadbalance_arp_mon(str
 	}
 
 re_arm:
-	mod_timer(&bond->arp_timer, jiffies + delta_in_ticks);
+	if (bond->params.arp_interval) {
+		mod_timer(&bond->arp_timer, jiffies + delta_in_ticks);
+	}
 out:
 	read_unlock(&bond->lock);
 }
@@ -2355,11 +2861,13 @@ static void bond_activebackup_arp_mon(st
 {
 	struct bonding *bond = bond_dev->priv;
 	struct slave *slave;
-	int delta_in_ticks = (arp_interval * HZ) / 1000;
+	int delta_in_ticks;
 	int i;
 
 	read_lock(&bond->lock);
 
+	delta_in_ticks = (bond->params.arp_interval * HZ) / 1000;
+
 	if (bond->kill_timers) {
 		goto out;
 	}
@@ -2518,7 +3026,7 @@ static void bond_activebackup_arp_mon(st
 		 * rx traffic
 		 */
 		if (slave && my_ip) {
-			bond_arp_send_all(slave);
+			bond_arp_send_all(bond, slave);
 		}
 	}
 
@@ -2539,7 +3047,7 @@ static void bond_activebackup_arp_mon(st
 				if (IS_UP(slave->dev)) {
 					slave->link = BOND_LINK_BACK;
 					bond_set_slave_active_flags(slave);
-					bond_arp_send_all(slave);
+					bond_arp_send_all(bond, slave);
 					slave->jiffies = jiffies;
 					bond->current_arp_slave = slave;
 					break;
@@ -2571,7 +3079,9 @@ static void bond_activebackup_arp_mon(st
 	}
 
 re_arm:
-	mod_timer(&bond->arp_timer, jiffies + delta_in_ticks);
+	if (bond->params.arp_interval) {
+		mod_timer(&bond->arp_timer, jiffies + delta_in_ticks);
+	}
 out:
 	read_unlock(&bond->lock);
 }
@@ -2629,33 +3139,40 @@ static void bond_info_seq_stop(struct se
 	read_unlock(&dev_base_lock);
 }
 
-static void bond_info_show_master(struct seq_file *seq, struct bonding *bond)
+static void bond_info_show_master(struct seq_file *seq)
 {
+	struct bonding *bond = seq->private;
 	struct slave *curr;
 
 	read_lock(&bond->curr_slave_lock);
 	curr = bond->curr_active_slave;
 	read_unlock(&bond->curr_slave_lock);
 
-	seq_printf(seq, "Bonding Mode: %s\n", bond_mode_name());
+	seq_printf(seq, "Bonding Mode: %s\n",
+		   bond_mode_name(bond->params.mode));
 
-	if (USES_PRIMARY(bond_mode)) {
-		if (curr) {
-			seq_printf(seq,
-				   "Currently Active Slave: %s\n",
-				   curr->dev->name);
-		}
+	if (USES_PRIMARY(bond->params.mode)) {
+		seq_printf(seq, "Primary Slave: %s\n",
+			   (bond->params.primary[0]) ?
+			   	bond->params.primary : "None");
+
+		seq_printf(seq, "Currently Active Slave: %s\n",
+			   (curr) ? curr->dev->name : "None");
 	}
 
 	seq_printf(seq, "MII Status: %s\n", (curr) ? "up" : "down");
-	seq_printf(seq, "MII Polling Interval (ms): %d\n", miimon);
-	seq_printf(seq, "Up Delay (ms): %d\n", updelay * miimon);
-	seq_printf(seq, "Down Delay (ms): %d\n", downdelay * miimon);
+	seq_printf(seq, "MII Polling Interval (ms): %d\n", bond->params.miimon);
+	seq_printf(seq, "Up Delay (ms): %d\n",
+		   bond->params.updelay * bond->params.miimon);
+	seq_printf(seq, "Down Delay (ms): %d\n",
+		   bond->params.downdelay * bond->params.miimon);
 
-	if (bond_mode == BOND_MODE_8023AD) {
+	if (bond->params.mode == BOND_MODE_8023AD) {
 		struct ad_info ad_info;
 
 		seq_puts(seq, "\n802.3ad info\n");
+		seq_printf(seq, "LACP rate: %s\n",
+			   (bond->params.lacp_fast) ? "fast" : "slow");
 
 		if (bond_3ad_get_active_agg_info(bond, &ad_info)) {
 			seq_printf(seq, "bond %s has no active aggregator\n",
@@ -2684,6 +3201,8 @@ static void bond_info_show_master(struct
 
 static void bond_info_show_slave(struct seq_file *seq, const struct slave *slave)
 {
+	struct bonding *bond = seq->private;
+
 	seq_printf(seq, "\nSlave Interface: %s\n", slave->dev->name);
 	seq_printf(seq, "MII Status: %s\n",
 		   (slave->link == BOND_LINK_UP) ?  "up" : "down");
@@ -2701,7 +3220,7 @@ static void bond_info_show_slave(struct 
 			   slave->perm_hwaddr[5]);
 	}
 
-	if (bond_mode == BOND_MODE_8023AD) {
+	if (bond->params.mode == BOND_MODE_8023AD) {
 		const struct aggregator *agg
 			= SLAVE_AD_INFO(slave).port.aggregator;
 
@@ -2718,7 +3237,7 @@ static int bond_info_seq_show(struct seq
 {
 	if (v == SEQ_START_TOKEN) {
 		seq_printf(seq, "%s\n", version);
-		bond_info_show_master(seq, seq->private);
+		bond_info_show_master(seq);
 	} else {
 		bond_info_show_slave(seq, v);
 	}
@@ -2994,14 +3513,14 @@ static int bond_open(struct net_device *
 
 	bond->kill_timers = 0;
 
-	if ((bond_mode == BOND_MODE_TLB) ||
-	    (bond_mode == BOND_MODE_ALB)) {
+	if ((bond->params.mode == BOND_MODE_TLB) ||
+	    (bond->params.mode == BOND_MODE_ALB)) {
 		struct timer_list *alb_timer = &(BOND_ALB_INFO(bond).alb_timer);
 
 		/* bond_alb_initialize must be called before the timer
 		 * is started.
 		 */
-		if (bond_alb_initialize(bond, (bond_mode == BOND_MODE_ALB))) {
+		if (bond_alb_initialize(bond, (bond->params.mode == BOND_MODE_ALB))) {
 			/* something went wrong - fail the open operation */
 			return -1;
 		}
@@ -3013,7 +3532,7 @@ static int bond_open(struct net_device *
 		add_timer(alb_timer);
 	}
 
-	if (miimon) {  /* link check interval, in milliseconds. */
+	if (bond->params.miimon) {  /* link check interval, in milliseconds. */
 		init_timer(mii_timer);
 		mii_timer->expires  = jiffies + 1;
 		mii_timer->data     = (unsigned long)bond_dev;
@@ -3021,11 +3540,11 @@ static int bond_open(struct net_device *
 		add_timer(mii_timer);
 	}
 
-	if (arp_interval) {  /* arp interval, in milliseconds. */
+	if (bond->params.arp_interval) {  /* arp interval, in milliseconds. */
 		init_timer(arp_timer);
 		arp_timer->expires  = jiffies + 1;
 		arp_timer->data     = (unsigned long)bond_dev;
-		if (bond_mode == BOND_MODE_ACTIVEBACKUP) {
+		if (bond->params.mode == BOND_MODE_ACTIVEBACKUP) {
 			arp_timer->function = (void *)&bond_activebackup_arp_mon;
 		} else {
 			arp_timer->function = (void *)&bond_loadbalance_arp_mon;
@@ -3033,7 +3552,7 @@ static int bond_open(struct net_device *
 		add_timer(arp_timer);
 	}
 
-	if (bond_mode == BOND_MODE_8023AD) {
+	if (bond->params.mode == BOND_MODE_8023AD) {
 		struct timer_list *ad_timer = &(BOND_AD_INFO(bond).ad_timer);
 		init_timer(ad_timer);
 		ad_timer->expires  = jiffies + 1;
@@ -3056,7 +3575,7 @@ static int bond_close(struct net_device 
 
 	bond_mc_list_destroy(bond);
 
-	if (bond_mode == BOND_MODE_8023AD) {
+	if (bond->params.mode == BOND_MODE_8023AD) {
 		/* Unregister the receive of LACPDUs */
 		bond_unregister_lacpdu(bond);
 	}
@@ -3070,15 +3589,15 @@ static int bond_close(struct net_device 
 	 * because a running timer might be trying to hold it too
 	 */
 
-	if (miimon) {  /* link check interval, in milliseconds. */
+	if (bond->params.miimon) {  /* link check interval, in milliseconds. */
 		del_timer_sync(&bond->mii_timer);
 	}
 
-	if (arp_interval) {  /* arp interval, in milliseconds. */
+	if (bond->params.arp_interval) {  /* arp interval, in milliseconds. */
 		del_timer_sync(&bond->arp_timer);
 	}
 
-	switch (bond_mode) {
+	switch (bond->params.mode) {
 	case BOND_MODE_8023AD:
 		del_timer_sync(&(BOND_AD_INFO(bond).ad_timer));
 		break;
@@ -3093,8 +3612,8 @@ static int bond_close(struct net_device 
 	/* Release the bonded slaves */
 	bond_release_all(bond_dev);
 
-	if ((bond_mode == BOND_MODE_TLB) ||
-	    (bond_mode == BOND_MODE_ALB)) {
+	if ((bond->params.mode == BOND_MODE_TLB) ||
+	    (bond->params.mode == BOND_MODE_ALB)) {
 		/* Must be called only after all
 		 * slaves have been released
 		 */
@@ -3274,11 +3793,7 @@ static int bond_do_ioctl(struct net_devi
 			break;
 		case BOND_CHANGE_ACTIVE_OLD:
 		case SIOCBONDCHANGEACTIVE:
-			if (USES_PRIMARY(bond_mode)) {
-				res = bond_ioctl_change_active(bond_dev, slave_dev);
-			} else {
-				res = -EINVAL;
-			}
+			res = bond_ioctl_change_active(bond_dev, slave_dev);
 			break;
 		default:
 			res = -EOPNOTSUPP;
@@ -3510,11 +4025,12 @@ static int bond_xmit_roundrobin(struct s
 	struct bonding *bond = bond_dev->priv;
 	struct slave *slave, *start_at;
 	int i;
+	int res = 1;
 
 	read_lock(&bond->lock);
 
 	if (!BOND_IS_OK(bond)) {
-		goto free_out;
+		goto out;
 	}
 
 	read_lock(&bond->curr_slave_lock);
@@ -3522,33 +4038,31 @@ static int bond_xmit_roundrobin(struct s
 	read_unlock(&bond->curr_slave_lock);
 
 	if (!slave) {
-		goto free_out;
+		goto out;
 	}
 
 	bond_for_each_slave_from(bond, slave, i, start_at) {
 		if (IS_UP(slave->dev) &&
 		    (slave->link == BOND_LINK_UP) &&
 		    (slave->state == BOND_STATE_ACTIVE)) {
-			skb->dev = slave->dev;
-			skb->priority = 1;
-			dev_queue_xmit(skb);
+			res = bond_dev_queue_xmit(bond, skb, slave->dev);
 
 			write_lock(&bond->curr_slave_lock);
 			bond->curr_active_slave = slave->next;
 			write_unlock(&bond->curr_slave_lock);
 
-			goto out;
+			break;
 		}
 	}
 
+
 out:
+	if (res) {
+		/* no suitable interface, frame not sent */
+		dev_kfree_skb(skb);
+	}
 	read_unlock(&bond->lock);
 	return 0;
-
-free_out:
-	/* no suitable interface, frame not sent */
-	dev_kfree_skb(skb);
-	goto out;
 }
 
 /*
@@ -3558,10 +4072,11 @@ free_out:
 static int bond_xmit_activebackup(struct sk_buff *skb, struct net_device *bond_dev)
 {
 	struct bonding *bond = bond_dev->priv;
+	int res = 1;
 
 	/* if we are sending arp packets, try to at least
 	   identify our own ip address */
-	if (arp_interval && !my_ip &&
+	if (bond->params.arp_interval && !my_ip &&
 		(skb->protocol == __constant_htons(ETH_P_ARP))) {
 		char *the_ip = (char *)skb->data +
 				sizeof(struct ethhdr) +
@@ -3574,26 +4089,21 @@ static int bond_xmit_activebackup(struct
 	read_lock(&bond->curr_slave_lock);
 
 	if (!BOND_IS_OK(bond)) {
-		goto free_out;
+		goto out;
 	}
 
 	if (bond->curr_active_slave) { /* one usable interface */
-		skb->dev = bond->curr_active_slave->dev;
-		skb->priority = 1;
-		dev_queue_xmit(skb);
-		goto out;
-	} else {
-		goto free_out;
+		res = bond_dev_queue_xmit(bond, skb, bond->curr_active_slave->dev);
 	}
+
 out:
+	if (res) {
+		/* no suitable interface, frame not sent */
+		dev_kfree_skb(skb);
+	}
 	read_unlock(&bond->curr_slave_lock);
 	read_unlock(&bond->lock);
 	return 0;
-
-free_out:
-	/* no suitable interface, frame not sent */
-	dev_kfree_skb(skb);
-	goto out;
 }
 
 /*
@@ -3609,11 +4119,12 @@ static int bond_xmit_xor(struct sk_buff 
 	int slave_no;
 	int ports_xor = 0;
 	int i;
+	int res = 1;
 
 	read_lock(&bond->lock);
 
 	if (!BOND_IS_OK(bond)) {
-		goto free_out;
+		goto out;
 	}
 
 	/* don't use the port if you can't get it, i.e. packet is a fragment */
@@ -3635,22 +4146,18 @@ static int bond_xmit_xor(struct sk_buff 
 		if (IS_UP(slave->dev) &&
 		    (slave->link == BOND_LINK_UP) &&
 		    (slave->state == BOND_STATE_ACTIVE)) {
-			skb->dev = slave->dev;
-			skb->priority = 1;
-			dev_queue_xmit(skb);
-
-			goto out;
+			res = bond_dev_queue_xmit(bond, skb, slave->dev);
+			break;
 		}
 	}
 
 out:
+	if (res) {
+		/* no suitable interface, frame not sent */
+		dev_kfree_skb(skb);
+	}
 	read_unlock(&bond->lock);
 	return 0;
-
-free_out:
-	/* no suitable interface, frame not sent */
-	dev_kfree_skb(skb);
-	goto out;
 }
 
 /*
@@ -3662,11 +4169,12 @@ static int bond_xmit_broadcast(struct sk
 	struct slave *slave, *start_at;
 	struct net_device *tx_dev = NULL;
 	int i;
+	int res = 1;
 
 	read_lock(&bond->lock);
 
 	if (!BOND_IS_OK(bond)) {
-		goto free_out;
+		goto out;
 	}
 
 	read_lock(&bond->curr_slave_lock);
@@ -3674,7 +4182,7 @@ static int bond_xmit_broadcast(struct sk
 	read_unlock(&bond->curr_slave_lock);
 
 	if (!start_at) {
-		goto free_out;
+		goto out;
 	}
 
 	bond_for_each_slave_from(bond, slave, i, start_at) {
@@ -3690,31 +4198,28 @@ static int bond_xmit_broadcast(struct sk
 					continue;
 				}
 
-				skb2->dev = tx_dev;
-				skb2->priority = 1;
-				dev_queue_xmit(skb2);
+				res = bond_dev_queue_xmit(bond, skb2, tx_dev);
+				if (res) {
+					dev_kfree_skb(skb2);
+					continue;
+				}
 			}
 			tx_dev = slave->dev;
 		}
 	}
 
 	if (tx_dev) {
-		skb->dev = tx_dev;
-		skb->priority = 1;
-		dev_queue_xmit(skb);
-	} else {
-		goto free_out;
+		res = bond_dev_queue_xmit(bond, skb, tx_dev);
 	}
 
 out:
+	if (res) {
+		/* no suitable interface, frame not sent */
+		dev_kfree_skb(skb);
+	}
 	/* frame sent to all suitable interfaces */
 	read_unlock(&bond->lock);
 	return 0;
-
-free_out:
-	/* no suitable interface, frame not sent */
-	dev_kfree_skb(skb);
-	goto out;
 }
 
 #ifdef CONFIG_NET_FASTROUTE
@@ -3727,13 +4232,51 @@ static int bond_accept_fastpath(struct n
 /*------------------------- Device initialization ---------------------------*/
 
 /*
+ * set bond mode specific net device operations
+ */
+static inline void bond_set_mode_ops(struct net_device *bond_dev, int mode)
+{
+	switch (mode) {
+	case BOND_MODE_ROUNDROBIN:
+		bond_dev->hard_start_xmit = bond_xmit_roundrobin;
+		break;
+	case BOND_MODE_ACTIVEBACKUP:
+		bond_dev->hard_start_xmit = bond_xmit_activebackup;
+		break;
+	case BOND_MODE_XOR:
+		bond_dev->hard_start_xmit = bond_xmit_xor;
+		break;
+	case BOND_MODE_BROADCAST:
+		bond_dev->hard_start_xmit = bond_xmit_broadcast;
+		break;
+	case BOND_MODE_8023AD:
+		bond_dev->hard_start_xmit = bond_3ad_xmit_xor;
+		break;
+	case BOND_MODE_TLB:
+	case BOND_MODE_ALB:
+		bond_dev->hard_start_xmit = bond_alb_xmit;
+		bond_dev->set_mac_address = bond_alb_set_mac_address;
+		break;
+	case BOND_MODE_MPXOR:
+		use_mpxor = 1;
+		bond_dev->hard_start_xmit = bond_xmit_xor;
+		break;
+	default:
+		/* Should never happen, mode already checked */
+		printk(KERN_ERR DRV_NAME
+		       ": Error: Unknown bonding mode %d\n",
+		       mode);
+		break;
+	}
+}
+
+/*
  * Does not allocate but creates a /proc entry.
  * Allowed to fail.
  */
-static int __init bond_init(struct net_device *bond_dev)
+static int __init bond_init(struct net_device *bond_dev, struct bond_params *params)
 {
 	struct bonding *bond = bond_dev->priv;
-	int count;
 
 	dprintk("Begin bond_init for %s\n", bond_dev->name);
 
@@ -3741,12 +4284,15 @@ static int __init bond_init(struct net_d
 	rwlock_init(&bond->lock);
 	rwlock_init(&bond->curr_slave_lock);
 
+	bond->params = *params; /* copy params struct */
+
 	/* Initialize pointers */
 	bond->first_slave = NULL;
 	bond->curr_active_slave = NULL;
 	bond->current_arp_slave = NULL;
 	bond->primary_slave = NULL;
 	bond->dev = bond_dev;
+	INIT_LIST_HEAD(&bond->vlan_list);
 
 	/* Initialize the device entry points */
 	bond_dev->open = bond_open;
@@ -3757,37 +4303,7 @@ static int __init bond_init(struct net_d
 	bond_dev->change_mtu = bond_change_mtu;
 	bond_dev->set_mac_address = bond_set_mac_address;
 
-	switch (bond_mode) {
-	case BOND_MODE_ROUNDROBIN:
-		bond_dev->hard_start_xmit = bond_xmit_roundrobin;
-		break;
-	case BOND_MODE_ACTIVEBACKUP:
-		bond_dev->hard_start_xmit = bond_xmit_activebackup;
-		break;
-	case BOND_MODE_XOR:
-		bond_dev->hard_start_xmit = bond_xmit_xor;
-		break;
-	case BOND_MODE_BROADCAST:
-		bond_dev->hard_start_xmit = bond_xmit_broadcast;
-		break;
-	case BOND_MODE_8023AD:
-		bond_dev->hard_start_xmit = bond_3ad_xmit_xor; /* extern */
-		break;
-	case BOND_MODE_TLB:
-	case BOND_MODE_ALB:
-		bond_dev->hard_start_xmit = bond_alb_xmit; /* extern */
-		bond_dev->set_mac_address = bond_alb_set_mac_address; /* extern */
-		break;
-	case BOND_MODE_MPXOR:
-		use_mpxor = 1;
-		bond_dev->hard_start_xmit = bond_xmit_xor;
-		break;
-	default:
-		printk(KERN_ERR DRV_NAME
-		       ": Error: Unknown bonding mode %d\n",
-		       bond_mode);
-		return -EINVAL;
-	}
+	bond_set_mode_ops(bond_dev, bond->params.mode);
 
 #ifdef CONFIG_NET_FASTROUTE
 	bond_dev->accept_fastpath = bond_accept_fastpath;
@@ -3797,27 +4313,25 @@ static int __init bond_init(struct net_d
 	bond_dev->tx_queue_len = 0;
 	bond_dev->flags |= IFF_MASTER|IFF_MULTICAST;
 
-	printk(KERN_INFO DRV_NAME ": %s registered with", bond_dev->name);
-	if (miimon) {
-		printk(" MII link monitoring set to %d ms", miimon);
-		updelay /= miimon;
-		downdelay /= miimon;
-	} else {
-		printk("out MII link monitoring");
-	}
-	printk(", in %s mode.\n", bond_mode_name());
+	/* At first, we block adding VLANs. That's the only way to
+	 * prevent problems that occur when adding VLANs over an
+	 * empty bond. The block will be removed once non-challenged
+	 * slaves are enslaved.
+	 */
+	bond_dev->features |= NETIF_F_VLAN_CHALLENGED;
 
-	printk(KERN_INFO DRV_NAME ": %s registered with", bond_dev->name);
-	if (arp_interval > 0) {
-		printk(" ARP monitoring set to %d ms with %d target(s):",
-		       arp_interval, arp_ip_count);
-		for (count=0 ; count<arp_ip_count ; count++) {
-			printk(" %s", arp_ip_target[count]);
-		}
-		printk("\n");
-	} else {
-		printk("out ARP monitoring\n");
-	}
+	/* By default, we declare the bond to be fully
+	 * VLAN hardware accelerated capable. Special
+	 * care is taken in the various xmit functions
+	 * when there are slaves that are not hw accel
+	 * capable
+	 */
+	bond_dev->vlan_rx_register = bond_vlan_rx_register;
+	bond_dev->vlan_rx_add_vid  = bond_vlan_rx_add_vid;
+	bond_dev->vlan_rx_kill_vid = bond_vlan_rx_kill_vid;
+	bond_dev->features |= (NETIF_F_HW_VLAN_TX |
+			       NETIF_F_HW_VLAN_RX |
+			       NETIF_F_HW_VLAN_FILTER);
 
 #ifdef CONFIG_PROC_FS
 	bond_create_proc_entry(bond);
@@ -3884,7 +4398,7 @@ static inline int bond_parse_parm(char *
 	return -1;
 }
 
-static int bond_check_params(void)
+static int bond_check_params(struct bond_params *params)
 {
 	/*
 	 * Convert string parameters.
@@ -3903,7 +4417,7 @@ static int bond_check_params(void)
 		if (bond_mode != BOND_MODE_8023AD) {
 			printk(KERN_INFO DRV_NAME
 			       ": lacp_rate param is irrelevant in mode %s\n",
-			       bond_mode_name());
+			       bond_mode_name(bond_mode));
 		} else {
 			lacp_fast = bond_parse_parm(lacp_rate, bond_lacp_tbl);
 			if (lacp_fast == -1) {
@@ -3947,17 +4461,17 @@ static int bond_check_params(void)
 		downdelay = 0;
 	}
 
+	if ((use_carrier != 0) && (use_carrier != 1)) {
+		printk(KERN_WARNING DRV_NAME
+		       ": Warning: use_carrier module parameter (%d), "
+		       "not of valid value (0/1), so it was set to 1\n",
+		       use_carrier);
+		use_carrier = 1;
+	}
+
 	/* reset values for 802.3ad */
 	if (bond_mode == BOND_MODE_8023AD) {
-		if (arp_interval) {
-			printk(KERN_WARNING DRV_NAME
-			       ": Warning: ARP monitoring can't be used "
-			       "simultaneously with 802.3ad, disabling ARP "
-			       "monitoring\n");
-			arp_interval = 0;
-		}
-
-		if (miimon) {
+		if (!miimon) {
 			printk(KERN_WARNING DRV_NAME
 			       ": Warning: miimon must be specified, "
 			       "otherwise bonding will not detect link "
@@ -4016,25 +4530,23 @@ static int bond_check_params(void)
 		}
 
 		if ((updelay % miimon) != 0) {
-			/* updelay will be rounded in bond_init() when it
-			 * is divided by miimon, we just inform user here
-			 */
 			printk(KERN_WARNING DRV_NAME
 			       ": Warning: updelay (%d) is not a multiple "
 			       "of miimon (%d), updelay rounded to %d ms\n",
 			       updelay, miimon, (updelay / miimon) * miimon);
 		}
 
+		updelay /= miimon;
+
 		if ((downdelay % miimon) != 0) {
-			/* downdelay will be rounded in bond_init() when it
-			 * is divided by miimon, we just inform user here
-			 */
 			printk(KERN_WARNING DRV_NAME
 			       ": Warning: downdelay (%d) is not a multiple "
 			       "of miimon (%d), downdelay rounded to %d ms\n",
 			       downdelay, miimon,
 			       (downdelay / miimon) * miimon);
 		}
+
+		downdelay /= miimon;
 	}
 
 	if (arp_interval < 0) {
@@ -4046,7 +4558,7 @@ static int bond_check_params(void)
 	}
 
 	for (arp_ip_count = 0;
-	     (arp_ip_count < MAX_ARP_IP_TARGETS) && arp_ip_target[arp_ip_count];
+	     (arp_ip_count < BOND_MAX_ARP_TARGETS) && arp_ip_target[arp_ip_count];
 	     arp_ip_count++) {
 		/* not complete check, but should be good enough to
 		   catch mistakes */
@@ -4072,7 +4584,23 @@ static int bond_check_params(void)
 		arp_interval = 0;
 	}
 
-	if (!miimon && !arp_interval) {
+	if (miimon) {
+		printk(KERN_INFO DRV_NAME
+		       ": MII link monitoring set to %d ms\n",
+		       miimon);
+	} else if (arp_interval) {
+		int i;
+
+		printk(KERN_INFO DRV_NAME
+		       ": ARP monitoring set to %d ms with %d target(s):",
+		       arp_interval, arp_ip_count);
+
+		for (i = 0; i < arp_ip_count; i++)
+			printk (" %s", arp_ip_target[i]);
+
+		printk("\n");
+
+	} else {
 		/* miimon and arp_interval not set, we need one so things
 		 * work as expected, see bonding.txt for details
 		 */
@@ -4090,21 +4618,39 @@ static int bond_check_params(void)
 		printk(KERN_WARNING DRV_NAME
 		       ": Warning: %s primary device specified but has no "
 		       "effect in %s mode\n",
-		       primary, bond_mode_name());
+		       primary, bond_mode_name(bond_mode));
 		primary = NULL;
 	}
 
+	/* fill params struct with the proper values */
+	params->mode = bond_mode;
+	params->miimon = miimon;
+	params->arp_interval = arp_interval;
+	params->updelay = updelay;
+	params->downdelay = downdelay;
+	params->use_carrier = use_carrier;
+	params->lacp_fast = lacp_fast;
+	params->primary[0] = 0;
+
+	if (primary) {
+		strncpy(params->primary, primary, IFNAMSIZ);
+		params->primary[IFNAMSIZ - 1] = 0;
+	}
+
+	memcpy(params->arp_targets, arp_target, sizeof(arp_target));
+
 	return 0;
 }
 
 static int __init bonding_init(void)
 {
+	struct bond_params params;
 	int i;
 	int res;
 
 	printk(KERN_INFO "%s", version);
 
-	res = bond_check_params();
+	res = bond_check_params(&params);
 	if (res) {
 		return res;
 	}
@@ -4134,7 +4680,7 @@ static int __init bonding_init(void)
 		 * /proc files), but before register_netdevice(), because we
 		 * need to set function pointers.
 		 */
-		res = bond_init(bond_dev);
+		res = bond_init(bond_dev, &params);
 		if (res < 0) {
 			free_netdev(bond_dev);
 			goto out_err;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/bonding/bonding.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/bonding/bonding.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/bonding/bonding.h	2004-06-29 11:25:07.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/bonding/bonding.h	2004-09-05 15:54:58.000000000 +0200
@@ -23,7 +23,7 @@
  * 2003/05/01 - Shmulik Hen <shmulik.hen at intel dot com>
  *	- Added support for Transmit load balancing mode.
  *
- * 2003/09/24 - Shmulik Hen <shmulik.hen at intel dot com>
+ * 2003/12/01 - Shmulik Hen <shmulik.hen at intel dot com>
  *	- Code cleanup and style changes
  */
 
@@ -36,11 +36,13 @@
 #include "bond_3ad.h"
 #include "bond_alb.h"
 
-#define DRV_VERSION	"2.5.0"
-#define DRV_RELDATE	"December 1, 2003"
+#define DRV_VERSION	"2.6.0"
+#define DRV_RELDATE	"January 14, 2004"
 #define DRV_NAME	"bonding"
 #define DRV_DESCRIPTION	"Ethernet Channel Bonding Driver"
 
+#define BOND_MAX_ARP_TARGETS	16
+
 #ifdef BONDING_DEBUG
 #define dprintk(fmt, args...) \
 	printk(KERN_DEBUG     \
@@ -133,6 +135,23 @@
 		bond_for_each_slave_from(bond, pos, cnt, (bond)->first_slave)
 
 
+struct bond_params {
+	int mode;
+	int miimon;
+	int arp_interval;
+	int use_carrier;
+	int updelay;
+	int downdelay;
+	int lacp_fast;
+	char primary[IFNAMSIZ];
+	u32 arp_targets[BOND_MAX_ARP_TARGETS];
+};
+
+struct vlan_entry {
+	struct list_head vlan_list;
+	unsigned short vlan_id;
+};
+
 struct slave {
 	struct net_device *dev; /* first - usefull for panic debug */
 	struct slave *next;
@@ -181,6 +200,9 @@ struct bonding {
 	u16      flags;
 	struct   ad_bond_info ad_info;
 	struct   alb_bond_info alb_info;
+	struct   bond_params params;
+	struct   list_head vlan_list;
+	struct   vlan_group *vlgrp;
 };
 
 /**
@@ -223,5 +245,8 @@ extern inline void bond_set_slave_active
 	slave->dev->flags &= ~IFF_NOARP;
 }
 
+struct vlan_entry *bond_next_vlan(struct bonding *bond, struct vlan_entry *curr);
+int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_device *slave_dev);
+
 #endif /* _LINUX_BONDING_H */
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/e100/e100_main.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/e100/e100_main.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/e100/e100_main.c	2004-06-29 11:26:00.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/e100/e100_main.c	2004-09-05 16:04:20.000000000 +0200
@@ -1080,6 +1080,116 @@ e100_change_mtu(struct net_device *dev, 
 	return 0;
 }
 
+/**
+ * e100_prepare_xmit_buff - prepare a buffer for transmission
+ * @bdp: atapter's private data struct
+ * @skb: skb to send
+ *
+ * This routine prepare a buffer for transmission. It checks
+ * the message length for the appropiate size. It picks up a
+ * free tcb from the TCB pool and sets up the corresponding
+ * TBD's. If the number of fragments are more than the number
+ * of TBD/TCB it copies all the fragments in a coalesce buffer.
+ * It returns a pointer to the prepared TCB.
+ */
+static inline tcb_t *
+e100_prepare_xmit_buff(struct e100_private *bdp, struct sk_buff *skb)
+{
+	tcb_t *tcb, *prev_tcb;
+
+	tcb = bdp->tcb_pool.data;
+	tcb += TCB_TO_USE(bdp->tcb_pool);
+
+	if (bdp->flags & USE_IPCB) {
+		tcb->tcbu.ipcb.ip_activation_high = IPCB_IP_ACTIVATION_DEFAULT;
+		tcb->tcbu.ipcb.ip_schedule &= ~IPCB_TCP_PACKET;
+		tcb->tcbu.ipcb.ip_schedule &= ~IPCB_TCPUDP_CHECKSUM_ENABLE;
+	}
+
+	if(bdp->vlgrp && vlan_tx_tag_present(skb)) {
+		(tcb->tcbu).ipcb.ip_activation_high |= IPCB_INSERTVLAN_ENABLE;
+		(tcb->tcbu).ipcb.vlan = cpu_to_be16(vlan_tx_tag_get(skb));
+	}
+	
+	tcb->tcb_hdr.cb_status = 0;
+	tcb->tcb_thrshld = bdp->tx_thld;
+	tcb->tcb_hdr.cb_cmd |= __constant_cpu_to_le16(CB_S_BIT);
+
+	/* Set I (Interrupt) bit on every (TX_FRAME_CNT)th packet */
+	if (!(++bdp->tx_count % TX_FRAME_CNT))
+		tcb->tcb_hdr.cb_cmd |= __constant_cpu_to_le16(CB_I_BIT);
+	else
+		/* Clear I bit on other packets */
+		tcb->tcb_hdr.cb_cmd &= ~__constant_cpu_to_le16(CB_I_BIT);
+
+	tcb->tcb_skb = skb;
+
+	if (skb->ip_summed == CHECKSUM_HW) {
+		const struct iphdr *ip = skb->nh.iph;
+
+		if ((ip->protocol == IPPROTO_TCP) ||
+		    (ip->protocol == IPPROTO_UDP)) {
+
+			tcb->tcbu.ipcb.ip_activation_high |=
+				IPCB_HARDWAREPARSING_ENABLE;
+			tcb->tcbu.ipcb.ip_schedule |=
+				IPCB_TCPUDP_CHECKSUM_ENABLE;
+
+			if (ip->protocol == IPPROTO_TCP)
+				tcb->tcbu.ipcb.ip_schedule |= IPCB_TCP_PACKET;
+		}
+	}
+
+	if (!skb_shinfo(skb)->nr_frags) {
+		(tcb->tbd_ptr)->tbd_buf_addr =
+			cpu_to_le32(pci_map_single(bdp->pdev, skb->data,
+						   skb->len, PCI_DMA_TODEVICE));
+		(tcb->tbd_ptr)->tbd_buf_cnt = cpu_to_le16(skb->len);
+		tcb->tcb_tbd_num = 1;
+		tcb->tcb_tbd_ptr = tcb->tcb_tbd_dflt_ptr;
+	} else {
+		int i;
+		void *addr;
+		tbd_t *tbd_arr_ptr = &(tcb->tbd_ptr[1]);
+		skb_frag_t *frag = &skb_shinfo(skb)->frags[0];
+
+		(tcb->tbd_ptr)->tbd_buf_addr =
+			cpu_to_le32(pci_map_single(bdp->pdev, skb->data,
+						   skb_headlen(skb),
+						   PCI_DMA_TODEVICE));
+		(tcb->tbd_ptr)->tbd_buf_cnt =
+			cpu_to_le16(skb_headlen(skb));
+
+		for (i = 0; i < skb_shinfo(skb)->nr_frags;
+		     i++, tbd_arr_ptr++, frag++) {
+
+			addr = ((void *) page_address(frag->page) +
+				frag->page_offset);
+
+			tbd_arr_ptr->tbd_buf_addr =
+				cpu_to_le32(pci_map_single(bdp->pdev,
+							   addr, frag->size,
+							   PCI_DMA_TODEVICE));
+			tbd_arr_ptr->tbd_buf_cnt = cpu_to_le16(frag->size);
+		}
+		tcb->tcb_tbd_num = skb_shinfo(skb)->nr_frags + 1;
+		tcb->tcb_tbd_ptr = tcb->tcb_tbd_expand_ptr;
+	}
+
+	/* clear the S-BIT on the previous tcb */
+	prev_tcb = bdp->tcb_pool.data;
+	prev_tcb += PREV_TCB_USED(bdp->tcb_pool);
+	prev_tcb->tcb_hdr.cb_cmd &= __constant_cpu_to_le16((u16) ~CB_S_BIT);
+
+	bdp->tcb_pool.tail = NEXT_TCB_TOUSE(bdp->tcb_pool.tail);
+
+	wmb();
+
+	e100_start_cu(bdp, tcb);
+
+	return tcb;
+}
+
 static int
 e100_xmit_frame(struct sk_buff *skb, struct net_device *dev)
 {
@@ -1612,6 +1722,32 @@ e100_alloc_tcb_pool(struct e100_private 
 	return 1;
 }
 
+/**
+ * e100_tx_skb_free - free TX skbs resources
+ * @bdp: atapter's private data struct
+ * @tcb: associated tcb of the freed skb
+ *
+ * This routine frees resources of TX skbs.
+ */
+static inline void
+e100_tx_skb_free(struct e100_private *bdp, tcb_t *tcb)
+{
+	if (tcb->tcb_skb) {
+		int i;
+		tbd_t *tbd_arr = tcb->tbd_ptr;
+		int frags = skb_shinfo(tcb->tcb_skb)->nr_frags;
+
+		for (i = 0; i <= frags; i++, tbd_arr++) {
+			pci_unmap_single(bdp->pdev,
+					 le32_to_cpu(tbd_arr->tbd_buf_addr),
+					 le16_to_cpu(tbd_arr->tbd_buf_cnt),
+					 PCI_DMA_TODEVICE);
+		}
+		dev_kfree_skb_irq(tcb->tcb_skb);
+		tcb->tcb_skb = NULL;
+	}
+}
+
 void
 e100_free_tcb_pool(struct e100_private *bdp)
 {
@@ -1917,32 +2053,6 @@ e100intr(int irq, void *dev_inst, struct
 }
 
 /**
- * e100_tx_skb_free - free TX skbs resources
- * @bdp: atapter's private data struct
- * @tcb: associated tcb of the freed skb
- *
- * This routine frees resources of TX skbs.
- */
-static inline void
-e100_tx_skb_free(struct e100_private *bdp, tcb_t *tcb)
-{
-	if (tcb->tcb_skb) {
-		int i;
-		tbd_t *tbd_arr = tcb->tbd_ptr;
-		int frags = skb_shinfo(tcb->tcb_skb)->nr_frags;
-
-		for (i = 0; i <= frags; i++, tbd_arr++) {
-			pci_unmap_single(bdp->pdev,
-					 le32_to_cpu(tbd_arr->tbd_buf_addr),
-					 le16_to_cpu(tbd_arr->tbd_buf_cnt),
-					 PCI_DMA_TODEVICE);
-		}
-		dev_kfree_skb_irq(tcb->tcb_skb);
-		tcb->tcb_skb = NULL;
-	}
-}
-
-/**
  * e100_tx_srv - service TX queues
  * @bdp: atapter's private data struct
  *
@@ -2162,116 +2272,6 @@ e100_refresh_txthld(struct e100_private 
 	}			/* end underrun check */
 }
 
-/**
- * e100_prepare_xmit_buff - prepare a buffer for transmission
- * @bdp: atapter's private data struct
- * @skb: skb to send
- *
- * This routine prepare a buffer for transmission. It checks
- * the message length for the appropiate size. It picks up a
- * free tcb from the TCB pool and sets up the corresponding
- * TBD's. If the number of fragments are more than the number
- * of TBD/TCB it copies all the fragments in a coalesce buffer.
- * It returns a pointer to the prepared TCB.
- */
-static inline tcb_t *
-e100_prepare_xmit_buff(struct e100_private *bdp, struct sk_buff *skb)
-{
-	tcb_t *tcb, *prev_tcb;
-
-	tcb = bdp->tcb_pool.data;
-	tcb += TCB_TO_USE(bdp->tcb_pool);
-
-	if (bdp->flags & USE_IPCB) {
-		tcb->tcbu.ipcb.ip_activation_high = IPCB_IP_ACTIVATION_DEFAULT;
-		tcb->tcbu.ipcb.ip_schedule &= ~IPCB_TCP_PACKET;
-		tcb->tcbu.ipcb.ip_schedule &= ~IPCB_TCPUDP_CHECKSUM_ENABLE;
-	}
-
-	if(bdp->vlgrp && vlan_tx_tag_present(skb)) {
-		(tcb->tcbu).ipcb.ip_activation_high |= IPCB_INSERTVLAN_ENABLE;
-		(tcb->tcbu).ipcb.vlan = cpu_to_be16(vlan_tx_tag_get(skb));
-	}
-	
-	tcb->tcb_hdr.cb_status = 0;
-	tcb->tcb_thrshld = bdp->tx_thld;
-	tcb->tcb_hdr.cb_cmd |= __constant_cpu_to_le16(CB_S_BIT);
-
-	/* Set I (Interrupt) bit on every (TX_FRAME_CNT)th packet */
-	if (!(++bdp->tx_count % TX_FRAME_CNT))
-		tcb->tcb_hdr.cb_cmd |= __constant_cpu_to_le16(CB_I_BIT);
-	else
-		/* Clear I bit on other packets */
-		tcb->tcb_hdr.cb_cmd &= ~__constant_cpu_to_le16(CB_I_BIT);
-
-	tcb->tcb_skb = skb;
-
-	if (skb->ip_summed == CHECKSUM_HW) {
-		const struct iphdr *ip = skb->nh.iph;
-
-		if ((ip->protocol == IPPROTO_TCP) ||
-		    (ip->protocol == IPPROTO_UDP)) {
-
-			tcb->tcbu.ipcb.ip_activation_high |=
-				IPCB_HARDWAREPARSING_ENABLE;
-			tcb->tcbu.ipcb.ip_schedule |=
-				IPCB_TCPUDP_CHECKSUM_ENABLE;
-
-			if (ip->protocol == IPPROTO_TCP)
-				tcb->tcbu.ipcb.ip_schedule |= IPCB_TCP_PACKET;
-		}
-	}
-
-	if (!skb_shinfo(skb)->nr_frags) {
-		(tcb->tbd_ptr)->tbd_buf_addr =
-			cpu_to_le32(pci_map_single(bdp->pdev, skb->data,
-						   skb->len, PCI_DMA_TODEVICE));
-		(tcb->tbd_ptr)->tbd_buf_cnt = cpu_to_le16(skb->len);
-		tcb->tcb_tbd_num = 1;
-		tcb->tcb_tbd_ptr = tcb->tcb_tbd_dflt_ptr;
-	} else {
-		int i;
-		void *addr;
-		tbd_t *tbd_arr_ptr = &(tcb->tbd_ptr[1]);
-		skb_frag_t *frag = &skb_shinfo(skb)->frags[0];
-
-		(tcb->tbd_ptr)->tbd_buf_addr =
-			cpu_to_le32(pci_map_single(bdp->pdev, skb->data,
-						   skb_headlen(skb),
-						   PCI_DMA_TODEVICE));
-		(tcb->tbd_ptr)->tbd_buf_cnt =
-			cpu_to_le16(skb_headlen(skb));
-
-		for (i = 0; i < skb_shinfo(skb)->nr_frags;
-		     i++, tbd_arr_ptr++, frag++) {
-
-			addr = ((void *) page_address(frag->page) +
-				frag->page_offset);
-
-			tbd_arr_ptr->tbd_buf_addr =
-				cpu_to_le32(pci_map_single(bdp->pdev,
-							   addr, frag->size,
-							   PCI_DMA_TODEVICE));
-			tbd_arr_ptr->tbd_buf_cnt = cpu_to_le16(frag->size);
-		}
-		tcb->tcb_tbd_num = skb_shinfo(skb)->nr_frags + 1;
-		tcb->tcb_tbd_ptr = tcb->tcb_tbd_expand_ptr;
-	}
-
-	/* clear the S-BIT on the previous tcb */
-	prev_tcb = bdp->tcb_pool.data;
-	prev_tcb += PREV_TCB_USED(bdp->tcb_pool);
-	prev_tcb->tcb_hdr.cb_cmd &= __constant_cpu_to_le16((u16) ~CB_S_BIT);
-
-	bdp->tcb_pool.tail = NEXT_TCB_TOUSE(bdp->tcb_pool.tail);
-
-	wmb();
-
-	e100_start_cu(bdp, tcb);
-
-	return tcb;
-}
-
 /* Changed for 82558 enhancement */
 /**
  * e100_start_cu - start the adapter's CU
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/e1000/e1000_main.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/e1000/e1000_main.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/e1000/e1000_main.c	2004-06-29 11:25:41.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/e1000/e1000_main.c	2004-09-05 16:00:53.000000000 +0200
@@ -248,6 +248,34 @@ e1000_exit_module(void)
 module_exit(e1000_exit_module);
 
 
+/**
+ * e1000_irq_enable - Enable default interrupt generation settings
+ * @adapter: board private structure
+ **/
+
+static inline void
+e1000_irq_enable(struct e1000_adapter *adapter)
+{
+	if(atomic_dec_and_test(&adapter->irq_sem)) {
+		E1000_WRITE_REG(&adapter->hw, IMS, IMS_ENABLE_MASK);
+		E1000_WRITE_FLUSH(&adapter->hw);
+	}
+}
+
+/**
+ * e1000_irq_disable - Mask off interrupt generation on the NIC
+ * @adapter: board private structure
+ **/
+
+static inline void
+e1000_irq_disable(struct e1000_adapter *adapter)
+{
+	atomic_inc(&adapter->irq_sem);
+	E1000_WRITE_REG(&adapter->hw, IMC, ~0);
+	E1000_WRITE_FLUSH(&adapter->hw);
+	synchronize_irq();
+}
+
 int
 e1000_up(struct e1000_adapter *adapter)
 {
@@ -2061,34 +2089,6 @@ e1000_update_stats(struct e1000_adapter 
 }
 
 /**
- * e1000_irq_disable - Mask off interrupt generation on the NIC
- * @adapter: board private structure
- **/
-
-static inline void
-e1000_irq_disable(struct e1000_adapter *adapter)
-{
-	atomic_inc(&adapter->irq_sem);
-	E1000_WRITE_REG(&adapter->hw, IMC, ~0);
-	E1000_WRITE_FLUSH(&adapter->hw);
-	synchronize_irq();
-}
-
-/**
- * e1000_irq_enable - Enable default interrupt generation settings
- * @adapter: board private structure
- **/
-
-static inline void
-e1000_irq_enable(struct e1000_adapter *adapter)
-{
-	if(atomic_dec_and_test(&adapter->irq_sem)) {
-		E1000_WRITE_REG(&adapter->hw, IMS, IMS_ENABLE_MASK);
-		E1000_WRITE_FLUSH(&adapter->hw);
-	}
-}
-
-/**
  * e1000_intr - Interrupt Handler
  * @irq: interrupt number
  * @data: pointer to a network interface device structure
@@ -2233,6 +2233,41 @@ e1000_clean_tx_irq(struct e1000_adapter 
 }
 
 /**
+ * e1000_rx_checksum - Receive Checksum Offload for 82543
+ * @adapter: board private structure
+ * @rx_desc: receive descriptor
+ * @sk_buff: socket buffer with received data
+ **/
+
+static inline void
+e1000_rx_checksum(struct e1000_adapter *adapter,
+                  struct e1000_rx_desc *rx_desc,
+                  struct sk_buff *skb)
+{
+	/* 82543 or newer only */
+	if((adapter->hw.mac_type < e1000_82543) ||
+	/* Ignore Checksum bit is set */
+	(rx_desc->status & E1000_RXD_STAT_IXSM) ||
+	/* TCP Checksum has not been calculated */
+	(!(rx_desc->status & E1000_RXD_STAT_TCPCS))) {
+		skb->ip_summed = CHECKSUM_NONE;
+		return;
+	}
+
+	/* At this point we know the hardware did the TCP checksum */
+	/* now look at the TCP checksum error bit */
+	if(rx_desc->errors & E1000_RXD_ERR_TCPE) {
+		/* let the stack verify checksum errors */
+		skb->ip_summed = CHECKSUM_NONE;
+		adapter->hw_csum_err++;
+	} else {
+	/* TCP checksum is good */
+		skb->ip_summed = CHECKSUM_UNNECESSARY;
+		adapter->hw_csum_good++;
+	}
+}
+
+/**
  * e1000_clean_rx_irq - Send received data up the network stack,
  * @adapter: board private structure
  **/
@@ -2587,41 +2622,6 @@ e1000_mii_ioctl(struct net_device *netde
 	return E1000_SUCCESS;
 }
 
-/**
- * e1000_rx_checksum - Receive Checksum Offload for 82543
- * @adapter: board private structure
- * @rx_desc: receive descriptor
- * @sk_buff: socket buffer with received data
- **/
-
-static inline void
-e1000_rx_checksum(struct e1000_adapter *adapter,
-                  struct e1000_rx_desc *rx_desc,
-                  struct sk_buff *skb)
-{
-	/* 82543 or newer only */
-	if((adapter->hw.mac_type < e1000_82543) ||
-	/* Ignore Checksum bit is set */
-	(rx_desc->status & E1000_RXD_STAT_IXSM) ||
-	/* TCP Checksum has not been calculated */
-	(!(rx_desc->status & E1000_RXD_STAT_TCPCS))) {
-		skb->ip_summed = CHECKSUM_NONE;
-		return;
-	}
-
-	/* At this point we know the hardware did the TCP checksum */
-	/* now look at the TCP checksum error bit */
-	if(rx_desc->errors & E1000_RXD_ERR_TCPE) {
-		/* let the stack verify checksum errors */
-		skb->ip_summed = CHECKSUM_NONE;
-		adapter->hw_csum_err++;
-	} else {
-	/* TCP checksum is good */
-		skb->ip_summed = CHECKSUM_UNNECESSARY;
-		adapter->hw_csum_good++;
-	}
-}
-
 void
 e1000_pci_set_mwi(struct e1000_hw *hw)
 {
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/e1000/e1000_param.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/e1000/e1000_param.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/e1000/e1000_param.c	2004-06-29 11:25:39.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/e1000/e1000_param.c	2004-09-05 16:00:53.000000000 +0200
@@ -212,7 +212,7 @@ E1000_PARAM(InterruptThrottleRate, "Inte
 #define MAX_TXABSDELAY            0xFFFF
 #define MIN_TXABSDELAY                 0
 
-#define DEFAULT_ITR                    1
+#define DEFAULT_ITR                 8000
 #define MAX_ITR                   100000
 #define MIN_ITR                      100
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/eql.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/eql.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/eql.c	2004-06-29 11:25:53.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/eql.c	2004-09-05 16:01:10.000000000 +0200
@@ -335,6 +335,152 @@ static int eql_ioctl(struct net_device *
 }
 
 
+static inline int eql_number_slaves(slave_queue_t *queue)
+{
+	return queue->num_slaves;
+}
+
+
+static inline int eql_is_empty(slave_queue_t *queue)
+{
+	if (eql_number_slaves (queue) == 0)
+		return 1;
+	return 0;
+}
+
+static inline int eql_is_full(slave_queue_t *queue)
+{
+	equalizer_t *eql = (equalizer_t *) queue->master_dev->priv;
+
+	if (eql_number_slaves (queue) == eql->max_slaves)
+		return 1;
+	return 0;
+}
+
+static inline slave_t *eql_first_slave(slave_queue_t *queue)
+{
+	return queue->head->next;
+}
+
+
+static inline slave_t *eql_next_slave(slave_queue_t *queue, slave_t *slave)
+{
+	return slave->next;
+}
+
+static inline void eql_set_best_slave(slave_queue_t *queue, slave_t *slave)
+{
+	queue->best_slave = slave;
+}
+
+static inline void eql_schedule_slaves(slave_queue_t *queue)
+{
+	struct net_device *master_dev = queue->master_dev;
+	slave_t *best_slave = 0;
+	slave_t *slave_corpse = 0;
+
+#ifdef EQL_DEBUG
+	if (eql_debug >= 100)
+		printk ("%s: schedule %d slaves\n", 
+			master_dev->name, eql_number_slaves (queue));
+#endif
+	if ( eql_is_empty (queue) )
+	{
+		/*
+		 *	No slaves to play with 
+		 */
+		eql_set_best_slave (queue, (slave_t *) 0);
+		return;
+	}
+	else
+	{		
+		/*
+		 *	Make a pass to set the best slave 
+		 */
+		unsigned long best_load = (unsigned long) ULONG_MAX;
+		slave_t *slave = 0;
+		unsigned long flags;
+		int i;
+
+		save_flags(flags);
+		cli ();
+		for (i = 1, slave = eql_first_slave (queue);
+			i <= eql_number_slaves (queue);
+			i++, slave = eql_next_slave (queue, slave))
+		{
+			/*
+			 *	Go through the slave list once, updating best_slave 
+			 *      whenever a new best_load is found, whenever a dead
+			 *	slave is found, it is marked to be pulled out of the 
+			 *	queue 
+			 */
+		
+			unsigned long slave_load;
+			unsigned long bytes_queued; 
+			unsigned long priority_Bps; 
+	  	
+	  		if (slave != 0)
+			{
+				bytes_queued = slave->bytes_queued;
+				priority_Bps = slave->priority_Bps;    
+				if ( slave->dev != 0)
+				{
+					if ((slave->dev->flags & IFF_UP) == IFF_UP )
+					{
+						slave_load = (ULONG_MAX - (ULONG_MAX / 2)) - 
+							(priority_Bps) + bytes_queued * 8;
+
+		      				if (slave_load < best_load)
+						{
+							best_load = slave_load;
+							best_slave = slave;
+						}
+					}
+					else		/* we found a dead slave */
+					{
+						/* 
+						 *	We only bury one slave at a time, if more than
+						 *	one slave dies, we will bury him on the next 
+						 *	reschedule. slaves don't die all at once that 
+						 *	much anyway 
+						 */
+						slave_corpse = slave;
+					}
+				}
+			}
+		} /* for */
+		restore_flags(flags);
+		eql_set_best_slave (queue, best_slave);
+	} /* else */
+	if (slave_corpse != 0)
+	{
+		printk ("eql: scheduler found dead slave, burying...\n");
+		eql_delete_slave (eql_remove_slave (queue, slave_corpse));
+	}
+	return;
+}
+
+
+static inline struct net_device *eql_best_slave_dev(slave_queue_t *queue)
+{
+	if (queue->best_slave != 0)
+	{
+		if (queue->best_slave->dev != 0)
+			return queue->best_slave->dev;
+		else
+			return 0;
+	}
+	else
+		return 0;
+}
+
+
+static inline slave_t *eql_best_slave(slave_queue_t *queue)
+{
+	return queue->best_slave;
+}
+
+
 static int eql_slave_xmit(struct sk_buff *skb, struct net_device *dev)
 {
 	equalizer_t *eql = (equalizer_t *) dev->priv;
@@ -383,6 +529,28 @@ static struct net_device_stats * eql_get
 	return eql->stats;
 }
 
+static inline int eql_is_slave(struct net_device *dev)
+{
+	if (dev)
+	{
+		if ((dev->flags & IFF_SLAVE) == IFF_SLAVE)
+			return 1;
+	}
+	return 0;
+}
+
+
+static inline int eql_is_master(struct net_device *dev)
+{
+	if (dev)
+	{
+		if ((dev->flags & IFF_MASTER) == IFF_MASTER)
+		return 1;
+	}
+	return 0;
+}
+
+
 /*
  *	Private ioctl functions
  */
@@ -597,28 +765,6 @@ static int eql_s_master_cfg(struct net_d
  *	Private device support functions
  */
 
-static inline int eql_is_slave(struct net_device *dev)
-{
-	if (dev)
-	{
-		if ((dev->flags & IFF_SLAVE) == IFF_SLAVE)
-			return 1;
-	}
-	return 0;
-}
-
-
-static inline int eql_is_master(struct net_device *dev)
-{
-	if (dev)
-	{
-		if ((dev->flags & IFF_MASTER) == IFF_MASTER)
-		return 1;
-	}
-	return 0;
-}
-
-
 static slave_t *eql_new_slave(void)
 {
 	slave_t *slave;
@@ -650,27 +796,6 @@ static long slave_bps(slave_t *slave)
 
 #endif
 
-static inline int eql_number_slaves(slave_queue_t *queue)
-{
-	return queue->num_slaves;
-}
-
-static inline int eql_is_empty(slave_queue_t *queue)
-{
-	if (eql_number_slaves (queue) == 0)
-		return 1;
-	return 0;
-}
-
-static inline int eql_is_full(slave_queue_t *queue)
-{
-	equalizer_t *eql = (equalizer_t *) queue->master_dev->priv;
-
-	if (eql_number_slaves (queue) == eql->max_slaves)
-		return 1;
-	return 0;
-}
-
 static slave_queue_t *eql_new_slave_queue(struct net_device *dev)
 {
 	slave_queue_t *queue;
@@ -817,113 +942,6 @@ static int eql_remove_slave_dev(slave_qu
 }
 
 
-static inline struct net_device *eql_best_slave_dev(slave_queue_t *queue)
-{
-	if (queue->best_slave != 0)
-	{
-		if (queue->best_slave->dev != 0)
-			return queue->best_slave->dev;
-		else
-			return 0;
-	}
-	else
-		return 0;
-}
-
-
-static inline slave_t *eql_best_slave(slave_queue_t *queue)
-{
-	return queue->best_slave;
-}
-
-static inline void eql_schedule_slaves(slave_queue_t *queue)
-{
-	struct net_device *master_dev = queue->master_dev;
-	slave_t *best_slave = 0;
-	slave_t *slave_corpse = 0;
-
-#ifdef EQL_DEBUG
-	if (eql_debug >= 100)
-		printk ("%s: schedule %d slaves\n", 
-			master_dev->name, eql_number_slaves (queue));
-#endif
-	if ( eql_is_empty (queue) )
-	{
-		/*
-		 *	No slaves to play with 
-		 */
-		eql_set_best_slave (queue, (slave_t *) 0);
-		return;
-	}
-	else
-	{		
-		/*
-		 *	Make a pass to set the best slave 
-		 */
-		unsigned long best_load = (unsigned long) ULONG_MAX;
-		slave_t *slave = 0;
-		unsigned long flags;
-		int i;
-
-		save_flags(flags);
-		cli ();
-		for (i = 1, slave = eql_first_slave (queue);
-			i <= eql_number_slaves (queue);
-			i++, slave = eql_next_slave (queue, slave))
-		{
-			/*
-			 *	Go through the slave list once, updating best_slave 
-			 *      whenever a new best_load is found, whenever a dead
-			 *	slave is found, it is marked to be pulled out of the 
-			 *	queue 
-			 */
-		
-			unsigned long slave_load;
-			unsigned long bytes_queued; 
-			unsigned long priority_Bps; 
-	  	
-	  		if (slave != 0)
-			{
-				bytes_queued = slave->bytes_queued;
-				priority_Bps = slave->priority_Bps;    
-				if ( slave->dev != 0)
-				{
-					if ((slave->dev->flags & IFF_UP) == IFF_UP )
-					{
-						slave_load = (ULONG_MAX - (ULONG_MAX / 2)) - 
-							(priority_Bps) + bytes_queued * 8;
-
-		      				if (slave_load < best_load)
-						{
-							best_load = slave_load;
-							best_slave = slave;
-						}
-					}
-					else		/* we found a dead slave */
-					{
-						/* 
-						 *	We only bury one slave at a time, if more than
-						 *	one slave dies, we will bury him on the next 
-						 *	reschedule. slaves don't die all at once that 
-						 *	much anyway 
-						 */
-						slave_corpse = slave;
-					}
-				}
-			}
-		} /* for */
-		restore_flags(flags);
-		eql_set_best_slave (queue, best_slave);
-	} /* else */
-	if (slave_corpse != 0)
-	{
-		printk ("eql: scheduler found dead slave, burying...\n");
-		eql_delete_slave (eql_remove_slave (queue, slave_corpse));
-	}
-	return;
-}
-
-
 static slave_t * eql_find_slave_dev(slave_queue_t *queue, struct net_device *dev)
 {
 	slave_t *slave = 0;
@@ -943,22 +961,6 @@ static slave_t * eql_find_slave_dev(slav
 }
 
 
-static inline slave_t *eql_first_slave(slave_queue_t *queue)
-{
-	return queue->head->next;
-}
-
-
-static inline slave_t *eql_next_slave(slave_queue_t *queue, slave_t *slave)
-{
-	return slave->next;
-}
-
-static inline void eql_set_best_slave(slave_queue_t *queue, slave_t *slave)
-{
-	queue->best_slave = slave;
-}
-
 static void eql_timer(unsigned long param)
 {
 	equalizer_t *eql = (equalizer_t *) param;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/forcedeth.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/forcedeth.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/forcedeth.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/forcedeth.c	2004-09-05 15:54:33.000000000 +0200
@@ -0,0 +1,2041 @@
+/*
+ * forcedeth: Ethernet driver for NVIDIA nForce media access controllers.
+ *
+ * Note: This driver is a cleanroom reimplementation based on reverse
+ *      engineered documentation written by Carl-Daniel Hailfinger
+ *      and Andrew de Quincey. It's neither supported nor endorsed
+ *      by NVIDIA Corp. Use at your own risk.
+ *
+ * NVIDIA, nForce and other NVIDIA marks are trademarks or registered
+ * trademarks of NVIDIA Corporation in the United States and other
+ * countries.
+ *
+ * Copyright (C) 2003,4 Manfred Spraul
+ * Copyright (C) 2004 Andrew de Quincey (wol support)
+ * Copyright (C) 2004 Carl-Daniel Hailfinger (invalid MAC handling, insane
+ *		IRQ rate fixes, bigendian fixes, cleanups, verification)
+ * Copyright (c) 2004 NVIDIA Corporation
+ *
+ * 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  02111-1307  USA
+ *
+ * Changelog:
+ * 	0.01: 05 Oct 2003: First release that compiles without warnings.
+ * 	0.02: 05 Oct 2003: Fix bug for nv_drain_tx: do not try to free NULL skbs.
+ * 			   Check all PCI BARs for the register window.
+ * 			   udelay added to mii_rw.
+ * 	0.03: 06 Oct 2003: Initialize dev->irq.
+ * 	0.04: 07 Oct 2003: Initialize np->lock, reduce handled irqs, add printks.
+ * 	0.05: 09 Oct 2003: printk removed again, irq status print tx_timeout.
+ * 	0.06: 10 Oct 2003: MAC Address read updated, pff flag generation updated,
+ * 			   irq mask updated
+ * 	0.07: 14 Oct 2003: Further irq mask updates.
+ * 	0.08: 20 Oct 2003: rx_desc.Length initialization added, nv_alloc_rx refill
+ * 			   added into irq handler, NULL check for drain_ring.
+ * 	0.09: 20 Oct 2003: Basic link speed irq implementation. Only handle the
+ * 			   requested interrupt sources.
+ * 	0.10: 20 Oct 2003: First cleanup for release.
+ * 	0.11: 21 Oct 2003: hexdump for tx added, rx buffer sizes increased.
+ * 			   MAC Address init fix, set_multicast cleanup.
+ * 	0.12: 23 Oct 2003: Cleanups for release.
+ * 	0.13: 25 Oct 2003: Limit for concurrent tx packets increased to 10.
+ * 			   Set link speed correctly. start rx before starting
+ * 			   tx (nv_start_rx sets the link speed).
+ * 	0.14: 25 Oct 2003: Nic dependant irq mask.
+ * 	0.15: 08 Nov 2003: fix smp deadlock with set_multicast_list during
+ * 			   open.
+ * 	0.16: 15 Nov 2003: include file cleanup for ppc64, rx buffer size
+ * 			   increased to 1628 bytes.
+ * 	0.17: 16 Nov 2003: undo rx buffer size increase. Substract 1 from
+ * 			   the tx length.
+ * 	0.18: 17 Nov 2003: fix oops due to late initialization of dev_stats
+ * 	0.19: 29 Nov 2003: Handle RxNoBuf, detect & handle invalid mac
+ * 			   addresses, really stop rx if already running
+ * 			   in nv_start_rx, clean up a bit.
+ * 	0.20: 07 Dec 2003: alloc fixes
+ * 	0.21: 12 Jan 2004: additional alloc fix, nic polling fix.
+ *	0.22: 19 Jan 2004: reprogram timer to a sane rate, avoid lockup
+ *			   on close.
+ *	0.23: 26 Jan 2004: various small cleanups
+ *	0.24: 27 Feb 2004: make driver even less anonymous in backtraces
+ *	0.25: 09 Mar 2004: wol support
+ *	0.26: 03 Jun 2004: netdriver specific annotation, sparse-related fixes
+ *	0.27: 19 Jun 2004: Gigabit support, new descriptor rings,
+ *			   added CK804/MCP04 device IDs, code fixes
+ *			   for registers, link status and other minor fixes.
+ *	0.28: 21 Jun 2004: Big cleanup, making driver mostly endian safe
+ *	0.29: 31 Aug 2004: Add backup timer for link change notification.
+ *
+ * Known bugs:
+ * We suspect that on some hardware no TX done interrupts are generated.
+ * This means recovery from netif_stop_queue only happens if the hw timer
+ * interrupt fires (100 times/second, configurable with NVREG_POLL_DEFAULT)
+ * and the timer is active in the IRQMask, or if a rx packet arrives by chance.
+ * If your hardware reliably generates tx done interrupts, then you can remove
+ * DEV_NEED_TIMERIRQ from the driver_data flags.
+ * DEV_NEED_TIMERIRQ will not harm you on sane hardware, only generating a few
+ * superfluous timer interrupts from the nic.
+ */
+#define FORCEDETH_VERSION		"0.29"
+#define DRV_NAME			"forcedeth"
+
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/pci.h>
+#include <linux/interrupt.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/delay.h>
+#include <linux/spinlock.h>
+#include <linux/ethtool.h>
+#include <linux/timer.h>
+#include <linux/skbuff.h>
+#include <linux/mii.h>
+#include <linux/random.h>
+#include <linux/init.h>
+
+#include <asm/irq.h>
+#include <asm/io.h>
+#include <asm/uaccess.h>
+#include <asm/system.h>
+
+#if 0
+#define dprintk			printk
+#else
+#define dprintk(x...)		do { } while (0)
+#endif
+
+
+/*
+ * Hardware access:
+ */
+
+#define DEV_NEED_LASTPACKET1	0x0001	/* set LASTPACKET1 in tx flags */
+#define DEV_IRQMASK_1		0x0002  /* use NVREG_IRQMASK_WANTED_1 for irq mask */
+#define DEV_IRQMASK_2		0x0004  /* use NVREG_IRQMASK_WANTED_2 for irq mask */
+#define DEV_NEED_TIMERIRQ	0x0008  /* set the timer irq flag in the irq mask */
+#define DEV_NEED_LINKTIMER	0x0010	/* poll link settings. Relies on the timer irq */
+
+enum {
+	NvRegIrqStatus = 0x000,
+#define NVREG_IRQSTAT_MIIEVENT	0x040
+#define NVREG_IRQSTAT_MASK		0x1ff
+	NvRegIrqMask = 0x004,
+#define NVREG_IRQ_RX_ERROR		0x0001
+#define NVREG_IRQ_RX			0x0002
+#define NVREG_IRQ_RX_NOBUF		0x0004
+#define NVREG_IRQ_TX_ERR		0x0008
+#define NVREG_IRQ_TX2			0x0010
+#define NVREG_IRQ_TIMER			0x0020
+#define NVREG_IRQ_LINK			0x0040
+#define NVREG_IRQ_TX1			0x0100
+#define NVREG_IRQMASK_WANTED_1		0x005f
+#define NVREG_IRQMASK_WANTED_2		0x0147
+#define NVREG_IRQ_UNKNOWN		(~(NVREG_IRQ_RX_ERROR|NVREG_IRQ_RX|NVREG_IRQ_RX_NOBUF|NVREG_IRQ_TX_ERR|NVREG_IRQ_TX2|NVREG_IRQ_TIMER|NVREG_IRQ_LINK|NVREG_IRQ_TX1))
+
+	NvRegUnknownSetupReg6 = 0x008,
+#define NVREG_UNKSETUP6_VAL		3
+
+/*
+ * NVREG_POLL_DEFAULT is the interval length of the timer source on the nic
+ * NVREG_POLL_DEFAULT=97 would result in an interval length of 1 ms
+ */
+	NvRegPollingInterval = 0x00c,
+#define NVREG_POLL_DEFAULT	970
+	NvRegMisc1 = 0x080,
+#define NVREG_MISC1_HD		0x02
+#define NVREG_MISC1_FORCE	0x3b0f3c
+
+	NvRegTransmitterControl = 0x084,
+#define NVREG_XMITCTL_START	0x01
+	NvRegTransmitterStatus = 0x088,
+#define NVREG_XMITSTAT_BUSY	0x01
+
+	NvRegPacketFilterFlags = 0x8c,
+#define NVREG_PFF_ALWAYS	0x7F0008
+#define NVREG_PFF_PROMISC	0x80
+#define NVREG_PFF_MYADDR	0x20
+
+	NvRegOffloadConfig = 0x90,
+#define NVREG_OFFLOAD_HOMEPHY	0x601
+#define NVREG_OFFLOAD_NORMAL	RX_NIC_BUFSIZE
+	NvRegReceiverControl = 0x094,
+#define NVREG_RCVCTL_START	0x01
+	NvRegReceiverStatus = 0x98,
+#define NVREG_RCVSTAT_BUSY	0x01
+
+	NvRegRandomSeed = 0x9c,
+#define NVREG_RNDSEED_MASK	0x00ff
+#define NVREG_RNDSEED_FORCE	0x7f00
+#define NVREG_RNDSEED_FORCE2	0x2d00
+#define NVREG_RNDSEED_FORCE3	0x7400
+
+	NvRegUnknownSetupReg1 = 0xA0,
+#define NVREG_UNKSETUP1_VAL	0x16070f
+	NvRegUnknownSetupReg2 = 0xA4,
+#define NVREG_UNKSETUP2_VAL	0x16
+	NvRegMacAddrA = 0xA8,
+	NvRegMacAddrB = 0xAC,
+	NvRegMulticastAddrA = 0xB0,
+#define NVREG_MCASTADDRA_FORCE	0x01
+	NvRegMulticastAddrB = 0xB4,
+	NvRegMulticastMaskA = 0xB8,
+	NvRegMulticastMaskB = 0xBC,
+
+	NvRegPhyInterface = 0xC0,
+#define PHY_RGMII		0x10000000
+
+	NvRegTxRingPhysAddr = 0x100,
+	NvRegRxRingPhysAddr = 0x104,
+	NvRegRingSizes = 0x108,
+#define NVREG_RINGSZ_TXSHIFT 0
+#define NVREG_RINGSZ_RXSHIFT 16
+	NvRegUnknownTransmitterReg = 0x10c,
+	NvRegLinkSpeed = 0x110,
+#define NVREG_LINKSPEED_FORCE 0x10000
+#define NVREG_LINKSPEED_10	1000
+#define NVREG_LINKSPEED_100	100
+#define NVREG_LINKSPEED_1000	50
+	NvRegUnknownSetupReg5 = 0x130,
+#define NVREG_UNKSETUP5_BIT31	(1<<31)
+	NvRegUnknownSetupReg3 = 0x13c,
+#define NVREG_UNKSETUP3_VAL1	0x200010
+	NvRegTxRxControl = 0x144,
+#define NVREG_TXRXCTL_KICK	0x0001
+#define NVREG_TXRXCTL_BIT1	0x0002
+#define NVREG_TXRXCTL_BIT2	0x0004
+#define NVREG_TXRXCTL_IDLE	0x0008
+#define NVREG_TXRXCTL_RESET	0x0010
+	NvRegMIIStatus = 0x180,
+#define NVREG_MIISTAT_ERROR		0x0001
+#define NVREG_MIISTAT_LINKCHANGE	0x0008
+#define NVREG_MIISTAT_MASK		0x000f
+#define NVREG_MIISTAT_MASK2		0x000f
+	NvRegUnknownSetupReg4 = 0x184,
+#define NVREG_UNKSETUP4_VAL	8
+
+	NvRegAdapterControl = 0x188,
+#define NVREG_ADAPTCTL_START	0x02
+#define NVREG_ADAPTCTL_LINKUP	0x04
+#define NVREG_ADAPTCTL_PHYVALID	0x40000
+#define NVREG_ADAPTCTL_RUNNING	0x100000
+#define NVREG_ADAPTCTL_PHYSHIFT	24
+	NvRegMIISpeed = 0x18c,
+#define NVREG_MIISPEED_BIT8	(1<<8)
+#define NVREG_MIIDELAY	5
+	NvRegMIIControl = 0x190,
+#define NVREG_MIICTL_INUSE	0x08000
+#define NVREG_MIICTL_WRITE	0x00400
+#define NVREG_MIICTL_ADDRSHIFT	5
+	NvRegMIIData = 0x194,
+	NvRegWakeUpFlags = 0x200,
+#define NVREG_WAKEUPFLAGS_VAL		0x7770
+#define NVREG_WAKEUPFLAGS_BUSYSHIFT	24
+#define NVREG_WAKEUPFLAGS_ENABLESHIFT	16
+#define NVREG_WAKEUPFLAGS_D3SHIFT	12
+#define NVREG_WAKEUPFLAGS_D2SHIFT	8
+#define NVREG_WAKEUPFLAGS_D1SHIFT	4
+#define NVREG_WAKEUPFLAGS_D0SHIFT	0
+#define NVREG_WAKEUPFLAGS_ACCEPT_MAGPAT		0x01
+#define NVREG_WAKEUPFLAGS_ACCEPT_WAKEUPPAT	0x02
+#define NVREG_WAKEUPFLAGS_ACCEPT_LINKCHANGE	0x04
+#define NVREG_WAKEUPFLAGS_ENABLE	0x1111
+
+	NvRegPatternCRC = 0x204,
+	NvRegPatternMask = 0x208,
+	NvRegPowerCap = 0x268,
+#define NVREG_POWERCAP_D3SUPP	(1<<30)
+#define NVREG_POWERCAP_D2SUPP	(1<<26)
+#define NVREG_POWERCAP_D1SUPP	(1<<25)
+	NvRegPowerState = 0x26c,
+#define NVREG_POWERSTATE_POWEREDUP	0x8000
+#define NVREG_POWERSTATE_VALID		0x0100
+#define NVREG_POWERSTATE_MASK		0x0003
+#define NVREG_POWERSTATE_D0		0x0000
+#define NVREG_POWERSTATE_D1		0x0001
+#define NVREG_POWERSTATE_D2		0x0002
+#define NVREG_POWERSTATE_D3		0x0003
+};
+
+/* Big endian: should work, but is untested */
+struct ring_desc {
+	u32 PacketBuffer;
+	u32 FlagLen;
+};
+
+#define FLAG_MASK_V1 0xffff0000
+#define FLAG_MASK_V2 0xffffc000
+#define LEN_MASK_V1 (0xffffffff ^ FLAG_MASK_V1)
+#define LEN_MASK_V2 (0xffffffff ^ FLAG_MASK_V2)
+
+#define NV_TX_LASTPACKET	(1<<16)
+#define NV_TX_RETRYERROR	(1<<19)
+#define NV_TX_LASTPACKET1	(1<<24)
+#define NV_TX_DEFERRED		(1<<26)
+#define NV_TX_CARRIERLOST	(1<<27)
+#define NV_TX_LATECOLLISION	(1<<28)
+#define NV_TX_UNDERFLOW		(1<<29)
+#define NV_TX_ERROR		(1<<30)
+#define NV_TX_VALID		(1<<31)
+
+#define NV_TX2_LASTPACKET	(1<<29)
+#define NV_TX2_RETRYERROR	(1<<18)
+#define NV_TX2_LASTPACKET1	(1<<23)
+#define NV_TX2_DEFERRED		(1<<25)
+#define NV_TX2_CARRIERLOST	(1<<26)
+#define NV_TX2_LATECOLLISION	(1<<27)
+#define NV_TX2_UNDERFLOW	(1<<28)
+/* error and valid are the same for both */
+#define NV_TX2_ERROR		(1<<30)
+#define NV_TX2_VALID		(1<<31)
+
+#define NV_RX_DESCRIPTORVALID	(1<<16)
+#define NV_RX_MISSEDFRAME	(1<<17)
+#define NV_RX_SUBSTRACT1	(1<<18)
+#define NV_RX_ERROR1		(1<<23)
+#define NV_RX_ERROR2		(1<<24)
+#define NV_RX_ERROR3		(1<<25)
+#define NV_RX_ERROR4		(1<<26)
+#define NV_RX_CRCERR		(1<<27)
+#define NV_RX_OVERFLOW		(1<<28)
+#define NV_RX_FRAMINGERR	(1<<29)
+#define NV_RX_ERROR		(1<<30)
+#define NV_RX_AVAIL		(1<<31)
+
+#define NV_RX2_DESCRIPTORVALID	(1<<29)
+#define NV_RX2_SUBSTRACT1	(1<<25)
+#define NV_RX2_ERROR1		(1<<18)
+#define NV_RX2_ERROR2		(1<<19)
+#define NV_RX2_ERROR3		(1<<20)
+#define NV_RX2_ERROR4		(1<<21)
+#define NV_RX2_CRCERR		(1<<22)
+#define NV_RX2_OVERFLOW		(1<<23)
+#define NV_RX2_FRAMINGERR	(1<<24)
+/* error and avail are the same for both */
+#define NV_RX2_ERROR		(1<<30)
+#define NV_RX2_AVAIL		(1<<31)
+
+/* Miscelaneous hardware related defines: */
+#define NV_PCI_REGSZ		0x270
+
+/* various timeout delays: all in usec */
+#define NV_TXRX_RESET_DELAY	4
+#define NV_TXSTOP_DELAY1	10
+#define NV_TXSTOP_DELAY1MAX	500000
+#define NV_TXSTOP_DELAY2	100
+#define NV_RXSTOP_DELAY1	10
+#define NV_RXSTOP_DELAY1MAX	500000
+#define NV_RXSTOP_DELAY2	100
+#define NV_SETUP5_DELAY		5
+#define NV_SETUP5_DELAYMAX	50000
+#define NV_POWERUP_DELAY	5
+#define NV_POWERUP_DELAYMAX	5000
+#define NV_MIIBUSY_DELAY	50
+#define NV_MIIPHY_DELAY	10
+#define NV_MIIPHY_DELAYMAX	10000
+
+#define NV_WAKEUPPATTERNS	5
+#define NV_WAKEUPMASKENTRIES	4
+
+/* General driver defaults */
+#define NV_WATCHDOG_TIMEO	(5*HZ)
+
+#define RX_RING		128
+#define TX_RING		64
+/*
+ * If your nic mysteriously hangs then try to reduce the limits
+ * to 1/0: It might be required to set NV_TX_LASTPACKET in the
+ * last valid ring entry. But this would be impossible to
+ * implement - probably a disassembly error.
+ */
+#define TX_LIMIT_STOP	63
+#define TX_LIMIT_START	62
+
+/* rx/tx mac addr + type + vlan + align + slack*/
+#define RX_NIC_BUFSIZE		(ETH_DATA_LEN + 64)
+/* even more slack */
+#define RX_ALLOC_BUFSIZE	(ETH_DATA_LEN + 128)
+
+#define OOM_REFILL	(1+HZ/20)
+#define POLL_WAIT	(1+HZ/100)
+#define LINK_TIMEOUT	(3*HZ)
+
+#define DESC_VER_1	0x0
+#define DESC_VER_2	0x02100
+
+/* PHY defines */
+#define PHY_OUI_MARVELL	0x5043
+#define PHY_OUI_CICADA	0x03f1
+#define PHYID1_OUI_MASK	0x03ff
+#define PHYID1_OUI_SHFT	6
+#define PHYID2_OUI_MASK	0xfc00
+#define PHYID2_OUI_SHFT	10
+#define PHY_INIT1	0x0f000
+#define PHY_INIT2	0x0e00
+#define PHY_INIT3	0x01000
+#define PHY_INIT4	0x0200
+#define PHY_INIT5	0x0004
+#define PHY_INIT6	0x02000
+#define PHY_GIGABIT	0x0100
+
+#define PHY_TIMEOUT	0x1
+#define PHY_ERROR	0x2
+
+#define PHY_100	0x1
+#define PHY_1000	0x2
+#define PHY_HALF	0x100
+
+/* FIXME: MII defines that should be added to <linux/mii.h> */
+#define MII_1000BT_CR	0x09
+#define MII_1000BT_SR	0x0a
+#define ADVERTISE_1000FULL	0x0200
+#define ADVERTISE_1000HALF	0x0100
+#define LPA_1000FULL	0x0800
+#define LPA_1000HALF	0x0400
+
+
+/*
+ * SMP locking:
+ * All hardware access under dev->priv->lock, except the performance
+ * critical parts:
+ * - rx is (pseudo-) lockless: it relies on the single-threading provided
+ *	by the arch code for interrupts.
+ * - tx setup is lockless: it relies on dev->xmit_lock. Actual submission
+ *	needs dev->priv->lock :-(
+ * - set_multicast_list: preparation lockless, relies on dev->xmit_lock.
+ */
+
+/* in dev: base, irq */
+struct fe_priv {
+	spinlock_t lock;
+
+	/* General data:
+	 * Locking: spin_lock(&np->lock); */
+	struct net_device_stats stats;
+	int in_shutdown;
+	u32 linkspeed;
+	int duplex;
+	int phyaddr;
+	int wolenabled;
+	unsigned int phy_oui;
+	u16 gigabit;
+
+	/* General data: RO fields */
+	dma_addr_t ring_addr;
+	struct pci_dev *pci_dev;
+	u32 orig_mac[2];
+	u32 irqmask;
+	u32 desc_ver;
+
+	/* rx specific fields.
+	 * Locking: Within irq hander or disable_irq+spin_lock(&np->lock);
+	 */
+	struct ring_desc *rx_ring;
+	unsigned int cur_rx, refill_rx;
+	struct sk_buff *rx_skbuff[RX_RING];
+	dma_addr_t rx_dma[RX_RING];
+	unsigned int rx_buf_sz;
+	struct timer_list oom_kick;
+	struct timer_list nic_poll;
+
+	/* media detection workaround.
+	 * Locking: Within irq hander or disable_irq+spin_lock(&np->lock);
+	 */
+	int need_linktimer;
+	unsigned long link_timeout;
+	/*
+	 * tx specific fields.
+	 */
+	struct ring_desc *tx_ring;
+	unsigned int next_tx, nic_tx;
+	struct sk_buff *tx_skbuff[TX_RING];
+	dma_addr_t tx_dma[TX_RING];
+	u32 tx_flags;
+};
+
+/*
+ * Maximum number of loops until we assume that a bit in the irq mask
+ * is stuck. Overridable with module param.
+ */
+static int max_interrupt_work = 5;
+
+static inline struct fe_priv *get_nvpriv(struct net_device *dev)
+{
+	return (struct fe_priv *) dev->priv;
+}
+
+static inline u8 *get_hwbase(struct net_device *dev)
+{
+	return (u8 *) dev->base_addr;
+}
+
+static inline void pci_push(u8 * base)
+{
+	/* force out pending posted writes */
+	readl(base);
+}
+
+static inline u32 nv_descr_getlength(struct ring_desc *prd, u32 v)
+{
+	return le32_to_cpu(prd->FlagLen)
+		& ((v == DESC_VER_1) ? LEN_MASK_V1 : LEN_MASK_V2);
+}
+
+static int reg_delay(struct net_device *dev, int offset, u32 mask, u32 target,
+				int delay, int delaymax, const char *msg)
+{
+	u8 *base = get_hwbase(dev);
+
+	pci_push(base);
+	do {
+		udelay(delay);
+		delaymax -= delay;
+		if (delaymax < 0) {
+			if (msg)
+				printk(msg);
+			return 1;
+		}
+	} while ((readl(base + offset) & mask) != target);
+	return 0;
+}
+
+#define MII_READ	(-1)
+/* mii_rw: read/write a register on the PHY.
+ *
+ * Caller must guarantee serialization
+ */
+static int mii_rw(struct net_device *dev, int addr, int miireg, int value)
+{
+	u8 *base = get_hwbase(dev);
+	u32 reg;
+	int retval;
+
+	writel(NVREG_MIISTAT_MASK, base + NvRegMIIStatus);
+
+	reg = readl(base + NvRegMIIControl);
+	if (reg & NVREG_MIICTL_INUSE) {
+		writel(NVREG_MIICTL_INUSE, base + NvRegMIIControl);
+		udelay(NV_MIIBUSY_DELAY);
+	}
+
+	reg = (addr << NVREG_MIICTL_ADDRSHIFT) | miireg;
+	if (value != MII_READ) {
+		writel(value, base + NvRegMIIData);
+		reg |= NVREG_MIICTL_WRITE;
+	}
+	writel(reg, base + NvRegMIIControl);
+
+	if (reg_delay(dev, NvRegMIIControl, NVREG_MIICTL_INUSE, 0,
+			NV_MIIPHY_DELAY, NV_MIIPHY_DELAYMAX, NULL)) {
+		dprintk(KERN_DEBUG "%s: mii_rw of reg %d at PHY %d timed out.\n",
+				dev->name, miireg, addr);
+		retval = -1;
+	} else if (value != MII_READ) {
+		/* it was a write operation - fewer failures are detectable */
+		dprintk(KERN_DEBUG "%s: mii_rw wrote 0x%x to reg %d at PHY %d\n",
+				dev->name, value, miireg, addr);
+		retval = 0;
+	} else if (readl(base + NvRegMIIStatus) & NVREG_MIISTAT_ERROR) {
+		dprintk(KERN_DEBUG "%s: mii_rw of reg %d at PHY %d failed.\n",
+				dev->name, miireg, addr);
+		retval = -1;
+	} else {
+		retval = readl(base + NvRegMIIData);
+		dprintk(KERN_DEBUG "%s: mii_rw read from reg %d at PHY %d: 0x%x.\n",
+				dev->name, miireg, addr, retval);
+	}
+
+	return retval;
+}
+
+static int phy_reset(struct net_device *dev)
+{
+	struct fe_priv *np = get_nvpriv(dev);
+	u32 miicontrol;
+	unsigned int tries = 0;
+
+	miicontrol = mii_rw(dev, np->phyaddr, MII_BMCR, MII_READ);
+	miicontrol |= BMCR_RESET;
+	if (mii_rw(dev, np->phyaddr, MII_BMCR, miicontrol)) {
+		return -1;
+	}
+
+	/* wait for 500ms */
+	mdelay(500);
+
+	/* must wait till reset is deasserted */
+	while (miicontrol & BMCR_RESET) {
+		mdelay(10);
+		miicontrol = mii_rw(dev, np->phyaddr, MII_BMCR, MII_READ);
+		/* FIXME: 100 tries seem excessive */
+		if (tries++ > 100)
+			return -1;
+	}
+	return 0;
+}
+
+static int phy_init(struct net_device *dev)
+{
+	struct fe_priv *np = get_nvpriv(dev);
+	u8 *base = get_hwbase(dev);
+	u32 phyinterface, phy_reserved, mii_status, mii_control, mii_control_1000,reg;
+
+	/* set advertise register */
+	reg = mii_rw(dev, np->phyaddr, MII_ADVERTISE, MII_READ);
+	reg |= (ADVERTISE_10HALF|ADVERTISE_10FULL|ADVERTISE_100HALF|ADVERTISE_100FULL|0x800|0x400);
+	if (mii_rw(dev, np->phyaddr, MII_ADVERTISE, reg)) {
+		printk(KERN_INFO "%s: phy write to advertise failed.\n", pci_name(np->pci_dev));
+		return PHY_ERROR;
+	}
+
+	/* get phy interface type */
+	phyinterface = readl(base + NvRegPhyInterface);
+
+	/* see if gigabit phy */
+	mii_status = mii_rw(dev, np->phyaddr, MII_BMSR, MII_READ);
+	if (mii_status & PHY_GIGABIT) {
+		np->gigabit = PHY_GIGABIT;
+		mii_control_1000 = mii_rw(dev, np->phyaddr, MII_1000BT_CR, MII_READ);
+		mii_control_1000 &= ~ADVERTISE_1000HALF;
+		if (phyinterface & PHY_RGMII)
+			mii_control_1000 |= ADVERTISE_1000FULL;
+		else
+			mii_control_1000 &= ~ADVERTISE_1000FULL;
+
+		if (mii_rw(dev, np->phyaddr, MII_1000BT_CR, mii_control_1000)) {
+			printk(KERN_INFO "%s: phy init failed.\n", pci_name(np->pci_dev));
+			return PHY_ERROR;
+		}
+	}
+	else
+		np->gigabit = 0;
+
+	/* reset the phy */
+	if (phy_reset(dev)) {
+		printk(KERN_INFO "%s: phy reset failed\n", pci_name(np->pci_dev));
+		return PHY_ERROR;
+	}
+
+	/* phy vendor specific configuration */
+	if ((np->phy_oui == PHY_OUI_CICADA) && (phyinterface & PHY_RGMII) ) {
+		phy_reserved = mii_rw(dev, np->phyaddr, MII_RESV1, MII_READ);
+		phy_reserved &= ~(PHY_INIT1 | PHY_INIT2);
+		phy_reserved |= (PHY_INIT3 | PHY_INIT4);
+		if (mii_rw(dev, np->phyaddr, MII_RESV1, phy_reserved)) {
+			printk(KERN_INFO "%s: phy init failed.\n", pci_name(np->pci_dev));
+			return PHY_ERROR;
+		}
+		phy_reserved = mii_rw(dev, np->phyaddr, MII_NCONFIG, MII_READ);
+		phy_reserved |= PHY_INIT5;
+		if (mii_rw(dev, np->phyaddr, MII_NCONFIG, phy_reserved)) {
+			printk(KERN_INFO "%s: phy init failed.\n", pci_name(np->pci_dev));
+			return PHY_ERROR;
+		}
+	}
+	if (np->phy_oui == PHY_OUI_CICADA) {
+		phy_reserved = mii_rw(dev, np->phyaddr, MII_SREVISION, MII_READ);
+		phy_reserved |= PHY_INIT6;
+		if (mii_rw(dev, np->phyaddr, MII_SREVISION, phy_reserved)) {
+			printk(KERN_INFO "%s: phy init failed.\n", pci_name(np->pci_dev));
+			return PHY_ERROR;
+		}
+	}
+
+	/* restart auto negotiation */
+	mii_control = mii_rw(dev, np->phyaddr, MII_BMCR, MII_READ);
+	mii_control |= (BMCR_ANRESTART | BMCR_ANENABLE);
+	if (mii_rw(dev, np->phyaddr, MII_BMCR, mii_control)) {
+		return PHY_ERROR;
+	}
+
+	return 0;
+}
+
+static void nv_start_rx(struct net_device *dev)
+{
+	struct fe_priv *np = get_nvpriv(dev);
+	u8 *base = get_hwbase(dev);
+
+	dprintk(KERN_DEBUG "%s: nv_start_rx\n", dev->name);
+	/* Already running? Stop it. */
+	if (readl(base + NvRegReceiverControl) & NVREG_RCVCTL_START) {
+		writel(0, base + NvRegReceiverControl);
+		pci_push(base);
+	}
+	writel(np->linkspeed, base + NvRegLinkSpeed);
+	pci_push(base);
+	writel(NVREG_RCVCTL_START, base + NvRegReceiverControl);
+	dprintk(KERN_DEBUG "%s: nv_start_rx to duplex %d, speed 0x%08x.\n",
+				dev->name, np->duplex, np->linkspeed);
+	pci_push(base);
+}
+
+static void nv_stop_rx(struct net_device *dev)
+{
+	u8 *base = get_hwbase(dev);
+
+	dprintk(KERN_DEBUG "%s: nv_stop_rx\n", dev->name);
+	writel(0, base + NvRegReceiverControl);
+	reg_delay(dev, NvRegReceiverStatus, NVREG_RCVSTAT_BUSY, 0,
+			NV_RXSTOP_DELAY1, NV_RXSTOP_DELAY1MAX,
+			KERN_INFO "nv_stop_rx: ReceiverStatus remained busy");
+
+	udelay(NV_RXSTOP_DELAY2);
+	writel(0, base + NvRegLinkSpeed);
+}
+
+static void nv_start_tx(struct net_device *dev)
+{
+	u8 *base = get_hwbase(dev);
+
+	dprintk(KERN_DEBUG "%s: nv_start_tx\n", dev->name);
+	writel(NVREG_XMITCTL_START, base + NvRegTransmitterControl);
+	pci_push(base);
+}
+
+static void nv_stop_tx(struct net_device *dev)
+{
+	u8 *base = get_hwbase(dev);
+
+	dprintk(KERN_DEBUG "%s: nv_stop_tx\n", dev->name);
+	writel(0, base + NvRegTransmitterControl);
+	reg_delay(dev, NvRegTransmitterStatus, NVREG_XMITSTAT_BUSY, 0,
+			NV_TXSTOP_DELAY1, NV_TXSTOP_DELAY1MAX,
+			KERN_INFO "nv_stop_tx: TransmitterStatus remained busy");
+
+	udelay(NV_TXSTOP_DELAY2);
+	writel(0, base + NvRegUnknownTransmitterReg);
+}
+
+static void nv_txrx_reset(struct net_device *dev)
+{
+	struct fe_priv *np = get_nvpriv(dev);
+	u8 *base = get_hwbase(dev);
+
+	dprintk(KERN_DEBUG "%s: nv_txrx_reset\n", dev->name);
+	writel(NVREG_TXRXCTL_BIT2 | NVREG_TXRXCTL_RESET | np->desc_ver, base + NvRegTxRxControl);
+	pci_push(base);
+	udelay(NV_TXRX_RESET_DELAY);
+	writel(NVREG_TXRXCTL_BIT2 | np->desc_ver, base + NvRegTxRxControl);
+	pci_push(base);
+}
+
+/*
+ * nv_get_stats: dev->get_stats function
+ * Get latest stats value from the nic.
+ * Called with read_lock(&dev_base_lock) held for read -
+ * only synchronized against unregister_netdevice.
+ */
+static struct net_device_stats *nv_get_stats(struct net_device *dev)
+{
+	struct fe_priv *np = get_nvpriv(dev);
+
+	/* It seems that the nic always generates interrupts and doesn't
+	 * accumulate errors internally. Thus the current values in np->stats
+	 * are already up to date.
+	 */
+	return &np->stats;
+}
+
+static int nv_ethtool_ioctl(struct net_device *dev, void __user *useraddr)
+{
+	struct fe_priv *np = get_nvpriv(dev);
+	u8 *base = get_hwbase(dev);
+	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, "forcedeth");
+		strcpy(info.version, FORCEDETH_VERSION);
+		strcpy(info.bus_info, pci_name(np->pci_dev));
+		if (copy_to_user(useraddr, &info, sizeof (info)))
+			return -EFAULT;
+		return 0;
+	}
+	case ETHTOOL_GLINK:
+	{
+		struct ethtool_value edata = { ETHTOOL_GLINK };
+
+		edata.data = !!netif_carrier_ok(dev);
+
+		if (copy_to_user(useraddr, &edata, sizeof(edata)))
+			return -EFAULT;
+		return 0;
+	}
+	case ETHTOOL_GWOL:
+	{
+		struct ethtool_wolinfo wolinfo;
+		memset(&wolinfo, 0, sizeof(wolinfo));
+		wolinfo.supported = WAKE_MAGIC;
+
+		spin_lock_irq(&np->lock);
+		if (np->wolenabled)
+			wolinfo.wolopts = WAKE_MAGIC;
+		spin_unlock_irq(&np->lock);
+
+		if (copy_to_user(useraddr, &wolinfo, sizeof(wolinfo)))
+			return -EFAULT;
+		return 0;
+	}
+	case ETHTOOL_SWOL:
+	{
+		struct ethtool_wolinfo wolinfo;
+		if (copy_from_user(&wolinfo, useraddr, sizeof(wolinfo)))
+			return -EFAULT;
+
+		spin_lock_irq(&np->lock);
+		if (wolinfo.wolopts == 0) {
+			writel(0, base + NvRegWakeUpFlags);
+			np->wolenabled = 0;
+		}
+		if (wolinfo.wolopts & WAKE_MAGIC) {
+			writel(NVREG_WAKEUPFLAGS_ENABLE, base + NvRegWakeUpFlags);
+			np->wolenabled = 1;
+		}
+		spin_unlock_irq(&np->lock);
+		return 0;
+	}
+
+	default:
+		break;
+	}
+
+	return -EOPNOTSUPP;
+}
+/*
+ * nv_ioctl: dev->do_ioctl function
+ * Called with rtnl_lock held.
+ */
+static int nv_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+{
+	switch(cmd) {
+	case SIOCETHTOOL:
+		return nv_ethtool_ioctl(dev, rq->ifr_data);
+
+	default:
+		return -EOPNOTSUPP;
+	}
+}
+
+/*
+ * nv_alloc_rx: fill rx ring entries.
+ * Return 1 if the allocations for the skbs failed and the
+ * rx engine is without Available descriptors
+ */
+static int nv_alloc_rx(struct net_device *dev)
+{
+	struct fe_priv *np = get_nvpriv(dev);
+	unsigned int refill_rx = np->refill_rx;
+	int nr;
+
+	while (np->cur_rx != refill_rx) {
+		struct sk_buff *skb;
+
+		nr = refill_rx % RX_RING;
+		if (np->rx_skbuff[nr] == NULL) {
+
+			skb = dev_alloc_skb(RX_ALLOC_BUFSIZE);
+			if (!skb)
+				break;
+
+			skb->dev = dev;
+			np->rx_skbuff[nr] = skb;
+		} else {
+			skb = np->rx_skbuff[nr];
+		}
+		np->rx_dma[nr] = pci_map_single(np->pci_dev, skb->data, skb->len,
+						PCI_DMA_FROMDEVICE);
+		np->rx_ring[nr].PacketBuffer = cpu_to_le32(np->rx_dma[nr]);
+		wmb();
+		np->rx_ring[nr].FlagLen = cpu_to_le32(RX_NIC_BUFSIZE | NV_RX_AVAIL);
+		dprintk(KERN_DEBUG "%s: nv_alloc_rx: Packet %d marked as Available\n",
+					dev->name, refill_rx);
+		refill_rx++;
+	}
+	np->refill_rx = refill_rx;
+	if (np->cur_rx - refill_rx == RX_RING)
+		return 1;
+	return 0;
+}
+
+static void nv_do_rx_refill(unsigned long data)
+{
+	struct net_device *dev = (struct net_device *) data;
+	struct fe_priv *np = get_nvpriv(dev);
+
+	disable_irq(dev->irq);
+	if (nv_alloc_rx(dev)) {
+		spin_lock(&np->lock);
+		if (!np->in_shutdown)
+			mod_timer(&np->oom_kick, jiffies + OOM_REFILL);
+		spin_unlock(&np->lock);
+	}
+	enable_irq(dev->irq);
+}
+
+static int nv_init_ring(struct net_device *dev)
+{
+	struct fe_priv *np = get_nvpriv(dev);
+	int i;
+
+	np->next_tx = np->nic_tx = 0;
+	for (i = 0; i < TX_RING; i++)
+		np->tx_ring[i].FlagLen = 0;
+
+	np->cur_rx = RX_RING;
+	np->refill_rx = 0;
+	for (i = 0; i < RX_RING; i++)
+		np->rx_ring[i].FlagLen = 0;
+	return nv_alloc_rx(dev);
+}
+
+static void nv_drain_tx(struct net_device *dev)
+{
+	struct fe_priv *np = get_nvpriv(dev);
+	int i;
+	for (i = 0; i < TX_RING; i++) {
+		np->tx_ring[i].FlagLen = 0;
+		if (np->tx_skbuff[i]) {
+			pci_unmap_single(np->pci_dev, np->tx_dma[i],
+						np->tx_skbuff[i]->len,
+						PCI_DMA_TODEVICE);
+			dev_kfree_skb(np->tx_skbuff[i]);
+			np->tx_skbuff[i] = NULL;
+			np->stats.tx_dropped++;
+		}
+	}
+}
+
+static void nv_drain_rx(struct net_device *dev)
+{
+	struct fe_priv *np = get_nvpriv(dev);
+	int i;
+	for (i = 0; i < RX_RING; i++) {
+		np->rx_ring[i].FlagLen = 0;
+		wmb();
+		if (np->rx_skbuff[i]) {
+			pci_unmap_single(np->pci_dev, np->rx_dma[i],
+						np->rx_skbuff[i]->len,
+						PCI_DMA_FROMDEVICE);
+			dev_kfree_skb(np->rx_skbuff[i]);
+			np->rx_skbuff[i] = NULL;
+		}
+	}
+}
+
+static void drain_ring(struct net_device *dev)
+{
+	nv_drain_tx(dev);
+	nv_drain_rx(dev);
+}
+
+/*
+ * nv_start_xmit: dev->hard_start_xmit function
+ * Called with dev->xmit_lock held.
+ */
+static int nv_start_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+	struct fe_priv *np = get_nvpriv(dev);
+	int nr = np->next_tx % TX_RING;
+
+	np->tx_skbuff[nr] = skb;
+	np->tx_dma[nr] = pci_map_single(np->pci_dev, skb->data,skb->len,
+					PCI_DMA_TODEVICE);
+
+	np->tx_ring[nr].PacketBuffer = cpu_to_le32(np->tx_dma[nr]);
+
+	spin_lock_irq(&np->lock);
+	wmb();
+	np->tx_ring[nr].FlagLen = cpu_to_le32( (skb->len-1) | np->tx_flags );
+	dprintk(KERN_DEBUG "%s: nv_start_xmit: packet packet %d queued for transmission.\n",
+				dev->name, np->next_tx);
+	{
+		int j;
+		for (j=0; j<64; j++) {
+			if ((j%16) == 0)
+				dprintk("\n%03x:", j);
+			dprintk(" %02x", ((unsigned char*)skb->data)[j]);
+		}
+		dprintk("\n");
+	}
+
+	np->next_tx++;
+
+	dev->trans_start = jiffies;
+	if (np->next_tx - np->nic_tx >= TX_LIMIT_STOP)
+		netif_stop_queue(dev);
+	spin_unlock_irq(&np->lock);
+	writel(NVREG_TXRXCTL_KICK|np->desc_ver, get_hwbase(dev) + NvRegTxRxControl);
+	pci_push(get_hwbase(dev));
+	return 0;
+}
+
+/*
+ * nv_tx_done: check for completed packets, release the skbs.
+ *
+ * Caller must own np->lock.
+ */
+static void nv_tx_done(struct net_device *dev)
+{
+	struct fe_priv *np = get_nvpriv(dev);
+	u32 Flags;
+	int i;
+
+	while (np->nic_tx != np->next_tx) {
+		i = np->nic_tx % TX_RING;
+
+		Flags = le32_to_cpu(np->tx_ring[i].FlagLen);
+
+		dprintk(KERN_DEBUG "%s: nv_tx_done: looking at packet %d, Flags 0x%x.\n",
+					dev->name, np->nic_tx, Flags);
+		if (Flags & NV_TX_VALID)
+			break;
+		if (np->desc_ver == DESC_VER_1) {
+			if (Flags & (NV_TX_RETRYERROR|NV_TX_CARRIERLOST|NV_TX_LATECOLLISION|
+							NV_TX_UNDERFLOW|NV_TX_ERROR)) {
+				if (Flags & NV_TX_UNDERFLOW)
+					np->stats.tx_fifo_errors++;
+				if (Flags & NV_TX_CARRIERLOST)
+					np->stats.tx_carrier_errors++;
+				np->stats.tx_errors++;
+			} else {
+				np->stats.tx_packets++;
+				np->stats.tx_bytes += np->tx_skbuff[i]->len;
+			}
+		} else {
+			if (Flags & (NV_TX2_RETRYERROR|NV_TX2_CARRIERLOST|NV_TX2_LATECOLLISION|
+							NV_TX2_UNDERFLOW|NV_TX2_ERROR)) {
+				if (Flags & NV_TX2_UNDERFLOW)
+					np->stats.tx_fifo_errors++;
+				if (Flags & NV_TX2_CARRIERLOST)
+					np->stats.tx_carrier_errors++;
+				np->stats.tx_errors++;
+			} else {
+				np->stats.tx_packets++;
+				np->stats.tx_bytes += np->tx_skbuff[i]->len;
+			}
+		}
+		pci_unmap_single(np->pci_dev, np->tx_dma[i],
+					np->tx_skbuff[i]->len,
+					PCI_DMA_TODEVICE);
+		dev_kfree_skb_irq(np->tx_skbuff[i]);
+		np->tx_skbuff[i] = NULL;
+		np->nic_tx++;
+	}
+	if (np->next_tx - np->nic_tx < TX_LIMIT_START)
+		netif_wake_queue(dev);
+}
+
+/*
+ * nv_tx_timeout: dev->tx_timeout function
+ * Called with dev->xmit_lock held.
+ */
+static void nv_tx_timeout(struct net_device *dev)
+{
+	struct fe_priv *np = get_nvpriv(dev);
+	u8 *base = get_hwbase(dev);
+
+	dprintk(KERN_DEBUG "%s: Got tx_timeout. irq: %08x\n", dev->name,
+			readl(base + NvRegIrqStatus) & NVREG_IRQSTAT_MASK);
+
+	spin_lock_irq(&np->lock);
+
+	/* 1) stop tx engine */
+	nv_stop_tx(dev);
+
+	/* 2) check that the packets were not sent already: */
+	nv_tx_done(dev);
+
+	/* 3) if there are dead entries: clear everything */
+	if (np->next_tx != np->nic_tx) {
+		printk(KERN_DEBUG "%s: tx_timeout: dead entries!\n", dev->name);
+		nv_drain_tx(dev);
+		np->next_tx = np->nic_tx = 0;
+		writel((u32) (np->ring_addr + RX_RING*sizeof(struct ring_desc)), base + NvRegTxRingPhysAddr);
+		netif_wake_queue(dev);
+	}
+
+	/* 4) restart tx engine */
+	nv_start_tx(dev);
+	spin_unlock_irq(&np->lock);
+}
+
+static void nv_rx_process(struct net_device *dev)
+{
+	struct fe_priv *np = get_nvpriv(dev);
+	u32 Flags;
+
+	for (;;) {
+		struct sk_buff *skb;
+		int len;
+		int i;
+		if (np->cur_rx - np->refill_rx >= RX_RING)
+			break;	/* we scanned the whole ring - do not continue */
+
+		i = np->cur_rx % RX_RING;
+		Flags = le32_to_cpu(np->rx_ring[i].FlagLen);
+		len = nv_descr_getlength(&np->rx_ring[i], np->desc_ver);
+
+		dprintk(KERN_DEBUG "%s: nv_rx_process: looking at packet %d, Flags 0x%x.\n",
+					dev->name, np->cur_rx, Flags);
+
+		if (Flags & NV_RX_AVAIL)
+			break;	/* still owned by hardware, */
+
+		/*
+		 * the packet is for us - immediately tear down the pci mapping.
+		 * TODO: check if a prefetch of the first cacheline improves
+		 * the performance.
+		 */
+		pci_unmap_single(np->pci_dev, np->rx_dma[i],
+				np->rx_skbuff[i]->len,
+				PCI_DMA_FROMDEVICE);
+
+		{
+			int j;
+			dprintk(KERN_DEBUG "Dumping packet (flags 0x%x).",Flags);
+			for (j=0; j<64; j++) {
+				if ((j%16) == 0)
+					dprintk("\n%03x:", j);
+				dprintk(" %02x", ((unsigned char*)np->rx_skbuff[i]->data)[j]);
+			}
+			dprintk("\n");
+		}
+		/* look at what we actually got: */
+		if (np->desc_ver == DESC_VER_1) {
+			if (!(Flags & NV_RX_DESCRIPTORVALID))
+				goto next_pkt;
+
+			if (Flags & NV_RX_MISSEDFRAME) {
+				np->stats.rx_missed_errors++;
+				np->stats.rx_errors++;
+				goto next_pkt;
+			}
+			if (Flags & (NV_RX_ERROR1|NV_RX_ERROR2|NV_RX_ERROR3|NV_RX_ERROR4)) {
+				np->stats.rx_errors++;
+				goto next_pkt;
+			}
+			if (Flags & NV_RX_CRCERR) {
+				np->stats.rx_crc_errors++;
+				np->stats.rx_errors++;
+				goto next_pkt;
+			}
+			if (Flags & NV_RX_OVERFLOW) {
+				np->stats.rx_over_errors++;
+				np->stats.rx_errors++;
+				goto next_pkt;
+			}
+			if (Flags & NV_RX_ERROR) {
+				/* framing errors are soft errors, the rest is fatal. */
+				if (Flags & NV_RX_FRAMINGERR) {
+					if (Flags & NV_RX_SUBSTRACT1) {
+						len--;
+					}
+				} else {
+					np->stats.rx_errors++;
+					goto next_pkt;
+				}
+			}
+		} else {
+			if (!(Flags & NV_RX2_DESCRIPTORVALID))
+				goto next_pkt;
+
+			if (Flags & (NV_RX2_ERROR1|NV_RX2_ERROR2|NV_RX2_ERROR3|NV_RX2_ERROR4)) {
+				np->stats.rx_errors++;
+				goto next_pkt;
+			}
+			if (Flags & NV_RX2_CRCERR) {
+				np->stats.rx_crc_errors++;
+				np->stats.rx_errors++;
+				goto next_pkt;
+			}
+			if (Flags & NV_RX2_OVERFLOW) {
+				np->stats.rx_over_errors++;
+				np->stats.rx_errors++;
+				goto next_pkt;
+			}
+			if (Flags & NV_RX2_ERROR) {
+				/* framing errors are soft errors, the rest is fatal. */
+				if (Flags & NV_RX2_FRAMINGERR) {
+					if (Flags & NV_RX2_SUBSTRACT1) {
+						len--;
+					}
+				} else {
+					np->stats.rx_errors++;
+					goto next_pkt;
+				}
+			}
+		}
+		/* got a valid packet - forward it to the network core */
+		skb = np->rx_skbuff[i];
+		np->rx_skbuff[i] = NULL;
+
+		skb_put(skb, len);
+		skb->protocol = eth_type_trans(skb, dev);
+		dprintk(KERN_DEBUG "%s: nv_rx_process: packet %d with %d bytes, proto %d accepted.\n",
+					dev->name, np->cur_rx, len, skb->protocol);
+		netif_rx(skb);
+		dev->last_rx = jiffies;
+		np->stats.rx_packets++;
+		np->stats.rx_bytes += len;
+next_pkt:
+		np->cur_rx++;
+	}
+}
+
+/*
+ * nv_change_mtu: dev->change_mtu function
+ * Called with dev_base_lock held for read.
+ */
+static int nv_change_mtu(struct net_device *dev, int new_mtu)
+{
+	if (new_mtu > ETH_DATA_LEN)
+		return -EINVAL;
+	dev->mtu = new_mtu;
+	return 0;
+}
+
+/*
+ * nv_set_multicast: dev->set_multicast function
+ * Called with dev->xmit_lock held.
+ */
+static void nv_set_multicast(struct net_device *dev)
+{
+	struct fe_priv *np = get_nvpriv(dev);
+	u8 *base = get_hwbase(dev);
+	u32 addr[2];
+	u32 mask[2];
+	u32 pff;
+
+	memset(addr, 0, sizeof(addr));
+	memset(mask, 0, sizeof(mask));
+
+	if (dev->flags & IFF_PROMISC) {
+		printk(KERN_NOTICE "%s: Promiscuous mode enabled.\n", dev->name);
+		pff = NVREG_PFF_PROMISC;
+	} else {
+		pff = NVREG_PFF_MYADDR;
+
+		if (dev->flags & IFF_ALLMULTI || dev->mc_list) {
+			u32 alwaysOff[2];
+			u32 alwaysOn[2];
+
+			alwaysOn[0] = alwaysOn[1] = alwaysOff[0] = alwaysOff[1] = 0xffffffff;
+			if (dev->flags & IFF_ALLMULTI) {
+				alwaysOn[0] = alwaysOn[1] = alwaysOff[0] = alwaysOff[1] = 0;
+			} else {
+				struct dev_mc_list *walk;
+
+				walk = dev->mc_list;
+				while (walk != NULL) {
+					u32 a, b;
+					a = le32_to_cpu(*(u32 *) walk->dmi_addr);
+					b = le16_to_cpu(*(u16 *) (&walk->dmi_addr[4]));
+					alwaysOn[0] &= a;
+					alwaysOff[0] &= ~a;
+					alwaysOn[1] &= b;
+					alwaysOff[1] &= ~b;
+					walk = walk->next;
+				}
+			}
+			addr[0] = alwaysOn[0];
+			addr[1] = alwaysOn[1];
+			mask[0] = alwaysOn[0] | alwaysOff[0];
+			mask[1] = alwaysOn[1] | alwaysOff[1];
+		}
+	}
+	addr[0] |= NVREG_MCASTADDRA_FORCE;
+	pff |= NVREG_PFF_ALWAYS;
+	spin_lock_irq(&np->lock);
+	nv_stop_rx(dev);
+	writel(addr[0], base + NvRegMulticastAddrA);
+	writel(addr[1], base + NvRegMulticastAddrB);
+	writel(mask[0], base + NvRegMulticastMaskA);
+	writel(mask[1], base + NvRegMulticastMaskB);
+	writel(pff, base + NvRegPacketFilterFlags);
+	dprintk(KERN_INFO "%s: reconfiguration for multicast lists.\n",
+		dev->name);
+	nv_start_rx(dev);
+	spin_unlock_irq(&np->lock);
+}
+
+static int nv_update_linkspeed(struct net_device *dev)
+{
+	struct fe_priv *np = get_nvpriv(dev);
+	u8 *base = get_hwbase(dev);
+	int adv, lpa;
+	int newls = np->linkspeed;
+	int newdup = np->duplex;
+	int mii_status;
+	int retval = 0;
+	u32 control_1000, status_1000, phyreg;
+
+	/* BMSR_LSTATUS is latched, read it twice:
+	 * we want the current value.
+	 */
+	mii_rw(dev, np->phyaddr, MII_BMSR, MII_READ);
+	mii_status = mii_rw(dev, np->phyaddr, MII_BMSR, MII_READ);
+
+	if (!(mii_status & BMSR_LSTATUS)) {
+		dprintk(KERN_DEBUG "%s: no link detected by phy - falling back to 10HD.\n",
+				dev->name);
+		newls = NVREG_LINKSPEED_FORCE|NVREG_LINKSPEED_10;
+		newdup = 0;
+		retval = 0;
+		goto set_speed;
+	}
+
+	/* check auto negotiation is complete */
+	if (!(mii_status & BMSR_ANEGCOMPLETE)) {
+		/* still in autonegotiation - configure nic for 10 MBit HD and wait. */
+		newls = NVREG_LINKSPEED_FORCE|NVREG_LINKSPEED_10;
+		newdup = 0;
+		retval = 0;
+		dprintk(KERN_DEBUG "%s: autoneg not completed - falling back to 10HD.\n", dev->name);
+		goto set_speed;
+	}
+
+	retval = 1;
+	if (np->gigabit == PHY_GIGABIT) {
+		control_1000 = mii_rw(dev, np->phyaddr, MII_1000BT_CR, MII_READ);
+		status_1000 = mii_rw(dev, np->phyaddr, MII_1000BT_SR, MII_READ);
+
+		if ((control_1000 & ADVERTISE_1000FULL) &&
+			(status_1000 & LPA_1000FULL)) {
+		dprintk(KERN_DEBUG "%s: nv_update_linkspeed: GBit ethernet detected.\n",
+				dev->name);
+			newls = NVREG_LINKSPEED_FORCE|NVREG_LINKSPEED_1000;
+			newdup = 1;
+			goto set_speed;
+		}
+	}
+
+	adv = mii_rw(dev, np->phyaddr, MII_ADVERTISE, MII_READ);
+	lpa = mii_rw(dev, np->phyaddr, MII_LPA, MII_READ);
+	dprintk(KERN_DEBUG "%s: nv_update_linkspeed: PHY advertises 0x%04x, lpa 0x%04x.\n",
+				dev->name, adv, lpa);
+
+	/* FIXME: handle parallel detection properly */
+	lpa = lpa & adv;
+	if (lpa & LPA_100FULL) {
+		newls = NVREG_LINKSPEED_FORCE|NVREG_LINKSPEED_100;
+		newdup = 1;
+	} else if (lpa & LPA_100HALF) {
+		newls = NVREG_LINKSPEED_FORCE|NVREG_LINKSPEED_100;
+		newdup = 0;
+	} else if (lpa & LPA_10FULL) {
+		newls = NVREG_LINKSPEED_FORCE|NVREG_LINKSPEED_10;
+		newdup = 1;
+	} else if (lpa & LPA_10HALF) {
+		newls = NVREG_LINKSPEED_FORCE|NVREG_LINKSPEED_10;
+		newdup = 0;
+	} else {
+		dprintk(KERN_DEBUG "%s: bad ability %04x - falling back to 10HD.\n", dev->name, lpa);
+		newls = NVREG_LINKSPEED_FORCE|NVREG_LINKSPEED_10;
+		newdup = 0;
+	}
+
+set_speed:
+	if (np->duplex == newdup && np->linkspeed == newls)
+		return retval;
+
+	dprintk(KERN_INFO "%s: changing link setting from %d/%d to %d/%d.\n",
+			dev->name, np->linkspeed, np->duplex, newls, newdup);
+
+	np->duplex = newdup;
+	np->linkspeed = newls;
+
+	if (np->gigabit == PHY_GIGABIT) {
+		phyreg = readl(base + NvRegRandomSeed);
+		phyreg &= ~(0x3FF00);
+		if ((np->linkspeed & 0xFFF) == NVREG_LINKSPEED_10)
+			phyreg |= NVREG_RNDSEED_FORCE3;
+		else if ((np->linkspeed & 0xFFF) == NVREG_LINKSPEED_100)
+			phyreg |= NVREG_RNDSEED_FORCE2;
+		else if ((np->linkspeed & 0xFFF) == NVREG_LINKSPEED_1000)
+			phyreg |= NVREG_RNDSEED_FORCE;
+		writel(phyreg, base + NvRegRandomSeed);
+	}
+
+	phyreg = readl(base + NvRegPhyInterface);
+	phyreg &= ~(PHY_HALF|PHY_100|PHY_1000);
+	if (np->duplex == 0)
+		phyreg |= PHY_HALF;
+	if ((np->linkspeed & 0xFFF) == NVREG_LINKSPEED_100)
+		phyreg |= PHY_100;
+	else if ((np->linkspeed & 0xFFF) == NVREG_LINKSPEED_1000)
+		phyreg |= PHY_1000;
+	writel(phyreg, base + NvRegPhyInterface);
+
+	writel(NVREG_MISC1_FORCE | ( np->duplex ? 0 : NVREG_MISC1_HD),
+		base + NvRegMisc1);
+	pci_push(base);
+	writel(np->linkspeed, base + NvRegLinkSpeed);
+	pci_push(base);
+
+	return retval;
+}
+
+static void nv_linkchange(struct net_device *dev)
+{
+	if (nv_update_linkspeed(dev)) {
+		if (netif_carrier_ok(dev)) {
+			nv_stop_rx(dev);
+		} else {
+			netif_carrier_on(dev);
+			printk(KERN_INFO "%s: link up.\n", dev->name);
+		}
+		nv_start_rx(dev);
+	} else {
+		if (netif_carrier_ok(dev)) {
+			netif_carrier_off(dev);
+			printk(KERN_INFO "%s: link down.\n", dev->name);
+			nv_stop_rx(dev);
+		}
+	}
+}
+
+static void nv_link_irq(struct net_device *dev)
+{
+	u8 *base = get_hwbase(dev);
+	u32 miistat;
+
+	miistat = readl(base + NvRegMIIStatus);
+	writel(NVREG_MIISTAT_MASK, base + NvRegMIIStatus);
+	dprintk(KERN_INFO "%s: link change irq, status 0x%x.\n", dev->name, miistat);
+
+	if (miistat & (NVREG_MIISTAT_LINKCHANGE))
+		nv_linkchange(dev);
+	dprintk(KERN_DEBUG "%s: link change notification done.\n", dev->name);
+}
+
+static irqreturn_t nv_nic_irq(int foo, void *data, struct pt_regs *regs)
+{
+	struct net_device *dev = (struct net_device *) data;
+	struct fe_priv *np = get_nvpriv(dev);
+	u8 *base = get_hwbase(dev);
+	u32 events;
+	int i;
+
+	dprintk(KERN_DEBUG "%s: nv_nic_irq\n", dev->name);
+
+	for (i=0; ; i++) {
+		events = readl(base + NvRegIrqStatus) & NVREG_IRQSTAT_MASK;
+		writel(NVREG_IRQSTAT_MASK, base + NvRegIrqStatus);
+		pci_push(base);
+		dprintk(KERN_DEBUG "%s: irq: %08x\n", dev->name, events);
+		if (!(events & np->irqmask))
+			break;
+
+		if (events & (NVREG_IRQ_TX1|NVREG_IRQ_TX2|NVREG_IRQ_TX_ERR)) {
+			spin_lock(&np->lock);
+			nv_tx_done(dev);
+			spin_unlock(&np->lock);
+		}
+
+		if (events & (NVREG_IRQ_RX_ERROR|NVREG_IRQ_RX|NVREG_IRQ_RX_NOBUF)) {
+			nv_rx_process(dev);
+			if (nv_alloc_rx(dev)) {
+				spin_lock(&np->lock);
+				if (!np->in_shutdown)
+					mod_timer(&np->oom_kick, jiffies + OOM_REFILL);
+				spin_unlock(&np->lock);
+			}
+		}
+
+		if (events & NVREG_IRQ_LINK) {
+			spin_lock(&np->lock);
+			nv_link_irq(dev);
+			spin_unlock(&np->lock);
+		}
+		if (np->need_linktimer && time_after(jiffies, np->link_timeout)) {
+			spin_lock(&np->lock);
+			nv_linkchange(dev);
+			spin_unlock(&np->lock);
+			np->link_timeout = jiffies + LINK_TIMEOUT;
+		}
+		if (events & (NVREG_IRQ_TX_ERR)) {
+			dprintk(KERN_DEBUG "%s: received irq with events 0x%x. Probably TX fail.\n",
+						dev->name, events);
+		}
+		if (events & (NVREG_IRQ_UNKNOWN)) {
+			printk(KERN_DEBUG "%s: received irq with unknown events 0x%x. Please report\n",
+						dev->name, events);
+		}
+		if (i > max_interrupt_work) {
+			spin_lock(&np->lock);
+			/* disable interrupts on the nic */
+			writel(0, base + NvRegIrqMask);
+			pci_push(base);
+
+			if (!np->in_shutdown)
+				mod_timer(&np->nic_poll, jiffies + POLL_WAIT);
+			printk(KERN_DEBUG "%s: too many iterations (%d) in nv_nic_irq.\n", dev->name, i);
+			spin_unlock(&np->lock);
+			break;
+		}
+
+	}
+	dprintk(KERN_DEBUG "%s: nv_nic_irq completed\n", dev->name);
+
+	return IRQ_RETVAL(i);
+}
+
+static void nv_do_nic_poll(unsigned long data)
+{
+	struct net_device *dev = (struct net_device *) data;
+	struct fe_priv *np = get_nvpriv(dev);
+	u8 *base = get_hwbase(dev);
+
+	disable_irq(dev->irq);
+	/* FIXME: Do we need synchronize_irq(dev->irq) here? */
+	/*
+	 * reenable interrupts on the nic, we have to do this before calling
+	 * nv_nic_irq because that may decide to do otherwise
+	 */
+	writel(np->irqmask, base + NvRegIrqMask);
+	pci_push(base);
+	nv_nic_irq((int) 0, (void *) data, (struct pt_regs *) NULL);
+	enable_irq(dev->irq);
+}
+
+static int nv_open(struct net_device *dev)
+{
+	struct fe_priv *np = get_nvpriv(dev);
+	u8 *base = get_hwbase(dev);
+	int ret, oom, i;
+
+	dprintk(KERN_DEBUG "nv_open: begin\n");
+
+	/* 1) erase previous misconfiguration */
+	/* 4.1-1: stop adapter: ignored, 4.3 seems to be overkill */
+	writel(NVREG_MCASTADDRA_FORCE, base + NvRegMulticastAddrA);
+	writel(0, base + NvRegMulticastAddrB);
+	writel(0, base + NvRegMulticastMaskA);
+	writel(0, base + NvRegMulticastMaskB);
+	writel(0, base + NvRegPacketFilterFlags);
+
+	writel(0, base + NvRegTransmitterControl);
+	writel(0, base + NvRegReceiverControl);
+
+	writel(0, base + NvRegAdapterControl);
+
+	/* 2) initialize descriptor rings */
+	oom = nv_init_ring(dev);
+
+	writel(0, base + NvRegLinkSpeed);
+	writel(0, base + NvRegUnknownTransmitterReg);
+	nv_txrx_reset(dev);
+	writel(0, base + NvRegUnknownSetupReg6);
+
+	np->in_shutdown = 0;
+
+	/* 3) set mac address */
+	{
+		u32 mac[2];
+
+		mac[0] = (dev->dev_addr[0] << 0) + (dev->dev_addr[1] << 8) +
+				(dev->dev_addr[2] << 16) + (dev->dev_addr[3] << 24);
+		mac[1] = (dev->dev_addr[4] << 0) + (dev->dev_addr[5] << 8);
+
+		writel(mac[0], base + NvRegMacAddrA);
+		writel(mac[1], base + NvRegMacAddrB);
+	}
+
+	/* 4) give hw rings */
+	writel((u32) np->ring_addr, base + NvRegRxRingPhysAddr);
+	writel((u32) (np->ring_addr + RX_RING*sizeof(struct ring_desc)), base + NvRegTxRingPhysAddr);
+	writel( ((RX_RING-1) << NVREG_RINGSZ_RXSHIFT) + ((TX_RING-1) << NVREG_RINGSZ_TXSHIFT),
+		base + NvRegRingSizes);
+
+	/* 5) continue setup */
+	np->linkspeed = NVREG_LINKSPEED_FORCE|NVREG_LINKSPEED_10;
+	np->duplex = 0;
+
+	writel(np->linkspeed, base + NvRegLinkSpeed);
+	writel(NVREG_UNKSETUP3_VAL1, base + NvRegUnknownSetupReg3);
+	writel(np->desc_ver, base + NvRegTxRxControl);
+	pci_push(base);
+	writel(NVREG_TXRXCTL_BIT1|np->desc_ver, base + NvRegTxRxControl);
+	reg_delay(dev, NvRegUnknownSetupReg5, NVREG_UNKSETUP5_BIT31, NVREG_UNKSETUP5_BIT31,
+			NV_SETUP5_DELAY, NV_SETUP5_DELAYMAX,
+			KERN_INFO "open: SetupReg5, Bit 31 remained off\n");
+
+	writel(0, base + NvRegUnknownSetupReg4);
+	writel(NVREG_IRQSTAT_MASK, base + NvRegIrqStatus);
+	writel(NVREG_MIISTAT_MASK2, base + NvRegMIIStatus);
+
+	/* 6) continue setup */
+	writel(NVREG_MISC1_FORCE | NVREG_MISC1_HD, base + NvRegMisc1);
+	writel(readl(base + NvRegTransmitterStatus), base + NvRegTransmitterStatus);
+	writel(NVREG_PFF_ALWAYS, base + NvRegPacketFilterFlags);
+	writel(NVREG_OFFLOAD_NORMAL, base + NvRegOffloadConfig);
+
+	writel(readl(base + NvRegReceiverStatus), base + NvRegReceiverStatus);
+	get_random_bytes(&i, sizeof(i));
+	writel(NVREG_RNDSEED_FORCE | (i&NVREG_RNDSEED_MASK), base + NvRegRandomSeed);
+	writel(NVREG_UNKSETUP1_VAL, base + NvRegUnknownSetupReg1);
+	writel(NVREG_UNKSETUP2_VAL, base + NvRegUnknownSetupReg2);
+	writel(NVREG_POLL_DEFAULT, base + NvRegPollingInterval);
+	writel(NVREG_UNKSETUP6_VAL, base + NvRegUnknownSetupReg6);
+	writel((np->phyaddr << NVREG_ADAPTCTL_PHYSHIFT)|NVREG_ADAPTCTL_PHYVALID|NVREG_ADAPTCTL_RUNNING,
+			base + NvRegAdapterControl);
+	writel(NVREG_MIISPEED_BIT8|NVREG_MIIDELAY, base + NvRegMIISpeed);
+	writel(NVREG_UNKSETUP4_VAL, base + NvRegUnknownSetupReg4);
+	writel(NVREG_WAKEUPFLAGS_VAL, base + NvRegWakeUpFlags);
+
+	i = readl(base + NvRegPowerState);
+	if ( (i & NVREG_POWERSTATE_POWEREDUP) == 0)
+		writel(NVREG_POWERSTATE_POWEREDUP|i, base + NvRegPowerState);
+
+	pci_push(base);
+	udelay(10);
+	writel(readl(base + NvRegPowerState) | NVREG_POWERSTATE_VALID, base + NvRegPowerState);
+
+	writel(0, base + NvRegIrqMask);
+	pci_push(base);
+	writel(NVREG_MIISTAT_MASK2, base + NvRegMIIStatus);
+	writel(NVREG_IRQSTAT_MASK, base + NvRegIrqStatus);
+	pci_push(base);
+
+	ret = request_irq(dev->irq, &nv_nic_irq, SA_SHIRQ, dev->name, dev);
+	if (ret)
+		goto out_drain;
+
+	/* ask for interrupts */
+	writel(np->irqmask, base + NvRegIrqMask);
+
+	spin_lock_irq(&np->lock);
+	writel(NVREG_MCASTADDRA_FORCE, base + NvRegMulticastAddrA);
+	writel(0, base + NvRegMulticastAddrB);
+	writel(0, base + NvRegMulticastMaskA);
+	writel(0, base + NvRegMulticastMaskB);
+	writel(NVREG_PFF_ALWAYS|NVREG_PFF_MYADDR, base + NvRegPacketFilterFlags);
+	/* One manual link speed update: Interrupts are enabled, future link
+	 * speed changes cause interrupts and are handled by nv_link_irq().
+	 */
+	{
+		u32 miistat;
+		miistat = readl(base + NvRegMIIStatus);
+		writel(NVREG_MIISTAT_MASK, base + NvRegMIIStatus);
+		dprintk(KERN_INFO "startup: got 0x%08x.\n", miistat);
+	}
+	ret = nv_update_linkspeed(dev);
+	nv_start_rx(dev);
+	nv_start_tx(dev);
+	netif_start_queue(dev);
+	if (ret) {
+		netif_carrier_on(dev);
+	} else {
+		printk("%s: no link during initialization.\n", dev->name);
+		netif_carrier_off(dev);
+	}
+	if (oom)
+		mod_timer(&np->oom_kick, jiffies + OOM_REFILL);
+	spin_unlock_irq(&np->lock);
+
+	return 0;
+out_drain:
+	drain_ring(dev);
+	return ret;
+}
+
+static int nv_close(struct net_device *dev)
+{
+	struct fe_priv *np = get_nvpriv(dev);
+	u8 *base;
+
+	spin_lock_irq(&np->lock);
+	np->in_shutdown = 1;
+	spin_unlock_irq(&np->lock);
+	synchronize_irq();
+
+	del_timer_sync(&np->oom_kick);
+	del_timer_sync(&np->nic_poll);
+
+	netif_stop_queue(dev);
+	spin_lock_irq(&np->lock);
+	nv_stop_tx(dev);
+	nv_stop_rx(dev);
+	base = get_hwbase(dev);
+
+	/* disable interrupts on the nic or we will lock up */
+	writel(0, base + NvRegIrqMask);
+	pci_push(base);
+	dprintk(KERN_INFO "%s: Irqmask is zero again\n", dev->name);
+
+	spin_unlock_irq(&np->lock);
+
+	free_irq(dev->irq, dev);
+
+	drain_ring(dev);
+
+	if (np->wolenabled)
+		nv_start_rx(dev);
+
+	/* FIXME: power down nic */
+
+	return 0;
+}
+
+static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_id *id)
+{
+	struct net_device *dev;
+	struct fe_priv *np;
+	unsigned long addr;
+	u8 *base;
+	int err, i;
+
+	dev = alloc_etherdev(sizeof(struct fe_priv));
+	err = -ENOMEM;
+	if (!dev)
+		goto out;
+
+	np = get_nvpriv(dev);
+	np->pci_dev = pci_dev;
+	spin_lock_init(&np->lock);
+	SET_MODULE_OWNER(dev);
+
+	init_timer(&np->oom_kick);
+	np->oom_kick.data = (unsigned long) dev;
+	np->oom_kick.function = &nv_do_rx_refill;	/* timer handler */
+	init_timer(&np->nic_poll);
+	np->nic_poll.data = (unsigned long) dev;
+	np->nic_poll.function = &nv_do_nic_poll;	/* timer handler */
+
+	err = pci_enable_device(pci_dev);
+	if (err) {
+		printk(KERN_INFO "forcedeth: pci_enable_dev failed (%d) for device %s\n",
+				err, pci_name(pci_dev));
+		goto out_free;
+	}
+
+	pci_set_master(pci_dev);
+
+	err = pci_request_regions(pci_dev, DRV_NAME);
+	if (err < 0)
+		goto out_disable;
+
+	err = -EINVAL;
+	addr = 0;
+	for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
+		dprintk(KERN_DEBUG "%s: resource %d start %p len %ld flags 0x%08lx.\n",
+				pci_name(pci_dev), i, (void*)pci_resource_start(pci_dev, i),
+				pci_resource_len(pci_dev, i),
+				pci_resource_flags(pci_dev, i));
+		if (pci_resource_flags(pci_dev, i) & IORESOURCE_MEM &&
+				pci_resource_len(pci_dev, i) >= NV_PCI_REGSZ) {
+			addr = pci_resource_start(pci_dev, i);
+			break;
+		}
+	}
+	if (i == DEVICE_COUNT_RESOURCE) {
+		printk(KERN_INFO "forcedeth: Couldn't find register window for device %s.\n",
+					pci_name(pci_dev));
+		goto out_relreg;
+	}
+
+	/* handle different descriptor versions */
+	if (pci_dev->device == PCI_DEVICE_ID_NVIDIA_NVENET_1 ||
+		pci_dev->device == PCI_DEVICE_ID_NVIDIA_NVENET_2 ||
+		pci_dev->device == PCI_DEVICE_ID_NVIDIA_NVENET_3)
+		np->desc_ver = DESC_VER_1;
+	else
+		np->desc_ver = DESC_VER_2;
+
+	err = -ENOMEM;
+	dev->base_addr = (unsigned long) ioremap(addr, NV_PCI_REGSZ);
+	if (!dev->base_addr)
+		goto out_relreg;
+	dev->irq = pci_dev->irq;
+	np->rx_ring = pci_alloc_consistent(pci_dev, sizeof(struct ring_desc) * (RX_RING + TX_RING),
+						&np->ring_addr);
+	if (!np->rx_ring)
+		goto out_unmap;
+	np->tx_ring = &np->rx_ring[RX_RING];
+
+	dev->open = nv_open;
+	dev->stop = nv_close;
+	dev->hard_start_xmit = nv_start_xmit;
+	dev->get_stats = nv_get_stats;
+	dev->change_mtu = nv_change_mtu;
+	dev->set_multicast_list = nv_set_multicast;
+	dev->do_ioctl = nv_ioctl;
+	dev->tx_timeout = nv_tx_timeout;
+	dev->watchdog_timeo = NV_WATCHDOG_TIMEO;
+
+	pci_set_drvdata(pci_dev, dev);
+
+	/* read the mac address */
+	base = get_hwbase(dev);
+	np->orig_mac[0] = readl(base + NvRegMacAddrA);
+	np->orig_mac[1] = readl(base + NvRegMacAddrB);
+
+	dev->dev_addr[0] = (np->orig_mac[1] >>  8) & 0xff;
+	dev->dev_addr[1] = (np->orig_mac[1] >>  0) & 0xff;
+	dev->dev_addr[2] = (np->orig_mac[0] >> 24) & 0xff;
+	dev->dev_addr[3] = (np->orig_mac[0] >> 16) & 0xff;
+	dev->dev_addr[4] = (np->orig_mac[0] >>  8) & 0xff;
+	dev->dev_addr[5] = (np->orig_mac[0] >>  0) & 0xff;
+
+	if (!is_valid_ether_addr(dev->dev_addr)) {
+		/*
+		 * Bad mac address. At least one bios sets the mac address
+		 * to 01:23:45:67:89:ab
+		 */
+		printk(KERN_ERR "%s: Invalid Mac address detected: %02x:%02x:%02x:%02x:%02x:%02x\n",
+			pci_name(pci_dev),
+			dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
+			dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
+		printk(KERN_ERR "Please complain to your hardware vendor. Switching to a random MAC.\n");
+		dev->dev_addr[0] = 0x00;
+		dev->dev_addr[1] = 0x00;
+		dev->dev_addr[2] = 0x6c;
+		get_random_bytes(&dev->dev_addr[3], 3);
+	}
+
+	dprintk(KERN_DEBUG "%s: MAC Address %02x:%02x:%02x:%02x:%02x:%02x\n", pci_name(pci_dev),
+			dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
+			dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
+
+	/* disable WOL */
+	writel(0, base + NvRegWakeUpFlags);
+	np->wolenabled = 0;
+
+	if (np->desc_ver == DESC_VER_1) {
+		np->tx_flags = NV_TX_LASTPACKET|NV_TX_VALID;
+		if (id->driver_data & DEV_NEED_LASTPACKET1)
+			np->tx_flags |= NV_TX_LASTPACKET1;
+	} else {
+		np->tx_flags = NV_TX2_LASTPACKET|NV_TX2_VALID;
+		if (id->driver_data & DEV_NEED_LASTPACKET1)
+			np->tx_flags |= NV_TX2_LASTPACKET1;
+	}
+	if (id->driver_data & DEV_IRQMASK_1)
+		np->irqmask = NVREG_IRQMASK_WANTED_1;
+	if (id->driver_data & DEV_IRQMASK_2)
+		np->irqmask = NVREG_IRQMASK_WANTED_2;
+	if (id->driver_data & DEV_NEED_TIMERIRQ)
+		np->irqmask |= NVREG_IRQ_TIMER;
+	if (id->driver_data & DEV_NEED_LINKTIMER) {
+		dprintk(KERN_INFO "%s: link timer on.\n", pci_name(pci_dev));
+		np->need_linktimer = 1;
+		np->link_timeout = jiffies + LINK_TIMEOUT;
+	} else {
+		dprintk(KERN_INFO "%s: link timer off.\n", pci_name(pci_dev));
+		np->need_linktimer = 0;
+	}
+
+	/* find a suitable phy */
+	for (i = 1; i < 32; i++) {
+		int id1, id2;
+
+		spin_lock_irq(&np->lock);
+		id1 = mii_rw(dev, i, MII_PHYSID1, MII_READ);
+		spin_unlock_irq(&np->lock);
+		if (id1 < 0 || id1 == 0xffff)
+			continue;
+		spin_lock_irq(&np->lock);
+		id2 = mii_rw(dev, i, MII_PHYSID2, MII_READ);
+		spin_unlock_irq(&np->lock);
+		if (id2 < 0 || id2 == 0xffff)
+			continue;
+
+		id1 = (id1 & PHYID1_OUI_MASK) << PHYID1_OUI_SHFT;
+		id2 = (id2 & PHYID2_OUI_MASK) >> PHYID2_OUI_SHFT;
+		dprintk(KERN_DEBUG "%s: open: Found PHY %04x:%04x at address %d.\n",
+				pci_name(pci_dev), id1, id2, i);
+		np->phyaddr = i;
+		np->phy_oui = id1 | id2;
+		break;
+	}
+	if (i == 32) {
+		/* PHY in isolate mode? No phy attached and user wants to
+		 * test loopback? Very odd, but can be correct.
+		 */
+		printk(KERN_INFO "%s: open: Could not find a valid PHY.\n",
+				pci_name(pci_dev));
+	}
+
+	if (i != 32) {
+		/* reset it */
+		phy_init(dev);
+	}
+
+	err = register_netdev(dev);
+	if (err) {
+		printk(KERN_INFO "forcedeth: unable to register netdev: %d\n", err);
+		goto out_freering;
+	}
+	printk(KERN_INFO "%s: forcedeth.c: subsystem: %05x:%04x bound to %s\n",
+			dev->name, pci_dev->subsystem_vendor, pci_dev->subsystem_device,
+			pci_name(pci_dev));
+
+	return 0;
+
+out_freering:
+	pci_free_consistent(np->pci_dev, sizeof(struct ring_desc) * (RX_RING + TX_RING),
+				np->rx_ring, np->ring_addr);
+	pci_set_drvdata(pci_dev, NULL);
+out_unmap:
+	iounmap(get_hwbase(dev));
+out_relreg:
+	pci_release_regions(pci_dev);
+out_disable:
+	pci_disable_device(pci_dev);
+out_free:
+	free_netdev(dev);
+out:
+	return err;
+}
+
+static void __devexit nv_remove(struct pci_dev *pci_dev)
+{
+	struct net_device *dev = pci_get_drvdata(pci_dev);
+	struct fe_priv *np = get_nvpriv(dev);
+	u8 *base = get_hwbase(dev);
+
+	unregister_netdev(dev);
+
+	/* special op: write back the misordered MAC address - otherwise
+	 * the next nv_probe would see a wrong address.
+	 */
+	writel(np->orig_mac[0], base + NvRegMacAddrA);
+	writel(np->orig_mac[1], base + NvRegMacAddrB);
+
+	/* free all structures */
+	pci_free_consistent(np->pci_dev, sizeof(struct ring_desc) * (RX_RING + TX_RING), np->rx_ring, np->ring_addr);
+	iounmap(get_hwbase(dev));
+	pci_release_regions(pci_dev);
+	pci_disable_device(pci_dev);
+	free_netdev(dev);
+	pci_set_drvdata(pci_dev, NULL);
+}
+
+static struct pci_device_id pci_tbl[] = {
+	{	/* nForce Ethernet Controller */
+		.vendor = PCI_VENDOR_ID_NVIDIA,
+		.device = PCI_DEVICE_ID_NVIDIA_NVENET_1,
+		.subvendor = PCI_ANY_ID,
+		.subdevice = PCI_ANY_ID,
+		.driver_data = DEV_IRQMASK_1|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER,
+	},
+	{	/* nForce2 Ethernet Controller */
+		.vendor = PCI_VENDOR_ID_NVIDIA,
+		.device = PCI_DEVICE_ID_NVIDIA_NVENET_2,
+		.subvendor = PCI_ANY_ID,
+		.subdevice = PCI_ANY_ID,
+		.driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER,
+	},
+	{	/* nForce3 Ethernet Controller */
+		.vendor = PCI_VENDOR_ID_NVIDIA,
+		.device = PCI_DEVICE_ID_NVIDIA_NVENET_3,
+		.subvendor = PCI_ANY_ID,
+		.subdevice = PCI_ANY_ID,
+		.driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER,
+	},
+	{	/* nForce3 Ethernet Controller */
+		.vendor = PCI_VENDOR_ID_NVIDIA,
+		.device = PCI_DEVICE_ID_NVIDIA_NVENET_4,
+		.subvendor = PCI_ANY_ID,
+		.subdevice = PCI_ANY_ID,
+		.driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ,
+	},
+	{	/* nForce3 Ethernet Controller */
+		.vendor = PCI_VENDOR_ID_NVIDIA,
+		.device = PCI_DEVICE_ID_NVIDIA_NVENET_5,
+		.subvendor = PCI_ANY_ID,
+		.subdevice = PCI_ANY_ID,
+		.driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ,
+	},
+	{	/* nForce3 Ethernet Controller */
+		.vendor = PCI_VENDOR_ID_NVIDIA,
+		.device = PCI_DEVICE_ID_NVIDIA_NVENET_6,
+		.subvendor = PCI_ANY_ID,
+		.subdevice = PCI_ANY_ID,
+		.driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ,
+	},
+	{	/* nForce3 Ethernet Controller */
+		.vendor = PCI_VENDOR_ID_NVIDIA,
+		.device = PCI_DEVICE_ID_NVIDIA_NVENET_7,
+		.subvendor = PCI_ANY_ID,
+		.subdevice = PCI_ANY_ID,
+		.driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ,
+	},
+	{	/* CK804 Ethernet Controller */
+		.vendor = PCI_VENDOR_ID_NVIDIA,
+		.device = PCI_DEVICE_ID_NVIDIA_NVENET_8,
+		.subvendor = PCI_ANY_ID,
+		.subdevice = PCI_ANY_ID,
+		.driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ,
+	},
+	{	/* CK804 Ethernet Controller */
+		.vendor = PCI_VENDOR_ID_NVIDIA,
+		.device = PCI_DEVICE_ID_NVIDIA_NVENET_9,
+		.subvendor = PCI_ANY_ID,
+		.subdevice = PCI_ANY_ID,
+		.driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ,
+	},
+	{	/* MCP04 Ethernet Controller */
+		.vendor = PCI_VENDOR_ID_NVIDIA,
+		.device = PCI_DEVICE_ID_NVIDIA_NVENET_10,
+		.subvendor = PCI_ANY_ID,
+		.subdevice = PCI_ANY_ID,
+		.driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ,
+	},
+	{	/* MCP04 Ethernet Controller */
+		.vendor = PCI_VENDOR_ID_NVIDIA,
+		.device = PCI_DEVICE_ID_NVIDIA_NVENET_11,
+		.subvendor = PCI_ANY_ID,
+		.subdevice = PCI_ANY_ID,
+		.driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ,
+	},
+	{0,},
+};
+
+static struct pci_driver driver = {
+	.name = "forcedeth",
+	.id_table = pci_tbl,
+	.probe = nv_probe,
+	.remove = __devexit_p(nv_remove),
+};
+
+
+static int __init init_nic(void)
+{
+	printk(KERN_INFO "forcedeth.c: Reverse Engineered nForce ethernet driver. Version %s.\n", FORCEDETH_VERSION);
+	return pci_module_init(&driver);
+}
+
+static void __exit exit_nic(void)
+{
+	pci_unregister_driver(&driver);
+}
+
+MODULE_PARM(max_interrupt_work, "i");
+MODULE_PARM_DESC(max_interrupt_work, "forcedeth maximum events handled per interrupt");
+
+MODULE_AUTHOR("Manfred Spraul <manfred@colorfullife.com>");
+MODULE_DESCRIPTION("Reverse Engineered nForce ethernet driver");
+MODULE_LICENSE("GPL");
+
+MODULE_DEVICE_TABLE(pci, pci_tbl);
+
+module_init(init_nic);
+module_exit(exit_nic);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/ixgb/LICENSE linux-2.4.20-wolk4.16-fullkernel/drivers/net/ixgb/LICENSE
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/ixgb/LICENSE	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/ixgb/LICENSE	2004-09-09 13:21:58.000000000 +0200
@@ -0,0 +1,339 @@
+
+"This software program is licensed subject to the GNU General Public License 
+(GPL). Version 2, June 1991, available at 
+<http://www.fsf.org/copyleft/gpl.html>"
+
+GNU General Public License 
+
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.  
+59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+
+Everyone is permitted to copy and distribute verbatim copies of this license
+document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to 
+share and change it. By contrast, the GNU General Public License is intended
+to guarantee your freedom to share and change free software--to make sure 
+the software is free for all its users. This General Public License applies 
+to most of the Free Software Foundation's software and to any other program 
+whose authors commit to using it. (Some other Free Software Foundation 
+software is covered by the GNU Library General Public License instead.) You 
+can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our
+General Public Licenses are designed to make sure that you have the freedom 
+to distribute copies of free software (and charge for this service if you 
+wish), that you receive source code or can get it if you want it, that you 
+can change the software or use pieces of it in new free programs; and that 
+you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to 
+deny you these rights or to ask you to surrender the rights. These 
+restrictions translate to certain responsibilities for you if you distribute
+copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or 
+for a fee, you must give the recipients all the rights that you have. You 
+must make sure that they, too, receive or can get the source code. And you 
+must show them these terms so they know their rights.
+ 
+We protect your rights with two steps: (1) copyright the software, and (2) 
+offer you this license which gives you legal permission to copy, distribute 
+and/or modify the software. 
+
+Also, for each author's protection and ours, we want to make certain that 
+everyone understands that there is no warranty for this free software. If 
+the software is modified by someone else and passed on, we want its 
+recipients to know that what they have is not the original, so that any 
+problems introduced by others will not reflect on the original authors' 
+reputations. 
+
+Finally, any free program is threatened constantly by software patents. We 
+wish to avoid the danger that redistributors of a free program will 
+individually obtain patent licenses, in effect making the program 
+proprietary. To prevent this, we have made it clear that any patent must be 
+licensed for everyone's free use or not licensed at all. 
+
+The precise terms and conditions for copying, distribution and modification 
+follow. 
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a notice
+   placed by the copyright holder saying it may be distributed under the 
+   terms of this General Public License. The "Program", below, refers to any
+   such program or work, and a "work based on the Program" means either the 
+   Program or any derivative work under copyright law: that is to say, a 
+   work containing the Program or a portion of it, either verbatim or with 
+   modifications and/or translated into another language. (Hereinafter, 
+   translation is included without limitation in the term "modification".) 
+   Each licensee is addressed as "you". 
+
+   Activities other than copying, distribution and modification are not 
+   covered by this License; they are outside its scope. The act of running 
+   the Program is not restricted, and the output from the Program is covered 
+   only if its contents constitute a work based on the Program (independent 
+   of having been made by running the Program). Whether that is true depends
+   on what the Program does. 
+
+1. You may copy and distribute verbatim copies of the Program's source code 
+   as you receive it, in any medium, provided that you conspicuously and 
+   appropriately publish on each copy an appropriate copyright notice and 
+   disclaimer of warranty; keep intact all the notices that refer to this 
+   License and to the absence of any warranty; and give any other recipients 
+   of the Program a copy of this License along with the Program. 
+
+   You may charge a fee for the physical act of transferring a copy, and you 
+   may at your option offer warranty protection in exchange for a fee. 
+
+2. You may modify your copy or copies of the Program or any portion of it, 
+   thus forming a work based on the Program, and copy and distribute such 
+   modifications or work under the terms of Section 1 above, provided that 
+   you also meet all of these conditions: 
+
+   * a) You must cause the modified files to carry prominent notices stating 
+        that you changed the files and the date of any change. 
+
+   * b) You must cause any work that you distribute or publish, that in 
+        whole or in part contains or is derived from the Program or any part 
+        thereof, to be licensed as a whole at no charge to all third parties
+        under the terms of this License. 
+
+   * c) If the modified program normally reads commands interactively when 
+        run, you must cause it, when started running for such interactive 
+        use in the most ordinary way, to print or display an announcement 
+        including an appropriate copyright notice and a notice that there is
+        no warranty (or else, saying that you provide a warranty) and that 
+        users may redistribute the program under these conditions, and 
+        telling the user how to view a copy of this License. (Exception: if 
+        the Program itself is interactive but does not normally print such 
+        an announcement, your work based on the Program is not required to 
+        print an announcement.) 
+
+   These requirements apply to the modified work as a whole. If identifiable 
+   sections of that work are not derived from the Program, and can be 
+   reasonably considered independent and separate works in themselves, then 
+   this License, and its terms, do not apply to those sections when you 
+   distribute them as separate works. But when you distribute the same 
+   sections as part of a whole which is a work based on the Program, the 
+   distribution of the whole must be on the terms of this License, whose 
+   permissions for other licensees extend to the entire whole, and thus to 
+   each and every part regardless of who wrote it. 
+
+   Thus, it is not the intent of this section to claim rights or contest 
+   your rights to work written entirely by you; rather, the intent is to 
+   exercise the right to control the distribution of derivative or 
+   collective works based on the Program. 
+
+   In addition, mere aggregation of another work not based on the Program 
+   with the Program (or with a work based on the Program) on a volume of a 
+   storage or distribution medium does not bring the other work under the 
+   scope of this License. 
+
+3. You may copy and distribute the Program (or a work based on it, under 
+   Section 2) in object code or executable form under the terms of Sections 
+   1 and 2 above provided that you also do one of the following: 
+
+   * a) Accompany it with the complete corresponding machine-readable source 
+        code, which must be distributed under the terms of Sections 1 and 2 
+        above on a medium customarily used for software interchange; or, 
+
+   * b) Accompany it with a written offer, valid for at least three years, 
+        to give any third party, for a charge no more than your cost of 
+        physically performing source distribution, a complete machine-
+        readable copy of the corresponding source code, to be distributed 
+        under the terms of Sections 1 and 2 above on a medium customarily 
+        used for software interchange; or, 
+
+   * c) Accompany it with the information you received as to the offer to 
+        distribute corresponding source code. (This alternative is allowed 
+        only for noncommercial distribution and only if you received the 
+        program in object code or executable form with such an offer, in 
+        accord with Subsection b above.) 
+
+   The source code for a work means the preferred form of the work for 
+   making modifications to it. For an executable work, complete source code 
+   means all the source code for all modules it contains, plus any 
+   associated interface definition files, plus the scripts used to control 
+   compilation and installation of the executable. However, as a special 
+   exception, the source code distributed need not include anything that is 
+   normally distributed (in either source or binary form) with the major 
+   components (compiler, kernel, and so on) of the operating system on which
+   the executable runs, unless that component itself accompanies the 
+   executable. 
+
+   If distribution of executable or object code is made by offering access 
+   to copy from a designated place, then offering equivalent access to copy 
+   the source code from the same place counts as distribution of the source 
+   code, even though third parties are not compelled to copy the source 
+   along with the object code. 
+
+4. You may not copy, modify, sublicense, or distribute the Program except as
+   expressly provided under this License. Any attempt otherwise to copy, 
+   modify, sublicense or distribute the Program is void, and will 
+   automatically terminate your rights under this License. However, parties 
+   who have received copies, or rights, from you under this License will not
+   have their licenses terminated so long as such parties remain in full 
+   compliance. 
+
+5. You are not required to accept this License, since you have not signed 
+   it. However, nothing else grants you permission to modify or distribute 
+   the Program or its derivative works. These actions are prohibited by law 
+   if you do not accept this License. Therefore, by modifying or 
+   distributing the Program (or any work based on the Program), you 
+   indicate your acceptance of this License to do so, and all its terms and
+   conditions for copying, distributing or modifying the Program or works 
+   based on it. 
+
+6. Each time you redistribute the Program (or any work based on the 
+   Program), the recipient automatically receives a license from the 
+   original licensor to copy, distribute or modify the Program subject to 
+   these terms and conditions. You may not impose any further restrictions 
+   on the recipients' exercise of the rights granted herein. You are not 
+   responsible for enforcing compliance by third parties to this License. 
+
+7. If, as a consequence of a court judgment or allegation of patent 
+   infringement or for any other reason (not limited to patent issues), 
+   conditions are imposed on you (whether by court order, agreement or 
+   otherwise) that contradict the conditions of this License, they do not 
+   excuse you from the conditions of this License. If you cannot distribute 
+   so as to satisfy simultaneously your obligations under this License and 
+   any other pertinent obligations, then as a consequence you may not 
+   distribute the Program at all. For example, if a patent license would 
+   not permit royalty-free redistribution of the Program by all those who 
+   receive copies directly or indirectly through you, then the only way you 
+   could satisfy both it and this License would be to refrain entirely from 
+   distribution of the Program. 
+
+   If any portion of this section is held invalid or unenforceable under any
+   particular circumstance, the balance of the section is intended to apply
+   and the section as a whole is intended to apply in other circumstances. 
+
+   It is not the purpose of this section to induce you to infringe any 
+   patents or other property right claims or to contest validity of any 
+   such claims; this section has the sole purpose of protecting the 
+   integrity of the free software distribution system, which is implemented 
+   by public license practices. Many people have made generous contributions
+   to the wide range of software distributed through that system in 
+   reliance on consistent application of that system; it is up to the 
+   author/donor to decide if he or she is willing to distribute software 
+   through any other system and a licensee cannot impose that choice. 
+
+   This section is intended to make thoroughly clear what is believed to be 
+   a consequence of the rest of this License. 
+
+8. If the distribution and/or use of the Program is restricted in certain 
+   countries either by patents or by copyrighted interfaces, the original 
+   copyright holder who places the Program under this License may add an 
+   explicit geographical distribution limitation excluding those countries, 
+   so that distribution is permitted only in or among countries not thus 
+   excluded. In such case, this License incorporates the limitation as if 
+   written in the body of this License. 
+
+9. The Free Software Foundation may publish revised and/or new versions of 
+   the General Public License from time to time. Such new versions will be 
+   similar in spirit to the present version, but may differ in detail to 
+   address new problems or concerns. 
+
+   Each version is given a distinguishing version number. If the Program 
+   specifies a version number of this License which applies to it and "any 
+   later version", you have the option of following the terms and 
+   conditions either of that version or of any later version published by 
+   the Free Software Foundation. If the Program does not specify a version 
+   number of this License, you may choose any version ever published by the 
+   Free Software Foundation. 
+
+10. If you wish to incorporate parts of the Program into other free programs
+    whose distribution conditions are different, write to the author to ask 
+    for permission. For software which is copyrighted by the Free Software 
+    Foundation, write to the Free Software Foundation; we sometimes make 
+    exceptions for this. Our decision will be guided by the two goals of 
+    preserving the free status of all derivatives of our free software and 
+    of promoting the sharing and reuse of software generally. 
+
+   NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY 
+    FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN 
+    OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES 
+    PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER 
+    EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE 
+    ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH 
+    YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL 
+    NECESSARY SERVICING, REPAIR OR CORRECTION. 
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING 
+    WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR 
+    REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR 
+    DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL 
+    DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM 
+    (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED 
+    INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF 
+    THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR 
+    OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest 
+possible use to the public, the best way to achieve this is to make it free 
+software which everyone can redistribute and change under these terms. 
+
+To do so, attach the following notices to the program. It is safest to 
+attach them to the start of each source file to most effectively convey the
+exclusion of warranty; and each file should have at least the "copyright" 
+line and a pointer to where the full notice is found. 
+
+one line to give the program's name and an idea of what it does.
+Copyright (C) yyyy  name of author
+
+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  02111-1307, USA.
+
+Also add information on how to contact you by electronic and paper mail. 
+
+If the program is interactive, make it output a short notice like this when 
+it starts in an interactive mode: 
+
+Gnomovision version 69, Copyright (C) year name of author Gnomovision comes 
+with ABSOLUTELY NO WARRANTY; for details type 'show w'.  This is free 
+software, and you are welcome to redistribute it under certain conditions; 
+type 'show c' for details.
+
+The hypothetical commands 'show w' and 'show c' should show the appropriate 
+parts of the General Public License. Of course, the commands you use may be 
+called something other than 'show w' and 'show c'; they could even be 
+mouse-clicks or menu items--whatever suits your program. 
+
+You should also get your employer (if you work as a programmer) or your 
+school, if any, to sign a "copyright disclaimer" for the program, if 
+necessary. Here is a sample; alter the names: 
+
+Yoyodyne, Inc., hereby disclaims all copyright interest in the program 
+'Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+signature of Ty Coon, 1 April 1989
+Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into 
+proprietary programs. If your program is a subroutine library, you may 
+consider it more useful to permit linking proprietary applications with the 
+library. If this is what you want to do, use the GNU Library General Public 
+License instead of this License.
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/ixgb/Makefile linux-2.4.20-wolk4.16-fullkernel/drivers/net/ixgb/Makefile
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/ixgb/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/ixgb/Makefile	2004-09-09 13:21:58.000000000 +0200
@@ -0,0 +1,38 @@
+################################################################################
+#
+# 
+# Copyright(c) 1999 - 2002 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 
+# 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  02111-1307, USA.
+# 
+# The full GNU General Public License is included in this distribution in the
+# file called LICENSE.
+# 
+# Contact Information:
+# Linux NICS <linux.nics@intel.com>
+# Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+#
+################################################################################
+
+#
+# Makefile for the Intel(R) PRO/10GbE driver
+#
+
+O_TARGET := ixgb.o
+
+obj-y	:= ixgb_main.o ixgb_hw.o ixgb_ee.o ixgb_ethtool.o ixgb_param.o
+obj-m	:= $(O_TARGET)
+
+include $(TOPDIR)/Rules.make
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/ixgb/ixgb.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/ixgb/ixgb.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/ixgb/ixgb.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/ixgb/ixgb.h	2004-09-09 13:21:58.000000000 +0200
@@ -0,0 +1,196 @@
+/*******************************************************************************
+
+  
+  Copyright(c) 1999 - 2004 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 
+  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  02111-1307, USA.
+  
+  The full GNU General Public License is included in this distribution in the
+  file called LICENSE.
+  
+  Contact Information:
+  Linux NICS <linux.nics@intel.com>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+*******************************************************************************/
+
+#ifndef _IXGB_H_
+#define _IXGB_H_
+
+#include <linux/stddef.h>
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <asm/byteorder.h>
+#include <linux/init.h>
+#include <linux/mm.h>
+#include <linux/errno.h>
+#include <linux/ioport.h>
+#include <linux/pci.h>
+#include <linux/kernel.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/skbuff.h>
+#include <linux/delay.h>
+#include <linux/timer.h>
+#include <linux/slab.h>
+#include <linux/interrupt.h>
+#include <linux/string.h>
+#include <linux/pagemap.h>
+#include <asm/bitops.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <linux/capability.h>
+#include <linux/in.h>
+#include <linux/ip.h>
+#include <linux/tcp.h>
+#include <linux/udp.h>
+#include <net/pkt_sched.h>
+#include <linux/list.h>
+#include <linux/reboot.h>
+#ifdef NETIF_F_TSO
+#include <net/checksum.h>
+#endif
+
+#ifdef SIOCETHTOOL
+#include <linux/ethtool.h>
+#endif
+#ifdef NETIF_F_HW_VLAN_TX
+#include <linux/if_vlan.h>
+#endif
+
+#define BAR_0		0
+#define BAR_1		1
+#define BAR_5		5
+#define PCI_DMA_64BIT	0xffffffffffffffffULL
+#define PCI_DMA_32BIT	0x00000000ffffffffULL
+
+#include "kcompat.h"
+
+struct ixgb_adapter;
+#include "ixgb_hw.h"
+#include "ixgb_ee.h"
+#include "ixgb_ids.h"
+
+
+#if _DEBUG_DRIVER_
+#define IXGB_DBG(args...) printk(KERN_DEBUG "ixgb: " args)
+#else
+#define IXGB_DBG(args...)
+#endif
+
+#define IXGB_ERR(args...) printk(KERN_ERR "ixgb: " args)
+
+/* Supported Rx Buffer Sizes */
+#define IXGB_RXBUFFER_2048  2048
+#define IXGB_RXBUFFER_4096  4096
+#define IXGB_RXBUFFER_8192  8192
+#define IXGB_RXBUFFER_16384 16384
+
+/* How many Tx Descriptors do we need to call netif_wake_queue? */
+#define IXGB_TX_QUEUE_WAKE 16
+
+/* How many Rx Buffers do we bundle into one write to the hardware ? */
+#define IXGB_RX_BUFFER_WRITE	16	/* Must be power of 2 */
+
+/* only works for sizes that are powers of 2 */
+#define IXGB_ROUNDUP(i, size) ((i) = (((i) + (size) - 1) & ~((size) - 1)))
+
+/* wrapper around a pointer to a socket buffer,
+ * so a DMA handle can be stored along with the buffer */
+struct ixgb_buffer {
+	struct sk_buff *skb;
+	uint64_t dma;
+	unsigned long length;
+	unsigned long time_stamp;
+	unsigned int next_to_watch;
+};
+
+struct ixgb_desc_ring {
+	/* pointer to the descriptor ring memory */
+	void *desc;
+	/* physical address of the descriptor ring */
+	dma_addr_t dma;
+	/* length of descriptor ring in bytes */
+	unsigned int size;
+	/* number of descriptors in the ring */
+	unsigned int count;
+	/* next descriptor to associate a buffer with */
+	unsigned int next_to_use;
+	/* next descriptor to check for DD status bit */
+	unsigned int next_to_clean;
+	/* array of buffer information structs */
+	struct ixgb_buffer *buffer_info;
+};
+
+#define IXGB_DESC_UNUSED(R) \
+	((((R)->next_to_clean > (R)->next_to_use) ? 0 : (R)->count) + \
+	(R)->next_to_clean - (R)->next_to_use - 1)
+
+#define IXGB_GET_DESC(R, i, type)	(&(((struct type *)((R).desc))[i]))
+#define IXGB_RX_DESC(R, i)		IXGB_GET_DESC(R, i, ixgb_rx_desc)
+#define IXGB_TX_DESC(R, i)		IXGB_GET_DESC(R, i, ixgb_tx_desc)
+#define IXGB_CONTEXT_DESC(R, i)	IXGB_GET_DESC(R, i, ixgb_context_desc)
+
+/* board specific private data structure */
+
+struct ixgb_adapter {
+        struct timer_list watchdog_timer;
+        struct list_head proc_list_head;
+#ifdef NETIF_F_HW_VLAN_TX
+	struct vlan_group *vlgrp;
+#endif
+	uint32_t bd_number;
+	uint32_t rx_buffer_len;
+	uint32_t part_num;
+        uint16_t link_speed;
+        uint16_t link_duplex;
+	spinlock_t tx_lock;
+        atomic_t irq_sem;
+        struct work_struct tx_timeout_task;
+
+#ifdef ETHTOOL_PHYS_ID
+	struct timer_list blink_timer;
+	unsigned long led_status;
+#endif
+
+	/* TX */
+	struct ixgb_desc_ring tx_ring;
+        unsigned long timeo_start;
+        uint32_t tx_cmd_type;
+        uint64_t hw_csum_tx_good;
+        uint64_t hw_csum_tx_error;
+        uint32_t tx_int_delay;
+        boolean_t tx_int_delay_enable;
+
+	/* RX */
+	struct ixgb_desc_ring rx_ring;
+	uint64_t hw_csum_rx_error;
+	uint64_t hw_csum_rx_good;
+	uint32_t rx_int_delay;
+	boolean_t raidc;
+	boolean_t rx_csum;
+
+	/* OS defined structs */
+	struct net_device *netdev;
+	struct pci_dev *pdev;
+	struct net_device_stats net_stats;
+
+	/* structs defined in ixgb_hw.h */
+	struct ixgb_hw hw;
+	struct ixgb_hw_stats stats;
+	uint32_t pci_state[16];
+};
+#endif /* _IXGB_H_ */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/ixgb/ixgb_ee.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/ixgb/ixgb_ee.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/ixgb/ixgb_ee.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/ixgb/ixgb_ee.c	2004-09-09 13:21:58.000000000 +0200
@@ -0,0 +1,774 @@
+/*******************************************************************************
+
+  
+  Copyright(c) 1999 - 2004 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 
+  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  02111-1307, USA.
+  
+  The full GNU General Public License is included in this distribution in the
+  file called LICENSE.
+  
+  Contact Information:
+  Linux NICS <linux.nics@intel.com>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+*******************************************************************************/
+
+
+#include "ixgb_hw.h"
+#include "ixgb_ee.h"
+/* Local prototypes */
+static uint16_t ixgb_shift_in_bits(struct ixgb_hw *hw);
+
+static void ixgb_shift_out_bits(struct ixgb_hw *hw,
+                                uint16_t data,
+                                uint16_t count);
+static void ixgb_standby_eeprom(struct ixgb_hw *hw);
+
+static boolean_t ixgb_wait_eeprom_command(struct ixgb_hw *hw);
+
+static void ixgb_cleanup_eeprom(struct ixgb_hw *hw);
+
+/******************************************************************************
+ * Raises the EEPROM's clock input.
+ *
+ * hw - Struct containing variables accessed by shared code
+ * eecd_reg - EECD's current value
+ *****************************************************************************/
+static void
+ixgb_raise_clock(struct ixgb_hw *hw,
+                  uint32_t *eecd_reg)
+{
+    /* Raise the clock input to the EEPROM (by setting the SK bit), and then
+     *  wait 50 microseconds.
+     */
+    *eecd_reg = *eecd_reg | IXGB_EECD_SK;
+    IXGB_WRITE_REG(hw, EECD, *eecd_reg);
+    usec_delay(50);
+    return;
+}
+
+/******************************************************************************
+ * Lowers the EEPROM's clock input.
+ *
+ * hw - Struct containing variables accessed by shared code
+ * eecd_reg - EECD's current value
+ *****************************************************************************/
+static void
+ixgb_lower_clock(struct ixgb_hw *hw,
+                  uint32_t *eecd_reg)
+{
+    /* Lower the clock input to the EEPROM (by clearing the SK bit), and then
+     * wait 50 microseconds.
+     */
+    *eecd_reg = *eecd_reg & ~IXGB_EECD_SK;
+    IXGB_WRITE_REG(hw, EECD, *eecd_reg);
+    usec_delay(50);
+    return;
+}
+
+/******************************************************************************
+ * Shift data bits out to the EEPROM.
+ *
+ * hw - Struct containing variables accessed by shared code
+ * data - data to send to the EEPROM
+ * count - number of bits to shift out
+ *****************************************************************************/
+static void
+ixgb_shift_out_bits(struct ixgb_hw *hw,
+                     uint16_t data,
+                     uint16_t count)
+{
+    uint32_t eecd_reg;
+    uint32_t mask;
+
+    /* We need to shift "count" bits out to the EEPROM. So, value in the
+     * "data" parameter will be shifted out to the EEPROM one bit at a time.
+     * In order to do this, "data" must be broken down into bits.
+     */
+    mask = 0x01 << (count - 1);
+    eecd_reg = IXGB_READ_REG(hw, EECD);
+    eecd_reg &= ~(IXGB_EECD_DO | IXGB_EECD_DI);
+    do {
+        /* A "1" is shifted out to the EEPROM by setting bit "DI" to a "1",
+         * and then raising and then lowering the clock (the SK bit controls
+         * the clock input to the EEPROM).  A "0" is shifted out to the EEPROM
+         * by setting "DI" to "0" and then raising and then lowering the clock.
+         */
+        eecd_reg &= ~IXGB_EECD_DI;
+
+        if(data & mask)
+            eecd_reg |= IXGB_EECD_DI;
+
+        IXGB_WRITE_REG(hw, EECD, eecd_reg);
+
+        usec_delay(50);
+
+        ixgb_raise_clock(hw, &eecd_reg);
+        ixgb_lower_clock(hw, &eecd_reg);
+
+        mask = mask >> 1;
+
+    } while(mask);
+
+    /* We leave the "DI" bit set to "0" when we leave this routine. */
+    eecd_reg &= ~IXGB_EECD_DI;
+    IXGB_WRITE_REG(hw, EECD, eecd_reg);
+    return;
+}
+
+/******************************************************************************
+ * Shift data bits in from the EEPROM
+ *
+ * hw - Struct containing variables accessed by shared code
+ *****************************************************************************/
+static uint16_t
+ixgb_shift_in_bits(struct ixgb_hw *hw)
+{
+    uint32_t eecd_reg;
+    uint32_t i;
+    uint16_t data;
+
+    /* In order to read a register from the EEPROM, we need to shift 16 bits
+     * in from the EEPROM. Bits are "shifted in" by raising the clock input to
+     * the EEPROM (setting the SK bit), and then reading the value of the "DO"
+     * bit.  During this "shifting in" process the "DI" bit should always be
+     * clear..
+     */
+
+    eecd_reg = IXGB_READ_REG(hw, EECD);
+
+    eecd_reg &= ~(IXGB_EECD_DO | IXGB_EECD_DI);
+    data = 0;
+
+    for(i = 0; i < 16; i++) {
+        data = data << 1;
+        ixgb_raise_clock(hw, &eecd_reg);
+
+        eecd_reg = IXGB_READ_REG(hw, EECD);
+
+        eecd_reg &= ~(IXGB_EECD_DI);
+        if(eecd_reg & IXGB_EECD_DO)
+            data |= 1;
+
+        ixgb_lower_clock(hw, &eecd_reg);
+    }
+
+    return data;
+}
+
+/******************************************************************************
+ * Prepares EEPROM for access
+ *
+ * hw - Struct containing variables accessed by shared code
+ *
+ * Lowers EEPROM clock. Clears input pin. Sets the chip select pin. This
+ * function should be called before issuing a command to the EEPROM.
+ *****************************************************************************/
+static void
+ixgb_setup_eeprom(struct ixgb_hw *hw)
+{
+    uint32_t eecd_reg;
+
+    eecd_reg = IXGB_READ_REG(hw, EECD);
+
+    /*  Clear SK and DI  */
+    eecd_reg &= ~(IXGB_EECD_SK | IXGB_EECD_DI);
+    IXGB_WRITE_REG(hw, EECD, eecd_reg);
+
+    /*  Set CS  */
+    eecd_reg |= IXGB_EECD_CS;
+    IXGB_WRITE_REG(hw, EECD, eecd_reg);
+    return;
+}
+
+/******************************************************************************
+ * Returns EEPROM to a "standby" state
+ *
+ * hw - Struct containing variables accessed by shared code
+ *****************************************************************************/
+static void
+ixgb_standby_eeprom(struct ixgb_hw *hw)
+{
+    uint32_t eecd_reg;
+
+    eecd_reg = IXGB_READ_REG(hw, EECD);
+
+    /*  Deselct EEPROM  */
+    eecd_reg &= ~(IXGB_EECD_CS | IXGB_EECD_SK);
+    IXGB_WRITE_REG(hw, EECD, eecd_reg);
+    usec_delay(50);
+
+    /*  Clock high  */
+    eecd_reg |= IXGB_EECD_SK;
+    IXGB_WRITE_REG(hw, EECD, eecd_reg);
+    usec_delay(50);
+
+    /*  Select EEPROM  */
+    eecd_reg |= IXGB_EECD_CS;
+    IXGB_WRITE_REG(hw, EECD, eecd_reg);
+    usec_delay(50);
+
+    /*  Clock low  */
+    eecd_reg &= ~IXGB_EECD_SK;
+    IXGB_WRITE_REG(hw, EECD, eecd_reg);
+    usec_delay(50);
+    return;
+}
+
+/******************************************************************************
+ * Raises then lowers the EEPROM's clock pin
+ *
+ * hw - Struct containing variables accessed by shared code
+ *****************************************************************************/
+static void
+ixgb_clock_eeprom(struct ixgb_hw *hw)
+{
+    uint32_t eecd_reg;
+
+    eecd_reg = IXGB_READ_REG(hw, EECD);
+
+    /*  Rising edge of clock  */
+    eecd_reg |= IXGB_EECD_SK;
+    IXGB_WRITE_REG(hw, EECD, eecd_reg);
+    usec_delay(50);
+
+    /*  Falling edge of clock  */
+    eecd_reg &= ~IXGB_EECD_SK;
+    IXGB_WRITE_REG(hw, EECD, eecd_reg);
+    usec_delay(50);
+    return;
+}
+
+/******************************************************************************
+ * Terminates a command by lowering the EEPROM's chip select pin
+ *
+ * hw - Struct containing variables accessed by shared code
+ *****************************************************************************/
+static void
+ixgb_cleanup_eeprom(struct ixgb_hw *hw)
+{
+    uint32_t eecd_reg;
+
+    eecd_reg = IXGB_READ_REG(hw, EECD);
+
+    eecd_reg &= ~(IXGB_EECD_CS | IXGB_EECD_DI);
+
+    IXGB_WRITE_REG(hw, EECD, eecd_reg);
+
+    ixgb_clock_eeprom(hw);
+    return;
+}
+
+/******************************************************************************
+ * Waits for the EEPROM to finish the current command.
+ *
+ * hw - Struct containing variables accessed by shared code
+ *
+ * The command is done when the EEPROM's data out pin goes high.
+ *
+ * Returns:
+ *      TRUE: EEPROM data pin is high before timeout.
+ *      FALSE:  Time expired.
+ *****************************************************************************/
+static boolean_t
+ixgb_wait_eeprom_command(struct ixgb_hw *hw)
+{
+    uint32_t eecd_reg;
+    uint32_t i;
+
+
+    /* Toggle the CS line.  This in effect tells to EEPROM to actually execute
+     * the command in question.
+     */
+    ixgb_standby_eeprom(hw);
+
+    /* Now read DO repeatedly until is high (equal to '1').  The EEEPROM will
+     * signal that the command has been completed by raising the DO signal.
+     * If DO does not go high in 10 milliseconds, then error out.
+     */
+    for(i = 0; i < 200; i++) {
+        eecd_reg = IXGB_READ_REG(hw, EECD);
+
+        if(eecd_reg & IXGB_EECD_DO)
+            return (TRUE);
+
+        usec_delay(50);
+    }
+    ASSERT(0);
+    return (FALSE);
+}
+
+
+/******************************************************************************
+ * Verifies that the EEPROM has a valid checksum
+ *
+ * hw - Struct containing variables accessed by shared code
+ *
+ * Reads the first 64 16 bit words of the EEPROM and sums the values read.
+ * If the the sum of the 64 16 bit words is 0xBABA, the EEPROM's checksum is
+ * valid.
+ *
+ * Returns:
+ *  TRUE: Checksum is valid
+ *  FALSE: Checksum is not valid.
+ *****************************************************************************/
+boolean_t
+ixgb_validate_eeprom_checksum(struct ixgb_hw *hw)
+{
+    uint16_t checksum = 0;
+    uint16_t i;
+
+    for(i = 0; i < (EEPROM_CHECKSUM_REG + 1); i++)
+        checksum += ixgb_read_eeprom(hw, i);
+
+    if(checksum == (uint16_t) EEPROM_SUM)
+        return (TRUE);
+    else
+        return (FALSE);
+}
+
+/******************************************************************************
+ * Calculates the EEPROM checksum and writes it to the EEPROM
+ *
+ * hw - Struct containing variables accessed by shared code
+ *
+ * Sums the first 63 16 bit words of the EEPROM. Subtracts the sum from 0xBABA.
+ * Writes the difference to word offset 63 of the EEPROM.
+ *****************************************************************************/
+void
+ixgb_update_eeprom_checksum(struct ixgb_hw *hw)
+{
+    uint16_t checksum = 0;
+    uint16_t i;
+
+    for(i = 0; i < EEPROM_CHECKSUM_REG; i++)
+        checksum += ixgb_read_eeprom(hw, i);
+
+    checksum = (uint16_t) EEPROM_SUM - checksum;
+
+    ixgb_write_eeprom(hw, EEPROM_CHECKSUM_REG, checksum);
+    return;
+}
+
+/******************************************************************************
+ * Writes a 16 bit word to a given offset in the EEPROM.
+ *
+ * hw - Struct containing variables accessed by shared code
+ * reg - offset within the EEPROM to be written to
+ * data - 16 bit word to be writen to the EEPROM
+ *
+ * If ixgb_update_eeprom_checksum is not called after this function, the
+ * EEPROM will most likely contain an invalid checksum.
+ *
+ *****************************************************************************/
+void
+ixgb_write_eeprom(struct ixgb_hw *hw,
+                   uint16_t offset,
+                   uint16_t data)
+{
+    /*  Prepare the EEPROM for writing  */
+    ixgb_setup_eeprom(hw);
+
+    /*  Send the 9-bit EWEN (write enable) command to the EEPROM (5-bit opcode
+     *  plus 4-bit dummy).  This puts the EEPROM into write/erase mode.
+     */
+    ixgb_shift_out_bits(hw, EEPROM_EWEN_OPCODE, 5);
+    ixgb_shift_out_bits(hw, 0, 4);
+
+    /*  Prepare the EEPROM  */
+    ixgb_standby_eeprom(hw);
+
+    /*  Send the Write command (3-bit opcode + 6-bit addr)  */
+    ixgb_shift_out_bits(hw, EEPROM_WRITE_OPCODE, 3);
+    ixgb_shift_out_bits(hw, offset, 6);
+
+    /*  Send the data  */
+    ixgb_shift_out_bits(hw, data, 16);
+
+    ixgb_wait_eeprom_command(hw);
+
+    /*  Recover from write  */
+    ixgb_standby_eeprom(hw);
+
+    /* Send the 9-bit EWDS (write disable) command to the EEPROM (5-bit
+     * opcode plus 4-bit dummy).  This takes the EEPROM out of write/erase
+     * mode.
+     */
+    ixgb_shift_out_bits(hw, EEPROM_EWDS_OPCODE, 5);
+    ixgb_shift_out_bits(hw, 0, 4);
+
+    /*  Done with writing  */
+    ixgb_cleanup_eeprom(hw);
+
+    return;
+}
+
+/******************************************************************************
+ * Reads a 16 bit word from the EEPROM.
+ *
+ * hw - Struct containing variables accessed by shared code
+ * offset - offset of 16 bit word in the EEPROM to read
+ *
+ * Returns:
+ *  The 16-bit value read from the eeprom
+ *****************************************************************************/
+uint16_t
+ixgb_read_eeprom(struct ixgb_hw *hw,
+                  uint16_t offset)
+{
+    uint16_t data;
+
+    /*  Prepare the EEPROM for reading  */
+    ixgb_setup_eeprom(hw);
+
+    /*  Send the READ command (opcode + addr)  */
+    ixgb_shift_out_bits(hw, EEPROM_READ_OPCODE, 3);
+    /*
+     * We have a 64 word EEPROM, there are 6 address bits
+     */
+    ixgb_shift_out_bits(hw, offset, 6);
+
+    /*  Read the data  */
+    data = ixgb_shift_in_bits(hw);
+
+    /*  End this read operation  */
+    ixgb_standby_eeprom(hw);
+
+    return (data);
+}
+
+/******************************************************************************
+ * Reads eeprom and stores data in shared structure.
+ * Validates eeprom checksum and eeprom signature.
+ *
+ * hw - Struct containing variables accessed by shared code
+ *
+ * Returns:
+ *      TRUE: if eeprom read is successful
+ *      FALSE: otherwise.
+ *****************************************************************************/
+boolean_t
+ixgb_get_eeprom_data(struct ixgb_hw *hw)
+{
+    uint16_t i;
+    uint16_t checksum = 0;
+    struct ixgb_ee_map_type *ee_map;
+
+    DEBUGFUNC("ixgb_get_eeprom_data");
+
+    ee_map = (struct ixgb_ee_map_type *) hw->eeprom;
+
+    DEBUGOUT("ixgb_ee: Reading eeprom data\n");
+    for (i=0; i < IXGB_EEPROM_SIZE ; i++) {
+        uint16_t ee_data;
+        ee_data = ixgb_read_eeprom(hw, i);
+        checksum += ee_data;
+        hw->eeprom[i] = le16_to_cpu (ee_data);
+    }
+
+    if (checksum != (uint16_t) EEPROM_SUM) {
+        DEBUGOUT("ixgb_ee: Checksum invalid.\n");
+        return (FALSE);
+    }
+
+    if ((ee_map->init_ctrl_reg_1 & le16_to_cpu(EEPROM_ICW1_SIGNATURE_MASK))
+         != le16_to_cpu(EEPROM_ICW1_SIGNATURE_VALID)) {
+        DEBUGOUT("ixgb_ee: Signature invalid.\n");
+        return(FALSE);
+    }
+
+    return(TRUE);
+}
+
+
+/******************************************************************************
+ * Local function to check if the eeprom signature is good
+ * If the eeprom signature is good, calls ixgb)get_eeprom_data.
+ *
+ * hw - Struct containing variables accessed by shared code
+ *
+ * Returns:
+ *      TRUE: eeprom signature was good and the eeprom read was successful
+ *      FALSE: otherwise.
+ ******************************************************************************/
+static boolean_t
+ixgb_check_and_get_eeprom_data (struct ixgb_hw* hw)
+{
+    struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *) hw->eeprom;
+
+
+    if ((ee_map->init_ctrl_reg_1 & le16_to_cpu(EEPROM_ICW1_SIGNATURE_MASK))
+                                == le16_to_cpu(EEPROM_ICW1_SIGNATURE_VALID)) {
+        return (TRUE);
+    } else {
+        return ixgb_get_eeprom_data(hw);
+    }
+}
+
+/******************************************************************************
+ * return a word from the eeprom
+ *
+ * hw - Struct containing variables accessed by shared code
+ * index - Offset of eeprom word
+ *
+ * Returns:
+ *          Word at indexed offset in eeprom, if valid, 0 otherwise.
+ ******************************************************************************/
+uint16_t
+ixgb_get_eeprom_word(struct ixgb_hw *hw, uint16_t index)
+{
+
+    if ((index < IXGB_EEPROM_SIZE) &&
+        (ixgb_check_and_get_eeprom_data (hw) == TRUE)) {
+       return(hw->eeprom[index]);
+    }
+
+    return(0);
+}
+
+
+/******************************************************************************
+ * return the mac address from EEPROM
+ *
+ * hw       - Struct containing variables accessed by shared code
+ * mac_addr - Ethernet Address if EEPROM contents are valid, 0 otherwise
+ *
+ * Returns: None.
+ ******************************************************************************/
+void
+ixgb_get_ee_mac_addr(struct ixgb_hw *hw,
+                        uint8_t *mac_addr)
+{
+    int i;
+    struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *) hw->eeprom;
+
+    DEBUGFUNC("ixgb_get_ee_mac_addr");
+
+    if (ixgb_check_and_get_eeprom_data (hw) == TRUE) {
+        for (i = 0; i < IXGB_ETH_LENGTH_OF_ADDRESS; i++) {
+            mac_addr[i] = ee_map->mac_addr[i];
+            DEBUGOUT2("mac(%d) = %.2X\n", i, mac_addr[i]);
+        }
+    }
+}
+
+/******************************************************************************
+ * return the compatibility flags from EEPROM
+ *
+ * hw - Struct containing variables accessed by shared code
+ *
+ * Returns:
+ *          compatibility flags if EEPROM contents are valid, 0 otherwise
+ ******************************************************************************/
+uint16_t
+ixgb_get_ee_compatibility(struct ixgb_hw *hw)
+{
+    struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *) hw->eeprom;
+
+    if (ixgb_check_and_get_eeprom_data (hw) == TRUE)
+       return(ee_map->compatibility);
+
+    return(0);
+}
+
+/******************************************************************************
+ * return the Printed Board Assembly number from EEPROM
+ *
+ * hw - Struct containing variables accessed by shared code
+ *
+ * Returns:
+ *          PBA number if EEPROM contents are valid, 0 otherwise
+ ******************************************************************************/
+uint32_t
+ixgb_get_ee_pba_number(struct ixgb_hw *hw)
+{
+    if (ixgb_check_and_get_eeprom_data (hw) == TRUE)
+       return (   le16_to_cpu(hw->eeprom[EEPROM_PBA_1_2_REG])
+               | (le16_to_cpu(hw->eeprom[EEPROM_PBA_3_4_REG])<<16));
+
+    return(0);
+}
+
+/******************************************************************************
+ * return the Initialization Control Word 1 from EEPROM
+ *
+ * hw - Struct containing variables accessed by shared code
+ *
+ * Returns:
+ *          Initialization Control Word 1 if EEPROM contents are valid, 0 otherwise
+ ******************************************************************************/
+uint16_t
+ixgb_get_ee_init_ctrl_reg_1(struct ixgb_hw *hw)
+{
+    struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *) hw->eeprom;
+
+    if (ixgb_check_and_get_eeprom_data (hw) == TRUE)
+       return(ee_map->init_ctrl_reg_1);
+
+    return(0);
+}
+
+/******************************************************************************
+ * return the Initialization Control Word 2 from EEPROM
+ *
+ * hw - Struct containing variables accessed by shared code
+ *
+ * Returns:
+ *          Initialization Control Word 2 if EEPROM contents are valid, 0 otherwise
+ ******************************************************************************/
+uint16_t
+ixgb_get_ee_init_ctrl_reg_2(struct ixgb_hw *hw)
+{
+    struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *) hw->eeprom;
+
+    if (ixgb_check_and_get_eeprom_data (hw) == TRUE)
+       return(ee_map->init_ctrl_reg_2);
+
+    return(0);
+}
+
+/******************************************************************************
+ * return the Subsystem Id from EEPROM
+ *
+ * hw - Struct containing variables accessed by shared code
+ *
+ * Returns:
+ *          Subsystem Id if EEPROM contents are valid, 0 otherwise
+ ******************************************************************************/
+uint16_t
+ixgb_get_ee_subsystem_id(struct ixgb_hw *hw)
+{
+    struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *) hw->eeprom;
+
+    if (ixgb_check_and_get_eeprom_data (hw) == TRUE)
+       return(ee_map->subsystem_id);
+
+    return(0);
+}
+
+/******************************************************************************
+ * return the Sub Vendor Id from EEPROM
+ *
+ * hw - Struct containing variables accessed by shared code
+ *
+ * Returns:
+ *          Sub Vendor Id if EEPROM contents are valid, 0 otherwise
+ ******************************************************************************/
+uint16_t
+ixgb_get_ee_subvendor_id(struct ixgb_hw *hw)
+{
+    struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *) hw->eeprom;
+
+    if (ixgb_check_and_get_eeprom_data (hw) == TRUE)
+       return(ee_map->subvendor_id);
+
+    return(0);
+}
+
+/******************************************************************************
+ * return the Device Id from EEPROM
+ *
+ * hw - Struct containing variables accessed by shared code
+ *
+ * Returns:
+ *          Device Id if EEPROM contents are valid, 0 otherwise
+ ******************************************************************************/
+uint16_t
+ixgb_get_ee_device_id(struct ixgb_hw *hw)
+{
+    struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *) hw->eeprom;
+
+    if (ixgb_check_and_get_eeprom_data (hw) == TRUE)
+       return(ee_map->device_id);
+
+    return(0);
+}
+
+/******************************************************************************
+ * return the Vendor Id from EEPROM
+ *
+ * hw - Struct containing variables accessed by shared code
+ *
+ * Returns:
+ *          Device Id if EEPROM contents are valid, 0 otherwise
+ ******************************************************************************/
+uint16_t
+ixgb_get_ee_vendor_id(struct ixgb_hw *hw)
+{
+    struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *) hw->eeprom;
+
+    if (ixgb_check_and_get_eeprom_data (hw) == TRUE)
+       return(ee_map->vendor_id);
+
+    return(0);
+}
+
+/******************************************************************************
+ * return the Software Defined Pins Register from EEPROM
+ *
+ * hw - Struct containing variables accessed by shared code
+ *
+ * Returns:
+ *          SDP Register if EEPROM contents are valid, 0 otherwise
+ ******************************************************************************/
+uint16_t
+ixgb_get_ee_swdpins_reg(struct ixgb_hw *hw)
+{
+    struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *) hw->eeprom;
+
+    if (ixgb_check_and_get_eeprom_data (hw) == TRUE)
+       return(ee_map->swdpins_reg);
+
+    return(0);
+}
+
+/******************************************************************************
+ * return the D3 Power Management Bits from EEPROM
+ *
+ * hw - Struct containing variables accessed by shared code
+ *
+ * Returns:
+ *          D3 Power Management Bits if EEPROM contents are valid, 0 otherwise
+ ******************************************************************************/
+uint8_t
+ixgb_get_ee_d3_power(struct ixgb_hw *hw)
+{
+    struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *) hw->eeprom;
+
+    if (ixgb_check_and_get_eeprom_data (hw) == TRUE)
+       return(ee_map->d3_power);
+
+    return(0);
+}
+
+/******************************************************************************
+ * return the D0 Power Management Bits from EEPROM
+ *
+ * hw - Struct containing variables accessed by shared code
+ *
+ * Returns:
+ *          D0 Power Management Bits if EEPROM contents are valid, 0 otherwise
+ ******************************************************************************/
+uint8_t
+ixgb_get_ee_d0_power(struct ixgb_hw *hw)
+{
+    struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *) hw->eeprom;
+
+    if (ixgb_check_and_get_eeprom_data (hw) == TRUE)
+       return(ee_map->d0_power);
+
+    return(0);
+}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/ixgb/ixgb_ee.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/ixgb/ixgb_ee.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/ixgb/ixgb_ee.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/ixgb/ixgb_ee.h	2004-09-09 13:21:58.000000000 +0200
@@ -0,0 +1,111 @@
+/*******************************************************************************
+
+  
+  Copyright(c) 1999 - 2004 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 
+  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  02111-1307, USA.
+  
+  The full GNU General Public License is included in this distribution in the
+  file called LICENSE.
+  
+  Contact Information:
+  Linux NICS <linux.nics@intel.com>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+*******************************************************************************/
+
+#ifndef _IXGB_EE_H_
+#define _IXGB_EE_H_
+
+
+#define IXGB_EEPROM_SIZE    64   /* Size in words */
+
+#define IXGB_ETH_LENGTH_OF_ADDRESS   6
+
+
+/* EEPROM Commands */
+#define EEPROM_READ_OPCODE  0x6  /* EERPOM read opcode */
+#define EEPROM_WRITE_OPCODE 0x5  /* EERPOM write opcode */
+#define EEPROM_ERASE_OPCODE 0x7  /* EERPOM erase opcode */
+#define EEPROM_EWEN_OPCODE  0x13 /* EERPOM erase/write enable */
+#define EEPROM_EWDS_OPCODE  0x10 /* EERPOM erast/write disable */
+
+/* EEPROM MAP (Word Offsets) */
+#define EEPROM_IA_1_2_REG        0x0000
+#define EEPROM_IA_3_4_REG        0x0001
+#define EEPROM_IA_5_6_REG        0x0002
+#define EEPROM_COMPATIBILITY_REG 0x0003
+#define EEPROM_PBA_1_2_REG       0x0008
+#define EEPROM_PBA_3_4_REG       0x0009
+#define EEPROM_INIT_CONTROL1_REG 0x000A
+#define EEPROM_SUBSYS_ID_REG     0x000B
+#define EEPROM_SUBVEND_ID_REG    0x000C
+#define EEPROM_DEVICE_ID_REG     0x000D
+#define EEPROM_VENDOR_ID_REG     0x000E
+#define EEPROM_INIT_CONTROL2_REG 0x000F
+#define EEPROM_SWDPINS_REG       0x0020
+#define EEPROM_CIRCUIT_CTRL_REG  0x0021
+#define EEPROM_D0_D3_POWER_REG   0x0022
+#define EEPROM_FLASH_VERSION     0x0032
+#define EEPROM_CHECKSUM_REG      0x003F
+
+/* Mask bits for fields in Word 0x0a of the EEPROM */
+
+#define EEPROM_ICW1_SIGNATURE_MASK  0xC000
+#define EEPROM_ICW1_SIGNATURE_VALID 0x4000
+
+/* For checksumming, the sum of all words in the EEPROM should equal 0xBABA. */
+#define EEPROM_SUM 0xBABA
+
+/* EEPROM Map Sizes (Byte Counts) */
+#define PBA_SIZE 4
+
+/* EEPROM Map defines (WORD OFFSETS)*/
+
+/* EEPROM structure */
+struct  ixgb_ee_map_type{
+    uint8_t         mac_addr[IXGB_ETH_LENGTH_OF_ADDRESS];
+    uint16_t        compatibility;
+    uint16_t        reserved1[4];         
+    uint32_t        pba_number;
+    uint16_t        init_ctrl_reg_1;
+    uint16_t        subsystem_id;
+    uint16_t        subvendor_id;
+    uint16_t        device_id;
+    uint16_t        vendor_id;
+    uint16_t        init_ctrl_reg_2;
+    uint16_t        oem_reserved[16];         
+    uint16_t        swdpins_reg;
+    uint16_t        circuit_ctrl_reg;
+    uint8_t         d3_power;
+    uint8_t         d0_power;
+    uint16_t        reserved2[28];         
+    uint16_t        checksum;
+        };
+        
+/* EEPROM Functions */
+uint16_t ixgb_read_eeprom(struct ixgb_hw *hw,
+                           uint16_t reg);
+
+boolean_t ixgb_validate_eeprom_checksum(struct ixgb_hw *hw);
+
+void ixgb_update_eeprom_checksum(struct ixgb_hw *hw);
+
+void ixgb_write_eeprom(struct ixgb_hw *hw,
+                             uint16_t reg,
+                             uint16_t data);
+
+#endif /* IXGB_EE_H */
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/ixgb/ixgb_ethtool.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/ixgb/ixgb_ethtool.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/ixgb/ixgb_ethtool.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/ixgb/ixgb_ethtool.c	2004-09-09 13:21:58.000000000 +0200
@@ -0,0 +1,797 @@
+/*******************************************************************************
+
+  
+  Copyright(c) 1999 - 2004 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 
+  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  02111-1307, USA.
+  
+  The full GNU General Public License is included in this distribution in the
+  file called LICENSE.
+  
+  Contact Information:
+  Linux NICS <linux.nics@intel.com>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+*******************************************************************************/
+
+/* ethtool support for ixgb */
+
+#include "ixgb.h"
+
+#ifdef	SIOCETHTOOL
+#include <asm/uaccess.h>
+
+extern char ixgb_driver_name[];
+extern char ixgb_driver_version[];
+
+extern int ixgb_up(struct ixgb_adapter *adapter);
+extern void ixgb_down(struct ixgb_adapter *adapter, boolean_t kill_watchdog);
+
+static inline int
+ixgb_eeprom_size(struct ixgb_hw *hw)
+{
+	/* return size in bytes */
+	return (IXGB_EEPROM_SIZE << 1);
+}
+
+#undef SUPPORTED_10000baseT_Full
+#define SUPPORTED_10000baseT_Full	(1 << 12)
+#undef SPEED_10000
+#define SPEED_10000		10000
+
+#ifndef ETH_GSTRING_LEN
+#define ETH_GSTRING_LEN 32
+#endif
+#ifdef	ETHTOOL_GSTATS
+struct ixgb_stats {
+	char stat_string[ETH_GSTRING_LEN];
+	int sizeof_stat;
+	int stat_offset;
+};
+
+#define IXGB_STAT(m) sizeof(((struct ixgb_adapter *)0)->m), \
+		      offsetof(struct ixgb_adapter, m)
+static struct ixgb_stats ixgb_gstrings_stats[] = {
+	{ "rx_packets", IXGB_STAT(net_stats.rx_packets) },
+	{ "tx_packets", IXGB_STAT(net_stats.tx_packets) },
+	{ "rx_bytes", IXGB_STAT(net_stats.rx_bytes) },
+	{ "tx_bytes", IXGB_STAT(net_stats.tx_bytes) },
+	{ "rx_errors", IXGB_STAT(net_stats.rx_errors) },
+	{ "tx_errors", IXGB_STAT(net_stats.tx_errors) },
+	{ "rx_dropped", IXGB_STAT(net_stats.rx_dropped) },
+	{ "tx_dropped", IXGB_STAT(net_stats.tx_dropped) },
+	{ "multicast", IXGB_STAT(net_stats.multicast) },
+	{ "collisions", IXGB_STAT(net_stats.collisions) },
+/*	{ "rx_length_errors", IXGB_STAT(net_stats.rx_length_errors) },	*/
+	{ "rx_over_errors", IXGB_STAT(net_stats.rx_over_errors) },
+	{ "rx_crc_errors", IXGB_STAT(net_stats.rx_crc_errors) },
+	{ "rx_frame_errors", IXGB_STAT(net_stats.rx_frame_errors) },
+	{ "rx_fifo_errors", IXGB_STAT(net_stats.rx_fifo_errors) },
+	{ "rx_missed_errors", IXGB_STAT(net_stats.rx_missed_errors) },
+	{ "tx_aborted_errors", IXGB_STAT(net_stats.tx_aborted_errors) },
+	{ "tx_carrier_errors", IXGB_STAT(net_stats.tx_carrier_errors) },
+	{ "tx_fifo_errors", IXGB_STAT(net_stats.tx_fifo_errors) },
+	{ "tx_heartbeat_errors", IXGB_STAT(net_stats.tx_heartbeat_errors) },
+	{ "tx_window_errors", IXGB_STAT(net_stats.tx_window_errors) },
+	{ "tx_deferred_ok", IXGB_STAT(stats.dc) },
+	{ "rx_long_length_errors", IXGB_STAT(stats.roc) },
+	{ "rx_short_length_errors", IXGB_STAT(stats.ruc) },
+#ifdef NETIF_F_TSO
+	{ "tx_tcp_seg_good", IXGB_STAT(stats.tsctc) },
+	{ "tx_tcp_seg_failed", IXGB_STAT(stats.tsctfc) },
+#endif
+	{ "rx_flow_control_xon", IXGB_STAT(stats.xonrxc) },
+	{ "rx_flow_control_xoff", IXGB_STAT(stats.xoffrxc) },
+	{ "tx_flow_control_xon", IXGB_STAT(stats.xontxc) },
+	{ "tx_flow_control_xoff", IXGB_STAT(stats.xofftxc) },
+	{ "rx_csum_offload_good", IXGB_STAT(hw_csum_rx_good) },
+	{ "rx_csum_offload_errors", IXGB_STAT(hw_csum_rx_error) },
+	{ "tx_csum_offload_good", IXGB_STAT(hw_csum_tx_good) },
+	{ "tx_csum_offload_errors", IXGB_STAT(hw_csum_tx_error) }
+};
+#define IXGB_STATS_LEN	\
+	sizeof(ixgb_gstrings_stats) / sizeof(struct ixgb_stats)
+#endif	/* ETHTOOL_GSTATS */
+
+static void
+ixgb_ethtool_gset(struct ixgb_adapter *adapter, struct ethtool_cmd *ecmd)
+{
+	ecmd->supported = (SUPPORTED_10000baseT_Full | SUPPORTED_FIBRE);
+	ecmd->advertising = (SUPPORTED_10000baseT_Full | SUPPORTED_FIBRE);
+	ecmd->port = PORT_FIBRE;
+	ecmd->transceiver = XCVR_EXTERNAL;
+
+	if(netif_carrier_ok(adapter->netdev)) {
+		ecmd->speed = SPEED_10000;
+		ecmd->duplex = DUPLEX_FULL;
+	} else {
+		ecmd->speed = -1;
+		ecmd->duplex = -1;
+	}
+
+	ecmd->autoneg = AUTONEG_DISABLE;
+}
+
+static int
+ixgb_ethtool_sset(struct ixgb_adapter *adapter, struct ethtool_cmd *ecmd)
+{
+	if(ecmd->autoneg == AUTONEG_ENABLE ||
+	   ecmd->speed + ecmd->duplex != SPEED_10000 + DUPLEX_FULL)
+		return -EINVAL;
+	else {
+		ixgb_down(adapter, TRUE);
+		ixgb_up(adapter);
+	}
+
+	return 0;
+}
+
+#ifdef	ETHTOOL_GPAUSEPARAM
+static int
+ixgb_ethtool_gpause(struct ixgb_adapter *adapter,
+                     struct ethtool_pauseparam *epause)
+{
+	struct ixgb_hw *hw = &adapter->hw;
+	
+	epause->autoneg = AUTONEG_DISABLE;
+		
+	
+	if(hw->fc.type == ixgb_fc_rx_pause)
+		epause->rx_pause = 1;
+	else if(hw->fc.type == ixgb_fc_tx_pause)
+		epause->tx_pause = 1;
+	else if(hw->fc.type == ixgb_fc_full) {
+		epause->rx_pause = 1;
+		epause->tx_pause = 1;
+	}
+	
+	return 0;
+}
+#endif /* ETHTOOL_GPAUSEPARAM */
+
+#ifdef	ETHTOOL_SPAUSEPARAM
+static int
+ixgb_ethtool_spause(struct ixgb_adapter *adapter,
+                     struct ethtool_pauseparam *epause)
+{
+	struct ixgb_hw *hw = &adapter->hw;
+	
+	if(epause->autoneg == AUTONEG_ENABLE)
+		return -EINVAL;
+
+	if(epause->rx_pause && epause->tx_pause)
+		hw->fc.type = ixgb_fc_full;
+	else if(epause->rx_pause && !epause->tx_pause)
+		hw->fc.type = ixgb_fc_rx_pause;
+	else if(!epause->rx_pause && epause->tx_pause)
+		hw->fc.type = ixgb_fc_tx_pause;
+	else if(!epause->rx_pause && !epause->tx_pause)
+		hw->fc.type = ixgb_fc_none;
+
+	ixgb_down(adapter, TRUE);
+	ixgb_up(adapter);
+	
+	return 0;
+}
+#endif /* ETHTOOL_SPAUSEPARAM */
+
+#ifdef	ETHTOOL_GDRVINFO
+static void
+ixgb_ethtool_gdrvinfo(struct ixgb_adapter *adapter,
+                       struct ethtool_drvinfo *drvinfo)
+{
+	strncpy(drvinfo->driver,  ixgb_driver_name, 32);
+	strncpy(drvinfo->version, ixgb_driver_version, 32);
+	strncpy(drvinfo->fw_version, "N/A", 32);
+	strncpy(drvinfo->bus_info, pci_name(adapter->pdev), 32);
+#ifdef	ETHTOOL_GSTATS
+	drvinfo->n_stats = IXGB_STATS_LEN;
+#endif	/* ETHTOOL_GSTATS */
+#ifdef	ETHTOOL_GEEPROM  /* GREGS broken in earlier ethtool.h */
+#ifdef	ETHTOOL_GREGS
+#define IXGB_REG_DUMP_LEN  136*sizeof(uint32_t)
+	drvinfo->regdump_len = IXGB_REG_DUMP_LEN;
+#endif	/* ETHTOOL_GREGS */
+#endif	/* ETHTOOL_GEEPROM */
+#ifdef	ETHTOOL_GEEPROM
+	drvinfo->eedump_len = ixgb_eeprom_size(&adapter->hw);
+#endif	/* ETHTOOL_GEEPROM */
+}
+#endif	/* ETHTOOL_GDRVINFO */
+
+#ifdef	ETHTOOL_GEEPROM  /* GREGS broken in earlier ethtool.h */
+#ifdef  ETHTOOL_GREGS
+#define IXGB_GET_STAT(_A_, _R_) _A_->stats._R_
+static void
+ixgb_ethtool_gregs(struct ixgb_adapter *adapter,
+                    struct ethtool_regs *regs, uint32_t *regs_buff)
+{
+	struct ixgb_hw *hw = &adapter->hw;
+	uint32_t *reg = regs_buff;
+	uint32_t *reg_start = reg;
+	uint8_t i;
+
+	regs->version = (adapter->hw.device_id << 16) | adapter->hw.subsystem_id;
+
+	/* General Registers */
+	*reg++ = IXGB_READ_REG(hw, CTRL0);  /*   0 */
+	*reg++ = IXGB_READ_REG(hw, CTRL1);  /*   1 */
+	*reg++ = IXGB_READ_REG(hw, STATUS); /*   2 */
+	*reg++ = IXGB_READ_REG(hw, EECD);   /*   3 */
+	*reg++ = IXGB_READ_REG(hw, MFS);    /*   4 */
+
+	/* Interrupt */
+	*reg++ = IXGB_READ_REG(hw, ICR);    /*   5 */
+	*reg++ = IXGB_READ_REG(hw, ICS);    /*   6 */
+	*reg++ = IXGB_READ_REG(hw, IMS);    /*   7 */
+	*reg++ = IXGB_READ_REG(hw, IMC);    /*   8 */
+
+	/* Receive */
+	*reg++ = IXGB_READ_REG(hw, RCTL);   /*   9 */
+	*reg++ = IXGB_READ_REG(hw, FCRTL);  /*  10 */
+	*reg++ = IXGB_READ_REG(hw, FCRTH);  /*  11 */
+	*reg++ = IXGB_READ_REG(hw, RDBAL);  /*  12 */
+	*reg++ = IXGB_READ_REG(hw, RDBAH);  /*  13 */
+	*reg++ = IXGB_READ_REG(hw, RDLEN);  /*  14 */
+	*reg++ = IXGB_READ_REG(hw, RDH);    /*  15 */
+	*reg++ = IXGB_READ_REG(hw, RDT);    /*  16 */
+	*reg++ = IXGB_READ_REG(hw, RDTR);   /*  17 */
+	*reg++ = IXGB_READ_REG(hw, RXDCTL); /*  18 */
+	*reg++ = IXGB_READ_REG(hw, RAIDC);  /*  19 */
+	*reg++ = IXGB_READ_REG(hw, RXCSUM); /*  20 */
+
+	for(i = 0; i < IXGB_RAR_ENTRIES; i++) {
+		*reg++ = IXGB_READ_REG_ARRAY(hw, RAL, (i << 1)); /*21,...,51 */
+		*reg++ = IXGB_READ_REG_ARRAY(hw, RAH, (i << 1)); /*22,...,52 */
+	}
+
+	/* Transmit */
+	*reg++ = IXGB_READ_REG(hw, TCTL);   /*  53 */
+	*reg++ = IXGB_READ_REG(hw, TDBAL);  /*  54 */
+	*reg++ = IXGB_READ_REG(hw, TDBAH);  /*  55 */
+	*reg++ = IXGB_READ_REG(hw, TDLEN);  /*  56 */
+	*reg++ = IXGB_READ_REG(hw, TDH);    /*  57 */
+	*reg++ = IXGB_READ_REG(hw, TDT);    /*  58 */
+	*reg++ = IXGB_READ_REG(hw, TIDV);   /*  59 */
+	*reg++ = IXGB_READ_REG(hw, TXDCTL); /*  60 */
+	*reg++ = IXGB_READ_REG(hw, TSPMT);  /*  61 */
+	*reg++ = IXGB_READ_REG(hw, PAP);    /*  62 */
+
+	/* Physical */
+	*reg++ = IXGB_READ_REG(hw, PCSC1);  /*  63 */
+	*reg++ = IXGB_READ_REG(hw, PCSC2);  /*  64 */
+	*reg++ = IXGB_READ_REG(hw, PCSS1);  /*  65 */
+	*reg++ = IXGB_READ_REG(hw, PCSS2);  /*  66 */
+	*reg++ = IXGB_READ_REG(hw, XPCSS);  /*  67 */
+	*reg++ = IXGB_READ_REG(hw, UCCR);   /*  68 */
+	*reg++ = IXGB_READ_REG(hw, XPCSTC); /*  69 */
+	*reg++ = IXGB_READ_REG(hw, MACA);   /*  70 */
+	*reg++ = IXGB_READ_REG(hw, APAE);   /*  71 */
+	*reg++ = IXGB_READ_REG(hw, ARD);    /*  72 */
+	*reg++ = IXGB_READ_REG(hw, AIS);    /*  73 */
+	*reg++ = IXGB_READ_REG(hw, MSCA);   /*  74 */
+	*reg++ = IXGB_READ_REG(hw, MSRWD);  /*  75 */
+
+
+	/* Statistics */
+	*reg++ = IXGB_GET_STAT(adapter, tprl);     /*  76 */
+	*reg++ = IXGB_GET_STAT(adapter, tprh);     /*  77 */
+	*reg++ = IXGB_GET_STAT(adapter, gprcl);    /*  78 */
+	*reg++ = IXGB_GET_STAT(adapter, gprch);    /*  79 */
+	*reg++ = IXGB_GET_STAT(adapter, bprcl);    /*  80 */
+	*reg++ = IXGB_GET_STAT(adapter, bprch);    /*  81 */
+	*reg++ = IXGB_GET_STAT(adapter, mprcl);    /*  82 */
+	*reg++ = IXGB_GET_STAT(adapter, mprch);    /*  83 */
+	*reg++ = IXGB_GET_STAT(adapter, uprcl);    /*  84 */
+	*reg++ = IXGB_GET_STAT(adapter, uprch);    /*  85 */
+	*reg++ = IXGB_GET_STAT(adapter, vprcl);    /*  86 */
+	*reg++ = IXGB_GET_STAT(adapter, vprch);    /*  87 */
+	*reg++ = IXGB_GET_STAT(adapter, jprcl);    /*  88 */
+	*reg++ = IXGB_GET_STAT(adapter, jprch);    /*  89 */
+	*reg++ = IXGB_GET_STAT(adapter, gorcl);    /*  90 */
+	*reg++ = IXGB_GET_STAT(adapter, gorch);    /*  91 */
+	*reg++ = IXGB_GET_STAT(adapter, torl);     /*  92 */
+	*reg++ = IXGB_GET_STAT(adapter, torh);     /*  93 */
+	*reg++ = IXGB_GET_STAT(adapter, rnbc);     /*  94 */
+	*reg++ = IXGB_GET_STAT(adapter, ruc);      /*  95 */
+	*reg++ = IXGB_GET_STAT(adapter, roc);      /*  96 */
+	*reg++ = IXGB_GET_STAT(adapter, rlec);     /*  97 */
+	*reg++ = IXGB_GET_STAT(adapter, crcerrs);  /*  98 */
+	*reg++ = IXGB_GET_STAT(adapter, icbc);     /*  99 */
+	*reg++ = IXGB_GET_STAT(adapter, ecbc);     /* 100 */
+	*reg++ = IXGB_GET_STAT(adapter, mpc);      /* 101 */
+	*reg++ = IXGB_GET_STAT(adapter, tptl);     /* 102 */
+	*reg++ = IXGB_GET_STAT(adapter, tpth);     /* 103 */
+	*reg++ = IXGB_GET_STAT(adapter, gptcl);    /* 104 */
+	*reg++ = IXGB_GET_STAT(adapter, gptch);    /* 105 */
+	*reg++ = IXGB_GET_STAT(adapter, bptcl);    /* 106 */
+	*reg++ = IXGB_GET_STAT(adapter, bptch);    /* 107 */
+	*reg++ = IXGB_GET_STAT(adapter, mptcl);    /* 108 */
+	*reg++ = IXGB_GET_STAT(adapter, mptch);    /* 109 */
+	*reg++ = IXGB_GET_STAT(adapter, uptcl);    /* 110 */
+	*reg++ = IXGB_GET_STAT(adapter, uptch);    /* 111 */
+	*reg++ = IXGB_GET_STAT(adapter, vptcl);    /* 112 */
+	*reg++ = IXGB_GET_STAT(adapter, vptch);    /* 113 */
+	*reg++ = IXGB_GET_STAT(adapter, jptcl);    /* 114 */
+	*reg++ = IXGB_GET_STAT(adapter, jptch);    /* 115 */
+	*reg++ = IXGB_GET_STAT(adapter, gotcl);    /* 116 */
+	*reg++ = IXGB_GET_STAT(adapter, gotch);    /* 117 */
+	*reg++ = IXGB_GET_STAT(adapter, totl);     /* 118 */
+	*reg++ = IXGB_GET_STAT(adapter, toth);     /* 119 */
+	*reg++ = IXGB_GET_STAT(adapter, dc);       /* 120 */
+	*reg++ = IXGB_GET_STAT(adapter, plt64c);   /* 121 */
+	*reg++ = IXGB_GET_STAT(adapter, tsctc);    /* 122 */
+	*reg++ = IXGB_GET_STAT(adapter, tsctfc);   /* 123 */
+	*reg++ = IXGB_GET_STAT(adapter, ibic);     /* 124 */
+	*reg++ = IXGB_GET_STAT(adapter, rfc);      /* 125 */
+	*reg++ = IXGB_GET_STAT(adapter, lfc);      /* 126 */
+	*reg++ = IXGB_GET_STAT(adapter, pfrc);     /* 127 */
+	*reg++ = IXGB_GET_STAT(adapter, pftc);     /* 128 */
+	*reg++ = IXGB_GET_STAT(adapter, mcfrc);    /* 129 */
+	*reg++ = IXGB_GET_STAT(adapter, mcftc);    /* 130 */
+	*reg++ = IXGB_GET_STAT(adapter, xonrxc);   /* 131 */
+	*reg++ = IXGB_GET_STAT(adapter, xontxc);   /* 132 */
+	*reg++ = IXGB_GET_STAT(adapter, xoffrxc);  /* 133 */
+	*reg++ = IXGB_GET_STAT(adapter, xofftxc);  /* 134 */
+	*reg++ = IXGB_GET_STAT(adapter, rjc);      /* 135 */
+
+	regs->len = (reg - reg_start) * sizeof(uint32_t);
+}
+#endif  /* ETHTOOL_GREGS */
+#endif	/* ETHTOOL_GEEPROM */
+
+#ifdef	ETHTOOL_GEEPROM
+static int
+ixgb_ethtool_geeprom(struct ixgb_adapter *adapter,
+                      struct ethtool_eeprom *eeprom, uint16_t *eeprom_buff)
+{
+	struct ixgb_hw *hw = &adapter->hw;
+	int i, max_len, first_word, last_word;
+	int ret_val = 0;
+
+	if(eeprom->len == 0) {
+		ret_val = -EINVAL;
+		goto geeprom_error;
+	}
+
+	eeprom->magic = hw->vendor_id | (hw->device_id << 16);
+
+	max_len = ixgb_eeprom_size(hw);
+
+	/* use our function to read the eeprom and update our cache */
+	ixgb_get_eeprom_data(hw);
+
+	if(eeprom->offset > eeprom->offset + eeprom->len) {
+		ret_val = -EINVAL;
+		goto geeprom_error;
+	}
+
+	if((eeprom->offset + eeprom->len) > max_len)
+		eeprom->len = (max_len - eeprom->offset);
+
+	first_word = eeprom->offset >> 1;
+	last_word = (eeprom->offset + eeprom->len - 1) >> 1;
+
+	for(i = 0; i <= (last_word - first_word); i++) {
+		eeprom_buff[i] = hw->eeprom[first_word + i];
+	}
+geeprom_error:
+	return ret_val;
+}
+#endif	/* ETHTOOL_GEEPROM */
+
+#ifdef	ETHTOOL_SEEPROM
+static int
+ixgb_ethtool_seeprom(struct ixgb_adapter *adapter,
+                      struct ethtool_eeprom *eeprom, void *user_data)
+{
+	struct ixgb_hw *hw = &adapter->hw;
+	uint16_t eeprom_buff[256];
+	int i, max_len, first_word, last_word;
+	void *ptr;
+
+	if(eeprom->magic != (hw->vendor_id | (hw->device_id << 16)))
+		return -EFAULT;
+
+	if(eeprom->len == 0) 
+		return -EINVAL;
+
+	max_len = ixgb_eeprom_size(hw);
+
+	if(eeprom->offset > eeprom->offset + eeprom->len)
+		return -EINVAL;
+
+	if((eeprom->offset + eeprom->len) > max_len)
+		eeprom->len = (max_len - eeprom->offset);
+
+	first_word = eeprom->offset >> 1;
+	last_word = (eeprom->offset + eeprom->len - 1) >> 1;
+	ptr = (void *)eeprom_buff;
+
+	if(eeprom->offset & 1) {
+		/* need read/modify/write of first changed EEPROM word */
+		/* only the second byte of the word is being modified */
+		eeprom_buff[0] = ixgb_read_eeprom(hw, first_word);
+		ptr++;
+	}
+	if((eeprom->offset + eeprom->len) & 1) {
+		/* need read/modify/write of last changed EEPROM word */
+		/* only the first byte of the word is being modified */
+		eeprom_buff[last_word - first_word] 
+			= ixgb_read_eeprom(hw, last_word);
+	}
+	if(copy_from_user(ptr, user_data, eeprom->len))
+		return -EFAULT;
+
+	for(i = 0; i <= (last_word - first_word); i++)
+		ixgb_write_eeprom(hw, first_word + i, eeprom_buff[i]);
+
+	/* Update the checksum over the first part of the EEPROM if needed */
+	if(first_word <= EEPROM_CHECKSUM_REG)
+		ixgb_update_eeprom_checksum(hw);
+
+	return 0;
+}
+#endif	/* ETHTOOL_SEEPROM */
+
+
+
+
+
+#ifdef	ETHTOOL_PHYS_ID
+
+/* toggle LED 4 times per second = 2 "blinks" per second */
+#define IXGB_ID_INTERVAL	(HZ/4)
+
+/* bit defines for adapter->led_status */
+#define IXGB_LED_ON		0
+
+static void
+ixgb_led_blink_callback(unsigned long data)
+{
+	struct ixgb_adapter *adapter = (struct ixgb_adapter *) data;
+
+	if(test_and_change_bit(IXGB_LED_ON, &adapter->led_status))
+		ixgb_led_off(&adapter->hw);
+	else
+		ixgb_led_on(&adapter->hw);
+
+	mod_timer(&adapter->blink_timer, jiffies + IXGB_ID_INTERVAL);
+}
+
+static int
+ixgb_ethtool_led_blink(struct ixgb_adapter *adapter, struct ethtool_value *id)
+{
+	if(!adapter->blink_timer.function) {
+		init_timer(&adapter->blink_timer);
+		adapter->blink_timer.function = ixgb_led_blink_callback;
+		adapter->blink_timer.data = (unsigned long) adapter;
+	}
+
+	mod_timer(&adapter->blink_timer, jiffies);
+
+	set_current_state(TASK_INTERRUPTIBLE);
+	if(id->data)
+		schedule_timeout(id->data * HZ);
+	else
+		schedule_timeout(MAX_SCHEDULE_TIMEOUT);
+
+	del_timer_sync(&adapter->blink_timer);
+	ixgb_led_off(&adapter->hw);
+	clear_bit(IXGB_LED_ON, &adapter->led_status);
+
+	return 0;
+}
+#endif	/* ETHTOOL_PHYS_ID */
+
+int
+ixgb_ethtool_ioctl(struct net_device *netdev, struct ifreq *ifr)
+{
+	struct ixgb_adapter *adapter = netdev->priv;
+	void *addr = ifr->ifr_data;
+	uint32_t cmd;
+
+	if(get_user(cmd, (uint32_t *) addr))
+		return -EFAULT;
+
+	switch(cmd) {
+	case ETHTOOL_GSET: {
+		struct ethtool_cmd ecmd = {ETHTOOL_GSET};
+		ixgb_ethtool_gset(adapter, &ecmd);
+		if(copy_to_user(addr, &ecmd, sizeof(ecmd)))
+			return -EFAULT;
+		return 0;
+	}
+	case ETHTOOL_SSET: {
+		struct ethtool_cmd ecmd;
+		if(copy_from_user(&ecmd, addr, sizeof(ecmd)))
+			return -EFAULT;
+		return ixgb_ethtool_sset(adapter, &ecmd);
+	}
+#ifdef	ETHTOOL_GDRVINFO
+	case ETHTOOL_GDRVINFO: {
+		struct ethtool_drvinfo drvinfo = {ETHTOOL_GDRVINFO};
+		ixgb_ethtool_gdrvinfo(adapter, &drvinfo);
+		if(copy_to_user(addr, &drvinfo, sizeof(drvinfo)))
+			return -EFAULT;
+		return 0;
+	}
+#endif	/* ETHTOOL_GDRVINFO */
+#ifdef	ETHTOOL_GSTRINGS
+	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) {
+#ifdef	ETHTOOL_GSTATS
+		case ETH_SS_STATS: {
+			int i;
+			gstrings.len = IXGB_STATS_LEN;
+			strings = kmalloc(IXGB_STATS_LEN * ETH_GSTRING_LEN,
+					  GFP_KERNEL);
+			if(!strings)
+				return -ENOMEM;
+			for(i=0; i < IXGB_STATS_LEN; i++) {
+				memcpy(&strings[i * ETH_GSTRING_LEN],
+				       ixgb_gstrings_stats[i].stat_string,
+				       ETH_GSTRING_LEN);
+			}
+			break;
+		}
+#endif	/* ETHTOOL_GSTATS */
+		default:
+			return -EOPNOTSUPP;
+		}
+		if(copy_to_user(addr, &gstrings, sizeof(gstrings)))
+			err = -EFAULT;
+		addr += offsetof(struct ethtool_gstrings, data);
+		if(!err && copy_to_user(addr, strings,
+		   gstrings.len * ETH_GSTRING_LEN))
+			err = -EFAULT;
+
+		kfree(strings);
+		return err;
+	}
+#endif	/* ETHTOOL_GSTRINGS */
+#ifdef	ETHTOOL_GEEPROM  /* GREGS broken in earlier ethtool.h */
+#ifdef  ETHTOOL_GREGS
+	case ETHTOOL_GREGS: {
+		struct ethtool_regs regs = {ETHTOOL_GREGS};
+		uint32_t regs_buff[IXGB_REG_DUMP_LEN];
+
+		if(copy_from_user(&regs, addr, sizeof(regs)))
+			return -EFAULT;
+		ixgb_ethtool_gregs(adapter, &regs, regs_buff);
+		if(copy_to_user(addr, &regs, sizeof(regs)))
+			return -EFAULT;
+
+		addr += offsetof(struct ethtool_regs, data);
+		if(copy_to_user(addr, regs_buff, regs.len))
+			return -EFAULT;
+
+		return 0;
+	}
+#endif  /* ETHTOOL_GREGS */
+#endif  /* ETHTOOL_GEEPROM */
+#ifdef	ETHTOOL_NWAY_RST
+	case ETHTOOL_NWAY_RST: {
+		if(netif_running(netdev)) {
+			ixgb_down(adapter, TRUE);
+			ixgb_up(adapter);
+		}
+		return 0;
+	}
+#endif	/* ETHTOOL_NWAY_RST */
+#ifdef	ETHTOOL_PHYS_ID
+	case ETHTOOL_PHYS_ID: {
+		struct ethtool_value id;
+		if(copy_from_user(&id, addr, sizeof(id)))
+			return -EFAULT;
+		return ixgb_ethtool_led_blink(adapter, &id);
+	}
+#endif	/* ETHTOOL_PHYS_ID */
+#ifdef	ETHTOOL_GLINK
+	case ETHTOOL_GLINK: {
+		struct ethtool_value link = {ETHTOOL_GLINK};
+		link.data = netif_carrier_ok(netdev);
+		if(copy_to_user(addr, &link, sizeof(link)))
+			return -EFAULT;
+		return 0;
+	}
+#endif	/* ETHTOOL_GLINK */
+
+#ifdef	ETHTOOL_GEEPROM
+	case ETHTOOL_GEEPROM: {
+		struct ethtool_eeprom eeprom = {ETHTOOL_GEEPROM};
+		uint16_t eeprom_buff[IXGB_EEPROM_SIZE];
+		void *ptr;
+		int err = 0;
+
+		if(copy_from_user(&eeprom, addr, sizeof(eeprom)))
+			return -EFAULT;
+
+		if ((err = ixgb_ethtool_geeprom(adapter, &eeprom, eeprom_buff))<0)
+			return err;
+
+		if(copy_to_user(addr, &eeprom, sizeof(eeprom)))
+			return -EFAULT;
+
+		addr += offsetof(struct ethtool_eeprom, data);
+		ptr = ((void *)eeprom_buff) + (eeprom.offset & 1);
+
+		if(copy_to_user(addr, ptr, eeprom.len))
+		    return -EFAULT;
+		return 0;
+	}
+#endif	/* ETHTOOL_GEEPROM */
+#ifdef	ETHTOOL_SEEPROM
+	case ETHTOOL_SEEPROM: {
+		struct ethtool_eeprom eeprom;
+
+		if(copy_from_user(&eeprom, addr, sizeof(eeprom)))
+			return -EFAULT;
+
+		addr += offsetof(struct ethtool_eeprom, data);
+		return ixgb_ethtool_seeprom(adapter, &eeprom, addr);
+	}
+#endif	/* ETHTOOL_SEEPROM */
+#ifdef	ETHTOOL_GPAUSEPARAM
+	case ETHTOOL_GPAUSEPARAM: {
+		struct ethtool_pauseparam epause = {ETHTOOL_GPAUSEPARAM};
+		ixgb_ethtool_gpause(adapter, &epause);
+		if(copy_to_user(addr, &epause, sizeof(epause)))
+			return -EFAULT;
+		return 0;
+	}
+#endif	/* ETHTOOL_GPAUSEPARAM */
+#ifdef	ETHTOOL_SPAUSEPARAM
+	case ETHTOOL_SPAUSEPARAM: {
+		struct ethtool_pauseparam epause;
+		if(copy_from_user(&epause, addr, sizeof(epause)))
+			return -EFAULT;
+		return ixgb_ethtool_spause(adapter, &epause);
+	}
+#endif	/* ETHTOOL_SPAUSEPARAM */
+#ifdef	ETHTOOL_GSTATS
+	case ETHTOOL_GSTATS: {
+		struct {
+			struct ethtool_stats eth_stats;
+			uint64_t data[IXGB_STATS_LEN];
+		} stats = { {ETHTOOL_GSTATS, IXGB_STATS_LEN} };
+		int i;
+
+		for(i = 0; i < IXGB_STATS_LEN; i++)
+			stats.data[i] = (ixgb_gstrings_stats[i].sizeof_stat ==
+					sizeof(uint64_t)) ?
+				*(uint64_t *)((char *)adapter +
+					ixgb_gstrings_stats[i].stat_offset) :
+				*(uint32_t *)((char *)adapter +
+					ixgb_gstrings_stats[i].stat_offset);
+		if(copy_to_user(addr, &stats, sizeof(stats)))
+			return -EFAULT;
+		return 0;
+	}
+#endif	/* ETHTOOL_GSTATS */
+#ifdef	ETHTOOL_GRXCSUM
+	case ETHTOOL_GRXCSUM: {
+		struct ethtool_value edata = { ETHTOOL_GRXCSUM };
+
+		edata.data = adapter->rx_csum;
+		if (copy_to_user(addr, &edata, sizeof(edata)))
+			return -EFAULT;
+		return 0;
+	}
+#endif	/* ETHTOOL_GRXCSUM */
+#ifdef	ETHTOOL_SRXCSUM
+	case ETHTOOL_SRXCSUM: {
+		struct ethtool_value edata;
+
+		if (copy_from_user(&edata, addr, sizeof(edata)))
+			return -EFAULT;
+		adapter->rx_csum = edata.data;
+		ixgb_down(adapter, TRUE);
+		ixgb_up(adapter);
+		return 0;
+	}
+#endif	/* ETHTOOL_SRXCSUM */
+#ifdef	ETHTOOL_GTXCSUM
+	case ETHTOOL_GTXCSUM: {
+		struct ethtool_value edata = { ETHTOOL_GTXCSUM };
+
+		edata.data =
+			(netdev->features & NETIF_F_HW_CSUM) != 0;
+		if (copy_to_user(addr, &edata, sizeof(edata)))
+			return -EFAULT;
+		return 0;
+	}
+#endif	/* ETHTOOL_GTXCSUM */
+#ifdef	ETHTOOL_STXCSUM
+	case ETHTOOL_STXCSUM: {
+		struct ethtool_value edata;
+
+		if (copy_from_user(&edata, addr, sizeof(edata)))
+			return -EFAULT;
+
+		if (edata.data)
+			netdev->features |= NETIF_F_HW_CSUM;
+		else
+			netdev->features &= ~NETIF_F_HW_CSUM;
+
+		return 0;
+	}
+#endif	/* ETHTOOL_STXCSUM */
+#ifdef	ETHTOOL_GSG
+	case ETHTOOL_GSG: {
+		struct ethtool_value edata = { ETHTOOL_GSG };
+
+		edata.data =
+			(netdev->features & NETIF_F_SG) != 0;
+		if (copy_to_user(addr, &edata, sizeof(edata)))
+			return -EFAULT;
+		return 0;
+	}
+#endif	/* ETHTOOL_GSG */
+#ifdef	ETHTOOL_SSG
+	case ETHTOOL_SSG: {
+		struct ethtool_value edata;
+
+		if (copy_from_user(&edata, addr, sizeof(edata)))
+			return -EFAULT;
+
+		if (edata.data)
+			netdev->features |= NETIF_F_SG;
+		else
+			netdev->features &= ~NETIF_F_SG;
+
+		return 0;
+	}
+#endif	/* ETHTOOL_SSG */
+#ifdef NETIF_F_TSO
+#ifdef ETHTOOL_GTSO
+	case ETHTOOL_GTSO: {
+		struct ethtool_value edata = { ETHTOOL_GTSO };
+
+		edata.data = (netdev->features & NETIF_F_TSO) != 0;
+		if (copy_to_user(addr, &edata, sizeof(edata)))
+			return -EFAULT;
+		return 0;
+	}
+#endif /* ETHTOOL_GTSO */
+#ifdef ETHTOOL_STSO
+	case ETHTOOL_STSO: {
+		struct ethtool_value edata;
+
+		if (copy_from_user(&edata, addr, sizeof(edata)))
+			return -EFAULT;
+
+		if (edata.data)
+			netdev->features |= NETIF_F_TSO;
+		else
+			netdev->features &= ~NETIF_F_TSO;
+
+		return 0;
+	}
+#endif /* ETHTOOL_STSO */
+#endif
+	default:
+		return -EOPNOTSUPP;
+	}
+}
+
+#endif	/* SIOCETHTOOL */
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/ixgb/ixgb_hw.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/ixgb/ixgb_hw.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/ixgb/ixgb_hw.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/ixgb/ixgb_hw.c	2004-09-09 13:21:58.000000000 +0200
@@ -0,0 +1,1216 @@
+/*******************************************************************************
+
+  
+  Copyright(c) 1999 - 2004 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 
+  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  02111-1307, USA.
+  
+  The full GNU General Public License is included in this distribution in the
+  file called LICENSE.
+  
+  Contact Information:
+  Linux NICS <linux.nics@intel.com>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+*******************************************************************************/
+
+
+/* ixgb_hw.c
+ * Shared functions for accessing and configuring the adapter
+ */
+
+#include "ixgb_hw.h"
+#include "ixgb_ids.h"
+
+/*  Local function prototypes */
+
+static uint32_t ixgb_hash_mc_addr(struct ixgb_hw *hw,
+                            uint8_t *mc_addr);
+
+static void ixgb_mta_set(struct ixgb_hw *hw,
+                    uint32_t hash_value);
+
+static void ixgb_get_bus_info(struct ixgb_hw *hw);
+
+static boolean_t ixgb_link_reset(struct ixgb_hw *hw);
+
+static void ixgb_optics_reset(struct ixgb_hw *hw);
+
+static ixgb_phy_type ixgb_identify_phy(struct ixgb_hw *hw);
+
+uint32_t ixgb_mac_reset (struct ixgb_hw* hw);
+
+uint32_t ixgb_mac_reset (struct ixgb_hw* hw)
+{
+    uint32_t ctrl_reg;
+
+    /* Setup up hardware to known state with RESET.
+     * SWDPIN settings as per Kemano EPS.
+     */
+    ctrl_reg =  IXGB_CTRL0_RST |
+                IXGB_CTRL0_SDP3_DIR |   /* All pins are Output=1 */
+                IXGB_CTRL0_SDP2_DIR |
+                IXGB_CTRL0_SDP1_DIR |
+                IXGB_CTRL0_SDP0_DIR |
+                IXGB_CTRL0_SDP3     |   /* Initial value 1101   */
+                IXGB_CTRL0_SDP2     |
+                IXGB_CTRL0_SDP0;
+
+#ifdef HP_ZX1
+    /* Workaround for 82597EX reset errata */
+    IXGB_WRITE_REG_IO(hw, CTRL0, ctrl_reg);
+#else
+    IXGB_WRITE_REG(hw, CTRL0, ctrl_reg);
+#endif
+
+    /* Delay a few ms just to allow the reset to complete */
+    msec_delay(IXGB_DELAY_AFTER_RESET);
+    ctrl_reg = IXGB_READ_REG(hw, CTRL0);
+#if DBG
+    /* Make sure the self-clearing global reset bit did self clear */
+    ASSERT(!(ctrl_reg & IXGB_CTRL0_RST));
+#endif
+
+    if (hw->phy_type == ixgb_phy_type_txn17401) {
+        /* Now reset the optics.  This reset is required to ensure link with
+         * the Kemano 003 optical module (TXN17401), as per instructions from
+         * the board designer.
+         */
+        ixgb_optics_reset(hw);
+    }
+
+    return ctrl_reg;
+}
+
+
+/******************************************************************************
+ * Reset the transmit and receive units; mask and clear all interrupts.
+ *
+ * hw - Struct containing variables accessed by shared code
+ *****************************************************************************/
+boolean_t
+ixgb_adapter_stop(struct ixgb_hw *hw)
+{
+    uint32_t ctrl_reg;
+    uint32_t icr_reg;
+
+    DEBUGFUNC("ixgb_adapter_stop");
+
+    /* If we are stopped or resetting exit gracefully and wait to be
+     * started again before accessing the hardware.
+     */
+    if(hw->adapter_stopped) {
+        DEBUGOUT("Exiting because the adapter is already stopped!!!\n");
+        return FALSE;
+    }
+
+    /* Set the Adapter Stopped flag so other driver functions stop
+     * touching the Hardware.
+     */
+    hw->adapter_stopped = TRUE;
+
+    /* Clear interrupt mask to stop board from generating interrupts */
+    DEBUGOUT("Masking off all interrupts\n");
+    IXGB_WRITE_REG(hw, IMC, 0xFFFFFFFF);
+
+    /* Disable the Transmit and Receive units.  Then delay to allow
+     * any pending transactions to complete before we hit the MAC with
+     * the global reset.
+     */
+    IXGB_WRITE_REG(hw, RCTL, IXGB_READ_REG(hw, RCTL) & ~IXGB_RCTL_RXEN);
+    IXGB_WRITE_REG(hw, TCTL, IXGB_READ_REG(hw, TCTL) & ~IXGB_TCTL_TXEN);
+    msec_delay(IXGB_DELAY_BEFORE_RESET);
+
+    /* Issue a global reset to the MAC.  This will reset the chip's
+     * transmit, receive, DMA, and link units.  It will not effect
+     * the current PCI configuration.  The global reset bit is self-
+     * clearing, and should clear within a microsecond.
+     */
+    DEBUGOUT("Issuing a global reset to MAC\n");
+
+    ctrl_reg = ixgb_mac_reset(hw);
+
+    /* Clear interrupt mask to stop board from generating interrupts */
+    DEBUGOUT("Masking off all interrupts\n");
+    IXGB_WRITE_REG(hw, IMC, 0xffffffff);
+
+    /* Clear any pending interrupt events. */
+    icr_reg = IXGB_READ_REG(hw, ICR);
+
+    return (ctrl_reg & IXGB_CTRL0_RST);
+}
+
+
+/******************************************************************************
+ * Identifies the vendor of the optics module on the adapter.  The SR adapters
+ * support two different types of XPAK optics, so it is necessary to determine
+ * which optics are present before applying any optics-specific workarounds.
+ *
+ * hw - Struct containing variables accessed by shared code.
+ *
+ * Returns: the vendor of the XPAK optics module.
+ *****************************************************************************/
+static ixgb_xpak_vendor
+ixgb_identify_xpak_vendor(struct ixgb_hw *hw)
+{
+    uint32_t            i;
+    uint16_t            vendor_name[5];
+    ixgb_xpak_vendor    xpak_vendor;
+
+    DEBUGFUNC("ixgb_identify_xpak_vendor");
+
+    /* Read the first few bytes of the vendor string from the XPAK NVR
+     * registers.  These are standard XENPAK/XPAK registers, so all XPAK
+     * devices should implement them. */
+    for (i = 0; i < 5; i++) {
+        vendor_name[i] = ixgb_read_phy_reg( hw,
+                                            MDIO_PMA_PMD_XPAK_VENDOR_NAME + i,
+                                            IXGB_PHY_ADDRESS,
+                                            MDIO_PMA_PMD_DID    );
+    }
+
+    /* Determine the actual vendor */
+    if (vendor_name[0] == 'I' &&
+        vendor_name[1] == 'N' &&
+        vendor_name[2] == 'T' &&
+        vendor_name[3] == 'E' &&
+        vendor_name[4] == 'L') {
+        xpak_vendor = ixgb_xpak_vendor_intel;
+    }
+    else {
+        xpak_vendor = ixgb_xpak_vendor_infineon;
+    }
+
+    return (xpak_vendor);
+}
+
+
+/******************************************************************************
+ * Determine the physical layer module on the adapter.
+ *
+ * hw - Struct containing variables accessed by shared code.  The device_id
+ *      field must be (correctly) populated before calling this routine.
+ *
+ * Returns: the phy type of the adapter.
+ *****************************************************************************/
+static ixgb_phy_type
+ixgb_identify_phy(struct ixgb_hw *hw)
+{
+    ixgb_phy_type       phy_type;
+    ixgb_xpak_vendor    xpak_vendor;
+
+    DEBUGFUNC("ixgb_identify_phy");
+
+    /* Infer the transceiver/phy type from the device id */
+    switch (hw->device_id) {
+        case IXGB_DEVICE_ID_82597EX:
+            DEBUGOUT("Identified TXN17401 optics\n");
+            phy_type = ixgb_phy_type_txn17401;
+            break;
+
+        case IXGB_DEVICE_ID_82597EX_SR:
+            /* The SR adapters carry two different types of XPAK optics
+             * modules; read the vendor identifier to determine the exact
+             * type of optics. */
+            xpak_vendor = ixgb_identify_xpak_vendor(hw);
+            if (xpak_vendor == ixgb_xpak_vendor_intel) {
+                DEBUGOUT("Identified TXN17201 optics\n");
+                phy_type = ixgb_phy_type_txn17201;
+            }
+            else {
+                DEBUGOUT("Identified G6005 optics\n");
+                phy_type = ixgb_phy_type_g6005;
+            }
+            break;
+
+
+        default:
+            DEBUGOUT("Unknown physical layer module\n");
+            phy_type = ixgb_phy_type_unknown;
+            break;
+    }
+
+    return (phy_type);
+}
+
+/******************************************************************************
+ * Performs basic configuration of the adapter.
+ *
+ * hw - Struct containing variables accessed by shared code
+ *
+ * Resets the controller.
+ * Reads and validates the EEPROM.
+ * Initializes the receive address registers.
+ * Initializes the multicast table.
+ * Clears all on-chip counters.
+ * Calls routine to setup flow control settings.
+ * Leaves the transmit and receive units disabled and uninitialized.
+ *
+ * Returns:
+ *      TRUE if successful,
+ *      FALSE if unrecoverable problems were encountered.
+ *****************************************************************************/
+boolean_t
+ixgb_init_hw(struct ixgb_hw *hw)
+{
+    uint32_t i;
+    uint32_t ctrl_reg;
+    boolean_t status;
+
+    DEBUGFUNC("ixgb_init_hw");
+
+    /* Issue a global reset to the MAC.  This will reset the chip's
+     * transmit, receive, DMA, and link units.  It will not effect
+     * the current PCI configuration.  The global reset bit is self-
+     * clearing, and should clear within a microsecond.
+     */
+    DEBUGOUT("Issuing a global reset to MAC\n");
+
+    ctrl_reg = ixgb_mac_reset(hw);
+
+    DEBUGOUT("Issuing an EE reset to MAC\n");
+#ifdef HP_ZX1
+    /* Workaround for 82597EX reset errata */
+    IXGB_WRITE_REG_IO(hw, CTRL1, IXGB_CTRL1_EE_RST);
+#else
+    IXGB_WRITE_REG(hw, CTRL1, IXGB_CTRL1_EE_RST);
+#endif
+
+    /* Delay a few ms just to allow the reset to complete */
+    msec_delay(IXGB_DELAY_AFTER_EE_RESET);
+
+    if (ixgb_get_eeprom_data(hw) == FALSE) {
+        return(FALSE);
+    }
+
+    /* Use the device id to determine the type of phy/transceiver. */
+    hw->device_id = ixgb_get_ee_device_id(hw);
+    hw->phy_type  = ixgb_identify_phy(hw);
+
+    /* Setup the receive addresses.
+     * Receive Address Registers (RARs 0 - 15).
+     */
+    ixgb_init_rx_addrs(hw);
+
+    /*
+     * Check that a valid MAC address has been set.
+     * If it is not valid, we fail hardware init.
+     */
+    if (!mac_addr_valid(hw->curr_mac_addr)) {
+            DEBUGOUT("MAC address invalid after ixgb_init_rx_addrs\n");
+            return(FALSE);
+    }
+
+    /* tell the routines in this file they can access hardware again */
+    hw->adapter_stopped = FALSE;
+
+    /* Fill in the bus_info structure */
+    ixgb_get_bus_info(hw);
+
+    /* Zero out the Multicast HASH table */
+    DEBUGOUT("Zeroing the MTA\n");
+    for(i = 0; i < IXGB_MC_TBL_SIZE; i++)
+        IXGB_WRITE_REG_ARRAY(hw, MTA, i, 0);
+
+    /* Zero out the VLAN Filter Table Array */
+    ixgb_clear_vfta(hw);
+
+    /* Zero all of the hardware counters */
+    ixgb_clear_hw_cntrs(hw);
+
+    /* Call a subroutine to setup flow control. */
+    status = ixgb_setup_fc(hw);
+
+    /* 82597EX errata: Call check-for-link in case lane deskew is locked */
+    ixgb_check_for_link(hw);
+
+    return (status);
+}
+
+/******************************************************************************
+ * Initializes receive address filters.
+ *
+ * hw - Struct containing variables accessed by shared code
+ *
+ * Places the MAC address in receive address register 0 and clears the rest
+ * of the receive addresss registers. Clears the multicast table. Assumes
+ * the receiver is in reset when the routine is called.
+ *****************************************************************************/
+void
+ixgb_init_rx_addrs(struct ixgb_hw *hw)
+{
+    uint32_t i;
+
+    DEBUGFUNC("ixgb_init_rx_addrs");
+
+    /*
+     * If the current mac address is valid, assume it is a software override
+     * to the permanent address.
+     * Otherwise, use the permanent address from the eeprom.
+     */
+    if (!mac_addr_valid(hw->curr_mac_addr)) {
+
+           /* Get the MAC address from the eeprom for later reference */
+           ixgb_get_ee_mac_addr(hw, hw->curr_mac_addr);
+
+           DEBUGOUT3(" Keeping Permanent MAC Addr =%.2X %.2X %.2X ",
+                                            hw->curr_mac_addr[0],
+                                            hw->curr_mac_addr[1],
+                                            hw->curr_mac_addr[2]);
+           DEBUGOUT3("%.2X %.2X %.2X\n",
+                                            hw->curr_mac_addr[3],
+                                            hw->curr_mac_addr[4],
+                                            hw->curr_mac_addr[5]);
+    } else {
+
+            /* Setup the receive address. */
+            DEBUGOUT("Overriding MAC Address in RAR[0]\n");
+            DEBUGOUT3(" New MAC Addr =%.2X %.2X %.2X ",
+                                        hw->curr_mac_addr[0],
+                                        hw->curr_mac_addr[1],
+                                        hw->curr_mac_addr[2]);
+            DEBUGOUT3("%.2X %.2X %.2X\n",
+                                        hw->curr_mac_addr[3],
+                                        hw->curr_mac_addr[4],
+                                        hw->curr_mac_addr[5]);
+
+
+            ixgb_rar_set(hw, hw->curr_mac_addr, 0);
+    }
+
+    /* Zero out the other 15 receive addresses. */
+    DEBUGOUT("Clearing RAR[1-15]\n");
+    for(i = 1; i < IXGB_RAR_ENTRIES; i++) {
+        IXGB_WRITE_REG_ARRAY(hw, RA, (i << 1), 0);
+        IXGB_WRITE_REG_ARRAY(hw, RA, ((i << 1) + 1), 0);
+    }
+
+    return;
+}
+
+/******************************************************************************
+ * Updates the MAC's list of multicast addresses.
+ *
+ * hw - Struct containing variables accessed by shared code
+ * mc_addr_list - the list of new multicast addresses
+ * mc_addr_count - number of addresses
+ * pad - number of bytes between addresses in the list
+ *
+ * The given list replaces any existing list. Clears the last 15 receive
+ * address registers and the multicast table. Uses receive address registers
+ * for the first 15 multicast addresses, and hashes the rest into the
+ * multicast table.
+ *****************************************************************************/
+void
+ixgb_mc_addr_list_update(struct ixgb_hw *hw,
+                          uint8_t *mc_addr_list,
+                          uint32_t mc_addr_count,
+                          uint32_t pad)
+{
+    uint32_t hash_value;
+    uint32_t i;
+    uint32_t rar_used_count = 1;        /* RAR[0] is used for our MAC address */
+
+    DEBUGFUNC("ixgb_mc_addr_list_update");
+
+    /* Set the new number of MC addresses that we are being requested to use. */
+    hw->num_mc_addrs = mc_addr_count;
+
+    /* Clear RAR[1-15] */
+    DEBUGOUT(" Clearing RAR[1-15]\n");
+    for(i = rar_used_count; i < IXGB_RAR_ENTRIES; i++) {
+        IXGB_WRITE_REG_ARRAY(hw, RA, (i << 1), 0);
+        IXGB_WRITE_REG_ARRAY(hw, RA, ((i << 1) + 1), 0);
+    }
+
+    /* Clear the MTA */
+    DEBUGOUT(" Clearing MTA\n");
+    for(i = 0; i < IXGB_MC_TBL_SIZE; i++) {
+        IXGB_WRITE_REG_ARRAY(hw, MTA, i, 0);
+    }
+
+    /* Add the new addresses */
+    for(i = 0; i < mc_addr_count; i++) {
+        DEBUGOUT(" Adding the multicast addresses:\n");
+        DEBUGOUT7(" MC Addr #%d =%.2X %.2X %.2X %.2X %.2X %.2X\n", i,
+                  mc_addr_list[i * (IXGB_ETH_LENGTH_OF_ADDRESS + pad)],
+                  mc_addr_list[i * (IXGB_ETH_LENGTH_OF_ADDRESS + pad) + 1],
+                  mc_addr_list[i * (IXGB_ETH_LENGTH_OF_ADDRESS + pad) + 2],
+                  mc_addr_list[i * (IXGB_ETH_LENGTH_OF_ADDRESS + pad) + 3],
+                  mc_addr_list[i * (IXGB_ETH_LENGTH_OF_ADDRESS + pad) + 4],
+                  mc_addr_list[i * (IXGB_ETH_LENGTH_OF_ADDRESS + pad) + 5]);
+
+        /* Place this multicast address in the RAR if there is room, *
+         * else put it in the MTA
+         */
+        if(rar_used_count < IXGB_RAR_ENTRIES) {
+            ixgb_rar_set(hw,
+                          mc_addr_list + (i * (IXGB_ETH_LENGTH_OF_ADDRESS + pad)),
+                          rar_used_count);
+            DEBUGOUT1("Added a multicast address to RAR[%d]\n", i);
+            rar_used_count++;
+        } else {
+             hash_value = ixgb_hash_mc_addr(hw,
+                                        mc_addr_list +
+                                        (i * (IXGB_ETH_LENGTH_OF_ADDRESS + pad)));
+
+            DEBUGOUT1(" Hash value = 0x%03X\n", hash_value);
+
+            ixgb_mta_set(hw, hash_value);
+        }
+    }
+
+    DEBUGOUT("MC Update Complete\n");
+    return;
+}
+
+/******************************************************************************
+ * Hashes an address to determine its location in the multicast table
+ *
+ * hw - Struct containing variables accessed by shared code
+ * mc_addr - the multicast address to hash
+ *
+ * Returns:
+ *      The hash value
+ *****************************************************************************/
+static uint32_t
+ixgb_hash_mc_addr(struct ixgb_hw *hw,
+                   uint8_t *mc_addr)
+{
+    uint32_t hash_value = 0;
+
+    DEBUGFUNC("ixgb_hash_mc_addr");
+
+    /* The portion of the address that is used for the hash table is
+     * determined by the mc_filter_type setting.
+     */
+    switch (hw->mc_filter_type) {
+        /* [0] [1] [2] [3] [4] [5]
+         * 01  AA  00  12  34  56
+         * LSB                 MSB - According to H/W docs */
+        case 0:
+            /* [47:36] i.e. 0x563 for above example address */
+            hash_value = ((mc_addr[4] >> 4) | (((uint16_t) mc_addr[5]) << 4));
+            break;
+        case 1:                   /* [46:35] i.e. 0xAC6 for above example address */
+            hash_value = ((mc_addr[4] >> 3) | (((uint16_t) mc_addr[5]) << 5));
+            break;
+        case 2:                   /* [45:34] i.e. 0x5D8 for above example address */
+            hash_value = ((mc_addr[4] >> 2) | (((uint16_t) mc_addr[5]) << 6));
+            break;
+        case 3:                   /* [43:32] i.e. 0x634 for above example address */
+            hash_value = ((mc_addr[4]) | (((uint16_t) mc_addr[5]) << 8));
+            break;
+        default:
+            /* Invalid mc_filter_type, what should we do? */
+            DEBUGOUT("MC filter type param set incorrectly\n");
+            ASSERT(0);
+            break;
+    }
+
+    hash_value &= 0xFFF;
+    return (hash_value);
+}
+
+/******************************************************************************
+ * Sets the bit in the multicast table corresponding to the hash value.
+ *
+ * hw - Struct containing variables accessed by shared code
+ * hash_value - Multicast address hash value
+ *****************************************************************************/
+static void
+ixgb_mta_set(struct ixgb_hw *hw,
+              uint32_t hash_value)
+{
+    uint32_t hash_bit, hash_reg;
+    uint32_t mta_reg;
+
+    /* The MTA is a register array of 128 32-bit registers.
+     * It is treated like an array of 4096 bits.  We want to set
+     * bit BitArray[hash_value]. So we figure out what register
+     * the bit is in, read it, OR in the new bit, then write
+     * back the new value.  The register is determined by the
+     * upper 7 bits of the hash value and the bit within that
+     * register are determined by the lower 5 bits of the value.
+     */
+    hash_reg = (hash_value >> 5) & 0x7F;
+    hash_bit = hash_value & 0x1F;
+
+    mta_reg = IXGB_READ_REG_ARRAY(hw, MTA, hash_reg);
+
+    mta_reg |= (1 << hash_bit);
+
+    IXGB_WRITE_REG_ARRAY(hw, MTA, hash_reg, mta_reg);
+
+    return;
+}
+
+/******************************************************************************
+ * Puts an ethernet address into a receive address register.
+ *
+ * hw - Struct containing variables accessed by shared code
+ * addr - Address to put into receive address register
+ * index - Receive address register to write
+ *****************************************************************************/
+void
+ixgb_rar_set(struct ixgb_hw *hw,
+              uint8_t *addr,
+              uint32_t index)
+{
+    uint32_t rar_low, rar_high;
+
+    DEBUGFUNC("ixgb_rar_set");
+
+    /* HW expects these in little endian so we reverse the byte order
+     * from network order (big endian) to little endian
+     */
+    rar_low = ((uint32_t) addr[0] |
+               ((uint32_t) addr[1] << 8) |
+               ((uint32_t) addr[2] << 16) |
+               ((uint32_t) addr[3] << 24));
+
+    rar_high = ((uint32_t) addr[4] |
+                ((uint32_t) addr[5] << 8) |
+                IXGB_RAH_AV);
+
+    IXGB_WRITE_REG_ARRAY(hw, RA, (index << 1), rar_low);
+    IXGB_WRITE_REG_ARRAY(hw, RA, ((index << 1) + 1), rar_high);
+    return;
+}
+
+/******************************************************************************
+ * Writes a value to the specified offset in the VLAN filter table.
+ *
+ * hw - Struct containing variables accessed by shared code
+ * offset - Offset in VLAN filer table to write
+ * value - Value to write into VLAN filter table
+ *****************************************************************************/
+void
+ixgb_write_vfta(struct ixgb_hw *hw,
+                 uint32_t offset,
+                 uint32_t value)
+{
+    IXGB_WRITE_REG_ARRAY(hw, VFTA, offset, value);
+    return;
+}
+
+/******************************************************************************
+ * Clears the VLAN filer table
+ *
+ * hw - Struct containing variables accessed by shared code
+ *****************************************************************************/
+void
+ixgb_clear_vfta(struct ixgb_hw *hw)
+{
+    uint32_t offset;
+
+    for(offset = 0; offset < IXGB_VLAN_FILTER_TBL_SIZE; offset++)
+        IXGB_WRITE_REG_ARRAY(hw, VFTA, offset, 0);
+    return;
+}
+
+/******************************************************************************
+ * Configures the flow control settings based on SW configuration.
+ *
+ * hw - Struct containing variables accessed by shared code
+ *****************************************************************************/
+
+boolean_t
+ixgb_setup_fc(struct ixgb_hw *hw)
+{
+    uint32_t ctrl_reg;
+    uint32_t pap_reg = 0;   /* by default, assume no pause time */
+    boolean_t status = TRUE;
+
+    DEBUGFUNC("ixgb_setup_fc");
+
+    /* Get the current control reg 0 settings */
+    ctrl_reg = IXGB_READ_REG(hw, CTRL0);
+
+    /* Clear the Receive Pause Enable and Transmit Pause Enable bits */
+    ctrl_reg &= ~(IXGB_CTRL0_RPE | IXGB_CTRL0_TPE);
+
+    /* The possible values of the "flow_control" parameter are:
+     *      0:  Flow control is completely disabled
+     *      1:  Rx flow control is enabled (we can receive pause frames
+     *          but not send pause frames).
+     *      2:  Tx flow control is enabled (we can send pause frames
+     *          but we do not support receiving pause frames).
+     *      3:  Both Rx and TX flow control (symmetric) are enabled.
+     *  other:  Invalid.
+     */
+    switch (hw->fc.type) {
+    case ixgb_fc_none:        /* 0 */
+        /* Set CMDC bit to disable Rx Flow control*/
+        ctrl_reg |= (IXGB_CTRL0_CMDC);
+        break;
+    case ixgb_fc_rx_pause:    /* 1 */
+        /* RX Flow control is enabled, and TX Flow control is
+         * disabled.
+         */
+        ctrl_reg |= (IXGB_CTRL0_RPE);
+        break;
+    case ixgb_fc_tx_pause:    /* 2 */
+        /* TX Flow control is enabled, and RX Flow control is
+         * disabled, by a software over-ride.
+         */
+        ctrl_reg |= (IXGB_CTRL0_TPE);
+        pap_reg = hw->fc.pause_time;
+        break;
+    case ixgb_fc_full:        /* 3 */
+        /* Flow control (both RX and TX) is enabled by a software
+         * over-ride.
+         */
+        ctrl_reg |= (IXGB_CTRL0_RPE | IXGB_CTRL0_TPE);
+        pap_reg = hw->fc.pause_time;
+        break;
+    default:
+        /* We should never get here.  The value should be 0-3. */
+        DEBUGOUT("Flow control param set incorrectly\n");
+        ASSERT(0);
+        break;
+    }
+
+    /* Write the new settings */
+    IXGB_WRITE_REG(hw, CTRL0, ctrl_reg);
+
+    if (pap_reg != 0) {
+        IXGB_WRITE_REG(hw, PAP, pap_reg);
+    }
+
+    /* Set the flow control receive threshold registers.  Normally,
+     * these registers will be set to a default threshold that may be
+     * adjusted later by the driver's runtime code.  However, if the
+     * ability to transmit pause frames in not enabled, then these
+     * registers will be set to 0.
+     */
+    if(!(hw->fc.type & ixgb_fc_tx_pause)) {
+        IXGB_WRITE_REG(hw, FCRTL, 0);
+        IXGB_WRITE_REG(hw, FCRTH, 0);
+    } else {
+       /* We need to set up the Receive Threshold high and low water
+        * marks as well as (optionally) enabling the transmission of XON frames.
+        */
+        if(hw->fc.send_xon) {
+            IXGB_WRITE_REG(hw, FCRTL,
+                            (hw->fc.low_water | IXGB_FCRTL_XONE));
+        } else {
+            IXGB_WRITE_REG(hw, FCRTL, hw->fc.low_water);
+        }
+        IXGB_WRITE_REG(hw, FCRTH, hw->fc.high_water);
+    }
+    return (status);
+}
+
+/******************************************************************************
+ * Reads a word from a device over the Management Data Interface (MDI) bus.
+ * This interface is used to manage Physical layer devices.
+ *
+ * hw          - Struct containing variables accessed by hw code
+ * reg_address - Offset of device register being read.
+ * phy_address - Address of device on MDI.
+ *
+ * Returns:  Data word (16 bits) from MDI device.
+ *
+ * The 82597EX has support for several MDI access methods.  This routine
+ * uses the new protocol MDI Single Command and Address Operation.
+ * This requires that first an address cycle command is sent, followed by a
+ * read command.
+ *****************************************************************************/
+uint16_t
+ixgb_read_phy_reg(struct ixgb_hw *hw,
+                        uint32_t reg_address,
+                        uint32_t phy_address,
+                        uint32_t device_type)
+{
+    uint32_t i;
+    uint32_t data;
+    uint32_t command = 0;
+
+    ASSERT(reg_address <= IXGB_MAX_PHY_REG_ADDRESS);
+    ASSERT(phy_address <= IXGB_MAX_PHY_ADDRESS);
+    ASSERT(device_type <= IXGB_MAX_PHY_DEV_TYPE);
+
+    /* Setup and write the address cycle command */
+    command = ((reg_address << IXGB_MSCA_NP_ADDR_SHIFT)  |
+               (device_type << IXGB_MSCA_DEV_TYPE_SHIFT) |
+               (phy_address << IXGB_MSCA_PHY_ADDR_SHIFT) |
+               (IXGB_MSCA_ADDR_CYCLE | IXGB_MSCA_MDI_COMMAND));
+
+    IXGB_WRITE_REG(hw, MSCA, command);
+
+    /**************************************************************
+    ** Check every 10 usec to see if the address cycle completed
+    ** The COMMAND bit will clear when the operation is complete.
+    ** This may take as long as 64 usecs (we'll wait 100 usecs max)
+    ** from the CPU Write to the Ready bit assertion.
+    **************************************************************/
+
+    for (i = 0; i < 10; i++)
+    {
+        usec_delay(10);
+
+        command = IXGB_READ_REG(hw, MSCA);
+
+        if ((command & IXGB_MSCA_MDI_COMMAND) == 0)
+            break;
+    }
+
+    ASSERT((command & IXGB_MSCA_MDI_COMMAND) == 0);
+
+    /* Address cycle complete, setup and write the read command */
+    command = ((reg_address << IXGB_MSCA_NP_ADDR_SHIFT)  |
+               (device_type << IXGB_MSCA_DEV_TYPE_SHIFT) |
+               (phy_address << IXGB_MSCA_PHY_ADDR_SHIFT) |
+               (IXGB_MSCA_READ | IXGB_MSCA_MDI_COMMAND));
+
+    IXGB_WRITE_REG(hw, MSCA, command);
+
+    /**************************************************************
+    ** Check every 10 usec to see if the read command completed
+    ** The COMMAND bit will clear when the operation is complete.
+    ** The read may take as long as 64 usecs (we'll wait 100 usecs max)
+    ** from the CPU Write to the Ready bit assertion.
+    **************************************************************/
+
+    for (i = 0; i < 10; i++)
+    {
+        usec_delay(10);
+
+        command = IXGB_READ_REG(hw, MSCA);
+
+        if ((command & IXGB_MSCA_MDI_COMMAND) == 0)
+            break;
+    }
+
+    ASSERT((command & IXGB_MSCA_MDI_COMMAND) == 0);
+
+    /* Operation is complete, get the data from the MDIO Read/Write Data
+     * register and return.
+     */
+    data = IXGB_READ_REG(hw, MSRWD);
+    data >>= IXGB_MSRWD_READ_DATA_SHIFT;
+    return((uint16_t) data);
+}
+
+/******************************************************************************
+ * Writes a word to a device over the Management Data Interface (MDI) bus.
+ * This interface is used to manage Physical layer devices.
+ *
+ * hw          - Struct containing variables accessed by hw code
+ * reg_address - Offset of device register being read.
+ * phy_address - Address of device on MDI.
+ * device_type - Also known as the Device ID or DID.
+ * data        - 16-bit value to be written
+ *
+ * Returns:  void.
+ *
+ * The 82597EX has support for several MDI access methods.  This routine
+ * uses the new protocol MDI Single Command and Address Operation.
+ * This requires that first an address cycle command is sent, followed by a
+ * write command.
+ *****************************************************************************/
+void
+ixgb_write_phy_reg(struct ixgb_hw *hw,
+                        uint32_t reg_address,
+                        uint32_t phy_address,
+                        uint32_t device_type,
+                        uint16_t data)
+{
+    uint32_t i;
+    uint32_t command = 0;
+
+    ASSERT(reg_address <= IXGB_MAX_PHY_REG_ADDRESS);
+    ASSERT(phy_address <= IXGB_MAX_PHY_ADDRESS);
+    ASSERT(device_type <= IXGB_MAX_PHY_DEV_TYPE);
+
+    /* Put the data in the MDIO Read/Write Data register */
+    IXGB_WRITE_REG(hw, MSRWD, (uint32_t)data);
+
+    /* Setup and write the address cycle command */
+    command = ((reg_address << IXGB_MSCA_NP_ADDR_SHIFT)  |
+               (device_type << IXGB_MSCA_DEV_TYPE_SHIFT) |
+               (phy_address << IXGB_MSCA_PHY_ADDR_SHIFT) |
+               (IXGB_MSCA_ADDR_CYCLE | IXGB_MSCA_MDI_COMMAND));
+
+    IXGB_WRITE_REG(hw, MSCA, command);
+
+    /**************************************************************
+    ** Check every 10 usec to see if the address cycle completed
+    ** The COMMAND bit will clear when the operation is complete.
+    ** This may take as long as 64 usecs (we'll wait 100 usecs max)
+    ** from the CPU Write to the Ready bit assertion.
+    **************************************************************/
+
+    for (i = 0; i < 10; i++)
+    {
+        usec_delay(10);
+
+        command = IXGB_READ_REG(hw, MSCA);
+
+        if ((command & IXGB_MSCA_MDI_COMMAND) == 0)
+            break;
+    }
+
+    ASSERT((command & IXGB_MSCA_MDI_COMMAND) == 0);
+
+    /* Address cycle complete, setup and write the write command */
+    command = ((reg_address << IXGB_MSCA_NP_ADDR_SHIFT)  |
+               (device_type << IXGB_MSCA_DEV_TYPE_SHIFT) |
+               (phy_address << IXGB_MSCA_PHY_ADDR_SHIFT) |
+               (IXGB_MSCA_WRITE | IXGB_MSCA_MDI_COMMAND));
+
+    IXGB_WRITE_REG(hw, MSCA, command);
+
+    /**************************************************************
+    ** Check every 10 usec to see if the read command completed
+    ** The COMMAND bit will clear when the operation is complete.
+    ** The write may take as long as 64 usecs (we'll wait 100 usecs max)
+    ** from the CPU Write to the Ready bit assertion.
+    **************************************************************/
+
+    for (i = 0; i < 10; i++)
+    {
+        usec_delay(10);
+
+        command = IXGB_READ_REG(hw, MSCA);
+
+        if ((command & IXGB_MSCA_MDI_COMMAND) == 0)
+            break;
+    }
+
+    ASSERT((command & IXGB_MSCA_MDI_COMMAND) == 0);
+
+    /* Operation is complete, return. */
+}
+
+
+/******************************************************************************
+ * Checks to see if the link status of the hardware has changed.
+ *
+ * hw - Struct containing variables accessed by hw code
+ *
+ * Called by any function that needs to check the link status of the adapter.
+ *****************************************************************************/
+void
+ixgb_check_for_link(struct ixgb_hw *hw)
+{
+    uint32_t status_reg;
+    uint32_t xpcss_reg;
+
+    DEBUGFUNC("ixgb_check_for_link");
+
+    xpcss_reg = IXGB_READ_REG(hw, XPCSS);
+    status_reg = IXGB_READ_REG(hw, STATUS);
+
+    if ((xpcss_reg & IXGB_XPCSS_ALIGN_STATUS) &&
+        (status_reg & IXGB_STATUS_LU)) {
+       hw->link_up = TRUE;
+    } else if (!(xpcss_reg & IXGB_XPCSS_ALIGN_STATUS) &&
+           (status_reg & IXGB_STATUS_LU)) {
+        DEBUGOUT("XPCSS Not Aligned while Status:LU is set.\n");
+        hw->link_up = ixgb_link_reset(hw);
+    } else {
+        /*
+         * 82597EX errata.  Since the lane deskew problem may prevent
+         * link, reset the link before reporting link down.
+         */
+        hw->link_up = ixgb_link_reset(hw);
+    }
+    /*  Anything else for 10 Gig?? */
+}
+
+/******************************************************************************
+ * Check for a bad link condition that may have occured.
+ * The indication is that the RFC / LFC registers may be incrementing
+ * continually.  A full adapter reset is required to recover.
+ *
+ * hw - Struct containing variables accessed by hw code
+ *
+ * Called by any function that needs to check the link status of the adapter.
+ *****************************************************************************/
+boolean_t ixgb_check_for_bad_link(struct ixgb_hw *hw)
+{
+    uint32_t newLFC, newRFC;
+    boolean_t bad_link_returncode = FALSE;
+
+    if (hw->phy_type == ixgb_phy_type_txn17401) {
+        newLFC = IXGB_READ_REG(hw, LFC);
+        newRFC = IXGB_READ_REG(hw, RFC);
+        if ((hw->lastLFC + 250 < newLFC) || (hw->lastRFC + 250 < newRFC)) {
+            DEBUGOUT("BAD LINK! too many LFC/RFC since last check\n");
+            bad_link_returncode = TRUE;
+        }
+        hw->lastLFC = newLFC;
+        hw->lastRFC = newRFC;
+    }
+
+    return bad_link_returncode;
+}
+
+
+/******************************************************************************
+ * Clears all hardware statistics counters.
+ *
+ * hw - Struct containing variables accessed by shared code
+ *****************************************************************************/
+void
+ixgb_clear_hw_cntrs(struct ixgb_hw *hw)
+{
+    volatile uint32_t temp_reg;
+
+    DEBUGFUNC("ixgb_clear_hw_cntrs");
+
+    /* if we are stopped or resetting exit gracefully */
+    if(hw->adapter_stopped) {
+        DEBUGOUT("Exiting because the adapter is stopped!!!\n");
+        return;
+    }
+
+    temp_reg = IXGB_READ_REG(hw, TPRL);
+    temp_reg = IXGB_READ_REG(hw, TPRH);
+    temp_reg = IXGB_READ_REG(hw, GPRCL);
+    temp_reg = IXGB_READ_REG(hw, GPRCH);
+    temp_reg = IXGB_READ_REG(hw, BPRCL);
+    temp_reg = IXGB_READ_REG(hw, BPRCH);
+    temp_reg = IXGB_READ_REG(hw, MPRCL);
+    temp_reg = IXGB_READ_REG(hw, MPRCH);
+    temp_reg = IXGB_READ_REG(hw, UPRCL);
+    temp_reg = IXGB_READ_REG(hw, UPRCH);
+    temp_reg = IXGB_READ_REG(hw, VPRCL);
+    temp_reg = IXGB_READ_REG(hw, VPRCH);
+    temp_reg = IXGB_READ_REG(hw, JPRCL);
+    temp_reg = IXGB_READ_REG(hw, JPRCH);
+    temp_reg = IXGB_READ_REG(hw, GORCL);
+    temp_reg = IXGB_READ_REG(hw, GORCH);
+    temp_reg = IXGB_READ_REG(hw, TORL);
+    temp_reg = IXGB_READ_REG(hw, TORH);
+    temp_reg = IXGB_READ_REG(hw, RNBC);
+    temp_reg = IXGB_READ_REG(hw, RUC);
+    temp_reg = IXGB_READ_REG(hw, ROC);
+    temp_reg = IXGB_READ_REG(hw, RLEC);
+    temp_reg = IXGB_READ_REG(hw, CRCERRS);
+    temp_reg = IXGB_READ_REG(hw, ICBC);
+    temp_reg = IXGB_READ_REG(hw, ECBC);
+    temp_reg = IXGB_READ_REG(hw, MPC);
+    temp_reg = IXGB_READ_REG(hw, TPTL);
+    temp_reg = IXGB_READ_REG(hw, TPTH);
+    temp_reg = IXGB_READ_REG(hw, GPTCL);
+    temp_reg = IXGB_READ_REG(hw, GPTCH);
+    temp_reg = IXGB_READ_REG(hw, BPTCL);
+    temp_reg = IXGB_READ_REG(hw, BPTCH);
+    temp_reg = IXGB_READ_REG(hw, MPTCL);
+    temp_reg = IXGB_READ_REG(hw, MPTCH);
+    temp_reg = IXGB_READ_REG(hw, UPTCL);
+    temp_reg = IXGB_READ_REG(hw, UPTCH);
+    temp_reg = IXGB_READ_REG(hw, VPTCL);
+    temp_reg = IXGB_READ_REG(hw, VPTCH);
+    temp_reg = IXGB_READ_REG(hw, JPTCL);
+    temp_reg = IXGB_READ_REG(hw, JPTCH);
+    temp_reg = IXGB_READ_REG(hw, GOTCL);
+    temp_reg = IXGB_READ_REG(hw, GOTCH);
+    temp_reg = IXGB_READ_REG(hw, TOTL);
+    temp_reg = IXGB_READ_REG(hw, TOTH);
+    temp_reg = IXGB_READ_REG(hw, DC);
+    temp_reg = IXGB_READ_REG(hw, PLT64C);
+    temp_reg = IXGB_READ_REG(hw, TSCTC);
+    temp_reg = IXGB_READ_REG(hw, TSCTFC);
+    temp_reg = IXGB_READ_REG(hw, IBIC);
+    temp_reg = IXGB_READ_REG(hw, RFC);
+    temp_reg = IXGB_READ_REG(hw, LFC);
+    temp_reg = IXGB_READ_REG(hw, PFRC);
+    temp_reg = IXGB_READ_REG(hw, PFTC);
+    temp_reg = IXGB_READ_REG(hw, MCFRC);
+    temp_reg = IXGB_READ_REG(hw, MCFTC);
+    temp_reg = IXGB_READ_REG(hw, XONRXC);
+    temp_reg = IXGB_READ_REG(hw, XONTXC);
+    temp_reg = IXGB_READ_REG(hw, XOFFRXC);
+    temp_reg = IXGB_READ_REG(hw, XOFFTXC);
+    temp_reg = IXGB_READ_REG(hw, RJC);
+    return;
+}
+
+
+/******************************************************************************
+ * Turns on the software controllable LED
+ *
+ * hw - Struct containing variables accessed by shared code
+ *****************************************************************************/
+void
+ixgb_led_on(struct ixgb_hw *hw)
+{
+    uint32_t ctrl0_reg = IXGB_READ_REG(hw, CTRL0);
+
+    /* To turn on the LED, clear software-definable pin 0 (SDP0). */
+    ctrl0_reg &= ~IXGB_CTRL0_SDP0;
+    IXGB_WRITE_REG(hw, CTRL0, ctrl0_reg);
+    return;
+}
+
+/******************************************************************************
+ * Turns off the software controllable LED
+ *
+ * hw - Struct containing variables accessed by shared code
+ *****************************************************************************/
+void
+ixgb_led_off(struct ixgb_hw *hw)
+{
+    uint32_t ctrl0_reg = IXGB_READ_REG(hw, CTRL0);
+
+    /* To turn off the LED, set software-definable pin 0 (SDP0). */
+    ctrl0_reg |= IXGB_CTRL0_SDP0;
+    IXGB_WRITE_REG(hw, CTRL0, ctrl0_reg);
+    return;
+}
+
+
+/******************************************************************************
+ * Gets the current PCI bus type, speed, and width of the hardware
+ *
+ * hw - Struct containing variables accessed by shared code
+ *****************************************************************************/
+static void
+ixgb_get_bus_info(struct ixgb_hw *hw)
+{
+    uint32_t status_reg;
+
+    status_reg = IXGB_READ_REG(hw, STATUS);
+
+    hw->bus.type = (status_reg & IXGB_STATUS_PCIX_MODE) ?
+        ixgb_bus_type_pcix : ixgb_bus_type_pci;
+
+    if (hw->bus.type == ixgb_bus_type_pci) {
+        hw->bus.speed = (status_reg & IXGB_STATUS_PCI_SPD) ?
+            ixgb_bus_speed_66 : ixgb_bus_speed_33;
+    } else {
+        switch (status_reg & IXGB_STATUS_PCIX_SPD_MASK) {
+        case IXGB_STATUS_PCIX_SPD_66:
+            hw->bus.speed = ixgb_bus_speed_66;
+            break;
+        case IXGB_STATUS_PCIX_SPD_100:
+            hw->bus.speed = ixgb_bus_speed_100;
+            break;
+        case IXGB_STATUS_PCIX_SPD_133:
+            hw->bus.speed = ixgb_bus_speed_133;
+            break;
+        default:
+            hw->bus.speed = ixgb_bus_speed_reserved;
+            break;
+        }
+    }
+
+    hw->bus.width = (status_reg & IXGB_STATUS_BUS64) ?
+        ixgb_bus_width_64 : ixgb_bus_width_32;
+
+    return;
+}
+
+
+
+/******************************************************************************
+ * Tests a MAC address to ensure it is a valid Individual Address
+ *
+ * mac_addr - pointer to MAC address.
+ *
+ *****************************************************************************/
+boolean_t
+mac_addr_valid(uint8_t *mac_addr)
+{
+    boolean_t       is_valid                = TRUE;
+    DEBUGFUNC("mac_addr_valid");
+
+
+    /* Make sure it is not a multicast address */
+    if (IS_MULTICAST(mac_addr)) {
+        DEBUGOUT("MAC address is multicast\n");
+        is_valid = FALSE;
+    }
+    /* Not a broadcast address */
+    else if (IS_BROADCAST(mac_addr)) {
+        DEBUGOUT("MAC address is broadcast\n");
+        is_valid = FALSE;
+    }
+    /* Reject the zero address */
+    else if (mac_addr[0] == 0 &&
+             mac_addr[1] == 0 &&
+             mac_addr[2] == 0 &&
+             mac_addr[3] == 0 &&
+             mac_addr[4] == 0 &&
+             mac_addr[5] == 0) {
+        DEBUGOUT("MAC address is all zeros\n");
+        is_valid = FALSE;
+    }
+    return (is_valid);
+}
+
+/******************************************************************************
+ * Resets the 10GbE link.  Waits the settle time and returns the state of
+ * the link.
+ *
+ * hw - Struct containing variables accessed by shared code
+ *****************************************************************************/
+boolean_t
+ixgb_link_reset(struct ixgb_hw *hw)
+{
+    boolean_t link_status = FALSE;
+    uint8_t   wait_retries = MAX_RESET_ITERATIONS;
+    uint8_t   lrst_retries = MAX_RESET_ITERATIONS;
+
+
+    do {
+       /* Reset the link */
+       IXGB_WRITE_REG(hw, CTRL0, IXGB_READ_REG(hw, CTRL0) | IXGB_CTRL0_LRST);
+
+       /* Wait for link-up and lane re-alignment */
+       do {
+           usec_delay(IXGB_DELAY_USECS_AFTER_LINK_RESET);
+           link_status = ((IXGB_READ_REG(hw, STATUS) & IXGB_STATUS_LU) &&
+               (IXGB_READ_REG(hw, XPCSS) & IXGB_XPCSS_ALIGN_STATUS)) ?
+               TRUE : FALSE;
+       } while (!link_status && -- wait_retries);
+
+    } while (!link_status && --lrst_retries);
+
+    return link_status;
+}
+
+
+
+/******************************************************************************
+ * Resets the 10GbE optics module.
+ *
+ * hw - Struct containing variables accessed by shared code
+ *****************************************************************************/
+void
+ixgb_optics_reset(struct ixgb_hw *hw)
+{
+    if (hw->phy_type == ixgb_phy_type_txn17401) {
+        uint16_t mdio_reg;
+
+        ixgb_write_phy_reg( hw,
+                            MDIO_PMA_PMD_CR1,
+                            IXGB_PHY_ADDRESS,
+                            MDIO_PMA_PMD_DID,
+                            MDIO_PMA_PMD_CR1_RESET);
+
+        mdio_reg = ixgb_read_phy_reg( hw,
+                            MDIO_PMA_PMD_CR1,
+                            IXGB_PHY_ADDRESS,
+                            MDIO_PMA_PMD_DID);
+    }
+
+    return;
+}
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/ixgb/ixgb_hw.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/ixgb/ixgb_hw.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/ixgb/ixgb_hw.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/ixgb/ixgb_hw.h	2004-09-09 13:21:58.000000000 +0200
@@ -0,0 +1,851 @@
+/*******************************************************************************
+
+  
+  Copyright(c) 1999 - 2004 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 
+  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  02111-1307, USA.
+  
+  The full GNU General Public License is included in this distribution in the
+  file called LICENSE.
+  
+  Contact Information:
+  Linux NICS <linux.nics@intel.com>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+*******************************************************************************/
+
+#ifndef _IXGB_HW_H_
+#define _IXGB_HW_H_
+
+#include "ixgb_osdep.h"
+
+/* Enums */
+typedef enum {
+    ixgb_mac_unknown = 0,
+    ixgb_82597,
+    ixgb_num_macs
+} ixgb_mac_type;
+
+/* Types of physical layer modules */
+typedef enum {
+    ixgb_phy_type_unknown = 0,
+    ixgb_phy_type_g6005,          /* 850nm, MM fiber, XPAK transceiver */
+    ixgb_phy_type_g6104,          /* 1310nm, SM fiber, XPAK transceiver */
+    ixgb_phy_type_txn17201,       /* 850nm, MM fiber, XPAK transceiver */
+    ixgb_phy_type_txn17401        /* 1310nm, SM fiber, XENPAK transceiver */
+} ixgb_phy_type;
+
+/* XPAK transceiver vendors, for the SR adapters */
+typedef enum {
+    ixgb_xpak_vendor_intel,
+    ixgb_xpak_vendor_infineon
+} ixgb_xpak_vendor;
+
+/* Media Types */
+typedef enum {
+    ixgb_media_type_unknown = 0,
+    ixgb_media_type_fiber = 1,
+    ixgb_num_media_types
+} ixgb_media_type;
+
+/* Flow Control Settings */
+typedef enum {
+    ixgb_fc_none = 0,
+    ixgb_fc_rx_pause = 1,
+    ixgb_fc_tx_pause = 2,
+    ixgb_fc_full = 3,
+    ixgb_fc_default = 0xFF
+} ixgb_fc_type;
+
+/* PCI bus types */
+typedef enum {
+    ixgb_bus_type_unknown = 0,
+    ixgb_bus_type_pci,
+    ixgb_bus_type_pcix
+} ixgb_bus_type;
+
+/* PCI bus speeds */
+typedef enum {
+    ixgb_bus_speed_unknown = 0,
+    ixgb_bus_speed_33,
+    ixgb_bus_speed_66,
+    ixgb_bus_speed_100,
+    ixgb_bus_speed_133,
+    ixgb_bus_speed_reserved
+} ixgb_bus_speed;
+
+/* PCI bus widths */
+typedef enum {
+    ixgb_bus_width_unknown = 0,
+    ixgb_bus_width_32,
+    ixgb_bus_width_64
+} ixgb_bus_width;
+
+
+#define IXGB_ETH_LENGTH_OF_ADDRESS   6
+
+#define IXGB_EEPROM_SIZE    64   /* Size in words */
+
+#define SPEED_10000  10000
+#define FULL_DUPLEX  2
+
+#define MIN_NUMBER_OF_DESCRIPTORS       8
+#define MAX_NUMBER_OF_DESCRIPTORS  0xFFF8  /* 13 bits in RDLEN/TDLEN, 128B aligned     */
+
+#define IXGB_DELAY_BEFORE_RESET        10  /* allow 10ms after idling rx/tx units      */
+#define IXGB_DELAY_AFTER_RESET          1  /* allow 1ms after the reset                */
+#define IXGB_DELAY_AFTER_EE_RESET      10  /* allow 10ms after the EEPROM reset        */
+
+#define IXGB_DELAY_USECS_AFTER_LINK_RESET    13  /* allow 13 microseconds after the reset    */
+                                           /* NOTE: this is MICROSECONDS               */
+#define MAX_RESET_ITERATIONS            8  /* number of iterations to get things right */
+
+/* General Registers */
+#define IXGB_CTRL0   0x00000 /* Device Control Register 0 - RW */
+#define IXGB_CTRL1   0x00008 /* Device Control Register 1 - RW */
+#define IXGB_STATUS  0x00010 /* Device Status Register - RO */
+#define IXGB_EECD    0x00018 /* EEPROM/Flash Control/Data Register - RW */
+#define IXGB_MFS     0x00020 /* Maximum Frame Size - RW */
+
+/* Interrupt */
+#define IXGB_ICR     0x00080 /* Interrupt Cause Read - R/clr */
+#define IXGB_ICS     0x00088 /* Interrupt Cause Set - RW */
+#define IXGB_IMS     0x00090 /* Interrupt Mask Set/Read - RW */
+#define IXGB_IMC     0x00098 /* Interrupt Mask Clear - WO */
+
+/* Receive */
+#define IXGB_RCTL    0x00100 /* RX Control - RW */
+#define IXGB_FCRTL   0x00108 /* Flow Control Receive Threshold Low - RW */
+#define IXGB_FCRTH   0x00110 /* Flow Control Receive Threshold High - RW */
+#define IXGB_RDBAL   0x00118 /* RX Descriptor Base Low - RW */
+#define IXGB_RDBAH   0x0011C /* RX Descriptor Base High - RW */
+#define IXGB_RDLEN   0x00120 /* RX Descriptor Length - RW */
+#define IXGB_RDH     0x00128 /* RX Descriptor Head - RW */
+#define IXGB_RDT     0x00130 /* RX Descriptor Tail - RW */
+#define IXGB_RDTR    0x00138 /* RX Delay Timer Ring - RW */
+#define IXGB_RXDCTL  0x00140 /* Receive Descriptor Control - RW */
+#define IXGB_RAIDC   0x00148 /* Receive Adaptive Interrupt Delay Control - RW */
+#define IXGB_RXCSUM  0x00158 /* Receive Checksum Control - RW */
+#define IXGB_RA      0x00180 /* Receive Address Array Base - RW */
+#define IXGB_RAL     0x00180 /* Receive Address Low [0:15] - RW */
+#define IXGB_RAH     0x00184 /* Receive Address High [0:15] - RW */
+#define IXGB_MTA     0x00200 /* Multicast Table Array [0:127] - RW */
+#define IXGB_VFTA    0x00400 /* VLAN Filter Table Array [0:127] - RW */
+#define IXGB_REQ_RX_DESCRIPTOR_MULTIPLE 8
+
+/* Transmit */
+#define IXGB_TCTL    0x00600 /* TX Control - RW */
+#define IXGB_TDBAL   0x00608 /* TX Descriptor Base Low - RW */
+#define IXGB_TDBAH   0x0060C /* TX Descriptor Base High - RW */
+#define IXGB_TDLEN   0x00610 /* TX Descriptor Length - RW */
+#define IXGB_TDH     0x00618 /* TX Descriptor Head - RW */
+#define IXGB_TDT     0x00620 /* TX Descriptor Tail - RW */
+#define IXGB_TIDV    0x00628 /* TX Interrupt Delay Value - RW */
+#define IXGB_TXDCTL  0x00630 /* Transmit Descriptor Control - RW */
+#define IXGB_TSPMT   0x00638 /* TCP Segmentation PAD & Min Threshold - RW */
+#define IXGB_PAP     0x00640 /* Pause and Pace - RW */
+#define IXGB_REQ_TX_DESCRIPTOR_MULTIPLE 8
+
+/* Physical */
+#define IXGB_PCSC1   0x00700 /* PCS Control 1 - RW */
+#define IXGB_PCSC2   0x00708 /* PCS Control 2 - RW */
+#define IXGB_PCSS1   0x00710 /* PCS Status 1 - RO */
+#define IXGB_PCSS2   0x00718 /* PCS Status 2 - RO */
+#define IXGB_XPCSS   0x00720 /* 10GBASE-X PCS Status (or XGXS Lane Status) - RO */
+#define IXGB_UCCR    0x00728 /* Unilink Circuit Control Register */
+#define IXGB_XPCSTC  0x00730 /* 10GBASE-X PCS Test Control */
+#define IXGB_MACA    0x00738 /* MDI Autoscan Command and Address - RW */
+#define IXGB_APAE    0x00740 /* Autoscan PHY Address Enable - RW */
+#define IXGB_ARD     0x00748 /* Autoscan Read Data - RO */
+#define IXGB_AIS     0x00750 /* Autoscan Interrupt Status - RO */
+#define IXGB_MSCA    0x00758 /* MDI Single Command and Address - RW */
+#define IXGB_MSRWD   0x00760 /* MDI Single Read and Write Data - RW, RO */
+
+/* Wake-up */
+#define IXGB_WUFC    0x00808 /* Wake Up Filter Control - RW */
+#define IXGB_WUS     0x00810 /* Wake Up Status - RO */
+#define IXGB_FFLT    0x01000 /* Flexible Filter Length Table - RW */
+#define IXGB_FFMT    0x01020 /* Flexible Filter Mask Table - RW */
+#define IXGB_FTVT    0x01420 /* Flexible Filter Value Table - RW */
+
+/* Statistics */
+#define IXGB_TPRL    0x02000 /* Total Packets Received (Low) */
+#define IXGB_TPRH    0x02004 /* Total Packets Received (High) */
+#define IXGB_GPRCL   0x02008 /* Good Packets Received Count (Low) */
+#define IXGB_GPRCH   0x0200C /* Good Packets Received Count (High) */
+#define IXGB_BPRCL   0x02010 /* Broadcast Packets Received Count (Low) */
+#define IXGB_BPRCH   0x02014 /* Broadcast Packets Received Count (High) */
+#define IXGB_MPRCL   0x02018 /* Multicast Packets Received Count (Low) */
+#define IXGB_MPRCH   0x0201C /* Multicast Packets Received Count (High) */
+#define IXGB_UPRCL   0x02020 /* Unicast Packets Received Count (Low) */
+#define IXGB_UPRCH   0x02024 /* Unicast Packets Received Count (High) */
+#define IXGB_VPRCL   0x02028 /* VLAN Packets Received Count (Low) */
+#define IXGB_VPRCH   0x0202C /* VLAN Packets Received Count (High) */
+#define IXGB_JPRCL   0x02030 /* Jumbo Packets Received Count (Low) */
+#define IXGB_JPRCH   0x02034 /* Jumbo Packets Received Count (High) */
+#define IXGB_GORCL   0x02038 /* Good Octets Received Count (Low) */
+#define IXGB_GORCH   0x0203C /* Good Octets Received Count (High) */
+#define IXGB_TORL    0x02040 /* Total Octets Received (Low) */
+#define IXGB_TORH    0x02044 /* Total Octets Received (High) */
+#define IXGB_RNBC    0x02048 /* Receive No Buffers Count */
+#define IXGB_RUC     0x02050 /* Receive Undersize Count */
+#define IXGB_ROC     0x02058 /* Receive Oversize Count */
+#define IXGB_RLEC    0x02060 /* Receive Length Error Count */
+#define IXGB_CRCERRS 0x02068 /* CRC Error Count */
+#define IXGB_ICBC    0x02070 /* Illegal control byte in mid-packet Count */
+#define IXGB_ECBC    0x02078 /* Error Control byte in mid-packet Count */
+#define IXGB_MPC     0x02080 /* Missed Packets Count */
+#define IXGB_TPTL    0x02100 /* Total Packets Transmitted (Low) */
+#define IXGB_TPTH    0x02104 /* Total Packets Transmitted (High) */
+#define IXGB_GPTCL   0x02108 /* Good Packets Transmitted Count (Low) */
+#define IXGB_GPTCH   0x0210C /* Good Packets Transmitted Count (High) */
+#define IXGB_BPTCL   0x02110 /* Broadcast Packets Transmitted Count (Low) */
+#define IXGB_BPTCH   0x02114 /* Broadcast Packets Transmitted Count (High) */
+#define IXGB_MPTCL   0x02118 /* Multicast Packets Transmitted Count (Low) */
+#define IXGB_MPTCH   0x0211C /* Multicast Packets Transmitted Count (High) */
+#define IXGB_UPTCL   0x02120 /* Unicast Packets Transmitted Count (Low) */
+#define IXGB_UPTCH   0x02124 /* Unicast Packets Transmitted Count (High) */
+#define IXGB_VPTCL   0x02128 /* VLAN Packets Transmitted Count (Low) */
+#define IXGB_VPTCH   0x0212C /* VLAN Packets Transmitted Count (High) */
+#define IXGB_JPTCL   0x02130 /* Jumbo Packets Transmitted Count (Low) */
+#define IXGB_JPTCH   0x02134 /* Jumbo Packets Transmitted Count (High) */
+#define IXGB_GOTCL   0x02138 /* Good Octets Transmitted Count (Low) */
+#define IXGB_GOTCH   0x0213C /* Good Octets Transmitted Count (High) */
+#define IXGB_TOTL    0x02140 /* Total Octets Transmitted Count (Low) */
+#define IXGB_TOTH    0x02144 /* Total Octets Transmitted Count (High) */
+#define IXGB_DC      0x02148 /* Defer Count */
+#define IXGB_PLT64C  0x02150 /* Packet Transmitted was less than 64 bytes Count */
+#define IXGB_TSCTC   0x02170 /* TCP Segmentation Context Transmitted Count */
+#define IXGB_TSCTFC  0x02178 /* TCP Segmentation Context Tx Fail Count */
+#define IXGB_IBIC    0x02180 /* Illegal byte during Idle stream count */
+#define IXGB_RFC     0x02188 /* Remote Fault Count */
+#define IXGB_LFC     0x02190 /* Local Fault Count */
+#define IXGB_PFRC    0x02198 /* Pause Frame Receive Count */
+#define IXGB_PFTC    0x021A0 /* Pause Frame Transmit Count */
+#define IXGB_MCFRC   0x021A8 /* MAC Control Frames (non-Pause) Received Count */
+#define IXGB_MCFTC   0x021B0 /* MAC Control Frames (non-Pause) Transmitted Count */
+#define IXGB_XONRXC  0x021B8 /* XON Received Count */
+#define IXGB_XONTXC  0x021C0 /* XON Transmitted Count */
+#define IXGB_XOFFRXC 0x021C8 /* XOFF Received Count */
+#define IXGB_XOFFTXC 0x021D0 /* XOFF Transmitted Count */
+#define IXGB_RJC     0x021D8 /* Receive Jabber Count */
+
+
+/* CTRL0 Bit Masks */
+#define IXGB_CTRL0_LRST     0x00000008
+#define IXGB_CTRL0_JFE      0x00000010
+#define IXGB_CTRL0_XLE      0x00000020
+#define IXGB_CTRL0_MDCS     0x00000040
+#define IXGB_CTRL0_CMDC     0x00000080
+#define IXGB_CTRL0_SDP0     0x00040000
+#define IXGB_CTRL0_SDP1     0x00080000
+#define IXGB_CTRL0_SDP2     0x00100000
+#define IXGB_CTRL0_SDP3     0x00200000
+#define IXGB_CTRL0_SDP0_DIR 0x00400000
+#define IXGB_CTRL0_SDP1_DIR 0x00800000
+#define IXGB_CTRL0_SDP2_DIR 0x01000000
+#define IXGB_CTRL0_SDP3_DIR 0x02000000
+#define IXGB_CTRL0_RST      0x04000000
+#define IXGB_CTRL0_RPE      0x08000000
+#define IXGB_CTRL0_TPE      0x10000000
+#define IXGB_CTRL0_VME      0x40000000
+
+/* CTRL1 Bit Masks */
+#define IXGB_CTRL1_GPI0_EN     0x00000001
+#define IXGB_CTRL1_GPI1_EN     0x00000002
+#define IXGB_CTRL1_GPI2_EN     0x00000004
+#define IXGB_CTRL1_GPI3_EN     0x00000008
+#define IXGB_CTRL1_SDP4        0x00000010
+#define IXGB_CTRL1_SDP5        0x00000020
+#define IXGB_CTRL1_SDP6        0x00000040
+#define IXGB_CTRL1_SDP7        0x00000080
+#define IXGB_CTRL1_SDP4_DIR    0x00000100
+#define IXGB_CTRL1_SDP5_DIR    0x00000200
+#define IXGB_CTRL1_SDP6_DIR    0x00000400
+#define IXGB_CTRL1_SDP7_DIR    0x00000800
+#define IXGB_CTRL1_EE_RST      0x00002000
+#define IXGB_CTRL1_RO_DIS      0x00020000
+#define IXGB_CTRL1_PCIXHM_MASK 0x00C00000
+#define IXGB_CTRL1_PCIXHM_1_2  0x00000000
+#define IXGB_CTRL1_PCIXHM_5_8  0x00400000
+#define IXGB_CTRL1_PCIXHM_3_4  0x00800000
+#define IXGB_CTRL1_PCIXHM_7_8  0x00C00000
+
+/* STATUS Bit Masks */
+#define IXGB_STATUS_LU            0x00000002
+#define IXGB_STATUS_AIP           0x00000004
+#define IXGB_STATUS_TXOFF         0x00000010
+#define IXGB_STATUS_XAUIME        0x00000020
+#define IXGB_STATUS_RES           0x00000040
+#define IXGB_STATUS_RIS           0x00000080
+#define IXGB_STATUS_RIE           0x00000100
+#define IXGB_STATUS_RLF           0x00000200
+#define IXGB_STATUS_RRF           0x00000400
+#define IXGB_STATUS_PCI_SPD       0x00000800
+#define IXGB_STATUS_BUS64         0x00001000
+#define IXGB_STATUS_PCIX_MODE     0x00002000
+#define IXGB_STATUS_PCIX_SPD_MASK 0x0000C000
+#define IXGB_STATUS_PCIX_SPD_66   0x00000000
+#define IXGB_STATUS_PCIX_SPD_100  0x00004000
+#define IXGB_STATUS_PCIX_SPD_133  0x00008000
+#define IXGB_STATUS_REV_ID_MASK   0x000F0000
+#define IXGB_STATUS_REV_ID_SHIFT  16
+
+/* EECD Bit Masks */
+#define IXGB_EECD_SK       0x00000001
+#define IXGB_EECD_CS       0x00000002
+#define IXGB_EECD_DI       0x00000004
+#define IXGB_EECD_DO       0x00000008
+#define IXGB_EECD_FWE_MASK 0x00000030
+#define IXGB_EECD_FWE_DIS  0x00000010
+#define IXGB_EECD_FWE_EN   0x00000020
+
+/* MFS */
+#define IXGB_MFS_SHIFT 16
+
+/* Interrupt Register Bit Masks (used for ICR, ICS, IMS, and IMC) */
+#define IXGB_INT_TXDW     0x00000001
+#define IXGB_INT_TXQE     0x00000002
+#define IXGB_INT_LSC      0x00000004
+#define IXGB_INT_RXSEQ    0x00000008
+#define IXGB_INT_RXDMT0   0x00000010
+#define IXGB_INT_RXO      0x00000040
+#define IXGB_INT_RXT0     0x00000080
+#define IXGB_INT_AUTOSCAN 0x00000200
+#define IXGB_INT_GPI0     0x00000800
+#define IXGB_INT_GPI1     0x00001000
+#define IXGB_INT_GPI2     0x00002000
+#define IXGB_INT_GPI3     0x00004000
+
+/* RCTL Bit Masks */
+#define IXGB_RCTL_RXEN        0x00000002
+#define IXGB_RCTL_SBP         0x00000004
+#define IXGB_RCTL_UPE         0x00000008
+#define IXGB_RCTL_MPE         0x00000010
+#define IXGB_RCTL_RDMTS_MASK  0x00000300
+#define IXGB_RCTL_RDMTS_1_2   0x00000000
+#define IXGB_RCTL_RDMTS_1_4   0x00000100
+#define IXGB_RCTL_RDMTS_1_8   0x00000200
+#define IXGB_RCTL_MO_MASK     0x00003000
+#define IXGB_RCTL_MO_47_36    0x00000000
+#define IXGB_RCTL_MO_46_35    0x00001000
+#define IXGB_RCTL_MO_45_34    0x00002000
+#define IXGB_RCTL_MO_43_32    0x00003000
+#define IXGB_RCTL_MO_SHIFT    12
+#define IXGB_RCTL_BAM         0x00008000
+#define IXGB_RCTL_BSIZE_MASK  0x00030000
+#define IXGB_RCTL_BSIZE_2048  0x00000000
+#define IXGB_RCTL_BSIZE_4096  0x00010000
+#define IXGB_RCTL_BSIZE_8192  0x00020000
+#define IXGB_RCTL_BSIZE_16384 0x00030000
+#define IXGB_RCTL_VFE         0x00040000
+#define IXGB_RCTL_CFIEN       0x00080000
+#define IXGB_RCTL_CFI         0x00100000
+#define IXGB_RCTL_RPDA_MASK   0x00600000
+#define IXGB_RCTL_RPDA_MC_MAC 0x00000000
+#define IXGB_RCTL_MC_ONLY     0x00400000
+#define IXGB_RCTL_CFF         0x00800000
+#define IXGB_RCTL_SECRC       0x04000000
+#define IXGB_RDT_FPDB         0x80000000
+
+#define IXGB_RCTL_IDLE_RX_UNIT 0
+
+/* FCRTL Bit Masks */
+#define IXGB_FCRTL_XONE       0x80000000
+
+/* RXDCTL Bit Masks */
+#define IXGB_RXDCTL_PTHRESH_MASK  0x000001FF
+#define IXGB_RXDCTL_PTHRESH_SHIFT 0
+#define IXGB_RXDCTL_HTHRESH_MASK  0x0003FE00
+#define IXGB_RXDCTL_HTHRESH_SHIFT 9
+#define IXGB_RXDCTL_WTHRESH_MASK  0x07FC0000
+#define IXGB_RXDCTL_WTHRESH_SHIFT 18
+
+/* RAIDC Bit Masks */
+#define IXGB_RAIDC_HIGHTHRS_MASK 0x0000003F
+#define IXGB_RAIDC_DELAY_MASK    0x000FF800
+#define IXGB_RAIDC_DELAY_SHIFT   11
+#define IXGB_RAIDC_POLL_MASK     0x1FF00000
+#define IXGB_RAIDC_POLL_SHIFT    20
+#define IXGB_RAIDC_RXT_GATE      0x40000000
+#define IXGB_RAIDC_EN            0x80000000
+
+#define IXGB_RAIDC_POLL_1000_INTERRUPTS_PER_SECOND      1220
+#define IXGB_RAIDC_POLL_5000_INTERRUPTS_PER_SECOND      244
+#define IXGB_RAIDC_POLL_10000_INTERRUPTS_PER_SECOND     122
+#define IXGB_RAIDC_POLL_20000_INTERRUPTS_PER_SECOND     61
+
+/* RXCSUM Bit Masks */
+#define IXGB_RXCSUM_IPOFL 0x00000100
+#define IXGB_RXCSUM_TUOFL 0x00000200
+
+/* RAH Bit Masks */
+#define IXGB_RAH_ASEL_MASK 0x00030000
+#define IXGB_RAH_ASEL_DEST 0x00000000
+#define IXGB_RAH_ASEL_SRC  0x00010000
+#define IXGB_RAH_AV        0x80000000
+
+/* TCTL Bit Masks */
+#define IXGB_TCTL_TCE  0x00000001
+#define IXGB_TCTL_TXEN 0x00000002
+#define IXGB_TCTL_TPDE 0x00000004
+
+#define IXGB_TCTL_IDLE_TX_UNIT  0
+
+/* TXDCTL Bit Masks */
+#define IXGB_TXDCTL_PTHRESH_MASK  0x0000007F
+#define IXGB_TXDCTL_HTHRESH_MASK  0x00007F00
+#define IXGB_TXDCTL_HTHRESH_SHIFT 8
+#define IXGB_TXDCTL_WTHRESH_MASK  0x007F0000
+#define IXGB_TXDCTL_WTHRESH_SHIFT 16
+
+/* TSPMT Bit Masks */
+#define IXGB_TSPMT_TSMT_MASK   0x0000FFFF
+#define IXGB_TSPMT_TSPBP_MASK  0xFFFF0000
+#define IXGB_TSPMT_TSPBP_SHIFT 16
+
+/* PAP Bit Masks */
+#define IXGB_PAP_TXPC_MASK 0x0000FFFF
+#define IXGB_PAP_TXPV_MASK 0x000F0000
+#define IXGB_PAP_TXPV_10G  0x00000000
+#define IXGB_PAP_TXPV_1G   0x00010000
+#define IXGB_PAP_TXPV_2G   0x00020000
+#define IXGB_PAP_TXPV_3G   0x00030000
+#define IXGB_PAP_TXPV_4G   0x00040000
+#define IXGB_PAP_TXPV_5G   0x00050000
+#define IXGB_PAP_TXPV_6G   0x00060000
+#define IXGB_PAP_TXPV_7G   0x00070000
+#define IXGB_PAP_TXPV_8G   0x00080000
+#define IXGB_PAP_TXPV_9G   0x00090000
+#define IXGB_PAP_TXPV_WAN  0x000F0000
+
+/* PCSC1 Bit Masks */
+#define IXGB_PCSC1_LOOPBACK 0x00004000
+
+/* PCSC2 Bit Masks */
+#define IXGB_PCSC2_PCS_TYPE_MASK  0x00000003
+#define IXGB_PCSC2_PCS_TYPE_10GBX 0x00000001
+
+/* PCSS1 Bit Masks */
+#define IXGB_PCSS1_LOCAL_FAULT    0x00000080
+#define IXGB_PCSS1_RX_LINK_STATUS 0x00000004
+
+/* PCSS2 Bit Masks */
+#define IXGB_PCSS2_DEV_PRES_MASK 0x0000C000
+#define IXGB_PCSS2_DEV_PRES      0x00004000
+#define IXGB_PCSS2_TX_LF         0x00000800
+#define IXGB_PCSS2_RX_LF         0x00000400
+#define IXGB_PCSS2_10GBW         0x00000004
+#define IXGB_PCSS2_10GBX         0x00000002
+#define IXGB_PCSS2_10GBR         0x00000001
+
+/* XPCSS Bit Masks */
+#define IXGB_XPCSS_ALIGN_STATUS 0x00001000
+#define IXGB_XPCSS_PATTERN_TEST 0x00000800
+#define IXGB_XPCSS_LANE_3_SYNC  0x00000008
+#define IXGB_XPCSS_LANE_2_SYNC  0x00000004
+#define IXGB_XPCSS_LANE_1_SYNC  0x00000002
+#define IXGB_XPCSS_LANE_0_SYNC  0x00000001
+
+/* XPCSTC Bit Masks */
+#define IXGB_XPCSTC_BERT_TRIG       0x00200000
+#define IXGB_XPCSTC_BERT_SST        0x00100000
+#define IXGB_XPCSTC_BERT_PSZ_MASK   0x000C0000
+#define IXGB_XPCSTC_BERT_PSZ_SHIFT  17
+#define IXGB_XPCSTC_BERT_PSZ_INF    0x00000003
+#define IXGB_XPCSTC_BERT_PSZ_68     0x00000001
+#define IXGB_XPCSTC_BERT_PSZ_1028   0x00000000
+
+/* MSCA bit Masks */
+/* New Protocol Address */
+#define IXGB_MSCA_NP_ADDR_MASK      0x0000FFFF
+#define IXGB_MSCA_NP_ADDR_SHIFT     0
+/* Either Device Type or Register Address,depending on ST_CODE */
+#define IXGB_MSCA_DEV_TYPE_MASK     0x001F0000
+#define IXGB_MSCA_DEV_TYPE_SHIFT    16
+#define IXGB_MSCA_PHY_ADDR_MASK     0x03E00000
+#define IXGB_MSCA_PHY_ADDR_SHIFT    21
+#define IXGB_MSCA_OP_CODE_MASK      0x0C000000
+/* OP_CODE == 00, Address cycle, New Protocol           */
+/* OP_CODE == 01, Write operation                       */
+/* OP_CODE == 10, Read operation                        */
+/* OP_CODE == 11, Read, auto increment, New Protocol    */
+#define IXGB_MSCA_ADDR_CYCLE        0x00000000
+#define IXGB_MSCA_WRITE             0x04000000
+#define IXGB_MSCA_READ              0x08000000
+#define IXGB_MSCA_READ_AUTOINC      0x0C000000
+#define IXGB_MSCA_OP_CODE_SHIFT     26
+#define IXGB_MSCA_ST_CODE_MASK      0x30000000
+/* ST_CODE == 00, New Protocol  */
+/* ST_CODE == 01, Old Protocol  */
+#define IXGB_MSCA_NEW_PROTOCOL      0x00000000
+#define IXGB_MSCA_OLD_PROTOCOL      0x10000000
+#define IXGB_MSCA_ST_CODE_SHIFT     28
+/* Initiate command, self-clearing when command completes */
+#define IXGB_MSCA_MDI_COMMAND       0x40000000
+/*MDI In Progress Enable. */
+#define IXGB_MSCA_MDI_IN_PROG_EN    0x80000000
+
+/* MSRWD bit masks */
+#define IXGB_MSRWD_WRITE_DATA_MASK  0x0000FFFF
+#define IXGB_MSRWD_WRITE_DATA_SHIFT 0
+#define IXGB_MSRWD_READ_DATA_MASK   0xFFFF0000
+#define IXGB_MSRWD_READ_DATA_SHIFT  16
+
+/* Definitions for the optics devices on the MDIO bus. */
+#define IXGB_PHY_ADDRESS             0x0  /* Single PHY, multiple "Devices" */
+
+/* Standard five-bit Device IDs.  See IEEE 802.3ae, clause 45 */
+#define MDIO_PMA_PMD_DID        0x01
+#define MDIO_WIS_DID            0x02
+#define MDIO_PCS_DID            0x03
+#define MDIO_XGXS_DID           0x04
+
+/* Standard PMA/PMD registers and bit definitions. */
+/* Note: This is a very limited set of definitions,      */
+/* only implemented features are defined.                */
+#define MDIO_PMA_PMD_CR1        0x0000
+#define MDIO_PMA_PMD_CR1_RESET  0x8000
+
+#define MDIO_PMA_PMD_XPAK_VENDOR_NAME       0x803A      /* XPAK/XENPAK devices only */
+
+/* Vendor-specific MDIO registers */
+#define G6XXX_PMA_PMD_VS1                   0xC001      /* Vendor-specific register */
+#define G6XXX_XGXS_XAUI_VS2                 0x18        /* Vendor-specific register */
+
+#define G6XXX_PMA_PMD_VS1_PLL_RESET         0x80
+#define G6XXX_PMA_PMD_VS1_REMOVE_PLL_RESET  0x00
+#define G6XXX_XGXS_XAUI_VS2_INPUT_MASK      0x0F        /* XAUI lanes synchronized */
+
+/* Layout of a single receive descriptor.  The controller assumes that this
+ * structure is packed into 16 bytes, which is a safe assumption with most
+ * compilers.  However, some compilers may insert padding between the fields,
+ * in which case the structure must be packed in some compiler-specific
+ * manner. */
+struct ixgb_rx_desc {
+    uint64_t buff_addr;
+    uint16_t length;
+    uint16_t reserved;
+    uint8_t  status;
+    uint8_t  errors;
+    uint16_t special;
+};
+
+#define IXGB_RX_DESC_STATUS_DD    0x01
+#define IXGB_RX_DESC_STATUS_EOP   0x02
+#define IXGB_RX_DESC_STATUS_IXSM  0x04
+#define IXGB_RX_DESC_STATUS_VP    0x08
+#define IXGB_RX_DESC_STATUS_TCPCS 0x20
+#define IXGB_RX_DESC_STATUS_IPCS  0x40
+#define IXGB_RX_DESC_STATUS_PIF   0x80
+
+#define IXGB_RX_DESC_ERRORS_CE   0x01
+#define IXGB_RX_DESC_ERRORS_SE   0x02
+#define IXGB_RX_DESC_ERRORS_P    0x08
+#define IXGB_RX_DESC_ERRORS_TCPE 0x20
+#define IXGB_RX_DESC_ERRORS_IPE  0x40
+#define IXGB_RX_DESC_ERRORS_RXE  0x80
+
+#define IXGB_RX_DESC_SPECIAL_VLAN_MASK  0x0FFF      /* VLAN ID is in lower 12 bits */
+#define IXGB_RX_DESC_SPECIAL_PRI_MASK   0xE000      /* Priority is in upper 3 bits */
+#define IXGB_RX_DESC_SPECIAL_PRI_SHIFT  0x000D      /* Priority is in upper 3 of 16 */
+
+/* Layout of a single transmit descriptor.  The controller assumes that this
+ * structure is packed into 16 bytes, which is a safe assumption with most
+ * compilers.  However, some compilers may insert padding between the fields,
+ * in which case the structure must be packed in some compiler-specific
+ * manner. */
+struct ixgb_tx_desc {
+    uint64_t buff_addr;
+    uint32_t cmd_type_len;
+    uint8_t  status;
+    uint8_t  popts;
+    uint16_t vlan;
+};
+
+#define IXGB_TX_DESC_LENGTH_MASK    0x000FFFFF
+#define IXGB_TX_DESC_TYPE_MASK      0x00F00000
+#define IXGB_TX_DESC_TYPE_SHIFT     20
+#define IXGB_TX_DESC_CMD_MASK       0xFF000000
+#define IXGB_TX_DESC_CMD_SHIFT      24
+#define IXGB_TX_DESC_CMD_EOP        0x01000000
+#define IXGB_TX_DESC_CMD_TSE        0x04000000
+#define IXGB_TX_DESC_CMD_RS         0x08000000
+#define IXGB_TX_DESC_CMD_VLE        0x40000000
+#define IXGB_TX_DESC_CMD_IDE        0x80000000
+
+#define IXGB_TX_DESC_TYPE           0x00100000
+
+#define IXGB_TX_DESC_STATUS_DD  0x01
+
+#define IXGB_TX_DESC_POPTS_IXSM 0x01
+#define IXGB_TX_DESC_POPTS_TXSM 0x02
+#define IXGB_TX_DESC_SPECIAL_PRI_SHIFT  IXGB_RX_DESC_SPECIAL_PRI_SHIFT      /* Priority is in upper 3 of 16 */
+
+struct ixgb_context_desc {
+    uint8_t  ipcss;
+    uint8_t  ipcso;
+    uint16_t ipcse;
+    uint8_t  tucss;
+    uint8_t  tucso;
+    uint16_t tucse;
+    uint32_t cmd_type_len;
+    uint8_t  status;
+    uint8_t  hdr_len;
+    uint16_t mss;
+};
+
+#define IXGB_CONTEXT_DESC_CMD_TCP 0x01000000
+#define IXGB_CONTEXT_DESC_CMD_IP  0x02000000
+#define IXGB_CONTEXT_DESC_CMD_TSE 0x04000000
+#define IXGB_CONTEXT_DESC_CMD_RS  0x08000000
+#define IXGB_CONTEXT_DESC_CMD_IDE 0x80000000
+
+#define IXGB_CONTEXT_DESC_TYPE 0x00000000
+
+#define IXGB_CONTEXT_DESC_STATUS_DD 0x01
+
+/* Filters */
+#define IXGB_RAR_ENTRIES          16   /* Number of entries in Rx Address array */
+#define IXGB_MC_TBL_SIZE          128  /* Multicast Filter Table (4096 bits) */
+#define IXGB_VLAN_FILTER_TBL_SIZE 128  /* VLAN Filter Table (4096 bits) */
+
+#define IXGB_MEMORY_REGISTER_BASE_ADDRESS   0
+#define ENET_HEADER_SIZE            14
+#define ENET_FCS_LENGTH             4
+#define IXGB_MAX_NUM_MULTICAST_ADDRESSES    128
+#define IXGB_MIN_ENET_FRAME_SIZE_WITHOUT_FCS    60
+#define IXGB_MAX_ENET_FRAME_SIZE_WITHOUT_FCS    1514
+#define IXGB_MAX_JUMBO_FRAME_SIZE       0x3F00
+
+/* Phy Addresses */
+#define IXGB_OPTICAL_PHY_ADDR 0x0 /* Optical Module phy address*/
+#define IXGB_XAUII_PHY_ADDR   0x1 /* Xauii transceiver phy address*/
+#define IXGB_DIAG_PHY_ADDR    0x1F/* Diagnostic Device phy address*/
+
+/* This structure takes a 64k flash and maps it for identification commands */
+struct ixgb_flash_buffer {
+    uint8_t manufacturer_id;
+    uint8_t device_id;
+    uint8_t filler1[0x2AA8];
+    uint8_t cmd2;
+    uint8_t filler2[0x2AAA];
+    uint8_t cmd1;
+    uint8_t filler3[0xAAAA];
+};
+
+/*
+ * This is a little-endian specific check.
+ */
+#define IS_MULTICAST(Address) \
+    (boolean_t)(((uint8_t *)(Address))[0] & ((uint8_t)0x01))
+
+
+/*
+ * Check whether an address is broadcast.
+ */
+#define IS_BROADCAST(Address)               \
+    ((((uint8_t *)(Address))[0] == ((uint8_t)0xff)) && (((uint8_t *)(Address))[1] == ((uint8_t)0xff)))
+
+/* Flow control parameters */
+struct ixgb_fc {
+    uint32_t        high_water;      /* Flow Control High-water          */
+    uint32_t        low_water;       /* Flow Control Low-water           */
+    uint16_t        pause_time;      /* Flow Control Pause timer         */
+    boolean_t       send_xon;        /* Flow control send XON            */
+    ixgb_fc_type    type;            /* Type of flow control             */
+};
+
+/* The historical defaults for the flow control values are given below. */
+#define FC_DEFAULT_HI_THRESH        (0x8000)    /* 32KB */
+#define FC_DEFAULT_LO_THRESH        (0x4000)    /* 16KB */
+#define FC_DEFAULT_TX_TIMER         (0x100)     /* ~130 us */
+
+/* Phy definitions */
+#define IXGB_MAX_PHY_REG_ADDRESS    0xFFFF
+#define IXGB_MAX_PHY_ADDRESS        31
+#define IXGB_MAX_PHY_DEV_TYPE       31
+
+/* Bus parameters */
+struct ixgb_bus {
+    ixgb_bus_speed  speed;
+    ixgb_bus_width  width;
+    ixgb_bus_type   type;
+};
+
+struct ixgb_hw {
+    uint8_t         *hw_addr;           /* Base Address of the hardware     */
+    void            *back;              /* Pointer to OS-dependent struct   */
+    struct ixgb_fc  fc;                 /* Flow control parameters          */
+    struct ixgb_bus bus;                /* Bus parameters                   */
+    uint32_t        phy_id;             /* Phy Identifier                   */
+    uint32_t        phy_addr;           /* XGMII address of Phy             */
+    ixgb_mac_type   mac_type;           /* Identifier for MAC controller    */
+    ixgb_phy_type   phy_type;           /* Transceiver/phy identifier       */
+    uint32_t        max_frame_size;     /* Maximum frame size supported     */
+    uint32_t        mc_filter_type;     /* Multicast filter hash type       */
+    uint32_t        num_mc_addrs;       /* Number of current Multicast addrs*/
+    uint8_t         curr_mac_addr[IXGB_ETH_LENGTH_OF_ADDRESS];  /* Individual address currently programmed in MAC */
+    uint32_t        num_tx_desc;        /* Number of Transmit descriptors   */
+    uint32_t        num_rx_desc;        /* Number of Receive descriptors    */
+    uint32_t        rx_buffer_size;     /* Size of Receive buffer           */
+    boolean_t       link_up;            /* TRUE if link is valid            */
+    boolean_t       adapter_stopped;    /* State of adapter                 */
+    uint16_t        device_id;          /* device id from PCI configuration space */
+    uint16_t        vendor_id;          /* vendor id from PCI configuration space */
+    uint8_t         revision_id;        /* revision id from PCI configuration space */
+    uint16_t        subsystem_vendor_id;/* subsystem vendor id from PCI configuration space */
+    uint16_t        subsystem_id;       /* subsystem id from PCI configuration space */
+    uint32_t        bar0;               /* Base Address registers           */
+    uint32_t        bar1;
+    uint32_t        bar2;
+    uint32_t        bar3;
+    uint16_t        pci_cmd_word;       /* PCI command register id from PCI configuration space */
+    uint16_t        eeprom[IXGB_EEPROM_SIZE]; /* EEPROM contents read at init time  */
+    unsigned long   io_base;            /* Our I/O mapped location */
+    uint32_t        lastLFC;
+    uint32_t        lastRFC;
+};
+
+/* Statistics reported by the hardware */
+struct ixgb_hw_stats {
+    uint64_t tprl;
+    uint64_t tprh;
+    uint64_t gprcl;
+    uint64_t gprch;
+    uint64_t bprcl;
+    uint64_t bprch;
+    uint64_t mprcl;
+    uint64_t mprch;
+    uint64_t uprcl;
+    uint64_t uprch;
+    uint64_t vprcl;
+    uint64_t vprch;
+    uint64_t jprcl;
+    uint64_t jprch;
+    uint64_t gorcl;
+    uint64_t gorch;
+    uint64_t torl;
+    uint64_t torh;
+    uint64_t rnbc;
+    uint64_t ruc;
+    uint64_t roc;
+    uint64_t rlec;
+    uint64_t crcerrs;
+    uint64_t icbc;
+    uint64_t ecbc;
+    uint64_t mpc;
+    uint64_t tptl;
+    uint64_t tpth;
+    uint64_t gptcl;
+    uint64_t gptch;
+    uint64_t bptcl;
+    uint64_t bptch;
+    uint64_t mptcl;
+    uint64_t mptch;
+    uint64_t uptcl;
+    uint64_t uptch;
+    uint64_t vptcl;
+    uint64_t vptch;
+    uint64_t jptcl;
+    uint64_t jptch;
+    uint64_t gotcl;
+    uint64_t gotch;
+    uint64_t totl;
+    uint64_t toth;
+    uint64_t dc;
+    uint64_t plt64c;
+    uint64_t tsctc;
+    uint64_t tsctfc;
+    uint64_t ibic;
+    uint64_t rfc;
+    uint64_t lfc;
+    uint64_t pfrc;
+    uint64_t pftc;
+    uint64_t mcfrc;
+    uint64_t mcftc;
+    uint64_t xonrxc;
+    uint64_t xontxc;
+    uint64_t xoffrxc;
+    uint64_t xofftxc;
+    uint64_t rjc;
+};
+
+/* Function Prototypes */
+extern boolean_t ixgb_adapter_stop(struct ixgb_hw *hw);
+extern boolean_t ixgb_init_hw(struct ixgb_hw *hw);
+extern boolean_t ixgb_adapter_start(struct ixgb_hw *hw);
+extern void ixgb_init_rx_addrs(struct ixgb_hw *hw);
+extern void ixgb_check_for_link(struct ixgb_hw *hw);
+extern boolean_t ixgb_check_for_bad_link(struct ixgb_hw *hw);
+extern boolean_t ixgb_setup_fc(struct ixgb_hw *hw);
+extern void ixgb_clear_hw_cntrs(struct ixgb_hw *hw);
+extern boolean_t mac_addr_valid(uint8_t *mac_addr);
+
+extern uint16_t ixgb_read_phy_reg(struct ixgb_hw *hw,
+                            uint32_t reg_addr,
+                            uint32_t phy_addr,
+                            uint32_t device_type);
+
+extern void ixgb_write_phy_reg(struct ixgb_hw *hw,
+                            uint32_t reg_addr,
+                            uint32_t phy_addr,
+                            uint32_t device_type,
+                            uint16_t data);
+
+extern void ixgb_rar_set(struct ixgb_hw *hw,
+                    uint8_t *addr,
+                    uint32_t index);
+
+
+/* Filters (multicast, vlan, receive) */
+extern void ixgb_mc_addr_list_update(struct ixgb_hw *hw,
+                               uint8_t * mc_addr_list,
+                               uint32_t mc_addr_count,
+                               uint32_t pad);
+
+/* Vfta functions */
+extern void ixgb_write_vfta(struct ixgb_hw *hw,
+                 uint32_t offset,
+                 uint32_t value);
+
+extern void ixgb_clear_vfta(struct ixgb_hw *hw);
+
+
+/* Access functions to eeprom data */
+void ixgb_get_ee_mac_addr(struct ixgb_hw *hw, uint8_t *mac_addr);
+uint16_t ixgb_get_ee_compatibility(struct ixgb_hw *hw);
+uint32_t ixgb_get_ee_pba_number(struct ixgb_hw *hw);
+uint16_t ixgb_get_ee_init_ctrl_reg_1(struct ixgb_hw *hw);
+uint16_t ixgb_get_ee_init_ctrl_reg_2(struct ixgb_hw *hw);
+uint16_t ixgb_get_ee_subsystem_id(struct ixgb_hw *hw);
+uint16_t ixgb_get_ee_subvendor_id(struct ixgb_hw *hw);
+uint16_t ixgb_get_ee_device_id(struct ixgb_hw *hw);
+uint16_t ixgb_get_ee_vendor_id(struct ixgb_hw *hw);
+uint16_t ixgb_get_ee_swdpins_reg(struct ixgb_hw *hw);
+uint8_t  ixgb_get_ee_d3_power(struct ixgb_hw *hw);
+uint8_t  ixgb_get_ee_d0_power(struct ixgb_hw *hw);
+boolean_t ixgb_get_eeprom_data(struct ixgb_hw *hw);
+uint16_t ixgb_get_eeprom_word(struct ixgb_hw *hw, uint16_t index);
+
+/* Everything else */
+void ixgb_led_on(struct ixgb_hw *hw);
+void ixgb_led_off(struct ixgb_hw *hw);
+void ixgb_write_pci_cfg(struct ixgb_hw *hw,
+                         uint32_t reg,
+                         uint16_t * value);
+
+
+#endif /* _IXGB_HW_H_ */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/ixgb/ixgb_ids.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/ixgb/ixgb_ids.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/ixgb/ixgb_ids.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/ixgb/ixgb_ids.h	2004-09-09 13:21:58.000000000 +0200
@@ -0,0 +1,55 @@
+/*******************************************************************************
+
+  
+  Copyright(c) 1999 - 2004 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 
+  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  02111-1307, USA.
+  
+  The full GNU General Public License is included in this distribution in the
+  file called LICENSE.
+  
+  Contact Information:
+  Linux NICS <linux.nics@intel.com>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+*******************************************************************************/
+
+
+#ifndef _IXGB_IDS_H_
+#define _IXGB_IDS_H_
+
+/**********************************************************************
+** The Device and Vendor IDs for 10 Gigabit MACs
+**********************************************************************/
+
+#define INTEL_VENDOR_ID         0x8086
+#define INTEL_SUBVENDOR_ID      0x8086
+
+
+#define IXGB_DEVICE_ID_82597EX      0x1048   /* Cibolo A1, -LR (1310nm) */
+#define IXGB_DEVICE_ID_82597EX_SR   0x1A48   /* Cibolo B0, -SR (850nm)  */
+
+#define IXGB_SUBDEVICE_ID_A11F  0xA11F   /* Adapter-OEM-1310nm-Fiber */
+#define IXGB_SUBDEVICE_ID_A01F  0xA01F   /* Adapter-Retail-1310nm-Fiber */
+
+#define IXGB_SUBDEVICE_ID_A15F  0xA15F   /* Adapter-OEM-850nm-Fiber */
+#define IXGB_SUBDEVICE_ID_A05F  0xA05F   /* Adapter-Retail-850nm-Fiber */
+
+#define IXGB_SUBDEVICE_ID_A12F  0xA12F   /* Adapter-OEM-1310nm-Fiber */
+#define IXGB_SUBDEVICE_ID_A02F  0xA02F   /* Adapter-Retail-1310nm-Fiber */
+
+#endif /* #ifndef _IXGB_IDS_H_ */
+
+/* End of File */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/ixgb/ixgb_main.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/ixgb/ixgb_main.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/ixgb/ixgb_main.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/ixgb/ixgb_main.c	2004-09-09 13:21:58.000000000 +0200
@@ -0,0 +1,2229 @@
+/*******************************************************************************
+
+  
+  Copyright(c) 1999 - 2004 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 
+  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  02111-1307, USA.
+  
+  The full GNU General Public License is included in this distribution in the
+  file called LICENSE.
+  
+  Contact Information:
+  Linux NICS <linux.nics@intel.com>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+*******************************************************************************/
+
+#include "ixgb.h"
+
+char ixgb_driver_name[] = "ixgb";
+char ixgb_driver_string[] = "Intel(R) PRO/10GbE Network Driver";
+char ixgb_driver_version[] = "1.0.65";
+char ixgb_copyright[] = "Copyright (c) 2001-2004 Intel Corporation.";
+
+/* ixgb_pci_tbl - PCI Device ID Table
+ *
+ * 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, private data (not used) }
+ */
+static struct pci_device_id ixgb_pci_tbl[] = {
+	{INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX,
+	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+	{INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_SR,
+	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+
+	/* required last entry */
+	{0,}
+};
+
+MODULE_DEVICE_TABLE(pci, ixgb_pci_tbl);
+
+/* Local Function Prototypes */
+
+int ixgb_up(struct ixgb_adapter *adapter);
+void ixgb_down(struct ixgb_adapter *adapter, boolean_t kill_watchdog);
+void ixgb_reset(struct ixgb_adapter *adapter);
+
+static int ixgb_init_module(void);
+static void ixgb_exit_module(void);
+static int ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
+static void __devexit ixgb_remove(struct pci_dev *pdev);
+static int ixgb_sw_init(struct ixgb_adapter *adapter);
+static int ixgb_open(struct net_device *netdev);
+static int ixgb_close(struct net_device *netdev);
+static int ixgb_setup_tx_resources(struct ixgb_adapter *adapter);
+static int ixgb_setup_rx_resources(struct ixgb_adapter *adapter);
+static void ixgb_configure_tx(struct ixgb_adapter *adapter);
+static void ixgb_configure_rx(struct ixgb_adapter *adapter);
+static void ixgb_setup_rctl(struct ixgb_adapter *adapter);
+static void ixgb_clean_tx_ring(struct ixgb_adapter *adapter);
+static void ixgb_clean_rx_ring(struct ixgb_adapter *adapter);
+static void ixgb_free_tx_resources(struct ixgb_adapter *adapter);
+static void ixgb_free_rx_resources(struct ixgb_adapter *adapter);
+static void ixgb_set_multi(struct net_device *netdev);
+static void ixgb_watchdog(unsigned long data);
+static int ixgb_xmit_frame(struct sk_buff *skb, struct net_device *netdev);
+static struct net_device_stats * ixgb_get_stats(struct net_device *netdev);
+static int ixgb_change_mtu(struct net_device *netdev, int new_mtu);
+static int ixgb_set_mac(struct net_device *netdev, void *p);
+static void ixgb_update_stats(struct ixgb_adapter *adapter);
+static inline void ixgb_irq_disable(struct ixgb_adapter *adapter);
+static inline void ixgb_irq_enable(struct ixgb_adapter *adapter);
+static irqreturn_t ixgb_intr(int irq, void *data, struct pt_regs *regs);
+static boolean_t ixgb_clean_tx_irq(struct ixgb_adapter *adapter);
+#ifdef CONFIG_IXGB_NAPI
+static int ixgb_clean(struct net_device *netdev, int *budget);
+static boolean_t ixgb_clean_rx_irq(struct ixgb_adapter *adapter,
+                                    int *work_done, int work_to_do);
+#else
+static boolean_t ixgb_clean_rx_irq(struct ixgb_adapter *adapter);
+#endif
+static void ixgb_alloc_rx_buffers(struct ixgb_adapter *adapter);
+static int ixgb_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd);
+static inline void ixgb_rx_checksum(struct ixgb_adapter *adapter,
+                                     struct ixgb_rx_desc *rx_desc,
+                                     struct sk_buff *skb);
+static void ixgb_tx_timeout(struct net_device *dev);
+static void ixgb_tx_timeout_task(struct net_device *dev);
+#ifdef NETIF_F_HW_VLAN_TX
+static void ixgb_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp);
+static void ixgb_vlan_rx_add_vid(struct net_device *netdev, uint16_t vid);
+static void ixgb_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid);
+static void ixgb_restore_vlan(struct ixgb_adapter *adapter);
+#endif
+
+static int ixgb_notify_reboot(struct notifier_block *, unsigned long event, void *ptr);
+static int ixgb_suspend(struct pci_dev *pdev, uint32_t state);
+
+#ifdef CONFIG_NET_POLL_CONTROLLER
+/* for netdump / net console */
+static void ixgb_netpoll (struct net_device *dev);
+#endif
+
+struct notifier_block ixgb_notifier_reboot = {
+	.notifier_call	= ixgb_notify_reboot,
+	.next		= NULL,
+	.priority	= 0
+};
+
+/* Exported from other modules */
+
+extern void ixgb_check_options(struct ixgb_adapter *adapter);
+extern int ixgb_ethtool_ioctl(struct net_device *netdev, struct ifreq *ifr);
+
+static struct pci_driver ixgb_driver = {
+	.name     = ixgb_driver_name,
+	.id_table = ixgb_pci_tbl,
+	.probe    = ixgb_probe,
+	.remove   = __devexit_p(ixgb_remove),
+	/* Power Managment Hooks */
+	.suspend  = NULL,
+	.resume	  = NULL
+};
+
+MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
+MODULE_DESCRIPTION("Intel(R) PRO/10GbE Network Driver");
+MODULE_LICENSE("GPL");
+
+/* some defines for controlling descriptor fetches in h/w */
+#define RXDCTL_PTHRESH_DEFAULT 128 /* chip considers prefech below this */
+#define RXDCTL_HTHRESH_DEFAULT 16  /* chip will only prefetch if tail is 
+                                      pushed this many descriptors from head */
+#define RXDCTL_WTHRESH_DEFAULT 16  /* chip writes back at this many or RXT0 */
+
+/**
+ * ixgb_init_module - Driver Registration Routine
+ *
+ * ixgb_init_module is the first routine called when the driver is
+ * loaded. All it does is register with the PCI subsystem.
+ **/
+
+static int __init
+ixgb_init_module(void)
+{
+	int ret;
+	printk(KERN_INFO "%s - version %s\n",
+	       ixgb_driver_string, ixgb_driver_version);
+
+	printk(KERN_INFO "%s\n", ixgb_copyright);
+
+	ret = pci_module_init(&ixgb_driver);
+	if(ret >= 0) {
+		register_reboot_notifier(&ixgb_notifier_reboot);
+	}
+	return ret;
+}
+
+module_init(ixgb_init_module);
+
+/**
+ * ixgb_exit_module - Driver Exit Cleanup Routine
+ *
+ * ixgb_exit_module is called just before the driver is removed
+ * from memory.
+ **/
+
+static void __exit
+ixgb_exit_module(void)
+{
+	unregister_reboot_notifier(&ixgb_notifier_reboot);
+	pci_unregister_driver(&ixgb_driver);
+}
+
+module_exit(ixgb_exit_module);
+
+
+int
+ixgb_up(struct ixgb_adapter *adapter)
+{
+	struct net_device *netdev = adapter->netdev;
+	int err;
+	int max_frame = netdev->mtu + ENET_HEADER_SIZE + ENET_FCS_LENGTH;
+	struct ixgb_hw *hw = &adapter->hw;
+
+	/* hardware has been reset, we need to reload some things */
+
+	ixgb_set_multi(netdev);
+
+#ifdef NETIF_F_HW_VLAN_TX
+	ixgb_restore_vlan(adapter);
+#endif
+
+	ixgb_configure_tx(adapter);
+	ixgb_setup_rctl(adapter);
+	ixgb_configure_rx(adapter);
+	ixgb_alloc_rx_buffers(adapter);
+
+	if((err = request_irq(adapter->pdev->irq, &ixgb_intr,
+		              SA_SHIRQ | SA_SAMPLE_RANDOM,
+		              netdev->name, netdev)))
+		return err;
+
+	/* disable interrupts and get the hardware into a known state */
+	IXGB_WRITE_REG(&adapter->hw, IMC, 0xffffffff);
+
+	if((hw->max_frame_size != max_frame) ||
+		(hw->max_frame_size !=
+		(IXGB_READ_REG(hw, MFS) >> IXGB_MFS_SHIFT))) {
+
+		hw->max_frame_size = max_frame;
+
+		IXGB_WRITE_REG(hw, MFS, hw->max_frame_size << IXGB_MFS_SHIFT);
+
+		if(hw->max_frame_size >
+		   IXGB_MAX_ENET_FRAME_SIZE_WITHOUT_FCS + ENET_FCS_LENGTH) {
+			uint32_t ctrl0 = IXGB_READ_REG(hw, CTRL0);
+
+			if(!(ctrl0 & IXGB_CTRL0_JFE)) {
+				ctrl0 |= IXGB_CTRL0_JFE;
+				IXGB_WRITE_REG(hw, CTRL0, ctrl0);
+			}
+		}
+	}
+
+	mod_timer(&adapter->watchdog_timer, jiffies);
+	ixgb_irq_enable(adapter);
+
+	return 0;
+}
+
+void
+ixgb_down(struct ixgb_adapter *adapter, boolean_t kill_watchdog)
+{
+	struct net_device *netdev = adapter->netdev;
+
+	ixgb_irq_disable(adapter);
+	free_irq(adapter->pdev->irq, netdev);
+	if(kill_watchdog)
+		del_timer_sync(&adapter->watchdog_timer);
+	adapter->link_speed = 0;
+	adapter->link_duplex = 0;
+	netif_carrier_off(netdev);
+	netif_stop_queue(netdev);
+
+	ixgb_reset(adapter);
+	ixgb_clean_tx_ring(adapter);
+	ixgb_clean_rx_ring(adapter);
+}
+
+void
+ixgb_reset(struct ixgb_adapter *adapter)
+{
+
+	ixgb_adapter_stop(&adapter->hw);
+	if(!ixgb_init_hw(&adapter->hw))
+		IXGB_DBG("ixgb_init_hw failed.\n");
+}
+
+/**
+ * ixgb_probe - Device Initialization Routine
+ * @pdev: PCI device information struct
+ * @ent: entry in ixgb_pci_tbl
+ *
+ * Returns 0 on success, negative on failure
+ *
+ * ixgb_probe initializes an adapter identified by a pci_dev structure.
+ * The OS initialization, configuring of the adapter private structure,
+ * and a hardware reset occur.
+ **/
+
+static int __devinit
+ixgb_probe(struct pci_dev *pdev,
+            const struct pci_device_id *ent)
+{
+	struct net_device *netdev = NULL;
+	struct ixgb_adapter *adapter;
+	static int cards_found = 0;
+	unsigned long mmio_start;
+	int mmio_len;
+	int pci_using_dac;
+	int i;
+	int err;
+
+	if((err = pci_enable_device(pdev)))
+		return err;
+
+	if(!(err = pci_set_dma_mask(pdev, PCI_DMA_64BIT))) {
+		pci_using_dac = 1;
+	} else {
+		if((err = pci_set_dma_mask(pdev, PCI_DMA_32BIT))) {
+			IXGB_ERR("No usable DMA configuration, aborting\n");
+			return err;
+		}
+		pci_using_dac = 0;
+	}
+
+	if((err = pci_request_regions(pdev, ixgb_driver_name)))
+		return err;
+
+	pci_set_master(pdev);
+
+	netdev = alloc_etherdev(sizeof(struct ixgb_adapter));
+	if(!netdev) {
+		err = -ENOMEM;
+		goto err_alloc_etherdev;
+	}
+
+	SET_MODULE_OWNER(netdev);
+	SET_NETDEV_DEV(netdev, &pdev->dev);
+
+	pci_set_drvdata(pdev, netdev);
+	adapter = netdev->priv;
+	adapter->netdev = netdev;
+	adapter->pdev = pdev;
+	adapter->hw.back = adapter;
+
+	mmio_start = pci_resource_start(pdev, BAR_0);
+	mmio_len = pci_resource_len(pdev, BAR_0);
+
+	adapter->hw.hw_addr = ioremap(mmio_start, mmio_len);
+	if(!adapter->hw.hw_addr) {
+		err = -EIO;
+		goto err_ioremap;
+	}
+
+	for(i = BAR_1; i <= BAR_5; i++) {
+		if(pci_resource_len(pdev, i) == 0)
+			continue;
+		if(pci_resource_flags(pdev, i) & IORESOURCE_IO) {
+			adapter->hw.io_base = pci_resource_start(pdev, i);
+			break;
+		}
+	}
+
+	netdev->open = &ixgb_open;
+	netdev->stop = &ixgb_close;
+	netdev->hard_start_xmit = &ixgb_xmit_frame;
+	netdev->get_stats = &ixgb_get_stats;
+	netdev->set_multicast_list = &ixgb_set_multi;
+	netdev->set_mac_address = &ixgb_set_mac;
+	netdev->change_mtu = &ixgb_change_mtu;
+	netdev->do_ioctl = &ixgb_ioctl;
+	netdev->tx_timeout = &ixgb_tx_timeout;
+	netdev->watchdog_timeo = HZ;
+#ifdef CONFIG_IXGB_NAPI
+	netdev->poll = &ixgb_clean;
+	netdev->weight = 64;
+#endif
+#ifdef NETIF_F_HW_VLAN_TX
+	netdev->vlan_rx_register = ixgb_vlan_rx_register;
+	netdev->vlan_rx_add_vid = ixgb_vlan_rx_add_vid;
+	netdev->vlan_rx_kill_vid = ixgb_vlan_rx_kill_vid;
+#endif
+#ifdef CONFIG_NET_POLL_CONTROLLER
+	netdev->poll_controller = ixgb_netpoll;
+#endif
+
+	netdev->mem_start = mmio_start;
+	netdev->mem_end = mmio_start + mmio_len;
+	netdev->base_addr = adapter->hw.io_base;
+
+	adapter->bd_number = cards_found;
+	adapter->link_speed = 0;
+	adapter->link_duplex = 0;
+
+	/* setup the private structure */
+
+	if((err = ixgb_sw_init(adapter)))
+		goto err_sw_init;
+
+#ifdef MAX_SKB_FRAGS
+#ifdef NETIF_F_HW_VLAN_TX
+	netdev->features = NETIF_F_SG |
+			   NETIF_F_HW_CSUM |
+			   NETIF_F_HW_VLAN_TX |
+			   NETIF_F_HW_VLAN_RX |
+			   NETIF_F_HW_VLAN_FILTER;
+#else
+	netdev->features = NETIF_F_SG | NETIF_F_HW_CSUM;
+#endif
+#ifdef NETIF_F_TSO
+	netdev->features |= NETIF_F_TSO;
+#endif
+
+	if(pci_using_dac)
+		netdev->features |= NETIF_F_HIGHDMA;
+#endif
+
+	/* make sure the EEPROM is good */
+
+	if(!ixgb_validate_eeprom_checksum(&adapter->hw)) {
+		printk(KERN_ERR "The EEPROM Checksum Is Not Valid\n");
+		err = -EIO;
+		goto err_eeprom;
+	}
+
+	ixgb_get_ee_mac_addr(&adapter->hw, netdev->dev_addr);
+
+	if(!is_valid_ether_addr(netdev->dev_addr)) {
+		err = -EIO;
+		goto err_eeprom;
+	}
+
+	adapter->part_num = ixgb_get_ee_pba_number(&adapter->hw);
+
+
+	init_timer(&adapter->watchdog_timer);
+	adapter->watchdog_timer.function = &ixgb_watchdog;
+	adapter->watchdog_timer.data = (unsigned long) adapter;
+
+
+	INIT_WORK(&adapter->tx_timeout_task,
+		(void (*)(void *))ixgb_tx_timeout_task, netdev);
+
+	if((err = register_netdev(netdev)))
+		goto err_register;
+
+	/* 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: Intel(R) PRO/10GbE Network Connection\n",
+	       netdev->name);
+	ixgb_check_options(adapter);
+	/* reset the hardware with the new settings */
+
+	ixgb_reset(adapter);
+
+	cards_found++;
+	return 0;
+
+err_register:
+err_sw_init:
+err_eeprom:
+	iounmap(adapter->hw.hw_addr);
+err_ioremap:
+	free_netdev(netdev);
+err_alloc_etherdev:
+	pci_release_regions(pdev);
+	return err;
+}
+
+/**
+ * ixgb_remove - Device Removal Routine
+ * @pdev: PCI device information struct
+ *
+ * ixgb_remove is called by the PCI subsystem to alert the driver
+ * that it should release a PCI device.  The could be caused by a
+ * Hot-Plug event, or because the driver is going to be removed from
+ * memory.
+ **/
+
+static void __devexit
+ixgb_remove(struct pci_dev *pdev)
+{
+	struct net_device *netdev = pci_get_drvdata(pdev);
+	struct ixgb_adapter *adapter = netdev->priv;
+
+
+	unregister_netdev(netdev);
+
+
+	iounmap(adapter->hw.hw_addr);
+	pci_release_regions(pdev);
+
+	free_netdev(netdev);
+}
+
+/**
+ * ixgb_sw_init - Initialize general software structures (struct ixgb_adapter)
+ * @adapter: board private structure to initialize
+ *
+ * ixgb_sw_init initializes the Adapter private data structure.
+ * Fields are initialized based on PCI device information and
+ * OS network device settings (MTU size).
+ **/
+
+static int __devinit
+ixgb_sw_init(struct ixgb_adapter *adapter)
+{
+	struct ixgb_hw *hw = &adapter->hw;
+	struct net_device *netdev = adapter->netdev;
+	struct pci_dev *pdev = adapter->pdev;
+
+	/* PCI config space info */
+
+	hw->vendor_id = pdev->vendor;
+	hw->device_id = pdev->device;
+	hw->subsystem_vendor_id = pdev->subsystem_vendor;
+	hw->subsystem_id = pdev->subsystem_device;
+
+
+
+	adapter->rx_buffer_len = IXGB_RXBUFFER_2048;
+
+	hw->max_frame_size = netdev->mtu + ENET_HEADER_SIZE + ENET_FCS_LENGTH;
+
+	if((hw->device_id == IXGB_DEVICE_ID_82597EX)
+	   ||(hw->device_id == IXGB_DEVICE_ID_82597EX_SR))
+			hw->mac_type = ixgb_82597;
+	else {
+		/* should never have loaded on this device */
+		printk(KERN_ERR "ixgb: unsupported device id\n");
+	}
+
+	/* enable flow control to be programmed */
+	hw->fc.send_xon = 1;
+
+	atomic_set(&adapter->irq_sem, 1);
+	spin_lock_init(&adapter->tx_lock);
+
+	return 0;
+}
+
+/**
+ * ixgb_open - Called when a network interface is made active
+ * @netdev: network interface device structure
+ *
+ * Returns 0 on success, negative value on failure
+ *
+ * The open entry point is called when a network interface is made
+ * active by the system (IFF_UP).  At this point all resources needed
+ * for transmit and receive operations are allocated, the interrupt
+ * handler is registered with the OS, the watchdog timer is started,
+ * and the stack is notified that the interface is ready.
+ **/
+
+static int
+ixgb_open(struct net_device *netdev)
+{
+	struct ixgb_adapter *adapter = netdev->priv;
+	int err;
+
+	/* allocate transmit descriptors */
+
+	if((err = ixgb_setup_tx_resources(adapter)))
+		goto err_setup_tx;
+
+	/* allocate receive descriptors */
+
+	if((err = ixgb_setup_rx_resources(adapter)))
+		goto err_setup_rx;
+
+	if((err = ixgb_up(adapter)))
+		goto err_up;
+
+	return 0;
+
+err_up:
+	ixgb_free_rx_resources(adapter);
+err_setup_rx:
+	ixgb_free_tx_resources(adapter);
+err_setup_tx:
+	ixgb_reset(adapter);
+
+	return err;
+}
+
+/**
+ * ixgb_close - Disables a network interface
+ * @netdev: network interface device structure
+ *
+ * Returns 0, this is not allowed to fail
+ *
+ * The close entry point is called when an interface is de-activated
+ * by the OS.  The hardware is still under the drivers control, but
+ * needs to be disabled.  A global MAC reset is issued to stop the
+ * hardware, and all transmit and receive resources are freed.
+ **/
+
+static int
+ixgb_close(struct net_device *netdev)
+{
+	struct ixgb_adapter *adapter = netdev->priv;
+
+	ixgb_down(adapter, TRUE);
+
+	ixgb_free_tx_resources(adapter);
+	ixgb_free_rx_resources(adapter);
+
+	return 0;
+}
+
+/**
+ * ixgb_setup_tx_resources - allocate Tx resources (Descriptors)
+ * @adapter: board private structure
+ *
+ * Return 0 on success, negative on failure
+ **/
+
+static int
+ixgb_setup_tx_resources(struct ixgb_adapter *adapter)
+{
+	struct ixgb_desc_ring *txdr = &adapter->tx_ring;
+	struct pci_dev *pdev = adapter->pdev;
+	int size;
+
+	size = sizeof(struct ixgb_buffer) * txdr->count;
+	txdr->buffer_info = kmalloc(size, GFP_KERNEL);
+	if(!txdr->buffer_info) {
+		return -ENOMEM;
+	}
+	memset(txdr->buffer_info, 0, size);
+
+	/* round up to nearest 4K */
+
+	txdr->size = txdr->count * sizeof(struct ixgb_tx_desc);
+	IXGB_ROUNDUP(txdr->size, 4096);
+
+	txdr->desc = pci_alloc_consistent(pdev, txdr->size, &txdr->dma);
+	if(!txdr->desc) {
+		kfree(txdr->buffer_info);
+		return -ENOMEM;
+	}
+	memset(txdr->desc, 0, txdr->size);
+
+	txdr->next_to_use = 0;
+	txdr->next_to_clean = 0;
+
+	return 0;
+}
+
+/**
+ * ixgb_configure_tx - Configure 82597 Transmit Unit after Reset.
+ * @adapter: board private structure
+ *
+ * Configure the Tx unit of the MAC after a reset.
+ **/
+
+static void
+ixgb_configure_tx(struct ixgb_adapter *adapter)
+{
+	uint64_t tdba = adapter->tx_ring.dma;
+	uint32_t tdlen = adapter->tx_ring.count * sizeof(struct ixgb_tx_desc);
+	uint32_t tctl;
+	struct ixgb_hw *hw = &adapter->hw;
+
+
+	/* Setup the Base and Length of the Tx Descriptor Ring 
+	 * tx_ring.dma can be either a 32 or 64 bit value 
+	 */
+
+	IXGB_WRITE_REG(hw, TDBAL, (tdba & 0x00000000ffffffffULL));
+	IXGB_WRITE_REG(hw, TDBAH, (tdba >> 32));
+
+	IXGB_WRITE_REG(hw, TDLEN, tdlen);
+
+	/* Setup the HW Tx Head and Tail descriptor pointers */
+
+	IXGB_WRITE_REG(hw, TDH, 0);
+	IXGB_WRITE_REG(hw, TDT, 0);
+
+	/* don't set up txdctl, it induces performance problems if
+	 * configured incorrectly
+	txdctl  = TXDCTL_PTHRESH_DEFAULT; // prefetch txds below this threshold
+	txdctl |= (TXDCTL_HTHRESH_DEFAULT // only prefetch if there are this many ready
+	           << IXGB_TXDCTL_HTHRESH_SHIFT);
+	IXGB_WRITE_REG (hw, TXDCTL, txdctl);
+	*/
+
+	/* Set the Tx Interrupt Delay register */
+
+	IXGB_WRITE_REG(hw, TIDV, adapter->tx_int_delay);
+
+	/* Program the Transmit Control Register */
+
+	tctl = IXGB_TCTL_TCE | IXGB_TCTL_TXEN | IXGB_TCTL_TPDE;
+	IXGB_WRITE_REG(hw, TCTL, tctl);
+
+	/* Setup Transmit Descriptor Settings for this adapter */
+	adapter->tx_cmd_type =
+	    IXGB_TX_DESC_TYPE 
+	    | (adapter->tx_int_delay_enable ? IXGB_TX_DESC_CMD_IDE : 0);
+}
+
+/**
+ * ixgb_setup_rx_resources - allocate Rx resources (Descriptors)
+ * @adapter: board private structure
+ *
+ * Returns 0 on success, negative on failure
+ **/
+
+static int
+ixgb_setup_rx_resources(struct ixgb_adapter *adapter)
+{
+	struct ixgb_desc_ring *rxdr = &adapter->rx_ring;
+	struct pci_dev *pdev = adapter->pdev;
+	int size;
+
+	size = sizeof(struct ixgb_buffer) * rxdr->count;
+	rxdr->buffer_info = kmalloc(size, GFP_KERNEL);
+	if(!rxdr->buffer_info) {
+		return -ENOMEM;
+	}
+	memset(rxdr->buffer_info, 0, size);
+
+	/* Round up to nearest 4K */
+
+	rxdr->size = rxdr->count * sizeof(struct ixgb_rx_desc);
+	IXGB_ROUNDUP(rxdr->size, 4096);
+
+	rxdr->desc = pci_alloc_consistent(pdev, rxdr->size, &rxdr->dma);
+
+	if(!rxdr->desc) {
+		kfree(rxdr->buffer_info);
+		return -ENOMEM;
+	}
+	memset(rxdr->desc, 0, rxdr->size);
+
+	rxdr->next_to_clean = 0;
+	rxdr->next_to_use = 0;
+
+	return 0;
+}
+
+/**
+ * ixgb_setup_rctl - configure the receive control register
+ * @adapter: Board private structure
+ **/
+
+static void
+ixgb_setup_rctl(struct ixgb_adapter *adapter)
+{
+	uint32_t rctl;
+
+	rctl = IXGB_READ_REG(&adapter->hw, RCTL);
+
+	rctl &= ~(3 << IXGB_RCTL_MO_SHIFT);
+
+	rctl |=
+		IXGB_RCTL_BAM | IXGB_RCTL_RDMTS_1_2 | 
+		IXGB_RCTL_RXEN | IXGB_RCTL_CFF | 
+		(adapter->hw.mc_filter_type << IXGB_RCTL_MO_SHIFT);
+
+	rctl |= IXGB_RCTL_SECRC;
+
+	switch (adapter->rx_buffer_len) {
+	case IXGB_RXBUFFER_2048:
+	default:
+		rctl |= IXGB_RCTL_BSIZE_2048;
+		break;
+	case IXGB_RXBUFFER_4096:
+		rctl |= IXGB_RCTL_BSIZE_4096;
+		break;
+	case IXGB_RXBUFFER_8192:
+		rctl |= IXGB_RCTL_BSIZE_8192;
+		break;
+	case IXGB_RXBUFFER_16384:
+		rctl |= IXGB_RCTL_BSIZE_16384;
+		break;
+	}
+
+	IXGB_WRITE_REG(&adapter->hw, RCTL, rctl);
+}
+
+/**
+ * ixgb_configure_rx - Configure 82597 Receive Unit after Reset.
+ * @adapter: board private structure
+ *
+ * Configure the Rx unit of the MAC after a reset.
+ **/
+
+static void
+ixgb_configure_rx(struct ixgb_adapter *adapter)
+{
+	uint64_t rdba = adapter->rx_ring.dma;
+	uint32_t rdlen = adapter->rx_ring.count * sizeof(struct ixgb_rx_desc);
+	struct ixgb_hw *hw = &adapter->hw;
+	uint32_t rctl;
+	uint32_t rxcsum;
+	uint32_t rxdctl;
+
+	/* make sure receives are disabled while setting up the descriptors */
+
+	rctl = IXGB_READ_REG(hw, RCTL);
+	IXGB_WRITE_REG(hw, RCTL, rctl & ~IXGB_RCTL_RXEN);
+
+	/* set the Receive Delay Timer Register */
+
+	IXGB_WRITE_REG(hw, RDTR, adapter->rx_int_delay);
+
+	/* Setup the Base and Length of the Rx Descriptor Ring */
+
+	IXGB_WRITE_REG(hw, RDBAL, (rdba & 0x00000000ffffffffULL));
+	IXGB_WRITE_REG(hw, RDBAH, (rdba >> 32));
+
+	IXGB_WRITE_REG(hw, RDLEN, rdlen);
+
+	/* Setup the HW Rx Head and Tail Descriptor Pointers */
+	IXGB_WRITE_REG(hw, RDH, 0);
+	IXGB_WRITE_REG(hw, RDT, 0);
+
+					    /* burst 16 or burst when RXT0*/
+	rxdctl =  RXDCTL_WTHRESH_DEFAULT << IXGB_RXDCTL_WTHRESH_SHIFT 
+	        | RXDCTL_HTHRESH_DEFAULT << IXGB_RXDCTL_HTHRESH_SHIFT 
+	        | RXDCTL_PTHRESH_DEFAULT << IXGB_RXDCTL_PTHRESH_SHIFT;
+	IXGB_WRITE_REG(hw, RXDCTL, rxdctl);
+
+	if (adapter->raidc) {
+		uint32_t raidc;
+		uint8_t	 poll_threshold;
+
+		/* Poll every rx_int_delay period, if RBD exists
+		 * Receive Backlog Detection is set to <threshold> 
+		 * Rx Descriptors
+		 * max is 0x3F == set to poll when 504 RxDesc left 
+		 * min is 0 */
+
+		/* polling times are 1 == 0.8192us
+		                     2 == 1.6384us
+		                     3 == 3.2768us etc
+		                     ...
+		                   511 == 418 us
+		 */
+#define IXGB_RAIDC_POLL_DEFAULT 122 /* set to poll every ~100 us under load 
+                                       also known as 10000 interrupts / sec */
+
+		/* divide this by 2^3 (8) to get a register size count */
+		poll_threshold = ((adapter->rx_ring.count-1) >> 3);
+		/* poll at half of that size */
+		poll_threshold >>= 1;
+		/* make sure its not bigger than our max */
+		poll_threshold &= 0x3F;
+
+		raidc =
+		    IXGB_RAIDC_EN | /* turn on raidc style moderation */
+		    IXGB_RAIDC_RXT_GATE | /* don't interrupt with rxt0 while
+		                             in RBD mode (polling) */
+		    (IXGB_RAIDC_POLL_DEFAULT << IXGB_RAIDC_POLL_SHIFT) | 
+		      /* this sets the regular "min interrupt delay" */
+		    (adapter-> rx_int_delay << IXGB_RAIDC_DELAY_SHIFT) |
+		    poll_threshold;
+
+		IXGB_WRITE_REG(hw, RAIDC, raidc);
+	}
+
+
+
+	/* Enable Receive Checksum Offload for TCP and UDP */
+	if(adapter->rx_csum == TRUE) {
+		rxcsum = IXGB_READ_REG(hw, RXCSUM);
+		rxcsum |= IXGB_RXCSUM_TUOFL;
+		IXGB_WRITE_REG(hw, RXCSUM, rxcsum);
+	}
+
+	/* Enable Receives */
+
+	IXGB_WRITE_REG(hw, RCTL, rctl);
+}
+
+/**
+ * ixgb_free_tx_resources - Free Tx Resources
+ * @adapter: board private structure
+ *
+ * Free all transmit software resources
+ **/
+
+static void
+ixgb_free_tx_resources(struct ixgb_adapter *adapter)
+{
+	struct pci_dev *pdev = adapter->pdev;
+
+	ixgb_clean_tx_ring(adapter);
+
+	kfree(adapter->tx_ring.buffer_info);
+	adapter->tx_ring.buffer_info = NULL;
+
+	pci_free_consistent(pdev, adapter->tx_ring.size,
+	                    adapter->tx_ring.desc, adapter->tx_ring.dma);
+
+	adapter->tx_ring.desc = NULL;
+}
+
+/**
+ * ixgb_clean_tx_ring - Free Tx Buffers
+ * @adapter: board private structure
+ **/
+
+static void
+ixgb_clean_tx_ring(struct ixgb_adapter *adapter)
+{
+	struct ixgb_desc_ring *tx_ring = &adapter->tx_ring;
+	struct ixgb_buffer *buffer_info;
+	struct pci_dev *pdev = adapter->pdev;
+	unsigned long size;
+	unsigned int i;
+
+	/* Free all the Tx ring sk_buffs */
+
+	for(i = 0; i < tx_ring->count; i++) {
+		buffer_info = &tx_ring->buffer_info[i];
+		if(buffer_info->skb) {
+
+			pci_unmap_page(pdev,
+			               buffer_info->dma,
+			               buffer_info->length,
+			               PCI_DMA_TODEVICE);
+
+			dev_kfree_skb(buffer_info->skb);
+
+			buffer_info->skb = NULL;
+		}
+	}
+
+	size = sizeof(struct ixgb_buffer) * tx_ring->count;
+	memset(tx_ring->buffer_info, 0, size);
+
+	/* Zero out the descriptor ring */
+
+	memset(tx_ring->desc, 0, tx_ring->size);
+
+	tx_ring->next_to_use = 0;
+	tx_ring->next_to_clean = 0;
+
+	IXGB_WRITE_REG(&adapter->hw, TDH, 0);
+	IXGB_WRITE_REG(&adapter->hw, TDT, 0);
+}
+
+/**
+ * ixgb_free_rx_resources - Free Rx Resources
+ * @adapter: board private structure
+ *
+ * Free all receive software resources
+ **/
+
+static void
+ixgb_free_rx_resources(struct ixgb_adapter *adapter)
+{
+	struct ixgb_desc_ring *rx_ring = &adapter->rx_ring;
+	struct pci_dev *pdev = adapter->pdev;
+
+	ixgb_clean_rx_ring(adapter);
+
+	kfree(rx_ring->buffer_info);
+	rx_ring->buffer_info = NULL;
+
+	pci_free_consistent(pdev, rx_ring->size, rx_ring->desc, rx_ring->dma);
+
+	rx_ring->desc = NULL;
+}
+
+/**
+ * ixgb_clean_rx_ring - Free Rx Buffers
+ * @adapter: board private structure
+ **/
+
+static void
+ixgb_clean_rx_ring(struct ixgb_adapter *adapter)
+{
+	struct ixgb_desc_ring *rx_ring = &adapter->rx_ring;
+	struct ixgb_buffer *buffer_info;
+	struct pci_dev *pdev = adapter->pdev;
+	unsigned long size;
+	unsigned int i;
+
+	/* Free all the Rx ring sk_buffs */
+
+	for(i = 0; i < rx_ring->count; i++) {
+		buffer_info = &rx_ring->buffer_info[i];
+		if(buffer_info->skb) {
+
+			pci_unmap_single(pdev,
+			                 buffer_info->dma,
+			                 buffer_info->length,
+			                 PCI_DMA_FROMDEVICE);
+
+			dev_kfree_skb(buffer_info->skb);
+
+			buffer_info->skb = NULL;
+		}
+	}
+
+	size = sizeof(struct ixgb_buffer) * rx_ring->count;
+	memset(rx_ring->buffer_info, 0, size);
+
+	/* Zero out the descriptor ring */
+
+	memset(rx_ring->desc, 0, rx_ring->size);
+
+	rx_ring->next_to_clean = 0;
+	rx_ring->next_to_use = 0;
+
+	IXGB_WRITE_REG(&adapter->hw, RDH, 0);
+	IXGB_WRITE_REG(&adapter->hw, RDT, 0);
+}
+/**
+ * ixgb_set_mac - Change the Ethernet Address of the NIC
+ * @netdev: network interface device structure
+ * @p: pointer to an address structure
+ *
+ * Returns 0 on success, negative on failure
+ **/
+
+static int
+ixgb_set_mac(struct net_device *netdev, void *p)
+{
+	struct ixgb_adapter *adapter = netdev->priv;
+	struct sockaddr *addr = p;
+
+	if(!is_valid_ether_addr(addr->sa_data))
+		return -EADDRNOTAVAIL;
+
+	memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
+
+	ixgb_rar_set(&adapter->hw, addr->sa_data, 0);
+
+	return 0;
+}
+
+/**
+ * ixgb_set_multi - Multicast and Promiscuous mode set
+ * @netdev: network interface device structure
+ *
+ * The set_multi entry point is called whenever the multicast address
+ * list or the network interface flags are updated.  This routine is
+ * responsible for configuring the hardware for proper multicast,
+ * promiscuous mode, and all-multi behavior.
+ **/
+
+static void
+ixgb_set_multi(struct net_device *netdev)
+{
+	struct ixgb_adapter *adapter = netdev->priv;
+	struct ixgb_hw *hw = &adapter->hw;
+	struct dev_mc_list *mc_ptr;
+	uint32_t rctl;
+	int i;
+
+	/* Check for Promiscuous and All Multicast modes */
+
+	rctl = IXGB_READ_REG(hw, RCTL);
+
+	if(netdev->flags & IFF_PROMISC) {
+		rctl |= (IXGB_RCTL_UPE | IXGB_RCTL_MPE);
+	} else if(netdev->flags & IFF_ALLMULTI) {
+		rctl |= IXGB_RCTL_MPE;
+		rctl &= ~IXGB_RCTL_UPE;
+	} else {
+		rctl &= ~(IXGB_RCTL_UPE | IXGB_RCTL_MPE);
+	}
+
+	if(netdev->mc_count > IXGB_MAX_NUM_MULTICAST_ADDRESSES) {
+		rctl |= IXGB_RCTL_MPE;
+		IXGB_WRITE_REG(hw, RCTL, rctl);
+	} else {
+		uint8_t mta[netdev->mc_count * IXGB_ETH_LENGTH_OF_ADDRESS];
+
+		IXGB_WRITE_REG(hw, RCTL, rctl);
+
+		for(i = 0, mc_ptr = netdev->mc_list; mc_ptr;
+		    i++, mc_ptr = mc_ptr->next)
+			memcpy(&mta[i * IXGB_ETH_LENGTH_OF_ADDRESS],
+			       mc_ptr->dmi_addr, IXGB_ETH_LENGTH_OF_ADDRESS);
+
+		ixgb_mc_addr_list_update(hw, mta, netdev->mc_count, 0);
+	}
+}
+
+/**
+ * ixgb_watchdog - Timer Call-back
+ * @data: pointer to netdev cast into an unsigned long
+ **/
+
+static void
+ixgb_watchdog(unsigned long data)
+{
+	struct ixgb_adapter *adapter = (struct ixgb_adapter *) data;
+	struct net_device *netdev = adapter->netdev;
+	struct ixgb_desc_ring *txdr = &adapter->tx_ring;
+	unsigned int i;
+
+	ixgb_check_for_link(&adapter->hw);
+
+	if (ixgb_check_for_bad_link(&adapter->hw)) {
+		/* force the reset path */
+		netif_stop_queue(netdev);
+	}
+
+	if(adapter->hw.link_up) {
+		if(!netif_carrier_ok(netdev)) {
+			printk(KERN_INFO "ixgb: %s NIC Link is Up %d Mbps %s\n",
+			       netdev->name, 10000, "Full Duplex");
+			adapter->link_speed = 10000;
+			adapter->link_duplex = FULL_DUPLEX;
+			netif_carrier_on(netdev);
+			netif_wake_queue(netdev);
+		}
+	} else {
+		if(netif_carrier_ok(netdev)) {
+			adapter->link_speed = 0;
+			adapter->link_duplex = 0;
+			printk(KERN_INFO
+			       "ixgb: %s NIC Link is Down\n",
+			       netdev->name);
+			netif_carrier_off(netdev);
+			netif_stop_queue(netdev);
+
+		}
+	}
+
+	ixgb_update_stats(adapter);
+
+	if(!netif_carrier_ok(netdev)) {
+		if(IXGB_DESC_UNUSED(txdr) + 1 < txdr->count) {
+			/* We've lost link, so the controller stops DMA,
+			 * but we've got queued Tx work that's never going
+			 * to get done, so reset controller to flush Tx.
+			 * (Do the reset outside of interrupt context). */
+			schedule_work(&adapter->tx_timeout_task);
+		}
+	}
+
+	/* Early detection of hung controller */
+	i = txdr->next_to_clean;
+	if(txdr->buffer_info[i].dma &&
+	   time_after(jiffies, txdr->buffer_info[i].time_stamp + HZ) &&
+	   !(IXGB_READ_REG(&adapter->hw, STATUS) & IXGB_STATUS_TXOFF))
+		netif_stop_queue(netdev);
+
+	/* generate an interrupt to force clean up of any stragglers */
+	IXGB_WRITE_REG (&adapter->hw, ICS, IXGB_INT_TXDW);
+
+	/* Reset the timer */
+	mod_timer(&adapter->watchdog_timer, jiffies + 2 * HZ);
+}
+
+#define IXGB_TX_FLAGS_CSUM		0x00000001
+#define IXGB_TX_FLAGS_VLAN		0x00000002
+#define IXGB_TX_FLAGS_TSO		0x00000004
+
+
+static inline boolean_t
+ixgb_tso(struct ixgb_adapter *adapter, struct sk_buff *skb)
+{
+#ifdef NETIF_F_TSO
+	struct ixgb_context_desc *context_desc;
+	unsigned int i;
+	uint8_t ipcss, ipcso, tucss, tucso, hdr_len;
+	uint16_t ipcse, tucse, mss;
+
+	if(likely(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 = IXGB_CONTEXT_DESC(adapter->tx_ring, i);
+		
+		context_desc->ipcss  = ipcss;
+		context_desc->ipcso  = ipcso;
+		context_desc->ipcse  = cpu_to_le16(ipcse);
+		context_desc->tucss  = tucss;
+		context_desc->tucso  = tucso;
+		context_desc->tucse  = cpu_to_le16(tucse);
+		context_desc->mss    = cpu_to_le16(mss);
+		context_desc->hdr_len= hdr_len;
+		context_desc->status = 0;
+		context_desc->cmd_type_len = cpu_to_le32(
+		                                  IXGB_CONTEXT_DESC_TYPE 
+		                                | IXGB_CONTEXT_DESC_CMD_TSE
+		                                | IXGB_CONTEXT_DESC_CMD_IP
+		                                | IXGB_CONTEXT_DESC_CMD_TCP
+		                                | IXGB_CONTEXT_DESC_CMD_RS
+		                                | IXGB_CONTEXT_DESC_CMD_IDE
+		                                | (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
+ixgb_tx_csum(struct ixgb_adapter *adapter, struct sk_buff *skb)
+{
+	struct ixgb_context_desc *context_desc;
+	unsigned int i;
+	uint8_t css, cso;
+
+	if(likely(skb->ip_summed == CHECKSUM_HW)) {
+		css = skb->h.raw - skb->data;
+		cso = (skb->h.raw + skb->csum) - skb->data;
+
+		i = adapter->tx_ring.next_to_use;
+		context_desc = IXGB_CONTEXT_DESC(adapter->tx_ring, i);
+
+		context_desc->tucss = css;
+		context_desc->tucso = cso;
+		context_desc->tucse = 0;
+		/* zero out any previously existing data in one instruction */
+		*(uint32_t *)&(context_desc->ipcss) = 0;
+		context_desc->status = 0;
+		context_desc->hdr_len = 0;
+		context_desc->mss = 0;
+		context_desc->cmd_type_len =
+		    cpu_to_le32(IXGB_CONTEXT_DESC_TYPE
+		                | IXGB_TX_DESC_CMD_RS 
+		                | IXGB_TX_DESC_CMD_IDE);
+
+		if(++i == adapter->tx_ring.count) i = 0;
+		adapter->tx_ring.next_to_use = i;
+
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+#define IXGB_MAX_TXD_PWR	14
+#define IXGB_MAX_DATA_PER_TXD	(1<<IXGB_MAX_TXD_PWR)
+
+static inline int
+ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb,
+	unsigned int first)
+{
+	struct ixgb_desc_ring *tx_ring = &adapter->tx_ring;
+	struct ixgb_buffer *buffer_info;
+	int len = skb->len;
+	unsigned int offset = 0, size, count = 0, i;
+
+#ifdef MAX_SKB_FRAGS
+	unsigned int nr_frags = skb_shinfo(skb)->nr_frags;
+	unsigned int f;
+	len -= skb->data_len;
+#endif
+
+	i = tx_ring->next_to_use;
+
+	while(len) {
+		buffer_info = &tx_ring->buffer_info[i];
+		size = min(len, IXGB_MAX_JUMBO_FRAME_SIZE);
+		buffer_info->length = size;
+		buffer_info->dma =
+			pci_map_single(adapter->pdev,
+				skb->data + offset,
+				size,
+				PCI_DMA_TODEVICE);
+		buffer_info->time_stamp = jiffies;
+
+		len -= size;
+		offset += size;
+		count++;
+		if(++i == tx_ring->count) i = 0;
+	}
+
+#ifdef MAX_SKB_FRAGS
+	for(f = 0; f < nr_frags; f++) {
+		struct skb_frag_struct *frag;
+
+		frag = &skb_shinfo(skb)->frags[f];
+		len = frag->size;
+		offset = 0;
+
+		while(len) {
+			buffer_info = &tx_ring->buffer_info[i];
+			size = min(len, IXGB_MAX_JUMBO_FRAME_SIZE);
+			buffer_info->length = size;
+			buffer_info->dma =
+				pci_map_page(adapter->pdev,
+					frag->page,
+					frag->page_offset + offset,
+					size,
+					PCI_DMA_TODEVICE);
+			buffer_info->time_stamp = jiffies;
+
+			len -= size;
+			offset += size;
+			count++;
+			if(++i == tx_ring->count) i = 0;
+		}
+	}
+#endif
+	i = (i == 0) ? tx_ring->count - 1 : i - 1;
+	tx_ring->buffer_info[i].skb = skb;
+	tx_ring->buffer_info[first].next_to_watch = i;
+
+	return count;
+}
+
+static inline void
+ixgb_tx_queue(struct ixgb_adapter *adapter, int count, int vlan_id,int tx_flags)
+{
+	struct ixgb_desc_ring *tx_ring = &adapter->tx_ring;
+	struct ixgb_tx_desc *tx_desc = NULL;
+	struct ixgb_buffer *buffer_info;
+	uint32_t cmd_type_len = adapter->tx_cmd_type;
+	uint8_t status = 0;
+	uint8_t popts = 0;
+	unsigned int i;
+
+	if(tx_flags & IXGB_TX_FLAGS_TSO) {
+		cmd_type_len |= IXGB_TX_DESC_CMD_TSE;
+		popts |= (IXGB_TX_DESC_POPTS_IXSM | IXGB_TX_DESC_POPTS_TXSM);
+	}
+
+	if(tx_flags & IXGB_TX_FLAGS_CSUM)
+		popts |= IXGB_TX_DESC_POPTS_TXSM;
+
+	if(tx_flags & IXGB_TX_FLAGS_VLAN) {
+		cmd_type_len |= IXGB_TX_DESC_CMD_VLE;
+	}
+
+	i = tx_ring->next_to_use;
+
+	while(count--) {
+		buffer_info = &tx_ring->buffer_info[i];
+		tx_desc = IXGB_TX_DESC(*tx_ring, i);
+		tx_desc->buff_addr = cpu_to_le64(buffer_info->dma);
+		tx_desc->cmd_type_len =
+			cpu_to_le32(cmd_type_len | buffer_info->length);
+		tx_desc->status = status;
+		tx_desc->popts = popts;
+		tx_desc->vlan = cpu_to_le16(vlan_id);
+
+		if(++i == tx_ring->count) i = 0;
+	}
+
+	tx_desc->cmd_type_len |= cpu_to_le32(IXGB_TX_DESC_CMD_EOP 
+				| IXGB_TX_DESC_CMD_RS );
+
+	/* Force memory writes to complete before letting h/w
+	 * know there are new descriptors to fetch.  (Only
+	 * applicable for weak-ordered memory model archs,
+	 * such as IA-64). */
+	wmb();
+
+	tx_ring->next_to_use = i;
+	IXGB_WRITE_REG(&adapter->hw, TDT, i);
+}
+
+/* Tx Descriptors needed, worst case */
+#define TXD_USE_COUNT(S) (((S) >> IXGB_MAX_TXD_PWR) + \
+			 (((S) & (IXGB_MAX_DATA_PER_TXD - 1)) ? 1 : 0))
+#ifdef MAX_SKB_FRAGS
+#define DESC_NEEDED TXD_USE_COUNT(IXGB_MAX_DATA_PER_TXD) + \
+	MAX_SKB_FRAGS * TXD_USE_COUNT(PAGE_SIZE) + 1
+#else
+#define DESC_NEEDED TXD_USE_COUNT(IXGB_MAX_DATA_PER_TXD)
+#endif
+
+static int
+ixgb_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
+{
+	struct ixgb_adapter *adapter = netdev->priv;
+	unsigned int first;
+	unsigned int tx_flags = 0;
+	unsigned long flags;
+	int vlan_id = 0;
+
+	if(skb->len <= 0) {
+		dev_kfree_skb_any(skb);
+		return 0;
+	}
+
+	spin_lock_irqsave(&adapter->tx_lock, flags);
+	if(unlikely(IXGB_DESC_UNUSED(&adapter->tx_ring) < DESC_NEEDED)) {
+		netif_stop_queue(netdev);
+		spin_unlock_irqrestore(&adapter->tx_lock, flags);
+		return 1;
+	}
+	spin_unlock_irqrestore(&adapter->tx_lock, flags);
+
+#ifdef NETIF_F_HW_VLAN_TX
+	if(adapter->vlgrp && vlan_tx_tag_present(skb)) {
+		tx_flags |= IXGB_TX_FLAGS_VLAN;
+		vlan_id = vlan_tx_tag_get(skb);
+	}
+#endif
+
+	first = adapter->tx_ring.next_to_use;
+	
+	if(ixgb_tso(adapter, skb))
+		tx_flags |= IXGB_TX_FLAGS_TSO;
+	else if(ixgb_tx_csum(adapter, skb))
+		tx_flags |= IXGB_TX_FLAGS_CSUM;
+
+	ixgb_tx_queue(adapter, ixgb_tx_map(adapter, skb, first), vlan_id,
+			tx_flags);
+
+	netdev->trans_start = jiffies;
+
+	return 0;
+}
+
+/**
+ * ixgb_tx_timeout - Respond to a Tx Hang
+ * @netdev: network interface device structure
+ **/
+
+static void
+ixgb_tx_timeout(struct net_device *netdev)
+{
+	struct ixgb_adapter *adapter = netdev->priv;
+
+	/* Do the reset outside of interrupt context */
+	schedule_work(&adapter->tx_timeout_task);
+}
+
+static void
+ixgb_tx_timeout_task(struct net_device *netdev)
+{
+	struct ixgb_adapter *adapter = netdev->priv;
+
+	netif_device_detach(netdev);
+	ixgb_down(adapter, TRUE);
+	ixgb_up(adapter);
+	netif_device_attach(netdev);
+}
+
+/**
+ * ixgb_get_stats - Get System Network Statistics
+ * @netdev: network interface device structure
+ *
+ * Returns the address of the device statistics structure.
+ * The statistics are actually updated from the timer callback.
+ **/
+
+static struct net_device_stats *
+ixgb_get_stats(struct net_device *netdev)
+{
+	struct ixgb_adapter *adapter = netdev->priv;
+
+	return &adapter->net_stats;
+}
+
+/**
+ * ixgb_change_mtu - Change the Maximum Transfer Unit
+ * @netdev: network interface device structure
+ * @new_mtu: new value for maximum frame size
+ *
+ * Returns 0 on success, negative on failure
+ **/
+
+static int
+ixgb_change_mtu(struct net_device *netdev, int new_mtu)
+{
+	struct ixgb_adapter *adapter = netdev->priv;
+	uint32_t old_mtu = adapter->rx_buffer_len;
+	int max_frame = new_mtu + ENET_HEADER_SIZE + ENET_FCS_LENGTH;
+
+
+	if((max_frame < IXGB_MIN_ENET_FRAME_SIZE_WITHOUT_FCS + ENET_FCS_LENGTH)
+	   || (max_frame > IXGB_MAX_JUMBO_FRAME_SIZE + ENET_FCS_LENGTH)) {
+		IXGB_ERR("Invalid MTU setting\n");
+		return -EINVAL;
+	}
+
+	if((max_frame <= IXGB_MAX_ENET_FRAME_SIZE_WITHOUT_FCS + ENET_FCS_LENGTH)
+	   || (max_frame <= IXGB_RXBUFFER_2048)) {
+		adapter->rx_buffer_len = IXGB_RXBUFFER_2048;
+
+	} else if(max_frame <= IXGB_RXBUFFER_4096) {
+		adapter->rx_buffer_len = IXGB_RXBUFFER_4096;
+
+	} else if(max_frame <= IXGB_RXBUFFER_8192) {
+		adapter->rx_buffer_len = IXGB_RXBUFFER_8192;
+
+	} else {
+		adapter->rx_buffer_len = IXGB_RXBUFFER_16384;
+	}
+
+	netdev->mtu = new_mtu;
+
+	if(old_mtu != adapter->rx_buffer_len && netif_running(netdev)) {
+
+		ixgb_down(adapter, TRUE);
+		ixgb_up(adapter);
+	}
+
+
+	return 0;
+}
+
+/**
+ * ixgb_update_stats - Update the board statistics counters.
+ * @adapter: board private structure
+ **/
+
+static void
+ixgb_update_stats(struct ixgb_adapter *adapter)
+{
+	adapter->stats.tprl += IXGB_READ_REG(&adapter->hw, TPRL);
+	adapter->stats.tprh += IXGB_READ_REG(&adapter->hw, TPRH);
+	adapter->stats.gprcl += IXGB_READ_REG(&adapter->hw, GPRCL);
+	adapter->stats.gprch += IXGB_READ_REG(&adapter->hw, GPRCH);
+	adapter->stats.bprcl += IXGB_READ_REG(&adapter->hw, BPRCL);
+	adapter->stats.bprch += IXGB_READ_REG(&adapter->hw, BPRCH);
+	adapter->stats.mprcl += IXGB_READ_REG(&adapter->hw, MPRCL);
+	adapter->stats.mprch += IXGB_READ_REG(&adapter->hw, MPRCH);
+	adapter->stats.uprcl += IXGB_READ_REG(&adapter->hw, UPRCL);
+	adapter->stats.uprch += IXGB_READ_REG(&adapter->hw, UPRCH);
+	adapter->stats.vprcl += IXGB_READ_REG(&adapter->hw, VPRCL);
+	adapter->stats.vprch += IXGB_READ_REG(&adapter->hw, VPRCH);
+	adapter->stats.jprcl += IXGB_READ_REG(&adapter->hw, JPRCL);
+	adapter->stats.jprch += IXGB_READ_REG(&adapter->hw, JPRCH);
+	adapter->stats.gorcl += IXGB_READ_REG(&adapter->hw, GORCL);
+	adapter->stats.gorch += IXGB_READ_REG(&adapter->hw, GORCH);
+	adapter->stats.torl += IXGB_READ_REG(&adapter->hw, TORL);
+	adapter->stats.torh += IXGB_READ_REG(&adapter->hw, TORH);
+	adapter->stats.rnbc += IXGB_READ_REG(&adapter->hw, RNBC);
+	adapter->stats.ruc += IXGB_READ_REG(&adapter->hw, RUC);
+	adapter->stats.roc += IXGB_READ_REG(&adapter->hw, ROC);
+	adapter->stats.rlec += IXGB_READ_REG(&adapter->hw, RLEC);
+	adapter->stats.crcerrs += IXGB_READ_REG(&adapter->hw, CRCERRS);
+	adapter->stats.icbc += IXGB_READ_REG(&adapter->hw, ICBC);
+	adapter->stats.ecbc += IXGB_READ_REG(&adapter->hw, ECBC);
+	adapter->stats.mpc += IXGB_READ_REG(&adapter->hw, MPC);
+	adapter->stats.tptl += IXGB_READ_REG(&adapter->hw, TPTL);
+	adapter->stats.tpth += IXGB_READ_REG(&adapter->hw, TPTH);
+	adapter->stats.gptcl += IXGB_READ_REG(&adapter->hw, GPTCL);
+	adapter->stats.gptch += IXGB_READ_REG(&adapter->hw, GPTCH);
+	adapter->stats.bptcl += IXGB_READ_REG(&adapter->hw, BPTCL);
+	adapter->stats.bptch += IXGB_READ_REG(&adapter->hw, BPTCH);
+	adapter->stats.mptcl += IXGB_READ_REG(&adapter->hw, MPTCL);
+	adapter->stats.mptch += IXGB_READ_REG(&adapter->hw, MPTCH);
+	adapter->stats.uptcl += IXGB_READ_REG(&adapter->hw, UPTCL);
+	adapter->stats.uptch += IXGB_READ_REG(&adapter->hw, UPTCH);
+	adapter->stats.vptcl += IXGB_READ_REG(&adapter->hw, VPTCL);
+	adapter->stats.vptch += IXGB_READ_REG(&adapter->hw, VPTCH);
+	adapter->stats.jptcl += IXGB_READ_REG(&adapter->hw, JPTCL);
+	adapter->stats.jptch += IXGB_READ_REG(&adapter->hw, JPTCH);
+	adapter->stats.gotcl += IXGB_READ_REG(&adapter->hw, GOTCL);
+	adapter->stats.gotch += IXGB_READ_REG(&adapter->hw, GOTCH);
+	adapter->stats.totl += IXGB_READ_REG(&adapter->hw, TOTL);
+	adapter->stats.toth += IXGB_READ_REG(&adapter->hw, TOTH);
+	adapter->stats.dc += IXGB_READ_REG(&adapter->hw, DC);
+	adapter->stats.plt64c += IXGB_READ_REG(&adapter->hw, PLT64C);
+	adapter->stats.tsctc += IXGB_READ_REG(&adapter->hw, TSCTC);
+	adapter->stats.tsctfc += IXGB_READ_REG(&adapter->hw, TSCTFC);
+	adapter->stats.ibic += IXGB_READ_REG(&adapter->hw, IBIC);
+	adapter->stats.rfc += IXGB_READ_REG(&adapter->hw, RFC);
+	adapter->stats.lfc += IXGB_READ_REG(&adapter->hw, LFC);
+	adapter->stats.pfrc += IXGB_READ_REG(&adapter->hw, PFRC);
+	adapter->stats.pftc += IXGB_READ_REG(&adapter->hw, PFTC);
+	adapter->stats.mcfrc += IXGB_READ_REG(&adapter->hw, MCFRC);
+	adapter->stats.mcftc += IXGB_READ_REG(&adapter->hw, MCFTC);
+	adapter->stats.xonrxc += IXGB_READ_REG(&adapter->hw, XONRXC);
+	adapter->stats.xontxc += IXGB_READ_REG(&adapter->hw, XONTXC);
+	adapter->stats.xoffrxc += IXGB_READ_REG(&adapter->hw, XOFFRXC);
+	adapter->stats.xofftxc += IXGB_READ_REG(&adapter->hw, XOFFTXC);
+	adapter->stats.rjc += IXGB_READ_REG(&adapter->hw, RJC);
+
+	/* Fill out the OS statistics structure */
+
+	adapter->net_stats.rx_packets = adapter->stats.gprcl;
+	adapter->net_stats.tx_packets = adapter->stats.gptcl;
+	adapter->net_stats.rx_bytes = adapter->stats.gorcl;
+	adapter->net_stats.tx_bytes = adapter->stats.gotcl;
+	adapter->net_stats.multicast = adapter->stats.mprcl;
+	adapter->net_stats.collisions = 0;
+
+	/* ignore RLEC as it reports errors for padded (<64bytes) frames
+	 * with a length in the type/len field */
+	adapter->net_stats.rx_errors =
+	    /* adapter->stats.rnbc + */ adapter->stats.crcerrs + adapter->stats.ruc +
+	    adapter->stats.roc /*+ adapter->stats.rlec*/ + adapter->stats.icbc +
+	    adapter->stats.ecbc + adapter->stats.mpc;
+
+	adapter->net_stats.rx_dropped = adapter->stats.mpc;
+
+	/* see above
+	 * adapter->net_stats.rx_length_errors = adapter->stats.rlec;
+	 */
+
+	adapter->net_stats.rx_crc_errors = adapter->stats.crcerrs;
+	adapter->net_stats.rx_fifo_errors = adapter->stats.mpc;
+	adapter->net_stats.rx_missed_errors = adapter->stats.mpc;
+	adapter->net_stats.rx_over_errors = adapter->stats.mpc;
+
+	adapter->net_stats.tx_errors = 0;
+	adapter->net_stats.rx_frame_errors = 0;
+	adapter->net_stats.tx_aborted_errors = 0;
+	adapter->net_stats.tx_carrier_errors = 0;
+	adapter->net_stats.tx_fifo_errors = 0;
+	adapter->net_stats.tx_heartbeat_errors = 0;
+	adapter->net_stats.tx_window_errors = 0;
+}
+
+/**
+ * ixgb_irq_disable - Mask off interrupt generation on the NIC
+ * @adapter: board private structure
+ **/
+
+static inline void
+ixgb_irq_disable(struct ixgb_adapter *adapter)
+{
+	atomic_inc(&adapter->irq_sem);
+	IXGB_WRITE_REG(&adapter->hw, IMC, ~0);
+	IXGB_WRITE_FLUSH(&adapter->hw);
+	synchronize_irq(adapter->pdev->irq);
+}
+
+/**
+ * ixgb_irq_enable - Enable default interrupt generation settings
+ * @adapter: board private structure
+ **/
+
+static inline void
+ixgb_irq_enable(struct ixgb_adapter *adapter)
+{
+	if(atomic_dec_and_test(&adapter->irq_sem)) {
+		IXGB_WRITE_REG(&adapter->hw, IMS,
+			   IXGB_INT_RXT0 | IXGB_INT_RXDMT0 | IXGB_INT_TXDW |
+			   IXGB_INT_RXO | IXGB_INT_LSC);
+		IXGB_WRITE_FLUSH(&adapter->hw);
+	}
+}
+
+#define IXGB_MAX_INTR 10
+/**
+ * ixgb_intr - Interrupt Handler
+ * @irq: interrupt number
+ * @data: pointer to a network interface device structure
+ * @pt_regs: CPU registers structure
+ **/
+
+static irqreturn_t
+ixgb_intr(int irq, void *data, struct pt_regs *regs)
+{
+	struct net_device *netdev = data;
+	struct ixgb_adapter *adapter = netdev->priv;
+	struct ixgb_hw *hw = &adapter->hw;
+	uint32_t icr = IXGB_READ_REG(&adapter->hw, ICR);
+#ifndef CONFIG_IXGB_NAPI
+	unsigned int i;
+#endif
+
+	if(unlikely(!icr))
+		return IRQ_NONE;  /* Not our interrupt */
+
+	if(unlikely(icr & (IXGB_INT_RXSEQ | IXGB_INT_LSC))) {
+		mod_timer(&adapter->watchdog_timer, jiffies);
+	}
+
+#ifdef CONFIG_IXGB_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);
+		IXGB_WRITE_REG(&adapter->hw, IMC, ~0);
+		__netif_rx_schedule(netdev);
+	}
+#else
+	for(i = 0; i < IXGB_MAX_INTR; i++)
+		if(!ixgb_clean_rx_irq(adapter) &
+		   !ixgb_clean_tx_irq(adapter))
+			break;
+	/* if RAIDC:EN == 1 and ICR:RXDMT0 == 1, we need to
+	 * set IMS:RXDMT0 to 1 to restart the RBD timer (POLL)
+	 */
+	if((icr & IXGB_INT_RXDMT0) && adapter->raidc) {
+	      /* ready the timer by writing the clear reg */
+	      IXGB_WRITE_REG(hw, IMC, IXGB_INT_RXDMT0);
+	      /* now restart it, h/w will decide if its necessary */
+	      IXGB_WRITE_REG(hw, IMS, IXGB_INT_RXDMT0);
+	}
+#endif 
+	return IRQ_HANDLED;
+}
+
+#ifdef CONFIG_IXGB_NAPI
+/**
+ * ixgb_clean - NAPI Rx polling callback
+ * @adapter: board private structure
+ **/
+
+static int
+ixgb_clean(struct net_device *netdev, int *budget)
+{
+	struct ixgb_adapter *adapter = netdev->priv;
+	int work_to_do = min(*budget, netdev->quota);
+	int work_done = 0;
+	
+	ixgb_clean_tx_irq(adapter);
+	ixgb_clean_rx_irq(adapter, &work_done, work_to_do);
+
+	*budget -= work_done;
+	netdev->quota -= work_done;
+	
+	if(work_done < work_to_do || !netif_running(netdev)) {
+		netif_rx_complete(netdev);
+		/* RAIDC will be automatically restarted by irq_enable */
+		ixgb_irq_enable(adapter);
+	}
+
+	return (work_done >= work_to_do);
+}
+#endif
+
+/**
+ * ixgb_clean_tx_irq - Reclaim resources after transmit completes
+ * @adapter: board private structure
+ **/
+
+static boolean_t
+ixgb_clean_tx_irq(struct ixgb_adapter *adapter)
+{
+	struct ixgb_desc_ring *tx_ring = &adapter->tx_ring;
+	struct net_device *netdev = adapter->netdev;
+	struct pci_dev *pdev = adapter->pdev;
+	struct ixgb_tx_desc *tx_desc, *eop_desc;
+	struct ixgb_buffer *buffer_info;
+	unsigned int i, eop;
+	boolean_t cleaned = FALSE;
+
+	i = tx_ring->next_to_clean;
+	eop = tx_ring->buffer_info[i].next_to_watch;
+	eop_desc = IXGB_TX_DESC(*tx_ring, eop);
+
+	while(eop_desc->status & cpu_to_le32(IXGB_TX_DESC_STATUS_DD)) {
+
+		for(cleaned = FALSE; !cleaned; ) {
+			tx_desc = IXGB_TX_DESC(*tx_ring, i);
+			buffer_info = &tx_ring->buffer_info[i];
+
+			if (tx_desc->popts
+		    	    & (IXGB_TX_DESC_POPTS_TXSM | IXGB_TX_DESC_POPTS_IXSM))
+				adapter->hw_csum_tx_good++;
+
+			if(buffer_info->dma) {
+
+				pci_unmap_page(pdev,
+					       buffer_info->dma,
+					       buffer_info->length,
+					       PCI_DMA_TODEVICE);
+
+				buffer_info->dma = 0;
+			}
+
+			if(buffer_info->skb) {
+
+				dev_kfree_skb_any(buffer_info->skb);
+
+				buffer_info->skb = NULL;
+			}
+
+			*(uint32_t *)&(tx_desc->status) = 0;
+
+			cleaned = (i == eop);
+			if(++i == tx_ring->count) i = 0;
+		}
+		
+		eop = tx_ring->buffer_info[i].next_to_watch;
+		eop_desc = IXGB_TX_DESC(*tx_ring, eop);
+	}
+
+	tx_ring->next_to_clean = i;
+
+	spin_lock(&adapter->tx_lock);
+	if(cleaned && netif_queue_stopped(netdev) && netif_carrier_ok(netdev) &&
+	   (IXGB_DESC_UNUSED(tx_ring) > IXGB_TX_QUEUE_WAKE)) {
+
+		netif_wake_queue(netdev);
+	}
+	spin_unlock(&adapter->tx_lock);
+	
+	return cleaned;
+}
+
+/**
+ * ixgb_clean_rx_irq - Send received data up the network stack,
+ * @adapter: board private structure
+ **/
+
+static boolean_t
+#ifdef CONFIG_IXGB_NAPI
+ixgb_clean_rx_irq(struct ixgb_adapter *adapter, int *work_done,
+                   int work_to_do)
+#else
+ixgb_clean_rx_irq(struct ixgb_adapter *adapter)
+#endif
+{
+	struct ixgb_desc_ring *rx_ring = &adapter->rx_ring;
+	struct net_device *netdev = adapter->netdev;
+	struct pci_dev *pdev = adapter->pdev;
+	struct ixgb_rx_desc *rx_desc, *next_rxd;
+	struct ixgb_buffer *buffer_info, *next_buffer, *next2_buffer;
+	struct sk_buff *skb, *next_skb;
+	uint32_t length;
+	unsigned int i, j;
+	boolean_t cleaned = FALSE;
+
+	i = rx_ring->next_to_clean;
+	rx_desc = IXGB_RX_DESC(*rx_ring, i);
+	buffer_info = &rx_ring->buffer_info[i];
+
+	while(rx_desc->status & IXGB_RX_DESC_STATUS_DD) {
+
+		skb = buffer_info->skb;
+		prefetch(skb->data);
+
+		if(++i == rx_ring->count) i = 0;
+		next_rxd = IXGB_RX_DESC(*rx_ring, i);
+		prefetch(next_rxd);
+
+		if((j = i + 1) == rx_ring->count) j = 0;
+		next2_buffer = &rx_ring->buffer_info[j];
+		prefetch(next2_buffer);
+
+		next_buffer = &rx_ring->buffer_info[i];
+		next_skb = next_buffer->skb;
+		prefetch(next_skb);
+
+#ifdef CONFIG_IXGB_NAPI
+		if(*work_done >= work_to_do)
+			break;
+
+		(*work_done)++;
+#endif
+
+		cleaned = TRUE;
+
+		pci_unmap_single(pdev,
+		                 buffer_info->dma,
+		                 buffer_info->length,
+		                 PCI_DMA_FROMDEVICE);
+
+		length = le16_to_cpu(rx_desc->length);
+
+		if(unlikely(!(rx_desc->status & IXGB_RX_DESC_STATUS_EOP))) {
+
+			/* All receives must fit into a single buffer */
+
+			IXGB_DBG("Receive packet consumed multiple buffers "
+			         "length<%x>\n", length);
+
+			dev_kfree_skb_irq(skb);
+			rx_desc->status = 0;
+			buffer_info->skb = NULL;
+
+			rx_desc = next_rxd;
+			buffer_info = next_buffer;
+			continue;
+		}
+
+		if(unlikely(rx_desc->errors 
+		            & (IXGB_RX_DESC_ERRORS_CE | IXGB_RX_DESC_ERRORS_SE |
+			           IXGB_RX_DESC_ERRORS_P | IXGB_RX_DESC_ERRORS_RXE))) {
+
+
+			dev_kfree_skb_irq(skb);
+			rx_desc->status = 0;
+			buffer_info->skb = NULL;
+
+			rx_desc = next_rxd;
+			buffer_info = next_buffer;
+			continue;
+		}
+
+		/* Good Receive */
+		skb_put(skb, length); 
+
+		/* Receive Checksum Offload */
+		ixgb_rx_checksum(adapter, rx_desc, skb);
+
+		skb->protocol = eth_type_trans(skb, netdev);
+#ifdef CONFIG_IXGB_NAPI
+#ifdef NETIF_F_HW_VLAN_TX
+		if(adapter->vlgrp && (rx_desc->status & IXGB_RX_DESC_STATUS_VP)) {
+			vlan_hwaccel_receive_skb(skb, adapter->vlgrp,
+				le16_to_cpu(rx_desc->special &
+					IXGB_RX_DESC_SPECIAL_VLAN_MASK));
+		} else {
+			netif_receive_skb(skb);
+		}
+#else
+		netif_receive_skb(skb);
+#endif
+#else /* CONFIG_IXGB_NAPI */
+#ifdef NETIF_F_HW_VLAN_TX
+		if(adapter->vlgrp && (rx_desc->status & IXGB_RX_DESC_STATUS_VP)) {
+			vlan_hwaccel_rx(skb, adapter->vlgrp,
+				le16_to_cpu(rx_desc->special &
+					IXGB_RX_DESC_SPECIAL_VLAN_MASK));
+		} else {
+			netif_rx(skb);
+		}
+#else
+		netif_rx(skb);
+#endif
+#endif /* CONFIG_IXGB_NAPI */
+		netdev->last_rx = jiffies;
+
+		rx_desc->status = 0;
+		buffer_info->skb = NULL;
+
+		rx_desc = next_rxd;
+		buffer_info = next_buffer;
+	}
+
+	rx_ring->next_to_clean = i;
+
+	ixgb_alloc_rx_buffers(adapter);
+
+	return cleaned;
+}
+
+/**
+ * ixgb_alloc_rx_buffers - Replace used receive buffers
+ * @adapter: address of board private structure
+ **/
+
+static void
+ixgb_alloc_rx_buffers(struct ixgb_adapter *adapter)
+{
+	struct ixgb_desc_ring *rx_ring = &adapter->rx_ring;
+	struct net_device *netdev = adapter->netdev;
+	struct pci_dev *pdev = adapter->pdev;
+	struct ixgb_rx_desc *rx_desc;
+	struct ixgb_buffer *buffer_info;
+	struct sk_buff *skb;
+	int reserve_len = 2;
+	unsigned int i;
+	int num_group_tail_writes;
+	long cleancount;
+
+	i = rx_ring->next_to_use;
+	buffer_info = &rx_ring->buffer_info[i];
+	cleancount = IXGB_DESC_UNUSED (rx_ring);
+
+	/* lessen this to 4 if we're
+	 * in the midst of raidc and rbd is occuring
+	 * because we don't want to delay returning buffers when low
+	 */
+	num_group_tail_writes 
+		= adapter->raidc ? 4 : IXGB_RX_BUFFER_WRITE;
+	
+	/* leave one descriptor unused */
+	while(--cleancount > 0) {
+		rx_desc = IXGB_RX_DESC(*rx_ring, i);
+
+		skb = dev_alloc_skb(adapter->rx_buffer_len + reserve_len);
+
+		if(unlikely(!skb)) {
+			/* Better luck next round */
+			break;
+		}
+
+		/* Make buffer alignment 2 beyond a 16 byte boundary
+		 * this will result in a 16 byte aligned IP header after
+		 * the 14 byte MAC header is removed
+		 */
+		skb_reserve(skb, reserve_len);
+
+		skb->dev = netdev;
+
+		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->buff_addr = cpu_to_le64(buffer_info->dma);
+
+		if((i & ~(num_group_tail_writes- 1)) == i) {
+			/* Force memory writes to complete before letting h/w
+			 * know there are new descriptors to fetch.  (Only
+			 * applicable for weak-ordered memory model archs,
+			 * such as IA-64). */
+			wmb();
+
+			IXGB_WRITE_REG(&adapter->hw, RDT, i);
+		}
+
+		if(++i == rx_ring->count) i = 0;
+		buffer_info = &rx_ring->buffer_info[i];
+	}
+
+	rx_ring->next_to_use = i;
+}
+
+/**
+ * ixgb_ioctl - perform a command - e.g: ethtool:get_driver_info.
+ * @param netdev network interface device structure
+ * @param ifr data to be used/filled in by the ioctl command
+ * @param cmd ioctl command to execute
+ **/
+
+static int
+ixgb_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
+{
+	switch (cmd) {
+#ifdef SIOCETHTOOL
+	case SIOCETHTOOL:
+		return ixgb_ethtool_ioctl(netdev, ifr);
+#endif
+	default:
+		return -EOPNOTSUPP;
+	}
+
+	return 0;
+}
+
+/**
+ * ixgb_rx_checksum - Receive Checksum Offload for 82597.
+ * @adapter: board private structure
+ * @rx_desc: receive descriptor
+ * @sk_buff: socket buffer with received data
+ **/
+
+static inline void
+ixgb_rx_checksum(struct ixgb_adapter *adapter,
+                 struct ixgb_rx_desc *rx_desc,
+                 struct sk_buff *skb)
+{
+	/* Ignore Checksum bit is set OR 
+	 * TCP Checksum has not been calculated 
+	 */
+	if((rx_desc->status & IXGB_RX_DESC_STATUS_IXSM) ||
+	   (!(rx_desc->status & IXGB_RX_DESC_STATUS_TCPCS))) {
+		skb->ip_summed = CHECKSUM_NONE;
+		return;
+	}
+
+	/* At this point we know the hardware did the TCP checksum */
+	/* now look at the TCP checksum error bit */
+	if(rx_desc->errors & IXGB_RX_DESC_ERRORS_TCPE) {
+		/* let the stack verify checksum errors */
+		skb->ip_summed = CHECKSUM_NONE;
+		adapter->hw_csum_rx_error++;
+	} else {
+	/* TCP checksum is good */
+		skb->ip_summed = CHECKSUM_UNNECESSARY;
+		adapter->hw_csum_rx_good++;
+	}
+}
+
+
+#ifdef NETIF_F_HW_VLAN_TX
+/**
+ * ixgb_vlan_rx_register - enables or disables vlan tagging/stripping.
+ * 
+ * @param netdev network interface device structure
+ * @param grp indicates to enable or disable tagging/stripping
+ **/
+static void
+ixgb_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
+{
+	struct ixgb_adapter *adapter = netdev->priv;
+	uint32_t ctrl, rctl;
+
+	ixgb_irq_disable(adapter);
+	adapter->vlgrp = grp;
+
+	if(grp) {
+		/* enable VLAN tag insert/strip */
+		ctrl = IXGB_READ_REG(&adapter->hw, CTRL0);
+		ctrl |= IXGB_CTRL0_VME;
+		IXGB_WRITE_REG(&adapter->hw, CTRL0, ctrl);
+
+		/* enable VLAN receive filtering */
+
+		rctl = IXGB_READ_REG(&adapter->hw, RCTL);
+		rctl |= IXGB_RCTL_VFE;
+		rctl &= ~IXGB_RCTL_CFIEN;
+		IXGB_WRITE_REG(&adapter->hw, RCTL, rctl);
+	} else {
+		/* disable VLAN tag insert/strip */
+
+		ctrl = IXGB_READ_REG(&adapter->hw, CTRL0);
+		ctrl &= ~IXGB_CTRL0_VME;
+		IXGB_WRITE_REG(&adapter->hw, CTRL0, ctrl);
+
+		/* disable VLAN filtering */
+
+		rctl = IXGB_READ_REG(&adapter->hw, RCTL);
+		rctl &= ~IXGB_RCTL_VFE;
+		IXGB_WRITE_REG(&adapter->hw, RCTL, rctl);
+	}
+
+	ixgb_irq_enable(adapter);
+}
+
+static void
+ixgb_vlan_rx_add_vid(struct net_device *netdev, uint16_t vid)
+{
+	struct ixgb_adapter *adapter = netdev->priv;
+	uint32_t vfta, index;
+
+	/* add VID to filter table */
+
+	index = (vid >> 5) & 0x7F;
+	vfta = IXGB_READ_REG_ARRAY(&adapter->hw, VFTA, index);
+	vfta |= (1 << (vid & 0x1F));
+	ixgb_write_vfta(&adapter->hw, index, vfta);
+}
+
+static void
+ixgb_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid)
+{
+	struct ixgb_adapter *adapter = netdev->priv;
+	uint32_t vfta, index;
+
+	ixgb_irq_disable(adapter);
+
+	if(adapter->vlgrp)
+		adapter->vlgrp->vlan_devices[vid] = NULL;
+
+	ixgb_irq_enable(adapter);
+
+	/* remove VID from filter table*/
+
+	index = (vid >> 5) & 0x7F;
+	vfta = IXGB_READ_REG_ARRAY(&adapter->hw, VFTA, index);
+	vfta &= ~(1 << (vid & 0x1F));
+	ixgb_write_vfta(&adapter->hw, index, vfta);
+}
+
+static void
+ixgb_restore_vlan(struct ixgb_adapter *adapter)
+{
+	ixgb_vlan_rx_register(adapter->netdev, adapter->vlgrp);
+
+	if(adapter->vlgrp) {
+		uint16_t vid;
+		for(vid = 0; vid < VLAN_GROUP_ARRAY_LEN; vid++) {
+			if(!adapter->vlgrp->vlan_devices[vid])
+				continue;
+			ixgb_vlan_rx_add_vid(adapter->netdev, vid);
+		}
+	}
+}
+#endif
+
+
+
+/**
+ * ixgb_notify_reboot - handles OS notification of reboot event.
+ * @param nb notifier block, unused
+ * @param event Event being passed to driver to act upon
+ * @param p A pointer to our net device
+ **/
+static int
+ixgb_notify_reboot(struct notifier_block *nb, unsigned long event, void *p)
+{
+	struct pci_dev *pdev = NULL;
+
+	switch(event) {
+	case SYS_DOWN:
+	case SYS_HALT:
+	case SYS_POWER_OFF:
+		while((pdev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, pdev))) {
+			if(pci_dev_driver(pdev) == &ixgb_driver)
+				ixgb_suspend(pdev, 3);
+		}
+	}
+	return NOTIFY_DONE;
+}
+
+
+/**
+ * ixgb_suspend - driver suspend function called from notify.
+ * @param pdev pci driver structure used for passing to
+ * @param state power state to enter 
+ **/
+static int
+ixgb_suspend(struct pci_dev *pdev, uint32_t state)
+{
+	struct net_device *netdev = pci_get_drvdata(pdev);
+	struct ixgb_adapter *adapter = netdev->priv;
+
+	netif_device_detach(netdev);
+
+	if(netif_running(netdev))
+		ixgb_down(adapter, TRUE);
+
+	pci_save_state(pdev, adapter->pci_state);
+
+	state = (state > 0) ? 3 : 0;
+	pci_set_power_state(pdev, state);
+	msec_delay(200);
+
+	return 0;
+}
+
+
+#ifdef CONFIG_NET_POLL_CONTROLLER
+/*
+ * Polling 'interrupt' - used by things like netconsole to send skbs
+ * without having to re-enable interrupts. It's not called while
+ * the interrupt routine is executing.
+ */
+
+static void ixgb_netpoll (struct net_device *dev)
+{
+	struct ixgb_adapter *adapter = dev->priv;
+	disable_irq(adapter->pdev->irq);
+	ixgb_intr (adapter->pdev->irq, dev, NULL);
+	enable_irq(adapter->pdev->irq);
+}
+#endif
+
+/* ixgb_main.c */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/ixgb/ixgb_osdep.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/ixgb/ixgb_osdep.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/ixgb/ixgb_osdep.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/ixgb/ixgb_osdep.h	2004-09-09 13:21:58.000000000 +0200
@@ -0,0 +1,100 @@
+/*******************************************************************************
+
+  
+  Copyright(c) 1999 - 2004 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 
+  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  02111-1307, USA.
+  
+  The full GNU General Public License is included in this distribution in the
+  file called LICENSE.
+  
+  Contact Information:
+  Linux NICS <linux.nics@intel.com>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+*******************************************************************************/
+
+
+/* glue for the OS independent part of ixgb
+ * includes register access macros
+ */
+
+#ifndef _IXGB_OSDEP_H_
+#define _IXGB_OSDEP_H_
+
+#include <linux/types.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <asm/io.h>
+#include <linux/interrupt.h>
+#include <linux/sched.h>
+#include "kcompat.h"
+
+#define usec_delay(x) udelay(x)
+#ifndef msec_delay
+#define msec_delay(x)	do { if(in_interrupt()) { \
+				/* Don't mdelay in interrupt context! */ \
+	                	BUG(); \
+			} else { \
+				set_current_state(TASK_UNINTERRUPTIBLE); \
+				schedule_timeout((x * HZ)/1000 + 2); \
+			} } while(0)
+#endif
+
+#define PCI_COMMAND_REGISTER   PCI_COMMAND
+#define CMD_MEM_WRT_INVALIDATE PCI_COMMAND_INVALIDATE
+
+typedef enum {
+#undef FALSE
+    FALSE = 0,
+#undef TRUE
+    TRUE = 1
+} boolean_t;
+
+#undef ASSERT
+#define ASSERT(x)	if(!(x)) BUG()
+#define MSGOUT(S, A, B)	printk(KERN_DEBUG S "\n", A, B)
+
+#if DBG
+#define DEBUGOUT(S)		printk(KERN_DEBUG S "\n")
+#define DEBUGOUT1(S, A...)	printk(KERN_DEBUG S "\n", A)
+#else
+#define DEBUGOUT(S)
+#define DEBUGOUT1(S, A...)
+#endif
+
+#define DEBUGFUNC(F) DEBUGOUT(F)
+#define DEBUGOUT2 DEBUGOUT1
+#define DEBUGOUT3 DEBUGOUT2
+#define DEBUGOUT7 DEBUGOUT3
+
+
+#define IXGB_WRITE_REG(a, reg, value) ( \
+    writel((value), ((a)->hw_addr + IXGB_##reg)))
+
+#define IXGB_READ_REG(a, reg) ( \
+    readl((a)->hw_addr + IXGB_##reg))
+
+#define IXGB_WRITE_REG_ARRAY(a, reg, offset, value) ( \
+    writel((value), ((a)->hw_addr + IXGB_##reg + ((offset) << 2))))
+
+#define IXGB_READ_REG_ARRAY(a, reg, offset) ( \
+    readl((a)->hw_addr + IXGB_##reg + ((offset) << 2)))
+
+#define IXGB_WRITE_FLUSH(a) IXGB_READ_REG(a, STATUS)
+
+#define IXGB_MEMCPY memcpy
+
+#endif /* _IXGB_OSDEP_H_ */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/ixgb/ixgb_param.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/ixgb/ixgb_param.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/ixgb/ixgb_param.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/ixgb/ixgb_param.c	2004-09-09 13:21:58.000000000 +0200
@@ -0,0 +1,479 @@
+/*******************************************************************************
+
+  
+  Copyright(c) 1999 - 2004 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 
+  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  02111-1307, USA.
+  
+  The full GNU General Public License is included in this distribution in the
+  file called LICENSE.
+  
+  Contact Information:
+  Linux NICS <linux.nics@intel.com>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+*******************************************************************************/
+
+#include "ixgb.h"
+
+/* This is the only thing that needs to be changed to adjust the
+ * maximum number of ports that the driver can manage.
+ */
+
+#define IXGB_MAX_NIC 8
+
+#define OPTION_UNSET    -1
+#define OPTION_DISABLED 0
+#define OPTION_ENABLED  1
+
+/* Module Parameters are always initialized to -1, so that the driver
+ * can tell the difference between no user specified value or the
+ * user asking for the default value.
+ * The true default values are loaded in when ixgb_check_options is called.
+ *
+ * This is a GCC extension to ANSI C.
+ * See the item "Labeled Elements in Initializers" in the section
+ * "Extensions to the C Language Family" of the GCC documentation.
+ */
+
+#define IXGB_PARAM_INIT { [0 ... IXGB_MAX_NIC] = OPTION_UNSET }
+
+/* All parameters are treated the same, as an integer array of values.
+ * This macro just reduces the need to repeat the same declaration code
+ * over and over (plus this helps to avoid typo bugs).
+ */
+
+#define IXGB_PARAM(X, S) \
+static const int __devinitdata X[IXGB_MAX_NIC + 1] = IXGB_PARAM_INIT; \
+MODULE_PARM(X, "1-" __MODULE_STRING(IXGB_MAX_NIC) "i"); \
+MODULE_PARM_DESC(X, S);
+
+/* Transmit Descriptor Count
+ *
+ * Valid Range: 64-4096
+ *
+ * Default Value: 256
+ */
+
+IXGB_PARAM(TxDescriptors, "Number of transmit descriptors");
+
+/* Receive Descriptor Count
+ *
+ * Valid Range: 64-4096
+ *
+ * Default Value: 1024
+ */
+
+IXGB_PARAM(RxDescriptors, "Number of receive descriptors");
+
+/* User Specified Flow Control Override
+ *
+ * Valid Range: 0-3
+ *  - 0 - No Flow Control
+ *  - 1 - Rx only, respond to PAUSE frames but do not generate them
+ *  - 2 - Tx only, generate PAUSE frames but ignore them on receive
+ *  - 3 - Full Flow Control Support
+ *
+ * Default Value: Read flow control settings from the EEPROM
+ */
+
+IXGB_PARAM(FlowControl, "Flow Control setting");
+
+/* XsumRX - Receive Checksum Offload Enable/Disable
+ *
+ * Valid Range: 0, 1
+ *  - 0 - disables all checksum offload
+ *  - 1 - enables receive IP/TCP/UDP checksum offload
+ *        on 82597 based NICs
+ *
+ * Default Value: 1
+ */
+
+IXGB_PARAM(XsumRX, "Disable or enable Receive Checksum offload");
+
+/* Transmit Interrupt Delay in units of 0.8192 microseconds
+ *
+ * Valid Range: 0-65535
+ *
+ * Default Value: 32
+ */
+
+IXGB_PARAM(TxIntDelay, "Transmit Interrupt Delay");
+
+/* Receive Interrupt Delay in units of 0.8192 microseconds
+ *
+ * Valid Range: 0-65535
+ *
+ * Default Value: 72
+ */
+
+IXGB_PARAM(RxIntDelay, "Receive Interrupt Delay");
+
+/* Receive Interrupt Moderation enable (uses RxIntDelay too)
+ *
+ * Valid Range: 0,1
+ *
+ * Default Value: 1
+ */
+
+IXGB_PARAM(RAIDC, "Disable or enable Receive Interrupt Moderation");
+
+/* Receive Flow control high threshold (when we send a pause frame)
+ * (FCRTH)
+ *
+ * Valid Range: 1,536 - 262,136 (0x600 - 0x3FFF8, 8 byte granularity)
+ *
+ * Default Value: 196,608 (0x30000)
+ */
+
+IXGB_PARAM(RxFCHighThresh, "Receive Flow Control High Threshold");
+
+
+/* Receive Flow control low threshold (when we send a resume frame)
+ * (FCRTL)
+ *
+ * Valid Range: 64 - 262,136 (0x40 - 0x3FFF8, 8 byte granularity)
+ *              must be less than high threshold by at least 8 bytes
+ *
+ * Default Value:  163,840 (0x28000)
+ */
+
+IXGB_PARAM(RxFCLowThresh, "Receive Flow Control Low Threshold");
+
+
+/* Flow control request timeout (how long to pause the link partner's tx)
+ * (PAP 15:0)
+ *
+ * Valid Range: 1 - 65535 
+ *
+ * Default Value:  256 (0x100)
+ */
+
+IXGB_PARAM(FCReqTimeout, "Flow Control Request Timeout");
+
+
+/* Interrupt Delay Enable
+ *
+ * Valid Range: 0, 1
+ *
+ *  - 0 - disables transmit interrupt delay
+ *  - 1 - enables transmmit interrupt delay
+ *
+ * Default Value: 1
+ */
+
+IXGB_PARAM(IntDelayEnable, "Transmit Interrupt Delay Enable");
+
+/* TODO: review defaults and min/max for Kemano */
+#define DEFAULT_TXD			    256
+#define MAX_TXD				   4096
+#define MIN_TXD				     64
+
+#define DEFAULT_RXD			   1024
+#define MAX_RXD				   4096
+#define MIN_RXD				     64
+
+#define DEFAULT_TIDV	   		     32
+#define MAX_TIDV			 0xFFFF
+#define MIN_TIDV			      0
+
+#define DEFAULT_RDTR		   	     72
+#define MAX_RDTR			 0xFFFF
+#define MIN_RDTR			      0
+
+#define XSUMRX_DEFAULT		 OPTION_ENABLED
+
+#define FLOW_CONTROL_FULL	   ixgb_fc_full
+#define FLOW_CONTROL_DEFAULT  FLOW_CONTROL_FULL
+#define DEFAULT_FCRTL	  		0x28000
+#define DEFAULT_FCRTH			0x30000
+#define MIN_FCRTL			      0
+#define MAX_FCRTL			0x3FFE8
+#define MIN_FCRTH			      8
+#define MAX_FCRTH			0x3FFF0
+
+#define DEFAULT_FCPAUSE		  	0x100 /* this may be too long */
+#define MIN_FCPAUSE			      1
+#define MAX_FCPAUSE			 0xffff
+
+
+struct ixgb_option {
+	enum { enable_option, range_option, list_option } type;
+	char *name;
+	char *err;
+	int  def;
+	union {
+		struct { /* range_option info */
+			int min;
+			int max;
+		} r;
+		struct { /* list_option info */
+			int nr;
+			struct ixgb_opt_list { int i; char *str; } *p;
+		} l;
+	} arg;
+};
+
+static int __devinit
+ixgb_validate_option(int *value, struct ixgb_option *opt)
+{
+	if(*value == OPTION_UNSET) {
+		*value = opt->def;
+		return 0;
+	}
+
+	switch (opt->type) {
+	case enable_option:
+		switch (*value) {
+		case OPTION_ENABLED:
+			printk(KERN_INFO "%s Enabled\n", opt->name);
+			return 0;
+		case OPTION_DISABLED:
+			printk(KERN_INFO "%s Disabled\n", opt->name);
+			return 0;
+		}
+		break;
+	case range_option:
+		if(*value >= opt->arg.r.min && *value <= opt->arg.r.max) {
+			printk(KERN_INFO "%s set to %i\n", opt->name, *value);
+			return 0;
+		}
+		break;
+	case list_option: {
+		int i;
+		struct ixgb_opt_list *ent;
+
+		for(i = 0; i < opt->arg.l.nr; i++) {
+			ent = &opt->arg.l.p[i];
+			if(*value == ent->i) {
+				if(ent->str[0] != '\0')
+					printk(KERN_INFO "%s\n", ent->str);
+				return 0;
+			}
+		}
+	}
+		break;
+	default:
+		BUG();
+	}
+
+	printk(KERN_INFO "Invalid %s specified (%i) %s\n",
+	       opt->name, *value, opt->err);
+	*value = opt->def;
+	return -1;
+}
+
+#define LIST_LEN(l) (sizeof(l) / sizeof(l[0]))
+
+/**
+ * ixgb_check_options - Range Checking for Command Line Parameters
+ * @adapter: board private structure
+ *
+ * This routine checks all command line parameters for valid user
+ * input.  If an invalid value is given, or if no user specified
+ * value exists, a default value is used.  The final value is stored
+ * in a variable in the adapter structure.
+ **/
+
+void __devinit
+ixgb_check_options(struct ixgb_adapter *adapter)
+{
+	int bd = adapter->bd_number;
+	if(bd >= IXGB_MAX_NIC) {
+		printk(KERN_NOTICE
+		       "Warning: no configuration for board #%i\n", bd);
+		printk(KERN_NOTICE "Using defaults for all values\n");
+		bd = IXGB_MAX_NIC;
+	}
+
+	{ /* Transmit Descriptor Count */
+		struct ixgb_option opt = {
+			.type = range_option,
+			.name = "Transmit Descriptors",
+			.err  = "using default of " __MODULE_STRING(DEFAULT_TXD),
+			.def  = DEFAULT_TXD,
+			.arg  = { .r = { .min = MIN_TXD,
+					 .max = MAX_TXD}}
+		};
+		struct ixgb_desc_ring *tx_ring = &adapter->tx_ring;
+
+		tx_ring->count = TxDescriptors[bd];
+		ixgb_validate_option(&tx_ring->count, &opt);
+		IXGB_ROUNDUP(tx_ring->count, IXGB_REQ_TX_DESCRIPTOR_MULTIPLE);
+	}
+	{ /* Receive Descriptor Count */
+		struct ixgb_option opt = {
+			.type = range_option,
+			.name = "Receive Descriptors",
+			.err  = "using default of " __MODULE_STRING(DEFAULT_RXD),
+			.def  = DEFAULT_RXD,
+			.arg  = { .r = { .min = MIN_RXD,
+					 .max = MAX_RXD}}
+		};
+		struct ixgb_desc_ring *rx_ring = &adapter->rx_ring;
+
+		rx_ring->count = RxDescriptors[bd];
+		ixgb_validate_option(&rx_ring->count, &opt);
+		IXGB_ROUNDUP(rx_ring->count, IXGB_REQ_RX_DESCRIPTOR_MULTIPLE);
+	}
+	{ /* Receive Checksum Offload Enable */
+		struct ixgb_option opt = {
+			.type = enable_option,
+			.name = "Receive Checksum Offload",
+			.err  = "defaulting to Enabled",
+			.def  = OPTION_ENABLED
+		};
+
+		int rx_csum = XsumRX[bd];
+		ixgb_validate_option(&rx_csum, &opt);
+		adapter->rx_csum = rx_csum;
+	}
+	{ /* Flow Control */
+
+		struct ixgb_opt_list fc_list[] =
+			{{ ixgb_fc_none,    "Flow Control Disabled" },
+			 { ixgb_fc_rx_pause,"Flow Control Receive Only" },
+			 { ixgb_fc_tx_pause,"Flow Control Transmit Only" },
+			 { ixgb_fc_full,    "Flow Control Enabled" },
+			 { ixgb_fc_default, "Flow Control Hardware Default" }};
+
+		struct ixgb_option opt = {
+			.type = list_option,
+			.name = "Flow Control",
+			.err  = "reading default settings from EEPROM",
+			.def  = ixgb_fc_full,
+			.arg  = { .l = { .nr = LIST_LEN(fc_list),
+					 .p = fc_list }}
+		};
+
+		int fc = FlowControl[bd];
+		ixgb_validate_option(&fc, &opt);
+		adapter->hw.fc.type = fc;
+	}
+	{ /* Receive Flow Control High Threshold */
+		struct ixgb_option opt = {
+			.type = range_option,
+			.name = "Rx Flow Control High Threshold",
+			.err  = "using default of " __MODULE_STRING(DEFAULT_FCRTH),
+			.def  = DEFAULT_FCRTH,
+			.arg  = { .r = { .min = MIN_FCRTH,
+					 .max = MAX_FCRTH}}
+		};
+
+		adapter->hw.fc.high_water = RxFCHighThresh[bd];
+		ixgb_validate_option(&adapter->hw.fc.high_water, &opt);
+		if ( !(adapter->hw.fc.type & ixgb_fc_rx_pause) )
+			printk (KERN_INFO 
+				"Ignoring RxFCHighThresh when no RxFC\n");
+	}
+	{ /* Receive Flow Control Low Threshold */
+		struct ixgb_option opt = {
+			.type = range_option,
+			.name = "Rx Flow Control Low Threshold",
+			.err  = "using default of " __MODULE_STRING(DEFAULT_FCRTL),
+			.def  = DEFAULT_FCRTL,
+			.arg  = { .r = { .min = MIN_FCRTL,
+					 .max = MAX_FCRTL}}
+		};
+
+		adapter->hw.fc.low_water = RxFCLowThresh[bd];
+		ixgb_validate_option(&adapter->hw.fc.low_water, &opt);
+		if ( !(adapter->hw.fc.type & ixgb_fc_rx_pause) )
+			printk (KERN_INFO 
+				"Ignoring RxFCLowThresh when no RxFC\n");
+	}
+	{ /* Flow Control Pause Time Request*/
+		struct ixgb_option opt = {
+			.type = range_option,
+			.name = "Flow Control Pause Time Request",
+			.err  = "using default of "__MODULE_STRING(DEFAULT_FCPAUSE),
+			.def  = DEFAULT_FCPAUSE,
+			.arg = { .r = { .min = MIN_FCPAUSE,
+					.max = MAX_FCPAUSE}}
+		};
+
+		int pause_time = FCReqTimeout[bd];
+
+		ixgb_validate_option(&pause_time, &opt);
+		if ( !(adapter->hw.fc.type & ixgb_fc_rx_pause) )
+			printk (KERN_INFO 
+				"Ignoring FCReqTimeout when no RxFC\n");
+		adapter->hw.fc.pause_time = pause_time;
+	}
+	/* high low and spacing check for rx flow control thresholds */
+	if (adapter->hw.fc.type & ixgb_fc_rx_pause) {
+		/* high must be greater than low */
+		if (adapter->hw.fc.high_water < (adapter->hw.fc.low_water + 8)) {
+			/* set defaults */
+			printk (KERN_INFO 
+				"RxFCHighThresh must be >= (RxFCLowThresh + 8), "
+				"Using Defaults\n");
+			adapter->hw.fc.high_water = DEFAULT_FCRTH;
+			adapter->hw.fc.low_water  = DEFAULT_FCRTL;
+		}
+	}
+	{ /* Receive Interrupt Delay */
+		struct ixgb_option opt = {
+			.type = range_option,
+			.name = "Receive Interrupt Delay",
+			.err  = "using default of " __MODULE_STRING(DEFAULT_RDTR),
+			.def  = DEFAULT_RDTR,
+			.arg  = { .r = { .min = MIN_RDTR,
+					 .max = MAX_RDTR}}
+		};
+
+		adapter->rx_int_delay = RxIntDelay[bd];
+		ixgb_validate_option(&adapter->rx_int_delay, &opt);
+	}
+	{ /* Receive Interrupt Moderation */
+		struct ixgb_option opt = {
+			.type = enable_option,
+			.name = "Advanced Receive Interrupt Moderation",
+			.err  = "defaulting to Enabled",
+			.def  = OPTION_ENABLED
+		};
+		int raidc = RAIDC[bd];
+
+		ixgb_validate_option(&raidc, &opt);
+		adapter->raidc = raidc;
+	}
+	{ /* Transmit Interrupt Delay */
+		struct ixgb_option opt = {
+			.type = range_option,
+			.name = "Transmit Interrupt Delay",
+			.err  = "using default of " __MODULE_STRING(DEFAULT_TIDV),
+			.def  = DEFAULT_TIDV,
+			.arg  = { .r = { .min = MIN_TIDV,
+					 .max = MAX_TIDV}}
+		};
+
+		adapter->tx_int_delay = TxIntDelay[bd];
+		ixgb_validate_option(&adapter->tx_int_delay, &opt);
+	}
+
+	{ /* Transmit Interrupt Delay Enable */
+		struct ixgb_option opt = {
+			.type = enable_option,
+			.name = "Tx Interrupt Delay Enable",
+			.err  = "defaulting to Enabled",
+			.def  = OPTION_ENABLED
+		};
+		int ide = IntDelayEnable[bd];
+
+		ixgb_validate_option(&ide, &opt);
+		adapter->tx_int_delay_enable = ide;
+	}
+}
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/ixgb/kcompat.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/ixgb/kcompat.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/ixgb/kcompat.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/ixgb/kcompat.c	2004-09-09 13:21:58.000000000 +0200
@@ -0,0 +1,170 @@
+/*******************************************************************************
+
+  
+  Copyright(c) 1999 - 2004 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 
+  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  02111-1307, USA.
+  
+  The full GNU General Public License is included in this distribution in the
+  file called LICENSE.
+  
+  Contact Information:
+  Linux NICS <linux.nics@intel.com>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+*******************************************************************************/
+
+#include "kcompat.h"
+
+/*****************************************************************************/
+/* 2.4.13 => 2.4.3 */
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,4,13) )
+
+/**************************************/
+/* PCI DMA MAPPING */
+
+#if defined(CONFIG_HIGHMEM)
+
+#ifndef PCI_DRAM_OFFSET
+#define PCI_DRAM_OFFSET 0
+#endif
+
+u64 _kc_pci_map_page(struct pci_dev *dev, struct page *page, unsigned long offset, size_t size, int direction)
+{
+	return (((u64)(page - mem_map) << PAGE_SHIFT) + offset + PCI_DRAM_OFFSET);
+}
+
+#else /* CONFIG_HIGHMEM */
+
+u64 _kc_pci_map_page(struct pci_dev *dev, struct page *page, unsigned long offset, size_t size, int direction)
+{
+	return pci_map_single(dev, (void *)page_address(page) + offset, size, direction);
+}
+
+#endif /* CONFIG_HIGHMEM */
+
+void _kc_pci_unmap_page(struct pci_dev *dev, u64 dma_addr, size_t size, int direction)
+{
+	return pci_unmap_single(dev, dma_addr, size, direction);
+}
+
+#endif /* 2.4.13 => 2.4.3 */
+
+
+/*****************************************************************************/
+/* 2.4.3 => 2.4.0 */
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,4,3) )
+
+/**************************************/
+/* PCI DRIVER API */
+
+int _kc_pci_set_dma_mask(struct pci_dev *dev, dma_addr_t mask)
+{
+	if(!pci_dma_supported(dev, mask))
+		return -EIO;
+	dev->dma_mask = mask;
+	return 0;
+}
+
+int _kc_pci_request_regions(struct pci_dev *dev, char *res_name)
+{
+	int i;
+
+	for (i = 0; i < 6; i++) {
+		if (pci_resource_len(dev, i) == 0)
+			continue;
+
+		if (pci_resource_flags(dev, i) & IORESOURCE_IO) {
+			if (!request_region(pci_resource_start(dev, i), pci_resource_len(dev, i), res_name)) {
+				pci_release_regions(dev);
+				return -EBUSY;
+			}
+		} else if (pci_resource_flags(dev, i) & IORESOURCE_MEM) {
+			if (!request_mem_region(pci_resource_start(dev, i), pci_resource_len(dev, i), res_name)) {
+				pci_release_regions(dev);
+				return -EBUSY;
+			}
+		}
+	}
+	return 0;
+}
+
+void _kc_pci_release_regions(struct pci_dev *dev)
+{
+	int i;
+
+	for (i = 0; i < 6; i++) {
+		if (pci_resource_len(dev, i) == 0)
+			continue;
+
+		if (pci_resource_flags(dev, i) & IORESOURCE_IO)
+			release_region(pci_resource_start(dev, i), pci_resource_len(dev, i));
+
+		else if (pci_resource_flags(dev, i) & IORESOURCE_MEM)
+			release_mem_region(pci_resource_start(dev, i), pci_resource_len(dev, i));
+	}
+}
+
+/**************************************/
+/* NETWORK DRIVER API */
+
+struct net_device * _kc_alloc_etherdev(int sizeof_priv)
+{
+	struct net_device *dev;
+	int alloc_size;
+
+	alloc_size = sizeof (*dev) + sizeof_priv + IFNAMSIZ + 31;
+
+	dev = kmalloc(alloc_size, GFP_KERNEL);
+
+	if (!dev) return NULL;
+
+	memset(dev, 0, alloc_size);
+
+	if (sizeof_priv)
+		dev->priv = (void *) (((unsigned long)(dev + 1) + 31) & ~31);
+
+	dev->name[0] = '\0';
+
+	ether_setup(dev);
+
+	return dev;
+}
+
+int _kc_is_valid_ether_addr(u8 *addr)
+{
+	const char zaddr[6] = {0,};
+
+	return !(addr[0]&1) && memcmp( addr, zaddr, 6);
+}
+
+#endif /* 2.4.3 => 2.4.0 */
+
+
+/*****************************************************************************/
+/* 2.4.6 => 2.4.3 */
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,4,6) )
+
+int _kc_pci_set_power_state(struct pci_dev *dev, int state)
+{ return 0; }
+int _kc_pci_save_state(struct pci_dev *dev, u32 *buffer)
+{ return 0; }
+int _kc_pci_restore_state(struct pci_dev *pdev, u32 *buffer)
+{ return 0; }
+int _kc_pci_enable_wake(struct pci_dev *pdev, u32 state, int enable)
+{ return 0; }
+
+#endif /* 2.4.6 => 2.4.3 */
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/ixgb/kcompat.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/ixgb/kcompat.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/ixgb/kcompat.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/ixgb/kcompat.h	2004-09-09 13:21:58.000000000 +0200
@@ -0,0 +1,319 @@
+/*******************************************************************************
+
+  
+  Copyright(c) 1999 - 2004 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 
+  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  02111-1307, USA.
+  
+  The full GNU General Public License is included in this distribution in the
+  file called LICENSE.
+  
+  Contact Information:
+  Linux NICS <linux.nics@intel.com>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+*******************************************************************************/
+
+#ifndef _KCOMPAT_H_
+#define _KCOMPAT_H_
+
+#include <linux/version.h>
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/netdevice.h>
+#include <linux/ioport.h>
+#include <linux/slab.h>
+#include <linux/pagemap.h>
+#include <linux/list.h>
+#include <linux/sched.h>
+#include <asm/io.h>
+
+#ifndef IRQ_HANDLED
+#define irqreturn_t void
+#define IRQ_HANDLED
+#define IRQ_NONE
+#endif
+
+#ifndef SET_NETDEV_DEV
+#define SET_NETDEV_DEV(net, pdev)
+#endif
+
+#ifndef free_netdev
+#define free_netdev(x)	kfree(x)
+#endif
+
+#ifndef pci_name
+#define pci_name(x)	((x)->slot_name)
+#endif
+
+#ifdef HAVE_POLL_CONTROLLER
+#define CONFIG_NET_POLL_CONTROLLER
+#endif
+
+/*****************************************************************************/
+#ifndef unlikely
+#define unlikely(_x) _x
+#define likely(_x) _x
+#endif
+/*****************************************************************************/
+
+/*****************************************************************************/
+/* Installations with ethtool version without eeprom, adapter id, or statistics
+ * support */
+#ifndef ETHTOOL_GSTATS
+#define ETHTOOL_GSTATS 0x1d
+#undef ethtool_drvinfo
+#define ethtool_drvinfo k_ethtool_drvinfo
+struct k_ethtool_drvinfo {
+	uint32_t cmd;
+	char	 driver[32];
+	char	 version[32];
+	char	 fw_version[32];
+	char	 bus_info[32];
+	char	 reserved1[32];
+	char	 reserved2[16];
+	uint32_t n_stats;
+	uint32_t testinfo_len;
+	uint32_t eedump_len;
+	uint32_t regdump_len;
+};
+
+struct ethtool_stats {
+	uint32_t cmd;
+	uint32_t n_stats;
+	uint64_t data[0];
+};
+
+#ifndef ETHTOOL_PHYS_ID
+#define ETHTOOL_PHYS_ID 0x1c
+#ifndef ETHTOOL_GSTRINGS
+#define ETHTOOL_GSTRINGS 0x1b
+enum ethtool_stringset {
+	ETH_SS_TEST             = 0,
+	ETH_SS_STATS,
+};
+struct ethtool_gstrings {
+	u32     cmd;            /* ETHTOOL_GSTRINGS */
+	u32     string_set;     /* string set id e.c. ETH_SS_TEST, etc*/
+	u32     len;            /* number of strings in the string set */
+	u8      data[0];
+};
+#ifndef ETHTOOL_TEST
+#define ETHTOOL_TEST 0x1a
+enum ethtool_test_flags {
+	ETH_TEST_FL_OFFLINE	= (1 << 0),
+	ETH_TEST_FL_FAILED	= (1 << 1),
+};
+struct ethtool_test {
+	uint32_t cmd;
+	uint32_t flags;
+	uint32_t reserved;
+	uint32_t len;
+	uint64_t data[0];
+};
+#ifndef ETHTOOL_GEEPROM
+#define ETHTOOL_GEEPROM 0xb
+#undef ETHTOOL_GREGS
+struct ethtool_eeprom {
+	uint32_t cmd;
+	uint32_t magic;
+	uint32_t offset;
+	uint32_t len;
+	uint8_t	 data[0];
+};
+
+struct ethtool_value {
+	uint32_t cmd;
+	uint32_t data;
+};
+
+#ifndef ETHTOOL_GLINK
+#define ETHTOOL_GLINK 0xa
+#endif /* Ethtool version without link support */
+#endif /* Ethtool version without eeprom support */
+#endif /* Ethtool version without test support */
+#endif /* Ethtool version without strings support */
+#endif /* Ethtool version wihtout adapter id support */
+#endif /* Ethtool version without statistics support */
+
+/*****************************************************************************/
+/* 2.4.3 => 2.4.0 */
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,4,3) )
+
+/**************************************/
+/* PCI DRIVER API */
+
+#ifndef pci_set_dma_mask
+#define pci_set_dma_mask _kc_pci_set_dma_mask
+extern int _kc_pci_set_dma_mask(struct pci_dev *dev, dma_addr_t mask);
+#endif
+
+#ifndef pci_request_regions
+#define pci_request_regions _kc_pci_request_regions
+extern int _kc_pci_request_regions(struct pci_dev *pdev, char *res_name);
+#endif
+
+#ifndef pci_release_regions
+#define pci_release_regions _kc_pci_release_regions
+extern void _kc_pci_release_regions(struct pci_dev *pdev);
+#endif
+
+/**************************************/
+/* NETWORK DRIVER API */
+
+#ifndef alloc_etherdev
+#define alloc_etherdev _kc_alloc_etherdev
+extern struct net_device * _kc_alloc_etherdev(int sizeof_priv);
+#endif
+
+#ifndef is_valid_ether_addr
+#define is_valid_ether_addr _kc_is_valid_ether_addr
+extern int _kc_is_valid_ether_addr(u8 *addr);
+#endif
+
+/**************************************/
+/* MISCELLANEOUS */
+
+#ifndef INIT_TQUEUE
+#define INIT_TQUEUE(_tq, _routine, _data)		\
+	do {						\
+		INIT_LIST_HEAD(&(_tq)->list);		\
+		(_tq)->sync = 0;			\
+		(_tq)->routine = _routine;		\
+		(_tq)->data = _data;			\
+	} while(0)
+#endif
+
+#endif /* 2.4.3 => 2.4.0 */
+
+/*****************************************************************************/
+/* 2.4.6 => 2.4.3 */
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,4,6) )
+
+#ifndef pci_set_power_state
+#define pci_set_power_state _kc_pci_set_power_state
+extern int _kc_pci_set_power_state(struct pci_dev *dev, int state);
+#endif
+
+#ifndef pci_save_state
+#define pci_save_state _kc_pci_save_state
+extern int _kc_pci_save_state(struct pci_dev *dev, u32 *buffer);
+#endif
+
+#ifndef pci_restore_state
+#define pci_restore_state _kc_pci_restore_state
+extern int _kc_pci_restore_state(struct pci_dev *pdev, u32 *buffer);
+#endif
+
+#ifndef pci_enable_wake
+#define pci_enable_wake _kc_pci_enable_wake
+extern int _kc_pci_enable_wake(struct pci_dev *pdev, u32 state, int enable);
+#endif
+
+/* PCI PM entry point syntax changed, so don't support suspend/resume */
+#undef CONFIG_PM
+
+#endif /* 2.4.6 => 2.4.3 */
+
+/*****************************************************************************/
+/* 2.4.10 => 2.4.6 */
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,4,10) )
+
+/**************************************/
+/* MODULE API */
+
+#ifndef MODULE_LICENSE
+	#define MODULE_LICENSE(X)
+#endif
+
+/**************************************/
+/* OTHER */
+
+#undef min
+#define min(x,y) ({ \
+	const typeof(x) _x = (x);	\
+	const typeof(y) _y = (y);	\
+	(void) (&_x == &_y);		\
+	_x < _y ? _x : _y; })
+
+#undef max
+#define max(x,y) ({ \
+	const typeof(x) _x = (x);	\
+	const typeof(y) _y = (y);	\
+	(void) (&_x == &_y);		\
+	_x > _y ? _x : _y; })
+
+#endif /* 2.4.10 -> 2.4.6 */
+
+
+/*****************************************************************************/
+/* 2.4.13 => 2.4.10 */
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,4,13) )
+
+/**************************************/
+/* PCI DMA MAPPING */
+
+#ifndef virt_to_page
+	#define virt_to_page(v) (mem_map + (virt_to_phys(v) >> PAGE_SHIFT))
+#endif
+
+#ifndef pci_map_page
+#define pci_map_page _kc_pci_map_page
+extern u64 _kc_pci_map_page(struct pci_dev *dev, struct page *page, unsigned long offset, size_t size, int direction);
+#endif
+
+#ifndef pci_unmap_page
+#define pci_unmap_page _kc_pci_unmap_page
+extern void _kc_pci_unmap_page(struct pci_dev *dev, u64 dma_addr, size_t size, int direction);
+#endif
+
+/* pci_set_dma_mask takes dma_addr_t, which is only 32-bits prior to 2.4.13 */
+
+#undef PCI_DMA_32BIT
+#define PCI_DMA_32BIT	0xffffffff
+#undef PCI_DMA_64BIT
+#define PCI_DMA_64BIT	0xffffffff
+
+#endif /* 2.4.13 => 2.4.10 */
+
+/*****************************************************************************/
+/* 2.4.17 => 2.4.12 */
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,4,17) )
+
+#ifndef __devexit_p
+	#define __devexit_p(x) &(x)
+#endif
+
+#endif /* 2.4.17 => 2.4.13 */
+
+/*****************************************************************************/
+/* 2.5.28 => 2.4.17 */
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,5,28) )
+
+static inline void _kc_synchronize_irq() { synchronize_irq(); }
+#undef synchronize_irq
+#define synchronize_irq(X) _kc_synchronize_irq()
+
+#include <linux/tqueue.h>
+#define work_struct tq_struct
+#define INIT_WORK INIT_TQUEUE
+#define schedule_work schedule_task
+
+#endif /* 2.5.28 => 2.4.17 */
+
+#endif /* _KCOMPAT_H_ */
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sis900.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/sis900.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sis900.c	2004-06-29 11:25:00.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sis900.c	2004-09-05 15:48:53.000000000 +0200
@@ -117,6 +117,7 @@ static struct mii_chip_info {
 #define	HOME 	0x0001
 #define LAN	0x0002
 #define MIX	0x0003
+#define UNKNOWN	0x0
 } mii_chip_table[] = {
 	{ "SiS 900 Internal MII PHY", 		0x001d, 0x8000, LAN },
 	{ "SiS 7014 Physical Layer Solution", 	0x0016, 0xf830, LAN },
@@ -124,6 +125,7 @@ static struct mii_chip_info {
 	{ "AMD 79C901 HomePNA PHY",		0x0000, 0x6B90, HOME},
 	{ "ICS LAN PHY",			0x0015, 0xF440, LAN },
 	{ "NS 83851 PHY",			0x2000, 0x5C20, MIX },
+	{ "NS 83847 PHY",			0x2000, 0x5C30, MIX },
 	{ "Realtek RTL8201 PHY",		0x0000, 0x8200, LAN },
 	{ "VIA 6103 PHY",			0x0101, 0x8f20, LAN },
 	{0,},
@@ -572,9 +574,11 @@ static int __init sis900_mii_probe (stru
 				break;
 			}
 			
-		if( !mii_chip_table[i].phy_id1 )
-			printk(KERN_INFO "%s: Unknown PHY transceiver found at address %d.\n",
-			       net_dev->name, phy_addr);			
+		if( !mii_chip_table[i].phy_id1 ) {
+			printk(KERN_INFO "%s: Unknown PHY transceiver found at address %d, id0=%X, id1=%X.\n",
+			       net_dev->name, phy_addr, mii_phy->phy_id0, mii_phy->phy_id1 & 0xFFF0);
+			mii_phy->phy_types = UNKNOWN;
+		}
 	}
 	
 	if (sis_priv->mii == NULL) {
@@ -639,15 +643,15 @@ static int __init sis900_mii_probe (stru
 static u16 sis900_default_phy(struct net_device * net_dev)
 {
 	struct sis900_private * sis_priv = net_dev->priv;
- 	struct mii_phy *phy = NULL, *phy_home = NULL, *default_phy = NULL;
+ 	struct mii_phy *phy = NULL, *phy_home = NULL, *default_phy = NULL, *phy_lan = NULL;
 	u16 status;
 
         for( phy=sis_priv->first_mii; phy; phy=phy->next ){
 		status = mdio_read(net_dev, phy->phy_addr, MII_STATUS);
 		status = mdio_read(net_dev, phy->phy_addr, MII_STATUS);
 
-		/* Link ON & Not select deafalut PHY */
-		 if ( (status & MII_STAT_LINK) && !(default_phy) )
+		/* Link ON & Not select default PHY & not ghost PHY */
+		 if ( (status & MII_STAT_LINK) && !default_phy && (phy->phy_types != UNKNOWN) )
 		 	default_phy = phy;
 		 else{
 			status = mdio_read(net_dev, phy->phy_addr, MII_CONTROL);
@@ -655,13 +659,22 @@ static u16 sis900_default_phy(struct net
 				status | MII_CNTL_AUTO | MII_CNTL_ISOLATE);
 			if( phy->phy_types == HOME )
 				phy_home = phy;
+			else if (phy->phy_types == LAN)
+				phy_lan = phy;
 		 }
 	}
 
-	if( (!default_phy) && phy_home )
+	if( !default_phy && phy_home )
 		default_phy = phy_home;
-	else if(!default_phy)
-		default_phy = sis_priv->first_mii;
+	else if( !default_phy && phy_lan )
+		default_phy = phy_lan;
+	else if ( !default_phy )
+        	for( phy=sis_priv->first_mii; phy; phy=phy->next )
+			if (phy->phy_addr == 1)
+			{
+				default_phy = phy;
+				break;
+			}
 
 	if( sis_priv->mii != default_phy ){
 		sis_priv->mii = default_phy;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/Makefile linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/Makefile
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/Makefile	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/Makefile	2004-09-09 13:20:48.000000000 +0200
@@ -1,7 +1,57 @@
-# File: drivers/sk98lin/Makefile
+#******************************************************************************
 #
-# Makefile for the SysKonnect SK-98xx device driver.
+# Name:         skge.c
+# Project:      GEnesis, PCI Gigabit Ethernet Adapter
+# Version:      $Revision: 1.9 $
+# Date:         $Date: 2004/07/13 15:54:50 $
+# Purpose:      The main driver source module
 #
+#******************************************************************************
+
+#******************************************************************************
+#
+#	(C)Copyright 1998-2002 SysKonnect GmbH.
+#	(C)Copyright 2002-2004 Marvell.
+#
+#	Makefile for Marvell Yukon chipset and SysKonnect Gigabit Ethernet 
+#	Server Adapter driver. (Kernel 2.4)
+#
+#	Author: Mirko Lindner (mlindner@syskonnect.de)
+#		Ralph Roesler (rroesler@syskonnect.de)
+#
+#	Address all question to: linux@syskonnect.de
+#
+#	This program is free software; you can redistribute it and/or modify
+#	it under the terms of the GNU General Public License as published by
+#	the Free Software Foundation; either version 2 of the License, or
+#	(at your option) any later version.
+#
+#	The information in this file is provided "AS IS" without warranty.
+# 
+#******************************************************************************
+
+#******************************************************************************
+#
+# History:
+#
+#	$Log: Makefile2.4,v $
+#	Revision 1.9  2004/07/13 15:54:50  rroesler
+#	Add: file skethtool.c
+#	Fix: corrected header regarding copyright
+#	Fix: minor typos corrected
+#	
+#	Revision 1.8  2004/06/08 08:40:36  mlindner
+#	Fix: Add CONFIG_SK98LIN_ZEROCOPY as default value
+#	
+#	Revision 1.7  2004/06/03 16:06:56  mlindner
+#	Fix: Added compile flag SK_DIAG_SUPPORT
+#	
+#	Revision 1.6  2004/06/02 08:02:59  mlindner
+#	Add: Changed header information and inserted a GPL statement
+#	
+#
+#******************************************************************************
+
 
 #
 # Standalone driver params
@@ -14,13 +64,16 @@ O_TARGET := sk98lin.o
 
 obj-y :=	\
 		skge.o		\
+		sky2.o		\
+		skethtool.o	\
+		sky2le.o	\
 		skdim.o		\
 		skaddr.o	\
 		skgehwt.o	\
 		skgeinit.o	\
 		skgepnmi.o	\
 		skgesirq.o	\
-		ski2c.o		\
+		sktwsi.o	\
 		sklm80.o	\
 		skqueue.o	\
 		skrlmt.o	\
@@ -78,7 +131,9 @@ endif
 # SK_DBGCAT_DRV_INT_SRC         0x04000000      interrupts sources
 # SK_DBGCAT_DRV_EVENT           0x08000000      driver events
 
-EXTRA_CFLAGS += -I. -DSK_DIAG_SUPPORT -DSK_USE_CSUM -DGENESIS -DYUKON $(DBGDEF) $(SKPARAM)
+EXTRA_CFLAGS += -I. -DSK_USE_CSUM -DSK_DIAG_SUPPORT -DGENESIS \
+		-DCONFIG_SK98LIN_ZEROCOPY -DYUKON -DYUK2 \
+		$(DBGDEF) $(SKPARAM)
 
 include $(TOPDIR)/Rules.make
 
@@ -86,7 +141,3 @@ clean:
 	rm -f core *.o *.a *.s
 
 
-
-
-
-
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/build_no.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/build_no.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/build_no.c	2004-06-29 11:24:54.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/build_no.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-/******************************************************************************
- *
- *	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.15-fullkernel/drivers/net/sk98lin/h/lm80.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/lm80.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/lm80.h	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/lm80.h	2004-09-09 13:20:48.000000000 +0200
@@ -2,8 +2,8 @@
  *
  * Name:	lm80.h	
  * Project:	Gigabit Ethernet Adapters, Common Modules
- * Version:	$Revision: 1.6 $
- * Date:	$Date: 2003/05/13 17:26:52 $
+ * Version:	$Revision: 2.1 $
+ * Date:	$Date: 2003/10/27 14:16:08 $
  * Purpose:	Contains all defines for the LM80 Chip
  *		(National Semiconductor).
  *
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skaddr.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skaddr.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skaddr.h	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skaddr.h	2004-09-09 13:20:48.000000000 +0200
@@ -2,8 +2,8 @@
  *
  * Name:	skaddr.h
  * Project:	Gigabit Ethernet Adapters, ADDR-Modul
- * Version:	$Revision: 1.29 $
- * Date:	$Date: 2003/05/13 16:57:24 $
+ * Version:	$Revision: 2.1 $
+ * Date:	$Date: 2003/10/27 14:16:07 $
  * Purpose:	Header file for Address Management (MC, UC, Prom).
  *
  ******************************************************************************/
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skcsum.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skcsum.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skcsum.h	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skcsum.h	2004-09-09 13:20:48.000000000 +0200
@@ -2,8 +2,8 @@
  *
  * Name:	skcsum.h
  * Project:	GEnesis - SysKonnect SK-NET Gigabit Ethernet (SK-98xx)
- * Version:	$Revision: 1.10 $
- * Date:	$Date: 2003/08/20 13:59:57 $
+ * Version:	$Revision: 2.2 $
+ * Date:	$Date: 2003/12/29 15:37:26 $
  * Purpose:	Store/verify Internet checksum in send/receive packets.
  *
  ******************************************************************************/
@@ -157,9 +157,7 @@ typedef struct s_CsProtocolStatistics {
 typedef struct s_Csum {
 	/* Enabled receive SK_PROTO_XXX bit flags. */
 	unsigned ReceiveFlags[SK_MAX_NETS];
-#ifdef TX_CSUM
 	unsigned TransmitFlags[SK_MAX_NETS];
-#endif /* TX_CSUM */
 
 	/* The protocol statistics structure; one per supported protocol. */
 	SKCS_PROTO_STATS ProtoStats[SK_MAX_NETS][SKCS_NUM_PROTOCOLS];
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skdebug.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skdebug.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skdebug.h	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skdebug.h	2004-09-09 13:20:48.000000000 +0200
@@ -2,8 +2,8 @@
  *
  * Name:	skdebug.h
  * Project:	Gigabit Ethernet Adapters, Common Modules
- * Version:	$Revision: 1.14 $
- * Date:	$Date: 2003/05/13 17:26:00 $
+ * Version:	$Revision: 2.2 $
+ * Date:	$Date: 2004/02/26 16:06:06 $
  * Purpose:	SK specific DEBUG support
  *
  ******************************************************************************/
@@ -58,6 +58,9 @@
 #define SK_DBGMOD_ADDR	0x00000080L	/* ADDR module */
 #define SK_DBGMOD_PECP	0x00000100L	/* PECP module */
 #define SK_DBGMOD_POWM	0x00000200L	/* Power Management module */
+#ifdef SK_ASF
+#define SK_DBGMOD_ASF	0x00000400L	/* ASF module */
+#endif
 
 /* Debug events */
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skdrv1st.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skdrv1st.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skdrv1st.h	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skdrv1st.h	2004-09-09 13:20:48.000000000 +0200
@@ -2,8 +2,8 @@
  *
  * Name:	skdrv1st.h
  * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.4 $
- * Date:	$Date: 2003/11/12 14:28:14 $
+ * Version:	$Revision: 1.5 $
+ * Date:	$Date: 2004/08/25 13:26:39 $
  * Purpose:	First header file for driver and all other modules
  *
  ******************************************************************************/
@@ -22,20 +22,6 @@
  *
  ******************************************************************************/
 
-/******************************************************************************
- *
- * Description:
- *
- * This is the first include file of the driver, which includes all
- * neccessary system header files and some of the GEnesis header files.
- * It also defines some basic items.
- *
- * Include File Hierarchy:
- *
- *	see skge.c
- *
- ******************************************************************************/
-
 #ifndef __INC_SKDRV1ST_H
 #define __INC_SKDRV1ST_H
 
@@ -58,13 +44,7 @@ typedef struct s_AC	SK_AC;
 
 #define SK_ADDR_EQUAL(a1,a2)		(!memcmp(a1,a2,6))
 
-#if !defined(__OPTIMIZE__)  ||  !defined(__KERNEL__)
-#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/version.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
@@ -97,6 +77,10 @@ typedef struct s_AC	SK_AC;
 #include	"h/lm80.h"
 #include	"h/xmac_ii.h"
 
+#ifndef SK_BMU_RX_WM_PEX
+#define SK_BMU_RX_WM_PEX 0x80
+#endif
+
 #ifdef __LITTLE_ENDIAN
 #define SK_LITTLE_ENDIAN
 #else
@@ -195,3 +179,8 @@ extern void SkErrorLog(SK_AC*, int, int,
 
 #endif
 
+/*******************************************************************************
+ *
+ * End of file
+ *
+ ******************************************************************************/
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skdrv2nd.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skdrv2nd.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skdrv2nd.h	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skdrv2nd.h	2004-09-09 13:20:48.000000000 +0200
@@ -1,17 +1,17 @@
 /******************************************************************************
  *
- * Name:	skdrv2nd.h
- * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.10 $
- * Date:	$Date: 2003/12/11 16:04:45 $
- * Purpose:	Second header file for driver and all other modules
+ * Name:        skdrv2nd.h
+ * Project:     GEnesis, PCI Gigabit Ethernet Adapter
+ * Version:     $Revision: 1.29 $
+ * Date:        $Date: 2004/08/25 13:26:05 $
+ * Purpose:     Second header file for driver and all other modules
  *
  ******************************************************************************/
 
 /******************************************************************************
  *
  *	(C)Copyright 1998-2002 SysKonnect GmbH.
- *	(C)Copyright 2002-2003 Marvell.
+ *	(C)Copyright 2002-2004 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
@@ -42,10 +42,11 @@
 #include "h/skqueue.h"
 #include "h/skgehwt.h"
 #include "h/sktimer.h"
-#include "h/ski2c.h"
+#include "h/sktwsi.h"
 #include "h/skgepnmi.h"
 #include "h/skvpd.h"
 #include "h/skgehw.h"
+#include "h/sky2le.h"
 #include "h/skgeinit.h"
 #include "h/skaddr.h"
 #include "h/skgesirq.h"
@@ -53,157 +54,121 @@
 #include "h/skrlmt.h"
 #include "h/skgedrv.h"
 
-#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) */     \
-        /* Gigabit Ethernet Adapter (0x4360) */     \
-        /* Gigabit Ethernet Adapter (0x4361) */     \
-        /* Belkin (0x5005) */     \
-        if ((pdev->device == 0x4320) || \
-            (pdev->device == 0x4360) || \
-            (pdev->device == 0x4361) || \
-            (pdev->device == 0x5005)) { \
-            result = SK_TRUE;     \
-        }     \
-    /* CNet (0x1371) */     \
-    } 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;     \
-    }     \
-}
+/******************************************************************************
+ *
+ * Generic ISR defines
+ *
+ ******************************************************************************/
 
+#define SkIsrRetVar     void
+#define SkIsrRetNone    NULL
+#define SkIsrRetHandled NULL
+
+#define DEV_KFREE_SKB(skb) dev_kfree_skb(skb)
+#define DEV_KFREE_SKB_IRQ(skb) dev_kfree_skb_irq(skb)
+#define DEV_KFREE_SKB_ANY(skb) dev_kfree_skb_any(skb)
 
-extern SK_MBUF		*SkDrvAllocRlmtMbuf(SK_AC*, SK_IOC, unsigned);
-extern void		SkDrvFreeRlmtMbuf(SK_AC*, SK_IOC, SK_MBUF*);
-extern SK_U64		SkOsGetTime(SK_AC*);
-extern int		SkPciReadCfgDWord(SK_AC*, int, SK_U32*);
-extern int		SkPciReadCfgWord(SK_AC*, int, SK_U16*);
-extern int		SkPciReadCfgByte(SK_AC*, int, SK_U8*);
-extern int		SkPciWriteCfgDWord(SK_AC*, int, SK_U32);
-extern int		SkPciWriteCfgWord(SK_AC*, int, SK_U16);
-extern int		SkPciWriteCfgByte(SK_AC*, int, SK_U8);
-extern int		SkDrvEvent(SK_AC*, SK_IOC IoC, SK_U32, SK_EVPARA);
-
-#ifdef SK_DIAG_SUPPORT
-extern int		SkDrvEnterDiagMode(SK_AC *pAc);
-extern int		SkDrvLeaveDiagMode(SK_AC *pAc);
-#endif
+/******************************************************************************
+ *
+ * Global function prototypes
+ *
+ ******************************************************************************/
+
+extern SK_MBUF *SkDrvAllocRlmtMbuf(SK_AC*, SK_IOC, unsigned);
+extern void SkDrvFreeRlmtMbuf(SK_AC*, SK_IOC, SK_MBUF*);
+extern SK_U64 SkOsGetTime(SK_AC*);
+extern int SkPciReadCfgDWord(SK_AC*, int, SK_U32*);
+extern int SkPciReadCfgWord(SK_AC*, int, SK_U16*);
+extern int SkPciReadCfgByte(SK_AC*, int, SK_U8*);
+extern int SkPciWriteCfgDWord(SK_AC*, int, SK_U32);
+extern int SkPciWriteCfgWord(SK_AC*, int, SK_U16);
+extern int SkPciWriteCfgByte(SK_AC*, int, SK_U8);
+extern int SkDrvEvent(SK_AC*, SK_IOC IoC, SK_U32, SK_EVPARA);
+extern int SkDrvEnterDiagMode(SK_AC *pAc);
+extern int SkDrvLeaveDiagMode(SK_AC *pAc);
+
+/******************************************************************************
+ *
+ * Linux specific RLMT buffer structure (SK_MBUF typedef in skdrv1st)!
+ *
+ ******************************************************************************/
 
 struct s_DrvRlmtMbuf {
-	SK_MBUF		*pNext;		/* Pointer to next RLMT Mbuf. */
-	SK_U8		*pData;		/* Data buffer (virtually contig.). */
-	unsigned	Size;		/* Data buffer size. */
-	unsigned	Length;		/* Length of packet (<= Size). */
-	SK_U32		PortIdx;	/* Receiving/transmitting port. */
+	SK_MBUF         *pNext;    /* Pointer to next RLMT Mbuf.       */
+	SK_U8           *pData;    /* Data buffer (virtually contig.). */
+	unsigned         Size;     /* Data buffer size.                */
+	unsigned         Length;   /* Length of packet (<= Size).      */
+	SK_U32           PortIdx;  /* Receiving/transmitting port.     */
 #ifdef SK_RLMT_MBUF_PRIVATE
-	SK_RLMT_MBUF	Rlmt;		/* Private part for RLMT. */
-#endif  /* SK_RLMT_MBUF_PRIVATE */
-	struct sk_buff	*pOs;		/* Pointer to message block */
+	SK_RLMT_MBUF     Rlmt;     /* Private part for RLMT.           */
+#endif
+	struct sk_buff  *pOs;      /* Pointer to message block         */
 };
 
+/******************************************************************************
+ *
+ * Linux specific TIME defines
+ *
+ ******************************************************************************/
 
-/*
- * 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))
+#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);\
 }
 
+/******************************************************************************
+ *
+ * Linux specific IOCTL defines and typedefs
+ *
+ ******************************************************************************/
 
-/*
- * ioctl definitions
- */
-#define		SK_IOCTL_BASE		(SIOCDEVPRIVATE)
-#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)
-#define		SK_IOCTL_DIAG		(SK_IOCTL_BASE + 4)
-
-typedef struct s_IOCTL	SK_GE_IOCTL;
+#define	SK_IOCTL_BASE       (SIOCDEVPRIVATE)
+#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)
+#define	SK_IOCTL_DIAG       (SK_IOCTL_BASE + 4)
 
+typedef struct s_IOCTL SK_GE_IOCTL;
 struct s_IOCTL {
-	char*		pData;
+	char*           pData;
 	unsigned int	Len;
 };
 
+/******************************************************************************
+ *
+ * Generic sizes and length definitions
+ *
+ ******************************************************************************/
+
+#define TX_RING_SIZE  (24*1024)  /* GEnesis/Yukon */
+#define RX_RING_SIZE  (24*1024)  /* GEnesis/Yukon */
+#define RX_MAX_NBR_BUFFERS   128  /* Yukon-EC/-II */
+#define TX_MAX_NBR_BUFFERS   128  /* Yukon-EC/-II */
+
+#define	ETH_BUF_SIZE        1560  /* multiples of 8 bytes */
+#define	ETH_MAX_MTU         1514
+#define ETH_MIN_MTU         60
+#define ETH_MULTICAST_BIT   0x01
+#define SK_JUMBO_MTU        9000
+
+#define TX_PRIO_LOW    0 /* asynchronous queue */
+#define TX_PRIO_HIGH   1 /* synchronous queue */
+#define DESCR_ALIGN   64 /* alignment of Rx/Tx descriptors */
+
+/******************************************************************************
+ *
+ * PNMI related definitions
+ *
+ ******************************************************************************/
 
-/*
- * define sizes of descriptor rings in bytes
- */
-
-#define		TX_RING_SIZE	(8*1024)
-#define		RX_RING_SIZE	(24*1024)
-
-/*
- * Buffer size for ethernet packets
- */
-#define	ETH_BUF_SIZE	1540
-#define	ETH_MAX_MTU	1514
-#define ETH_MIN_MTU	60
-#define ETH_MULTICAST_BIT	0x01
-#define SK_JUMBO_MTU	9000
-
-/*
- * transmit priority selects the queue: LOW=asynchron, HIGH=synchron
- */
-#define TX_PRIO_LOW	0
-#define TX_PRIO_HIGH	1
-
-/*
- * alignment of rx/tx descriptors
- */
-#define DESCR_ALIGN	64
-
-/*
- * definitions for pnmi. TODO
- */
 #define SK_DRIVER_RESET(pAC, IoC)	0
 #define SK_DRIVER_SENDEVENT(pAC, IoC)	0
 #define SK_DRIVER_SELFTEST(pAC, IoC)	0
@@ -212,20 +177,16 @@ 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 */
-
-/*
-** Definitions regarding transmitting frames 
-** any calculating any checksum.
-*/
+
+/******************************************************************************
+ *
+ * Various offsets and sizes
+ *
+ ******************************************************************************/
+
+#define	SK_DRV_MODERATION_TIMER         1   /* id */
+#define SK_DRV_MODERATION_TIMER_LENGTH  1   /* 1 second */
+
 #define C_LEN_ETHERMAC_HEADER_DEST_ADDR 6
 #define C_LEN_ETHERMAC_HEADER_SRC_ADDR  6
 #define C_LEN_ETHERMAC_HEADER_LENTYPE   2
@@ -251,114 +212,341 @@ struct s_IOCTL {
 #define C_PROTO_ID_UDP                  17       /* refer to RFC 790 or Stevens'   */
 #define C_PROTO_ID_TCP                  6        /* TCP/IP illustrated for details */
 
-/* TX and RX descriptors *****************************************************/
+/******************************************************************************
+ *
+ * Tx and Rx descriptor definitions
+ *
+ ******************************************************************************/
 
 typedef struct s_RxD RXD; /* the receive descriptor */
-
 struct s_RxD {
-	volatile SK_U32	RBControl;	/* Receive Buffer Control */
-	SK_U32		VNextRxd;	/* Next receive descriptor,low dword */
-	SK_U32		VDataLow;	/* Receive buffer Addr, low dword */
-	SK_U32		VDataHigh;	/* Receive buffer Addr, high dword */
-	SK_U32		FrameStat;	/* Receive Frame Status word */
-	SK_U32		TimeStamp;	/* Time stamp from XMAC */
-	SK_U32		TcpSums;	/* TCP Sum 2 / TCP Sum 1 */
-	SK_U32		TcpSumStarts;	/* TCP Sum Start 2 / TCP Sum Start 1 */
-	RXD		*pNextRxd;	/* Pointer to next Rxd */
-	struct sk_buff	*pMBuf;		/* Pointer to Linux' socket buffer */
+	volatile SK_U32  RBControl;     /* Receive Buffer Control            */
+	SK_U32           VNextRxd;      /* Next receive descriptor,low dword */
+	SK_U32           VDataLow;      /* Receive buffer Addr, low dword    */
+	SK_U32           VDataHigh;     /* Receive buffer Addr, high dword   */
+	SK_U32           FrameStat;     /* Receive Frame Status word         */
+	SK_U32           TimeStamp;     /* Time stamp from XMAC              */
+	SK_U32           TcpSums;       /* TCP Sum 2 / TCP Sum 1             */
+	SK_U32           TcpSumStarts;  /* TCP Sum Start 2 / TCP Sum Start 1 */
+	RXD             *pNextRxd;      /* Pointer to next Rxd               */
+	struct sk_buff  *pMBuf;         /* Pointer to Linux' socket buffer   */
 };
 
 typedef struct s_TxD TXD; /* the transmit descriptor */
-
 struct s_TxD {
-	volatile SK_U32	TBControl;	/* Transmit Buffer Control */
-	SK_U32		VNextTxd;	/* Next transmit descriptor,low dword */
-	SK_U32		VDataLow;	/* Transmit Buffer Addr, low dword */
-	SK_U32		VDataHigh;	/* Transmit Buffer Addr, high dword */
-	SK_U32		FrameStat;	/* Transmit Frame Status Word */
-	SK_U32		TcpSumOfs;	/* Reserved / TCP Sum Offset */
-	SK_U16		TcpSumSt;	/* TCP Sum Start */
-	SK_U16		TcpSumWr;	/* TCP Sum Write */
-	SK_U32		TcpReserved;	/* not used */
-	TXD		*pNextTxd;	/* Pointer to next Txd */
-	struct sk_buff	*pMBuf;		/* Pointer to Linux' socket buffer */
+	volatile SK_U32  TBControl;     /* Transmit Buffer Control            */
+	SK_U32           VNextTxd;      /* Next transmit descriptor,low dword */
+	SK_U32           VDataLow;      /* Transmit Buffer Addr, low dword    */
+	SK_U32           VDataHigh;     /* Transmit Buffer Addr, high dword   */
+	SK_U32           FrameStat;     /* Transmit Frame Status Word         */
+	SK_U32           TcpSumOfs;     /* Reserved / TCP Sum Offset          */
+	SK_U16           TcpSumSt;      /* TCP Sum Start                      */
+	SK_U16           TcpSumWr;      /* TCP Sum Write                      */
+	SK_U32           TcpReserved;   /* not used                           */
+	TXD             *pNextTxd;      /* Pointer to next Txd                */
+	struct sk_buff  *pMBuf;         /* Pointer to Linux' socket buffer    */
 };
 
-/* Used interrupt bits in the interrupts source register *********************/
+/******************************************************************************
+ *
+ * Generic Yukon-II defines
+ *
+ ******************************************************************************/
 
-#define DRIVER_IRQS	((IS_IRQ_SW)   | \
-			(IS_R1_F)      |(IS_R2_F)  | \
-			(IS_XS1_F)     |(IS_XA1_F) | \
-			(IS_XS2_F)     |(IS_XA2_F))
-
-#define SPECIAL_IRQS	((IS_HW_ERR)   |(IS_I2C_READY)  | \
-			(IS_EXT_REG)   |(IS_TIMINT)     | \
-			(IS_PA_TO_RX1) |(IS_PA_TO_RX2)  | \
-			(IS_PA_TO_TX1) |(IS_PA_TO_TX2)  | \
-			(IS_MAC1)      |(IS_LNK_SYNC_M1)| \
-			(IS_MAC2)      |(IS_LNK_SYNC_M2)| \
-			(IS_R1_C)      |(IS_R2_C)       | \
-			(IS_XS1_C)     |(IS_XA1_C)      | \
-			(IS_XS2_C)     |(IS_XA2_C))
-
-#define IRQ_MASK	((IS_IRQ_SW)   | \
-			(IS_R1_B)      |(IS_R1_F)     |(IS_R2_B) |(IS_R2_F) | \
-			(IS_XS1_B)     |(IS_XS1_F)    |(IS_XA1_B)|(IS_XA1_F)| \
-			(IS_XS2_B)     |(IS_XS2_F)    |(IS_XA2_B)|(IS_XA2_F)| \
-			(IS_HW_ERR)    |(IS_I2C_READY)| \
-			(IS_EXT_REG)   |(IS_TIMINT)   | \
-			(IS_PA_TO_RX1) |(IS_PA_TO_RX2)| \
-			(IS_PA_TO_TX1) |(IS_PA_TO_TX2)| \
-			(IS_MAC1)      |(IS_MAC2)     | \
-			(IS_R1_C)      |(IS_R2_C)     | \
-			(IS_XS1_C)     |(IS_XA1_C)    | \
-			(IS_XS2_C)     |(IS_XA2_C))
+#define LE_SIZE   sizeof(SK_HWLE)
+#define MAX_NUM_FRAGS   (MAX_SKB_FRAGS + 1)
+#define MIN_LEN_OF_LE_TAB   128
+#define MAX_LEN_OF_LE_TAB   4096
+#define MAX_UNUSED_RX_LE_WORKING   8
+#ifdef MAX_FRAG_OVERHEAD
+#undef MAX_FRAG_OVERHEAD
+#define MAX_FRAG_OVERHEAD   4
+#endif
+// as we have a maximum of 16 physical fragments,
+// maximum 1 ADDR64 per physical fragment
+// maximum 4 LEs for VLAN, Csum, LargeSend, Packet
+#define MIN_LE_FREE_REQUIRED   ((16*2) + 4)
+#define IS_GMAC(pAc)   (!pAc->GIni.GIGenesis)
+#ifdef USE_SYNC_TX_QUEUE
+#define TXS_MAX_LE   256
+#else /* !USE_SYNC_TX_QUEUE */
+#define TXS_MAX_LE   0
+#endif
 
-#define IRQ_HWE_MASK	(IS_ERR_MSK) /* enable all HW irqs */
+#define ETHER_MAC_HDR_LEN   (6+6+2) // MAC SRC ADDR, MAC DST ADDR, TYPE
+#define IP_HDR_LEN   20
+#define TCP_CSUM_OFFS   0x10
+#define UDP_CSUM_OFFS   0x06
+#define TXA_MAX_LE   256
+#define RX_MAX_LE   256
+#define ST_MAX_LE   (SK_MAX_MACS)*((3*RX_MAX_LE)+(TXA_MAX_LE)+(TXS_MAX_LE))
+
+/******************************************************************************
+ *
+ * Structures specific for Yukon-II
+ *
+ ******************************************************************************/
+
+typedef	struct s_frag SK_FRAG;
+struct s_frag {
+ 	SK_FRAG       *pNext;
+ 	char          *pVirt;
+  	SK_U64         pPhys;
+ 	unsigned int   FragLen;
+};
+
+typedef	struct s_packet SK_PACKET;
+struct s_packet {
+	/* Common infos: */
+	SK_PACKET       *pNext;         /* pointer for packet queues          */
+	unsigned int     PacketLen;     /* length of packet                   */
+	unsigned int     NumFrags;      /* nbr of fragments (for Rx always 1) */
+	SK_FRAG         *pFrag;         /* fragment list                      */
+	SK_FRAG          FragArray[MAX_NUM_FRAGS]; /* TX fragment array       */
+	unsigned int     NextLE;        /* next LE to use for the next packet */
+
+	/* Private infos: */
+	struct sk_buff	*pMBuf;         /* Pointer to Linux' socket buffer    */
+};
+
+typedef	struct s_queue SK_PKT_QUEUE;
+struct s_queue {
+ 	SK_PACKET       *pHead;
+ 	SK_PACKET       *pTail;
+	spinlock_t       QueueLock;     /* serialize packet accesses          */
+};
+
+/*******************************************************************************
+ *
+ * Macros specific for Yukon-II queues
+ *
+ ******************************************************************************/
+
+#define IS_Q_EMPTY(pQueue)  ((pQueue)->pHead != NULL) ? SK_FALSE : SK_TRUE
+#define IS_Q_LOCKED(pQueue) spin_is_locked(&((pQueue)->QueueLock))
+
+#define PLAIN_POP_FIRST_PKT_FROM_QUEUE(pQueue, pPacket)	{	\
+        if ((pQueue)->pHead != NULL) {				\
+		(pPacket)       = (pQueue)->pHead;		\
+		(pQueue)->pHead = (pPacket)->pNext;		\
+		if ((pQueue)->pHead == NULL) {			\
+			(pQueue)->pTail = NULL;			\
+		}						\
+		(pPacket)->pNext = NULL;			\
+	} else {						\
+		(pPacket) = NULL;				\
+	}							\
+}
+
+#define PLAIN_PUSH_PKT_AS_FIRST_IN_QUEUE(pQueue, pPacket) {	\
+	if ((pQueue)->pHead != NULL) {				\
+		(pPacket)->pNext = (pQueue)->pHead;		\
+	} else {						\
+		(pPacket)->pNext = NULL;			\
+		(pQueue)->pTail  = (pPacket);			\
+	}							\
+      	(pQueue)->pHead  = (pPacket);				\
+}
+
+#define PLAIN_PUSH_PKT_AS_LAST_IN_QUEUE(pQueue, pPacket) {	\
+	(pPacket)->pNext = NULL;				\
+	if ((pQueue)->pTail != NULL) {				\
+		(pQueue)->pTail->pNext = (pPacket);		\
+	} else {						\
+		(pQueue)->pHead        = (pPacket);		\
+	}							\
+	(pQueue)->pTail = (pPacket);				\
+}
+
+#define PLAIN_PUSH_MULTIPLE_PKT_AS_LAST_IN_QUEUE(pQueue,pPktGrpStart,pPktGrpEnd) { \
+	if ((pPktGrpStart) != NULL) {					\
+		if ((pQueue)->pTail != NULL) {				\
+			(pQueue)->pTail->pNext = (pPktGrpStart);	\
+		} else {						\
+			(pQueue)->pHead = (pPktGrpStart);		\
+		}							\
+		(pQueue)->pTail = (pPktGrpEnd);				\
+	}								\
+}
+
+/* Required: 'Flags' */ 
+#define POP_FIRST_PKT_FROM_QUEUE(pQueue, pPacket)	{	\
+	spin_lock_irqsave(&((pQueue)->QueueLock), Flags);	\
+	if ((pQueue)->pHead != NULL) {				\
+		(pPacket)       = (pQueue)->pHead;		\
+		(pQueue)->pHead = (pPacket)->pNext;		\
+		if ((pQueue)->pHead == NULL) {			\
+			(pQueue)->pTail = NULL;			\
+		}						\
+		(pPacket)->pNext = NULL;			\
+	} else {						\
+		(pPacket) = NULL;				\
+	}							\
+	spin_unlock_irqrestore(&((pQueue)->QueueLock), Flags);	\
+}
+
+/* Required: 'Flags' */
+#define PUSH_PKT_AS_FIRST_IN_QUEUE(pQueue, pPacket)	{	\
+	spin_lock_irqsave(&(pQueue)->QueueLock, Flags);		\
+	if ((pQueue)->pHead != NULL) {				\
+		(pPacket)->pNext = (pQueue)->pHead;		\
+	} else {						\
+		(pPacket)->pNext = NULL;			\
+		(pQueue)->pTail  = (pPacket);			\
+	}							\
+	(pQueue)->pHead = (pPacket);				\
+	spin_unlock_irqrestore(&(pQueue)->QueueLock, Flags);	\
+}
+
+/* Required: 'Flags' */
+#define PUSH_PKT_AS_LAST_IN_QUEUE(pQueue, pPacket)	{	\
+	(pPacket)->pNext = NULL;				\
+	spin_lock_irqsave(&(pQueue)->QueueLock, Flags);		\
+	if ((pQueue)->pTail != NULL) {				\
+		(pQueue)->pTail->pNext = (pPacket);		\
+	} else {						\
+		(pQueue)->pHead = (pPacket);			\
+	}							\
+	(pQueue)->pTail = (pPacket);				\
+	spin_unlock_irqrestore(&(pQueue)->QueueLock, Flags);	\
+}
+
+/* Required: 'Flags' */
+#define PUSH_MULTIPLE_PKT_AS_LAST_IN_QUEUE(pQueue,pPktGrpStart,pPktGrpEnd) {	\
+	if ((pPktGrpStart) != NULL) {					\
+		spin_lock_irqsave(&(pQueue)->QueueLock, Flags);		\
+		if ((pQueue)->pTail != NULL) {				\
+			(pQueue)->pTail->pNext = (pPktGrpStart);	\
+		} else {						\
+			(pQueue)->pHead = (pPktGrpStart);		\
+		}							\
+		(pQueue)->pTail = (pPktGrpEnd);				\
+		spin_unlock_irqrestore(&(pQueue)->QueueLock, Flags);	\
+	}								\
+}
+
+/*******************************************************************************
+ *
+ * Used interrupt bits in the interrupts source register
+ *
+ ******************************************************************************/
+
+#define DRIVER_IRQS	((IS_IRQ_SW) | \
+			 (IS_R1_F)   | (IS_R2_F)  | \
+			 (IS_XS1_F)  | (IS_XA1_F) | \
+			 (IS_XS2_F)  | (IS_XA2_F))
+
+#define TX_COMPL_IRQS	((IS_XS1_B)  | (IS_XS1_F) | \
+			 (IS_XA1_B)  | (IS_XA1_F) | \
+			 (IS_XS2_B)  | (IS_XS2_F) | \
+			 (IS_XA2_B)  | (IS_XA2_F))
+
+#define NAPI_DRV_IRQS	((IS_R1_F)   | (IS_R2_F) | \
+			 (IS_XS1_F)  | (IS_XA1_F)| \
+			 (IS_XS2_F)  | (IS_XA2_F))
+
+#define Y2_DRIVER_IRQS	((Y2_IS_STAT_BMU) | (Y2_IS_IRQ_SW) | (Y2_IS_POLL_CHK))
+
+#define SPECIAL_IRQS	((IS_HW_ERR)    |(IS_I2C_READY)  | \
+			 (IS_EXT_REG)   |(IS_TIMINT)     | \
+			 (IS_PA_TO_RX1) |(IS_PA_TO_RX2)  | \
+			 (IS_PA_TO_TX1) |(IS_PA_TO_TX2)  | \
+			 (IS_MAC1)      |(IS_LNK_SYNC_M1)| \
+			 (IS_MAC2)      |(IS_LNK_SYNC_M2)| \
+			 (IS_R1_C)      |(IS_R2_C)       | \
+			 (IS_XS1_C)     |(IS_XA1_C)      | \
+			 (IS_XS2_C)     |(IS_XA2_C))
+
+#define Y2_SPECIAL_IRQS	((Y2_IS_HW_ERR)   |(Y2_IS_ASF)      | \
+			 (Y2_IS_TWSI_RDY) |(Y2_IS_TIMINT)   | \
+			 (Y2_IS_IRQ_PHY2) |(Y2_IS_IRQ_MAC2) | \
+			 (Y2_IS_CHK_RX2)  |(Y2_IS_CHK_TXS2) | \
+			 (Y2_IS_CHK_TXA2) |(Y2_IS_IRQ_PHY1) | \
+			 (Y2_IS_IRQ_MAC1) |(Y2_IS_CHK_RX1)  | \
+			 (Y2_IS_CHK_TXS1) |(Y2_IS_CHK_TXA1))
+
+#define IRQ_MASK	((IS_IRQ_SW)    | \
+			 (IS_R1_F)      |(IS_R2_F)     | \
+			 (IS_XS1_F)     |(IS_XA1_F)    | \
+			 (IS_XS2_F)     |(IS_XA2_F)    | \
+			 (IS_HW_ERR)    |(IS_I2C_READY)| \
+			 (IS_EXT_REG)   |(IS_TIMINT)   | \
+			 (IS_PA_TO_RX1) |(IS_PA_TO_RX2)| \
+			 (IS_PA_TO_TX1) |(IS_PA_TO_TX2)| \
+			 (IS_MAC1)      |(IS_MAC2)     | \
+			 (IS_R1_C)      |(IS_R2_C)     | \
+			 (IS_XS1_C)     |(IS_XA1_C)    | \
+			 (IS_XS2_C)     |(IS_XA2_C))
+
+#define Y2_IRQ_MASK	((Y2_DRIVER_IRQS) | (Y2_SPECIAL_IRQS))
+
+#define IRQ_HWE_MASK	(IS_ERR_MSK)		/* enable all HW irqs */
+#define Y2_IRQ_HWE_MASK	(Y2_HWE_ALL_MSK)	/* enable all HW irqs */
 
 typedef struct s_DevNet DEV_NET;
 
 struct s_DevNet {
-	struct			proc_dir_entry *proc;
-	int             PortNr;
-	int             NetNr;
-	int             Mtu;
-	int             Up;
-	SK_AC   *pAC;
+	struct		proc_dir_entry *proc;
+	int		PortNr;
+	int		NetNr;
+	int		Mtu;
+	int		Up;
+	char		InitialDevName[20];
+	SK_AC		*pAC;
 };  
 
-typedef struct s_TxPort		TX_PORT;
+/*******************************************************************************
+ *
+ * Rx/Tx Port structures
+ *
+ ******************************************************************************/
 
-struct s_TxPort {
-	/* the transmit descriptor rings */
-	caddr_t		pTxDescrRing;	/* descriptor area memory */
-	SK_U64		VTxDescrRing;	/* descr. area bus virt. addr. */
-	TXD		*pTxdRingHead;	/* Head of Tx rings */
-	TXD		*pTxdRingTail;	/* Tail of Tx rings */
-	TXD		*pTxdRingPrev;	/* descriptor sent previously */
-	int		TxdRingFree;	/* # of free entrys */
-	spinlock_t	TxDesRingLock;	/* serialize descriptor accesses */
-	caddr_t		HwAddr;		/* bmu registers address */
-	int		PortIndex;	/* index number of port (0 or 1) */
+typedef struct s_TxPort	TX_PORT;
+struct s_TxPort {                       /* the transmit descriptor rings */
+	caddr_t         pTxDescrRing;   /* descriptor area memory        */
+	SK_U64          VTxDescrRing;   /* descr. area bus virt. addr.   */
+	TXD            *pTxdRingHead;   /* Head of Tx rings              */
+	TXD            *pTxdRingTail;   /* Tail of Tx rings              */
+	TXD            *pTxdRingPrev;   /* descriptor sent previously    */
+	int             TxdRingPrevFree;/* previously # of free entrys   */
+	int             TxdRingFree;    /* # of free entrys              */
+	spinlock_t      TxDesRingLock;  /* serialize descriptor accesses */
+	caddr_t         HwAddr;         /* bmu registers address         */
+	int             PortIndex;      /* index number of port (0 or 1) */
+	SK_PACKET      *TransmitPacketTable;
+	SK_LE_TABLE     TxALET;         /* tx (async) list element table */
+	SK_LE_TABLE     TxSLET;         /* tx (sync) list element table  */
+	SK_PKT_QUEUE    TxQ_free;
+	SK_PKT_QUEUE    TxAQ_waiting;
+	SK_PKT_QUEUE    TxSQ_waiting;
+	SK_PKT_QUEUE    TxAQ_working;
+	SK_PKT_QUEUE    TxSQ_working;
 };
 
-typedef struct s_RxPort		RX_PORT;
-
-struct s_RxPort {
-	/* the receive descriptor rings */
-	caddr_t		pRxDescrRing;	/* descriptor area memory */
-	SK_U64		VRxDescrRing;   /* descr. area bus virt. addr. */
-	RXD		*pRxdRingHead;	/* Head of Rx rings */
-	RXD		*pRxdRingTail;	/* Tail of Rx rings */
-	RXD		*pRxdRingPrev;	/* descriptor given to BMU previously */
-	int		RxdRingFree;	/* # of free entrys */
-	spinlock_t	RxDesRingLock;	/* serialize descriptor accesses */
-	int		RxFillLimit;	/* limit for buffers in ring */
-	caddr_t		HwAddr;		/* bmu registers address */
-	int		PortIndex;	/* index number of port (0 or 1) */
+typedef struct s_RxPort	RX_PORT;
+struct s_RxPort {                       /* the receive descriptor rings  */
+	caddr_t         pRxDescrRing;   /* descriptor area memory        */
+	SK_U64          VRxDescrRing;   /* descr. area bus virt. addr.   */
+	RXD            *pRxdRingHead;   /* Head of Rx rings              */
+	RXD            *pRxdRingTail;   /* Tail of Rx rings              */
+	RXD            *pRxdRingPrev;   /* descr given to BMU previously */
+	int             RxdRingFree;    /* # of free entrys              */
+	spinlock_t      RxDesRingLock;  /* serialize descriptor accesses */
+	int             RxFillLimit;    /* limit for buffers in ring     */
+	caddr_t         HwAddr;         /* bmu registers address         */
+	int             PortIndex;      /* index number of port (0 or 1) */
+	SK_BOOL         UseRxCsum;      /* use Rx checksumming (yes/no)  */
+	SK_PACKET      *ReceivePacketTable;
+	SK_LE_TABLE     RxLET;          /* rx list element table         */
+	SK_PKT_QUEUE    RxQ_working;
+	SK_PKT_QUEUE    RxQ_waiting;
 };
 
-/* Definitions needed for interrupt moderation *******************************/
+/*******************************************************************************
+ *
+ * Interrupt masks used in combination with interrupt moderation
+ *
+ ******************************************************************************/
 
 #define IRQ_EOF_AS_TX     ((IS_XA1_F)     | (IS_XA2_F))
 #define IRQ_EOF_SY_TX     ((IS_XS1_F)     | (IS_XS2_F))
@@ -370,139 +558,135 @@ struct s_RxPort {
 #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 */
-#define C_INT_MOD_IPS_LOWER_RANGE     30
-#define C_INT_MOD_IPS_UPPER_RANGE     40000
-
-
-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') */
+#define IRQ_MASK_Y2_TX_ONLY  (Y2_IS_STAT_BMU)
+#define IRQ_MASK_Y2_RX_ONLY  (Y2_IS_STAT_BMU)
+#define IRQ_MASK_Y2_SP_ONLY  (SPECIAL_IRQS)
+#define IRQ_MASK_Y2_TX_RX    ((IRQ_MASK_TX_ONLY)| (IRQ_MASK_RX_ONLY))
+#define IRQ_MASK_Y2_SP_RX    ((SPECIAL_IRQS)    | (IRQ_MASK_RX_ONLY))
+#define IRQ_MASK_Y2_SP_TX    ((SPECIAL_IRQS)    | (IRQ_MASK_TX_ONLY))
+#define IRQ_MASK_Y2_RX_TX_SP ((SPECIAL_IRQS)    | (IRQ_MASK_TX_RX))
 
-	SK_TIMER        ModTimer; /* just some timer */
-};
+/*******************************************************************************
+ *
+ * Defines and typedefs regarding interrupt moderation
+ *
+ ******************************************************************************/
 
-typedef struct s_PerStrm	PER_STRM;
+#define C_INT_MOD_NONE			1
+#define C_INT_MOD_STATIC		2
+#define C_INT_MOD_DYNAMIC		4
+
+#define C_CLK_FREQ_GENESIS		 53215000 /* or:  53.125 MHz */
+#define C_CLK_FREQ_YUKON		 78215000 /* or:  78.125 MHz */
+#define C_CLK_FREQ_YUKON_EC		125000000 /* or: 125.000 MHz */
+
+#define C_Y2_INTS_PER_SEC_DEFAULT	5000 
+#define C_INTS_PER_SEC_DEFAULT		2000 
+#define C_INT_MOD_IPS_LOWER_RANGE	30        /* in IRQs/second */
+#define C_INT_MOD_IPS_UPPER_RANGE	40000     /* in IRQs/second */
+
+typedef struct s_DynIrqModInfo {
+	SK_U64     PrevPort0RxIntrCts;
+	SK_U64     PrevPort1RxIntrCts;
+	SK_U64     PrevPort0TxIntrCts;
+	SK_U64     PrevPort1TxIntrCts;
+	SK_U64     PrevPort0StatusLeIntrCts;
+	SK_U64     PrevPort1StatusLeIntrCts;
+	int        MaxModIntsPerSec;            /* Moderation Threshold   */
+	int        MaxModIntsPerSecUpperLimit;  /* Upper limit for DIM    */
+	int        MaxModIntsPerSecLowerLimit;  /* Lower limit for DIM    */
+	long       MaskIrqModeration;           /* IRQ Mask (eg. 'TxRx')  */
+	int        IntModTypeSelect;            /* Type  (eg. 'dynamic')  */
+	int        DynIrqModSampleInterval;     /* expressed in seconds!  */
+	SK_TIMER   ModTimer;                    /* Timer for dynamic mod. */
+} DIM_INFO;
 
 #define SK_ALLOC_IRQ	0x00000001
-
-#ifdef SK_DIAG_SUPPORT
 #define	DIAG_ACTIVE		1
 #define	DIAG_NOTACTIVE		0
-#endif
 
 /****************************************************************************
+ *
  * Per board structure / Adapter Context structure:
- *	Allocated within attach(9e) and freed within detach(9e).
- *	Contains all 'per device' necessary handles, flags, locks etc.:
- */
-struct s_AC  {
-	SK_GEINIT	GIni;		/* GE init struct */
-	SK_PNMI		Pnmi;		/* PNMI data struct */
-	SK_VPD		vpd;		/* vpd data struct */
-	SK_QUEUE	Event;		/* Event queue */
-	SK_HWT		Hwt;		/* Hardware Timer control struct */
-	SK_TIMCTRL	Tim;		/* Software Timer control struct */
-	SK_I2C		I2c;		/* I2C relevant data structure */
-	SK_ADDR		Addr;		/* for Address module */
-	SK_CSUM		Csum;		/* for checksum module */
-	SK_RLMT		Rlmt;		/* for rlmt module */
-	spinlock_t	SlowPathLock;	/* Normal IRQ lock */
-	SK_PNMI_STRUCT_DATA PnmiStruct;	/* structure to get all Pnmi-Data */
-	int			RlmtMode;	/* link check mode to set */
-	int			RlmtNets;	/* Number of nets */
-	
-	SK_IOC		IoBase;		/* register set of adapter */
-	int		BoardLevel;	/* level of active hw init (0-2) */
-	char		DeviceStr[80];	/* adapter string from vpd */
-	SK_U32		AllocFlag;	/* flag allocation of resources */
-	struct pci_dev	*PciDev;	/* for access to pci config space */
-	SK_U32		PciDevId;	/* pci device id */
-	struct SK_NET_DEVICE	*dev[2];	/* pointer to device struct */
-	char		Name[30];	/* driver name */
-	struct SK_NET_DEVICE	*Next;		/* link all devices (for clearing) */
-	int		RxBufSize;	/* length of receive buffers */
-        struct net_device_stats stats;	/* linux 'netstat -i' statistics */
-	int		Index;		/* internal board index number */
-
-	/* adapter RAM sizes for queues of active port */
-	int		RxQueueSize;	/* memory used for receive queue */
-	int		TxSQueueSize;	/* memory used for sync. tx queue */
-	int		TxAQueueSize;	/* memory used for async. tx queue */
-
-	int		PromiscCount;	/* promiscuous mode counter  */
-	int		AllMultiCount;  /* allmulticast mode counter */
-	int		MulticCount;	/* number of different MC    */
-					/*  addresses for this board */
-					/*  (may be more than HW can)*/
-
-	int		HWRevision;	/* Hardware revision */
-	int		ActivePort;	/* the active XMAC port */
-	int		MaxPorts;		/* number of activated ports */
-	int		TxDescrPerRing;	/* # of descriptors per tx ring */
-	int		RxDescrPerRing;	/* # of descriptors per rx ring */
-
-	caddr_t		pDescrMem;	/* Pointer to the descriptor area */
-	dma_addr_t	pDescrMemDMA;	/* PCI DMA address of area */
-
-	/* the port structures with descriptor rings */
-	TX_PORT		TxPort[SK_MAX_MACS][2];
-	RX_PORT		RxPort[SK_MAX_MACS];
-
-	unsigned int	CsOfs1;		/* for checksum calculation */
-	unsigned int	CsOfs2;		/* for checksum calculation */
-	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;
-	int		ChipsetType;	/*  Chipset family type 
-					 *  0 == Genesis family support
-					 *  1 == Yukon family support
-					 */
-#ifdef SK_DIAG_SUPPORT
-	SK_U32		DiagModeActive;		/* is diag active?	*/
-	SK_BOOL		DiagFlowCtrl;		/* for control purposes	*/
-	SK_PNMI_STRUCT_DATA PnmiBackup;		/* backup structure for all Pnmi-Data */
-	SK_BOOL         WasIfUp[SK_MAX_MACS];   /* for OpenClose while 
-						 * DIAG is busy with NIC 
-						 */
-#endif
+ * Contains all 'per device' necessary handles, flags, locks etc.:
+ *
+ ******************************************************************************/
 
+struct s_AC  {
+	SK_GEINIT                GIni;          /* GE init struct             */
+	SK_PNMI                  Pnmi;          /* PNMI data struct           */
+	SK_VPD                   vpd;           /* vpd data struct            */
+	SK_QUEUE                 Event;         /* Event queue                */
+	SK_HWT                   Hwt;           /* Hardware Timer ctrl struct */
+	SK_TIMCTRL               Tim;           /* Software Timer ctrl struct */
+	SK_I2C                   I2c;           /* I2C relevant data structure*/
+	SK_ADDR                  Addr;          /* for Address module         */
+	SK_CSUM                  Csum;          /* for checksum module        */
+	SK_RLMT                  Rlmt;          /* for rlmt module            */
+	spinlock_t               SlowPathLock;  /* Normal IRQ lock            */
+	SK_PNMI_STRUCT_DATA      PnmiStruct;    /* struct for all Pnmi-Data   */
+	int                      RlmtMode;      /* link check mode to set     */
+	int                      RlmtNets;      /* Number of nets             */
+	SK_IOC                   IoBase;        /* register set of adapter    */
+	int                      BoardLevel;    /* level of hw init (0-2)     */
+	char                     DeviceStr[80]; /* adapter string from vpd    */
+	SK_U32                   AllocFlag;     /* alloc flag of resources    */
+	struct pci_dev          *PciDev;        /* for access to pci cfg space*/
+	SK_U32                   PciDevId;      /* pci device id              */
+	struct SK_NET_DEVICE    *dev[2];        /* pointer to device struct   */
+	char                     Name[30];      /* driver name                */
+	struct SK_NET_DEVICE    *Next;          /* link all devs for cleanup  */
+	int                      RxBufSize;     /* length of receive buffers  */
+	struct net_device_stats  stats;         /* linux 'netstat -i' stats   */
+	int                      Index;         /* internal board idx number  */
+	int                      RxQueueSize;   /* memory used for RX queue   */
+	int                      TxSQueueSize;  /* memory used for TXS queue  */
+	int                      TxAQueueSize;  /* memory used for TXA queue  */
+	int                      PromiscCount;  /* promiscuous mode counter   */
+	int                      AllMultiCount; /* allmulticast mode counter  */
+	int                      MulticCount;   /* number of MC addresses used*/
+	int                      HWRevision;	/* Hardware revision          */
+	int                      ActivePort;	/* the active XMAC port       */
+	int                      MaxPorts;      /* number of activated ports  */
+	int                      TxDescrPerRing;/* # of descriptors TX ring   */
+	int                      RxDescrPerRing;/* # of descriptors RX ring   */
+	caddr_t                  pDescrMem;     /* Ptr to the descriptor area */
+	dma_addr_t               pDescrMemDMA;  /* PCI DMA address of area    */
+	TX_PORT                  TxPort[SK_MAX_MACS][2];
+	RX_PORT                  RxPort[SK_MAX_MACS];
+	SK_LE_TABLE              TxListElement[SK_MAX_MACS][2];
+	SK_LE_TABLE              RxListElement[SK_MAX_MACS];
+	SK_LE_TABLE              StatusLETable; 
+	unsigned                 SizeOfAlignedLETables;	
+	spinlock_t               SetPutIndexLock;
+	int                      MaxUnusedRxLeWorking;
+	unsigned int             CsOfs1;        /* for checksum calculation   */
+	unsigned int             CsOfs2;        /* for checksum calculation   */
+	SK_U32                   CsOfs;         /* for checksum calculation   */
+	SK_BOOL                  CheckQueue;    /* check event queue soon     */
+	DIM_INFO                 DynIrqModInfo; /* all data related to IM     */
+	int                      PortUp;
+	int                      PortDown;
+	int                      ChipsetType;   /* 0=GENESIS; 1=Yukon         */
+	SK_U32                   DiagModeActive;/* is diag active?            */
+	SK_BOOL                  DiagFlowCtrl;  /* for control purposes       */
+	SK_PNMI_STRUCT_DATA      PnmiBackup;    /* backup structure for PNMI  */
+	SK_BOOL                  WasIfUp[SK_MAX_MACS]; 
 };
 
 
-#endif /* __INC_SKDRV2ND_H */
+/*******************************************************************************
+ *
+ * Defines and typedefs regarding power management
+ *
+ ******************************************************************************/
+
+/* Disabled at the moment */
+
+#endif
 
+/*******************************************************************************
+ *
+ * End of file
+ *
+ ******************************************************************************/
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skerror.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skerror.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skerror.h	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skerror.h	2004-09-09 13:20:48.000000000 +0200
@@ -2,8 +2,8 @@
  *
  * Name:	skerror.h
  * Project:	Gigabit Ethernet Adapters, Common Modules
- * Version:	$Revision: 1.7 $
- * Date:	$Date: 2003/05/13 17:25:13 $
+ * Version:	$Revision: 2.2 $
+ * Date:	$Date: 2004/05/24 15:27:19 $
  * Purpose:	SK specific Error log support
  *
  ******************************************************************************/
@@ -11,13 +11,12 @@
 /******************************************************************************
  *
  *	(C)Copyright 1998-2002 SysKonnect.
- *	(C)Copyright 2002-2003 Marvell.
+ *	(C)Copyright 2002-2004 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
  *	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.
  *
  ******************************************************************************/
@@ -36,7 +35,6 @@
 #define	SK_ERRCL_HW			(1L<<4)	/* Hardware Failure */
 #define	SK_ERRCL_COMM		(1L<<5)	/* Communication error */
 
-
 /*
  * Define Error Code Bases
  */
@@ -49,7 +47,9 @@
 #define	SK_ERRBASE_I2C		 700	/* Base Error number for I2C module */
 #define	SK_ERRBASE_QUEUE	 800	/* Base Error number for Scheduler */
 #define	SK_ERRBASE_ADDR		 900	/* Base Error number for Address module */
-#define SK_ERRBASE_PECP		1000    /* Base Error number for PECP */
+#define SK_ERRBASE_PECP		1000	/* Base Error number for PECP */
 #define	SK_ERRBASE_DRV		1100	/* Base Error number for Driver */
+#define SK_ERRBASE_ASF		1200	/* Base Error number for ASF */
 
 #endif	/* _INC_SKERROR_H_ */
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skgedrv.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skgedrv.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skgedrv.h	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skgedrv.h	2004-09-09 13:20:48.000000000 +0200
@@ -2,8 +2,8 @@
  *
  * Name:	skgedrv.h
  * Project:	Gigabit Ethernet Adapters, Common Modules
- * Version:	$Revision: 1.10 $
- * Date:	$Date: 2003/07/04 12:25:01 $
+ * Version:	$Revision: 2.1 $
+ * Date:	$Date: 2003/10/27 14:16:08 $
  * Purpose:	Interface with the driver
  *
  ******************************************************************************/
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skgehw.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skgehw.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skgehw.h	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skgehw.h	2004-09-09 13:20:48.000000000 +0200
@@ -2,8 +2,8 @@
  *
  * Name:	skgehw.h
  * Project:	Gigabit Ethernet Adapters, Common Modules
- * Version:	$Revision: 1.57 $
- * Date:	$Date: 2003/12/23 14:32:24 $
+ * Version:	$Revision: 2.42 $
+ * Date:	$Date: 2004/08/13 09:21:20 $
  * Purpose:	Defines and Macros for the Gigabit Ethernet Adapter Product Family
  *
  ******************************************************************************/
@@ -11,13 +11,12 @@
 /******************************************************************************
  *
  *	(C)Copyright 1998-2002 SysKonnect.
- *	(C)Copyright 2002-2003 Marvell.
+ *	(C)Copyright 2002-2004 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
  *	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.
  *
  ******************************************************************************/
@@ -114,6 +113,16 @@ extern "C" {
 #define SHIFT1(x)	((x) << 1)
 #define SHIFT0(x)	((x) << 0)
 
+/* Macro for arbitrary alignment of a given pointer */
+#define ALIGN_ADDR( ADDRESS, GRANULARITY ) { \
+    SK_UPTR addr = (SK_UPTR)(ADDRESS); \
+    if (addr & ((GRANULARITY)-1)) { \
+        addr += (GRANULARITY); \
+        addr &= ~(SK_UPTR)((GRANULARITY)-1); \
+        ADDRESS = (void *)addr; \
+    }\
+}
+
 /*
  * Configuration Space header
  * Since this module is used for different OS', those may be
@@ -159,7 +168,47 @@ extern "C" {
 #define PCI_VPD_DAT_REG	0x54	/* 32 bit 	VPD Data Register */
 	/* Bytes 0x58..0x59:	reserved */
 #define PCI_SER_LD_CTRL	0x5a	/* 16 bit 	SEEPROM Loader Ctrl (YUKON only) */
-	/* Bytes 0x5c..0xff:	reserved */
+	/* Bytes 0x5c..0xfc:	used by Yukon-2 */
+#define PCI_MSI_CAP_ID	0x5c	/*  8 bit	MSI Capability ID Register */
+#define PCI_MSI_NITEM	0x5d	/*  8 bit	MSI Next Item Pointer */
+#define PCI_MSI_CTRL	0x5e	/* 16 bit	MSI Message Control */
+#define PCI_MSI_ADR_LO	0x60	/* 32 bit	MSI Message Address (Lower) */
+#define PCI_MSI_ADR_HI	0x64	/* 32 bit	MSI Message Address (Upper) */
+#define PCI_MSI_DATA	0x68	/* 16 bit	MSI Message Data */
+	/* Bytes 0x6a..0x6b:	reserved */
+#define PCI_X_CAP_ID	0x6c	/*  8 bit	PCI-X Capability ID Register */
+#define PCI_X_NITEM		0x6d	/*  8 bit	PCI-X Next Item Pointer */
+#define PCI_X_COMMAND	0x6e	/* 16 bit	PCI-X Command */
+#define PCI_X_PE_STAT	0x70	/* 32 bit	PCI-X / PE Status */
+#define PCI_CAL_CTRL	0x74	/* 16 bit	PCI Calibration Control Register */
+#define PCI_CAL_STAT	0x76	/* 16 bit	PCI Calibration Status Register */
+#define PCI_DISC_CNT	0x78	/* 16 bit	PCI Discard Counter */
+#define PCI_RETRY_CNT	0x7a	/*  8 bit	PCI Retry Counter */
+	/* Byte 0x7b:	reserved */
+#define PCI_OUR_STATUS	0x7c	/* 32 bit 	Adapter Status Register */
+	/* Bytes 0x80..0xdf:	reserved */
+
+/* PCI Express Capability */
+#define PEX_CAP_ID		0xe0	/*  8 bit	PEX Capability ID */
+#define PEX_NITEM		0xe1	/*  8 bit	PEX Next Item Pointer */
+#define PEX_CAP_REG		0xe2	/* 16 bit	PEX Capability Register */
+#define PEX_DEV_CAP		0xe4	/* 32 bit	PEX Device Capabilities */
+#define PEX_DEV_CTRL	0xe8	/* 16 bit	PEX Device Control */
+#define PEX_DEV_STAT	0xea	/* 16 bit	PEX Device Status */
+#define PEX_LNK_CAP		0xec	/* 32 bit	PEX Link Capabilities */
+#define PEX_LNK_CTRL	0xf0	/* 16 bit	PEX Link Control */
+#define PEX_LNK_STAT	0xf2	/* 16 bit	PEX Link Status */
+	/* Bytes 0xf4..0xff:	reserved */
+
+/* PCI Express Extended Capabilities */
+#define PEX_ADV_ERR_REP		0x100	/* 32 bit	PEX Advanced Error Reporting */
+#define PEX_UNC_ERR_STAT	0x104	/* 32 bit	PEX Uncorr. Errors Status */
+#define PEX_UNC_ERR_MASK	0x108	/* 32 bit	PEX Uncorr. Errors Mask */
+#define PEX_UNC_ERR_SEV		0x10c	/* 32 bit	PEX Uncorr. Errors Severity */
+#define PEX_COR_ERR_STAT	0x110	/* 32 bit	PEX Correc. Errors Status */
+#define PEX_COR_ERR_MASK	0x114	/* 32 bit	PEX Correc. Errors Mask */
+#define PEX_ADV_ERR_CAP_C	0x118	/* 32 bit	PEX Advanced Error Cap./Ctrl */
+#define PEX_HEADER_LOG		0x11c	/* 4x32 bit	PEX Header Log Register */
 
 /*
  * I2C Address (PCI Config)
@@ -180,7 +229,7 @@ extern "C" {
 #define PCI_ADSTEP		BIT_7S		/* Address Stepping */
 #define PCI_PERREN		BIT_6S		/* Parity Report Response enable */
 #define PCI_VGA_SNOOP	BIT_5S		/* VGA palette snoop */
-#define PCI_MWIEN		BIT_4S		/* Memory write an inv cycl ena */
+#define PCI_MWIEN		BIT_4S		/* Memory write an inv cycl enable */
 #define PCI_SCYCEN		BIT_3S		/* Special Cycle enable */
 #define PCI_BMEN		BIT_2S		/* Bus Master enable */
 #define PCI_MEMEN		BIT_1S		/* Memory Space Access enable */
@@ -257,6 +306,14 @@ extern "C" {
 #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 */
+/* Yukon-2 */
+#define PCI_Y2_PIG_ENA		BIT_31	/* Enable Plug-in-Go (YUKON-2) */
+#define PCI_Y2_DLL_DIS		BIT_30	/* Disable PCI DLL (YUKON-2) */
+#define PCI_Y2_PHY2_COMA	BIT_29	/* Set PHY 2 to Coma Mode (YUKON-2) */
+#define PCI_Y2_PHY1_COMA	BIT_28	/* Set PHY 1 to Coma Mode (YUKON-2) */
+#define PCI_Y2_PHY2_POWD	BIT_27	/* Set PHY 2 to Power Down (YUKON-2) */
+#define PCI_Y2_PHY1_POWD	BIT_26	/* Set PHY 1 to Power Down (YUKON-2) */
+								/* Bit 25:	reserved */
 #define PCI_DIS_BOOT	BIT_24		/* Disable BOOT via ROM */
 #define PCI_EN_IO		BIT_23		/* Mapping to I/O space */
 #define PCI_EN_FPROM	BIT_22		/* Enable FLASH mapping to memory */
@@ -270,6 +327,7 @@ extern "C" {
 								/* Bit 19:	reserved	*/
 #define PCI_PAGEREG		(7L<<16)	/* Bit 18..16:	Page Register	*/
 #define PCI_NOTAR		BIT_15		/* No turnaround cycle */
+#define PCI_PEX_LEGNAT	BIT_15		/* PEX PM legacy/native mode (YUKON-2) */
 #define PCI_FORCE_BE	BIT_14		/* Assert all BEs on MR */
 #define PCI_DIS_MRL		BIT_13		/* Disable Mem Read Line */
 #define PCI_DIS_MRM		BIT_12		/* Disable Mem Read Multiple */
@@ -280,7 +338,6 @@ extern "C" {
 #define PCI_SKEW_DAS	(0xfL<<4)	/* Bit	7.. 4:	Skew Ctrl, DAS Ext */
 #define PCI_SKEW_BASE	0xfL		/* Bit	3.. 0:	Skew Ctrl, Base	*/
 
-
 /*	PCI_OUR_REG_2		32 bit	Our Register 2 */
 #define PCI_VPD_WR_THR	(0xffL<<24)	/* Bit 31..24:	VPD Write Threshold */
 #define PCI_DEV_SEL		(0x7fL<<17)	/* Bit 23..17:	EEPROM Device Select */
@@ -301,7 +358,6 @@ extern "C" {
 								/* Bit	1:	reserved */
 #define PCI_USEDATA64	BIT_0		/* Use 64Bit Data bus ext */
 
-
 /* Power Management Region */
 /*	PCI_PM_CAP_REG		16 bit	Power Management Capabilities */
 #define PCI_PME_SUP_MSK	(0x1f<<11)	/* Bit 15..11:	PM Event Support Mask */
@@ -336,6 +392,58 @@ extern "C" {
 #define PCI_VPD_FLAG	BIT_15S		/* starts VPD rd/wr cycle */
 #define PCI_VPD_ADR_MSK	0x7fffL		/* Bit 14.. 0:	VPD Address Mask */
 
+/* PCI_OUR_STATUS		32 bit 	Adapter Status Register (Yukon-2) */
+#define PCI_OS_PCI64B	BIT_31		/* Conventional PCI 64 bits Bus */
+#define PCI_OS_PCIX		BIT_30		/* PCI-X Bus */
+#define PCI_OS_MODE_MSK	(3<<28)		/* Bit 29..28:	PCI-X Bus Mode Mask */
+#define PCI_OS_PCI66M	BIT_27		/* PCI 66 MHz Bus */
+#define PCI_OS_PCI_X	BIT_26		/* PCI/PCI-X Bus (0 = PEX) */
+#define PCI_OS_DLLE_MSK	(3<<24)		/* Bit 25..24:	DLL Status Indication */
+#define PCI_OS_DLLR_MSK	(0xf<<20)	/* Bit 23..20:	DLL Row Counters Values */
+#define PCI_OS_DLLC_MSK	(0xf<<16)	/* Bit 19..16:	DLL Col. Counters Values */
+								/* Bit 15.. 8:	reserved */
+
+#define PCI_OS_SPEED(val)	((val & PCI_OS_MODE_MSK) >> 28)	/* PCI-X Speed */
+/* possible values for the speed field of the register */
+#define PCI_OS_SPD_PCI		0		/* PCI Conventional Bus */
+#define PCI_OS_SPD_X66		1		/* PCI-X 66MHz Bus */
+#define PCI_OS_SPD_X100		2		/* PCI-X 100MHz Bus */
+#define PCI_OS_SPD_X133		3		/* PCI-X 133MHz Bus */
+
+/* PEX_DEV_CTRL			16 bit	PEX Device Control (Yukon-2) */
+								/* Bit 15	reserved */
+#define PEX_DC_MAX_RRS_MSK	(7<<12)	/* Bit 14..12:	Max. Read Request Size */
+#define PEX_DC_EN_NO_SNOOP	BIT_11S	/* Enable No Snoop */
+#define PEX_DC_EN_AUX_POW	BIT_10S	/* Enable AUX Power */
+#define PEX_DC_EN_PHANTOM	BIT_9S	/* Enable Phantom Functions */
+#define PEX_DC_EN_EXT_TAG	BIT_8S	/* Enable Extended Tag Field */
+#define PEX_DC_MAX_PLS_MSK	(7<<5)	/* Bit  7.. 5:	Max. Payload Size Mask */
+#define PEX_DC_EN_REL_ORD	BIT_4S	/* Enable Relaxed Ordering */
+#define PEX_DC_EN_UNS_RQ_RP	BIT_3S	/* Enable Unsupported Request Reporting */
+#define PEX_DC_EN_FAT_ER_RP	BIT_2S	/* Enable Fatal Error Reporting */
+#define PEX_DC_EN_NFA_ER_RP	BIT_1S	/* Enable Non-Fatal Error Reporting */
+#define PEX_DC_EN_COR_ER_RP	BIT_0S	/* Enable Correctable Error Reporting */
+
+#define PEX_DC_MAX_RD_RQ_SIZE(x)	(SHIFT12(x) & PEX_DC_MAX_RRS_MSK)
+
+/* PEX_UNC_ERR_STAT	 PEX Uncorrectable Errors Status Register (Yukon-2) */
+								/* Bit 31..21	reserved */
+#define	PEX_UNSUP_REQ 	BIT_20		/* Unsupported Request Error */
+									/* ECRC Error (not supported) */
+#define PEX_MALFOR_TLP	BIT_18		/* Malformed TLP */
+									/* Receiver Overflow (not supported) */
+#define PEX_UNEXP_COMP	BIT_16		/* Unexpected Completion */
+									/* Completer Abort (not supported) */
+#define PEX_COMP_TO		BIT_14		/* Completion Timeout */
+#define PEX_FLOW_CTRL_P	BIT_13		/* Flow Control Protocol Error */
+#define PEX_POIS_TLP	BIT_12		/* Poisoned TLP */
+								/* Bit 11.. 5:	reserved */
+#define PEX_DATA_LINK_P BIT_4		/* Data Link Protocol Error */
+								/* Bit  3.. 1:	reserved */
+									/* Training Error (not supported) */
+
+#define PEX_FATAL_ERRORS	(PEX_MALFOR_TLP | PEX_FLOW_CTRL_P | PEX_DATA_LINK_P)
+
 /*	Control Register File (Address Map) */
 
 /*
@@ -350,8 +458,14 @@ extern "C" {
 #define B0_IMSK			0x000c	/* 32 bit	Interrupt Mask Register */
 #define B0_HWE_ISRC		0x0010	/* 32 bit	HW Error Interrupt Src Reg */
 #define B0_HWE_IMSK		0x0014	/* 32 bit	HW Error Interrupt Mask Reg */
-#define B0_SP_ISRC		0x0018	/* 32 bit	Special Interrupt Source Reg */
-	/* 0x001c:		reserved */
+#define B0_SP_ISRC		0x0018	/* 32 bit	Special Interrupt Source Reg 1 */
+
+/* Special ISR registers (Yukon-2 only) */
+#define B0_Y2_SP_ISRC2	0x001c	/* 32 bit	Special Interrupt Source Reg 2 */
+#define B0_Y2_SP_ISRC3	0x0020	/* 32 bit	Special Interrupt Source Reg 3 */
+#define B0_Y2_SP_EISR	0x0024	/* 32 bit	Enter ISR Reg */
+#define B0_Y2_SP_LISR	0x0028	/* 32 bit	Leave ISR Reg */
+#define B0_Y2_SP_ICR	0x002c	/* 32 bit	Interrupt Control Reg */
 
 /* B0 XMAC 1 registers (GENESIS only) */
 #define B0_XM1_IMSK		0x0020	/* 16 bit r/w	XMAC 1 Interrupt Mask Register*/
@@ -402,13 +516,22 @@ extern "C" {
 #define B2_PMD_TYP		0x0119	/*  8 bit	PMD type */
 #define B2_MAC_CFG		0x011a	/*  8 bit	MAC Configuration / Chip Revision */
 #define B2_CHIP_ID		0x011b	/*  8 bit 	Chip Identification Number */
-	/* Eprom registers are currently of no use */
+	/* Eprom registers */
 #define B2_E_0			0x011c	/*  8 bit	EPROM Byte 0 (ext. SRAM size */
+/* Yukon and Genesis */
 #define B2_E_1			0x011d	/*  8 bit	EPROM Byte 1 (PHY type) */
 #define B2_E_2			0x011e	/*  8 bit	EPROM Byte 2 */
+/* Yukon-2 */
+#define B2_Y2_CLK_GATE	0x011d	/*  8 bit	Clock Gating (Yukon-2) */
+#define B2_Y2_HW_RES	0x011e	/*  8 bit	HW Resources (Yukon-2) */
+
 #define B2_E_3			0x011f	/*  8 bit	EPROM Byte 3 */
+
+/* Yukon and Genesis */
 #define B2_FAR			0x0120	/* 32 bit	Flash-Prom Addr Reg/Cnt */
 #define B2_FDP			0x0124	/*  8 bit	Flash-Prom Data Port */
+/* Yukon-2 */
+#define B2_Y2_CLK_CTRL	0x0120	/* 32 bit	Core Clock Frequency Control */
 	/* 0x0125 - 0x0127:	reserved */
 #define B2_LD_CTRL		0x0128	/*  8 bit	EPROM loader control register */
 #define B2_LD_TEST		0x0129	/*  8 bit	EPROM loader test register */
@@ -440,6 +563,10 @@ extern "C" {
 #define B2_BSC_CTRL		0x0178	/*  8 bit	Blink Source Counter Control */
 #define B2_BSC_STAT		0x0179	/*  8 bit	Blink Source Counter Status */
 #define B2_BSC_TST		0x017a	/* 16 bit	Blink Source Counter Test Reg */
+	
+/* Yukon-2 */
+#define Y2_PEX_PHY_DATA	0x0170	/* 16 bit	PEX PHY Data Register */
+#define Y2_PEX_PHY_ADDR	0x0172	/* 16 bit	PEX PHY Address Register */
 	/* 0x017c - 0x017f:	reserved */
 
 /*
@@ -449,9 +576,13 @@ extern "C" {
 #define B3_RAM_ADDR		0x0180	/* 32 bit	RAM Address, to read or write */
 #define B3_RAM_DATA_LO	0x0184	/* 32 bit	RAM Data Word (low dWord) */
 #define B3_RAM_DATA_HI	0x0188	/* 32 bit	RAM Data Word (high dWord) */
-	/* 0x018c - 0x018f:	reserved */
+
+#define SELECT_RAM_BUFFER(rb, addr) (addr | (rb << 6))	/* Yukon-2 only */
+
+    /* 0x018c - 0x018f:	reserved */
 
 /* RAM Interface Registers */
+/* Yukon-2: use SELECT_RAM_BUFFER() to access the RAM buffer */
 /*
  * The HW-Spec. calls this registers Timeout Value 0..11. But this names are
  * not usable in SW. Please notice these are NOT real timeouts, these are
@@ -518,8 +649,8 @@ extern "C" {
 	/* 0x01ea - 0x01eb:	reserved */
 #define B3_PA_TOVAL_TX2	0x01ec	/* 16 bit	Timeout Val Tx Path MAC 2 */
 	/* 0x01ee - 0x01ef:	reserved */
-#define B3_PA_CTRL	0x01f0	/* 16 bit	Packet Arbiter Ctrl Register */
-#define B3_PA_TEST	0x01f2	/* 16 bit	Packet Arbiter Test Register */
+#define B3_PA_CTRL		0x01f0	/* 16 bit	Packet Arbiter Ctrl Register */
+#define B3_PA_TEST		0x01f2	/* 16 bit	Packet Arbiter Test Register */
 	/* 0x01f4 - 0x01ff:	reserved */
 
 /*
@@ -533,7 +664,16 @@ extern "C" {
 #define TXA_CTRL		0x0210	/*  8 bit	Tx Arbiter Control Register */
 #define TXA_TEST		0x0211	/*  8 bit	Tx Arbiter Test Register */
 #define TXA_STAT		0x0212	/*  8 bit	Tx Arbiter Status Register */
-	/* 0x0213 - 0x027f:	reserved */
+	/* 0x0213 - 0x021f:	reserved */
+	
+	/* RSS key registers for Yukon-2 Family */
+#define B4_RSS_KEY		0x0220	/* 4x32 bit RSS Key register (Yukon-2) */
+	/* RSS key register offsets */
+#define KEY_IDX_0		0		/* offset for location of KEY 0 */
+#define KEY_IDX_1		4		/* offset for location of KEY 1 */
+#define KEY_IDX_2		8		/* offset for location of KEY 2 */
+#define KEY_IDX_3		12		/* offset for location of KEY 3 */
+		
 	/* 0x0280 - 0x0292:	MAC 2 */
 	/* 0x0213 - 0x027f:	reserved */
 
@@ -571,8 +711,37 @@ extern "C" {
 #define Q_T1_SV	0x3f	/*  8 bit	Test Register 1 Supervisor SM */
 #define Q_T2	0x40	/* 32 bit	Test Register 2	*/
 #define Q_T3	0x44	/* 32 bit	Test Register 3	*/
+
+/* Yukon-2 */
+#define Q_DONE	0x24	/* 16 bit	Done Index 		(Yukon-2 only) */
+#define Q_WM	0x40	/* 16 bit	FIFO Watermark */
+#define Q_AL	0x42	/*  8 bit	FIFO Alignment */
+#define Q_RSP	0x44	/* 16 bit	FIFO Read Shadow Pointer */
+#define Q_RSL	0x46	/*  8 bit	FIFO Read Shadow Level */
+#define Q_RP	0x48	/*  8 bit	FIFO Read Pointer */
+#define Q_RL	0x4a	/*  8 bit	FIFO Read Level */
+#define Q_WP	0x4c	/*  8 bit	FIFO Write Pointer */
+#define Q_WSP	0x4d	/*  8 bit	FIFO Write Shadow Pointer */
+#define Q_WL	0x4e	/*  8 bit	FIFO Write Level */
+#define Q_WSL	0x4f	/*  8 bit	FIFO Write Shadow Level */
 	/* 0x48 - 0x7f:	reserved */
 
+/* Queue Prefetch Unit Offsets, use Y2_PREF_Q_ADDR() to address (Yukon-2 only)*/
+#define Y2_B8_PREF_REGS			0x0450
+
+#define PREF_UNIT_CTRL_REG		0x00	/* 32 bit	Prefetch Control register */
+#define PREF_UNIT_LAST_IDX_REG	0x04	/* 16 bit	Last Index */
+#define PREF_UNIT_ADDR_LOW_REG	0x08	/* 32 bit	List start addr, low part */
+#define PREF_UNIT_ADDR_HI_REG	0x0c	/* 32 bit	List start addr, high part*/
+#define PREF_UNIT_GET_IDX_REG	0x10	/* 16 bit	Get Index */
+#define PREF_UNIT_PUT_IDX_REG	0x14	/* 16 bit	Put Index */
+#define PREF_UNIT_FIFO_WP_REG	0x20	/*  8 bit 	FIFO write pointer */
+#define PREF_UNIT_FIFO_RP_REG	0x24	/*  8 bit	FIFO read pointer */
+#define PREF_UNIT_FIFO_WM_REG	0x28	/*  8 bit	FIFO watermark */
+#define PREF_UNIT_FIFO_LEV_REG	0x2c	/*  8 bit	FIFO level */
+
+#define PREF_UNIT_MASK_IDX  0x0fff
+
 /*
  *	Bank 16 - 23
  */
@@ -584,8 +753,8 @@ extern "C" {
 #define RB_END			0x04	/* 32 bit	RAM Buffer End Address */
 #define RB_WP			0x08	/* 32 bit	RAM Buffer Write Pointer */
 #define RB_RP			0x0c	/* 32 bit	RAM Buffer Read Pointer */
-#define RB_RX_UTPP		0x10	/* 32 bit	Rx Upper Threshold, Pause Pack */
-#define RB_RX_LTPP		0x14	/* 32 bit	Rx Lower Threshold, Pause Pack */
+#define RB_RX_UTPP		0x10	/* 32 bit	Rx Upper Threshold, Pause Packet */
+#define RB_RX_LTPP		0x14	/* 32 bit	Rx Lower Threshold, Pause Packet */
 #define RB_RX_UTHP		0x18	/* 32 bit	Rx Upper Threshold, High Prio */
 #define RB_RX_LTHP		0x1c	/* 32 bit	Rx Lower Threshold, High Prio */
 	/* 0x10 - 0x1f:	reserved at Tx RAM Buffer Registers */
@@ -629,13 +798,15 @@ extern "C" {
 #define LNK_LED_REG		0x0c3c	/*  8 bit	Link LED Register */
 	/* 0x0c3d - 0x0c3f:	reserved */
 
-/* Receive GMAC FIFO (YUKON only), use MR_ADDR() to access */
+/* Receive GMAC FIFO (YUKON and Yukon-2), use MR_ADDR() to access */
 #define RX_GMF_EA		0x0c40	/* 32 bit	Rx GMAC FIFO End Address */
 #define RX_GMF_AF_THR	0x0c44	/* 32 bit	Rx GMAC FIFO Almost Full Thresh. */
 #define RX_GMF_CTRL_T	0x0c48	/* 32 bit	Rx GMAC FIFO Control/Test */
 #define RX_GMF_FL_MSK	0x0c4c	/* 32 bit	Rx GMAC FIFO Flush Mask */
 #define RX_GMF_FL_THR	0x0c50	/* 32 bit	Rx GMAC FIFO Flush Threshold */
-	/* 0x0c54 - 0x0c5f:	reserved */
+#define RX_GMF_TR_THR	0x0c54	/* 32 bit	Rx Truncation Threshold (Yukon-2) */
+	/* 0x0c58 - 0x0c5b:	reserved */
+#define RX_GMF_VLAN		0x0c5c	/* 32 bit 	Rx VLAN Type Register (Yukon-2) */
 #define RX_GMF_WP		0x0c60	/* 32 bit 	Rx GMAC FIFO Write Pointer */
 	/* 0x0c64 - 0x0c67:	reserved */
 #define RX_GMF_WLEV		0x0c68	/* 32 bit 	Rx GMAC FIFO Write Level */
@@ -677,11 +848,12 @@ extern "C" {
 #define TX_LED_TST		0x0d29	/*  8 bit	Transmit LED Cnt Test Reg */
 	/* 0x0d2a - 0x0d3f:	reserved */
 
-/* Transmit GMAC FIFO (YUKON only), use MR_ADDR() to access */
+/* Transmit GMAC FIFO (YUKON and Yukon-2), use MR_ADDR() to access */
 #define TX_GMF_EA		0x0d40	/* 32 bit	Tx GMAC FIFO End Address */
 #define TX_GMF_AE_THR	0x0d44	/* 32 bit	Tx GMAC FIFO Almost Empty Thresh.*/
 #define TX_GMF_CTRL_T	0x0d48	/* 32 bit	Tx GMAC FIFO Control/Test */
-	/* 0x0d4c - 0x0d5f:	reserved */
+	/* 0x0d4c - 0x0d5b:	reserved */
+#define TX_GMF_VLAN		0x0d5c	/* 32 bit 	Tx VLAN Type Register (Yukon-2) */
 #define TX_GMF_WP		0x0d60	/* 32 bit 	Tx GMAC FIFO Write Pointer */
 #define TX_GMF_WSP		0x0d64	/* 32 bit 	Tx GMAC FIFO Write Shadow Ptr. */
 #define TX_GMF_WLEV		0x0d68	/* 32 bit 	Tx GMAC FIFO Write Level */
@@ -714,12 +886,84 @@ extern "C" {
 #define GMAC_TI_ST_CTRL	0x0e18	/*  8 bit	Time Stamp Timer Ctrl Reg */
 	/* 0x0e19:	reserved */
 #define GMAC_TI_ST_TST	0x0e1a	/*  8 bit	Time Stamp Timer Test Reg */
-	/* 0x0e1b - 0x0e7f:	reserved */
+	/* 0x0e1b - 0x0e1f:	reserved */
+
+/* Polling Unit Registers (Yukon-2 only) */
+#define POLL_CTRL			0x0e20	/* 32 bit	Polling Unit Control Reg */
+#define POLL_LAST_IDX		0x0e24	/* 16 bit	Polling Unit List Last Index */
+	/* 0x0e26 - 0x0e27:	reserved */
+#define POLL_LIST_ADDR_LO	0x0e28	/* 32 bit	Poll. List Start Addr (low) */
+#define POLL_LIST_ADDR_HI	0x0e2c	/* 32 bit	Poll. List Start Addr (high) */
+	/* 0x0e30 - 0x0e3f:	reserved */
+
+/* ASF Subsystem Registers (Yukon-2 only) */
+#define B28_Y2_SMB_CONFIG	0x0e40	/* 32 bit	ASF SMBus Config Register */
+#define B28_Y2_SMB_CSD_REG	0x0e44	/* 32 bit	ASF SMB Control/Status/Data */
+	/* 0x0e48 - 0x0e5f: reserved */
+#define B28_Y2_ASF_IRQ_V_BASE	0x0e60	/* 32 bit	ASF IRQ Vector Base */
+	/* 0x0e64 - 0x0e67: reserved */
+#define B28_Y2_ASF_STAT_CMD	0x0e68	/* 32 bit	ASF Status and Command Reg */
+#define B28_Y2_ASF_HOST_COM	0x0e6c	/* 32 bit	ASF Host Communication Reg */
+#define B28_Y2_DATA_REG_1	0x0e70	/* 32 bit	ASF/Host Data Register 1 */
+#define B28_Y2_DATA_REG_2	0x0e74	/* 32 bit	ASF/Host Data Register 2 */
+#define B28_Y2_DATA_REG_3	0x0e78	/* 32 bit	ASF/Host Data Register 3 */
+#define B28_Y2_DATA_REG_4	0x0e7c	/* 32 bit	ASF/Host Data Register 4 */
 
 /*
  *	Bank 29
  */
-	/* 0x0e80 - 0x0efc:	reserved */
+
+/* Status BMU Registers (Yukon-2 only)*/
+#define STAT_CTRL			0x0e80	/* 32 bit	Status BMU Control Reg */
+#define STAT_LAST_IDX		0x0e84	/* 16 bit	Status BMU Last Index */
+	/* 0x0e85 - 0x0e86:	reserved */
+#define STAT_LIST_ADDR_LO	0x0e88	/* 32 bit	Status List Start Addr (low) */
+#define STAT_LIST_ADDR_HI	0x0e8c	/* 32 bit	Status List Start Addr (high) */
+#define STAT_TXA1_RIDX		0x0e90	/* 16 bit	Status TxA1 Report Index Reg */
+#define STAT_TXS1_RIDX		0x0e92	/* 16 bit	Status TxS1 Report Index Reg */
+#define STAT_TXA2_RIDX		0x0e94	/* 16 bit	Status TxA2 Report Index Reg */
+#define STAT_TXS2_RIDX		0x0e96	/* 16 bit	Status TxS2 Report Index Reg */
+#define STAT_TX_IDX_TH		0x0e98	/* 16 bit	Status Tx Index Threshold Reg */
+	/* 0x0e9a - 0x0e9b:	reserved */
+#define STAT_PUT_IDX		0x0e9c	/* 16 bit	Status Put Index Reg */
+	/* 0x0e9e - 0x0e9f:	reserved */
+
+/* FIFO Control/Status Registers (Yukon-2 only)*/
+#define STAT_FIFO_WP		0x0ea0	/*  8 bit	Status FIFO Write Pointer Reg */
+	/* 0x0ea1 - 0x0ea3:	reserved */
+#define STAT_FIFO_RP		0x0ea4	/*  8 bit	Status FIFO Read Pointer Reg */
+	/* 0x0ea5:	reserved */
+#define STAT_FIFO_RSP		0x0ea6	/*  8 bit	Status FIFO Read Shadow Ptr */
+	/* 0x0ea7:	reserved */
+#define STAT_FIFO_LEVEL		0x0ea8	/*  8 bit	Status FIFO Level Reg */
+	/* 0x0ea9:	reserved */
+#define STAT_FIFO_SHLVL		0x0eaa	/*  8 bit	Status FIFO Shadow Level Reg */
+	/* 0x0eab:	reserved */
+#define STAT_FIFO_WM		0x0eac	/*  8 bit	Status FIFO Watermark Reg */
+#define STAT_FIFO_ISR_WM	0x0ead	/*  8 bit	Status FIFO ISR Watermark Reg */
+	/* 0x0eae - 0x0eaf:	reserved */
+
+/* Level and ISR Timer Registers (Yukon-2 only)*/
+#define STAT_LEV_TIMER_INI	0x0eb0	/* 32 bit	Level Timer Init. Value Reg */
+#define STAT_LEV_TIMER_CNT	0x0eb4	/* 32 bit	Level Timer Counter Reg */
+#define STAT_LEV_TIMER_CTRL	0x0eb8	/*  8 bit	Level Timer Control Reg */
+#define STAT_LEV_TIMER_TEST	0x0eb9	/*  8 bit	Level Timer Test Reg */
+	/* 0x0eba - 0x0ebf:	reserved */
+#define STAT_TX_TIMER_INI	0x0ec0	/* 32 bit	Tx Timer Init. Value Reg */
+#define STAT_TX_TIMER_CNT	0x0ec4	/* 32 bit	Tx Timer Counter Reg */
+#define STAT_TX_TIMER_CTRL	0x0ec8	/*  8 bit	Tx Timer Control Reg */
+#define STAT_TX_TIMER_TEST	0x0ec9	/*  8 bit	Tx Timer Test Reg */
+	/* 0x0eca - 0x0ecf:	reserved */
+#define STAT_ISR_TIMER_INI	0x0ed0	/* 32 bit	ISR Timer Init. Value Reg */
+#define STAT_ISR_TIMER_CNT	0x0ed4	/* 32 bit	ISR Timer Counter Reg */
+#define STAT_ISR_TIMER_CTRL	0x0ed8	/*  8 bit	ISR Timer Control Reg */
+#define STAT_ISR_TIMER_TEST	0x0ed9	/*  8 bit	ISR Timer Test Reg */
+	/* 0x0eda - 0x0eff:	reserved */
+
+#define ST_LAST_IDX_MASK    0x007f  /* Last Index Mask */
+#define ST_TXRP_IDX_MASK    0x0fff  /* Tx Report Index Mask */
+#define ST_TXTH_IDX_MASK    0x0fff  /* Tx Threshold Index Mask */
+#define ST_WM_IDX_MASK		0x3f	/* FIFO Watermark Index Mask */
 
 /*
  *	Bank 30
@@ -743,10 +987,9 @@ extern "C" {
 #define WOL_MATCH_RES	0x0f23	/*  8 bit	WOL Match Result Reg */
 #define WOL_MAC_ADDR_LO	0x0f24	/* 32 bit	WOL MAC Address Low */
 #define WOL_MAC_ADDR_HI	0x0f28	/* 16 bit	WOL MAC Address High */
-#define WOL_PATT_RPTR	0x0f2c	/*  8 bit	WOL Pattern Read Ptr */
-
-/* use this macro to access above registers */
-#define WOL_REG(Reg)	((Reg) + (pAC->GIni.GIWolOffs))
+#define WOL_PATT_PME	0x0f2a	/*  8 bit   WOL PME Match Enable (Yukon-2) */
+#define WOL_PATT_ASFM	0x0f2b	/*  8 bit   WOL ASF Match Enable (Yukon-2) */
+#define WOL_PATT_RPTR	0x0f2c	/*  8 bit	WOL Pattern Read Pointer */
 
 /* WOL Pattern Length Registers (YUKON only) */
 
@@ -764,11 +1007,22 @@ extern "C" {
  */
 /* 0x0f80 - 0x0fff:	reserved */
 
+/* WOL registers link 2 */
+
+/* use this macro to access WOL registers */
+#define WOL_REG(Port, Reg)	((Reg) + ((Port)*0x80) + (pAC->GIni.GIWolOffs))
+
 /*
  *	Bank 32	- 33
  */
 #define WOL_PATT_RAM_1	0x1000	/*  WOL Pattern RAM Link 1 */
+#define WOL_PATT_RAM_2  0x1400  /*  WOL Pattern RAM Link 2 */
+
+/* use this macro to retrieve the pattern ram base address */
+#define WOL_PATT_RAM_BASE(Port) (WOL_PATT_RAM_1 + (Port)*0x400)
 
+/* offset to configuration space on Yukon-2 */
+#define Y2_CFG_SPC 		0x1c00
 /*
  *	Bank 0x22 - 0x3f
  */
@@ -802,11 +1056,24 @@ extern "C" {
 								/* Bit 7:	reserved */
 #define RAP_RAP			0x3f	/* Bit 6..0:	0 = block 0,..,6f = block 6f */
 
+/*	B0_CTST			24 bit	Control/Status register */
+								/* Bit 23..18:	reserved */
+#define Y2_VMAIN_AVAIL	BIT_17		/* VMAIN available (YUKON-2 only) */
+#define Y2_VAUX_AVAIL	BIT_16		/* VAUX available (YUKON-2 only) */
+								/* Bit 15..14:	reserved */
+#define Y2_ASF_ENABLE	BIT_13S		/* ASF Unit Enable (YUKON-2 only) */
+#define Y2_ASF_DISABLE	BIT_12S		/* ASF Unit Disable (YUKON-2 only) */
+#define Y2_CLK_RUN_ENA	BIT_11S		/* CLK_RUN Enable  (YUKON-2 only) */
+#define Y2_CLK_RUN_DIS	BIT_10S		/* CLK_RUN Disable (YUKON-2 only) */
+#define Y2_LED_STAT_ON	BIT_9S		/* Status LED On  (YUKON-2 only) */
+#define Y2_LED_STAT_OFF	BIT_8S		/* Status LED Off (YUKON-2 only) */
+								/* Bit  7.. 0:	same as below */
+
 /*	B0_CTST			16 bit	Control/Status register */
 								/* Bit 15..14:	reserved */
-#define CS_CLK_RUN_HOT	BIT_13S		/* CLK_RUN hot m. (YUKON-Lite only) */
-#define CS_CLK_RUN_RST	BIT_12S		/* CLK_RUN reset  (YUKON-Lite only) */
-#define CS_CLK_RUN_ENA	BIT_11S		/* CLK_RUN enable (YUKON-Lite only) */
+#define CS_CLK_RUN_HOT	BIT_13S		/* CLK_RUN Hot m. (YUKON-Lite only) */
+#define CS_CLK_RUN_RST	BIT_12S		/* CLK_RUN Reset  (YUKON-Lite only) */
+#define CS_CLK_RUN_ENA	BIT_11S		/* CLK_RUN Enable (YUKON-Lite only) */
 #define CS_VAUX_AVAIL	BIT_10S		/* VAUX available (YUKON only) */
 #define CS_BUS_CLOCK	BIT_9S		/* Bus Clock 0/1 = 33/66 MHz */
 #define CS_BUS_SLOT_SZ	BIT_8S		/* Slot Size 0/1 = 32/64 bit slot */
@@ -819,10 +1086,10 @@ extern "C" {
 #define CS_RST_CLR		BIT_1S		/* Clear Software Reset	*/
 #define CS_RST_SET		BIT_0S		/* Set   Software Reset	*/
 
-/*	B0_LED			 8 Bit	LED register */
+/*	B0_LED			 8 Bit	LED register (GENESIS only)*/
 								/* Bit  7.. 2:	reserved */
-#define LED_STAT_ON		BIT_1S		/* Status LED on	*/
-#define LED_STAT_OFF	BIT_0S		/* Status LED off	*/
+#define LED_STAT_ON		BIT_1S		/* Status LED On	*/
+#define LED_STAT_OFF	BIT_0S		/* Status LED Off	*/
 
 /*	B0_POWER_CTRL	 8 Bit	Power Control reg (YUKON only) */
 #define PC_VAUX_ENA		BIT_7		/* Switch VAUX Enable  */
@@ -834,6 +1101,7 @@ extern "C" {
 #define PC_VCC_ON		BIT_1       /* Switch VCC On  */
 #define PC_VCC_OFF		BIT_0       /* Switch VCC Off */
 
+/* Yukon and Genesis */
 /*	B0_ISRC			32 bit	Interrupt Source Register */
 /*	B0_IMSK			32 bit	Interrupt Mask Register */
 /*	B0_SP_ISRC		32 bit	Special Interrupt Source Reg */
@@ -879,12 +1147,51 @@ extern "C" {
 #define IS_XA2_F		BIT_1		/* Q_XA2 End of Frame */
 #define IS_XA2_C		BIT_0		/* Q_XA2 Encoding Error */
 
+/*						(Yukon-2)			*/
+/*	B0_ISRC			32 bit	Interrupt Source Register */
+/*	B0_IMSK			32 bit	Interrupt Mask Register */
+/*	B0_SP_ISRC		32 bit	Special Interrupt Source Reg */
+/*	B2_IRQM_MSK 	32 bit	IRQ Moderation Mask */
+/*	B0_Y2_SP_ISRC2	32 bit	Special Interrupt Source Reg 2 */
+/*	B0_Y2_SP_ISRC3	32 bit	Special Interrupt Source Reg 3 */
+/*	B0_Y2_SP_EISR	32 bit	Enter ISR Reg */
+/*	B0_Y2_SP_LISR	32 bit	Leave ISR Reg */
+#define Y2_IS_PORT_MASK(Port, Mask)	((Mask) << (Port*8))
+#define Y2_IS_HW_ERR	BIT_31		/* Interrupt HW Error */
+#define Y2_IS_STAT_BMU	BIT_30		/* Status BMU Interrupt */
+#define Y2_IS_ASF		BIT_29		/* ASF subsystem Interrupt */
+							/* Bit 28: reserved */
+#define Y2_IS_POLL_CHK	BIT_27		/* Check IRQ from polling unit */
+#define Y2_IS_TWSI_RDY	BIT_26		/* IRQ on end of TWSI Tx */
+#define Y2_IS_IRQ_SW	BIT_25		/* SW forced IRQ	*/
+#define Y2_IS_TIMINT	BIT_24		/* IRQ from Timer	*/
+							/* Bit 23..16 reserved */
+						/* Link 2 Interrupts */
+#define Y2_IS_IRQ_PHY2	BIT_12      /* Interrupt from PHY 2 */
+#define Y2_IS_IRQ_MAC2	BIT_11      /* Interrupt from MAC 2 */
+#define Y2_IS_CHK_RX2	BIT_10      /* Descriptor error Rx 2 */
+#define Y2_IS_CHK_TXS2	BIT_9       /* Descriptor error TXS 2 */
+#define Y2_IS_CHK_TXA2	BIT_8       /* Descriptor error TXA 2 */
+							/* Bit  7.. 5 reserved */
+						/* Link 1 interrupts */
+#define Y2_IS_IRQ_PHY1	BIT_4       /* Interrupt from PHY 1 */
+#define Y2_IS_IRQ_MAC1	BIT_3       /* Interrupt from MAC 1 */
+#define Y2_IS_CHK_RX1	BIT_2       /* Descriptor error Rx 1 */
+#define Y2_IS_CHK_TXS1	BIT_1       /* Descriptor error TXS 1 */
+#define Y2_IS_CHK_TXA1	BIT_0       /* Descriptor error TXA 1 */
+
+#define Y2_IS_L1_MASK	0x0000001fUL	/* IRQ Mask for port 1 */	
 
+#define Y2_IS_L2_MASK	0x00001f00UL	/* IRQ Mask for port 2 */	
+
+#define Y2_IS_ALL_MSK	0xef001f1fUL	/* All Interrupt bits */
+
+/* Yukon and Genesis */
 /*	B0_HWE_ISRC		32 bit	HW Error Interrupt Src Reg */
 /*	B0_HWE_IMSK		32 bit	HW Error Interrupt Mask Reg */
 /*	B2_IRQM_HWE_MSK	32 bit	IRQ Moderation HW Error Mask */
 #define IS_ERR_MSK		0x00000fffL	/* 		All Error bits */
-								/* Bit 31..14:	reserved */
+							/* Bit 31..14:	reserved */
 #define IS_IRQ_TIST_OV	BIT_13	/* Time Stamp Timer Overflow (YUKON only) */
 #define IS_IRQ_SENSOR	BIT_12	/* IRQ from Sensor (YUKON only) */
 #define IS_IRQ_MST_ERR	BIT_11	/* IRQ master error detected */
@@ -900,6 +1207,43 @@ extern "C" {
 #define IS_R1_PAR_ERR	BIT_1	/* Queue R1 Parity Error */
 #define IS_R2_PAR_ERR	BIT_0	/* Queue R2 Parity Error */
 
+						/* Yukon-2 */
+/*	B0_HWE_ISRC		32 bit	HW Error Interrupt Src Reg */
+/*	B0_HWE_IMSK		32 bit	HW Error Interrupt Mask Reg */
+/*	B2_IRQM_HWE_MSK	32 bit	IRQ Moderation HW Error Mask */
+						/* Bit: 31..30 reserved */
+#define Y2_IS_TIST_OV	BIT_29	/* Time Stamp Timer overflow interrupt */
+#define Y2_IS_SENSOR	BIT_28	/* Sensor interrupt */
+#define Y2_IS_MST_ERR	BIT_27	/* Master error interrupt */
+#define Y2_IS_IRQ_STAT	BIT_26	/* Status exception interrupt */
+#define Y2_IS_PCI_EXP	BIT_25	/* PCI-Express interrupt */
+#define Y2_IS_PCI_NEXP	BIT_24	/* PCI-Express error similar to PCI error */
+						/* Bit: 23..14 reserved */
+						/* Link 2 */
+#define Y2_IS_PAR_RD2	BIT_13	/* Read RAM parity error interrupt */
+#define Y2_IS_PAR_WR2	BIT_12	/* Write RAM parity error interrupt */
+#define Y2_IS_PAR_MAC2	BIT_11	/* MAC hardware fault interrupt */
+#define Y2_IS_PAR_RX2	BIT_10	/* Parity Error Rx Queue 2 */
+#define Y2_IS_TCP_TXS2	BIT_9	/* TCP length mismatch sync Tx queue IRQ */
+#define Y2_IS_TCP_TXA2	BIT_8	/* TCP length mismatch async Tx queue IRQ */
+						/* Bit:  9.. 6 reserved */
+						/* Link 1 */
+#define Y2_IS_PAR_RD1	BIT_5	/* Read RAM parity error interrupt */
+#define Y2_IS_PAR_WR1	BIT_4	/* Write RAM parity error interrupt */
+#define Y2_IS_PAR_MAC1	BIT_3	/* MAC hardware fault interrupt */
+#define Y2_IS_PAR_RX1	BIT_2	/* Parity Error Rx Queue 1 */
+#define Y2_IS_TCP_TXS1	BIT_1	/* TCP length mismatch sync Tx queue IRQ */
+#define Y2_IS_TCP_TXA1	BIT_0	/* TCP length mismatch async Tx queue IRQ */
+
+#define Y2_HWE_L1_MASK	(Y2_IS_PAR_RD1 | Y2_IS_PAR_WR1 | Y2_IS_PAR_MAC1 |\
+						 Y2_IS_PAR_RX1 | Y2_IS_TCP_TXS1| Y2_IS_TCP_TXA1)
+#define Y2_HWE_L2_MASK	(Y2_IS_PAR_RD2 | Y2_IS_PAR_WR2 | Y2_IS_PAR_MAC2 |\
+						 Y2_IS_PAR_RX2 | Y2_IS_TCP_TXS2| Y2_IS_TCP_TXA2)
+
+#define Y2_HWE_ALL_MSK	(Y2_IS_TIST_OV | /* Y2_IS_SENSOR | */ Y2_IS_MST_ERR |\
+						 Y2_IS_IRQ_STAT | Y2_IS_PCI_EXP | Y2_IS_PCI_NEXP |\
+						 Y2_HWE_L1_MASK | Y2_HWE_L2_MASK)
+
 /*	B2_CONN_TYP		 8 bit	Connector type */
 /*	B2_PMD_TYP		 8 bit	PMD type */
 /*	Values of connector and PMD type comply to SysKonnect internal std */
@@ -915,16 +1259,58 @@ extern "C" {
 #define CHIP_ID_YUKON		0xb0	/* Chip ID for YUKON */
 #define CHIP_ID_YUKON_LITE	0xb1	/* Chip ID for YUKON-Lite (Rev. A1-A3) */
 #define CHIP_ID_YUKON_LP	0xb2	/* Chip ID for YUKON-LP */
+#define CHIP_ID_YUKON_XL	0xb3	/* Chip ID for YUKON-2 XL */
+#define CHIP_ID_YUKON_EC	0xb6	/* Chip ID for YUKON-2 EC */
+#define CHIP_ID_YUKON_FE	0xb7	/* Chip ID for YUKON-2 FE */
 
 #define CHIP_REV_YU_LITE_A1	3		/* Chip Rev. for YUKON-Lite A1,A2 */
 #define CHIP_REV_YU_LITE_A3	7		/* Chip Rev. for YUKON-Lite A3 */
 
+#define CHIP_REV_YU_EC_A1	0		/* Chip Rev. for Yukon-EC A1/A0 */
+#define CHIP_REV_YU_EC_A2	1		/* Chip Rev. for Yukon-EC A2 */
+
+/*	B2_Y2_CLK_GATE	 8 bit	Clock Gating (Yukon-2 only) */
+#define Y2_STATUS_LNK2_INAC	BIT_7S	/* Status Link 2 inactiv (0 = activ) */
+#define Y2_CLK_GAT_LNK2_DIS	BIT_6S	/* Disable clock gating Link 2 */
+#define Y2_COR_CLK_LNK2_DIS	BIT_5S	/* Disable Core clock Link 2 */
+#define Y2_PCI_CLK_LNK2_DIS	BIT_4S	/* Disable PCI clock Link 2 */
+#define Y2_STATUS_LNK1_INAC	BIT_3S	/* Status Link 1 inactiv (0 = activ) */
+#define Y2_CLK_GAT_LNK1_DIS	BIT_2S	/* Disable clock gating Link 1 */
+#define Y2_COR_CLK_LNK1_DIS	BIT_1S	/* Disable Core clock Link 1 */
+#define Y2_PCI_CLK_LNK1_DIS	BIT_0S	/* Disable PCI clock Link 1 */
+
+/*	B2_Y2_HW_RES	8 bit 	HW Resources (Yukon-2 only) */
+								/* Bit 7.. 5:	reserved */
+#define CFG_LED_MODE_MSK	(7<<2)	/* Bit  4.. 2:	LED Mode Mask */
+#define CFG_LINK_2_AVAIL	BIT_1S	/* Link 2 available */
+#define CFG_LINK_1_AVAIL	BIT_0S	/* Link 1 available */
+
+#define CFG_LED_MODE(x)		(((x) & CFG_LED_MODE_MSK) >> 2)
+#define CFG_DUAL_MAC_MSK	(CFG_LINK_2_AVAIL | CFG_LINK_1_AVAIL)
+
+#define CFG_LED_SING_ACT_LNK	0	/* Single LED ACT/LNK mode */
+#define CFG_LED_DUAL_ACT_LNK	1	/* Dual   LED ACT/LNK mode */
+
 /*	B2_E_3			 8 bit 	lower 4 bits used for HW self test result */
 #define B2_E3_RES_MASK	0x0f
 
 /*	B2_FAR			32 bit	Flash-Prom Addr Reg/Cnt */
 #define FAR_ADDR		0x1ffffL	/* Bit 16.. 0:	FPROM Address Mask */
 
+/*	B2_Y2_CLK_CTRL	32 bit	Core Clock Frequency Control Register (Yukon-2/EC) */
+								/* Bit 31..24:	reserved */
+/* Yukon-EC/FE */
+#define Y2_CLK_DIV_VAL_MSK	(0xff<<16)	/* Bit 23..16:	Clock Divisor Value */
+#define Y2_CLK_DIV_VAL(x)	(SHIFT16(x) & Y2_CLK_DIV_VAL_MSK)
+/* Yukon-2 */
+#define Y2_CLK_DIV_VAL2_MSK	(7<<21)		/* Bit 23..21:	Clock Divisor Value */
+#define Y2_CLK_SELECT2_MSK	(0x1f<<16)	/* Bit 20..16:	Clock Select */
+#define Y2_CLK_DIV_VAL_2(x)	(SHIFT21(x) & Y2_CLK_DIV_VAL2_MSK)
+#define Y2_CLK_SEL_VAL_2(x)	(SHIFT16(x) & Y2_CLK_SELECT_MSK)
+								/* Bit 15.. 2:	reserved */
+#define Y2_CLK_DIV_ENA		BIT_1S	/* Enable  Core Clock Division */
+#define Y2_CLK_DIV_DIS		BIT_0S	/* Disable Core Clock Division */
+
 /*	B2_LD_CTRL		 8 bit	EPROM loader control register */
 /*	Bits are currently reserved */
 
@@ -1032,10 +1418,8 @@ extern "C" {
 #define I2C_DATA		BIT_1S		/* I2C Data Port	*/
 #define I2C_CLK			BIT_0S		/* I2C Clock Port	*/
 
-/*
- * I2C Address
- */
-#define I2C_SENS_ADDR	LM80_ADDR	/* I2C Sensor Address, (Volt and Temp)*/
+/* I2C Address */
+#define I2C_SENS_ADDR	LM80_ADDR	/* I2C Sensor Address (Volt and Temp) */
 
 
 /*	B2_BSC_CTRL		 8 bit	Blink Source Counter Control */
@@ -1052,16 +1436,20 @@ extern "C" {
 #define BSC_T_OFF	BIT_1S		/* Test mode off */
 #define BSC_T_STEP	BIT_0S		/* Test step */
 
+/*	Y2_PEX_PHY_ADDR/DATA		PEX PHY address and data reg  (Yukon-2 only) */
+#define PEX_RD_ACCESS	BIT_31	/* Access Mode Read = 1, Write = 0 */
+#define PEX_DB_ACCESS	BIT_30	/* Access to debug register */
+
 
 /*	B3_RAM_ADDR		32 bit	RAM Address, to read or write */
 					/* Bit 31..19:	reserved */
 #define RAM_ADR_RAN	0x0007ffffL	/* Bit 18.. 0:	RAM Address Range */
 
 /* RAM Interface Registers */
-/*	B3_RI_CTRL		16 bit	RAM Iface Control Register */
+/*	B3_RI_CTRL		16 bit	RAM Interface Control Register */
 								/* Bit 15..10:	reserved */
-#define RI_CLR_RD_PERR	BIT_9S	/* Clear IRQ RAM Read Parity Err */
-#define RI_CLR_WR_PERR	BIT_8S	/* Clear IRQ RAM Write Parity Err*/
+#define RI_CLR_RD_PERR	BIT_9S	/* Clear IRQ RAM Read  Parity Err */
+#define RI_CLR_WR_PERR	BIT_8S	/* Clear IRQ RAM Write Parity Err */
 								/* Bit	7.. 2:	reserved */
 #define RI_RST_CLR		BIT_1S	/* Clear RAM Interface Reset */
 #define RI_RST_SET		BIT_0S	/* Set   RAM Interface Reset */
@@ -1171,7 +1559,7 @@ extern "C" {
 								/* Bit 31..16:	reserved */
 #define BC_MAX			0xffff	/* Bit 15.. 0:	Byte counter */
 
-/* BMU Control / Status Registers */
+/* BMU Control / Status Registers	(Yukon and Genesis) */
 /*	B0_R1_CSR		32 bit	BMU Ctrl/Stat Rx Queue 1 */
 /*	B0_R2_CSR		32 bit	BMU Ctrl/Stat Rx Queue 2 */
 /*	B0_XA1_CSR		32 bit	BMU Ctrl/Stat Sync Tx Queue 1 */
@@ -1212,6 +1600,42 @@ extern "C" {
 						CSR_SV_RUN | CSR_DREAD_RUN | CSR_DWRITE_RUN |\
 						CSR_TRANS_RUN)
 
+/* Rx BMU Control / Status Registers (Yukon-2) */
+#define BMU_IDLE			BIT_31	/* BMU Idle State */
+#define BMU_RX_TCP_PKT		BIT_30	/* Rx TCP Packet (when RSS Hash enabled) */
+#define BMU_RX_IP_PKT		BIT_29	/* Rx IP  Packet (when RSS Hash enabled) */
+								/* Bit 28..16:	reserved */
+#define BMU_ENA_RX_RSS_HASH	BIT_15	/* Enable  Rx RSS Hash */
+#define BMU_DIS_RX_RSS_HASH	BIT_14	/* Disable Rx RSS Hash */
+#define BMU_ENA_RX_CHKSUM	BIT_13	/* Enable  Rx TCP/IP Checksum Check */
+#define BMU_DIS_RX_CHKSUM	BIT_12	/* Disable Rx TCP/IP Checksum Check */
+#define BMU_CLR_IRQ_PAR		BIT_11	/* Clear IRQ on Parity errors (Rx) */
+#define BMU_CLR_IRQ_TCP		BIT_11	/* Clear IRQ on TCP segmen. error (Tx) */
+									
+#define BMU_CLR_IRQ_CHK		BIT_10	/* Clear IRQ Check */
+#define BMU_STOP			BIT_9   /* Stop  Rx/Tx Queue */
+#define BMU_START			BIT_8	/* Start Rx/Tx Queue */
+#define BMU_FIFO_OP_ON		BIT_7	/* FIFO Operational On */
+#define BMU_FIFO_OP_OFF 	BIT_6	/* FIFO Operational Off */
+#define BMU_FIFO_ENA		BIT_5	/* Enable FIFO */
+#define BMU_FIFO_RST		BIT_4	/* Reset  FIFO */
+#define BMU_OP_ON			BIT_3	/* BMU Operational On */
+#define BMU_OP_OFF			BIT_2	/* BMU Operational Off */
+#define BMU_RST_CLR			BIT_1	/* Clear BMU Reset (Enable) */
+#define BMU_RST_SET			BIT_0	/* Set   BMU Reset */
+
+#define BMU_CLR_RESET		(BMU_FIFO_RST | BMU_OP_OFF | BMU_RST_CLR)
+#define BMU_OPER_INIT		(BMU_CLR_IRQ_PAR | BMU_CLR_IRQ_CHK | BMU_START | \
+							BMU_FIFO_ENA | BMU_OP_ON)
+							
+/* Tx BMU Control / Status Registers (Yukon-2) */
+								/* Bit 31: same as for Rx */
+								/* Bit 30..14:	reserved */
+#define BMU_TX_IPIDINCR_ON	BIT_13	/* Enable  IP ID Increment */
+#define BMU_TX_IPIDINCR_OFF	BIT_12	/* Disable IP ID Increment */
+#define BMU_TX_CLR_IRQ_TCP	BIT_11	/* Clear IRQ on TCP segm. length mism. */
+								/* Bit 10..0: same as for Rx */
+
 /*	Q_F				32 bit	Flag Register */
 									/* Bit 31..28:	reserved */
 #define F_ALM_FULL		BIT_27		/* Rx FIFO: almost full */
@@ -1260,6 +1684,13 @@ extern "C" {
 								/* Bit  3:	reserved */
 #define T3_VRAM_MSK		7		/* Bit  2.. 0:	Virtual RAM Buffer Address */
 
+/* Queue Prefetch Unit Offsets, use Y2_PREF_Q_ADDR() to address (Yukon-2 only)*/
+/* PREF_UNIT_CTRL_REG	32 bit	Prefetch Control register */
+#define PREF_UNIT_OP_ON		BIT_3	/* prefetch unit operational */
+#define PREF_UNIT_OP_OFF	BIT_2	/* prefetch unit not operational */
+#define PREF_UNIT_RST_CLR	BIT_1	/* Clear Prefetch Unit Reset */
+#define PREF_UNIT_RST_SET	BIT_0	/* Set   Prefetch Unit Reset */
+
 /* RAM Buffer Register Offsets, use RB_ADDR(Queue, Offs) to access */
 /*	RB_START		32 bit	RAM Buffer Start Address */
 /*	RB_END			32 bit	RAM Buffer End Address */
@@ -1300,6 +1731,21 @@ extern "C" {
 #define RB_RST_CLR		BIT_1S	/* Clear RAM Buf STM Reset */
 #define RB_RST_SET		BIT_0S	/* Set   RAM Buf STM Reset */
 
+/* Yukon-2 */
+							/* Bit 31..20:	reserved */
+#define RB_CNT_DOWN		BIT_19	/* Packet Counter Decrement */
+#define RB_CNT_TST_ON	BIT_18  /* Packet Counter Test On */
+#define RB_CNT_TST_OFF	BIT_17	/* Packet Counter Test Off */
+#define RB_CNT_UP		BIT_16	/* Packet Counter Increment */
+							/* Bit 15:	reserved */
+#define RB_WP_TST_ON	BIT_14  /* Write Pointer Test On */
+#define RB_WP_TST_OFF	BIT_13	/* Write Pointer Test Off */
+#define RB_WP_UP		BIT_12	/* Write Pointer Increment  */
+							/* Bit 11:	reserved */
+#define RB_RP_TST_ON	BIT_10  /* Read Pointer Test On */
+#define RB_RP_TST_OFF	BIT_9	/* Read Pointer Test Off */
+#define RB_RP_UP		BIT_8	/* Read Pointer Increment */
+
 
 /* Receive and Transmit MAC FIFO Registers (GENESIS only) */
 
@@ -1394,7 +1840,7 @@ extern "C" {
 							/* Bit 7.. 3:	reserved */
 #define LED_START		BIT_2S	/* Start Counter */
 #define LED_STOP		BIT_1S	/* Stop Counter */
-#define LED_STATE		BIT_0S	/* Rx/Tx: LED State, 1=LED on */
+#define LED_STATE		BIT_0S	/* Rx/Tx: LED State, 1=LED On */
 
 /*	LNK_SYNC_CTRL	 8 bit	Link Sync Cnt Control Register */
 							/* Bit 7.. 3:	reserved */
@@ -1416,8 +1862,8 @@ extern "C" {
 #define LED_BLK_OFF		BIT_4S	/* Link LED Blinking Off */
 #define LED_SYNC_ON		BIT_3S	/* Use Sync Wire to switch LED */
 #define LED_SYNC_OFF	BIT_2S	/* Disable Sync Wire Input */
-#define LED_ON			BIT_1S	/* switch LED on */
-#define LED_OFF			BIT_0S	/* switch LED off */
+#define LED_ON			BIT_1S	/* Switch LED On */
+#define LED_OFF			BIT_0S	/* Switch LED Off */
 
 /*	Receive and Transmit GMAC FIFO Registers (YUKON only) */
 
@@ -1437,7 +1883,12 @@ extern "C" {
 /*	TX_GMF_RLEV		32 bit 	Tx GMAC FIFO Read Level */
 
 /*	RX_GMF_CTRL_T	32 bit	Rx GMAC FIFO Control/Test */
-						/* Bits 31..15:	reserved */
+						/* Bit 31..28 reserved */
+#define RX_TRUNC_ON		BIT_27  /* enable  packet truncation */
+#define RX_TRUNC_OFF	BIT_26	/* disable packet truncation */
+#define RX_VLAN_STRIP_ON	BIT_25	/* enable  VLAN stripping */
+#define RX_VLAN_STRIP_OFF	BIT_24	/* disable VLAN stripping */
+						/* Bit 23..15 reserved */
 #define GMF_WP_TST_ON	BIT_14	/* Write Pointer Test On */
 #define GMF_WP_TST_OFF	BIT_13	/* Write Pointer Test Off */
 #define GMF_WP_STEP		BIT_12	/* Write Pointer Step/Increment */
@@ -1454,12 +1905,16 @@ extern "C" {
 #define GMF_RST_CLR		BIT_1	/* Clear GMAC FIFO Reset */
 #define GMF_RST_SET		BIT_0	/* Set   GMAC FIFO Reset */
 
-/*	TX_GMF_CTRL_T	32 bit	Tx GMAC FIFO Control/Test */
-						/* Bits 31..19:	reserved */
+/*	TX_GMF_CTRL_T	32 bit	Tx GMAC FIFO Control/Test (YUKON and Yukon-2) */
+						/* Bits 31..26: reserved */
+#define TX_VLAN_TAG_ON	BIT_25	/* enable  VLAN tagging */
+#define TX_VLAN_TAG_OFF	BIT_24	/* disable VLAN tagging */
+						/* Bits 23..19: reserved */
 #define GMF_WSP_TST_ON	BIT_18	/* Write Shadow Pointer Test On */
 #define GMF_WSP_TST_OFF	BIT_17	/* Write Shadow Pointer Test Off */
 #define GMF_WSP_STEP	BIT_16	/* Write Shadow Pointer Step/Increment */
-						/* Bits 15..7: same as for RX_GMF_CTRL_T */
+						/* Bits 15..8: same as for RX_GMF_CTRL_T */
+						/* Bit 7:	reserved */
 #define GMF_CLI_TX_FU	BIT_6	/* Clear IRQ Tx FIFO Underrun */
 #define GMF_CLI_TX_FC	BIT_5	/* Clear IRQ Tx Frame Complete */
 #define GMF_CLI_TX_PE	BIT_4	/* Clear IRQ Tx Parity Error */
@@ -1468,6 +1923,7 @@ extern "C" {
 #define GMF_RX_CTRL_DEF		(GMF_OPER_ON | GMF_RX_F_FL_ON)
 #define GMF_TX_CTRL_DEF		GMF_OPER_ON
 
+#define RX_GMF_AF_THR_MIN	0x0c	/* Rx GMAC FIFO Almost Full Thresh. min. */
 #define RX_GMF_FL_THR_DEF	0x0a	/* Rx GMAC FIFO Flush Threshold default */
 
 /*	GMAC_TI_ST_CTRL	 8 bit	Time Stamp Timer Ctrl Reg (YUKON only) */
@@ -1476,6 +1932,47 @@ extern "C" {
 #define GMT_ST_STOP		BIT_1S	/* Stop  Time Stamp Timer */
 #define GMT_ST_CLR_IRQ	BIT_0S	/* Clear Time Stamp Timer IRQ */
 
+/*  POLL_CTRL		32 bit	Polling Unit control register (Yukon-2 only) */
+							/* Bit 31.. 6:	reserved */
+#define PC_CLR_IRQ_CHK	BIT_5	/* Clear IRQ Check */
+#define PC_POLL_RQ		BIT_4	/* Poll Request Start */
+#define PC_POLL_OP_ON	BIT_3	/* Operational Mode On */
+#define PC_POLL_OP_OFF	BIT_2	/* Operational Mode Off */
+#define PC_POLL_RST_CLR	BIT_1	/* Clear Polling Unit Reset (Enable) */
+#define PC_POLL_RST_SET	BIT_0	/* Set   Polling Unit Reset */
+
+
+/* The bit definition of the following registers is still missing! */
+/* B28_Y2_SMB_CONFIG		32 bit	ASF SMBus Config Register */
+/* B28_Y2_SMB_CSD_REG		32 bit	ASF SMB Control/Status/Data */
+/* B28_Y2_ASF_IRQ_V_BASE	32 bit	ASF IRQ Vector Base */
+
+/* B28_Y2_ASF_STAT_CMD		32 bit	ASF Status and Command Reg */
+/* This register is used by the host driver software */
+						/* Bit 31:5	reserved */
+#define Y2_ASF_OS_PRES	BIT_4	/* ASF operationg system present */
+#define Y2_ASF_UC_STATE (BIT_3|BIT_2)	/* ASF uC State */
+#define Y2_ASF_CLK_HALT 0		/* ASF system clock stopped */
+#define Y2_ASF_RESET	BIT_3	/* ASF system in reset state */
+#define Y2_ASF_RUNNING	BIT_2	/* ASF system operational */
+#define Y2_ASF_CLR_HSTI BIT_1	/* Clear ASF IRQ */
+#define Y2_ASF_IRQ		BIT_0	/* Issue an IRQ to ASF system */
+
+/* B28_Y2_ASF_HOST_COM	32 bit	ASF Host Communication Reg */
+/* This register is used by the ASF firmware */
+						/* Bit 31:2	reserved */
+#define Y2_ASF_CLR_ASFI BIT_1	/* Clear host IRQ */
+#define Y2_ASF_HOST_IRQ BIT_0	/* Issue an IRQ to HOST system */
+
+
+/*  STAT_CTRL		32 bit	Status BMU control register (Yukon-2 only) */
+							/* Bit  7.. 5:	reserved */
+#define SC_STAT_CLR_IRQ	BIT_4	/* Status Burst IRQ clear */
+#define SC_STAT_OP_ON	BIT_3	/* Operational Mode On */
+#define SC_STAT_OP_OFF	BIT_2	/* Operational Mode Off */
+#define SC_STAT_RST_CLR	BIT_1	/* Clear Status Unit Reset (Enable) */
+#define SC_STAT_RST_SET	BIT_0	/* Set   Status Unit Reset */
+	
 /*	GMAC_CTRL		32 bit	GMAC Control Reg (YUKON only) */
 						/* Bits 31.. 8:	reserved */
 #define GMC_H_BURST_ON	BIT_7	/* Half Duplex Burst Mode On */
@@ -1490,7 +1987,7 @@ extern "C" {
 /*	GPHY_CTRL		32 bit	GPHY Control Reg (YUKON only) */
 						/* Bits 31..29:	reserved */
 #define GPC_SEL_BDT		BIT_28	/* Select Bi-Dir. Transfer for MDC/MDIO */
-#define GPC_INT_POL_HI	BIT_27	/* IRQ Polarity is Active HIGH */
+#define GPC_INT_POL		BIT_27	/* IRQ Polarity is Active Low */
 #define GPC_75_OHM		BIT_26	/* Use 75 Ohm Termination instead of 50 */
 #define GPC_DIS_FC		BIT_25	/* Disable Automatic Fiber/Copper Detection */
 #define GPC_DIS_SLEEP	BIT_24	/* Disable Energy Detect */
@@ -1544,14 +2041,14 @@ extern "C" {
 
 /*	GMAC_IRQ_SRC	 8 bit	GMAC Interrupt Source Reg (YUKON only) */
 /*	GMAC_IRQ_MSK	 8 bit	GMAC Interrupt Mask   Reg (YUKON only) */
-#define GM_IS_TX_CO_OV	BIT_5		/* Transmit Counter Overflow IRQ */
-#define GM_IS_RX_CO_OV	BIT_4		/* Receive Counter Overflow IRQ */
-#define GM_IS_TX_FF_UR	BIT_3		/* Transmit FIFO Underrun */
-#define GM_IS_TX_COMPL	BIT_2		/* Frame Transmission Complete */
-#define GM_IS_RX_FF_OR	BIT_1		/* Receive FIFO Overrun */
-#define GM_IS_RX_COMPL	BIT_0		/* Frame Reception Complete */
+#define GM_IS_RX_CO_OV	BIT_5S		/* Receive Counter Overflow IRQ */
+#define GM_IS_TX_CO_OV	BIT_4S		/* Transmit Counter Overflow IRQ */
+#define GM_IS_TX_FF_UR	BIT_3S		/* Transmit FIFO Underrun */
+#define GM_IS_TX_COMPL	BIT_2S		/* Frame Transmission Complete */
+#define GM_IS_RX_FF_OR	BIT_1S		/* Receive FIFO Overrun */
+#define GM_IS_RX_COMPL	BIT_0S		/* Frame Reception Complete */
 
-#define GMAC_DEF_MSK	(GM_IS_TX_CO_OV | GM_IS_RX_CO_OV | \
+#define GMAC_DEF_MSK	(GM_IS_RX_CO_OV | GM_IS_TX_CO_OV | \
 						GM_IS_TX_FF_UR)
 
 /*	GMAC_LINK_CTRL	16 bit	GMAC Link Control Reg (YUKON only) */
@@ -1583,15 +2080,19 @@ extern "C" {
 
 #define WOL_CTL_DEFAULT				\
 	(WOL_CTL_DIS_PME_ON_LINK_CHG |	\
-	WOL_CTL_DIS_PME_ON_PATTERN |	\
-	WOL_CTL_DIS_PME_ON_MAGIC_PKT |	\
-	WOL_CTL_DIS_LINK_CHG_UNIT |		\
-	WOL_CTL_DIS_PATTERN_UNIT |		\
-	WOL_CTL_DIS_MAGIC_PKT_UNIT)
+	 WOL_CTL_DIS_PME_ON_PATTERN |	\
+	 WOL_CTL_DIS_PME_ON_MAGIC_PKT |	\
+	 WOL_CTL_DIS_LINK_CHG_UNIT |	\
+	 WOL_CTL_DIS_PATTERN_UNIT |		\
+	 WOL_CTL_DIS_MAGIC_PKT_UNIT)
 
 /*	WOL_MATCH_CTL	 8 bit	WOL Match Control Reg */
 #define WOL_CTL_PATT_ENA(x)				(BIT_0 << (x))
 
+/*	WOL_PATT_PME	8 bit   WOL PME Match Enable (Yukon-2) */
+#define WOL_PATT_FORCE_PME				BIT_7	/* Generates a PME */
+#define WOL_PATT_MATCH_PME_ALL			0x7f
+
 #define SK_NUM_WOL_PATTERN		7
 #define SK_PATTERN_PER_WORD		4
 #define SK_BITMASK_PATTERN		7
@@ -1655,6 +2156,237 @@ typedef	struct s_HwRxd {
  * swap if the DWord is swapped by the hardware.
  */
 
+/* YUKON-2 descriptors ******************************************************/
+
+typedef struct _TxChksum {
+#ifndef SK_USE_REV_DESC
+	SK_U16	TxTcpWp;		/* TCP Checksum Write Position */
+	SK_U16	TxTcpSp;		/* TCP Checksum Calculation Start Position */
+#else  /* SK_USE_REV_DESC */
+	SK_U16	TxTcpSp;		/* TCP Checksum Calculation Start Position */
+	SK_U16	TxTcpWp;		/* TCP Checksum Write Position */
+#endif /* SK_USE_REV_DESC */
+} SK_HWTXCS;
+
+typedef struct _LargeSend {
+#ifndef SK_USE_REV_DESC
+	SK_U16 Length;		/* Large Send Segment Length */
+	SK_U16 Reserved;	/* reserved */
+#else  /* SK_USE_REV_DESC */
+	SK_U16 Reserved;	/* reserved */
+	SK_U16 Length;		/* Large Send Segment Length */
+#endif /* SK_USE_REV_DESC */
+} SK_HWTXLS;
+
+typedef union u_HwTxBuf {
+	SK_U16	BufLen;		/* Tx Buffer Length */
+	SK_U16	VlanTag;	/* VLAN Tag */
+	SK_U16	InitCsum;	/* Init. Checksum */
+} SK_HWTXBUF;
+
+/* Tx List Element structure */
+typedef struct s_HwLeTx {
+    union {
+        SK_U32	BufAddr;	/* Tx LE Buffer Address high/low */
+        SK_HWTXCS ChkSum;	/* Tx LE TCP Checksum parameters */
+		SK_HWTXLS LargeSend;/* Large Send length */
+    } TxUn;
+#ifndef SK_USE_REV_DESC
+    SK_HWTXBUF	Send;
+	SK_U8	ControlFlags;	/* Tx LE Control field or Lock Number */
+    SK_U8	Opcode;		    /* Tx LE Opcode field */
+#else  /* SK_USE_REV_DESC */
+    SK_U8	Opcode;		    /* Tx LE Opcode field */
+    SK_U8	ControlFlags;	/* Tx LE Control field or Lock Number */
+    SK_HWTXBUF	Send;
+#endif /* SK_USE_REV_DESC */
+} SK_HWLETX;
+
+typedef struct _RxChkSum{
+#ifndef SK_USE_REV_DESC
+	SK_U16	RxTcpSp1;		/* TCP Checksum Calculation Start Position 1 */
+	SK_U16	RxTcpSp2;		/* TCP Checksum Calculation Start Position 2 */
+#else  /* SK_USE_REV_DESC */
+	SK_U16	RxTcpSp2;		/* TCP Checksum Calculation Start Position 2 */
+	SK_U16	RxTcpSp1;		/* TCP Checksum Calculation Start Position 1 */
+#endif /* SK_USE_REV_DESC */
+} SK_HWRXCS;
+
+/* Rx List Element structure */
+typedef struct s_HwLeRx {
+    union {
+        SK_U32	BufAddr;	/* Rx LE Buffer Address high/low */
+        SK_HWRXCS ChkSum;	/* Rx LE TCP Checksum parameters */
+    } RxUn;
+#ifndef SK_USE_REV_DESC
+	SK_U16	BufferLength;	/* Rx LE Buffer Length field */
+    SK_U8	ControlFlags;	/* Rx LE Control field */
+    SK_U8	Opcode;		    /* Rx LE Opcode field */
+#else  /* SK_USE_REV_DESC */
+    SK_U8	Opcode;		    /* Rx LE Opcode field */
+    SK_U8	ControlFlags;	/* Rx LE Control field */
+	SK_U16	BufferLength;	/* Rx LE Buffer Length field */
+#endif /* SK_USE_REV_DESC */
+} SK_HWLERX;
+
+typedef struct s_StRxTCPChkSum {
+#ifndef SK_USE_REV_DESC
+	SK_U16	RxTCPSum1;		/* Rx TCP Checksum 1 */
+	SK_U16	RxTCPSum2;		/* Rx TCP Checksum 2 */
+#else  /* SK_USE_REV_DESC */
+	SK_U16	RxTCPSum2;		/* Rx TCP Checksum 2 */
+	SK_U16	RxTCPSum1;		/* Rx TCP Checksum 1 */
+#endif /* SK_USE_REV_DESC */
+} SK_HWSTCS;
+
+typedef struct s_StRxRssFlags {
+#ifndef SK_USE_REV_DESC
+	SK_U8	FlagField;		/* contains TCP and IP flags */
+	SK_U8	reserved;		/* reserved */
+#else  /* SK_USE_REV_DESC */
+	SK_U8	reserved;		/* reserved */
+	SK_U8	FlagField;		/* contains TCP and IP flags */
+#endif /* SK_USE_REV_DESC */
+} SK_HWSTRSS;
+
+/* bit definition of RSS LE bit 32/33 (SK_HWSTRSS.FlagField) */
+								/* bit 7..2 reserved */
+#define RSS_TCP_FLAG	BIT_1S	/* RSS value related to TCP area */
+#define RSS_IP_FLAG		BIT_0S	/* RSS value related to IP area */
+/* StRxRssValue is valid if at least RSS_IP_FLAG is set. */
+/* For protocol errors or other protocols an empty RSS LE is generated. */
+
+typedef union u_HwStBuf {
+	SK_U16	BufLen;		/* Rx Buffer Length */
+	SK_U16	VlanTag;	/* VLAN Tag */
+	SK_U16	StTxStatHi;	/* Tx Queue Status (high) */
+	SK_HWSTRSS	Rss;	/* Flag Field for TCP and IP protocol */
+} SK_HWSTBUF;
+
+/* Status List Element structure */
+typedef struct s_HwLeSt {
+    union {
+        SK_U32	StRxStatWord;	/* Rx Status Dword */
+        SK_U32	StRxTimeStamp;	/* Rx Timestamp */
+		SK_HWSTCS StRxTCPCSum;	/* Rx TCP Checksum */
+        SK_U32	StTxStatLow;	/* Tx Queue Status (low) */
+		SK_U32	StRxRssValue;	/* Rx RSS value */
+    } StUn;
+#ifndef SK_USE_REV_DESC
+    SK_HWSTBUF	Stat;
+    SK_U8	Link;			/* Status LE Link field */
+    SK_U8	Opcode;		    /* Status LE Opcode field */
+#else  /* SK_USE_REV_DESC */
+    SK_U8	Opcode;		    /* Status LE Opcode field */
+    SK_U8	Link;			/* Status LE Link field */
+    SK_HWSTBUF	Stat;
+#endif /* SK_USE_REV_DESC */
+} SK_HWLEST;
+
+/* Special Action List Element */
+typedef struct s_HwLeSa {
+#ifndef SK_USE_REV_DESC
+	SK_U16	TxAIdxVld;		/* Special Action LE TxA Put Index field */
+	SK_U16	TxSIdxVld;      /* Special Action LE TxS Put Index field */
+	SK_U16	RxIdxVld;       /* Special Action LE Rx Put Index field */
+    SK_U8	Link;			/* Special Action LE Link field */
+    SK_U8	Opcode;		    /* Special Action LE Opcode field */
+#else  /* SK_USE_REV_DESC */
+	SK_U16	TxSIdxVld;      /* Special Action LE TxS Put Index field */
+	SK_U16	TxAIdxVld;		/* Special Action LE TxA Put Index field */
+    SK_U8	Opcode;		    /* Special Action LE Opcode field */
+    SK_U8	Link;			/* Special Action LE Link field */
+	SK_U16	RxIdxVld;       /* Special Action LE Rx Put Index field */
+#endif /* SK_USE_REV_DESC */
+} SK_HWLESA;
+
+/* Common List Element union */
+typedef union u_HwLeTxRxSt {
+    /* transmit list element structure */
+    SK_HWLETX Tx;
+    /* receive list element structure */
+    SK_HWLERX Rx;
+    /* status list element structure */
+    SK_HWLEST St;
+    /* special action list element structure */
+    SK_HWLESA Sa;
+} SK_HWLE;
+
+/* mask and shift value to get tx async queue status for port 1 */
+#define STLE_TXA1_MSKL		0x00000fff
+#define STLE_TXA1_SHIFTL	0
+
+/* mask and shift value to get tx sync queue status for port 1 */
+#define STLE_TXS1_MSKL		0x00fff000
+#define STLE_TXS1_SHIFTL	12
+
+/* mask and shift value to get tx async queue status for port 2 */
+#define STLE_TXA2_MSKL		0xff000000
+#define STLE_TXA2_SHIFTL	24
+#define STLE_TXA2_MSKH		0x000f
+/* this one shifts up */
+#define STLE_TXA2_SHIFTH	8
+
+/* mask and shift value to get tx sync queue status for port 2 */
+#define STLE_TXS2_MSKL		0x00000000
+#define STLE_TXS2_SHIFTL	0
+#define STLE_TXS2_MSKH		0xfff0
+#define STLE_TXS2_SHIFTH	4
+
+/* YUKON-2  bit values */
+#define HW_OWNER        BIT_7
+#define SW_OWNER        0
+
+#define PU_PUTIDX_VALID		BIT_12
+
+/* YUKON-2  Control flags */
+#define UDPTCP          BIT_0S
+#define CALSUM          BIT_1S
+#define WR_SUM          BIT_2S
+#define INIT_SUM        BIT_3S
+#define LOCK_SUM		BIT_4S
+#define INS_VLAN		BIT_5S
+#define FRC_STAT		BIT_6S
+#define EOP				BIT_7S
+
+#define TX_LOCK			BIT_8S
+#define BUF_SEND		BIT_9S
+#define PACKET_SEND		BIT_10S
+
+#define NO_WARNING		BIT_14S
+#define NO_UPDATE		BIT_15S
+
+/* YUKON-2  Rx/Tx opcodes defines */
+#define	OP_TCPWRITE		0x11
+#define	OP_TCPSTART		0x12
+#define	OP_TCPINIT		0x14
+#define	OP_TCPLCK		0x18
+#define OP_TCPCHKSUM    OP_TCPSTART
+#define OP_TCPIS        (OP_TCPINIT | OP_TCPSTART)
+#define OP_TCPLW        (OP_TCPLCK | OP_TCPWRITE)
+#define OP_TCPLSW       (OP_TCPLCK | OP_TCPSTART | OP_TCPWRITE)
+#define OP_TCPLISW      (OP_TCPLCK | OP_TCPINIT | OP_TCPSTART | OP_TCPWRITE)
+#define OP_ADDR64       0x21
+#define OP_VLAN         0x22
+#define OP_ADDR64VLAN   (OP_ADDR64 | OP_VLAN)
+#define OP_LRGLEN       0x24
+#define OP_LRGLENVLAN   (OP_LRGLEN | OP_VLAN)
+#define OP_BUFFER       0x40
+#define OP_PACKET       0x41
+#define OP_LARGESEND    0x43
+
+/* YUKON-2  STATUS opcodes defines */
+#define OP_RXSTAT       0x60
+#define OP_RXTIMESTAMP  0x61
+#define OP_RXVLAN       0x62
+#define OP_RXCHKS		0x64
+#define OP_RXCHKSVLAN	( OP_RXCHKS | OP_RXVLAN )
+#define OP_RXTIMEVLAN   ( OP_RXTIMESTAMP | OP_RXVLAN )
+#define OP_RSS_HASH		0x65
+#define OP_TXINDEXLE    0x68
+
+/* YUKON-2  SPECIAL opcodes defines */
+#define OP_PUTIDX       0x70
 
 /* Descriptor Bit Definition */
 /*	TxCtrl		Transmit Buffer Control Field */
@@ -1689,6 +2421,10 @@ typedef	struct s_HwRxd {
 
 /* macros ********************************************************************/
 
+/* Macro fro accessing the key registers */
+#define RSS_KEY_ADDR(Port, KeyIndex)	\
+		((B4_RSS_KEY | ( ((Port)!=0) ? 0x80 : 0))+(KeyIndex))
+
 /* Receive and Transmit Queues */
 #define Q_R1	0x0000		/* Receive Queue 1 */
 #define Q_R2	0x0080		/* Receive Queue 2 */
@@ -1697,6 +2433,10 @@ typedef	struct s_HwRxd {
 #define Q_XS2	0x0300		/* Synchronous Transmit Queue 2 */
 #define Q_XA2	0x0380		/* Asynchronous Transmit Queue 2 */
 
+#define Q_ASF_R1	0x100	/* ASF Rx Queue 1 */
+#define Q_ASF_R2	0x180	/* ASF Rx Queue 2 */
+#define Q_ASF_T1	0x140	/* ASF Tx Queue 1 */
+#define Q_ASF_T2	0x1c0	/* ASF Tx Queue 2 */
 /*
  *	Macro Q_ADDR()
  *
@@ -1708,11 +2448,27 @@ typedef	struct s_HwRxd {
  *	Offs	Queue register offset.
  *				Values: Q_D, Q_DA_L ... Q_T2, Q_T3
  *
- * usage	SK_IN32(pAC, Q_ADDR(Q_R2, Q_BC), pVal)
+ * usage	SK_IN32(IoC, Q_ADDR(Q_R2, Q_BC), pVal)
  */
 #define Q_ADDR(Queue, Offs)	(B8_Q_REGS + (Queue) + (Offs))
 
 /*
+ *	Macro Y2_PREF_Q_ADDR()
+ *
+ *	Use this macro to access the Prefetch Units of the receive and
+ *	transmit queues of Yukon-2.
+ *
+ * para:	
+ *	Queue	Queue to access.
+ *				Values: Q_R1, Q_R2, Q_XS1, Q_XA1, Q_XS2, Q_XA2,
+ *	Offs	Queue register offset.
+ *				Values: PREF_UNIT_CTRL_REG ... PREF_UNIT_FIFO_LEV_REG
+ *
+ * usage	SK_IN16(IoC, Y2_Q_ADDR(Q_R2, PREF_UNIT_GET_IDX_REG), pVal)
+ */
+#define Y2_PREF_Q_ADDR(Queue, Offs)	(Y2_B8_PREF_REGS + (Queue) + (Offs))
+
+/*
  *	Macro RB_ADDR()
  *
  *	Use this macro to access the RAM Buffer Registers.
@@ -1723,14 +2479,14 @@ typedef	struct s_HwRxd {
  *	Offs	Queue register offset.
  *				Values: RB_START, RB_END ... RB_LEV, RB_CTRL
  *
- * usage	SK_IN32(pAC, RB_ADDR(Q_R2, RB_RP), pVal)
+ * usage	SK_IN32(IoC, RB_ADDR(Q_R2, RB_RP), pVal)
  */
 #define RB_ADDR(Queue, Offs)	(B16_RAM_REGS + (Queue) + (Offs))
 
 
 /* MAC Related Registers */
-#define MAC_1		0	/* belongs to the port near the slot */
-#define MAC_2		1	/* belongs to the port far away from the slot */
+#define MAC_1		0	/* 1st port */
+#define MAC_2		1	/* 2nd port */
 
 /*
  *	Macro MR_ADDR()
@@ -1744,7 +2500,7 @@ typedef	struct s_HwRxd {
  *				Values: RX_MFF_EA, RX_MFF_WP ... LNK_LED_REG,
  *						TX_MFF_EA, TX_MFF_WP ... TX_LED_TST
  *
- * usage	SK_IN32(pAC, MR_ADDR(MAC_1, TX_MFF_EA), pVal)
+ * usage	SK_IN32(IoC, MR_ADDR(MAC_1, TX_MFF_EA), pVal)
  */
 #define MR_ADDR(Mac, Offs)	(((Mac) << 7) + (Offs))
 
@@ -2074,12 +2830,14 @@ typedef	struct s_HwRxd {
  *	Use this macro to access PCI config register from the I/O space.
  *
  * para:
+ *	pAC		Pointer to adapter context
  *	Addr	PCI configuration register to access.
  *			Values:	PCI_VENDOR_ID ... PCI_VPD_ADR_REG,
  *
- * usage	SK_IN16(pAC, PCI_C(PCI_VENDOR_ID), pVal);
+ * usage	SK_IN16(IoC, PCI_C(pAC, PCI_VENDOR_ID), pVal);
  */
-#define PCI_C(Addr)	(B7_CFG_SPC + (Addr))	/* PCI Config Space */
+#define PCI_C(p, Addr)		\
+	(((CHIP_ID_YUKON_2(p)) ? Y2_CFG_SPC : B7_CFG_SPC) + (Addr))
 
 /*
  *	Macro SK_HW_ADDR(Base, Addr)
@@ -2091,7 +2849,7 @@ typedef	struct s_HwRxd {
  *	Addr	Address offset
  *
  * usage:	May be used in SK_INxx and SK_OUTxx macros
- *		#define SK_IN8(pAC, Addr, pVal) ...\
+ *		#define SK_IN8(IoC, Addr, pVal) ...\
  *			*pVal = (SK_U8)inp(SK_HW_ADDR(pAC->Hw.Iop, Addr)))
  */
 #ifdef SK_MEM_MAPPED_IO
@@ -2116,6 +2874,21 @@ typedef	struct s_HwRxd {
 #define SK_HWAC_LINK_LED(pAC, IoC, Port, Mode) \
 	SK_OUT8(IoC, MR_ADDR(Port, LNK_LED_REG), Mode);
 
+#define SK_SET_GPIO(IoC, Bit) { \
+	SK_U32	DWord;				\
+	SK_IN32(IoC, B2_GP_IO, &DWord);						\
+	DWord |= ((GP_DIR_0 << (Bit)) | (GP_IO_0 << (Bit)));\
+	SK_OUT32(IoC, B2_GP_IO, DWord);						\
+}
+	
+#define SK_CLR_GPIO(IoC, Bit) { \
+	SK_U32	DWord;				\
+	SK_IN32(IoC, B2_GP_IO, &DWord);		\
+	DWord &= ~(GP_IO_0 << (Bit));		\
+	SK_OUT32(IoC, B2_GP_IO, DWord);		\
+}
+
+#define SK_GE_PCI_FIFO_SIZE		1600	/* PCI FIFO Size */
 
 /* typedefs *******************************************************************/
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skgehwt.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skgehwt.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skgehwt.h	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skgehwt.h	2004-09-09 13:20:48.000000000 +0200
@@ -2,8 +2,8 @@
  *
  * Name:	skhwt.h
  * Project:	Gigabit Ethernet Adapters, Event Scheduler Module
- * Version:	$Revision: 1.7 $
- * Date:	$Date: 2003/09/16 12:55:08 $
+ * Version:	$Revision: 2.1 $
+ * Date:	$Date: 2003/10/27 14:16:09 $
  * Purpose:	Defines for the hardware timer functions
  *
  ******************************************************************************/
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skgei2c.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skgei2c.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skgei2c.h	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skgei2c.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,210 +0,0 @@
-/******************************************************************************
- *
- * Name:	skgei2c.h
- * Project:	Gigabit Ethernet Adapters, TWSI-Module
- * Version:	$Revision: 1.25 $
- * Date:	$Date: 2003/10/20 09:06:05 $
- * Purpose:	Special defines for TWSI
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *	(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
- *	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.
- *
- ******************************************************************************/
-
-/*
- * SKGEI2C.H	contains all SK-98xx specific defines for the TWSI handling
- */
-
-#ifndef _INC_SKGEI2C_H_
-#define _INC_SKGEI2C_H_
-
-/*
- * Macros to access the B2_I2C_CTRL
- */
-#define SK_I2C_CTL(IoC, flag, dev, dev_size, reg, burst) \
-	SK_OUT32(IoC, B2_I2C_CTRL,\
-		(flag ? 0x80000000UL : 0x0L) | \
-		(((SK_U32)reg << 16) & I2C_ADDR) | \
-		(((SK_U32)dev << 9) & I2C_DEV_SEL) | \
-		(dev_size & I2C_DEV_SIZE) | \
-		((burst << 4) & I2C_BURST_LEN))
-
-#define SK_I2C_STOP(IoC) {				\
-	SK_U32	I2cCtrl;				\
-	SK_IN32(IoC, B2_I2C_CTRL, &I2cCtrl);		\
-	SK_OUT32(IoC, B2_I2C_CTRL, I2cCtrl | I2C_STOP);	\
-}
-
-#define SK_I2C_GET_CTL(IoC, pI2cCtrl)	SK_IN32(IoC, B2_I2C_CTRL, pI2cCtrl)
-
-/*
- * Macros to access the TWSI SW Registers
- */
-#define SK_I2C_SET_BIT(IoC, SetBits) {			\
-	SK_U8	OrgBits;				\
-	SK_IN8(IoC, B2_I2C_SW, &OrgBits);		\
-	SK_OUT8(IoC, B2_I2C_SW, OrgBits | (SK_U8)(SetBits));	\
-}
-
-#define SK_I2C_CLR_BIT(IoC, ClrBits) {			\
-	SK_U8	OrgBits;				\
-	SK_IN8(IoC, B2_I2C_SW, &OrgBits);		\
-	SK_OUT8(IoC, B2_I2C_SW, OrgBits & ~((SK_U8)(ClrBits)));	\
-}
-
-#define SK_I2C_GET_SW(IoC, pI2cSw)	SK_IN8(IoC, B2_I2C_SW, pI2cSw)
-
-/*
- * define the possible sensor states
- */
-#define	SK_SEN_IDLE		0	/* Idle: sensor not read */
-#define	SK_SEN_VALUE	1	/* Value Read cycle */
-#define	SK_SEN_VALEXT	2	/* Extended Value Read cycle */
-
-/*
- * Conversion factor to convert read Voltage sensor to milli Volt
- * Conversion factor to convert read Temperature sensor to 10th degree Celsius
- */
-#define	SK_LM80_VT_LSB		22	/* 22mV LSB resolution */
-#define	SK_LM80_TEMP_LSB	10	/* 1 degree LSB resolution */
-#define	SK_LM80_TEMPEXT_LSB	 5	/* 0.5 degree LSB resolution for ext. val. */
-
-/*
- * formula: counter = (22500*60)/(rpm * divisor * pulses/2)
- * assuming: 6500rpm, 4 pulses, divisor 1
- */
-#define SK_LM80_FAN_FAKTOR	((22500L*60)/(1*2))
-
-/*
- * Define sensor management data
- * Maximum is reached on Genesis copper dual port and Yukon-64
- * Board specific maximum is in pAC->I2c.MaxSens
- */
-#define	SK_MAX_SENSORS	8	/* maximal no. of installed sensors */
-#define	SK_MIN_SENSORS	5	/* minimal no. of installed sensors */
-
-/*
- * To watch the state machine (SM) use the timer in two ways
- * instead of one as hitherto
- */
-#define	SK_TIMER_WATCH_SM		0	/* Watch the SM to finish in a spec. time */
-#define	SK_TIMER_NEW_GAUGING	1	/* Start a new gauging when timer expires */
-
-/*
- * Defines for the individual thresholds
- */
-
-/* Temperature sensor */
-#define	SK_SEN_TEMP_HIGH_ERR	800	/* Temperature High Err  Threshold */
-#define	SK_SEN_TEMP_HIGH_WARN	700	/* Temperature High Warn Threshold */
-#define	SK_SEN_TEMP_LOW_WARN	100	/* Temperature Low  Warn Threshold */
-#define	SK_SEN_TEMP_LOW_ERR		  0	/* Temperature Low  Err  Threshold */
-
-/* VCC which should be 5 V */
-#define	SK_SEN_PCI_5V_HIGH_ERR		5588	/* Voltage PCI High Err  Threshold */
-#define	SK_SEN_PCI_5V_HIGH_WARN		5346	/* Voltage PCI High Warn Threshold */
-#define	SK_SEN_PCI_5V_LOW_WARN		4664	/* Voltage PCI Low  Warn Threshold */
-#define	SK_SEN_PCI_5V_LOW_ERR		4422	/* Voltage PCI Low  Err  Threshold */
-
-/*
- * VIO may be 5 V or 3.3 V. Initialization takes two parts:
- * 1. Initialize lowest lower limit and highest higher limit.
- * 2. After the first value is read correct the upper or the lower limit to
- *    the appropriate C constant.
- *
- * Warning limits are +-5% of the exepected voltage.
- * Error limits are +-10% of the expected voltage.
- */
-
-/* Bug fix AF: 16.Aug.2001: Correct the init base of LM80 sensor */
-
-#define	SK_SEN_PCI_IO_5V_HIGH_ERR	5566	/* + 10% V PCI-IO High Err Threshold */
-#define	SK_SEN_PCI_IO_5V_HIGH_WARN	5324	/* +  5% V PCI-IO High Warn Threshold */
-					/*		5000	mVolt */
-#define	SK_SEN_PCI_IO_5V_LOW_WARN	4686	/* -  5% V PCI-IO Low Warn Threshold */
-#define	SK_SEN_PCI_IO_5V_LOW_ERR	4444	/* - 10% V PCI-IO Low Err Threshold */
-
-#define	SK_SEN_PCI_IO_RANGE_LIMITER	4000	/* 4000 mV range delimiter */
-
-/* correction values for the second pass */
-#define	SK_SEN_PCI_IO_3V3_HIGH_ERR	3850	/* + 15% V PCI-IO High Err Threshold */
-#define	SK_SEN_PCI_IO_3V3_HIGH_WARN	3674	/* + 10% V PCI-IO High Warn Threshold */
-					/*		3300	mVolt */
-#define	SK_SEN_PCI_IO_3V3_LOW_WARN	2926	/* - 10% V PCI-IO Low Warn Threshold */
-#define	SK_SEN_PCI_IO_3V3_LOW_ERR	2772	/* - 15% V PCI-IO Low Err  Threshold */
-
-/*
- * VDD voltage
- */
-#define	SK_SEN_VDD_HIGH_ERR		3630	/* Voltage ASIC High Err  Threshold */
-#define	SK_SEN_VDD_HIGH_WARN	3476	/* Voltage ASIC High Warn Threshold */
-#define	SK_SEN_VDD_LOW_WARN		3146	/* Voltage ASIC Low  Warn Threshold */
-#define	SK_SEN_VDD_LOW_ERR		2970	/* Voltage ASIC Low  Err  Threshold */
-
-/*
- * PHY PLL 3V3 voltage
- */
-#define	SK_SEN_PLL_3V3_HIGH_ERR		3630	/* Voltage PMA High Err  Threshold */
-#define	SK_SEN_PLL_3V3_HIGH_WARN	3476	/* Voltage PMA High Warn Threshold */
-#define	SK_SEN_PLL_3V3_LOW_WARN		3146	/* Voltage PMA Low  Warn Threshold */
-#define	SK_SEN_PLL_3V3_LOW_ERR		2970	/* Voltage PMA Low  Err  Threshold */
-
-/*
- * VAUX (YUKON only)
- */
-#define	SK_SEN_VAUX_3V3_HIGH_ERR	3630	/* Voltage VAUX High Err Threshold */
-#define	SK_SEN_VAUX_3V3_HIGH_WARN	3476	/* Voltage VAUX High Warn Threshold */
-#define	SK_SEN_VAUX_3V3_LOW_WARN	3146	/* Voltage VAUX Low Warn Threshold */
-#define	SK_SEN_VAUX_3V3_LOW_ERR		2970	/* Voltage VAUX Low Err Threshold */
-#define	SK_SEN_VAUX_0V_WARN_ERR		   0	/* if VAUX not present */
-#define	SK_SEN_VAUX_RANGE_LIMITER	1000	/* 1000 mV range delimiter */
-
-/*
- * PHY 2V5 voltage
- */
-#define	SK_SEN_PHY_2V5_HIGH_ERR		2750	/* Voltage PHY High Err Threshold */
-#define	SK_SEN_PHY_2V5_HIGH_WARN	2640	/* Voltage PHY High Warn Threshold */
-#define	SK_SEN_PHY_2V5_LOW_WARN		2376	/* Voltage PHY Low Warn Threshold */
-#define	SK_SEN_PHY_2V5_LOW_ERR		2222	/* Voltage PHY Low Err Threshold */
-
-/*
- * ASIC Core 1V5 voltage (YUKON only)
- */
-#define	SK_SEN_CORE_1V5_HIGH_ERR	1650	/* Voltage ASIC Core High Err Threshold */
-#define	SK_SEN_CORE_1V5_HIGH_WARN	1575	/* Voltage ASIC Core High Warn Threshold */
-#define	SK_SEN_CORE_1V5_LOW_WARN	1425	/* Voltage ASIC Core Low Warn Threshold */
-#define	SK_SEN_CORE_1V5_LOW_ERR 	1350	/* Voltage ASIC Core Low Err Threshold */
-
-/*
- * FAN 1 speed
- */
-/* assuming: 6500rpm +-15%, 4 pulses,
- * warning at:	80 %
- * error at:	70 %
- * no upper limit
- */
-#define	SK_SEN_FAN_HIGH_ERR		20000	/* FAN Speed High Err Threshold */
-#define	SK_SEN_FAN_HIGH_WARN	20000	/* FAN Speed High Warn Threshold */
-#define	SK_SEN_FAN_LOW_WARN		 5200	/* FAN Speed Low Warn Threshold */
-#define	SK_SEN_FAN_LOW_ERR		 4550	/* FAN Speed Low Err Threshold */
-
-/*
- * Some Voltages need dynamic thresholds
- */
-#define	SK_SEN_DYN_INIT_NONE		 0  /* No dynamic init of thresholds */
-#define	SK_SEN_DYN_INIT_PCI_IO		10  /* Init PCI-IO with new thresholds */
-#define	SK_SEN_DYN_INIT_VAUX		11  /* Init VAUX with new thresholds */
-
-extern	int SkLm80ReadSensor(SK_AC *pAC, SK_IOC IoC, SK_SENSOR *pSen);
-#endif	/* n_INC_SKGEI2C_H */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skgeinit.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skgeinit.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skgeinit.h	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skgeinit.h	2004-09-09 13:20:48.000000000 +0200
@@ -2,8 +2,8 @@
  *
  * Name:	skgeinit.h
  * Project:	Gigabit Ethernet Adapters, Common Modules
- * Version:	$Revision: 1.84 $
- * Date:	$Date: 2003/12/23 14:17:01 $
+ * Version:	$Revision: 2.30 $
+ * Date:	$Date: 2004/08/13 09:12:18 $
  * Purpose:	Structures and prototypes for the GE Init Module
  *
  ******************************************************************************/
@@ -11,13 +11,12 @@
 /******************************************************************************
  *
  *	(C)Copyright 1998-2002 SysKonnect.
- *	(C)Copyright 2002-2003 Marvell.
+ *	(C)Copyright 2002-2004 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
  *	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.
  *
  ******************************************************************************/
@@ -60,14 +59,17 @@ extern "C" {
 #define SK_XMIT_DUR		0x002faf08UL	/*  50 ms */
 #define SK_BLK_DUR		0x01dcd650UL	/* 500 ms */
 
-#define SK_DPOLL_DEF	0x00ee6b28UL	/* 250 ms at 62.5 MHz */
+#define SK_DPOLL_DEF	0x00ee6b28UL	/* 250 ms at 62.5 MHz (Genesis) */
+#define SK_DPOLL_DEF_Y2	0x0000124fUL	/*  75 us (Yukon-2) */
 
 #define SK_DPOLL_MAX	0x00ffffffUL	/* 268 ms at 62.5 MHz */
-										/* 215 ms at 78.12 MHz */
+										/* 215 ms at 78.12 MHz (Yukon) */
 
 #define SK_FACT_62		100			/* is given in percent */
 #define SK_FACT_53		 85         /* on GENESIS:	53.12 MHz */
 #define SK_FACT_78		125			/* on YUKON:	78.12 MHz */
+#define SK_FACT_100		161			/* on YUKON-FE:	100 MHz */
+#define SK_FACT_125		202			/* on YUKON-EC:	125 MHz */
 
 /* Timeout values */
 #define SK_MAC_TO_53	72			/* MAC arbiter timeout */
@@ -83,10 +85,16 @@ extern "C" {
 #define SK_RB_LLPP_B	(16 * 1024)	/* Lower Level for big Queues */
 
 #ifndef SK_BMU_RX_WM
-#define SK_BMU_RX_WM	0x600		/* BMU Rx Watermark */
+#define SK_BMU_RX_WM		0x600	/* BMU Rx Watermark */
 #endif
+
 #ifndef SK_BMU_TX_WM
-#define SK_BMU_TX_WM	0x600		/* BMU Tx Watermark */
+#define SK_BMU_TX_WM		0x600	/* BMU Tx Watermark */
+#endif
+
+/* performance sensitive drivers should set this define to 0x80 */
+#ifndef SK_BMU_RX_WM_PEX
+#define SK_BMU_RX_WM_PEX	0x600	/* BMU Rx Watermark for PEX */
 #endif
 
 /* XMAC II Rx High Watermark */
@@ -104,31 +112,25 @@ extern "C" {
 #define SK_JUMBO_LINK	3		/* driver uses jumbo frames */
 
 /* Minimum RAM Buffer Rx Queue Size */
-#define SK_MIN_RXQ_SIZE	16		/* 16 kB */
+#define SK_MIN_RXQ_SIZE	(((pAC)->GIni.GIYukon2) ? 10 : 16)		/* 10/16 kB */
 
 /* Minimum RAM Buffer Tx Queue Size */
-#define SK_MIN_TXQ_SIZE	16		/* 16 kB */
+#define SK_MIN_TXQ_SIZE	(((pAC)->GIni.GIYukon2) ? 10 : 16)		/* 10/16 kB */
 
-/* Queue Size units */
+/* Queue Size units (Genesis/Yukon) */
 #define QZ_UNITS		7
 #define QZ_STEP			8
 
+/* Queue Size units (Yukon-2) */
+#define QZ_STEP_Y2		1
+
 /* Percentage of queue size from whole memory */
 /* 80 % for receive */
 #define RAM_QUOTA_RX	80
-/*  0 % for sync transfer */
+/* 0% for sync transfer */
 #define	RAM_QUOTA_SYNC	0
 /* the rest (20%) is taken for async transfer */
 
-/* Get the rounded queue size in Bytes in 8k steps */
-#define ROUND_QUEUE_SIZE(SizeInBytes)					\
-	((((long)(SizeInBytes) + (QZ_STEP*1024L)-1) / 1024) &	\
-	~(QZ_STEP-1))
-
-/* Get the rounded queue size in KBytes in 8k steps */
-#define ROUND_QUEUE_SIZE_KB(Kilobytes) \
-	ROUND_QUEUE_SIZE((Kilobytes) * 1024L)
-
 /* Types of RAM Buffer Queues */
 #define SK_RX_SRAM_Q	1	/* small receive queue */
 #define SK_RX_BRAM_Q	2	/* big receive queue */
@@ -266,10 +268,15 @@ extern "C" {
 
 /* PHY power down modes */
 #define PHY_PM_OPERATIONAL_MODE		0	/* PHY operational mode */
-#define PHY_PM_DEEP_SLEEP			1	/* coma mode --> minimal power */
+#define PHY_PM_DEEP_SLEEP			1	/* Coma mode --> minimal power */
 #define PHY_PM_IEEE_POWER_DOWN		2	/* IEEE 22.2.4.1.5 compl. power down */
-#define PHY_PM_ENERGY_DETECT		3	/* energy detect */
-#define PHY_PM_ENERGY_DETECT_PLUS	4	/* energy detect plus */
+#define PHY_PM_ENERGY_DETECT		3	/* Energy detect */
+#define PHY_PM_ENERGY_DETECT_PLUS	4	/* Energy detect plus */
+
+/* PCI Bus Types */
+#define SK_PCI_BUS		0x0001		/* normal PCI bus */
+#define SK_PCIX_BUS		0x0002      /* PCI-X bus */
+#define SK_PEX_BUS		0x0004      /* PCI-Express bus */
 
 /* Default receive frame limit for Workaround of XMAC Errata */
 #define SK_DEF_RX_WA_LIM	SK_CONSTU64(100)
@@ -278,6 +285,7 @@ extern "C" {
 #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 */
+#define SK_DUAL_LED_ACT_LNK	(1<<3)	/* Dual LED ACT/LNK configuration */
 
 /* Link Partner Status */
 #define SK_LIPA_UNKNOWN	0	/* Link partner is in unknown state */
@@ -290,9 +298,148 @@ extern "C" {
 /* Max. Auto-neg. timeouts before link detection in sense mode is reset */
 #define SK_MAX_ANEG_TO	10	/* Max. 10 times the sense mode is reset */
 
+
+/******************************************************************************
+ *
+ * HW_FEATURE() macro
+ */
+
+/* DWORD 0: Features */
+#define HWF_SYNC_TX_SUP			0x00800000UL	/* synch tx queue available */
+#define HWF_SINGLE_PORT_DEVICE	0x00400000UL	/* device has only one LAN IF */
+#define HWF_JUMBO_FRAMES_SUP	0x00200000UL	/* Jumbo frames supported */
+#define HWF_TX_TCP_CSUM_SUP		0x00100000UL	/* TCP tx checksum supported */
+#define HWF_TX_UDP_CSUM_SUP		0x00080000UL	/* UDP tx checksum supported */
+#define HWF_RX_CSUM_SUP			0x00040000UL	/* RX checksum supported */
+#define HWF_TCP_SEGM_SUP		0x00020000UL	/* TCP segmentation supported */
+#define HWF_RSS_HASH_SUP		0x00010000UL	/* RSS Hash supported */
+#define HWF_PORT_VLAN_SUP		0x00008000UL	/* VLAN can be config per port*/
+#define HWF_ROLE_PARAM_SUP		0x00004000UL	/* Role parameter supported */
+#define HWF_LOW_PMODE_SUP		0x00002000UL	/* Low Power Mode supported */
+#define HWF_ENERGIE_DEMO_SUP	0x00001000UL	/* Energie detect mode supp. */
+#define HWF_SPEED1000_SUP		0x00000800UL	/* Line Speed 1000 supported */
+#define HWF_SPEED100_SUP		0x00000400UL	/* Line Speed 100 supported */
+#define HWF_SPEED10_SUP			0x00000200UL	/* Line Speed 10 supported */
+#define HWF_AUTONEGSENSE_SUP	0x00000100UL	/* Autoneg Sense supported */
+#define HWF_PHY_LOOPB_MD_SUP	0x00000080UL	/* PHY loopback mode supp. */
+#define HWF_ASF_SUP				0x00000040UL	/* ASF support possible */
+#define HWF_QS_STEPS_1kB		0x00000020UL	/* The rx/tx queues can be */
+												/* configured in units of 1 kB*/
+#define HWF_OWN_RAM_PER_PORT	0x00000010UL	/* Each port has a separate */
+												/* RAM buffer */
+#define HWF_MIN_LED_IF			0x00000008UL	/* Minimal LED interface */
+												/* (e.g. for Yukon-EC) */
+#define HWF_LIST_ELEMENTS_USED	0x00000004UL	/* HW uses list elements */
+												/* (otherwise desc. are used) */
+#define HWF_GMAC_INSIDE			0x00000002UL	/* device contains GMAC */
+#define HWF_TWSI_PRESENT		0x00000001UL	/* TWSI sensor bus present */
+
+/*-RMV- DWORD 1: Deviations */
+#define HWF_WA_DEV_427			0x10000400UL	/*-RMV- 4.27 (Tx Done Rep) */
+#define HWF_WA_DEV_42			0x10000200UL	/*-RMV- 4.2 (pref unit burst)*/
+#define HWF_WA_DEV_46			0x10000100UL	/*-RMV- 4.6 (CPU crash II) */
+#define HWF_WA_DEV_43_418		0x10000080UL	/*-RMV- 4.3 & 4.18 (PCI unexp */
+												/*-RMV- compl&Stat BMU deadl) */
+#define HWF_WA_DEV_420			0x10000040UL	/*-RMV- 4.20 (Status BMU ov) */
+#define HWF_WA_DEV_423			0x10000020UL	/*-RMV- 4.23 (TCP Segm Hang) */
+#define HWF_WA_DEV_424			0x10000010UL	/*-RMV- 4.24 (MAC reg over wr)*/
+#define HWF_WA_DEV_425			0x10000008UL	/*-RMV- 4.25 (Magic packet */
+												/*-RMV- with odd offset) */
+#define HWF_WA_DEV_428			0x10000004UL	/*-RMV- 4.28 (Poll-U &BigEndi)*/
+#define HWF_WA_FIFO_FLUSH_YLA0	0x10000002UL	/*-RMV- dis Rx GMAC FIFO Flush*/
+												/*-RMV- for Yu-L Rev. A0 only */
+#define HWF_WA_COMA_MODE		0x10000001UL	/*-RMV- Coma Mode WA req */
+
+/* DWORD 2: still unused */
+/* DWORD 3: still unused */
+
+
+/*
+ * HW_FEATURE()	-	returns whether the feature is serviced or not
+ */
+#define HW_FEATURE(pAC, ReqFeature) \
+	(((pAC)->GIni.HwF.Features[((ReqFeature) & 0x30000000UL) >> 28] &\
+	 ((ReqFeature) & 0x0fffffffUL)) != 0)
+
+#define HW_FEAT_LIST	0
+#define HW_DEV_LIST		1
+
+#define SET_HW_FEATURE_MASK(pAC, List, OffMaskValue, OnMaskValue) {	\
+	if ((List) == HW_FEAT_LIST || (List) == HW_DEV_LIST) {			\
+		(pAC)->GIni.HwF.OffMask[List] = (OffMaskValue);				\
+		(pAC)->GIni.HwF.OnMask[List] = (OnMaskValue);				\
+	}																\
+}
+
+/* driver access macros for GIni structure ***********************************/
+
+#define CHIP_ID_YUKON_2(pAC)		((pAC)->GIni.GIYukon2)
+#define HW_SYNC_TX_SUPPORTED(pAC)						\
+		((pAC)->GIni.GIChipId != CHIP_ID_YUKON_EC &&	\
+		 (pAC)->GIni.GIChipId != CHIP_ID_YUKON_FE)
+
+#define HW_MS_TO_TICKS(pAC, MsTime) \
+	((MsTime) * (62500L/100) * (pAC)->GIni.GIHstClkFact)
+
+#if 0
+/* still under construction */
+#define HW_IS_SINGLE_PORT(pAC)		((pAC)->GIni.GIMacsFound == 1)
+#define HW_NUMBER_OF_PORTS(pAC)		((pAC)->GIni.GIMacsFound)
+
+#define HW_TX_UDP_CSUM_SUPPORTED(pAC) \
+	((((pAC)->GIni.GIChipId >= CHIP_ID_YUKON) && ((pAC)->GIni.GIChipRev != 0))
+
+#define HW_DEFAULT_LINESPEED(pAC)	\
+	((!(pAC)->GIni.GIGenesis && (pAC)->GIni.GICopperType) ? \
+	SK_LSPEED_AUTO : SK_LSPEED_1000MBPS)
+
+#define HW_ROLE_PARAM_SUPPORTED(pAC)	((pAC)->GIni.GICopperType)
+
+#define HW_SPEED1000_SUPPORTED(pAC, Port)		\
+	 ((pAC)->GIni.GP[Port].PLinkSpeedCap & SK_LSPEED_CAP_1000MBPS)
+
+#define HW_SPEED100_SUPPORTED(pAC, Port)		\
+	 ((pAC)->GIni.GP[Port].PLinkSpeedCap & SK_LSPEED_CAP_100MBPS)
+
+#define HW_SPEED10_SUPPORTED(pAC, Port)		\
+	 ((pAC)->GIni.GP[Port].PLinkSpeedCap & SK_LSPEED_CAP_10MBPS)
+
+#define HW_AUTONEGSENSE_SUPPORTED(pAC)  ((pAC)->GIni.GP[0].PhyType==SK_PHY_XMAC)
+
+#define HW_FREQ_TO_CARD_TICKS(pAC, AdapterClkSpeed, Freq) \
+	(((AdapterClkSpeed / 100) * (pAC)->GIni.GIHstClkFact) / Freq)
+
+#define HW_IS_LINK_UP(pAC, Port)		((pAC)->GIni.GP[Port].PHWLinkUp)
+#define HW_LINK_SPEED_USED(pAC, Port)	((pAC)->GIni.GP[Port].PLinkSpeedUsed)
+#define HW_RAM_SIZE(pAC)				((pAC)->GIni.GIRamSize)
+
+#define HW_ENA_JUMBO_FRAME_SUPPORT(pAC) (pAC)->GIni.GIPortUsage = SK_JUMBO_LINK
+#define HW_DIS_JUMBO_FRAME_SUPPORT(pAC) (pAC)->GIni.GIPortUsage = ????
+#define HW_PHY_LP_MODE_SUPPORTED(pAC)	(pAC0->???
+#define HW_ASF_ACTIVE(pAC)				???
+#define RAWIO_OUT32(pAC, pAC->RegIrqMask, pAC->GIni.GIValIrqMask)...
+
+/* macro to check whether tx csum is supported */
+#define HW_TX_CSUM_SUPPORTED(pAC)	((pAC)->GIni.GIChipId != CHIP_ID_GENESIS)
+
+BMU_UDP_CHECK : BMU_TCP_CHECK;
+
+/* macro for - Own Bit mirrored to DWORD7 (Yukon LP receive descriptor) */
+#endif /* 0 */
+
+
 /* structures *****************************************************************/
 
 /*
+ * HW Feature structure
+ */
+typedef struct s_HwFeatures {
+	SK_U32	Features[4];	/* Feature list */
+	SK_U32	OffMask[4];		/* Off Mask */
+	SK_U32	OnMask[4];		/* On Mask */
+} SK_HW_FEATURES;
+
+/*
  * MAC specific functions
  */
 typedef struct s_GeMacFunc {
@@ -300,6 +447,7 @@ typedef struct s_GeMacFunc {
 	int	(*pFnMacStatistic)(SK_AC *, SK_IOC, unsigned int, SK_U16, SK_U32 SK_FAR *);
 	int	(*pFnMacResetCounter)(SK_AC *, SK_IOC, unsigned int);
 	int	(*pFnMacOverflow)(SK_AC *, SK_IOC, unsigned int, SK_U16, SK_U64 SK_FAR *);
+	void (*pSkGeSirqIsr)(SK_AC *, SK_IOC, SK_U32);
 #ifdef SK_DIAG
 	int	(*pFnMacPhyRead)(SK_AC *, SK_IOC, int, int, SK_U16 SK_FAR *);
 	int	(*pFnMacPhyWrite)(SK_AC *, SK_IOC, int, int, SK_U16);
@@ -310,10 +458,10 @@ typedef struct s_GeMacFunc {
  * Port Structure
  */
 typedef	struct s_GePort {
-#if (!defined(SK_DIAG) || defined(VCPU))
+#ifndef SK_DIAG
 	SK_TIMER	PWaTimer;	/* Workaround Timer */
 	SK_TIMER	HalfDupChkTimer;
-#endif /* !SK_DIAG || VCPU */
+#endif /* !SK_DIAG */
 	SK_U32	PPrevShorts;	/* Previous Short Counter checking */
 	SK_U32	PPrevFcs;		/* Previous FCS Error Counter checking */
 	SK_U64	PPrevRx;		/* Previous RxOk Counter checking */
@@ -369,6 +517,8 @@ typedef	struct s_GePort {
 	int		PMacJamLen;		/* MAC Jam length */
 	int		PMacJamIpgVal;	/* MAC Jam IPG */
 	int		PMacJamIpgData;	/* MAC IPG Jam to Data */
+	int		PMacBackOffLim;	/* MAC Back-off Limit */
+	int		PMacDataBlind;	/* MAC Data Blinder */
 	int		PMacIpgData;	/* MAC Data IPG */
 	SK_BOOL PMacLimit4;		/* reset collision counter and backoff algorithm */
 } SK_GEPORT;
@@ -381,9 +531,11 @@ typedef	struct s_GeInit {
 	int			GIChipId;		/* Chip Identification Number */
 	int			GIChipRev;		/* Chip Revision Number */
 	SK_U8		GIPciHwRev;		/* PCI HW Revision Number */
+	SK_U8		GIPciBus;		/* PCI Bus Type (PCI / PCIX / PEX)*/
 	SK_BOOL		GIGenesis;		/* Genesis adapter ? */
-	SK_BOOL		GIYukon;		/* YUKON-Family chip */
-	SK_BOOL		GIYukonLite;	/* YUKON-Lite (Plus) chip */
+	SK_BOOL		GIYukon;		/* YUKON family (1 and 2) */
+	SK_BOOL		GIYukonLite;	/* YUKON-Lite chip */
+	SK_BOOL		GIYukon2;		/* YUKON-2 chip (-XL, -EC or -FE) */
 	SK_U8		GIConTyp;		/* Connector Type */
 	SK_U8		GIPmdTyp;		/* PMD Type */
 	SK_BOOL		GICopperType;	/* Copper Type adapter ? */
@@ -391,10 +543,12 @@ typedef	struct s_GeInit {
 	SK_BOOL		GIPciClock66;	/* 66 MHz PCI Clock */
 	SK_BOOL		GIVauxAvail;	/* VAUX available (YUKON) */
 	SK_BOOL		GIYukon32Bit;	/* 32-Bit YUKON adapter */
+	SK_BOOL		GIAsfEnabled;	/* ASF subsystem enabled */
 	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			GIChipCap;		/* Adapter's Capabilities */
+	int			GIHstClkFact;	/* Host Clock Factor (HstClk / 62.5 * 100) */
 	int			GIPortUsage;	/* Driver Port Usage */
 	int			GILevel;		/* Initialization Level completed */
 	int			GIRamSize;		/* The RAM size of the adapter in kB */
@@ -402,8 +556,10 @@ typedef	struct s_GeInit {
 	SK_U32		GIRamOffs;		/* RAM Address Offset for addr calculation */
 	SK_U32		GIPollTimerVal;	/* Descr. Poll Timer Init Val (HstClk ticks) */
 	SK_U32		GIValIrqMask;	/* Value for Interrupt Mask */
+	SK_U32		GIValHwIrqMask;	/* Value for Interrupt Mask */
 	SK_U32		GITimeStampCnt;	/* Time Stamp High Counter (YUKON only) */
 	SK_GEPORT	GP[SK_MAX_MACS];/* Port Dependent Information */
+	SK_HW_FEATURES HwF;			/* HW Features struct */
 	SK_GEMACFUNC GIFunc;		/* MAC depedent functions */
 } SK_GEINIT;
 
@@ -468,6 +624,24 @@ typedef	struct s_GeInit {
 /*
  * public functions in skgeinit.c
  */
+extern void SkGePortVlan(
+	SK_AC	*pAC,
+	SK_IOC	IoC,
+	int		Port,
+	SK_BOOL Enable);
+
+extern void SkGeRxRss(
+	SK_AC	*pAC,
+	SK_IOC	IoC,
+	int		Port,
+	SK_BOOL	Enable);
+
+extern void SkGeRxCsum(
+	SK_AC	*pAC,
+	SK_IOC	IoC,
+	int		Port,
+	SK_BOOL Enable);
+
 extern void	SkGePollRxD(
 	SK_AC	*pAC,
 	SK_IOC	IoC,
@@ -733,6 +907,7 @@ extern int SkGmCableDiagStatus(
 	int		Port,
 	SK_BOOL	StartTest);
 
+#ifdef SK_PHY_LP_MODE
 extern int SkGmEnterLowPowerMode(
 	SK_AC	*pAC,
 	SK_IOC	IoC,
@@ -743,6 +918,7 @@ extern int SkGmLeaveLowPowerMode(
 	SK_AC	*pAC,
 	SK_IOC	IoC,
 	int		Port);
+#endif /* SK_PHY_LP_MODE */
 
 #ifdef SK_DIAG
 extern void	SkGePhyRead(
@@ -798,6 +974,9 @@ extern int	SkGeInitPort();
 extern void	SkGeXmitLED();
 extern void	SkGeInitRamIface();
 extern int	SkGeInitAssignRamToQueues();
+extern void SkGePortVlan();
+extern void SkGeRxCsum();
+extern void SkGeRxRss();
 
 /*
  * public functions in skxmac2.c
@@ -836,8 +1015,10 @@ extern int	SkGmResetCounter();
 extern int	SkXmOverflowStatus();
 extern int	SkGmOverflowStatus();
 extern int	SkGmCableDiagStatus();
+#ifdef SK_PHY_LP_MODE
 extern int	SkGmEnterLowPowerMode();
 extern int	SkGmLeaveLowPowerMode();
+#endif /* SK_PHY_LP_MODE */
 
 #ifdef SK_DIAG
 extern void	SkGePhyRead();
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skgepnm2.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skgepnm2.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skgepnm2.h	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skgepnm2.h	2004-09-09 13:20:48.000000000 +0200
@@ -2,8 +2,8 @@
  *
  * Name:	skgepnm2.h
  * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.36 $
- * Date:	$Date: 2003/05/23 12:45:13 $
+ * Version:	$Revision: 2.3 $
+ * Date:	$Date: 2004/03/19 16:19:59 $
  * Purpose:	Defines for Private Network Management Interface
  *
  ****************************************************************************/
@@ -70,9 +70,9 @@
 /*
  * VCT internal status values
  */
-#define SK_PNMI_VCT_PENDING	32
-#define SK_PNMI_VCT_TEST_DONE	64
-#define SK_PNMI_VCT_LINK	128
+#define SK_PNMI_VCT_PENDING		0x20
+#define SK_PNMI_VCT_TEST_DONE	0x40
+#define SK_PNMI_VCT_LINK		0x80
 
 /*
  * Internal table definitions
@@ -323,7 +323,7 @@ typedef struct s_PnmiStatAddr {
 						vSt, \
 						pAC->Pnmi.MacUpdatedFlag, \
 						pAC->Pnmi.RlmtUpdatedFlag, \
-						pAC->Pnmi.SirqUpdatedFlag))}}
+						pAC->Pnmi.SirqUpdatedFlag));}}
 
 #else	/* !DEBUG */
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skgepnmi.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skgepnmi.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skgepnmi.h	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skgepnmi.h	2004-09-09 13:20:48.000000000 +0200
@@ -1,9 +1,9 @@
 /*****************************************************************************
  *
  * Name:	skgepnmi.h
- * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.62 $
- * Date:	$Date: 2003/08/15 12:31:52 $
+ * Project:	Gigabit Ethernet Adapters, PNMI-Module
+ * Version:	$Revision: 2.8 $
+ * Date:	$Date: 2004/06/14 06:55:26 $
  * Purpose:	Defines for Private Network Management Interface
  *
  ****************************************************************************/
@@ -31,7 +31,7 @@
 #include "h/sktypes.h"
 #include "h/skerror.h"
 #include "h/sktimer.h"
-#include "h/ski2c.h"
+#include "h/sktwsi.h"
 #include "h/skaddr.h"
 #include "h/skrlmt.h"
 #include "h/skvpd.h"
@@ -41,7 +41,6 @@
  */
 #define SK_PNMI_MDB_VERSION		0x00030001	/* 3.1 */
 
-
 /*
  * Event definitions
  */
@@ -54,16 +53,13 @@
 #define SK_PNMI_EVT_UTILIZATION_TIMER	7	/* Timer event for Utiliza. */
 #define SK_PNMI_EVT_CLEAR_COUNTER		8	/* Clear statistic counters */
 #define SK_PNMI_EVT_XMAC_RESET			9	/* XMAC will be reset */
-
 #define SK_PNMI_EVT_RLMT_PORT_UP		10	/* Port came logically up */
 #define SK_PNMI_EVT_RLMT_PORT_DOWN		11	/* Port went logically down */
 #define SK_PNMI_EVT_RLMT_SEGMENTATION	13	/* Two SP root bridges found */
 #define SK_PNMI_EVT_RLMT_ACTIVE_DOWN	14	/* Port went logically down */
 #define SK_PNMI_EVT_RLMT_ACTIVE_UP		15	/* Port came logically up */
-#define SK_PNMI_EVT_RLMT_SET_NETS		16	/* 1. Parameter is number of nets
-												1 = single net; 2 = dual net */
-#define SK_PNMI_EVT_VCT_RESET		17	/* VCT port reset timer event started with SET. */
-
+#define SK_PNMI_EVT_RLMT_SET_NETS		16	/* Number of nets (1 or 2). */
+#define SK_PNMI_EVT_VCT_RESET			17	/* VCT port reset timer event started with SET. */
 
 /*
  * Return values
@@ -78,7 +74,6 @@
 #define SK_PNMI_ERR_UNKNOWN_NET 	7
 #define SK_PNMI_ERR_NOT_SUPPORTED	10
 
-
 /*
  * Return values of driver reset function SK_DRIVER_RESET() and
  * driver event function SK_DRIVER_EVENT()
@@ -86,19 +81,17 @@
 #define SK_PNMI_ERR_OK			0
 #define SK_PNMI_ERR_FAIL		1
 
-
 /*
  * Return values of driver test function SK_DRIVER_SELFTEST()
  */
 #define SK_PNMI_TST_UNKNOWN		(1 << 0)
-#define SK_PNMI_TST_TRANCEIVER		(1 << 1)
+#define SK_PNMI_TST_TRANCEIVER	(1 << 1)
 #define SK_PNMI_TST_ASIC		(1 << 2)
 #define SK_PNMI_TST_SENSOR		(1 << 3)
-#define SK_PNMI_TST_POWERMGMT		(1 << 4)
+#define SK_PNMI_TST_POWERMGMT	(1 << 4)
 #define SK_PNMI_TST_PCI			(1 << 5)
 #define SK_PNMI_TST_MAC			(1 << 6)
 
-
 /*
  * RLMT specific definitions
  */
@@ -352,6 +345,7 @@
 #define OID_SKGE_VCT_GET				0xFF020200
 #define OID_SKGE_VCT_SET				0xFF020201
 #define OID_SKGE_VCT_STATUS				0xFF020202
+#define OID_SKGE_VCT_CAPABILITIES		0xFF020203
 
 #ifdef SK_DIAG_SUPPORT
 /* Defines for driver DIAG mode. */
@@ -367,22 +361,66 @@
 #define OID_SKGE_PHY_TYPE				0xFF020215
 #define OID_SKGE_PHY_LP_MODE			0xFF020216
 
+/*
+ * Added for new DualNet IM driver V2
+ * these OIDs should later  be in pnmi.h
+ */
+#define OID_SKGE_MAC_COUNT		0xFF020217
+#define OID_SKGE_DUALNET_MODE		0xFF020218
+#define OID_SKGE_SET_TAGHEADER	0xFF020219
+
+#ifdef SK_ASF
+/* Defines for ASF */
+#define OID_SKGE_ASF                    0xFF02021a
+#define OID_SKGE_ASF_STORE_CONFIG       0xFF02021b
+#define OID_SKGE_ASF_ENA                0xFF02021c
+#define OID_SKGE_ASF_RETRANS            0xFF02021d
+#define OID_SKGE_ASF_RETRANS_INT        0xFF02021e
+#define OID_SKGE_ASF_HB_ENA             0xFF02021f
+#define OID_SKGE_ASF_HB_INT             0xFF020220
+#define OID_SKGE_ASF_WD_ENA             0xFF020221
+#define OID_SKGE_ASF_WD_TIME            0xFF020222
+#define OID_SKGE_ASF_IP_SOURCE          0xFF020223
+#define OID_SKGE_ASF_MAC_SOURCE			0xFF020224
+#define OID_SKGE_ASF_IP_DEST            0xFF020225
+#define OID_SKGE_ASF_MAC_DEST           0xFF020226
+#define OID_SKGE_ASF_COMMUNITY_NAME     0xFF020227
+#define OID_SKGE_ASF_RSP_ENA            0xFF020228  
+#define OID_SKGE_ASF_RETRANS_COUNT_MIN	0xFF020229
+#define OID_SKGE_ASF_RETRANS_COUNT_MAX	0xFF02022a
+#define OID_SKGE_ASF_RETRANS_INT_MIN	0xFF02022b
+#define OID_SKGE_ASF_RETRANS_INT_MAX	0xFF02022c
+#define OID_SKGE_ASF_HB_INT_MIN			0xFF02022d
+#define OID_SKGE_ASF_HB_INT_MAX			0xFF02022e
+#define OID_SKGE_ASF_WD_TIME_MIN		0xFF02022f
+#define OID_SKGE_ASF_WD_TIME_MAX		0xFF020230
+#define OID_SKGE_ASF_HB_CAP				0xFF020231
+#define OID_SKGE_ASF_WD_TIMER_RES		0xFF020232
+#define OID_SKGE_ASF_GUID				0xFF020233
+#define OID_SKGE_ASF_KEY_OP				0xFF020234
+#define OID_SKGE_ASF_KEY_ADM			0xFF020235
+#define OID_SKGE_ASF_KEY_GEN			0xFF020236
+#define OID_SKGE_ASF_CAP				0xFF020237
+#define OID_SKGE_ASF_PAR_1				0xFF020238
+#define OID_SKGE_ASF_OVERALL_OID        0xFF020239
+#endif /* SK_ASF */
+
 /* VCT struct to store a backup copy of VCT data after a port reset. */
 typedef struct s_PnmiVct {
 	SK_U8			VctStatus;
-	SK_U8			PCableLen;
-	SK_U32			PMdiPairLen[4];
-	SK_U8			PMdiPairSts[4];
+	SK_U8			CableLen;
+	SK_U32			MdiPairLen[4];
+	SK_U8			MdiPairSts[4];
 } SK_PNMI_VCT;
 
 
 /* VCT status values (to be given to CPA via OID_SKGE_VCT_STATUS). */
-#define SK_PNMI_VCT_NONE		0
-#define SK_PNMI_VCT_OLD_VCT_DATA	1
-#define SK_PNMI_VCT_NEW_VCT_DATA	2
-#define SK_PNMI_VCT_OLD_DSP_DATA	4
-#define SK_PNMI_VCT_NEW_DSP_DATA	8
-#define SK_PNMI_VCT_RUNNING		16
+#define SK_PNMI_VCT_NONE			0x00
+#define SK_PNMI_VCT_OLD_VCT_DATA	0x01
+#define SK_PNMI_VCT_NEW_VCT_DATA	0x02
+#define SK_PNMI_VCT_OLD_DSP_DATA	0x04
+#define SK_PNMI_VCT_NEW_DSP_DATA	0x08
+#define SK_PNMI_VCT_RUNNING			0x10
 
 
 /* VCT cable test status. */
@@ -390,7 +428,12 @@ typedef struct s_PnmiVct {
 #define SK_PNMI_VCT_SHORT_CABLE			1
 #define SK_PNMI_VCT_OPEN_CABLE			2
 #define SK_PNMI_VCT_TEST_FAIL			3
-#define SK_PNMI_VCT_IMPEDANCE_MISMATCH		4
+#define SK_PNMI_VCT_IMPEDANCE_MISMATCH	4
+#define SK_PNMI_VCT_NOT_PRESENT			5
+
+/* VCT capabilities (needed for OID_SKGE_VCT_CAPABILITIES. */
+#define SK_PNMI_VCT_SUPPORTED			1
+#define SK_PNMI_VCT_NOT_SUPPORTED		0
 
 #define	OID_SKGE_TRAP_SEN_WAR_LOW		500
 #define OID_SKGE_TRAP_SEN_WAR_UPP		501
@@ -419,7 +462,6 @@ typedef struct s_PnmiVct {
 #define	SK_SET_FULL_MIB			5
 #define	SK_PRESET_FULL_MIB		6
 
-
 /*
  * Define error numbers and messages for syslog
  */
@@ -452,7 +494,7 @@ typedef struct s_PnmiVct {
 #define SK_PNMI_ERR014		(SK_ERRBASE_PNMI + 14)
 #define SK_PNMI_ERR014MSG	"Vpd: Cannot read VPD keys"
 #define SK_PNMI_ERR015		(SK_ERRBASE_PNMI + 15)
-#define SK_PNMI_ERR015MSG	"Vpd: Internal array for VPD keys to small"
+#define SK_PNMI_ERR015MSG	"Vpd: Internal array for VPD keys too small"
 #define SK_PNMI_ERR016		(SK_ERRBASE_PNMI + 16)
 #define SK_PNMI_ERR016MSG	"Vpd: Key string too long"
 #define SK_PNMI_ERR017		(SK_ERRBASE_PNMI + 17)
@@ -494,9 +536,9 @@ typedef struct s_PnmiVct {
 #define SK_PNMI_ERR036		(SK_ERRBASE_PNMI + 36)
 #define SK_PNMI_ERR036MSG	""
 #define SK_PNMI_ERR037		(SK_ERRBASE_PNMI + 37)
-#define SK_PNMI_ERR037MSG	"Rlmt: SK_RLMT_MODE_CHANGE event return not 0"
+#define SK_PNMI_ERR037MSG	"Rlmt: SK_RLMT_MODE_CHANGE event returned not 0"
 #define SK_PNMI_ERR038		(SK_ERRBASE_PNMI + 38)
-#define SK_PNMI_ERR038MSG	"Rlmt: SK_RLMT_PREFPORT_CHANGE event return not 0"
+#define SK_PNMI_ERR038MSG	"Rlmt: SK_RLMT_PREFPORT_CHANGE event returned not 0"
 #define SK_PNMI_ERR039		(SK_ERRBASE_PNMI + 39)
 #define SK_PNMI_ERR039MSG	"RlmtStat: Unknown OID"
 #define SK_PNMI_ERR040		(SK_ERRBASE_PNMI + 40)
@@ -514,9 +556,9 @@ typedef struct s_PnmiVct {
 #define SK_PNMI_ERR046		(SK_ERRBASE_PNMI + 46)
 #define SK_PNMI_ERR046MSG	"Monitor: Unknown OID"
 #define SK_PNMI_ERR047		(SK_ERRBASE_PNMI + 47)
-#define SK_PNMI_ERR047MSG	"SirqUpdate: Event function returns not 0"
+#define SK_PNMI_ERR047MSG	"SirqUpdate: Event function returned not 0"
 #define SK_PNMI_ERR048		(SK_ERRBASE_PNMI + 48)
-#define SK_PNMI_ERR048MSG	"RlmtUpdate: Event function returns not 0"
+#define SK_PNMI_ERR048MSG	"RlmtUpdate: Event function returned not 0"
 #define SK_PNMI_ERR049		(SK_ERRBASE_PNMI + 49)
 #define SK_PNMI_ERR049MSG	"SkPnmiInit: Invalid size of 'CounterOffset' struct!!"
 #define SK_PNMI_ERR050		(SK_ERRBASE_PNMI + 50)
@@ -826,23 +868,25 @@ typedef struct s_PnmiStrucData {
 } SK_PNMI_STRUCT_DATA;
 
 #define SK_PNMI_STRUCT_SIZE	(sizeof(SK_PNMI_STRUCT_DATA))
+
+/* The ReturnStatus field must be located before VpdFreeBytes! */
 #define SK_PNMI_MIN_STRUCT_SIZE	((unsigned int)(SK_UPTR)\
 				 &(((SK_PNMI_STRUCT_DATA *)0)->VpdFreeBytes))
-														/*
-														 * ReturnStatus field
-														 * must be located
-														 * before VpdFreeBytes
-														 */
 
 /*
  * Various definitions
  */
+#define SK_PNMI_EVT_TIMER_CHECK		28125000L	/* 28125 ms */
+
+#define SK_PNMI_VCT_TIMER_CHECK		 4000000L	/* 4 sec. */
+
 #define SK_PNMI_MAX_PROTOS		3
 
-#define SK_PNMI_CNT_NO			66	/* Must have the value of the enum
-									 * SK_PNMI_MAX_IDX. Define SK_PNMI_CHECK
-									 * for check while init phase 1
-									 */
+/*
+ * SK_PNMI_CNT_NO must have the value of the enum SK_PNMI_MAX_IDX.
+ * Define SK_PNMI_CHECK to check this during init level SK_INIT_IO.
+ */
+#define SK_PNMI_CNT_NO			66
 
 /*
  * Estimate data structure
@@ -856,14 +900,6 @@ typedef struct s_PnmiEstimate {
 
 
 /*
- * VCT timer data structure
- */
-typedef struct s_VctTimer {
-	SK_TIMER		VctTimer;
-} SK_PNMI_VCT_TIMER;
-
-
-/*
  * PNMI specific adapter context structure
  */
 typedef struct s_PnmiPort {
@@ -933,9 +969,9 @@ typedef struct s_PnmiData {
 	unsigned int	TrapQueueEnd;
 	unsigned int	TrapBufPad;
 	unsigned int	TrapUnique;
-	SK_U8		VctStatus[SK_MAX_MACS];
-	SK_PNMI_VCT	VctBackup[SK_MAX_MACS];
-	SK_PNMI_VCT_TIMER VctTimeout[SK_MAX_MACS];
+	SK_U8			VctStatus[SK_MAX_MACS];
+	SK_PNMI_VCT		VctBackup[SK_MAX_MACS];
+	SK_TIMER		VctTimeout[SK_MAX_MACS];
 #ifdef SK_DIAG_SUPPORT
 	SK_U32			DiagAttached;
 #endif /* SK_DIAG_SUPPORT */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skgesirq.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skgesirq.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skgesirq.h	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skgesirq.h	2004-09-09 13:20:48.000000000 +0200
@@ -2,22 +2,21 @@
  *
  * Name:	skgesirq.h
  * Project:	Gigabit Ethernet Adapters, Common Modules
- * Version:	$Revision: 1.30 $
- * Date:	$Date: 2003/07/04 12:34:13 $
- * Purpose:	SK specific Gigabit Ethernet special IRQ functions
+ * Version:	$Revision: 2.3 $
+ * Date:	$Date: 2004/05/28 14:42:03 $
+ * Purpose:	Gigabit Ethernet special IRQ functions
  *
  ******************************************************************************/
 
 /******************************************************************************
  *
  *	(C)Copyright 1998-2002 SysKonnect.
- *	(C)Copyright 2002-2003 Marvell.
+ *	(C)Copyright 2002-2004 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
  *	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.
  *
  ******************************************************************************/
@@ -44,10 +43,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		(5000000UL)	/* 5 sec */
-#define SK_WA_INA_TIME		(100000UL)	/* 100 msec */
+#define SK_WA_ACT_TIME		1000000UL	/* 1000 msec (1 sec) */
+#define SK_WA_INA_TIME		 100000UL	/*  100 msec */
 
-#define SK_HALFDUP_CHK_TIME	(10000UL)	/* 10 msec */
+#define SK_HALFDUP_CHK_TIME	  10000UL	/*   10 msec */
 
 /*
  * Define the error numbers and messages
@@ -102,10 +101,35 @@
 #define SKERR_SIRQ_E024MSG	"FIFO overflow error"
 #define SKERR_SIRQ_E025		(SKERR_SIRQ_E024+1)
 #define SKERR_SIRQ_E025MSG	"2 Pair Downshift detected"
+#define SKERR_SIRQ_E026		(SKERR_SIRQ_E025+1)
+#define SKERR_SIRQ_E026MSG	"Uncorrectable PCI Express error"
+#define SKERR_SIRQ_E027		(SKERR_SIRQ_E026+1)
+#define SKERR_SIRQ_E027MSG	"PCI express protocol violation error"
+#define SKERR_SIRQ_E028		(SKERR_SIRQ_E027+1)
+#define SKERR_SIRQ_E028MSG	"Parity error on RAM 1 (read)"
+#define SKERR_SIRQ_E029		(SKERR_SIRQ_E028+1)
+#define SKERR_SIRQ_E029MSG	"Parity error on RAM 1 (write)"
+#define SKERR_SIRQ_E030		(SKERR_SIRQ_E029+1)
+#define SKERR_SIRQ_E030MSG	"Parity error on RAM 2 (read)"
+#define SKERR_SIRQ_E031		(SKERR_SIRQ_E030+1)
+#define SKERR_SIRQ_E031MSG	"Parity error on RAM 2 (write)"
+#define SKERR_SIRQ_E032		(SKERR_SIRQ_E031+1)
+#define SKERR_SIRQ_E032MSG	"TCP segmentation error async. queue 1"
+#define SKERR_SIRQ_E033		(SKERR_SIRQ_E032+1)
+#define SKERR_SIRQ_E033MSG	"TCP segmentation error sync. queue 1"
+#define SKERR_SIRQ_E034		(SKERR_SIRQ_E033+1)
+#define SKERR_SIRQ_E034MSG	"TCP segmentation error async. queue 2"
+#define SKERR_SIRQ_E035		(SKERR_SIRQ_E034+1)
+#define SKERR_SIRQ_E035MSG	"TCP segmentation error sync. queue 2"
+#define SKERR_SIRQ_E036		(SKERR_SIRQ_E035+1)
+#define SKERR_SIRQ_E036MSG	"CHECK failure polling unit"
 
 extern void SkGeSirqIsr(SK_AC *pAC, SK_IOC IoC, SK_U32 Istatus);
 extern int  SkGeSirqEvent(SK_AC *pAC, SK_IOC IoC, SK_U32 Event, SK_EVPARA Para);
 extern void SkHWLinkUp(SK_AC *pAC, SK_IOC IoC, int Port);
 extern void SkHWLinkDown(SK_AC *pAC, SK_IOC IoC, int Port);
+extern void SkGeYuSirqIsr(SK_AC *pAC, SK_IOC IoC, SK_U32 Istatus);
+extern void SkYuk2SirqIsr(SK_AC *pAC, SK_IOC IoC, SK_U32 Istatus);
 
 #endif	/* _INC_SKGESIRQ_H_ */
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skgetwsi.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skgetwsi.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skgetwsi.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skgetwsi.h	2004-09-09 13:20:48.000000000 +0200
@@ -0,0 +1,233 @@
+/******************************************************************************
+ *
+ * Name:	skgetwsi.h
+ * Project:	Gigabit Ethernet Adapters, TWSI-Module
+ * Version:	$Revision: 1.3 $
+ * Date:	$Date: 2004/07/29 12:54:31 $
+ * Purpose:	Special defines for TWSI
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *	(C)Copyright 1998-2002 SysKonnect.
+ *	(C)Copyright 2002-2004 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
+ *	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.
+ *
+ ******************************************************************************/
+
+/*
+ * SKGETWSI.H	contains all SK-98xx specific defines for the TWSI handling
+ */
+
+#ifndef _INC_SKGETWSI_H_
+#define _INC_SKGETWSI_H_
+
+/*
+ * Macros to access the B2_I2C_CTRL
+ */
+#define SK_I2C_CTL(IoC, flag, dev, dev_size, reg, burst) \
+	SK_OUT32(IoC, B2_I2C_CTRL,\
+		(flag ? 0x80000000UL : 0x0L) | \
+		(((SK_U32)reg << 16) & I2C_ADDR) | \
+		(((SK_U32)dev << 9) & I2C_DEV_SEL) | \
+		(dev_size & I2C_DEV_SIZE) | \
+		((burst << 4) & I2C_BURST_LEN))
+
+#define SK_I2C_STOP(IoC) {			\
+	SK_U32	I2cCtrl;				\
+	SK_IN32(IoC, B2_I2C_CTRL, &I2cCtrl);		\
+	SK_OUT32(IoC, B2_I2C_CTRL, I2cCtrl | I2C_STOP);	\
+}
+
+#define SK_I2C_GET_CTL(IoC, pI2cCtrl)	SK_IN32(IoC, B2_I2C_CTRL, pI2cCtrl)
+
+/*
+ * Macros to access the TWSI SW Registers
+ */
+#define SK_I2C_SET_BIT(IoC, SetBits) {			\
+	SK_U8	OrgBits;				\
+	SK_IN8(IoC, B2_I2C_SW, &OrgBits);		\
+	SK_OUT8(IoC, B2_I2C_SW, OrgBits | (SK_U8)(SetBits));	\
+}
+
+#define SK_I2C_CLR_BIT(IoC, ClrBits) {			\
+	SK_U8	OrgBits;				\
+	SK_IN8(IoC, B2_I2C_SW, &OrgBits);		\
+	SK_OUT8(IoC, B2_I2C_SW, OrgBits & ~((SK_U8)(ClrBits)));	\
+}
+
+#define SK_I2C_GET_SW(IoC, pI2cSw)	SK_IN8(IoC, B2_I2C_SW, pI2cSw)
+
+/*
+ * define the possible sensor states
+ */
+#define	SK_SEN_IDLE		0	/* Idle: sensor not read */
+#define	SK_SEN_VALUE	1	/* Value Read cycle */
+#define	SK_SEN_VALEXT	2	/* Extended Value Read cycle */
+
+/*
+ * Conversion factor to convert read Voltage sensor to milli Volt
+ * Conversion factor to convert read Temperature sensor to 10th degree Celsius
+ */
+#define	SK_LM80_VT_LSB		22	/* 22mV LSB resolution */
+#define	SK_LM80_TEMP_LSB	10	/* 1 degree LSB resolution */
+#define	SK_LM80_TEMPEXT_LSB	 5	/* 0.5 degree LSB resolution for ext. val. */
+
+/*
+ * formula: counter = (22500*60)/(rpm * divisor * pulses/2)
+ * assuming: 6500rpm, 4 pulses, divisor 1
+ */
+#define SK_LM80_FAN_FAKTOR	((22500L*60)/(1*2))
+
+/*
+ * Define sensor management data
+ * Maximum is reached on Genesis copper dual port and Yukon-64
+ * Board specific maximum is in pAC->I2c.MaxSens
+ */
+#define	SK_MAX_SENSORS	8	/* maximal no. of installed sensors */
+#define	SK_MIN_SENSORS	5	/* minimal no. of installed sensors */
+
+/*
+ * To watch the state machine (SM) use the timer in two ways
+ * instead of one as hitherto
+ */
+#define	SK_TIMER_WATCH_SM		0	/* Watch the SM to finish in a spec. time */
+#define	SK_TIMER_NEW_GAUGING	1	/* Start a new gauging when timer expires */
+
+/*
+ * Defines for the individual thresholds
+ */
+
+#define C_PLUS_15		1.15
+#define C_PLUS_10		1.10
+#define C_PLUS_5		1.05
+#define C_MINUS_5		0.95
+#define C_MINUS_10		0.90
+#define C_MINUS_15		0.85
+
+/* Temperature sensor */
+#define	SK_SEN_TEMP_HIGH_ERR	800	/* Temperature High Err  Threshold */
+#define	SK_SEN_TEMP_HIGH_WARN	700	/* Temperature High Warn Threshold */
+#define	SK_SEN_TEMP_LOW_WARN	100	/* Temperature Low  Warn Threshold */
+#define	SK_SEN_TEMP_LOW_ERR		  0	/* Temperature Low  Err  Threshold */
+
+/* VCC which should be 5 V */
+#define	SK_SEN_PCI_5V_HIGH_ERR		5588	/* Voltage PCI High Err  Threshold */
+#define	SK_SEN_PCI_5V_HIGH_WARN		5346	/* Voltage PCI High Warn Threshold */
+#define	SK_SEN_PCI_5V_LOW_WARN		4664	/* Voltage PCI Low  Warn Threshold */
+#define	SK_SEN_PCI_5V_LOW_ERR		4422	/* Voltage PCI Low  Err  Threshold */
+
+/*
+ * VIO may be 5 V or 3.3 V. Initialization takes two parts:
+ * 1. Initialize lowest lower limit and highest higher limit.
+ * 2. After the first value is read correct the upper or the lower limit to
+ *    the appropriate C constant.
+ *
+ * Warning limits are +-5% of the exepected voltage.
+ * Error limits are +-10% of the expected voltage.
+ */
+
+/* Bug fix AF: 16.Aug.2001: Correct the init base of LM80 sensor */
+
+#define	SK_SEN_PCI_IO_5V_HIGH_ERR	5566	/* + 10% V PCI-IO High Err Threshold */
+#define	SK_SEN_PCI_IO_5V_HIGH_WARN	5324	/* +  5% V PCI-IO High Warn Threshold */
+					/*		5000	mVolt */
+#define	SK_SEN_PCI_IO_5V_LOW_WARN	4686	/* -  5% V PCI-IO Low Warn Threshold */
+#define	SK_SEN_PCI_IO_5V_LOW_ERR	4444	/* - 10% V PCI-IO Low Err Threshold */
+
+#define	SK_SEN_PCI_IO_RANGE_LIMITER	4000	/* 4000 mV range delimiter */
+
+/* correction values for the second pass */
+#define	SK_SEN_PCI_IO_3V3_HIGH_ERR	3850	/* + 15% V PCI-IO High Err Threshold */
+#define	SK_SEN_PCI_IO_3V3_HIGH_WARN	3674	/* + 10% V PCI-IO High Warn Threshold */
+					/*		3300	mVolt */
+#define	SK_SEN_PCI_IO_3V3_LOW_WARN	2926	/* - 10% V PCI-IO Low Warn Threshold */
+#define	SK_SEN_PCI_IO_3V3_LOW_ERR	2772	/* - 15% V PCI-IO Low Err  Threshold */
+
+/*
+ * VDD voltage
+ */
+#define	SK_SEN_VDD_HIGH_ERR		3630	/* Voltage ASIC High Err  Threshold */
+#define	SK_SEN_VDD_HIGH_WARN	3476	/* Voltage ASIC High Warn Threshold */
+#define	SK_SEN_VDD_LOW_WARN		3146	/* Voltage ASIC Low  Warn Threshold */
+#define	SK_SEN_VDD_LOW_ERR		2970	/* Voltage ASIC Low  Err  Threshold */
+
+/*
+ * PHY PLL 3V3 voltage
+ */
+#define	SK_SEN_PLL_3V3_HIGH_ERR		3630	/* Voltage PMA High Err  Threshold */
+#define	SK_SEN_PLL_3V3_HIGH_WARN	3476	/* Voltage PMA High Warn Threshold */
+#define	SK_SEN_PLL_3V3_LOW_WARN		3146	/* Voltage PMA Low  Warn Threshold */
+#define	SK_SEN_PLL_3V3_LOW_ERR		2970	/* Voltage PMA Low  Err  Threshold */
+
+/*
+ * VAUX (YUKON only)
+ */
+#define	SK_SEN_VAUX_3V3_VAL		3300	/* Voltage VAUX 3.3 Volt */
+
+#define	SK_SEN_VAUX_3V3_HIGH_ERR	(SK_I32)(SK_SEN_VAUX_3V3_VAL * C_PLUS_10)
+#define	SK_SEN_VAUX_3V3_HIGH_WARN	(SK_I32)(SK_SEN_VAUX_3V3_VAL * C_PLUS_5)
+#define	SK_SEN_VAUX_3V3_LOW_WARN	(SK_I32)(SK_SEN_VAUX_3V3_VAL * C_MINUS_5)
+#define	SK_SEN_VAUX_3V3_LOW_ERR		(SK_I32)(SK_SEN_VAUX_3V3_VAL * C_MINUS_10)
+
+#define	SK_SEN_VAUX_RANGE_LIMITER	1000	/* 1000 mV range delimiter */
+
+/*
+ * PHY 2V5 voltage
+ */
+#define	SK_SEN_PHY_2V5_VAL		2500	/* Voltage PHY 2.5 Volt */
+
+#define	SK_SEN_PHY_2V5_HIGH_ERR		(SK_I32)(SK_SEN_PHY_2V5_VAL * C_PLUS_10)
+#define	SK_SEN_PHY_2V5_HIGH_WARN	(SK_I32)(SK_SEN_PHY_2V5_VAL * C_PLUS_5)
+#define	SK_SEN_PHY_2V5_LOW_WARN		(SK_I32)(SK_SEN_PHY_2V5_VAL * C_MINUS_5)
+#define	SK_SEN_PHY_2V5_LOW_ERR		(SK_I32)(SK_SEN_PHY_2V5_VAL * C_MINUS_10)
+
+/*
+ * ASIC Core 1V5 voltage (YUKON only)
+ */
+#define	SK_SEN_CORE_1V5_VAL		1500	/* Voltage ASIC Core 1.5 Volt */
+
+#define	SK_SEN_CORE_1V5_HIGH_ERR	(SK_I32)(SK_SEN_CORE_1V5_VAL * C_PLUS_10)
+#define	SK_SEN_CORE_1V5_HIGH_WARN	(SK_I32)(SK_SEN_CORE_1V5_VAL * C_PLUS_5)
+#define	SK_SEN_CORE_1V5_LOW_WARN	(SK_I32)(SK_SEN_CORE_1V5_VAL * C_MINUS_5)
+#define	SK_SEN_CORE_1V5_LOW_ERR 	(SK_I32)(SK_SEN_CORE_1V5_VAL * C_MINUS_10)
+
+/*
+ * ASIC Core 1V2 voltage (YUKON-2 only)
+ */
+#define	SK_SEN_CORE_1V2_VAL		1300	/* Voltage ASIC Core 1.3 Volt */
+
+#define	SK_SEN_CORE_1V2_HIGH_ERR	(SK_I32)(SK_SEN_CORE_1V2_VAL * C_PLUS_15)
+#define	SK_SEN_CORE_1V2_HIGH_WARN	(SK_I32)(SK_SEN_CORE_1V2_VAL * C_PLUS_10)
+#define	SK_SEN_CORE_1V2_LOW_WARN	(SK_I32)(SK_SEN_CORE_1V2_VAL * C_MINUS_5)
+#define	SK_SEN_CORE_1V2_LOW_ERR 	(SK_I32)(SK_SEN_CORE_1V2_VAL * C_MINUS_10)
+
+/*
+ * FAN 1 speed
+ */
+/* assuming: 6500rpm +-15%, 4 pulses,
+ * warning at:	80 %
+ * error at:	70 %
+ * no upper limit
+ */
+#define	SK_SEN_FAN_HIGH_ERR		20000	/* FAN Speed High Err Threshold */
+#define	SK_SEN_FAN_HIGH_WARN	20000	/* FAN Speed High Warn Threshold */
+#define	SK_SEN_FAN_LOW_WARN		 5200	/* FAN Speed Low Warn Threshold */
+#define	SK_SEN_FAN_LOW_ERR		 4550	/* FAN Speed Low Err Threshold */
+
+/*
+ * Some Voltages need dynamic thresholds
+ */
+#define	SK_SEN_DYN_INIT_NONE		 0  /* No dynamic init of thresholds */
+#define	SK_SEN_DYN_INIT_PCI_IO		10  /* Init PCI-IO with new thresholds */
+#define	SK_SEN_DYN_INIT_VAUX		11  /* Init VAUX with new thresholds */
+
+extern	int SkLm80ReadSensor(SK_AC *pAC, SK_IOC IoC, SK_SENSOR *pSen);
+#endif	/* n_INC_SKGETWSI_H */
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/ski2c.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/ski2c.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/ski2c.h	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/ski2c.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,177 +0,0 @@
-/******************************************************************************
- *
- * Name:	ski2c.h
- * Project:	Gigabit Ethernet Adapters, TWSI-Module
- * Version:	$Revision: 1.35 $
- * Date:	$Date: 2003/10/20 09:06:30 $
- * Purpose:	Defines to access Voltage and Temperature Sensor
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *	(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
- *	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.
- *
- ******************************************************************************/
-
-/*
- * SKI2C.H	contains all I2C specific defines
- */
-
-#ifndef _SKI2C_H_
-#define _SKI2C_H_
-
-typedef struct  s_Sensor SK_SENSOR;
-
-#include "h/skgei2c.h"
-
-/*
- * Define the I2C events.
- */
-#define SK_I2CEV_IRQ	1	/* IRQ happened Event */
-#define SK_I2CEV_TIM	2	/* Timeout event */
-#define SK_I2CEV_CLEAR	3	/* Clear MIB Values */
-
-/*
- * Define READ and WRITE Constants.
- */
-#define I2C_READ	0
-#define I2C_WRITE	1
-#define I2C_BURST	1
-#define I2C_SINGLE	0
-
-#define SKERR_I2C_E001		(SK_ERRBASE_I2C+0)
-#define SKERR_I2C_E001MSG	"Sensor index unknown"
-#define SKERR_I2C_E002		(SKERR_I2C_E001+1)
-#define SKERR_I2C_E002MSG	"TWSI: transfer does not complete"
-#define SKERR_I2C_E003		(SKERR_I2C_E002+1)
-#define SKERR_I2C_E003MSG	"LM80: NAK on device send"
-#define SKERR_I2C_E004		(SKERR_I2C_E003+1)
-#define SKERR_I2C_E004MSG	"LM80: NAK on register send"
-#define SKERR_I2C_E005		(SKERR_I2C_E004+1)
-#define SKERR_I2C_E005MSG	"LM80: NAK on device (2) send"
-#define SKERR_I2C_E006		(SKERR_I2C_E005+1)
-#define SKERR_I2C_E006MSG	"Unknown event"
-#define SKERR_I2C_E007		(SKERR_I2C_E006+1)
-#define SKERR_I2C_E007MSG	"LM80 read out of state"
-#define SKERR_I2C_E008		(SKERR_I2C_E007+1)
-#define SKERR_I2C_E008MSG	"Unexpected sensor read completed"
-#define SKERR_I2C_E009		(SKERR_I2C_E008+1)
-#define SKERR_I2C_E009MSG	"WARNING: temperature sensor out of range"
-#define SKERR_I2C_E010		(SKERR_I2C_E009+1)
-#define SKERR_I2C_E010MSG	"WARNING: voltage sensor out of range"
-#define SKERR_I2C_E011		(SKERR_I2C_E010+1)
-#define SKERR_I2C_E011MSG	"ERROR: temperature sensor out of range"
-#define SKERR_I2C_E012		(SKERR_I2C_E011+1)
-#define SKERR_I2C_E012MSG	"ERROR: voltage sensor out of range"
-#define SKERR_I2C_E013		(SKERR_I2C_E012+1)
-#define SKERR_I2C_E013MSG	"ERROR: couldn't init sensor"
-#define SKERR_I2C_E014		(SKERR_I2C_E013+1)
-#define SKERR_I2C_E014MSG	"WARNING: fan sensor out of range"
-#define SKERR_I2C_E015		(SKERR_I2C_E014+1)
-#define SKERR_I2C_E015MSG	"ERROR: fan sensor out of range"
-#define SKERR_I2C_E016		(SKERR_I2C_E015+1)
-#define SKERR_I2C_E016MSG	"TWSI: active transfer does not complete"
-
-/*
- * Define Timeout values
- */
-#define SK_I2C_TIM_LONG		2000000L	/* 2 seconds */
-#define SK_I2C_TIM_SHORT	 100000L	/* 100 milliseconds */
-#define SK_I2C_TIM_WATCH	1000000L	/* 1 second */
-
-/*
- * Define trap and error log hold times
- */
-#ifndef	SK_SEN_ERR_TR_HOLD
-#define SK_SEN_ERR_TR_HOLD		(4*SK_TICKS_PER_SEC)
-#endif
-#ifndef	SK_SEN_ERR_LOG_HOLD
-#define SK_SEN_ERR_LOG_HOLD		(60*SK_TICKS_PER_SEC)
-#endif
-#ifndef	SK_SEN_WARN_TR_HOLD
-#define SK_SEN_WARN_TR_HOLD		(15*SK_TICKS_PER_SEC)
-#endif
-#ifndef	SK_SEN_WARN_LOG_HOLD
-#define SK_SEN_WARN_LOG_HOLD	(15*60*SK_TICKS_PER_SEC)
-#endif
-
-/*
- * Defines for SenType
- */
-#define SK_SEN_UNKNOWN	0
-#define SK_SEN_TEMP		1
-#define SK_SEN_VOLT		2
-#define SK_SEN_FAN		3
-
-/*
- * Define for the SenErrorFlag
- */
-#define SK_SEN_ERR_NOT_PRESENT	0	/* Error Flag: Sensor not present */
-#define SK_SEN_ERR_OK			1	/* Error Flag: O.K. */
-#define SK_SEN_ERR_WARN			2	/* Error Flag: Warning */
-#define SK_SEN_ERR_ERR			3	/* Error Flag: Error */
-#define SK_SEN_ERR_FAULTY		4	/* Error Flag: Faulty */
-
-/*
- * Define the Sensor struct
- */
-struct	s_Sensor {
-	char	*SenDesc;			/* Description */
-	int		SenType;			/* Voltage or Temperature */
-	SK_I32	SenValue;			/* Current value of the sensor */
-	SK_I32	SenThreErrHigh;		/* High error Threshhold of this sensor */
-	SK_I32	SenThreWarnHigh;	/* High warning Threshhold of this sensor */
-	SK_I32	SenThreErrLow;		/* Lower error Threshold of the sensor */
-	SK_I32	SenThreWarnLow;		/* Lower warning Threshold of the sensor */
-	int		SenErrFlag;			/* Sensor indicated an error */
-	SK_BOOL	SenInit;			/* Is sensor initialized ? */
-	SK_U64	SenErrCts;			/* Error trap counter */
-	SK_U64	SenWarnCts;			/* Warning trap counter */
-	SK_U64	SenBegErrTS;		/* Begin error timestamp */
-	SK_U64	SenBegWarnTS;		/* Begin warning timestamp */
-	SK_U64	SenLastErrTrapTS;	/* Last error trap timestamp */
-	SK_U64	SenLastErrLogTS;	/* Last error log timestamp */
-	SK_U64	SenLastWarnTrapTS;	/* Last warning trap timestamp */
-	SK_U64	SenLastWarnLogTS;	/* Last warning log timestamp */
-	int		SenState;			/* Sensor State (see HW specific include) */
-	int		(*SenRead)(SK_AC *pAC, SK_IOC IoC, struct s_Sensor *pSen);
-								/* Sensors read function */
-	SK_U16	SenReg;				/* Register Address for this sensor */
-	SK_U8	SenDev;				/* Device Selection for this sensor */
-};
-
-typedef	struct	s_I2c {
-	SK_SENSOR	SenTable[SK_MAX_SENSORS];	/* Sensor Table */
-	int			CurrSens;	/* Which sensor is currently queried */
-	int			MaxSens;	/* Max. number of sensors */
-	int			TimerMode;	/* Use the timer also to watch the state machine */
-	int			InitLevel;	/* Initialized Level */
-#ifndef SK_DIAG
-	int			DummyReads;	/* Number of non-checked dummy reads */
-	SK_TIMER	SenTimer;	/* Sensors timer */
-#endif /* !SK_DIAG */
-} SK_I2C;
-
-extern int SkI2cInit(SK_AC *pAC, SK_IOC IoC, int Level);
-extern int SkI2cWrite(SK_AC *pAC, SK_IOC IoC, SK_U32 Data, int Dev, int Size,
-					   int Reg, int Burst);
-extern int SkI2cReadSensor(SK_AC *pAC, SK_IOC IoC, SK_SENSOR *pSen);
-#ifdef SK_DIAG
-extern	SK_U32 SkI2cRead(SK_AC *pAC, SK_IOC IoC, int Dev, int Size, int Reg,
-						 int Burst);
-#else /* !SK_DIAG */
-extern int SkI2cEvent(SK_AC *pAC, SK_IOC IoC, SK_U32 Event, SK_EVPARA Para);
-extern void SkI2cWaitIrq(SK_AC *pAC, SK_IOC IoC);
-extern void SkI2cIsr(SK_AC *pAC, SK_IOC IoC);
-#endif /* !SK_DIAG */
-#endif /* n_SKI2C_H */
-
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skqueue.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skqueue.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skqueue.h	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skqueue.h	2004-09-09 13:20:48.000000000 +0200
@@ -2,8 +2,8 @@
  *
  * Name:	skqueue.h
  * Project:	Gigabit Ethernet Adapters, Event Scheduler Module
- * Version:	$Revision: 1.16 $
- * Date:	$Date: 2003/09/16 12:50:32 $
+ * Version:	$Revision: 2.3 $
+ * Date:	$Date: 2004/05/14 13:39:15 $
  * Purpose:	Defines for the Event queue
  *
  ******************************************************************************/
@@ -45,6 +45,9 @@
 #define	SKGE_RSF	11	/* RSF Aggregation Event Class */
 #define	SKGE_MARKER	12	/* MARKER Aggregation Event Class */
 #define	SKGE_FD		13	/* FD Distributor Event Class */
+#ifdef SK_ASF
+#define	SKGE_ASF	14	/* ASF Event Class */
+#endif
 
 /*
  * define event queue as circular buffer
@@ -90,5 +93,11 @@ extern	int SkEventDispatcher(SK_AC *pAC,
 #define	SKERR_Q_E001MSG	"Event queue overflow"
 #define	SKERR_Q_E002	(SKERR_Q_E001+1)
 #define	SKERR_Q_E002MSG	"Undefined event class"
+#define	SKERR_Q_E003	(SKERR_Q_E001+2)
+#define	SKERR_Q_E003MSG	"Event queued in Init Level 0"
+#define	SKERR_Q_E004	(SKERR_Q_E001+3)
+#define	SKERR_Q_E004MSG	"Error Reported from Event Fuction (Queue Blocked)"
+#define	SKERR_Q_E005	(SKERR_Q_E001+4)
+#define	SKERR_Q_E005MSG	"Event scheduler called in Init Level 0 or 1"
 #endif	/* _SKQUEUE_H_ */
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skrlmt.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skrlmt.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skrlmt.h	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skrlmt.h	2004-09-09 13:20:48.000000000 +0200
@@ -2,8 +2,8 @@
  *
  * Name:	skrlmt.h
  * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.37 $
- * Date:	$Date: 2003/04/15 09:43:43 $
+ * Version:	$Revision: 2.1 $
+ * Date:	$Date: 2003/10/27 14:16:09 $
  * Purpose:	Header file for Redundant Link ManagemenT.
  *
  ******************************************************************************/
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/sktimer.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/sktimer.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/sktimer.h	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/sktimer.h	2004-09-09 13:20:48.000000000 +0200
@@ -2,8 +2,8 @@
  *
  * Name:	sktimer.h
  * Project:	Gigabit Ethernet Adapters, Event Scheduler Module
- * Version:	$Revision: 1.11 $
- * Date:	$Date: 2003/09/16 12:58:18 $
+ * Version:	$Revision: 2.1 $
+ * Date:	$Date: 2003/10/27 14:16:09 $
  * Purpose:	Defines for the timer functions
  *
  ******************************************************************************/
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/sktwsi.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/sktwsi.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/sktwsi.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/sktwsi.h	2004-09-09 13:20:48.000000000 +0200
@@ -0,0 +1,177 @@
+/******************************************************************************
+ *
+ * Name:	sktwsi.h
+ * Project:	Gigabit Ethernet Adapters, TWSI-Module
+ * Version:	$Revision: 1.1 $
+ * Date:	$Date: 2003/12/19 14:02:56 $
+ * Purpose:	Defines to access Voltage and Temperature Sensor
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *	(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
+ *	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.
+ *
+ ******************************************************************************/
+
+/*
+ * SKTWSI.H	contains all TWSI specific defines
+ */
+
+#ifndef _SKTWSI_H_
+#define _SKTWSI_H_
+
+typedef struct  s_Sensor SK_SENSOR;
+
+#include "h/skgetwsi.h"
+
+/*
+ * Define the TWSI events.
+ */
+#define SK_I2CEV_IRQ	1	/* IRQ happened Event */
+#define SK_I2CEV_TIM	2	/* Timeout event */
+#define SK_I2CEV_CLEAR	3	/* Clear MIB Values */
+
+/*
+ * Define READ and WRITE Constants.
+ */
+#define I2C_READ	0
+#define I2C_WRITE	1
+#define I2C_BURST	1
+#define I2C_SINGLE	0
+
+#define SKERR_I2C_E001		(SK_ERRBASE_I2C+0)
+#define SKERR_I2C_E001MSG	"Sensor index unknown"
+#define SKERR_I2C_E002		(SKERR_I2C_E001+1)
+#define SKERR_I2C_E002MSG	"TWSI: transfer does not complete"
+#define SKERR_I2C_E003		(SKERR_I2C_E002+1)
+#define SKERR_I2C_E003MSG	"LM80: NAK on device send"
+#define SKERR_I2C_E004		(SKERR_I2C_E003+1)
+#define SKERR_I2C_E004MSG	"LM80: NAK on register send"
+#define SKERR_I2C_E005		(SKERR_I2C_E004+1)
+#define SKERR_I2C_E005MSG	"LM80: NAK on device (2) send"
+#define SKERR_I2C_E006		(SKERR_I2C_E005+1)
+#define SKERR_I2C_E006MSG	"Unknown event"
+#define SKERR_I2C_E007		(SKERR_I2C_E006+1)
+#define SKERR_I2C_E007MSG	"LM80 read out of state"
+#define SKERR_I2C_E008		(SKERR_I2C_E007+1)
+#define SKERR_I2C_E008MSG	"Unexpected sensor read completed"
+#define SKERR_I2C_E009		(SKERR_I2C_E008+1)
+#define SKERR_I2C_E009MSG	"WARNING: temperature sensor out of range"
+#define SKERR_I2C_E010		(SKERR_I2C_E009+1)
+#define SKERR_I2C_E010MSG	"WARNING: voltage sensor out of range"
+#define SKERR_I2C_E011		(SKERR_I2C_E010+1)
+#define SKERR_I2C_E011MSG	"ERROR: temperature sensor out of range"
+#define SKERR_I2C_E012		(SKERR_I2C_E011+1)
+#define SKERR_I2C_E012MSG	"ERROR: voltage sensor out of range"
+#define SKERR_I2C_E013		(SKERR_I2C_E012+1)
+#define SKERR_I2C_E013MSG	"ERROR: couldn't init sensor"
+#define SKERR_I2C_E014		(SKERR_I2C_E013+1)
+#define SKERR_I2C_E014MSG	"WARNING: fan sensor out of range"
+#define SKERR_I2C_E015		(SKERR_I2C_E014+1)
+#define SKERR_I2C_E015MSG	"ERROR: fan sensor out of range"
+#define SKERR_I2C_E016		(SKERR_I2C_E015+1)
+#define SKERR_I2C_E016MSG	"TWSI: active transfer does not complete"
+
+/*
+ * Define Timeout values
+ */
+#define SK_I2C_TIM_LONG		2000000L	/* 2 seconds */
+#define SK_I2C_TIM_SHORT	 100000L	/* 100 milliseconds */
+#define SK_I2C_TIM_WATCH	1000000L	/* 1 second */
+
+/*
+ * Define trap and error log hold times
+ */
+#ifndef	SK_SEN_ERR_TR_HOLD
+#define SK_SEN_ERR_TR_HOLD		(4*SK_TICKS_PER_SEC)
+#endif
+#ifndef	SK_SEN_ERR_LOG_HOLD
+#define SK_SEN_ERR_LOG_HOLD		(60*SK_TICKS_PER_SEC)
+#endif
+#ifndef	SK_SEN_WARN_TR_HOLD
+#define SK_SEN_WARN_TR_HOLD		(15*SK_TICKS_PER_SEC)
+#endif
+#ifndef	SK_SEN_WARN_LOG_HOLD
+#define SK_SEN_WARN_LOG_HOLD	(15*60*SK_TICKS_PER_SEC)
+#endif
+
+/*
+ * Defines for SenType
+ */
+#define SK_SEN_UNKNOWN	0
+#define SK_SEN_TEMP		1
+#define SK_SEN_VOLT		2
+#define SK_SEN_FAN		3
+
+/*
+ * Define for the SenErrorFlag
+ */
+#define SK_SEN_ERR_NOT_PRESENT	0	/* Error Flag: Sensor not present */
+#define SK_SEN_ERR_OK			1	/* Error Flag: O.K. */
+#define SK_SEN_ERR_WARN			2	/* Error Flag: Warning */
+#define SK_SEN_ERR_ERR			3	/* Error Flag: Error */
+#define SK_SEN_ERR_FAULTY		4	/* Error Flag: Faulty */
+
+/*
+ * Define the Sensor struct
+ */
+struct	s_Sensor {
+	char	*SenDesc;			/* Description */
+	int		SenType;			/* Voltage or Temperature */
+	SK_I32	SenValue;			/* Current value of the sensor */
+	SK_I32	SenThreErrHigh;		/* High error Threshhold of this sensor */
+	SK_I32	SenThreWarnHigh;	/* High warning Threshhold of this sensor */
+	SK_I32	SenThreErrLow;		/* Lower error Threshold of the sensor */
+	SK_I32	SenThreWarnLow;		/* Lower warning Threshold of the sensor */
+	int		SenErrFlag;			/* Sensor indicated an error */
+	SK_BOOL	SenInit;			/* Is sensor initialized ? */
+	SK_U64	SenErrCts;			/* Error trap counter */
+	SK_U64	SenWarnCts;			/* Warning trap counter */
+	SK_U64	SenBegErrTS;		/* Begin error timestamp */
+	SK_U64	SenBegWarnTS;		/* Begin warning timestamp */
+	SK_U64	SenLastErrTrapTS;	/* Last error trap timestamp */
+	SK_U64	SenLastErrLogTS;	/* Last error log timestamp */
+	SK_U64	SenLastWarnTrapTS;	/* Last warning trap timestamp */
+	SK_U64	SenLastWarnLogTS;	/* Last warning log timestamp */
+	int		SenState;			/* Sensor State (see HW specific include) */
+	int		(*SenRead)(SK_AC *pAC, SK_IOC IoC, struct s_Sensor *pSen);
+								/* Sensors read function */
+	SK_U16	SenReg;				/* Register Address for this sensor */
+	SK_U8	SenDev;				/* Device Selection for this sensor */
+};
+
+typedef	struct	s_I2c {
+	SK_SENSOR	SenTable[SK_MAX_SENSORS];	/* Sensor Table */
+	int			CurrSens;	/* Which sensor is currently queried */
+	int			MaxSens;	/* Max. number of sensors */
+	int			TimerMode;	/* Use the timer also to watch the state machine */
+	int			InitLevel;	/* Initialized Level */
+#ifndef SK_DIAG
+	int			DummyReads;	/* Number of non-checked dummy reads */
+	SK_TIMER	SenTimer;	/* Sensors timer */
+#endif /* !SK_DIAG */
+} SK_I2C;
+
+extern int SkI2cInit(SK_AC *pAC, SK_IOC IoC, int Level);
+extern int SkI2cWrite(SK_AC *pAC, SK_IOC IoC, SK_U32 Data, int Dev, int Size,
+					   int Reg, int Burst);
+extern int SkI2cReadSensor(SK_AC *pAC, SK_IOC IoC, SK_SENSOR *pSen);
+#ifdef SK_DIAG
+extern	SK_U32 SkI2cRead(SK_AC *pAC, SK_IOC IoC, int Dev, int Size, int Reg,
+						 int Burst);
+#else /* !SK_DIAG */
+extern int SkI2cEvent(SK_AC *pAC, SK_IOC IoC, SK_U32 Event, SK_EVPARA Para);
+extern void SkI2cWaitIrq(SK_AC *pAC, SK_IOC IoC);
+extern void SkI2cIsr(SK_AC *pAC, SK_IOC IoC);
+#endif /* !SK_DIAG */
+#endif /* n_SKTWSI_H */
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/sktypes.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/sktypes.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/sktypes.h	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/sktypes.h	2004-09-09 13:20:48.000000000 +0200
@@ -3,7 +3,7 @@
  * Name:	sktypes.h
  * Project:	GEnesis, PCI Gigabit Ethernet Adapter
  * Version:	$Revision: 1.2 $
- * Date:	$Date: 2003/10/07 08:16:51 $
+ * Date:	$Date: 2004/07/09 13:29:49 $
  * Purpose:	Define data types for Linux
  *
  ******************************************************************************/
@@ -22,48 +22,28 @@
  *
  ******************************************************************************/
  
-/******************************************************************************
- *
- * Description:
- *
- * In this file, all data types that are needed by the common modules
- * are mapped to Linux data types.
- * 
- *
- * Include File Hierarchy:
- *
- *
- ******************************************************************************/
-
 #ifndef __INC_SKTYPES_H
 #define __INC_SKTYPES_H
 
-
-/* defines *******************************************************************/
-
-/*
- * Data types with a specific size. 'I' = signed, 'U' = unsigned.
- */
-#define SK_I8	s8
-#define SK_U8	u8
-#define SK_I16	s16
-#define SK_U16	u16
-#define SK_I32	s32
-#define SK_U32	u32
-#define SK_I64	s64
-#define SK_U64	u64
-
-#define SK_UPTR	ulong		/* casting pointer <-> integral */
-
-/*
-* Boolean type.
-*/
-#define SK_BOOL		SK_U8
-#define SK_FALSE	0
-#define SK_TRUE		(!SK_FALSE)
-
-/* typedefs *******************************************************************/
-
-/* function prototypes ********************************************************/
+#define SK_I8    s8    /* 8 bits (1 byte) signed       */
+#define SK_U8    u8    /* 8 bits (1 byte) unsigned     */
+#define SK_I16  s16    /* 16 bits (2 bytes) signed     */
+#define SK_U16  u16    /* 16 bits (2 bytes) unsigned   */
+#define SK_I32  s32    /* 32 bits (4 bytes) signed     */
+#define SK_U32  u32    /* 32 bits (4 bytes) unsigned   */
+#define SK_I64  s64    /* 64 bits (8 bytes) signed     */
+#define SK_U64  u64    /* 64 bits (8 bytes) unsigned   */
+
+#define SK_UPTR	ulong  /* casting pointer <-> integral */
+
+#define SK_BOOL   SK_U8
+#define SK_FALSE  0
+#define SK_TRUE   (!SK_FALSE)
 
 #endif	/* __INC_SKTYPES_H */
+
+/*******************************************************************************
+ *
+ * End of file
+ *
+ ******************************************************************************/
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skversion.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skversion.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skversion.h	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skversion.h	2004-09-09 13:20:48.000000000 +0200
@@ -1,17 +1,17 @@
 /******************************************************************************
  *
- * Name:	version.h
+ * Name:	skversion.h
  * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.5 $
- * Date:	$Date: 2003/10/07 08:16:51 $
- * Purpose:	SK specific Error log support
+ * Version:	$Revision: 1.3 $
+ * Date:	$Date: 2004/07/09 13:33:59 $
+ * Purpose:	specific version strings and numbers
  *
  ******************************************************************************/
 
 /******************************************************************************
  *
  *	(C)Copyright 1998-2002 SysKonnect GmbH.
- *	(C)Copyright 2002-2003 Marvell.
+ *	(C)Copyright 2002-2004 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
@@ -22,18 +22,15 @@
  *
  ******************************************************************************/
 
- 
-#ifdef	lint
-static const char SysKonnectFileId[] = "@(#) (C) SysKonnect GmbH.";
-static const char SysKonnectBuildNumber[] =
-	"@(#)SK-BUILD: 6.24 PL: 01"; 
-#endif	/* !defined(lint) */
-
-#define BOOT_STRING	"sk98lin: Network Device Driver v6.24\n" \
-			"(C)Copyright 1999-2004 Marvell(R)."
-
-#define VER_STRING	"6.24"
-#define DRIVER_FILE_NAME	"sk98lin"
-#define DRIVER_REL_DATE		"Feb-20-2004"
-
+#define BOOT_STRING  "sk98lin: Network Device Driver v7.07\n" \
+                     "(C)Copyright 1999-2004 Marvell(R)."
+#define VER_STRING   "7.07"
+#define PATCHLEVEL   "01"
+#define DRIVER_FILE_NAME   "sk98lin"
+#define DRIVER_REL_DATE    "Aug-26-2004"
 
+/*******************************************************************************
+ *
+ * End of file
+ *
+ ******************************************************************************/
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skvpd.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skvpd.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/skvpd.h	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/skvpd.h	2004-09-09 13:20:48.000000000 +0200
@@ -1,22 +1,22 @@
 /******************************************************************************
  *
  * Name:	skvpd.h
- * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.15 $
- * Date:	$Date: 2003/01/13 10:39:38 $
+ * Project:	Gigabit Ethernet Adapters, VPD-Module
+ * Version:	$Revision: 2.5 $
+ * Date:	$Date: 2004/08/11 14:36:16 $
  * Purpose:	Defines and Macros for VPD handling
  *
  ******************************************************************************/
 
 /******************************************************************************
  *
- *	(C)Copyright 1998-2003 SysKonnect GmbH.
+ *	(C)Copyright 1998-2002 SysKonnect.
+ *	(C)Copyright 2002-2004 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
  *	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.
  *
  ******************************************************************************/
@@ -48,6 +48,8 @@
 #define	VPD_YA		"YA"	/* Asset Tag Identifier */
 #define VPD_VL		"VL"	/* First Error Log Message (SK specific) */
 #define VPD_VF		"VF"	/* Second Error Log Message (SK specific) */
+#define VPD_VB		"VB"	/* Boot Agent ROM Configuration (SK specific) */
+#define VPD_VE		"VE"	/* EFI UNDI Configuration (SK specific) */
 #define VPD_RW		"RW"	/* Remaining Read / Write Area */
 
 /* 'type' values for vpd_setup_para() */
@@ -135,49 +137,49 @@ typedef	struct s_vpd_key {
 #define VPD_IN16(pAC,IoC,Addr,pVal)	(void)SkPciReadCfgWord(pAC,Addr,pVal)
 #define VPD_IN32(pAC,IoC,Addr,pVal)	(void)SkPciReadCfgDWord(pAC,Addr,pVal)
 #else	/* VPD_DO_IO */
-#define VPD_OUT8(pAC,IoC,Addr,Val)	SK_OUT8(IoC,PCI_C(Addr),Val)
-#define VPD_OUT16(pAC,IoC,Addr,Val)	SK_OUT16(IoC,PCI_C(Addr),Val)
-#define VPD_OUT32(pAC,IoC,Addr,Val)	SK_OUT32(IoC,PCI_C(Addr),Val)
-#define VPD_IN8(pAC,IoC,Addr,pVal)	SK_IN8(IoC,PCI_C(Addr),pVal)
-#define VPD_IN16(pAC,IoC,Addr,pVal)	SK_IN16(IoC,PCI_C(Addr),pVal)
-#define VPD_IN32(pAC,IoC,Addr,pVal)	SK_IN32(IoC,PCI_C(Addr),pVal)
+#define VPD_OUT8(pAC,IoC,Addr,Val)	SK_OUT8(IoC,PCI_C(pAC,Addr),Val)
+#define VPD_OUT16(pAC,IoC,Addr,Val)	SK_OUT16(IoC,PCI_C(pAC,Addr),Val)
+#define VPD_OUT32(pAC,IoC,Addr,Val)	SK_OUT32(IoC,PCI_C(pAC,Addr),Val)
+#define VPD_IN8(pAC,IoC,Addr,pVal)	SK_IN8(IoC,PCI_C(pAC,Addr),pVal)
+#define VPD_IN16(pAC,IoC,Addr,pVal)	SK_IN16(IoC,PCI_C(pAC,Addr),pVal)
+#define VPD_IN32(pAC,IoC,Addr,pVal)	SK_IN32(IoC,PCI_C(pAC,Addr),pVal)
 #endif	/* VPD_DO_IO */
 #else	/* SKDIAG */
 #define VPD_OUT8(pAC,Ioc,Addr,Val) {			\
 		if ((pAC)->DgT.DgUseCfgCycle)			\
 			SkPciWriteCfgByte(pAC,Addr,Val);	\
 		else									\
-			SK_OUT8(pAC,PCI_C(Addr),Val);		\
+			SK_OUT8(pAC,PCI_C(pAC,Addr),Val);	\
 		}
 #define VPD_OUT16(pAC,Ioc,Addr,Val) {			\
 		if ((pAC)->DgT.DgUseCfgCycle)			\
 			SkPciWriteCfgWord(pAC,Addr,Val);	\
 		else						\
-			SK_OUT16(pAC,PCI_C(Addr),Val);		\
+			SK_OUT16(pAC,PCI_C(pAC,Addr),Val);	\
 		}
 #define VPD_OUT32(pAC,Ioc,Addr,Val) {			\
 		if ((pAC)->DgT.DgUseCfgCycle)			\
 			SkPciWriteCfgDWord(pAC,Addr,Val);	\
 		else						\
-			SK_OUT32(pAC,PCI_C(Addr),Val); 		\
+			SK_OUT32(pAC,PCI_C(pAC,Addr),Val);	\
 		}
 #define VPD_IN8(pAC,Ioc,Addr,pVal) {			\
 		if ((pAC)->DgT.DgUseCfgCycle) 			\
 			SkPciReadCfgByte(pAC,Addr,pVal);	\
 		else						\
-			SK_IN8(pAC,PCI_C(Addr),pVal); 		\
+			SK_IN8(pAC,PCI_C(pAC,Addr),pVal);	\
 		}
 #define VPD_IN16(pAC,Ioc,Addr,pVal) {			\
 		if ((pAC)->DgT.DgUseCfgCycle) 			\
 			SkPciReadCfgWord(pAC,Addr,pVal);	\
 		else						\
-			SK_IN16(pAC,PCI_C(Addr),pVal); 		\
+			SK_IN16(pAC,PCI_C(pAC,Addr),pVal);	\
 		}
 #define VPD_IN32(pAC,Ioc,Addr,pVal) {			\
 		if ((pAC)->DgT.DgUseCfgCycle)			\
 			SkPciReadCfgDWord(pAC,Addr,pVal);	\
 		else						\
-			SK_IN32(pAC,PCI_C(Addr),pVal);		\
+			SK_IN32(pAC,PCI_C(pAC,Addr),pVal);	\
 		}
 #endif	/* nSKDIAG */
 
@@ -240,7 +242,12 @@ extern void	VpdErrLog(
 	SK_IOC		IoC,
 	char		*msg);
 
-#ifdef	SKDIAG
+int VpdInit(
+	SK_AC		*pAC,
+	SK_IOC		IoC);
+
+#if defined(SKDIAG) || defined(SK_ASF)
+
 extern int	VpdReadBlock(
 	SK_AC		*pAC,
 	SK_IOC		IoC,
@@ -254,7 +261,9 @@ extern int	VpdWriteBlock(
 	char		*buf,
 	int			addr,
 	int			len);
-#endif	/* SKDIAG */
+
+#endif	/* SKDIAG || SK_ASF */
+
 #else	/* SK_KR_PROTO */
 extern SK_U32	VpdReadDWord();
 extern int	VpdSetupPara();
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/sky2le.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/sky2le.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/sky2le.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/sky2le.h	2004-09-09 13:20:48.000000000 +0200
@@ -0,0 +1,872 @@
+/******************************************************************************
+ *
+ * Name:	sky2le.h
+ * Project:	Gigabit Ethernet Adapters, Common Modules
+ * Version:	$Revision: 1.7 $
+ * Date:	$Date: 2004/03/04 14:20:51 $
+ * Purpose:	Common list element definitions and access macros.
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *	(C)Copyright 2003 Marvell.
+ *	All Rights Reserved
+ *
+ *	THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MARVELL
+ *	The copyright notice above does not evidence any
+ *	actual or intended publication of such source code.
+ *
+ *	This Module contains Proprietary Information of Marvell
+ *	and should be treated as Confidential.
+ *
+ *	The information in this file is provided for the exclusive use of
+ *	the licensees of Marvell.
+ *	Such users have the right to use, modify, and incorporate this code
+ *	into products for purposes authorized by the license agreement
+ *	provided they include this notice and the associated copyright notice
+ *	with any such product.
+ *	The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+#ifndef __INC_SKY2LE_H
+#define __INC_SKY2LE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif	/* __cplusplus */
+
+
+/* defines ********************************************************************/
+
+#define MIN_LEN_OF_LE_TAB	128
+#define MAX_LEN_OF_LE_TAB	4096
+#ifdef USE_POLLING_UNIT
+#define NUM_LE_POLLING_UNIT	2
+#endif
+#define MAX_FRAG_OVERHEAD       10
+
+/* Macro for aligning a given value */
+#define SK_ALIGN_SIZE(Value, Alignment, AlignedVal)	{						\
+	(AlignedVal) = (((Value) + (Alignment) - 1) & (~((Alignment) - 1)));	\
+}
+
+/******************************************************************************
+ *
+ * LE2DWord() - Converts the given Little Endian value to machine order value
+ *
+ * Description:
+ *	This function converts the Little Endian value received as an argument to
+ *  the machine order value.
+ *
+ * Returns:
+ *	The converted value
+ *
+ */
+
+#ifdef SK_LITTLE_ENDIAN
+
+#define LE2DWord(value)	(value)
+
+#else	/* !SK_LITTLE_ENDIAN */
+
+#define LE2DWord(value)				\
+	((((value)<<24L)&0xff000000L) +	\
+	(((value)<< 8L)&0x00ff0000L) +	\
+	(((value)>> 8L)&0x0000ff00L) +	\
+	(((value)>>24L)&0x000000ffL))
+
+#endif	/* !SK_LITTLE_ENDIAN */
+
+/******************************************************************************
+ *
+ * DWord2LE() - Converts the given value to a Little Endian value
+ *
+ * Description:
+ *	This function converts the value received as an argument to a Little Endian
+ *  value on Big Endian machines. If the machine running the code is Little
+ *  Endian, then no conversion is done.
+ *
+ * Returns:
+ *	The converted value
+ *
+ */
+
+#ifdef SK_LITTLE_ENDIAN
+
+#define DWord2LE(value) (value)
+
+#else	/* !SK_LITTLE_ENDIAN */
+
+#define DWord2LE(value) 			\
+	((((value)<<24L)&0xff000000L) +	\
+	(((value)<< 8L)&0x00ff0000L) +	\
+	(((value)>> 8L)&0x0000ff00L) +	\
+	(((value)>>24L)&0x000000ffL))
+
+#endif	/* !SK_LITTLE_ENDIAN */
+
+/******************************************************************************
+ *
+ * LE2Word() - Converts the given Little Endian value to machine order value
+ *
+ * Description:
+ *	This function converts the Little Endian value received as an argument to
+ *  the machine order value.
+ *
+ * Returns:
+ *	The converted value
+ *
+ */
+
+#ifdef SK_LITTLE_ENDIAN
+
+#define LE2Word(value) (value)
+
+#else	/* !SK_LITTLE_ENDIAN */
+
+#define LE2Word(value)			\
+	((((value)<< 8L)&0xff00) +	\
+	(((value)>> 8L)&0x00ff))
+
+#endif	/* !SK_LITTLE_ENDIAN */
+
+/******************************************************************************
+ *
+ * Word2LE() - Converts the given value to a Little Endian value
+ *
+ * Description:
+ *	This function converts the value received as an argument to a Little Endian
+ *  value on Big Endian machines. If the machine running the code is Little
+ *  Endian, then no conversion is done.
+ *
+ * Returns:
+ *	The converted value
+ *
+ */
+
+#ifdef SK_LITTLE_ENDIAN
+
+#define Word2LE(value) (value)
+
+#else	/* !SK_LITTLE_ENDIAN */
+
+#define Word2LE(value) 			\
+	((((value)<< 8L)&0xff00) +	\
+	(((value)>> 8L)&0x00ff))
+
+#endif	/* !SK_LITTLE_ENDIAN */
+
+/******************************************************************************
+ *
+ * Transmit list element macros
+ *
+ */
+
+#define TXLE_SET_ADDR(pLE, Addr)	\
+	((pLE)->Tx.TxUn.BufAddr = DWord2LE(Addr))
+#define TXLE_SET_LSLEN(pLE, Len)	\
+	((pLE)->Tx.TxUn.LargeSend.Length = Word2LE(Len))
+#define TXLE_SET_STACS(pLE, Start)	\
+	((pLE)->Tx.TxUn.ChkSum.TxTcpSp = Word2LE(Start))
+#define TXLE_SET_WRICS(pLE, Write)	\
+	((pLE)->Tx.TxUn.ChkSum.TxTcpWp = Word2LE(Write))
+#define TXLE_SET_INICS(pLE, Ini)	((pLE)->Tx.Send.InitCsum = Word2LE(Ini))
+#define TXLE_SET_LEN(pLE, Len)		((pLE)->Tx.Send.BufLen = Word2LE(Len))
+#define TXLE_SET_VLAN(pLE, Vlan)	((pLE)->Tx.Send.VlanTag = Word2LE(Vlan))
+#define TXLE_SET_LCKCS(pLE, Lock)	((pLE)->Tx.ControlFlags = (Lock))
+#define TXLE_SET_CTRL(pLE, Ctrl)	((pLE)->Tx.ControlFlags = (Ctrl))
+#define TXLE_SET_OPC(pLE, Opc)		((pLE)->Tx.Opcode = (Opc))
+
+
+#define TXLE_GET_ADDR(pLE)		LE2DWord((pLE)->Tx.TxUn.BufAddr)
+#define TXLE_GET_LSLEN(pLE)		LE2Word((pLE)->Tx.TxUn.LargeSend.Length)
+#define TXLE_GET_STACS(pLE)		LE2Word((pLE)->Tx.TxUn.ChkSum.TxTcpSp)
+#define TXLE_GET_WRICS(pLE)		LE2Word((pLE)->Tx.TxUn.ChkSum.TxTcpWp)
+#define TXLE_GET_INICS(pLE)		LE2Word((pLE)->Tx.Send.InitCsum)
+#define TXLE_GET_LEN(pLE) 		LE2Word((pLE)->Tx.Send.BufLen)
+#define TXLE_GET_VLAN(pLE)		LE2Word((pLE)->Tx.Send.VlanTag)
+#define TXLE_GET_LCKCS(pLE)		((pLE)->Tx.ControlFlags)
+#define TXLE_GET_CTRL(pLE)		((pLE)->Tx.ControlFlags)
+#define TXLE_GET_OPC(pLE)		((pLE)->Tx.Opcode)
+
+/******************************************************************************
+ *
+ * Receive list element macros
+ *
+ */
+
+#define RXLE_SET_ADDR(pLE, Addr)	\
+	((pLE)->Rx.RxUn.BufAddr = (SK_U32) DWord2LE(Addr))
+#define RXLE_SET_STACS2(pLE, Offs)	\
+	((pLE)->Rx.RxUn.ChkSum.RxTcpSp2 = Word2LE(Offs))
+#define RXLE_SET_STACS1(pLE, Offs)	\
+	((pLE)->Rx.RxUn.ChkSum.RxTcpSp1 = Word2LE(Offs))
+#define RXLE_SET_LEN(pLE, Len)		((pLE)->Rx.BufferLength = Word2LE(Len))
+#define RXLE_SET_CTRL(pLE, Ctrl)	((pLE)->Rx.ControlFlags = (Ctrl))
+#define RXLE_SET_OPC(pLE, Opc)		((pLE)->Rx.Opcode = (Opc))
+
+
+#define RXLE_GET_ADDR(pLE)		LE2DWord((pLE)->Rx.RxUn.BufAddr)
+#define RXLE_GET_STACS2(pLE)	LE2Word((pLE)->Rx.RxUn.ChkSum.RxTcpSp2)
+#define RXLE_GET_STACS1(pLE)	LE2Word((pLE)->Rx.RxUn.ChkSum.RxTcpSp1)
+#define RXLE_GET_LEN(pLE) 		LE2Word((pLE)->Rx.BufferLength)
+#define RXLE_GET_CTRL(pLE)		((pLE)->Rx.ControlFlags)
+#define RXLE_GET_OPC(pLE)		((pLE)->Rx.Opcode)
+
+/******************************************************************************
+ *
+ * Status list element macros
+ *
+ */
+
+#define STLE_SET_OPC(pLE, Opc)		((pLE)->St.Opcode = (Opc))
+
+#define STLE_GET_FRSTATUS(pLE)	LE2DWord((pLE)->St.StUn.StRxStatWord)
+#define STLE_GET_TIST(pLE)		LE2DWord((pLE)->St.StUn.StRxTimeStamp)
+#define STLE_GET_TCP1(pLE)		LE2Word((pLE)->St.StUn.StRxTCPCSum.RxTCPSum1)
+#define STLE_GET_TCP2(pLE)		LE2Word((pLE)->St.StUn.StRxTCPCSum.RxTCPSum2)
+#define STLE_GET_LEN(pLE)		LE2Word((pLE)->St.Stat.BufLen)
+#define STLE_GET_VLAN(pLE)		LE2Word((pLE)->St.Stat.VlanTag)
+#define STLE_GET_LINK(pLE)		((pLE)->St.Link)
+#define STLE_GET_OPC(pLE)		((pLE)->St.Opcode)
+#define STLE_GET_DONE_IDX(pLE,LowVal,HighVal) {			\
+	(LowVal) = LE2DWord((pLE)->St.StUn.StTxStatLow);	\
+	(HighVal) = LE2Word((pLE)->St.Stat.StTxStatHi);		\
+}
+
+#define STLE_GET_RSS(pLE)		LE2DWord((pLE)->St.StUn.StRxRssValue)
+#define STLE_GET_IPBIT(pLE)		((pLE)->St.Stat.Rss.FlagField & RSS_IP_FLAG)
+#define STLE_GET_TCPBIT(pLE)	((pLE)->St.Stat.Rss.FlagField & RSS_TCP_FLAG)
+
+
+/* I always take both values as a paramter to avoid typos */
+#define STLE_GET_DONE_IDX_TXA1(LowVal,HighVal)			\
+	(((LowVal) & STLE_TXA1_MSKL) >> STLE_TXA1_SHIFTL)
+#define STLE_GET_DONE_IDX_TXS1(LowVal,HighVal)			\
+	((LowVal & STLE_TXS1_MSKL) >> STLE_TXS1_SHIFTL)
+#define STLE_GET_DONE_IDX_TXA2(LowVal,HighVal)			\
+	(((LowVal & STLE_TXA2_MSKL) >> STLE_TXA2_SHIFTL) + 	\
+	((HighVal & STLE_TXA2_MSKH) << STLE_TXA2_SHIFTH))
+#define STLE_GET_DONE_IDX_TXS2(LowVal,HighVal)			\
+	((HighVal & STLE_TXS2_MSKL) >> STLE_TXS2_SHIFTL)
+
+
+#define SK_Y2_RXSTAT_CHECK_PKT(Len, RxStat, IsOk) {				\
+	(IsOk) = (((RxStat) & GMR_FS_RX_OK) == GMR_FS_RX_OK) &&		\
+			 (((RxStat) & GMR_FS_ANY_ERR) == 0);				\
+																\
+	if ((IsOk) && ((SK_U16)(((RxStat) & GMR_FS_LEN_MSK) >>  	\
+		GMR_FS_LEN_SHIFT) != (Len))) {							\
+		/* length in MAC status differs from length in LE */	\
+		(IsOk) = SK_FALSE;										\
+	}															\
+}
+
+
+/******************************************************************************
+ *
+ * Polling unit list element macros
+ *
+ * NOTE: the Idx must be <= 0xfff and PU_PUTIDX_VALID makes them valid
+ *
+ */
+
+#ifdef USE_POLLING_UNIT
+
+#define POLE_SET_OPC(pLE, Opc)		((pLE)->Sa.Opcode = (Opc))
+#define POLE_SET_LINK(pLE, Port)	((pLE)->Sa.Link = (Port))
+#define POLE_SET_RXIDX(pLE, Idx)	((pLE)->Sa.RxIdxVld = Word2LE(Idx))
+#define POLE_SET_TXAIDX(pLE, Idx)	((pLE)->Sa.TxAIdxVld = Word2LE(Idx))
+#define POLE_SET_TXSIDX(pLE, Idx)	((pLE)->Sa.TxSIdxVld = Word2LE(Idx))
+
+#define POLE_GET_OPC(pLE)		((pLE)->Sa.Opcode)
+#define POLE_GET_LINK(pLE)		((pLE)->Sa.Link)
+#define POLE_GET_RXIDX(pLE)		LE2Word((pLE)->Sa.RxIdxVld)
+#define POLE_GET_TXAIDX(pLE)	LE2Word((pLE)->Sa.TxAIdxVld)
+#define POLE_GET_TXSIDX(pLE)	LE2Word((pLE)->Sa.TxSIdxVld)
+
+#endif	/* USE_POLLING_UNIT */
+
+/******************************************************************************
+ *
+ * Debug macros for list elements
+ *
+ */
+
+#ifdef DEBUG
+
+#define SK_DBG_DUMP_RX_LE(pLE)	{										\
+	SK_U8	Opcode;														\
+	SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,						\
+		("=== RX_LIST_ELEMENT @addr: %p cont: %02x %02x %02x %02x %02x %02x %02x %02x\n",	\
+		pLE, ((SK_U8 *) pLE)[0], ((SK_U8 *) pLE)[1], ((SK_U8 *) pLE)[2],\
+		((SK_U8 *) pLE)[3], ((SK_U8 *) pLE)[4], ((SK_U8 *) pLE)[5],		\
+		((SK_U8 *) pLE)[6], ((SK_U8 *) pLE)[7])); 						\
+	SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,						\
+		("\t (16bit) %04x %04x %04x %04x\n",							\
+		((SK_U16 *) pLE)[0], ((SK_U16 *) pLE)[1], ((SK_U16 *) pLE)[2],	\
+		((SK_U16 *) pLE)[3])); 											\
+	SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,						\
+		("\t (32bit) %08x %08x\n",										\
+		((SK_U32 *) pLE)[0], ((SK_U32 *) pLE)[1])); 					\
+	Opcode = RXLE_GET_OPC(pLE);											\
+	SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,					   	\
+		("\tOwn belongs to %s\n", ((Opcode & HW_OWNER) == HW_OWNER) ? 	\
+		 "Hardware" : "Software"));										\
+	SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,						\
+		("\tOpc: 0x%x ",Opcode));								   		\
+	switch (Opcode & (~HW_OWNER)) {									  	\
+	case OP_BUFFER:														\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,			   		\
+			("\tOP_BUFFER\n"));									   		\
+		break;															\
+	case OP_PACKET:									  	  	   			\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,			   		\
+			("\tOP_PACKET\n"));								   			\
+		break;															\
+	case OP_ADDR64:												   		\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,				   	\
+			("\tOP_ADDR64\n"));								   			\
+		break;															\
+	case OP_TCPSTART:												   	\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,				   	\
+			("\tOP_TCPPAR\n"));									   		\
+		break;															\
+	case SW_OWNER:														\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,			   		\
+			("\tunused LE\n"));									   		\
+		break;															\
+	default:														   	\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,				   	\
+			("\tunknown Opcode!!!\n"));								   	\
+		break;															\
+	}																	\
+	if ((Opcode & OP_BUFFER) == OP_BUFFER) {							\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,					\
+			("\tControl: 0x%x\n", RXLE_GET_CTRL(pLE)));					\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,					\
+			("\tBufLen: 0x%x\n", RXLE_GET_LEN(pLE)));					\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,					\
+			("\tLowAddr: 0x%x\n", RXLE_GET_ADDR(pLE)));					\
+	}																	\
+	if ((Opcode & OP_ADDR64) == OP_ADDR64) {							\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,					\
+			("\tHighAddr: 0x%x\n", RXLE_GET_ADDR(pLE)));				\
+	}																	\
+	if ((Opcode & OP_TCPSTART) == OP_TCPSTART) {	  		  			\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,					\
+			("\tTCP Sum Start 1 : 0x%x\n", RXLE_GET_STACS1(pLE)));		\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,					\
+			("\tTCP Sum Start 2 : 0x%x\n", RXLE_GET_STACS2(pLE)));		\
+	}																	\
+	SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,						\
+		("=====================\n"));									\
+}
+
+#define SK_DBG_DUMP_TX_LE(pLE)	{										\
+	SK_U8	Opcode;														\
+	SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,						\
+		("=== TX_LIST_ELEMENT @addr: %p cont: %02x %02x %02x %02x %02x %02x %02x %02x\n",	\
+		pLE, ((SK_U8 *) pLE)[0], ((SK_U8 *) pLE)[1], ((SK_U8 *) pLE)[2],\
+		((SK_U8 *) pLE)[3], ((SK_U8 *) pLE)[4], ((SK_U8 *) pLE)[5],		\
+		((SK_U8 *) pLE)[6], ((SK_U8 *) pLE)[7])); 						\
+	SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,						\
+		("\t (16bit) %04x %04x %04x %04x\n",							\
+		((SK_U16 *) pLE)[0], ((SK_U16 *) pLE)[1], ((SK_U16 *) pLE)[2],	\
+		((SK_U16 *) pLE)[3])); 											\
+	SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,						\
+		("\t (32bit) %08x %08x\n",										\
+		((SK_U32 *) pLE)[0], ((SK_U32 *) pLE)[1])); 					\
+	Opcode = TXLE_GET_OPC(pLE);										   	\
+	SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,					   	\
+		("\tOwn belongs to %s\n", ((Opcode & HW_OWNER) == HW_OWNER) ? 	\
+		"Hardware" : "Software"));										\
+	SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,					   	\
+		("\tOpc: 0x%x ",Opcode));								   		\
+	switch (Opcode & (~HW_OWNER)) {									   	\
+	case OP_TCPCHKSUM:										 	      	\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,				   	\
+			("\tOP_TCPCHKSUM\n"));									   	\
+		break;											   		 		\
+	case OP_TCPIS:										  		  	   	\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,				   	\
+			("\tOP_TCPIS\n"));										   	\
+		break;												  		  	\
+	case OP_TCPLCK:													   	\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,		   	    	\
+			("\tOP_TCPLCK\n"));								   	    	\
+		break;												   		 	\
+	case OP_TCPLW:													   	\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,		   	    	\
+			("\tOP_TCPLW\n"));								   	    	\
+		break;															\
+	case OP_TCPLSW:													   	\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,				   	\
+			("\tOP_TCPLSW\n"));										   	\
+		break;															\
+	case OP_TCPLISW:												   	\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,				   	\
+			("\tOP_TCPLISW\n"));						 		   	   	\
+		break;											 		   		\
+	case OP_ADDR64:										 		   	   	\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,	  	     	   	\
+			("\tOP_ADDR64\n"));										   	\
+		break;															\
+	case OP_VLAN:													   	\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,			   		\
+			("\tOP_VLAN\n"));										   	\
+		break;															\
+	case OP_ADDR64VLAN:												   	\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,				   	\
+			("\tOP_ADDR64VLAN\n"));								   		\
+		break;															\
+	case OP_LRGLEN:													   	\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,				   	\
+			("\tOP_LRGLEN\n"));										   	\
+		break;															\
+	case OP_LRGLENVLAN:												   	\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,			   		\
+			("\tOP_LRGLENVLAN\n"));									   	\
+		break;															\
+	case OP_BUFFER:													   	\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,				   	\
+			("\tOP_BUFFER\n"));									   		\
+		break;															\
+	case OP_PACKET:												   		\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,				   	\
+			("\tOP_PACKET\n"));										   	\
+		break;															\
+	case OP_LARGESEND:													\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,			   		\
+			("\tOP_LARGESEND\n"));									   	\
+		break;															\
+	case SW_OWNER:														\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,			   		\
+			("\tunused LE\n"));										   	\
+		break;															\
+	default:														   	\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,				   	\
+			("\tunknown Opcode!!!\n"));								   	\
+		break;															\
+	}																	\
+	if ((Opcode & OP_BUFFER) == OP_BUFFER) {							\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,					\
+			("\tControl: 0x%x\n", TXLE_GET_CTRL(pLE)));					\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,					\
+			("\tBufLen: 0x%x\n", TXLE_GET_LEN(pLE)));					\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,					\
+			("\tLowAddr: 0x%x\n", TXLE_GET_ADDR(pLE)));					\
+	}																	\
+	if ((Opcode & OP_ADDR64) == OP_ADDR64) {							\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,					\
+			("\tHighAddr: 0x%x\n", TXLE_GET_ADDR(pLE)));				\
+	}																	\
+	if ((Opcode & OP_VLAN) == OP_VLAN) {								\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,					\
+			("\tVLAN Id: 0x%x\n", TXLE_GET_VLAN(pLE)));					\
+	}																	\
+	if ((Opcode & OP_LRGLEN) == OP_LRGLEN) {				   			\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,					\
+			("\tLarge send length: 0x%x\n", TXLE_GET_LSLEN(pLE)));		\
+	}																	\
+	if ((Opcode &(~HW_OWNER)) <= OP_ADDR64) {							\
+		if ((Opcode & OP_TCPWRITE) == OP_TCPWRITE) {					\
+			SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,				\
+				("\tTCP Sum Write: 0x%x\n", TXLE_GET_WRICS(pLE)));		\
+		}																\
+		if ((Opcode & OP_TCPSTART) == OP_TCPSTART) {					\
+			SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,				\
+				("\tTCP Sum Start: 0x%x\n", TXLE_GET_STACS(pLE)));		\
+		}																\
+		if ((Opcode & OP_TCPINIT) == OP_TCPINIT) {					  	\
+			SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,				\
+				("\tTCP Sum Init: 0x%x\n", TXLE_GET_INICS(pLE)));		\
+		}																\
+		if ((Opcode & OP_TCPLCK) == OP_TCPLCK) {					  	\
+			SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,				\
+				("\tTCP Sum Lock: 0x%x\n", TXLE_GET_LCKCS(pLE)));		\
+		}																\
+	}																	\
+	SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,						\
+		("=====================\n"));									\
+}
+	
+#define SK_DBG_DUMP_ST_LE(pLE)	{ 										\
+	SK_U8	Opcode;														\
+	SK_U16	HighVal;													\
+	SK_U32	LowVal;														\
+	SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,						\
+		("=== ST_LIST_ELEMENT @addr: %p contains: %02x %02x %02x %02x %02x %02x %02x %02x\n",	\
+		pLE, ((SK_U8 *) pLE)[0], ((SK_U8 *) pLE)[1], ((SK_U8 *) pLE)[2],\
+		((SK_U8 *) pLE)[3], ((SK_U8 *) pLE)[4], ((SK_U8 *) pLE)[5],		\
+		((SK_U8 *) pLE)[6], ((SK_U8 *) pLE)[7])); 						\
+	SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,						\
+		("\t (16bit) %04x %04x %04x %04x\n",							\
+		((SK_U16 *) pLE)[0], ((SK_U16 *) pLE)[1], ((SK_U16 *) pLE)[2],	\
+		((SK_U16 *) pLE)[3])); 											\
+	SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,						\
+		("\t (32bit) %08x %08x\n",										\
+		((SK_U32 *) pLE)[0], ((SK_U32 *) pLE)[1])); 					\
+	Opcode = STLE_GET_OPC(pLE);											\
+	SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,					   	\
+		("\tOwn belongs to %s\n", ((Opcode & HW_OWNER) == SW_OWNER) ? 	\
+		"Hardware" : "Software"));										\
+	SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,						\
+		("\tOpc: 0x%x",	Opcode));										\
+	Opcode &= (~HW_OWNER);												\
+	switch (Opcode) {													\
+	case OP_RXSTAT:										 	     		\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,				   	\
+			("\tOP_RXSTAT\n"));								   			\
+		break;															\
+	case OP_RXTIMESTAMP:												\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,				   	\
+			("\tOP_RXTIMESTAMP\n"));									\
+		break;															\
+	case OP_RXVLAN:											  			\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,				   	\
+			("\tOP_RXVLAN\n"));										   	\
+		break;															\
+	case OP_RXCHKS:											  			\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,	 		   	   	\
+			("\tOP_RXCHKS\n"));										   	\
+		break;											 		   		\
+	case OP_RXCHKSVLAN:									 	     		\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,	 		   	   	\
+			("\tOP_RXCHKSVLAN\n"));						 		   	   	\
+		break;											 		   		\
+	case OP_RXTIMEVLAN:									 	     		\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,	   		 	   	\
+			("\tOP_RXTIMEVLAN\n"));						   		 	   	\
+		break;											   		 		\
+	case OP_RSS_HASH:											  		\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,				   	\
+			("\tOP_RSS_HASH\n"));									   	\
+		break;															\
+	case OP_TXINDEXLE:											  		\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,				   	\
+			("\tOP_TXINDEXLE\n"));						  		  	   	\
+		break;															\
+	case HW_OWNER:											  			\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,				   	\
+			("\tunused LE\n"));						  		  	   		\
+		break;															\
+	default:												  			\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,				   	\
+			("\tunknown status list element!!!\n"));				   	\
+		break;															\
+	}																	\
+	SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,						\
+		("\tPort: %c\n", 'A' + STLE_GET_LINK(pLE)));					\
+	if (Opcode == OP_RXSTAT) {											\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,					\
+			("\tFrameLen: 0x%x\n", STLE_GET_LEN(pLE)));					\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,					\
+			("\tFrameStat: 0x%x\n", STLE_GET_FRSTATUS(pLE)));			\
+	}																	\
+	if ((Opcode & OP_RXVLAN) == OP_RXVLAN) {							\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,					\
+			("\tVLAN Id: 0x%x\n", STLE_GET_VLAN(pLE)));					\
+	}																	\
+	if ((Opcode & OP_RXTIMESTAMP) == OP_RXTIMESTAMP) {					\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,					\
+			("\tTimestamp: 0x%x\n", STLE_GET_TIST(pLE)));				\
+	}																	\
+	if ((Opcode & OP_RXCHKS) == OP_RXCHKS) {							\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,					\
+			("\tTCP: 0x%x 0x%x\n", STLE_GET_TCP1(pLE),					\
+			STLE_GET_TCP2(pLE)));										\
+	}																	\
+	if (Opcode == OP_TXINDEXLE) {										\
+		STLE_GET_DONE_IDX(pLE, LowVal, HighVal);						\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,					\
+			("\tTx Index TxA1: 0x%x\n",									\
+			STLE_GET_DONE_IDX_TXA1(LowVal,HighVal)));					\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,					\
+			("\tTx Index TxS1: 0x%x\n",									\
+			STLE_GET_DONE_IDX_TXS1(LowVal,HighVal)));					\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,					\
+			("\tTx Index TxA2: 0x%x\n",									\
+			STLE_GET_DONE_IDX_TXA2(LowVal,HighVal)));					\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,					\
+			("\tTx Index TxS2: 0x%x\n",									\
+			STLE_GET_DONE_IDX_TXS2(LowVal,HighVal)));					\
+	}																	\
+	SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,						\
+		("=====================\n"));									\
+}
+
+#ifdef USE_POLLING_UNIT
+#define SK_DBG_DUMP_PO_LE(pLE)	{										\
+	SK_U8	Opcode;														\
+	SK_U16	Idx;														\
+	SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,						\
+		("=== PO_LIST_ELEMENT @addr: %p cont: %02x %02x %02x %02x %02x %02x %02x %02x\n",	\
+		pLE, ((SK_U8 *) pLE)[0], ((SK_U8 *) pLE)[1], ((SK_U8 *) pLE)[2],\
+		((SK_U8 *) pLE)[3], ((SK_U8 *) pLE)[4], ((SK_U8 *) pLE)[5],		\
+		((SK_U8 *) pLE)[6], ((SK_U8 *) pLE)[7])); 						\
+	SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,						\
+		("\t (16bit) %04x %04x %04x %04x\n",							\
+		((SK_U16 *) pLE)[0], ((SK_U16 *) pLE)[1], ((SK_U16 *) pLE)[2],	\
+		((SK_U16 *) pLE)[3])); 											\
+	SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,						\
+		("\t (32bit) %08x %08x\n",										\
+		((SK_U32 *) pLE)[0], ((SK_U32 *) pLE)[1])); 					\
+	Opcode = POLE_GET_OPC(pLE);											\
+	SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,						\
+		 ("\tOwn belongs to %s\n", ((Opcode & HW_OWNER) == HW_OWNER) ? 	\
+		  "Hardware" : "Software"));									\
+	SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,						\
+		 ("\tOpc: 0x%x ",Opcode));										\
+	if ((Opcode & ~HW_OWNER) == OP_PUTIDX) {							\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,			   		\
+			("\tOP_PUTIDX\n"));								   			\
+	}																	\
+	else {																\
+		SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,				   	\
+			("\tunknown Opcode!!!\n"));								   	\
+	}																	\
+	SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,			   			\
+		("\tPort %c\n", 'A' + POLE_GET_LINK(pLE)));						\
+	Idx = POLE_GET_TXAIDX(pLE);											\
+	SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,			   			\
+		("\tTxA Index is 0x%X and %svalid\n", Idx,						\
+		(Idx & PU_PUTIDX_VALID) ? "" : "not "));						\
+	Idx = POLE_GET_TXSIDX(pLE);											\
+	SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,			   			\
+		("\tTxS Index is 0x%X and %svalid\n", Idx,						\
+		(Idx & PU_PUTIDX_VALID) ? "" : "not "));						\
+	Idx = POLE_GET_RXIDX(pLE);											\
+	SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,			   			\
+		("\tRx Index is 0x%X and %svalid\n", Idx,						\
+		(Idx & PU_PUTIDX_VALID) ? "" : "not "));						\
+	SK_DBG_MSG(pAc, SK_DBGMOD_HWM, SK_DBGCAT_INIT,						\
+		("=====================\n"));									\
+}
+#endif	/* USE_POLLING_UNIT */
+
+#else	/* !DEBUG */
+
+#define SK_DBG_DUMP_RX_LE(pLE)
+#define SK_DBG_DUMP_TX_LE(pLE)
+#define SK_DBG_DUMP_ST_LE(pLE)
+#define SK_DBG_DUMP_PO_LE(pLE)
+
+#endif	/* !DEBUG */
+
+/******************************************************************************
+ *
+ * Macros for listelement tables
+ *
+ *
+ */
+
+#define LE_SIZE sizeof(SK_HWLE)
+#define LE_TAB_SIZE(NumElements)	((NumElements) * LE_SIZE)
+
+/* Number of unused list elements in table
+ * this macro always returns the number of free listelements - 1
+ * this way we want to guarantee that always one LE remains unused
+ */
+#define NUM_FREE_LE_IN_TABLE(pTable) 									\
+	( ((pTable)->Put >= (pTable)->Done) ?									\
+	(NUM_LE_IN_TABLE(pTable) - (pTable)->Put + (pTable)->Done - 1) :	\
+	((pTable)->Done - (pTable)->Put - 1) )
+
+/* total number of list elements in table */
+#define NUM_LE_IN_TABLE(pTable)		((pTable)->Num)
+	
+/* get next unused rx list element */
+#define GET_RX_LE(pLE, pTable) {										\
+	pLE = &(pTable)->pLETab[(pTable)->Put];								\
+	(pTable)->Put = ((pTable)->Put + 1) % NUM_LE_IN_TABLE(pTable);		\
+}
+	
+/* get next unused tx list element */
+#define GET_TX_LE(pLE, pTable)	GET_RX_LE(pLE, pTable)
+
+/* get next status list element expected to be finished by hw */
+#define GET_ST_LE(pLE, pTable) {										\
+	pLE = &(pTable)->pLETab[(pTable)->Done];							\
+	(pTable)->Done = ((pTable)->Done +1) % NUM_LE_IN_TABLE(pTable);		\
+}
+
+#ifdef USE_POLLING_UNIT
+/* get next polling unit list element for port */
+#define GET_PO_LE(pLE, pTable, Port) {									\
+	pLE = &(pTable)->pLETab[(Port)];									\
+}
+#endif	/* USE_POLLING_UNIT */
+
+#define GET_PUT_IDX(pTable)			((pTable)->Put)
+
+#define UPDATE_HWPUT_IDX(pTable)	{(pTable)->HwPut = (pTable)->Put; }
+
+/*
+ * get own bit of next status LE
+ * if the result is != 0 there has been at least one status LE finished
+ */
+#define OWN_OF_FIRST_LE(pTable)											\
+	(STLE_GET_OPC(&(pTable)->pLETab[(pTable)->Done]) & HW_OWNER)
+
+#define SET_DONE_INDEX(pTable, Idx)	(pTable)->Done = (Idx);
+
+#define GET_DONE_INDEX(pTable)	((pTable)->Done)
+
+#ifdef SAFE_BUT_SLOW
+
+/* check own bit of LE before current done idx */
+#define CHECK_STLE_OVERFLOW(pTable, IsOk) {						\
+		unsigned i;												\
+		if ((i = (pTable)->Done) == 0) {						\
+			i = NUM_LE_IN_TABLE(pTable);						\
+		}														\
+		else {													\
+			i = i - 1; 											\
+		}														\
+		if (STLE_GET_OPC(&(pTable)->pLETab[i]) == HW_OWNER) {	\
+			(IsOk) = SK_TRUE;									\
+		}														\
+		else {													\
+			(IsOk) = SK_FALSE;									\
+		}														\
+	}
+
+
+/*
+ * for Yukon2 the hardware is not polling the list elements, so it
+ * is not necessary to change the own-bit of rx or tx-LEs before
+ * reusing them
+ * but it might make debugging easier if one simply can see whether
+ * a LE has been worked on
+ */
+	
+#define CLEAR_LE_OWN(pTable, Idx)								\
+	STLE_SET_OPC(&(pTable)->pLETab[(Idx)], SW_OWNER)
+
+/*
+ * clear all own bits starting from old done index up to the LE before
+ * the new done index
+ */
+#define CLEAR_LE_OWN_FROM_DONE_TO(pTable, To) {					\
+		int i;													\
+		i = (pTable)->Done;										\
+		while (i != To) {										\
+			CLEAR_LE_OWN(pTable, i);							\
+			i = (i + 1) % NUM_LE_IN_TABLE(pTable);				\
+		}														\
+	}
+
+#else	/* !SAFE_BUT_SLOW */
+
+#define CHECK_STLE_OVERFLOW(pTable, IsOk)
+#define CLEAR_LE_OWN(pTable, Idx)
+#define CLEAR_LE_OWN_FROM_DONE_TO(pTable, To)
+
+#endif	/* !SAFE_BUT_SLOW */
+
+
+/* typedefs *******************************************************************/
+
+typedef struct s_LetRxTx {
+	SK_U16	VlanId;			/* VLAN Id given down last time */
+	SK_U16	TcpWp;			/* TCP Checksum Write Position */
+	SK_U16	TcpSp1;			/* TCP Checksum Calculation Start Position 1 */
+	SK_U16	TcpSp2;			/* TCP Checksum Calculation Start Position 2 */
+	SK_U16	MssValue;		/* Maximum Segment Size */
+	SK_U16	Reserved1;		/* reserved word for furture extensions */
+	SK_U16	Reserved2;		/* reserved word for furture extensions */
+	SK_U16	Reserved3;		/* reserved word for furture extensions */
+} SK_LET_RX_TX;
+
+typedef struct s_LetStat {
+	SK_U32	RxTimeStamp;	/* Receive Timestamp */
+	SK_U32	RssHashValue;	/* RSS Hash Value */
+	SK_BOOL	RssIsIp;		/* RSS Hash Value: IP packet detected */
+	SK_BOOL	RssIsTcp;		/* RSS Hash Value: IP+TCP packet detected */
+	SK_U16	VlanId;			/* VLAN Id given received by Status BMU */
+	SK_U16	TcpSum1;		/* TCP checksum 1 (status BMU) */
+	SK_U16	TcpSum2;		/* TCP checksum 2 (status BMU) */
+} SK_LET_STAT;
+
+
+typedef union s_LetBmuSpec {
+	SK_LET_RX_TX	RxTx;	/* Rx/Tx BMU specific variables */
+	SK_LET_STAT		Stat;	/* Status BMU specific variables */
+} SK_LET_BMU_S;
+
+
+
+typedef	struct s_le_table SK_LE_TABLE;
+
+struct s_le_table {
+	/* all LE's between Done and HWPut are owned by the hardware */
+	/* all LE's between Put and Done can be used from Software */
+	/* all LE's between HWPut and Put are currently processed in DriverSend */
+	unsigned Done;			/* done index - consumed from HW and available */
+	unsigned Put;			/* put index - to be given to hardware */
+	unsigned HwPut;			/* put index actually given to hardware */
+	unsigned Num;			/* total number of list elements */
+	SK_HWLE *pLETab;		/* virtual address of list element table */
+	SK_U32	pPhyLETABLow;	/* physical address of list element table */
+	SK_U32	pPhyLETABHigh;	/* physical address of list element table */
+	/* values to remember in order to save some LEs */
+	SK_U32	BufHighAddr;	/* high addr given down last time */
+	SK_LET_BMU_S Bmu;		/* contains BMU specific information */
+	SK_U32	private;		/* driver private variable free usable */
+	SK_U16	TcpInitCsum;	/* Init. Checksum */
+};
+
+/* function prototypes ********************************************************/
+
+#ifndef	SK_KR_PROTO
+
+/*
+ * public functions in sky2le.c
+ */
+extern void SkGeY2SetPutIndex(
+	SK_AC	*pAC,
+	SK_IOC	IoC,
+	SK_U32 StartAddrPrefetchUnit,
+	SK_LE_TABLE *pLETab);
+
+extern void SkGeY2InitPrefetchUnit(
+	SK_AC	*pAC,
+	SK_IOC	IoC,
+	unsigned int Queue,
+	SK_LE_TABLE *pLETab);
+
+extern void SkGeY2InitStatBmu(
+	SK_AC	*pAC,
+	SK_IOC	IoC,
+	SK_LE_TABLE *pLETab);
+
+extern void SkGeY2InitPollUnit(
+	SK_AC	*pAC,
+	SK_IOC	IoC,
+	SK_LE_TABLE *pLETab);
+
+extern void SkGeY2InitSingleLETable(
+	SK_AC	*pAC,
+	SK_LE_TABLE *pLETab,
+	unsigned int NumLE,
+	void	*pVMem,
+	SK_U32	PMemLowAddr,
+	SK_U32	PMemHighAddr);
+
+#else	/* SK_KR_PROTO */
+extern void SkGeY2SetPutIndex();
+extern void SkGeY2InitPrefetchUnit();
+extern void SkGeY2InitStatBmu();
+extern void SkGeY2InitPollUnit();
+extern void SkGeY2InitSingleLETable();
+#endif	/* SK_KR_PROTO */
+
+#ifdef __cplusplus
+}
+#endif	/* __cplusplus */
+
+#endif	/* __INC_SKY2LE_H */
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/xmac_ii.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/xmac_ii.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/h/xmac_ii.h	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/h/xmac_ii.h	2004-09-09 13:20:48.000000000 +0200
@@ -2,8 +2,8 @@
  *
  * Name:	xmac_ii.h
  * Project:	Gigabit Ethernet Adapters, Common Modules
- * Version:	$Revision: 1.54 $
- * Date:	$Date: 2004/01/21 14:50:31 $
+ * Version:	$Revision: 2.7 $
+ * Date:	$Date: 2004/07/02 15:01:01 $
  * Purpose:	Defines and Macros for Gigabit Ethernet Controller
  *
  ******************************************************************************/
@@ -11,13 +11,12 @@
 /******************************************************************************
  *
  *	(C)Copyright 1998-2002 SysKonnect.
- *	(C)Copyright 2002-2003 Marvell.
+ *	(C)Copyright 2002-2004 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
  *	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.
  *
  ******************************************************************************/
@@ -449,7 +448,7 @@ extern "C" {
 /*
  * Receive Frame Status Encoding
  */
-#define XMR_FS_LEN	(0x3fffUL<<18)	/* Bit 31..18:	Rx Frame Length */
+#define XMR_FS_LEN_MSK	(0x3fffUL<<18)	/* Bit 31..18:	Rx Frame Length */
 #define XMR_FS_2L_VLAN	(1L<<17)	/* Bit 17:	tagged wh 2Lev VLAN ID*/
 #define XMR_FS_1L_VLAN	(1L<<16)	/* Bit 16:	tagged wh 1Lev VLAN ID*/
 #define XMR_FS_BC		(1L<<15)	/* Bit 15:	Broadcast Frame */
@@ -469,6 +468,8 @@ extern "C" {
 #define XMR_FS_ERR		(1L<<1)		/* Bit  1:	Frame Error */
 #define XMR_FS_MCTRL	(1L<<0)		/* Bit  0:	MAC Control Packet */
 
+#define XMR_FS_LEN_SHIFT	18
+
 /*
  * XMR_FS_ERR will be set if
  *	XMR_FS_FCS_ERR, XMR_FS_LNG_ERR, XMR_FS_RUNT,
@@ -552,13 +553,21 @@ extern "C" {
 #define PHY_MARV_EXT_CTRL	0x14	/* 16 bit r/w	Ext. PHY Specific Ctrl */
 #define PHY_MARV_RXE_CNT	0x15	/* 16 bit r/w	Receive Error Counter */
 #define PHY_MARV_EXT_ADR	0x16	/* 16 bit r/w	Ext. Ad. for Cable Diag. */
-	/* 0x17:		reserved */
+#define PHY_MARV_PORT_IRQ	0x17	/* 16 bit r/o	Port 0 IRQ (88E1111 only) */
 #define PHY_MARV_LED_CTRL	0x18	/* 16 bit r/w	LED Control Reg */
 #define PHY_MARV_LED_OVER	0x19	/* 16 bit r/w	Manual LED Override Reg */
 #define PHY_MARV_EXT_CTRL_2	0x1a	/* 16 bit r/w	Ext. PHY Specific Ctrl 2 */
 #define PHY_MARV_EXT_P_STAT	0x1b	/* 16 bit r/w	Ext. PHY Spec. Stat Reg */
 #define PHY_MARV_CABLE_DIAG	0x1c	/* 16 bit r/o	Cable Diagnostic Reg */
-	/* 0x1d - 0x1f:		reserved */
+#define PHY_MARV_PAGE_ADDR	0x1d	/* 16 bit r/w	Extended Page Address Reg */
+#define PHY_MARV_PAGE_DATA	0x1e	/* 16 bit r/w	Extended Page Data Reg */
+
+/* for 10/100 Fast Ethernet PHY (88E3082 only) */
+#define PHY_MARV_FE_LED_PAR	0x16	/* 16 bit r/w	LED Parallel Select Reg. */
+#define PHY_MARV_FE_LED_SER	0x17	/* 16 bit r/w	LED Stream Select S. LED */
+#define PHY_MARV_FE_VCT_TX	0x1a	/* 16 bit r/w	VCT Reg. for TXP/N Pins */
+#define PHY_MARV_FE_VCT_RX	0x1b	/* 16 bit r/o	VCT Reg. for RXP/N Pins */
+#define PHY_MARV_FE_SPEC_2	0x1c	/* 16 bit r/w	Specific Control Reg. 2 */
 
 /*----------------------------------------------------------------------------*/
 /*
@@ -667,7 +676,7 @@ extern "C" {
 /*****	PHY_LONE_ID1		16 bit r/o	PHY ID1 Register */
 #define PHY_I1_OUI_MSK	(0x3f<<10)	/* Bit 15..10:	Organization Unique ID */
 #define PHY_I1_MOD_NUM	(0x3f<<4)	/* Bit  9.. 4:	Model Number */
-#define PHY_I1_REV_MSK	0x0f		/* Bit  3.. 0:	Revision Number */
+#define PHY_I1_REV_MSK	0xf			/* Bit  3.. 0:	Revision Number */
 
 /* different Broadcom PHY Ids */
 #define PHY_BCOM_ID1_A1		0x6041
@@ -1029,9 +1038,8 @@ extern "C" {
 									/* Bit  9..0:	not described */
 
 /*****  PHY_LONE_CIM		16 bit r/o	CIM Reg *****/
-#define PHY_L_CIM_ISOL		(255<<8)/* Bit 15..8:	Isolate Count */
-#define PHY_L_CIM_FALSE_CAR	(255<<0)/* Bit  7..0:	False Carrier Count */
-
+#define PHY_L_CIM_ISOL		(0xff<<8)	/* Bit 15..8:	Isolate Count */
+#define PHY_L_CIM_FALSE_CAR	0xff		/* Bit  7..0:	False Carrier Count */
 
 /*
  * Pause Bits (PHY_L_AN_ASP and PHY_L_AN_PC) encoding
@@ -1041,7 +1049,6 @@ extern "C" {
 #define PHY_L_P_ASYM_MD		(2<<10)	/* Bit 11..10:	asymmetric Pause Mode */
 #define PHY_L_P_BOTH_MD		(3<<10)	/* Bit 11..10:	both Pause Mode */
 
-
 /*
  * National-Specific
  */
@@ -1086,22 +1093,24 @@ extern "C" {
  */
 /*****  PHY_MARV_AUNE_ADV	16 bit r/w	Auto-Negotiation Advertisement *****/
 /*****  PHY_MARV_AUNE_LP	16 bit r/w	Link Part Ability Reg *****/
-#define PHY_M_AN_NXT_PG		BIT_15	/* Request Next Page */
-#define PHY_M_AN_ACK		BIT_14	/* (ro)	Acknowledge Received */
-#define PHY_M_AN_RF			BIT_13	/* Remote Fault */
-									/* Bit 12:	reserved */
-#define PHY_M_AN_ASP		BIT_11	/* Asymmetric Pause */
-#define PHY_M_AN_PC			BIT_10	/* MAC Pause implemented */
-#define PHY_M_AN_100_FD		BIT_8	/* Advertise 100Base-TX Full Duplex */
-#define PHY_M_AN_100_HD		BIT_7	/* Advertise 100Base-TX Half Duplex */
-#define PHY_M_AN_10_FD		BIT_6	/* Advertise 10Base-TX Full Duplex */
-#define PHY_M_AN_10_HD		BIT_5	/* Advertise 10Base-TX Half Duplex */
+#define PHY_M_AN_NXT_PG		BIT_15S	/* Request Next Page */
+#define PHY_M_AN_ACK		BIT_14S	/* (ro)	Acknowledge Received */
+#define PHY_M_AN_RF			BIT_13S	/* Remote Fault */
+								/* Bit 12:	reserved */
+#define PHY_M_AN_ASP		BIT_11S	/* Asymmetric Pause */
+#define PHY_M_AN_PC			BIT_10S	/* MAC Pause implemented */
+#define PHY_M_AN_100_T4		BIT_9S	/* Not cap. 100Base-T4 (always 0) */
+#define PHY_M_AN_100_FD		BIT_8S	/* Advertise 100Base-TX Full Duplex */
+#define PHY_M_AN_100_HD		BIT_7S	/* Advertise 100Base-TX Half Duplex */
+#define PHY_M_AN_10_FD		BIT_6S	/* Advertise 10Base-TX Full Duplex */
+#define PHY_M_AN_10_HD		BIT_5S	/* Advertise 10Base-TX Half Duplex */
+#define PHY_M_AN_SEL_MSK	(0x1f<<4)	/* Bit  4.. 0:	Selector Field Mask */
 
 /* special defines for FIBER (88E1011S only) */
-#define PHY_M_AN_ASP_X		BIT_8	/* Asymmetric Pause */
-#define PHY_M_AN_PC_X		BIT_7	/* MAC Pause implemented */
-#define PHY_M_AN_1000X_AHD	BIT_6	/* Advertise 10000Base-X Half Duplex */
-#define PHY_M_AN_1000X_AFD	BIT_5	/* Advertise 10000Base-X Full Duplex */
+#define PHY_M_AN_ASP_X		BIT_8S	/* Asymmetric Pause */
+#define PHY_M_AN_PC_X		BIT_7S	/* MAC Pause implemented */
+#define PHY_M_AN_1000X_AHD	BIT_6S	/* Advertise 10000Base-X Half Duplex */
+#define PHY_M_AN_1000X_AFD	BIT_5S	/* Advertise 10000Base-X Full Duplex */
 
 /* Pause Bits (PHY_M_AN_ASP_X and PHY_M_AN_PC_X) encoding */
 #define PHY_M_P_NO_PAUSE_X	(0<<7)	/* Bit  8.. 7:	no Pause Mode */
@@ -1111,26 +1120,26 @@ extern "C" {
 
 /*****  PHY_MARV_1000T_CTRL	16 bit r/w	1000Base-T Control Reg *****/
 #define PHY_M_1000C_TEST	(7<<13)	/* Bit 15..13:	Test Modes */
-#define PHY_M_1000C_MSE		(1<<12)	/* Bit 12:	Manual Master/Slave Enable */
-#define PHY_M_1000C_MSC		(1<<11)	/* Bit 11:	M/S Configuration (1=Master) */
-#define PHY_M_1000C_MPD		(1<<10)	/* Bit 10:	Multi-Port Device */
-#define PHY_M_1000C_AFD		(1<<9)	/* Bit  9:	Advertise Full Duplex */
-#define PHY_M_1000C_AHD		(1<<8)	/* Bit  8:	Advertise Half Duplex */
+#define PHY_M_1000C_MSE		BIT_12S	/* Manual Master/Slave Enable */
+#define PHY_M_1000C_MSC		BIT_11S	/* M/S Configuration (1=Master) */
+#define PHY_M_1000C_MPD		BIT_10S	/* Multi-Port Device */
+#define PHY_M_1000C_AFD		BIT_9S	/* Advertise Full Duplex */
+#define PHY_M_1000C_AHD		BIT_8S	/* Advertise Half Duplex */
 									/* Bit  7..0:	reserved */
 
 /*****  PHY_MARV_PHY_CTRL	16 bit r/w	PHY Specific Ctrl Reg *****/
 #define PHY_M_PC_TX_FFD_MSK	(3<<14)	/* Bit 15..14:	Tx FIFO Depth Mask */
 #define PHY_M_PC_RX_FFD_MSK	(3<<12)	/* Bit 13..12:	Rx FIFO Depth Mask */
-#define PHY_M_PC_ASS_CRS_TX	(1<<11)	/* Bit 11:	Assert CRS on Transmit */
-#define PHY_M_PC_FL_GOOD	(1<<10)	/* Bit 10:	Force Link Good */
+#define PHY_M_PC_ASS_CRS_TX	BIT_11S	/* Assert CRS on Transmit */
+#define PHY_M_PC_FL_GOOD	BIT_10S	/* Force Link Good */
 #define PHY_M_PC_EN_DET_MSK	(3<<8)	/* Bit  9.. 8:	Energy Detect Mask */
-#define PHY_M_PC_ENA_EXT_D	(1<<7)	/* Bit  7:	Enable Ext. Distance (10BT) */
+#define PHY_M_PC_ENA_EXT_D	BIT_7S	/* Enable Ext. Distance (10BT) */
 #define PHY_M_PC_MDIX_MSK	(3<<5)	/* Bit  6.. 5:	MDI/MDIX Config. Mask */
-#define PHY_M_PC_DIS_125CLK	(1<<4)	/* Bit  4:	Disable 125 CLK */
-#define PHY_M_PC_MAC_POW_UP	(1<<3)	/* Bit  3:	MAC Power up */
-#define PHY_M_PC_SQE_T_ENA	(1<<2)	/* Bit  2:	SQE Test Enabled */
-#define PHY_M_PC_POL_R_DIS	(1<<1)	/* Bit  1:	Polarity Reversal Disabled */
-#define PHY_M_PC_DIS_JABBER	(1<<0)	/* Bit  0:	Disable Jabber */
+#define PHY_M_PC_DIS_125CLK	BIT_4S	/* Disable 125 CLK */
+#define PHY_M_PC_MAC_POW_UP	BIT_3S	/* MAC Power up */
+#define PHY_M_PC_SQE_T_ENA	BIT_2S	/* SQE Test Enabled */
+#define PHY_M_PC_POL_R_DIS	BIT_1S	/* Polarity Reversal Disabled */
+#define PHY_M_PC_DIS_JABBER	BIT_0S	/* Disable Jabber */
 
 #define PHY_M_PC_EN_DET			SHIFT8(2)	/* Energy Detect (Mode 1) */
 #define PHY_M_PC_EN_DET_PLUS	SHIFT8(3)	/* Energy Detect Plus (Mode 2) */
@@ -1141,71 +1150,112 @@ extern "C" {
 #define PHY_M_PC_MAN_MDIX	1		/* 01 = Manual MDIX configuration */
 #define PHY_M_PC_ENA_AUTO	3		/* 11 = Enable Automatic Crossover */
 
+/* for 10/100 Fast Ethernet PHY (88E3082 only) */
+#define PHY_M_PC_ENA_DTE_DT	BIT_15S	/* Enable Data Terminal Equ. (DTE) Detect */
+#define PHY_M_PC_ENA_ENE_DT	BIT_14S	/* Enable Energy Detect (sense & pulse) */
+#define PHY_M_PC_DIS_NLP_CK	BIT_13S	/* Disable Normal Link Puls (NLP) Check */
+#define PHY_M_PC_ENA_LIP_NP	BIT_12S	/* Enable Link Partner Next Page Reg. */
+#define PHY_M_PC_DIS_NLP_GN	BIT_11S	/* Disable Normal Link Puls Generation */
+
+#define PHY_M_PC_DIS_SCRAMB	BIT_9S	/* Disable Scrambler */
+#define PHY_M_PC_DIS_FEFI	BIT_8S	/* Disable Far End Fault Indic. (FEFI) */
+
+#define PHY_M_PC_SH_TP_SEL	BIT_6S	/* Shielded Twisted Pair Select */
+#define PHY_M_PC_RX_FD_MSK	(3<<2)	/* Bit  3.. 2:	Rx FIFO Depth Mask */
+
 /*****  PHY_MARV_PHY_STAT	16 bit r/o	PHY Specific Status Reg *****/
 #define PHY_M_PS_SPEED_MSK	(3<<14)	/* Bit 15..14:	Speed Mask */
-#define PHY_M_PS_SPEED_1000	(1<<15)	/*       10 = 1000 Mbps */
-#define PHY_M_PS_SPEED_100	(1<<14)	/*       01 =  100 Mbps */
+#define PHY_M_PS_SPEED_1000	BIT_15S	/*       10 = 1000 Mbps */
+#define PHY_M_PS_SPEED_100	BIT_14S	/*       01 =  100 Mbps */
 #define PHY_M_PS_SPEED_10	0		/*       00 =   10 Mbps */
-#define PHY_M_PS_FULL_DUP	(1<<13)	/* Bit 13:	Full Duplex */
-#define PHY_M_PS_PAGE_REC	(1<<12)	/* Bit 12:	Page Received */
-#define PHY_M_PS_SPDUP_RES	(1<<11)	/* Bit 11:	Speed & Duplex Resolved */
-#define PHY_M_PS_LINK_UP	(1<<10)	/* Bit 10:	Link Up */
+#define PHY_M_PS_FULL_DUP	BIT_13S	/* Full Duplex */
+#define PHY_M_PS_PAGE_REC	BIT_12S	/* Page Received */
+#define PHY_M_PS_SPDUP_RES	BIT_11S	/* Speed & Duplex Resolved */
+#define PHY_M_PS_LINK_UP	BIT_10S	/* Link Up */
 #define PHY_M_PS_CABLE_MSK	(7<<7)	/* Bit  9.. 7:  Cable Length Mask */
-#define PHY_M_PS_MDI_X_STAT	(1<<6)	/* Bit  6:	MDI Crossover Stat (1=MDIX) */
-#define PHY_M_PS_DOWNS_STAT	(1<<5)	/* Bit  5:	Downshift Status (1=downsh.) */
-#define PHY_M_PS_ENDET_STAT	(1<<4)	/* Bit  4:	Energy Detect Status (1=act) */
-#define PHY_M_PS_TX_P_EN	(1<<3)	/* Bit  3:	Tx Pause Enabled */
-#define PHY_M_PS_RX_P_EN	(1<<2)	/* Bit  2:	Rx Pause Enabled */
-#define PHY_M_PS_POL_REV	(1<<1)	/* Bit  1:	Polarity Reversed */
-#define PHY_M_PC_JABBER		(1<<0)	/* Bit  0:	Jabber */
+#define PHY_M_PS_MDI_X_STAT	BIT_6S	/* MDI Crossover Stat (1=MDIX) */
+#define PHY_M_PS_DOWNS_STAT	BIT_5S	/* Downshift Status (1=downsh.) */
+#define PHY_M_PS_ENDET_STAT	BIT_4S	/* Energy Detect Status (1=act) */
+#define PHY_M_PS_TX_P_EN	BIT_3S	/* Tx Pause Enabled */
+#define PHY_M_PS_RX_P_EN	BIT_2S	/* Rx Pause Enabled */
+#define PHY_M_PS_POL_REV	BIT_1S	/* Polarity Reversed */
+#define PHY_M_PS_JABBER		BIT_0S	/* Jabber */
 
 #define PHY_M_PS_PAUSE_MSK	(PHY_M_PS_TX_P_EN | PHY_M_PS_RX_P_EN)
 
+/* for 10/100 Fast Ethernet PHY (88E3082 only) */
+#define PHY_M_PS_DTE_DETECT	BIT_15S	/* Data Terminal Equipment (DTE) Detected */
+#define PHY_M_PS_RES_SPEED	BIT_14S	/* Resolved Speed (1=100 Mbps, 0=10 Mbps */
+	
 /*****  PHY_MARV_INT_MASK	16 bit r/w	Interrupt Mask Reg *****/
 /*****  PHY_MARV_INT_STAT	16 bit r/o	Interrupt Status Reg *****/
-#define PHY_M_IS_AN_ERROR	(1<<15)	/* Bit 15:	Auto-Negotiation Error */
-#define PHY_M_IS_LSP_CHANGE	(1<<14)	/* Bit 14:	Link Speed Changed */
-#define PHY_M_IS_DUP_CHANGE	(1<<13)	/* Bit 13:	Duplex Mode Changed */
-#define PHY_M_IS_AN_PR		(1<<12)	/* Bit 12:	Page Received */
-#define PHY_M_IS_AN_COMPL	(1<<11)	/* Bit 11:	Auto-Negotiation Completed */
-#define PHY_M_IS_LST_CHANGE	(1<<10)	/* Bit 10:	Link Status Changed */
-#define PHY_M_IS_SYMB_ERROR	(1<<9)	/* Bit  9:	Symbol Error */
-#define PHY_M_IS_FALSE_CARR	(1<<8)	/* Bit  8:	False Carrier */
-#define PHY_M_IS_FIFO_ERROR	(1<<7)	/* Bit  7:	FIFO Overflow/Underrun Error */
-#define PHY_M_IS_MDI_CHANGE	(1<<6)	/* Bit  6:	MDI Crossover Changed */
-#define PHY_M_IS_DOWNSH_DET	(1<<5)	/* Bit  5:	Downshift Detected */
-#define PHY_M_IS_END_CHANGE	(1<<4)	/* Bit  4:	Energy Detect Changed */
-									/* Bit  3..2:	reserved */
-#define PHY_M_IS_POL_CHANGE	(1<<1)	/* Bit  1:	Polarity Changed */
-#define PHY_M_IS_JABBER		(1<<0)	/* Bit  0:	Jabber */
+#define PHY_M_IS_AN_ERROR	BIT_15S	/* Auto-Negotiation Error */
+#define PHY_M_IS_LSP_CHANGE	BIT_14S	/* Link Speed Changed */
+#define PHY_M_IS_DUP_CHANGE	BIT_13S	/* Duplex Mode Changed */
+#define PHY_M_IS_AN_PR		BIT_12S	/* Page Received */
+#define PHY_M_IS_AN_COMPL	BIT_11S	/* Auto-Negotiation Completed */
+#define PHY_M_IS_LST_CHANGE	BIT_10S	/* Link Status Changed */
+#define PHY_M_IS_SYMB_ERROR	BIT_9S	/* Symbol Error */
+#define PHY_M_IS_FALSE_CARR	BIT_8S	/* False Carrier */
+#define PHY_M_IS_FIFO_ERROR	BIT_7S	/* FIFO Overflow/Underrun Error */
+#define PHY_M_IS_MDI_CHANGE	BIT_6S	/* MDI Crossover Changed */
+#define PHY_M_IS_DOWNSH_DET	BIT_5S	/* Downshift Detected */
+#define PHY_M_IS_END_CHANGE	BIT_4S	/* Energy Detect Changed */
+								/* Bit   3:	reserved */
+#define PHY_M_IS_DTE_CHANGE	BIT_2S	/* DTE Power Det. Status Changed */
+									/* (88E1111 only) */
+#define PHY_M_IS_POL_CHANGE	BIT_1S	/* Polarity Changed */
+#define PHY_M_IS_JABBER		BIT_0S	/* Jabber */
 
 #define PHY_M_DEF_MSK		(PHY_M_IS_AN_ERROR | PHY_M_IS_AN_PR | \
 							PHY_M_IS_LST_CHANGE | PHY_M_IS_FIFO_ERROR)
 
 /*****  PHY_MARV_EXT_CTRL	16 bit r/w	Ext. PHY Specific Ctrl *****/
-#define PHY_M_EC_M_DSC_MSK	(3<<10)	/* Bit 11..10:	Master downshift counter */
-#define PHY_M_EC_S_DSC_MSK	(3<<8)	/* Bit  9.. 8:	Slave  downshift counter */
+#define PHY_M_EC_ENA_BC_EXT	BIT_15S	/* Enable Block Carr. Ext. (88E1111 only) */
+#define PHY_M_EC_ENA_LIN_LB	BIT_14S	/* Enable Line Loopback (88E1111 only) */
+								/* Bit 13:	reserved */
+#define PHY_M_EC_DIS_LINK_P	BIT_12S	/* Disable Link Pulses (88E1111 only) */
+#define PHY_M_EC_M_DSC_MSK	(3<<10)	/* Bit 11..10:	Master Downshift Counter */
+									/* (88E1011 only) */
+#define PHY_M_EC_S_DSC_MSK	(3<<8)	/* Bit  9.. 8:	Slave  Downshift Counter */
+									/* (88E1011 only) */
+#define PHY_M_EC_M_DSC_MSK2	(7<<9)	/* Bit 11.. 9:	Master Downshift Counter */
+									/* (88E1111 only) */
+#define PHY_M_EC_DOWN_S_DIS	BIT_8S	/* Downshift Disable (88E1111 only) */
+#define PHY_M_EC_RX_TIM_CT	BIT_7S	/* RGMII Rx Timing Control*/
 #define PHY_M_EC_MAC_S_MSK	(7<<4)	/* Bit  6.. 4:	Def. MAC interface speed */
-#define PHY_M_EC_FIB_AN_ENA	(1<<3)	/* Bit  3:	Fiber Auto-Neg. Enable */
+#define PHY_M_EC_FIB_AN_ENA	BIT_3S	/* Fiber Auto-Neg. Enable (88E1011S only) */
+#define PHY_M_EC_DTE_D_ENA	BIT_2S	/* DTE Detect Enable (88E1111 only) */
+#define PHY_M_EC_TX_TIM_CT	BIT_1S	/* RGMII Tx Timing Control */
+#define PHY_M_EC_TRANS_DIS	BIT_0S	/* Transmitter Disable (88E1111 only) */
 
 #define PHY_M_EC_M_DSC(x)		SHIFT10(x)	/* 00=1x; 01=2x; 10=3x; 11=4x */
 #define PHY_M_EC_S_DSC(x)		SHIFT8(x)	/* 00=dis; 01=1x; 10=2x; 11=3x */
 #define PHY_M_EC_MAC_S(x)		SHIFT4(x)	/* 01X=0; 110=2.5; 111=25 (MHz) */
 
+#define PHY_M_EC_M_DSC_2(x)		SHIFT9(x)	/* 000=1x; 001=2x; 010=3x; 011=4x */
+											/* 100=5x; 101=6x; 110=7x; 111=8x */
 #define MAC_TX_CLK_0_MHZ	2
 #define MAC_TX_CLK_2_5_MHZ	6
 #define MAC_TX_CLK_25_MHZ	7
 
 /*****  PHY_MARV_LED_CTRL	16 bit r/w	LED Control Reg *****/
-#define PHY_M_LEDC_DIS_LED	(1<<15)	/* Bit 15:	Disable LED */
+#define PHY_M_LEDC_DIS_LED	BIT_15S	/* Disable LED */
 #define PHY_M_LEDC_PULS_MSK	(7<<12)	/* Bit 14..12:  Pulse Stretch Mask */
-#define PHY_M_LEDC_F_INT	(1<<11)	/* Bit 11:	Force Interrupt */
+#define PHY_M_LEDC_F_INT	BIT_11S	/* Force Interrupt */
 #define PHY_M_LEDC_BL_R_MSK	(7<<8)	/* Bit 10.. 8:  Blink Rate Mask */
-									/* Bit  7.. 5:	reserved */
+#define PHY_M_LEDC_DP_C_LSB	BIT_7S	/* Duplex Control (LSB, 88E1111 only) */
+#define PHY_M_LEDC_TX_C_LSB	BIT_6S	/* Tx Control (LSB, 88E1111 only) */
+#define PHY_M_LEDC_LK_C_MSK	(7<<3)	/* Bit  5.. 3:	Link Control Mask */
+									/* (88E1111 only) */
+								/* Bit  7.. 5:	reserved (88E1011 only) */
 #define PHY_M_LEDC_LINK_MSK	(3<<3)	/* Bit  4.. 3:	Link Control Mask */
-#define PHY_M_LEDC_DP_CTRL	(1<<2)	/* Bit  2:	Duplex Control */
-#define PHY_M_LEDC_RX_CTRL	(1<<1)	/* Bit  1:	Rx activity / Link */
-#define PHY_M_LEDC_TX_CTRL	(1<<0)	/* Bit  0:	Tx activity / Link */
+									/* (88E1011 only) */
+#define PHY_M_LEDC_DP_CTRL	BIT_2S	/* Duplex Control */
+#define PHY_M_LEDC_DP_C_MSB	BIT_2S	/* Duplex Control (MSB, 88E1111 only) */
+#define PHY_M_LEDC_RX_CTRL	BIT_1S	/* Rx Activity / Link */
+#define PHY_M_LEDC_TX_CTRL	BIT_0S	/* Tx Activity / Link */
+#define PHY_M_LEDC_TX_C_MSB	BIT_0S	/* Tx Control (MSB, 88E1111 only) */
 
 #define PHY_M_LED_PULS_DUR(x)	(SHIFT12(x) & PHY_M_LEDC_PULS_MSK)
 
@@ -1228,6 +1278,8 @@ extern "C" {
 								/* values 5 - 7: reserved */
 
 /*****  PHY_MARV_LED_OVER	16 bit r/w	Manual LED Override Reg *****/
+#define PHY_M_LED_MO_SGMII(x)	SHIFT14(x)	/* Bit 15..14:  SGMII AN Timer */
+										/* Bit 13..12:	reserved */
 #define PHY_M_LED_MO_DUP(x)		SHIFT10(x)	/* Bit 11..10:  Duplex */
 #define PHY_M_LED_MO_10(x)		SHIFT8(x)	/* Bit  9.. 8:  Link 10 */
 #define PHY_M_LED_MO_100(x)		SHIFT6(x)	/* Bit  7.. 6:  Link 100 */
@@ -1241,29 +1293,35 @@ extern "C" {
 #define MO_LED_ON			3
 
 /*****  PHY_MARV_EXT_CTRL_2	16 bit r/w	Ext. PHY Specific Ctrl 2 *****/
-									/* Bit 15.. 7:	reserved */
-#define PHY_M_EC2_FI_IMPED	(1<<6)	/* Bit  6:	Fiber Input  Impedance */
-#define PHY_M_EC2_FO_IMPED	(1<<5)	/* Bit  5:	Fiber Output Impedance */
-#define PHY_M_EC2_FO_M_CLK	(1<<4)	/* Bit  4:	Fiber Mode Clock Enable */
-#define PHY_M_EC2_FO_BOOST	(1<<3)	/* Bit  3:	Fiber Output Boost */
+								/* Bit 15.. 7:	reserved */
+#define PHY_M_EC2_FI_IMPED	BIT_6S	/* Fiber Input  Impedance */
+#define PHY_M_EC2_FO_IMPED	BIT_5S	/* Fiber Output Impedance */
+#define PHY_M_EC2_FO_M_CLK	BIT_4S	/* Fiber Mode Clock Enable */
+#define PHY_M_EC2_FO_BOOST	BIT_3S	/* Fiber Output Boost */
 #define PHY_M_EC2_FO_AM_MSK	7		/* Bit  2.. 0:	Fiber Output Amplitude */
 
 /*****	PHY_MARV_EXT_P_STAT 16 bit r/w	Ext. PHY Specific Status *****/
-#define PHY_M_FC_AUTO_SEL	(1<<15)	/* Bit 15:	Fiber/Copper Auto Sel. dis. */
-#define PHY_M_FC_AN_REG_ACC (1<<14) /* Bit 14:	Fiber/Copper Autoneg. reg acc */
-#define PHY_M_FC_RESULUTION (1<<13)	/* Bit 13:	Fiber/Copper Resulution */
-#define PHY_M_SER_IF_AN_BP  (1<<12) /* Bit 12:	Ser IF autoneg. bypass enable */
-#define PHY_M_SER_IF_BP_ST	(1<<11) /* Bit 11:	Ser IF autoneg. bypass status */
-#define PHY_M_IRQ_POLARITY	(1<<10) /* Bit 10:	IRQ polarity */
-									/* Bit 9..4: reserved */
-#define PHY_M_UNDOC1		(1<< 7) /* undocumented bit !! */
-#define PHY_M_MODE_MASK		(0xf<<0)/* Bit 3..0: copy of HWCFG MODE[3:0] */
+#define PHY_M_FC_AUTO_SEL	BIT_15S	/* Fiber/Copper Auto Sel. Dis. */
+#define PHY_M_FC_AN_REG_ACC	BIT_14S	/* Fiber/Copper AN Reg. Access */
+#define PHY_M_FC_RESOLUTION	BIT_13S	/* Fiber/Copper Resolution */
+#define PHY_M_SER_IF_AN_BP	BIT_12S	/* Ser. IF AN Bypass Enable */
+#define PHY_M_SER_IF_BP_ST	BIT_11S	/* Ser. IF AN Bypass Status */
+#define PHY_M_IRQ_POLARITY	BIT_10S	/* IRQ polarity */
+#define PHY_M_DIS_AUT_MED	BIT_9S	/* Disable Aut. Medium Reg. Selection */
+									/* (88E1111 only) */
+								/* Bit  9.. 4: reserved (88E1011 only) */
+#define PHY_M_UNDOC1		BIT_7S	/* undocumented bit !! */
+#define PHY_M_DTE_POW_STAT	BIT_4S	/* DTE Power Status (88E1111 only) */
+#define PHY_M_MODE_MASK		0xf		/* Bit  3.. 0: copy of HWCFG MODE[3:0] */
 
 /*****  PHY_MARV_CABLE_DIAG	16 bit r/o	Cable Diagnostic Reg *****/
-#define PHY_M_CABD_ENA_TEST	(1<<15)	/* Bit 15:	Enable Test */
-#define PHY_M_CABD_STAT_MSK	(3<<13)	/* Bit 14..13:	Status */
-									/* Bit 12.. 8:	reserved */
-#define PHY_M_CABD_DIST_MSK	0xff	/* Bit  7.. 0:	Distance */
+#define PHY_M_CABD_ENA_TEST	BIT_15S		/* Enable Test (Page 0) */
+#define PHY_M_CABD_DIS_WAIT	BIT_15S		/* Disable Waiting Period (Page 1) */
+										/* (88E1111 only) */
+#define PHY_M_CABD_STAT_MSK	(3<<13)		/* Bit 14..13:	Status Mask */
+#define PHY_M_CABD_AMPL_MSK	(0x1f<<8)	/* Bit 12.. 8:	Amplitude Mask */
+										/* (88E1111 only) */
+#define PHY_M_CABD_DIST_MSK	0xff		/* Bit  7.. 0:	Distance Mask */
 
 /* values for Cable Diagnostic Status (11=fail; 00=OK; 10=open; 01=short) */
 #define CABD_STAT_NORMAL	0
@@ -1271,6 +1329,38 @@ extern "C" {
 #define CABD_STAT_OPEN		2
 #define CABD_STAT_FAIL		3
 
+/* for 10/100 Fast Ethernet PHY (88E3082 only) */
+/*****  PHY_MARV_FE_LED_PAR		16 bit r/w	LED Parallel Select Reg. *****/
+									/* Bit 15..12: reserved (used internally) */
+#define PHY_M_FELP_LED2_MSK	(0xf<<8)	/* Bit 11.. 8:	LED2 Mask (LINK) */
+#define PHY_M_FELP_LED1_MSK	(0xf<<4)	/* Bit  7.. 4:	LED1 Mask (ACT) */
+#define PHY_M_FELP_LED0_MSK	0xf			/* Bit  3.. 0:	LED0 Mask (SPEED) */
+
+#define PHY_M_FELP_LED2_CTRL(x)	(SHIFT8(x) & PHY_M_FELP_LED2_MSK)
+#define PHY_M_FELP_LED1_CTRL(x)	(SHIFT4(x) & PHY_M_FELP_LED1_MSK)
+#define PHY_M_FELP_LED0_CTRL(x)	(SHIFT0(x) & PHY_M_FELP_LED0_MSK)
+
+#define LED_PAR_CTRL_COLX	0x00
+#define LED_PAR_CTRL_ERROR	0x01
+#define LED_PAR_CTRL_DUPLEX	0x02
+#define LED_PAR_CTRL_DP_COL	0x03
+#define LED_PAR_CTRL_SPEED	0x04
+#define LED_PAR_CTRL_LINK	0x05
+#define LED_PAR_CTRL_TX		0x06
+#define LED_PAR_CTRL_RX		0x07
+#define LED_PAR_CTRL_ACT	0x08
+#define LED_PAR_CTRL_LNK_RX	0x09
+#define LED_PAR_CTRL_LNK_AC	0x0a
+#define LED_PAR_CTRL_ACT_BL	0x0b
+#define LED_PAR_CTRL_TX_BL	0x0c
+#define LED_PAR_CTRL_RX_BL	0x0d
+#define LED_PAR_CTRL_COL_BL	0x0e
+#define LED_PAR_CTRL_INACT	0x0f
+
+/*****  PHY_MARV_FE_SPEC_2		16 bit r/w	Specific Control Reg. 2 *****/
+#define PHY_M_FESC_DIS_WAIT	BIT_2S		/* Disable TDR Waiting Period */
+#define PHY_M_FESC_ENA_MCLK	BIT_1S		/* Enable MAC Rx Clock in sleep mode */
+#define PHY_M_FESC_SEL_CL_A	BIT_0S		/* Select Class A driver (100B-TX) */
 
 /*
  * GMAC registers
@@ -1431,141 +1521,158 @@ extern "C" {
  */
 
 /*	GM_GP_STAT	16 bit r/o	General Purpose Status Register */
-#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_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 */
-#define GM_GPSR_EXC_COL		(1<<9)	/* Bit  9:	Excessive Collisions Occured */
-#define GM_GPSR_LAT_COL		(1<<8)	/* Bit  8:	Late Collisions Occured */
-								/* Bit  7..6:	reserved */
-#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_PROM_EN		(1<<1)	/* Bit  1:	Promiscuous Mode Enabled */
-								/* Bit  0:	reserved */
+#define GM_GPSR_SPEED		BIT_15S	/* Port Speed (1 = 100 Mbps) */
+#define GM_GPSR_DUPLEX		BIT_14S	/* Duplex Mode (1 = Full) */
+#define GM_GPSR_FC_TX_DIS	BIT_13S	/* Tx Flow-Control Mode Disabled */
+#define GM_GPSR_LINK_UP		BIT_12S	/* Link Up Status */
+#define GM_GPSR_PAUSE		BIT_11S	/* Pause State */
+#define GM_GPSR_TX_ACTIVE	BIT_10S	/* Tx in Progress */
+#define GM_GPSR_EXC_COL		BIT_9S	/* Excessive Collisions Occured */
+#define GM_GPSR_LAT_COL		BIT_8S	/* Late Collisions Occured */
+								/* Bit   7.. 6:	reserved */
+#define GM_GPSR_PHY_ST_CH	BIT_5S	/* PHY Status Change */
+#define GM_GPSR_GIG_SPEED	BIT_4S	/* Gigabit Speed (1 = 1000 Mbps) */
+#define GM_GPSR_PART_MODE	BIT_3S	/* Partition mode */
+#define GM_GPSR_FC_RX_DIS	BIT_2S	/* Rx Flow-Control Mode Disabled */
+								/* Bit   2.. 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_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 */
-#define GM_GPCR_LOOP_ENA	(1<<9)	/* Bit  9:	Enable MAC Loopback Mode */
-#define GM_GPCR_PART_ENA	(1<<8)	/* Bit  8:	Enable Partition Mode */
-#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_SPEED_100	(1<<3)  /* Bit  3:	Port Speed 100 Mbps */
-#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_RMII_PH_ENA	BIT_15S	/* Enable RMII for PHY (Yukon-FE only) */
+#define GM_GPCR_RMII_LB_ENA	BIT_14S	/* Enable RMII Loopback (Yukon-FE only) */
+#define GM_GPCR_FC_TX_DIS	BIT_13S	/* Disable Tx Flow-Control Mode */
+#define GM_GPCR_TX_ENA		BIT_12S	/* Enable Transmit */
+#define GM_GPCR_RX_ENA		BIT_11S	/* Enable Receive */
+								/* Bit 10:	reserved */
+#define GM_GPCR_LOOP_ENA	BIT_9S	/* Enable MAC Loopback Mode */
+#define GM_GPCR_PART_ENA	BIT_8S	/* Enable Partition Mode */
+#define GM_GPCR_GIGS_ENA	BIT_7S	/* Gigabit Speed (1000 Mbps) */
+#define GM_GPCR_FL_PASS		BIT_6S	/* Force Link Pass */
+#define GM_GPCR_DUP_FULL	BIT_5S	/* Full Duplex Mode */
+#define GM_GPCR_FC_RX_DIS	BIT_4S	/* Disable Rx Flow-Control Mode */
+#define GM_GPCR_SPEED_100	BIT_3S	/* Port Speed 100 Mbps */
+#define GM_GPCR_AU_DUP_DIS	BIT_2S	/* Disable Auto-Update Duplex */
+#define GM_GPCR_AU_FCT_DIS	BIT_1S	/* Disable Auto-Update Flow-C. */
+#define GM_GPCR_AU_SPD_DIS	BIT_0S	/* 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 |\
 							 GM_GPCR_AU_SPD_DIS)
 	
 /*	GM_TX_CTRL				16 bit r/w	Transmit Control Register */
-#define GM_TXCR_FORCE_JAM	(1<<15)	/* Bit 15:	Force Jam / Flow-Control */
-#define GM_TXCR_CRC_DIS		(1<<14)	/* Bit 14:	Disable insertion of CRC */
-#define GM_TXCR_PAD_DIS		(1<<13)	/* Bit 13:	Disable padding of packets */
+#define GM_TXCR_FORCE_JAM	BIT_15S	/* Force Jam / Flow-Control */
+#define GM_TXCR_CRC_DIS		BIT_14S	/* Disable insertion of CRC */
+#define GM_TXCR_PAD_DIS		BIT_13S	/* Disable padding of packets */
 #define GM_TXCR_COL_THR_MSK	(7<<10)	/* Bit 12..10:	Collision Threshold Mask */
+								/* Bit   9.. 8:	reserved */
+#define GM_TXCR_PAD_PAT_MSK	0xff	/* Bit  7.. 0:	Padding Pattern Mask */
+									/* (Yukon-2 only) */
 
 #define TX_COL_THR(x)		(SHIFT10(x) & GM_TXCR_COL_THR_MSK)
 
 #define TX_COL_DEF			0x04
 	
 /*	GM_RX_CTRL				16 bit r/w	Receive Control Register */
-#define GM_RXCR_UCF_ENA		(1<<15)	/* Bit 15:	Enable Unicast filtering */
-#define GM_RXCR_MCF_ENA		(1<<14)	/* Bit 14:	Enable Multicast filtering */
-#define GM_RXCR_CRC_DIS		(1<<13)	/* Bit 13:	Remove 4-byte CRC */
-#define GM_RXCR_PASS_FC		(1<<12)	/* Bit 12:	Pass FC packets to FIFO */
+#define GM_RXCR_UCF_ENA		BIT_15S	/* Enable Unicast filtering */
+#define GM_RXCR_MCF_ENA		BIT_14S	/* Enable Multicast filtering */
+#define GM_RXCR_CRC_DIS		BIT_13S	/* Remove 4-byte CRC */
+#define GM_RXCR_PASS_FC		BIT_12S	/* Pass FC packets to FIFO (Yukon-1 only) */
+								/* Bit  11.. 0:	reserved */
 	
 /*	GM_TX_PARAM				16 bit r/w	Transmit Parameter Register */
 #define GM_TXPA_JAMLEN_MSK	(3<<14)		/* Bit 15..14:	Jam Length */
 #define GM_TXPA_JAMIPG_MSK	(0x1f<<9)	/* Bit 13.. 9:	Jam IPG */
 #define GM_TXPA_JAMDAT_MSK	(0x1f<<4)	/* Bit  8.. 4:	IPG Jam to Data */
-								/* Bit  3..0:	reserved */
+#define GM_TXPA_BO_LIM_MSK	0x0f		/* Bit  3.. 0:	Backoff Limit Mask */
+										/* (Yukon-2 only) */
 
 #define TX_JAM_LEN_VAL(x)	(SHIFT14(x) & GM_TXPA_JAMLEN_MSK)
 #define TX_JAM_IPG_VAL(x)	(SHIFT9(x) & GM_TXPA_JAMIPG_MSK)
 #define TX_IPG_JAM_DATA(x)	(SHIFT4(x) & GM_TXPA_JAMDAT_MSK)
+#define TX_BACK_OFF_LIM(x)	((x) & GM_TXPA_BO_LIM_MSK)
 
 #define TX_JAM_LEN_DEF		0x03
 #define TX_JAM_IPG_DEF		0x0b
 #define TX_IPG_JAM_DEF		0x1c
+#define TX_BOF_LIM_DEF		0x04
 
 /*	GM_SERIAL_MODE			16 bit r/w	Serial Mode Register */
-#define GM_SMOD_DATABL_MSK	(0x1f<<11)	/* Bit 15..11:	Data Blinder (r/o) */
-#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) */
+#define GM_SMOD_DATABL_MSK	(0x1f<<11)	/* Bit 15..11:	Data Blinder */
+										/* r/o on Yukon, r/w on Yukon-EC */
+#define GM_SMOD_LIMIT_4		BIT_10S	/* 4 consecutive Tx trials */
+#define GM_SMOD_VLAN_ENA	BIT_9S	/* Enable VLAN  (Max. Frame Len) */
+#define GM_SMOD_JUMBO_ENA	BIT_8S	/* Enable Jumbo (Max. Frame Len) */
+								/* Bit   7.. 5:	reserved */
+#define GM_SMOD_IPG_MSK		0x1f	/* Bit  4.. 0:	Inter-Packet Gap (IPG) */
 	
 #define DATA_BLIND_VAL(x)	(SHIFT11(x) & GM_SMOD_DATABL_MSK)
-#define DATA_BLIND_DEF		0x04
-
 #define IPG_DATA_VAL(x)		((x) & GM_SMOD_IPG_MSK)
+
+#define DATA_BLIND_DEF		0x04
 #define IPG_DATA_DEF		0x1e
 
 /*	GM_SMI_CTRL				16 bit r/w	SMI Control Register */
 #define GM_SMI_CT_PHY_A_MSK	(0x1f<<11)	/* Bit 15..11:	PHY Device Address */
 #define GM_SMI_CT_REG_A_MSK	(0x1f<<6)	/* Bit 10.. 6:	PHY Register Address */
-#define GM_SMI_CT_OP_RD		(1<<5)	/* Bit  5:	OpCode Read (0=Write)*/
-#define GM_SMI_CT_RD_VAL	(1<<4)	/* Bit  4:	Read Valid (Read completed) */
-#define GM_SMI_CT_BUSY		(1<<3)	/* Bit  3:	Busy (Operation in progress) */
-								/* Bit   2..0:	reserved */
+#define GM_SMI_CT_OP_RD		BIT_5S	/* OpCode Read (0=Write)*/
+#define GM_SMI_CT_RD_VAL	BIT_4S	/* Read Valid (Read completed) */
+#define GM_SMI_CT_BUSY		BIT_3S	/* Busy (Operation in progress) */
+								/* Bit   2.. 0:	reserved */
 	
 #define GM_SMI_CT_PHY_AD(x)	(SHIFT11(x) & GM_SMI_CT_PHY_A_MSK)
 #define GM_SMI_CT_REG_AD(x)	(SHIFT6(x) & GM_SMI_CT_REG_A_MSK)
 
 	/*	GM_PHY_ADDR				16 bit r/w	GPHY Address Register */
-								/* Bit  15..6:	reserved */
-#define GM_PAR_MIB_CLR		(1<<5)	/* Bit  5:	Set MIB Clear Counter Mode */
-#define GM_PAR_MIB_TST		(1<<4)	/* Bit  4:	MIB Load Counter (Test Mode) */
-								/* Bit   3..0:	reserved */
+								/* Bit  15.. 6:	reserved */
+#define GM_PAR_MIB_CLR		BIT_5S	/* Set MIB Clear Counter Mode */
+#define GM_PAR_MIB_TST		BIT_4S	/* MIB Load Counter (Test Mode) */
+								/* Bit   3.. 0:	reserved */
 	
 /* Receive Frame Status Encoding */
-#define GMR_FS_LEN	(0xffffUL<<16)	/* Bit 31..16:	Rx Frame Length */
+#define GMR_FS_LEN_MSK	(0xffffUL<<16)	/* Bit 31..16:	Rx Frame Length */
 								/* Bit  15..14:	reserved */
-#define GMR_FS_VLAN		(1L<<13)	/* Bit 13:	VLAN Packet */
-#define GMR_FS_JABBER	(1L<<12)	/* Bit 12:	Jabber Packet */
-#define GMR_FS_UN_SIZE	(1L<<11)	/* Bit 11:	Undersize Packet */
-#define GMR_FS_MC		(1L<<10)	/* Bit 10:	Multicast Packet */
-#define GMR_FS_BC		(1L<<9)		/* Bit  9:	Broadcast Packet */
-#define GMR_FS_RX_OK	(1L<<8)		/* Bit  8:	Receive OK (Good Packet) */
-#define GMR_FS_GOOD_FC	(1L<<7)		/* Bit  7:	Good Flow-Control Packet */
-#define GMR_FS_BAD_FC	(1L<<6)		/* Bit  6:	Bad  Flow-Control Packet */
-#define GMR_FS_MII_ERR	(1L<<5)		/* Bit  5:	MII Error */
-#define GMR_FS_LONG_ERR	(1L<<4)		/* Bit  4:	Too Long Packet */
-#define GMR_FS_FRAGMENT	(1L<<3)		/* Bit  3:	Fragment */
+#define GMR_FS_VLAN			BIT_13	/* VLAN Packet */
+#define GMR_FS_JABBER		BIT_12	/* Jabber Packet */
+#define GMR_FS_UN_SIZE		BIT_11	/* Undersize Packet */
+#define GMR_FS_MC			BIT_10	/* Multicast Packet */
+#define GMR_FS_BC			BIT_9	/* Broadcast Packet */
+#define GMR_FS_RX_OK		BIT_8	/* Receive OK (Good Packet) */
+#define GMR_FS_GOOD_FC		BIT_7	/* Good Flow-Control Packet */
+#define GMR_FS_BAD_FC		BIT_6	/* Bad  Flow-Control Packet */
+#define GMR_FS_MII_ERR		BIT_5	/* MII Error */
+#define GMR_FS_LONG_ERR		BIT_4	/* Too Long Packet */
+#define GMR_FS_FRAGMENT		BIT_3	/* Fragment */
 								/* Bit  2:	reserved */
-#define GMR_FS_CRC_ERR	(1L<<1)		/* Bit  1:	CRC Error */
-#define GMR_FS_RX_FF_OV	(1L<<0)		/* Bit  0:	Rx FIFO Overflow */
+#define GMR_FS_CRC_ERR		BIT_1	/* CRC Error */
+#define GMR_FS_RX_FF_OV		BIT_0	/* Rx FIFO Overflow */
+
+#define GMR_FS_LEN_SHIFT	16
 
 /*
  * GMR_FS_ANY_ERR (analogous to XMR_FS_ANY_ERR)
  */
-#define GMR_FS_ANY_ERR	(GMR_FS_CRC_ERR | \
-			GMR_FS_LONG_ERR | \
+#ifdef SK_DIAG
+#define GMR_FS_ANY_ERR		( \
+			GMR_FS_RX_FF_OV | \
+			GMR_FS_CRC_ERR | \
 			GMR_FS_MII_ERR | \
 			GMR_FS_BAD_FC | \
 			GMR_FS_GOOD_FC | \
 			GMR_FS_JABBER)
-
-/* Rx GMAC FIFO Flush Mask (default) */
-#define RX_FF_FL_DEF_MSK	(GMR_FS_CRC_ERR | \
+#else
+#define GMR_FS_ANY_ERR		( \
 			GMR_FS_RX_FF_OV | \
+			GMR_FS_CRC_ERR | \
+			GMR_FS_FRAGMENT | \
+			GMR_FS_LONG_ERR | \
 			GMR_FS_MII_ERR | \
 			GMR_FS_BAD_FC | \
 			GMR_FS_GOOD_FC | \
 			GMR_FS_UN_SIZE | \
 			GMR_FS_JABBER)
+#endif
+
+/* Rx GMAC FIFO Flush Mask (default) */
+#define RX_FF_FL_DEF_MSK	GMR_FS_ANY_ERR
 
 /* typedefs *******************************************************************/
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/skaddr.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/skaddr.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/skaddr.c	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/skaddr.c	2004-09-09 13:20:48.000000000 +0200
@@ -2,8 +2,8 @@
  *
  * Name:	skaddr.c
  * Project:	Gigabit Ethernet Adapters, ADDR-Module
- * Version:	$Revision: 1.52 $
- * Date:	$Date: 2003/06/02 13:46:15 $
+ * Version:	$Revision: 2.2 $
+ * Date:	$Date: 2003/11/24 12:22:01 $
  * Purpose:	Manage Addresses (Multicast and Unicast) and Promiscuous Mode.
  *
  ******************************************************************************/
@@ -44,7 +44,7 @@
 
 #if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
 static const char SysKonnectFileId[] =
-	"@(#) $Id: skaddr.c,v 1.52 2003/06/02 13:46:15 tschilli Exp $ (C) Marvell.";
+	"@(#) $Id: skaddr.c,v 2.2 2003/11/24 12:22:01 mkarl Exp $ (C) Marvell.";
 #endif /* DEBUG ||!LINT || !SK_SLIM */
 
 #define __SKADDR_C
@@ -213,7 +213,7 @@ int		Level)	/* initialization level */
 					pAC->Addr.Net[i].PermanentMacAddress.a[2],
 					pAC->Addr.Net[i].PermanentMacAddress.a[3],
 					pAC->Addr.Net[i].PermanentMacAddress.a[4],
-					pAC->Addr.Net[i].PermanentMacAddress.a[5]))
+					pAC->Addr.Net[i].PermanentMacAddress.a[5]));
 			
 			SK_DBG_MSG(pAC, SK_DBGMOD_ADDR, SK_DBGCAT_INIT,
 				("Logical MAC Address (Net%d): %02X %02X %02X %02X %02X %02X\n",
@@ -223,7 +223,7 @@ int		Level)	/* initialization level */
 					pAC->Addr.Net[i].CurrentMacAddress.a[2],
 					pAC->Addr.Net[i].CurrentMacAddress.a[3],
 					pAC->Addr.Net[i].CurrentMacAddress.a[4],
-					pAC->Addr.Net[i].CurrentMacAddress.a[5]))
+					pAC->Addr.Net[i].CurrentMacAddress.a[5]));
 		}
 #endif	/* DEBUG */
 
@@ -266,7 +266,7 @@ int		Level)	/* initialization level */
 					pAPort->PermanentMacAddress.a[2],
 					pAPort->PermanentMacAddress.a[3],
 					pAPort->PermanentMacAddress.a[4],
-					pAPort->PermanentMacAddress.a[5]))
+					pAPort->PermanentMacAddress.a[5]));
 			
 			SK_DBG_MSG(pAC, SK_DBGMOD_ADDR, SK_DBGCAT_INIT,
 				("SkAddrInit: Physical MAC Address: %02X %02X %02X %02X %02X %02X\n",
@@ -275,7 +275,7 @@ int		Level)	/* initialization level */
 					pAPort->CurrentMacAddress.a[2],
 					pAPort->CurrentMacAddress.a[3],
 					pAPort->CurrentMacAddress.a[4],
-					pAPort->CurrentMacAddress.a[5]))
+					pAPort->CurrentMacAddress.a[5]));
 #endif /* DEBUG */
 		}
 		/* pAC->Addr.InitDone = SK_INIT_IO; */
@@ -339,10 +339,14 @@ int		Flags)		/* permanent/non-perm, sw-o
 	}
 	
 	if (pAC->GIni.GIGenesis) {
+#ifdef GENESIS
 		ReturnCode = SkAddrXmacMcClear(pAC, IoC, PortNumber, Flags);
+#endif
 	}
 	else {
+#ifdef YUKON
 		ReturnCode = SkAddrGmacMcClear(pAC, IoC, PortNumber, Flags);
+#endif
 	}
 
 	return (ReturnCode);
@@ -352,7 +356,7 @@ int		Flags)		/* permanent/non-perm, sw-o
 #endif /* !SK_SLIM */
 
 #ifndef SK_SLIM
-
+#ifdef GENESIS
 /******************************************************************************
  *
  *	SkAddrXmacMcClear - clear the multicast table
@@ -404,11 +408,11 @@ int		Flags)		/* permanent/non-perm, sw-o
 	return (SK_ADDR_SUCCESS);
 	
 }	/* SkAddrXmacMcClear */
-
+#endif	/* GENESIS */
 #endif /* !SK_SLIM */
 
 #ifndef SK_SLIM
-
+#ifdef YUKON
 /******************************************************************************
  *
  *	SkAddrGmacMcClear - clear the multicast table
@@ -447,7 +451,7 @@ int		Flags)		/* permanent/non-perm, sw-o
 			pAC->Addr.Port[PortNumber].InexactFilter.Bytes[4],
 			pAC->Addr.Port[PortNumber].InexactFilter.Bytes[5],
 			pAC->Addr.Port[PortNumber].InexactFilter.Bytes[6],
-			pAC->Addr.Port[PortNumber].InexactFilter.Bytes[7]))
+			pAC->Addr.Port[PortNumber].InexactFilter.Bytes[7]));
 #endif	/* DEBUG */
 
 	/* Clear InexactFilter */
@@ -489,7 +493,7 @@ int		Flags)		/* permanent/non-perm, sw-o
 			pAC->Addr.Port[PortNumber].InexactFilter.Bytes[4],
 			pAC->Addr.Port[PortNumber].InexactFilter.Bytes[5],
 			pAC->Addr.Port[PortNumber].InexactFilter.Bytes[6],
-			pAC->Addr.Port[PortNumber].InexactFilter.Bytes[7]))
+			pAC->Addr.Port[PortNumber].InexactFilter.Bytes[7]));
 #endif	/* DEBUG */
 	
 	if (!(Flags & SK_MC_SW_ONLY)) {
@@ -499,9 +503,10 @@ int		Flags)		/* permanent/non-perm, sw-o
 	return (SK_ADDR_SUCCESS);
 
 }	/* SkAddrGmacMcClear */
+#endif	/* YUKON */
 
 #ifndef SK_ADDR_CHEAT
-
+#ifdef GENESIS
 /******************************************************************************
  *
  *	SkXmacMcHash - hash multicast address
@@ -538,8 +543,9 @@ unsigned char *pMc)	/* Multicast address
 	return (Crc & ((1 << HASH_BITS) - 1));
 
 }	/* SkXmacMcHash */
+#endif	/* GENESIS */
 
-
+#ifdef YUKON
 /******************************************************************************
  *
  *	SkGmacMcHash - hash multicast address
@@ -597,7 +603,7 @@ unsigned char *pMc)	/* Multicast address
 	return (Crc & ((1 << HASH_BITS) - 1));
 
 }	/* SkGmacMcHash */
-
+#endif	/* YUKON */
 #endif	/* !SK_ADDR_CHEAT */
 
 /******************************************************************************
@@ -638,17 +644,21 @@ int			Flags)		/* permanent/non-permanent
 	}
 	
 	if (pAC->GIni.GIGenesis) {
+#ifdef GENESIS
 		ReturnCode = SkAddrXmacMcAdd(pAC, IoC, PortNumber, pMc, Flags);
+#endif
 	}
 	else {
+#ifdef YUKON
 		ReturnCode = SkAddrGmacMcAdd(pAC, IoC, PortNumber, pMc, Flags);
+#endif
 	}
 
 	return (ReturnCode);
 
 }	/* SkAddrMcAdd */
 
-
+#ifdef GENESIS
 /******************************************************************************
  *
  *	SkAddrXmacMcAdd - add a multicast address to a port
@@ -758,8 +768,9 @@ int		Flags)		/* permanent/non-permanent 
 	}
 
 }	/* SkAddrXmacMcAdd */
+#endif	/* GENESIS */
 
-
+#ifdef YUKON
 /******************************************************************************
  *
  *	SkAddrGmacMcAdd - add a multicast address to a port
@@ -821,7 +832,7 @@ int		Flags)		/* permanent/non-permanent 
 			pAC->Addr.Port[PortNumber].InexactRlmtFilter.Bytes[4],
 			pAC->Addr.Port[PortNumber].InexactRlmtFilter.Bytes[5],
 			pAC->Addr.Port[PortNumber].InexactRlmtFilter.Bytes[6],
-			pAC->Addr.Port[PortNumber].InexactRlmtFilter.Bytes[7]))
+			pAC->Addr.Port[PortNumber].InexactRlmtFilter.Bytes[7]));
 #endif	/* DEBUG */
 	}
 	else {	/* not permanent => DRV */
@@ -845,7 +856,7 @@ int		Flags)		/* permanent/non-permanent 
 			pAC->Addr.Port[PortNumber].InexactDrvFilter.Bytes[4],
 			pAC->Addr.Port[PortNumber].InexactDrvFilter.Bytes[5],
 			pAC->Addr.Port[PortNumber].InexactDrvFilter.Bytes[6],
-			pAC->Addr.Port[PortNumber].InexactDrvFilter.Bytes[7]))
+			pAC->Addr.Port[PortNumber].InexactDrvFilter.Bytes[7]));
 #endif	/* DEBUG */
 	}
 	
@@ -860,7 +871,7 @@ int		Flags)		/* permanent/non-permanent 
 	return (SK_MC_FILTERING_INEXACT);
 	
 }	/* SkAddrGmacMcAdd */
-
+#endif	/* YUKON */
 #endif /* !SK_SLIM */
 
 /******************************************************************************
@@ -892,7 +903,7 @@ SK_AC	*pAC,		/* adapter context */
 SK_IOC	IoC,		/* I/O context */
 SK_U32	PortNumber)	/* Port Number */
 {
-	int ReturnCode;
+	int ReturnCode = 0;
 #if (!defined(SK_SLIM) || defined(DEBUG))
 	if (PortNumber >= (SK_U32) pAC->GIni.GIMacsFound) {
 		return (SK_ADDR_ILLEGAL_PORT);
@@ -948,13 +959,13 @@ SK_U32	PortNumber)	/* Port Number */
 	SK_ADDR_PORT	*pAPort;
 
 	SK_DBG_MSG(pAC,SK_DBGMOD_ADDR, SK_DBGCAT_CTRL,
-		("SkAddrXmacMcUpdate on Port %u.\n", PortNumber))
+		("SkAddrXmacMcUpdate on Port %u.\n", PortNumber));
 	
 	pAPort = &pAC->Addr.Port[PortNumber];
 
 #ifdef DEBUG
 	SK_DBG_MSG(pAC,SK_DBGMOD_ADDR, SK_DBGCAT_CTRL,
-		("Next0 on Port %d: %d\n", PortNumber, Next0[PortNumber]))
+		("Next0 on Port %d: %d\n", PortNumber, Next0[PortNumber]));
 #endif /* DEBUG */
 
 	/* Start with 0 to also program the logical MAC address. */
@@ -1043,7 +1054,7 @@ SK_U32	PortNumber)	/* Port Number */
 				pAPort->Exact[i].a[2],
 				pAPort->Exact[i].a[3],
 				pAPort->Exact[i].a[4],
-				pAPort->Exact[i].a[5]))
+				pAPort->Exact[i].a[5]));
 	}
 #endif /* DEBUG */
 
@@ -1095,13 +1106,13 @@ SK_U32	PortNumber)	/* Port Number */
 	SK_ADDR_PORT	*pAPort;
 
 	SK_DBG_MSG(pAC,SK_DBGMOD_ADDR, SK_DBGCAT_CTRL,
-		("SkAddrGmacMcUpdate on Port %u.\n", PortNumber))
+		("SkAddrGmacMcUpdate on Port %u.\n", PortNumber));
 	
 	pAPort = &pAC->Addr.Port[PortNumber];
 
 #ifdef DEBUG
 	SK_DBG_MSG(pAC,SK_DBGMOD_ADDR, SK_DBGCAT_CTRL,
-		("Next0 on Port %d: %d\n", PortNumber, Next0[PortNumber]))
+		("Next0 on Port %d: %d\n", PortNumber, Next0[PortNumber]));
 #endif /* DEBUG */
 	
 #ifndef SK_SLIM
@@ -1157,7 +1168,7 @@ SK_U32	PortNumber)	/* Port Number */
 			pAPort->Exact[0].a[2],
 			pAPort->Exact[0].a[3],
 			pAPort->Exact[0].a[4],
-			pAPort->Exact[0].a[5]))
+			pAPort->Exact[0].a[5]));
 	
 	SK_DBG_MSG(pAC, SK_DBGMOD_ADDR, SK_DBGCAT_CTRL,
 		("SkAddrGmacMcUpdate: Physical MAC Address: %02X %02X %02X %02X %02X %02X\n",
@@ -1166,7 +1177,7 @@ SK_U32	PortNumber)	/* Port Number */
 			pAPort->CurrentMacAddress.a[2],
 			pAPort->CurrentMacAddress.a[3],
 			pAPort->CurrentMacAddress.a[4],
-			pAPort->CurrentMacAddress.a[5]))
+			pAPort->CurrentMacAddress.a[5]));
 #endif /* DEBUG */
 	
 #ifndef SK_SLIM
@@ -1373,7 +1384,7 @@ int			Flags)				/* logical/physical MAC 
 				pAC->Addr.Net[NetNumber].PermanentMacAddress.a[2],
 				pAC->Addr.Net[NetNumber].PermanentMacAddress.a[3],
 				pAC->Addr.Net[NetNumber].PermanentMacAddress.a[4],
-				pAC->Addr.Net[NetNumber].PermanentMacAddress.a[5]))
+				pAC->Addr.Net[NetNumber].PermanentMacAddress.a[5]));
 		
 		SK_DBG_MSG(pAC,SK_DBGMOD_ADDR, SK_DBGCAT_CTRL,
 			("SkAddrOverride: New logical MAC Address: %02X %02X %02X %02X %02X %02X\n",
@@ -1382,7 +1393,7 @@ int			Flags)				/* logical/physical MAC 
 				pAC->Addr.Net[NetNumber].CurrentMacAddress.a[2],
 				pAC->Addr.Net[NetNumber].CurrentMacAddress.a[3],
 				pAC->Addr.Net[NetNumber].CurrentMacAddress.a[4],
-				pAC->Addr.Net[NetNumber].CurrentMacAddress.a[5]))
+				pAC->Addr.Net[NetNumber].CurrentMacAddress.a[5]));
 #endif /* DEBUG */
 
         /* Write address to first exact match entry of active port. */
@@ -1424,7 +1435,7 @@ SK_IOC	IoC,			/* I/O context */
 SK_U32	PortNumber,		/* port whose promiscuous mode changes */
 int		NewPromMode)	/* new promiscuous mode */
 {
-	int ReturnCode;
+	int ReturnCode = 0;
 #if (!defined(SK_SLIM) || defined(DEBUG))
 	if (PortNumber >= (SK_U32) pAC->GIni.GIMacsFound) {
 		return (SK_ADDR_ILLEGAL_PORT);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/skcsum.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/skcsum.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/skcsum.c	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/skcsum.c	2004-09-09 13:20:48.000000000 +0200
@@ -2,8 +2,8 @@
  *
  * Name:	skcsum.c
  * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.12 $
- * Date:	$Date: 2003/08/20 13:55:53 $
+ * Version:	$Revision: 2.1 $
+ * Date:	$Date: 2003/10/27 14:16:08 $
  * Purpose:	Store/verify Internet checksum in send/receive packets.
  *
  ******************************************************************************/
@@ -25,7 +25,7 @@
 
 #ifndef lint
 static const char SysKonnectFileId[] =
-	"@(#) $Id: skcsum.c,v 1.12 2003/08/20 13:55:53 mschmid Exp $ (C) SysKonnect.";
+	"@(#) $Id: skcsum.c,v 2.1 2003/10/27 14:16:08 amock Exp $ (C) SysKonnect.";
 #endif	/* !lint */
 
 /******************************************************************************
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/skdim.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/skdim.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/skdim.c	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/skdim.c	2004-09-09 13:20:48.000000000 +0200
@@ -1,18 +1,29 @@
 /******************************************************************************
  *
- * Name:	skdim.c
- * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.5 $
- * Date:	$Date: 2003/11/28 12:55:40 $
- * Purpose:	All functions to maintain interrupt moderation
+ * Name:        skdim.c
+ * Project:     GEnesis, PCI Gigabit Ethernet Adapter
+ * Version:     $Revision: 1.5 $
+ * Date:        $Date: 2004/07/17 13:28:43 $
+ * Purpose:     All functions regardig interrupt moderation
  *
  ******************************************************************************/
 
 /******************************************************************************
  *
  *	(C)Copyright 1998-2002 SysKonnect GmbH.
- *	(C)Copyright 2002-2003 Marvell.
+ *	(C)Copyright 2002-2004 Marvell.
  *
+ *	Driver for Marvell Yukon/2 chipset and SysKonnect Gigabit Ethernet 
+ *      Server Adapters.
+ *
+ *	Author: Ralph Roesler (rroesler@syskonnect.de)
+ *	        Mirko Lindner (mlindner@syskonnect.de)
+ *
+ *	Address all question to: linux@syskonnect.de
+ *
+ *	The technical manual for the adapters is available from SysKonnect's
+ *	web pages: www.syskonnect.com
+ *	
  *	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
@@ -20,709 +31,367 @@
  *
  *	The information in this file is provided "AS IS" without warranty.
  *
- ******************************************************************************/
-
-/******************************************************************************
- *
- * 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.5 2003/11/28 12:55: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
+ *
+ *****************************************************************************/
 
-/*******************************************************************************
-**
-** 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);
+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);
 
-/*******************************************************************************
-**
-** Global variables
-**
-*******************************************************************************/
+#define M_DIMINFO pAC->DynIrqModInfo
 
-/*******************************************************************************
-**
-** Local variables
-**
-*******************************************************************************/
+/******************************************************************************
+ *
+ * Global Functions
+ *
+ *****************************************************************************/
 
-/*******************************************************************************
-**
-** Global functions 
-**
-*******************************************************************************/
+/*****************************************************************************
+ *
+ * 	SkDimModerate - Moderates the IRQs depending on the current needs
+ *
+ * Description:
+ *	Moderation of IRQs depends on the number of occurred IRQs with 
+ *	respect to the previous moderation cycle.
+ *
+ * Returns:	N/A
+ *
+ */
+void SkDimModerate(
+SK_AC *pAC)  /* pointer to adapter control context */
+{
+	SK_U64  IsrCalls = getIsrCalls(pAC);
+
+	SK_DBG_MSG(pAC,SK_DBGMOD_DRV,SK_DBGCAT_DRV_MSG,("==> SkDimModerate\n"));
+
+	if (M_DIMINFO.IntModTypeSelect == C_INT_MOD_DYNAMIC) {
+		if (isIntModEnabled(pAC)) {
+			if (IsrCalls < M_DIMINFO.MaxModIntsPerSecLowerLimit) {
+				disableIntMod(pAC);
+			}
+		} else {
+			if (IsrCalls > M_DIMINFO.MaxModIntsPerSecUpperLimit) {
+				enableIntMod(pAC);
+			}
+		}
+	}
+	setCurrIntCtr(pAC);
 
-/*******************************************************************************
-** 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;
+	SK_DBG_MSG(pAC,SK_DBGMOD_DRV,SK_DBGCAT_DRV_MSG,("<== SkDimModerate\n"));
+}
 
-#define M_DIMINFO pAC->DynIrqModInfo
+/*****************************************************************************
+ *
+ * 	SkDimStartModerationTimer - Starts the moderation timer
+ *
+ * Description:
+ *	Dynamic interrupt moderation is regularly checked using the
+ *	so-called moderation timer. This timer is started with this function.
+ *
+ * Returns:	N/A
+ */
+void SkDimStartModerationTimer(
+SK_AC *pAC) /* pointer to adapter control context */
+{
+	SK_EVPARA   EventParam;   /* Event struct for timer event */
+ 
+	SK_DBG_MSG(pAC,SK_DBGMOD_DRV,SK_DBGCAT_DRV_MSG,
+			("==> SkDimStartModerationTimer\n"));
 
-    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);
-    }
+	if (M_DIMINFO.IntModTypeSelect == C_INT_MOD_DYNAMIC) {
+		SK_MEMSET((char *) &EventParam, 0, sizeof(EventParam));
+		EventParam.Para32[0] = SK_DRV_MODERATION_TIMER;
+		SkTimerStart(pAC, pAC->IoBase,
+			&pAC->DynIrqModInfo.ModTimer,
+			pAC->DynIrqModInfo.DynIrqModSampleInterval * 1000000,
+			SKGE_DRV, SK_DRV_TIMER, EventParam);
+	}
 
-    M_DIMINFO.NbrProcessedDescr = 0; 
-    SetCurrIntCtr(pAC);
+	SK_DBG_MSG(pAC,SK_DBGMOD_DRV,SK_DBGCAT_DRV_MSG,
+			("<== SkDimStartModerationTimer\n"));
 }
 
-/*******************************************************************************
-** 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);
-}
+/*****************************************************************************
+ *
+ * 	SkDimEnableModerationIfNeeded - Enables or disables any moderationtype
+ *
+ * Description:
+ *	This function effectively initializes the IRQ moderation of a network
+ *	adapter. Depending on the configuration, this might be either static
+ *	or dynamic. If no moderation is configured, this function will do
+ *	nothing.
+ *
+ * Returns:	N/A
+ */
+void SkDimEnableModerationIfNeeded(
+SK_AC *pAC)  /* pointer to adapter control context */
+{
+	SK_DBG_MSG(pAC,SK_DBGMOD_DRV,SK_DBGCAT_DRV_MSG,
+			("==> SkDimEnableModerationIfNeeded\n"));
+
+	if (M_DIMINFO.IntModTypeSelect != C_INT_MOD_NONE) {
+		if (M_DIMINFO.IntModTypeSelect == C_INT_MOD_STATIC) {
+			enableIntMod(pAC);   
+		} else { /* must be C_INT_MOD_DYNAMIC */
+			SkDimStartModerationTimer(pAC);
+		}
+	}
 
-/*******************************************************************************
-** 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");
-        }
-    }
+	SK_DBG_MSG(pAC,SK_DBGMOD_DRV,SK_DBGCAT_DRV_MSG,
+			("<== SkDimEnableModerationIfNeeded\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);
-}
+/*****************************************************************************
+ *
+ * 	SkDimDisableModeration - disables moderation if it is enabled
+ *
+ * Description:
+ *	Disabling of the moderation requires that is enabled already.
+ *
+ * Returns:	N/A
+ */
+void SkDimDisableModeration(
+SK_AC  *pAC,                /* pointer to adapter control context */
+int     CurrentModeration)  /* type of current moderation         */
+{
+	SK_DBG_MSG(pAC,SK_DBGMOD_DRV,SK_DBGCAT_DRV_MSG,
+			("==> SkDimDisableModeration\n"));
+
+	if (M_DIMINFO.IntModTypeSelect != C_INT_MOD_NONE) {
+		if (CurrentModeration == C_INT_MOD_STATIC) {
+			disableIntMod(pAC);
+		} else { /* must be C_INT_MOD_DYNAMIC */
+			SkTimerStop(pAC, pAC->IoBase, &M_DIMINFO.ModTimer);
+			disableIntMod(pAC);
+		}
+	}
 
-/*******************************************************************************
-**
-** Local functions 
-**
-*******************************************************************************/
+	SK_DBG_MSG(pAC,SK_DBGMOD_DRV,SK_DBGCAT_DRV_MSG,
+			("<== SkDimDisableModeration\n"));
+}
 
-/*******************************************************************************
-** 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;
-
-#ifdef CONFIG_SMP
-	unsigned int  SKNumCpus   = smp_num_cpus;
-#else
-	unsigned int  SKNumCpus   = 1;
-#endif
+/******************************************************************************
+ *
+ * Local Functions
+ *
+ *****************************************************************************/
 
-	unsigned int  NbrCpu      = 0;
+/*****************************************************************************
+ *
+ * 	getIsrCalls - evaluate the number of IRQs handled in mod interval
+ *
+ * Description:
+ *	Depending on the selected moderation mask, this function will return
+ *	the number of interrupts handled in the previous moderation interval.
+ *	This evaluated number is based on the current number of interrupts
+ *	stored in PNMI-context and the previous stored interrupts.
+ *
+ * Returns:
+ *	the number of IRQs handled
+ */
+static SK_U64 getIsrCalls(
+SK_AC *pAC)  /* pointer to adapter control context */
+{
+	SK_U64   RxPort0IntDiff = 0, RxPort1IntDiff = 0;
+	SK_U64   TxPort0IntDiff = 0, TxPort1IntDiff = 0;
+	SK_U64   StatusPort0IntDiff = 0, StatusPort1IntDiff = 0;
+
+        SK_DBG_MSG(pAC,SK_DBGMOD_DRV,SK_DBGCAT_DRV_MSG,("==>getIsrCalls\n"));
+
+	if (!CHIP_ID_YUKON_2(pAC)) {
+		if ((M_DIMINFO.MaskIrqModeration == IRQ_MASK_TX_ONLY) ||
+		    (M_DIMINFO.MaskIrqModeration == IRQ_MASK_SP_TX)) {
+			if (pAC->GIni.GIMacsFound == 2) {
+				TxPort1IntDiff = 
+					pAC->Pnmi.Port[1].TxIntrCts - 
+					M_DIMINFO.PrevPort1TxIntrCts;
+			}
+			TxPort0IntDiff = pAC->Pnmi.Port[0].TxIntrCts - 
+					M_DIMINFO.PrevPort0TxIntrCts;
+		} else if ((M_DIMINFO.MaskIrqModeration == IRQ_MASK_RX_ONLY) ||
+		           (M_DIMINFO.MaskIrqModeration == IRQ_MASK_SP_RX)) {
+			if (pAC->GIni.GIMacsFound == 2) {
+				RxPort1IntDiff =
+					pAC->Pnmi.Port[1].RxIntrCts - 
+					M_DIMINFO.PrevPort1RxIntrCts;
+			}
+			RxPort0IntDiff = pAC->Pnmi.Port[0].RxIntrCts - 
+					M_DIMINFO.PrevPort0RxIntrCts;
+		} else {
+			if (pAC->GIni.GIMacsFound == 2) {
+				RxPort1IntDiff = 
+					pAC->Pnmi.Port[1].RxIntrCts - 
+					M_DIMINFO.PrevPort1RxIntrCts;
+				TxPort1IntDiff =
+					pAC->Pnmi.Port[1].TxIntrCts - 
+					M_DIMINFO.PrevPort1TxIntrCts;
+			} 
+			RxPort0IntDiff = pAC->Pnmi.Port[0].RxIntrCts - 
+					M_DIMINFO.PrevPort0RxIntrCts;
+			TxPort0IntDiff = pAC->Pnmi.Port[0].TxIntrCts - 
+					M_DIMINFO.PrevPort0TxIntrCts;
+		}
+        	SK_DBG_MSG(pAC,SK_DBGMOD_DRV,SK_DBGCAT_DRV_MSG,
+				("==>getIsrCalls (!CHIP_ID_YUKON_2)\n"));
+		return (RxPort0IntDiff + RxPort1IntDiff + 
+		        TxPort0IntDiff + TxPort1IntDiff);
+	}
 
-    for (NbrCpu = 0; NbrCpu < SKNumCpus; NbrCpu++) {
-#ifdef _LINUX_PROCESS_TIMING_H
 	/*
-	** all seconds and usec values being obtained from the
-	** process_timing entries need to be adapted to jiffies
-	** (in case we have a system supporting process times)
+	** We have a Yukon2 compliant chipset if we come up to here
+	**
+	if (pAC->GIni.GIMacsFound == 2) {
+		StatusPort1IntDiff = pAC->Pnmi.Port[1].StatusLeIntrCts - 
+					M_DIMINFO.PrevPort1StatusIntrCts;
+	}
+	StatusPort0IntDiff = pAC->Pnmi.Port[0].StatusLeIntrCts - 
+				M_DIMINFO.PrevPort0StatusIntrCts;
 	*/
-        UserTime   = UserTime   + (kstat_percpu[NbrCpu].user.tv_sec * 10)
-	                        + (kstat_percpu[NbrCpu].user.tv_usec/100000);
-        NiceTime   = NiceTime   + (kstat_percpu[NbrCpu].nice.tv_sec * 10)
-	                        + (kstat_percpu[NbrCpu].nice.tv_usec/100000);
-        SystemTime = SystemTime + (kstat_percpu[NbrCpu].system.tv_sec * 10)
-	                        + (kstat_percpu[NbrCpu].system.tv_usec/100000);
-#else
-        UserTime   = UserTime   + kstat.per_cpu_user[NbrCpu];
-        NiceTime   = NiceTime   + kstat.per_cpu_nice[NbrCpu];
-        SystemTime = SystemTime + kstat.per_cpu_system[NbrCpu];
-#endif
-    }
-
-	UsedTime  = UserTime + NiceTime + SystemTime;
-
-	IdleTime  = jif * SKNumCpus - UsedTime;
-	TotalTime = UsedTime + IdleTime;
-
-	SystemLoad = ( 100 * (UsedTime  - M_DIMINFO.PrevUsedTime) ) /
-						(TotalTime - M_DIMINFO.PrevTotalTime);
+        SK_DBG_MSG(pAC,SK_DBGMOD_DRV,SK_DBGCAT_DRV_MSG,
+			("==>getIsrCalls (CHIP_ID_YUKON_2)\n"));
+	return (StatusPort0IntDiff + StatusPort1IntDiff);
+}
 
-	if (M_DIMINFO.DisplayStats) {
-		printk("Current system load is: %u\n", SystemLoad);
+/*****************************************************************************
+ *
+ * 	setCurrIntCtr - stores the current number of interrupts
+ *
+ * Description:
+ *	Stores the current number of occurred interrupts in the adapter
+ *	context. This is needed to evaluate the  umber of interrupts within
+ *	the moderation interval.
+ *
+ * Returns:	N/A
+ *
+ */
+static void setCurrIntCtr(
+SK_AC *pAC)  /* pointer to adapter control context */
+{
+        SK_DBG_MSG(pAC,SK_DBGMOD_DRV,SK_DBGCAT_DRV_MSG,("==>setCurrIntCtr\n"));
+
+	if (!CHIP_ID_YUKON_2(pAC)) {
+		if (pAC->GIni.GIMacsFound == 2) {
+			M_DIMINFO.PrevPort1RxIntrCts = pAC->Pnmi.Port[1].RxIntrCts;
+			M_DIMINFO.PrevPort1TxIntrCts = pAC->Pnmi.Port[1].TxIntrCts;
+		} 
+		M_DIMINFO.PrevPort0RxIntrCts = pAC->Pnmi.Port[0].RxIntrCts;
+		M_DIMINFO.PrevPort0TxIntrCts = pAC->Pnmi.Port[0].TxIntrCts;
+        	SK_DBG_MSG(pAC,SK_DBGMOD_DRV,SK_DBGCAT_DRV_MSG,
+				("<== setCurrIntCtr (!CHIP_ID_YUKON_2)\n"));
+		return;
 	}
 
-	M_DIMINFO.PrevTotalTime = TotalTime;
-	M_DIMINFO.PrevUsedTime  = UsedTime;
-
-	return (SystemLoad);
+	/*
+	** We have a Yukon2 compliant chipset if we come up to here
+	**
+	if (pAC->GIni.GIMacsFound == 2) {
+		M_DIMINFO.PrevPort1StatusIntrCts = pAC->Pnmi.Port[1].StatusLeIntrCts;
+	} 
+	M_DIMINFO.PrevPort0StatusIntrCts = pAC->Pnmi.Port[0].StatusLeIntrCts;
+	*/
+        SK_DBG_MSG(pAC,SK_DBGMOD_DRV,SK_DBGCAT_DRV_MSG,
+			("<== setCurrIntCtr (CHIP_ID_YUKON_2)\n"));
 }
 
-/*******************************************************************************
-** 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);
+/*****************************************************************************
+ *
+ * 	isIntModEnabled - returns the current state of interrupt moderation
+ *
+ * Description:
+ *	This function retrieves the current value of the interrupt moderation
+ *	command register. Its content determines whether any moderation is 
+ *	running or not.
+ *
+ * Returns:
+ *	SK_TRUE : IRQ moderation is currently active
+ *	SK_FALSE: No IRQ moderation is active
+ */
+static SK_BOOL isIntModEnabled(
+SK_AC *pAC)  /* pointer to adapter control context */
+{
+	unsigned long CtrCmd;
+
+        SK_DBG_MSG(pAC,SK_DBGMOD_DRV,SK_DBGCAT_DRV_MSG,("==>isIntModEnabled\n"));
+
+	SK_IN32(pAC->IoBase, B2_IRQM_CTRL, &CtrCmd);
+	if ((CtrCmd & TIM_START) == TIM_START) {
+        	SK_DBG_MSG(pAC,SK_DBGMOD_DRV,SK_DBGCAT_DRV_MSG,
+			("<== isIntModEnabled (SK_TRUE)\n"));
+		return SK_TRUE;
+	}
+        SK_DBG_MSG(pAC,SK_DBGMOD_DRV,SK_DBGCAT_DRV_MSG,
+			("<== isIntModEnabled (SK_FALSE)\n"));
+	return SK_FALSE;
 }
 
-/*******************************************************************************
-** 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);
-}
+/*****************************************************************************
+ *
+ * 	enableIntMod - enables the interrupt moderation
+ *
+ * Description:
+ *	Enabling the interrupt moderation is done by putting the desired
+ *	moderation interval in the B2_IRQM_INI register, specifying the
+ *	desired maks in the B2_IRQM_MSK register and finally starting the
+ *	IRQ moderation timer using the B2_IRQM_CTRL register.
+ *
+ * Returns:	N/A
+ *
+ */
+static void enableIntMod(
+SK_AC *pAC)  /* pointer to adapter control context */
+{
+	unsigned long ModBase;
+
+        SK_DBG_MSG(pAC,SK_DBGMOD_DRV,SK_DBGCAT_DRV_MSG,("==> enableIntMod\n"));
+
+	if (pAC->GIni.GIChipId == CHIP_ID_GENESIS) {
+		ModBase = C_CLK_FREQ_GENESIS / M_DIMINFO.MaxModIntsPerSec;
+	} else if (pAC->GIni.GIChipId == CHIP_ID_YUKON_EC) {
+		ModBase = C_CLK_FREQ_YUKON_EC / M_DIMINFO.MaxModIntsPerSec;
+	} else {
+		ModBase = C_CLK_FREQ_YUKON / M_DIMINFO.MaxModIntsPerSec;
+	}
 
-/*******************************************************************************
-** 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;
-}
+	SK_OUT32(pAC->IoBase, B2_IRQM_INI, ModBase);
+	SK_OUT32(pAC->IoBase, B2_IRQM_MSK, M_DIMINFO.MaskIrqModeration);
+	SK_OUT32(pAC->IoBase, B2_IRQM_CTRL, TIM_START);
 
-/*******************************************************************************
-** 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;
-    }
+        SK_DBG_MSG(pAC,SK_DBGMOD_DRV,SK_DBGCAT_DRV_MSG,("<== enableIntMod\n"));
 }
 
-/*******************************************************************************
-** 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);
-    }
-}
+/*****************************************************************************
+ *
+ * 	disableIntMod - disables the interrupt moderation
+ *
+ * Description:
+ *	Disabling the interrupt moderation is done by stopping the
+ *	IRQ moderation timer using the B2_IRQM_CTRL register.
+ *
+ * Returns:	N/A
+ *
+ */
+static void disableIntMod(
+SK_AC *pAC)  /* pointer to adapter control context */
+{
+        SK_DBG_MSG(pAC,SK_DBGMOD_DRV,SK_DBGCAT_DRV_MSG,("==> disableIntMod\n"));
 
-/*******************************************************************************
-** 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");
-    }
-} 
+	SK_OUT32(pAC->IoBase, B2_IRQM_CTRL, TIM_STOP);
 
-/*******************************************************************************
-** 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);
+        SK_DBG_MSG(pAC,SK_DBGMOD_DRV,SK_DBGCAT_DRV_MSG,("<== disableIntMod\n"));
 } 
 
 /*******************************************************************************
-** 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
-**
-*******************************************************************************/
+ *
+ * End of file
+ *
+ ******************************************************************************/
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/skethtool.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/skethtool.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/skethtool.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/skethtool.c	2004-09-09 13:20:48.000000000 +0200
@@ -0,0 +1,1252 @@
+/******************************************************************************
+ *
+ * Name:        skethtool.c
+ * Project:     GEnesis, PCI Gigabit Ethernet Adapter
+ * Version:     $Revision: 1.3 $
+ * Date:        $Date: 2004/07/26 15:00:53 $
+ * Purpose:     All functions regarding ethtool handling
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *	(C)Copyright 1998-2002 SysKonnect GmbH.
+ *	(C)Copyright 2002-2004 Marvell.
+ *
+ *	Driver for Marvell Yukon/2 chipset and SysKonnect Gigabit Ethernet 
+ *      Server Adapters.
+ *
+ *	Author: Ralph Roesler (rroesler@syskonnect.de)
+ *	        Mirko Lindner (mlindner@syskonnect.de)
+ *
+ *	Address all question to: linux@syskonnect.de
+ *
+ *	The technical manual for the adapters is available from SysKonnect's
+ *	web pages: www.syskonnect.com
+ *	
+ *	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.
+ *
+ *****************************************************************************/
+
+#include "h/skdrv1st.h"
+#include "h/skdrv2nd.h"
+#include "h/skversion.h"
+#include <linux/ethtool.h>
+#include <linux/module.h>
+#include <linux/timer.h>
+
+/******************************************************************************
+ *
+ * External Functions and Data
+ *
+ *****************************************************************************/
+
+extern void SkDimDisableModeration(SK_AC *pAC, int CurrentModeration);
+extern void SkDimEnableModerationIfNeeded(SK_AC *pAC);
+
+/******************************************************************************
+ *
+ * Defines
+ *
+ *****************************************************************************/
+
+#ifndef ETHT_STATSTRING_LEN
+#define ETHT_STATSTRING_LEN 32
+#endif
+
+#define SK98LIN_STAT(m)	sizeof(((SK_AC *)0)->m),offsetof(SK_AC, m)
+
+#define SUPP_COPPER_ALL (SUPPORTED_10baseT_Half  | SUPPORTED_10baseT_Full  | \
+                         SUPPORTED_100baseT_Half | SUPPORTED_100baseT_Full | \
+                         SUPPORTED_1000baseT_Half| SUPPORTED_1000baseT_Full| \
+                         SUPPORTED_TP)
+
+#define ADV_COPPER_ALL  (ADVERTISED_10baseT_Half  | ADVERTISED_10baseT_Full  | \
+                         ADVERTISED_100baseT_Half | ADVERTISED_100baseT_Full | \
+                         ADVERTISED_1000baseT_Half| ADVERTISED_1000baseT_Full| \
+                         ADVERTISED_TP)
+
+#define SUPP_FIBRE_ALL  (SUPPORTED_1000baseT_Full | \
+                         SUPPORTED_FIBRE          | \
+                         SUPPORTED_Autoneg)
+
+#define ADV_FIBRE_ALL   (ADVERTISED_1000baseT_Full | \
+                         ADVERTISED_FIBRE          | \
+                         ADVERTISED_Autoneg)
+
+/******************************************************************************
+ *
+ * Local Function Prototypes
+ *
+ *****************************************************************************/
+
+#ifdef ETHTOOL_GSET
+static void getSettings(SK_AC *pAC, int port, struct ethtool_cmd *ecmd);
+#endif
+#ifdef ETHTOOL_SSET
+static int setSettings(SK_AC *pAC, int port, struct ethtool_cmd *ecmd);
+#endif
+#ifdef ETHTOOL_GPAUSEPARAM
+static void getPauseParams(SK_AC *pAC, int port, struct ethtool_pauseparam *epause);
+#endif
+#ifdef ETHTOOL_SPAUSEPARAM
+static int setPauseParams(SK_AC *pAC, int port, struct ethtool_pauseparam *epause);
+#endif
+#ifdef ETHTOOL_GDRVINFO
+static void getDriverInfo(SK_AC *pAC, int port, struct ethtool_drvinfo *edrvinfo);
+#endif
+#ifdef ETHTOOL_PHYS_ID
+static int startLocateNIC(SK_AC *pAC, int port, struct ethtool_value *blinkSecs);
+static void toggleLeds(unsigned long ptr);
+#endif
+#ifdef ETHTOOL_GCOALESCE
+static void getModerationParams(SK_AC *pAC, int port, struct ethtool_coalesce *ecoalesc);
+#endif
+#ifdef ETHTOOL_SCOALESCE
+static int setModerationParams(SK_AC *pAC, int port, struct ethtool_coalesce *ecoalesc);
+#endif
+#ifdef ETHTOOL_GWOL
+static void getWOLsettings(SK_AC *pAC, int port, struct ethtool_wolinfo *ewol);
+#endif
+#ifdef ETHTOOL_SWOL
+static int setWOLsettings(SK_AC *pAC, int port, struct ethtool_wolinfo *ewol);
+#endif
+
+static int getPortNumber(struct net_device *netdev, struct ifreq *ifr);
+
+/******************************************************************************
+ *
+ * Local Variables
+ *
+ *****************************************************************************/
+
+struct sk98lin_stats {
+	char stat_string[ETHT_STATSTRING_LEN];
+	int  sizeof_stat;
+	int  stat_offset;
+};
+
+static struct sk98lin_stats sk98lin_etht_stats_port0[] = {
+	{ "rx_packets" , SK98LIN_STAT(PnmiStruct.Stat[0].StatRxOkCts) },
+	{ "tx_packets" , SK98LIN_STAT(PnmiStruct.Stat[0].StatTxOkCts) },
+	{ "rx_bytes" , SK98LIN_STAT(PnmiStruct.Stat[0].StatRxOctetsOkCts) },
+	{ "tx_bytes" , SK98LIN_STAT(PnmiStruct.Stat[0].StatTxOctetsOkCts) },
+	{ "rx_errors" , SK98LIN_STAT(PnmiStruct.InErrorsCts) },
+	{ "tx_errors" , SK98LIN_STAT(PnmiStruct.Stat[0].StatTxSingleCollisionCts) },
+	{ "rx_dropped" , SK98LIN_STAT(PnmiStruct.RxNoBufCts) },
+	{ "tx_dropped" , SK98LIN_STAT(PnmiStruct.TxNoBufCts) },
+	{ "multicasts" , SK98LIN_STAT(PnmiStruct.Stat[0].StatRxMulticastOkCts) },
+	{ "collisions" , SK98LIN_STAT(PnmiStruct.Stat[0].StatTxSingleCollisionCts) },
+	{ "rx_length_errors" , SK98LIN_STAT(PnmiStruct.Stat[0].StatRxRuntCts) },
+	{ "rx_buffer_overflow_errors" , SK98LIN_STAT(PnmiStruct.Stat[0].StatRxFifoOverflowCts) },
+	{ "rx_crc_errors" , SK98LIN_STAT(PnmiStruct.Stat[0].StatRxFcsCts) },
+	{ "rx_frame_errors" , SK98LIN_STAT(PnmiStruct.Stat[0].StatRxFramingCts) },
+	{ "rx_too_short_errors" , SK98LIN_STAT(PnmiStruct.Stat[0].StatRxShortsCts) },
+	{ "rx_too_long_errors" , SK98LIN_STAT(PnmiStruct.Stat[0].StatRxTooLongCts) },
+	{ "rx_carrier_extension_errors", SK98LIN_STAT(PnmiStruct.Stat[0].StatRxCextCts) },
+	{ "rx_symbol_errors" , SK98LIN_STAT(PnmiStruct.Stat[0].StatRxSymbolCts) },
+	{ "rx_llc_mac_size_errors" , SK98LIN_STAT(PnmiStruct.Stat[0].StatRxIRLengthCts) },
+	{ "rx_carrier_errors" , SK98LIN_STAT(PnmiStruct.Stat[0].StatRxCarrierCts) },
+	{ "rx_jabber_errors" , SK98LIN_STAT(PnmiStruct.Stat[0].StatRxJabberCts) },
+	{ "rx_missed_errors" , SK98LIN_STAT(PnmiStruct.Stat[0].StatRxMissedCts) },
+	{ "tx_abort_collision_errors" , SK98LIN_STAT(stats.tx_aborted_errors) },
+	{ "tx_carrier_errors" , SK98LIN_STAT(PnmiStruct.Stat[0].StatTxCarrierCts) },
+	{ "tx_buffer_underrun_errors" , SK98LIN_STAT(PnmiStruct.Stat[0].StatTxFifoUnderrunCts) },
+	{ "tx_heartbeat_errors" , SK98LIN_STAT(PnmiStruct.Stat[0].StatTxCarrierCts) } ,
+	{ "tx_window_errors" , SK98LIN_STAT(stats.tx_window_errors) }
+};
+
+static struct sk98lin_stats sk98lin_etht_stats_port1[] = {
+	{ "rx_packets" , SK98LIN_STAT(PnmiStruct.Stat[1].StatRxOkCts) },
+	{ "tx_packets" , SK98LIN_STAT(PnmiStruct.Stat[1].StatTxOkCts) },
+	{ "rx_bytes" , SK98LIN_STAT(PnmiStruct.Stat[1].StatRxOctetsOkCts) },
+	{ "tx_bytes" , SK98LIN_STAT(PnmiStruct.Stat[1].StatTxOctetsOkCts) },
+	{ "rx_errors" , SK98LIN_STAT(PnmiStruct.InErrorsCts) },
+	{ "tx_errors" , SK98LIN_STAT(PnmiStruct.Stat[1].StatTxSingleCollisionCts) },
+	{ "rx_dropped" , SK98LIN_STAT(PnmiStruct.RxNoBufCts) },
+	{ "tx_dropped" , SK98LIN_STAT(PnmiStruct.TxNoBufCts) },
+	{ "multicasts" , SK98LIN_STAT(PnmiStruct.Stat[1].StatRxMulticastOkCts) },
+	{ "collisions" , SK98LIN_STAT(PnmiStruct.Stat[1].StatTxSingleCollisionCts) },
+	{ "rx_length_errors" , SK98LIN_STAT(PnmiStruct.Stat[1].StatRxRuntCts) },
+	{ "rx_buffer_overflow_errors" , SK98LIN_STAT(PnmiStruct.Stat[1].StatRxFifoOverflowCts) },
+	{ "rx_crc_errors" , SK98LIN_STAT(PnmiStruct.Stat[1].StatRxFcsCts) },
+	{ "rx_frame_errors" , SK98LIN_STAT(PnmiStruct.Stat[1].StatRxFramingCts) },
+	{ "rx_too_short_errors" , SK98LIN_STAT(PnmiStruct.Stat[1].StatRxShortsCts) },
+	{ "rx_too_long_errors" , SK98LIN_STAT(PnmiStruct.Stat[1].StatRxTooLongCts) },
+	{ "rx_carrier_extension_errors", SK98LIN_STAT(PnmiStruct.Stat[1].StatRxCextCts) },
+	{ "rx_symbol_errors" , SK98LIN_STAT(PnmiStruct.Stat[1].StatRxSymbolCts) },
+	{ "rx_llc_mac_size_errors" , SK98LIN_STAT(PnmiStruct.Stat[1].StatRxIRLengthCts) },
+	{ "rx_carrier_errors" , SK98LIN_STAT(PnmiStruct.Stat[1].StatRxCarrierCts) },
+	{ "rx_jabber_errors" , SK98LIN_STAT(PnmiStruct.Stat[1].StatRxJabberCts) },
+	{ "rx_missed_errors" , SK98LIN_STAT(PnmiStruct.Stat[1].StatRxMissedCts) },
+	{ "tx_abort_collision_errors" , SK98LIN_STAT(stats.tx_aborted_errors) },
+	{ "tx_carrier_errors" , SK98LIN_STAT(PnmiStruct.Stat[1].StatTxCarrierCts) },
+	{ "tx_buffer_underrun_errors" , SK98LIN_STAT(PnmiStruct.Stat[1].StatTxFifoUnderrunCts) },
+	{ "tx_heartbeat_errors" , SK98LIN_STAT(PnmiStruct.Stat[1].StatTxCarrierCts) } ,
+	{ "tx_window_errors" , SK98LIN_STAT(stats.tx_window_errors) }
+};
+
+#define SK98LIN_STATS_LEN sizeof(sk98lin_etht_stats_port0) / sizeof(struct sk98lin_stats)
+
+static int nbrBlinkQuarterSeconds;
+static int currentPortIndex;
+static SK_BOOL isLocateNICrunning   = SK_FALSE;
+static SK_BOOL isDualNetCard        = SK_FALSE;
+static SK_BOOL doSwitchLEDsOn       = SK_FALSE;
+static SK_BOOL boardWasDown[2]      = { SK_FALSE, SK_FALSE };
+static struct timer_list locateNICtimer;
+
+/******************************************************************************
+ *
+ * Global Functions
+ *
+ *****************************************************************************/
+
+/*****************************************************************************
+ *
+ * 	SkEthIoctl - IOCTL entry point for all ethtool queries
+ *
+ * Description:
+ *	Any IOCTL request that has to deal with the ethtool command tool is
+ *	dispatched via this function.
+ *
+ * Returns:
+ *	==0:	everything fine, no error
+ *	!=0:	the return value is the error code of the failure 
+ */
+int SkEthIoctl(
+struct net_device *netdev,  /* the pointer to netdev structure       */
+struct ifreq      *ifr)     /* what interface the request refers to? */
+{
+	DEV_NET             *pNet        = (DEV_NET*) netdev->priv;
+	SK_AC               *pAC         = pNet->pAC;
+	void                *pAddr       = ifr->ifr_data;
+	int                  port        = getPortNumber(netdev, ifr);
+	SK_PNMI_STRUCT_DATA *pPnmiStruct = &pAC->PnmiStruct;
+	SK_U32               Size        = sizeof(SK_PNMI_STRUCT_DATA);
+	SK_U32               cmd;
+	struct sk98lin_stats *sk98lin_etht_stats = 
+		(port == 0) ? sk98lin_etht_stats_port0 : sk98lin_etht_stats_port1;
+
+        if (get_user(cmd, (uint32_t *) pAddr)) {
+                return -EFAULT;
+	}
+
+	switch(cmd) {
+#ifdef ETHTOOL_GSET
+	case ETHTOOL_GSET: {
+		struct ethtool_cmd ecmd = { ETHTOOL_GSET };
+		getSettings(pAC, port, &ecmd);
+		if(copy_to_user(pAddr, &ecmd, sizeof(ecmd))) {
+			return -EFAULT;
+		}
+		return 0;
+	}
+	break;
+#endif
+#ifdef ETHTOOL_SSET
+	case ETHTOOL_SSET: {
+		struct ethtool_cmd ecmd;
+		if(copy_from_user(&ecmd, pAddr, sizeof(ecmd))) {
+			return -EFAULT;
+		}
+		return setSettings(pAC, port, &ecmd);
+	}
+	break;
+#endif
+#ifdef ETHTOOL_GDRVINFO
+	case ETHTOOL_GDRVINFO: {
+		struct ethtool_drvinfo drvinfo = { ETHTOOL_GDRVINFO };
+		getDriverInfo(pAC, port, &drvinfo);
+		if(copy_to_user(pAddr, &drvinfo, sizeof(drvinfo))) {
+			return -EFAULT;
+		}
+		return 0;
+	}
+	break;
+#endif
+#ifdef ETHTOOL_GSTRINGS
+	case ETHTOOL_GSTRINGS: {
+		struct ethtool_gstrings gstrings = { ETHTOOL_GSTRINGS };
+		char *strings = NULL;
+		int err = 0;
+		if(copy_from_user(&gstrings, pAddr, sizeof(gstrings))) {
+			return -EFAULT;
+		}
+		switch(gstrings.string_set) {
+#ifdef ETHTOOL_GSTATS
+			case ETH_SS_STATS: {
+				int i;
+				gstrings.len = SK98LIN_STATS_LEN;
+				if ((strings = kmalloc(SK98LIN_STATS_LEN*ETHT_STATSTRING_LEN,GFP_KERNEL)) == NULL) {
+					return -ENOMEM;
+				}
+				for(i=0; i < SK98LIN_STATS_LEN; i++) {
+					memcpy(&strings[i * ETHT_STATSTRING_LEN],
+						&(sk98lin_etht_stats[i].stat_string),
+						ETHT_STATSTRING_LEN);
+				}
+			}
+			break;
+#endif
+			default:
+				return -EOPNOTSUPP;
+		}
+		if(copy_to_user(pAddr, &gstrings, sizeof(gstrings))) {
+			err = -EFAULT;
+		}
+		pAddr += offsetof(struct ethtool_gstrings, data);
+		if(!err && copy_to_user(pAddr, strings, gstrings.len * ETH_GSTRING_LEN)) {
+			err = -EFAULT;
+		}
+		kfree(strings);
+		return err;
+	}
+#endif
+#ifdef ETHTOOL_GSTATS
+	case ETHTOOL_GSTATS: {
+		struct {
+			struct ethtool_stats eth_stats;
+			uint64_t data[SK98LIN_STATS_LEN];
+		} stats = { {ETHTOOL_GSTATS, SK98LIN_STATS_LEN} };
+		int i;
+
+		if (pNet->Up) {
+			SkPnmiGetStruct(pAC, pAC->IoBase, pPnmiStruct, &Size, port);
+		}
+		for(i = 0; i < SK98LIN_STATS_LEN; i++) {
+			if (pNet->Up) {
+				stats.data[i] = (sk98lin_etht_stats[i].sizeof_stat ==
+					sizeof(uint64_t)) ?
+					*(uint64_t *)((char *)pAC +
+						sk98lin_etht_stats[i].stat_offset) :
+					*(uint32_t *)((char *)pAC +
+						sk98lin_etht_stats[i].stat_offset);
+			} else {
+				stats.data[i] = (sk98lin_etht_stats[i].sizeof_stat ==
+					sizeof(uint64_t)) ? (uint64_t) 0 : (uint32_t) 0;
+			}
+		}
+		if(copy_to_user(pAddr, &stats, sizeof(stats))) {
+			return -EFAULT;
+		}
+		return 0;
+	}
+#endif
+#ifdef ETHTOOL_PHYS_ID
+	case ETHTOOL_PHYS_ID: {
+		struct ethtool_value blinkSecs;
+		if(copy_from_user(&blinkSecs, pAddr, sizeof(blinkSecs))) {
+			return -EFAULT;
+		}
+		return startLocateNIC(pAC, port, &blinkSecs);
+	}
+#endif
+#ifdef ETHTOOL_GPAUSEPARAM
+	case ETHTOOL_GPAUSEPARAM: {
+		struct ethtool_pauseparam epause = { ETHTOOL_GPAUSEPARAM };
+		getPauseParams(pAC, port, &epause);
+		if(copy_to_user(pAddr, &epause, sizeof(epause))) {
+			return -EFAULT;
+		}
+		return 0;
+	}
+#endif
+#ifdef ETHTOOL_SPAUSEPARAM
+	case ETHTOOL_SPAUSEPARAM: {
+		struct ethtool_pauseparam epause;
+		if(copy_from_user(&epause, pAddr, sizeof(epause))) {
+			return -EFAULT;
+		}
+		return setPauseParams(pAC, port, &epause);
+	}
+#endif
+#ifdef ETHTOOL_GSG
+	case ETHTOOL_GSG: {
+		struct ethtool_value edata = { ETHTOOL_GSG };
+		edata.data = (netdev->features & NETIF_F_SG) != 0;
+		if (copy_to_user(pAddr, &edata, sizeof(edata))) {
+			return -EFAULT;
+		}
+		return 0;
+	}
+#endif
+#ifdef ETHTOOL_SSG
+	case ETHTOOL_SSG: {
+		struct ethtool_value edata;
+		if (copy_from_user(&edata, pAddr, sizeof(edata))) {
+                        return -EFAULT;
+		}
+		if (pAC->ChipsetType) {
+		/* Don't handle if Genesis chipset */
+			if (edata.data) {
+				netdev->features |= NETIF_F_SG;
+			} else {
+				netdev->features &= ~NETIF_F_SG;
+			}
+		}
+		return 0;
+	}
+#endif
+#ifdef ETHTOOL_GRXCSUM
+	case ETHTOOL_GRXCSUM: {
+		struct ethtool_value edata = { ETHTOOL_GRXCSUM };
+		edata.data = pAC->RxPort[port].UseRxCsum;
+		if (copy_to_user(pAddr, &edata, sizeof(edata))) {
+			return -EFAULT;
+		}
+		return 0;
+	}
+#endif
+#ifdef ETHTOOL_SRXCSUM
+	case ETHTOOL_SRXCSUM: {
+		struct ethtool_value edata;
+		if (copy_from_user(&edata, pAddr, sizeof(edata))) {
+			return -EFAULT;
+		}
+		pAC->RxPort[port].UseRxCsum = edata.data;
+                return 0;
+	}
+#endif
+#ifdef ETHTOOL_GTXCSUM
+	case ETHTOOL_GTXCSUM: {
+		struct ethtool_value edata = { ETHTOOL_GTXCSUM };
+		edata.data = ((netdev->features & NETIF_F_IP_CSUM) != 0);
+		if (copy_to_user(pAddr, &edata, sizeof(edata))) {
+			return -EFAULT;
+		}
+		return 0;
+	}
+#endif
+#ifdef ETHTOOL_STXCSUM
+	case ETHTOOL_STXCSUM: {
+		struct ethtool_value edata;
+		if (copy_from_user(&edata, pAddr, sizeof(edata))) {
+			return -EFAULT;
+		}
+
+		if (pAC->ChipsetType) {
+		/* Don't handle if Genesis chipset */
+			if (edata.data) {
+				netdev->features |= NETIF_F_IP_CSUM;
+			} else {
+				netdev->features &= ~NETIF_F_IP_CSUM;
+			}
+		}
+		return 0;
+	}
+#endif
+#ifdef ETHTOOL_NWAY_RST
+	case ETHTOOL_NWAY_RST: {
+		if(netif_running(netdev)) {
+			(*netdev->stop)(netdev);
+			(*netdev->open)(netdev);
+		}
+		return 0;
+	}
+#endif
+#ifdef NETIF_F_TSO
+#ifdef ETHTOOL_GTSO
+	case ETHTOOL_GTSO: {
+		struct ethtool_value edata = { ETHTOOL_GTSO };
+		edata.data = (netdev->features & NETIF_F_TSO) != 0;
+		if (copy_to_user(pAddr, &edata, sizeof(edata))) {
+			return -EFAULT;
+		}
+		return 0;
+	}
+#endif
+#ifdef ETHTOOL_STSO
+	case ETHTOOL_STSO: {
+		struct ethtool_value edata;
+		if (CHIP_ID_YUKON_2(pAC)) {
+			if (copy_from_user(&edata, pAddr, sizeof(edata))) {
+				return -EFAULT;
+			}
+			if (edata.data) {
+				netdev->features |= NETIF_F_TSO;
+			} else {
+				netdev->features &= ~NETIF_F_TSO;
+			}
+			return 0;
+		}
+                return -EOPNOTSUPP;
+	}
+#endif
+#endif
+#ifdef ETHTOOL_GCOALESCE
+	case ETHTOOL_GCOALESCE: {
+		struct ethtool_coalesce ecoalesc = { ETHTOOL_GCOALESCE };
+		getModerationParams(pAC, port, &ecoalesc);
+		if(copy_to_user(pAddr, &ecoalesc, sizeof(ecoalesc))) {
+			return -EFAULT;
+		}
+		return 0;
+	}
+#endif
+#ifdef ETHTOOL_SCOALESCE
+	case ETHTOOL_SCOALESCE: {
+		struct ethtool_coalesce ecoalesc;
+		if(copy_from_user(&ecoalesc, pAddr, sizeof(ecoalesc))) {
+			return -EFAULT;
+		}
+		return setModerationParams(pAC, port, &ecoalesc);
+	}
+#endif
+#ifdef ETHTOOL_GWOL
+	case ETHTOOL_GWOL: {
+		struct ethtool_wolinfo ewol = { ETHTOOL_GWOL };
+		getWOLsettings(pAC, port, &ewol);
+		if(copy_to_user(pAddr, &ewol, sizeof(ewol))) {
+			return -EFAULT;
+		}
+		return 0;
+	}
+#endif
+#ifdef ETHTOOL_SWOL
+	case ETHTOOL_SWOL: {
+		struct ethtool_wolinfo ewol;
+		if(copy_from_user(&ewol, pAddr, sizeof(ewol))) {
+			return -EFAULT;
+		}
+		return setWOLsettings(pAC, port, &ewol);
+	}
+#endif
+        default:
+                return -EOPNOTSUPP;
+        }
+} /* SkEthIoctl() */
+
+/******************************************************************************
+ *
+ * Local Functions
+ *
+ *****************************************************************************/
+
+#ifdef ETHTOOL_GSET
+/*****************************************************************************
+ *
+ * 	getSettings - retrieves the current settings of the selected adapter
+ *
+ * Description:
+ *	The current configuration of the selected adapter is returned.
+ *	This configuration involves a)speed, b)duplex and c)autoneg plus
+ *	a number of other variables.
+ *
+ * Returns:	N/A
+ *
+ */
+static void getSettings(
+SK_AC              *pAC,  /* pointer to adapter control context      */
+int                 port, /* the port of the selected adapter        */
+struct ethtool_cmd *ecmd) /* mandatory command structure for results */
+{
+	SK_GEPORT *pPort = &pAC->GIni.GP[port];
+
+	static int DuplexAutoNegConfMap[9][3]= {
+		{ -1                     , -1         , -1              },
+		{ 0                      , -1         , -1              },
+		{ SK_LMODE_HALF          , DUPLEX_HALF, AUTONEG_DISABLE },
+		{ SK_LMODE_FULL          , DUPLEX_FULL, AUTONEG_DISABLE },
+		{ SK_LMODE_AUTOHALF      , DUPLEX_HALF, AUTONEG_ENABLE  },
+		{ SK_LMODE_AUTOFULL      , DUPLEX_FULL, AUTONEG_ENABLE  },
+		{ SK_LMODE_AUTOBOTH      , DUPLEX_FULL, AUTONEG_ENABLE  },
+		{ SK_LMODE_AUTOSENSE     , -1         , -1              },
+		{ SK_LMODE_INDETERMINATED, -1         , -1              }
+	};
+
+	static int SpeedConfMap[6][2] = {
+		{ 0                       , -1 },
+		{ SK_LSPEED_AUTO          , SPEED_1000 },
+		{ SK_LSPEED_10MBPS        , SPEED_10   },
+		{ SK_LSPEED_100MBPS       , SPEED_100  },
+		{ SK_LSPEED_1000MBPS      , SPEED_1000 },
+		{ SK_LSPEED_INDETERMINATED, 0          }
+	};
+
+	ecmd->phy_address = port;
+	ecmd->speed       = SpeedConfMap[pPort->PLinkSpeedUsed][1];
+	ecmd->duplex      = DuplexAutoNegConfMap[pPort->PLinkModeStatus][1];
+	ecmd->autoneg     = DuplexAutoNegConfMap[pPort->PLinkModeStatus][2];
+	ecmd->transceiver = XCVR_INTERNAL;
+
+	if (pAC->GIni.GICopperType) {
+		ecmd->port        = PORT_TP;
+		ecmd->supported   = (SUPP_COPPER_ALL|SUPPORTED_Autoneg);
+		ecmd->advertising = (ADV_COPPER_ALL);
+		if (ecmd->autoneg == AUTONEG_ENABLE) {
+			ecmd->advertising |= ADVERTISED_Autoneg;
+		} 
+	} else {
+		ecmd->port        = PORT_FIBRE;
+		ecmd->supported   = (SUPP_FIBRE_ALL);
+		ecmd->advertising = (ADV_FIBRE_ALL);
+	}
+}
+#endif
+
+#ifdef ETHTOOL_SSET
+/*****************************************************************************
+ *
+ *	setSettings - configures the settings of a selected adapter
+ *
+ * Description:
+ *	Possible settings that may be altered are a)speed, b)duplex or 
+ *	c)autonegotiation.
+ *
+ * Returns:
+ *	==0:	everything fine, no error
+ *	!=0:	the return value is the error code of the failure 
+ */
+static int setSettings(
+SK_AC              *pAC,  /* pointer to adapter control context    */
+int                 port, /* the port of the selected adapter      */
+struct ethtool_cmd *ecmd) /* command structure containing settings */
+{
+	DEV_NET     *pNet  = (DEV_NET *) pAC->dev[port]->priv;
+	SK_U32       Instance;
+	char         Buf[4];
+	unsigned int Len = 1;
+	int Ret;
+
+	if (port == 0) {
+		Instance = (pAC->RlmtNets == 2) ? 1 : 2;
+	} else {
+		Instance = (pAC->RlmtNets == 2) ? 2 : 3;
+	}
+
+	if (ecmd->autoneg == AUTONEG_DISABLE) {
+		if (ecmd->duplex == DUPLEX_FULL) { 
+			*Buf = (char) SK_LMODE_FULL;
+		} else {
+			*Buf = (char) SK_LMODE_HALF;
+		}
+	} else {
+		if (ecmd->duplex == DUPLEX_FULL) { 
+			*Buf = (char) SK_LMODE_AUTOFULL;
+		} else {
+			*Buf = (char) SK_LMODE_AUTOHALF;
+		}
+	}
+
+	Ret = SkPnmiSetVar(pAC, pAC->IoBase, OID_SKGE_LINK_MODE, 
+				&Buf, &Len, Instance, pNet->NetNr);
+
+	if (Ret != SK_PNMI_ERR_OK) {
+		return -EINVAL;
+	}
+
+	if (ecmd->speed == SPEED_1000) {
+		*Buf = (char) SK_LSPEED_1000MBPS;
+	} else if (ecmd->speed == SPEED_100) {
+		*Buf = (char) SK_LSPEED_100MBPS;
+	} else {
+		*Buf = (char) SK_LSPEED_10MBPS;
+	}
+
+	Ret = SkPnmiSetVar(pAC, pAC->IoBase, OID_SKGE_SPEED_MODE, 
+				&Buf, &Len, Instance, pNet->NetNr);
+
+	if (Ret != SK_PNMI_ERR_OK) {
+		return -EINVAL;
+	}
+	return 0;
+}
+#endif
+
+#ifdef ETHTOOL_GPAUSEPARAM
+/*****************************************************************************
+ *
+ * 	getPauseParams - retrieves the pause parameters
+ *
+ * Description:
+ *	All current pause parameters of a selected adapter are placed 
+ *	in the passed ethtool_pauseparam structure and are returned.
+ *
+ * Returns:	N/A
+ *
+ */
+static void getPauseParams(
+SK_AC                     *pAC,    /* pointer to adapter control context */
+int                        port,   /* the port of the selected adapter   */
+struct ethtool_pauseparam *epause) /* pause parameter struct for result  */
+{
+	SK_GEPORT *pPort            = &pAC->GIni.GP[port];
+	SK_BOOL    isAutoNegEnabled = SK_TRUE;
+
+	if (pPort->PLinkModeConf == SK_LMODE_HALF || 
+	    pPort->PLinkModeConf == SK_LMODE_FULL) {
+                isAutoNegEnabled = SK_FALSE;
+        }
+
+	epause->autoneg  = isAutoNegEnabled;
+	epause->rx_pause = 0;
+	epause->tx_pause = 0;
+
+	if (isAutoNegEnabled) {
+		if (pPort->PFlowCtrlMode & SK_FLOW_MODE_LOC_SEND) {
+			epause->tx_pause = 1;
+		}
+		if ((pPort->PFlowCtrlMode & SK_FLOW_MODE_SYMMETRIC) ||
+		    (pPort->PFlowCtrlMode & SK_FLOW_MODE_SYM_OR_REM)) {
+			epause->tx_pause = 1;
+			epause->rx_pause = 1;
+		}
+	}
+}
+#endif
+
+#ifdef ETHTOOL_SPAUSEPARAM
+/*****************************************************************************
+ *
+ *	setPauseParams - configures the pause parameters of an adapter
+ *
+ * Description:
+ *	This function sets the Rx or Tx pause parameters 
+ *
+ * Returns:
+ *	==0:	everything fine, no error
+ *	!=0:	the return value is the error code of the failure 
+ */
+static int setPauseParams(
+SK_AC                     *pAC,    /* pointer to adapter control context */
+int                        port,   /* the port of the selected adapter   */
+struct ethtool_pauseparam *epause) /* pause parameter struct with params */
+{
+	SK_GEPORT *pPort            = &pAC->GIni.GP[port];
+	DEV_NET   *pNet             = (DEV_NET *) pAC->dev[port]->priv;
+	int        PrevSpeedVal     = pPort->PLinkSpeedUsed;
+
+	SK_U32       Instance;
+	char         Buf[4];
+	unsigned int	Len = 1;
+	int		Ret;
+
+        if (port == 0) {
+                Instance = (pAC->RlmtNets == 2) ? 1 : 2;
+        } else {
+                Instance = (pAC->RlmtNets == 2) ? 2 : 3;
+        }
+
+	if (epause->autoneg == AUTONEG_DISABLE) {
+		if (pPort->PLinkModeConf == SK_LMODE_AUTOHALF) {
+			*Buf = (char) SK_LMODE_HALF;
+		}
+		if ((pPort->PLinkModeConf == SK_LMODE_AUTOFULL) ||
+		    (pPort->PLinkModeConf == SK_LMODE_AUTOBOTH)) {
+			*Buf = (char) SK_LMODE_FULL;
+		}
+	} 
+
+	if (epause->autoneg == AUTONEG_ENABLE) {
+		if (pPort->PLinkModeConf == SK_LMODE_HALF) {
+			// pPort->PLinkModeConf = SK_LMODE_AUTOHALF;
+			*Buf = (char) SK_LMODE_AUTOHALF;
+		}
+		if (pPort->PLinkModeConf == SK_LMODE_FULL) {
+			// pPort->PLinkModeConf = SK_LMODE_AUTOBOTH;
+			*Buf = (char) SK_LMODE_AUTOBOTH;
+		}
+	}
+
+        Ret = SkPnmiSetVar(pAC, pAC->IoBase, OID_SKGE_LINK_MODE,
+                                &Buf, &Len, Instance, pNet->NetNr);
+
+        if (Ret != SK_PNMI_ERR_OK) {
+                printk("ethtool: error changing autoneg parameter\n");
+        }
+
+	if(epause->rx_pause && epause->tx_pause) {
+		// pPort->PFlowCtrlMode = SK_FLOW_MODE_SYMMETRIC;
+		*Buf = (char) SK_FLOW_MODE_SYMMETRIC;
+	} else if (epause->rx_pause && !epause->tx_pause) {
+		// pPort->PFlowCtrlMode = SK_FLOW_MODE_SYM_OR_REM;
+		*Buf = (char) SK_FLOW_MODE_SYM_OR_REM;
+	} else if(!epause->rx_pause && epause->tx_pause) {
+		// pPort->PFlowCtrlMode = SK_FLOW_MODE_LOC_SEND;
+		*Buf = (char) SK_FLOW_MODE_LOC_SEND;
+	} else {
+		// pPort->PFlowCtrlMode = SK_FLOW_MODE_NONE;
+		*Buf = (char) SK_FLOW_MODE_NONE;
+	}
+
+        Ret = SkPnmiSetVar(pAC, pAC->IoBase, OID_SKGE_FLOWCTRL_MODE,
+                                &Buf, &Len, Instance, pNet->NetNr);
+
+        if (Ret != SK_PNMI_ERR_OK) {
+                printk("ethtool: error changing rx/tx pause parameters\n");
+        }
+
+	/*
+	** It may be that autoneg has been disabled! Therefore set
+	** the speed to the previously used value...
+	*/
+	if (epause->autoneg == AUTONEG_DISABLE) {
+		if ((PrevSpeedVal == SK_LSPEED_AUTO) ||
+		    (PrevSpeedVal == SK_LSPEED_INDETERMINATED)) {
+			PrevSpeedVal = SK_LSPEED_100MBPS;
+		}
+		*Buf = (char) PrevSpeedVal;
+
+		Ret = SkPnmiSetVar(pAC, pAC->IoBase, OID_SKGE_SPEED_MODE, 
+					&Buf, &Len, Instance, pNet->NetNr);
+
+		if (Ret != SK_PNMI_ERR_OK) {
+			printk("ethtool: setting the speed parameter\n");
+		}
+	}
+        return 0;
+}
+#endif
+
+#ifdef ETHTOOL_GCOALESCE
+/*****************************************************************************
+ *
+ * 	getModerationParams - retrieves the IRQ moderation settings 
+ *
+ * Description:
+ *	All current IRQ moderation settings of a selected adapter are placed 
+ *	in the passed ethtool_coalesce structure and are returned.
+ *
+ * Returns:	N/A
+ *
+ */
+static void getModerationParams(
+SK_AC                   *pAC,      /* pointer to adapter control context */
+int                      port,     /* the port of the selected adapter   */
+struct ethtool_coalesce *ecoalesc) /* IRQ moderation struct for results  */
+{
+	DIM_INFO *Info = &pAC->DynIrqModInfo;
+	SK_BOOL UseTxIrqModeration = SK_FALSE;
+	SK_BOOL UseRxIrqModeration = SK_FALSE;
+
+	if (Info->IntModTypeSelect != C_INT_MOD_NONE) {
+		if (CHIP_ID_YUKON_2(pAC)) {
+			UseRxIrqModeration = SK_TRUE;
+			UseTxIrqModeration = SK_TRUE;
+		} else {
+			if ((Info->MaskIrqModeration == IRQ_MASK_RX_ONLY) ||
+			    (Info->MaskIrqModeration == IRQ_MASK_SP_RX)   ||
+			    (Info->MaskIrqModeration == IRQ_MASK_RX_TX_SP)) {
+				UseRxIrqModeration = SK_TRUE;
+			}
+			if ((Info->MaskIrqModeration == IRQ_MASK_TX_ONLY) ||
+			    (Info->MaskIrqModeration == IRQ_MASK_SP_TX)   ||
+			    (Info->MaskIrqModeration == IRQ_MASK_RX_TX_SP)) {
+				UseTxIrqModeration = SK_TRUE;
+			}
+		}
+
+		if (UseRxIrqModeration) {
+			ecoalesc->rx_coalesce_usecs = 1000000 / Info->MaxModIntsPerSec;
+		}
+		if (UseTxIrqModeration) {
+			ecoalesc->tx_coalesce_usecs = 1000000 / Info->MaxModIntsPerSec;
+		}
+		if (Info->IntModTypeSelect == C_INT_MOD_DYNAMIC) {
+			ecoalesc->rate_sample_interval = Info->DynIrqModSampleInterval; 
+			if (UseRxIrqModeration) {
+				ecoalesc->use_adaptive_rx_coalesce = 1;
+				ecoalesc->rx_coalesce_usecs_low = 
+					1000000 / Info->MaxModIntsPerSecLowerLimit;
+				ecoalesc->rx_coalesce_usecs_high = 
+					1000000 / Info->MaxModIntsPerSecUpperLimit;
+			}
+			if (UseTxIrqModeration) {
+				ecoalesc->use_adaptive_tx_coalesce = 1;
+				ecoalesc->tx_coalesce_usecs_low = 
+					1000000 / Info->MaxModIntsPerSecLowerLimit;
+				ecoalesc->tx_coalesce_usecs_high = 
+					1000000 / Info->MaxModIntsPerSecUpperLimit;
+			}
+		}
+	}
+}
+#endif
+
+#ifdef ETHTOOL_SCOALESCE
+/*****************************************************************************
+ *
+ *	setModerationParams - configures the IRQ moderation of an adapter
+ *
+ * Description:
+ *	Depending on the desired IRQ moderation parameters, either a) static,
+ *	b) dynamic or c) no moderation is configured. 
+ *
+ * Returns:
+ *	==0:	everything fine, no error
+ *	!=0:	the return value is the error code of the failure 
+ */
+static int setModerationParams(
+SK_AC                   *pAC,      /* pointer to adapter control context */
+int                      port,     /* the port of the selected adapter   */
+struct ethtool_coalesce *ecoalesc) /* IRQ moderation struct with params  */
+{
+	DIM_INFO  *Info             = &pAC->DynIrqModInfo;
+	int        PrevModeration   = Info->IntModTypeSelect;
+
+	if ((ecoalesc->rx_coalesce_usecs) || (ecoalesc->tx_coalesce_usecs)) {
+		if (!CHIP_ID_YUKON_2(pAC)) {
+			if ((Info->MaskIrqModeration == IRQ_MASK_SP_RX) ||
+			    (Info->MaskIrqModeration == IRQ_MASK_SP_TX) ||
+			    (Info->MaskIrqModeration == IRQ_MASK_RX_TX_SP)) {
+				Info->MaskIrqModeration = IRQ_MASK_SP_ONLY;
+			} 
+		}
+		Info->IntModTypeSelect = C_INT_MOD_STATIC;
+		if (ecoalesc->rx_coalesce_usecs) {
+			Info->MaxModIntsPerSec = 
+				1000000 / ecoalesc->rx_coalesce_usecs;
+			if (!CHIP_ID_YUKON_2(pAC)) {
+				if (Info->MaskIrqModeration == IRQ_MASK_TX_ONLY) {
+					Info->MaskIrqModeration = IRQ_MASK_TX_RX;
+				} 
+				if (Info->MaskIrqModeration == IRQ_MASK_SP_ONLY) {
+					Info->MaskIrqModeration = IRQ_MASK_SP_RX;
+				} 
+				if (Info->MaskIrqModeration == IRQ_MASK_SP_TX) {
+					Info->MaskIrqModeration = IRQ_MASK_RX_TX_SP;
+				}
+			} else {
+				Info->MaskIrqModeration = Y2_IRQ_MASK;
+			}
+		}
+		if (ecoalesc->tx_coalesce_usecs) {
+			Info->MaxModIntsPerSec = 
+				1000000 / ecoalesc->tx_coalesce_usecs;
+			if (!CHIP_ID_YUKON_2(pAC)) {
+				if (Info->MaskIrqModeration == IRQ_MASK_RX_ONLY) {
+					Info->MaskIrqModeration = IRQ_MASK_TX_RX;
+				} 
+				if (Info->MaskIrqModeration == IRQ_MASK_SP_ONLY) {
+					Info->MaskIrqModeration = IRQ_MASK_SP_TX;
+				} 
+				if (Info->MaskIrqModeration == IRQ_MASK_SP_RX) {
+					Info->MaskIrqModeration = IRQ_MASK_RX_TX_SP;
+				}
+			} else {
+				Info->MaskIrqModeration = Y2_IRQ_MASK;
+			}
+		}
+		if ((ecoalesc->rate_sample_interval)  ||
+		    (ecoalesc->rx_coalesce_usecs_low) ||
+		    (ecoalesc->tx_coalesce_usecs_low) ||
+		    (ecoalesc->rx_coalesce_usecs_high)||
+		    (ecoalesc->tx_coalesce_usecs_high)) {
+			Info->IntModTypeSelect = C_INT_MOD_DYNAMIC;
+			if (ecoalesc->rate_sample_interval) {
+				Info->DynIrqModSampleInterval = 
+					ecoalesc->rate_sample_interval; 
+			}
+			if (ecoalesc->rx_coalesce_usecs_low) {
+				Info->MaxModIntsPerSecLowerLimit = 
+					1000000 / ecoalesc->rx_coalesce_usecs_low;
+			}
+			if (ecoalesc->tx_coalesce_usecs_low) {
+				Info->MaxModIntsPerSecLowerLimit = 
+					1000000 / ecoalesc->tx_coalesce_usecs_low;
+			}
+			if (ecoalesc->rx_coalesce_usecs_high) {
+				Info->MaxModIntsPerSecUpperLimit = 
+					1000000 / ecoalesc->rx_coalesce_usecs_high;
+			}
+			if (ecoalesc->tx_coalesce_usecs_high) {
+				Info->MaxModIntsPerSecUpperLimit = 
+					1000000 / ecoalesc->tx_coalesce_usecs_high;
+			}
+		}
+	} else {
+		Info->IntModTypeSelect = C_INT_MOD_NONE;
+	}
+
+	if ((PrevModeration         == C_INT_MOD_NONE) &&
+	    (Info->IntModTypeSelect != C_INT_MOD_NONE)) {
+		SkDimEnableModerationIfNeeded(pAC);
+	}
+	if ((PrevModeration         != C_INT_MOD_NONE) &&
+	    (Info->IntModTypeSelect == C_INT_MOD_NONE)) {
+		SkDimDisableModeration(pAC, PrevModeration);
+	}
+
+        return 0;
+}
+#endif
+
+#ifdef ETHTOOL_GWOL
+/*****************************************************************************
+ *
+ * 	getWOLsettings - retrieves the WOL settings of the selected adapter
+ *
+ * Description:
+ *	All current WOL settings of a selected adapter are placed in the 
+ *	passed ethtool_wolinfo structure and are returned to the caller.
+ *
+ * Returns:	N/A
+ *
+ */
+static void getWOLsettings(
+SK_AC                  *pAC,  /* pointer to adapter control context  */
+int                     port, /* the port of the selected adapter    */
+struct ethtool_wolinfo *ewol) /* mandatory WOL structure for results */
+{
+	ewol->supported = 
+		WAKE_PHY|WAKE_MAGIC|WAKE_UCAST|WAKE_MCAST|WAKE_BCAST;
+	
+	ewol->wolopts =
+		WAKE_PHY|WAKE_MAGIC|WAKE_UCAST|WAKE_MCAST|WAKE_BCAST;
+
+	return;
+}
+#endif
+
+#ifdef ETHTOOL_SWOL
+/*****************************************************************************
+ *
+ *	setWOLsettings - configures the WOL settings of a selected adapter
+ *
+ * Description:
+ *	The WOL settings of a selected adapter are configured regarding
+ *	the parameters in the passed ethtool_wolinfo structure.
+ *
+ * Returns:
+ *	==0:	everything fine, no error
+ *	!=0:	the return value is the error code of the failure 
+ */
+static int setWOLsettings(
+SK_AC                  *pAC,  /* pointer to adapter control context */
+int                     port, /* the port of the selected adapter   */
+struct ethtool_wolinfo *ewol) /* WOL structure containing settings  */
+{
+	return 0;
+}
+#endif
+
+#ifdef ETHTOOL_GDRVINFO
+/*****************************************************************************
+ *
+ * 	getDriverInfo - returns generic driver and adapter information
+ *
+ * Description:
+ *	Generic driver information is returned via this function, such as
+ *	the name of the driver, its version and and firmware version.
+ *	In addition to this, the location of the selected adapter is 
+ *	returned as a bus info string (e.g. '01:05.0').
+ *	
+ * Returns:	N/A
+ *
+ */
+static void getDriverInfo(
+SK_AC                  *pAC,      /* pointer to adapter control context   */
+int                     port,     /* the port of the selected adapter     */
+struct ethtool_drvinfo *edrvinfo) /* mandatory info structure for results */
+{
+	char versionString[32];
+
+	snprintf(versionString, 32, "%s (%s)", VER_STRING, PATCHLEVEL);
+	strncpy(edrvinfo->driver, DRIVER_FILE_NAME , 32);
+	strncpy(edrvinfo->version, versionString , 32);
+	strncpy(edrvinfo->fw_version, "N/A", 32);
+	strncpy(edrvinfo->bus_info, pAC->PciDev->slot_name, 32);
+#ifdef  ETHTOOL_GSTATS
+	edrvinfo->n_stats = SK98LIN_STATS_LEN;
+#endif
+}
+#endif
+
+#ifdef ETHTOOL_PHYS_ID
+/*****************************************************************************
+ *
+ * 	startLocateNIC - start the locate NIC feature of the elected adapter 
+ *
+ * Description:
+ *	This function is used if the user want to locate a particular NIC.
+ *	All LEDs are regularly switched on and off, so the NIC can easily
+ *	be identified.
+ *
+ * Returns:	
+ *	==0:	everything fine, no error, locateNIC test was started
+ *	!=0:	one locateNIC test runs already
+ *
+ */
+static int startLocateNIC(
+SK_AC                *pAC,        /* pointer to adapter control context        */
+int                   port,       /* the port of the selected adapter          */
+struct ethtool_value *blinkSecs)  /* how long the LEDs should blink in seconds */
+{
+	struct SK_NET_DEVICE *pDev      = pAC->dev[port];
+	DEV_NET              *pNet      = (DEV_NET *) pAC->dev[port]->priv;
+	int                   OtherPort = (port) ? 0 : 1;
+	struct SK_NET_DEVICE *pOtherDev = pAC->dev[OtherPort];
+	DEV_NET              *pOtherNet = (DEV_NET *) pAC->dev[OtherPort]->priv;
+
+	if (isLocateNICrunning) {
+		return -EFAULT;
+	}
+	isLocateNICrunning = SK_TRUE;
+	currentPortIndex = port;
+	isDualNetCard = (pDev != pOtherDev) ? SK_TRUE : SK_FALSE;
+
+	if (!pNet->Up) {
+		(*pDev->open)(pDev);
+		boardWasDown[0] = SK_TRUE;
+	} else {
+		boardWasDown[0] = SK_FALSE;
+	}
+
+	if (isDualNetCard) {
+		if (!pOtherNet->Up) {
+			(*pOtherDev->open)(pOtherDev);
+			boardWasDown[1] = SK_TRUE;
+		} else {
+			boardWasDown[1] = SK_FALSE;
+		}
+	}
+
+	if ((blinkSecs->data < 1) || (blinkSecs->data > 30)) {
+		blinkSecs->data = 3; /* three seconds default */
+	}
+	nbrBlinkQuarterSeconds = 4*blinkSecs->data;
+
+	init_timer(&locateNICtimer);
+	locateNICtimer.function = toggleLeds;
+	locateNICtimer.data     = (unsigned long) pAC;
+	locateNICtimer.expires  = jiffies + 1*HZ; /* initially 1sec */
+	add_timer(&locateNICtimer);
+
+	return 0;
+}
+
+/*****************************************************************************
+ *
+ * 	toggleLeds - Changes the LED state of an adapter
+ *
+ * Description:
+ *	This function changes the current state of all LEDs of an adapter so
+ *	that it can be located by a user. If the requested time interval for
+ *	this test has elapsed, this function cleans up everything that was 
+ *	temporarily setup during the locate NIC test. This involves of course
+ *	also closing or opening any adapter so that the initial board state 
+ *	is recovered.
+ *
+ * Returns:	N/A
+ *
+ */
+static void toggleLeds(
+unsigned long ptr)  /* holds the pointer to adapter control context */
+{
+	SK_AC                *pAC       = (SK_AC *) ptr;
+	int                   port      = currentPortIndex;
+	SK_IOC                IoC       = pAC->IoBase;
+	struct SK_NET_DEVICE *pDev      = pAC->dev[port];
+	int                   OtherPort = (port) ? 0 : 1;
+	struct SK_NET_DEVICE *pOtherDev = pAC->dev[OtherPort];
+
+	SK_U16  YukLedOn = (PHY_M_LED_MO_DUP(MO_LED_ON)  |
+			    PHY_M_LED_MO_10(MO_LED_ON)   |
+			    PHY_M_LED_MO_100(MO_LED_ON)  |
+			    PHY_M_LED_MO_1000(MO_LED_ON) | 
+			    PHY_M_LED_MO_RX(MO_LED_ON));
+	SK_U16  YukLedOff = (PHY_M_LED_MO_DUP(MO_LED_OFF)  |
+			     PHY_M_LED_MO_10(MO_LED_OFF)   |
+			     PHY_M_LED_MO_100(MO_LED_OFF)  |
+			     PHY_M_LED_MO_1000(MO_LED_OFF) | 
+			     PHY_M_LED_MO_RX(MO_LED_OFF));
+
+	nbrBlinkQuarterSeconds--;
+	if (nbrBlinkQuarterSeconds <= 0) {
+		(*pDev->stop)(pDev);
+		if (isDualNetCard) {
+			(*pOtherDev->stop)(pOtherDev);
+		}
+
+		if (!boardWasDown[0]) {
+			(*pDev->open)(pDev);
+		}
+		if (isDualNetCard) {
+			(*pOtherDev->open)(pOtherDev);
+		}
+		isDualNetCard      = SK_FALSE;
+		isLocateNICrunning = SK_FALSE;
+		return;
+	}
+
+	doSwitchLEDsOn = (doSwitchLEDsOn) ? SK_FALSE : SK_TRUE;
+	if (doSwitchLEDsOn) {
+		if (pAC->GIni.GIGenesis) {
+			SK_OUT8(IoC,MR_ADDR(port,LNK_LED_REG),(SK_U8)SK_LNK_ON);
+			SkGeYellowLED(pAC,IoC,LED_ON >> 1);
+			SkGeXmitLED(pAC,IoC,MR_ADDR(port,RX_LED_INI),SK_LED_TST);
+			if (pAC->GIni.GP[port].PhyType == SK_PHY_BCOM) {
+				SkXmPhyWrite(pAC,IoC,port,PHY_BCOM_P_EXT_CTRL,PHY_B_PEC_LED_ON);
+			} else if (pAC->GIni.GP[port].PhyType == SK_PHY_LONE) {
+				SkXmPhyWrite(pAC,IoC,port,PHY_LONE_LED_CFG,0x0800);
+			} else {
+				SkGeXmitLED(pAC,IoC,MR_ADDR(port,TX_LED_INI),SK_LED_TST);
+			}
+		} else {
+			SkGmPhyWrite(pAC,IoC,port,PHY_MARV_LED_CTRL,0);
+			SkGmPhyWrite(pAC,IoC,port,PHY_MARV_LED_OVER,YukLedOn);
+		}
+	} else {
+		if (pAC->GIni.GIGenesis) {
+			SK_OUT8(IoC,MR_ADDR(port,LNK_LED_REG),(SK_U8)SK_LNK_OFF);
+			SkGeYellowLED(pAC,IoC,LED_OFF >> 1);
+			SkGeXmitLED(pAC,IoC,MR_ADDR(port,RX_LED_INI),SK_LED_DIS);
+			if (pAC->GIni.GP[port].PhyType == SK_PHY_BCOM) {
+				SkXmPhyWrite(pAC,IoC,port,PHY_BCOM_P_EXT_CTRL,PHY_B_PEC_LED_OFF);
+			} else if (pAC->GIni.GP[port].PhyType == SK_PHY_LONE) {
+				SkXmPhyWrite(pAC,IoC,port,PHY_LONE_LED_CFG,PHY_L_LC_LEDT);
+			} else {
+				SkGeXmitLED(pAC,IoC,MR_ADDR(port,TX_LED_INI),SK_LED_DIS);
+			}
+		} else {
+			SkGmPhyWrite(pAC,IoC,port,PHY_MARV_LED_CTRL,0);
+			SkGmPhyWrite(pAC,IoC,port,PHY_MARV_LED_OVER,YukLedOff);
+		}
+	}
+
+	locateNICtimer.function = toggleLeds;
+	locateNICtimer.data     = (unsigned long) pAC;
+	locateNICtimer.expires  = jiffies + (1*HZ)/4; /* 250ms */
+	add_timer(&locateNICtimer);
+} 
+#endif
+
+/*****************************************************************************
+ *
+ * 	getPortNumber - evaluates the port number of an interface
+ *
+ * Description:
+ *	It may be that the current interface refers to one which is located
+ *	on a dual net adapter. Hence, this function will return the correct
+ *	port for further use.
+ *
+ * Returns:
+ *	the port number that corresponds to the selected adapter
+ *
+ */
+static int getPortNumber(
+struct net_device *netdev,  /* the pointer to netdev structure       */
+struct ifreq      *ifr)     /* what interface the request refers to? */
+{
+	DEV_NET *pNet = (DEV_NET*) netdev->priv;
+	SK_AC   *pAC  = pNet->pAC;
+
+	if (pAC->dev[1] != pAC->dev[0]) {
+		if (!strcmp(pAC->dev[1]->name, ifr->ifr_name)) {
+			return 1; /* port index 1 */
+		}
+	}
+	return 0;
+}
+
+/*******************************************************************************
+ *
+ * End of file
+ *
+ ******************************************************************************/
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/skge.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/skge.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/skge.c	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/skge.c	2004-09-09 13:21:27.000000000 +0200
@@ -1,25 +1,23 @@
 /******************************************************************************
  *
- * Name:	skge.c
- * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.47 $
- * Date:       	$Date: 2004/02/18 13:30:21 $
- * Purpose:	The main driver source module
+ * Name:        skge.c
+ * Project:     GEnesis, PCI Gigabit Ethernet Adapter
+ * Version:     $Revision: 1.60 $
+ * Date:        $Date: 2004/08/25 13:24:55 $
+ * Purpose:     The main driver source module
  *
  ******************************************************************************/
 
 /******************************************************************************
  *
  *	(C)Copyright 1998-2002 SysKonnect GmbH.
- *	(C)Copyright 2002-2003 Marvell.
+ *	(C)Copyright 2002-2004 Marvell.
  *
  *	Driver for Marvell Yukon chipset and SysKonnect Gigabit Ethernet 
  *      Server Adapters.
  *
- *	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)
+ *	Author: Mirko Lindner (mlindner@syskonnect.de)
+ *	        Ralph Roesler (rroesler@syskonnect.de)
  *
  *	Address all question to: linux@syskonnect.de
  *
@@ -38,71 +36,33 @@
 
 /******************************************************************************
  *
- * Possible compiler options (#define xxx / -Dxxx):
- *
- *	debugging can be enable by changing SK_DEBUG_CHKMOD and
- *	SK_DEBUG_CHKCAT in makefile (described there).
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
  * Description:
  *
- *	This is the main module of the Linux GE driver.
- *	
- *	All source files except skge.c, skdrv1st.h, skdrv2nd.h and sktypes.h
- *	are part of SysKonnect's COMMON MODULES for the SK-98xx adapters.
- *	Those are used for drivers on multiple OS', so some thing may seem
- *	unnecessary complicated on Linux. Please do not try to 'clean up'
- *	them without VERY good reasons, because this will make it more
- *	difficult to keep the Linux driver in synchronisation with the
- *	other versions.
- *
- * Include file hierarchy:
- *
- *	<linux/module.h>
- *
- *	"h/skdrv1st.h"
- *		<linux/types.h>
- *		<linux/kernel.h>
- *		<linux/string.h>
- *		<linux/errno.h>
- *		<linux/ioport.h>
- *		<linux/slab.h>
- *		<linux/interrupt.h>
- *		<linux/pci.h>
- *		<asm/byteorder.h>
- *		<asm/bitops.h>
- *		<asm/io.h>
- *		<linux/netdevice.h>
- *		<linux/etherdevice.h>
- *		<linux/skbuff.h>
- *	    those three depending on kernel version used:
- *		<linux/bios32.h>
- *		<linux/init.h>
- *		<asm/uaccess.h>
- *		<net/checksum.h>
- *
- *		"h/skerror.h"
- *		"h/skdebug.h"
- *		"h/sktypes.h"
- *		"h/lm80.h"
- *		"h/xmac_ii.h"
- *
- *      "h/skdrv2nd.h"
- *		"h/skqueue.h"
- *		"h/skgehwt.h"
- *		"h/sktimer.h"
- *		"h/ski2c.h"
- *		"h/skgepnmi.h"
- *		"h/skvpd.h"
- *		"h/skgehw.h"
- *		"h/skgeinit.h"
- *		"h/skaddr.h"
- *		"h/skgesirq.h"
- *		"h/skcsum.h"
- *		"h/skrlmt.h"
+ *	All source files in this sk98lin directory except of the sk98lin 
+ *	Linux specific files
+ *
+ *		- skdim.c
+ *		- skethtool.c
+ *		- skge.c
+ *		- skproc.c
+ *		- sky2.c
+ *		- Makefile
+ *		- h/skdrv1st.h
+ *		- h/skdrv2nd.h
+ *		- h/sktypes.h
+ *		- h/skversion.h
+ *
+ *	are part of SysKonnect's common modules for the SK-9xxx adapters.
+ *
+ *	Those common module files which are not Linux specific are used to 
+ *	build drivers on different OS' (e.g. Windows, MAC OS) so that those
+ *	drivers are based on the same set of files
+ *
+ *	At a first glance, this seems to complicate things unnescessarily on 
+ *	Linux, but please do not try to 'clean up' them without VERY good 
+ *	reasons, because this will make it more difficult to keep the sk98lin
+ *	driver for Linux in synchronisation with the other drivers running on
+ *	other operating systems.
  *
  ******************************************************************************/
 
@@ -111,6 +71,7 @@
 #include	<linux/config.h>
 #include	<linux/module.h>
 #include	<linux/init.h>
+#include	<linux/ethtool.h>
 
 #ifdef CONFIG_PROC_FS
 #include 	<linux/proc_fs.h>
@@ -129,27 +90,22 @@
 /* #define BREAKPOINT() asm(" int $3"); */
 
 /* use the transmit hw checksum driver functionality */
-// #define USE_SK_TX_CHECKSUM
+#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 TCP segmentation offload if possible */
+#define USE_SK_TSO_FEATURE	
 
-/* use of a transmit complete interrupt */
-#define USE_TX_COMPLETE
-
-/*
- * threshold for copying small receive frames
- * set to 0 to avoid copying, set to 9001 to copy all frames
- */
-#define SK_COPY_THRESHOLD	50
+/* threshold for copying small RX frames; 0 avoids copying, 9001 copies all */
+#define SK_COPY_THRESHOLD 50
 
 /* number of adapters that can be configured via command line params */
-#define SK_MAX_CARD_PARAM	16
-
+#define SK_MAX_CARD_PARAM 16
 
+/* use of a transmit complete interrupt */
+/* #define USE_TX_COMPLETE */
 
 /*
  * use those defines for a compile-in version of the driver instead
@@ -157,8 +113,6 @@
  */
 // #define LINK_SPEED_A	{"Auto", }
 // #define LINK_SPEED_B	{"Auto", }
-// #define AUTO_NEG_A	{"Sense", }
-// #define AUTO_NEG_B	{"Sense", }
 // #define DUP_CAP_A	{"Both", }
 // #define DUP_CAP_B	{"Both", }
 // #define FLOW_CTRL_A	{"SymOrRem", }
@@ -175,21 +129,24 @@
 # define RLMT_MODE	{"CheckLinkState", }
 #endif
 
-#define DEV_KFREE_SKB(skb) dev_kfree_skb(skb)
-#define DEV_KFREE_SKB_IRQ(skb) dev_kfree_skb_irq(skb)
-#define DEV_KFREE_SKB_ANY(skb) dev_kfree_skb_any(skb)
-
+#ifdef CONFIG_SK98LIN_AUTONEG_SENSE
+# define AUTO_NEG_A	{"Sense", }
+# define AUTO_NEG_B	{"Sense", }
+#elif defined (CONFIG_SK98LIN_AUTONEG_ON)
+# define AUTO_NEG_A	{"On", }
+# define AUTO_NEG_B	{"On", }
+#elif defined (CONFIG_SK98LIN_AUTONEG_OFF)
+# define AUTO_NEG_A	{"Off", }
+# define AUTO_NEG_B	{"Off", }
+#endif
 
 /* 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
+#define CLEAR_AND_START_RX(Port) SK_OUT8(pAC->IoBase, RxQueueAddr[(Port)]+Q_CSR, CSR_START | CSR_IRQ_CL_F)
+#define CLEAR_TX_IRQ(Port,Prio) SK_OUT8(pAC->IoBase, TxQueueAddr[(Port)][(Prio)]+Q_CSR, CSR_IRQ_CL_F)
 
 
 /*******************************************************************************
@@ -198,12 +155,22 @@
  *
  ******************************************************************************/
 
+static int 	__devinit sk98lin_init_device(struct pci_dev *pdev, const struct pci_device_id *ent);
+static void 	sk98lin_remove_device(struct pci_dev *pdev);
+#ifdef SK_CONFIG_PM
+static int	sk98lin_suspend(struct pci_dev *pdev, uint32_t state);
+static int	sk98lin_resume(struct pci_dev *pdev);
+static void	SkHWSetDState(SK_AC *pAC, SK_IOC IoC, SK_DEVICE_POWER_STATE State);
+static void	SkHWSwitchPower(SK_AC *pAC, SK_IOC IoC, SK_DEVICE_POWER_STATE State);
+static int	SkSetPortSpeed(SK_AC *pAC, SK_IOC IoC, SK_U8 Speed);
+static void	SkEnableWOMagicPacket(SK_AC *pAC, SK_IOC IoC, SK_MAC_ADDR MacAddr);
+#endif
 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	SetupRing(SK_AC*, void*, uintptr_t, RXD**, RXD**, RXD**, int*, 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);
@@ -219,24 +186,22 @@ static int	XmitFrame(SK_AC*, TX_PORT*, s
 static void	FreeTxDescriptors(SK_AC*pAC, TX_PORT*);
 static void	FillRxRing(SK_AC*, RX_PORT*);
 static SK_BOOL	FillRxDescriptor(SK_AC*, RX_PORT*);
+#ifdef CONFIG_SK98LIN_NAPI
+static int	SkGePoll(struct net_device *dev, int *budget);
+static void	ReceiveIrq(SK_AC*, RX_PORT*, SK_BOOL, int*, int);
+#else
 static void	ReceiveIrq(SK_AC*, RX_PORT*, SK_BOOL);
-static void	ClearAndStartRx(SK_AC*, int);
-static void	ClearTxIrq(SK_AC*, int, int);
+#endif
 static void	ClearRxRing(SK_AC*, RX_PORT*);
 static void	ClearTxRing(SK_AC*, TX_PORT*);
 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 int	SkGeInitPCI(SK_AC *pAC);
-static void	StartDrvCleanupTimer(SK_AC *pAC);
-static void	StopDrvCleanupTimer(SK_AC *pAC);
-static int	XmitFrameSG(SK_AC*, TX_PORT*, struct sk_buff*);
-
-#ifdef SK_DIAG_SUPPORT
 static SK_U32   ParseDeviceNbrFromSlotName(const char *SlotName);
 static int      SkDrvInitAdapter(SK_AC *pAC, int devNbr);
 static int      SkDrvDeInitAdapter(SK_AC *pAC, int devNbr);
-#endif
+static int	XmitFrameSG(SK_AC*, TX_PORT*, struct sk_buff*);
 
 /*******************************************************************************
  *
@@ -244,9 +209,30 @@ static int      SkDrvDeInitAdapter(SK_AC
  *
  ******************************************************************************/
 
+extern SK_BOOL SkY2AllocateResources(SK_AC *pAC);
+extern void SkY2FreeResources(SK_AC *pAC);
+extern void SkY2AllocateRxBuffers(SK_AC *pAC,SK_IOC IoC,int Port);
+extern void SkY2FreeRxBuffers(SK_AC *pAC,SK_IOC IoC,int Port);
+extern void SkY2FreeTxBuffers(SK_AC *pAC,SK_IOC IoC,int Port);
+extern SkIsrRetVar SkY2Isr(int irq,void *dev_id,struct pt_regs *ptregs);
+extern int SkY2Xmit(struct sk_buff *skb,struct SK_NET_DEVICE *dev);
+extern void SkY2PortStop(SK_AC *pAC,SK_IOC IoC,int Port,int Dir,int RstMode);
+extern void SkY2PortStart(SK_AC *pAC,SK_IOC IoC,int Port);
+extern int SkY2RlmtSend(SK_AC *pAC,int PortNr,struct sk_buff *pMessage);
+extern void SkY2RestartStatusUnit(SK_AC *pAC);
+#ifdef CONFIG_SK98LIN_NAPI
+extern int SkY2Poll(struct net_device *dev, int *budget);
+#endif
+
+extern void SkDimEnableModerationIfNeeded(SK_AC *pAC);	
+extern void SkDimStartModerationTimer(SK_AC *pAC);
+extern void SkDimModerate(SK_AC *pAC);
+
+extern int SkEthIoctl(struct net_device *netdev, struct ifreq *ifr);
+
 #ifdef CONFIG_PROC_FS
 static const char 	SK_Root_Dir_entry[] = "sk98lin";
-static struct		proc_dir_entry *pSkRootDir = NULL;
+static struct		proc_dir_entry *pSkRootDir;
 extern int 	sk_proc_read(	char   *buffer,
 				char	**buffer_location,
 				off_t	offset,
@@ -255,11 +241,6 @@ extern int 	sk_proc_read(	char   *buffer
 				void	*data);
 #endif
 
-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*);
 static void	DumpData(char*, int);
@@ -269,13 +250,12 @@ static void	DumpLong(char*, int);
 /* global variables *********************************************************/
 static const char *BootString = BOOT_STRING;
 struct SK_NET_DEVICE *SkGeRootDev = NULL;
-static int probed __initdata = 0;
 static SK_BOOL DoPrintInterfaceChange = SK_TRUE;
 
 /* local variables **********************************************************/
 static uintptr_t TxQueueAddr[SK_MAX_MACS][2] = {{0x680, 0x600},{0x780, 0x700}};
 static uintptr_t RxQueueAddr[SK_MAX_MACS] = {0x400, 0x480};
-
+static int sk98lin_max_boards_found = 0;
 
 #ifdef CONFIG_PROC_FS
 static struct proc_dir_entry	*pSkRootDir;
@@ -283,277 +263,350 @@ static struct proc_dir_entry	*pSkRootDir
 
 
 
+static struct pci_device_id sk98lin_pci_tbl[] __devinitdata = {
+/*	{ pci_vendor_id, pci_device_id, * SAMPLE ENTRY! *
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, */
+	{ 0x10b7, 0x1700, /* 3Com (10b7), Gigabit Ethernet Adapter */
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+	{ 0x1148, 0x4300, /* SysKonnect (1148), SK-98xx Gigabit Ethernet Server Adapter */
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+	{ 0x1148, 0x4320, /* SysKonnect (1148), SK-98xx V2.0 Gigabit Ethernet Adapter */
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+	{ 0x1148, 0x9E00, /* SysKonnect (1148), SK-9Exx 10/100/1000Base-T Adapter */
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+	{ 0x1186, 0x4c00, /* D-Link (1186), Gigabit Ethernet Adapter */
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+	{ 0x11ab, 0x4320, /* Marvell (11ab), Gigabit Ethernet Controller */
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+	{ 0x11ab, 0x4350, /* Marvell (11ab), Fast Ethernet Controller */
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+	{ 0x11ab, 0x4351, /* Marvell (11ab), Fast Ethernet Controller */
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+	{ 0x11ab, 0x4360, /* Marvell (11ab), Gigabit Ethernet Controller */
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+	{ 0x11ab, 0x4361, /* Marvell (11ab), Gigabit Ethernet Controller */
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+	{ 0x11ab, 0x4362, /* Marvell (11ab), Gigabit Ethernet Controller */
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+	{ 0x11ab, 0x5005, /* Marvell (11ab), Belkin */
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+	{ 0x1371, 0x434e, /* CNet (1371), GigaCard Network Adapter */
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+	{ 0x1737, 0x1032, /* Linksys (1737), Gigabit Network Adapter */
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+	{ 0x1737, 0x1064, /* Linksys (1737), Gigabit Network Adapter */
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+	{ 0, }
+};
+
+MODULE_DEVICE_TABLE(pci, sk98lin_pci_tbl);
+
+static struct pci_driver sk98lin_driver = {
+	.name		= DRIVER_FILE_NAME,
+	.id_table	= sk98lin_pci_tbl,
+	.probe		= sk98lin_init_device,
+	.remove		= __devexit_p(sk98lin_remove_device),
+#ifdef SK_CONFIG_PM
+	.suspend	= sk98lin_suspend,
+	.resume		= sk98lin_resume
+#endif
+};
+
+
 /*****************************************************************************
  *
- * 	skge_probe - find all SK-98xx adapters
+ * 	sk98lin_init_device - initialize the adapter
  *
  * Description:
- *	This function scans the PCI bus for SK-98xx adapters. Resources for
- *	each adapter are allocated and the adapter is brought into Init 1
+ *	This function initializes the adapter. Resources for
+ *	the adapter are allocated and the adapter is brought into Init 1
  *	state.
  *
  * Returns:
  *	0, if everything is ok
  *	!=0, on error
  */
-static int __init skge_probe (void)
+static int __devinit sk98lin_init_device(struct pci_dev *pdev,
+				  const struct pci_device_id *ent)
+
 {
-	int			boards_found = 0;
-	int			vendor_flag = SK_FALSE;
+	static SK_BOOL 		sk98lin_boot_string = SK_FALSE;
+	static SK_BOOL 		sk98lin_proc_entry = SK_FALSE;
+	static int		sk98lin_boards_found = 0;
 	SK_AC			*pAC;
 	DEV_NET			*pNet = NULL;
-	struct pci_dev	*pdev = NULL;
 	struct SK_NET_DEVICE *dev = NULL;
-	SK_BOOL DeviceFound = SK_FALSE;
-	SK_BOOL BootStringCount = SK_FALSE;
 	int			retval;
 #ifdef CONFIG_PROC_FS
 	int			proc_root_initialized = 0;
 	struct proc_dir_entry	*pProcFile;
 #endif
 
-	if (probed)
-		return -ENODEV;
-	probed++;
-
-	if (!pci_present()) {		/* is PCI support present? */
-		return -ENODEV;
+	retval = pci_enable_device(pdev);
+	if (retval) {
+		printk(KERN_ERR "Cannot enable PCI device, "
+			"aborting.\n");
+		return retval;
 	}
 
-	while((pdev = pci_find_class(PCI_CLASS_NETWORK_ETHERNET << 8, pdev))) {
+	dev = NULL;
+	pNet = NULL;
 
-		dev = NULL;
-		pNet = NULL;
 
-		/* Don't handle Yukon2 cards at the moment */
-		/* 12-feb-2004 ---- mlindner@syskonnect.de */
-		if (pdev->vendor == 0x11ab) {
-			if ( (pdev->device == 0x4360) || (pdev->device == 0x4361) )
-				continue;
-		}
+	/* INSERT * We have to find the power-management capabilities */
+	/* Find power-management capability. */
 
-		SK_PCI_ISCOMPLIANT(vendor_flag, pdev);
-		if (!vendor_flag)
-			continue;
 
-		/* Configure DMA attributes. */
-		if (pci_set_dma_mask(pdev, (u64) 0xffffffffffffffffULL) &&
-			pci_set_dma_mask(pdev, (u64) 0xffffffff))
-			continue;
 
+	/* Configure DMA attributes. */
+	retval = pci_set_dma_mask(pdev, (u64) 0xffffffffffffffffULL);
+	if (!retval) {
+		retval = pci_set_dma_mask(pdev, (u64) 0xffffffff);
+		if (retval)
+			return retval;
+	} else {
+		return retval;
+	}
 
-		if ((dev = init_etherdev(dev, sizeof(DEV_NET))) == NULL) {
-			printk(KERN_ERR "Unable to allocate etherdev "
-			       "structure!\n");
-			break;
-		}
 
-		pNet = dev->priv;
-		pNet->pAC = kmalloc(sizeof(SK_AC), GFP_KERNEL);
-		if (pNet->pAC == NULL){
-			unregister_netdev(dev);
-			dev->get_stats = NULL;
-			kfree(dev->priv);
-			printk(KERN_ERR "Unable to allocate adapter "
-			       "structure!\n");
-			break;
-		}
+	if ((dev = init_etherdev(dev, sizeof(DEV_NET))) == NULL) {
+		printk(KERN_ERR "Unable to allocate etherdev "
+			"structure!\n");
+		return -ENODEV;
+	}
 
-		/* Print message */
-		if (!BootStringCount) {
-			/* set display flag to TRUE so that */
-			/* we only display this string ONCE */
-			BootStringCount = SK_TRUE;
-			printk("%s\n", BootString);
-		}
+	pNet = dev->priv;
+	pNet->pAC = kmalloc(sizeof(SK_AC), GFP_KERNEL);
+	if (pNet->pAC == NULL){
+		unregister_netdev(dev);
+		dev->get_stats = NULL;
+		kfree(dev->priv);
+		printk(KERN_ERR "Unable to allocate adapter "
+			"structure!\n");
+		return -ENODEV;
+	}
 
-		memset(pNet->pAC, 0, sizeof(SK_AC));
-		pAC = pNet->pAC;
-		pAC->PciDev = pdev;
-		pAC->PciDevId = pdev->device;
-		pAC->dev[0] = dev;
-		pAC->dev[1] = dev;
-		sprintf(pAC->Name, "SysKonnect SK-98xx");
-		pAC->CheckQueue = SK_FALSE;
 
-		pNet->Mtu = 1500;
-		pNet->Up = 0;
-		dev->irq = pdev->irq;
-		retval = SkGeInitPCI(pAC);
-		if (retval) {
-			printk("SKGE: PCI setup failed: %i\n", retval);
-			unregister_netdev(dev);
-			dev->get_stats = NULL;
-			kfree(dev);
-			continue;
-		}
+	/* Print message */
+	if (!sk98lin_boot_string) {
+		/* set display flag to TRUE so that */
+		/* we only display this string ONCE */
+		sk98lin_boot_string = SK_TRUE;
+		printk("%s\n", BootString);
+	}
+
+	memset(pNet->pAC, 0, sizeof(SK_AC));
+	pAC = pNet->pAC;
+	pAC->PciDev = pdev;
+	pAC->PciDevId = pdev->device;
+	pAC->dev[0] = dev;
+	pAC->dev[1] = dev;
+	sprintf(pAC->Name, "SysKonnect SK-98xx");
+	pAC->CheckQueue = SK_FALSE;
+
+	pNet->Mtu = 1500;
+	pNet->Up = 0;
+	dev->irq = pdev->irq;
+	retval = SkGeInitPCI(pAC);
+	if (retval) {
+		printk("SKGE: PCI setup failed: %i\n", retval);
+		unregister_netdev(dev);
+		dev->get_stats = NULL;
+		kfree(dev);
+		return -ENODEV;
+	}
+
+
+	dev->open =		&SkGeOpen;
+	dev->stop =		&SkGeClose;
+	dev->get_stats =	&SkGeStats;
+	dev->set_multicast_list = &SkGeSetRxMode;
+	dev->set_mac_address =	&SkGeSetMacAddr;
+	dev->do_ioctl =		&SkGeIoctl;
+	dev->change_mtu =	&SkGeChangeMtu;
+	dev->flags &= 		~IFF_RUNNING;
+
+	pAC->Index = sk98lin_boards_found;
+
+	if (SkGeBoardInit(dev, pAC)) {
+		unregister_netdev(dev);
+		kfree(dev);
+		return -ENODEV;
+	} else {
+		ProductStr(pAC);
+	}
 
-		dev->open =		&SkGeOpen;
-		dev->stop =		&SkGeClose;
+	/* shifter to later moment in time... */
+	if (CHIP_ID_YUKON_2(pAC)) {
+		dev->hard_start_xmit =	&SkY2Xmit;
+	} else {
 		dev->hard_start_xmit =	&SkGeXmit;
-		dev->get_stats =	&SkGeStats;
-		dev->set_multicast_list = &SkGeSetRxMode;
-		dev->set_mac_address =	&SkGeSetMacAddr;
-		dev->do_ioctl =		&SkGeIoctl;
-		dev->change_mtu =	&SkGeChangeMtu;
-		dev->flags &= 		~IFF_RUNNING;
-
-		pAC->Index = boards_found;
-
-		if (SkGeBoardInit(dev, pAC)) {
-			unregister_netdev(dev);
-			kfree(dev);
-			continue;
-		}
+	}
 
-#ifdef SK_ZEROCOPY
+#ifdef NETIF_F_TSO
+#ifdef USE_SK_TSO_FEATURE	
+	if (CHIP_ID_YUKON_2(pAC)) {
+		dev->features |= NETIF_F_TSO;
+	}
+#endif
+#endif
+#ifdef CONFIG_SK98LIN_ZEROCOPY
+	if (pAC->GIni.GIChipId != CHIP_ID_GENESIS)
+		dev->features |= NETIF_F_SG;
+#endif
 #ifdef USE_SK_TX_CHECKSUM
-
-		if (pAC->ChipsetType) {
-			/* Use only if yukon hardware */
-			/* SK and ZEROCOPY - fly baby... */
-			dev->features |= NETIF_F_SG | NETIF_F_IP_CSUM;
-		}
+	if (pAC->GIni.GIChipId != CHIP_ID_GENESIS)
+		dev->features |= NETIF_F_IP_CSUM;
 #endif
+#ifdef USE_SK_RX_CHECKSUM
+	pAC->RxPort[0].UseRxCsum = SK_TRUE;
 #endif
 
+	/* Save the hardware revision */
+	pAC->HWRevision = (((pAC->GIni.GIPciHwRev >> 4) & 0x0F)*10) +
+		(pAC->GIni.GIPciHwRev & 0x0F);
 
-		/* Print adapter specific string from vpd */
-		ProductStr(pAC);
-		printk("%s: %s\n", dev->name, pAC->DeviceStr);
+	/* Set driver globals */
+	pAC->Pnmi.pDriverFileName    = DRIVER_FILE_NAME;
+	pAC->Pnmi.pDriverReleaseDate = DRIVER_REL_DATE;
 
-		/* Print configuration settings */
-		printk("      PrefPort:%c  RlmtMode:%s\n",
-			'A' + pAC->Rlmt.Net[0].Port[pAC->Rlmt.Net[0].PrefPort]->PortNumber,
-			(pAC->RlmtMode==0)  ? "Check Link State" :
-			((pAC->RlmtMode==1) ? "Check Link State" :
-			((pAC->RlmtMode==3) ? "Check Local Port" :
-			((pAC->RlmtMode==7) ? "Check Segmentation" :
-			((pAC->RlmtMode==17) ? "Dual Check Link State" :"Error")))));
+	SK_MEMSET(&(pAC->PnmiBackup), 0, sizeof(SK_PNMI_STRUCT_DATA));
+	SK_MEMCPY(&(pAC->PnmiBackup), &(pAC->PnmiStruct), 
+			sizeof(SK_PNMI_STRUCT_DATA));
 
-		SkGeYellowLED(pAC, pAC->IoBase, 1);
 
+	/* Save initial device name */
+	strcpy(pNet->InitialDevName, dev->name);
 
-		memcpy((caddr_t) &dev->dev_addr,
-			(caddr_t) &pAC->Addr.Net[0].CurrentMacAddress, 6);
+	/* Print adapter specific string from vpd and config settings */
+	printk("%s: %s\n", pNet->InitialDevName, pAC->DeviceStr);
+	printk("      PrefPort:%c  RlmtMode:%s\n",
+		'A' + pAC->Rlmt.Net[0].Port[pAC->Rlmt.Net[0].PrefPort]->PortNumber,
+		(pAC->RlmtMode==0)  ? "Check Link State" :
+		((pAC->RlmtMode==1) ? "Check Link State" :
+		((pAC->RlmtMode==3) ? "Check Local Port" :
+		((pAC->RlmtMode==7) ? "Check Segmentation" :
+		((pAC->RlmtMode==17) ? "Dual Check Link State" :"Error")))));
 
-		/* First adapter... Create proc and print message */
+	SkGeYellowLED(pAC, pAC->IoBase, 1);
+
+	memcpy((caddr_t) &dev->dev_addr,
+		(caddr_t) &pAC->Addr.Net[0].CurrentMacAddress, 6);
+
+	/* First adapter... Create proc and print message */
 #ifdef CONFIG_PROC_FS
-		if (!DeviceFound) {
-			DeviceFound = SK_TRUE;
-			SK_MEMCPY(&SK_Root_Dir_entry, BootString,
-				sizeof(SK_Root_Dir_entry) - 1);
-
-			/*Create proc (directory)*/
-			if(!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;
-			}
+	if (!sk98lin_proc_entry) {
+		sk98lin_proc_entry = SK_TRUE;
+		SK_MEMCPY(&SK_Root_Dir_entry, BootString,
+			sizeof(SK_Root_Dir_entry) - 1);
+
+		/*Create proc (directory)*/
+		if(!proc_root_initialized) {
+			pSkRootDir = create_proc_entry(SK_Root_Dir_entry,
+			S_IFDIR | S_IRUGO | S_IXUGO, proc_net);
+			pSkRootDir->owner = THIS_MODULE;
+			proc_root_initialized = 1;
 		}
+	}
 
-		/* Create proc file */
-		pProcFile = create_proc_entry(dev->name,
-			S_IFREG | S_IXUSR | S_IWGRP | S_IROTH,
-			pSkRootDir);
+	/* Create proc file */
+	pProcFile = create_proc_entry(dev->name,
+		S_IFREG | S_IRUSR | S_IRGRP | S_IROTH,
+		pSkRootDir);
 
-		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;
+	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;
 #endif
 
-		pNet->PortNr = 0;
-		pNet->NetNr  = 0;
+	pNet->PortNr = 0;
+	pNet->NetNr  = 0;
 
-		boards_found++;
+	sk98lin_boards_found++;
+	pci_set_drvdata(pdev, dev);
 
-		/* More then one port found */
-		if ((pAC->GIni.GIMacsFound == 2 ) && (pAC->RlmtNets == 2)) {
-			if ((dev = init_etherdev(NULL, sizeof(DEV_NET))) == 0) {
-				printk(KERN_ERR "Unable to allocate etherdev "
-					"structure!\n");
-				break;
-			}
+	/* More then one port found */
+	if ((pAC->GIni.GIMacsFound == 2 ) && (pAC->RlmtNets == 2)) {
+		if ((dev = init_etherdev(NULL, sizeof(DEV_NET))) == 0) {
+			printk(KERN_ERR "Unable to allocate etherdev "
+				"structure!\n");
+			return -ENODEV;
+		}
 
-			pAC->dev[1]   = dev;
-			pNet          = dev->priv;
-			pNet->PortNr  = 1;
-			pNet->NetNr   = 1;
-			pNet->pAC     = pAC;
-			pNet->Mtu     = 1500;
-			pNet->Up      = 0;
-
-			dev->open               = &SkGeOpen;
-			dev->stop               = &SkGeClose;
-			dev->hard_start_xmit    = &SkGeXmit;
-			dev->get_stats          = &SkGeStats;
-			dev->set_multicast_list = &SkGeSetRxMode;
-			dev->set_mac_address    = &SkGeSetMacAddr;
-			dev->do_ioctl           = &SkGeIoctl;
-			dev->change_mtu         = &SkGeChangeMtu;
-			dev->flags             &= ~IFF_RUNNING;
+		pAC->dev[1]   = dev;
+		pNet          = dev->priv;
+		pNet->PortNr  = 1;
+		pNet->NetNr   = 1;
+		pNet->pAC     = pAC;
+		pNet->Mtu     = 1500;
+		pNet->Up      = 0;
 
-#ifdef SK_ZEROCOPY
+		if (CHIP_ID_YUKON_2(pAC)) {
+			dev->hard_start_xmit = &SkY2Xmit;
+		} else {
+			dev->hard_start_xmit = &SkGeXmit;
+		}
+		dev->open               = &SkGeOpen;
+		dev->stop               = &SkGeClose;
+		dev->get_stats          = &SkGeStats;
+		dev->set_multicast_list = &SkGeSetRxMode;
+		dev->set_mac_address    = &SkGeSetMacAddr;
+		dev->do_ioctl           = &SkGeIoctl;
+		dev->change_mtu         = &SkGeChangeMtu;
+		dev->flags             &= ~IFF_RUNNING;
+
+#ifdef NETIF_F_TSO
+#ifdef USE_SK_TSO_FEATURE	
+		if (CHIP_ID_YUKON_2(pAC)) {
+			dev->features |= NETIF_F_TSO;
+		}
+#endif
+#endif
+#ifdef CONFIG_SK98LIN_ZEROCOPY
+		/* Don't handle if Genesis chipset */
+		if (pAC->GIni.GIChipId != CHIP_ID_GENESIS)
+			dev->features |= NETIF_F_SG;
+#endif
 #ifdef USE_SK_TX_CHECKSUM
-			if (pAC->ChipsetType) {
-				/* SG and ZEROCOPY - fly baby... */
-				dev->features |= NETIF_F_SG | NETIF_F_IP_CSUM;
-			}
+		/* Don't handle if Genesis chipset */
+		if (pAC->GIni.GIChipId != CHIP_ID_GENESIS)
+			dev->features |= NETIF_F_IP_CSUM;
 #endif
+#ifdef USE_SK_RX_CHECKSUM
+		pAC->RxPort[1].UseRxCsum = SK_TRUE;
 #endif
 
+
+		/* Save initial device name */
+		strcpy(pNet->InitialDevName, dev->name);
+
 #ifdef CONFIG_PROC_FS
-			pProcFile = create_proc_entry(dev->name,
-				S_IFREG | S_IXUSR | S_IWGRP | S_IROTH,
-				pSkRootDir);
-			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;
+		pProcFile = create_proc_entry(dev->name,
+			S_IFREG | S_IRUSR | S_IRGRP | S_IROTH,
+			pSkRootDir);
+		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;
 #endif
 
-			memcpy((caddr_t) &dev->dev_addr,
-			(caddr_t) &pAC->Addr.Net[1].CurrentMacAddress, 6);
+		memcpy((caddr_t) &dev->dev_addr,
+		(caddr_t) &pAC->Addr.Net[1].CurrentMacAddress, 6);
 	
-			printk("%s: %s\n", dev->name, pAC->DeviceStr);
-			printk("      PrefPort:B  RlmtMode:Dual Check Link State\n");
-		}
-
-		/* Save the hardware revision */
-		pAC->HWRevision = (((pAC->GIni.GIPciHwRev >> 4) & 0x0F)*10) +
-			(pAC->GIni.GIPciHwRev & 0x0F);
-
-		/* Set driver globals */
-		pAC->Pnmi.pDriverFileName    = DRIVER_FILE_NAME;
-		pAC->Pnmi.pDriverReleaseDate = DRIVER_REL_DATE;
-
-		SK_MEMSET(&(pAC->PnmiBackup), 0, sizeof(SK_PNMI_STRUCT_DATA));
-		SK_MEMCPY(&(pAC->PnmiBackup), &(pAC->PnmiStruct), 
-				sizeof(SK_PNMI_STRUCT_DATA));
-
-		/*
-		 * This is bollocks, but we need to tell the net-init
-		 * code that it shall go for the next device.
-		 */
-#ifndef MODULE
-		dev->base_addr = 0;
-#endif
+		printk("%s: %s\n", pNet->InitialDevName, pAC->DeviceStr);
+		printk("      PrefPort:B  RlmtMode:Dual Check Link State\n");
 	}
 
-	/*
-	 * If we're at this point we're going through skge_probe() for
-	 * the first time.  Return success (0) if we've initialized 1
-	 * or more boards. Otherwise, return failure (-ENODEV).
-	 */
+	pAC->Index = sk98lin_boards_found;
+	sk98lin_max_boards_found = sk98lin_boards_found;
+	return 0;
+}
 
-	return boards_found;
-} /* skge_probe */
 
 
 /*****************************************************************************
@@ -579,7 +632,7 @@ int SkGeInitPCI(SK_AC *pAC)
 	dev->mem_start = pci_resource_start (pdev, 0);
 	pci_set_master(pdev);
 
-	if (pci_request_regions(pdev, pAC->Name) != 0) {
+	if (pci_request_regions(pdev, DRIVER_FILE_NAME) != 0) {
 		retval = 2;
 		goto out_disable;
 	}
@@ -616,6 +669,315 @@ int SkGeInitPCI(SK_AC *pAC)
 	return retval;
 }
 
+#ifdef SK_CONFIG_PM
+/*****************************************************************************
+ *
+ * 	sk98lin_resume - Resume the the card
+ *
+ * Description:
+ *	This function resumes the card into the D0 state
+ *
+ * Returns: N/A
+ *	
+ */
+static int sk98lin_resume(struct pci_dev *pdev)
+{
+	DEV_NET			*pNet;
+	SK_AC			*pAC;
+	struct 			net_device *dev = pci_get_drvdata(pdev);
+	pNet = (DEV_NET*) dev->priv;
+	pAC = pNet->pAC;
+
+	/* Set the power state to D0 */
+	pci_set_power_state(pdev, 0);
+	pci_restore_state(pdev, pAC->PciState);
+	pci_enable_wake(pdev, 3, 0);
+	pci_enable_wake(pdev, 4, 0); /* 4 == D3 cold */
+
+
+	/* Set the adapter power state to D0 */
+	SkHWSetDState(pAC, pAC->IoBase, 0);
+
+	/* Reinit the adapter and start the port again */
+	SkDrvLeaveDiagMode(pAC);
+
+	netif_device_attach(dev);
+
+	return 0;
+}
+ 
+/*****************************************************************************
+ *
+ * 	sk98lin_suspend - Suspend the card
+ *
+ * Description:
+ *	This function suspends the card into a defined state
+ *
+ * Returns: N/A
+ *	
+ */
+static int sk98lin_suspend(struct pci_dev *pdev, uint32_t state)
+{
+DEV_NET			*pNet;
+SK_AC			*pAC;
+SK_U16			PciPMControlStatus;
+SK_U16			PciPMCapabilities;
+SK_MAC_ADDR		MacAddr;
+struct 			net_device *dev = pci_get_drvdata(pdev);
+int			i;
+
+	pNet = (DEV_NET*) dev->priv;
+	pAC = pNet->pAC;
+	netif_device_detach(dev);
+
+	/* Device still busy */
+	if(netif_running(dev)) {
+		/* Maybe we have to close the adapter */
+	}
+
+	/* Stop the adapter */
+	SkDrvEnterDiagMode(pAC);
+
+	/* read the PM control/status register from the PCI config space */
+	SK_IN16(pAC->IoBase, PCI_C(pAC, PCI_PM_CTL_STS), &PciPMControlStatus);
+
+	/* read the power management capabilities from the config space */
+	SK_IN16(pAC->IoBase, PCI_C(pAC, PCI_PM_CAP_REG), &PciPMCapabilities);
+
+
+	/*
+	 * The GE chipset and the first revision of yukon does not 
+	 * support power management
+	 */
+	if (((pAC->GIni.GIChipId == CHIP_ID_YUKON) && 
+		(pAC->GIni.GIChipRev == 0)) ||
+		(pAC->GIni.GIChipId == CHIP_ID_GENESIS)) {
+	/* Power management not supported */
+		printk("Power management not supported\n");
+	} else {
+	/* Enable power management */
+		/* Enable WakeUp with Magic Packet */
+		/* get MAC address from adapter */
+		for (i = 0; i < SK_MAC_ADDR_LEN; i++) {
+			/* virtual address: will be used for data */
+			SK_IN8(pAC->IoBase, (B2_MAC_1 + i), &MacAddr.a[i]);
+		}
+
+		/* enable wake up through amd magic packet */
+		SkEnableWOMagicPacket(pAC, pAC->IoBase, MacAddr);
+
+		/* Set port spee to 100MBit */
+		SkSetPortSpeed(pAC, pAC->IoBase, SK_LSPEED_100MBPS);
+
+		/* Switch the power state */
+		SkHWSwitchPower(pAC, pAC->IoBase, state);
+
+		/*   Set the power state
+		 *
+		 * in DState 3 no I/O access to the adapter is possible
+		 * we can only access its PCI Config space through PCI
+		 * BIOS functions
+		 */
+		SkHWSetDState(pAC, pAC->IoBase, state);
+
+		pci_enable_wake(pdev, 3, 1);
+		pci_enable_wake(pdev, 4, 1);	/* 4 == D3 cold */
+		pci_save_state(pdev, pAC->PciState);
+
+		/* Set state */
+		pci_set_power_state(pdev, state);
+	}
+	return 0;
+}
+
+/******************************************************************************
+ *
+ *	SkHWSetDState - Set the desired DState by writing it into the PCI
+ *		config space of the adapter
+ *
+ * Context:
+ *	init, pageable
+ *	the adapter must be de-initialized before calling this function
+ *
+ * Returns:
+ *	SK_POWER_ERR_OK			- everything's fine
+ */
+
+static void SkHWSetDState(
+SK_AC	*pAC,	/* Adapter Context */
+SK_IOC	IoC,	/* I/O context */
+SK_DEVICE_POWER_STATE	State)	/* requested DState */
+{
+	SK_U16	PmCtlSts;
+	SkPciReadCfgWord(pAC, PCI_PM_CTL_STS, &PmCtlSts);
+
+	/* reset all DState bits */
+	PmCtlSts &= ~(PCI_PM_STATE_D3);
+
+	switch(State) {
+	case SkDeviceStateD0 :
+		PmCtlSts |= PCI_PM_STATE_D0;
+		break;
+	case SkDeviceStateD1 :
+		PmCtlSts |= PCI_PM_STATE_D1;
+		break;
+	case SkDeviceStateD2 :
+		PmCtlSts |= PCI_PM_STATE_D2;
+		break;
+	case SkDeviceStateD3 :
+		PmCtlSts |= (PCI_PM_STATE_D3 | PCI_PME_EN);
+		break;
+	}
+	SkPciWriteCfgWord(pAC, PCI_PM_CTL_STS, PmCtlSts);
+
+}	/* SkHWSetDState */
+
+/******************************************************************************
+ *
+ *	SkHWSwitchPower - Switch the adapter internal power switches according
+ *		to the selected DState
+ *
+ * Context:
+ *	init, pageable
+ *
+ * Returns:
+ *	SK_POWER_ERR_OK			- everything's fine
+ */
+
+static void SkHWSwitchPower(
+SK_AC	*pAC,	/* Adapter Context */
+SK_IOC	IoC,	/* I/O context */
+SK_DEVICE_POWER_STATE	State)
+{
+	SK_U8 Byte;
+
+	Byte = PC_VAUX_ENA | PC_VCC_ENA;
+
+	if (State == SkDeviceStateD3) {
+		/* switch power to Vaux */
+		Byte |= PC_VAUX_ON | PC_VCC_OFF;
+	}
+	else {
+		/* switch power to Vcc */
+		Byte |= PC_VAUX_OFF | PC_VCC_ON;
+	}
+
+	SK_OUT8(IoC, B0_POWER_CTRL, Byte);
+
+}	/* SkHWSwitchPower */
+
+
+/*****************************************************************************
+*
+* SkSetPortSpeed - switch the link speed of a specific port
+*
+* Description:
+*
+* Notes:
+*
+* Function Parameters:
+*	pAC - A pointer to our adapter info struct.
+*	IoC - 
+* 	Speed - link speed to switch to
+*
+* Context:
+*	IRQL -
+*
+* Returns:
+*
+*/
+static int SkSetPortSpeed(
+SK_AC	*pAC,
+SK_IOC	IoC,
+SK_U8	Speed)
+{
+	SK_GEPORT 	*pGePort;
+	SK_EVPARA 	EvPara;
+
+	pGePort = &pAC->GIni.GP[0];
+
+	/* Stop port */
+	SkY2PortStop(pAC, pAC->IoBase, 0, SK_STOP_ALL, SK_HARD_RST);
+
+	/* Set port's link speed. */
+	if (Speed == SK_LSPEED_100MBPS) {
+		/* Set port's link mode. */
+		pGePort->PLinkSpeed = SK_LSPEED_100MBPS;
+		pGePort->PLinkModeConf = 
+			pGePort->PLinkMode = SK_LMODE_AUTOBOTH;
+	}
+	else {
+		/* Set port's link mode. */
+		pGePort->PLinkSpeed = SK_LSPEED_1000MBPS;
+		pGePort->PLinkModeConf = 
+			pGePort->PLinkMode = SK_LMODE_FULL;
+	}
+
+	/* Set port's flow control mode */
+	pGePort->PFlowCtrlMode = SK_FLOW_MODE_SYM_OR_REM;
+
+	/* Set port's Master/Slave param */
+	pGePort->PMSMode = SK_MS_MODE_AUTO;
+
+	/* Start the port again so we can switch to the new Link speed */
+	SkY2PortStart(pAC, pAC->IoBase, 0);
+
+	return(0);
+}
+
+/******************************************************************************
+ *
+ *	SkEnableWOMagicPacket - Enable Wake on Magic Packet on the adapter
+ *
+ * Context:
+ *	init, pageable
+ *	the adapter should be de-initialized before calling this function
+ *
+ * Returns:
+ *	nothing
+ */
+
+static void SkEnableWOMagicPacket(
+SK_AC	*pAC,		/* Adapter Context */
+SK_IOC	IoC,		/* I/O context */
+SK_MAC_ADDR	MacAddr)	/* MacAddr expected in magic packet */
+{
+	SK_U16	Word;
+	SK_U32	DWord;
+	int 	i;
+	int		HwPortIndex;
+
+	/* use Port 0 as long as we do not have any dual port cards which support WOL */
+	HwPortIndex = 0;
+	DWord = 0;
+
+	for (i = 0; i < 4; i++) {
+		DWord = DWord << 8;
+		DWord |= MacAddr.a[3 - i];
+	}
+
+	Word = 0;
+	for (i = 0; i < 2; i++) {
+		Word = Word << 8;
+		Word |= MacAddr.a[5 - i];
+	}
+
+	/* write MAC address the WOL state machine is waiting for */
+	SK_OUT32(IoC, WOL_REG(HwPortIndex, WOL_MAC_ADDR_LO), DWord);
+	SK_OUT16(IoC, WOL_REG(HwPortIndex, WOL_MAC_ADDR_HI), Word);
+
+	SK_IN16(IoC, WOL_REG(HwPortIndex, WOL_CTRL_STAT), &Word);
+
+	/* enable wake on AMD magic packet */
+	Word &= ~(WOL_CTL_DIS_MAGIC_PKT_UNIT | WOL_CTL_DIS_PME_ON_MAGIC_PKT);
+	Word |= WOL_CTL_ENA_MAGIC_PKT_UNIT | WOL_CTL_ENA_PME_ON_MAGIC_PKT |
+		WOL_CTL_CLEAR_RESULT;
+
+	SK_OUT16(IoC, WOL_REG(HwPortIndex, WOL_CTRL_STAT), Word);
+
+}	/* SkEnableWOMagicPacket */
+#endif
+
 
 /*****************************************************************************
  *
@@ -670,16 +1032,9 @@ MODULE_PARM(Role_B,	"1-" __MODULE_STRING
 MODULE_PARM(ConType,	"1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
 MODULE_PARM(PrefPort,   "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
 MODULE_PARM(RlmtMode,   "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
-/* not used, just there because every driver should have them: */
-MODULE_PARM(options,    "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "i");
-MODULE_PARM(debug,      "i");
-/* used for interrupt moderation */
 MODULE_PARM(IntsPerSec,     "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "i");
 MODULE_PARM(Moderation,     "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
-MODULE_PARM(Stats,          "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
 MODULE_PARM(ModerationMask, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
-MODULE_PARM(AutoSizing,     "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
-
 
 #ifdef LINK_SPEED_A
 static char *Speed_A[SK_MAX_CARD_PARAM] = LINK_SPEED;
@@ -759,47 +1114,14 @@ static char *RlmtMode[SK_MAX_CARD_PARAM]
 static char *RlmtMode[SK_MAX_CARD_PARAM] = {"", };
 #endif
 
-static int debug = 0; /* not used */
-static int options[SK_MAX_CARD_PARAM] = {0, }; /* not used */
-
 static int   IntsPerSec[SK_MAX_CARD_PARAM];
 static char *Moderation[SK_MAX_CARD_PARAM];
 static char *ModerationMask[SK_MAX_CARD_PARAM];
-static char *AutoSizing[SK_MAX_CARD_PARAM];
-static char *Stats[SK_MAX_CARD_PARAM];
-
-
-/*****************************************************************************
- *
- * 	skge_init_module - module initialization function
- *
- * Description:
- *	Very simple, only call skge_probe and return approriate result.
- *
- * Returns:
- *	0, if everything is ok
- *	!=0, on error
- */
-static int __init skge_init_module(void)
-{
-	int cards;
-	SkGeRootDev = NULL;
-	
-	/* just to avoid warnings ... */
-	debug = 0;
-	options[0] = 0;
-
-	cards = skge_probe();
-	if (cards == 0) {
-		printk("sk98lin: No adapter found.\n");
-	}
-	return cards ? 0 : -ENODEV;
-} /* skge_init_module */
 
 
 /*****************************************************************************
  *
- * 	skge_cleanup_module - module unload function
+ * 	sk98lin_remove_device - device deinit function
  *
  * Description:
  *	Disable adapter if it is still running, free resources,
@@ -807,74 +1129,86 @@ static int __init skge_init_module(void)
  *
  * Returns: N/A
  */
-static void __exit skge_cleanup_module(void)
+
+static void sk98lin_remove_device(struct pci_dev *pdev)
 {
 DEV_NET		*pNet;
 SK_AC		*pAC;
 struct SK_NET_DEVICE *next;
 unsigned long Flags;
 SK_EVPARA EvPara;
+struct net_device *dev = pci_get_drvdata(pdev);
 
-	while (SkGeRootDev) {
-		pNet = (DEV_NET*) SkGeRootDev->priv;
-		pAC = pNet->pAC;
-		next = pAC->Next;
-
-		netif_stop_queue(SkGeRootDev);
-		SkGeYellowLED(pAC, pAC->IoBase, 0);
 
-		if(pAC->BoardLevel == SK_INIT_RUN) {
-			/* board is still alive */
-			spin_lock_irqsave(&pAC->SlowPathLock, Flags);
-			EvPara.Para32[0] = 0;
-			EvPara.Para32[1] = -1;
-			SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_STOP, EvPara);
-			EvPara.Para32[0] = 1;
-			EvPara.Para32[1] = -1;
-			SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_STOP, EvPara);
-			SkEventDispatcher(pAC, pAC->IoBase);
-			/* disable interrupts */
-			SK_OUT32(pAC->IoBase, B0_IMSK, 0);
-			SkGeDeInit(pAC, pAC->IoBase);
-			spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
-			pAC->BoardLevel = SK_INIT_DATA;
-			/* We do NOT check here, if IRQ was pending, of course*/
-		}
+	/* Device not available. Return. */
+	if (!dev)
+		return;
 
-		if(pAC->BoardLevel == SK_INIT_IO) {
-			/* board is still alive */
-			SkGeDeInit(pAC, pAC->IoBase);
-			pAC->BoardLevel = SK_INIT_DATA;
-		}
+	pNet = (DEV_NET*) dev->priv;
+	pAC = pNet->pAC;
+	next = pAC->Next;
 
-		if ((pAC->GIni.GIMacsFound == 2) && pAC->RlmtNets == 2){
-			unregister_netdev(pAC->dev[1]);
-			kfree(pAC->dev[1]);
+	netif_stop_queue(dev);
+	SkGeYellowLED(pAC, pAC->IoBase, 0);
 
-		}
+	if(pAC->BoardLevel == SK_INIT_RUN) {
+		/* board is still alive */
+		spin_lock_irqsave(&pAC->SlowPathLock, Flags);
+		EvPara.Para32[0] = 0;
+		EvPara.Para32[1] = -1;
+		SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_STOP, EvPara);
+		EvPara.Para32[0] = 1;
+		EvPara.Para32[1] = -1;
+		SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_STOP, EvPara);
+		SkEventDispatcher(pAC, pAC->IoBase);
+		/* disable interrupts */
+		SK_OUT32(pAC->IoBase, B0_IMSK, 0);
+		SkGeDeInit(pAC, pAC->IoBase);
+		spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
+		pAC->BoardLevel = SK_INIT_DATA;
+		/* We do NOT check here, if IRQ was pending, of course*/
+	}
 
-		FreeResources(SkGeRootDev);
+	if(pAC->BoardLevel == SK_INIT_IO) {
+		/* board is still alive */
+		SkGeDeInit(pAC, pAC->IoBase);
+		pAC->BoardLevel = SK_INIT_DATA;
+	}
 
-		SkGeRootDev->get_stats = NULL;
-		/*
-		 * otherwise unregister_netdev calls get_stats with
-		 * invalid IO ...  :-(
-		 */
-		unregister_netdev(SkGeRootDev);
-		kfree(SkGeRootDev);
-		kfree(pAC);
-		SkGeRootDev = next;
+	if ((pAC->GIni.GIMacsFound == 2) && pAC->RlmtNets == 2){
+		unregister_netdev(pAC->dev[1]);
+		kfree(pAC->dev[1]);
 	}
 
+	FreeResources(dev);
+
 #ifdef CONFIG_PROC_FS
-	/* clear proc-dir */
-	remove_proc_entry(pSkRootDir->name, proc_net);
+	/* Remove the sk98lin procfs device entries */
+	if ((pAC->GIni.GIMacsFound == 2) && pAC->RlmtNets == 2){
+		remove_proc_entry(pAC->dev[1]->name, pSkRootDir);
+	}
+	remove_proc_entry(pNet->InitialDevName, pSkRootDir);
 #endif
 
-} /* skge_cleanup_module */
+	dev->get_stats = NULL;
+	/*
+	 * otherwise unregister_netdev calls get_stats with
+	 * invalid IO ...  :-(
+	 */
+	unregister_netdev(dev);
+	kfree(dev);
+	kfree(pAC);
+	sk98lin_max_boards_found--;
 
-module_init(skge_init_module);
-module_exit(skge_cleanup_module);
+#ifdef CONFIG_PROC_FS
+	/* Remove all Proc entries if last device */
+	if (sk98lin_max_boards_found == 0) {
+		/* clear proc-dir */
+		remove_proc_entry(pSkRootDir->name, proc_net);
+	}
+#endif
+
+}
 
 
 /*****************************************************************************
@@ -913,7 +1247,9 @@ SK_BOOL	DualNet;
 		spin_lock_init(&pAC->TxPort[i][0].TxDesRingLock);
 		spin_lock_init(&pAC->RxPort[i].RxDesRingLock);
 	}
+
 	spin_lock_init(&pAC->SlowPathLock);
+	spin_lock_init(&pAC->SetPutIndexLock);	/* for Yukon2 chipsets */
 
 	/* level 0 init common modules here */
 	
@@ -937,10 +1273,7 @@ SK_BOOL	DualNet;
 	SK_PNMI_SET_DRIVER_DESCR(pAC, DescrString);
 	SK_PNMI_SET_DRIVER_VER(pAC, VerStr);
 
-	spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
-
 	/* level 1 init common modules here (HW init) */
-	spin_lock_irqsave(&pAC->SlowPathLock, Flags);
 	if (SkGeInit(pAC, pAC->IoBase, SK_INIT_IO) != 0) {
 		printk("sk98lin: HWInit (1) failed.\n");
 		spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
@@ -954,49 +1287,79 @@ SK_BOOL	DualNet;
 	SkTimerInit(pAC, pAC->IoBase, SK_INIT_IO);
 
 	/* Set chipset type support */
-	pAC->ChipsetType = 0;
 	if ((pAC->GIni.GIChipId == CHIP_ID_YUKON) ||
-		(pAC->GIni.GIChipId == CHIP_ID_YUKON_LITE)) {
-		pAC->ChipsetType = 1;
+		(pAC->GIni.GIChipId == CHIP_ID_YUKON_LITE) ||
+		(pAC->GIni.GIChipId == CHIP_ID_YUKON_LP)) {
+		pAC->ChipsetType = 1;	/* Yukon chipset (descriptor logic) */
+	} else if (CHIP_ID_YUKON_2(pAC)) {
+		pAC->ChipsetType = 2;	/* Yukon2 chipset (list logic) */
+	} else {
+		pAC->ChipsetType = 0;	/* Genesis chipset (descriptor logic) */
 	}
 
 	GetConfiguration(pAC);
 	if (pAC->RlmtNets == 2) {
-		pAC->GIni.GIPortUsage = SK_MUL_LINK;
+ 		pAC->GIni.GIPortUsage = SK_MUL_LINK;
 	}
 
 	pAC->BoardLevel = SK_INIT_IO;
 	spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
 
-	if (pAC->GIni.GIMacsFound == 2) {
-		 Ret = request_irq(dev->irq, SkGeIsr, SA_SHIRQ, pAC->Name, dev);
-	} else if (pAC->GIni.GIMacsFound == 1) {
-		Ret = request_irq(dev->irq, SkGeIsrOnePort, SA_SHIRQ,
-			pAC->Name, dev);
-	} else {
-		printk(KERN_WARNING "sk98lin: Illegal number of ports: %d\n",
-		       pAC->GIni.GIMacsFound);
-		return -EAGAIN;
+	if (!CHIP_ID_YUKON_2(pAC)) {
+#ifdef CONFIG_SK98LIN_NAPI
+		dev->poll =  &SkGePoll;
+		dev->weight = 64;
+#endif
+		if (pAC->GIni.GIMacsFound == 2) {
+			Ret = request_irq(dev->irq, SkGeIsr, SA_SHIRQ, dev->name, dev);
+		} else if (pAC->GIni.GIMacsFound == 1) {
+			Ret = request_irq(dev->irq, SkGeIsrOnePort, SA_SHIRQ, dev->name, dev);
+		} else {
+			printk(KERN_WARNING "sk98lin: Illegal number of ports: %d\n",
+				pAC->GIni.GIMacsFound);
+			return -EAGAIN;
+		}
+	}
+	else {
+		Ret = request_irq(dev->irq, SkY2Isr, SA_SHIRQ, dev->name, dev);
+#ifdef CONFIG_SK98LIN_NAPI
+		dev->poll =  &SkY2Poll;
+		dev->weight = 64;
+#endif
 	}
 
 	if (Ret) {
 		printk(KERN_WARNING "sk98lin: Requested IRQ %d is busy.\n",
-		       dev->irq);
+			dev->irq);
 		return -EAGAIN;
 	}
 	pAC->AllocFlag |= SK_ALLOC_IRQ;
 
-	/* Alloc memory for this board (Mem for RxD/TxD) : */
-	if(!BoardAllocMem(pAC)) {
-		printk("No memory for descriptor rings.\n");
-       		return(-EAGAIN);
+	/* 
+	** Alloc descriptor/LETable memory for this board (both RxD/TxD)
+	*/
+	if (CHIP_ID_YUKON_2(pAC)) {
+		if (!SkY2AllocateResources(pAC)) {
+			printk("No memory for Yukon2 settings\n");
+			return(-EAGAIN);
+		}
+	} else {
+		if(!BoardAllocMem(pAC)) {
+			printk("No memory for descriptor rings.\n");
+			return(-EAGAIN);
+		}
 	}
 
+#ifdef SK_USE_CSUM
 	SkCsSetReceiveFlags(pAC,
 		SKCS_PROTO_IP | SKCS_PROTO_TCP | SKCS_PROTO_UDP,
 		&pAC->CsOfs1, &pAC->CsOfs2, 0);
 	pAC->CsOfs = (pAC->CsOfs2 << 16) | pAC->CsOfs1;
+#endif
 
+	/*
+	** Function BoardInitMem() for Yukon dependent settings...
+	*/
 	BoardInitMem(pAC);
 	/* tschilling: New common function with minimum size check. */
 	DualNet = SK_FALSE;
@@ -1108,6 +1471,12 @@ size_t		AllocLength;	/* length of comple
 
 	SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
 		("BoardFreeMem\n"));
+
+	if (CHIP_ID_YUKON_2(pAC)) {
+		SkY2FreeResources(pAC);
+		return;
+	}
+
 #if (BITS_PER_LONG == 32)
 	AllocLength = (RX_RING_SIZE + TX_RING_SIZE) * pAC->GIni.GIMacsFound + 8;
 #else
@@ -1126,7 +1495,7 @@ size_t		AllocLength;	/* length of comple
  * 	BoardInitMem - initiate the descriptor rings
  *
  * Description:
- *	This function sets the descriptor rings up in memory.
+ *	This function sets the descriptor rings or LETables up in memory.
  *	The adapter is initialized with the descriptor start addresses.
  *
  * Returns:	N/A
@@ -1141,34 +1510,37 @@ int	TxDescrSize;	/* the size of a tx des
 	SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
 		("BoardInitMem\n"));
 
-	RxDescrSize = (((sizeof(RXD) - 1) / DESCR_ALIGN) + 1) * DESCR_ALIGN;
-	pAC->RxDescrPerRing = RX_RING_SIZE / RxDescrSize;
-	TxDescrSize = (((sizeof(TXD) - 1) / DESCR_ALIGN) + 1) * DESCR_ALIGN;
-	pAC->TxDescrPerRing = TX_RING_SIZE / RxDescrSize;
+	if (!pAC->GIni.GIYukon2) {
+		RxDescrSize = (((sizeof(RXD) - 1) / DESCR_ALIGN) + 1) * DESCR_ALIGN;
+		pAC->RxDescrPerRing = RX_RING_SIZE / RxDescrSize;
+		TxDescrSize = (((sizeof(TXD) - 1) / DESCR_ALIGN) + 1) * DESCR_ALIGN;
+		pAC->TxDescrPerRing = TX_RING_SIZE / RxDescrSize;
 	
-	for (i=0; i<pAC->GIni.GIMacsFound; i++) {
-		SetupRing(
-			pAC,
-			pAC->TxPort[i][0].pTxDescrRing,
-			pAC->TxPort[i][0].VTxDescrRing,
-			(RXD**)&pAC->TxPort[i][0].pTxdRingHead,
-			(RXD**)&pAC->TxPort[i][0].pTxdRingTail,
-			(RXD**)&pAC->TxPort[i][0].pTxdRingPrev,
-			&pAC->TxPort[i][0].TxdRingFree,
-			SK_TRUE);
-		SetupRing(
-			pAC,
-			pAC->RxPort[i].pRxDescrRing,
-			pAC->RxPort[i].VRxDescrRing,
-			&pAC->RxPort[i].pRxdRingHead,
-			&pAC->RxPort[i].pRxdRingTail,
-			&pAC->RxPort[i].pRxdRingPrev,
-			&pAC->RxPort[i].RxdRingFree,
-			SK_FALSE);
+		for (i=0; i<pAC->GIni.GIMacsFound; i++) {
+			SetupRing(
+				pAC,
+				pAC->TxPort[i][0].pTxDescrRing,
+				pAC->TxPort[i][0].VTxDescrRing,
+				(RXD**)&pAC->TxPort[i][0].pTxdRingHead,
+				(RXD**)&pAC->TxPort[i][0].pTxdRingTail,
+				(RXD**)&pAC->TxPort[i][0].pTxdRingPrev,
+				&pAC->TxPort[i][0].TxdRingFree,
+				&pAC->TxPort[i][0].TxdRingPrevFree,
+				SK_TRUE);
+			SetupRing(
+				pAC,
+				pAC->RxPort[i].pRxDescrRing,
+				pAC->RxPort[i].VRxDescrRing,
+				&pAC->RxPort[i].pRxdRingHead,
+				&pAC->RxPort[i].pRxdRingTail,
+				&pAC->RxPort[i].pRxdRingPrev,
+				&pAC->RxPort[i].RxdRingFree,
+				&pAC->RxPort[i].RxdRingFree,
+				SK_FALSE);
+		}
 	}
 } /* BoardInitMem */
 
-
 /*****************************************************************************
  *
  * 	SetupRing - create one descriptor ring
@@ -1188,6 +1560,7 @@ RXD		**ppRingHead,	/* address where the 
 RXD		**ppRingTail,	/* address where the tail should be written */
 RXD		**ppRingPrev,	/* address where the tail should be written */
 int		*pRingFree,	/* address where the # of free descr. goes */
+int		*pRingPrevFree,	/* address where the # of free descr. goes */
 SK_BOOL		IsTx)		/* flag: is this a tx ring */
 {
 int	i;		/* loop counter */
@@ -1230,11 +1603,12 @@ uintptr_t VNextDescr;	/* the virtual bus
 	}
 	pPrevDescr->pNextRxd = (RXD*) pMemArea;
 	pPrevDescr->VNextRxd = VMemArea;
-	pDescr = (RXD*) pMemArea;
-	*ppRingHead = (RXD*) pMemArea;
-	*ppRingTail = *ppRingHead;
-	*ppRingPrev = pPrevDescr;
-	*pRingFree = DescrNum;
+	pDescr               = (RXD*) pMemArea;
+	*ppRingHead          = (RXD*) pMemArea;
+	*ppRingTail          = *ppRingHead;
+	*ppRingPrev          = pPrevDescr;
+	*pRingFree           = DescrNum;
+	*pRingPrevFree       = DescrNum;
 } /* SetupRing */
 
 
@@ -1310,6 +1684,24 @@ SK_U32		IntSrc;		/* interrupts source re
 		return;
 	}
 
+#ifdef CONFIG_SK98LIN_NAPI
+	if (netif_rx_schedule_prep(dev)) {
+		pAC->GIni.GIValIrqMask &= ~(NAPI_DRV_IRQS);
+		SK_OUT32(pAC->IoBase, B0_IMSK, pAC->GIni.GIValIrqMask);
+		__netif_rx_schedule(dev);
+	}
+
+#ifdef USE_TX_COMPLETE /* only if tx complete interrupt used */
+	if (IntSrc & IS_XA1_F) {
+		CLEAR_TX_IRQ(0, TX_PRIO_LOW);
+	}
+	if (IntSrc & IS_XA2_F) {
+		CLEAR_TX_IRQ(1, TX_PRIO_LOW);
+	}
+#endif
+
+
+#else
 	while (((IntSrc & IRQ_MASK) & ~SPECIAL_IRQS) != 0) {
 #if 0 /* software irq currently not used */
 		if (IntSrc & IS_IRQ_SW) {
@@ -1323,6 +1715,7 @@ SK_U32		IntSrc;		/* interrupts source re
 				SK_DBGCAT_DRV_INT_SRC,
 				("EOF RX1 IRQ\n"));
 			ReceiveIrq(pAC, &pAC->RxPort[0], SK_TRUE);
+			CLEAR_AND_START_RX(0);
 			SK_PNMI_CNT_RX_INTR(pAC, 0);
 		}
 		if (IntSrc & IS_R2_F) {
@@ -1330,6 +1723,7 @@ SK_U32		IntSrc;		/* interrupts source re
 				SK_DBGCAT_DRV_INT_SRC,
 				("EOF RX2 IRQ\n"));
 			ReceiveIrq(pAC, &pAC->RxPort[1], SK_TRUE);
+			CLEAR_AND_START_RX(1);
 			SK_PNMI_CNT_RX_INTR(pAC, 1);
 		}
 #ifdef USE_TX_COMPLETE /* only if tx complete interrupt used */
@@ -1337,6 +1731,7 @@ SK_U32		IntSrc;		/* interrupts source re
 			SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
 				SK_DBGCAT_DRV_INT_SRC,
 				("EOF AS TX1 IRQ\n"));
+			CLEAR_TX_IRQ(0, TX_PRIO_LOW);
 			SK_PNMI_CNT_TX_INTR(pAC, 0);
 			spin_lock(&pAC->TxPort[0][TX_PRIO_LOW].TxDesRingLock);
 			FreeTxDescriptors(pAC, &pAC->TxPort[0][TX_PRIO_LOW]);
@@ -1346,6 +1741,7 @@ SK_U32		IntSrc;		/* interrupts source re
 			SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
 				SK_DBGCAT_DRV_INT_SRC,
 				("EOF AS TX2 IRQ\n"));
+			CLEAR_TX_IRQ(1, TX_PRIO_LOW);
 			SK_PNMI_CNT_TX_INTR(pAC, 1);
 			spin_lock(&pAC->TxPort[1][TX_PRIO_LOW].TxDesRingLock);
 			FreeTxDescriptors(pAC, &pAC->TxPort[1][TX_PRIO_LOW]);
@@ -1356,38 +1752,28 @@ SK_U32		IntSrc;		/* interrupts source re
 			SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
 				SK_DBGCAT_DRV_INT_SRC,
 				("EOF SY TX1 IRQ\n"));
+			CLEAR_TX_IRQ(0, TX_PRIO_HIGH);
 			SK_PNMI_CNT_TX_INTR(pAC, 1);
 			spin_lock(&pAC->TxPort[0][TX_PRIO_HIGH].TxDesRingLock);
 			FreeTxDescriptors(pAC, 0, TX_PRIO_HIGH);
 			spin_unlock(&pAC->TxPort[0][TX_PRIO_HIGH].TxDesRingLock);
-			ClearTxIrq(pAC, 0, TX_PRIO_HIGH);
 		}
 		if (IntSrc & IS_XS2_F) {
 			SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
 				SK_DBGCAT_DRV_INT_SRC,
 				("EOF SY TX2 IRQ\n"));
+			CLEAR_TX_IRQ(1, TX_PRIO_HIGH);
 			SK_PNMI_CNT_TX_INTR(pAC, 1);
 			spin_lock(&pAC->TxPort[1][TX_PRIO_HIGH].TxDesRingLock);
 			FreeTxDescriptors(pAC, 1, TX_PRIO_HIGH);
 			spin_unlock(&pAC->TxPort[1][TX_PRIO_HIGH].TxDesRingLock);
-			ClearTxIrq(pAC, 1, TX_PRIO_HIGH);
 		}
 #endif
 #endif
 
-		/* do all IO at once */
-		if (IntSrc & IS_R1_F)
-			ClearAndStartRx(pAC, 0);
-		if (IntSrc & IS_R2_F)
-			ClearAndStartRx(pAC, 1);
-#ifdef USE_TX_COMPLETE /* only if tx complete interrupt used */
-		if (IntSrc & IS_XA1_F)
-			ClearTxIrq(pAC, 0, TX_PRIO_LOW);
-		if (IntSrc & IS_XA2_F)
-			ClearTxIrq(pAC, 1, TX_PRIO_LOW);
-#endif
 		SK_IN32(pAC->IoBase, B0_ISRC, &IntSrc);
 	} /* while (IntSrc & IRQ_MASK != 0) */
+#endif
 
 	IntSrc &= pAC->GIni.GIValIrqMask;
 	if ((IntSrc & SPECIAL_IRQS) || pAC->CheckQueue) {
@@ -1401,18 +1787,12 @@ SK_U32		IntSrc;		/* interrupts source re
 		SkEventDispatcher(pAC, pAC->IoBase);
 		spin_unlock(&pAC->SlowPathLock);
 	}
-	/*
-	 * 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
-	 *
+
+#ifndef CONFIG_SK98LIN_NAPI
+	/* Handle interrupts */
 	ReceiveIrq(pAC, &pAC->RxPort[0], SK_TRUE);
 	ReceiveIrq(pAC, &pAC->RxPort[1], SK_TRUE);
-	 */
+#endif
 
 	if (pAC->CheckQueue) {
 		pAC->CheckQueue = SK_FALSE;
@@ -1459,6 +1839,21 @@ SK_U32		IntSrc;		/* interrupts source re
 		return;
 	}
 	
+#ifdef CONFIG_SK98LIN_NAPI
+	if (netif_rx_schedule_prep(dev)) {
+		// CLEAR_AND_START_RX(0);
+		// CLEAR_TX_IRQ(0, TX_PRIO_LOW);
+		pAC->GIni.GIValIrqMask &= ~(NAPI_DRV_IRQS);
+		SK_OUT32(pAC->IoBase, B0_IMSK, pAC->GIni.GIValIrqMask);
+		__netif_rx_schedule(dev);
+	} 
+
+#ifdef USE_TX_COMPLETE /* only if tx complete interrupt used */
+	if (IntSrc & IS_XA1_F) {
+		CLEAR_TX_IRQ(0, TX_PRIO_LOW);
+	}
+#endif
+#else
 	while (((IntSrc & IRQ_MASK) & ~SPECIAL_IRQS) != 0) {
 #if 0 /* software irq currently not used */
 		if (IntSrc & IS_IRQ_SW) {
@@ -1472,6 +1867,7 @@ SK_U32		IntSrc;		/* interrupts source re
 				SK_DBGCAT_DRV_INT_SRC,
 				("EOF RX1 IRQ\n"));
 			ReceiveIrq(pAC, &pAC->RxPort[0], SK_TRUE);
+			CLEAR_AND_START_RX(0);
 			SK_PNMI_CNT_RX_INTR(pAC, 0);
 		}
 #ifdef USE_TX_COMPLETE /* only if tx complete interrupt used */
@@ -1479,6 +1875,7 @@ SK_U32		IntSrc;		/* interrupts source re
 			SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
 				SK_DBGCAT_DRV_INT_SRC,
 				("EOF AS TX1 IRQ\n"));
+			CLEAR_TX_IRQ(0, TX_PRIO_LOW);
 			SK_PNMI_CNT_TX_INTR(pAC, 0);
 			spin_lock(&pAC->TxPort[0][TX_PRIO_LOW].TxDesRingLock);
 			FreeTxDescriptors(pAC, &pAC->TxPort[0][TX_PRIO_LOW]);
@@ -1489,24 +1886,18 @@ SK_U32		IntSrc;		/* interrupts source re
 			SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
 				SK_DBGCAT_DRV_INT_SRC,
 				("EOF SY TX1 IRQ\n"));
+			CLEAR_TX_IRQ(0, TX_PRIO_HIGH);
 			SK_PNMI_CNT_TX_INTR(pAC, 0);
 			spin_lock(&pAC->TxPort[0][TX_PRIO_HIGH].TxDesRingLock);
 			FreeTxDescriptors(pAC, 0, TX_PRIO_HIGH);
 			spin_unlock(&pAC->TxPort[0][TX_PRIO_HIGH].TxDesRingLock);
-			ClearTxIrq(pAC, 0, TX_PRIO_HIGH);
 		}
 #endif
 #endif
 
-		/* do all IO at once */
-		if (IntSrc & IS_R1_F)
-			ClearAndStartRx(pAC, 0);
-#ifdef USE_TX_COMPLETE /* only if tx complete interrupt used */
-		if (IntSrc & IS_XA1_F)
-			ClearTxIrq(pAC, 0, TX_PRIO_LOW);
-#endif
 		SK_IN32(pAC->IoBase, B0_ISRC, &IntSrc);
 	} /* while (IntSrc & IRQ_MASK != 0) */
+#endif
 	
 	IntSrc &= pAC->GIni.GIValIrqMask;
 	if ((IntSrc & SPECIAL_IRQS) || pAC->CheckQueue) {
@@ -1520,17 +1911,10 @@ SK_U32		IntSrc;		/* interrupts source re
 		SkEventDispatcher(pAC, pAC->IoBase);
 		spin_unlock(&pAC->SlowPathLock);
 	}
-	/*
-	 * 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
-	 *
+
+#ifndef CONFIG_SK98LIN_NAPI
 	ReceiveIrq(pAC, &pAC->RxPort[0], SK_TRUE);
-	 */
+#endif
 
 	/* IRQ is processed - Enable IRQs again*/
 	SK_OUT32(pAC->IoBase, B0_IMSK, pAC->GIni.GIValIrqMask);
@@ -1538,7 +1922,6 @@ SK_U32		IntSrc;		/* interrupts source re
 		return;
 } /* SkGeIsrOnePort */
 
-
 /****************************************************************************
  *
  *	SkGeOpen - handle start of initialized adapter
@@ -1556,27 +1939,22 @@ SK_U32		IntSrc;		/* interrupts source re
  *	!= 0 on error
  */
 static int SkGeOpen(
-struct SK_NET_DEVICE	*dev)
+struct SK_NET_DEVICE *dev)  /* the device that is to be opened */
 {
-	DEV_NET			*pNet;
-	SK_AC			*pAC;
-	unsigned long	Flags;		/* for spin lock */
-	int				i;
-	SK_EVPARA		EvPara;		/* an event parameter union */
+	DEV_NET        *pNet = (DEV_NET*) dev->priv;
+	SK_AC          *pAC  = pNet->pAC;
+	unsigned long   Flags;    /* for the spin locks    */
+	int             CurrMac;  /* loop ctr for ports    */
+	SK_EVPARA       EvPara;   /* event parameter union */
 
-	pNet = (DEV_NET*) dev->priv;
-	pAC = pNet->pAC;
-	
 	SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
 		("SkGeOpen: pAC=0x%lX:\n", (unsigned long)pAC));
 
-#ifdef SK_DIAG_SUPPORT
 	if (pAC->DiagModeActive == DIAG_ACTIVE) {
 		if (pAC->Pnmi.DiagAttached == SK_DIAG_RUNNING) {
 			return (-1);   /* still in use by diag; deny actions */
 		} 
 	}
-#endif
 
 
 	/* Set blink mode */
@@ -1613,18 +1991,31 @@ struct SK_NET_DEVICE	*dev)
 		pAC->BoardLevel = SK_INIT_RUN;
 	}
 
-	for (i=0; i<pAC->GIni.GIMacsFound; i++) {
-		/* Enable transmit descriptor polling. */
-		SkGePollTxD(pAC, pAC->IoBase, i, SK_TRUE);
-		FillRxRing(pAC, &pAC->RxPort[i]);
+	for (CurrMac=0; CurrMac<pAC->GIni.GIMacsFound; CurrMac++) {
+		if (CHIP_ID_YUKON_2(pAC)) {
+			SkY2PortStart(pAC, pAC->IoBase, CurrMac);
+		} else {
+			/* Enable transmit descriptor polling. */
+			SkGePollTxD(pAC, pAC->IoBase, CurrMac, SK_TRUE);
+			FillRxRing(pAC, &pAC->RxPort[CurrMac]);
+			SkMacRxTxEnable(pAC, pAC->IoBase, pNet->PortNr);
+		}
 	}
-	SkGeYellowLED(pAC, pAC->IoBase, 1);
 
-	StartDrvCleanupTimer(pAC);
+	SkGeYellowLED(pAC, pAC->IoBase, 1);
 	SkDimEnableModerationIfNeeded(pAC);	
-	SkDimDisplayModerationSettings(pAC);
 
-	pAC->GIni.GIValIrqMask &= IRQ_MASK;
+	if (!CHIP_ID_YUKON_2(pAC)) {
+		/*
+		** Has been setup already at SkGeInit(SK_INIT_IO),
+		** but additional masking added for Genesis & Yukon
+		** chipsets -> modify it...
+		*/
+		pAC->GIni.GIValIrqMask &= IRQ_MASK;
+#ifndef USE_TX_COMPLETE
+		pAC->GIni.GIValIrqMask &= ~(TX_COMPL_IRQS);
+#endif
+	}
 
 	/* enable Interrupts */
 	SK_OUT32(pAC->IoBase, B0_IMSK, pAC->GIni.GIValIrqMask);
@@ -1673,24 +2064,22 @@ struct SK_NET_DEVICE	*dev)
  *	error code - on error
  */
 static int SkGeClose(
-struct SK_NET_DEVICE	*dev)
+struct SK_NET_DEVICE *dev)  /* the device that is to be closed */
 {
-	DEV_NET		*pNet;
-	DEV_NET		*newPtrNet;
-	SK_AC		*pAC;
-
-	unsigned long	Flags;		/* for spin lock */
-	int		i;
-	int		PortIdx;
-	SK_EVPARA	EvPara;
-
+	DEV_NET         *pNet = (DEV_NET*) dev->priv;
+	SK_AC           *pAC  = pNet->pAC;
+	DEV_NET         *newPtrNet;
+	unsigned long    Flags;        /* for the spin locks           */
+	int              CurrMac;      /* loop ctr for the current MAC */
+	int              PortIdx;
+	SK_EVPARA        EvPara;
+#ifdef CONFIG_SK98LIN_NAPI
+	int              WorkToDo = 1; /* min(*budget, dev->quota);    */
+	int              WorkDone = 0;
+#endif
 	SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
 		("SkGeClose: pAC=0x%lX ", (unsigned long)pAC));
 
-	pNet = (DEV_NET*) dev->priv;
-	pAC = pNet->pAC;
-
-#ifdef SK_DIAG_SUPPORT
 	if (pAC->DiagModeActive == DIAG_ACTIVE) {
 		if (pAC->DiagFlowCtrl == SK_FALSE) {
 			MOD_DEC_USE_COUNT;
@@ -1710,7 +2099,6 @@ struct SK_NET_DEVICE	*dev)
 			pAC->DiagFlowCtrl = SK_FALSE;
 		}
 	}
-#endif
 
 	netif_stop_queue(dev);
 
@@ -1719,8 +2107,6 @@ struct SK_NET_DEVICE	*dev)
 	else
 		PortIdx = pNet->NetNr;
 
-        StopDrvCleanupTimer(pAC);
-
 	/*
 	 * Clear multicast table, promiscuous mode ....
 	 */
@@ -1738,8 +2124,14 @@ struct SK_NET_DEVICE	*dev)
 		SkEventDispatcher(pAC, pAC->IoBase);
 		SK_OUT32(pAC->IoBase, B0_IMSK, 0);
 		/* stop the hardware */
-		SkGeDeInit(pAC, pAC->IoBase);
-		pAC->BoardLevel = SK_INIT_DATA;
+		/* SkGeDeInit(pAC, pAC->IoBase);	*/
+		/* pAC->BoardLevel = SK_INIT_DATA;	*/
+		if (CHIP_ID_YUKON_2(pAC)) {
+			SkY2PortStop(pAC, pAC->IoBase, 0, SK_STOP_ALL, SK_HARD_RST);
+		}
+		else {
+			SkGeStopPort(pAC, pAC->IoBase, 0, SK_STOP_ALL, SK_HARD_RST);
+		}
 		spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
 	} else {
 
@@ -1754,24 +2146,52 @@ 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,
-			SK_STOP_ALL, SK_HARD_RST);
+		if (CHIP_ID_YUKON_2(pAC)) {
+			SkY2PortStop(pAC, pAC->IoBase, pNet->PortNr,
+				SK_STOP_ALL, SK_HARD_RST);
+		}
+		else {
+			SkGeStopPort(pAC, pAC->IoBase, pNet->PortNr,
+				SK_STOP_ALL, SK_HARD_RST);
+		}
 		spin_unlock_irqrestore(&pAC->TxPort[pNet->PortNr]
 			[TX_PRIO_LOW].TxDesRingLock, Flags);
 	}
 
 	if (pAC->RlmtNets == 1) {
 		/* clear all descriptor rings */
-		for (i=0; i<pAC->GIni.GIMacsFound; i++) {
-			ReceiveIrq(pAC, &pAC->RxPort[i], SK_TRUE);
-			ClearRxRing(pAC, &pAC->RxPort[i]);
-			ClearTxRing(pAC, &pAC->TxPort[i][TX_PRIO_LOW]);
+		for (CurrMac=0; CurrMac<pAC->GIni.GIMacsFound; CurrMac++) {
+			if (!CHIP_ID_YUKON_2(pAC)) {
+#ifdef CONFIG_SK98LIN_NAPI
+				WorkToDo = 1;
+				ReceiveIrq(pAC,&pAC->RxPort[CurrMac],
+						SK_TRUE,&WorkDone,WorkToDo);
+#else
+				ReceiveIrq(pAC,&pAC->RxPort[CurrMac],SK_TRUE);
+#endif
+				ClearRxRing(pAC, &pAC->RxPort[CurrMac]);
+				ClearTxRing(pAC, &pAC->TxPort[CurrMac][TX_PRIO_LOW]);
+			} else {
+				SkY2FreeRxBuffers(pAC, pAC->IoBase, CurrMac);
+				SkY2FreeTxBuffers(pAC, pAC->IoBase, CurrMac);
+			}
 		}
 	} else {
 		/* clear port descriptor rings */
-		ReceiveIrq(pAC, &pAC->RxPort[pNet->PortNr], SK_TRUE);
-		ClearRxRing(pAC, &pAC->RxPort[pNet->PortNr]);
-		ClearTxRing(pAC, &pAC->TxPort[pNet->PortNr][TX_PRIO_LOW]);
+		if (!CHIP_ID_YUKON_2(pAC)) {
+#ifdef CONFIG_SK98LIN_NAPI
+			WorkToDo = 1;
+			ReceiveIrq(pAC, &pAC->RxPort[pNet->PortNr], SK_TRUE, &WorkDone, WorkToDo);
+#else
+			ReceiveIrq(pAC, &pAC->RxPort[pNet->PortNr], SK_TRUE);
+#endif
+			ClearRxRing(pAC, &pAC->RxPort[pNet->PortNr]);
+			ClearTxRing(pAC, &pAC->TxPort[pNet->PortNr][TX_PRIO_LOW]);
+		}
+		else {
+			SkY2FreeRxBuffers(pAC, pAC->IoBase, pNet->PortNr);
+			SkY2FreeTxBuffers(pAC, pAC->IoBase, pNet->PortNr);
+		}
 	}
 
 	SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
@@ -1842,9 +2262,11 @@ int			Rc;	/* return code of XmitFrame */
 	}
 
 	/* Transmitter out of resources? */
+#ifdef USE_TX_COMPLETE
 	if (Rc <= 0) {
 		netif_stop_queue(dev);
 	}
+#endif
 
 	/* If not taken, give buffer ownership back to the
 	 * queueing layer.
@@ -1856,6 +2278,53 @@ int			Rc;	/* return code of XmitFrame */
 	return (0);
 } /* SkGeXmit */
 
+#ifdef CONFIG_SK98LIN_NAPI
+/*****************************************************************************
+ *
+ * 	SkGePoll - NAPI Rx polling callback for GEnesis and Yukon chipsets
+ *
+ * Description:
+ *	Called by the Linux system in case NAPI polling is activated
+ *
+ * Returns:
+ *	The number of work data still to be handled
+ */
+static int SkGePoll(struct net_device *dev, int *budget) 
+{
+SK_AC	*pAC = ((DEV_NET*)(dev->priv))->pAC; /* pointer to adapter context */
+int	WorkToDo = min(*budget, dev->quota);
+int	WorkDone = 0;
+
+	if (pAC->dev[0] != pAC->dev[1]) {
+#ifdef USE_TX_COMPLETE
+		spin_lock(&pAC->TxPort[1][TX_PRIO_LOW].TxDesRingLock);
+		FreeTxDescriptors(pAC, &pAC->TxPort[1][TX_PRIO_LOW]);
+		spin_unlock(&pAC->TxPort[1][TX_PRIO_LOW].TxDesRingLock);
+#endif
+		ReceiveIrq(pAC, &pAC->RxPort[1], SK_TRUE, &WorkDone, WorkToDo);
+	}
+#ifdef USE_TX_COMPLETE
+	spin_lock(&pAC->TxPort[0][TX_PRIO_LOW].TxDesRingLock);
+	FreeTxDescriptors(pAC, &pAC->TxPort[0][TX_PRIO_LOW]);
+	spin_unlock(&pAC->TxPort[0][TX_PRIO_LOW].TxDesRingLock);
+#endif
+	ReceiveIrq(pAC, &pAC->RxPort[0], SK_TRUE, &WorkDone, WorkToDo);
+
+	*budget -= WorkDone;
+	dev->quota -= WorkDone;
+
+	if(WorkDone < WorkToDo) {
+		netif_rx_complete(dev);
+		/* enable interrupts again */
+		pAC->GIni.GIValIrqMask |= (NAPI_DRV_IRQS);
+#ifndef USE_TX_COMPLETE
+		pAC->GIni.GIValIrqMask &= ~(TX_COMPL_IRQS);
+#endif
+		SK_OUT32(pAC->IoBase, B0_IMSK, pAC->GIni.GIValIrqMask);
+	}
+	return (WorkDone >= WorkToDo);
+} /* SkGePoll */
+#endif
 
 /*****************************************************************************
  *
@@ -1880,7 +2349,7 @@ int			Rc;	/* return code of XmitFrame */
  *	< 0 - on failure: other problems ( -> return failure to upper layers)
  */
 static int XmitFrame(
-SK_AC 		*pAC,		/* pointer to adapter context           */
+SK_AC 		*pAC,		/* pointer to adapter context	        */
 TX_PORT		*pTxPort,	/* pointer to struct of port to send to */
 struct sk_buff	*pMessage)	/* pointer to send-message              */
 {
@@ -1896,11 +2365,14 @@ struct sk_buff	*pMessage)	/* pointer to 
 
 	spin_lock_irqsave(&pTxPort->TxDesRingLock, Flags);
 #ifndef USE_TX_COMPLETE
-	FreeTxDescriptors(pAC, pTxPort);
+	if ((pTxPort->TxdRingPrevFree - pTxPort->TxdRingFree) > 6)  {
+		FreeTxDescriptors(pAC, pTxPort);
+		pTxPort->TxdRingPrevFree = pTxPort->TxdRingFree;
+	}
 #endif
 	if (pTxPort->TxdRingFree == 0) {
 		/* 
-		** no enough free descriptors in ring at the moment.
+		** not enough free descriptors in ring at the moment.
 		** Maybe free'ing some old one help?
 		*/
 		FreeTxDescriptors(pAC, pTxPort);
@@ -1928,6 +2400,7 @@ struct sk_buff	*pMessage)	/* pointer to 
 	*/
 	if (BytesSend < C_LEN_ETHERNET_MINSIZE) {
 		if ((pMessage = skb_padto(pMessage, C_LEN_ETHERNET_MINSIZE)) == NULL) {
+			spin_unlock_irqrestore(&pTxPort->TxDesRingLock, Flags);
 			return 0;
 		}
 		pMessage->len = C_LEN_ETHERNET_MINSIZE;
@@ -1985,7 +2458,7 @@ struct sk_buff	*pMessage)	/* pointer to 
 				   BMU_IRQ_EOF |
 #endif
 				   pMessage->len;
-        } else {
+	} else {
 		pTxd->TBControl = BMU_OWN | BMU_STF | BMU_CHECK | 
 				  BMU_SW  | BMU_EOF |
 #ifdef USE_TX_COMPLETE
@@ -2405,33 +2878,40 @@ SK_U16		Length;		/* data fragment length
  * Returns:	N/A
  */
 static void ReceiveIrq(
-	SK_AC		*pAC,			/* pointer to adapter context */
-	RX_PORT		*pRxPort,		/* pointer to receive port struct */
-	SK_BOOL		SlowPathLock)	/* indicates if SlowPathLock is needed */
-{
-RXD				*pRxd;			/* pointer to receive descriptors */
-SK_U32			Control;		/* control field of descriptor */
-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 */
-int				PortIndex = pRxPort->PortIndex;
-unsigned int	Offset;
-unsigned int	NumBytes;
-unsigned int	ForRlmt;
-SK_BOOL			IsBc;
-SK_BOOL			IsMc;
-SK_BOOL  IsBadFrame; 			/* Bad frame */
-
-SK_U32			FrameStat;
-unsigned short	Csum1;
-unsigned short	Csum2;
-unsigned short	Type;
-int				Result;
-SK_U64			PhysAddr;
+#ifdef CONFIG_SK98LIN_NAPI
+SK_AC    *pAC,          /* pointer to adapter context          */
+RX_PORT  *pRxPort,      /* pointer to receive port struct      */
+SK_BOOL   SlowPathLock, /* indicates if SlowPathLock is needed */
+int      *WorkDone,
+int       WorkToDo)
+#else
+SK_AC    *pAC,          /* pointer to adapter context          */
+RX_PORT  *pRxPort,      /* pointer to receive port struct      */
+SK_BOOL   SlowPathLock) /* indicates if SlowPathLock is needed */
+#endif
+{
+	RXD             *pRxd;          /* pointer to receive descriptors         */
+	struct sk_buff  *pMsg;          /* pointer to message holding frame       */
+	struct sk_buff  *pNewMsg;       /* pointer to new message for frame copy  */
+	SK_MBUF         *pRlmtMbuf;     /* ptr to buffer for giving frame to RLMT */
+	SK_EVPARA        EvPara;        /* an event parameter union        */	
+	SK_U32           Control;       /* control field of descriptor     */
+	unsigned long    Flags;         /* for spin lock handling          */
+	int              PortIndex = pRxPort->PortIndex;
+	int              FrameLength;   /* total length of received frame  */
+	int              IpFrameLength; /* IP length of the received frame */
+	unsigned int     Offset;
+	unsigned int     NumBytes;
+	unsigned int     RlmtNotifier;
+	SK_BOOL          IsBc;          /* we received a broadcast packet  */
+	SK_BOOL          IsMc;          /* we received a multicast packet  */
+	SK_BOOL          IsBadFrame;    /* the frame received is bad!      */
+	SK_U32           FrameStat;
+	unsigned short   Csum1;
+	unsigned short   Csum2;
+	unsigned short   Type;
+	int              Result;
+	SK_U64           PhysAddr;
 
 rx_start:	
 	/* do forever; exit if BMU_OWN found */
@@ -2451,8 +2931,15 @@ rx_start:	
 		 * to be checked next.
 		 */
 
-		Control = pRxd->RBControl;
-	
+		Control = pRxd->RBControl;
+	
+#ifdef CONFIG_SK98LIN_NAPI
+		if (*WorkDone >= WorkToDo) {
+			break;
+		}
+		(*WorkDone)++;
+#endif
+
 		/* check if this descriptor is ready */
 		if ((Control & BMU_OWN) != 0) {
 			/* this descriptor is not yet ready */
@@ -2461,7 +2948,6 @@ rx_start:	
 			FillRxRing(pAC, pRxPort);
 			return;
 		}
-                pAC->DynIrqModInfo.NbrProcessedDescr++;
 
 		/* get length of frame and check it */
 		FrameLength = Control & BMU_BBC;
@@ -2480,8 +2966,8 @@ rx_start:	
 		FrameStat = pRxd->FrameStat;
 
 		/* check for frame length mismatch */
-#define XMR_FS_LEN_SHIFT        18
-#define GMR_FS_LEN_SHIFT        16
+#define XMR_FS_LEN_SHIFT	18
+#define GMR_FS_LEN_SHIFT	16
 		if (pAC->GIni.GIChipId == CHIP_ID_GENESIS) {
 			if (FrameLength != (SK_U32) (FrameStat >> XMR_FS_LEN_SHIFT)) {
 				SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
@@ -2491,8 +2977,7 @@ rx_start:	
 					(SK_U32) (FrameStat >> XMR_FS_LEN_SHIFT)));
 				goto rx_failed;
 			}
-		}
-		else {
+		} else {
 			if (FrameLength != (SK_U32) (FrameStat >> GMR_FS_LEN_SHIFT)) {
 				SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
 					SK_DBGCAT_DRV_RX_PROGRESS,
@@ -2560,11 +3045,11 @@ rx_start:	
 			skb_put(pNewMsg, FrameLength);
 			PhysAddr = ((SK_U64) pRxd->VDataHigh) << (SK_U64)32;
 			PhysAddr |= (SK_U64) pRxd->VDataLow;
-
 			pci_dma_sync_single(pAC->PciDev,
 						(dma_addr_t) PhysAddr,
 						FrameLength,
 						PCI_DMA_FROMDEVICE);
+
 			eth_copy_and_sum(pNewMsg, pMsg->data,
 				FrameLength, 0);
 			ReQueueRxBuffer(pAC, pRxPort, pMsg,
@@ -2572,13 +3057,11 @@ rx_start:	
 
 			pMsg = pNewMsg;
 
-		}
-		else {
+		} else {
 			/*
 			 * if large frame, or SKB allocation failed, pass
 			 * the SKB directly to the networking
 			 */
-
 			PhysAddr = ((SK_U64) pRxd->VDataHigh) << (SK_U64)32;
 			PhysAddr |= (SK_U64) pRxd->VDataLow;
 
@@ -2587,119 +3070,75 @@ rx_start:	
 					 PhysAddr,
 					 pAC->RxBufSize - 2,
 					 PCI_DMA_FROMDEVICE);
+			skb_put(pMsg, FrameLength); /* set message len */
+			pMsg->ip_summed = CHECKSUM_NONE; /* initial default */
 
-			/* set length in message */
-			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);
-				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->ChipsetType)) {
-						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
+			if (pRxPort->UseRxCsum) {
+				Type = ntohs(*((short*)&pMsg->data[12]));
+				if (Type == 0x800) {
+					IpFrameLength = (int) ntohs((unsigned short)
+							((unsigned short *) pMsg->data)[8]);
+					if ((FrameLength - IpFrameLength) == 0xe) {
+						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->ChipsetType)) {
+							Result = SkCsGetReceiveInfo(pAC, &pMsg->data[14],
+								Csum1, Csum2, 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 */
+			} /* pRxPort->UseRxCsum */
 		} /* frame > SK_COPY_TRESHOLD */
 		
 		SK_DBG_MSG(NULL, SK_DBGMOD_DRV,	1,("V"));
-		ForRlmt = SK_RLMT_RX_PROTOCOL;
-#if 0
-		IsBc = (FrameStat & XMR_FS_BC)==XMR_FS_BC;
-#endif
+		RlmtNotifier = SK_RLMT_RX_PROTOCOL;
 		SK_RLMT_PRE_LOOKAHEAD(pAC, PortIndex, FrameLength,
-			IsBc, &Offset, &NumBytes);
+					IsBc, &Offset, &NumBytes);
 		if (NumBytes != 0) {
-#if 0
-			IsMc = (FrameStat & XMR_FS_MC)==XMR_FS_MC;
-#endif
-			SK_RLMT_LOOKAHEAD(pAC, PortIndex,
-				&pMsg->data[Offset],
-				IsBc, IsMc, &ForRlmt);
+			SK_RLMT_LOOKAHEAD(pAC,PortIndex,&pMsg->data[Offset],
+						IsBc,IsMc,&RlmtNotifier);
 		}
-		if (ForRlmt == SK_RLMT_RX_PROTOCOL) {
-					SK_DBG_MSG(NULL, SK_DBGMOD_DRV,	1,("W"));
+		if (RlmtNotifier == SK_RLMT_RX_PROTOCOL) {
+			SK_DBG_MSG(NULL, SK_DBGMOD_DRV,	1,("W"));
 			/* send up only frames from active port */
-			if ((PortIndex == pAC->ActivePort) ||
-				(pAC->RlmtNets == 2)) {
-				/* frame for upper layer */
+			if ((PortIndex == pAC->ActivePort)||(pAC->RlmtNets == 2)) {
 				SK_DBG_MSG(NULL, SK_DBGMOD_DRV, 1,("U"));
 #ifdef xDEBUG
 				DumpMsg(pMsg, "Rx");
 #endif
-				SK_PNMI_CNT_RX_OCTETS_DELIVERED(pAC,
-					FrameLength, pRxPort->PortIndex);
-
-				pMsg->dev = pAC->dev[pRxPort->PortIndex];
-				pMsg->protocol = eth_type_trans(pMsg,
-					pAC->dev[pRxPort->PortIndex]);
-				netif_rx(pMsg);
-				pAC->dev[pRxPort->PortIndex]->last_rx = jiffies;
-			}
-			else {
-				/* drop frame */
+				SK_PNMI_CNT_RX_OCTETS_DELIVERED(pAC,FrameLength,PortIndex);
+				pMsg->dev = pAC->dev[PortIndex];
+				pMsg->protocol = eth_type_trans(pMsg,pAC->dev[PortIndex]);
+				netif_rx(pMsg); /* frame for upper layer */
+				pAC->dev[PortIndex]->last_rx = jiffies;
+			} else {
 				SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
-					SK_DBGCAT_DRV_RX_PROGRESS,
-					("D"));
-				DEV_KFREE_SKB(pMsg);
+					SK_DBGCAT_DRV_RX_PROGRESS,("D"));
+				DEV_KFREE_SKB(pMsg); /* drop frame */
 			}
-			
-		} /* if not for rlmt */
-		else {
-			/* packet for rlmt */
+		} else { /* packet for RLMT stack */
 			SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
-				SK_DBGCAT_DRV_RX_PROGRESS, ("R"));
+				SK_DBGCAT_DRV_RX_PROGRESS,("R"));
 			pRlmtMbuf = SkDrvAllocRlmtMbuf(pAC,
 				pAC->IoBase, FrameLength);
 			if (pRlmtMbuf != NULL) {
@@ -2727,32 +3166,22 @@ rx_start:	
 				}
 
 				SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
-					SK_DBGCAT_DRV_RX_PROGRESS,
-					("Q"));
+					SK_DBGCAT_DRV_RX_PROGRESS,("Q"));
 			}
-			if ((pAC->dev[pRxPort->PortIndex]->flags &
-				(IFF_PROMISC | IFF_ALLMULTI)) != 0 ||
-				(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]);
+			if ((pAC->dev[PortIndex]->flags & (IFF_PROMISC | IFF_ALLMULTI)) ||
+			    (RlmtNotifier & SK_RLMT_RX_PROTOCOL)) {
+				pMsg->dev = pAC->dev[PortIndex];
+				pMsg->protocol = eth_type_trans(pMsg,pAC->dev[PortIndex]);
 				netif_rx(pMsg);
-				pAC->dev[pRxPort->PortIndex]->last_rx = jiffies;
-			}
-			else {
+				pAC->dev[PortIndex]->last_rx = jiffies;
+			} else {
 				DEV_KFREE_SKB(pMsg);
 			}
-
-		} /* if packet for rlmt */
+		} /* if packet for RLMT stack */
 	} /* for ... scanning the RXD ring */
 
 	/* RXD ring is empty -> fill and restart */
 	FillRxRing(pAC, pRxPort);
-	/* do not start if called from Close */
-	if (pAC->BoardLevel > SK_INIT_DATA) {
-		ClearAndStartRx(pAC, PortIndex);
-	}
 	return;
 
 rx_failed:
@@ -2776,49 +3205,6 @@ rx_failed:
 
 } /* ReceiveIrq */
 
-
-/*****************************************************************************
- *
- * 	ClearAndStartRx - give a start receive command to BMU, clear IRQ
- *
- * Description:
- *	This function sends a start command and a clear interrupt
- *	command for one receive queue to the BMU.
- *
- * Returns: N/A
- *	none
- */
-static void ClearAndStartRx(
-SK_AC	*pAC,		/* pointer to the adapter context */
-int	PortIndex)	/* index of the receive port (XMAC) */
-{
-	SK_OUT8(pAC->IoBase,
-		RxQueueAddr[PortIndex]+Q_CSR,
-		CSR_START | CSR_IRQ_CL_F);
-} /* ClearAndStartRx */
-
-
-/*****************************************************************************
- *
- * 	ClearTxIrq - give a clear transmit IRQ command to BMU
- *
- * Description:
- *	This function sends a clear tx IRQ command for one
- *	transmit queue to the BMU.
- *
- * Returns: N/A
- */
-static void ClearTxIrq(
-SK_AC	*pAC,		/* pointer to the adapter context */
-int	PortIndex,	/* index of the transmit port (XMAC) */
-int	Prio)		/* priority or normal queue */
-{
-	SK_OUT8(pAC->IoBase, 
-		TxQueueAddr[PortIndex][Prio]+Q_CSR,
-		CSR_IRQ_CL_F);
-} /* ClearTxIrq */
-
-
 /*****************************************************************************
  *
  * 	ClearRxRing - remove all buffers from the receive ring
@@ -3032,6 +3418,10 @@ SK_AC		*pAC;
 unsigned long	Flags;
 int		i;
 SK_EVPARA 	EvPara;
+#ifdef CONFIG_SK98LIN_NAPI
+int		WorkToDo = 1; // min(*budget, dev->quota);
+int		WorkDone = 0;
+#endif
 
 	SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
 		("SkGeChangeMtu starts now...\n"));
@@ -3047,7 +3437,6 @@ SK_EVPARA 	EvPara;
 		return -EINVAL;
 	}
 
-#ifdef SK_DIAG_SUPPORT
 	if (pAC->DiagModeActive == DIAG_ACTIVE) {
 		if (pAC->DiagFlowCtrl == SK_FALSE) {
 			return -1; /* still in use, deny any actions of MTU */
@@ -3055,7 +3444,6 @@ SK_EVPARA 	EvPara;
 			pAC->DiagFlowCtrl = SK_FALSE;
 		}
 	}
-#endif
 
 	pNet->Mtu = NewMtu;
 	pOtherNet = (DEV_NET*)pAC->dev[1 - pNet->NetNr]->priv;
@@ -3064,6 +3452,9 @@ SK_EVPARA 	EvPara;
 	}
 
 	pAC->RxBufSize = NewMtu + 32;
+	while (pAC->RxBufSize % 8) { /* RxBufSize must be a multiple of 8 */
+		pAC->RxBufSize = pAC->RxBufSize + 1;
+	}
 	dev->mtu = NewMtu;
 
 	SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
@@ -3096,8 +3487,7 @@ SK_EVPARA 	EvPara;
 	SkEventDispatcher(pAC, pAC->IoBase);
 
 	for (i=0; i<pAC->GIni.GIMacsFound; i++) {
-		spin_lock_irqsave(
-			&pAC->TxPort[i][TX_PRIO_LOW].TxDesRingLock, Flags);
+		spin_lock(&pAC->TxPort[i][TX_PRIO_LOW].TxDesRingLock);
 		netif_stop_queue(pAC->dev[i]);
 
 	}
@@ -3148,7 +3538,6 @@ SK_EVPARA 	EvPara;
 	** enable/disable hardware support for long frames
 	*/
 	if (NewMtu > 1500) {
-// pAC->JumboActivated = SK_TRUE; /* is never set back !!! */
 		pAC->GIni.GIPortUsage = SK_JUMBO_LINK;
 	} else {
 	    if ((pAC->GIni.GIMacsFound == 2 ) && (pAC->RlmtNets == 2)) {
@@ -3165,9 +3554,8 @@ SK_EVPARA 	EvPara;
 	SkAddrInit( pAC, pAC->IoBase, SK_INIT_IO);
 	SkRlmtInit( pAC, pAC->IoBase, SK_INIT_IO);
 	SkTimerInit(pAC, pAC->IoBase, SK_INIT_IO);
-	
+
 	/*
-	** tschilling:
 	** Speed and others are set back to default in level 1 init!
 	*/
 	GetConfiguration(pAC);
@@ -3181,23 +3569,35 @@ SK_EVPARA 	EvPara;
 	SkTimerInit(pAC, pAC->IoBase, SK_INIT_RUN);
 
 	/*
-	** clear and reinit the rx rings here
+	** clear and reinit the rx rings here, because of new MTU size
 	*/
 	for (i=0; i<pAC->GIni.GIMacsFound; i++) {
-		ReceiveIrq(pAC, &pAC->RxPort[i], SK_TRUE);
-		ClearRxRing(pAC, &pAC->RxPort[i]);
-		FillRxRing(pAC, &pAC->RxPort[i]);
+		if (CHIP_ID_YUKON_2(pAC)) {
+			SkY2FreeRxBuffers(pAC, pAC->IoBase, i);
+			SkY2FreeTxBuffers(pAC, pAC->IoBase, i);
+			SkY2AllocateRxBuffers(pAC, pAC->IoBase, i);
+			SkY2RestartStatusUnit(pAC);
+			SkY2PortStart(pAC, pAC->IoBase, i);
+		} else {
+#ifdef CONFIG_SK98LIN_NAPI
+			WorkToDo = 1;
+			ReceiveIrq(pAC, &pAC->RxPort[i], SK_TRUE, &WorkDone, WorkToDo);
+#else
+			ReceiveIrq(pAC, &pAC->RxPort[i], SK_TRUE);
+#endif
+			ClearRxRing(pAC, &pAC->RxPort[i]);
+			FillRxRing(pAC, &pAC->RxPort[i]);
 
-		/* 
-		** Enable transmit descriptor polling
-		*/
-		SkGePollTxD(pAC, pAC->IoBase, i, SK_TRUE);
-		FillRxRing(pAC, &pAC->RxPort[i]);
-	};
+			/* 
+			** Enable transmit descriptor polling
+			*/
+			SkGePollTxD(pAC, pAC->IoBase, i, SK_TRUE);
+			FillRxRing(pAC, &pAC->RxPort[i]);
+		}
+	}
 
 	SkGeYellowLED(pAC, pAC->IoBase, 1);
 	SkDimEnableModerationIfNeeded(pAC);	
-	SkDimDisplayModerationSettings(pAC);
 
 	netif_start_queue(pAC->dev[pNet->PortNr]);
 	for (i=pAC->GIni.GIMacsFound-1; i>=0; i--) {
@@ -3267,42 +3667,38 @@ static struct net_device_stats *SkGeStat
 {
 DEV_NET *pNet = (DEV_NET*) dev->priv;
 SK_AC	*pAC = pNet->pAC;
-SK_PNMI_STRUCT_DATA *pPnmiStruct;       /* structure for all Pnmi-Data */
-SK_PNMI_STAT    *pPnmiStat;             /* pointer to virtual XMAC stat. data */
-SK_PNMI_CONF    *pPnmiConf;             /* pointer to virtual link config. */
-unsigned int    Size;                   /* size of pnmi struct */
+SK_PNMI_STRUCT_DATA *pPnmiStruct;	/* structure for all Pnmi-Data */
+SK_PNMI_STAT    *pPnmiStat;		/* pointer to virtual XMAC stat. data */
+SK_PNMI_CONF    *pPnmiConf;		/* pointer to virtual link config. */
+unsigned int    Size;			/* size of pnmi struct */
 unsigned long	Flags;			/* for spin lock */
 
 	SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
 		("SkGeStats starts now...\n"));
 	pPnmiStruct = &pAC->PnmiStruct;
 
-#ifdef SK_DIAG_SUPPORT
-        if ((pAC->DiagModeActive == DIAG_NOTACTIVE) &&
-                (pAC->BoardLevel == SK_INIT_RUN)) {
-#endif
-        SK_MEMSET(pPnmiStruct, 0, sizeof(SK_PNMI_STRUCT_DATA));
-        spin_lock_irqsave(&pAC->SlowPathLock, Flags);
-        Size = SK_PNMI_STRUCT_SIZE;
-		SkPnmiGetStruct(pAC, pAC->IoBase, pPnmiStruct, &Size, pNet->NetNr);
-        spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
-#ifdef SK_DIAG_SUPPORT
+	if ((pAC->DiagModeActive == DIAG_NOTACTIVE) &&
+		(pAC->BoardLevel == SK_INIT_RUN)) {
+		SK_MEMSET(pPnmiStruct, 0, sizeof(SK_PNMI_STRUCT_DATA));
+		spin_lock_irqsave(&pAC->SlowPathLock, Flags);
+		Size = SK_PNMI_STRUCT_SIZE;
+			SkPnmiGetStruct(pAC, pAC->IoBase, pPnmiStruct, &Size, pNet->NetNr);
+		spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
 	}
-#endif
 
-        pPnmiStat = &pPnmiStruct->Stat[0];
-        pPnmiConf = &pPnmiStruct->Conf[0];
+	pPnmiStat = &pPnmiStruct->Stat[0];
+	pPnmiConf = &pPnmiStruct->Conf[0];
 
 	pAC->stats.rx_packets = (SK_U32) pPnmiStruct->RxDeliveredCts & 0xFFFFFFFF;
 	pAC->stats.tx_packets = (SK_U32) pPnmiStat->StatTxOkCts & 0xFFFFFFFF;
 	pAC->stats.rx_bytes = (SK_U32) pPnmiStruct->RxOctetsDeliveredCts;
 	pAC->stats.tx_bytes = (SK_U32) pPnmiStat->StatTxOctetsOkCts;
 	
-        if (pNet->Mtu <= 1500) {
-                pAC->stats.rx_errors = (SK_U32) pPnmiStruct->InErrorsCts & 0xFFFFFFFF;
-        } else {
-                pAC->stats.rx_errors = (SK_U32) ((pPnmiStruct->InErrorsCts -
-                        pPnmiStat->StatRxTooLongCts) & 0xFFFFFFFF);
+	if (pNet->Mtu <= 1500) {
+		pAC->stats.rx_errors = (SK_U32) pPnmiStruct->InErrorsCts & 0xFFFFFFFF;
+	} else {
+		pAC->stats.rx_errors = (SK_U32) ((pPnmiStruct->InErrorsCts -
+			pPnmiStat->StatRxTooLongCts) & 0xFFFFFFFF);
 	}
 
 
@@ -3349,28 +3745,27 @@ unsigned long	Flags;			/* for spin lock 
  */
 static int SkGeIoctl(struct SK_NET_DEVICE *dev, struct ifreq *rq, int cmd)
 {
-DEV_NET		*pNet;
-SK_AC		*pAC;
-void		*pMemBuf;
-struct pci_dev  *pdev = NULL;
-SK_GE_IOCTL	Ioctl;
-unsigned int	Err = 0;
-int		Size = 0;
-int             Ret = 0;
-unsigned int	Length = 0;
-int		HeaderLength = sizeof(SK_U32) + sizeof(SK_U32);
+	DEV_NET          *pNet = (DEV_NET*) dev->priv;
+	SK_AC            *pAC  = pNet->pAC;
+	struct pci_dev   *pdev = NULL;
+	void             *pMemBuf;
+	SK_GE_IOCTL       Ioctl;
+	unsigned int      Err = 0;
+	unsigned int      Length = 0;
+	int               HeaderLength = sizeof(SK_U32) + sizeof(SK_U32);
+	int               Size = 0;
+	int               Ret = 0;
 
 	SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
 		("SkGeIoctl starts now...\n"));
 
-	pNet = (DEV_NET*) dev->priv;
-	pAC = pNet->pAC;
-	
 	if(copy_from_user(&Ioctl, rq->ifr_data, sizeof(SK_GE_IOCTL))) {
 		return -EFAULT;
 	}
 
 	switch(cmd) {
+	case SIOCETHTOOL:
+		return SkEthIoctl(dev, rq);
 	case SK_IOCTL_SETMIB:
 	case SK_IOCTL_PRESETMIB:
 		if (!capable(CAP_NET_ADMIN)) return -EPERM;
@@ -3419,8 +3814,7 @@ int		HeaderLength = sizeof(SK_U32) + siz
 fault_gen:
 		kfree(pMemBuf); /* cleanup everything */
 		break;
-#ifdef SK_DIAG_SUPPORT
-       case SK_IOCTL_DIAG:
+	case SK_IOCTL_DIAG:
 		if (!capable(CAP_NET_ADMIN)) return -EPERM;
 		if (Ioctl.Len < (sizeof(pAC->PnmiStruct) + HeaderLength)) {
 			Length = Ioctl.Len;
@@ -3457,7 +3851,6 @@ fault_gen:
 fault_diag:
 		kfree(pMemBuf); /* cleanup everything */
 		break;
-#endif
 	default:
 		Err = -EOPNOTSUPP;
 	}
@@ -3537,17 +3930,18 @@ SK_AC	*pAC)	/* pointer to the adapter co
 SK_I32	Port;		/* preferred port */
 SK_BOOL	AutoSet;
 SK_BOOL DupSet;
-int	LinkSpeed          = SK_LSPEED_AUTO;	/* Link speed */
-int	AutoNeg            = 1;			/* autoneg off (0) or on (1) */
-int	DuplexCap          = 0;			/* 0=both,1=full,2=half */
-int	FlowCtrl           = SK_FLOW_MODE_SYM_OR_REM;	/* FlowControl  */
-int	MSMode             = SK_MS_MODE_AUTO;	/* master/slave mode    */
-
-SK_BOOL IsConTypeDefined   = SK_TRUE;
-SK_BOOL IsLinkSpeedDefined = SK_TRUE;
-SK_BOOL IsFlowCtrlDefined  = SK_TRUE;
-SK_BOOL IsRoleDefined      = SK_TRUE;
-SK_BOOL IsModeDefined      = SK_TRUE;
+int	LinkSpeed		= SK_LSPEED_AUTO;	/* Link speed */
+int	AutoNeg			= 1;			/* autoneg off (0) or on (1) */
+int	DuplexCap		= 0;			/* 0=both,1=full,2=half */
+int	FlowCtrl		= SK_FLOW_MODE_SYM_OR_REM;	/* FlowControl  */
+int	MSMode			= SK_MS_MODE_AUTO;	/* master/slave mode    */
+int	IrqModMaskOffset	= 6;			/* all ints moderated=default */
+
+SK_BOOL IsConTypeDefined	= SK_TRUE;
+SK_BOOL IsLinkSpeedDefined	= SK_TRUE;
+SK_BOOL IsFlowCtrlDefined	= SK_TRUE;
+SK_BOOL IsRoleDefined		= SK_TRUE;
+SK_BOOL IsModeDefined		= SK_TRUE;
 /*
  *	The two parameters AutoNeg. and DuplexCap. map to one configuration
  *	parameter. The mapping is described by this table:
@@ -3565,6 +3959,15 @@ int	Capabilities[3][3] =
 		  {SK_LMODE_AUTOBOTH , SK_LMODE_AUTOFULL , SK_LMODE_AUTOHALF },
 		  {SK_LMODE_AUTOSENSE, SK_LMODE_AUTOSENSE, SK_LMODE_AUTOSENSE} };
 
+SK_U32	IrqModMask[7][2] =
+		{ { IRQ_MASK_RX_ONLY , Y2_DRIVER_IRQS  },
+		  { IRQ_MASK_TX_ONLY , Y2_DRIVER_IRQS  },
+		  { IRQ_MASK_SP_ONLY , Y2_SPECIAL_IRQS },
+		  { IRQ_MASK_SP_RX   , Y2_IRQ_MASK     },
+		  { IRQ_MASK_TX_RX   , Y2_DRIVER_IRQS  },
+		  { IRQ_MASK_SP_TX   , Y2_IRQ_MASK     },
+		  { IRQ_MASK_RX_TX_SP, Y2_IRQ_MASK     } };
+
 #define DC_BOTH	0
 #define DC_FULL 1
 #define DC_HALF 2
@@ -3604,7 +4007,7 @@ int	Capabilities[3][3] =
 	** 
 	** This ConType parameter is used for all ports of the adapter!
 	*/
-        if ( (ConType != NULL)                && 
+	if ( (ConType != NULL)                && 
 	     (pAC->Index < SK_MAX_CARD_PARAM) &&
 	     (ConType[pAC->Index] != NULL) ) {
 
@@ -3630,40 +4033,40 @@ int	Capabilities[3][3] =
 			M_CurrPort.PMSMode       = SK_MS_MODE_AUTO;
 			M_CurrPort.PLinkSpeed    = SK_LSPEED_AUTO;
 		    }
-                } else if (strcmp(ConType[pAC->Index],"100FD")==0) {
+		} else if (strcmp(ConType[pAC->Index],"100FD")==0) {
 		    for (Port = 0; Port < SK_MAX_MACS; Port++) {
 			M_CurrPort.PLinkModeConf = Capabilities[AN_OFF][DC_FULL];
 			M_CurrPort.PFlowCtrlMode = SK_FLOW_MODE_NONE;
 			M_CurrPort.PMSMode       = SK_MS_MODE_AUTO;
 			M_CurrPort.PLinkSpeed    = SK_LSPEED_100MBPS;
 		    }
-                } else if (strcmp(ConType[pAC->Index],"100HD")==0) {
+		} else if (strcmp(ConType[pAC->Index],"100HD")==0) {
 		    for (Port = 0; Port < SK_MAX_MACS; Port++) {
 			M_CurrPort.PLinkModeConf = Capabilities[AN_OFF][DC_HALF];
 			M_CurrPort.PFlowCtrlMode = SK_FLOW_MODE_NONE;
 			M_CurrPort.PMSMode       = SK_MS_MODE_AUTO;
 			M_CurrPort.PLinkSpeed    = SK_LSPEED_100MBPS;
 		    }
-                } else if (strcmp(ConType[pAC->Index],"10FD")==0) {
+		} else if (strcmp(ConType[pAC->Index],"10FD")==0) {
 		    for (Port = 0; Port < SK_MAX_MACS; Port++) {
 			M_CurrPort.PLinkModeConf = Capabilities[AN_OFF][DC_FULL];
 			M_CurrPort.PFlowCtrlMode = SK_FLOW_MODE_NONE;
 			M_CurrPort.PMSMode       = SK_MS_MODE_AUTO;
 			M_CurrPort.PLinkSpeed    = SK_LSPEED_10MBPS;
 		    }
-                } else if (strcmp(ConType[pAC->Index],"10HD")==0) {
+		} else if (strcmp(ConType[pAC->Index],"10HD")==0) {
 		    for (Port = 0; Port < SK_MAX_MACS; Port++) {
 			M_CurrPort.PLinkModeConf = Capabilities[AN_OFF][DC_HALF];
 			M_CurrPort.PFlowCtrlMode = SK_FLOW_MODE_NONE;
 			M_CurrPort.PMSMode       = SK_MS_MODE_AUTO;
 			M_CurrPort.PLinkSpeed    = SK_LSPEED_10MBPS;
 		    }
-                } else { 
+		} else { 
 		    printk("sk98lin: Illegal value \"%s\" for ConType\n", 
 			ConType[pAC->Index]);
 		    IsConTypeDefined = SK_FALSE; /* Wrong ConType defined */
 		}
-        } else {
+	} else {
 	    IsConTypeDefined = SK_FALSE; /* No ConType defined */
 	}
 
@@ -3682,14 +4085,30 @@ int	Capabilities[3][3] =
 		} else if (strcmp(Speed_A[pAC->Index],"100")==0) {
 		    LinkSpeed = SK_LSPEED_100MBPS;
 		} else if (strcmp(Speed_A[pAC->Index],"1000")==0) {
-		    LinkSpeed = SK_LSPEED_1000MBPS;
+		    if ((pAC->PciDev->vendor == 0x11ab ) &&
+		    	(pAC->PciDev->device == 0x4350)) {
+				LinkSpeed = SK_LSPEED_100MBPS;
+				printk("sk98lin: Illegal value \"%s\" for Speed_A.\n"
+					"Gigabit speed not possible with this chip revision!",
+					Speed_A[pAC->Index]);
+			} else {
+				LinkSpeed = SK_LSPEED_1000MBPS;
+		    }
 		} else {
 		    printk("sk98lin: Illegal value \"%s\" for Speed_A\n",
 			Speed_A[pAC->Index]);
 		    IsLinkSpeedDefined = SK_FALSE;
 		}
 	} else {
-	    IsLinkSpeedDefined = SK_FALSE;
+		if ((pAC->PciDev->vendor == 0x11ab ) && 
+			(pAC->PciDev->device == 0x4350)) {
+			/* Gigabit speed not supported
+			 * Swith to speed 100
+			 */
+			LinkSpeed = SK_LSPEED_100MBPS;
+		} else {
+			IsLinkSpeedDefined = SK_FALSE;
+		}
 	}
 
 	/* 
@@ -3784,9 +4203,6 @@ int	Capabilities[3][3] =
 	}
 	
 	if (!AutoSet && DupSet) {
-		printk("sk98lin: Port A: Duplex setting not"
-			" possible in\n    default AutoNegotiation mode"
-			" (Sense).\n    Using AutoNegotiation On\n");
 		AutoNeg = AN_ON;
 	}
 	
@@ -3814,7 +4230,7 @@ int	Capabilities[3][3] =
 		    FlowCtrl = SK_FLOW_MODE_NONE;
 		} else {
 		    printk("sk98lin: Illegal value \"%s\" for FlowCtrl_A\n",
-                        FlowCtrl_A[pAC->Index]);
+			FlowCtrl_A[pAC->Index]);
 		    IsFlowCtrlDefined = SK_FALSE;
 		}
 	} else {
@@ -3906,7 +4322,7 @@ int	Capabilities[3][3] =
 	** Decide whether to set new config value if somethig valid has
 	** been received.
 	*/
-        if (IsLinkSpeedDefined) {
+	if (IsLinkSpeedDefined) {
 	    pAC->GIni.GP[1].PLinkSpeed = LinkSpeed;
 	}
 
@@ -3982,9 +4398,6 @@ int	Capabilities[3][3] =
 	}
 	
 	if (!AutoSet && DupSet) {
-		printk("sk98lin: Port B: Duplex setting not"
-			" possible in\n    default AutoNegotiation mode"
-			" (Sense).\n    Using AutoNegotiation On\n");
 		AutoNeg = AN_ON;
 	}
 
@@ -4128,6 +4541,7 @@ int	Capabilities[3][3] =
 	/*
 	** Check the interrupt moderation parameters
 	*/
+	pAC->DynIrqModInfo.IntModTypeSelect = C_INT_MOD_NONE;
 	if (Moderation[pAC->Index] != NULL) {
 		if (strcmp(Moderation[pAC->Index], "") == 0) {
 			pAC->DynIrqModInfo.IntModTypeSelect = C_INT_MOD_NONE;
@@ -4141,70 +4555,49 @@ int	Capabilities[3][3] =
 	   		printk("sk98lin: Illegal value \"%s\" for Moderation.\n"
 				"      Disable interrupt moderation.\n",
 				Moderation[pAC->Index]);
-			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;
+/* Set interrupt moderation if wished */
+#ifdef CONFIG_SK98LIN_STATINT
+		pAC->DynIrqModInfo.IntModTypeSelect = C_INT_MOD_STATIC;
+#endif
 	}
 
 	if (ModerationMask[pAC->Index] != NULL) {
 		if (strcmp(ModerationMask[pAC->Index], "Rx") == 0) {
-			pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_RX_ONLY;
+			IrqModMaskOffset = 0;
 		} else if (strcmp(ModerationMask[pAC->Index], "Tx") == 0) {
-			pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_TX_ONLY;
+			IrqModMaskOffset = 1;
 		} else if (strcmp(ModerationMask[pAC->Index], "Sp") == 0) {
-			pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_SP_ONLY;
+			IrqModMaskOffset = 2;
 		} else if (strcmp(ModerationMask[pAC->Index], "RxSp") == 0) {
-			pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_SP_RX;
+			IrqModMaskOffset = 3;
 		} else if (strcmp(ModerationMask[pAC->Index], "SpRx") == 0) {
-			pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_SP_RX;
+			IrqModMaskOffset = 3;
 		} else if (strcmp(ModerationMask[pAC->Index], "RxTx") == 0) {
-			pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_TX_RX;
+			IrqModMaskOffset = 4;
 		} else if (strcmp(ModerationMask[pAC->Index], "TxRx") == 0) {
-			pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_TX_RX;
+			IrqModMaskOffset = 4;
 		} else if (strcmp(ModerationMask[pAC->Index], "TxSp") == 0) {
-			pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_SP_TX;
+			IrqModMaskOffset = 5;
 		} 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;
+			IrqModMaskOffset = 5;
+		} else { /* some rubbish stated */
+			// IrqModMaskOffset = 6; ->has been initialized
+			// already at the begin of this function...
 		}
-	} else {  /* operator has stated nothing */
-		pAC->DynIrqModInfo.AutoSizing = SK_FALSE;
+	}
+	if (!CHIP_ID_YUKON_2(pAC)) {
+		pAC->DynIrqModInfo.MaskIrqModeration = IrqModMask[IrqModMaskOffset][0];
+	} else {
+		pAC->DynIrqModInfo.MaskIrqModeration = IrqModMask[IrqModMaskOffset][1];
 	}
 
+	if (!CHIP_ID_YUKON_2(pAC)) {
+		pAC->DynIrqModInfo.MaxModIntsPerSec = C_INTS_PER_SEC_DEFAULT;
+	} else {
+		pAC->DynIrqModInfo.MaxModIntsPerSec = C_Y2_INTS_PER_SEC_DEFAULT;
+	}
 	if (IntsPerSec[pAC->Index] != 0) {
 		if ((IntsPerSec[pAC->Index]< C_INT_MOD_IPS_LOWER_RANGE) || 
 			(IntsPerSec[pAC->Index] > C_INT_MOD_IPS_UPPER_RANGE)) {
@@ -4213,28 +4606,25 @@ int	Capabilities[3][3] =
 				IntsPerSec[pAC->Index],
 				C_INT_MOD_IPS_LOWER_RANGE,
 				C_INT_MOD_IPS_UPPER_RANGE,
-				C_INTS_PER_SEC_DEFAULT);
-			pAC->DynIrqModInfo.MaxModIntsPerSec = C_INTS_PER_SEC_DEFAULT;
+				pAC->DynIrqModInfo.MaxModIntsPerSec);
 		} 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.MaxModIntsPerSec / 5);
 
 	pAC->DynIrqModInfo.MaxModIntsPerSecLowerLimit =
 		pAC->DynIrqModInfo.MaxModIntsPerSec -
-		(pAC->DynIrqModInfo.MaxModIntsPerSec / 2);
-
-	pAC->DynIrqModInfo.PrevTimeVal = jiffies;  /* initial value */
+		(pAC->DynIrqModInfo.MaxModIntsPerSec / 5);
 
+	pAC->DynIrqModInfo.DynIrqModSampleInterval = 
+		SK_DRV_MODERATION_TIMER_LENGTH;
 
 } /* GetConfiguration */
 
@@ -4270,45 +4660,6 @@ 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 *********************************************/
 /****************************************************************************/
@@ -4397,7 +4748,9 @@ SK_MBUF		*pNextMbuf;
 SK_U64 SkOsGetTime(SK_AC *pAC)
 {
 	SK_U64	PrivateJiffies;
+
 	SkOsGetTimeCurrent(pAC, &PrivateJiffies);
+
 	return PrivateJiffies;
 } /* SkOsGetTime */
 
@@ -4552,28 +4905,31 @@ SK_U8 Val)		/* pointer to store the read
  *	
  */
 int SkDrvEvent(
-SK_AC *pAC,		/* pointer to adapter context */
-SK_IOC IoC,		/* io-context */
-SK_U32 Event,		/* event-id */
-SK_EVPARA Param)	/* event-parameter */
-{
-SK_MBUF		*pRlmtMbuf;	/* pointer to a rlmt-mbuf structure */
-struct sk_buff	*pMsg;		/* pointer to a message block */
-int		FromPort;	/* the port from which we switch away */
-int		ToPort;		/* the port we switch to */
-SK_EVPARA	NewPara;	/* parameter for further events */
-int		Stat;
-unsigned long	Flags;
-SK_BOOL		DualNet;
+SK_AC     *pAC,    /* pointer to adapter context */
+SK_IOC     IoC,    /* IO control context         */
+SK_U32     Event,  /* event-id                   */
+SK_EVPARA  Param)  /* event-parameter            */
+{
+	SK_MBUF         *pRlmtMbuf;   /* pointer to a rlmt-mbuf structure   */
+	struct sk_buff  *pMsg;        /* pointer to a message block         */
+	SK_EVPARA        NewPara;     /* parameter for further events       */
+	SK_BOOL          DualNet;
+	SK_U32           Reason;
+	unsigned long    Flags;
+	int              FromPort;    /* the port from which we switch away */
+	int              ToPort;      /* the port we switch to              */
+	int              Stat;
+#ifdef CONFIG_SK98LIN_NAPI
+	int              WorkToDo = 1; /* min(*budget, dev->quota); */
+	int              WorkDone = 0;
+#endif
 
 	switch (Event) {
 	case SK_DRV_ADAP_FAIL:
 		SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_EVENT,
 			("ADAPTER FAIL EVENT\n"));
 		printk("%s: Adapter failed.\n", pAC->dev[0]->name);
-		/* disable interrupts */
-		SK_OUT32(pAC->IoBase, B0_IMSK, 0);
-		/* cgoos */
+		SK_OUT32(pAC->IoBase, B0_IMSK, 0); /* disable interrupts */
 		break;
 	case SK_DRV_PORT_FAIL:
 		FromPort = Param.Para32[0];
@@ -4584,10 +4940,8 @@ SK_BOOL		DualNet;
 		} else {
 			printk("%s: Port B failed.\n", pAC->dev[1]->name);
 		}
-		/* cgoos */
 		break;
-	case SK_DRV_PORT_RESET:	 /* SK_U32 PortIdx */
-		/* action list 4 */
+	case SK_DRV_PORT_RESET:
 		FromPort = Param.Para32[0];
 		SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_EVENT,
 			("PORT RESET EVENT, Port: %d ", FromPort));
@@ -4596,176 +4950,187 @@ SK_BOOL		DualNet;
 		spin_lock_irqsave(
 			&pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock,
 			Flags);
-
-		SkGeStopPort(pAC, IoC, FromPort, SK_STOP_ALL, SK_HARD_RST);
+		if (CHIP_ID_YUKON_2(pAC)) {
+			SkY2PortStop(pAC, IoC, FromPort, SK_STOP_ALL, SK_HARD_RST);
+		} else {
+			SkGeStopPort(pAC, IoC, FromPort, SK_STOP_ALL, SK_HARD_RST);
+		}
 		pAC->dev[Param.Para32[0]]->flags &= ~IFF_RUNNING;
 		spin_unlock_irqrestore(
 			&pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock,
 			Flags);
 		
-		/* clear rx ring from received frames */
-		ReceiveIrq(pAC, &pAC->RxPort[FromPort], SK_FALSE);
-		
-		ClearTxRing(pAC, &pAC->TxPort[FromPort][TX_PRIO_LOW]);
+		if (!CHIP_ID_YUKON_2(pAC)) {
+#ifdef CONFIG_SK98LIN_NAPI
+			WorkToDo = 1;
+			ReceiveIrq(pAC, &pAC->RxPort[FromPort], SK_FALSE, &WorkDone, WorkToDo);
+#else
+			ReceiveIrq(pAC, &pAC->RxPort[FromPort], SK_FALSE);
+#endif
+			ClearTxRing(pAC, &pAC->TxPort[FromPort][TX_PRIO_LOW]);
+		}
 		spin_lock_irqsave(
 			&pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock,
 			Flags);
 		
-		/* tschilling: Handling of return value inserted. */
-		if (SkGeInitPort(pAC, IoC, FromPort)) {
-			if (FromPort == 0) {
-				printk("%s: SkGeInitPort A failed.\n", pAC->dev[0]->name);
-			} else {
-				printk("%s: SkGeInitPort B failed.\n", pAC->dev[1]->name);
+		if (CHIP_ID_YUKON_2(pAC)) {
+			SkY2PortStart(pAC, IoC, FromPort);
+		} else {
+			/* tschilling: Handling of return value inserted. */
+			if (SkGeInitPort(pAC, IoC, FromPort)) {
+				if (FromPort == 0) {
+					printk("%s: SkGeInitPort A failed.\n", pAC->dev[0]->name);
+				} else {
+					printk("%s: SkGeInitPort B failed.\n", pAC->dev[1]->name);
+				}
 			}
+			SkAddrMcUpdate(pAC,IoC, FromPort);
+			PortReInitBmu(pAC, FromPort);
+			SkGePollTxD(pAC, IoC, FromPort, SK_TRUE);
+			CLEAR_AND_START_RX(FromPort);
 		}
-		SkAddrMcUpdate(pAC,IoC, FromPort);
-		PortReInitBmu(pAC, FromPort);
-		SkGePollTxD(pAC, IoC, FromPort, SK_TRUE);
-		ClearAndStartRx(pAC, FromPort);
 		spin_unlock_irqrestore(
 			&pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock,
 			Flags);
 		break;
-	case SK_DRV_NET_UP:	 /* SK_U32 PortIdx */
-		/* action list 5 */
+	case SK_DRV_NET_UP:
 		FromPort = Param.Para32[0];
 		SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_EVENT,
-			("NET UP EVENT, Port: %d ", Param.Para32[0]));
-		/* Mac update */
-		SkAddrMcUpdate(pAC,IoC, FromPort);
-
+			("NET UP EVENT, Port: %d ", FromPort));
+		SkAddrMcUpdate(pAC,IoC, FromPort); /* Mac update */
 		if (DoPrintInterfaceChange) {
-		printk("%s: network connection up using"
-			" port %c\n", pAC->dev[Param.Para32[0]]->name, 'A'+Param.Para32[0]);
+			printk("%s: network connection up using port %c\n",
+				pAC->dev[FromPort]->name, 'A'+FromPort);
 
-		/* tschilling: Values changed according to LinkSpeedUsed. */
-		Stat = pAC->GIni.GP[FromPort].PLinkSpeedUsed;
-		if (Stat == SK_LSPEED_STAT_10MBPS) {
-			printk("    speed:           10\n");
-		} else if (Stat == SK_LSPEED_STAT_100MBPS) {
-			printk("    speed:           100\n");
-		} else if (Stat == SK_LSPEED_STAT_1000MBPS) {
-			printk("    speed:           1000\n");
-		} else {
-			printk("    speed:           unknown\n");
-		}
+			/* tschilling: Values changed according to LinkSpeedUsed. */
+			Stat = pAC->GIni.GP[FromPort].PLinkSpeedUsed;
+			if (Stat == SK_LSPEED_STAT_10MBPS) {
+				printk("    speed:           10\n");
+			} else if (Stat == SK_LSPEED_STAT_100MBPS) {
+				printk("    speed:           100\n");
+			} else if (Stat == SK_LSPEED_STAT_1000MBPS) {
+				printk("    speed:           1000\n");
+			} else {
+				printk("    speed:           unknown\n");
+			}
 
+			Stat = pAC->GIni.GP[FromPort].PLinkModeStatus;
+			if ((Stat == SK_LMODE_STAT_AUTOHALF) ||
+			    (Stat == SK_LMODE_STAT_AUTOFULL)) {
+				printk("    autonegotiation: yes\n");
+			} else {
+				printk("    autonegotiation: no\n");
+			}
 
-		Stat = pAC->GIni.GP[FromPort].PLinkModeStatus;
-		if (Stat == SK_LMODE_STAT_AUTOHALF ||
-			Stat == SK_LMODE_STAT_AUTOFULL) {
-			printk("    autonegotiation: yes\n");
-		}
-		else {
-			printk("    autonegotiation: no\n");
-		}
-		if (Stat == SK_LMODE_STAT_AUTOHALF ||
-			Stat == SK_LMODE_STAT_HALF) {
-			printk("    duplex mode:     half\n");
-		}
-		else {
-			printk("    duplex mode:     full\n");
-		}
-		Stat = pAC->GIni.GP[FromPort].PFlowCtrlStatus;
-		if (Stat == SK_FLOW_STAT_REM_SEND ) {
-			printk("    flowctrl:        remote send\n");
-		}
-		else if (Stat == SK_FLOW_STAT_LOC_SEND ){
-			printk("    flowctrl:        local send\n");
-		}
-		else if (Stat == SK_FLOW_STAT_SYMMETRIC ){
-			printk("    flowctrl:        symmetric\n");
-		}
-		else {
-			printk("    flowctrl:        none\n");
-		}
-		
-		/* tschilling: Check against CopperType now. */
-		if ((pAC->GIni.GICopperType == SK_TRUE) &&
-			(pAC->GIni.GP[FromPort].PLinkSpeedUsed ==
-			SK_LSPEED_STAT_1000MBPS)) {
-			Stat = pAC->GIni.GP[FromPort].PMSStatus;
-			if (Stat == SK_MS_STAT_MASTER ) {
-				printk("    role:            master\n");
+			if ((Stat == SK_LMODE_STAT_AUTOHALF) ||
+			    (Stat == SK_LMODE_STAT_HALF)) {
+				printk("    duplex mode:     half\n");
+			} else {
+				printk("    duplex mode:     full\n");
 			}
-			else if (Stat == SK_MS_STAT_SLAVE ) {
-				printk("    role:            slave\n");
+
+			Stat = pAC->GIni.GP[FromPort].PFlowCtrlStatus;
+			if (Stat == SK_FLOW_STAT_REM_SEND ) {
+				printk("    flowctrl:        remote send\n");
+			} else if (Stat == SK_FLOW_STAT_LOC_SEND ) {
+				printk("    flowctrl:        local send\n");
+			} else if (Stat == SK_FLOW_STAT_SYMMETRIC ) {
+				printk("    flowctrl:        symmetric\n");
+			} else {
+				printk("    flowctrl:        none\n");
 			}
-			else {
-				printk("    role:            ???\n");
+		
+			/* tschilling: Check against CopperType now. */
+			if ((pAC->GIni.GICopperType == SK_TRUE) &&
+				(pAC->GIni.GP[FromPort].PLinkSpeedUsed ==
+				SK_LSPEED_STAT_1000MBPS)) {
+				Stat = pAC->GIni.GP[FromPort].PMSStatus;
+				if (Stat == SK_MS_STAT_MASTER ) {
+					printk("    role:            master\n");
+				} else if (Stat == SK_MS_STAT_SLAVE ) {
+					printk("    role:            slave\n");
+				} else {
+					printk("    role:            ???\n");
+				}
 			}
-		}
 
-		/* 
-		   Display dim (dynamic interrupt moderation) 
-		   informations
-		 */
-		if (pAC->DynIrqModInfo.IntModTypeSelect == C_INT_MOD_STATIC)
-			printk("    irq moderation:  static (%d ints/sec)\n",
+			/* Display interrupt moderation informations */
+			if (pAC->DynIrqModInfo.IntModTypeSelect == C_INT_MOD_STATIC) {
+				printk("    irq moderation:  static (%d ints/sec)\n",
 					pAC->DynIrqModInfo.MaxModIntsPerSec);
-		else if (pAC->DynIrqModInfo.IntModTypeSelect == C_INT_MOD_DYNAMIC)
-			printk("    irq moderation:  dynamic (%d ints/sec)\n",
+			} else if (pAC->DynIrqModInfo.IntModTypeSelect == C_INT_MOD_DYNAMIC) {
+				printk("    irq moderation:  dynamic (%d ints/sec)\n",
 					pAC->DynIrqModInfo.MaxModIntsPerSec);
-		else
-			printk("    irq moderation:  disabled\n");
+			} else {
+				printk("    irq moderation:  disabled\n");
+			}
+	
+#ifdef NETIF_F_TSO
+			if (CHIP_ID_YUKON_2(pAC)) {
+				if (pAC->dev[FromPort]->features & NETIF_F_TSO) {
+					printk("    tcp offload:     enabled\n");
+				} else {
+					printk("    tcp offload:     disabled\n");
+				}
+			}
+#endif
 
+			if (pAC->dev[FromPort]->features & NETIF_F_SG) {
+				printk("    scatter-gather:  enabled\n");
+			} else {
+				printk("    scatter-gather:  disabled\n");
+			}
 
-#ifdef SK_ZEROCOPY
-		if (pAC->ChipsetType)
-#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 (pAC->dev[FromPort]->features & NETIF_F_IP_CSUM) {
+				printk("    tx-checksum:     enabled\n");
+			} else {
+				printk("    tx-checksum:     disabled\n");
+			}
 
-#ifndef USE_SK_RX_CHECKSUM
-			printk("    rx-checksum:     disabled\n");
+			if (pAC->RxPort[FromPort].UseRxCsum) {
+				printk("    rx-checksum:     enabled\n");
+			} else {
+				printk("    rx-checksum:     disabled\n");
+			}
+#ifdef CONFIG_SK98LIN_NAPI
+			printk("    rx-polling:      enabled\n");
 #endif
-
 		} else {
-                        DoPrintInterfaceChange = SK_TRUE;
-                }
+			DoPrintInterfaceChange = SK_TRUE;
+		}
 	
-		if ((Param.Para32[0] != pAC->ActivePort) &&
-			(pAC->RlmtNets == 1)) {
+		if ((FromPort != pAC->ActivePort)&&(pAC->RlmtNets == 1)) {
 			NewPara.Para32[0] = pAC->ActivePort;
-			NewPara.Para32[1] = Param.Para32[0];
-			SkEventQueue(pAC, SKGE_DRV, SK_DRV_SWITCH_INTERN,
-				NewPara);
+			NewPara.Para32[1] = FromPort;
+			SkEventQueue(pAC,SKGE_DRV,SK_DRV_SWITCH_INTERN,NewPara);
 		}
 
 		/* Inform the world that link protocol is up. */
-		pAC->dev[Param.Para32[0]]->flags |= IFF_RUNNING;
-
+		netif_wake_queue(pAC->dev[0]);
+		pAC->dev[FromPort]->flags |= IFF_RUNNING;
 		break;
-	case SK_DRV_NET_DOWN:	 /* SK_U32 Reason */
-		/* action list 7 */
+	case SK_DRV_NET_DOWN:	
+		Reason   = Param.Para32[0];
+		FromPort = Param.Para32[1];
 		SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_EVENT,
 			("NET DOWN EVENT "));
 		if (DoPrintInterfaceChange) {
-			printk("%s: network connection down\n", 
-				pAC->dev[Param.Para32[1]]->name);
+			if (pAC->dev[FromPort]->flags & IFF_RUNNING) {
+				printk("%s: network connection down\n", 
+					pAC->dev[FromPort]->name);
+			}
 		} else {
 			DoPrintInterfaceChange = SK_TRUE;
 		}
-		pAC->dev[Param.Para32[1]]->flags &= ~IFF_RUNNING;
+		pAC->dev[FromPort]->flags &= ~IFF_RUNNING;
 		break;
-	case SK_DRV_SWITCH_HARD: /* SK_U32 FromPortIdx SK_U32 ToPortIdx */
-		SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_EVENT,
-			("PORT SWITCH HARD "));
-	case SK_DRV_SWITCH_SOFT: /* SK_U32 FromPortIdx SK_U32 ToPortIdx */
-	/* action list 6 */
-		printk("%s: switching to port %c\n", pAC->dev[0]->name,
-			'A'+Param.Para32[1]);
-	case SK_DRV_SWITCH_INTERN: /* SK_U32 FromPortIdx SK_U32 ToPortIdx */
+	case SK_DRV_SWITCH_HARD:   /* FALL THRU */
+	case SK_DRV_SWITCH_SOFT:   /* FALL THRU */
+	case SK_DRV_SWITCH_INTERN: 
 		FromPort = Param.Para32[0];
-		ToPort = Param.Para32[1];
+		ToPort   = Param.Para32[1];
+		printk("%s: switching from port %c to port %c\n",
+			pAC->dev[0]->name, 'A'+FromPort, 'A'+ToPort);
 		SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_EVENT,
 			("PORT SWITCH EVENT, From: %d  To: %d (Pref %d) ",
 			FromPort, ToPort, pAC->Rlmt.Net[0].PrefPort));
@@ -4776,26 +5141,38 @@ SK_BOOL		DualNet;
 		spin_lock_irqsave(
 			&pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock,
 			Flags);
-		spin_lock_irqsave(
-			&pAC->TxPort[ToPort][TX_PRIO_LOW].TxDesRingLock, Flags);
-		SkGeStopPort(pAC, IoC, FromPort, SK_STOP_ALL, SK_SOFT_RST);
-		SkGeStopPort(pAC, IoC, ToPort, SK_STOP_ALL, SK_SOFT_RST);
-		spin_unlock_irqrestore(
-			&pAC->TxPort[ToPort][TX_PRIO_LOW].TxDesRingLock, Flags);
+		spin_lock(&pAC->TxPort[ToPort][TX_PRIO_LOW].TxDesRingLock);
+		if (CHIP_ID_YUKON_2(pAC)) {
+			SkY2PortStop(pAC, IoC, FromPort, SK_STOP_ALL, SK_HARD_RST);
+			SkY2PortStop(pAC, IoC, ToPort, SK_STOP_ALL, SK_HARD_RST);
+		}
+		else {
+			SkGeStopPort(pAC, IoC, FromPort, SK_STOP_ALL, SK_SOFT_RST);
+			SkGeStopPort(pAC, IoC, ToPort, SK_STOP_ALL, SK_SOFT_RST);
+		}
+		spin_unlock(&pAC->TxPort[ToPort][TX_PRIO_LOW].TxDesRingLock);
 		spin_unlock_irqrestore(
 			&pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock,
 			Flags);
 
-		ReceiveIrq(pAC, &pAC->RxPort[FromPort], SK_FALSE); /* clears rx ring */
-		ReceiveIrq(pAC, &pAC->RxPort[ToPort], SK_FALSE); /* clears rx ring */
 		
-		ClearTxRing(pAC, &pAC->TxPort[FromPort][TX_PRIO_LOW]);
-		ClearTxRing(pAC, &pAC->TxPort[ToPort][TX_PRIO_LOW]);
+		if (!CHIP_ID_YUKON_2(pAC)) {
+#ifdef CONFIG_SK98LIN_NAPI
+			WorkToDo = 1;
+			ReceiveIrq(pAC, &pAC->RxPort[FromPort], SK_FALSE, &WorkDone, WorkToDo);
+			ReceiveIrq(pAC, &pAC->RxPort[ToPort], SK_FALSE, &WorkDone, WorkToDo);
+#else
+			ReceiveIrq(pAC, &pAC->RxPort[FromPort], SK_FALSE); /* clears rx ring */
+			ReceiveIrq(pAC, &pAC->RxPort[ToPort], SK_FALSE); /* clears rx ring */
+#endif
+			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,
 			Flags);
-		spin_lock_irqsave(
-			&pAC->TxPort[ToPort][TX_PRIO_LOW].TxDesRingLock, Flags);
+		spin_lock(&pAC->TxPort[ToPort][TX_PRIO_LOW].TxDesRingLock);
 		pAC->ActivePort = ToPort;
 #if 0
 		SetQueueSizes(pAC);
@@ -4810,8 +5187,7 @@ SK_BOOL		DualNet;
 			pAC,
 			pAC->ActivePort,
 			DualNet)) {
-			spin_unlock_irqrestore(
-				&pAC->TxPort[ToPort][TX_PRIO_LOW].TxDesRingLock, Flags);
+			spin_unlock(&pAC->TxPort[ToPort][TX_PRIO_LOW].TxDesRingLock);
 			spin_unlock_irqrestore(
 				&pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock,
 				Flags);
@@ -4819,62 +5195,59 @@ SK_BOOL		DualNet;
 			break;
 		}
 #endif
-		/* tschilling: Handling of return values inserted. */
-		if (SkGeInitPort(pAC, IoC, FromPort) ||
-			SkGeInitPort(pAC, IoC, ToPort)) {
-			printk("%s: SkGeInitPort failed.\n", pAC->dev[0]->name);
+		if (!CHIP_ID_YUKON_2(pAC)) {
+			/* tschilling: Handling of return values inserted. */
+			if (SkGeInitPort(pAC, IoC, FromPort) ||
+				SkGeInitPort(pAC, IoC, ToPort)) {
+				printk("%s: SkGeInitPort failed.\n", pAC->dev[0]->name);
+			}
 		}
 		if (Event == SK_DRV_SWITCH_SOFT) {
 			SkMacRxTxEnable(pAC, IoC, FromPort);
 		}
+
 		SkMacRxTxEnable(pAC, IoC, ToPort);
 		SkAddrSwap(pAC, IoC, FromPort, ToPort);
 		SkAddrMcUpdate(pAC, IoC, FromPort);
 		SkAddrMcUpdate(pAC, IoC, ToPort);
-		PortReInitBmu(pAC, FromPort);
-		PortReInitBmu(pAC, ToPort);
-		SkGePollTxD(pAC, IoC, FromPort, SK_TRUE);
-		SkGePollTxD(pAC, IoC, ToPort, SK_TRUE);
-		ClearAndStartRx(pAC, FromPort);
-		ClearAndStartRx(pAC, ToPort);
-		spin_unlock_irqrestore(
-			&pAC->TxPort[ToPort][TX_PRIO_LOW].TxDesRingLock, Flags);
+
+		if (!CHIP_ID_YUKON_2(pAC)) {
+			PortReInitBmu(pAC, FromPort);
+			PortReInitBmu(pAC, ToPort);
+			SkGePollTxD(pAC, IoC, FromPort, SK_TRUE);
+			SkGePollTxD(pAC, IoC, ToPort, SK_TRUE);
+			CLEAR_AND_START_RX(FromPort);
+			CLEAR_AND_START_RX(ToPort);
+		} else {
+			SkY2PortStart(pAC, IoC, FromPort);
+			SkY2PortStart(pAC, IoC, ToPort);
+		}
+		spin_unlock(&pAC->TxPort[ToPort][TX_PRIO_LOW].TxDesRingLock);
 		spin_unlock_irqrestore(
 			&pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock,
 			Flags);
 		break;
 	case SK_DRV_RLMT_SEND:	 /* SK_MBUF *pMb */
-		SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_EVENT,
-			("RLS "));
+		SK_DBG_MSG(NULL,SK_DBGMOD_DRV,SK_DBGCAT_DRV_EVENT,("RLS "));
 		pRlmtMbuf = (SK_MBUF*) Param.pParaPtr;
 		pMsg = (struct sk_buff*) pRlmtMbuf->pOs;
 		skb_put(pMsg, pRlmtMbuf->Length);
-		if (XmitFrame(pAC, &pAC->TxPort[pRlmtMbuf->PortIdx][TX_PRIO_LOW],
-			pMsg) < 0)
-
-			DEV_KFREE_SKB_ANY(pMsg);
+		if (!CHIP_ID_YUKON_2(pAC)) {
+			if (XmitFrame(pAC, &pAC->TxPort[pRlmtMbuf->PortIdx][TX_PRIO_LOW],
+				pMsg) < 0) {
+				DEV_KFREE_SKB_ANY(pMsg);
+			}
+		} else {
+			if (SkY2RlmtSend(pAC, pRlmtMbuf->PortIdx, pMsg) < 0) {
+				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
-			*/
+			/* check what IRQs are to be moderated */
 			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_FALSE);
-			}
-			ReceiveIrq(pAC, &pAC->RxPort[0], SK_FALSE);
 		} else {
 			printk("Expiration of unknown timer\n");
 		}
@@ -4938,8 +5311,6 @@ char	ClassStr[80];
 
 } /* SkErrorLog */
 
-#ifdef SK_DIAG_SUPPORT
-
 /*****************************************************************************
  *
  *	SkDrvEnterDiagMode - handles DIAG attach request
@@ -5007,16 +5378,16 @@ SK_AC   *pAc)   /* pointer to adapter co
 			sizeof(SK_PNMI_STRUCT_DATA));
 	pAc->DiagModeActive    = DIAG_NOTACTIVE;
 	pAc->Pnmi.DiagAttached = SK_DIAG_IDLE;
-        if (pAc->WasIfUp[0] == SK_TRUE) {
-                pAc->DiagFlowCtrl = SK_TRUE; /* for SkGeClose */
+	if (pAc->WasIfUp[0] == SK_TRUE) {
+		pAc->DiagFlowCtrl = SK_TRUE; /* for SkGeClose */
 		DoPrintInterfaceChange = SK_FALSE;
-                SkDrvInitAdapter(pAc, 0);    /* first device  */
-        }
-        if (pAc->WasIfUp[1] == SK_TRUE) {
-                pAc->DiagFlowCtrl = SK_TRUE; /* for SkGeClose */
+		SkDrvInitAdapter(pAc, 0);    /* first device  */
+	}
+	if (pAc->WasIfUp[1] == SK_TRUE) {
+		pAc->DiagFlowCtrl = SK_TRUE; /* for SkGeClose */
 		DoPrintInterfaceChange = SK_FALSE;
-                SkDrvInitAdapter(pAc, 1);    /* second device */
-        }
+		SkDrvInitAdapter(pAc, 1);    /* second device */
+	}
 	return(0);
 }
 
@@ -5159,14 +5530,25 @@ int      devNbr)	/* what device is to be
 
 } /* SkDrvInitAdapter */
 
-#endif
+static int __init sk98lin_init(void)
+{
+	return pci_module_init(&sk98lin_driver);
+}
+
+static void __exit sk98lin_cleanup(void)
+{
+	pci_unregister_driver(&sk98lin_driver);
+}
+
+module_init(sk98lin_init);
+module_exit(sk98lin_cleanup);
+
 
 #ifdef DEBUG
 /****************************************************************************/
 /* "debug only" section *****************************************************/
 /****************************************************************************/
 
-
 /*****************************************************************************
  *
  *	DumpMsg - print a frame
@@ -5177,9 +5559,11 @@ int      devNbr)	/* what device is to be
  * Returns: N/A
  *	
  */
-static void DumpMsg(struct sk_buff *skb, char *str)
+static void DumpMsg(
+struct sk_buff *skb,  /* linux' socket buffer  */
+char           *str)  /* additional msg string */
 {
-	int	msglen;
+	int msglen = (skb->len > 64) ? 64 : skb->len;
 
 	if (skb == NULL) {
 		printk("DumpMsg(): NULL-Message\n");
@@ -5191,19 +5575,14 @@ static void DumpMsg(struct sk_buff *skb,
 		return;
 	}
 
-	msglen = skb->len;
-	if (msglen > 64)
-		msglen = 64;
-
-	printk("--- Begin of message from %s , len %d (from %d) ----\n", str, msglen, skb->len);
-
+	printk("DumpMsg: PhysPage: %p\n", 
+		page_address(virt_to_page(skb->data)));
+	printk("--- Begin of message from %s , len %d (from %d) ----\n", 
+		str, msglen, skb->len);
 	DumpData((char *)skb->data, msglen);
-
 	printk("------- End of message ---------\n");
 } /* DumpMsg */
 
-
-
 /*****************************************************************************
  *
  *	DumpData - print a data area
@@ -5215,23 +5594,22 @@ static void DumpMsg(struct sk_buff *skb,
  * Returns: N/A
  *	
  */
-static void DumpData(char *p, int size)
-{
-register int    i;
-int	haddr, addr;
-char	hex_buffer[180];
-char	asc_buffer[180];
-char	HEXCHAR[] = "0123456789ABCDEF";
-
-	addr = 0;
-	haddr = 0;
-	hex_buffer[0] = 0;
-	asc_buffer[0] = 0;
+static void DumpData(
+char  *p,     /* pointer to area containing the data */
+int    size)  /* the size of that data area in bytes */
+{
+	register int  i;
+	int           haddr = 0, addr = 0;
+	char          hex_buffer[180] = { '\0' };
+	char          asc_buffer[180] = { '\0' };
+	char          HEXCHAR[] = "0123456789ABCDEF";
+
 	for (i=0; i < size; ) {
-		if (*p >= '0' && *p <='z')
+		if (*p >= '0' && *p <='z') {
 			asc_buffer[addr] = *p;
-		else
+		} else {
 			asc_buffer[addr] = '.';
+		}
 		addr++;
 		asc_buffer[addr] = 0;
 		hex_buffer[haddr] = HEXCHAR[(*p & 0xf0) >> 4];
@@ -5257,27 +5635,24 @@ 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 long variable to the system logfile/to the
  *	console.
  *
  * Returns: N/A
  *	
  */
-static void DumpLong(char *pc, int size)
-{
-register int    i;
-int	haddr, addr;
-char	hex_buffer[180];
-char	asc_buffer[180];
-char	HEXCHAR[] = "0123456789ABCDEF";
-long	*p;
-int	l;
-
-	addr = 0;
-	haddr = 0;
-	hex_buffer[0] = 0;
-	asc_buffer[0] = 0;
-	p = (long*) pc;
+static void DumpLong(
+char  *pc,    /* location of the variable to print */
+int    size)  /* how large is the variable?        */
+{
+	register int   i;
+	int            haddr = 0, addr = 0;
+	char           hex_buffer[180] = { '\0' };
+	char           asc_buffer[180] = { '\0' };
+	char           HEXCHAR[] = "0123456789ABCDEF";
+	long          *p = (long*) pc;
+	int            l;
+
 	for (i=0; i < size; ) {
 		l = (long) *p;
 		hex_buffer[haddr] = HEXCHAR[(l >> 28) & 0xf];
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/skgehwt.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/skgehwt.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/skgehwt.c	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/skgehwt.c	2004-09-09 13:20:48.000000000 +0200
@@ -2,8 +2,8 @@
  *
  * Name:	skgehwt.c
  * Project:	Gigabit Ethernet Adapters, Event Scheduler Module
- * Version:	$Revision: 1.15 $
- * Date:	$Date: 2003/09/16 13:41:23 $
+ * Version:	$Revision: 2.2 $
+ * Date:	$Date: 2004/05/28 13:39:04 $
  * Purpose:	Hardware Timer
  *
  ******************************************************************************/
@@ -11,7 +11,7 @@
 /******************************************************************************
  *
  *	(C)Copyright 1998-2002 SysKonnect GmbH.
- *	(C)Copyright 2002-2003 Marvell.
+ *	(C)Copyright 2002-2004 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,7 +27,7 @@
  */
 #if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
 static const char SysKonnectFileId[] =
-	"@(#) $Id: skgehwt.c,v 1.15 2003/09/16 13:41:23 rschmidt Exp $ (C) Marvell.";
+	"@(#) $Id: skgehwt.c,v 2.2 2004/05/28 13:39:04 rschmidt Exp $ (C) Marvell.";
 #endif
 
 #include "h/skdrv1st.h"		/* Driver Specific Definitions */
@@ -44,10 +44,10 @@ intro()
 /*
  * Prototypes of local functions.
  */
-#define	SK_HWT_MAX	(65000)
+#define	SK_HWT_MAX	65000UL * 160		/* ca. 10 sec. */
 
 /* correction factor */
-#define	SK_HWT_FAC	(1000 * (SK_U32)pAC->GIni.GIHstClkFact / 100)
+#define	SK_HWT_FAC	(10 * (SK_U32)pAC->GIni.GIHstClkFact / 16)
 
 /*
  * Initialize hardware timer.
@@ -73,29 +73,21 @@ SK_IOC	Ioc)	/* IoContext */
 void	SkHwtStart(
 SK_AC	*pAC,	/* Adapters context */
 SK_IOC	Ioc,	/* IoContext */
-SK_U32	Time)	/* Time in units of 16us to load the timer with. */
+SK_U32	Time)	/* Time in usec to load the timer */
 {
-	SK_U32	Cnt;
-
 	if (Time > SK_HWT_MAX)
 		Time = SK_HWT_MAX;
 
 	pAC->Hwt.TStart = Time;
 	pAC->Hwt.TStop = 0L;
 
-	Cnt = Time;
-
-	/*
-	 * if time < 16 us
-	 *	time = 16 us
-	 */
-	if (!Cnt) {
-		Cnt++;
+	if (!Time) {
+		Time = 1L;
 	}
 
-	SK_OUT32(Ioc, B2_TI_INI, Cnt * SK_HWT_FAC);
-	
-	SK_OUT16(Ioc, B2_TI_CTRL, TIM_START);	/* Start timer. */
+	SK_OUT32(Ioc, B2_TI_INI, Time * SK_HWT_FAC);
+
+	SK_OUT16(Ioc, B2_TI_CTRL, TIM_START);	/* Start timer */
 
 	pAC->Hwt.TActive = SK_TRUE;
 }
@@ -109,13 +101,12 @@ SK_AC	*pAC,	/* Adapters context */
 SK_IOC	Ioc)	/* IoContext */
 {
 	SK_OUT16(Ioc, B2_TI_CTRL, TIM_STOP);
-	
+
 	SK_OUT16(Ioc, B2_TI_CTRL, TIM_CLR_IRQ);
 
 	pAC->Hwt.TActive = SK_FALSE;
 }
 
-
 /*
  *	Stop hardware timer and read time elapsed since last start.
  *
@@ -129,6 +120,9 @@ SK_IOC	Ioc)	/* IoContext */
 {
 	SK_U32	TRead;
 	SK_U32	IStatus;
+	SK_U32	TimerInt;
+
+	TimerInt = CHIP_ID_YUKON_2(pAC) ? Y2_IS_TIMINT : IS_TIMINT;
 
 	if (pAC->Hwt.TActive) {
 		
@@ -139,15 +133,15 @@ SK_IOC	Ioc)	/* IoContext */
 
 		SK_IN32(Ioc, B0_ISRC, &IStatus);
 
-		/* Check if timer expired (or wraped around) */
-		if ((TRead > pAC->Hwt.TStart) || (IStatus & IS_TIMINT)) {
-			
+		/* Check if timer expired (or wrapped around) */
+		if ((TRead > pAC->Hwt.TStart) || ((IStatus & TimerInt) != 0)) {
+
 			SkHwtStop(pAC, Ioc);
-			
+
 			pAC->Hwt.TStop = pAC->Hwt.TStart;
 		}
 		else {
-			
+
 			pAC->Hwt.TStop = pAC->Hwt.TStart - TRead;
 		}
 	}
@@ -162,9 +156,9 @@ SK_AC	*pAC,	/* Adapters context */
 SK_IOC	Ioc)	/* IoContext */
 {
 	SkHwtStop(pAC, Ioc);
-	
+
 	pAC->Hwt.TStop = pAC->Hwt.TStart;
-	
+
 	SkTimerDone(pAC, Ioc);
 }
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/skgeinit.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/skgeinit.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/skgeinit.c	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/skgeinit.c	2004-09-09 13:20:48.000000000 +0200
@@ -2,8 +2,8 @@
  *
  * Name:	skgeinit.c
  * Project:	Gigabit Ethernet Adapters, Common Modules
- * Version:	$Revision: 1.99 $
- * Date:	$Date: 2004/01/20 13:11:23 $
+ * Version:	$Revision: 2.56 $
+ * Date:	$Date: 2004/08/13 09:38:27 $
  * Purpose:	Contains functions to initialize the adapter
  *
  ******************************************************************************/
@@ -11,13 +11,12 @@
 /******************************************************************************
  *
  *	(C)Copyright 1998-2002 SysKonnect.
- *	(C)Copyright 2002-2003 Marvell.
+ *	(C)Copyright 2002-2004 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
  *	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.
  *
  ******************************************************************************/
@@ -31,7 +30,7 @@
 
 #if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
 static const char SysKonnectFileId[] =
-	"@(#) $Id: skgeinit.c,v 1.99 2004/01/20 13:11:23 rschmidt Exp $ (C) Marvell.";
+	"@(#) $Id: skgeinit.c,v 2.56 2004/08/13 09:38:27 rschmidt Exp $ (C) Marvell.";
 #endif
 
 struct s_QOffTab {
@@ -59,6 +58,101 @@ static struct s_Config OemConfig = {
 
 /******************************************************************************
  *
+ *	SkGePortVlan() -	Enable / Disable VLAN support
+ *
+ * Description:
+ *	Enable or disable the VLAN support of the selected port.
+ *	The new configuration is *not* saved over any SkGeStopPort() and
+ *	SkGeInitPort() calls.
+ *	Currently this function is only supported on Yukon-2/EC adapters.
+ *
+ * Returns:
+ *	nothing
+ */
+void SkGePortVlan(
+SK_AC	*pAC,	/* Adapter Context */
+SK_IOC	IoC,	/* I/O Context */
+int		Port,	/* Port number */
+SK_BOOL	Enable)	/* Flag */
+{
+	if (CHIP_ID_YUKON_2(pAC)) {
+		if (Enable) {
+			SK_OUT32(IoC, MR_ADDR(Port, RX_GMF_CTRL_T), RX_VLAN_STRIP_ON);
+			SK_OUT32(IoC, MR_ADDR(Port, TX_GMF_CTRL_T), TX_VLAN_TAG_ON);
+		}
+		else {
+			SK_OUT32(IoC, MR_ADDR(Port, RX_GMF_CTRL_T), RX_VLAN_STRIP_OFF);
+			SK_OUT32(IoC, MR_ADDR(Port, TX_GMF_CTRL_T), TX_VLAN_TAG_OFF);
+		}
+	}
+}
+
+
+/******************************************************************************
+ *
+ *	SkGeRxRss() -	Enable / Disable RSS Hash Calculation
+ *
+ * Description:
+ *	Enable or disable the RSS hash calculation of the selected port.
+ *	The new configuration is *not* saved over any SkGeStopPort() and
+ *	SkGeInitPort() calls.
+ *	Currently this function is only supported on Yukon-2/EC adapters.
+ *
+ * Returns:
+ *	nothing
+ */
+void SkGeRxRss(
+SK_AC	*pAC,	/* Adapter Context */
+SK_IOC	IoC,	/* I/O Context */
+int		Port,	/* Port number */
+SK_BOOL	Enable)	/* Flag */
+{
+	if (CHIP_ID_YUKON_2(pAC)) {
+		if (Enable) {
+			SK_OUT32(IoC, Q_ADDR(pAC->GIni.GP[Port].PRxQOff, Q_CSR),
+				BMU_ENA_RX_RSS_HASH);
+		}
+		else {
+			SK_OUT32(IoC, Q_ADDR(pAC->GIni.GP[Port].PRxQOff, Q_CSR),
+				BMU_DIS_RX_RSS_HASH);
+		}
+	}
+}
+
+/******************************************************************************
+ *
+ *	SkGeRxCsum() -	Enable / Disable Receive Checksum
+ *
+ * Description:
+ *	Enable or disable the checksum of the selected port.
+ *	The new configuration is *not* saved over any SkGeStopPort() and
+ *	SkGeInitPort() calls.
+ *	Currently this function is only supported on Yukon-2/EC adapters.
+ *
+ * Returns:
+ *	nothing
+ */
+void SkGeRxCsum(
+SK_AC	*pAC,	/* Adapter Context */
+SK_IOC	IoC,	/* I/O Context */
+int		Port,	/* Port number */
+SK_BOOL	Enable)	/* Flag */
+{
+	if (CHIP_ID_YUKON_2(pAC)) {
+		if (Enable) {
+			SK_OUT32(IoC, Q_ADDR(pAC->GIni.GP[Port].PRxQOff, Q_CSR),
+				BMU_ENA_RX_CHKSUM);
+		}
+		else {
+			SK_OUT32(IoC, Q_ADDR(pAC->GIni.GP[Port].PRxQOff, Q_CSR),
+				BMU_DIS_RX_CHKSUM);
+		}
+	}
+}
+
+
+/******************************************************************************
+ *
  *	SkGePollRxD() - Enable / Disable Descriptor Polling of RxD Ring
  *
  * Description:
@@ -71,8 +165,8 @@ static struct s_Config OemConfig = {
  *	nothing
  */
 void SkGePollRxD(
-SK_AC	*pAC,		/* adapter context */
-SK_IOC	IoC,		/* I/O context */
+SK_AC	*pAC,		/* Adapter Context */
+SK_IOC	IoC,		/* I/O Context */
 int		Port,		/* Port Index (MAC_1 + n) */
 SK_BOOL PollRxD)	/* SK_TRUE (enable pol.), SK_FALSE (disable pol.) */
 {
@@ -99,8 +193,8 @@ SK_BOOL PollRxD)	/* SK_TRUE (enable pol.
  *	nothing
  */
 void SkGePollTxD(
-SK_AC	*pAC,		/* adapter context */
-SK_IOC	IoC,		/* I/O context */
+SK_AC	*pAC,		/* Adapter Context */
+SK_IOC	IoC,		/* I/O Context */
 int		Port,		/* Port Index (MAC_1 + n) */
 SK_BOOL PollTxD)	/* SK_TRUE (enable pol.), SK_FALSE (disable pol.) */
 {
@@ -114,7 +208,7 @@ SK_BOOL PollTxD)	/* SK_TRUE (enable pol.
 	if (pPrt->PXSQSize != 0) {
 		SK_OUT32(IoC, Q_ADDR(pPrt->PXsQOff, Q_CSR), DWord);
 	}
-	
+
 	if (pPrt->PXAQSize != 0) {
 		SK_OUT32(IoC, Q_ADDR(pPrt->PXaQOff, Q_CSR), DWord);
 	}
@@ -135,8 +229,8 @@ SK_BOOL PollTxD)	/* SK_TRUE (enable pol.
  *	nothing
  */
 void SkGeYellowLED(
-SK_AC	*pAC,		/* adapter context */
-SK_IOC	IoC,		/* I/O context */
+SK_AC	*pAC,		/* Adapter Context */
+SK_IOC	IoC,		/* I/O Context */
 int		State)		/* yellow LED state, 0 = OFF, 0 != ON */
 {
 	if (State == 0) {
@@ -169,8 +263,8 @@ int		State)		/* yellow LED state, 0 = OF
  *	nothing
  */
 void SkGeXmitLED(
-SK_AC	*pAC,		/* adapter context */
-SK_IOC	IoC,		/* I/O context */
+SK_AC	*pAC,		/* Adapter Context */
+SK_IOC	IoC,		/* I/O Context */
 int		Led,		/* offset to the LED Init Value register */
 int		Mode)		/* Mode may be SK_LED_DIS, SK_LED_ENA, SK_LED_TST */
 {
@@ -227,7 +321,7 @@ int		Mode)		/* Mode may be SK_LED_DIS, S
  *	1:	configuration error
  */
 static int DoCalcAddr(
-SK_AC		*pAC, 				/* adapter context */
+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 */
@@ -262,6 +356,33 @@ SK_U32		SK_FAR *QuEndAddr)	/* end addres
 	return(Rtv);
 }	/* DoCalcAddr */
 
+/******************************************************************************
+ *
+ *	SkGeRoundQueueSize() - Round the given queue size to the adpaters QZ units
+ *
+ * Description:
+ *	This function rounds the given queue size in kBs to adapter specific
+ *	queue size units (Genesis and Yukon: 8kB, Yukon-2/EC 1kB).
+ *
+ * Returns:
+ *	the rounded queue size in kB	
+ */
+static int SkGeRoundQueueSize(
+SK_AC	*pAC,		/* Adapter Context */
+int	QueueSizeKB)	/* Queue size in kB */
+{
+	int QueueSizeSteps;
+
+	if (CHIP_ID_YUKON_2(pAC)) {
+		QueueSizeSteps = QZ_STEP_Y2;
+	}
+	else {
+		QueueSizeSteps = QZ_STEP;
+	}
+
+	return ((QueueSizeKB + QueueSizeSteps-1) & ~(QueueSizeSteps-1));
+}	/* SkGeRoundQueueSize */
+
 
 /******************************************************************************
  *
@@ -270,7 +391,7 @@ SK_U32		SK_FAR *QuEndAddr)	/* end addres
  * Description:
  *	This function assigns the memory to the different queues and ports.
  *	When DualNet is set to SK_TRUE all ports get the same amount of memory.
- *  Otherwise the first port gets most of the memory and all the
+ *	Otherwise the first port gets most of the memory and all the
  *	other ports just the required minimum.
  *	This function can only be called when pAC->GIni.GIRamSize and
  *	pAC->GIni.GIMacsFound have been initialized, usually this happens
@@ -283,28 +404,38 @@ SK_U32		SK_FAR *QuEndAddr)	/* end addres
  */
 
 int SkGeInitAssignRamToQueues(
-SK_AC	*pAC,			/* Adapter context */
+SK_AC	*pAC,			/* Adapter Context */
 int		ActivePort,		/* Active Port in RLMT mode */
-SK_BOOL	DualNet)		/* adapter context */
+SK_BOOL	DualNet)		/* Dual Net active */
 {
 	int	i;
 	int	UsedKilobytes;			/* memory already assigned */
 	int	ActivePortKilobytes;	/* memory available for active port */
+	int MinQueueSize;			/* min. memory for queues */
 	SK_GEPORT *pGePort;
 
 	UsedKilobytes = 0;
 
 	if (ActivePort >= pAC->GIni.GIMacsFound) {
+
 		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_INIT,
 			("SkGeInitAssignRamToQueues: ActivePort (%d) invalid\n",
 			ActivePort));
 		return(1);
 	}
-	if (((pAC->GIni.GIMacsFound * (SK_MIN_RXQ_SIZE + SK_MIN_TXQ_SIZE)) +
-		((RAM_QUOTA_SYNC == 0) ? 0 : SK_MIN_TXQ_SIZE)) > pAC->GIni.GIRamSize) {
+
+	MinQueueSize = SK_MIN_RXQ_SIZE + SK_MIN_TXQ_SIZE;
+
+	if (MinQueueSize > pAC->GIni.GIRamSize) {
+		MinQueueSize = pAC->GIni.GIRamSize;
+	}
+
+	if ((pAC->GIni.GIMacsFound * MinQueueSize +
+		 RAM_QUOTA_SYNC * SK_MIN_TXQ_SIZE) > pAC->GIni.GIRamSize) {
+
 		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_INIT,
 			("SkGeInitAssignRamToQueues: Not enough memory (%d)\n",
-			 pAC->GIni.GIRamSize));
+			pAC->GIni.GIRamSize));
 		return(2);
 	}
 
@@ -316,11 +447,11 @@ SK_BOOL	DualNet)		/* adapter context */
 			pGePort = &pAC->GIni.GP[i];
 
 			/* take away the minimum memory for active queues */
-			ActivePortKilobytes -= (SK_MIN_RXQ_SIZE + SK_MIN_TXQ_SIZE);
+			ActivePortKilobytes -= MinQueueSize;
 
 			/* receive queue gets the minimum + 80% of the rest */
-			pGePort->PRxQSize = (int)ROUND_QUEUE_SIZE_KB((
-				(long)ActivePortKilobytes * RAM_QUOTA_RX) / 100)
+			pGePort->PRxQSize = SkGeRoundQueueSize(pAC,
+				(int)((long)ActivePortKilobytes * RAM_QUOTA_RX) / 100)
 				+ SK_MIN_RXQ_SIZE;
 
 			ActivePortKilobytes -= (pGePort->PRxQSize - SK_MIN_RXQ_SIZE);
@@ -329,8 +460,8 @@ SK_BOOL	DualNet)		/* adapter context */
 			pGePort->PXSQSize = 0;
 
 			/* asynchronous transmit queue */
-			pGePort->PXAQSize = (int)ROUND_QUEUE_SIZE_KB(ActivePortKilobytes +
-				SK_MIN_TXQ_SIZE);
+			pGePort->PXAQSize = SkGeRoundQueueSize(pAC,
+				ActivePortKilobytes + SK_MIN_TXQ_SIZE);
 		}
 	}
 	else {
@@ -355,21 +486,22 @@ SK_BOOL	DualNet)		/* adapter context */
 
 		/* assign it to the active port */
 		/* first take away the minimum memory */
-		ActivePortKilobytes -= (SK_MIN_RXQ_SIZE + SK_MIN_TXQ_SIZE);
+		ActivePortKilobytes -= MinQueueSize;
 		pGePort = &pAC->GIni.GP[ActivePort];
 
 		/* receive queue get's the minimum + 80% of the rest */
-		pGePort->PRxQSize = (int)ROUND_QUEUE_SIZE_KB((ActivePortKilobytes *
-			(long)RAM_QUOTA_RX) / 100) + SK_MIN_RXQ_SIZE;
+		pGePort->PRxQSize = SkGeRoundQueueSize(pAC,
+			(int)((long)ActivePortKilobytes * RAM_QUOTA_RX) / 100) +
+			MinQueueSize/2;
 
-		ActivePortKilobytes -= (pGePort->PRxQSize - SK_MIN_RXQ_SIZE);
+		ActivePortKilobytes -= (pGePort->PRxQSize - MinQueueSize/2);
 
 		/* synchronous transmit queue */
 		pGePort->PXSQSize = 0;
 
 		/* asynchronous transmit queue */
-		pGePort->PXAQSize = (int)ROUND_QUEUE_SIZE_KB(ActivePortKilobytes) +
-			SK_MIN_TXQ_SIZE;
+		pGePort->PXAQSize = SkGeRoundQueueSize(pAC, ActivePortKilobytes) +
+			MinQueueSize/2;
 	}
 
 	return(0);
@@ -386,12 +518,12 @@ SK_BOOL	DualNet)		/* adapter context */
  *	used ports.
  *	This requirements must be fullfilled to have a valid configuration:
  *		- The size of all queues must not exceed GIRamSize.
- *		- The queue sizes must be specified in units of 8 kB.
+ *		- The queue sizes must be specified in units of 8 kB (Genesis & Yukon).
  *		- The size of Rx queues of available ports must not be
- *		  smaller than 16 kB.
+ *		  smaller than 16 kB (Genesis & Yukon) resp. 10 kB (Yukon-2).
  *		- The size of at least one Tx queue (synch. or asynch.)
- *        of available ports must not be smaller than 16 kB
- *        when Jumbo Frames are used.
+ *		  of available ports must not be smaller than 16 kB (Genesis & Yukon),
+ *		  resp. 10 kB (Yukon-2) when Jumbo Frames are used.
  *		- The RAM start and end addresses must not be changed
  *		  for ports which are already initialized.
  *	Furthermore SkGeCheckQSize() defines the Start and End Addresses
@@ -402,7 +534,7 @@ SK_BOOL	DualNet)		/* adapter context */
  *	1:	Queue Size Configuration invalid
  */
 static int SkGeCheckQSize(
-SK_AC	 *pAC,		/* adapter context */
+SK_AC	 *pAC,		/* Adapter Context */
 int		 Port)		/* port index */
 {
 	SK_GEPORT *pPrt;
@@ -419,18 +551,24 @@ int		 Port)		/* port index */
 #ifndef SK_SLIM
 
 	UsedMem = 0;
+	Rtv = 0;
 	for (i = 0; i < pAC->GIni.GIMacsFound; i++) {
 		pPrt = &pAC->GIni.GP[i];
 
-		if ((pPrt->PRxQSize & QZ_UNITS) != 0 ||
-			(pPrt->PXSQSize & QZ_UNITS) != 0 ||
-			(pPrt->PXAQSize & QZ_UNITS) != 0) {
+		if (CHIP_ID_YUKON_2(pAC)) {
+			UsedMem = 0;
+		}
+		else if (((pPrt->PRxQSize & QZ_UNITS) != 0 ||
+				  (pPrt->PXSQSize & QZ_UNITS) != 0 ||
+				  (pPrt->PXAQSize & QZ_UNITS) != 0)) {
 
 			SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E012, SKERR_HWI_E012MSG);
 			return(1);
 		}
 
-		if (i == Port && pPrt->PRxQSize < SK_MIN_RXQ_SIZE) {
+#ifndef SK_DIAG
+		if (i == Port && pAC->GIni.GIRamSize > SK_MIN_RXQ_SIZE &&
+			pPrt->PRxQSize < SK_MIN_RXQ_SIZE) {
 			SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E011, SKERR_HWI_E011MSG);
 			return(1);
 		}
@@ -441,11 +579,12 @@ int		 Port)		/* port index */
 		 */
 		if ((i == Port && pPrt->PXSQSize == 0 && pPrt->PXAQSize == 0) ||
 			(pAC->GIni.GIPortUsage == SK_JUMBO_LINK &&
-            ((pPrt->PXSQSize > 0 && pPrt->PXSQSize < SK_MIN_TXQ_SIZE) ||
+			((pPrt->PXSQSize > 0 && pPrt->PXSQSize < SK_MIN_TXQ_SIZE) ||
 			 (pPrt->PXAQSize > 0 && pPrt->PXAQSize < SK_MIN_TXQ_SIZE)))) {
 				SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E023, SKERR_HWI_E023MSG);
 				return(1);
 		}
+#endif /* !SK_DIAG */
 
 		UsedMem += pPrt->PRxQSize + pPrt->PXSQSize + pPrt->PXAQSize;
 	}
@@ -461,6 +600,14 @@ int		 Port)		/* port index */
 	for (i = 0; i < pAC->GIni.GIMacsFound; i++) {
 		pPrt = &pAC->GIni.GP[i];
 
+		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_INIT,
+			("Port %d: RxQSize=%u, TxAQSize=%u, TxSQSize=%u\n",
+			i, pPrt->PRxQSize, pPrt->PXAQSize, pPrt->PXSQSize));
+
+		if (CHIP_ID_YUKON_2(pAC)) {
+			StartAddr = 0;
+		}
+
 		/* Calculate/Check values for the receive queue */
 		Rtv2 = DoCalcAddr(pAC, pPrt, pPrt->PRxQSize, &StartAddr,
 			&pPrt->PRxQRamStart, &pPrt->PRxQRamEnd);
@@ -500,8 +647,8 @@ int		 Port)		/* port index */
  *	nothing
  */
 static void SkGeInitMacArb(
-SK_AC	*pAC,		/* adapter context */
-SK_IOC	IoC)		/* I/O context */
+SK_AC	*pAC,		/* Adapter Context */
+SK_IOC	IoC)		/* I/O Context */
 {
 	/* release local reset */
 	SK_OUT16(IoC, B3_MA_TO_CTRL, MA_RST_CLR);
@@ -540,8 +687,8 @@ SK_IOC	IoC)		/* I/O context */
  *	nothing
  */
 static void SkGeInitPktArb(
-SK_AC	*pAC,		/* adapter context */
-SK_IOC	IoC)		/* I/O context */
+SK_AC	*pAC,		/* Adapter Context */
+SK_IOC	IoC)		/* I/O Context */
 {
 	/* release local reset */
 	SK_OUT16(IoC, B3_PA_CTRL, PA_RST_CLR);
@@ -580,8 +727,8 @@ SK_IOC	IoC)		/* I/O context */
  *	nothing
  */
 static void SkGeInitMacFifo(
-SK_AC	*pAC,		/* adapter context */
-SK_IOC	IoC,		/* I/O context */
+SK_AC	*pAC,		/* Adapter Context */
+SK_IOC	IoC,		/* I/O Context */
 int		Port)		/* Port Index (MAC_1 + n) */
 {
 	SK_U16	Word;
@@ -614,8 +761,6 @@ int		Port)		/* Port Index (MAC_1 + n) */
 
 #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);
 
 		Word = (SK_U16)GMF_RX_CTRL_DEF;
 
@@ -625,14 +770,23 @@ int		Port)		/* Port Index (MAC_1 + n) */
 			Word &= ~GMF_RX_F_FL_ON;
 		}
 
-		/* Configure Rx MAC FIFO */
+		/* Configure Rx GMAC FIFO */
 		SK_OUT8(IoC, MR_ADDR(Port, RX_GMF_CTRL_T), (SK_U8)GMF_RST_CLR);
 		SK_OUT16(IoC, MR_ADDR(Port, RX_GMF_CTRL_T), Word);
 
-		/* set Rx GMAC FIFO Flush Threshold (default: 0x0a -> 56 bytes) */
-		SK_OUT16(IoC, MR_ADDR(Port, RX_GMF_FL_THR), RX_GMF_FL_THR_DEF);
+		/* set Rx GMAC FIFO Flush Mask (after clearing reset) */
+		SK_OUT16(IoC, MR_ADDR(Port, RX_GMF_FL_MSK), (SK_U16)RX_FF_FL_DEF_MSK);
+
+		Word = (SK_U16)RX_GMF_FL_THR_DEF;	/* default: 0x0a -> 56 bytes) */
 
-		/* Configure Tx MAC FIFO */
+		if (pAC->GIni.GIAsfEnabled) {
+			Word -= 2;						/* for ASF: 0x08 -> 40 bytes) */
+		}
+
+		/* set Rx GMAC FIFO Flush Threshold (after clearing reset) */
+		SK_OUT16(IoC, MR_ADDR(Port, RX_GMF_FL_THR), Word);
+
+		/* Configure Tx GMAC FIFO */
 		SK_OUT8(IoC, MR_ADDR(Port, TX_GMF_CTRL_T), (SK_U8)GMF_RST_CLR);
 		SK_OUT16(IoC, MR_ADDR(Port, TX_GMF_CTRL_T), (SK_U16)GMF_TX_CTRL_DEF);
 
@@ -664,8 +818,8 @@ int		Port)		/* Port Index (MAC_1 + n) */
  *	nothing
  */
 void SkGeLoadLnkSyncCnt(
-SK_AC	*pAC,		/* adapter context */
-SK_IOC	IoC,		/* I/O context */
+SK_AC	*pAC,		/* Adapter Context */
+SK_IOC	IoC,		/* I/O Context */
 int		Port,		/* Port Index (MAC_1 + n) */
 SK_U32	CntVal)		/* Counter value */
 {
@@ -752,8 +906,8 @@ SK_U32	CntVal)		/* Counter value */
  *		synchronous queue is configured
  */
 int SkGeCfgSync(
-SK_AC	*pAC,		/* adapter context */
-SK_IOC	IoC,		/* I/O context */
+SK_AC	*pAC,		/* Adapter Context */
+SK_IOC	IoC,		/* I/O Context */
 int		Port,		/* Port Index (MAC_1 + n) */
 SK_U32	IntTime,	/* Interval Timer Value in units of 8ns */
 SK_U32	LimCount,	/* Number of bytes to transfer during IntTime */
@@ -825,9 +979,9 @@ int		SyncMode)	/* Sync Mode: TXA_ENA_ALL
  * Returns:
  *	nothing
  */
-static void DoInitRamQueue(
-SK_AC	*pAC,			/* adapter context */
-SK_IOC	IoC,			/* I/O context */
+void DoInitRamQueue(
+SK_AC	*pAC,			/* Adapter Context */
+SK_IOC	IoC,			/* I/O Context */
 int		QuIoOffs,		/* Queue I/O Address Offset */
 SK_U32	QuStartAddr,	/* Queue Start Address */
 SK_U32	QuEndAddr,		/* Queue End Address */
@@ -904,8 +1058,8 @@ int		QuType)			/* Queue Type (SK_RX_SRAM
  *	nothing
  */
 static void SkGeInitRamBufs(
-SK_AC	*pAC,		/* adapter context */
-SK_IOC	IoC,		/* I/O context */
+SK_AC	*pAC,		/* Adapter Context */
+SK_IOC	IoC,		/* I/O Context */
 int		Port)		/* Port Index (MAC_1 + n) */
 {
 	SK_GEPORT *pPrt;
@@ -913,7 +1067,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
 
 	pPrt = &pAC->GIni.GP[Port];
 
-	if (pPrt->PRxQSize == SK_MIN_RXQ_SIZE) {
+	if (pPrt->PRxQSize <= SK_MIN_RXQ_SIZE) {
 		RxQType = SK_RX_SRAM_Q; 	/* small Rx Queue */
 	}
 	else {
@@ -946,26 +1100,37 @@ int		Port)		/* Port Index (MAC_1 + n) */
  *	nothing
  */
 void SkGeInitRamIface(
-SK_AC	*pAC,		/* adapter context */
-SK_IOC	IoC)		/* I/O context */
+SK_AC	*pAC,		/* Adapter Context */
+SK_IOC	IoC)		/* I/O Context */
 {
-	/* release local reset */
-	SK_OUT16(IoC, B3_RI_CTRL, RI_RST_CLR);
+	int i;
+	int RamBuffers;
 
-	/* configure timeout values */
-	SK_OUT8(IoC, B3_RI_WTO_R1, SK_RI_TO_53);
-	SK_OUT8(IoC, B3_RI_WTO_XA1, SK_RI_TO_53);
-	SK_OUT8(IoC, B3_RI_WTO_XS1, SK_RI_TO_53);
-	SK_OUT8(IoC, B3_RI_RTO_R1, SK_RI_TO_53);
-	SK_OUT8(IoC, B3_RI_RTO_XA1, SK_RI_TO_53);
-	SK_OUT8(IoC, B3_RI_RTO_XS1, SK_RI_TO_53);
-	SK_OUT8(IoC, B3_RI_WTO_R2, SK_RI_TO_53);
-	SK_OUT8(IoC, B3_RI_WTO_XA2, SK_RI_TO_53);
-	SK_OUT8(IoC, B3_RI_WTO_XS2, SK_RI_TO_53);
-	SK_OUT8(IoC, B3_RI_RTO_R2, SK_RI_TO_53);
-	SK_OUT8(IoC, B3_RI_RTO_XA2, SK_RI_TO_53);
-	SK_OUT8(IoC, B3_RI_RTO_XS2, SK_RI_TO_53);
+	if (CHIP_ID_YUKON_2(pAC)) {
+		RamBuffers = pAC->GIni.GIMacsFound;
+	}
+	else {
+		RamBuffers = 1;
+	}
+	
+	for (i = 0; i < RamBuffers; i++) {
+		/* release local reset */
+		SK_OUT16(IoC, SELECT_RAM_BUFFER(i, B3_RI_CTRL), RI_RST_CLR);
 
+		/* configure timeout values */
+		SK_OUT8(IoC, SELECT_RAM_BUFFER(i, B3_RI_WTO_R1), SK_RI_TO_53);
+		SK_OUT8(IoC, SELECT_RAM_BUFFER(i, B3_RI_WTO_XA1), SK_RI_TO_53);
+		SK_OUT8(IoC, SELECT_RAM_BUFFER(i, B3_RI_WTO_XS1), SK_RI_TO_53);
+		SK_OUT8(IoC, SELECT_RAM_BUFFER(i, B3_RI_RTO_R1), SK_RI_TO_53);
+		SK_OUT8(IoC, SELECT_RAM_BUFFER(i, B3_RI_RTO_XA1), SK_RI_TO_53);
+		SK_OUT8(IoC, SELECT_RAM_BUFFER(i, B3_RI_RTO_XS1), SK_RI_TO_53);
+		SK_OUT8(IoC, SELECT_RAM_BUFFER(i, B3_RI_WTO_R2), SK_RI_TO_53);
+		SK_OUT8(IoC, SELECT_RAM_BUFFER(i, B3_RI_WTO_XA2), SK_RI_TO_53);
+		SK_OUT8(IoC, SELECT_RAM_BUFFER(i, B3_RI_WTO_XS2), SK_RI_TO_53);
+		SK_OUT8(IoC, SELECT_RAM_BUFFER(i, B3_RI_RTO_R2), SK_RI_TO_53);
+		SK_OUT8(IoC, SELECT_RAM_BUFFER(i, B3_RI_RTO_XA2), SK_RI_TO_53);
+		SK_OUT8(IoC, SELECT_RAM_BUFFER(i, B3_RI_RTO_XS2), SK_RI_TO_53);
+	}
 }	/* SkGeInitRamIface */
 
 
@@ -980,8 +1145,8 @@ SK_IOC	IoC)		/* I/O context */
  *	nothing
  */
 static void SkGeInitBmu(
-SK_AC	*pAC,		/* adapter context */
-SK_IOC	IoC,		/* I/O context */
+SK_AC	*pAC,		/* Adapter Context */
+SK_IOC	IoC,		/* I/O Context */
 int		Port)		/* Port Index (MAC_1 + n) */
 {
 	SK_GEPORT	*pPrt;
@@ -992,29 +1157,63 @@ int		Port)		/* Port Index (MAC_1 + n) */
 
 	RxWm = SK_BMU_RX_WM;
 	TxWm = SK_BMU_TX_WM;
-	
-	if (!pAC->GIni.GIPciSlot64 && !pAC->GIni.GIPciClock66) {
-		/* for better performance */
-		RxWm /= 2;
-		TxWm /= 2;
-	}
 
-	/* Rx Queue: Release all local resets and set the watermark */
-	SK_OUT32(IoC, Q_ADDR(pPrt->PRxQOff, Q_CSR), CSR_CLR_RESET);
-	SK_OUT32(IoC, Q_ADDR(pPrt->PRxQOff, Q_F), RxWm);
+	if (CHIP_ID_YUKON_2(pAC)) {
 
-	/*
-	 * Tx Queue: Release all local resets if the queue is used !
-	 * 		set watermark
-	 */
-	if (pPrt->PXSQSize != 0) {
-		SK_OUT32(IoC, Q_ADDR(pPrt->PXsQOff, Q_CSR), CSR_CLR_RESET);
-		SK_OUT32(IoC, Q_ADDR(pPrt->PXsQOff, Q_F), TxWm);
+		if (pAC->GIni.GIPciBus == SK_PEX_BUS) {
+			/* for better performance set it to 128 */
+			RxWm = SK_BMU_RX_WM_PEX;		
+		}
+
+		/* Rx Queue: Release all local resets and set the watermark */
+		SK_OUT32(IoC, Q_ADDR(pPrt->PRxQOff, Q_CSR), BMU_CLR_RESET);
+		SK_OUT32(IoC, Q_ADDR(pPrt->PRxQOff, Q_CSR), BMU_OPER_INIT);
+		SK_OUT32(IoC, Q_ADDR(pPrt->PRxQOff, Q_CSR), BMU_FIFO_OP_ON);
+		SK_OUT32(IoC, Q_ADDR(pPrt->PRxQOff, Q_WM), RxWm);
+
+		/*
+		 * Tx Queue: Release all local resets if the queue is used !
+		 * 		set watermark
+		 */
+		if (pPrt->PXSQSize != 0 && HW_SYNC_TX_SUPPORTED(pAC)) {
+			/* Yukon-EC doesn't have a synchronous Tx queue */
+			SK_OUT32(IoC, Q_ADDR(pPrt->PXsQOff, Q_CSR), BMU_CLR_RESET);
+			SK_OUT32(IoC, Q_ADDR(pPrt->PXsQOff, Q_CSR), BMU_OPER_INIT);
+			SK_OUT32(IoC, Q_ADDR(pPrt->PXsQOff, Q_CSR), BMU_FIFO_OP_ON);
+			SK_OUT32(IoC, Q_ADDR(pPrt->PXsQOff, Q_WM), TxWm);
+		}
+		
+		if (pPrt->PXAQSize != 0) {
+			SK_OUT32(IoC, Q_ADDR(pPrt->PXaQOff, Q_CSR), BMU_CLR_RESET);
+			SK_OUT32(IoC, Q_ADDR(pPrt->PXaQOff, Q_CSR), BMU_OPER_INIT);
+			SK_OUT32(IoC, Q_ADDR(pPrt->PXaQOff, Q_CSR), BMU_FIFO_OP_ON);
+			SK_OUT32(IoC, Q_ADDR(pPrt->PXaQOff, Q_WM), TxWm);
+		}
 	}
+	else {
+		if (!pAC->GIni.GIPciSlot64 && !pAC->GIni.GIPciClock66) {
+			/* for better performance */
+			RxWm /= 2;
+			TxWm /= 2;
+		}
 
-	if (pPrt->PXAQSize != 0) {
-		SK_OUT32(IoC, Q_ADDR(pPrt->PXaQOff, Q_CSR), CSR_CLR_RESET);
-		SK_OUT32(IoC, Q_ADDR(pPrt->PXaQOff, Q_F), TxWm);
+		/* Rx Queue: Release all local resets and set the watermark */
+		SK_OUT32(IoC, Q_ADDR(pPrt->PRxQOff, Q_CSR), CSR_CLR_RESET);
+		SK_OUT32(IoC, Q_ADDR(pPrt->PRxQOff, Q_F), RxWm);
+
+		/*
+		 * Tx Queue: Release all local resets if the queue is used !
+		 * 		set watermark
+		 */
+		if (pPrt->PXSQSize != 0) {
+			SK_OUT32(IoC, Q_ADDR(pPrt->PXsQOff, Q_CSR), CSR_CLR_RESET);
+			SK_OUT32(IoC, Q_ADDR(pPrt->PXsQOff, Q_F), TxWm);
+		}
+
+		if (pPrt->PXAQSize != 0) {
+			SK_OUT32(IoC, Q_ADDR(pPrt->PXaQOff, Q_CSR), CSR_CLR_RESET);
+			SK_OUT32(IoC, Q_ADDR(pPrt->PXaQOff, Q_F), TxWm);
+		}
 	}
 	/*
 	 * Do NOT enable the descriptor poll timers here, because
@@ -1045,13 +1244,22 @@ int		QuIoOffs)	/* Queue I/O Address Offs
 
 	SK_IN32(IoC, Q_ADDR(QuIoOffs, Q_CSR), &QuCsr);
 	
-	if ((QuCsr & (CSR_STOP | CSR_SV_IDLE)) == 0) {
-		/* Stop Descriptor overridden by start command */
-		SK_OUT32(IoC, Q_ADDR(QuIoOffs, Q_CSR), CSR_STOP);
+	if (CHIP_ID_YUKON_2(pAC)) {
+		if ((QuCsr & (BMU_STOP | BMU_IDLE)) == 0) {
+			/* Stop Descriptor overridden by start command */
+			SK_OUT32(IoC, Q_ADDR(QuIoOffs, Q_CSR), BMU_STOP);
 
-		SK_IN32(IoC, Q_ADDR(QuIoOffs, Q_CSR), &QuCsr);
+			SK_IN32(IoC, Q_ADDR(QuIoOffs, Q_CSR), &QuCsr);
+		}
+	}
+	else {
+		if ((QuCsr & (CSR_STOP | CSR_SV_IDLE)) == 0) {
+			/* Stop Descriptor overridden by start command */
+			SK_OUT32(IoC, Q_ADDR(QuIoOffs, Q_CSR), CSR_STOP);
+
+			SK_IN32(IoC, Q_ADDR(QuIoOffs, Q_CSR), &QuCsr);
+		}
 	}
-	
 	return(QuCsr);
 }	/* TestStopBit */
 
@@ -1135,56 +1343,83 @@ int		QuIoOffs)	/* Queue I/O Address Offs
  *	  SWITCH_PORT.
  */
 void SkGeStopPort(
-SK_AC	*pAC,	/* adapter context */
-SK_IOC	IoC,	/* I/O context */
-int		Port,	/* port to stop (MAC_1 + n) */
+SK_AC	*pAC,	/* Adapter Context */
+SK_IOC	IoC,	/* I/O Context */
+int		Port,	/* Port to stop (MAC_1 + n) */
 int		Dir,	/* Direction to Stop (SK_STOP_RX, SK_STOP_TX, SK_STOP_ALL) */
 int		RstMode)/* Reset Mode (SK_SOFT_RST, SK_HARD_RST) */
 {
-#ifndef SK_DIAG
-	SK_EVPARA Para;
-#endif /* !SK_DIAG */
 	SK_GEPORT *pPrt;
-	SK_U32	DWord;
+	SK_U32	RxCsr;
 	SK_U32	XsCsr;
 	SK_U32	XaCsr;
 	SK_U64	ToutStart;
+	SK_U32	CsrStart;
+	SK_U32	CsrStop;
+	SK_U32	CsrIdle;
+	SK_U32	CsrTest;
+	SK_U8 	rsl;	/* FIFO read shadow level */
+	SK_U8	rl;		/* FIFO read level */
 	int		i;
 	int		ToutCnt;
 
 	pPrt = &pAC->GIni.GP[Port];
 
+	/* set the proper values of Q_CSR register layout depending on the chip id */
+	if (CHIP_ID_YUKON_2(pAC)) {
+		CsrStart = BMU_START;
+		CsrStop = BMU_STOP;
+		CsrIdle = BMU_IDLE;
+		CsrTest = BMU_IDLE;
+	}
+	else {
+		CsrStart = CSR_START;
+		CsrStop = CSR_STOP;
+		CsrIdle = CSR_SV_IDLE;
+		CsrTest = CSR_SV_IDLE | CSR_STOP;
+	}
+
 	if ((Dir & SK_STOP_TX) != 0) {
-		/* disable receiver and transmitter */
-		SkMacRxTxDisable(pAC, IoC, Port);
+
+		if (!pAC->GIni.GIAsfEnabled) {
+			/* disable receiver and transmitter */
+			SkMacRxTxDisable(pAC, IoC, Port);
+		}
 
 		/* stop both transmit queues */
 		/*
 		 * If the BMU is in the reset state CSR_STOP will terminate
 		 * immediately.
 		 */
-		SK_OUT32(IoC, Q_ADDR(pPrt->PXsQOff, Q_CSR), CSR_STOP);
-		SK_OUT32(IoC, Q_ADDR(pPrt->PXaQOff, Q_CSR), CSR_STOP);
+		SK_OUT32(IoC, Q_ADDR(pPrt->PXsQOff, Q_CSR), CsrStop);
+		SK_OUT32(IoC, Q_ADDR(pPrt->PXaQOff, Q_CSR), CsrStop);
 
 		ToutStart = SkOsGetTime(pAC);
 		ToutCnt = 0;
 		do {
-			/*
-			 * Clear packet arbiter timeout to make sure
-			 * this loop will terminate.
-			 */
-			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
-			 * terminate if we don't flush the XMAC's transmit FIFO !
-			 */
-			SkMacFlushTxFifo(pAC, IoC, Port);
+#ifdef GENESIS
+			if (pAC->GIni.GIGenesis) {
+				/* Clear Tx packet arbiter timeout IRQ */
+				SK_OUT16(IoC, B3_PA_CTRL, (SK_U16)((Port == MAC_1) ?
+					PA_CLR_TO_TX1 : PA_CLR_TO_TX2));
 
-			XsCsr = TestStopBit(pAC, IoC, pPrt->PXsQOff);
+				/*
+				 * If the transfer stucks at the MAC the STOP command will not
+				 * terminate if we don't flush the XMAC's transmit FIFO !
+				 */
+				SkMacFlushTxFifo(pAC, IoC, Port);
+			}
+#endif /* GENESIS */
+			
 			XaCsr = TestStopBit(pAC, IoC, pPrt->PXaQOff);
 
+			if (HW_SYNC_TX_SUPPORTED(pAC)) {
+				XsCsr = TestStopBit(pAC, IoC, pPrt->PXsQOff);
+			}
+			else {
+				XsCsr = XaCsr;
+			}
+
 			if (SkOsGetTime(pAC) - ToutStart > (SK_TICKS_PER_SEC / 18)) {
 				/*
 				 * Timeout of 1/18 second reached.
@@ -1192,18 +1427,12 @@ int		RstMode)/* Reset Mode (SK_SOFT_RST,
 				 */
 				ToutCnt++;
 				if (ToutCnt > 1) {
-					/* Might be a problem when the driver event handler
-					 * calls StopPort again. XXX.
+					/*
+					 * If BMU stop doesn't terminate, we assume
+					 * we have a stable state and can reset the
+					 * BMU, Pref Unit, and RAM buffer now.
 					 */
-
-					/* Fatal Error, Loop aborted */
-					SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_HWI_E018,
-						SKERR_HWI_E018MSG);
-#ifndef SK_DIAG
-					Para.Para64 = Port;
-					SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_FAIL, Para);
-#endif /* !SK_DIAG */
-					return;
+					break;				/* ====> leave do/while loop here */
 				}
 				/*
 				 * Cache incoherency workaround: Assume a start command
@@ -1211,27 +1440,48 @@ int		RstMode)/* Reset Mode (SK_SOFT_RST,
 				 */
 				ToutStart = SkOsGetTime(pAC);
 
-				if ((XsCsr & CSR_STOP) != 0) {
-					SK_OUT32(IoC, Q_ADDR(pPrt->PXsQOff, Q_CSR), CSR_START);
+				if ((XsCsr & CsrStop) != 0) {
+					SK_OUT32(IoC, Q_ADDR(pPrt->PXsQOff, Q_CSR), CsrStart);
 				}
-				if ((XaCsr & CSR_STOP) != 0) {
-					SK_OUT32(IoC, Q_ADDR(pPrt->PXaQOff, Q_CSR), CSR_START);
+				if ((XaCsr & CsrStop) != 0) {
+					SK_OUT32(IoC, Q_ADDR(pPrt->PXaQOff, Q_CSR), CsrStart);
+				}
+
+				/*
+				 * After the previous operations the X(s|a)Csr does no
+				 * longer contain the proper values
+				 */
+				XaCsr = TestStopBit(pAC, IoC, pPrt->PXaQOff);
+
+				if (HW_SYNC_TX_SUPPORTED(pAC)) {
+					XsCsr = TestStopBit(pAC, IoC, pPrt->PXsQOff);
+				}
+				else {
+					XsCsr = XaCsr;
 				}
 			}
 
-		/*
-		 * Because of the ASIC problem report entry from 21.08.1998 it is
-		 * required to wait until CSR_STOP is reset and CSR_SV_IDLE is set.
-		 */
-		} while ((XsCsr & (CSR_STOP | CSR_SV_IDLE)) != CSR_SV_IDLE ||
-				 (XaCsr & (CSR_STOP | CSR_SV_IDLE)) != CSR_SV_IDLE);
+			/*
+			 * Because of the ASIC problem report entry from 21.08.1998 it is
+			 * required to wait until CSR_STOP is reset and CSR_SV_IDLE is set.
+			 * (valid for GENESIS only)
+			 */
+		} while (((XsCsr & CsrTest) != CsrIdle ||
+				  (XaCsr & CsrTest) != CsrIdle));
+
+		if (pAC->GIni.GIAsfEnabled) {
 
-		/* Reset the MAC depending on the RstMode */
-		if (RstMode == SK_SOFT_RST) {
-			SkMacSoftRst(pAC, IoC, Port);
+			pPrt->PState = (RstMode == SK_SOFT_RST) ? SK_PRT_STOP :
+				SK_PRT_RESET;
 		}
 		else {
-			SkMacHardRst(pAC, IoC, Port);
+			/* Reset the MAC depending on the RstMode */
+			if (RstMode == SK_SOFT_RST) {
+				SkMacSoftRst(pAC, IoC, Port);
+			}
+			else {
+				SkMacHardRst(pAC, IoC, Port);
+			}
 		}
 
 		/* Disable Force Sync bit and Enable Alloc bit */
@@ -1243,11 +1493,26 @@ int		RstMode)/* Reset Mode (SK_SOFT_RST,
 		SK_OUT32(IoC, MR_ADDR(Port, TXA_LIM_INI), 0L);
 
 		/* Perform a local reset of the port's Tx path */
+		if (CHIP_ID_YUKON_2(pAC)) {
+			/* Reset the PCI FIFO of the async Tx queue */
+			SK_OUT32(IoC, Q_ADDR(pPrt->PXaQOff, Q_CSR),
+				BMU_RST_SET | BMU_FIFO_RST);
+			/* Reset the PCI FIFO of the sync Tx queue */
+			SK_OUT32(IoC, Q_ADDR(pPrt->PXsQOff, Q_CSR),
+				BMU_RST_SET | BMU_FIFO_RST);
+			/* Reset the Tx prefetch units */
+			SK_OUT32(IoC, Y2_PREF_Q_ADDR(pPrt->PXaQOff, PREF_UNIT_CTRL_REG),
+				PREF_UNIT_RST_SET);
+			SK_OUT32(IoC, Y2_PREF_Q_ADDR(pPrt->PXsQOff, PREF_UNIT_CTRL_REG),
+				PREF_UNIT_RST_SET);
+		}
+		else {
+			/* Reset the PCI FIFO of the async Tx queue */
+			SK_OUT32(IoC, Q_ADDR(pPrt->PXaQOff, Q_CSR), CSR_SET_RESET);
+			/* Reset the PCI FIFO of the sync Tx queue */
+			SK_OUT32(IoC, Q_ADDR(pPrt->PXsQOff, Q_CSR), CSR_SET_RESET);
+		}
 
-		/* Reset the PCI FIFO of the async Tx queue */
-		SK_OUT32(IoC, Q_ADDR(pPrt->PXaQOff, Q_CSR), CSR_SET_RESET);
-		/* Reset the PCI FIFO of the sync Tx queue */
-		SK_OUT32(IoC, Q_ADDR(pPrt->PXsQOff, Q_CSR), CSR_SET_RESET);
 		/* Reset the RAM Buffer async Tx queue */
 		SK_OUT8(IoC, RB_ADDR(pPrt->PXaQOff, RB_CTRL), RB_RST_SET);
 		/* Reset the RAM Buffer sync Tx queue */
@@ -1266,53 +1531,96 @@ int		RstMode)/* Reset Mode (SK_SOFT_RST,
 #endif /* GENESIS */
 
 #ifdef YUKON
-		if (pAC->GIni.GIYukon) {
-			/* Reset TX MAC FIFO */
+		if (pAC->GIni.GIYukon && !pAC->GIni.GIAsfEnabled) {
+			/* Reset Tx MAC FIFO */
 			SK_OUT8(IoC, MR_ADDR(Port, TX_GMF_CTRL_T), (SK_U8)GMF_RST_SET);
 		}
+
+		/* set Pause Off */
+		SK_OUT8(IoC, MR_ADDR(Port, GMAC_CTRL), (SK_U8)GMC_PAUSE_OFF);
 #endif /* YUKON */
 	}
 
 	if ((Dir & SK_STOP_RX) != 0) {
-		/*
-		 * The RX Stop Command will not terminate if no buffers
-		 * are queued in the RxD ring. But it will always reach
-		 * the Idle state. Therefore we can use this feature to
-		 * stop the transfer of received packets.
-		 */
-		/* stop the port's receive queue */
-		SK_OUT32(IoC, Q_ADDR(pPrt->PRxQOff, Q_CSR), CSR_STOP);
-
-		i = 100;
-		do {
+		
+		if (CHIP_ID_YUKON_2(pAC)) {
 			/*
-			 * Clear packet arbiter timeout to make sure
-			 * this loop will terminate
+			 * The RX Stop command will not work for Yukon-2 if the BMU does not
+			 * reach the end of packet and since we can't make sure that we have
+			 * incoming data, we must reset the BMU while it is not during a DMA
+			 * transfer. Since it is possible that the RX path is still active,
+			 * the RX RAM buffer will be stopped first, so any possible incoming
+			 * data will not trigger a DMA. After the RAM buffer is stopped, the
+			 * BMU is polled until any DMA in progress is ended and only then it
+			 * will be reset.
 			 */
-			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);
+			/* Disable the RAM Buffer receive queue */
+			SK_OUT8(IoC, RB_ADDR(pPrt->PRxQOff, RB_CTRL), RB_DIS_OP_MD);
 
-			/* timeout if i==0 (bug fix for #10748) */
-			if (--i == 0) {
-				SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_HWI_E024,
-					SKERR_HWI_E024MSG);
-				break;
+			i = 0xffff;
+			while (--i) {
+				SK_IN8(IoC, RB_ADDR(pPrt->PRxQOff, Q_RSL), &rsl);
+				SK_IN8(IoC, RB_ADDR(pPrt->PRxQOff, Q_RL), &rl);
+				
+				if (rsl == rl) {
+					break;
+				}
 			}
-		/*
-		 * because of the ASIC problem report entry from 21.08.98
-		 * it is required to wait until CSR_STOP is reset and
-		 * CSR_SV_IDLE is set.
-		 */
-		} while ((DWord & (CSR_STOP | CSR_SV_IDLE)) != CSR_SV_IDLE);
 
-		/* The path data transfer activity is fully stopped now */
+			/*
+			 * If the rx side is blocked the above loop
+			 * cannot terminate. But, if there was any traffic
+			 * it should be terminated, now. However, stop the
+			 * RX BMU and prefetch unit!
+			 */
+			SK_OUT32(IoC, Q_ADDR(pPrt->PXaQOff, Q_CSR),
+				BMU_RST_SET | BMU_FIFO_RST);
+			/* reset the Rx prefetch unit */
+			SK_OUT32(IoC, Y2_PREF_Q_ADDR(pPrt->PRxQOff, PREF_UNIT_CTRL_REG),
+				PREF_UNIT_RST_SET);
+		}
+		else {
+			/*
+			 * The RX Stop Command will not terminate if no buffers
+			 * are queued in the RxD ring. But it will always reach
+			 * the Idle state. Therefore we can use this feature to
+			 * stop the transfer of received packets.
+			 */
+			/* stop the port's receive queue */
+			SK_OUT32(IoC, Q_ADDR(pPrt->PRxQOff, Q_CSR), CsrStop);
+
+			i = 100;
+			do {
+#ifdef GENESIS
+				if (pAC->GIni.GIGenesis) {
+					/* Clear Rx packet arbiter timeout IRQ */
+					SK_OUT16(IoC, B3_PA_CTRL, (SK_U16)((Port == MAC_1) ?
+						PA_CLR_TO_RX1 : PA_CLR_TO_RX2));
+				}
+#endif /* GENESIS */
 
-		/* Perform a local reset of the port's Rx path */
+				RxCsr = TestStopBit(pAC, IoC, pPrt->PRxQOff);
+
+				/* timeout if i==0 (bug fix for #10748) */
+				if (--i == 0) {
+					SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_HWI_E024,
+						SKERR_HWI_E024MSG);
+					break;
+				}
+			/*
+			 * Because of the ASIC problem report entry from 21.08.1998 it is
+			 * required to wait until CSR_STOP is reset and CSR_SV_IDLE is set.
+			 * (valid for GENESIS only)
+			 */
+			} while ((RxCsr & CsrTest) != CsrIdle);
+			/* The path data transfer activity is fully stopped now */
+
+			/* Perform a local reset of the port's Rx path */
+			/*	Reset the PCI FIFO of the Rx queue */
+			SK_OUT32(IoC, Q_ADDR(pPrt->PRxQOff, Q_CSR), CSR_SET_RESET);
+		}
 
-		 /*	Reset the PCI FIFO of the Rx queue */
-		SK_OUT32(IoC, Q_ADDR(pPrt->PRxQOff, Q_CSR), CSR_SET_RESET);
 		/* Reset the RAM Buffer receive queue */
 		SK_OUT8(IoC, RB_ADDR(pPrt->PRxQOff, RB_CTRL), RB_RST_SET);
 
@@ -1328,7 +1636,7 @@ int		RstMode)/* Reset Mode (SK_SOFT_RST,
 #endif /* GENESIS */
 
 #ifdef YUKON
-		if (pAC->GIni.GIYukon) {
+		if (pAC->GIni.GIYukon && !pAC->GIni.GIAsfEnabled) {
 			/* Reset Rx MAC FIFO */
 			SK_OUT8(IoC, MR_ADDR(Port, RX_GMF_CTRL_T), (SK_U8)GMF_RST_SET);
 		}
@@ -1348,8 +1656,8 @@ int		RstMode)/* Reset Mode (SK_SOFT_RST,
  *	nothing
  */
 static void SkGeInit0(
-SK_AC	*pAC,		/* adapter context */
-SK_IOC	IoC)		/* I/O context */
+SK_AC	*pAC,		/* Adapter Context */
+SK_IOC	IoC)		/* I/O Context */
 {
 	int i;
 	SK_GEPORT *pPrt;
@@ -1392,13 +1700,21 @@ SK_IOC	IoC)		/* I/O context */
 		pPrt->PMacJamLen = TX_JAM_LEN_DEF;
 		pPrt->PMacJamIpgVal	= TX_JAM_IPG_DEF;
 		pPrt->PMacJamIpgData = TX_IPG_JAM_DEF;
+		pPrt->PMacBackOffLim = TX_BOF_LIM_DEF;
+		pPrt->PMacDataBlind = DATA_BLIND_DEF;
 		pPrt->PMacIpgData = IPG_DATA_DEF;
 		pPrt->PMacLimit4 = SK_FALSE;
 	}
 
 	pAC->GIni.GIPortUsage = SK_RED_LINK;
 	pAC->GIni.GILedBlinkCtrl = (SK_U16)OemConfig.Value;
-	pAC->GIni.GIValIrqMask = IS_ALL_MSK;
+	pAC->GIni.GIChipCap = 0;
+
+	for (i = 0; i < 4; i++) {
+		pAC->GIni.HwF.Features[i]= 0x00000000;
+		pAC->GIni.HwF.OnMask[i]	 = 0x00000000;
+		pAC->GIni.HwF.OffMask[i] = 0x00000000;
+	}
 
 }	/* SkGeInit0*/
 
@@ -1418,8 +1734,8 @@ SK_IOC	IoC)		/* I/O context */
  *	1:	Power state could not be changed to 3.
  */
 static int SkGePciReset(
-SK_AC	*pAC,		/* adapter context */
-SK_IOC	IoC)		/* I/O context */
+SK_AC	*pAC,		/* Adapter Context */
+SK_IOC	IoC)		/* I/O Context */
 {
 	int		i;
 	SK_U16	PmCtlSts;
@@ -1442,7 +1758,7 @@ SK_IOC	IoC)		/* I/O context */
 	/* We know the RAM Interface Arbiter is enabled. */
 	SkPciWriteCfgWord(pAC, PCI_PM_CTL_STS, PCI_PM_STATE_D3);
 	SkPciReadCfgWord(pAC, PCI_PM_CTL_STS, &PmCtlSts);
-	
+
 	if ((PmCtlSts & PCI_PM_STATE_MSK) != PCI_PM_STATE_D3) {
 		return(1);
 	}
@@ -1452,7 +1768,7 @@ SK_IOC	IoC)		/* I/O context */
 
 	/* Check for D0 state. */
 	SkPciReadCfgWord(pAC, PCI_PM_CTL_STS, &PmCtlSts);
-	
+
 	if ((PmCtlSts & PCI_PM_STATE_MSK) != PCI_PM_STATE_D0) {
 		return(1);
 	}
@@ -1461,11 +1777,24 @@ SK_IOC	IoC)		/* I/O context */
 	SkPciReadCfgWord(pAC, PCI_COMMAND, &PciCmd);
 	SkPciReadCfgByte(pAC, PCI_CACHE_LSZ, &Cls);
 	SkPciReadCfgDWord(pAC, PCI_BASE_1ST, &Bp1);
-	SkPciReadCfgDWord(pAC, PCI_BASE_2ND, &Bp2);
+
+	/*
+	 * Compute the location in PCI config space of BAR2
+	 * relativ to the location of BAR1
+	 */
+	if ((Bp1 & PCI_MEM_TYP_MSK) == PCI_MEM64BIT) {
+		/* BAR1 is 64 bits wide */
+		i = 8;
+	}
+	else {
+		i = 4;
+	}
+
+	SkPciReadCfgDWord(pAC, PCI_BASE_1ST + i, &Bp2);
 	SkPciReadCfgByte(pAC, PCI_LAT_TIM, &Lat);
 
-	if (PciCmd != 0 || Cls != (SK_U8)0 || Lat != (SK_U8)0 ||
-		(Bp1 & 0xfffffff0L) != 0 || Bp2 != 1) {
+	if (PciCmd != 0 || Cls != 0 || (Bp1 & 0xfffffff0L) != 0 || Bp2 != 1 ||
+		Lat != 0) {
 		return(1);
 	}
 
@@ -1481,6 +1810,63 @@ SK_IOC	IoC)		/* I/O context */
 
 /******************************************************************************
  *
+ *	SkGeSetUpSupFeatures() - Collect Feature List for HW_FEATURE Macro
+ *
+ * Description:
+ *	This function collects the available features and required
+ *	deviation services of the Adapter and provides these
+ *	information in the GIHwF struct. Theses information is used as
+ *	default value and may be overritten by the driver using the
+ *	SET_HW_FEATURE_MASK() macro in its Init0 phase.
+ *
+ * Notice:
+ *	Unsing the On and Off mask: Never switch on the same bit in both
+ *	masks simultaneously. However, if doing the Off mask will win.
+ *	
+ * Returns:
+ *	nothing
+ */
+static void SkGeSetUpSupFeatures(
+SK_AC	*pAC,		/* Adapter Context */
+SK_IOC	IoC)		/* I/O Context */
+{
+	int i;
+
+	switch (pAC->GIni.GIChipId) {
+	case CHIP_ID_YUKON_EC:
+		if (pAC->GIni.GIChipRev == CHIP_REV_YU_EC_A1) {
+			/* A0/A1 */
+			pAC->GIni.HwF.Features[HW_DEV_LIST] = 	
+				HWF_WA_DEV_42  | HWF_WA_DEV_46 | HWF_WA_DEV_43_418 |
+				HWF_WA_DEV_420 | HWF_WA_DEV_423 |
+				HWF_WA_DEV_424 | HWF_WA_DEV_425 | HWF_WA_DEV_427 |
+				HWF_WA_DEV_428;
+		}
+		else if (pAC->GIni.GIChipRev == CHIP_REV_YU_EC_A2) {
+			/* A2 */
+			pAC->GIni.HwF.Features[HW_DEV_LIST] =
+				HWF_WA_DEV_424 | HWF_WA_DEV_425 | HWF_WA_DEV_427 |
+				HWF_WA_DEV_428;
+		}
+		break;
+	case CHIP_ID_YUKON_FE:
+		pAC->GIni.HwF.Features[HW_DEV_LIST] = HWF_WA_DEV_427;
+		break;
+	case CHIP_ID_YUKON_XL:
+		pAC->GIni.HwF.Features[HW_DEV_LIST] = HWF_WA_DEV_427;
+		break;
+	}
+
+	for (i = 0; i < 4; i++) {
+		pAC->GIni.HwF.Features[i] =
+			(pAC->GIni.HwF.Features[i] | pAC->GIni.HwF.OnMask[i]) &
+				~pAC->GIni.HwF.OffMask[i];
+	}
+}	/* SkGeSetUpSupFeatures */
+
+
+/******************************************************************************
+ *
  *	SkGeInit1() - Level 1 Initialization
  *
  * Description:
@@ -1501,73 +1887,190 @@ SK_IOC	IoC)		/* I/O context */
  *	6:	HW self test failed
  */
 static int SkGeInit1(
-SK_AC	*pAC,		/* adapter context */
-SK_IOC	IoC)		/* I/O context */
+SK_AC	*pAC,		/* Adapter Context */
+SK_IOC	IoC)		/* I/O Context */
 {
 	SK_U8	Byte;
 	SK_U16	Word;
-	SK_U16	CtrlStat;
+	SK_U32	CtrlStat;
+	SK_U32	VauxAvail;
 	SK_U32	DWord;
+	SK_U32	PowerDownBit;
+	SK_GEPORT *pPrt;
 	int	RetVal;
 	int	i;
 
 	RetVal = 0;
 
-	/* save CLK_RUN bits (YUKON-Lite) */
-	SK_IN16(IoC, B0_CTST, &CtrlStat);
+	/* save CLK_RUN & ASF_ENABLE bits (YUKON-Lite, YUKON-EC) */
+	SK_IN32(IoC, B0_CTST, &CtrlStat);
 
 #ifdef SK_PCI_RESET
 	(void)SkGePciReset(pAC, IoC);
 #endif /* SK_PCI_RESET */
 
-	/* do the SW-reset */
-	SK_OUT8(IoC, B0_CTST, CS_RST_SET);
-
 	/* release the SW-reset */
+	/* Important: SW-reset has to be cleared here, to ensure
+	 * the CHIP_ID can be read IO-mapped based, too -
+	 * remember the RAP register can only be written if
+	 * SW-reset is cleared.
+	 */
 	SK_OUT8(IoC, B0_CTST, CS_RST_CLR);
 
+	/* read Chip Identification Number */
+	SK_IN8(IoC, B2_CHIP_ID, &Byte);
+	pAC->GIni.GIChipId = Byte;
+
+	pAC->GIni.GIAsfEnabled = SK_FALSE;
+
+	/* ASF support only for Yukon-2 */
+	if ((pAC->GIni.GIChipId >= CHIP_ID_YUKON_XL) &&
+		(pAC->GIni.GIChipId <= CHIP_ID_YUKON_EC)) {
+#ifdef SK_ASF
+		if ((CtrlStat & Y2_ASF_ENABLE) != 0) {
+			/* do the SW-reset only if ASF is not enabled */
+			pAC->GIni.GIAsfEnabled = SK_TRUE;
+		}
+#else /* !SK_ASF */
+		/* Put ASF system in reset state */
+		SK_OUT32(IoC, B28_Y2_ASF_STAT_CMD, Y2_ASF_RESET);
+
+		/* Disable ASF Unit */
+		SK_OUT16(IoC, B0_CTST, Y2_ASF_DISABLE);
+#endif /* !SK_ASF */
+	}
+
+	if (!pAC->GIni.GIAsfEnabled) {
+		/* set the SW-reset */
+		SK_OUT8(IoC, B0_CTST, CS_RST_SET);
+
+		/* release the SW-reset */
+		SK_OUT8(IoC, B0_CTST, CS_RST_CLR);
+	}
+
 	/* 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'.
 	 */
-	SK_IN16(IoC, PCI_C(PCI_STATUS), &Word);
-	
+	SK_IN16(IoC, PCI_C(pAC, PCI_STATUS), &Word);
+
 	SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_ON);
-	SK_OUT16(IoC, PCI_C(PCI_STATUS), (SK_U16)(Word | PCI_ERRBITS));
-	SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
+
+	SK_OUT16(IoC, PCI_C(pAC, PCI_STATUS), Word | (SK_U16)PCI_ERRBITS);
 
 	/* 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, (SK_U16)(CtrlStat &
 		(CS_CLK_RUN_HOT | CS_CLK_RUN_RST | CS_CLK_RUN_ENA)));
+#endif /* CLK_RUN */
 
-	/* read Chip Identification Number */
-	SK_IN8(IoC, B2_CHIP_ID, &Byte);
-	pAC->GIni.GIChipId = Byte;
+	if ((pAC->GIni.GIChipId >= CHIP_ID_YUKON_XL) &&
+		(pAC->GIni.GIChipId <= CHIP_ID_YUKON_FE)) {
+
+		pAC->GIni.GIYukon2 = SK_TRUE;
+		pAC->GIni.GIValIrqMask = Y2_IS_ALL_MSK;
+		pAC->GIni.GIValHwIrqMask = Y2_HWE_ALL_MSK;
+
+		VauxAvail = Y2_VAUX_AVAIL;
+
+		SK_IN32(IoC, PCI_C(pAC, PCI_OUR_STATUS), &DWord);
+
+		if ((DWord & PCI_OS_PCI_X) != 0) {
+			/* this is a PCI/PCIX bus */
+			pAC->GIni.GIPciBus = (SK_U8)(((DWord & PCI_OS_PCIX) != 0) ?
+				SK_PCIX_BUS : SK_PCI_BUS);
+
+			/* check if 64-bit PCI Slot is present */
+			pAC->GIni.GIPciSlot64 = (SK_BOOL)((DWord & PCI_OS_PCI64B) != 0);
 
-	/* read number of MACs */
-	SK_IN8(IoC, B2_MAC_CFG, &Byte);
-	pAC->GIni.GIMacsFound = (Byte & CFG_SNG_MAC) ? 1 : 2;
+			/* check if 66 MHz PCI Clock is active */
+			pAC->GIni.GIPciClock66 = (SK_BOOL)((DWord & PCI_OS_PCI66M) != 0);
+		}
+		else {
+			/* this is a PEX bus */
+			pAC->GIni.GIPciBus = SK_PEX_BUS;
+
+			/* Clear any PEX errors */
+			SK_OUT32(IoC, PCI_C(pAC, PEX_UNC_ERR_STAT), 0xffffffffUL);
+		}
+		/*
+		 * Yukon-2 chips family has a different way of providing
+		 * the number of MACs available
+		 */
+		pAC->GIni.GIMacsFound = 1;
+
+		SK_IN8(IoC, B2_Y2_HW_RES, &Byte);
+
+		if (CHIP_ID_YUKON_2(pAC)) {
+			/*
+			 * OEM config value is overwritten and should not
+			 * be used for Yukon-2
+			 */
+			pAC->GIni.GILedBlinkCtrl |= SK_ACT_LED_BLINK;
+
+			if (CFG_LED_MODE(Byte) == CFG_LED_DUAL_ACT_LNK) {
+
+				pAC->GIni.GILedBlinkCtrl |= SK_DUAL_LED_ACT_LNK;
+			}
+		}
+
+		if ((Byte & CFG_DUAL_MAC_MSK) == CFG_DUAL_MAC_MSK) {
+
+			SK_IN8(IoC, B2_Y2_CLK_GATE, &Byte);
+
+			if (!(Byte & Y2_STATUS_LNK2_INAC)) {
+				pAC->GIni.GIMacsFound++;
+			}
+		}
+
+		if (pAC->GIni.GIChipId == CHIP_ID_YUKON_XL) {
+#ifdef XXX
+			if (pAC->GIni.GIPciBus != SK_PEX_BUS) {
+				/* Enable Core Clock Division */
+				SK_OUT32(IoC, B2_Y2_CLK_CTRL, Y2_CLK_DIV_VAL_2(0) |
+					Y2_CLK_DIV_ENA);
+			}
+#endif /* XXX */
+#ifdef VCPU
+		/* temporary WA for reported number of links */
+			pAC->GIni.GIMacsFound = 2;
+#endif /* VCPU */
+		}
+
+		/* read Chip Revision */
+		SK_IN8(IoC, B2_MAC_CFG, &Byte);
+
+		pAC->GIni.GIChipCap = Byte & 0x0f;
+	}
+	else {
+		pAC->GIni.GIYukon2 = SK_FALSE;
+		pAC->GIni.GIValIrqMask = IS_ALL_MSK;
+		pAC->GIni.GIValHwIrqMask = 0;	/* not activated */
+
+		VauxAvail = CS_VAUX_AVAIL;
+
+		/* read number of MACs and Chip Revision */
+		SK_IN8(IoC, B2_MAC_CFG, &Byte);
+
+		pAC->GIni.GIMacsFound = (Byte & CFG_SNG_MAC) ? 1 : 2;
+	}
 
 	/* 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 RAM size */
 	SK_IN8(IoC, B2_E_0, &Byte);
 
 	pAC->GIni.GIGenesis = SK_FALSE;
 	pAC->GIni.GIYukon = SK_FALSE;
 	pAC->GIni.GIYukonLite = SK_FALSE;
+	pAC->GIni.GIVauxAvail = SK_FALSE;
 
 #ifdef GENESIS
 	if (pAC->GIni.GIChipId == CHIP_ID_GENESIS) {
@@ -1583,7 +2086,7 @@ SK_IOC	IoC)		/* I/O context */
 			pAC->GIni.GIRamSize = (int)Byte * 512;
 			pAC->GIni.GIRamOffs = 0;
 		}
-		/* all GE adapters work with 53.125 MHz host clock */
+		/* all GENESIS adapters work with 53.125 MHz host clock */
 		pAC->GIni.GIHstClkFact = SK_FACT_53;
 
 		/* set Descr. Poll Timer Init Value to 250 ms */
@@ -1601,39 +2104,42 @@ SK_IOC	IoC)		/* I/O context */
 
 		pAC->GIni.GIRamOffs = 0;
 
-		/* WA for chip Rev. A */
+		/* WA for Yukon chip Rev. A */
 		pAC->GIni.GIWolOffs = (pAC->GIni.GIChipId == CHIP_ID_YUKON &&
 			pAC->GIni.GIChipRev == 0) ? WOL_REG_OFFS : 0;
 
 		/* get PM Capabilities of PCI config space */
-		SK_IN16(IoC, PCI_C(PCI_PM_CAP_REG), &Word);
+		SK_IN16(IoC, PCI_C(pAC, PCI_PM_CAP_REG), &Word);
 
 		/* check if VAUX is available */
-		if (((CtrlStat & CS_VAUX_AVAIL) != 0) &&
+		if (((CtrlStat & VauxAvail) != 0) &&
 			/* check also if PME from D3cold is set */
 			((Word & PCI_PME_D3C_SUP) != 0)) {
 			/* set entry in GE init struct */
 			pAC->GIni.GIVauxAvail = SK_TRUE;
 		}
 
-		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);
+		if (!CHIP_ID_YUKON_2(pAC)) {
 
-			/* 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 */
+			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);
+					/* restore Flash-Address Register */
+					SK_OUT32(IoC, B2_FAR, DWord);
+				}
 			}
 		}
 
@@ -1641,74 +2147,128 @@ SK_IOC	IoC)		/* I/O context */
 		SK_OUT8(IoC, B0_POWER_CTRL, (SK_U8)(PC_VAUX_ENA | PC_VCC_ENA |
 			PC_VAUX_OFF | PC_VCC_ON));
 
-		/* read the Interrupt source */
-		SK_IN32(IoC, B0_ISRC, &DWord);
+		if (!pAC->GIni.GIAsfEnabled) {
 
-		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;
+			for (i = 0; i < pAC->GIni.GIMacsFound; i++) {
+				/* set GMAC Link Control reset */
+				SK_OUT8(IoC, MR_ADDR(i, GMAC_LINK_CTRL), (SK_U8)GMLC_RST_SET);
+
+				/* clear GMAC Link Control reset */
+				SK_OUT8(IoC, MR_ADDR(i, GMAC_LINK_CTRL), (SK_U8)GMLC_RST_CLR);
 			}
 		}
 
-		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);
+		if (CHIP_ID_YUKON_2(pAC)) {
+			/* for PCI-Express the PCI_CLK is substituted by the core clock */
+			if (pAC->GIni.GIPciBus == SK_PEX_BUS) {
+				/* PEX adapters work with different host clock */
+				if (pAC->GIni.GIChipId == CHIP_ID_YUKON_FE) {
+					/* Yukon-FE works with 100 MHz host clock */
+					pAC->GIni.GIHstClkFact = SK_FACT_100;
+				}
+				else {
+					/* Yukon-EC/XL (PEX) work with 125 MHz host clock */
+					pAC->GIni.GIHstClkFact = SK_FACT_125;
+				}
+			}
+			else {
+				/* non-PEX adapters work with 156 MHz host clock */
+				pAC->GIni.GIHstClkFact = 2 * SK_FACT_78;
+			}
+
+			pAC->GIni.GIPollTimerVal =		/* ca. 75 us */
+				SK_DPOLL_DEF_Y2 * (SK_U32)pAC->GIni.GIHstClkFact / 100;
 
-			/* clear GMAC Link Control reset */
-			SK_OUT16(IoC, MR_ADDR(i, GMAC_LINK_CTRL), GMLC_RST_CLR);
+			/* set power down bit */
+			PowerDownBit = PCI_Y2_PHY1_POWD | PCI_Y2_PHY2_POWD;
+
+#ifdef SK_PHY_LP_MODE_DEEP_SLEEP
+			/* Disable Core Clock Division */
+			SK_OUT32(IoC, B2_Y2_CLK_CTRL, Y2_CLK_DIV_DIS);
+#endif
 		}
-		/* all YU chips work with 78.125 MHz host clock */
-		pAC->GIni.GIHstClkFact = SK_FACT_78;
+		else {
+			/* YUKON adapters work with 78 MHz host clock */
+			pAC->GIni.GIHstClkFact = SK_FACT_78;
+
+			pAC->GIni.GIPollTimerVal = SK_DPOLL_MAX;	/* 215 ms */
+
+			/* read the Interrupt source */
+			SK_IN32(IoC, B0_ISRC, &DWord);
+
+			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;
+				}
+			}
+			/* set power down bit */
+			PowerDownBit = PCI_PHY_COMA;
+		}
+
+#ifdef SK_PHY_LP_MODE_DEEP_SLEEP
 
-		pAC->GIni.GIPollTimerVal = SK_DPOLL_MAX;	/* 215 ms */
+		SK_IN32(IoC, PCI_C(pAC, PCI_OUR_REG_1), &DWord);
+
+		/* Release PHY from PowerDown/COMA Mode */
+		SK_OUT32(IoC, PCI_C(pAC, PCI_OUR_REG_1), DWord & ~PowerDownBit);
+#endif
 	}
 #endif /* YUKON */
 
-	/* check if 64-bit PCI Slot is present */
-	pAC->GIni.GIPciSlot64 = (SK_BOOL)((CtrlStat & CS_BUS_SLOT_SZ) != 0);
+	SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
 
-	/* check if 66 MHz PCI Clock is active */
-	pAC->GIni.GIPciClock66 = (SK_BOOL)((CtrlStat & CS_BUS_CLOCK) != 0);
+	if (!CHIP_ID_YUKON_2(pAC)) {
+		/* 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 */
+		pAC->GIni.GIPciClock66 = (SK_BOOL)((CtrlStat & CS_BUS_CLOCK) != 0);
+	}
 
 	/* read PCI HW Revision Id. */
-	SK_IN8(IoC, PCI_C(PCI_REV_ID), &Byte);
+	SK_IN8(IoC, PCI_C(pAC, PCI_REV_ID), &Byte);
 	pAC->GIni.GIPciHwRev = Byte;
 
 	/* read connector type */
 	SK_IN8(IoC, B2_CONN_TYP, &pAC->GIni.GIConTyp);
 
 	/* read the PMD type */
-	SK_IN8(IoC, B2_PMD_TYP, &pAC->GIni.GIPmdTyp);
+	SK_IN8(IoC, B2_PMD_TYP, &Byte);
+
+	pAC->GIni.GIPmdTyp = Byte;
 
-	pAC->GIni.GICopperType = (SK_U8)(pAC->GIni.GIPmdTyp == 'T');
+	pAC->GIni.GICopperType = (SK_BOOL)(Byte == 'T' || Byte == '1') ||
+		pAC->GIni.GIYukon2;
 
-	/* read the PHY type */
+	/* read the PHY type (Yukon and Genesis) */
 	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++) {
 
+		pPrt = &pAC->GIni.GP[i];
+
 #ifdef GENESIS
 		if (pAC->GIni.GIGenesis) {
 			switch (Byte) {
 			case SK_PHY_XMAC:
-				pAC->GIni.GP[i].PhyAddr = PHY_ADDR_XMAC;
+				pPrt->PhyAddr = PHY_ADDR_XMAC;
 				break;
 			case SK_PHY_BCOM:
-				pAC->GIni.GP[i].PhyAddr = PHY_ADDR_BCOM;
-				pAC->GIni.GP[i].PMSCap = (SK_U8)(SK_MS_CAP_AUTO |
+				pPrt->PhyAddr = PHY_ADDR_BCOM;
+				pPrt->PMSCap = (SK_U8)(SK_MS_CAP_AUTO |
 					SK_MS_CAP_MASTER | SK_MS_CAP_SLAVE);
 				break;
 #ifdef OTHER_PHY
 			case SK_PHY_LONE:
-				pAC->GIni.GP[i].PhyAddr = PHY_ADDR_LONE;
+				pPrt->PhyAddr = PHY_ADDR_LONE;
 				break;
 			case SK_PHY_NAT:
-				pAC->GIni.GP[i].PhyAddr = PHY_ADDR_NAT;
+				pPrt->PhyAddr = PHY_ADDR_NAT;
 				break;
 #endif /* OTHER_PHY */
 			default:
@@ -1722,37 +2282,52 @@ SK_IOC	IoC)		/* I/O context */
 #ifdef YUKON
 		if (pAC->GIni.GIYukon) {
 
-			if (Byte < (SK_U8)SK_PHY_MARV_COPPER) {
+			if ((Byte < (SK_U8)SK_PHY_MARV_COPPER) || CHIP_ID_YUKON_2(pAC)) {
 				/* if this field is not initialized */
 				Byte = (SK_U8)SK_PHY_MARV_COPPER;
 
 				pAC->GIni.GICopperType = SK_TRUE;
 			}
 
-			pAC->GIni.GP[i].PhyAddr = PHY_ADDR_MARV;
+			pPrt->PhyAddr = PHY_ADDR_MARV;
 
 			if (pAC->GIni.GICopperType) {
 
-				pAC->GIni.GP[i].PLinkSpeedCap = (SK_U8)(SK_LSPEED_CAP_AUTO |
-					SK_LSPEED_CAP_10MBPS | SK_LSPEED_CAP_100MBPS |
-					SK_LSPEED_CAP_1000MBPS);
+				if (pAC->GIni.GIChipId == CHIP_ID_YUKON_FE ||
+					(pAC->GIni.GIChipId == CHIP_ID_YUKON_EC &&
+					pAC->GIni.GIChipCap == 2)) {
+
+					pPrt->PLinkSpeedCap = (SK_U8)(SK_LSPEED_CAP_100MBPS |
+						SK_LSPEED_CAP_10MBPS);
+
+					pAC->GIni.GIRamSize = 4;
+				}
+				else {
+					pPrt->PLinkSpeedCap = (SK_U8)(SK_LSPEED_CAP_1000MBPS |
+						SK_LSPEED_CAP_100MBPS | SK_LSPEED_CAP_10MBPS |
+						SK_LSPEED_CAP_AUTO);
+				}
 
-				pAC->GIni.GP[i].PLinkSpeed = (SK_U8)SK_LSPEED_AUTO;
+				pPrt->PLinkSpeed = (SK_U8)SK_LSPEED_AUTO;
 
-				pAC->GIni.GP[i].PMSCap = (SK_U8)(SK_MS_CAP_AUTO |
+				pPrt->PMSCap = (SK_U8)(SK_MS_CAP_AUTO |
 					SK_MS_CAP_MASTER | SK_MS_CAP_SLAVE);
 			}
 			else {
 				Byte = (SK_U8)SK_PHY_MARV_FIBER;
 			}
 		}
+
+		/* Clear TWSI IRQ */
+		SK_OUT32(IoC, B2_I2C_IRQ, I2C_CLR_IRQ);
+
 #endif /* YUKON */
 
-		pAC->GIni.GP[i].PhyType = (int)Byte;
+		pPrt->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));
+			("PHY type: %d  PHY addr: %04x\n",
+			Byte, pPrt->PhyAddr));
 	}
 
 	/* get MAC Type & set function pointers dependent on */
@@ -1768,10 +2343,12 @@ SK_IOC	IoC)		/* I/O context */
 #ifdef SK_DIAG
 		pAC->GIni.GIFunc.pFnMacPhyRead		= SkXmPhyRead;
 		pAC->GIni.GIFunc.pFnMacPhyWrite		= SkXmPhyWrite;
-#endif /* SK_DIAG */
+#else	/* SK_DIAG */
+		pAC->GIni.GIFunc.pSkGeSirqIsr		= SkGeYuSirqIsr;
+#endif /* !SK_DIAG */
 	}
 #endif /* GENESIS */
-	
+
 #ifdef YUKON
 	if (pAC->GIni.GIYukon) {
 
@@ -1784,7 +2361,14 @@ SK_IOC	IoC)		/* I/O context */
 #ifdef SK_DIAG
 		pAC->GIni.GIFunc.pFnMacPhyRead		= SkGmPhyRead;
 		pAC->GIni.GIFunc.pFnMacPhyWrite		= SkGmPhyWrite;
-#endif /* SK_DIAG */
+#else	/* SK_DIAG */
+		if (CHIP_ID_YUKON_2(pAC)) {
+			pAC->GIni.GIFunc.pSkGeSirqIsr	= SkYuk2SirqIsr;
+		}
+		else {
+			pAC->GIni.GIFunc.pSkGeSirqIsr	= SkGeYuSirqIsr;
+		}
+#endif /* !SK_DIAG */
 
 #ifdef SPECIAL_HANDLING
 		if (pAC->GIni.GIChipId == CHIP_ID_YUKON) {
@@ -1798,6 +2382,8 @@ SK_IOC	IoC)		/* I/O context */
 	}
 #endif /* YUKON */
 
+	SkGeSetUpSupFeatures(pAC, IoC);
+
 	return(RetVal);
 }	/* SkGeInit1 */
 
@@ -1818,9 +2404,12 @@ SK_IOC	IoC)		/* I/O context */
  *	nothing
  */
 static void SkGeInit2(
-SK_AC	*pAC,		/* adapter context */
-SK_IOC	IoC)		/* I/O context */
+SK_AC	*pAC,		/* Adapter Context */
+SK_IOC	IoC)		/* I/O Context */
 {
+#ifdef YUKON
+	SK_U16	Word;
+#endif /* YUKON */
 #ifdef GENESIS
 	SK_U32	DWord;
 #endif /* GENESIS */
@@ -1855,12 +2444,12 @@ SK_IOC	IoC)		/* I/O context */
 	}
 #endif /* GENESIS */
 
-#ifdef YUKON
+#ifdef xSK_DIAG
 	if (pAC->GIni.GIYukon) {
 		/* start Time Stamp Timer */
 		SK_OUT8(IoC, GMAC_TI_ST_CTRL, (SK_U8)GMT_ST_START);
 	}
-#endif /* YUKON */
+#endif /* SK_DIAG */
 
 	/* enable the Tx Arbiters */
 	for (i = 0; i < pAC->GIni.GIMacsFound; i++) {
@@ -1870,6 +2459,31 @@ SK_IOC	IoC)		/* I/O context */
 	/* enable the RAM Interface Arbiter */
 	SkGeInitRamIface(pAC, IoC);
 
+#ifdef YUKON
+	if (CHIP_ID_YUKON_2(pAC)) {
+
+		if (pAC->GIni.GIPciBus == SK_PEX_BUS) {
+
+			SK_IN16(IoC, PCI_C(pAC, PEX_DEV_CTRL), &Word);
+
+			/* change Max. Read Request Size to 2048 bytes */
+			Word &= ~PEX_DC_MAX_RRS_MSK;
+			Word |= PEX_DC_MAX_RD_RQ_SIZE(4);
+
+			SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_ON);
+
+			SK_OUT16(IoC, PCI_C(pAC, PEX_DEV_CTRL), Word);
+
+			SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
+		}
+
+		/*
+		 * Writing the HW Error Mask Reg. will not generate an
+		 * IRQ as long as the B0_IMSK is not set by the driver.
+		 */
+		SK_OUT32(IoC, B0_HWE_IMSK, pAC->GIni.GIValHwIrqMask);
+	}
+#endif /* YUKON */
 }	/* SkGeInit2 */
 
 
@@ -1908,9 +2522,9 @@ SK_IOC	IoC)		/* I/O context */
  *	6:	HW self test failed
  */
 int	SkGeInit(
-SK_AC	*pAC,		/* adapter context */
-SK_IOC	IoC,		/* I/O context */
-int		Level)		/* initialization level */
+SK_AC	*pAC,		/* Adapter Context */
+SK_IOC	IoC,		/* I/O Context */
+int		Level)		/* Initialization Level */
 {
 	int		RetVal;		/* return value */
 	SK_U32	DWord;
@@ -1943,11 +2557,13 @@ int		Level)		/* initialization level */
 			break;
 		}
 
+#ifdef DEBUG
 		/* check if the number of GIMacsFound matches SK_MAX_MACS */
 		if (pAC->GIni.GIMacsFound > SK_MAX_MACS) {
 			RetVal = 1;
 			break;
 		}
+#endif /* DEBUG */
 
 		/* Level 1 successfully passed */
 		pAC->GIni.GILevel = SK_INIT_IO;
@@ -1991,76 +2607,78 @@ int		Level)		/* initialization level */
  *	nothing
  */
 void SkGeDeInit(
-SK_AC	*pAC,		/* adapter context */
-SK_IOC	IoC)		/* I/O context */
+SK_AC	*pAC,		/* Adapter Context */
+SK_IOC	IoC)		/* I/O Context */
 {
 	int	i;
 	SK_U16	Word;
 
-#ifdef SK_PHY_LP_MODE
-	SK_U8	Byte;
+#ifdef SK_PHY_LP_MODE_DEEP_SLEEP
 	SK_U16	PmCtlSts;
-#endif /* SK_PHY_LP_MODE */
+#endif
 
 #if (!defined(SK_SLIM) && !defined(VCPU))
 	/* ensure I2C is ready */
 	SkI2cWaitIrq(pAC, IoC);
 #endif
 
-	/* 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) {
-
-			SkGeStopPort(pAC, IoC, i, SK_STOP_ALL, SK_HARD_RST);
-		}
-	}
-
-#ifdef SK_PHY_LP_MODE
-    /*
+#ifdef SK_PHY_LP_MODE_DEEP_SLEEP
+	/*
 	 * for power saving purposes within mobile environments
-	 * we set the PHY to coma mode and switch to D3 power state.
+	 * we set the PHY to coma mode.
 	 */
-	if (pAC->GIni.GIYukonLite &&
-		pAC->GIni.GIChipRev == CHIP_REV_YU_LITE_A3) {
+#ifndef SK_DIAG
+	if (pAC->GIni.GIVauxAvail) {
+		/* switch power to VAUX */
+		SK_OUT8(IoC, B0_POWER_CTRL, (SK_U8)(PC_VAUX_ENA | PC_VCC_ENA |
+			PC_VAUX_ON | PC_VCC_OFF));
+	}
+#endif /* SK_DIAG */
+
+	if (CHIP_ID_YUKON_2(pAC) && !pAC->GIni.GIAsfEnabled
+#ifdef XXX
+		|| pAC->GIni.GIYukonLite &&
+		pAC->GIni.GIChipRev == CHIP_REV_YU_LITE_A3
+#endif
+		) {
 
 		/* for all ports switch PHY to coma mode */
 		for (i = 0; i < pAC->GIni.GIMacsFound; i++) {
 
-			SkGmEnterLowPowerMode(pAC, IoC, i, PHY_PM_DEEP_SLEEP);
+			(void)SkGmEnterLowPowerMode(pAC, IoC, i, PHY_PM_DEEP_SLEEP);
 		}
+	}
+#else /* !SK_PHY_LP_MODE_DEEP_SLEEP */
 
-		if (pAC->GIni.GIVauxAvail) {
-			/* switch power to VAUX */
-			Byte = PC_VAUX_ENA | PC_VCC_ENA | PC_VAUX_ON | PC_VCC_OFF;
+	if (!pAC->GIni.GIAsfEnabled) {
+		/* 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) {
 
-			SK_OUT8(IoC, B0_POWER_CTRL, Byte);
+				SkGeStopPort(pAC, IoC, i, SK_STOP_ALL, SK_HARD_RST);
+			}
 		}
-
-		/* switch to D3 state */
-		SK_IN16(IoC, PCI_C(PCI_PM_CTL_STS), &PmCtlSts);
-
-		PmCtlSts |= PCI_PM_STATE_D3;
-
-		SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_ON);
-
-		SK_OUT16(IoC, PCI_C(PCI_PM_CTL_STS), PmCtlSts);
 	}
-#endif /* SK_PHY_LP_MODE */
 
 	/* Reset all bits in the PCI STATUS register */
 	/*
 	 * Note: PCI Cfg cycles cannot be used, because they are not
 	 *	 available on some platforms after 'boot time'.
 	 */
-	SK_IN16(IoC, PCI_C(PCI_STATUS), &Word);
+	SK_IN16(IoC, PCI_C(pAC, PCI_STATUS), &Word);
 
 	SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_ON);
-	SK_OUT16(IoC, PCI_C(PCI_STATUS), (SK_U16)(Word | PCI_ERRBITS));
+
+	SK_OUT16(IoC, PCI_C(pAC, 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 */
-	SK_OUT8(IoC, B0_CTST, CS_RST_SET);
+	if (!pAC->GIni.GIAsfEnabled) {
+		/* set the SW-reset */
+		SK_OUT8(IoC, B0_CTST, CS_RST_SET);
+	}
+#endif /* !SK_PHY_LP_MODE_DEEP_SLEEP */
 
 	pAC->GIni.GILevel = SK_INIT_DATA;
 }	/* SkGeDeInit */
@@ -2095,8 +2713,8 @@ SK_IOC	IoC)		/* I/O context */
  *	2:	The port has to be stopped before it can be initialized again.
  */
 int SkGeInitPort(
-SK_AC	*pAC,		/* adapter context */
-SK_IOC	IoC,		/* I/O context */
+SK_AC	*pAC,		/* Adapter Context */
+SK_IOC	IoC,		/* I/O Context */
 int		Port)		/* Port to configure */
 {
 	SK_GEPORT *pPrt;
@@ -2108,7 +2726,7 @@ int		Port)		/* Port to configure */
 		return(1);
 	}
 
-	if (pPrt->PState == SK_PRT_INIT || pPrt->PState == SK_PRT_RUN) {
+	if (pPrt->PState >= SK_PRT_INIT) {
 		SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E005, SKERR_HWI_E005MSG);
 		return(2);
 	}
@@ -2129,7 +2747,7 @@ int		Port)		/* Port to configure */
 		SkXmInitMac(pAC, IoC, Port);
 	}
 #endif /* GENESIS */
-	
+
 #ifdef YUKON
 	if (pAC->GIni.GIYukon) {
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/skgemib.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/skgemib.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/skgemib.c	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/skgemib.c	2004-09-09 13:20:48.000000000 +0200
@@ -2,8 +2,8 @@
  *
  * Name:	skgemib.c
  * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.11 $
- * Date:	$Date: 2003/09/15 13:38:12 $
+ * Version:	$Revision: 2.6 $
+ * Date:	$Date: 2004/06/14 06:51:42 $
  * Purpose:	Private Network Management Interface Management Database
  *
  ****************************************************************************/
@@ -251,6 +251,168 @@ PNMI_STATIC const SK_PNMI_TAB_ENTRY IdTa
 		0,
 		SK_PNMI_RW, DiagActions, 0},
 #endif /* SK_DIAG_SUPPORT */
+#ifdef SK_ASF
+    {OID_SKGE_ASF,
+        0,
+        0,
+        0,
+        SK_PNMI_RW, Asf, 0},
+    {OID_SKGE_ASF_STORE_CONFIG,
+        0,
+        0,
+        0,
+        SK_PNMI_RW, Asf, 0},
+    {OID_SKGE_ASF_ENA,
+        0,
+        0,
+        0,
+        SK_PNMI_RW, Asf, 0},
+    {OID_SKGE_ASF_RETRANS,
+        0,
+        0,
+        0,
+        SK_PNMI_RW, Asf, 0},
+    {OID_SKGE_ASF_RETRANS_INT,
+        0,
+        0,
+        0,
+        SK_PNMI_RW, Asf, 0},
+    {OID_SKGE_ASF_HB_ENA,
+        0,
+        0,
+        0,
+        SK_PNMI_RW, Asf, 0},
+    {OID_SKGE_ASF_HB_INT,
+        0,
+        0,
+        0,
+        SK_PNMI_RW, Asf, 0},
+    {OID_SKGE_ASF_WD_ENA,
+        0,
+        0,
+        0,
+        SK_PNMI_RW, Asf, 0},
+    {OID_SKGE_ASF_WD_TIME,
+        0,
+        0,
+        0,
+        SK_PNMI_RW, Asf, 0},
+    {OID_SKGE_ASF_IP_SOURCE,
+        0,
+        0,
+        0,
+        SK_PNMI_RW, Asf, 0},
+    {OID_SKGE_ASF_MAC_SOURCE,
+        0,
+        0,
+        0,
+        SK_PNMI_RW, Asf, 0},
+    {OID_SKGE_ASF_IP_DEST,
+        0,
+        0,
+        0,
+        SK_PNMI_RW, Asf, 0},
+    {OID_SKGE_ASF_MAC_DEST,
+        0,
+        0,
+        0,
+        SK_PNMI_RW, Asf, 0},
+    {OID_SKGE_ASF_COMMUNITY_NAME,
+        0,
+        0,
+        0,
+        SK_PNMI_RW, Asf, 0},
+    {OID_SKGE_ASF_RSP_ENA,
+        0,
+        0,
+        0,
+        SK_PNMI_RW, Asf, 0},
+    {OID_SKGE_ASF_RETRANS_COUNT_MIN,
+        0,
+        0,
+        0,
+        SK_PNMI_RW, Asf, 0},
+    {OID_SKGE_ASF_RETRANS_COUNT_MAX,
+        0,
+        0,
+        0,
+        SK_PNMI_RW, Asf, 0},
+    {OID_SKGE_ASF_RETRANS_INT_MIN,
+        0,
+        0,
+        0,
+        SK_PNMI_RW, Asf, 0},
+    {OID_SKGE_ASF_RETRANS_INT_MAX,
+        0,
+        0,
+        0,
+        SK_PNMI_RW, Asf, 0},
+    {OID_SKGE_ASF_HB_INT_MIN,
+        0,
+        0,
+        0,
+        SK_PNMI_RW, Asf, 0},
+    {OID_SKGE_ASF_HB_INT_MAX,
+        0,
+        0,
+        0,
+        SK_PNMI_RW, Asf, 0},
+    {OID_SKGE_ASF_WD_TIME_MIN,
+        0,
+        0,
+        0,
+        SK_PNMI_RW, Asf, 0},
+    {OID_SKGE_ASF_WD_TIME_MAX,
+        0,
+        0,
+        0,
+        SK_PNMI_RW, Asf, 0},
+    {OID_SKGE_ASF_HB_CAP,
+        0,
+        0,
+        0,
+        SK_PNMI_RW, Asf, 0},
+    {OID_SKGE_ASF_WD_TIMER_RES,
+        0,
+        0,
+        0,
+        SK_PNMI_RW, Asf, 0},
+    {OID_SKGE_ASF_GUID,
+        0,
+        0,
+        0,
+        SK_PNMI_RW, Asf, 0},
+    {OID_SKGE_ASF_KEY_OP,
+        0,
+        0,
+        0,
+        SK_PNMI_RW, Asf, 0},
+    {OID_SKGE_ASF_KEY_ADM,
+        0,
+        0,
+        0,
+        SK_PNMI_RW, Asf, 0},
+    {OID_SKGE_ASF_KEY_GEN,
+        0,
+        0,
+        0,
+        SK_PNMI_RW, Asf, 0},
+    {OID_SKGE_ASF_CAP,
+        0,
+        0,
+        0,
+        SK_PNMI_RW, Asf, 0},
+    {OID_SKGE_ASF_PAR_1,
+        0,
+        0,
+        0,
+        SK_PNMI_RW, Asf, 0},
+    {OID_SKGE_ASF_OVERALL_OID,
+        0,
+        0,
+        0,
+        SK_PNMI_RW, Asf, 0},
+#endif /* SK_ASF */
 	{OID_SKGE_MDB_VERSION,
 		1,
 		0,
@@ -1073,6 +1235,11 @@ PNMI_STATIC const SK_PNMI_TAB_ENTRY IdTa
 		0,
 		0,
 		SK_PNMI_RO, Vct, 0},
+	{OID_SKGE_VCT_CAPABILITIES,
+		0,
+		0,
+		0,
+		SK_PNMI_RO, Vct, 0},
 	{OID_SKGE_BOARDLEVEL,
 		0,
 		0,
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/skgepnmi.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/skgepnmi.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/skgepnmi.c	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/skgepnmi.c	2004-09-09 13:20:48.000000000 +0200
@@ -1,9 +1,9 @@
 /*****************************************************************************
  *
  * Name:	skgepnmi.c
- * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.111 $
- * Date:	$Date: 2003/09/15 13:35:35 $
+ * Project:	Gigabit Ethernet Adapters, PNMI-Module
+ * Version:	$Revision: 2.13 $
+ * Date:	$Date: 2004/06/14 06:50:30 $
  * Purpose:	Private Network Management Interface
  *
  ****************************************************************************/
@@ -22,11 +22,10 @@
  *
  ******************************************************************************/
 
-
-#ifndef _lint
+#if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
 static const char SysKonnectFileId[] =
-	"@(#) $Id: skgepnmi.c,v 1.111 2003/09/15 13:35:35 tschilli Exp $ (C) Marvell.";
-#endif /* !_lint */
+	"@(#) $Id: skgepnmi.c,v 2.13 2004/06/14 06:50:30 tschilli Exp $ (C) Marvell.";
+#endif
 
 #include "h/skdrv1st.h"
 #include "h/sktypes.h"
@@ -38,12 +37,14 @@ static const char SysKonnectFileId[] =
 #include "h/skcsum.h"
 #include "h/skvpd.h"
 #include "h/skgehw.h"
+#include "h/sky2le.h"
 #include "h/skgeinit.h"
 #include "h/skdrv2nd.h"
 #include "h/skgepnm2.h"
 #ifdef SK_POWER_MGMT
 #include "h/skgepmgt.h"
-#endif
+#endif /* SK_POWER_MGMT */
+
 /* defines *******************************************************************/
 
 #ifndef DEBUG
@@ -72,7 +73,6 @@ int SkPnmiEvent(SK_AC *pAC, SK_IOC IoC, 
 int SkPnmiGenIoctl(SK_AC *pAC, SK_IOC IoC, void * pBuf,
 	unsigned int * pLen, SK_U32 NetIndex);
 
-
 /*
  * Private Function prototypes
  */
@@ -112,6 +112,12 @@ PNMI_STATIC void VirtualConf(SK_AC *pAC,
 PNMI_STATIC int Vct(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);
 PNMI_STATIC void CheckVctStatus(SK_AC *, SK_IOC, char *, SK_U32, SK_U32);
+PNMI_STATIC void VctGetResults(SK_AC *, SK_IOC, SK_U32);
+#ifdef SK_ASF
+PNMI_STATIC int Asf(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_ASF */
 
 /*
  * Table to correlate OID with handler function and index to
@@ -353,17 +359,13 @@ PNMI_STATIC const SK_PNMI_STATADDR StatA
  *	Always 0
  */
 int SkPnmiInit(
-SK_AC *pAC,		/* Pointer to adapter context */
-SK_IOC IoC,		/* IO context handle */
-int Level)		/* Initialization level */
+SK_AC	*pAC,		/* Pointer to adapter context */
+SK_IOC	IoC,		/* IO context handle */
+int		Level)		/* Initialization level */
 {
 	unsigned int	PortMax;	/* Number of ports */
 	unsigned int	PortIndex;	/* Current port index in loop */
-	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_PNMI_VCT	*pVctBackupData;
-
+	SK_EVPARA		EventParam;	/* Event struct for timer event */
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
 		("PNMI: SkPnmiInit: Called, level=%d\n", Level));
@@ -372,9 +374,11 @@ int Level)		/* Initialization level */
 
 	case SK_INIT_DATA:
 		SK_MEMSET((char *)&pAC->Pnmi, 0, sizeof(pAC->Pnmi));
+		
 		pAC->Pnmi.TrapBufFree = SK_PNMI_TRAP_QUEUE_LEN;
 		pAC->Pnmi.StartUpTime = SK_PNMI_HUNDREDS_SEC(SkOsGetTime(pAC));
 		pAC->Pnmi.RlmtChangeThreshold = SK_PNMI_DEF_RLMT_CHG_THRES;
+		
 		for (PortIndex = 0; PortIndex < SK_MAX_MACS; PortIndex ++) {
 
 			pAC->Pnmi.Port[PortIndex].ActiveFlag = SK_FALSE;
@@ -408,51 +412,42 @@ int Level)		/* Initialization level */
 		break;
 
 	case SK_INIT_IO:
-		/*
-		 * Reset MAC counters
-		 */
+
+		/* Reset MAC counters. */
 		PortMax = pAC->GIni.GIMacsFound;
 
 		for (PortIndex = 0; PortIndex < PortMax; PortIndex ++) {
 
 			pAC->GIni.GIFunc.pFnMacResetCounter(pAC, IoC, PortIndex);
 		}
-		
+
 		/* Initialize DSP variables for Vct() to 0xff => Never written! */		
 		for (PortIndex = 0; PortIndex < PortMax; PortIndex ++) {
 			pAC->GIni.GP[PortIndex].PCableLen = 0xff;
-			pVctBackupData = &pAC->Pnmi.VctBackup[PortIndex];
-			pVctBackupData->PCableLen = 0xff;
+			pAC->Pnmi.VctBackup[PortIndex].CableLen = 0xff;
 		}
-		
-		/*
-		 * Get pci bus speed
-		 */
-		SK_IN16(IoC, B0_CTST, &Val16);
-		if ((Val16 & CS_BUS_CLOCK) == 0) {
 
-			pAC->Pnmi.PciBusSpeed = 33;
+		/* Get PCI bus speed. */
+		if (pAC->GIni.GIPciClock66) {
+
+			pAC->Pnmi.PciBusSpeed = 66;
 		}
 		else {
-			pAC->Pnmi.PciBusSpeed = 66;
+			pAC->Pnmi.PciBusSpeed = 33;
 		}
 
-		/*
-		 * Get pci bus width
-		 */
-		SK_IN16(IoC, B0_CTST, &Val16);
-		if ((Val16 & CS_BUS_SLOT_SZ) == 0) {
+		/* Get PCI bus width. */
+		if (pAC->GIni.GIPciSlot64) {
 
-			pAC->Pnmi.PciBusWidth = 32;
+			pAC->Pnmi.PciBusWidth = 64;
 		}
 		else {
-			pAC->Pnmi.PciBusWidth = 64;
+			pAC->Pnmi.PciBusWidth = 32;
 		}
 
-		/*
-		 * Get chipset
-		 */
+		/* Get chipset. */
 		switch (pAC->GIni.GIChipId) {
+		
 		case CHIP_ID_GENESIS:
 			pAC->Pnmi.Chipset = SK_PNMI_CHIPSET_XMAC;
 			break;
@@ -465,53 +460,27 @@ int Level)		/* Initialization level */
 			break;
 		}
 
-		/*
-		 * Get PMD and DeviceType
-		 */
-		SK_IN8(IoC, B2_PMD_TYP, &Val8);
-		switch (Val8) {
+		/* Get PMD and Device Type. */
+		switch (pAC->GIni.GIPmdTyp) {
+		
 		case 'S':
 			pAC->Pnmi.PMD = 3;
-			if (pAC->GIni.GIMacsFound > 1) {
-
-				pAC->Pnmi.DeviceType = 0x00020002;
-			}
-			else {
-				pAC->Pnmi.DeviceType = 0x00020001;
-			}
+			pAC->Pnmi.DeviceType = 0x00020001;
 			break;
 
 		case 'L':
 			pAC->Pnmi.PMD = 2;
-			if (pAC->GIni.GIMacsFound > 1) {
-
-				pAC->Pnmi.DeviceType = 0x00020004;
-			}
-			else {
-				pAC->Pnmi.DeviceType = 0x00020003;
-			}
+			pAC->Pnmi.DeviceType = 0x00020003;
 			break;
 
 		case 'C':
 			pAC->Pnmi.PMD = 4;
-			if (pAC->GIni.GIMacsFound > 1) {
-
-				pAC->Pnmi.DeviceType = 0x00020006;
-			}
-			else {
-				pAC->Pnmi.DeviceType = 0x00020005;
-			}
+			pAC->Pnmi.DeviceType = 0x00020005;
 			break;
 
 		case 'T':
 			pAC->Pnmi.PMD = 5;
-			if (pAC->GIni.GIMacsFound > 1) {
-
-				pAC->Pnmi.DeviceType = 0x00020008;
-			}
-			else {
-				pAC->Pnmi.DeviceType = 0x00020007;
-			}
+			pAC->Pnmi.DeviceType = 0x00020007;
 			break;
 
 		default :
@@ -520,11 +489,14 @@ int Level)		/* Initialization level */
 			break;
 		}
 
-		/*
-		 * Get connector
-		 */
-		SK_IN8(IoC, B2_CONN_TYP, &Val8);
-		switch (Val8) {
+		if (pAC->GIni.GIMacsFound > 1) {
+
+			pAC->Pnmi.DeviceType++;
+		}
+		
+		/* Get connector type. */
+		switch (pAC->GIni.GIConTyp) {
+		
 		case 'C':
 			pAC->Pnmi.Connector = 2;
 			break;
@@ -552,17 +524,17 @@ int Level)		/* Initialization level */
 		break;
 
 	case SK_INIT_RUN:
-		/*
-		 * Start timer for RLMT change counter
-		 */
+
+		/* Start timer for RLMT change counter. */
 		SK_MEMSET((char *)&EventParam, 0, sizeof(EventParam));
+		
 		SkTimerStart(pAC, IoC, &pAC->Pnmi.RlmtChangeEstimate.EstTimer,
-			28125000, SKGE_PNMI, SK_PNMI_EVT_CHG_EST_TIMER,
+			SK_PNMI_EVT_TIMER_CHECK, SKGE_PNMI, SK_PNMI_EVT_CHG_EST_TIMER,
 			EventParam);
 		break;
 
 	default:
-		break; /* Nothing todo */
+		break; /* Nothing to do. */
 	}
 
 	return (0);
@@ -642,7 +614,6 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		("PNMI: SkPnmiPreSetVar: Called, Id=0x%x, BufLen=%d, Instance=%d, NetIndex=%d\n",
 			Id, *pLen, Instance, NetIndex));
 
-
 	return (PnmiVar(pAC, IoC, SK_PNMI_PRESET, Id, (char *)pBuf, pLen,
 		Instance, NetIndex));
 }
@@ -724,7 +695,6 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	unsigned int	TmpLen;
 	char		KeyArr[SK_PNMI_VPD_ENTRIES][SK_PNMI_VPD_KEY_SIZE];
 
-
 	SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
 		("PNMI: SkPnmiGetStruct: Called, BufLen=%d, NetIndex=%d\n",
 			*pLen, NetIndex));
@@ -733,22 +703,19 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 
 		if (*pLen >= SK_PNMI_MIN_STRUCT_SIZE) {
 
-			SK_PNMI_SET_STAT(pBuf, SK_PNMI_ERR_TOO_SHORT,
-				(SK_U32)(-1));
+			SK_PNMI_SET_STAT(pBuf, SK_PNMI_ERR_TOO_SHORT, (SK_U32)(-1));
 		}
 
 		*pLen = SK_PNMI_STRUCT_SIZE;
 		return (SK_PNMI_ERR_TOO_SHORT);
 	}
 
-    /*
-     * Check NetIndex
-     */
+	/* Check NetIndex. */
 	if (NetIndex >= pAC->Rlmt.NumNets) {
 		return (SK_PNMI_ERR_UNKNOWN_NET);
 	}
 
-	/* Update statistic */
+	/* Update statistics. */
 	SK_PNMI_CHECKFLAGS("SkPnmiGetStruct: On call");
 
 	if ((Ret = MacUpdate(pAC, IoC, 0, pAC->GIni.GIMacsFound - 1)) !=
@@ -773,15 +740,12 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		return (Ret);
 	}
 
-	/*
-	 * Increment semaphores to indicate that an update was
-	 * already done
-	 */
+	/* Increment semaphores to indicate that an update was already done. */
 	pAC->Pnmi.MacUpdatedFlag ++;
 	pAC->Pnmi.RlmtUpdatedFlag ++;
 	pAC->Pnmi.SirqUpdatedFlag ++;
 
-	/* Get vpd keys for instance calculation */
+	/* Get VPD keys for instance calculation. */
 	Ret = GetVpdKeyArr(pAC, IoC, &KeyArr[0][0], sizeof(KeyArr), &TmpLen);
 	if (Ret != SK_PNMI_ERR_OK) {
 
@@ -795,13 +759,13 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		return (SK_PNMI_ERR_GENERAL);
 	}
 
-	/* Retrieve values */
+	/* Retrieve values. */
 	SK_MEMSET((char *)pBuf, 0, SK_PNMI_STRUCT_SIZE);
+	
 	for (TableIndex = 0; TableIndex < ID_TABLE_SIZE; TableIndex ++) {
 
 		InstanceNo = IdTable[TableIndex].InstanceNo;
-		for (InstanceCnt = 1; InstanceCnt <= InstanceNo;
-			InstanceCnt ++) {
+		for (InstanceCnt = 1; InstanceCnt <= InstanceNo; InstanceCnt ++) {
 
 			DstOffset = IdTable[TableIndex].Offset +
 				(InstanceCnt - 1) *
@@ -998,7 +962,6 @@ SK_EVPARA Param)	/* Event dependent para
 	unsigned int	PhysPortIndex;
     unsigned int	MaxNetNumber;
 	int			CounterIndex;
-	int			Ret;
 	SK_U16		MacStatus;
 	SK_U64		OverflowStatus;
 	SK_U64		Mask;
@@ -1012,12 +975,7 @@ SK_EVPARA Param)	/* Event dependent para
 	SK_U64		Delta;
 	SK_PNMI_ESTIMATE *pEst;
 	SK_U32		NetIndex;
-	SK_GEPORT	*pPrt;
-	SK_PNMI_VCT	*pVctBackupData;
 	SK_U32		RetCode;
-	int		i;
-	SK_U32		CableLength;
-
 
 #ifdef DEBUG
 	if (Event != SK_PNMI_EVT_XMAC_RESET) {
@@ -1048,9 +1006,7 @@ SK_EVPARA Param)	/* Event dependent para
 #endif /* DEBUG */
 		OverflowStatus = 0;
 
-		/*
-		 * Check which source caused an overflow interrupt.
-		 */
+		/* Check which source caused an overflow interrupt. */
 		if ((pAC->GIni.GIFunc.pFnMacOverflow(pAC, IoC, PhysPortIndex,
 				MacStatus, &OverflowStatus) != 0) ||
 			(OverflowStatus == 0)) {
@@ -1068,7 +1024,6 @@ SK_EVPARA Param)	/* Event dependent para
 
 			Mask = (SK_U64)1 << CounterIndex;
 			if ((OverflowStatus & Mask) == 0) {
-
 				continue;
 			}
 
@@ -1100,9 +1055,7 @@ SK_EVPARA Param)	/* Event dependent para
 			case SK_PNMI_HRX_IRLENGTH:
 			case SK_PNMI_HRX_RESERVED:
 			
-			/*
-			 * the following counters aren't be handled (id > 63)
-			 */
+			/* The following counters aren't be handled (id > 63). */
 			case SK_PNMI_HTX_SYNC:
 			case SK_PNMI_HTX_SYNC_OCTET:
 				break;
@@ -1189,7 +1142,7 @@ 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_ERR_UPP parameter wrong, SensorIndex=%d\n",
+				("PNMI: ERR: SK_PNMI_EVT_SEN_ERR_UPP parameter wrong, SensorIndex=%d\n",
 				(unsigned int)Param.Para64));
 			return (0);
 		}
@@ -1208,16 +1161,14 @@ SK_EVPARA Param)	/* Event dependent para
 	case SK_PNMI_EVT_CHG_EST_TIMER:
 		/*
 		 * Calculate port switch average on a per hour basis
-		 *   Time interval for check       : 28125 ms
+		 *   Time interval for check       : 28125 ms (SK_PNMI_EVT_TIMER_CHECK)
 		 *   Number of values for average  : 8
 		 *
 		 * Be careful in changing these values, on change check
 		 *   - typedef of SK_PNMI_ESTIMATE (Size of EstValue
 		 *     array one less than value number)
 		 *   - Timer initialization SkTimerStart() in SkPnmiInit
-		 *   - Delta value below must be multiplicated with
-		 *     power of 2
-		 *
+		 *   - Delta value below must be multiplicated with power of 2
 		 */
 		pEst = &pAC->Pnmi.RlmtChangeEstimate;
 		CounterIndex = pEst->EstValueIndex + 1;
@@ -1240,7 +1191,7 @@ SK_EVPARA Param)	/* Event dependent para
 			Delta = NewestValue - OldestValue;
 		}
 		else {
-			/* Overflow situation */
+			/* Overflow situation. */
 			Delta = (SK_U64)(0 - OldestValue) + NewestValue;
 		}
 
@@ -1266,8 +1217,9 @@ SK_EVPARA Param)	/* Event dependent para
 		}
 
 		SK_MEMSET((char *)&EventParam, 0, sizeof(EventParam));
+		
 		SkTimerStart(pAC, IoC, &pAC->Pnmi.RlmtChangeEstimate.EstTimer,
-			28125000, SKGE_PNMI, SK_PNMI_EVT_CHG_EST_TIMER,
+			SK_PNMI_EVT_TIMER_CHECK, SKGE_PNMI, SK_PNMI_EVT_CHG_EST_TIMER,
 			EventParam);
 		break;
 
@@ -1311,29 +1263,25 @@ SK_EVPARA Param)	/* Event dependent para
 				(unsigned int)Param.Para64));
 			return (0);
 		}
-#endif
+#endif /* DEBUG */
+
 		PhysPortIndex = (unsigned int)Param.Para64;
 
-		/*
-		 * Update XMAC statistic to get fresh values
-		 */
-		Ret = MacUpdate(pAC, IoC, 0, pAC->GIni.GIMacsFound - 1);
-		if (Ret != SK_PNMI_ERR_OK) {
+		/* Update XMAC statistic to get fresh values. */
+		if (MacUpdate(pAC, IoC, 0, pAC->GIni.GIMacsFound - 1) !=
+			SK_PNMI_ERR_OK) {
 
 			SK_PNMI_CHECKFLAGS("SkPnmiEvent: On return");
 			return (0);
 		}
-		/*
-		 * Increment semaphore to indicate that an update was
-		 * already done
-		 */
+
+		/* Increment semaphore to indicate that an update was already done. */
 		pAC->Pnmi.MacUpdatedFlag ++;
 
 		for (CounterIndex = 0; CounterIndex < SK_PNMI_MAX_IDX;
 			CounterIndex ++) {
 
 			if (!StatAddr[CounterIndex][MacType].GetOffset) {
-
 				continue;
 			}
 
@@ -1366,14 +1314,15 @@ SK_EVPARA Param)	/* Event dependent para
 		QueueRlmtPortTrap(pAC, OID_SKGE_TRAP_RLMT_PORT_UP, PhysPortIndex);
 		(void)SK_DRIVER_SENDEVENT(pAC, IoC);
 
-		/* Bugfix for XMAC errata (#10620)*/
+		/* Bugfix for XMAC errata (#10620). */
 		if (MacType == SK_MAC_XMAC) {
-			/* Add incremental difference to offset (#10620)*/
+			/* Add incremental difference to offset (#10620). */
 			(void)pAC->GIni.GIFunc.pFnMacStatistic(pAC, IoC, PhysPortIndex,
 				XM_RXE_SHT_ERR, &Val32);
 			
 			Value = (((SK_U64)pAC->Pnmi.Port[PhysPortIndex].
 				 CounterHigh[SK_PNMI_HRX_SHORTS] << 32) | (SK_U64)Val32);
+			
 			pAC->Pnmi.Port[PhysPortIndex].CounterOffset[SK_PNMI_HRX_SHORTS] +=
 				Value - pAC->Pnmi.Port[PhysPortIndex].RxShortZeroMark;
 		}
@@ -1403,7 +1352,7 @@ SK_EVPARA Param)	/* Event dependent para
 		QueueRlmtPortTrap(pAC, OID_SKGE_TRAP_RLMT_PORT_DOWN, PhysPortIndex);
 		(void)SK_DRIVER_SENDEVENT(pAC, IoC);
 
-		/* Bugfix #10620 - get zero level for incremental difference */
+		/* Bugfix #10620 - get zero level for incremental difference. */
 		if (MacType == SK_MAC_XMAC) {
 
 			(void)pAC->GIni.GIFunc.pFnMacStatistic(pAC, IoC, PhysPortIndex,
@@ -1435,17 +1384,13 @@ SK_EVPARA Param)	/* Event dependent para
 		}
 #endif /* DEBUG */
 
-		/*
-		 * For now, ignore event if NetIndex != 0.
-		 */
+		/* For now, ignore event if NetIndex != 0. */
 		if (Param.Para32[1] != 0) {
 
 			return (0);
 		}
 
-		/*
-		 * Nothing to do if port is already inactive
-		 */
+		/* Nothing to do if port is already inactive. */
 		if (!pAC->Pnmi.Port[PhysPortIndex].ActiveFlag) {
 
 			return (0);
@@ -1476,7 +1421,6 @@ SK_EVPARA Param)	/* Event dependent para
 			CounterIndex ++) {
 
 			if (!StatAddr[CounterIndex][MacType].GetOffset) {
-
 				continue;
 			}
 
@@ -1485,9 +1429,7 @@ SK_EVPARA Param)	/* Event dependent para
 			pAC->Pnmi.VirtualCounterOffset[CounterIndex] += Value;
 		}
 
-		/*
-		 * Set port to inactive
-		 */
+		/* Set port to inactive. */
 		pAC->Pnmi.Port[PhysPortIndex].ActiveFlag = SK_FALSE;
 
 		pAC->Pnmi.MacUpdatedFlag --;
@@ -1513,25 +1455,19 @@ SK_EVPARA Param)	/* Event dependent para
 		}
 #endif /* DEBUG */
 
-		/*
-		 * For now, ignore event if NetIndex != 0.
-		 */
+		/* For now, ignore event if NetIndex != 0. */
 		if (Param.Para32[1] != 0) {
 
 			return (0);
 		}
 
-		/*
-		 * Nothing to do if port is already active
-		 */
+		/* Nothing to do if port is already inactive. */
 		if (pAC->Pnmi.Port[PhysPortIndex].ActiveFlag) {
 
 			return (0);
 		}
 
-		/*
-		 * Statistic maintenance
-		 */
+		/* Statistic maintenance. */
 		pAC->Pnmi.RlmtChangeCts ++;
 		pAC->Pnmi.RlmtChangeTime = SK_PNMI_HUNDREDS_SEC(SkOsGetTime(pAC));
 
@@ -1565,7 +1501,6 @@ SK_EVPARA Param)	/* Event dependent para
 			CounterIndex ++) {
 
 			if (!StatAddr[CounterIndex][MacType].GetOffset) {
-
 				continue;
 			}
 
@@ -1574,16 +1509,14 @@ 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 --;
 		break;
 
 	case SK_PNMI_EVT_RLMT_SEGMENTATION:
-		/*
-		 * Para.Para32[0] contains the NetIndex.
-		 */
+		/* Para.Para32[0] contains the NetIndex. */
 
 		/*
 		 * Store a trap message in the trap buffer and generate an event for
@@ -1598,71 +1531,53 @@ SK_EVPARA Param)	/* Event dependent para
 		 *  Param.Para32[0] contains the number of Nets.
 		 *  Param.Para32[1] is reserved, contains -1.
 		 */
-	    /*
-    	 * Check number of nets
-		 */
+	    /* Check number of nets. */
 		MaxNetNumber = pAC->GIni.GIMacsFound;
-		if (((unsigned int)Param.Para32[0] < 1)
-			|| ((unsigned int)Param.Para32[0] > MaxNetNumber)) {
+		
+		if (((unsigned int)Param.Para32[0] < 1) ||
+			((unsigned int)Param.Para32[0] > MaxNetNumber)) {
+			
 			return (SK_PNMI_ERR_UNKNOWN_NET);
 		}
 
-        if ((unsigned int)Param.Para32[0] == 1) { /* single net mode */
+        if ((unsigned int)Param.Para32[0] == 1) { /* SingleNet mode. */
         	pAC->Pnmi.DualNetActiveFlag = SK_FALSE;
         }
-        else { /* dual net mode */
+        else { /* DualNet mode. */
         	pAC->Pnmi.DualNetActiveFlag = SK_TRUE;
         }
         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));
+				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);
+				
+				SkTimerStart(pAC, IoC, &pAC->Pnmi.VctTimeout[PhysPortIndex],
+					SK_PNMI_VCT_TIMER_CHECK, 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);
 			
-			/* 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];
-			}
+			VctGetResults(pAC, IoC, PhysPortIndex);
 			
-			Param.Para32[0] = PhysPortIndex;
-			Param.Para32[1] = -1;
-			SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_RESET, Param);
-			SkEventDispatcher(pAC, IoC);
+			EventParam.Para32[0] = PhysPortIndex;
+			EventParam.Para32[1] = -1;
+			SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_RESET, EventParam);
+
+			/* SkEventDispatcher(pAC, IoC); */
 		}
 		
 		break;
@@ -1710,14 +1625,13 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	unsigned int	TableIndex;
 	int		Ret;
 
-
 	if ((TableIndex = LookupId(Id)) == (unsigned int)(-1)) {
 
 		*pLen = 0;
 		return (SK_PNMI_ERR_UNKNOWN_OID);
 	}
 	
-    /* Check NetIndex */
+    /* Check NetIndex. */
 	if (NetIndex >= pAC->Rlmt.NumNets) {
 		return (SK_PNMI_ERR_UNKNOWN_NET);
 	}
@@ -1767,22 +1681,20 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	SK_U32		Instance;
 	SK_U32		Id;
 
-
-	/* Check if the passed buffer has the right size */
+	/* Check if the passed buffer has the right size. */
 	if (*pLen < SK_PNMI_STRUCT_SIZE) {
 
-		/* Check if we can return the error within the buffer */
+		/* Check if we can return the error within the buffer. */
 		if (*pLen >= SK_PNMI_MIN_STRUCT_SIZE) {
 
-			SK_PNMI_SET_STAT(pBuf, SK_PNMI_ERR_TOO_SHORT,
-				(SK_U32)(-1));
+			SK_PNMI_SET_STAT(pBuf, SK_PNMI_ERR_TOO_SHORT, (SK_U32)(-1));
 		}
 
 		*pLen = SK_PNMI_STRUCT_SIZE;
 		return (SK_PNMI_ERR_TOO_SHORT);
 	}
 	
-    /* Check NetIndex */
+    /* Check NetIndex. */
 	if (NetIndex >= pAC->Rlmt.NumNets) {
 		return (SK_PNMI_ERR_UNKNOWN_NET);
 	}
@@ -1810,12 +1722,11 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	pAC->Pnmi.RlmtUpdatedFlag ++;
 	pAC->Pnmi.SirqUpdatedFlag ++;
 
-	/* Preset/Set values */
+	/* PRESET/SET values. */
 	for (TableIndex = 0; TableIndex < ID_TABLE_SIZE; TableIndex ++) {
 
 		if ((IdTable[TableIndex].Access != SK_PNMI_RW) &&
 			(IdTable[TableIndex].Access != SK_PNMI_WO)) {
-
 			continue;
 		}
 
@@ -1826,8 +1737,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			InstanceCnt ++) {
 
 			DstOffset = IdTable[TableIndex].Offset +
-				(InstanceCnt - 1) *
-				IdTable[TableIndex].StructSize;
+				(InstanceCnt - 1) * IdTable[TableIndex].StructSize;
 
 			/*
 			 * Because VPD multiple instance variables are
@@ -1837,9 +1747,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			 */
 			Instance = (SK_U32)InstanceCnt;
 
-			/*
-			 * Evaluate needed buffer length
-			 */
+			/* Evaluate needed buffer length. */
 			Len = 0;
 			Ret = IdTable[TableIndex].Func(pAC, IoC,
 				SK_PNMI_GET, IdTable[TableIndex].Id,
@@ -1855,8 +1763,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 				pAC->Pnmi.SirqUpdatedFlag --;
 
 				SK_PNMI_CHECKFLAGS("PnmiStruct: On return");
-				SK_PNMI_SET_STAT(pBuf,
-					SK_PNMI_ERR_GENERAL, DstOffset);
+				SK_PNMI_SET_STAT(pBuf, SK_PNMI_ERR_GENERAL, DstOffset);
 				*pLen = SK_PNMI_MIN_STRUCT_SIZE;
 				return (SK_PNMI_ERR_GENERAL);
 			}
@@ -1878,7 +1785,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 				}
 			}
 
-			/* Call the OID handler function */
+			/* Call the OID handler function. */
 			Ret = IdTable[TableIndex].Func(pAC, IoC, Action,
 				IdTable[TableIndex].Id, pBuf + DstOffset,
 				&Len, Instance, TableIndex, NetIndex);
@@ -1889,8 +1796,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 				pAC->Pnmi.SirqUpdatedFlag --;
 
 				SK_PNMI_CHECKFLAGS("PnmiStruct: On return");
-				SK_PNMI_SET_STAT(pBuf, SK_PNMI_ERR_BAD_VALUE,
-					DstOffset);
+				SK_PNMI_SET_STAT(pBuf, SK_PNMI_ERR_BAD_VALUE, DstOffset);
 				*pLen = SK_PNMI_MIN_STRUCT_SIZE;
 				return (SK_PNMI_ERR_BAD_VALUE);
 			}
@@ -1924,7 +1830,7 @@ SK_U32 Id)		/* Object identifier to be s
 
 		if (IdTable[i].Id == Id) {
 
-			return i;
+			return (i);
 		}
 	}
 
@@ -1965,16 +1871,13 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 {
 	if (Id != OID_SKGE_ALL_DATA) {
 
-		SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR003,
-			SK_PNMI_ERR003MSG);
+		SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR003, SK_PNMI_ERR003MSG);
 
 		*pLen = 0;
 		return (SK_PNMI_ERR_GENERAL);
 	}
 
-	/*
-	 * Check instance. We only handle single instance variables
-	 */
+	/* Check instance. We only handle single instance variables. */
 	if (Instance != (SK_U32)(-1) && Instance != 1) {
 
 		*pLen = 0;
@@ -2033,10 +1936,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	int	Ret;
 	SK_U32	ActionOp;
 
-
-	/*
-	 * Check instance. We only handle single instance variables
-	 */
+	/* Check instance. We only handle single instance variables. */
 	if (Instance != (SK_U32)(-1) && Instance != 1) {
 
 		*pLen = 0;
@@ -2049,10 +1949,10 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		return (SK_PNMI_ERR_TOO_SHORT);
 	}
 
-	/* Check if a get should be performed */
+	/* Check if a GET should be performed. */
 	if (Action == SK_PNMI_GET) {
 
-		/* A get is easy. We always return the same value */
+		/* A GET is easy. We always return the same value. */
 		ActionOp = (SK_U32)SK_PNMI_ACT_IDLE;
 		SK_PNMI_STORE_U32(pBuf, ActionOp);
 		*pLen = sizeof(SK_U32);
@@ -2060,13 +1960,13 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		return (SK_PNMI_ERR_OK);
 	}
 
-	/* Continue with PRESET/SET action */
+	/* Continue with PRESET/SET action. */
 	if (*pLen > sizeof(SK_U32)) {
 
 		return (SK_PNMI_ERR_BAD_VALUE);
 	}
 
-	/* Check if the command is a known one */
+	/* Check if the command is a known one. */
 	SK_PNMI_READ_U32(pBuf, ActionOp);
 	if (*pLen > sizeof(SK_U32) ||
 		(ActionOp != SK_PNMI_ACT_IDLE &&
@@ -2078,7 +1978,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		return (SK_PNMI_ERR_BAD_VALUE);
 	}
 
-	/* A preset ends here */
+	/* A PRESET ends here. */
 	if (Action == SK_PNMI_PRESET) {
 
 		return (SK_PNMI_ERR_OK);
@@ -2087,19 +1987,15 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	switch (ActionOp) {
 
 	case SK_PNMI_ACT_IDLE:
-		/* Nothing to do */
+		/* Nothing to do. */
 		break;
 
 	case SK_PNMI_ACT_RESET:
-		/*
-		 * Perform a driver reset or something that comes near
-		 * to this.
-		 */
+		/* Perform a driver reset or something that comes near to this. */
 		Ret = SK_DRIVER_RESET(pAC, IoC);
 		if (Ret != 0) {
 
-			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR005,
-				SK_PNMI_ERR005MSG);
+			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR005, SK_PNMI_ERR005MSG);
 
 			return (SK_PNMI_ERR_GENERAL);
 		}
@@ -2116,13 +2012,12 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		break;
 
 	case SK_PNMI_ACT_RESETCNT:
-		/* Set all counters and timestamps to zero */
+		/* Set all counters and timestamps to zero. */
 		ResetCounter(pAC, IoC, NetIndex);
 		break;
 
 	default:
-		SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR006,
-			SK_PNMI_ERR006MSG);
+		SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR006, SK_PNMI_ERR006MSG);
 
 		return (SK_PNMI_ERR_GENERAL);
 	}
@@ -2166,25 +2061,21 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	SK_U32  StatVal32;
 	SK_BOOL Is64BitReq = SK_FALSE;
 
-	/*
-	 * Only the active Mac is returned
-	 */
+	/* Only the active MAC is returned. */
 	if (Instance != (SK_U32)(-1) && Instance != 1) {
 
 		*pLen = 0;
 		return (SK_PNMI_ERR_UNKNOWN_INST);
 	}
 
-	/*
-	 * Check action type
-	 */
+	/* Check action type. */
 	if (Action != SK_PNMI_GET) {
 
 		*pLen = 0;
 		return (SK_PNMI_ERR_READ_ONLY);
 	}
 
-	/* Check length */
+	/* Check length. */
 	switch (Id) {
 
 	case OID_802_3_PERMANENT_ADDRESS:
@@ -2205,12 +2096,12 @@ 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 32 bits are required for OID. */
 		if (*pLen < sizeof(SK_U32)) {
 			/*
-			* but indicate handling for 64bit values,
-			* if insufficient space is provided
-			*/
+			 * Indicate handling for 64 bit values,
+			 * if insufficient space is provided.
+			 */
 			*pLen = sizeof(SK_U64);
 			return (SK_PNMI_ERR_TOO_SHORT);
 		}
@@ -2226,16 +2117,14 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	 * to indicate that an update was already done.
 	 */
 	Ret = MacUpdate(pAC, IoC, 0, pAC->GIni.GIMacsFound - 1);
-	if ( Ret != SK_PNMI_ERR_OK) {
+	if (Ret != SK_PNMI_ERR_OK) {
 
 		*pLen = 0;
 		return (Ret);
 	}
 	pAC->Pnmi.MacUpdatedFlag ++;
 
-	/*
-	 * Get value (MAC Index 0 identifies the virtual MAC)
-	 */
+	/* Get value (MAC index 0 identifies the virtual MAC). */
 	switch (Id) {
 
 	case OID_802_3_PERMANENT_ADDRESS:
@@ -2251,7 +2140,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 32 bit values are evaluated. */
 		if (!Is64BitReq) {
 			StatVal32 = (SK_U32)StatVal;
 			SK_PNMI_STORE_U32(pBuf, StatVal32);
@@ -2305,21 +2194,19 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	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 */
+	if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) { /* DualNet mode. */
 		LogPortMax--;
 	}
 
-	if ((Instance != (SK_U32)(-1))) { /* Only one specific instance is queried */
-		/* Check instance range */
+	if ((Instance != (SK_U32)(-1))) { /* Only one specific instance is queried. */
+		/* Check instance range. */
 		if ((Instance < 1) || (Instance > LogPortMax)) {
 
 			*pLen = 0;
@@ -2329,20 +2216,20 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		Limit = LogPortIndex + 1;
 	}
 
-	else { /* Instance == (SK_U32)(-1), get all Instances of that OID */
+	else { /* Instance == (SK_U32)(-1), get all Instances of that OID. */
 
 		LogPortIndex = 0;
 		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);
@@ -2361,7 +2248,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	}
 	pAC->Pnmi.MacUpdatedFlag ++;
 
-	/* Get value */
+	/* Get value. */
 	Offset = 0;
 	for (; LogPortIndex < Limit; LogPortIndex ++) {
 
@@ -2467,19 +2354,16 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	unsigned int	Limit;
 	unsigned int	Offset = 0;
 
-	/*
-	 * 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);
 
-	if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) { /* Dual net mode */
+	if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) { /* DualNet mode. */
 		LogPortMax--;
 	}
 
-	if ((Instance != (SK_U32)(-1))) { /* Only one specific instance is queried */
-		/* Check instance range */
+	if ((Instance != (SK_U32)(-1))) { /* Only one specific instance is queried. */
+		/* Check instance range. */
 		if ((Instance < 1) || (Instance > LogPortMax)) {
 
 			*pLen = 0;
@@ -2488,27 +2372,23 @@ 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 */
+	else { /* Instance == (SK_U32)(-1), get all Instances of that OID. */
 
 		LogPortIndex = 0;
 		Limit = LogPortMax;
 	}
 
-	/*
-	 * Perform Action
-	 */
+	/* Perform action. */
 	if (Action == SK_PNMI_GET) {
 
-		/* Check length */
+		/* Check length. */
 		if (*pLen < (Limit - LogPortIndex) * 6) {
 
 			*pLen = (Limit - LogPortIndex) * 6;
 			return (SK_PNMI_ERR_TOO_SHORT);
 		}
 
-		/*
-		 * Get value
-		 */
+		/* Get value. */
 		for (; LogPortIndex < Limit; LogPortIndex ++) {
 
 			switch (Id) {
@@ -2532,8 +2412,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 						&pAC->Addr.Net[NetIndex].PermanentMacAddress);
 				}
 				else {
-					PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
-						pAC, LogPortIndex);
+					PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(pAC, LogPortIndex);
 
 					CopyMac(pBuf + Offset,
 						&pAC->Addr.Port[PhysPortIndex].PermanentMacAddress);
@@ -2542,8 +2421,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 				break;
 
 			default:
-				SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR008,
-					SK_PNMI_ERR008MSG);
+				SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR008, SK_PNMI_ERR008MSG);
 
 				*pLen = 0;
 				return (SK_PNMI_ERR_GENERAL);
@@ -2554,8 +2432,8 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	}
 	else {
 		/*
-		 * The logical MAC address may not be changed only
-		 * the physical ones
+		 * The logical MAC address may not be changed,
+		 * only the physical ones.
 		 */
 		if (Id == OID_SKGE_PHYS_FAC_ADDR) {
 
@@ -2563,19 +2441,16 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			return (SK_PNMI_ERR_READ_ONLY);
 		}
 
-		/*
-		 * Only the current address may be changed
-		 */
+		/* Only the current address may be changed. */
 		if (Id != OID_SKGE_PHYS_CUR_ADDR) {
 
-			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR009,
-				SK_PNMI_ERR009MSG);
+			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR009, SK_PNMI_ERR009MSG);
 
 			*pLen = 0;
 			return (SK_PNMI_ERR_GENERAL);
 		}
 
-		/* Check length */
+		/* Check length. */
 		if (*pLen < (Limit - LogPortIndex) * 6) {
 
 			*pLen = (Limit - LogPortIndex) * 6;
@@ -2587,32 +2462,26 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			return (SK_PNMI_ERR_BAD_VALUE);
 		}
 
-		/*
-		 * Check Action
-		 */
+		/* Check action. */
 		if (Action == SK_PNMI_PRESET) {
 
 			*pLen = 0;
 			return (SK_PNMI_ERR_OK);
 		}
 
-		/*
-		 * Set OID_SKGE_MAC_CUR_ADDR
-		 */
+		/* Set OID_SKGE_MAC_CUR_ADDR.  */
 		for (; LogPortIndex < Limit; LogPortIndex ++, Offset += 6) {
 
 			/*
 			 * A set to virtual port and set of broadcast
-			 * address will be ignored
+			 * address will be ignored.
 			 */
 			if (LogPortIndex == 0 || SK_MEMCMP(pBuf + Offset,
 				"\xff\xff\xff\xff\xff\xff", 6) == 0) {
-
 				continue;
 			}
 
-			PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(pAC,
-				LogPortIndex);
+			PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(pAC, LogPortIndex);
 
 			Ret = SkAddrOverride(pAC, IoC, PhysPortIndex,
 				(SK_MAC_ADDR *)(pBuf + Offset),
@@ -2665,10 +2534,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	unsigned int	Offset = 0;
 	SK_U64		StatVal;
 
-
-	/*
-	 * Calculate instance if wished
-	 */
+	/* Calculate instance if wished. */
 	if (Instance != (SK_U32)(-1)) {
 
 		if ((Instance < 1) || (Instance > SKCS_NUM_PROTOCOLS)) {
@@ -2684,25 +2550,21 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		Limit = SKCS_NUM_PROTOCOLS;
 	}
 
-	/*
-	 * Check action
-	 */
+	/* Check action. */
 	if (Action != SK_PNMI_GET) {
 
 		*pLen = 0;
 		return (SK_PNMI_ERR_READ_ONLY);
 	}
 
-	/* Check length */
+	/* Check length. */
 	if (*pLen < (Limit - Index) * sizeof(SK_U64)) {
 
 		*pLen = (Limit - Index) * sizeof(SK_U64);
 		return (SK_PNMI_ERR_TOO_SHORT);
 	}
 
-	/*
-	 * Get value
-	 */
+	/* Get value. */
 	for (; Index < Limit; Index ++) {
 
 		switch (Id) {
@@ -2728,8 +2590,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			break;
 
 		default:
-			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR010,
-				SK_PNMI_ERR010MSG);
+			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR010, SK_PNMI_ERR010MSG);
 
 			*pLen = 0;
 			return (SK_PNMI_ERR_GENERAL);
@@ -2739,9 +2600,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		Offset += sizeof(SK_U64);
 	}
 
-	/*
-	 * Store used buffer space
-	 */
+	/* Store used buffer space. */
 	*pLen = Offset;
 
 	return (SK_PNMI_ERR_OK);
@@ -2784,10 +2643,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	SK_U32		Val32;
 	SK_U64		Val64;
 
-
-	/*
-	 * Calculate instance if wished
-	 */
+	/* Calculate instance if wished. */
 	if ((Instance != (SK_U32)(-1))) {
 
 		if ((Instance < 1) || (Instance > (SK_U32)pAC->I2c.MaxSens)) {
@@ -2804,16 +2660,14 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		Limit = (unsigned int) pAC->I2c.MaxSens;
 	}
 
-	/*
-	 * Check action
-	 */
+	/* Check action. */
 	if (Action != SK_PNMI_GET) {
 
 		*pLen = 0;
 		return (SK_PNMI_ERR_READ_ONLY);
 	}
 
-	/* Check length */
+	/* Check length. */
 	switch (Id) {
 
 	case OID_SKGE_SENSOR_VALUE:
@@ -2872,38 +2726,33 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		break;
 
 	default:
-		SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR012,
-			SK_PNMI_ERR012MSG);
+		SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR012, SK_PNMI_ERR012MSG);
 
 		*pLen = 0;
 		return (SK_PNMI_ERR_GENERAL);
 
 	}
 
-	/*
-	 * Get value
-	 */
+	/* Get value. */
 	for (Offset = 0; Index < Limit; Index ++) {
 
 		switch (Id) {
 
 		case OID_SKGE_SENSOR_INDEX:
 			*(pBuf + Offset) = (char)Index;
-			Offset += sizeof(char);
+			Offset ++;
 			break;
 
 		case OID_SKGE_SENSOR_DESCR:
 			Len = SK_STRLEN(pAC->I2c.SenTable[Index].SenDesc);
-			SK_MEMCPY(pBuf + Offset + 1,
-				pAC->I2c.SenTable[Index].SenDesc, Len);
+			SK_MEMCPY(pBuf + Offset + 1, pAC->I2c.SenTable[Index].SenDesc, Len);
 			*(pBuf + Offset) = (char)Len;
 			Offset += Len + 1;
 			break;
 
 		case OID_SKGE_SENSOR_TYPE:
-			*(pBuf + Offset) =
-				(char)pAC->I2c.SenTable[Index].SenType;
-			Offset += sizeof(char);
+			*(pBuf + Offset) = (char)pAC->I2c.SenTable[Index].SenType;
+			Offset ++;
 			break;
 
 		case OID_SKGE_SENSOR_VALUE:
@@ -2940,9 +2789,8 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			break;
 
 		case OID_SKGE_SENSOR_STATUS:
-			*(pBuf + Offset) =
-				(char)pAC->I2c.SenTable[Index].SenErrFlag;
-			Offset += sizeof(char);
+			*(pBuf + Offset) = (char)pAC->I2c.SenTable[Index].SenErrFlag;
+			Offset ++;
 			break;
 
 		case OID_SKGE_SENSOR_WAR_CTS:
@@ -2979,9 +2827,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		}
 	}
 
-	/*
-	 * Store used buffer space
-	 */
+	/* Store used buffer space. */
 	*pLen = Offset;
 
 	return (SK_PNMI_ERR_OK);
@@ -3035,9 +2881,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	int		Ret;
 	SK_U32		Val32;
 
-	/*
-	 * Get array of all currently stored VPD keys
-	 */
+	/* Get array of all currently stored VPD keys. */
 	Ret = GetVpdKeyArr(pAC, IoC, &KeyArr[0][0], sizeof(KeyArr), &KeyNo);
 	if (Ret != SK_PNMI_ERR_OK) {
 		*pLen = 0;
@@ -3082,21 +2926,19 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		}
 	}
 
-	/*
-	 * Get value, if a query should be performed
-	 */
+	/* Get value, if a query should be performed. */
 	if (Action == SK_PNMI_GET) {
 
 		switch (Id) {
 
 		case OID_SKGE_VPD_FREE_BYTES:
-			/* Check length of buffer */
+			/* Check length of buffer. */
 			if (*pLen < sizeof(SK_U32)) {
 
 				*pLen = sizeof(SK_U32);
 				return (SK_PNMI_ERR_TOO_SHORT);
 			}
-			/* Get number of free bytes */
+			/* Get number of free bytes. */
 			pVpdStatus = VpdStat(pAC, IoC);
 			if (pVpdStatus == NULL) {
 
@@ -3121,7 +2963,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			break;
 
 		case OID_SKGE_VPD_ENTRIES_LIST:
-			/* Check length */
+			/* Check length. */
 			for (Len = 0, Index = 0; Index < KeyNo; Index ++) {
 
 				Len += SK_STRLEN(KeyArr[Index]) + 1;
@@ -3132,7 +2974,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 				return (SK_PNMI_ERR_TOO_SHORT);
 			}
 
-			/* Get value */
+			/* Get value. */
 			*(pBuf) = (char)Len - 1;
 			for (Offset = 1, Index = 0; Index < KeyNo; Index ++) {
 
@@ -3151,7 +2993,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			break;
 
 		case OID_SKGE_VPD_ENTRIES_NUMBER:
-			/* Check length */
+			/* Check length. */
 			if (*pLen < sizeof(SK_U32)) {
 
 				*pLen = sizeof(SK_U32);
@@ -3164,7 +3006,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			break;
 
 		case OID_SKGE_VPD_KEY:
-			/* Check buffer length, if it is large enough */
+			/* Check buffer length, if it is large enough. */
 			for (Len = 0, Index = FirstIndex;
 				Index < LastIndex; Index ++) {
 
@@ -3180,31 +3022,27 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			 * Get the key to an intermediate buffer, because
 			 * we have to prepend a length byte.
 			 */
-			for (Offset = 0, Index = FirstIndex;
-				Index < LastIndex; Index ++) {
+			for (Offset = 0, Index = FirstIndex; Index < LastIndex; Index ++) {
 
 				Len = SK_STRLEN(KeyArr[Index]);
 
 				*(pBuf + Offset) = (char)Len;
-				SK_MEMCPY(pBuf + Offset + 1, KeyArr[Index],
-					Len);
+				SK_MEMCPY(pBuf + Offset + 1, KeyArr[Index], Len);
 				Offset += Len + 1;
 			}
 			*pLen = Offset;
 			break;
 
 		case OID_SKGE_VPD_VALUE:
-			/* Check the buffer length if it is large enough */
-			for (Offset = 0, Index = FirstIndex;
-				Index < LastIndex; Index ++) {
+			/* Check the buffer length if it is large enough. */
+			for (Offset = 0, Index = FirstIndex; Index < LastIndex; Index ++) {
 
 				BufLen = 256;
 				if (VpdRead(pAC, IoC, KeyArr[Index], Buf,
 					(int *)&BufLen) > 0 ||
 					BufLen >= SK_PNMI_VPD_DATALEN) {
 
-					SK_ERR_LOG(pAC, SK_ERRCL_SW,
-						SK_PNMI_ERR021,
+					SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR021,
 						SK_PNMI_ERR021MSG);
 
 					return (SK_PNMI_ERR_GENERAL);
@@ -3221,16 +3059,14 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			 * Get the value to an intermediate buffer, because
 			 * we have to prepend a length byte.
 			 */
-			for (Offset = 0, Index = FirstIndex;
-				Index < LastIndex; Index ++) {
+			for (Offset = 0, Index = FirstIndex; Index < LastIndex; Index ++) {
 
 				BufLen = 256;
 				if (VpdRead(pAC, IoC, KeyArr[Index], Buf,
 					(int *)&BufLen) > 0 ||
 					BufLen >= SK_PNMI_VPD_DATALEN) {
 
-					SK_ERR_LOG(pAC, SK_ERRCL_SW,
-						SK_PNMI_ERR022,
+					SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR022,
 						SK_PNMI_ERR022MSG);
 
 					*pLen = 0;
@@ -3251,8 +3087,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 				return (SK_PNMI_ERR_TOO_SHORT);
 			}
 
-			for (Offset = 0, Index = FirstIndex;
-				Index < LastIndex; Index ++) {
+			for (Offset = 0, Index = FirstIndex; Index < LastIndex; Index ++) {
 
 				if (VpdMayWrite(KeyArr[Index])) {
 
@@ -3278,15 +3113,14 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			break;
 
 		default:
-			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR023,
-				SK_PNMI_ERR023MSG);
+			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR023, SK_PNMI_ERR023MSG);
 
 			*pLen = 0;
 			return (SK_PNMI_ERR_GENERAL);
 		}
 	}
 	else {
-		/* The only OID which can be set is VPD_ACTION */
+		/* The only OID which can be set is VPD_ACTION. */
 		if (Id != OID_SKGE_VPD_ACTION) {
 
 			if (Id == OID_SKGE_VPD_FREE_BYTES ||
@@ -3300,8 +3134,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 				return (SK_PNMI_ERR_READ_ONLY);
 			}
 
-			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR024,
-				SK_PNMI_ERR024MSG);
+			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR024, SK_PNMI_ERR024MSG);
 
 			*pLen = 0;
 			return (SK_PNMI_ERR_GENERAL);
@@ -3317,14 +3150,11 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			return (SK_PNMI_ERR_TOO_SHORT);
 		}
 
-		/*
-		 * The first byte contains the VPD action type we should
-		 * perform.
-		 */
+		/* The first byte contains the VPD action type we should perform. */
 		switch (*pBuf) {
 
 		case SK_PNMI_VPD_IGNORE:
-			/* Nothing to do */
+			/* Nothing to do. */
 			break;
 
 		case SK_PNMI_VPD_CREATE:
@@ -3356,13 +3186,13 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			SK_MEMCPY(Buf, pBuf + 4, Offset);
 			Buf[Offset] = 0;
 
-			/* A preset ends here */
+			/* A PRESET ends here. */
 			if (Action == SK_PNMI_PRESET) {
 
 				return (SK_PNMI_ERR_OK);
 			}
 
-			/* Write the new entry or modify an existing one */
+			/* Write the new entry or modify an existing one .*/
 			Ret = VpdWrite(pAC, IoC, KeyStr, Buf);
 			if (Ret == SK_PNMI_VPD_NOWRITE ) {
 
@@ -3394,7 +3224,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			break;
 
 		case SK_PNMI_VPD_DELETE:
-			/* Check if the buffer size is plausible */
+			/* Check if the buffer size is plausible. */
 			if (*pLen < 3) {
 
 				*pLen = 3;
@@ -3409,7 +3239,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			KeyStr[1] = pBuf[2];
 			KeyStr[2] = 0;
 
-			/* Find the passed key in the array */
+			/* Find the passed key in the array. */
 			for (Index = 0; Index < KeyNo; Index ++) {
 
 				if (SK_STRCMP(KeyStr, KeyArr[Index]) == 0) {
@@ -3417,6 +3247,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 					break;
 				}
 			}
+
 			/*
 			 * If we cannot find the key it is wrong, so we
 			 * return an appropriate error value.
@@ -3432,7 +3263,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 				return (SK_PNMI_ERR_OK);
 			}
 
-			/* Ok, you wanted it and you will get it */
+			/* Ok, you wanted it and you will get it. */
 			Ret = VpdDelete(pAC, IoC, KeyStr);
 			if (Ret != SK_PNMI_VPD_OK) {
 
@@ -3510,18 +3341,14 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	char		Buf[256];
 	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) {
 
 		*pLen = 0;
 		return (SK_PNMI_ERR_UNKNOWN_INST);
 	}
 
-	/*
-	 * Check action. We only allow get requests.
-	 */
+	/* Check action. We only allow get requests. */
 	if (Action != SK_PNMI_GET) {
 
 		*pLen = 0;
@@ -3530,9 +3357,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	
 	MacType = pAC->GIni.GIMacType;
 	
-	/*
-	 * Check length for the various supported OIDs
-	 */
+	/* Check length for the various supported OIDs. */
 	switch (Id) {
 
 	case OID_GEN_XMIT_ERROR:
@@ -3546,14 +3371,12 @@ 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,
-			* if insufficient space is provided
-			*/
+			 * Indicate handling for 64bit values,
+			 * if insufficient space is provided.
+			 */
 			*pLen = sizeof(SK_U64);
 			return (SK_PNMI_ERR_TOO_SHORT);
 		}
@@ -3624,11 +3447,11 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		break;
 
 	default:
-		/* Checked later */
+		/* Checked later. */
 		break;
 	}
 
-	/* Update statistic */
+	/* Update statistics. */
 	if (Id == OID_SKGE_RX_HW_ERROR_CTS ||
 		Id == OID_SKGE_TX_HW_ERROR_CTS ||
 		Id == OID_SKGE_IN_ERRORS_CTS ||
@@ -3636,7 +3459,8 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		Id == OID_GEN_XMIT_ERROR ||
 		Id == OID_GEN_RCV_ERROR) {
 
-		/* Force the XMAC to update its statistic counters and
+		/*
+		 * Force the XMAC to update its statistic counters and
 		 * Increment semaphore to indicate that an update was
 		 * already done.
 		 */
@@ -3685,9 +3509,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		}
 	}
 
-	/*
-	 * Retrieve value
-	 */
+	/* Retrieve value. */
 	switch (Id) {
 
 	case OID_SKGE_SUPPORTED_LIST:
@@ -3697,11 +3519,11 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			*pLen = Len;
 			return (SK_PNMI_ERR_TOO_SHORT);
 		}
-		for (Offset = 0, Index = 0; Offset < Len;
-			Offset += sizeof(SK_U32), Index ++) {
+		for (Offset = 0, Index = 0; Offset < Len; Index ++) {
 
 			Val32 = (SK_U32)IdTable[Index].Id;
 			SK_PNMI_STORE_U32(pBuf + Offset, Val32);
+			Offset += sizeof(SK_U32);
 		}
 		*pLen = Len;
 		break;
@@ -3727,8 +3549,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	case OID_SKGE_DRIVER_DESCR:
 		if (pAC->Pnmi.pDriverDescription == NULL) {
 
-			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR007,
-				SK_PNMI_ERR007MSG);
+			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR007, SK_PNMI_ERR007MSG);
 
 			*pLen = 0;
 			return (SK_PNMI_ERR_GENERAL);
@@ -3737,8 +3558,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		Len = SK_STRLEN(pAC->Pnmi.pDriverDescription) + 1;
 		if (Len > SK_PNMI_STRINGLEN1) {
 
-			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR029,
-				SK_PNMI_ERR029MSG);
+			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR029, SK_PNMI_ERR029MSG);
 
 			*pLen = 0;
 			return (SK_PNMI_ERR_GENERAL);
@@ -3757,8 +3577,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	case OID_SKGE_DRIVER_VERSION:
 		if (pAC->Pnmi.pDriverVersion == NULL) {
 
-			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR030,
-				SK_PNMI_ERR030MSG);
+			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR030, SK_PNMI_ERR030MSG);
 
 			*pLen = 0;
 			return (SK_PNMI_ERR_GENERAL);
@@ -3767,8 +3586,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		Len = SK_STRLEN(pAC->Pnmi.pDriverVersion) + 1;
 		if (Len > SK_PNMI_STRINGLEN1) {
 
-			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR031,
-				SK_PNMI_ERR031MSG);
+			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR031, SK_PNMI_ERR031MSG);
 
 			*pLen = 0;
 			return (SK_PNMI_ERR_GENERAL);
@@ -3787,8 +3605,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	case OID_SKGE_DRIVER_RELDATE:
 		if (pAC->Pnmi.pDriverReleaseDate == NULL) {
 
-			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR030,
-				SK_PNMI_ERR053MSG);
+			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR053, SK_PNMI_ERR053MSG);
 
 			*pLen = 0;
 			return (SK_PNMI_ERR_GENERAL);
@@ -3797,8 +3614,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		Len = SK_STRLEN(pAC->Pnmi.pDriverReleaseDate) + 1;
 		if (Len > SK_PNMI_STRINGLEN1) {
 
-			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR031,
-				SK_PNMI_ERR054MSG);
+			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR054, SK_PNMI_ERR054MSG);
 
 			*pLen = 0;
 			return (SK_PNMI_ERR_GENERAL);
@@ -3817,8 +3633,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	case OID_SKGE_DRIVER_FILENAME:
 		if (pAC->Pnmi.pDriverFileName == NULL) {
 
-			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR030,
-				SK_PNMI_ERR055MSG);
+			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR055, SK_PNMI_ERR055MSG);
 
 			*pLen = 0;
 			return (SK_PNMI_ERR_GENERAL);
@@ -3827,8 +3642,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		Len = SK_STRLEN(pAC->Pnmi.pDriverFileName) + 1;
 		if (Len > SK_PNMI_STRINGLEN1) {
 
-			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR031,
-				SK_PNMI_ERR056MSG);
+			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR056, SK_PNMI_ERR056MSG);
 
 			*pLen = 0;
 			return (SK_PNMI_ERR_GENERAL);
@@ -3854,8 +3668,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		Len = 256;
 		if (VpdRead(pAC, IoC, VPD_NAME, Buf, (int *)&Len) > 0) {
 
-			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR032,
-				SK_PNMI_ERR032MSG);
+			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR032, SK_PNMI_ERR032MSG);
 
 			*pLen = 0;
 			return (SK_PNMI_ERR_GENERAL);
@@ -3863,8 +3676,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		Len ++;
 		if (Len > SK_PNMI_STRINGLEN1) {
 
-			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR033,
-				SK_PNMI_ERR033MSG);
+			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR033, SK_PNMI_ERR033MSG);
 
 			*pLen = 0;
 			return (SK_PNMI_ERR_GENERAL);
@@ -3880,7 +3692,6 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		break;
 
 	case OID_SKGE_HW_VERSION:
-		/* Oh, I love to do some string manipulation */
 		if (*pLen < 5) {
 
 			*pLen = 5;
@@ -3889,9 +3700,9 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		Val8 = (SK_U8)pAC->GIni.GIPciHwRev;
 		pBuf[0] = 4;
 		pBuf[1] = 'v';
-		pBuf[2] = (char)(0x30 | ((Val8 >> 4) & 0x0F));
+		pBuf[2] = (char)('0' | ((Val8 >> 4) & 0x0f));
 		pBuf[3] = '.';
-		pBuf[4] = (char)(0x30 | (Val8 & 0x0F));
+		pBuf[4] = (char)('0' | (Val8 & 0x0f));
 		*pLen = 5;
 		break;
 
@@ -3914,12 +3725,12 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		break;
 
 	case OID_SKGE_VAUXAVAIL:
-		*pBuf = (char) pAC->GIni.GIVauxAvail;
+		*pBuf = (char)pAC->GIni.GIVauxAvail;
 		*pLen = sizeof(char);
 		break;
 
 	case OID_SKGE_BUS_TYPE:
-		*pBuf = (char) SK_PNMI_BUS_PCI;
+		*pBuf = (char)SK_PNMI_BUS_PCI;
 		*pLen = sizeof(char);
 		break;
 
@@ -3968,31 +3779,31 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		break;
 
 	case OID_SKGE_RLMT_MONITOR_NUMBER:
-/* XXX Not yet implemented by RLMT therefore we return zero elements */
+		/* Not yet implemented by RLMT, therefore we return zero elements. */
 		Val32 = 0;
 		SK_PNMI_STORE_U32(pBuf, Val32);
 		*pLen = sizeof(SK_U32);
 		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 */
+			/* DualNet mode. */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
 				Val64 = pAC->Pnmi.BufPort[NetIndex].TxSwQueueLen;
 			}
-			/* Single net mode */
+			/* SingleNet mode. */
 			else {
 				Val64 = pAC->Pnmi.BufPort[0].TxSwQueueLen +
 					pAC->Pnmi.BufPort[1].TxSwQueueLen;
 			}			
 		}
 		else {
-			/* Dual net mode */
+			/* DualNet mode. */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
 				Val64 = pAC->Pnmi.Port[NetIndex].TxSwQueueLen;
 			}
-			/* Single net mode */
+			/* SingleNet mode. */
 			else {
 				Val64 = pAC->Pnmi.Port[0].TxSwQueueLen +
 					pAC->Pnmi.Port[1].TxSwQueueLen;
@@ -4004,24 +3815,24 @@ 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 */
+			/* DualNet mode. */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
 				Val64 = pAC->Pnmi.BufPort[NetIndex].TxSwQueueMax;
 			}
-			/* Single net mode */
+			/* SingleNet mode. */
 			else {
 				Val64 = pAC->Pnmi.BufPort[0].TxSwQueueMax +
 					pAC->Pnmi.BufPort[1].TxSwQueueMax;
 			}
 		}
 		else {
-			/* Dual net mode */
+			/* DualNet mode. */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
 				Val64 = pAC->Pnmi.Port[NetIndex].TxSwQueueMax;
 			}
-			/* Single net mode */
+			/* SingleNet mode. */
 			else {
 				Val64 = pAC->Pnmi.Port[0].TxSwQueueMax +
 					pAC->Pnmi.Port[1].TxSwQueueMax;
@@ -4032,24 +3843,24 @@ 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 */
+			/* DualNet mode. */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
 				Val64 = pAC->Pnmi.BufPort[NetIndex].TxRetryCts;
 			}
-			/* Single net mode */
+			/* SingleNet mode. */
 			else {
 				Val64 = pAC->Pnmi.BufPort[0].TxRetryCts +
 					pAC->Pnmi.BufPort[1].TxRetryCts;
 			}
 		}
 		else {
-			/* Dual net mode */
+			/* DualNet mode. */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
 				Val64 = pAC->Pnmi.Port[NetIndex].TxRetryCts;
 			}
-			/* Single net mode */
+			/* SingleNet mode. */
 			else {
 				Val64 = pAC->Pnmi.Port[0].TxRetryCts +
 					pAC->Pnmi.Port[1].TxRetryCts;
@@ -4060,24 +3871,24 @@ 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 */
+			/* DualNet mode. */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
 				Val64 = pAC->Pnmi.BufPort[NetIndex].RxIntrCts;
 			}
-			/* Single net mode */
+			/* SingleNet mode. */
 			else {
 				Val64 = pAC->Pnmi.BufPort[0].RxIntrCts +
 					pAC->Pnmi.BufPort[1].RxIntrCts;
 			}
 		}
 		else {
-			/* Dual net mode */
+			/* DualNet mode. */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
 				Val64 = pAC->Pnmi.Port[NetIndex].RxIntrCts;
 			}
-			/* Single net mode */
+			/* SingleNet mode. */
 			else {
 				Val64 = pAC->Pnmi.Port[0].RxIntrCts +
 					pAC->Pnmi.Port[1].RxIntrCts;
@@ -4088,24 +3899,24 @@ 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 */
+			/* DualNet mode. */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
 				Val64 = pAC->Pnmi.BufPort[NetIndex].TxIntrCts;
 			}
-			/* Single net mode */
+			/* SingleNet mode. */
 			else {
 				Val64 = pAC->Pnmi.BufPort[0].TxIntrCts +
 					pAC->Pnmi.BufPort[1].TxIntrCts;
 			}
 		}
 		else {
-			/* Dual net mode */
+			/* DualNet mode. */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
 				Val64 = pAC->Pnmi.Port[NetIndex].TxIntrCts;
 			}
-			/* Single net mode */
+			/* SingleNet mode. */
 			else {
 				Val64 = pAC->Pnmi.Port[0].TxIntrCts +
 					pAC->Pnmi.Port[1].TxIntrCts;
@@ -4116,24 +3927,24 @@ 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 */
+			/* DualNet mode. */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
 				Val64 = pAC->Pnmi.BufPort[NetIndex].RxNoBufCts;
 			}
-			/* Single net mode */
+			/* SingleNet mode. */
 			else {
 				Val64 = pAC->Pnmi.BufPort[0].RxNoBufCts +
 					pAC->Pnmi.BufPort[1].RxNoBufCts;
 			}
 		}
 		else {
-			/* Dual net mode */
+			/* DualNet mode. */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
 				Val64 = pAC->Pnmi.Port[NetIndex].RxNoBufCts;
 			}
-			/* Single net mode */
+			/* SingleNet mode. */
 			else {
 				Val64 = pAC->Pnmi.Port[0].RxNoBufCts +
 					pAC->Pnmi.Port[1].RxNoBufCts;
@@ -4144,24 +3955,24 @@ 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 */
+			/* DualNet mode. */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
 				Val64 = pAC->Pnmi.BufPort[NetIndex].TxNoBufCts;
 			}
-			/* Single net mode */
+			/* SingleNet mode. */
 			else {
 				Val64 = pAC->Pnmi.BufPort[0].TxNoBufCts +
 					pAC->Pnmi.BufPort[1].TxNoBufCts;
 			}
 		}
 		else {
-			/* Dual net mode */
+			/* DualNet mode. */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
 				Val64 = pAC->Pnmi.Port[NetIndex].TxNoBufCts;
 			}
-			/* Single net mode */
+			/* SingleNet mode. */
 			else {
 				Val64 = pAC->Pnmi.Port[0].TxNoBufCts +
 					pAC->Pnmi.Port[1].TxNoBufCts;
@@ -4172,24 +3983,24 @@ 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 */
+			/* DualNet mode. */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
 				Val64 = pAC->Pnmi.BufPort[NetIndex].TxUsedDescrNo;
 			}
-			/* Single net mode */
+			/* SingleNet mode. */
 			else {
 				Val64 = pAC->Pnmi.BufPort[0].TxUsedDescrNo +
 					pAC->Pnmi.BufPort[1].TxUsedDescrNo;
 			}
 		}
 		else {
-			/* Dual net mode */
+			/* DualNet mode. */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
 				Val64 = pAC->Pnmi.Port[NetIndex].TxUsedDescrNo;
 			}
-			/* Single net mode */
+			/* SingleNet mode. */
 			else {
 				Val64 = pAC->Pnmi.Port[0].TxUsedDescrNo +
 					pAC->Pnmi.Port[1].TxUsedDescrNo;
@@ -4200,24 +4011,24 @@ 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 */
+			/* DualNet mode. */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
 				Val64 = pAC->Pnmi.BufPort[NetIndex].RxDeliveredCts;
 			}
-			/* Single net mode */
+			/* SingleNet mode. */
 			else {
 				Val64 = pAC->Pnmi.BufPort[0].RxDeliveredCts +
 					pAC->Pnmi.BufPort[1].RxDeliveredCts;
 			}
 		}
 		else {
-			/* Dual net mode */
+			/* DualNet mode. */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
 				Val64 = pAC->Pnmi.Port[NetIndex].RxDeliveredCts;
 			}
-			/* Single net mode */
+			/* SingleNet mode. */
 			else {
 				Val64 = pAC->Pnmi.Port[0].RxDeliveredCts +
 					pAC->Pnmi.Port[1].RxDeliveredCts;
@@ -4228,24 +4039,24 @@ 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 */
+			/* DualNet mode. */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
 				Val64 = pAC->Pnmi.BufPort[NetIndex].RxOctetsDeliveredCts;
 			}
-			/* Single net mode */
+			/* SingleNet mode. */
 			else {
 				Val64 = pAC->Pnmi.BufPort[0].RxOctetsDeliveredCts +
 					pAC->Pnmi.BufPort[1].RxOctetsDeliveredCts;
 			}
 		}
 		else {
-			/* Dual net mode */
+			/* DualNet mode. */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
 				Val64 = pAC->Pnmi.Port[NetIndex].RxOctetsDeliveredCts;
 			}
-			/* Single net mode */
+			/* SingleNet mode. */
 			else {
 				Val64 = pAC->Pnmi.Port[0].RxOctetsDeliveredCts +
 					pAC->Pnmi.Port[1].RxOctetsDeliveredCts;
@@ -4266,13 +4077,13 @@ 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 */
+			/* DualNet mode. */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
 				Val64 = Val64RxHwErrs + pAC->Pnmi.BufPort[NetIndex].RxNoBufCts;
 			}
-			/* Single net mode */
+			/* SingleNet mode. */
 			else {
 				Val64 = Val64RxHwErrs +
 					pAC->Pnmi.BufPort[0].RxNoBufCts +
@@ -4280,11 +4091,11 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			}
 		}
 		else {
-			/* Dual net mode */
+			/* DualNet mode. */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
 				Val64 = Val64RxHwErrs + pAC->Pnmi.Port[NetIndex].RxNoBufCts;
 			}
-			/* Single net mode */
+			/* SingleNet mode. */
 			else {
 				Val64 = Val64RxHwErrs +
 					pAC->Pnmi.Port[0].RxNoBufCts +
@@ -4296,13 +4107,13 @@ 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 */
+			/* DualNet mode. */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
 				Val64 = Val64TxHwErrs + pAC->Pnmi.BufPort[NetIndex].TxNoBufCts;
 			}
-			/* Single net mode */
+			/* SingleNet mode. */
 			else {
 				Val64 = Val64TxHwErrs +
 					pAC->Pnmi.BufPort[0].TxNoBufCts +
@@ -4310,11 +4121,11 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			}
 		}
 		else {
-			/* Dual net mode */
+			/* DualNet mode. */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
 				Val64 = Val64TxHwErrs + pAC->Pnmi.Port[NetIndex].TxNoBufCts;
 			}
-			/* Single net mode */
+			/* SingleNet mode. */
 			else {
 				Val64 = Val64TxHwErrs +
 					pAC->Pnmi.Port[0].TxNoBufCts +
@@ -4326,24 +4137,24 @@ 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 */
+			/* DualNet mode. */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
 				Val64 = pAC->Pnmi.BufPort[NetIndex].ErrRecoveryCts;
 			}
-			/* Single net mode */
+			/* SingleNet mode. */
 			else {
 				Val64 = pAC->Pnmi.BufPort[0].ErrRecoveryCts +
 					pAC->Pnmi.BufPort[1].ErrRecoveryCts;
 			}
 		}
 		else {
-			/* Dual net mode */
+			/* DualNet mode. */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
 				Val64 = pAC->Pnmi.Port[NetIndex].ErrRecoveryCts;
 			}
-			/* Single net mode */
+			/* SingleNet mode. */
 			else {
 				Val64 = pAC->Pnmi.Port[0].ErrRecoveryCts +
 					pAC->Pnmi.Port[1].ErrRecoveryCts;
@@ -4367,7 +4178,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;
 		}
@@ -4376,7 +4187,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		}
 
 		/*
-		 * by default 32bit values are evaluated
+		 * By default 32bit values are evaluated.
 		 */
 		if (!Is64BitReq) {
 			Val32 = (SK_U32)Val64;
@@ -4390,7 +4201,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;
 		}
@@ -4399,7 +4210,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		}
 
 		/*
-		 * by default 32bit values are evaluated
+		 * By default 32bit values are evaluated.
 		 */
 		if (!Is64BitReq) {
 			Val32 = (SK_U32)Val64;
@@ -4413,7 +4224,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;
 		}
@@ -4422,7 +4233,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		}
 
 		/*
-		 * by default 32bit values are evaluated
+		 * By default 32bit values are evaluated.
 		 */
 		if (!Is64BitReq) {
 			Val32 = (SK_U32)Val64;
@@ -4442,8 +4253,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		break;
 
 	default:
-		SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR034,
-			SK_PNMI_ERR034MSG);
+		SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR034, SK_PNMI_ERR034MSG);
 
 		*pLen = 0;
 		return (SK_PNMI_ERR_GENERAL);
@@ -4500,25 +4310,17 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	SK_U32		Val32;
 	SK_U64		Val64;
 
-
-	/*
-	 * Check instance. Only single instance OIDs are allowed here.
-	 */
+	/* Check instance. Only single instance OIDs are allowed here. */
 	if (Instance != (SK_U32)(-1) && Instance != 1) {
 
 		*pLen = 0;
 		return (SK_PNMI_ERR_UNKNOWN_INST);
 	}
 
-	/*
-	 * Perform the requested action.
-	 */
+	/* Perform the requested action. */
 	if (Action == SK_PNMI_GET) {
 
-		/*
-		 * Check if the buffer length is large enough.
-		 */
-
+		/* Check if the buffer length is large enough. */
 		switch (Id) {
 
 		case OID_SKGE_RLMT_MODE:
@@ -4551,8 +4353,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			break;
 
 		default:
-			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR035,
-				SK_PNMI_ERR035MSG);
+			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR035, SK_PNMI_ERR035MSG);
 
 			*pLen = 0;
 			return (SK_PNMI_ERR_GENERAL);
@@ -4571,9 +4372,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		}
 		pAC->Pnmi.RlmtUpdatedFlag ++;
 
-		/*
-		 * Retrieve Value
-		*/
+		/* Retrieve value. */
 		switch (Id) {
 
 		case OID_SKGE_RLMT_MODE:
@@ -4651,17 +4450,17 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		pAC->Pnmi.RlmtUpdatedFlag --;
 	}
 	else {
-		/* Perform a preset or set */
+		/* Perform a PRESET or SET. */
 		switch (Id) {
 
 		case OID_SKGE_RLMT_MODE:
-			/* Check if the buffer length is plausible */
+			/* Check if the buffer length is plausible. */
 			if (*pLen < sizeof(char)) {
 
 				*pLen = sizeof(char);
 				return (SK_PNMI_ERR_TOO_SHORT);
 			}
-			/* Check if the value range is correct */
+			/* Check if the value range is correct. */
 			if (*pLen != sizeof(char) ||
 				(*pBuf & SK_PNMI_RLMT_MODE_CHK_LINK) == 0 ||
 				*(SK_U8 *)pBuf > 15) {
@@ -4669,21 +4468,21 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 				*pLen = 0;
 				return (SK_PNMI_ERR_BAD_VALUE);
 			}
-			/* The preset ends here */
+			/* The PRESET ends here. */
 			if (Action == SK_PNMI_PRESET) {
 
 				*pLen = 0;
 				return (SK_PNMI_ERR_OK);
 			}
-			/* Send an event to RLMT to change the mode */
+			/* Send an event to RLMT to change the mode. */
 			SK_MEMSET((char *)&EventParam, 0, sizeof(EventParam));
+			
 			EventParam.Para32[0] |= (SK_U32)(*pBuf);
 			EventParam.Para32[1] = 0;
 			if (SkRlmtEvent(pAC, IoC, SK_RLMT_MODE_CHANGE,
 				EventParam) > 0) {
 
-				SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR037,
-					SK_PNMI_ERR037MSG);
+				SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR037, SK_PNMI_ERR037MSG);
 
 				*pLen = 0;
 				return (SK_PNMI_ERR_GENERAL);
@@ -4691,20 +4490,25 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			break;
 
 		case OID_SKGE_RLMT_PORT_PREFERRED:
-			/* Check if the buffer length is plausible */
+			/* PRESET/SET action makes no sense in Dual Net mode. */
+			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
+				break;
+			}
+			
+			/* Check if the buffer length is plausible. */
 			if (*pLen < sizeof(char)) {
 
 				*pLen = sizeof(char);
 				return (SK_PNMI_ERR_TOO_SHORT);
 			}
-			/* Check if the value range is correct */
+			/* Check if the value range is correct. */
 			if (*pLen != sizeof(char) || *(SK_U8 *)pBuf >
 				(SK_U8)pAC->GIni.GIMacsFound) {
 
 				*pLen = 0;
 				return (SK_PNMI_ERR_BAD_VALUE);
 			}
-			/* The preset ends here */
+			/* The PRESET ends here. */
 			if (Action == SK_PNMI_PRESET) {
 
 				*pLen = 0;
@@ -4717,13 +4521,13 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			 * make the decision which is the preferred port.
 			 */
 			SK_MEMSET((char *)&EventParam, 0, sizeof(EventParam));
+			
 			EventParam.Para32[0] = (SK_U32)(*pBuf) - 1;
 			EventParam.Para32[1] = NetIndex;
 			if (SkRlmtEvent(pAC, IoC, SK_RLMT_PREFPORT_CHANGE,
 				EventParam) > 0) {
 
-				SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR038,
-					SK_PNMI_ERR038MSG);
+				SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR038, SK_PNMI_ERR038MSG);
 
 				*pLen = 0;
 				return (SK_PNMI_ERR_GENERAL);
@@ -4731,22 +4535,20 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			break;
 
 		case OID_SKGE_RLMT_CHANGE_THRES:
-			/* Check if the buffer length is plausible */
+			/* Check if the buffer length is plausible. */
 			if (*pLen < sizeof(SK_U64)) {
 
 				*pLen = sizeof(SK_U64);
 				return (SK_PNMI_ERR_TOO_SHORT);
 			}
-			/*
-			 * There are not many restrictions to the
-			 * value range.
-			 */
+			
+			/* There are not many restrictions to the value range. */
 			if (*pLen != sizeof(SK_U64)) {
 
 				*pLen = 0;
 				return (SK_PNMI_ERR_BAD_VALUE);
 			}
-			/* A preset ends here */
+			/* The PRESET ends here. */
 			if (Action == SK_PNMI_PRESET) {
 
 				*pLen = 0;
@@ -4761,7 +4563,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			break;
 
 		default:
-			/* The other OIDs are not be able for set */
+			/* The other OIDs are not be able for set. */
 			*pLen = 0;
 			return (SK_PNMI_ERR_READ_ONLY);
 		}
@@ -4806,54 +4608,49 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	SK_U32		Val32;
 	SK_U64		Val64;
 
-	/*
-	 * Calculate the port indexes from the instance.
-	 */
+
+	/* Calculate the port indexes from the instance. */
 	PhysPortMax = pAC->GIni.GIMacsFound;
 
 	if ((Instance != (SK_U32)(-1))) {
-		/* Check instance range */
+		/* Check instance range. */
 		if ((Instance < 1) || (Instance > PhysPortMax)) {
 
 			*pLen = 0;
 			return (SK_PNMI_ERR_UNKNOWN_INST);
 		}
 
-		/* Single net mode */
+		/* SingleNet mode. */
 		PhysPortIndex = Instance - 1;
 
-		/* Dual net mode */
+		/* DualNet mode. */
 		if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
 			PhysPortIndex = NetIndex;
 		}
 
-		/* Both net modes */
+		/* Both net modes. */
 		Limit = PhysPortIndex + 1;
 	}
 	else {
-		/* Single net mode */
+		/* SingleNet mode. */
 		PhysPortIndex = 0;
 		Limit = PhysPortMax;
 
-		/* Dual net mode */
+		/* DualNet mode. */
 		if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
 			PhysPortIndex = NetIndex;
 			Limit = PhysPortIndex + 1;
 		}
 	}
 
-	/*
-	 * Currently only get requests are allowed.
-	 */
+	/* Currently only GET requests are allowed. */
 	if (Action != SK_PNMI_GET) {
 
 		*pLen = 0;
 		return (SK_PNMI_ERR_READ_ONLY);
 	}
 
-	/*
-	 * Check if the buffer length is large enough.
-	 */
+	/* Check if the buffer length is large enough. */
 	switch (Id) {
 
 	case OID_SKGE_RLMT_PORT_INDEX:
@@ -4877,8 +4674,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		break;
 
 	default:
-		SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR039,
-			SK_PNMI_ERR039MSG);
+		SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR039, SK_PNMI_ERR039MSG);
 
 		*pLen = 0;
 		return (SK_PNMI_ERR_GENERAL);
@@ -4896,9 +4692,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	}
 	pAC->Pnmi.RlmtUpdatedFlag ++;
 
-	/*
-	 * Get value
-	 */
+	/* Get value. */
 	Offset = 0;
 	for (; PhysPortIndex < Limit; PhysPortIndex ++) {
 
@@ -5011,19 +4805,21 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	int			Ret;
 	SK_EVPARA	EventParam;
 	SK_U32		Val32;
+#ifdef SK_PHY_LP_MODE
+	SK_U8	CurrentPhyPowerState;
+#endif /* SK_PHY_LP_MODE */
 
-	/*
-	 * 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);
 
-	if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) { /* Dual net mode */
+	if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) { /* DualNet mode. */
 		LogPortMax--;
 	}
 
-	if ((Instance != (SK_U32)(-1))) { /* Only one specific instance is queried */
-		/* Check instance range */
+	if ((Instance != (SK_U32)(-1))) { /* Only one specific instance is queried. */
+		/* Check instance range. */
 		if ((Instance < 1) || (Instance > LogPortMax)) {
 
 			*pLen = 0;
@@ -5033,18 +4829,16 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		Limit = LogPortIndex + 1;
 	}
 
-	else { /* Instance == (SK_U32)(-1), get all Instances of that OID */
+	else { /* Instance == (SK_U32)(-1), get all Instances of that OID. */
 
 		LogPortIndex = 0;
 		Limit = LogPortMax;
 	}
 
-	/*
-	 * Perform action
-	 */
+	/* Perform action. */
 	if (Action == SK_PNMI_GET) {
 
-		/* Check length */
+		/* Check length. */
 		switch (Id) {
 
 		case OID_SKGE_PMD:
@@ -5082,8 +4876,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			break;
 
 		default:
-			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR041,
-				SK_PNMI_ERR041MSG);
+			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR041, SK_PNMI_ERR041MSG);
 			*pLen = 0;
 			return (SK_PNMI_ERR_GENERAL);
 		}
@@ -5099,9 +4892,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		}
 		pAC->Pnmi.SirqUpdatedFlag ++;
 
-		/*
-		 * Get value
-		 */
+		/* Get value. */
 		Offset = 0;
 		for (; LogPortIndex < Limit; LogPortIndex ++) {
 
@@ -5111,107 +4902,99 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 
 			case OID_SKGE_PMD:
 				*pBufPtr = pAC->Pnmi.PMD;
-				Offset += sizeof(char);
+				Offset ++;
 				break;
 
 			case OID_SKGE_CONNECTOR:
 				*pBufPtr = pAC->Pnmi.Connector;
-				Offset += sizeof(char);
+				Offset ++;
 				break;
 
 			case OID_SKGE_PHY_TYPE:
-				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
+				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNet mode. */
 					if (LogPortIndex == 0) {
 						continue;
 					}
-					else {
-						/* Get value for physical ports */
-						PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
-							pAC, LogPortIndex);
-						Val32 = pAC->GIni.GP[PhysPortIndex].PhyType;
-						SK_PNMI_STORE_U32(pBufPtr, Val32);
-					}
+					/* Get value for physical port. */
+					PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(pAC, LogPortIndex);
+					Val32 = pAC->GIni.GP[PhysPortIndex].PhyType;
 				}
-				else { /* DualNetMode */
+				else { /* DualNet mode. */
 					
 					Val32 = pAC->GIni.GP[NetIndex].PhyType;
-					SK_PNMI_STORE_U32(pBufPtr, Val32);
 				}
+				SK_PNMI_STORE_U32(pBufPtr, Val32);
 				Offset += sizeof(SK_U32);
 				break;
 
 #ifdef SK_PHY_LP_MODE
 			case OID_SKGE_PHY_LP_MODE:
-				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
+				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNet mode. */
 					if (LogPortIndex == 0) {
 						continue;
 					}
-					else {
-						/* Get value for physical ports */
-						PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(pAC, LogPortIndex);
-						Val8 = (SK_U8) pAC->GIni.GP[PhysPortIndex].PPhyPowerState;
-						*pBufPtr = Val8;
-					}
+					/* Get value for physical port. */
+					PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(pAC, LogPortIndex);
+					*pBufPtr = (SK_U8)pAC->GIni.GP[PhysPortIndex].PPhyPowerState;
 				}
-				else { /* DualNetMode */
+				else { /* DualNet mode. */
 					
-					Val8 = (SK_U8) pAC->GIni.GP[PhysPortIndex].PPhyPowerState;
-					*pBufPtr = Val8;
+					*pBufPtr = (SK_U8)pAC->GIni.GP[NetIndex].PPhyPowerState;
 				}
 				Offset += sizeof(SK_U8);
 				break;
 #endif
 
 			case OID_SKGE_LINK_CAP:
-				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
+				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNet mode. */
 					if (LogPortIndex == 0) {
-						/* Get value for virtual port */
+						/* Get value for virtual port. */
 						VirtualConf(pAC, IoC, Id, pBufPtr);
 					}
 					else {
-						/* Get value for physical ports */
+						/* Get value for physical port. */
 						PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
 							pAC, LogPortIndex);
 
 						*pBufPtr = pAC->GIni.GP[PhysPortIndex].PLinkCap;
 					}
 				}
-				else { /* DualNetMode */
+				else { /* DualNet mode. */
 					
 					*pBufPtr = pAC->GIni.GP[NetIndex].PLinkCap;
 				}
-				Offset += sizeof(char);
+				Offset ++;
 				break;
 
 			case OID_SKGE_LINK_MODE:
-				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
+				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNet mode. */
 					if (LogPortIndex == 0) {
-						/* Get value for virtual port */
+						/* Get value for virtual port. */
 						VirtualConf(pAC, IoC, Id, pBufPtr);
 					}
 					else {
-						/* Get value for physical ports */
+						/* Get value for physical port. */
 						PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
 							pAC, LogPortIndex);
 
 						*pBufPtr = pAC->GIni.GP[PhysPortIndex].PLinkModeConf;
 					}
 				}
-				else { /* DualNetMode */
+				else { /* DualNet mode. */
 				
 					*pBufPtr = pAC->GIni.GP[NetIndex].PLinkModeConf;
 				}
-				Offset += sizeof(char);
+				Offset ++;
 				break;
 
 			case OID_SKGE_LINK_MODE_STATUS:
-				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
+				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNet mode. */
 					if (LogPortIndex == 0) {
-						/* Get value for virtual port */
+						/* Get value for virtual port. */
 						VirtualConf(pAC, IoC, Id, pBufPtr);
 					}
 					else {
-						/* Get value for physical port */
+						/* Get value for physical port. */
 						PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
 							pAC, LogPortIndex);
 
@@ -5219,147 +5002,147 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 							CalculateLinkModeStatus(pAC, IoC, PhysPortIndex);
 					}
 				}
-				else { /* DualNetMode */
+				else { /* DualNet mode. */
 					
 					*pBufPtr = CalculateLinkModeStatus(pAC, IoC, NetIndex);
 				}
-				Offset += sizeof(char);
+				Offset ++;
 				break;
 
 			case OID_SKGE_LINK_STATUS:
-				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
+				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNet mode. */
 					if (LogPortIndex == 0) {
-						/* Get value for virtual port */
+						/* Get value for virtual port. */
 						VirtualConf(pAC, IoC, Id, pBufPtr);
 					}
 					else {
-						/* Get value for physical ports */
+						/* Get value for physical port. */
 						PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
 							pAC, LogPortIndex);
 	
 						*pBufPtr = CalculateLinkStatus(pAC, IoC, PhysPortIndex);
 					}
 				}
-				else { /* DualNetMode */
+				else { /* DualNet mode. */
 
 					*pBufPtr = CalculateLinkStatus(pAC, IoC, NetIndex);
 				}
-				Offset += sizeof(char);
+				Offset ++;
 				break;
 
 			case OID_SKGE_FLOWCTRL_CAP:
-				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
+				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNet mode. */
 					if (LogPortIndex == 0) {
-						/* Get value for virtual port */
+						/* Get value for virtual port. */
 						VirtualConf(pAC, IoC, Id, pBufPtr);
 					}
 					else {
-						/* Get value for physical ports */
+						/* Get value for physical port. */
 						PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
 							pAC, LogPortIndex);
 	
 						*pBufPtr = pAC->GIni.GP[PhysPortIndex].PFlowCtrlCap;
 					}
 				}
-				else { /* DualNetMode */
+				else { /* DualNet mode. */
 				
 					*pBufPtr = pAC->GIni.GP[NetIndex].PFlowCtrlCap;
 				}
-				Offset += sizeof(char);
+				Offset ++;
 				break;
 
 			case OID_SKGE_FLOWCTRL_MODE:
-				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
+				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNet mode. */
 					if (LogPortIndex == 0) {
-						/* Get value for virtual port */
+						/* Get value for virtual port. */
 						VirtualConf(pAC, IoC, Id, pBufPtr);
 					}
 					else {
-						/* Get value for physical port */
+						/* Get value for physical port. */
 						PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
 							pAC, LogPortIndex);
 	
 						*pBufPtr = pAC->GIni.GP[PhysPortIndex].PFlowCtrlMode;
 					}
 				}
-				else { /* DualNetMode */
+				else { /* DualNet mode. */
 
 					*pBufPtr = pAC->GIni.GP[NetIndex].PFlowCtrlMode;
 				}
-				Offset += sizeof(char);
+				Offset ++;
 				break;
 
 			case OID_SKGE_FLOWCTRL_STATUS:
-				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
+				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNet mode. */
 					if (LogPortIndex == 0) {
-						/* Get value for virtual port */
+						/* Get value for virtual port. */
 						VirtualConf(pAC, IoC, Id, pBufPtr);
 					}
 					else {
-						/* Get value for physical port */
+						/* Get value for physical port. */
 						PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
 							pAC, LogPortIndex);
 	
 						*pBufPtr = pAC->GIni.GP[PhysPortIndex].PFlowCtrlStatus;
 					}
 				}
-				else { /* DualNetMode */
+				else { /* DualNet mode. */
 
 					*pBufPtr = pAC->GIni.GP[NetIndex].PFlowCtrlStatus;
 				}
-				Offset += sizeof(char);
+				Offset ++;
 				break;
 
 			case OID_SKGE_PHY_OPERATION_CAP:
-				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
+				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNet Mode. */
 					if (LogPortIndex == 0) {
-						/* Get value for virtual port */
+						/* Get value for virtual port. */
 						VirtualConf(pAC, IoC, Id, pBufPtr);
 					}
 					else {
-						/* Get value for physical ports */
+						/* Get value for physical port. */
 						PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
 							pAC, LogPortIndex);
 	
 						*pBufPtr = pAC->GIni.GP[PhysPortIndex].PMSCap;
 					}
 				}
-				else { /* DualNetMode */
+				else { /* DualNet mode. */
 				
 					*pBufPtr = pAC->GIni.GP[NetIndex].PMSCap;
 				}
-				Offset += sizeof(char);
+				Offset ++;
 				break;
 
 			case OID_SKGE_PHY_OPERATION_MODE:
-				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
+				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNet mode. */
 					if (LogPortIndex == 0) {
-						/* Get value for virtual port */
+						/* Get value for virtual port. */
 						VirtualConf(pAC, IoC, Id, pBufPtr);
 					}
 					else {
-						/* Get value for physical port */
+						/* Get value for physical port. */
 						PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
 							pAC, LogPortIndex);
 
 						*pBufPtr = pAC->GIni.GP[PhysPortIndex].PMSMode;
 					}
 				}
-				else { /* DualNetMode */
+				else { /* DualNet mode. */
 				
 					*pBufPtr = pAC->GIni.GP[NetIndex].PMSMode;
 				}
-				Offset += sizeof(char);
+				Offset ++;
 				break;
 
 			case OID_SKGE_PHY_OPERATION_STATUS:
-				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
+				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNet mode. */
 					if (LogPortIndex == 0) {
-						/* Get value for virtual port */
+						/* Get value for virtual port. */
 						VirtualConf(pAC, IoC, Id, pBufPtr);
 					}
 					else {
-						/* Get value for physical port */
+						/* Get value for physical port. */
 						PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
 							pAC, LogPortIndex);
 	
@@ -5370,70 +5153,70 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 				
 					*pBufPtr = pAC->GIni.GP[NetIndex].PMSStatus;
 				}
-				Offset += sizeof(char);
+				Offset ++;
 				break;
 
 			case OID_SKGE_SPEED_CAP:
-				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
+				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNet mode. */
 					if (LogPortIndex == 0) {
-						/* Get value for virtual port */
+						/* Get value for virtual port. */
 						VirtualConf(pAC, IoC, Id, pBufPtr);
 					}
 					else {
-						/* Get value for physical ports */
+						/* Get value for physical port. */
 						PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
 							pAC, LogPortIndex);
 	
 						*pBufPtr = pAC->GIni.GP[PhysPortIndex].PLinkSpeedCap;
 					}
 				}
-				else { /* DualNetMode */
+				else { /* DualNet mode. */
 				
 					*pBufPtr = pAC->GIni.GP[NetIndex].PLinkSpeedCap;
 				}
-				Offset += sizeof(char);
+				Offset ++;
 				break;
 
 			case OID_SKGE_SPEED_MODE:
-				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
+				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNet mode. */
 					if (LogPortIndex == 0) {
-						/* Get value for virtual port */
+						/* Get value for virtual port. */
 						VirtualConf(pAC, IoC, Id, pBufPtr);
 					}
 					else {
-						/* Get value for physical port */
+						/* Get value for physical port. */
 						PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
 							pAC, LogPortIndex);
 	
 						*pBufPtr = pAC->GIni.GP[PhysPortIndex].PLinkSpeed;
 					}
 				}
-				else { /* DualNetMode */
+				else { /* DualNet mode. */
 
 					*pBufPtr = pAC->GIni.GP[NetIndex].PLinkSpeed;
 				}
-				Offset += sizeof(char);
+				Offset ++;
 				break;
 
 			case OID_SKGE_SPEED_STATUS:
-				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
+				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNet mode. */
 					if (LogPortIndex == 0) {
-						/* Get value for virtual port */
+						/* Get value for virtual port. */
 						VirtualConf(pAC, IoC, Id, pBufPtr);
 					}
 					else {
-						/* Get value for physical port */
+						/* Get value for physical port. */
 						PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
 							pAC, LogPortIndex);
 	
 						*pBufPtr = pAC->GIni.GP[PhysPortIndex].PLinkSpeedUsed;
 					}
 				}
-				else { /* DualNetMode */
+				else { /* DualNet mode. */
 
 					*pBufPtr = pAC->GIni.GP[NetIndex].PLinkSpeedUsed;
 				}
-				Offset += sizeof(char);
+				Offset ++;
 				break;
 			
 			case OID_SKGE_MTU:
@@ -5486,40 +5269,33 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			return (SK_PNMI_ERR_TOO_SHORT);
 		}
 		break;
-#endif
+#endif /* SK_PHY_LP_MODE */
 
 	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);
 		}
-		if (*pLen != sizeof(SK_U32)) {
-
-			*pLen = 0;
-			return (SK_PNMI_ERR_BAD_VALUE);
-		}
 		break;
-
+	
     default:
 		*pLen = 0;
 		return (SK_PNMI_ERR_READ_ONLY);
 	}
 
-	/*
-	 * Perform preset or set
-	 */
+	/* Perform PRESET or SET. */
 	Offset = 0;
 	for (; LogPortIndex < Limit; LogPortIndex ++) {
 
+		Val8 = *(pBuf + Offset);
+
 		switch (Id) {
 
 		case OID_SKGE_LINK_MODE:
-			/* Check the value range */
-			Val8 = *(pBuf + Offset);
+			/* Check the value range. */
 			if (Val8 == 0) {
-
-				Offset += sizeof(char);
+				Offset++;
 				break;
 			}
 			if (Val8 < SK_LMODE_HALF ||
@@ -5530,51 +5306,68 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 				return (SK_PNMI_ERR_BAD_VALUE);
 			}
 
-			/* The preset ends here */
+			/* The PRESET ends here. */
 			if (Action == SK_PNMI_PRESET) {
 
 				return (SK_PNMI_ERR_OK);
 			}
 
-			if (LogPortIndex == 0) {
-
-				/*
-				 * The virtual port consists of all currently
-				 * active ports. Find them and send an event
-				 * with the new link mode to SIRQ.
-				 */
-				for (PhysPortIndex = 0;
-					PhysPortIndex < PhysPortMax;
-					PhysPortIndex ++) {
-
-					if (!pAC->Pnmi.Port[PhysPortIndex].
-						ActiveFlag) {
-
-						continue;
-					}
+			if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNet mode. */
+				if (LogPortIndex == 0) {
+					/*
+					 * The virtual port consists of all currently
+					 * active ports. Find them and send an event
+					 * with the new link mode to SIRQ.
+					 */
+					for (PhysPortIndex = 0; PhysPortIndex < PhysPortMax;
+						PhysPortIndex ++) {
 
-					EventParam.Para32[0] = PhysPortIndex;
+						if (!pAC->Pnmi.Port[PhysPortIndex].ActiveFlag) {
+							continue;
+						}
+						
+						EventParam.Para32[0] = PhysPortIndex;
+						EventParam.Para32[1] = (SK_U32)Val8;
+						if (SkGeSirqEvent(pAC, IoC,
+							SK_HWEV_SET_LMODE,
+							EventParam) > 0) {
+							
+							SK_ERR_LOG(pAC, SK_ERRCL_SW,
+								SK_PNMI_ERR043,
+								SK_PNMI_ERR043MSG);
+							
+							*pLen = 0;
+							return (SK_PNMI_ERR_GENERAL);
+						}
+					} /* for */
+				}
+				else {
+					/*
+					 * Send an event with the new link mode to
+					 * the SIRQ module.
+					 */
+					EventParam.Para32[0] = SK_PNMI_PORT_LOG2PHYS(
+						pAC, LogPortIndex);
 					EventParam.Para32[1] = (SK_U32)Val8;
-					if (SkGeSirqEvent(pAC, IoC,
-						SK_HWEV_SET_LMODE,
+					if (SkGeSirqEvent(pAC, IoC, SK_HWEV_SET_LMODE,
 						EventParam) > 0) {
-
+						
 						SK_ERR_LOG(pAC, SK_ERRCL_SW,
 							SK_PNMI_ERR043,
 							SK_PNMI_ERR043MSG);
-
+						
 						*pLen = 0;
 						return (SK_PNMI_ERR_GENERAL);
 					}
 				}
 			}
-			else {
+			else { /* DualNet mode. */
+
 				/*
 				 * Send an event with the new link mode to
 				 * the SIRQ module.
 				 */
-				EventParam.Para32[0] = SK_PNMI_PORT_LOG2PHYS(
-					pAC, LogPortIndex);
+				EventParam.Para32[0] = NetIndex;
 				EventParam.Para32[1] = (SK_U32)Val8;
 				if (SkGeSirqEvent(pAC, IoC, SK_HWEV_SET_LMODE,
 					EventParam) > 0) {
@@ -5587,15 +5380,13 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 					return (SK_PNMI_ERR_GENERAL);
 				}
 			}
-			Offset += sizeof(char);
+			Offset++;
 			break;
 
 		case OID_SKGE_FLOWCTRL_MODE:
-			/* Check the value range */
-			Val8 = *(pBuf + Offset);
+			/* Check the value range. */
 			if (Val8 == 0) {
-
-				Offset += sizeof(char);
+				Offset++;
 				break;
 			}
 			if (Val8 < SK_FLOW_MODE_NONE ||
@@ -5606,30 +5397,48 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 				return (SK_PNMI_ERR_BAD_VALUE);
 			}
 
-			/* The preset ends here */
+			/* The PRESET ends here. */
 			if (Action == SK_PNMI_PRESET) {
 
 				return (SK_PNMI_ERR_OK);
 			}
 
-			if (LogPortIndex == 0) {
+			if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNet mode. */
+				if (LogPortIndex == 0) {
+					/*
+					 * The virtual port consists of all currently
+					 * active ports. Find them and send an event
+					 * with the new flow control mode to SIRQ.
+					 */
+					for (PhysPortIndex = 0; PhysPortIndex < PhysPortMax;
+						PhysPortIndex ++) {
 
-				/*
-				 * The virtual port consists of all currently
-				 * active ports. Find them and send an event
-				 * with the new flow control mode to SIRQ.
-				 */
-				for (PhysPortIndex = 0;
-					PhysPortIndex < PhysPortMax;
-					PhysPortIndex ++) {
+						if (!pAC->Pnmi.Port[PhysPortIndex].ActiveFlag) {
+							continue;
+						}
 
-					if (!pAC->Pnmi.Port[PhysPortIndex].
-						ActiveFlag) {
+						EventParam.Para32[0] = PhysPortIndex;
+						EventParam.Para32[1] = (SK_U32)Val8;
+						if (SkGeSirqEvent(pAC, IoC,
+							SK_HWEV_SET_FLOWMODE,
+							EventParam) > 0) {
+
+							SK_ERR_LOG(pAC, SK_ERRCL_SW,
+								SK_PNMI_ERR044,
+								SK_PNMI_ERR044MSG);
 
-						continue;
+							*pLen = 0;
+							return (SK_PNMI_ERR_GENERAL);
+						}
 					}
-
-					EventParam.Para32[0] = PhysPortIndex;
+				}
+				else {
+					/*
+					 * Send an event with the new flow control
+					 * mode to the SIRQ module.
+					 */
+					EventParam.Para32[0] = SK_PNMI_PORT_LOG2PHYS(
+						pAC, LogPortIndex);
 					EventParam.Para32[1] = (SK_U32)Val8;
 					if (SkGeSirqEvent(pAC, IoC,
 						SK_HWEV_SET_FLOWMODE,
@@ -5644,17 +5453,16 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 					}
 				}
 			}
-			else {
+			else { /* DualNet mode. */
+				
 				/*
-				 * Send an event with the new flow control
-				 * mode to the SIRQ module.
+				 * Send an event with the new link mode to
+				 * the SIRQ module.
 				 */
-				EventParam.Para32[0] = SK_PNMI_PORT_LOG2PHYS(
-					pAC, LogPortIndex);
+				EventParam.Para32[0] = NetIndex;
 				EventParam.Para32[1] = (SK_U32)Val8;
-				if (SkGeSirqEvent(pAC, IoC,
-					SK_HWEV_SET_FLOWMODE, EventParam)
-					> 0) {
+				if (SkGeSirqEvent(pAC, IoC, SK_HWEV_SET_FLOWMODE,
+					EventParam) > 0) {
 
 					SK_ERR_LOG(pAC, SK_ERRCL_SW,
 						SK_PNMI_ERR044,
@@ -5664,15 +5472,14 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 					return (SK_PNMI_ERR_GENERAL);
 				}
 			}
-			Offset += sizeof(char);
+			Offset++;
 			break;
 
 		case OID_SKGE_PHY_OPERATION_MODE :
-			/* Check the value range */
-			Val8 = *(pBuf + Offset);
+			/* Check the value range. */
 			if (Val8 == 0) {
-				/* mode of this port remains unchanged */
-				Offset += sizeof(char);
+				/* Mode of this port remains unchanged. */
+				Offset++;
 				break;
 			}
 			if (Val8 < SK_MS_MODE_AUTO ||
@@ -5683,34 +5490,51 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 				return (SK_PNMI_ERR_BAD_VALUE);
 			}
 
-			/* The preset ends here */
+			/* The PRESET ends here. */
 			if (Action == SK_PNMI_PRESET) {
 
 				return (SK_PNMI_ERR_OK);
 			}
 
-			if (LogPortIndex == 0) {
+			if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNet mode. */
+				if (LogPortIndex == 0) {
+					/*
+					 * The virtual port consists of all currently
+					 * active ports. Find them and send an event
+					 * with new master/slave (role) mode to SIRQ.
+					 */
+					for (PhysPortIndex = 0; PhysPortIndex < PhysPortMax;
+						PhysPortIndex ++) {
 
-				/*
-				 * The virtual port consists of all currently
-				 * active ports. Find them and send an event
-				 * with new master/slave (role) mode to SIRQ.
-				 */
-				for (PhysPortIndex = 0;
-					PhysPortIndex < PhysPortMax;
-					PhysPortIndex ++) {
+						if (!pAC->Pnmi.Port[PhysPortIndex].ActiveFlag) {
+							continue;
+						}
 
-					if (!pAC->Pnmi.Port[PhysPortIndex].
-						ActiveFlag) {
+						EventParam.Para32[0] = PhysPortIndex;
+						EventParam.Para32[1] = (SK_U32)Val8;
+						if (SkGeSirqEvent(pAC, IoC,
+							SK_HWEV_SET_ROLE,
+							EventParam) > 0) {
+
+							SK_ERR_LOG(pAC, SK_ERRCL_SW,
+								SK_PNMI_ERR042,
+								SK_PNMI_ERR042MSG);
 
-						continue;
+							*pLen = 0;
+							return (SK_PNMI_ERR_GENERAL);
+						}
 					}
-
-					EventParam.Para32[0] = PhysPortIndex;
+				}
+				else {
+					/*
+					 * Send an event with the new master/slave
+					 * (role) mode to the SIRQ module.
+					 */
+					EventParam.Para32[0] = SK_PNMI_PORT_LOG2PHYS(
+						pAC, LogPortIndex);
 					EventParam.Para32[1] = (SK_U32)Val8;
 					if (SkGeSirqEvent(pAC, IoC,
-						SK_HWEV_SET_ROLE,
-						EventParam) > 0) {
+						SK_HWEV_SET_ROLE, EventParam) > 0) {
 
 						SK_ERR_LOG(pAC, SK_ERRCL_SW,
 							SK_PNMI_ERR042,
@@ -5721,16 +5545,16 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 					}
 				}
 			}
-			else {
+			else { /* DualNet mode. */
+
 				/*
-				 * Send an event with the new master/slave
-				 * (role) mode to the SIRQ module.
+				 * Send an event with the new link mode to
+				 * the SIRQ module.
 				 */
-				EventParam.Para32[0] = SK_PNMI_PORT_LOG2PHYS(
-					pAC, LogPortIndex);
+				EventParam.Para32[0] = NetIndex;
 				EventParam.Para32[1] = (SK_U32)Val8;
-				if (SkGeSirqEvent(pAC, IoC,
-					SK_HWEV_SET_ROLE, EventParam) > 0) {
+				if (SkGeSirqEvent(pAC, IoC, SK_HWEV_SET_ROLE,
+					EventParam) > 0) {
 
 					SK_ERR_LOG(pAC, SK_ERRCL_SW,
 						SK_PNMI_ERR042,
@@ -5740,16 +5564,13 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 					return (SK_PNMI_ERR_GENERAL);
 				}
 			}
-
-			Offset += sizeof(char);
+			Offset++;
 			break;
 
 		case OID_SKGE_SPEED_MODE:
-			/* Check the value range */
-			Val8 = *(pBuf + Offset);
+			/* Check the value range. */
 			if (Val8 == 0) {
-
-				Offset += sizeof(char);
+				Offset++;
 				break;
 			}
 			if (Val8 < (SK_LSPEED_AUTO) ||
@@ -5760,29 +5581,49 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 				return (SK_PNMI_ERR_BAD_VALUE);
 			}
 
-			/* The preset ends here */
+			/* The PRESET ends here. */
 			if (Action == SK_PNMI_PRESET) {
 
 				return (SK_PNMI_ERR_OK);
 			}
 
-			if (LogPortIndex == 0) {
+			if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNet mode. */
+				if (LogPortIndex == 0) {
 
-				/*
-				 * The virtual port consists of all currently
-				 * active ports. Find them and send an event
-				 * with the new flow control mode to SIRQ.
-				 */
-				for (PhysPortIndex = 0;
-					PhysPortIndex < PhysPortMax;
-					PhysPortIndex ++) {
+					/*
+					 * The virtual port consists of all currently
+					 * active ports. Find them and send an event
+					 * with the new flow control mode to SIRQ.
+					 */
+					for (PhysPortIndex = 0; PhysPortIndex < PhysPortMax;
+						PhysPortIndex ++) {
 
-					if (!pAC->Pnmi.Port[PhysPortIndex].ActiveFlag) {
+						if (!pAC->Pnmi.Port[PhysPortIndex].ActiveFlag) {
+							continue;
+						}
 
-						continue;
-					}
+						EventParam.Para32[0] = PhysPortIndex;
+						EventParam.Para32[1] = (SK_U32)Val8;
+						if (SkGeSirqEvent(pAC, IoC,
+							SK_HWEV_SET_SPEED,
+							EventParam) > 0) {
+
+							SK_ERR_LOG(pAC, SK_ERRCL_SW,
+								SK_PNMI_ERR045,
+								SK_PNMI_ERR045MSG);
 
-					EventParam.Para32[0] = PhysPortIndex;
+							*pLen = 0;
+							return (SK_PNMI_ERR_GENERAL);
+						}
+					}
+				}
+				else {
+					/*
+					 * Send an event with the new flow control
+					 * mode to the SIRQ module.
+					 */
+					EventParam.Para32[0] = SK_PNMI_PORT_LOG2PHYS(
+						pAC, LogPortIndex);
 					EventParam.Para32[1] = (SK_U32)Val8;
 					if (SkGeSirqEvent(pAC, IoC,
 						SK_HWEV_SET_SPEED,
@@ -5797,16 +5638,15 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 					}
 				}
 			}
-			else {
+			else { /* DualNet mode. */
+				
 				/*
-				 * Send an event with the new flow control
-				 * mode to the SIRQ module.
+				 * Send an event with the new link mode to
+				 * the SIRQ module.
 				 */
-				EventParam.Para32[0] = SK_PNMI_PORT_LOG2PHYS(
-					pAC, LogPortIndex);
+				EventParam.Para32[0] = NetIndex;
 				EventParam.Para32[1] = (SK_U32)Val8;
-				if (SkGeSirqEvent(pAC, IoC,
-					SK_HWEV_SET_SPEED,
+				if (SkGeSirqEvent(pAC, IoC, SK_HWEV_SET_SPEED,
 					EventParam) > 0) {
 
 					SK_ERR_LOG(pAC, SK_ERRCL_SW,
@@ -5817,23 +5657,25 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 					return (SK_PNMI_ERR_GENERAL);
 				}
 			}
-			Offset += sizeof(char);
+			Offset++;
 			break;
 
-		case OID_SKGE_MTU :
-			/* Check the value range */
-			Val32 = *(SK_U32*)(pBuf + Offset);
+		case OID_SKGE_MTU:
+			/* Check the value range. */
+			SK_PNMI_READ_U32((pBuf + Offset), Val32);
+
 			if (Val32 == 0) {
-				/* mtu of this port remains unchanged */
+				/* MTU of this port remains unchanged. */
 				Offset += sizeof(SK_U32);
 				break;
 			}
+
 			if (SK_DRIVER_PRESET_MTU(pAC, IoC, NetIndex, Val32) != 0) {
 				*pLen = 0;
 				return (SK_PNMI_ERR_BAD_VALUE);
 			}
 
-			/* The preset ends here */
+			/* The PRESET ends here. */
 			if (Action == SK_PNMI_PRESET) {
 				return (SK_PNMI_ERR_OK);
 			}
@@ -5844,116 +5686,69 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 
 			Offset += sizeof(SK_U32);
 			break;
-		
+
 #ifdef SK_PHY_LP_MODE
 		case OID_SKGE_PHY_LP_MODE:
-			/* The preset ends here */
+			/* The PRESET ends here. */
 			if (Action == SK_PNMI_PRESET) {
 
 				return (SK_PNMI_ERR_OK);
 			}
 
-			if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
+			if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNet mode. */
 				if (LogPortIndex == 0) {
 					Offset = 0;
 					continue;
 				}
-				else {
-					/* Set value for physical ports */
-					PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(pAC, LogPortIndex);
-
-					switch (*(pBuf + Offset)) {
-						case 0:
-							/* If LowPowerMode is active, we can leave it. */
-							if (pAC->GIni.GP[PhysPortIndex].PPhyPowerState) {
-
-								Val32 = SkGmLeaveLowPowerMode(pAC, IoC, PhysPortIndex);
-								
-								if (pAC->GIni.GP[PhysPortIndex].PPhyPowerState < 3)	{
-									
-									SkDrvInitAdapter(pAC);
-								}
-								break;
-							}
-							else {
-								*pLen = 0;
-								return (SK_PNMI_ERR_GENERAL);
-							}
-						case 1:
-						case 2:
-						case 3:
-						case 4:
-							/* If no LowPowerMode is active, we can enter it. */
-							if (!pAC->GIni.GP[PhysPortIndex].PPhyPowerState) {
-
-								if ((*(pBuf + Offset)) < 3)	{
-								
-									SkDrvDeInitAdapter(pAC);
-								}
-
-								Val32 = SkGmEnterLowPowerMode(pAC, IoC, PhysPortIndex, *pBuf);
-								break;
-							}
-							else {
-								*pLen = 0;
-								return (SK_PNMI_ERR_GENERAL);
-							}
-						default:
-							*pLen = 0;
-							return (SK_PNMI_ERR_BAD_VALUE);
-					}
-				}
 			}
-			else { /* DualNetMode */
-				
-				switch (*(pBuf + Offset)) {
-					case 0:
-						/* If we are in a LowPowerMode, we can leave it. */
-						if (pAC->GIni.GP[PhysPortIndex].PPhyPowerState) {
+			/* Set value for physical port. */
+			PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(pAC, LogPortIndex);
+			CurrentPhyPowerState = pAC->GIni.GP[PhysPortIndex].PPhyPowerState;
 
-							Val32 = SkGmLeaveLowPowerMode(pAC, IoC, PhysPortIndex);
-							
-							if (pAC->GIni.GP[PhysPortIndex].PPhyPowerState < 3)	{
+			switch (Val8) {
+				case PHY_PM_OPERATIONAL_MODE:
+					/* If LowPowerMode is active, we can leave it. */
+					if (CurrentPhyPowerState) {
 
-								SkDrvInitAdapter(pAC);
-							}
-							break;
-						}
-						else {
-							*pLen = 0;
-							return (SK_PNMI_ERR_GENERAL);
-						}
-					
-					case 1:
-					case 2:
-					case 3:
-					case 4:
-						/* If we are not already in LowPowerMode, we can enter it. */
-						if (!pAC->GIni.GP[PhysPortIndex].PPhyPowerState) {
-
-							if ((*(pBuf + Offset)) < 3)	{
-
-								SkDrvDeInitAdapter(pAC);
-							}
-							else {
-
-								Val32 = SkGmEnterLowPowerMode(pAC, IoC, PhysPortIndex, *pBuf);
-							}
-							break;
-						}
-						else {
-							*pLen = 0;
-							return (SK_PNMI_ERR_GENERAL);
+						Val32 = SkGmLeaveLowPowerMode(pAC, IoC, PhysPortIndex);
+						
+						if ((CurrentPhyPowerState == PHY_PM_DEEP_SLEEP) ||
+							(CurrentPhyPowerState == PHY_PM_IEEE_POWER_DOWN)) {
+							
+							SkDrvInitAdapter(pAC);
 						}
-					
-					default:
+						break;
+					}
+					else {
 						*pLen = 0;
-						return (SK_PNMI_ERR_BAD_VALUE);
-				}
+						return (SK_PNMI_ERR_GENERAL);
+					}
+				case PHY_PM_DEEP_SLEEP:
+				case PHY_PM_IEEE_POWER_DOWN:
+					/* If no LowPowerMode is active, we can enter it. */
+					if (!CurrentPhyPowerState) {
+						SkDrvDeInitAdapter(pAC);
+					}
+
+				case PHY_PM_ENERGY_DETECT:
+				case PHY_PM_ENERGY_DETECT_PLUS:
+					/* If no LowPowerMode is active, we can enter it. */
+					if (!CurrentPhyPowerState) {
+
+						Val32 = SkGmEnterLowPowerMode(pAC, IoC, PhysPortIndex, *pBuf);
+						break;
+					}
+					else {
+						*pLen = 0;
+						return (SK_PNMI_ERR_GENERAL);
+					}
+				default:
+					*pLen = 0;
+					return (SK_PNMI_ERR_BAD_VALUE);
 			}
-			Offset += sizeof(SK_U8);
+			Offset++;
 			break;
-#endif
+#endif /* SK_PHY_LP_MODE */
 
 		default:
             SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_ERR,
@@ -6003,14 +5798,11 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	unsigned int	Limit;
 	unsigned int	Offset;
 	unsigned int	Entries;
-
 	
-	/*
-	 * Calculate instance if wished.
-	 */
-	/* XXX Not yet implemented. Return always an empty table. */
+	/* Not implemented yet. Return always an empty table. */
 	Entries = 0;
 
+	/* Calculate instance if wished. */
 	if ((Instance != (SK_U32)(-1))) {
 
 		if ((Instance < 1) || (Instance > Entries)) {
@@ -6027,12 +5819,10 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		Limit = Entries;
 	}
 
-	/*
-	 * Get/Set value
-	*/
+	/* GET/SET value. */
 	if (Action == SK_PNMI_GET) {
 
-		for (Offset=0; Index < Limit; Index ++) {
+		for (Offset = 0; Index < Limit; Index ++) {
 
 			switch (Id) {
 
@@ -6054,32 +5844,29 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		*pLen = Offset;
 	}
 	else {
-		/* Only MONITOR_ADMIN can be set */
+		/* Only MONITOR_ADMIN can be set. */
 		if (Id != OID_SKGE_RLMT_MONITOR_ADMIN) {
 
 			*pLen = 0;
 			return (SK_PNMI_ERR_READ_ONLY);
 		}
 
-		/* Check if the length is plausible */
+		/* Check if the length is plausible. */
 		if (*pLen < (Limit - Index)) {
 
 			return (SK_PNMI_ERR_TOO_SHORT);
 		}
-		/* Okay, we have a wide value range */
+		/* Okay, we have a wide value range. */
 		if (*pLen != (Limit - Index)) {
 
 			*pLen = 0;
 			return (SK_PNMI_ERR_BAD_VALUE);
 		}
-/*
-		for (Offset=0; Index < Limit; Index ++) {
-		}
-*/
-/*
- * XXX Not yet implemented. Return always BAD_VALUE, because the table
- * is empty.
- */
+
+		/*
+		 * Not yet implemented. Return always BAD_VALUE,
+		 * because the table is empty.
+		 */
 		*pLen = 0;
 		return (SK_PNMI_ERR_BAD_VALUE);
 	}
@@ -6120,14 +5907,12 @@ char *pBuf)		/* Buffer used for the mana
 	PortActiveFlag = SK_FALSE;
 	PhysPortMax = pAC->GIni.GIMacsFound;
 	
-	for (PhysPortIndex = 0; PhysPortIndex < PhysPortMax;
-		PhysPortIndex ++) {
+	for (PhysPortIndex = 0; PhysPortIndex < PhysPortMax; PhysPortIndex ++) {
 
 		pPrt = &pAC->GIni.GP[PhysPortIndex];
 
-		/* Check if the physical port is active */
+		/* Check if the physical port is active. */
 		if (!pAC->Pnmi.Port[PhysPortIndex].ActiveFlag) {
-
 			continue;
 		}
 
@@ -6136,12 +5921,13 @@ char *pBuf)		/* Buffer used for the mana
 		switch (Id) {
 
 		case OID_SKGE_PHY_TYPE:
-			/* Check if it is the first active port */
+			/* Check if it is the first active port. */
 			if (*pBuf == 0) {
 				Val32 = pPrt->PhyType;
 				SK_PNMI_STORE_U32(pBuf, Val32);
 				continue;
 			}
+			break;
 
 		case OID_SKGE_LINK_CAP:
 
@@ -6155,7 +5941,7 @@ char *pBuf)		/* Buffer used for the mana
 			break;
 
 		case OID_SKGE_LINK_MODE:
-			/* Check if it is the first active port */
+			/* Check if it is the first active port. */
 			if (*pBuf == 0) {
 
 				*pBuf = pPrt->PLinkModeConf;
@@ -6163,9 +5949,8 @@ char *pBuf)		/* Buffer used for the mana
 			}
 
 			/*
-			 * If we find an active port with a different link
-			 * mode than the first one we return a value that
-			 * indicates that the link mode is indeterminated.
+			 * If we find an active port with a different link mode
+			 * than the first one we return indeterminated.
 			 */
 			if (*pBuf != pPrt->PLinkModeConf) {
 
@@ -6174,10 +5959,10 @@ char *pBuf)		/* Buffer used for the mana
 			break;
 
 		case OID_SKGE_LINK_MODE_STATUS:
-			/* Get the link mode of the physical port */
+			/* Get the link mode of the physical port. */
 			Val8 = CalculateLinkModeStatus(pAC, IoC, PhysPortIndex);
 
-			/* Check if it is the first active port */
+			/* Check if it is the first active port. */
 			if (*pBuf == 0) {
 
 				*pBuf = Val8;
@@ -6185,10 +5970,8 @@ char *pBuf)		/* Buffer used for the mana
 			}
 
 			/*
-			 * If we find an active port with a different link
-			 * mode status than the first one we return a value
-			 * that indicates that the link mode status is
-			 * indeterminated.
+			 * If we find an active port with a different link mode status
+			 * than the first one we return indeterminated.
 			 */
 			if (*pBuf != Val8) {
 
@@ -6197,10 +5980,10 @@ char *pBuf)		/* Buffer used for the mana
 			break;
 
 		case OID_SKGE_LINK_STATUS:
-			/* Get the link status of the physical port */
+			/* Get the link status of the physical port. */
 			Val8 = CalculateLinkStatus(pAC, IoC, PhysPortIndex);
 
-			/* Check if it is the first active port */
+			/* Check if it is the first active port. */
 			if (*pBuf == 0) {
 
 				*pBuf = Val8;
@@ -6208,10 +5991,8 @@ char *pBuf)		/* Buffer used for the mana
 			}
 
 			/*
-			 * If we find an active port with a different link
-			 * status than the first one, we return a value
-			 * that indicates that the link status is
-			 * indeterminated.
+			 * If we find an active port with a different link status
+			 * than the first one we return indeterminated.
 			 */
 			if (*pBuf != Val8) {
 
@@ -6220,7 +6001,7 @@ char *pBuf)		/* Buffer used for the mana
 			break;
 
 		case OID_SKGE_FLOWCTRL_CAP:
-			/* Check if it is the first active port */
+			/* Check if it is the first active port. */
 			if (*pBuf == 0) {
 
 				*pBuf = pPrt->PFlowCtrlCap;
@@ -6235,7 +6016,7 @@ char *pBuf)		/* Buffer used for the mana
 			break;
 
 		case OID_SKGE_FLOWCTRL_MODE:
-			/* Check if it is the first active port */
+			/* Check if it is the first active port. */
 			if (*pBuf == 0) {
 
 				*pBuf = pPrt->PFlowCtrlMode;
@@ -6243,9 +6024,8 @@ char *pBuf)		/* Buffer used for the mana
 			}
 
 			/*
-			 * If we find an active port with a different flow
-			 * control mode than the first one, we return a value
-			 * that indicates that the mode is indeterminated.
+			 * If we find an active port with a different flow-control mode
+			 * than the first one we return indeterminated.
 			 */
 			if (*pBuf != pPrt->PFlowCtrlMode) {
 
@@ -6254,7 +6034,7 @@ char *pBuf)		/* Buffer used for the mana
 			break;
 
 		case OID_SKGE_FLOWCTRL_STATUS:
-			/* Check if it is the first active port */
+			/* Check if it is the first active port. */
 			if (*pBuf == 0) {
 
 				*pBuf = pPrt->PFlowCtrlStatus;
@@ -6262,10 +6042,8 @@ char *pBuf)		/* Buffer used for the mana
 			}
 
 			/*
-			 * If we find an active port with a different flow
-			 * control status than the first one, we return a
-			 * value that indicates that the status is
-			 * indeterminated.
+			 * If we find an active port with a different flow-control status
+			 * than the first one we return indeterminated.
 			 */
 			if (*pBuf != pPrt->PFlowCtrlStatus) {
 
@@ -6274,7 +6052,7 @@ char *pBuf)		/* Buffer used for the mana
 			break;
 		
 		case OID_SKGE_PHY_OPERATION_CAP:
-			/* Check if it is the first active port */
+			/* Check if it is the first active port. */
 			if (*pBuf == 0) {
 
 				*pBuf = pPrt->PMSCap;
@@ -6289,7 +6067,7 @@ char *pBuf)		/* Buffer used for the mana
 			break;
 
 		case OID_SKGE_PHY_OPERATION_MODE:
-			/* Check if it is the first active port */
+			/* Check if it is the first active port. */
 			if (*pBuf == 0) {
 
 				*pBuf = pPrt->PMSMode;
@@ -6297,9 +6075,8 @@ char *pBuf)		/* Buffer used for the mana
 			}
 
 			/*
-			 * If we find an active port with a different master/
-			 * slave mode than the first one, we return a value
-			 * that indicates that the mode is indeterminated.
+			 * If we find an active port with a different master/slave mode
+			 * than the first one we return indeterminated.
 			 */
 			if (*pBuf != pPrt->PMSMode) {
 
@@ -6308,7 +6085,7 @@ char *pBuf)		/* Buffer used for the mana
 			break;
 
 		case OID_SKGE_PHY_OPERATION_STATUS:
-			/* Check if it is the first active port */
+			/* Check if it is the first active port. */
 			if (*pBuf == 0) {
 
 				*pBuf = pPrt->PMSStatus;
@@ -6316,10 +6093,8 @@ char *pBuf)		/* Buffer used for the mana
 			}
 
 			/*
-			 * If we find an active port with a different master/
-			 * slave status than the first one, we return a
-			 * value that indicates that the status is
-			 * indeterminated.
+			 * If we find an active port with a different master/slave status
+			 * than the first one we return indeterminated.
 			 */
 			if (*pBuf != pPrt->PMSStatus) {
 
@@ -6328,7 +6103,7 @@ char *pBuf)		/* Buffer used for the mana
 			break;
 		
 		case OID_SKGE_SPEED_MODE:
-			/* Check if it is the first active port */
+			/* Check if it is the first active port. */
 			if (*pBuf == 0) {
 
 				*pBuf = pPrt->PLinkSpeed;
@@ -6336,9 +6111,8 @@ char *pBuf)		/* Buffer used for the mana
 			}
 
 			/*
-			 * If we find an active port with a different flow
-			 * control mode than the first one, we return a value
-			 * that indicates that the mode is indeterminated.
+			 * If we find an active port with a different link speed
+			 * than the first one we return indeterminated.
 			 */
 			if (*pBuf != pPrt->PLinkSpeed) {
 
@@ -6347,7 +6121,7 @@ char *pBuf)		/* Buffer used for the mana
 			break;
 		
 		case OID_SKGE_SPEED_STATUS:
-			/* Check if it is the first active port */
+			/* Check if it is the first active port. */
 			if (*pBuf == 0) {
 
 				*pBuf = pPrt->PLinkSpeedUsed;
@@ -6355,10 +6129,8 @@ char *pBuf)		/* Buffer used for the mana
 			}
 
 			/*
-			 * If we find an active port with a different flow
-			 * control status than the first one, we return a
-			 * value that indicates that the status is
-			 * indeterminated.
+			 * If we find an active port with a different link speed used
+			 * than the first one we return indeterminated.
 			 */
 			if (*pBuf != pPrt->PLinkSpeedUsed) {
 
@@ -6368,9 +6140,7 @@ char *pBuf)		/* Buffer used for the mana
 		}
 	}
 
-	/*
-	 * If no port is active return an indeterminated answer
-	 */
+	/* If no port is active return an indeterminated answer. */
 	if (!PortActiveFlag) {
 
 		switch (Id) {
@@ -6487,16 +6257,15 @@ unsigned int PhysPortIndex)	/* Physical 
 {
 	SK_U8	Result;
 
-	/* Get the current mode, which can be full or half duplex */
+	/* Get the current mode, which can be full or half duplex. */
 	Result = pAC->GIni.GP[PhysPortIndex].PLinkModeStatus;
 
-	/* Check if no valid mode could be found (link is down) */
+	/* Check if no valid mode could be found (link is down). */
 	if (Result < SK_LMODE_STAT_HALF) {
 
 		Result = SK_LMODE_STAT_UNKNOWN;
 	}
 	else if (pAC->GIni.GP[PhysPortIndex].PLinkMode >= SK_LMODE_AUTOHALF) {
-
 		/*
 		 * Auto-negotiation was used to bring up the link. Change
 		 * the already found duplex status that it indicates
@@ -6541,22 +6310,19 @@ unsigned int *pKeyNo)	/* Number of keys 
 	int			Index;
 	int			Ret;
 
-
 	SK_MEMSET(pKeyArr, 0, KeyArrLen);
 
-	/*
-	 * Get VPD key list
-	 */
+	/* Get VPD key list. */
 	Ret = VpdKeys(pAC, IoC, (char *)&BufKeys, (int *)&BufKeysLen,
 		(int *)pKeyNo);
+	
 	if (Ret > 0) {
 
-		SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR014,
-			SK_PNMI_ERR014MSG);
+		SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR014, SK_PNMI_ERR014MSG);
 
 		return (SK_PNMI_ERR_GENERAL);
 	}
-	/* If no keys are available return now */
+	/* If no keys are available return now. */
 	if (*pKeyNo == 0 || BufKeysLen == 0) {
 
 		return (SK_PNMI_ERR_OK);
@@ -6564,12 +6330,11 @@ unsigned int *pKeyNo)	/* Number of keys 
 	/*
 	 * If the key list is too long for us trunc it and give a
 	 * errorlog notification. This case should not happen because
-	 * the maximum number of keys is limited due to RAM limitations
+	 * the maximum number of keys is limited due to RAM limitations.
 	 */
 	if (*pKeyNo > SK_PNMI_VPD_ENTRIES) {
 
-		SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR015,
-			SK_PNMI_ERR015MSG);
+		SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR015, SK_PNMI_ERR015MSG);
 
 		*pKeyNo = SK_PNMI_VPD_ENTRIES;
 	}
@@ -6582,14 +6347,12 @@ unsigned int *pKeyNo)	/* Number of keys 
 		Offset ++) {
 
 		if (BufKeys[Offset] != 0) {
-
 			continue;
 		}
 
 		if (Offset - StartOffset > SK_PNMI_VPD_KEY_SIZE) {
 
-			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR016,
-				SK_PNMI_ERR016MSG);
+			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR016, SK_PNMI_ERR016MSG);
 			return (SK_PNMI_ERR_GENERAL);
 		}
 
@@ -6600,7 +6363,7 @@ unsigned int *pKeyNo)	/* Number of keys 
 		StartOffset = Offset + 1;
 	}
 
-	/* Last key not zero terminated? Get it anyway */
+	/* Last key not zero terminated? Get it anyway. */
 	if (StartOffset < Offset) {
 
 		SK_STRNCPY(pKeyArr + Index * SK_PNMI_VPD_KEY_SIZE,
@@ -6629,19 +6392,18 @@ SK_IOC IoC)	/* IO context handle */
 {
 	SK_EVPARA	EventParam;
 
-
 	/* Was the module already updated during the current PNMI call? */
 	if (pAC->Pnmi.SirqUpdatedFlag > 0) {
 
 		return (SK_PNMI_ERR_OK);
 	}
 
-	/* Send an synchronuous update event to the module */
+	/* Send an synchronuous update event to the module. */
 	SK_MEMSET((char *)&EventParam, 0, sizeof(EventParam));
-	if (SkGeSirqEvent(pAC, IoC, SK_HWEV_UPDATE_STAT, EventParam) > 0) {
+	
+	if (SkGeSirqEvent(pAC, IoC, SK_HWEV_UPDATE_STAT, EventParam)) {
 
-		SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR047,
-			SK_PNMI_ERR047MSG);
+		SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR047, SK_PNMI_ERR047MSG);
 
 		return (SK_PNMI_ERR_GENERAL);
 	}
@@ -6669,21 +6431,19 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 {
 	SK_EVPARA	EventParam;
 
-
 	/* Was the module already updated during the current PNMI call? */
 	if (pAC->Pnmi.RlmtUpdatedFlag > 0) {
 
 		return (SK_PNMI_ERR_OK);
 	}
 
-	/* Send an synchronuous update event to the module */
+	/* Send an synchronuous update event to the module. */
 	SK_MEMSET((char *)&EventParam, 0, sizeof(EventParam));
 	EventParam.Para32[0] = NetIndex;
 	EventParam.Para32[1] = (SK_U32)-1;
 	if (SkRlmtEvent(pAC, IoC, SK_RLMT_STATS_UPDATE, EventParam) > 0) {
 
-		SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR048,
-			SK_PNMI_ERR048MSG);
+		SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR048, SK_PNMI_ERR048MSG);
 
 		return (SK_PNMI_ERR_GENERAL);
 	}
@@ -6721,20 +6481,20 @@ unsigned int LastMac)	/* Index of the la
 		return (SK_PNMI_ERR_OK);
 	}
 
-	/* Send an update command to all MACs specified */
+	/* Send an update command to all MACs specified. */
 	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)
+		 *                      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);
@@ -6772,19 +6532,19 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	SK_U64			Val = 0;
 
 
-	if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {	/* Dual net mode */
+	if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {	/* DualNet mode. */
 
 		PhysPortIndex = NetIndex;
 		
 		Val = GetPhysStatVal(pAC, IoC, PhysPortIndex, StatIndex);
 	}
-	else {	/* Single Net mode */
+	else {	/* SingleNet mode. */
 
 		if (LogPortIndex == 0) {
 
 			PhysPortMax = pAC->GIni.GIMacsFound;
 
-			/* Add counter of all active ports */
+			/* Add counter of all active ports. */
 			for (PhysPortIndex = 0; PhysPortIndex < PhysPortMax;
 				PhysPortIndex ++) {
 
@@ -6794,11 +6554,11 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 				}
 			}
 
-			/* Correct value because of port switches */
+			/* Correct value because of port switches. */
 			Val += pAC->Pnmi.VirtualCounterOffset[StatIndex];
 		}
 		else {
-			/* Get counter value of physical port */
+			/* Get counter value of physical port. */
 			PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(pAC, LogPortIndex);
 			
 			Val = GetPhysStatVal(pAC, IoC, PhysPortIndex, StatIndex);
@@ -6844,7 +6604,7 @@ unsigned int StatIndex)		/* Index to sta
 	
 	MacType = pAC->GIni.GIMacType;
 	
-	/* 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) {
 		pPnmiPrt = &pAC->Pnmi.BufPort[PhysPortIndex];
 	}
@@ -6912,7 +6672,7 @@ unsigned int StatIndex)		/* Index to sta
 	case SK_PNMI_HTX_BURST:
 	case SK_PNMI_HTX_EXCESS_DEF:
 	case SK_PNMI_HTX_CARRIER:
-		/* Not supported by GMAC */
+		/* Not supported by GMAC. */
 		if (MacType == SK_MAC_GMAC) {
 			return (Val);
 		}
@@ -6924,7 +6684,7 @@ unsigned int StatIndex)		/* Index to sta
 		break;
 
 	case SK_PNMI_HTX_MACC:
-		/* GMAC only supports PAUSE MAC control frames */
+		/* GMAC only supports PAUSE MAC control frames. */
 		if (MacType == SK_MAC_GMAC) {
 			HelpIndex = SK_PNMI_HTX_PMACC;
 		}
@@ -6941,7 +6701,7 @@ unsigned int StatIndex)		/* Index to sta
 
 	case SK_PNMI_HTX_COL:
 	case SK_PNMI_HRX_UNDERSIZE:
-		/* Not supported by XMAC */
+		/* Not supported by XMAC. */
 		if (MacType == SK_MAC_XMAC) {
 			return (Val);
 		}
@@ -6953,7 +6713,7 @@ unsigned int StatIndex)		/* Index to sta
 		break;
 
 	case SK_PNMI_HTX_DEFFERAL:
-		/* Not supported by GMAC */
+		/* Not supported by GMAC. */
 		if (MacType == SK_MAC_GMAC) {
 			return (Val);
 		}
@@ -6971,7 +6731,7 @@ unsigned int StatIndex)		/* Index to sta
 			HighVal = 0;
 		}
 		else {
-			/* Otherwise get contents of hardware register */
+			/* Otherwise get contents of hardware register. */
 			(void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
 										  StatAddr[StatIndex][MacType].Reg,
 										  &LowVal);
@@ -6980,7 +6740,7 @@ unsigned int StatIndex)		/* Index to sta
 		break;
 
 	case SK_PNMI_HRX_BADOCTET:
-		/* Not supported by XMAC */
+		/* Not supported by XMAC. */
 		if (MacType == SK_MAC_XMAC) {
 			return (Val);
 		}
@@ -6999,7 +6759,7 @@ unsigned int StatIndex)		/* Index to sta
 		return (Val);
 
 	case SK_PNMI_HRX_LONGFRAMES:
-		/* For XMAC the SW counter is managed by PNMI */
+		/* For XMAC the SW counter is managed by PNMI. */
 		if (MacType == SK_MAC_XMAC) {
 			return (pPnmiPrt->StatRxLongFrameCts);
 		}
@@ -7019,7 +6779,7 @@ unsigned int StatIndex)		/* Index to sta
 		Val = (((SK_U64)HighVal << 32) | (SK_U64)LowVal);
 
 		if (MacType == SK_MAC_GMAC) {
-			/* For GMAC the SW counter is additionally managed by PNMI */
+			/* For GMAC the SW counter is additionally managed by PNMI. */
 			Val += pPnmiPrt->StatRxFrameTooLongCts;
 		}
 		else {
@@ -7037,20 +6797,19 @@ unsigned int StatIndex)		/* Index to sta
 		break;
 		
 	case SK_PNMI_HRX_SHORTS:
-		/* Not supported by GMAC */
+		/* Not supported by GMAC. */
 		if (MacType == SK_MAC_GMAC) {
 			/* GM_RXE_FRAG?? */
 			return (Val);
 		}
 		
 		/*
-		 * XMAC counts short frame errors even if link down (#10620)
-		 *
-		 * If link-down the counter remains constant
+		 * XMAC counts short frame errors even if link down (#10620).
+		 * If the link is down, the counter remains constant.
 		 */
 		if (pPrt->PLinkModeStatus != SK_LMODE_STAT_UNKNOWN) {
 
-			/* Otherwise get incremental difference */
+			/* Otherwise get incremental difference. */
 			(void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
 										  StatAddr[StatIndex][MacType].Reg,
 										  &LowVal);
@@ -7073,7 +6832,7 @@ unsigned int StatIndex)		/* Index to sta
 	case SK_PNMI_HRX_IRLENGTH:
 	case SK_PNMI_HRX_SYMBOL:
 	case SK_PNMI_HRX_CEXT:
-		/* Not supported by GMAC */
+		/* Not supported by GMAC. */
 		if (MacType == SK_MAC_GMAC) {
 			return (Val);
 		}
@@ -7085,7 +6844,7 @@ unsigned int StatIndex)		/* Index to sta
 		break;
 
 	case SK_PNMI_HRX_PMACC_ERR:
-		/* For GMAC the SW counter is managed by PNMI */
+		/* For GMAC the SW counter is managed by PNMI. */
 		if (MacType == SK_MAC_GMAC) {
 			return (pPnmiPrt->StatRxPMaccErr);
 		}
@@ -7096,13 +6855,13 @@ unsigned int StatIndex)		/* Index to sta
 		HighVal = pPnmiPrt->CounterHigh[StatIndex];
 		break;
 
-	/* SW counter managed by PNMI */
+	/* SW counter managed by PNMI. */
 	case SK_PNMI_HTX_SYNC:
 		LowVal = (SK_U32)pPnmiPrt->StatSyncCts;
 		HighVal = (SK_U32)(pPnmiPrt->StatSyncCts >> 32);
 		break;
 
-	/* SW counter managed by PNMI */
+	/* SW counter managed by PNMI. */
 	case SK_PNMI_HTX_SYNC_OCTET:
 		LowVal = (SK_U32)pPnmiPrt->StatSyncOctetsCts;
 		HighVal = (SK_U32)(pPnmiPrt->StatSyncOctetsCts >> 32);
@@ -7110,17 +6869,19 @@ unsigned int StatIndex)		/* Index to sta
 
 	case SK_PNMI_HRX_FCS:
 		/*
-		 * Broadcom filters FCS errors and counts it in
-		 * Receive Error Counter register
+		 * Broadcom filters FCS errors and counts them in
+		 * Receive Error Counter register.
 		 */
 		if (pPrt->PhyType == SK_PHY_BCOM) {
-			/* do not read while not initialized (PHY_READ hangs!)*/
+#ifdef GENESIS
+			/* Do not read while not initialized (PHY_READ hangs!). */
 			if (pPrt->PState != SK_PRT_RESET) {
 				SkXmPhyRead(pAC, IoC, PhysPortIndex, PHY_BCOM_RE_CTR, &Word);
 				
 				LowVal = Word;
 			}
 			HighVal = pPnmiPrt->CounterHigh[StatIndex];
+#endif /* GENESIS */
 		}
 		else {
 			(void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
@@ -7140,7 +6901,7 @@ unsigned int StatIndex)		/* Index to sta
 
 	Val = (((SK_U64)HighVal << 32) | (SK_U64)LowVal);
 
-	/* Correct value because of possible XMAC reset. XMAC Errata #2 */
+	/* Correct value because of possible XMAC reset (XMAC Errata #2). */
 	Val += pPnmiPrt->CounterOffset[StatIndex];
 
 	return (Val);
@@ -7165,22 +6926,21 @@ SK_U32 NetIndex)
 	unsigned int	PhysPortIndex;
 	SK_EVPARA	EventParam;
 
-
 	SK_MEMSET((char *)&EventParam, 0, sizeof(EventParam));
 
-	/* Notify sensor module */
+	/* Notify sensor module. */
 	SkEventQueue(pAC, SKGE_I2C, SK_I2CEV_CLEAR, EventParam);
 
-	/* Notify RLMT module */
+	/* Notify RLMT module. */
 	EventParam.Para32[0] = NetIndex;
 	EventParam.Para32[1] = (SK_U32)-1;
 	SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_STATS_CLEAR, EventParam);
 	EventParam.Para32[1] = 0;
 
-	/* Notify SIRQ module */
+	/* Notify SIRQ module. */
 	SkEventQueue(pAC, SKGE_HWAC, SK_HWEV_CLEAR_STAT, EventParam);
 
-	/* Notify CSUM module */
+	/* Notify CSUM module. */
 #ifdef SK_USE_CSUM
 	EventParam.Para32[0] = NetIndex;
 	EventParam.Para32[1] = (SK_U32)-1;
@@ -7188,7 +6948,7 @@ SK_U32 NetIndex)
 		EventParam);
 #endif /* SK_USE_CSUM */
 	
-	/* Clear XMAC statistic */
+	/* Clear XMAC statistics. */
 	for (PhysPortIndex = 0; PhysPortIndex <
 		(unsigned int)pAC->GIni.GIMacsFound; PhysPortIndex ++) {
 
@@ -7215,13 +6975,13 @@ SK_U32 NetIndex)
 			PhysPortIndex].StatRxPMaccErr));
 	}
 
-	/*
-	 * Clear local statistics
-	 */
+	/* Clear local statistics. */
 	SK_MEMSET((char *)&pAC->Pnmi.VirtualCounterOffset, 0,
 		  sizeof(pAC->Pnmi.VirtualCounterOffset));
+	
 	pAC->Pnmi.RlmtChangeCts = 0;
 	pAC->Pnmi.RlmtChangeTime = 0;
+	
 	SK_MEMSET((char *)&pAC->Pnmi.RlmtChangeEstimate.EstValue[0], 0,
 		sizeof(pAC->Pnmi.RlmtChangeEstimate.EstValue));
 	pAC->Pnmi.RlmtChangeEstimate.EstValueIndex = 0;
@@ -7258,23 +7018,21 @@ SK_AC *pAC,		/* Pointer to adapter conte
 SK_U32 TrapId,		/* SNMP ID of the trap */
 unsigned int Size)	/* Space needed for trap entry */
 {
-	unsigned int		BufPad = pAC->Pnmi.TrapBufPad;
-	unsigned int		BufFree = pAC->Pnmi.TrapBufFree;
-	unsigned int		Beg = pAC->Pnmi.TrapQueueBeg;
-	unsigned int		End = pAC->Pnmi.TrapQueueEnd;
+	unsigned int	BufPad = pAC->Pnmi.TrapBufPad;
+	unsigned int	BufFree = pAC->Pnmi.TrapBufFree;
+	unsigned int	Beg = pAC->Pnmi.TrapQueueBeg;
+	unsigned int	End = pAC->Pnmi.TrapQueueEnd;
 	char			*pBuf = &pAC->Pnmi.TrapBuf[0];
 	int			Wrap;
-	unsigned int		NeededSpace;
-	unsigned int		EntrySize;
+	unsigned int	NeededSpace;
+	unsigned int	EntrySize;
 	SK_U32			Val32;
 	SK_U64			Val64;
 
-
-	/* Last byte of entry will get a copy of the entry length */
+	/* Last byte of entry will get a copy of the entry length. */
 	Size ++;
 
-	/*
-	 * Calculate needed buffer space */
+	/* Calculate needed buffer space. */
 	if (Beg >= Size) {
 
 		NeededSpace = Size;
@@ -7289,7 +7047,7 @@ unsigned int Size)	/* Space needed for t
 	 * Check if enough buffer space is provided. Otherwise
 	 * free some entries. Leave one byte space between begin
 	 * and end of buffer to make it possible to detect whether
-	 * the buffer is full or empty
+	 * the buffer is full or empty.
 	 */
 	while (BufFree < NeededSpace + 1) {
 
@@ -7328,13 +7086,13 @@ unsigned int Size)	/* Space needed for t
 	}
 	BufFree -= NeededSpace;
 
-	/* Save the current offsets */
+	/* Save the current offsets. */
 	pAC->Pnmi.TrapQueueBeg = Beg;
 	pAC->Pnmi.TrapQueueEnd = End;
 	pAC->Pnmi.TrapBufPad = BufPad;
 	pAC->Pnmi.TrapBufFree = BufFree;
 
-	/* Initialize the trap entry */
+	/* Initialize the trap entry. */
 	*(pBuf + Beg + Size - 1) = (char)Size;
 	*(pBuf + Beg) = (char)Size;
 	Val32 = (pAC->Pnmi.TrapUnique) ++;
@@ -7369,7 +7127,6 @@ char *pDstBuf)		/* Buffer to which the q
 	unsigned int	Len;
 	unsigned int	DstOff = 0;
 
-
 	while (Trap != End) {
 
 		Len = (unsigned int)*(pBuf + Trap);
@@ -7414,7 +7171,6 @@ unsigned int *pEntries)	/* Returns numbe
 	unsigned int	Entries = 0;
 	unsigned int	TotalLen = 0;
 
-
 	while (Trap != End) {
 
 		Len = (unsigned int)*(pBuf + Trap);
@@ -7471,14 +7227,14 @@ unsigned int SensorIndex)	/* Index of se
 	unsigned int	DescrLen;
 	SK_U32		Val32;
 
-
-	/* Get trap buffer entry */
+	/* Get trap buffer entry. */
 	DescrLen = SK_STRLEN(pAC->I2c.SenTable[SensorIndex].SenDesc);
+	
 	pBuf = GetTrapEntry(pAC, TrapId,
 		SK_PNMI_TRAP_SENSOR_LEN_BASE + DescrLen);
 	Offset = SK_PNMI_TRAP_SIMPLE_LEN;
 
-	/* Store additionally sensor trap related data */
+	/* Store additionally sensor trap related data. */
 	Val32 = OID_SKGE_SENSOR_INDEX;
 	SK_PNMI_STORE_U32(pBuf + Offset, Val32);
 	*(pBuf + Offset + 4) = 4;
@@ -7523,7 +7279,6 @@ unsigned int ActiveMac)	/* Index (0..n) 
 	char	*pBuf;
 	SK_U32	Val32;
 
-
 	pBuf = GetTrapEntry(pAC, OID_SKGE_TRAP_RLMT_CHANGE_PORT,
 		SK_PNMI_TRAP_RLMT_CHANGE_LEN);
 
@@ -7551,7 +7306,6 @@ unsigned int PortIndex)	/* Index of the 
 	char	*pBuf;
 	SK_U32	Val32;
 
-
 	pBuf = GetTrapEntry(pAC, TrapId, SK_PNMI_TRAP_RLMT_PORT_LEN);
 
 	Val32 = OID_SKGE_RLMT_PORT_INDEX;
@@ -7571,12 +7325,11 @@ unsigned int PortIndex)	/* Index of the 
  *	Nothing
  */
 PNMI_STATIC void CopyMac(
-char *pDst,		/* Pointer to destination buffer */
+char		*pDst,	/* Pointer to destination buffer */
 SK_MAC_ADDR *pMac)	/* Pointer of Source */
 {
 	int	i;
 
-
 	for (i = 0; i < sizeof(SK_MAC_ADDR); i ++) {
 
 		*(pDst + i) = pMac->a[i];
@@ -7616,17 +7369,14 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	
 	SK_U32	RetCode = SK_PNMI_ERR_GENERAL;
 
-	/*
-	 * Check instance. We only handle single instance variables
-	 */
+	/* 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 */
+    /* Check length. */
     switch (Id) {
 
     case OID_PNP_CAPABILITIES:
@@ -7664,14 +7414,10 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
         break;
     }
 	
-    /*
-	 * Perform action
-	 */
+	/* Perform action. */
 	if (Action == SK_PNMI_GET) {
 
-		/*
-		 * Get value
-		 */
+		/* Get value. */
 		switch (Id) {
 
 		case OID_PNP_CAPABILITIES:
@@ -7679,18 +7425,21 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			break;
 
 		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.
-			 A miniport driver must always return NDIS_STATUS_SUCCESS
-			 to a query of OID_PNP_QUERY_POWER. */
-			*pLen = sizeof(SK_DEVICE_POWER_STATE);;
+			/*
+			 * 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.
+			 * A miniport driver must always return NDIS_STATUS_SUCCESS
+			 * to a query of OID_PNP_QUERY_POWER.
+			 */
+			*pLen = sizeof(SK_DEVICE_POWER_STATE);
             RetCode = SK_PNMI_ERR_OK;
 			break;
 
-			/* NDIS handles these OIDs as write-only.
+			/*
+			 * NDIS handles these OIDs as write-only.
 			 * So in case of get action the buffer with written length = 0
-			 * is returned
+			 * is returned.
 			 */
 		case OID_PNP_SET_POWER:
 		case OID_PNP_ADD_WAKE_UP_PATTERN:
@@ -7711,13 +7460,11 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		return (RetCode);
 	}
 	
-
-	/*
-	 * Perform preset or set
-	 */
+	/* Perform PRESET or SET. */
 	
-	/* POWER module does not support PRESET action */
+	/* The POWER module does not support PRESET action. */
 	if (Action == SK_PNMI_PRESET) {
+
 		return (SK_PNMI_ERR_OK);
 	}
 
@@ -7749,7 +7496,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 #ifdef SK_DIAG_SUPPORT
 /*****************************************************************************
  *
- * DiagActions - OID handler function of Diagnostic driver 
+ * DiagActions - OID handler function of Diagnostic driver
  *
  * Description:
  *	The code is simple. No description necessary.
@@ -7776,22 +7523,17 @@ SK_U32 Instance,	/* Instance (1..n) that
 unsigned int TableIndex, /* Index to the Id table */
 SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode always zero */
 {
-
 	SK_U32	DiagStatus;
 	SK_U32	RetCode = SK_PNMI_ERR_GENERAL;
 
-	/*
-	 * Check instance. We only handle single instance variables.
-	 */
+	/* 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.
-	 */
+    /* Check length. */
 	switch (Id) {
 
 	case OID_SKGE_DIAG_MODE:
@@ -7809,10 +7551,9 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	}
 
 	/* Perform action. */
-
-	/* GET value. */
 	if (Action == SK_PNMI_GET) {
 
+		/* Get value. */
 		switch (Id) {
 
 		case OID_SKGE_DIAG_MODE:
@@ -7827,14 +7568,15 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			RetCode = SK_PNMI_ERR_GENERAL;
 			break;
 		}
-		return (RetCode); 
+		return (RetCode);
 	}
 
 	/* From here SET or PRESET value. */
 	
 	/* PRESET value is not supported. */
 	if (Action == SK_PNMI_PRESET) {
-		return (SK_PNMI_ERR_OK); 
+
+		return (SK_PNMI_ERR_OK);
 	}
 
 	/* SET value. */
@@ -7846,7 +7588,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 
 				/* Attach the DIAG to this adapter. */
 				case SK_DIAG_ATTACHED:
-					/* Check if we come from running */
+					/* Check if we come from running. */
 					if (pAC->Pnmi.DiagAttached == SK_DIAG_RUNNING) {
 
 						RetCode = SkDrvLeaveDiagMode(pAC);
@@ -7881,7 +7623,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 						/* If DiagMode is not active, we can enter it. */
 						if (!pAC->DiagModeActive) {
 
-							RetCode = SkDrvEnterDiagMode(pAC); 
+							RetCode = SkDrvEnterDiagMode(pAC);
 						}
 						else {
 
@@ -7900,7 +7642,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 					break;
 
 				case SK_DIAG_IDLE:
-					/* Check if we come from running */
+					/* Check if we come from running. */
 					if (pAC->Pnmi.DiagAttached == SK_DIAG_RUNNING) {
 
 						RetCode = SkDrvLeaveDiagMode(pAC);
@@ -7946,7 +7688,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 
 /*****************************************************************************
  *
- * Vct - OID handler function of  OIDs
+ * Vct - OID handler function of OIDs for Virtual Cable Tester (VCT)
  *
  * Description:
  *	The code is simple. No description necessary.
@@ -7982,15 +7724,13 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	SK_U32		PhysPortIndex;
 	SK_U32		Limit;
 	SK_U32		Offset;
-	SK_BOOL		Link;
-	SK_U32		RetCode = SK_PNMI_ERR_GENERAL;
-	int		i;
+	SK_U32		RetCode;
+	int			i;
 	SK_EVPARA	Para;
-	SK_U32		CableLength;
 	
-	/*
-	 * Calculate the port indexes from the instance.
-	 */
+	RetCode = SK_PNMI_ERR_GENERAL;
+	
+	/* Calculate the port indexes from the instance. */
 	PhysPortMax = pAC->GIni.GIMacsFound;
 	LogPortMax = SK_PNMI_PORT_PHYS2LOG(PhysPortMax);
 	
@@ -8000,7 +7740,11 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	}
 	
 	if ((Instance != (SK_U32) (-1))) {
-		/* Check instance range. */
+		/*
+		 * Get one instance of that OID, so check the instance range:
+		 * There is no virtual port with an Instance == 1, so we get
+		 * the values from one physical port only.
+		 */
 		if ((Instance < 2) || (Instance > LogPortMax)) {
 			*pLen = 0;
 			return (SK_PNMI_ERR_UNKNOWN_INST);
@@ -8016,34 +7760,26 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	}
 	else {
 		/*
-		 * Instance == (SK_U32) (-1), get all Instances of that OID.
-		 *
-		 * Not implemented yet. May be used in future releases.
+		 * Instance == (SK_U32) (-1), so get all instances of that OID.
+		 * There is no virtual port with an Instance == 1, so we get
+		 * the values from all physical ports.
 		 */
 		PhysPortIndex = 0;
 		Limit = PhysPortMax;
 	}
 	
 	pPrt = &pAC->GIni.GP[PhysPortIndex];
-	if (pPrt->PHWLinkUp) {
-		Link = SK_TRUE;
-	}
-	else {
-		Link = SK_FALSE;
-	}
 	
-	/* Check MAC type */
-	if (pPrt->PhyType != SK_PHY_MARV_COPPER) {
+	/* Check MAC type. */
+	if ((Id != OID_SKGE_VCT_CAPABILITIES) &&
+		(pPrt->PhyType != SK_PHY_MARV_COPPER)) {
 		*pLen = 0;
-		return (SK_PNMI_ERR_GENERAL);
+		return (SK_PNMI_ERR_NOT_SUPPORTED);
 	}
 	
-	/* 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:
@@ -8054,6 +7790,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			break;
 		
 		case OID_SKGE_VCT_STATUS:
+		case OID_SKGE_VCT_CAPABILITIES:
 			if (*pLen < (Limit - PhysPortIndex) * sizeof(SK_U8)) {
 				*pLen = (Limit - PhysPortIndex) * sizeof(SK_U8);
 				return (SK_PNMI_ERR_TOO_SHORT);
@@ -8065,70 +7802,73 @@ 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:
-				if ((Link == SK_FALSE) &&
+				if (!pPrt->PHWLinkUp &&
 					(pAC->Pnmi.VctStatus[PhysPortIndex] & SK_PNMI_VCT_PENDING)) {
+
 					RetCode = SkGmCableDiagStatus(pAC, IoC, PhysPortIndex, SK_FALSE);
+					
 					if (RetCode == 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];
-						}
+						/* VCT test is finished, so save the data. */
+						VctGetResults(pAC, IoC, PhysPortIndex);
 
 						Para.Para32[0] = PhysPortIndex;
 						Para.Para32[1] = -1;
 						SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_RESET, Para);
-						SkEventDispatcher(pAC, IoC);
-					}
-					else {
-						; /* VCT test is running. */
+
+						/* SkEventDispatcher(pAC, IoC); */
 					}
 				}
 				
+				/* Initialize backup data pointer. */
+				pVctBackupData = &pAC->Pnmi.VctBackup[PhysPortIndex];
+				
 				/* Get all results. */
 				CheckVctStatus(pAC, IoC, pBuf, Offset, PhysPortIndex);
-				Offset += sizeof(SK_U8);
+				
+				Offset++;
 				*(pBuf + Offset) = pPrt->PCableLen;
-				Offset += sizeof(SK_U8);
+				Offset++;
 				for (i = 0; i < 4; i++)  {
-					SK_PNMI_STORE_U32((pBuf + Offset), pVctBackupData->PMdiPairLen[i]);
+
+					SK_PNMI_STORE_U32((pBuf + Offset), pVctBackupData->MdiPairLen[i]);
 					Offset += sizeof(SK_U32);
 				}
 				for (i = 0; i < 4; i++)  {
-					*(pBuf + Offset) = pVctBackupData->PMdiPairSts[i];
-					Offset += sizeof(SK_U8);
+
+					*(pBuf + Offset) = pVctBackupData->MdiPairSts[i];
+					Offset++;
 				}
 				
 				RetCode = SK_PNMI_ERR_OK;
 				break;
-		
+
 			case OID_SKGE_VCT_STATUS:
 				CheckVctStatus(pAC, IoC, pBuf, Offset, PhysPortIndex);
-				Offset += sizeof(SK_U8);
+
+				Offset++;
 				RetCode = SK_PNMI_ERR_OK;
 				break;
-			
+
+			case OID_SKGE_VCT_CAPABILITIES:
+				if (pPrt->PhyType != SK_PHY_MARV_COPPER) {
+					*(pBuf + Offset) = SK_PNMI_VCT_NOT_SUPPORTED;
+				}
+				else {
+					*(pBuf + Offset) = SK_PNMI_VCT_SUPPORTED;
+				}
+				Offset++;
+
+				RetCode = SK_PNMI_ERR_OK;
+				break;
+
 			default:
 				*pLen = 0;
 				return (SK_PNMI_ERR_GENERAL);
@@ -8144,7 +7884,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)) {
@@ -8158,36 +7898,39 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		return (SK_PNMI_ERR_GENERAL);
 	}
 	
-	/*
-	 * Perform preset or set.
-	 */
+	/* Perform PRESET or SET. */
 	
 	/* VCT does not support PRESET action. */
 	if (Action == SK_PNMI_PRESET) {
+
 		return (SK_PNMI_ERR_OK);
 	}
 	
 	Offset = 0;
 	for (; PhysPortIndex < Limit; PhysPortIndex++) {
+
+		pPrt = &pAC->GIni.GP[PhysPortIndex];
+
 		switch (Id) {
 		case OID_SKGE_VCT_SET: /* Start VCT test. */
-			if (Link == SK_FALSE) {
+			if (!pPrt->PHWLinkUp) {
 				SkGeStopPort(pAC, IoC, PhysPortIndex, SK_STOP_ALL, SK_SOFT_RST);
 				
 				RetCode = SkGmCableDiagStatus(pAC, IoC, PhysPortIndex, SK_TRUE);
+				
 				if (RetCode == 0) { /* RetCode: 0 => Start! */
 					pAC->Pnmi.VctStatus[PhysPortIndex] |= SK_PNMI_VCT_PENDING;
-					pAC->Pnmi.VctStatus[PhysPortIndex] &= ~SK_PNMI_VCT_NEW_VCT_DATA;
-					pAC->Pnmi.VctStatus[PhysPortIndex] &= ~SK_PNMI_VCT_LINK;
+					pAC->Pnmi.VctStatus[PhysPortIndex] &=
+						~(SK_PNMI_VCT_NEW_VCT_DATA | SK_PNMI_VCT_LINK);
 					
-					/*
-					 * Start VCT timer counter.
-					 */
-					SK_MEMSET((char *) &Para, 0, sizeof(Para));
+					/* Start VCT timer counter. */
+					SK_MEMSET((char *)&Para, 0, sizeof(Para));
 					Para.Para32[0] = PhysPortIndex;
 					Para.Para32[1] = -1;
-					SkTimerStart(pAC, IoC, &pAC->Pnmi.VctTimeout[PhysPortIndex].VctTimer,
-						4000000, SKGE_PNMI, SK_PNMI_EVT_VCT_RESET, Para);
+					
+					SkTimerStart(pAC, IoC, &pAC->Pnmi.VctTimeout[PhysPortIndex],
+						SK_PNMI_VCT_TIMER_CHECK, SKGE_PNMI, SK_PNMI_EVT_VCT_RESET, Para);
+					
 					SK_PNMI_STORE_U32((pBuf + Offset), RetCode);
 					RetCode = SK_PNMI_ERR_OK;
 				}
@@ -8215,6 +7958,57 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 } /* Vct */
 
 
+PNMI_STATIC void VctGetResults(
+SK_AC		*pAC,
+SK_IOC		IoC,
+SK_U32		Port)
+{
+	SK_GEPORT	*pPrt;
+	int			i;
+	SK_U8		PairLen;
+	SK_U8		PairSts;
+	SK_U32		CableLength;
+	
+	pPrt = &pAC->GIni.GP[Port];
+
+	/* Copy results for later use to PNMI struct. */
+	for (i = 0; i < 4; i++)  {
+
+		PairLen = pPrt->PMdiPairLen[i];
+
+		if (((pPrt->PLinkSpeedCap & SK_LSPEED_CAP_1000MBPS) == 0) && (i > 1)) {
+			PairSts = SK_PNMI_VCT_NOT_PRESENT;
+		}
+		else {
+			PairSts = pPrt->PMdiPairSts[i];
+		}
+
+		if ((PairSts == SK_PNMI_VCT_NORMAL_CABLE) &&
+			(PairLen > 28) && (PairLen < 0xff)) {
+
+			PairSts = SK_PNMI_VCT_IMPEDANCE_MISMATCH;
+		}
+
+		/* Ignore values <= 35, the linear factor is 4/5 (trend line). */
+		if ((PairLen > 35) && (PairLen < 0xff)) {
+			
+			CableLength = 1000UL * (PairLen - 35) * 4 / 5;
+		}
+		else {
+			/* No cable or short cable. */
+			CableLength = 0;
+		}
+
+		pAC->Pnmi.VctBackup[Port].MdiPairLen[i] = CableLength;
+		pAC->Pnmi.VctBackup[Port].MdiPairSts[i] = PairSts;
+	}
+
+	pAC->Pnmi.VctStatus[Port] &= ~SK_PNMI_VCT_PENDING;
+	pAC->Pnmi.VctStatus[Port] |= (SK_PNMI_VCT_NEW_VCT_DATA |
+		SK_PNMI_VCT_TEST_DONE);
+
+} /* GetVctResults */
+
 PNMI_STATIC void CheckVctStatus(
 SK_AC		*pAC,
 SK_IOC		IoC,
@@ -8224,6 +8018,7 @@ SK_U32		PhysPortIndex)
 {
 	SK_GEPORT 	*pPrt;
 	SK_PNMI_VCT	*pVctData;
+	SK_U8		VctStatus;
 	SK_U32		RetCode;
 	
 	pPrt = &pAC->GIni.GP[PhysPortIndex];
@@ -8231,11 +8026,13 @@ SK_U32		PhysPortIndex)
 	pVctData = (SK_PNMI_VCT *) (pBuf + Offset);
 	pVctData->VctStatus = SK_PNMI_VCT_NONE;
 	
+	VctStatus = pAC->Pnmi.VctStatus[PhysPortIndex];
+	
 	if (!pPrt->PHWLinkUp) {
 		
 		/* Was a VCT test ever made before? */
-		if (pAC->Pnmi.VctStatus[PhysPortIndex] & SK_PNMI_VCT_TEST_DONE) {
-			if ((pAC->Pnmi.VctStatus[PhysPortIndex] & SK_PNMI_VCT_LINK)) {
+		if (VctStatus & SK_PNMI_VCT_TEST_DONE) {
+			if (VctStatus & SK_PNMI_VCT_LINK) {
 				pVctData->VctStatus |= SK_PNMI_VCT_OLD_VCT_DATA;
 			}
 			else {
@@ -8245,11 +8042,12 @@ SK_U32		PhysPortIndex)
 		
 		/* Check VCT test status. */
 		RetCode = SkGmCableDiagStatus(pAC,IoC, PhysPortIndex, SK_FALSE);
+		
 		if (RetCode == 2) { /* VCT test is running. */
 			pVctData->VctStatus |= SK_PNMI_VCT_RUNNING;
 		}
 		else { /* VCT data was copied to pAC here. Check PENDING state. */
-			if (pAC->Pnmi.VctStatus[PhysPortIndex] & SK_PNMI_VCT_PENDING) {
+			if (VctStatus & SK_PNMI_VCT_PENDING) {
 				pVctData->VctStatus |= SK_PNMI_VCT_NEW_VCT_DATA;
 			}
 		}
@@ -8259,16 +8057,14 @@ SK_U32		PhysPortIndex)
 		}
 	}
 	else {
-		
 		/* Was a VCT test ever made before? */
-		if (pAC->Pnmi.VctStatus[PhysPortIndex] & SK_PNMI_VCT_TEST_DONE) {
+		if (VctStatus & SK_PNMI_VCT_TEST_DONE) {
 			pVctData->VctStatus &= ~SK_PNMI_VCT_NEW_VCT_DATA;
 			pVctData->VctStatus |= SK_PNMI_VCT_OLD_VCT_DATA;
 		}
 		
 		/* DSP only valid in 100/1000 modes. */
-		if (pAC->GIni.GP[PhysPortIndex].PLinkSpeedUsed !=
-			SK_LSPEED_STAT_10MBPS) {	
+		if (pPrt->PLinkSpeedUsed != SK_LSPEED_STAT_10MBPS) {
 			pVctData->VctStatus |= SK_PNMI_VCT_NEW_DSP_DATA;
 		}
 	}
@@ -8314,29 +8110,29 @@ int 	HeaderLength;	/* Length of desired 
 	ReturnCode = SK_PNMI_ERR_GENERAL;
 	
 	SK_MEMCPY(&Mode, pBuf, sizeof(SK_I32));
-	SK_MEMCPY(&Oid, (char *) pBuf + sizeof(SK_I32), sizeof(SK_U32));
+	SK_MEMCPY(&Oid, (char *)pBuf + sizeof(SK_I32), sizeof(SK_U32));
 	HeaderLength = sizeof(SK_I32) + sizeof(SK_U32);
 	*pLen = *pLen - HeaderLength;
-	SK_MEMCPY((char *) pBuf + sizeof(SK_I32), (char *) pBuf + HeaderLength, *pLen);
+	SK_MEMCPY((char *)pBuf + sizeof(SK_I32), (char *)pBuf + HeaderLength, *pLen);
 	
 	switch(Mode) {
 	case SK_GET_SINGLE_VAR:
-		ReturnCode = SkPnmiGetVar(pAC, IoC, Oid, 
-				(char *) pBuf + sizeof(SK_I32), pLen,
+		ReturnCode = SkPnmiGetVar(pAC, IoC, Oid,
+				(char *)pBuf + sizeof(SK_I32), pLen,
 				((SK_U32) (-1)), NetIndex);
 		SK_PNMI_STORE_U32(pBuf, ReturnCode);
 		*pLen = *pLen + sizeof(SK_I32);
 		break;
 	case SK_PRESET_SINGLE_VAR:
-		ReturnCode = SkPnmiPreSetVar(pAC, IoC, Oid, 
-				(char *) pBuf + sizeof(SK_I32), pLen,
+		ReturnCode = SkPnmiPreSetVar(pAC, IoC, Oid,
+				(char *)pBuf + sizeof(SK_I32), pLen,
 				((SK_U32) (-1)), NetIndex);
 		SK_PNMI_STORE_U32(pBuf, ReturnCode);
 		*pLen = *pLen + sizeof(SK_I32);
 		break;
 	case SK_SET_SINGLE_VAR:
-		ReturnCode = SkPnmiSetVar(pAC, IoC, Oid, 
-				(char *) pBuf + sizeof(SK_I32), pLen,
+		ReturnCode = SkPnmiSetVar(pAC, IoC, Oid,
+				(char *)pBuf + sizeof(SK_I32), pLen,
 				((SK_U32) (-1)), NetIndex);
 		SK_PNMI_STORE_U32(pBuf, ReturnCode);
 		*pLen = *pLen + sizeof(SK_I32);
@@ -8357,3 +8153,86 @@ int 	HeaderLength;	/* Length of desired 
 	return (ReturnCode);
 
 } /* SkGeIocGen */
+
+#ifdef SK_ASF
+/*****************************************************************************
+ *
+ * Asf
+ *
+ * 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 Asf(
+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);
+    }
+
+    /* Perform action. */
+    /* GET value. */
+    if (Action == SK_PNMI_GET) {
+        switch (Id) {
+            case OID_SKGE_ASF:  
+                RetCode = SkAsfGet(pAC, IoC, (SK_U8 *) pBuf, pLen);
+                break;
+            default:
+                RetCode = SkAsfGetOid( pAC, IoC, Id, Instance, (SK_U8 *) pBuf, pLen );
+                break;
+        }
+
+        return (RetCode); 
+    }
+
+    /* PRESET value. */
+    if (Action == SK_PNMI_PRESET) { 
+        switch (Id) {
+            case OID_SKGE_ASF:
+                RetCode = SkAsfPreSet(pAC, IoC, (SK_U8 *) pBuf, pLen);
+                break;
+            default:
+                RetCode = SkAsfPreSetOid( pAC, IoC, Id, Instance, (SK_U8 *) pBuf, pLen );
+                break;
+        }
+    }
+
+    /* SET value. */
+    if (Action == SK_PNMI_SET) {
+        switch (Id) {
+            case OID_SKGE_ASF:
+                RetCode = SkAsfSet(pAC, IoC, (SK_U8 *) pBuf, pLen);
+                break;
+            default:
+                RetCode = SkAsfSetOid( pAC, IoC, Id, Instance, (SK_U8 *) pBuf, pLen );
+                break;
+        }
+    }
+    return (RetCode);
+}
+#endif /* SK_ASF */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/skgesirq.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/skgesirq.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/skgesirq.c	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/skgesirq.c	2004-09-09 13:20:48.000000000 +0200
@@ -2,8 +2,8 @@
  *
  * Name:	skgesirq.c
  * Project:	Gigabit Ethernet Adapters, Common Modules
- * Version:	$Revision: 1.93 $
- * Date:	$Date: 2003/12/23 14:44:24 $
+ * Version:	$Revision: 2.17 $
+ * Date:	$Date: 2004/07/02 15:24:06 $
  * Purpose:	Special IRQ module
  *
  ******************************************************************************/
@@ -11,13 +11,12 @@
 /******************************************************************************
  *
  *	(C)Copyright 1998-2002 SysKonnect.
- *	(C)Copyright 2002-2003 Marvell.
+ *	(C)Copyright 2002-2004 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
  *	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.
  *
  ******************************************************************************/
@@ -38,7 +37,7 @@
  *	right after this ISR.
  *
  *	The Interrupt source register of the adapter is NOT read by this module.
- *  SO if the drivers implementor needs a while loop around the
+ *	SO if the drivers implementor needs a while loop around the
  *	slow data paths interrupt bits, he needs to call the SkGeSirqIsr() for
  *	each loop entered.
  *
@@ -57,7 +56,7 @@
 
 #if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
 static const char SysKonnectFileId[] =
-	"@(#) $Id: skgesirq.c,v 1.93 2003/12/23 14:44:24 rschmidt Exp $ (C) Marvell.";
+	"@(#) $Id: skgesirq.c,v 2.17 2004/07/02 15:24:06 rschmidt Exp $ (C) Marvell.";
 #endif
 
 /* local function prototypes */
@@ -111,7 +110,7 @@ intro()
  * Returns: N/A
  */
 static void SkHWInitDefSense(
-SK_AC	*pAC,	/* adapter context */
+SK_AC	*pAC,	/* Adapter Context */
 SK_IOC	IoC,	/* I/O context */
 int		Port)	/* Port Index (MAC_1 + n) */
 {
@@ -147,7 +146,7 @@ int		Port)	/* Port Index (MAC_1 + n) */
  *
  */
 static SK_U8 SkHWSenseGetNext(
-SK_AC	*pAC,	/* adapter context */
+SK_AC	*pAC,	/* Adapter Context */
 SK_IOC	IoC,	/* I/O context */
 int		Port)	/* Port Index (MAC_1 + n) */
 {
@@ -157,18 +156,18 @@ int		Port)	/* Port Index (MAC_1 + n) */
 
 	pPrt->PAutoNegTimeOut = 0;
 
-    if (pPrt->PLinkModeConf != (SK_U8)SK_LMODE_AUTOSENSE) {
+	if (pPrt->PLinkModeConf != (SK_U8)SK_LMODE_AUTOSENSE) {
 		/* Leave all as configured */
 		return(pPrt->PLinkModeConf);
 	}
 
-    if (pPrt->PLinkMode == (SK_U8)SK_LMODE_AUTOFULL) {
+	if (pPrt->PLinkMode == (SK_U8)SK_LMODE_AUTOFULL) {
 		/* Return next mode AUTOBOTH */
-        return((SK_U8)SK_LMODE_AUTOBOTH);
+		return((SK_U8)SK_LMODE_AUTOBOTH);
 	}
 
 	/* Return default autofull */
-    return((SK_U8)SK_LMODE_AUTOFULL);
+	return((SK_U8)SK_LMODE_AUTOFULL);
 }	/* SkHWSenseGetNext */
 
 
@@ -181,7 +180,7 @@ int		Port)	/* Port Index (MAC_1 + n) */
  * Returns: N/A
  */
 static void SkHWSenseSetNext(
-SK_AC	*pAC,		/* adapter context */
+SK_AC	*pAC,		/* Adapter Context */
 SK_IOC	IoC,		/* I/O context */
 int		Port,		/* Port Index (MAC_1 + n) */
 SK_U8	NewMode)	/* New Mode to be written in sense mode */
@@ -192,7 +191,7 @@ SK_U8	NewMode)	/* New Mode to be written
 
 	pPrt->PAutoNegTimeOut = 0;
 
-    if (pPrt->PLinkModeConf != (SK_U8)SK_LMODE_AUTOSENSE) {
+	if (pPrt->PLinkModeConf != (SK_U8)SK_LMODE_AUTOSENSE) {
 		return;
 	}
 
@@ -216,7 +215,7 @@ SK_U8	NewMode)	/* New Mode to be written
  * Returns: N/A
  */
 void SkHWLinkDown(
-SK_AC	*pAC,		/* adapter context */
+SK_AC	*pAC,		/* Adapter Context */
 SK_IOC	IoC,		/* I/O context */
 int		Port)		/* Port Index (MAC_1 + n) */
 {
@@ -229,7 +228,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
 
 	/* Disable Receiver and Transmitter */
 	SkMacRxTxDisable(pAC, IoC, Port);
-	
+
 	/* Init default sense mode */
 	SkHWInitDefSense(pAC, IoC, Port);
 
@@ -244,8 +243,8 @@ int		Port)		/* Port Index (MAC_1 + n) */
 	pPrt->PHWLinkUp = SK_FALSE;
 
 	/* Reset Port stati */
-    pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_UNKNOWN;
-    pPrt->PFlowCtrlStatus = (SK_U8)SK_FLOW_STAT_NONE;
+	pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_UNKNOWN;
+	pPrt->PFlowCtrlStatus = (SK_U8)SK_FLOW_STAT_NONE;
 	pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_INDETERMINATED;
 
 	/* Re-init Phy especially when the AutoSense default is set now */
@@ -268,7 +267,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
  * Returns: N/A
  */
 void SkHWLinkUp(
-SK_AC	*pAC,	/* adapter context */
+SK_AC	*pAC,	/* Adapter Context */
 SK_IOC	IoC,	/* I/O context */
 int		Port)	/* Port Index (MAC_1 + n) */
 {
@@ -283,11 +282,11 @@ int		Port)	/* Port Index (MAC_1 + n) */
 
 	pPrt->PHWLinkUp = SK_TRUE;
 	pPrt->PAutoNegFail = SK_FALSE;
-    pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_UNKNOWN;
+	pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_UNKNOWN;
 
-    if (pPrt->PLinkMode != (SK_U8)SK_LMODE_AUTOHALF &&
-        pPrt->PLinkMode != (SK_U8)SK_LMODE_AUTOFULL &&
-        pPrt->PLinkMode != (SK_U8)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 */
 
 		/* Link speed should be the configured one */
@@ -310,14 +309,14 @@ int		Port)	/* Port Index (MAC_1 + n) */
 			pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_FULL;
 		}
 		else {
-            pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_HALF;
+			pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_HALF;
 		}
 
 		/* No flow control without auto-negotiation */
-        pPrt->PFlowCtrlStatus = (SK_U8)SK_FLOW_STAT_NONE;
+		pPrt->PFlowCtrlStatus = (SK_U8)SK_FLOW_STAT_NONE;
 
 		/* enable Rx/Tx */
-        (void)SkMacRxTxEnable(pAC, IoC, Port);
+		(void)SkMacRxTxEnable(pAC, IoC, Port);
 	}
 }	/* SkHWLinkUp */
 
@@ -331,14 +330,16 @@ int		Port)	/* Port Index (MAC_1 + n) */
  * Returns: N/A
  */
 static void SkMacParity(
-SK_AC	*pAC,	/* adapter context */
+SK_AC	*pAC,	/* Adapter Context */
 SK_IOC	IoC,	/* I/O context */
-int		Port)	/* Port Index of the port failed */
+int		Port)	/* Port Index (MAC_1 + n) */
 {
 	SK_EVPARA	Para;
 	SK_GEPORT	*pPrt;		/* GIni Port struct pointer */
 	SK_U32		TxMax;		/* Tx Max Size Counter */
 
+	TxMax = 0;
+
 	pPrt = &pAC->GIni.GP[Port];
 
 	/* Clear IRQ Tx Parity Error */
@@ -357,7 +358,7 @@ int		Port)	/* Port Index of the port fai
 			pAC->GIni.GIChipRev == 0) ? GMF_CLI_TX_FC : GMF_CLI_TX_PE));
 	}
 #endif /* YUKON */
-	
+
 	if (pPrt->PCheckPar) {
 
 		if (Port == MAC_1) {
@@ -368,7 +369,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);
 
@@ -380,7 +381,7 @@ int		Port)	/* Port Index of the port fai
 	if (pAC->GIni.GIGenesis) {
 		/* Snap statistic counters */
 		(void)SkXmUpdateStats(pAC, IoC, Port);
-		
+
 		(void)SkXmMacStatistic(pAC, IoC, Port, XM_TXF_MAX_SZ, &TxMax);
 	}
 #endif /* GENESIS */
@@ -401,14 +402,14 @@ int		Port)	/* Port Index of the port fai
 
 /******************************************************************************
  *
- *	SkGeHwErr() - Hardware Error service routine
+ *	SkGeYuHwErr() - Hardware Error service routine (Genesis and Yukon)
  *
  * Description: handles all HW Error interrupts
  *
  * Returns: N/A
  */
-static void SkGeHwErr(
-SK_AC	*pAC,		/* adapter context */
+static void SkGeYuHwErr(
+SK_AC	*pAC,		/* Adapter Context */
 SK_IOC	IoC,		/* I/O context */
 SK_U32	HwStatus)	/* Interrupt status word */
 {
@@ -425,10 +426,10 @@ SK_U32	HwStatus)	/* Interrupt status wor
 		}
 
 		/* Reset all bits in the PCI STATUS register */
-		SK_IN16(IoC, PCI_C(PCI_STATUS), &Word);
-		
+		SK_IN16(IoC, PCI_C(pAC, PCI_STATUS), &Word);
+
 		SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_ON);
-        SK_OUT16(IoC, PCI_C(PCI_STATUS), (SK_U16)(Word | PCI_ERRBITS));
+		SK_OUT16(IoC, PCI_C(pAC, PCI_STATUS), (SK_U16)(Word | PCI_ERRBITS));
 		SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
 
 		Para.Para64 = 0;
@@ -486,14 +487,18 @@ SK_U32	HwStatus)	/* Interrupt status wor
 #endif /* YUKON */
 
 	if ((HwStatus & IS_RAM_RD_PAR) != 0) {
+
 		SK_OUT16(IoC, B3_RI_CTRL, RI_CLR_RD_PERR);
+
 		SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E014, SKERR_SIRQ_E014MSG);
 		Para.Para64 = 0;
 		SkEventQueue(pAC, SKGE_DRV, SK_DRV_ADAP_FAIL, Para);
 	}
 
 	if ((HwStatus & IS_RAM_WR_PAR) != 0) {
+
 		SK_OUT16(IoC, B3_RI_CTRL, RI_CLR_WR_PERR);
+
 		SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E015, SKERR_SIRQ_E015MSG);
 		Para.Para64 = 0;
 		SkEventQueue(pAC, SKGE_DRV, SK_DRV_ADAP_FAIL, Para);
@@ -514,7 +519,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);
 	}
@@ -526,26 +531,246 @@ 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);
 	}
-}	/* SkGeHwErr */
+}	/* SkGeYuHwErr */
 
+#ifdef YUK2
+/******************************************************************************
+ *
+ *	SkYuk2HwPortErr() - Service HW Errors for specified port (Yukon-2 only)
+ *
+ * Description: handles the HW Error interrupts for a specific port.
+ *
+ * Returns: N/A
+ */
+static void SkYuk2HwPortErr(
+SK_AC	*pAC,		/* Adapter Context */
+SK_IOC	IoC,		/* I/O Context */
+SK_U32	HwStatus,	/* Interrupt status word */
+int		Port)		/* Port Index (MAC_1 + n) */
+{
+	int Queue;
+	SK_EVPARA	Para;
+
+	if (Port == MAC_2) {
+		HwStatus >>= 8;
+	}
+
+	if ((HwStatus & Y2_HWE_L1_MASK) == 0) {
+		return;
+	}
+
+	if ((HwStatus & Y2_IS_PAR_RD1) != 0) {
+		/* Clear IRQ */
+		SK_OUT16(IoC, SELECT_RAM_BUFFER(Port, B3_RI_CTRL), RI_CLR_RD_PERR);
+
+		if (Port == MAC_1) {
+			SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E028, SKERR_SIRQ_E028MSG);
+		}
+		else {
+			SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E030, SKERR_SIRQ_E030MSG);
+		}
+	}
+
+	if ((HwStatus & Y2_IS_PAR_WR1) != 0) {
+		/* Clear IRQ */
+		SK_OUT16(IoC, SELECT_RAM_BUFFER(Port, B3_RI_CTRL), RI_CLR_WR_PERR);
+
+		if (Port == MAC_1) {
+			SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E029, SKERR_SIRQ_E029MSG);
+		}
+		else {
+			SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E031, SKERR_SIRQ_E031MSG);
+		}
+	}
+
+	if ((HwStatus & Y2_IS_PAR_MAC1) != 0) {
+		/* Clear IRQ */
+		SK_OUT8(IoC, MR_ADDR(Port, TX_GMF_CTRL_T), GMF_CLI_TX_PE);
+
+		if (Port == MAC_1) {
+			SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E016, SKERR_SIRQ_E016MSG);
+		}
+		else {
+			SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E017, SKERR_SIRQ_E017MSG);
+		}
+	}
+
+	if ((HwStatus & Y2_IS_PAR_RX1) != 0) {
+		if (Port == MAC_1) {
+			Queue = Q_R1;
+			SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E018, SKERR_SIRQ_E018MSG);
+		}
+		else {
+			Queue = Q_R2;
+			SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E019, SKERR_SIRQ_E019MSG);
+		}
+		/* Clear IRQ */
+		SK_OUT32(IoC, Q_ADDR(Queue, Q_CSR), BMU_CLR_IRQ_PAR);
+	}
+
+	if ((HwStatus & Y2_IS_TCP_TXS1) != 0) {
+		if (Port == MAC_1) {
+			Queue = Q_XS1;
+			SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E033, SKERR_SIRQ_E033MSG);
+		}
+		else {
+			Queue = Q_XS2;
+			SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E035, SKERR_SIRQ_E035MSG);
+		}
+		/* Clear IRQ */
+		SK_OUT32(IoC, Q_ADDR(Queue, Q_CSR), BMU_CLR_IRQ_TCP);
+	}
+
+	if ((HwStatus & Y2_IS_TCP_TXA1) != 0) {
+		if (Port == MAC_1) {
+			Queue = Q_XA1;
+			SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E032, SKERR_SIRQ_E032MSG);
+		}
+		else {
+			Queue = Q_XA2;
+			SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E034, SKERR_SIRQ_E034MSG);
+		}
+		/* Clear IRQ */
+		SK_OUT32(IoC, Q_ADDR(Queue, Q_CSR), BMU_CLR_IRQ_TCP);
+	}
+
+	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);
+
+}	/* SkYuk2HwPortErr */
 
 /******************************************************************************
  *
- *	SkGeSirqIsr() - Special Interrupt Service Routine
+ *	SkYuk2HwErr() - Hardware Error service routine (Yukon-2 only)
  *
- * Description: handles all non data transfer specific interrupts (slow path)
+ * Description: handles all HW Error interrupts
+ *
+ * Returns: N/A
+ */
+static void SkYuk2HwErr(
+SK_AC	*pAC,		/* Adapter Context */
+SK_IOC	IoC,		/* I/O Context */
+SK_U32	HwStatus)	/* Interrupt status word */
+{
+	SK_EVPARA	Para;
+	SK_U16		Word;
+	SK_U32		DWord;
+	int			i;
+
+	/* This is necessary only for Rx timing measurements */
+	if ((HwStatus & Y2_IS_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);
+	}
+
+	/* Evaluate Y2_IS_PCI_NEXP before Y2_IS_MST_ERR or Y2_IS_IRQ_STAT */
+	if ((HwStatus & Y2_IS_PCI_NEXP) != 0) {
+		/* PCI-Express Error occured which is not described in PEX spec. */
+		/*
+		 * This error is also mapped either to Master Abort (Y2_IS_MST_ERR)
+		 * or Target Abort (Y2_IS_IRQ_STAT) bit and can only be cleared there.
+		 * Therefore handle this event just by printing an error log entry.
+		 */
+		SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E027, SKERR_SIRQ_E027MSG);
+	}
+
+	if ((HwStatus & (Y2_IS_MST_ERR | Y2_IS_IRQ_STAT)) != 0) {
+		/* PCI Errors occured */
+		if ((HwStatus & Y2_IS_IRQ_STAT) != 0) {
+			SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E013, SKERR_SIRQ_E013MSG);
+		}
+		else {
+			SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E012, SKERR_SIRQ_E012MSG);
+		}
+
+		/* Reset all bits in the PCI STATUS register */
+		SK_IN16(IoC, PCI_C(pAC,PCI_STATUS), &Word);
+
+		SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_ON);
+		SK_OUT16(IoC, PCI_C(pAC,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);
+	}
+
+	if ((HwStatus & Y2_IS_PCI_EXP) != 0) {
+		/* PCI-Express uncorrectable Error occured */
+		/*
+		 * On PCI-Express bus bridges are called root complexes.
+		 * PCI-Express errors are recognized by the root complex too,
+		 * which requests the system to handle the problem. After error
+		 * occurence it may be that no access to the adapter may be performed
+		 * any longer.
+		 */
+		SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E026, SKERR_SIRQ_E026MSG);
+
+		/* Save uncorrectable error status */
+		SK_IN32(IoC, PCI_C(pAC, PEX_UNC_ERR_STAT), &DWord);
+
+		/* clear the interrupt */
+		SK_OUT32(IoC, B2_TST_CTRL1, TST_CFG_WRITE_ON);
+		SK_OUT32(IoC, PCI_C(pAC, PEX_UNC_ERR_STAT), 0xffffffffUL);
+		SK_OUT32(IoC, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
+
+		if ((DWord & PEX_FATAL_ERRORS) != 0) {
+			/* Stop only, if the uncorrectable error is fatal */	
+			Para.Para64 = 0;
+			SkEventQueue(pAC, SKGE_DRV, SK_DRV_ADAP_FAIL, Para);
+
+			pAC->GIni.GIValHwIrqMask &= ~Y2_IS_PCI_EXP;
+			/* Rewrite HW IRQ mask */
+			SK_OUT32(IoC, B0_HWE_IMSK, pAC->GIni.GIValHwIrqMask);
+		}
+	}
+
+	for (i = 0; i < pAC->GIni.GIMacsFound; i++) {
+
+		SkYuk2HwPortErr(pAC, IoC, HwStatus, i);
+	}
+
+}	/* SkYuk2HwErr */
+#endif /* YUK2 */
+
+/******************************************************************************
+ *
+ *	SkGeSirqIsr() - Wrapper for Special Interrupt Service Routine
+ *
+ * Description: calls the preselected special ISR (slow path)
  *
  * Returns: N/A
  */
 void SkGeSirqIsr(
-SK_AC	*pAC,		/* adapter context */
+SK_AC	*pAC,		/* Adapter Context */
 SK_IOC	IoC,		/* I/O context */
 SK_U32	Istatus)	/* Interrupt status word */
 {
+	pAC->GIni.GIFunc.pSkGeSirqIsr(pAC, IoC, Istatus);
+}
+
+/******************************************************************************
+ *
+ *	SkGeYuSirqIsr() - Special Interrupt Service Routine
+ *
+ * Description: handles all non data transfer specific interrupts (slow path)
+ *
+ * Returns: N/A
+ */
+void SkGeYuSirqIsr(
+SK_AC	*pAC,		/* Adapter Context */
+SK_IOC	IoC,		/* I/O Context */
+SK_U32	Istatus)	/* Interrupt status word */
+{
 	SK_EVPARA	Para;
 	SK_U32		RegVal32;	/* Read register value */
 	SK_GEPORT	*pPrt;		/* GIni Port struct pointer */
@@ -555,8 +780,8 @@ SK_U32	Istatus)	/* Interrupt status word
 	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);
+
+		SkGeYuHwErr(pAC, IoC, RegVal32);
 	}
 
 	/*
@@ -571,7 +796,7 @@ SK_U32	Istatus)	/* Interrupt status word
 	}
 
 	if (((Istatus & (IS_PA_TO_RX2 | IS_PA_TO_TX2)) != 0) &&
-	    pAC->GIni.GP[MAC_2].PState == SK_PRT_RESET) {
+		pAC->GIni.GP[MAC_2].PState == SK_PRT_RESET) {
 		/* MAC 2 was not initialized but Packet timeout occured */
 		SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_SIRQ_E005,
 			SKERR_SIRQ_E005MSG);
@@ -592,7 +817,7 @@ SK_U32	Istatus)	/* Interrupt status word
 	}
 
 	if ((Istatus & IS_PA_TO_TX1) != 0) {
-		
+
 		pPrt = &pAC->GIni.GP[0];
 
 		/* May be a normal situation in a server with a slow network */
@@ -619,7 +844,7 @@ SK_U32	Istatus)	/* Interrupt status word
 				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 */
@@ -628,11 +853,11 @@ SK_U32	Istatus)	/* Interrupt status word
 				(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);
@@ -642,7 +867,7 @@ SK_U32	Istatus)	/* Interrupt status word
 	}
 
 	if ((Istatus & IS_PA_TO_TX2) != 0) {
-		
+
 		pPrt = &pAC->GIni.GP[1];
 
 		/* May be a normal situation in a server with a slow network */
@@ -660,7 +885,7 @@ SK_U32	Istatus)	/* Interrupt status word
 				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 */
@@ -669,11 +894,11 @@ SK_U32	Istatus)	/* Interrupt status word
 				(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);
@@ -686,6 +911,7 @@ SK_U32	Istatus)	/* Interrupt status word
 	if ((Istatus & IS_R1_C) != 0) {
 		/* Clear IRQ */
 		SK_OUT32(IoC, B0_R1_CSR, CSR_IRQ_CL_C);
+
 		SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_SIRQ_E006,
 			SKERR_SIRQ_E006MSG);
 		Para.Para64 = MAC_1;
@@ -697,6 +923,7 @@ SK_U32	Istatus)	/* Interrupt status word
 	if ((Istatus & IS_R2_C) != 0) {
 		/* Clear IRQ */
 		SK_OUT32(IoC, B0_R2_CSR, CSR_IRQ_CL_C);
+
 		SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_SIRQ_E007,
 			SKERR_SIRQ_E007MSG);
 		Para.Para64 = MAC_2;
@@ -708,6 +935,7 @@ SK_U32	Istatus)	/* Interrupt status word
 	if ((Istatus & IS_XS1_C) != 0) {
 		/* Clear IRQ */
 		SK_OUT32(IoC, B0_XS1_CSR, CSR_IRQ_CL_C);
+
 		SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_SIRQ_E008,
 			SKERR_SIRQ_E008MSG);
 		Para.Para64 = MAC_1;
@@ -719,6 +947,7 @@ SK_U32	Istatus)	/* Interrupt status word
 	if ((Istatus & IS_XA1_C) != 0) {
 		/* Clear IRQ */
 		SK_OUT32(IoC, B0_XA1_CSR, CSR_IRQ_CL_C);
+
 		SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_SIRQ_E009,
 			SKERR_SIRQ_E009MSG);
 		Para.Para64 = MAC_1;
@@ -730,6 +959,7 @@ SK_U32	Istatus)	/* Interrupt status word
 	if ((Istatus & IS_XS2_C) != 0) {
 		/* Clear IRQ */
 		SK_OUT32(IoC, B0_XS2_CSR, CSR_IRQ_CL_C);
+
 		SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_SIRQ_E010,
 			SKERR_SIRQ_E010MSG);
 		Para.Para64 = MAC_2;
@@ -741,6 +971,7 @@ SK_U32	Istatus)	/* Interrupt status word
 	if ((Istatus & IS_XA2_C) != 0) {
 		/* Clear IRQ */
 		SK_OUT32(IoC, B0_XA2_CSR, CSR_IRQ_CL_C);
+
 		SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_SIRQ_E011,
 			SKERR_SIRQ_E011MSG);
 		Para.Para64 = MAC_2;
@@ -753,39 +984,37 @@ SK_U32	Istatus)	/* Interrupt status word
 	if ((Istatus & IS_EXT_REG) != 0) {
 		/* Test IRQs from PHY */
 		for (i = 0; i < pAC->GIni.GIMacsFound; i++) {
-			
+
 			pPrt = &pAC->GIni.GP[i];
-			
+
 			if (pPrt->PState == SK_PRT_RESET) {
 				continue;
 			}
-			
+
 #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));
+							("Port %d PHY 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));
+							("Port %d PHY Int: 0x%04X\n", i, PhyInt));
 						SkPhyIsrLone(pAC, IoC, i, PhyInt);
 					}
 					break;
@@ -801,8 +1030,7 @@ SK_U32	Istatus)	/* Interrupt status word
 
 				if ((PhyInt & PHY_M_DEF_MSK) != 0) {
 					SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
-						("Port %d Marv Int: 0x%04X\n",
-						i, PhyInt));
+						("Port %d PHY Int: 0x%04X\n", i, PhyInt));
 					SkPhyIsrGmac(pAC, IoC, i, PhyInt);
 				}
 			}
@@ -810,13 +1038,13 @@ SK_U32	Istatus)	/* Interrupt status word
 		}
 	}
 
-	/* I2C Ready interrupt */
+	/* TWSI Ready interrupt */
 	if ((Istatus & IS_I2C_READY) != 0) {
 #ifdef SK_SLIM
-        SK_OUT32(IoC, B2_I2C_IRQ, I2C_CLR_IRQ);
-#else		
+		SK_OUT32(IoC, B2_I2C_IRQ, I2C_CLR_IRQ);
+#else
 		SkI2cIsr(pAC, IoC);
-#endif		
+#endif
 	}
 
 	/* SW forced interrupt */
@@ -862,13 +1090,189 @@ SK_U32	Istatus)	/* Interrupt status word
 			/* read the HW Error Interrupt source */
 			SK_IN32(IoC, B0_HWE_ISRC, &RegVal32);
 
-			SkGeHwErr(pAC, IoC, RegVal32);
+			SkGeYuHwErr(pAC, IoC, RegVal32);
 		}
 
 		SkHwtIsr(pAC, IoC);
 	}
 
-}	/* SkGeSirqIsr */
+}	/* SkGeYuSirqIsr */
+
+#ifdef YUK2
+/******************************************************************************
+ *
+ *	SkYuk2PortSirq() - Service HW Errors for specified port (Yukon-2 only)
+ *
+ * Description: handles the HW Error interrupts for a specific port.
+ *
+ * Returns: N/A
+ */
+static void SkYuk2PortSirq(
+SK_AC	*pAC,		/* Adapter Context */
+SK_IOC	IoC,		/* I/O Context */
+SK_U32	IStatus,	/* Interrupt status word */
+int		Port)		/* Port Index (MAC_1 + n) */
+{
+	SK_EVPARA	Para;
+	int Queue;
+	SK_U16	PhyInt;
+
+	if (Port == MAC_2) {
+		IStatus >>= 8;
+	}
+
+	/* Interrupt from PHY */
+	if ((IStatus & Y2_IS_IRQ_PHY1) != 0) {
+		/* Read PHY Interrupt Status */
+		SkGmPhyRead(pAC, IoC, Port, PHY_MARV_INT_STAT, &PhyInt);
+
+		if ((PhyInt & PHY_M_DEF_MSK) != 0) {
+			SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
+				("Port %d PHY Int: 0x%04X\n", Port, PhyInt));
+			SkPhyIsrGmac(pAC, IoC, Port, PhyInt);
+		}
+	}
+
+	/* Interrupt from MAC */
+	if ((IStatus & Y2_IS_IRQ_MAC1) != 0) {
+		SkMacIrq(pAC, IoC, Port);
+	}
+
+	if ((IStatus & (Y2_IS_CHK_RX1 | Y2_IS_CHK_TXS1 | Y2_IS_CHK_TXA1)) != 0) {
+		if ((IStatus & Y2_IS_CHK_RX1) != 0) {
+			if (Port == MAC_1) {
+				Queue = Q_R1;
+				SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E006,
+					SKERR_SIRQ_E006MSG);
+			}
+			else {
+				Queue = Q_R2;
+				SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E007,
+					SKERR_SIRQ_E007MSG);
+			}
+			/* Clear IRQ */
+			SK_OUT32(IoC, Q_ADDR(Queue, Q_CSR), BMU_CLR_IRQ_CHK);
+		}
+
+		if ((IStatus & Y2_IS_CHK_TXS1) != 0) {
+			if (Port == MAC_1) {
+				Queue = Q_XS1;
+				SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E008,
+					SKERR_SIRQ_E008MSG);
+			}
+			else {
+				Queue = Q_XS2;
+				SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E010,
+					SKERR_SIRQ_E010MSG);
+			}
+			/* Clear IRQ */
+			SK_OUT32(IoC, Q_ADDR(Queue, Q_CSR), BMU_CLR_IRQ_CHK);
+		}
+
+		if ((IStatus & Y2_IS_CHK_TXA1) != 0) {
+			if (Port == MAC_1) {
+				Queue = Q_XA1;
+				SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E009,
+					SKERR_SIRQ_E009MSG);
+			}
+			else {
+				Queue = Q_XA2;
+				SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E011,
+					SKERR_SIRQ_E011MSG);
+			}
+			/* Clear IRQ */
+			SK_OUT32(IoC, Q_ADDR(Queue, Q_CSR), BMU_CLR_IRQ_CHK);
+		}
+
+		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);
+	}
+}	/* SkYuk2PortSirq */
+#endif /* YUK2 */
+
+/******************************************************************************
+ *
+ *	SkYuk2SirqIsr() - Special Interrupt Service Routine	(Yukon-2 only)
+ *
+ * Description: handles all non data transfer specific interrupts (slow path)
+ *
+ * Returns: N/A
+ */
+void SkYuk2SirqIsr(
+SK_AC	*pAC,		/* Adapter Context */
+SK_IOC	IoC,		/* I/O Context */
+SK_U32	Istatus)	/* Interrupt status word */
+{
+#ifdef YUK2
+	SK_EVPARA	Para;
+	SK_U32		RegVal32;	/* Read register value */
+	SK_U32		DwValue;
+
+	/* HW Error indicated ? */
+	if (((Istatus & Y2_IS_HW_ERR) & pAC->GIni.GIValIrqMask) != 0) {
+		/* read the HW Error Interrupt source */
+		SK_IN32(IoC, B0_HWE_ISRC, &RegVal32);
+
+		SkYuk2HwErr(pAC, IoC, RegVal32);
+	}
+
+	/* Interrupt from ASF Subsystem */
+	if ((Istatus & Y2_IS_ASF) != 0) {
+		/* clear IRQ */
+		/* later on clearing should be done in ASF ISR handler */
+		SK_IN32(IoC, B28_Y2_ASF_STAT_CMD, &DwValue);
+		DwValue |= Y2_ASF_CLR_HSTI;
+		SK_OUT32(IoC, B28_Y2_ASF_STAT_CMD, DwValue);
+		/* Call IRQ handler in ASF Module */
+		/* TBD */
+	}
+
+	/* Check IRQ from polling unit */
+	if ((Istatus & Y2_IS_POLL_CHK) != 0) {
+		/* Clear IRQ */
+		SK_OUT32(IoC, POLL_CTRL, PC_CLR_IRQ_CHK);
+
+		SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_SIRQ_E036,
+			SKERR_SIRQ_E036MSG);
+		Para.Para64 = 0;
+		SkEventQueue(pAC, SKGE_DRV, SK_DRV_ADAP_FAIL, Para);
+	}
+
+	/* TWSI Ready interrupt */
+	if ((Istatus & Y2_IS_TWSI_RDY) != 0) {
+#ifdef SK_SLIM
+		SK_OUT32(IoC, B2_I2C_IRQ, I2C_CLR_IRQ);
+#else
+		SkI2cIsr(pAC, IoC);
+#endif
+	}
+
+	/* SW forced interrupt */
+	if ((Istatus & Y2_IS_IRQ_SW) != 0) {
+		/* clear the software IRQ */
+		SK_OUT8(IoC, B0_CTST, CS_CL_SW_IRQ);
+	}
+
+	if ((Istatus & Y2_IS_L1_MASK) != 0) {
+		SkYuk2PortSirq(pAC, IoC, Istatus, MAC_1);
+	}
+
+	if ((Istatus & Y2_IS_L2_MASK) != 0) {
+		SkYuk2PortSirq(pAC, IoC, Istatus, MAC_2);
+	}
+
+	/* Timer interrupt (served last) */
+	if ((Istatus & Y2_IS_TIMINT) != 0) {
+		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
+			("Timer Int: 0x%08X\n", Istatus));
+		SkHwtIsr(pAC, IoC);
+	}
+#endif	/* YUK2 */
+
+}	/* SkYuk2SirqIsr */
 
 
 #ifdef GENESIS
@@ -883,7 +1287,7 @@ SK_U32	Istatus)	/* Interrupt status word
 static int SkGePortCheckShorts(
 SK_AC	*pAC,		/* Adapter Context */
 SK_IOC	IoC,		/* I/O Context */
-int		Port)		/* Which port should be checked */
+int		Port)		/* Port Index (MAC_1 + n) */
 {
 	SK_U32		Shorts;			/* Short Event Counter */
 	SK_U32		CheckShorts;	/* Check value for Short Event Counter */
@@ -911,9 +1315,9 @@ int		Port)		/* Which port should be chec
 	RxCts = 0;
 
 	for (i = 0; i < sizeof(SkGeRxRegs)/sizeof(SkGeRxRegs[0]); i++) {
-		
+
 		(void)SkXmMacStatistic(pAC, IoC, Port, SkGeRxRegs[i], &RxTmp);
-		
+
 		RxCts += (SK_U64)RxTmp;
 	}
 
@@ -930,10 +1334,10 @@ int		Port)		/* Which port should be chec
 		CheckShorts = 2;
 
 		(void)SkXmMacStatistic(pAC, IoC, Port, XM_RXF_FCS_ERR, &FcsErrCts);
-		
+
 		if (pPrt->PLinkModeConf == SK_LMODE_AUTOSENSE &&
-		    pPrt->PLipaAutoNeg == SK_LIPA_UNKNOWN &&
-		    (pPrt->PLinkMode == SK_LMODE_HALF ||
+			pPrt->PLipaAutoNeg == SK_LIPA_UNKNOWN &&
+			(pPrt->PLinkMode == SK_LMODE_HALF ||
 			 pPrt->PLinkMode == SK_LMODE_FULL)) {
 			/*
 			 * This is autosensing and we are in the fallback
@@ -943,7 +1347,7 @@ int		Port)		/* Which port should be chec
 				/* Nothing received, restart link */
 				pPrt->PPrevFcs = FcsErrCts;
 				pPrt->PPrevShorts = Shorts;
-				
+
 				return(SK_HW_PS_RESTART);
 			}
 			else {
@@ -952,7 +1356,7 @@ int		Port)		/* Which port should be chec
 		}
 
 		if (((RxCts - pPrt->PPrevRx) > pPrt->PRxLim) ||
-		    (!(FcsErrCts - pPrt->PPrevFcs))) {
+			(!(FcsErrCts - pPrt->PPrevFcs))) {
 			/*
 			 * Note: The compare with zero above has to be done the way shown,
 			 * otherwise the Linux driver will have a problem.
@@ -998,14 +1402,14 @@ int		Port)		/* Which port should be chec
 static int SkGePortCheckUp(
 SK_AC	*pAC,		/* Adapter Context */
 SK_IOC	IoC,		/* I/O Context */
-int		Port)		/* Which port should be checked */
+int		Port)		/* Port Index (MAC_1 + n) */
 {
 	SK_GEPORT	*pPrt;		/* GIni Port struct pointer */
 	SK_BOOL		AutoNeg;	/* Is Auto-negotiation used ? */
 	int			Rtv;		/* Return value */
 
 	Rtv = SK_HW_PS_NONE;
-	
+
 	pPrt = &pAC->GIni.GP[Port];
 
 	if (pPrt->PLinkMode == SK_LMODE_HALF || pPrt->PLinkMode == SK_LMODE_FULL) {
@@ -1019,7 +1423,7 @@ int		Port)		/* Which port should be chec
 	if (pAC->GIni.GIGenesis) {
 
 		switch (pPrt->PhyType) {
-		
+
 		case SK_PHY_XMAC:
 			Rtv = SkGePortCheckUpXmac(pAC, IoC, Port, AutoNeg);
 			break;
@@ -1040,7 +1444,7 @@ int		Port)		/* Which port should be chec
 	
 #ifdef YUKON
 	if (pAC->GIni.GIYukon) {
-		
+
 		Rtv = SkGePortCheckUpGmac(pAC, IoC, Port, AutoNeg);
 	}
 #endif /* YUKON */
@@ -1062,7 +1466,7 @@ int		Port)		/* Which port should be chec
 static int SkGePortCheckUpXmac(
 SK_AC	*pAC,		/* Adapter Context */
 SK_IOC	IoC,		/* I/O Context */
-int		Port,		/* Which port should be checked */
+int		Port,		/* Port Index (MAC_1 + n) */
 SK_BOOL	AutoNeg)	/* Is Auto-negotiation used ? */
 {
 	SK_U32		Shorts;		/* Short Event Counter */
@@ -1100,7 +1504,7 @@ SK_BOOL	AutoNeg)	/* Is Auto-negotiation 
 			XM_IN16(IoC, Port, XM_ISRC, &Isrc);
 			IsrcSum |= Isrc;
 			SkXmAutoNegLipaXmac(pAC, IoC, Port, IsrcSum);
-			
+
 			if ((Isrc & XM_IS_INP_ASS) == 0) {
 				/* It has been in sync since last time */
 				/* Restart the PORT */
@@ -1126,7 +1530,7 @@ SK_BOOL	AutoNeg)	/* Is Auto-negotiation 
 				 *  check whether the link is now o.k.
 				 */
 				pPrt->PLinkResCt++;
-				
+
 				pPrt->PAutoNegTimeOut = 0;
 
 				if (pPrt->PLinkResCt < SK_MAX_LRESTART) {
@@ -1134,13 +1538,13 @@ SK_BOOL	AutoNeg)	/* Is Auto-negotiation 
 				}
 
 				pPrt->PLinkResCt = 0;
-				
+
 				SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
 					("Do NOT restart on Port %d %x %x\n", Port, Isrc, IsrcSum));
 			}
 			else {
 				pPrt->PIsave = (SK_U16)(IsrcSum & XM_IS_AND);
-				
+
 				SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
 					("Save Sync/nosync Port %d %x %x\n", Port, Isrc, IsrcSum));
 
@@ -1180,7 +1584,7 @@ SK_BOOL	AutoNeg)	/* Is Auto-negotiation 
 		}
 		else {
 			SkXmAutoNegLipaXmac(pAC, IoC, Port, Isrc);
-			
+
 			if (SkGePortCheckShorts(pAC, IoC, Port) == SK_HW_PS_RESTART) {
 				return(SK_HW_PS_RESTART);
 			}
@@ -1222,7 +1626,7 @@ SK_BOOL	AutoNeg)	/* Is Auto-negotiation 
 				SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_ERR,
 					("AutoNeg FAIL Port %d (LpAb %x, ResAb %x)\n",
 					 Port, LpAb, ResAb));
-					
+
 				/* Try next possible mode */
 				NextMode = SkHWSenseGetNext(pAC, IoC, Port);
 				SkHWLinkDown(pAC, IoC, Port);
@@ -1238,10 +1642,10 @@ SK_BOOL	AutoNeg)	/* Is Auto-negotiation 
 			 * (clear Page Received bit if set)
 			 */
 			SkXmPhyRead(pAC, IoC, Port, PHY_XMAC_AUNE_EXP, &ExtStat);
-			
+
 			return(SK_HW_PS_LINK);
 		}
-		
+
 		/* AutoNeg not done, but HW link is up. Check for timeouts */
 		pPrt->PAutoNegTimeOut++;
 		if (pPrt->PAutoNegTimeOut >= SK_AND_MAX_TO) {
@@ -1292,7 +1696,7 @@ SK_BOOL	AutoNeg)	/* Is Auto-negotiation 
 		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
 			("Link sync(GP), Port %d\n", Port));
 		SkHWLinkUp(pAC, IoC, Port);
-		
+
 		/*
 		 * Link sync (GP) and so assume a good connection. But if not received
 		 * a bunch of frames received in a time slot (maybe broken tx cable)
@@ -1317,7 +1721,7 @@ SK_BOOL	AutoNeg)	/* Is Auto-negotiation 
 static int SkGePortCheckUpBcom(
 SK_AC	*pAC,		/* Adapter Context */
 SK_IOC	IoC,		/* I/O Context */
-int		Port,		/* Which port should be checked */
+int		Port,		/* Port Index (MAC_1 + n) */
 SK_BOOL	AutoNeg)	/* Is Auto-negotiation used ? */
 {
 	SK_GEPORT	*pPrt;		/* GIni Port struct pointer */
@@ -1336,74 +1740,6 @@ SK_BOOL	AutoNeg)	/* Is Auto-negotiation 
 	/* Check for No HCD Link events (#10523) */
 	SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_INT_STAT, &Isrc);
 
-#ifdef xDEBUG
-	if ((Isrc & ~(PHY_B_IS_HCT | PHY_B_IS_LCT) ==
-		(PHY_B_IS_SCR_S_ER | PHY_B_IS_RRS_CHANGE | PHY_B_IS_LRS_CHANGE)) {
-
-		SK_U32	Stat1, Stat2, Stat3;
-
-		Stat1 = 0;
-		SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_INT_MASK, &Stat1);
-		CMSMPrintString(
-			pAC->pConfigTable,
-			MSG_TYPE_RUNTIME_INFO,
-			"CheckUp1 - Stat: %x, Mask: %x",
-			(void *)Isrc,
-			(void *)Stat1);
-
-		Stat1 = 0;
-		SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_CTRL, &Stat1);
-		Stat2 = 0;
-		SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_STAT, &Stat2);
-		Stat1 = Stat1 << 16 | Stat2;
-		Stat2 = 0;
-		SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUNE_ADV, &Stat2);
-		Stat3 = 0;
-		SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUNE_LP, &Stat3);
-		Stat2 = Stat2 << 16 | Stat3;
-		CMSMPrintString(
-			pAC->pConfigTable,
-			MSG_TYPE_RUNTIME_INFO,
-			"Ctrl/Stat: %x, AN Adv/LP: %x",
-			(void *)Stat1,
-			(void *)Stat2);
-
-		Stat1 = 0;
-		SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUNE_EXP, &Stat1);
-		Stat2 = 0;
-		SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_EXT_STAT, &Stat2);
-		Stat1 = Stat1 << 16 | Stat2;
-		Stat2 = 0;
-		SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_1000T_CTRL, &Stat2);
-		Stat3 = 0;
-		SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_1000T_STAT, &Stat3);
-		Stat2 = Stat2 << 16 | Stat3;
-		CMSMPrintString(
-			pAC->pConfigTable,
-			MSG_TYPE_RUNTIME_INFO,
-			"AN Exp/IEEE Ext: %x, 1000T Ctrl/Stat: %x",
-			(void *)Stat1,
-			(void *)Stat2);
-
-		Stat1 = 0;
-		SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_P_EXT_CTRL, &Stat1);
-		Stat2 = 0;
-		SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_P_EXT_STAT, &Stat2);
-		Stat1 = Stat1 << 16 | Stat2;
-		Stat2 = 0;
-		SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUX_CTRL, &Stat2);
-		Stat3 = 0;
-		SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUX_STAT, &Stat3);
-		Stat2 = Stat2 << 16 | Stat3;
-		CMSMPrintString(
-			pAC->pConfigTable,
-			MSG_TYPE_RUNTIME_INFO,
-			"PHY Ext Ctrl/Stat: %x, Aux Ctrl/Stat: %x",
-			(void *)Stat1,
-			(void *)Stat2);
-	}
-#endif /* DEBUG */
-
 	if ((Isrc & (PHY_B_IS_NO_HDCL /* | PHY_B_IS_NO_HDC */)) != 0) {
 		/*
 		 * Workaround BCom Errata:
@@ -1416,14 +1752,6 @@ SK_BOOL	AutoNeg)	/* Is Auto-negotiation 
 			(SK_U16)(Ctrl & ~PHY_CT_LOOP));
 		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
 			("No HCD Link event, Port %d\n", Port));
-#ifdef xDEBUG
-		CMSMPrintString(
-			pAC->pConfigTable,
-			MSG_TYPE_RUNTIME_INFO,
-			"No HCD link event, port %d.",
-			(void *)Port,
-			(void *)NULL);
-#endif /* DEBUG */
 	}
 
 	/* Not obsolete: link status bit is latched to 0 and autoclearing! */
@@ -1433,72 +1761,6 @@ SK_BOOL	AutoNeg)	/* Is Auto-negotiation 
 		return(SK_HW_PS_NONE);
 	}
 
-#ifdef xDEBUG
-	{
-		SK_U32	Stat1, Stat2, Stat3;
-
-		Stat1 = 0;
-		SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_INT_MASK, &Stat1);
-		CMSMPrintString(
-			pAC->pConfigTable,
-			MSG_TYPE_RUNTIME_INFO,
-			"CheckUp1a - Stat: %x, Mask: %x",
-			(void *)Isrc,
-			(void *)Stat1);
-
-		Stat1 = 0;
-		SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_CTRL, &Stat1);
-		Stat2 = 0;
-		SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_STAT, &PhyStat);
-		Stat1 = Stat1 << 16 | PhyStat;
-		Stat2 = 0;
-		SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUNE_ADV, &Stat2);
-		Stat3 = 0;
-		SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUNE_LP, &Stat3);
-		Stat2 = Stat2 << 16 | Stat3;
-		CMSMPrintString(
-			pAC->pConfigTable,
-			MSG_TYPE_RUNTIME_INFO,
-			"Ctrl/Stat: %x, AN Adv/LP: %x",
-			(void *)Stat1,
-			(void *)Stat2);
-
-		Stat1 = 0;
-		SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUNE_EXP, &Stat1);
-		Stat2 = 0;
-		SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_EXT_STAT, &Stat2);
-		Stat1 = Stat1 << 16 | Stat2;
-		Stat2 = 0;
-		SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_1000T_CTRL, &Stat2);
-		Stat3 = 0;
-		SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_1000T_STAT, &ResAb);
-		Stat2 = Stat2 << 16 | ResAb;
-		CMSMPrintString(
-			pAC->pConfigTable,
-			MSG_TYPE_RUNTIME_INFO,
-			"AN Exp/IEEE Ext: %x, 1000T Ctrl/Stat: %x",
-			(void *)Stat1,
-			(void *)Stat2);
-
-		Stat1 = 0;
-		SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_P_EXT_CTRL, &Stat1);
-		Stat2 = 0;
-		SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_P_EXT_STAT, &Stat2);
-		Stat1 = Stat1 << 16 | Stat2;
-		Stat2 = 0;
-		SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUX_CTRL, &Stat2);
-		Stat3 = 0;
-		SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUX_STAT, &Stat3);
-		Stat2 = Stat2 << 16 | Stat3;
-		CMSMPrintString(
-			pAC->pConfigTable,
-			MSG_TYPE_RUNTIME_INFO,
-			"PHY Ext Ctrl/Stat: %x, Aux Ctrl/Stat: %x",
-			(void *)Stat1,
-			(void *)Stat2);
-	}
-#endif /* DEBUG */
-
 	/*
 	 * Here we usually can check whether the link is in sync and
 	 * auto-negotiation is done.
@@ -1507,7 +1769,7 @@ SK_BOOL	AutoNeg)	/* Is Auto-negotiation 
 	SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_STAT, &PhyStat);
 
 	SkMacAutoNegLipaPhy(pAC, IoC, Port, PhyStat);
-	
+
 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
 		("CheckUp Port %d, PhyStat: 0x%04X\n", Port, PhyStat));
 
@@ -1516,31 +1778,32 @@ SK_BOOL	AutoNeg)	/* Is Auto-negotiation 
 	if ((ResAb & PHY_B_1000S_MSF) != 0) {
 		/* Error */
 		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_ERR,
-			("Master/Slave Fault port %d\n", Port));
-		
+			("Master/Slave Fault, ResAb: 0x%04X\n", ResAb));
+
 		pPrt->PAutoNegFail = SK_TRUE;
 		pPrt->PMSStatus = SK_MS_STAT_FAULT;
-		
+
 		return(SK_HW_PS_RESTART);
 	}
 
 	if ((PhyStat & PHY_ST_LSYNC) == 0) {
 		return(SK_HW_PS_NONE);
 	}
-	
+
 	pPrt->PMSStatus = ((ResAb & PHY_B_1000S_MSR) != 0) ?
 		SK_MS_STAT_MASTER : SK_MS_STAT_SLAVE;
-	
+
 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
 		("Port %d, ResAb: 0x%04X\n", Port, ResAb));
 
 	if (AutoNeg) {
+		/* Auto-Negotiation Over ? */
 		if ((PhyStat & PHY_ST_AN_OVER) != 0) {
 			
 			SkHWLinkUp(pAC, IoC, Port);
-			
+
 			Done = SkMacAutoNegDone(pAC, IoC, Port);
-			
+
 			if (Done != SK_AND_OK) {
 #ifdef DEBUG
 				/* Get PHY parameters, for debugging only */
@@ -1553,19 +1816,6 @@ SK_BOOL	AutoNeg)	/* Is Auto-negotiation 
 				return(SK_HW_PS_RESTART);
 			}
 			else {
-#ifdef xDEBUG
-				/* Dummy read ISR to prevent extra link downs/ups */
-				SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_INT_STAT, &ExtStat);
-
-				if ((ExtStat & ~(PHY_B_IS_HCT | PHY_B_IS_LCT)) != 0) {
-					CMSMPrintString(
-						pAC->pConfigTable,
-						MSG_TYPE_RUNTIME_INFO,
-						"CheckUp2 - Stat: %x",
-						(void *)ExtStat,
-						(void *)NULL);
-				}
-#endif /* DEBUG */
 				return(SK_HW_PS_LINK);
 			}
 		}
@@ -1579,24 +1829,10 @@ SK_BOOL	AutoNeg)	/* Is Auto-negotiation 
 		}
 #endif /* DEBUG */
 
-#ifdef xDEBUG
-		/* Dummy read ISR to prevent extra link downs/ups */
-		SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_INT_STAT, &ExtStat);
-
-		if ((ExtStat & ~(PHY_B_IS_HCT | PHY_B_IS_LCT)) != 0) {
-			CMSMPrintString(
-				pAC->pConfigTable,
-				MSG_TYPE_RUNTIME_INFO,
-				"CheckUp3 - Stat: %x",
-				(void *)ExtStat,
-				(void *)NULL);
-		}
-#endif /* DEBUG */
-		
 		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);
 	}
 
@@ -1618,13 +1854,12 @@ SK_BOOL	AutoNeg)	/* Is Auto-negotiation 
 static int SkGePortCheckUpGmac(
 SK_AC	*pAC,		/* Adapter Context */
 SK_IOC	IoC,		/* I/O Context */
-int		Port,		/* Which port should be checked */
+int		Port,		/* Port Index (MAC_1 + n) */
 SK_BOOL	AutoNeg)	/* Is Auto-negotiation used ? */
 {
 	SK_GEPORT	*pPrt;		/* GIni Port struct pointer */
 	int			Done;
-	SK_U16		PhyIsrc;	/* PHY Interrupt source */
-	SK_U16		PhyStat;	/* PPY Status */
+	SK_U16		PhyStat;	/* PHY Status */
 	SK_U16		PhySpecStat;/* PHY Specific Status */
 	SK_U16		ResAb;		/* Master/Slave resolution */
 	SK_EVPARA	Para;
@@ -1644,86 +1879,81 @@ SK_BOOL	AutoNeg)	/* Is Auto-negotiation 
 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
 		("CheckUp Port %d, PhyStat: 0x%04X\n", Port, PhyStat));
 
-	/* Read PHY Interrupt Status */
-	SkGmPhyRead(pAC, IoC, Port, PHY_MARV_INT_STAT, &PhyIsrc);
+	SkMacAutoNegLipaPhy(pAC, IoC, Port, PhyStat);
 
-	if ((PhyIsrc & PHY_M_IS_AN_COMPL) != 0) {
-		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-			("Auto-Negotiation Completed, PhyIsrc: 0x%04X\n", PhyIsrc));
-	}
+	if ((pPrt->PLinkSpeedCap & SK_LSPEED_CAP_1000MBPS) != 0) {
 
-	if ((PhyIsrc & PHY_M_IS_LSP_CHANGE) != 0) {
-		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-			("Link Speed Changed, PhyIsrc: 0x%04X\n", PhyIsrc));
-	}
+		SkGmPhyRead(pAC, IoC, Port, PHY_MARV_1000T_STAT, &ResAb);
 
-	SkMacAutoNegLipaPhy(pAC, IoC, Port, PhyStat);
-	
-	SkGmPhyRead(pAC, IoC, Port, PHY_MARV_1000T_STAT, &ResAb);
+		if ((ResAb & PHY_B_1000S_MSF) != 0) {
+			/* Error */
+			SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_ERR,
+				("Master/Slave Fault, ResAb: 0x%04X\n", ResAb));
 
-	if ((ResAb & PHY_B_1000S_MSF) != 0) {
-		/* Error */
-		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_ERR,
-			("Master/Slave Fault port %d\n", Port));
-		
-		pPrt->PAutoNegFail = SK_TRUE;
-		pPrt->PMSStatus = SK_MS_STAT_FAULT;
-		
-		return(SK_HW_PS_RESTART);
+			pPrt->PAutoNegFail = SK_TRUE;
+			pPrt->PMSStatus = SK_MS_STAT_FAULT;
+
+			return(SK_HW_PS_RESTART);
+		}
 	}
 
 	/* Read PHY Specific Status */
 	SkGmPhyRead(pAC, IoC, Port, PHY_MARV_PHY_STAT, &PhySpecStat);
-	
+
 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
 		("Phy1000BT: 0x%04X, PhySpecStat: 0x%04X\n", ResAb, PhySpecStat));
 
 #ifdef DEBUG
 	SkGmPhyRead(pAC, IoC, Port, PHY_MARV_AUNE_EXP, &Word);
 
-	if ((PhyIsrc & PHY_M_IS_AN_PR) != 0 || (Word & PHY_ANE_RX_PG) != 0 ||
+	if ((Word & PHY_ANE_RX_PG) != 0 ||
 		(PhySpecStat & PHY_M_PS_PAGE_REC) != 0)  {
 		/* Read PHY Next Page Link Partner */
 		SkGmPhyRead(pAC, IoC, Port, PHY_MARV_NEPG_LP, &Word);
 
 		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-			("Page Received, NextPage: 0x%04X\n", Word));
+			("Page received, NextPage: 0x%04X\n", Word));
 	}
 #endif /* DEBUG */
 
 	if ((PhySpecStat & PHY_M_PS_LINK_UP) == 0) {
+		/* Link down */
 		return(SK_HW_PS_NONE);
 	}
-	
-	if ((PhySpecStat & PHY_M_PS_DOWNS_STAT) != 0 ||
-		(PhyIsrc & PHY_M_IS_DOWNSH_DET) != 0) {
+
+	if ((PhySpecStat & PHY_M_PS_DOWNS_STAT) != 0) {
 		/* Downshift detected */
 		SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E025, SKERR_SIRQ_E025MSG);
-		
+
 		Para.Para64 = Port;
 		SkEventQueue(pAC, SKGE_DRV, SK_DRV_DOWNSHIFT_DET, Para);
-		
+
+		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+			("Downshift detected, PhySpecStat: 0x%04X\n", PhySpecStat));
+	}
+
+	if ((PhySpecStat & PHY_M_PS_MDI_X_STAT) != 0) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-			("Downshift detected, PhyIsrc: 0x%04X\n", PhyIsrc));
+			("MDI Xover detected, PhyStat: 0x%04X\n", PhySpecStat));
 	}
 
 	pPrt->PMSStatus = ((ResAb & PHY_B_1000S_MSR) != 0) ?
 		SK_MS_STAT_MASTER : SK_MS_STAT_SLAVE;
-	
+
 	pPrt->PCableLen = (SK_U8)((PhySpecStat & PHY_M_PS_CABLE_MSK) >> 7);
-	
+
 	if (AutoNeg) {
 		/* Auto-Negotiation Over ? */
 		if ((PhyStat & PHY_ST_AN_OVER) != 0) {
-			
+
 			SkHWLinkUp(pAC, IoC, Port);
-			
+
 			Done = SkMacAutoNegDone(pAC, IoC, Port);
-			
+
 			if (Done != SK_AND_OK) {
 				return(SK_HW_PS_RESTART);
 			}
-			
+
 			return(SK_HW_PS_LINK);
 		}
 	}
@@ -1739,7 +1969,7 @@ SK_BOOL	AutoNeg)	/* Is Auto-negotiation 
 		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
 			("Link sync, Port %d\n", Port));
 		SkHWLinkUp(pAC, IoC, Port);
-		
+
 		return(SK_HW_PS_LINK);
 	}
 
@@ -1761,7 +1991,7 @@ SK_BOOL	AutoNeg)	/* Is Auto-negotiation 
 static int SkGePortCheckUpLone(
 SK_AC	*pAC,		/* Adapter Context */
 SK_IOC	IoC,		/* I/O Context */
-int		Port,		/* Which port should be checked */
+int		Port,		/* Port Index (MAC_1 + n) */
 SK_BOOL	AutoNeg)	/* Is Auto-negotiation used ? */
 {
 	SK_GEPORT	*pPrt;		/* GIni Port struct pointer */
@@ -1790,7 +2020,7 @@ SK_BOOL	AutoNeg)	/* Is Auto-negotiation 
 	StatSum |= PhyStat;
 
 	SkMacAutoNegLipaPhy(pAC, IoC, Port, PhyStat);
-	
+
 	if ((PhyStat & PHY_ST_LSYNC) == 0) {
 		/* Save Auto-negotiation Done bit */
 		pPrt->PIsave = (SK_U16)(StatSum & PHY_ST_AN_OVER);
@@ -1804,9 +2034,13 @@ SK_BOOL	AutoNeg)	/* Is Auto-negotiation 
 	}
 
 	if (AutoNeg) {
+		/* Auto-Negotiation Over ? */
 		if ((StatSum & PHY_ST_AN_OVER) != 0) {
+
 			SkHWLinkUp(pAC, IoC, Port);
+
 			Done = SkMacAutoNegDone(pAC, IoC, Port);
+
 			if (Done != SK_AND_OK) {
 				/* Get PHY parameters, for debugging only */
 				SkXmPhyRead(pAC, IoC, Port, PHY_LONE_AUNE_LP, &LpAb);
@@ -1814,7 +2048,7 @@ SK_BOOL	AutoNeg)	/* Is Auto-negotiation 
 				SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_ERR,
 					("AutoNeg FAIL Port %d (LpAb %x, 1000TStat %x)\n",
 					 Port, LpAb, ExtStat));
-					
+
 				/* Try next possible mode */
 				NextMode = SkHWSenseGetNext(pAC, IoC, Port);
 				SkHWLinkDown(pAC, IoC, Port);
@@ -1827,12 +2061,15 @@ SK_BOOL	AutoNeg)	/* Is Auto-negotiation 
 
 			}
 			else {
-				/* Dummy Read interrupt status to prevent extra link down/ups */
+				/*
+				 * Dummy Read interrupt status to prevent
+				 * extra link down/ups
+				 */
 				SkXmPhyRead(pAC, IoC, Port, PHY_LONE_INT_STAT, &ExtStat);
 				return(SK_HW_PS_LINK);
 			}
 		}
-		
+
 		/* AutoNeg not done, but HW link is up. Check for timeouts */
 		pPrt->PAutoNegTimeOut++;
 		if (pPrt->PAutoNegTimeOut >= SK_AND_MAX_TO) {
@@ -1860,13 +2097,17 @@ SK_BOOL	AutoNeg)	/* Is Auto-negotiation 
 		}
 #endif /* DEBUG */
 
-		/* Dummy Read interrupt status to prevent extra link down/ups */
+		/*
+		 * Dummy Read interrupt status to prevent
+		 * extra link down/ups
+		 */
 		SkXmPhyRead(pAC, IoC, Port, PHY_LONE_INT_STAT, &ExtStat);
-		
+
 		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);
 	}
 
@@ -1886,7 +2127,7 @@ SK_BOOL	AutoNeg)	/* Is Auto-negotiation 
 static int SkGePortCheckUpNat(
 SK_AC	*pAC,		/* Adapter Context */
 SK_IOC	IoC,		/* I/O Context */
-int		Port,		/* Which port should be checked */
+int		Port,		/* Port Index (MAC_1 + n) */
 SK_BOOL	AutoNeg)	/* Is Auto-negotiation used ? */
 {
 	/* todo: National */
@@ -1924,7 +2165,7 @@ SK_EVPARA	Para)		/* Event specific Param
 	switch (Event) {
 	case SK_HWEV_WATIM:
 		if (pPrt->PState == SK_PRT_RESET) {
-		
+
 			PortStat = SK_HW_PS_NONE;
 		}
 		else {
@@ -1954,19 +2195,23 @@ SK_EVPARA	Para)		/* Event specific Param
 			SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_UP, Para);
 			break;
 		}
-		
+
 		/* Start again the check Timer */
 		if (pPrt->PHWLinkUp) {
+			
 			Val32 = SK_WA_ACT_TIME;
 		}
 		else {
 			Val32 = SK_WA_INA_TIME;
-		}
 
-		/* Todo: still needed for non-XMAC PHYs??? */
+			if (pAC->GIni.GIYukon) {
+				Val32 *= 5;
+			}
+		}
 		/* Start workaround Errata #2 timer */
 		SkTimerStart(pAC, IoC, &pPrt->PWaTimer, Val32,
 			SKGE_HWAC, SK_HWEV_WATIM, Para);
+
 		break;
 
 	case SK_HWEV_PORT_START:
@@ -1986,6 +2231,7 @@ SK_EVPARA	Para)		/* Event specific Param
 		/* Start workaround Errata #2 timer */
 		SkTimerStart(pAC, IoC, &pPrt->PWaTimer, SK_WA_INA_TIME,
 			SKGE_HWAC, SK_HWEV_WATIM, Para);
+
 		break;
 
 	case SK_HWEV_PORT_STOP:
@@ -2093,11 +2339,11 @@ SK_EVPARA	Para)		/* Event specific Param
 				(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);
@@ -2106,7 +2352,7 @@ SK_EVPARA	Para)		/* Event specific Param
 		}
 		break;
 #endif /* GENESIS */
-	
+
 	default:
 		SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_SIRQ_E001, SKERR_SIRQ_E001MSG);
 		break;
@@ -2128,7 +2374,7 @@ SK_EVPARA	Para)		/* Event specific Param
 static void SkPhyIsrBcom(
 SK_AC		*pAC,		/* Adapter Context */
 SK_IOC		IoC,		/* I/O Context */
-int			Port,		/* Port Num = PHY Num */
+int			Port,		/* Port Index (MAC_1 + n) */
 SK_U16		IStatus)	/* Interrupt Status */
 {
 	SK_GEPORT	*pPrt;		/* GIni Port struct pointer */
@@ -2141,7 +2387,7 @@ SK_U16		IStatus)	/* Interrupt Status */
 		SK_ERR_LOG(pAC, SK_ERRCL_HW | SK_ERRCL_INIT, SKERR_SIRQ_E022,
 			SKERR_SIRQ_E022MSG);
 	}
-	
+
 	if ((IStatus & (PHY_B_IS_AN_PR | PHY_B_IS_LST_CHANGE)) != 0) {
 
 		SkHWLinkDown(pAC, IoC, Port);
@@ -2171,7 +2417,7 @@ SK_U16		IStatus)	/* Interrupt Status */
 static void SkPhyIsrGmac(
 SK_AC		*pAC,		/* Adapter Context */
 SK_IOC		IoC,		/* I/O Context */
-int			Port,		/* Port Num = PHY Num */
+int			Port,		/* Port Index (MAC_1 + n) */
 SK_U16		IStatus)	/* Interrupt Status */
 {
 	SK_GEPORT	*pPrt;		/* GIni Port struct pointer */
@@ -2180,37 +2426,62 @@ SK_U16		IStatus)	/* Interrupt Status */
 
 	pPrt = &pAC->GIni.GP[Port];
 
-	if ((IStatus & (PHY_M_IS_AN_PR | PHY_M_IS_LST_CHANGE)) != 0) {
-
-		SkHWLinkDown(pAC, IoC, Port);
+	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+		("PHY IRQ, PhyIsrc: 0x%04X\n", IStatus));
 
-		SkGmPhyRead(pAC, IoC, Port, PHY_MARV_AUNE_ADV, &Word);
+	if ((IStatus & PHY_M_IS_LST_CHANGE) != 0) {
 
 		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));
-		}
-		
+			("Link Status changed\n", IStatus));
+
 		Para.Para32[0] = (SK_U32)Port;
-		/* Signal to RLMT */
-		SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_DOWN, Para);
+
+		if (pPrt->PHWLinkUp) {
+			
+			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 (pAC->GIni.GIChipId != CHIP_ID_YUKON_FE &&
+				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));
+			}
+
+			/* Signal to RLMT */
+			SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_DOWN, Para);
+		}
+		else {
+
+			if ((IStatus & PHY_M_IS_AN_COMPL) != 0) {
+				SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+					("Auto-Negotiation completed\n"));
+			}
+
+			if ((IStatus & PHY_M_IS_LSP_CHANGE) != 0) {
+				SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+					("Link Speed changed\n"));
+			}
+
+			SkEventQueue(pAC, SKGE_HWAC, SK_HWEV_WATIM, Para);
+		}
 	}
-	
+
 	if ((IStatus & PHY_M_IS_AN_ERROR) != 0) {
 		/* Auto-Negotiation Error */
 		SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E023, SKERR_SIRQ_E023MSG);
 	}
-	
+
 	if ((IStatus & PHY_M_IS_FIFO_ERROR) != 0) {
 		/* FIFO Overflow/Underrun Error */
 		SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E024, SKERR_SIRQ_E024MSG);
 	}
-	
+
 }	/* SkPhyIsrGmac */
 #endif /* YUKON */
 
@@ -2227,7 +2498,7 @@ SK_U16		IStatus)	/* Interrupt Status */
 static void SkPhyIsrLone(
 SK_AC	*pAC,		/* Adapter Context */
 SK_IOC	IoC,		/* I/O Context */
-int		Port,		/* Port Num = PHY Num */
+int		Port,		/* Port Index (MAC_1 + n) */
 SK_U16	IStatus)	/* Interrupt Status */
 {
 	SK_EVPARA	Para;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/ski2c.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/ski2c.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/ski2c.c	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/ski2c.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,1296 +0,0 @@
-/******************************************************************************
- *
- * Name:	ski2c.c
- * Project:	Gigabit Ethernet Adapters, TWSI-Module
- * Version:	$Revision: 1.59 $
- * Date:	$Date: 2003/10/20 09:07:25 $
- * Purpose:	Functions to access Voltage and Temperature Sensor
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *	(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
- *	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.
- *
- ******************************************************************************/
-
-/*
- *	I2C Protocol
- */
-#if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
-static const char SysKonnectFileId[] =
-	"@(#) $Id: ski2c.c,v 1.59 2003/10/20 09:07:25 rschmidt Exp $ (C) Marvell. ";
-#endif
-
-#include "h/skdrv1st.h"		/* Driver Specific Definitions */
-#include "h/lm80.h"
-#include "h/skdrv2nd.h"		/* Adapter Control- and Driver specific Def. */
-
-#ifdef __C2MAN__
-/*
-	I2C protocol implementation.
-
-	General Description:
-
-	The I2C protocol is used for the temperature sensors and for
-	the serial EEPROM which hold the configuration.
-
-	This file covers functions that allow to read write and do
-	some bulk requests a specified I2C address.
-
-	The Genesis has 2 I2C buses. One for the EEPROM which holds
-	the VPD Data and one for temperature and voltage sensor.
-	The following picture shows the I2C buses, I2C devices and
-	their control registers.
-
-	Note: The VPD functions are in skvpd.c
-.
-.	PCI Config I2C Bus for VPD Data:
-.
-.		      +------------+
-.		      | VPD EEPROM |
-.		      +------------+
-.			     |
-.			     | <-- I2C
-.			     |
-.		 +-----------+-----------+
-.		 |			 |
-.	+-----------------+	+-----------------+
-.	| PCI_VPD_ADR_REG |	| PCI_VPD_DAT_REG |
-.	+-----------------+	+-----------------+
-.
-.
-.	I2C Bus for LM80 sensor:
-.
-.			+-----------------+
-.			| Temperature and |
-.			| Voltage Sensor  |
-.			| 	LM80	  |
-.			+-----------------+
-.				|
-.				|
-.			I2C --> |
-.				|
-.			     +----+
-.	     +-------------->| OR |<--+
-.	     |		     +----+   |
-.     +------+------+		      |
-.     |		    |		      |
-. +--------+	+--------+	+----------+
-. | B2_I2C |	| B2_I2C |	|  B2_I2C  |
-. | _CTRL  |	| _DATA  |	|   _SW    |
-. +--------+	+--------+	+----------+
-.
-	The I2C bus may be driven by the B2_I2C_SW or by the B2_I2C_CTRL
-	and B2_I2C_DATA registers.
-	For driver software it is recommended to use the I2C control and
-	data register, because I2C bus timing is done by the ASIC and
-	an interrupt may be received when the I2C request is completed.
-
-	Clock Rate Timing:			MIN	MAX	generated by
-		VPD EEPROM:			50 kHz	100 kHz		HW
-		LM80 over I2C Ctrl/Data reg.	50 kHz	100 kHz		HW
-		LM80 over B2_I2C_SW register	0	400 kHz		SW
-
-	Note:	The clock generated by the hardware is dependend on the
-		PCI clock. If the PCI bus clock is 33 MHz, the I2C/VPD
-		clock is 50 kHz.
- */
-intro()
-{}
-#endif
-
-#ifdef SK_DIAG
-/*
- * I2C Fast Mode timing values used by the LM80.
- * If new devices are added to the I2C bus the timing values have to be checked.
- */
-#ifndef I2C_SLOW_TIMING
-#define	T_CLK_LOW			1300L	/* clock low time in ns */
-#define	T_CLK_HIGH		 	 600L	/* clock high time in ns */
-#define T_DATA_IN_SETUP		 100L	/* data in Set-up Time */
-#define T_START_HOLD		 600L	/* start condition hold time */
-#define T_START_SETUP		 600L	/* start condition Set-up time */
-#define	T_STOP_SETUP		 600L	/* stop condition Set-up time */
-#define T_BUS_IDLE			1300L	/* time the bus must free after Tx */
-#define	T_CLK_2_DATA_OUT	 900L	/* max. clock low to data output valid */
-#else	/* I2C_SLOW_TIMING */
-/* I2C Standard Mode Timing */
-#define	T_CLK_LOW			4700L	/* clock low time in ns */
-#define	T_CLK_HIGH			4000L	/* clock high time in ns */
-#define T_DATA_IN_SETUP		 250L	/* data in Set-up Time */
-#define T_START_HOLD		4000L	/* start condition hold time */
-#define T_START_SETUP		4700L	/* start condition Set-up time */
-#define	T_STOP_SETUP		4000L	/* stop condition Set-up time */
-#define T_BUS_IDLE			4700L	/* time the bus must free after Tx */
-#endif	/* !I2C_SLOW_TIMING */
-
-#define NS2BCLK(x)	(((x)*125)/10000)
-
-/*
- * I2C Wire Operations
- *
- * About I2C_CLK_LOW():
- *
- * The Data Direction bit (I2C_DATA_DIR) has to be set to input when setting
- * clock to low, to prevent the ASIC and the I2C data client from driving the
- * serial data line simultaneously (ASIC: last bit of a byte = '1', I2C client
- * send an 'ACK'). See also Concentrator Bugreport No. 10192.
- */
-#define I2C_DATA_HIGH(IoC)	SK_I2C_SET_BIT(IoC, I2C_DATA)
-#define	I2C_DATA_LOW(IoC)	SK_I2C_CLR_BIT(IoC, I2C_DATA)
-#define	I2C_DATA_OUT(IoC)	SK_I2C_SET_BIT(IoC, I2C_DATA_DIR)
-#define	I2C_DATA_IN(IoC)	SK_I2C_CLR_BIT(IoC, I2C_DATA_DIR | I2C_DATA)
-#define	I2C_CLK_HIGH(IoC)	SK_I2C_SET_BIT(IoC, I2C_CLK)
-#define	I2C_CLK_LOW(IoC)	SK_I2C_CLR_BIT(IoC, I2C_CLK | I2C_DATA_DIR)
-#define	I2C_START_COND(IoC)	SK_I2C_CLR_BIT(IoC, I2C_CLK)
-
-#define NS2CLKT(x)	((x*125L)/10000)
-
-/*--------------- I2C Interface Register Functions --------------- */
-
-/*
- * sending one bit
- */
-void SkI2cSndBit(
-SK_IOC	IoC,	/* I/O Context */
-SK_U8	Bit)	/* Bit to send */
-{
-	I2C_DATA_OUT(IoC);
-	if (Bit) {
-		I2C_DATA_HIGH(IoC);
-	}
-	else {
-		I2C_DATA_LOW(IoC);
-	}
-	SkDgWaitTime(IoC, NS2BCLK(T_DATA_IN_SETUP));
-	I2C_CLK_HIGH(IoC);
-	SkDgWaitTime(IoC, NS2BCLK(T_CLK_HIGH));
-	I2C_CLK_LOW(IoC);
-}	/* SkI2cSndBit*/
-
-
-/*
- * Signal a start to the I2C Bus.
- *
- * A start is signaled when data goes to low in a high clock cycle.
- *
- * Ends with Clock Low.
- *
- * Status: not tested
- */
-void SkI2cStart(
-SK_IOC	IoC)	/* I/O Context */
-{
-	/* Init data and Clock to output lines */
-	/* Set Data high */
-	I2C_DATA_OUT(IoC);
-	I2C_DATA_HIGH(IoC);
-	/* Set Clock high */
-	I2C_CLK_HIGH(IoC);
-
-	SkDgWaitTime(IoC, NS2BCLK(T_START_SETUP));
-
-	/* Set Data Low */
-	I2C_DATA_LOW(IoC);
-
-	SkDgWaitTime(IoC, NS2BCLK(T_START_HOLD));
-
-	/* Clock low without Data to Input */
-	I2C_START_COND(IoC);
-
-	SkDgWaitTime(IoC, NS2BCLK(T_CLK_LOW));
-}	/* SkI2cStart */
-
-
-void SkI2cStop(
-SK_IOC	IoC)	/* I/O Context */
-{
-	/* Init data and Clock to output lines */
-	/* Set Data low */
-	I2C_DATA_OUT(IoC);
-	I2C_DATA_LOW(IoC);
-
-	SkDgWaitTime(IoC, NS2BCLK(T_CLK_2_DATA_OUT));
-
-	/* Set Clock high */
-	I2C_CLK_HIGH(IoC);
-
-	SkDgWaitTime(IoC, NS2BCLK(T_STOP_SETUP));
-
-	/*
-	 * Set Data High:	Do it by setting the Data Line to Input.
-	 *			Because of a pull up resistor the Data Line
-	 *			floods to high.
-	 */
-	I2C_DATA_IN(IoC);
-
-	/*
-	 *	When I2C activity is stopped
-	 *	 o	DATA should be set to input and
-	 *	 o	CLOCK should be set to high!
-	 */
-	SkDgWaitTime(IoC, NS2BCLK(T_BUS_IDLE));
-}	/* SkI2cStop */
-
-
-/*
- * Receive just one bit via the I2C bus.
- *
- * Note:	Clock must be set to LOW before calling this function.
- *
- * Returns The received bit.
- */
-int SkI2cRcvBit(
-SK_IOC	IoC)	/* I/O Context */
-{
-	int	Bit;
-	SK_U8	I2cSwCtrl;
-
-	/* Init data as input line */
-	I2C_DATA_IN(IoC);
-
-	SkDgWaitTime(IoC, NS2BCLK(T_CLK_2_DATA_OUT));
-
-	I2C_CLK_HIGH(IoC);
-
-	SkDgWaitTime(IoC, NS2BCLK(T_CLK_HIGH));
-
-	SK_I2C_GET_SW(IoC, &I2cSwCtrl);
-	
-	Bit = (I2cSwCtrl & I2C_DATA) ? 1 : 0;
-
-	I2C_CLK_LOW(IoC);
-	SkDgWaitTime(IoC, NS2BCLK(T_CLK_LOW-T_CLK_2_DATA_OUT));
-
-	return(Bit);
-}	/* SkI2cRcvBit */
-
-
-/*
- * Receive an ACK.
- *
- * returns	0 If acknowledged
- *		1 in case of an error
- */
-int SkI2cRcvAck(
-SK_IOC	IoC)	/* I/O Context */
-{
-	/*
-	 * Received bit must be zero.
-	 */
-	return(SkI2cRcvBit(IoC) != 0);
-}	/* SkI2cRcvAck */
-
-
-/*
- * Send an NACK.
- */
-void SkI2cSndNAck(
-SK_IOC	IoC)	/* I/O Context */
-{
-	/*
-	 * Received bit must be zero.
-	 */
-	SkI2cSndBit(IoC, 1);
-}	/* SkI2cSndNAck */
-
-
-/*
- * Send an ACK.
- */
-void SkI2cSndAck(
-SK_IOC IoC)	/* I/O Context */
-{
-	/*
-	 * Received bit must be zero.
-	 */
-	SkI2cSndBit(IoC, 0);
-}	/* SkI2cSndAck */
-
-
-/*
- * Send one byte to the I2C device and wait for ACK.
- *
- * Return acknowleged status.
- */
-int SkI2cSndByte(
-SK_IOC	IoC,	/* I/O Context */
-int		Byte)	/* byte to send */
-{
-	int	i;
-
-	for (i = 0; i < 8; i++) {
-		if (Byte & (1<<(7-i))) {
-			SkI2cSndBit(IoC, 1);
-		}
-		else {
-			SkI2cSndBit(IoC, 0);
-		}
-	}
-
-	return(SkI2cRcvAck(IoC));
-}	/* SkI2cSndByte */
-
-
-/*
- * Receive one byte and ack it.
- *
- * Return byte.
- */
-int SkI2cRcvByte(
-SK_IOC	IoC,	/* I/O Context */
-int		Last)	/* Last Byte Flag */
-{
-	int	i;
-	int	Byte = 0;
-
-	for (i = 0; i < 8; i++) {
-		Byte <<= 1;
-		Byte |= SkI2cRcvBit(IoC);
-	}
-
-	if (Last) {
-		SkI2cSndNAck(IoC);
-	}
-	else {
-		SkI2cSndAck(IoC);
-	}
-
-	return(Byte);
-}	/* SkI2cRcvByte */
-
-
-/*
- * Start dialog and send device address
- *
- * Return 0 if acknowleged, 1 in case of an error
- */
-int	SkI2cSndDev(
-SK_IOC	IoC,	/* I/O Context */
-int		Addr,	/* Device Address */
-int		Rw)		/* Read / Write Flag */
-{
-	SkI2cStart(IoC);
-	Rw = ~Rw;
-	Rw &= I2C_WRITE;
-	return(SkI2cSndByte(IoC, (Addr<<1) | Rw));
-}	/* SkI2cSndDev */
-
-#endif /* SK_DIAG */
-
-/*----------------- I2C CTRL Register Functions ----------*/
-
-/*
- * waits for a completion of an I2C transfer
- *
- * returns	0:	success, transfer completes
- *			1:	error,	 transfer does not complete, I2C transfer
- *						 killed, wait loop terminated.
- */
-int	SkI2cWait(
-SK_AC	*pAC,	/* Adapter Context */
-SK_IOC	IoC,	/* I/O Context */
-int		Event)	/* complete event to wait for (I2C_READ or I2C_WRITE) */
-{
-	SK_U64	StartTime;
-	SK_U64	CurrentTime;
-	SK_U32	I2cCtrl;
-
-	StartTime = SkOsGetTime(pAC);
-	
-	do {
-		CurrentTime = SkOsGetTime(pAC);
-
-		if (CurrentTime - StartTime > SK_TICKS_PER_SEC / 8) {
-			
-			SK_I2C_STOP(IoC);
-#ifndef SK_DIAG
-			SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_I2C_E002, SKERR_I2C_E002MSG);
-#endif /* !SK_DIAG */
-			return(1);
-		}
-		
-		SK_I2C_GET_CTL(IoC, &I2cCtrl);
-
-#ifdef xYUKON_DBG
-		printf("StartTime=%lu, CurrentTime=%lu\n",
-			StartTime, CurrentTime);
-		if (kbhit()) {
-			return(1);
-		}
-#endif /* YUKON_DBG */
-	
-	} while ((I2cCtrl & I2C_FLAG) == (SK_U32)Event << 31);
-
-	return(0);
-}	/* SkI2cWait */
-
-
-/*
- * waits for a completion of an I2C transfer
- *
- * Returns
- *	Nothing
- */
-void SkI2cWaitIrq(
-SK_AC	*pAC,	/* Adapter Context */
-SK_IOC	IoC)	/* I/O Context */
-{
-	SK_SENSOR	*pSen;
-	SK_U64		StartTime;
-	SK_U32		IrqSrc;
-
-	pSen = &pAC->I2c.SenTable[pAC->I2c.CurrSens];
-
-	if (pSen->SenState == SK_SEN_IDLE) {
-		return;
-	}
-
-	StartTime = SkOsGetTime(pAC);
-	
-	do {
-		if (SkOsGetTime(pAC) - StartTime > SK_TICKS_PER_SEC / 8) {
-			
-			SK_I2C_STOP(IoC);
-#ifndef SK_DIAG
-			SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_I2C_E016, SKERR_I2C_E016MSG);
-#endif /* !SK_DIAG */
-			return;
-		}
-		
-		SK_IN32(IoC, B0_ISRC, &IrqSrc);
-
-	} while ((IrqSrc & IS_I2C_READY) == 0);
-
-	pSen->SenState = SK_SEN_IDLE;
-	return;
-}	/* SkI2cWaitIrq */
-
-/*
- * writes a single byte or 4 bytes into the I2C device
- *
- * returns	0:	success
- *			1:	error
- */
-int SkI2cWrite(
-SK_AC	*pAC,		/* Adapter Context */
-SK_IOC	IoC,		/* I/O Context */
-SK_U32	I2cData,	/* I2C Data to write */
-int		I2cDev,		/* I2C Device Address */
-int		I2cDevSize, /* I2C Device Size (e.g. I2C_025K_DEV or I2C_2K_DEV) */
-int		I2cReg,		/* I2C Device Register Address */
-int		I2cBurst)	/* I2C Burst Flag */
-{
-	SK_OUT32(IoC, B2_I2C_DATA, I2cData);
-	
-	SK_I2C_CTL(IoC, I2C_WRITE, I2cDev, I2cDevSize, I2cReg, I2cBurst);
-	
-	return(SkI2cWait(pAC, IoC, I2C_WRITE));
-}	/* SkI2cWrite*/
-
-
-#ifdef	SK_DIAG
-/*
- * reads a single byte or 4 bytes from the I2C device
- *
- * returns	the word read
- */
-SK_U32 SkI2cRead(
-SK_AC	*pAC,		/* Adapter Context */
-SK_IOC	IoC,		/* I/O Context */
-int		I2cDev,		/* I2C Device Address */
-int		I2cDevSize, /* I2C Device Size (e.g. I2C_025K_DEV or I2C_2K_DEV) */
-int		I2cReg,		/* I2C Device Register Address */
-int		I2cBurst)	/* I2C Burst Flag */
-{
-	SK_U32	Data;
-
-	SK_OUT32(IoC, B2_I2C_DATA, 0);
-	SK_I2C_CTL(IoC, I2C_READ, I2cDev, I2cDevSize, I2cReg, I2cBurst);
-	
-	if (SkI2cWait(pAC, IoC, I2C_READ) != 0) {
-		w_print("%s\n", SKERR_I2C_E002MSG);
-	}
-	
-	SK_IN32(IoC, B2_I2C_DATA, &Data);
-	
-	return(Data);
-}	/* SkI2cRead */
-#endif /* SK_DIAG */
-
-
-/*
- * read a sensor's value
- *
- * This function reads a sensor's value from the I2C sensor chip. The sensor
- * is defined by its index into the sensors database in the struct pAC points
- * to.
- * Returns
- *		1 if the read is completed
- *		0 if the read must be continued (I2C Bus still allocated)
- */
-int	SkI2cReadSensor(
-SK_AC		*pAC,	/* Adapter Context */
-SK_IOC		IoC,	/* I/O Context */
-SK_SENSOR	*pSen)	/* Sensor to be read */
-{
-    if (pSen->SenRead != NULL) {
-        return((*pSen->SenRead)(pAC, IoC, pSen));
-    }
-	else {
-        return(0); /* no success */
-	}
-}	/* SkI2cReadSensor */
-
-/*
- * Do the Init state 0 initialization
- */
-static int SkI2cInit0(
-SK_AC	*pAC)	/* Adapter Context */
-{
-	int	i;
-
-	/* Begin with first sensor */
-	pAC->I2c.CurrSens = 0;
-	
-	/* Begin with timeout control for state machine */
-	pAC->I2c.TimerMode = SK_TIMER_WATCH_SM;
-	
-	/* Set sensor number to zero */
-	pAC->I2c.MaxSens = 0;
-
-#ifndef SK_DIAG
-	/* Initialize Number of Dummy Reads */
-	pAC->I2c.DummyReads = SK_MAX_SENSORS;
-#endif
-
-	for (i = 0; i < SK_MAX_SENSORS; i++) {
-		pAC->I2c.SenTable[i].SenDesc = "unknown";
-		pAC->I2c.SenTable[i].SenType = SK_SEN_UNKNOWN;
-		pAC->I2c.SenTable[i].SenThreErrHigh = 0;
-		pAC->I2c.SenTable[i].SenThreErrLow = 0;
-		pAC->I2c.SenTable[i].SenThreWarnHigh = 0;
-		pAC->I2c.SenTable[i].SenThreWarnLow = 0;
-		pAC->I2c.SenTable[i].SenReg = LM80_FAN2_IN;
-		pAC->I2c.SenTable[i].SenInit = SK_SEN_DYN_INIT_NONE;
-		pAC->I2c.SenTable[i].SenValue = 0;
-		pAC->I2c.SenTable[i].SenErrFlag = SK_SEN_ERR_NOT_PRESENT;
-		pAC->I2c.SenTable[i].SenErrCts = 0;
-		pAC->I2c.SenTable[i].SenBegErrTS = 0;
-		pAC->I2c.SenTable[i].SenState = SK_SEN_IDLE;
-		pAC->I2c.SenTable[i].SenRead = NULL;
-		pAC->I2c.SenTable[i].SenDev = 0;
-	}
-
-	/* Now we are "INIT data"ed */
-	pAC->I2c.InitLevel = SK_INIT_DATA;
-	return(0);
-}	/* SkI2cInit0*/
-
-
-/*
- * Do the init state 1 initialization
- *
- * initialize the following register of the LM80:
- * Configuration register:
- * - START, noINT, activeLOW, noINT#Clear, noRESET, noCI, noGPO#, noINIT
- *
- * Interrupt Mask Register 1:
- * - all interrupts are Disabled (0xff)
- *
- * Interrupt Mask Register 2:
- * - all interrupts are Disabled (0xff) Interrupt modi doesn't matter.
- *
- * Fan Divisor/RST_OUT register:
- * - Divisors set to 1 (bits 00), all others 0s.
- *
- * OS# Configuration/Temperature resolution Register:
- * - all 0s
- *
- */
-static int SkI2cInit1(
-SK_AC	*pAC,	/* Adapter Context */
-SK_IOC	IoC)	/* I/O Context */
-{
-    int i;
-    SK_U8 I2cSwCtrl;
-	SK_GEPORT *pPrt;	/* GIni Port struct pointer */
-
-	if (pAC->I2c.InitLevel != SK_INIT_DATA) {
-		/* ReInit not needed in I2C module */
-		return(0);
-	}
-
-    /* Set the Direction of I2C-Data Pin to IN */
-    SK_I2C_CLR_BIT(IoC, I2C_DATA_DIR | I2C_DATA);
-    /* Check for 32-Bit Yukon with Low at I2C-Data Pin */
-	SK_I2C_GET_SW(IoC, &I2cSwCtrl);
-
-	if ((I2cSwCtrl & I2C_DATA) == 0) {
-		/* this is a 32-Bit board */
-		pAC->GIni.GIYukon32Bit = SK_TRUE;
-        return(0);
-    }
-
-	/* Check for 64 Bit Yukon without sensors */
-	if (SkI2cWrite(pAC, IoC, 0, LM80_ADDR, I2C_025K_DEV, LM80_CFG, 0) != 0) {
-        return(0);
-    }
-
-	(void)SkI2cWrite(pAC, IoC, 0xffUL, LM80_ADDR, I2C_025K_DEV, LM80_IMSK_1, 0);
-	
-	(void)SkI2cWrite(pAC, IoC, 0xffUL, LM80_ADDR, I2C_025K_DEV, LM80_IMSK_2, 0);
-	
-	(void)SkI2cWrite(pAC, IoC, 0, LM80_ADDR, I2C_025K_DEV, LM80_FAN_CTRL, 0);
-	
-	(void)SkI2cWrite(pAC, IoC, 0, LM80_ADDR, I2C_025K_DEV, LM80_TEMP_CTRL, 0);
-	
-	(void)SkI2cWrite(pAC, IoC, (SK_U32)LM80_CFG_START, LM80_ADDR, I2C_025K_DEV,
-		LM80_CFG, 0);
-	
-	/*
-	 * MaxSens has to be updated here, because PhyType is not
-	 * set when performing Init Level 0
-	 */
-    pAC->I2c.MaxSens = 5;
-	
-	pPrt = &pAC->GIni.GP[0];
-	
-	if (pAC->GIni.GIGenesis) {
-		if (pPrt->PhyType == SK_PHY_BCOM) {
-			if (pAC->GIni.GIMacsFound == 1) {
-				pAC->I2c.MaxSens += 1;
-			}
-			else {
-				pAC->I2c.MaxSens += 3;
-			}
-		}
-	}
-	else {
-		pAC->I2c.MaxSens += 3;
-	}
-	
-	for (i = 0; i < pAC->I2c.MaxSens; i++) {
-		switch (i) {
-		case 0:
-			pAC->I2c.SenTable[i].SenDesc = "Temperature";
-			pAC->I2c.SenTable[i].SenType = SK_SEN_TEMP;
-			pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_TEMP_HIGH_ERR;
-			pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_TEMP_HIGH_WARN;
-			pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_TEMP_LOW_WARN;
-			pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_TEMP_LOW_ERR;
-			pAC->I2c.SenTable[i].SenReg = LM80_TEMP_IN;
-			break;
-		case 1:
-			pAC->I2c.SenTable[i].SenDesc = "Voltage PCI";
-			pAC->I2c.SenTable[i].SenType = SK_SEN_VOLT;
-			pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_PCI_5V_HIGH_ERR;
-			pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_PCI_5V_HIGH_WARN;
-			pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_PCI_5V_LOW_WARN;
-			pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_PCI_5V_LOW_ERR;
-			pAC->I2c.SenTable[i].SenReg = LM80_VT0_IN;
-			break;
-		case 2:
-			pAC->I2c.SenTable[i].SenDesc = "Voltage PCI-IO";
-			pAC->I2c.SenTable[i].SenType = SK_SEN_VOLT;
-			pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_PCI_IO_5V_HIGH_ERR;
-			pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_PCI_IO_5V_HIGH_WARN;
-			pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_PCI_IO_3V3_LOW_WARN;
-			pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_PCI_IO_3V3_LOW_ERR;
-			pAC->I2c.SenTable[i].SenReg = LM80_VT1_IN;
-			pAC->I2c.SenTable[i].SenInit = SK_SEN_DYN_INIT_PCI_IO;
-			break;
-		case 3:
-			pAC->I2c.SenTable[i].SenDesc = "Voltage ASIC";
-			pAC->I2c.SenTable[i].SenType = SK_SEN_VOLT;
-			pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_VDD_HIGH_ERR;
-			pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_VDD_HIGH_WARN;
-			pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_VDD_LOW_WARN;
-			pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_VDD_LOW_ERR;
-			pAC->I2c.SenTable[i].SenReg = LM80_VT2_IN;
-			break;
-		case 4:
-			if (pAC->GIni.GIGenesis) {
-				if (pPrt->PhyType == SK_PHY_BCOM) {
-					pAC->I2c.SenTable[i].SenDesc = "Voltage PHY A PLL";
-					pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_PLL_3V3_HIGH_ERR;
-					pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_PLL_3V3_HIGH_WARN;
-					pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_PLL_3V3_LOW_WARN;
-					pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_PLL_3V3_LOW_ERR;
-				}
-				else {
-					pAC->I2c.SenTable[i].SenDesc = "Voltage PMA";
-					pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_PLL_3V3_HIGH_ERR;
-					pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_PLL_3V3_HIGH_WARN;
-					pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_PLL_3V3_LOW_WARN;
-					pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_PLL_3V3_LOW_ERR;
-				}
-			}
-			else {
-				pAC->I2c.SenTable[i].SenDesc = "Voltage VAUX";
-				pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_VAUX_3V3_HIGH_ERR;
-				pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_VAUX_3V3_HIGH_WARN;
-				if (pAC->GIni.GIVauxAvail) {
-					pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_VAUX_3V3_LOW_WARN;
-					pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_VAUX_3V3_LOW_ERR;
-				}
-				else {
-					pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_VAUX_0V_WARN_ERR;
-					pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_VAUX_0V_WARN_ERR;
-				}
-			}
-			pAC->I2c.SenTable[i].SenType = SK_SEN_VOLT;
-			pAC->I2c.SenTable[i].SenReg = LM80_VT3_IN;
-			break;
-		case 5:
-			if (pAC->GIni.GIGenesis) {
-				pAC->I2c.SenTable[i].SenDesc = "Voltage PHY 2V5";
-				pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_PHY_2V5_HIGH_ERR;
-				pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_PHY_2V5_HIGH_WARN;
-				pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_PHY_2V5_LOW_WARN;
-				pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_PHY_2V5_LOW_ERR;
-			}
-			else {
-				pAC->I2c.SenTable[i].SenDesc = "Voltage Core 1V5";
-				pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_CORE_1V5_HIGH_ERR;
-				pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_CORE_1V5_HIGH_WARN;
-				pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_CORE_1V5_LOW_WARN;
-				pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_CORE_1V5_LOW_ERR;
-			}
-			pAC->I2c.SenTable[i].SenType = SK_SEN_VOLT;
-			pAC->I2c.SenTable[i].SenReg = LM80_VT4_IN;
-			break;
-		case 6:
-			if (pAC->GIni.GIGenesis) {
-				pAC->I2c.SenTable[i].SenDesc = "Voltage PHY B PLL";
-			}
-			else {
-				pAC->I2c.SenTable[i].SenDesc = "Voltage PHY 3V3";
-			}
-			pAC->I2c.SenTable[i].SenType = SK_SEN_VOLT;
-			pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_PLL_3V3_HIGH_ERR;
-			pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_PLL_3V3_HIGH_WARN;
-			pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_PLL_3V3_LOW_WARN;
-			pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_PLL_3V3_LOW_ERR;
-			pAC->I2c.SenTable[i].SenReg = LM80_VT5_IN;
-			break;
-		case 7:
-			if (pAC->GIni.GIGenesis) {
-				pAC->I2c.SenTable[i].SenDesc = "Speed Fan";
-				pAC->I2c.SenTable[i].SenType = SK_SEN_FAN;
-				pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_FAN_HIGH_ERR;
-				pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_FAN_HIGH_WARN;
-				pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_FAN_LOW_WARN;
-				pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_FAN_LOW_ERR;
-				pAC->I2c.SenTable[i].SenReg = LM80_FAN2_IN;
-			}
-			else {
-				pAC->I2c.SenTable[i].SenDesc = "Voltage PHY 2V5";
-				pAC->I2c.SenTable[i].SenType = SK_SEN_VOLT;
-				pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_PHY_2V5_HIGH_ERR;
-				pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_PHY_2V5_HIGH_WARN;
-				pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_PHY_2V5_LOW_WARN;
-				pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_PHY_2V5_LOW_ERR;
-				pAC->I2c.SenTable[i].SenReg = LM80_VT6_IN;
-			}
-			break;
-		default:
-			SK_ERR_LOG(pAC, SK_ERRCL_INIT | SK_ERRCL_SW,
-				SKERR_I2C_E001, SKERR_I2C_E001MSG);
-			break;
-		}
-
-		pAC->I2c.SenTable[i].SenValue = 0;
-		pAC->I2c.SenTable[i].SenErrFlag = SK_SEN_ERR_OK;
-		pAC->I2c.SenTable[i].SenErrCts = 0;
-		pAC->I2c.SenTable[i].SenBegErrTS = 0;
-		pAC->I2c.SenTable[i].SenState = SK_SEN_IDLE;
-		pAC->I2c.SenTable[i].SenRead = SkLm80ReadSensor;
-		pAC->I2c.SenTable[i].SenDev = LM80_ADDR;
-	}
-
-#ifndef SK_DIAG
-	pAC->I2c.DummyReads = pAC->I2c.MaxSens;
-#endif /* !SK_DIAG */
-	
-	/* Clear I2C IRQ */
-	SK_OUT32(IoC, B2_I2C_IRQ, I2C_CLR_IRQ);
-	
-	/* Now we are I/O initialized */
-	pAC->I2c.InitLevel = SK_INIT_IO;
-	return(0);
-}	/* SkI2cInit1 */
-
-
-/*
- * Init level 2: Start first sensor read.
- */
-static int SkI2cInit2(
-SK_AC	*pAC,	/* Adapter Context */
-SK_IOC	IoC)	/* I/O Context */
-{
-	int		ReadComplete;
-	SK_SENSOR	*pSen;
-
-	if (pAC->I2c.InitLevel != SK_INIT_IO) {
-		/* ReInit not needed in I2C module */
-		/* Init0 and Init2 not permitted */
-		return(0);
-	}
-
-	pSen = &pAC->I2c.SenTable[pAC->I2c.CurrSens];
-	ReadComplete = SkI2cReadSensor(pAC, IoC, pSen);
-
-	if (ReadComplete) {
-		SK_ERR_LOG(pAC, SK_ERRCL_INIT, SKERR_I2C_E008, SKERR_I2C_E008MSG);
-	}
-
-	/* Now we are correctly initialized */
-	pAC->I2c.InitLevel = SK_INIT_RUN;
-
-	return(0);
-}	/* SkI2cInit2*/
-
-
-/*
- * Initialize I2C devices
- *
- * Get the first voltage value and discard it.
- * Go into temperature read mode. A default pointer is not set.
- *
- * The things to be done depend on the init level in the parameter list:
- * Level 0:
- *	Initialize only the data structures. Do NOT access hardware.
- * Level 1:
- *	Initialize hardware through SK_IN / SK_OUT commands. Do NOT use interrupts.
- * Level 2:
- *	Everything is possible. Interrupts may be used from now on.
- *
- * return:
- *	0 = success
- *	other = error.
- */
-int	SkI2cInit(
-SK_AC	*pAC,	/* Adapter Context */
-SK_IOC	IoC,	/* I/O Context needed in levels 1 and 2 */
-int		Level)	/* Init Level */
-{
-
-	switch (Level) {
-	case SK_INIT_DATA:
-		return(SkI2cInit0(pAC));
-	case SK_INIT_IO:
-		return(SkI2cInit1(pAC, IoC));
-	case SK_INIT_RUN:
-		return(SkI2cInit2(pAC, IoC));
-	default:
-		break;
-	}
-
-	return(0);
-}	/* SkI2cInit */
-
-
-#ifndef SK_DIAG
-
-/*
- * Interrupt service function for the I2C Interface
- *
- * Clears the Interrupt source
- *
- * Reads the register and check it for sending a trap.
- *
- * Starts the timer if necessary.
- */
-void SkI2cIsr(
-SK_AC	*pAC,	/* Adapter Context */
-SK_IOC	IoC)	/* I/O Context */
-{
-	SK_EVPARA	Para;
-
-	/* Clear I2C IRQ */
-	SK_OUT32(IoC, B2_I2C_IRQ, I2C_CLR_IRQ);
-
-	Para.Para64 = 0;
-	SkEventQueue(pAC, SKGE_I2C, SK_I2CEV_IRQ, Para);
-}	/* SkI2cIsr */
-
-
-/*
- * Check this sensors Value against the threshold and send events.
- */
-static void SkI2cCheckSensor(
-SK_AC		*pAC,	/* Adapter Context */
-SK_SENSOR	*pSen)
-{
-	SK_EVPARA	ParaLocal;
-	SK_BOOL		TooHigh;	/* Is sensor too high? */
-	SK_BOOL		TooLow;		/* Is sensor too low? */
-	SK_U64		CurrTime;	/* Current Time */
-	SK_BOOL		DoTrapSend;	/* We need to send a trap */
-	SK_BOOL		DoErrLog;	/* We need to log the error */
-	SK_BOOL		IsError;	/* We need to log the error */
-
-	/* Check Dummy Reads first */
-	if (pAC->I2c.DummyReads > 0) {
-		pAC->I2c.DummyReads--;
-		return;
-	}
-
-	/* Get the current time */
-	CurrTime = SkOsGetTime(pAC);
-
-	/* Set para to the most useful setting: The current sensor. */
-	ParaLocal.Para64 = (SK_U64)pAC->I2c.CurrSens;
-
-	/* Check the Value against the thresholds. First: Error Thresholds */
-	TooHigh = (pSen->SenValue > pSen->SenThreErrHigh);
-	TooLow = (pSen->SenValue < pSen->SenThreErrLow);
-		
-	IsError = SK_FALSE;
-	if (TooHigh || TooLow) {
-		/* Error condition is satisfied */
-		DoTrapSend = SK_TRUE;
-		DoErrLog = SK_TRUE;
-
-		/* Now error condition is satisfied */
-		IsError = SK_TRUE;
-
-		if (pSen->SenErrFlag == SK_SEN_ERR_ERR) {
-			/* This state is the former one */
-
-			/* So check first whether we have to send a trap */
-			if (pSen->SenLastErrTrapTS + SK_SEN_ERR_TR_HOLD >
-			    CurrTime) {
-				/*
-				 * Do NOT send the Trap. The hold back time
-				 * has to run out first.
-				 */
-				DoTrapSend = SK_FALSE;
-			}
-
-			/* Check now whether we have to log an Error */
-			if (pSen->SenLastErrLogTS + SK_SEN_ERR_LOG_HOLD >
-			    CurrTime) {
-				/*
-				 * Do NOT log the error. The hold back time
-				 * has to run out first.
-				 */
-				DoErrLog = SK_FALSE;
-			}
-		}
-		else {
-			/* We came from a different state -> Set Begin Time Stamp */
-			pSen->SenBegErrTS = CurrTime;
-			pSen->SenErrFlag = SK_SEN_ERR_ERR;
-		}
-
-		if (DoTrapSend) {
-			/* Set current Time */
-			pSen->SenLastErrTrapTS = CurrTime;
-			pSen->SenErrCts++;
-
-			/* Queue PNMI Event */
-			SkEventQueue(pAC, SKGE_PNMI, (TooHigh ?
-				SK_PNMI_EVT_SEN_ERR_UPP :
-				SK_PNMI_EVT_SEN_ERR_LOW),
-				ParaLocal);
-		}
-
-		if (DoErrLog) {
-			/* Set current Time */
-			pSen->SenLastErrLogTS = CurrTime;
-
-			if (pSen->SenType == SK_SEN_TEMP) {
-				SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_I2C_E011, SKERR_I2C_E011MSG);
-			}
-			else if (pSen->SenType == SK_SEN_VOLT) {
-				SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_I2C_E012, SKERR_I2C_E012MSG);
-			}
-			else {
-				SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_I2C_E015, SKERR_I2C_E015MSG);
-			}
-		}
-	}
-
-	/* Check the Value against the thresholds */
-	/* 2nd: Warning thresholds */
-	TooHigh = (pSen->SenValue > pSen->SenThreWarnHigh);
-	TooLow = (pSen->SenValue < pSen->SenThreWarnLow);
-		
-	if (!IsError && (TooHigh || TooLow)) {
-		/* Error condition is satisfied */
-		DoTrapSend = SK_TRUE;
-		DoErrLog = SK_TRUE;
-
-		if (pSen->SenErrFlag == SK_SEN_ERR_WARN) {
-			/* This state is the former one */
-
-			/* So check first whether we have to send a trap */
-			if (pSen->SenLastWarnTrapTS + SK_SEN_WARN_TR_HOLD > CurrTime) {
-				/*
-				 * Do NOT send the Trap. The hold back time
-				 * has to run out first.
-				 */
-				DoTrapSend = SK_FALSE;
-			}
-
-			/* Check now whether we have to log an Error */
-			if (pSen->SenLastWarnLogTS + SK_SEN_WARN_LOG_HOLD > CurrTime) {
-				/*
-				 * Do NOT log the error. The hold back time
-				 * has to run out first.
-				 */
-				DoErrLog = SK_FALSE;
-			}
-		}
-		else {
-			/* We came from a different state -> Set Begin Time Stamp */
-			pSen->SenBegWarnTS = CurrTime;
-			pSen->SenErrFlag = SK_SEN_ERR_WARN;
-		}
-
-		if (DoTrapSend) {
-			/* Set current Time */
-			pSen->SenLastWarnTrapTS = CurrTime;
-			pSen->SenWarnCts++;
-
-			/* Queue PNMI Event */
-			SkEventQueue(pAC, SKGE_PNMI, (TooHigh ?
-				SK_PNMI_EVT_SEN_WAR_UPP :
-				SK_PNMI_EVT_SEN_WAR_LOW),
-				ParaLocal);
-		}
-
-		if (DoErrLog) {
-			/* Set current Time */
-			pSen->SenLastWarnLogTS = CurrTime;
-
-			if (pSen->SenType == SK_SEN_TEMP) {
-				SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_I2C_E009, SKERR_I2C_E009MSG);
-			}
-			else if (pSen->SenType == SK_SEN_VOLT) {
-				SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_I2C_E010, SKERR_I2C_E010MSG);
-			}
-			else {
-				SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_I2C_E014, SKERR_I2C_E014MSG);
-			}
-		}
-	}
-
-	/* Check for NO error at all */
-	if (!IsError && !TooHigh && !TooLow) {
-		/* Set o.k. Status if no error and no warning condition */
-		pSen->SenErrFlag = SK_SEN_ERR_OK;
-	}
-
-	/* End of check against the thresholds */
-
-	/* Bug fix AF: 16.Aug.2001: Correct the init base
-	 * of LM80 sensor.
-	 */
-	if (pSen->SenInit == SK_SEN_DYN_INIT_PCI_IO) {
-
-        pSen->SenInit = SK_SEN_DYN_INIT_NONE;
-
-		if (pSen->SenValue > SK_SEN_PCI_IO_RANGE_LIMITER) {
-			/* 5V PCI-IO Voltage */
-			pSen->SenThreWarnLow = SK_SEN_PCI_IO_5V_LOW_WARN;
-			pSen->SenThreErrLow = SK_SEN_PCI_IO_5V_LOW_ERR;
-		}
-		else {
-			/* 3.3V PCI-IO Voltage */
-			pSen->SenThreWarnHigh = SK_SEN_PCI_IO_3V3_HIGH_WARN;
-			pSen->SenThreErrHigh = SK_SEN_PCI_IO_3V3_HIGH_ERR;
-		}
-	}
-	
-#ifdef TEST_ONLY
-    /* Dynamic thresholds also for VAUX of LM80 sensor */
-	if (pSen->SenInit == SK_SEN_DYN_INIT_VAUX) {
-
-        pSen->SenInit = SK_SEN_DYN_INIT_NONE;
-
-		/* 3.3V VAUX Voltage */
-		if (pSen->SenValue > SK_SEN_VAUX_RANGE_LIMITER) {
-			pSen->SenThreWarnLow = SK_SEN_VAUX_3V3_LOW_WARN;
-			pSen->SenThreErrLow = SK_SEN_VAUX_3V3_LOW_ERR;
-		}
-		/* 0V VAUX Voltage */
-		else {
-			pSen->SenThreWarnHigh = SK_SEN_VAUX_0V_WARN_ERR;
-			pSen->SenThreErrHigh = SK_SEN_VAUX_0V_WARN_ERR;
-		}
-	}
-
-	/*
-	 * Check initialization state:
-	 * The VIO Thresholds need adaption
-	 */
-	if (!pSen->SenInit && pSen->SenReg == LM80_VT1_IN &&
-	     pSen->SenValue > SK_SEN_WARNLOW2C &&
-	     pSen->SenValue < SK_SEN_WARNHIGH2) {
-		pSen->SenThreErrLow = SK_SEN_ERRLOW2C;
-		pSen->SenThreWarnLow = SK_SEN_WARNLOW2C;
-		pSen->SenInit = SK_TRUE;
-	}
-
-	if (!pSen->SenInit && pSen->SenReg == LM80_VT1_IN &&
-	     pSen->SenValue > SK_SEN_WARNLOW2 &&
-	     pSen->SenValue < SK_SEN_WARNHIGH2C) {
-		pSen->SenThreErrHigh = SK_SEN_ERRHIGH2C;
-		pSen->SenThreWarnHigh = SK_SEN_WARNHIGH2C;
-		pSen->SenInit = SK_TRUE;
-	}
-#endif
-
-	if (pSen->SenInit != SK_SEN_DYN_INIT_NONE) {
-		SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_I2C_E013, SKERR_I2C_E013MSG);
-	}
-}	/* SkI2cCheckSensor */
-
-
-/*
- * The only Event to be served is the timeout event
- *
- */
-int	SkI2cEvent(
-SK_AC		*pAC,	/* Adapter Context */
-SK_IOC		IoC,	/* I/O Context */
-SK_U32		Event,	/* Module specific Event */
-SK_EVPARA	Para)	/* Event specific Parameter */
-{
-	int			ReadComplete;
-	SK_SENSOR	*pSen;
-	SK_U32		Time;
-	SK_EVPARA	ParaLocal;
-	int			i;
-
-	/* New case: no sensors */
-	if (pAC->I2c.MaxSens == 0) {
-		return(0);
-	}
-
-	switch (Event) {
-	case SK_I2CEV_IRQ:
-		pSen = &pAC->I2c.SenTable[pAC->I2c.CurrSens];
-		ReadComplete = SkI2cReadSensor(pAC, IoC, pSen);
-
-		if (ReadComplete) {
-			/* Check sensor against defined thresholds */
-			SkI2cCheckSensor(pAC, pSen);
-
-			/* Increment Current sensor and set appropriate Timeout */
-			pAC->I2c.CurrSens++;
-			if (pAC->I2c.CurrSens >= pAC->I2c.MaxSens) {
-				pAC->I2c.CurrSens = 0;
-				Time = SK_I2C_TIM_LONG;
-			}
-			else {
-				Time = SK_I2C_TIM_SHORT;
-			}
-
-			/* Start Timer */
-			ParaLocal.Para64 = (SK_U64)0;
-
-			pAC->I2c.TimerMode = SK_TIMER_NEW_GAUGING;
-			
-			SkTimerStart(pAC, IoC, &pAC->I2c.SenTimer, Time,
-				SKGE_I2C, SK_I2CEV_TIM, ParaLocal);
-		}
-        else {
-			/* Start Timer */
-			ParaLocal.Para64 = (SK_U64)0;
-
-			pAC->I2c.TimerMode = SK_TIMER_WATCH_SM;
-
-            SkTimerStart(pAC, IoC, &pAC->I2c.SenTimer, SK_I2C_TIM_WATCH,
-				SKGE_I2C, SK_I2CEV_TIM, ParaLocal);
-		}
-		break;
-	case SK_I2CEV_TIM:
-		if (pAC->I2c.TimerMode == SK_TIMER_NEW_GAUGING) {
-
-			ParaLocal.Para64 = (SK_U64)0;
-			SkTimerStop(pAC, IoC, &pAC->I2c.SenTimer);
-
-			pSen = &pAC->I2c.SenTable[pAC->I2c.CurrSens];
-			ReadComplete = SkI2cReadSensor(pAC, IoC, pSen);
-
-			if (ReadComplete) {
-				/* Check sensor against defined thresholds */
-				SkI2cCheckSensor(pAC, pSen);
-
-				/* Increment Current sensor and set appropriate Timeout */
-				pAC->I2c.CurrSens++;
-				if (pAC->I2c.CurrSens == pAC->I2c.MaxSens) {
-					pAC->I2c.CurrSens = 0;
-					Time = SK_I2C_TIM_LONG;
-				}
-				else {
-					Time = SK_I2C_TIM_SHORT;
-				}
-
-				/* Start Timer */
-				ParaLocal.Para64 = (SK_U64)0;
-
-				pAC->I2c.TimerMode = SK_TIMER_NEW_GAUGING;
-
-				SkTimerStart(pAC, IoC, &pAC->I2c.SenTimer, Time,
-					SKGE_I2C, SK_I2CEV_TIM, ParaLocal);
-			}
-		}
-		else {
-			pSen = &pAC->I2c.SenTable[pAC->I2c.CurrSens];
-			pSen->SenErrFlag = SK_SEN_ERR_FAULTY;
-			SK_I2C_STOP(IoC);
-
-			/* Increment Current sensor and set appropriate Timeout */
-			pAC->I2c.CurrSens++;
-			if (pAC->I2c.CurrSens == pAC->I2c.MaxSens) {
-				pAC->I2c.CurrSens = 0;
-				Time = SK_I2C_TIM_LONG;
-			}
-			else {
-				Time = SK_I2C_TIM_SHORT;
-			}
-
-			/* Start Timer */
-			ParaLocal.Para64 = (SK_U64)0;
-
-			pAC->I2c.TimerMode = SK_TIMER_NEW_GAUGING;
-
-			SkTimerStart(pAC, IoC, &pAC->I2c.SenTimer, Time,
-				SKGE_I2C, SK_I2CEV_TIM, ParaLocal);
-		}
-		break;
-	case SK_I2CEV_CLEAR:
-		for (i = 0; i < SK_MAX_SENSORS; i++) {
-			pAC->I2c.SenTable[i].SenErrFlag = SK_SEN_ERR_OK;
-			pAC->I2c.SenTable[i].SenErrCts = 0;
-			pAC->I2c.SenTable[i].SenWarnCts = 0;
-			pAC->I2c.SenTable[i].SenBegErrTS = 0;
-			pAC->I2c.SenTable[i].SenBegWarnTS = 0;
-			pAC->I2c.SenTable[i].SenLastErrTrapTS = (SK_U64)0;
-			pAC->I2c.SenTable[i].SenLastErrLogTS = (SK_U64)0;
-			pAC->I2c.SenTable[i].SenLastWarnTrapTS = (SK_U64)0;
-			pAC->I2c.SenTable[i].SenLastWarnLogTS = (SK_U64)0;
-		}
-		break;
-	default:
-		SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_I2C_E006, SKERR_I2C_E006MSG);
-	}
-
-	return(0);
-}	/* SkI2cEvent*/
-
-#endif /* !SK_DIAG */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/sklm80.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/sklm80.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/sklm80.c	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/sklm80.c	2004-09-09 13:20:48.000000000 +0200
@@ -2,8 +2,8 @@
  *
  * Name:	sklm80.c
  * Project:	Gigabit Ethernet Adapters, TWSI-Module
- * Version:	$Revision: 1.22 $
- * Date:	$Date: 2003/10/20 09:08:21 $
+ * Version:	$Revision: 1.1 $
+ * Date:	$Date: 2003/12/19 14:02:31 $
  * Purpose:	Functions to access Voltage and Temperature Sensor (LM80)
  *
  ******************************************************************************/
@@ -27,7 +27,7 @@
 */
 #if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
 static const char SysKonnectFileId[] =
-	"@(#) $Id: sklm80.c,v 1.22 2003/10/20 09:08:21 rschmidt Exp $ (C) Marvell. ";
+	"@(#) $Id: sklm80.c,v 1.1 2003/12/19 14:02:31 mschmid Exp $ (C) Marvell. ";
 #endif
 
 #include "h/skdrv1st.h"		/* Driver Specific Definitions */
@@ -111,12 +111,12 @@ int		Reg)		/* register to read */
 /*
  * read a sensors value (LM80 specific)
  *
- * This function reads a sensors value from the I2C sensor chip LM80.
+ * This function reads a sensors value from the TWSI sensor chip LM80.
  * The sensor is defined by its index into the sensors database in the struct
  * pAC points to.
  *
  * Returns	1 if the read is completed
- *		0 if the read must be continued (I2C Bus still allocated)
+ *		0 if the read must be continued (TWSI Bus still allocated)
  */
 int SkLm80ReadSensor(
 SK_AC		*pAC,	/* Adapter Context */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/skproc.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/skproc.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/skproc.c	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/skproc.c	2004-09-09 13:20:48.000000000 +0200
@@ -2,28 +2,37 @@
  *
  * Name:	skproc.c
  * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.12 $
- * Date:	$Date: 2004/02/18 13:32:54 $
- * Purpose:	Funktions to display statictic data
+ * Version:	$Revision: 1.14 $
+ * Date:	$Date: 2004/07/26 15:01:36 $
+ * Purpose:	Functions to display statictic data
  *
  ******************************************************************************/
  
 /******************************************************************************
  *
  *	(C)Copyright 1998-2002 SysKonnect GmbH.
- *	(C)Copyright 2002-2003 Marvell.
+ *	(C)Copyright 2002-2004 Marvell.
  *
+ *	Driver for Marvell Yukon/2 chipset and SysKonnect Gigabit Ethernet 
+ *      Server Adapters.
+ *
+ *	Author: Ralph Roesler (rroesler@syskonnect.de)
+ *	        Mirko Lindner (mlindner@syskonnect.de)
+ *
+ *	Address all question to: linux@syskonnect.de
+ *
+ *	The technical manual for the adapters is available from SysKonnect's
+ *	web pages: www.syskonnect.com
+ *	
  *	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.
  *
- *	Created 22-Nov-2000
- *	Author: Mirko Lindner (mlindner@syskonnect.de)
- *
  *	The information in this file is provided "AS IS" without warranty.
  *
- ******************************************************************************/
+ *****************************************************************************/
+
 #include <linux/proc_fs.h>
 
 #include "h/skdrv1st.h"
@@ -31,9 +40,16 @@
 #include "h/skversion.h"
 
 extern struct SK_NET_DEVICE *SkGeRootDev;
+
+/******************************************************************************
+ *
+ * Local Function Prototypes and Local Variables
+ *
+ *****************************************************************************/
+
 static int sk_proc_print(void *writePtr, char *format, ...);
 static void sk_gen_browse(void *buffer);
-int len;
+static int len;
 
 struct proc_dir_entry *file = NULL;
 
@@ -42,19 +58,21 @@ struct proc_dir_entry *file = NULL;
  *      sk_proc_read - show proc information of a particular adapter
  *
  * Description:
- *  This function fills the proc entry with statistic data about 
- *  the ethernet device. It invokes the generic sk_gen_browse() to
- *  print out all items one per one.
+ *	This function fills the proc entry with statistic data about 
+ *	the ethernet device. It invokes the generic sk_gen_browse() to
+ *	print out all items one per one.
  *  
- * Returns: number of bytes written
+ * Returns:
+ *	the number of bytes written
  *      
  */
-int sk_proc_read(char   *buffer,
-		char  **buffer_location,
-		off_t   offset,
-		int     buffer_length,
-		int    *eof,
-		void   *data)
+int sk_proc_read(
+char   *buffer,           /* the buffer holding the display results */
+char  **buffer_location,  /* the buffer location                    */
+off_t   offset,           /* additional offset                      */
+int     buffer_length,    /* total buffer length                    */
+int    *eof,              /* End Of File (EOF) indication           */
+void   *data)             /* the data pointer                       */
 {
 	void *castedBuffer = (void *) buffer;
 	file               = (struct proc_dir_entry*) data;
@@ -78,13 +96,14 @@ int sk_proc_read(char   *buffer,
  * 	sk_gen_browse -generic  print "summaries" entry 
  *
  * Description:
- *  This function fills the proc entry with statistic data about 
- *  the ethernet device.
+ *	This function fills the proc entry with statistic data about 
+ *	the ethernet device.
  *  
- * Returns: -
+ * Returns:	N/A
  *	
  */
-static void sk_gen_browse(void *buffer)
+static void sk_gen_browse(
+void *buffer)  /* buffer where the statistics will be stored in */
 {
 	struct SK_NET_DEVICE	*SkgeProcDev = SkGeRootDev;
 	struct SK_NET_DEVICE	*next;
@@ -120,7 +139,6 @@ static void sk_gen_browse(void *buffer)
 			spin_lock_irqsave(&pAC->SlowPathLock, Flags);
 			Size = SK_PNMI_STRUCT_SIZE;
 			DisableStatistic = 0;
-#ifdef SK_DIAG_SUPPORT
 			if (pAC->BoardLevel == SK_INIT_DATA) {
 				SK_MEMCPY(&(pAC->PnmiStruct), &(pAC->PnmiBackup), sizeof(SK_PNMI_STRUCT_DATA));
 				if (pAC->DiagModeActive == DIAG_NOTACTIVE) {
@@ -129,12 +147,7 @@ static void sk_gen_browse(void *buffer)
 			} else {
 				SkPnmiGetStruct(pAC, pAC->IoBase, pPnmiStruct, &Size, t-1);
 			}
-#else
-			SkPnmiGetStruct(pAC, pAC->IoBase, 
-				pPnmiStruct, &Size, t-1);
-#endif
 			spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
-	
 			if (strcmp(pAC->dev[t-1]->name, file->name) == 0) {
 				if (!pAC->GIni.GIYukon32Bit)
 					card_type = 64;
@@ -155,6 +168,10 @@ static void sk_gen_browse(void *buffer)
 					"Card name                      %s\n",
 					pAC->DeviceStr);
 				len += sk_proc_print(buffer,
+					"Vendor/Device ID               %x/%x\n",
+					pAC->PciDev->vendor,
+					pAC->PciDev->device);
+				len += sk_proc_print(buffer,
 					"Card type (Bit)                %d\n",
 					card_type);
 					
@@ -179,28 +196,37 @@ static void sk_gen_browse(void *buffer)
 					len += sk_proc_print(buffer,
 					"Interrupt Moderation           disabled\n");
 
+				if (CHIP_ID_YUKON_2(pAC)) {
+					len += sk_proc_print(buffer,
+						"Bus type                       PCI Express\n",
+						pPnmiStruct->BusSpeed);
+				} else {
+					len += sk_proc_print(buffer,
+						"Bus speed (MHz)                %d\n",
+						pPnmiStruct->BusSpeed);
+					len += sk_proc_print(buffer,
+						"Bus width (Bit)                %d\n",
+						pPnmiStruct->BusWidth);
+				}
 				len += sk_proc_print(buffer,
-					"Bus speed (MHz)                %d\n",
-					pPnmiStruct->BusSpeed);
-				len += sk_proc_print(buffer,
-					"Bus width (Bit)                %d\n",
-					pPnmiStruct->BusWidth);
-				
+					"Driver version                 %s (%s)\n",
+					VER_STRING, PATCHLEVEL);
 				len += sk_proc_print(buffer,
-					"Driver version                 %s\n",
-					VER_STRING);
+					"Driver release date            %s\n",
+					pAC->Pnmi.pDriverReleaseDate);
 				len += sk_proc_print(buffer,
 					"Hardware revision              v%d.%d\n",
 					(pAC->GIni.GIPciHwRev >> 4) & 0x0F,
 					pAC->GIni.GIPciHwRev & 0x0F);
 
-				if (pAC->BoardLevel < 2) {
+				if (!pNet->Up) {
 					len += sk_proc_print(buffer,
-						"\n      No interface assigned to card.\n"
-						"      Therefore no statistics available.\n"
+						"\n      Device %s is down.\n"
+						"      Therefore no statistics are available.\n"
 						"      After bringing the device up (ifconfig)"
 						" statistics will\n"
-						"      be displayed.\n");
+						"      be displayed.\n",
+						pAC->dev[t-1]->name);
 					DisableStatistic = 1;
 				}
 
@@ -283,6 +309,7 @@ static void sk_gen_browse(void *buffer)
 					len += sk_proc_print(buffer,
 						"Received multicast             %Lu\n",
 						(unsigned long long) pPnmiStat->StatRxMulticastOkCts);
+#ifdef ADVANCED_STATISTIC_OUTPUT
 					len += sk_proc_print(buffer,
 						"Receive error types\n");
 					len += sk_proc_print(buffer,
@@ -325,17 +352,17 @@ static void sk_gen_browse(void *buffer)
 					len += sk_proc_print(buffer,
 						"   jabber                      %Lu\n",
 						(unsigned long long) pPnmiStat->StatRxJabberCts);				
-
+#endif
 
 					/*Transmit statistics */
 					len += sk_proc_print(buffer, 
 					"\nTransmit statistics\n\n");
 				
 					len += sk_proc_print(buffer,
-						"Transmited bytes               %Lu\n",
+						"Transmitted bytes              %Lu\n",
 						(unsigned long long) pPnmiStat->StatTxOctetsOkCts);
 					len += sk_proc_print(buffer,
-						"Transmited packets             %Lu\n",
+						"Transmitted packets            %Lu\n",
 						(unsigned long long) pPnmiStat->StatTxOkCts);
 					len += sk_proc_print(buffer,
 						"Transmit errors                %Lu\n",
@@ -346,6 +373,7 @@ static void sk_gen_browse(void *buffer)
 					len += sk_proc_print(buffer,
 						"Transmit collisions            %Lu\n",
 						(unsigned long long) pPnmiStat->StatTxSingleCollisionCts);
+#ifdef ADVANCED_STATISTIC_OUTPUT
 					len += sk_proc_print(buffer,
 						"Transmit error types\n");
 					len += sk_proc_print(buffer,
@@ -363,6 +391,7 @@ static void sk_gen_browse(void *buffer)
 					len += sk_proc_print(buffer,
 						"   window                      %ld\n",
 						pAC->stats.tx_window_errors);
+#endif
 				} /* if (!DisableStatistic) */
 				
 			} /* if (strcmp(pACname, currDeviceName) == 0) */
@@ -373,16 +402,20 @@ static void sk_gen_browse(void *buffer)
 
 /*****************************************************************************
  *
- *      sk_proc_print -generic line print  
+ *      sk_proc_print - generic line print  
  *
  * Description:
- *  This function fills the proc entry with statistic data about 
- *  the ethernet device.
+ *	This function fills the proc entry with statistic data about the 
+ *	ethernet device.
  *  
- * Returns: number of bytes written
+ * Returns:
+ *	the number of bytes written
  *      
  */ 
-static int sk_proc_print(void *writePtr, char *format, ...)
+static int sk_proc_print(
+void *writePtr, /* the buffer pointer         */
+char *format,   /* the format of the string   */
+...)            /* variable list of arguments */
 {   
 #define MAX_LEN_SINGLE_LINE 256
 	char     str[MAX_LEN_SINGLE_LINE];
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/skqueue.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/skqueue.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/skqueue.c	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/skqueue.c	2004-09-09 13:20:48.000000000 +0200
@@ -2,8 +2,8 @@
  *
  * Name:	skqueue.c
  * Project:	Gigabit Ethernet Adapters, Event Scheduler Module
- * Version:	$Revision: 1.20 $
- * Date:	$Date: 2003/09/16 13:44:00 $
+ * Version:	$Revision: 2.3 $
+ * Date:	$Date: 2004/05/14 13:28:18 $
  * Purpose:	Management of an event queue.
  *
  ******************************************************************************/
@@ -28,7 +28,7 @@
  */
 #if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
 static const char SysKonnectFileId[] =
-	"@(#) $Id: skqueue.c,v 1.20 2003/09/16 13:44:00 rschmidt Exp $ (C) Marvell.";
+	"@(#) $Id: skqueue.c,v 2.3 2004/05/14 13:28:18 malthoff Exp $ (C) Marvell.";
 #endif
 
 #include "h/skdrv1st.h"		/* Driver Specific Definitions */
@@ -48,10 +48,16 @@ intro()
 
 #define PRINTF(a,b,c)
 
-/*
- * init event queue management
+/******************************************************************************
+ *
+ *	SkEventInit() - init event queue management
  *
- * Must be called during init level 0.
+ * Description:
+ * 	This function initializes event queue management.
+ *	It must be called during init level 0.
+ *
+ * Returns:
+ *	nothing
  */
 void	SkEventInit(
 SK_AC	*pAC,	/* Adapter context */
@@ -67,8 +73,17 @@ int		Level)	/* Init level */
 	}
 }
 
-/*
- * add event to queue
+/******************************************************************************
+ *
+ *	SkEventQueue()	-	add event to queue
+ *
+ * Description:
+ *	This function adds an event to the event queue.
+ *	At least Init Level 1 is required to queue events,
+ *	but will be scheduled add Init Level 2.
+ *
+ * returns:
+ *	nothing
  */
 void	SkEventQueue(
 SK_AC		*pAC,	/* Adapters context */
@@ -76,26 +91,45 @@ SK_U32		Class,	/* Event Class */
 SK_U32		Event,	/* Event to be queued */
 SK_EVPARA	Para)	/* Event parameter */
 {
-	pAC->Event.EvPut->Class = Class;
-	pAC->Event.EvPut->Event = Event;
-	pAC->Event.EvPut->Para = Para;
+
+	if (pAC->GIni.GILevel == SK_INIT_DATA) {
+		SK_ERR_LOG(pAC, SK_ERRCL_NORES, SKERR_Q_E003, SKERR_Q_E003MSG);
+	}
+	else {
+		pAC->Event.EvPut->Class = Class;
+		pAC->Event.EvPut->Event = Event;
+		pAC->Event.EvPut->Para = Para;
 	
-	if (++pAC->Event.EvPut == &pAC->Event.EvQueue[SK_MAX_EVENT])
-		pAC->Event.EvPut = pAC->Event.EvQueue;
+		if (++pAC->Event.EvPut == &pAC->Event.EvQueue[SK_MAX_EVENT])
+			pAC->Event.EvPut = pAC->Event.EvQueue;
 
-	if (pAC->Event.EvPut == pAC->Event.EvGet) {
-		SK_ERR_LOG(pAC, SK_ERRCL_NORES, SKERR_Q_E001, SKERR_Q_E001MSG);
+		if (pAC->Event.EvPut == pAC->Event.EvGet) {
+			SK_ERR_LOG(pAC, SK_ERRCL_NORES, SKERR_Q_E001, SKERR_Q_E001MSG);
+		}
 	}
 }
 
-/*
- * event dispatcher
- *	while event queue is not empty
- *		get event from queue
- *		send command to state machine
- *	end
- *	return error reported by individual Event function
- *		0 if no error occured.
+/******************************************************************************
+ *
+ *	SkEventDispatcher() -	 Event Dispatcher
+ *
+ * Description:
+ *	The event dispatcher performs the following operations:
+ *		o while event queue is not empty
+ *			- get event from queue
+ *			- send event to state machine
+ *		  end
+ *
+ * CAUTION:
+ *	The event functions MUST report an error if performing a reinitialization
+ *	of the event queue, e.g. performing level Init 0..2 while in dispatcher
+ *	call!
+ *  ANY OTHER return value delays scheduling the other events in the
+ *	queue. In this case the event blocks the queue until
+ *  the error condition is cleared!
+ *
+ * Returns:
+ *	The return value error reported by individual event function
  */
 int	SkEventDispatcher(
 SK_AC	*pAC,	/* Adapters Context */
@@ -105,6 +139,10 @@ SK_IOC	Ioc)	/* Io context */
 	SK_U32			Class;
 	int			Rtv;
 
+	if (pAC->GIni.GILevel != SK_INIT_RUN) {
+		SK_ERR_LOG(pAC, SK_ERRCL_NORES, SKERR_Q_E005, SKERR_Q_E005MSG);
+	}
+
 	pEv = pAC->Event.EvGet;
 	
 	PRINTF("dispatch get %x put %x\n", pEv, pAC->Event.ev_put);
@@ -152,6 +190,11 @@ SK_IOC	Ioc)	/* Io context */
 			Rtv = SkFdEvent(pAC, Ioc, pEv->Event, pEv->Para);
 			break;
 #endif /* SK_USE_LAC_EV */
+#ifdef SK_ASF
+		case SKGE_ASF :
+			Rtv = SkAsfEvent(pAC,Ioc,pEv->Event,pEv->Para);
+			break ;
+#endif
 #ifdef	SK_USE_CSUM
 		case SKGE_CSUM :
 			Rtv = SkCsEvent(pAC, Ioc, pEv->Event, pEv->Para);
@@ -163,6 +206,20 @@ SK_IOC	Ioc)	/* Io context */
 		}
 
 		if (Rtv != 0) {
+			/* 
+			 * Special Case: See CAUTION statement above.
+			 * We assume the event queue is reset.
+			 */
+			if (pAC->Event.EvGet != pAC->Event.EvQueue &&
+				pAC->Event.EvGet != pEv) {
+				/*
+				 * Create an error log entry if the
+				 * event queue isn't reset.
+				 * In this case it may be blocked.
+				 */
+				SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_Q_E004, SKERR_Q_E004MSG);
+			}
+
 			return(Rtv);
 		}
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/skrlmt.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/skrlmt.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/skrlmt.c	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/skrlmt.c	2004-09-09 13:20:49.000000000 +0200
@@ -2,8 +2,8 @@
  *
  * Name:	skrlmt.c
  * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.69 $
- * Date:	$Date: 2003/04/15 09:39:22 $
+ * Version:	$Revision: 2.2 $
+ * Date:	$Date: 2003/11/24 12:27:57 $
  * Purpose:	Manage links on SK-NET Adapters, esp. redundant ones.
  *
  ******************************************************************************/
@@ -39,7 +39,7 @@
 
 #ifndef	lint
 static const char SysKonnectFileId[] =
-	"@(#) $Id: skrlmt.c,v 1.69 2003/04/15 09:39:22 tschilli Exp $ (C) Marvell.";
+	"@(#) $Id: skrlmt.c,v 2.2 2003/11/24 12:27:57 mkarl Exp $ (C) Marvell.";
 #endif	/* !defined(lint) */
 
 #define __SKRLMT_C
@@ -350,7 +350,7 @@ int		Level)	/* Initialization Level */
     SK_BOOL		PhysicalAMacAddressSet;
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_INIT,
-		("RLMT Init level %d.\n", Level))
+		("RLMT Init level %d.\n", Level));
 
 	switch (Level) {
 	case SK_INIT_DATA:	/* Initialize data structures. */
@@ -390,7 +390,7 @@ int		Level)	/* Initialization Level */
 
 	case SK_INIT_IO:	/* GIMacsFound first available here. */
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_INIT,
-			("RLMT: %d MACs were detected.\n", pAC->GIni.GIMacsFound))
+			("RLMT: %d MACs were detected.\n", pAC->GIni.GIMacsFound));
 
 		pAC->Rlmt.Net[0].NumPorts = pAC->GIni.GIMacsFound;
 
@@ -512,7 +512,7 @@ SK_U32	NetIdx)	/* Net Number */
 	}
 			
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-		("SkRlmtBuildCheckChain.\n"))
+		("SkRlmtBuildCheckChain.\n"));
 
 	NumMacsUp = 0;
 
@@ -558,7 +558,7 @@ SK_U32	NetIdx)	/* Net Number */
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
 			("Port %d checks %d other ports: %2X.\n", i,
 				pAC->Rlmt.Net[NetIdx].Port[i]->PortsChecked,
-				pAC->Rlmt.Net[NetIdx].Port[i]->PortCheck[0].CheckAddr.a[5]))
+				pAC->Rlmt.Net[NetIdx].Port[i]->PortCheck[0].CheckAddr.a[5]));
 	}
 #endif	/* DEBUG */
 
@@ -604,7 +604,7 @@ SK_MAC_ADDR	*DestAddr)	/* Destination ad
 	if ((CheckSrc == 0) || (CheckDest == 0)) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_ERR,
 			("SkRlmtBuildPacket: Invalid %s%saddr.\n",
-			 (CheckSrc == 0 ? "Src" : ""), (CheckDest == 0 ? "Dest" : "")))
+			 (CheckSrc == 0 ? "Src" : ""), (CheckDest == 0 ? "Dest" : "")));
 	}
 #endif
 
@@ -796,7 +796,7 @@ SK_U32	PortNumber)	/* Sending port */
 
 			SkEventQueue(pAC, SKGE_DRV, SK_DRV_RLMT_SEND, Para);
 			SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_TX,
-				("SkRlmtSend: BPDU Packet on Port %u.\n", PortNumber))
+				("SkRlmtSend: BPDU Packet on Port %u.\n", PortNumber));
 		}
 	}
 	return;
@@ -835,7 +835,7 @@ SK_U32	PortNumber)		/* Port to check */
 		 * Bring it up.
 		 */
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
-			("SkRlmtPacketReceive: Received on PortDown.\n"))
+			("SkRlmtPacketReceive: Received on PortDown.\n"));
 
 		pRPort->PortState = SK_RLMT_PS_GOING_UP;
 		pRPort->GuTimeStamp = SkOsGetTime(pAC);
@@ -849,7 +849,7 @@ SK_U32	PortNumber)		/* Port to check */
 	}	/* PortDown && !SuspectTx */
 	else if (pRPort->CheckingState & SK_RLMT_PCS_RX) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
-			("SkRlmtPacketReceive: Stop bringing port down.\n"))
+			("SkRlmtPacketReceive: Stop bringing port down.\n"));
 		SkTimerStop(pAC, IoC, &pRPort->DownRxTimer);
 		pRPort->CheckingState &= ~SK_RLMT_PCS_RX;
 		/* pAC->Rlmt.CheckSwitch = SK_TRUE; */
@@ -896,7 +896,7 @@ SK_MBUF	*pMb)	/* Received packet */
 	pRPort = &pAC->Rlmt.Port[PortNumber];
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
-		("SkRlmtPacketReceive: PortNumber == %d.\n", PortNumber))
+		("SkRlmtPacketReceive: PortNumber == %d.\n", PortNumber));
 
 	pRPacket = (SK_RLMT_PACKET*)pMb->pData;
 	pSPacket = (SK_SPTREE_PACKET*)pRPacket;
@@ -917,7 +917,7 @@ SK_MBUF	*pMb)	/* Received packet */
 
 		/* Not sent to current MAC or registered MC address => Trash it. */
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
-			("SkRlmtPacketReceive: Not for me.\n"))
+			("SkRlmtPacketReceive: Not for me.\n"));
 
 		SkDrvFreeRlmtMbuf(pAC, IoC, pMb);
 		return;
@@ -955,7 +955,7 @@ SK_MBUF	*pMb)	/* Received packet */
 			pRPacket->Indicator[5] == SK_RLMT_INDICATOR5 &&
 			pRPacket->Indicator[6] == SK_RLMT_INDICATOR6) {
 			SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
-				("SkRlmtPacketReceive: Duplicate MAC Address.\n"))
+				("SkRlmtPacketReceive: Duplicate MAC Address.\n"));
 
 			/* Error Log entry. */
 			SK_ERR_LOG(pAC, SK_ERRCL_COMM, SKERR_RLMT_E006, SKERR_RLMT_E006_MSG);
@@ -963,7 +963,7 @@ SK_MBUF	*pMb)	/* Received packet */
 		else {
 			/* Simply trash it. */
 			SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
-				("SkRlmtPacketReceive: Sent by me.\n"))
+				("SkRlmtPacketReceive: Sent by me.\n"));
 		}
 
 		SkDrvFreeRlmtMbuf(pAC, IoC, pMb);
@@ -1007,7 +1007,7 @@ SK_MBUF	*pMb)	/* Received packet */
 #endif	/* 0 */
 
 			SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
-				("SkRlmtPacketReceive: Announce.\n"))
+				("SkRlmtPacketReceive: Announce.\n"));
 
 			SkDrvFreeRlmtMbuf(pAC, IoC, pMb);
 			break;
@@ -1015,7 +1015,7 @@ SK_MBUF	*pMb)	/* Received packet */
 		case SK_PACKET_ALIVE:
 			if (pRPacket->SSap & LLC_COMMAND_RESPONSE_BIT) {
 				SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
-					("SkRlmtPacketReceive: Alive Reply.\n"))
+					("SkRlmtPacketReceive: Alive Reply.\n"));
 
 				if (!(pAC->Addr.Port[PortNumber].PromMode & SK_PROM_MODE_LLC) ||
 					SK_ADDR_EQUAL(
@@ -1046,7 +1046,7 @@ SK_MBUF	*pMb)	/* Received packet */
 			}
 			else {	/* Alive Request Packet. */
 				SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
-					("SkRlmtPacketReceive: Alive Request.\n"))
+					("SkRlmtPacketReceive: Alive Request.\n"));
 
 				pRPort->RxHelloCts++;
 
@@ -1065,7 +1065,7 @@ SK_MBUF	*pMb)	/* Received packet */
 
 		case SK_PACKET_CHECK_TX:
 			SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
-				("SkRlmtPacketReceive: Check your tx line.\n"))
+				("SkRlmtPacketReceive: Check your tx line.\n"));
 
 			/* A port checking us requests us to check our tx line. */
 			pRPort->CheckingState |= SK_RLMT_PCS_TX;
@@ -1088,7 +1088,7 @@ SK_MBUF	*pMb)	/* Received packet */
 
 		case SK_PACKET_ADDR_CHANGED:
 			SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
-				("SkRlmtPacketReceive: Address Change.\n"))
+				("SkRlmtPacketReceive: Address Change.\n"));
 
 			/* Build the check chain. */
 			SkRlmtBuildCheckChain(pAC, pRPort->Net->NetNumber);
@@ -1097,7 +1097,7 @@ SK_MBUF	*pMb)	/* Received packet */
 
 		default:
 			SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
-				("SkRlmtPacketReceive: Unknown RLMT packet.\n"))
+				("SkRlmtPacketReceive: Unknown RLMT packet.\n"));
 
 			/* RA;:;: ??? */
 			SkDrvFreeRlmtMbuf(pAC, IoC, pMb);
@@ -1107,7 +1107,7 @@ SK_MBUF	*pMb)	/* Received packet */
 		pSPacket->Ctrl == SK_RLMT_SPT_CTRL &&
 		(pSPacket->SSap & ~LLC_COMMAND_RESPONSE_BIT) == SK_RLMT_SPT_SSAP) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
-			("SkRlmtPacketReceive: BPDU Packet.\n"))
+			("SkRlmtPacketReceive: BPDU Packet.\n"));
 
 		/* Spanning Tree packet. */
 		pRPort->RxSpHelloCts++;
@@ -1139,7 +1139,7 @@ SK_MBUF	*pMb)	/* Received packet */
 					pRPort->Root.Id[0], pRPort->Root.Id[1],
 					pRPort->Root.Id[2], pRPort->Root.Id[3],
 					pRPort->Root.Id[4], pRPort->Root.Id[5],
-					pRPort->Root.Id[6], pRPort->Root.Id[7]))
+					pRPort->Root.Id[6], pRPort->Root.Id[7]));
 		}
 
 		SkDrvFreeRlmtMbuf(pAC, IoC, pMb);
@@ -1150,7 +1150,7 @@ SK_MBUF	*pMb)	/* Received packet */
 	}
 	else {
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
-			("SkRlmtPacketReceive: Unknown Packet Type.\n"))
+			("SkRlmtPacketReceive: Unknown Packet Type.\n"));
 
 		/* Unknown packet. */
 		SkDrvFreeRlmtMbuf(pAC, IoC, pMb);
@@ -1232,7 +1232,7 @@ SK_U32	PortNumber)	/* Port to check */
 	if ((pRPort->PacketsPerTimeSlot - pRPort->BpduPacketsPerTimeSlot) == 0) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
 			("SkRlmtCheckPort %d: No (%d) receives in last time slot.\n",
-				PortNumber, pRPort->PacketsPerTimeSlot))
+				PortNumber, pRPort->PacketsPerTimeSlot));
 
 		/*
 		 * Check segmentation if there was no receive at least twice
@@ -1249,7 +1249,7 @@ SK_U32	PortNumber)	/* Port to check */
 
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
 			("SkRlmtCheckPort: PortsSuspect %d, PcsRx %d.\n",
-				pRPort->PortsSuspect, pRPort->CheckingState & SK_RLMT_PCS_RX))
+				pRPort->PortsSuspect, pRPort->CheckingState & SK_RLMT_PCS_RX));
 
 		if (pRPort->PortState != SK_RLMT_PS_DOWN) {
 			NewTimeout = TO_SHORTEN(pAC->Rlmt.Port[PortNumber].Net->TimeoutValue);
@@ -1295,7 +1295,7 @@ SK_U32	PortNumber)	/* Port to check */
 			("SkRlmtCheckPort %d: %d (%d) receives in last time slot.\n",
 				PortNumber,
 				pRPort->PacketsPerTimeSlot - pRPort->BpduPacketsPerTimeSlot,
-				pRPort->PacketsPerTimeSlot))
+				pRPort->PacketsPerTimeSlot));
 		
 		SkRlmtPortReceives(pAC, IoC, PortNumber);
 		if (pAC->Rlmt.CheckSwitch) {
@@ -1345,7 +1345,7 @@ SK_U32	*pSelect)	/* New active port */
 				i,
    				pAC->Rlmt.Port[i].PortDown, pAC->Rlmt.Port[i].PortNoRx,
 				*((SK_U32*)(&pAC->Rlmt.Port[i].BcTimeStamp) + OFFS_HI32),
-				*((SK_U32*)(&pAC->Rlmt.Port[i].BcTimeStamp) + OFFS_LO32)))
+				*((SK_U32*)(&pAC->Rlmt.Port[i].BcTimeStamp) + OFFS_LO32)));
 
 		if (!pAC->Rlmt.Port[i].PortDown && !pAC->Rlmt.Port[i].PortNoRx) {
 			if (!PortFound || pAC->Rlmt.Port[i].BcTimeStamp > BcTimeStamp) {
@@ -1358,7 +1358,7 @@ SK_U32	*pSelect)	/* New active port */
 
 	if (PortFound) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("Port %d received the last broadcast.\n", *pSelect))
+			("Port %d received the last broadcast.\n", *pSelect));
 
 		/* Look if another port's time stamp is similar. */
 		for (i = 0; i < (SK_U32)pAC->GIni.GIMacsFound; i++) {
@@ -1373,7 +1373,7 @@ SK_U32	*pSelect)	/* New active port */
 				PortFound = SK_FALSE;
 				
 				SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-					("Port %d received a broadcast at a similar time.\n", i))
+					("Port %d received a broadcast at a similar time.\n", i));
 				break;
 			}
 		}
@@ -1385,7 +1385,7 @@ SK_U32	*pSelect)	/* New active port */
 			("SK_RLMT_SELECT_BCRX found Port %d receiving the substantially "
 			 "latest broadcast (%u).\n",
 				*pSelect,
-				BcTimeStamp - pAC->Rlmt.Port[1 - *pSelect].BcTimeStamp))
+				BcTimeStamp - pAC->Rlmt.Port[1 - *pSelect].BcTimeStamp));
 	}
 #endif	/* DEBUG */
 
@@ -1434,7 +1434,7 @@ SK_U32	*pSelect)	/* New active port */
 			PortFound = SK_TRUE;
 			SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
 				("SK_RLMT_SELECT_NOTSUSPECT found Port %d up and not check RX.\n",
-					*pSelect))
+					*pSelect));
 			break;
 		}
 	}
@@ -1483,7 +1483,7 @@ SK_BOOL	AutoNegDone)	/* Successfully aut
 			}
 			PortFound = SK_TRUE;
 			SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-				("SK_RLMT_SELECT_UP found Port %d up.\n", *pSelect))
+				("SK_RLMT_SELECT_UP found Port %d up.\n", *pSelect));
 			break;
 		}
 	}
@@ -1544,7 +1544,7 @@ SK_BOOL	AutoNegDone)	/* Successfully aut
 	}
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-		("SK_RLMT_SELECT_GOINGUP found Port %d going up.\n", *pSelect))
+		("SK_RLMT_SELECT_GOINGUP found Port %d going up.\n", *pSelect));
 	return (SK_TRUE);
 }	/* SkRlmtSelectGoingUp */
 
@@ -1590,7 +1590,7 @@ SK_BOOL	AutoNegDone)	/* Successfully aut
 			}
 			PortFound = SK_TRUE;
 			SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-				("SK_RLMT_SELECT_DOWN found Port %d down.\n", *pSelect))
+				("SK_RLMT_SELECT_DOWN found Port %d down.\n", *pSelect));
 			break;
 		}
 	}
@@ -1788,7 +1788,7 @@ SK_U32	NetIdx)	/* Net index */
 
 			if (Para.Para32[1] != Active) {
 				SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-					("Active: %d, Para1: %d.\n", Active, Para.Para32[1]))
+					("Active: %d, Para1: %d.\n", Active, Para.Para32[1]));
 				pAC->Rlmt.Net[NetIdx].ActivePort = Para.Para32[1];
 				Para.Para32[0] = pAC->Rlmt.Net[NetIdx].
 					Port[Para.Para32[0]]->PortNumber;
@@ -1868,7 +1868,7 @@ SK_U32	NetIdx)	/* Net number */
 				pNet->Port[i]->Root.Id[0], pNet->Port[i]->Root.Id[1],
 				pNet->Port[i]->Root.Id[2], pNet->Port[i]->Root.Id[3],
 				pNet->Port[i]->Root.Id[4], pNet->Port[i]->Root.Id[5],
-				pNet->Port[i]->Root.Id[6], pNet->Port[i]->Root.Id[7]))
+				pNet->Port[i]->Root.Id[6], pNet->Port[i]->Root.Id[7]));
 
 		if (!pNet->RootIdSet) {
 			pNet->Root = pNet->Port[i]->Root;
@@ -1963,13 +1963,13 @@ SK_EVPARA	Para)	/* SK_U32 PortNumber; SK
 	SK_U32			i;
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-		("SK_RLMT_PORTSTART_TIMEOUT Port %d Event BEGIN.\n", Para.Para32[0]))
+		("SK_RLMT_PORTSTART_TIMEOUT Port %d Event BEGIN.\n", Para.Para32[0]));
 
 		if (Para.Para32[1] != (SK_U32)-1) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("Bad Parameter.\n"))
+			("Bad Parameter.\n"));
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("SK_RLMT_PORTSTART_TIMEOUT Event EMPTY.\n"))
+			("SK_RLMT_PORTSTART_TIMEOUT Event EMPTY.\n"));
 		return;
 	}
 
@@ -1990,7 +1990,7 @@ SK_EVPARA	Para)	/* SK_U32 PortNumber; SK
 	}
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-		("SK_RLMT_PORTSTART_TIMEOUT Event END.\n"))
+		("SK_RLMT_PORTSTART_TIMEOUT Event END.\n"));
 }	/* SkRlmtEvtPortStartTim */
 
 
@@ -2018,21 +2018,21 @@ SK_EVPARA	Para)	/* SK_U32 PortNumber; SK
 	SK_EVPARA		Para2;
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-		("SK_RLMT_LINK_UP Port %d Event BEGIN.\n", Para.Para32[0]))
+		("SK_RLMT_LINK_UP Port %d Event BEGIN.\n", Para.Para32[0]));
 
 	pRPort = &pAC->Rlmt.Port[Para.Para32[0]];
 	if (!pRPort->PortStarted) {
 		SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_RLMT_E008, SKERR_RLMT_E008_MSG);
 
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-				("SK_RLMT_LINK_UP Event EMPTY.\n"))
+				("SK_RLMT_LINK_UP Event EMPTY.\n"));
 		return;
 	}
 
 	if (!pRPort->LinkDown) {
 		/* RA;:;: Any better solution? */
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("SK_RLMT_LINK_UP Event EMPTY.\n"))
+			("SK_RLMT_LINK_UP Event EMPTY.\n"));
 		return;
 	}
 
@@ -2110,7 +2110,7 @@ SK_EVPARA	Para)	/* SK_U32 PortNumber; SK
 	}
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-		("SK_RLMT_LINK_UP Event END.\n"))
+		("SK_RLMT_LINK_UP Event END.\n"));
 }	/* SkRlmtEvtLinkUp */
 
 
@@ -2136,20 +2136,20 @@ SK_EVPARA	Para)	/* SK_U32 PortNumber; SK
 	SK_RLMT_PORT	*pRPort;
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-		("SK_RLMT_PORTUP_TIM Port %d Event BEGIN.\n", Para.Para32[0]))
+		("SK_RLMT_PORTUP_TIM Port %d Event BEGIN.\n", Para.Para32[0]));
 
 	if (Para.Para32[1] != (SK_U32)-1) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("Bad Parameter.\n"))
+			("Bad Parameter.\n"));
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("SK_RLMT_PORTUP_TIM Event EMPTY.\n"))
+			("SK_RLMT_PORTUP_TIM Event EMPTY.\n"));
 		return;
 	}
 
 	pRPort = &pAC->Rlmt.Port[Para.Para32[0]];
 	if (pRPort->LinkDown || (pRPort->PortState == SK_RLMT_PS_UP)) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("SK_RLMT_PORTUP_TIM Port %d Event EMPTY.\n", Para.Para32[0]))
+			("SK_RLMT_PORTUP_TIM Port %d Event EMPTY.\n", Para.Para32[0]));
 		return;
 	}
 
@@ -2164,7 +2164,7 @@ SK_EVPARA	Para)	/* SK_U32 PortNumber; SK
 	}
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-		("SK_RLMT_PORTUP_TIM Event END.\n"))
+		("SK_RLMT_PORTUP_TIM Event END.\n"));
 }	/* SkRlmtEvtPortUpTim */
 
 
@@ -2192,13 +2192,13 @@ SK_EVPARA	Para)	/* SK_U32 PortNumber; SK
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
 		("SK_RLMT_PORTDOWN* Port %d Event (%d) BEGIN.\n",
-			Para.Para32[0], Event))
+			Para.Para32[0], Event));
 
 	if (Para.Para32[1] != (SK_U32)-1) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("Bad Parameter.\n"))
+			("Bad Parameter.\n"));
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("SK_RLMT_PORTDOWN* Event EMPTY.\n"))
+			("SK_RLMT_PORTDOWN* Event EMPTY.\n"));
 		return;
 	}
 
@@ -2206,7 +2206,7 @@ SK_EVPARA	Para)	/* SK_U32 PortNumber; SK
 	if (!pRPort->PortStarted || (Event == SK_RLMT_PORTDOWN_TX_TIM &&
 		!(pRPort->CheckingState & SK_RLMT_PCS_TX))) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("SK_RLMT_PORTDOWN* Event (%d) EMPTY.\n", Event))
+			("SK_RLMT_PORTDOWN* Event (%d) EMPTY.\n", Event));
 		return;
 	}
 	
@@ -2243,7 +2243,7 @@ SK_EVPARA	Para)	/* SK_U32 PortNumber; SK
 	}
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-		("SK_RLMT_PORTDOWN* Event (%d) END.\n", Event))
+		("SK_RLMT_PORTDOWN* Event (%d) END.\n", Event));
 }	/* SkRlmtEvtPortDownX */
 
 
@@ -2270,7 +2270,7 @@ SK_EVPARA	Para)	/* SK_U32 PortNumber; SK
 
 	pRPort = &pAC->Rlmt.Port[Para.Para32[0]];
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-		("SK_RLMT_LINK_DOWN Port %d Event BEGIN.\n", Para.Para32[0]))
+		("SK_RLMT_LINK_DOWN Port %d Event BEGIN.\n", Para.Para32[0]));
 
 	if (!pAC->Rlmt.Port[Para.Para32[0]].LinkDown) {
 		pRPort->Net->LinksUp--;
@@ -2289,7 +2289,7 @@ SK_EVPARA	Para)	/* SK_U32 PortNumber; SK
 	}
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-		("SK_RLMT_LINK_DOWN Event END.\n"))
+		("SK_RLMT_LINK_DOWN Event END.\n"));
 }	/* SkRlmtEvtLinkDown */
 
 
@@ -2318,13 +2318,13 @@ SK_EVPARA	Para)	/* SK_U32 PortNumber; SK
 	SK_MAC_ADDR		*pNewMacAddr;
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-		("SK_RLMT_PORT_ADDR Port %d Event BEGIN.\n", Para.Para32[0]))
+		("SK_RLMT_PORT_ADDR Port %d Event BEGIN.\n", Para.Para32[0]));
 
 	if (Para.Para32[1] != (SK_U32)-1) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("Bad Parameter.\n"))
+			("Bad Parameter.\n"));
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("SK_RLMT_PORT_ADDR Event EMPTY.\n"))
+			("SK_RLMT_PORT_ADDR Event EMPTY.\n"));
 		return;
 	}
 
@@ -2348,7 +2348,7 @@ SK_EVPARA	Para)	/* SK_U32 PortNumber; SK
 	}
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("SK_RLMT_PORT_ADDR Event END.\n"))
+			("SK_RLMT_PORT_ADDR Event END.\n"));
 }	/* SkRlmtEvtPortAddr */
 
 
@@ -2376,35 +2376,35 @@ SK_EVPARA	Para)	/* SK_U32 NetNumber; SK_
 	SK_U32		PortNumber;
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-		("SK_RLMT_START Net %d Event BEGIN.\n", Para.Para32[0]))
+		("SK_RLMT_START Net %d Event BEGIN.\n", Para.Para32[0]));
 
 	if (Para.Para32[1] != (SK_U32)-1) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("Bad Parameter.\n"))
+			("Bad Parameter.\n"));
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("SK_RLMT_START Event EMPTY.\n"))
+			("SK_RLMT_START Event EMPTY.\n"));
 		return;
 	}
 
 	if (Para.Para32[0] >= pAC->Rlmt.NumNets) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("Bad NetNumber %d.\n", Para.Para32[0]))
+			("Bad NetNumber %d.\n", Para.Para32[0]));
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("SK_RLMT_START Event EMPTY.\n"))
+			("SK_RLMT_START Event EMPTY.\n"));
 		return;
 	}
 
 	if (pAC->Rlmt.Net[Para.Para32[0]].RlmtState != SK_RLMT_RS_INIT) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("SK_RLMT_START Event EMPTY.\n"))
+			("SK_RLMT_START Event EMPTY.\n"));
 		return;
 	}
 
 	if (pAC->Rlmt.NetsStarted >= pAC->Rlmt.NumNets) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("All nets should have been started.\n"))
+			("All nets should have been started.\n"));
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("SK_RLMT_START Event EMPTY.\n"))
+			("SK_RLMT_START Event EMPTY.\n"));
 		return;
 	}
 
@@ -2438,7 +2438,7 @@ SK_EVPARA	Para)	/* SK_U32 NetNumber; SK_
 	pAC->Rlmt.NetsStarted++;
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("SK_RLMT_START Event END.\n"))
+			("SK_RLMT_START Event END.\n"));
 }	/* SkRlmtEvtStart */
 
 
@@ -2466,35 +2466,35 @@ SK_EVPARA	Para)	/* SK_U32 NetNumber; SK_
 	SK_U32		i;
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-		("SK_RLMT_STOP Net %d Event BEGIN.\n", Para.Para32[0]))
+		("SK_RLMT_STOP Net %d Event BEGIN.\n", Para.Para32[0]));
 
 	if (Para.Para32[1] != (SK_U32)-1) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("Bad Parameter.\n"))
+			("Bad Parameter.\n"));
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("SK_RLMT_STOP Event EMPTY.\n"))
+			("SK_RLMT_STOP Event EMPTY.\n"));
 		return;
 	}
 
 	if (Para.Para32[0] >= pAC->Rlmt.NumNets) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("Bad NetNumber %d.\n", Para.Para32[0]))
+			("Bad NetNumber %d.\n", Para.Para32[0]));
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("SK_RLMT_STOP Event EMPTY.\n"))
+			("SK_RLMT_STOP Event EMPTY.\n"));
 		return;
 	}
 
 	if (pAC->Rlmt.Net[Para.Para32[0]].RlmtState == SK_RLMT_RS_INIT) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("SK_RLMT_STOP Event EMPTY.\n"))
+			("SK_RLMT_STOP Event EMPTY.\n"));
 		return;
 	}
 
 	if (pAC->Rlmt.NetsStarted == 0) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("All nets are stopped.\n"))
+			("All nets are stopped.\n"));
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("SK_RLMT_STOP Event EMPTY.\n"))
+			("SK_RLMT_STOP Event EMPTY.\n"));
 		return;
 	}
 
@@ -2529,7 +2529,7 @@ SK_EVPARA	Para)	/* SK_U32 NetNumber; SK_
 	pAC->Rlmt.NetsStarted--;
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-		("SK_RLMT_STOP Event END.\n"))
+		("SK_RLMT_STOP Event END.\n"));
 }	/* SkRlmtEvtStop */
 
 
@@ -2559,13 +2559,13 @@ SK_EVPARA	Para)	/* SK_U32 NetNumber; SK_
 	SK_U32			i;
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-		("SK_RLMT_TIM Event BEGIN.\n"))
+		("SK_RLMT_TIM Event BEGIN.\n"));
 
 	if (Para.Para32[1] != (SK_U32)-1) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("Bad Parameter.\n"))
+			("Bad Parameter.\n"));
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("SK_RLMT_TIM Event EMPTY.\n"))
+			("SK_RLMT_TIM Event EMPTY.\n"));
 		return;
 	}
 
@@ -2637,7 +2637,7 @@ SK_EVPARA	Para)	/* SK_U32 NetNumber; SK_
 	}
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("SK_RLMT_TIM Event END.\n"))
+			("SK_RLMT_TIM Event END.\n"));
 }	/* SkRlmtEvtTim */
 
 
@@ -2665,13 +2665,13 @@ SK_EVPARA	Para)	/* SK_U32 NetNumber; SK_
 #endif	/* DEBUG */
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-		("SK_RLMT_SEG_TIM Event BEGIN.\n"))
+		("SK_RLMT_SEG_TIM Event BEGIN.\n"));
 
 	if (Para.Para32[1] != (SK_U32)-1) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("Bad Parameter.\n"))
+			("Bad Parameter.\n"));
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("SK_RLMT_SEG_TIM Event EMPTY.\n"))
+			("SK_RLMT_SEG_TIM Event EMPTY.\n"));
 		return;
 	}
 
@@ -2695,7 +2695,7 @@ SK_EVPARA	Para)	/* SK_U32 NetNumber; SK_
 					InAddr8[3], InAddr8[4], InAddr8[5],
 					pAPort->Exact[k].a[0], pAPort->Exact[k].a[1],
 					pAPort->Exact[k].a[2], pAPort->Exact[k].a[3],
-					pAPort->Exact[k].a[4], pAPort->Exact[k].a[5]))
+					pAPort->Exact[k].a[4], pAPort->Exact[k].a[5]));
 		}
 	}
 #endif	/* xDEBUG */
@@ -2703,7 +2703,7 @@ SK_EVPARA	Para)	/* SK_U32 NetNumber; SK_
 	SkRlmtCheckSeg(pAC, IoC, Para.Para32[0]);
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("SK_RLMT_SEG_TIM Event END.\n"))
+			("SK_RLMT_SEG_TIM Event END.\n"));
 }	/* SkRlmtEvtSegTim */
 
 
@@ -2732,18 +2732,18 @@ SK_EVPARA	Para)	/* SK_MBUF *pMb */
 
 	
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-		("SK_RLMT_PACKET_RECEIVED Event BEGIN.\n"))
+		("SK_RLMT_PACKET_RECEIVED Event BEGIN.\n"));
 
 	/* Should we ignore frames during port switching? */
 
 #ifdef DEBUG
 	pMb = Para.pParaPtr;
 	if (pMb == NULL) {
-		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL, ("No mbuf.\n"))
+		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL, ("No mbuf.\n"));
 	}
 	else if (pMb->pNext != NULL) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("More than one mbuf or pMb->pNext not set.\n"))
+			("More than one mbuf or pMb->pNext not set.\n"));
 	}
 #endif	/* DEBUG */
 
@@ -2761,7 +2761,7 @@ SK_EVPARA	Para)	/* SK_MBUF *pMb */
 	}
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-		("SK_RLMT_PACKET_RECEIVED Event END.\n"))
+		("SK_RLMT_PACKET_RECEIVED Event END.\n"));
 }	/* SkRlmtEvtPacketRx */
 
 
@@ -2788,21 +2788,21 @@ SK_EVPARA	Para)	/* SK_U32 NetNumber; SK_
 	SK_RLMT_PORT	*pRPort;
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-		("SK_RLMT_STATS_CLEAR Event BEGIN.\n"))
+		("SK_RLMT_STATS_CLEAR Event BEGIN.\n"));
 
 	if (Para.Para32[1] != (SK_U32)-1) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("Bad Parameter.\n"))
+			("Bad Parameter.\n"));
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("SK_RLMT_STATS_CLEAR Event EMPTY.\n"))
+			("SK_RLMT_STATS_CLEAR Event EMPTY.\n"));
 		return;
 	}
 
 	if (Para.Para32[0] >= pAC->Rlmt.NumNets) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("Bad NetNumber %d.\n", Para.Para32[0]))
+			("Bad NetNumber %d.\n", Para.Para32[0]));
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("SK_RLMT_STATS_CLEAR Event EMPTY.\n"))
+			("SK_RLMT_STATS_CLEAR Event EMPTY.\n"));
 		return;
 	}
 
@@ -2817,7 +2817,7 @@ SK_EVPARA	Para)	/* SK_U32 NetNumber; SK_
 	}
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-		("SK_RLMT_STATS_CLEAR Event END.\n"))
+		("SK_RLMT_STATS_CLEAR Event END.\n"));
 }	/* SkRlmtEvtStatsClear */
 
 
@@ -2841,28 +2841,28 @@ SK_IOC		IoC,	/* I/O Context */
 SK_EVPARA	Para)	/* SK_U32 NetNumber; SK_U32 -1 */
 {
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-		("SK_RLMT_STATS_UPDATE Event BEGIN.\n"))
+		("SK_RLMT_STATS_UPDATE Event BEGIN.\n"));
 
 	if (Para.Para32[1] != (SK_U32)-1) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("Bad Parameter.\n"))
+			("Bad Parameter.\n"));
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("SK_RLMT_STATS_UPDATE Event EMPTY.\n"))
+			("SK_RLMT_STATS_UPDATE Event EMPTY.\n"));
 		return;
 	}
 
 	if (Para.Para32[0] >= pAC->Rlmt.NumNets) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("Bad NetNumber %d.\n", Para.Para32[0]))
+			("Bad NetNumber %d.\n", Para.Para32[0]));
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("SK_RLMT_STATS_UPDATE Event EMPTY.\n"))
+			("SK_RLMT_STATS_UPDATE Event EMPTY.\n"));
 		return;
 	}
 
 	/* Update statistics - currently always up-to-date. */
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-		("SK_RLMT_STATS_UPDATE Event END.\n"))
+		("SK_RLMT_STATS_UPDATE Event END.\n"));
 }	/* SkRlmtEvtStatsUpdate */
 
 
@@ -2886,13 +2886,13 @@ SK_IOC		IoC,	/* I/O Context */
 SK_EVPARA	Para)	/* SK_U32 PortIndex; SK_U32 NetNumber */
 {
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-		("SK_RLMT_PREFPORT_CHANGE to Port %d Event BEGIN.\n", Para.Para32[0]))
+		("SK_RLMT_PREFPORT_CHANGE to Port %d Event BEGIN.\n", Para.Para32[0]));
 
 	if (Para.Para32[1] >= pAC->Rlmt.NumNets) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("Bad NetNumber %d.\n", Para.Para32[1]))
+			("Bad NetNumber %d.\n", Para.Para32[1]));
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("SK_RLMT_PREFPORT_CHANGE Event EMPTY.\n"))
+			("SK_RLMT_PREFPORT_CHANGE Event EMPTY.\n"));
 		return;
 	}
 
@@ -2905,7 +2905,7 @@ SK_EVPARA	Para)	/* SK_U32 PortIndex; SK_
 			SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_RLMT_E010, SKERR_RLMT_E010_MSG);
 
 			SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-				("SK_RLMT_PREFPORT_CHANGE Event EMPTY.\n"))
+				("SK_RLMT_PREFPORT_CHANGE Event EMPTY.\n"));
 			return;
 		}
 
@@ -2919,7 +2919,7 @@ SK_EVPARA	Para)	/* SK_U32 PortIndex; SK_
 	}
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-		("SK_RLMT_PREFPORT_CHANGE Event END.\n"))
+		("SK_RLMT_PREFPORT_CHANGE Event END.\n"));
 }	/* SkRlmtEvtPrefportChange */
 
 
@@ -2945,37 +2945,37 @@ SK_EVPARA	Para)	/* SK_U32 NumNets; SK_U3
 	int i;
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-		("SK_RLMT_SET_NETS Event BEGIN.\n"))
+		("SK_RLMT_SET_NETS Event BEGIN.\n"));
 
 	if (Para.Para32[1] != (SK_U32)-1) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("Bad Parameter.\n"))
+			("Bad Parameter.\n"));
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("SK_RLMT_SET_NETS Event EMPTY.\n"))
+			("SK_RLMT_SET_NETS Event EMPTY.\n"));
 		return;
 	}
 
 	if (Para.Para32[0] == 0 || Para.Para32[0] > SK_MAX_NETS ||
 		Para.Para32[0] > (SK_U32)pAC->GIni.GIMacsFound) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("Bad number of nets: %d.\n", Para.Para32[0]))
+			("Bad number of nets: %d.\n", Para.Para32[0]));
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("SK_RLMT_SET_NETS Event EMPTY.\n"))
+			("SK_RLMT_SET_NETS Event EMPTY.\n"));
 		return;
 	}
 
 	if (Para.Para32[0] == pAC->Rlmt.NumNets) {	/* No change. */
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("SK_RLMT_SET_NETS Event EMPTY.\n"))
+			("SK_RLMT_SET_NETS Event EMPTY.\n"));
 		return;
 	}
 
 	/* Entering and leaving dual mode only allowed while nets are stopped. */
 	if (pAC->Rlmt.NetsStarted > 0) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("Changing dual mode only allowed while all nets are stopped.\n"))
+			("Changing dual mode only allowed while all nets are stopped.\n"));
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("SK_RLMT_SET_NETS Event EMPTY.\n"))
+			("SK_RLMT_SET_NETS Event EMPTY.\n"));
 		return;
 	}
 
@@ -3006,7 +3006,7 @@ SK_EVPARA	Para)	/* SK_U32 NumNets; SK_U3
 		SkEventQueue(pAC, SKGE_PNMI, SK_PNMI_EVT_RLMT_SET_NETS, Para);
 
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("RLMT: Changed to one net with two ports.\n"))
+			("RLMT: Changed to one net with two ports.\n"));
 	}
 	else if (Para.Para32[0] == 2) {
 		pAC->Rlmt.Port[1].Net= &pAC->Rlmt.Net[1];
@@ -3035,19 +3035,19 @@ SK_EVPARA	Para)	/* SK_U32 NumNets; SK_U3
 		SkEventQueue(pAC, SKGE_PNMI, SK_PNMI_EVT_RLMT_SET_NETS, Para);
 
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("RLMT: Changed to two nets with one port each.\n"))
+			("RLMT: Changed to two nets with one port each.\n"));
 	}
 	else {
 		/* Not implemented for more than two nets. */
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("SetNets not implemented for more than two nets.\n"))
+			("SetNets not implemented for more than two nets.\n"));
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("SK_RLMT_SET_NETS Event EMPTY.\n"))
+			("SK_RLMT_SET_NETS Event EMPTY.\n"));
 		return;
 	}
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-		("SK_RLMT_SET_NETS Event END.\n"))
+		("SK_RLMT_SET_NETS Event END.\n"));
 }	/* SkRlmtSetNets */
 
 
@@ -3075,13 +3075,13 @@ SK_EVPARA	Para)	/* SK_U32 NewMode; SK_U3
 	SK_U32		PrevRlmtMode;
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-		("SK_RLMT_MODE_CHANGE Event BEGIN.\n"))
+		("SK_RLMT_MODE_CHANGE Event BEGIN.\n"));
 
 	if (Para.Para32[1] >= pAC->Rlmt.NumNets) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("Bad NetNumber %d.\n", Para.Para32[1]))
+			("Bad NetNumber %d.\n", Para.Para32[1]));
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("SK_RLMT_MODE_CHANGE Event EMPTY.\n"))
+			("SK_RLMT_MODE_CHANGE Event EMPTY.\n"));
 		return;
 	}
 
@@ -3091,9 +3091,9 @@ SK_EVPARA	Para)	/* SK_U32 NewMode; SK_U3
 		Para.Para32[0] != SK_RLMT_MODE_CLS) {
 		pAC->Rlmt.Net[Para.Para32[1]].RlmtMode = SK_RLMT_MODE_CLS;
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("Forced RLMT mode to CLS on single port net.\n"))
+			("Forced RLMT mode to CLS on single port net.\n"));
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("SK_RLMT_MODE_CHANGE Event EMPTY.\n"))
+			("SK_RLMT_MODE_CHANGE Event EMPTY.\n"));
 		return;
 	}
 
@@ -3159,7 +3159,7 @@ SK_EVPARA	Para)	/* SK_U32 NewMode; SK_U3
 	}	/* SK_RLMT_CHECK_SEG bit changed. */
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("SK_RLMT_MODE_CHANGE Event END.\n"))
+			("SK_RLMT_MODE_CHANGE Event END.\n"));
 }	/* SkRlmtEvtModeChange */
 
 
@@ -3245,7 +3245,7 @@ SK_EVPARA	Para)	/* Event-specific parame
 
 	default:	/* Create error log entry. */
 		SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
-			("Unknown RLMT Event %d.\n", Event))
+			("Unknown RLMT Event %d.\n", Event));
 		SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_RLMT_E003, SKERR_RLMT_E003_MSG);
 		break;
 	}	/* switch() */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/sktimer.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/sktimer.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/sktimer.c	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/sktimer.c	2004-09-09 13:20:49.000000000 +0200
@@ -2,8 +2,8 @@
  *
  * Name:	sktimer.c
  * Project:	Gigabit Ethernet Adapters, Event Scheduler Module
- * Version:	$Revision: 1.14 $
- * Date:	$Date: 2003/09/16 13:46:51 $
+ * Version:	$Revision: 2.2 $
+ * Date:	$Date: 2004/05/28 13:44:39 $
  * Purpose:	High level timer functions.
  *
  ******************************************************************************/
@@ -11,7 +11,7 @@
 /******************************************************************************
  *
  *	(C)Copyright 1998-2002 SysKonnect GmbH.
- *	(C)Copyright 2002-2003 Marvell.
+ *	(C)Copyright 2002-2004 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
@@ -22,13 +22,12 @@
  *
  ******************************************************************************/
 
-
 /*
  *	Event queue and dispatcher
  */
 #if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
 static const char SysKonnectFileId[] =
-	"@(#) $Id: sktimer.c,v 1.14 2003/09/16 13:46:51 rschmidt Exp $ (C) Marvell.";
+	"@(#) $Id: sktimer.c,v 2.2 2004/05/28 13:44:39 rschmidt Exp $ (C) Marvell.";
 #endif
 
 #include "h/skdrv1st.h"		/* Driver Specific Definitions */
@@ -62,7 +61,7 @@ int		Level)		/* Init Level */
 {
 	switch (Level) {
 	case SK_INIT_DATA:
-		pAC->Tim.StQueue = 0;
+		pAC->Tim.StQueue = NULL;
 		break;
 	case SK_INIT_IO:
 		SkHwtInit(pAC, Ioc);
@@ -85,22 +84,20 @@ SK_TIMER	*pTimer)	/* Timer Pointer to be
 	SK_TIMER	**ppTimPrev;
 	SK_TIMER	*pTm;
 
-	/*
-	 * remove timer from queue
-	 */
+	/* remove timer from queue */
 	pTimer->TmActive = SK_FALSE;
-	
+
 	if (pAC->Tim.StQueue == pTimer && !pTimer->TmNext) {
 		SkHwtStop(pAC, Ioc);
 	}
-	
+
 	for (ppTimPrev = &pAC->Tim.StQueue; (pTm = *ppTimPrev);
 		ppTimPrev = &pTm->TmNext ) {
-		
+
 		if (pTm == pTimer) {
 			/*
 			 * Timer found in queue
-			 * - dequeue it and
+			 * - dequeue it
 			 * - correct delta of the next timer
 			 */
 			*ppTimPrev = pTm->TmNext;
@@ -121,7 +118,7 @@ void	SkTimerStart(
 SK_AC		*pAC,		/* Adapters context */
 SK_IOC		Ioc,		/* IoContext */
 SK_TIMER	*pTimer,	/* Timer Pointer to be started */
-SK_U32		Time,		/* Time value */
+SK_U32		Time,		/* Time Value (in microsec.) */
 SK_U32		Class,		/* Event Class for this timer */
 SK_U32		Event,		/* Event Value for this timer */
 SK_EVPARA	Para)		/* Event Parameter for this timer */
@@ -130,11 +127,6 @@ SK_EVPARA	Para)		/* Event Parameter for 
 	SK_TIMER	*pTm;
 	SK_U32		Delta;
 
-	Time /= 16;		/* input is uS, clock ticks are 16uS */
-	
-	if (!Time)
-		Time = 1;
-
 	SkTimerStop(pAC, Ioc, pTimer);
 
 	pTimer->TmClass = Class;
@@ -143,31 +135,26 @@ SK_EVPARA	Para)		/* Event Parameter for 
 	pTimer->TmActive = SK_TRUE;
 
 	if (!pAC->Tim.StQueue) {
-		/* First Timer to be started */
+		/* first Timer to be started */
 		pAC->Tim.StQueue = pTimer;
-		pTimer->TmNext = 0;
+		pTimer->TmNext = NULL;
 		pTimer->TmDelta = Time;
-		
+
 		SkHwtStart(pAC, Ioc, Time);
-		
+
 		return;
 	}
 
-	/*
-	 * timer correction
-	 */
+	/* timer correction */
 	timer_done(pAC, Ioc, 0);
 
-	/*
-	 * find position in queue
-	 */
+	/* find position in queue */
 	Delta = 0;
 	for (ppTimPrev = &pAC->Tim.StQueue; (pTm = *ppTimPrev);
 		ppTimPrev = &pTm->TmNext ) {
-		
+
 		if (Delta + pTm->TmDelta > Time) {
-			/* Position found */
-			/* Here the timer needs to be inserted. */
+			/* the timer needs to be inserted here */
 			break;
 		}
 		Delta += pTm->TmDelta;
@@ -179,9 +166,7 @@ SK_EVPARA	Para)		/* Event Parameter for 
 	pTimer->TmDelta = Time - Delta;
 
 	if (pTm) {
-		/* There is a next timer
-		 * -> correct its Delta value.
-		 */
+		/* there is a next timer:  correct its Delta value */
 		pTm->TmDelta -= pTimer->TmDelta;
 	}
 
@@ -210,7 +195,7 @@ int		Restart)	/* Do we need to restart t
 	int		Done = 0;
 
 	Delta = SkHwtRead(pAC, Ioc);
-	
+
 	ppLast = &pAC->Tim.StQueue;
 	pTm = pAC->Tim.StQueue;
 	while (pTm && !Done) {
@@ -228,13 +213,13 @@ int		Restart)	/* Do we need to restart t
 			Done = 1;
 		}
 	}
-	*ppLast = 0;
+	*ppLast = NULL;
 	/*
 	 * pTm points to the first Timer that did not run out.
 	 * StQueue points to the first Timer that run out.
 	 */
 
-	for ( pTComp = pAC->Tim.StQueue; pTComp; pTComp = pTComp->TmNext) {
+	for (pTComp = pAC->Tim.StQueue; pTComp; pTComp = pTComp->TmNext) {
 		SkEventQueue(pAC,pTComp->TmClass, pTComp->TmEvent, pTComp->TmPara);
 	}
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/sktwsi.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/sktwsi.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/sktwsi.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/sktwsi.c	2004-09-09 13:20:49.000000000 +0200
@@ -0,0 +1,1337 @@
+/******************************************************************************
+ *
+ * Name:	sktwsi.c
+ * Project:	Gigabit Ethernet Adapters, TWSI-Module
+ * Version:	$Revision: 1.7 $
+ * Date:	$Date: 2004/08/05 14:34:52 $
+ * Purpose:	Functions to access Voltage and Temperature Sensor
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *	(C)Copyright 1998-2002 SysKonnect.
+ *	(C)Copyright 2002-2004 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
+ *	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.
+ *
+ ******************************************************************************/
+
+/*
+ *	TWSI Protocol
+ */
+#if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
+static const char SysKonnectFileId[] =
+	"@(#) $Id: sktwsi.c,v 1.7 2004/08/05 14:34:52 malthoff Exp $ (C) Marvell.";
+#endif
+
+#include "h/skdrv1st.h"		/* Driver Specific Definitions */
+#include "h/lm80.h"
+#include "h/skdrv2nd.h"		/* Adapter Control- and Driver specific Def. */
+
+#ifdef __C2MAN__
+/*
+	TWSI protocol implementation.
+
+	General Description:
+
+	The TWSI protocol is used for the temperature sensors and for
+	the serial EEPROM which hold the configuration.
+
+	This file covers functions that allow to read write and do
+	some bulk requests a specified TWSI address.
+
+	The Genesis has 2 TWSI buses. One for the EEPROM which holds
+	the VPD Data and one for temperature and voltage sensor.
+	The following picture shows the TWSI buses, TWSI devices and
+	their control registers.
+
+	Note: The VPD functions are in skvpd.c
+.
+.	PCI Config TWSI Bus for VPD Data:
+.
+.		      +------------+
+.		      | VPD EEPROM |
+.		      +------------+
+.			     |
+.			     | <-- TWSI
+.			     |
+.		 +-----------+-----------+
+.		 |			 |
+.	+-----------------+	+-----------------+
+.	| PCI_VPD_ADR_REG |	| PCI_VPD_DAT_REG |
+.	+-----------------+	+-----------------+
+.
+.
+.	TWSI Bus for LM80 sensor:
+.
+.			+-----------------+
+.			| Temperature and |
+.			| Voltage Sensor  |
+.			| 	LM80	  |
+.			+-----------------+
+.				|
+.				|
+.			TWSI --> |
+.				|
+.			     +----+
+.	     +-------------->| OR |<--+
+.	     |		     +----+   |
+.     +------+------+		      |
+.     |		    |		      |
+. +--------+	+--------+	+----------+
+. | B2_I2C |	| B2_I2C |	|  B2_I2C  |
+. | _CTRL  |	| _DATA  |	|   _SW    |
+. +--------+	+--------+	+----------+
+.
+	The TWSI bus may be driven by the B2_I2C_SW or by the B2_I2C_CTRL
+	and B2_I2C_DATA registers.
+	For driver software it is recommended to use the TWSI control and
+	data register, because TWSI bus timing is done by the ASIC and
+	an interrupt may be received when the TWSI request is completed.
+
+	Clock Rate Timing:			MIN	MAX	generated by
+		VPD EEPROM:			50 kHz	100 kHz		HW
+		LM80 over TWSI Ctrl/Data reg.	50 kHz	100 kHz		HW
+		LM80 over B2_I2C_SW register	0	400 kHz		SW
+
+	Note:	The clock generated by the hardware is dependend on the
+		PCI clock. If the PCI bus clock is 33 MHz, the I2C/VPD
+		clock is 50 kHz.
+ */
+intro()
+{}
+#endif
+
+#ifdef SK_DIAG
+/*
+ * TWSI Fast Mode timing values used by the LM80.
+ * If new devices are added to the TWSI bus the timing values have to be checked.
+ */
+#ifndef I2C_SLOW_TIMING
+#define	T_CLK_LOW			1300L	/* clock low time in ns */
+#define	T_CLK_HIGH			 600L	/* clock high time in ns */
+#define T_DATA_IN_SETUP		 100L	/* data in Set-up Time */
+#define T_START_HOLD		 600L	/* start condition hold time */
+#define T_START_SETUP		 600L	/* start condition Set-up time */
+#define	T_STOP_SETUP		 600L	/* stop condition Set-up time */
+#define T_BUS_IDLE			1300L	/* time the bus must free after Tx */
+#define	T_CLK_2_DATA_OUT	 900L	/* max. clock low to data output valid */
+#else	/* I2C_SLOW_TIMING */
+/* TWSI Standard Mode Timing */
+#define	T_CLK_LOW			4700L	/* clock low time in ns */
+#define	T_CLK_HIGH			4000L	/* clock high time in ns */
+#define T_DATA_IN_SETUP		 250L	/* data in Set-up Time */
+#define T_START_HOLD		4000L	/* start condition hold time */
+#define T_START_SETUP		4700L	/* start condition Set-up time */
+#define	T_STOP_SETUP		4000L	/* stop condition Set-up time */
+#define T_BUS_IDLE			4700L	/* time the bus must free after Tx */
+#endif	/* !I2C_SLOW_TIMING */
+
+#define NS2BCLK(x)	(((x)*125)/10000)
+
+/*
+ * TWSI Wire Operations
+ *
+ * About I2C_CLK_LOW():
+ *
+ * The Data Direction bit (I2C_DATA_DIR) has to be set to input when setting
+ * clock to low, to prevent the ASIC and the TWSI data client from driving the
+ * serial data line simultaneously (ASIC: last bit of a byte = '1', TWSI client
+ * send an 'ACK'). See also Concentrator Bugreport No. 10192.
+ */
+#define I2C_DATA_HIGH(IoC)	SK_I2C_SET_BIT(IoC, I2C_DATA)
+#define	I2C_DATA_LOW(IoC)	SK_I2C_CLR_BIT(IoC, I2C_DATA)
+#define	I2C_DATA_OUT(IoC)	SK_I2C_SET_BIT(IoC, I2C_DATA_DIR)
+#define	I2C_DATA_IN(IoC)	SK_I2C_CLR_BIT(IoC, I2C_DATA_DIR | I2C_DATA)
+#define	I2C_CLK_HIGH(IoC)	SK_I2C_SET_BIT(IoC, I2C_CLK)
+#define	I2C_CLK_LOW(IoC)	SK_I2C_CLR_BIT(IoC, I2C_CLK | I2C_DATA_DIR)
+#define	I2C_START_COND(IoC)	SK_I2C_CLR_BIT(IoC, I2C_CLK)
+
+#define NS2CLKT(x)	((x*125L)/10000)
+
+/*--------------- TWSI Interface Register Functions --------------- */
+
+/*
+ * sending one bit
+ */
+void SkI2cSndBit(
+SK_IOC	IoC,	/* I/O Context */
+SK_U8	Bit)	/* Bit to send */
+{
+	I2C_DATA_OUT(IoC);
+	if (Bit) {
+		I2C_DATA_HIGH(IoC);
+	}
+	else {
+		I2C_DATA_LOW(IoC);
+	}
+	SkDgWaitTime(IoC, NS2BCLK(T_DATA_IN_SETUP));
+	I2C_CLK_HIGH(IoC);
+	SkDgWaitTime(IoC, NS2BCLK(T_CLK_HIGH));
+	I2C_CLK_LOW(IoC);
+}	/* SkI2cSndBit*/
+
+
+/*
+ * Signal a start to the TWSI Bus.
+ *
+ * A start is signaled when data goes to low in a high clock cycle.
+ *
+ * Ends with Clock Low.
+ *
+ * Status: not tested
+ */
+void SkI2cStart(
+SK_IOC	IoC)	/* I/O Context */
+{
+	/* Init data and Clock to output lines */
+	/* Set Data high */
+	I2C_DATA_OUT(IoC);
+	I2C_DATA_HIGH(IoC);
+	/* Set Clock high */
+	I2C_CLK_HIGH(IoC);
+
+	SkDgWaitTime(IoC, NS2BCLK(T_START_SETUP));
+
+	/* Set Data Low */
+	I2C_DATA_LOW(IoC);
+
+	SkDgWaitTime(IoC, NS2BCLK(T_START_HOLD));
+
+	/* Clock low without Data to Input */
+	I2C_START_COND(IoC);
+
+	SkDgWaitTime(IoC, NS2BCLK(T_CLK_LOW));
+}	/* SkI2cStart */
+
+
+void SkI2cStop(
+SK_IOC	IoC)	/* I/O Context */
+{
+	/* Init data and Clock to output lines */
+	/* Set Data low */
+	I2C_DATA_OUT(IoC);
+	I2C_DATA_LOW(IoC);
+
+	SkDgWaitTime(IoC, NS2BCLK(T_CLK_2_DATA_OUT));
+
+	/* Set Clock high */
+	I2C_CLK_HIGH(IoC);
+
+	SkDgWaitTime(IoC, NS2BCLK(T_STOP_SETUP));
+
+	/*
+	 * Set Data High:	Do it by setting the Data Line to Input.
+	 *			Because of a pull up resistor the Data Line
+	 *			floods to high.
+	 */
+	I2C_DATA_IN(IoC);
+
+	/*
+	 *	When TWSI activity is stopped
+	 *	 o	DATA should be set to input and
+	 *	 o	CLOCK should be set to high!
+	 */
+	SkDgWaitTime(IoC, NS2BCLK(T_BUS_IDLE));
+}	/* SkI2cStop */
+
+
+/*
+ * Receive just one bit via the TWSI bus.
+ *
+ * Note:	Clock must be set to LOW before calling this function.
+ *
+ * Returns The received bit.
+ */
+int SkI2cRcvBit(
+SK_IOC	IoC)	/* I/O Context */
+{
+	int	Bit;
+	SK_U8	I2cSwCtrl;
+
+	/* Init data as input line */
+	I2C_DATA_IN(IoC);
+
+	SkDgWaitTime(IoC, NS2BCLK(T_CLK_2_DATA_OUT));
+
+	I2C_CLK_HIGH(IoC);
+
+	SkDgWaitTime(IoC, NS2BCLK(T_CLK_HIGH));
+
+	SK_I2C_GET_SW(IoC, &I2cSwCtrl);
+
+	Bit = (I2cSwCtrl & I2C_DATA) ? 1 : 0;
+
+	I2C_CLK_LOW(IoC);
+	SkDgWaitTime(IoC, NS2BCLK(T_CLK_LOW-T_CLK_2_DATA_OUT));
+
+	return(Bit);
+}	/* SkI2cRcvBit */
+
+
+/*
+ * Receive an ACK.
+ *
+ * returns	0 If acknowledged
+ *		1 in case of an error
+ */
+int SkI2cRcvAck(
+SK_IOC	IoC)	/* I/O Context */
+{
+	/*
+	 * Received bit must be zero.
+	 */
+	return(SkI2cRcvBit(IoC) != 0);
+}	/* SkI2cRcvAck */
+
+
+/*
+ * Send an NACK.
+ */
+void SkI2cSndNAck(
+SK_IOC	IoC)	/* I/O Context */
+{
+	/*
+	 * Received bit must be zero.
+	 */
+	SkI2cSndBit(IoC, 1);
+}	/* SkI2cSndNAck */
+
+
+/*
+ * Send an ACK.
+ */
+void SkI2cSndAck(
+SK_IOC IoC)	/* I/O Context */
+{
+	/*
+	 * Received bit must be zero.
+	 */
+	SkI2cSndBit(IoC, 0);
+}	/* SkI2cSndAck */
+
+
+/*
+ * Send one byte to the TWSI device and wait for ACK.
+ *
+ * Return acknowleged status.
+ */
+int SkI2cSndByte(
+SK_IOC	IoC,	/* I/O Context */
+int		Byte)	/* byte to send */
+{
+	int	i;
+
+	for (i = 0; i < 8; i++) {
+		if (Byte & (1<<(7-i))) {
+			SkI2cSndBit(IoC, 1);
+		}
+		else {
+			SkI2cSndBit(IoC, 0);
+		}
+	}
+
+	return(SkI2cRcvAck(IoC));
+}	/* SkI2cSndByte */
+
+
+/*
+ * Receive one byte and ack it.
+ *
+ * Return byte.
+ */
+int SkI2cRcvByte(
+SK_IOC	IoC,	/* I/O Context */
+int		Last)	/* Last Byte Flag */
+{
+	int	i;
+	int	Byte = 0;
+
+	for (i = 0; i < 8; i++) {
+		Byte <<= 1;
+		Byte |= SkI2cRcvBit(IoC);
+	}
+
+	if (Last) {
+		SkI2cSndNAck(IoC);
+	}
+	else {
+		SkI2cSndAck(IoC);
+	}
+
+	return(Byte);
+}	/* SkI2cRcvByte */
+
+
+/*
+ * Start dialog and send device address
+ *
+ * Return 0 if acknowleged, 1 in case of an error
+ */
+int	SkI2cSndDev(
+SK_IOC	IoC,	/* I/O Context */
+int		Addr,	/* Device Address */
+int		Rw)		/* Read / Write Flag */
+{
+	SkI2cStart(IoC);
+	Rw = ~Rw;
+	Rw &= I2C_WRITE;
+	return(SkI2cSndByte(IoC, (Addr<<1) | Rw));
+}	/* SkI2cSndDev */
+
+#endif /* SK_DIAG */
+
+/*----------------- TWSI CTRL Register Functions ----------*/
+
+/*
+ * waits for a completion of an TWSI transfer
+ *
+ * returns	0:	success, transfer completes
+ *			1:	error,	 transfer does not complete, TWSI transfer
+ *						 killed, wait loop terminated.
+ */
+int	SkI2cWait(
+SK_AC	*pAC,	/* Adapter Context */
+SK_IOC	IoC,	/* I/O Context */
+int		Event)	/* complete event to wait for (I2C_READ or I2C_WRITE) */
+{
+	SK_U64	StartTime;
+	SK_U64	CurrentTime;
+	SK_U32	I2cCtrl;
+
+	StartTime = SkOsGetTime(pAC);
+
+	do {
+		CurrentTime = SkOsGetTime(pAC);
+
+		if (CurrentTime - StartTime > SK_TICKS_PER_SEC / 8) {
+
+			SK_I2C_STOP(IoC);
+#ifndef SK_DIAG
+			SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_I2C_E002, SKERR_I2C_E002MSG);
+#endif /* !SK_DIAG */
+			return(1);
+		}
+
+		SK_I2C_GET_CTL(IoC, &I2cCtrl);
+
+#ifdef xYUKON_DBG
+		printf("StartTime=%lu, CurrentTime=%lu\n",
+			StartTime, CurrentTime);
+		if (kbhit()) {
+			return(1);
+		}
+#endif /* YUKON_DBG */
+
+	} while ((I2cCtrl & I2C_FLAG) == (SK_U32)Event << 31);
+
+	return(0);
+}	/* SkI2cWait */
+
+
+/*
+ * waits for a completion of an TWSI transfer
+ *
+ * Returns
+ *	Nothing
+ */
+void SkI2cWaitIrq(
+SK_AC	*pAC,	/* Adapter Context */
+SK_IOC	IoC)	/* I/O Context */
+{
+	SK_SENSOR	*pSen;
+	SK_U64		StartTime;
+	SK_U32		IrqSrc;
+	SK_U32		IsTwsiReadyBit;
+
+	IsTwsiReadyBit = CHIP_ID_YUKON_2(pAC) ? Y2_IS_TWSI_RDY : IS_I2C_READY;
+
+	pSen = &pAC->I2c.SenTable[pAC->I2c.CurrSens];
+
+	if (pSen->SenState == SK_SEN_IDLE) {
+		return;
+	}
+
+	StartTime = SkOsGetTime(pAC);
+
+	do {
+		if (SkOsGetTime(pAC) - StartTime > SK_TICKS_PER_SEC / 8) {
+
+			SK_I2C_STOP(IoC);
+#ifndef SK_DIAG
+			SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_I2C_E016, SKERR_I2C_E016MSG);
+#endif /* !SK_DIAG */
+			return;
+		}
+
+		SK_IN32(IoC, B0_ISRC, &IrqSrc);
+
+	} while ((IrqSrc & IsTwsiReadyBit) == 0);
+
+	pSen->SenState = SK_SEN_IDLE;
+	return;
+}	/* SkI2cWaitIrq */
+
+/*
+ * writes a single byte or 4 bytes into the TWSI device
+ *
+ * returns	0:	success
+ *			1:	error
+ */
+int SkI2cWrite(
+SK_AC	*pAC,		/* Adapter Context */
+SK_IOC	IoC,		/* I/O Context */
+SK_U32	I2cData,	/* TWSI Data to write */
+int		I2cDev,		/* TWSI Device Address */
+int		I2cDevSize,	/* TWSI Device Size (e.g. I2C_025K_DEV or I2C_2K_DEV) */
+int		I2cReg,		/* TWSI Device Register Address */
+int		I2cBurst)	/* TWSI Burst Flag */
+{
+	SK_OUT32(IoC, B2_I2C_DATA, I2cData);
+
+	SK_I2C_CTL(IoC, I2C_WRITE, I2cDev, I2cDevSize, I2cReg, I2cBurst);
+
+	return(SkI2cWait(pAC, IoC, I2C_WRITE));
+}	/* SkI2cWrite*/
+
+
+#ifdef	SK_DIAG
+/*
+ * reads a single byte or 4 bytes from the TWSI device
+ *
+ * returns	the word read
+ */
+SK_U32 SkI2cRead(
+SK_AC	*pAC,		/* Adapter Context */
+SK_IOC	IoC,		/* I/O Context */
+int		I2cDev,		/* TWSI Device Address */
+int		I2cDevSize,	/* TWSI Device Size (e.g. I2C_025K_DEV or I2C_2K_DEV) */
+int		I2cReg,		/* TWSI Device Register Address */
+int		I2cBurst)	/* TWSI Burst Flag */
+{
+	SK_U32	Data;
+
+	SK_OUT32(IoC, B2_I2C_DATA, 0);
+	SK_I2C_CTL(IoC, I2C_READ, I2cDev, I2cDevSize, I2cReg, I2cBurst);
+
+	if (SkI2cWait(pAC, IoC, I2C_READ) != 0) {
+		w_print("%s\n", SKERR_I2C_E002MSG);
+	}
+
+	SK_IN32(IoC, B2_I2C_DATA, &Data);
+
+	return(Data);
+}	/* SkI2cRead */
+#endif /* SK_DIAG */
+
+
+/*
+ * read a sensor's value
+ *
+ * This function reads a sensor's value from the TWSI sensor chip. The sensor
+ * is defined by its index into the sensors database in the struct pAC points
+ * to.
+ * Returns
+ *		1 if the read is completed
+ *		0 if the read must be continued (TWSI Bus still allocated)
+ */
+int	SkI2cReadSensor(
+SK_AC		*pAC,	/* Adapter Context */
+SK_IOC		IoC,	/* I/O Context */
+SK_SENSOR	*pSen)	/* Sensor to be read */
+{
+	if (pSen->SenRead != NULL) {
+		return((*pSen->SenRead)(pAC, IoC, pSen));
+	}
+
+	return(0); /* no success */
+}	/* SkI2cReadSensor */
+
+/*
+ * Do the Init state 0 initialization
+ */
+static int SkI2cInit0(
+SK_AC	*pAC)	/* Adapter Context */
+{
+	int	i;
+
+	/* Begin with first sensor */
+	pAC->I2c.CurrSens = 0;
+
+	/* Begin with timeout control for state machine */
+	pAC->I2c.TimerMode = SK_TIMER_WATCH_SM;
+
+	/* Set sensor number to zero */
+	pAC->I2c.MaxSens = 0;
+
+#ifndef SK_DIAG
+	/* Initialize Number of Dummy Reads */
+	pAC->I2c.DummyReads = SK_MAX_SENSORS;
+#endif /* !SK_DIAG */
+
+	for (i = 0; i < SK_MAX_SENSORS; i++) {
+		pAC->I2c.SenTable[i].SenDesc = "unknown";
+		pAC->I2c.SenTable[i].SenType = SK_SEN_UNKNOWN;
+		pAC->I2c.SenTable[i].SenThreErrHigh = 0;
+		pAC->I2c.SenTable[i].SenThreErrLow = 0;
+		pAC->I2c.SenTable[i].SenThreWarnHigh = 0;
+		pAC->I2c.SenTable[i].SenThreWarnLow = 0;
+		pAC->I2c.SenTable[i].SenReg = LM80_FAN2_IN;
+		pAC->I2c.SenTable[i].SenInit = SK_SEN_DYN_INIT_NONE;
+		pAC->I2c.SenTable[i].SenValue = 0;
+		pAC->I2c.SenTable[i].SenErrFlag = SK_SEN_ERR_NOT_PRESENT;
+		pAC->I2c.SenTable[i].SenErrCts = 0;
+		pAC->I2c.SenTable[i].SenBegErrTS = 0;
+		pAC->I2c.SenTable[i].SenState = SK_SEN_IDLE;
+		pAC->I2c.SenTable[i].SenRead = NULL;
+		pAC->I2c.SenTable[i].SenDev = 0;
+	}
+
+	/* Now we are "INIT data"ed */
+	pAC->I2c.InitLevel = SK_INIT_DATA;
+	return(0);
+}	/* SkI2cInit0*/
+
+
+/*
+ * Do the init state 1 initialization
+ *
+ * initialize the following register of the LM80:
+ * Configuration register:
+ * - START, noINT, activeLOW, noINT#Clear, noRESET, noCI, noGPO#, noINIT
+ *
+ * Interrupt Mask Register 1:
+ * - all interrupts are Disabled (0xff)
+ *
+ * Interrupt Mask Register 2:
+ * - all interrupts are Disabled (0xff) Interrupt modi doesn't matter.
+ *
+ * Fan Divisor/RST_OUT register:
+ * - Divisors set to 1 (bits 00), all others 0s.
+ *
+ * OS# Configuration/Temperature resolution Register:
+ * - all 0s
+ *
+ */
+static int SkI2cInit1(
+SK_AC	*pAC,	/* Adapter Context */
+SK_IOC	IoC)	/* I/O Context */
+{
+	int i;
+	SK_U8 I2cSwCtrl;
+	SK_GEPORT *pPrt;	/* GIni Port struct pointer */
+
+	if (pAC->I2c.InitLevel != SK_INIT_DATA) {
+		/* Re-init not needed in TWSI module */
+		return(0);
+	}
+
+	if (pAC->GIni.GIChipId == CHIP_ID_YUKON_EC ||
+		pAC->GIni.GIChipId == CHIP_ID_YUKON_FE) {
+		/* No sensors on Yukon-EC and Yukon-FE */
+		return(0);
+	}
+
+	/* Set the Direction of TWSI-Data Pin to IN */
+	SK_I2C_CLR_BIT(IoC, I2C_DATA_DIR | I2C_DATA);
+	/* Check for 32-Bit Yukon with Low at TWSI-Data Pin */
+	SK_I2C_GET_SW(IoC, &I2cSwCtrl);
+
+	if ((I2cSwCtrl & I2C_DATA) == 0) {
+		/* this is a 32-Bit board */
+		pAC->GIni.GIYukon32Bit = SK_TRUE;
+		return(0);
+	}
+
+	/* Check for 64 Bit Yukon without sensors */
+	if (SkI2cWrite(pAC, IoC, 0, LM80_ADDR, I2C_025K_DEV, LM80_CFG, 0) != 0) {
+		return(0);
+	}
+
+	(void)SkI2cWrite(pAC, IoC, 0xffUL, LM80_ADDR, I2C_025K_DEV, LM80_IMSK_1, 0);
+
+	(void)SkI2cWrite(pAC, IoC, 0xffUL, LM80_ADDR, I2C_025K_DEV, LM80_IMSK_2, 0);
+
+	(void)SkI2cWrite(pAC, IoC, 0, LM80_ADDR, I2C_025K_DEV, LM80_FAN_CTRL, 0);
+
+	(void)SkI2cWrite(pAC, IoC, 0, LM80_ADDR, I2C_025K_DEV, LM80_TEMP_CTRL, 0);
+
+	(void)SkI2cWrite(pAC, IoC, (SK_U32)LM80_CFG_START, LM80_ADDR, I2C_025K_DEV,
+		LM80_CFG, 0);
+
+	/*
+	 * MaxSens has to be updated here, because PhyType is not
+	 * set when performing Init Level 0
+	 */
+	pAC->I2c.MaxSens = 5;
+
+	pPrt = &pAC->GIni.GP[0];
+
+	if (pAC->GIni.GIGenesis) {
+		if (pPrt->PhyType == SK_PHY_BCOM) {
+			if (pAC->GIni.GIMacsFound == 1) {
+				pAC->I2c.MaxSens += 1;
+			}
+			else {
+				pAC->I2c.MaxSens += 3;
+			}
+		}
+	}
+	else {
+		pAC->I2c.MaxSens += 3;
+	}
+
+	for (i = 0; i < pAC->I2c.MaxSens; i++) {
+		switch (i) {
+		case 0:
+			pAC->I2c.SenTable[i].SenDesc = "Temperature";
+			pAC->I2c.SenTable[i].SenType = SK_SEN_TEMP;
+			pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_TEMP_HIGH_ERR;
+			pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_TEMP_HIGH_WARN;
+			pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_TEMP_LOW_WARN;
+			pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_TEMP_LOW_ERR;
+			pAC->I2c.SenTable[i].SenReg = LM80_TEMP_IN;
+			break;
+		case 1:
+			pAC->I2c.SenTable[i].SenDesc = "Voltage PCI";
+			pAC->I2c.SenTable[i].SenType = SK_SEN_VOLT;
+			pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_PCI_5V_HIGH_ERR;
+			pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_PCI_5V_HIGH_WARN;
+			if (pAC->GIni.GIPciBus != SK_PEX_BUS) {
+				pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_PCI_5V_LOW_WARN;
+				pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_PCI_5V_LOW_ERR;
+			}
+			else {
+				pAC->I2c.SenTable[i].SenThreWarnLow = 0;
+				pAC->I2c.SenTable[i].SenThreErrLow = 0;
+			}
+			pAC->I2c.SenTable[i].SenReg = LM80_VT0_IN;
+			break;
+		case 2:
+			pAC->I2c.SenTable[i].SenDesc = "Voltage PCI-IO";
+			pAC->I2c.SenTable[i].SenType = SK_SEN_VOLT;
+			pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_PCI_IO_5V_HIGH_ERR;
+			pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_PCI_IO_5V_HIGH_WARN;
+			if (pAC->GIni.GIPciBus != SK_PEX_BUS) {
+				pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_PCI_IO_3V3_LOW_WARN;
+				pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_PCI_IO_3V3_LOW_ERR;
+			}
+			else {
+				pAC->I2c.SenTable[i].SenThreWarnLow = 0;
+				pAC->I2c.SenTable[i].SenThreErrLow = 0;
+			}
+			pAC->I2c.SenTable[i].SenReg = LM80_VT1_IN;
+			pAC->I2c.SenTable[i].SenInit = SK_SEN_DYN_INIT_PCI_IO;
+			break;
+		case 3:
+			pAC->I2c.SenTable[i].SenDesc = "Voltage ASIC";
+			pAC->I2c.SenTable[i].SenType = SK_SEN_VOLT;
+			pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_VDD_HIGH_ERR;
+			pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_VDD_HIGH_WARN;
+			pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_VDD_LOW_WARN;
+			pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_VDD_LOW_ERR;
+			pAC->I2c.SenTable[i].SenReg = LM80_VT2_IN;
+			break;
+		case 4:
+			if (pAC->GIni.GIGenesis) {
+				if (pPrt->PhyType == SK_PHY_BCOM) {
+					pAC->I2c.SenTable[i].SenDesc = "Voltage PHY A PLL";
+					pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_PLL_3V3_HIGH_ERR;
+					pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_PLL_3V3_HIGH_WARN;
+					pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_PLL_3V3_LOW_WARN;
+					pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_PLL_3V3_LOW_ERR;
+				}
+				else {
+					pAC->I2c.SenTable[i].SenDesc = "Voltage PMA";
+					pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_PLL_3V3_HIGH_ERR;
+					pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_PLL_3V3_HIGH_WARN;
+					pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_PLL_3V3_LOW_WARN;
+					pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_PLL_3V3_LOW_ERR;
+				}
+			}
+			else {
+				pAC->I2c.SenTable[i].SenDesc = "Voltage VAUX";
+				pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_VAUX_3V3_HIGH_ERR;
+				pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_VAUX_3V3_HIGH_WARN;
+				if (pAC->GIni.GIVauxAvail) {
+					pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_VAUX_3V3_LOW_WARN;
+					pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_VAUX_3V3_LOW_ERR;
+				}
+				else {
+					pAC->I2c.SenTable[i].SenThreErrLow = 0;
+					pAC->I2c.SenTable[i].SenThreWarnLow = 0;
+				}
+			}
+			pAC->I2c.SenTable[i].SenType = SK_SEN_VOLT;
+			pAC->I2c.SenTable[i].SenReg = LM80_VT3_IN;
+			break;
+		case 5:
+			if (CHIP_ID_YUKON_2(pAC)) {
+				pAC->I2c.SenTable[i].SenDesc = "Voltage Core 1V3";
+				pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_CORE_1V2_HIGH_ERR;
+				pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_CORE_1V2_HIGH_WARN;
+				pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_CORE_1V2_LOW_WARN;
+				pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_CORE_1V2_LOW_ERR;
+			}
+			else {
+				if (pAC->GIni.GIGenesis) {
+					pAC->I2c.SenTable[i].SenDesc = "Voltage PHY 2V5";
+					pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_PHY_2V5_HIGH_ERR;
+					pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_PHY_2V5_HIGH_WARN;
+					pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_PHY_2V5_LOW_WARN;
+					pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_PHY_2V5_LOW_ERR;
+				}
+				else {
+					pAC->I2c.SenTable[i].SenDesc = "Voltage Core 1V5";
+					pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_CORE_1V5_HIGH_ERR;
+					pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_CORE_1V5_HIGH_WARN;
+					pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_CORE_1V5_LOW_WARN;
+					pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_CORE_1V5_LOW_ERR;
+				}
+			}
+			pAC->I2c.SenTable[i].SenType = SK_SEN_VOLT;
+			pAC->I2c.SenTable[i].SenReg = LM80_VT4_IN;
+			break;
+		case 6:
+			if (CHIP_ID_YUKON_2(pAC)) {
+				pAC->I2c.SenTable[i].SenDesc = "Voltage PHY 1V5";
+				pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_CORE_1V5_HIGH_ERR;
+				pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_CORE_1V5_HIGH_WARN;
+				if (pAC->GIni.GIPciBus == SK_PEX_BUS) {
+					pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_CORE_1V5_LOW_WARN;
+					pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_CORE_1V5_LOW_ERR;
+				}
+				else {
+					pAC->I2c.SenTable[i].SenThreWarnLow = 0;
+					pAC->I2c.SenTable[i].SenThreErrLow = 0;
+				}
+			}
+			else {
+				if (pAC->GIni.GIGenesis) {
+					pAC->I2c.SenTable[i].SenDesc = "Voltage PHY B PLL";
+				}
+				else {
+					pAC->I2c.SenTable[i].SenDesc = "Voltage PHY 3V3";
+				}
+				pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_PLL_3V3_HIGH_ERR;
+				pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_PLL_3V3_HIGH_WARN;
+				pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_PLL_3V3_LOW_WARN;
+				pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_PLL_3V3_LOW_ERR;
+			}
+			pAC->I2c.SenTable[i].SenType = SK_SEN_VOLT;
+			pAC->I2c.SenTable[i].SenReg = LM80_VT5_IN;
+			break;
+		case 7:
+			if (pAC->GIni.GIGenesis) {
+				pAC->I2c.SenTable[i].SenDesc = "Speed Fan";
+				pAC->I2c.SenTable[i].SenType = SK_SEN_FAN;
+				pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_FAN_HIGH_ERR;
+				pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_FAN_HIGH_WARN;
+				pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_FAN_LOW_WARN;
+				pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_FAN_LOW_ERR;
+				pAC->I2c.SenTable[i].SenReg = LM80_FAN2_IN;
+			}
+			else {
+				pAC->I2c.SenTable[i].SenDesc = "Voltage PHY 2V5";
+				pAC->I2c.SenTable[i].SenType = SK_SEN_VOLT;
+				pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_PHY_2V5_HIGH_ERR;
+				pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_PHY_2V5_HIGH_WARN;
+				pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_PHY_2V5_LOW_WARN;
+				pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_PHY_2V5_LOW_ERR;
+				pAC->I2c.SenTable[i].SenReg = LM80_VT6_IN;
+			}
+			break;
+		default:
+			SK_ERR_LOG(pAC, SK_ERRCL_INIT | SK_ERRCL_SW,
+				SKERR_I2C_E001, SKERR_I2C_E001MSG);
+			break;
+		}
+
+		pAC->I2c.SenTable[i].SenValue = 0;
+		pAC->I2c.SenTable[i].SenErrFlag = SK_SEN_ERR_OK;
+		pAC->I2c.SenTable[i].SenErrCts = 0;
+		pAC->I2c.SenTable[i].SenBegErrTS = 0;
+		pAC->I2c.SenTable[i].SenState = SK_SEN_IDLE;
+		pAC->I2c.SenTable[i].SenRead = SkLm80ReadSensor;
+		pAC->I2c.SenTable[i].SenDev = LM80_ADDR;
+	}
+
+#ifndef SK_DIAG
+	pAC->I2c.DummyReads = pAC->I2c.MaxSens;
+#endif /* !SK_DIAG */
+
+	/* Clear TWSI IRQ */
+	SK_OUT32(IoC, B2_I2C_IRQ, I2C_CLR_IRQ);
+
+	/* Now we are I/O initialized */
+	pAC->I2c.InitLevel = SK_INIT_IO;
+	return(0);
+}	/* SkI2cInit1 */
+
+
+/*
+ * Init level 2: Start first sensor read.
+ */
+static int SkI2cInit2(
+SK_AC	*pAC,	/* Adapter Context */
+SK_IOC	IoC)	/* I/O Context */
+{
+	int		ReadComplete;
+	SK_SENSOR	*pSen;
+
+	if (pAC->I2c.InitLevel != SK_INIT_IO) {
+		/* ReInit not needed in TWSI module */
+		/* Init0 and Init2 not permitted */
+		return(0);
+	}
+
+	pSen = &pAC->I2c.SenTable[pAC->I2c.CurrSens];
+	ReadComplete = SkI2cReadSensor(pAC, IoC, pSen);
+
+	if (ReadComplete) {
+		SK_ERR_LOG(pAC, SK_ERRCL_INIT, SKERR_I2C_E008, SKERR_I2C_E008MSG);
+	}
+
+	/* Now we are correctly initialized */
+	pAC->I2c.InitLevel = SK_INIT_RUN;
+
+	return(0);
+}	/* SkI2cInit2*/
+
+
+/*
+ * Initialize TWSI devices
+ *
+ * Get the first voltage value and discard it.
+ * Go into temperature read mode. A default pointer is not set.
+ *
+ * The things to be done depend on the init level in the parameter list:
+ * Level 0:
+ *	Initialize only the data structures. Do NOT access hardware.
+ * Level 1:
+ *	Initialize hardware through SK_IN / SK_OUT commands. Do NOT use interrupts.
+ * Level 2:
+ *	Everything is possible. Interrupts may be used from now on.
+ *
+ * return:
+ *	0 = success
+ *	other = error.
+ */
+int	SkI2cInit(
+SK_AC	*pAC,	/* Adapter Context */
+SK_IOC	IoC,	/* I/O Context needed in levels 1 and 2 */
+int		Level)	/* Init Level */
+{
+
+	switch (Level) {
+	case SK_INIT_DATA:
+		return(SkI2cInit0(pAC));
+	case SK_INIT_IO:
+		return(SkI2cInit1(pAC, IoC));
+	case SK_INIT_RUN:
+		return(SkI2cInit2(pAC, IoC));
+	default:
+		break;
+	}
+
+	return(0);
+}	/* SkI2cInit */
+
+
+#ifndef SK_DIAG
+/*
+ * Interrupt service function for the TWSI Interface
+ *
+ * Clears the Interrupt source
+ *
+ * Reads the register and check it for sending a trap.
+ *
+ * Starts the timer if necessary.
+ */
+void SkI2cIsr(
+SK_AC	*pAC,	/* Adapter Context */
+SK_IOC	IoC)	/* I/O Context */
+{
+	SK_EVPARA	Para;
+
+	/* Clear TWSI IRQ */
+	SK_OUT32(IoC, B2_I2C_IRQ, I2C_CLR_IRQ);
+
+	Para.Para64 = 0;
+	SkEventQueue(pAC, SKGE_I2C, SK_I2CEV_IRQ, Para);
+}	/* SkI2cIsr */
+
+
+/*
+ * Check this sensors Value against the threshold and send events.
+ */
+static void SkI2cCheckSensor(
+SK_AC		*pAC,	/* Adapter Context */
+SK_SENSOR	*pSen)
+{
+	SK_EVPARA	ParaLocal;
+	SK_BOOL		TooHigh;	/* Is sensor too high? */
+	SK_BOOL		TooLow;		/* Is sensor too low? */
+	SK_U64		CurrTime;	/* Current Time */
+	SK_BOOL		DoTrapSend;	/* We need to send a trap */
+	SK_BOOL		DoErrLog;	/* We need to log the error */
+	SK_BOOL		IsError;	/* We need to log the error */
+
+	/* Check Dummy Reads first */
+	if (pAC->I2c.DummyReads > 0) {
+		pAC->I2c.DummyReads--;
+		return;
+	}
+
+	/* Get the current time */
+	CurrTime = SkOsGetTime(pAC);
+
+	/* Set para to the most useful setting: The current sensor. */
+	ParaLocal.Para64 = (SK_U64)pAC->I2c.CurrSens;
+
+	/* Check the Value against the thresholds. First: Error Thresholds */
+	TooHigh = (pSen->SenValue > pSen->SenThreErrHigh);
+	TooLow = (pSen->SenValue < pSen->SenThreErrLow);
+
+	IsError = SK_FALSE;
+	if (TooHigh || TooLow) {
+		/* Error condition is satisfied */
+		DoTrapSend = SK_TRUE;
+		DoErrLog = SK_TRUE;
+
+		/* Now error condition is satisfied */
+		IsError = SK_TRUE;
+
+		if (pSen->SenErrFlag == SK_SEN_ERR_ERR) {
+			/* This state is the former one */
+
+			/* So check first whether we have to send a trap */
+			if (pSen->SenLastErrTrapTS + SK_SEN_ERR_TR_HOLD > CurrTime) {
+				/*
+				 * Do NOT send the Trap. The hold back time
+				 * has to run out first.
+				 */
+				DoTrapSend = SK_FALSE;
+			}
+
+			/* Check now whether we have to log an Error */
+			if (pSen->SenLastErrLogTS + SK_SEN_ERR_LOG_HOLD > CurrTime) {
+				/*
+				 * Do NOT log the error. The hold back time
+				 * has to run out first.
+				 */
+				DoErrLog = SK_FALSE;
+			}
+		}
+		else {
+			/* We came from a different state -> Set Begin Time Stamp */
+			pSen->SenBegErrTS = CurrTime;
+			pSen->SenErrFlag = SK_SEN_ERR_ERR;
+		}
+
+		if (DoTrapSend) {
+			/* Set current Time */
+			pSen->SenLastErrTrapTS = CurrTime;
+			pSen->SenErrCts++;
+
+			/* Queue PNMI Event */
+			SkEventQueue(pAC, SKGE_PNMI, (TooHigh ?
+				SK_PNMI_EVT_SEN_ERR_UPP : SK_PNMI_EVT_SEN_ERR_LOW),
+				ParaLocal);
+		}
+
+		if (DoErrLog) {
+			/* Set current Time */
+			pSen->SenLastErrLogTS = CurrTime;
+
+			if (pSen->SenType == SK_SEN_TEMP) {
+				SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_I2C_E011, SKERR_I2C_E011MSG);
+			}
+			else if (pSen->SenType == SK_SEN_VOLT) {
+				SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_I2C_E012, SKERR_I2C_E012MSG);
+			}
+			else {
+				SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_I2C_E015, SKERR_I2C_E015MSG);
+			}
+		}
+	}
+
+	/* Check the Value against the thresholds */
+	/* 2nd: Warning thresholds */
+	TooHigh = (pSen->SenValue > pSen->SenThreWarnHigh);
+	TooLow = (pSen->SenValue < pSen->SenThreWarnLow);
+
+	if (!IsError && (TooHigh || TooLow)) {
+		/* Error condition is satisfied */
+		DoTrapSend = SK_TRUE;
+		DoErrLog = SK_TRUE;
+
+		if (pSen->SenErrFlag == SK_SEN_ERR_WARN) {
+			/* This state is the former one */
+
+			/* So check first whether we have to send a trap */
+			if (pSen->SenLastWarnTrapTS + SK_SEN_WARN_TR_HOLD > CurrTime) {
+				/*
+				 * Do NOT send the Trap. The hold back time
+				 * has to run out first.
+				 */
+				DoTrapSend = SK_FALSE;
+			}
+
+			/* Check now whether we have to log an Error */
+			if (pSen->SenLastWarnLogTS + SK_SEN_WARN_LOG_HOLD > CurrTime) {
+				/*
+				 * Do NOT log the error. The hold back time
+				 * has to run out first.
+				 */
+				DoErrLog = SK_FALSE;
+			}
+		}
+		else {
+			/* We came from a different state -> Set Begin Time Stamp */
+			pSen->SenBegWarnTS = CurrTime;
+			pSen->SenErrFlag = SK_SEN_ERR_WARN;
+		}
+
+		if (DoTrapSend) {
+			/* Set current Time */
+			pSen->SenLastWarnTrapTS = CurrTime;
+			pSen->SenWarnCts++;
+
+			/* Queue PNMI Event */
+			SkEventQueue(pAC, SKGE_PNMI, (TooHigh ?
+				SK_PNMI_EVT_SEN_WAR_UPP : SK_PNMI_EVT_SEN_WAR_LOW),
+				ParaLocal);
+		}
+
+		if (DoErrLog) {
+			/* Set current Time */
+			pSen->SenLastWarnLogTS = CurrTime;
+
+			if (pSen->SenType == SK_SEN_TEMP) {
+				SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_I2C_E009, SKERR_I2C_E009MSG);
+			}
+			else if (pSen->SenType == SK_SEN_VOLT) {
+				SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_I2C_E010, SKERR_I2C_E010MSG);
+			}
+			else {
+				SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_I2C_E014, SKERR_I2C_E014MSG);
+			}
+		}
+	}
+
+	/* Check for NO error at all */
+	if (!IsError && !TooHigh && !TooLow) {
+		/* Set o.k. Status if no error and no warning condition */
+		pSen->SenErrFlag = SK_SEN_ERR_OK;
+	}
+
+	/* End of check against the thresholds */
+
+	/* Bug fix AF: 16.Aug.2001: Correct the init base
+	 * of LM80 sensor.
+	 */
+	if (pSen->SenInit == SK_SEN_DYN_INIT_PCI_IO) {
+
+		pSen->SenInit = SK_SEN_DYN_INIT_NONE;
+
+		if (pSen->SenValue > SK_SEN_PCI_IO_RANGE_LIMITER) {
+			/* 5V PCI-IO Voltage */
+			pSen->SenThreWarnLow = SK_SEN_PCI_IO_5V_LOW_WARN;
+			pSen->SenThreErrLow = SK_SEN_PCI_IO_5V_LOW_ERR;
+		}
+		else {
+			/* 3.3V PCI-IO Voltage */
+			pSen->SenThreWarnHigh = SK_SEN_PCI_IO_3V3_HIGH_WARN;
+			pSen->SenThreErrHigh = SK_SEN_PCI_IO_3V3_HIGH_ERR;
+		}
+	}
+	
+#ifdef TEST_ONLY
+	/* Dynamic thresholds also for VAUX of LM80 sensor */
+	if (pSen->SenInit == SK_SEN_DYN_INIT_VAUX) {
+
+		pSen->SenInit = SK_SEN_DYN_INIT_NONE;
+
+		/* 3.3V VAUX Voltage */
+		if (pSen->SenValue > SK_SEN_VAUX_RANGE_LIMITER) {
+			pSen->SenThreWarnLow = SK_SEN_VAUX_3V3_LOW_WARN;
+			pSen->SenThreErrLow = SK_SEN_VAUX_3V3_LOW_ERR;
+		}
+		/* 0V VAUX Voltage */
+		else {
+			pSen->SenThreWarnHigh = SK_SEN_VAUX_0V_WARN_ERR;
+			pSen->SenThreErrHigh = SK_SEN_VAUX_0V_WARN_ERR;
+		}
+	}
+
+	/*
+	 * Check initialization state:
+	 * The VIO Thresholds need adaption
+	 */
+	if (!pSen->SenInit && pSen->SenReg == LM80_VT1_IN &&
+		 pSen->SenValue > SK_SEN_WARNLOW2C &&
+		 pSen->SenValue < SK_SEN_WARNHIGH2) {
+
+		pSen->SenThreErrLow = SK_SEN_ERRLOW2C;
+		pSen->SenThreWarnLow = SK_SEN_WARNLOW2C;
+		pSen->SenInit = SK_TRUE;
+	}
+
+	if (!pSen->SenInit && pSen->SenReg == LM80_VT1_IN &&
+		 pSen->SenValue > SK_SEN_WARNLOW2 &&
+		 pSen->SenValue < SK_SEN_WARNHIGH2C) {
+
+		pSen->SenThreErrHigh = SK_SEN_ERRHIGH2C;
+		pSen->SenThreWarnHigh = SK_SEN_WARNHIGH2C;
+		pSen->SenInit = SK_TRUE;
+	}
+#endif
+
+	if (pSen->SenInit != SK_SEN_DYN_INIT_NONE) {
+		SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_I2C_E013, SKERR_I2C_E013MSG);
+	}
+}	/* SkI2cCheckSensor */
+
+
+/*
+ * The only Event to be served is the timeout event
+ *
+ */
+int	SkI2cEvent(
+SK_AC		*pAC,	/* Adapter Context */
+SK_IOC		IoC,	/* I/O Context */
+SK_U32		Event,	/* Module specific Event */
+SK_EVPARA	Para)	/* Event specific Parameter */
+{
+	int			ReadComplete;
+	SK_SENSOR	*pSen;
+	SK_U32		Time;
+	SK_EVPARA	ParaLocal;
+	int			i;
+
+	/* New case: no sensors */
+	if (pAC->I2c.MaxSens == 0) {
+		return(0);
+	}
+
+	switch (Event) {
+	case SK_I2CEV_IRQ:
+		pSen = &pAC->I2c.SenTable[pAC->I2c.CurrSens];
+		ReadComplete = SkI2cReadSensor(pAC, IoC, pSen);
+
+		if (ReadComplete) {
+			/* Check sensor against defined thresholds */
+			SkI2cCheckSensor(pAC, pSen);
+
+			/* Increment Current sensor and set appropriate Timeout */
+			pAC->I2c.CurrSens++;
+			if (pAC->I2c.CurrSens >= pAC->I2c.MaxSens) {
+				pAC->I2c.CurrSens = 0;
+				Time = SK_I2C_TIM_LONG;
+			}
+			else {
+				Time = SK_I2C_TIM_SHORT;
+			}
+
+			/* Start Timer */
+			ParaLocal.Para64 = (SK_U64)0;
+
+			pAC->I2c.TimerMode = SK_TIMER_NEW_GAUGING;
+
+			SkTimerStart(pAC, IoC, &pAC->I2c.SenTimer, Time,
+				SKGE_I2C, SK_I2CEV_TIM, ParaLocal);
+		}
+		else {
+			/* Start Timer */
+			ParaLocal.Para64 = (SK_U64)0;
+
+			pAC->I2c.TimerMode = SK_TIMER_WATCH_SM;
+
+			SkTimerStart(pAC, IoC, &pAC->I2c.SenTimer, SK_I2C_TIM_WATCH,
+				SKGE_I2C, SK_I2CEV_TIM, ParaLocal);
+		}
+		break;
+	case SK_I2CEV_TIM:
+		if (pAC->I2c.TimerMode == SK_TIMER_NEW_GAUGING) {
+
+			ParaLocal.Para64 = (SK_U64)0;
+			SkTimerStop(pAC, IoC, &pAC->I2c.SenTimer);
+
+			pSen = &pAC->I2c.SenTable[pAC->I2c.CurrSens];
+			ReadComplete = SkI2cReadSensor(pAC, IoC, pSen);
+
+			if (ReadComplete) {
+				/* Check sensor against defined thresholds */
+				SkI2cCheckSensor(pAC, pSen);
+
+				/* Increment Current sensor and set appropriate Timeout */
+				pAC->I2c.CurrSens++;
+				if (pAC->I2c.CurrSens == pAC->I2c.MaxSens) {
+					pAC->I2c.CurrSens = 0;
+					Time = SK_I2C_TIM_LONG;
+				}
+				else {
+					Time = SK_I2C_TIM_SHORT;
+				}
+
+				/* Start Timer */
+				ParaLocal.Para64 = (SK_U64)0;
+
+				pAC->I2c.TimerMode = SK_TIMER_NEW_GAUGING;
+
+				SkTimerStart(pAC, IoC, &pAC->I2c.SenTimer, Time,
+					SKGE_I2C, SK_I2CEV_TIM, ParaLocal);
+			}
+		}
+		else {
+			pSen = &pAC->I2c.SenTable[pAC->I2c.CurrSens];
+			pSen->SenErrFlag = SK_SEN_ERR_FAULTY;
+			SK_I2C_STOP(IoC);
+
+			/* Increment Current sensor and set appropriate Timeout */
+			pAC->I2c.CurrSens++;
+			if (pAC->I2c.CurrSens == pAC->I2c.MaxSens) {
+				pAC->I2c.CurrSens = 0;
+				Time = SK_I2C_TIM_LONG;
+			}
+			else {
+				Time = SK_I2C_TIM_SHORT;
+			}
+
+			/* Start Timer */
+			ParaLocal.Para64 = (SK_U64)0;
+
+			pAC->I2c.TimerMode = SK_TIMER_NEW_GAUGING;
+
+			SkTimerStart(pAC, IoC, &pAC->I2c.SenTimer, Time,
+				SKGE_I2C, SK_I2CEV_TIM, ParaLocal);
+		}
+		break;
+	case SK_I2CEV_CLEAR:
+		for (i = 0; i < SK_MAX_SENSORS; i++) {
+			pAC->I2c.SenTable[i].SenErrFlag = SK_SEN_ERR_OK;
+			pAC->I2c.SenTable[i].SenErrCts = 0;
+			pAC->I2c.SenTable[i].SenWarnCts = 0;
+			pAC->I2c.SenTable[i].SenBegErrTS = 0;
+			pAC->I2c.SenTable[i].SenBegWarnTS = 0;
+			pAC->I2c.SenTable[i].SenLastErrTrapTS = (SK_U64)0;
+			pAC->I2c.SenTable[i].SenLastErrLogTS = (SK_U64)0;
+			pAC->I2c.SenTable[i].SenLastWarnTrapTS = (SK_U64)0;
+			pAC->I2c.SenTable[i].SenLastWarnLogTS = (SK_U64)0;
+		}
+		break;
+	default:
+		SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_I2C_E006, SKERR_I2C_E006MSG);
+	}
+
+	return(0);
+}	/* SkI2cEvent*/
+
+#endif /* !SK_DIAG */
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/skvpd.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/skvpd.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/skvpd.c	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/skvpd.c	2004-09-09 13:20:49.000000000 +0200
@@ -1,22 +1,22 @@
 /******************************************************************************
  *
  * Name:	skvpd.c
- * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.37 $
- * Date:	$Date: 2003/01/13 10:42:45 $
- * Purpose:	Shared software to read and write VPD data
+ * Project:	Gigabit Ethernet Adapters, VPD-Module
+ * Version:	$Revision: 2.4 $
+ * Date:	$Date: 2004/08/11 14:24:49 $
+ * Purpose:	Shared software to read and write VPD
  *
  ******************************************************************************/
 
 /******************************************************************************
  *
- *	(C)Copyright 1998-2003 SysKonnect GmbH.
+ *	(C)Copyright 1998-2002 SysKonnect.
+ *	(C)Copyright 2002-2004 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
  *	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.
  *
  ******************************************************************************/
@@ -25,7 +25,7 @@
 	Please refer skvpd.txt for infomation how to include this module
  */
 static const char SysKonnectFileId[] =
-	"@(#)$Id: skvpd.c,v 1.37 2003/01/13 10:42:45 rschmidt Exp $ (C) SK";
+	"@(#) $Id: skvpd.c,v 2.4 2004/08/11 14:24:49 rschmidt Exp $ (C) Marvell.";
 
 #include "h/skdrv1st.h"
 #include "h/sktypes.h"
@@ -59,7 +59,7 @@ int		event)	/* event to wait for (VPD_RE
 	SK_U64	start_time;
 	SK_U16	state;
 
-	SK_DBG_MSG(pAC,SK_DBGMOD_VPD, SK_DBGCAT_CTRL,
+	SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_CTRL,
 		("VPD wait for %s\n", event?"Write":"Read"));
 	start_time = SkOsGetTime(pAC);
 	do {
@@ -81,12 +81,12 @@ int		event)	/* event to wait for (VPD_RE
 				("ERROR:VPD wait timeout\n"));
 			return(1);
 		}
-		
+
 		VPD_IN16(pAC, IoC, PCI_VPD_ADR_REG, &state);
-		
+
 		SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_CTRL,
 			("state = %x, event %x\n",state,event));
-	} while((int)(state & PCI_VPD_FLAG) == event);
+	} while ((int)(state & PCI_VPD_FLAG) == event);
 
 	return(0);
 }
@@ -124,7 +124,7 @@ int		addr)	/* VPD address */
 	Rtv = 0;
 
 	VPD_IN32(pAC, IoC, PCI_VPD_DAT_REG, &Rtv);
-	
+
 	SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_CTRL,
 		("VPD read dword data = 0x%x\n",Rtv));
 	return(Rtv);
@@ -269,9 +269,9 @@ int		Len)	/* number of bytes to read / t
 			}
 
 			for (j = 0; j <= (int)(i%sizeof(SK_U32)); j++, pComp++) {
-				
+
 				VPD_IN8(pAC, IoC, PCI_VPD_DAT_REG + j, &Data);
-				
+
 				if (Data != *pComp) {
 					/* Verify Error */
 					SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
@@ -350,14 +350,14 @@ int		dir)	/* transfer direction may be V
 		return(0);
 
 	vpd_rom_size = pAC->vpd.rom_size;
-	
+
 	if (addr > vpd_rom_size - 4) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR | SK_DBGCAT_FATAL,
 			("Address error: 0x%x, exp. < 0x%x\n",
 			addr, vpd_rom_size - 4));
 		return(0);
 	}
-	
+
 	if (addr + len > vpd_rom_size) {
 		len = vpd_rom_size - addr;
 		SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
@@ -374,7 +374,7 @@ int		dir)	/* transfer direction may be V
 	return(Rtv);
 }
 
-#ifdef SKDIAG
+#if defined (SKDIAG) || defined (SK_ASF)
 
 /*
  *	Read 'len' bytes of VPD data, starting at 'addr'.
@@ -407,16 +407,24 @@ int		len)	/* number of bytes to write */
 }
 #endif	/* SKDIAG */
 
-/*
- * (re)initialize the VPD buffer
+/******************************************************************************
  *
- * Reads the VPD data from the EEPROM into the VPD buffer.
- * Get the remaining read only and read / write space.
+ *	VpdInit() - (re)initialize the VPD buffer
  *
- * return	0:	success
- *		1:	fatal VPD error
+ * Description:
+ *	Reads the VPD data from the EEPROM into the VPD buffer.
+ *	Get the remaining read only and read / write space.
+ *
+ * Note:
+ *	This is a local function and should be used locally only.
+ *	However, the ASF module needs to use this function also.
+ *	Therfore it has been published.
+ *
+ * Returns:
+ *	0:	success
+ *	1:	fatal VPD error
  */
-static int VpdInit(
+int VpdInit(
 SK_AC	*pAC,	/* Adapters context */
 SK_IOC	IoC)	/* IO Context */
 {
@@ -428,13 +436,13 @@ SK_IOC	IoC)	/* IO Context */
 	SK_U32	our_reg2;
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_INIT, ("VpdInit .. "));
-	
+
 	VPD_IN16(pAC, IoC, PCI_DEVICE_ID, &dev_id);
-	
+
 	VPD_IN32(pAC, IoC, PCI_OUR_REG_2, &our_reg2);
-	
+
 	pAC->vpd.rom_size = 256 << ((our_reg2 & PCI_VPD_ROM_SZ) >> 14);
-	
+
 	/*
 	 * this function might get used before the hardware is initialized
 	 * therefore we cannot always trust in GIChipId
@@ -465,18 +473,25 @@ SK_IOC	IoC)	/* IO Context */
 			("Block Read Error\n"));
 		return(1);
 	}
-	
+
 	pAC->vpd.vpd_size = vpd_size;
 
+	/* Asus K8V Se Deluxe bugfix. Correct VPD content */
+	i = 62;
+	if(!strncmp(pAC->vpd.vpd_buf + i, " 8<E", 4)) {
+
+		pAC->vpd.vpd_buf[i + 2] = '8';
+	}
+
 	/* find the end tag of the RO area */
 	if (!(r = vpd_find_para(pAC, VPD_RV, &rp))) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR | SK_DBGCAT_FATAL,
 			("Encoding Error: RV Tag not found\n"));
 		return(1);
 	}
-	
+
 	if (r->p_val + r->p_len > pAC->vpd.vpd_buf + vpd_size/2) {
-		SK_DBG_MSG(pAC,SK_DBGMOD_VPD,SK_DBGCAT_ERR | SK_DBGCAT_FATAL,
+		SK_DBG_MSG(pAC, SK_DBGMOD_VPD,SK_DBGCAT_ERR | SK_DBGCAT_FATAL,
 			("Encoding Error: Invalid VPD struct size\n"));
 		return(1);
 	}
@@ -486,7 +501,7 @@ SK_IOC	IoC)	/* IO Context */
 	for (i = 0, x = 0; (unsigned)i <= (unsigned)vpd_size/2 - r->p_len; i++) {
 		x += pAC->vpd.vpd_buf[i];
 	}
-	
+
 	if (x != 0) {
 		/* checksum error */
 		SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR | SK_DBGCAT_FATAL,
@@ -500,7 +515,7 @@ SK_IOC	IoC)	/* IO Context */
 			("Encoding Error: RV Tag not found\n"));
 		return(1);
 	}
-	
+
 	if (r->p_val < pAC->vpd.vpd_buf + vpd_size/2) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR | SK_DBGCAT_FATAL,
 			("Encoding Error: Invalid VPD struct size\n"));
@@ -530,7 +545,7 @@ SK_IOC	IoC)	/* IO Context */
 static SK_VPD_PARA *vpd_find_para(
 SK_AC		*pAC,	/* common data base */
 const char	*key,	/* keyword to find (e.g. "MN") */
-SK_VPD_PARA *p)		/* parameter description struct */
+SK_VPD_PARA	*p)		/* parameter description struct */
 {
 	char *v	;	/* points to VPD buffer */
 	int max;	/* Maximum Number of Iterations */
@@ -545,7 +560,7 @@ SK_VPD_PARA *p)		/* parameter descriptio
 	if (*v != (char)RES_ID) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR | SK_DBGCAT_FATAL,
 			("Error: 0x%x missing\n", RES_ID));
-		return(0);
+		return NULL;
 	}
 
 	if (strcmp(key, VPD_NAME) == 0) {
@@ -558,7 +573,7 @@ SK_VPD_PARA *p)		/* parameter descriptio
 
 	v += 3 + VPD_GET_RES_LEN(v) + 3;
 	for (;; ) {
-		if (SK_MEMCMP(key,v,2) == 0) {
+		if (SK_MEMCMP(key, v, 2) == 0) {
 			p->p_len = VPD_GET_VPD_LEN(v);
 			p->p_val = VPD_GET_VAL(v);
 			SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_CTRL,
@@ -568,11 +583,11 @@ SK_VPD_PARA *p)		/* parameter descriptio
 
 		/* exit when reaching the "RW" Tag or the maximum of itera. */
 		max--;
-		if (SK_MEMCMP(VPD_RW,v,2) == 0 || max == 0) {
+		if (SK_MEMCMP(VPD_RW, v, 2) == 0 || max == 0) {
 			break;
 		}
 
-		if (SK_MEMCMP(VPD_RV,v,2) == 0) {
+		if (SK_MEMCMP(VPD_RV, v, 2) == 0) {
 			v += 3 + VPD_GET_VPD_LEN(v) + 3;	/* skip VPD-W */
 		}
 		else {
@@ -589,7 +604,7 @@ SK_VPD_PARA *p)		/* parameter descriptio
 			("Key/Len Encoding error\n"));
 	}
 #endif /* DEBUG */
-	return(0);
+	return NULL;
 }
 
 /*
@@ -671,7 +686,7 @@ char	*etp)		/* end pointer input positio
 
 	if (p->p_key[0] != 'R' || (p->p_key[1] != 'V' && p->p_key[1] != 'W')) {
 		/* something wrong here, encoding error */
-		SK_DBG_MSG(pAC,SK_DBGMOD_VPD,SK_DBGCAT_ERR | SK_DBGCAT_FATAL,
+		SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR | SK_DBGCAT_FATAL,
 			("Encoding Error: invalid end tag\n"));
 		return(1);
 	}
@@ -736,11 +751,11 @@ int		op)			/* operation to do: ADD_KEY o
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_CTRL,
 		("VPD setup para key = %s, val = %s\n",key,buf));
-	
+
 	vpd_size = pAC->vpd.vpd_size;
 
 	rtv = 0;
-	ip = 0;
+	ip = NULL;
 	if (type == VPD_RW_KEY) {
 		/* end tag is "RW" */
 		free = pAC->vpd.v.vpd_free_rw;
@@ -875,7 +890,7 @@ int		*elements)	/* number of keywords re
 	}
 	else {
 		*len = 0;
-		SK_DBG_MSG(pAC,SK_DBGMOD_VPD,SK_DBGCAT_ERR,
+		SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
 			("buffer overflow\n"));
 		return(2);
 	}
@@ -1071,7 +1086,7 @@ char	*key)	/* keyword to read (e.g. "MN"
 
 	vpd_size = pAC->vpd.vpd_size;
 
-	SK_DBG_MSG(pAC,SK_DBGMOD_VPD,SK_DBGCAT_TX,("VPD delete key %s\n",key));
+	SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_TX, ("VPD delete key %s\n", key));
 	if ((pAC->vpd.v.vpd_status & VPD_VALID) == 0) {
 		if (VpdInit(pAC, IoC) != 0) {
 			SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/skxmac2.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/skxmac2.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/skxmac2.c	2004-06-29 11:24:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/skxmac2.c	2004-09-09 13:20:49.000000000 +0200
@@ -2,8 +2,8 @@
  *
  * Name:	skxmac2.c
  * Project:	Gigabit Ethernet Adapters, Common Modules
- * Version:	$Revision: 1.103 $
- * Date:	$Date: 2004/01/21 15:55:50 $
+ * Version:	$Revision: 2.25 $
+ * Date:	$Date: 2004/08/13 09:49:09 $
  * Purpose:	Contains functions to initialize the MACs and PHYs
  *
  ******************************************************************************/
@@ -11,13 +11,12 @@
 /******************************************************************************
  *
  *	(C)Copyright 1998-2002 SysKonnect.
- *	(C)Copyright 2002-2003 Marvell.
+ *	(C)Copyright 2002-2004 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
  *	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.
  *
  ******************************************************************************/
@@ -37,7 +36,7 @@ typedef struct s_PhyHack {
 
 #if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
 static const char SysKonnectFileId[] =
-	"@(#) $Id: skxmac2.c,v 1.103 2004/01/21 15:55:50 rschmidt Exp $ (C) Marvell.";
+	"@(#) $Id: skxmac2.c,v 2.25 2004/08/13 09:49:09 rschmidt Exp $ (C) Marvell.";
 #endif
 
 #ifdef GENESIS
@@ -94,13 +93,13 @@ SK_U16	SK_FAR *pVal)	/* Pointer to Value
 	SK_GEPORT	*pPrt;
 
 	pPrt = &pAC->GIni.GP[Port];
-	
+
 	/* write the PHY register's address */
 	XM_OUT16(IoC, Port, XM_PHY_ADDR, PhyReg | pPrt->PhyAddr);
-	
+
 	/* get the PHY register's value */
 	XM_IN16(IoC, Port, XM_PHY_DATA, pVal);
-	
+
 	if (pPrt->PhyType != SK_PHY_XMAC) {
 		do {
 			XM_IN16(IoC, Port, XM_MMU_CMD, &Mmu);
@@ -110,7 +109,7 @@ SK_U16	SK_FAR *pVal)	/* Pointer to Value
 		/* get the PHY register's value */
 		XM_IN16(IoC, Port, XM_PHY_DATA, pVal);
 	}
-	
+
 	return(0);
 }	/* SkXmPhyRead */
 
@@ -135,27 +134,27 @@ SK_U16	Val)		/* Value */
 	SK_GEPORT	*pPrt;
 
 	pPrt = &pAC->GIni.GP[Port];
-	
+
 	if (pPrt->PhyType != SK_PHY_XMAC) {
 		do {
 			XM_IN16(IoC, Port, XM_MMU_CMD, &Mmu);
 			/* wait until 'Busy' is cleared */
 		} while ((Mmu & XM_MMU_PHY_BUSY) != 0);
 	}
-	
+
 	/* write the PHY register's address */
 	XM_OUT16(IoC, Port, XM_PHY_ADDR, PhyReg | pPrt->PhyAddr);
-	
+
 	/* write the PHY register's value */
 	XM_OUT16(IoC, Port, XM_PHY_DATA, Val);
-	
+
 	if (pPrt->PhyType != SK_PHY_XMAC) {
 		do {
 			XM_IN16(IoC, Port, XM_MMU_CMD, &Mmu);
 			/* wait until 'Busy' is cleared */
 		} while ((Mmu & XM_MMU_PHY_BUSY) != 0);
 	}
-	
+
 	return(0);
 }	/* SkXmPhyWrite */
 #endif /* GENESIS */
@@ -183,17 +182,9 @@ SK_U16	SK_FAR *pVal)	/* Pointer to Value
 	SK_U32	StartTime;
 	SK_U32	CurrTime;
 	SK_U32	Delta;
-#ifdef VCPU
-	u_long SimCyle;
-	u_long SimLowTime;
-	
-	VCPUgetTime(&SimCyle, &SimLowTime);
-	VCPUprintf(0, "SkGmPhyRead(%u), SimCyle=%u, SimLowTime=%u\n",
-		PhyReg, SimCyle, SimLowTime);
-#endif /* VCPU */
-	
+
 	pPrt = &pAC->GIni.GP[Port];
-	
+
 	/* set PHY-Register offset and 'Read' OpCode (= 1) */
 	*pVal = (SK_U16)(GM_SMI_CT_PHY_AD(pPrt->PhyAddr) |
 		GM_SMI_CT_REG_AD(PhyReg) | GM_SMI_CT_OP_RD);
@@ -203,9 +194,9 @@ SK_U16	SK_FAR *pVal)	/* Pointer to Value
 #ifdef DEBUG
 	/* additional check for MDC/MDIO activity */
 	GM_IN16(IoC, Port, GM_SMI_CTRL, &Ctrl);
-	
+
 	if ((Ctrl & GM_SMI_CT_OP_RD) == 0) {
-		
+
 		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_ERR,
 			("PHY read impossible on Port %d (Ctrl=0x%04x)\n", Port, Ctrl));
 
@@ -213,16 +204,16 @@ SK_U16	SK_FAR *pVal)	/* Pointer to Value
 		return(1);
 	}
 #endif /* DEBUG */
-		
+
 	*pVal |= GM_SMI_CT_BUSY;
-	
+
 	SK_IN32(IoC, GMAC_TI_ST_VAL, &StartTime);
 
 	do {	/* wait until 'Busy' is cleared and 'ReadValid' is set */
 #ifdef VCPU
 		VCPUwaitTime(1000);
 #endif /* VCPU */
-		
+
 		SK_IN32(IoC, GMAC_TI_ST_VAL, &CurrTime);
 
 		if (CurrTime >= StartTime) {
@@ -238,18 +229,20 @@ SK_U16	SK_FAR *pVal)	/* Pointer to Value
 				("PHY read timeout on Port %d (Ctrl=0x%04x)\n", Port, Ctrl));
 			return(1);
 		}
-		
+
 		GM_IN16(IoC, Port, GM_SMI_CTRL, &Ctrl);
 
+		/* Error on reading SMI Control Register */
+		if (Ctrl == 0xffff) {
+			return(1);
+		}
+
 	} while ((Ctrl ^ *pVal) != (GM_SMI_CT_RD_VAL | GM_SMI_CT_BUSY));
 
 	GM_IN16(IoC, Port, GM_SMI_DATA, pVal);
 
-#ifdef VCPU
-	VCPUgetTime(&SimCyle, &SimLowTime);
-	VCPUprintf(0, "VCPUgetTime(), SimCyle=%u, SimLowTime=%u\n",
-		SimCyle, SimLowTime);
-#endif /* VCPU */
+	/* dummy read after GM_IN16() */
+	SK_IN32(IoC, GMAC_TI_ST_VAL, &CurrTime);
 
 	return(0);
 }	/* SkGmPhyRead */
@@ -276,35 +269,28 @@ SK_U16	Val)		/* Value */
 	SK_U32	StartTime;
 	SK_U32	CurrTime;
 	SK_U32	Delta;
-#ifdef VCPU
-	u_long	SimCyle;
-	u_long	SimLowTime;
-	
-	VCPUgetTime(&SimCyle, &SimLowTime);
-	VCPUprintf(0, "SkGmPhyWrite(Reg=%u, Val=0x%04x), SimCyle=%u, SimLowTime=%u\n",
-		PhyReg, Val, SimCyle, SimLowTime);
-#endif /* VCPU */
-	
+
 	pPrt = &pAC->GIni.GP[Port];
-	
+
 	/* write the PHY register's value */
 	GM_OUT16(IoC, Port, GM_SMI_DATA, Val);
-	
+
 #ifdef DEBUG
 	/* additional check for MDC/MDIO activity */
 	GM_IN16(IoC, Port, GM_SMI_DATA, &Ctrl);
-	
+
 	if (Ctrl != Val) {
-		
+
 		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_ERR,
 			("PHY write impossible on Port %d (Val=0x%04x)\n", Port, Ctrl));
 
 		return(1);
 	}
 #endif /* DEBUG */
-		
+
 	/* set PHY-Register offset and 'Write' OpCode (= 0) */
-	Ctrl = GM_SMI_CT_PHY_AD(pPrt->PhyAddr) | GM_SMI_CT_REG_AD(PhyReg);
+	Ctrl = (SK_U16)(GM_SMI_CT_PHY_AD(pPrt->PhyAddr) |
+		GM_SMI_CT_REG_AD(PhyReg));
 
 	GM_OUT16(IoC, Port, GM_SMI_CTRL, Ctrl);
 
@@ -332,14 +318,16 @@ SK_U16	Val)		/* Value */
 		}
 
 		GM_IN16(IoC, Port, GM_SMI_CTRL, &Ctrl);
-		
-	} while ((Ctrl & GM_SMI_CT_BUSY) != 0);
+
+		/* Error on reading SMI Control Register */
+		if (Ctrl == 0xffff) {
+			return(1);
+		}
 	
-#ifdef VCPU
-	VCPUgetTime(&SimCyle, &SimLowTime);
-	VCPUprintf(0, "VCPUgetTime(), SimCyle=%u, SimLowTime=%u\n",
-		SimCyle, SimLowTime);
-#endif /* VCPU */
+	} while ((Ctrl & GM_SMI_CT_BUSY) != 0);
+
+	/* dummy read after GM_IN16() */
+	SK_IN32(IoC, GMAC_TI_ST_VAL, &CurrTime);
 
 	return(0);
 }	/* SkGmPhyWrite */
@@ -363,7 +351,7 @@ int		Port,		/* Port Index (MAC_1 + n) */
 int		PhyReg,		/* Register Address (Offset) */
 SK_U16	*pVal)		/* Pointer to Value */
 {
-	
+
 	pAC->GIni.GIFunc.pFnMacPhyRead(pAC, IoC, Port, PhyReg, pVal);
 }	/* SkGePhyRead */
 
@@ -384,7 +372,7 @@ int		Port,		/* Port Index (MAC_1 + n) */
 int		PhyReg,		/* Register Address (Offset) */
 SK_U16	Val)		/* Value */
 {
-	
+
 	pAC->GIni.GIFunc.pFnMacPhyWrite(pAC, IoC, Port, PhyReg, Val);
 }	/* SkGePhyWrite */
 #endif /* SK_DIAG */
@@ -396,7 +384,7 @@ SK_U16	Val)		/* Value */
  *
  * Description:
  *   enables / disables promiscuous mode by setting Mode Register (XMAC) or
- *   Receive Control Register (GMAC) dep. on board type   	
+ *   Receive Control Register (GMAC) dep. on board type
  *
  * Returns:
  *	nothing
@@ -412,11 +400,11 @@ SK_BOOL	Enable)	/* Enable / Disable */
 #endif
 #ifdef GENESIS
 	SK_U32	MdReg;
-#endif	
+#endif
 
 #ifdef GENESIS
 	if (pAC->GIni.GIGenesis) {
-		
+
 		XM_IN32(IoC, Port, XM_MODE, &MdReg);
 		/* enable or disable promiscuous mode */
 		if (Enable) {
@@ -429,12 +417,12 @@ SK_BOOL	Enable)	/* Enable / Disable */
 		XM_OUT32(IoC, Port, XM_MODE, MdReg);
 	}
 #endif /* GENESIS */
-	
+
 #ifdef YUKON
 	if (pAC->GIni.GIYukon) {
-		
+
 		GM_IN16(IoC, Port, GM_RX_CTRL, &RcReg);
-		
+
 		/* enable or disable unicast and multicast filtering */
 		if (Enable) {
 			RcReg &= ~(GM_RXCR_UCF_ENA | GM_RXCR_MCF_ENA);
@@ -456,7 +444,7 @@ SK_BOOL	Enable)	/* Enable / Disable */
  *
  * Description:
  *   enables / disables hashing by setting Mode Register (XMAC) or
- *   Receive Control Register (GMAC) dep. on board type		
+ *   Receive Control Register (GMAC) dep. on board type
  *
  * Returns:
  *	nothing
@@ -469,14 +457,14 @@ SK_BOOL	Enable)	/* Enable / Disable */
 {
 #ifdef YUKON
 	SK_U16	RcReg;
-#endif	
+#endif
 #ifdef GENESIS
 	SK_U32	MdReg;
 #endif
 
 #ifdef GENESIS
 	if (pAC->GIni.GIGenesis) {
-		
+
 		XM_IN32(IoC, Port, XM_MODE, &MdReg);
 		/* enable or disable hashing */
 		if (Enable) {
@@ -489,12 +477,12 @@ SK_BOOL	Enable)	/* Enable / Disable */
 		XM_OUT32(IoC, Port, XM_MODE, MdReg);
 	}
 #endif /* GENESIS */
-	
+
 #ifdef YUKON
 	if (pAC->GIni.GIYukon) {
-		
+
 		GM_IN16(IoC, Port, GM_RX_CTRL, &RcReg);
-		
+
 		/* enable or disable multicast filtering */
 		if (Enable) {
 			RcReg |= GM_RXCR_MCF_ENA;
@@ -546,7 +534,7 @@ int		Mode)		/* Mode is SK_STRIP_FCS_ON/O
 	XM_IN16(IoC, Port, XM_RX_CMD, &OldRxCmd);
 
 	RxCmd = OldRxCmd;
-	
+
 	switch (Mode & (SK_STRIP_FCS_ON | SK_STRIP_FCS_OFF)) {
 	case SK_STRIP_FCS_ON:
 		RxCmd |= XM_RX_STRIP_FCS;
@@ -625,14 +613,11 @@ int		Port,		/* Port Index (MAC_1 + n) */
 int		Mode)		/* Mode is SK_STRIP_FCS_ON/OFF, SK_STRIP_PAD_ON/OFF,
 					   SK_LENERR_OK_ON/OFF, or SK_BIG_PK_OK_ON/OFF */
 {
-	SK_U16	OldRxCmd;
 	SK_U16	RxCmd;
 
 	if ((Mode & (SK_STRIP_FCS_ON | SK_STRIP_FCS_OFF)) != 0) {
-		
-		GM_IN16(IoC, Port, GM_RX_CTRL, &OldRxCmd);
 
-		RxCmd = OldRxCmd;
+		GM_IN16(IoC, Port, GM_RX_CTRL, &RxCmd);
 
 		if ((Mode & SK_STRIP_FCS_ON) != 0) {
 			RxCmd |= GM_RXCR_CRC_DIS;
@@ -640,17 +625,13 @@ int		Mode)		/* Mode is SK_STRIP_FCS_ON/O
 		else {
 			RxCmd &= ~GM_RXCR_CRC_DIS;
 		}
-		/* Write the new mode to the Rx control register if required */
-		if (OldRxCmd != RxCmd) {
-			GM_OUT16(IoC, Port, GM_RX_CTRL, RxCmd);
-		}
+		/* Write the new mode to the Rx Control register */
+		GM_OUT16(IoC, Port, GM_RX_CTRL, RxCmd);
 	}
 
 	if ((Mode & (SK_BIG_PK_OK_ON | SK_BIG_PK_OK_OFF)) != 0) {
-		
-		GM_IN16(IoC, Port, GM_SERIAL_MODE, &OldRxCmd);
 
-		RxCmd = OldRxCmd;
+		GM_IN16(IoC, Port, GM_SERIAL_MODE, &RxCmd);
 
 		if ((Mode & SK_BIG_PK_OK_ON) != 0) {
 			RxCmd |= GM_SMOD_JUMBO_ENA;
@@ -658,10 +639,8 @@ int		Mode)		/* Mode is SK_STRIP_FCS_ON/O
 		else {
 			RxCmd &= ~GM_SMOD_JUMBO_ENA;
 		}
-		/* Write the new mode to the Rx control register if required */
-		if (OldRxCmd != RxCmd) {
-			GM_OUT16(IoC, Port, GM_SERIAL_MODE, RxCmd);
-		}
+		/* Write the new mode to the Serial Mode register */
+		GM_OUT16(IoC, Port, GM_SERIAL_MODE, RxCmd);
 	}
 }	/* SkGmSetRxCmd */
 
@@ -682,11 +661,11 @@ int		Port,		/* Port Index (MAC_1 + n) */
 int		Mode)		/* Rx Mode */
 {
 	if (pAC->GIni.GIGenesis) {
-		
+
 		SkXmSetRxCmd(pAC, IoC, Port, Mode);
 	}
 	else {
-		
+
 		SkGmSetRxCmd(pAC, IoC, Port, Mode);
 	}
 
@@ -711,7 +690,7 @@ SK_BOOL	Enable)	/* Enable / Disable */
 	SK_U16	Word;
 
 	if (pAC->GIni.GIGenesis) {
-		
+
 		XM_IN16(IoC, Port, XM_TX_CMD, &Word);
 
 		if (Enable) {
@@ -724,9 +703,9 @@ SK_BOOL	Enable)	/* Enable / Disable */
 		XM_OUT16(IoC, Port, XM_TX_CMD, Word);
 	}
 	else {
-		
+
 		GM_IN16(IoC, Port, GM_TX_CTRL, &Word);
-		
+
 		if (Enable) {
 			Word &= ~GM_TXCR_CRC_DIS;
 		}
@@ -763,7 +742,7 @@ int		StartNum,	/* Begin with this Addres
 int		StopNum)	/* Stop after finished with this Register Idx (0..15) */
 {
 	int		i;
-	SK_U16	ZeroAddr[3] = {0x0000, 0x0000, 0x0000};
+	SK_U16	ZeroAddr[3] = {0, 0, 0};
 
 	if ((unsigned)StartNum > 15 || (unsigned)StopNum > 15 ||
 		StartNum > StopNum) {
@@ -773,7 +752,7 @@ int		StopNum)	/* Stop after finished wit
 	}
 
 	for (i = StartNum; i <= StopNum; i++) {
-		XM_OUTADDR(IoC, Port, XM_EXM(i), &ZeroAddr[0]);
+		XM_OUTADDR(IoC, Port, XM_EXM(i), ZeroAddr);
 	}
 }	/* SkXmClrExactAddr */
 #endif /* GENESIS */
@@ -798,13 +777,13 @@ int		Port)	/* Port Index (MAC_1 + n) */
 	SK_U32	MdReg;
 
 	if (pAC->GIni.GIGenesis) {
-		
+
 		XM_IN32(IoC, Port, XM_MODE, &MdReg);
 
 		XM_OUT32(IoC, Port, XM_MODE, MdReg | XM_MD_FTF);
 	}
 #endif /* GENESIS */
-	
+
 #ifdef YUKON
 	if (pAC->GIni.GIYukon) {
 		/* no way to flush the FIFO we have to issue a reset */
@@ -840,7 +819,7 @@ int		Port)	/* Port Index (MAC_1 + n) */
 		XM_OUT32(IoC, Port, XM_MODE, MdReg | XM_MD_FRF);
 	}
 #endif /* GENESIS */
-	
+
 #ifdef YUKON
 	if (pAC->GIni.GIYukon) {
 		/* no way to flush the FIFO we have to issue a reset */
@@ -892,19 +871,19 @@ SK_AC	*pAC,	/* Adapter Context */
 SK_IOC	IoC,	/* I/O Context */
 int		Port)	/* Port Index (MAC_1 + n) */
 {
-	SK_U16	ZeroAddr[4] = {0x0000, 0x0000, 0x0000, 0x0000};
-	
+	SK_U16	ZeroAddr[4] = {0, 0, 0, 0};
+
 	/* reset the statistics module */
 	XM_OUT32(IoC, Port, XM_GP_PORT, XM_GP_RES_STAT);
 
 	/* disable all XMAC IRQs */
 	XM_OUT16(IoC, Port, XM_IMSK, 0xffff);
-	
+
 	XM_OUT32(IoC, Port, XM_MODE, 0);		/* clear Mode Reg */
-	
+
 	XM_OUT16(IoC, Port, XM_TX_CMD, 0);		/* reset TX CMD Reg */
 	XM_OUT16(IoC, Port, XM_RX_CMD, 0);		/* reset RX CMD Reg */
-	
+
 	/* disable all PHY IRQs */
 	switch (pAC->GIni.GP[Port].PhyType) {
 	case SK_PHY_BCOM:
@@ -922,13 +901,13 @@ int		Port)	/* Port Index (MAC_1 + n) */
 	}
 
 	/* clear the Hash Register */
-	XM_OUTHASH(IoC, Port, XM_HSM, &ZeroAddr);
+	XM_OUTHASH(IoC, Port, XM_HSM, ZeroAddr);
 
 	/* clear the Exact Match Address registers */
 	SkXmClrExactAddr(pAC, IoC, Port, 0, 15);
-	
+
 	/* clear the Source Check Address registers */
-	XM_OUTHASH(IoC, Port, XM_SRC_CHK, &ZeroAddr);
+	XM_OUTHASH(IoC, Port, XM_SRC_CHK, ZeroAddr);
 
 }	/* SkXmSoftRst */
 
@@ -975,17 +954,17 @@ int		Port)	/* Port Index (MAC_1 + n) */
 			}
 
 			SK_OUT16(IoC, MR_ADDR(Port, TX_MFF_CTRL1), MFF_SET_MAC_RST);
-			
+
 			SK_IN16(IoC, MR_ADDR(Port, TX_MFF_CTRL1), &Word);
-		
+
 		} while ((Word & MFF_SET_MAC_RST) == 0);
 	}
 
 	/* For external PHYs there must be special handling */
 	if (pAC->GIni.GP[Port].PhyType != SK_PHY_XMAC) {
-		
+
 		SK_IN32(IoC, B2_GP_IO, &Reg);
-		
+
 		if (Port == 0) {
 			Reg |= GP_DIR_0; 	/* set to output */
 			Reg &= ~GP_IO_0;	/* set PHY reset (active low) */
@@ -1018,7 +997,7 @@ SK_IOC	IoC,	/* I/O Context */
 int		Port)	/* Port Index (MAC_1 + n) */
 {
 	SK_U32	DWord;
-	
+
 	/* clear HW reset */
 	SK_OUT16(IoC, MR_ADDR(Port, TX_MFF_CTRL1), MFF_CLR_MAC_RST);
 
@@ -1065,19 +1044,18 @@ int		Port)	/* Port Index (MAC_1 + n) */
 	/* reset the statistics module */
 
 	/* disable all GMAC IRQs */
-	SK_OUT8(IoC, GMAC_IRQ_MSK, 0);
-	
+	SK_OUT8(IoC, MR_ADDR(Port, GMAC_IRQ_MSK), 0);
+
 	/* disable all PHY IRQs */
 	SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_INT_MASK, 0);
-	
+
 	/* clear the Hash Register */
 	GM_OUTHASH(IoC, Port, GM_MC_ADDR_H1, EmptyHash);
 
 	/* Enable Unicast and Multicast filtering */
 	GM_IN16(IoC, Port, GM_RX_CTRL, &RxCtrl);
-	
-	GM_OUT16(IoC, Port, GM_RX_CTRL,
-		(SK_U16)(RxCtrl | GM_RXCR_UCF_ENA | GM_RXCR_MCF_ENA));
+
+	GM_OUT16(IoC, Port, GM_RX_CTRL, RxCtrl | GM_RXCR_UCF_ENA | GM_RXCR_MCF_ENA);
 
 }	/* SkGmSoftRst */
 
@@ -1097,11 +1075,11 @@ SK_IOC	IoC,	/* I/O Context */
 int		Port)	/* Port Index (MAC_1 + n) */
 {
 	SK_U32	DWord;
-	
+
 	/* WA code for COMA mode */
 	if (pAC->GIni.GIYukonLite &&
 		pAC->GIni.GIChipRev == CHIP_REV_YU_LITE_A3) {
-		
+
 		SK_IN32(IoC, B2_GP_IO, &DWord);
 
 		DWord |= (GP_DIR_9 | GP_IO_9);
@@ -1111,10 +1089,10 @@ int		Port)	/* Port Index (MAC_1 + n) */
 	}
 
 	/* set GPHY Control reset */
-	SK_OUT32(IoC, MR_ADDR(Port, GPHY_CTRL), GPC_RST_SET);
+	SK_OUT8(IoC, MR_ADDR(Port, GPHY_CTRL), (SK_U8)GPC_RST_SET);
 
 	/* set GMAC Control reset */
-	SK_OUT32(IoC, MR_ADDR(Port, GMAC_CTRL), GMC_RST_SET);
+	SK_OUT8(IoC, MR_ADDR(Port, GMAC_CTRL), (SK_U8)GMC_RST_SET);
 
 }	/* SkGmHardRst */
 
@@ -1134,19 +1112,19 @@ SK_IOC	IoC,	/* I/O Context */
 int		Port)	/* Port Index (MAC_1 + n) */
 {
 	SK_U32	DWord;
-	
+
 #ifdef XXX
 		/* clear GMAC Control reset */
-		SK_OUT32(IoC, MR_ADDR(Port, GMAC_CTRL), GMC_RST_CLR);
+		SK_OUT8(IoC, MR_ADDR(Port, GMAC_CTRL), (SK_U8)GMC_RST_CLR);
 
 		/* set GMAC Control reset */
-		SK_OUT32(IoC, MR_ADDR(Port, GMAC_CTRL), GMC_RST_SET);
+		SK_OUT8(IoC, MR_ADDR(Port, GMAC_CTRL), (SK_U8)GMC_RST_SET);
 #endif /* XXX */
 
 	/* WA code for COMA mode */
 	if (pAC->GIni.GIYukonLite &&
 		pAC->GIni.GIChipRev == CHIP_REV_YU_LITE_A3) {
-		
+
 		SK_IN32(IoC, B2_GP_IO, &DWord);
 
 		DWord |= GP_DIR_9;		/* set to output */
@@ -1158,41 +1136,50 @@ int		Port)	/* Port Index (MAC_1 + n) */
 
 #ifdef VCPU
 	/* Set MAC Reset before PHY reset is set */
-	SK_OUT8(IoC, MR_ADDR(Port, GMAC_CTRL), GMC_RST_SET);
+	SK_OUT8(IoC, MR_ADDR(Port, GMAC_CTRL), (SK_U8)GMC_RST_SET);
 #endif /* VCPU */
 
-	/* set HWCFG_MODE */
-	DWord = GPC_INT_POL_HI | GPC_DIS_FC | GPC_DIS_SLEEP |
-		GPC_ENA_XC | GPC_ANEG_ADV_ALL_M | GPC_ENA_PAUSE |
-		(pAC->GIni.GICopperType ? GPC_HWCFG_GMII_COP :
-		GPC_HWCFG_GMII_FIB);
-
-	/* set GPHY Control reset */
-	SK_OUT32(IoC, MR_ADDR(Port, GPHY_CTRL), DWord | GPC_RST_SET);
+	if (CHIP_ID_YUKON_2(pAC)) {
+		/* set GPHY Control reset */
+		SK_OUT8(IoC, MR_ADDR(Port, GPHY_CTRL), (SK_U8)GPC_RST_SET);
 
-	/* release GPHY Control reset */
-	SK_OUT32(IoC, MR_ADDR(Port, GPHY_CTRL), DWord | GPC_RST_CLR);
+		/* release GPHY Control reset */
+		SK_OUT8(IoC, MR_ADDR(Port, GPHY_CTRL), (SK_U8)GPC_RST_CLR);
+	}
+	else {
+		/* set HWCFG_MODE */
+		DWord = GPC_INT_POL | GPC_DIS_FC | GPC_DIS_SLEEP |
+			GPC_ENA_XC | GPC_ANEG_ADV_ALL_M | GPC_ENA_PAUSE |
+			(pAC->GIni.GICopperType ? GPC_HWCFG_GMII_COP :
+			GPC_HWCFG_GMII_FIB);
+		
+		/* set GPHY Control reset */
+		SK_OUT32(IoC, MR_ADDR(Port, GPHY_CTRL), DWord | GPC_RST_SET);
 
+		/* release GPHY Control reset */
+		SK_OUT32(IoC, MR_ADDR(Port, GPHY_CTRL), DWord | GPC_RST_CLR);
+	}
+	
 #ifdef VCPU
     /* wait for internal initialization of GPHY */
-    VCPUprintf(0, "Waiting until PHY %d is ready to initialize\n",Port);
+    VCPUprintf(0, "Waiting until PHY %d is ready to initialize\n", Port);
 	VCpuWait(10000);
 
 	/* release GMAC reset */
-    SK_OUT8(IoC, MR_ADDR(Port, GMAC_CTRL), GMC_RST_CLR);
+    SK_OUT8(IoC, MR_ADDR(Port, GMAC_CTRL), (SK_U8)GMC_RST_CLR);
 
     /* wait for stable GMAC clk */
 	VCpuWait(9000);
 #endif /* VCPU */
 
 	/* clear GMAC Control reset */
-	SK_OUT32(IoC, MR_ADDR(Port, GMAC_CTRL), GMC_PAUSE_ON | GMC_RST_CLR);
+	SK_OUT8(IoC, MR_ADDR(Port, GMAC_CTRL), (SK_U8)GMC_RST_CLR);
 
 #ifdef VCPU
 	VCpuWait(2000);
-	
+
 	SK_IN32(IoC, MR_ADDR(Port, GPHY_CTRL), &DWord);
-			
+
 	SK_IN32(IoC, B0_ISRC, &DWord);
 #endif /* VCPU */
 
@@ -1214,33 +1201,29 @@ SK_AC	*pAC,	/* Adapter Context */
 SK_IOC	IoC,	/* I/O Context */
 int		Port)	/* Port Index (MAC_1 + n) */
 {
-	SK_GEPORT	*pPrt;
-
-	pPrt = &pAC->GIni.GP[Port];
-
 	/* disable receiver and transmitter */
 	SkMacRxTxDisable(pAC, IoC, Port);
 
 #ifdef GENESIS
 	if (pAC->GIni.GIGenesis) {
-		
+
 		SkXmSoftRst(pAC, IoC, Port);
 	}
 #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);
-	
+
 	SkMacFlushRxFifo(pAC, IoC, Port);
 
-	pPrt->PState = SK_PRT_STOP;
+	pAC->GIni.GP[Port].PState = SK_PRT_STOP;
 
 }	/* SkMacSoftRst */
 
@@ -1259,17 +1242,17 @@ SK_AC	*pAC,	/* Adapter Context */
 SK_IOC	IoC,	/* I/O Context */
 int		Port)	/* Port Index (MAC_1 + n) */
 {
-	
+
 #ifdef GENESIS
 	if (pAC->GIni.GIGenesis) {
-		
+
 		SkXmHardRst(pAC, IoC, Port);
 	}
 #endif /* GENESIS */
-	
+
 #ifdef YUKON
 	if (pAC->GIni.GIYukon) {
-		
+
 		SkGmHardRst(pAC, IoC, Port);
 	}
 #endif /* YUKON */
@@ -1293,17 +1276,17 @@ SK_AC	*pAC,	/* Adapter Context */
 SK_IOC	IoC,	/* I/O Context */
 int		Port)	/* Port Index (MAC_1 + n) */
 {
-	
+
 #ifdef GENESIS
 	if (pAC->GIni.GIGenesis) {
-		
+
 		SkXmClearRst(pAC, IoC, Port);
 	}
 #endif /* GENESIS */
-	
+
 #ifdef YUKON
 	if (pAC->GIni.GIYukon) {
-		
+
 		SkGmClearRst(pAC, IoC, Port);
 	}
 #endif /* YUKON */
@@ -1363,7 +1346,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
 			 * Must be done AFTER first access to BCOM chip.
 			 */
 			XM_IN16(IoC, Port, XM_MMU_CMD, &SWord);
-			
+
 			XM_OUT16(IoC, Port, XM_MMU_CMD, SWord | XM_MMU_NO_PRE);
 
 			if (pPrt->PhyId1 == PHY_BCOM_ID1_C0) {
@@ -1396,7 +1379,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
 			 * Disable Power Management after reset.
 			 */
 			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));
 
@@ -1405,7 +1388,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
 
 		/* Dummy read the Interrupt source register */
 		XM_IN16(IoC, Port, XM_ISRC, &SWord);
-		
+
 		/*
 		 * The auto-negotiation process starts immediately after
 		 * clearing the reset. The auto-negotiation process should be
@@ -1431,7 +1414,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		 * independent. Remember this when changing.
 		 */
 		SK_IN16(IoC, (B2_MAC_2 + Port * 8 + i * 2), &SWord);
-		
+
 		XM_OUT16(IoC, Port, (XM_SA + i * 2), SWord);
 	}
 
@@ -1484,7 +1467,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		 */
 		SWord |= XM_RX_DIS_CEXT;
 	}
-	
+
 	XM_OUT16(IoC, Port, XM_RX_CMD, SWord);
 
 	/*
@@ -1556,7 +1539,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		/* Port State: SK_PRT_STOP */
 		/* Verify that the reset bit is cleared */
 		SK_IN32(IoC, MR_ADDR(Port, GMAC_CTRL), &DWord);
-		
+
 		if ((DWord & GMC_RST_SET) != 0) {
 			/* PState does not match HW state */
 			SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E006, SKERR_HWI_E006MSG);
@@ -1566,11 +1549,11 @@ int		Port)		/* Port Index (MAC_1 + n) */
 	}
 
 	if (pPrt->PState == SK_PRT_RESET) {
-		
+
 		SkGmHardRst(pAC, IoC, Port);
 
 		SkGmClearRst(pAC, IoC, Port);
-		
+
 		/* Auto-negotiation ? */
 		if (pPrt->PLinkMode == SK_LMODE_HALF || pPrt->PLinkMode == SK_LMODE_FULL) {
 			/* Auto-negotiation disabled */
@@ -1580,10 +1563,10 @@ int		Port)		/* Port Index (MAC_1 + n) */
 
 			/* 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 {
@@ -1594,7 +1577,10 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		switch (pPrt->PLinkSpeed) {
 		case SK_LSPEED_AUTO:
 		case SK_LSPEED_1000MBPS:
-			SWord |= GM_GPCR_SPEED_1000 | GM_GPCR_SPEED_100;
+			if ((pPrt->PLinkSpeedCap & SK_LSPEED_CAP_1000MBPS) != 0) {
+
+				SWord |= GM_GPCR_SPEED_1000 | GM_GPCR_SPEED_100;
+			}
 			break;
 		case SK_LSPEED_100MBPS:
 			SWord |= GM_GPCR_SPEED_100;
@@ -1612,8 +1598,6 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		/* flow-control settings */
 		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;
@@ -1631,24 +1615,24 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		GM_OUT16(IoC, Port, GM_GP_CTRL, SWord);
 
 		/* dummy read the Interrupt Source Register */
-		SK_IN16(IoC, GMAC_IRQ_SRC, &SWord);
-		
+		SK_IN16(IoC, MR_ADDR(Port, GMAC_IRQ_SRC), &SWord);
+
 #ifndef VCPU
 		/* read Id from PHY */
 		SkGmPhyRead(pAC, IoC, Port, PHY_MARV_ID1, &pPrt->PhyId1);
-		
+
 		SkGmInitPhyMarv(pAC, IoC, Port, SK_FALSE);
-#endif /* VCPU */
+#endif /* !VCPU */
 	}
 
 	(void)SkGmResetCounter(pAC, IoC, Port);
 
 	/* setup Transmit Control Register */
-	GM_OUT16(IoC, Port, GM_TX_CTRL, TX_COL_THR(pPrt->PMacColThres));
+	GM_OUT16(IoC, Port, GM_TX_CTRL, (SK_U16)TX_COL_THR(pPrt->PMacColThres));
 
 	/* setup Receive Control Register */
-	GM_OUT16(IoC, Port, GM_RX_CTRL, GM_RXCR_UCF_ENA | GM_RXCR_MCF_ENA |
-		GM_RXCR_CRC_DIS);
+	GM_OUT16(IoC, Port, GM_RX_CTRL, GM_RXCR_UCF_ENA |
+		GM_RXCR_MCF_ENA | GM_RXCR_CRC_DIS);
 
 	/* setup Transmit Flow Control Register */
 	GM_OUT16(IoC, Port, GM_TX_FLOW_CTRL, 0xffff);
@@ -1658,18 +1642,16 @@ int		Port)		/* Port Index (MAC_1 + n) */
 	GM_IN16(IoC, Port, GM_TX_PARAM, &SWord);
 #endif /* VCPU */
 
-    SWord = TX_JAM_LEN_VAL(pPrt->PMacJamLen) |
-			TX_JAM_IPG_VAL(pPrt->PMacJamIpgVal) |
-			TX_IPG_JAM_DATA(pPrt->PMacJamIpgData);
-	
+	SWord = (SK_U16)(TX_JAM_LEN_VAL(pPrt->PMacJamLen) |
+		TX_JAM_IPG_VAL(pPrt->PMacJamIpgVal) |
+		TX_IPG_JAM_DATA(pPrt->PMacJamIpgData) |
+		TX_BACK_OFF_LIM(pPrt->PMacBackOffLim));
+
 	GM_OUT16(IoC, Port, GM_TX_PARAM, SWord);
 
 	/* configure the Serial Mode Register */
-#ifdef VCPU
-	GM_IN16(IoC, Port, GM_SERIAL_MODE, &SWord);
-#endif /* VCPU */
-	
-	SWord = GM_SMOD_VLAN_ENA | IPG_DATA_VAL(pPrt->PMacIpgData);
+	SWord = (SK_U16)(DATA_BLIND_VAL(pPrt->PMacDataBlind) |
+		GM_SMOD_VLAN_ENA | IPG_DATA_VAL(pPrt->PMacIpgData));
 
 	if (pPrt->PMacLimit4) {
 		/* reset of collision counter after 4 consecutive collisions */
@@ -1680,9 +1662,9 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		/* enable jumbo mode (Max. Frame Length = 9018) */
 		SWord |= GM_SMOD_JUMBO_ENA;
 	}
-	
+
 	GM_OUT16(IoC, Port, GM_SERIAL_MODE, SWord);
-	
+
 	/*
 	 * configure the GMACs Station Addresses
 	 * in PROM you can find our addresses at:
@@ -1711,15 +1693,15 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		else {
 			GM_OUT16(IoC, Port, (GM_SRC_ADDR_1L + i * 4), SWord);
 		}
-#else		
+#else
 		GM_OUT16(IoC, Port, (GM_SRC_ADDR_1L + i * 4), SWord);
 #endif /* WA_DEV_16 */
-		
+
 		/* virtual address: will be used for data */
 		SK_IN16(IoC, (B2_MAC_1 + Port * 8 + i * 2), &SWord);
 
 		GM_OUT16(IoC, Port, (GM_SRC_ADDR_2L + i * 4), SWord);
-		
+
 		/* reset Multicast filtering Hash registers 1-3 */
 		GM_OUT16(IoC, Port, GM_MC_ADDR_H1 + 4*i, 0);
 	}
@@ -1732,18 +1714,6 @@ int		Port)		/* Port Index (MAC_1 + n) */
 	GM_OUT16(IoC, Port, GM_RX_IRQ_MSK, 0);
 	GM_OUT16(IoC, Port, GM_TR_IRQ_MSK, 0);
 
-#if defined(SK_DIAG) || defined(DEBUG)
-	/* read General Purpose Status */
-	GM_IN16(IoC, Port, GM_GP_STAT, &SWord);
-	
-	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-		("MAC Stat Reg.=0x%04X\n", SWord));
-#endif /* SK_DIAG || DEBUG */
-
-#ifdef SK_DIAG
-	c_print("MAC Stat Reg=0x%04X\n", SWord);
-#endif /* SK_DIAG */
-
 }	/* SkGmInitMac */
 #endif /* YUKON */
 
@@ -1821,7 +1791,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
 	pPrt = &pAC->GIni.GP[Port];
 
 	XM_IN16(IoC, Port, XM_MMU_CMD, &Word);
-	
+
 	if (pPrt->PFlowCtrlStatus == SK_FLOW_STAT_NONE ||
 		pPrt->PFlowCtrlStatus == SK_FLOW_STAT_LOC_SEND) {
 
@@ -1835,8 +1805,8 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		 */
 		/* Enable Pause Frame Reception */
 		Word &= ~XM_MMU_IGN_PF;
-	}	
-	
+	}
+
 	XM_OUT16(IoC, Port, XM_MMU_CMD, Word);
 
 	XM_IN32(IoC, Port, XM_MODE, &DWord);
@@ -1876,7 +1846,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		/* Disable Pause Mode in MAC Rx FIFO */
 		SK_OUT16(IoC, MR_ADDR(Port, RX_MFF_CTRL1), MFF_DIS_PAUSE);
 	}
-	
+
 	XM_OUT32(IoC, Port, XM_MODE, DWord);
 }	/* SkXmInitPauseMd*/
 
@@ -1903,7 +1873,7 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 
 	pPrt = &pAC->GIni.GP[Port];
 	Ctrl = 0;
-	
+
 	/* Auto-negotiation ? */
 	if (pPrt->PLinkMode == SK_LMODE_HALF || pPrt->PLinkMode == SK_LMODE_FULL) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
@@ -2010,7 +1980,7 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 	/* manually Master/Slave ? */
 	if (pPrt->PMSMode != SK_MS_MODE_AUTO) {
 		Ctrl2 |= PHY_B_1000C_MSE;
-		
+
 		if (pPrt->PMSMode == SK_MS_MODE_MASTER) {
 			Ctrl2 |= PHY_B_1000C_MSC;
 		}
@@ -2045,7 +2015,7 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 		 * Set Repeater/DTE bit 10 of the 1000Base-T Control Register
 		 */
 		Ctrl2 |= PHY_B_1000C_RD;
-		
+
 		 /* Set Full/half duplex capabilities */
 		switch (pPrt->PLinkMode) {
 		case SK_LMODE_AUTOHALF:
@@ -2084,21 +2054,21 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 		/* Restart Auto-negotiation */
 		Ctrl1 |= PHY_CT_ANE | PHY_CT_RE_CFG;
 	}
-	
+
 	/* 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_BCOM_1000T_CTRL, Ctrl2);
 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
 		("Set 1000B-T Ctrl Reg=0x%04X\n", Ctrl2));
-	
+
 	/* Write AutoNeg Advertisement Register */
 	SkXmPhyWrite(pAC, IoC, Port, PHY_BCOM_AUNE_ADV, Ctrl3);
 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
 		("Set Auto-Neg.Adv.Reg=0x%04X\n", Ctrl3));
-	
+
 	if (DoLoop) {
 		/* Set the Phy Loopback bit, too */
 		Ctrl1 |= PHY_CT_LOOP;
@@ -2116,7 +2086,7 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 
 	/* Configure LED Traffic Mode and Jumbo Frame usage if specified */
 	SkXmPhyWrite(pAC, IoC, Port, PHY_BCOM_P_EXT_CTRL, Ctrl4);
-	
+
 	/* Write to the Phy control register */
 	SkXmPhyWrite(pAC, IoC, Port, PHY_BCOM_CTRL, Ctrl1);
 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
@@ -2126,17 +2096,17 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 
 
 #ifdef YUKON
-#ifndef SK_SLIM
+#ifdef SK_PHY_LP_MODE
 /******************************************************************************
  *
  *	SkGmEnterLowPowerMode()
  *
- * Description:	
+ * Description:
  *	This function sets the Marvell Alaska PHY to the low power mode
  *	given by parameter mode.
  *	The following low power modes are available:
- *		
- *		- Coma Mode (Deep Sleep):
+ *
+ *		- COMA Mode (Deep Sleep):
  *			Power consumption: ~15 - 30 mW
  *			The PHY cannot wake up on its own.
  *
@@ -2170,108 +2140,155 @@ SK_U8	Mode)		/* low power mode */
 {
 	SK_U16	Word;
 	SK_U32	DWord;
+	SK_U32	PowerDownBit;
 	SK_U8	LastMode;
 	int		Ret = 0;
 
-	if (pAC->GIni.GIYukonLite &&
-	    pAC->GIni.GIChipRev == CHIP_REV_YU_LITE_A3) {
+	if (!(CHIP_ID_YUKON_2(pAC) || (pAC->GIni.GIYukonLite &&
+		pAC->GIni.GIChipRev == CHIP_REV_YU_LITE_A3))) {
 
-		/* save current power mode */
-		LastMode = pAC->GIni.GP[Port].PPhyPowerState;
-		pAC->GIni.GP[Port].PPhyPowerState = Mode;
-
-		switch (Mode) {
-			/* coma mode (deep sleep) */
-			case PHY_PM_DEEP_SLEEP:
-				/* setup General Purpose Control Register */
-				GM_OUT16(IoC, 0, GM_GP_CTRL, GM_GPCR_FL_PASS |
-					GM_GPCR_SPEED_100 | GM_GPCR_AU_ALL_DIS);
-
-				/* apply COMA mode workaround */
-				SkGmPhyWrite(pAC, IoC, Port, 29, 0x001f);
-				
-				SkGmPhyWrite(pAC, IoC, Port, 30, 0xfff3);
-
-				SK_IN32(IoC, PCI_C(PCI_OUR_REG_1), &DWord);
-
-				SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_ON);
-				
-				/* Set PHY to Coma Mode */
-				SK_OUT32(IoC, PCI_C(PCI_OUR_REG_1), DWord | PCI_PHY_COMA);
-				
-				SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
-
-			break;
-			
-			/* IEEE 22.2.4.1.5 compatible power down mode */
-			case PHY_PM_IEEE_POWER_DOWN:
-				/*
-				 * - disable MAC 125 MHz clock
-				 * - allow MAC power down
-				 */
-				SkGmPhyRead(pAC, IoC, Port, PHY_MARV_PHY_CTRL, &Word);
-				Word |= PHY_M_PC_DIS_125CLK;
-				Word &=	~PHY_M_PC_MAC_POW_UP;
-				SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PHY_CTRL, Word);
+		return(1);
+	}
 
-				/*
-				 * register changes must be followed by a software
-				 * reset to take effect
-				 */
-				SkGmPhyRead(pAC, IoC, Port, PHY_MARV_CTRL, &Word);
-				Word |= PHY_CT_RESET;
-				SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_CTRL, Word);
-
-				/* switch IEEE compatible power down mode on */
-				SkGmPhyRead(pAC, IoC, Port, PHY_MARV_CTRL, &Word);
-				Word |= PHY_CT_PDOWN;
-				SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_CTRL, Word);
-			break;
+	/* save current power mode */
+	LastMode = pAC->GIni.GP[Port].PPhyPowerState;
+	pAC->GIni.GP[Port].PPhyPowerState = Mode;
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_POWM, SK_DBGCAT_CTRL,
+		("SkGmEnterLowPowerMode: %u\n", Mode));
+
+	switch (Mode) {
+	/* COMA mode (deep sleep) */
+	case PHY_PM_DEEP_SLEEP:
+		/* clear PHY & MAC reset first */
+		SkGmClearRst(pAC, IoC, Port);
 
-			/* energy detect and energy detect plus mode */
-			case PHY_PM_ENERGY_DETECT:
-			case PHY_PM_ENERGY_DETECT_PLUS:
-				/*
-				 * - disable MAC 125 MHz clock
-				 */
-				SkGmPhyRead(pAC, IoC, Port, PHY_MARV_PHY_CTRL, &Word);
-				Word |= PHY_M_PC_DIS_125CLK;
-				SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PHY_CTRL, Word);
-				
-				/* activate energy detect mode 1 */
-				SkGmPhyRead(pAC, IoC, Port, PHY_MARV_PHY_CTRL, &Word);
-
-				/* energy detect mode */
-				if (Mode == PHY_PM_ENERGY_DETECT) {
-					Word |= PHY_M_PC_EN_DET;
-				}
-				/* energy detect plus mode */
-				else {
-					Word |= PHY_M_PC_EN_DET_PLUS;
-				}
+		/* setup General Purpose Control Register */
+		GM_OUT16(IoC, Port, GM_GP_CTRL, GM_GPCR_FL_PASS |
+			GM_GPCR_SPEED_100 | GM_GPCR_AU_ALL_DIS);
 
-				SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PHY_CTRL, Word);
+		SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_ON);
 
-				/*
-				 * reinitialize the PHY to force a software reset
-				 * which is necessary after the register settings
-				 * for the energy detect modes.
-				 * Furthermore reinitialisation prevents that the
-				 * PHY is running out of a stable state.
-				 */
-				SkGmInitPhyMarv(pAC, IoC, Port, SK_FALSE);
-			break;
+		if (CHIP_ID_YUKON_2(pAC)) {
+			/* set power down bit */
+			PowerDownBit = (Port == MAC_1) ? PCI_Y2_PHY1_POWD :
+				PCI_Y2_PHY2_POWD;
+
+			/* no COMA mode on Yukon-FE */
+			if (pAC->GIni.GIChipId == CHIP_ID_YUKON_FE) {
+				/* set IEEE compatible Power Down Mode */
+				Ret = SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_CTRL, PHY_CT_PDOWN);
 
-			/* don't change current power mode */
-			default:
-				pAC->GIni.GP[Port].PPhyPowerState = LastMode;
-				Ret = 1;
-			break;
+				Word = 0;	/* divide clock by 2 */
+			}
+			else {
+				Word = 1;	/* divide clock by 4 */
+			}
+
+			/* Enable Core Clock Division */
+			SK_OUT32(IoC, B2_Y2_CLK_CTRL, Y2_CLK_DIV_VAL(Word) |
+				Y2_CLK_DIV_ENA);
+
+			/* ASF system clock stopped */
+			SK_OUT32(IoC, B28_Y2_ASF_STAT_CMD, Y2_ASF_CLK_HALT);
 		}
-	}
-	/* low power modes are not supported by this chip */
-	else {
+		else {
+			/* apply COMA mode workaround */
+			(void)SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PAGE_ADDR, 0x001f);
+
+			Ret = SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PAGE_DATA, 0xfff3);
+
+			PowerDownBit = PCI_PHY_COMA;
+		}
+
+		SK_IN32(IoC, PCI_C(pAC, PCI_OUR_REG_1), &DWord);
+
+		/* Set PHY to PowerDown/COMA Mode */
+		SK_OUT32(IoC, PCI_C(pAC, PCI_OUR_REG_1), DWord | PowerDownBit);
+
+		SK_IN16(IoC, PCI_C(pAC, PCI_PM_CTL_STS), &Word);
+
+		/* switch to D1 state */
+		SK_OUT16(IoC, PCI_C(pAC, PCI_PM_CTL_STS), Word | PCI_PM_STATE_D1);
+
+		break;
+
+	/* IEEE 22.2.4.1.5 compatible power down mode */
+	case PHY_PM_IEEE_POWER_DOWN:
+		/*
+		 * - disable MAC 125 MHz clock
+		 * - allow MAC power down
+		 */
+		Ret = SkGmPhyRead(pAC, IoC, Port, PHY_MARV_PHY_CTRL, &Word);
+		Word |= PHY_M_PC_DIS_125CLK | PHY_M_PC_POL_R_DIS;
+		Word &=	~PHY_M_PC_MAC_POW_UP;
+		SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PHY_CTRL, Word);
+
+		/*
+		 * register changes must be followed by a software
+		 * reset to take effect
+		 */
+		SkGmPhyRead(pAC, IoC, Port, PHY_MARV_CTRL, &Word);
+		Word |= PHY_CT_RESET;
+		SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_CTRL, Word);
+
+		/* switch IEEE compatible power down mode on */
+		SkGmPhyRead(pAC, IoC, Port, PHY_MARV_CTRL, &Word);
+		Word |= PHY_CT_PDOWN;
+		SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_CTRL, Word);
+		
+		break;
+
+	/* energy detect and energy detect plus mode */
+	case PHY_PM_ENERGY_DETECT:
+	case PHY_PM_ENERGY_DETECT_PLUS:
+
+		Ret = SkGmPhyRead(pAC, IoC, Port, PHY_MARV_PHY_CTRL, &Word);
+
+		Word |= PHY_M_PC_POL_R_DIS;
+
+		if (!CHIP_ID_YUKON_2(pAC)) {
+			/* disable MAC 125 MHz clock */
+			Word |= PHY_M_PC_DIS_125CLK | PHY_M_PC_POL_R_DIS;
+		}
+
+		/* energy detect mode */
+		if (Mode == PHY_PM_ENERGY_DETECT) {
+			Word |= PHY_M_PC_EN_DET;
+		}
+		/* energy detect plus mode */
+		else {
+			Word |= PHY_M_PC_EN_DET_PLUS;
+		}
+
+		SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PHY_CTRL, Word);
+
+		/*
+		 * register changes must be followed by a software
+		 * reset to take effect
+		 */
+		SkGmPhyRead(pAC, IoC, Port, PHY_MARV_CTRL, &Word);
+		Word |= PHY_CT_RESET;
+		SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_CTRL, Word);
+
+#ifdef XXX
+		/*
+		 * reinitialize the PHY to force a software reset
+		 * which is necessary after the register settings
+		 * for the energy detect modes.
+		 * Furthermore reinitialisation prevents that the
+		 * PHY is running out of a stable state.
+		 */
+		SkGmInitPhyMarv(pAC, IoC, Port, SK_FALSE);
+#endif /* XXX */
+
+		break;
+
+	/* don't change current power mode */
+	default:
+		pAC->GIni.GP[Port].PPhyPowerState = LastMode;
 		Ret = 1;
+		break;
 	}
 
 	return(Ret);
@@ -2282,7 +2299,7 @@ SK_U8	Mode)		/* low power mode */
  *
  *	SkGmLeaveLowPowerMode()
  *
- * Description:	
+ * Description:
  *	Leave the current low power mode and switch to normal mode
  *
  * Note:
@@ -2297,110 +2314,144 @@ SK_IOC	IoC,		/* I/O Context */
 int		Port)		/* Port Index (e.g. MAC_1) */
 {
 	SK_U32	DWord;
+	SK_U32	PowerDownBit;
 	SK_U16	Word;
 	SK_U8	LastMode;
 	int		Ret = 0;
 
-	if (pAC->GIni.GIYukonLite &&
-		pAC->GIni.GIChipRev == CHIP_REV_YU_LITE_A3) {
+	if (!(CHIP_ID_YUKON_2(pAC) || (pAC->GIni.GIYukonLite &&
+		pAC->GIni.GIChipRev == CHIP_REV_YU_LITE_A3))) {
 
-		/* save current power mode */
-		LastMode = pAC->GIni.GP[Port].PPhyPowerState;
-		pAC->GIni.GP[Port].PPhyPowerState = PHY_PM_OPERATIONAL_MODE;
-
-		switch (LastMode) {
-			/* coma mode (deep sleep) */
-			case PHY_PM_DEEP_SLEEP:
-				SK_IN32(IoC, PCI_C(PCI_OUR_REG_1), &DWord);
-
-				SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_ON);
-				
-				/* Release PHY from Coma Mode */
-				SK_OUT32(IoC, PCI_C(PCI_OUR_REG_1), DWord & ~PCI_PHY_COMA);
-				
-				SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
-				
-				SK_IN32(IoC, B2_GP_IO, &DWord);
-
-				/* set to output */
-				DWord |= (GP_DIR_9 | GP_IO_9);
-
-				/* set PHY reset */
-				SK_OUT32(IoC, B2_GP_IO, DWord);
-
-				DWord &= ~GP_IO_9; /* clear PHY reset (active high) */
-
-				/* clear PHY reset */
-				SK_OUT32(IoC, B2_GP_IO, DWord);
-			break;
-			
-			/* IEEE 22.2.4.1.5 compatible power down mode */
-			case PHY_PM_IEEE_POWER_DOWN:
-				/*
-				 * - enable MAC 125 MHz clock
-				 * - set MAC power up
-				 */
-				SkGmPhyRead(pAC, IoC, Port, PHY_MARV_PHY_CTRL, &Word);
-				Word &= ~PHY_M_PC_DIS_125CLK;
-				Word |=	PHY_M_PC_MAC_POW_UP;
-				SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PHY_CTRL, Word);
+		return(1);
+	}
 
-				/*
-				 * register changes must be followed by a software
-				 * reset to take effect
-				 */
-				SkGmPhyRead(pAC, IoC, Port, PHY_MARV_CTRL, &Word);
-				Word |= PHY_CT_RESET;
-				SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_CTRL, Word);
-
-				/* switch IEEE compatible power down mode off */
-				SkGmPhyRead(pAC, IoC, Port, PHY_MARV_CTRL, &Word);
-				Word &= ~PHY_CT_PDOWN;
-				SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_CTRL, Word);
-			break;
+	/* save current power mode */
+	LastMode = pAC->GIni.GP[Port].PPhyPowerState;
+	pAC->GIni.GP[Port].PPhyPowerState = PHY_PM_OPERATIONAL_MODE;
 
-			/* energy detect and energy detect plus mode */
-			case PHY_PM_ENERGY_DETECT:
-			case PHY_PM_ENERGY_DETECT_PLUS:
-				/*
-				 * - enable MAC 125 MHz clock
-				 */
-				SkGmPhyRead(pAC, IoC, Port, PHY_MARV_PHY_CTRL, &Word);
-				Word &= ~PHY_M_PC_DIS_125CLK;
-				SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PHY_CTRL, Word);
-				
-				/* disable energy detect mode */
-				SkGmPhyRead(pAC, IoC, Port, PHY_MARV_PHY_CTRL, &Word);
-				Word &= ~PHY_M_PC_EN_DET_MSK;
-				SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PHY_CTRL, Word);
+	SK_DBG_MSG(pAC, SK_DBGMOD_POWM, SK_DBGCAT_CTRL,
+		("SkGmLeaveLowPowerMode: %u\n", LastMode));
 
-				/*
-				 * reinitialize the PHY to force a software reset
-				 * which is necessary after the register settings
-				 * for the energy detect modes.
-				 * Furthermore reinitialisation prevents that the
-				 * PHY is running out of a stable state.
-				 */
-				SkGmInitPhyMarv(pAC, IoC, Port, SK_FALSE);
-			break;
+	switch (LastMode) {
+	/* COMA mode (deep sleep) */
+	case PHY_PM_DEEP_SLEEP:
 
-			/* don't change current power mode */
-			default:
-				pAC->GIni.GP[Port].PPhyPowerState = LastMode;
-				Ret = 1;
-			break;
+		SkPciReadCfgWord(pAC, PCI_PM_CTL_STS, &Word);
+
+		/* reset all DState bits */
+		Word &= ~(PCI_PM_STATE_MSK);
+
+		/* switch to D0 state */
+		SkPciWriteCfgWord(pAC, PCI_PM_CTL_STS, Word);
+
+		SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_ON);
+
+		if (CHIP_ID_YUKON_2(pAC)) {
+			/* Disable Core Clock Division */
+			SK_OUT32(IoC, B2_Y2_CLK_CTRL, Y2_CLK_DIV_DIS);
+
+			/* set power down bit */
+			PowerDownBit = (Port == MAC_1) ? PCI_Y2_PHY1_POWD :
+				PCI_Y2_PHY2_POWD;
 		}
-	}
-	/* low power modes are not supported by this chip */
-	else {
+		else {
+			PowerDownBit = PCI_PHY_COMA;
+		}
+
+		SK_IN32(IoC, PCI_C(pAC, PCI_OUR_REG_1), &DWord);
+
+		/* Release PHY from PowerDown/COMA Mode */
+		SK_OUT32(IoC, PCI_C(pAC, PCI_OUR_REG_1), DWord & ~PowerDownBit);
+
+		SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
+
+		if (CHIP_ID_YUKON_2(pAC)) {
+			/* no COMA mode on Yukon-FE */
+			if (pAC->GIni.GIChipId == CHIP_ID_YUKON_FE) {
+				/* release IEEE compatible Power Down Mode */
+				Ret = SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_CTRL, PHY_CT_ANE);
+			}
+		}
+		else {
+			SK_IN32(IoC, B2_GP_IO, &DWord);
+
+			/* set to output */
+			DWord |= (GP_DIR_9 | GP_IO_9);
+
+			/* set PHY reset */
+			SK_OUT32(IoC, B2_GP_IO, DWord);
+
+			DWord &= ~GP_IO_9; /* clear PHY reset (active high) */
+
+			/* clear PHY reset */
+			SK_OUT32(IoC, B2_GP_IO, DWord);
+		}
+
+		break;
+
+	/* IEEE 22.2.4.1.5 compatible power down mode */
+	case PHY_PM_IEEE_POWER_DOWN:
+		/*
+		 * - enable MAC 125 MHz clock
+		 * - set MAC power up
+		 */
+		Ret = SkGmPhyRead(pAC, IoC, Port, PHY_MARV_PHY_CTRL, &Word);
+		Word &= ~PHY_M_PC_DIS_125CLK;
+		Word |=	PHY_M_PC_MAC_POW_UP;
+		SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PHY_CTRL, Word);
+
+		/*
+		 * register changes must be followed by a software
+		 * reset to take effect
+		 */
+		SkGmPhyRead(pAC, IoC, Port, PHY_MARV_CTRL, &Word);
+		Word |= PHY_CT_RESET;
+		SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_CTRL, Word);
+
+		/* switch IEEE compatible power down mode off */
+		SkGmPhyRead(pAC, IoC, Port, PHY_MARV_CTRL, &Word);
+		Word &= ~PHY_CT_PDOWN;
+		SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_CTRL, Word);
+
+		break;
+
+	/* energy detect and energy detect plus mode */
+	case PHY_PM_ENERGY_DETECT:
+	case PHY_PM_ENERGY_DETECT_PLUS:
+		/*
+		 * - enable MAC 125 MHz clock
+		 */
+		Ret = SkGmPhyRead(pAC, IoC, Port, PHY_MARV_PHY_CTRL, &Word);
+		Word &= ~PHY_M_PC_DIS_125CLK;
+		SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PHY_CTRL, Word);
+
+		/* disable energy detect mode */
+		SkGmPhyRead(pAC, IoC, Port, PHY_MARV_PHY_CTRL, &Word);
+		Word &= ~PHY_M_PC_EN_DET_MSK;
+		SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PHY_CTRL, Word);
+
+		/*
+		 * reinitialize the PHY to force a software reset
+		 * which is necessary after the register settings
+		 * for the energy detect modes.
+		 * Furthermore reinitialisation prevents that the
+		 * PHY is running out of a stable state.
+		 */
+		SkGmInitPhyMarv(pAC, IoC, Port, SK_FALSE);
+
+		break;
+
+	/* don't change current power mode */
+	default:
+		pAC->GIni.GP[Port].PPhyPowerState = LastMode;
 		Ret = 1;
+		break;
 	}
 
 	return(Ret);
 
 }	/* SkGmLeaveLowPowerMode */
-#endif /* !SK_SLIM */
-
+#endif /* SK_PHY_LP_MODE */
 
 /******************************************************************************
  *
@@ -2424,15 +2475,17 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 	SK_U16		PhyCtrl;
 	SK_U16		C1000BaseT;
 	SK_U16		AutoNegAdv;
+	SK_U16		SWord;
 #ifndef VCPU
 	SK_U16		ExtPhyCtrl;
 	SK_U16		LedCtrl;
+	SK_U16		LedOver;
 #if defined(SK_DIAG) || defined(DEBUG)
 	SK_U16		PhyStat;
 	SK_U16		PhyStat1;
 	SK_U16		PhySpecStat;
 #endif /* SK_DIAG || DEBUG */
-#endif /* VCPU */
+#endif /* !VCPU */
 
 	pPrt = &pAC->GIni.GP[Port];
 
@@ -2443,33 +2496,59 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 	else {
 		AutoNeg = SK_TRUE;
 	}
-	
+
 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
 		("InitPhyMarv: Port %d, auto-negotiation %s\n",
 		 Port, AutoNeg ? "ON" : "OFF"));
 
-#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);
+#ifndef VCPU
+	if ((pPrt->PLinkSpeedCap & SK_LSPEED_CAP_1000MBPS) != 0) {
+
+		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 if (AutoNeg && pPrt->PLinkSpeed == SK_LSPEED_AUTO) {
+			/* Read Ext. PHY Specific Control */
+			SkGmPhyRead(pAC, IoC, Port, PHY_MARV_EXT_CTRL, &ExtPhyCtrl);
+
+			ExtPhyCtrl &= ~(PHY_M_EC_M_DSC_MSK | PHY_M_EC_S_DSC_MSK |
+				PHY_M_EC_MAC_S_MSK);
+
+			ExtPhyCtrl |= PHY_M_EC_MAC_S(MAC_TX_CLK_25_MHZ);
+
+			if (pAC->GIni.GIChipId == CHIP_ID_YUKON_EC) {
+				/* on PHY 88E1111 there is a change for downshift control */
+				ExtPhyCtrl |= PHY_M_EC_M_DSC_2(0);
+			}
+			else {
+				ExtPhyCtrl |= PHY_M_EC_M_DSC(0) | PHY_M_EC_S_DSC(1);
+			}
+
+			SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_EXT_CTRL, ExtPhyCtrl);
+			SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+				("Set Ext. PHY Ctrl=0x%04X\n", ExtPhyCtrl));
+		}
 	}
-	else if (AutoNeg && pPrt->PLinkSpeed == SK_LSPEED_AUTO) {
-		/* Read Ext. PHY Specific Control */
-		SkGmPhyRead(pAC, IoC, Port, PHY_MARV_EXT_CTRL, &ExtPhyCtrl);
-		
-		ExtPhyCtrl &= ~(PHY_M_EC_M_DSC_MSK | PHY_M_EC_S_DSC_MSK |
-			PHY_M_EC_MAC_S_MSK);
-		
-		ExtPhyCtrl |= PHY_M_EC_MAC_S(MAC_TX_CLK_25_MHZ) |
-			PHY_M_EC_M_DSC(0) | PHY_M_EC_S_DSC(1);
-	
-		SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_EXT_CTRL, ExtPhyCtrl);
-		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-			("Set Ext. PHY Ctrl=0x%04X\n", ExtPhyCtrl));
+
+	if (!DoLoop && CHIP_ID_YUKON_2(pAC)) {
+		/* Read PHY Specific Control */
+		SkGmPhyRead(pAC, IoC, Port, PHY_MARV_PHY_CTRL, &PhyCtrl);
+
+		if (pAC->GIni.GIChipId == CHIP_ID_YUKON_FE) {
+			/* Enable Automatic Crossover (!!! Bits 5..4) */
+			PhyCtrl |= (SK_U16)(PHY_M_PC_MDI_XMODE(PHY_M_PC_ENA_AUTO) >> 1);
+		}
+		else {
+			/* Disable Energy Detect Mode */
+			PhyCtrl &= ~PHY_M_PC_EN_DET_MSK;
+
+			/* Enable Automatic Crossover */
+			PhyCtrl |= (SK_U16)PHY_M_PC_MDI_XMODE(PHY_M_PC_ENA_AUTO);
+		}
+
+		SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PHY_CTRL, PhyCtrl);
 	}
 
 	/* Read PHY Control */
@@ -2483,7 +2562,7 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 	PhyCtrl |= PHY_CT_RESET;
 	/* Assert software reset */
 	SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_CTRL, PhyCtrl);
-#endif /* VCPU */
+#endif /* !VCPU */
 
 	PhyCtrl = 0 /* PHY_CT_COL_TST */;
 	C1000BaseT = 0;
@@ -2493,15 +2572,15 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 	if (pPrt->PMSMode != SK_MS_MODE_AUTO) {
 		/* enable Manual Master/Slave */
 		C1000BaseT |= PHY_M_1000C_MSE;
-		
+
 		if (pPrt->PMSMode == SK_MS_MODE_MASTER) {
 			C1000BaseT |= PHY_M_1000C_MSC;	/* set it to Master */
 		}
 	}
-	
+
 	/* Auto-negotiation ? */
 	if (!AutoNeg) {
-		
+
 		if (pPrt->PLinkMode == SK_LMODE_FULL) {
 			/* Set Full Duplex Mode */
 			PhyCtrl |= PHY_CT_DUP_MD;
@@ -2516,7 +2595,8 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 		switch (pPrt->PLinkSpeed) {
 		case SK_LSPEED_AUTO:
 		case SK_LSPEED_1000MBPS:
-			PhyCtrl |= PHY_CT_SP1000;
+			PhyCtrl |= (((pPrt->PLinkSpeedCap & SK_LSPEED_CAP_1000MBPS) != 0) ?
+						PHY_CT_SP1000 : PHY_CT_SP100);
 			break;
 		case SK_LSPEED_100MBPS:
 			PhyCtrl |= PHY_CT_SP100;
@@ -2528,31 +2608,59 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 				SKERR_HWI_E019MSG);
 		}
 
+		if ((pPrt->PFlowCtrlMode == SK_FLOW_STAT_NONE) ||
+			/* disable Pause also for 10/100 Mbps in half duplex mode */
+			((pPrt->PLinkMode == SK_LMODE_HALF) &&
+			 ((pPrt->PLinkSpeed == SK_LSPEED_STAT_100MBPS) ||
+			  (pPrt->PLinkSpeed == SK_LSPEED_STAT_10MBPS)))) {
+
+			/* set Pause Off */
+			SK_OUT8(IoC, MR_ADDR(Port, GMAC_CTRL), (SK_U8)GMC_PAUSE_OFF);
+		}
+		else {
+			/* set Pause On */
+			SK_OUT8(IoC, MR_ADDR(Port, GMAC_CTRL), (SK_U8)GMC_PAUSE_ON);
+		}
+
 		if (!DoLoop) {
 			PhyCtrl |= PHY_CT_RESET;
 		}
 	}
 	else {
 		/* Set Auto-negotiation advertisement */
-		
+
 		if (pAC->GIni.GICopperType) {
 			/* Set Speed capabilities */
 			switch (pPrt->PLinkSpeed) {
 			case SK_LSPEED_AUTO:
-				C1000BaseT |= PHY_M_1000C_AHD | PHY_M_1000C_AFD;
+				if ((pPrt->PLinkSpeedCap & SK_LSPEED_CAP_1000MBPS) != 0) {
+					C1000BaseT |= PHY_M_1000C_AFD;
+#ifdef xSK_DIAG
+					C1000BaseT |= PHY_M_1000C_AHD;
+#endif /* SK_DIAG */
+				}
 				AutoNegAdv |= PHY_M_AN_100_FD | PHY_M_AN_100_HD |
 					PHY_M_AN_10_FD | PHY_M_AN_10_HD;
 				break;
 			case SK_LSPEED_1000MBPS:
-				C1000BaseT |= PHY_M_1000C_AHD | PHY_M_1000C_AFD;
+				if ((pPrt->PLinkSpeedCap & SK_LSPEED_CAP_1000MBPS) != 0) {
+					C1000BaseT |= PHY_M_1000C_AFD;
+#ifdef xSK_DIAG
+					C1000BaseT |= PHY_M_1000C_AHD;
+#endif /* SK_DIAG */
+				}
 				break;
 			case SK_LSPEED_100MBPS:
-				AutoNegAdv |= PHY_M_AN_100_FD | PHY_M_AN_100_HD |
-					/* advertise 10Base-T also */
-					PHY_M_AN_10_FD | PHY_M_AN_10_HD;
+				if ((pPrt->PLinkSpeedCap & SK_LSPEED_CAP_100MBPS) != 0) {
+					AutoNegAdv |= PHY_M_AN_100_FD | PHY_M_AN_100_HD |
+						/* advertise 10Base-T also */
+						PHY_M_AN_10_FD | PHY_M_AN_10_HD;
+				}
 				break;
 			case SK_LSPEED_10MBPS:
-				AutoNegAdv |= PHY_M_AN_10_FD | PHY_M_AN_10_HD;
+				if ((pPrt->PLinkSpeedCap & SK_LSPEED_CAP_10MBPS) != 0) {
+					AutoNegAdv |= PHY_M_AN_10_FD | PHY_M_AN_10_HD;
+				}
 				break;
 			default:
 				SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_HWI_E019,
@@ -2575,7 +2683,7 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 				SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_HWI_E015,
 					SKERR_HWI_E015MSG);
 			}
-			
+
 			/* Set Flow-control capabilities */
 			switch (pPrt->PFlowCtrlMode) {
 			case SK_FLOW_MODE_NONE:
@@ -2596,7 +2704,7 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 			}
 		}
 		else {	/* special defines for FIBER (88E1011S only) */
-			
+
 			/* Set Full/half duplex capabilities */
 			switch (pPrt->PLinkMode) {
 			case SK_LMODE_AUTOHALF:
@@ -2612,7 +2720,7 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 				SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_HWI_E015,
 					SKERR_HWI_E015MSG);
 			}
-			
+
 			/* Set Flow-control capabilities */
 			switch (pPrt->PFlowCtrlMode) {
 			case SK_FLOW_MODE_NONE:
@@ -2638,30 +2746,32 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 			PhyCtrl |= PHY_CT_ANE | PHY_CT_RE_CFG;
 		}
 	}
-	
+
 #ifdef VCPU
 	/*
 	 * E-mail from Gu Lin (08-03-2002):
 	 */
-	
+
 	/* Program PHY register 30 as 16'h0708 for simulation speed up */
 	SkGmPhyWrite(pAC, IoC, Port, 30, 0x0700 /* 0x0708 */);
-	
+
 	VCpuWait(2000);
 
 #else /* VCPU */
-	
-	/* Write 1000Base-T Control Register */
-	SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_1000T_CTRL, C1000BaseT);
-	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-		("Set 1000B-T Ctrl =0x%04X\n", C1000BaseT));
-	
+
+	if (pAC->GIni.GIChipId != CHIP_ID_YUKON_FE) {
+		/* Write 1000Base-T Control Register */
+		SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_1000T_CTRL, C1000BaseT);
+		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+			("Set 1000B-T Ctrl =0x%04X\n", C1000BaseT));
+	}
+
 	/* Write AutoNeg Advertisement Register */
 	SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_AUNE_ADV, AutoNegAdv);
 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
 		("Set Auto-Neg.Adv.=0x%04X\n", AutoNegAdv));
 #endif /* VCPU */
-	
+
 	if (DoLoop) {
 		/* Set the PHY Loopback bit */
 		PhyCtrl |= PHY_CT_LOOP;
@@ -2669,21 +2779,18 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 #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 */
 
-#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 */
+#endif /* XXX */
 	}
 #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);
+		/* Write PHY Specific Control */
+		SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PHY_CTRL, PHY_M_PC_EN_DET_MSK);
 	}
 #endif
 
@@ -2696,27 +2803,60 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 	VCpuWait(2000);
 #else
 
-	LedCtrl = PHY_M_LED_PULS_DUR(PULS_170MS) | PHY_M_LED_BLINK_RT(BLINK_84MS);
+	LedCtrl = PHY_M_LED_PULS_DUR(PULS_170MS);
+
+	LedOver = 0;
+
+	if ((pAC->GIni.GILedBlinkCtrl & SK_ACT_LED_BLINK) != 0)  {
+
+		if (pAC->GIni.GIChipId == CHIP_ID_YUKON_FE) {
+			/* on 88E3082 these bits are at 11..9 (shifted left) */
+			LedCtrl |= PHY_M_LED_BLINK_RT(BLINK_84MS) << 1;
+
+			SkGmPhyRead(pAC, IoC, Port, PHY_MARV_FE_LED_PAR, &SWord);
 
-	if ((pAC->GIni.GILedBlinkCtrl & SK_ACT_LED_BLINK) != 0) {
-		LedCtrl |= PHY_M_LEDC_RX_CTRL | PHY_M_LEDC_TX_CTRL;
+			/* delete ACT LED control bits */
+			SWord &= ~PHY_M_FELP_LED1_MSK;
+			/* change ACT LED control to blink mode */
+			SWord |= PHY_M_FELP_LED1_CTRL(LED_PAR_CTRL_ACT_BL);
+
+			SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_FE_LED_PAR, SWord);
+		}
+		else {
+			/* set Tx LED (LED_TX) to blink mode on Rx OR Tx activity */
+			LedCtrl |= PHY_M_LED_BLINK_RT(BLINK_84MS) | PHY_M_LEDC_TX_CTRL;
+
+			/* on PHY 88E1111 there is a change for LED control */
+			if (pAC->GIni.GIChipId == CHIP_ID_YUKON_EC &&
+				(pAC->GIni.GILedBlinkCtrl & SK_DUAL_LED_ACT_LNK) != 0)  {
+				/* Yukon-EC needs setting of 2 bits: 0,6=11) */
+				LedCtrl |= PHY_M_LEDC_TX_C_LSB;
+			}
+			/* turn off the Rx LED (LED_RX) */
+			LedOver |= PHY_M_LED_MO_RX(MO_LED_OFF);
+		}
 	}
 
 	if ((pAC->GIni.GILedBlinkCtrl & SK_DUP_LED_NORMAL) != 0) {
+		/* disable blink mode (LED_DUPLEX) on collisions */
 		LedCtrl |= PHY_M_LEDC_DP_CTRL;
 	}
-	
+
 	SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_LED_CTRL, LedCtrl);
 
 	if ((pAC->GIni.GILedBlinkCtrl & SK_LED_LINK100_ON) != 0) {
 		/* only in forced 100 Mbps mode */
 		if (!AutoNeg && pPrt->PLinkSpeed == SK_LSPEED_100MBPS) {
-
-			SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_LED_OVER,
-				PHY_M_LED_MO_100(MO_LED_ON));
+			/* turn on 100 Mbps LED (LED_LINK100) */
+			LedOver |= PHY_M_LED_MO_100(MO_LED_ON);
 		}
 	}
 
+	if (LedOver != 0) {
+		/* set Manual LED Override */
+		SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_LED_OVER, LedOver);
+	}
+
 #ifdef SK_DIAG
 	c_print("Set PHY Ctrl=0x%04X\n", PhyCtrl);
 	c_print("Set 1000 B-T=0x%04X\n", C1000BaseT);
@@ -2729,31 +2869,33 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 	SkGmPhyRead(pAC, IoC, Port, PHY_MARV_CTRL, &PhyCtrl);
 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
 		("PHY Ctrl Reg.=0x%04X\n", PhyCtrl));
-	
-	/* Read 1000Base-T Control Register */
-	SkGmPhyRead(pAC, IoC, Port, PHY_MARV_1000T_CTRL, &C1000BaseT);
-	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-		("1000B-T Ctrl =0x%04X\n", C1000BaseT));
-	
+
 	/* Read AutoNeg Advertisement Register */
 	SkGmPhyRead(pAC, IoC, Port, PHY_MARV_AUNE_ADV, &AutoNegAdv);
 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
 		("Auto-Neg.Adv.=0x%04X\n", AutoNegAdv));
-	
-	/* 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));
-	
+
+	if (pAC->GIni.GIChipId != CHIP_ID_YUKON_FE) {
+		/* Read 1000Base-T Control Register */
+		SkGmPhyRead(pAC, IoC, Port, PHY_MARV_1000T_CTRL, &C1000BaseT);
+		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+			("1000B-T Ctrl =0x%04X\n", C1000BaseT));
+
+		/* 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));
+	}
+
 	/* Read PHY Status */
 	SkGmPhyRead(pAC, IoC, Port, PHY_MARV_STAT, &PhyStat);
 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
 		("PHY Stat Reg.=0x%04X\n", PhyStat));
-	
+
 	SkGmPhyRead(pAC, IoC, Port, PHY_MARV_STAT, &PhyStat1);
 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
 		("PHY Stat Reg.=0x%04X\n", PhyStat1));
-	
+
 	/* Read PHY Specific Status */
 	SkGmPhyRead(pAC, IoC, Port, PHY_MARV_PHY_STAT, &PhySpecStat);
 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
@@ -2770,6 +2912,9 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 	c_print("PHY Spec Reg=0x%04X\n", PhySpecStat);
 #endif /* SK_DIAG */
 
+	/* Enable all PHY interrupts */
+	SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_INT_MASK,
+		(SK_U16)PHY_M_DEF_MSK);
 #endif /* VCPU */
 
 }	/* SkGmInitPhyMarv */
@@ -2808,7 +2953,7 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 	/* manually Master/Slave ? */
 	if (pPrt->PMSMode != SK_MS_MODE_AUTO) {
 		Ctrl2 |= PHY_L_1000C_MSE;
-		
+
 		if (pPrt->PMSMode == SK_MS_MODE_MASTER) {
 			Ctrl2 |= PHY_L_1000C_MSC;
 		}
@@ -2878,12 +3023,12 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 		/* Restart Auto-negotiation */
 		Ctrl1 = PHY_CT_ANE | PHY_CT_RE_CFG;
 	}
-	
+
 	/* Write 1000Base-T Control Register */
 	SkXmPhyWrite(pAC, IoC, Port, PHY_LONE_1000T_CTRL, Ctrl2);
 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
 		("1000B-T Ctrl Reg=0x%04X\n", Ctrl2));
-	
+
 	/* Write AutoNeg Advertisement Register */
 	SkXmPhyWrite(pAC, IoC, Port, PHY_LONE_AUNE_ADV, Ctrl3);
 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
@@ -2946,7 +3091,7 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 
 #ifdef GENESIS
 	if (pAC->GIni.GIGenesis) {
-		
+
 		switch (pPrt->PhyType) {
 		case SK_PHY_XMAC:
 			SkXmInitPhyXmac(pAC, IoC, Port, DoLoop);
@@ -2965,10 +3110,10 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 		}
 	}
 #endif /* GENESIS */
-	
+
 #ifdef YUKON
 	if (pAC->GIni.GIYukon) {
-		
+
 		SkGmInitPhyMarv(pAC, IoC, Port, DoLoop);
 	}
 #endif /* YUKON */
@@ -3012,7 +3157,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_ERR,
 			("AutoNegFail: Remote fault bit set Port %d\n", Port));
 		pPrt->PAutoNegFail = SK_TRUE;
-		
+
 		return(SK_AND_OTHER);
 	}
 
@@ -3041,12 +3186,12 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		pPrt->PFlowCtrlStatus = SK_FLOW_STAT_SYMMETRIC;
 	}
 	else if (pPrt->PFlowCtrlMode == SK_FLOW_MODE_SYM_OR_REM &&
-		   (LPAb & PHY_X_RS_PAUSE) == PHY_X_P_ASYM_MD) {
+		     (LPAb & PHY_X_RS_PAUSE) == PHY_X_P_ASYM_MD) {
 		/* Enable PAUSE receive, disable PAUSE transmit */
 		pPrt->PFlowCtrlStatus = SK_FLOW_STAT_REM_SEND;
 	}
 	else if (pPrt->PFlowCtrlMode == SK_FLOW_MODE_LOC_SEND &&
-		   (LPAb & PHY_X_RS_PAUSE) == PHY_X_P_BOTH_MD) {
+		     (LPAb & PHY_X_RS_PAUSE) == PHY_X_P_BOTH_MD) {
 		/* Disable PAUSE receive, enable PAUSE transmit */
 		pPrt->PFlowCtrlStatus = SK_FLOW_STAT_LOC_SEND;
 	}
@@ -3096,7 +3241,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
 01-Sep-2000 RA;:;:
 	SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_1000T_STAT, &ResAb);
 #endif	/* 0 */
-	
+
 	SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUX_STAT, &AuxStat);
 
 	if ((LPAb & PHY_B_AN_RF) != 0) {
@@ -3121,7 +3266,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		pPrt->PAutoNegFail = SK_TRUE;
 		return(SK_AND_DUP_CAP);
 	}
-	
+
 #ifdef TEST_ONLY
 01-Sep-2000 RA;:;:
 	/* Check Master/Slave resolution */
@@ -3132,7 +3277,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		pPrt->PMSStatus = SK_MS_STAT_FAULT;
 		return(SK_AND_OTHER);
 	}
-	
+
 	pPrt->PMSStatus = ((ResAb & PHY_B_1000S_MSR) != 0) ?
 		SK_MS_STAT_MASTER : SK_MS_STAT_SLAVE;
 #endif	/* 0 */
@@ -3193,7 +3338,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
 	SkGmPhyRead(pAC, IoC, Port, PHY_MARV_AUNE_LP, &LPAb);
 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
 		("Link P.Abil.=0x%04X\n", LPAb));
-	
+
 	if ((LPAb & PHY_M_AN_RF) != 0) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_ERR,
 			("AutoNegFail: Remote fault bit set Port %d\n", Port));
@@ -3201,23 +3346,26 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		return(SK_AND_OTHER);
 	}
 
-	SkGmPhyRead(pAC, IoC, Port, PHY_MARV_1000T_STAT, &ResAb);
-	
-	/* Check Master/Slave resolution */
-	if ((ResAb & PHY_B_1000S_MSF) != 0) {
-		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_ERR,
-			("Master/Slave Fault Port %d\n", Port));
-		pPrt->PAutoNegFail = SK_TRUE;
-		pPrt->PMSStatus = SK_MS_STAT_FAULT;
-		return(SK_AND_OTHER);
+	if ((pPrt->PLinkSpeedCap & SK_LSPEED_CAP_1000MBPS) != 0) {
+
+		SkGmPhyRead(pAC, IoC, Port, PHY_MARV_1000T_STAT, &ResAb);
+
+		/* Check Master/Slave resolution */
+		if ((ResAb & PHY_B_1000S_MSF) != 0) {
+			SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_ERR,
+				("Master/Slave Fault Port %d\n", Port));
+			pPrt->PAutoNegFail = SK_TRUE;
+			pPrt->PMSStatus = SK_MS_STAT_FAULT;
+			return(SK_AND_OTHER);
+		}
 	}
-	
+
 	pPrt->PMSStatus = ((ResAb & PHY_B_1000S_MSR) != 0) ?
 		(SK_U8)SK_MS_STAT_MASTER : (SK_U8)SK_MS_STAT_SLAVE;
-	
+
 	/* Read PHY Specific Status */
 	SkGmPhyRead(pAC, IoC, Port, PHY_MARV_PHY_STAT, &AuxStat);
-	
+
 	/* Check Speed & Duplex resolved */
 	if ((AuxStat & PHY_M_PS_SPDUP_RES) == 0) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_ERR,
@@ -3226,43 +3374,66 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_UNKNOWN;
 		return(SK_AND_DUP_CAP);
 	}
-	
+
 	if ((AuxStat & PHY_M_PS_FULL_DUP) != 0) {
 		pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_AUTOFULL;
 	}
 	else {
 		pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_AUTOHALF;
 	}
-	
-	/* 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 */
-		pPrt->PFlowCtrlStatus = SK_FLOW_STAT_SYMMETRIC;
+
+	if (pAC->GIni.GIChipId == CHIP_ID_YUKON_FE) {
+		/* set used link speed */
+		pPrt->PLinkSpeedUsed = ((AuxStat & PHY_M_PS_SPEED_100) != 0) ?
+			(SK_U8)SK_LSPEED_STAT_100MBPS : (SK_U8)SK_LSPEED_STAT_10MBPS;
 	}
-	else if ((AuxStat & PHY_M_PS_PAUSE_MSK) == PHY_M_PS_RX_P_EN) {
-		/* Enable PAUSE receive, disable PAUSE transmit */
-		pPrt->PFlowCtrlStatus = SK_FLOW_STAT_REM_SEND;
+	else {
+		/* set used link speed */
+		switch ((unsigned)(AuxStat & PHY_M_PS_SPEED_MSK)) {
+		case (unsigned)PHY_M_PS_SPEED_1000:
+			pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_1000MBPS;
+			break;
+		case PHY_M_PS_SPEED_100:
+			pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_100MBPS;
+			break;
+		default:
+			pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_10MBPS;
+		}
+
+		if (pAC->GIni.GIChipId == CHIP_ID_YUKON_XL) {
+			/* Tx & Rx Pause Enabled bits are at 9..8 */
+			AuxStat >>= 6;
+		}
+
+		/* 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 */
+			pPrt->PFlowCtrlStatus = SK_FLOW_STAT_SYMMETRIC;
+		}
+		else if ((AuxStat & PHY_M_PS_PAUSE_MSK) == PHY_M_PS_RX_P_EN) {
+			/* Enable PAUSE receive, disable PAUSE transmit */
+			pPrt->PFlowCtrlStatus = SK_FLOW_STAT_REM_SEND;
+		}
+		else if ((AuxStat & PHY_M_PS_PAUSE_MSK) == PHY_M_PS_TX_P_EN) {
+			/* Disable PAUSE receive, enable PAUSE transmit */
+			pPrt->PFlowCtrlStatus = SK_FLOW_STAT_LOC_SEND;
+		}
+		else {
+			/* PAUSE mismatch -> no PAUSE */
+			pPrt->PFlowCtrlStatus = SK_FLOW_STAT_NONE;
+		}
 	}
-	else if ((AuxStat & PHY_M_PS_PAUSE_MSK) == PHY_M_PS_TX_P_EN) {
-		/* Disable PAUSE receive, enable PAUSE transmit */
-		pPrt->PFlowCtrlStatus = SK_FLOW_STAT_LOC_SEND;
+
+	if ((pPrt->PFlowCtrlStatus == SK_FLOW_STAT_NONE) ||
+		/* disable Pause also for 10/100 Mbps in half duplex mode */
+		((pPrt->PLinkSpeedUsed < (SK_U8)SK_LSPEED_STAT_1000MBPS) &&
+		 pPrt->PLinkModeStatus == (SK_U8)SK_LMODE_STAT_AUTOHALF)) {
+		/* set Pause Off */
+		SK_OUT8(IoC, MR_ADDR(Port, GMAC_CTRL), (SK_U8)GMC_PAUSE_OFF);
 	}
 	else {
-		/* PAUSE mismatch -> no PAUSE */
-		pPrt->PFlowCtrlStatus = SK_FLOW_STAT_NONE;
-	}
-	
-	/* set used link speed */
-	switch ((unsigned)(AuxStat & PHY_M_PS_SPEED_MSK)) {
-	case (unsigned)PHY_M_PS_SPEED_1000:
-		pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_1000MBPS;
-		break;
-	case PHY_M_PS_SPEED_100:
-		pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_100MBPS;
-		break;
-	default:
-		pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_10MBPS;
+		/* set Pause On */
+		SK_OUT8(IoC, MR_ADDR(Port, GMAC_CTRL), (SK_U8)GMC_PAUSE_ON);
 	}
 
 	return(SK_AND_OK);
@@ -3317,7 +3488,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
 	else {
 		pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_AUTOHALF;
 	}
-	
+
 	/* Check Master/Slave resolution */
 	if ((ResAb & PHY_L_1000S_MSF) != 0) {
 		/* Error */
@@ -3338,7 +3509,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
 	/* We are using IEEE 802.3z/D5.0 Table 37-4 */
 	/* we must manually resolve the abilities here */
 	pPrt->PFlowCtrlStatus = SK_FLOW_STAT_NONE;
-	
+
 	switch (pPrt->PFlowCtrlMode) {
 	case SK_FLOW_MODE_NONE:
 		/* default */
@@ -3371,7 +3542,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_HWI_E016,
 			SKERR_HWI_E016MSG);
 	}
-	
+
 	return(SK_AND_OK);
 }	/* SkXmAutoNegDoneLone */
 
@@ -3424,9 +3595,9 @@ int		Port)		/* Port Index (MAC_1 + n) */
 
 #ifdef GENESIS
 	if (pAC->GIni.GIGenesis) {
-		
+
 		switch (pPrt->PhyType) {
-		
+
 		case SK_PHY_XMAC:
 			Rtv = SkXmAutoNegDoneXmac(pAC, IoC, Port);
 			break;
@@ -3446,26 +3617,26 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		}
 	}
 #endif /* GENESIS */
-	
+
 #ifdef YUKON
 	if (pAC->GIni.GIYukon) {
-		
+
 		Rtv = SkGmAutoNegDoneMarv(pAC, IoC, Port);
 	}
 #endif /* YUKON */
-	
+
 	if (Rtv != SK_AND_OK) {
 		return(Rtv);
 	}
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
 		("AutoNeg done Port %d\n", Port));
-	
+
 	/* We checked everything and may now enable the link */
 	pPrt->PAutoNegFail = SK_FALSE;
 
 	SkMacRxTxEnable(pAC, IoC, Port);
-	
+
 	return(SK_AND_OK);
 }	/* SkMacAutoNegDone */
 
@@ -3508,7 +3679,7 @@ int		Para)		/* Parameter to set: MAC or 
 		Word &= ~XM_MMU_GMII_LOOP;
 		break;
 	}
-	
+
 	switch (Para & (SK_PHY_FULLD_ON | SK_PHY_FULLD_OFF)) {
 	case SK_PHY_FULLD_ON:
 		Word |= XM_MMU_GMII_FD;
@@ -3517,7 +3688,7 @@ int		Para)		/* Parameter to set: MAC or 
 		Word &= ~XM_MMU_GMII_FD;
 		break;
 	}
-	
+
 	XM_OUT16(IoC, Port, XM_MMU_CMD, Word | XM_MMU_ENA_RX | XM_MMU_ENA_TX);
 
 	/* dummy read to ensure writing */
@@ -3545,7 +3716,7 @@ int		Port,		/* Port Index (MAC_1 + n) */
 int		Para)		/* Parameter to set: MAC LoopBack, Duplex Mode */
 {
 	SK_U16	Ctrl;
-	
+
 	GM_IN16(IoC, Port, GM_GP_CTRL, &Ctrl);
 
 	switch (Para & (SK_MAC_LOOPB_ON | SK_MAC_LOOPB_OFF)) {
@@ -3565,12 +3736,13 @@ int		Para)		/* Parameter to set: MAC Loo
 		Ctrl &= ~GM_GPCR_DUP_FULL;
 		break;
 	}
-	
-    GM_OUT16(IoC, Port, GM_GP_CTRL, (SK_U16)(Ctrl | GM_GPCR_RX_ENA |
-		GM_GPCR_TX_ENA));
 
+	GM_OUT16(IoC, Port, GM_GP_CTRL, Ctrl | GM_GPCR_RX_ENA | GM_GPCR_TX_ENA);
+
+#ifdef XXX
 	/* dummy read to ensure writing */
 	GM_IN16(IoC, Port, GM_GP_CTRL, &Ctrl);
+#endif /* XXX */
 
 }	/* SkGmSetRxTxEn */
 #endif /* YUKON */
@@ -3593,14 +3765,14 @@ int		Para)
 {
 #ifdef GENESIS
 	if (pAC->GIni.GIGenesis) {
-		
+
 		SkXmSetRxTxEn(pAC, IoC, Port, Para);
 	}
 #endif /* GENESIS */
-	
+
 #ifdef YUKON
 	if (pAC->GIni.GIYukon) {
-		
+
 		SkGmSetRxTxEn(pAC, IoC, Port, Para);
 	}
 #endif /* YUKON */
@@ -3639,9 +3811,9 @@ int		Port)		/* Port Index (MAC_1 + n) */
 	}
 
 	if ((pPrt->PLinkMode == SK_LMODE_AUTOHALF ||
-	     pPrt->PLinkMode == SK_LMODE_AUTOFULL ||
-	     pPrt->PLinkMode == SK_LMODE_AUTOBOTH) &&
-	     pPrt->PAutoNegFail) {
+		 pPrt->PLinkMode == SK_LMODE_AUTOFULL ||
+		 pPrt->PLinkMode == SK_LMODE_AUTOBOTH) &&
+		 pPrt->PAutoNegFail) {
 		/* Auto-negotiation is not done or failed */
 		return(0);
 	}
@@ -3650,9 +3822,9 @@ int		Port)		/* Port Index (MAC_1 + n) */
 	if (pAC->GIni.GIGenesis) {
 		/* set Duplex Mode and Pause Mode */
 		SkXmInitDupMd(pAC, IoC, Port);
-		
+
 		SkXmInitPauseMd(pAC, IoC, Port);
-	
+
 		/*
 		 * Initialize the Interrupt Mask Register. Default IRQs are...
 		 *	- Link Asynchronous Event
@@ -3668,23 +3840,23 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		/* add IRQ for Receive FIFO Overflow */
 		IntMask &= ~XM_IS_RXF_OV;
 #endif /* DEBUG */
-		
+
 		if (pPrt->PhyType != SK_PHY_XMAC) {
 			/* disable GP0 interrupt bit */
 			IntMask |= XM_IS_INP_ASS;
 		}
 		XM_OUT16(IoC, Port, XM_IMSK, IntMask);
-	
+
 		/* get MMU Command Reg. */
 		XM_IN16(IoC, Port, XM_MMU_CMD, &Reg);
-		
+
 		if (pPrt->PhyType != SK_PHY_XMAC &&
 			(pPrt->PLinkModeStatus == SK_LMODE_STAT_FULL ||
 			 pPrt->PLinkModeStatus == SK_LMODE_STAT_AUTOFULL)) {
 			/* set to Full Duplex */
 			Reg |= XM_MMU_GMII_FD;
 		}
-		
+
 		switch (pPrt->PhyType) {
 		case SK_PHY_BCOM:
 			/*
@@ -3694,7 +3866,7 @@ 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,
+			SkXmPhyWrite(pAC, IoC, Port, PHY_BCOM_INT_MASK,
 				(SK_U16)PHY_B_DEF_MSK);
 			break;
 #ifdef OTHER_PHY
@@ -3708,12 +3880,12 @@ int		Port)		/* Port Index (MAC_1 + n) */
 			break;
 #endif /* OTHER_PHY */
 		}
-		
+
 		/* enable Rx/Tx */
 		XM_OUT16(IoC, Port, XM_MMU_CMD, Reg | XM_MMU_ENA_RX | XM_MMU_ENA_TX);
 	}
 #endif /* GENESIS */
-	
+
 #ifdef YUKON
 	if (pAC->GIni.GIYukon) {
 		/*
@@ -3728,30 +3900,28 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		/* add IRQ for Receive FIFO Overrun */
 		IntMask |= GM_IS_RX_FF_OR;
 #endif /* DEBUG */
-		
-		SK_OUT8(IoC, GMAC_IRQ_MSK, (SK_U8)IntMask);
-		
+
+		SK_OUT8(IoC, MR_ADDR(Port, GMAC_IRQ_MSK), (SK_U8)IntMask);
+
 		/* get General Purpose Control */
 		GM_IN16(IoC, Port, GM_GP_CTRL, &Reg);
-		
+
 		if (pPrt->PLinkModeStatus == SK_LMODE_STAT_FULL ||
 			pPrt->PLinkModeStatus == SK_LMODE_STAT_AUTOFULL) {
 			/* set to Full Duplex */
 			Reg |= GM_GPCR_DUP_FULL;
 		}
-		
+
 		/* enable Rx/Tx */
-        GM_OUT16(IoC, Port, GM_GP_CTRL, (SK_U16)(Reg | GM_GPCR_RX_ENA |
-			GM_GPCR_TX_ENA));
+		GM_OUT16(IoC, Port, GM_GP_CTRL, Reg | GM_GPCR_RX_ENA | GM_GPCR_TX_ENA);
 
-#ifndef VCPU
-		/* Enable all PHY interrupts */
-        SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_INT_MASK,
-			(SK_U16)PHY_M_DEF_MSK);
-#endif /* VCPU */
+#ifdef XXX
+		/* dummy read to ensure writing */
+		GM_IN16(IoC, Port, GM_GP_CTRL, &Reg);
+#endif /* XXX */
 	}
 #endif /* YUKON */
-					
+
 	return(0);
 
 }	/* SkMacRxTxEnable */
@@ -3774,26 +3944,31 @@ int		Port)		/* Port Index (MAC_1 + n) */
 
 #ifdef GENESIS
 	if (pAC->GIni.GIGenesis) {
-		
+
 		XM_IN16(IoC, Port, XM_MMU_CMD, &Word);
-		
-		XM_OUT16(IoC, Port, XM_MMU_CMD, Word & ~(XM_MMU_ENA_RX | XM_MMU_ENA_TX));
-	
+
+		Word &= ~(XM_MMU_ENA_RX | XM_MMU_ENA_TX);
+
+		XM_OUT16(IoC, Port, XM_MMU_CMD, Word);
+
 		/* dummy read to ensure writing */
 		XM_IN16(IoC, Port, XM_MMU_CMD, &Word);
 	}
 #endif /* GENESIS */
-	
+
 #ifdef YUKON
 	if (pAC->GIni.GIYukon) {
-		
+
 		GM_IN16(IoC, Port, GM_GP_CTRL, &Word);
 
-        GM_OUT16(IoC, Port, GM_GP_CTRL, (SK_U16)(Word & ~(GM_GPCR_RX_ENA |
-			GM_GPCR_TX_ENA)));
+		Word &= ~(GM_GPCR_RX_ENA | GM_GPCR_TX_ENA);
 
+		GM_OUT16(IoC, Port, GM_GP_CTRL, Word);
+
+#ifdef XXX
 		/* dummy read to ensure writing */
 		GM_IN16(IoC, Port, GM_GP_CTRL, &Word);
+#endif /* XXX */
 	}
 #endif /* YUKON */
 
@@ -3822,10 +3997,10 @@ int		Port)		/* Port Index (MAC_1 + n) */
 
 #ifdef GENESIS
 	if (pAC->GIni.GIGenesis) {
-		
+
 		/* disable all XMAC IRQs */
-		XM_OUT16(IoC, Port, XM_IMSK, 0xffff);	
-		
+		XM_OUT16(IoC, Port, XM_IMSK, 0xffff);
+
 		/* Disable all PHY interrupts */
 		switch (pPrt->PhyType) {
 			case SK_PHY_BCOM:
@@ -3852,16 +4027,16 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		}
 	}
 #endif /* GENESIS */
-	
+
 #ifdef YUKON
 	if (pAC->GIni.GIYukon) {
 		/* disable all GMAC IRQs */
-		SK_OUT8(IoC, GMAC_IRQ_MSK, 0);
-		
+		SK_OUT8(IoC, MR_ADDR(Port, GMAC_IRQ_MSK), 0);
+
 #ifndef VCPU
 		/* Disable all PHY interrupts */
 		SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_INT_MASK, 0);
-#endif /* VCPU */
+#endif /* !VCPU */
 	}
 #endif /* YUKON */
 
@@ -4037,12 +4212,12 @@ int		Port)		/* Port Index (MAC_1 + n) */
 	SK_U16		IStatus2;
 #ifdef SK_SLIM
     SK_U64      OverflowStatus;
-#endif	
+#endif
 
 	pPrt = &pAC->GIni.GP[Port];
-	
+
 	XM_IN16(IoC, Port, XM_ISRC, &IStatus);
-	
+
 	/* LinkPartner Auto-negable? */
 	if (pPrt->PhyType == SK_PHY_XMAC) {
 		SkXmAutoNegLipaXmac(pAC, IoC, Port, IStatus);
@@ -4053,7 +4228,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
 			XM_IS_RX_PAGE | XM_IS_TX_PAGE |
 			XM_IS_AND | XM_IS_INP_ASS);
 	}
-	
+
 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
 		("XmacIrq Port %d Isr 0x%04X\n", Port, IStatus));
 
@@ -4170,33 +4345,33 @@ int		Port)		/* Port Index (MAC_1 + n) */
 	SK_GEPORT	*pPrt;
 	SK_U8		IStatus;	/* Interrupt status */
 #ifdef SK_SLIM
-    SK_U64      OverflowStatus;
+	SK_U64		OverflowStatus;
 #else
 	SK_EVPARA	Para;
-#endif	
+#endif
 
 	pPrt = &pAC->GIni.GP[Port];
-	
-	SK_IN8(IoC, GMAC_IRQ_SRC, &IStatus);
-	
+
+	SK_IN8(IoC, MR_ADDR(Port, 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%02X\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);
+		SkGmOverflowStatus(pAC, IoC, Port, (SK_U16)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		
+#endif
 	}
 
 	if (IStatus & GM_IS_RX_FF_OR) {
@@ -4245,7 +4420,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		SkXmIrq(pAC, IoC, Port);
 	}
 #endif /* GENESIS */
-	
+
 #ifdef YUKON
 	if (pAC->GIni.GIYukon) {
 		/* IRQ from GMAC */
@@ -4295,7 +4470,7 @@ unsigned int Port)	/* Port Index (MAC_1 
 	do {
 
 		XM_IN16(IoC, Port, XM_STAT_CMD, &StatReg);
-		
+
 		if (++WaitIndex > 10) {
 
 			SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_HWI_E021, SKERR_HWI_E021MSG);
@@ -4303,7 +4478,7 @@ unsigned int Port)	/* Port Index (MAC_1 
 			return(1);
 		}
 	} while ((StatReg & (XM_SC_SNP_TXC | XM_SC_SNP_RXC)) != 0);
-	
+
 	return(0);
 }	/* SkXmUpdateStats */
 
@@ -4326,15 +4501,15 @@ SK_AC	*pAC,			/* Adapter Context */
 SK_IOC	IoC,			/* I/O 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 */
+SK_U32	SK_FAR *pVal)	/* Pointer to return statistic value */
 {
 	if ((StatAddr < XM_TXF_OK) || (StatAddr > XM_RXF_MAX_SZ)) {
-		
+
 		SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E022, SKERR_HWI_E022MSG);
-		
+
 		return(1);
 	}
-	
+
 	XM_IN32(IoC, Port, StatAddr, pVal);
 
 	return(0);
@@ -4358,7 +4533,7 @@ SK_IOC	IoC,		/* I/O 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 */
+	/* Clear two times according to XMAC Errata #3 */
 	XM_OUT16(IoC, Port, XM_STAT_CMD, XM_SC_CLR_RXC | XM_SC_CLR_TXC);
 
 	return(0);
@@ -4388,8 +4563,8 @@ int SkXmOverflowStatus(
 SK_AC	*pAC,				/* Adapter Context */
 SK_IOC	IoC,				/* I/O 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_U16	IStatus,			/* Interrupt Status from MAC */
+SK_U64	SK_FAR *pStatus)	/* Pointer for return overflow status value */
 {
 	SK_U64	Status;	/* Overflow status */
 	SK_U32	RegVal;
@@ -4401,7 +4576,7 @@ SK_U64	SK_FAR *pStatus)	/* ptr for retur
 		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);
@@ -4454,20 +4629,23 @@ SK_AC	*pAC,			/* Adapter Context */
 SK_IOC	IoC,			/* I/O 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 */
+SK_U32	SK_FAR *pVal)	/* Pointer 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_ERR,
 			("SkGmMacStat: wrong MIB counter 0x%04X\n", StatAddr));
 		return(1);
 	}
-		
+
 	GM_IN32(IoC, Port, StatAddr, pVal);
 
+	/* dummy read */
+	SK_IN16(IoC, B0_RAP, &StatAddr);
+
 	return(0);
 }	/* SkGmMacStatistic */
 
@@ -4496,16 +4674,16 @@ unsigned int Port)	/* Port Index (MAC_1 
 
 	/* set MIB Clear Counter Mode */
 	GM_OUT16(IoC, Port, GM_PHY_ADDR, Reg | GM_PAR_MIB_CLR);
-	
+
 	/* read all MIB Counters with Clear Mode set */
 	for (i = 0; i < GM_MIB_CNT_SIZE; i++) {
 		/* the reset is performed only when the lower 16 bits are read */
 		GM_IN16(IoC, Port, GM_MIB_CNT_BASE + 8*i, &Word);
 	}
-	
+
 	/* clear MIB Clear Counter Mode */
 	GM_OUT16(IoC, Port, GM_PHY_ADDR, Reg);
-	
+
 	return(0);
 }	/* SkGmResetCounter */
 
@@ -4519,11 +4697,11 @@ unsigned int Port)	/* Port Index (MAC_1 
  *	resulting counter overflow status is written to <pStatus>, whereas the
  *	the following bit coding is used:
  *	63:56 - unused
- *	55:48 - TxRx interrupt register bit7:0
- *	32:47 - Rx interrupt register
+ *	55:48 - TxRx interrupt register bit 7:0
+ *	47:32 - Rx interrupt register
  *	31:24 - unused
- *	23:16 - TxRx interrupt register bit15:8
- *	15:0  - Tx interrupt register
+ *	23:16 - TxRx interrupt register bit 15:8
+ *	15: 0 - Tx interrupt register
  *
  * Returns:
  *	0:  success
@@ -4533,34 +4711,48 @@ int SkGmOverflowStatus(
 SK_AC	*pAC,				/* Adapter Context */
 SK_IOC	IoC,				/* I/O 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_U16	IStatus,			/* Interrupt Status from MAC */
+SK_U64	SK_FAR *pStatus)	/* Pointer for return overflow status value */
 {
-	SK_U64	Status;		/* Overflow status */
 	SK_U16	RegVal;
+#ifndef SK_SLIM
+	SK_U64	Status;		/* Overflow status */
 
 	Status = 0;
+#endif /* !SK_SLIM */
 
 	if ((IStatus & GM_IS_RX_CO_OV) != 0) {
 		/* this register is self-clearing after read */
 		GM_IN16(IoC, Port, GM_RX_IRQ_SRC, &RegVal);
+
+#ifndef SK_SLIM
 		Status |= (SK_U64)RegVal << 32;
+#endif /* !SK_SLIM */
 	}
-	
+
 	if ((IStatus & GM_IS_TX_CO_OV) != 0) {
 		/* this register is self-clearing after read */
 		GM_IN16(IoC, Port, GM_TX_IRQ_SRC, &RegVal);
+
+#ifndef SK_SLIM
 		Status |= (SK_U64)RegVal;
+#endif /* !SK_SLIM */
 	}
-	
+
 	/* this register is self-clearing after read */
 	GM_IN16(IoC, Port, GM_TR_IRQ_SRC, &RegVal);
+
+#ifndef SK_SLIM
 	/* Rx overflow interrupt register bits (LoByte)*/
 	Status |= (SK_U64)((SK_U8)RegVal) << 48;
 	/* Tx overflow interrupt register bits (HiByte)*/
 	Status |= (SK_U64)(RegVal >> 8) << 16;
 
 	*pStatus = Status;
+#endif /* !SK_SLIM */
+
+	/* dummy read */
+	SK_IN16(IoC, B0_RAP, &RegVal);
 
 	return(0);
 }	/* SkGmOverflowStatus */
@@ -4576,7 +4768,7 @@ SK_U64	SK_FAR *pStatus)	/* ptr for retur
  *  gets the results if 'StartTest' is true
  *
  * NOTE:	this test is meaningful only when link is down
- *	
+ *
  * Returns:
  *	0:  success
  *	1:	no YUKON copper
@@ -4589,44 +4781,75 @@ int		Port,		/* Port Index (MAC_1 + n) */
 SK_BOOL	StartTest)	/* flag for start / get result */
 {
 	int		i;
+	int		CableDiagOffs;
+	int		MdiPairs;
+	SK_BOOL	FastEthernet;
 	SK_U16	RegVal;
 	SK_GEPORT	*pPrt;
 
 	pPrt = &pAC->GIni.GP[Port];
 
 	if (pPrt->PhyType != SK_PHY_MARV_COPPER) {
-		
+
 		return(1);
 	}
 
+	if (pAC->GIni.GIChipId == CHIP_ID_YUKON_FE) {
+
+		CableDiagOffs = PHY_MARV_FE_VCT_TX;
+		FastEthernet = SK_TRUE;
+		MdiPairs = 2;
+	}
+	else {
+		CableDiagOffs = PHY_MARV_CABLE_DIAG;
+		FastEthernet = SK_FALSE;
+		MdiPairs = 4;
+	}
+
 	if (StartTest) {
 		/* only start the cable test */
-		if ((pPrt->PhyId1 & PHY_I1_REV_MSK) < 4) {
-			/* apply TDR workaround from Marvell */
-			SkGmPhyWrite(pAC, IoC, Port, 29, 0x001e);
-			
-			SkGmPhyWrite(pAC, IoC, Port, 30, 0xcc00);
-			SkGmPhyWrite(pAC, IoC, Port, 30, 0xc800);
-			SkGmPhyWrite(pAC, IoC, Port, 30, 0xc400);
-			SkGmPhyWrite(pAC, IoC, Port, 30, 0xc000);
-			SkGmPhyWrite(pAC, IoC, Port, 30, 0xc100);
-		}
+		if (!FastEthernet) {
 
-		/* set address to 0 for MDI[0] */
-		SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_EXT_ADR, 0);
+			if ((((pPrt->PhyId1 & PHY_I1_MOD_NUM) >> 4) == 2) &&
+				 ((pPrt->PhyId1 & PHY_I1_REV_MSK) < 4)) {
+				/* apply TDR workaround for model 2, rev. < 4 */
+				SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PAGE_ADDR, 0x001e);
+
+				SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PAGE_DATA, 0xcc00);
+				SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PAGE_DATA, 0xc800);
+				SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PAGE_DATA, 0xc400);
+				SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PAGE_DATA, 0xc000);
+				SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PAGE_DATA, 0xc100);
+			}
 
-		/* Read Cable Diagnostic Reg */
-		SkGmPhyRead(pAC, IoC, Port, PHY_MARV_CABLE_DIAG, &RegVal);
+			if (pAC->GIni.GIChipId == CHIP_ID_YUKON_EC) {
+				/* set address to 1 for Page 1 */
+				SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_EXT_ADR, 1);
+	
+				/* disable waiting period */
+				SkGmPhyWrite(pAC, IoC, Port, CableDiagOffs,
+					PHY_M_CABD_DIS_WAIT);
+			}
+	
+			/* set address to 0 for MDI[0] (Page 0) */
+			SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_EXT_ADR, 0);
+		}
+		else {
+			SkGmPhyRead(pAC, IoC, Port, PHY_MARV_FE_SPEC_2, &RegVal);
+			/* disable waiting period */
+			RegVal |= PHY_M_FESC_DIS_WAIT;
+
+			SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_FE_SPEC_2, RegVal);
+		}
 
 		/* start Cable Diagnostic Test */
-		SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_CABLE_DIAG,
-			(SK_U16)(RegVal | PHY_M_CABD_ENA_TEST));
-	
+		SkGmPhyWrite(pAC, IoC, Port, CableDiagOffs, PHY_M_CABD_ENA_TEST);
+
 		return(0);
 	}
-	
+
 	/* Read Cable Diagnostic Reg */
-	SkGmPhyRead(pAC, IoC, Port, PHY_MARV_CABLE_DIAG, &RegVal);
+	SkGmPhyRead(pAC, IoC, Port, CableDiagOffs, &RegVal);
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
 		("PHY Cable Diag.=0x%04X\n", RegVal));
@@ -4637,16 +4860,24 @@ SK_BOOL	StartTest)	/* flag for start / g
 	}
 
 	/* get the test results */
-	for (i = 0; i < 4; i++)  {
-		/* set address to i for MDI[i] */
-		SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_EXT_ADR, (SK_U16)i);
+	for (i = 0; i < MdiPairs; i++)  {
+
+		if (!FastEthernet) {
+			/* set address to i for MDI[i] */
+			SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_EXT_ADR, (SK_U16)i);
+		}
 
 		/* get Cable Diagnostic values */
-		SkGmPhyRead(pAC, IoC, Port, PHY_MARV_CABLE_DIAG, &RegVal);
+		SkGmPhyRead(pAC, IoC, Port, CableDiagOffs, &RegVal);
 
 		pPrt->PMdiPairLen[i] = (SK_U8)(RegVal & PHY_M_CABD_DIST_MSK);
 
 		pPrt->PMdiPairSts[i] = (SK_U8)((RegVal & PHY_M_CABD_STAT_MSK) >> 13);
+
+		if (FastEthernet) {
+			/* get next register */
+			CableDiagOffs++;
+		}
 	}
 
 	return(0);
@@ -4655,3 +4886,4 @@ SK_BOOL	StartTest)	/* flag for start / g
 #endif /* YUKON */
 
 /* End of file */
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/sky2.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/sky2.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/sky2.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/sky2.c	2004-09-09 13:20:49.000000000 +0200
@@ -0,0 +1,2428 @@
+/******************************************************************************
+ *
+ * Name:        sky2.c
+ * Project:     Yukon2 specific functions and implementations
+ * Version:     $Revision: 1.35 $
+ * Date:        $Date: 2004/08/17 12:37:45 $
+ * Purpose:     The main driver source module
+ *
+ *****************************************************************************/
+
+/******************************************************************************
+ *
+ *	(C)Copyright 1998-2002 SysKonnect GmbH.
+ *	(C)Copyright 2002-2004 Marvell.
+ *
+ *	Driver for Marvell Yukon/2 chipset and SysKonnect Gigabit Ethernet 
+ *      Server Adapters.
+ *
+ *	Author: Ralph Roesler (rroesler@syskonnect.de)
+ *	        Mirko Lindner (mlindner@syskonnect.de)
+ *
+ *	Address all question to: linux@syskonnect.de
+ *
+ *	The technical manual for the adapters is available from SysKonnect's
+ *	web pages: www.syskonnect.com
+ *	
+ *	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.
+ *
+ *****************************************************************************/
+
+#include "h/skdrv1st.h"
+#include "h/skdrv2nd.h"
+#include <linux/tcp.h>
+
+/******************************************************************************
+ *
+ * Local Function Prototypes
+ *
+ *****************************************************************************/
+
+static void InitPacketQueues(SK_AC *pAC,int Port);
+static void GiveTxBufferToHw(SK_AC *pAC,SK_IOC IoC,int Port);
+static void GiveRxBufferToHw(SK_AC *pAC,SK_IOC IoC,int Port,SK_PACKET *pPacket);
+static void FillReceiveTableYukon2(SK_AC *pAC,SK_IOC IoC,int Port);
+static SK_BOOL HandleReceives(SK_AC *pAC,int Port,SK_U16 Len,SK_U32 FrameStatus,SK_U16 Tcp1,SK_U16 Tcp2,SK_U32 Tist,SK_U16 Vlan);
+static void CheckForSendComplete(SK_AC *pAC,SK_IOC IoC,int Port,SK_PKT_QUEUE *pPQ,SK_LE_TABLE *pLETab,unsigned int Done);
+static void UnmapAndFreeTxPktBuffer(SK_AC *pAC,SK_PACKET *pSkPacket,int TxPort);
+static SK_BOOL AllocateAndInitLETables(SK_AC *pAC);
+static SK_BOOL AllocatePacketBuffersYukon2(SK_AC *pAC);
+static void FreeLETables(SK_AC *pAC);
+static void FreePacketBuffers(SK_AC *pAC);
+static SK_BOOL AllocAndMapRxBuffer(SK_AC *pAC,SK_PACKET *pSkPacket,int Port);
+#ifdef CONFIG_SK98LIN_NAPI
+static SK_BOOL HandleStatusLEs(SK_AC *pAC,int *WorkDone,int WorkToDo);
+#else
+static SK_BOOL HandleStatusLEs(SK_AC *pAC);
+#endif
+
+/******************************************************************************
+ *
+ * Local Variables
+ *
+ *****************************************************************************/
+
+#define MAX_NBR_RX_BUFFERS_IN_HW	0x15
+static SK_U8 NbrRxBuffersInHW;
+
+#if defined(__i386__) || defined(__x86_64__)
+// Investigate faster method, because using 'wbinvd' costs too much time...
+// #define FLUSH_OPC(le)   asm volatile ("wbinvd":::"memory");
+#define FLUSH_OPC(le)
+#else
+#define FLUSH_OPC(le) 
+#endif
+
+/******************************************************************************
+ *
+ * Global Functions
+ *
+ *****************************************************************************/
+
+int SkY2Xmit( struct sk_buff *skb, struct SK_NET_DEVICE *dev); 
+
+/*****************************************************************************
+ *
+ * 	SkY2RestartStatusUnit - restarts teh status unit
+ *
+ * Description:
+ *	Reenables the status unit after any De-Init (e.g. when altering 
+ *	the sie of the MTU via 'ifconfig a.b.c.d mtu xxx')
+ *
+ * Returns:	N/A
+ */
+void SkY2RestartStatusUnit(
+SK_AC  *pAC)  /* pointer to adapter control context */
+{
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_MSG,
+		("==> SkY2RestartStatusUnit\n"));
+
+	/*
+	** It might be that the TX timer is not started. Therefore
+	** it is initialized here -> to be more investigated!
+	*/
+	SK_OUT32(pAC->IoBase, STAT_TX_TIMER_INI, HW_MS_TO_TICKS(pAC,10));
+
+	pAC->StatusLETable.Done  = 0;
+	pAC->StatusLETable.Put   = 0;
+	pAC->StatusLETable.HwPut = 0;
+	SkGeY2InitStatBmu(pAC, pAC->IoBase, &pAC->StatusLETable);
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_MSG,
+		("<== SkY2RestartStatusUnit\n"));
+}
+
+/*****************************************************************************
+ *
+ * 	SkY2RlmtSend - sends out a single RLMT notification
+ *
+ * Description:
+ *	This function sends out an RLMT frame
+ *
+ * Returns:	
+ *	> 0 - on succes: the number of bytes in the message
+ *	= 0 - on resource shortage: this frame sent or dropped, now
+ *	      the ring is full ( -> set tbusy)
+ *	< 0 - on failure: other problems ( -> return failure to upper layers)
+ */
+int SkY2RlmtSend (
+SK_AC          *pAC,       /* pointer to adapter control context           */
+int             PortNr,    /* index of port the packet(s) shall be send to */
+struct sk_buff *pMessage)  /* pointer to send-message                      */
+{
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_MSG,
+		("=== SkY2RlmtSend\n"));
+	return -1;   // temporarily do not send out RLMT frames
+#if 0
+	return(SkY2Xmit(pMessage, pAC->dev[PortNr])); SkY2Xmit needs device
+#endif
+}
+
+/*****************************************************************************
+ *
+ * 	SkY2AllocateResources - Allocates all required resources for Yukon2
+ *
+ * Description:
+ *	This function allocates all memory needed for the Yukon2. 
+ *	It maps also RX buffers to the LETables and initializes the
+ *	status list element table.
+ *
+ * Returns:	
+ *	SK_TRUE, if all resources could be allocated and setup succeeded
+ *	SK_FALSE, if an error 
+ */
+SK_BOOL SkY2AllocateResources (
+SK_AC  *pAC)  /* pointer to adapter control context */
+{
+	int CurrMac;
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_INIT,
+		("==> SkY2AllocateResources\n"));
+
+	/*
+	** Initialize the packet queue variables first
+	*/
+	for (CurrMac = 0; CurrMac < pAC->GIni.GIMacsFound; CurrMac++) {
+		InitPacketQueues(pAC, CurrMac);
+	}
+
+	/* 
+	** Get sufficient memory for the LETables
+	*/
+	if (!AllocateAndInitLETables(pAC)) {
+		SK_DBG_MSG(pAC, SK_DBGMOD_DRV, 
+			SK_DBGCAT_INIT | SK_DBGCAT_DRV_ERROR,
+			("No memory for LETable.\n"));
+		return(SK_FALSE);
+	}
+
+	/*
+	** Allocate and intialize memory for both RX and TX 
+	** packet and fragment buffers. On an error, free 
+	** previously allocated LETable memory and quit.
+	*/
+	if (!AllocatePacketBuffersYukon2(pAC)) {
+		FreeLETables(pAC);
+		SK_DBG_MSG(pAC, SK_DBGMOD_DRV, 
+			SK_DBGCAT_INIT | SK_DBGCAT_DRV_ERROR,
+			("No memory for Packetbuffers.\n"));
+		return(SK_FALSE);
+	}
+
+	/* 
+	** Rx and Tx LE tables will be initialized in SkGeOpen() 
+	**
+	** It might be that the TX timer is not started. Therefore
+	** it is initialized here -> to be more investigated!
+	*/
+	SK_OUT32(pAC->IoBase, STAT_TX_TIMER_INI, HW_MS_TO_TICKS(pAC,10));
+	SkGeY2InitStatBmu(pAC, pAC->IoBase, &pAC->StatusLETable);
+
+	pAC->MaxUnusedRxLeWorking = MAX_UNUSED_RX_LE_WORKING;
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_INIT,
+		("<== SkY2AllocateResources\n"));
+
+	return (SK_TRUE);
+}
+
+/*****************************************************************************
+ *
+ * 	SkY2FreeResources - Frees previously allocated resources of Yukon2
+ *
+ * Description:
+ *	This function frees all previously allocated memory of the Yukon2. 
+ *
+ * Returns: N/A
+ */
+void SkY2FreeResources (
+SK_AC  *pAC)  /* pointer to adapter control context */
+{
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_MSG,
+		("==> SkY2FreeResources\n"));
+
+	FreeLETables(pAC);
+	FreePacketBuffers(pAC);
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_MSG,
+		("<== SkY2FreeResources\n"));
+}
+
+/*****************************************************************************
+ *
+ * 	SkY2AllocateRxBuffers - Allocates the receive buffers for a port
+ *
+ * Description:
+ *	This function allocated all the RX buffers of the Yukon2. 
+ *
+ * Returns: N/A
+ */
+void SkY2AllocateRxBuffers (
+SK_AC    *pAC,   /* pointer to adapter control context */
+SK_IOC    IoC,	 /* I/O control context                */
+int       Port)	 /* port index of RX                   */
+{
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_INIT,
+		("==> SkY2AllocateRxBuffers (Port %c)\n", Port));
+
+	FillReceiveTableYukon2(pAC, IoC, Port);
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_INIT,
+		("<== SkY2AllocateRxBuffers\n"));
+}
+
+/*****************************************************************************
+ *
+ * 	SkY2FreeRxBuffers - Free's all allocates RX buffers of
+ *
+ * Description:
+ *	This function frees all RX buffers of the Yukon2 for a single port
+ *
+ * Returns: N/A
+ */
+void SkY2FreeRxBuffers (
+SK_AC    *pAC,   /* pointer to adapter control context */
+SK_IOC    IoC,	 /* I/O control context                */
+int       Port)	 /* port index of RX                   */
+{
+	SK_PACKET     *pSkPacket;
+	unsigned long  Flags;   /* for POP/PUSH macros */
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_MSG,
+		("==> SkY2FreeRxBuffers (Port %c)\n", Port));
+
+	if (pAC->RxPort[Port].ReceivePacketTable   != NULL) {
+		POP_FIRST_PKT_FROM_QUEUE(&pAC->RxPort[Port].RxQ_working, pSkPacket);
+		while (pSkPacket != NULL) {
+			if ((pSkPacket->pFrag) != NULL) {
+				pci_unmap_page(pAC->PciDev,
+				(dma_addr_t) pSkPacket->pFrag->pPhys,
+				pSkPacket->pFrag->FragLen - 2,
+				PCI_DMA_FROMDEVICE);
+
+				DEV_KFREE_SKB_ANY(pSkPacket->pMBuf);
+				pSkPacket->pMBuf        = NULL;
+				pSkPacket->pFrag->pPhys = (SK_U64) 0;
+				pSkPacket->pFrag->pVirt = NULL;
+			}
+			PUSH_PKT_AS_LAST_IN_QUEUE(&pAC->RxPort[Port].RxQ_waiting, pSkPacket);
+			POP_FIRST_PKT_FROM_QUEUE(&pAC->RxPort[Port].RxQ_working, pSkPacket);
+		}
+	}
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_MSG,
+		("<== SkY2FreeRxBuffers\n"));
+}
+
+/*****************************************************************************
+ *
+ * 	SkY2FreeTxBuffers - Free's any currently maintained Tx buffer
+ *
+ * Description:
+ *	This function frees the TX buffers of the Yukon2 for a single port
+ *	which might be in use by a transmit action
+ *
+ * Returns: N/A
+ */
+void SkY2FreeTxBuffers (
+SK_AC    *pAC,   /* pointer to adapter control context */
+SK_IOC    IoC,	 /* I/O control context                */
+int       Port)	 /* port index of TX                   */
+{
+	SK_PACKET      *pSkPacket;
+	SK_FRAG        *pSkFrag;
+	unsigned long   Flags;
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_MSG,
+		("==> SkY2FreeTxBuffers (Port %c)\n", Port));
+ 
+	if (pAC->TxPort[Port][0].TransmitPacketTable != NULL) {
+		POP_FIRST_PKT_FROM_QUEUE(&pAC->TxPort[Port][0].TxAQ_working, pSkPacket);
+		while (pSkPacket != NULL) {
+			if ((pSkFrag = pSkPacket->pFrag) != NULL) {
+				UnmapAndFreeTxPktBuffer(pAC, pSkPacket, Port);
+			}
+			PUSH_PKT_AS_LAST_IN_QUEUE(&pAC->TxPort[Port][0].TxAQ_waiting, pSkPacket);
+			POP_FIRST_PKT_FROM_QUEUE(&pAC->TxPort[Port][0].TxAQ_working, pSkPacket);
+		}
+#if USE_SYNC_TX_QUEUE
+		POP_FIRST_PKT_FROM_QUEUE(&pAC->TxPort[Port][0].TxSQ_working, pSkPacket);
+		while (pSkPacket != NULL) {
+			if ((pSkFrag = pSkPacket->pFrag) != NULL) {
+				UnmapAndFreeTxPktBuffer(pAC, pSkPacket, Port);
+			}
+			PUSH_PKT_AS_LAST_IN_QUEUE(&pAC->TxPort[Port][0].TxSQ_waiting, pSkPacket);
+			POP_FIRST_PKT_FROM_QUEUE(&pAC->TxPort[Port][0].TxSQ_working, pSkPacket);
+		}
+#endif
+	}
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_MSG,
+		("<== SkY2FreeTxBuffers\n"));
+}
+
+/*****************************************************************************
+ *
+ * 	SkY2Isr - handle a receive IRQ for all yukon2 cards
+ *
+ * Description:
+ *	This function is called when a receive IRQ is set. (only for yukon2)
+ *	HandleReceives does the deferred processing of all outstanding
+ *	interrupt operations.
+ *
+ * Returns:	N/A
+ */
+SkIsrRetVar SkY2Isr (
+int              irq,     /* the irq we have received (might be shared!) */
+void            *dev_id,  /* current device id                           */
+struct  pt_regs *ptregs)  /* not used by our driver                      */
+{
+	struct SK_NET_DEVICE  *dev  = (struct SK_NET_DEVICE *)dev_id;
+	DEV_NET               *pNet = (DEV_NET*) dev->priv;
+	SK_AC                 *pAC  = pNet->pAC;
+	SK_U32                 IntSrc;
+	unsigned long          Flags;
+#ifndef CONFIG_SK98LIN_NAPI
+	SK_BOOL                handledStatLE = SK_FALSE;
+#endif
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_INT_SRC,
+		("==> SkY2Isr\n"));
+
+	SK_IN32(pAC->IoBase, B0_Y2_SP_ISRC2, &IntSrc);
+
+	if (IntSrc == 0) {
+		SK_OUT32(pAC->IoBase, B0_Y2_SP_ICR, 2);
+		SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_INT_SRC,
+			("No Interrupt\n ==> SkY2Isr\n"));
+		return;
+
+	}
+
+#ifdef CONFIG_SK98LIN_NAPI
+	if (netif_rx_schedule_prep(dev)) {
+		pAC->GIni.GIValIrqMask &= ~(Y2_IS_STAT_BMU);
+		SK_OUT32(pAC->IoBase, B0_IMSK, pAC->GIni.GIValIrqMask);
+		__netif_rx_schedule(dev);
+	}
+#else
+	handledStatLE = HandleStatusLEs(pAC);
+#endif
+
+	/* 
+	** Check for Special Interrupts 
+	*/
+	if (IntSrc & ~Y2_IS_STAT_BMU) {
+		spin_lock_irqsave(&pAC->SlowPathLock, Flags);
+		SkGeSirqIsr(pAC, pAC->IoBase, IntSrc);
+		SkEventDispatcher(pAC, pAC->IoBase);
+		spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
+	}
+
+	/* Speed enhancement for a2 chipsets */
+	if (HW_FEATURE(pAC, HWF_WA_DEV_42)) {
+		spin_lock_irqsave(&pAC->SetPutIndexLock, Flags);
+		SkGeY2SetPutIndex(pAC, pAC->IoBase, Y2_PREF_Q_ADDR(Q_XA1,0), &pAC->TxPort[0][0].TxALET);
+		SkGeY2SetPutIndex(pAC, pAC->IoBase, Y2_PREF_Q_ADDR(Q_R1,0), &pAC->RxPort[0].RxLET);
+		spin_unlock_irqrestore(&pAC->SetPutIndexLock, Flags);
+	} 
+
+	/* 
+	** Reenable interrupts and signal end of ISR 
+	*/
+	SK_OUT32(pAC->IoBase, B0_Y2_SP_ICR, 2);
+			
+	/*
+	** Stop and restart TX timer in case a Status LE was handled
+	*/
+#ifndef CONFIG_SK98LIN_NAPI
+	if ((HW_FEATURE(pAC, HWF_WA_DEV_43_418)) && (handledStatLE)) {
+		SK_OUT8(pAC->IoBase, STAT_TX_TIMER_CTRL, TIM_STOP);
+		SK_OUT8(pAC->IoBase, STAT_TX_TIMER_CTRL, TIM_START);
+	}
+#endif
+
+	if (!(IS_Q_EMPTY(&(pAC->TxPort[0][TX_PRIO_LOW].TxAQ_waiting)))) {
+		GiveTxBufferToHw(pAC, pAC->IoBase, 0);
+	}
+	if (!(IS_Q_EMPTY(&(pAC->TxPort[1][TX_PRIO_LOW].TxAQ_waiting)))) {
+		GiveTxBufferToHw(pAC, pAC->IoBase, 1);
+	}
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_INT_SRC,
+		("<== SkY2Isr\n"));
+
+	return;
+}	/* SkY2Isr */
+
+/*****************************************************************************
+ *
+ *	SkY2Xmit - Linux frame transmit function for Yukon2
+ *
+ * Description:
+ *	The system calls this function to send frames onto the wire.
+ *	It puts the frame in the tx descriptor ring. If the ring is
+ *	full then, the 'tbusy' flag is set.
+ *
+ * Returns:
+ *	0, if everything is ok
+ *	!=0, on error
+ *
+ * WARNING: 
+ *	returning 1 in 'tbusy' case caused system crashes (double
+ *	allocated skb's) !!!
+ */
+int SkY2Xmit(
+struct sk_buff       *skb,  /* socket buffer to be sent */
+struct SK_NET_DEVICE *dev)  /* via which device?        */
+{
+	DEV_NET         *pNet    = (DEV_NET*) dev->priv;
+	SK_AC           *pAC     = pNet->pAC;
+	SK_U8            FragIdx = 0;
+	SK_PACKET       *pSkPacket;
+	SK_FRAG         *PrevFrag;
+	SK_FRAG         *CurrFrag;
+	SK_PKT_QUEUE    *pWorkQueue;  /* corresponding TX queue */
+	SK_PKT_QUEUE    *pWaitQueue; 
+	SK_PKT_QUEUE    *pFreeQueue; 
+	SK_LE_TABLE     *pLETab;      /* corresponding LETable  */ 
+	skb_frag_t      *sk_frag;
+	SK_U64           PhysAddr;
+	unsigned long    Flags;
+	unsigned int     Port;
+	int              CurrFragCtr;
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_TX_PROGRESS,
+		("==> SkY2Xmit\n"));
+
+	/*
+	** Get port and return if no free packet is available 
+	*/
+	Port = (pAC->RlmtNets == 2) ? pNet->PortNr : pAC->ActivePort;
+	if (IS_Q_EMPTY(&(pAC->TxPort[Port][TX_PRIO_LOW].TxQ_free))) {
+		return 1; /* zero bytes sent! */
+	}
+
+	/*
+	** Put any new packet to be sent in the waiting queue and 
+	** handle also any possible fragment of that packet.
+	*/
+	pWorkQueue = &(pAC->TxPort[Port][TX_PRIO_LOW].TxAQ_working);
+	pWaitQueue = &(pAC->TxPort[Port][TX_PRIO_LOW].TxAQ_waiting);
+	pFreeQueue = &(pAC->TxPort[Port][TX_PRIO_LOW].TxQ_free);
+	pLETab     = &(pAC->TxPort[Port][TX_PRIO_LOW].TxALET);
+
+	/*
+	** Normal send operations require only one fragment, because 
+	** only one sk_buff data area is passed. 
+	** In contradiction to this, scatter-gather (zerocopy) send
+	** operations might pass one or more additional fragments 
+	** where each fragment needs a separate fragment info packet.
+	*/
+	if (((skb_shinfo(skb)->nr_frags + 1) * MAX_FRAG_OVERHEAD) > 
+					NUM_FREE_LE_IN_TABLE(pLETab)) {
+		SK_DBG_MSG(pAC, SK_DBGMOD_DRV, 
+			SK_DBGCAT_DRV_TX_PROGRESS | SK_DBGCAT_DRV_ERROR,
+			("Not enough LE available for send\n"));
+		return 1; /* zero bytes sent! */
+	}
+	
+	if ((skb_shinfo(skb)->nr_frags + 1) > MAX_NUM_FRAGS) {
+		SK_DBG_MSG(pAC, SK_DBGMOD_DRV, 
+			SK_DBGCAT_DRV_TX_PROGRESS | SK_DBGCAT_DRV_ERROR,
+			("Not even one fragment available for send\n"));
+		return 1; /* zero bytes sent! */
+	}
+
+	/*
+	** Get first packet from free packet queue
+	*/
+	POP_FIRST_PKT_FROM_QUEUE(pFreeQueue, pSkPacket);
+	if(pSkPacket == NULL) {
+		SK_DBG_MSG(pAC, SK_DBGMOD_DRV, 
+			SK_DBGCAT_DRV_TX_PROGRESS | SK_DBGCAT_DRV_ERROR,
+			("Could not obtain free packet used for xmit\n"));
+		return 1; /* zero bytes sent! */
+	}
+
+	pSkPacket->pFrag = &(pSkPacket->FragArray[FragIdx]);
+
+	/* 
+	** map the sk_buff to be available for the adapter 
+	*/
+	PhysAddr = (SK_U64) pci_map_page(pAC->PciDev,
+			virt_to_page(skb->data),
+			((unsigned long) skb->data & ~PAGE_MASK),
+			skb_headlen(skb),
+			PCI_DMA_TODEVICE);
+	pSkPacket->pMBuf	  = skb;
+	pSkPacket->pFrag->pPhys   = PhysAddr;
+	pSkPacket->pFrag->FragLen = skb_headlen(skb);
+	pSkPacket->pFrag->pNext   = NULL; /* initial has no next default */
+	pSkPacket->NumFrags	  = skb_shinfo(skb)->nr_frags + 1;
+
+	PrevFrag = pSkPacket->pFrag;
+
+	/*
+	** Each scatter-gather fragment need to be mapped...
+	*/
+        for (	CurrFragCtr = 0; 
+		CurrFragCtr < skb_shinfo(skb)->nr_frags;
+		CurrFragCtr++) {
+		FragIdx++;
+		sk_frag = &skb_shinfo(skb)->frags[CurrFragCtr];
+		CurrFrag = &(pSkPacket->FragArray[FragIdx]);
+
+                /* 
+		** map the sk_buff to be available for the adapter 
+		*/
+		PhysAddr = (SK_U64) pci_map_page(pAC->PciDev,
+				sk_frag->page,
+		 		sk_frag->page_offset,
+		 		sk_frag->size,
+		 		PCI_DMA_TODEVICE);
+
+		CurrFrag->pPhys   = PhysAddr;
+ 		CurrFrag->FragLen = sk_frag->size;
+ 		CurrFrag->pNext   = NULL;
+
+		/*
+		** Add the new fragment to the list of fragments
+		*/
+		PrevFrag->pNext = CurrFrag;
+		PrevFrag = CurrFrag;
+	}
+
+	/* 
+	** Add packet to waiting packets queue 
+	*/
+	PUSH_PKT_AS_LAST_IN_QUEUE(pWaitQueue, pSkPacket);
+	GiveTxBufferToHw(pAC, pAC->IoBase, Port);
+	dev->trans_start = jiffies;
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_TX_PROGRESS,
+		("<== SkY2Xmit(return 0)\n"));
+	return (0);
+}	/* SkY2Xmit */
+
+#ifdef CONFIG_SK98LIN_NAPI
+/*****************************************************************************
+ *
+ *	SkY2Poll - NAPI Rx polling callback for Yukon2 chipsets
+ *
+ * Description:
+ *	Called by the Linux system in case NAPI polling is activated
+ *
+ * Returns
+ *	The number of work data still to be handled
+ */
+int SkY2Poll(
+struct net_device *dev,     /* device that needs to be polled */
+int               *budget)  /* how many budget do we have?    */
+{
+	SK_AC	*pAC           = ((DEV_NET*)(dev->priv))->pAC;
+	int	 WorkToDo      = min(*budget, dev->quota);
+	int	 WorkDone      = 0;
+	SK_BOOL  handledStatLE = SK_FALSE;
+
+	handledStatLE = HandleStatusLEs(pAC, &WorkDone, WorkToDo);
+
+	*budget -= WorkDone;
+	dev->quota -= WorkDone;
+
+	if(WorkDone < WorkToDo) {
+		netif_rx_complete(dev);
+		pAC->GIni.GIValIrqMask |= (Y2_IS_STAT_BMU);
+		SK_OUT32(pAC->IoBase, B0_IMSK, pAC->GIni.GIValIrqMask);
+		if ((HW_FEATURE(pAC, HWF_WA_DEV_43_418)) && (handledStatLE)) {
+			SK_OUT8(pAC->IoBase, STAT_TX_TIMER_CTRL, TIM_STOP);
+			SK_OUT8(pAC->IoBase, STAT_TX_TIMER_CTRL, TIM_START);
+		}
+	}
+	return (WorkDone >= WorkToDo);
+}	/* SkY2Poll */
+#endif
+
+/******************************************************************************
+ *
+ *	SkY2PortStop - stop a port on Yukon2
+ *
+ * Description:
+ *	This function stops a port of the Yukon2 chip. This stop 
+ *	stop needs to be performed in a specific order:
+ * 
+ *	a) Stop the Prefetch unit
+ *	b) Stop the Port (MAC, PHY etc.)
+ *
+ * Returns: N/A
+ */
+void SkY2PortStop(
+SK_AC   *pAC,      /* adapter control context                             */
+SK_IOC   IoC,      /* I/O control context (address of adapter registers)  */
+int      Port,     /* port to stop (MAC_1 + n)                            */
+int      Dir,      /* StopDirection (SK_STOP_RX, SK_STOP_TX, SK_STOP_ALL) */
+int      RstMode)  /* Reset Mode (SK_SOFT_RST, SK_HARD_RST)               */
+{
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_MSG,
+		("==> SkY2PortStop (Port %c)\n", 'A' + Port));
+
+	/*
+	** Stop the HW
+	*/
+	SkGeStopPort(pAC, IoC, Port, Dir, RstMode);
+
+	/*
+	** Move any TX packet from work queues into the free queue again
+	*/
+	SkY2FreeTxBuffers(pAC, pAC->IoBase, Port);
+
+	/*
+	** Move any RX packet from work queue into the waiting queue
+	*/
+	SkY2FreeRxBuffers(pAC, pAC->IoBase, Port);
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_MSG,
+		("<== SkY2PortStop()\n"));
+}
+
+/******************************************************************************
+ *
+ *	SkY2PortStart - start a port on Yukon2
+ *
+ * Description:
+ *	This function starts a port of the Yukon2 chip. This start 
+ *	action needs to be performed in a specific order:
+ * 
+ *	a) Initialize the LET indices (PUT/GET to 0)
+ *	b) Initialize the LET in HW (enables also prefetch unit)
+ *	c) Move all RX buffers from waiting queue to working queue
+ *	   which involves also setting up of RX list elements
+ *	d) Initialize the FIFO settings of Yukon2 (Watermark etc.)
+ *	e) Initialize the Port (MAC, PHY etc.)
+ *	f) Initialize the MC addresses
+ *
+ * Returns:	N/A
+ */
+void SkY2PortStart(
+SK_AC   *pAC,   /* adapter control context                            */
+SK_IOC   IoC,   /* I/O control context (address of adapter registers) */
+int      Port)  /* port to start                                      */
+{
+	SK_HWLE  *pLE;
+	SK_U32    DWord;
+	SK_U32    PrefetchReg; /* register for Put index */
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_MSG,
+		("==> SkY2PortStart (Port %c)\n", 'A' + Port));
+
+	/*
+	** Initialize the LET indices
+	*/
+	pAC->RxPort[Port].RxLET.Done                = 0; 
+	pAC->RxPort[Port].RxLET.Put                 = 0;
+	pAC->RxPort[Port].RxLET.HwPut               = 0;
+	pAC->TxPort[Port][TX_PRIO_LOW].TxALET.Done  = 0;    
+	pAC->TxPort[Port][TX_PRIO_LOW].TxALET.Put   = 0;
+	pAC->TxPort[Port][TX_PRIO_LOW].TxALET.HwPut = 0;
+	if (HW_SYNC_TX_SUPPORTED(pAC)) {
+		pAC->TxPort[Port][TX_PRIO_LOW].TxSLET.Done  = 0;    
+		pAC->TxPort[Port][TX_PRIO_LOW].TxSLET.Put   = 0;
+		pAC->TxPort[Port][TX_PRIO_LOW].TxSLET.HwPut = 0;
+	}
+	
+	if (HW_FEATURE(pAC, HWF_WA_DEV_420)) {
+		/*
+		** It might be that we have to limit the RX buffers 
+		** effectively passed to HW. Initialize the start
+		** value in that case...
+		*/
+		NbrRxBuffersInHW = 0;
+	}
+
+	/*
+	** TODO on dual net adapters we need to check if
+	** StatusLETable need to be set...
+	** 
+	** pAC->StatusLETable.Done  = 0;
+	** pAC->StatusLETable.Put   = 0;
+	** pAC->StatusLETable.HwPut = 0;
+	** SkGeY2InitPrefetchUnit(pAC, pAC->IoBase, Q_ST, &pAC->StatusLETable);
+	*/
+
+	/*
+	** Initialize the LET in HW (enables also prefetch unit)
+	*/
+	SkGeY2InitPrefetchUnit(pAC, IoC,(Port == 0) ? Q_R1 : Q_R2,
+			&pAC->RxPort[Port].RxLET);
+	SkGeY2InitPrefetchUnit( pAC, IoC,(Port == 0) ? Q_XA1 : Q_XA2, 
+			&pAC->TxPort[Port][TX_PRIO_LOW].TxALET);
+	if (HW_SYNC_TX_SUPPORTED(pAC)) {
+		SkGeY2InitPrefetchUnit( pAC, IoC, (Port == 0) ? Q_XS1 : Q_XS2,
+				&pAC->TxPort[Port][TX_PRIO_HIGH].TxSLET);
+	}
+
+	/*
+	** Initialize the Port (MAC, PHY etc.)
+	*/
+	if (SkGeInitPort(pAC, IoC, Port)) {
+		if (Port == 0) {
+			printk("%s: SkGeInitPort A failed.\n",pAC->dev[0]->name);
+		} else {
+			printk("%s: SkGeInitPort B failed.\n",pAC->dev[1]->name);
+		}
+	}
+	
+	if (IS_GMAC(pAC)) {
+		/* disable Rx GMAC FIFO Flush Mode */
+		SK_OUT8(IoC, MR_ADDR(Port, RX_GMF_CTRL_T), (SK_U8) GMF_RX_F_FL_OFF);
+	}
+
+	/*
+	** Initialize the MC addresses
+	*/
+	SkAddrMcUpdate(pAC,IoC, Port);
+
+	SkMacRxTxEnable(pAC, IoC,Port);
+				
+	if (pAC->RxPort[Port].UseRxCsum) {
+		SkGeRxCsum(pAC, IoC, Port, SK_TRUE);
+	
+		GET_RX_LE(pLE, &pAC->RxPort[Port].RxLET);
+		RXLE_SET_STACS1(pLE, pAC->CsOfs1);
+		RXLE_SET_STACS2(pLE, pAC->CsOfs2);
+		RXLE_SET_CTRL(pLE, 0);
+
+		RXLE_SET_OPC(pLE, OP_TCPSTART | HW_OWNER);
+		FLUSH_OPC(pLE);
+		if (Port == 0) {
+			PrefetchReg=Y2_PREF_Q_ADDR(Q_R1,PREF_UNIT_PUT_IDX_REG);
+		} else {
+			PrefetchReg=Y2_PREF_Q_ADDR(Q_R2,PREF_UNIT_PUT_IDX_REG);
+		}
+		DWord = GET_PUT_IDX(&pAC->RxPort[Port].RxLET);
+		SK_OUT32(IoC, PrefetchReg, DWord);
+		UPDATE_HWPUT_IDX(&pAC->RxPort[Port].RxLET);
+	}
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_MSG,
+		("<== SkY2PortStart()\n"));
+}
+
+/******************************************************************************
+ *
+ * Local Functions
+ *
+ *****************************************************************************/
+
+/*****************************************************************************
+ *
+ *	InitPacketQueues - initialize SW settings of packet queues
+ *
+ * Description:
+ *	This function will initialize the packet queues for a port.
+ *
+ * Returns: N/A
+ */
+static void InitPacketQueues(
+SK_AC  *pAC,   /* pointer to adapter control context */
+int     Port)  /* index of port to be initialized    */
+{
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_INIT,
+		("==> InitPacketQueues(Port %c)\n", 'A' + Port));
+	
+	pAC->RxPort[Port].RxQ_working.pHead = NULL;
+	pAC->RxPort[Port].RxQ_working.pTail = NULL;
+	spin_lock_init(&pAC->RxPort[Port].RxQ_working.QueueLock);
+	
+	pAC->RxPort[Port].RxQ_waiting.pHead = NULL;
+	pAC->RxPort[Port].RxQ_waiting.pTail = NULL;
+	spin_lock_init(&pAC->RxPort[Port].RxQ_waiting.QueueLock);
+	
+	pAC->TxPort[Port][TX_PRIO_LOW].TxQ_free.pHead = NULL;
+	pAC->TxPort[Port][TX_PRIO_LOW].TxQ_free.pTail = NULL;
+	spin_lock_init(&pAC->TxPort[Port][TX_PRIO_LOW].TxQ_free.QueueLock);
+
+	pAC->TxPort[Port][TX_PRIO_LOW].TxAQ_working.pHead = NULL;
+	pAC->TxPort[Port][TX_PRIO_LOW].TxAQ_working.pTail = NULL;
+	spin_lock_init(&pAC->TxPort[Port][TX_PRIO_LOW].TxAQ_working.QueueLock);
+	
+	pAC->TxPort[Port][TX_PRIO_LOW].TxAQ_waiting.pHead = NULL;
+	pAC->TxPort[Port][TX_PRIO_LOW].TxAQ_waiting.pTail = NULL;
+	spin_lock_init(&pAC->TxPort[Port][TX_PRIO_LOW].TxAQ_waiting.QueueLock);
+	
+#if USE_SYNC_TX_QUEUE
+	pAC->TxPort[Port][TX_PRIO_LOW].TxSQ_working.pHead = NULL;
+	pAC->TxPort[Port][TX_PRIO_LOW].TxSQ_working.pTail = NULL;
+	spin_lock_init(&pAC->TxPort[Port][TX_PRIO_LOW].TxSQ_working.QueueLock);
+
+	pAC->TxPort[Port][TX_PRIO_LOW].TxSQ_waiting.pHead = NULL;
+	pAC->TxPort[Port][TX_PRIO_LOW].TxSQ_waiting.pTail = NULL;
+	spin_lock_init(&pAC->TxPort[Port][TX_PRIO_LOW].TxSQ_waiting.QueueLock);
+#endif
+	
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_INIT,
+		("<== InitPacketQueues(Port %c)\n", 'A' + Port));
+}	/* InitPacketQueues */
+
+/*****************************************************************************
+ *
+ *	GiveTxBufferToHw - commits a previously allocated DMA area to HW
+ *
+ * Description:
+ *	This functions gives transmit buffers to HW. If no list elements
+ *	are available the buffers will be queued. 
+ *
+ * Notes:
+ *       This function can run only once in a system at one time.
+ *
+ * Returns: N/A
+ */
+static void GiveTxBufferToHw(
+SK_AC   *pAC,   /* pointer to adapter control context         */
+SK_IOC   IoC,   /* I/O control context (address of registers) */
+int      Port)  /* port index for which the buffer is used    */
+{
+	SK_HWLE         *pLE;
+	SK_PACKET       *pSkPacket;
+	SK_FRAG         *pFrag;
+	SK_PKT_QUEUE    *pWorkQueue;   /* corresponding TX queue */
+	SK_PKT_QUEUE    *pWaitQueue; 
+	SK_LE_TABLE     *pLETab;       /* corresponding LETable  */ 
+	SK_BOOL          SetOpcodePacketFlag;
+	SK_U32           HighAddress;
+	SK_U32           LowAddress;
+	SK_U16           TcpSumStart; 
+	SK_U16           TcpSumWrite;
+	SK_U8            OpCode;
+	SK_U8            Ctrl;
+	unsigned long    Flags;
+	int              Protocol;
+#ifdef NETIF_F_TSO
+	SK_U16           Mss;
+	int              TcpOptLen;
+	int              IpTcpLen;
+#endif
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_TX_PROGRESS,
+		("==> GiveTxBufferToHw\n"));
+
+	if (IS_Q_EMPTY(&(pAC->TxPort[Port][TX_PRIO_LOW].TxAQ_waiting))) {
+		return;
+	}
+
+	/*
+	** Initialize queue settings
+	*/
+	pWorkQueue = &(pAC->TxPort[Port][TX_PRIO_LOW].TxAQ_working);
+	pWaitQueue = &(pAC->TxPort[Port][TX_PRIO_LOW].TxAQ_waiting);
+	pLETab     = &(pAC->TxPort[Port][TX_PRIO_LOW].TxALET);
+
+	POP_FIRST_PKT_FROM_QUEUE(pWaitQueue, pSkPacket);
+	while (pSkPacket != NULL) {
+		SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_TX_PROGRESS,
+			("\tWe have a packet to send %p\n", pSkPacket));
+
+		/* 
+		** the first frag of a packet gets opcode OP_PACKET 
+		*/
+		SetOpcodePacketFlag	= SK_TRUE;
+		pFrag			= pSkPacket->pFrag;
+
+		/* 
+		** fill list elements with data from fragments 
+		*/
+		while (pFrag != NULL) {
+			SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_TX_PROGRESS,
+				("\tGet LE\n"));
+#ifdef NETIF_F_TSO
+			Mss = skb_shinfo(pSkPacket->pMBuf)->tso_size;
+			if (Mss) {
+				TcpOptLen = ((pSkPacket->pMBuf->h.th->doff - 5) * 4);
+				IpTcpLen  = ((pSkPacket->pMBuf->nh.iph->ihl * 4) + 
+						sizeof(struct tcphdr));
+				Mss += (TcpOptLen + IpTcpLen + C_LEN_ETHERMAC_HEADER);
+			}
+			if (pLETab->Bmu.RxTx.MssValue != Mss) {
+				pLETab->Bmu.RxTx.MssValue = Mss;
+				/* Take a new LE for TSO from the table */
+				GET_TX_LE(pLE, pLETab);
+
+#if 0
+				if(pSkPacket->VlanId) {
+					TXLE_SET_OPC(pLE, OP_LRGLENVLAN | HW_OWNER);
+					TXLE_SET_VLAN(pLE, pSkPacket->VlanId);
+					pSkPacket->VlanId = 0;
+					Ctrl |= INS_VLAN;
+				} else {
+#endif
+					TXLE_SET_OPC(pLE, OP_LRGLEN | HW_OWNER);
+#if 0
+				}
+#endif
+				/* set maximum segment size for new packet */
+				TXLE_SET_LSLEN(pLE, pLETab->Bmu.RxTx.MssValue);
+				FLUSH_OPC(pLE) ;
+			}
+#endif
+			GET_TX_LE(pLE, pLETab);
+			Ctrl	= 0;
+
+			SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_TX_PROGRESS,
+				("\tGot empty LE %p idx %d\n", pLE, GET_PUT_IDX(pLETab)));
+
+			SK_DBG_DUMP_TX_LE(pLE);
+
+			LowAddress  = (SK_U32) (pFrag->pPhys & 0xffffffff);
+			HighAddress = (SK_U32) (pFrag->pPhys >> 32);
+			if (HighAddress != pLETab->BufHighAddr) {
+				/* set opcode high part of the address in one LE */
+				OpCode = OP_ADDR64 | HW_OWNER;
+	
+				/* Set now the 32 high bits of the address */
+				TXLE_SET_ADDR( pLE, HighAddress);
+	
+				/* Set the opcode into the LE */
+				TXLE_SET_OPC(pLE, OpCode);
+	
+				/* Flush the LE to memory */
+				FLUSH_OPC(pLE);
+	
+				/* remember the HighAddress we gave to the Hardware */
+				pLETab->BufHighAddr = HighAddress;
+				
+				/* get a new LE because we filled one with high address */
+				GET_TX_LE(pLE, pLETab);
+			}
+	
+			/*
+			** TCP checksum offload
+			*/
+			if ((pSkPacket->pMBuf->ip_summed == CHECKSUM_HW) && 
+			    (SetOpcodePacketFlag         == SK_TRUE)) {
+				Protocol = ((SK_U8)pSkPacket->pMBuf->data[C_OFFSET_IPPROTO] & 0xff);
+				/* if (Protocol & C_PROTO_ID_IP) { Ctrl = 0; } */ 
+				if (Protocol & C_PROTO_ID_TCP) {
+					Ctrl = CALSUM | WR_SUM | INIT_SUM | LOCK_SUM;
+					/* TCP Checksum Calculation Start Position */
+					TcpSumStart = C_LEN_ETHERMAC_HEADER + IP_HDR_LEN;
+					/* TCP Checksum Write Position */
+					TcpSumWrite = TcpSumStart + TCP_CSUM_OFFS;
+				} else {
+					Ctrl = UDPTCP | CALSUM | WR_SUM | INIT_SUM | LOCK_SUM;
+					/* TCP Checksum Calculation Start Position */
+					TcpSumStart = ETHER_MAC_HDR_LEN + IP_HDR_LEN;
+					/* UDP Checksum Write Position */
+					TcpSumWrite = TcpSumStart + UDP_CSUM_OFFS;
+				}
+	
+				if ((Ctrl) && (pLETab->Bmu.RxTx.TcpWp != TcpSumWrite)) {
+					/* Update the last value of the write position */
+					pLETab->Bmu.RxTx.TcpWp = TcpSumWrite;
+	
+					/* Set the Lock field for this LE: */
+					/* Checksum calculation for one packet only */
+					TXLE_SET_LCKCS(pLE, 1);
+	
+					/* Set the start position for checksum. */
+					TXLE_SET_STACS(pLE, TcpSumStart);
+	
+					/* Set the position where the checksum will be writen */
+					TXLE_SET_WRICS(pLE, TcpSumWrite);
+	
+					/* Set the initial value for checksum */
+					/* PseudoHeader CS passed from Linux -> 0! */
+					TXLE_SET_INICS(pLE, 0);
+	
+					/* Set the opcode for tcp checksum */
+					TXLE_SET_OPC(pLE, OP_TCPLISW | HW_OWNER);
+	
+					/* Flush the LE to memory */
+					FLUSH_OPC(pLE);
+	
+					/* get a new LE because we filled one with data for checksum */
+					GET_TX_LE(pLE, pLETab);
+				}
+			} /* end TCP offload handling */
+	
+			TXLE_SET_ADDR(pLE, LowAddress);
+			TXLE_SET_LEN(pLE, pFrag->FragLen);
+	
+			if (SetOpcodePacketFlag){
+#ifdef NETIF_F_TSO
+				if (Mss) {
+					OpCode = OP_LARGESEND | HW_OWNER;
+				} else {
+#endif
+					OpCode = OP_PACKET| HW_OWNER;
+#ifdef NETIF_F_TSO
+				}
+#endif
+				SetOpcodePacketFlag = SK_FALSE;
+			} else {
+				/* Follow packet in a sequence has always OP_BUFFER */
+				OpCode = OP_BUFFER | HW_OWNER;
+			}
+	
+			pFrag = pFrag->pNext;
+			if (pFrag == NULL) {
+				/* mark last fragment */
+				Ctrl |= EOP;
+			}
+			TXLE_SET_CTRL(pLE, Ctrl);
+			TXLE_SET_OPC(pLE, OpCode);
+			FLUSH_OPC(pLE);
+			SK_DBG_DUMP_TX_LE(pLE);
+		}
+	
+		/* 
+		** Remember next LE for tx complete 
+		*/
+		pSkPacket->NextLE = GET_PUT_IDX(pLETab);
+		SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_TX_PROGRESS,
+			("\tNext LE for pkt %p is %d\n", pSkPacket, pSkPacket->NextLE));
+
+		/* 
+		** Add packet to working packets queue 
+		*/
+		PUSH_PKT_AS_LAST_IN_QUEUE(pWorkQueue, pSkPacket);
+
+		/* 
+		** give transmit start command
+		*/
+		if (HW_FEATURE(pAC, HWF_WA_DEV_42)) {
+			spin_lock(&pAC->SetPutIndexLock);
+			SkGeY2SetPutIndex(pAC, pAC->IoBase, Y2_PREF_Q_ADDR(Q_XA1,0), &pAC->TxPort[0][0].TxALET);
+			spin_unlock(&pAC->SetPutIndexLock);
+		} else {
+			/* write put index */
+			if (Port == 0) { 
+				SK_OUT32(pAC->IoBase, 
+					Y2_PREF_Q_ADDR(Q_XA1,PREF_UNIT_PUT_IDX_REG), 
+					GET_PUT_IDX(&pAC->TxPort[0][0].TxALET)); 
+				UPDATE_HWPUT_IDX(&pAC->TxPort[0][0].TxALET);
+			} else {
+				SK_OUT32(pAC->IoBase, 
+					Y2_PREF_Q_ADDR(Q_XA2, PREF_UNIT_PUT_IDX_REG), 
+					GET_PUT_IDX(&pAC->TxPort[1][0].TxALET)); 
+				UPDATE_HWPUT_IDX(&pAC->TxPort[1][0].TxALET);
+			}
+		}
+	
+		if (IS_Q_EMPTY(&(pAC->TxPort[Port][TX_PRIO_LOW].TxAQ_waiting))) {
+			break; /* get out of while */
+		}
+		POP_FIRST_PKT_FROM_QUEUE(pWaitQueue, pSkPacket);
+	} /* while (pSkPacket != NULL) */
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_TX_PROGRESS,
+		("<== GiveTxBufferToHw\n"));
+	return;
+}	/* GiveTxBufferToHw */
+
+/***********************************************************************
+ *
+ *	GiveRxBufferToHw - commits a previously allocated DMA area to HW
+ *
+ * Description:
+ *	This functions gives receive buffers to HW. If no list elements
+ *	are available the buffers will be queued. 
+ *
+ * Notes:
+ *       This function can run only once in a system at one time.
+ *
+ * Returns: N/A
+ */
+static void GiveRxBufferToHw(
+SK_AC      *pAC,      /* pointer to adapter control context         */
+SK_IOC      IoC,      /* I/O control context (address of registers) */
+int         Port,     /* port index for which the buffer is used    */
+SK_PACKET  *pPacket)  /* receive buffer(s)                          */
+{
+	SK_HWLE         *pLE;
+	SK_LE_TABLE     *pLETab;
+	SK_BOOL         Done = SK_FALSE;  /* at least on LE changed? */
+	SK_U32          LowAddress;
+	SK_U32          HighAddress;
+	SK_U32          PrefetchReg;      /* register for Put index  */
+	SK_U8           OpCode;
+	SK_U8           Ctrl;
+	unsigned        NumFree;
+	unsigned        Required;
+	unsigned long   Flags;
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_RX_PROGRESS,
+	("==> GiveRxBufferToHw(Port %c, Packet %p)\n", 'A' + Port, pPacket));
+
+	pLETab	= &pAC->RxPort[Port].RxLET;
+
+	if (Port == 0) {
+		PrefetchReg = Y2_PREF_Q_ADDR(Q_R1, PREF_UNIT_PUT_IDX_REG);
+	} else {
+		PrefetchReg = Y2_PREF_Q_ADDR(Q_R2, PREF_UNIT_PUT_IDX_REG);
+	} 
+
+	if (pPacket != NULL) {
+		/*
+		** For the time being, we have only one packet passed
+		** to this function which might be changed in future!
+		*/
+		PUSH_PKT_AS_LAST_IN_QUEUE(&pAC->RxPort[Port].RxQ_waiting, pPacket);
+	}
+
+	/* 
+	** now pPacket contains the very first waiting packet
+	*/
+	POP_FIRST_PKT_FROM_QUEUE(&pAC->RxPort[Port].RxQ_waiting, pPacket);
+	while (pPacket != NULL) {
+		if (HW_FEATURE(pAC, HWF_WA_DEV_420)) {
+			if (NbrRxBuffersInHW >= MAX_NBR_RX_BUFFERS_IN_HW) {
+				PUSH_PKT_AS_FIRST_IN_QUEUE(&pAC->RxPort[Port].RxQ_waiting, pPacket);
+				SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_RX_PROGRESS,
+					("<== GiveRxBufferToHw()\n"));
+				return;
+			} 
+			NbrRxBuffersInHW++;
+		}
+
+		SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_RX_PROGRESS,
+			("Try to add packet %p\n", pPacket));
+
+		/* 
+		** Check whether we have enough listelements:
+		**
+		** we have to take into account that each fragment 
+		** may need an additional list element for the high 
+		** part of the address here I simplified it by 
+		** using MAX_FRAG_OVERHEAD maybe it's worth to split 
+		** this constant for Rx and Tx or to calculate the
+		** real number of needed LE's
+		*/
+		SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_RX_PROGRESS,
+			("\tNum %d Put %d Done %d Free %d %d\n",
+			pLETab->Num, pLETab->Put, pLETab->Done,
+			NUM_FREE_LE_IN_TABLE(pLETab),
+			(NUM_FREE_LE_IN_TABLE(pLETab))));
+
+		Required = pPacket->NumFrags + MAX_FRAG_OVERHEAD;
+		NumFree = NUM_FREE_LE_IN_TABLE(pLETab);
+		if (NumFree) {
+			NumFree--;
+		}
+
+		if (Required > NumFree ) {
+			SK_DBG_MSG(pAC, SK_DBGMOD_DRV, 
+				SK_DBGCAT_DRV_RX_PROGRESS | SK_DBGCAT_DRV_ERROR,
+				("\tOut of LEs have %d need %d\n",
+				NumFree, Required));
+
+			SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_RX_PROGRESS,
+				("\tWaitQueue starts with packet %p\n", pPacket));
+			PUSH_PKT_AS_FIRST_IN_QUEUE(&pAC->RxPort[Port].RxQ_waiting, pPacket);
+			if (Done) {
+				/*
+				** write Put index to BMU or Polling Unit and make the LE's
+				** available for the hardware
+				*/
+				SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_RX_PROGRESS,
+					("\tWrite new Put Idx\n"));
+
+				SK_OUT32(IoC, PrefetchReg, GET_PUT_IDX(pLETab));
+				UPDATE_HWPUT_IDX(pLETab);
+			}
+			SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_RX_PROGRESS,
+				("<== GiveRxBufferToHw()\n"));
+			return;
+		} else {
+			if (!AllocAndMapRxBuffer(pAC, pPacket, Port)) {
+				/*
+				** Failure while allocating sk_buff might
+				** be due to temporary short of resources
+				** Maybe next time buffers are available.
+				** Until this, the packet remains in the 
+				** RX waiting queue...
+				*/
+				SK_DBG_MSG(pAC, SK_DBGMOD_DRV, 
+					SK_DBGCAT_DRV_RX_PROGRESS | SK_DBGCAT_DRV_ERROR,
+					("Failed to allocate Rx buffer\n"));
+
+				SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_RX_PROGRESS,
+					("WaitQueue starts with packet %p\n", pPacket));
+				PUSH_PKT_AS_FIRST_IN_QUEUE(&pAC->RxPort[Port].RxQ_waiting, pPacket);
+				if (Done) {
+					/*
+					** write Put index to BMU or Polling 
+					** Unit and make the LE's
+					** available for the hardware
+					*/
+					SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_RX_PROGRESS,
+						("\tWrite new Put Idx\n"));
+	
+					SK_OUT32(IoC, PrefetchReg, GET_PUT_IDX(pLETab));
+					UPDATE_HWPUT_IDX(pLETab);
+				}
+				SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_RX_PROGRESS,
+					("<== GiveRxBufferToHw()\n"));
+				return;
+			}
+		}
+		Done = SK_TRUE;
+
+		/*
+		** :;:; TODO
+		** here we have to check for the 64 bit part of the address first
+		** and use a ADDR64-LE in case of change
+		**
+		** so this is simplified model without csum offload and with
+		** 32 bit phys addresses
+		*/
+		OpCode = OP_PACKET | HW_OWNER;
+		Ctrl = 0;
+
+		/*
+		** Begin fragment processing: On the receive side we always have 
+		** one fragment belonging to one packet.
+		*/
+		GET_RX_LE(pLE, pLETab);
+
+		SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_RX_PROGRESS,
+			("=== LE empty\n"));
+
+		SK_DBG_DUMP_RX_LE(pLE);
+
+		/* 
+		** Fill data into listelement 
+		*/
+		LowAddress = (SK_U32) (pPacket->pFrag->pPhys & 0xffffffff);
+		HighAddress = (SK_U32) (pPacket->pFrag->pPhys >> 32);
+
+		RXLE_SET_ADDR(pLE, LowAddress);
+		RXLE_SET_LEN(pLE, pPacket->pFrag->FragLen);
+		RXLE_SET_CTRL(pLE, Ctrl);
+		RXLE_SET_OPC(pLE, OpCode);
+		FLUSH_OPC(pLE);
+
+		SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_RX_PROGRESS,
+			("=== LE filled\n"));
+
+		SK_DBG_DUMP_RX_LE(pLE);
+
+		/* 
+		** Change OpCode for the following fragments 
+		** of a receive buffer. End of fragment processing.
+		*/
+		OpCode = OP_BUFFER | HW_OWNER;
+
+		/* 
+		** Remember next LE for rx complete 
+		*/
+		pPacket->NextLE = GET_PUT_IDX(pLETab);
+
+		SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_RX_PROGRESS,
+			("\tPackets Next LE is %d\n", pPacket->NextLE));
+
+		/* 
+		** Add packet to working receive buffer queue and get
+		** any next packet out of the waiting queue
+		*/
+		PUSH_PKT_AS_LAST_IN_QUEUE(&pAC->RxPort[Port].RxQ_working, pPacket);
+		if (IS_Q_EMPTY(&(pAC->RxPort[Port].RxQ_waiting))) {
+			break; /* get out of while processing */
+		}
+		POP_FIRST_PKT_FROM_QUEUE(&pAC->RxPort[Port].RxQ_waiting, pPacket);
+	}
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_RX_PROGRESS,
+		("\tWaitQueue is empty\n"));
+
+	if (Done) {
+		/*
+		** write Put index to BMU or Polling Unit and make the LE's
+		** available for the hardware
+		*/
+		SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_RX_PROGRESS,
+			("\tWrite new Put Idx\n"));
+
+		/* Speed enhancement for a2 chipsets */
+		if (HW_FEATURE(pAC, HWF_WA_DEV_42)) {
+			spin_lock_irqsave(&pAC->SetPutIndexLock, Flags);
+			SkGeY2SetPutIndex(pAC, pAC->IoBase, Y2_PREF_Q_ADDR(Q_R1,0), pLETab);
+			spin_unlock_irqrestore(&pAC->SetPutIndexLock, Flags);
+		} else {
+			/* write put index */
+			if (Port == 0) { 
+				SK_OUT32(IoC, 
+					Y2_PREF_Q_ADDR(Q_R1, PREF_UNIT_PUT_IDX_REG), 
+					GET_PUT_IDX(pLETab)); 
+			} else {
+				SK_OUT32(IoC, 
+					Y2_PREF_Q_ADDR(Q_R2, PREF_UNIT_PUT_IDX_REG), 
+					GET_PUT_IDX(pLETab)); 
+			}
+
+			/* Update put index */
+			UPDATE_HWPUT_IDX(pLETab);
+		}
+	}
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_RX_PROGRESS,
+		("<== GiveRxBufferToHw()\n"));
+}       /* GiveRxBufferToHw */
+
+/***********************************************************************
+ *
+ *	FillReceiveTableYukon2 - map any waiting RX buffers to HW
+ *
+ * Description:
+ *	If the list element table contains more empty elements than 
+ *	specified this function tries to refill them.
+ *
+ * Notes:
+ *       This function can run only once per port in a system at one time.
+ *
+ * Returns: N/A
+ */
+static void FillReceiveTableYukon2(
+SK_AC   *pAC,   /* pointer to adapter control context */
+SK_IOC   IoC,   /* I/O control context                */
+int      Port)  /* port index of RX                   */
+{
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_RX_PROGRESS,
+		("==> FillReceiveTableYukon2 (Port %c)\n", 'A' + Port));
+
+	if (NUM_FREE_LE_IN_TABLE(&pAC->RxPort[Port].RxLET) >
+		pAC->MaxUnusedRxLeWorking) {
+
+		/* 
+		** Give alle waiting receive buffers down 
+		** The queue holds all RX packets that
+		** need a fresh allocation of the sk_buff.
+		*/
+		if (pAC->RxPort[Port].RxQ_waiting.pHead != NULL) {
+			SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_RX_PROGRESS,
+			("Waiting queue is not empty -> give it to HW"));
+			GiveRxBufferToHw(pAC, IoC, Port, NULL);
+		}
+	}
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_RX_PROGRESS,
+		("<== FillReceiveTableYukon2 ()\n"));
+}	/* FillReceiveTableYukon2 */
+
+/******************************************************************************
+ *
+ *
+ *	HandleReceives - will pass any ready RX packet to kernel
+ *
+ * Description:
+ *	This functions handles a received packet. It checks wether it is
+ *	valid, updates the receive list element table and gives the receive
+ *	buffer to Linux
+ *
+ * Notes:
+ *	This function can run only once per port at one time in the system.
+ *
+ * Returns: N/A
+ */
+static SK_BOOL HandleReceives(
+SK_AC  *pAC,          /* adapter control context                     */
+int     Port,         /* port on which a packet has been received    */
+SK_U16  Len,          /* number of bytes which was actually received */
+SK_U32  FrameStatus,  /* MAC frame status word                       */
+SK_U16  Tcp1,         /* first hw checksum                           */
+SK_U16  Tcp2,         /* second hw checksum                          */
+SK_U32  Tist,         /* timestamp                                   */
+SK_U16  Vlan)         /* Vlan Id                                     */
+{
+
+	SK_PACKET       *pSkPacket;
+	SK_LE_TABLE     *pLETab;
+	SK_MBUF         *pRlmtMbuf;  /* buffer for giving RLMT frame */
+	struct sk_buff  *pMsg;       /* ptr to message holding frame */
+
+	SK_BOOL         SlowPathLock = SK_TRUE;
+	SK_BOOL         IsGoodPkt;
+	SK_BOOL         IsBc;
+	SK_BOOL         IsMc;
+	SK_EVPARA       EvPara;      /* an event parameter union     */
+	SK_I16          LenToFree;   /* must be signed integer       */
+
+	unsigned long   Flags;       /* for spin lock                */
+	unsigned int    RlmtNotifier;
+	unsigned short  Type;
+	int             IpFrameLength;
+	int             FrameLength; /* total length of recvd frame  */
+	int             NumBytes; 
+	int             Result;
+	int             Offset = 0; 
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_RX_PROGRESS,
+		("==> HandleReceives (Port %c)\n", 'A' + Port));
+
+	/* 
+	** initialize vars for selected port 
+	*/
+	pLETab = &pAC->RxPort[Port].RxLET;
+
+	/* 
+	** check whether we want to receive this packet 
+	*/
+	SK_Y2_RXSTAT_CHECK_PKT(Len, FrameStatus, IsGoodPkt);
+
+	/*
+	** Remember length to free (in case of RxBuffer overruns;
+	** unlikely, but might happen once in a while)
+	*/
+	LenToFree = (SK_I16) Len;
+
+	/* 
+	** maybe we put these two checks into the SK_RXDESC_CHECK_PKT macro too 
+	*/
+	if (Len > pAC->RxBufSize) {
+		IsGoodPkt = SK_FALSE;
+	}
+
+	/*
+	** take first receive buffer out of working queue 
+	*/
+	POP_FIRST_PKT_FROM_QUEUE(&pAC->RxPort[Port].RxQ_working, pSkPacket);
+	if (HW_FEATURE(pAC, HWF_WA_DEV_420)) {
+		NbrRxBuffersInHW--;
+	}
+
+	/* 
+	** Verify the received length of the frame! Note that having 
+	** multiple RxBuffers being aware of one single receive packet
+	** (one packet spread over multiple RxBuffers) is not supported 
+	** by this driver!
+	*/
+	if ((Len > pAC->RxBufSize) || (Len > (SK_U16) pSkPacket->PacketLen)) {
+		IsGoodPkt = SK_FALSE;
+	}
+
+	/* 
+	** Reset own bit in LE's between old and new Done index
+	** This is not really necessary but makes debugging easier 
+	*/
+	CLEAR_LE_OWN_FROM_DONE_TO(pLETab, pSkPacket->NextLE);
+
+	/* 
+	** Free the list elements for new Rx buffers 
+	*/
+	SET_DONE_INDEX(pLETab, pSkPacket->NextLE);
+	pMsg = pSkPacket->pMBuf;
+	FrameLength = Len;
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_RX_PROGRESS,
+		("Received frame of length %d on port %d\n",FrameLength, Port));
+
+	if (!IsGoodPkt) {
+		/* 
+		** release the DMA mapping 
+		*/
+		pci_dma_sync_single(pAC->PciDev,
+				(dma_addr_t) pSkPacket->pFrag->pPhys,
+				pSkPacket->pFrag->FragLen,
+				PCI_DMA_FROMDEVICE); 
+
+		DEV_KFREE_SKB_ANY(pSkPacket->pMBuf);
+		PUSH_PKT_AS_LAST_IN_QUEUE(&pAC->RxPort[Port].RxQ_waiting, pSkPacket);
+		SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_RX_PROGRESS,
+			("<== HandleReceives (Port %c)\n", 'A' + Port));
+
+		/*
+		** Sanity check for RxBuffer overruns...
+		*/
+		LenToFree = LenToFree - (pSkPacket->pFrag->FragLen);
+		while (LenToFree > 0) {
+			POP_FIRST_PKT_FROM_QUEUE(&pAC->RxPort[Port].RxQ_working, pSkPacket);
+			if (HW_FEATURE(pAC, HWF_WA_DEV_420)) {
+				NbrRxBuffersInHW--;
+			}
+			CLEAR_LE_OWN_FROM_DONE_TO(pLETab, pSkPacket->NextLE);
+			SET_DONE_INDEX(pLETab, pSkPacket->NextLE);
+			pci_dma_sync_single(pAC->PciDev,
+					(dma_addr_t) pSkPacket->pFrag->pPhys,
+					pSkPacket->pFrag->FragLen,
+					PCI_DMA_FROMDEVICE); 
+
+			DEV_KFREE_SKB_ANY(pSkPacket->pMBuf);
+			PUSH_PKT_AS_LAST_IN_QUEUE(&pAC->RxPort[Port].RxQ_waiting, pSkPacket);
+			LenToFree = LenToFree - ((SK_I16)(pSkPacket->pFrag->FragLen));
+			
+			SK_DBG_MSG(pAC, SK_DBGMOD_DRV,
+				SK_DBGCAT_DRV_RX_PROGRESS | SK_DBGCAT_DRV_ERROR,
+				("<==HandleReceives (Port %c) drop faulty len pkt(2)\n",'A'+Port));
+		}
+		return(SK_TRUE);
+	} else {
+		/* 
+		** Release the DMA mapping 
+		*/
+		pci_unmap_single(pAC->PciDev,
+				 pSkPacket->pFrag->pPhys,
+				 pAC->RxBufSize - 2,
+				 PCI_DMA_FROMDEVICE);
+
+		skb_put(pMsg, FrameLength); /* set message len */
+		pMsg->ip_summed = CHECKSUM_NONE; /* initial default */
+		if (pAC->RxPort[Port].UseRxCsum) {
+			Type = ntohs(*((short*)&pMsg->data[12]));
+			if (Type == 0x800) {
+				*((char *)&(IpFrameLength)) = pMsg->data[16];
+				*(((char *)&(IpFrameLength))+1) = pMsg->data[17];
+				IpFrameLength = ntohs(IpFrameLength);
+				if ((FrameLength - IpFrameLength) == 0xe) {
+					/* Frame not padded => TCP offload! */
+					if ((((Tcp1 & 0xfffe) && (Tcp2 & 0xfffe)) &&
+						(pAC->GIni.GIChipId == CHIP_ID_GENESIS)) ||
+						(pAC->ChipsetType)) {
+						Result = SkCsGetReceiveInfo(pAC,&pMsg->data[14],
+										Tcp1, Tcp2, Port);
+						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)) {
+							SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
+								SK_DBGCAT_DRV_RX_PROGRESS | SK_DBGCAT_DRV_ERROR,
+								("skge: CRC error. Frame dropped!\n"));
+							DEV_KFREE_SKB_ANY(pMsg);
+							PUSH_PKT_AS_LAST_IN_QUEUE(&pAC->RxPort[Port].RxQ_waiting, pSkPacket);
+							SK_DBG_MSG(pAC,SK_DBGMOD_DRV,SK_DBGCAT_DRV_RX_PROGRESS,
+								("<==HandleReceives(Port %c)\n",'A'+Port));
+							return(SK_TRUE);
+						} else {
+							pMsg->ip_summed = CHECKSUM_NONE;
+						}
+					}/* checksumControl calculation valid */
+				} /* Frame length check */
+			} /* IP frame */
+		} /* end if (pRxPort->UseRxCsum) */
+		
+		SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
+			SK_DBGCAT_DRV_RX_PROGRESS,("V"));
+		RlmtNotifier = SK_RLMT_RX_PROTOCOL;
+
+		IsBc = (FrameStatus & GMR_FS_BC) ? SK_TRUE : SK_FALSE;
+		SK_RLMT_PRE_LOOKAHEAD(pAC,Port,FrameLength,
+					IsBc,&Offset,&NumBytes);
+		if (NumBytes != 0) {
+			IsMc = (FrameStatus & GMR_FS_MC) ? SK_TRUE : SK_FALSE;
+			SK_RLMT_LOOKAHEAD(pAC,Port,&pMsg->data[Offset],
+						IsBc,IsMc,&RlmtNotifier);
+		}
+
+		if (RlmtNotifier == SK_RLMT_RX_PROTOCOL) {
+			SK_DBG_MSG(NULL,SK_DBGMOD_DRV,
+				SK_DBGCAT_DRV_RX_PROGRESS,("W"));
+			if ((Port == pAC->ActivePort)||(pAC->RlmtNets == 2)) {
+				/* send up only frames from active port */
+				SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
+					SK_DBGCAT_DRV_RX_PROGRESS,("U"));
+#ifdef xDEBUG
+				DumpMsg(pMsg, "Rx");
+#endif
+				SK_PNMI_CNT_RX_OCTETS_DELIVERED(pAC,
+					FrameLength, Port);
+
+				pMsg->dev = pAC->dev[Port];
+				pMsg->protocol = eth_type_trans(pMsg,
+					pAC->dev[Port]);
+				netif_rx(pMsg);
+				pAC->dev[Port]->last_rx = jiffies;
+			} else { /* drop frame */
+				SK_DBG_MSG(NULL,SK_DBGMOD_DRV,
+					SK_DBGCAT_DRV_RX_PROGRESS,("D"));
+				DEV_KFREE_SKB_ANY(pMsg);
+			}
+		} else { /* This is an RLMT-packet! */
+			SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
+				SK_DBGCAT_DRV_RX_PROGRESS,("R"));
+			pRlmtMbuf = SkDrvAllocRlmtMbuf(pAC,
+				pAC->IoBase, FrameLength);
+			if (pRlmtMbuf != NULL) {
+				pRlmtMbuf->pNext = NULL;
+				pRlmtMbuf->Length = FrameLength;
+				pRlmtMbuf->PortIdx = Port;
+				EvPara.pParaPtr = pRlmtMbuf;
+				SK_MEMCPY((char*)(pRlmtMbuf->pData),
+				          (char*)(pMsg->data),FrameLength);
+
+				if (SlowPathLock == SK_TRUE) {
+					spin_lock_irqsave(&pAC->SlowPathLock, Flags);
+					SkEventQueue(pAC, SKGE_RLMT,
+						SK_RLMT_PACKET_RECEIVED,
+						EvPara);
+					pAC->CheckQueue = SK_TRUE;
+					spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
+				} else {
+					SkEventQueue(pAC, SKGE_RLMT,
+						SK_RLMT_PACKET_RECEIVED,
+						EvPara);
+					pAC->CheckQueue = SK_TRUE;
+				}
+
+				SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
+					SK_DBGCAT_DRV_RX_PROGRESS,("Q"));
+			}
+			if (pAC->dev[Port]->flags & (IFF_PROMISC | IFF_ALLMULTI)) {
+				pMsg->dev = pAC->dev[Port];
+				pMsg->protocol = eth_type_trans(pMsg,pAC->dev[Port]);
+				netif_rx(pMsg);
+				pAC->dev[Port]->last_rx = jiffies;
+			} else {
+				DEV_KFREE_SKB_ANY(pMsg);
+			}
+		} /* if packet for rlmt */
+		PUSH_PKT_AS_LAST_IN_QUEUE(&pAC->RxPort[Port].RxQ_waiting, pSkPacket);
+	} /* end if-else (IsGoodPkt) */
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_RX_PROGRESS,
+		("<== HandleReceives (Port %c)\n", 'A' + Port));
+	return(SK_TRUE);
+
+}	/* HandleReceives */
+
+/***********************************************************************
+ *
+ * 	CheckForSendComplete - Frees any freeable Tx bufffer 
+ *
+ * Description:
+ *	This function checks the queues of a port for completed send
+ *	packets and returns these packets back to the OS.
+ *
+ * Notes:
+ *	This function can run simultaneously for both ports if
+ *	the OS function OSReturnPacket() can handle this,
+ *
+ *	Such a send complete does not mean, that the packet is really
+ *	out on the wire. We just know that the adapter has copied it
+ *	into its internal memory and the buffer in the systems memory
+ *	is no longer needed.
+ *
+ * Returns: N/A
+ */
+static void CheckForSendComplete(
+SK_AC         *pAC,     /* pointer to adapter control context  */
+SK_IOC         IoC,     /* I/O control context                 */
+int            Port,    /* port index                          */
+SK_PKT_QUEUE  *pPQ,     /* tx working packet queue to check    */
+SK_LE_TABLE   *pLETab,  /* corresponding list element table    */
+unsigned int   Done)    /* done index reported for this LET    */
+{
+	SK_PACKET       *pSkPacket;
+	SK_PKT_QUEUE     SendCmplPktQ = { NULL, NULL, SPIN_LOCK_UNLOCKED };
+	SK_BOOL          DoWakeQueue  = SK_FALSE;
+	unsigned long    Flags;
+	unsigned         Put;
+	
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_TX_PROGRESS,
+		("==> CheckForSendComplete(Port %c)\n", 'A' + Port));
+
+	/* 
+	** Reset own bit in LE's between old and new Done index
+	** This is not really necessairy but makes debugging easier 
+	*/
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_TX_PROGRESS,
+		("Clear Own Bits in TxTable from %d to %d\n",
+		pLETab->Done, (Done == 0) ?
+		NUM_LE_IN_TABLE(pLETab) :
+		(Done - 1)));
+
+	spin_lock_irqsave(&(pPQ->QueueLock), Flags);
+
+	CLEAR_LE_OWN_FROM_DONE_TO(pLETab, Done);
+
+	Put = GET_PUT_IDX(pLETab);
+
+	/* 
+	** Check whether some packets have been completed 
+	*/
+	PLAIN_POP_FIRST_PKT_FROM_QUEUE(pPQ, pSkPacket);
+	while (pSkPacket != NULL) {
+		
+		SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_TX_PROGRESS,
+			("Check Completion of Tx packet %p\n", pSkPacket));
+		SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_TX_PROGRESS,
+			("Put %d NewDone %d NextLe of Packet %d\n", Put, Done,
+			pSkPacket->NextLE));
+
+		if ((Put > Done) &&
+			((pSkPacket->NextLE > Put) || (pSkPacket->NextLE <= Done))) {
+			PLAIN_PUSH_PKT_AS_LAST_IN_QUEUE(&SendCmplPktQ, pSkPacket);
+			SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_TX_PROGRESS,
+				("Packet finished (a)\n"));
+		} else if ((Done > Put) &&
+			(pSkPacket->NextLE > Put) && (pSkPacket->NextLE <= Done)) {
+			PLAIN_PUSH_PKT_AS_LAST_IN_QUEUE(&SendCmplPktQ, pSkPacket);
+			SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_TX_PROGRESS,
+				("Packet finished (b)\n"));
+		} else if ((Done == TXA_MAX_LE-1) && (Put == 0) && (pSkPacket->NextLE == 0)) {
+			PLAIN_PUSH_PKT_AS_LAST_IN_QUEUE(&SendCmplPktQ, pSkPacket);
+			SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_TX_PROGRESS,
+				("Packet finished (b)\n"));
+			DoWakeQueue = SK_TRUE;
+		} else if (Done == Put) {
+			/* all packets have been sent */
+			PLAIN_PUSH_PKT_AS_LAST_IN_QUEUE(&SendCmplPktQ, pSkPacket);
+			SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_TX_PROGRESS,
+				("Packet finished (c)\n"));
+		} else {
+			SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_TX_PROGRESS,
+				("Packet not yet finished\n"));
+			PLAIN_PUSH_PKT_AS_FIRST_IN_QUEUE(pPQ, pSkPacket);
+			break;
+		}
+		PLAIN_POP_FIRST_PKT_FROM_QUEUE(pPQ, pSkPacket);
+	}
+	spin_unlock_irqrestore(&(pPQ->QueueLock), Flags);
+
+	/* 
+	** Set new done index in list element table
+	*/
+	SET_DONE_INDEX(pLETab, Done);
+	 
+	/*
+	** All TX packets that are send complete should be added to
+	** the free queue again for new sents to come
+	*/
+	pSkPacket = SendCmplPktQ.pHead;
+	while (pSkPacket != NULL) {
+		while (pSkPacket->pFrag != NULL) {
+			pci_unmap_page(pAC->PciDev,
+					(dma_addr_t) pSkPacket->pFrag->pPhys,
+					pSkPacket->pFrag->FragLen,
+					PCI_DMA_FROMDEVICE);
+			pSkPacket->pFrag = pSkPacket->pFrag->pNext;
+		}
+
+		DEV_KFREE_SKB_ANY(pSkPacket->pMBuf);
+		pSkPacket->pMBuf	= NULL;
+		pSkPacket = pSkPacket->pNext; /* get next packet */
+	}
+
+	/*
+	** Append the available TX packets back to free queue
+	*/
+	if (SendCmplPktQ.pHead != NULL) { 
+		spin_lock_irqsave(&(pAC->TxPort[Port][0].TxQ_free.QueueLock), Flags);
+		if (pAC->TxPort[Port][0].TxQ_free.pTail != NULL) {
+			pAC->TxPort[Port][0].TxQ_free.pTail->pNext = SendCmplPktQ.pHead;
+			pAC->TxPort[Port][0].TxQ_free.pTail        = SendCmplPktQ.pTail;
+			if (pAC->TxPort[Port][0].TxQ_free.pHead->pNext == NULL) {
+                                netif_wake_queue(pAC->dev[Port]);
+                        }
+		} else {
+			pAC->TxPort[Port][0].TxQ_free.pHead = SendCmplPktQ.pHead;
+			pAC->TxPort[Port][0].TxQ_free.pTail = SendCmplPktQ.pTail; 
+			netif_wake_queue(pAC->dev[Port]);
+		}
+		if (Done == Put) {
+                        netif_wake_queue(pAC->dev[Port]);
+                }
+                if (DoWakeQueue) {
+                        netif_wake_queue(pAC->dev[Port]);
+                        DoWakeQueue = SK_FALSE;
+                }
+		spin_unlock_irqrestore(&pAC->TxPort[Port][0].TxQ_free.QueueLock, Flags);
+	}
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_TX_PROGRESS,
+		("<== CheckForSendComplete()\n"));
+
+	return;
+}	/* CheckForSendComplete */
+
+/*****************************************************************************
+ *
+ *	UnmapAndFreeTxPktBuffer
+ *
+ * Description:
+ *      This function free any allocated space of receive buffers
+ *
+ * Arguments:
+ *      pAC - A pointer to the adapter context struct.
+ *
+ */
+static void UnmapAndFreeTxPktBuffer(
+SK_AC       *pAC,       /* pointer to adapter context             */
+SK_PACKET   *pSkPacket,	/* pointer to port struct of ring to fill */
+int          TxPort)    /* TX port index                          */
+{
+	SK_FRAG	 *pFrag = pSkPacket->pFrag;
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_TX_PROGRESS,
+		("--> UnmapAndFreeTxPktBuffer\n"));
+
+	while (pFrag != NULL) {
+		pci_unmap_page(pAC->PciDev,
+				(dma_addr_t) pFrag->pPhys,
+				pFrag->FragLen,
+				PCI_DMA_FROMDEVICE);
+		pFrag = pFrag->pNext;
+	}
+
+	DEV_KFREE_SKB_ANY(pSkPacket->pMBuf);
+	pSkPacket->pMBuf	= NULL;
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_TX_PROGRESS,
+		("<-- UnmapAndFreeTxPktBuffer\n"));
+}
+
+/*****************************************************************************
+ *
+ * 	HandleStatusLEs
+ *
+ * Description:
+ *	This function checks for any new status LEs that may have been 
+  *	received. Those status LEs may either be Rx or Tx ones.
+ *
+ * Returns:	N/A
+ */
+static SK_BOOL HandleStatusLEs(
+#ifdef CONFIG_SK98LIN_NAPI
+SK_AC *pAC,       /* pointer to adapter context   */
+int   *WorkDone,  /* Done counter needed for NAPI */
+int    WorkToDo)  /* ToDo counter for NAPI        */
+#else
+SK_AC *pAC)       /* pointer to adapter context   */
+#endif
+{
+	int       DoneTxA[SK_MAX_MACS];
+	int       DoneTxS[SK_MAX_MACS];
+	int       Port;
+	SK_BOOL   handledStatLE = SK_FALSE;
+	SK_BOOL   NewDone       = SK_FALSE;
+	SK_HWLE  *pLE;
+	SK_U16    HighVal;
+	SK_U32    LowVal;
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_INT_SRC,
+		("==> HandleStatusLEs\n"));
+
+	do {
+		SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_INT_SRC,
+			("Check next Own Bit of ST-LE[%d]: 0x%li \n",
+			(pAC->StatusLETable.Done + 1) % NUM_LE_IN_TABLE(&pAC->StatusLETable),
+			 OWN_OF_FIRST_LE(&pAC->StatusLETable)));
+
+		while (OWN_OF_FIRST_LE(&pAC->StatusLETable) == HW_OWNER) {
+			GET_ST_LE(pLE, &pAC->StatusLETable);
+			SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_INT_SRC,
+				("Working on finished status LE[%d]:\n",
+				GET_DONE_INDEX(&pAC->StatusLETable)));
+			SK_DBG_DUMP_ST_LE(pLE);
+			handledStatLE = SK_TRUE;
+			switch (STLE_GET_OPC(pLE) & ~HW_OWNER) {
+			case OP_RXSTAT:
+				if (pAC->StatusLETable.private) {
+					/* 
+					** This is always the last Status LE belonging
+					** to a received packet -> handle it...
+					*/
+					HandleReceives(
+						pAC,
+						STLE_GET_LINK(pLE),
+						STLE_GET_LEN(pLE),
+						STLE_GET_FRSTATUS(pLE),
+						pAC->StatusLETable.Bmu.Stat.TcpSum1,
+						pAC->StatusLETable.Bmu.Stat.TcpSum2,
+						pAC->StatusLETable.Bmu.Stat.RxTimeStamp,
+						pAC->StatusLETable.Bmu.Stat.VlanId);
+					pAC->StatusLETable.private = SK_FALSE;
+#ifdef CONFIG_SK98LIN_NAPI
+					if (*WorkDone >= WorkToDo) {
+						break;
+					}
+					(*WorkDone)++;
+#endif
+				} else {
+					pAC->StatusLETable.Bmu.Stat.TcpSum1 = STLE_GET_TCP1(pLE);
+					pAC->StatusLETable.Bmu.Stat.TcpSum2 = STLE_GET_TCP2(pLE);
+					pAC->StatusLETable.private = SK_TRUE;
+				}
+				break;
+			case OP_RXVLAN:
+				/* this value will be used for next RXSTAT */
+				pAC->StatusLETable.Bmu.Stat.VlanId = STLE_GET_VLAN(pLE);
+				break;
+			case OP_RXTIMEVLAN:
+				/* this value will be used for next RXSTAT */
+				pAC->StatusLETable.Bmu.Stat.VlanId = STLE_GET_VLAN(pLE);
+				/* fall through */
+			case OP_RXTIMESTAMP:
+				/* this value will be used for next RXSTAT */
+				pAC->StatusLETable.Bmu.Stat.RxTimeStamp = STLE_GET_TIST(pLE);
+				break;
+			case OP_RXCHKSVLAN:
+				/* this value will be used for next RXSTAT */
+				pAC->StatusLETable.Bmu.Stat.VlanId = STLE_GET_VLAN(pLE);
+				/* fall through */
+			case OP_RXCHKS:
+				/* this value will be used for next RXSTAT */
+				pAC->StatusLETable.Bmu.Stat.TcpSum1 = STLE_GET_TCP1(pLE);
+				pAC->StatusLETable.Bmu.Stat.TcpSum2 = STLE_GET_TCP2(pLE);
+				pAC->StatusLETable.private = SK_TRUE;
+				break;
+			case OP_RSS_HASH:
+				/* this value will be used for next RXSTAT */
+#if 0
+				pAC->StatusLETable.Bmu.Stat.RssHashValue = STLE_GET_RSS(pLE);
+#endif
+				break;
+			case OP_TXINDEXLE:
+				/*
+				** :;:; TODO
+				** it would be possible to check for which queues
+				** the index has been changed and call 
+				** CheckForSendComplete() only for such queues
+				*/
+				STLE_GET_DONE_IDX(pLE,LowVal,HighVal);
+				SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_INT_SRC,
+					("LowVal: 0x%x HighVal: 0x%x\n", LowVal, HighVal));
+
+				/*
+				** It would be possible to check whether we really
+				** need the values for second port or sync queue, 
+				** but I think checking whether we need them is 
+				** more expensive than the calculation
+				*/
+				DoneTxA[0] = STLE_GET_DONE_IDX_TXA1(LowVal,HighVal);
+				DoneTxS[0] = STLE_GET_DONE_IDX_TXS1(LowVal,HighVal);
+				DoneTxA[1] = STLE_GET_DONE_IDX_TXA2(LowVal,HighVal);
+				DoneTxS[1] = STLE_GET_DONE_IDX_TXS2(LowVal,HighVal);
+
+				SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_INT_SRC,
+					("DoneTxa1 0x%x DoneTxS1: 0x%x DoneTxa2 0x%x DoneTxS2: 0x%x\n",
+					DoneTxA[0], DoneTxS[0], DoneTxA[1], DoneTxS[1]));
+
+				NewDone = SK_TRUE;
+				break;
+			default:
+				/* 
+				** Have to handle the illegal Opcode in Status LE 
+				*/
+				SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_INT_SRC,
+					("Unexpected OpCode\n"));
+				break;
+			}
+
+			/* 
+			** Reset own bit we have to do this in order to detect a overflow 
+			*/
+			STLE_SET_OPC(pLE, SW_OWNER);
+		}
+
+		/* 
+		** Now handle any new transmit complete 
+		*/
+		if (NewDone) {
+			SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_INT_SRC,
+				("Done Index for Tx BMU has been changed\n"));
+			for (Port = 0; Port < pAC->GIni.GIMacsFound; Port++) {
+				/* 
+				** Do we have a new Done idx ? 
+				*/
+				if (DoneTxA[Port] != GET_DONE_INDEX(&pAC->TxPort[Port][0].TxALET)) {
+					SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_INT_SRC,
+						("Check TxA%d\n", Port + 1));
+					CheckForSendComplete(pAC, pAC->IoBase, Port,
+						&(pAC->TxPort[Port][0].TxAQ_working),
+						&pAC->TxPort[Port][0].TxALET,
+						DoneTxA[Port]);
+				} else {
+					SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_INT_SRC,
+						("No changes for TxA%d\n", Port + 1));
+				}
+#if USE_SYNC_TX_QUEUE
+				if (HW_SYNC_TX_SUPPORTED(pAC)) {
+					/* 
+					** Do we have a new Done idx ? 
+					*/
+					if (DoneTxS[Port] !=
+						GET_DONE_INDEX(&pAC->TxPort[Port][0].TxSLET)) {
+						SK_DBG_MSG(pAC, SK_DBGMOD_DRV, 
+							SK_DBGCAT_DRV_INT_SRC,
+							("Check TxS%d\n", Port));
+						CheckForSendComplete(pAC, pAC->IoBase, Port,
+							&(pAC->TxPort[Port][0].TxSQ_working),
+							&pAC->TxPort[Port][0].TxSLET,
+							DoneTxS[Port]);
+					} else {
+						SK_DBG_MSG(pAC, SK_DBGMOD_DRV, 
+							SK_DBGCAT_DRV_INT_SRC,
+							("No changes for TxS%d\n", Port));
+					}
+				}
+#endif
+			}
+		}
+		NewDone = SK_FALSE;
+
+		/* 
+		** Check whether we have to refill our RX table  
+		*/
+		if (HW_FEATURE(pAC, HWF_WA_DEV_420)) {
+			if (NbrRxBuffersInHW < MAX_NBR_RX_BUFFERS_IN_HW) {
+				for (Port = 0; Port < pAC->GIni.GIMacsFound; Port++) {
+					SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_INT_SRC,
+						("Check for refill of RxBuffers on Port %c\n", 'A' + Port));
+					FillReceiveTableYukon2(pAC, pAC->IoBase, Port);
+				}
+			}
+		} else {
+			for (Port = 0; Port < pAC->GIni.GIMacsFound; Port++) {
+				SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_INT_SRC,
+					("Check for refill of RxBuffers on Port %c\n", 'A' + Port));
+				if (NUM_FREE_LE_IN_TABLE(&pAC->RxPort[Port].RxLET) >= 64) {
+					FillReceiveTableYukon2(pAC, pAC->IoBase, Port);
+				}
+			}
+		}
+#ifdef CONFIG_SK98LIN_NAPI
+		if (*WorkDone >= WorkToDo) {
+			break;
+		}
+#endif
+	} while (OWN_OF_FIRST_LE(&pAC->StatusLETable) == HW_OWNER);
+
+	/* 
+	** Clear status BMU 
+	*/
+	SK_OUT32(pAC->IoBase, STAT_CTRL, SC_STAT_CLR_IRQ);
+
+	return(handledStatLE);
+}	/* HandleStatusLEs */
+
+/*****************************************************************************
+ *
+ *	AllocateAndInitLETables - allocate memory for the LETable and init
+ *
+ * Description:
+ *	This function will allocate space for the LETable and will also  
+ *	initialize them. The size of the tables must have been specified 
+ *	before.
+ *
+ * Arguments:
+ *	pAC - A pointer to the adapter context struct.
+ *
+ * Returns:
+ *	SK_TRUE  - all LETables initialized
+ *	SK_FALSE - failed
+ */
+static SK_BOOL AllocateAndInitLETables(
+SK_AC *pAC)  /* pointer to adapter context */
+{
+	char           *pVirtMemAddr;
+	dma_addr_t     pPhysMemAddr;
+	SK_U32         CurrMac;
+	unsigned       Size;
+	unsigned       Aligned;
+	unsigned       Alignment;
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_INIT,
+		("==> AllocateAndInitLETables()\n"));
+
+	/*
+	** Determine how much memory we need with respect to alignment
+	*/
+	Alignment = MAX_LEN_OF_LE_TAB;
+	Size = 0;
+	for (CurrMac = 0; CurrMac < pAC->GIni.GIMacsFound; CurrMac++) {
+		SK_ALIGN_SIZE(LE_TAB_SIZE(RX_MAX_LE), Alignment, Aligned);
+		Size += Aligned;
+		SK_ALIGN_SIZE(LE_TAB_SIZE(TXA_MAX_LE), Alignment, Aligned);
+		Size += Aligned;
+		SK_ALIGN_SIZE(LE_TAB_SIZE(TXS_MAX_LE), Alignment, Aligned);
+		Size += Aligned;
+	}
+	SK_ALIGN_SIZE(LE_TAB_SIZE(ST_MAX_LE), Alignment, Aligned);
+	Size += Aligned;
+	Size += Alignment;
+	pAC->SizeOfAlignedLETables = Size;
+	
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_INIT, 
+			("Need %08x bytes in total\n", Size));
+	
+	/*
+	** Allocate the memory
+	*/
+	pVirtMemAddr = pci_alloc_consistent(pAC->PciDev, Size, &pPhysMemAddr);
+	if (pVirtMemAddr == NULL) {
+		SK_DBG_MSG(pAC, SK_DBGMOD_DRV, 
+			SK_DBGCAT_INIT | SK_DBGCAT_DRV_ERROR,
+			("AllocateAndInitLETables: kernel malloc failed!\n"));
+		return (SK_FALSE); 
+	}
+
+	/* 
+	** Initialize the memory
+	*/
+	SK_MEMSET(pVirtMemAddr, 0, Size);
+	ALIGN_ADDR(pVirtMemAddr, Alignment); /* Macro defined in skgew.h */
+	
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_INIT,
+		("Virtual address of LETab is %8p!\n", pVirtMemAddr));
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_INIT,
+		("Phys address of LETab is %8p!\n", (void *) pPhysMemAddr));
+
+	for (CurrMac = 0; CurrMac < pAC->GIni.GIMacsFound; CurrMac++) {
+		SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_INIT,
+			("RxLeTable for Port %c", 'A' + CurrMac));
+		SkGeY2InitSingleLETable(
+			pAC,
+			&pAC->RxPort[CurrMac].RxLET,
+			RX_MAX_LE,
+			pVirtMemAddr,
+			(SK_U32) (pPhysMemAddr & 0xffffffff),
+			(SK_U32) (((SK_U64) pPhysMemAddr) >> 32));
+
+		SK_ALIGN_SIZE(LE_TAB_SIZE(RX_MAX_LE), Alignment, Aligned);
+		pVirtMemAddr += Aligned;
+		pPhysMemAddr += Aligned;
+
+		SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_INIT,
+			("TxALeTable for Port %c", 'A' + CurrMac));
+		SkGeY2InitSingleLETable(
+			pAC,
+			&pAC->TxPort[CurrMac][0].TxALET,
+			TXA_MAX_LE,
+			pVirtMemAddr,
+			(SK_U32) (pPhysMemAddr & 0xffffffff),
+			(SK_U32) (((SK_U64) pPhysMemAddr) >> 32));
+
+		SK_ALIGN_SIZE(LE_TAB_SIZE(TXA_MAX_LE), Alignment, Aligned);
+		pVirtMemAddr += Aligned;
+		pPhysMemAddr += Aligned;
+
+		SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_INIT,
+			("TxSLeTable for Port %c", 'A' + CurrMac));
+		SkGeY2InitSingleLETable(
+			pAC,
+			&pAC->TxPort[CurrMac][0].TxSLET,
+			TXS_MAX_LE,
+			pVirtMemAddr,
+			(SK_U32) (pPhysMemAddr & 0xffffffff),
+			(SK_U32) (((SK_U64) pPhysMemAddr) >> 32));
+
+		SK_ALIGN_SIZE(LE_TAB_SIZE(TXS_MAX_LE), Alignment, Aligned);
+		pVirtMemAddr += Aligned;
+		pPhysMemAddr += Aligned;
+	}
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_MSG,("StLeTable"));
+
+	SkGeY2InitSingleLETable(
+		pAC,
+		&pAC->StatusLETable,
+		ST_MAX_LE,
+		pVirtMemAddr,
+		(SK_U32) (pPhysMemAddr & 0xffffffff),
+		(SK_U32) (((SK_U64) pPhysMemAddr) >> 32));
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_INIT, 
+		("<== AllocateAndInitLETables(OK)\n"));
+	return(SK_TRUE);
+}	/* AllocateAndInitLETables */
+
+/*****************************************************************************
+ *
+ *	AllocatePacketBuffersYukon2 - allocate packet and fragment buffers
+ *
+ * Description:
+ *      This function will allocate space for the packets and fragments
+ *
+ * Arguments:
+ *      pAC - A pointer to the adapter context struct.
+ *
+ * Returns:
+ *      SK_TRUE  - Memory was allocated correctly
+ *      SK_FALSE - An error occured
+ */
+static SK_BOOL AllocatePacketBuffersYukon2(
+SK_AC *pAC)  /* pointer to adapter context */
+{
+	SK_PACKET       *pRxPacket;
+	SK_PACKET       *pTxPacket;
+	SK_U32           CurrBuff;
+	SK_U32           CurrMac;
+	unsigned long    Flags; /* needed for POP/PUSH functions */
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_INIT,
+		("==> AllocatePacketBuffersYukon2()"));
+
+	for (CurrMac = 0; CurrMac < pAC->GIni.GIMacsFound; CurrMac++) {
+		/* 
+		** Allocate RX packet space, initialize the packets and
+		** add them to the RX waiting queue. Waiting queue means 
+		** that packet and fragment are initialized, but no sk_buff
+		** has been assigned to it yet.
+		*/
+		pAC->RxPort[CurrMac].ReceivePacketTable = 
+			kmalloc((RX_MAX_NBR_BUFFERS * sizeof(SK_PACKET)), GFP_KERNEL);
+
+		if (pAC->RxPort[CurrMac].ReceivePacketTable == NULL) {
+			SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_INIT | SK_DBGCAT_DRV_ERROR,
+				("AllocatePacketBuffersYukon2: no mem RxPkts (port %i)",CurrMac));
+			break;
+		} else {
+			SK_MEMSET(pAC->RxPort[CurrMac].ReceivePacketTable, 0, 
+				(RX_MAX_NBR_BUFFERS * sizeof(SK_PACKET)));
+
+			pRxPacket = pAC->RxPort[CurrMac].ReceivePacketTable;
+
+			for (CurrBuff=0;CurrBuff<RX_MAX_NBR_BUFFERS;CurrBuff++) {
+				pRxPacket->pFrag = &(pRxPacket->FragArray[0]);
+				pRxPacket->NumFrags = 1;
+				PUSH_PKT_AS_LAST_IN_QUEUE(&pAC->RxPort[CurrMac].RxQ_waiting, pRxPacket);
+				pRxPacket++;
+			}
+		}
+
+		/*
+		** Allocate TX packet space, initialize the packets and
+		** add them to the TX free queue. Free queue means that
+		** packet is available and initialized, but no fragment
+		** has been assigned to it. (Must be done at TX side)
+		*/
+		pAC->TxPort[CurrMac][0].TransmitPacketTable = 
+			kmalloc((TX_MAX_NBR_BUFFERS * sizeof(SK_PACKET)), GFP_KERNEL);
+
+		if (pAC->TxPort[CurrMac][0].TransmitPacketTable == NULL) {
+			SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_INIT | SK_DBGCAT_DRV_ERROR,
+				("AllocatePacketBuffersYukon2: no mem TxPkts (port %i)",CurrMac));
+			kfree(pAC->RxPort[CurrMac].ReceivePacketTable);
+			return(SK_FALSE);
+		} else {
+			SK_MEMSET(pAC->TxPort[CurrMac][0].TransmitPacketTable, 0, 
+				(TX_MAX_NBR_BUFFERS * sizeof(SK_PACKET)));
+		
+			pTxPacket = pAC->TxPort[CurrMac][0].TransmitPacketTable;
+
+			for (CurrBuff=0;CurrBuff<TX_MAX_NBR_BUFFERS;CurrBuff++) {
+				PUSH_PKT_AS_LAST_IN_QUEUE(&pAC->TxPort[CurrMac][0].TxQ_free, pTxPacket);
+				pTxPacket++;
+			}
+		}
+	} /* end for (CurrMac = 0; CurrMac < pAC->GIni.GIMacsFound; CurrMac++) */
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_INIT,
+		("<== AllocatePacketBuffersYukon2 (OK)\n"));
+	return(SK_TRUE);
+
+}	/* AllocatePacketBuffersYukon2 */
+
+/*****************************************************************************
+ *
+ *	FreeLETables - release allocated memory of LETables
+ *
+ * Description:
+ *      This function will free all resources of the LETables
+ *
+ * Arguments:
+ *      pAC - A pointer to the adapter context struct.
+ *
+ * Returns: N/A
+ */
+static void FreeLETables(
+SK_AC *pAC)  /* pointer to adapter control context */
+{
+	dma_addr_t  pPhysMemAddr;
+	char       *pVirtMemAddr;
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_MSG,
+		("==> FreeLETables()\n"));
+	
+	/*
+	** The RxLETable is the first of all LET. 
+	** Therefore we can use its address for the input 
+	** of the free function.
+	*/
+	pVirtMemAddr = (char *) pAC->RxPort[0].RxLET.pLETab;
+	pPhysMemAddr = (((SK_U64) pAC->RxPort[0].RxLET.pPhyLETABHigh << (SK_U64) 32) | 
+			((SK_U64) pAC->RxPort[0].RxLET.pPhyLETABLow));
+
+	/* free continuous memory */
+	pci_free_consistent(pAC->PciDev, pAC->SizeOfAlignedLETables,
+			    pVirtMemAddr, pPhysMemAddr);
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_MSG,
+		("<== FreeLETables()\n"));
+}	/* FreeLETables */
+
+/*****************************************************************************
+ *
+ *	FreePacketBuffers - free's all packet buffers of an adapter
+ *
+ * Description:
+ *      This function will free all previously allocated memory of the 
+ *	packet buffers.
+ *
+ * Arguments:
+ *      pAC - A pointer to the adapter context struct.
+ *
+ * Returns: N/A
+ */
+static void FreePacketBuffers(
+SK_AC *pAC)  /* pointer to adapter control context */
+{
+	int Port;
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_MSG,
+		("==> FreePacketBuffers()\n"));
+	
+	for (Port = 0; Port < pAC->GIni.GIMacsFound; Port++) {
+		kfree(pAC->RxPort[Port].ReceivePacketTable);
+		kfree(pAC->TxPort[Port][0].TransmitPacketTable);
+	}
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_DRV, SK_DBGCAT_DRV_MSG,
+		("<== FreePacketBuffers()\n"));
+}	/* FreePacketBuffers */
+
+/*****************************************************************************
+ *
+ * 	AllocAndMapRxBuffer - fill one buffer into the receive packet/fragment
+ *
+ * Description:
+ *	The function allocates a new receive buffer and assigns it to the
+ *	the passsed receive packet/fragment
+ *
+ * Returns:
+ *	SK_TRUE - a buffer was allocated and assigned
+ *	SK_FALSE - a buffer could not be added
+ */
+static SK_BOOL AllocAndMapRxBuffer(
+SK_AC      *pAC,        /* pointer to the adapter control context */
+SK_PACKET  *pSkPacket,  /* pointer to packet that is to fill      */
+int         Port)       /* port the packet belongs to             */
+{
+	struct sk_buff *pMsgBlock;  /* pointer to a new message block  */
+	SK_U64          PhysAddr;   /* physical address of a rx buffer */
+
+	SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_RX_PROGRESS,
+		("--> AllocAndMapRxBuffer (Port: %i)\n", Port));
+
+	pMsgBlock = alloc_skb(pAC->RxBufSize, GFP_ATOMIC);
+	if (pMsgBlock == NULL) {
+		SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
+			SK_DBGCAT_DRV_RX_PROGRESS | SK_DBGCAT_DRV_ERROR,
+			("%s: Allocation of rx buffer failed !\n",
+			pAC->dev[Port]->name));
+		SK_PNMI_CNT_NO_RX_BUF(pAC, pAC->RxPort[Port].PortIndex);
+		return(SK_FALSE);
+	} 
+
+	PhysAddr = (SK_U64) pci_map_page(pAC->PciDev,
+		virt_to_page(pMsgBlock->data),
+		((unsigned long) pMsgBlock->data &
+		~PAGE_MASK),
+		pAC->RxBufSize - 2,
+		PCI_DMA_FROMDEVICE);
+
+	pSkPacket->pFrag->pVirt   = pMsgBlock->data;
+	pSkPacket->pFrag->pPhys   = PhysAddr;
+	pSkPacket->pFrag->FragLen = pAC->RxBufSize - 2; /* for correct unmap */
+	pSkPacket->pMBuf          = pMsgBlock;	
+	pSkPacket->PacketLen      = pAC->RxBufSize - 2;
+
+	SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_RX_PROGRESS,
+		("<-- AllocAndMapRxBuffer\n"));
+
+	return (SK_TRUE);
+}	/* AllocAndMapRxBuffer */
+
+/*******************************************************************************
+ *
+ * End of file
+ *
+ ******************************************************************************/
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/sky2le.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/sky2le.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/sk98lin/sky2le.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/sk98lin/sky2le.c	2004-09-09 13:20:49.000000000 +0200
@@ -0,0 +1,470 @@
+/*****************************************************************************
+ *
+ *	Name:		sky2le.c
+ *	Project:	Gigabit Ethernet Adapters, Common Modules
+ *	Version:	$Revision: 1.8 $
+ *	Date:		$Date: 2004/06/03 15:09:29 $
+ *	Purpose: 	Functions for handling List Element Tables
+ *
+ *****************************************************************************/
+
+/******************************************************************************
+ *
+ *	(C)Copyright 2002-2004 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
+ *	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.
+ *
+ ******************************************************************************/
+
+#if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
+static const char SysKonnectFileId[] = "@(#)"
+	"$Id: sky2le.c,v 1.8 2004/06/03 15:09:29 malthoff Exp $ (C) Marvell.";
+#endif /* DEBUG || (!LINT && !SK_SLIM) */
+
+/*****************************************************************************
+ *
+ * Description:
+ *
+ * This module contains the code necessary for handling List Elements.
+ *
+ * Supported Gigabit Ethernet Chipsets:
+ *	Yukon-2 (PCI, PCI-X, PCI-Express)
+ *
+ * Include File Hierarchy:
+ *
+ *
+ *****************************************************************************/
+#include "h/skdrv1st.h"
+#include "h/skdrv2nd.h"
+
+/* defines *******************************************************************/
+/* typedefs ******************************************************************/
+/* global variables **********************************************************/
+/* local variables ***********************************************************/
+/* function prototypes *******************************************************/
+
+/*****************************************************************************
+ *
+ * SkGeY2InitSingleLETable() - initializes a list element table
+ *
+ * Description:
+ *	This function will initialize the selected list element table.
+ *	Should be called once during DriverInit. No InitLevel required.
+ *
+ * Arguments:
+ *	pAC			- pointer to the adapter context struct.
+ *	pLETab		- pointer to list element table structure
+ *	NumLE		- number of list elements in this table
+ *	pVMem		- virtual address of memory allocated for this LE table
+ *	PMemLowAddr - physical address of memory to be used for the LE table
+ *	PMemHighAddr
+ *
+ * Returns:
+ *	nothing
+ */
+void SkGeY2InitSingleLETable(
+SK_AC	*pAC,			/* pointer to adapter context */
+SK_LE_TABLE	*pLETab,	/* pointer to list element table to be initialized */
+unsigned int NumLE,		/* number of list elements to be filled in tab */
+void	*pVMem,			/* virtual address of memory used for list elements */
+SK_U32	PMemLowAddr,	/* physical addr of mem used for LE */
+SK_U32	PMemHighAddr)
+{
+	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_INIT,
+		("==> SkGeY2InitSingleLETable()\n"));
+
+#ifdef DEBUG
+	if (NumLE != 2) {	/* not table for polling unit */
+		if ((NumLE % MIN_LEN_OF_LE_TAB) != 0 || NumLE > MAX_LEN_OF_LE_TAB) {
+			SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_ERR,
+				("ERROR: Illegal number of list elements %d\n", NumLE));
+		}
+	}
+#endif /* DEBUG */
+
+	/* special case: unused list element table */
+	if (NumLE == 0) {
+		PMemLowAddr = 0;
+		PMemHighAddr = 0;
+		pVMem = 0;
+	}
+
+	/* set addresses */
+	pLETab->pPhyLETABLow = PMemLowAddr;
+	pLETab->pPhyLETABHigh = PMemHighAddr;
+	pLETab->pLETab = (void *)pVMem;
+	
+	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_INIT,
+		("contains %d LEs", NumLE));
+	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_INIT,
+		(" and starts at virt %08p and phys %08lx:%08lx\n",
+		pVMem, PMemHighAddr, PMemLowAddr));
+
+	/* initialize indexes */
+	pLETab->Done = 0;
+	pLETab->Put = 0;
+	pLETab->HwPut = 0;
+	/* initialize size */
+	pLETab->Num = NumLE;
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_INIT,
+		("<== SkGeY2InitSingleLETable()\n"));
+}	/* SkGeY2InitSingleLETable */
+
+/*****************************************************************************
+ *
+ * SkGeY2InitPrefetchUnit() - Initialize a Prefetch Unit
+ *
+ * Description:
+ *	Calling this function requires an already configured list element
+ *	table. The prefetch unit to be configured is specified in the parameter
+ *	'Queue'. The function is able to initialze the prefetch units of
+ *	the following queues: Q_R1, Q_R2, Q_XS1, Q_XS2, Q_XA1, Q_XA2.
+ *	The funcution should be called before SkGeInitPort().
+ *
+ * Arguments:
+ *	pAC - pointer to the adapter context struct.
+ *	IoC - I/O context.
+ *	Queue - I/O offset of queue e.g. Q_XA1.
+ *	pLETab - pointer to list element table to be initialized
+ *
+ * Returns: N/A
+ */
+void SkGeY2InitPrefetchUnit(
+SK_AC	*pAC,			/* pointer to adapter context */
+SK_IOC	IoC,			/* I/O context */
+unsigned int Queue,		/* Queue offset for finding the right registers */
+SK_LE_TABLE	*pLETab)	/* pointer to list element table to be initialized */
+{
+	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_INIT,
+		("==> SkGeY2InitPrefetchUnit()\n"));
+
+#ifdef DEBUG
+	if (Queue != Q_R1 && Queue != Q_R2 && Queue != Q_XS1 &&
+		Queue != Q_XS2 && Queue != Q_XA1 && Queue != Q_XA2) {
+		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_ERR,
+			("ERROR: Illegal queue identifier %x\n", Queue));
+	}
+#endif /* DEBUG */
+
+	/* disable the prefetch unit */
+	SK_OUT32(IoC, Y2_PREF_Q_ADDR(Queue, PREF_UNIT_CTRL_REG), PREF_UNIT_RST_SET);
+	SK_OUT32(IoC, Y2_PREF_Q_ADDR(Queue, PREF_UNIT_CTRL_REG), PREF_UNIT_RST_CLR);
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_INIT,
+		("Base address: %08lx:%08lx\n", pLETab->pPhyLETABHigh,
+		pLETab->pPhyLETABLow));
+
+	/* Set the list base address  high part*/
+	SK_OUT32(IoC, Y2_PREF_Q_ADDR(Queue, PREF_UNIT_ADDR_HI_REG),
+		pLETab->pPhyLETABHigh);
+
+	/* Set the list base address low part */
+	SK_OUT32(IoC, Y2_PREF_Q_ADDR(Queue, PREF_UNIT_ADDR_LOW_REG),
+		pLETab->pPhyLETABLow);
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_INIT,
+		("Last index: %d\n", pLETab->Num-1));
+
+	/* Set the list last index */
+	SK_OUT16(IoC, Y2_PREF_Q_ADDR(Queue, PREF_UNIT_LAST_IDX_REG),
+		(SK_U16)(pLETab->Num - 1));
+
+	/* turn on prefetch unit */
+	SK_OUT32(IoC, Y2_PREF_Q_ADDR(Queue, PREF_UNIT_CTRL_REG), PREF_UNIT_OP_ON);
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_INIT,
+		("<== SkGeY2InitPrefetchUnit()\n"));
+}	/* SkGeY2InitPrefetchUnit */
+
+
+/*****************************************************************************
+ *
+ * SkGeY2InitStatBmu() -	Initialize the Status BMU
+ *
+ * Description:
+ *	Calling this function requires an already configured list element
+ *	table. Ensure the status BMU is only initialized once during
+ *  DriverInit - InitLevel2 required.
+ *
+ * Arguments:
+ *	pAC - pointer to the adapter context struct.
+ *	IoC - I/O context.
+ *	pLETab - pointer to status LE table to be initialized
+ *
+ * Returns: N/A
+ */
+void SkGeY2InitStatBmu(
+SK_AC	*pAC,			/* pointer to adapter context */
+SK_IOC	IoC,			/* I/O context */
+SK_LE_TABLE	*pLETab)	/* pointer to status LE table */
+{
+	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_INIT,
+		("==> SkGeY2InitStatBmu()\n"));
+
+	/* disable the prefetch unit */
+	SK_OUT32(IoC, STAT_CTRL, SC_STAT_RST_SET);
+	SK_OUT32(IoC, STAT_CTRL, SC_STAT_RST_CLR);
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_INIT,
+		("Base address Low: %08lX\n", pLETab->pPhyLETABLow));
+
+	/* Set the list base address */
+	SK_OUT32(IoC, STAT_LIST_ADDR_LO, pLETab->pPhyLETABLow);
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_INIT,
+		("Base address High: %08lX\n", pLETab->pPhyLETABHigh));
+
+	SK_OUT32(IoC, STAT_LIST_ADDR_HI, pLETab->pPhyLETABHigh);
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_INIT,
+		("Last index: %d\n", pLETab->Num - 1));
+
+	/* Set the list last index */
+	SK_OUT16(IoC, STAT_LAST_IDX, (SK_U16)(pLETab->Num - 1));
+
+	if (HW_FEATURE(pAC, HWF_WA_DEV_43_418)) {
+
+		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_INIT,
+			("Set Tx index threshold\n"));
+		/* WA for dev. #4.3 */
+		SK_OUT16(IoC, STAT_TX_IDX_TH, ST_TXTH_IDX_MASK);
+
+		/* set Status-FIFO watermark */
+		SK_OUT8(IoC, STAT_FIFO_WM, 0x21);		/* WA for dev. #4.18 */
+
+		/* set Status-FIFO ISR watermark */
+		SK_OUT8(IoC, STAT_FIFO_ISR_WM, 0x07);	/* WA for dev. #4.18 */
+
+		/* WA for dev. #4.3 and #4.18 */
+		/* set Status-FIFO Tx timer init value */
+		SK_OUT32(IoC, STAT_TX_TIMER_INI, HW_MS_TO_TICKS(pAC, 10));
+	}
+	else {
+		/*
+		 * Further settings may be added if required...
+		 * 1) Status-FIFO watermark (STAT_FIFO_WM, STAT_FIFO_ISR_WM)
+		 * 2) Status-FIFO timer values (STAT_TX_TIMER_INI,
+		 *		STAT_LEV_TIMER_INI and STAT_ISR_TIMER_INI)
+		 * but tests shows that the default values give the best results,
+		 * therefore the defaults are used.
+		 */
+
+		/*
+		 * Theses settings should avoid the
+		 * temporary hanging of the status BMU.
+		 * May be not all required... still under investigation...
+		 */
+		SK_OUT16(IoC, STAT_TX_IDX_TH, 0x000a);
+
+		/* set Status-FIFO watermark */
+		SK_OUT8(IoC, STAT_FIFO_WM, 0x10);
+		/* set Status-FIFO ISR watermark */
+		SK_OUT8(IoC, STAT_FIFO_ISR_WM, 0x04);
+																
+		SK_OUT32(IoC, STAT_ISR_TIMER_INI, 0x0190);
+	}
+
+	/* start Status-FIFO timer */
+	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_INIT,
+		("Start Status FiFo timer\n"));
+
+	/* enable the prefetch unit */
+	/* operational bit not functional for Yukon-EC, but fixed in Yukon-2 */
+	SK_OUT32(IoC, STAT_CTRL, SC_STAT_OP_ON);
+
+	/* start Status-FIFO timer */
+	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_INIT,
+		("Start Status FiFo timer\n"));
+
+	SK_OUT8(IoC, STAT_TX_TIMER_CTRL, TIM_START);
+	SK_OUT8(IoC, STAT_LEV_TIMER_CTRL, TIM_START);
+	SK_OUT8(IoC, STAT_ISR_TIMER_CTRL, TIM_START);
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_INIT,
+		("<== SkGeY2InitStatBmu()\n"));
+}	/* SkGeY2InitStatBmu */
+
+#ifdef USE_POLLING_UNIT
+/*****************************************************************************
+ *
+ * SkGeY2InitPollUnit() -	Initialize the Polling Unit
+ *
+ * Description:
+ *	This function will write the data of one polling LE table into the
+ *  adapter.
+ *
+ * Arguments:
+ *	pAC - pointer to the adapter context struct.
+ *	IoC - I/O context.
+ *	pLETab - pointer to polling LE table to be initialized
+ *
+ * Returns: N/A
+ */
+void SkGeY2InitPollUnit(
+SK_AC	*pAC,			/* pointer to adapter context */
+SK_IOC	IoC,			/* I/O context */
+SK_LE_TABLE	*pLETab)	/* pointer to polling LE table */
+{
+	SK_HWLE	*pLE;
+	int	i;
+#ifdef VCPU
+	VCPU_VARS();
+#endif /* VCPU */
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_INIT,
+		("==> SkGeY2InitPollUnit()\n"));
+
+#ifdef VCPU
+	for (i = 0; i < SK_MAX_MACS; i++) {
+		GET_PO_LE(pLE, pLETab, i);
+		VCPU_START_AND_COPY_LE();
+		/* initialize polling LE but leave indexes invalid */
+		POLE_SET_OPC(pLE, OP_PUTIDX | HW_OWNER);
+		POLE_SET_LINK(pLE, i);
+		POLE_SET_RXIDX(pLE, 0);
+		POLE_SET_TXAIDX(pLE, 0);
+		POLE_SET_TXSIDX(pLE, 0);
+		VCPU_WRITE_LE();
+		SK_DBG_DUMP_PO_LE(pLE);
+	}
+#endif	/* VCPU */
+
+	/* disable the polling unit */
+	SK_OUT32(IoC, POLL_CTRL, PC_POLL_RST_SET);
+	SK_OUT32(IoC, POLL_CTRL, PC_POLL_RST_CLR);
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_INIT,
+		("Base address Low: %08lX\n", pLETab->pPhyLETABLow));
+
+	/* Set the list base address */
+	SK_OUT32(IoC, POLL_LIST_ADDR_LO, pLETab->pPhyLETABLow);
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_INIT,
+		("Base address High: %08lX\n", pLETab->pPhyLETABHigh));
+
+	SK_OUT32(IoC, POLL_LIST_ADDR_HI, pLETab->pPhyLETABHigh);
+
+	/* we don't need to write the last index - it is hardwired to 1 */
+
+	/* enable the prefetch unit */
+	SK_OUT32(IoC, POLL_CTRL, PC_POLL_OP_ON);
+
+	/*
+	 * now we have to start the descriptor poll timer because it triggers
+	 * the polling unit
+	 */
+
+	/*
+	 * ;:;:
+	 * still playing with the value (timer runs at 125 MHz)
+	 * descriptor poll timer is enabled by GeInit
+	 */
+	SK_OUT32(IoC, B28_DPT_INI,
+		(SK_DPOLL_DEF_Y2 * (SK_U32)pAC->GIni.GIHstClkFact / 100));
+
+	SK_OUT8(IoC, B28_DPT_CTRL, TIM_START);
+
+	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_INIT,
+		("<== SkGeY2InitPollUnit()\n"));
+}	/* SkGeY2InitPollUnit */
+#endif	/* USE_POLLING_UNIT */
+
+
+/******************************************************************************
+ *
+ * SkGeY2SetPutIndex
+ *
+ * Description:
+ *   This function is writing the Done index of a transmit
+ *   list element table.
+ *
+ * Notes:
+ *	Dev. Issue 4.2
+ *
+ * Returns: N/A
+ */
+void SkGeY2SetPutIndex(
+SK_AC	*pAC,					/* pointer to adapter context */
+SK_IOC	IoC,					/* pointer to the IO context */
+SK_U32	StartAddrPrefetchUnit,	/* start address of the prefetch unit */
+SK_LE_TABLE	*pLETab)			/* list element table to work with */
+{
+	unsigned int Put;
+	SK_U16 EndOfListIndex;
+	SK_U16 HwGetIndex;
+	SK_U16 HwPutIndex;
+
+	/* set put index we would like to write */
+	Put = GET_PUT_IDX(pLETab);
+
+	/*
+	 * in this case we wrap around
+	 * new put is lower than last put given to hw
+	 */
+	if (Put < pLETab->HwPut) {
+
+		/* set put index = last index of list */
+		EndOfListIndex = (NUM_LE_IN_TABLE(pLETab)-1);
+
+		/* read get index of hw prefetch unit */
+		SK_IN16(IoC, (StartAddrPrefetchUnit + PREF_UNIT_GET_IDX_REG),
+			&HwGetIndex);
+
+		/* read put index of hw prefetch unit */
+		SK_IN16(IoC, (StartAddrPrefetchUnit + PREF_UNIT_PUT_IDX_REG),
+			&HwPutIndex);
+
+		/* prefetch unit reached end of list */
+		/* prefetch unit reached first list element */
+		if (HwGetIndex == 0) {
+			/* restore watermark */
+			SK_OUT8(IoC, StartAddrPrefetchUnit + PREF_UNIT_FIFO_WM_REG, 0xe0U);
+			/* write put index */
+			SK_OUT16(IoC, StartAddrPrefetchUnit + PREF_UNIT_PUT_IDX_REG,
+				(SK_U16)Put);
+
+			/* remember put index  we wrote to hw */
+			pLETab->HwPut = Put;
+		}
+		else if (HwGetIndex == EndOfListIndex) {
+			/* set watermark to one list element */
+			SK_OUT8(IoC, StartAddrPrefetchUnit + PREF_UNIT_FIFO_WM_REG, 8);
+			/* set put index to first list element */
+			SK_OUT16(IoC, StartAddrPrefetchUnit + PREF_UNIT_PUT_IDX_REG, 0);
+		}
+		/* prefetch unit did not reach end of list yet */
+		/* and we did not write put index to end of list yet */
+		else if ((HwPutIndex != EndOfListIndex) &&
+				 (HwGetIndex != EndOfListIndex)) {
+			/* write put index */
+			SK_OUT16(IoC, StartAddrPrefetchUnit + PREF_UNIT_PUT_IDX_REG,
+				EndOfListIndex);
+		}
+		else {
+			/* do nothing */
+		}
+	}
+	else {
+#ifdef XXX		/* leads in to problems in the Windows Driver */
+		if (Put != pLETab->HwPut) {
+			/* write put index */
+			SK_OUT16(IoC, StartAddrPrefetchUnit + PREF_UNIT_PUT_IDX_REG,
+				(SK_U16)Put);
+			/* update put index */
+			UPDATE_HWPUT_IDX(pLETab);
+		}
+#else
+		/* write put index */
+		SK_OUT16(IoC, StartAddrPrefetchUnit + PREF_UNIT_PUT_IDX_REG,
+			(SK_U16)Put);
+		/* update put index */
+		UPDATE_HWPUT_IDX(pLETab);
+#endif
+	}
+}	/* SkGeY2SetPutIndex */
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/tg3.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/tg3.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/tg3.c	2004-06-29 11:25:45.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/tg3.c	2004-09-05 16:01:00.000000000 +0200
@@ -1,8 +1,12 @@
 /*
  * tg3.c: Broadcom Tigon3 ethernet driver.
  *
- * Copyright (C) 2001, 2002, 2003 David S. Miller (davem@redhat.com)
+ * Copyright (C) 2001, 2002, 2003, 2004 David S. Miller (davem@redhat.com)
  * Copyright (C) 2001, 2002, 2003 Jeff Garzik (jgarzik@pobox.com)
+ * Copyright (C) 2004 Sun Microsystems Inc.
+ *
+ * Firmware is:
+ * 	Copyright (C) 2000-2003 Broadcom Corporation.
  */
 
 #include <linux/config.h>
@@ -55,8 +59,8 @@
 
 #define DRV_MODULE_NAME		"tg3"
 #define PFX DRV_MODULE_NAME	": "
-#define DRV_MODULE_VERSION	"3.6"
-#define DRV_MODULE_RELDATE	"June 12, 2004"
+#define DRV_MODULE_VERSION	"3.9"
+#define DRV_MODULE_RELDATE	"August 30, 2004"
 
 #define TG3_DEF_MAC_MODE	0
 #define TG3_DEF_RX_MODE		0
@@ -440,9 +444,14 @@ static void tg3_switch_clocks(struct tg3
 		       0x1f);
 	tp->pci_clock_ctrl = clock_ctrl;
 
-	if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705 &&
-	    GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5750 &&
-	    (orig_clock_ctrl & CLOCK_CTRL_44MHZ_CORE) != 0) {
+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 ||
+	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750) {
+		if (orig_clock_ctrl & CLOCK_CTRL_625_CORE) {
+			tw32_f(TG3PCI_CLOCK_CTRL,
+			       clock_ctrl | CLOCK_CTRL_625_CORE);
+			udelay(40);
+		}
+	} else if ((orig_clock_ctrl & CLOCK_CTRL_44MHZ_CORE) != 0) {
 		tw32_f(TG3PCI_CLOCK_CTRL,
 		     clock_ctrl |
 		     (CLOCK_CTRL_44MHZ_CORE | CLOCK_CTRL_ALTCLK));
@@ -978,7 +987,7 @@ static int tg3_set_power_state(struct tg
 		tp->link_config.orig_autoneg = tp->link_config.autoneg;
 	}
 
-	if (tp->phy_id != PHY_ID_SERDES) {
+	if (!(tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)) {
 		tp->link_config.speed = SPEED_10;
 		tp->link_config.duplex = DUPLEX_HALF;
 		tp->link_config.autoneg = AUTONEG_ENABLE;
@@ -990,7 +999,7 @@ static int tg3_set_power_state(struct tg
 	if (tp->tg3_flags & TG3_FLAG_WOL_ENABLE) {
 		u32 mac_mode;
 
-		if (tp->phy_id != PHY_ID_SERDES) {
+		if (!(tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)) {
 			tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x5a);
 			udelay(40);
 
@@ -1485,6 +1494,18 @@ static int tg3_setup_copper_phy(struct t
 	current_speed = SPEED_INVALID;
 	current_duplex = DUPLEX_INVALID;
 
+	if (tp->tg3_flags2 & TG3_FLG2_CAPACITIVE_COUPLING) {
+		u32 val;
+
+		tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x4007);
+		tg3_readphy(tp, MII_TG3_AUX_CTRL, &val);
+		if (!(val & (1 << 10))) {
+			val |= (1 << 10);
+			tg3_writephy(tp, MII_TG3_AUX_CTRL, val);
+			goto relink;
+		}
+	}
+
 	bmsr = 0;
 	for (i = 0; i < 100; i++) {
 		tg3_readphy(tp, MII_BMSR, &bmsr);
@@ -1564,7 +1585,7 @@ static int tg3_setup_copper_phy(struct t
 			tg3_setup_flow_control(tp, local_adv, remote_adv);
 		}
 	}
-
+relink:
 	if (current_link_up == 0) {
 		u32 tmp;
 
@@ -1960,152 +1981,325 @@ static int tg3_fiber_aneg_smachine(struc
 	return ret;
 }
 
-static int tg3_setup_fiber_phy(struct tg3 *tp, int force_reset)
+static int fiber_autoneg(struct tg3 *tp, u32 *flags)
 {
-	u32 orig_pause_cfg;
-	u16 orig_active_speed;
-	u8 orig_active_duplex;
-	int current_link_up;
-	int i;
+	int res = 0;
+	struct tg3_fiber_aneginfo aninfo;
+	int status = ANEG_FAILED;
+	unsigned int tick;
+	u32 tmp;
 
-	orig_pause_cfg =
-		(tp->tg3_flags & (TG3_FLAG_RX_PAUSE |
-				  TG3_FLAG_TX_PAUSE));
-	orig_active_speed = tp->link_config.active_speed;
-	orig_active_duplex = tp->link_config.active_duplex;
+	tw32_f(MAC_TX_AUTO_NEG, 0);
 
-	tp->mac_mode &= ~(MAC_MODE_PORT_MODE_MASK | MAC_MODE_HALF_DUPLEX);
-	tp->mac_mode |= MAC_MODE_PORT_MODE_TBI;
+	tmp = tp->mac_mode & ~MAC_MODE_PORT_MODE_MASK;
+	tw32_f(MAC_MODE, tmp | MAC_MODE_PORT_MODE_GMII);
+	udelay(40);
+
+	tw32_f(MAC_MODE, tp->mac_mode | MAC_MODE_SEND_CONFIGS);
+	udelay(40);
+
+	memset(&aninfo, 0, sizeof(aninfo));
+	aninfo.flags |= MR_AN_ENABLE;
+	aninfo.state = ANEG_STATE_UNKNOWN;
+	aninfo.cur_time = 0;
+	tick = 0;
+	while (++tick < 195000) {
+		status = tg3_fiber_aneg_smachine(tp, &aninfo);
+		if (status == ANEG_DONE || status == ANEG_FAILED)
+			break;
+
+		udelay(1);
+	}
+
+	tp->mac_mode &= ~MAC_MODE_SEND_CONFIGS;
 	tw32_f(MAC_MODE, tp->mac_mode);
 	udelay(40);
 
+	*flags = aninfo.flags;
+
+	if (status == ANEG_DONE &&
+	    (aninfo.flags & (MR_AN_COMPLETE | MR_LINK_OK |
+			     MR_LP_ADV_FULL_DUPLEX)))
+		res = 1;
+
+	return res;
+}
+
+static void tg3_init_bcm8002(struct tg3 *tp)
+{
+	u32 mac_status = tr32(MAC_STATUS);
+	int i;
+
 	/* Reset when initting first time or we have a link. */
-	if (!(tp->tg3_flags & TG3_FLAG_INIT_COMPLETE) ||
-	    (tr32(MAC_STATUS) & MAC_STATUS_PCS_SYNCED)) {
-		/* Set PLL lock range. */
-		tg3_writephy(tp, 0x16, 0x8007);
-
-		/* SW reset */
-		tg3_writephy(tp, MII_BMCR, BMCR_RESET);
-
-		/* Wait for reset to complete. */
-		/* XXX schedule_timeout() ... */
-		for (i = 0; i < 500; i++)
-			udelay(10);
+	if ((tp->tg3_flags & TG3_FLAG_INIT_COMPLETE) &&
+	    !(mac_status & MAC_STATUS_PCS_SYNCED))
+		return;
 
-		/* Config mode; select PMA/Ch 1 regs. */
-		tg3_writephy(tp, 0x10, 0x8411);
+	/* Set PLL lock range. */
+	tg3_writephy(tp, 0x16, 0x8007);
 
-		/* Enable auto-lock and comdet, select txclk for tx. */
-		tg3_writephy(tp, 0x11, 0x0a10);
+	/* SW reset */
+	tg3_writephy(tp, MII_BMCR, BMCR_RESET);
 
-		tg3_writephy(tp, 0x18, 0x00a0);
-		tg3_writephy(tp, 0x16, 0x41ff);
+	/* Wait for reset to complete. */
+	/* XXX schedule_timeout() ... */
+	for (i = 0; i < 500; i++)
+		udelay(10);
 
-		/* Assert and deassert POR. */
-		tg3_writephy(tp, 0x13, 0x0400);
-		udelay(40);
-		tg3_writephy(tp, 0x13, 0x0000);
+	/* Config mode; select PMA/Ch 1 regs. */
+	tg3_writephy(tp, 0x10, 0x8411);
 
-		tg3_writephy(tp, 0x11, 0x0a50);
-		udelay(40);
-		tg3_writephy(tp, 0x11, 0x0a10);
+	/* Enable auto-lock and comdet, select txclk for tx. */
+	tg3_writephy(tp, 0x11, 0x0a10);
 
-		/* Wait for signal to stabilize */
-		/* XXX schedule_timeout() ... */
-		for (i = 0; i < 15000; i++)
-			udelay(10);
+	tg3_writephy(tp, 0x18, 0x00a0);
+	tg3_writephy(tp, 0x16, 0x41ff);
 
-		/* Deselect the channel register so we can read the PHYID
-		 * later.
-		 */
-		tg3_writephy(tp, 0x10, 0x8011);
-	}
+	/* Assert and deassert POR. */
+	tg3_writephy(tp, 0x13, 0x0400);
+	udelay(40);
+	tg3_writephy(tp, 0x13, 0x0000);
 
-	/* Enable link change interrupt unless serdes polling.  */
-	if (!(tp->tg3_flags & TG3_FLAG_POLL_SERDES))
-		tw32_f(MAC_EVENT, MAC_EVENT_LNKSTATE_CHANGED);
-	else
-		tw32_f(MAC_EVENT, 0);
+	tg3_writephy(tp, 0x11, 0x0a50);
 	udelay(40);
+	tg3_writephy(tp, 0x11, 0x0a10);
 
-	current_link_up = 0;
-	if (tr32(MAC_STATUS) & MAC_STATUS_PCS_SYNCED) {
-		if (tp->link_config.autoneg == AUTONEG_ENABLE &&
-		    !(tp->tg3_flags & TG3_FLAG_GOT_SERDES_FLOWCTL)) {
-			struct tg3_fiber_aneginfo aninfo;
-			int status = ANEG_FAILED;
-			unsigned int tick;
-			u32 tmp;
+	/* Wait for signal to stabilize */
+	/* XXX schedule_timeout() ... */
+	for (i = 0; i < 15000; i++)
+		udelay(10);
 
-			memset(&aninfo, 0, sizeof(aninfo));
-			aninfo.flags |= (MR_AN_ENABLE);
+	/* Deselect the channel register so we can read the PHYID
+	 * later.
+	 */
+	tg3_writephy(tp, 0x10, 0x8011);
+}
 
-			tw32(MAC_TX_AUTO_NEG, 0);
+static int tg3_setup_fiber_hw_autoneg(struct tg3 *tp, u32 mac_status)
+{
+	u32 sg_dig_ctrl, sg_dig_status;
+	u32 serdes_cfg, expected_sg_dig_ctrl;
+	int workaround, port_a;
+	int current_link_up;
 
-			tmp = tp->mac_mode & ~MAC_MODE_PORT_MODE_MASK;
-			tw32_f(MAC_MODE, tmp | MAC_MODE_PORT_MODE_GMII);
-			udelay(40);
+	serdes_cfg = 0;
+	expected_sg_dig_ctrl = 0;
+	workaround = 0;
+	port_a = 1;
+	current_link_up = 0;
 
-			tw32_f(MAC_MODE, tp->mac_mode | MAC_MODE_SEND_CONFIGS);
-			udelay(40);
+	if (tp->pci_chip_rev_id != CHIPREV_ID_5704_A0 &&
+	    tp->pci_chip_rev_id != CHIPREV_ID_5704_A1) {
+		workaround = 1;
+		if (tr32(TG3PCI_DUAL_MAC_CTRL) & DUAL_MAC_CTRL_ID)
+			port_a = 0;
 
-			aninfo.state = ANEG_STATE_UNKNOWN;
-			aninfo.cur_time = 0;
-			tick = 0;
-			while (++tick < 195000) {
-				status = tg3_fiber_aneg_smachine(tp, &aninfo);
-				if (status == ANEG_DONE ||
-				    status == ANEG_FAILED)
-					break;
+		serdes_cfg = tr32(MAC_SERDES_CFG) &
+			((1 << 23) | (1 << 22) | (1 << 21) | (1 << 20));
+	}
+
+	sg_dig_ctrl = tr32(SG_DIG_CTRL);
 
-				udelay(1);
+	if (tp->link_config.autoneg != AUTONEG_ENABLE) {
+		if (sg_dig_ctrl & (1 << 31)) {
+			if (workaround) {
+				u32 val = serdes_cfg;
+
+				if (port_a)
+					val |= 0xc010880;
+				else
+					val |= 0x4010880;
+				tw32_f(MAC_SERDES_CFG, val);
 			}
+			tw32_f(SG_DIG_CTRL, 0x01388400);
+		}
+		if (mac_status & MAC_STATUS_PCS_SYNCED) {
+			tg3_setup_flow_control(tp, 0, 0);
+			current_link_up = 1;
+		}
+		goto out;
+	}
 
-			tp->mac_mode &= ~MAC_MODE_SEND_CONFIGS;
-			tw32_f(MAC_MODE, tp->mac_mode);
-			udelay(40);
+	/* Want auto-negotiation.  */
+	expected_sg_dig_ctrl = 0x81388400;
 
-			if (status == ANEG_DONE &&
-			    (aninfo.flags &
-			     (MR_AN_COMPLETE | MR_LINK_OK |
-			      MR_LP_ADV_FULL_DUPLEX))) {
-				u32 local_adv, remote_adv;
-
-				local_adv = ADVERTISE_PAUSE_CAP;
-				remote_adv = 0;
-				if (aninfo.flags & MR_LP_ADV_SYM_PAUSE)
-					remote_adv |= LPA_PAUSE_CAP;
-				if (aninfo.flags & MR_LP_ADV_ASYM_PAUSE)
-					remote_adv |= LPA_PAUSE_ASYM;
+	/* Pause capability */
+	expected_sg_dig_ctrl |= (1 << 11);
 
-				tg3_setup_flow_control(tp, local_adv, remote_adv);
+	/* Asymettric pause */
+	expected_sg_dig_ctrl |= (1 << 12);
 
-				tp->tg3_flags |=
-					TG3_FLAG_GOT_SERDES_FLOWCTL;
-				current_link_up = 1;
-			}
-			for (i = 0; i < 60; i++) {
-				udelay(20);
-				tw32_f(MAC_STATUS,
-				     (MAC_STATUS_SYNC_CHANGED |
-				      MAC_STATUS_CFG_CHANGED));
+	if (sg_dig_ctrl != expected_sg_dig_ctrl) {
+		if (workaround)
+			tw32_f(MAC_SERDES_CFG, serdes_cfg | 0xc011880);
+		tw32_f(SG_DIG_CTRL, expected_sg_dig_ctrl | (1 << 30));
+		udelay(5);
+		tw32_f(SG_DIG_CTRL, expected_sg_dig_ctrl);
+
+		tp->tg3_flags2 |= TG3_FLG2_PHY_JUST_INITTED;
+	} else if (mac_status & (MAC_STATUS_PCS_SYNCED |
+				 MAC_STATUS_SIGNAL_DET)) {
+		sg_dig_status = tr32(SG_DIG_STATUS);
+
+		if ((sg_dig_status & (1 << 1)) &&
+		    (mac_status & MAC_STATUS_PCS_SYNCED)) {
+			u32 local_adv, remote_adv;
+
+			local_adv = ADVERTISE_PAUSE_CAP;
+			remote_adv = 0;
+			if (sg_dig_status & (1 << 19))
+				remote_adv |= LPA_PAUSE_CAP;
+			if (sg_dig_status & (1 << 20))
+				remote_adv |= LPA_PAUSE_ASYM;
+
+			tg3_setup_flow_control(tp, local_adv, remote_adv);
+			current_link_up = 1;
+			tp->tg3_flags2 &= ~TG3_FLG2_PHY_JUST_INITTED;
+		} else if (!(sg_dig_status & (1 << 1))) {
+			if (tp->tg3_flags2 & TG3_FLG2_PHY_JUST_INITTED)
+				tp->tg3_flags2 &= ~TG3_FLG2_PHY_JUST_INITTED;
+			else {
+				if (workaround) {
+					u32 val = serdes_cfg;
+
+					if (port_a)
+						val |= 0xc010880;
+					else
+						val |= 0x4010880;
+
+					tw32_f(MAC_SERDES_CFG, serdes_cfg);
+				}
+
+				tw32_f(SG_DIG_CTRL, 0x01388400);
 				udelay(40);
-				if ((tr32(MAC_STATUS) &
-				     (MAC_STATUS_SYNC_CHANGED |
-				      MAC_STATUS_CFG_CHANGED)) == 0)
-					break;
-			}
-			if (current_link_up == 0 &&
-			    (tr32(MAC_STATUS) & MAC_STATUS_PCS_SYNCED)) {
-				current_link_up = 1;
+
+				mac_status = tr32(MAC_STATUS);
+				if (mac_status & MAC_STATUS_PCS_SYNCED) {
+					tg3_setup_flow_control(tp, 0, 0);
+					current_link_up = 1;
+				}
 			}
-		} else {
-			/* Forcing 1000FD link up. */
+		}
+	}
+
+out:
+	return current_link_up;
+}
+
+static int tg3_setup_fiber_by_hand(struct tg3 *tp, u32 mac_status)
+{
+	int current_link_up = 0;
+
+ 	if (!(mac_status & MAC_STATUS_PCS_SYNCED)) {
+		tp->tg3_flags &= ~TG3_FLAG_GOT_SERDES_FLOWCTL;
+		goto out;
+	}
+
+	if (tp->link_config.autoneg == AUTONEG_ENABLE) {
+		u32 flags;
+		int i;
+  
+		if (fiber_autoneg(tp, &flags)) {
+			u32 local_adv, remote_adv;
+
+			local_adv = ADVERTISE_PAUSE_CAP;
+			remote_adv = 0;
+			if (flags & MR_LP_ADV_SYM_PAUSE)
+				remote_adv |= LPA_PAUSE_CAP;
+			if (flags & MR_LP_ADV_ASYM_PAUSE)
+				remote_adv |= LPA_PAUSE_ASYM;
+
+			tg3_setup_flow_control(tp, local_adv, remote_adv);
+
+			tp->tg3_flags |= TG3_FLAG_GOT_SERDES_FLOWCTL;
 			current_link_up = 1;
 		}
+		for (i = 0; i < 30; i++) {
+			udelay(20);
+			tw32_f(MAC_STATUS,
+			       (MAC_STATUS_SYNC_CHANGED |
+				MAC_STATUS_CFG_CHANGED));
+			udelay(40);
+			if ((tr32(MAC_STATUS) &
+			     (MAC_STATUS_SYNC_CHANGED |
+			      MAC_STATUS_CFG_CHANGED)) == 0)
+				break;
+		}
+
+		mac_status = tr32(MAC_STATUS);
+		if (current_link_up == 0 &&
+		    (mac_status & MAC_STATUS_PCS_SYNCED) &&
+		    !(mac_status & MAC_STATUS_RCVD_CFG))
+			current_link_up = 1;
+	} else {
+		/* Forcing 1000FD link up. */
+		current_link_up = 1;
+		tp->tg3_flags |= TG3_FLAG_GOT_SERDES_FLOWCTL;
+
+		tw32_f(MAC_MODE, (tp->mac_mode | MAC_MODE_SEND_CONFIGS));
+		udelay(40);
+	}
+
+out:
+	return current_link_up;
+}
+
+static int tg3_setup_fiber_phy(struct tg3 *tp, int force_reset)
+{
+	u32 orig_pause_cfg;
+	u16 orig_active_speed;
+	u8 orig_active_duplex;
+	u32 mac_status;
+	int current_link_up;
+	int i;
+
+	orig_pause_cfg =
+		(tp->tg3_flags & (TG3_FLAG_RX_PAUSE |
+				  TG3_FLAG_TX_PAUSE));
+	orig_active_speed = tp->link_config.active_speed;
+	orig_active_duplex = tp->link_config.active_duplex;
+
+	if (!(tp->tg3_flags2 & TG3_FLG2_HW_AUTONEG) &&
+	    netif_carrier_ok(tp->dev) &&
+	    (tp->tg3_flags & TG3_FLAG_INIT_COMPLETE)) {
+		mac_status = tr32(MAC_STATUS);
+		mac_status &= (MAC_STATUS_PCS_SYNCED |
+			       MAC_STATUS_SIGNAL_DET |
+			       MAC_STATUS_CFG_CHANGED |
+			       MAC_STATUS_RCVD_CFG);
+		if (mac_status == (MAC_STATUS_PCS_SYNCED |
+				   MAC_STATUS_SIGNAL_DET)) {
+			tw32_f(MAC_STATUS, (MAC_STATUS_SYNC_CHANGED |
+					    MAC_STATUS_CFG_CHANGED));
+			return 0;
+		}
 	}
 
+	tw32_f(MAC_TX_AUTO_NEG, 0);
+
+	tp->mac_mode &= ~(MAC_MODE_PORT_MODE_MASK | MAC_MODE_HALF_DUPLEX);
+	tp->mac_mode |= MAC_MODE_PORT_MODE_TBI;
+	tw32_f(MAC_MODE, tp->mac_mode);
+	udelay(40);
+
+	if (tp->phy_id == PHY_ID_BCM8002)
+		tg3_init_bcm8002(tp);
+
+	/* Enable link change interrupt unless serdes polling.  */
+	if (!(tp->tg3_flags & TG3_FLAG_POLL_SERDES))
+		tw32_f(MAC_EVENT, MAC_EVENT_LNKSTATE_CHANGED);
+	else
+		tw32_f(MAC_EVENT, 0);
+	udelay(40);
+
+	current_link_up = 0;
+	mac_status = tr32(MAC_STATUS);
+
+	if (tp->tg3_flags2 & TG3_FLG2_HW_AUTONEG)
+		current_link_up = tg3_setup_fiber_hw_autoneg(tp, mac_status);
+	else
+		current_link_up = tg3_setup_fiber_by_hand(tp, mac_status);
+
 	tp->mac_mode &= ~MAC_MODE_LINK_POLARITY;
 	tw32_f(MAC_MODE, tp->mac_mode);
 	udelay(40);
@@ -2115,19 +2309,24 @@ static int tg3_setup_fiber_phy(struct tg
 		 (tp->hw_status->status & ~SD_STATUS_LINK_CHG));
 
 	for (i = 0; i < 100; i++) {
-		udelay(20);
-		tw32_f(MAC_STATUS,
-		     (MAC_STATUS_SYNC_CHANGED |
-		      MAC_STATUS_CFG_CHANGED));
-		udelay(40);
-		if ((tr32(MAC_STATUS) &
-		     (MAC_STATUS_SYNC_CHANGED |
-		      MAC_STATUS_CFG_CHANGED)) == 0)
+		tw32_f(MAC_STATUS, (MAC_STATUS_SYNC_CHANGED |
+				    MAC_STATUS_CFG_CHANGED));
+		udelay(5);
+		if ((tr32(MAC_STATUS) & (MAC_STATUS_SYNC_CHANGED |
+					 MAC_STATUS_CFG_CHANGED)) == 0)
 			break;
 	}
 
-	if ((tr32(MAC_STATUS) & MAC_STATUS_PCS_SYNCED) == 0)
+	mac_status = tr32(MAC_STATUS);
+	if ((mac_status & MAC_STATUS_PCS_SYNCED) == 0) {
 		current_link_up = 0;
+		if (tp->link_config.autoneg == AUTONEG_ENABLE) {
+			tw32_f(MAC_MODE, (tp->mac_mode |
+					  MAC_MODE_SEND_CONFIGS));
+			udelay(1);
+			tw32_f(MAC_MODE, tp->mac_mode);
+		}
+	}
 
 	if (current_link_up == 1) {
 		tp->link_config.active_speed = SPEED_1000;
@@ -2159,15 +2358,6 @@ static int tg3_setup_fiber_phy(struct tg
 			tg3_link_report(tp);
 	}
 
-	if ((tr32(MAC_STATUS) & MAC_STATUS_PCS_SYNCED) == 0) {
-		tw32_f(MAC_MODE, tp->mac_mode | MAC_MODE_LINK_POLARITY);
-		udelay(40);
-		if (tp->tg3_flags & TG3_FLAG_INIT_COMPLETE) {
-			tw32_f(MAC_MODE, tp->mac_mode);
-			udelay(40);
-		}
-	}
-
 	return 0;
 }
 
@@ -2175,7 +2365,7 @@ static int tg3_setup_phy(struct tg3 *tp,
 {
 	int err;
 
-	if (tp->phy_id == PHY_ID_SERDES) {
+	if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES) {
 		err = tg3_setup_fiber_phy(tp, force_reset);
 	} else {
 		err = tg3_setup_copper_phy(tp, force_reset);
@@ -2411,6 +2601,11 @@ static int tg3_rx(struct tg3 *tp, int bu
 	int received;
 
 	hw_idx = tp->hw_status->idx[0].rx_producer;
+	/*
+	 * We need to order the read of hw_idx and the read of
+	 * the opaque cookie.
+	 */
+	rmb();
 	sw_idx = rx_rcb_ptr % TG3_RX_RCB_RING_SIZE(tp);
 	work_mask = 0;
 	received = 0;
@@ -2688,11 +2883,11 @@ static void tg3_reset_task(void *_data)
 	tg3_halt(tp);
 	tg3_init_hw(tp);
 
+	tg3_netif_start(tp);
+
 	spin_unlock(&tp->tx_lock);
 	spin_unlock_irq(&tp->lock);
 
-	tg3_netif_start(tp);
-
 	if (restart_timer)
 		mod_timer(&tp->timer, jiffies + 1);
 }
@@ -2809,11 +3004,10 @@ static inline int tg3_4g_overflow_test(d
 	u32 base = (u32) mapping & 0xffffffff;
 
 	return ((base > 0xffffdcc0) &&
-		((u64) mapping >> 32) == 0 &&
 		(base + len + 8 < base));
 }
 
-static int tg3_start_xmit_4gbug(struct sk_buff *skb, struct net_device *dev)
+static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
 	struct tg3 *tp = netdev_priv(dev);
 	dma_addr_t mapping;
@@ -3017,165 +3211,6 @@ out_unlock:
 	return 0;
 }
 
-static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
-{
-	struct tg3 *tp = netdev_priv(dev);
-	dma_addr_t mapping;
-	u32 len, entry, base_flags, mss;
-	unsigned long flags;
-
-	len = skb_headlen(skb);
-
-	/* No BH disabling for tx_lock here.  We are running in BH disabled
-	 * context and TX reclaim runs via tp->poll inside of a software
-	 * interrupt.  Rejoice!
-	 *
-	 * Actually, things are not so simple.  If we are to take a hw
-	 * IRQ here, we can deadlock, consider:
-	 *
-	 *       CPU1		CPU2
-	 *   tg3_start_xmit
-	 *   take tp->tx_lock
-	 *			tg3_timer
-	 *			take tp->lock
-	 *   tg3_interrupt
-	 *   spin on tp->lock
-	 *			spin on tp->tx_lock
-	 *
-	 * So we really do need to disable interrupts when taking
-	 * tx_lock here.
-	 */
-	spin_lock_irqsave(&tp->tx_lock, flags);
-
-	/* This is a hard error, log it. */
-	if (unlikely(TX_BUFFS_AVAIL(tp) <= (skb_shinfo(skb)->nr_frags + 1))) {
-		netif_stop_queue(dev);
-		spin_unlock_irqrestore(&tp->tx_lock, flags);
-		printk(KERN_ERR PFX "%s: BUG! Tx Ring full when queue awake!\n",
-		       dev->name);
-		return 1;
-	}
-
-	entry = tp->tx_prod;
-	base_flags = 0;
-	if (skb->ip_summed == CHECKSUM_HW)
-		base_flags |= TXD_FLAG_TCPUDP_CSUM;
-#if TG3_TSO_SUPPORT != 0
-	mss = 0;
-	if (skb->len > (tp->dev->mtu + ETH_HLEN) &&
-	    (mss = skb_shinfo(skb)->tso_size) != 0) {
-		int tcp_opt_len, ip_tcp_len;
-
-		tcp_opt_len = ((skb->h.th->doff - 5) * 4);
-		ip_tcp_len = (skb->nh.iph->ihl * 4) + sizeof(struct tcphdr);
-
-		base_flags |= (TXD_FLAG_CPU_PRE_DMA |
-			       TXD_FLAG_CPU_POST_DMA);
-
-		skb->nh.iph->check = 0;
-		skb->nh.iph->tot_len = ntohs(mss + ip_tcp_len + tcp_opt_len);
-		skb->h.th->check = ~csum_tcpudp_magic(skb->nh.iph->saddr,
-						      skb->nh.iph->daddr,
-						      0, IPPROTO_TCP, 0);
-
-		if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) {
-			if (tcp_opt_len || skb->nh.iph->ihl > 5) {
-				int tsflags;
-
-				tsflags = ((skb->nh.iph->ihl - 5) +
-					   (tcp_opt_len >> 2));
-				mss |= (tsflags << 11);
-			}
-		} else {
-			if (tcp_opt_len || skb->nh.iph->ihl > 5) {
-				int tsflags;
-
-				tsflags = ((skb->nh.iph->ihl - 5) +
-					   (tcp_opt_len >> 2));
-				base_flags |= tsflags << 12;
-			}
-		}
-	}
-#else
-	mss = 0;
-#endif
-#if TG3_VLAN_TAG_USED
-	if (tp->vlgrp != NULL && vlan_tx_tag_present(skb))
-		base_flags |= (TXD_FLAG_VLAN |
-			       (vlan_tx_tag_get(skb) << 16));
-#endif
-
-	/* Queue skb data, a.k.a. the main skb fragment. */
-	mapping = pci_map_single(tp->pdev, skb->data, len, PCI_DMA_TODEVICE);
-
-	tp->tx_buffers[entry].skb = skb;
-	pci_unmap_addr_set(&tp->tx_buffers[entry], mapping, mapping);
-
-	tg3_set_txd(tp, entry, mapping, len, base_flags,
-		    (skb_shinfo(skb)->nr_frags == 0) | (mss << 1));
-
-	entry = NEXT_TX(entry);
-
-	/* Now loop through additional data fragments, and queue them. */
-	if (skb_shinfo(skb)->nr_frags > 0) {
-		unsigned int i, last;
-
-		last = skb_shinfo(skb)->nr_frags - 1;
-		for (i = 0; i <= last; i++) {
-			skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
-
-
-			len = frag->size;
-			mapping = pci_map_page(tp->pdev,
-					       frag->page,
-					       frag->page_offset,
-					       len, PCI_DMA_TODEVICE);
-
-			tp->tx_buffers[entry].skb = NULL;
-			pci_unmap_addr_set(&tp->tx_buffers[entry], mapping, mapping);
-
-			if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750)
-				tg3_set_txd(tp, entry, mapping, len,
-					    base_flags, (i == last)|(mss << 1));
-			else
-				tg3_set_txd(tp, entry, mapping, len,
-					    base_flags, (i == last));
-
-			entry = NEXT_TX(entry);
-		}
-	}
-
-	/* Packets are ready, update Tx producer idx local and on card.
-	 * We know this is not a 5700 (by virtue of not being a chip
-	 * requiring the 4GB overflow workaround) so we can safely omit
-	 * the double-write bug tests.
-	 */
-	if (tp->tg3_flags & TG3_FLAG_HOST_TXDS) {
-		tw32_tx_mbox((MAILBOX_SNDHOST_PROD_IDX_0 +
-			      TG3_64BIT_REG_LOW), entry);
-	} else {
-		/* First, make sure tg3 sees last descriptor fully
-		 * in SRAM.
-		 */
-		if (tp->tg3_flags & TG3_FLAG_MBOX_WRITE_REORDER)
-			tr32(MAILBOX_SNDNIC_PROD_IDX_0 +
-			     TG3_64BIT_REG_LOW);
-
-		tw32_tx_mbox((MAILBOX_SNDNIC_PROD_IDX_0 +
-			      TG3_64BIT_REG_LOW), entry);
-	}
-
-	tp->tx_prod = entry;
-	if (TX_BUFFS_AVAIL(tp) <= (MAX_SKB_FRAGS + 1))
-		netif_stop_queue(dev);
-
-	spin_unlock_irqrestore(&tp->tx_lock, flags);
-
-	dev->trans_start = jiffies;
-
-	return 0;
-}
-
 static inline void tg3_set_mtu(struct net_device *dev, struct tg3 *tp,
 			       int new_mtu)
 {
@@ -3212,9 +3247,10 @@ static int tg3_change_mtu(struct net_dev
 
 	tg3_init_hw(tp);
 
+	tg3_netif_start(tp);
+
 	spin_unlock(&tp->tx_lock);
 	spin_unlock_irq(&tp->lock);
-	tg3_netif_start(tp);
 
 	return 0;
 }
@@ -3705,6 +3741,8 @@ static void tg3_write_sig_legacy(struct 
 	}
 }
 
+static void tg3_stop_fw(struct tg3 *);
+
 /* tp->lock is held. */
 static int tg3_chip_reset(struct tg3 *tp)
 {
@@ -3745,9 +3783,25 @@ static int tg3_chip_reset(struct tg3 *tp
 	/* restore 5701 hardware bug workaround flag */
 	tp->tg3_flags = flags_save;
 
+	/* Unfortunately, we have to delay before the PCI read back.
+	 * Some 575X chips even will not respond to a PCI cfg access
+	 * when the reset command is given to the chip.
+	 *
+	 * How do these hardware designers expect things to work
+	 * properly if the PCI write is posted for a long period
+	 * of time?  It is always necessary to have some method by
+	 * which a register read back can occur to push the write
+	 * out which does the reset.
+	 *
+	 * For most tg3 variants the trick below was working.
+	 * Ho hum...
+	 */
+	udelay(120);
+
 	/* Flush PCI posted writes.  The normal MMIO registers
 	 * are inaccessible at this time so this is the only
-	 * way to make this reliably.  I tried to use indirect
+	 * way to make this reliably (actually, this is no longer
+	 * the case, see above).  I tried to use indirect
 	 * register read/write but this upset some 5701 variants.
 	 */
 	pci_read_config_dword(tp->pdev, PCI_COMMAND, &val);
@@ -3791,6 +3845,11 @@ static int tg3_chip_reset(struct tg3 *tp
 
 	tw32(MEMARB_MODE, MEMARB_MODE_ENABLE);
 
+	if (tp->pci_chip_rev_id == CHIPREV_ID_5750_A3) {
+		tg3_stop_fw(tp);
+		tw32(0x5000, 0x400);
+	}
+
 	tw32(GRC_MODE, tp->grc_mode);
 
 	if (tp->pci_chip_rev_id == CHIPREV_ID_5705_A0) {
@@ -3807,7 +3866,7 @@ static int tg3_chip_reset(struct tg3 *tp
 		tw32(TG3PCI_CLOCK_CTRL, tp->pci_clock_ctrl);
 	}
 
-	if (tp->phy_id == PHY_ID_SERDES) {
+	if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES) {
 		tp->mac_mode = MAC_MODE_PORT_MODE_TBI;
 		tw32_f(MAC_MODE, tp->mac_mode);
 	} else
@@ -5337,14 +5396,14 @@ static int tg3_reset_hw(struct tg3 *tp)
 	tw32(MAC_LED_CTRL, tp->led_ctrl);
 
 	tw32(MAC_MI_STAT, MAC_MI_STAT_LNKSTAT_ATTN_ENAB);
-	if (tp->phy_id == PHY_ID_SERDES) {
+	if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES) {
 		tw32_f(MAC_RX_MODE, RX_MODE_RESET);
 		udelay(10);
 	}
 	tw32_f(MAC_RX_MODE, tp->rx_mode);
 	udelay(10);
 
-	if (tp->phy_id == PHY_ID_SERDES) {
+	if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES) {
 		if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) {
 			/* Set drive transmission level to 1.2V  */
 			val = tr32(MAC_SERDES_CFG);
@@ -5361,11 +5420,17 @@ static int tg3_reset_hw(struct tg3 *tp)
 	 */
 	tw32_f(MAC_LOW_WMARK_MAX_RX_FRAME, 2);
 
+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704 &&
+	    (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)) {
+		/* Use hardware link auto-negotiation */
+		tp->tg3_flags2 |= TG3_FLG2_HW_AUTONEG;
+	}
+
 	err = tg3_setup_phy(tp, 1);
 	if (err)
 		return err;
 
-	if (tp->phy_id != PHY_ID_SERDES) {
+	if (!(tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)) {
 		u32 tmp;
 
 		/* Clear CRC stats. */
@@ -5557,7 +5622,8 @@ static void tg3_timer(unsigned long __op
 				need_setup = 1;
 			}
 			if (! netif_carrier_ok(tp->dev) &&
-			    (mac_stat & MAC_STATUS_PCS_SYNCED)) {
+			    (mac_stat & (MAC_STATUS_PCS_SYNCED |
+					 MAC_STATUS_SIGNAL_DET))) {
 				need_setup = 1;
 			}
 			if (need_setup) {
@@ -5953,7 +6019,7 @@ static unsigned long calc_crc_errors(str
 {
 	struct tg3_hw_stats *hw_stats = tp->hw_stats;
 
-	if (tp->phy_id != PHY_ID_SERDES &&
+	if (!(tp->tg3_flags2 & TG3_FLG2_PHY_SERDES) &&
 	    (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 ||
 	     GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701)) {
 		unsigned long flags;
@@ -6384,7 +6450,7 @@ static int tg3_get_settings(struct net_d
 		cmd->supported |= (SUPPORTED_1000baseT_Half |
 				   SUPPORTED_1000baseT_Full);
 
-	if (tp->phy_id != PHY_ID_SERDES)
+	if (!(tp->tg3_flags2 & TG3_FLG2_PHY_SERDES))
 		cmd->supported |= (SUPPORTED_100baseT_Half |
 				  SUPPORTED_100baseT_Full |
 				  SUPPORTED_10baseT_Half |
@@ -6413,7 +6479,7 @@ static int tg3_set_settings(struct net_d
 	    tp->link_config.phy_is_low_power)
 		return -EAGAIN;
 
-	if (tp->phy_id == PHY_ID_SERDES) {
+	if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES) {
 		/* These are the only valid advertisement bits allowed.  */
 		if (cmd->autoneg == AUTONEG_ENABLE &&
 		    (cmd->advertising & ~(ADVERTISED_1000baseT_Half |
@@ -6471,7 +6537,7 @@ static int tg3_set_wol(struct net_device
 	if (wol->wolopts & ~WAKE_MAGIC)
 		return -EINVAL;
 	if ((wol->wolopts & WAKE_MAGIC) &&
-	    tp->phy_id == PHY_ID_SERDES &&
+	    tp->tg3_flags2 & TG3_FLG2_PHY_SERDES &&
 	    !(tp->tg3_flags & TG3_FLAG_SERDES_WOL_CAP))
 		return -EINVAL;
   
@@ -6567,10 +6633,9 @@ static int tg3_set_ringparam(struct net_
 
 	tg3_halt(tp);
 	tg3_init_hw(tp);
-	netif_wake_queue(tp->dev);
+	tg3_netif_start(tp);
 	spin_unlock(&tp->tx_lock);
 	spin_unlock_irq(&tp->lock);
-	tg3_netif_start(tp);
   
 	return 0;
 }
@@ -6605,9 +6670,9 @@ static int tg3_set_pauseparam(struct net
 		tp->tg3_flags &= ~TG3_FLAG_PAUSE_TX;
 	tg3_halt(tp);
 	tg3_init_hw(tp);
+	tg3_netif_start(tp);
 	spin_unlock(&tp->tx_lock);
 	spin_unlock_irq(&tp->lock);
-	tg3_netif_start(tp);
   
 	return 0;
 }
@@ -6694,6 +6759,9 @@ static int tg3_ioctl(struct net_device *
 	case SIOCGMIIREG: {
 		u32 mii_regval;
 
+		if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)
+			break;			/* We have no PHY */
+
 		spin_lock_irq(&tp->lock);
 		err = tg3_readphy(tp, data->reg_num & 0x1f, &mii_regval);
 		spin_unlock_irq(&tp->lock);
@@ -6704,6 +6772,9 @@ static int tg3_ioctl(struct net_device *
 	}
 
 	case SIOCSMIIREG:
+		if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)
+			break;			/* We have no PHY */
+
 		if (!capable(CAP_NET_ADMIN))
 			return -EPERM;
 
@@ -6938,10 +7009,10 @@ static struct subsys_tbl_ent subsys_id_t
 	{ PCI_VENDOR_ID_BROADCOM, 0x1644, PHY_ID_BCM5401 }, /* BCM95700A6 */
 	{ PCI_VENDOR_ID_BROADCOM, 0x0001, PHY_ID_BCM5701 }, /* BCM95701A5 */
 	{ PCI_VENDOR_ID_BROADCOM, 0x0002, PHY_ID_BCM8002 }, /* BCM95700T6 */
-	{ PCI_VENDOR_ID_BROADCOM, 0x0003, PHY_ID_SERDES  }, /* BCM95700A9 */
+	{ PCI_VENDOR_ID_BROADCOM, 0x0003, 0 },		    /* BCM95700A9 */
 	{ PCI_VENDOR_ID_BROADCOM, 0x0005, PHY_ID_BCM5701 }, /* BCM95701T1 */
 	{ PCI_VENDOR_ID_BROADCOM, 0x0006, PHY_ID_BCM5701 }, /* BCM95701T8 */
-	{ PCI_VENDOR_ID_BROADCOM, 0x0007, PHY_ID_SERDES  }, /* BCM95701A7 */
+	{ PCI_VENDOR_ID_BROADCOM, 0x0007, 0 },		    /* BCM95701A7 */
 	{ PCI_VENDOR_ID_BROADCOM, 0x0008, PHY_ID_BCM5701 }, /* BCM95701A10 */
 	{ PCI_VENDOR_ID_BROADCOM, 0x8008, PHY_ID_BCM5701 }, /* BCM95701A12 */
 	{ PCI_VENDOR_ID_BROADCOM, 0x0009, PHY_ID_BCM5703 }, /* BCM95703Ax1 */
@@ -6950,7 +7021,7 @@ static struct subsys_tbl_ent subsys_id_t
 	/* 3com boards. */
 	{ PCI_VENDOR_ID_3COM, 0x1000, PHY_ID_BCM5401 }, /* 3C996T */
 	{ PCI_VENDOR_ID_3COM, 0x1006, PHY_ID_BCM5701 }, /* 3C996BT */
-	{ PCI_VENDOR_ID_3COM, 0x1004, PHY_ID_SERDES  }, /* 3C996SX */
+	{ PCI_VENDOR_ID_3COM, 0x1004, 0 },		/* 3C996SX */
 	{ PCI_VENDOR_ID_3COM, 0x1007, PHY_ID_BCM5701 }, /* 3C1000T */
 	{ PCI_VENDOR_ID_3COM, 0x1008, PHY_ID_BCM5701 }, /* 3C940BR01 */
 
@@ -6963,37 +7034,43 @@ static struct subsys_tbl_ent subsys_id_t
 	/* Compaq boards. */
 	{ PCI_VENDOR_ID_COMPAQ, 0x007c, PHY_ID_BCM5701 }, /* BANSHEE */
 	{ PCI_VENDOR_ID_COMPAQ, 0x009a, PHY_ID_BCM5701 }, /* BANSHEE_2 */
-	{ PCI_VENDOR_ID_COMPAQ, 0x007d, PHY_ID_SERDES  }, /* CHANGELING */
+	{ PCI_VENDOR_ID_COMPAQ, 0x007d, 0 },		  /* CHANGELING */
 	{ PCI_VENDOR_ID_COMPAQ, 0x0085, PHY_ID_BCM5701 }, /* NC7780 */
 	{ PCI_VENDOR_ID_COMPAQ, 0x0099, PHY_ID_BCM5701 }, /* NC7780_2 */
 
 	/* IBM boards. */
-	{ PCI_VENDOR_ID_IBM, 0x0281, PHY_ID_SERDES } /* IBM??? */
+	{ PCI_VENDOR_ID_IBM, 0x0281, 0 } /* IBM??? */
 };
 
-static int __devinit tg3_phy_probe(struct tg3 *tp)
+static inline struct subsys_tbl_ent *lookup_by_subsys(struct tg3 *tp)
 {
-	u32 eeprom_phy_id, hw_phy_id_1, hw_phy_id_2;
-	u32 hw_phy_id, hw_phy_id_masked;
-	u32 val;
-	int i, eeprom_signature_found, err;
+	int i;
 
-	tp->phy_id = PHY_ID_INVALID;
 	for (i = 0; i < ARRAY_SIZE(subsys_id_to_phy_id); i++) {
 		if ((subsys_id_to_phy_id[i].subsys_vendor ==
 		     tp->pdev->subsystem_vendor) &&
 		    (subsys_id_to_phy_id[i].subsys_devid ==
-		     tp->pdev->subsystem_device)) {
-			tp->phy_id = subsys_id_to_phy_id[i].phy_id;
-			break;
-		}
+		     tp->pdev->subsystem_device))
+			return &subsys_id_to_phy_id[i];
 	}
+	return NULL;
+}
+
+static int __devinit tg3_phy_probe(struct tg3 *tp)
+{
+	u32 eeprom_phy_id, hw_phy_id_1, hw_phy_id_2;
+	u32 hw_phy_id, hw_phy_id_masked;
+	u32 val;
+	int eeprom_signature_found, eeprom_phy_serdes, err;
 
+	tp->phy_id = PHY_ID_INVALID;
 	eeprom_phy_id = PHY_ID_INVALID;
+	eeprom_phy_serdes = 0;
 	eeprom_signature_found = 0;
 	tg3_read_mem(tp, NIC_SRAM_DATA_SIG, &val);
 	if (val == NIC_SRAM_DATA_SIG_MAGIC) {
 		u32 nic_cfg, led_cfg;
+		u32 nic_phy_id, cfg2;
 
 		tg3_read_mem(tp, NIC_SRAM_DATA_CFG, &nic_cfg);
 		tp->nic_sram_data_cfg = nic_cfg;
@@ -7001,21 +7078,19 @@ static int __devinit tg3_phy_probe(struc
 		eeprom_signature_found = 1;
 
 		if ((nic_cfg & NIC_SRAM_DATA_CFG_PHY_TYPE_MASK) ==
-		    NIC_SRAM_DATA_CFG_PHY_TYPE_FIBER) {
-			eeprom_phy_id = PHY_ID_SERDES;
-		} else {
-			u32 nic_phy_id;
+		    NIC_SRAM_DATA_CFG_PHY_TYPE_FIBER)
+			eeprom_phy_serdes = 1;
 
-			tg3_read_mem(tp, NIC_SRAM_DATA_PHY_ID, &nic_phy_id);
-			if (nic_phy_id != 0) {
-				u32 id1 = nic_phy_id & NIC_SRAM_DATA_PHY_ID1_MASK;
-				u32 id2 = nic_phy_id & NIC_SRAM_DATA_PHY_ID2_MASK;
-
-				eeprom_phy_id  = (id1 >> 16) << 10;
-				eeprom_phy_id |= (id2 & 0xfc00) << 16;
-				eeprom_phy_id |= (id2 & 0x03ff) <<  0;
-			}
-		}
+		tg3_read_mem(tp, NIC_SRAM_DATA_PHY_ID, &nic_phy_id);
+		if (nic_phy_id != 0) {
+			u32 id1 = nic_phy_id & NIC_SRAM_DATA_PHY_ID1_MASK;
+			u32 id2 = nic_phy_id & NIC_SRAM_DATA_PHY_ID2_MASK;
+
+			eeprom_phy_id  = (id1 >> 16) << 10;
+			eeprom_phy_id |= (id2 & 0xfc00) << 16;
+			eeprom_phy_id |= (id2 & 0x03ff) <<  0;
+		} else
+			eeprom_phy_id = 0;
 
 		if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750) {
 			tg3_read_mem(tp, NIC_SRAM_DATA_CFG_2, &led_cfg);
@@ -7077,6 +7152,10 @@ static int __devinit tg3_phy_probe(struc
 		}
 		if (nic_cfg & NIC_SRAM_DATA_CFG_FIBER_WOL)
 			tp->tg3_flags |= TG3_FLAG_SERDES_WOL_CAP;
+
+		tg3_read_mem(tp, NIC_SRAM_DATA_PHY_ID, &cfg2);
+		if (cfg2 & (1 << 17))
+			tp->tg3_flags2 |= TG3_FLG2_CAPACITIVE_COUPLING;
 	}
 
 	/* Reading the PHY ID register can conflict with ASF
@@ -7103,20 +7182,31 @@ static int __devinit tg3_phy_probe(struc
 
 	if (!err && KNOWN_PHY_ID(hw_phy_id_masked)) {
 		tp->phy_id = hw_phy_id;
+		if (hw_phy_id_masked == PHY_ID_BCM8002)
+			tp->tg3_flags2 |= TG3_FLG2_PHY_SERDES;
 	} else {
-		/* phy_id currently holds the value found in the
-		 * subsys_id_to_phy_id[] table or PHY_ID_INVALID
-		 * if a match was not found there.
-		 */
-		if (tp->phy_id == PHY_ID_INVALID) {
-			if (!eeprom_signature_found ||
-			    !KNOWN_PHY_ID(eeprom_phy_id & PHY_ID_MASK))
-				return -ENODEV;
+		if (eeprom_signature_found) {
 			tp->phy_id = eeprom_phy_id;
+			if (eeprom_phy_serdes)
+				tp->tg3_flags2 |= TG3_FLG2_PHY_SERDES;
+		} else {
+			struct subsys_tbl_ent *p;
+
+			/* No eeprom signature?  Try the hardcoded
+			 * subsys device table.
+			 */
+			p = lookup_by_subsys(tp);
+			if (!p)
+				return -ENODEV;
+
+			tp->phy_id = p->phy_id;
+			if (!tp->phy_id ||
+			    tp->phy_id == PHY_ID_BCM8002)
+				tp->tg3_flags2 |= TG3_FLG2_PHY_SERDES;
 		}
 	}
 
-	if (tp->phy_id != PHY_ID_SERDES &&
+	if (!(tp->tg3_flags2 & TG3_FLG2_PHY_SERDES) &&
 	    !(tp->tg3_flags & TG3_FLAG_ENABLE_ASF)) {
 		u32 bmsr, adv_reg, tg3_ctrl;
 
@@ -7173,7 +7263,7 @@ skip_phy_reset:
 	if (!eeprom_signature_found)
 		tp->led_ctrl = LED_CTRL_MODE_PHY_1;
 
-	if (tp->phy_id == PHY_ID_SERDES)
+	if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)
 		tp->link_config.advertising =
 			(ADVERTISED_1000baseT_Half |
 			 ADVERTISED_1000baseT_Full |
@@ -7560,12 +7650,14 @@ static int __devinit tg3_get_invariants(
 	grc_misc_cfg = tr32(GRC_MISC_CFG);
 	grc_misc_cfg &= GRC_MISC_CFG_BOARD_ID_MASK;
 
+	/* Broadcom's driver says that CIOBE multisplit has a bug */
+#if 0
 	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704 &&
 	    grc_misc_cfg == GRC_MISC_CFG_BOARD_ID_5704CIOBE) {
 		tp->tg3_flags |= TG3_FLAG_SPLIT_MODE;
 		tp->split_mode_max_reqs = SPLIT_MODE_5704_MAX_REQ;
 	}
-
+#endif
 	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 &&
 	    (grc_misc_cfg == GRC_MISC_CFG_BOARD_ID_5788 ||
 	     grc_misc_cfg == GRC_MISC_CFG_BOARD_ID_5788M))
@@ -7592,7 +7684,7 @@ static int __devinit tg3_get_invariants(
 
 	tg3_read_partno(tp);
 
-	if (tp->phy_id == PHY_ID_SERDES) {
+	if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES) {
 		tp->tg3_flags &= ~TG3_FLAG_USE_MI_INTERRUPT;
 	} else {
 		if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700)
@@ -7615,13 +7707,13 @@ static int __devinit tg3_get_invariants(
 	 * upon subsystem IDs.
 	 */
 	if (tp->pdev->subsystem_vendor == PCI_VENDOR_ID_DELL &&
-	    tp->phy_id != PHY_ID_SERDES) {
+	    !(tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)) {
 		tp->tg3_flags |= (TG3_FLAG_USE_MI_INTERRUPT |
 				  TG3_FLAG_USE_LINKCHG_REG);
 	}
 
 	/* For all SERDES we poll the MAC status register. */
-	if (tp->phy_id == PHY_ID_SERDES)
+	if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)
 		tp->tg3_flags |= TG3_FLAG_POLL_SERDES;
 	else
 		tp->tg3_flags &= ~TG3_FLAG_POLL_SERDES;
@@ -7634,13 +7726,10 @@ static int __devinit tg3_get_invariants(
 	else
 		tp->tg3_flags &= ~TG3_FLAG_TXD_MBOX_HWBUG;
 
-	/* 5700 chips can get confused if TX buffers straddle the
-	 * 4GB address boundary in some cases.
+	/* It seems all chips can get confused if TX buffers
+	 * straddle the 4GB address boundary in some cases.
 	 */
-	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700)
-		tp->dev->hard_start_xmit = tg3_start_xmit_4gbug;
-	else
-		tp->dev->hard_start_xmit = tg3_start_xmit;
+	tp->dev->hard_start_xmit = tg3_start_xmit;
 
 	tp->rx_offset = 2;
 	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701 &&
@@ -8060,8 +8149,8 @@ static char * __devinit tg3_phy_string(s
 	case PHY_ID_BCM5704:	return "5704";
 	case PHY_ID_BCM5705:	return "5705";
 	case PHY_ID_BCM5750:	return "5750";
-	case PHY_ID_BCM8002:	return "8002";
-	case PHY_ID_SERDES:	return "serdes";
+	case PHY_ID_BCM8002:	return "8002/serdes";
+	case 0:			return "serdes";
 	default:		return "unknown";
 	};
 }
@@ -8436,11 +8525,11 @@ static int tg3_suspend(struct pci_dev *p
 		tp->timer.expires = jiffies + tp->timer_offset;
 		add_timer(&tp->timer);
 
-		spin_unlock(&tp->tx_lock);
-		spin_unlock_irq(&tp->lock);
-
 		netif_device_attach(dev);
 		tg3_netif_start(tp);
+
+		spin_unlock(&tp->tx_lock);
+		spin_unlock_irq(&tp->lock);
 	}
 
 	return err;
@@ -8473,11 +8562,11 @@ static int tg3_resume(struct pci_dev *pd
 
 	tg3_enable_ints(tp);
 
+	tg3_netif_start(tp);
+
 	spin_unlock(&tp->tx_lock);
 	spin_unlock_irq(&tp->lock);
 
-	tg3_netif_start(tp);
-
 	return 0;
 }
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/tg3.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/tg3.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/tg3.h	2004-06-29 11:25:44.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/tg3.h	2004-09-05 16:01:00.000000000 +0200
@@ -1,8 +1,9 @@
 /* $Id: tg3.h,v 1.37.2.32 2002/03/11 12:18:18 davem Exp $
  * tg3.h: Definitions for Broadcom Tigon3 ethernet driver.
  *
- * Copyright (C) 2001, 2002 David S. Miller (davem@redhat.com)
+ * Copyright (C) 2001, 2002, 2003, 2004 David S. Miller (davem@redhat.com)
  * Copyright (C) 2001 Jeff Garzik (jgarzik@pobox.com)
+ * Copyright (C) 2004 Sun Microsystems Inc.
  */
 
 #ifndef _T3_H
@@ -116,12 +117,14 @@
 #define  CHIPREV_ID_5704_A0		 0x2000
 #define  CHIPREV_ID_5704_A1		 0x2001
 #define  CHIPREV_ID_5704_A2		 0x2002
+#define  CHIPREV_ID_5704_A3		 0x2003
 #define  CHIPREV_ID_5705_A0		 0x3000
 #define  CHIPREV_ID_5705_A1		 0x3001
 #define  CHIPREV_ID_5705_A2		 0x3002
 #define  CHIPREV_ID_5705_A3		 0x3003
 #define  CHIPREV_ID_5750_A0		 0x4000
 #define  CHIPREV_ID_5750_A1		 0x4001
+#define  CHIPREV_ID_5750_A3		 0x4003
 #define  GET_ASIC_REV(CHIP_REV_ID)	((CHIP_REV_ID) >> 12)
 #define   ASIC_REV_5700			 0x07
 #define   ASIC_REV_5701			 0x00
@@ -518,8 +521,50 @@
 #define MAC_EXTADDR_11_HIGH		0x00000588
 #define MAC_EXTADDR_11_LOW		0x0000058c
 #define MAC_SERDES_CFG			0x00000590
+#define  MAC_SERDES_CFG_EDGE_SELECT	 0x00001000
 #define MAC_SERDES_STAT			0x00000594
-/* 0x598 --> 0x600 unused */
+/* 0x598 --> 0x5b0 unused */
+#define SG_DIG_CTRL			0x000005b0
+#define  SG_DIG_USING_HW_AUTONEG	 0x80000000
+#define  SG_DIG_SOFT_RESET		 0x40000000
+#define  SG_DIG_DISABLE_LINKRDY		 0x20000000
+#define  SG_DIG_CRC16_CLEAR_N		 0x01000000
+#define  SG_DIG_EN10B			 0x00800000
+#define  SG_DIG_CLEAR_STATUS		 0x00400000
+#define  SG_DIG_LOCAL_DUPLEX_STATUS	 0x00200000
+#define  SG_DIG_LOCAL_LINK_STATUS	 0x00100000
+#define  SG_DIG_SPEED_STATUS_MASK	 0x000c0000
+#define  SG_DIG_SPEED_STATUS_SHIFT	 18
+#define  SG_DIG_JUMBO_PACKET_DISABLE	 0x00020000
+#define  SG_DIG_RESTART_AUTONEG		 0x00010000
+#define  SG_DIG_FIBER_MODE		 0x00008000
+#define  SG_DIG_REMOTE_FAULT_MASK	 0x00006000
+#define  SG_DIG_PAUSE_MASK		 0x00001800
+#define  SG_DIG_GBIC_ENABLE		 0x00000400
+#define  SG_DIG_CHECK_END_ENABLE	 0x00000200
+#define  SG_DIG_SGMII_AUTONEG_TIMER	 0x00000100
+#define  SG_DIG_CLOCK_PHASE_SELECT	 0x00000080
+#define  SG_DIG_GMII_INPUT_SELECT	 0x00000040
+#define  SG_DIG_MRADV_CRC16_SELECT	 0x00000020
+#define  SG_DIG_COMMA_DETECT_ENABLE	 0x00000010
+#define  SG_DIG_AUTONEG_TIMER_REDUCE	 0x00000008
+#define  SG_DIG_AUTONEG_LOW_ENABLE	 0x00000004
+#define  SG_DIG_REMOTE_LOOPBACK		 0x00000002
+#define  SG_DIG_LOOPBACK		 0x00000001
+#define SG_DIG_STATUS			0x000005b4
+#define  SG_DIG_CRC16_BUS_MASK		 0xffff0000
+#define  SG_DIG_PARTNER_FAULT_MASK	 0x00600000 /* If !MRADV_CRC16_SELECT */
+#define  SG_DIG_PARTNER_ASYM_PAUSE	 0x00100000 /* If !MRADV_CRC16_SELECT */
+#define  SG_DIG_PARTNER_PAUSE_CAPABLE	 0x00080000 /* If !MRADV_CRC16_SELECT */
+#define  SG_DIG_PARTNER_HALF_DUPLEX	 0x00040000 /* If !MRADV_CRC16_SELECT */
+#define  SG_DIG_PARTNER_FULL_DUPLEX	 0x00020000 /* If !MRADV_CRC16_SELECT */
+#define  SG_DIG_PARTNER_NEXT_PAGE	 0x00010000 /* If !MRADV_CRC16_SELECT */
+#define  SG_DIG_AUTONEG_STATE_MASK	 0x00000ff0
+#define  SG_DIG_COMMA_DETECTOR		 0x00000008
+#define  SG_DIG_MAC_ACK_STATUS		 0x00000004
+#define  SG_DIG_AUTONEG_COMPLETE	 0x00000002
+#define  SG_DIG_AUTONEG_ERROR		 0x00000001
+/* 0x5b8 --> 0x600 unused */
 #define MAC_TX_MAC_STATE_BASE		0x00000600 /* 16 bytes */
 #define MAC_RX_MAC_STATE_BASE		0x00000610 /* 20 bytes */
 /* 0x624 --> 0x800 unused */
@@ -2044,6 +2089,10 @@ struct tg3 {
 #define TG3_FLG2_PHY_BER_BUG		0x00000100
 #define TG3_FLG2_PCI_EXPRESS		0x00000200
 #define TG3_FLG2_ASF_NEW_HANDSHAKE	0x00000400
+#define TG3_FLG2_HW_AUTONEG		0x00000800
+#define TG3_FLG2_PHY_JUST_INITTED	0x00001000
+#define TG3_FLG2_PHY_SERDES		0x00002000
+#define TG3_FLG2_CAPACITIVE_COUPLING	0x00004000
 
 	u32				split_mode_max_reqs;
 #define SPLIT_MODE_5704_MAX_REQ		3
@@ -2091,7 +2140,6 @@ struct tg3 {
 #define PHY_ID_BCM5705			0x600081a0
 #define PHY_ID_BCM5750			0x60008180
 #define PHY_ID_BCM8002			0x60010140
-#define PHY_ID_SERDES			0xfeedbee0
 #define PHY_ID_INVALID			0xffffffff
 #define PHY_ID_REV_MASK			0x0000000f
 #define PHY_REV_BCM5401_B0		0x1
@@ -2114,7 +2162,7 @@ struct tg3 {
 	 (X) == PHY_ID_BCM5411 || (X) == PHY_ID_BCM5701 || \
 	 (X) == PHY_ID_BCM5703 || (X) == PHY_ID_BCM5704 || \
 	 (X) == PHY_ID_BCM5705 || (X) == PHY_ID_BCM5750 || \
-	 (X) == PHY_ID_BCM8002 || (X) == PHY_ID_SERDES)
+	 (X) == PHY_ID_BCM8002)
 
 	struct tg3_hw_stats		*hw_stats;
 	dma_addr_t			stats_mapping;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/Config.in linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/Config.in
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/Config.in	2004-06-29 11:24:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/Config.in	2004-09-05 15:48:55.000000000 +0200
@@ -25,6 +25,7 @@ if [ "$CONFIG_PCI" = "y" ]; then
    dep_tristate '      Averatec 5100P (EXPERIMENTAL)' CONFIG_IPW2100_AVERATEC_5100P $CONFIG_IPW2100 $CONFIG_EXPERIMENTAL
    dep_tristate '    Host AP driver for Prism2/2.5/3 in PLX9052 based PCI adaptors' CONFIG_HOSTAP_PLX $CONFIG_HOSTAP
    dep_tristate '    Host AP driver for Prism2.5 PCI adaptors' CONFIG_HOSTAP_PCI $CONFIG_HOSTAP
+   dep_tristate '  NDIS driver wrapper support' CONFIG_NDISWRAPPER $CONFIG_PCI
 fi
 
 # If Pcmcia is compiled in, offer Pcmcia cards...
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/Makefile linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/Makefile
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/Makefile	2004-06-29 11:24:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/Makefile	2004-09-05 15:48:55.000000000 +0200
@@ -15,6 +15,7 @@ obj-		:=
 export-objs	:= airo.o orinoco.o hermes.o hostap.o
 
 subdir-$(CONFIG_IPW2100)	+= ipw2100
+subdir-$(CONFIG_NDISWRAPPER)	+= ndiswrapper
 
 obj-$(CONFIG_HERMES)		+= orinoco.o hermes.o
 obj-$(CONFIG_PCMCIA_HERMES)	+= orinoco_cs.o
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/Makefile linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/Makefile
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/Makefile	2004-09-05 15:48:55.000000000 +0200
@@ -0,0 +1,11 @@
+
+EXTRA_CFLAGS := -DDRV_VERSION=\"0.9\"
+
+O_TARGET := ndiswrapper.o
+
+obj-y := wrapper.o iw_ndis.o loader.o ntoskernel.o ndis.o \
+	 misc_funcs.o proc.o divdi3.o hal.o
+
+obj-$(CONFIG_NDISWRAPPER)	:= $(O_TARGET)
+
+include $(TOPDIR)/Rules.make
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/coffpe.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/coffpe.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/coffpe.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/coffpe.h	2004-09-05 15:48:55.000000000 +0200
@@ -0,0 +1,162 @@
+/*
+ *  Copyright (C) 2003 Pontus Fuchs
+ *
+ *  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.
+ *
+ */
+#ifndef COFFPE_H
+#define COFFPE_H
+
+#pragma pack(1)
+
+typedef signed short cs16;
+typedef unsigned short cu16;
+typedef signed long cs32;
+typedef unsigned long cu32;
+typedef signed char cs8;
+typedef unsigned char cu8;
+
+
+/* Standard coff header */
+struct coff_hdr
+{
+	cu16 machine;
+	cu16 num_sections;
+	cu32 timedatestamp;
+	cu32 symtab_ptr;
+	cu32 symtab_entries;
+	cu16 optionalhdr_size;
+	cu16 characteristics;
+
+#define COFF_MACHINE_I386 0x14c
+#define COFF_MACHINE_ARM  0x1c0
+
+#define COFF_CHAR_RELOCS_STRIPPED 0x0001
+#define COFF_CHAR_IMAGE 0x0002
+#define COFF_CHAR_32BIT 0x0100
+#define COFF_CHAR_ISDLL 0x2000
+
+};
+
+/* The "header data directory" contains these */
+struct mscoff_datadir_entry
+{
+	cu32 rva;
+	cu32 size;
+};
+
+
+/* Coff header used by MS */
+struct mscoff_hdr
+{
+	struct coff_hdr stdhdr;
+
+	/* MS optional PE32 */
+	cu16 magic;
+	cu8  linkver_major;
+	cu8  linkver_minor;
+	cu32 text_size;
+	cu32 data_size;
+	cu32 bss_size;
+	cu32 entry_rva;
+	cu32 code_base_rva;
+	cu32 data_base_rva;
+	cu32 image_base;
+	cu32 section_alignment;
+	cu32 file_alignment;
+	cu16 osver_major;
+	cu16 osver_minor;
+	cu16 imagever_major;
+	cu16 imagever_minor;
+	cu16 subsysver_major;
+	cu16 subsysver_minor;
+	cu32 reserved;
+	cu32 imagesize;
+	cu32 headers_size;
+	cu32 checksum;
+	cu16 subsys;
+	cu16 dll_char;
+	cu32 stackreserve_size;
+	cu32 stackcommit_size;
+	cu32 heapreserve_size;
+	cu32 heapcommit_size;
+	cu32 loaderflags;
+	cu32 datadir_size;
+
+#define COFF_MAGIC_PE32 0x10b
+
+	/* Header data dir */
+       	struct mscoff_datadir_entry export_tbl;
+	struct mscoff_datadir_entry import_tbl;
+	struct mscoff_datadir_entry resource_tbl;
+	struct mscoff_datadir_entry exception_tbl;
+	struct mscoff_datadir_entry certificate_tbl;
+	struct mscoff_datadir_entry basereloc_tbl;
+	/* There may be more, but we don't need them */
+};
+
+/* Section table (right after header and optional header) */
+struct coffpe_sectiontbl_entry
+{
+	cu8  name[8];
+	cu32 virt_size;
+	cu32 dest_rva;
+	cu32 disk_size;
+	cu32 disk_offset;
+	cu32 reloc_offset;
+ 	cu32 linenum_offset;
+	cu16 reloc_num;
+	cu16 linenux_num;
+	cu32 characteristics;
+};
+
+/* Used by exports section */
+struct coffpe_exports
+{
+	cu32 export_flags;
+	cu32 timedatestamp;
+	cu16 version_major;
+	cu16 version_minor;
+	cu32 name_rva;      //Name of dll
+	cu32 ordinal_base;
+	cu32 addresses_size;
+	cu32 names_size;
+	cu32 addresses_rva;   // Location of symbols
+	cu32 names_rva;     // Location of symbol names
+	cu32 ordinals_rva;
+};
+
+
+struct coffpe_import_dirent
+{
+	cu32 import_lookup_tbl;
+	cu32 timedatestamp;
+	cu32 forwarder_chain;
+	cu32 name_rva;
+	cu32 import_address_table;
+};
+
+
+/* Reloc sections */
+struct coffpe_relocs
+{
+	cu32 page_rva;
+	cu32 block_size;
+};
+
+#define COFF_FIXUP_ABSOLUTE 0
+#define COFF_FIXUP_HIGH16 1
+#define COFF_FIXUP_LOW16 2
+#define COFF_FIXUP_HIGHLOW 3
+
+#pragma pack()
+
+#endif /* COFFPE_H */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/divdi3.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/divdi3.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/divdi3.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/divdi3.c	2004-09-05 15:48:55.000000000 +0200
@@ -0,0 +1,329 @@
+/* 64-bit multiplication and division
+   Copyright (C) 1989, 1992-1999, 2000, 2001, 2002, 2003
+   Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+
+#if BITS_PER_LONG != 32
+#error This is for 32-bit targets only
+#endif
+
+typedef unsigned int UQItype	__attribute__ ((mode (QI)));
+typedef          int SItype	__attribute__ ((mode (SI)));
+typedef unsigned int USItype	__attribute__ ((mode (SI)));
+typedef          int DItype	__attribute__ ((mode (DI)));
+typedef unsigned int UDItype	__attribute__ ((mode (DI)));
+#define Wtype SItype
+#define HWtype SItype
+#define DWtype DItype
+#define UWtype USItype
+#define UHWtype USItype
+#define UDWtype UDItype
+#define W_TYPE_SIZE 32
+
+#include "longlong.h"
+
+#if defined(__BIG_ENDIAN)
+struct DWstruct { Wtype high, low;};
+#elif defined(__LITTLE_ENDIAN)
+struct DWstruct { Wtype low, high;};
+#else
+#error Unhandled endianity
+#endif
+typedef union { struct DWstruct s; DWtype ll; } DWunion;
+
+/* Prototypes of exported functions.  */
+extern DWtype __divdi3 (DWtype u, DWtype v);
+extern DWtype __moddi3 (DWtype u, DWtype v);
+extern UDWtype __udivdi3 (UDWtype u, UDWtype v);
+extern UDWtype __umoddi3 (UDWtype u, UDWtype v);
+
+static UDWtype
+__udivmoddi4 (UDWtype n, UDWtype d, UDWtype *rp)
+{
+  DWunion ww;
+  DWunion nn, dd;
+  DWunion rr;
+  UWtype d0, d1, n0, n1, n2;
+  UWtype q0, q1;
+  UWtype b, bm;
+
+  nn.ll = n;
+  dd.ll = d;
+
+  d0 = dd.s.low;
+  d1 = dd.s.high;
+  n0 = nn.s.low;
+  n1 = nn.s.high;
+
+#if !UDIV_NEEDS_NORMALIZATION
+  if (d1 == 0)
+    {
+      if (d0 > n1)
+	{
+	  /* 0q = nn / 0D */
+
+	  udiv_qrnnd (q0, n0, n1, n0, d0);
+	  q1 = 0;
+
+	  /* Remainder in n0.  */
+	}
+      else
+	{
+	  /* qq = NN / 0d */
+
+	  if (d0 == 0)
+	    d0 = 1 / d0;	/* Divide intentionally by zero.  */
+
+	  udiv_qrnnd (q1, n1, 0, n1, d0);
+	  udiv_qrnnd (q0, n0, n1, n0, d0);
+
+	  /* Remainder in n0.  */
+	}
+
+      if (rp != 0)
+	{
+	  rr.s.low = n0;
+	  rr.s.high = 0;
+	  *rp = rr.ll;
+	}
+    }
+
+#else /* UDIV_NEEDS_NORMALIZATION */
+
+  if (d1 == 0)
+    {
+      if (d0 > n1)
+	{
+	  /* 0q = nn / 0D */
+
+	  count_leading_zeros (bm, d0);
+
+	  if (bm != 0)
+	    {
+	      /* Normalize, i.e. make the most significant bit of the
+		 denominator set.  */
+
+	      d0 = d0 << bm;
+	      n1 = (n1 << bm) | (n0 >> (W_TYPE_SIZE - bm));
+	      n0 = n0 << bm;
+	    }
+
+	  udiv_qrnnd (q0, n0, n1, n0, d0);
+	  q1 = 0;
+
+	  /* Remainder in n0 >> bm.  */
+	}
+      else
+	{
+	  /* qq = NN / 0d */
+
+	  if (d0 == 0)
+	    d0 = 1 / d0;	/* Divide intentionally by zero.  */
+
+	  count_leading_zeros (bm, d0);
+
+	  if (bm == 0)
+	    {
+	      /* From (n1 >= d0) /\ (the most significant bit of d0 is set),
+		 conclude (the most significant bit of n1 is set) /\ (the
+		 leading quotient digit q1 = 1).
+
+		 This special case is necessary, not an optimization.
+		 (Shifts counts of W_TYPE_SIZE are undefined.)  */
+
+	      n1 -= d0;
+	      q1 = 1;
+	    }
+	  else
+	    {
+	      /* Normalize.  */
+
+	      b = W_TYPE_SIZE - bm;
+
+	      d0 = d0 << bm;
+	      n2 = n1 >> b;
+	      n1 = (n1 << bm) | (n0 >> b);
+	      n0 = n0 << bm;
+
+	      udiv_qrnnd (q1, n1, n2, n1, d0);
+	    }
+
+	  /* n1 != d0...  */
+
+	  udiv_qrnnd (q0, n0, n1, n0, d0);
+
+	  /* Remainder in n0 >> bm.  */
+	}
+
+      if (rp != 0)
+	{
+	  rr.s.low = n0 >> bm;
+	  rr.s.high = 0;
+	  *rp = rr.ll;
+	}
+    }
+#endif /* UDIV_NEEDS_NORMALIZATION */
+
+  else
+    {
+      if (d1 > n1)
+	{
+	  /* 00 = nn / DD */
+
+	  q0 = 0;
+	  q1 = 0;
+
+	  /* Remainder in n1n0.  */
+	  if (rp != 0)
+	    {
+	      rr.s.low = n0;
+	      rr.s.high = n1;
+	      *rp = rr.ll;
+	    }
+	}
+      else
+	{
+	  /* 0q = NN / dd */
+
+	  count_leading_zeros (bm, d1);
+	  if (bm == 0)
+	    {
+	      /* From (n1 >= d1) /\ (the most significant bit of d1 is set),
+		 conclude (the most significant bit of n1 is set) /\ (the
+		 quotient digit q0 = 0 or 1).
+
+		 This special case is necessary, not an optimization.  */
+
+	      /* The condition on the next line takes advantage of that
+		 n1 >= d1 (true due to program flow).  */
+	      if (n1 > d1 || n0 >= d0)
+		{
+		  q0 = 1;
+		  sub_ddmmss (n1, n0, n1, n0, d1, d0);
+		}
+	      else
+		q0 = 0;
+
+	      q1 = 0;
+
+	      if (rp != 0)
+		{
+		  rr.s.low = n0;
+		  rr.s.high = n1;
+		  *rp = rr.ll;
+		}
+	    }
+	  else
+	    {
+	      UWtype m1, m0;
+	      /* Normalize.  */
+
+	      b = W_TYPE_SIZE - bm;
+
+	      d1 = (d1 << bm) | (d0 >> b);
+	      d0 = d0 << bm;
+	      n2 = n1 >> b;
+	      n1 = (n1 << bm) | (n0 >> b);
+	      n0 = n0 << bm;
+
+	      udiv_qrnnd (q0, n1, n2, n1, d1);
+	      umul_ppmm (m1, m0, q0, d0);
+
+	      if (m1 > n1 || (m1 == n1 && m0 > n0))
+		{
+		  q0--;
+		  sub_ddmmss (m1, m0, m1, m0, d1, d0);
+		}
+
+	      q1 = 0;
+
+	      /* Remainder in (n1n0 - m1m0) >> bm.  */
+	      if (rp != 0)
+		{
+		  sub_ddmmss (n1, n0, n1, n0, m1, m0);
+		  rr.s.low = (n1 << b) | (n0 >> bm);
+		  rr.s.high = n1 >> bm;
+		  *rp = rr.ll;
+		}
+	    }
+	}
+    }
+
+  ww.s.low = q0;
+  ww.s.high = q1;
+  return ww.ll;
+}
+
+DWtype
+__divdi3 (DWtype u, DWtype v)
+{
+  Wtype c = 0;
+  DWtype w;
+
+  if (u < 0)
+    {
+      c = ~c;
+      u = -u;
+    }
+  if (v < 0)
+    {
+      c = ~c;
+      v = -v;
+    }
+  w = __udivmoddi4 (u, v, NULL);
+  if (c)
+    w = -w;
+  return w;
+}
+
+DWtype
+__moddi3 (DWtype u, DWtype v)
+{
+  Wtype c = 0;
+  DWtype w;
+
+  if (u < 0)
+    {
+      c = ~c;
+      u = -u;
+    }
+  if (v < 0)
+    v = -v;
+  __udivmoddi4 (u, v, &w);
+  if (c)
+    w = -w;
+  return w;
+}
+
+UDWtype
+__udivdi3 (UDWtype u, UDWtype v)
+{
+  return __udivmoddi4 (u, v, NULL);
+}
+
+UDWtype
+__umoddi3 (UDWtype u, UDWtype v)
+{
+  UDWtype w;
+
+  __udivmoddi4 (u, v, &w);
+  return w;
+}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/hal.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/hal.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/hal.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/hal.c	2004-09-05 15:48:55.000000000 +0200
@@ -0,0 +1,114 @@
+/*
+ *  Copyright (C) 2003-2004 Pontus Fuchs, Giridhar Pemmasani
+ *
+ *  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.
+ *
+ */
+
+#include "ndis.h"
+#include "ntoskernel.h"
+
+STDCALL static void
+WRITE_PORT_ULONG(unsigned int port, unsigned int value)
+{
+	outl(value, port);
+}
+
+STDCALL static unsigned int
+READ_PORT_ULONG(unsigned int port)
+{
+	return inl(port);
+}
+
+STDCALL static void
+WRITE_PORT_USHORT(unsigned int port, unsigned short value)
+{
+	outw(value, port);
+}
+
+STDCALL static unsigned short
+READ_PORT_USHORT(unsigned int port)
+{
+	return inw(port);
+}
+
+STDCALL static void
+WRITE_PORT_UCHAR(unsigned int port, unsigned char value)
+{
+	outb(value, port);
+}
+
+STDCALL static unsigned short
+READ_PORT_UCHAR(unsigned int port)
+{
+	return inb(port);
+}
+
+STDCALL static void
+WRITE_PORT_BUFFER_USHORT (unsigned int port, unsigned short *buf,
+			  unsigned long count)
+{
+	unsigned long i;
+	for (i = 0 ; i < count ; i++)
+		outw(buf[i], port);
+}
+
+STDCALL static void
+READ_PORT_BUFFER_USHORT (unsigned int port, unsigned short *buf,
+			 unsigned long count)
+{
+	unsigned long i;
+	for (i = 0 ; i < count; i++)
+		buf[i] = inw(port);
+}
+
+STDCALL static void
+KeStallExecutionProcessor(unsigned long usecs)
+{
+	//DBGTRACE("%s %d\n", __FUNCTION__ , usecs);
+	udelay(usecs);
+}
+
+
+STDCALL static KIRQL
+KfAcquireSpinLock(KSPIN_LOCK *lock)
+{
+	KIRQL irql;
+
+	irql = KeGetCurrentIrql();
+	DBGTRACE4("lock = %p, *lock = %p", lock, (void *)lock);
+	if (lock && *lock)
+	{
+		if (irql == DISPATCH_LEVEL)
+			spin_lock((spinlock_t *)(*lock));
+		else // irql == PASSIVE_LEVEL
+			spin_lock_bh((spinlock_t *)(*lock));
+	}
+	else
+		ERROR("lock %p is not initialized!", lock);
+	return irql;
+}
+
+struct wrap_func hal_wrap_funcs[] =
+{
+	WRAP_FUNC_ENTRY(WRITE_PORT_BUFFER_USHORT),
+	WRAP_FUNC_ENTRY(WRITE_PORT_UCHAR),
+	WRAP_FUNC_ENTRY(WRITE_PORT_ULONG),
+	WRAP_FUNC_ENTRY(WRITE_PORT_USHORT),
+	WRAP_FUNC_ENTRY(READ_PORT_BUFFER_USHORT),
+	WRAP_FUNC_ENTRY(READ_PORT_UCHAR),
+	WRAP_FUNC_ENTRY(READ_PORT_ULONG),
+	WRAP_FUNC_ENTRY(READ_PORT_USHORT),
+	WRAP_FUNC_ENTRY(KeStallExecutionProcessor),
+	WRAP_FUNC_ENTRY(KfAcquireSpinLock),
+	{NULL, NULL}
+};
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/iw_ndis.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/iw_ndis.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/iw_ndis.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/iw_ndis.c	2004-09-05 15:48:55.000000000 +0200
@@ -0,0 +1,1629 @@
+/*
+ *  Copyright (C) 2003-2004 Pontus Fuchs, Giridhar Pemmasani
+ *
+ *  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.
+ *
+ */
+#include <linux/wireless.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/ethtool.h>
+#include <linux/if_arp.h>
+#include <net/iw_handler.h>
+#include <linux/rtnetlink.h>
+#include <asm/uaccess.h>
+
+#include "iw_ndis.h"
+
+static int freq_chan[] = { 2412, 2417, 2422, 2427, 2432, 2437, 2442,
+			   2447, 2452, 2457, 2462, 2467, 2472, 2484 };
+
+
+int set_essid(struct ndis_handle *handle, const char *ssid, int ssid_len)
+{
+	unsigned int res, written, needed;
+	struct ndis_essid req;
+
+	memset(&req, 0, sizeof(req));
+	
+	if (ssid_len == 0)
+		req.length = 0;
+	else
+	{
+		if (ssid_len > (IW_ESSID_MAX_SIZE + 1))
+			return -EINVAL;
+
+		req.length = ssid_len;
+		memcpy(&req.essid, ssid, req.length);
+		req.essid[req.length] = 0;
+		DBGTRACE("ssid = '%s'", req.essid);
+	}
+	
+	res = dosetinfo(handle, NDIS_OID_ESSID, (char*)&req, sizeof(req),
+			&written, &needed);
+	if (res)
+		WARNING("setting essid failed (%08X)", res); 
+
+	memcpy(&handle->essid, &req, sizeof(req));
+	TRACEEXIT1(return 0);
+}
+
+static int iw_set_essid(struct net_device *dev, struct iw_request_info *info,
+			union iwreq_data *wrqu, char *extra)
+{
+	struct ndis_handle *handle = dev->priv;
+	char ssid[IW_ESSID_MAX_SIZE];
+
+	memset(ssid, 0, sizeof(ssid));
+	/* iwconfig adds 1 to the actual length */
+	if (wrqu->essid.flags)
+		wrqu->essid.length--;
+
+	/* when 'iwconfig iface essid off' is called, we actually set
+	 * an impossible essid, which will disassociate without having
+	 * to call NDIS_OID_DISASSOCIATE, which also turns off the radio
+	 * some cards don't come back when a new essid is given
+	 */
+
+	if (wrqu->essid.length > IW_ESSID_MAX_SIZE)
+		TRACEEXIT1(return -EINVAL);
+
+	memcpy(ssid, extra, wrqu->essid.length);
+	if (set_essid(handle, ssid, wrqu->essid.length))
+		TRACEEXIT1(return -EINVAL);
+
+	TRACEEXIT1(return 0);
+}
+
+static int iw_get_essid(struct net_device *dev, struct iw_request_info *info,
+			union iwreq_data *wrqu, char *extra)
+{
+	struct ndis_handle *handle = dev->priv; 
+	unsigned int res, written, needed;
+	struct ndis_essid req;
+
+	TRACEENTER1("%s", "");
+	memset(&req, 0, sizeof(req));
+	res = doquery(handle, NDIS_OID_ESSID, (char*)&req, sizeof(req),
+		      &written, &needed);
+	if (res)
+		WARNING("getting essid failed (%08X)", res);
+
+	memcpy(extra, req.essid, req.length);
+	extra[req.length] = 0;
+	if (req.length > 0)
+		wrqu->essid.flags  = 1;
+	else
+		wrqu->essid.flags = 0;
+	wrqu->essid.length = req.length;
+	TRACEEXIT1(return 0);
+}
+
+int set_mode(struct ndis_handle *handle, enum op_mode mode)
+{
+	int res;
+
+	TRACEENTER1("%s", "");
+
+	res = set_int(handle, NDIS_OID_MODE, mode);
+	if (res == NDIS_STATUS_INVALID_DATA)
+	{
+		WARNING("setting operating mode failed (%08X)", res); 
+		TRACEEXIT1(return -EINVAL);
+	}
+
+	handle->op_mode = mode;
+	TRACEEXIT1(return 0);
+}
+
+static int iw_set_mode(struct net_device *dev, struct iw_request_info *info,
+		       union iwreq_data *wrqu, char *extra)
+{
+	struct ndis_handle *handle = dev->priv;
+	enum op_mode ndis_mode;
+
+	TRACEENTER1("%s", "");
+	switch (wrqu->mode)
+	{
+	case IW_MODE_ADHOC:
+		ndis_mode = NDIS_MODE_ADHOC;
+		break;	
+	case IW_MODE_INFRA:
+		ndis_mode = NDIS_MODE_INFRA;
+		break;	
+	case IW_MODE_AUTO:
+		ndis_mode = NDIS_MODE_AUTO;
+		break;	
+	default:
+		TRACEEXIT1(return -EINVAL);
+	}
+	
+	if (set_mode(handle, ndis_mode))
+		TRACEEXIT1(return -EINVAL);
+
+	TRACEEXIT1(return 0);
+}
+
+static int iw_get_mode(struct net_device *dev, struct iw_request_info *info,
+		       union iwreq_data *wrqu, char *extra)
+{
+	struct ndis_handle *handle = dev->priv; 
+	int ndis_mode, iw_mode;
+
+	int res;
+
+	TRACEENTER1("%s", "");
+	res = query_int(handle, NDIS_OID_MODE, &ndis_mode);
+	if (res)
+	{
+		WARNING("getting operating mode failed (%08X)", res);
+		TRACEEXIT1(return -EOPNOTSUPP);
+	}
+
+	switch(ndis_mode)
+	{
+	case NDIS_MODE_ADHOC:
+		iw_mode = IW_MODE_ADHOC;
+		break;
+	case NDIS_MODE_INFRA:
+		iw_mode = IW_MODE_INFRA;
+		break;
+	case NDIS_MODE_AUTO:
+		iw_mode = IW_MODE_AUTO;
+		break;
+	default:
+		ERROR("invalid operating mode (%u)", ndis_mode);
+		TRACEEXIT1(return -EINVAL);
+	}
+	wrqu->mode = iw_mode;
+	TRACEEXIT1(return 0);
+}
+
+static const char *net_type_to_name(int net_type)
+{
+	static const char *net_names[] = {"IEEE 802.11FH", "IEEE 802.11b",
+	              "IEEE 802.11a", "IEEE 802.11g"};
+	static const char *unknown = "Unknown";
+
+	if (net_type >= 0 &&
+	    net_type < (sizeof(net_names)/sizeof(net_names[0])))
+		return net_names[net_type];
+	else
+		return unknown;
+}
+
+static int iw_get_name(struct net_device *dev, struct iw_request_info *info,
+		       union iwreq_data *wrqu, char *extra)
+{
+	struct ndis_handle *handle = dev->priv;
+	unsigned int network_type, res;
+	
+	res = query_int(handle, NDIS_OID_NETWORK_TYPE_IN_USE, &network_type);
+	if (res == NDIS_STATUS_INVALID_DATA)
+		network_type = -1;
+
+	strncpy(wrqu->name, net_type_to_name(network_type),
+	        sizeof(wrqu->name) - 1);
+	wrqu->name[sizeof(wrqu->name)-1] = 0;
+	return 0;
+}
+
+static int iw_get_freq(struct net_device *dev, struct iw_request_info *info,
+		       union iwreq_data *wrqu, char *extra)
+{
+	struct ndis_handle *handle = dev->priv;
+	unsigned int res, written, needed;
+	struct ndis_configuration req;
+
+	res = doquery(handle, NDIS_OID_CONFIGURATION, (char*)&req,
+		      sizeof(req), &written, &needed);
+	if (res)
+		WARNING("getting configuration failed (%08X)", res);
+
+	memset(&(wrqu->freq), 0, sizeof(struct iw_freq));
+
+	/* see comment in wireless.h above the "struct iw_freq"
+	   definition for an explanation of this if
+	   NOTE: 1000000 is due to the kHz
+	*/
+	if (req.ds_config > 1000000)
+	{
+		wrqu->freq.m = req.ds_config / 10;
+		wrqu->freq.e = 1;
+	}
+	else
+		wrqu->freq.m = req.ds_config;
+
+	/* convert from kHz to Hz */
+	wrqu->freq.e += 3;
+
+	return 0;
+}
+
+static int iw_set_freq(struct net_device *dev, struct iw_request_info *info,
+		       union iwreq_data *wrqu, char *extra)
+{
+	struct ndis_handle *handle = dev->priv;
+	unsigned int res, written, needed;
+	struct ndis_configuration req;
+
+	res = doquery(handle, NDIS_OID_CONFIGURATION, (char *)&req,
+				  sizeof(req), &written, &needed);
+	if (res)
+		WARNING("getting configuration failed (%08X)", res);
+
+	if (wrqu->freq.m < 1000 && wrqu->freq.e == 0)
+	{
+		if (wrqu->freq.m >= 1 &&
+		    wrqu->freq.m <= (sizeof(freq_chan)/sizeof(freq_chan[0])))
+			req.ds_config = freq_chan[wrqu->freq.m - 1] * 1000;
+		else
+			return -EINVAL;
+	}
+	else
+	{
+		int i;
+		for (req.ds_config = wrqu->freq.m, i = wrqu->freq.e ;
+		     i > 0 ; i--)
+			req.ds_config *= 10;
+		req.ds_config /= 1000;
+		
+	}
+	res = dosetinfo(handle, NDIS_OID_CONFIGURATION, (char*)&req,
+			sizeof(req), &written, &needed);
+	if (res == NDIS_STATUS_INVALID_DATA)
+	{
+		WARNING("setting configuration failed (%08X)", res);
+		return -EINVAL;
+	}
+	return 0;
+}
+
+static int iw_get_tx_power(struct net_device *dev,
+			   struct iw_request_info *info,
+			   union iwreq_data *wrqu, char *extra)
+{
+	struct ndis_handle *handle = dev->priv; 
+	unsigned long ndis_power;
+	unsigned int written, needed, res;
+
+	res = doquery(handle, NDIS_OID_TX_POWER_LEVEL, (char*)&ndis_power,
+		      sizeof(ndis_power), &written, &needed);
+	/* Centrino driver returns NDIS_STATUS_INVALID_OID (why?) */
+	if (res == NDIS_STATUS_NOT_SUPPORTED || res == NDIS_STATUS_INVALID_OID)
+		return -EOPNOTSUPP;
+
+	wrqu->txpower.flags = IW_TXPOW_MWATT;
+	wrqu->txpower.disabled = 0;
+	wrqu->txpower.fixed = 0;
+	wrqu->txpower.value = ndis_power;
+	return 0;
+}
+
+static int iw_set_tx_power(struct net_device *dev,
+			   struct iw_request_info *info,
+			   union iwreq_data *wrqu, char *extra)
+{
+	struct ndis_handle *handle = dev->priv; 
+	unsigned long ndis_power;
+	unsigned int written, needed, res;
+
+	if (wrqu->txpower.disabled)
+	{
+		ndis_power = 0;
+		res = dosetinfo(handle, NDIS_OID_TX_POWER_LEVEL,
+				(char *)&ndis_power,
+				sizeof(ndis_power), &written, &needed);
+		if (res == NDIS_STATUS_INVALID_DATA)
+			return -EINVAL;
+		res = set_int(handle, NDIS_OID_DISASSOCIATE, 0);
+		if (res)
+			return -EINVAL;
+		return 0;
+	}
+	else 
+	{
+		if (wrqu->txpower.flags == IW_TXPOW_MWATT)
+			ndis_power = wrqu->txpower.value;
+		else // wrqu->txpower.flags == IW_TXPOW_DBM
+		{
+			if (wrqu->txpower.value > 20)
+				ndis_power = 128;
+			else if (wrqu->txpower.value < -43)
+				ndis_power = 127;
+			else
+			{
+				signed char tmp;
+				tmp = wrqu->txpower.value;
+				tmp = -12 - tmp;
+				tmp <<= 2;
+				ndis_power = (unsigned char)tmp;
+			}
+		}
+	}
+	res = dosetinfo(handle, NDIS_OID_TX_POWER_LEVEL, (char*)&ndis_power,
+		      sizeof(ndis_power), &written, &needed);
+	if (res)
+		WARNING("setting tx_power failed (%08X)", res);
+	if (res == NDIS_STATUS_NOT_SUPPORTED)
+		return -EOPNOTSUPP;
+	if (res == NDIS_STATUS_INVALID_DATA)
+		return -EINVAL;
+
+	return 0;
+}
+
+static int iw_get_bitrate(struct net_device *dev, struct iw_request_info *info,
+			  union iwreq_data *wrqu, char *extra)
+{
+	struct ndis_handle *handle = dev->priv; 
+	int ndis_rate;
+
+	int res = query_int(handle, NDIS_OID_GEN_SPEED, &ndis_rate);
+	if (res)
+		WARNING("getting bitrate failed (%08X)", res);
+
+	wrqu->bitrate.value = ndis_rate * 100;
+	return 0;
+}
+
+static int iw_set_dummy(struct net_device *dev, struct iw_request_info *info,
+			union iwreq_data *wrqu, char *extra)
+{
+	/* Do nothing. Used for ioctls that are not implemented. */
+	return 0;
+}
+
+static int iw_get_rts_threshold(struct net_device *dev,
+				struct iw_request_info *info,
+				union iwreq_data *wrqu, char *extra)
+{
+	struct ndis_handle *handle = dev->priv;
+	int ndis_rts_threshold;
+
+	int res = query_int(handle, NDIS_OID_RTS_THRESH, &ndis_rts_threshold);
+	if (res == NDIS_STATUS_NOT_SUPPORTED)
+	{
+		WARNING("getting RTS threshold failed (%08X)", res);
+		return -EOPNOTSUPP;
+	}
+
+	wrqu->rts.value = ndis_rts_threshold;
+	return 0;
+}
+
+static int iw_get_frag_threshold(struct net_device *dev,
+				 struct iw_request_info *info,
+				 union iwreq_data *wrqu, char *extra)
+{
+	struct ndis_handle *handle = dev->priv; 
+	int ndis_frag_threshold;
+
+	int res = query_int(handle, NDIS_OID_FRAG_THRESH, &ndis_frag_threshold);
+	if (res == NDIS_STATUS_NOT_SUPPORTED)
+	{
+		WARNING("getting fragmentation threshold failed (%08X)", res);
+		return -EOPNOTSUPP;
+	}
+
+	wrqu->frag.value = ndis_frag_threshold;
+	return 0;
+}
+
+int get_ap_address(struct ndis_handle *handle, mac_address ap_addr)
+{
+	unsigned int res, written, needed;
+
+	TRACEENTER1("%s", "");
+
+	res = doquery(handle, NDIS_OID_BSSID, ap_addr, ETH_ALEN,
+		      &written, &needed);
+	if (res == NDIS_STATUS_ADAPTER_NOT_READY)
+		memset(ap_addr, 0, ETH_ALEN);
+
+	DBGTRACE1(MACSTR, MAC2STR(ap_addr));
+        TRACEEXIT1(return 0);
+}
+
+static int iw_get_ap_address(struct net_device *dev,
+			     struct iw_request_info *info,
+			     union iwreq_data *wrqu, char *extra)
+{
+    struct ndis_handle *handle = dev->priv;
+    mac_address ap_addr;
+
+    TRACEENTER1("%s", "");
+    get_ap_address(handle, ap_addr);
+
+    memcpy(wrqu->ap_addr.sa_data, ap_addr, ETH_ALEN);
+    wrqu->ap_addr.sa_family = ARPHRD_ETHER;
+    TRACEEXIT1(return 0);
+}
+
+static int iw_set_ap_address(struct net_device *dev,
+			     struct iw_request_info *info,
+			     union iwreq_data *wrqu, char *extra)
+{
+	struct ndis_handle *handle = dev->priv; 
+	unsigned int res, written, needed;
+	mac_address ap_addr;
+
+        memcpy(ap_addr, wrqu->ap_addr.sa_data, ETH_ALEN);
+	DBGTRACE1(MACSTR, MAC2STR(ap_addr));
+	res = dosetinfo(handle, NDIS_OID_BSSID, (char*)&(ap_addr[0]),
+			ETH_ALEN, &written, &needed);
+
+	if (res)
+	{
+		WARNING("setting AP mac address failed (%08X)", res);
+		TRACEEXIT1(return -EINVAL);
+	}
+
+        TRACEEXIT1(return 0);
+}
+
+int set_auth_mode(struct ndis_handle *handle, int auth_mode)
+{
+	unsigned int res;
+	res = set_int(handle, NDIS_OID_AUTH_MODE, auth_mode);
+	if (res == NDIS_STATUS_INVALID_DATA)
+	{
+		WARNING("setting auth mode failed (%08X)", res);
+		return -EINVAL;
+	}
+	else
+	{
+		handle->auth_mode = auth_mode;
+		return 0;
+	}
+}
+
+int set_encr_mode(struct ndis_handle *handle, int encr_mode)
+{
+	unsigned int res;
+	res = set_int(handle, NDIS_OID_ENCR_STATUS, encr_mode);
+	if (res == NDIS_STATUS_INVALID_DATA)
+		TRACEEXIT2(return -EINVAL);
+	else
+	{
+		handle->encr_mode = encr_mode;
+		TRACEEXIT2(return 0);
+	}
+}
+
+static int iw_get_encr(struct net_device *dev, struct iw_request_info *info,
+		       union iwreq_data *wrqu, char *extra)
+{
+	struct ndis_handle *handle = dev->priv;
+	int status, res, index;
+	struct encr_info *encr_info = &handle->encr_info;
+
+	TRACEENTER1("%s", "");
+	wrqu->data.length = 0;
+	extra[0] = 0;
+
+	index = (wrqu->data.flags & IW_ENCODE_INDEX);
+	DBGTRACE2("index = %u", index);
+	if (index && (index <= 0 || index > MAX_ENCR_KEYS))
+	{
+		WARNING("encryption index out of range (%u)", index);
+		TRACEEXIT1(return -EINVAL);
+	}
+
+	if (index == 0)
+		index = encr_info->active;
+	else	
+		index--;
+
+	if (index != encr_info->active)
+	{
+		if (encr_info->keys[index].length > 0)
+		{
+			wrqu->data.flags |= IW_ENCODE_ENABLED;
+			wrqu->data.length = encr_info->keys[index].length;
+			memcpy(extra, encr_info->keys[index].key,
+			       encr_info->keys[index].length);
+		}
+		else
+			wrqu->data.flags |= IW_ENCODE_DISABLED;
+
+		TRACEEXIT1(return 0);
+	}
+	
+	/* active key */
+	res = query_int(handle, NDIS_OID_ENCR_STATUS, &status);
+	if (res == NDIS_STATUS_NOT_SUPPORTED)
+	{
+		WARNING("getting encryption status failed (%08X)", res);
+		TRACEEXIT1(return -EOPNOTSUPP);
+	}
+
+	if (status == ENCR_DISABLED || status == ENCR1_NO_SUPPORT)
+		wrqu->data.flags |= IW_ENCODE_DISABLED;
+	else
+	{
+		if (status == ENCR1_NOKEY || status == ENCR2_ABSENT ||
+		    status == ENCR3_ABSENT)
+			wrqu->data.flags |= IW_ENCODE_NOKEY;
+
+		else
+		{
+			wrqu->data.flags |= IW_ENCODE_ENABLED | (index+1);
+			wrqu->data.length = encr_info->keys[index].length;
+			memcpy(extra, encr_info->keys[index].key,
+			       encr_info->keys[index].length);
+		}
+	}
+	res = query_int(handle, NDIS_OID_AUTH_MODE, &status);
+	if (res == NDIS_STATUS_NOT_SUPPORTED)
+	{
+		WARNING("getting authentication mode failed (%08X)", res);
+		TRACEEXIT1(return -EOPNOTSUPP);
+	}
+
+	if (status == AUTHMODE_OPEN)
+		wrqu->data.flags |= IW_ENCODE_OPEN;
+	else if (status == AUTHMODE_RESTRICTED)
+		wrqu->data.flags |= IW_ENCODE_RESTRICTED;
+	
+	TRACEEXIT1(return 0);
+}
+
+static int iw_set_encr(struct net_device *dev, struct iw_request_info *info,
+		       union iwreq_data *wrqu, char *extra)
+{
+	struct ndis_handle *handle = dev->priv;
+	unsigned int res, written, needed, index;
+	struct encr_info *encr_info = &handle->encr_info;
+	struct ndis_encr_key ndis_key;
+	
+	TRACEENTER1("%s", "");
+	index = (wrqu->encoding.flags & IW_ENCODE_INDEX);
+	DBGTRACE2("index = %u", index);
+	if (index > MAX_ENCR_KEYS)
+	{
+		WARNING("encryption index out of range (%u)", index);
+		TRACEEXIT1(return -EINVAL);
+	}
+
+	if (index <= 0)
+		index = encr_info->active;
+	else	
+		index--;
+
+	/* store the key if given */
+	if(wrqu->data.length > 0)
+	{
+		encr_info->keys[index].length = wrqu->data.length;
+		memcpy(&encr_info->keys[index].key, extra,
+		       wrqu->data.length);		
+	}
+
+	/* remove key if disabled */
+	if (wrqu->data.flags & IW_ENCODE_DISABLED)
+	{
+		unsigned long keyindex = index;
+		res = dosetinfo(handle, NDIS_OID_REMOVE_WEP,
+				(char *)&keyindex, sizeof(keyindex),
+				&written, &needed);
+		if (res == NDIS_STATUS_INVALID_DATA)
+		{
+			WARNING("removing encryption key %d failed (%08X)",
+				index, res);
+			TRACEEXIT1(return -EINVAL);
+		}
+		encr_info->keys[index].length = 0;
+		
+		/* if it is active key, disable encryption */
+		if (index == encr_info->active)
+		{
+			res = set_encr_mode(handle, ENCR_DISABLED);
+			if (res)
+				WARNING("changing encr status failed (%08X)",
+					res);
+		}
+		TRACEEXIT1(return 0);
+	}
+
+	if (encr_info->keys[index].length > 0)
+	{
+		ndis_key.struct_size = sizeof(ndis_key);
+		ndis_key.index = index;
+
+		if (index == encr_info->active || (wrqu->data.length == 0))
+		{
+			DBGTRACE2("setting key %d as tx key", index);
+			ndis_key.index |= 1 << 31;
+			encr_info->active = index;
+		}
+
+		ndis_key.length = encr_info->keys[index].length;
+		memcpy(&ndis_key.key, encr_info->keys[index].key,
+		       encr_info->keys[index].length);
+
+		res = dosetinfo(handle, NDIS_OID_ADD_WEP, (char *)&ndis_key,
+				sizeof(ndis_key), &written, &needed);
+		if (res == NDIS_STATUS_INVALID_DATA)
+		{
+			WARNING("adding encryption key %d failed (%08X)",
+				index, res);
+			TRACEEXIT1(return -EINVAL);
+		}
+
+		DBGTRACE("key length = %ld", ndis_key.length);
+		res = set_encr_mode(handle, ENCR1_ENABLED);
+		if (res)
+			WARNING("changing encr status failed (%08X)", res);
+
+		/* ndis drivers want essid to be set after setting encr */
+		set_essid(handle, handle->essid.essid, handle->essid.length);
+	}
+
+	/* global encryption state (for all keys) */
+	if (wrqu->data.flags & IW_ENCODE_OPEN)
+		res = set_auth_mode(handle, AUTHMODE_OPEN);
+	else // if (wrqu->data.flags & IW_ENCODE_RESTRICTED)
+		res = set_auth_mode(handle, AUTHMODE_RESTRICTED);
+	if (res)
+	{
+		WARNING("setting authentication mode failed (%08X)", res);
+		TRACEEXIT1(return -EINVAL);
+	}
+
+	TRACEEXIT1(return 0);
+}
+	
+static int iw_set_nick(struct net_device *dev, struct iw_request_info *info,
+		       union iwreq_data *wrqu, char *extra)
+{
+	struct ndis_handle *handle = dev->priv;
+	
+	if (wrqu->data.length > IW_ESSID_MAX_SIZE)
+		return -EINVAL;
+	memcpy(handle->nick, extra, wrqu->data.length);
+	handle->nick[IW_ESSID_MAX_SIZE] = 0;
+	return 0;
+}
+
+static int iw_get_nick(struct net_device *dev, struct iw_request_info *info,
+		       union iwreq_data *wrqu, char *extra)
+{
+	struct ndis_handle *handle = dev->priv;
+	
+	memcpy(extra, handle->nick, IW_ESSID_MAX_SIZE+1);
+	wrqu->data.length = strlen(handle->nick);
+	return 0;
+}
+
+static char *ndis_translate_scan(struct net_device *dev, char *event,
+				 char *end_buf, struct ssid_item *item)
+{
+	struct iw_event iwe;
+	char *current_val;
+	int i;
+	char buf[MAX_WPA_IE_LEN * 2 + 30];
+
+	TRACEENTER1("%s", "");
+	/* add mac address */
+	memset(&iwe, 0, sizeof(iwe));
+	iwe.cmd = SIOCGIWAP;
+	iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
+	iwe.len = IW_EV_ADDR_LEN;
+	memcpy(iwe.u.ap_addr.sa_data, item->mac, ETH_ALEN);
+	event = iwe_stream_add_event(event, end_buf, &iwe, IW_EV_ADDR_LEN);
+
+	/* add essid */
+	memset(&iwe, 0, sizeof(iwe));
+	iwe.cmd = SIOCGIWESSID;
+	iwe.u.data.length = item->ssid.length;
+	if (iwe.u.data.length > IW_ESSID_MAX_SIZE)
+		iwe.u.data.length = IW_ESSID_MAX_SIZE;
+	iwe.u.data.flags = 1;
+	iwe.len = IW_EV_POINT_LEN + iwe.u.data.length;
+	event = iwe_stream_add_point(event, end_buf, &iwe, item->ssid.essid);
+
+	/* add protocol name */
+	memset(&iwe, 0, sizeof(iwe));
+	iwe.cmd = SIOCGIWNAME;
+	strncpy(iwe.u.name, net_type_to_name(item->net_type), IFNAMSIZ);
+	event = iwe_stream_add_event(event, end_buf, &iwe, IW_EV_CHAR_LEN);
+
+	/* add mode */
+	memset(&iwe, 0, sizeof(iwe));
+	iwe.cmd = SIOCGIWMODE;
+	if (item->mode == NDIS_MODE_ADHOC)
+		iwe.u.mode = IW_MODE_ADHOC;
+	else if (item->mode == NDIS_MODE_INFRA)
+		iwe.u.mode = IW_MODE_INFRA;
+	else // if (item->mode == NDIS_MODE_AUTO)
+		iwe.u.mode = IW_MODE_AUTO;
+	event = iwe_stream_add_event(event, end_buf, &iwe, IW_EV_UINT_LEN);
+	
+	/* add freq */
+	memset(&iwe, 0, sizeof(iwe));
+	iwe.cmd = SIOCGIWFREQ;
+	iwe.u.freq.m = item->config.ds_config;
+	if (item->config.ds_config > 1000000)
+	{
+		iwe.u.freq.m = item->config.ds_config / 10;
+		iwe.u.freq.e = 1;
+	}
+	else
+		iwe.u.freq.m = item->config.ds_config;
+	/* convert from kHz to Hz */
+	iwe.u.freq.e += 3;
+	iwe.len = IW_EV_FREQ_LEN;
+	event = iwe_stream_add_event(event, end_buf, &iwe, IW_EV_FREQ_LEN);
+
+	/* add qual */
+	memset(&iwe, 0, sizeof(iwe));
+	iwe.cmd = IWEVQUAL;
+	iwe.u.qual.level = item->rssi;
+	iwe.u.qual.noise = 0;
+	iwe.u.qual.qual = 0;
+	iwe.len = IW_EV_QUAL_LEN;
+	event = iwe_stream_add_event(event, end_buf, &iwe, IW_EV_QUAL_LEN);
+
+	/* add key info */
+	memset(&iwe, 0, sizeof(iwe));
+	iwe.cmd = SIOCGIWENCODE;
+	if (item->privacy == NDIS_PRIV_ACCEPT_ALL)
+		iwe.u.data.flags = IW_ENCODE_DISABLED;
+	else
+		iwe.u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;
+	iwe.u.data.length = 0;
+	iwe.len = IW_EV_POINT_LEN;
+	event = iwe_stream_add_point(event, end_buf, &iwe, item->ssid.essid);
+
+	/* add rate */
+	memset(&iwe, 0, sizeof(iwe));
+	current_val = event + IW_EV_LCP_LEN;
+	iwe.cmd = SIOCGIWRATE;
+	for (i = 0 ; i < NDIS_MAX_RATES ; i++)
+	{
+		if (item->rates[i] == 0)
+			break;
+		iwe.u.bitrate.value = ((item->rates[i] & 0x7f) * 500000);
+		current_val = iwe_stream_add_value(event, current_val, end_buf,
+						   &iwe, IW_EV_PARAM_LEN);
+	}
+
+	if ((current_val - event) > IW_EV_LCP_LEN)
+		event = current_val;
+
+	memset(&iwe, 0, sizeof(iwe));
+	iwe.cmd = IWEVCUSTOM;
+	sprintf(buf, "bcn_int=%d", item->config.beacon_period);
+	iwe.u.data.length = strlen(buf);
+	event = iwe_stream_add_point(event, end_buf, &iwe, buf);
+	
+	if (item->length > ((char *)&item->rates[NDIS_MAX_RATES] -
+			    (char *)&item->length) &&
+	    item->ie_length >= (sizeof(struct fixed_ies) + 2))
+	{
+		struct fixed_ies *fixed_ies = (struct fixed_ies *)item->ies;
+		unsigned char *iep = (unsigned char *)(fixed_ies + 1);
+		int iel = item->ie_length - sizeof(*fixed_ies);
+		
+		DBGTRACE2("%s: adding atim\n", __FUNCTION__);
+		memset(&iwe, 0, sizeof(iwe));
+		iwe.cmd = IWEVCUSTOM;
+		sprintf(buf, "atim=%u", item->config.atim_window);
+		iwe.u.data.length = strlen(buf);
+		event = iwe_stream_add_point(event, end_buf, &iwe, buf);
+		
+		while(iel > 0) {
+			if(iep[0] == WLAN_EID_GENERIC && iep[1] >= 4 &&
+			   iep[2] == 0x00 && iep[3] == 0x50 &&
+			   iep[4] == 0xf2 && iep[5] == 1)
+			{
+				char *p = buf;
+				
+				i = iep[1] + 2;
+				if(i < iel)
+					iel = i;
+				
+				p += sprintf(p, "wpa_ie=");
+				for (i = 0; i < iel; i++)
+					p += sprintf(p, "%02x", iep[i]);
+				
+				DBGTRACE2("adding wpa_ie :%d\n", strlen(buf));
+				memset(&iwe, 0, sizeof(iwe));
+				iwe.cmd = IWEVCUSTOM;
+				iwe.u.data.length = strlen(buf);
+				event = iwe_stream_add_point(event, end_buf,
+							     &iwe, buf);
+				break;
+			}
+
+			iel -= iep[1];
+			iel -= 2;
+			iep += iep[1];
+			iep += 2;
+		}
+	}
+
+	DBGTRACE2("event = %p, current_val = %p", event, current_val);
+
+	TRACEEXIT1(return event);
+}
+
+static int iw_set_scan(struct net_device *dev, struct iw_request_info *info,
+		       union iwreq_data *wrqu, char *extra)
+{
+	struct ndis_handle *handle = dev->priv;
+	unsigned int res = 0;
+
+	TRACEENTER1("%s", "");
+	res = set_int(handle, NDIS_OID_BSSID_LIST_SCAN, 0);
+	if (res == NDIS_STATUS_NOT_SUPPORTED ||
+	    res == NDIS_STATUS_INVALID_DATA)
+	{
+		WARNING("scanning failed (%08X)", res);
+		handle->scan_timestamp = 0;
+		TRACEEXIT1(return -EOPNOTSUPP);
+	}
+	else
+	{
+		handle->scan_timestamp = jiffies;
+		TRACEEXIT1(return 0);
+	}
+}
+
+static int iw_get_scan(struct net_device *dev, struct iw_request_info *info,
+		       union iwreq_data *wrqu, char *extra)
+{
+ 	struct ndis_handle *handle = dev->priv;
+	unsigned int i, res, written, needed, list_len;
+	struct bssid_list *bssid_list;
+	char *event = extra;
+	struct ssid_item *cur_item ;
+
+	TRACEENTER1("%s", "");
+	if (!handle->scan_timestamp)
+		TRACEEXIT1(return -EOPNOTSUPP);
+
+	if (time_before(jiffies, handle->scan_timestamp + 3 * HZ))
+		return -EAGAIN;
+	
+	/* Try with space for 15 scan items */
+	list_len = sizeof(unsigned long) + sizeof(struct ssid_item) * 15;
+	bssid_list = kmalloc(list_len, GFP_KERNEL);
+
+	written = needed = 0;
+	res = doquery(handle, NDIS_OID_BSSID_LIST, (char *)bssid_list,
+		      list_len, &written, &needed);
+	if (res == NDIS_STATUS_INVALID_LENGTH)
+	{
+		/* 15 items not enough; allocate required space */
+		kfree(bssid_list);
+		list_len = needed;
+		bssid_list = kmalloc(list_len, GFP_KERNEL);
+	
+		res = doquery(handle, NDIS_OID_BSSID_LIST, (char*)bssid_list,
+			      list_len, &written, &needed);
+	}
+	if (res == NDIS_STATUS_INVALID_DATA)
+	{
+		WARNING("getting BSSID list failed (%08X)", res);
+		kfree(bssid_list);
+		TRACEEXIT1(return -EOPNOTSUPP);
+	}
+
+	for (i = 0, cur_item = &bssid_list->items[0] ;
+	     i < bssid_list->num_items ; i++)
+	{
+		event = ndis_translate_scan(dev, event,
+					    extra + IW_SCAN_MAX_DATA,
+					    cur_item);
+		cur_item = (struct ssid_item *)((char *)cur_item +
+						cur_item->length);
+	}
+	wrqu->data.length = event - extra;
+	wrqu->data.flags = 0;
+
+	kfree(bssid_list);
+	TRACEEXIT1(return 0);
+}
+
+static int iw_set_power_mode(struct net_device *dev,
+			     struct iw_request_info *info,
+			     union iwreq_data *wrqu, char *extra)
+{
+	struct ndis_handle *handle = dev->priv;
+	int res, power_mode;
+
+	if (wrqu->power.disabled == 1)
+		power_mode = NDIS_POWER_OFF;
+	else if (wrqu->power.flags & IW_POWER_MIN)
+		power_mode = NDIS_POWER_MIN;
+	else // if (wrqu->power.flags & IW_POWER_MAX)
+		power_mode = NDIS_POWER_MAX;
+
+	res = set_int(handle, NDIS_OID_POWER_MODE, power_mode);
+	if (res == NDIS_STATUS_INVALID_DATA)
+	{
+		WARNING("setting power mode failed (%08X)", res);
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static int iw_get_power_mode(struct net_device *dev,
+			     struct iw_request_info *info,
+			     union iwreq_data *wrqu, char *extra)
+{
+	struct ndis_handle *handle = dev->priv;
+	int res, power_mode;
+
+	res = query_int(handle, NDIS_OID_POWER_MODE, &power_mode);
+	if (res == NDIS_STATUS_NOT_SUPPORTED)
+	{
+		WARNING("getting power mode failed (%08X)", res);
+		return -EOPNOTSUPP;
+	}
+	if (power_mode == NDIS_POWER_OFF)
+		wrqu->power.disabled = 1;
+	else
+	{
+		if (wrqu->power.flags != 0)
+			return 0;
+		wrqu->power.flags |= IW_POWER_ALL_R;
+		wrqu->power.flags |= IW_POWER_TIMEOUT;
+		wrqu->power.value = 0;
+		wrqu->power.disabled = 0;
+
+		if (power_mode == NDIS_POWER_MIN)
+			wrqu->power.flags |= IW_POWER_MIN;
+		else // if (power_mode == NDIS_POWER_MAX)
+			wrqu->power.flags |= IW_POWER_MAX;
+	}
+	return 0;
+}
+
+static int iw_get_sensitivity(struct net_device *dev,
+			      struct iw_request_info *info,
+			      union iwreq_data *wrqu, char *extra)
+{
+	struct ndis_handle *handle = dev->priv;
+	unsigned int res, written, needed;
+	unsigned long rssi_trigger;
+
+	res = doquery(handle, NDIS_OID_RSSI_TRIGGER, (char *)&rssi_trigger,
+		      sizeof(rssi_trigger), &written, &needed);
+	if (res)
+		return -EOPNOTSUPP;
+	wrqu->param.value = rssi_trigger;
+	wrqu->param.disabled = (rssi_trigger == 0);
+	wrqu->param.fixed = 1;
+	return 0;
+}
+
+static int iw_set_sensitivity(struct net_device *dev,
+			      struct iw_request_info *info,
+			      union iwreq_data *wrqu, char *extra)
+{
+	struct ndis_handle *handle = dev->priv;
+	unsigned int res, written, needed;
+	unsigned long rssi_trigger;
+
+	if (wrqu->param.disabled)
+		rssi_trigger = 0;
+	else
+		rssi_trigger = wrqu->param.value;
+	res = dosetinfo(handle, NDIS_OID_RSSI_TRIGGER, (char *)&rssi_trigger,
+			sizeof(rssi_trigger), &written, &needed);
+	if (res)
+		return -EINVAL;
+	return 0;
+}
+
+struct iw_statistics *get_wireless_stats(struct net_device *dev)
+{
+	struct ndis_handle *handle = dev->priv;
+	return &handle->wireless_stats;
+}
+
+
+static int iw_get_ndis_stats(struct net_device *dev,
+			     struct iw_request_info *info,
+			     union iwreq_data *wrqu, char *extra)
+
+{
+	struct iw_statistics *stats = get_wireless_stats(dev);
+	memcpy(&wrqu->qual, &stats->qual, sizeof(stats->qual));
+	return 0;
+}
+
+static int iw_get_range(struct net_device *dev, struct iw_request_info *info,
+			union iwreq_data *wrqu, char *extra)
+{
+	struct iw_range *range = (struct iw_range *)extra;
+	struct iw_point *data = &wrqu->data;
+	struct ndis_handle *handle = (struct ndis_handle *)dev->priv;
+	unsigned int i, written, needed;
+	unsigned char rates[NDIS_MAX_RATES];
+	unsigned long tx_power;
+
+	data->length = sizeof(struct iw_range);
+	memset(range, 0, sizeof(struct iw_range));
+	
+	range->txpower_capa = IW_TXPOW_MWATT;
+	range->num_txpower = 0;
+
+	if (!doquery(handle, NDIS_OID_TX_POWER_LEVEL, (char*)&tx_power,
+		     sizeof(tx_power), &written, &needed))
+	{
+		range->num_txpower = 1;
+		range->txpower[0] = tx_power;
+	}
+
+
+	range->we_version_compiled = WIRELESS_EXT;
+	range->we_version_source = 0;
+
+	range->retry_capa = IW_RETRY_LIMIT;
+	range->retry_flags = IW_RETRY_LIMIT;
+	range->min_retry = 0;
+	range->max_retry = 255;
+
+	range->num_channels = 1;
+	
+	range->max_qual.qual = 100;
+	range->max_qual.level = 154;
+	range->max_qual.noise = 154;
+	range->sensitivity = 3;
+
+	range->max_encoding_tokens = 4;
+	range->num_encoding_sizes = 2;
+	range->encoding_size[0] = 5;
+	range->encoding_size[1] = 13;
+
+	range->num_bitrates = 0;
+	if (!doquery(handle, NDIS_OID_SUPPORTED_RATES, (char *)&rates,
+		    sizeof(rates), &written, &needed))
+	{
+		for (i = 0 ; i < NDIS_MAX_RATES && rates[i] ; i++)
+			if (range->num_bitrates < IW_MAX_BITRATES &&
+			    rates[i] & 0x80)
+			{
+				range->bitrate[range->num_bitrates] =
+					(rates[i] & 0x7f) * 500000;
+				range->num_bitrates++;
+			}
+	}
+
+	range->num_channels = (sizeof(freq_chan)/sizeof(freq_chan[0]));
+
+	for(i = 0; i < (sizeof(freq_chan)/sizeof(freq_chan[0])) &&
+		    i < IW_MAX_FREQUENCIES; i++)
+	{
+		range->freq[i].i = i + 1;
+		range->freq[i].m = freq_chan[i] * 100000;
+		range->freq[i].e = 1;
+	}
+	range->num_frequency = i;
+
+
+	range->min_rts = 0;
+	range->max_rts = 2347;
+	range->min_frag = 256;
+	range->max_frag = 2346;
+
+	return 0;
+}
+
+static const iw_handler	ndis_handler[] = {
+	[SIOCGIWNAME	- SIOCIWFIRST] = iw_get_name,
+	[SIOCSIWESSID	- SIOCIWFIRST] = iw_set_essid,
+	[SIOCGIWESSID	- SIOCIWFIRST] = iw_get_essid,
+	[SIOCSIWMODE	- SIOCIWFIRST] = iw_set_mode,
+	[SIOCGIWMODE	- SIOCIWFIRST] = iw_get_mode,
+	[SIOCGIWFREQ	- SIOCIWFIRST] = iw_get_freq,
+	[SIOCSIWFREQ	- SIOCIWFIRST] = iw_set_freq,
+	[SIOCGIWTXPOW	- SIOCIWFIRST] = iw_get_tx_power,
+	[SIOCSIWTXPOW	- SIOCIWFIRST] = iw_set_tx_power,
+	[SIOCGIWRATE	- SIOCIWFIRST] = iw_get_bitrate,
+	[SIOCSIWRATE	- SIOCIWFIRST] = iw_set_dummy,
+	[SIOCGIWRTS	- SIOCIWFIRST] = iw_get_rts_threshold,
+	[SIOCGIWFRAG	- SIOCIWFIRST] = iw_get_frag_threshold,
+	[SIOCGIWAP	- SIOCIWFIRST] = iw_get_ap_address,
+	[SIOCSIWAP	- SIOCIWFIRST] = iw_set_ap_address,
+	[SIOCSIWENCODE	- SIOCIWFIRST] = iw_set_encr,
+	[SIOCGIWENCODE	- SIOCIWFIRST] = iw_get_encr,
+	[SIOCSIWSCAN	- SIOCIWFIRST] = iw_set_scan,
+	[SIOCGIWSCAN	- SIOCIWFIRST] = iw_get_scan,
+	[SIOCGIWPOWER	- SIOCIWFIRST] = iw_get_power_mode,
+	[SIOCSIWPOWER	- SIOCIWFIRST] = iw_set_power_mode,
+	[SIOCGIWRANGE	- SIOCIWFIRST] = iw_get_range,
+	[SIOCGIWSTATS	- SIOCIWFIRST] = iw_get_ndis_stats,
+	[SIOCGIWSENS	- SIOCIWFIRST] = iw_get_sensitivity,
+	[SIOCSIWSENS	- SIOCIWFIRST] = iw_set_sensitivity,
+	[SIOCGIWNICKN	- SIOCIWFIRST] = iw_get_nick,
+	[SIOCSIWNICKN	- SIOCIWFIRST] = iw_set_nick,
+	[SIOCSIWCOMMIT	- SIOCIWFIRST] = iw_set_dummy,
+};
+
+/* private ioctl's */
+
+static int priv_reset(struct net_device *dev, struct iw_request_info *info,
+		      union iwreq_data *wrqu, char *extra)
+{
+	int res;
+	res = doreset(dev->priv);
+	if (res)
+	{
+		WARNING("reset returns %08X", res);
+		return -EINVAL;
+	}
+	return 0;
+}
+
+static int priv_power_profile(struct net_device *dev,
+			      struct iw_request_info *info,
+			      union iwreq_data *wrqu, char *extra)
+{
+	struct ndis_handle *handle = dev->priv;
+	struct miniport_char *miniport = &handle->driver->miniport_char;
+	unsigned long profile_inf;
+
+	miniport = &handle->driver->miniport_char;
+	if (!miniport->pnp_event_notify)
+		TRACEEXIT(return -EOPNOTSUPP);
+
+	/* 1 for AC and 0 for Battery */
+	if (wrqu->param.value)
+		profile_inf = NDIS_POWER_PROFILE_AC;
+	else
+		profile_inf = NDIS_POWER_PROFILE_BATTERY;
+	
+	miniport->pnp_event_notify(handle->adapter_ctx,
+				   NDIS_PNP_PROFILE_CHANGED,
+				   &profile_inf, sizeof(profile_inf));
+	TRACEEXIT(return 0);
+}
+
+/* WPA support */
+
+static int wpa_set_wpa(struct net_device *dev, struct iw_request_info *info,
+		       union iwreq_data *wrqu, char *extra)
+{
+	struct ndis_handle *handle = (struct ndis_handle *)dev->priv;
+	
+	TRACEENTER("%s", "");
+	DBGTRACE("flags = %d,  handle->capa = %ld",
+		 wrqu->data.flags, handle->capa);
+	
+	if (test_bit(CAPA_WPA, &handle->capa))
+		TRACEEXIT(return 0);
+	else
+	{
+		WARNING("%s", "driver is not WPA capable");
+		TRACEEXIT(return -EINVAL);
+	}
+}
+
+static int char_to_hex(int c)
+{
+	if (c >= '0' && c <= '9')
+		return c - '0';
+	if (c >= 'a' && c <= 'f')
+		return c - 'a' + 10;
+	return -1;
+}
+
+/* convert key in string to hex digits - 2 chars make up one digit */
+static int key_str_to_hex(const char *str, unsigned char *key, int str_len)
+{
+	int i, key_len;
+
+	if (!memcmp(str, "s:", 2))
+	{
+		key_len = str_len-2;
+		if (key_len >= IW_ENCODING_TOKEN_MAX)
+			TRACEEXIT(return -1);
+		memcpy(key, str+2, key_len);
+	}
+	else
+		for (i = key_len = 0; i < str_len-1; i += 2, key_len++)
+		{
+			int c1, c2;
+
+			if (key_len >= IW_ENCODING_TOKEN_MAX)
+				TRACEEXIT(return -1);
+			/* sscanf(str, "%1X", &ch) doesn't seem to work */
+			c1 = char_to_hex(tolower(str[i]));
+			c2 = char_to_hex(tolower(str[i+1]));
+			if (c1 < 0 || c2 < 0)
+				TRACEEXIT(return -1);
+			key[key_len] = c1 << 4 | c2;
+		}
+	DBGTRACE("key length = %d", key_len);
+	if (key_len == 5 || key_len == 13)
+		TRACEEXIT(return key_len);
+	else
+		TRACEEXIT(return -1);
+}
+
+static int wpa_set_key(struct net_device *dev, struct iw_request_info *info,
+		       union iwreq_data *wrqu, char *extra)
+{
+	struct ndis_handle *handle = (struct ndis_handle *)dev->priv;
+	struct ndis_wpa_key ndis_key;
+	struct wpa_key wpa_key;
+	int i, res, written, needed;
+	u8 addr[ETH_ALEN];
+	u8 seq[IW_ENCODING_TOKEN_MAX];
+	u8 usrkey[IW_ENCODING_TOKEN_MAX];
+
+	copy_from_user(&wpa_key, wrqu->data.pointer, sizeof(wpa_key));
+	if(wpa_key.addr)
+		copy_from_user(&addr, wpa_key.addr, ETH_ALEN);
+
+	if(wpa_key.seq)
+		copy_from_user(&seq, wpa_key.seq, IW_ENCODING_TOKEN_MAX);
+
+	if(wpa_key.key)
+		copy_from_user(&usrkey, wpa_key.key, IW_ENCODING_TOKEN_MAX);
+	
+	TRACEENTER1("alg = %d, key_index = %d",
+		    wpa_key.alg, wpa_key.key_index);
+	
+	if (wpa_key.alg == WPA_ALG_NONE || wpa_key.key_len == 0)
+	{
+		struct ndis_remove_key ndis_remove_key;
+
+		ndis_remove_key.struct_size = sizeof(ndis_remove_key);
+		ndis_remove_key.index = wpa_key.key_index;
+		if (wpa_key.addr)
+			memcpy(&ndis_remove_key.bssid, addr,
+			       ETH_ALEN);
+		else
+			memset(&ndis_remove_key.bssid, 0xff, ETH_ALEN);
+		res = dosetinfo(handle, NDIS_OID_REMOVE_KEY,
+				(char *)&ndis_remove_key,
+				sizeof(ndis_remove_key), &written, &needed);
+		if (res == NDIS_STATUS_INVALID_DATA)
+		{
+			DBGTRACE("removing key failed with %08X, %d, %d",
+			       res, needed, sizeof(ndis_remove_key));
+			TRACEEXIT(return -EINVAL);
+		}
+		if (wpa_key.key_index >= 0 &&
+		    wpa_key.key_index < MAX_ENCR_KEYS)
+		{
+			handle->encr_info.keys[wpa_key.key_index].length = 0;
+			if (wpa_key.key_index == handle->encr_info.active)
+				set_encr_mode(handle, ENCR_DISABLED);
+		}
+
+		TRACEEXIT(return 0);
+	}
+
+	if (wpa_key.alg == WPA_ALG_WEP)
+	{
+		union iwreq_data encr_req;
+		unsigned char key[IW_ENCODING_TOKEN_MAX];
+		int i;
+
+		if (test_bit(CAPA_ENCR_NONE, &handle->capa))
+			TRACEEXIT(return -EINVAL);
+
+		memset(&encr_req, 0, sizeof(encr_req));
+		encr_req.data.flags = wpa_key.key_index;
+		/* auth mode is set with set_auth_alg */
+		if (handle->auth_mode == AUTHMODE_OPEN)
+			encr_req.data.flags |= IW_ENCODE_OPEN;
+		else
+			encr_req.data.flags |= IW_ENCODE_RESTRICTED;
+		i = key_str_to_hex(usrkey, key, wpa_key.key_len);
+		if (i < 0)
+			TRACEEXIT(return -EINVAL);
+		encr_req.data.length = i;
+		encr_req.data.pointer = key;
+		if (iw_set_encr(dev, info, &encr_req, key))
+			TRACEEXIT(return -EINVAL);
+		else
+			TRACEEXIT(return 0);
+	}
+
+	/* alg is either WPA_ALG_TKIP or WPA_ALG_CCMP */
+	if (!test_bit(CAPA_WPA, &handle->capa))
+		TRACEEXIT1(return -EINVAL);
+
+	if (wpa_key.key_len > sizeof(ndis_key.key))
+	{
+		DBGTRACE("incorrect key length (%d)", wpa_key.key_len);
+		TRACEEXIT1(return -EINVAL);
+	}
+	
+	DBGTRACE("adding key %d, %d", wpa_key.key_index, wpa_key.key_len);
+	memset(&ndis_key, 0, sizeof(ndis_key));
+
+	if (wpa_key.key_len > IW_ENCODING_TOKEN_MAX)
+	{
+		DBGTRACE1("incorrect key? length = (%d)", wpa_key.key_len);
+		TRACEEXIT1(return -EINVAL);
+	}
+	memcpy(&ndis_key.key, usrkey, wpa_key.key_len);
+
+	ndis_key.struct_size = sizeof(ndis_key);
+	ndis_key.length = wpa_key.key_len;
+
+	if (wpa_key.seq_len > IW_ENCODING_TOKEN_MAX)
+	{
+		DBGTRACE1("incorrect seq? length = (%d)", wpa_key.seq_len);
+		TRACEEXIT1(return -EINVAL);
+	}
+
+	for (i = 0, ndis_key.rsc = 0 ; i < wpa_key.seq_len ; i++)
+		ndis_key.rsc |= (seq[i] << (i * 8));
+
+	if (wpa_key.key_index == 0) /* pairwise key */
+		ndis_key.index = (1 << 31) | (1 << 30);
+	else
+		ndis_key.index = wpa_key.key_index;
+
+	if (!memcmp(&addr, "\xff\xff\xff\xff\xff\xff", ETH_ALEN))
+	{
+		mac_address ap_addr;
+
+		get_ap_address(handle, ap_addr);
+		memcpy(&ndis_key.bssid, &ap_addr, ETH_ALEN);
+	}
+	else
+		memcpy(&ndis_key.bssid, addr, ETH_ALEN);
+	DBGTRACE("bssid " MACSTR, MAC2STR(ndis_key.bssid));
+
+	if (wpa_key.alg == WPA_ALG_TKIP && wpa_key.key_len == 32)
+	{
+		/* wpa_supplicant gives us the Michael MIC RX/TX keys in
+		 * different order than NDIS spec, so swap the order here. */
+		u8 tmp[8];
+		memcpy(tmp, ndis_key.key + 16, 8);
+		memcpy(ndis_key.key + 16, ndis_key.key + 24, 8);
+		memcpy(ndis_key.key + 24, tmp, 8);
+	}
+
+	res = dosetinfo(handle, NDIS_OID_ADD_KEY, (char *)&ndis_key,
+			ndis_key.struct_size, &written, &needed);
+	if (res == NDIS_STATUS_INVALID_DATA)
+	{
+		DBGTRACE("adding key failed (%08X), %d, %d, %lu",
+			 res, written, needed, ndis_key.struct_size);
+		TRACEEXIT(return -EINVAL);
+	}
+	memcpy(&handle->encr_info.keys[wpa_key.key_index].key, &ndis_key.key,
+	       NDIS_ENCODING_TOKEN_MAX);
+	handle->encr_info.keys[wpa_key.key_index].length = 
+		wpa_key.key_len;
+	TRACEEXIT(return 0);
+}
+
+static int wpa_disassociate(struct net_device *dev,
+			    struct iw_request_info *info,
+			    union iwreq_data *wrqu, char *extra)
+{
+	struct ndis_handle *handle = (struct ndis_handle *)dev->priv;
+	mac_address ap_addr;
+	
+	TRACEENTER("%s", "");
+	get_ap_address(handle, ap_addr);
+	DBGTRACE("bssid " MACSTR, MAC2STR(ap_addr));
+	/* FIXME: clear keys, essid etc. */
+	/* calling NDIS_OID_DISASSOCIATE here turns off the radio and further
+	 * communication is not possible */
+//	if (doreset(handle))
+//		TRACEEXIT(return -EOPNOTSUPP);
+
+	/* we set an impossible essid to disassociate - see note in
+	 * iw_set_essid; setting an empty essid doesn't disassociate */
+	set_essid(handle, " ", 1);
+	get_ap_address(handle, ap_addr);
+	DBGTRACE("bssid " MACSTR, MAC2STR(ap_addr));
+	TRACEEXIT(return 0);
+}
+
+static int wpa_associate(struct net_device *dev,
+			 struct iw_request_info *info,
+			 union iwreq_data *wrqu, char *extra)
+{
+	struct ndis_handle *handle = (struct ndis_handle *)dev->priv;
+	struct wpa_assoc_info wpa_assoc_info;
+	char ssid[NDIS_ESSID_MAX_SIZE];
+	
+	TRACEENTER("%s", "");
+	copy_from_user(&wpa_assoc_info, wrqu->data.pointer,
+		       sizeof(wpa_assoc_info));
+
+	if(wpa_assoc_info.ssid)
+		copy_from_user(&ssid, wpa_assoc_info.ssid, NDIS_ESSID_MAX_SIZE);
+	
+	DBGTRACE("key_mgmt_suite = %d, pairwise_suite = %d, group_suite= %d",
+		 wpa_assoc_info.key_mgmt_suite,
+		 wpa_assoc_info.pairwise_suite, wpa_assoc_info.group_suite);
+	if (wpa_assoc_info.key_mgmt_suite != KEY_MGMT_PSK &&
+	    wpa_assoc_info.key_mgmt_suite != KEY_MGMT_NONE)
+		TRACEEXIT(return -EINVAL);
+
+	switch (wpa_assoc_info.key_mgmt_suite)
+	{
+	case KEY_MGMT_PSK:
+		if (set_auth_mode(handle, AUTHMODE_WPAPSK))
+			TRACEEXIT(return -EINVAL);
+		break;
+	case KEY_MGMT_NONE:
+		if (wpa_assoc_info.group_suite != CIPHER_WEP104 &&
+		    wpa_assoc_info.group_suite != CIPHER_WEP40)
+			TRACEEXIT(return -EINVAL);
+		break;
+	default:
+		TRACEEXIT(return -EINVAL);
+	}
+
+	switch (wpa_assoc_info.group_suite)
+	{
+	case CIPHER_CCMP:
+		if (!test_bit(CAPA_AES, &handle->capa) ||
+		    set_encr_mode(handle, ENCR3_ENABLED))
+			TRACEEXIT(return -EINVAL);
+		break;
+	case CIPHER_TKIP:
+		if (!test_bit(CAPA_WPA, &handle->capa) ||
+		    set_encr_mode(handle, ENCR2_ENABLED))
+			TRACEEXIT(return -EINVAL);
+		break;
+	case CIPHER_WEP104:
+	case CIPHER_WEP40:
+		if (test_bit(CAPA_ENCR_NONE, &handle->capa))
+			TRACEEXIT(return -EINVAL);
+		break;
+	default:
+		TRACEEXIT(return -EINVAL);
+	}
+
+	if (set_essid(handle, ssid, wpa_assoc_info.ssid_len))
+		TRACEEXIT(return -EINVAL);
+
+	TRACEEXIT(return 0);
+}
+
+static int wpa_set_countermeasures(struct net_device *dev,
+				   struct iw_request_info *info,
+				   union iwreq_data *wrqu, char *extra)
+{
+	TRACEENTER("%s", "");
+	return 0;
+}
+
+static int wpa_deauthenticate(struct net_device *dev,
+			      struct iw_request_info *info,
+			      union iwreq_data *wrqu, char *extra)
+{
+	struct ndis_handle *handle = (struct ndis_handle *)dev->priv;
+	mac_address ap_addr;
+	
+	TRACEENTER("%s", "");
+	get_ap_address(handle, ap_addr);
+	DBGTRACE("bssid " MACSTR, MAC2STR(ap_addr));
+	/* FIXME: clear keys, essid etc. */
+	/* calling NDIS_OID_DISASSOCIATE here turns off the radio and further
+	 * communication is not possible, so do a reset */
+//	if (doreset(handle))
+//		TRACEEXIT(return -EOPNOTSUPP);
+
+	/* we set an impossible essid to disassociate - see note in
+	 * iw_set_essid; setting an empty essid doesn't disassociate */
+	set_essid(handle, " ", 1);
+	get_ap_address(handle, ap_addr);
+	DBGTRACE("bssid " MACSTR, MAC2STR(ap_addr));
+	TRACEEXIT(return 0);
+}
+
+int set_privacy_filter(struct ndis_handle *handle, int flags)
+{
+	int res;
+
+	TRACEENTER("filter: %d", flags);
+	res = set_int(handle, NDIS_OID_PRIVACY_FILTER, flags);
+	if (res == NDIS_STATUS_INVALID_DATA)
+	{
+		WARNING("setting privacy filter to %d failed (%08X)",
+			flags, res);
+		TRACEEXIT(return -EINVAL);
+	}
+	TRACEEXIT(return 0);
+}
+
+static int wpa_set_privacy_filter(struct net_device *dev,
+				  struct iw_request_info *info,
+				  union iwreq_data *wrqu, char *extra)
+{
+	struct ndis_handle *handle = (struct ndis_handle *)dev->priv;
+	int flags;
+
+	TRACEENTER("filter: %d", wrqu->param.value);
+	if (wrqu->param.value)
+		flags = NDIS_PRIV_WEP;
+	else
+		flags = NDIS_PRIV_ACCEPT_ALL;
+	if (set_privacy_filter(handle, flags))
+		TRACEEXIT(return -EINVAL);
+	TRACEEXIT(return 0);
+}
+
+static int wpa_set_auth_alg(struct net_device *dev,
+			    struct iw_request_info *info,
+			    union iwreq_data *wrqu, char *extra)
+{
+	struct ndis_handle *handle = (struct ndis_handle *)dev->priv;
+	int mode;
+	
+	if (wrqu->param.value == AUTH_ALG_OPEN_SYSTEM)
+		mode = AUTHMODE_OPEN;
+	else if (wrqu->param.value == AUTH_ALG_SHARED_KEY)
+		mode = AUTHMODE_RESTRICTED;
+	else
+		TRACEEXIT(return -EINVAL);
+
+	/* wpa_supplicant assumes OPEN mode, but it won't work if RESTRCITED
+	 * mode is used, so we try with AUTO mode always hoping the driver
+	 * chooses what is appropriate */
+	if (set_auth_mode(handle, AUTHMODE_AUTO))
+		TRACEEXIT(return -EINVAL);
+	TRACEEXIT(return 0);
+}
+
+static const struct iw_priv_args priv_args[] = {
+	{WPA_SET_WPA, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "setwpa"},
+	{WPA_SET_KEY, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "setkey"},
+	{WPA_ASSOCIATE, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0,
+	 "associate"},
+	{WPA_DISASSOCIATE, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0,
+	 "disassociate"},
+	{WPA_DROP_UNENCRYPTED, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0,
+	 "drop_unencrypted"},
+	{WPA_SET_COUNTERMEASURES, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0,
+	 "countermeaures"},
+	{WPA_DEAUTHENTICATE, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0,
+	 "deauthenticate"},
+	{WPA_SET_AUTH_ALG, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0,
+	 "auth_alg"},
+
+	{PRIV_RESET, 0, 0, "ndis_reset"},
+	{PRIV_POWER_PROFILE, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0,
+	 "power_profile"},
+};
+
+static const iw_handler priv_handler[] = {
+	[WPA_SET_WPA 		- SIOCIWFIRSTPRIV] = wpa_set_wpa,
+	[WPA_SET_KEY 		- SIOCIWFIRSTPRIV] = wpa_set_key,
+	[WPA_ASSOCIATE 		- SIOCIWFIRSTPRIV] = wpa_associate,
+	[WPA_DISASSOCIATE 	- SIOCIWFIRSTPRIV] = wpa_disassociate,
+	[WPA_DROP_UNENCRYPTED 	- SIOCIWFIRSTPRIV] = wpa_set_privacy_filter,
+	[WPA_SET_COUNTERMEASURES- SIOCIWFIRSTPRIV] = wpa_set_countermeasures,
+	[WPA_DEAUTHENTICATE 	- SIOCIWFIRSTPRIV] = wpa_deauthenticate,
+	[WPA_SET_AUTH_ALG 	- SIOCIWFIRSTPRIV] = wpa_set_auth_alg,
+
+	[PRIV_RESET 		- SIOCIWFIRSTPRIV] = priv_reset,
+	[PRIV_POWER_PROFILE 	- SIOCIWFIRSTPRIV] = priv_power_profile,
+};
+
+const struct iw_handler_def ndis_handler_def = {
+	.num_standard	= sizeof(ndis_handler) / sizeof(ndis_handler[0]),
+	.num_private	= sizeof(priv_handler) / sizeof(priv_handler[0]),
+	.num_private_args = sizeof(priv_args) / sizeof(priv_args[0]),
+
+	.standard	= (iw_handler *)ndis_handler,
+	.private	= (iw_handler *)priv_handler,
+	.private_args	= (struct iw_priv_args *)priv_args,
+};
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/iw_ndis.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/iw_ndis.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/iw_ndis.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/iw_ndis.h	2004-09-05 15:48:55.000000000 +0200
@@ -0,0 +1,30 @@
+/*
+ *  Copyright (C) 2003-2004 Pontus Fuchs, Giridhar Pemmasani
+ *
+ *  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.
+ *
+ */
+#ifndef IW_NDIS_H
+#define IW_NDIS_H
+
+#include "ndis.h"
+
+extern const struct iw_handler_def ndis_handler_def;
+
+int set_essid(struct ndis_handle *handle, const char *ssid, int ssid_len);
+int set_mode(struct ndis_handle *handle, enum op_mode mode);
+struct iw_statistics *get_wireless_stats(struct net_device *dev);
+int get_ap_address(struct ndis_handle *handle, mac_address mac);
+int set_auth_mode(struct ndis_handle *handle, int auth_mode);
+int set_encr_mode(struct ndis_handle *handle, int encr_mode);
+int set_privacy_filter(struct ndis_handle *handle, int flags);
+
+#endif // IW_NDIS_H
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/loader.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/loader.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/loader.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/loader.c	2004-09-05 15:48:55.000000000 +0200
@@ -0,0 +1,232 @@
+/*
+ *  Copyright (C) 2003-2004 Pontus Fuchs, Giridhar Pemmasani
+ *
+ *  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.
+ *
+ */
+#include <linux/module.h>
+#include <linux/mm.h>
+#include <asm/pgalloc.h>
+
+#include "coffpe.h"
+#include "ndis.h"
+
+#define RADR(base, rva, type) (type) ((char*)base + rva)
+
+extern struct wrap_func ntos_wrap_funcs[], ndis_wrap_funcs[],
+	misc_wrap_funcs[], hal_wrap_funcs[];
+
+WRAP_FUNC *get_wrap_func(char *name)
+{
+	int i;
+
+	for (i = 0 ; ntos_wrap_funcs[i].name != NULL; i++)
+		if (strcmp(ntos_wrap_funcs[i].name, name) == 0)
+			return ntos_wrap_funcs[i].func;
+
+	for (i = 0 ; ndis_wrap_funcs[i].name != NULL; i++)
+		if (strcmp(ndis_wrap_funcs[i].name, name) == 0)
+			return ndis_wrap_funcs[i].func;
+
+	for (i = 0 ; misc_wrap_funcs[i].name != NULL; i++)
+		if (strcmp(misc_wrap_funcs[i].name, name) == 0)
+			return misc_wrap_funcs[i].func;
+
+	for (i = 0 ; hal_wrap_funcs[i].name != NULL; i++)
+		if (strcmp(hal_wrap_funcs[i].name, name) == 0)
+			return hal_wrap_funcs[i].func;
+
+	return NULL;
+}
+
+/*
+ * Find and validate the coff header
+ *
+ */
+static struct mscoff_hdr *check_coff_hdr(void *image, int size, int offset)
+{
+	const char pe_sign[4] = {'P', 'E', 0, 0};
+	long char_must;
+
+	struct mscoff_hdr * hdr;
+
+	/* Make sure we have enough data */
+	if(offset + sizeof(struct mscoff_hdr) + 4 > size)
+		return 0;
+
+	/* Validate the pe signature */
+	if(memcmp(pe_sign, image + offset, 4) != 0)
+		return 0;
+
+	/* Right after the signature comes the header */
+	hdr = (struct mscoff_hdr*) (image + offset + 4);
+
+	/* Make sure Image is PE32 */
+	if(hdr->magic != COFF_MAGIC_PE32)
+		return 0;
+	
+	if(hdr->stdhdr.machine != COFF_MACHINE_I386)
+	{
+		ERROR("%s", "Driver is not for i386");
+		return 0;
+	}
+
+	/* Make sure this is a relocatable 32 bit dll */
+	char_must = COFF_CHAR_IMAGE | COFF_CHAR_32BIT;
+	if((hdr->stdhdr.characteristics & char_must) != char_must)
+		return 0;
+
+	/* Must be a relocatable dll */
+	if((hdr->stdhdr.characteristics & COFF_CHAR_RELOCS_STRIPPED))
+		return 0;
+
+	/* Make sure we have at least one section */
+	if(hdr->stdhdr.num_sections == 0)
+		return 0;
+
+	if(hdr->section_alignment != hdr->file_alignment)
+	{
+		ERROR("Alignment mismatch: secion: 0x%lx, file: 0x%lx",
+		      hdr->section_alignment, hdr->file_alignment);
+		return 0;
+	}
+
+	return hdr;
+}
+
+
+static int import(void *image, struct coffpe_import_dirent *dirent, char *dll)
+{
+	cu32 *lookup_tbl, *address_tbl;
+	char *symname = 0;
+	int i;
+	WRAP_FUNC *adr;
+	int ret = 0;
+
+	lookup_tbl  = RADR(image, dirent->import_lookup_tbl,    cu32*);
+	address_tbl = RADR(image, dirent->import_address_table, cu32*);
+
+	for(i = 0; lookup_tbl[i]; i++) {
+		if(lookup_tbl[i] & 0x80000000) {
+			ERROR("ordinal import not supported: %d",
+			      (int) lookup_tbl[i]);
+			return -1;
+		}
+		else {
+			symname = RADR(image, ((lookup_tbl[i] & 0x7fffffff) + 2), char*);
+		}
+
+		adr = get_wrap_func(symname);
+		if(adr == 0)
+		{
+			ERROR("Unknown symbol: %s:%s", dll, symname);
+			ret = -1;
+		}
+		DBGTRACE1("Importing rva %08x: %s : %s",
+			  (int)(&address_tbl[i]) - (int)image, dll, symname); 
+		address_tbl[i] = (cu32)adr;
+	}
+	return ret;
+}
+
+static int load_imports(void *image, struct coffpe_import_dirent *dirent)
+{
+	int i;
+	char *name;
+	int ret = 0, res;
+	for(i = 0; dirent[i].name_rva; i++) {
+		name = RADR(image, dirent[i].name_rva, char*);
+
+		//printk("Imports from dll: %s\n", name);
+		res = import(image, &dirent[i], name);
+		if(res)
+			ret = res;			
+	}
+	return ret;
+}
+
+
+/*
+ * Perform relocations described by <fixups> of a block at <blockbase> 
+ * of size <size>.
+ */
+static void reloc_block(void *image, cu32 blockbase, cu16 *fixups, int size, int delta)
+{
+	cu32 fixup_adr;
+	int type, offset, i;
+
+	for(i = 0; i < size; i++) {
+		type = (fixups[i] >> 12) & 0xf;
+		offset = fixups[i] & 0xfff;
+		fixup_adr = (cu32)image + blockbase + offset;
+
+		switch(type) {
+		case COFF_FIXUP_HIGHLOW:
+			*(cu32*) fixup_adr += delta;
+			break;
+		case COFF_FIXUP_ABSOLUTE:
+			break;
+		default:
+			ERROR("Unsupported fixup type 0x%x at offset %04x",
+			      type, offset); 
+			break;
+		}
+	}
+}
+
+/*
+ * Perform relocations
+ */
+static int do_reloc(void *image, int relocs_offset, int size, int delta)
+{
+	struct coffpe_relocs *curr;
+	int processed = 0;
+	while(processed < size) {
+		curr = RADR(image, (long)relocs_offset + processed, struct coffpe_relocs*);
+
+		reloc_block(image, 
+			    curr->page_rva,
+			    (cu16*) (curr+1), 
+			    (int) ((curr->block_size - sizeof(struct coffpe_relocs)) >> 1),
+		            delta);
+		processed += curr->block_size;
+	}
+
+	return 0;
+}
+
+/* This one can be used to calc RVA's from virtual addressed so it's nice to have as a global */
+int image_offset;
+
+int prepare_coffpe_image(void **entry, void *image, int size)
+{
+	int header_offset;
+	struct mscoff_hdr *hdr;
+	/* The PE header is found at the RVA specified at offset 3c. */
+	if(size < 0x3c + 4)
+		return -1;
+	header_offset =  *(long*)(image+0x3c);
+//	DBGTRACE("PE Header at offset %08x", (int) header_offset);
+
+	hdr = check_coff_hdr(image, size, header_offset);
+	if(hdr == 0)
+		return -1;
+
+	if(load_imports(image, RADR(image, hdr->import_tbl.rva, struct coffpe_import_dirent*)))
+		return -1;
+		
+	do_reloc(image, hdr->basereloc_tbl.rva, hdr->basereloc_tbl.size, (int)image - hdr->image_base);
+	flush_icache_range(image, size);
+
+	image_offset = (int)image - hdr->image_base;
+	*entry = RADR(image, hdr->entry_rva, void*);
+	return 0;
+}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/loader.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/loader.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/loader.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/loader.h	2004-09-05 15:48:55.000000000 +0200
@@ -0,0 +1,21 @@
+/*
+ *  Copyright (C) 2003-2004 Pontus Fuchs, Giridhar Pemmasani
+ *
+ *  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.
+ *
+ */
+#ifndef LOADER_H
+#define LOADER_H
+
+#include "wrapper.h"
+int prepare_coffpe_image(void **entry, void *image, int size);
+
+#endif /* LOADER_H */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/longlong.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/longlong.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/longlong.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/longlong.h	2004-09-05 15:48:55.000000000 +0200
@@ -0,0 +1,1333 @@
+/* longlong.h -- definitions for mixed size 32/64 bit arithmetic.
+   Copyright (C) 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+   Free Software Foundation, Inc.
+
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+/* You have to define the following before including this file:
+
+   UWtype -- An unsigned type, default type for operations (typically a "word")
+   UHWtype -- An unsigned type, at least half the size of UWtype.
+   UDWtype -- An unsigned type, at least twice as large a UWtype
+   W_TYPE_SIZE -- size in bits of UWtype
+
+   UQItype -- Unsigned 8 bit type.
+   SItype, USItype -- Signed and unsigned 32 bit types.
+   DItype, UDItype -- Signed and unsigned 64 bit types.
+
+   On a 32 bit machine UWtype should typically be USItype;
+   on a 64 bit machine, UWtype should typically be UDItype.
+*/
+
+#define __BITS4 (W_TYPE_SIZE / 4)
+#define __ll_B ((UWtype) 1 << (W_TYPE_SIZE / 2))
+#define __ll_lowpart(t) ((UWtype) (t) & (__ll_B - 1))
+#define __ll_highpart(t) ((UWtype) (t) >> (W_TYPE_SIZE / 2))
+
+#ifndef W_TYPE_SIZE
+#define W_TYPE_SIZE	32
+#define UWtype		USItype
+#define UHWtype		USItype
+#define UDWtype		UDItype
+#endif
+
+/* Define auxiliary asm macros.
+
+   1) umul_ppmm(high_prod, low_prod, multipler, multiplicand) multiplies two
+   UWtype integers MULTIPLER and MULTIPLICAND, and generates a two UWtype
+   word product in HIGH_PROD and LOW_PROD.
+
+   2) __umulsidi3(a,b) multiplies two UWtype integers A and B, and returns a
+   UDWtype product.  This is just a variant of umul_ppmm.
+
+   3) udiv_qrnnd(quotient, remainder, high_numerator, low_numerator,
+   denominator) divides a UDWtype, composed by the UWtype integers
+   HIGH_NUMERATOR and LOW_NUMERATOR, by DENOMINATOR and places the quotient
+   in QUOTIENT and the remainder in REMAINDER.  HIGH_NUMERATOR must be less
+   than DENOMINATOR for correct operation.  If, in addition, the most
+   significant bit of DENOMINATOR must be 1, then the pre-processor symbol
+   UDIV_NEEDS_NORMALIZATION is defined to 1.
+
+   4) sdiv_qrnnd(quotient, remainder, high_numerator, low_numerator,
+   denominator).  Like udiv_qrnnd but the numbers are signed.  The quotient
+   is rounded towards 0.
+
+   5) count_leading_zeros(count, x) counts the number of zero-bits from the
+   msb to the first nonzero bit in the UWtype X.  This is the number of
+   steps X needs to be shifted left to set the msb.  Undefined for X == 0,
+   unless the symbol COUNT_LEADING_ZEROS_0 is defined to some value.
+
+   6) count_trailing_zeros(count, x) like count_leading_zeros, but counts
+   from the least significant end.
+
+   7) add_ssaaaa(high_sum, low_sum, high_addend_1, low_addend_1,
+   high_addend_2, low_addend_2) adds two UWtype integers, composed by
+   HIGH_ADDEND_1 and LOW_ADDEND_1, and HIGH_ADDEND_2 and LOW_ADDEND_2
+   respectively.  The result is placed in HIGH_SUM and LOW_SUM.  Overflow
+   (i.e. carry out) is not stored anywhere, and is lost.
+
+   8) sub_ddmmss(high_difference, low_difference, high_minuend, low_minuend,
+   high_subtrahend, low_subtrahend) subtracts two two-word UWtype integers,
+   composed by HIGH_MINUEND_1 and LOW_MINUEND_1, and HIGH_SUBTRAHEND_2 and
+   LOW_SUBTRAHEND_2 respectively.  The result is placed in HIGH_DIFFERENCE
+   and LOW_DIFFERENCE.  Overflow (i.e. carry out) is not stored anywhere,
+   and is lost.
+
+   If any of these macros are left undefined for a particular CPU,
+   C macros are used.  */
+
+/* The CPUs come in alphabetical order below.
+
+   Please add support for more CPUs here, or improve the current support
+   for the CPUs below!
+   (E.g. WE32100, IBM360.)  */
+
+#if defined (__GNUC__) && !defined (NO_ASM)
+
+/* We sometimes need to clobber "cc" with gcc2, but that would not be
+   understood by gcc1.  Use cpp to avoid major code duplication.  */
+#if __GNUC__ < 2
+#define __CLOBBER_CC
+#define __AND_CLOBBER_CC
+#else /* __GNUC__ >= 2 */
+#define __CLOBBER_CC : "cc"
+#define __AND_CLOBBER_CC , "cc"
+#endif /* __GNUC__ < 2 */
+
+#if defined (__alpha) && W_TYPE_SIZE == 64
+#define umul_ppmm(ph, pl, m0, m1) \
+  do {									\
+    UDItype __m0 = (m0), __m1 = (m1);					\
+    __asm__ ("umulh %r1,%2,%0"						\
+	     : "=r" ((UDItype) ph)					\
+	     : "%rJ" (__m0),						\
+	       "rI" (__m1));						\
+    (pl) = __m0 * __m1;							\
+  } while (0)
+#define UMUL_TIME 46
+#ifndef LONGLONG_STANDALONE
+#define udiv_qrnnd(q, r, n1, n0, d) \
+  do { UDItype __r;							\
+    (q) = __udiv_qrnnd (&__r, (n1), (n0), (d));				\
+    (r) = __r;								\
+  } while (0)
+extern UDItype __udiv_qrnnd (UDItype *, UDItype, UDItype, UDItype);
+#define UDIV_TIME 220
+#endif /* LONGLONG_STANDALONE */
+#ifdef __alpha_cix__
+#define count_leading_zeros(COUNT,X) \
+  __asm__("ctlz %1,%0" : "=r"(COUNT) : "r"(X))
+#define count_trailing_zeros(COUNT,X) \
+  __asm__("cttz %1,%0" : "=r"(COUNT) : "r"(X))
+#define COUNT_LEADING_ZEROS_0 64
+#else
+extern const UQItype __clz_tab[];
+#define count_leading_zeros(COUNT,X) \
+  do {									\
+    UDItype __xr = (X), __t, __a;					\
+    __asm__("cmpbge $31,%1,%0" : "=r"(__t) : "r"(__xr));		\
+    __a = __clz_tab[__t ^ 0xff] - 1;					\
+    __asm__("extbl %1,%2,%0" : "=r"(__t) : "r"(__xr), "r"(__a));	\
+    (COUNT) = 64 - (__clz_tab[__t] + __a*8);				\
+  } while (0)
+#define count_trailing_zeros(COUNT,X) \
+  do {									\
+    UDItype __xr = (X), __t, __a;					\
+    __asm__("cmpbge $31,%1,%0" : "=r"(__t) : "r"(__xr));		\
+    __t = ~__t & -~__t;							\
+    __a = ((__t & 0xCC) != 0) * 2;					\
+    __a += ((__t & 0xF0) != 0) * 4;					\
+    __a += ((__t & 0xAA) != 0);						\
+    __asm__("extbl %1,%2,%0" : "=r"(__t) : "r"(__xr), "r"(__a));	\
+    __a <<= 3;								\
+    __t &= -__t;							\
+    __a += ((__t & 0xCC) != 0) * 2;					\
+    __a += ((__t & 0xF0) != 0) * 4;					\
+    __a += ((__t & 0xAA) != 0);						\
+    (COUNT) = __a;							\
+  } while (0)
+#endif /* __alpha_cix__ */
+#endif /* __alpha */
+
+#if defined (__arc__) && W_TYPE_SIZE == 32
+#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
+  __asm__ ("add.f	%1, %4, %5\n\tadc	%0, %2, %3"		\
+	   : "=r" ((USItype) (sh)),					\
+	     "=&r" ((USItype) (sl))					\
+	   : "%r" ((USItype) (ah)),					\
+	     "rIJ" ((USItype) (bh)),					\
+	     "%r" ((USItype) (al)),					\
+	     "rIJ" ((USItype) (bl)))
+#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
+  __asm__ ("sub.f	%1, %4, %5\n\tsbc	%0, %2, %3"		\
+	   : "=r" ((USItype) (sh)),					\
+	     "=&r" ((USItype) (sl))					\
+	   : "r" ((USItype) (ah)),					\
+	     "rIJ" ((USItype) (bh)),					\
+	     "r" ((USItype) (al)),					\
+	     "rIJ" ((USItype) (bl)))
+/* Call libgcc routine.  */
+#define umul_ppmm(w1, w0, u, v) \
+do {									\
+  DWunion __w;								\
+  __w.ll = __umulsidi3 (u, v);						\
+  w1 = __w.s.high;							\
+  w0 = __w.s.low;							\
+} while (0)
+#define __umulsidi3 __umulsidi3
+UDItype __umulsidi3 (USItype, USItype);
+#endif
+
+#if defined (__arm__) && W_TYPE_SIZE == 32
+#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
+  __asm__ ("adds	%1, %4, %5\n\tadc	%0, %2, %3"		\
+	   : "=r" ((USItype) (sh)),					\
+	     "=&r" ((USItype) (sl))					\
+	   : "%r" ((USItype) (ah)),					\
+	     "rI" ((USItype) (bh)),					\
+	     "%r" ((USItype) (al)),					\
+	     "rI" ((USItype) (bl)))
+#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
+  __asm__ ("subs	%1, %4, %5\n\tsbc	%0, %2, %3"		\
+	   : "=r" ((USItype) (sh)),					\
+	     "=&r" ((USItype) (sl))					\
+	   : "r" ((USItype) (ah)),					\
+	     "rI" ((USItype) (bh)),					\
+	     "r" ((USItype) (al)),					\
+	     "rI" ((USItype) (bl)))
+#define umul_ppmm(xh, xl, a, b) \
+{register USItype __t0, __t1, __t2;					\
+  __asm__ ("%@ Inlined umul_ppmm\n"					\
+	   "	mov	%2, %5, lsr #16\n"				\
+	   "	mov	%0, %6, lsr #16\n"				\
+	   "	bic	%3, %5, %2, lsl #16\n"				\
+	   "	bic	%4, %6, %0, lsl #16\n"				\
+	   "	mul	%1, %3, %4\n"					\
+	   "	mul	%4, %2, %4\n"					\
+	   "	mul	%3, %0, %3\n"					\
+	   "	mul	%0, %2, %0\n"					\
+	   "	adds	%3, %4, %3\n"					\
+	   "	addcs	%0, %0, #65536\n"				\
+	   "	adds	%1, %1, %3, lsl #16\n"				\
+	   "	adc	%0, %0, %3, lsr #16"				\
+	   : "=&r" ((USItype) (xh)),					\
+	     "=r" ((USItype) (xl)),					\
+	     "=&r" (__t0), "=&r" (__t1), "=r" (__t2)			\
+	   : "r" ((USItype) (a)),					\
+	     "r" ((USItype) (b)));}
+#define UMUL_TIME 20
+#define UDIV_TIME 100
+#endif /* __arm__ */
+
+#if defined (__hppa) && W_TYPE_SIZE == 32
+#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
+  __asm__ ("add %4,%5,%1\n\taddc %2,%3,%0"				\
+	   : "=r" ((USItype) (sh)),					\
+	     "=&r" ((USItype) (sl))					\
+	   : "%rM" ((USItype) (ah)),					\
+	     "rM" ((USItype) (bh)),					\
+	     "%rM" ((USItype) (al)),					\
+	     "rM" ((USItype) (bl)))
+#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
+  __asm__ ("sub %4,%5,%1\n\tsubb %2,%3,%0"				\
+	   : "=r" ((USItype) (sh)),					\
+	     "=&r" ((USItype) (sl))					\
+	   : "rM" ((USItype) (ah)),					\
+	     "rM" ((USItype) (bh)),					\
+	     "rM" ((USItype) (al)),					\
+	     "rM" ((USItype) (bl)))
+#if defined (_PA_RISC1_1)
+#define umul_ppmm(w1, w0, u, v) \
+  do {									\
+    union								\
+      {									\
+	UDItype __f;							\
+	struct {USItype __w1, __w0;} __w1w0;				\
+      } __t;								\
+    __asm__ ("xmpyu %1,%2,%0"						\
+	     : "=x" (__t.__f)						\
+	     : "x" ((USItype) (u)),					\
+	       "x" ((USItype) (v)));					\
+    (w1) = __t.__w1w0.__w1;						\
+    (w0) = __t.__w1w0.__w0;						\
+     } while (0)
+#define UMUL_TIME 8
+#else
+#define UMUL_TIME 30
+#endif
+#define UDIV_TIME 40
+#define count_leading_zeros(count, x) \
+  do {									\
+    USItype __tmp;							\
+    __asm__ (								\
+       "ldi		1,%0\n"						\
+"	extru,=		%1,15,16,%%r0		; Bits 31..16 zero?\n"	\
+"	extru,tr	%1,15,16,%1		; No.  Shift down, skip add.\n"\
+"	ldo		16(%0),%0		; Yes.  Perform add.\n"	\
+"	extru,=		%1,23,8,%%r0		; Bits 15..8 zero?\n"	\
+"	extru,tr	%1,23,8,%1		; No.  Shift down, skip add.\n"\
+"	ldo		8(%0),%0		; Yes.  Perform add.\n"	\
+"	extru,=		%1,27,4,%%r0		; Bits 7..4 zero?\n"	\
+"	extru,tr	%1,27,4,%1		; No.  Shift down, skip add.\n"\
+"	ldo		4(%0),%0		; Yes.  Perform add.\n"	\
+"	extru,=		%1,29,2,%%r0		; Bits 3..2 zero?\n"	\
+"	extru,tr	%1,29,2,%1		; No.  Shift down, skip add.\n"\
+"	ldo		2(%0),%0		; Yes.  Perform add.\n"	\
+"	extru		%1,30,1,%1		; Extract bit 1.\n"	\
+"	sub		%0,%1,%0		; Subtract it.\n"	\
+	: "=r" (count), "=r" (__tmp) : "1" (x));			\
+  } while (0)
+#endif
+
+#if (defined (__i370__) || defined (__mvs__)) && W_TYPE_SIZE == 32
+#define umul_ppmm(xh, xl, m0, m1) \
+  do {									\
+    union {UDItype __ll;						\
+	   struct {USItype __h, __l;} __i;				\
+	  } __xx;							\
+    USItype __m0 = (m0), __m1 = (m1);					\
+    __asm__ ("mr %0,%3"							\
+	     : "=r" (__xx.__i.__h),					\
+	       "=r" (__xx.__i.__l)					\
+	     : "%1" (__m0),						\
+	       "r" (__m1));						\
+    (xh) = __xx.__i.__h; (xl) = __xx.__i.__l;				\
+    (xh) += ((((SItype) __m0 >> 31) & __m1)				\
+	     + (((SItype) __m1 >> 31) & __m0));				\
+  } while (0)
+#define smul_ppmm(xh, xl, m0, m1) \
+  do {									\
+    union {DItype __ll;							\
+	   struct {USItype __h, __l;} __i;				\
+	  } __xx;							\
+    __asm__ ("mr %0,%3"							\
+	     : "=r" (__xx.__i.__h),					\
+	       "=r" (__xx.__i.__l)					\
+	     : "%1" (m0),						\
+	       "r" (m1));						\
+    (xh) = __xx.__i.__h; (xl) = __xx.__i.__l;				\
+  } while (0)
+#define sdiv_qrnnd(q, r, n1, n0, d) \
+  do {									\
+    union {DItype __ll;							\
+	   struct {USItype __h, __l;} __i;				\
+	  } __xx;							\
+    __xx.__i.__h = n1; __xx.__i.__l = n0;				\
+    __asm__ ("dr %0,%2"							\
+	     : "=r" (__xx.__ll)						\
+	     : "0" (__xx.__ll), "r" (d));				\
+    (q) = __xx.__i.__l; (r) = __xx.__i.__h;				\
+  } while (0)
+#endif
+
+#if (defined (__i386__) || defined (__i486__)) && W_TYPE_SIZE == 32
+#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
+  __asm__ ("addl %5,%1\n\tadcl %3,%0"					\
+	   : "=r" ((USItype) (sh)),					\
+	     "=&r" ((USItype) (sl))					\
+	   : "%0" ((USItype) (ah)),					\
+	     "g" ((USItype) (bh)),					\
+	     "%1" ((USItype) (al)),					\
+	     "g" ((USItype) (bl)))
+#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
+  __asm__ ("subl %5,%1\n\tsbbl %3,%0"					\
+	   : "=r" ((USItype) (sh)),					\
+	     "=&r" ((USItype) (sl))					\
+	   : "0" ((USItype) (ah)),					\
+	     "g" ((USItype) (bh)),					\
+	     "1" ((USItype) (al)),					\
+	     "g" ((USItype) (bl)))
+#define umul_ppmm(w1, w0, u, v) \
+  __asm__ ("mull %3"							\
+	   : "=a" ((USItype) (w0)),					\
+	     "=d" ((USItype) (w1))					\
+	   : "%0" ((USItype) (u)),					\
+	     "rm" ((USItype) (v)))
+#define udiv_qrnnd(q, r, n1, n0, dv) \
+  __asm__ ("divl %4"							\
+	   : "=a" ((USItype) (q)),					\
+	     "=d" ((USItype) (r))					\
+	   : "0" ((USItype) (n0)),					\
+	     "1" ((USItype) (n1)),					\
+	     "rm" ((USItype) (dv)))
+#define count_leading_zeros(count, x) \
+  do {									\
+    USItype __cbtmp;							\
+    __asm__ ("bsrl %1,%0"						\
+	     : "=r" (__cbtmp) : "rm" ((USItype) (x)));			\
+    (count) = __cbtmp ^ 31;						\
+  } while (0)
+#define count_trailing_zeros(count, x) \
+  __asm__ ("bsfl %1,%0" : "=r" (count) : "rm" ((USItype)(x)))
+#define UMUL_TIME 40
+#define UDIV_TIME 40
+#endif /* 80x86 */
+
+#if defined (__i960__) && W_TYPE_SIZE == 32
+#define umul_ppmm(w1, w0, u, v) \
+  ({union {UDItype __ll;						\
+	   struct {USItype __l, __h;} __i;				\
+	  } __xx;							\
+  __asm__ ("emul	%2,%1,%0"					\
+	   : "=d" (__xx.__ll)						\
+	   : "%dI" ((USItype) (u)),					\
+	     "dI" ((USItype) (v)));					\
+  (w1) = __xx.__i.__h; (w0) = __xx.__i.__l;})
+#define __umulsidi3(u, v) \
+  ({UDItype __w;							\
+    __asm__ ("emul	%2,%1,%0"					\
+	     : "=d" (__w)						\
+	     : "%dI" ((USItype) (u)),					\
+	       "dI" ((USItype) (v)));					\
+    __w; })
+#endif /* __i960__ */
+
+#if defined (__M32R__) && W_TYPE_SIZE == 32
+#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
+  /* The cmp clears the condition bit.  */ \
+  __asm__ ("cmp %0,%0\n\taddx %%5,%1\n\taddx %%3,%0"			\
+	   : "=r" ((USItype) (sh)),					\
+	     "=&r" ((USItype) (sl))					\
+	   : "%0" ((USItype) (ah)),					\
+	     "r" ((USItype) (bh)),					\
+	     "%1" ((USItype) (al)),					\
+	     "r" ((USItype) (bl))					\
+	   : "cbit")
+#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
+  /* The cmp clears the condition bit.  */ \
+  __asm__ ("cmp %0,%0\n\tsubx %5,%1\n\tsubx %3,%0"			\
+	   : "=r" ((USItype) (sh)),					\
+	     "=&r" ((USItype) (sl))					\
+	   : "0" ((USItype) (ah)),					\
+	     "r" ((USItype) (bh)),					\
+	     "1" ((USItype) (al)),					\
+	     "r" ((USItype) (bl))					\
+	   : "cbit")
+#endif /* __M32R__ */
+
+#if defined (__mc68000__) && W_TYPE_SIZE == 32
+#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
+  __asm__ ("add%.l %5,%1\n\taddx%.l %3,%0"				\
+	   : "=d" ((USItype) (sh)),					\
+	     "=&d" ((USItype) (sl))					\
+	   : "%0" ((USItype) (ah)),					\
+	     "d" ((USItype) (bh)),					\
+	     "%1" ((USItype) (al)),					\
+	     "g" ((USItype) (bl)))
+#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
+  __asm__ ("sub%.l %5,%1\n\tsubx%.l %3,%0"				\
+	   : "=d" ((USItype) (sh)),					\
+	     "=&d" ((USItype) (sl))					\
+	   : "0" ((USItype) (ah)),					\
+	     "d" ((USItype) (bh)),					\
+	     "1" ((USItype) (al)),					\
+	     "g" ((USItype) (bl)))
+
+/* The '020, '030, '040 and CPU32 have 32x32->64 and 64/32->32q-32r.  */
+#if defined (__mc68020__) || defined(mc68020) \
+	|| defined(__mc68030__) || defined(mc68030) \
+	|| defined(__mc68040__) || defined(mc68040) \
+	|| defined(__mcpu32__) || defined(mcpu32)
+#define umul_ppmm(w1, w0, u, v) \
+  __asm__ ("mulu%.l %3,%1:%0"						\
+	   : "=d" ((USItype) (w0)),					\
+	     "=d" ((USItype) (w1))					\
+	   : "%0" ((USItype) (u)),					\
+	     "dmi" ((USItype) (v)))
+#define UMUL_TIME 45
+#define udiv_qrnnd(q, r, n1, n0, d) \
+  __asm__ ("divu%.l %4,%1:%0"						\
+	   : "=d" ((USItype) (q)),					\
+	     "=d" ((USItype) (r))					\
+	   : "0" ((USItype) (n0)),					\
+	     "1" ((USItype) (n1)),					\
+	     "dmi" ((USItype) (d)))
+#define UDIV_TIME 90
+#define sdiv_qrnnd(q, r, n1, n0, d) \
+  __asm__ ("divs%.l %4,%1:%0"						\
+	   : "=d" ((USItype) (q)),					\
+	     "=d" ((USItype) (r))					\
+	   : "0" ((USItype) (n0)),					\
+	     "1" ((USItype) (n1)),					\
+	     "dmi" ((USItype) (d)))
+
+#else /* not mc68020 */
+#if !defined(__mcf5200__)
+/* %/ inserts REGISTER_PREFIX, %# inserts IMMEDIATE_PREFIX.  */
+#define umul_ppmm(xh, xl, a, b) \
+  __asm__ ("| Inlined umul_ppmm\n"					\
+	   "	move%.l	%2,%/d0\n"					\
+	   "	move%.l	%3,%/d1\n"					\
+	   "	move%.l	%/d0,%/d2\n"					\
+	   "	swap	%/d0\n"						\
+	   "	move%.l	%/d1,%/d3\n"					\
+	   "	swap	%/d1\n"						\
+	   "	move%.w	%/d2,%/d4\n"					\
+	   "	mulu	%/d3,%/d4\n"					\
+	   "	mulu	%/d1,%/d2\n"					\
+	   "	mulu	%/d0,%/d3\n"					\
+	   "	mulu	%/d0,%/d1\n"					\
+	   "	move%.l	%/d4,%/d0\n"					\
+	   "	eor%.w	%/d0,%/d0\n"					\
+	   "	swap	%/d0\n"						\
+	   "	add%.l	%/d0,%/d2\n"					\
+	   "	add%.l	%/d3,%/d2\n"					\
+	   "	jcc	1f\n"						\
+	   "	add%.l	%#65536,%/d1\n"					\
+	   "1:	swap	%/d2\n"						\
+	   "	moveq	%#0,%/d0\n"					\
+	   "	move%.w	%/d2,%/d0\n"					\
+	   "	move%.w	%/d4,%/d2\n"					\
+	   "	move%.l	%/d2,%1\n"					\
+	   "	add%.l	%/d1,%/d0\n"					\
+	   "	move%.l	%/d0,%0"					\
+	   : "=g" ((USItype) (xh)),					\
+	     "=g" ((USItype) (xl))					\
+	   : "g" ((USItype) (a)),					\
+	     "g" ((USItype) (b))					\
+	   : "d0", "d1", "d2", "d3", "d4")
+#define UMUL_TIME 100
+#define UDIV_TIME 400
+#endif /* not mcf5200 */
+#endif /* not mc68020 */
+
+/* The '020, '030, '040 and '060 have bitfield insns.  */
+#if defined (__mc68020__) || defined(mc68020) \
+	|| defined(__mc68030__) || defined(mc68030) \
+	|| defined(__mc68040__) || defined(mc68040) \
+	|| defined(__mc68060__) || defined(mc68060)
+#define count_leading_zeros(count, x) \
+  __asm__ ("bfffo %1{%b2:%b2},%0"					\
+	   : "=d" ((USItype) (count))					\
+	   : "od" ((USItype) (x)), "n" (0))
+#endif
+#endif /* mc68000 */
+
+#if defined (__m88000__) && W_TYPE_SIZE == 32
+#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
+  __asm__ ("addu.co %1,%r4,%r5\n\taddu.ci %0,%r2,%r3"			\
+	   : "=r" ((USItype) (sh)),					\
+	     "=&r" ((USItype) (sl))					\
+	   : "%rJ" ((USItype) (ah)),					\
+	     "rJ" ((USItype) (bh)),					\
+	     "%rJ" ((USItype) (al)),					\
+	     "rJ" ((USItype) (bl)))
+#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
+  __asm__ ("subu.co %1,%r4,%r5\n\tsubu.ci %0,%r2,%r3"			\
+	   : "=r" ((USItype) (sh)),					\
+	     "=&r" ((USItype) (sl))					\
+	   : "rJ" ((USItype) (ah)),					\
+	     "rJ" ((USItype) (bh)),					\
+	     "rJ" ((USItype) (al)),					\
+	     "rJ" ((USItype) (bl)))
+#define count_leading_zeros(count, x) \
+  do {									\
+    USItype __cbtmp;							\
+    __asm__ ("ff1 %0,%1"						\
+	     : "=r" (__cbtmp)						\
+	     : "r" ((USItype) (x)));					\
+    (count) = __cbtmp ^ 31;						\
+  } while (0)
+#define COUNT_LEADING_ZEROS_0 63 /* sic */
+#if defined (__mc88110__)
+#define umul_ppmm(wh, wl, u, v) \
+  do {									\
+    union {UDItype __ll;						\
+	   struct {USItype __h, __l;} __i;				\
+	  } __xx;							\
+    __asm__ ("mulu.d	%0,%1,%2"					\
+	     : "=r" (__xx.__ll)						\
+	     : "r" ((USItype) (u)),					\
+	       "r" ((USItype) (v)));					\
+    (wh) = __xx.__i.__h;						\
+    (wl) = __xx.__i.__l;						\
+  } while (0)
+#define udiv_qrnnd(q, r, n1, n0, d) \
+  ({union {UDItype __ll;						\
+	   struct {USItype __h, __l;} __i;				\
+	  } __xx;							\
+  USItype __q;								\
+  __xx.__i.__h = (n1); __xx.__i.__l = (n0);				\
+  __asm__ ("divu.d %0,%1,%2"						\
+	   : "=r" (__q)							\
+	   : "r" (__xx.__ll),						\
+	     "r" ((USItype) (d)));					\
+  (r) = (n0) - __q * (d); (q) = __q; })
+#define UMUL_TIME 5
+#define UDIV_TIME 25
+#else
+#define UMUL_TIME 17
+#define UDIV_TIME 150
+#endif /* __mc88110__ */
+#endif /* __m88000__ */
+
+#if defined (__mips__) && W_TYPE_SIZE == 32
+#define umul_ppmm(w1, w0, u, v) \
+  __asm__ ("multu %2,%3"						\
+	   : "=l" ((USItype) (w0)),					\
+	     "=h" ((USItype) (w1))					\
+	   : "d" ((USItype) (u)),					\
+	     "d" ((USItype) (v)))
+#define UMUL_TIME 10
+#define UDIV_TIME 100
+#endif /* __mips__ */
+
+#if defined (__ns32000__) && W_TYPE_SIZE == 32
+#define umul_ppmm(w1, w0, u, v) \
+  ({union {UDItype __ll;						\
+	   struct {USItype __l, __h;} __i;				\
+	  } __xx;							\
+  __asm__ ("meid %2,%0"							\
+	   : "=g" (__xx.__ll)						\
+	   : "%0" ((USItype) (u)),					\
+	     "g" ((USItype) (v)));					\
+  (w1) = __xx.__i.__h; (w0) = __xx.__i.__l;})
+#define __umulsidi3(u, v) \
+  ({UDItype __w;							\
+    __asm__ ("meid %2,%0"						\
+	     : "=g" (__w)						\
+	     : "%0" ((USItype) (u)),					\
+	       "g" ((USItype) (v)));					\
+    __w; })
+#define udiv_qrnnd(q, r, n1, n0, d) \
+  ({union {UDItype __ll;						\
+	   struct {USItype __l, __h;} __i;				\
+	  } __xx;							\
+  __xx.__i.__h = (n1); __xx.__i.__l = (n0);				\
+  __asm__ ("deid %2,%0"							\
+	   : "=g" (__xx.__ll)						\
+	   : "0" (__xx.__ll),						\
+	     "g" ((USItype) (d)));					\
+  (r) = __xx.__i.__l; (q) = __xx.__i.__h; })
+#define count_trailing_zeros(count,x) \
+  do {									\
+    __asm__ ("ffsd     %2,%0"						\
+            : "=r" ((USItype) (count))					\
+            : "0" ((USItype) 0),					\
+              "r" ((USItype) (x)));					\
+  } while (0)
+#endif /* __ns32000__ */
+
+/* FIXME: We should test _IBMR2 here when we add assembly support for the
+   system vendor compilers.
+   FIXME: What's needed for gcc PowerPC VxWorks?  __vxworks__ is not good
+   enough, since that hits ARM and m68k too.  */
+#if (defined (_ARCH_PPC)	/* AIX */				\
+     || defined (_ARCH_PWR)	/* AIX */				\
+     || defined (_ARCH_COM)	/* AIX */				\
+     || defined (__powerpc__)	/* gcc */				\
+     || defined (__POWERPC__)	/* BEOS */				\
+     || defined (__ppc__)	/* Darwin */				\
+     || defined (PPC)		/* GNU/Linux, SysV */			\
+     ) && W_TYPE_SIZE == 32
+#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
+  do {									\
+    if (__builtin_constant_p (bh) && (bh) == 0)				\
+      __asm__ ("{a%I4|add%I4c} %1,%3,%4\n\t{aze|addze} %0,%2"		\
+	     : "=r" (sh), "=&r" (sl) : "r" (ah), "%r" (al), "rI" (bl));\
+    else if (__builtin_constant_p (bh) && (bh) == ~(USItype) 0)		\
+      __asm__ ("{a%I4|add%I4c} %1,%3,%4\n\t{ame|addme} %0,%2"		\
+	     : "=r" (sh), "=&r" (sl) : "r" (ah), "%r" (al), "rI" (bl));\
+    else								\
+      __asm__ ("{a%I5|add%I5c} %1,%4,%5\n\t{ae|adde} %0,%2,%3"		\
+	     : "=r" (sh), "=&r" (sl)					\
+	     : "%r" (ah), "r" (bh), "%r" (al), "rI" (bl));		\
+  } while (0)
+#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
+  do {									\
+    if (__builtin_constant_p (ah) && (ah) == 0)				\
+      __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{sfze|subfze} %0,%2"	\
+	       : "=r" (sh), "=&r" (sl) : "r" (bh), "rI" (al), "r" (bl));\
+    else if (__builtin_constant_p (ah) && (ah) == ~(USItype) 0)		\
+      __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{sfme|subfme} %0,%2"	\
+	       : "=r" (sh), "=&r" (sl) : "r" (bh), "rI" (al), "r" (bl));\
+    else if (__builtin_constant_p (bh) && (bh) == 0)			\
+      __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{ame|addme} %0,%2"		\
+	       : "=r" (sh), "=&r" (sl) : "r" (ah), "rI" (al), "r" (bl));\
+    else if (__builtin_constant_p (bh) && (bh) == ~(USItype) 0)		\
+      __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{aze|addze} %0,%2"		\
+	       : "=r" (sh), "=&r" (sl) : "r" (ah), "rI" (al), "r" (bl));\
+    else								\
+      __asm__ ("{sf%I4|subf%I4c} %1,%5,%4\n\t{sfe|subfe} %0,%3,%2"	\
+	       : "=r" (sh), "=&r" (sl)					\
+	       : "r" (ah), "r" (bh), "rI" (al), "r" (bl));		\
+  } while (0)
+#define count_leading_zeros(count, x) \
+  __asm__ ("{cntlz|cntlzw} %0,%1" : "=r" (count) : "r" (x))
+#define COUNT_LEADING_ZEROS_0 32
+#if defined (_ARCH_PPC) || defined (__powerpc__) || defined (__POWERPC__) \
+  || defined (__ppc__) || defined (PPC) || defined (__vxworks__)
+#define umul_ppmm(ph, pl, m0, m1) \
+  do {									\
+    USItype __m0 = (m0), __m1 = (m1);					\
+    __asm__ ("mulhwu %0,%1,%2" : "=r" (ph) : "%r" (m0), "r" (m1));	\
+    (pl) = __m0 * __m1;							\
+  } while (0)
+#define UMUL_TIME 15
+#define smul_ppmm(ph, pl, m0, m1) \
+  do {									\
+    SItype __m0 = (m0), __m1 = (m1);					\
+    __asm__ ("mulhw %0,%1,%2" : "=r" (ph) : "%r" (m0), "r" (m1));	\
+    (pl) = __m0 * __m1;							\
+  } while (0)
+#define SMUL_TIME 14
+#define UDIV_TIME 120
+#elif defined (_ARCH_PWR)
+#define UMUL_TIME 8
+#define smul_ppmm(xh, xl, m0, m1) \
+  __asm__ ("mul %0,%2,%3" : "=r" (xh), "=q" (xl) : "r" (m0), "r" (m1))
+#define SMUL_TIME 4
+#define sdiv_qrnnd(q, r, nh, nl, d) \
+  __asm__ ("div %0,%2,%4" : "=r" (q), "=q" (r) : "r" (nh), "1" (nl), "r" (d))
+#define UDIV_TIME 100
+#endif
+#endif /* 32-bit POWER architecture variants.  */
+
+/* We should test _IBMR2 here when we add assembly support for the system
+   vendor compilers.  */
+#if (defined (_ARCH_PPC64) || defined (__powerpc64__)) && W_TYPE_SIZE == 64
+#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
+  do {									\
+    if (__builtin_constant_p (bh) && (bh) == 0)				\
+      __asm__ ("{a%I4|add%I4c} %1,%3,%4\n\t{aze|addze} %0,%2"		\
+	     : "=r" (sh), "=&r" (sl) : "r" (ah), "%r" (al), "rI" (bl));\
+    else if (__builtin_constant_p (bh) && (bh) == ~(UDItype) 0)		\
+      __asm__ ("{a%I4|add%I4c} %1,%3,%4\n\t{ame|addme} %0,%2"		\
+	     : "=r" (sh), "=&r" (sl) : "r" (ah), "%r" (al), "rI" (bl));\
+    else								\
+      __asm__ ("{a%I5|add%I5c} %1,%4,%5\n\t{ae|adde} %0,%2,%3"		\
+	     : "=r" (sh), "=&r" (sl)					\
+	     : "%r" (ah), "r" (bh), "%r" (al), "rI" (bl));		\
+  } while (0)
+#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
+  do {									\
+    if (__builtin_constant_p (ah) && (ah) == 0)				\
+      __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{sfze|subfze} %0,%2"	\
+	       : "=r" (sh), "=&r" (sl) : "r" (bh), "rI" (al), "r" (bl));\
+    else if (__builtin_constant_p (ah) && (ah) == ~(UDItype) 0)		\
+      __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{sfme|subfme} %0,%2"	\
+	       : "=r" (sh), "=&r" (sl) : "r" (bh), "rI" (al), "r" (bl));\
+    else if (__builtin_constant_p (bh) && (bh) == 0)			\
+      __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{ame|addme} %0,%2"		\
+	       : "=r" (sh), "=&r" (sl) : "r" (ah), "rI" (al), "r" (bl));\
+    else if (__builtin_constant_p (bh) && (bh) == ~(UDItype) 0)		\
+      __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{aze|addze} %0,%2"		\
+	       : "=r" (sh), "=&r" (sl) : "r" (ah), "rI" (al), "r" (bl));\
+    else								\
+      __asm__ ("{sf%I4|subf%I4c} %1,%5,%4\n\t{sfe|subfe} %0,%3,%2"	\
+	       : "=r" (sh), "=&r" (sl)					\
+	       : "r" (ah), "r" (bh), "rI" (al), "r" (bl));		\
+  } while (0)
+#define count_leading_zeros(count, x) \
+  __asm__ ("cntlzd %0,%1" : "=r" (count) : "r" (x))
+#define COUNT_LEADING_ZEROS_0 64
+#define umul_ppmm(ph, pl, m0, m1) \
+  do {									\
+    UDItype __m0 = (m0), __m1 = (m1);					\
+    __asm__ ("mulhdu %0,%1,%2" : "=r" (ph) : "%r" (m0), "r" (m1));	\
+    (pl) = __m0 * __m1;							\
+  } while (0)
+#define UMUL_TIME 15
+#define smul_ppmm(ph, pl, m0, m1) \
+  do {									\
+    DItype __m0 = (m0), __m1 = (m1);					\
+    __asm__ ("mulhd %0,%1,%2" : "=r" (ph) : "%r" (m0), "r" (m1));	\
+    (pl) = __m0 * __m1;							\
+  } while (0)
+#define SMUL_TIME 14  /* ??? */
+#define UDIV_TIME 120 /* ??? */
+#endif /* 64-bit PowerPC.  */
+
+#if defined (__ibm032__) /* RT/ROMP */ && W_TYPE_SIZE == 32
+#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
+  __asm__ ("a %1,%5\n\tae %0,%3"					\
+	   : "=r" ((USItype) (sh)),					\
+	     "=&r" ((USItype) (sl))					\
+	   : "%0" ((USItype) (ah)),					\
+	     "r" ((USItype) (bh)),					\
+	     "%1" ((USItype) (al)),					\
+	     "r" ((USItype) (bl)))
+#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
+  __asm__ ("s %1,%5\n\tse %0,%3"					\
+	   : "=r" ((USItype) (sh)),					\
+	     "=&r" ((USItype) (sl))					\
+	   : "0" ((USItype) (ah)),					\
+	     "r" ((USItype) (bh)),					\
+	     "1" ((USItype) (al)),					\
+	     "r" ((USItype) (bl)))
+#define umul_ppmm(ph, pl, m0, m1) \
+  do {									\
+    USItype __m0 = (m0), __m1 = (m1);					\
+    __asm__ (								\
+       "s	r2,r2\n"						\
+"	mts	r10,%2\n"						\
+"	m	r2,%3\n"						\
+"	m	r2,%3\n"						\
+"	m	r2,%3\n"						\
+"	m	r2,%3\n"						\
+"	m	r2,%3\n"						\
+"	m	r2,%3\n"						\
+"	m	r2,%3\n"						\
+"	m	r2,%3\n"						\
+"	m	r2,%3\n"						\
+"	m	r2,%3\n"						\
+"	m	r2,%3\n"						\
+"	m	r2,%3\n"						\
+"	m	r2,%3\n"						\
+"	m	r2,%3\n"						\
+"	m	r2,%3\n"						\
+"	m	r2,%3\n"						\
+"	cas	%0,r2,r0\n"						\
+"	mfs	r10,%1"							\
+	     : "=r" ((USItype) (ph)),					\
+	       "=r" ((USItype) (pl))					\
+	     : "%r" (__m0),						\
+		"r" (__m1)						\
+	     : "r2");							\
+    (ph) += ((((SItype) __m0 >> 31) & __m1)				\
+	     + (((SItype) __m1 >> 31) & __m0));				\
+  } while (0)
+#define UMUL_TIME 20
+#define UDIV_TIME 200
+#define count_leading_zeros(count, x) \
+  do {									\
+    if ((x) >= 0x10000)							\
+      __asm__ ("clz	%0,%1"						\
+	       : "=r" ((USItype) (count))				\
+	       : "r" ((USItype) (x) >> 16));				\
+    else								\
+      {									\
+	__asm__ ("clz	%0,%1"						\
+		 : "=r" ((USItype) (count))				\
+		 : "r" ((USItype) (x)));					\
+	(count) += 16;							\
+      }									\
+  } while (0)
+#endif
+
+#if defined (__sh2__) && W_TYPE_SIZE == 32
+#define umul_ppmm(w1, w0, u, v) \
+  __asm__ (								\
+       "dmulu.l	%2,%3\n\tsts	macl,%1\n\tsts	mach,%0"		\
+	   : "=r" ((USItype)(w1)),					\
+	     "=r" ((USItype)(w0))					\
+	   : "r" ((USItype)(u)),					\
+	     "r" ((USItype)(v))						\
+	   : "macl", "mach")
+#define UMUL_TIME 5
+#endif
+
+#if defined (__SH5__) && __SHMEDIA__ && W_TYPE_SIZE == 32
+#define __umulsidi3(u,v) ((UDItype)(USItype)u*(USItype)v)
+#define count_leading_zeros(count, x) \
+  do									\
+    {									\
+      UDItype x_ = (USItype)(x);					\
+      SItype c_;							\
+									\
+      __asm__ ("nsb %1, %0" : "=r" (c_) : "r" (x_));			\
+      (count) = c_ - 31;						\
+    }									\
+  while (0)
+#define COUNT_LEADING_ZEROS_0 32
+#endif
+
+#if defined (__sparc__) && !defined (__arch64__) && !defined (__sparcv9) \
+    && W_TYPE_SIZE == 32
+#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
+  __asm__ ("addcc %r4,%5,%1\n\taddx %r2,%3,%0"				\
+	   : "=r" ((USItype) (sh)),					\
+	     "=&r" ((USItype) (sl))					\
+	   : "%rJ" ((USItype) (ah)),					\
+	     "rI" ((USItype) (bh)),					\
+	     "%rJ" ((USItype) (al)),					\
+	     "rI" ((USItype) (bl))					\
+	   __CLOBBER_CC)
+#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
+  __asm__ ("subcc %r4,%5,%1\n\tsubx %r2,%3,%0"				\
+	   : "=r" ((USItype) (sh)),					\
+	     "=&r" ((USItype) (sl))					\
+	   : "rJ" ((USItype) (ah)),					\
+	     "rI" ((USItype) (bh)),					\
+	     "rJ" ((USItype) (al)),					\
+	     "rI" ((USItype) (bl))					\
+	   __CLOBBER_CC)
+#if defined (__sparc_v8__)
+#define umul_ppmm(w1, w0, u, v) \
+  __asm__ ("umul %2,%3,%1;rd %%y,%0"					\
+	   : "=r" ((USItype) (w1)),					\
+	     "=r" ((USItype) (w0))					\
+	   : "r" ((USItype) (u)),					\
+	     "r" ((USItype) (v)))
+#define udiv_qrnnd(__q, __r, __n1, __n0, __d) \
+  __asm__ ("mov %2,%%y;nop;nop;nop;udiv %3,%4,%0;umul %0,%4,%1;sub %3,%1,%1"\
+	   : "=&r" ((USItype) (__q)),					\
+	     "=&r" ((USItype) (__r))					\
+	   : "r" ((USItype) (__n1)),					\
+	     "r" ((USItype) (__n0)),					\
+	     "r" ((USItype) (__d)))
+#else
+#if defined (__sparclite__)
+/* This has hardware multiply but not divide.  It also has two additional
+   instructions scan (ffs from high bit) and divscc.  */
+#define umul_ppmm(w1, w0, u, v) \
+  __asm__ ("umul %2,%3,%1;rd %%y,%0"					\
+	   : "=r" ((USItype) (w1)),					\
+	     "=r" ((USItype) (w0))					\
+	   : "r" ((USItype) (u)),					\
+	     "r" ((USItype) (v)))
+#define udiv_qrnnd(q, r, n1, n0, d) \
+  __asm__ ("! Inlined udiv_qrnnd\n"					\
+"	wr	%%g0,%2,%%y	! Not a delayed write for sparclite\n"	\
+"	tst	%%g0\n"							\
+"	divscc	%3,%4,%%g1\n"						\
+"	divscc	%%g1,%4,%%g1\n"						\
+"	divscc	%%g1,%4,%%g1\n"						\
+"	divscc	%%g1,%4,%%g1\n"						\
+"	divscc	%%g1,%4,%%g1\n"						\
+"	divscc	%%g1,%4,%%g1\n"						\
+"	divscc	%%g1,%4,%%g1\n"						\
+"	divscc	%%g1,%4,%%g1\n"						\
+"	divscc	%%g1,%4,%%g1\n"						\
+"	divscc	%%g1,%4,%%g1\n"						\
+"	divscc	%%g1,%4,%%g1\n"						\
+"	divscc	%%g1,%4,%%g1\n"						\
+"	divscc	%%g1,%4,%%g1\n"						\
+"	divscc	%%g1,%4,%%g1\n"						\
+"	divscc	%%g1,%4,%%g1\n"						\
+"	divscc	%%g1,%4,%%g1\n"						\
+"	divscc	%%g1,%4,%%g1\n"						\
+"	divscc	%%g1,%4,%%g1\n"						\
+"	divscc	%%g1,%4,%%g1\n"						\
+"	divscc	%%g1,%4,%%g1\n"						\
+"	divscc	%%g1,%4,%%g1\n"						\
+"	divscc	%%g1,%4,%%g1\n"						\
+"	divscc	%%g1,%4,%%g1\n"						\
+"	divscc	%%g1,%4,%%g1\n"						\
+"	divscc	%%g1,%4,%%g1\n"						\
+"	divscc	%%g1,%4,%%g1\n"						\
+"	divscc	%%g1,%4,%%g1\n"						\
+"	divscc	%%g1,%4,%%g1\n"						\
+"	divscc	%%g1,%4,%%g1\n"						\
+"	divscc	%%g1,%4,%%g1\n"						\
+"	divscc	%%g1,%4,%%g1\n"						\
+"	divscc	%%g1,%4,%0\n"						\
+"	rd	%%y,%1\n"						\
+"	bl,a 1f\n"							\
+"	add	%1,%4,%1\n"						\
+"1:	! End of inline udiv_qrnnd"					\
+	   : "=r" ((USItype) (q)),					\
+	     "=r" ((USItype) (r))					\
+	   : "r" ((USItype) (n1)),					\
+	     "r" ((USItype) (n0)),					\
+	     "rI" ((USItype) (d))					\
+	   : "g1" __AND_CLOBBER_CC)
+#define UDIV_TIME 37
+#define count_leading_zeros(count, x) \
+  do {                                                                  \
+  __asm__ ("scan %1,1,%0"                                               \
+           : "=r" ((USItype) (count))                                   \
+           : "r" ((USItype) (x)));					\
+  } while (0)
+/* Early sparclites return 63 for an argument of 0, but they warn that future
+   implementations might change this.  Therefore, leave COUNT_LEADING_ZEROS_0
+   undefined.  */
+#else
+/* SPARC without integer multiplication and divide instructions.
+   (i.e. at least Sun4/20,40,60,65,75,110,260,280,330,360,380,470,490) */
+#define umul_ppmm(w1, w0, u, v) \
+  __asm__ ("! Inlined umul_ppmm\n"					\
+"	wr	%%g0,%2,%%y	! SPARC has 0-3 delay insn after a wr\n"\
+"	sra	%3,31,%%o5	! Don't move this insn\n"		\
+"	and	%2,%%o5,%%o5	! Don't move this insn\n"		\
+"	andcc	%%g0,0,%%g1	! Don't move this insn\n"		\
+"	mulscc	%%g1,%3,%%g1\n"						\
+"	mulscc	%%g1,%3,%%g1\n"						\
+"	mulscc	%%g1,%3,%%g1\n"						\
+"	mulscc	%%g1,%3,%%g1\n"						\
+"	mulscc	%%g1,%3,%%g1\n"						\
+"	mulscc	%%g1,%3,%%g1\n"						\
+"	mulscc	%%g1,%3,%%g1\n"						\
+"	mulscc	%%g1,%3,%%g1\n"						\
+"	mulscc	%%g1,%3,%%g1\n"						\
+"	mulscc	%%g1,%3,%%g1\n"						\
+"	mulscc	%%g1,%3,%%g1\n"						\
+"	mulscc	%%g1,%3,%%g1\n"						\
+"	mulscc	%%g1,%3,%%g1\n"						\
+"	mulscc	%%g1,%3,%%g1\n"						\
+"	mulscc	%%g1,%3,%%g1\n"						\
+"	mulscc	%%g1,%3,%%g1\n"						\
+"	mulscc	%%g1,%3,%%g1\n"						\
+"	mulscc	%%g1,%3,%%g1\n"						\
+"	mulscc	%%g1,%3,%%g1\n"						\
+"	mulscc	%%g1,%3,%%g1\n"						\
+"	mulscc	%%g1,%3,%%g1\n"						\
+"	mulscc	%%g1,%3,%%g1\n"						\
+"	mulscc	%%g1,%3,%%g1\n"						\
+"	mulscc	%%g1,%3,%%g1\n"						\
+"	mulscc	%%g1,%3,%%g1\n"						\
+"	mulscc	%%g1,%3,%%g1\n"						\
+"	mulscc	%%g1,%3,%%g1\n"						\
+"	mulscc	%%g1,%3,%%g1\n"						\
+"	mulscc	%%g1,%3,%%g1\n"						\
+"	mulscc	%%g1,%3,%%g1\n"						\
+"	mulscc	%%g1,%3,%%g1\n"						\
+"	mulscc	%%g1,%3,%%g1\n"						\
+"	mulscc	%%g1,0,%%g1\n"						\
+"	add	%%g1,%%o5,%0\n"						\
+"	rd	%%y,%1"							\
+	   : "=r" ((USItype) (w1)),					\
+	     "=r" ((USItype) (w0))					\
+	   : "%rI" ((USItype) (u)),					\
+	     "r" ((USItype) (v))						\
+	   : "g1", "o5" __AND_CLOBBER_CC)
+#define UMUL_TIME 39		/* 39 instructions */
+/* It's quite necessary to add this much assembler for the sparc.
+   The default udiv_qrnnd (in C) is more than 10 times slower!  */
+#define udiv_qrnnd(__q, __r, __n1, __n0, __d) \
+  __asm__ ("! Inlined udiv_qrnnd\n"					\
+"	mov	32,%%g1\n"						\
+"	subcc	%1,%2,%%g0\n"						\
+"1:	bcs	5f\n"							\
+"	 addxcc %0,%0,%0	! shift n1n0 and a q-bit in lsb\n"	\
+"	sub	%1,%2,%1	! this kills msb of n\n"		\
+"	addx	%1,%1,%1	! so this can't give carry\n"		\
+"	subcc	%%g1,1,%%g1\n"						\
+"2:	bne	1b\n"							\
+"	 subcc	%1,%2,%%g0\n"						\
+"	bcs	3f\n"							\
+"	 addxcc %0,%0,%0	! shift n1n0 and a q-bit in lsb\n"	\
+"	b	3f\n"							\
+"	 sub	%1,%2,%1	! this kills msb of n\n"		\
+"4:	sub	%1,%2,%1\n"						\
+"5:	addxcc	%1,%1,%1\n"						\
+"	bcc	2b\n"							\
+"	 subcc	%%g1,1,%%g1\n"						\
+"! Got carry from n.  Subtract next step to cancel this carry.\n"	\
+"	bne	4b\n"							\
+"	 addcc	%0,%0,%0	! shift n1n0 and a 0-bit in lsb\n"	\
+"	sub	%1,%2,%1\n"						\
+"3:	xnor	%0,0,%0\n"						\
+"	! End of inline udiv_qrnnd"					\
+	   : "=&r" ((USItype) (__q)),					\
+	     "=&r" ((USItype) (__r))					\
+	   : "r" ((USItype) (__d)),					\
+	     "1" ((USItype) (__n1)),					\
+	     "0" ((USItype) (__n0)) : "g1" __AND_CLOBBER_CC)
+#define UDIV_TIME (3+7*32)	/* 7 instructions/iteration. 32 iterations.  */
+#endif /* __sparclite__ */
+#endif /* __sparc_v8__ */
+#endif /* sparc32 */
+
+#if ((defined (__sparc__) && defined (__arch64__)) || defined (__sparcv9)) \
+    && W_TYPE_SIZE == 64
+#define add_ssaaaa(sh, sl, ah, al, bh, bl)				\
+  __asm__ ("addcc %r4,%5,%1\n\t"					\
+   	   "add %r2,%3,%0\n\t"						\
+   	   "bcs,a,pn %%xcc, 1f\n\t"					\
+   	   "add %0, 1, %0\n"						\
+	   "1:"								\
+	   : "=r" ((UDItype)(sh)),				      	\
+	     "=&r" ((UDItype)(sl))				      	\
+	   : "%rJ" ((UDItype)(ah)),				     	\
+	     "rI" ((UDItype)(bh)),				      	\
+	     "%rJ" ((UDItype)(al)),				     	\
+	     "rI" ((UDItype)(bl))				       	\
+	   __CLOBBER_CC)
+
+#define sub_ddmmss(sh, sl, ah, al, bh, bl) 				\
+  __asm__ ("subcc %r4,%5,%1\n\t"					\
+   	   "sub %r2,%3,%0\n\t"						\
+   	   "bcs,a,pn %%xcc, 1f\n\t"					\
+   	   "sub %0, 1, %0\n\t"						\
+	   "1:"								\
+	   : "=r" ((UDItype)(sh)),				      	\
+	     "=&r" ((UDItype)(sl))				      	\
+	   : "rJ" ((UDItype)(ah)),				     	\
+	     "rI" ((UDItype)(bh)),				      	\
+	     "rJ" ((UDItype)(al)),				     	\
+	     "rI" ((UDItype)(bl))				       	\
+	   __CLOBBER_CC)
+
+#define umul_ppmm(wh, wl, u, v)						\
+  do {									\
+	  UDItype tmp1, tmp2, tmp3, tmp4;				\
+	  __asm__ __volatile__ (					\
+		   "srl %7,0,%3\n\t"					\
+		   "mulx %3,%6,%1\n\t"					\
+		   "srlx %6,32,%2\n\t"					\
+		   "mulx %2,%3,%4\n\t"					\
+		   "sllx %4,32,%5\n\t"					\
+		   "srl %6,0,%3\n\t"					\
+		   "sub %1,%5,%5\n\t"					\
+		   "srlx %5,32,%5\n\t"					\
+		   "addcc %4,%5,%4\n\t"					\
+		   "srlx %7,32,%5\n\t"					\
+		   "mulx %3,%5,%3\n\t"					\
+		   "mulx %2,%5,%5\n\t"					\
+		   "sethi %%hi(0x80000000),%2\n\t"			\
+		   "addcc %4,%3,%4\n\t"					\
+		   "srlx %4,32,%4\n\t"					\
+		   "add %2,%2,%2\n\t"					\
+		   "movcc %%xcc,%%g0,%2\n\t"				\
+		   "addcc %5,%4,%5\n\t"					\
+		   "sllx %3,32,%3\n\t"					\
+		   "add %1,%3,%1\n\t"					\
+		   "add %5,%2,%0"					\
+	   : "=r" ((UDItype)(wh)),					\
+	     "=&r" ((UDItype)(wl)),					\
+	     "=&r" (tmp1), "=&r" (tmp2), "=&r" (tmp3), "=&r" (tmp4)	\
+	   : "r" ((UDItype)(u)),					\
+	     "r" ((UDItype)(v))						\
+	   __CLOBBER_CC);						\
+  } while (0)
+#define UMUL_TIME 96
+#define UDIV_TIME 230
+#endif /* sparc64 */
+
+#if defined (__vax__) && W_TYPE_SIZE == 32
+#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
+  __asm__ ("addl2 %5,%1\n\tadwc %3,%0"					\
+	   : "=g" ((USItype) (sh)),					\
+	     "=&g" ((USItype) (sl))					\
+	   : "%0" ((USItype) (ah)),					\
+	     "g" ((USItype) (bh)),					\
+	     "%1" ((USItype) (al)),					\
+	     "g" ((USItype) (bl)))
+#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
+  __asm__ ("subl2 %5,%1\n\tsbwc %3,%0"					\
+	   : "=g" ((USItype) (sh)),					\
+	     "=&g" ((USItype) (sl))					\
+	   : "0" ((USItype) (ah)),					\
+	     "g" ((USItype) (bh)),					\
+	     "1" ((USItype) (al)),					\
+	     "g" ((USItype) (bl)))
+#define umul_ppmm(xh, xl, m0, m1) \
+  do {									\
+    union {								\
+	UDItype __ll;							\
+	struct {USItype __l, __h;} __i;					\
+      } __xx;								\
+    USItype __m0 = (m0), __m1 = (m1);					\
+    __asm__ ("emul %1,%2,$0,%0"						\
+	     : "=r" (__xx.__ll)						\
+	     : "g" (__m0),						\
+	       "g" (__m1));						\
+    (xh) = __xx.__i.__h;						\
+    (xl) = __xx.__i.__l;						\
+    (xh) += ((((SItype) __m0 >> 31) & __m1)				\
+	     + (((SItype) __m1 >> 31) & __m0));				\
+  } while (0)
+#define sdiv_qrnnd(q, r, n1, n0, d) \
+  do {									\
+    union {DItype __ll;							\
+	   struct {SItype __l, __h;} __i;				\
+	  } __xx;							\
+    __xx.__i.__h = n1; __xx.__i.__l = n0;				\
+    __asm__ ("ediv %3,%2,%0,%1"						\
+	     : "=g" (q), "=g" (r)					\
+	     : "g" (__xx.__ll), "g" (d));				\
+  } while (0)
+#endif /* __vax__ */
+
+#if defined (__z8000__) && W_TYPE_SIZE == 16
+#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
+  __asm__ ("add	%H1,%H5\n\tadc	%H0,%H3"				\
+	   : "=r" ((unsigned int)(sh)),					\
+	     "=&r" ((unsigned int)(sl))					\
+	   : "%0" ((unsigned int)(ah)),					\
+	     "r" ((unsigned int)(bh)),					\
+	     "%1" ((unsigned int)(al)),					\
+	     "rQR" ((unsigned int)(bl)))
+#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
+  __asm__ ("sub	%H1,%H5\n\tsbc	%H0,%H3"				\
+	   : "=r" ((unsigned int)(sh)),					\
+	     "=&r" ((unsigned int)(sl))					\
+	   : "0" ((unsigned int)(ah)),					\
+	     "r" ((unsigned int)(bh)),					\
+	     "1" ((unsigned int)(al)),					\
+	     "rQR" ((unsigned int)(bl)))
+#define umul_ppmm(xh, xl, m0, m1) \
+  do {									\
+    union {long int __ll;						\
+	   struct {unsigned int __h, __l;} __i;				\
+	  } __xx;							\
+    unsigned int __m0 = (m0), __m1 = (m1);				\
+    __asm__ ("mult	%S0,%H3"					\
+	     : "=r" (__xx.__i.__h),					\
+	       "=r" (__xx.__i.__l)					\
+	     : "%1" (__m0),						\
+	       "rQR" (__m1));						\
+    (xh) = __xx.__i.__h; (xl) = __xx.__i.__l;				\
+    (xh) += ((((signed int) __m0 >> 15) & __m1)				\
+	     + (((signed int) __m1 >> 15) & __m0));			\
+  } while (0)
+#endif /* __z8000__ */
+
+#endif /* __GNUC__ */
+
+/* If this machine has no inline assembler, use C macros.  */
+
+#if !defined (add_ssaaaa)
+#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
+  do {									\
+    UWtype __x;								\
+    __x = (al) + (bl);							\
+    (sh) = (ah) + (bh) + (__x < (al));					\
+    (sl) = __x;								\
+  } while (0)
+#endif
+
+#if !defined (sub_ddmmss)
+#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
+  do {									\
+    UWtype __x;								\
+    __x = (al) - (bl);							\
+    (sh) = (ah) - (bh) - (__x > (al));					\
+    (sl) = __x;								\
+  } while (0)
+#endif
+
+#if !defined (umul_ppmm)
+#define umul_ppmm(w1, w0, u, v)						\
+  do {									\
+    UWtype __x0, __x1, __x2, __x3;					\
+    UHWtype __ul, __vl, __uh, __vh;					\
+									\
+    __ul = __ll_lowpart (u);						\
+    __uh = __ll_highpart (u);						\
+    __vl = __ll_lowpart (v);						\
+    __vh = __ll_highpart (v);						\
+									\
+    __x0 = (UWtype) __ul * __vl;					\
+    __x1 = (UWtype) __ul * __vh;					\
+    __x2 = (UWtype) __uh * __vl;					\
+    __x3 = (UWtype) __uh * __vh;					\
+									\
+    __x1 += __ll_highpart (__x0);/* this can't give carry */		\
+    __x1 += __x2;		/* but this indeed can */		\
+    if (__x1 < __x2)		/* did we get it? */			\
+      __x3 += __ll_B;		/* yes, add it in the proper pos.  */	\
+									\
+    (w1) = __x3 + __ll_highpart (__x1);					\
+    (w0) = __ll_lowpart (__x1) * __ll_B + __ll_lowpart (__x0);		\
+  } while (0)
+#endif
+
+#if !defined (__umulsidi3)
+#define __umulsidi3(u, v) \
+  ({DWunion __w;							\
+    umul_ppmm (__w.s.high, __w.s.low, u, v);				\
+    __w.ll; })
+#endif
+
+/* Define this unconditionally, so it can be used for debugging.  */
+#define __udiv_qrnnd_c(q, r, n1, n0, d) \
+  do {									\
+    UWtype __d1, __d0, __q1, __q0;					\
+    UWtype __r1, __r0, __m;						\
+    __d1 = __ll_highpart (d);						\
+    __d0 = __ll_lowpart (d);						\
+									\
+    __r1 = (n1) % __d1;							\
+    __q1 = (n1) / __d1;							\
+    __m = (UWtype) __q1 * __d0;						\
+    __r1 = __r1 * __ll_B | __ll_highpart (n0);				\
+    if (__r1 < __m)							\
+      {									\
+	__q1--, __r1 += (d);						\
+	if (__r1 >= (d)) /* i.e. we didn't get carry when adding to __r1 */\
+	  if (__r1 < __m)						\
+	    __q1--, __r1 += (d);					\
+      }									\
+    __r1 -= __m;							\
+									\
+    __r0 = __r1 % __d1;							\
+    __q0 = __r1 / __d1;							\
+    __m = (UWtype) __q0 * __d0;						\
+    __r0 = __r0 * __ll_B | __ll_lowpart (n0);				\
+    if (__r0 < __m)							\
+      {									\
+	__q0--, __r0 += (d);						\
+	if (__r0 >= (d))						\
+	  if (__r0 < __m)						\
+	    __q0--, __r0 += (d);					\
+      }									\
+    __r0 -= __m;							\
+									\
+    (q) = (UWtype) __q1 * __ll_B | __q0;				\
+    (r) = __r0;								\
+  } while (0)
+
+/* If the processor has no udiv_qrnnd but sdiv_qrnnd, go through
+   __udiv_w_sdiv (defined in libgcc or elsewhere).  */
+#if !defined (udiv_qrnnd) && defined (sdiv_qrnnd)
+#define udiv_qrnnd(q, r, nh, nl, d) \
+  do {									\
+    USItype __r;							\
+    (q) = __udiv_w_sdiv (&__r, nh, nl, d);				\
+    (r) = __r;								\
+  } while (0)
+#endif
+
+/* If udiv_qrnnd was not defined for this processor, use __udiv_qrnnd_c.  */
+#if !defined (udiv_qrnnd)
+#define UDIV_NEEDS_NORMALIZATION 1
+#define udiv_qrnnd __udiv_qrnnd_c
+#endif
+
+#if !defined (count_leading_zeros)
+extern const UQItype __clz_tab[];
+#define count_leading_zeros(count, x) \
+  do {									\
+    UWtype __xr = (x);							\
+    UWtype __a;								\
+									\
+    if (W_TYPE_SIZE <= 32)						\
+      {									\
+	__a = __xr < ((UWtype)1<<2*__BITS4)				\
+	  ? (__xr < ((UWtype)1<<__BITS4) ? 0 : __BITS4)			\
+	  : (__xr < ((UWtype)1<<3*__BITS4) ?  2*__BITS4 : 3*__BITS4);	\
+      }									\
+    else								\
+      {									\
+	for (__a = W_TYPE_SIZE - 8; __a > 0; __a -= 8)			\
+	  if (((__xr >> __a) & 0xff) != 0)				\
+	    break;							\
+      }									\
+									\
+    (count) = W_TYPE_SIZE - (__clz_tab[__xr >> __a] + __a);		\
+  } while (0)
+#define COUNT_LEADING_ZEROS_0 W_TYPE_SIZE
+#endif
+
+#if !defined (count_trailing_zeros)
+/* Define count_trailing_zeros using count_leading_zeros.  The latter might be
+   defined in asm, but if it is not, the C version above is good enough.  */
+#define count_trailing_zeros(count, x) \
+  do {									\
+    UWtype __ctz_x = (x);						\
+    UWtype __ctz_c;							\
+    count_leading_zeros (__ctz_c, __ctz_x & -__ctz_x);			\
+    (count) = W_TYPE_SIZE - 1 - __ctz_c;				\
+  } while (0)
+#endif
+
+#ifndef UDIV_NEEDS_NORMALIZATION
+#define UDIV_NEEDS_NORMALIZATION 0
+#endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/misc_funcs.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/misc_funcs.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/misc_funcs.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/misc_funcs.c	2004-09-05 15:48:55.000000000 +0200
@@ -0,0 +1,682 @@
+/*
+ *  Copyright (C) 2003-2004 Pontus Fuchs, Giridhar Pemmasani
+ *
+ *  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.
+ *
+ */
+#include <linux/types.h>
+#include <linux/module.h>
+#include <linux/delay.h>
+#include <asm/io.h>
+#include <linux/ctype.h>
+#include <linux/net.h>
+
+#include "ndis.h"
+#include "wrapper.h"
+
+struct list_head wrap_allocs;
+struct wrap_spinlock wrap_allocs_lock;
+
+void *wrap_kmalloc(size_t size, int flags)
+{
+	struct wrap_alloc *alloc;
+	if ((flags & GFP_ATOMIC) || irqs_disabled())
+		alloc = kmalloc(sizeof(*alloc), GFP_ATOMIC);
+	else
+		alloc = kmalloc(sizeof(*alloc), GFP_KERNEL);
+	if (!alloc)
+		return NULL;
+	alloc->ptr = kmalloc(size, flags);
+	if (!alloc->ptr)
+	{
+		kfree(alloc);
+		return NULL;
+	}
+	wrap_spin_lock(&wrap_allocs_lock);
+	list_add(&alloc->list, &wrap_allocs);
+	wrap_spin_unlock(&wrap_allocs_lock);
+	return alloc->ptr;
+}
+
+void wrap_kfree(void *ptr)
+{
+	struct list_head *cur, *tmp;
+
+	wrap_spin_lock(&wrap_allocs_lock);
+	list_for_each_safe(cur, tmp, &wrap_allocs)
+	{
+		struct wrap_alloc *alloc = (struct wrap_alloc *)cur;
+		if (alloc->ptr == ptr)
+		{
+			list_del(&alloc->list);
+			kfree(alloc->ptr);
+			kfree(alloc);
+			break;
+		}
+	}
+
+	wrap_spin_unlock(&wrap_allocs_lock);
+	return;
+}
+
+void wrap_kfree_all(void)
+{
+	struct list_head *cur, *tmp;
+
+	wrap_spin_lock(&wrap_allocs_lock);
+	list_for_each_safe(cur, tmp, &wrap_allocs)
+	{
+		struct wrap_alloc *alloc = (struct wrap_alloc *)cur;
+
+		list_del(&alloc->list);
+		kfree(alloc->ptr);
+		kfree(alloc);
+
+	}
+
+	wrap_spin_unlock(&wrap_allocs_lock);
+	return;
+}
+
+void wrapper_timer_handler(unsigned long data)
+{
+	struct wrapper_timer *timer = (struct wrapper_timer *)data;
+	struct kdpc *kdpc;
+	STDCALL void (*func)(void *res1, void *data, void *res3, void *res4);
+
+	if (!timer)
+	{
+		ERROR("%s", "invalid timer");
+		return;
+	}
+	kdpc = timer->kdpc;
+#ifdef DEBUG_TIMER
+	BUG_ON(timer->wrapper_timer_magic != WRAPPER_TIMER_MAGIC);
+	BUG_ON(kdpc == NULL);
+#endif
+	func = kdpc->func;
+
+	if (!timer->active)
+		return;
+	if (timer->repeat)
+	{
+		timer->timer.expires = jiffies + timer->repeat;
+		add_timer(&timer->timer);
+	}
+	else
+		timer->active = 0;
+
+	if (func)
+		func(kdpc, kdpc->ctx, kdpc->arg1, kdpc->arg2);
+}
+
+void wrapper_init_timer(struct ktimer *ktimer, void *handle)
+{
+	struct wrapper_timer *wrapper_timer;
+	struct ndis_handle *ndis_handle = (struct ndis_handle *)handle;
+	wrapper_timer = wrap_kmalloc(sizeof(struct wrapper_timer), GFP_ATOMIC);
+	if(!wrapper_timer)
+	{
+		ERROR("%s", "Cannot malloc mem for timer");
+		return;
+	}
+
+	memset(wrapper_timer, 27, sizeof(*wrapper_timer));
+	init_timer(&wrapper_timer->timer);
+	wrapper_timer->timer.data = (unsigned long)wrapper_timer;
+	wrapper_timer->timer.function = &wrapper_timer_handler;
+	wrapper_timer->active = 0;
+	wrapper_timer->repeat = 0;
+	wrapper_timer->kdpc = NULL;
+#ifdef DEBUG_TIMER
+	wrapper_timer->wrapper_timer_magic = WRAPPER_TIMER_MAGIC;
+#endif
+	ktimer->wrapper_timer = wrapper_timer;
+	if (handle)
+		list_add(&wrapper_timer->list, &ndis_handle->timers);
+	DBGTRACE4("added timer %p, wrapper_timer->list %p\n",
+		  wrapper_timer, &wrapper_timer->list);
+}
+
+int wrapper_set_timer(struct wrapper_timer *timer,
+                      unsigned long expires, unsigned long repeat)
+{
+	if (!timer)
+	{
+		ERROR("%s", "invalid timer");
+		return 0;
+	}
+
+#ifdef DEBUG_TIMER
+	if (timer->wrapper_timer_magic != WRAPPER_TIMER_MAGIC)
+	{
+		WARNING("timer %p is not initialized (%lu)",
+			timer, timer->wrapper_timer_magic);
+		timer->wrapper_timer_magic = WRAPPER_TIMER_MAGIC;
+	}
+#endif
+	timer->repeat = repeat;
+
+	if (timer->active)
+	{
+		DBGTRACE4("modifying timer %p to %lu, %lu",
+			  timer, expires, repeat);
+		mod_timer(&timer->timer, expires);
+		return 1;
+	}
+	else
+	{
+		DBGTRACE4("setting timer %p to %lu, %lu",
+			  timer, expires, repeat);
+		timer->timer.expires = expires;
+		add_timer(&timer->timer);
+		timer->active = 1;
+		return 0;
+	}
+}
+
+void wrapper_cancel_timer(struct wrapper_timer *timer, char *canceled)
+{
+	TRACEENTER4("timer = %p, canceled = %p", timer, canceled);
+	if(!timer)
+	{
+		ERROR("%s", "invalid timer");
+		return;
+	}
+
+	if (!timer->active)
+	{
+		*canceled = 0;
+		return;
+	}
+#ifdef DEBUG_TIMER
+	DBGTRACE4("canceling timer %p", timer);
+	BUG_ON(timer->wrapper_timer_magic != WRAPPER_TIMER_MAGIC);
+#endif
+
+	timer->repeat = 0;
+	*canceled = del_timer_sync(&(timer->timer));
+	timer->active = 0;
+	return;
+}
+
+NOREGPARM int wrap_sprintf(char *buf, const char *format, ...)
+{
+	va_list args;
+	int res;
+	va_start(args, format);
+	res = vsprintf(buf, format, args);
+	va_end(args);
+	return res;
+}
+
+NOREGPARM int wrap_vsprintf (char *str, const char *format, va_list ap)
+{
+	return vsprintf(str, format, ap);
+}
+
+NOREGPARM int wrap_snprintf(char *buf, size_t count, const char *format, ...)
+{
+	va_list args;
+	int res;
+
+	va_start(args, format);
+	res = vsnprintf(buf, count, format, args);
+	va_end(args);
+	return res;
+}
+
+NOREGPARM int wrap_vsnprintf (char *str, size_t size,
+			      const char *format, va_list ap)
+{
+	return vsnprintf(str, size, format, ap);
+}
+
+
+NOREGPARM char *wrap_strncpy(char *dst, char *src, int n)
+{
+	return strncpy(dst, src, n);
+}
+
+NOREGPARM size_t wrap_strlen(const char *s)
+{
+       return strlen(s);
+}
+
+NOREGPARM int wrap_strncmp(const char *s1, const char *s2, size_t n)
+{
+	return strncmp(s1, s2, n);
+}
+
+NOREGPARM int wrap_strcmp(const char *s1, const char *s2)
+{
+	return strcmp(s1, s2);
+}
+
+int stricmp(const char *s1, const char *s2)
+{
+	while (*s1 && *s2 && tolower(*s1) == tolower(*s2))
+	{
+		s1++;
+		s2++;
+	}
+	return (int)*s1 - (int)*s2;
+}
+
+NOREGPARM int wrap_tolower(int c)
+{
+	return tolower(c);
+}
+
+NOREGPARM int wrap_toupper(int c)
+{
+	return toupper(c);
+}
+
+NOREGPARM void *wrap_memcpy(void * to, const void * from, size_t n)
+{
+	return memcpy(to, from, n);
+}
+
+NOREGPARM void *wrap_strcpy(void * to, const void * from)
+{
+	return strcpy(to, from);
+}
+
+NOREGPARM void *wrap_memset(void * s, char c,size_t count)
+{
+	return memset(s, c, count);
+}
+
+NOREGPARM void *wrap_memmove(void *to, void *from, size_t count)
+{
+	return memmove(to, from, count);
+}
+
+NOREGPARM void wrap_srand(unsigned int seed)
+{
+	net_srandom(seed);
+}
+
+NOREGPARM int wrap_atoi(const char *ptr)
+{
+	int i = simple_strtol(ptr, NULL, 10);
+	return i;
+}
+
+
+STDCALL __s64 _alldiv(__s64 a, __s64 b)
+{
+	return (a / b);
+}
+
+STDCALL __u64 _aulldiv(__u64 a, __u64 b)
+{
+	return (a / b);
+}
+
+STDCALL __s64 _allmul(__s64 a, __s64 b)
+{
+	return (a * b);
+}
+
+STDCALL __u64 _aullmul(__u64 a, __u64 b)
+{
+	return (a * b);
+}
+
+STDCALL __s64 _allrem(__s64 a, __s64 b)
+{
+	return (a % b);
+}
+
+STDCALL __u64 _aullrem(__u64 a, __u64 b)
+{
+	return (a % b);
+}
+
+__attribute__ ((regparm(3))) __s64 _allshl(__s64 a, __u8 b)
+{
+	return (a << b);
+}
+
+__attribute__ ((regparm(3))) __u64 _aullshl(__u64 a, __u8 b)
+{
+	return (a << b);
+}
+
+__attribute__ ((regparm(3))) __s64 _allshr(__s64 a, __u8 b)
+{
+	return (a >> b);
+}
+
+__attribute__ ((regparm(3))) __u64 _aullshr(__u64 a, __u8 b)
+{
+	return (a >> b);
+}
+
+STDCALL size_t RtlCompareMemory(const void *a, const void *b, size_t len)
+{
+	size_t i;
+	char *x, *y;
+
+	TRACEENTER1("%s", "");
+
+	x = (char *)a;
+	y = (char *)b;
+	/* MSDN says this should return number of bytes that compare as
+	 * equal. This can be interpretted as either all bytes that are
+	 * equal in 'len' bytes or that only until the bytes compare as
+	 * not equal. Initially we had it the former way, but Realtek driver
+	 * doesn't like it that way - it takes many attempts to associate
+	 * with WPA. ReactOS returns the number of bytes that are equal
+	 * upto when they compare as not equal.
+	 * According to lords at #reactos, that is the way it should be
+	 * and that msdn is wrong about it!
+	 */
+	for (i = 0; i < len && x[i] == y[i]; i++)
+		;
+	return i;
+}
+
+STDCALL long RtlCompareString(const struct ustring *s1,
+			      const struct ustring *s2, int case_insensitive)
+{
+	unsigned int len;
+	long ret = 0;
+	const char *p1, *p2;
+
+	TRACEENTER1("%s", "");
+	len = min(s1->len, s2->len);
+	p1 = s1->buf;
+	p2 = s2->buf;
+
+	if (case_insensitive)
+		while (!ret && len--)
+			ret = toupper(*p1++) - toupper(*p2++);
+	else
+		while (!ret && len--)
+			ret = *p1++ - *p2++;
+	if (!ret)
+		ret = s1->len - s2->len;
+	return ret;
+}
+
+
+STDCALL long RtlCompareUnicodeString(const struct ustring *s1,
+				     const struct ustring *s2,
+				     int case_insensitive)
+{
+	unsigned int len;
+	long ret = 0;
+	const __u16 *p1, *p2;
+
+	TRACEENTER1("%s", "");
+	len = min(s1->len, s2->len);
+	p1 = (__u16 *)s1->buf;
+	p2 = (__u16 *)s2->buf;
+
+	if (case_insensitive)
+		while (!ret && len--)
+			ret = toupper((__u8)*p1++) - toupper((__u8)*p2++);
+	else
+		while (!ret && len--)
+			ret = *p1++ - *p2++;
+	if (!ret)
+		ret = s1->len - s2->len;
+	return ret;
+}
+
+STDCALL int RtlEqualString(const struct ustring *s1,
+			   const struct ustring *s2, int case_insensitive)
+{
+	TRACEENTER1("%s", "");
+	if (s1->len != s2->len)
+		return 0;
+	return !RtlCompareString(s1, s2, case_insensitive);
+}
+
+STDCALL int RtlEqualUnicodeString(const struct ustring *s1,
+				  const struct ustring *s2,
+				  int case_insensitive)
+{
+	if (s1->len != s2->len)
+		return 0;
+	return !RtlCompareUnicodeString(s1, s2, case_insensitive);
+}
+
+STDCALL void RtlCopyUnicodeString(struct ustring *dst,
+				  const struct ustring *src)
+{
+	TRACEENTER1("%s", "");
+	if (src)
+	{
+		unsigned int len = min(src->len, dst->buflen);
+		memcpy(dst->buf, src->buf, len);
+		dst->len = len;
+		/* append terminating '\0' if enough space */
+		if (len < dst->buflen)
+			dst->buf[len] = 0;
+	}
+	else dst->len = 0;
+	TRACEEXIT1(return);
+}
+
+STDCALL int RtlAnsiStringToUnicodeString(struct ustring *dst, struct ustring *src, unsigned int dup)
+{
+	int i;
+	__u16 *d;
+	__u8 *s;
+
+	TRACEENTER2("dup: %d src: %s", dup, src->buf);
+	if(dup)
+	{
+		char *buf = kmalloc((src->buflen+1) * sizeof(__u16), GFP_KERNEL);
+		if(!buf)
+			return NDIS_STATUS_FAILURE;
+		dst->buf = buf;
+		dst->buflen = (src->buflen+1) * sizeof(__u16);
+	}
+	else if (dst->buflen < (src->len+1) * sizeof(__u16))
+		return NDIS_STATUS_FAILURE;
+
+	dst->len = src->len * sizeof(__u16);
+	d = (__u16 *)dst->buf;
+	s = (__u8 *)src->buf;
+	for(i = 0; i < src->len; i++)
+	{
+		d[i] = (__u16)s[i];
+	}
+	d[i] = 0;
+
+	TRACEEXIT2(return NDIS_STATUS_SUCCESS);
+}
+
+STDCALL int RtlUnicodeStringToAnsiString(struct ustring *dst, struct ustring *src, unsigned int dup)
+{
+	int i;
+	__u16 *s;
+	__u8 *d;
+
+	TRACEENTER2("dup: %d src->len: %d src->buflen: %d, dst: %p",
+		    dup, src->len, src->buflen, dst);
+	if(dup)
+	{
+		char *buf = kmalloc((src->buflen+1) / sizeof(__u16),
+				    GFP_KERNEL);
+		if(!buf)
+			return NDIS_STATUS_FAILURE;
+		dst->buf = buf;
+		dst->buflen = (src->buflen+1) / sizeof(__u16);
+	}
+	else if (dst->buflen < (src->len+1) / sizeof(__u16))
+		return NDIS_STATUS_FAILURE;
+
+	dst->len = src->len / sizeof(__u16);
+	s = (__u16 *)src->buf;
+	d = (__u8 *)dst->buf;
+	for(i = 0; i < dst->len; i++)
+		d[i] = (__u8)s[i];
+	d[i] = 0;
+
+	TRACEEXIT2(return NDIS_STATUS_SUCCESS);
+}
+
+STDCALL int RtlIntegerToUnicodeString(unsigned long value, unsigned long base,
+				      struct ustring *ustring)
+{
+	char string[sizeof(unsigned long) * 8 + 1];
+	struct ustring ansi;
+	int i;
+
+	TRACEENTER1("%s", "");
+	if (base == 0)
+		base = 10;
+	if (!(base == 2 || base == 8 || base == 10 || base == 16))
+		return NDIS_STATUS_INVALID_PARAMETER;
+	for (i = 0; value && i < sizeof(string); i++)
+	{
+		int r;
+		r = value % base;
+		value /= base;
+		if (r < 10)
+			string[i] = r + '0';
+		else
+			string[i] = r + 'a' - 10;
+	}
+
+	if (i < sizeof(string))
+		string[i] = 0;
+	else
+		return NDIS_STATUS_BUFFER_TOO_SHORT;
+
+	ansi.buf = string;
+	ansi.len = strlen(string);
+	ansi.buflen = sizeof(string);
+	return RtlAnsiStringToUnicodeString(ustring, &ansi, 0);
+}
+
+void RtlFreeUnicodeString(void){UNIMPL();}
+void RtlUnwind(void){UNIMPL();}
+
+STDCALL int rand(void)
+{
+	char buf[6];
+	int i, r;
+
+	get_random_bytes(buf, sizeof(buf));
+	for (r = i = 0; i < sizeof(buf) ; i++)
+		r += buf[i];
+	return r;
+}
+
+/*
+ * This is the packet_recycler that gets scheduled from NdisMIndicateReceivePacket
+ */
+void packet_recycler(void *param)
+{
+	struct ndis_handle *handle = (struct ndis_handle*) param;
+
+	TRACEENTER3("%s", "Packet recycler running");
+	while (1)
+	{
+		struct ndis_packet * packet = NULL;
+
+		wrap_spin_lock(&handle->recycle_packets_lock);
+		if (list_empty(&handle->recycle_packets))
+		{
+			wrap_spin_unlock(&handle->recycle_packets_lock);
+			break;
+		}
+		else
+		{
+			packet = (struct ndis_packet*) handle->recycle_packets.next;
+
+			list_del(handle->recycle_packets.next);
+			DBGTRACE3("Picking packet at %p!", packet);
+			packet = (struct ndis_packet*) ((char*)packet - ((char*) &packet->recycle_list - (char*) &packet->nr_pages));
+		}
+
+		wrap_spin_unlock(&handle->recycle_packets_lock);
+
+		if (packet == NULL)
+			break;
+
+		packet->status = NDIS_STATUS_SUCCESS;
+		handle->driver->miniport_char.return_packet(handle->adapter_ctx, packet);
+	}
+	TRACEEXIT3(return);
+}
+
+int getSp(void)
+{
+	volatile int i;
+	asm("movl %esp,(%esp,1)");
+	return i;
+}
+
+void inline my_dumpstack(void)
+{
+	int *sp = (int*) getSp();
+	int i;
+	for(i = 0; i < 20; i++)
+	{
+		printk("%08x\n", sp[i]);
+	}
+}
+
+struct wrap_func misc_wrap_funcs[] =
+{
+	WRAP_FUNC_ENTRY(RtlAnsiStringToUnicodeString),
+	WRAP_FUNC_ENTRY(RtlCompareMemory),
+	WRAP_FUNC_ENTRY(RtlCompareString),
+	WRAP_FUNC_ENTRY(RtlCompareUnicodeString),
+	WRAP_FUNC_ENTRY(RtlCopyUnicodeString),
+	WRAP_FUNC_ENTRY(RtlEqualString),
+	WRAP_FUNC_ENTRY(RtlEqualUnicodeString),
+	WRAP_FUNC_ENTRY(RtlFreeUnicodeString),
+	WRAP_FUNC_ENTRY(RtlIntegerToUnicodeString),
+	WRAP_FUNC_ENTRY(RtlUnicodeStringToAnsiString),
+	WRAP_FUNC_ENTRY(RtlUnwind),
+
+	WRAP_FUNC_ENTRY(_alldiv),
+	WRAP_FUNC_ENTRY(_allmul),
+	WRAP_FUNC_ENTRY(_allrem),
+	WRAP_FUNC_ENTRY(_aulldiv),
+	WRAP_FUNC_ENTRY(_aullmul),
+	WRAP_FUNC_ENTRY(_aullrem),
+	WRAP_FUNC_ENTRY(_allshl),
+	WRAP_FUNC_ENTRY(_aullshl),
+	WRAP_FUNC_ENTRY(_allshr),
+	WRAP_FUNC_ENTRY(_aullshr),
+
+	{"atoi",   (WRAP_FUNC *)wrap_atoi},
+	{"memcpy",   (WRAP_FUNC *)wrap_memcpy},
+	{"memmove",   (WRAP_FUNC *)wrap_memmove},
+	{"memset",   (WRAP_FUNC *)wrap_memset},
+	{"rand",   (WRAP_FUNC *)rand},
+	{"snprintf",   (WRAP_FUNC *)wrap_snprintf},
+	{"sprintf",   (WRAP_FUNC *)wrap_sprintf},
+	{"srand",   (WRAP_FUNC *)wrap_srand},
+	{"strcmp",   (WRAP_FUNC *)wrap_strcmp},
+	{"strcpy",   (WRAP_FUNC *)wrap_strcpy},
+	{"strlen",   (WRAP_FUNC *)wrap_strlen},
+	{"strncmp",   (WRAP_FUNC *)wrap_strncmp},
+	{"strncpy",   (WRAP_FUNC *)wrap_strncpy},
+	{"tolower",   (WRAP_FUNC *)wrap_tolower},
+	{"toupper",   (WRAP_FUNC *)wrap_toupper},
+	{"vsnprintf",   (WRAP_FUNC *)wrap_vsnprintf},
+	{"vsprintf",   (WRAP_FUNC *)wrap_vsprintf},
+	{"_snprintf",   (WRAP_FUNC *)wrap_snprintf},
+	{"_vsnprintf",   (WRAP_FUNC *)wrap_vsnprintf},
+
+	{NULL, NULL}
+};
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/ndis.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/ndis.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/ndis.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/ndis.c	2004-09-05 15:48:55.000000000 +0200
@@ -0,0 +1,2396 @@
+/*
+ *  Copyright (C) 2003-2004 Pontus Fuchs, Giridhar Pemmasani
+ *
+ *  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.
+ *
+ */
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/spinlock.h>
+#include <linux/timer.h>
+#include <linux/interrupt.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/types.h>
+#include <linux/string.h>
+#include <linux/ctype.h>
+
+#include "ndis.h"
+
+extern int image_offset;
+extern struct list_head ndis_driverlist;
+
+struct list_head handle_ctx_list;
+static struct list_head alloc_list;
+static struct wrap_spinlock alloc_list_lock;
+static struct work_struct alloc_work;
+static struct wrap_spinlock atomic_lock;
+
+DECLARE_WAIT_QUEUE_HEAD(event_wq);
+
+static struct work_struct work;
+static struct list_head worklist;
+static struct wrap_spinlock worklist_lock;
+
+static void alloc_worker(void *data);
+static void worker(void *context);
+
+void init_ndis(void)
+{
+	INIT_WORK(&work, &worker, NULL);
+	INIT_LIST_HEAD(&worklist);
+	wrap_spin_lock_init(&worklist_lock);
+
+	INIT_WORK(&alloc_work, alloc_worker, NULL);
+	INIT_LIST_HEAD(&alloc_list);
+	wrap_spin_lock_init(&alloc_list_lock);
+
+	wrap_spin_lock_init(&atomic_lock);
+	return;
+}
+
+/* Called from the driver entry. */
+STDCALL static void
+NdisInitializeWrapper(struct ndis_handle **ndis_handle, void *SystemSpecific1,
+		      void *SystemSpecific2, void *SystemSpecific3)
+{
+	TRACEENTER1("handle=%08x, SS1=%08x, SS2=%08x", (int)ndis_handle,
+		    (int)SystemSpecific1, (int)SystemSpecific2);
+	*ndis_handle = (struct ndis_handle*) SystemSpecific1;
+	TRACEEXIT1(return);
+}
+
+STDCALL static void
+NdisTerminateWrapper(struct ndis_handle *handle, void *SystemSpecific1)
+{
+}
+
+/* Register a miniport with NDIS. Called from driver entry */
+STDCALL static int
+NdisMRegisterMiniport(struct ndis_driver *ndis_driver,
+		      struct miniport_char *miniport_char,
+		      unsigned int char_len)
+{
+	int min_length = ((char*) &miniport_char->co_create_vc) -
+		((char*) miniport_char);
+
+	TRACEENTER1("driver: %p", ndis_driver);
+
+	if(miniport_char->majorVersion < 4)
+	{
+		ERROR("Driver %s using ndis version %d which is too old.",
+		      ndis_driver->name, miniport_char->majorVersion);
+		TRACEEXIT1(return NDIS_STATUS_BAD_VERSION);
+	}
+
+	if(char_len < min_length)
+	{
+		ERROR("Characteristics length %d is too small for driver %s",
+		      char_len, ndis_driver->name);
+		TRACEEXIT1(return NDIS_STATUS_BAD_CHARACTERISTICS);
+	}
+
+	DBGTRACE1("Version %d.%d", miniport_char->majorVersion,
+		 miniport_char->minorVersion);
+	DBGTRACE1("Len: %08x:%08x", char_len, sizeof(struct miniport_char));
+	memcpy(&ndis_driver->miniport_char, miniport_char,
+	       sizeof(struct miniport_char));
+
+	TRACEEXIT1(return NDIS_STATUS_SUCCESS);
+}
+
+STDCALL static unsigned int
+NdisAllocateMemory(void **dest, unsigned int length, unsigned int flags,
+		   unsigned int highest_addr)
+{
+	TRACEENTER3("length = %u, flags = %08X", length, flags);
+	if (length <= KMALLOC_THRESHOLD)
+	{
+		if (irqs_disabled() || in_atomic())
+			*dest = (void *)kmalloc(length,
+						GFP_ATOMIC | __GFP_NOWARN);
+		else
+			*dest = (void *)kmalloc(length,
+						GFP_KERNEL | __GFP_NOWARN);
+	}
+	else if (flags & NDIS_MEMORY_CONTIGUOUS)
+	{
+		WARNING("Allocating %u bytes of physically "
+		       "contiguous memory may fail", length);
+		*dest = (void *)kmalloc(length, GFP_KERNEL | __GFP_NOWARN);
+	}
+	else
+		*dest = vmalloc(length);
+
+	if (*dest)
+		TRACEEXIT3(return NDIS_STATUS_SUCCESS);
+	DBGTRACE3("Allocatemem failed size=%d", length);
+	TRACEEXIT3(return NDIS_STATUS_FAILURE);
+}
+
+STDCALL static unsigned int
+NdisAllocateMemoryWithTag(void **dest, unsigned int length,
+			  unsigned int tag)
+{
+	TRACEEXIT3(return NdisAllocateMemory(dest, length, 0, 0));
+}
+
+STDCALL static void
+NdisFreeMemory(void *adr, unsigned int length, unsigned int flags)
+{
+	TRACEENTER3("length = %u, flags = %08X", length, flags);
+
+	if (!adr)
+		TRACEEXIT3(return);
+
+	if (length <= KMALLOC_THRESHOLD)
+		kfree(adr);
+	else if (flags & NDIS_MEMORY_CONTIGUOUS)
+		kfree(adr);
+	else
+		vfree(adr);
+	TRACEEXIT3(return);
+}
+
+/*
+ * This function should not be STDCALL because it's a variable args function.
+ */
+NOREGPARM static void
+NdisWriteErrorLogEntry(struct ndis_handle *handle, unsigned int error,
+			    unsigned int length, unsigned int p1)
+{
+	ERROR("log: %08X, length: %d (%08x)\n", error, length, p1);
+}
+
+STDCALL static void
+NdisOpenConfiguration(unsigned int *status, struct ndis_handle **confhandle,
+		      struct ndis_handle *handle)
+{
+	TRACEENTER2("confHandle: %p, handle->dev_name: %s",
+			confhandle, handle->net_dev->name);
+	*confhandle = handle;
+	*status = NDIS_STATUS_SUCCESS;
+	TRACEEXIT2(return);
+}
+
+STDCALL static void
+NdisOpenConfigurationKeyByName(unsigned int *status,
+			       struct ndis_handle *handle, struct ustring *key,
+			       struct ndis_handle **subkeyhandle)
+{
+	TRACEENTER2("%s", "");
+	*subkeyhandle = handle;
+	*status = NDIS_STATUS_SUCCESS;
+	TRACEEXIT2(return);
+}
+
+STDCALL static void
+NdisCloseConfiguration(void *confhandle)
+{
+	TRACEENTER2("confhandle: %08x", (int) confhandle);
+}
+
+STDCALL static void
+NdisOpenFile(unsigned int *status, struct ndis_file **filehandle,
+	     unsigned int *filelength, struct ustring *filename,
+	     u64 highest_address)
+{
+	struct ustring ansi;
+	struct list_head *curr, *tmp;
+	struct ndis_file *file;
+
+	TRACEENTER2("status = %p, filelength = %p, *filelength = %d, "
+		    "high = %lu, filehandle = %p, *filehandle = %p",
+		    status, filelength, *filelength,
+		    (unsigned long)highest_address, filehandle, *filehandle);
+
+	ansi.buf = kmalloc(MAX_STR_LEN, GFP_KERNEL);
+	if (!ansi.buf)
+	{
+		*status = NDIS_STATUS_RESOURCES;
+		return;
+	}
+	ansi.buf[MAX_STR_LEN-1] = 0;
+	ansi.buflen = MAX_STR_LEN;
+
+
+	if (RtlUnicodeStringToAnsiString(&ansi, filename, 0))
+	{
+		*status = NDIS_STATUS_RESOURCES;
+		kfree(ansi.buf);
+		TRACEEXIT2(return);
+	}
+	DBGTRACE2("Filename: %s, Highest Address: %08x",
+			 ansi.buf, (int) highest_address);
+
+	/* Loop through all drivers and all files to find the requested file */
+	list_for_each_safe(curr, tmp, &ndis_driverlist)
+	{
+		struct list_head *curr2, *tmp2;
+
+		struct ndis_driver *driver = (struct ndis_driver *) curr;
+		list_for_each_safe(curr2, tmp2, &driver->files)
+		{
+			int n;
+			file = (struct ndis_file*) curr2;
+			DBGTRACE2("Considering %s", file->name);
+			n = min(strlen(file->name), strlen(ansi.buf));
+			if(strnicmp(file->name, ansi.buf, n) == 0)
+			{
+				*filehandle = file;
+				*filelength = file->size;
+				*status = NDIS_STATUS_SUCCESS;
+				kfree(ansi.buf);
+				TRACEEXIT2(return);
+			}
+		}
+	}
+	*status = NDIS_STATUS_FILE_NOT_FOUND;
+	kfree(ansi.buf);
+	TRACEEXIT2(return);
+}
+
+STDCALL static void
+NdisMapFile(unsigned int *status, void **mappedbuffer,
+	    struct ndis_file *filehandle)
+{
+	TRACEENTER2("Handle: %08x", (int) filehandle);
+
+	if (!filehandle)
+	{
+		*status = NDIS_STATUS_ALREADY_MAPPED;
+		TRACEEXIT2(return);
+	}
+
+	*status = NDIS_STATUS_SUCCESS;
+	*mappedbuffer = filehandle->data;
+	TRACEEXIT2(return);
+}
+
+STDCALL static void
+NdisUnmapFile(struct ndis_file *filehandle)
+{
+	TRACEENTER2("Handle: %08x", (int) filehandle);
+	TRACEEXIT2(return);
+}
+
+STDCALL static void
+NdisCloseFile(struct ndis_file *filehandle)
+{
+	TRACEENTER2("Handle: %08x", (int) filehandle);
+	TRACEEXIT2(return);
+}
+
+STDCALL static void
+NdisGetSystemUpTime(unsigned int *systemuptime)
+{
+	TRACEENTER4("%s", "");
+	*systemuptime = 10 * jiffies / HZ;
+	TRACEEXIT4(return);
+}
+
+static inline int SPAN_PAGES(unsigned int ptr, unsigned int len)
+{
+	unsigned int p = ptr & (PAGE_SIZE - 1);
+	TRACEEXIT3(return (p + len + (PAGE_SIZE - 1)) >> PAGE_SHIFT);
+}
+
+/* called as macro */
+STDCALL unsigned long
+NDIS_BUFFER_TO_SPAN_PAGES(struct ndis_buffer *buffer)
+{
+	unsigned int p;
+	unsigned int i;
+
+	TRACEENTER3("%s", "");
+
+	if (buffer == NULL)
+		return 0;
+
+	if (buffer->len == 0)
+		return 1;
+	p = (unsigned int)buffer->data + buffer->offset;
+	i = SPAN_PAGES(PAGE_ALIGN(p), buffer->len);
+	DBGTRACE3("pages = %u", i);
+	TRACEEXIT3(return i);
+}
+
+STDCALL static void
+NdisGetBufferPhysicalArraySize(struct ndis_buffer *buffer,
+			       unsigned int *arraysize)
+{
+	TRACEENTER3("Buffer: %08x", (int) buffer);
+	*arraysize = NDIS_BUFFER_TO_SPAN_PAGES(buffer);
+	TRACEEXIT3(return);
+}
+
+static int ndis_encode_setting(struct ndis_setting *setting,
+			       int ndis_setting_type)
+{
+	struct ustring ansi;
+
+	if (setting->value.type == ndis_setting_type)
+		return NDIS_STATUS_SUCCESS;
+
+	if (setting->value.type == NDIS_SETTING_STRING)
+		kfree(setting->value.data.ustring.buf);
+
+	switch(ndis_setting_type)
+	{
+	case NDIS_SETTING_INT:
+		setting->value.data.intval =
+			simple_strtol(setting->val_str, NULL, 0);
+		break;
+	case NDIS_SETTING_HEXINT:
+		setting->value.data.intval =
+			simple_strtol(setting->val_str, NULL, 16);
+		break;
+	case NDIS_SETTING_STRING:
+		ansi.buflen = ansi.len = strlen(setting->val_str);
+		ansi.buf = setting->val_str;
+		if (RtlAnsiStringToUnicodeString(&setting->value.data.ustring,
+						 &ansi, 1))
+			return NDIS_STATUS_FAILURE;
+		break;
+	default:
+		return NDIS_STATUS_FAILURE;
+	}
+	setting->value.type = ndis_setting_type;
+	return NDIS_STATUS_SUCCESS;
+}
+
+static int ndis_decode_setting(struct ndis_setting *setting,
+			       struct ndis_setting_val *val)
+{
+	struct ustring ansi;
+
+	switch(val->type)
+	{
+	case NDIS_SETTING_INT:
+		setting->val_str = kmalloc(sizeof(long) + 1, GFP_KERNEL);
+		if (setting->val_str == NULL)
+			return NDIS_STATUS_RESOURCES;
+		snprintf(setting->val_str, sizeof(long), "%lu",
+			 (unsigned long)val->data.intval);
+		setting->val_str[sizeof(long)] = 0;
+		break;
+	case NDIS_SETTING_HEXINT:
+		setting->val_str = kmalloc(sizeof(long) + 1, GFP_KERNEL);
+		if (setting->val_str == NULL)
+			return NDIS_STATUS_RESOURCES;
+		snprintf(setting->val_str, sizeof(long), "%lx",
+			 (unsigned long)val->data.intval);
+		setting->val_str[sizeof(long)] = 0;
+		break;
+	case NDIS_SETTING_STRING:
+		setting->val_str = kmalloc(MAX_STR_LEN, GFP_KERNEL);
+		if (setting->val_str == NULL)
+			return NDIS_STATUS_RESOURCES;
+		ansi.buf = setting->val_str;
+		ansi.buflen = MAX_STR_LEN;
+		if (RtlUnicodeStringToAnsiString(&ansi, &val->data.ustring, 0)
+		    || ansi.len >= MAX_STR_LEN)
+		{
+			kfree(setting->val_str);
+			return NDIS_STATUS_FAILURE;
+		}
+		break;
+	default:
+		DBGTRACE2("unknown setting type: %d", val->type);
+		return NDIS_STATUS_FAILURE;
+	}
+	setting->value.type = NDIS_SETTING_NONE;
+	return NDIS_STATUS_SUCCESS;
+}
+
+STDCALL static void
+NdisReadConfiguration(unsigned int *status, struct ndis_setting_val **dest,
+		      struct ndis_handle *handle, struct ustring *key,
+		      unsigned int type)
+{
+	struct ndis_setting *setting;
+	struct ustring ansi;
+	char *keyname;
+
+	TRACEENTER2("%s", "");
+	ansi.buf = kmalloc(MAX_STR_LEN, GFP_KERNEL);
+	if (!ansi.buf)
+	{
+		*status = NDIS_STATUS_RESOURCES;
+		return;
+	}
+	ansi.buf[MAX_STR_LEN-1] = 0;
+	ansi.buflen = MAX_STR_LEN;
+	if (RtlUnicodeStringToAnsiString(&ansi, key, 0))
+	{
+		*dest = NULL;
+		*status = NDIS_STATUS_FAILURE;
+		kfree(ansi.buf);
+		TRACEEXIT2(return);
+	}
+	keyname = ansi.buf;
+
+	list_for_each_entry(setting, &handle->device->settings, list)
+	{
+		if(stricmp(keyname, setting->name) == 0)
+		{
+			DBGTRACE2("setting found %s=%s",
+				 keyname, setting->val_str);
+
+			*status = ndis_encode_setting(setting, type);
+			if (*status == NDIS_STATUS_SUCCESS)
+				*dest = &setting->value;
+			else
+			{
+				*dest = NULL;
+				DBGTRACE2("status = %d", *status);
+			}
+			kfree(ansi.buf);
+			TRACEEXIT2(return);
+		}
+	}
+
+	DBGTRACE2("setting %s not found (type:%d)", keyname, type);
+
+	*dest = NULL;
+	*status = NDIS_STATUS_FAILURE;
+	kfree(ansi.buf);
+	TRACEEXIT2(return);
+}
+
+STDCALL static void
+NdisWriteConfiguration(unsigned int *status, struct ndis_handle *handle,
+		       struct ustring *key, struct ndis_setting_val *val)
+{
+	struct ustring ansi;
+	struct ndis_setting *setting;
+	char *keyname;
+
+	TRACEENTER2("%s", "");
+	ansi.buf = kmalloc(MAX_STR_LEN, GFP_KERNEL);
+	if (!ansi.buf)
+	{
+		*status = NDIS_STATUS_RESOURCES;
+		return;
+	}
+	ansi.buf[MAX_STR_LEN-1] = 0;
+	ansi.buflen = MAX_STR_LEN;
+	if (RtlUnicodeStringToAnsiString(&ansi, key, 0))
+	{
+		*status = NDIS_STATUS_FAILURE;
+		kfree(ansi.buf);
+		TRACEEXIT2(return);
+	}
+	keyname = ansi.buf;
+
+	list_for_each_entry(setting, &handle->device->settings, list)
+	{
+		if(strcmp(keyname, setting->name) == 0)
+		{
+			kfree(setting->val_str);
+			if (setting->value.type == NDIS_SETTING_STRING)
+				kfree(setting->value.data.ustring.buf);
+			*status = ndis_decode_setting(setting, val);
+			DBGTRACE2("setting changed %s=%s",
+				 keyname, setting->val_str);
+			kfree(ansi.buf);
+			TRACEEXIT2(return);
+		}
+	}
+
+	if ((setting = kmalloc(sizeof(*setting), GFP_KERNEL)) == NULL)
+	{
+		*status = NDIS_STATUS_RESOURCES;
+		kfree(ansi.buf);
+		TRACEEXIT2(return);
+	}
+	memset(setting, 0, sizeof(*setting));
+	if ((setting->name = kmalloc(ansi.len+1, GFP_KERNEL)) == NULL)
+	{
+		kfree(setting);
+		*status = NDIS_STATUS_RESOURCES;
+		kfree(ansi.buf);
+		TRACEEXIT2(return);
+	}
+	memcpy(setting->name, keyname, ansi.len);
+	setting->name[ansi.len] = 0;
+	*status = ndis_decode_setting(setting, val);
+	if (*status == NDIS_STATUS_SUCCESS)
+		list_add(&setting->list, &handle->device->settings);
+	else
+	{
+		kfree(setting->name);
+		kfree(setting);
+	}
+	kfree(ansi.buf);
+	TRACEEXIT2(return);
+}
+
+STDCALL static void
+NdisInitializeString(struct ustring *dest, char *src)
+{
+	struct ustring ansi;
+
+	TRACEENTER2("%s", "");
+	ansi.len = ansi.buflen = strlen(src);
+	ansi.buf = src;
+	if (RtlAnsiStringToUnicodeString(dest, &ansi, 1))
+		DBGTRACE2("%s", "failed");
+	TRACEEXIT2(return);
+}
+
+STDCALL static void
+NdisInitAnsiString(struct ustring *dest, char *src)
+{
+	TRACEENTER2("%s", "");
+	if (dest == NULL)
+		TRACEEXIT2(return);
+	if (src == NULL) {
+		dest->len = dest->buflen = 0;
+		dest->buf = NULL;
+		TRACEEXIT2(return);
+	}
+	dest->len = dest->buflen = strlen(src);
+	dest->buf = src;
+	TRACEEXIT2(return);
+}
+
+STDCALL static void
+NdisInitUnicodeString(struct ustring *dest, u16 *src)
+{
+	int i;
+
+	TRACEENTER2("%s", "");
+	if (dest == NULL)
+		TRACEEXIT2(return);
+	if (src == NULL) {
+		dest->len = dest->buflen = 0;
+		dest->buf = NULL;
+		TRACEEXIT2(return);
+	}
+
+	for (i = 0 ; src[i] ; i++)
+		;
+	dest->len = dest->buflen = i * 2;
+	dest->buf = (u8 *)src;
+	TRACEEXIT2(return);
+}
+
+STDCALL static unsigned int
+NdisAnsiStringToUnicodeString(struct ustring *dst, struct ustring *src)
+{
+	int dup;
+
+	TRACEENTER2("%s", "");
+	if (dst == NULL || src == NULL)
+		TRACEEXIT2(return NDIS_STATUS_FAILURE);
+	if (dst->buf == NULL)
+		dup = 1;
+	else
+		dup = 0;
+	TRACEEXIT2(return RtlAnsiStringToUnicodeString(dst, src, 0));
+}
+
+STDCALL static int
+NdisUnicodeStringToAnsiString(struct ustring *dst, struct ustring *src)
+{
+	int dup;
+
+	TRACEENTER2("%s", "");
+	if (dst == NULL || src == NULL)
+		TRACEEXIT2(return NDIS_STATUS_FAILURE);
+	if (dst->buf == NULL)
+		dup = 1;
+	else
+		dup = 0;
+	TRACEEXIT2(return RtlUnicodeStringToAnsiString(dst, src, dup));
+}
+
+/*
+ * Called by driver from the init callback.
+ * The adapter_ctx should be supplied to most other callbacks so we save
+ * it in out handle. Some functions are called only with adapter_ctx, but
+ * we also need handle in them, so we store handle X adapter_ctx map in
+ * a global list.
+ */
+STDCALL static void
+NdisMSetAttributesEx(struct ndis_handle *handle, void* adapter_ctx,
+		     unsigned int hangcheck_interval,
+		     unsigned int attributes, unsigned int adaptortype)
+{
+	struct handle_ctx_entry *handle_ctx;
+
+	TRACEENTER2("%08x, %08x %d %08x, %d", (int)handle, (int)adapter_ctx,
+		    hangcheck_interval, attributes, adaptortype);
+	/* FIXME: is it possible to have duplicate ctx's? */
+	handle_ctx = kmalloc(sizeof(*handle_ctx), GFP_KERNEL);
+	if (handle_ctx)
+	{
+		handle_ctx->handle = handle;
+		handle_ctx->ctx = adapter_ctx;
+		/* atomic_lock is not meant for use here, but since the
+		 * functions that use it are fast, no harm abusing it */
+		wrap_spin_lock(&atomic_lock);
+		list_add(&handle_ctx->list, &handle_ctx_list);
+		wrap_spin_unlock(&atomic_lock);
+	}
+
+	if (attributes & NDIS_ATTRIBUTE_BUS_MASTER)
+	{
+		pci_set_master(handle->pci_dev);
+	}
+
+	if (attributes & NDIS_ATTRIBUTE_DESERIALIZE)
+		handle->serialized = 0;
+	else
+		handle->serialized = 1;
+
+	if (attributes & NDIS_ATTRIBUTE_SURPRISE_REMOVE_OK)
+		handle->surprise_remove = 1;
+
+	if (handle->hangcheck_interval == 0)
+	{
+		if (hangcheck_interval > 2)
+			handle->hangcheck_interval = 2*hangcheck_interval * HZ;
+		/* less than 3 seconds seem to be problematic */
+		else
+			handle->hangcheck_interval = 3 * HZ;
+	}
+
+	handle->adapter_ctx = adapter_ctx;
+	TRACEEXIT2(return);
+}
+
+static struct ndis_handle *ctx_to_handle(void *ctx)
+{
+	struct handle_ctx_entry *handle_ctx;
+
+	wrap_spin_lock(&atomic_lock);
+	list_for_each_entry(handle_ctx, &handle_ctx_list, list)
+	{
+		if (handle_ctx->ctx == ctx)
+		{
+			wrap_spin_unlock(&atomic_lock);
+			return handle_ctx->handle;
+		}
+	}
+	wrap_spin_unlock(&atomic_lock);
+
+	return NULL;
+}
+
+/* remove all 'handle X ctx' pairs for the given handle */
+void free_handle_ctx(struct ndis_handle *handle)
+{
+	struct list_head *curr, *tmp;
+
+	wrap_spin_lock(&atomic_lock);
+	list_for_each_safe(curr, tmp, &handle_ctx_list)
+	{
+		struct handle_ctx_entry *handle_ctx =
+			(struct handle_ctx_entry *)curr;
+		if (handle_ctx->handle == handle)
+		{
+			list_del(&handle_ctx->list);
+			kfree(handle_ctx);
+		}
+	}
+	wrap_spin_unlock(&atomic_lock);
+	return;
+}
+
+STDCALL static unsigned int
+NdisReadPciSlotInformation(struct ndis_handle *handle, unsigned int slot,
+			   unsigned int offset, char *buf, unsigned int len)
+{
+	int i;
+	for(i = 0; i < len; i++)
+	{
+		pci_read_config_byte(handle->pci_dev, offset+i, &buf[i]);
+	}
+	return len;
+}
+
+STDCALL static unsigned int
+NdisWritePciSlotInformation(struct ndis_handle *handle, unsigned int slot,
+			    unsigned int offset, char *buf, unsigned int len)
+{
+	int i;
+	for(i = 0; i < len; i++)
+	{
+		pci_write_config_byte(handle->pci_dev, offset+i, buf[i]);
+	}
+	return len;
+}
+
+STDCALL static void
+NdisMQueryAdapterResources(unsigned int *status, struct ndis_handle *handle,
+			   struct ndis_resource_list *resource_list,
+			   unsigned int *size)
+{
+	int i;
+	int len = 0;
+	struct pci_dev *pci_dev = handle->pci_dev;
+	struct ndis_resource_entry *entry;
+	TRACEENTER2("handle: %08x. buf: %08x, len: %d. IRQ:%d", (int)handle,
+		    (int)resource_list, *size, pci_dev->irq);
+
+	resource_list->version = 1;
+	resource_list->revision = 0;
+
+	/* Put all memory and port resources */
+	i = 0;
+	while(pci_resource_start(pci_dev, i))
+	{
+		entry = &resource_list->list[len++];
+		if(pci_resource_flags(pci_dev, i) & IORESOURCE_MEM)
+		{
+			entry->type = 3;
+			entry->flags = 0;
+
+		}
+
+		else if(pci_resource_flags(pci_dev, i) & IORESOURCE_IO)
+		{
+			entry->type = 1;
+			entry->flags = 1;
+		}
+
+		entry->share = 0;
+		entry->param1 = pci_resource_start(pci_dev, i);
+		entry->param2 = 0;
+		entry->param3 = pci_resource_len(pci_dev, i);
+
+		i++;
+	}
+
+	/* Put IRQ resource */
+	entry = &resource_list->list[len++];
+	entry->type = 2;
+	entry->share = 0;
+	entry->flags = 0;
+	entry->param1 = pci_dev->irq; //Level
+	entry->param2 = pci_dev->irq; //Vector
+	entry->param3 = -1;  //affinity
+
+	resource_list->length = len;
+	*size = (char*) (&resource_list->list[len]) - (char*)resource_list;
+	*status = NDIS_STATUS_SUCCESS;
+
+
+	DBGTRACE2("resource list v%d.%d len %d, size=%d",
+		  resource_list->version, resource_list->revision,
+		  resource_list->length, *size);
+
+	for(i = 0; i < len; i++)
+	{
+		DBGTRACE2("Resource: %d: %08x %08x %08x, %d",
+			  resource_list->list[i].type,
+			  resource_list->list[i].param1,
+			  resource_list->list[i].param2,
+			  resource_list->list[i].param3,
+			  resource_list->list[i].flags);
+	}
+	TRACEEXIT2(return);
+}
+
+STDCALL static unsigned int
+NdisMMapIoSpace(void **virt, struct ndis_handle *handle,
+		unsigned int physlo, unsigned int physhi, unsigned int len)
+{
+	TRACEENTER2("%08x, %d", (int)physlo, len);
+	*virt = ioremap(physlo, len);
+	if(*virt == NULL) {
+		ERROR("%s", "ioremap failed");
+		TRACEEXIT2(return NDIS_STATUS_FAILURE);
+	}
+
+	handle->mem_start = physlo;
+	handle->mem_end = physlo + len -1;
+	DBGTRACE2("ioremap successful %08x", (int)*virt);
+	TRACEEXIT2(return NDIS_STATUS_SUCCESS);
+}
+
+STDCALL static void
+NdisMUnmapIoSpace(struct ndis_handle *handle, void *virtaddr, unsigned int len)
+{
+	TRACEENTER2("%08x, %d", (int)virtaddr, len);
+	iounmap(virtaddr);
+}
+
+STDCALL static void
+NdisAllocateSpinLock(struct ndis_spin_lock *lock)
+{
+	struct wrap_spinlock *wrap_spinlock;
+
+	TRACEENTER4("lock %p", lock);
+
+	wrap_spinlock = wrap_kmalloc(sizeof(wrap_spinlock), GFP_ATOMIC);
+	if (!wrap_spinlock)
+		ERROR("%s", "Couldn't allocate space for spinlock");
+	else
+	{
+		DBGTRACE4("allocated spinlock %p", wrap_spinlock);
+		wrap_spin_lock_init(wrap_spinlock);
+		lock->wrap_spinlock = wrap_spinlock;
+	}
+
+	TRACEEXIT4(return);
+}
+
+STDCALL static void
+NdisFreeSpinLock(struct ndis_spin_lock *lock)
+{
+	TRACEENTER4("lock %p", lock);
+	if (!lock->wrap_spinlock)
+	{
+		ERROR("incorrect lock %p", lock);
+		return;
+	}
+#ifdef CONFIG_DEBUG_SPINLOCK
+	if (lock->wrap_spinlock->magic != NDIS_SPIN_LOCK_MAGIC)
+		ERROR("uninitliazed lock %p (%u)",
+		      lock->wrap_spinlock, lock->wrap_spinlock->magic);
+	else
+#endif
+	{
+		wrap_kfree(lock->wrap_spinlock);
+		lock->wrap_spinlock = NULL;
+	}
+	TRACEEXIT4(return);
+}
+
+STDCALL static void
+NdisAcquireSpinLock(struct ndis_spin_lock *lock)
+{
+	TRACEENTER5("lock %p", lock);
+	if (!lock->wrap_spinlock)
+	{
+		WARNING("Windows driver trying to use uninitialized lock %p,"
+		     " fixing it.", lock);
+		NdisAllocateSpinLock(lock);
+		if (!lock->wrap_spinlock)
+			return;
+	}
+	wrap_spin_lock(lock->wrap_spinlock);
+	TRACEEXIT5(return);
+}
+
+STDCALL static void
+NdisReleaseSpinLock(struct ndis_spin_lock *lock)
+{
+	TRACEENTER5("lock %p", lock);
+	if (!lock->wrap_spinlock)
+	{
+		ERROR("incorrect lock %p", lock);
+		return;
+	}
+	wrap_spin_unlock(lock->wrap_spinlock);
+	TRACEEXIT5(return);
+}
+
+STDCALL static void
+NdisDprAcquireSpinLock(struct ndis_spin_lock *lock)
+{
+	TRACEENTER5("lock %p", lock);
+	NdisAcquireSpinLock(lock);
+	TRACEEXIT5(return);
+}
+
+STDCALL static void
+NdisDprReleaseSpinLock(struct ndis_spin_lock *lock)
+{
+	TRACEENTER5("lock %p", lock);
+	NdisReleaseSpinLock(lock);
+	TRACEEXIT5(return);
+}
+
+STDCALL static  unsigned int
+NdisMAllocateMapRegisters(struct ndis_handle *handle, unsigned int dmachan,
+			  unsigned char dmasize, unsigned int basemap,
+			  unsigned int size)
+{
+	TRACEENTER2("%d %d %d %d", dmachan, dmasize, basemap, size);
+
+//	if (basemap > 64)
+//		return NDIS_STATUS_RESOURCES;
+
+	if (handle->map_count > 0)
+	{
+		DBGTRACE2("%s: map registers already allocated: %u",
+			 handle->net_dev->name, handle->map_count);
+		TRACEEXIT2(return NDIS_STATUS_RESOURCES);
+	}
+
+	handle->map_count = basemap;
+	handle->map_dma_addr = kmalloc(basemap * sizeof(dma_addr_t),
+				       GFP_KERNEL);
+	if (!handle->map_dma_addr)
+		TRACEEXIT2(return NDIS_STATUS_RESOURCES);
+	memset(handle->map_dma_addr, 0, basemap * sizeof(dma_addr_t));
+
+	TRACEEXIT2(return NDIS_STATUS_SUCCESS);
+}
+
+STDCALL static void
+NdisMFreeMapRegisters(struct ndis_handle *handle)
+{
+	TRACEENTER2("handle: %08x", (int)handle);
+
+	if (handle->map_dma_addr != NULL)
+		kfree(handle->map_dma_addr);
+	TRACEEXIT2(return);
+}
+
+STDCALL static void
+NdisMAllocateSharedMemory(struct ndis_handle *handle, unsigned long size,
+			  char cached, void **virt,
+			  struct ndis_phy_address *phys)
+{
+	dma_addr_t p;
+	void *v;
+
+	TRACEENTER3("%s", "");
+//	if (handle->map_dma_addr == NULL)
+//		printk(KERN_ERR "%s: DMA map address is not set!\n",
+//		       __FUNCTION__);
+	v = PCI_DMA_ALLOC_COHERENT(handle->pci_dev, size, &p);
+	if(!v)
+	{
+		ERROR("Failed to allocate DMA coherent memory. "
+		      "Windows driver requested %ld bytes of %scached memory\n",
+		       size, cached ? "" : "un-");
+	}
+
+	*(char**)virt = v;
+	phys->low = (unsigned int)p;
+	phys->high = 0;
+	DBGTRACE3("allocated shared memory: %p", v);
+}
+
+static void alloc_worker(void *data)
+{
+	struct ndis_alloc_entry *alloc_entry;
+	void *virt;
+	struct ndis_phy_address phys;
+	struct ndis_handle *handle;
+	struct miniport_char *miniport;
+
+	TRACEENTER3("%s", "");
+	while (1)
+	{
+		wrap_spin_lock(&alloc_list_lock);
+		if (list_empty(&alloc_list))
+			alloc_entry = NULL;
+		else
+		{
+			alloc_entry =
+				(struct ndis_alloc_entry *)alloc_list.next;
+			list_del(&alloc_entry->list);
+		}
+		wrap_spin_unlock(&alloc_list_lock);
+
+		if (!alloc_entry)
+		{
+			DBGTRACE3("%s", "No more allocs");
+			break;
+		}
+
+		DBGTRACE3("Allocating %scached memory of length %ld",
+			  alloc_entry->cached ? "" : "un-",
+			  alloc_entry->size);
+		handle = (struct ndis_handle *)alloc_entry->handle;
+		miniport = &handle->driver->miniport_char;
+		NdisMAllocateSharedMemory(handle, alloc_entry->size,
+					  alloc_entry->cached, &virt, &phys);
+		miniport->alloc_complete(handle, virt, &phys,
+					 alloc_entry->size, alloc_entry->ctx);
+		kfree(alloc_entry);
+	}
+	TRACEEXIT3(return);
+}
+
+STDCALL static int
+NdisMAllocateSharedMemoryAsync(struct ndis_handle *handle,
+			       unsigned long size, char cached, void *ctx)
+{
+	struct ndis_alloc_entry *alloc_entry;
+
+	TRACEENTER3("%s", "");
+	alloc_entry = kmalloc(sizeof(*alloc_entry), GFP_ATOMIC);
+	if (!alloc_entry)
+		return NDIS_STATUS_FAILURE;
+
+	alloc_entry->handle = handle;
+	alloc_entry->size = size;
+	alloc_entry->cached = cached;
+	alloc_entry->ctx = ctx;
+
+	wrap_spin_lock(&alloc_list_lock);
+	list_add_tail(&alloc_entry->list, &alloc_list);
+	wrap_spin_unlock(&alloc_list_lock);
+
+	schedule_work(&alloc_work);
+	TRACEEXIT3(return NDIS_STATUS_PENDING);
+}
+
+STDCALL static void
+NdisMFreeSharedMemory(struct ndis_handle *handle, unsigned int size,
+		      char cached, void *virt,
+		      unsigned int physlow, unsigned int physhigh)
+{
+	TRACEENTER3("%s", "");
+	PCI_DMA_FREE_COHERENT(handle->pci_dev, size, virt, physlow);
+	TRACEEXIT3(return);
+}
+
+STDCALL static void
+NdisAllocateBufferPool(unsigned int *status, unsigned int *poolhandle,
+		       unsigned int size)
+{
+	TRACEENTER4("%s", "");
+	*poolhandle = 0x0000fff8;
+	*status = NDIS_STATUS_SUCCESS;
+}
+
+STDCALL static void
+NdisFreeBufferPool(void *poolhandle)
+{
+	TRACEENTER4("%s", "");
+
+	TRACEEXIT4(return);
+}
+
+STDCALL static void
+NdisAllocateBuffer(unsigned int *status, void **buffer, void *poolhandle,
+		   void *virt, unsigned int len)
+{
+	struct ndis_buffer *my_buffer = kmalloc(sizeof(struct ndis_buffer),
+						GFP_ATOMIC);
+	TRACEENTER4("%s", "");
+	if(!my_buffer)
+	{
+		ERROR("%s", "Couldn't allocate memory");
+		*status = NDIS_STATUS_FAILURE;
+		TRACEEXIT4(return);
+	}
+
+	memset(my_buffer, 0, sizeof(struct ndis_buffer));
+
+	my_buffer->data = virt;
+	my_buffer->next = 0;
+	my_buffer->len = len;
+
+	*buffer = my_buffer;
+
+	DBGTRACE4("allocated buffer: %p", buffer);
+	*status = NDIS_STATUS_SUCCESS;
+	TRACEEXIT4(return);
+}
+
+STDCALL static void
+NdisFreeBuffer(void *buffer)
+{
+	TRACEENTER4("%s", "");
+	if(buffer)
+	{
+		memset(buffer, 0, sizeof(struct ndis_buffer));
+		kfree(buffer);
+	}
+	TRACEEXIT4(return);
+}
+
+STDCALL static void
+NdisAdjustBufferLength(struct ndis_buffer *buf, unsigned int len)
+{
+	TRACEENTER4("%s", "");
+	buf->len = len;
+}
+
+STDCALL static void
+NdisQueryBuffer(struct ndis_buffer *buf, void **adr, unsigned int *len)
+{
+	TRACEENTER3("%s", "");
+	if(adr)
+		*adr = buf->data;
+	if(len)
+		*len = buf->len;
+}
+
+STDCALL static void
+NdisQueryBufferSafe(struct ndis_buffer *buf, void **adr,
+		    unsigned int *len, unsigned int priority)
+{
+	TRACEENTER3("%08x, %08x, %08x", (int)buf, (int)adr, (int)len);
+	if(adr)
+		*adr = buf->data;
+	if(len)
+		*len = buf->len;
+}
+
+STDCALL static void *
+NdisBufferVirtualAddress(struct ndis_buffer *buf)
+{
+	TRACEENTER3("%s", "");
+	return buf->data;
+}
+
+STDCALL static unsigned long
+NdisBufferLength(struct ndis_buffer *buf)
+{
+	TRACEENTER3("%s", "");
+	return buf->len;
+}
+
+STDCALL static void
+NdisAllocatePacketPool(unsigned int *status, unsigned int *poolhandle,
+		       unsigned int size, unsigned int rsvlen)
+{
+	TRACEENTER3("size=%d", size);
+	*poolhandle = 0xa000fff4;
+	*status = NDIS_STATUS_SUCCESS;
+}
+
+STDCALL static void
+NdisAllocatePacketPoolEx(unsigned int *status, unsigned int *poolhandle,
+			 unsigned int size, unsigned int overflowsize,
+			 unsigned int rsvlen)
+{
+	TRACEENTER3("%s", "");
+	NdisAllocatePacketPool(status, poolhandle, size, rsvlen);
+	TRACEEXIT3(return);
+}
+
+STDCALL static unsigned int
+NdisPacketPoolUsage(void *poolhandle)
+{
+	UNIMPL();
+	return 0;
+}
+
+STDCALL static void
+NdisFreePacketPool(void *poolhandle)
+{
+	TRACEENTER3("handle: %08x", (int)poolhandle);
+}
+
+STDCALL static void
+NdisAllocatePacket(unsigned int *status, struct ndis_packet **packet_out,
+		   void *poolhandle)
+{
+	struct ndis_packet *packet;
+
+	TRACEENTER3("%s", "");
+	packet = kmalloc(sizeof(struct ndis_packet), GFP_ATOMIC);
+	if(!packet)
+	{
+		ERROR("%s", "Couldn't allocate memory");
+		*packet_out = NULL;
+		*status = NDIS_STATUS_FAILURE;
+		TRACEEXIT3(return);
+	}
+	memset(packet, 0, sizeof(struct ndis_packet));
+	packet->oob_offset = (int)(&packet->timesent1) - (int)packet;
+	packet->pool = (void*) 0xa000fff4;
+	packet->packet_flags = 0xc0;
+
+/* See comment in wrapper.c/send_one about this */
+#if 0
+	{
+		int i = 0;
+		/* Poision extra packet info */
+		int *x = (int*) &packet->ext1;
+		for(i = 0; i <= 12; i++)
+		{
+			x[i] = i;
+		}
+		packet->mediaspecific_size = 0x100;
+		packet->mediaspecific = (void*) 0x0001f00;
+	}
+#endif
+
+
+	*packet_out = packet;
+	*status = NDIS_STATUS_SUCCESS;
+	TRACEEXIT3(return);
+}
+
+STDCALL static void
+NdisFreePacket(void *packet)
+{
+	TRACEENTER3("%s", "");
+	if(packet)
+	{
+		memset(packet, 0, sizeof(struct ndis_packet));
+		kfree(packet);
+	}
+	TRACEEXIT3(return);
+}
+
+STDCALL static void
+NdisMInitializeTimer(struct ndis_miniport_timer *timer_handle,
+		     struct ndis_handle *handle, void *func, void *ctx)
+{
+	TRACEENTER4("%s", "");
+	wrapper_init_timer(&timer_handle->ktimer, handle);
+	init_dpc(&timer_handle->kdpc, func, ctx);
+	wrapper_set_timer_dpc(timer_handle->ktimer.wrapper_timer,
+	                      &timer_handle->kdpc);
+	TRACEEXIT4(return);
+}
+
+STDCALL static void
+NdisInitializeTimer(struct ndis_timer *timer_handle, void *func, void *ctx)
+{
+	TRACEENTER4("%p, %p, %p", timer_handle, func, ctx);
+	wrapper_init_timer(&timer_handle->ktimer, NULL);
+	init_dpc(&timer_handle->kdpc, func, ctx);
+	wrapper_set_timer_dpc(timer_handle->ktimer.wrapper_timer,
+	                      &timer_handle->kdpc);
+	TRACEEXIT4(return);
+}
+
+STDCALL static void
+NdisSetTimer(struct ndis_timer *timer_handle, unsigned int ms)
+{
+	unsigned long expires = jiffies + (ms * HZ) / 1000;
+
+	TRACEENTER4("%p, %u", timer_handle, ms);
+	wrapper_set_timer(timer_handle->ktimer.wrapper_timer, expires, 0);
+	TRACEEXIT4(return);
+}
+
+STDCALL static void
+NdisMSetPeriodicTimer(struct ndis_miniport_timer *timer_handle,
+		      unsigned int ms)
+{
+	unsigned long expires = jiffies + (ms * HZ) / 1000;
+	unsigned long repeat = ms * HZ / 1000;
+
+	TRACEENTER4("%p, %u", timer_handle, ms);
+	wrapper_set_timer(timer_handle->ktimer.wrapper_timer, expires, repeat);
+	TRACEEXIT4(return);
+}
+
+STDCALL static void
+NdisMCancelTimer(struct ndis_miniport_timer *timer_handle, char *canceled)
+{
+	TRACEENTER4("%s", "");
+	wrapper_cancel_timer(timer_handle->ktimer.wrapper_timer, canceled);
+	TRACEEXIT4(return);
+}
+
+STDCALL static void
+NdisCancelTimer(struct ndis_timer *timer_handle, char *canceled)
+{
+	TRACEENTER4("%s", "");
+	wrapper_cancel_timer(timer_handle->ktimer.wrapper_timer, canceled);
+	TRACEEXIT4(return);
+}
+
+/*
+ * The driver asks ndis what mac it should use. If this
+ * function returns failiure it will use it's default mac.
+ */
+STDCALL static void
+NdisReadNetworkAddress(unsigned int *status, char *adr, unsigned int *len,
+		       void *conf_handle)
+{
+	TRACEENTER1("%s", "");
+	*len = 0;
+	*status = NDIS_STATUS_FAILURE;
+	TRACEEXIT1(return);
+}
+
+STDCALL static void
+NdisMRegisterAdapterShutdownHandler(struct ndis_handle *handle,
+				    void *ctx, void *func)
+{
+	TRACEENTER1("sp:%08x", getSp());
+	handle->driver->miniport_char.adapter_shutdown = func;
+	handle->shutdown_ctx = ctx;
+}
+
+STDCALL static void
+NdisMDeregisterAdapterShutdownHandler(struct ndis_handle *handle)
+{
+	TRACEENTER1("sp:%08x", getSp());
+	handle->driver->miniport_char.adapter_shutdown = NULL;
+	handle->shutdown_ctx = NULL;
+}
+
+/* bottom half of the irq handler */
+void ndis_irq_bh(void *data)
+{
+	struct ndis_irq *ndis_irq = (struct ndis_irq *) data;
+	struct ndis_handle *handle = ndis_irq->handle;
+	struct miniport_char *miniport = &handle->driver->miniport_char;
+
+	if (ndis_irq->enabled)
+	{
+		miniport->handle_interrupt(handle->adapter_ctx);
+		if (miniport->enable_interrupts)
+			miniport->enable_interrupts(handle->adapter_ctx);
+	}
+}
+
+/* Top half of the irq handler */
+irqreturn_t ndis_irq_th(int irq, void *data, struct pt_regs *pt_regs)
+{
+	int recognized = 0;
+	int handled = 0;
+	struct ndis_irq *ndis_irq = (struct ndis_irq *) data;
+	struct ndis_handle *handle;
+	struct miniport_char *miniport;
+
+	if (!ndis_irq || !ndis_irq->handle)
+		return IRQ_NONE;
+	handle = ndis_irq->handle;
+	miniport = &handle->driver->miniport_char;
+	/* this spinlock should be shared with NdisMSynchronizeWithInterrupt
+	 */
+	spin_lock(ndis_irq->spinlock);
+	if (ndis_irq->req_isr)
+		miniport->isr(&recognized, &handled, handle->adapter_ctx);
+	else //if (miniport->disable_interrupts)
+	{
+		miniport->disable_interrupts(handle->adapter_ctx);
+		/* it is not shared interrupt, so handler must be called */
+		recognized = handled = 1;
+	}
+	spin_unlock(ndis_irq->spinlock);
+
+	if (recognized && handled)
+		schedule_work(&handle->irq_bh);
+
+	if (recognized)
+		return IRQ_HANDLED;
+
+	return IRQ_NONE;
+}
+
+STDCALL static unsigned int
+NdisMRegisterInterrupt(struct ndis_irq *ndis_irq, struct ndis_handle *handle,
+		       unsigned int vector, unsigned int level,
+		       unsigned char req_isr, unsigned char shared,
+		       unsigned int mode)
+{
+	TRACEENTER1("%08x, vector:%d, level:%d, req_isr:%d, shared:%d, "
+		    "mode:%d sp:%08x",(int)ndis_irq, vector, level, req_isr,
+		    shared, mode, (int)getSp());
+
+	ndis_irq->spinlock = kmalloc(sizeof(spinlock_t), GFP_KERNEL);
+	if (ndis_irq->spinlock == NULL)
+		TRACEEXIT1(return NDIS_STATUS_RESOURCES);
+
+	ndis_irq->irq = vector;
+	ndis_irq->handle = handle;
+	ndis_irq->req_isr = req_isr;
+	if (shared && !req_isr)
+		WARNING("%s", "shared but dynamic interrupt!");
+	ndis_irq->shared = shared;
+	spin_lock_init(ndis_irq->spinlock);
+	handle->ndis_irq = ndis_irq;
+
+	INIT_WORK(&handle->irq_bh, &ndis_irq_bh, ndis_irq);
+	if (request_irq(vector, ndis_irq_th, shared? SA_SHIRQ : 0,
+			"ndiswrapper", ndis_irq))
+	{
+		TRACEEXIT1(return NDIS_STATUS_RESOURCES);
+	}
+	ndis_irq->enabled = 1;
+	printk(KERN_INFO "%s: using irq %d\n", DRV_NAME, vector);
+	TRACEEXIT1(return NDIS_STATUS_SUCCESS);
+}
+
+/* called in call_halt */
+STDCALL void
+NdisMDeregisterInterrupt(struct ndis_irq *ndis_irq)
+{
+	TRACEENTER1("%p", ndis_irq);
+
+	if (ndis_irq)
+	{
+		struct ndis_handle *handle = ndis_irq->handle;
+		ndis_irq->enabled = 0;
+		/* flush irq_bh workqueue; calling it before enabled=0
+		 * will crash since some drivers (Centrino at least) don't
+		 * expect irq hander to be called anymore */
+		/* cancel_delayed_work is probably better, but 2.4 kernels
+		 * don't have equivalent function
+		 */
+		flush_scheduled_work();
+		free_irq(ndis_irq->irq, ndis_irq);
+		kfree(ndis_irq->spinlock);
+		ndis_irq->spinlock = NULL;
+		ndis_irq->handle = NULL;
+		handle->ndis_irq = NULL;
+	}
+	TRACEEXIT1(return);
+}
+
+STDCALL static unsigned char
+NdisMSynchronizeWithInterrupt(struct ndis_irq *ndis_irq, void *func, void *ctx)
+{
+	unsigned char ret;
+	unsigned char (*sync_func)(void *ctx) STDCALL;
+
+	TRACEENTER5("%08x %08x %08x %08x\n", (int) ndis_irq,
+		    (int) ndis_irq, (int) func, (int) ctx);
+
+	if (func == NULL || ctx == NULL)
+		TRACEEXIT5(return 0);
+
+	sync_func = func;
+	spin_lock_bh(ndis_irq->spinlock);
+	ret = sync_func(ctx);
+	spin_unlock_bh(ndis_irq->spinlock);
+
+	DBGTRACE5("sync_func returns %u", ret);
+	TRACEEXIT5(return ret);
+}
+
+/* called via fnuction pointer */
+STDCALL void
+NdisMIndicateStatus(struct ndis_handle *handle, unsigned int status, void *buf,
+		    unsigned int len)
+{
+	TRACEENTER1("%08x", status);
+
+	if (status == NDIS_STATUS_MEDIA_CONNECT)
+	{
+		handle->link_status = 1;
+		set_bit(WRAPPER_LINK_STATUS, &handle->wrapper_work);
+		schedule_work(&handle->wrapper_worker);
+	}
+
+	if (status == NDIS_STATUS_MEDIA_DISCONNECT)
+		handle->link_status = 0;
+
+	if (status == NDIS_STATUS_MEDIA_SPECIFIC_INDICATION && buf)
+	{
+		struct status_indication *status =
+			(struct status_indication *)buf;
+		DBGTRACE("%s", "media status");
+		if (status->status_type == NDIS_STATUS_AUTHENTICATION)
+		{
+			struct auth_req *auth_req;
+			buf = (char *)buf + sizeof(struct status_indication);
+			len -= sizeof(struct status_indication);
+			while (len > 0)
+			{
+				auth_req = (struct auth_req *)buf;
+				DBGTRACE(MACSTR, MAC2STR(auth_req->bssid));
+				if (auth_req->flags & 0x01)
+					DBGTRACE("%s", "reqauth");
+				if (auth_req->flags & 0x02)
+					DBGTRACE("%s", "keyupdate");
+				if (auth_req->flags & 0x06)
+					DBGTRACE("%s", "pairwise_error");
+				if (auth_req->flags & 0x0E)
+					DBGTRACE("%s", "group_error");
+				len -= auth_req->length;
+				buf = (char *)buf + auth_req->length;
+			}
+		}
+	}
+
+	TRACEEXIT1(return);
+}
+
+/* called via function pointer */
+STDCALL void
+NdisMIndicateStatusComplete(struct ndis_handle *handle)
+{
+	TRACEENTER3("%s", "");
+}
+
+/* called via function pointer */
+STDCALL void
+NdisMIndicateReceivePacket(struct ndis_handle *handle,
+			   struct ndis_packet **packets,
+			   unsigned int nr_packets)
+{
+	struct ndis_buffer *buffer;
+	struct ndis_packet *packet;
+	struct sk_buff *skb;
+	int i;
+
+	TRACEENTER3("%s", "");
+	for(i = 0; i < nr_packets; i++)
+	{
+		packet = packets[i];
+		if(!packet)
+		{
+			WARNING("%s", "Skipping empty packet on receive");
+			continue;
+		}
+
+		buffer = packet->buffer_head;
+
+		skb = dev_alloc_skb(buffer->len);
+		if(skb)
+		{
+			skb->dev = handle->net_dev;
+			eth_copy_and_sum(skb, buffer->data, buffer->len, 0);
+			skb_put(skb, buffer->len);
+			skb->protocol = eth_type_trans(skb, handle->net_dev);
+			handle->stats.rx_bytes += buffer->len;
+			handle->stats.rx_packets++;
+			netif_rx(skb);
+		}
+		else
+			handle->stats.rx_dropped++;
+
+		/* The driver normally sets status field to
+		 * NDIS_STATUS_SUCCESS which means a normal packet
+		 * delivery. We should then change status to
+		 * NDIS_STATUS_PENDING meaning that we now own the
+		 * package that we'll call the return_packet handler
+		 * later when the packet is processed.
+		 *
+		 * Since we always make a copy of the packet here it
+		 * would be tempting to call the return_packet from
+		 * here but we cannot to this because some some
+		 * drivers gets confused by this. The centrino driver
+		 * for example calls this function with a spinlock
+		 * held and when calling return_packet it tries to
+		 * take the same lock again leading to an instant
+		 * lockup on SMP.
+		 *
+		 * If status is NDIS_STATUS_RESOURCES it means that
+		 * the driver is running out of packets and expects us
+		 * to copy the packet and then set status to
+		 * NDIS_STATUS_SUCCESS and not call the return_packet
+		 * handler later.
+		 */
+
+		if(packet->status == NDIS_STATUS_RESOURCES)
+		{
+			/* Signal the driver that we did not take
+			 * ownership of the packet. */
+			packet->status = NDIS_STATUS_SUCCESS;
+			DBGTRACE3("%s", "Low on resources");
+		}
+		else
+		{
+			if(packet->status != NDIS_STATUS_SUCCESS)
+				WARNING("invalid packet status %08X",
+					packet->status);
+			/* Signal the driver that took ownership of
+			 * the packet and will call return_packet later
+			 */
+			packet->status = NDIS_STATUS_PENDING;
+			wrap_spin_lock(&handle->recycle_packets_lock);
+			list_add(&packet->recycle_list,
+				 &handle->recycle_packets);
+			wrap_spin_unlock(&handle->recycle_packets_lock);
+			schedule_work(&handle->recycle_packets_work);
+		}
+	}
+	TRACEEXIT3(return);
+}
+
+/* called via function pointer */
+STDCALL void
+NdisMSendComplete(struct ndis_handle *handle,
+		  struct ndis_packet *packet, unsigned int status)
+{
+	TRACEENTER3("%08x", status);
+	sendpacket_done(handle, packet);
+	/* In case a serialized driver has requested a pause by returning
+	 * NDIS_STATUS_RESOURCES we need to give the send-code a kick again.
+	 */
+	handle->send_status = 0;
+	schedule_work(&handle->xmit_work);
+	TRACEEXIT3(return);
+}
+
+/* called via function pointer */
+STDCALL void
+NdisMSendResourcesAvailable(struct ndis_handle *handle)
+{
+	TRACEENTER3("%s", "");
+	/* sending packets immediately seem to result in NDIS_STATUS_FAILURE,
+	   so wait for a while before sending the packet again */
+	mdelay(5);
+	handle->send_status = 0;
+	schedule_work(&handle->xmit_work);
+	TRACEEXIT3(return);
+}
+
+/* called via function pointer (by NdisMEthIndicateReiceve macro) */
+STDCALL void
+EthRxIndicateHandler(void *adapter_ctx, void *rx_ctx, char *header1,
+		     char *header, u32 header_size, char *look_ahead,
+		     u32 look_ahead_size, u32 packet_size)
+{
+	struct sk_buff *skb = NULL;
+	struct ndis_handle *handle = ctx_to_handle(rx_ctx);
+	unsigned int skb_size = 0;
+
+	TRACEENTER3("adapter_ctx = %p, rx_ctx = %p, buf = %p, size = %d, "
+		    "buf = %p, size = %d, packet = %d",
+		    adapter_ctx, rx_ctx, header, header_size, look_ahead,
+		    look_ahead_size, packet_size);
+
+	DBGTRACE3("handle = %p", handle);
+	if (!handle)
+		TRACEEXIT3(return);
+
+	if (look_ahead_size < packet_size)
+	{
+		struct ndis_packet *packet;
+		struct miniport_char *miniport;
+		unsigned int res, bytes_txed;
+
+		NdisAllocatePacket(&res, &packet, NULL);
+		if (res != NDIS_STATUS_SUCCESS)
+		{
+			handle->stats.rx_dropped++;
+			TRACEEXIT3(return);
+		}
+
+		miniport = &handle->driver->miniport_char;
+		res = miniport->tx_data(packet, &bytes_txed, adapter_ctx,
+					rx_ctx, look_ahead_size, packet_size);
+		if (res == NDIS_STATUS_SUCCESS)
+		{
+			skb = dev_alloc_skb(header_size+look_ahead_size+
+					    bytes_txed);
+			if (skb)
+			{
+				memcpy(skb->data, header, header_size);
+				memcpy(skb->data+header_size, look_ahead,
+				       look_ahead_size);
+				memcpy(skb->data+header_size+look_ahead_size,
+				       packet->buffer_head->data,
+				       bytes_txed);
+				skb_size = header_size+look_ahead_size+
+					bytes_txed;
+				NdisFreePacket(packet);
+			}
+		}
+		else if (res == NDIS_STATUS_PENDING)
+		{
+			/* driver will call td_complete */
+			packet->look_ahead = kmalloc(look_ahead_size,
+						     GFP_ATOMIC);
+			if (!packet->look_ahead)
+			{
+				NdisFreePacket(packet);
+				handle->stats.rx_dropped++;
+				TRACEEXIT3(return);
+			}
+			memcpy(&packet->header, header, 
+			       sizeof(packet->header));
+			memcpy(packet->look_ahead, look_ahead,
+			       look_ahead_size);
+			packet->look_ahead_size = look_ahead_size;
+		}
+		else
+		{
+			NdisFreePacket(packet);
+			handle->stats.rx_dropped++;
+			TRACEEXIT3(return);
+		}
+	}
+	else
+	{
+		skb_size = header_size+packet_size;
+		skb = dev_alloc_skb(skb_size);
+		if (skb)
+		{
+			memcpy(skb->data, header, header_size);
+			memcpy(skb->data+header_size, look_ahead, packet_size);
+		}
+	}
+
+	if (skb && skb_size > 0)
+	{
+		skb->dev = handle->net_dev;
+		skb_put(skb, skb_size);
+		skb->protocol = eth_type_trans(skb, handle->net_dev);
+		handle->stats.rx_bytes += skb_size;
+		handle->stats.rx_packets++;
+		netif_rx(skb);
+	}
+	else
+		handle->stats.rx_dropped++;
+
+	TRACEEXIT3(return);
+}
+
+/* called via function pointer */
+STDCALL void
+NdisMTransferDataComplete(struct ndis_handle *handle,
+			  struct ndis_packet *packet,
+			  unsigned int status, unsigned int bytes_txed)
+{
+	struct sk_buff *skb;
+	unsigned int skb_size;
+
+	TRACEENTER3("handle = %p, packet = %p, bytes_txed = %d",
+		    handle, packet, bytes_txed);
+
+	if (!packet)
+	{
+		WARNING("%s", "illegal packet");
+		TRACEEXIT3(return);
+	}
+
+	if ((int)packet->look_ahead_size <= 0)
+	{
+		WARNING("illegal packet? (look_ahead_size = %d)",
+			packet->look_ahead_size);
+		TRACEEXIT3(return);
+	}
+
+	skb_size = sizeof(packet->header)+packet->look_ahead_size+bytes_txed;
+
+	skb = dev_alloc_skb(skb_size);
+	if (!skb)
+	{
+		kfree(packet->look_ahead);
+		NdisFreePacket(packet);
+		handle->stats.rx_dropped++;
+		TRACEEXIT3(return);
+	}
+
+	skb->dev = handle->net_dev;
+	memcpy(skb->data, packet->header, sizeof(packet->header));
+	memcpy(skb->data+sizeof(packet->header), packet->look_ahead,
+	       packet->look_ahead_size);
+	memcpy(skb->data+sizeof(packet->header)+packet->look_ahead_size,
+	       packet->buffer_head->data, bytes_txed);
+	kfree(packet->look_ahead);
+	NdisFreePacket(packet);
+	skb_put(skb, skb_size);
+	skb->protocol = eth_type_trans(skb, handle->net_dev);
+	handle->stats.rx_bytes += skb_size;
+	handle->stats.rx_packets++;
+	netif_rx(skb);
+}
+
+/* called via function pointer */
+STDCALL void
+EthRxComplete(struct ndis_handle *handle)
+{
+	DBGTRACE3("%s", "");
+}
+
+/* Called via function pointer if query returns NDIS_STATUS_PENDING */
+STDCALL void
+NdisMQueryInformationComplete(struct ndis_handle *handle, unsigned int status)
+{
+	TRACEENTER3("%08X", status);
+
+	handle->ndis_comm_res = status;
+	up(&handle->ndis_comm_done);
+	TRACEEXIT3(return);
+}
+
+/* Called via function pointer if setinfo returns NDIS_STATUS_PENDING */
+STDCALL void
+NdisMSetInformationComplete(struct ndis_handle *handle,
+					 unsigned int status)
+{
+	TRACEENTER3("status = %08X", status);
+
+	handle->ndis_comm_res = status;
+	up(&handle->ndis_comm_done);
+	TRACEEXIT3(return);
+}
+
+STDCALL static void
+NdisMSleep(unsigned long us_to_sleep)
+{
+	TRACEENTER4("us: %lu", us_to_sleep);
+	if (us_to_sleep > 0)
+	{
+		set_current_state(TASK_INTERRUPTIBLE);
+		schedule_timeout((us_to_sleep * HZ)/1000000);
+		DBGTRACE4("%s", "woke up");
+	}
+	TRACEEXIT4(return);
+}
+
+STDCALL static void
+NdisGetCurrentSystemTime(u64 *time)
+{
+	struct timeval now;
+	u64 t;
+
+	do_gettimeofday(&now);
+	t = (u64) now.tv_sec * TICKSPERSEC;
+	t += now.tv_usec * 10 + TICKS_1601_TO_1970;
+	*time = t;
+}
+
+STDCALL static unsigned int
+NdisMRegisterIoPortRange(void **virt, struct ndis_handle *handle,
+			 unsigned int start, unsigned int len)
+{
+	TRACEENTER3("%08x %08x", start, len);
+	*virt = (void*) start;
+	return NDIS_STATUS_SUCCESS;
+}
+
+STDCALL static void
+NdisMDeregisterIoPortRange(struct ndis_handle *handle, unsigned int start,
+			   unsigned int len, void* virt)
+{
+	TRACEENTER1("%08x %08x", start, len);
+}
+
+STDCALL static long
+NdisInterlockedDecrement(long *val)
+{
+	long x;
+
+	TRACEENTER4("%s", "");
+	wrap_spin_lock(&atomic_lock);
+	(*val)--;
+	x = *val;
+	wrap_spin_unlock(&atomic_lock);
+	TRACEEXIT4(return x);
+}
+
+STDCALL static long
+NdisInterlockedIncrement(long *val)
+{
+	long x;
+
+	TRACEENTER4("%s", "");
+	wrap_spin_lock(&atomic_lock);
+	(*val)++;
+	x = *val;
+	wrap_spin_unlock(&atomic_lock);
+	TRACEEXIT4(return x);
+}
+
+STDCALL static struct list_entry *
+NdisInterlockedInsertHeadList(struct list_entry *head,
+			      struct list_entry *entry,
+			      struct ndis_spin_lock *lock)
+{
+	struct list_entry *flink;
+
+	TRACEENTER1("lock: %p", lock);
+	NdisAcquireSpinLock(lock);
+
+	flink = head->fwd_link;
+	entry->fwd_link = flink;
+	entry->bwd_link = head;
+	flink->bwd_link = entry;
+	head->fwd_link = entry;
+
+	NdisReleaseSpinLock(lock);
+	TRACEEXIT1(return (flink != head) ? flink : NULL);
+}
+
+STDCALL static struct list_entry *
+NdisInterlockedInsertTailList(struct list_entry *head,
+			      struct list_entry *entry,
+			      struct ndis_spin_lock *lock)
+{
+	struct list_entry *flink;
+
+	TRACEENTER1("lock: %p", lock);
+	NdisAcquireSpinLock(lock);
+
+	flink = head->bwd_link;
+	entry->fwd_link = head;
+	entry->bwd_link = flink;
+	flink->fwd_link = entry;
+	head->bwd_link = entry;
+
+	NdisReleaseSpinLock(lock);
+	TRACEEXIT1(return (flink != head) ? flink : NULL);
+}
+
+STDCALL static struct list_entry *
+NdisInterlockedRemoveHeadList(struct list_entry *head,
+			      struct ndis_spin_lock *lock)
+{
+	struct list_entry *flink;
+
+	TRACEENTER1("lock: %p", lock);
+	NdisAcquireSpinLock(lock);
+
+	flink = head->fwd_link;
+	head->fwd_link = flink->fwd_link;
+	head->fwd_link->bwd_link = head;
+
+	NdisReleaseSpinLock(lock);
+	TRACEEXIT1(return (flink != head) ? flink : NULL);
+}
+
+STDCALL static int
+NdisMInitializeScatterGatherDma(struct ndis_handle *handle, int is64bit,
+				unsigned long maxtransfer)
+{
+	TRACEENTER2("64bit=%d, maxtransfer=%ld", is64bit, maxtransfer);
+	handle->use_scatter_gather = 1;
+	return NDIS_STATUS_SUCCESS;
+}
+
+STDCALL static unsigned int
+NdisMGetDmaAlignment(struct ndis_handle *handle)
+{
+	TRACEENTER3("%s", "");
+	return PAGE_SIZE;
+}
+
+STDCALL static void
+NdisQueryBufferOffset(struct ndis_buffer *buffer, unsigned int *offset,
+		      unsigned int *length)
+{
+	TRACEENTER3("%s", "");
+	*offset = 0;
+	*length = buffer->len;
+}
+
+STDCALL static int
+NdisSystemProcessorCount(void)
+{
+	return NR_CPUS;
+}
+
+STDCALL static void
+NdisInitializeEvent(struct ndis_event *event)
+{
+	TRACEENTER3("%08x", (int)event);
+	event->state = 0;
+}
+
+STDCALL static int
+NdisWaitEvent(struct ndis_event *event, int timeout)
+{
+	int res;
+
+	TRACEENTER3("%08x %08x", (int)event, timeout);
+	if (event->state)
+		TRACEEXIT3(return 1);
+	if (!timeout)
+	{
+		wait_event_interruptible(event_wq, event->state == 1);
+		return 1;
+	}
+
+	res = wait_event_interruptible_timeout(event_wq, event->state == 1,
+					       (timeout * HZ)/1000);
+	DBGTRACE3("%08x Woke up (%d)", (int)event, event->state);
+
+	if (event->state == 1)
+		TRACEEXIT3(return 1);
+
+	TRACEEXIT3(return 0);
+}
+
+STDCALL static void
+NdisSetEvent(struct ndis_event *event)
+{
+	event->state = 1;
+	wake_up_interruptible(&event_wq);
+}
+
+STDCALL static void
+NdisResetEvent(struct ndis_event *event)
+{
+	TRACEENTER3("%08x", (int)event);
+	event->state = 0;
+}
+
+/* called via function pointer */
+STDCALL void
+NdisMResetComplete(struct ndis_handle *handle, int status, int reset_status)
+{
+	TRACEENTER3("status: %08X, reset status: %u", status, reset_status);
+
+	handle->ndis_comm_res = status;
+	handle->reset_status = status;
+	up(&handle->ndis_comm_done);
+	TRACEEXIT3(return);
+}
+
+static void worker(void *context)
+{
+	struct ndis_workentry *workentry;
+	struct ndis_work *ndis_work;
+
+	TRACEENTER3("%s", "");
+	while (1)
+	{
+		wrap_spin_lock(&worklist_lock);
+		if (list_empty(&worklist))
+			workentry = NULL;
+		else
+		{
+			workentry = (struct ndis_workentry*) worklist.next;
+			list_del(&workentry->list);
+		}
+		wrap_spin_unlock(&worklist_lock);
+
+		if (!workentry)
+		{
+			DBGTRACE3("%s", "No more work");
+			break;
+		}
+
+		ndis_work = workentry->work;
+
+		DBGTRACE3("Calling work at %08x (rva %08x)with parameter %08x",
+			  (int)ndis_work->func,
+			  (int)ndis_work->func - image_offset,
+			  (int)ndis_work->ctx);
+		ndis_work->func(ndis_work, ndis_work->ctx);
+		kfree(workentry);
+	}
+	TRACEEXIT3(return);
+}
+
+STDCALL static int
+NdisScheduleWorkItem(struct ndis_work *ndis_work)
+{
+	struct ndis_workentry *workentry;
+
+	TRACEENTER3("%s", "");
+	/* this function is called from irq_bh by realtek driver */
+	workentry = kmalloc(sizeof(*workentry), GFP_ATOMIC);
+	if (!workentry)
+	{
+		BUG();
+	}
+	workentry->work = ndis_work;
+
+	wrap_spin_lock(&worklist_lock);
+	list_add_tail(&workentry->list, &worklist);
+	wrap_spin_unlock(&worklist_lock);
+
+	schedule_work(&work);
+	TRACEEXIT3(return NDIS_STATUS_SUCCESS);
+}
+
+STDCALL static void
+NdisUnchainBufferAtBack(struct ndis_packet *packet,
+			struct ndis_buffer **buffer)
+{
+	struct ndis_buffer *b = packet->buffer_head;
+	struct ndis_buffer *btail = packet->buffer_tail;
+
+	TRACEENTER3("%p", b);
+	if(!b) {
+		/* No buffer in packet */
+		*buffer = 0;
+		TRACEEXIT3(return);
+	}
+
+	if(b == btail) {
+		/* Only buffer in packet */
+		packet->buffer_head = 0;
+		packet->buffer_tail = 0;
+	} else {
+		while(b->next != btail) {
+			b = b->next;
+		}
+		packet->buffer_tail = b;
+	}
+	b->next = 0;
+	packet->valid_counts = 0;
+	*buffer = btail;
+	TRACEEXIT3(return);
+}
+
+STDCALL static void
+NdisUnchainBufferAtFront(struct ndis_packet *packet,
+			 struct ndis_buffer **buffer)
+{
+	struct ndis_buffer *b = packet->buffer_head;
+
+	TRACEENTER3("%p", b);
+	if(!b) {
+		/* No buffer in packet */
+		*buffer = 0;
+		TRACEEXIT3(return);
+	}
+
+	if(b == packet->buffer_tail) {
+		/* Only buffer in packet */
+		packet->buffer_head = 0;
+		packet->buffer_tail = 0;
+	}
+	else
+	{
+		packet->buffer_head = b->next;
+	}
+
+	b->next = 0;
+	packet->valid_counts = 0;
+
+	*buffer = b;
+	TRACEEXIT3(return);
+}
+
+STDCALL static void
+NdisGetFirstBufferFromPacketSafe(struct ndis_packet *packet,
+				 struct ndis_buffer **buffer, void **virt,
+				 unsigned int *len, unsigned int *totlen,
+				 unsigned int priority)
+{
+	struct ndis_buffer *b = packet->buffer_head;
+
+	TRACEENTER3("%p", b);
+
+	*buffer = b;
+	*virt = b->data;
+	*len = b->len;
+	*totlen = packet->len;
+}
+
+STDCALL static void
+NdisMStartBufferPhysicalMapping(struct ndis_handle *handle,
+				struct ndis_buffer *buf,
+				unsigned long phy_map_reg,
+				unsigned int write_to_dev,
+				struct ndis_phy_addr_unit *phy_addr_array,
+				unsigned int  *array_size)
+{
+	TRACEENTER3("phy_map_reg: %ld", phy_map_reg);
+	if (!write_to_dev)
+	{
+		ERROR( "dma from device not supported (%d)", write_to_dev);
+		*array_size = 0;
+		return;
+	}
+
+	if (phy_map_reg > handle->map_count)
+	{
+		ERROR("map_register too big (%lu > %u)",
+		      phy_map_reg, handle->map_count);
+		*array_size = 0;
+		return;
+	}
+
+	if (handle->map_dma_addr[phy_map_reg] != 0)
+	{
+		ERROR("map register already used (%lu)", phy_map_reg);
+		*array_size = 0;
+		return;
+	}
+
+	// map buffer
+	phy_addr_array[0].phy_addr.low =
+		PCI_DMA_MAP_SINGLE(handle->pci_dev, buf->data, buf->len,
+				   PCI_DMA_TODEVICE);
+	phy_addr_array[0].phy_addr.high = 0;
+	phy_addr_array[0].length= buf->len;
+
+	*array_size = 1;
+
+	// save mapping index
+	handle->map_dma_addr[phy_map_reg] =
+		(dma_addr_t)phy_addr_array[0].phy_addr.low;
+}
+
+STDCALL static void
+NdisMCompleteBufferPhysicalMapping(struct ndis_handle *handle,
+				   struct ndis_buffer *buf,
+				   unsigned long phy_map_reg)
+{
+	TRACEENTER3("%p %lu (%u)", handle, phy_map_reg, handle->map_count);
+
+	if (phy_map_reg > handle->map_count)
+	{
+		ERROR("map_register too big (%lu > %u)",
+		      phy_map_reg, handle->map_count);
+		return;
+	}
+
+	if (handle->map_dma_addr[phy_map_reg] == 0)
+	{
+		ERROR("map register not used (%lu)", phy_map_reg);
+		return;
+	}
+
+	// unmap buffer
+	PCI_DMA_UNMAP_SINGLE(handle->pci_dev,
+			     handle->map_dma_addr[phy_map_reg],
+			     buf->len, PCI_DMA_TODEVICE);
+
+	// clear mapping index
+	handle->map_dma_addr[phy_map_reg] = 0;
+}
+
+STDCALL static int
+NdisMRegisterDevice(struct ndis_handle *handle, struct ustring *dev_name,
+		    struct ustring *sym_name, void **funcs, void *dev_object,
+		    struct ndis_handle **dev_handle)
+{
+	TRACEENTER1("%p, %p", *dev_handle, handle);
+	*dev_handle = handle;
+	return NDIS_STATUS_SUCCESS;
+}
+
+STDCALL static int
+NdisMDeregisterDevice(struct ndis_handle *handle)
+{
+	return NDIS_STATUS_SUCCESS;
+}
+
+STDCALL static void
+NdisMGetDeviceProperty(struct ndis_handle handle, void **phy_dev,
+		       void **func_dev, void **next_dev, void **alloc_res,
+		       void**trans_res)
+{
+	TRACEENTER1("%s", "");
+	return;
+}
+
+STDCALL static unsigned long
+NdisReadPcmciaAttributeMemory(struct ndis_handle *handle,
+			       unsigned int offset, void *buffer,
+			       unsigned long length)
+{
+	UNIMPL();
+	return 0;
+}
+
+STDCALL static unsigned long
+NdisWritePcmciaAttributeMemory(struct ndis_handle *handle,
+			       unsigned int offset, void *buffer,
+			       unsigned long length)
+{
+	UNIMPL();
+	return 0;
+}
+
+ /* Unimplemented...*/
+STDCALL static void NdisMSetAttributes(void){UNIMPL();}
+STDCALL static void EthFilterDprIndicateReceiveComplete(void){UNIMPL();}
+STDCALL static void EthFilterDprIndicateReceive(void){UNIMPL();}
+STDCALL static void NdisMPciAssignResources(void){UNIMPL();}
+STDCALL static void NdisMRemoveMiniport(void) { UNIMPL(); }
+
+struct wrap_func ndis_wrap_funcs[] =
+{
+	WRAP_FUNC_ENTRY(EthFilterDprIndicateReceive),
+	WRAP_FUNC_ENTRY(EthFilterDprIndicateReceiveComplete),
+	WRAP_FUNC_ENTRY(NDIS_BUFFER_TO_SPAN_PAGES),
+	WRAP_FUNC_ENTRY(NdisAcquireSpinLock),
+	WRAP_FUNC_ENTRY(NdisAdjustBufferLength),
+	WRAP_FUNC_ENTRY(NdisAllocateBuffer),
+	WRAP_FUNC_ENTRY(NdisAllocateBufferPool),
+	WRAP_FUNC_ENTRY(NdisAllocateMemory),
+	WRAP_FUNC_ENTRY(NdisAllocateMemoryWithTag),
+	WRAP_FUNC_ENTRY(NdisAllocatePacket),
+	WRAP_FUNC_ENTRY(NdisAllocatePacketPool),
+	WRAP_FUNC_ENTRY(NdisAllocatePacketPoolEx),
+	WRAP_FUNC_ENTRY(NdisAllocateSpinLock),
+	WRAP_FUNC_ENTRY(NdisAnsiStringToUnicodeString),
+	WRAP_FUNC_ENTRY(NdisBufferLength),
+	WRAP_FUNC_ENTRY(NdisBufferVirtualAddress),
+	WRAP_FUNC_ENTRY(NdisCancelTimer),
+	WRAP_FUNC_ENTRY(NdisCloseConfiguration),
+	WRAP_FUNC_ENTRY(NdisCloseFile),
+	WRAP_FUNC_ENTRY(NdisDprAcquireSpinLock),
+	WRAP_FUNC_ENTRY(NdisDprReleaseSpinLock),
+	WRAP_FUNC_ENTRY(NdisFreeBuffer),
+	WRAP_FUNC_ENTRY(NdisFreeBufferPool),
+	WRAP_FUNC_ENTRY(NdisFreeMemory),
+	WRAP_FUNC_ENTRY(NdisFreePacket),
+	WRAP_FUNC_ENTRY(NdisFreePacketPool),
+	WRAP_FUNC_ENTRY(NdisFreeSpinLock),
+	WRAP_FUNC_ENTRY(NdisGetBufferPhysicalArraySize),
+	WRAP_FUNC_ENTRY(NdisGetCurrentSystemTime),
+	WRAP_FUNC_ENTRY(NdisGetFirstBufferFromPacketSafe),
+	WRAP_FUNC_ENTRY(NdisGetSystemUpTime),
+//	WRAP_FUNC_ENTRY(NdisMIndicateStatus),
+//	WRAP_FUNC_ENTRY(NdisMIndicateStatusComplete),
+	WRAP_FUNC_ENTRY(NdisInitAnsiString),
+	WRAP_FUNC_ENTRY(NdisInitUnicodeString),
+	WRAP_FUNC_ENTRY(NdisInitializeEvent),
+	WRAP_FUNC_ENTRY(NdisInitializeString),
+	WRAP_FUNC_ENTRY(NdisInitializeTimer),
+	WRAP_FUNC_ENTRY(NdisInitializeWrapper),
+	WRAP_FUNC_ENTRY(NdisInterlockedDecrement),
+	WRAP_FUNC_ENTRY(NdisInterlockedIncrement),
+	WRAP_FUNC_ENTRY(NdisInterlockedInsertHeadList),
+	WRAP_FUNC_ENTRY(NdisInterlockedInsertTailList),
+	WRAP_FUNC_ENTRY(NdisInterlockedRemoveHeadList),
+	WRAP_FUNC_ENTRY(NdisMAllocateMapRegisters),
+	WRAP_FUNC_ENTRY(NdisMAllocateSharedMemory),
+	WRAP_FUNC_ENTRY(NdisMAllocateSharedMemoryAsync),
+	WRAP_FUNC_ENTRY(NdisMCancelTimer),
+	WRAP_FUNC_ENTRY(NdisMCompleteBufferPhysicalMapping),
+	WRAP_FUNC_ENTRY(NdisMDeregisterAdapterShutdownHandler),
+	WRAP_FUNC_ENTRY(NdisMDeregisterDevice),
+	WRAP_FUNC_ENTRY(NdisMDeregisterInterrupt),
+	WRAP_FUNC_ENTRY(NdisMDeregisterIoPortRange),
+	WRAP_FUNC_ENTRY(NdisMFreeMapRegisters),
+	WRAP_FUNC_ENTRY(NdisMFreeSharedMemory),
+	WRAP_FUNC_ENTRY(NdisMGetDeviceProperty),
+	WRAP_FUNC_ENTRY(NdisMGetDmaAlignment),
+//	WRAP_FUNC_ENTRY(NdisMIndicateReceivePacket),
+	WRAP_FUNC_ENTRY(NdisMInitializeScatterGatherDma),
+	WRAP_FUNC_ENTRY(NdisMInitializeTimer),
+	WRAP_FUNC_ENTRY(NdisMMapIoSpace),
+	WRAP_FUNC_ENTRY(NdisMPciAssignResources),
+	WRAP_FUNC_ENTRY(NdisMQueryAdapterResources),
+//	WRAP_FUNC_ENTRY(NdisMQueryInformationComplete),
+	WRAP_FUNC_ENTRY(NdisMRegisterAdapterShutdownHandler),
+	WRAP_FUNC_ENTRY(NdisMRegisterDevice),
+	WRAP_FUNC_ENTRY(NdisMRegisterInterrupt),
+	WRAP_FUNC_ENTRY(NdisMRegisterIoPortRange),
+	WRAP_FUNC_ENTRY(NdisMRegisterMiniport),
+	WRAP_FUNC_ENTRY(NdisMRemoveMiniport),
+//	WRAP_FUNC_ENTRY(NdisMResetComplete),
+//	WRAP_FUNC_ENTRY(NdisMSendComplete),
+//	WRAP_FUNC_ENTRY(NdisMSendResourcesAvailable),
+	WRAP_FUNC_ENTRY(NdisMSetAttributes),
+	WRAP_FUNC_ENTRY(NdisMSetAttributesEx),
+//	WRAP_FUNC_ENTRY(NdisMSetInformationComplete),
+	WRAP_FUNC_ENTRY(NdisMSetPeriodicTimer),
+	WRAP_FUNC_ENTRY(NdisMSleep),
+	WRAP_FUNC_ENTRY(NdisMStartBufferPhysicalMapping),
+	WRAP_FUNC_ENTRY(NdisMSynchronizeWithInterrupt),
+	WRAP_FUNC_ENTRY(NdisMUnmapIoSpace),
+	WRAP_FUNC_ENTRY(NdisMapFile),
+	WRAP_FUNC_ENTRY(NdisOpenConfiguration),
+	WRAP_FUNC_ENTRY(NdisOpenConfigurationKeyByName),
+	WRAP_FUNC_ENTRY(NdisOpenFile),
+	WRAP_FUNC_ENTRY(NdisPacketPoolUsage),
+	WRAP_FUNC_ENTRY(NdisQueryBuffer),
+	WRAP_FUNC_ENTRY(NdisQueryBufferOffset),
+	WRAP_FUNC_ENTRY(NdisQueryBufferSafe),
+	WRAP_FUNC_ENTRY(NdisReadConfiguration),
+	WRAP_FUNC_ENTRY(NdisReadNetworkAddress),
+	WRAP_FUNC_ENTRY(NdisReadPciSlotInformation),
+	WRAP_FUNC_ENTRY(NdisReadPcmciaAttributeMemory),
+	WRAP_FUNC_ENTRY(NdisReleaseSpinLock),
+	WRAP_FUNC_ENTRY(NdisResetEvent),
+	WRAP_FUNC_ENTRY(NdisScheduleWorkItem),
+	WRAP_FUNC_ENTRY(NdisSetEvent),
+	WRAP_FUNC_ENTRY(NdisSetTimer),
+	WRAP_FUNC_ENTRY(NdisSystemProcessorCount),
+	WRAP_FUNC_ENTRY(NdisTerminateWrapper),
+	WRAP_FUNC_ENTRY(NdisUnchainBufferAtBack),
+	WRAP_FUNC_ENTRY(NdisUnchainBufferAtFront),
+	WRAP_FUNC_ENTRY(NdisUnicodeStringToAnsiString),
+	WRAP_FUNC_ENTRY(NdisUnmapFile),
+	WRAP_FUNC_ENTRY(NdisWaitEvent),
+	WRAP_FUNC_ENTRY(NdisWriteConfiguration),
+	WRAP_FUNC_ENTRY(NdisWriteErrorLogEntry),
+	WRAP_FUNC_ENTRY(NdisWritePciSlotInformation),
+	WRAP_FUNC_ENTRY(NdisWritePcmciaAttributeMemory),
+
+	{NULL, NULL}
+};
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/ndis.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/ndis.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/ndis.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/ndis.h	2004-09-05 15:48:55.000000000 +0200
@@ -0,0 +1,1113 @@
+/*
+ *  Copyright (C) 2003-2004 Pontus Fuchs, Giridhar Pemmasani
+ *
+ *  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.
+ *
+ */
+#ifndef NDIS_H
+#define NDIS_H
+
+#include "ntoskernel.h"
+
+struct packed ndis_scatterentry
+{
+	unsigned int physlo;
+	unsigned int physhi;
+	unsigned int len;
+	unsigned int reserved;
+};
+
+struct packed ndis_scatterlist
+{
+	unsigned int len;
+	unsigned int reserved;
+	struct ndis_scatterentry entry;
+};
+
+struct packed ndis_phy_address
+{
+	__u32 low;
+	__u32 high;
+};
+
+struct ndis_phy_addr_unit {
+    struct ndis_phy_address phy_addr;
+    unsigned int length;
+};
+
+struct ndis_buffer
+{
+	struct ndis_buffer *next;
+	unsigned int len;
+	unsigned int offset;
+	unsigned char *data;
+};
+
+
+struct packed ndis_packet
+{
+	unsigned int nr_pages;
+
+	/* 4: Packet length */
+	unsigned int len;
+
+	struct ndis_buffer *buffer_head;
+	struct ndis_buffer *buffer_tail;
+	void *pool;
+
+	/* 14 Number of buffers */
+	unsigned int count;
+
+	unsigned int flags;
+
+	/* 1 If buffer count is valid? */
+	__u8 valid_counts;
+	__u8 packet_flags;
+	__u16 oob_offset;
+
+	/* For use by miniport */
+	unsigned char private_1 [6*sizeof(void*)];
+	unsigned char private_2[4];
+
+	/* OOB data */
+	__u32 timesent1;
+	__u32 timesent2;
+	__u32 timerec1;
+	__u32 timerec2;
+	unsigned int header_size;
+	unsigned int mediaspecific_size;
+	void *mediaspecific;
+	unsigned int status;
+
+	void *ext1;
+	void *ext2;
+	void *ext3;
+	void *ext4;
+	void *ext5;
+	struct ndis_scatterlist *scatter_gather_ext;
+	void *ext7;
+	void *ext8;
+	void *ext9;
+	void *ext10;
+	void *ext11;
+	void *ext12;
+
+	struct ndis_scatterlist scatterlist;
+	dma_addr_t dataphys;
+	struct list_head recycle_list;
+	unsigned char header[ETH_HLEN];
+	unsigned char *look_ahead;
+	unsigned int look_ahead_size;
+};
+
+enum ndis_pnp_event
+{
+	NDIS_PNP_QUERY_REMOVED,
+	NDIS_PNP_REMOVED,
+	NDIS_PNP_SURPRISE_REMOVED,
+	NDIS_PNP_QUERY_STOPPED,
+	NDIS_PNP_STOPPED,
+	NDIS_PNP_PROFILE_CHANGED,
+	NDIS_PNP_MAXIMUM,
+};
+
+struct miniport_char
+{
+	/* NDIS 3.0 */
+	unsigned char majorVersion;
+	unsigned char minorVersion;
+	unsigned int reserved;
+
+	char (*hangcheck)(void *ctx) STDCALL;
+	void (*disable_interrupts)(void *ctx) STDCALL;
+	void (*enable_interrupts)(void *ctx) STDCALL;
+
+	/* Stop miniport */
+	void (*halt)(void *ctx) STDCALL;
+
+	/* Interrupt BH */
+	void (*handle_interrupt)(void *ctx) STDCALL;
+
+	/* Start miniport driver */
+	unsigned int (*init)(unsigned int *OpenErrorStatus,
+			     unsigned int *SelectedmediumIndex,
+			     unsigned int *MediumArray,
+			     unsigned int MediumArraySize, void *ndis_handle,
+			     void *conf_handle) STDCALL;
+
+	/* Interrupt TH */
+	void (*isr)(unsigned int *taken, unsigned int *callme,
+		    void *ctx) STDCALL;
+
+	/* Query parameters */
+	unsigned int (*query)(void *ctx, unsigned int oid,
+			      char *buffer, unsigned int buflen,
+			      unsigned int *written,
+			      unsigned int *needed) STDCALL;
+
+	void * ReconfigureHandler;
+	int (*reset)(int *needs_set, void *ctx) STDCALL;
+
+	/* Send one packet */
+	unsigned int (*send)(void *ctx, struct ndis_packet *packet,
+			     unsigned int flags) STDCALL;
+
+	/* Set parameters */
+	unsigned int (*setinfo)(void *ctx, unsigned int oid, char *buffer,
+				unsigned int buflen, unsigned int *written,
+				unsigned int *needed) STDCALL;
+
+	/* transfer data from received packet */
+	unsigned int (*tx_data)(struct ndis_packet *ndis_packet,
+				unsigned int *bytes_txed,
+				void *adapter_ctx, void *rx_ctx,
+				unsigned int offset,
+				unsigned int bytes_to_tx) STDCALL;
+
+	/* NDIS 4.0 extensions */
+	/* upper layer is done with RX packet */
+	void (*return_packet)(void *ctx, void *packet) STDCALL;
+
+	/* Send packets */
+	unsigned int (*send_packets)(void *ctx, struct ndis_packet **packets,
+				     int nr_of_packets) STDCALL;
+
+	void (*alloc_complete)(void *handle, void *virt,
+			       struct ndis_phy_address *phys,
+			       unsigned long size, void *ctx) STDCALL;
+
+	/* NDIS 5.0 extensions */
+	void *co_create_vc;
+	void *co_delete_vc;
+	void *co_activate_vc;
+	void *co_deactivate_vc;
+	void *co_send_packets;
+	void *co_request;
+
+	/* NDIS 5.1 extensions */
+	void *cancel_send_packets;
+	void (*pnp_event_notify)(void *ctx, enum ndis_pnp_event, void *inf_buf,
+				 unsigned long inf_buf_len) STDCALL;
+	void (*adapter_shutdown)(void *ctx) STDCALL;
+	void *reserved1;
+	void *reserved2;
+	void *reserved3;
+	void *reserved4;
+
+};
+
+struct handle_ctx_entry
+{
+	struct list_head list;
+	void *handle;
+	void *ctx;
+};
+
+struct ndis_alloc_entry
+{
+	struct list_head list;
+	struct ndis_handle *handle;
+	unsigned long size;
+	unsigned char cached;
+	void *ctx;
+};
+
+struct ndis_work
+{
+	void *ctx;
+	void (*func)(struct ndis_work *work, void *ctx) STDCALL;
+	struct list_head list;
+};
+
+struct ndis_workentry
+{
+	struct list_head list;
+	struct ndis_work *work;
+};
+
+struct kevent
+{
+	struct dispatch_header header;
+};
+
+struct ndis_irq
+{
+	/* void *intr_obj is used for irq */
+	int irq;
+	/* KSPIN_LOCK lock (pointer to unsigned long) is used for spinlock */
+	/* Taken by ISR, DisableInterrupt and SynchronizeWithInterrupt */
+	spinlock_t *spinlock;
+	void *id;
+	void *isr;
+	void *dpc;
+
+	struct kdpc intr_dpc;
+	struct ndis_handle *handle;
+	unsigned char dpc_count;
+	/* unsigned char filler1 is used for enabled */
+	unsigned char enabled;
+	struct kevent completed_event;
+	unsigned char shared;
+	unsigned char req_isr;
+};
+
+struct ndis_spin_lock
+{
+	struct wrap_spinlock *wrap_spinlock;
+	KIRQL kirql;
+};
+
+struct packed ustring
+{
+	__u16 len;
+	__u16 buflen;
+	char *buf;
+};
+
+struct ndis_binary_data {
+	__u16 len;
+	void *buf;
+};
+
+enum ndis_setting_type {
+	NDIS_SETTING_INT,
+	NDIS_SETTING_HEXINT,
+	NDIS_SETTING_STRING,
+	NDIS_SETTING_MULTISTRING,
+	NDIS_SETTING_BINARY,
+	NDIS_SETTING_NONE,
+};
+
+struct ndis_setting_val
+{
+	enum ndis_setting_type type;
+	union
+	{
+		unsigned long intval;
+		struct ustring ustring;
+//		struct ndis_binary_data binary_data;
+	} data;
+};
+
+struct ndis_setting
+{
+	struct list_head list;
+	char *name;
+	char *val_str;
+	struct ndis_setting_val value;
+};
+
+
+struct ndis_file
+{
+	struct list_head list;
+	char name[32];
+	int size;
+	void *data;
+};
+
+
+/*
+ * There is one of these per driver. One per loaded driver exists.
+ *
+ */
+struct ndis_driver
+{
+	struct list_head list;
+	char name[32];
+
+	struct list_head devices;
+	struct list_head files;
+	struct pci_driver pci_driver;
+	struct pci_device_id *pci_idtable;
+
+	int nr_devices;
+	int started;
+
+	unsigned int pci_registered;
+
+	void *image;
+	unsigned int (*entry)(void *obj, char *p2) STDCALL;
+	struct miniport_char miniport_char;
+	struct ndis_device *current_device;
+};
+
+/*
+ * There is one of these per handeled pci-id
+ *
+ */
+struct ndis_device
+{
+	struct list_head list;
+	struct list_head settings;
+	struct ndis_driver *driver;
+
+	int pci_vendor;
+	int pci_device;
+	int pci_subvendor;
+	int pci_subdevice;
+	int fuzzy;
+};
+
+typedef __u64 LARGE_INTEGER;
+struct ndis_wireless_stats {
+	LARGE_INTEGER length;
+	LARGE_INTEGER tx_frag;
+	LARGE_INTEGER tx_multi_frag;
+	LARGE_INTEGER failed;
+	LARGE_INTEGER retry;
+	LARGE_INTEGER multi_retry;
+	LARGE_INTEGER rtss_succ;
+	LARGE_INTEGER rtss_fail;
+	LARGE_INTEGER ack_fail;
+	LARGE_INTEGER frame_dup;
+	LARGE_INTEGER rx_frag;
+	LARGE_INTEGER rx_multi_frag;
+	LARGE_INTEGER fcs_err;
+};
+
+#define NDIS_ESSID_MAX_SIZE 32
+struct packed ndis_essid
+{
+	unsigned int length;
+	char essid[NDIS_ESSID_MAX_SIZE];
+};
+
+#define NDIS_ENCODING_TOKEN_MAX 32
+struct packed ndis_encr_key
+{
+	unsigned long struct_size;
+	unsigned long index;
+	unsigned long length;
+	unsigned char key[NDIS_ENCODING_TOKEN_MAX];
+};
+
+typedef unsigned char mac_address[ETH_ALEN];
+
+struct ndis_wpa_key
+{
+	unsigned long struct_size;
+	unsigned long index;
+	unsigned long length;
+	mac_address bssid;
+	unsigned char pad[6];
+	unsigned long long rsc;
+	unsigned char key[NDIS_ENCODING_TOKEN_MAX];
+};
+
+struct ndis_remove_key
+{
+	unsigned long struct_size;
+	unsigned long index;
+	mac_address bssid;
+};
+
+enum auth_mode
+{
+	AUTHMODE_OPEN,
+	AUTHMODE_RESTRICTED,
+	AUTHMODE_AUTO,
+	AUTHMODE_WPA,
+	AUTHMODE_WPAPSK,
+	AUTHMODE_WPANONE
+};
+
+enum encr_mode
+{
+	ENCR1_ENABLED,
+	ENCR_DISABLED,
+	ENCR1_NOKEY,
+	ENCR1_NO_SUPPORT,
+	ENCR2_ENABLED,
+	ENCR2_ABSENT,
+	ENCR3_ENABLED,
+	ENCR3_ABSENT,
+};
+
+struct fixed_ies
+{
+    unsigned char time_stamp[8];
+    unsigned short beacon_interval;
+    unsigned short capa;
+};
+
+struct variable_ies
+{
+    unsigned char elem_id;
+    unsigned char length;
+    unsigned char data[1];
+};
+
+struct ndis_assoc_info
+{
+	unsigned long length;
+	unsigned short req_ies;
+	struct req_ie {
+		unsigned short capa;
+		unsigned short listen_interval;
+		mac_address cur_ap_address;
+	} req_ie;
+	unsigned long req_ie_length;
+	unsigned long offset_req_ies;
+	unsigned short resp_ies;
+	struct resp_ie {
+		unsigned short capa;
+		unsigned short status_code;
+		unsigned short assoc_id;
+	} resp_ie;
+	unsigned long resp_ie_length;
+	unsigned long offset_resp_ies;
+};
+
+enum wrapper_work
+{
+	WRAPPER_LINK_STATUS,
+	SET_OP_MODE,
+	SET_ESSID,
+};
+
+enum op_mode
+{
+	NDIS_MODE_ADHOC,
+	NDIS_MODE_INFRA,
+	NDIS_MODE_AUTO
+};
+
+#define MAX_ENCR_KEYS 4
+struct encr_info
+{
+	struct encr_key
+	{
+		unsigned int length;
+		unsigned char key[NDIS_ENCODING_TOKEN_MAX];
+	} keys[MAX_ENCR_KEYS];
+	int active;
+};
+
+struct packed ndis_configuration
+{
+	__u32 length;
+	__u32 beacon_period;
+	__u32 atim_window;
+	__u32 ds_config;
+	struct ndis_configuration_fh
+	{
+		__u32 length;
+		__u32 hop_pattern;
+		__u32 hop_set;
+		__u32 dwell_time;
+	} fh_config;
+};
+
+#define XMIT_RING_SIZE 16
+
+enum ndis_medium {
+	NDIS_MEDIUM_802_3,
+	NDIS_MEDIUM_802_5,
+	NDIS_MEDIUM_FDDI,
+	NDIS_MEDIUM_WAN,
+	NDIS_MEDIUM_LOCALTALK,
+	NDIS_MEDIUM_DIX,
+	NDIS_MEDIUM_ARCNETRAW,
+	NDIS_MEDIUM_ARCNET878_2,
+	NDIS_MEDIUM_ATM,
+	NDIS_MEDIUM_WIRELESSWAN,
+	NDIS_MEDIUM_IRDA,
+	NDIS_MEDIUM_BPC,
+	NDIS_MEDIUM_COWAN,
+	NDIS_MEDIUM_1394,
+	NDIS_MEDIUM_MAX
+};
+
+
+enum ndis_phys_medium
+{
+    NDIS_PHYSICAL_MEDIUM_UNSPECIFIED,
+    NDIS_PHYSICAL_MEDIUM_WIRELESSLAN,
+    NDIS_PHYSICAL_MEDIUM_CABLEMODEM,
+    NDIS_PHYSICAL_MEDIUM_PHONELINE,
+    NDIS_PHYSICAL_MEDIUM_POWERLINE,
+    NDIS_PHYSICAL_MEDIUM_DSL,
+    NDIS_PHYSICAL_MEDIUM_FIBRECHANNEL,
+    NDIS_PHYSICAL_MEDIUM_1394,
+    NDIS_PHYSICAL_MEDIUM_WIRELESSWAN,
+    NDIS_PHYSICAL_MEDIUM_MAX,
+};
+
+/*
+ * This is the per device struct. One per PCI-device exists.
+ *
+ *  This struct contains function pointers that the drivers references directly via macros,
+ * so it's important that they are at the correct position hence the paddings.
+ */
+struct packed ndis_handle
+{
+	char fill1[232];
+	void *rx_packet;
+	void *send_complete;
+	void *send_resource_avail;
+	void *reset_complete;
+//	char fill2[132];
+
+	unsigned long media_type;
+	unsigned int bus_number;
+	unsigned int bus_type;
+	unsigned int adapter_type;
+	void *device_obj;
+	void *phys_device_obj;
+	void *next_device_obj;
+	void *mapreg;
+	void *call_mgraflist;
+	void *miniport_thread;
+	void *setinfobuf;
+	unsigned short setinfo_buf_len;
+	unsigned short max_send_pkts;
+	unsigned int fake_status;
+	void *lock_handler;
+	struct ustring *adapter_instance_name;
+	void *timer_queue;
+	u32 mac_options;
+	void *pending_req;
+	u32 max_long_addrs;
+	u32 max_short_addrs;
+	u32 cur_lookahead;
+	u32 max_lookahead;
+	void *interrupt;
+	void *disable_intr;
+	void *enable_intr;
+	void *send_pkts;
+	void *deferred_send;
+	void *eth_rx_indicate;
+	void *txrx_indicate;
+	void *fddi_rx_indicate;
+	void *eth_rx_complete;
+	void *txrx_complete;
+	void *fddi_rx_complete;
+
+	void *status;
+	void *status_complete;
+	void *td_complete;
+
+	void *query_complete;
+	void *set_complete;
+	void *wan_tx_complete;
+	void *wan_rx;
+	void *wan_rx_complete;
+
+	char fill3[200];
+
+	struct pci_dev *pci_dev;
+	struct net_device *net_dev;
+	void *adapter_ctx;
+	void *shutdown_ctx;
+
+	struct work_struct irq_bh;
+
+	struct ndis_irq *ndis_irq;
+	unsigned long mem_start;
+	unsigned long mem_end;
+
+	struct net_device_stats stats;
+	struct iw_statistics wireless_stats;
+	struct ndis_wireless_stats ndis_stats;
+	struct ndis_driver *driver;
+	struct ndis_device *device;
+
+	struct work_struct xmit_work;
+	struct wrap_spinlock xmit_ring_lock;
+	struct ndis_buffer *xmit_ring[XMIT_RING_SIZE];
+	unsigned int xmit_ring_start;
+	unsigned int xmit_ring_pending;
+
+	int send_status;
+	struct ndis_packet *send_packet;
+	struct wrap_spinlock send_packet_lock;
+	struct wrap_spinlock send_packet_done_lock;
+
+	struct semaphore ndis_comm_mutex;
+	wait_queue_head_t ndis_comm_wqhead;
+	int ndis_comm_res;
+	struct semaphore ndis_comm_done;
+
+	int serialized;
+	int use_scatter_gather;
+	int map_count;
+	int multicast_list_size;
+	char *multicast_list;
+	dma_addr_t *map_dma_addr;
+
+	int hangcheck_interval;
+	struct timer_list hangcheck_timer;
+	struct work_struct hangcheck_work;
+	int reset_status;
+
+	struct timer_list statcollector_timer;
+	struct work_struct statcollector_work;
+
+	unsigned long scan_timestamp;
+
+	u32 link_status;
+	struct encr_info encr_info;
+	char nick[IW_ESSID_MAX_SIZE+1];
+
+	u32 pci_state[16];
+	unsigned int pm_state;
+
+	struct ndis_essid essid;
+
+	unsigned long capa;
+	enum auth_mode auth_mode;
+	enum encr_mode encr_mode;
+	enum op_mode op_mode;
+
+	struct list_head recycle_packets;
+	struct wrap_spinlock recycle_packets_lock;
+	struct work_struct recycle_packets_work;
+
+	/* List of initialized timers */
+	struct list_head timers;
+
+	struct proc_dir_entry *procfs_iface;
+
+	struct work_struct set_rx_mode_work;
+
+	struct work_struct wrapper_worker;
+	unsigned long wrapper_work;
+
+	unsigned short surprise_remove;
+};
+
+struct ndis_timer
+{
+	struct ktimer ktimer;
+	struct kdpc kdpc;
+};
+
+struct ndis_miniport_timer
+{
+	struct ktimer ktimer;
+	struct kdpc kdpc;
+	void *timer_func;
+	void *timer_ctx;
+	struct ndis_handle *handle;
+	struct ndis_miniport_timer *next;
+};
+
+struct packed ndis_resource_entry
+{
+	__u8 type;
+	__u8 share;
+	__u16 flags;
+	__u32 param1;
+	__u32 param2;
+	__u32 param3;
+};
+
+struct packed ndis_resource_list
+{
+	__u16 version;
+	__u16 revision;
+	__u32 length;
+	struct ndis_resource_entry list[0];
+};
+
+
+struct ndis_event
+{
+	int state;
+};
+
+#define NDIS_MAX_RATES 16
+struct ssid_item
+{
+	unsigned long length;
+	__u8 mac[ETH_ALEN];
+	unsigned char reserved[2];
+	struct ndis_essid ssid;
+	unsigned long privacy;
+	long rssi;
+	unsigned int net_type;
+	struct ndis_configuration config;
+	unsigned int mode;
+	unsigned char rates[NDIS_MAX_RATES];
+	unsigned long ie_length;
+	unsigned char ies[1];
+};
+
+#define WLAN_EID_GENERIC 221
+#define MAX_WPA_IE_LEN 64
+
+struct bssid_list
+{
+	unsigned long num_items;
+	struct ssid_item items[1];
+};
+
+enum priv_filter
+{
+	NDIS_PRIV_ACCEPT_ALL,
+	NDIS_PRIV_WEP,
+};
+
+enum ndis_power
+{
+	NDIS_POWER_OFF = 0,
+	NDIS_POWER_MAX,
+	NDIS_POWER_MIN,
+};
+
+enum ndis_pm_state
+{
+	NDIS_PM_STATE_D0 = 1,
+	NDIS_PM_STATE_D1 = 2,
+	NDIS_PM_STATE_D2 = 3,
+	NDIS_PM_STATE_D3 = 4,
+};
+
+enum ndis_power_profile
+{
+	NDIS_POWER_PROFILE_BATTERY,
+	NDIS_POWER_PROFILE_AC,
+};
+
+enum status_type
+{
+	NDIS_STATUS_AUTHENTICATION,
+	NDIS_STATUS_MAX,
+};
+
+struct status_indication
+{
+	enum status_type status_type;
+};
+
+struct auth_req
+{
+	unsigned long length;
+	mac_address bssid;
+	unsigned long flags;
+};
+
+void sendpacket_done(struct ndis_handle *handle, struct ndis_packet *packet);
+STDCALL void NdisMIndicateReceivePacket(struct ndis_handle *handle,
+					struct ndis_packet **packets,
+					unsigned int nr_packets);
+STDCALL void NdisMSendComplete(struct ndis_handle *handle,
+			       struct ndis_packet *packet,
+			       unsigned int status);
+STDCALL void NdisMSendResourcesAvailable(struct ndis_handle *handle);
+STDCALL void NdisMIndicateStatus(struct ndis_handle *handle,
+				 unsigned int status, void *buf,
+				 unsigned int len);
+STDCALL void NdisMIndicateStatusComplete(struct ndis_handle *handle);
+STDCALL void NdisMQueryInformationComplete(struct ndis_handle *handle,
+					   unsigned int status);
+STDCALL void NdisMSetInformationComplete(struct ndis_handle *handle,
+					 unsigned int status);
+STDCALL void NdisMResetComplete(struct ndis_handle *handle, int status,
+				int reset_status);
+STDCALL unsigned long NDIS_BUFFER_TO_SPAN_PAGES(struct ndis_buffer *buffer);
+STDCALL void NdisMDeregisterInterrupt(struct ndis_irq *ndis_irq);
+STDCALL void EthRxIndicateHandler(void *adapter_ctx, void *rx_ctx,
+				  char *header1, char *header,
+				  u32 header_size, char *look_aheader,
+				  u32 look_aheader_size, u32 packet_size);
+STDCALL void EthRxComplete(struct ndis_handle *handle);
+void free_handle_ctx(struct ndis_handle *handle);
+STDCALL void NdisMTransferDataComplete(struct ndis_handle *handle,
+				       struct ndis_packet *packet,
+				       unsigned int status,
+				       unsigned int bytes_txed);
+
+STDCALL int RtlUnicodeStringToAnsiString(struct ustring *dst,
+					 struct ustring *src,
+					 unsigned int dup);
+STDCALL int RtlAnsiStringToUnicodeString(struct ustring *dst,
+					 struct ustring *src,
+					 unsigned int dup);
+int getSp(void);
+void init_ndis(void);
+
+int ndiswrapper_procfs_init(void);
+int ndiswrapper_procfs_add_iface(struct ndis_handle *handle);
+void ndiswrapper_procfs_remove_iface(struct ndis_handle *handle);
+void ndiswrapper_procfs_remove(void);
+
+int doquery(struct ndis_handle *handle, unsigned int oid, char *buf,
+	    int bufsize, unsigned int *written , unsigned int *needed);
+int dosetinfo(struct ndis_handle *handle, unsigned int oid, char *buf,
+	      int bufsize, unsigned int *written , unsigned int *needed);
+int set_int(struct ndis_handle *handle, int oid, int data);
+int query_int(struct ndis_handle *handle, int oid, int *data);
+int doreset(struct ndis_handle *handle);
+void ndis_set_rx_mode(struct net_device *dev);
+
+void packet_recycler(void *param);
+
+int stricmp(const char *s1, const char *s2);
+
+#define NDIS_OID_STAT_TX_OK         0x00020101
+#define NDIS_OID_STAT_RX_OK         0x00020102
+#define NDIS_OID_STAT_TX_ERROR      0x00020103
+#define NDIS_OID_STAT_RX_ERROR      0x00020104
+
+#define OID_802_3_MULTICAST_LIST    0x01010103
+#define OID_802_3_MAXIMUM_LIST_SIZE 0x01010104
+
+#define NDIS_OID_ESSID              0x0D010102
+#define NDIS_OID_BSSID              0x0D010101
+#define NDIS_OID_MODE               0x0D010108
+#define NDIS_OID_RSSI               0x0D010206
+#define NDIS_OID_RSSI_TRIGGER       0x0D010207
+#define NDIS_OID_CONFIGURATION      0x0D010211
+#define NDIS_OID_TX_POWER_LEVEL     0x0D010205
+#define NDIS_OID_RTS_THRESH         0x0D01020A
+#define NDIS_OID_FRAG_THRESH        0x0D010209
+#define NDIS_OID_PACKET_FILTER      0x0001010E
+#define NDIS_OID_ADD_WEP            0x0D010113
+#define NDIS_OID_REMOVE_WEP         0x0D010114
+#define NDIS_OID_ENCR_STATUS        0x0D01011B
+#define NDIS_OID_AUTH_MODE          0x0D010118
+#define NDIS_OID_PRIVACY_FILTER     0x0D010119
+#define NDIS_OID_NETWORK_TYPE_IN_USE 0x0D010204
+#define NDIS_OID_BSSID_LIST_SCAN    0x0D01011A
+#define NDIS_OID_BSSID_LIST         0x0D010217
+#define NDIS_OID_POWER_MODE         0x0D010216
+#define NDIS_OID_DISASSOCIATE       0x0D010115
+#define NDIS_OID_STATISTICS         0x0D020212
+#define NDIS_OID_SUPPORTED_RATES    0x0D01020E
+#define NDIS_OID_DESIRED_RATES      0x0D010210
+#define NDIS_OID_ADD_KEY            0x0D01011D
+#define NDIS_OID_REMOVE_KEY         0x0D01011E
+#define NDIS_OID_ASSOC_INFO         0x0D01011F
+#define NDIS_OID_TEST               0x0D010120
+
+#define NDIS_OID_NUM_ANTENNA        0x0D01020B
+#define NDIS_OID_RX_ANTENNA         0x0D01020C
+#define NDIS_OID_TX_ANTENNA         0x0D01020D
+
+/* general OIDs */
+#define NDIS_OID_GEN_SPEED          0x00010107
+#define OID_GEN_PHYSICAL_MEDIUM     0x00010202
+#define OID_GEN_MEDIA_SUPPORTED                 0x00010103
+#define OID_GEN_MEDIA_IN_USE                    0x00010104
+
+#define NDIS_OID_PNP_SET_POWER      0xFD010101
+#define NDIS_OID_PNP_QUERY_POWER    0xFD010102
+#define NDIS_OID_CURRENT_MAC_ADDRESS 0x01010102
+
+#define NDIS_STATUS_SUCCESS		0
+#define NDIS_STATUS_PENDING		0x00000103
+#define NDIS_STATUS_NOT_RECOGNIZED	0x00010001
+#define NDIS_STATUS_NOT_COPIED		0x00010002
+#define NDIS_STATUS_NOT_ACCEPTED	0x00010003
+#define NDIS_STATUS_CALL_ACTIVE		0x00010007
+#define NDIS_STATUS_ONLINE		0x40010003
+#define NDIS_STATUS_RESET_START		0x40010004
+#define NDIS_STATUS_RESET_END		0x40010005
+#define NDIS_STATUS_RING_STATUS		0x40010006
+#define NDIS_STATUS_CLOSED		0x40010007
+#define NDIS_STATUS_WAN_LINE_UP		0x40010008
+#define NDIS_STATUS_WAN_LINE_DOWN	0x40010009
+#define NDIS_STATUS_WAN_FRAGMENT	0x4001000A
+#define NDIS_STATUS_MEDIA_CONNECT	0x4001000B
+#define NDIS_STATUS_MEDIA_DISCONNECT	0x4001000C
+#define NDIS_STATUS_HARDWARE_LINE_UP	0x4001000D
+#define NDIS_STATUS_HARDWARE_LINE_DOWN	0x4001000E
+#define NDIS_STATUS_INTERFACE_UP	0x4001000F
+#define NDIS_STATUS_INTERFACE_DOWN	0x40010010
+#define NDIS_STATUS_MEDIA_BUSY		0x40010011
+#define NDIS_STATUS_MEDIA_SPECIFIC_INDICATION	0x40010012
+#define NDIS_STATUS_WW_INDICATION NDIS_STATUS_MEDIA_SPECIFIC_INDICATION
+#define NDIS_STATUS_LINK_SPEED_CHANGE	0x40010013
+#define NDIS_STATUS_WAN_GET_STATS	0x40010014
+#define NDIS_STATUS_WAN_CO_FRAGMENT	0x40010015
+#define NDIS_STATUS_WAN_CO_LINKPARAMS	0x40010016
+#define NDIS_STATUS_NOT_RESETTABLE	0x80010001
+#define NDIS_STATUS_SOFT_ERRORS		0x80010003
+#define NDIS_STATUS_HARD_ERRORS		0x80010004
+#define NDIS_STATUS_BUFFER_OVERFLOW	0x80000005
+#define NDIS_STATUS_FAILURE		0xC0000001
+#define NDIS_STATUS_INVALID_PARAMETER 0xC000000D
+#define NDIS_STATUS_RESOURCES		0xC000009A
+#define NDIS_STATUS_CLOSING		0xC0010002
+#define NDIS_STATUS_BAD_VERSION		0xC0010004
+#define NDIS_STATUS_BAD_CHARACTERISTICS	0xC0010005
+#define NDIS_STATUS_ADAPTER_NOT_FOUND	0xC0010006
+#define NDIS_STATUS_OPEN_FAILED		0xC0010007
+#define NDIS_STATUS_DEVICE_FAILED	0xC0010008
+#define NDIS_STATUS_MULTICAST_FULL	0xC0010009
+#define NDIS_STATUS_MULTICAST_EXISTS	0xC001000A
+#define NDIS_STATUS_MULTICAST_NOT_FOUND	0xC001000B
+#define NDIS_STATUS_REQUEST_ABORTED	0xC001000C
+#define NDIS_STATUS_RESET_IN_PROGRESS	0xC001000D
+#define NDIS_STATUS_CLOSING_INDICATING	0xC001000E
+#define NDIS_STATUS_BAD_VERSION		0xC0010004
+#define NDIS_STATUS_NOT_SUPPORTED	0xC00000BB
+#define NDIS_STATUS_INVALID_PACKET	0xC001000F
+#define NDIS_STATUS_OPEN_LIST_FULL	0xC0010010
+#define NDIS_STATUS_ADAPTER_NOT_READY	0xC0010011
+#define NDIS_STATUS_ADAPTER_NOT_OPEN	0xC0010012
+#define NDIS_STATUS_NOT_INDICATING	0xC0010013
+#define NDIS_STATUS_INVALID_LENGTH	0xC0010014
+#define NDIS_STATUS_INVALID_DATA	0xC0010015
+#define NDIS_STATUS_BUFFER_TOO_SHORT	0xC0010016
+#define NDIS_STATUS_INVALID_OID		0xC0010017
+#define NDIS_STATUS_ADAPTER_REMOVED	0xC0010018
+#define NDIS_STATUS_UNSUPPORTED_MEDIA	0xC0010019
+#define NDIS_STATUS_GROUP_ADDRESS_IN_USE	0xC001001A
+#define NDIS_STATUS_FILE_NOT_FOUND	0xC001001B
+#define NDIS_STATUS_ERROR_READING_FILE	0xC001001C
+#define NDIS_STATUS_ALREADY_MAPPED	0xC001001D
+#define NDIS_STATUS_RESOURCE_CONFLICT	0xC001001E
+#define NDIS_STATUS_NO_CABLE		0xC001001F
+#define NDIS_STATUS_INVALID_SAP		0xC0010020
+#define NDIS_STATUS_SAP_IN_USE		0xC0010021
+#define NDIS_STATUS_INVALID_ADDRESS	0xC0010022
+#define NDIS_STATUS_VC_NOT_ACTIVATED	0xC0010023
+#define NDIS_STATUS_DEST_OUT_OF_ORDER	0xC0010024
+#define NDIS_STATUS_VC_NOT_AVAILABLE	0xC0010025
+#define NDIS_STATUS_CELLRATE_NOT_AVAILABLE	0xC0010026
+#define NDIS_STATUS_INCOMPATABLE_QOS	0xC0010027
+#define NDIS_STATUS_AAL_PARAMS_UNSUPPORTED	0xC0010028
+#define NDIS_STATUS_NO_ROUTE_TO_DESTINATION	0xC0010029
+#define NDIS_STATUS_TOKEN_RING_OPEN_ERROR	0xC0011000
+#define NDIS_STATUS_INVALID_DEVICE_REQUEST	0xC0000010
+#define NDIS_STATUS_NETWORK_UNREACHABLE         0xC000023C
+
+/* Event codes */
+
+#define EVENT_NDIS_RESOURCE_CONFLICT	0xC0001388
+#define EVENT_NDIS_OUT_OF_RESOURCE	0xC0001389
+#define EVENT_NDIS_HARDWARE_FAILURE	0xC000138A
+#define EVENT_NDIS_ADAPTER_NOT_FOUND	0xC000138B
+#define EVENT_NDIS_INTERRUPT_CONNECT	0xC000138C
+#define EVENT_NDIS_DRIVER_FAILURE	0xC000138D
+#define EVENT_NDIS_BAD_VERSION		0xC000138E
+#define EVENT_NDIS_TIMEOUT		0x8000138F
+#define EVENT_NDIS_NETWORK_ADDRESS	0xC0001390
+#define EVENT_NDIS_UNSUPPORTED_CONFIGURATION	0xC0001391
+#define EVENT_NDIS_INVALID_VALUE_FROM_ADAPTER	0xC0001392
+#define EVENT_NDIS_MISSING_CONFIGURATION_PARAMETER	0xC0001393
+#define EVENT_NDIS_BAD_IO_BASE_ADDRESS	0xC0001394
+#define EVENT_NDIS_RECEIVE_SPACE_SMALL	0x40001395
+#define EVENT_NDIS_ADAPTER_DISABLED	0x80001396
+#define EVENT_NDIS_IO_PORT_CONFLICT	0x80001397
+#define EVENT_NDIS_PORT_OR_DMA_CONFLICT	0x80001398
+#define EVENT_NDIS_MEMORY_CONFLICT	0x80001399
+#define EVENT_NDIS_INTERRUPT_CONFLICT	0x8000139A
+#define EVENT_NDIS_DMA_CONFLICT		0x8000139B
+#define EVENT_NDIS_INVALID_DOWNLOAD_FILE_ERROR	0xC000139C
+#define EVENT_NDIS_MAXRECEIVES_ERROR	0x8000139D
+#define EVENT_NDIS_MAXTRANSMITS_ERROR	0x8000139E
+#define EVENT_NDIS_MAXFRAMESIZE_ERROR	0x8000139F
+#define EVENT_NDIS_MAXINTERNALBUFS_ERROR	0x800013A0
+#define EVENT_NDIS_MAXMULTICAST_ERROR	0x800013A1
+#define EVENT_NDIS_PRODUCTID_ERROR	0x800013A2
+#define EVENT_NDIS_LOBE_FAILUE_ERROR	0x800013A3
+#define EVENT_NDIS_SIGNAL_LOSS_ERROR	0x800013A4
+#define EVENT_NDIS_REMOVE_RECEIVED_ERROR	0x800013A5
+#define EVENT_NDIS_TOKEN_RING_CORRECTION	0x400013A6
+#define EVENT_NDIS_ADAPTER_CHECK_ERROR	0xC00013A7
+#define EVENT_NDIS_RESET_FAILURE_ERROR	0x800013A8
+#define EVENT_NDIS_CABLE_DISCONNECTED_ERROR	0x800013A9
+#define EVENT_NDIS_RESET_FAILURE_CORRECTION	0x800013AA
+
+/* packet filter bits used by NDIS_OID_PACKET_FILTER */
+#define NDIS_PACKET_TYPE_DIRECTED               0x00000001
+#define NDIS_PACKET_TYPE_MULTICAST              0x00000002
+#define NDIS_PACKET_TYPE_ALL_MULTICAST          0x00000004
+#define NDIS_PACKET_TYPE_BROADCAST              0x00000008
+#define NDIS_PACKET_TYPE_SOURCE_ROUTING         0x00000010
+#define NDIS_PACKET_TYPE_PROMISCUOUS            0x00000020
+#define NDIS_PACKET_TYPE_SMT                    0x00000040
+#define NDIS_PACKET_TYPE_ALL_LOCAL              0x00000080
+#define NDIS_PACKET_TYPE_GROUP                  0x00001000
+#define NDIS_PACKET_TYPE_ALL_FUNCTIONAL         0x00002000
+#define NDIS_PACKET_TYPE_FUNCTIONAL             0x00004000
+#define NDIS_PACKET_TYPE_MAC_FRAME              0x00008000
+
+/* memory allocation flags */
+#define NDIS_MEMORY_CONTIGUOUS			0x00000001
+#define NDIS_MEMORY_NONCACHED			0x00000002
+
+/* Atrribute flags to NdisMSetAtrributesEx */
+#define NDIS_ATTRIBUTE_IGNORE_PACKET_TIMEOUT    0x00000001
+#define NDIS_ATTRIBUTE_IGNORE_REQUEST_TIMEOUT   0x00000002
+#define NDIS_ATTRIBUTE_IGNORE_TOKEN_RING_ERRORS 0x00000004
+#define NDIS_ATTRIBUTE_BUS_MASTER               0x00000008
+#define NDIS_ATTRIBUTE_INTERMEDIATE_DRIVER      0x00000010
+#define NDIS_ATTRIBUTE_DESERIALIZE              0x00000020
+#define NDIS_ATTRIBUTE_NO_HALT_ON_SUSPEND       0x00000040
+#define NDIS_ATTRIBUTE_SURPRISE_REMOVE_OK       0x00000080
+#define NDIS_ATTRIBUTE_NOT_CO_NDIS              0x00000100
+#define NDIS_ATTRIBUTE_USES_SAFE_BUFFER_APIS    0x00000200
+
+
+/* WPA support */
+
+enum capa_list
+{
+	CAPA_ENCR1 = ENCR1_ENABLED,
+	CAPA_ENCR_NONE = ENCR_DISABLED,
+	CAPA_TKIP = ENCR2_ENABLED,
+	CAPA_AES = ENCR3_ENABLED,
+	CAPA_WPA,
+};
+
+#define PRIV_RESET	 		SIOCIWFIRSTPRIV+16
+#define PRIV_POWER_PROFILE	 	SIOCIWFIRSTPRIV+17
+
+/* these have to match what is in wpa_supplicant */
+typedef enum { WPA_ALG_NONE, WPA_ALG_WEP, WPA_ALG_TKIP, WPA_ALG_CCMP } wpa_alg;
+typedef enum { CIPHER_NONE, CIPHER_WEP40, CIPHER_TKIP, CIPHER_CCMP,
+	       CIPHER_WEP104 } wpa_cipher;
+typedef enum { KEY_MGMT_802_1X, KEY_MGMT_PSK, KEY_MGMT_NONE } wpa_key_mgmt;
+
+#define AUTH_ALG_OPEN_SYSTEM	0x01
+#define AUTH_ALG_SHARED_KEY	0x02
+#define AUTH_ALG_LEAP		0x04
+
+struct wpa_key
+{
+	wpa_alg alg;
+	u8 *addr;
+	int key_index;
+	int set_tx;
+	u8 *seq;
+	size_t seq_len;
+	u8 *key;
+	size_t key_len;
+};
+
+struct wpa_assoc_info
+{
+	const char *bssid;
+	const char *ssid;
+	size_t ssid_len;
+	int freq;
+	const char *wpa_ie;
+	size_t wpa_ie_len;
+	wpa_cipher pairwise_suite;
+	wpa_cipher group_suite;
+	wpa_key_mgmt key_mgmt_suite;
+};
+
+#define WPA_SET_WPA 			SIOCIWFIRSTPRIV+1
+#define WPA_SET_KEY 			SIOCIWFIRSTPRIV+2
+#define WPA_ASSOCIATE		 	SIOCIWFIRSTPRIV+3
+#define WPA_DISASSOCIATE 		SIOCIWFIRSTPRIV+4
+#define WPA_DROP_UNENCRYPTED 		SIOCIWFIRSTPRIV+5
+#define WPA_SET_COUNTERMEASURES 	SIOCIWFIRSTPRIV+6
+#define WPA_DEAUTHENTICATE	 	SIOCIWFIRSTPRIV+7
+#define WPA_SET_AUTH_ALG	 	SIOCIWFIRSTPRIV+8
+
+#endif /* NDIS_H */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/ndiswrapper.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/ndiswrapper.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/ndiswrapper.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/ndiswrapper.h	2004-09-05 15:48:55.000000000 +0200
@@ -0,0 +1,303 @@
+/*
+ *  Copyright (C) 2003-2004 Pontus Fuchs, Giridhar Pemmasani
+ *
+ *  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.
+ *
+ */
+
+#ifndef NDISWRAPPER_H
+#define NDISWRAPPER_H
+
+#include <linux/types.h>
+#include <linux/timer.h>
+
+#include <linux/netdevice.h>
+#include <linux/wireless.h>
+#include <linux/pci.h>
+#include <linux/wait.h>
+#include <linux/pm.h>
+#include <linux/delay.h>
+#include <linux/mm.h>
+#include <linux/random.h>
+#include <linux/ctype.h>
+#include <asm/mman.h>
+#include <asm/atomic.h>
+
+#include <linux/version.h>
+
+#define DRV_NAME "ndiswrapper"
+
+#define STDCALL __attribute__((__stdcall__, regparm(0)))
+#define NOREGPARM __attribute__((regparm(0)))
+#define packed __attribute__((packed))
+#define _FASTCALL __attribute__((__stdcall__)) __attribute__((regparm (3)))
+
+/* Workqueue / task queue backwards compatibility stuff */
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,41)
+#include <linux/workqueue.h>
+/* pci functions in 2.6 kernels have problems allocating dma buffers,
+ * but seem to work fine with dma functions
+ */
+typedef struct workqueue_struct *workqueue;
+#include <asm/dma-mapping.h>
+#define PCI_DMA_ALLOC_COHERENT(pci_dev,size,dma_handle) \
+	dma_alloc_coherent(&pci_dev->dev,size,dma_handle,GFP_KERNEL|__GFP_DMA)
+#define PCI_DMA_FREE_COHERENT(pci_dev,size,cpu_addr,dma_handle) \
+	dma_free_coherent(&pci_dev->dev,size,cpu_addr,dma_handle)
+#define PCI_DMA_MAP_SINGLE(pci_dev,addr,size,direction) \
+	dma_map_single(&pci_dev->dev,addr,size,direction)
+#define PCI_DMA_UNMAP_SINGLE(pci_dev,dma_handle,size,direction) \
+	dma_unmap_single(&pci_dev->dev,dma_handle,size,direction)
+
+#else // linux version <= 2.5.41
+
+#define PCI_DMA_ALLOC_COHERENT(dev,size,dma_handle) \
+	pci_alloc_consistent(dev,size,dma_handle)
+#define PCI_DMA_FREE_COHERENT(dev,size,cpu_addr,dma_handle) \
+	pci_free_consistent(dev,size,cpu_addr,dma_handle)
+#define PCI_DMA_MAP_SINGLE(dev,addr,size,direction) \
+	pci_map_single(dev,addr,size,direction)
+#define PCI_DMA_UNMAP_SINGLE(dev,dma_handle,size,direction) \
+	pci_unmap_single(dev,dma_handle,size,direction)
+#include <linux/tqueue.h>
+#define work_struct tq_struct
+#define INIT_WORK INIT_TQUEUE
+#define schedule_work schedule_task
+#define flush_scheduled_work flush_scheduled_tasks
+typedef task_queue workqueue;
+#include <linux/smp_lock.h>
+
+/* RedHat kernels #define irqs_disabled this way */
+#ifndef irqs_disabled
+#define irqs_disabled()                \
+({                                     \
+       unsigned long flags;            \
+       __save_flags(flags);            \
+       !(flags & (1<<9));              \
+})
+#endif
+
+#ifdef CONFIG_PREEMPT
+#define in_atomic() ((preempt_get_count() & ~PREEMPT_ACTIVE) != kernel_locked())
+#else
+#define in_atomic() (in_interrupt())
+#endif // CONFIG_PREEMPT
+
+#define __GFP_NOWARN 0
+
+#endif // LINUX_VERSION_CODE
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,23)
+#define HAVE_ETHTOOL 1
+#endif
+
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,0)
+#undef __wait_event_interruptible_timeout
+#undef wait_event_interruptible_timeout
+#define __wait_event_interruptible_timeout(wq, condition, ret)		\
+do {									\
+	wait_queue_t __wait;						\
+	init_waitqueue_entry(&__wait, current);				\
+									\
+	add_wait_queue(&wq, &__wait);					\
+	for (;;) {							\
+		set_current_state(TASK_INTERRUPTIBLE);			\
+		if (condition)						\
+			break;						\
+		if (!signal_pending(current)) {				\
+			ret = schedule_timeout(ret);			\
+			if (!ret)					\
+				break;					\
+			continue;					\
+		}							\
+		ret = -ERESTARTSYS;					\
+		break;							\
+	}								\
+	current->state = TASK_RUNNING;					\
+	remove_wait_queue(&wq, &__wait);				\
+} while (0)
+
+#define wait_event_interruptible_timeout(wq, condition, timeout)	\
+({									\
+	long __ret = timeout;						\
+	if (!(condition))						\
+		__wait_event_interruptible_timeout(wq, condition, __ret); \
+	__ret;								\
+})
+#endif // LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,0)
+
+/* Interrupt backwards compatibility stuff */
+#include <linux/interrupt.h>
+#ifndef IRQ_HANDLED
+#define IRQ_HANDLED
+#define IRQ_NONE
+#define irqreturn_t void
+#endif
+
+#ifndef free_netdev
+#define free_netdev kfree
+#endif
+
+#define KMALLOC_THRESHOLD 131072
+
+#define TICKSPERSEC             10000000
+#define SECSPERDAY              86400
+
+/* 1601 to 1970 is 369 years plus 89 leap days */
+#define SECS_1601_TO_1970       ((369 * 365 + 89) * (u64)SECSPERDAY)
+#define TICKS_1601_TO_1970      (SECS_1601_TO_1970 * TICKSPERSEC)
+
+#define UNIMPL() do { \
+    printk(KERN_ERR "%s --UNIMPLEMENTED--\n", __FUNCTION__ );	\
+  } while (0)
+
+typedef void *WRAP_FUNC(void);
+
+struct wrap_func
+{
+	char *name;
+	WRAP_FUNC *func;
+};
+
+#define STRFY(S) #S
+#define WRAP_FUNC_ENTRY(Func) {STRFY(Func), (WRAP_FUNC *)Func}
+
+struct wrap_alloc
+{
+	struct list_head list;
+	void *ptr;
+};
+
+void *wrap_kmalloc(size_t size, int flags);
+void wrap_kfree(void *ptr);
+void wrap_kfree_all(void);
+
+/* DEBUG macros */
+
+#define DBGTRACE(fmt, ...) (void)0
+#define DBGTRACE1(fmt, ...) (void)0
+#define DBGTRACE2(fmt, ...) (void)0
+#define DBGTRACE3(fmt, ...) (void)0
+#define DBGTRACE4(fmt, ...) (void)0
+#define DBGTRACE5(fmt, ...) (void)0
+
+#define MSG(level, fmt, ...) printk(level "ndiswrapper (%s:%d): " fmt "\n", \
+				    __FUNCTION__, __LINE__, ## __VA_ARGS__)
+#define WARNING(fmt, ...) MSG(KERN_WARNING, fmt, ## __VA_ARGS__)
+#define ERROR(fmt, ...) MSG(KERN_ERR, fmt, ## __VA_ARGS__)
+#define INFO(fmt, ...) MSG(KERN_INFO, fmt, ## __VA_ARGS__)
+
+#if defined DEBUG
+#undef DBGTRACE
+#define DBGTRACE(fmt, ...)  printk(KERN_INFO "ndiswrapper (%s:%d): " fmt "\n", \
+				   __FUNCTION__, __LINE__, ## __VA_ARGS__)
+#endif
+
+#if defined DEBUG && DEBUG >= 1
+#undef DBGTRACE1
+#define DBGTRACE1(fmt, ...) DBGTRACE(fmt, ## __VA_ARGS__)
+#endif
+
+#if defined DEBUG && DEBUG >= 2
+#undef DBGTRACE2
+#define DBGTRACE2(fmt, ...) DBGTRACE(fmt, ## __VA_ARGS__)
+#endif
+
+#if defined DEBUG && DEBUG >= 3
+#undef DBGTRACE3
+#define DBGTRACE3(fmt, ...) DBGTRACE(fmt, ## __VA_ARGS__)
+#endif
+
+#if defined DEBUG && DEBUG >= 4
+#undef DBGTRACE4
+#define DBGTRACE4(fmt, ...) DBGTRACE(fmt, ## __VA_ARGS__)
+#endif
+
+#if defined DEBUG && DEBUG >= 5
+#undef DBGTRACE5
+#define DBGTRACE5(fmt, ...) DBGTRACE(fmt, ## __VA_ARGS__)
+#endif
+
+#define TRACEENTER(fmt, ...) DBGTRACE("Enter " fmt , ## __VA_ARGS__)
+#define TRACEENTER1(fmt, ...) DBGTRACE1("Enter " fmt , ## __VA_ARGS__)
+#define TRACEENTER2(fmt, ...) DBGTRACE2("Enter " fmt , ## __VA_ARGS__)
+#define TRACEENTER3(fmt, ...) DBGTRACE3("Enter " fmt , ## __VA_ARGS__)
+#define TRACEENTER4(fmt, ...) DBGTRACE4("Enter " fmt , ## __VA_ARGS__)
+#define TRACEENTER5(fmt, ...) DBGTRACE5("Enter " fmt , ## __VA_ARGS__)
+
+#define TRACEEXIT(stmt) do { DBGTRACE("%s", "Exit"); stmt; } while(0)
+#define TRACEEXIT1(stmt) do { DBGTRACE1("%s", "Exit"); stmt; } while(0)
+#define TRACEEXIT2(stmt) do { DBGTRACE2("%s", "Exit"); stmt; } while(0)
+#define TRACEEXIT3(stmt) do { DBGTRACE3("%s", "Exit"); stmt; } while(0)
+#define TRACEEXIT4(stmt) do { DBGTRACE4("%s", "Exit"); stmt; } while(0)
+#define TRACEEXIT5(stmt) do { DBGTRACE5("%s", "Exit"); stmt; } while(0)
+
+#define MAC2STR(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5]
+#define MACSTR "%02x:%02x:%02x:%02x:%02x:%02x"
+
+#define NDIS_SPIN_LOCK_MAGIC 137
+
+struct packed wrap_spinlock
+{
+	spinlock_t spinlock;
+	unsigned short magic;
+	unsigned short in_bh;
+	atomic_t in_use;
+};
+
+static inline void wrap_spin_lock_init(struct wrap_spinlock *lock)
+{
+	TRACEENTER5("lock: %p", lock);
+	spin_lock_init(&lock->spinlock);
+	lock->magic = NDIS_SPIN_LOCK_MAGIC;
+	atomic_set(&lock->in_use, 0);
+	TRACEEXIT5(return);
+}
+
+static inline void wrap_spin_lock(struct wrap_spinlock *lock)
+{
+	TRACEENTER5("lock: %p", lock);
+	if (lock->magic != NDIS_SPIN_LOCK_MAGIC)
+		WARNING("lock %p is not initlialized (%d)", lock, lock->magic);
+	if (atomic_read(&lock->in_use) == 1)
+		WARNING("lock %p is already locked", lock);
+
+	if (in_atomic() || irqs_disabled())
+	{
+		spin_lock(&lock->spinlock);
+		lock->in_bh = 0;
+	}
+	else
+	{
+		spin_lock_bh(&lock->spinlock);
+		lock->in_bh = 1;
+	}
+	atomic_set(&lock->in_use, 1);
+	TRACEEXIT5(return);
+}
+
+static inline void wrap_spin_unlock(struct wrap_spinlock *lock)
+{
+	TRACEENTER5("lock: %p", lock);
+	if (lock->magic != NDIS_SPIN_LOCK_MAGIC)
+		WARNING("lock %p is not initlialized (%d)", lock, lock->magic);
+	if (atomic_read(&lock->in_use) == 0)
+		WARNING("lock %p was not locked", lock);
+
+	atomic_set(&lock->in_use, 0);
+	if (lock->in_bh)
+		spin_unlock_bh(&lock->spinlock);
+	else
+		spin_unlock(&lock->spinlock);
+	TRACEEXIT5(return);
+}
+
+#endif // NDISWRAPPER_H
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/ntoskernel.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/ntoskernel.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/ntoskernel.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/ntoskernel.c	2004-09-05 15:48:55.000000000 +0200
@@ -0,0 +1,431 @@
+/*
+ *  Copyright (C) 2003-2004 Pontus Fuchs, Giridhar Pemmasani
+ *
+ *  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.
+ *
+ */
+
+#include "ntoskernel.h"
+#include "wrapper.h"
+
+STDCALL static void
+WRITE_REGISTER_ULONG(unsigned int reg, unsigned int val)
+{
+	writel(val, reg);
+}
+
+STDCALL static void
+WRITE_REGISTER_USHORT(unsigned int reg, unsigned short val)
+{
+	writew(val, reg);
+}
+
+STDCALL static void
+WRITE_REGISTER_UCHAR(unsigned int reg, unsigned char val)
+{
+	writeb(val, reg);
+}
+
+STDCALL static void
+KeInitializeTimer(struct ktimer *ktimer)
+{
+	TRACEENTER4("%p", ktimer);
+	wrapper_init_timer(ktimer, NULL);
+	ktimer->dispatch_header.signal_state = 0;
+}
+
+STDCALL static void
+KeInitializeDpc(struct kdpc *kdpc, void *func, void *ctx)
+{
+	TRACEENTER4("%p, %p, %p", kdpc, func, ctx);
+	init_dpc(kdpc, func, ctx);
+}
+
+STDCALL static int
+KeSetTimerEx(struct ktimer *ktimer, __s64 due_time, __u32 period,
+	     struct kdpc *kdpc)
+{
+	unsigned long expires;
+	unsigned long repeat;
+
+	TRACEENTER4("%p, %ld, %u, %p", ktimer, (long)due_time, period, kdpc);
+
+	if (ktimer == NULL)
+		return 0;
+	if (due_time < 0)
+		expires = jiffies + HZ * (-due_time / 10000000);
+	else
+		expires = HZ * (due_time / 10000000);
+	repeat = HZ * (period / 1000);
+	if (kdpc)
+		wrapper_set_timer_dpc(ktimer->wrapper_timer, kdpc);
+	return wrapper_set_timer(ktimer->wrapper_timer, expires, repeat);
+}
+
+STDCALL static int
+KeCancelTimer(struct ktimer *ktimer)
+{
+	char canceled;
+
+	TRACEENTER4("%p", ktimer);
+	wrapper_cancel_timer(ktimer->wrapper_timer, &canceled);
+	return canceled;
+}
+
+STDCALL KIRQL
+KeGetCurrentIrql(void)
+{
+	if (in_atomic() || irqs_disabled())
+		return DISPATCH_LEVEL;
+	else
+		return PASSIVE_LEVEL;
+}
+
+STDCALL static void
+KeInitializeSpinLock(KSPIN_LOCK *lock)
+{
+	struct wrap_spinlock *spin_lock;
+
+	if (!lock)
+	{
+		ERROR("%s", "invalid lock");
+		return;
+	}
+
+	spin_lock = wrap_kmalloc(sizeof(struct wrap_spinlock), GFP_ATOMIC);
+	if (!spin_lock)
+		ERROR("%s", "Couldn't allocate space for spinlock");
+	else
+	{
+		DBGTRACE4("allocated spinlock %p", spin_lock);
+		wrap_spin_lock_init(spin_lock);
+		*lock = (KSPIN_LOCK)spin_lock;
+	}
+}
+
+STDCALL static void
+KeAcquireSpinLock(KSPIN_LOCK *lock, KIRQL *oldirql)
+{
+	TRACEENTER4("lock = %p, *lock = %p", lock, (void *)*lock);
+
+	if (!lock)
+	{
+		ERROR("%s", "invalid lock");
+		return;
+	}
+
+	if (!*lock)
+	{
+		printk(KERN_WARNING "Buggy Windows driver trying to use "
+		       "uninitialized lock. Trying to recover...");
+		KeInitializeSpinLock(lock);
+		if (*lock)
+			printk(KERN_WARNING "ok\n");
+		else
+		{
+			printk(KERN_WARNING "failed\n");
+			BUG();
+		}
+	}
+	wrap_spin_lock((struct wrap_spinlock *)*lock);
+	TRACEEXIT4(return);
+}
+
+STDCALL static void
+KeReleaseSpinLock(KSPIN_LOCK *lock, KIRQL newirql)
+{
+	TRACEENTER4("lock = %p, *lock = %p", lock, (void *)*lock);
+
+	if (!lock || !*lock)
+	{
+		ERROR("invalid spin lock %p", lock);
+		return;
+	}
+
+	wrap_spin_unlock((struct wrap_spinlock *)*lock);
+}
+
+_FASTCALL static struct slist_entry *
+ExInterlockedPushEntrySList(int dummy, struct slist_entry *entry,
+			    union slist_head *head, KSPIN_LOCK *lock)
+{
+	struct slist_entry *oldhead;
+	KIRQL irql;
+
+	TRACEENTER3("head = %p, entry = %p", head, entry);
+
+//	__asm__ __volatile__ ("" : "=c" (head), "=d" (entry));
+
+	KeAcquireSpinLock(lock, &irql);
+	oldhead = head->list.next;
+	entry->next = head->list.next;
+	head->list.next = entry;
+	KeReleaseSpinLock(lock, irql);
+	DBGTRACE3("head = %p, oldhead = %p", head, oldhead);
+	return(oldhead);
+}
+
+_FASTCALL static struct slist_entry *
+ExInterlockedPopEntrySList(int dummy, KSPIN_LOCK *lock, union slist_head *head)
+{
+	struct slist_entry *first;
+	KIRQL irql;
+
+	TRACEENTER3("head = %p", head);
+//	__asm__ __volatile__ ("" : "=c" (head));
+	KeAcquireSpinLock(lock, &irql);
+	first = NULL;
+	if (head)
+	{
+		first = head->list.next;
+		if (first)
+		{
+			head->list.next = first->next;
+		}
+	}
+	KeReleaseSpinLock(lock, irql);
+	DBGTRACE3("returning %p", first);
+	return first;
+}
+
+STDCALL static void *
+lookaside_def_alloc_func(POOL_TYPE pool_type, unsigned long size,
+			 unsigned long tag)
+{
+	return kmalloc(size, GFP_ATOMIC);
+}
+
+STDCALL static void
+lookaside_def_free_func(void *buffer)
+{
+	kfree(buffer);
+}
+
+STDCALL static void
+ExInitializeNPagedLookasideList(struct npaged_lookaside_list *lookaside,
+				 LOOKASIDE_ALLOC_FUNC *alloc_func,
+				 LOOKASIDE_FREE_FUNC *free_func,
+				 unsigned long flags, unsigned long size,
+				 unsigned long tag, unsigned short depth)
+{
+	TRACEENTER3("lookaside: %p, size: %lu, flags: %lu,"
+		    " head: %p, size of lookaside: %u\n",
+		    lookaside, size, flags, lookaside->head.list.next,
+		    sizeof(struct npaged_lookaside_list));
+
+	memset(lookaside, 0, sizeof(*lookaside));
+
+	lookaside->size = size;
+	lookaside->tag = tag;
+	lookaside->depth = 4;
+	lookaside->maxdepth = 256;
+
+	if (alloc_func)
+		lookaside->alloc_func = alloc_func;
+	else
+		lookaside->alloc_func = lookaside_def_alloc_func;
+	if (free_func)
+		lookaside->free_func = free_func;
+	else
+		lookaside->free_func = lookaside_def_free_func;
+
+	KeInitializeSpinLock(&lookaside->obsolete);
+	TRACEEXIT3(return);
+}
+
+STDCALL static void
+ExDeleteNPagedLookasideList(struct npaged_lookaside_list *lookaside)
+{
+	struct slist_entry *entry, *p;
+
+	TRACEENTER3("ookaside = %p", lookaside);
+	entry = lookaside->head.list.next;
+	while (entry)
+	{
+		p = entry;
+		entry = entry->next;
+		lookaside->free_func(p);
+	}
+	TRACEEXIT4(return);
+}
+
+
+_FASTCALL static void
+ExInterlockedAddLargeStatistic(int dummy, u32 n, u64 *plint)
+{
+	unsigned long flags;
+	static spinlock_t lock = SPIN_LOCK_UNLOCKED;
+	/* we should have one lock per driver, but since it is used only
+	 * here, no harm in having a global lock, for simplicity sake
+	 */
+
+	TRACEENTER3("Stat %p = %llu, n = %u", plint, *plint, n);
+	spin_lock_irqsave(&lock, flags);
+	*plint += n;
+	spin_unlock_irqrestore(&lock, flags);
+}
+
+STDCALL static void *
+MmMapIoSpace(__s64 phys_addr, unsigned long size, int cache)
+{
+	void *virt;
+	if (cache)
+		virt = ioremap(phys_addr, size);
+	else
+		virt = ioremap_nocache(phys_addr, size);
+	DBGTRACE3("%Lx, %lu, %d: %p", phys_addr, size, cache, virt);
+	return virt;
+}
+
+STDCALL static void
+MmUnmapIoSpace(void *addr, unsigned long size)
+{
+	TRACEENTER3("%p, %lu", addr, size);
+	iounmap(addr);
+	return;
+}
+
+STDCALL static int
+IoIsWdmVersionAvailable(unsigned char major, unsigned char minor)
+{
+	TRACEENTER3("%d, %d", major, minor);
+	if (major == 1 &&
+	    (minor == 0x30 || // Windows 2003
+	     minor == 0x20 || // Windows XP
+	     minor == 0x10)) // Windows 2000
+		return 1;
+	return 0;
+}
+
+STDCALL static unsigned int
+KeWaitForSingleObject(void **object, unsigned int reason,
+		      unsigned int waitmode, unsigned short alertable,
+		      void *timeout)
+{
+	UNIMPL();
+	return 0;
+}
+
+STDCALL static void *
+ExAllocatePoolWithTag(unsigned int type, unsigned int size, unsigned int tag)
+{
+	UNIMPL();
+	return (void*)0x000afff8;
+}
+
+STDCALL static void
+IoBuildSynchronousFsdRequest(void)
+{
+	UNIMPL();
+}
+
+STDCALL static void
+IofCallDriver(void)
+{
+	UNIMPL();
+}
+
+/* this function can't be STDCALL as it takes variable number of args */
+NOREGPARM unsigned long
+DbgPrint(char *format, ...)
+{
+	int res = 0;
+
+#ifdef DEBUG
+	va_list args;
+	static char buf[1024];
+
+	va_start(args, format);
+	res = vsnprintf(buf, sizeof(buf), format, args);
+	printk("DbgPrint: ");
+	printk(buf);
+	va_end(args);
+#endif
+	return res;
+
+}
+
+STDCALL static void DbgBreakPoint(void)
+{
+	UNIMPL();
+}
+
+STDCALL static void IofCompleteRequest(void){UNIMPL();}
+STDCALL static void IoReleaseCancelSpinLock(void){UNIMPL();}
+STDCALL static void KeInitializeEvent(void *event){UNIMPL();}
+STDCALL static void IoDeleteDevice(void){UNIMPL();}
+STDCALL static void IoCreateSymbolicLink(void){UNIMPL();}
+STDCALL static void ExFreePool(void){UNIMPL();}
+STDCALL static void MmMapLockedPages(void){UNIMPL();}
+STDCALL static void IoCreateDevice(void){UNIMPL();}
+STDCALL static void IoDeleteSymbolicLink(void){UNIMPL();}
+STDCALL static void InterlockedExchange(void){UNIMPL();}
+STDCALL static void KeSetEvent(void){UNIMPL();}
+STDCALL static void KeClearEvent(void){UNIMPL();}
+STDCALL static void MmMapLockedPagesSpecifyCache(void){UNIMPL();}
+STDCALL static void MmProbeAndLockPages(void){UNIMPL();}
+STDCALL static void MmUnlockPages(void){UNIMPL();}
+STDCALL static void IoAllocateMdl(void){UNIMPL();}
+STDCALL static void IoFreeMdl(void){UNIMPL();}
+STDCALL static void ObfReferenceObject(void){UNIMPL();}
+STDCALL static void ObReferenceObjectByHandle(void){UNIMPL();}
+STDCALL static void _except_handler3(void){UNIMPL();}
+
+struct wrap_func ntos_wrap_funcs[] =
+{
+	WRAP_FUNC_ENTRY(DbgBreakPoint),
+	WRAP_FUNC_ENTRY(DbgPrint),
+	WRAP_FUNC_ENTRY(ExAllocatePoolWithTag),
+	WRAP_FUNC_ENTRY(ExDeleteNPagedLookasideList),
+	WRAP_FUNC_ENTRY(ExFreePool),
+	WRAP_FUNC_ENTRY(ExInitializeNPagedLookasideList),
+	WRAP_FUNC_ENTRY(ExInterlockedAddLargeStatistic),
+	WRAP_FUNC_ENTRY(ExInterlockedPopEntrySList),
+	WRAP_FUNC_ENTRY(ExInterlockedPushEntrySList),
+	WRAP_FUNC_ENTRY(InterlockedExchange),
+	WRAP_FUNC_ENTRY(IoAllocateMdl),
+	WRAP_FUNC_ENTRY(IoBuildSynchronousFsdRequest),
+	WRAP_FUNC_ENTRY(IoCreateDevice),
+	WRAP_FUNC_ENTRY(IoCreateSymbolicLink),
+	WRAP_FUNC_ENTRY(IoDeleteDevice),
+	WRAP_FUNC_ENTRY(IoDeleteSymbolicLink),
+	WRAP_FUNC_ENTRY(IoFreeMdl),
+	WRAP_FUNC_ENTRY(IoIsWdmVersionAvailable),
+	WRAP_FUNC_ENTRY(IoReleaseCancelSpinLock),
+	WRAP_FUNC_ENTRY(IofCallDriver),
+	WRAP_FUNC_ENTRY(IofCompleteRequest),
+	WRAP_FUNC_ENTRY(KeAcquireSpinLock),
+	WRAP_FUNC_ENTRY(KeCancelTimer),
+	WRAP_FUNC_ENTRY(KeClearEvent),
+	WRAP_FUNC_ENTRY(KeGetCurrentIrql),
+	WRAP_FUNC_ENTRY(KeInitializeDpc),
+	WRAP_FUNC_ENTRY(KeInitializeEvent),
+	WRAP_FUNC_ENTRY(KeInitializeSpinLock),
+	WRAP_FUNC_ENTRY(KeInitializeTimer),
+	WRAP_FUNC_ENTRY(KeReleaseSpinLock),
+	WRAP_FUNC_ENTRY(KeSetEvent),
+	WRAP_FUNC_ENTRY(KeSetTimerEx),
+	WRAP_FUNC_ENTRY(KeWaitForSingleObject),
+	WRAP_FUNC_ENTRY(MmMapIoSpace),
+	WRAP_FUNC_ENTRY(MmMapLockedPages),
+	WRAP_FUNC_ENTRY(MmMapLockedPagesSpecifyCache),
+	WRAP_FUNC_ENTRY(MmProbeAndLockPages),
+	WRAP_FUNC_ENTRY(MmUnlockPages),
+	WRAP_FUNC_ENTRY(MmUnmapIoSpace),
+	WRAP_FUNC_ENTRY(ObReferenceObjectByHandle),
+	WRAP_FUNC_ENTRY(ObfReferenceObject),
+	WRAP_FUNC_ENTRY(WRITE_REGISTER_UCHAR),
+	WRAP_FUNC_ENTRY(WRITE_REGISTER_ULONG),
+	WRAP_FUNC_ENTRY(WRITE_REGISTER_USHORT),
+	WRAP_FUNC_ENTRY(_except_handler3),
+
+	{NULL, NULL}
+};
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/ntoskernel.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/ntoskernel.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/ntoskernel.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/ntoskernel.h	2004-09-05 15:48:55.000000000 +0200
@@ -0,0 +1,148 @@
+/*
+ *  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.
+ *
+ */
+
+#ifndef _NTOSKERNEL_H_
+#define _NTOSKERNEL_H_
+
+#include "ndiswrapper.h"
+
+#define MAX_STR_LEN 512
+
+#define PASSIVE_LEVEL 0
+#define DISPATCH_LEVEL 2
+
+struct slist_entry
+{
+	struct slist_entry  *next;
+};
+
+union slist_head {
+	unsigned long long align;
+	struct
+	{
+		struct slist_entry  *next;
+		unsigned short depth;
+		unsigned short sequence;
+	} list;
+};
+
+typedef unsigned long *KSPIN_LOCK;
+typedef unsigned char KIRQL;
+
+struct list_entry
+{
+	struct list_entry *fwd_link;
+	struct list_entry *bwd_link;
+};
+
+typedef unsigned long POOL_TYPE;
+
+struct dispatch_header
+{
+	unsigned char type;
+	unsigned char absolute;
+	unsigned char size;
+	unsigned char inserted;
+	long signal_state;
+	struct list_entry wait_list_head;
+};
+
+struct ktimer;
+struct kdpc;
+
+#define WRAPPER_TIMER_MAGIC 47697249
+struct wrapper_timer
+{
+	struct list_head list;
+	struct timer_list timer;
+#ifdef DEBUG_TIMER
+	unsigned long wrapper_timer_magic;
+#endif
+	long repeat;
+	int active;
+	struct ktimer *ktimer;
+	struct kdpc *kdpc;
+};
+
+struct kdpc
+{
+	short type;
+	unsigned char number;
+	unsigned char importance;
+	struct list_entry dpc_list_entry;
+
+	void *func;
+	void *ctx;
+	void *arg1;
+	void *arg2;
+	unsigned long *lock;
+};
+
+struct ktimer
+{
+	struct dispatch_header dispatch_header;
+	u64 due_time;
+	struct list_entry timer_list;
+	/* the space for kdpc is used for wrapper timer */
+	/* struct kdpc *kdpc; */
+	struct wrapper_timer *wrapper_timer;
+	long period;
+};
+
+#define NOTIFICATION_TIMER 1
+
+typedef STDCALL void *LOOKASIDE_ALLOC_FUNC(POOL_TYPE, unsigned long,
+					   unsigned long);
+typedef STDCALL void LOOKASIDE_FREE_FUNC(void *);
+
+struct packed npaged_lookaside_list {
+	union slist_head head;
+	unsigned short depth;
+	unsigned short maxdepth;
+	unsigned long totalallocs;
+	unsigned long allocmisses;
+	unsigned long totalfrees;
+	unsigned long freemisses;
+	POOL_TYPE type;
+	unsigned long tag;
+	unsigned long size;
+	LOOKASIDE_ALLOC_FUNC *alloc_func;
+	LOOKASIDE_FREE_FUNC *free_func;
+	struct list_entry listent;
+	unsigned long lasttotallocs;
+	unsigned long lastallocmisses;
+	unsigned long pad[2];
+	KSPIN_LOCK obsolete;
+};
+
+void wrapper_timer_handler(unsigned long data);
+void wrapper_init_timer(struct ktimer *ktimer, void *handle);
+int wrapper_set_timer(struct wrapper_timer *wrapper_timer,
+                      unsigned long expires, unsigned long repeat);
+void wrapper_cancel_timer(struct wrapper_timer *wrapper_timer, char *canceled);
+
+STDCALL KIRQL KeGetCurrentIrql(void);
+
+static inline void wrapper_set_timer_dpc(struct wrapper_timer *wrapper_timer,
+                                         struct kdpc *kdpc)
+{
+	wrapper_timer->kdpc = kdpc;
+}
+
+static inline void init_dpc(struct kdpc *kdpc, void *func, void *ctx)
+{
+	kdpc->func = func;
+	kdpc->ctx  = ctx;
+}
+
+#endif // _NTOSKERNEL_H_
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/proc.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/proc.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/proc.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/proc.c	2004-09-05 15:48:55.000000000 +0200
@@ -0,0 +1,330 @@
+/*
+ *  Copyright (C) 2003-2004 Pontus Fuchs, Giridhar Pemmasani
+ *
+ *  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.
+ *
+ */
+#include <linux/proc_fs.h>
+#include <linux/module.h>
+
+#include "ndis.h"
+
+static struct proc_dir_entry *ndiswrapper_procfs_entry;
+extern int proc_uid, proc_gid;
+
+static int procfs_read_stats(char *page, char **start, off_t off,
+			     int count, int *eof, void *data)
+{
+	char *p = page;
+	struct ndis_handle *handle = (struct ndis_handle *) data;
+	struct ndis_wireless_stats stats;
+	unsigned int res, written, needed;
+	long rssi;
+
+	if (off != 0) {
+		*eof = 1;
+		return 0;
+	}
+
+	res = doquery(handle, NDIS_OID_RSSI, (char*)&rssi,
+		      sizeof(rssi), &written, &needed);
+	if (!res)
+		p += sprintf(p, "signal_level=%ld dBm\n", rssi);
+
+	res = doquery(handle, NDIS_OID_STATISTICS, (char*)&stats,
+		      sizeof(stats), &written, &needed);
+	if (!res)
+	{
+
+		p += sprintf(p, "tx_frames=%Lu\n", stats.tx_frag);
+		p += sprintf(p, "tx_multicast_frames=%Lu\n",
+			     stats.tx_multi_frag);
+		p += sprintf(p, "tx_failed=%Lu\n", stats.failed);
+		p += sprintf(p, "tx_retry=%Lu\n", stats.retry);
+		p += sprintf(p, "tx_multi_rerty=%Lu\n", stats.multi_retry);
+		p += sprintf(p, "tx_rtss_success=%Lu\n", stats.rtss_succ);
+		p += sprintf(p, "tx_rtss_fail=%Lu\n", stats.rtss_fail);
+		p += sprintf(p, "ack_fail=%Lu\n", stats.ack_fail);
+		p += sprintf(p, "frame_duplicates=%Lu\n", stats.frame_dup);
+		p += sprintf(p, "rx_frames=%Lu\n", stats.rx_frag);
+		p += sprintf(p, "rx_multicast_frames=%Lu\n",
+			     stats.rx_multi_frag);
+		p += sprintf(p, "fcs_errors=%Lu\n", stats.fcs_err);
+	}
+
+	if (p - page > count)
+	{
+		ERROR("wrote %u bytes (limit is %u)\n", p - page, count);
+		*eof = 1;
+	}
+
+	return (p - page);
+}
+
+static int procfs_read_encr(char *page, char **start, off_t off,
+			    int count, int *eof, void *data)
+{
+	char *p = page;
+	struct ndis_handle *handle = (struct ndis_handle *) data;
+	int i, encr_status, auth_mode, op_mode;
+	unsigned int res, written, needed;
+	struct ndis_essid essid;
+	mac_address ap_address;
+
+	if (off != 0) {
+		*eof = 1;
+		return 0;
+	}
+
+	res = doquery(handle, NDIS_OID_BSSID, (char*)&ap_address,
+		      sizeof(ap_address), &written, &needed);
+	if (res)
+		memset(ap_address, 0, ETH_ALEN);
+	p += sprintf(p, "ap_address=%2.2X", ap_address[0]);
+	for (i = 1 ; i < ETH_ALEN ; i++)
+		p += sprintf(p, ":%2.2X", ap_address[i]);
+	p += sprintf(p, "\n");
+
+	res = doquery(handle, NDIS_OID_ESSID, (char*)&essid,
+		      sizeof(essid), &written, &needed);
+	if (!res)
+	{
+		essid.essid[essid.length] = '\0';
+		p += sprintf(p, "essid=%s\n", essid.essid);
+	}
+
+	res = query_int(handle, NDIS_OID_ENCR_STATUS, &encr_status);
+	res |= query_int(handle, NDIS_OID_AUTH_MODE, &auth_mode);
+
+	if (!res)
+	{
+		int active = handle->encr_info.active;
+		p += sprintf(p, "tx_key=%u\n", handle->encr_info.active);
+		p += sprintf(p, "key=");
+		if (handle->encr_info.keys[active].length > 0)
+			for (i = 0; i < NDIS_ENCODING_TOKEN_MAX &&
+				     i < handle->encr_info.keys[active].length;
+			     i++)
+				p += sprintf(p, "%2.2X",
+					     handle->encr_info.keys[active].key[i]);
+		else
+			p += sprintf(p, "off");
+		p += sprintf(p, "\n");
+
+		p += sprintf(p, "status=%sabled\n",
+			     (encr_status == ENCR_DISABLED) ? "dis" : "en");
+		p += sprintf(p, "auth_mode=%s\n",
+			     (auth_mode == AUTHMODE_RESTRICTED) ?
+			     "restricted" : "open");
+	}
+
+	res = query_int(handle, NDIS_OID_MODE, &op_mode);
+	p += sprintf(p, "mode=%s\n", (op_mode == NDIS_MODE_ADHOC) ?
+		     "adhoc" : (op_mode == NDIS_MODE_INFRA) ?
+		     "managed" : "auto");
+	if (p - page > count)
+	{
+		WARNING("wrote %u bytes (limit is %u)", p - page, count);
+		*eof = 1;
+	}
+
+	return (p - page);
+}
+
+static int procfs_read_hw(char *page, char **start, off_t off,
+			  int count, int *eof, void *data)
+{
+	char *p = page;
+	struct ndis_handle *handle = (struct ndis_handle *)data;
+	struct ndis_configuration config;
+	unsigned int res, written, needed, power_mode;
+	unsigned long tx_power, bit_rate, rts_threshold, frag_threshold;
+	unsigned long antenna;
+
+	if (off != 0) {
+		*eof = 1;
+		return 0;
+	}
+
+	res = doquery(handle, NDIS_OID_CONFIGURATION,
+		      (char*)&config, sizeof(config), &written, &needed);
+	if (!res)
+	{
+		p += sprintf(p, "beacon_period=%u msec\n",
+			     config.beacon_period);
+		p += sprintf(p, "atim_window=%u msec\n", config.atim_window);
+		p += sprintf(p, "frequency=%u kHZ\n", config.ds_config);
+		p += sprintf(p, "hop_pattern=%u\n",
+			     config.fh_config.hop_pattern);
+		p += sprintf(p, "hop_set=%u\n",
+			     config.fh_config.hop_set);
+		p += sprintf(p, "dwell_time=%u msec\n",
+			     config.fh_config.dwell_time);
+	}
+
+	res = doquery(handle, NDIS_OID_TX_POWER_LEVEL, (char*)&tx_power,
+		      sizeof(tx_power), &written, &needed);
+	if (!res)
+		p += sprintf(p, "tx_power=%lu mW\n", tx_power);
+
+	res = doquery(handle, NDIS_OID_GEN_SPEED, (char*)&bit_rate,
+		      sizeof(bit_rate), &written, &needed);
+	if (!res)
+		p += sprintf(p, "bit_rate=%lu kBps\n", bit_rate / 10);
+
+	res = doquery(handle, NDIS_OID_RTS_THRESH, (char*)&rts_threshold,
+		      sizeof(rts_threshold), &written, &needed);
+	if (!res)
+		p += sprintf(p, "rts_threshold=%lu bytes\n", rts_threshold);
+
+	res = doquery(handle, NDIS_OID_FRAG_THRESH, (char*)&frag_threshold,
+		      sizeof(frag_threshold), &written, &needed);
+	if (!res)
+		p += sprintf(p, "frag_threshold=%lu bytes\n", frag_threshold);
+
+	res = query_int(handle, NDIS_OID_POWER_MODE, &power_mode);
+	if (!res)
+		p += sprintf(p, "power_mode=%s\n",
+			     (power_mode == NDIS_POWER_OFF) ?
+			     "always_on" :
+			     (power_mode == NDIS_POWER_MAX) ?
+			     "max_savings" : "min_savings");
+
+	res = doquery(handle, NDIS_OID_NUM_ANTENNA, (char *)&antenna,
+		      sizeof(antenna), &written, &needed);
+	if (!res)
+		p += sprintf(p, "num_antennas=%lu\n",
+			     antenna);
+
+	res = doquery(handle, NDIS_OID_TX_ANTENNA, (char *)&antenna,
+		      sizeof(antenna), &written, &needed);
+	if (!res)
+		p += sprintf(p, "tx_antenna=%lu\n",
+			     antenna);
+
+	res = doquery(handle, NDIS_OID_RX_ANTENNA, (char *)&antenna,
+		      sizeof(antenna), &written, &needed);
+	if (!res)
+		p += sprintf(p, "rx_antenna=%lu\n",
+			     antenna);
+
+	if (p - page > count)
+	{
+		WARNING("wrote %u bytes (limit is %u)", p - page, count);
+		*eof = 1;
+	}
+
+	return (p - page);
+}
+
+int ndiswrapper_procfs_init(void)
+{
+	ndiswrapper_procfs_entry = proc_mkdir(DRV_NAME, proc_net);
+	if (ndiswrapper_procfs_entry == NULL)
+	{
+		ERROR("%s", "Couldn't create procfs directory");
+		return -ENOMEM;
+	}
+	ndiswrapper_procfs_entry->uid = proc_uid;
+	ndiswrapper_procfs_entry->gid = proc_gid;
+	return 0;
+}
+
+int ndiswrapper_procfs_add_iface(struct ndis_handle *handle)
+{
+	struct net_device *dev = handle->net_dev;
+	struct proc_dir_entry *proc_iface, *procfs_entry;
+
+	handle->procfs_iface = NULL;
+	if (ndiswrapper_procfs_entry == NULL)
+		return -ENOMEM;
+
+	proc_iface = proc_mkdir(dev->name, ndiswrapper_procfs_entry);
+
+	handle->procfs_iface = proc_iface;
+
+	if (proc_iface == NULL)
+	{
+		ERROR("%s", "Couldn't create proc directory");
+		return -ENOMEM;
+	}
+	proc_iface->uid = proc_uid;
+	proc_iface->gid = proc_gid;
+
+	procfs_entry = create_proc_entry("hw", S_IFREG | S_IRUSR | S_IRGRP,
+					 proc_iface);
+	if (procfs_entry == NULL)
+	{
+		ERROR("%s", "Couldn't create proc entry for 'hw'");
+		return -ENOMEM;
+	}
+	else
+	{
+		procfs_entry->uid = proc_uid;
+		procfs_entry->gid = proc_gid;
+		procfs_entry->data = handle;
+		procfs_entry->read_proc = procfs_read_hw;
+	}
+
+	procfs_entry = create_proc_entry("stats", S_IFREG | S_IRUSR | S_IRGRP,
+					 proc_iface);
+	if (procfs_entry == NULL)
+	{
+		ERROR("%s", "Couldn't create proc entry for 'stats'");
+		return -ENOMEM;
+	}
+	else
+	{
+		procfs_entry->uid = proc_uid;
+		procfs_entry->gid = proc_gid;
+		procfs_entry->data = handle;
+		procfs_entry->read_proc = procfs_read_stats;
+	}
+
+	procfs_entry = create_proc_entry("encr", S_IFREG | S_IRUSR | S_IRGRP,
+					 proc_iface);
+	if (procfs_entry == NULL)
+	{
+		ERROR("%s", "Couldn't create proc entry for 'encr'");
+		return -ENOMEM;
+	}
+	else
+	{
+		procfs_entry->uid = proc_uid;
+		procfs_entry->gid = proc_gid;
+		procfs_entry->data = handle;
+		procfs_entry->read_proc = procfs_read_encr;
+	}
+
+	return 0;
+}
+
+void ndiswrapper_procfs_remove_iface(struct ndis_handle *handle)
+{
+	struct net_device *dev = handle->net_dev;
+	struct proc_dir_entry *procfs_iface = handle->procfs_iface;
+
+	if (procfs_iface == NULL)
+		return;
+	remove_proc_entry("hw", procfs_iface);
+	remove_proc_entry("stats", procfs_iface);
+	remove_proc_entry("encr", procfs_iface);
+	if (ndiswrapper_procfs_entry != NULL)
+		remove_proc_entry(dev->name, ndiswrapper_procfs_entry);
+	handle->procfs_iface = NULL;
+}
+
+void ndiswrapper_procfs_remove(void)
+{
+	if (ndiswrapper_procfs_entry == NULL)
+		return;
+	remove_proc_entry(DRV_NAME, proc_net);
+}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/wrapper.c linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/wrapper.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/wrapper.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/wrapper.c	2004-09-05 15:48:55.000000000 +0200
@@ -0,0 +1,1910 @@
+/*
+ *  Copyright (C) 2003-2004 Pontus Fuchs, Giridhar Pemmasani
+ *
+ *  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.
+ *
+ */
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/vmalloc.h>
+#include <linux/kmod.h>
+
+#include <linux/types.h>
+#include <linux/fs.h>
+#include <linux/errno.h>
+#include <linux/miscdevice.h>
+#include <linux/pci.h>
+
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/ethtool.h>
+#include <linux/if_arp.h>
+#include <net/iw_handler.h>
+#include <linux/rtnetlink.h>
+
+#include <asm/uaccess.h>
+
+#include "wrapper.h"
+#include "loader.h"
+#include "ndis.h"
+#include "iw_ndis.h"
+
+#ifndef DRV_VERSION
+#error You must run make from the toplevel directory
+#endif
+
+#ifdef CONFIG_4K_STACKS
+#warning Most windows drivers do not work with 4K stacks. \
+	Disable 4K stack option (CONFIG_4K_STACKS) in the kernel; otherwise \
+	most likely the kernel crashes.
+#endif
+
+/* Define this if you are developing and ndis_init_one crashes.
+   When using the old PCI-API a reboot is not needed when this
+   function crashes. A simple rmmod -f will do the trick and
+   you can try again.
+*/
+
+/*#define DEBUG_CRASH_ON_INIT*/
+
+static char *if_name = "wlan%d";
+int proc_uid, proc_gid;
+static int hangcheck_interval;
+
+MODULE_PARM(if_name, "s");
+MODULE_PARM_DESC(if_name, "Network interface name or template (default: wlan%d)");
+MODULE_PARM(proc_uid, "i");
+MODULE_PARM_DESC(proc_uid, "The uid of the files created in /proc (default: 0).");
+MODULE_PARM(proc_gid, "i");
+MODULE_PARM_DESC(proc_gid, "The gid of the files created in /proc (default: 0).");
+MODULE_PARM(hangcheck_interval, "i");
+/* negative value - no hangcheck, 0 - default value provided by NDIS driver,
+ * positive value - force hangcheck interval to that many seconds
+ */
+MODULE_PARM_DESC(hangcheck_interval, "The interval, in seconds, for checking if driver is hung. (default: 0)");
+
+/* List of loaded drivers */
+LIST_HEAD(ndis_driverlist);
+
+/* Protects driver list */
+static struct wrap_spinlock driverlist_lock;
+
+extern int image_offset;
+
+extern struct list_head wrap_allocs;
+extern struct wrap_spinlock wrap_allocs_lock;
+
+extern struct list_head handle_ctx_list;
+
+void ndis_set_rx_mode(struct net_device *dev);
+
+int doreset(struct ndis_handle *handle)
+{
+	int res = 0;
+	struct miniport_char *miniport = &handle->driver->miniport_char;
+
+	TRACEENTER3("%s", "");
+
+	if (handle->reset_status)
+		return NDIS_STATUS_PENDING;
+
+	if (down_interruptible(&handle->ndis_comm_mutex))
+		TRACEEXIT3(return NDIS_STATUS_FAILURE);
+
+	handle->reset_status = 0;
+	res = miniport->reset(&handle->reset_status, handle->adapter_ctx);
+
+	if (res == NDIS_STATUS_PENDING)
+	{
+		/* wait for NdisMResetComplete */
+		if (down_interruptible(&handle->ndis_comm_done))
+			res = NDIS_STATUS_FAILURE;
+		else
+			res = handle->ndis_comm_res;
+	}
+	up(&handle->ndis_comm_mutex);
+	DBGTRACE3("reset: res = %08X, reset status = %08X",
+		  res, handle->reset_status);
+
+	if (res == NDIS_STATUS_SUCCESS && handle->reset_status)
+	{
+		handle->rx_packet = &NdisMIndicateReceivePacket;
+		handle->send_complete = &NdisMSendComplete;
+		handle->send_resource_avail = &NdisMSendResourcesAvailable;
+		handle->status = &NdisMIndicateStatus;
+		handle->status_complete = &NdisMIndicateStatusComplete;
+		handle->query_complete = &NdisMQueryInformationComplete;
+		handle->set_complete = &NdisMSetInformationComplete;
+		handle->reset_complete = &NdisMResetComplete;
+		handle->reset_status = 0;
+		ndis_set_rx_mode(handle->net_dev);
+	}
+
+	TRACEEXIT3(return res);
+}
+
+/*
+ * Perform a sync query and deal with the possibility of an async operation.
+ * This function must be called from process context as it will sleep.
+ */
+int doquery(struct ndis_handle *handle, unsigned int oid, char *buf,
+	    int bufsize, unsigned int *written , unsigned int *needed)
+{
+	int res;
+	struct miniport_char *miniport = &handle->driver->miniport_char;
+
+	TRACEENTER3("Calling query at %p rva(%08x)",
+		    miniport->query, (int)miniport->query - image_offset);
+
+	if (down_interruptible(&handle->ndis_comm_mutex))
+		TRACEEXIT3(return NDIS_STATUS_FAILURE);
+
+	res = miniport->query(handle->adapter_ctx, oid, buf, bufsize,
+			      written, needed);
+	if (res == NDIS_STATUS_PENDING)
+	{
+		/* wait for NdisMQueryInformationComplete */
+		if (down_interruptible(&handle->ndis_comm_done))
+			res = NDIS_STATUS_FAILURE;
+		else
+			res = handle->ndis_comm_res;
+	}
+	up(&handle->ndis_comm_mutex);
+	TRACEEXIT3(return res);
+}
+
+/*
+ * Perform a sync setinfo and deal with the possibility of an async operation.
+ * This function must be called from process context as it will sleep.
+ */
+int dosetinfo(struct ndis_handle *handle, unsigned int oid, char *buf,
+	      int bufsize, unsigned int *written , unsigned int *needed)
+{
+	int res;
+	struct miniport_char *miniport = &handle->driver->miniport_char;
+
+	TRACEENTER3("Calling setinfo at %p rva(%08x)",
+		    miniport->setinfo, (int)miniport->setinfo - image_offset);
+
+	if (down_interruptible(&handle->ndis_comm_mutex))
+		TRACEEXIT3(return NDIS_STATUS_FAILURE);
+
+	res = miniport->setinfo(handle->adapter_ctx, oid, buf, bufsize,
+			       written, needed);
+	if (res == NDIS_STATUS_PENDING)
+	{
+		/* wait for NdisMSetInformationComplete */
+		if (down_interruptible(&handle->ndis_comm_done))
+			res = NDIS_STATUS_FAILURE;
+		else
+			res = handle->ndis_comm_res;
+	}
+	up(&handle->ndis_comm_mutex);
+	TRACEEXIT3(return res);
+}
+
+/* Make a query that has an int as the result. */
+int query_int(struct ndis_handle *handle, int oid, int *data)
+{
+	unsigned int res, written, needed;
+
+	res = doquery(handle, oid, (char*)data, sizeof(int),
+		      &written, &needed);
+	if (!res)
+		return 0;
+	*data = 0;
+	return res;
+}
+
+/* Set an int */
+int set_int(struct ndis_handle *handle, int oid, int data)
+{
+	unsigned int written, needed;
+
+	return dosetinfo(handle, oid, (char*)&data, sizeof(int),
+			 &written, &needed);
+}
+
+static u32 ndis_get_link(struct net_device *dev)
+{
+	struct ndis_handle *handle = dev->priv;
+	return handle->link_status;
+}
+
+
+#ifdef HAVE_ETHTOOL
+static struct ethtool_ops ndis_ethtool_ops = {
+	.get_link		= ndis_get_link,
+};
+#endif
+
+static int call_init(struct ndis_handle *handle)
+{
+	__u32 res, res2;
+	__u32 selected_medium;
+	__u32 mediumtypes[] = {0,1,2,3,4,5,6,7,8,9,10,11,12};
+	struct miniport_char *miniport = &handle->driver->miniport_char;
+
+	TRACEENTER1("Calling NDIS driver init routine at %p rva(%08X)",
+		    miniport->init, (int)miniport->init - image_offset);
+	res = miniport->init(&res2, &selected_medium, mediumtypes, 13, handle,
+			     handle);
+	DBGTRACE1("init returns %08X", res);
+	return res != 0;
+}
+
+static void call_halt(struct ndis_handle *handle)
+{
+	struct miniport_char *miniport = &handle->driver->miniport_char;
+	TRACEENTER1("Calling NDIS driver halt at %p rva(%08X)",
+		    miniport->halt, (int)miniport->halt - image_offset);
+
+	set_int(handle, NDIS_OID_PNP_SET_POWER, NDIS_PM_STATE_D3);
+
+	miniport->halt(handle->adapter_ctx);
+	/* TI driver doesn't call NdisMDeregisterInterrupt during halt! */
+	if (handle->ndis_irq)
+	{
+		if (miniport->disable_interrupts)
+			miniport->disable_interrupts(handle->adapter_ctx);
+		NdisMDeregisterInterrupt(handle->ndis_irq);
+	}
+	pci_set_power_state(handle->pci_dev, 3);
+	TRACEEXIT1(return);
+}
+
+static void free_timers(struct ndis_handle *handle)
+{
+	char x;
+
+	/* Cancel any timers left by bugyy windows driver
+	 * Also free the memory for timers
+	 */
+	while (!list_empty(&handle->timers))
+	{
+		struct wrapper_timer *timer =
+			(struct wrapper_timer*) handle->timers.next;
+		DBGTRACE1("fixing up timer %p, timer->list %p",
+			  timer, &timer->list);
+		list_del(&timer->list);
+		if (timer->active)
+		{
+			WARNING("%s", "Fixing an active timer left "
+				" by buggy windows driver");
+			wrapper_cancel_timer(timer, &x);
+		}
+		wrap_kfree(timer);
+	}
+}
+
+static unsigned int call_entry(struct ndis_driver *driver)
+{
+	int res;
+	char regpath[] = {'a', 0, 'b', 0, 0, 0};
+
+	TRACEENTER1("Calling NDIS driver entry at %08X rva(%08X)",
+		    (int)driver->entry, (int)driver->entry - image_offset);
+	res = driver->entry((void*)driver, regpath);
+	DBGTRACE1("Past entry: Version: %d.%dn",
+		  driver->miniport_char.majorVersion,
+		  driver->miniport_char.minorVersion);
+
+	/* Dump addresses of driver suppoled callbacks */
+#if defined DEBUG && DEBUG >= 1
+	if(res == 0) {
+		int i;
+		int *adr = (int*) &driver->miniport_char.hangcheck;
+		char *name[] = {
+				"CheckForHangTimer",
+				"DisableInterruptHandler",
+				"EnableInterruptHandler",
+				"halt",
+				"HandleInterruptHandler",
+				"init",
+				"ISRHandler",
+				"query",
+				"ReconfigureHandler",
+				"ResetHandler",
+				"SendHandler",
+				"SetInformationHandler",
+				"TransferDataHandler",
+				"ReturnPacketHandler",
+				"SendPacketsHandler",
+				"AllocateCompleteHandler",
+		};
+
+		for(i = 0; i < 16; i++)
+		{
+			DBGTRACE1("%08X (rva %08X):%s", adr[i],
+				  adr[i]?adr[i] - image_offset:0, name[i]);
+		}
+	}
+#endif
+	return res;
+}
+
+static void hangcheck_reinit(struct ndis_handle *handle);
+
+static void hangcheck_bh(void *data)
+{
+	struct ndis_handle *handle = (struct ndis_handle *)data;
+
+	TRACEENTER3("%s", "");
+	if (handle->driver->miniport_char.hangcheck(handle->adapter_ctx))
+	{
+		int res;
+		INFO("Hangcheck returned true. Resetting %s!",
+		     handle->net_dev->name);
+		res = doreset(handle);
+		DBGTRACE3("reset returns %08X, %d", res, handle->reset_status);
+	}
+	TRACEEXIT3(return);
+}
+
+static void hangcheck(unsigned long data)
+{
+	struct ndis_handle *handle = (struct ndis_handle *)data;
+	schedule_work(&handle->hangcheck_work);
+	hangcheck_reinit(handle);
+}
+
+static void hangcheck_reinit(struct ndis_handle *handle)
+{
+	handle->hangcheck_timer.data = (unsigned long) handle;
+	handle->hangcheck_timer.function = &hangcheck;
+	handle->hangcheck_timer.expires = jiffies + handle->hangcheck_interval;
+	add_timer(&handle->hangcheck_timer);
+
+}
+
+void hangcheck_add(struct ndis_handle *handle)
+{
+	if(!handle->driver->miniport_char.hangcheck ||
+	   handle->hangcheck_interval <= 0)
+		return;
+
+	INIT_WORK(&handle->hangcheck_work, &hangcheck_bh, handle);
+	init_timer(&handle->hangcheck_timer);
+	hangcheck_reinit(handle);
+}
+
+void hangcheck_del(struct ndis_handle *handle)
+{
+	if(!handle->driver->miniport_char.hangcheck ||
+	   handle->hangcheck_interval <= 0)
+		return;
+
+	del_timer_sync(&handle->hangcheck_timer);
+}
+
+
+static void statcollector_reinit(struct ndis_handle *handle);
+
+static void statcollector_bh(void *data)
+{
+	struct ndis_handle *handle = (struct ndis_handle *)data;
+	unsigned int res, written, needed;
+	struct iw_statistics *iw_stats = &handle->wireless_stats;
+	struct ndis_wireless_stats ndis_stats;
+	long rssi;
+
+	res = doquery(handle, NDIS_OID_RSSI, (char *)&rssi, sizeof(rssi),
+		      &written, &needed);
+	iw_stats->qual.level = rssi;
+
+	memset(&ndis_stats, 0, sizeof(ndis_stats));
+	res = doquery(handle, NDIS_OID_STATISTICS, (char *)&ndis_stats,
+		      sizeof(ndis_stats), &written, &needed);
+	if (res != NDIS_STATUS_NOT_SUPPORTED)
+	{
+		iw_stats->discard.retries = (__u32)ndis_stats.retry +
+			(__u32)ndis_stats.multi_retry;
+		iw_stats->discard.misc = (__u32)ndis_stats.fcs_err +
+			(__u32)ndis_stats.rtss_fail +
+			(__u32)ndis_stats.ack_fail +
+			(__u32)ndis_stats.frame_dup;
+
+		if (ndis_stats.tx_frag)
+			iw_stats->qual.qual = 100 - 100 *
+				((__u32)ndis_stats.retry +
+				 2 * (__u32)ndis_stats.multi_retry +
+				 3 * (__u32)ndis_stats.failed) /
+				(6 * (__u32)ndis_stats.tx_frag);
+		else
+			iw_stats->qual.qual = 100;
+	}
+}
+
+static void statcollector_timer(unsigned long data)
+{
+	struct ndis_handle *handle = (struct ndis_handle *)data;
+	schedule_work(&handle->statcollector_work);
+	statcollector_reinit(handle);
+}
+
+static void statcollector_reinit(struct ndis_handle *handle)
+{
+	handle->statcollector_timer.data = (unsigned long) handle;
+	handle->statcollector_timer.function = &statcollector_timer;
+	handle->statcollector_timer.expires = jiffies + 1*HZ;
+	add_timer(&handle->statcollector_timer);
+}
+
+void statcollector_add(struct ndis_handle *handle)
+{
+	INIT_WORK(&handle->statcollector_work, &statcollector_bh, handle);
+	init_timer(&handle->statcollector_timer);
+	statcollector_reinit(handle);
+}
+
+void statcollector_del(struct ndis_handle *handle)
+{
+	del_timer_sync(&handle->statcollector_timer);
+}
+
+static int ndis_open(struct net_device *dev)
+{
+	TRACEENTER1("%s", "");
+	netif_start_queue(dev);
+	return 0;
+}
+
+static int ndis_close(struct net_device *dev)
+{
+	TRACEENTER1("%s", "");
+	netif_stop_queue(dev);
+	return 0;
+}
+
+/*
+ * doquery (or query_int) may not be called from this function as
+ * it might sleep which is not allowed from the context this function
+ * is running in.
+ */
+static struct net_device_stats *ndis_get_stats(struct net_device *dev)
+{
+	struct ndis_handle *handle = dev->priv;
+	return &handle->stats;
+}
+
+
+static int ndis_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+{
+	int rc = -ENODEV;
+	return rc;
+}
+
+static void set_multicast_list(struct net_device *dev,
+			       struct ndis_handle *handle)
+{
+	unsigned int written, needed;
+	struct dev_mc_list *mclist;
+	int i;
+	char *list = handle->multicast_list;
+	int size = 0, res;
+
+	for (i = 0, mclist = dev->mc_list; mclist && i < dev->mc_count;
+	     i++, mclist = mclist->next)
+	{
+		memcpy(list, mclist->dmi_addr, 6);
+		list += 6;
+		size += 6;
+	}
+	DBGTRACE1("%d entries. size=%d", dev->mc_count, size);
+
+	res = dosetinfo(handle, OID_802_3_MULTICAST_LIST, list,
+	                size, &written, &needed);
+	if (res)
+		ERROR("Unable to set multicast list (%08X)", res);
+}
+
+/*
+ * Like ndis_set_rx_mode but this one will sleep.
+ */
+static void ndis_set_rx_mode_proc(void *param)
+{
+	struct net_device *dev = (struct net_device*) param;
+	struct ndis_handle *handle = dev->priv;
+	unsigned long packet_filter;
+	int res;
+	unsigned int written, needed;
+
+	TRACEENTER1("%s", "");
+	packet_filter = (NDIS_PACKET_TYPE_DIRECTED |
+	                 NDIS_PACKET_TYPE_BROADCAST |
+	                 NDIS_PACKET_TYPE_ALL_MULTICAST);
+
+	if (dev->flags & IFF_PROMISC) {
+		DBGTRACE1("%s", "Going into promiscuous mode");
+		packet_filter |= NDIS_PACKET_TYPE_PROMISCUOUS;
+	}
+	else if ((dev->mc_count > handle->multicast_list_size) ||
+	         (dev->flags & IFF_ALLMULTI) ||
+	         (handle->multicast_list == 0))
+	{
+		/* Too many to filter perfectly -- accept all multicasts. */
+		DBGTRACE1("%s", "Multicast list to long. Accepting all\n");
+		packet_filter |= NDIS_PACKET_TYPE_ALL_MULTICAST;
+	}
+	else if(dev->mc_count > 0)
+	{
+		packet_filter |= NDIS_PACKET_TYPE_MULTICAST;
+		set_multicast_list(dev, handle);
+	}
+
+	res = dosetinfo(handle, NDIS_OID_PACKET_FILTER, (char *)&packet_filter,
+	                sizeof(packet_filter), &written, &needed);
+	if (res)
+		ERROR("Unable to set packet filter (%08X)", res);
+}
+
+/*
+ * This function is called fom BH context...no sleep!
+ */
+void ndis_set_rx_mode(struct net_device *dev)
+{
+	struct ndis_handle *handle = dev->priv;
+	schedule_work(&handle->set_rx_mode_work);
+}
+
+/*
+ * This function should be called while holding send_packet_lock
+ */
+static struct ndis_packet *init_packet(struct ndis_handle *handle,
+				       struct ndis_buffer *buffer)
+{
+	struct ndis_packet *packet;
+
+	packet = kmalloc(sizeof(struct ndis_packet), GFP_ATOMIC);
+	if(!packet)
+	{
+		return NULL;
+	}
+
+	memset(packet, 0, sizeof(*packet));
+
+
+/* Enable this if you want to poison the packet-info during debugging.
+ * This is not enabled when debug is defined because one card I have
+ * silently faild if this was on.
+ */
+#if 0
+	{
+		int i = 0;
+		/* Poision extra packet info */
+		int *x = (int*) &packet->ext1;
+		for(i = 0; i <= 12; i++)
+		{
+			x[i] = i;
+		}
+	}
+#endif
+
+	if(handle->use_scatter_gather)
+	{
+		packet->dataphys =
+			PCI_DMA_MAP_SINGLE(handle->pci_dev,
+					   buffer->data, buffer->len,
+					   PCI_DMA_TODEVICE);
+		packet->scatterlist.len = 1;
+		packet->scatterlist.entry.physlo = packet->dataphys;
+		packet->scatterlist.entry.physhi = 0;
+		packet->scatterlist.entry.len = buffer->len;
+		packet->scatter_gather_ext = &packet->scatterlist;
+	}
+
+	packet->oob_offset = (int)(&packet->timesent1) - (int)packet;
+
+	packet->nr_pages = NDIS_BUFFER_TO_SPAN_PAGES(buffer);
+	packet->len = buffer->len;
+	packet->count = 1;
+	packet->valid_counts = 1;
+
+	packet->buffer_head = buffer;
+	packet->buffer_tail = buffer;
+
+//	DBGTRACE4("Buffer: %08X, data %08X, len %d\n", (int)buffer,
+//		  (int)buffer->data, (int)buffer->len);
+	return packet;
+}
+
+/*
+ * This function should be called while holding send_packet_lock
+ */
+static void free_packet(struct ndis_handle *handle, struct ndis_packet *packet)
+{
+	if(packet->dataphys)
+	{
+		PCI_DMA_UNMAP_SINGLE(handle->pci_dev, packet->dataphys,
+				     packet->len, PCI_DMA_TODEVICE);
+	}
+
+	kfree(packet);
+}
+
+/*
+ * This function should be called while holding send_packet_lock
+ */
+static void free_buffer(struct ndis_handle *handle, struct ndis_packet *packet)
+{
+	kfree(packet->buffer_head->data);
+	kfree(packet->buffer_head);
+	free_packet(handle, packet);
+}
+
+static int send_packet(struct ndis_handle *handle, struct ndis_packet *packet)
+{
+	int res;
+	struct miniport_char *miniport = &handle->driver->miniport_char;
+
+	TRACEENTER3("packet = %p", packet);
+
+	if (miniport->send_packets)
+	{
+		struct ndis_packet *packets[1];
+		packets[0] = packet;
+		miniport->send_packets(handle->adapter_ctx, &packets[0], 1);
+
+		if(handle->serialized)
+		{
+			/* Serialized miniports sets packet->status */
+			res = packet->status;
+		}
+		else
+		{
+			/* Deserialized miniports always call NdisMSendComplete */
+			res = NDIS_STATUS_PENDING;
+		}
+	}
+	else if (miniport->send)
+	{
+		res = miniport->send(handle->adapter_ctx, packet, 0);
+	}
+	else
+	{
+		DBGTRACE3("%s", "No send handler");
+		res = NDIS_STATUS_FAILURE;
+	}
+
+	DBGTRACE3("send_packets returning %08X", res);
+
+	TRACEEXIT3(return res);
+}
+
+static void xmit_bh(void *param)
+{
+	struct ndis_handle *handle = (struct ndis_handle*) param;
+	struct ndis_buffer *buffer;
+	int res;
+
+	TRACEENTER3("send status is %08X", handle->send_status);
+
+	while (handle->send_status == 0)
+	{
+		wrap_spin_lock(&handle->xmit_ring_lock);
+		if (!handle->xmit_ring_pending)
+		{
+			wrap_spin_unlock(&handle->xmit_ring_lock);
+			break;
+		}
+		buffer = handle->xmit_ring[handle->xmit_ring_start];
+		wrap_spin_unlock(&handle->xmit_ring_lock);
+
+		wrap_spin_lock(&handle->send_packet_lock);
+		/* if we are resending a packet due to NDIS_STATUS_RESOURCES
+		 * then just pick up the packet already created
+		 */
+		if (!handle->send_packet)
+		{
+			/* otherwise, get a new packet */
+			handle->send_packet = init_packet(handle, buffer);
+			if (!handle->send_packet)
+			{
+				wrap_spin_unlock(&handle->send_packet_lock);
+				ERROR("%s", "couldn't get a packet");
+				return;
+			}
+		}
+
+		res = send_packet(handle, handle->send_packet);
+		/* If the driver returns...
+		 * NDIS_STATUS_SUCCESS - we own the packet and
+		 *    driver will not call NdisMSendComplete.
+		 * NDIS_STATUS_PENDING - the driver owns the packet
+		 *    and will return it using NdisMSendComplete.
+		 * NDIS_STATUS_RESOURCES - (driver is serialized)
+		 *    Requeue it when resources are available.
+		 * NDIS_STATUS_FAILURE - drop the packet?
+		 */
+		switch (res)
+		{
+		case NDIS_STATUS_SUCCESS:
+			sendpacket_done(handle, handle->send_packet);
+			handle->send_status = 0;
+			break;
+		case NDIS_STATUS_PENDING:
+			break;
+		case NDIS_STATUS_RESOURCES:
+			/* should be serialized driver */
+			if (!handle->serialized)
+				ERROR("%s", "deserialized driver returning "
+				      "NDIS_STATUS_RESOURCES!");
+			handle->send_status = res;
+			wrap_spin_unlock(&handle->send_packet_lock);
+			/* this packet will be tried again */
+			return;
+
+			/* free buffer, drop the packet */
+		case NDIS_STATUS_FAILURE:
+			free_buffer(handle, handle->send_packet);
+			break;
+		default:
+			ERROR("Unknown status code %08X", res);
+			free_buffer(handle, handle->send_packet);
+			break;
+		}
+
+		handle->send_packet = NULL;
+		wrap_spin_unlock(&handle->send_packet_lock);
+
+		wrap_spin_lock(&handle->xmit_ring_lock);
+		handle->xmit_ring_start =
+			(handle->xmit_ring_start + 1) % XMIT_RING_SIZE;
+		handle->xmit_ring_pending--;
+		wrap_spin_unlock(&handle->xmit_ring_lock);
+		if (netif_queue_stopped(handle->net_dev))
+			netif_wake_queue(handle->net_dev);
+	}
+	TRACEEXIT3(return);
+}
+
+/*
+ * Free and unmap a packet created in xmit
+ * This function should be called while holding send_packet_lock
+ */
+void sendpacket_done(struct ndis_handle *handle, struct ndis_packet *packet)
+{
+	TRACEENTER3("%s", "");
+	/* is this lock necessary? */
+	wrap_spin_lock(&handle->send_packet_done_lock);
+	handle->stats.tx_bytes += packet->len;
+	handle->stats.tx_packets++;
+
+	free_buffer(handle, packet);
+	wrap_spin_unlock(&handle->send_packet_done_lock);
+	TRACEEXIT3(return);
+}
+
+/*
+ * This function is called in BH disabled context and ndis drivers
+ * must have their send-functions called from sleepeable context so we
+ * just queue the packets up here and schedule a workqueue to run
+ * later.
+ */
+static int start_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+	struct ndis_handle *handle = dev->priv;
+	struct ndis_buffer *buffer;
+	unsigned int xmit_ring_next_slot;
+
+	char *data = kmalloc(skb->len, GFP_ATOMIC);
+	if(!data)
+	{
+		return 1;
+	}
+
+	buffer = kmalloc(sizeof(struct ndis_buffer), GFP_ATOMIC);
+	if(!buffer)
+	{
+		kfree(data);
+		return 1;
+	}
+
+	skb_copy_and_csum_dev(skb, data);
+	buffer->data = data;
+	buffer->next = 0;
+	buffer->len = skb->len;
+	dev_kfree_skb(skb);
+
+	wrap_spin_lock(&handle->xmit_ring_lock);
+	xmit_ring_next_slot =
+		(handle->xmit_ring_start + handle->xmit_ring_pending) % XMIT_RING_SIZE;
+	handle->xmit_ring[xmit_ring_next_slot] = buffer;
+	handle->xmit_ring_pending++;
+	wrap_spin_unlock(&handle->xmit_ring_lock);
+	if (handle->xmit_ring_pending == XMIT_RING_SIZE)
+		netif_stop_queue(handle->net_dev);
+
+	schedule_work(&handle->xmit_work);
+
+	return 0;
+}
+
+static int ndis_suspend(struct pci_dev *pdev, u32 state)
+{
+	struct net_device *dev;
+	struct ndis_handle *handle;
+	int res, pm_state;
+
+	if (!pdev)
+		return -1;
+	handle = pci_get_drvdata(pdev);
+	if (!handle)
+		return -1;
+	dev = handle->net_dev;
+
+	if (handle->pm_state != NDIS_PM_STATE_D0)
+		return 0;
+
+	DBGTRACE2("%s: detaching device", dev->name);
+	netif_device_detach(dev);
+
+	if (state == 1)
+		pm_state = NDIS_PM_STATE_D1;
+	else if (state == 2)
+		pm_state = NDIS_PM_STATE_D2;
+	else
+		pm_state = NDIS_PM_STATE_D3;
+
+	handle->pm_state = pm_state;
+
+	res = query_int(handle, NDIS_OID_PNP_QUERY_POWER, &pm_state);
+	DBGTRACE2("%s: query power to state %d returns %d",
+			 dev->name, handle->pm_state, res);
+	if (res)
+		WARNING("No pnp capabilities for pm (%08X)\n", res);
+
+	res = set_int(handle, NDIS_OID_PNP_SET_POWER, handle->pm_state);
+	pci_save_state(pdev, handle->pci_state);
+	pci_set_power_state(pdev, state);
+	DBGTRACE2("%s: setting power to state %d returns %d",
+			 dev->name, handle->pm_state, res);
+	if (res)
+		WARNING("No pnp capabilities for pm (%08X)", res);
+	DBGTRACE2("%s: device suspended!\n", dev->name);
+	return 0;
+}
+
+static int ndis_resume(struct pci_dev *pdev)
+{
+	struct net_device *dev;
+	struct ndis_handle *handle;
+	struct miniport_char *miniport;
+	int res;
+//	unsigned long profile_inf = NDIS_POWER_PROFILE_AC;
+
+	if (!pdev)
+		return -1;
+	handle = pci_get_drvdata(pdev);
+	if (!handle)
+		return -1;
+	dev = handle->net_dev;
+
+	if (handle->pm_state == NDIS_PM_STATE_D0)
+		return 0;
+
+	handle->pm_state = NDIS_PM_STATE_D0;
+	pci_set_power_state(pdev, 0);
+	pci_restore_state(pdev, handle->pci_state);
+	res = set_int(handle, NDIS_OID_PNP_SET_POWER, handle->pm_state);
+	DBGTRACE2("%s: setting power to state %d returns %d",
+			 dev->name, handle->pm_state, res);
+	if (res)
+		WARNING("No pnp capabilities for pm (%08X)", res);
+
+	miniport = &handle->driver->miniport_char;
+	/*
+	if (miniport->pnp_event_notify)
+	{
+		INFO("%s", "calling pnp_event_notify");
+		miniport->pnp_event_notify(handle, NDIS_PNP_PROFILE_CHANGED,
+					 &profile_inf, sizeof(profile_inf));
+	}
+	*/
+
+	doreset(handle);
+	set_int(handle, NDIS_OID_BSSID_LIST_SCAN, 0);
+
+	set_bit(SET_ESSID, &handle->wrapper_work);
+	schedule_work(&handle->wrapper_worker);
+
+	DBGTRACE2("%s: attaching device\n", dev->name);
+	netif_device_attach(dev);
+
+	DBGTRACE2("%s: device resumed!", dev->name);
+	return 0;
+}
+
+/* worker procedure to take care of setting/checking various states */
+static void wrapper_worker_proc(void *param)
+{
+	struct ndis_handle *handle = (struct ndis_handle *)param;
+
+	DBGTRACE("%lu\n", handle->wrapper_work);
+
+	if (test_and_clear_bit(SET_OP_MODE, &handle->wrapper_work))
+		set_mode(handle, handle->op_mode);
+
+	if (test_and_clear_bit(WRAPPER_LINK_STATUS, &handle->wrapper_work))
+	{
+		struct ndis_assoc_info *ndis_assoc_info;
+		unsigned char *wpa_assoc_info, *assoc_info, *p, *offset;
+		union iwreq_data wrqu;
+		unsigned int i, res, written, needed;
+		const int ie_size = 256;
+		const int assoc_size = sizeof(*ndis_assoc_info) + 2 * 256;
+
+		if (!test_bit(CAPA_WPA, &handle->capa))
+			return;
+
+		assoc_info = kmalloc(assoc_size, GFP_KERNEL);
+		if (!assoc_info)
+		{
+			ERROR("%s", "couldn't allocate memory");
+			return;
+		}
+		wpa_assoc_info = kmalloc(ie_size, GFP_KERNEL);
+		if (!wpa_assoc_info)
+		{
+			ERROR("%s", "couldn't allocate memory");
+			kfree(assoc_info);
+			return;
+		}
+
+		memset(assoc_info, 0, assoc_size);
+
+		ndis_assoc_info = (struct ndis_assoc_info *)assoc_info;
+		ndis_assoc_info->length = sizeof(*ndis_assoc_info);
+		ndis_assoc_info->offset_req_ies = sizeof(*ndis_assoc_info);
+		ndis_assoc_info->req_ie_length = ie_size;
+		ndis_assoc_info->offset_resp_ies = sizeof(*ndis_assoc_info) +
+			ndis_assoc_info->req_ie_length;
+		ndis_assoc_info->resp_ie_length = ie_size;
+
+		res = doquery(handle, NDIS_OID_ASSOC_INFO, assoc_info,
+			      assoc_size, &written, &needed);
+		if (res)
+		{
+			ERROR("query assoc_info failed (%08X)", res);
+			kfree(assoc_info);
+			kfree(wpa_assoc_info);
+			return;
+		}
+
+		p = wpa_assoc_info;
+		p += sprintf(p, "ASSOCINFO(ReqIEs=");
+		offset = ((char *)ndis_assoc_info) +
+			ndis_assoc_info->offset_req_ies;
+		for (i = 0; i < ie_size && i < ndis_assoc_info->req_ie_length;
+		     i++)
+			p += sprintf(p, "%02x", *(offset + i));
+
+		p += sprintf(p, " RespIEs=");
+		offset = ((char *)ndis_assoc_info) +
+			ndis_assoc_info->offset_resp_ies;
+		for (i = 0; i < ie_size && i < ndis_assoc_info->resp_ie_length;
+		     i++)
+			p += sprintf(p, "%02x", *(offset + i));
+
+		p += sprintf(p, ")");
+
+		memset(&wrqu, 0, sizeof(wrqu));
+		wrqu.data.length = p - wpa_assoc_info;
+		DBGTRACE("adding %d bytes", wrqu.data.length);
+		wireless_send_event(handle->net_dev, IWEVCUSTOM, &wrqu,
+				    wpa_assoc_info);
+		kfree(assoc_info);
+		kfree(wpa_assoc_info);
+
+		get_ap_address(handle, (char *)&wrqu.ap_addr.sa_data);
+		wrqu.ap_addr.sa_family = ARPHRD_ETHER;
+		wireless_send_event(handle->net_dev, SIOCGIWAP, &wrqu, NULL);
+	}
+
+	if (test_and_clear_bit(SET_ESSID, &handle->wrapper_work))
+		set_essid(handle, handle->essid.essid, handle->essid.length);
+}
+
+/* check capabilites - mainly for WPA */
+static void check_capa(struct ndis_handle *handle)
+{
+	int i, mode;
+	unsigned int res, written, needed;
+	struct ndis_assoc_info ndis_assoc_info;
+	struct ndis_wpa_key ndis_key;
+
+	TRACEENTER1("%s", "");
+	if (set_auth_mode(handle, AUTHMODE_WPA) ||
+	    query_int(handle, NDIS_OID_AUTH_MODE, &i) || i != AUTHMODE_WPA)
+		TRACEEXIT1(return);
+
+	/* check for highest encryption */
+	for (mode = ENCR3_ENABLED; mode != ENCR_DISABLED; )
+	{
+		DBGTRACE("checking encryption mode %d", mode);
+		if (set_encr_mode(handle, mode) ||
+		    query_int(handle, NDIS_OID_ENCR_STATUS, &i))
+			i = ENCR_DISABLED;
+
+		if (mode == ENCR3_ENABLED)
+		{
+			if (i == mode || i == ENCR3_ABSENT)
+				break;
+			else
+				mode = ENCR2_ENABLED;
+		}
+		else if (mode == ENCR2_ENABLED)
+		{
+			if (i == mode || i == ENCR2_ABSENT)
+				break;
+			else
+				mode = ENCR1_ENABLED;
+		}
+		else
+			mode = ENCR_DISABLED;
+	}
+	DBGTRACE("highest encryption mode supported = %d", mode);
+	set_bit(mode, &handle->capa);
+	set_encr_mode(handle, mode);
+
+	if (handle->encr_mode == ENCR_DISABLED ||
+	    handle->encr_mode == ENCR1_ENABLED)
+	{
+		printk(KERN_INFO "ndiswrapper device %s doesn't support WPA ",
+		       handle->net_dev->name);
+		TRACEEXIT1(return);
+	}
+
+	ndis_key.length = 32;
+	ndis_key.index = 0xC0000001;
+	ndis_key.struct_size = sizeof(ndis_key);
+	res = dosetinfo(handle, NDIS_OID_ADD_KEY, (char *)&ndis_key,
+			ndis_key.struct_size, &written, &needed);
+
+	DBGTRACE("add key returns %08X, needed = %d, size = %d\n",
+		 res, needed, sizeof(ndis_key));
+	if (res != NDIS_STATUS_INVALID_DATA)
+		TRACEEXIT1(return);
+	res = doquery(handle, NDIS_OID_ASSOC_INFO, (char *)&ndis_assoc_info,
+		      sizeof(ndis_assoc_info), &written, &needed);
+	DBGTRACE("assoc info returns %d", res);
+	if (res == NDIS_STATUS_NOT_SUPPORTED)
+		TRACEEXIT1(return);
+	set_bit(CAPA_WPA, &handle->capa);
+
+	DBGTRACE("capbilities = %ld\n", handle->capa);
+	if (test_bit(CAPA_AES, &handle->capa))
+		printk(KERN_INFO "ndiswrapper device %s supports WPA with "
+		       "AES/CCMP and TKIP ciphers\n", handle->net_dev->name);
+	else
+		printk(KERN_INFO "ndiswrapper device %s supports WPA with "
+		       "TKIP cipher\n", handle->net_dev->name);
+	TRACEEXIT1(return);
+}
+
+static int setup_dev(struct net_device *dev)
+{
+	struct ndis_handle *handle = dev->priv;
+	mac_address mac;
+	unsigned int i, written, needed, res;
+	union iwreq_data wrqu;
+
+	if (strlen(if_name) > (IFNAMSIZ-1))
+	{
+		ERROR("interface name '%s' is too long", if_name);
+		return -1;
+	}
+	strncpy(dev->name, if_name, IFNAMSIZ-1);
+	dev->name[IFNAMSIZ-1] = '\0';
+
+	DBGTRACE1("%s: Querying for mac", DRV_NAME);
+	res = doquery(handle, 0x01010102, &mac[0], sizeof(mac),
+		      &written, &needed);
+	DBGTRACE1("mac:" MACSTR, MAC2STR(mac));
+
+	if(res)
+	{
+		ERROR("%s", "unable to get mac address from driver");
+		return -1;
+	}
+
+	memset(&wrqu, 0, sizeof(wrqu));
+
+	set_mode(handle, NDIS_MODE_INFRA);
+	set_essid(handle, handle->essid.essid, handle->essid.length);
+
+	res = query_int(handle, OID_802_3_MAXIMUM_LIST_SIZE, &i);
+	if(res == NDIS_STATUS_SUCCESS)
+	{
+		DBGTRACE1("Multicast list size is %d", i);
+		handle->multicast_list_size = i;
+	}
+
+	if(handle->multicast_list_size)
+		handle->multicast_list =
+			kmalloc(handle->multicast_list_size * 6, GFP_KERNEL);
+
+	if (set_privacy_filter(handle, NDIS_PRIV_ACCEPT_ALL))
+		WARNING("%s", "Unable to set privacy filter");
+
+	ndis_set_rx_mode_proc(dev);
+
+	dev->open = ndis_open;
+	dev->hard_start_xmit = start_xmit;
+	dev->stop = ndis_close;
+	dev->get_stats = ndis_get_stats;
+	dev->do_ioctl = ndis_ioctl;
+	dev->get_wireless_stats = get_wireless_stats;
+	dev->wireless_handlers	= (struct iw_handler_def *)&ndis_handler_def;
+	dev->set_multicast_list = ndis_set_rx_mode;
+#ifdef HAVE_ETHTOOL
+	dev->ethtool_ops = &ndis_ethtool_ops;
+#endif
+	memcpy(&dev->dev_addr, mac, ETH_ALEN);
+	dev->irq = handle->ndis_irq->irq;
+	dev->mem_start = handle->mem_start;
+	dev->mem_end = handle->mem_end;
+
+	res = register_netdev(dev);
+	if (res)
+	{
+		ERROR("cannot register net device %s", dev->name);
+		return res;
+	}
+
+	printk(KERN_INFO "%s: %s ethernet device " MACSTR " using driver %s\n",
+	       dev->name, DRV_NAME, MAC2STR(mac), handle->driver->name);
+
+	check_capa(handle);
+	/* check_capa changes auth_mode and encr_mode, so set them again */
+	set_auth_mode(handle, AUTHMODE_OPEN);
+	set_encr_mode(handle, ENCR_DISABLED);
+
+	/* some cards (e.g., RaLink) need a scan before they can associate */
+	set_int(handle, NDIS_OID_BSSID_LIST_SCAN, 0);
+
+	return 0;
+}
+
+/*
+ * Called by PCI-subsystem for each PCI-card found.
+ *
+ * This function should not be marked __devinit because ndiswrapper
+ * adds PCI_id's dynamically.
+ */
+static int ndis_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
+{
+	int i, *ip, res = 0;
+	struct ndis_device *device = (struct ndis_device *) ent->driver_data;
+	struct ndis_driver *driver = device->driver;
+	struct ndis_handle *handle;
+	struct net_device *dev;
+	struct miniport_char *miniport;
+//	unsigned long profile_inf = NDIS_POWER_PROFILE_AC;
+
+	TRACEENTER1("%04x:%04x:%04x:%04x", ent->vendor, ent->device,
+		    ent->subvendor, ent->subdevice);
+	if(device->fuzzy)
+	{
+		printk(KERN_WARNING "This driver (%s) is not for your hardware. " \
+		       "It's likely to work anyway but have it in " \
+		       "mind if you have problem.\n", device->driver->name);
+	}
+
+	dev = alloc_etherdev(sizeof(*handle));
+	if(!dev)
+	{
+		ERROR("%s", "Unable to alloc etherdev");
+		res = -ENOMEM;
+		goto out_nodev;
+	}
+
+	SET_MODULE_OWNER(dev);
+//	SET_NETDEV_DEV(dev, &pdev->dev);
+	handle = dev->priv;
+
+	/* Poision the fileds as they may contain function pointers
+	 * which my be called by the driver */
+	for (i = 0, ip = (int *)handle->fill1;
+	     (void *)&ip[i] < (void *)&handle->pci_dev; i++)
+		ip[i] = 0x1000+i;
+
+	handle->driver = driver;
+	handle->device = device;
+	handle->net_dev = dev;
+	pci_set_drvdata(pdev, handle);
+
+	init_MUTEX(&handle->ndis_comm_mutex);
+	init_MUTEX_LOCKED(&handle->ndis_comm_done);
+	init_waitqueue_head(&handle->ndis_comm_wqhead);
+
+	handle->send_status = 0;
+	handle->send_packet = NULL;
+
+	wrap_spin_lock_init(&handle->send_packet_lock);
+	wrap_spin_lock_init(&handle->send_packet_done_lock);
+
+	INIT_WORK(&handle->xmit_work, xmit_bh, handle);
+	wrap_spin_lock_init(&handle->xmit_ring_lock);
+	handle->xmit_ring_start = 0;
+	handle->xmit_ring_pending = 0;
+
+	handle->encr_mode = ENCR_DISABLED;
+	handle->auth_mode = AUTHMODE_OPEN;
+	handle->capa = 0;
+
+	wrap_spin_lock_init(&handle->recycle_packets_lock);
+	INIT_LIST_HEAD(&handle->recycle_packets);
+
+	handle->reset_status = 0;
+
+	INIT_WORK(&handle->recycle_packets_work, packet_recycler, handle);
+
+	INIT_WORK(&handle->set_rx_mode_work, ndis_set_rx_mode_proc, dev);
+
+	INIT_LIST_HEAD(&handle->timers);
+
+	handle->rx_packet = &NdisMIndicateReceivePacket;
+	handle->send_complete = &NdisMSendComplete;
+	handle->send_resource_avail = &NdisMSendResourcesAvailable;
+	handle->status = &NdisMIndicateStatus;
+	handle->status_complete = &NdisMIndicateStatusComplete;
+	handle->query_complete = &NdisMQueryInformationComplete;
+	handle->set_complete = &NdisMSetInformationComplete;
+	handle->reset_complete = &NdisMResetComplete;
+	handle->eth_rx_indicate = &EthRxIndicateHandler;
+	handle->eth_rx_complete = &EthRxComplete;
+	handle->td_complete = &NdisMTransferDataComplete;
+
+	handle->map_count = 0;
+	handle->map_dma_addr = NULL;
+
+	handle->nick[0] = 0;
+
+	handle->pci_dev = pdev;
+
+	handle->hangcheck_interval = hangcheck_interval;
+	handle->scan_timestamp = 0;
+
+	memset(&handle->essid, 0, sizeof(handle->essid));
+	memset(&handle->encr_info, 0, sizeof(handle->encr_info));
+
+	handle->op_mode = IW_MODE_INFRA;
+
+	INIT_WORK(&handle->wrapper_worker, wrapper_worker_proc, handle);
+
+	res = pci_enable_device(pdev);
+	if(res)
+		goto out_enable;
+
+	res = pci_request_regions(pdev, driver->name);
+	if(res)
+		goto out_regions;
+
+	pci_set_power_state(pdev, 0);
+	pci_restore_state(pdev, NULL);
+
+	DBGTRACE1("%s", "Calling ndis init routine");
+	if(call_init(handle))
+	{
+		ERROR("%s", "Windows driver couldn't initialize the device");
+		res = -EINVAL;
+		goto out_start;
+	}
+
+	/* do we need to power up the card explicitly? */
+	handle->pm_state = NDIS_PM_STATE_D0;
+	set_int(handle, NDIS_OID_PNP_SET_POWER, handle->pm_state);
+	miniport = &handle->driver->miniport_char;
+	/* According NDIS, pnp_event_notify should be called whenever power
+	 * is set to D0
+	 * Only NDIS 5.1 drivers are required to supply this function; some
+	 * drivers don't seem to support it (at least Orinoco)
+	 */
+	/*
+	if (miniport->pnp_event_notify)
+	{
+		INFO("%s", "calling pnp_event_notify");
+		miniport->pnp_event_notify(handle, NDIS_PNP_PROFILE_CHANGED,
+					 &profile_inf, sizeof(profile_inf));
+	}
+	*/
+
+	/* SMC 2802W V2 cards need reset (any others need it too?) */
+	if (ent->vendor == 0x1260)
+		doreset(handle);
+
+	/* Wait a little to let card power up otherwise ifup might fail after
+	   boot */
+	set_current_state(TASK_INTERRUPTIBLE);
+	schedule_timeout(HZ);
+
+	if(setup_dev(handle->net_dev))
+	{
+		ERROR("%s", "Couldn't setup interface");
+		res = -EINVAL;
+		goto out_setup;
+	}
+	hangcheck_add(handle);
+	statcollector_add(handle);
+	ndiswrapper_procfs_add_iface(handle);
+	TRACEEXIT1(return 0);
+
+out_setup:
+	call_halt(handle);
+out_start:
+	pci_release_regions(pdev);
+out_regions:
+	pci_disable_device(pdev);
+out_enable:
+	free_netdev(dev);
+out_nodev:
+	TRACEEXIT1(return res);
+}
+
+/* Remove one PCI-card (adapter). */
+static void __devexit ndis_remove_one(struct pci_dev *pdev)
+{
+	struct ndis_handle *handle = pci_get_drvdata(pdev);
+	struct miniport_char *miniport = &handle->driver->miniport_char;
+
+	TRACEENTER1("%s", "");
+	ndiswrapper_procfs_remove_iface(handle);
+	statcollector_del(handle);
+	hangcheck_del(handle);
+
+	if (!netif_queue_stopped(handle->net_dev))
+	{
+		netif_stop_queue(handle->net_dev);
+		DBGTRACE1("%d, %p", handle->surprise_remove,
+			  miniport->pnp_event_notify);
+		if (handle->surprise_remove && miniport->pnp_event_notify)
+		{
+			miniport->pnp_event_notify(handle->adapter_ctx,
+						   NDIS_PNP_SURPRISE_REMOVED,
+						   NULL, 0);
+			DBGTRACE1("%s", "");
+		}
+	}
+
+	/* Make sure all queued packets have been pushed out from
+	 * xmit_bh before we call halt */
+	flush_scheduled_work();
+	netif_carrier_off(handle->net_dev);
+
+#ifndef DEBUG_CRASH_ON_INIT
+	set_int(handle, NDIS_OID_DISASSOCIATE, 0);
+	call_halt(handle);
+
+	free_timers(handle);
+	free_handle_ctx(handle);
+
+	if (handle->net_dev)
+		unregister_netdev(handle->net_dev);
+
+	if (handle->multicast_list)
+		kfree(handle->multicast_list);
+	if (handle->net_dev)
+		free_netdev(handle->net_dev);
+#endif
+	pci_release_regions(pdev);
+	pci_disable_device(pdev);
+	pci_set_drvdata(pdev, NULL);
+}
+
+/* Register one ndis driver with pci subsystem. */
+static int start_driver(struct ndis_driver *driver)
+{
+	int res = 0;
+	int i;
+	struct ndis_device *device;
+
+	if(call_entry(driver))
+	{
+		ERROR("%s", "Driver entry returns error");
+		return -EINVAL;
+	}
+
+	DBGTRACE1("Nr devices: %d", driver->nr_devices);
+
+	driver->pci_idtable = kmalloc(sizeof(struct pci_device_id)*(driver->nr_devices+1), GFP_KERNEL);
+	if(!driver->pci_idtable)
+		return -ENOMEM;
+	memset(driver->pci_idtable, 0,
+	       sizeof(struct pci_device_id)*(driver->nr_devices+1));
+
+	device = (struct ndis_device*) driver->devices.next;
+	for(i = 0; i < driver->nr_devices; i++)
+	{
+		driver->pci_idtable[i].vendor = device->pci_vendor;
+		driver->pci_idtable[i].device = device->pci_device;
+		driver->pci_idtable[i].subvendor = device->pci_subvendor;
+		driver->pci_idtable[i].subdevice = device->pci_subdevice;
+		driver->pci_idtable[i].class = 0;
+		driver->pci_idtable[i].class_mask = 0;
+		driver->pci_idtable[i].driver_data = (unsigned long) device;
+
+		DBGTRACE1("Adding %04x:%04x:%04x:%04x to pci idtable",
+			  device->pci_vendor, device->pci_device,
+			  device->pci_subvendor, device->pci_subdevice);
+
+		device = (struct ndis_device*) device->list.next;
+	}
+
+	memset(&driver->pci_driver, 0, sizeof(driver->pci_driver));
+	driver->pci_driver.name = driver->name;
+	driver->pci_driver.id_table = driver->pci_idtable;
+	driver->pci_driver.probe = ndis_init_one;
+	driver->pci_driver.remove = __devexit_p(ndis_remove_one);
+	driver->pci_driver.suspend = ndis_suspend;
+	driver->pci_driver.resume = ndis_resume;
+#ifndef DEBUG_CRASH_ON_INIT
+	res = pci_module_init(&driver->pci_driver);
+	if(!res)
+		driver->pci_registered = 1;
+#endif
+	return res;
+}
+
+/* Load the driver from userspace. */
+static struct ndis_driver *load_driver(struct put_file *put_driver)
+{
+	void *entry;
+	struct ndis_driver *driver;
+	int namelen;
+
+	TRACEENTER1("Putting driver size %d", put_driver->size);
+
+	driver = kmalloc(sizeof(struct ndis_driver), GFP_KERNEL);
+	if(!driver)
+	{
+		ERROR("%s", "Unable to allocate memory");
+		goto out_nodriver;
+	}
+	memset(driver, 0, sizeof(struct ndis_driver));
+
+	INIT_LIST_HEAD(&driver->devices);
+	INIT_LIST_HEAD(&driver->files);
+
+	namelen = sizeof(put_driver->name);
+	if(sizeof(driver->name) < namelen)
+		namelen = sizeof(driver->name);
+
+	strncpy(driver->name, put_driver->name, namelen-1);
+	driver->name[namelen-1] = 0;
+
+	driver->image = vmalloc(put_driver->size);
+	DBGTRACE1("Image is at %08X", (int)driver->image);
+	if(!driver->image)
+	{
+		ERROR("%s", "Unable to allocate memory");
+		goto out_vmalloc;
+	}
+
+	if(copy_from_user(driver->image, put_driver->data, put_driver->size))
+	{
+		ERROR("%s", "Failed to copy from user");
+		goto out_baddriver;
+	}
+
+	if(prepare_coffpe_image(&entry, driver->image, put_driver->size))
+	{
+		ERROR("%s", "Unable to prepare driver");
+		goto out_baddriver;
+	}
+	driver->entry = entry;
+
+	TRACEEXIT1(return driver);
+
+out_baddriver:
+	vfree(driver->image);
+out_vmalloc:
+	kfree(driver);
+out_nodriver:
+	TRACEEXIT1(return 0);
+}
+
+/*
+ * Add driver to list of loaded driver but make sure this driver is
+ * not loaded before.
+ */
+static int add_driver(struct ndis_driver *driver)
+{
+	struct ndis_driver *tmp;
+	int dup = 0;
+
+	wrap_spin_lock(&driverlist_lock);
+	list_for_each_entry(tmp, &ndis_driverlist, list)
+	{
+		if(strcmp(tmp->name, driver->name) == 0)
+		{
+			dup = 1;
+			break;
+		}
+	}
+	if(!dup)
+		list_add(&driver->list, &ndis_driverlist);
+	wrap_spin_unlock(&driverlist_lock);
+	if(dup)
+	{
+		ERROR("%s", "Cannot add duplicate driver");
+		return -EBUSY;
+	}
+
+	printk(KERN_INFO "%s: driver %s added\n", DRV_NAME, driver->name);
+	return 0;
+}
+
+/* Load a file from userspace and put on list of files. */
+static int add_file(struct ndis_driver *driver, struct put_file *put_file)
+{
+	struct ndis_file *file;
+	int namelen;
+
+	TRACEENTER1("Putting file size %d", put_file->size);
+
+	file = kmalloc(sizeof(struct ndis_file), GFP_KERNEL);
+	if(!file)
+	{
+		ERROR("%s", "Unable to allocate memory");
+		goto err;
+	}
+	memset(file, 0, sizeof(struct ndis_file));
+
+	namelen = sizeof(put_file->name);
+	if(sizeof(file->name) < namelen)
+		namelen = sizeof(file->name);
+
+	strncpy(file->name, put_file->name, namelen-1);
+	file->name[namelen-1] = 0;
+	file->size = put_file->size;
+
+	file->data = vmalloc(put_file->size);
+	if(!file->data)
+	{
+		ERROR("%s", "Unable to allocate memory");
+		goto err;
+	}
+
+	if(copy_from_user(file->data, put_file->data, put_file->size))
+	{
+		ERROR("%s", "Failed to copy from user");
+		goto err;
+	}
+
+	list_add(&file->list, &driver->files);
+
+	TRACEEXIT1(return 0);
+err:
+	if(file)
+	{
+		if(file->data)
+			vfree(file->data);
+		kfree(file);
+	}
+	TRACEEXIT1(return -ENOMEM);
+}
+
+/* Add a new device to a driver. */
+static struct ndis_device *add_device(struct ndis_driver *driver,
+				      struct put_device *put_device)
+{
+	struct ndis_device *device;
+	if (!(device = kmalloc(sizeof(*device), GFP_KERNEL)))
+		return NULL;
+
+	memset(device, 0, sizeof(*device));
+	INIT_LIST_HEAD(&device->settings);
+
+	device->pci_vendor = put_device->pci_vendor;
+	device->pci_device = put_device->pci_device;
+	device->pci_subvendor = put_device->pci_subvendor;
+	device->pci_subdevice = put_device->pci_subdevice;
+	device->fuzzy = put_device->fuzzy;
+
+	DBGTRACE1("%04x:%04x:%04x:%04x %d", device->pci_vendor,
+		  device->pci_device, device->pci_subvendor,
+		  device->pci_subdevice, device->fuzzy);
+
+	if(put_device->pci_subvendor == -1)
+	{
+		device->pci_subvendor = PCI_ANY_ID;
+		device->pci_subdevice = PCI_ANY_ID;
+		list_add_tail(&device->list, &driver->devices);
+	}
+	else
+	{
+		list_add(&device->list, &driver->devices);
+	}
+
+	return device;
+}
+
+/* Add setting to the list of settings for the device. */
+static int add_setting(struct ndis_device *device,
+		       struct put_setting *put_setting)
+{
+	struct ndis_setting *setting;
+
+	if (!(setting = kmalloc(sizeof(*setting), GFP_KERNEL)))
+		return -ENOMEM;
+
+	memset(setting, 0, sizeof(*setting));
+
+	if (!(setting->name = kmalloc(put_setting->name_len+1, GFP_KERNEL)))
+		goto setting_fail;
+
+	if (!(setting->val_str = kmalloc(put_setting->val_str_len+1,
+					 GFP_KERNEL)))
+		goto name_fail;
+
+	if(copy_from_user(setting->name, put_setting->name,
+			  put_setting->name_len))
+		goto val_str_fail;
+
+	setting->name[put_setting->name_len] = 0;
+
+	if(copy_from_user(setting->val_str, put_setting->value,
+			  put_setting->val_str_len))
+		goto val_str_fail;
+
+	setting->val_str[put_setting->val_str_len] = 0;
+	setting->value.type = NDIS_SETTING_NONE;
+
+	list_add(&setting->list, &device->settings);
+	return 0;
+
+val_str_fail:
+	kfree(setting->val_str);
+name_fail:
+	kfree(setting->name);
+setting_fail:
+	kfree(setting);
+	return -EINVAL;
+}
+
+/* Delete a device and all info about it. */
+static void delete_device(struct ndis_device *device)
+{
+	struct list_head *curr, *tmp2;
+
+	TRACEENTER1("%s", "");
+	list_for_each_safe(curr, tmp2, &device->settings)
+	{
+		struct ndis_setting *setting = (struct ndis_setting*) curr;
+		kfree(setting->name);
+		kfree(setting->val_str);
+		kfree(setting);
+	}
+	kfree(device);
+	TRACEEXIT1(return);
+}
+
+/* Delete a driver. This implies deleting all cards for the handle too. */
+static void unload_driver(struct ndis_driver *driver)
+{
+	struct list_head *curr, *tmp2;
+
+	if(driver->pci_registered)
+		pci_unregister_driver(&driver->pci_driver);
+#ifdef DEBUG_CRASH_ON_INIT
+	{
+		struct pci_dev *pdev = 0;
+		pdev = pci_find_device(driver->pci_idtable[0].vendor,
+				       driver->pci_idtable[0].device, pdev);
+		if(pdev)
+			ndis_remove_one(pdev);
+	}
+#endif
+	wrap_spin_lock(&driverlist_lock);
+	if(driver->list.next)
+		list_del(&driver->list);
+	wrap_spin_unlock(&driverlist_lock);
+
+	if(driver->image)
+		vfree(driver->image);
+
+	if(driver->pci_idtable)
+		kfree(driver->pci_idtable);
+
+	list_for_each_safe(curr, tmp2, &driver->files)
+	{
+		struct ndis_file *file = (struct ndis_file*) curr;
+		DBGTRACE1("Deleting file %s", file->name);
+		vfree(file->data);
+		kfree(file);
+	}
+
+	list_for_each_safe(curr, tmp2, &driver->devices)
+	{
+		struct ndis_device *device = (struct ndis_device*) curr;
+		delete_device(device);
+	}
+	kfree(driver);
+
+}
+
+/*
+ * Called when userspace closes the filehandle for the misc device.
+ * Check and remove any half-loaded drivers.
+ */
+static int misc_release(struct inode *inode, struct file *file)
+{
+	if(!file->private_data)
+		return 0;
+
+	TRACEENTER1("%s", "Removing partially loaded driver");
+	unload_driver((struct ndis_driver *)file->private_data);
+	file->private_data = 0;
+	TRACEEXIT1(return 0);
+}
+
+static int misc_ioctl(struct inode *inode, struct file *file,
+		      unsigned int cmd, unsigned long arg)
+{
+	struct put_file put_file;
+	struct put_device put_device;
+	int res = -1;
+	struct ndis_device *device = NULL;
+	struct ndis_driver *driver = (struct ndis_driver*) file->private_data;
+
+	if(driver)
+		device = driver->current_device;
+
+	switch(cmd) {
+	case NDIS_PUTDRIVER:
+		if(copy_from_user(&put_file, (void*)arg,
+				  sizeof(struct put_file)))
+			return -EINVAL;
+		else
+		{
+			driver = load_driver(&put_file);
+			if(!driver)
+				return -EINVAL;
+			file->private_data = driver;
+
+			return add_driver(driver);
+		}
+		break;
+	case NDIS_PUTFILE:
+		if (!driver)
+			return -EINVAL;
+		if(copy_from_user(&put_file, (void*)arg,
+				  sizeof(struct put_file)))
+			return -EINVAL;
+		else
+		{
+			return add_file(driver, &put_file);
+		}
+		break;
+
+	case NDIS_PUTDEVICE:
+		if (!driver)
+			return -EINVAL;
+
+		if(copy_from_user(&put_device, (void*)arg,
+				  sizeof(struct put_device)))
+			return -EINVAL;
+		else
+		{
+			if (!(device = add_device(driver, &put_device)))
+				return -EINVAL;
+			driver->current_device = device;
+			driver->nr_devices++;
+			device->driver = driver;
+		}
+		break;
+
+	case NDIS_STARTDRIVER:
+		if (!driver)
+			return -EINVAL;
+		else
+		{
+			res = start_driver(driver);
+#ifdef DEBUG_CRASH_ON_INIT
+			{
+				struct pci_dev *pdev = 0;
+				pdev = pci_find_device(driver->pci_idtable[0].vendor, driver->pci_idtable[0].device, pdev);
+				if (pdev)
+					ndis_init_one(pdev, &driver->pci_idtable[0]);
+			}
+#endif
+			file->private_data = NULL;
+
+			if (res)
+				unload_driver(driver);
+			return res;
+		}
+		break;
+	case NDIS_PUTSETTING:
+		if (!device)
+			return -EINVAL;
+		else
+		{
+			struct put_setting put_setting;
+			if (copy_from_user(&put_setting, (void*)arg,
+					  sizeof(struct put_setting)))
+				return -EINVAL;
+			return add_setting(device, &put_setting);
+		}
+		break;
+	default:
+		ERROR("Unknown ioctl %08X\n", cmd);
+		return -EINVAL;
+		break;
+	}
+
+	return 0;
+}
+
+static struct file_operations wrapper_fops = {
+	.owner          = THIS_MODULE,
+	.ioctl		= misc_ioctl,
+	.release	= misc_release
+};
+
+static struct miscdevice wrapper_misc = {
+	.name   = DRV_NAME,
+	.fops   = &wrapper_fops
+};
+
+static int __init wrapper_init(void)
+{
+	char *argv[] = {"loadndisdriver", "-a", 0};
+	char *env[] = {0};
+	int err;
+
+	printk(KERN_INFO "%s version %s loaded\n", DRV_NAME, DRV_VERSION);
+        if ( (err = misc_register(&wrapper_misc)) < 0 ) {
+                ERROR("misc_register failed (%d)", err);
+		return err;
+        }
+
+	init_ndis();
+	INIT_LIST_HEAD(&wrap_allocs);
+	INIT_LIST_HEAD(&handle_ctx_list);
+	wrap_spin_lock_init(&wrap_allocs_lock);
+	wrap_spin_lock_init(&driverlist_lock);
+	ndiswrapper_procfs_init();
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+	err = call_usermodehelper("/sbin/loadndisdriver", argv, env, 1);
+#else
+	err = call_usermodehelper("/sbin/loadndisdriver", argv, env);
+#endif
+
+	if (err)
+	{
+		ERROR("loadndiswrapper failed (%d)", err);
+		ndiswrapper_procfs_remove();
+		misc_deregister(&wrapper_misc);
+		return -ENOEXEC;
+	}
+	return 0;
+}
+
+static void __exit wrapper_exit(void)
+{
+	while(!list_empty(&ndis_driverlist))
+	{
+		struct ndis_driver *driver = (struct ndis_driver*) ndis_driverlist.next;
+		unload_driver(driver);
+	}
+
+	ndiswrapper_procfs_remove();
+	misc_deregister(&wrapper_misc);
+	wrap_kfree_all();
+}
+
+module_init(wrapper_init);
+module_exit(wrapper_exit);
+
+MODULE_LICENSE("GPL");
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/wrapper.h linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/wrapper.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/net/wireless/ndiswrapper/wrapper.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/net/wireless/ndiswrapper/wrapper.h	2004-09-05 15:48:55.000000000 +0200
@@ -0,0 +1,55 @@
+/*
+ *  Copyright (C) 2003-2004 Pontus Fuchs, Giridhar Pemmasani
+ *
+ *  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.
+ *
+ */
+#ifndef WRAPPER_H
+#define WRAPPER_H
+
+#include <linux/ioctl.h>
+
+#define DRIVERNAME_MAX 32
+
+struct put_file {
+	char name[DRIVERNAME_MAX];
+	size_t size;
+	void *data;
+};
+
+struct del_driver {
+	char name[DRIVERNAME_MAX];
+};
+
+struct put_device {
+	int pci_vendor;
+	int pci_device;
+	int pci_subvendor;
+	int pci_subdevice;
+	int fuzzy;
+};
+
+struct put_setting
+{
+	size_t name_len;
+	size_t val_str_len;
+	char *name;
+	char *value;
+};
+
+#define NDIS_PUTDRIVER     _IOWR('N', 0, struct put_file*)
+#define NDIS_PUTSETTING    _IOWR('N', 1, struct put_setting*)
+#define NDIS_STARTDRIVER   _IOWR('N', 2, int)
+#define NDIS_DELDRIVER     _IOWR('N', 4, struct del_driver*)
+#define NDIS_PUTDEVICE     _IOWR('N', 5, struct put_device*)
+#define NDIS_PUTFILE       _IOWR('N', 6, struct put_file*)
+#endif /* WRAPPER_H */
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/parport/Makefile linux-2.4.20-wolk4.16-fullkernel/drivers/parport/Makefile
--- linux-2.4.20-wolk4.15-fullkernel/drivers/parport/Makefile	2001-09-14 01:04:43.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/parport/Makefile	2004-09-05 16:05:53.000000000 +0200
@@ -22,8 +22,7 @@ endif
 
 obj-$(CONFIG_PARPORT)		+= parport.o
 obj-$(CONFIG_PARPORT_PC)	+= parport_pc.o
-obj-$(CONFIG_PARPORT_SERIAL)	+= parport_serial.o
-obj-$(CONFIG_PARPORT_PC_PCMCIA)+= parport_cs.o
+obj-$(CONFIG_PARPORT_PC_PCMCIA)	+= parport_cs.o
 obj-$(CONFIG_PARPORT_AMIGA)	+= parport_amiga.o
 obj-$(CONFIG_PARPORT_MFC3)	+= parport_mfc3.o
 obj-$(CONFIG_PARPORT_ATARI)	+= parport_atari.o
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/parport/parport_pc.c linux-2.4.20-wolk4.16-fullkernel/drivers/parport/parport_pc.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/parport/parport_pc.c	2002-11-29 00:53:14.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/parport/parport_pc.c	2004-09-05 16:05:53.000000000 +0200
@@ -2699,6 +2699,10 @@ enum parport_pc_pci_cards {
 	oxsemi_840,
 	aks_0100,
 	mobility_pp,
+	netmos_9705,
+	netmos_9805,
+	netmos_9815,
+	netmos_9855,
 };
 
 
@@ -2768,6 +2772,10 @@ static struct parport_pc_pci {
 	/* oxsemi_840 */		{ 1, { { 0, -1 }, } },
 	/* aks_0100 */			{ 1, { { 0, 1 }, } },
 	/* mobility_pp */		{ 1, { { 0, 1 }, } },
+	/* netmos_9705 */               { 1, { { 0, -1 }, } }, /* untested */
+	/* netmos_9805 */               { 1, { { 0, -1 }, } }, /* untested */
+	/* netmos_9815 */               { 2, { { 0, -1 }, { 2, -1 }, } }, /* untested */
+	/* netmos_9855 */               { 2, { { 0, -1 }, { 2, -1 }, } }, /* untested */
 };
 
 static struct pci_device_id parport_pc_pci_tbl[] __devinitdata = {
@@ -2836,6 +2844,15 @@ static struct pci_device_id parport_pc_p
 	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_840 },
 	{ PCI_VENDOR_ID_AKS, PCI_DEVICE_ID_AKS_ALADDINCARD,
 	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, aks_0100 },
+	/* NetMos communication controllers */
+	{ PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9705,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9705 },
+	{ PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9805,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9805 },
+	{ PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9815,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9815 },
+	{ PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9855,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9855 },
 	{ 0, } /* terminate list */
 };
 MODULE_DEVICE_TABLE(pci,parport_pc_pci_tbl);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/pci/pci.c linux-2.4.20-wolk4.16-fullkernel/drivers/pci/pci.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/pci/pci.c	2004-06-29 11:31:21.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/pci/pci.c	2004-09-05 16:06:21.000000000 +0200
@@ -1292,6 +1292,8 @@ struct pci_bus * __devinit pci_add_new_b
 	 * Allocate a new bus, and inherit stuff from the parent..
 	 */
 	child = pci_alloc_bus();
+	if (!child)
+		return NULL;
 
 	list_add_tail(&child->node, &parent->children);
 	child->self = dev;
@@ -1346,7 +1348,11 @@ static int __devinit pci_scan_bridge(str
 		 */
 		if (pass)
 			return max;
+
 		child = pci_add_new_bus(bus, dev, 0);
+		if (!child)
+			return max;
+
 		child->primary = buses & 0xFF;
 		child->secondary = (buses >> 8) & 0xFF;
 		child->subordinate = (buses >> 16) & 0xFF;
@@ -1371,6 +1377,9 @@ static int __devinit pci_scan_bridge(str
 		pci_write_config_word(dev, PCI_STATUS, 0xffff);
 
 		child = pci_add_new_bus(bus, dev, ++max);
+		if (!child)
+			return max;
+
 		buses = (buses & 0xff000000)
 		      | ((unsigned int)(child->primary)     <<  0)
 		      | ((unsigned int)(child->secondary)   <<  8)
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/pci/pci.ids linux-2.4.20-wolk4.16-fullkernel/drivers/pci/pci.ids
--- linux-2.4.20-wolk4.15-fullkernel/drivers/pci/pci.ids	2004-06-29 11:30:51.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/pci/pci.ids	2004-09-05 16:05:15.000000000 +0200
@@ -3405,6 +3405,7 @@
 11aa  Actel
 11ab  Galileo Technology Ltd.
 	0146  GT-64010
+	4146  GT-64011/GT-64111 System Controller
 	4320  Gigabit Ethernet Adapter
 		1019 0f38  Marvell 88E8001 Gigabit LOM Ethernet Adapter (ECS)
 		1019 8001  Marvell 88E8001 Gigabit LOM Ethernet Adapter (ECS)
@@ -3422,13 +3423,7 @@
 		15d4 0047  Marvell 88E8001 Gigabit LOM Ethernet Adapter (Iwill)
 		1695 9025  Marvell 88E8001 Gigabit LOM Ethernet Adapter (Epox)
 		17f2 1c03  Marvell 88E8001 Gigabit LOM Ethernet Adapter (Albatron)
-	4360  Gigabit Ethernet Adapter
-		11ab 5221  Marvell RDK-8052 Adapter
-	4361  Gigabit Ethernet Adapter
-		11ab 5021  Marvell 88E8050 Gigabit LOM Ethernet Adapter (Intel)
 	4801  GT-48001
-	5005  Belkin
-		1799 5005  Belkin Gigabit Desktop Card 10/100/1000Base-T Adapter, Copper RJ-45
 	f003  GT-64010 Primary Image Piranha Image Generator
 11ac  Canon Information Systems Research Aust.
 11ad  Lite-On Communications Inc
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/pci/proc.c linux-2.4.20-wolk4.16-fullkernel/drivers/pci/proc.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/pci/proc.c	2004-06-29 11:24:39.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/pci/proc.c	2004-09-05 16:06:00.000000000 +0200
@@ -47,7 +47,8 @@ proc_bus_pci_read(struct file *file, cha
 	const struct inode *ino = file->f_dentry->d_inode;
 	const struct proc_dir_entry *dp = ino->u.generic_ip;
 	struct pci_dev *dev = dp->data;
-	unsigned int pos = *ppos;
+	loff_t n = *ppos;
+	unsigned pos = n;
 	unsigned int cnt, size;
 
 	/*
@@ -63,7 +64,7 @@ proc_bus_pci_read(struct file *file, cha
 	else
 		size = 64;
 
-	if (pos >= size)
+	if (pos != n || pos >= size)
 		return 0;
 	if (nbytes >= size)
 		nbytes = size;
@@ -129,10 +130,11 @@ proc_bus_pci_write(struct file *file, co
 	const struct inode *ino = file->f_dentry->d_inode;
 	const struct proc_dir_entry *dp = ino->u.generic_ip;
 	struct pci_dev *dev = dp->data;
-	int pos = *ppos;
+	loff_t n = *ppos;
+	unsigned pos = n;
 	int cnt;
 
-	if (pos >= PCI_CFG_SPACE_SIZE)
+	if (pos != n || pos >= PCI_CFG_SPACE_SIZE)
 		return 0;
 	if (nbytes >= PCI_CFG_SPACE_SIZE)
 		nbytes = PCI_CFG_SPACE_SIZE;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/pnp/isapnp_proc.c linux-2.4.20-wolk4.16-fullkernel/drivers/pnp/isapnp_proc.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/pnp/isapnp_proc.c	2002-11-29 00:53:14.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/pnp/isapnp_proc.c	2004-09-05 16:06:00.000000000 +0200
@@ -102,6 +102,7 @@ static ssize_t isapnp_info_entry_read(st
 				      size_t count, loff_t * offset)
 {
 	isapnp_info_buffer_t *buf;
+	loff_t pos = *offset;
 	long size = 0, size1;
 	int mode;
 
@@ -111,15 +112,15 @@ static ssize_t isapnp_info_entry_read(st
 	buf = (isapnp_info_buffer_t *) file->private_data;
 	if (!buf)
 		return -EIO;
-	if (file->f_pos >= buf->size)
+	if (pos != (unsigned) pos || pos >= buf->size)
 		return 0;
 	size = buf->size < count ? buf->size : count;
-	size1 = buf->size - file->f_pos;
+	size1 = buf->size - pos;
 	if (size1 < size)
 		size = size1;
-	if (copy_to_user(buffer, buf->buffer + file->f_pos, size))
+	if (copy_to_user(buffer, buf->buffer + pos, size))
 		return -EFAULT;
-	file->f_pos += size;
+	*offset = pos + size;
 	return size;
 }
 
@@ -128,6 +129,7 @@ static ssize_t isapnp_info_entry_write(s
 {
 	isapnp_info_buffer_t *buf;
 	long size = 0, size1;
+	loff_t pos = *offset;
 	int mode;
 
 	mode = file->f_flags & O_ACCMODE;
@@ -136,19 +138,19 @@ static ssize_t isapnp_info_entry_write(s
 	buf = (isapnp_info_buffer_t *) file->private_data;
 	if (!buf)
 		return -EIO;
-	if (file->f_pos < 0)
+	if (pos < 0)
 		return -EINVAL;
-	if (file->f_pos >= buf->len)
+	if (pos >= buf->len)
 		return -ENOMEM;
 	size = buf->len < count ? buf->len : count;
-	size1 = buf->len - file->f_pos;
+	size1 = buf->len - pos;
 	if (size1 < size)
 		size = size1;
-	if (copy_from_user(buf->buffer + file->f_pos, buffer, size))
+	if (copy_from_user(buf->buffer + pos, buffer, size))
 		return -EFAULT;
-	if (buf->size < file->f_pos + size)
-		buf->size = file->f_pos + size;
-	file->f_pos += size;
+	if (buf->size < pos + size)
+		buf->size = pos + size;
+	*offset = pos + size;
 	return size;
 }
 
@@ -240,14 +242,15 @@ static ssize_t isapnp_proc_bus_read(stru
 	struct inode *ino = file->f_dentry->d_inode;
 	struct proc_dir_entry *dp = ino->u.generic_ip;
 	struct pci_dev *dev = dp->data;
-	int pos = *ppos;
+	loff_t n = *ppos;
+	unsigned pos = n;
 	int cnt, size = 256;
 
-	if (pos >= size)
+	if (pos != n || pos >= size)
 		return 0;
 	if (nbytes >= size)
 		nbytes = size;
-	if (pos + nbytes > size)
+	if (nbytes > size - pos)
 		nbytes = size - pos;
 	cnt = nbytes;
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/sbus/char/flash.c linux-2.4.20-wolk4.16-fullkernel/drivers/sbus/char/flash.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/sbus/char/flash.c	2001-10-11 08:42:47.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/sbus/char/flash.c	2004-09-05 16:06:00.000000000 +0200
@@ -105,9 +105,15 @@ static ssize_t
 flash_read(struct file * file, char * buf,
 	   size_t count, loff_t *ppos)
 {
-	unsigned long p = file->f_pos;
+	loff_t p = *ppos;
 	int i;
 	
+	if (p > flash.read_size)
+		return 0;
+
+	if (p < 0)
+		return -EINVAL;
+
 	if (count > flash.read_size - p)
 		count = flash.read_size - p;
 
@@ -118,7 +124,7 @@ flash_read(struct file * file, char * bu
 		buf++;
 	}
 
-	file->f_pos += count;
+	*ppos = p + count;
 	return count;
 }
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/3w-9xxx.c linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/3w-9xxx.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/3w-9xxx.c	2004-06-29 11:24:52.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/3w-9xxx.c	2004-09-05 15:48:40.000000000 +0200
@@ -1,9 +1,9 @@
 /*
    3w-9xxx.c -- 3ware 9000 Storage Controller device driver for Linux.
 
-   Written By: Adam Radford <linux@3ware.com>
+   Written By: Adam Radford <linuxraid@amcc.com>
 
-   Copyright (C) 2002-2004 3ware Inc.
+   Copyright (C) 2004 Applied Micro Circuits Corporation.
 
    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
@@ -39,21 +39,28 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
    Bugs/Comments/Suggestions should be mailed to:
-   linux@3ware.com
+   linuxraid@amcc.com
 
    For more information, goto:
-   http://www.3ware.com
+   http://www.amcc.com
 
    Note: This version of the driver contains a bundled firmware image.
 
    History
    -------
    2.24.00.006fw - Initial release.
+   2.24.00.007fw - Bundled fw v2.02.00.009.
+   2.24.00.008fw - Remove TW_WRITEL macro, replace with writeq().
+                   Bundled fw v2.02.00.011.
+   2.24.00.009fw - Skip lun and channel probes.
+   2.24.00.010fw - Fix bug in attention/command interrupt handling.
+   2.24.00.011fw - Bundled fw v2.02.00.012.
+                   Add new controller error strings.
 */
 
 #include <linux/module.h>
 
-MODULE_AUTHOR ("3ware Inc.");
+MODULE_AUTHOR ("AMCC");
 #ifdef CONFIG_SMP
 MODULE_DESCRIPTION ("3ware 9000 Storage Controller Linux Driver (SMP)");
 #else
@@ -102,7 +109,7 @@ static struct file_operations twa_fops =
 };
 
 /* Globals */
-char *twa_driver_version="2.24.00.006fw";
+char *twa_driver_version="2.24.00.011fw";
 TW_Device_Extension *twa_device_extension_list[TW_MAX_SLOT];
 unsigned int twa_device_extension_count = 0;
 static int twa_major = -1;
@@ -163,7 +170,6 @@ static int twa_aen_complete(TW_Device_Ex
 out2:
 	tw_dev->state[request_id] = TW_S_COMPLETED;
 	twa_free_request_id(tw_dev, request_id);
-        TW_CLEAR_ATTENTION_INTERRUPT(tw_dev);
 	clear_bit(TW_IN_ATTENTION_LOOP, &tw_dev->flags);
 out:
 	return retval;
@@ -1236,6 +1242,7 @@ static void twa_interrupt(int irq, void 
 
 		/* Handle attention interrupt */
 		if (status_reg_value & TW_STATUS_ATTENTION_INTERRUPT) {
+			TW_CLEAR_ATTENTION_INTERRUPT(tw_dev);
 			if (!(test_and_set_bit(TW_IN_ATTENTION_LOOP, &tw_dev->flags))) {
 				twa_get_request_id(tw_dev, &request_id);
 
@@ -1243,14 +1250,14 @@ static void twa_interrupt(int irq, void 
 				if (error) {
 					tw_dev->state[request_id] = TW_S_COMPLETED;
 					twa_free_request_id(tw_dev, request_id);
-					TW_CLEAR_ATTENTION_INTERRUPT(tw_dev);
 					clear_bit(TW_IN_ATTENTION_LOOP, &tw_dev->flags);
 				}
 			}
 		}
 
 		/* Handle command interrupt */
-		if ((status_reg_value & TW_STATUS_COMMAND_INTERRUPT) || !(status_reg_value & TW_STATUS_COMMAND_QUEUE_FULL)) {
+		if (status_reg_value & TW_STATUS_COMMAND_INTERRUPT) {
+			TW_MASK_COMMAND_INTERRUPT(tw_dev);
 			/* Drain as many pending commands as we can */
 			while (tw_dev->pending_request_count > 0) {
 				request_id = tw_dev->pending_queue[tw_dev->pending_head];
@@ -1267,9 +1274,6 @@ static void twa_interrupt(int irq, void 
 					break;
 				}
 			}
-			/* If there are no more pending requests, we mask command interrupt */
-			if (tw_dev->pending_request_count == 0)
-				TW_MASK_COMMAND_INTERRUPT(tw_dev);
 		}
 
 		/* Handle response interrupt */
@@ -1558,7 +1562,7 @@ static int twa_post_command_packet(TW_De
 	} else {
 		/* We successfully posted the command packet */
 #if BITS_PER_LONG > 32
-		TW_WRITEL(TW_COMMAND_OFFSET + command_que_value, TW_COMMAND_QUEUE_REG_ADDR(tw_dev));
+		writeq(TW_COMMAND_OFFSET + command_que_value, TW_COMMAND_QUEUE_REG_ADDR(tw_dev));
 #else
 		writel(TW_COMMAND_OFFSET + command_que_value, TW_COMMAND_QUEUE_REG_ADDR(tw_dev));
 #endif
@@ -1974,6 +1978,13 @@ static int twa_scsi_queue(Scsi_Cmnd *SCp
 
 	spin_lock(&tw_dev->tw_lock);
 
+	/* Skip lun and channel probes */
+	if ((SCpnt->lun != 0) || (SCpnt->channel != 0)) {
+		SCpnt->result = (DID_BAD_TARGET << 16);
+		done(SCpnt);
+		goto out;
+	}
+
 	/* Save done function into Scsi_Cmnd struct */
 	SCpnt->scsi_done = done;
 
@@ -1992,6 +2003,7 @@ static int twa_scsi_queue(Scsi_Cmnd *SCp
 		SCpnt->result = (DID_ERROR << 16);
 		done(SCpnt);
 	}
+out:
 	spin_unlock(&tw_dev->tw_lock);
 
 	return 0;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/3w-9xxx.h linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/3w-9xxx.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/3w-9xxx.h	2004-06-29 11:24:52.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/3w-9xxx.h	2004-09-05 15:48:40.000000000 +0200
@@ -1,9 +1,9 @@
 /*
    3w-9xxx.h -- 3ware 9000 Storage Controller device driver for Linux.
 
-   Written By: Adam Radford <linux@3ware.com>
+   Written By: Adam Radford <linuxraid@amcc.com>
 
-   Copyright (C) 2002-2004 3ware Inc.
+   Copyright (C) 2004 Applied Micro Circuits Corporation.
 
    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
@@ -39,10 +39,10 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
    Bugs/Comments/Suggestions should be mailed to:
-   linux@3ware.com
+   linuxraid@amcc.com
 
    For more information, goto:
-   http://www.3ware.com
+   http://www.amcc.com
 */
 
 #ifndef _3W_9XXX_H
@@ -204,6 +204,8 @@ static twa_message_type twa_error_table[
 	{0x01C7, "Flash file size error"},
 	{0x01C8, "Bad flash file checksum"},
 	{0x01CA, "Corrupt flash file system detected"},
+	{0x01CD, "Flash Write cycle Failed"},
+	{0x01CE, "Flash Erase cycle Failed"},
 	{0x01D0, "Invalid field in parameter list"},
 	{0x01D1, "Parameter list length error"},
 	{0x01D2, "Parameter item is not changeable"},
@@ -252,6 +254,7 @@ static twa_message_type twa_error_table[
 	{0x025A, "Invalid configuration specified in CreateUnit descriptor"},
 	{0x025B, "Invalid LBA offset specified in CreateUnit descriptor"},
 	{0x025C, "Invalid stripelet size specified in CreateUnit descriptor"},
+	{0x025D, "JBOD unit is not allowed"},
 	{0x0260, "SMART attribute exceeded threshold"},
 	{0xFFFFFFFF, (char*) 0}
 };
@@ -332,7 +335,7 @@ static twa_message_type twa_error_table[
 /* Compatibility defines */
 #define TW_9000_ARCH_ID 0x5
 #define TW_CURRENT_FW_SRL 24
-#define TW_CURRENT_FW_BUILD 9
+#define TW_CURRENT_FW_BUILD 13
 #define TW_CURRENT_FW_BRANCH 1
 
 /* Misc defines */
@@ -457,7 +460,6 @@ static twa_message_type twa_error_table[
 			TW_CONTROL_MASK_RESPONSE_INTERRUPT | \
 			TW_CONTROL_CLEAR_ERROR_STATUS | \
 			TW_CONTROL_DISABLE_INTERRUPTS, TW_CONTROL_REG_ADDR(x)))
-#define TW_WRITEL(b,addr) (*(volatile unsigned long *) __io_virt(addr) = (b))
 #define TW_PRINTK(h,a,b,c) { \
 if (h) \
 printk(KERN_WARNING "3w-9xxx: scsi%d: ERROR: (0x%02X:0x%04X): %s.\n",h->host_no,a,b,c); \
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/3w-9xxx_fw.h linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/3w-9xxx_fw.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/3w-9xxx_fw.h	2004-06-29 11:24:53.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/3w-9xxx_fw.h	2004-09-05 15:48:41.000000000 +0200
@@ -1,45 +1,8 @@
 /*
    3w-9xxx_fw.h -- 3ware 9000 Storage Controller firmware.
 
-   Copyright (C) 2002-2004 3ware Inc.
-   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; version 2 of the License.
-
-   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.
-
-   NO WARRANTY
-   THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR
-   CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT
-   LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is
-   solely responsible for determining the appropriateness of using and
-   distributing the Program and assumes all risks associated with its
-   exercise of rights under this Agreement, including but not limited to
-   the risks and costs of program errors, damage to or loss of data,
-   programs or equipment, and unavailability or interruption of operations.
-
-   DISCLAIMER OF LIABILITY
-   NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY
-   DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-   DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND
-   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-   TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-   USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-   HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES
-
-   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  02111-1307  USA
+   Copyright (C) 2004 Applied Micro Circuits Corporation.
 
-   Bugs/Comments/Suggestions should be mailed to:
-   linux@3ware.com
-
-   For more information, goto:
-   http://www.3ware.com
    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; version 2 of the License.
@@ -74,50 +37,50 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
    Bugs/Comments/Suggestions should be mailed to:
-   linux@3ware.com
+   linuxraid@amcc.com
 
    For more information, goto:
-   http://www.3ware.com
+   http://www.amcc.com
 */
 
 #ifndef _3W_9XXX_FW_H
 #define _3W_9XXX_FW_H
 
-#define TW_FW_VERSION "2.02.00.008"
+#define TW_FW_VERSION "2.02.00.012"
 
 unsigned char tw_fw_code[] __initdata = {
-1,0,208,0,196,66,7,0,51,71,250,136,5,0,0,0,
+1,0,208,0,220,79,7,0,62,244,110,236,5,0,0,0,
 8,8,8,8,8,8,8,8,8,8,8,8,8,8,51,119,
 97,114,101,32,69,115,99,97,108,97,100,101,32,70,105,114,
 109,119,97,114,101,32,73,109,97,103,101,32,40,67,41,32,
 50,48,48,51,45,50,48,48,52,32,51,119,97,114,101,32,
 73,110,99,46,13,10,66,117,105,108,116,32,98,121,32,70,
 108,97,115,104,73,109,97,103,101,67,111,109,112,111,115,101,
-114,32,49,46,48,51,32,111,110,32,70,114,105,32,77,97,
-114,32,49,57,32,49,50,58,52,52,58,52,48,32,50,48,
+114,32,49,46,48,51,32,111,110,32,87,101,100,32,74,117,
+110,32,48,57,32,49,54,58,53,53,58,49,54,32,50,48,
 48,52,10,13,10,72,101,97,100,101,114,32,82,101,118,105,
 115,105,111,110,32,48,49,13,10,70,69,57,88,32,50,46,
-48,50,46,48,48,46,48,48,56,13,10,66,69,57,88,32,
+48,50,46,48,48,46,48,49,50,13,10,66,69,57,88,32,
 50,46,48,50,46,48,49,46,48,51,55,13,10,26,0,0,
 3,30,200,255,99,39,53,0,99,167,49,0,99,175,45,0,
 99,183,41,0,99,191,37,0,99,199,33,0,99,207,29,0,
 99,215,25,0,99,255,21,0,99,223,17,0,99,231,13,0,
 99,239,9,0,128,255,4,0,31,232,93,38,1,0,36,38,
-24,90,4,38,0,64,4,38,0,64,93,54,0,0,38,54,
-176,0,102,31,1,0,93,30,1,0,35,30,20,90,93,54,
-0,0,38,54,144,0,28,10,64,14,128,0,1,14,80,58,
-162,5,1,240,93,86,0,0,42,86,228,54,234,167,32,0,
+244,91,4,38,0,64,4,38,0,64,93,54,0,0,38,54,
+176,0,102,31,1,0,93,30,1,0,35,30,240,91,93,54,
+0,0,38,54,144,0,28,10,64,14,128,0,1,14,44,60,
+162,5,1,240,93,86,0,0,42,86,224,56,234,167,32,0,
 128,255,124,0,93,54,0,0,38,54,176,0,38,31,1,0,
 35,255,21,0,35,239,9,0,35,231,13,0,35,223,17,0,
 35,215,25,0,35,207,29,0,35,199,33,0,35,191,37,0,
 35,183,41,0,35,175,45,0,35,167,49,0,35,39,53,0,
 3,30,56,0,127,0,0,0,1,0,0,0,0,0,0,0,
-80,58,128,0,0,0,0,0,0,0,0,0,0,0,0,0,
+44,60,128,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,70,108,97,115,
 104,32,85,112,100,97,116,101,114,0,20,0,138,7,225,255,
-128,239,4,0,6,16,93,78,0,0,41,78,14,48,93,214,
-0,0,58,214,200,46,93,206,0,0,57,206,126,46,93,174,
-0,0,53,174,28,56,0,226,26,160,99,79,1,0,34,143,
+128,239,4,0,6,16,93,78,0,0,41,78,10,50,93,214,
+0,0,58,214,196,48,93,206,0,0,57,206,122,48,93,174,
+0,0,53,174,24,58,0,226,26,160,99,79,1,0,34,143,
 1,0,97,138,234,29,2,134,4,0,48,223,1,0,2,126,
 8,0,47,199,1,0,2,118,12,0,46,191,1,0,2,110,
 16,0,45,255,1,0,2,102,20,0,44,183,1,0,2,94,
@@ -134,32 +97,32 @@ unsigned char tw_fw_code[] __initdata = 
 93,118,128,255,46,118,252,254,14,120,187,121,113,127,1,0,
 35,102,4,0,12,110,8,0,68,86,254,255,42,86,0,96,
 10,88,184,89,109,95,1,0,35,134,4,0,16,142,12,0,
-68,118,126,255,46,118,176,37,14,120,183,121,113,127,1,0,
-93,110,0,0,45,110,28,56,28,216,205,217,93,102,0,0,
-44,102,52,56,28,192,204,193,181,29,68,218,27,94,252,255,
+68,118,126,255,46,118,212,35,14,120,183,121,113,127,1,0,
+93,110,0,0,45,110,24,58,28,216,205,217,93,102,0,0,
+44,102,48,58,28,192,204,193,181,29,68,218,27,94,252,255,
 35,142,4,0,17,86,12,0,42,23,1,0,43,135,1,0,
 208,17,59,87,1,0,68,218,59,95,1,0,68,218,2,48,
 10,56,11,64,93,254,0,0,63,254,138,1,122,0,248,217,
-218,229,93,126,0,0,47,126,52,56,28,216,207,217,93,118,
-0,0,46,118,52,56,28,208,206,209,93,110,0,0,45,110,
-52,56,28,192,205,193,181,45,250,217,137,13,35,94,4,0,
+218,229,93,126,0,0,47,126,48,58,28,216,207,217,93,118,
+0,0,46,118,48,58,28,208,206,209,93,110,0,0,45,110,
+48,58,28,192,205,193,181,45,250,217,137,13,35,94,4,0,
 11,102,12,0,44,23,1,0,245,5,35,142,4,0,17,86,
 4,0,42,23,1,0,59,135,1,0,208,17,68,218,68,218,
 27,126,252,255,35,110,4,0,13,118,4,0,46,87,1,0,
 47,103,1,0,204,81,59,95,1,0,68,218,2,48,10,56,
 11,64,93,254,0,0,63,254,8,2,121,0,248,217,218,213,
-93,198,0,0,56,198,62,47,93,94,0,0,43,94,52,56,
-28,216,203,217,93,86,0,0,42,86,52,56,28,208,202,209,
-93,142,0,0,49,142,52,56,28,200,209,201,181,45,250,217,
+93,198,0,0,56,198,58,49,93,94,0,0,43,94,48,58,
+28,216,203,217,93,86,0,0,42,86,48,58,28,208,202,209,
+93,142,0,0,49,142,48,58,28,200,209,201,181,45,250,217,
 137,13,35,126,4,0,15,134,12,0,48,23,1,0,245,5,
 35,110,4,0,13,118,4,0,46,23,1,0,59,103,1,0,
 204,17,68,218,68,218,27,94,252,255,35,142,4,0,17,86,
 4,0,42,87,1,0,43,135,1,0,208,81,59,95,1,0,
 68,218,2,48,10,56,11,64,93,254,0,0,63,254,142,2,
-120,0,249,217,218,213,93,126,0,0,47,126,52,56,28,16,
-207,17,93,118,0,0,46,118,20,57,28,64,206,65,93,110,
-0,0,45,110,20,57,28,56,205,57,226,65,162,77,35,94,
-4,0,11,102,12,0,68,142,126,255,49,142,176,37,44,135,
+120,0,249,217,218,213,93,126,0,0,47,126,48,58,28,16,
+207,17,93,118,0,0,46,118,244,58,28,64,206,65,93,110,
+0,0,45,110,244,58,28,56,205,57,226,65,162,77,35,94,
+4,0,11,102,12,0,68,142,126,255,49,142,212,35,44,135,
 1,0,17,80,176,81,170,65,197,61,65,58,7,126,255,255,
 15,55,0,0,198,118,48,0,14,104,164,106,13,88,194,90,
 11,96,35,142,4,0,12,80,209,81,42,87,1,0,68,18,
@@ -170,25 +133,25 @@ unsigned char tw_fw_code[] __initdata = 
 202,73,198,126,8,0,224,121,162,5,162,74,127,79,1,0,
 232,17,202,197,128,255,8,0,74,6,255,255,130,7,225,241,
 58,6,64,48,32,16,64,198,16,0,57,6,68,51,34,17,
-55,6,192,176,160,144,128,255,194,17,31,88,128,255,4,0,
+55,6,192,176,160,144,128,255,190,19,31,88,128,255,4,0,
 31,80,11,248,10,224,162,226,194,226,128,255,150,2,10,16,
 224,17,178,5,128,7,250,1,0,218,27,16,194,18,2,104,
 220,105,13,80,42,127,1,0,250,121,250,5,28,112,194,113,
 46,103,5,0,249,97,178,13,42,95,1,0,250,89,170,29,
 28,80,194,81,42,135,5,0,247,129,202,21,13,232,28,120,
-194,121,47,111,5,0,247,105,138,13,128,255,12,4,61,23,
+194,121,47,111,5,0,247,105,138,13,128,255,198,4,61,23,
 13,0,234,17,250,5,181,13,29,48,128,255,182,1,224,81,
 226,5,65,218,128,94,0,240,235,217,134,213,128,86,0,240,
 234,217,218,5,32,86,195,1,128,7,134,1,61,143,1,0,
-250,137,234,37,61,135,5,0,247,129,170,37,128,255,38,4,
-10,48,253,63,11,0,61,71,13,0,221,57,128,255,206,4,
+250,137,234,37,61,135,5,0,247,129,170,37,128,255,224,4,
+10,48,253,63,11,0,61,71,13,0,221,57,128,255,136,5,
 10,16,224,17,178,5,128,7,88,1,253,95,11,0,221,89,
 61,239,13,0,203,233,61,87,1,0,250,81,218,5,61,143,
 5,0,249,137,210,5,32,86,195,1,128,7,52,1,128,255,
-228,3,248,81,170,13,128,255,128,3,10,224,216,225,128,255,
-166,3,10,216,220,217,181,5,64,222,16,0,29,224,213,13,
+158,4,248,81,170,13,128,255,58,4,10,224,216,225,128,255,
+96,4,10,216,220,217,181,5,64,222,16,0,29,224,213,13,
 28,48,128,255,30,1,10,16,224,17,178,5,128,7,2,1,
-28,48,128,255,122,1,10,224,224,225,186,245,128,255,74,3,
+28,48,128,255,122,1,10,224,224,225,186,245,128,255,4,4,
 10,224,216,225,60,127,1,0,250,121,218,5,60,119,5,0,
 249,113,162,5,27,224,60,111,1,0,250,105,202,37,60,103,
 5,0,249,97,138,37,28,48,128,255,68,1,10,224,60,87,
@@ -196,842 +159,872 @@ unsigned char tw_fw_code[] __initdata = 
 49,6,136,119,102,85,241,129,202,13,60,127,21,0,224,121,
 226,5,28,48,128,255,24,1,10,224,229,5,0,226,197,5,
 0,226,165,5,0,226,27,48,61,71,13,0,29,56,128,255,
-236,3,10,16,224,17,202,61,61,111,21,0,224,105,242,53,
+166,4,10,16,224,17,202,61,61,111,21,0,224,105,242,53,
 61,95,13,0,29,48,129,90,193,90,203,217,128,255,224,0,
 10,232,224,225,178,21,187,225,125,231,21,0,61,127,13,0,
 61,119,21,0,239,113,185,5,125,7,21,0,29,48,128,255,
 68,0,61,111,21,0,106,111,21,0,27,48,61,71,13,0,
-29,56,128,255,152,3,10,16,224,17,170,21,128,255,122,2,
+29,56,128,255,82,4,10,16,224,17,170,21,128,255,52,3,
 10,232,216,233,61,95,5,0,249,89,154,13,31,82,99,87,
-1,0,29,48,3,56,4,66,128,255,114,3,0,82,66,6,
+1,0,29,48,3,56,4,66,128,255,44,4,0,82,66,6,
 255,241,38,87,13,0,230,135,11,0,198,81,176,81,127,0,
 128,7,97,0,6,232,191,255,236,255,10,16,61,135,1,0,
 49,6,64,48,32,16,241,129,178,13,61,119,1,0,47,6,
 128,112,96,80,239,113,194,5,32,86,200,1,229,29,34,103,
 1,0,45,6,64,48,32,16,237,97,178,13,34,87,1,0,
 43,6,128,112,96,80,235,81,194,5,32,86,200,1,213,13,
-29,48,2,56,253,71,11,0,128,255,102,35,224,81,194,5,
+29,48,2,56,253,71,11,0,128,255,98,37,224,81,194,5,
 32,86,200,1,165,5,0,82,64,6,127,0,38,143,21,0,
 224,137,210,5,38,87,21,0,198,81,165,5,0,82,127,0,
-128,7,225,0,128,239,4,0,0,50,128,255,58,3,100,87,
+128,7,225,0,128,239,4,0,0,50,128,255,244,3,100,87,
 13,128,36,23,13,128,34,23,17,0,93,254,0,0,34,127,
 16,0,63,254,44,0,36,55,13,128,15,112,34,111,21,0,
 206,49,109,0,10,224,224,225,210,5,36,55,13,128,128,255,
-22,14,224,225,226,29,0,50,128,255,196,6,100,87,13,128,
+18,16,224,225,226,29,0,50,128,255,248,7,100,87,13,128,
 36,23,13,128,34,23,17,0,93,254,0,0,34,135,16,0,
 63,254,106,0,36,55,13,128,16,120,34,119,21,0,207,49,
-110,0,10,224,224,225,210,5,36,55,13,128,128,255,216,13,
-224,225,186,5,128,255,10,0,28,80,64,6,255,0,128,7,
-225,112,128,239,4,0,36,23,13,128,34,23,17,0,93,254,
-0,0,34,127,24,0,63,254,34,0,36,55,13,128,15,112,
-34,111,29,0,206,49,109,0,36,23,13,128,10,224,34,23,
-17,0,93,254,0,0,34,87,56,0,63,254,70,0,36,55,
-13,128,10,136,34,135,61,0,209,49,112,0,234,225,250,109,
-36,231,13,128,60,231,17,0,36,223,13,128,93,254,0,0,
-59,223,17,0,63,254,124,0,60,103,24,0,27,222,40,0,
-36,55,13,128,12,88,60,87,29,0,203,49,28,230,24,0,
-106,0,59,135,0,0,10,224,36,55,13,128,16,120,207,49,
-59,119,5,0,93,254,0,0,63,254,152,0,110,0,36,223,
-13,128,10,200,59,223,17,0,220,201,36,231,13,128,60,231,
-17,0,93,254,0,0,36,215,13,128,63,254,218,0,58,215,
-17,0,28,230,40,0,59,143,24,0,26,214,48,0,36,55,
-13,128,17,128,59,127,29,0,208,49,27,222,24,0,111,0,
-60,111,0,0,10,216,36,55,13,128,13,96,204,49,60,95,
-5,0,93,254,0,0,63,254,246,0,107,0,10,224,58,143,
-0,0,219,225,36,55,13,128,17,128,208,49,58,127,5,0,
-93,254,0,0,63,254,20,1,111,0,25,48,220,81,10,62,
-8,0,128,255,236,0,100,87,17,128,181,5,100,231,17,128,
-64,6,255,112,127,0,128,7,97,0,128,239,4,0,36,23,
-13,128,34,23,17,0,93,254,0,0,34,127,40,0,63,254,
-34,0,36,55,13,128,15,112,34,111,45,0,206,49,109,0,
-64,6,127,0,128,7,97,0,128,239,4,0,36,23,13,128,
-34,23,17,0,93,254,0,0,34,127,48,0,63,254,34,0,
-36,55,13,128,15,112,34,111,53,0,206,49,109,0,64,6,
-127,0,128,7,97,0,128,239,4,0,36,23,13,128,34,23,
-17,0,93,254,0,0,34,127,56,0,63,254,34,0,36,55,
-13,128,15,112,34,111,61,0,206,49,109,0,64,6,127,0,
-12,0,128,7,97,0,6,232,61,135,1,0,49,6,64,48,
-32,16,241,129,178,13,61,119,1,0,47,6,128,112,96,80,
-239,113,194,5,32,86,202,1,133,21,29,48,128,255,184,0,
-29,48,10,56,253,71,11,0,128,255,182,32,224,81,194,5,
-32,86,202,1,165,5,0,82,64,6,127,0,128,7,128,7,
-225,16,7,216,6,232,149,21,61,135,1,0,49,6,64,48,
-32,16,241,129,154,13,29,224,28,48,191,255,152,255,224,81,
-186,5,28,80,213,5,68,234,251,233,241,237,0,82,64,6,
-255,16,52,0,154,7,24,0,140,7,128,7,225,112,128,239,
-4,0,6,216,7,208,8,200,229,87,64,0,224,7,96,1,
-36,23,13,128,10,224,34,23,17,0,27,56,34,127,8,0,
-26,64,36,55,13,128,15,112,206,49,25,72,34,111,13,0,
-93,254,0,0,63,254,56,0,109,0,10,216,252,47,32,0,
-27,80,64,6,255,112,128,7,128,7,140,7,152,7,128,7,
-128,7,38,143,38,87,13,0,230,135,11,0,198,81,176,81,
-127,0,24,0,128,7,33,0,6,16,224,17,138,13,32,54,
-36,0,128,255,34,11,10,16,224,17,226,45,68,142,0,0,
-49,142,24,139,98,143,17,0,68,134,0,0,48,134,164,139,
-98,135,17,0,64,126,16,0,98,127,5,0,32,118,0,64,
-98,119,13,0,64,110,16,0,98,111,1,0,34,103,1,0,
-12,102,170,10,98,103,21,0,34,95,1,0,11,94,84,5,
-98,95,25,0,34,87,1,0,98,87,29,0,34,143,1,0,
-66,138,98,143,33,0,2,80,64,6,63,0,38,23,1,0,
-2,80,127,0,38,23,5,0,2,80,127,0,38,23,13,0,
-2,80,127,0,68,134,0,0,48,134,88,139,16,142,4,0,
-68,110,0,0,45,110,88,139,13,118,8,0,46,127,1,0,
-49,103,1,0,204,121,15,88,202,90,11,16,2,80,127,0,
-38,23,1,0,2,80,127,0,128,7,193,16,6,232,0,226,
-229,87,64,0,224,7,96,1,10,216,61,143,21,0,32,134,
-170,0,113,135,0,0,61,127,25,0,32,118,85,0,111,119,
-0,0,61,111,21,0,32,102,144,0,109,103,0,0,61,95,
-1,0,235,87,1,0,202,142,255,0,17,128,208,130,61,127,
-33,0,239,119,1,0,14,224,16,225,61,111,21,0,32,102,
-240,0,109,103,0,0,251,47,32,0,43,6,91,34,1,0,
-235,225,186,5,0,18,229,13,42,6,186,34,1,0,234,225,
-250,5,64,142,8,0,125,143,5,0,0,18,181,5,32,22,
-192,1,2,80,64,6,223,16,128,7,225,247,6,216,7,200,
-8,184,9,192,59,143,1,0,241,201,161,13,24,128,217,129,
-59,127,5,0,59,119,1,0,206,121,239,129,195,5,32,22,
-193,1,165,125,64,54,1,0,128,255,112,9,10,16,2,208,
-26,168,224,209,202,5,32,22,21,1,229,109,0,18,59,231,
-1,0,0,18,229,21,2,96,194,98,12,104,68,86,0,0,
-42,86,88,139,13,88,202,89,43,239,1,0,29,136,202,138,
-17,232,29,128,220,129,240,201,129,13,29,120,207,225,65,18,
-2,112,14,6,180,255,137,237,2,176,133,77,22,96,194,98,
-12,104,68,86,0,0,42,86,88,139,13,88,202,89,43,239,
-1,0,29,136,202,138,17,232,27,48,28,56,26,64,29,72,
-128,255,24,1,25,16,188,17,25,80,229,13,2,128,213,129,
-65,186,23,126,255,255,15,119,0,0,80,119,0,0,95,194,
-65,202,65,82,65,18,29,104,220,105,237,81,161,5,181,5,
-224,193,218,237,27,48,28,56,128,255,52,1,27,48,28,56,
-26,64,29,72,128,255,56,0,27,48,28,56,26,64,29,72,
-128,255,236,0,224,81,242,5,26,48,128,255,186,8,32,22,
-194,1,165,13,29,96,204,225,65,178,224,193,138,189,26,48,
-128,255,164,8,0,18,2,80,64,6,255,247,128,7,193,240,
-6,216,7,232,8,224,9,192,58,6,240,255,31,0,229,87,
-64,0,224,7,96,1,10,200,0,18,149,53,253,143,1,0,
-252,135,1,0,240,137,202,5,66,234,66,226,245,37,59,127,
-21,0,32,118,170,0,111,119,0,0,59,111,25,0,32,102,
-85,0,109,103,0,0,59,95,21,0,32,86,160,0,107,87,
-0,0,66,234,29,142,254,255,66,226,28,134,254,255,240,127,
-1,0,113,127,0,0,250,119,1,0,206,110,64,0,250,103,
-1,0,204,94,64,0,235,105,250,245,65,18,24,80,191,82,
-10,136,159,138,24,128,209,129,16,120,161,122,239,17,241,197,
-249,47,32,0,64,6,223,240,0,18,133,13,231,143,1,0,
-104,143,0,0,66,58,66,66,65,18,9,120,191,122,159,122,
-9,104,207,105,161,106,237,17,161,245,127,0,0,18,213,13,
-232,143,1,0,66,66,231,135,1,0,66,58,240,137,194,5,
-32,86,194,1,181,13,65,18,9,112,191,114,159,114,9,96,
-206,97,161,98,236,17,214,237,0,82,127,0,34,6,240,255,
-31,0,38,143,21,0,32,134,170,0,113,135,0,0,38,127,
-25,0,32,118,85,0,111,119,0,0,38,111,21,0,32,102,
-128,0,109,103,0,0,38,95,21,0,32,86,170,0,107,87,
-0,0,38,143,25,0,32,134,85,0,113,135,0,0,32,126,
-48,0,103,127,0,0,226,119,1,0,206,110,64,0,226,103,
-1,0,204,94,64,0,235,105,250,245,127,0,128,7,97,0,
-6,232,224,233,138,13,32,54,36,0,128,255,90,7,10,232,
-224,233,162,45,29,48,191,255,30,252,68,142,0,0,49,142,
-228,139,125,143,17,0,64,134,16,0,125,135,5,0,32,126,
-0,64,125,127,13,0,125,135,1,0,61,111,1,0,128,102,
-170,170,204,105,125,111,21,0,61,95,1,0,11,94,84,85,
-125,95,25,0,61,87,1,0,125,87,29,0,61,143,1,0,
-66,138,125,143,33,0,29,80,64,6,127,0,128,7,225,0,
-6,248,229,87,64,0,224,7,96,1,10,224,252,47,32,0,
-63,143,21,0,32,134,170,0,113,135,0,0,63,127,25,0,
-32,118,85,0,111,119,0,0,63,111,21,0,32,102,144,0,
-109,103,0,0,63,87,1,0,42,87,0,0,31,48,202,142,
-255,0,63,239,33,0,208,138,253,239,1,0,17,233,128,255,
-26,0,44,6,91,0,32,0,236,233,186,5,0,82,181,5,
-32,86,192,1,64,6,255,0,128,7,33,0,38,143,21,0,
-32,134,240,0,113,135,0,0,12,50,128,255,126,5,64,6,
-63,0,38,135,128,7,38,23,1,0,2,80,127,0,38,23,
-5,0,2,80,127,0,38,23,13,0,2,80,127,0,34,6,
-0,192,23,0,2,80,127,0,128,7,225,16,6,232,0,226,
-229,87,64,0,224,7,96,1,10,216,61,143,21,0,128,134,
-170,170,113,135,0,0,61,127,25,0,32,118,85,85,111,119,
-0,0,61,111,21,0,128,102,144,144,109,103,0,0,32,54,
-32,78,128,255,22,5,61,95,1,0,235,87,1,0,10,136,
-208,138,61,135,29,0,240,127,1,0,15,224,17,225,61,119,
-21,0,128,110,170,170,110,111,0,0,61,103,25,0,32,94,
-85,85,108,95,0,0,61,87,21,0,128,142,240,240,106,143,
-0,0,32,54,32,78,128,255,210,4,251,47,32,0,48,6,
-186,186,31,31,240,225,186,5,0,18,181,5,32,22,192,1,
-2,80,64,6,255,16,190,7,225,241,3,30,124,254,6,232,
-7,224,8,216,9,208,35,142,0,0,64,134,0,64,17,200,
-16,201,61,127,1,0,239,225,161,13,26,112,220,113,61,111,
-5,0,61,103,1,0,204,105,237,113,195,5,32,22,193,1,
-133,101,28,88,61,87,1,0,11,136,170,137,17,16,61,135,
-9,0,240,23,194,2,2,184,149,85,61,127,1,0,15,112,
-23,104,61,103,9,0,13,88,236,95,34,2,11,96,12,192,
-206,193,29,48,24,56,25,64,128,255,32,1,0,18,24,72,
-149,37,252,73,218,29,224,209,178,29,2,80,217,81,65,218,
-27,142,255,255,17,135,0,0,74,135,0,0,95,210,65,226,
-224,209,226,13,2,126,1,0,15,112,217,113,65,218,27,110,
-255,255,13,103,0,0,78,103,0,0,95,210,65,226,66,74,
-68,18,61,87,9,0,10,88,129,90,11,128,193,130,16,136,
-17,120,216,121,239,73,225,213,29,48,24,56,25,64,128,255,
-44,0,29,48,24,56,25,64,128,255,248,0,10,16,224,17,
-194,5,32,22,194,1,213,5,65,186,224,209,250,173,0,18,
-2,80,3,30,132,1,126,6,255,241,128,7,225,48,6,224,
-7,216,8,248,60,135,5,0,16,136,129,138,17,232,59,233,
-229,87,64,0,224,7,96,1,10,208,60,127,21,0,128,118,
-170,170,111,119,0,0,60,111,25,0,32,102,85,85,109,103,
-0,0,60,95,21,0,128,86,160,160,107,87,0,0,0,18,
-229,21,66,218,27,142,254,255,66,250,31,134,254,255,240,127,
-1,0,113,127,0,0,66,234,29,118,254,255,66,250,31,110,
-254,255,237,103,1,0,110,103,0,0,65,18,60,87,9,0,
-10,88,129,90,235,17,225,229,32,54,32,78,128,255,44,3,
-250,47,32,0,64,6,255,48,38,135,5,0,16,136,129,138,
-17,16,39,17,0,74,229,21,66,66,8,126,254,255,66,58,
-7,118,254,255,238,111,1,0,111,111,0,0,66,66,8,102,
-254,255,66,18,2,94,254,255,235,87,1,0,108,87,0,0,
-65,74,38,135,9,0,16,136,129,138,241,73,225,229,127,0,
-38,135,5,0,16,136,129,138,17,16,39,17,0,74,133,37,
-66,66,8,126,254,255,239,119,1,0,66,58,7,110,254,255,
-237,103,1,0,236,113,194,5,32,22,194,1,149,29,66,66,
-8,94,254,255,235,87,1,0,66,18,2,142,254,255,241,135,
-1,0,240,81,194,5,32,22,194,1,165,13,65,74,9,120,
-38,111,9,0,13,112,129,114,238,121,177,221,0,18,2,80,
-127,0,38,23,1,0,2,80,127,0,38,23,5,0,2,80,
+110,0,10,224,224,225,210,5,36,55,13,128,128,255,212,15,
+224,225,226,29,0,50,128,255,42,8,100,87,13,128,36,23,
+13,128,34,23,17,0,93,254,0,0,34,143,16,0,63,254,
+168,0,36,55,13,128,17,128,34,127,21,0,208,49,111,0,
+10,224,224,225,210,5,36,55,13,128,128,255,150,15,224,225,
+226,29,0,50,128,255,90,8,100,87,13,128,36,23,13,128,
+34,23,17,0,93,254,0,0,34,87,16,0,63,254,230,0,
+36,55,13,128,10,136,34,135,21,0,209,49,112,0,10,224,
+224,225,210,5,36,55,13,128,128,255,88,15,224,225,226,29,
+0,50,128,255,138,8,100,87,13,128,36,23,13,128,34,23,
+17,0,93,254,0,0,34,95,16,0,63,254,36,1,36,55,
+13,128,11,80,34,143,21,0,202,49,113,0,10,224,224,225,
+210,5,36,55,13,128,128,255,26,15,224,225,186,5,128,255,
+10,0,28,80,64,6,255,0,128,7,225,112,128,239,4,0,
+36,23,13,128,34,23,17,0,93,254,0,0,34,127,24,0,
+63,254,34,0,36,55,13,128,15,112,34,111,29,0,206,49,
+109,0,36,23,13,128,10,224,34,23,17,0,93,254,0,0,
+34,87,56,0,63,254,70,0,36,55,13,128,10,136,34,135,
+61,0,209,49,112,0,234,225,250,109,36,231,13,128,60,231,
+17,0,36,223,13,128,93,254,0,0,59,223,17,0,63,254,
+124,0,60,103,24,0,27,222,40,0,36,55,13,128,12,88,
+60,87,29,0,203,49,28,230,24,0,106,0,59,135,0,0,
+10,224,36,55,13,128,16,120,207,49,59,119,5,0,93,254,
+0,0,63,254,152,0,110,0,36,223,13,128,10,200,59,223,
+17,0,220,201,36,231,13,128,60,231,17,0,93,254,0,0,
+36,215,13,128,63,254,218,0,58,215,17,0,28,230,40,0,
+59,143,24,0,26,214,48,0,36,55,13,128,17,128,59,127,
+29,0,208,49,27,222,24,0,111,0,60,111,0,0,10,216,
+36,55,13,128,13,96,204,49,60,95,5,0,93,254,0,0,
+63,254,246,0,107,0,10,224,58,143,0,0,219,225,36,55,
+13,128,17,128,208,49,58,127,5,0,93,254,0,0,63,254,
+20,1,111,0,25,48,220,81,10,62,8,0,128,255,236,0,
+100,87,17,128,181,5,100,231,17,128,64,6,255,112,127,0,
+128,7,97,0,128,239,4,0,36,23,13,128,34,23,17,0,
+93,254,0,0,34,127,40,0,63,254,34,0,36,55,13,128,
+15,112,34,111,45,0,206,49,109,0,64,6,127,0,128,7,
+97,0,128,239,4,0,36,23,13,128,34,23,17,0,93,254,
+0,0,34,127,48,0,63,254,34,0,36,55,13,128,15,112,
+34,111,53,0,206,49,109,0,64,6,127,0,128,7,97,0,
+128,239,4,0,36,23,13,128,34,23,17,0,93,254,0,0,
+34,127,56,0,63,254,34,0,36,55,13,128,15,112,34,111,
+61,0,206,49,109,0,64,6,127,0,12,0,128,7,97,0,
+6,232,61,135,1,0,49,6,64,48,32,16,241,129,178,13,
+61,119,1,0,47,6,128,112,96,80,239,113,194,5,32,86,
+202,1,133,21,29,48,128,255,184,0,29,48,10,56,253,71,
+11,0,128,255,248,33,224,81,194,5,32,86,202,1,165,5,
+0,82,64,6,127,0,128,7,128,7,225,16,7,216,6,232,
+149,21,61,135,1,0,49,6,64,48,32,16,241,129,154,13,
+29,224,28,48,191,255,152,255,224,81,186,5,28,80,213,5,
+68,234,251,233,241,237,0,82,64,6,255,16,52,0,154,7,
+24,0,140,7,128,7,225,112,128,239,4,0,6,216,7,208,
+8,200,229,87,64,0,224,7,96,1,36,23,13,128,10,224,
+34,23,17,0,27,56,34,127,8,0,26,64,36,55,13,128,
+15,112,206,49,25,72,34,111,13,0,93,254,0,0,63,254,
+56,0,109,0,10,216,252,47,32,0,27,80,64,6,255,112,
+128,7,128,7,140,7,152,7,128,7,128,7,38,143,38,87,
+13,0,230,135,11,0,198,81,176,81,127,0,24,0,128,7,
+33,0,6,16,224,17,138,13,32,54,40,0,128,255,100,12,
+10,16,224,17,178,53,68,142,0,0,49,142,24,139,98,143,
+17,0,68,134,0,0,48,134,164,139,98,135,17,0,64,126,
+16,0,98,127,5,0,32,118,0,64,98,119,13,0,64,110,
+16,0,98,111,1,0,34,103,1,0,12,102,170,10,98,103,
+21,0,34,95,1,0,11,94,84,5,98,95,25,0,34,87,
+1,0,98,87,29,0,34,143,1,0,66,138,98,143,33,0,
+48,6,91,34,1,0,98,135,37,0,2,80,64,6,63,0,
+38,23,1,0,2,80,127,0,38,23,5,0,2,80,127,0,
+38,23,13,0,2,80,127,0,68,134,0,0,48,134,88,139,
+16,142,4,0,68,110,0,0,45,110,88,139,13,118,8,0,
+46,127,1,0,49,103,1,0,204,121,15,88,202,90,11,16,
+2,80,127,0,38,23,1,0,2,80,127,0,128,7,193,16,
+6,232,0,226,229,87,64,0,224,7,96,1,10,216,61,143,
+21,0,32,134,170,0,113,135,0,0,61,127,25,0,32,118,
+85,0,111,119,0,0,61,111,21,0,32,102,144,0,109,103,
+0,0,61,95,29,0,235,87,1,0,202,142,255,0,17,128,
+208,130,61,127,33,0,239,119,1,0,14,224,16,225,61,111,
+21,0,32,102,240,0,109,103,0,0,251,47,32,0,61,95,
+37,0,235,225,186,5,0,18,181,5,32,22,192,1,2,80,
+64,6,223,16,128,7,225,255,6,200,7,192,8,176,9,184,
+0,218,57,143,1,0,241,193,161,13,23,128,216,129,57,127,
+5,0,57,119,1,0,206,121,239,129,211,5,32,22,193,1,
+128,7,30,1,64,54,1,0,128,255,188,10,10,16,2,208,
+26,160,224,209,218,5,32,22,21,1,128,7,4,1,0,18,
+57,231,1,0,0,18,229,21,2,96,194,98,12,104,68,86,
+0,0,42,86,88,139,13,88,202,89,43,239,1,0,29,136,
+202,138,17,232,29,128,220,129,240,193,129,13,29,120,207,225,
+65,18,2,112,14,6,180,255,137,237,2,168,181,93,21,96,
+194,98,12,104,68,86,0,0,42,86,88,139,13,88,202,89,
+43,239,1,0,29,136,202,138,17,232,25,48,28,56,26,64,
+29,72,128,255,108,1,24,16,188,17,24,80,229,13,2,128,
+212,129,65,178,22,126,255,255,15,119,0,0,80,119,0,0,
+95,186,65,194,65,82,65,18,29,104,220,105,237,81,161,5,
+181,5,224,185,218,237,25,48,28,56,128,255,136,1,10,216,
+27,16,224,17,226,5,26,48,128,255,24,10,27,16,133,45,
+25,48,28,56,26,64,29,72,128,255,76,0,10,216,27,16,
+224,17,226,5,26,48,128,255,250,9,27,16,149,29,25,48,
+28,56,26,64,29,72,128,255,28,1,10,216,27,16,224,17,
+226,5,26,48,128,255,220,9,27,16,165,13,29,96,204,225,
+65,170,224,185,218,165,26,48,128,255,200,9,27,16,2,80,
+64,6,255,255,128,7,193,240,6,208,7,232,8,224,9,192,
+59,6,240,255,31,0,229,87,64,0,224,7,96,1,10,16,
+2,200,0,74,213,69,253,143,1,0,252,135,1,0,240,137,
+202,5,66,234,66,226,181,61,58,127,21,0,32,118,170,0,
+111,119,0,0,58,111,25,0,32,102,85,0,109,103,0,0,
+58,95,21,0,32,86,160,0,107,87,0,0,66,234,29,142,
+254,255,66,226,28,134,254,255,240,127,1,0,113,127,0,0,
+251,23,1,0,251,127,1,0,194,118,32,0,224,113,130,21,
+251,23,1,0,251,127,1,0,2,104,205,102,64,0,15,88,
+203,86,64,0,234,97,194,5,32,22,205,1,229,21,2,136,
+209,134,64,0,207,118,64,0,238,129,186,229,65,74,24,104,
+191,106,13,96,159,98,24,88,204,89,11,80,161,82,234,73,
+177,181,249,47,32,0,0,18,2,80,64,6,223,240,0,18,
+133,13,231,143,1,0,104,143,0,0,66,58,66,66,65,18,
+9,120,191,122,159,122,9,104,207,105,161,106,237,17,161,245,
+127,0,0,18,213,13,232,143,1,0,66,66,231,135,1,0,
+66,58,240,137,194,5,32,86,194,1,181,13,65,18,9,112,
+191,114,159,114,9,96,206,97,161,98,236,17,214,237,0,82,
+127,0,34,6,240,255,31,0,38,143,21,0,32,134,170,0,
+113,135,0,0,38,127,25,0,32,118,85,0,111,119,0,0,
+38,111,21,0,32,102,128,0,109,103,0,0,38,95,21,0,
+32,86,170,0,107,87,0,0,38,143,25,0,32,134,85,0,
+113,135,0,0,32,126,48,0,103,127,0,0,226,127,1,0,
+226,79,1,0,207,118,32,0,224,113,130,21,226,127,1,0,
+226,79,1,0,15,104,205,102,64,0,9,88,203,86,64,0,
+234,97,194,5,32,22,206,1,165,13,15,136,209,134,64,0,
+9,120,207,118,64,0,238,129,170,229,0,18,2,80,127,0,
+128,7,97,0,6,232,224,233,138,13,32,54,40,0,128,255,
+34,8,10,232,224,233,146,45,29,48,191,255,164,251,64,142,
+16,0,125,143,5,0,32,134,0,64,125,135,13,0,125,143,
+1,0,61,119,1,0,128,110,170,170,205,113,125,119,21,0,
+61,103,1,0,12,102,84,85,125,103,25,0,61,95,1,0,
+125,95,29,0,61,87,1,0,66,82,125,87,33,0,49,6,
+91,0,32,0,125,143,37,0,29,80,64,6,127,0,128,7,
+128,7,97,0,6,232,224,233,138,13,32,54,40,0,128,255,
+178,7,10,232,224,233,146,45,29,48,191,255,52,251,64,142,
+16,0,125,143,5,0,32,134,0,64,125,135,13,0,125,143,
+1,0,61,119,1,0,128,110,170,170,205,113,125,119,21,0,
+61,103,1,0,12,102,84,85,125,103,25,0,61,95,1,0,
+125,95,29,0,61,87,1,0,66,82,125,87,33,0,49,6,
+91,34,32,0,125,143,37,0,29,80,64,6,127,0,128,7,
+97,0,6,232,224,233,138,13,32,54,40,0,128,255,68,7,
+10,232,224,233,146,45,29,48,191,255,198,250,64,142,16,0,
+125,143,5,0,32,134,0,64,125,135,13,0,125,143,1,0,
+61,119,1,0,128,110,170,170,205,113,125,119,21,0,61,103,
+1,0,12,102,84,85,125,103,25,0,61,95,1,0,125,95,
+29,0,61,87,1,0,66,82,125,87,33,0,49,6,91,34,
+194,0,125,143,37,0,29,80,64,6,127,0,128,7,97,0,
+6,232,224,233,138,13,32,54,40,0,128,255,214,6,10,232,
+224,233,178,45,29,48,191,255,88,250,64,142,16,0,125,143,
+5,0,32,134,0,64,125,135,13,0,125,143,1,0,61,119,
+1,0,128,110,170,170,205,113,125,119,21,0,61,103,1,0,
+12,102,84,85,125,103,25,0,61,95,1,0,11,94,0,2,
+125,95,29,0,61,87,1,0,66,82,125,87,33,0,49,6,
+91,34,28,0,125,143,37,0,29,80,64,6,127,0,38,135,
+128,7,38,23,1,0,2,80,127,0,38,23,5,0,2,80,
 127,0,38,23,13,0,2,80,127,0,34,6,0,192,23,0,
 2,80,127,0,128,7,225,16,6,232,0,226,229,87,64,0,
 224,7,96,1,10,216,61,143,21,0,128,134,170,170,113,135,
 0,0,61,127,25,0,32,118,85,85,111,119,0,0,61,111,
 21,0,128,102,144,144,109,103,0,0,32,54,32,78,128,255,
-26,2,61,95,1,0,235,87,1,0,10,136,208,138,61,135,
+22,5,61,95,1,0,235,87,1,0,10,136,208,138,61,135,
 29,0,240,127,1,0,15,224,17,225,61,119,21,0,128,110,
 170,170,110,111,0,0,61,103,25,0,32,94,85,85,108,95,
 0,0,61,87,21,0,128,142,240,240,106,143,0,0,32,54,
-32,78,128,255,214,1,251,47,32,0,48,6,186,186,31,31,
+32,78,128,255,210,4,251,47,32,0,48,6,186,186,31,31,
 240,225,186,5,0,18,181,5,32,22,192,1,2,80,64,6,
-255,16,190,7,225,241,3,30,124,254,6,232,7,208,8,192,
-9,200,35,142,0,0,64,134,0,64,17,216,16,217,61,127,
-1,0,239,209,161,13,25,112,218,113,61,111,5,0,61,103,
-1,0,204,105,237,113,195,5,32,22,193,1,149,85,26,88,
+255,16,190,7,225,241,3,30,124,254,6,232,7,224,8,216,
+9,208,35,142,0,0,64,134,0,64,17,200,16,201,61,127,
+1,0,239,225,161,13,26,112,220,113,61,111,5,0,61,103,
+1,0,204,105,237,113,195,5,32,22,193,1,133,101,28,88,
 61,87,1,0,11,136,170,137,17,16,61,135,9,0,240,23,
-194,2,2,184,165,69,61,127,1,0,15,112,23,104,61,103,
-9,0,13,88,236,95,34,2,11,96,12,224,206,225,29,48,
-28,56,27,64,128,255,226,0,0,74,28,16,165,21,250,17,
-234,13,224,201,194,13,9,80,219,81,65,194,24,142,255,255,
-17,135,0,0,74,135,0,0,95,202,65,210,65,18,65,74,
-61,119,9,0,14,120,129,122,15,96,193,98,12,104,13,88,
-220,89,235,17,209,229,29,48,28,56,27,64,128,255,44,0,
-29,48,28,56,27,64,128,255,184,0,10,16,224,17,194,5,
-32,22,194,1,213,5,65,186,224,201,234,189,0,18,2,80,
-3,30,132,1,126,6,255,241,128,7,225,16,6,248,7,232,
-8,224,229,87,64,0,224,7,96,1,10,216,63,143,21,0,
-128,134,170,170,113,135,0,0,63,127,25,0,32,118,85,85,
-111,119,0,0,63,111,21,0,128,102,160,160,109,103,0,0,
-0,18,197,13,66,234,29,94,254,255,66,226,28,86,254,255,
-234,143,1,0,107,143,0,0,65,18,63,127,9,0,15,128,
-129,130,240,17,129,245,32,54,32,78,128,255,110,0,251,47,
-32,0,64,6,255,16,0,18,197,13,66,66,8,142,254,255,
-66,58,7,134,254,255,240,127,1,0,113,127,0,0,65,18,
-38,111,9,0,13,112,129,114,238,17,129,245,127,0,0,18,
-149,21,66,66,8,142,254,255,241,135,1,0,66,58,7,126,
-254,255,239,119,1,0,238,129,194,5,32,22,194,1,165,13,
-65,18,2,104,38,95,9,0,11,96,129,98,236,105,161,237,
-0,18,2,80,127,0,127,0,128,7,225,0,6,232,29,6,
-155,255,233,5,32,230,213,1,29,238,156,255,149,21,47,6,
-140,134,71,0,15,128,253,135,34,2,16,136,17,112,45,6,
-64,66,15,0,237,119,194,2,14,230,1,0,0,234,128,102,
-26,183,236,225,147,13,128,54,26,183,128,255,54,0,128,94,
-26,183,171,225,229,5,28,80,10,48,128,255,38,0,0,226,
-224,225,234,237,224,233,202,213,64,6,255,0,127,0,36,135,
-64,86,0,0,42,87,80,245,10,16,194,0,2,80,127,0,
-128,7,225,0,6,232,191,255,234,255,10,224,29,136,220,137,
-17,128,128,126,27,183,239,135,192,234,252,233,231,5,191,255,
-210,255,253,81,214,253,197,13,191,255,200,255,10,16,197,5,
-191,255,192,255,10,16,252,17,207,253,253,17,166,253,64,6,
-255,0,192,25,1,50,127,0,88,26,99,255,5,0,99,231,
-1,0,3,224,128,255,48,0,35,255,5,0,35,231,1,0,
-72,26,127,0,88,26,99,255,5,0,99,231,1,0,224,49,
-3,224,178,5,128,255,38,18,35,255,5,0,35,231,1,0,
-72,26,127,0,3,30,236,255,99,255,17,0,99,231,13,0,
+194,2,2,184,149,85,61,127,1,0,15,112,23,104,61,103,
+9,0,13,88,236,95,34,2,11,96,12,192,206,193,29,48,
+24,56,25,64,128,255,32,1,0,18,24,72,149,37,252,73,
+218,29,224,209,178,29,2,80,217,81,65,218,27,142,255,255,
+17,135,0,0,74,135,0,0,95,210,65,226,224,209,226,13,
+2,126,1,0,15,112,217,113,65,218,27,110,255,255,13,103,
+0,0,78,103,0,0,95,210,65,226,66,74,68,18,61,87,
+9,0,10,88,129,90,11,128,193,130,16,136,17,120,216,121,
+239,73,225,213,29,48,24,56,25,64,128,255,44,0,29,48,
+24,56,25,64,128,255,248,0,10,16,224,17,194,5,32,22,
+194,1,213,5,65,186,224,209,250,173,0,18,2,80,3,30,
+132,1,126,6,255,241,128,7,225,48,6,224,7,216,8,248,
+60,135,5,0,16,136,129,138,17,232,59,233,229,87,64,0,
+224,7,96,1,10,208,60,127,21,0,128,118,170,170,111,119,
+0,0,60,111,25,0,32,102,85,85,109,103,0,0,60,95,
+21,0,128,86,160,160,107,87,0,0,0,18,229,21,66,218,
+27,142,254,255,66,250,31,134,254,255,240,127,1,0,113,127,
+0,0,66,234,29,118,254,255,66,250,31,110,254,255,237,103,
+1,0,110,103,0,0,65,18,60,87,9,0,10,88,129,90,
+235,17,225,229,32,54,32,78,128,255,44,3,250,47,32,0,
+64,6,255,48,38,135,5,0,16,136,129,138,17,16,39,17,
+0,74,229,21,66,66,8,126,254,255,66,58,7,118,254,255,
+238,111,1,0,111,111,0,0,66,66,8,102,254,255,66,18,
+2,94,254,255,235,87,1,0,108,87,0,0,65,74,38,135,
+9,0,16,136,129,138,241,73,225,229,127,0,38,135,5,0,
+16,136,129,138,17,16,39,17,0,74,133,37,66,66,8,126,
+254,255,239,119,1,0,66,58,7,110,254,255,237,103,1,0,
+236,113,194,5,32,22,194,1,149,29,66,66,8,94,254,255,
+235,87,1,0,66,18,2,142,254,255,241,135,1,0,240,81,
+194,5,32,22,194,1,165,13,65,74,9,120,38,111,9,0,
+13,112,129,114,238,121,177,221,0,18,2,80,127,0,38,23,
+1,0,2,80,127,0,38,23,5,0,2,80,127,0,38,23,
+13,0,2,80,127,0,34,6,0,192,23,0,2,80,127,0,
+128,7,225,16,6,232,0,226,229,87,64,0,224,7,96,1,
+10,216,61,143,21,0,128,134,170,170,113,135,0,0,61,127,
+25,0,32,118,85,85,111,119,0,0,61,111,21,0,128,102,
+144,144,109,103,0,0,32,54,32,78,128,255,26,2,61,95,
+1,0,235,87,1,0,10,136,208,138,61,135,29,0,240,127,
+1,0,15,224,17,225,61,119,21,0,128,110,170,170,110,111,
+0,0,61,103,25,0,32,94,85,85,108,95,0,0,61,87,
+21,0,128,142,240,240,106,143,0,0,32,54,32,78,128,255,
+214,1,251,47,32,0,48,6,186,186,31,31,240,225,186,5,
+0,18,181,5,32,22,192,1,2,80,64,6,255,16,190,7,
+225,241,3,30,124,254,6,232,7,208,8,192,9,200,35,142,
+0,0,64,134,0,64,17,216,16,217,61,127,1,0,239,209,
+161,13,25,112,218,113,61,111,5,0,61,103,1,0,204,105,
+237,113,195,5,32,22,193,1,149,85,26,88,61,87,1,0,
+11,136,170,137,17,16,61,135,9,0,240,23,194,2,2,184,
+165,69,61,127,1,0,15,112,23,104,61,103,9,0,13,88,
+236,95,34,2,11,96,12,224,206,225,29,48,28,56,27,64,
+128,255,226,0,0,74,28,16,165,21,250,17,234,13,224,201,
+194,13,9,80,219,81,65,194,24,142,255,255,17,135,0,0,
+74,135,0,0,95,202,65,210,65,18,65,74,61,119,9,0,
+14,120,129,122,15,96,193,98,12,104,13,88,220,89,235,17,
+209,229,29,48,28,56,27,64,128,255,44,0,29,48,28,56,
+27,64,128,255,184,0,10,16,224,17,194,5,32,22,194,1,
+213,5,65,186,224,201,234,189,0,18,2,80,3,30,132,1,
+126,6,255,241,128,7,225,16,6,248,7,232,8,224,229,87,
+64,0,224,7,96,1,10,216,63,143,21,0,128,134,170,170,
+113,135,0,0,63,127,25,0,32,118,85,85,111,119,0,0,
+63,111,21,0,128,102,160,160,109,103,0,0,0,18,197,13,
+66,234,29,94,254,255,66,226,28,86,254,255,234,143,1,0,
+107,143,0,0,65,18,63,127,9,0,15,128,129,130,240,17,
+129,245,32,54,32,78,128,255,110,0,251,47,32,0,64,6,
+255,16,0,18,197,13,66,66,8,142,254,255,66,58,7,134,
+254,255,240,127,1,0,113,127,0,0,65,18,38,111,9,0,
+13,112,129,114,238,17,129,245,127,0,0,18,149,21,66,66,
+8,142,254,255,241,135,1,0,66,58,7,126,254,255,239,119,
+1,0,238,129,194,5,32,22,194,1,165,13,65,18,2,104,
+38,95,9,0,11,96,129,98,236,105,161,237,0,18,2,80,
+127,0,127,0,128,7,225,0,6,232,29,6,155,255,233,5,
+32,230,213,1,29,238,156,255,149,21,47,6,140,134,71,0,
+15,128,253,135,34,2,16,136,17,112,45,6,64,66,15,0,
+237,119,194,2,14,230,1,0,0,234,128,102,26,183,236,225,
+147,13,128,54,26,183,128,255,54,0,128,94,26,183,171,225,
+229,5,28,80,10,48,128,255,38,0,0,226,224,225,234,237,
+224,233,202,213,64,6,255,0,127,0,36,135,64,86,0,0,
+42,87,80,245,10,16,194,0,2,80,127,0,128,7,225,0,
+6,232,191,255,234,255,10,224,29,136,220,137,17,128,128,126,
+27,183,239,135,192,234,252,233,231,5,191,255,210,255,253,81,
+214,253,197,13,191,255,200,255,10,16,197,5,191,255,192,255,
+10,16,252,17,207,253,253,17,166,253,64,6,255,0,192,25,
+1,50,127,0,88,26,99,255,5,0,99,231,1,0,3,224,
+128,255,48,0,35,255,5,0,35,231,1,0,72,26,127,0,
+88,26,99,255,5,0,99,231,1,0,224,49,3,224,178,5,
+128,255,38,18,35,255,5,0,35,231,1,0,72,26,127,0,
+3,30,236,255,99,255,17,0,99,231,13,0,99,215,9,0,
+3,230,12,0,99,239,1,0,99,223,5,0,128,239,4,0,
+6,208,224,209,186,29,1,210,149,29,68,54,0,0,38,55,
+237,140,224,49,218,5,93,54,0,0,38,54,128,0,6,216,
+93,254,0,0,63,254,42,0,123,0,93,102,0,0,44,102,
+128,0,236,217,186,5,0,48,245,5,26,48,128,255,132,17,
+10,48,224,49,178,229,35,215,9,0,35,231,13,0,35,255,
+17,0,35,239,1,0,35,223,5,0,6,80,3,30,20,0,
+127,0,88,26,99,255,5,0,99,231,1,0,6,50,3,224,
+128,255,170,1,35,231,1,0,35,255,5,0,72,26,127,0,
+192,25,127,0,3,30,236,255,99,255,17,0,99,231,13,0,
 99,215,9,0,3,230,12,0,99,239,1,0,99,223,5,0,
-128,239,4,0,6,208,224,209,186,29,1,210,149,29,68,54,
-0,0,38,55,45,141,224,49,218,5,93,54,0,0,38,54,
-128,0,6,216,93,254,0,0,63,254,42,0,123,0,93,102,
-0,0,44,102,128,0,236,217,186,5,0,48,245,5,26,48,
-128,255,132,17,10,48,224,49,178,229,35,215,9,0,35,231,
-13,0,35,255,17,0,35,239,1,0,35,223,5,0,6,80,
-3,30,20,0,127,0,88,26,99,255,5,0,99,231,1,0,
-6,50,3,224,128,255,170,1,35,231,1,0,35,255,5,0,
-72,26,127,0,192,25,127,0,3,30,236,255,99,255,17,0,
-99,231,13,0,99,215,9,0,3,230,12,0,99,239,1,0,
-99,223,5,0,128,239,4,0,68,102,0,0,44,103,41,141,
-0,218,224,97,218,37,1,50,68,14,0,0,97,55,41,141,
-93,54,0,0,38,54,112,0,128,255,222,13,133,21,27,48,
-65,218,194,50,68,62,0,0,39,62,92,128,199,49,38,215,
-1,0,93,254,0,0,63,254,68,0,122,0,27,88,194,90,
-68,70,0,0,200,89,43,63,93,128,224,57,154,237,35,215,
-9,0,35,223,5,0,35,239,1,0,35,255,17,0,35,231,
-13,0,3,30,20,0,127,0,80,26,99,255,13,0,99,231,
-9,0,99,239,1,0,3,230,8,0,99,223,5,0,128,239,
-4,0,213,29,39,103,1,0,68,14,0,0,97,103,201,134,
-7,48,38,63,5,0,224,57,178,13,38,223,9,0,93,254,
-0,0,7,48,2,58,63,254,42,0,123,0,133,13,38,223,
-9,0,93,254,0,0,63,254,58,0,123,0,68,62,0,0,
-39,63,201,134,224,57,250,221,35,223,5,0,35,239,1,0,
-35,255,13,0,35,231,9,0,3,30,16,0,127,0,88,26,
-99,255,5,0,99,231,1,0,6,56,3,224,0,50,95,58,
-104,58,251,53,71,0,9,0,14,0,19,0,24,0,29,0,
-34,0,39,0,44,0,49,0,68,54,0,0,38,54,48,141,
-133,45,68,54,0,0,38,54,124,141,181,37,68,54,0,0,
-38,54,180,141,229,29,68,54,0,0,38,54,96,142,149,29,
-68,54,0,0,38,54,232,141,197,21,68,54,0,0,38,54,
-8,142,245,13,68,54,0,0,38,54,44,142,165,13,68,54,
-0,0,38,54,68,142,213,5,68,54,0,0,38,54,68,141,
-35,255,5,0,35,231,1,0,6,80,72,26,127,0,80,26,
-99,255,13,0,99,231,9,0,99,239,1,0,3,230,8,0,
-99,223,5,0,6,232,1,50,191,255,86,255,10,216,29,48,
-191,255,78,255,64,54,0,0,38,54,128,128,196,49,27,64,
-10,72,68,62,0,0,39,62,164,142,128,255,192,10,128,255,
-254,10,35,231,9,0,35,255,13,0,35,239,1,0,35,223,
-5,0,3,30,16,0,127,0,3,30,224,255,99,79,29,0,
-99,71,25,0,99,255,13,0,99,231,9,0,35,102,20,0,
-3,230,8,0,99,103,1,0,6,64,64,54,0,0,38,54,
-112,128,99,63,21,0,196,49,35,94,16,0,203,94,7,0,
-99,95,5,0,8,56,35,79,5,0,12,64,128,255,20,0,
-35,231,9,0,35,255,13,0,3,30,32,0,127,0,4,2,
-3,30,212,253,99,79,41,2,99,71,37,2,99,255,25,2,
-99,231,21,2,99,207,17,2,3,230,20,2,99,215,13,2,
-99,239,5,2,99,223,9,2,128,239,4,0,7,200,6,216,
-128,255,160,16,27,215,15,0,220,210,159,210,219,247,15,0,
-218,5,9,50,128,255,86,27,133,61,59,103,5,0,224,97,
-154,21,35,94,4,0,123,95,5,0,35,86,4,0,123,87,
-1,0,32,54,0,2,123,55,9,0,219,175,15,0,219,151,
-15,0,27,48,93,62,0,0,35,103,41,2,39,62,136,17,
-99,103,1,0,35,79,37,2,25,64,128,255,38,2,10,200,
-59,87,5,0,35,94,4,0,235,81,170,13,27,48,128,255,
-196,14,123,7,5,0,123,7,1,0,123,7,9,0,224,209,
-218,5,219,223,15,0,162,5,31,202,27,48,128,255,62,16,
-25,80,35,207,17,2,35,215,13,2,35,223,9,2,35,239,
-5,2,35,255,25,2,35,231,21,2,3,30,44,2,127,0,
-88,26,99,255,5,0,99,231,1,0,3,224,197,13,6,88,
-10,82,234,95,194,98,12,102,48,0,71,103,255,255,234,55,
-194,2,95,58,224,49,202,245,224,65,146,13,229,5,32,54,
-48,0,71,55,255,255,95,58,231,65,161,253,35,255,5,0,
-35,231,1,0,7,80,72,26,127,0,24,0,3,30,208,255,
-99,255,45,0,99,231,41,0,99,207,37,0,3,230,40,0,
-99,215,33,0,99,239,25,0,99,223,29,0,128,239,4,0,
-99,55,21,0,38,119,9,0,99,119,17,0,7,216,38,207,
-13,0,224,217,99,223,1,0,250,5,68,222,0,0,59,222,
-172,142,99,223,1,0,27,48,128,255,136,16,35,111,21,0,
-10,48,13,71,21,0,45,63,5,0,224,65,194,5,230,57,
-169,5,7,48,6,112,219,113,99,119,9,0,35,119,21,0,
-46,119,1,0,230,113,99,119,5,0,190,5,99,55,5,0,
-35,79,21,0,35,215,5,0,9,79,16,0,166,209,224,73,
-130,37,224,65,186,29,27,71,0,0,8,6,211,255,242,5,
-8,6,213,255,194,5,8,6,224,255,170,5,65,218,27,95,
-0,0,11,6,208,255,170,13,27,55,1,0,6,6,136,255,
-194,5,6,6,168,255,170,5,66,218,32,118,48,0,181,5,
-32,118,32,0,99,119,13,0,229,13,14,71,0,0,35,63,
-17,0,8,48,65,114,99,119,1,0,93,254,0,0,63,254,
-212,0,121,0,35,119,1,0,251,113,129,245,35,63,21,0,
-7,63,17,0,224,57,194,13,149,29,35,55,13,0,35,63,
-17,0,93,254,0,0,63,254,252,0,121,0,95,210,224,209,
-223,245,197,13,27,103,0,0,35,63,17,0,12,48,65,218,
-93,254,0,0,63,254,26,1,121,0,35,111,9,0,237,217,
-161,245,181,13,35,63,17,0,32,54,32,0,93,254,0,0,
-63,254,54,1,121,0,95,210,224,209,223,245,35,207,37,0,
-35,215,33,0,35,223,29,0,35,239,25,0,35,255,45,0,
-35,231,41,0,35,87,5,0,3,30,48,0,127,0,108,1,
-3,30,108,254,99,79,145,1,99,255,129,1,99,231,125,1,
-99,207,121,1,3,230,124,1,99,215,117,1,99,239,109,1,
-99,223,113,1,128,239,4,0,99,55,21,0,99,63,25,0,
-0,210,8,216,224,217,218,5,68,222,0,0,59,222,172,142,
-35,111,21,0,99,111,89,1,35,111,25,0,99,111,93,1,
-128,7,30,7,6,6,219,255,226,13,35,63,21,0,93,254,
-0,0,35,103,25,0,63,254,68,0,108,0,65,218,65,210,
-128,7,254,6,65,218,31,50,99,55,85,1,99,55,81,1,
-0,202,35,54,96,1,197,5,70,7,0,0,65,50,35,78,
-105,1,233,49,163,253,27,255,0,0,31,6,211,255,218,5,
-1,50,67,55,97,1,197,29,31,6,213,255,218,5,1,50,
-67,55,98,1,213,21,31,6,208,255,218,5,1,50,67,55,
-96,1,229,13,31,6,224,255,218,5,1,50,67,55,99,1,
-245,5,31,6,221,255,234,5,1,50,67,55,100,1,65,218,
-181,221,31,6,208,255,198,29,31,6,199,255,159,29,99,7,
-81,1,213,13,27,95,0,0,35,63,81,1,65,218,234,63,
-64,2,199,89,11,94,208,255,99,95,81,1,27,55,0,0,
-6,6,208,255,214,29,6,6,199,255,215,237,149,29,31,6,
-214,255,234,21,35,95,145,1,28,66,67,90,72,89,68,90,
-43,55,253,255,99,95,145,1,99,55,81,1,224,49,254,5,
-128,49,99,55,81,1,1,50,67,55,97,1,65,218,27,79,
-0,0,9,6,210,255,234,61,27,55,1,0,1,202,65,218,
-6,6,208,255,198,29,6,6,199,255,159,29,99,7,85,1,
-213,13,27,87,0,0,35,55,85,1,65,218,234,55,64,2,
-198,81,10,86,208,255,99,87,85,1,27,55,0,0,6,6,
-208,255,134,37,6,6,199,255,215,237,197,29,27,95,0,0,
-11,6,214,255,186,21,35,87,145,1,28,58,67,82,71,81,
-68,82,99,87,145,1,42,87,253,255,99,87,85,1,224,81,
-142,13,31,50,99,55,85,1,197,5,99,7,85,1,165,5,
-65,218,27,55,0,0,6,6,224,255,178,253,6,6,148,255,
-250,13,27,55,1,0,1,58,65,218,6,6,148,255,218,5,
-65,218,67,63,103,1,181,21,67,63,102,1,133,21,6,6,
-180,255,234,5,65,218,1,50,67,55,103,1,133,13,6,6,
-152,255,218,5,65,218,1,50,67,55,104,1,27,63,0,0,
-65,218,67,63,105,1,7,6,187,255,186,5,128,7,78,4,
-7,6,185,255,186,5,128,7,68,4,7,6,176,255,186,5,
-128,7,8,2,7,6,168,255,186,5,128,7,32,2,7,6,
-157,255,177,5,128,7,202,4,186,5,128,7,202,4,7,6,
-156,255,162,45,7,6,152,255,177,5,128,7,16,4,7,6,
-151,255,162,37,7,6,146,255,177,5,128,7,164,4,186,5,
-128,7,28,4,7,6,144,255,177,5,128,7,224,1,186,5,
-128,7,184,1,7,6,141,255,186,5,128,7,102,4,7,6,
-139,255,186,5,128,7,198,1,7,6,136,255,186,5,128,7,
-188,1,128,7,108,4,224,201,178,5,67,7,96,1,3,63,
-103,1,224,57,35,63,145,1,242,21,7,94,255,255,35,79,
-149,1,203,86,4,0,234,73,226,55,0,0,194,50,199,49,
-67,50,28,82,74,49,72,50,99,55,145,1,38,71,249,255,
-38,79,253,255,181,13,67,58,28,82,74,57,68,58,39,71,
-253,255,99,63,145,1,8,72,191,74,3,55,104,1,224,49,
-194,5,232,0,8,72,191,74,67,7,3,0,67,7,79,1,
-3,206,79,1,9,48,224,49,190,29,1,106,67,111,3,0,
-193,50,250,13,224,65,218,13,32,54,56,0,89,55,255,255,
-42,6,204,204,204,204,95,202,43,6,204,204,204,12,213,5,
-8,48,9,56,128,255,92,13,10,64,11,72,9,48,99,55,
-17,0,25,80,8,48,32,78,34,0,39,6,0,40,107,238,
-133,61,0,90,0,202,213,37,9,6,225,255,254,5,40,6,
-0,202,154,59,233,71,192,0,165,5,25,88,35,103,17,0,
-193,202,236,57,203,21,230,65,139,13,35,111,17,0,65,202,
-167,105,99,111,17,0,165,13,35,103,17,0,236,57,249,5,
-65,202,167,97,95,98,99,103,17,0,168,49,129,58,95,74,
-224,73,190,221,99,95,17,0,0,66,25,56,11,57,178,5,
-10,70,247,255,10,56,191,255,90,250,25,48,3,58,4,74,
-35,111,17,0,0,66,224,105,218,197,10,56,191,255,68,250,
-35,63,85,1,10,200,224,57,174,5,1,58,35,54,79,1,
-167,49,229,5,32,62,48,0,89,63,255,255,95,202,230,201,
-171,253,3,79,3,0,224,73,194,5,32,54,45,0,133,21,
-3,71,98,1,224,65,194,5,32,54,43,0,149,13,3,63,
-99,1,224,57,186,5,128,7,22,1,32,54,32,0,89,55,
-255,255,95,202,128,7,8,1,3,55,105,1,35,95,145,1,
-72,50,67,55,105,1,67,90,28,66,72,89,68,90,99,95,
-145,1,43,87,253,255,0,90,213,117,224,201,178,5,67,7,
-96,1,3,79,103,1,35,71,145,1,224,73,146,29,8,72,
-9,62,255,255,35,95,149,1,199,54,4,0,230,89,226,71,
-0,0,194,66,201,65,8,62,3,0,28,50,70,57,72,58,
-99,63,145,1,39,87,249,255,39,95,253,255,165,13,67,66,
-28,90,75,65,68,66,99,71,145,1,40,87,253,255,0,90,
-3,63,104,1,224,57,178,5,202,0,0,90,3,79,105,1,
-9,6,139,255,250,61,3,206,235,0,67,7,235,0,181,29,
-35,63,33,0,35,55,29,0,10,66,0,74,128,255,122,13,
-10,48,11,56,32,70,48,0,0,74,128,255,164,11,89,87,
-255,255,10,66,35,55,29,0,35,63,33,0,95,202,0,74,
-128,255,52,12,99,87,29,0,99,95,33,0,11,72,10,64,
-0,50,0,58,128,255,56,11,97,82,178,221,35,63,85,1,
-224,57,174,5,1,58,35,54,235,0,167,49,229,5,32,62,
-48,0,89,63,255,255,95,202,230,201,171,253,25,56,128,7,
-22,2,99,87,29,0,3,71,105,1,3,206,135,0,8,6,
-168,255,226,111,0,0,99,95,33,0,196,106,68,94,0,0,
-43,94,180,142,203,105,99,111,9,0,67,7,135,0,35,79,
-33,0,10,64,0,50,0,58,128,255,150,10,97,82,186,5,
-67,7,100,1,3,87,105,1,10,6,145,255,138,13,3,106,
-99,111,13,0,7,106,99,111,17,0,165,45,4,106,99,111,
-13,0,15,106,149,253,35,71,17,0,35,55,29,0,8,72,
-35,63,33,0,191,74,128,255,76,10,35,55,9,0,0,74,
-0,56,10,64,128,255,202,10,10,55,0,0,35,71,13,0,
-89,55,255,255,8,72,95,202,35,55,29,0,35,63,33,0,
-191,74,128,255,206,10,99,87,29,0,99,95,33,0,35,79,
-33,0,35,71,29,0,0,50,0,58,128,255,82,10,97,82,
-178,213,35,111,13,0,99,106,170,13,3,79,100,1,224,73,
-226,5,32,54,48,0,89,55,255,255,95,202,35,71,85,1,
-224,65,174,5,1,66,35,54,135,0,168,49,229,5,32,62,
-48,0,89,63,255,255,95,202,230,201,171,253,35,111,13,0,
-100,106,178,5,191,7,248,254,3,95,100,1,224,89,186,5,
-191,7,236,254,3,87,105,1,32,54,48,0,89,87,255,255,
-89,55,254,255,94,202,191,7,214,254,68,206,0,0,57,206,
-212,142,25,56,35,54,80,1,191,255,244,247,202,209,32,54,
-41,0,89,55,15,0,89,7,16,0,165,109,67,7,96,1,
-3,79,104,1,35,95,145,1,224,73,210,13,11,70,3,0,
-28,90,75,65,68,66,99,71,145,1,40,71,253,255,104,215,
-0,0,229,85,3,63,103,1,28,66,224,57,130,21,11,54,
-3,0,72,49,68,50,99,55,145,1,26,72,38,55,253,255,
-191,74,102,215,1,0,102,79,5,0,165,69,67,90,72,89,
-68,90,99,95,145,1,43,95,253,255,107,215,1,0,133,61,
-1,50,35,71,145,1,67,55,101,1,67,66,28,90,75,65,
-8,78,4,0,99,79,145,1,40,63,1,0,197,37,67,63,
-4,0,213,13,35,71,145,1,28,90,67,66,75,65,68,66,
-99,71,145,1,40,71,253,255,67,71,4,0,3,63,4,0,
-67,7,5,0,224,57,218,13,35,63,21,0,0,50,93,254,
-0,0,35,103,25,0,63,254,52,7,108,0,191,7,18,249,
-35,62,4,0,35,54,80,1,191,255,20,247,202,209,27,55,
-0,0,224,49,178,5,191,7,222,248,26,80,35,207,121,1,
-35,215,117,1,35,223,113,1,35,239,109,1,35,255,129,1,
-35,231,125,1,3,30,148,1,127,0,3,30,224,255,99,79,
-29,0,99,255,13,0,35,94,16,0,203,94,7,0,99,95,
-5,0,99,231,9,0,99,71,25,0,35,79,5,0,35,70,
-24,0,99,71,1,0,3,230,8,0,191,255,134,245,35,255,
-13,0,35,231,9,0,3,30,32,0,127,0,88,26,99,255,
-5,0,99,231,1,0,6,50,3,224,128,255,68,19,35,231,
-1,0,35,255,5,0,72,26,127,0,16,0,17,2,6,216,
-7,200,8,208,64,230,0,0,60,230,128,128,196,225,28,232,
-29,56,68,54,0,0,38,54,35,143,128,255,62,5,224,217,
-210,21,27,103,0,0,224,97,146,21,29,56,32,54,34,0,
-128,255,32,5,27,48,29,56,128,255,32,5,29,56,68,54,
-0,0,38,54,23,143,128,255,18,5,29,56,68,54,0,0,
-38,54,27,143,128,255,4,5,25,48,29,56,128,255,252,4,
-29,56,68,54,0,0,38,54,15,143,128,255,238,4,224,209,
-255,5,29,56,32,54,48,0,128,255,216,4,213,29,3,238,
-12,0,26,48,67,7,12,0,181,13,10,74,6,64,233,71,
-128,82,10,86,48,0,93,87,255,255,73,48,95,234,224,49,
-223,245,229,5,11,48,65,234,28,56,128,255,166,4,29,95,
-0,0,224,89,138,253,28,56,10,50,128,255,150,4,191,255,
-30,255,0,82,39,2,16,0,0,2,8,2,128,255,252,18,
-32,230,35,0,28,48,194,50,68,86,0,0,202,49,38,63,
-205,134,224,57,38,54,204,134,162,13,7,216,0,58,102,7,
-1,0,93,254,0,0,63,254,48,0,123,0,95,226,188,237,
-68,230,0,0,60,79,161,129,224,73,60,230,160,129,146,13,
-9,216,93,254,0,0,63,254,80,0,123,0,124,7,1,0,
-128,255,172,18,30,2,8,2,6,216,68,230,0,0,128,255,
-154,18,60,103,93,135,224,97,60,230,92,135,170,13,93,94,
-0,0,43,94,162,255,124,95,1,0,28,48,128,255,152,16,
-0,74,9,48,194,50,68,70,0,0,200,49,38,63,205,134,
-224,57,38,54,204,134,250,5,102,223,1,0,128,255,96,18,
-0,82,133,13,65,74,9,6,220,255,198,237,128,255,80,18,
-31,82,30,2,80,26,80,26,99,255,13,0,99,239,1,0,
-99,223,5,0,6,232,99,231,9,0,68,222,0,0,59,222,
-100,135,59,103,33,0,3,230,8,0,224,97,218,5,32,54,
-0,8,123,55,33,0,59,55,33,0,29,56,95,50,6,72,
-221,73,72,74,38,232,73,233,180,5,231,233,185,5,0,216,
-149,61,29,48,128,255,110,16,10,48,127,50,146,253,198,70,
-7,0,178,5,8,58,135,65,59,95,29,0,230,89,138,13,
-29,56,198,57,123,63,29,0,8,216,198,217,181,29,59,63,
-25,0,224,57,178,5,231,49,185,5,123,55,25,0,59,63,
-29,0,224,57,210,5,29,72,198,73,233,57,217,5,29,56,
-198,57,123,63,29,0,8,56,198,57,7,222,8,0,72,66,
-168,233,71,234,24,82,74,233,123,239,253,255,27,48,128,255,
-76,1,27,80,35,223,5,0,35,239,1,0,35,255,13,0,
-35,231,9,0,3,30,16,0,127,0,3,30,228,255,99,255,
-25,0,99,207,17,0,99,215,13,0,99,231,21,0,99,239,
-5,0,99,223,9,0,3,230,20,0,6,222,11,0,24,90,
-75,217,230,217,185,5,0,72,149,117,27,6,240,255,177,5,
-32,222,16,0,68,214,0,0,58,214,100,135,58,239,5,0,
-224,233,186,13,26,238,16,0,122,239,5,0,122,239,17,0,
-122,239,21,0,122,7,13,0,29,56,61,239,1,0,61,79,
-253,255,251,73,193,45,61,87,1,0,9,48,122,63,5,0,
-187,49,6,6,120,255,241,5,103,87,1,0,29,72,106,63,
-5,0,197,69,58,71,29,0,221,73,232,73,218,5,29,64,
-219,233,1,90,197,5,6,64,221,65,0,90,104,223,253,255,
-8,72,125,55,253,255,224,89,146,53,103,239,1,0,125,63,
-5,0,125,87,1,0,106,239,5,0,133,45,58,55,5,0,
-230,233,186,205,99,55,1,0,27,200,25,48,0,58,191,255,
-88,254,224,81,234,21,29,56,7,64,40,63,1,0,231,65,
-217,5,58,54,16,0,230,57,138,253,40,103,253,255,25,48,
-172,49,1,58,191,255,50,254,224,81,186,5,0,74,229,5,
-35,119,1,0,122,119,5,0,133,173,35,207,17,0,35,231,
-21,0,35,255,25,0,35,239,5,0,35,223,9,0,35,215,
-13,0,9,80,3,30,28,0,127,0,84,26,99,255,9,0,
-99,239,1,0,99,231,5,0,68,70,0,0,38,79,253,255,
-40,71,105,135,3,230,4,0,232,49,169,13,8,56,7,64,
-40,63,5,0,231,49,185,13,232,57,161,253,133,13,8,56,
-39,71,1,0,232,57,185,5,230,65,163,253,68,14,0,0,
-97,63,105,135,0,250,39,87,253,255,0,234,10,96,199,97,
-230,97,138,13,7,48,38,63,5,0,202,73,102,79,253,255,
-1,250,9,88,198,89,232,89,170,21,40,95,1,0,40,87,
-253,255,103,55,1,0,202,73,102,63,5,0,11,64,102,71,
-1,0,102,79,253,255,104,55,5,0,1,234,224,249,186,13,
-224,233,154,13,103,55,1,0,102,63,5,0,102,71,1,0,
-104,55,5,0,35,239,1,0,35,255,9,0,35,231,5,0,
-76,26,127,0,84,26,99,255,9,0,99,231,5,0,99,239,
-1,0,3,230,4,0,6,232,128,255,112,15,29,48,191,255,
-252,253,10,232,128,255,104,15,29,80,35,239,1,0,35,255,
-9,0,35,231,5,0,76,26,127,0,84,26,99,255,9,0,
-99,231,5,0,99,239,1,0,3,230,4,0,6,232,128,255,
-58,15,224,233,194,5,29,48,191,255,242,254,128,255,48,15,
+128,239,4,0,68,102,0,0,44,103,233,140,0,218,224,97,
+218,37,1,50,68,14,0,0,97,55,233,140,93,54,0,0,
+38,54,112,0,128,255,222,13,133,21,27,48,65,218,194,50,
+68,62,0,0,39,62,92,128,199,49,38,215,1,0,93,254,
+0,0,63,254,68,0,122,0,27,88,194,90,68,70,0,0,
+200,89,43,63,93,128,224,57,154,237,35,215,9,0,35,223,
+5,0,35,239,1,0,35,255,17,0,35,231,13,0,3,30,
+20,0,127,0,80,26,99,255,13,0,99,231,9,0,99,239,
+1,0,3,230,8,0,99,223,5,0,128,239,4,0,213,29,
+39,103,1,0,68,14,0,0,97,103,201,134,7,48,38,63,
+5,0,224,57,178,13,38,223,9,0,93,254,0,0,7,48,
+2,58,63,254,42,0,123,0,133,13,38,223,9,0,93,254,
+0,0,63,254,58,0,123,0,68,62,0,0,39,63,201,134,
+224,57,250,221,35,223,5,0,35,239,1,0,35,255,13,0,
+35,231,9,0,3,30,16,0,127,0,88,26,99,255,5,0,
+99,231,1,0,6,56,3,224,0,50,95,58,104,58,251,53,
+71,0,9,0,14,0,19,0,24,0,29,0,34,0,39,0,
+44,0,49,0,68,54,0,0,38,54,240,140,133,45,68,54,
+0,0,38,54,60,141,181,37,68,54,0,0,38,54,116,141,
+229,29,68,54,0,0,38,54,32,142,149,29,68,54,0,0,
+38,54,168,141,197,21,68,54,0,0,38,54,200,141,245,13,
+68,54,0,0,38,54,236,141,165,13,68,54,0,0,38,54,
+4,142,213,5,68,54,0,0,38,54,4,141,35,255,5,0,
+35,231,1,0,6,80,72,26,127,0,80,26,99,255,13,0,
+99,231,9,0,99,239,1,0,3,230,8,0,99,223,5,0,
+6,232,1,50,191,255,86,255,10,216,29,48,191,255,78,255,
+64,54,0,0,38,54,128,128,196,49,27,64,10,72,68,62,
+0,0,39,62,100,142,128,255,192,10,128,255,254,10,35,231,
+9,0,35,255,13,0,35,239,1,0,35,223,5,0,3,30,
+16,0,127,0,3,30,224,255,99,79,29,0,99,71,25,0,
+99,255,13,0,99,231,9,0,35,102,20,0,3,230,8,0,
+99,103,1,0,6,64,64,54,0,0,38,54,112,128,99,63,
+21,0,196,49,35,94,16,0,203,94,7,0,99,95,5,0,
+8,56,35,79,5,0,12,64,128,255,20,0,35,231,9,0,
+35,255,13,0,3,30,32,0,127,0,4,2,3,30,212,253,
+99,79,41,2,99,71,37,2,99,255,25,2,99,231,21,2,
+99,207,17,2,3,230,20,2,99,215,13,2,99,239,5,2,
+99,223,9,2,128,239,4,0,7,200,6,216,128,255,160,16,
+27,215,15,0,220,210,159,210,219,247,15,0,218,5,9,50,
+128,255,86,27,133,61,59,103,5,0,224,97,154,21,35,94,
+4,0,123,95,5,0,35,86,4,0,123,87,1,0,32,54,
+0,2,123,55,9,0,219,175,15,0,219,151,15,0,27,48,
+93,62,0,0,35,103,41,2,39,62,136,17,99,103,1,0,
+35,79,37,2,25,64,128,255,38,2,10,200,59,87,5,0,
+35,94,4,0,235,81,170,13,27,48,128,255,196,14,123,7,
+5,0,123,7,1,0,123,7,9,0,224,209,218,5,219,223,
+15,0,162,5,31,202,27,48,128,255,62,16,25,80,35,207,
+17,2,35,215,13,2,35,223,9,2,35,239,5,2,35,255,
+25,2,35,231,21,2,3,30,44,2,127,0,88,26,99,255,
+5,0,99,231,1,0,3,224,197,13,6,88,10,82,234,95,
+194,98,12,102,48,0,71,103,255,255,234,55,194,2,95,58,
+224,49,202,245,224,65,146,13,229,5,32,54,48,0,71,55,
+255,255,95,58,231,65,161,253,35,255,5,0,35,231,1,0,
+7,80,72,26,127,0,24,0,3,30,208,255,99,255,45,0,
+99,231,41,0,99,207,37,0,3,230,40,0,99,215,33,0,
+99,239,25,0,99,223,29,0,128,239,4,0,99,55,21,0,
+38,119,9,0,99,119,17,0,7,216,38,207,13,0,224,217,
+99,223,1,0,250,5,68,222,0,0,59,222,108,142,99,223,
+1,0,27,48,128,255,136,16,35,111,21,0,10,48,13,71,
+21,0,45,63,5,0,224,65,194,5,230,57,169,5,7,48,
+6,112,219,113,99,119,9,0,35,119,21,0,46,119,1,0,
+230,113,99,119,5,0,190,5,99,55,5,0,35,79,21,0,
+35,215,5,0,9,79,16,0,166,209,224,73,130,37,224,65,
+186,29,27,71,0,0,8,6,211,255,242,5,8,6,213,255,
+194,5,8,6,224,255,170,5,65,218,27,95,0,0,11,6,
+208,255,170,13,27,55,1,0,6,6,136,255,194,5,6,6,
+168,255,170,5,66,218,32,118,48,0,181,5,32,118,32,0,
+99,119,13,0,229,13,14,71,0,0,35,63,17,0,8,48,
+65,114,99,119,1,0,93,254,0,0,63,254,212,0,121,0,
+35,119,1,0,251,113,129,245,35,63,21,0,7,63,17,0,
+224,57,194,13,149,29,35,55,13,0,35,63,17,0,93,254,
+0,0,63,254,252,0,121,0,95,210,224,209,223,245,197,13,
+27,103,0,0,35,63,17,0,12,48,65,218,93,254,0,0,
+63,254,26,1,121,0,35,111,9,0,237,217,161,245,181,13,
+35,63,17,0,32,54,32,0,93,254,0,0,63,254,54,1,
+121,0,95,210,224,209,223,245,35,207,37,0,35,215,33,0,
+35,223,29,0,35,239,25,0,35,255,45,0,35,231,41,0,
+35,87,5,0,3,30,48,0,127,0,108,1,3,30,108,254,
+99,79,145,1,99,255,129,1,99,231,125,1,99,207,121,1,
+3,230,124,1,99,215,117,1,99,239,109,1,99,223,113,1,
+128,239,4,0,99,55,21,0,99,63,25,0,0,210,8,216,
+224,217,218,5,68,222,0,0,59,222,108,142,35,111,21,0,
+99,111,89,1,35,111,25,0,99,111,93,1,128,7,30,7,
+6,6,219,255,226,13,35,63,21,0,93,254,0,0,35,103,
+25,0,63,254,68,0,108,0,65,218,65,210,128,7,254,6,
+65,218,31,50,99,55,85,1,99,55,81,1,0,202,35,54,
+96,1,197,5,70,7,0,0,65,50,35,78,105,1,233,49,
+163,253,27,255,0,0,31,6,211,255,218,5,1,50,67,55,
+97,1,197,29,31,6,213,255,218,5,1,50,67,55,98,1,
+213,21,31,6,208,255,218,5,1,50,67,55,96,1,229,13,
+31,6,224,255,218,5,1,50,67,55,99,1,245,5,31,6,
+221,255,234,5,1,50,67,55,100,1,65,218,181,221,31,6,
+208,255,198,29,31,6,199,255,159,29,99,7,81,1,213,13,
+27,95,0,0,35,63,81,1,65,218,234,63,64,2,199,89,
+11,94,208,255,99,95,81,1,27,55,0,0,6,6,208,255,
+214,29,6,6,199,255,215,237,149,29,31,6,214,255,234,21,
+35,95,145,1,28,66,67,90,72,89,68,90,43,55,253,255,
+99,95,145,1,99,55,81,1,224,49,254,5,128,49,99,55,
+81,1,1,50,67,55,97,1,65,218,27,79,0,0,9,6,
+210,255,234,61,27,55,1,0,1,202,65,218,6,6,208,255,
+198,29,6,6,199,255,159,29,99,7,85,1,213,13,27,87,
+0,0,35,55,85,1,65,218,234,55,64,2,198,81,10,86,
+208,255,99,87,85,1,27,55,0,0,6,6,208,255,134,37,
+6,6,199,255,215,237,197,29,27,95,0,0,11,6,214,255,
+186,21,35,87,145,1,28,58,67,82,71,81,68,82,99,87,
+145,1,42,87,253,255,99,87,85,1,224,81,142,13,31,50,
+99,55,85,1,197,5,99,7,85,1,165,5,65,218,27,55,
+0,0,6,6,224,255,178,253,6,6,148,255,250,13,27,55,
+1,0,1,58,65,218,6,6,148,255,218,5,65,218,67,63,
+103,1,181,21,67,63,102,1,133,21,6,6,180,255,234,5,
+65,218,1,50,67,55,103,1,133,13,6,6,152,255,218,5,
+65,218,1,50,67,55,104,1,27,63,0,0,65,218,67,63,
+105,1,7,6,187,255,186,5,128,7,78,4,7,6,185,255,
+186,5,128,7,68,4,7,6,176,255,186,5,128,7,8,2,
+7,6,168,255,186,5,128,7,32,2,7,6,157,255,177,5,
+128,7,202,4,186,5,128,7,202,4,7,6,156,255,162,45,
+7,6,152,255,177,5,128,7,16,4,7,6,151,255,162,37,
+7,6,146,255,177,5,128,7,164,4,186,5,128,7,28,4,
+7,6,144,255,177,5,128,7,224,1,186,5,128,7,184,1,
+7,6,141,255,186,5,128,7,102,4,7,6,139,255,186,5,
+128,7,198,1,7,6,136,255,186,5,128,7,188,1,128,7,
+108,4,224,201,178,5,67,7,96,1,3,63,103,1,224,57,
+35,63,145,1,242,21,7,94,255,255,35,79,149,1,203,86,
+4,0,234,73,226,55,0,0,194,50,199,49,67,50,28,82,
+74,49,72,50,99,55,145,1,38,71,249,255,38,79,253,255,
+181,13,67,58,28,82,74,57,68,58,39,71,253,255,99,63,
+145,1,8,72,191,74,3,55,104,1,224,49,194,5,232,0,
+8,72,191,74,67,7,3,0,67,7,79,1,3,206,79,1,
+9,48,224,49,190,29,1,106,67,111,3,0,193,50,250,13,
+224,65,218,13,32,54,56,0,89,55,255,255,42,6,204,204,
+204,204,95,202,43,6,204,204,204,12,213,5,8,48,9,56,
+128,255,92,13,10,64,11,72,9,48,99,55,17,0,25,80,
+8,48,32,78,34,0,39,6,0,40,107,238,133,61,0,90,
+0,202,213,37,9,6,225,255,254,5,40,6,0,202,154,59,
+233,71,192,0,165,5,25,88,35,103,17,0,193,202,236,57,
+203,21,230,65,139,13,35,111,17,0,65,202,167,105,99,111,
+17,0,165,13,35,103,17,0,236,57,249,5,65,202,167,97,
+95,98,99,103,17,0,168,49,129,58,95,74,224,73,190,221,
+99,95,17,0,0,66,25,56,11,57,178,5,10,70,247,255,
+10,56,191,255,90,250,25,48,3,58,4,74,35,111,17,0,
+0,66,224,105,218,197,10,56,191,255,68,250,35,63,85,1,
+10,200,224,57,174,5,1,58,35,54,79,1,167,49,229,5,
+32,62,48,0,89,63,255,255,95,202,230,201,171,253,3,79,
+3,0,224,73,194,5,32,54,45,0,133,21,3,71,98,1,
+224,65,194,5,32,54,43,0,149,13,3,63,99,1,224,57,
+186,5,128,7,22,1,32,54,32,0,89,55,255,255,95,202,
+128,7,8,1,3,55,105,1,35,95,145,1,72,50,67,55,
+105,1,67,90,28,66,72,89,68,90,99,95,145,1,43,87,
+253,255,0,90,213,117,224,201,178,5,67,7,96,1,3,79,
+103,1,35,71,145,1,224,73,146,29,8,72,9,62,255,255,
+35,95,149,1,199,54,4,0,230,89,226,71,0,0,194,66,
+201,65,8,62,3,0,28,50,70,57,72,58,99,63,145,1,
+39,87,249,255,39,95,253,255,165,13,67,66,28,90,75,65,
+68,66,99,71,145,1,40,87,253,255,0,90,3,63,104,1,
+224,57,178,5,202,0,0,90,3,79,105,1,9,6,139,255,
+250,61,3,206,235,0,67,7,235,0,181,29,35,63,33,0,
+35,55,29,0,10,66,0,74,128,255,122,13,10,48,11,56,
+32,70,48,0,0,74,128,255,164,11,89,87,255,255,10,66,
+35,55,29,0,35,63,33,0,95,202,0,74,128,255,52,12,
+99,87,29,0,99,95,33,0,11,72,10,64,0,50,0,58,
+128,255,56,11,97,82,178,221,35,63,85,1,224,57,174,5,
+1,58,35,54,235,0,167,49,229,5,32,62,48,0,89,63,
+255,255,95,202,230,201,171,253,25,56,128,7,22,2,99,87,
+29,0,3,71,105,1,3,206,135,0,8,6,168,255,226,111,
+0,0,99,95,33,0,196,106,68,94,0,0,43,94,116,142,
+203,105,99,111,9,0,67,7,135,0,35,79,33,0,10,64,
+0,50,0,58,128,255,150,10,97,82,186,5,67,7,100,1,
+3,87,105,1,10,6,145,255,138,13,3,106,99,111,13,0,
+7,106,99,111,17,0,165,45,4,106,99,111,13,0,15,106,
+149,253,35,71,17,0,35,55,29,0,8,72,35,63,33,0,
+191,74,128,255,76,10,35,55,9,0,0,74,0,56,10,64,
+128,255,202,10,10,55,0,0,35,71,13,0,89,55,255,255,
+8,72,95,202,35,55,29,0,35,63,33,0,191,74,128,255,
+206,10,99,87,29,0,99,95,33,0,35,79,33,0,35,71,
+29,0,0,50,0,58,128,255,82,10,97,82,178,213,35,111,
+13,0,99,106,170,13,3,79,100,1,224,73,226,5,32,54,
+48,0,89,55,255,255,95,202,35,71,85,1,224,65,174,5,
+1,66,35,54,135,0,168,49,229,5,32,62,48,0,89,63,
+255,255,95,202,230,201,171,253,35,111,13,0,100,106,178,5,
+191,7,248,254,3,95,100,1,224,89,186,5,191,7,236,254,
+3,87,105,1,32,54,48,0,89,87,255,255,89,55,254,255,
+94,202,191,7,214,254,68,206,0,0,57,206,148,142,25,56,
+35,54,80,1,191,255,244,247,202,209,32,54,41,0,89,55,
+15,0,89,7,16,0,165,109,67,7,96,1,3,79,104,1,
+35,95,145,1,224,73,210,13,11,70,3,0,28,90,75,65,
+68,66,99,71,145,1,40,71,253,255,104,215,0,0,229,85,
+3,63,103,1,28,66,224,57,130,21,11,54,3,0,72,49,
+68,50,99,55,145,1,26,72,38,55,253,255,191,74,102,215,
+1,0,102,79,5,0,165,69,67,90,72,89,68,90,99,95,
+145,1,43,95,253,255,107,215,1,0,133,61,1,50,35,71,
+145,1,67,55,101,1,67,66,28,90,75,65,8,78,4,0,
+99,79,145,1,40,63,1,0,197,37,67,63,4,0,213,13,
+35,71,145,1,28,90,67,66,75,65,68,66,99,71,145,1,
+40,71,253,255,67,71,4,0,3,63,4,0,67,7,5,0,
+224,57,218,13,35,63,21,0,0,50,93,254,0,0,35,103,
+25,0,63,254,52,7,108,0,191,7,18,249,35,62,4,0,
+35,54,80,1,191,255,20,247,202,209,27,55,0,0,224,49,
+178,5,191,7,222,248,26,80,35,207,121,1,35,215,117,1,
+35,223,113,1,35,239,109,1,35,255,129,1,35,231,125,1,
+3,30,148,1,127,0,3,30,224,255,99,79,29,0,99,255,
+13,0,35,94,16,0,203,94,7,0,99,95,5,0,99,231,
+9,0,99,71,25,0,35,79,5,0,35,70,24,0,99,71,
+1,0,3,230,8,0,191,255,134,245,35,255,13,0,35,231,
+9,0,3,30,32,0,127,0,88,26,99,255,5,0,99,231,
+1,0,6,50,3,224,128,255,68,19,35,231,1,0,35,255,
+5,0,72,26,127,0,16,0,17,2,6,216,7,200,8,208,
+64,230,0,0,60,230,128,128,196,225,28,232,29,56,68,54,
+0,0,38,54,227,142,128,255,62,5,224,217,210,21,27,103,
+0,0,224,97,146,21,29,56,32,54,34,0,128,255,32,5,
+27,48,29,56,128,255,32,5,29,56,68,54,0,0,38,54,
+215,142,128,255,18,5,29,56,68,54,0,0,38,54,219,142,
+128,255,4,5,25,48,29,56,128,255,252,4,29,56,68,54,
+0,0,38,54,207,142,128,255,238,4,224,209,255,5,29,56,
+32,54,48,0,128,255,216,4,213,29,3,238,12,0,26,48,
+67,7,12,0,181,13,10,74,6,64,233,71,128,82,10,86,
+48,0,93,87,255,255,73,48,95,234,224,49,223,245,229,5,
+11,48,65,234,28,56,128,255,166,4,29,95,0,0,224,89,
+138,253,28,56,10,50,128,255,150,4,191,255,30,255,0,82,
+39,2,16,0,0,2,8,2,128,255,252,18,32,230,35,0,
+28,48,194,50,68,86,0,0,202,49,38,63,205,134,224,57,
+38,54,204,134,162,13,7,216,0,58,102,7,1,0,93,254,
+0,0,63,254,48,0,123,0,95,226,188,237,68,230,0,0,
+60,79,161,129,224,73,60,230,160,129,146,13,9,216,93,254,
+0,0,63,254,80,0,123,0,124,7,1,0,128,255,172,18,
+30,2,8,2,6,216,68,230,0,0,128,255,154,18,60,103,
+93,135,224,97,60,230,92,135,170,13,93,94,0,0,43,94,
+162,255,124,95,1,0,28,48,128,255,152,16,0,74,9,48,
+194,50,68,70,0,0,200,49,38,63,205,134,224,57,38,54,
+204,134,250,5,102,223,1,0,128,255,96,18,0,82,133,13,
+65,74,9,6,220,255,198,237,128,255,80,18,31,82,30,2,
+80,26,80,26,99,255,13,0,99,239,1,0,99,223,5,0,
+6,232,99,231,9,0,68,222,0,0,59,222,100,135,59,103,
+33,0,3,230,8,0,224,97,218,5,32,54,0,8,123,55,
+33,0,59,55,33,0,29,56,95,50,6,72,221,73,72,74,
+38,232,73,233,180,5,231,233,185,5,0,216,149,61,29,48,
+128,255,110,16,10,48,127,50,146,253,198,70,7,0,178,5,
+8,58,135,65,59,95,29,0,230,89,138,13,29,56,198,57,
+123,63,29,0,8,216,198,217,181,29,59,63,25,0,224,57,
+178,5,231,49,185,5,123,55,25,0,59,63,29,0,224,57,
+210,5,29,72,198,73,233,57,217,5,29,56,198,57,123,63,
+29,0,8,56,198,57,7,222,8,0,72,66,168,233,71,234,
+24,82,74,233,123,239,253,255,27,48,128,255,76,1,27,80,
+35,223,5,0,35,239,1,0,35,255,13,0,35,231,9,0,
+3,30,16,0,127,0,3,30,228,255,99,255,25,0,99,207,
+17,0,99,215,13,0,99,231,21,0,99,239,5,0,99,223,
+9,0,3,230,20,0,6,222,11,0,24,90,75,217,230,217,
+185,5,0,72,149,117,27,6,240,255,177,5,32,222,16,0,
+68,214,0,0,58,214,100,135,58,239,5,0,224,233,186,13,
+26,238,16,0,122,239,5,0,122,239,17,0,122,239,21,0,
+122,7,13,0,29,56,61,239,1,0,61,79,253,255,251,73,
+193,45,61,87,1,0,9,48,122,63,5,0,187,49,6,6,
+120,255,241,5,103,87,1,0,29,72,106,63,5,0,197,69,
+58,71,29,0,221,73,232,73,218,5,29,64,219,233,1,90,
+197,5,6,64,221,65,0,90,104,223,253,255,8,72,125,55,
+253,255,224,89,146,53,103,239,1,0,125,63,5,0,125,87,
+1,0,106,239,5,0,133,45,58,55,5,0,230,233,186,205,
+99,55,1,0,27,200,25,48,0,58,191,255,88,254,224,81,
+234,21,29,56,7,64,40,63,1,0,231,65,217,5,58,54,
+16,0,230,57,138,253,40,103,253,255,25,48,172,49,1,58,
+191,255,50,254,224,81,186,5,0,74,229,5,35,119,1,0,
+122,119,5,0,133,173,35,207,17,0,35,231,21,0,35,255,
+25,0,35,239,5,0,35,223,9,0,35,215,13,0,9,80,
+3,30,28,0,127,0,84,26,99,255,9,0,99,239,1,0,
+99,231,5,0,68,70,0,0,38,79,253,255,40,71,105,135,
+3,230,4,0,232,49,169,13,8,56,7,64,40,63,5,0,
+231,49,185,13,232,57,161,253,133,13,8,56,39,71,1,0,
+232,57,185,5,230,65,163,253,68,14,0,0,97,63,105,135,
+0,250,39,87,253,255,0,234,10,96,199,97,230,97,138,13,
+7,48,38,63,5,0,202,73,102,79,253,255,1,250,9,88,
+198,89,232,89,170,21,40,95,1,0,40,87,253,255,103,55,
+1,0,202,73,102,63,5,0,11,64,102,71,1,0,102,79,
+253,255,104,55,5,0,1,234,224,249,186,13,224,233,154,13,
+103,55,1,0,102,63,5,0,102,71,1,0,104,55,5,0,
 35,239,1,0,35,255,9,0,35,231,5,0,76,26,127,0,
-3,30,9,2,0,226,6,232,128,255,104,1,224,233,194,69,
-61,55,5,0,224,49,130,69,221,247,15,0,234,5,9,50,
-128,255,26,12,31,226,133,61,221,239,15,0,218,53,61,103,
-1,0,230,97,163,37,221,255,13,0,146,13,61,95,12,0,
-0,58,203,54,255,63,2,66,128,255,226,10,61,87,12,0,
-61,79,1,0,61,63,5,0,202,54,255,63,167,73,9,64,
-128,255,200,9,61,63,5,0,61,55,1,0,167,49,230,81,
-206,5,221,31,15,0,31,226,61,95,5,0,221,183,13,0,
-125,95,1,0,224,89,202,5,125,7,9,0,213,5,32,54,
-0,2,125,55,9,0,29,48,128,255,2,1,28,80,31,2,
-0,2,128,255,116,1,22,2,8,2,6,224,7,232,29,48,
-128,255,192,0,61,103,5,0,224,97,186,61,28,48,128,255,
-226,1,10,216,224,217,130,13,28,55,0,0,29,56,128,255,
-232,1,127,82,130,21,95,218,224,217,247,45,61,87,12,0,
-28,78,1,0,202,54,255,63,9,56,27,64,128,255,60,9,
-251,81,190,37,221,31,15,0,31,226,133,37,61,71,9,0,
-95,66,125,71,9,0,140,13,28,55,0,0,29,56,128,255,
-168,1,10,48,181,13,61,95,1,0,65,90,125,95,1,0,
-28,55,0,0,75,55,255,255,134,0,65,226,127,50,210,229,
-28,79,0,0,224,73,186,229,0,226,29,48,128,255,94,0,
-28,80,30,2,0,2,68,94,0,0,43,94,96,128,171,49,
-164,50,6,6,236,255,193,13,6,72,194,74,68,62,0,0,
-39,62,164,129,9,64,199,65,8,48,128,255,202,13,22,2,
+84,26,99,255,9,0,99,231,5,0,99,239,1,0,3,230,
+4,0,6,232,128,255,112,15,29,48,191,255,252,253,10,232,
+128,255,104,15,29,80,35,239,1,0,35,255,9,0,35,231,
+5,0,76,26,127,0,84,26,99,255,9,0,99,231,5,0,
+99,239,1,0,3,230,4,0,6,232,128,255,58,15,224,233,
+194,5,29,48,191,255,242,254,128,255,48,15,35,239,1,0,
+35,255,9,0,35,231,5,0,76,26,127,0,3,30,9,2,
+0,226,6,232,128,255,104,1,224,233,194,69,61,55,5,0,
+224,49,130,69,221,247,15,0,234,5,9,50,128,255,26,12,
+31,226,133,61,221,239,15,0,218,53,61,103,1,0,230,97,
+163,37,221,255,13,0,146,13,61,95,12,0,0,58,203,54,
+255,63,2,66,128,255,226,10,61,87,12,0,61,79,1,0,
+61,63,5,0,202,54,255,63,167,73,9,64,128,255,200,9,
+61,63,5,0,61,55,1,0,167,49,230,81,206,5,221,31,
+15,0,31,226,61,95,5,0,221,183,13,0,125,95,1,0,
+224,89,202,5,125,7,9,0,213,5,32,54,0,2,125,55,
+9,0,29,48,128,255,2,1,28,80,31,2,0,2,128,255,
+116,1,22,2,8,2,6,224,7,232,29,48,128,255,192,0,
+61,103,5,0,224,97,186,61,28,48,128,255,226,1,10,216,
+224,217,130,13,28,55,0,0,29,56,128,255,232,1,127,82,
+130,21,95,218,224,217,247,45,61,87,12,0,28,78,1,0,
+202,54,255,63,9,56,27,64,128,255,60,9,251,81,190,37,
+221,31,15,0,31,226,133,37,61,71,9,0,95,66,125,71,
+9,0,140,13,28,55,0,0,29,56,128,255,168,1,10,48,
+181,13,61,95,1,0,65,90,125,95,1,0,28,55,0,0,
+75,55,255,255,134,0,65,226,127,50,210,229,28,79,0,0,
+224,73,186,229,0,226,29,48,128,255,94,0,28,80,30,2,
 0,2,68,94,0,0,43,94,96,128,171,49,164,50,6,6,
-236,255,177,13,194,50,68,62,0,0,199,49,38,55,165,129,
-224,49,178,5,128,255,146,13,22,2,0,2,68,94,0,0,
-43,94,96,128,171,49,164,50,6,6,236,255,177,13,194,50,
-68,62,0,0,199,49,38,55,165,129,224,49,178,5,128,255,
-108,13,22,2,0,2,9,2,68,54,0,0,38,54,96,128,
-198,47,15,0,6,238,16,0,198,55,31,0,6,230,32,0,
-38,103,28,0,32,110,0,192,77,97,140,102,1,0,38,87,
-44,0,102,103,28,0,77,81,138,86,2,0,102,87,44,0,
-198,55,47,0,191,255,64,255,29,48,191,255,58,255,28,48,
-191,255,52,255,31,2,9,2,6,224,7,232,29,48,191,255,
-82,255,61,103,9,0,95,98,125,103,9,0,252,5,28,48,
-29,56,128,255,132,0,10,224,149,13,61,95,1,0,65,90,
-125,95,1,0,75,231,255,255,156,0,29,48,191,255,78,255,
-28,80,31,2,0,2,39,103,9,0,95,98,103,103,9,0,
-220,5,128,255,84,0,10,48,149,13,39,95,1,0,65,90,
-103,95,1,0,75,55,255,255,134,0,6,80,22,2,10,88,
-95,66,150,13,6,87,0,0,7,95,0,0,65,50,65,58,
-234,89,242,245,202,86,255,0,203,94,255,0,171,81,127,0,
-6,56,6,103,0,0,65,50,224,97,202,253,6,86,255,255,
-167,81,127,0,4,0,20,2,6,224,7,232,68,54,0,0,
-38,54,96,128,230,233,193,69,68,86,0,0,234,87,87,143,
-196,82,198,81,234,233,201,61,221,247,15,0,146,61,29,71,
-15,0,200,70,3,0,99,66,178,53,221,215,15,0,130,13,
-221,239,15,0,210,5,61,63,5,0,125,63,1,0,221,151,
-15,0,61,55,5,0,221,175,15,0,224,49,202,29,67,231,
-3,0,221,255,13,0,146,13,61,103,12,0,0,58,204,54,
-255,63,2,66,128,255,6,8,61,95,12,0,35,62,3,0,
-203,54,255,63,1,66,128,255,242,6,97,82,254,13,221,31,
-15,0,229,5,29,48,191,255,188,252,224,81,178,5,31,82,
-245,5,28,48,29,56,191,255,74,253,28,80,138,0,42,2,
-4,0,192,25,71,73,70,65,8,80,9,88,127,0,80,26,
-99,231,5,0,99,215,13,0,6,224,99,239,1,0,8,208,
-99,223,9,0,7,232,9,216,251,233,0,74,202,5,250,225,
-170,5,1,74,35,215,13,0,35,239,1,0,35,231,5,0,
-35,223,9,0,9,80,3,30,16,0,127,0,80,26,99,231,
-5,0,99,215,13,0,6,224,99,239,1,0,8,208,99,223,
-9,0,7,232,9,216,251,233,1,74,202,5,250,225,170,5,
-0,74,35,215,13,0,35,239,1,0,35,231,5,0,35,223,
-9,0,9,80,3,30,16,0,127,0,80,26,80,26,192,25,
-8,80,198,81,230,81,225,95,0,0,201,89,199,89,127,0,
-0,2,6,64,7,72,0,50,0,58,128,255,242,1,22,2,
-7,2,6,224,7,232,9,48,8,72,224,49,159,21,127,50,
-246,13,9,6,193,255,207,13,9,6,63,0,150,13,224,49,
-186,5,224,73,214,5,127,50,234,5,224,73,198,5,0,82,
-0,90,245,37,224,73,202,5,28,80,29,88,165,37,224,73,
-158,13,28,48,29,56,128,73,9,64,0,74,128,255,200,2,
-133,29,9,6,224,255,134,13,29,80,9,62,224,255,231,87,
-128,0,0,88,229,13,32,86,32,0,169,81,29,64,234,71,
-192,0,233,239,128,0,233,231,128,0,28,65,8,80,29,88,
-29,2,24,0,17,2,99,55,17,0,8,208,99,63,21,0,
-99,63,9,0,9,216,191,58,35,255,9,0,99,63,13,0,
-224,249,154,13,224,217,250,5,35,87,17,0,0,88,250,87,
-194,2,133,125,64,70,0,128,224,249,178,13,32,238,63,0,
-31,88,72,89,138,21,129,66,95,234,224,65,170,253,181,13,
-32,238,31,0,35,103,17,0,72,97,218,5,129,66,95,234,
-224,65,154,253,27,48,64,70,0,128,224,49,178,13,32,78,
-63,0,6,56,72,57,250,13,129,66,95,74,224,65,170,253,
-165,13,32,78,31,0,26,48,72,49,218,5,129,66,95,74,
-224,65,170,253,0,202,0,226,233,233,166,69,35,103,9,0,
-99,103,1,0,35,103,17,0,169,233,99,103,5,0,162,13,
-29,64,0,72,26,48,27,56,128,255,220,1,10,64,11,72,
-181,5,26,64,27,72,9,56,8,48,133,45,28,64,193,226,
-159,66,193,202,35,111,1,0,8,201,231,105,251,5,231,105,
-250,21,35,111,5,0,230,105,177,21,35,111,5,0,230,105,
-225,71,0,0,35,111,1,0,199,65,168,105,99,111,1,0,
-35,111,5,0,156,230,1,0,166,105,99,111,5,0,7,64,
-223,66,129,58,129,50,8,49,95,234,224,233,142,221,28,80,
-25,88,39,2,24,0,7,2,6,224,7,232,8,208,9,216,
-224,233,138,13,224,217,234,5,250,231,194,90,11,80,0,88,
-213,21,28,48,29,56,26,64,27,72,191,255,186,254,10,48,
-11,56,26,64,27,72,128,255,44,0,28,64,10,224,8,80,
-188,81,225,63,0,0,167,233,157,89,29,2,9,2,135,73,
-232,49,225,63,0,0,167,73,168,49,6,80,9,88,31,2,
-80,0,18,2,8,208,218,254,255,255,144,210,6,224,220,70,
-255,255,8,48,250,55,34,2,99,55,21,0,9,216,27,48,
-198,222,255,255,8,72,255,79,34,2,99,79,17,0,144,50,
-8,72,230,71,34,2,251,79,34,2,99,79,25,0,99,71,
-29,0,144,226,28,72,255,79,34,2,99,79,33,0,7,232,
-28,56,250,63,34,2,99,63,37,0,99,7,45,0,221,54,
-255,255,6,56,255,63,34,2,99,63,49,0,250,55,34,2,
-99,55,53,0,99,7,57,0,99,7,61,0,99,7,69,0,
-99,7,73,0,251,231,34,2,99,231,41,0,99,7,77,0,
-144,234,255,239,34,2,99,239,65,0,0,226,0,234,29,248,
-194,250,31,72,195,73,105,231,1,0,0,218,0,226,245,21,
-27,56,194,58,29,80,187,81,199,81,194,82,195,81,42,55,
-17,0,31,72,6,88,144,90,203,225,195,73,41,63,1,0,
-198,86,255,255,202,57,105,63,1,0,65,218,253,217,151,237,
-195,249,63,87,1,0,65,234,10,88,202,0,127,87,1,0,
-144,90,203,225,100,234,198,213,35,63,13,0,35,95,9,0,
-208,58,7,89,35,87,5,0,35,55,1,0,208,82,6,81,
-40,2,80,0,9,2,6,224,7,232,9,48,224,49,159,21,
-127,50,246,13,8,6,193,255,207,13,8,6,63,0,150,13,
-224,49,186,5,224,65,214,5,127,50,234,5,224,65,198,5,
-0,82,0,90,229,37,224,65,202,5,28,80,29,88,149,37,
-224,65,142,13,28,48,29,56,128,65,0,74,191,255,164,252,
-133,29,28,72,8,6,224,255,134,13,8,70,224,255,232,79,
-192,0,0,80,9,88,213,13,32,86,32,0,168,81,234,231,
-128,0,232,239,192,0,29,225,28,88,232,79,192,0,9,80,
-31,2,6,80,198,94,3,0,218,21,39,89,203,94,3,0,
-154,21,100,66,241,13,6,96,200,97,130,98,194,98,39,95,
-1,0,68,58,102,95,1,0,68,50,230,97,155,253,200,70,
-3,0,224,65,178,13,6,96,200,97,7,95,0,0,65,58,
-70,95,0,0,65,50,230,97,155,253,127,0,8,72,7,64,
-88,26,99,239,1,0,136,0,6,232,9,48,99,231,5,0,
-221,49,29,230,255,255,9,6,223,255,169,37,8,56,200,58,
-8,57,7,88,208,90,11,57,197,5,70,71,255,255,95,50,
-198,86,15,0,186,253,16,74,29,80,73,81,149,13,102,63,
-1,0,102,63,5,0,102,63,9,0,102,63,13,0,80,50,
-234,49,234,245,6,54,16,0,181,5,70,71,0,0,95,50,
-252,49,202,253,29,80,35,231,5,0,35,239,1,0,72,26,
-127,0,3,30,232,255,99,255,21,0,99,231,17,0,99,215,
-9,0,3,230,16,0,8,208,99,207,13,0,199,209,6,72,
-99,239,1,0,9,200,99,223,5,0,32,238,238,15,0,218,
-133,69,129,218,219,102,0,1,234,5,135,55,1,0,65,58,
-134,222,0,255,219,94,1,0,135,103,1,0,146,13,73,103,
-0,0,65,58,65,74,65,234,221,238,255,15,165,45,167,87,
-1,0,66,58,202,70,240,0,196,66,8,97,202,86,15,0,
-67,82,12,48,201,49,189,49,236,233,191,5,6,54,0,240,
-0,66,229,5,73,7,0,0,65,50,65,74,65,66,249,49,
-185,13,234,65,134,253,133,13,134,95,1,0,73,95,0,0,
-65,50,65,74,65,66,234,65,134,253,221,81,202,238,255,15,
-250,57,138,197,35,207,13,0,35,215,9,0,35,223,5,0,
-35,239,1,0,35,255,21,0,35,231,17,0,3,30,24,0,
-127,0,3,30,216,255,99,255,37,0,99,231,33,0,99,239,
-21,0,3,230,32,0,99,215,29,0,6,232,99,223,25,0,
-7,208,8,216,128,255,26,3,68,102,0,0,44,103,89,143,
-224,97,178,5,128,255,190,5,68,94,0,0,43,95,93,143,
-224,89,178,5,191,255,82,248,68,86,0,0,42,87,97,143,
-224,81,178,5,191,255,156,206,68,78,0,0,41,79,101,143,
-224,73,194,5,0,50,128,255,128,4,68,70,0,0,40,71,
-105,143,224,65,242,5,128,255,102,5,42,54,220,0,191,255,
-114,206,224,233,234,21,67,7,2,0,67,7,3,0,35,62,
-2,0,99,63,13,0,99,7,17,0,35,102,3,0,99,103,
-5,0,99,7,9,0,35,222,4,0,35,214,12,0,1,234,
-68,14,0,0,97,223,245,129,68,94,0,0,43,95,109,143,
-224,89,226,5,29,48,26,56,27,64,191,255,38,206,29,48,
-26,56,27,64,191,255,120,210,10,48,128,255,136,2,35,215,
-29,0,35,223,25,0,35,239,21,0,35,255,37,0,35,231,
-33,0,3,30,40,0,127,0,88,26,99,255,5,0,99,231,
-1,0,8,80,3,224,7,72,9,64,10,72,6,56,38,6,
-1,0,4,0,128,255,142,1,35,231,1,0,35,255,5,0,
-72,26,127,0,88,26,99,255,5,0,99,231,1,0,8,80,
-3,224,7,72,9,64,10,72,6,56,64,54,4,0,128,255,
-100,1,35,231,1,0,35,255,5,0,72,26,127,0,3,30,
-224,255,99,79,29,0,99,255,13,0,99,231,9,0,7,72,
-3,230,8,0,201,102,0,1,99,71,25,0,6,56,9,64,
-194,21,35,86,16,0,202,86,7,0,99,87,5,0,35,94,
-27,0,28,98,76,89,68,90,99,95,1,0,43,79,253,255,
-38,6,4,0,4,0,197,5,38,6,4,0,3,0,128,255,
-4,1,35,255,13,0,35,231,9,0,3,30,32,0,127,0,
-88,26,99,255,5,0,99,231,1,0,7,64,3,224,6,56,
-38,6,6,0,3,0,128,255,220,0,35,231,1,0,35,255,
-5,0,72,26,127,0,88,26,99,255,5,0,99,231,1,0,
-6,56,3,224,38,6,5,0,2,0,128,255,184,0,35,231,
-1,0,35,255,5,0,72,26,127,0,88,26,99,255,5,0,
-99,231,1,0,8,80,3,224,7,72,9,64,10,72,6,56,
-38,6,7,0,4,0,128,255,140,0,35,231,1,0,35,255,
+236,255,193,13,6,72,194,74,68,62,0,0,39,62,164,129,
+9,64,199,65,8,48,128,255,202,13,22,2,0,2,68,94,
+0,0,43,94,96,128,171,49,164,50,6,6,236,255,177,13,
+194,50,68,62,0,0,199,49,38,55,165,129,224,49,178,5,
+128,255,146,13,22,2,0,2,68,94,0,0,43,94,96,128,
+171,49,164,50,6,6,236,255,177,13,194,50,68,62,0,0,
+199,49,38,55,165,129,224,49,178,5,128,255,108,13,22,2,
+0,2,9,2,68,54,0,0,38,54,96,128,198,47,15,0,
+6,238,16,0,198,55,31,0,6,230,32,0,38,103,28,0,
+32,110,0,192,77,97,140,102,1,0,38,87,44,0,102,103,
+28,0,77,81,138,86,2,0,102,87,44,0,198,55,47,0,
+191,255,64,255,29,48,191,255,58,255,28,48,191,255,52,255,
+31,2,9,2,6,224,7,232,29,48,191,255,82,255,61,103,
+9,0,95,98,125,103,9,0,252,5,28,48,29,56,128,255,
+132,0,10,224,149,13,61,95,1,0,65,90,125,95,1,0,
+75,231,255,255,156,0,29,48,191,255,78,255,28,80,31,2,
+0,2,39,103,9,0,95,98,103,103,9,0,220,5,128,255,
+84,0,10,48,149,13,39,95,1,0,65,90,103,95,1,0,
+75,55,255,255,134,0,6,80,22,2,10,88,95,66,150,13,
+6,87,0,0,7,95,0,0,65,50,65,58,234,89,242,245,
+202,86,255,0,203,94,255,0,171,81,127,0,6,56,6,103,
+0,0,65,50,224,97,202,253,6,86,255,255,167,81,127,0,
+4,0,20,2,6,224,7,232,68,54,0,0,38,54,96,128,
+230,233,193,69,68,86,0,0,234,87,23,143,196,82,198,81,
+234,233,201,61,221,247,15,0,146,61,29,71,15,0,200,70,
+3,0,99,66,178,53,221,215,15,0,130,13,221,239,15,0,
+210,5,61,63,5,0,125,63,1,0,221,151,15,0,61,55,
+5,0,221,175,15,0,224,49,202,29,67,231,3,0,221,255,
+13,0,146,13,61,103,12,0,0,58,204,54,255,63,2,66,
+128,255,6,8,61,95,12,0,35,62,3,0,203,54,255,63,
+1,66,128,255,242,6,97,82,254,13,221,31,15,0,229,5,
+29,48,191,255,188,252,224,81,178,5,31,82,245,5,28,48,
+29,56,191,255,74,253,28,80,138,0,42,2,4,0,192,25,
+71,73,70,65,8,80,9,88,127,0,80,26,99,231,5,0,
+99,215,13,0,6,224,99,239,1,0,8,208,99,223,9,0,
+7,232,9,216,251,233,0,74,202,5,250,225,170,5,1,74,
+35,215,13,0,35,239,1,0,35,231,5,0,35,223,9,0,
+9,80,3,30,16,0,127,0,80,26,99,231,5,0,99,215,
+13,0,6,224,99,239,1,0,8,208,99,223,9,0,7,232,
+9,216,251,233,1,74,202,5,250,225,170,5,0,74,35,215,
+13,0,35,239,1,0,35,231,5,0,35,223,9,0,9,80,
+3,30,16,0,127,0,80,26,80,26,192,25,8,80,198,81,
+230,81,225,95,0,0,201,89,199,89,127,0,0,2,6,64,
+7,72,0,50,0,58,128,255,242,1,22,2,7,2,6,224,
+7,232,9,48,8,72,224,49,159,21,127,50,246,13,9,6,
+193,255,207,13,9,6,63,0,150,13,224,49,186,5,224,73,
+214,5,127,50,234,5,224,73,198,5,0,82,0,90,245,37,
+224,73,202,5,28,80,29,88,165,37,224,73,158,13,28,48,
+29,56,128,73,9,64,0,74,128,255,200,2,133,29,9,6,
+224,255,134,13,29,80,9,62,224,255,231,87,128,0,0,88,
+229,13,32,86,32,0,169,81,29,64,234,71,192,0,233,239,
+128,0,233,231,128,0,28,65,8,80,29,88,29,2,24,0,
+17,2,99,55,17,0,8,208,99,63,21,0,99,63,9,0,
+9,216,191,58,35,255,9,0,99,63,13,0,224,249,154,13,
+224,217,250,5,35,87,17,0,0,88,250,87,194,2,133,125,
+64,70,0,128,224,249,178,13,32,238,63,0,31,88,72,89,
+138,21,129,66,95,234,224,65,170,253,181,13,32,238,31,0,
+35,103,17,0,72,97,218,5,129,66,95,234,224,65,154,253,
+27,48,64,70,0,128,224,49,178,13,32,78,63,0,6,56,
+72,57,250,13,129,66,95,74,224,65,170,253,165,13,32,78,
+31,0,26,48,72,49,218,5,129,66,95,74,224,65,170,253,
+0,202,0,226,233,233,166,69,35,103,9,0,99,103,1,0,
+35,103,17,0,169,233,99,103,5,0,162,13,29,64,0,72,
+26,48,27,56,128,255,220,1,10,64,11,72,181,5,26,64,
+27,72,9,56,8,48,133,45,28,64,193,226,159,66,193,202,
+35,111,1,0,8,201,231,105,251,5,231,105,250,21,35,111,
+5,0,230,105,177,21,35,111,5,0,230,105,225,71,0,0,
+35,111,1,0,199,65,168,105,99,111,1,0,35,111,5,0,
+156,230,1,0,166,105,99,111,5,0,7,64,223,66,129,58,
+129,50,8,49,95,234,224,233,142,221,28,80,25,88,39,2,
+24,0,7,2,6,224,7,232,8,208,9,216,224,233,138,13,
+224,217,234,5,250,231,194,90,11,80,0,88,213,21,28,48,
+29,56,26,64,27,72,191,255,186,254,10,48,11,56,26,64,
+27,72,128,255,44,0,28,64,10,224,8,80,188,81,225,63,
+0,0,167,233,157,89,29,2,9,2,135,73,232,49,225,63,
+0,0,167,73,168,49,6,80,9,88,31,2,80,0,18,2,
+8,208,218,254,255,255,144,210,6,224,220,70,255,255,8,48,
+250,55,34,2,99,55,21,0,9,216,27,48,198,222,255,255,
+8,72,255,79,34,2,99,79,17,0,144,50,8,72,230,71,
+34,2,251,79,34,2,99,79,25,0,99,71,29,0,144,226,
+28,72,255,79,34,2,99,79,33,0,7,232,28,56,250,63,
+34,2,99,63,37,0,99,7,45,0,221,54,255,255,6,56,
+255,63,34,2,99,63,49,0,250,55,34,2,99,55,53,0,
+99,7,57,0,99,7,61,0,99,7,69,0,99,7,73,0,
+251,231,34,2,99,231,41,0,99,7,77,0,144,234,255,239,
+34,2,99,239,65,0,0,226,0,234,29,248,194,250,31,72,
+195,73,105,231,1,0,0,218,0,226,245,21,27,56,194,58,
+29,80,187,81,199,81,194,82,195,81,42,55,17,0,31,72,
+6,88,144,90,203,225,195,73,41,63,1,0,198,86,255,255,
+202,57,105,63,1,0,65,218,253,217,151,237,195,249,63,87,
+1,0,65,234,10,88,202,0,127,87,1,0,144,90,203,225,
+100,234,198,213,35,63,13,0,35,95,9,0,208,58,7,89,
+35,87,5,0,35,55,1,0,208,82,6,81,40,2,80,0,
+9,2,6,224,7,232,9,48,224,49,159,21,127,50,246,13,
+8,6,193,255,207,13,8,6,63,0,150,13,224,49,186,5,
+224,65,214,5,127,50,234,5,224,65,198,5,0,82,0,90,
+229,37,224,65,202,5,28,80,29,88,149,37,224,65,142,13,
+28,48,29,56,128,65,0,74,191,255,164,252,133,29,28,72,
+8,6,224,255,134,13,8,70,224,255,232,79,192,0,0,80,
+9,88,213,13,32,86,32,0,168,81,234,231,128,0,232,239,
+192,0,29,225,28,88,232,79,192,0,9,80,31,2,6,80,
+198,94,3,0,218,21,39,89,203,94,3,0,154,21,100,66,
+241,13,6,96,200,97,130,98,194,98,39,95,1,0,68,58,
+102,95,1,0,68,50,230,97,155,253,200,70,3,0,224,65,
+178,13,6,96,200,97,7,95,0,0,65,58,70,95,0,0,
+65,50,230,97,155,253,127,0,8,72,7,64,88,26,99,239,
+1,0,136,0,6,232,9,48,99,231,5,0,221,49,29,230,
+255,255,9,6,223,255,169,37,8,56,200,58,8,57,7,88,
+208,90,11,57,197,5,70,71,255,255,95,50,198,86,15,0,
+186,253,16,74,29,80,73,81,149,13,102,63,1,0,102,63,
+5,0,102,63,9,0,102,63,13,0,80,50,234,49,234,245,
+6,54,16,0,181,5,70,71,0,0,95,50,252,49,202,253,
+29,80,35,231,5,0,35,239,1,0,72,26,127,0,3,30,
+232,255,99,255,21,0,99,231,17,0,99,215,9,0,3,230,
+16,0,8,208,99,207,13,0,199,209,6,72,99,239,1,0,
+9,200,99,223,5,0,32,238,238,15,0,218,133,69,129,218,
+219,102,0,1,234,5,135,55,1,0,65,58,134,222,0,255,
+219,94,1,0,135,103,1,0,146,13,73,103,0,0,65,58,
+65,74,65,234,221,238,255,15,165,45,167,87,1,0,66,58,
+202,70,240,0,196,66,8,97,202,86,15,0,67,82,12,48,
+201,49,189,49,236,233,191,5,6,54,0,240,0,66,229,5,
+73,7,0,0,65,50,65,74,65,66,249,49,185,13,234,65,
+134,253,133,13,134,95,1,0,73,95,0,0,65,50,65,74,
+65,66,234,65,134,253,221,81,202,238,255,15,250,57,138,197,
+35,207,13,0,35,215,9,0,35,223,5,0,35,239,1,0,
+35,255,21,0,35,231,17,0,3,30,24,0,127,0,3,30,
+216,255,99,255,37,0,99,231,33,0,99,239,21,0,3,230,
+32,0,99,215,29,0,6,232,99,223,25,0,7,208,8,216,
+128,255,26,3,68,102,0,0,44,103,25,143,224,97,178,5,
+128,255,190,5,68,94,0,0,43,95,29,143,224,89,178,5,
+191,255,82,248,68,86,0,0,42,87,33,143,224,81,178,5,
+191,255,160,204,68,78,0,0,41,79,37,143,224,73,194,5,
+0,50,128,255,128,4,68,70,0,0,40,71,41,143,224,65,
+242,5,128,255,102,5,42,54,220,0,191,255,118,204,224,233,
+234,21,67,7,2,0,67,7,3,0,35,62,2,0,99,63,
+13,0,99,7,17,0,35,102,3,0,99,103,5,0,99,7,
+9,0,35,222,4,0,35,214,12,0,1,234,68,14,0,0,
+97,223,245,129,68,94,0,0,43,95,45,143,224,89,226,5,
+29,48,26,56,27,64,191,255,42,204,29,48,26,56,27,64,
+191,255,124,208,10,48,128,255,136,2,35,215,29,0,35,223,
+25,0,35,239,21,0,35,255,37,0,35,231,33,0,3,30,
+40,0,127,0,88,26,99,255,5,0,99,231,1,0,8,80,
+3,224,7,72,9,64,10,72,6,56,38,6,1,0,4,0,
+128,255,142,1,35,231,1,0,35,255,5,0,72,26,127,0,
+88,26,99,255,5,0,99,231,1,0,8,80,3,224,7,72,
+9,64,10,72,6,56,64,54,4,0,128,255,100,1,35,231,
+1,0,35,255,5,0,72,26,127,0,3,30,224,255,99,79,
+29,0,99,255,13,0,99,231,9,0,7,72,3,230,8,0,
+201,102,0,1,99,71,25,0,6,56,9,64,194,21,35,86,
+16,0,202,86,7,0,99,87,5,0,35,94,27,0,28,98,
+76,89,68,90,99,95,1,0,43,79,253,255,38,6,4,0,
+4,0,197,5,38,6,4,0,3,0,128,255,4,1,35,255,
+13,0,35,231,9,0,3,30,32,0,127,0,88,26,99,255,
+5,0,99,231,1,0,7,64,3,224,6,56,38,6,6,0,
+3,0,128,255,220,0,35,231,1,0,35,255,5,0,72,26,
+127,0,88,26,99,255,5,0,99,231,1,0,6,56,3,224,
+38,6,5,0,2,0,128,255,184,0,35,231,1,0,35,255,
 5,0,72,26,127,0,88,26,99,255,5,0,99,231,1,0,
-6,56,3,224,38,6,8,0,2,0,128,255,104,0,35,231,
-1,0,35,255,5,0,72,26,127,0,88,26,99,255,5,0,
-99,231,1,0,8,80,3,224,7,72,9,64,10,72,6,56,
-38,6,18,0,4,0,128,255,60,0,35,231,1,0,35,255,
+8,80,3,224,7,72,9,64,10,72,6,56,38,6,7,0,
+4,0,128,255,140,0,35,231,1,0,35,255,5,0,72,26,
+127,0,88,26,99,255,5,0,99,231,1,0,6,56,3,224,
+38,6,8,0,2,0,128,255,104,0,35,231,1,0,35,255,
 5,0,72,26,127,0,88,26,99,255,5,0,99,231,1,0,
-8,80,3,224,7,72,9,64,10,72,6,56,38,6,19,0,
-4,0,128,255,16,0,35,231,1,0,35,255,5,0,72,26,
-127,0,92,26,99,255,1,0,97,2,0,82,128,255,92,5,
-217,5,10,48,128,255,86,0,31,82,35,255,1,0,68,26,
-127,0,84,26,99,255,9,0,99,231,5,0,99,239,1,0,
-3,230,4,0,128,239,4,0,93,102,0,0,44,102,4,3,
-224,97,234,5,68,86,0,0,42,86,248,129,245,5,128,255,
-238,2,10,48,224,49,170,5,0,80,35,239,1,0,35,255,
-9,0,35,231,5,0,76,26,127,0,84,26,99,255,9,0,
-99,231,5,0,99,239,1,0,3,230,4,0,6,232,191,255,
-164,255,10,48,224,49,178,5,102,239,1,0,35,239,1,0,
-35,255,9,0,35,231,5,0,76,26,127,0,88,26,88,26,
-99,255,5,0,99,231,1,0,32,54,16,0,3,224,31,58,
-191,255,82,255,35,231,1,0,35,255,5,0,72,26,127,0,
-4,0,3,30,228,255,99,255,25,0,99,231,21,0,99,207,
-17,0,3,230,20,0,99,215,13,0,99,239,5,0,99,223,
-9,0,128,239,4,0,99,55,1,0,0,202,128,255,92,2,
-68,222,0,0,59,223,137,135,165,13,59,215,1,0,93,254,
-0,0,63,254,34,0,122,0,59,223,5,0,224,217,234,245,
-68,102,0,0,44,103,113,143,224,97,242,5,128,255,32,2,
-42,54,220,0,191,255,44,203,35,63,1,0,2,50,191,255,
-212,254,25,88,171,0,2,82,75,80,202,54,1,0,98,50,
-145,253,128,255,10,2,35,207,17,0,35,215,13,0,35,223,
-9,0,35,239,5,0,35,255,25,0,35,231,21,0,3,30,
-28,0,127,0,84,26,99,255,9,0,99,231,5,0,99,239,
-1,0,3,230,4,0,6,232,128,255,208,1,68,102,0,0,
-44,103,137,135,125,103,5,0,68,14,0,0,97,239,137,135,
-128,255,188,1,35,239,1,0,35,255,9,0,35,231,5,0,
-76,26,127,0,88,26,99,255,5,0,99,231,1,0,1,50,
-3,224,191,255,16,255,35,231,1,0,35,255,5,0,72,26,
-127,0,80,26,99,255,13,0,99,231,9,0,99,223,5,0,
-3,230,8,0,99,239,1,0,6,216,68,238,0,0,128,255,
-106,1,61,103,141,135,224,97,61,238,140,135,250,5,68,94,
-254,255,43,94,0,96,125,95,1,0,61,55,1,0,68,78,
-254,255,219,49,41,78,0,96,230,73,203,13,68,70,255,255,
-40,70,0,112,232,49,235,5,125,55,1,0,6,232,187,233,
-213,5,31,234,12,50,191,255,68,254,128,255,34,1,29,80,
-35,223,5,0,35,239,1,0,35,255,13,0,35,231,9,0,
-3,30,16,0,127,0,88,26,99,255,5,0,99,231,1,0,
-6,248,3,224,224,249,202,5,128,255,228,0,10,248,1,74,
-9,80,194,82,223,81,106,7,1,0,65,74,9,6,224,255,
-135,253,32,78,18,0,1,50,9,96,194,98,223,97,108,55,
-1,0,65,74,9,6,232,255,247,245,32,78,29,0,1,50,
-9,56,194,58,223,57,103,55,1,0,65,74,9,6,224,255,
-247,245,35,255,5,0,35,231,1,0,72,26,127,0,3,30,
-236,255,99,255,17,0,99,231,13,0,99,215,9,0,3,230,
-12,0,99,239,1,0,99,223,5,0,128,239,4,0,6,216,
-224,217,199,5,27,6,224,255,183,5,31,82,165,37,128,255,
-94,0,10,56,27,48,194,50,6,72,199,73,41,215,1,0,
-105,218,178,5,224,209,218,5,27,48,191,255,170,254,133,21,
-97,210,226,13,68,58,7,70,252,255,199,49,102,7,253,255,
-0,58,27,48,93,254,0,0,63,254,80,0,122,0,0,82,
-35,215,9,0,35,223,5,0,35,239,1,0,35,255,17,0,
-35,231,13,0,3,30,20,0,127,0,88,26,192,25,68,86,
-0,0,42,86,252,129,127,0,192,25,127,0,192,25,127,0,
-192,25,192,25,127,0,192,25,127,0,192,25,127,0,192,25,
-31,82,127,0,192,25,127,0,192,25,127,0,88,0,96,0,
-106,0,116,0,132,0,142,0,152,0,162,0,172,0,182,0,
-192,0,240,0,208,0,218,0,228,0,0,1,246,0,10,1,
-20,1,30,1,40,1,50,1,84,1,98,1,114,1,130,1,
-148,1,164,1,180,1,196,1,212,1,228,1,244,1,74,1,
-88,1,104,1,120,1,138,1,154,1,170,1,186,1,202,1,
-218,1,234,1,128,7,33,0,224,7,68,1,128,7,33,0,
-128,7,193,255,165,13,128,7,33,0,128,7,193,247,213,5,
-128,7,33,0,128,7,193,243,240,239,64,0,224,7,68,1,
-128,7,33,0,128,7,193,241,229,29,128,7,33,0,128,7,
-193,240,149,29,128,7,33,0,128,7,193,112,197,21,128,7,
-33,0,128,7,193,48,245,13,128,7,33,0,128,7,193,16,
-165,13,128,7,33,0,128,7,193,0,213,5,128,7,33,0,
-128,7,65,0,240,239,64,0,224,7,68,1,128,7,33,0,
-128,7,193,255,165,13,128,7,33,0,128,7,193,247,213,5,
-128,7,33,0,128,7,193,243,128,7,78,0,128,7,33,0,
-213,37,128,7,33,0,128,7,193,240,229,29,128,7,33,0,
-128,7,193,241,149,29,128,7,33,0,128,7,193,112,197,21,
-128,7,33,0,128,7,193,48,245,13,128,7,33,0,128,7,
-193,16,165,13,128,7,33,0,128,7,193,0,213,5,128,7,
-33,0,128,7,65,0,240,239,64,0,240,87,64,0,234,95,
-253,255,171,25,106,0,240,255,64,0,255,103,1,0,204,25,
-64,6,63,0,240,103,64,0,236,103,1,0,204,25,64,6,
-192,255,133,21,240,103,64,0,236,103,1,0,204,25,64,6,
-192,247,133,13,240,103,64,0,236,103,1,0,204,25,64,6,
-192,243,64,6,63,0,240,103,64,0,236,103,1,0,204,25,
-64,6,192,241,133,53,240,103,64,0,236,103,1,0,204,25,
-64,6,192,240,133,45,240,103,64,0,236,103,1,0,204,25,
-64,6,192,112,133,37,240,103,64,0,236,103,1,0,204,25,
-64,6,192,48,133,29,240,103,64,0,236,103,1,0,204,25,
-64,6,192,16,133,21,240,103,64,0,236,103,1,0,204,25,
-64,6,192,0,133,13,240,103,64,0,236,103,1,0,204,25,
-64,6,64,0,64,6,63,0,0,0,0,0,127,0,0,0,
-88,90,129,0,0,0,0,0,24,0,0,0,124,90,129,0,
-0,0,0,0,100,7,0,0,116,101,129,0,124,101,129,0,
-132,101,129,0,140,101,129,0,148,101,129,0,156,101,129,0,
-164,101,129,0,0,102,129,0,8,102,129,0,16,102,129,0,
-24,102,129,0,32,102,129,0,40,102,129,0,48,102,129,0,
-64,102,129,0,72,102,129,0,80,102,129,0,88,102,129,0,
-96,102,129,0,104,102,129,0,112,102,129,0,128,102,129,0,
-136,102,129,0,144,102,129,0,152,102,129,0,160,102,129,0,
-168,102,129,0,176,102,129,0,192,102,129,0,200,102,129,0,
-208,102,129,0,216,102,129,0,224,102,129,0,232,102,129,0,
-240,102,129,0,0,103,129,0,8,103,129,0,16,103,129,0,
-24,103,129,0,32,103,129,0,40,103,129,0,48,103,129,0,
-64,103,129,0,72,103,129,0,80,103,129,0,88,103,129,0,
-96,103,129,0,104,103,129,0,112,103,129,0,168,105,129,0,
-172,105,129,0,176,105,129,0,180,105,129,0,184,105,129,0,
-188,105,129,0,192,105,129,0,49,49,49,49,49,49,49,49,
+8,80,3,224,7,72,9,64,10,72,6,56,38,6,18,0,
+4,0,128,255,60,0,35,231,1,0,35,255,5,0,72,26,
+127,0,88,26,99,255,5,0,99,231,1,0,8,80,3,224,
+7,72,9,64,10,72,6,56,38,6,19,0,4,0,128,255,
+16,0,35,231,1,0,35,255,5,0,72,26,127,0,92,26,
+99,255,1,0,97,2,0,82,128,255,92,5,217,5,10,48,
+128,255,86,0,31,82,35,255,1,0,68,26,127,0,84,26,
+99,255,9,0,99,231,5,0,99,239,1,0,3,230,4,0,
+128,239,4,0,93,102,0,0,44,102,4,3,224,97,234,5,
+68,86,0,0,42,86,248,129,245,5,128,255,238,2,10,48,
+224,49,170,5,0,80,35,239,1,0,35,255,9,0,35,231,
+5,0,76,26,127,0,84,26,99,255,9,0,99,231,5,0,
+99,239,1,0,3,230,4,0,6,232,191,255,164,255,10,48,
+224,49,178,5,102,239,1,0,35,239,1,0,35,255,9,0,
+35,231,5,0,76,26,127,0,88,26,88,26,99,255,5,0,
+99,231,1,0,32,54,16,0,3,224,31,58,191,255,82,255,
+35,231,1,0,35,255,5,0,72,26,127,0,4,0,3,30,
+228,255,99,255,25,0,99,231,21,0,99,207,17,0,3,230,
+20,0,99,215,13,0,99,239,5,0,99,223,9,0,128,239,
+4,0,99,55,1,0,0,202,128,255,92,2,68,222,0,0,
+59,223,137,135,165,13,59,215,1,0,93,254,0,0,63,254,
+34,0,122,0,59,223,5,0,224,217,234,245,68,102,0,0,
+44,103,49,143,224,97,242,5,128,255,32,2,42,54,220,0,
+191,255,48,201,35,63,1,0,2,50,191,255,212,254,25,88,
+171,0,2,82,75,80,202,54,1,0,98,50,145,253,128,255,
+10,2,35,207,17,0,35,215,13,0,35,223,9,0,35,239,
+5,0,35,255,25,0,35,231,21,0,3,30,28,0,127,0,
+84,26,99,255,9,0,99,231,5,0,99,239,1,0,3,230,
+4,0,6,232,128,255,208,1,68,102,0,0,44,103,137,135,
+125,103,5,0,68,14,0,0,97,239,137,135,128,255,188,1,
+35,239,1,0,35,255,9,0,35,231,5,0,76,26,127,0,
+88,26,99,255,5,0,99,231,1,0,1,50,3,224,191,255,
+16,255,35,231,1,0,35,255,5,0,72,26,127,0,80,26,
+99,255,13,0,99,231,9,0,99,223,5,0,3,230,8,0,
+99,239,1,0,6,216,68,238,0,0,128,255,106,1,61,103,
+141,135,224,97,61,238,140,135,250,5,68,94,254,255,43,94,
+0,96,125,95,1,0,61,55,1,0,68,78,254,255,219,49,
+41,78,0,96,230,73,203,13,68,70,255,255,40,70,0,112,
+232,49,235,5,125,55,1,0,6,232,187,233,213,5,31,234,
+12,50,191,255,68,254,128,255,34,1,29,80,35,223,5,0,
+35,239,1,0,35,255,13,0,35,231,9,0,3,30,16,0,
+127,0,88,26,99,255,5,0,99,231,1,0,6,248,3,224,
+224,249,202,5,128,255,228,0,10,248,1,74,9,80,194,82,
+223,81,106,7,1,0,65,74,9,6,224,255,135,253,32,78,
+18,0,1,50,9,96,194,98,223,97,108,55,1,0,65,74,
+9,6,232,255,247,245,32,78,29,0,1,50,9,56,194,58,
+223,57,103,55,1,0,65,74,9,6,224,255,247,245,35,255,
+5,0,35,231,1,0,72,26,127,0,3,30,236,255,99,255,
+17,0,99,231,13,0,99,215,9,0,3,230,12,0,99,239,
+1,0,99,223,5,0,128,239,4,0,6,216,224,217,199,5,
+27,6,224,255,183,5,31,82,165,37,128,255,94,0,10,56,
+27,48,194,50,6,72,199,73,41,215,1,0,105,218,178,5,
+224,209,218,5,27,48,191,255,170,254,133,21,97,210,226,13,
+68,58,7,70,252,255,199,49,102,7,253,255,0,58,27,48,
+93,254,0,0,63,254,80,0,122,0,0,82,35,215,9,0,
+35,223,5,0,35,239,1,0,35,255,17,0,35,231,13,0,
+3,30,20,0,127,0,88,26,192,25,68,86,0,0,42,86,
+252,129,127,0,192,25,127,0,192,25,127,0,192,25,192,25,
+127,0,192,25,127,0,192,25,127,0,192,25,31,82,127,0,
+192,25,127,0,192,25,127,0,88,0,96,0,106,0,116,0,
+132,0,142,0,152,0,162,0,172,0,182,0,192,0,240,0,
+208,0,218,0,228,0,0,1,246,0,10,1,20,1,30,1,
+40,1,50,1,84,1,98,1,114,1,130,1,148,1,164,1,
+180,1,196,1,212,1,228,1,244,1,74,1,88,1,104,1,
+120,1,138,1,154,1,170,1,186,1,202,1,218,1,234,1,
+128,7,33,0,224,7,68,1,128,7,33,0,128,7,193,255,
+165,13,128,7,33,0,128,7,193,247,213,5,128,7,33,0,
+128,7,193,243,240,239,64,0,224,7,68,1,128,7,33,0,
+128,7,193,241,229,29,128,7,33,0,128,7,193,240,149,29,
+128,7,33,0,128,7,193,112,197,21,128,7,33,0,128,7,
+193,48,245,13,128,7,33,0,128,7,193,16,165,13,128,7,
+33,0,128,7,193,0,213,5,128,7,33,0,128,7,65,0,
+240,239,64,0,224,7,68,1,128,7,33,0,128,7,193,255,
+165,13,128,7,33,0,128,7,193,247,213,5,128,7,33,0,
+128,7,193,243,128,7,78,0,128,7,33,0,213,37,128,7,
+33,0,128,7,193,240,229,29,128,7,33,0,128,7,193,241,
+149,29,128,7,33,0,128,7,193,112,197,21,128,7,33,0,
+128,7,193,48,245,13,128,7,33,0,128,7,193,16,165,13,
+128,7,33,0,128,7,193,0,213,5,128,7,33,0,128,7,
+65,0,240,239,64,0,240,87,64,0,234,95,253,255,171,25,
+106,0,240,255,64,0,255,103,1,0,204,25,64,6,63,0,
+240,103,64,0,236,103,1,0,204,25,64,6,192,255,133,21,
+240,103,64,0,236,103,1,0,204,25,64,6,192,247,133,13,
+240,103,64,0,236,103,1,0,204,25,64,6,192,243,64,6,
+63,0,240,103,64,0,236,103,1,0,204,25,64,6,192,241,
+133,53,240,103,64,0,236,103,1,0,204,25,64,6,192,240,
+133,45,240,103,64,0,236,103,1,0,204,25,64,6,192,112,
+133,37,240,103,64,0,236,103,1,0,204,25,64,6,192,48,
+133,29,240,103,64,0,236,103,1,0,204,25,64,6,192,16,
+133,21,240,103,64,0,236,103,1,0,204,25,64,6,192,0,
+133,13,240,103,64,0,236,103,1,0,204,25,64,6,64,0,
+64,6,63,0,0,0,0,0,127,0,0,0,52,92,129,0,
+0,0,0,0,24,0,0,0,88,92,129,0,0,0,0,0,
+100,7,0,0,80,103,129,0,88,103,129,0,96,103,129,0,
+104,103,129,0,112,103,129,0,120,103,129,0,128,103,129,0,
+220,103,129,0,228,103,129,0,236,103,129,0,244,103,129,0,
+252,103,129,0,4,104,129,0,12,104,129,0,28,104,129,0,
+36,104,129,0,44,104,129,0,52,104,129,0,60,104,129,0,
+68,104,129,0,76,104,129,0,92,104,129,0,100,104,129,0,
+108,104,129,0,116,104,129,0,124,104,129,0,132,104,129,0,
+140,104,129,0,156,104,129,0,164,104,129,0,172,104,129,0,
+180,104,129,0,188,104,129,0,196,104,129,0,204,104,129,0,
+220,104,129,0,228,104,129,0,236,104,129,0,244,104,129,0,
+252,104,129,0,4,105,129,0,12,105,129,0,68,107,129,0,
+72,107,129,0,76,107,129,0,80,107,129,0,84,107,129,0,
+88,107,129,0,92,107,129,0,49,49,49,49,49,49,49,49,
 49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,
 49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,
-49,49,49,49,49,49,49,49,49,177,177,177,177,177,177,177,
+49,49,177,177,177,177,177,177,177,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,
@@ -5639,8 +5632,9 @@ unsigned char tw_fw_code[] __initdata = 
 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,238,238,34,34,
+187,187,85,85,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,
-238,238,34,34,187,187,85,85,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,
@@ -5759,6049 +5753,6177 @@ unsigned char tw_fw_code[] __initdata = 
 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,
-102,108,97,115,104,70,105,108,101,46,99,112,112,0,0,0,
-67,104,101,99,107,105,110,103,32,102,108,97,115,104,32,109,
-101,109,111,114,121,32,102,105,108,101,115,10,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,102,108,97,115,
+104,70,105,108,101,46,99,112,112,0,0,0,67,104,101,99,
+107,105,110,103,32,102,108,97,115,104,32,109,101,109,111,114,
+121,32,102,105,108,101,115,10,0,0,0,0,45,45,45,45,
 45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
-45,45,45,45,45,32,58,32,32,45,45,45,45,45,45,45,
-45,45,45,32,32,45,45,45,45,45,45,45,45,45,45,45,
-45,45,45,45,45,45,10,0,32,110,111,110,101,32,102,111,
-117,110,100,10,109,97,114,107,105,110,103,32,108,97,115,116,
-32,118,97,108,105,100,32,102,105,108,101,46,46,46,46,0,
-32,102,111,117,110,100,46,10,76,105,110,107,105,110,103,32,
-118,97,108,105,100,32,102,105,108,101,115,46,46,46,46,32,
-10,0,0,0,32,68,111,110,101,10,82,101,112,97,105,114,
-32,99,111,109,112,108,101,116,101,100,32,115,117,99,99,101,
-115,115,102,117,108,108,121,32,10,0,0,0,10,10,82,101,
-112,97,105,114,105,110,103,32,116,104,101,32,102,108,97,115,
-104,32,102,105,108,101,32,115,121,115,116,101,109,10,0,0,
-66,97,100,32,100,105,114,101,99,116,111,114,121,44,32,114,
-101,112,97,105,114,32,97,98,111,114,116,101,100,10,0,0,
-48,120,37,48,56,88,46,48,120,37,48,56,88,32,58,32,
-32,48,120,37,48,56,120,32,32,37,54,100,32,40,61,37,
-35,120,41,10,0,0,0,0,118,97,108,105,100,97,116,105,
-111,110,32,102,97,105,108,101,100,44,32,115,101,97,114,99,
-104,105,110,103,32,102,111,114,32,118,97,108,105,100,32,102,
-105,108,101,115,46,46,46,46,0,0,0,0,32,82,101,112,
-97,105,114,32,102,97,105,108,101,100,32,10,0,0,0,0,
-86,97,108,105,100,97,116,105,110,103,32,102,108,97,115,104,
-32,102,105,108,101,32,115,121,115,116,101,109,46,46,46,46,
-46,10,115,105,103,110,97,116,117,114,101,49,46,115,105,103,
-110,97,116,117,114,101,50,32,58,32,32,97,100,100,114,101,
-115,115,32,32,32,32,32,116,111,116,97,108,32,115,105,122,
-101,10,0,0,85,110,115,117,112,112,111,114,116,101,100,32,
-70,108,97,115,104,70,105,108,101,32,118,101,114,115,105,111,
-110,32,40,97,100,100,114,61,48,120,37,88,41,10,0,0,
-102,108,97,115,104,70,105,108,101,46,99,112,112,0,0,0,
+45,32,58,32,32,45,45,45,45,45,45,45,45,45,45,32,
+32,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
+45,45,10,0,32,110,111,110,101,32,102,111,117,110,100,10,
+109,97,114,107,105,110,103,32,108,97,115,116,32,118,97,108,
+105,100,32,102,105,108,101,46,46,46,46,0,32,102,111,117,
+110,100,46,10,76,105,110,107,105,110,103,32,118,97,108,105,
+100,32,102,105,108,101,115,46,46,46,46,32,10,0,0,0,
+32,68,111,110,101,10,82,101,112,97,105,114,32,99,111,109,
+112,108,101,116,101,100,32,115,117,99,99,101,115,115,102,117,
+108,108,121,32,10,0,0,0,10,10,82,101,112,97,105,114,
+105,110,103,32,116,104,101,32,102,108,97,115,104,32,102,105,
+108,101,32,115,121,115,116,101,109,10,0,0,66,97,100,32,
+100,105,114,101,99,116,111,114,121,44,32,114,101,112,97,105,
+114,32,97,98,111,114,116,101,100,10,0,0,48,120,37,48,
+56,88,46,48,120,37,48,56,88,32,58,32,32,48,120,37,
+48,56,120,32,32,37,54,100,32,40,61,37,35,120,41,10,
+0,0,0,0,118,97,108,105,100,97,116,105,111,110,32,102,
+97,105,108,101,100,44,32,115,101,97,114,99,104,105,110,103,
+32,102,111,114,32,118,97,108,105,100,32,102,105,108,101,115,
+46,46,46,46,0,0,0,0,32,82,101,112,97,105,114,32,
+102,97,105,108,101,100,32,10,0,0,0,0,86,97,108,105,
+100,97,116,105,110,103,32,102,108,97,115,104,32,102,105,108,
+101,32,115,121,115,116,101,109,46,46,46,46,46,10,115,105,
+103,110,97,116,117,114,101,49,46,115,105,103,110,97,116,117,
+114,101,50,32,58,32,32,97,100,100,114,101,115,115,32,32,
+32,32,32,116,111,116,97,108,32,115,105,122,101,10,0,0,
 85,110,115,117,112,112,111,114,116,101,100,32,70,108,97,115,
 104,70,105,108,101,32,118,101,114,115,105,111,110,32,40,97,
-100,100,114,61,48,120,37,88,41,10,0,0,66,73,79,83,
+100,100,114,61,48,120,37,88,41,10,0,0,102,108,97,115,
+104,70,105,108,101,46,99,112,112,0,0,0,85,110,115,117,
+112,112,111,114,116,101,100,32,70,108,97,115,104,70,105,108,
+101,32,118,101,114,115,105,111,110,32,40,97,100,100,114,61,
+48,120,37,88,41,10,0,0,66,73,79,83,32,105,109,97,
+103,101,32,110,111,116,32,102,111,117,110,100,32,105,110,32,
+102,108,97,115,104,33,10,0,70,105,114,109,119,97,114,101,
 32,105,109,97,103,101,32,110,111,116,32,102,111,117,110,100,
-32,105,110,32,102,108,97,115,104,33,10,0,70,105,114,109,
-119,97,114,101,32,105,109,97,103,101,32,110,111,116,32,102,
-111,117,110,100,32,105,110,32,102,108,97,115,104,33,10,0,
-85,110,101,120,112,101,99,116,101,100,32,108,111,99,97,116,
-105,111,110,32,111,102,32,70,105,114,109,119,97,114,101,32,
-105,110,32,102,108,97,115,104,33,10,0,0,32,32,32,69,
-120,112,101,99,116,101,100,32,97,100,100,114,58,32,37,120,
-32,32,32,32,65,99,116,117,97,108,32,97,100,100,114,58,
-32,37,120,10,0,0,0,0,85,110,101,120,112,101,99,116,
-101,100,32,115,105,122,101,32,111,102,32,70,105,114,109,119,
-97,114,101,32,104,101,97,100,101,114,33,10,0,0,0,0,
-32,32,32,69,120,112,101,99,116,101,100,32,115,105,122,101,
-58,32,37,120,32,32,32,32,65,99,116,117,97,108,32,115,
-105,122,101,58,32,37,120,10,0,0,0,0,85,110,101,120,
+32,105,110,32,102,108,97,115,104,33,10,0,85,110,101,120,
 112,101,99,116,101,100,32,108,111,99,97,116,105,111,110,32,
-111,102,32,66,73,79,83,32,105,110,32,102,108,97,115,104,
-33,10,0,0,85,110,101,120,112,101,99,116,101,100,32,115,
-105,122,101,32,111,102,32,66,73,79,83,32,104,101,97,100,
-101,114,33,10,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,22,22,128,0,0,0,0,0,22,22,128,0,
-0,0,0,0,22,22,128,0,0,0,0,0,22,22,128,0,
-0,0,0,0,22,22,128,0,0,0,0,0,22,22,128,0,
-0,0,0,0,22,22,128,0,16,0,0,0,8,0,0,0,
-8,0,0,0,32,0,0,0,64,0,0,0,64,0,0,0,
+111,102,32,70,105,114,109,119,97,114,101,32,105,110,32,102,
+108,97,115,104,33,10,0,0,32,32,32,69,120,112,101,99,
+116,101,100,32,97,100,100,114,58,32,37,120,32,32,32,32,
+65,99,116,117,97,108,32,97,100,100,114,58,32,37,120,10,
+0,0,0,0,85,110,101,120,112,101,99,116,101,100,32,115,
+105,122,101,32,111,102,32,70,105,114,109,119,97,114,101,32,
+104,101,97,100,101,114,33,10,0,0,0,0,32,32,32,69,
+120,112,101,99,116,101,100,32,115,105,122,101,58,32,37,120,
+32,32,32,32,65,99,116,117,97,108,32,115,105,122,101,58,
+32,37,120,10,0,0,0,0,85,110,101,120,112,101,99,116,
+101,100,32,108,111,99,97,116,105,111,110,32,111,102,32,66,
+73,79,83,32,105,110,32,102,108,97,115,104,33,10,0,0,
+85,110,101,120,112,101,99,116,101,100,32,115,105,122,101,32,
+111,102,32,66,73,79,83,32,104,101,97,100,101,114,33,10,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+18,24,128,0,0,0,0,0,18,24,128,0,0,0,0,0,
+18,24,128,0,0,0,0,0,18,24,128,0,0,0,0,0,
+18,24,128,0,0,0,0,0,18,24,128,0,0,0,0,0,
+18,24,128,0,16,0,0,0,8,0,0,0,8,0,0,0,
+32,0,0,0,64,0,0,0,64,0,0,0,64,0,0,0,
 64,0,0,0,64,0,0,0,64,0,0,0,64,0,0,0,
 64,0,0,0,64,0,0,0,64,0,0,0,64,0,0,0,
 64,0,0,0,64,0,0,0,64,0,0,0,64,0,0,0,
-64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-184,11,128,0,0,0,0,0,40,11,128,0,0,0,0,0,
-220,10,128,0,0,0,0,0,228,10,128,0,0,0,0,0,
-236,10,128,0,0,0,0,0,244,10,128,0,0,0,0,0,
-32,11,128,0,0,0,0,0,0,0,0,0,0,0,0,0,
-184,11,128,0,0,0,0,0,156,14,128,0,0,0,0,0,
-220,10,128,0,0,0,0,0,228,10,128,0,0,0,0,0,
-236,10,128,0,0,0,0,0,244,10,128,0,0,0,0,0,
-32,11,128,0,0,0,0,0,0,0,0,0,0,0,0,0,
-22,22,128,0,0,0,0,0,22,22,128,0,0,0,0,0,
-22,22,128,0,0,0,0,0,22,22,128,0,0,0,0,0,
-22,22,128,0,0,0,0,0,22,22,128,0,0,0,0,0,
-22,22,128,0,0,0,0,0,0,0,0,0,0,0,0,0,
-230,15,128,0,0,0,0,0,72,15,128,0,0,0,0,0,
-38,15,128,0,0,0,0,0,46,15,128,0,0,0,0,0,
-54,15,128,0,0,0,0,0,22,22,128,0,0,0,0,0,
-62,15,128,0,0,0,0,0,0,0,0,0,0,0,0,0,
-22,22,128,0,0,0,0,0,22,22,128,0,0,0,0,0,
-22,22,128,0,0,0,0,0,22,22,128,0,0,0,0,0,
-22,22,128,0,0,0,0,0,22,22,128,0,0,0,0,0,
-22,22,128,0,0,0,0,0,0,0,0,0,0,0,0,0,
-226,18,128,0,0,0,0,0,68,18,128,0,0,0,0,0,
-34,18,128,0,0,0,0,0,42,18,128,0,0,0,0,0,
-50,18,128,0,0,0,0,0,22,22,128,0,0,0,0,0,
-58,18,128,0,232,3,0,0,0,0,0,0,0,0,0,0,
-67,43,43,32,114,117,110,116,105,109,101,32,97,98,111,114,
-116,0,0,0,102,114,101,101,105,110,103,32,97,114,114,97,
-121,32,110,111,116,32,97,108,108,111,99,97,116,101,100,32,
-98,121,32,97,110,32,97,114,114,97,121,32,110,101,119,32,
-111,112,101,114,97,116,105,111,110,0,0,0,116,101,114,109,
-105,110,97,116,101,40,41,32,99,97,108,108,101,100,32,98,
-121,32,116,104,101,32,101,120,99,101,112,116,105,111,110,32,
-104,97,110,100,108,105,110,103,32,109,101,99,104,97,110,105,
-115,109,0,0,114,101,116,117,114,110,101,100,32,102,114,111,
-109,32,97,32,117,115,101,114,45,100,101,102,105,110,101,100,
-32,116,101,114,109,105,110,97,116,101,40,41,32,114,111,117,
-116,105,110,101,0,0,0,0,109,97,105,110,40,41,32,99,
-97,108,108,101,100,32,109,111,114,101,32,116,104,97,110,32,
-111,110,99,101,0,0,0,0,97,32,112,117,114,101,32,118,
-105,114,116,117,97,108,32,102,117,110,99,116,105,111,110,32,
-119,97,115,32,99,97,108,108,101,100,0,0,105,110,118,97,
-108,105,100,32,100,121,110,97,109,105,99,32,99,97,115,116,
-0,0,0,0,105,110,118,97,108,105,100,32,116,121,112,101,
-105,100,32,111,112,101,114,97,116,105,111,110,0,0,0,0,
-105,110,116,101,114,110,97,108,32,101,114,114,111,114,58,32,
-115,116,97,116,105,99,32,111,98,106,101,99,116,32,109,97,
-114,107,101,100,32,102,111,114,32,100,101,115,116,114,117,99,
-116,105,111,110,32,109,111,114,101,32,116,104,97,110,32,111,
-110,99,101,0,37,115,58,32,37,115,10,0,40,110,117,108,
-108,41,0,0,48,49,50,51,52,53,54,55,56,57,97,98,
-99,100,101,102,48,49,50,51,52,53,54,55,56,57,65,66,
-67,68,69,70,40,70,108,111,97,116,105,110,103,32,112,111,
-105,110,116,32,111,117,116,112,117,116,32,117,110,115,117,112,
-112,111,114,116,101,100,32,119,47,45,110,111,102,108,111,97,
-116,105,111,32,111,114,32,45,102,110,111,110,101,41,0,44,
-32,108,105,110,101,32,0,34,44,32,0,102,105,108,101,32,
-0,0,0,65,115,115,101,114,116,105,111,110,32,102,97,105,
-108,101,100,58,32,0,0,95,117,110,107,110,111,119,110,32,
-115,116,114,105,110,103,95,0,0,0,0,95,78,97,109,101,
-108,101,115,115,95,0,20,0,2,55,128,0,166,41,128,0,
-0,0,0,0,246,53,128,0,0,0,0,0,0,0,0,0,
-0,0,0,0,64,48,32,16,68,51,34,17,3,0,24,0,
-240,23,5,0,173,147,200,40,240,23,5,0,0,0,128,0,
-0,226,128,255,4,0,31,232,8,72,7,64,6,56,97,2,
-0,82,32,54,20,0,133,255,114,20,1,66,0,74,177,5,
-128,7,6,0,0,66,64,38,133,0,36,38,188,23,64,30,
-150,0,35,30,240,174,28,10,65,25,4,38,0,64,4,38,
-0,64,64,46,134,0,37,46,188,151,64,14,133,0,1,14,
-188,23,186,5,128,7,6,0,1,240,93,86,2,0,42,86,
-20,90,234,167,32,0,128,166,255,0,128,174,255,255,0,178,
-0,186,0,194,0,202,0,210,93,54,0,0,38,54,230,0,
-128,255,216,1,128,7,0,0,6,80,198,94,3,0,178,5,
-128,7,56,0,39,89,203,94,3,0,178,5,128,7,44,0,
-100,66,185,5,128,7,36,0,6,96,200,97,130,98,194,98,
-39,95,1,0,68,58,102,95,1,0,68,50,230,97,179,5,
-191,7,240,255,200,70,3,0,224,65,186,5,128,7,28,0,
-6,96,200,97,7,95,0,0,65,58,70,95,0,0,65,50,
-230,97,179,5,191,7,240,255,127,0,0,0,1,0,0,0,
-0,0,0,0,84,123,132,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,128,7,193,0,
-7,16,6,72,8,232,194,233,9,224,32,70,238,15,0,50,
-245,93,129,50,198,142,0,1,224,137,138,13,65,18,2,134,
-255,255,144,87,1,0,138,54,0,255,198,126,1,0,224,121,
-194,21,65,18,2,118,255,255,142,87,1,0,65,74,9,110,
-255,255,10,96,172,0,12,88,139,0,77,95,0,0,8,86,
-1,0,202,70,255,15,197,61,65,18,2,142,255,255,145,87,
-1,0,65,18,2,134,255,255,144,63,1,0,199,126,240,0,
-15,112,196,114,14,81,199,110,15,0,13,62,3,0,8,96,
-170,97,9,104,172,105,234,65,191,5,13,110,0,240,0,98,
-133,13,65,74,9,94,255,255,75,7,0,0,65,106,65,98,
-252,105,161,5,245,13,231,97,214,245,197,13,65,74,9,86,
-255,255,65,106,13,142,255,255,145,135,1,0,74,135,0,0,
-65,98,231,97,198,245,7,120,200,121,207,70,255,15,253,17,
-154,165,64,6,223,0,8,16,198,17,7,136,145,0,17,72,
-6,62,255,255,8,6,223,255,169,45,9,136,200,138,9,128,
-16,137,17,120,208,122,15,137,197,5,95,18,66,79,0,0,
-194,118,15,0,224,113,170,253,16,106,6,112,77,113,245,13,
-98,143,1,0,2,102,4,0,108,143,1,0,2,94,8,0,
-107,143,1,0,2,86,12,0,106,143,1,0,80,18,238,17,
-138,245,2,22,16,0,181,5,66,79,0,0,95,18,231,17,
-202,253,6,16,2,80,127,0,142,7,225,243,6,16,99,63,
-9,0,99,71,5,0,99,79,1,0,59,6,140,5,128,0,
-63,6,230,1,128,0,60,6,136,0,128,0,57,6,144,20,
-133,0,0,234,31,192,27,184,2,142,16,0,49,215,1,0,
-2,134,20,0,48,183,1,0,2,126,24,0,47,79,1,0,
-2,118,28,0,46,119,1,0,9,16,186,17,99,7,13,0,
-35,102,12,0,12,110,4,0,109,7,1,0,35,86,12,0,
-10,94,8,0,107,7,1,0,35,134,12,0,16,142,12,0,
-113,7,1,0,233,201,177,5,249,113,187,5,2,232,128,233,
-233,193,177,5,248,113,251,5,2,80,223,81,10,248,2,80,
-220,81,10,224,247,73,235,5,238,185,201,5,246,209,162,5,
-162,217,238,73,162,13,26,48,9,56,14,120,169,121,15,64,
-63,6,24,3,128,0,124,0,46,6,144,20,133,0,29,224,
-206,225,45,6,204,20,133,0,29,208,205,209,133,29,68,226,
-28,102,252,255,35,86,12,0,10,94,12,0,43,23,1,0,
-44,143,1,0,209,17,60,87,1,0,68,226,60,95,1,0,
-68,226,2,48,10,56,11,64,191,255,142,254,250,225,138,237,
-48,6,204,20,133,0,29,224,208,225,47,6,20,21,133,0,
-29,208,207,209,46,6,20,21,133,0,29,200,206,201,133,45,
-250,225,137,13,35,102,12,0,12,110,12,0,45,23,1,0,
-245,5,35,86,12,0,10,94,4,0,43,23,1,0,60,143,
-1,0,209,17,68,226,68,226,28,134,252,255,35,118,12,0,
-14,126,4,0,47,87,1,0,48,111,1,0,205,81,60,95,
-1,0,68,226,2,48,10,56,11,64,191,255,190,252,249,225,
-138,221,44,6,20,21,133,0,29,224,204,225,43,6,32,21,
-133,0,29,208,203,209,165,53,68,226,28,86,252,255,35,134,
-12,0,16,142,12,0,49,255,1,0,42,127,1,0,207,249,
-68,226,28,118,252,255,35,102,12,0,12,110,4,0,45,207,
-1,0,46,95,1,0,203,201,68,226,28,86,252,255,42,199,
-1,0,64,86,0,0,3,90,106,95,10,248,31,48,25,56,
-24,142,15,0,16,122,17,128,79,129,16,64,191,255,76,252,
-64,86,0,0,0,90,106,95,10,248,250,225,225,205,46,6,
-20,21,133,0,29,224,206,225,45,6,20,21,133,0,29,208,
-205,209,44,6,20,21,133,0,29,200,204,201,133,45,250,225,
-137,13,35,86,12,0,10,94,12,0,43,23,1,0,245,5,
-35,134,12,0,16,142,4,0,49,23,1,0,60,127,1,0,
-207,17,68,226,68,226,28,118,252,255,35,102,12,0,12,110,
-4,0,45,87,1,0,46,95,1,0,203,81,60,95,1,0,
-68,226,2,48,10,56,11,64,191,255,84,252,249,225,138,221,
-42,6,32,21,133,0,29,16,202,17,49,6,116,21,133,0,
-29,248,209,249,48,6,116,21,133,0,208,233,226,249,146,77,
-35,118,12,0,14,126,12,0,44,6,0,0,0,0,47,95,
-1,0,12,104,171,105,173,249,197,61,65,234,29,86,255,255,
-10,231,0,0,220,142,48,0,17,128,164,130,16,112,194,114,
-14,120,35,102,12,0,15,104,204,105,45,103,1,0,68,18,
-2,94,252,255,43,87,1,0,12,208,202,209,58,79,1,0,
-220,142,128,0,224,137,178,5,224,73,178,29,220,134,3,0,
-16,112,194,114,14,120,35,102,12,0,15,104,204,105,45,103,
-1,0,224,97,226,13,220,94,8,0,224,89,162,5,194,74,
-204,73,220,86,8,0,224,81,162,5,162,74,122,79,1,0,
-255,17,202,197,35,55,9,0,35,63,5,0,35,71,1,0,
-63,6,136,5,128,0,123,0,78,6,255,243,128,7,225,0,
-6,232,7,224,37,143,21,128,224,137,178,5,130,255,236,1,
-37,135,25,128,224,129,178,5,130,255,14,58,37,127,29,128,
-224,121,178,5,191,255,76,250,37,119,33,128,224,113,194,5,
-0,50,130,255,100,83,29,48,28,104,13,56,128,255,178,2,
-64,6,255,0,128,7,225,0,6,232,7,224,224,233,226,13,
-61,143,1,0,224,137,210,5,125,7,1,0,128,255,108,0,
-129,226,201,5,29,48,130,255,134,22,64,6,255,0,132,7,
-97,0,7,16,8,56,32,71,37,183,40,71,41,0,6,72,
-99,23,1,0,38,6,84,123,132,0,130,255,66,28,196,255,
-144,140,170,29,196,63,144,140,0,50,129,255,102,171,1,138,
-99,143,5,0,31,50,128,255,42,0,61,6,128,29,148,0,
-29,48,31,58,128,255,36,0,224,81,186,253,35,54,4,0,
-2,58,191,255,130,255,133,5,33,6,2,99,0,0,97,0,
-33,6,26,99,0,0,97,0,33,6,120,191,1,0,97,0,
-128,7,225,0,0,226,64,22,134,0,34,238,144,142,125,7,
-1,0,29,54,4,0,0,58,32,70,124,0,191,255,90,251,
-125,7,26,0,65,226,29,238,128,0,28,6,216,255,134,245,
-32,142,40,0,100,143,93,134,100,7,97,134,100,7,101,134,
-64,6,255,0,3,30,216,255,99,79,37,0,99,255,21,0,
-99,239,9,0,99,231,13,0,99,223,17,0,6,224,252,0,
-7,216,99,71,33,0,35,142,32,0,99,143,1,0,35,134,
-24,0,208,126,7,0,99,127,5,0,32,54,255,0,130,255,
-114,21,10,232,29,48,35,79,5,0,35,71,1,0,27,56,
-130,255,106,38,229,87,64,0,224,7,96,1,10,216,29,48,
-28,56,128,255,66,0,196,231,144,140,242,5,32,110,0,16,
-64,14,32,0,97,111,20,0,251,47,32,0,29,48,130,255,
-22,21,35,223,17,0,35,231,13,0,35,239,9,0,35,255,
-21,0,3,30,40,0,127,0,71,7,0,0,71,7,1,0,
-2,82,127,0,128,7,225,240,231,0,36,215,33,175,7,216,
-26,64,6,192,38,6,120,123,132,0,130,255,242,26,229,87,
-64,0,224,7,96,1,36,135,101,134,10,200,16,6,216,255,
-158,21,36,127,93,134,65,122,100,127,93,134,15,6,216,255,
-182,5,100,7,93,134,36,119,101,134,65,114,100,119,101,134,
-181,5,32,222,255,0,36,231,93,134,43,6,144,142,133,0,
-199,226,203,225,60,238,4,0,29,48,0,58,32,70,124,0,
-191,255,38,250,29,48,27,56,24,64,32,78,124,0,128,255,
-40,246,156,143,5,0,17,6,143,255,210,13,32,134,113,0,
-92,135,4,0,28,127,29,0,24,146,82,121,143,126,4,0,
-92,127,29,0,124,215,1,0,249,47,32,0,64,6,255,240,
-128,7,225,16,6,224,229,87,64,0,224,7,96,1,10,216,
-36,143,101,134,32,70,124,0,224,137,167,37,36,239,97,134,
-60,54,4,0,199,234,46,6,144,142,133,0,206,233,61,62,
-4,0,191,255,86,248,61,111,1,0,36,103,97,134,124,111,
-1,0,65,98,100,103,97,134,12,6,216,255,182,5,100,7,
-97,134,36,95,101,134,95,90,100,95,101,134,213,13,60,54,
-4,0,0,58,191,255,130,249,124,7,26,0,10,82,92,87,
-11,0,124,7,1,0,251,47,32,0,64,6,255,16,128,7,
-225,16,6,232,189,0,7,224,188,0,130,255,170,23,29,48,
-28,56,128,255,130,12,128,255,174,0,129,255,6,3,10,216,
-129,255,130,165,224,217,194,5,27,48,128,255,118,19,38,6,
-60,126,132,0,130,255,168,25,59,6,204,125,132,0,27,48,
-130,255,156,25,37,54,36,128,130,255,148,25,38,6,112,126,
-132,0,130,255,138,25,38,6,252,125,132,0,32,62,23,0,
-32,70,24,0,130,255,120,25,38,6,28,126,132,0,1,58,
-9,66,130,255,106,25,38,6,148,126,132,0,39,6,220,125,
-132,0,40,6,176,126,132,0,130,255,84,25,38,6,232,125,
-132,0,130,255,74,25,28,56,29,64,38,6,188,126,132,0,
-130,255,60,25,37,54,36,128,130,255,52,25,27,48,130,255,
-46,25,37,54,36,128,130,255,38,25,129,255,218,230,0,82,
-64,6,255,16,33,6,38,102,0,0,97,0,128,7,33,0,
-196,223,144,140,138,21,32,54,128,0,128,255,184,1,224,81,
-162,13,38,6,92,127,132,0,32,62,79,0,0,66,191,255,
-144,252,224,81,64,6,63,0,140,7,97,0,49,6,128,112,
-96,80,48,6,136,119,102,85,99,135,5,0,99,143,1,0,
-196,223,144,140,170,69,32,126,0,1,64,14,32,0,97,127,
-12,0,3,48,129,255,224,12,10,232,224,233,130,53,29,48,
-128,255,168,0,196,199,144,140,162,13,38,6,208,127,132,0,
-39,6,224,70,133,0,130,255,150,24,197,45,29,62,24,0,
-0,50,64,70,1,0,128,255,52,1,10,232,224,233,202,13,
-38,6,236,127,132,0,39,6,224,70,133,0,130,255,112,24,
-196,7,144,140,245,21,29,48,128,255,160,243,29,56,10,64,
-38,6,104,127,132,0,130,255,86,24,197,13,38,6,136,127,
-132,0,130,255,74,24,229,5,38,6,160,127,132,0,130,255,
-62,24,32,86,0,1,64,14,32,0,97,87,14,0,229,87,
-64,0,224,7,96,1,10,232,64,86,0,0,10,87,34,241,
-10,248,32,86,191,255,74,249,64,86,0,0,74,255,34,241,
-253,47,32,0,76,6,127,0,6,72,40,6,224,70,133,0,
-6,62,244,1,8,54,16,0,213,77,9,80,37,94,40,128,
-4,98,10,111,0,0,11,119,0,0,65,82,65,90,13,16,
-174,17,218,5,224,105,178,5,95,98,202,245,224,17,154,61,
-68,74,9,16,2,119,0,0,65,18,224,113,202,253,95,18,
-169,17,242,45,201,17,2,94,1,0,37,102,44,128,4,106,
-11,119,0,0,12,87,0,0,65,90,65,98,14,16,170,17,
-218,5,224,113,178,5,95,106,202,245,224,17,170,29,32,86,
-16,0,8,16,9,88,11,135,0,0,66,135,0,0,65,90,
-65,18,224,129,186,5,95,18,181,5,95,82,218,245,224,81,
-226,5,66,7,0,0,65,18,95,82,202,253,70,7,0,0,
-65,74,231,73,177,181,127,0,6,88,33,6,182,68,1,0,
-97,0,33,6,98,37,0,0,97,0,128,7,33,0,224,49,
-210,5,129,58,185,5,130,255,86,17,64,6,63,0,128,7,
-33,0,38,6,152,175,138,0,39,6,136,129,132,0,1,66,
-129,255,154,29,64,6,63,0,156,7,225,0,6,232,99,7,
-17,0,99,7,21,0,99,7,24,0,35,126,36,0,99,127,
-13,0,32,134,17,0,99,135,33,0,99,7,30,0,128,255,
-182,1,106,7,9,0,46,6,36,64,1,0,106,119,5,0,
-32,110,236,176,106,111,29,0,32,102,0,16,106,103,33,0,
-32,94,232,3,106,95,21,0,99,87,9,0,0,226,221,207,
-6,0,194,29,189,79,5,0,99,79,26,0,29,48,0,58,
-35,70,36,0,128,255,104,1,97,82,146,13,38,6,152,129,
-132,0,32,62,134,0,0,66,191,255,54,250,12,50,12,58,
-35,70,8,0,128,255,64,1,65,226,61,239,13,0,224,233,
-250,221,224,225,215,61,61,6,152,175,138,0,29,48,31,58,
-191,255,120,250,224,81,186,253,35,239,9,0,229,87,64,0,
-224,7,96,1,61,255,0,0,220,249,125,255,0,0,10,224,
-252,47,32,0,224,249,138,13,29,48,61,135,5,0,63,6,
-38,12,128,0,112,0,31,122,99,127,1,0,32,54,236,176,
-32,62,0,16,1,66,35,78,4,0,128,255,242,0,38,6,
-152,175,138,0,128,255,240,0,224,81,162,13,38,6,168,129,
-132,0,32,62,183,1,0,66,191,255,166,249,224,81,35,55,
-9,0,38,239,12,0,102,7,0,0,128,255,210,0,29,80,
-92,6,255,0,128,7,225,16,36,239,77,139,61,239,0,0,
-224,233,210,5,29,48,128,255,154,15,229,45,229,87,64,0,
-224,7,96,1,10,216,0,50,128,255,208,135,10,224,38,6,
-180,129,132,0,130,255,184,21,28,48,3,58,128,255,28,137,
-10,232,224,233,210,5,29,48,128,255,104,15,181,5,128,255,
-134,0,224,225,242,13,60,23,49,0,3,58,72,18,34,87,
-0,0,34,103,5,0,220,81,10,48,63,6,226,12,128,0,
-108,0,251,47,32,0,224,233,210,5,196,31,144,140,128,255,
-94,0,29,80,64,6,255,16,128,7,33,0,50,6,180,175,
-138,0,114,7,1,0,38,6,0,71,133,0,130,255,46,20,
-64,6,63,0,33,6,28,11,0,0,97,0,33,6,240,40,
-0,0,97,0,33,6,206,63,1,0,97,0,33,6,230,192,
-1,0,97,0,33,6,66,192,1,0,97,0,33,6,186,206,
-1,0,97,0,33,6,210,77,1,0,97,0,33,6,8,78,
-1,0,97,0,132,7,225,48,7,224,0,18,28,6,240,255,
-241,5,252,22,120,4,45,6,184,29,148,0,205,17,2,232,
-224,233,186,5,128,7,164,1,0,82,28,6,240,255,177,13,
-252,22,40,0,32,134,160,180,208,17,34,127,17,0,224,121,
-162,5,2,80,10,208,224,209,186,5,128,7,126,1,58,223,
-17,0,224,217,186,5,128,7,114,1,59,23,105,0,63,6,
-198,13,128,0,2,22,80,0,34,87,0,0,34,119,5,0,
-219,81,10,48,110,0,224,81,186,5,221,151,0,0,59,23,
-105,0,3,56,2,22,64,1,34,87,0,0,34,111,5,0,
-219,81,10,48,63,6,236,13,128,0,109,0,35,103,1,0,
-10,16,224,97,194,45,224,17,250,29,132,23,21,139,224,17,
-130,21,221,215,0,0,210,13,1,82,93,87,4,0,221,151,
-0,0,47,6,49,144,145,0,207,225,92,87,0,0,245,21,
-157,111,5,0,224,105,178,21,224,17,154,21,93,7,4,0,
-221,23,0,0,197,13,157,95,5,0,224,89,130,13,221,215,
-0,0,218,5,93,7,4,0,221,23,0,0,221,215,0,0,
-130,69,221,215,2,0,218,61,59,23,105,0,0,226,2,22,
-96,0,34,55,0,0,34,87,5,0,219,49,63,6,116,14,
-128,0,106,0,224,81,194,5,221,47,1,0,1,226,125,7,
-17,0,93,7,20,0,93,7,21,0,93,7,22,0,31,82,
-125,87,9,0,125,87,13,0,93,7,23,0,99,7,5,0,
-61,54,40,4,26,56,28,64,35,78,4,0,128,255,146,0,
-35,127,5,0,36,119,57,139,128,121,207,113,100,119,57,139,
-26,48,128,255,132,0,197,82,125,87,117,4,125,7,113,4,
-221,215,0,0,250,21,221,215,2,0,194,21,26,48,128,255,
-112,0,99,7,5,0,61,54,40,4,0,58,35,70,4,0,
-128,255,102,0,35,103,5,0,36,111,57,139,204,105,100,111,
-57,139,253,23,1,0,253,87,3,0,234,17,226,5,125,23,
-2,0,29,48,128,255,34,0,68,6,255,48,132,135,13,139,
-240,142,100,0,100,143,17,139,127,0,128,7,33,0,128,255,
-48,0,64,6,63,0,33,6,18,43,0,0,97,0,33,6,
-54,189,1,0,97,0,33,6,204,135,1,0,97,0,33,6,
-4,130,1,0,97,0,33,6,198,189,1,0,97,0,33,6,
-94,147,1,0,97,0,128,7,193,16,6,224,7,232,229,87,
-64,0,224,7,96,1,60,143,8,0,10,216,224,137,170,13,
-124,239,5,0,124,239,1,0,125,239,17,0,125,239,21,0,
-181,21,60,119,5,0,125,119,21,0,60,111,5,0,109,239,
-17,0,60,103,1,0,125,103,17,0,60,95,1,0,107,239,
-21,0,124,239,5,0,60,87,8,0,65,82,124,87,8,0,
-251,47,32,0,64,6,223,16,128,7,225,0,6,232,7,248,
-229,87,64,0,224,7,96,1,61,143,8,0,10,224,224,137,
-170,13,38,6,72,131,132,0,32,62,115,6,0,66,191,255,
-16,246,181,37,61,135,5,0,61,23,1,0,240,17,127,23,
-1,0,234,5,125,7,5,0,125,7,1,0,149,21,61,111,
-1,0,45,111,17,0,61,95,5,0,125,111,1,0,109,95,
-21,0,61,87,5,0,61,143,1,0,106,143,17,0,61,135,
-8,0,95,130,125,135,8,0,252,47,32,0,61,127,8,0,
-224,121,174,13,38,6,72,131,132,0,32,62,153,6,0,66,
-191,255,174,245,224,81,64,6,255,0,128,7,225,16,7,224,
-6,232,61,143,8,0,59,6,88,131,132,0,97,138,254,5,
-27,48,32,62,176,6,0,66,191,255,134,245,229,87,64,0,
-224,7,96,1,10,248,61,23,1,0,61,95,5,0,226,225,
-250,29,235,17,138,29,125,7,1,0,61,119,8,0,125,7,
-5,0,95,114,125,119,8,0,255,47,32,0,61,111,8,0,
-224,105,174,53,27,48,32,62,197,6,0,66,191,255,66,245,
-224,81,165,45,60,103,17,0,125,103,1,0,245,5,235,225,
-218,5,60,87,21,0,125,87,5,0,60,135,17,0,60,143,
-21,0,61,111,8,0,113,135,17,0,95,106,60,127,17,0,
-60,119,21,0,125,111,8,0,111,119,21,0,255,47,32,0,
-61,103,8,0,224,97,142,13,27,48,32,62,224,6,0,66,
-191,255,238,244,224,81,64,6,255,16,49,6,60,180,138,0,
-100,143,33,139,100,7,29,139,0,18,226,126,12,0,44,6,
-60,180,138,0,204,121,12,118,12,0,2,104,236,111,64,2,
-206,105,111,111,9,0,111,7,5,0,111,7,1,0,65,18,
-2,6,1,248,182,237,226,86,12,0,204,81,106,7,9,0,
-106,7,5,0,106,7,1,0,127,0,128,7,193,16,6,216,
-7,224,229,87,64,0,224,7,96,1,10,232,133,21,224,225,
-162,13,229,87,64,0,224,135,96,1,229,87,64,0,224,7,
-96,1,213,5,253,47,32,0,0,82,213,21,36,143,33,139,
-224,137,226,237,36,231,33,139,36,127,29,139,60,135,9,0,
-65,122,100,135,33,139,100,127,29,139,253,47,32,0,124,223,
-1,0,28,80,64,6,223,16,128,7,97,0,6,232,224,233,
-154,13,38,6,104,131,132,0,32,62,103,7,0,66,191,255,
-32,244,229,87,64,0,224,7,96,1,36,23,33,139,10,248,
-125,23,9,0,36,143,29,139,100,239,33,139,95,138,100,143,
-29,139,255,47,32,0,64,6,127,0,128,7,225,16,6,216,
-7,232,8,224,224,233,154,13,38,6,136,131,132,0,32,62,
-148,7,0,66,191,255,218,243,59,23,1,0,224,17,178,21,
-224,225,194,5,60,23,9,0,213,5,34,231,5,0,123,239,
-1,0,125,231,5,0,124,239,9,0,125,23,9,0,98,239,
-5,0,245,5,125,239,9,0,125,239,5,0,123,239,1,0,
-64,6,255,16,128,7,225,0,7,224,60,63,1,0,6,232,
-128,255,88,0,29,48,28,56,10,64,191,255,144,255,64,6,
-255,0,128,7,97,0,38,143,1,0,1,234,241,57,186,13,
-39,23,9,0,226,57,218,5,102,7,1,0,0,234,181,5,
-102,23,1,0,39,23,5,0,39,87,9,0,106,23,5,0,
-39,87,5,0,39,23,9,0,106,23,9,0,7,48,191,255,
-10,255,29,80,64,6,127,0,38,87,1,0,224,81,10,16,
-210,29,34,95,1,0,39,127,13,0,43,103,9,0,43,111,
-13,0,39,119,9,0,239,105,177,13,187,5,238,97,131,13,
-234,17,186,5,0,82,181,13,34,87,5,0,133,13,34,23,
-9,0,234,17,250,229,34,23,5,0,2,80,127,0,38,87,
-1,0,224,81,10,16,162,13,34,143,1,0,231,137,226,5,
-34,23,9,0,234,17,154,253,0,18,2,80,127,0,130,7,
-225,243,6,224,7,200,0,194,0,186,0,234,229,87,64,0,
-224,7,96,1,10,176,60,223,1,0,99,7,1,0,224,217,
-186,5,128,7,70,1,28,48,25,56,191,255,110,255,10,56,
-7,48,224,57,218,5,27,16,195,15,0,0,245,5,39,23,
-9,0,251,17,186,5,195,23,0,0,57,223,13,0,57,71,
-24,0,57,215,9,0,8,72,191,74,218,65,225,111,0,0,
-205,73,219,73,195,207,0,0,178,13,245,45,60,103,1,0,
-236,57,202,5,195,15,0,0,133,13,39,63,5,0,39,87,
-1,0,202,207,42,0,178,245,195,207,0,0,234,29,42,103,
-9,0,42,111,13,0,42,87,24,0,10,120,191,122,204,81,
-225,135,0,0,208,121,205,121,239,217,219,13,177,5,234,209,
-169,13,65,234,221,0,7,192,7,184,195,15,0,0,195,7,
-0,0,181,5,195,15,0,0,195,215,0,0,154,53,34,87,
-1,0,202,207,42,0,186,21,213,5,60,95,1,0,235,17,
-130,13,34,23,9,0,34,87,1,0,202,207,42,0,226,245,
-60,87,1,0,234,17,186,5,195,23,0,0,195,215,0,0,
-250,21,34,103,1,0,44,95,13,0,44,87,9,0,235,73,
-209,13,187,5,234,65,163,13,2,184,224,233,170,5,2,192,
-65,234,221,0,195,7,0,0,181,5,195,23,0,0,34,23,
-9,0,195,207,0,0,194,5,195,215,0,0,218,5,60,127,
-1,0,239,17,138,149,32,142,124,176,113,239,0,0,92,138,
-113,55,1,0,32,142,112,176,113,199,1,0,68,138,113,191,
-1,0,1,114,64,119,126,176,246,47,32,0,3,87,0,0,
-202,86,1,0,66,6,255,243,128,7,128,7,128,7,33,0,
-224,49,210,5,129,58,185,5,130,255,196,7,64,6,63,0,
-128,7,97,0,128,255,72,0,10,16,224,17,186,5,1,234,
-213,13,0,234,2,6,226,255,146,13,38,6,12,133,132,0,
-32,62,39,1,0,66,191,255,24,241,29,80,64,6,127,0,
-128,7,33,0,50,6,184,228,140,0,114,7,1,0,38,6,
-24,71,133,0,130,255,54,12,64,6,63,0,33,6,20,199,
-1,0,97,0,128,7,97,0,6,232,189,0,68,239,80,139,
-167,0,68,63,81,139,0,50,128,255,74,0,196,191,144,140,
-99,234,210,5,100,7,141,140,100,7,144,140,64,6,127,0,
-128,7,97,0,6,232,189,0,68,239,80,139,224,233,226,55,
-0,0,128,255,32,0,98,234,146,13,99,234,154,13,36,127,
-141,140,65,122,100,127,141,140,181,5,100,7,141,140,64,6,
-127,0,4,135,144,140,32,150,239,255,82,129,198,126,1,0,
-196,122,15,129,68,135,144,140,224,49,194,5,32,118,0,4,
-181,5,32,118,0,1,50,6,20,0,32,0,114,119,0,0,
-127,0,144,7,225,16,0,226,0,50,128,255,208,40,172,82,
-10,232,1,50,128,255,198,40,140,82,196,82,10,233,68,239,
-82,139,36,102,8,132,12,54,4,0,29,64,168,0,37,62,
-88,128,130,255,44,23,38,6,164,133,132,0,36,62,8,132,
-130,255,124,12,4,87,82,139,10,6,240,255,166,5,1,226,
-32,62,36,244,99,63,1,0,32,70,4,244,99,71,5,0,
-3,122,99,127,9,0,0,50,5,74,129,255,68,11,100,87,
-73,139,10,64,0,50,32,62,80,0,129,255,2,164,100,87,
-77,139,10,48,129,255,54,164,10,232,224,233,130,29,59,6,
-120,133,132,0,27,48,130,255,38,12,29,6,192,253,250,5,
-38,6,184,133,132,0,130,255,22,12,229,5,38,6,104,133,
-132,0,130,255,10,12,27,48,130,255,4,12,0,50,191,255,
-20,255,128,255,24,248,128,255,238,4,38,6,238,238,34,34,
-129,255,86,47,38,6,153,153,119,119,129,255,76,47,28,48,
-128,255,186,39,128,255,254,39,128,255,194,39,36,95,77,139,
-43,95,0,0,224,89,186,29,191,255,172,246,0,234,165,21,
-99,239,21,0,99,239,25,0,64,86,1,0,99,87,29,0,
-35,54,12,0,32,62,128,0,0,66,128,255,208,39,93,238,
-1,0,128,255,128,39,234,233,198,237,181,5,191,255,128,246,
-191,255,124,242,128,255,104,0,80,6,255,16,128,7,33,0,
-36,63,169,172,38,6,68,134,132,0,130,255,114,11,36,63,
-141,140,38,6,224,133,132,0,130,255,100,11,32,63,225,176,
-38,6,244,133,132,0,130,255,86,11,128,255,136,39,10,56,
-38,6,8,134,132,0,130,255,70,11,32,63,53,176,38,6,
-28,134,132,0,130,255,56,11,128,255,114,39,10,56,38,6,
-48,134,132,0,130,255,40,11,64,6,63,0,128,7,33,0,
-68,7,84,139,38,6,204,204,68,68,129,255,124,46,128,255,
-12,39,128,255,80,39,128,255,220,38,128,255,200,38,128,255,
-76,39,129,255,14,157,128,255,76,39,128,255,80,39,128,255,
-84,39,128,255,88,39,128,255,236,38,128,255,240,38,128,255,
-84,39,191,255,172,243,129,255,98,162,191,255,230,238,129,255,
-172,139,128,255,254,169,128,255,38,163,128,255,90,62,128,255,
-254,61,128,255,56,39,129,255,130,167,129,255,86,118,128,255,
-40,192,128,255,160,38,0,18,2,136,193,138,46,6,188,228,
-140,0,206,137,32,102,160,5,226,103,32,2,113,103,0,0,
-65,18,103,18,166,245,3,82,100,87,86,139,38,6,255,255,
-17,17,129,255,228,45,38,6,187,187,85,85,129,255,218,45,
-64,6,63,0,136,7,225,0,198,0,224,49,146,21,228,119,
-69,139,6,113,100,119,68,139,32,54,236,176,100,7,241,131,
-32,62,16,0,0,66,128,255,92,38,128,7,106,1,35,54,
-3,0,35,62,4,0,129,255,180,167,36,239,241,131,10,16,
-228,111,69,139,99,111,14,0,32,86,60,0,234,23,194,2,
-29,6,237,255,154,13,2,102,5,0,32,86,96,39,234,103,
-128,90,100,95,237,131,29,6,237,255,167,45,36,127,237,131,
-99,7,14,0,162,121,106,122,183,5,100,7,237,131,0,98,
-12,112,193,114,43,6,188,228,140,0,203,113,36,87,237,131,
-46,95,0,0,235,81,175,13,235,17,134,13,228,143,87,139,
-227,127,15,0,17,121,99,127,14,0,65,98,103,98,150,237,
-227,119,15,0,224,113,194,5,0,234,100,7,241,131,29,6,
-237,255,239,5,38,6,104,134,132,0,130,255,162,9,29,6,
-240,255,190,21,29,56,38,6,140,134,132,0,130,255,144,9,
-227,111,15,0,99,111,8,0,35,22,8,0,34,63,1,0,
-29,48,128,255,166,0,165,53,29,6,237,255,222,21,29,230,
-240,255,28,56,38,6,88,134,132,0,130,255,98,9,227,103,
-15,0,99,103,12,0,35,22,12,0,34,63,1,0,28,48,
-128,255,200,1,181,29,29,6,237,255,234,5,38,6,116,134,
-132,0,130,255,58,9,229,87,64,0,224,7,96,1,36,95,
-241,131,10,248,235,233,250,5,29,86,1,0,100,87,241,131,
-100,7,68,139,255,47,32,0,229,29,229,87,64,0,224,7,
-96,1,36,143,241,131,10,248,241,233,202,13,29,134,1,0,
-100,135,241,131,227,127,15,0,228,111,69,139,15,105,100,111,
-68,139,255,47,32,0,32,54,236,176,32,62,16,0,0,66,
-128,255,242,36,72,6,255,0,3,30,208,255,99,63,37,0,
-99,255,29,0,99,215,25,0,99,223,21,0,99,231,17,0,
-99,239,13,0,6,224,128,255,138,161,224,81,138,13,38,6,
-224,134,132,0,130,255,168,8,128,7,6,1,0,234,1,210,
-28,48,0,58,0,66,3,72,128,255,26,37,10,216,28,48,
-27,56,128,255,88,36,59,143,0,0,224,137,218,253,59,135,
-12,0,224,129,234,5,227,127,3,0,224,121,170,5,0,210,
-123,7,0,0,27,48,191,255,70,243,195,199,36,0,146,37,
-28,48,128,255,232,36,10,232,224,233,234,13,28,48,128,255,
-254,160,10,64,28,72,32,54,34,0,39,6,244,134,132,0,
-191,255,148,236,149,13,29,6,255,239,226,5,38,6,176,134,
-132,0,130,255,42,8,29,6,255,239,138,13,0,234,229,5,
-38,6,152,134,132,0,130,255,22,8,224,209,130,53,4,95,
-84,139,224,89,202,45,195,207,36,0,242,29,224,233,218,29,
-28,48,128,255,144,36,10,232,29,6,160,253,138,13,28,64,
-15,50,37,62,96,128,191,255,62,236,197,21,224,233,250,5,
-38,6,8,135,132,0,130,255,214,7,197,13,38,6,200,134,
-132,0,130,255,202,7,229,5,38,6,32,135,132,0,130,255,
-190,7,32,54,244,1,129,255,172,218,229,5,38,6,56,135,
-132,0,130,255,170,7,37,54,104,128,130,255,162,7,35,215,
-25,0,35,223,21,0,35,231,17,0,35,239,13,0,35,255,
-29,0,3,30,48,0,127,0,3,30,236,255,99,63,9,0,
-99,255,1,0,97,50,209,5,194,13,98,50,194,37,165,45,
-38,6,112,135,132,0,130,255,102,7,129,255,114,118,165,37,
-195,231,8,0,162,21,38,6,152,135,132,0,130,255,80,7,
-31,50,191,255,78,235,128,255,228,35,191,255,62,235,32,54,
-244,1,129,255,48,218,229,13,38,6,128,135,132,0,130,255,
-46,7,133,13,38,6,168,135,132,0,130,255,34,7,129,255,
-88,118,37,54,106,128,130,255,22,7,35,255,1,0,3,30,
-20,0,127,0,128,7,97,0,128,255,182,242,10,232,128,255,
-248,242,10,72,9,16,133,85,2,88,37,102,108,128,4,106,
-65,90,11,119,255,255,65,98,12,127,255,255,14,80,175,81,
-218,5,224,113,178,5,95,106,202,245,224,81,202,61,68,18,
-2,80,65,82,10,119,255,255,224,113,202,253,95,82,162,81,
-162,53,194,81,10,102,1,0,37,110,112,128,4,114,65,98,
-12,127,255,255,65,106,13,87,255,255,15,88,170,89,218,5,
-224,121,178,5,95,114,202,245,224,89,218,29,32,94,16,0,
-36,86,244,131,65,18,2,135,255,255,65,82,74,135,255,255,
-224,129,186,5,95,82,181,5,95,90,218,245,224,89,226,5,
-65,82,74,7,255,255,95,90,202,253,36,22,244,131,66,7,
-16,0,229,5,65,18,29,112,201,113,238,17,225,173,38,6,
-180,135,132,0,36,62,244,131,130,255,68,6,64,6,127,0,
-190,7,225,243,3,30,208,255,230,0,61,6,12,72,133,0,
-61,198,120,255,0,218,27,16,195,18,216,17,34,23,0,0,
-226,49,210,5,65,218,27,6,239,255,230,245,27,6,239,255,
-170,5,95,218,32,54,16,0,130,255,68,0,10,224,224,225,
-146,13,35,142,3,0,99,143,5,0,28,48,0,58,128,255,
-120,8,32,86,232,3,3,18,67,23,148,0,67,23,164,0,
-67,23,156,0,99,87,169,0,32,22,44,1,99,23,153,0,
-32,86,88,2,2,18,67,23,140,0,99,87,161,0,32,22,
-100,0,99,23,145,0,67,7,132,0,60,95,5,0,99,23,
-137,0,224,89,186,5,0,18,213,5,60,23,9,0,171,17,
-163,18,224,89,186,5,0,82,213,5,60,87,13,0,171,81,
-163,82,60,215,9,0,234,17,169,37,99,215,25,0,26,200,
-1,186,229,21,25,16,224,17,146,21,224,17,250,5,8,50,
-129,255,172,255,10,16,224,17,146,13,3,87,164,0,66,87,
-0,0,35,87,169,0,98,87,5,0,95,186,72,202,224,185,
-170,237,26,22,8,0,124,23,9,0,213,61,99,215,13,0,
-35,102,12,0,60,87,5,0,99,103,21,0,224,81,186,5,
-0,18,213,5,60,23,9,0,170,17,163,18,224,17,186,5,
-0,210,245,13,60,87,5,0,99,87,17,0,35,215,21,0,
-35,86,16,0,42,127,1,0,58,215,1,0,175,209,163,210,
-35,119,21,0,28,48,46,119,1,0,35,62,16,0,99,119,
-17,0,1,66,35,78,164,0,128,255,212,17,60,87,5,0,
-99,87,17,0,35,22,16,0,34,95,1,0,195,210,203,209,
-99,215,9,0,27,200,195,202,25,16,216,17,34,215,5,0,
-10,82,74,208,0,186,128,7,242,1,60,95,5,0,224,89,
+0,0,0,0,0,0,0,0,0,0,0,0,100,12,128,0,
+0,0,0,0,236,11,128,0,0,0,0,0,160,11,128,0,
+0,0,0,0,168,11,128,0,0,0,0,0,176,11,128,0,
+0,0,0,0,184,11,128,0,0,0,0,0,228,11,128,0,
+0,0,0,0,0,0,0,0,0,0,0,0,18,24,128,0,
+0,0,0,0,18,24,128,0,0,0,0,0,18,24,128,0,
+0,0,0,0,18,24,128,0,0,0,0,0,18,24,128,0,
+0,0,0,0,18,24,128,0,0,0,0,0,18,24,128,0,
+0,0,0,0,0,0,0,0,0,0,0,0,226,17,128,0,
+0,0,0,0,68,17,128,0,0,0,0,0,34,17,128,0,
+0,0,0,0,42,17,128,0,0,0,0,0,50,17,128,0,
+0,0,0,0,18,24,128,0,0,0,0,0,58,17,128,0,
+0,0,0,0,0,0,0,0,0,0,0,0,18,24,128,0,
+0,0,0,0,18,24,128,0,0,0,0,0,18,24,128,0,
+0,0,0,0,18,24,128,0,0,0,0,0,18,24,128,0,
+0,0,0,0,18,24,128,0,0,0,0,0,18,24,128,0,
+0,0,0,0,0,0,0,0,0,0,0,0,222,20,128,0,
+0,0,0,0,64,20,128,0,0,0,0,0,30,20,128,0,
+0,0,0,0,38,20,128,0,0,0,0,0,46,20,128,0,
+0,0,0,0,18,24,128,0,0,0,0,0,54,20,128,0,
+232,3,0,0,0,0,0,0,0,0,0,0,67,43,43,32,
+114,117,110,116,105,109,101,32,97,98,111,114,116,0,0,0,
+102,114,101,101,105,110,103,32,97,114,114,97,121,32,110,111,
+116,32,97,108,108,111,99,97,116,101,100,32,98,121,32,97,
+110,32,97,114,114,97,121,32,110,101,119,32,111,112,101,114,
+97,116,105,111,110,0,0,0,116,101,114,109,105,110,97,116,
+101,40,41,32,99,97,108,108,101,100,32,98,121,32,116,104,
+101,32,101,120,99,101,112,116,105,111,110,32,104,97,110,100,
+108,105,110,103,32,109,101,99,104,97,110,105,115,109,0,0,
+114,101,116,117,114,110,101,100,32,102,114,111,109,32,97,32,
+117,115,101,114,45,100,101,102,105,110,101,100,32,116,101,114,
+109,105,110,97,116,101,40,41,32,114,111,117,116,105,110,101,
+0,0,0,0,109,97,105,110,40,41,32,99,97,108,108,101,
+100,32,109,111,114,101,32,116,104,97,110,32,111,110,99,101,
+0,0,0,0,97,32,112,117,114,101,32,118,105,114,116,117,
+97,108,32,102,117,110,99,116,105,111,110,32,119,97,115,32,
+99,97,108,108,101,100,0,0,105,110,118,97,108,105,100,32,
+100,121,110,97,109,105,99,32,99,97,115,116,0,0,0,0,
+105,110,118,97,108,105,100,32,116,121,112,101,105,100,32,111,
+112,101,114,97,116,105,111,110,0,0,0,0,105,110,116,101,
+114,110,97,108,32,101,114,114,111,114,58,32,115,116,97,116,
+105,99,32,111,98,106,101,99,116,32,109,97,114,107,101,100,
+32,102,111,114,32,100,101,115,116,114,117,99,116,105,111,110,
+32,109,111,114,101,32,116,104,97,110,32,111,110,99,101,0,
+37,115,58,32,37,115,10,0,40,110,117,108,108,41,0,0,
+48,49,50,51,52,53,54,55,56,57,97,98,99,100,101,102,
+48,49,50,51,52,53,54,55,56,57,65,66,67,68,69,70,
+40,70,108,111,97,116,105,110,103,32,112,111,105,110,116,32,
+111,117,116,112,117,116,32,117,110,115,117,112,112,111,114,116,
+101,100,32,119,47,45,110,111,102,108,111,97,116,105,111,32,
+111,114,32,45,102,110,111,110,101,41,0,44,32,108,105,110,
+101,32,0,34,44,32,0,102,105,108,101,32,0,0,0,65,
+115,115,101,114,116,105,111,110,32,102,97,105,108,101,100,58,
+32,0,0,95,117,110,107,110,111,119,110,32,115,116,114,105,
+110,103,95,0,0,0,0,95,78,97,109,101,108,101,115,115,
+95,0,20,0,254,56,128,0,162,43,128,0,0,0,0,0,
+242,55,128,0,0,0,0,0,0,0,0,0,0,0,0,0,
+64,48,32,16,68,51,34,17,3,0,24,0,108,35,5,0,
+34,197,156,1,108,35,5,0,0,0,128,0,0,226,128,255,
+4,0,31,232,8,72,7,64,6,56,97,2,0,82,32,54,
+20,0,133,255,238,31,1,66,0,74,177,5,128,7,6,0,
+0,66,64,38,133,0,36,38,56,35,64,30,150,0,35,30,
+80,186,28,10,65,25,4,38,0,64,4,38,0,64,64,46,
+134,0,37,46,56,163,64,14,133,0,1,14,56,35,186,5,
+128,7,6,0,1,240,93,86,2,0,42,86,184,98,234,167,
+32,0,128,166,255,0,128,174,255,255,0,178,0,186,0,194,
+0,202,0,210,93,54,0,0,38,54,230,0,128,255,216,1,
+128,7,0,0,6,80,198,94,3,0,178,5,128,7,56,0,
+39,89,203,94,3,0,178,5,128,7,44,0,100,66,185,5,
+128,7,36,0,6,96,200,97,130,98,194,98,39,95,1,0,
+68,58,102,95,1,0,68,50,230,97,179,5,191,7,240,255,
+200,70,3,0,224,65,186,5,128,7,28,0,6,96,200,97,
+7,95,0,0,65,58,70,95,0,0,65,50,230,97,179,5,
+191,7,240,255,127,0,0,0,1,0,0,0,0,0,0,0,
+52,134,132,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,128,7,193,0,7,16,6,72,
+8,232,194,233,9,224,32,70,238,15,0,50,245,93,129,50,
+198,142,0,1,224,137,138,13,65,18,2,134,255,255,144,87,
+1,0,138,54,0,255,198,126,1,0,224,121,194,21,65,18,
+2,118,255,255,142,87,1,0,65,74,9,110,255,255,10,96,
+172,0,12,88,139,0,77,95,0,0,8,86,1,0,202,70,
+255,15,197,61,65,18,2,142,255,255,145,87,1,0,65,18,
+2,134,255,255,144,63,1,0,199,126,240,0,15,112,196,114,
+14,81,199,110,15,0,13,62,3,0,8,96,170,97,9,104,
+172,105,234,65,191,5,13,110,0,240,0,98,133,13,65,74,
+9,94,255,255,75,7,0,0,65,106,65,98,252,105,161,5,
+245,13,231,97,214,245,197,13,65,74,9,86,255,255,65,106,
+13,142,255,255,145,135,1,0,74,135,0,0,65,98,231,97,
+198,245,7,120,200,121,207,70,255,15,253,17,154,165,64,6,
+223,0,8,16,198,17,7,136,145,0,17,72,6,62,255,255,
+8,6,223,255,169,45,9,136,200,138,9,128,16,137,17,120,
+208,122,15,137,197,5,95,18,66,79,0,0,194,118,15,0,
+224,113,170,253,16,106,6,112,77,113,245,13,98,143,1,0,
+2,102,4,0,108,143,1,0,2,94,8,0,107,143,1,0,
+2,86,12,0,106,143,1,0,80,18,238,17,138,245,2,22,
+16,0,181,5,66,79,0,0,95,18,231,17,202,253,6,16,
+2,80,127,0,142,7,225,243,6,16,99,63,9,0,99,71,
+5,0,99,79,1,0,59,6,140,5,128,0,63,6,230,1,
+128,0,60,6,136,0,128,0,57,6,12,32,133,0,0,234,
+31,192,27,184,2,142,16,0,49,215,1,0,2,134,20,0,
+48,183,1,0,2,126,24,0,47,79,1,0,2,118,28,0,
+46,119,1,0,9,16,186,17,99,7,13,0,35,102,12,0,
+12,110,4,0,109,7,1,0,35,86,12,0,10,94,8,0,
+107,7,1,0,35,134,12,0,16,142,12,0,113,7,1,0,
+233,201,177,5,249,113,187,5,2,232,128,233,233,193,177,5,
+248,113,251,5,2,80,223,81,10,248,2,80,220,81,10,224,
+247,73,235,5,238,185,201,5,246,209,162,5,162,217,238,73,
+162,13,26,48,9,56,14,120,169,121,15,64,63,6,24,3,
+128,0,124,0,46,6,12,32,133,0,29,224,206,225,45,6,
+72,32,133,0,29,208,205,209,133,29,68,226,28,102,252,255,
+35,86,12,0,10,94,12,0,43,23,1,0,44,143,1,0,
+209,17,60,87,1,0,68,226,60,95,1,0,68,226,2,48,
+10,56,11,64,191,255,142,254,250,225,138,237,48,6,72,32,
+133,0,29,224,208,225,47,6,144,32,133,0,29,208,207,209,
+46,6,144,32,133,0,29,200,206,201,133,45,250,225,137,13,
+35,102,12,0,12,110,12,0,45,23,1,0,245,5,35,86,
+12,0,10,94,4,0,43,23,1,0,60,143,1,0,209,17,
+68,226,68,226,28,134,252,255,35,118,12,0,14,126,4,0,
+47,87,1,0,48,111,1,0,205,81,60,95,1,0,68,226,
+2,48,10,56,11,64,191,255,190,252,249,225,138,221,44,6,
+144,32,133,0,29,224,204,225,43,6,156,32,133,0,29,208,
+203,209,165,53,68,226,28,86,252,255,35,134,12,0,16,142,
+12,0,49,255,1,0,42,127,1,0,207,249,68,226,28,118,
+252,255,35,102,12,0,12,110,4,0,45,207,1,0,46,95,
+1,0,203,201,68,226,28,86,252,255,42,199,1,0,64,86,
+0,0,3,90,106,95,10,248,31,48,25,56,24,142,15,0,
+16,122,17,128,79,129,16,64,191,255,76,252,64,86,0,0,
+0,90,106,95,10,248,250,225,225,205,46,6,144,32,133,0,
+29,224,206,225,45,6,144,32,133,0,29,208,205,209,44,6,
+144,32,133,0,29,200,204,201,133,45,250,225,137,13,35,86,
+12,0,10,94,12,0,43,23,1,0,245,5,35,134,12,0,
+16,142,4,0,49,23,1,0,60,127,1,0,207,17,68,226,
+68,226,28,118,252,255,35,102,12,0,12,110,4,0,45,87,
+1,0,46,95,1,0,203,81,60,95,1,0,68,226,2,48,
+10,56,11,64,191,255,84,252,249,225,138,221,42,6,156,32,
+133,0,29,16,202,17,49,6,240,32,133,0,29,248,209,249,
+48,6,240,32,133,0,208,233,226,249,146,77,35,118,12,0,
+14,126,12,0,44,6,0,0,0,0,47,95,1,0,12,104,
+171,105,173,249,197,61,65,234,29,86,255,255,10,231,0,0,
+220,142,48,0,17,128,164,130,16,112,194,114,14,120,35,102,
+12,0,15,104,204,105,45,103,1,0,68,18,2,94,252,255,
+43,87,1,0,12,208,202,209,58,79,1,0,220,142,128,0,
+224,137,178,5,224,73,178,29,220,134,3,0,16,112,194,114,
+14,120,35,102,12,0,15,104,204,105,45,103,1,0,224,97,
+226,13,220,94,8,0,224,89,162,5,194,74,204,73,220,86,
+8,0,224,81,162,5,162,74,122,79,1,0,255,17,202,197,
+35,55,9,0,35,63,5,0,35,71,1,0,63,6,136,5,
+128,0,123,0,78,6,255,243,128,7,225,0,6,232,7,224,
+37,143,21,128,224,137,178,5,130,255,144,10,37,135,25,128,
+224,129,178,5,130,255,178,66,37,127,29,128,224,121,178,5,
+191,255,76,250,37,119,33,128,224,113,194,5,0,50,130,255,
+8,92,29,48,28,104,13,56,128,255,178,2,64,6,255,0,
+128,7,225,0,6,232,7,224,224,233,226,13,61,143,1,0,
+224,137,210,5,125,7,1,0,128,255,108,0,129,226,201,5,
+29,48,130,255,42,31,64,6,255,0,132,7,97,0,7,16,
+8,56,32,71,37,183,40,71,41,0,6,72,99,23,1,0,
+38,6,52,134,132,0,130,255,230,36,196,255,156,140,170,29,
+196,63,156,140,0,50,129,255,8,180,1,138,99,143,5,0,
+31,50,128,255,42,0,61,6,224,40,148,0,29,48,31,58,
+128,255,36,0,224,81,186,253,35,54,4,0,2,58,191,255,
+130,255,133,5,33,6,170,99,0,0,97,0,33,6,194,99,
+0,0,97,0,33,6,198,193,1,0,97,0,128,7,225,0,
+0,226,64,22,134,0,34,238,240,153,125,7,1,0,29,54,
+4,0,0,58,32,70,124,0,191,255,90,251,125,7,26,0,
+65,226,29,238,128,0,28,6,216,255,134,245,32,142,40,0,
+100,143,105,134,100,7,109,134,100,7,113,134,64,6,255,0,
+3,30,216,255,99,79,37,0,99,255,21,0,99,239,9,0,
+99,231,13,0,99,223,17,0,6,224,252,0,7,216,99,71,
+33,0,35,142,32,0,99,143,1,0,35,134,24,0,208,126,
+7,0,99,127,5,0,32,54,255,0,130,255,22,30,10,232,
+29,48,35,79,5,0,35,71,1,0,27,56,130,255,14,47,
+229,87,64,0,224,7,96,1,10,216,29,48,28,56,128,255,
+66,0,196,231,156,140,242,5,32,110,0,16,64,14,32,0,
+97,111,20,0,251,47,32,0,29,48,130,255,186,29,35,223,
+17,0,35,231,13,0,35,239,9,0,35,255,21,0,3,30,
+40,0,127,0,71,7,0,0,71,7,1,0,2,82,127,0,
+128,7,225,240,231,0,36,215,45,175,7,216,26,64,6,192,
+38,6,88,134,132,0,130,255,150,35,229,87,64,0,224,7,
+96,1,36,135,113,134,10,200,16,6,216,255,158,21,36,127,
+105,134,65,122,100,127,105,134,15,6,216,255,182,5,100,7,
+105,134,36,119,113,134,65,114,100,119,113,134,181,5,32,222,
+255,0,36,231,105,134,43,6,240,153,133,0,199,226,203,225,
+60,238,4,0,29,48,0,58,32,70,124,0,191,255,38,250,
+29,48,27,56,24,64,32,78,124,0,128,255,100,250,156,143,
+5,0,17,6,143,255,210,13,32,134,113,0,92,135,4,0,
+28,127,29,0,24,146,82,121,143,126,4,0,92,127,29,0,
+124,215,1,0,249,47,32,0,64,6,255,240,128,7,225,16,
+6,224,229,87,64,0,224,7,96,1,10,216,36,143,113,134,
+32,70,124,0,224,137,167,37,36,239,109,134,60,54,4,0,
+199,234,46,6,240,153,133,0,206,233,61,62,4,0,191,255,
+86,248,61,111,1,0,36,103,109,134,124,111,1,0,65,98,
+100,103,109,134,12,6,216,255,182,5,100,7,109,134,36,95,
+113,134,95,90,100,95,113,134,213,13,60,54,4,0,0,58,
+191,255,130,249,124,7,26,0,10,82,92,87,11,0,124,7,
+1,0,251,47,32,0,64,6,255,16,128,7,225,16,6,232,
+189,0,7,224,188,0,130,255,78,32,29,48,28,56,128,255,
+66,13,128,255,174,0,129,255,112,8,10,216,129,255,36,174,
+224,217,194,5,27,48,128,255,54,20,38,6,28,137,132,0,
+130,255,76,34,59,6,172,136,132,0,27,48,130,255,64,34,
+37,54,36,128,130,255,56,34,38,6,80,137,132,0,130,255,
+46,34,38,6,220,136,132,0,32,62,23,0,32,70,24,0,
+130,255,28,34,38,6,252,136,132,0,1,58,13,66,130,255,
+14,34,38,6,116,137,132,0,39,6,188,136,132,0,40,6,
+144,137,132,0,130,255,248,33,38,6,200,136,132,0,130,255,
+238,33,28,56,29,64,38,6,156,137,132,0,130,255,224,33,
+37,54,36,128,130,255,216,33,27,48,130,255,210,33,37,54,
+36,128,130,255,202,33,129,255,126,239,0,82,64,6,255,16,
+33,6,206,102,0,0,97,0,128,7,33,0,196,223,156,140,
+138,21,32,54,128,0,128,255,184,1,224,81,162,13,38,6,
+60,138,132,0,32,62,79,0,0,66,191,255,144,252,224,81,
+64,6,63,0,140,7,97,0,49,6,128,112,96,80,48,6,
+136,119,102,85,99,135,5,0,99,143,1,0,196,223,156,140,
+170,69,32,126,0,1,64,14,32,0,97,127,12,0,3,48,
+129,255,236,18,10,232,224,233,130,53,29,48,128,255,168,0,
+196,199,156,140,162,13,38,6,176,138,132,0,39,6,104,82,
+133,0,130,255,58,33,197,45,29,62,24,0,0,50,64,70,
+1,0,128,255,52,1,10,232,224,233,202,13,38,6,204,138,
+132,0,39,6,104,82,133,0,130,255,20,33,196,7,156,140,
+245,21,29,48,128,255,220,247,29,56,10,64,38,6,72,138,
+132,0,130,255,250,32,197,13,38,6,104,138,132,0,130,255,
+238,32,229,5,38,6,128,138,132,0,130,255,226,32,32,86,
+0,1,64,14,32,0,97,87,14,0,229,87,64,0,224,7,
+96,1,10,232,64,86,0,0,10,87,34,241,10,248,32,86,
+191,255,74,249,64,86,0,0,74,255,34,241,253,47,32,0,
+76,6,127,0,6,72,40,6,104,82,133,0,6,62,244,1,
+8,54,16,0,213,77,9,80,37,94,40,128,4,98,10,111,
+0,0,11,119,0,0,65,82,65,90,13,16,174,17,218,5,
+224,105,178,5,95,98,202,245,224,17,154,61,68,74,9,16,
+2,119,0,0,65,18,224,113,202,253,95,18,169,17,242,45,
+201,17,2,94,1,0,37,102,44,128,4,106,11,119,0,0,
+12,87,0,0,65,90,65,98,14,16,170,17,218,5,224,113,
+178,5,95,106,202,245,224,17,170,29,32,86,16,0,8,16,
+9,88,11,135,0,0,66,135,0,0,65,90,65,18,224,129,
+186,5,95,18,181,5,95,82,218,245,224,81,226,5,66,7,
+0,0,65,18,95,82,202,253,70,7,0,0,65,74,231,73,
+177,181,127,0,6,88,33,6,138,70,1,0,97,0,33,6,
+98,37,0,0,97,0,128,7,33,0,224,49,210,5,129,58,
+185,5,130,255,250,25,64,6,63,0,128,7,33,0,38,6,
+248,186,138,0,39,6,104,140,132,0,1,66,129,255,166,35,
+64,6,63,0,156,7,225,0,6,232,99,7,17,0,99,7,
+21,0,99,7,24,0,35,126,36,0,99,127,13,0,32,134,
+17,0,99,135,33,0,99,7,30,0,128,255,182,1,106,7,
+9,0,46,6,248,65,1,0,106,119,5,0,32,110,236,176,
+106,111,29,0,32,102,0,16,106,103,33,0,32,94,232,3,
+106,95,21,0,99,87,9,0,0,226,221,207,6,0,194,29,
+189,79,5,0,99,79,26,0,29,48,0,58,35,70,36,0,
+128,255,104,1,97,82,146,13,38,6,120,140,132,0,32,62,
+134,0,0,66,191,255,54,250,12,50,12,58,35,70,8,0,
+128,255,64,1,65,226,61,239,13,0,224,233,250,221,224,225,
+215,61,61,6,248,186,138,0,29,48,31,58,191,255,120,250,
+224,81,186,253,35,239,9,0,229,87,64,0,224,7,96,1,
+61,255,0,0,220,249,125,255,0,0,10,224,252,47,32,0,
+224,249,138,13,29,48,61,135,5,0,63,6,38,12,128,0,
+112,0,31,122,99,127,1,0,32,54,236,176,32,62,0,16,
+1,66,35,78,4,0,128,255,242,0,38,6,248,186,138,0,
+128,255,240,0,224,81,162,13,38,6,136,140,132,0,32,62,
+183,1,0,66,191,255,166,249,224,81,35,55,9,0,38,239,
+12,0,102,7,0,0,128,255,210,0,29,80,92,6,255,0,
+128,7,225,16,36,239,89,139,61,239,0,0,224,233,210,5,
+29,48,128,255,90,16,229,45,229,87,64,0,224,7,96,1,
+10,216,0,50,128,255,12,140,10,224,38,6,148,140,132,0,
+130,255,92,30,28,48,3,58,128,255,88,141,10,232,224,233,
+210,5,29,48,128,255,40,16,181,5,128,255,134,0,224,225,
+242,13,60,23,49,0,3,58,72,18,34,87,0,0,34,103,
+5,0,220,81,10,48,63,6,226,12,128,0,108,0,251,47,
+32,0,224,233,210,5,196,31,156,140,128,255,94,0,29,80,
+64,6,255,16,128,7,33,0,50,6,20,187,138,0,114,7,
+1,0,38,6,136,82,133,0,130,255,210,28,64,6,63,0,
+33,6,28,11,0,0,97,0,33,6,240,40,0,0,97,0,
+33,6,162,65,1,0,97,0,33,6,52,195,1,0,97,0,
+33,6,144,194,1,0,97,0,33,6,10,209,1,0,97,0,
+33,6,166,79,1,0,97,0,33,6,220,79,1,0,97,0,
+132,7,225,48,7,224,0,18,28,6,240,255,241,5,252,22,
+120,4,45,6,24,41,148,0,205,17,2,232,224,233,186,5,
+128,7,164,1,0,82,28,6,240,255,177,13,252,22,40,0,
+32,134,160,180,208,17,34,127,17,0,224,121,162,5,2,80,
+10,208,224,209,186,5,128,7,126,1,58,223,17,0,224,217,
+186,5,128,7,114,1,59,23,105,0,63,6,198,13,128,0,
+2,22,80,0,34,87,0,0,34,119,5,0,219,81,10,48,
+110,0,224,81,186,5,221,151,0,0,59,23,105,0,3,56,
+2,22,64,1,34,87,0,0,34,111,5,0,219,81,10,48,
+63,6,236,13,128,0,109,0,35,103,1,0,10,16,224,97,
+194,45,224,17,250,29,132,23,33,139,224,17,130,21,221,215,
+0,0,210,13,1,82,93,87,4,0,221,151,0,0,47,6,
+145,155,145,0,207,225,92,87,0,0,245,21,157,111,5,0,
+224,105,178,21,224,17,154,21,93,7,4,0,221,23,0,0,
+197,13,157,95,5,0,224,89,130,13,221,215,0,0,218,5,
+93,7,4,0,221,23,0,0,221,215,0,0,130,69,221,215,
+2,0,218,61,59,23,105,0,0,226,2,22,96,0,34,55,
+0,0,34,87,5,0,219,49,63,6,116,14,128,0,106,0,
+224,81,194,5,221,47,1,0,1,226,125,7,17,0,93,7,
+20,0,93,7,21,0,93,7,22,0,31,82,125,87,9,0,
+125,87,13,0,93,7,23,0,99,7,5,0,61,54,40,4,
+26,56,28,64,35,78,4,0,128,255,146,0,35,127,5,0,
+36,119,69,139,128,121,207,113,100,119,69,139,26,48,128,255,
+132,0,197,82,125,87,117,4,125,7,113,4,221,215,0,0,
+250,21,221,215,2,0,194,21,26,48,128,255,112,0,99,7,
+5,0,61,54,40,4,0,58,35,70,4,0,128,255,102,0,
+35,103,5,0,36,111,69,139,204,105,100,111,69,139,253,23,
+1,0,253,87,3,0,234,17,226,5,125,23,2,0,29,48,
+128,255,34,0,68,6,255,48,132,135,25,139,240,142,100,0,
+100,143,29,139,127,0,128,7,33,0,128,255,48,0,64,6,
+63,0,33,6,18,43,0,0,97,0,33,6,132,191,1,0,
+97,0,33,6,246,137,1,0,97,0,33,6,46,132,1,0,
+97,0,33,6,20,192,1,0,97,0,33,6,136,149,1,0,
+97,0,128,7,193,16,6,224,7,232,229,87,64,0,224,7,
+96,1,60,143,8,0,10,216,224,137,170,13,124,239,5,0,
+124,239,1,0,125,239,17,0,125,239,21,0,181,21,60,119,
+5,0,125,119,21,0,60,111,5,0,109,239,17,0,60,103,
+1,0,125,103,17,0,60,95,1,0,107,239,21,0,124,239,
+5,0,60,87,8,0,65,82,124,87,8,0,251,47,32,0,
+64,6,223,16,128,7,225,0,6,232,7,248,229,87,64,0,
+224,7,96,1,61,143,8,0,10,224,224,137,170,13,38,6,
+40,142,132,0,32,62,115,6,0,66,191,255,16,246,181,37,
+61,135,5,0,61,23,1,0,240,17,127,23,1,0,234,5,
+125,7,5,0,125,7,1,0,149,21,61,111,1,0,45,111,
+17,0,61,95,5,0,125,111,1,0,109,95,21,0,61,87,
+5,0,61,143,1,0,106,143,17,0,61,135,8,0,95,130,
+125,135,8,0,252,47,32,0,61,127,8,0,224,121,174,13,
+38,6,40,142,132,0,32,62,153,6,0,66,191,255,174,245,
+224,81,64,6,255,0,128,7,225,16,7,224,6,232,61,143,
+8,0,59,6,56,142,132,0,97,138,254,5,27,48,32,62,
+176,6,0,66,191,255,134,245,229,87,64,0,224,7,96,1,
+10,248,61,23,1,0,61,95,5,0,226,225,250,29,235,17,
+138,29,125,7,1,0,61,119,8,0,125,7,5,0,95,114,
+125,119,8,0,255,47,32,0,61,111,8,0,224,105,174,53,
+27,48,32,62,197,6,0,66,191,255,66,245,224,81,165,45,
+60,103,17,0,125,103,1,0,245,5,235,225,218,5,60,87,
+21,0,125,87,5,0,60,135,17,0,60,143,21,0,61,111,
+8,0,113,135,17,0,95,106,60,127,17,0,60,119,21,0,
+125,111,8,0,111,119,21,0,255,47,32,0,61,103,8,0,
+224,97,142,13,27,48,32,62,224,6,0,66,191,255,238,244,
+224,81,64,6,255,16,49,6,156,191,138,0,100,143,45,139,
+100,7,41,139,0,18,226,126,12,0,44,6,156,191,138,0,
+204,121,12,118,12,0,2,104,236,111,64,2,206,105,111,111,
+9,0,111,7,5,0,111,7,1,0,65,18,2,6,1,248,
+182,237,226,86,12,0,204,81,106,7,9,0,106,7,5,0,
+106,7,1,0,127,0,128,7,193,16,6,216,7,224,229,87,
+64,0,224,7,96,1,10,232,133,21,224,225,162,13,229,87,
+64,0,224,135,96,1,229,87,64,0,224,7,96,1,213,5,
+253,47,32,0,0,82,213,21,36,143,45,139,224,137,226,237,
+36,231,45,139,36,127,41,139,60,135,9,0,65,122,100,135,
+45,139,100,127,41,139,253,47,32,0,124,223,1,0,28,80,
+64,6,223,16,128,7,97,0,6,232,224,233,154,13,38,6,
+72,142,132,0,32,62,103,7,0,66,191,255,32,244,229,87,
+64,0,224,7,96,1,36,23,45,139,10,248,125,23,9,0,
+36,143,41,139,100,239,45,139,95,138,100,143,41,139,255,47,
+32,0,64,6,127,0,128,7,225,16,6,216,7,232,8,224,
+224,233,154,13,38,6,104,142,132,0,32,62,148,7,0,66,
+191,255,218,243,59,23,1,0,224,17,178,21,224,225,194,5,
+60,23,9,0,213,5,34,231,5,0,123,239,1,0,125,231,
+5,0,124,239,9,0,125,23,9,0,98,239,5,0,245,5,
+125,239,9,0,125,239,5,0,123,239,1,0,64,6,255,16,
+128,7,225,0,7,224,60,63,1,0,6,232,128,255,88,0,
+29,48,28,56,10,64,191,255,144,255,64,6,255,0,128,7,
+97,0,38,143,1,0,1,234,241,57,186,13,39,23,9,0,
+226,57,218,5,102,7,1,0,0,234,181,5,102,23,1,0,
+39,23,5,0,39,87,9,0,106,23,5,0,39,87,5,0,
+39,23,9,0,106,23,9,0,7,48,191,255,10,255,29,80,
+64,6,127,0,38,87,1,0,224,81,10,16,210,29,34,95,
+1,0,39,127,13,0,43,103,9,0,43,111,13,0,39,119,
+9,0,239,105,177,13,187,5,238,97,131,13,234,17,186,5,
+0,82,181,13,34,87,5,0,133,13,34,23,9,0,234,17,
+250,229,34,23,5,0,2,80,127,0,38,87,1,0,224,81,
+10,16,162,13,34,143,1,0,231,137,226,5,34,23,9,0,
+234,17,154,253,0,18,2,80,127,0,130,7,225,243,6,224,
+7,200,0,194,0,186,0,234,229,87,64,0,224,7,96,1,
+10,176,60,223,1,0,99,7,1,0,224,217,186,5,128,7,
+70,1,28,48,25,56,191,255,110,255,10,56,7,48,224,57,
+218,5,27,16,195,15,0,0,245,5,39,23,9,0,251,17,
+186,5,195,23,0,0,57,223,13,0,57,71,24,0,57,215,
+9,0,8,72,191,74,218,65,225,111,0,0,205,73,219,73,
+195,207,0,0,178,13,245,45,60,103,1,0,236,57,202,5,
+195,15,0,0,133,13,39,63,5,0,39,87,1,0,202,207,
+42,0,178,245,195,207,0,0,234,29,42,103,9,0,42,111,
+13,0,42,87,24,0,10,120,191,122,204,81,225,135,0,0,
+208,121,205,121,239,217,219,13,177,5,234,209,169,13,65,234,
+221,0,7,192,7,184,195,15,0,0,195,7,0,0,181,5,
+195,15,0,0,195,215,0,0,154,53,34,87,1,0,202,207,
+42,0,186,21,213,5,60,95,1,0,235,17,130,13,34,23,
+9,0,34,87,1,0,202,207,42,0,226,245,60,87,1,0,
+234,17,186,5,195,23,0,0,195,215,0,0,250,21,34,103,
+1,0,44,95,13,0,44,87,9,0,235,73,209,13,187,5,
+234,65,163,13,2,184,224,233,170,5,2,192,65,234,221,0,
+195,7,0,0,181,5,195,23,0,0,34,23,9,0,195,207,
+0,0,194,5,195,215,0,0,218,5,60,127,1,0,239,17,
+138,149,32,142,124,176,113,239,0,0,92,138,113,55,1,0,
+32,142,112,176,113,199,1,0,68,138,113,191,1,0,1,114,
+64,119,126,176,246,47,32,0,3,87,0,0,202,86,1,0,
+66,6,255,243,128,7,128,7,128,7,225,112,7,232,8,200,
+59,6,32,141,132,0,224,233,250,5,27,48,32,62,201,4,
+0,66,191,255,56,241,61,239,1,0,57,231,1,0,61,215,
+37,0,224,233,250,5,27,48,32,62,207,4,0,66,191,255,
+28,241,224,209,250,5,27,48,32,62,208,4,0,66,191,255,
+12,241,61,127,24,0,60,135,24,0,60,95,29,0,208,121,
+61,103,33,0,125,127,24,0,108,95,13,0,60,119,26,0,
+61,135,33,0,60,87,29,0,61,111,26,0,106,135,9,0,
+206,105,60,127,33,0,125,111,26,0,125,127,33,0,29,48,
+128,255,32,0,220,143,42,0,124,7,37,0,26,48,25,56,
+128,255,24,0,64,6,255,112,33,6,174,86,0,0,97,0,
+33,6,232,75,0,0,97,0,33,6,116,65,0,0,97,0,
+33,6,154,69,0,0,97,0,128,7,33,0,224,49,210,5,
+129,58,185,5,130,255,168,15,64,6,63,0,128,7,97,0,
+128,255,72,0,10,16,224,17,186,5,1,234,213,13,0,234,
+2,6,226,255,146,13,38,6,236,143,132,0,32,62,39,1,
+0,66,191,255,88,240,29,80,64,6,127,0,128,7,33,0,
+50,6,24,240,140,0,114,7,1,0,38,6,160,82,133,0,
+130,255,26,20,64,6,63,0,33,6,98,201,1,0,97,0,
+128,7,97,0,6,232,189,0,68,239,92,139,167,0,68,63,
+93,139,0,50,128,255,74,0,196,191,156,140,99,234,210,5,
+100,7,153,140,100,7,156,140,64,6,127,0,128,7,97,0,
+6,232,189,0,68,239,92,139,224,233,226,55,0,0,128,255,
+32,0,98,234,146,13,99,234,154,13,36,127,153,140,65,122,
+100,127,153,140,181,5,100,7,153,140,64,6,127,0,4,135,
+156,140,32,150,239,255,82,129,198,126,1,0,196,122,15,129,
+68,135,156,140,224,49,194,5,32,118,0,4,181,5,32,118,
+0,1,50,6,20,0,32,0,114,119,0,0,127,0,144,7,
+225,16,0,226,0,50,128,255,248,42,172,82,10,232,1,50,
+128,255,238,42,140,82,196,82,10,233,68,239,94,139,36,102,
+20,132,12,54,4,0,29,64,168,0,37,62,88,128,130,255,
+16,31,38,6,132,144,132,0,36,62,20,132,130,255,96,20,
+4,87,94,139,10,6,240,255,166,5,1,226,32,62,36,244,
+99,63,1,0,32,70,4,244,99,71,5,0,3,122,99,127,
+9,0,0,50,5,74,129,255,144,16,100,87,85,139,10,64,
+0,50,32,62,80,0,129,255,228,171,100,87,89,139,10,48,
+129,255,24,172,10,232,224,233,130,29,59,6,88,144,132,0,
+27,48,130,255,10,20,29,6,192,253,250,5,38,6,152,144,
+132,0,130,255,250,19,229,5,38,6,72,144,132,0,130,255,
+238,19,27,48,130,255,232,19,0,50,191,255,20,255,128,255,
+100,253,128,255,238,4,38,6,238,238,34,34,129,255,162,52,
+38,6,153,153,119,119,129,255,152,52,28,48,128,255,226,41,
+128,255,38,42,128,255,234,41,36,95,89,139,43,95,0,0,
+224,89,186,29,191,255,236,245,0,234,165,21,99,239,21,0,
+99,239,25,0,64,86,1,0,99,87,29,0,35,54,12,0,
+32,62,128,0,0,66,128,255,248,41,93,238,1,0,128,255,
+168,41,234,233,198,237,181,5,191,255,192,245,191,255,188,241,
+128,255,104,0,80,6,255,16,128,7,33,0,36,63,181,172,
+38,6,36,145,132,0,130,255,86,19,36,63,153,140,38,6,
+192,144,132,0,130,255,72,19,32,63,225,176,38,6,212,144,
+132,0,130,255,58,19,128,255,176,41,10,56,38,6,232,144,
+132,0,130,255,42,19,32,63,53,176,38,6,252,144,132,0,
+130,255,28,19,128,255,154,41,10,56,38,6,16,145,132,0,
+130,255,12,19,64,6,63,0,128,7,33,0,68,7,96,139,
+38,6,204,204,68,68,129,255,200,51,128,255,52,41,128,255,
+120,41,128,255,4,41,128,255,240,40,128,255,116,41,129,255,
+240,164,128,255,116,41,128,255,120,41,128,255,124,41,128,255,
+128,41,128,255,20,41,128,255,24,41,128,255,124,41,191,255,
+236,242,129,255,68,170,191,255,38,238,129,255,142,147,128,255,
+122,173,128,255,162,166,128,255,130,64,128,255,38,64,128,255,
+96,41,129,255,100,175,129,255,52,126,128,255,164,195,128,255,
+200,40,0,18,2,136,193,138,46,6,28,240,140,0,206,137,
+32,102,160,5,226,103,32,2,113,103,0,0,65,18,103,18,
+166,245,3,82,100,87,98,139,38,6,255,255,17,17,129,255,
+48,51,38,6,187,187,85,85,129,255,38,51,64,6,63,0,
+136,7,225,0,198,0,224,49,146,21,228,119,81,139,6,113,
+100,119,80,139,32,54,236,176,100,7,253,131,32,62,16,0,
+0,66,128,255,132,40,128,7,106,1,35,54,3,0,35,62,
+4,0,129,255,150,175,36,239,253,131,10,16,228,111,81,139,
+99,111,14,0,32,86,60,0,234,23,194,2,29,6,237,255,
+154,13,2,102,5,0,32,86,96,39,234,103,128,90,100,95,
+249,131,29,6,237,255,167,45,36,127,249,131,99,7,14,0,
+162,121,106,122,183,5,100,7,249,131,0,98,12,112,193,114,
+43,6,28,240,140,0,203,113,36,87,249,131,46,95,0,0,
+235,81,175,13,235,17,134,13,228,143,99,139,227,127,15,0,
+17,121,99,127,14,0,65,98,103,98,150,237,227,119,15,0,
+224,113,194,5,0,234,100,7,253,131,29,6,237,255,239,5,
+38,6,72,145,132,0,130,255,134,17,29,6,240,255,190,21,
+29,56,38,6,108,145,132,0,130,255,116,17,227,111,15,0,
+99,111,8,0,35,22,8,0,34,63,1,0,29,48,128,255,
+166,0,165,53,29,6,237,255,222,21,29,230,240,255,28,56,
+38,6,56,145,132,0,130,255,70,17,227,103,15,0,99,103,
+12,0,35,22,12,0,34,63,1,0,28,48,128,255,200,1,
+181,29,29,6,237,255,234,5,38,6,84,145,132,0,130,255,
+30,17,229,87,64,0,224,7,96,1,36,95,253,131,10,248,
+235,233,250,5,29,86,1,0,100,87,253,131,100,7,80,139,
+255,47,32,0,229,29,229,87,64,0,224,7,96,1,36,143,
+253,131,10,248,241,233,202,13,29,134,1,0,100,135,253,131,
+227,127,15,0,228,111,81,139,15,105,100,111,80,139,255,47,
+32,0,32,54,236,176,32,62,16,0,0,66,128,255,26,39,
+72,6,255,0,3,30,208,255,99,63,37,0,99,255,29,0,
+99,215,25,0,99,223,21,0,99,231,17,0,99,239,13,0,
+6,224,128,255,6,165,224,81,138,13,38,6,192,145,132,0,
+130,255,140,16,128,7,6,1,0,234,1,210,28,48,0,58,
+0,66,3,72,128,255,66,39,10,216,28,48,27,56,128,255,
+128,38,59,143,0,0,224,137,218,253,59,135,12,0,224,129,
+234,5,227,127,3,0,224,121,170,5,0,210,123,7,0,0,
+27,48,191,255,134,242,195,199,36,0,146,37,28,48,128,255,
+16,39,10,232,224,233,234,13,28,48,128,255,122,164,10,64,
+28,72,32,54,34,0,39,6,212,145,132,0,191,255,212,235,
+149,13,29,6,255,239,226,5,38,6,144,145,132,0,130,255,
+14,16,29,6,255,239,138,13,0,234,229,5,38,6,120,145,
+132,0,130,255,250,15,224,209,130,53,4,95,96,139,224,89,
+202,45,195,207,36,0,242,29,224,233,218,29,28,48,128,255,
+184,38,10,232,29,6,160,253,138,13,28,64,15,50,37,62,
+96,128,191,255,126,235,197,21,224,233,250,5,38,6,232,145,
+132,0,130,255,186,15,197,13,38,6,168,145,132,0,130,255,
+174,15,229,5,38,6,0,146,132,0,130,255,162,15,32,54,
+244,1,129,255,144,226,229,5,38,6,24,146,132,0,130,255,
+142,15,37,54,104,128,130,255,134,15,35,215,25,0,35,223,
+21,0,35,231,17,0,35,239,13,0,35,255,29,0,3,30,
+48,0,127,0,3,30,236,255,99,63,9,0,99,255,1,0,
+97,50,209,5,194,13,98,50,194,37,165,45,38,6,80,146,
+132,0,130,255,74,15,129,255,80,126,165,37,195,231,8,0,
+162,21,38,6,120,146,132,0,130,255,52,15,31,50,191,255,
+142,234,128,255,12,38,191,255,126,234,32,54,244,1,129,255,
+20,226,229,13,38,6,96,146,132,0,130,255,18,15,133,13,
+38,6,136,146,132,0,130,255,6,15,129,255,54,126,37,54,
+106,128,130,255,250,14,35,255,1,0,3,30,20,0,127,0,
+128,7,97,0,128,255,2,248,10,232,128,255,68,248,10,72,
+9,16,133,85,2,88,37,102,108,128,4,106,65,90,11,119,
+255,255,65,98,12,127,255,255,14,80,175,81,218,5,224,113,
+178,5,95,106,202,245,224,81,202,61,68,18,2,80,65,82,
+10,119,255,255,224,113,202,253,95,82,162,81,162,53,194,81,
+10,102,1,0,37,110,112,128,4,114,65,98,12,127,255,255,
+65,106,13,87,255,255,15,88,170,89,218,5,224,121,178,5,
+95,114,202,245,224,89,218,29,32,94,16,0,36,86,0,132,
+65,18,2,135,255,255,65,82,74,135,255,255,224,129,186,5,
+95,82,181,5,95,90,218,245,224,89,226,5,65,82,74,7,
+255,255,95,90,202,253,36,22,0,132,66,7,16,0,229,5,
+65,18,29,112,201,113,238,17,225,173,38,6,148,146,132,0,
+36,62,0,132,130,255,40,14,64,6,127,0,190,7,225,243,
+3,30,208,255,230,0,61,6,148,83,133,0,61,198,120,255,
+0,218,27,16,195,18,216,17,34,23,0,0,226,49,210,5,
+65,218,27,6,239,255,230,245,27,6,239,255,170,5,95,218,
+32,54,16,0,130,255,40,8,10,224,224,225,146,13,35,142,
+3,0,99,143,5,0,28,48,0,58,128,255,160,10,32,86,
+232,3,3,18,67,23,148,0,67,23,164,0,67,23,156,0,
+99,87,169,0,32,22,44,1,99,23,153,0,32,86,88,2,
+2,18,67,23,140,0,99,87,161,0,32,22,100,0,99,23,
+145,0,67,7,132,0,60,95,5,0,99,23,137,0,224,89,
+186,5,0,18,213,5,60,23,9,0,171,17,163,18,224,89,
+186,5,0,82,213,5,60,87,13,0,171,81,163,82,60,215,
+9,0,234,17,169,37,99,215,25,0,26,200,1,186,229,21,
+25,16,224,17,146,21,224,17,250,5,8,50,130,255,144,7,
+10,16,224,17,146,13,3,87,164,0,66,87,0,0,35,87,
+169,0,98,87,5,0,95,186,72,202,224,185,170,237,26,22,
+8,0,124,23,9,0,213,61,99,215,13,0,35,102,12,0,
+60,87,5,0,99,103,21,0,224,81,186,5,0,18,213,5,
+60,23,9,0,170,17,163,18,224,17,186,5,0,210,245,13,
+60,87,5,0,99,87,17,0,35,215,21,0,35,86,16,0,
+42,127,1,0,58,215,1,0,175,209,163,210,35,119,21,0,
+28,48,46,119,1,0,35,62,16,0,99,119,17,0,1,66,
+35,78,164,0,128,255,252,19,60,87,5,0,99,87,17,0,
+35,22,16,0,34,95,1,0,195,210,203,209,99,215,9,0,
+27,200,195,202,25,16,216,17,34,215,5,0,10,82,74,208,
+0,186,128,7,242,1,60,95,5,0,224,89,186,5,0,18,
+213,5,60,23,9,0,171,17,163,18,224,89,186,5,0,82,
+213,5,60,87,13,0,171,81,163,82,60,223,9,0,234,17,
+169,45,99,223,45,0,27,176,1,154,99,159,129,0,165,29,
+22,16,224,17,146,21,224,17,250,5,8,50,130,255,144,6,
+10,16,224,17,146,13,3,87,132,0,66,87,0,0,35,87,
+137,0,98,87,5,0,35,159,129,0,72,178,95,154,99,159,
+129,0,35,159,129,0,224,153,202,229,27,22,8,0,124,23,
+9,0,213,61,99,223,33,0,35,110,32,0,60,87,5,0,
+99,111,41,0,224,81,186,5,0,18,213,5,60,23,9,0,
+170,17,163,18,224,17,186,5,0,218,245,13,60,87,5,0,
+99,87,37,0,35,223,41,0,35,86,36,0,42,135,1,0,
+59,223,1,0,176,217,163,218,35,127,41,0,28,48,47,127,
+1,0,35,62,36,0,99,127,37,0,1,66,35,78,132,0,
+128,255,240,18,60,87,5,0,99,87,37,0,35,22,36,0,
+34,103,1,0,195,218,204,217,99,223,29,0,60,95,5,0,
+224,89,186,5,0,18,213,5,60,23,9,0,171,17,163,18,
+224,89,186,5,0,82,213,5,60,87,13,0,171,81,163,82,
+60,223,9,0,234,17,169,45,99,223,65,0,27,176,1,154,
+99,159,129,0,165,29,22,16,224,17,146,21,224,17,250,5,
+8,50,130,255,154,5,10,16,224,17,146,13,3,87,148,0,
+66,87,0,0,35,87,153,0,98,87,5,0,35,159,129,0,
+72,178,95,154,99,159,129,0,35,159,129,0,224,153,202,229,
+27,22,8,0,124,23,9,0,213,61,99,223,53,0,35,126,
+52,0,60,87,5,0,99,127,61,0,224,81,186,5,0,18,
+213,5,60,23,9,0,170,17,163,18,224,17,186,5,0,218,
+245,13,60,87,5,0,99,87,57,0,35,223,61,0,35,86,
+56,0,42,87,1,0,59,223,1,0,170,217,163,218,35,143,
+61,0,28,48,49,143,1,0,35,62,56,0,99,143,57,0,
+1,66,35,78,148,0,128,255,250,17,60,87,5,0,99,87,
+57,0,35,22,56,0,34,119,1,0,195,218,206,217,99,223,
+49,0,65,186,250,185,190,5,191,7,14,254,224,209,194,117,
+60,95,5,0,224,89,186,5,0,18,213,5,60,23,9,0,
+171,17,163,18,224,89,186,5,0,82,213,5,60,87,13,0,
+171,81,163,82,60,223,9,0,234,17,169,37,99,223,85,0,
+27,208,1,186,229,21,26,16,224,17,146,21,224,17,250,5,
+8,50,130,255,154,4,10,16,224,17,146,13,3,87,156,0,
+66,87,0,0,35,87,161,0,98,87,5,0,95,186,72,210,
+224,185,170,237,27,22,8,0,124,23,9,0,213,61,99,223,
+73,0,35,142,72,0,60,87,5,0,99,143,81,0,224,81,
+186,5,0,18,213,5,60,23,9,0,170,17,163,18,224,17,
+186,5,0,218,245,13,60,87,5,0,99,87,77,0,35,223,
+81,0,35,86,76,0,42,103,1,0,59,223,1,0,172,217,
+163,218,35,95,81,0,28,48,43,95,1,0,35,62,76,0,
+99,95,77,0,1,66,35,78,156,0,128,255,6,17,60,87,
+5,0,99,87,77,0,35,22,76,0,34,135,1,0,195,218,
+208,217,99,223,69,0,25,16,216,17,34,23,5,0,10,82,
+234,23,128,210,0,210,128,7,210,1,60,95,5,0,224,89,
 186,5,0,18,213,5,60,23,9,0,171,17,163,18,224,89,
 186,5,0,82,213,5,60,87,13,0,171,81,163,82,60,223,
-9,0,234,17,169,45,99,223,45,0,27,176,1,154,99,159,
-129,0,165,29,22,16,224,17,146,21,224,17,250,5,8,50,
-129,255,172,254,10,16,224,17,146,13,3,87,132,0,66,87,
-0,0,35,87,137,0,98,87,5,0,35,159,129,0,72,178,
-95,154,99,159,129,0,35,159,129,0,224,153,202,229,27,22,
-8,0,124,23,9,0,213,61,99,223,33,0,35,110,32,0,
-60,87,5,0,99,111,41,0,224,81,186,5,0,18,213,5,
+9,0,234,17,169,37,99,223,105,0,27,184,1,178,229,21,
+23,16,224,17,146,21,224,17,250,5,8,50,130,255,160,3,
+10,16,224,17,146,13,3,87,140,0,66,87,0,0,35,87,
+145,0,98,87,5,0,95,178,72,186,224,177,170,237,27,22,
+8,0,124,23,9,0,213,61,99,223,93,0,35,94,92,0,
+60,87,5,0,99,95,101,0,224,81,186,5,0,18,213,5,
 60,23,9,0,170,17,163,18,224,17,186,5,0,218,245,13,
-60,87,5,0,99,87,37,0,35,223,41,0,35,86,36,0,
-42,135,1,0,59,223,1,0,176,217,163,218,35,127,41,0,
-28,48,47,127,1,0,35,62,36,0,99,127,37,0,1,66,
-35,78,132,0,128,255,200,16,60,87,5,0,99,87,37,0,
-35,22,36,0,34,103,1,0,195,218,204,217,99,223,29,0,
+60,87,5,0,99,87,97,0,35,223,101,0,35,86,96,0,
+42,119,1,0,59,223,1,0,174,217,163,218,35,111,101,0,
+28,48,45,111,1,0,35,62,96,0,99,111,97,0,1,66,
+35,78,140,0,128,255,12,16,60,87,5,0,99,87,97,0,
+35,22,96,0,34,87,1,0,195,218,202,217,99,223,89,0,
 60,95,5,0,224,89,186,5,0,18,213,5,60,23,9,0,
 171,17,163,18,224,89,186,5,0,82,213,5,60,87,13,0,
-171,81,163,82,60,223,9,0,234,17,169,45,99,223,65,0,
-27,176,1,154,99,159,129,0,165,29,22,16,224,17,146,21,
-224,17,250,5,8,50,129,255,182,253,10,16,224,17,146,13,
-3,87,148,0,66,87,0,0,35,87,153,0,98,87,5,0,
-35,159,129,0,72,178,95,154,99,159,129,0,35,159,129,0,
-224,153,202,229,27,22,8,0,124,23,9,0,213,61,99,223,
-53,0,35,126,52,0,60,87,5,0,99,127,61,0,224,81,
+171,81,163,82,60,223,9,0,234,17,169,37,99,223,125,0,
+27,184,1,178,229,21,23,16,224,17,146,21,224,17,250,5,
+8,50,130,255,186,2,10,16,224,17,146,13,3,87,148,0,
+66,87,0,0,35,87,153,0,98,87,5,0,95,178,72,186,
+224,177,170,237,27,22,8,0,124,23,9,0,213,61,99,223,
+113,0,35,110,112,0,60,87,5,0,99,111,121,0,224,81,
 186,5,0,18,213,5,60,23,9,0,170,17,163,18,224,17,
-186,5,0,218,245,13,60,87,5,0,99,87,57,0,35,223,
-61,0,35,86,56,0,42,87,1,0,59,223,1,0,170,217,
-163,218,35,143,61,0,28,48,49,143,1,0,35,62,56,0,
-99,143,57,0,1,66,35,78,148,0,128,255,210,15,60,87,
-5,0,99,87,57,0,35,22,56,0,34,119,1,0,195,218,
-206,217,99,223,49,0,65,186,250,185,190,5,191,7,14,254,
-224,209,194,117,60,95,5,0,224,89,186,5,0,18,213,5,
-60,23,9,0,171,17,163,18,224,89,186,5,0,82,213,5,
-60,87,13,0,171,81,163,82,60,223,9,0,234,17,169,37,
-99,223,85,0,27,208,1,186,229,21,26,16,224,17,146,21,
-224,17,250,5,8,50,129,255,182,252,10,16,224,17,146,13,
-3,87,156,0,66,87,0,0,35,87,161,0,98,87,5,0,
-95,186,72,210,224,185,170,237,27,22,8,0,124,23,9,0,
-213,61,99,223,73,0,35,142,72,0,60,87,5,0,99,143,
-81,0,224,81,186,5,0,18,213,5,60,23,9,0,170,17,
-163,18,224,17,186,5,0,218,245,13,60,87,5,0,99,87,
-77,0,35,223,81,0,35,86,76,0,42,103,1,0,59,223,
-1,0,172,217,163,218,35,95,81,0,28,48,43,95,1,0,
-35,62,76,0,99,95,77,0,1,66,35,78,156,0,128,255,
-222,14,60,87,5,0,99,87,77,0,35,22,76,0,34,135,
-1,0,195,218,208,217,99,223,69,0,25,16,216,17,34,23,
-5,0,10,82,234,23,128,210,0,210,128,7,210,1,60,95,
-5,0,224,89,186,5,0,18,213,5,60,23,9,0,171,17,
-163,18,224,89,186,5,0,82,213,5,60,87,13,0,171,81,
-163,82,60,223,9,0,234,17,169,37,99,223,105,0,27,184,
-1,178,229,21,23,16,224,17,146,21,224,17,250,5,8,50,
-129,255,188,251,10,16,224,17,146,13,3,87,140,0,66,87,
-0,0,35,87,145,0,98,87,5,0,95,178,72,186,224,177,
-170,237,27,22,8,0,124,23,9,0,213,61,99,223,93,0,
-35,94,92,0,60,87,5,0,99,95,101,0,224,81,186,5,
-0,18,213,5,60,23,9,0,170,17,163,18,224,17,186,5,
-0,218,245,13,60,87,5,0,99,87,97,0,35,223,101,0,
-35,86,96,0,42,119,1,0,59,223,1,0,174,217,163,218,
-35,111,101,0,28,48,45,111,1,0,35,62,96,0,99,111,
-97,0,1,66,35,78,140,0,128,255,228,13,60,87,5,0,
-99,87,97,0,35,22,96,0,34,87,1,0,195,218,202,217,
-99,223,89,0,60,95,5,0,224,89,186,5,0,18,213,5,
-60,23,9,0,171,17,163,18,224,89,186,5,0,82,213,5,
-60,87,13,0,171,81,163,82,60,223,9,0,234,17,169,37,
-99,223,125,0,27,184,1,178,229,21,23,16,224,17,146,21,
-224,17,250,5,8,50,129,255,214,250,10,16,224,17,146,13,
-3,87,148,0,66,87,0,0,35,87,153,0,98,87,5,0,
-95,178,72,186,224,177,170,237,27,22,8,0,124,23,9,0,
-213,61,99,223,113,0,35,110,112,0,60,87,5,0,99,111,
-121,0,224,81,186,5,0,18,213,5,60,23,9,0,170,17,
-163,18,224,17,186,5,0,218,245,13,60,87,5,0,99,87,
-117,0,35,223,121,0,35,86,116,0,42,135,1,0,59,223,
-1,0,176,217,163,218,35,127,121,0,28,48,47,127,1,0,
-35,62,116,0,99,127,117,0,1,66,35,78,148,0,128,255,
-254,12,60,87,5,0,99,87,117,0,35,22,116,0,34,103,
-1,0,195,218,204,217,99,223,109,0,65,210,25,16,216,17,
-34,23,5,0,10,82,234,23,128,18,226,209,190,5,191,7,
-32,254,28,48,129,255,170,7,3,30,48,0,126,6,255,243,
-6,88,3,30,232,255,99,255,5,0,99,239,1,0,213,21,
-41,135,1,0,88,130,105,135,1,0,40,127,1,0,88,122,
-104,127,1,0,41,23,1,0,47,87,1,0,98,87,1,0,
-47,87,5,0,98,87,5,0,39,111,1,0,40,119,1,0,
-238,105,250,229,6,16,9,232,224,17,250,5,4,50,129,255,
-190,249,10,16,224,17,210,5,61,103,1,0,98,103,1,0,
-35,239,1,0,35,255,5,0,3,30,24,0,127,0,128,7,
-33,0,224,49,162,13,34,6,36,71,133,0,102,23,5,0,
-129,58,185,5,129,255,104,249,64,6,63,0,38,87,1,0,
-127,0,127,0,128,7,33,0,48,6,255,255,255,31,240,57,
-211,5,129,255,90,239,0,82,213,5,7,48,195,50,129,255,
-94,249,64,6,63,0,3,30,220,255,99,255,17,0,99,231,
-5,0,99,223,9,0,99,215,13,0,6,224,99,239,1,0,
-7,208,8,232,181,29,2,216,29,16,224,17,146,21,224,17,
-250,5,8,50,129,255,40,249,10,16,224,17,146,13,27,87,
-0,0,66,87,0,0,59,87,5,0,98,87,5,0,60,135,
-1,0,72,234,72,130,124,135,1,0,58,127,1,0,60,23,
-1,0,239,17,154,229,29,80,35,215,13,0,35,223,9,0,
-35,231,5,0,35,239,1,0,35,255,17,0,3,30,36,0,
-127,0,128,7,128,7,38,87,130,7,128,7,130,7,130,7,
-225,0,6,232,7,224,224,233,178,53,34,6,68,71,133,0,
-125,23,5,0,61,23,33,0,2,6,240,255,201,13,2,6,
-240,255,201,5,61,23,13,0,181,5,61,22,12,0,2,48,
-129,255,124,248,15,130,125,135,33,0,197,5,61,23,13,0,
-181,5,61,22,12,0,125,7,29,0,67,7,3,0,35,86,
-3,0,10,119,0,0,66,119,0,0,129,226,34,6,36,71,
-133,0,125,23,5,0,201,5,29,48,129,255,66,248,66,6,
-255,0,38,135,33,0,16,6,240,255,201,5,38,23,13,0,
-181,5,38,22,12,0,2,80,127,0,128,7,33,0,129,255,
-74,247,64,6,63,0,130,7,225,0,6,232,7,224,224,233,
-178,53,34,6,68,71,133,0,125,23,5,0,61,23,33,0,
-2,6,240,255,201,13,2,6,240,255,201,5,61,23,13,0,
-181,5,61,22,12,0,2,48,129,255,228,247,15,130,125,135,
-33,0,197,5,61,23,13,0,181,5,61,22,12,0,125,7,
-29,0,67,7,3,0,35,86,3,0,10,119,0,0,66,119,
-0,0,129,226,34,6,36,71,133,0,125,23,5,0,201,5,
-29,48,129,255,170,247,66,6,255,0,128,7,33,0,129,255,
-202,246,64,6,63,0,176,7,225,241,61,6,12,72,133,0,
-6,216,123,7,5,0,123,7,9,0,123,7,13,0,7,224,
-224,225,202,5,0,82,128,7,66,10,48,6,255,255,255,31,
-240,225,187,5,128,7,6,10,42,6,64,133,132,0,131,127,
-5,0,67,127,5,0,15,114,99,119,93,0,197,5,35,23,
-73,0,181,5,35,22,72,0,99,7,89,0,67,7,6,0,
-35,94,6,0,11,103,0,0,66,103,0,0,10,16,65,18,
-2,95,255,255,224,89,202,253,10,200,2,222,255,255,170,217,
-35,230,68,0,60,23,25,0,0,82,2,6,240,255,201,5,
-60,95,5,0,181,5,60,94,4,0,249,89,251,13,2,6,
-240,255,201,5,60,95,5,0,181,5,60,94,4,0,60,135,
-21,0,203,129,240,201,169,5,1,82,138,0,224,81,186,5,
-128,7,160,3,2,6,240,255,201,5,60,23,5,0,181,5,
-60,22,4,0,162,201,60,23,21,0,249,17,201,5,28,48,
-129,255,208,244,60,87,21,0,10,16,185,17,226,217,169,5,
-27,16,64,214,134,0,58,215,153,132,2,216,217,217,251,81,
-201,5,28,48,129,255,172,244,60,23,21,0,187,17,250,17,
-169,5,2,208,224,209,186,5,128,7,154,1,60,87,25,0,
-10,6,240,255,201,5,60,103,5,0,181,5,60,102,4,0,
-27,88,204,89,10,6,240,255,201,5,60,87,5,0,181,5,
-60,86,4,0,202,217,26,80,219,81,186,17,162,37,11,96,
-10,88,2,104,203,105,12,80,171,81,13,128,171,129,240,81,
-139,21,2,120,204,121,15,102,255,255,13,94,255,255,95,90,
-11,119,1,0,95,98,76,119,1,0,95,18,154,253,149,13,
-65,90,11,111,255,255,65,98,76,111,255,255,95,18,154,253,
-60,223,21,0,186,217,126,218,195,5,28,48,129,255,254,242,
-60,95,25,0,251,89,153,93,60,199,21,0,155,214,15,0,
-126,210,163,5,27,208,26,54,1,0,129,255,2,246,10,184,
-224,193,146,21,60,87,25,0,23,88,10,6,240,255,201,5,
-60,23,5,0,181,5,60,22,4,0,11,48,2,56,24,64,
-191,255,200,217,60,23,25,0,2,6,240,255,201,13,2,6,
-240,255,201,5,60,23,5,0,181,5,60,22,4,0,2,48,
-129,255,156,245,15,130,124,135,25,0,197,5,60,23,5,0,
-181,5,60,22,4,0,124,7,21,0,67,7,9,0,35,86,
-9,0,10,119,0,0,66,119,0,0,26,6,240,255,124,191,
-5,0,124,215,25,0,185,5,23,16,181,5,60,22,4,0,
-124,199,21,0,67,7,8,0,194,193,35,22,8,0,2,95,
-0,0,88,95,0,0,245,21,224,217,218,21,60,87,25,0,
-124,7,21,0,10,6,240,255,201,5,60,23,5,0,181,5,
-60,22,4,0,67,7,7,0,35,86,7,0,10,135,0,0,
-66,135,0,0,224,217,226,21,60,111,25,0,13,6,240,255,
-201,5,60,23,5,0,181,5,60,22,4,0,124,223,21,0,
-67,7,10,0,194,217,35,22,10,0,2,95,0,0,91,95,
-0,0,60,95,21,0,25,72,233,89,169,5,11,72,224,73,
-186,5,128,7,250,2,60,23,25,0,2,6,240,255,201,5,
-60,87,5,0,181,5,60,86,4,0,10,96,2,6,240,255,
-201,5,60,23,5,0,181,5,60,22,4,0,9,80,194,81,
-11,16,169,17,146,37,10,88,2,104,203,105,12,80,171,81,
-13,128,171,129,240,81,139,21,2,120,204,121,15,102,255,255,
-13,94,255,255,95,90,11,119,1,0,95,98,76,119,1,0,
-95,18,154,253,149,13,65,90,11,111,255,255,65,98,76,111,
-255,255,95,18,154,253,60,223,21,0,169,217,126,218,195,5,
-28,48,129,255,88,241,60,95,25,0,251,89,153,93,60,207,
-21,0,155,214,15,0,126,210,163,5,27,208,26,54,1,0,
-129,255,92,244,10,192,224,201,146,21,60,87,25,0,24,88,
-10,6,240,255,201,5,60,23,5,0,181,5,60,22,4,0,
-11,48,2,56,25,64,191,255,34,216,60,23,25,0,2,6,
+186,5,0,218,245,13,60,87,5,0,99,87,117,0,35,223,
+121,0,35,86,116,0,42,135,1,0,59,223,1,0,176,217,
+163,218,35,127,121,0,28,48,47,127,1,0,35,62,116,0,
+99,127,117,0,1,66,35,78,148,0,128,255,38,15,60,87,
+5,0,99,87,117,0,35,22,116,0,34,103,1,0,195,218,
+204,217,99,223,109,0,65,210,25,16,216,17,34,23,5,0,
+10,82,234,23,128,18,226,209,190,5,191,7,32,254,28,48,
+129,255,246,12,3,30,48,0,126,6,255,243,6,88,3,30,
+232,255,99,255,5,0,99,239,1,0,213,21,41,135,1,0,
+88,130,105,135,1,0,40,127,1,0,88,122,104,127,1,0,
+41,23,1,0,47,87,1,0,98,87,1,0,47,87,5,0,
+98,87,5,0,39,111,1,0,40,119,1,0,238,105,250,229,
+6,16,9,232,224,17,250,5,4,50,130,255,162,1,10,16,
+224,17,210,5,61,103,1,0,98,103,1,0,35,239,1,0,
+35,255,5,0,3,30,24,0,127,0,128,7,33,0,224,49,
+162,13,34,6,172,82,133,0,102,23,5,0,129,58,185,5,
+130,255,76,1,64,6,63,0,38,87,1,0,127,0,127,0,
+128,7,33,0,48,6,255,255,255,31,240,57,211,5,129,255,
+62,247,0,82,213,5,7,48,195,50,130,255,66,1,64,6,
+63,0,3,30,220,255,99,255,17,0,99,231,5,0,99,223,
+9,0,99,215,13,0,6,224,99,239,1,0,7,208,8,232,
+181,29,2,216,29,16,224,17,146,21,224,17,250,5,8,50,
+130,255,12,1,10,16,224,17,146,13,27,87,0,0,66,87,
+0,0,59,87,5,0,98,87,5,0,60,135,1,0,72,234,
+72,130,124,135,1,0,58,127,1,0,60,23,1,0,239,17,
+154,229,29,80,35,215,13,0,35,223,9,0,35,231,5,0,
+35,239,1,0,35,255,17,0,3,30,36,0,127,0,128,7,
+128,7,128,7,225,48,8,224,6,232,61,135,21,0,7,216,
+251,129,185,5,129,255,156,254,61,23,21,0,187,17,252,17,
+169,5,2,224,224,225,146,69,29,48,128,255,154,1,27,208,
+202,209,29,48,128,255,144,1,27,16,202,17,28,80,61,119,
+21,0,194,81,187,113,188,113,162,37,26,104,10,16,14,120,
+194,121,13,96,162,97,15,88,162,89,235,97,139,21,14,80,
+205,81,10,110,255,255,15,22,255,255,95,18,2,135,1,0,
+95,106,77,135,1,0,95,114,154,253,149,13,65,18,2,127,
+255,255,65,106,77,127,255,255,95,114,154,253,61,223,21,0,
+29,48,188,217,27,56,0,66,128,255,66,0,224,81,210,5,
+29,48,27,56,128,255,16,0,29,80,64,6,255,48,38,87,
+21,0,127,0,130,7,225,0,7,232,6,224,128,255,8,1,
+124,239,21,0,67,7,3,0,35,22,3,0,2,135,0,0,
+202,233,93,135,0,0,66,6,255,0,130,7,225,112,6,232,
+7,224,8,216,155,0,126,226,179,5,129,255,176,252,61,135,
+25,0,252,129,185,53,224,217,178,5,0,18,181,5,61,23,
+21,0,2,216,156,214,15,0,126,210,163,5,28,208,26,54,
+1,0,129,255,170,255,10,200,224,217,146,13,29,48,128,255,
+166,0,25,48,10,56,27,64,191,255,220,218,29,48,1,58,
+128,255,172,0,125,207,5,0,125,215,25,0,29,48,128,255,
+134,0,125,223,21,0,67,7,3,0,35,22,3,0,2,119,
+0,0,202,217,91,119,0,0,165,29,224,217,146,13,28,6,
+240,255,225,5,29,48,1,58,128,255,116,0,133,21,224,225,
+234,13,125,7,21,0,29,48,128,255,76,0,67,7,2,0,
+35,22,2,0,2,103,0,0,74,103,0,0,224,225,234,87,
+0,0,66,6,255,112,128,7,225,16,7,216,0,234,6,224,
+128,255,36,0,251,81,171,13,28,48,128,255,26,0,60,23,
+21,0,202,17,226,217,169,5,1,234,157,0,29,80,138,0,
+64,6,255,16,38,135,25,0,16,6,240,255,201,5,38,23,
+5,0,181,5,38,22,4,0,2,80,127,0,130,7,97,0,
+6,232,135,0,224,57,146,21,61,23,25,0,2,6,240,255,
+201,13,2,6,240,255,201,5,61,23,5,0,181,5,61,22,
+4,0,2,48,129,255,152,254,15,122,125,127,25,0,197,5,
+61,23,5,0,181,5,61,22,4,0,125,7,21,0,67,7,
+3,0,35,86,3,0,10,111,0,0,66,111,0,0,66,6,
+127,0,130,7,225,0,6,232,7,224,224,233,178,53,34,6,
+204,82,133,0,125,23,5,0,61,23,33,0,2,6,240,255,
+201,13,2,6,240,255,201,5,61,23,13,0,181,5,61,22,
+12,0,2,48,129,255,56,254,15,130,125,135,33,0,197,5,
+61,23,13,0,181,5,61,22,12,0,125,7,29,0,67,7,
+3,0,35,86,3,0,10,119,0,0,66,119,0,0,129,226,
+34,6,172,82,133,0,125,23,5,0,201,5,29,48,129,255,
+254,253,66,6,255,0,38,135,33,0,16,6,240,255,201,5,
+38,23,13,0,181,5,38,22,12,0,2,80,127,0,128,7,
+33,0,129,255,6,253,64,6,63,0,130,7,225,0,6,232,
+7,224,224,233,178,53,34,6,204,82,133,0,125,23,5,0,
+61,23,33,0,2,6,240,255,201,13,2,6,240,255,201,5,
+61,23,13,0,181,5,61,22,12,0,2,48,129,255,160,253,
+15,130,125,135,33,0,197,5,61,23,13,0,181,5,61,22,
+12,0,125,7,29,0,67,7,3,0,35,86,3,0,10,119,
+0,0,66,119,0,0,129,226,34,6,172,82,133,0,125,23,
+5,0,201,5,29,48,129,255,102,253,66,6,255,0,128,7,
+33,0,129,255,134,252,64,6,63,0,176,7,225,241,61,6,
+148,83,133,0,6,216,123,7,5,0,123,7,9,0,123,7,
+13,0,7,224,224,225,202,5,0,82,128,7,66,10,48,6,
+255,255,255,31,240,225,187,5,128,7,6,10,42,6,32,144,
+132,0,131,127,5,0,67,127,5,0,15,114,99,119,93,0,
+197,5,35,23,73,0,181,5,35,22,72,0,99,7,89,0,
+67,7,6,0,35,94,6,0,11,103,0,0,66,103,0,0,
+10,16,65,18,2,95,255,255,224,89,202,253,10,200,2,222,
+255,255,170,217,35,230,68,0,60,23,25,0,0,82,2,6,
+240,255,201,5,60,95,5,0,181,5,60,94,4,0,249,89,
+251,13,2,6,240,255,201,5,60,95,5,0,181,5,60,94,
+4,0,60,135,21,0,203,129,240,201,169,5,1,82,138,0,
+224,81,186,5,128,7,160,3,2,6,240,255,201,5,60,23,
+5,0,181,5,60,22,4,0,162,201,60,23,21,0,249,17,
+201,5,28,48,129,255,140,250,60,87,21,0,10,16,185,17,
+226,217,169,5,27,16,64,214,134,0,58,215,249,143,2,216,
+217,217,251,81,201,5,28,48,129,255,104,250,60,23,21,0,
+187,17,250,17,169,5,2,208,224,209,186,5,128,7,154,1,
+60,87,25,0,10,6,240,255,201,5,60,103,5,0,181,5,
+60,102,4,0,27,88,204,89,10,6,240,255,201,5,60,87,
+5,0,181,5,60,86,4,0,202,217,26,80,219,81,186,17,
+162,37,11,96,10,88,2,104,203,105,12,80,171,81,13,128,
+171,129,240,81,139,21,2,120,204,121,15,102,255,255,13,94,
+255,255,95,90,11,119,1,0,95,98,76,119,1,0,95,18,
+154,253,149,13,65,90,11,111,255,255,65,98,76,111,255,255,
+95,18,154,253,60,223,21,0,186,217,126,218,195,5,28,48,
+129,255,186,248,60,95,25,0,251,89,153,93,60,199,21,0,
+155,214,15,0,126,210,163,5,27,208,26,54,1,0,129,255,
+190,251,10,184,224,193,146,21,60,87,25,0,23,88,10,6,
+240,255,201,5,60,23,5,0,181,5,60,22,4,0,11,48,
+2,56,24,64,191,255,224,214,60,23,25,0,2,6,240,255,
+201,13,2,6,240,255,201,5,60,23,5,0,181,5,60,22,
+4,0,2,48,129,255,88,251,15,130,124,135,25,0,197,5,
+60,23,5,0,181,5,60,22,4,0,124,7,21,0,67,7,
+9,0,35,86,9,0,10,119,0,0,66,119,0,0,26,6,
+240,255,124,191,5,0,124,215,25,0,185,5,23,16,181,5,
+60,22,4,0,124,199,21,0,67,7,8,0,194,193,35,22,
+8,0,2,95,0,0,88,95,0,0,245,21,224,217,218,21,
+60,87,25,0,124,7,21,0,10,6,240,255,201,5,60,23,
+5,0,181,5,60,22,4,0,67,7,7,0,35,86,7,0,
+10,135,0,0,66,135,0,0,224,217,226,21,60,111,25,0,
+13,6,240,255,201,5,60,23,5,0,181,5,60,22,4,0,
+124,223,21,0,67,7,10,0,194,217,35,22,10,0,2,95,
+0,0,91,95,0,0,60,95,21,0,25,72,233,89,169,5,
+11,72,224,73,186,5,128,7,250,2,60,23,25,0,2,6,
+240,255,201,5,60,87,5,0,181,5,60,86,4,0,10,96,
+2,6,240,255,201,5,60,23,5,0,181,5,60,22,4,0,
+9,80,194,81,11,16,169,17,146,37,10,88,2,104,203,105,
+12,80,171,81,13,128,171,129,240,81,139,21,2,120,204,121,
+15,102,255,255,13,94,255,255,95,90,11,119,1,0,95,98,
+76,119,1,0,95,18,154,253,149,13,65,90,11,111,255,255,
+65,98,76,111,255,255,95,18,154,253,60,223,21,0,169,217,
+126,218,195,5,28,48,129,255,20,247,60,95,25,0,251,89,
+153,93,60,207,21,0,155,214,15,0,126,210,163,5,27,208,
+26,54,1,0,129,255,24,250,10,192,224,201,146,21,60,87,
+25,0,24,88,10,6,240,255,201,5,60,23,5,0,181,5,
+60,22,4,0,11,48,2,56,25,64,191,255,58,213,60,23,
+25,0,2,6,240,255,201,13,2,6,240,255,201,5,60,23,
+5,0,181,5,60,22,4,0,2,48,129,255,178,249,15,130,
+124,135,25,0,197,5,60,23,5,0,181,5,60,22,4,0,
+124,7,21,0,67,7,13,0,35,86,13,0,10,119,0,0,
+66,119,0,0,26,6,240,255,124,199,5,0,124,215,25,0,
+185,5,24,16,181,5,60,22,4,0,124,207,21,0,67,7,
+12,0,194,201,35,22,12,0,2,95,0,0,89,95,0,0,
+245,21,224,217,218,21,60,87,25,0,124,7,21,0,10,6,
+240,255,201,5,60,23,5,0,181,5,60,22,4,0,67,7,
+11,0,35,86,11,0,10,135,0,0,66,135,0,0,224,217,
+186,5,128,7,142,1,60,111,25,0,13,6,240,255,201,5,
+60,23,5,0,181,5,60,22,4,0,124,223,21,0,67,7,
+14,0,194,217,35,22,14,0,2,95,0,0,91,95,0,0,
+128,7,96,1,126,218,195,5,28,48,129,255,240,245,60,23,
+25,0,251,17,217,69,155,214,15,0,126,210,163,5,27,208,
+26,54,1,0,129,255,248,248,60,23,25,0,10,192,2,6,
 240,255,201,13,2,6,240,255,201,5,60,23,5,0,181,5,
-60,22,4,0,2,48,129,255,246,243,15,130,124,135,25,0,
+60,22,4,0,2,48,129,255,182,248,15,82,124,87,25,0,
 197,5,60,23,5,0,181,5,60,22,4,0,124,7,21,0,
-67,7,13,0,35,86,13,0,10,119,0,0,66,119,0,0,
-26,6,240,255,124,199,5,0,124,215,25,0,185,5,24,16,
-181,5,60,22,4,0,124,207,21,0,67,7,12,0,194,201,
-35,22,12,0,2,95,0,0,89,95,0,0,245,21,224,217,
-218,21,60,87,25,0,124,7,21,0,10,6,240,255,201,5,
-60,23,5,0,181,5,60,22,4,0,67,7,11,0,35,86,
-11,0,10,135,0,0,66,135,0,0,224,217,186,5,128,7,
-142,1,60,111,25,0,13,6,240,255,201,5,60,23,5,0,
-181,5,60,22,4,0,124,223,21,0,67,7,14,0,194,217,
-35,22,14,0,2,95,0,0,91,95,0,0,128,7,96,1,
-126,218,195,5,28,48,129,255,52,240,60,23,25,0,251,17,
-217,69,155,214,15,0,126,210,163,5,27,208,26,54,1,0,
-129,255,60,243,60,23,25,0,10,192,2,6,240,255,201,13,
-2,6,240,255,201,5,60,23,5,0,181,5,60,22,4,0,
-2,48,129,255,250,242,15,82,124,87,25,0,197,5,60,23,
-5,0,181,5,60,22,4,0,124,7,21,0,67,7,17,0,
-35,86,17,0,10,127,0,0,66,127,0,0,26,6,240,255,
-124,199,5,0,124,215,25,0,185,5,24,80,181,5,60,86,
-4,0,124,7,21,0,10,16,67,7,16,0,35,86,16,0,
-10,103,0,0,66,103,0,0,197,61,27,6,240,255,177,37,
-2,6,240,255,201,13,2,6,240,255,201,5,60,23,5,0,
-181,5,60,22,4,0,2,48,129,255,132,242,15,90,124,95,
-25,0,197,5,60,23,5,0,181,5,60,22,4,0,124,7,
-21,0,67,7,18,0,35,86,18,0,10,135,0,0,66,135,
-0,0,245,21,224,217,218,21,60,127,25,0,124,7,21,0,
-15,6,240,255,201,5,60,23,5,0,181,5,60,22,4,0,
-67,7,15,0,35,86,15,0,10,119,0,0,66,119,0,0,
-224,217,210,37,60,95,25,0,11,6,240,255,201,5,60,23,
-5,0,181,5,60,22,4,0,2,48,25,56,27,64,191,255,
-26,214,60,87,25,0,10,6,240,255,201,5,60,23,5,0,
-181,5,60,22,4,0,124,223,21,0,67,7,19,0,194,217,
-35,22,19,0,2,127,0,0,91,127,0,0,37,22,72,128,
-99,23,33,0,35,214,68,0,61,22,56,255,99,23,37,0,
-15,106,154,119,1,0,67,119,3,0,99,111,65,0,197,5,
-35,23,45,0,181,5,35,22,44,0,99,7,61,0,67,7,
-20,0,35,86,20,0,10,95,0,0,66,95,0,0,64,94,
-134,0,43,95,153,132,58,231,21,0,11,16,252,17,169,5,
-2,224,35,86,40,0,250,81,178,5,128,7,200,1,35,135,
-61,0,11,216,252,129,217,5,35,54,40,0,129,255,132,239,
-35,23,61,0,188,17,251,17,169,5,2,216,224,217,186,5,
-128,7,22,3,35,87,65,0,10,6,240,255,201,5,35,103,
-45,0,181,5,35,102,44,0,28,88,204,89,10,6,240,255,
-201,5,35,87,45,0,181,5,35,86,44,0,202,225,27,80,
-220,81,187,17,162,37,11,112,10,88,2,80,203,81,14,104,
-171,105,10,96,171,97,236,105,139,21,2,88,206,89,11,118,
-255,255,10,94,255,255,95,90,11,87,1,0,95,114,78,87,
-1,0,95,18,154,253,149,13,65,90,11,135,255,255,65,114,
-78,135,255,255,95,18,154,253,35,231,61,0,187,225,126,226,
-211,5,35,54,40,0,129,255,212,237,35,119,65,0,252,113,
-137,93,35,215,61,0,156,222,15,0,126,218,163,5,28,216,
-27,54,1,0,129,255,216,240,10,200,224,209,130,21,35,111,
-65,0,13,6,240,255,201,5,35,23,45,0,181,5,35,22,
-44,0,10,48,2,56,26,64,191,255,160,212,35,23,65,0,
-2,6,240,255,201,13,2,6,240,255,201,5,35,23,45,0,
-181,5,35,22,44,0,2,48,129,255,116,240,15,98,99,103,
-65,0,197,5,35,23,45,0,181,5,35,22,44,0,99,7,
-61,0,67,7,23,0,35,86,23,0,10,87,0,0,66,87,
-0,0,27,6,240,255,99,207,45,0,99,223,65,0,185,5,
-25,16,181,5,35,22,44,0,99,215,61,0,67,7,22,0,
-194,209,35,22,22,0,2,119,0,0,90,119,0,0,245,21,
-224,225,218,21,35,111,65,0,99,7,61,0,13,6,240,255,
-201,5,35,23,45,0,181,5,35,22,44,0,67,7,21,0,
-35,86,21,0,10,103,0,0,66,103,0,0,224,225,186,5,
-128,7,166,1,35,135,65,0,16,6,240,255,201,5,35,23,
-45,0,181,5,35,22,44,0,99,231,61,0,67,7,24,0,
-194,225,35,22,24,0,2,119,0,0,92,119,0,0,128,7,
-120,1,126,226,211,5,35,54,40,0,129,255,176,236,35,23,
-65,0,252,17,217,69,156,222,15,0,126,218,163,5,28,216,
-27,54,1,0,129,255,184,239,35,23,65,0,10,200,2,6,
-240,255,201,13,2,6,240,255,201,5,35,23,45,0,181,5,
-35,22,44,0,2,48,129,255,118,239,15,106,99,111,65,0,
-197,5,35,23,45,0,181,5,35,22,44,0,99,7,61,0,
-67,7,27,0,35,86,27,0,10,95,0,0,66,95,0,0,
-27,6,240,255,99,207,45,0,99,223,65,0,185,5,25,80,
-181,5,35,86,44,0,99,7,61,0,10,16,67,7,26,0,
-35,86,26,0,10,127,0,0,66,127,0,0,197,61,28,6,
+67,7,17,0,35,86,17,0,10,127,0,0,66,127,0,0,
+26,6,240,255,124,199,5,0,124,215,25,0,185,5,24,80,
+181,5,60,86,4,0,124,7,21,0,10,16,67,7,16,0,
+35,86,16,0,10,103,0,0,66,103,0,0,197,61,27,6,
 240,255,177,37,2,6,240,255,201,13,2,6,240,255,201,5,
-35,23,45,0,181,5,35,22,44,0,2,48,129,255,0,239,
-15,114,99,119,65,0,197,5,35,23,45,0,181,5,35,22,
-44,0,99,7,61,0,67,7,28,0,35,86,28,0,10,103,
-0,0,66,103,0,0,245,21,224,225,218,21,35,95,65,0,
-99,7,61,0,11,6,240,255,201,5,35,23,45,0,181,5,
-35,22,44,0,67,7,25,0,35,86,25,0,10,87,0,0,
-66,87,0,0,224,225,130,53,35,119,65,0,14,6,240,255,
-201,5,35,23,45,0,181,5,35,22,44,0,58,111,25,0,
-2,80,13,6,240,255,201,5,58,23,5,0,181,5,58,22,
-4,0,10,48,2,56,28,64,191,255,128,210,35,103,65,0,
-12,6,240,255,201,5,35,23,45,0,181,5,35,22,44,0,
-99,231,61,0,67,7,29,0,194,225,35,22,29,0,2,87,
-0,0,92,87,0,0,61,22,88,255,99,23,37,0,64,134,
-134,0,48,135,221,131,35,230,32,0,224,129,242,5,28,48,
-16,120,63,6,90,46,128,0,111,0,60,23,5,0,63,6,
-118,46,128,0,2,22,24,0,34,87,0,0,34,119,5,0,
-220,81,10,48,110,0,28,48,129,255,48,237,61,22,56,255,
-99,23,37,0,35,23,65,0,2,6,240,255,201,13,2,6,
+60,23,5,0,181,5,60,22,4,0,2,48,129,255,64,248,
+15,90,124,95,25,0,197,5,60,23,5,0,181,5,60,22,
+4,0,124,7,21,0,67,7,18,0,35,86,18,0,10,135,
+0,0,66,135,0,0,245,21,224,217,218,21,60,127,25,0,
+124,7,21,0,15,6,240,255,201,5,60,23,5,0,181,5,
+60,22,4,0,67,7,15,0,35,86,15,0,10,119,0,0,
+66,119,0,0,224,217,210,37,60,95,25,0,11,6,240,255,
+201,5,60,23,5,0,181,5,60,22,4,0,2,48,25,56,
+27,64,191,255,50,211,60,87,25,0,10,6,240,255,201,5,
+60,23,5,0,181,5,60,22,4,0,124,223,21,0,67,7,
+19,0,194,217,35,22,19,0,2,127,0,0,91,127,0,0,
+37,22,72,128,99,23,33,0,35,214,68,0,61,22,56,255,
+99,23,37,0,15,106,154,119,1,0,67,119,3,0,99,111,
+65,0,197,5,35,23,45,0,181,5,35,22,44,0,99,7,
+61,0,67,7,20,0,35,86,20,0,10,95,0,0,66,95,
+0,0,64,94,134,0,43,95,249,143,58,231,21,0,11,16,
+252,17,169,5,2,224,35,86,40,0,250,81,178,5,128,7,
+200,1,35,135,61,0,11,216,252,129,217,5,35,54,40,0,
+129,255,64,245,35,23,61,0,188,17,251,17,169,5,2,216,
+224,217,186,5,128,7,22,3,35,87,65,0,10,6,240,255,
+201,5,35,103,45,0,181,5,35,102,44,0,28,88,204,89,
+10,6,240,255,201,5,35,87,45,0,181,5,35,86,44,0,
+202,225,27,80,220,81,187,17,162,37,11,112,10,88,2,80,
+203,81,14,104,171,105,10,96,171,97,236,105,139,21,2,88,
+206,89,11,118,255,255,10,94,255,255,95,90,11,87,1,0,
+95,114,78,87,1,0,95,18,154,253,149,13,65,90,11,135,
+255,255,65,114,78,135,255,255,95,18,154,253,35,231,61,0,
+187,225,126,226,211,5,35,54,40,0,129,255,144,243,35,119,
+65,0,252,113,137,93,35,215,61,0,156,222,15,0,126,218,
+163,5,28,216,27,54,1,0,129,255,148,246,10,200,224,209,
+130,21,35,111,65,0,13,6,240,255,201,5,35,23,45,0,
+181,5,35,22,44,0,10,48,2,56,26,64,191,255,184,209,
+35,23,65,0,2,6,240,255,201,13,2,6,240,255,201,5,
+35,23,45,0,181,5,35,22,44,0,2,48,129,255,48,246,
+15,98,99,103,65,0,197,5,35,23,45,0,181,5,35,22,
+44,0,99,7,61,0,67,7,23,0,35,86,23,0,10,87,
+0,0,66,87,0,0,27,6,240,255,99,207,45,0,99,223,
+65,0,185,5,25,16,181,5,35,22,44,0,99,215,61,0,
+67,7,22,0,194,209,35,22,22,0,2,119,0,0,90,119,
+0,0,245,21,224,225,218,21,35,111,65,0,99,7,61,0,
+13,6,240,255,201,5,35,23,45,0,181,5,35,22,44,0,
+67,7,21,0,35,86,21,0,10,103,0,0,66,103,0,0,
+224,225,186,5,128,7,166,1,35,135,65,0,16,6,240,255,
+201,5,35,23,45,0,181,5,35,22,44,0,99,231,61,0,
+67,7,24,0,194,225,35,22,24,0,2,119,0,0,92,119,
+0,0,128,7,120,1,126,226,211,5,35,54,40,0,129,255,
+108,242,35,23,65,0,252,17,217,69,156,222,15,0,126,218,
+163,5,28,216,27,54,1,0,129,255,116,245,35,23,65,0,
+10,200,2,6,240,255,201,13,2,6,240,255,201,5,35,23,
+45,0,181,5,35,22,44,0,2,48,129,255,50,245,15,106,
+99,111,65,0,197,5,35,23,45,0,181,5,35,22,44,0,
+99,7,61,0,67,7,27,0,35,86,27,0,10,95,0,0,
+66,95,0,0,27,6,240,255,99,207,45,0,99,223,65,0,
+185,5,25,80,181,5,35,86,44,0,99,7,61,0,10,16,
+67,7,26,0,35,86,26,0,10,127,0,0,66,127,0,0,
+197,61,28,6,240,255,177,37,2,6,240,255,201,13,2,6,
 240,255,201,5,35,23,45,0,181,5,35,22,44,0,2,48,
-129,255,220,237,15,106,99,111,65,0,197,5,35,23,45,0,
-181,5,35,22,44,0,99,7,61,0,67,7,30,0,35,86,
-30,0,10,95,0,0,66,95,0,0,61,22,24,255,99,23,
-37,0,35,23,93,0,2,6,240,255,201,13,2,6,240,255,
-201,5,35,23,73,0,181,5,35,22,72,0,2,48,129,255,
-142,237,15,82,99,87,93,0,197,5,35,23,73,0,181,5,
-35,22,72,0,99,7,89,0,67,7,31,0,35,86,31,0,
-10,127,0,0,66,127,0,0,245,21,46,6,255,255,255,31,
-238,225,211,5,129,255,104,227,0,18,229,5,28,48,195,50,
-129,255,108,237,10,16,123,23,5,0,123,23,9,0,195,226,
-194,225,123,231,13,0,1,82,112,6,255,241,190,7,225,241,
-3,30,24,255,41,87,1,0,35,22,28,1,98,87,1,0,
-7,184,41,87,5,0,8,216,98,87,5,0,6,224,60,23,
-5,0,61,6,12,72,133,0,224,17,186,5,0,82,213,5,
-60,87,13,0,162,81,163,82,10,208,224,217,186,5,128,7,
-64,14,224,17,186,5,0,82,213,5,60,87,9,0,162,81,
-163,82,44,6,255,255,255,31,170,97,251,97,177,5,128,7,
-254,9,43,6,84,133,132,0,131,87,9,0,67,87,9,0,
-15,130,99,135,97,1,197,5,35,23,77,1,181,5,35,22,
-76,1,99,7,93,1,67,7,10,0,35,86,10,0,10,119,
-0,0,66,119,0,0,11,16,65,18,2,111,255,255,224,105,
-202,253,11,200,0,82,2,222,255,255,35,230,72,1,60,23,
-25,0,171,217,2,6,240,255,201,5,60,95,5,0,181,5,
-60,94,4,0,249,89,251,13,2,6,240,255,201,5,60,103,
-5,0,181,5,60,102,4,0,60,95,21,0,204,89,235,201,
-169,5,1,82,138,0,224,81,186,5,128,7,152,3,2,6,
-240,255,201,5,60,23,5,0,181,5,60,22,4,0,162,201,
-60,23,21,0,249,17,201,5,28,48,129,255,54,234,60,87,
-21,0,10,16,185,17,226,217,169,5,27,16,64,214,134,0,
-58,215,153,132,2,216,217,217,251,81,201,5,28,48,129,255,
-18,234,60,23,21,0,187,17,250,17,169,5,2,208,224,209,
-186,5,128,7,150,1,60,87,25,0,10,6,240,255,201,5,
-60,103,5,0,181,5,60,102,4,0,27,88,204,89,10,6,
-240,255,201,5,60,87,5,0,181,5,60,86,4,0,202,217,
-26,80,219,81,186,17,146,37,11,104,2,112,202,113,13,96,
-170,97,14,88,170,89,235,97,139,21,2,80,205,81,10,110,
-255,255,14,86,255,255,95,82,10,135,1,0,95,106,77,135,
-1,0,95,18,154,253,149,13,65,82,10,127,255,255,65,106,
-77,127,255,255,95,18,154,253,60,223,21,0,186,217,126,218,
-195,5,28,48,129,255,102,232,60,111,25,0,251,105,137,93,
-60,199,21,0,155,214,15,0,126,210,163,5,27,208,26,54,
-1,0,129,255,106,235,10,184,224,193,130,21,60,103,25,0,
+129,255,188,244,15,114,99,119,65,0,197,5,35,23,45,0,
+181,5,35,22,44,0,99,7,61,0,67,7,28,0,35,86,
+28,0,10,103,0,0,66,103,0,0,245,21,224,225,218,21,
+35,95,65,0,99,7,61,0,11,6,240,255,201,5,35,23,
+45,0,181,5,35,22,44,0,67,7,25,0,35,86,25,0,
+10,87,0,0,66,87,0,0,224,225,130,53,35,119,65,0,
+14,6,240,255,201,5,35,23,45,0,181,5,35,22,44,0,
+58,111,25,0,2,80,13,6,240,255,201,5,58,23,5,0,
+181,5,58,22,4,0,10,48,2,56,28,64,191,255,152,207,
+35,103,65,0,12,6,240,255,201,5,35,23,45,0,181,5,
+35,22,44,0,99,231,61,0,67,7,29,0,194,225,35,22,
+29,0,2,87,0,0,92,87,0,0,61,22,88,255,99,23,
+37,0,64,134,134,0,48,135,61,143,35,230,32,0,224,129,
+242,5,28,48,16,120,63,6,66,49,128,0,111,0,60,23,
+5,0,63,6,94,49,128,0,2,22,24,0,34,87,0,0,
+34,119,5,0,220,81,10,48,110,0,28,48,129,255,236,242,
+61,22,56,255,99,23,37,0,35,23,65,0,2,6,240,255,
+201,13,2,6,240,255,201,5,35,23,45,0,181,5,35,22,
+44,0,2,48,129,255,152,243,15,106,99,111,65,0,197,5,
+35,23,45,0,181,5,35,22,44,0,99,7,61,0,67,7,
+30,0,35,86,30,0,10,95,0,0,66,95,0,0,61,22,
+24,255,99,23,37,0,35,23,93,0,2,6,240,255,201,13,
+2,6,240,255,201,5,35,23,73,0,181,5,35,22,72,0,
+2,48,129,255,74,243,15,82,99,87,93,0,197,5,35,23,
+73,0,181,5,35,22,72,0,99,7,89,0,67,7,31,0,
+35,86,31,0,10,127,0,0,66,127,0,0,245,21,46,6,
+255,255,255,31,238,225,211,5,129,255,36,233,0,18,229,5,
+28,48,195,50,129,255,40,243,10,16,123,23,5,0,123,23,
+9,0,195,226,194,225,123,231,13,0,1,82,112,6,255,241,
+190,7,225,241,3,30,24,255,41,87,1,0,35,22,28,1,
+98,87,1,0,7,184,41,87,5,0,8,216,98,87,5,0,
+6,224,60,23,5,0,61,6,148,83,133,0,224,17,186,5,
+0,82,213,5,60,87,13,0,162,81,163,82,10,208,224,217,
+186,5,128,7,64,14,224,17,186,5,0,82,213,5,60,87,
+9,0,162,81,163,82,44,6,255,255,255,31,170,97,251,97,
+177,5,128,7,254,9,43,6,52,144,132,0,131,87,9,0,
+67,87,9,0,15,130,99,135,97,1,197,5,35,23,77,1,
+181,5,35,22,76,1,99,7,93,1,67,7,10,0,35,86,
+10,0,10,119,0,0,66,119,0,0,11,16,65,18,2,111,
+255,255,224,105,202,253,11,200,0,82,2,222,255,255,35,230,
+72,1,60,23,25,0,171,217,2,6,240,255,201,5,60,95,
+5,0,181,5,60,94,4,0,249,89,251,13,2,6,240,255,
+201,5,60,103,5,0,181,5,60,102,4,0,60,95,21,0,
+204,89,235,201,169,5,1,82,138,0,224,81,186,5,128,7,
+152,3,2,6,240,255,201,5,60,23,5,0,181,5,60,22,
+4,0,162,201,60,23,21,0,249,17,201,5,28,48,129,255,
+242,239,60,87,21,0,10,16,185,17,226,217,169,5,27,16,
+64,214,134,0,58,215,249,143,2,216,217,217,251,81,201,5,
+28,48,129,255,206,239,60,23,21,0,187,17,250,17,169,5,
+2,208,224,209,186,5,128,7,150,1,60,87,25,0,10,6,
+240,255,201,5,60,103,5,0,181,5,60,102,4,0,27,88,
+204,89,10,6,240,255,201,5,60,87,5,0,181,5,60,86,
+4,0,202,217,26,80,219,81,186,17,146,37,11,104,2,112,
+202,113,13,96,170,97,14,88,170,89,235,97,139,21,2,80,
+205,81,10,110,255,255,14,86,255,255,95,82,10,135,1,0,
+95,106,77,135,1,0,95,18,154,253,149,13,65,82,10,127,
+255,255,65,106,77,127,255,255,95,18,154,253,60,223,21,0,
+186,217,126,218,195,5,28,48,129,255,34,238,60,111,25,0,
+251,105,137,93,60,199,21,0,155,214,15,0,126,210,163,5,
+27,208,26,54,1,0,129,255,38,241,10,184,224,193,130,21,
+60,103,25,0,12,6,240,255,201,5,60,23,5,0,181,5,
+60,22,4,0,10,48,2,56,24,64,191,255,74,204,60,23,
+25,0,2,6,240,255,201,13,2,6,240,255,201,5,60,23,
+5,0,181,5,60,22,4,0,2,48,129,255,194,240,15,90,
+124,95,25,0,197,5,60,23,5,0,181,5,60,22,4,0,
+124,7,21,0,67,7,13,0,35,86,13,0,10,135,0,0,
+66,135,0,0,26,6,240,255,124,191,5,0,124,215,25,0,
+185,5,23,16,181,5,60,22,4,0,124,199,21,0,67,7,
+12,0,194,193,35,22,12,0,2,111,0,0,88,111,0,0,
+245,21,224,217,218,21,60,103,25,0,124,7,21,0,12,6,
+240,255,201,5,60,23,5,0,181,5,60,22,4,0,67,7,
+11,0,35,86,11,0,10,95,0,0,66,95,0,0,224,217,
+226,21,60,127,25,0,15,6,240,255,201,5,60,23,5,0,
+181,5,60,22,4,0,124,223,21,0,67,7,14,0,194,217,
+35,22,14,0,2,111,0,0,91,111,0,0,60,95,21,0,
+25,112,238,89,169,5,11,112,224,113,186,5,128,7,246,2,
+60,23,25,0,2,6,240,255,201,5,60,87,5,0,181,5,
+60,86,4,0,10,96,2,6,240,255,201,5,60,23,5,0,
+181,5,60,22,4,0,14,80,194,81,11,16,174,17,130,37,
+2,120,202,121,12,104,170,97,15,88,170,89,235,97,139,21,
+2,80,205,81,10,110,255,255,15,86,255,255,95,82,10,135,
+1,0,95,106,77,135,1,0,95,18,154,253,149,13,65,82,
+10,127,255,255,65,106,77,127,255,255,95,18,154,253,60,223,
+21,0,174,217,126,218,195,5,28,48,129,255,128,236,60,111,
+25,0,251,105,137,93,60,207,21,0,155,214,15,0,126,210,
+163,5,27,208,26,54,1,0,129,255,132,239,10,192,224,201,
+130,21,60,103,25,0,12,6,240,255,201,5,60,23,5,0,
+181,5,60,22,4,0,10,48,2,56,25,64,191,255,168,202,
+60,23,25,0,2,6,240,255,201,13,2,6,240,255,201,5,
+60,23,5,0,181,5,60,22,4,0,2,48,129,255,32,239,
+15,90,124,95,25,0,197,5,60,23,5,0,181,5,60,22,
+4,0,124,7,21,0,67,7,17,0,35,86,17,0,10,135,
+0,0,66,135,0,0,26,6,240,255,124,199,5,0,124,215,
+25,0,185,5,24,16,181,5,60,22,4,0,124,207,21,0,
+67,7,16,0,194,201,35,22,16,0,2,111,0,0,89,111,
+0,0,245,21,224,217,218,21,60,103,25,0,124,7,21,0,
 12,6,240,255,201,5,60,23,5,0,181,5,60,22,4,0,
-10,48,2,56,24,64,191,255,50,207,60,23,25,0,2,6,
-240,255,201,13,2,6,240,255,201,5,60,23,5,0,181,5,
-60,22,4,0,2,48,129,255,6,235,15,90,124,95,25,0,
-197,5,60,23,5,0,181,5,60,22,4,0,124,7,21,0,
-67,7,13,0,35,86,13,0,10,135,0,0,66,135,0,0,
-26,6,240,255,124,191,5,0,124,215,25,0,185,5,23,16,
-181,5,60,22,4,0,124,199,21,0,67,7,12,0,194,193,
-35,22,12,0,2,111,0,0,88,111,0,0,245,21,224,217,
-218,21,60,103,25,0,124,7,21,0,12,6,240,255,201,5,
-60,23,5,0,181,5,60,22,4,0,67,7,11,0,35,86,
-11,0,10,95,0,0,66,95,0,0,224,217,226,21,60,127,
-25,0,15,6,240,255,201,5,60,23,5,0,181,5,60,22,
-4,0,124,223,21,0,67,7,14,0,194,217,35,22,14,0,
-2,111,0,0,91,111,0,0,60,95,21,0,25,112,238,89,
-169,5,11,112,224,113,186,5,128,7,246,2,60,23,25,0,
-2,6,240,255,201,5,60,87,5,0,181,5,60,86,4,0,
-10,96,2,6,240,255,201,5,60,23,5,0,181,5,60,22,
-4,0,14,80,194,81,11,16,174,17,130,37,2,120,202,121,
-12,104,170,97,15,88,170,89,235,97,139,21,2,80,205,81,
-10,110,255,255,15,86,255,255,95,82,10,135,1,0,95,106,
-77,135,1,0,95,18,154,253,149,13,65,82,10,127,255,255,
-65,106,77,127,255,255,95,18,154,253,60,223,21,0,174,217,
-126,218,195,5,28,48,129,255,196,230,60,111,25,0,251,105,
-137,93,60,207,21,0,155,214,15,0,126,210,163,5,27,208,
-26,54,1,0,129,255,200,233,10,192,224,201,130,21,60,103,
-25,0,12,6,240,255,201,5,60,23,5,0,181,5,60,22,
-4,0,10,48,2,56,25,64,191,255,144,205,60,23,25,0,
+67,7,15,0,35,86,15,0,10,95,0,0,66,95,0,0,
+224,217,186,5,128,7,142,1,60,127,25,0,15,6,240,255,
+201,5,60,23,5,0,181,5,60,22,4,0,124,223,21,0,
+67,7,18,0,194,217,35,22,18,0,2,111,0,0,91,111,
+0,0,128,7,96,1,126,218,195,5,28,48,129,255,94,235,
+60,23,25,0,251,17,217,69,155,214,15,0,126,210,163,5,
+27,208,26,54,1,0,129,255,102,238,60,23,25,0,10,192,
 2,6,240,255,201,13,2,6,240,255,201,5,60,23,5,0,
-181,5,60,22,4,0,2,48,129,255,100,233,15,90,124,95,
+181,5,60,22,4,0,2,48,129,255,36,238,15,98,124,103,
 25,0,197,5,60,23,5,0,181,5,60,22,4,0,124,7,
-21,0,67,7,17,0,35,86,17,0,10,135,0,0,66,135,
+21,0,67,7,21,0,35,86,21,0,10,87,0,0,66,87,
 0,0,26,6,240,255,124,199,5,0,124,215,25,0,185,5,
-24,16,181,5,60,22,4,0,124,207,21,0,67,7,16,0,
-194,201,35,22,16,0,2,111,0,0,89,111,0,0,245,21,
-224,217,218,21,60,103,25,0,124,7,21,0,12,6,240,255,
-201,5,60,23,5,0,181,5,60,22,4,0,67,7,15,0,
-35,86,15,0,10,95,0,0,66,95,0,0,224,217,186,5,
-128,7,142,1,60,127,25,0,15,6,240,255,201,5,60,23,
-5,0,181,5,60,22,4,0,124,223,21,0,67,7,18,0,
-194,217,35,22,18,0,2,111,0,0,91,111,0,0,128,7,
-96,1,126,218,195,5,28,48,129,255,162,229,60,23,25,0,
-251,17,217,69,155,214,15,0,126,210,163,5,27,208,26,54,
-1,0,129,255,170,232,60,23,25,0,10,192,2,6,240,255,
-201,13,2,6,240,255,201,5,60,23,5,0,181,5,60,22,
-4,0,2,48,129,255,104,232,15,98,124,103,25,0,197,5,
-60,23,5,0,181,5,60,22,4,0,124,7,21,0,67,7,
-21,0,35,86,21,0,10,87,0,0,66,87,0,0,26,6,
-240,255,124,199,5,0,124,215,25,0,185,5,24,80,181,5,
-60,86,4,0,124,7,21,0,10,16,67,7,20,0,35,86,
-20,0,10,119,0,0,66,119,0,0,197,61,27,6,240,255,
-177,37,2,6,240,255,201,13,2,6,240,255,201,5,60,23,
-5,0,181,5,60,22,4,0,2,48,129,255,242,231,15,106,
-124,111,25,0,197,5,60,23,5,0,181,5,60,22,4,0,
-124,7,21,0,67,7,22,0,35,86,22,0,10,95,0,0,
-66,95,0,0,245,21,224,217,218,21,60,87,25,0,124,7,
-21,0,10,6,240,255,201,5,60,23,5,0,181,5,60,22,
-4,0,67,7,19,0,35,86,19,0,10,135,0,0,66,135,
-0,0,224,217,210,37,60,111,25,0,13,6,240,255,201,5,
-60,23,5,0,181,5,60,22,4,0,2,48,25,56,27,64,
-191,255,136,203,60,103,25,0,12,6,240,255,201,5,60,23,
-5,0,181,5,60,22,4,0,124,223,21,0,67,7,23,0,
-194,217,35,22,23,0,2,87,0,0,91,87,0,0,37,22,
-80,128,99,23,37,1,35,214,72,1,61,22,56,255,99,23,
-41,1,15,122,154,135,1,0,67,135,7,0,99,127,69,1,
-197,5,35,23,49,1,181,5,35,22,48,1,99,7,65,1,
-67,7,24,0,35,86,24,0,10,111,0,0,66,111,0,0,
-64,86,134,0,42,87,153,132,58,231,21,0,10,16,252,17,
-169,5,2,224,35,102,44,1,250,97,178,5,128,7,198,1,
-35,95,65,1,10,216,252,89,217,5,35,54,44,1,129,255,
-242,228,35,23,65,1,188,17,251,17,169,5,2,216,224,217,
-186,5,128,7,20,3,35,87,69,1,10,6,240,255,201,5,
-35,103,49,1,181,5,35,102,48,1,28,88,204,89,10,6,
-240,255,201,5,35,87,49,1,181,5,35,86,48,1,202,225,
-27,80,220,81,187,17,146,37,11,128,16,120,2,88,202,89,
-170,121,11,112,170,113,238,121,139,21,2,104,208,105,13,134,
-255,255,11,86,255,255,95,82,10,103,1,0,95,130,80,103,
-1,0,95,18,154,253,149,13,65,82,10,95,255,255,65,130,
-80,95,255,255,95,18,154,253,35,231,65,1,187,225,126,226,
-211,5,35,54,44,1,129,255,68,227,35,135,69,1,252,129,
-137,93,35,215,65,1,156,222,15,0,126,218,163,5,28,216,
-27,54,1,0,129,255,72,230,10,200,224,209,130,21,35,127,
-69,1,15,6,240,255,201,5,35,23,49,1,181,5,35,22,
-48,1,10,48,2,56,26,64,191,255,16,202,35,23,69,1,
-2,6,240,255,201,13,2,6,240,255,201,5,35,23,49,1,
-181,5,35,22,48,1,2,48,129,255,228,229,15,114,99,119,
-69,1,197,5,35,23,49,1,181,5,35,22,48,1,99,7,
-65,1,67,7,27,0,35,86,27,0,10,103,0,0,66,103,
-0,0,27,6,240,255,99,207,49,1,99,223,69,1,185,5,
-25,16,181,5,35,22,48,1,99,215,65,1,67,7,26,0,
-194,209,35,22,26,0,2,135,0,0,90,135,0,0,245,21,
-224,225,218,21,35,127,69,1,99,7,65,1,15,6,240,255,
-201,5,35,23,49,1,181,5,35,22,48,1,67,7,25,0,
-35,86,25,0,10,119,0,0,66,119,0,0,224,225,186,5,
-128,7,166,1,35,95,69,1,11,6,240,255,201,5,35,23,
-49,1,181,5,35,22,48,1,99,231,65,1,67,7,28,0,
-194,225,35,22,28,0,2,135,0,0,92,135,0,0,128,7,
-120,1,126,226,211,5,35,54,44,1,129,255,32,226,35,23,
-69,1,252,17,217,69,156,222,15,0,126,218,163,5,28,216,
-27,54,1,0,129,255,40,229,35,23,69,1,10,200,2,6,
-240,255,201,13,2,6,240,255,201,5,35,23,49,1,181,5,
-35,22,48,1,2,48,129,255,230,228,15,122,99,127,69,1,
-197,5,35,23,49,1,181,5,35,22,48,1,99,7,65,1,
-67,7,31,0,35,86,31,0,10,111,0,0,66,111,0,0,
-27,6,240,255,99,207,49,1,99,223,69,1,185,5,25,80,
-181,5,35,86,48,1,99,7,65,1,10,16,67,7,30,0,
-35,86,30,0,10,87,0,0,66,87,0,0,197,61,28,6,
-240,255,177,37,2,6,240,255,201,13,2,6,240,255,201,5,
-35,23,49,1,181,5,35,22,48,1,2,48,129,255,112,228,
-15,130,99,135,69,1,197,5,35,23,49,1,181,5,35,22,
-48,1,99,7,65,1,67,7,32,0,35,86,32,0,10,119,
-0,0,66,119,0,0,245,21,224,225,218,21,35,111,69,1,
-99,7,65,1,13,6,240,255,201,5,35,23,49,1,181,5,
-35,22,48,1,67,7,29,0,35,86,29,0,10,103,0,0,
-66,103,0,0,224,225,130,53,35,135,69,1,16,6,240,255,
-201,5,35,23,49,1,181,5,35,22,48,1,58,127,25,0,
-2,80,15,6,240,255,201,5,58,23,5,0,181,5,58,22,
-4,0,10,48,2,56,28,64,191,255,240,199,35,119,69,1,
-14,6,240,255,201,5,35,23,49,1,181,5,35,22,48,1,
-99,231,65,1,67,7,33,0,194,225,35,22,33,0,2,103,
-0,0,92,103,0,0,61,22,88,255,99,23,41,1,64,94,
-134,0,43,95,221,131,35,230,36,1,224,89,242,5,28,48,
-11,80,63,6,234,56,128,0,106,0,60,23,5,0,63,6,
-6,57,128,0,2,22,24,0,34,87,0,0,34,135,5,0,
-220,81,10,48,112,0,28,48,129,255,160,226,61,22,56,255,
-99,23,41,1,35,23,69,1,2,6,240,255,201,13,2,6,
+24,80,181,5,60,86,4,0,124,7,21,0,10,16,67,7,
+20,0,35,86,20,0,10,119,0,0,66,119,0,0,197,61,
+27,6,240,255,177,37,2,6,240,255,201,13,2,6,240,255,
+201,5,60,23,5,0,181,5,60,22,4,0,2,48,129,255,
+174,237,15,106,124,111,25,0,197,5,60,23,5,0,181,5,
+60,22,4,0,124,7,21,0,67,7,22,0,35,86,22,0,
+10,95,0,0,66,95,0,0,245,21,224,217,218,21,60,87,
+25,0,124,7,21,0,10,6,240,255,201,5,60,23,5,0,
+181,5,60,22,4,0,67,7,19,0,35,86,19,0,10,135,
+0,0,66,135,0,0,224,217,210,37,60,111,25,0,13,6,
+240,255,201,5,60,23,5,0,181,5,60,22,4,0,2,48,
+25,56,27,64,191,255,160,200,60,103,25,0,12,6,240,255,
+201,5,60,23,5,0,181,5,60,22,4,0,124,223,21,0,
+67,7,23,0,194,217,35,22,23,0,2,87,0,0,91,87,
+0,0,37,22,80,128,99,23,37,1,35,214,72,1,61,22,
+56,255,99,23,41,1,15,122,154,135,1,0,67,135,7,0,
+99,127,69,1,197,5,35,23,49,1,181,5,35,22,48,1,
+99,7,65,1,67,7,24,0,35,86,24,0,10,111,0,0,
+66,111,0,0,64,86,134,0,42,87,249,143,58,231,21,0,
+10,16,252,17,169,5,2,224,35,102,44,1,250,97,178,5,
+128,7,198,1,35,95,65,1,10,216,252,89,217,5,35,54,
+44,1,129,255,174,234,35,23,65,1,188,17,251,17,169,5,
+2,216,224,217,186,5,128,7,20,3,35,87,69,1,10,6,
+240,255,201,5,35,103,49,1,181,5,35,102,48,1,28,88,
+204,89,10,6,240,255,201,5,35,87,49,1,181,5,35,86,
+48,1,202,225,27,80,220,81,187,17,146,37,11,128,16,120,
+2,88,202,89,170,121,11,112,170,113,238,121,139,21,2,104,
+208,105,13,134,255,255,11,86,255,255,95,82,10,103,1,0,
+95,130,80,103,1,0,95,18,154,253,149,13,65,82,10,95,
+255,255,65,130,80,95,255,255,95,18,154,253,35,231,65,1,
+187,225,126,226,211,5,35,54,44,1,129,255,0,233,35,135,
+69,1,252,129,137,93,35,215,65,1,156,222,15,0,126,218,
+163,5,28,216,27,54,1,0,129,255,4,236,10,200,224,209,
+130,21,35,127,69,1,15,6,240,255,201,5,35,23,49,1,
+181,5,35,22,48,1,10,48,2,56,26,64,191,255,40,199,
+35,23,69,1,2,6,240,255,201,13,2,6,240,255,201,5,
+35,23,49,1,181,5,35,22,48,1,2,48,129,255,160,235,
+15,114,99,119,69,1,197,5,35,23,49,1,181,5,35,22,
+48,1,99,7,65,1,67,7,27,0,35,86,27,0,10,103,
+0,0,66,103,0,0,27,6,240,255,99,207,49,1,99,223,
+69,1,185,5,25,16,181,5,35,22,48,1,99,215,65,1,
+67,7,26,0,194,209,35,22,26,0,2,135,0,0,90,135,
+0,0,245,21,224,225,218,21,35,127,69,1,99,7,65,1,
+15,6,240,255,201,5,35,23,49,1,181,5,35,22,48,1,
+67,7,25,0,35,86,25,0,10,119,0,0,66,119,0,0,
+224,225,186,5,128,7,166,1,35,95,69,1,11,6,240,255,
+201,5,35,23,49,1,181,5,35,22,48,1,99,231,65,1,
+67,7,28,0,194,225,35,22,28,0,2,135,0,0,92,135,
+0,0,128,7,120,1,126,226,211,5,35,54,44,1,129,255,
+220,231,35,23,69,1,252,17,217,69,156,222,15,0,126,218,
+163,5,28,216,27,54,1,0,129,255,228,234,35,23,69,1,
+10,200,2,6,240,255,201,13,2,6,240,255,201,5,35,23,
+49,1,181,5,35,22,48,1,2,48,129,255,162,234,15,122,
+99,127,69,1,197,5,35,23,49,1,181,5,35,22,48,1,
+99,7,65,1,67,7,31,0,35,86,31,0,10,111,0,0,
+66,111,0,0,27,6,240,255,99,207,49,1,99,223,69,1,
+185,5,25,80,181,5,35,86,48,1,99,7,65,1,10,16,
+67,7,30,0,35,86,30,0,10,87,0,0,66,87,0,0,
+197,61,28,6,240,255,177,37,2,6,240,255,201,13,2,6,
 240,255,201,5,35,23,49,1,181,5,35,22,48,1,2,48,
-129,255,76,227,15,122,99,127,69,1,197,5,35,23,49,1,
-181,5,35,22,48,1,99,7,65,1,67,7,34,0,35,86,
-34,0,10,111,0,0,66,111,0,0,61,22,24,255,99,23,
-41,1,35,23,97,1,2,6,240,255,201,13,2,6,240,255,
-201,5,35,23,77,1,181,5,35,22,76,1,2,48,129,255,
-254,226,15,98,99,103,97,1,197,5,35,23,77,1,181,5,
-35,22,76,1,99,7,93,1,67,7,35,0,35,86,35,0,
-10,87,0,0,66,87,0,0,128,7,38,4,224,17,186,5,
-0,82,213,5,60,87,9,0,162,81,163,82,27,112,202,113,
-238,209,177,5,128,7,132,1,26,80,129,82,45,6,255,255,
-255,31,170,105,250,105,185,5,0,82,165,5,218,81,10,208,
+129,255,44,234,15,130,99,135,69,1,197,5,35,23,49,1,
+181,5,35,22,48,1,99,7,65,1,67,7,32,0,35,86,
+32,0,10,119,0,0,66,119,0,0,245,21,224,225,218,21,
+35,111,69,1,99,7,65,1,13,6,240,255,201,5,35,23,
+49,1,181,5,35,22,48,1,67,7,29,0,35,86,29,0,
+10,103,0,0,66,103,0,0,224,225,130,53,35,135,69,1,
+16,6,240,255,201,5,35,23,49,1,181,5,35,22,48,1,
+58,127,25,0,2,80,15,6,240,255,201,5,58,23,5,0,
+181,5,58,22,4,0,10,48,2,56,28,64,191,255,8,197,
+35,119,69,1,14,6,240,255,201,5,35,23,49,1,181,5,
+35,22,48,1,99,231,65,1,67,7,33,0,194,225,35,22,
+33,0,2,103,0,0,92,103,0,0,61,22,88,255,99,23,
+41,1,64,94,134,0,43,95,61,143,35,230,36,1,224,89,
+242,5,28,48,11,80,63,6,210,59,128,0,106,0,60,23,
+5,0,63,6,238,59,128,0,2,22,24,0,34,87,0,0,
+34,135,5,0,220,81,10,48,112,0,28,48,129,255,92,232,
+61,22,56,255,99,23,41,1,35,23,69,1,2,6,240,255,
+201,13,2,6,240,255,201,5,35,23,49,1,181,5,35,22,
+48,1,2,48,129,255,8,233,15,122,99,127,69,1,197,5,
+35,23,49,1,181,5,35,22,48,1,99,7,65,1,67,7,
+34,0,35,86,34,0,10,111,0,0,66,111,0,0,61,22,
+24,255,99,23,41,1,35,23,97,1,2,6,240,255,201,13,
+2,6,240,255,201,5,35,23,77,1,181,5,35,22,76,1,
+2,48,129,255,186,232,15,98,99,103,97,1,197,5,35,23,
+77,1,181,5,35,22,76,1,99,7,93,1,67,7,35,0,
+35,86,35,0,10,87,0,0,66,87,0,0,128,7,38,4,
 224,17,186,5,0,82,213,5,60,87,9,0,162,81,163,82,
-27,128,202,129,240,209,185,13,224,17,186,5,0,82,213,5,
-60,87,9,0,162,81,163,82,27,208,202,209,28,48,26,56,
-0,66,191,255,18,233,60,23,5,0,35,206,48,0,99,23,
-49,0,99,207,89,0,55,111,1,0,35,198,52,0,99,111,
-53,0,99,199,85,0,57,103,1,0,10,232,99,103,81,0,
-56,95,1,0,99,239,65,0,99,95,77,0,35,22,80,0,
-34,87,1,0,29,64,99,87,69,0,35,94,76,0,43,135,
-1,0,99,95,61,0,99,135,73,0,99,23,57,0,28,72,
-131,23,37,0,67,23,0,0,35,54,68,0,35,62,72,0,
-191,255,198,232,28,48,10,56,27,64,35,78,28,1,128,255,
-72,3,55,127,1,0,99,199,125,0,99,127,53,0,35,94,
-112,0,60,23,9,0,99,95,97,0,99,23,49,0,99,207,
-121,0,56,119,1,0,35,22,116,0,99,119,117,0,99,87,
-101,0,57,111,1,0,10,64,99,111,113,0,28,72,34,103,
-1,0,99,23,93,0,99,103,105,0,35,54,104,0,43,95,
-1,0,163,23,37,0,67,23,0,0,99,95,109,0,35,62,
-108,0,191,255,84,232,60,87,5,0,224,81,186,5,0,18,
-213,5,60,23,9,0,170,17,163,18,194,217,60,23,5,0,
-224,17,242,13,60,87,9,0,99,23,41,0,99,87,45,0,
-165,5,72,18,234,17,234,253,60,55,5,0,129,255,80,225,
-195,210,221,209,124,215,13,0,195,218,221,217,124,223,9,0,
-124,239,5,0,128,7,138,2,60,23,9,0,35,86,128,0,
-99,23,129,0,23,232,42,127,1,0,61,23,1,0,28,72,
-162,121,163,122,251,121,177,5,128,7,56,1,99,23,133,0,
-35,86,132,0,60,23,9,0,27,200,99,23,137,0,195,202,
-42,95,1,0,61,71,1,0,99,87,173,0,99,95,165,0,
-35,22,136,0,35,94,164,0,99,95,141,0,34,87,1,0,
-217,65,99,87,161,0,99,23,169,0,43,135,1,0,35,22,
-160,0,99,135,153,0,99,71,149,0,34,127,1,0,99,23,
-145,0,99,127,157,0,131,23,39,0,67,23,0,0,35,54,
-152,0,35,62,156,0,191,255,112,231,60,215,9,0,35,22,
-188,0,99,215,189,0,99,215,193,0,61,103,1,0,34,111,
-1,0,27,232,172,105,163,106,173,233,229,21,26,16,224,17,
-146,21,224,17,250,5,8,50,129,255,148,224,10,16,224,17,
-146,13,3,87,28,1,66,87,0,0,35,87,33,1,98,87,
-5,0,95,234,72,210,224,233,170,237,60,87,9,0,217,81,
-124,87,9,0,55,135,1,0,35,126,132,0,99,135,133,0,
-99,127,185,0,60,23,9,0,195,218,99,23,137,0,35,94,
-176,0,35,22,136,0,34,103,1,0,99,95,181,0,187,97,
-99,103,177,0,165,21,35,86,28,1,42,95,1,0,98,95,
-1,0,42,87,5,0,98,87,5,0,35,23,185,0,34,87,
-1,0,72,82,98,87,1,0,35,23,185,0,35,119,181,0,
-34,23,1,0,46,119,1,0,238,17,234,229,128,7,50,1,
-60,87,9,0,27,104,99,87,25,1,99,87,201,0,195,106,
-10,16,173,17,99,23,197,0,35,214,196,0,58,95,1,0,
-60,71,9,0,99,215,237,0,99,95,229,0,35,206,200,0,
-57,87,1,0,99,87,225,0,99,207,233,0,35,22,228,0,
-34,135,1,0,35,86,224,0,99,135,217,0,99,87,209,0,
-42,127,1,0,99,71,213,0,99,23,205,0,99,127,221,0,
-163,23,39,0,67,23,0,0,35,54,216,0,35,62,220,0,
-191,255,54,230,124,87,9,0,35,95,25,1,61,119,1,0,
-27,104,99,119,241,0,99,95,245,0,195,106,11,16,173,17,
-99,23,197,0,35,86,240,0,42,135,1,0,99,215,9,1,
-99,135,1,1,99,87,13,1,58,127,1,0,35,230,244,0,
-99,127,253,0,99,231,5,1,60,119,1,0,25,48,99,119,
-249,0,163,23,39,0,67,23,0,0,35,62,0,1,35,70,
-252,0,35,78,248,0,191,255,28,229,61,111,1,0,99,231,
-21,1,99,111,245,0,195,218,61,87,1,0,99,215,17,1,
-202,217,99,223,197,0,165,21,35,86,28,1,42,95,1,0,
-98,95,1,0,42,87,5,0,98,87,5,0,35,23,21,1,
-34,135,1,0,72,130,98,135,1,0,35,23,21,1,35,111,
-17,1,34,23,1,0,45,111,1,0,237,17,234,229,3,30,
-232,0,126,6,255,241,130,7,225,112,9,200,7,216,99,223,
-1,0,27,232,8,208,26,224,229,21,29,16,224,17,146,21,
-224,17,250,5,8,50,129,255,166,222,10,16,224,17,146,13,
-25,87,0,0,66,87,0,0,57,87,5,0,98,87,5,0,
-95,226,72,234,224,225,170,237,26,80,195,82,219,81,66,6,
-255,112,33,6,46,6,0,0,97,0,33,6,48,17,0,0,
-97,0,33,6,194,26,0,0,97,0,33,6,138,27,0,0,
-97,0,33,6,232,35,0,0,97,0,33,6,242,35,0,0,
-97,0,33,6,120,38,0,0,97,0,33,6,80,43,0,0,
-97,0,33,6,228,76,0,0,97,0,33,6,170,98,0,0,
-97,0,33,6,234,193,1,0,97,0,33,6,146,105,0,0,
-97,0,33,6,92,74,1,0,97,0,33,6,234,85,1,0,
-97,0,33,6,202,55,1,0,97,0,33,6,106,93,1,0,
-97,0,33,6,248,54,1,0,97,0,33,6,154,108,1,0,
-97,0,33,6,186,92,1,0,97,0,33,6,244,108,1,0,
-97,0,33,6,238,54,1,0,97,0,33,6,180,5,1,0,
-97,0,33,6,12,107,0,0,97,0,33,6,10,137,1,0,
-97,0,33,6,234,61,1,0,97,0,33,6,12,43,1,0,
-97,0,33,6,164,42,1,0,97,0,33,6,244,147,1,0,
-97,0,128,7,33,0,224,49,210,5,129,58,185,5,129,255,
-110,221,64,6,63,0,128,7,33,0,224,49,210,5,129,58,
-185,5,129,255,90,221,64,6,63,0,128,7,33,0,50,6,
-176,215,255,255,114,7,1,0,38,6,24,72,133,0,129,255,
-252,225,50,6,208,215,255,255,114,7,1,0,38,6,36,72,
-133,0,129,255,232,225,64,6,63,0,128,7,33,0,38,23,
-105,0,63,6,122,63,128,0,2,22,16,0,34,87,0,0,
-34,135,5,0,198,81,10,48,112,0,64,6,63,0,128,7,
-33,0,38,23,105,0,63,6,156,63,128,0,72,18,34,87,
-0,0,34,135,5,0,198,81,10,48,112,0,64,6,63,0,
-128,7,33,0,38,23,105,0,63,6,192,63,128,0,2,22,
-16,0,34,87,0,0,34,135,5,0,198,81,10,48,112,0,
-64,6,63,0,128,7,33,0,38,23,105,0,63,6,228,63,
+27,112,202,113,238,209,177,5,128,7,132,1,26,80,129,82,
+45,6,255,255,255,31,170,105,250,105,185,5,0,82,165,5,
+218,81,10,208,224,17,186,5,0,82,213,5,60,87,9,0,
+162,81,163,82,27,128,202,129,240,209,185,13,224,17,186,5,
+0,82,213,5,60,87,9,0,162,81,163,82,27,208,202,209,
+28,48,26,56,0,66,191,255,234,230,60,23,5,0,35,206,
+48,0,99,23,49,0,99,207,89,0,55,111,1,0,35,198,
+52,0,99,111,53,0,99,199,85,0,57,103,1,0,10,232,
+99,103,81,0,56,95,1,0,99,239,65,0,99,95,77,0,
+35,22,80,0,34,87,1,0,29,64,99,87,69,0,35,94,
+76,0,43,135,1,0,99,95,61,0,99,135,73,0,99,23,
+57,0,28,72,131,23,37,0,67,23,0,0,35,54,68,0,
+35,62,72,0,191,255,158,230,28,48,10,56,27,64,35,78,
+28,1,128,255,72,3,55,127,1,0,99,199,125,0,99,127,
+53,0,35,94,112,0,60,23,9,0,99,95,97,0,99,23,
+49,0,99,207,121,0,56,119,1,0,35,22,116,0,99,119,
+117,0,99,87,101,0,57,111,1,0,10,64,99,111,113,0,
+28,72,34,103,1,0,99,23,93,0,99,103,105,0,35,54,
+104,0,43,95,1,0,163,23,37,0,67,23,0,0,99,95,
+109,0,35,62,108,0,191,255,44,230,60,87,5,0,224,81,
+186,5,0,18,213,5,60,23,9,0,170,17,163,18,194,217,
+60,23,5,0,224,17,242,13,60,87,9,0,99,23,41,0,
+99,87,45,0,165,5,72,18,234,17,234,253,60,55,5,0,
+129,255,12,231,195,210,221,209,124,215,13,0,195,218,221,217,
+124,223,9,0,124,239,5,0,128,7,138,2,60,23,9,0,
+35,86,128,0,99,23,129,0,23,232,42,127,1,0,61,23,
+1,0,28,72,162,121,163,122,251,121,177,5,128,7,56,1,
+99,23,133,0,35,86,132,0,60,23,9,0,27,200,99,23,
+137,0,195,202,42,95,1,0,61,71,1,0,99,87,173,0,
+99,95,165,0,35,22,136,0,35,94,164,0,99,95,141,0,
+34,87,1,0,217,65,99,87,161,0,99,23,169,0,43,135,
+1,0,35,22,160,0,99,135,153,0,99,71,149,0,34,127,
+1,0,99,23,145,0,99,127,157,0,131,23,39,0,67,23,
+0,0,35,54,152,0,35,62,156,0,191,255,72,229,60,215,
+9,0,35,22,188,0,99,215,189,0,99,215,193,0,61,103,
+1,0,34,111,1,0,27,232,172,105,163,106,173,233,229,21,
+26,16,224,17,146,21,224,17,250,5,8,50,129,255,80,230,
+10,16,224,17,146,13,3,87,28,1,66,87,0,0,35,87,
+33,1,98,87,5,0,95,234,72,210,224,233,170,237,60,87,
+9,0,217,81,124,87,9,0,55,135,1,0,35,126,132,0,
+99,135,133,0,99,127,185,0,60,23,9,0,195,218,99,23,
+137,0,35,94,176,0,35,22,136,0,34,103,1,0,99,95,
+181,0,187,97,99,103,177,0,165,21,35,86,28,1,42,95,
+1,0,98,95,1,0,42,87,5,0,98,87,5,0,35,23,
+185,0,34,87,1,0,72,82,98,87,1,0,35,23,185,0,
+35,119,181,0,34,23,1,0,46,119,1,0,238,17,234,229,
+128,7,50,1,60,87,9,0,27,104,99,87,25,1,99,87,
+201,0,195,106,10,16,173,17,99,23,197,0,35,214,196,0,
+58,95,1,0,60,71,9,0,99,215,237,0,99,95,229,0,
+35,206,200,0,57,87,1,0,99,87,225,0,99,207,233,0,
+35,22,228,0,34,135,1,0,35,86,224,0,99,135,217,0,
+99,87,209,0,42,127,1,0,99,71,213,0,99,23,205,0,
+99,127,221,0,163,23,39,0,67,23,0,0,35,54,216,0,
+35,62,220,0,191,255,14,228,124,87,9,0,35,95,25,1,
+61,119,1,0,27,104,99,119,241,0,99,95,245,0,195,106,
+11,16,173,17,99,23,197,0,35,86,240,0,42,135,1,0,
+99,215,9,1,99,135,1,1,99,87,13,1,58,127,1,0,
+35,230,244,0,99,127,253,0,99,231,5,1,60,119,1,0,
+25,48,99,119,249,0,163,23,39,0,67,23,0,0,35,62,
+0,1,35,70,252,0,35,78,248,0,191,255,244,226,61,111,
+1,0,99,231,21,1,99,111,245,0,195,218,61,87,1,0,
+99,215,17,1,202,217,99,223,197,0,165,21,35,86,28,1,
+42,95,1,0,98,95,1,0,42,87,5,0,98,87,5,0,
+35,23,21,1,34,135,1,0,72,130,98,135,1,0,35,23,
+21,1,35,111,17,1,34,23,1,0,45,111,1,0,237,17,
+234,229,3,30,232,0,126,6,255,241,130,7,225,112,9,200,
+7,216,99,223,1,0,27,232,8,208,26,224,229,21,29,16,
+224,17,146,21,224,17,250,5,8,50,129,255,98,228,10,16,
+224,17,146,13,25,87,0,0,66,87,0,0,57,87,5,0,
+98,87,5,0,95,226,72,234,224,225,170,237,26,80,195,82,
+219,81,66,6,255,112,33,6,46,6,0,0,97,0,33,6,
+48,17,0,0,97,0,33,6,194,26,0,0,97,0,33,6,
+138,27,0,0,97,0,33,6,232,35,0,0,97,0,33,6,
+242,35,0,0,97,0,33,6,120,38,0,0,97,0,33,6,
+80,43,0,0,97,0,33,6,236,76,0,0,97,0,33,6,
+82,99,0,0,97,0,33,6,56,196,1,0,97,0,33,6,
+58,106,0,0,97,0,33,6,48,76,1,0,97,0,33,6,
+190,87,1,0,97,0,33,6,158,57,1,0,97,0,33,6,
+22,95,1,0,97,0,33,6,204,56,1,0,97,0,33,6,
+196,110,1,0,97,0,33,6,102,94,1,0,97,0,33,6,
+30,111,1,0,97,0,33,6,194,56,1,0,97,0,33,6,
+214,6,1,0,97,0,33,6,180,107,0,0,97,0,33,6,
+52,139,1,0,97,0,33,6,190,63,1,0,97,0,33,6,
+224,44,1,0,97,0,33,6,120,44,1,0,97,0,33,6,
+30,150,1,0,97,0,128,7,33,0,224,49,210,5,129,58,
+185,5,129,255,42,227,64,6,63,0,128,7,33,0,224,49,
+210,5,129,58,185,5,129,255,22,227,64,6,63,0,128,7,
+33,0,50,6,176,215,255,255,114,7,1,0,38,6,160,83,
+133,0,129,255,184,231,50,6,208,215,255,255,114,7,1,0,
+38,6,172,83,133,0,129,255,164,231,64,6,63,0,128,7,
+33,0,38,23,105,0,63,6,98,66,128,0,2,22,16,0,
+34,87,0,0,34,135,5,0,198,81,10,48,112,0,64,6,
+63,0,128,7,33,0,38,23,105,0,63,6,132,66,128,0,
+72,18,34,87,0,0,34,135,5,0,198,81,10,48,112,0,
+64,6,63,0,128,7,33,0,38,23,105,0,63,6,168,66,
 128,0,2,22,16,0,34,87,0,0,34,135,5,0,198,81,
-10,48,112,0,64,6,63,0,1,82,127,0,0,82,127,0,
-32,86,34,1,127,0,0,82,127,0,128,7,225,0,6,232,
-7,224,224,233,226,13,49,6,96,75,133,0,125,143,105,0,
-0,58,128,255,36,3,129,226,201,5,29,48,129,255,96,220,
-64,6,255,0,0,82,127,0,128,7,225,0,6,232,7,224,
-224,233,226,13,48,6,96,75,133,0,125,135,105,0,0,58,
-128,255,246,2,129,226,201,5,29,48,129,255,50,220,64,6,
-255,0,128,7,225,0,6,232,7,224,224,233,226,13,48,6,
-96,75,133,0,125,135,105,0,0,58,128,255,204,2,129,226,
-201,5,29,48,129,255,8,220,64,6,255,0,1,82,127,0,
-128,7,225,0,6,232,29,231,7,0,28,6,225,255,250,29,
-29,135,0,0,224,129,154,21,61,23,105,0,63,6,180,64,
-128,0,2,22,80,0,34,87,0,0,34,127,5,0,221,81,
-10,48,111,0,224,81,178,13,61,119,117,0,139,114,203,114,
-125,119,121,0,14,118,0,248,125,119,117,0,29,48,128,255,
-96,2,10,16,28,6,225,255,186,5,221,7,2,0,221,199,
-2,0,242,5,61,127,117,0,15,126,0,8,125,127,121,0,
-2,80,64,6,255,0,128,7,97,0,6,232,29,143,7,0,
-123,138,234,5,38,6,172,137,132,0,129,255,82,225,29,63,
-1,0,61,71,108,0,38,6,184,137,132,0,129,255,64,225,
-61,63,117,0,61,71,113,0,38,6,148,137,132,0,129,255,
-46,225,64,6,127,0,130,7,97,0,6,232,3,48,128,255,
-232,1,195,199,0,0,178,5,195,63,0,0,35,127,0,0,
-125,127,0,0,35,119,2,0,125,119,2,0,29,80,66,6,
-127,0,128,7,97,0,6,232,29,143,7,0,123,138,234,5,
-38,6,200,137,132,0,129,255,230,224,29,63,1,0,61,71,
-108,0,38,6,212,137,132,0,129,255,212,224,61,63,117,0,
-61,71,113,0,38,6,228,137,132,0,129,255,194,224,29,48,
-128,255,126,1,228,87,76,2,10,104,191,106,150,106,10,56,
-205,57,170,58,38,6,252,137,132,0,129,255,162,224,64,6,
-127,0,128,7,97,0,6,232,29,143,7,0,123,138,234,5,
-38,6,12,138,132,0,129,255,134,224,29,63,1,0,61,71,
-108,0,38,6,24,138,132,0,129,255,116,224,61,63,117,0,
-61,71,113,0,38,6,40,138,132,0,129,255,98,224,29,48,
-128,255,30,1,228,87,76,2,10,104,191,106,150,106,10,56,
-205,57,170,58,38,6,64,138,132,0,129,255,66,224,64,6,
-127,0,128,7,33,0,38,23,105,0,63,6,66,66,128,0,
-2,22,16,0,34,87,0,0,34,135,5,0,198,81,10,48,
-112,0,64,6,63,0,128,7,33,0,38,23,105,0,63,6,
-100,66,128,0,72,18,34,87,0,0,34,135,5,0,198,81,
 10,48,112,0,64,6,63,0,128,7,33,0,38,23,105,0,
-63,6,136,66,128,0,2,22,16,0,34,87,0,0,34,135,
+63,6,204,66,128,0,2,22,16,0,34,87,0,0,34,135,
 5,0,198,81,10,48,112,0,64,6,63,0,1,82,127,0,
-0,82,127,0,32,86,34,1,127,0,0,82,127,0,0,82,
-127,0,0,82,127,0,0,82,127,0,198,143,2,0,0,82,
-127,0,103,7,1,0,198,207,2,0,226,87,0,0,127,0,
-1,82,127,0,32,86,34,1,127,0,32,86,34,1,127,0,
-0,82,127,0,32,86,34,1,127,0,32,86,35,1,127,0,
-32,86,35,1,127,0,31,82,127,0,127,0,128,7,33,0,
-38,23,105,0,63,6,12,67,128,0,2,22,200,0,34,87,
+0,82,127,0,32,86,34,1,127,0,0,82,127,0,128,7,
+225,0,6,232,7,224,224,233,226,13,49,6,232,86,133,0,
+125,143,105,0,0,58,128,255,36,3,129,226,201,5,29,48,
+129,255,28,226,64,6,255,0,0,82,127,0,128,7,225,0,
+6,232,7,224,224,233,226,13,48,6,232,86,133,0,125,135,
+105,0,0,58,128,255,246,2,129,226,201,5,29,48,129,255,
+238,225,64,6,255,0,128,7,225,0,6,232,7,224,224,233,
+226,13,48,6,232,86,133,0,125,135,105,0,0,58,128,255,
+204,2,129,226,201,5,29,48,129,255,196,225,64,6,255,0,
+1,82,127,0,128,7,225,0,6,232,29,231,7,0,28,6,
+225,255,250,29,29,135,0,0,224,129,154,21,61,23,105,0,
+63,6,156,67,128,0,2,22,80,0,34,87,0,0,34,127,
+5,0,221,81,10,48,111,0,224,81,178,13,61,119,117,0,
+139,114,203,114,125,119,121,0,14,118,0,248,125,119,117,0,
+29,48,128,255,96,2,10,16,28,6,225,255,186,5,221,7,
+2,0,221,199,2,0,242,5,61,127,117,0,15,126,0,8,
+125,127,121,0,2,80,64,6,255,0,128,7,97,0,6,232,
+29,143,7,0,123,138,234,5,38,6,140,148,132,0,129,255,
+14,231,29,63,1,0,61,71,108,0,38,6,152,148,132,0,
+129,255,252,230,61,63,117,0,61,71,113,0,38,6,116,148,
+132,0,129,255,234,230,64,6,127,0,130,7,97,0,6,232,
+3,48,128,255,232,1,195,199,0,0,178,5,195,63,0,0,
+35,127,0,0,125,127,0,0,35,119,2,0,125,119,2,0,
+29,80,66,6,127,0,128,7,97,0,6,232,29,143,7,0,
+123,138,234,5,38,6,168,148,132,0,129,255,162,230,29,63,
+1,0,61,71,108,0,38,6,180,148,132,0,129,255,144,230,
+61,63,117,0,61,71,113,0,38,6,196,148,132,0,129,255,
+126,230,29,48,128,255,126,1,228,87,76,2,10,104,191,106,
+150,106,10,56,205,57,170,58,38,6,220,148,132,0,129,255,
+94,230,64,6,127,0,128,7,97,0,6,232,29,143,7,0,
+123,138,234,5,38,6,236,148,132,0,129,255,66,230,29,63,
+1,0,61,71,108,0,38,6,248,148,132,0,129,255,48,230,
+61,63,117,0,61,71,113,0,38,6,8,149,132,0,129,255,
+30,230,29,48,128,255,30,1,228,87,76,2,10,104,191,106,
+150,106,10,56,205,57,170,58,38,6,32,149,132,0,129,255,
+254,229,64,6,127,0,128,7,33,0,38,23,105,0,63,6,
+42,69,128,0,2,22,16,0,34,87,0,0,34,135,5,0,
+198,81,10,48,112,0,64,6,63,0,128,7,33,0,38,23,
+105,0,63,6,76,69,128,0,72,18,34,87,0,0,34,135,
+5,0,198,81,10,48,112,0,64,6,63,0,128,7,33,0,
+38,23,105,0,63,6,112,69,128,0,2,22,16,0,34,87,
 0,0,34,135,5,0,198,81,10,48,112,0,64,6,63,0,
-32,86,255,127,127,0,32,86,255,127,127,0,127,0,33,6,
-114,131,0,0,97,0,33,6,154,134,0,0,97,0,33,6,
-158,137,0,0,97,0,33,6,244,142,0,0,97,0,128,7,
-33,0,0,66,128,255,22,0,64,6,63,0,128,7,33,0,
-1,66,128,255,8,0,64,6,63,0,152,7,225,243,6,232,
-99,71,5,0,7,208,58,207,13,0,58,199,9,0,249,1,
-130,29,61,231,14,0,24,48,28,72,28,64,191,74,25,56,
-130,255,222,15,28,64,28,72,191,74,10,176,22,48,11,184,
-23,56,130,255,52,13,99,87,9,0,99,95,13,0,229,13,
-0,186,61,23,14,0,24,176,226,183,194,2,22,96,226,103,
-34,2,99,103,9,0,99,7,13,0,35,71,9,0,58,223,
-1,0,58,231,18,0,168,193,28,112,61,103,14,0,216,113,
-236,113,179,13,191,255,80,201,43,6,148,204,1,0,106,95,
-5,0,106,223,9,0,10,216,58,207,5,0,58,87,16,0,
-58,135,25,0,99,87,36,0,99,135,45,0,35,111,13,0,
-35,103,9,0,24,112,204,113,225,135,0,0,205,129,99,207,
-25,0,99,119,29,0,99,135,33,0,250,127,23,0,99,127,
-42,0,0,210,61,119,14,0,195,151,42,0,184,113,252,113,
-252,119,60,99,99,103,38,0,229,87,64,0,224,7,96,1,
-61,151,89,0,61,159,93,0,10,248,99,151,9,0,99,159,
-13,0,255,47,32,0,35,143,13,0,241,185,171,13,209,5,
-35,143,9,0,241,177,217,5,99,223,21,0,1,18,181,29,
-22,64,61,55,81,0,23,72,99,7,1,0,128,255,70,12,
-10,192,191,255,162,200,106,223,9,0,43,6,126,66,1,0,
-106,199,33,0,1,130,106,95,5,0,99,87,21,0,106,135,
-0,0,0,18,35,151,5,0,224,145,218,29,61,94,16,0,
-61,118,16,0,2,80,194,82,10,104,205,113,46,23,1,0,
-203,81,34,23,105,0,42,55,1,0,72,18,34,103,0,0,
-35,62,20,0,204,49,34,95,5,0,63,6,226,68,128,0,
-107,0,229,29,61,134,16,0,2,80,194,82,10,120,207,129,
-48,23,1,0,61,94,16,0,34,23,105,0,203,81,2,22,
-16,0,34,95,0,0,42,55,1,0,11,96,204,49,35,62,
-20,0,34,111,5,0,63,6,30,69,128,0,109,0,35,23,
-38,0,65,210,162,225,252,0,224,225,242,45,35,111,33,0,
-35,103,29,0,2,80,10,112,191,18,204,113,225,135,0,0,
-208,17,205,17,99,23,33,0,99,119,29,0,57,23,17,0,
-35,95,36,0,137,18,171,17,245,5,25,206,20,0,57,23,
-17,0,0,90,137,18,162,81,156,253,203,17,194,81,99,87,
-36,0,61,87,14,0,99,207,25,0,252,81,252,87,60,131,
-99,135,38,0,191,7,180,254,97,210,231,21,229,87,64,0,
-224,7,96,1,59,255,0,0,10,232,218,249,123,255,0,0,
-253,47,32,0,224,249,138,13,27,48,59,127,5,0,63,6,
-182,69,128,0,111,0,88,6,255,243,128,7,97,0,6,232,
-61,143,17,0,63,6,226,69,128,0,49,23,105,0,17,88,
-2,22,88,0,34,87,0,0,34,135,5,0,203,81,10,48,
-112,0,10,16,224,17,186,21,61,127,21,0,63,6,10,70,
-128,0,47,23,105,0,15,88,2,22,88,0,34,87,0,0,
-34,119,5,0,203,81,10,48,110,0,10,16,2,80,64,6,
-127,0,130,7,225,16,6,224,60,143,17,0,7,216,49,23,
-105,0,17,88,2,22,64,1,34,87,0,0,3,56,203,81,
-10,48,34,135,5,0,63,6,62,70,128,0,112,0,35,127,
-1,0,10,232,97,122,250,21,60,119,21,0,3,56,46,23,
-105,0,14,88,2,22,64,1,34,87,0,0,34,111,5,0,
-203,81,10,48,63,6,108,70,128,0,109,0,10,16,97,234,
-170,5,2,232,35,103,1,0,123,103,1,0,29,80,66,6,
-255,16,128,7,97,0,6,232,61,63,14,0,38,6,64,145,
-132,0,7,128,191,130,159,130,208,57,161,58,129,255,192,219,
-29,48,128,255,0,10,64,6,127,0,128,7,33,0,6,143,
-7,0,127,138,186,21,38,135,21,0,63,6,216,70,128,0,
-48,23,105,0,16,88,2,22,176,0,34,87,0,0,34,127,
-5,0,203,81,10,48,111,0,181,5,128,255,208,9,64,6,
-63,0,128,7,33,0,6,143,7,0,127,138,186,21,38,135,
-21,0,63,6,16,71,128,0,48,23,105,0,16,88,2,22,
-184,0,34,87,0,0,34,127,5,0,203,81,10,48,111,0,
-181,5,128,255,136,9,64,6,63,0,134,7,225,240,7,224,
-60,95,13,0,60,87,9,0,6,232,99,87,5,0,99,95,
-9,0,8,200,61,135,21,0,25,56,48,23,105,0,16,88,
-2,22,240,0,34,87,0,0,35,70,4,0,203,81,10,48,
-9,192,3,72,34,127,5,0,63,6,96,71,128,0,111,0,
-224,81,202,5,32,86,34,1,229,53,35,223,9,0,35,215,
+1,82,127,0,0,82,127,0,32,86,34,1,127,0,0,82,
+127,0,0,82,127,0,0,82,127,0,0,82,127,0,198,143,
+2,0,0,82,127,0,103,7,1,0,198,207,2,0,226,87,
+0,0,127,0,1,82,127,0,32,86,34,1,127,0,32,86,
+34,1,127,0,0,82,127,0,32,86,34,1,127,0,32,86,
+35,1,127,0,32,86,35,1,127,0,31,82,127,0,127,0,
+128,7,33,0,38,23,105,0,63,6,244,69,128,0,2,22,
+200,0,34,87,0,0,34,135,5,0,198,81,10,48,112,0,
+64,6,63,0,32,86,255,127,127,0,32,86,255,127,127,0,
+127,0,33,6,26,132,0,0,97,0,33,6,58,135,0,0,
+97,0,33,6,62,138,0,0,97,0,33,6,152,143,0,0,
+97,0,128,7,33,0,0,66,128,255,22,0,64,6,63,0,
+128,7,33,0,1,66,128,255,8,0,64,6,63,0,152,7,
+225,243,6,232,99,71,5,0,7,208,58,207,13,0,58,199,
+9,0,249,1,130,29,61,231,14,0,24,48,28,72,28,64,
+191,74,25,56,130,255,154,21,28,64,28,72,191,74,10,176,
+22,48,11,184,23,56,130,255,240,18,99,87,9,0,99,95,
+13,0,229,13,0,186,61,23,14,0,24,176,226,183,194,2,
+22,96,226,103,34,2,99,103,9,0,99,7,13,0,35,71,
+9,0,58,223,1,0,58,231,18,0,168,193,28,112,61,103,
+14,0,216,113,236,113,179,13,191,255,104,198,43,6,228,206,
+1,0,106,95,5,0,106,223,9,0,10,216,58,207,5,0,
+58,87,16,0,58,135,25,0,99,87,36,0,99,135,45,0,
+35,111,13,0,35,103,9,0,24,112,204,113,225,135,0,0,
+205,129,99,207,25,0,99,119,29,0,99,135,33,0,250,127,
+23,0,99,127,42,0,0,210,61,119,14,0,195,151,42,0,
+184,113,252,113,252,119,60,99,99,103,38,0,229,87,64,0,
+224,7,96,1,61,151,89,0,61,159,93,0,10,248,99,151,
+9,0,99,159,13,0,255,47,32,0,35,143,13,0,241,185,
+171,13,209,5,35,143,9,0,241,177,217,5,99,223,21,0,
+1,18,181,29,22,64,61,55,81,0,23,72,99,7,1,0,
+128,255,70,12,10,192,191,255,186,197,106,223,9,0,43,6,
+82,68,1,0,106,199,33,0,1,130,106,95,5,0,99,87,
+21,0,106,135,0,0,0,18,35,151,5,0,224,145,218,29,
+61,94,16,0,61,118,16,0,2,80,194,82,10,104,205,113,
+46,23,1,0,203,81,34,23,105,0,42,55,1,0,72,18,
+34,103,0,0,35,62,20,0,204,49,34,95,5,0,63,6,
+202,71,128,0,107,0,229,29,61,134,16,0,2,80,194,82,
+10,120,207,129,48,23,1,0,61,94,16,0,34,23,105,0,
+203,81,2,22,16,0,34,95,0,0,42,55,1,0,11,96,
+204,49,35,62,20,0,34,111,5,0,63,6,6,72,128,0,
+109,0,35,23,38,0,65,210,162,225,252,0,224,225,242,45,
+35,111,33,0,35,103,29,0,2,80,10,112,191,18,204,113,
+225,135,0,0,208,17,205,17,99,23,33,0,99,119,29,0,
+57,23,17,0,35,95,36,0,137,18,171,17,245,5,25,206,
+20,0,57,23,17,0,0,90,137,18,162,81,156,253,203,17,
+194,81,99,87,36,0,61,87,14,0,99,207,25,0,252,81,
+252,87,60,131,99,135,38,0,191,7,180,254,97,210,231,21,
+229,87,64,0,224,7,96,1,59,255,0,0,10,232,218,249,
+123,255,0,0,253,47,32,0,224,249,138,13,27,48,59,127,
+5,0,63,6,158,72,128,0,111,0,88,6,255,243,128,7,
+97,0,6,232,61,143,17,0,63,6,202,72,128,0,49,23,
+105,0,17,88,2,22,88,0,34,87,0,0,34,135,5,0,
+203,81,10,48,112,0,10,16,224,17,186,21,61,127,21,0,
+63,6,242,72,128,0,47,23,105,0,15,88,2,22,88,0,
+34,87,0,0,34,119,5,0,203,81,10,48,110,0,10,16,
+2,80,64,6,127,0,130,7,225,16,6,224,60,143,17,0,
+7,216,49,23,105,0,17,88,2,22,64,1,34,87,0,0,
+3,56,203,81,10,48,34,135,5,0,63,6,38,73,128,0,
+112,0,35,127,1,0,10,232,97,122,250,21,60,119,21,0,
+3,56,46,23,105,0,14,88,2,22,64,1,34,87,0,0,
+34,111,5,0,203,81,10,48,63,6,84,73,128,0,109,0,
+10,16,97,234,170,5,2,232,35,103,1,0,123,103,1,0,
+29,80,66,6,255,16,128,7,97,0,6,232,61,63,14,0,
+38,6,32,156,132,0,7,128,191,130,159,130,208,57,161,58,
+129,255,124,225,29,48,128,255,0,10,64,6,127,0,128,7,
+33,0,6,143,7,0,127,138,186,21,38,135,21,0,63,6,
+192,73,128,0,48,23,105,0,16,88,2,22,176,0,34,87,
+0,0,34,127,5,0,203,81,10,48,111,0,181,5,128,255,
+208,9,64,6,63,0,128,7,33,0,6,143,7,0,127,138,
+186,21,38,135,21,0,63,6,248,73,128,0,48,23,105,0,
+16,88,2,22,184,0,34,87,0,0,34,127,5,0,203,81,
+10,48,111,0,181,5,128,255,136,9,64,6,63,0,134,7,
+225,240,7,224,60,95,13,0,60,87,9,0,6,232,99,87,
+5,0,99,95,9,0,8,200,61,135,21,0,25,56,48,23,
+105,0,16,88,2,22,240,0,34,87,0,0,35,70,4,0,
+203,81,10,48,9,192,3,72,34,127,5,0,63,6,72,74,
+128,0,111,0,224,81,202,5,32,86,34,1,229,53,35,223,
+9,0,35,215,5,0,61,63,93,0,61,71,14,0,61,55,
+89,0,8,72,191,74,130,255,0,15,235,217,225,103,0,0,
+235,217,226,111,0,0,234,209,225,87,0,0,77,81,12,81,
+194,82,61,110,16,0,202,105,45,23,1,0,61,94,16,0,
+34,23,105,0,203,81,2,22,248,0,34,95,0,0,42,55,
+1,0,11,96,204,49,28,56,25,64,24,72,34,87,5,0,
+63,6,188,74,128,0,106,0,70,6,255,240,134,7,225,112,
+7,224,60,95,13,0,60,87,9,0,6,232,99,87,5,0,
+99,95,9,0,8,200,61,135,21,0,25,56,48,23,105,0,
+16,88,2,22,240,0,34,87,0,0,35,70,4,0,203,81,
+10,48,3,72,34,127,5,0,63,6,4,75,128,0,111,0,
+224,81,202,5,32,86,34,1,213,53,35,223,9,0,35,215,
 5,0,61,63,93,0,61,71,14,0,61,55,89,0,8,72,
-191,74,130,255,68,9,235,217,225,103,0,0,235,217,226,111,
+191,74,130,255,68,14,235,217,225,103,0,0,235,217,226,111,
 0,0,234,209,225,87,0,0,77,81,12,81,194,82,61,110,
 16,0,202,105,45,23,1,0,61,94,16,0,34,23,105,0,
-203,81,2,22,248,0,34,95,0,0,42,55,1,0,11,96,
-204,49,28,56,25,64,24,72,34,87,5,0,63,6,212,71,
-128,0,106,0,70,6,255,240,134,7,225,112,7,224,60,95,
-13,0,60,87,9,0,6,232,99,87,5,0,99,95,9,0,
-8,200,61,135,21,0,25,56,48,23,105,0,16,88,2,22,
-240,0,34,87,0,0,35,70,4,0,203,81,10,48,3,72,
-34,127,5,0,63,6,28,72,128,0,111,0,224,81,202,5,
-32,86,34,1,213,53,35,223,9,0,35,215,5,0,61,63,
-93,0,61,71,14,0,61,55,89,0,8,72,191,74,130,255,
-136,8,235,217,225,103,0,0,235,217,226,111,0,0,234,209,
-225,87,0,0,77,81,12,81,194,82,61,110,16,0,202,105,
-45,23,1,0,61,94,16,0,34,23,105,0,203,81,2,22,
-0,1,34,95,0,0,42,55,1,0,11,96,204,49,28,56,
-25,64,34,87,5,0,63,6,142,72,128,0,106,0,70,6,
-255,112,130,7,225,112,7,232,61,215,9,0,61,223,13,0,
-6,224,26,48,8,200,60,71,14,0,27,56,8,72,191,74,
-130,255,22,8,125,95,13,0,125,87,9,0,26,64,60,55,
-81,0,27,72,99,207,1,0,128,255,250,7,60,135,17,0,
-29,56,48,23,105,0,10,200,72,18,34,87,0,0,16,88,
-203,81,10,48,34,127,5,0,63,6,240,72,128,0,111,0,
-125,215,9,0,125,223,13,0,25,80,66,6,255,112,128,7,
-225,48,7,232,61,215,9,0,61,223,13,0,6,224,26,48,
-60,71,14,0,27,56,8,72,191,74,130,255,172,7,125,87,
-9,0,125,95,13,0,29,56,60,135,21,0,63,6,74,73,
-128,0,48,23,105,0,16,88,2,22,16,0,34,87,0,0,
-34,127,5,0,203,81,10,48,111,0,125,215,9,0,125,223,
-13,0,0,82,64,6,255,48,136,7,225,243,8,176,7,232,
-61,23,18,0,61,215,9,0,2,200,99,79,13,0,6,224,
-60,95,101,0,61,223,13,0,60,87,97,0,235,217,225,5,
-187,5,234,209,177,5,0,82,165,125,60,127,8,0,239,17,
-182,5,0,82,197,117,60,119,17,0,22,64,46,23,105,0,
-14,88,2,22,136,0,34,87,0,0,35,54,4,0,203,81,
-10,56,34,111,5,0,63,6,190,73,128,0,109,0,195,199,
-4,0,186,5,0,82,181,93,35,151,13,0,60,55,81,0,
-26,64,99,151,1,0,27,72,128,255,234,6,60,199,17,0,
-99,87,9,0,56,199,14,0,25,184,248,191,192,2,25,88,
-248,95,192,98,125,103,18,0,26,48,60,71,14,0,27,56,
-8,72,191,74,130,255,194,6,10,48,11,56,24,64,24,72,
-191,74,130,255,76,9,11,104,10,96,23,120,191,122,23,112,
-204,113,225,135,0,0,125,119,9,0,208,121,205,121,125,127,
-13,0,12,82,60,135,17,0,125,87,25,0,48,23,105,0,
-29,56,2,22,32,1,34,87,0,0,16,88,203,81,10,48,
-22,64,35,79,13,0,34,127,5,0,63,6,98,74,128,0,
-111,0,10,48,224,49,178,5,128,255,114,6,125,223,13,0,
-125,215,9,0,125,207,18,0,35,87,9,0,72,6,255,243,
-130,7,225,243,8,176,7,232,61,23,18,0,61,215,9,0,
-2,200,6,224,60,95,101,0,61,223,13,0,60,87,97,0,
-235,217,241,5,187,5,234,209,193,5,32,86,34,1,229,101,
-60,127,8,0,239,17,198,5,32,86,34,1,245,93,60,119,
-17,0,22,64,46,23,105,0,14,88,2,22,136,0,34,87,
-0,0,3,48,203,81,10,56,34,111,5,0,63,6,228,74,
-128,0,109,0,195,199,0,0,202,5,32,86,34,1,229,69,
-60,199,17,0,25,184,56,199,14,0,25,88,248,191,192,2,
-248,95,192,98,125,103,18,0,26,48,60,71,14,0,27,56,
-8,72,191,74,130,255,178,5,10,48,11,56,24,64,24,72,
-191,74,130,255,60,8,23,120,191,122,23,112,10,96,204,113,
-125,119,9,0,11,104,225,135,0,0,208,121,205,121,125,127,
-13,0,12,82,60,135,17,0,125,87,25,0,48,23,105,0,
-16,88,2,22,40,1,34,87,0,0,29,56,203,81,10,48,
-22,64,34,127,5,0,63,6,110,75,128,0,111,0,125,215,
-9,0,125,223,13,0,125,207,18,0,66,6,255,243,134,7,
-225,243,6,232,7,224,28,23,0,0,99,79,9,0,98,18,
-162,13,2,56,38,6,84,145,132,0,129,255,194,214,0,82,
-128,7,62,1,60,95,13,0,60,103,9,0,0,112,204,113,
-225,135,0,0,208,89,125,95,93,0,125,119,89,0,2,82,
-28,119,1,0,35,151,9,0,93,71,0,0,93,119,6,0,
-125,87,4,0,28,111,5,0,0,194,93,111,7,0,93,151,
-1,0,0,210,28,95,19,0,1,186,93,95,2,0,165,69,
-26,200,194,202,61,182,16,0,217,177,23,216,244,223,64,2,
-220,217,187,55,1,0,128,255,172,4,118,87,1,0,61,94,
-16,0,217,89,43,135,1,0,224,129,178,45,61,118,16,0,
-25,104,205,113,46,95,1,0,29,103,0,0,43,23,105,0,
-27,56,2,22,112,0,34,87,0,0,65,98,203,81,10,48,
-35,79,9,0,35,127,49,0,12,64,47,127,1,0,35,134,
-4,0,99,135,1,0,99,127,5,0,218,73,34,127,5,0,
-63,6,104,76,128,0,111,0,10,192,216,185,224,193,226,5,
-65,210,61,119,4,0,238,209,198,189,61,111,21,0,125,7,
-10,0,61,95,17,0,45,111,14,0,43,23,105,0,13,96,
-125,7,12,0,125,103,14,0,125,111,8,0,2,22,24,0,
-34,55,0,0,34,87,5,0,203,49,63,6,178,76,128,0,
-106,0,10,48,61,71,14,0,11,56,8,72,191,74,130,255,
-160,6,125,87,97,0,125,95,101,0,235,1,138,13,234,1,
-234,5,1,82,125,87,97,0,125,7,101,0,24,80,70,6,
-255,243,128,7,97,48,6,232,8,208,9,216,128,255,206,3,
-61,135,21,0,26,64,48,23,105,0,16,88,2,22,232,0,
-34,87,0,0,27,72,203,81,10,48,34,127,5,0,63,6,
-22,77,128,0,111,0,64,6,127,48,128,7,225,112,6,232,
-7,224,188,0,8,208,9,200,0,218,28,6,17,0,202,45,
-61,127,17,0,28,112,47,23,105,0,15,88,2,22,152,0,
-34,87,0,0,14,56,203,81,10,48,34,111,5,0,63,6,
-86,77,128,0,109,0,10,216,224,217,202,53,61,95,21,0,
-28,80,43,23,105,0,10,56,2,22,152,0,34,55,0,0,
-26,64,203,49,25,72,34,135,5,0,63,6,130,77,128,0,
-112,0,10,216,245,29,127,226,218,29,29,119,7,0,14,6,
-81,0,138,29,61,87,89,0,61,111,101,0,61,95,93,0,
-61,103,97,0,237,89,225,13,187,5,236,81,177,13,61,55,
-85,0,93,231,7,0,224,49,210,5,129,255,232,61,125,7,
-85,0,27,80,64,6,255,112,128,7,225,0,6,232,61,135,
-17,0,63,6,240,77,128,0,48,23,105,0,16,88,2,22,
-96,1,34,87,0,0,34,127,5,0,203,81,10,48,111,0,
-10,224,224,225,178,21,61,111,21,0,63,6,24,78,128,0,
-45,23,105,0,13,88,2,22,96,1,34,87,0,0,34,103,
-5,0,203,81,10,48,108,0,10,224,61,87,89,0,61,111,
-101,0,61,95,93,0,61,103,97,0,237,89,203,13,177,5,
-236,81,153,13,29,95,7,0,127,90,210,5,32,86,175,255,
-93,87,7,0,224,225,194,21,61,127,81,0,224,121,138,21,
-29,48,128,255,120,2,125,87,81,0,224,81,154,13,38,6,
-148,145,132,0,129,255,248,211,93,7,7,0,0,226,28,80,
-64,6,255,0,128,7,225,16,8,216,187,0,6,232,61,55,
-85,0,7,224,188,0,224,225,186,13,29,127,7,0,239,217,
-250,5,224,49,210,5,125,7,85,0,129,255,8,61,97,226,
-186,45,29,103,7,0,236,217,250,37,61,95,85,0,224,89,
-234,5,0,50,129,255,140,75,125,87,85,0,61,55,85,0,
-224,49,162,29,29,56,129,255,112,32,224,81,210,21,61,87,
-85,0,224,81,242,13,42,23,241,11,3,58,72,18,34,95,
-0,0,63,6,242,78,128,0,202,89,34,87,5,0,11,48,
-106,0,125,7,85,0,64,6,255,16,128,7,225,0,6,232,
-7,224,224,233,194,53,49,6,200,88,133,0,61,63,81,0,
-125,143,105,0,224,57,194,5,29,48,128,255,184,1,61,55,
-85,0,224,49,178,5,129,255,124,60,61,23,105,0,63,6,
-70,79,128,0,2,22,104,1,34,87,0,0,34,135,5,0,
-221,81,10,48,112,0,29,63,0,0,29,71,1,0,38,6,
-180,145,132,0,129,255,8,211,45,6,48,72,133,0,125,111,
-105,0,129,226,201,5,29,48,129,255,20,205,64,6,255,0,
-128,7,33,0,38,23,105,0,63,6,144,79,128,0,2,22,
-16,0,34,87,0,0,34,135,5,0,198,81,10,48,112,0,
-64,6,63,0,128,7,33,0,38,23,105,0,63,6,178,79,
-128,0,72,18,34,87,0,0,34,135,5,0,198,81,10,48,
-112,0,64,6,63,0,128,7,33,0,38,23,105,0,63,6,
-214,79,128,0,2,22,16,0,34,87,0,0,34,135,5,0,
-198,81,10,48,112,0,64,6,63,0,128,7,33,0,38,23,
-105,0,63,6,250,79,128,0,2,22,16,0,34,87,0,0,
-34,135,5,0,198,81,10,48,112,0,64,6,63,0,1,82,
-127,0,0,82,127,0,128,7,33,0,38,23,105,0,63,6,
-38,80,128,0,2,22,208,0,34,87,0,0,34,135,5,0,
-198,81,10,48,112,0,64,6,63,0,128,7,33,0,38,135,
-17,0,63,6,80,80,128,0,48,23,105,0,16,88,2,22,
-24,0,34,87,0,0,34,127,5,0,203,81,10,48,111,0,
-64,6,63,0,0,82,127,0,0,82,127,0,0,82,127,0,
-128,7,33,0,38,135,21,0,63,6,134,80,128,0,48,23,
-105,0,16,88,2,22,144,0,34,87,0,0,34,127,5,0,
-203,81,10,48,111,0,64,6,63,0,0,82,127,0,31,82,
-127,0,0,82,127,0,0,82,127,0,33,6,34,112,0,0,
-97,0,33,6,40,113,0,0,97,0,33,6,48,116,0,0,
-97,0,33,6,118,125,0,0,97,0,33,6,10,131,0,0,
-97,0,33,6,242,109,1,0,97,0,33,6,76,109,1,0,
-97,0,33,6,162,109,1,0,97,0,33,6,142,110,1,0,
-97,0,128,7,225,0,6,232,7,224,224,233,138,13,32,54,
-108,0,129,255,170,203,10,232,224,233,194,21,29,48,128,255,
-14,3,49,6,96,90,133,0,125,143,105,0,224,225,226,5,
-125,231,17,0,1,130,125,135,4,0,32,126,64,0,93,127,
-6,0,29,80,64,6,255,0,128,7,33,0,38,135,17,0,
-224,129,146,21,16,88,43,23,105,0,63,6,82,81,128,0,
-2,22,24,0,34,87,0,0,34,127,5,0,203,81,10,48,
-111,0,181,5,1,82,0,90,64,6,63,0,132,7,97,0,
-6,232,39,143,17,0,99,7,0,0,224,137,210,29,17,88,
-43,23,105,0,35,54,4,0,2,22,136,0,34,87,0,0,
-34,135,5,0,203,81,10,56,63,6,144,81,128,0,112,0,
-35,127,5,0,99,127,1,0,195,199,0,0,210,5,99,7,
-0,0,195,7,0,0,35,103,0,0,125,103,0,0,35,95,
-2,0,125,95,2,0,29,80,68,6,127,0,128,7,33,0,
-38,143,17,0,224,137,146,21,17,88,43,23,105,0,63,6,
-230,81,128,0,2,22,176,0,34,87,0,0,34,135,5,0,
-203,81,10,48,112,0,165,5,1,82,64,6,63,0,128,7,
-33,0,38,143,17,0,224,137,146,21,17,88,43,23,105,0,
-63,6,24,82,128,0,2,22,184,0,34,87,0,0,34,135,
-5,0,203,81,10,48,112,0,181,5,191,255,128,254,64,6,
-63,0,128,7,33,0,38,143,17,0,224,137,146,21,17,88,
-43,23,105,0,63,6,76,82,128,0,2,22,192,0,34,87,
-0,0,34,135,5,0,203,81,10,48,112,0,181,5,191,255,
-84,254,64,6,63,0,128,7,33,0,39,55,1,0,32,134,
-40,1,102,135,12,0,31,58,128,255,156,1,64,6,63,0,
-128,7,225,0,6,232,7,224,224,233,178,37,49,6,96,90,
-133,0,17,86,104,1,42,23,0,0,125,143,105,0,221,17,
-2,48,42,135,5,0,63,6,158,82,128,0,112,0,29,63,
-0,0,38,6,220,145,132,0,129,255,180,207,46,6,48,72,
-133,0,125,119,105,0,129,226,201,5,29,48,129,255,192,201,
-64,6,255,0,128,7,33,0,38,23,105,0,63,6,228,82,
+203,81,2,22,0,1,34,95,0,0,42,55,1,0,11,96,
+204,49,28,56,25,64,34,87,5,0,63,6,118,75,128,0,
+106,0,70,6,255,112,130,7,225,112,7,232,61,215,9,0,
+61,223,13,0,6,224,26,48,8,200,60,71,14,0,27,56,
+8,72,191,74,130,255,210,13,125,95,13,0,125,87,9,0,
+26,64,60,55,81,0,27,72,99,207,1,0,128,255,250,7,
+60,135,17,0,29,56,48,23,105,0,10,200,72,18,34,87,
+0,0,16,88,203,81,10,48,34,127,5,0,63,6,216,75,
+128,0,111,0,125,215,9,0,125,223,13,0,25,80,66,6,
+255,112,128,7,225,48,7,232,61,215,9,0,61,223,13,0,
+6,224,26,48,60,71,14,0,27,56,8,72,191,74,130,255,
+104,13,125,87,9,0,125,95,13,0,29,56,60,135,21,0,
+63,6,50,76,128,0,48,23,105,0,16,88,2,22,16,0,
+34,87,0,0,34,127,5,0,203,81,10,48,111,0,125,215,
+9,0,125,223,13,0,0,82,64,6,255,48,136,7,225,243,
+8,176,7,232,61,23,18,0,61,215,9,0,2,200,99,79,
+13,0,6,224,60,95,101,0,61,223,13,0,60,87,97,0,
+235,217,225,5,187,5,234,209,177,5,0,82,165,125,60,127,
+8,0,239,17,182,5,0,82,197,117,60,119,17,0,22,64,
+46,23,105,0,14,88,2,22,136,0,34,87,0,0,35,54,
+4,0,203,81,10,56,34,111,5,0,63,6,166,76,128,0,
+109,0,195,199,4,0,186,5,0,82,181,93,35,151,13,0,
+60,55,81,0,26,64,99,151,1,0,27,72,128,255,234,6,
+60,199,17,0,99,87,9,0,56,199,14,0,25,184,248,191,
+192,2,25,88,248,95,192,98,125,103,18,0,26,48,60,71,
+14,0,27,56,8,72,191,74,130,255,126,12,10,48,11,56,
+24,64,24,72,191,74,130,255,8,15,11,104,10,96,23,120,
+191,122,23,112,204,113,225,135,0,0,125,119,9,0,208,121,
+205,121,125,127,13,0,12,82,60,135,17,0,125,87,25,0,
+48,23,105,0,29,56,2,22,32,1,34,87,0,0,16,88,
+203,81,10,48,22,64,35,79,13,0,34,127,5,0,63,6,
+74,77,128,0,111,0,10,48,224,49,178,5,128,255,114,6,
+125,223,13,0,125,215,9,0,125,207,18,0,35,87,9,0,
+72,6,255,243,130,7,225,243,8,176,7,232,61,23,18,0,
+61,215,9,0,2,200,6,224,60,95,101,0,61,223,13,0,
+60,87,97,0,235,217,241,5,187,5,234,209,193,5,32,86,
+34,1,229,101,60,127,8,0,239,17,198,5,32,86,34,1,
+245,93,60,119,17,0,22,64,46,23,105,0,14,88,2,22,
+136,0,34,87,0,0,3,48,203,81,10,56,34,111,5,0,
+63,6,204,77,128,0,109,0,195,199,0,0,202,5,32,86,
+34,1,229,69,60,199,17,0,25,184,56,199,14,0,25,88,
+248,191,192,2,248,95,192,98,125,103,18,0,26,48,60,71,
+14,0,27,56,8,72,191,74,130,255,110,11,10,48,11,56,
+24,64,24,72,191,74,130,255,248,13,23,120,191,122,23,112,
+10,96,204,113,125,119,9,0,11,104,225,135,0,0,208,121,
+205,121,125,127,13,0,12,82,60,135,17,0,125,87,25,0,
+48,23,105,0,16,88,2,22,40,1,34,87,0,0,29,56,
+203,81,10,48,22,64,34,127,5,0,63,6,86,78,128,0,
+111,0,125,215,9,0,125,223,13,0,125,207,18,0,66,6,
+255,243,134,7,225,243,6,232,7,224,28,23,0,0,99,79,
+9,0,98,18,162,13,2,56,38,6,52,156,132,0,129,255,
+126,220,0,82,128,7,62,1,60,95,13,0,60,103,9,0,
+0,112,204,113,225,135,0,0,208,89,125,95,93,0,125,119,
+89,0,2,82,28,119,1,0,35,151,9,0,93,71,0,0,
+93,119,6,0,125,87,4,0,28,111,5,0,0,194,93,111,
+7,0,93,151,1,0,0,210,28,95,19,0,1,186,93,95,
+2,0,165,69,26,200,194,202,61,182,16,0,217,177,23,216,
+244,223,64,2,220,217,187,55,1,0,128,255,172,4,118,87,
+1,0,61,94,16,0,217,89,43,135,1,0,224,129,178,45,
+61,118,16,0,25,104,205,113,46,95,1,0,29,103,0,0,
+43,23,105,0,27,56,2,22,112,0,34,87,0,0,65,98,
+203,81,10,48,35,79,9,0,35,127,49,0,12,64,47,127,
+1,0,35,134,4,0,99,135,1,0,99,127,5,0,218,73,
+34,127,5,0,63,6,80,79,128,0,111,0,10,192,216,185,
+224,193,226,5,65,210,61,119,4,0,238,209,198,189,61,111,
+21,0,125,7,10,0,61,95,17,0,45,111,14,0,43,23,
+105,0,13,96,125,7,12,0,125,103,14,0,125,111,8,0,
+2,22,24,0,34,55,0,0,34,87,5,0,203,49,63,6,
+154,79,128,0,106,0,10,48,61,71,14,0,11,56,8,72,
+191,74,130,255,92,12,125,87,97,0,125,95,101,0,235,1,
+138,13,234,1,234,5,1,82,125,87,97,0,125,7,101,0,
+24,80,70,6,255,243,128,7,97,48,6,232,8,208,9,216,
+128,255,206,3,61,135,21,0,26,64,48,23,105,0,16,88,
+2,22,232,0,34,87,0,0,27,72,203,81,10,48,34,127,
+5,0,63,6,254,79,128,0,111,0,64,6,127,48,128,7,
+225,112,6,232,7,224,188,0,8,208,9,200,0,218,28,6,
+17,0,202,45,61,127,17,0,28,112,47,23,105,0,15,88,
+2,22,152,0,34,87,0,0,14,56,203,81,10,48,34,111,
+5,0,63,6,62,80,128,0,109,0,10,216,224,217,202,53,
+61,95,21,0,28,80,43,23,105,0,10,56,2,22,152,0,
+34,55,0,0,26,64,203,49,25,72,34,135,5,0,63,6,
+106,80,128,0,112,0,10,216,245,29,127,226,218,29,29,119,
+7,0,14,6,81,0,138,29,61,87,89,0,61,111,101,0,
+61,95,93,0,61,103,97,0,237,89,225,13,187,5,236,81,
+177,13,61,55,85,0,93,231,7,0,224,49,210,5,129,255,
+158,67,125,7,85,0,27,80,64,6,255,112,128,7,225,0,
+6,232,61,135,17,0,63,6,216,80,128,0,48,23,105,0,
+16,88,2,22,96,1,34,87,0,0,34,127,5,0,203,81,
+10,48,111,0,10,224,224,225,178,21,61,111,21,0,63,6,
+0,81,128,0,45,23,105,0,13,88,2,22,96,1,34,87,
+0,0,34,103,5,0,203,81,10,48,108,0,10,224,61,87,
+89,0,61,111,101,0,61,95,93,0,61,103,97,0,237,89,
+203,13,177,5,236,81,153,13,29,95,7,0,127,90,210,5,
+32,86,175,255,93,87,7,0,224,225,194,21,61,127,81,0,
+224,121,138,21,29,48,128,255,120,2,125,87,81,0,224,81,
+154,13,38,6,116,156,132,0,129,255,180,217,93,7,7,0,
+0,226,28,80,64,6,255,0,128,7,225,16,8,216,187,0,
+6,232,61,55,85,0,7,224,188,0,224,225,186,13,29,127,
+7,0,239,217,250,5,224,49,210,5,125,7,85,0,129,255,
+190,66,97,226,186,45,29,103,7,0,236,217,250,37,61,95,
+85,0,224,89,234,5,0,50,129,255,70,81,125,87,85,0,
+61,55,85,0,224,49,162,29,29,56,129,255,220,37,224,81,
+210,21,61,87,85,0,224,81,242,13,42,23,241,11,3,58,
+72,18,34,95,0,0,63,6,218,81,128,0,202,89,34,87,
+5,0,11,48,106,0,125,7,85,0,64,6,255,16,128,7,
+225,0,6,232,7,224,224,233,194,53,49,6,80,100,133,0,
+61,63,81,0,125,143,105,0,224,57,194,5,29,48,128,255,
+184,1,61,55,85,0,224,49,178,5,129,255,50,66,61,23,
+105,0,63,6,46,82,128,0,2,22,104,1,34,87,0,0,
+34,135,5,0,221,81,10,48,112,0,29,63,0,0,29,71,
+1,0,38,6,148,156,132,0,129,255,196,216,45,6,184,83,
+133,0,125,111,105,0,129,226,201,5,29,48,129,255,208,210,
+64,6,255,0,128,7,33,0,38,23,105,0,63,6,120,82,
 128,0,2,22,16,0,34,87,0,0,34,135,5,0,198,81,
 10,48,112,0,64,6,63,0,128,7,33,0,38,23,105,0,
-63,6,6,83,128,0,72,18,34,87,0,0,34,135,5,0,
+63,6,154,82,128,0,72,18,34,87,0,0,34,135,5,0,
 198,81,10,48,112,0,64,6,63,0,128,7,33,0,38,23,
-105,0,63,6,42,83,128,0,2,22,16,0,34,87,0,0,
+105,0,63,6,190,82,128,0,2,22,16,0,34,87,0,0,
+34,135,5,0,198,81,10,48,112,0,64,6,63,0,128,7,
+33,0,38,23,105,0,63,6,226,82,128,0,2,22,16,0,
+34,87,0,0,34,135,5,0,198,81,10,48,112,0,64,6,
+63,0,1,82,127,0,0,82,127,0,128,7,33,0,38,23,
+105,0,63,6,14,83,128,0,2,22,208,0,34,87,0,0,
+34,135,5,0,198,81,10,48,112,0,64,6,63,0,128,7,
+33,0,38,135,17,0,63,6,56,83,128,0,48,23,105,0,
+16,88,2,22,24,0,34,87,0,0,34,127,5,0,203,81,
+10,48,111,0,64,6,63,0,0,82,127,0,0,82,127,0,
+0,82,127,0,128,7,33,0,38,135,21,0,63,6,110,83,
+128,0,48,23,105,0,16,88,2,22,144,0,34,87,0,0,
+34,127,5,0,203,81,10,48,111,0,64,6,63,0,0,82,
+127,0,31,82,127,0,0,82,127,0,0,82,127,0,33,6,
+202,112,0,0,97,0,33,6,208,113,0,0,97,0,33,6,
+216,116,0,0,97,0,33,6,30,126,0,0,97,0,33,6,
+178,131,0,0,97,0,33,6,28,112,1,0,97,0,33,6,
+118,111,1,0,97,0,33,6,204,111,1,0,97,0,33,6,
+184,112,1,0,97,0,128,7,225,0,6,232,7,224,224,233,
+138,13,32,54,108,0,129,255,102,209,10,232,224,233,194,21,
+29,48,128,255,14,3,49,6,232,101,133,0,125,143,105,0,
+224,225,226,5,125,231,17,0,1,130,125,135,4,0,32,126,
+64,0,93,127,6,0,29,80,64,6,255,0,128,7,33,0,
+38,135,17,0,224,129,146,21,16,88,43,23,105,0,63,6,
+58,84,128,0,2,22,24,0,34,87,0,0,34,127,5,0,
+203,81,10,48,111,0,181,5,1,82,0,90,64,6,63,0,
+132,7,97,0,6,232,39,143,17,0,99,7,0,0,224,137,
+210,29,17,88,43,23,105,0,35,54,4,0,2,22,136,0,
+34,87,0,0,34,135,5,0,203,81,10,56,63,6,120,84,
+128,0,112,0,35,127,5,0,99,127,1,0,195,199,0,0,
+210,5,99,7,0,0,195,7,0,0,35,103,0,0,125,103,
+0,0,35,95,2,0,125,95,2,0,29,80,68,6,127,0,
+128,7,33,0,38,143,17,0,224,137,146,21,17,88,43,23,
+105,0,63,6,206,84,128,0,2,22,176,0,34,87,0,0,
+34,135,5,0,203,81,10,48,112,0,165,5,1,82,64,6,
+63,0,128,7,33,0,38,143,17,0,224,137,146,21,17,88,
+43,23,105,0,63,6,0,85,128,0,2,22,184,0,34,87,
+0,0,34,135,5,0,203,81,10,48,112,0,181,5,191,255,
+128,254,64,6,63,0,128,7,33,0,38,143,17,0,224,137,
+146,21,17,88,43,23,105,0,63,6,52,85,128,0,2,22,
+192,0,34,87,0,0,34,135,5,0,203,81,10,48,112,0,
+181,5,191,255,84,254,64,6,63,0,128,7,33,0,39,55,
+1,0,32,134,40,1,102,135,12,0,31,58,128,255,156,1,
+64,6,63,0,128,7,225,0,6,232,7,224,224,233,178,37,
+49,6,232,101,133,0,17,86,104,1,42,23,0,0,125,143,
+105,0,221,17,2,48,42,135,5,0,63,6,134,85,128,0,
+112,0,29,63,0,0,38,6,188,156,132,0,129,255,112,213,
+46,6,184,83,133,0,125,119,105,0,129,226,201,5,29,48,
+129,255,124,207,64,6,255,0,128,7,33,0,38,23,105,0,
+63,6,204,85,128,0,2,22,16,0,34,87,0,0,34,135,
+5,0,198,81,10,48,112,0,64,6,63,0,128,7,33,0,
+38,23,105,0,63,6,238,85,128,0,72,18,34,87,0,0,
 34,135,5,0,198,81,10,48,112,0,64,6,63,0,128,7,
-33,0,38,23,105,0,63,6,78,83,128,0,2,22,16,0,
+33,0,38,23,105,0,63,6,18,86,128,0,2,22,16,0,
 34,87,0,0,34,135,5,0,198,81,10,48,112,0,64,6,
-63,0,0,82,127,0,32,86,34,1,127,0,0,82,127,0,
-0,82,127,0,128,7,33,0,191,255,238,254,64,6,63,0,
-128,7,33,0,191,255,226,254,64,6,63,0,0,82,127,0,
+63,0,128,7,33,0,38,23,105,0,63,6,54,86,128,0,
+2,22,16,0,34,87,0,0,34,135,5,0,198,81,10,48,
+112,0,64,6,63,0,0,82,127,0,32,86,34,1,127,0,
+0,82,127,0,0,82,127,0,128,7,33,0,191,255,238,254,
+64,6,63,0,128,7,33,0,191,255,226,254,64,6,63,0,
 0,82,127,0,0,82,127,0,0,82,127,0,0,82,127,0,
-0,82,127,0,103,7,1,0,1,82,127,0,0,82,127,0,
-127,0,0,82,127,0,32,86,33,1,127,0,32,86,35,1,
-127,0,32,86,35,1,127,0,127,0,32,86,34,1,127,0,
-32,86,34,1,127,0,0,82,127,0,32,86,34,1,127,0,
+0,82,127,0,0,82,127,0,103,7,1,0,1,82,127,0,
+0,82,127,0,127,0,0,82,127,0,32,86,33,1,127,0,
+32,86,35,1,127,0,32,86,35,1,127,0,127,0,32,86,
+34,1,127,0,32,86,34,1,127,0,0,82,127,0,32,86,
+34,1,127,0,127,0,0,82,127,0,0,82,127,0,0,82,
 127,0,0,82,127,0,0,82,127,0,0,82,127,0,0,82,
-127,0,0,82,127,0,0,82,127,0,0,82,127,0,0,82,
-127,0,0,82,127,0,0,82,127,0,32,86,35,1,127,0,
-0,82,127,0,33,6,220,62,1,0,97,0,33,6,156,106,
-0,0,97,0,128,7,97,0,6,232,224,233,138,13,32,54,
-96,2,129,255,122,200,10,232,224,233,210,13,125,7,45,0,
-61,54,122,0,41,6,242,124,128,0,32,62,40,0,6,66,
-129,255,66,202,29,80,64,6,127,0,128,7,97,0,6,232,
-29,62,0,6,128,255,210,35,125,87,1,0,64,6,127,0,
-128,7,97,0,6,232,29,62,0,2,128,255,188,35,125,87,
-1,0,64,6,127,0,128,7,97,0,6,232,29,62,0,6,
-128,255,166,35,61,127,1,0,239,81,234,87,0,0,64,6,
-127,0,128,7,97,0,6,232,29,62,0,2,128,255,138,35,
-61,127,1,0,239,81,234,87,0,0,64,6,127,0,128,7,
-225,0,6,224,7,232,224,225,250,5,4,50,129,255,224,199,
-10,224,224,225,242,21,124,239,1,0,0,234,1,138,60,119,
-1,0,253,143,192,0,78,137,146,13,253,54,96,2,42,6,
-204,248,140,0,202,49,128,255,56,11,65,234,29,6,240,255,
-230,237,28,80,64,6,255,0,128,7,225,16,6,224,7,216,
-224,225,162,29,0,234,1,138,60,119,1,0,253,143,192,0,
-78,137,146,13,253,54,96,2,42,6,204,248,140,0,202,49,
-128,255,20,11,65,234,29,6,240,255,230,237,129,218,201,5,
-28,48,129,255,74,199,64,6,255,16,128,7,225,0,6,232,
-7,224,224,233,242,13,61,63,5,0,36,71,33,175,38,6,
-196,146,132,0,129,255,8,205,129,226,201,5,29,48,129,255,
-30,199,64,6,255,0,128,7,225,0,6,232,7,224,224,233,
-194,21,61,23,0,0,224,17,178,13,61,63,5,0,61,71,
-9,0,2,72,38,6,232,146,132,0,129,255,210,204,129,226,
-201,5,29,48,129,255,232,198,64,6,255,0,128,7,97,0,
-38,6,204,126,141,0,39,6,16,147,132,0,129,255,34,175,
-224,81,162,13,38,6,36,147,132,0,32,62,28,2,0,66,
-191,255,62,176,224,81,0,234,133,21,253,54,96,2,46,6,
-204,248,140,0,206,49,29,56,29,80,36,71,89,139,204,82,
-202,65,128,255,40,0,65,234,4,143,205,131,241,233,230,237,
-64,6,127,0,128,7,33,0,4,55,205,131,195,50,191,255,
-20,181,100,87,89,139,64,6,63,0,128,7,225,16,6,232,
-7,224,39,6,48,147,132,0,8,216,1,66,128,255,248,209,
-125,231,49,0,125,223,57,0,31,138,125,143,61,0,125,143,
-65,0,93,7,68,0,125,7,73,0,125,7,77,0,125,7,
-81,0,125,143,53,0,125,7,84,0,93,7,93,2,93,7,
-94,2,93,7,95,2,125,7,89,0,2,114,93,119,92,2,
-61,54,92,0,0,58,32,70,0,2,191,255,124,171,64,6,
-255,16,128,7,225,0,6,232,29,143,93,2,109,138,150,13,
-38,6,68,147,132,0,32,62,122,2,0,66,191,255,114,175,
-29,23,93,2,45,6,204,151,132,0,196,18,205,17,34,55,
-8,0,34,95,10,0,221,49,224,89,206,5,34,23,13,0,
-213,13,34,87,12,0,198,81,42,87,1,0,195,90,202,89,
-43,87,0,0,43,23,5,0,202,49,2,224,63,6,212,86,
-128,0,124,0,93,87,93,2,189,95,95,2,224,89,218,5,
-157,87,95,2,224,81,154,205,157,87,95,2,64,6,255,0,
-128,7,97,0,6,232,61,127,49,0,1,58,239,63,192,0,
-38,6,124,136,141,0,0,66,191,255,106,231,1,82,93,87,
-93,2,93,87,95,2,93,87,94,2,64,6,127,0,70,7,
-94,2,70,7,95,2,0,82,127,0,128,7,97,0,6,232,
-61,55,49,0,128,255,180,99,10,22,4,252,125,23,61,0,
-29,48,128,255,164,27,125,87,65,0,125,7,84,0,61,54,
-92,0,0,58,32,70,0,2,191,255,142,170,1,138,93,143,
-94,2,93,7,95,2,2,82,64,6,127,0,152,7,225,48,
-6,232,61,23,57,0,7,208,99,23,37,0,99,23,41,0,
-8,216,27,128,201,130,99,135,45,0,61,111,49,0,1,226,
-237,231,192,0,191,255,144,181,10,48,102,7,9,0,44,6,
-36,64,1,0,102,103,5,0,43,6,124,136,141,0,102,95,
-29,0,102,231,33,0,32,86,244,1,102,87,21,0,125,55,
-89,0,1,58,191,255,64,252,61,23,89,0,0,58,194,7,
-3,0,194,31,3,0,99,7,16,0,99,23,1,0,35,134,
-28,0,99,135,5,0,99,223,18,0,12,122,99,127,25,0,
-99,7,13,0,99,215,9,0,99,7,22,0,61,55,49,0,
-3,64,191,255,18,181,1,114,93,119,95,2,88,6,255,48,
-128,7,33,0,38,63,61,0,8,66,191,255,82,255,7,82,
-64,6,63,0,128,7,97,0,6,232,61,63,49,0,61,71,
-65,0,38,6,80,147,132,0,129,255,36,202,29,48,61,63,
-65,0,8,66,191,255,40,255,9,82,64,6,127,0,142,7,
-225,0,6,232,61,127,49,0,1,226,239,231,192,0,191,255,
-198,180,106,7,9,0,46,6,36,64,1,0,106,119,5,0,
-45,6,124,136,141,0,106,111,29,0,32,102,244,1,106,231,
-33,0,10,48,125,87,89,0,106,103,21,0,1,58,191,255,
-118,251,61,23,89,0,99,7,5,0,194,7,3,0,99,23,
-1,0,194,31,3,0,99,7,16,0,8,82,99,87,18,0,
-61,95,65,0,99,7,25,0,99,95,9,0,99,7,13,0,
-99,7,22,0,61,55,49,0,3,58,3,64,191,255,72,180,
-1,130,93,135,95,2,8,82,78,6,255,0,128,7,33,0,
-38,143,61,0,4,66,17,62,252,255,191,255,130,254,10,82,
-64,6,63,0,128,7,97,0,6,232,61,63,49,0,38,6,
-124,147,132,0,0,66,129,255,86,201,29,48,0,58,4,66,
-191,255,92,254,10,82,64,6,127,0,128,7,225,0,6,232,
+127,0,0,82,127,0,0,82,127,0,0,82,127,0,32,86,
+35,1,127,0,0,82,127,0,33,6,176,64,1,0,97,0,
+33,6,68,107,0,0,97,0,128,7,97,0,6,232,224,233,
+138,13,32,54,96,2,129,255,54,206,10,232,224,233,210,13,
+125,7,45,0,61,54,122,0,41,6,218,127,128,0,32,62,
+40,0,6,66,129,255,254,207,29,80,64,6,127,0,128,7,
+97,0,6,232,29,62,0,6,128,255,210,35,125,87,1,0,
+64,6,127,0,128,7,97,0,6,232,29,62,0,2,128,255,
+188,35,125,87,1,0,64,6,127,0,128,7,97,0,6,232,
+29,62,0,6,128,255,166,35,61,127,1,0,239,81,234,87,
+0,0,64,6,127,0,128,7,97,0,6,232,29,62,0,2,
+128,255,138,35,61,127,1,0,239,81,234,87,0,0,64,6,
+127,0,128,7,225,0,6,224,7,232,224,225,250,5,4,50,
+129,255,156,205,10,224,224,225,242,21,124,239,1,0,0,234,
+1,138,60,119,1,0,253,143,192,0,78,137,146,13,253,54,
+96,2,42,6,44,4,141,0,202,49,128,255,56,11,65,234,
+29,6,240,255,230,237,28,80,64,6,255,0,128,7,225,16,
+6,224,7,216,224,225,162,29,0,234,1,138,60,119,1,0,
+253,143,192,0,78,137,146,13,253,54,96,2,42,6,44,4,
+141,0,202,49,128,255,20,11,65,234,29,6,240,255,230,237,
+129,218,201,5,28,48,129,255,6,205,64,6,255,16,128,7,
+225,0,6,232,7,224,224,233,242,13,61,63,5,0,36,71,
+45,175,38,6,164,157,132,0,129,255,196,210,129,226,201,5,
+29,48,129,255,218,204,64,6,255,0,128,7,225,0,6,232,
+7,224,224,233,194,21,61,23,0,0,224,17,178,13,61,63,
+5,0,61,71,9,0,2,72,38,6,200,157,132,0,129,255,
+142,210,129,226,201,5,29,48,129,255,164,204,64,6,255,0,
+128,7,97,0,38,6,44,138,141,0,39,6,240,157,132,0,
+129,255,222,180,224,81,162,13,38,6,4,158,132,0,32,62,
+28,2,0,66,191,255,86,173,224,81,0,234,133,21,253,54,
+96,2,46,6,44,4,141,0,206,49,29,56,29,80,36,71,
+101,139,204,82,202,65,128,255,40,0,65,234,4,143,217,131,
+241,233,230,237,64,6,127,0,128,7,33,0,4,55,217,131,
+195,50,191,255,44,178,100,87,101,139,64,6,63,0,128,7,
+225,16,6,232,7,224,39,6,16,158,132,0,8,216,1,66,
+128,255,28,213,125,231,49,0,125,223,57,0,31,138,125,143,
+61,0,125,143,65,0,93,7,68,0,125,7,73,0,125,7,
+77,0,125,7,81,0,125,143,53,0,125,7,84,0,93,7,
+93,2,93,7,94,2,93,7,95,2,125,7,89,0,2,114,
+93,119,92,2,61,54,92,0,0,58,32,70,0,2,191,255,
+148,168,64,6,255,16,128,7,225,0,6,232,29,143,93,2,
+109,138,150,13,38,6,36,158,132,0,32,62,122,2,0,66,
+191,255,138,172,29,23,93,2,45,6,188,162,132,0,196,18,
+205,17,34,55,8,0,34,95,10,0,221,49,224,89,206,5,
+34,23,13,0,213,13,34,87,12,0,198,81,42,87,1,0,
+195,90,202,89,43,87,0,0,43,23,5,0,202,49,2,224,
+63,6,188,89,128,0,124,0,93,87,93,2,189,95,95,2,
+224,89,218,5,157,87,95,2,224,81,154,205,157,87,95,2,
+64,6,255,0,128,7,97,0,6,232,61,127,49,0,1,58,
+239,63,192,0,38,6,220,147,141,0,0,66,191,255,106,231,
+1,82,93,87,93,2,93,87,95,2,93,87,94,2,64,6,
+127,0,70,7,94,2,70,7,95,2,0,82,127,0,128,7,
+97,0,6,232,61,55,49,0,128,255,8,101,10,22,4,252,
+125,23,61,0,29,48,128,255,164,27,125,87,65,0,125,7,
+84,0,61,54,92,0,0,58,32,70,0,2,191,255,166,167,
+1,138,93,143,94,2,93,7,95,2,2,82,64,6,127,0,
+152,7,225,48,6,232,61,23,57,0,7,208,99,23,37,0,
+99,23,41,0,8,216,27,128,201,130,99,135,45,0,61,111,
+49,0,1,226,237,231,192,0,191,255,168,178,10,48,102,7,
+9,0,44,6,248,65,1,0,102,103,5,0,43,6,220,147,
+141,0,102,95,29,0,102,231,33,0,32,86,244,1,102,87,
+21,0,125,55,89,0,1,58,191,255,64,252,61,23,89,0,
+0,58,194,7,3,0,194,31,3,0,99,7,16,0,99,23,
+1,0,35,134,28,0,99,135,5,0,99,223,18,0,12,122,
+99,127,25,0,99,7,13,0,99,215,9,0,99,7,22,0,
+61,55,49,0,3,64,191,255,42,178,1,114,93,119,95,2,
+88,6,255,48,128,7,33,0,38,63,61,0,8,66,191,255,
+82,255,7,82,64,6,63,0,128,7,97,0,6,232,61,63,
+49,0,61,71,65,0,38,6,48,158,132,0,129,255,224,207,
+29,48,61,63,65,0,8,66,191,255,40,255,9,82,64,6,
+127,0,142,7,225,0,6,232,61,127,49,0,1,226,239,231,
+192,0,191,255,222,177,106,7,9,0,46,6,248,65,1,0,
+106,119,5,0,45,6,220,147,141,0,106,111,29,0,32,102,
+244,1,106,231,33,0,10,48,125,87,89,0,106,103,21,0,
+1,58,191,255,118,251,61,23,89,0,99,7,5,0,194,7,
+3,0,99,23,1,0,194,31,3,0,99,7,16,0,8,82,
+99,87,18,0,61,95,65,0,99,7,25,0,99,95,9,0,
+99,7,13,0,99,7,22,0,61,55,49,0,3,58,3,64,
+191,255,96,177,1,130,93,135,95,2,8,82,78,6,255,0,
+128,7,33,0,38,143,61,0,4,66,17,62,252,255,191,255,
+130,254,10,82,64,6,63,0,128,7,97,0,6,232,61,63,
+49,0,38,6,92,158,132,0,0,66,129,255,18,207,29,48,
+0,58,4,66,191,255,92,254,10,82,64,6,127,0,128,7,
+225,0,6,232,61,55,89,0,38,231,12,0,102,7,0,0,
+93,7,95,2,191,255,36,177,125,7,89,0,224,225,170,13,
+61,55,57,0,61,62,92,0,32,70,0,2,128,255,122,36,
+10,224,224,225,242,29,61,63,49,0,28,64,38,6,160,158,
+132,0,129,255,186,206,1,114,93,119,68,0,61,71,49,0,
+28,72,32,54,66,0,39,6,140,158,132,0,191,255,84,170,
+11,18,28,6,252,253,170,5,12,18,93,23,92,2,4,82,
+229,45,29,48,128,255,10,3,93,87,92,2,10,16,162,0,
+224,17,186,5,5,82,181,37,97,18,170,29,15,138,29,135,
+119,0,125,143,84,0,16,6,180,255,202,5,4,122,125,127,
+65,0,29,23,118,0,127,18,125,23,53,0,194,5,2,6,
+240,255,199,13,10,106,93,111,92,2,4,82,133,13,100,18,
+178,5,101,18,186,5,4,82,165,5,3,82,64,6,255,0,
+128,7,225,0,6,232,61,55,89,0,38,231,12,0,102,7,
+0,0,93,7,95,2,191,255,82,176,125,7,89,0,224,225,
+170,13,61,55,57,0,61,62,92,0,32,70,0,2,128,255,
+168,35,10,224,224,225,130,37,61,63,49,0,28,64,38,6,
+208,158,132,0,129,255,232,205,11,18,28,6,252,253,170,5,
+12,18,93,23,92,2,29,48,128,255,162,24,61,23,65,0,
+234,17,138,13,28,6,254,253,218,5,4,82,125,87,65,0,
+181,45,12,82,149,45,29,48,128,255,54,2,93,87,92,2,
+10,16,162,0,224,17,234,13,29,48,128,255,112,24,61,23,
+65,0,234,17,218,5,4,82,125,87,65,0,213,21,5,82,
+181,21,97,18,138,21,15,130,29,23,118,0,125,135,84,0,
+125,23,53,0,127,18,194,5,2,6,240,255,199,5,10,114,
+93,119,92,2,11,82,64,6,255,0,128,7,225,0,6,232,
 61,55,89,0,38,231,12,0,102,7,0,0,93,7,95,2,
-191,255,12,180,125,7,89,0,224,225,170,13,61,55,57,0,
-61,62,92,0,32,70,0,2,128,255,248,35,10,224,224,225,
-242,29,61,63,49,0,28,64,38,6,192,147,132,0,129,255,
-254,200,1,114,93,119,68,0,61,71,49,0,28,72,32,54,
-66,0,39,6,172,147,132,0,191,255,60,173,11,18,28,6,
-252,253,170,5,12,18,93,23,92,2,4,82,229,45,29,48,
-128,255,10,3,93,87,92,2,10,16,162,0,224,17,186,5,
-5,82,181,37,97,18,170,29,15,138,29,135,119,0,125,143,
-84,0,16,6,180,255,202,5,4,122,125,127,65,0,29,23,
-118,0,127,18,125,23,53,0,194,5,2,6,240,255,199,13,
-10,106,93,111,92,2,4,82,133,13,100,18,178,5,101,18,
-186,5,4,82,165,5,3,82,64,6,255,0,128,7,225,0,
-6,232,61,55,89,0,38,231,12,0,102,7,0,0,93,7,
-95,2,191,255,58,179,125,7,89,0,224,225,170,13,61,55,
-57,0,61,62,92,0,32,70,0,2,128,255,38,35,10,224,
-224,225,130,37,61,63,49,0,28,64,38,6,240,147,132,0,
-129,255,44,200,11,18,28,6,252,253,170,5,12,18,93,23,
-92,2,29,48,128,255,162,24,61,23,65,0,234,17,138,13,
-28,6,254,253,218,5,4,82,125,87,65,0,181,45,12,82,
-149,45,29,48,128,255,54,2,93,87,92,2,10,16,162,0,
-224,17,234,13,29,48,128,255,112,24,61,23,65,0,234,17,
-218,5,4,82,125,87,65,0,213,21,5,82,181,21,97,18,
-138,21,15,130,29,23,118,0,125,135,84,0,125,23,53,0,
-127,18,194,5,2,6,240,255,199,5,10,114,93,119,92,2,
-11,82,64,6,255,0,128,7,225,0,6,232,61,55,89,0,
-38,231,12,0,102,7,0,0,93,7,95,2,191,255,112,178,
-125,7,89,0,224,225,170,13,61,55,57,0,61,62,92,0,
-32,70,0,2,128,255,92,34,10,224,224,225,130,37,61,63,
-49,0,28,64,38,6,32,148,132,0,129,255,98,199,11,18,
-28,6,252,253,170,5,12,18,93,23,92,2,29,48,128,255,
-216,23,61,23,65,0,234,17,234,5,4,106,125,111,65,0,
-6,82,245,37,93,7,92,2,12,82,181,37,61,94,20,2,
-37,102,184,128,4,106,65,90,11,119,255,255,65,98,12,87,
-255,255,14,16,170,17,218,5,224,113,178,5,95,106,202,245,
-224,17,202,13,3,130,93,135,92,2,4,122,125,127,65,0,
-32,118,76,0,93,119,119,0,181,5,93,7,92,2,11,82,
-64,6,255,0,128,7,225,0,6,232,61,55,89,0,38,231,
-12,0,102,7,0,0,93,7,95,2,191,255,178,177,125,7,
-89,0,224,225,226,13,1,130,93,135,68,0,61,71,49,0,
-28,72,32,54,67,0,39,6,80,148,132,0,191,255,8,171,
-11,82,64,6,255,0,128,7,97,0,70,7,94,2,6,232,
-128,255,110,0,29,48,128,255,110,4,11,82,64,6,127,0,
-128,7,97,0,6,232,29,143,92,2,108,138,194,5,11,130,
-93,135,92,2,93,7,94,2,29,48,128,255,68,0,29,48,
-128,255,68,4,0,82,64,6,127,0,128,7,97,0,6,232,
-61,55,89,0,224,49,178,5,128,255,32,33,12,138,93,143,
-92,2,29,48,128,255,26,0,29,48,128,255,26,4,93,7,
-93,2,93,7,95,2,93,7,94,2,64,6,127,0,128,7,
-33,0,6,23,92,2,102,18,153,13,97,18,179,37,99,18,
-193,37,210,29,101,18,209,21,245,21,105,18,217,5,103,18,
-129,21,162,21,229,13,106,18,241,13,178,13,108,18,177,5,
-210,5,181,21,32,22,236,0,149,21,32,22,238,0,229,13,
-32,22,221,0,181,13,32,22,219,0,133,13,32,22,217,0,
-213,5,32,22,255,0,165,5,0,18,38,55,49,0,2,56,
-0,66,128,255,212,95,64,6,63,0,128,7,97,0,42,6,
-100,148,132,0,38,238,92,0,38,22,100,0,0,90,65,18,
-65,82,10,135,255,255,2,143,255,255,240,137,178,5,0,82,
-197,21,65,90,104,90,198,245,29,48,191,255,200,247,224,81,
-178,5,4,82,165,13,253,127,25,0,128,118,2,144,238,121,
-178,5,5,82,165,5,1,82,64,6,127,0,130,7,225,0,
-6,224,7,232,252,143,85,0,224,137,154,13,38,6,156,148,
-132,0,32,62,203,4,0,66,191,255,246,168,28,48,2,58,
-3,64,128,255,192,1,10,16,224,17,202,5,32,86,128,1,
-245,61,35,119,1,0,60,55,57,0,201,114,206,49,29,56,
-2,64,201,66,128,255,12,32,10,16,224,17,154,53,61,135,
-5,0,29,48,124,135,73,0,29,62,0,6,128,255,218,26,
-61,23,1,0,226,81,242,5,6,114,92,119,92,2,32,86,
-130,1,229,29,61,111,5,0,224,105,242,13,61,23,49,0,
-224,17,183,13,2,6,175,254,129,13,61,23,25,3,224,17,
-199,5,2,6,175,254,185,13,60,63,49,0,38,6,112,148,
-132,0,129,255,202,196,32,86,133,1,165,5,0,82,66,6,
-255,0,130,7,225,0,6,232,7,224,253,143,85,0,224,137,
-154,13,38,6,168,148,132,0,32,62,22,5,0,66,191,255,
-64,168,29,48,8,58,3,64,128,255,10,1,10,16,224,17,
-202,5,32,86,128,1,149,61,35,119,1,0,61,55,57,0,
-201,114,206,49,28,56,2,64,201,66,128,255,86,31,60,143,
-5,0,125,143,77,0,28,48,191,255,126,246,224,81,242,5,
-8,130,93,135,92,2,32,86,130,1,245,29,60,127,50,1,
-15,6,255,207,242,5,9,114,93,119,92,2,32,86,129,1,
-197,21,60,111,52,1,224,105,210,5,60,103,5,0,224,97,
-186,13,61,63,49,0,38,6,180,148,132,0,129,255,32,196,
-32,86,132,1,165,5,0,82,66,6,255,0,130,7,225,0,
-6,224,7,232,252,143,85,0,224,137,154,13,38,6,224,148,
-132,0,32,62,96,5,0,66,191,255,150,167,28,48,4,58,
-3,64,128,255,96,0,10,16,224,17,202,5,32,86,128,1,
-245,37,35,119,1,0,60,55,57,0,201,114,206,49,29,56,
-2,64,201,66,128,255,172,30,10,16,224,17,154,29,29,48,
-29,62,0,2,128,255,130,25,61,23,1,0,226,81,178,13,
-60,63,49,0,38,6,236,148,132,0,129,255,162,195,32,86,
-131,1,229,5,61,127,5,0,0,82,124,127,81,0,66,6,
-255,0,199,0,0,98,6,135,121,0,0,82,149,29,10,16,
-230,23,64,2,38,94,122,0,194,89,235,119,1,0,231,113,
-234,13,38,102,122,0,194,97,44,87,2,0,38,134,122,0,
-104,87,1,0,208,17,226,103,5,0,197,5,65,82,240,81,
-246,229,12,80,127,0,130,7,225,0,199,0,8,224,6,232,
-3,64,191,255,176,255,10,16,201,18,202,5,32,86,128,1,
-213,13,35,119,1,0,125,7,84,0,61,55,57,0,201,114,
-206,49,28,56,2,64,191,255,196,171,66,6,255,0,154,7,
-225,48,7,216,8,208,218,0,6,232,26,56,3,64,191,255,
-116,255,10,224,224,225,186,5,0,82,133,93,125,215,84,0,
-35,23,1,0,219,55,2,0,219,31,3,0,99,7,40,0,
-99,223,25,0,99,7,9,0,99,7,5,0,2,120,61,103,
-57,0,201,122,204,121,35,102,4,0,99,103,29,0,201,82,
-99,87,21,0,99,127,13,0,99,127,17,0,99,231,42,0,
-61,111,61,0,2,82,205,17,99,23,33,0,99,7,37,0,
-11,90,99,95,49,0,99,87,46,0,61,55,49,0,9,58,
-35,70,24,0,191,255,64,173,99,7,40,0,99,223,25,0,
-35,110,4,0,99,111,29,0,99,231,42,0,35,127,1,0,
-61,119,65,0,2,90,206,121,99,127,33,0,99,7,37,0,
-11,98,99,103,49,0,99,95,46,0,61,55,49,0,9,58,
-35,70,24,0,191,255,0,173,2,82,90,6,255,48,128,7,
-97,0,6,232,29,48,31,58,128,255,8,29,224,81,186,253,
-64,6,127,0,128,7,33,0,191,255,212,180,224,81,162,13,
-38,6,28,149,132,0,32,62,6,1,0,66,191,255,178,165,
-224,81,64,6,63,0,132,7,225,112,6,200,0,218,7,224,
-124,7,1,0,0,210,0,234,197,53,57,23,105,0,29,64,
-2,22,136,0,34,87,0,0,35,54,4,0,217,81,10,56,
-34,143,5,0,63,6,140,96,128,0,113,0,35,135,5,0,
-99,135,1,0,195,199,0,0,178,29,65,218,253,54,96,2,
-44,6,204,248,140,0,35,63,2,0,204,49,128,255,124,22,
-195,207,0,0,218,5,1,82,253,87,192,0,10,209,195,255,
-0,0,226,5,60,135,1,0,65,130,124,135,1,0,65,234,
-4,127,205,131,239,233,166,205,60,23,1,0,224,17,178,13,
-251,17,146,13,38,6,40,149,132,0,32,62,128,6,0,66,
-191,255,14,165,26,80,68,6,255,112,0,90,0,18,224,49,
-226,143,0,0,1,130,226,135,192,0,81,129,202,13,226,102,
-96,2,42,6,204,248,140,0,202,97,44,87,73,0,235,81,
-163,5,10,88,65,18,2,6,240,255,166,237,11,86,1,0,
-127,0,0,90,0,18,224,49,226,143,0,0,1,130,226,135,
-192,0,81,129,202,13,226,102,96,2,42,6,204,248,140,0,
-202,97,44,87,77,0,235,81,163,5,10,88,65,18,2,6,
-240,255,166,237,11,86,1,0,127,0,0,90,0,18,224,49,
-226,143,0,0,1,130,226,135,192,0,81,129,202,13,226,102,
-96,2,42,6,204,248,140,0,202,97,44,87,81,0,235,81,
-163,5,10,88,65,18,2,6,240,255,166,237,11,86,1,0,
-127,0,128,7,33,0,0,18,6,6,240,255,129,13,230,126,
-40,0,32,110,160,180,205,121,47,23,17,0,2,48,128,255,
-8,0,64,6,63,0,132,7,225,16,6,216,224,217,186,5,
-0,82,229,37,0,226,0,234,229,29,59,23,105,0,29,64,
-2,22,136,0,34,87,0,0,35,54,4,0,219,81,10,56,
-34,143,5,0,63,6,252,97,128,0,113,0,35,135,5,0,
-99,135,1,0,195,199,0,0,210,5,1,122,253,127,192,0,
-15,225,65,234,4,111,205,131,237,233,134,229,28,80,68,6,
-255,16,128,7,225,243,6,200,7,192,8,184,9,176,0,226,
-25,216,0,210,245,61,219,142,1,0,162,61,250,238,96,2,
-46,6,204,248,140,0,206,233,29,48,61,70,92,0,1,58,
-191,255,198,252,10,224,224,225,250,45,29,48,24,64,2,58,
-191,255,182,252,10,224,224,225,250,37,56,95,5,0,29,48,
-125,95,73,0,23,64,4,58,191,255,158,252,10,224,224,81,
-186,29,55,143,5,0,29,48,125,143,81,0,22,64,8,58,
-191,255,134,252,10,224,224,225,250,13,54,127,5,0,1,114,
-125,127,77,0,93,119,92,2,29,48,191,255,132,249,65,210,
-129,218,224,217,154,197,224,225,234,5,25,48,15,58,128,255,
-12,0,10,224,28,80,64,6,255,243,172,7,225,243,7,208,
-218,0,0,218,6,224,28,176,191,255,76,170,106,7,9,0,
-49,6,36,64,1,0,106,143,5,0,48,6,204,126,141,0,
-106,135,29,0,32,126,244,1,106,231,33,0,10,232,106,127,
-21,0,0,202,149,21,220,118,1,0,194,13,249,54,96,2,
-42,6,204,248,140,0,202,49,29,56,26,64,191,255,50,252,
-202,217,65,202,129,226,224,225,250,237,29,48,27,56,191,255,
-214,240,29,48,128,255,20,26,10,200,224,201,162,69,32,119,
-37,183,32,126,176,179,239,113,202,61,35,54,8,0,0,58,
-32,70,80,0,191,255,146,158,253,231,19,0,28,102,255,255,
-92,97,204,0,224,97,194,5,37,22,192,128,181,5,37,22,
-200,128,99,23,5,0,0,194,32,22,61,0,35,190,8,0,
-133,21,220,118,1,0,178,13,23,48,2,64,24,72,37,62,
-208,128,129,255,108,201,202,185,32,22,44,0,129,226,65,194,
-224,225,138,245,35,71,5,0,224,55,209,176,32,134,32,0,
-99,135,1,0,37,62,216,128,35,78,8,0,128,255,8,155,
-125,7,0,0,29,48,191,255,118,169,22,56,26,64,27,72,
-99,207,1,0,38,6,52,149,132,0,129,255,130,190,25,80,
-108,6,255,243,128,7,33,0,0,18,6,6,240,255,129,13,
-230,126,40,0,32,110,160,180,205,121,47,23,17,0,2,48,
-128,255,8,0,64,6,63,0,148,7,225,240,6,216,128,255,
-42,25,10,224,99,231,33,0,61,6,156,149,132,0,99,239,
-37,0,29,56,28,64,36,79,33,175,38,6,120,149,132,0,
-129,255,44,190,99,7,20,0,99,239,25,0,99,231,29,0,
-224,217,250,13,35,54,20,0,2,58,191,255,28,241,35,54,
-32,0,2,58,191,255,230,240,32,238,10,1,128,7,246,1,
-27,48,3,56,191,255,242,251,10,200,25,56,35,54,4,0,
-191,255,62,240,0,194,25,208,133,45,218,142,1,0,178,37,
-248,238,96,2,46,6,204,248,140,0,206,233,29,48,128,255,
-14,12,99,87,20,0,234,0,224,81,154,29,29,48,32,62,
-78,0,128,255,184,17,35,103,1,0,224,97,154,13,29,48,
-128,255,150,13,99,87,20,0,234,0,224,81,138,13,29,48,
-191,255,110,247,65,194,129,210,224,209,138,221,35,87,1,0,
-224,81,210,5,35,143,20,0,224,137,194,21,35,239,20,0,
-35,54,4,0,2,58,191,255,18,240,35,54,20,0,2,58,
-191,255,118,240,35,54,32,0,2,58,191,255,64,240,128,7,
-84,1,58,6,168,149,132,0,32,54,0,6,129,255,144,183,
-99,87,9,0,224,81,250,5,26,48,32,62,237,7,0,66,
-191,255,222,160,35,55,9,0,0,58,32,70,0,6,191,255,
-184,156,28,6,240,255,145,13,35,119,9,0,28,48,46,62,
-48,0,128,255,14,24,133,13,35,111,9,0,27,48,45,62,
-48,0,128,255,46,16,35,23,9,0,32,70,88,1,34,62,
-48,0,34,54,24,3,191,255,34,155,35,239,9,0,32,102,
-1,32,125,103,8,0,1,90,125,95,5,0,32,86,21,0,
-125,87,10,0,32,142,88,1,125,143,12,0,32,134,144,1,
-125,135,14,0,29,48,29,62,0,6,128,255,140,18,125,87,
-1,0,32,54,0,6,129,255,246,182,99,87,13,0,32,54,
-0,2,129,255,234,182,35,119,13,0,99,87,17,0,224,113,
-250,5,26,48,32,62,8,8,0,66,191,255,52,160,35,111,
-17,0,224,105,250,5,26,48,32,62,9,8,0,66,191,255,
-32,160,35,55,13,0,27,56,1,66,128,255,162,17,28,48,
-0,58,128,255,10,224,28,48,35,63,17,0,1,66,128,255,
-70,17,35,79,13,0,35,63,9,0,35,71,17,0,25,48,
-191,255,18,252,99,87,20,0,10,232,35,55,17,0,253,0,
-129,255,92,182,35,55,13,0,129,255,84,182,35,55,9,0,
-129,255,76,182,35,54,4,0,2,58,191,255,190,238,35,54,
-20,0,2,58,191,255,34,239,35,54,32,0,2,58,191,255,
-236,238,29,80,84,6,255,240,152,7,225,243,61,6,132,215,
-255,255,99,7,36,0,7,176,64,22,133,0,34,62,180,149,
-99,63,41,0,6,208,99,215,45,0,99,215,29,0,99,63,
-33,0,26,64,36,79,33,175,38,6,192,149,132,0,129,255,
-206,187,1,138,67,143,2,0,29,48,31,58,128,255,148,22,
-224,81,186,253,0,18,26,6,240,255,129,13,250,118,40,0,
-32,102,160,180,204,113,46,23,17,0,59,6,184,146,132,0,
-2,192,224,193,186,37,32,230,10,1,99,231,36,0,131,87,
-3,0,224,81,226,13,67,7,2,0,29,48,191,255,48,174,
-224,81,242,5,27,48,32,62,6,1,0,66,191,255,18,159,
-35,54,28,0,2,58,191,255,68,238,35,54,36,0,2,58,
-191,255,102,238,28,80,128,7,32,5,55,6,228,149,132,0,
-24,48,35,62,4,0,191,255,64,249,10,200,25,56,35,54,
-8,0,191,255,140,237,32,54,0,6,129,255,114,181,99,87,
-13,0,224,81,250,5,23,48,32,62,93,8,0,66,191,255,
-192,158,35,55,13,0,0,58,32,70,0,6,191,255,154,154,
-35,135,13,0,26,48,48,62,48,0,128,255,246,21,99,87,
-36,0,10,16,226,0,224,17,146,45,35,55,13,0,2,224,
-129,255,12,181,35,54,8,0,2,58,191,255,126,237,131,119,
-3,0,224,113,226,13,67,7,2,0,29,48,191,255,128,173,
-224,81,242,5,27,48,32,62,6,1,0,66,191,255,98,158,
-35,54,28,0,2,58,191,255,148,237,35,54,36,0,2,58,
-191,255,182,237,28,80,128,7,112,4,35,111,13,0,24,48,
-45,62,24,3,128,255,188,13,35,231,13,0,25,48,191,255,
-44,249,124,87,5,0,32,102,21,0,35,231,13,0,32,94,
-88,1,124,103,10,0,124,95,12,0,32,86,144,1,124,87,
-14,0,28,48,28,62,0,6,128,255,46,16,124,87,1,0,
-32,54,0,6,129,255,152,180,99,87,17,0,224,81,250,5,
-23,48,32,62,111,8,0,66,191,255,230,157,35,55,17,0,
-0,58,32,70,0,6,191,255,192,153,35,127,17,0,35,119,
-13,0,47,54,48,0,46,62,24,3,32,70,88,1,191,255,
-74,152,35,111,17,0,35,103,13,0,45,54,24,3,44,62,
-24,3,32,70,88,1,191,255,50,152,35,95,13,0,35,231,
-17,0,43,95,5,0,32,142,21,0,65,90,124,95,5,0,
-124,143,10,0,32,134,88,1,124,135,12,0,32,126,144,1,
-124,127,14,0,28,48,28,62,0,6,128,255,156,15,124,87,
-1,0,32,54,0,6,129,255,6,180,99,87,21,0,224,81,
-250,5,23,48,32,62,123,8,0,66,191,255,84,157,25,48,
-191,255,130,248,35,55,21,0,24,56,10,64,128,255,208,14,
-32,54,0,2,129,255,216,179,99,87,25,0,224,81,250,5,
-23,48,32,62,128,8,0,66,191,255,38,157,25,48,191,255,
-140,248,10,70,255,255,35,63,25,0,26,48,128,255,88,14,
-131,95,3,0,224,89,226,13,67,7,2,0,29,48,191,255,
-14,172,224,81,242,5,27,48,32,62,6,1,0,66,191,255,
-240,156,35,87,5,0,0,18,224,81,242,5,54,48,89,49,
-128,255,232,6,10,16,162,0,67,23,3,0,0,186,22,224,
-149,29,220,126,1,0,194,21,247,214,96,2,44,6,204,248,
-140,0,204,209,26,48,128,255,86,7,99,87,36,0,234,0,
-224,81,170,13,3,63,3,0,26,48,128,255,0,13,65,186,
-161,226,224,225,250,229,35,143,5,0,224,137,210,5,35,135,
-36,0,224,129,226,53,35,55,25,0,35,231,36,0,129,255,
-254,178,35,55,21,0,129,255,246,178,35,55,17,0,129,255,
-238,178,35,55,13,0,129,255,230,178,35,54,8,0,2,58,
-191,255,88,235,131,127,3,0,224,121,226,13,67,7,2,0,
-29,48,191,255,90,171,224,81,242,5,27,48,32,62,6,1,
-0,66,191,255,60,156,35,54,28,0,2,58,191,255,110,235,
-35,54,36,0,2,58,191,255,144,235,28,80,128,7,74,2,
-35,79,21,0,35,63,17,0,35,71,25,0,22,48,191,255,
-52,248,99,87,36,0,10,16,226,0,224,17,210,53,35,55,
-25,0,2,224,129,255,120,178,35,55,21,0,129,255,112,178,
-35,55,17,0,129,255,104,178,35,55,13,0,129,255,96,178,
-35,54,8,0,2,58,191,255,210,234,131,111,3,0,224,105,
-226,13,67,7,2,0,29,48,191,255,212,170,224,81,242,5,
-27,48,32,62,6,1,0,66,191,255,182,155,35,54,28,0,
-2,58,191,255,232,234,35,54,36,0,2,58,191,255,10,235,
-28,80,128,7,196,1,54,224,89,225,0,186,28,208,213,29,
-218,94,1,0,130,29,247,206,96,2,48,6,204,248,140,0,
-208,201,25,48,35,71,13,0,2,58,191,255,140,244,99,87,
-36,0,234,0,224,81,186,13,35,111,13,0,45,111,5,0,
-121,111,73,0,65,186,129,210,224,209,186,229,35,103,36,0,
-224,97,250,5,28,48,2,58,191,255,18,248,99,87,36,0,
-35,23,36,0,224,17,194,53,35,55,25,0,2,224,129,255,
-174,177,35,55,21,0,129,255,166,177,35,55,17,0,129,255,
-158,177,35,55,13,0,129,255,150,177,35,54,8,0,2,58,
-191,255,8,234,131,87,3,0,224,81,226,13,67,7,2,0,
-29,48,191,255,10,170,224,81,242,5,27,48,32,62,6,1,
-0,66,191,255,236,154,35,54,28,0,2,58,191,255,30,234,
-35,54,36,0,2,58,191,255,64,234,28,80,213,125,35,79,
-21,0,35,63,17,0,35,71,25,0,28,48,191,255,230,246,
-99,87,36,0,10,16,226,0,224,17,194,53,35,55,25,0,
-2,224,129,255,42,177,35,55,21,0,129,255,34,177,35,55,
-17,0,129,255,26,177,35,55,13,0,129,255,18,177,35,54,
-8,0,2,58,191,255,132,233,131,135,3,0,224,129,226,13,
-67,7,2,0,29,48,191,255,134,169,224,81,242,5,27,48,
-32,62,6,1,0,66,191,255,104,154,35,54,28,0,2,58,
-191,255,154,233,35,54,36,0,2,58,191,255,188,233,28,80,
-181,61,35,127,17,0,24,48,47,62,48,0,128,255,156,17,
-35,55,25,0,35,231,36,0,129,255,180,176,35,55,21,0,
-129,255,172,176,35,55,17,0,129,255,164,176,35,55,13,0,
-129,255,156,176,35,54,8,0,2,58,191,255,14,233,131,119,
-3,0,224,113,226,13,67,7,2,0,29,48,191,255,16,169,
-224,81,242,5,27,48,32,62,6,1,0,66,191,255,242,153,
-35,54,28,0,2,58,191,255,36,233,35,54,36,0,2,58,
-191,255,70,233,28,80,88,6,255,243,146,7,225,112,60,6,
-132,215,255,255,99,7,24,0,7,200,64,22,133,0,34,62,
-20,150,99,63,29,0,6,232,99,239,33,0,99,239,17,0,
-99,63,21,0,29,64,36,79,33,175,38,6,240,149,132,0,
-129,255,252,181,1,138,67,143,3,0,28,48,31,58,128,255,
-194,16,224,81,186,253,0,18,29,6,240,255,129,13,253,118,
-40,0,32,102,160,180,204,113,46,23,17,0,58,6,184,146,
-132,0,2,216,224,217,186,37,32,238,10,1,99,239,24,0,
-163,87,3,0,224,81,226,13,67,7,3,0,28,48,191,255,
-94,168,224,81,242,5,26,48,32,62,6,1,0,66,191,255,
-64,153,35,54,16,0,2,58,191,255,114,232,35,54,24,0,
-2,58,191,255,148,232,29,80,128,7,86,1,27,48,35,62,
-4,0,191,255,116,243,25,232,35,143,5,0,74,233,224,137,
-154,37,35,239,24,0,163,135,3,0,224,129,226,13,67,7,
-3,0,28,48,191,255,8,168,224,81,242,5,26,48,32,62,
-6,1,0,66,191,255,234,152,35,54,16,0,2,58,191,255,
-28,232,35,54,24,0,2,58,191,255,62,232,29,80,128,7,
-0,1,29,56,35,54,8,0,191,255,118,231,32,54,0,6,
-129,255,92,175,99,87,13,0,224,81,154,13,38,6,36,150,
-132,0,32,62,26,9,0,66,191,255,166,152,29,48,191,255,
-212,243,35,55,13,0,27,56,10,64,128,255,34,10,163,119,
-3,0,224,113,226,13,67,7,3,0,28,48,191,255,144,167,
-224,81,242,5,26,48,32,62,6,1,0,66,191,255,114,152,
-0,202,29,216,165,29,219,110,1,0,210,21,249,54,96,2,
-35,71,13,0,42,6,204,248,140,0,40,143,5,0,202,49,
-102,143,77,0,8,58,191,255,96,241,99,87,24,0,234,0,
-224,81,218,5,65,202,129,218,224,217,234,229,35,127,24,0,
-224,121,250,5,29,48,8,58,191,255,242,244,99,87,24,0,
-35,55,13,0,35,239,24,0,129,255,148,174,35,54,8,0,
-2,58,191,255,6,231,163,119,3,0,224,113,226,13,67,7,
-3,0,28,48,191,255,8,167,224,81,242,5,26,48,32,62,
-6,1,0,66,191,255,234,151,35,54,16,0,2,58,191,255,
-28,231,35,54,24,0,2,58,191,255,62,231,29,80,82,6,
-255,112,146,7,225,112,59,6,132,215,255,255,99,7,24,0,
-64,22,133,0,34,62,48,150,99,63,29,0,6,232,99,239,
-33,0,99,239,17,0,99,63,21,0,29,64,36,79,33,175,
-38,6,64,150,132,0,129,255,246,179,1,138,67,143,3,0,
-27,48,31,58,128,255,188,14,224,81,186,253,0,18,29,6,
-240,255,129,13,253,118,40,0,32,102,160,180,204,113,46,23,
-17,0,57,6,184,146,132,0,2,48,224,49,186,37,32,238,
-10,1,99,239,24,0,163,87,3,0,224,81,226,13,67,7,
-3,0,27,48,191,255,88,166,224,81,242,5,25,48,32,62,
-6,1,0,66,191,255,58,151,35,54,16,0,2,58,191,255,
-108,230,35,54,24,0,2,58,191,255,142,230,29,80,128,7,
-38,1,35,62,4,0,191,255,112,241,35,143,5,0,10,224,
-224,137,138,37,35,239,24,0,163,135,3,0,224,129,226,13,
-67,7,3,0,27,48,191,255,6,166,224,81,242,5,25,48,
-32,62,6,1,0,66,191,255,232,150,35,54,16,0,2,58,
-191,255,26,230,35,54,24,0,2,58,191,255,60,230,29,80,
-165,109,28,56,35,54,8,0,191,255,118,229,32,54,0,2,
-129,255,92,173,99,87,13,0,224,81,154,13,38,6,100,150,
-132,0,32,62,96,9,0,66,191,255,166,150,28,48,191,255,
-12,242,29,48,35,63,13,0,10,64,128,255,218,7,0,210,
-28,232,229,21,221,118,1,0,146,21,250,54,96,2,42,6,
-204,248,140,0,202,49,35,71,13,0,4,58,191,255,138,239,
-99,87,24,0,234,0,224,81,218,5,65,210,161,234,224,233,
-170,237,35,135,24,0,224,129,250,5,28,48,4,58,191,255,
-28,243,99,87,24,0,35,55,13,0,35,239,24,0,129,255,
-190,172,35,54,8,0,2,58,191,255,48,229,163,127,3,0,
-224,121,226,13,67,7,3,0,27,48,191,255,50,165,224,81,
-242,5,25,48,32,62,6,1,0,66,191,255,20,150,35,54,
-16,0,2,58,191,255,70,229,35,54,24,0,2,58,191,255,
-104,229,29,80,82,6,255,112,0,18,0,82,245,13,198,142,
-1,0,162,13,234,126,96,2,45,6,204,248,140,0,205,121,
-15,23,119,0,213,5,65,82,129,50,224,49,154,245,2,6,
-180,255,226,5,2,6,178,255,178,5,32,22,78,0,2,80,
-127,0,128,7,225,0,6,232,29,143,0,0,7,224,224,137,
-146,13,38,6,112,150,132,0,32,62,181,9,0,66,191,255,
-160,149,28,48,191,255,62,241,10,48,191,255,158,255,29,55,
-3,0,10,224,128,255,116,74,10,16,28,6,180,255,234,5,
-2,126,0,248,32,118,0,4,197,5,2,126,0,184,0,112,
-125,119,9,0,125,127,13,0,64,6,255,0,128,7,225,48,
-6,232,191,255,124,239,29,23,92,2,97,18,242,13,99,18,
-145,37,226,5,101,18,147,29,105,18,131,13,181,29,61,231,
-61,0,0,210,92,226,4,218,165,29,29,143,119,0,17,6,
-180,255,226,5,29,48,191,255,94,239,0,226,197,37,4,210,
-61,231,61,0,8,218,181,13,4,210,61,231,61,0,8,218,
-229,5,29,48,191,255,64,239,0,226,213,21,61,63,49,0,
-27,64,38,6,124,150,132,0,129,255,84,177,29,48,26,56,
-28,64,27,72,128,255,22,0,10,224,93,7,92,2,29,48,
-191,255,20,239,28,80,64,6,255,48,152,7,225,112,6,232,
-7,208,8,200,9,224,104,226,147,13,38,6,172,150,132,0,
-32,62,30,10,0,66,191,255,184,148,29,48,128,255,0,7,
-10,16,224,17,178,5,2,224,197,117,61,119,49,0,1,218,
-238,223,192,0,191,255,192,155,106,7,9,0,45,6,36,64,
-1,0,106,111,5,0,44,6,204,126,141,0,106,103,29,0,
-32,94,244,1,106,223,33,0,28,120,106,95,21,0,125,87,
-89,0,202,55,2,0,202,31,3,0,99,7,1,0,99,7,
-5,0,201,122,61,87,57,0,61,55,89,0,99,127,17,0,
-99,87,9,0,99,87,13,0,2,58,191,255,74,226,99,7,
-36,0,99,31,25,0,99,231,38,0,61,103,89,0,2,90,
-99,215,29,0,99,103,21,0,99,7,33,0,11,98,99,103,
-45,0,99,95,42,0,61,55,49,0,9,58,35,70,20,0,
-191,255,36,155,61,87,89,0,99,7,36,0,99,87,21,0,
-99,31,25,0,99,231,38,0,2,122,99,207,29,0,99,7,
-33,0,11,130,99,135,45,0,99,127,42,0,61,55,49,0,
-9,58,35,70,20,0,191,255,238,154,61,55,89,0,128,255,
-26,11,61,55,89,0,102,7,0,0,10,224,191,255,0,155,
-28,80,88,6,255,112,128,7,225,0,6,232,191,255,210,237,
-93,7,92,2,29,48,128,255,246,5,10,224,224,225,210,5,
-29,48,191,255,210,237,213,61,61,127,49,0,1,226,239,231,
-192,0,191,255,178,154,106,7,9,0,46,6,36,64,1,0,
-106,119,5,0,45,6,204,126,141,0,106,111,29,0,32,102,
-244,1,106,231,33,0,29,48,125,87,89,0,106,103,21,0,
-10,56,15,66,191,255,170,236,61,55,89,0,10,56,191,255,
-86,225,61,55,89,0,128,255,146,10,61,55,89,0,102,7,
-0,0,10,224,191,255,120,154,61,63,49,0,29,71,119,0,
-38,6,184,150,132,0,129,255,134,175,29,48,191,255,88,237,
-28,80,64,6,255,0,128,7,33,0,38,55,49,0,128,255,
-250,71,10,86,4,216,64,6,63,0,128,7,33,0,224,49,
-202,5,32,86,10,1,229,5,191,255,190,238,10,48,128,255,
-8,0,64,6,63,0,138,7,225,243,60,6,28,151,132,0,
-31,218,99,223,13,0,61,6,236,150,132,0,99,239,17,0,
-29,56,31,66,6,176,36,79,33,175,38,6,248,150,132,0,
-129,255,28,175,99,7,0,0,99,239,5,0,99,223,9,0,
-32,54,0,6,129,255,72,169,10,232,32,54,0,2,129,255,
-62,169,10,200,32,54,0,6,129,255,52,169,10,216,224,233,
-250,5,28,48,32,62,197,10,0,66,191,255,132,146,224,201,
-250,5,28,48,32,62,198,10,0,66,191,255,116,146,224,217,
-138,13,28,48,32,62,199,10,0,66,191,255,100,146,224,81,
-0,210,22,192,128,7,146,1,216,134,1,0,186,5,128,7,
-132,1,250,230,96,2,45,6,204,248,140,0,205,225,28,48,
-191,255,220,252,99,87,0,0,234,0,224,81,178,5,128,7,
-112,1,28,48,0,58,128,255,82,3,28,48,32,62,78,0,
-128,255,122,2,28,48,60,70,92,0,1,58,191,255,42,235,
-99,87,0,0,234,0,224,81,178,5,128,7,68,1,29,48,
-0,58,32,70,0,6,191,255,224,141,61,190,48,0,61,62,
-56,0,26,48,128,255,160,74,36,143,33,175,55,126,8,0,
-218,137,119,143,5,0,175,81,119,87,1,0,61,54,24,3,
-61,62,48,0,32,70,88,1,191,255,80,140,32,118,1,32,
-125,119,8,0,1,106,125,111,5,0,32,102,21,0,125,103,
-10,0,32,94,88,1,125,95,12,0,32,86,144,1,125,87,
-14,0,29,48,29,62,0,6,128,255,190,3,125,87,1,0,
-28,48,29,64,2,58,191,255,160,234,99,87,0,0,234,0,
-224,81,234,93,61,127,5,0,25,56,124,127,73,0,31,50,
-1,66,128,255,178,2,28,48,25,64,4,58,191,255,122,234,
-99,87,0,0,234,0,224,81,186,77,57,111,5,0,27,48,
-124,111,81,0,0,58,32,70,0,6,191,255,44,141,1,98,
-123,103,52,1,32,94,253,15,123,95,48,1,32,86,20,0,
-123,87,54,1,32,142,1,48,123,143,50,1,123,103,5,0,
-12,122,59,190,56,1,87,127,1,0,32,118,31,0,87,119,
-5,0,87,215,3,0,26,48,128,255,240,69,10,22,0,184,
-119,23,13,0,27,48,191,255,68,223,28,48,27,64,8,58,
-191,255,6,234,99,87,0,0,234,0,224,81,154,21,59,103,
-5,0,1,90,124,103,77,0,92,95,92,2,28,48,191,255,
-0,231,65,210,161,194,224,193,178,5,191,7,110,254,35,87,
-0,0,224,81,250,5,22,48,15,58,191,255,128,237,99,87,
-0,0,29,48,129,255,40,167,25,48,129,255,34,167,27,48,
-129,255,28,167,35,239,0,0,3,48,2,58,191,255,250,223,
-35,54,12,0,2,58,191,255,196,223,29,80,74,6,255,243,
-134,7,225,48,6,208,7,224,28,48,0,58,32,70,88,1,
-191,255,86,140,224,209,186,5,0,82,229,93,1,138,67,143,
-3,0,38,6,132,215,255,255,31,58,128,255,134,7,224,81,
-154,253,60,238,8,0,0,218,245,29,58,23,105,0,27,64,
-2,22,136,0,34,87,0,0,35,54,8,0,218,81,10,56,
-34,135,5,0,63,6,220,117,128,0,112,0,35,127,9,0,
-99,127,5,0,195,199,4,0,226,5,27,48,29,56,128,255,
-198,72,10,232,65,218,4,119,205,131,238,217,246,221,36,111,
-33,175,60,94,8,0,124,111,5,0,171,233,124,239,1,0,
-29,6,176,254,150,13,38,6,40,151,132,0,32,62,61,11,
-0,66,191,255,220,143,60,239,1,0,163,143,3,0,224,137,
-162,21,67,7,3,0,38,6,132,215,255,255,191,255,208,158,
-224,81,146,13,38,6,184,146,132,0,32,62,6,1,0,66,
-191,255,174,143,29,80,70,6,255,48,128,7,225,0,7,224,
-188,0,6,232,61,54,92,0,0,58,32,70,0,2,191,255,
-120,139,29,48,191,255,114,252,125,87,65,0,224,225,178,85,
-61,86,100,0,34,6,52,151,132,0,2,94,9,0,2,103,
-0,0,74,103,0,0,65,18,65,82,226,89,154,253,1,130,
-125,135,113,0,61,119,53,0,128,126,2,144,125,127,116,0,
-93,119,118,0,32,110,40,0,93,111,120,0,8,74,93,79,
-121,0,28,6,180,255,202,13,4,90,32,86,76,0,93,87,
-119,0,125,95,65,0,42,6,64,92,133,0,197,29,32,134,
-78,0,93,135,119,0,42,6,16,92,133,0,197,21,9,16,
-230,23,64,2,61,142,122,0,194,137,202,17,34,135,0,0,
-113,135,0,0,34,127,2,0,113,127,2,0,34,119,4,0,
-113,119,4,0,9,104,95,74,224,105,170,237,61,54,92,0,
-191,255,64,221,64,6,255,0,128,7,33,0,7,136,177,0,
-102,143,53,0,70,63,118,0,38,54,92,0,191,255,36,221,
-64,6,63,0,128,7,225,16,6,224,7,232,8,216,29,48,
-0,58,32,70,0,2,191,255,144,138,28,6,240,255,129,13,
-28,48,61,62,12,0,32,70,244,1,128,255,178,206,32,134,
-3,64,125,135,8,0,125,223,5,0,29,48,29,62,0,2,
-128,255,166,0,125,87,1,0,64,6,255,16,128,7,225,16,
-6,232,7,224,0,58,8,216,32,70,0,6,191,255,74,138,
-60,23,105,0,61,62,56,1,2,22,184,0,34,87,0,0,
-34,143,5,0,220,81,10,48,63,6,192,119,128,0,113,0,
-60,23,105,0,63,6,220,119,128,0,2,22,176,0,34,87,
-0,0,34,135,5,0,220,81,10,48,112,0,125,87,52,1,
-234,0,10,6,205,255,151,13,38,6,64,151,132,0,32,62,
-224,11,0,66,191,255,10,142,28,48,128,255,62,5,10,48,
-128,255,96,5,125,87,48,1,32,118,20,0,125,119,54,1,
-32,110,1,48,125,111,50,1,125,223,5,0,29,48,191,255,
-44,220,64,6,255,16,0,114,0,122,6,22,4,0,68,18,
-34,87,253,255,15,72,206,81,10,112,225,111,0,0,13,120,
-201,121,231,17,209,245,15,80,206,81,127,0,152,7,225,0,
-6,232,61,23,57,0,32,134,0,16,99,23,41,0,99,23,
-37,0,99,135,45,0,61,119,49,0,1,226,238,231,192,0,
-191,255,180,148,106,7,9,0,45,6,36,64,1,0,106,111,
-5,0,44,6,204,126,141,0,106,103,29,0,10,48,106,231,
-33,0,32,94,232,3,125,87,89,0,106,95,21,0,1,58,
-191,255,100,219,61,23,89,0,99,7,16,0,99,23,1,0,
-35,86,28,0,99,87,5,0,99,7,9,0,99,7,13,0,
-8,130,99,135,18,0,32,126,17,0,99,127,25,0,99,7,
-22,0,12,50,12,58,3,64,191,255,60,148,61,55,89,0,
-125,7,84,0,128,255,100,4,61,55,89,0,102,7,0,0,
-10,224,191,255,74,148,28,80,88,6,255,0,132,7,225,112,
-6,232,0,18,29,6,240,255,129,13,253,126,40,0,32,110,
-160,180,205,121,47,23,17,0,2,48,224,49,202,5,32,86,
-10,1,245,101,3,56,191,255,48,231,35,103,1,0,10,216,
-224,97,186,5,0,82,213,93,32,54,0,2,129,255,96,163,
-99,87,5,0,224,81,154,13,38,6,136,151,132,0,32,62,
-222,12,0,66,191,255,170,140,0,202,31,210,0,226,165,29,
-219,86,1,0,210,21,252,54,96,2,46,6,204,248,140,0,
-35,63,5,0,206,49,191,255,214,228,224,81,154,13,35,23,
-5,0,34,23,5,0,249,17,183,5,2,200,28,208,65,226,
-161,218,224,217,234,229,127,210,218,13,29,56,38,6,76,151,
-132,0,129,255,186,168,35,55,5,0,129,255,210,162,0,82,
-133,37,250,54,96,2,48,6,204,248,140,0,35,63,5,0,
-208,49,191,255,138,228,10,224,224,225,242,5,35,55,5,0,
-129,255,172,162,28,80,213,13,35,119,5,0,29,48,46,62,
-12,0,128,255,26,204,35,55,5,0,129,255,146,162,0,82,
-68,6,255,112,132,7,225,48,6,208,0,18,7,6,240,255,
-129,13,231,126,40,0,32,110,160,180,205,121,47,23,17,0,
-2,48,224,49,186,5,0,82,181,61,3,56,191,255,58,230,
-35,103,1,0,10,224,224,97,186,5,0,82,149,53,28,56,
-35,54,4,0,191,255,122,218,0,218,0,234,149,37,220,94,
-1,0,194,29,253,54,96,2,48,6,204,248,140,0,208,49,
-134,127,69,0,224,121,162,21,230,23,85,0,111,18,146,13,
-29,56,2,64,38,6,148,151,132,0,129,255,242,167,229,5,
-26,56,15,66,191,255,218,228,202,217,65,234,161,226,224,225,
-250,221,35,54,4,0,2,58,191,255,112,218,27,80,68,6,
-255,48,128,7,33,0,191,255,156,243,64,6,63,0,130,7,
+191,255,136,175,125,7,89,0,224,225,170,13,61,55,57,0,
+61,62,92,0,32,70,0,2,128,255,222,34,10,224,224,225,
+130,37,61,63,49,0,28,64,38,6,0,159,132,0,129,255,
+30,205,11,18,28,6,252,253,170,5,12,18,93,23,92,2,
+29,48,128,255,216,23,61,23,65,0,234,17,234,5,4,106,
+125,111,65,0,6,82,245,37,93,7,92,2,12,82,181,37,
+61,94,20,2,37,102,184,128,4,106,65,90,11,119,255,255,
+65,98,12,87,255,255,14,16,170,17,218,5,224,113,178,5,
+95,106,202,245,224,17,202,13,3,130,93,135,92,2,4,122,
+125,127,65,0,32,118,76,0,93,119,119,0,181,5,93,7,
+92,2,11,82,64,6,255,0,128,7,225,0,6,232,61,55,
+89,0,38,231,12,0,102,7,0,0,93,7,95,2,191,255,
+202,174,125,7,89,0,224,225,226,13,1,130,93,135,68,0,
+61,71,49,0,28,72,32,54,67,0,39,6,48,159,132,0,
+191,255,32,168,11,82,64,6,255,0,128,7,97,0,70,7,
+94,2,6,232,128,255,110,0,29,48,128,255,110,4,11,82,
+64,6,127,0,128,7,97,0,6,232,29,143,92,2,108,138,
+194,5,11,130,93,135,92,2,93,7,94,2,29,48,128,255,
+68,0,29,48,128,255,68,4,0,82,64,6,127,0,128,7,
+97,0,6,232,61,55,89,0,224,49,178,5,128,255,162,33,
+12,138,93,143,92,2,29,48,128,255,26,0,29,48,128,255,
+26,4,93,7,93,2,93,7,95,2,93,7,94,2,64,6,
+127,0,128,7,33,0,6,23,92,2,102,18,153,13,97,18,
+179,37,99,18,193,37,210,29,101,18,209,21,245,21,105,18,
+217,5,103,18,129,21,162,21,229,13,106,18,241,13,178,13,
+108,18,177,5,210,5,181,21,32,22,236,0,149,21,32,22,
+238,0,229,13,32,22,221,0,181,13,32,22,219,0,133,13,
+32,22,217,0,213,5,32,22,255,0,165,5,0,18,38,55,
+49,0,2,56,0,66,128,255,40,97,64,6,63,0,128,7,
+97,0,42,6,68,159,132,0,38,238,92,0,38,22,100,0,
+0,90,65,18,65,82,10,135,255,255,2,143,255,255,240,137,
+178,5,0,82,197,21,65,90,104,90,198,245,29,48,191,255,
+200,247,224,81,178,5,4,82,165,13,253,127,25,0,128,118,
+2,144,238,121,178,5,5,82,165,5,1,82,64,6,127,0,
+130,7,225,0,6,224,7,232,252,143,85,0,224,137,154,13,
+38,6,124,159,132,0,32,62,203,4,0,66,191,255,14,166,
+28,48,2,58,3,64,128,255,192,1,10,16,224,17,202,5,
+32,86,128,1,245,61,35,119,1,0,60,55,57,0,201,114,
+206,49,29,56,2,64,201,66,128,255,142,32,10,16,224,17,
+154,53,61,135,5,0,29,48,124,135,73,0,29,62,0,6,
+128,255,218,26,61,23,1,0,226,81,242,5,6,114,92,119,
+92,2,32,86,130,1,229,29,61,111,5,0,224,105,242,13,
+61,23,49,0,224,17,183,13,2,6,175,254,129,13,61,23,
+25,3,224,17,199,5,2,6,175,254,185,13,60,63,49,0,
+38,6,80,159,132,0,129,255,134,202,32,86,133,1,165,5,
+0,82,66,6,255,0,130,7,225,0,6,232,7,224,253,143,
+85,0,224,137,154,13,38,6,136,159,132,0,32,62,22,5,
+0,66,191,255,88,165,29,48,8,58,3,64,128,255,10,1,
+10,16,224,17,202,5,32,86,128,1,149,61,35,119,1,0,
+61,55,57,0,201,114,206,49,28,56,2,64,201,66,128,255,
+216,31,60,143,5,0,125,143,77,0,28,48,191,255,126,246,
+224,81,242,5,8,130,93,135,92,2,32,86,130,1,245,29,
+60,127,50,1,15,6,255,207,242,5,9,114,93,119,92,2,
+32,86,129,1,197,21,60,111,52,1,224,105,210,5,60,103,
+5,0,224,97,186,13,61,63,49,0,38,6,148,159,132,0,
+129,255,220,201,32,86,132,1,165,5,0,82,66,6,255,0,
+130,7,225,0,6,224,7,232,252,143,85,0,224,137,154,13,
+38,6,192,159,132,0,32,62,96,5,0,66,191,255,174,164,
+28,48,4,58,3,64,128,255,96,0,10,16,224,17,202,5,
+32,86,128,1,245,37,35,119,1,0,60,55,57,0,201,114,
+206,49,29,56,2,64,201,66,128,255,46,31,10,16,224,17,
+154,29,29,48,29,62,0,2,128,255,130,25,61,23,1,0,
+226,81,178,13,60,63,49,0,38,6,204,159,132,0,129,255,
+94,201,32,86,131,1,229,5,61,127,5,0,0,82,124,127,
+81,0,66,6,255,0,199,0,0,98,6,135,121,0,0,82,
+149,29,10,16,230,23,64,2,38,94,122,0,194,89,235,119,
+1,0,231,113,234,13,38,102,122,0,194,97,44,87,2,0,
+38,134,122,0,104,87,1,0,208,17,226,103,5,0,197,5,
+65,82,240,81,246,229,12,80,127,0,130,7,225,0,199,0,
+8,224,6,232,3,64,191,255,176,255,10,16,201,18,202,5,
+32,86,128,1,213,13,35,119,1,0,125,7,84,0,61,55,
+57,0,201,114,206,49,28,56,2,64,191,255,220,168,66,6,
+255,0,154,7,225,48,7,216,8,208,218,0,6,232,26,56,
+3,64,191,255,116,255,10,224,224,225,186,5,0,82,133,93,
+125,215,84,0,35,23,1,0,219,55,2,0,219,31,3,0,
+99,7,40,0,99,223,25,0,99,7,9,0,99,7,5,0,
+2,120,61,103,57,0,201,122,204,121,35,102,4,0,99,103,
+29,0,201,82,99,87,21,0,99,127,13,0,99,127,17,0,
+99,231,42,0,61,111,61,0,2,82,205,17,99,23,33,0,
+99,7,37,0,11,90,99,95,49,0,99,87,46,0,61,55,
+49,0,9,58,35,70,24,0,191,255,88,170,99,7,40,0,
+99,223,25,0,35,110,4,0,99,111,29,0,99,231,42,0,
+35,127,1,0,61,119,65,0,2,90,206,121,99,127,33,0,
+99,7,37,0,11,98,99,103,49,0,99,95,46,0,61,55,
+49,0,9,58,35,70,24,0,191,255,24,170,2,82,90,6,
+255,48,128,7,97,0,6,232,29,48,31,58,128,255,138,29,
+224,81,186,253,64,6,127,0,128,7,33,0,191,255,172,178,
+224,81,162,13,38,6,252,159,132,0,32,62,6,1,0,66,
+191,255,202,162,224,81,64,6,63,0,132,7,225,112,6,200,
+0,218,7,224,124,7,1,0,0,210,0,234,197,53,57,23,
+105,0,29,64,2,22,136,0,34,87,0,0,35,54,4,0,
+217,81,10,56,34,143,5,0,63,6,116,99,128,0,113,0,
+35,135,5,0,99,135,1,0,195,199,0,0,178,29,65,218,
+253,54,96,2,44,6,44,4,141,0,35,63,2,0,204,49,
+128,255,124,22,195,207,0,0,218,5,1,82,253,87,192,0,
+10,209,195,255,0,0,226,5,60,135,1,0,65,130,124,135,
+1,0,65,234,4,127,217,131,239,233,166,205,60,23,1,0,
+224,17,178,13,251,17,146,13,38,6,8,160,132,0,32,62,
+128,6,0,66,191,255,38,162,26,80,68,6,255,112,0,90,
+0,18,224,49,226,143,0,0,1,130,226,135,192,0,81,129,
+202,13,226,102,96,2,42,6,44,4,141,0,202,97,44,87,
+73,0,235,81,163,5,10,88,65,18,2,6,240,255,166,237,
+11,86,1,0,127,0,0,90,0,18,224,49,226,143,0,0,
+1,130,226,135,192,0,81,129,202,13,226,102,96,2,42,6,
+44,4,141,0,202,97,44,87,77,0,235,81,163,5,10,88,
+65,18,2,6,240,255,166,237,11,86,1,0,127,0,0,90,
+0,18,224,49,226,143,0,0,1,130,226,135,192,0,81,129,
+202,13,226,102,96,2,42,6,44,4,141,0,202,97,44,87,
+81,0,235,81,163,5,10,88,65,18,2,6,240,255,166,237,
+11,86,1,0,127,0,128,7,33,0,0,18,6,6,240,255,
+129,13,230,126,40,0,32,110,160,180,205,121,47,23,17,0,
+2,48,128,255,8,0,64,6,63,0,132,7,225,16,6,216,
+224,217,186,5,0,82,229,37,0,226,0,234,229,29,59,23,
+105,0,29,64,2,22,136,0,34,87,0,0,35,54,4,0,
+219,81,10,56,34,143,5,0,63,6,228,100,128,0,113,0,
+35,135,5,0,99,135,1,0,195,199,0,0,210,5,1,122,
+253,127,192,0,15,225,65,234,4,111,217,131,237,233,134,229,
+28,80,68,6,255,16,128,7,225,243,6,200,7,192,8,184,
+9,176,0,226,25,216,0,210,245,61,219,142,1,0,162,61,
+250,238,96,2,46,6,44,4,141,0,206,233,29,48,61,70,
+92,0,1,58,191,255,198,252,10,224,224,225,250,45,29,48,
+24,64,2,58,191,255,182,252,10,224,224,225,250,37,56,95,
+5,0,29,48,125,95,73,0,23,64,4,58,191,255,158,252,
+10,224,224,81,186,29,55,143,5,0,29,48,125,143,81,0,
+22,64,8,58,191,255,134,252,10,224,224,225,250,13,54,127,
+5,0,1,114,125,127,77,0,93,119,92,2,29,48,191,255,
+132,249,65,210,129,218,224,217,154,197,224,225,234,5,25,48,
+15,58,128,255,12,0,10,224,28,80,64,6,255,243,172,7,
+225,243,7,208,218,0,0,218,6,224,28,176,191,255,100,167,
+106,7,9,0,49,6,248,65,1,0,106,143,5,0,48,6,
+44,138,141,0,106,135,29,0,32,126,244,1,106,231,33,0,
+10,232,106,127,21,0,0,202,149,21,220,118,1,0,194,13,
+249,54,96,2,42,6,44,4,141,0,202,49,29,56,26,64,
+191,255,50,252,202,217,65,202,129,226,224,225,250,237,29,48,
+27,56,191,255,214,240,29,48,128,255,150,26,10,200,224,201,
+162,69,32,119,37,183,32,126,176,179,239,113,202,61,35,54,
+8,0,0,58,32,70,80,0,191,255,170,155,253,231,19,0,
+28,102,255,255,92,97,204,0,224,97,194,5,37,22,192,128,
+181,5,37,22,200,128,99,23,5,0,0,194,32,22,61,0,
+35,190,8,0,133,21,220,118,1,0,178,13,23,48,2,64,
+24,72,37,62,208,128,129,255,40,207,202,185,32,22,44,0,
+129,226,65,194,224,225,138,245,35,71,5,0,224,55,209,176,
+32,134,32,0,99,135,1,0,37,62,216,128,35,78,8,0,
+128,255,92,156,125,7,0,0,29,48,191,255,142,166,22,56,
+26,64,27,72,99,207,1,0,38,6,20,160,132,0,129,255,
+62,196,25,80,108,6,255,243,128,7,33,0,0,18,6,6,
+240,255,129,13,230,126,40,0,32,110,160,180,205,121,47,23,
+17,0,2,48,128,255,8,0,64,6,63,0,148,7,225,240,
+6,216,128,255,172,25,10,224,99,231,33,0,61,6,124,160,
+132,0,99,239,37,0,29,56,28,64,36,79,45,175,38,6,
+88,160,132,0,129,255,232,195,99,7,20,0,99,239,25,0,
+99,231,29,0,224,217,250,13,35,54,20,0,2,58,191,255,
+28,241,35,54,32,0,2,58,191,255,230,240,32,238,10,1,
+128,7,246,1,27,48,3,56,191,255,242,251,10,200,25,56,
+35,54,4,0,191,255,62,240,0,194,25,208,133,45,218,142,
+1,0,178,37,248,238,96,2,46,6,44,4,141,0,206,233,
+29,48,128,255,14,12,99,87,20,0,234,0,224,81,154,29,
+29,48,32,62,78,0,128,255,184,17,35,103,1,0,224,97,
+154,13,29,48,128,255,150,13,99,87,20,0,234,0,224,81,
+138,13,29,48,191,255,110,247,65,194,129,210,224,209,138,221,
+35,87,1,0,224,81,210,5,35,143,20,0,224,137,194,21,
+35,239,20,0,35,54,4,0,2,58,191,255,18,240,35,54,
+20,0,2,58,191,255,118,240,35,54,32,0,2,58,191,255,
+64,240,128,7,84,1,58,6,136,160,132,0,32,54,0,6,
+129,255,76,189,99,87,9,0,224,81,250,5,26,48,32,62,
+237,7,0,66,191,255,246,157,35,55,9,0,0,58,32,70,
+0,6,191,255,208,153,28,6,240,255,145,13,35,119,9,0,
+28,48,46,62,48,0,128,255,144,24,133,13,35,111,9,0,
+27,48,45,62,48,0,128,255,46,16,35,23,9,0,32,70,
+88,1,34,62,48,0,34,54,24,3,191,255,58,152,35,239,
+9,0,32,102,1,32,125,103,8,0,1,90,125,95,5,0,
+32,86,21,0,125,87,10,0,32,142,88,1,125,143,12,0,
+32,134,144,1,125,135,14,0,29,48,29,62,0,6,128,255,
+140,18,125,87,1,0,32,54,0,6,129,255,178,188,99,87,
+13,0,32,54,0,2,129,255,166,188,35,119,13,0,99,87,
+17,0,224,113,250,5,26,48,32,62,8,8,0,66,191,255,
+76,157,35,111,17,0,224,105,250,5,26,48,32,62,9,8,
+0,66,191,255,56,157,35,55,13,0,27,56,1,66,128,255,
+162,17,28,48,0,58,128,255,46,227,28,48,35,63,17,0,
+1,66,128,255,70,17,35,79,13,0,35,63,9,0,35,71,
+17,0,25,48,191,255,18,252,99,87,20,0,10,232,35,55,
+17,0,253,0,129,255,24,188,35,55,13,0,129,255,16,188,
+35,55,9,0,129,255,8,188,35,54,4,0,2,58,191,255,
+190,238,35,54,20,0,2,58,191,255,34,239,35,54,32,0,
+2,58,191,255,236,238,29,80,84,6,255,240,152,7,225,243,
+61,6,132,215,255,255,99,7,36,0,7,176,64,22,133,0,
+34,62,148,160,99,63,41,0,6,208,99,215,45,0,99,215,
+29,0,99,63,33,0,26,64,36,79,45,175,38,6,160,160,
+132,0,129,255,138,193,1,138,67,143,2,0,29,48,31,58,
+128,255,22,23,224,81,186,253,0,18,26,6,240,255,129,13,
+250,118,40,0,32,102,160,180,204,113,46,23,17,0,59,6,
+152,157,132,0,2,192,224,193,186,37,32,230,10,1,99,231,
+36,0,131,87,3,0,224,81,226,13,67,7,2,0,29,48,
+191,255,8,172,224,81,242,5,27,48,32,62,6,1,0,66,
+191,255,42,156,35,54,28,0,2,58,191,255,68,238,35,54,
+36,0,2,58,191,255,102,238,28,80,128,7,32,5,55,6,
+196,160,132,0,24,48,35,62,4,0,191,255,64,249,10,200,
+25,56,35,54,8,0,191,255,140,237,32,54,0,6,129,255,
+46,187,99,87,13,0,224,81,250,5,23,48,32,62,93,8,
+0,66,191,255,216,155,35,55,13,0,0,58,32,70,0,6,
+191,255,178,151,35,135,13,0,26,48,48,62,48,0,128,255,
+120,22,99,87,36,0,10,16,226,0,224,17,146,45,35,55,
+13,0,2,224,129,255,200,186,35,54,8,0,2,58,191,255,
+126,237,131,119,3,0,224,113,226,13,67,7,2,0,29,48,
+191,255,88,171,224,81,242,5,27,48,32,62,6,1,0,66,
+191,255,122,155,35,54,28,0,2,58,191,255,148,237,35,54,
+36,0,2,58,191,255,182,237,28,80,128,7,112,4,35,111,
+13,0,24,48,45,62,24,3,128,255,188,13,35,231,13,0,
+25,48,191,255,44,249,124,87,5,0,32,102,21,0,35,231,
+13,0,32,94,88,1,124,103,10,0,124,95,12,0,32,86,
+144,1,124,87,14,0,28,48,28,62,0,6,128,255,46,16,
+124,87,1,0,32,54,0,6,129,255,84,186,99,87,17,0,
+224,81,250,5,23,48,32,62,111,8,0,66,191,255,254,154,
+35,55,17,0,0,58,32,70,0,6,191,255,216,150,35,127,
+17,0,35,119,13,0,47,54,48,0,46,62,24,3,32,70,
+88,1,191,255,98,149,35,111,17,0,35,103,13,0,45,54,
+24,3,44,62,24,3,32,70,88,1,191,255,74,149,35,95,
+13,0,35,231,17,0,43,95,5,0,32,142,21,0,65,90,
+124,95,5,0,124,143,10,0,32,134,88,1,124,135,12,0,
+32,126,144,1,124,127,14,0,28,48,28,62,0,6,128,255,
+156,15,124,87,1,0,32,54,0,6,129,255,194,185,99,87,
+21,0,224,81,250,5,23,48,32,62,123,8,0,66,191,255,
+108,154,25,48,191,255,130,248,35,55,21,0,24,56,10,64,
+128,255,208,14,32,54,0,2,129,255,148,185,99,87,25,0,
+224,81,250,5,23,48,32,62,128,8,0,66,191,255,62,154,
+25,48,191,255,140,248,10,70,255,255,35,63,25,0,26,48,
+128,255,88,14,131,95,3,0,224,89,226,13,67,7,2,0,
+29,48,191,255,230,169,224,81,242,5,27,48,32,62,6,1,
+0,66,191,255,8,154,35,87,5,0,0,18,224,81,242,5,
+54,48,89,49,128,255,232,6,10,16,162,0,67,23,3,0,
+0,186,22,224,149,29,220,126,1,0,194,21,247,214,96,2,
+44,6,44,4,141,0,204,209,26,48,128,255,86,7,99,87,
+36,0,234,0,224,81,170,13,3,63,3,0,26,48,128,255,
+0,13,65,186,161,226,224,225,250,229,35,143,5,0,224,137,
+210,5,35,135,36,0,224,129,226,53,35,55,25,0,35,231,
+36,0,129,255,186,184,35,55,21,0,129,255,178,184,35,55,
+17,0,129,255,170,184,35,55,13,0,129,255,162,184,35,54,
+8,0,2,58,191,255,88,235,131,127,3,0,224,121,226,13,
+67,7,2,0,29,48,191,255,50,169,224,81,242,5,27,48,
+32,62,6,1,0,66,191,255,84,153,35,54,28,0,2,58,
+191,255,110,235,35,54,36,0,2,58,191,255,144,235,28,80,
+128,7,74,2,35,79,21,0,35,63,17,0,35,71,25,0,
+22,48,191,255,52,248,99,87,36,0,10,16,226,0,224,17,
+210,53,35,55,25,0,2,224,129,255,52,184,35,55,21,0,
+129,255,44,184,35,55,17,0,129,255,36,184,35,55,13,0,
+129,255,28,184,35,54,8,0,2,58,191,255,210,234,131,111,
+3,0,224,105,226,13,67,7,2,0,29,48,191,255,172,168,
+224,81,242,5,27,48,32,62,6,1,0,66,191,255,206,152,
+35,54,28,0,2,58,191,255,232,234,35,54,36,0,2,58,
+191,255,10,235,28,80,128,7,196,1,54,224,89,225,0,186,
+28,208,213,29,218,94,1,0,130,29,247,206,96,2,48,6,
+44,4,141,0,208,201,25,48,35,71,13,0,2,58,191,255,
+140,244,99,87,36,0,234,0,224,81,186,13,35,111,13,0,
+45,111,5,0,121,111,73,0,65,186,129,210,224,209,186,229,
+35,103,36,0,224,97,250,5,28,48,2,58,191,255,18,248,
+99,87,36,0,35,23,36,0,224,17,194,53,35,55,25,0,
+2,224,129,255,106,183,35,55,21,0,129,255,98,183,35,55,
+17,0,129,255,90,183,35,55,13,0,129,255,82,183,35,54,
+8,0,2,58,191,255,8,234,131,87,3,0,224,81,226,13,
+67,7,2,0,29,48,191,255,226,167,224,81,242,5,27,48,
+32,62,6,1,0,66,191,255,4,152,35,54,28,0,2,58,
+191,255,30,234,35,54,36,0,2,58,191,255,64,234,28,80,
+213,125,35,79,21,0,35,63,17,0,35,71,25,0,28,48,
+191,255,230,246,99,87,36,0,10,16,226,0,224,17,194,53,
+35,55,25,0,2,224,129,255,230,182,35,55,21,0,129,255,
+222,182,35,55,17,0,129,255,214,182,35,55,13,0,129,255,
+206,182,35,54,8,0,2,58,191,255,132,233,131,135,3,0,
+224,129,226,13,67,7,2,0,29,48,191,255,94,167,224,81,
+242,5,27,48,32,62,6,1,0,66,191,255,128,151,35,54,
+28,0,2,58,191,255,154,233,35,54,36,0,2,58,191,255,
+188,233,28,80,181,61,35,127,17,0,24,48,47,62,48,0,
+128,255,30,18,35,55,25,0,35,231,36,0,129,255,112,182,
+35,55,21,0,129,255,104,182,35,55,17,0,129,255,96,182,
+35,55,13,0,129,255,88,182,35,54,8,0,2,58,191,255,
+14,233,131,119,3,0,224,113,226,13,67,7,2,0,29,48,
+191,255,232,166,224,81,242,5,27,48,32,62,6,1,0,66,
+191,255,10,151,35,54,28,0,2,58,191,255,36,233,35,54,
+36,0,2,58,191,255,70,233,28,80,88,6,255,243,146,7,
+225,112,60,6,132,215,255,255,99,7,24,0,7,200,64,22,
+133,0,34,62,244,160,99,63,29,0,6,232,99,239,33,0,
+99,239,17,0,99,63,21,0,29,64,36,79,45,175,38,6,
+208,160,132,0,129,255,184,187,1,138,67,143,3,0,28,48,
+31,58,128,255,68,17,224,81,186,253,0,18,29,6,240,255,
+129,13,253,118,40,0,32,102,160,180,204,113,46,23,17,0,
+58,6,152,157,132,0,2,216,224,217,186,37,32,238,10,1,
+99,239,24,0,163,87,3,0,224,81,226,13,67,7,3,0,
+28,48,191,255,54,166,224,81,242,5,26,48,32,62,6,1,
+0,66,191,255,88,150,35,54,16,0,2,58,191,255,114,232,
+35,54,24,0,2,58,191,255,148,232,29,80,128,7,86,1,
+27,48,35,62,4,0,191,255,116,243,25,232,35,143,5,0,
+74,233,224,137,154,37,35,239,24,0,163,135,3,0,224,129,
+226,13,67,7,3,0,28,48,191,255,224,165,224,81,242,5,
+26,48,32,62,6,1,0,66,191,255,2,150,35,54,16,0,
+2,58,191,255,28,232,35,54,24,0,2,58,191,255,62,232,
+29,80,128,7,0,1,29,56,35,54,8,0,191,255,118,231,
+32,54,0,6,129,255,24,181,99,87,13,0,224,81,154,13,
+38,6,4,161,132,0,32,62,26,9,0,66,191,255,190,149,
+29,48,191,255,212,243,35,55,13,0,27,56,10,64,128,255,
+34,10,163,119,3,0,224,113,226,13,67,7,3,0,28,48,
+191,255,104,165,224,81,242,5,26,48,32,62,6,1,0,66,
+191,255,138,149,0,202,29,216,165,29,219,110,1,0,210,21,
+249,54,96,2,35,71,13,0,42,6,44,4,141,0,40,143,
+5,0,202,49,102,143,77,0,8,58,191,255,96,241,99,87,
+24,0,234,0,224,81,218,5,65,202,129,218,224,217,234,229,
+35,127,24,0,224,121,250,5,29,48,8,58,191,255,242,244,
+99,87,24,0,35,55,13,0,35,239,24,0,129,255,80,180,
+35,54,8,0,2,58,191,255,6,231,163,119,3,0,224,113,
+226,13,67,7,3,0,28,48,191,255,224,164,224,81,242,5,
+26,48,32,62,6,1,0,66,191,255,2,149,35,54,16,0,
+2,58,191,255,28,231,35,54,24,0,2,58,191,255,62,231,
+29,80,82,6,255,112,146,7,225,112,59,6,132,215,255,255,
+99,7,24,0,64,22,133,0,34,62,16,161,99,63,29,0,
+6,232,99,239,33,0,99,239,17,0,99,63,21,0,29,64,
+36,79,45,175,38,6,32,161,132,0,129,255,178,185,1,138,
+67,143,3,0,27,48,31,58,128,255,62,15,224,81,186,253,
+0,18,29,6,240,255,129,13,253,118,40,0,32,102,160,180,
+204,113,46,23,17,0,57,6,152,157,132,0,2,48,224,49,
+186,37,32,238,10,1,99,239,24,0,163,87,3,0,224,81,
+226,13,67,7,3,0,27,48,191,255,48,164,224,81,242,5,
+25,48,32,62,6,1,0,66,191,255,82,148,35,54,16,0,
+2,58,191,255,108,230,35,54,24,0,2,58,191,255,142,230,
+29,80,128,7,38,1,35,62,4,0,191,255,112,241,35,143,
+5,0,10,224,224,137,138,37,35,239,24,0,163,135,3,0,
+224,129,226,13,67,7,3,0,27,48,191,255,222,163,224,81,
+242,5,25,48,32,62,6,1,0,66,191,255,0,148,35,54,
+16,0,2,58,191,255,26,230,35,54,24,0,2,58,191,255,
+60,230,29,80,165,109,28,56,35,54,8,0,191,255,118,229,
+32,54,0,2,129,255,24,179,99,87,13,0,224,81,154,13,
+38,6,68,161,132,0,32,62,96,9,0,66,191,255,190,147,
+28,48,191,255,12,242,29,48,35,63,13,0,10,64,128,255,
+218,7,0,210,28,232,229,21,221,118,1,0,146,21,250,54,
+96,2,42,6,44,4,141,0,202,49,35,71,13,0,4,58,
+191,255,138,239,99,87,24,0,234,0,224,81,218,5,65,210,
+161,234,224,233,170,237,35,135,24,0,224,129,250,5,28,48,
+4,58,191,255,28,243,99,87,24,0,35,55,13,0,35,239,
+24,0,129,255,122,178,35,54,8,0,2,58,191,255,48,229,
+163,127,3,0,224,121,226,13,67,7,3,0,27,48,191,255,
+10,163,224,81,242,5,25,48,32,62,6,1,0,66,191,255,
+44,147,35,54,16,0,2,58,191,255,70,229,35,54,24,0,
+2,58,191,255,104,229,29,80,82,6,255,112,0,18,0,82,
+245,13,198,142,1,0,162,13,234,126,96,2,45,6,44,4,
+141,0,205,121,15,23,119,0,213,5,65,82,129,50,224,49,
+154,245,2,6,180,255,226,5,2,6,178,255,178,5,32,22,
+78,0,2,80,127,0,128,7,225,0,6,232,29,143,0,0,
+7,224,224,137,146,13,38,6,80,161,132,0,32,62,181,9,
+0,66,191,255,184,146,28,48,191,255,62,241,10,48,191,255,
+158,255,29,55,3,0,10,224,128,255,200,75,10,16,28,6,
+180,255,234,5,2,126,0,248,32,118,0,4,197,5,2,126,
+0,184,0,112,125,119,9,0,125,127,13,0,64,6,255,0,
+128,7,225,48,6,232,191,255,124,239,29,23,92,2,97,18,
+242,13,99,18,145,37,226,5,101,18,147,29,105,18,131,13,
+181,29,61,231,61,0,0,210,92,226,4,218,165,29,29,143,
+119,0,17,6,180,255,226,5,29,48,191,255,94,239,0,226,
+197,37,4,210,61,231,61,0,8,218,181,13,4,210,61,231,
+61,0,8,218,229,5,29,48,191,255,64,239,0,226,213,21,
+61,63,49,0,27,64,38,6,92,161,132,0,129,255,16,183,
+29,48,26,56,28,64,27,72,128,255,22,0,10,224,93,7,
+92,2,29,48,191,255,20,239,28,80,64,6,255,48,152,7,
+225,112,6,232,7,208,8,200,9,224,104,226,147,13,38,6,
+140,161,132,0,32,62,30,10,0,66,191,255,208,145,29,48,
+128,255,0,7,10,16,224,17,178,5,2,224,197,117,61,119,
+49,0,1,218,238,223,192,0,191,255,216,152,106,7,9,0,
+45,6,248,65,1,0,106,111,5,0,44,6,44,138,141,0,
+106,103,29,0,32,94,244,1,106,223,33,0,28,120,106,95,
+21,0,125,87,89,0,202,55,2,0,202,31,3,0,99,7,
+1,0,99,7,5,0,201,122,61,87,57,0,61,55,89,0,
+99,127,17,0,99,87,9,0,99,87,13,0,2,58,191,255,
+74,226,99,7,36,0,99,31,25,0,99,231,38,0,61,103,
+89,0,2,90,99,215,29,0,99,103,21,0,99,7,33,0,
+11,98,99,103,45,0,99,95,42,0,61,55,49,0,9,58,
+35,70,20,0,191,255,60,152,61,87,89,0,99,7,36,0,
+99,87,21,0,99,31,25,0,99,231,38,0,2,122,99,207,
+29,0,99,7,33,0,11,130,99,135,45,0,99,127,42,0,
+61,55,49,0,9,58,35,70,20,0,191,255,6,152,61,55,
+89,0,128,255,156,11,61,55,89,0,102,7,0,0,10,224,
+191,255,24,152,28,80,88,6,255,112,128,7,225,0,6,232,
+191,255,210,237,93,7,92,2,29,48,128,255,246,5,10,224,
+224,225,210,5,29,48,191,255,210,237,213,61,61,127,49,0,
+1,226,239,231,192,0,191,255,202,151,106,7,9,0,46,6,
+248,65,1,0,106,119,5,0,45,6,44,138,141,0,106,111,
+29,0,32,102,244,1,106,231,33,0,29,48,125,87,89,0,
+106,103,21,0,10,56,15,66,191,255,170,236,61,55,89,0,
+10,56,191,255,86,225,61,55,89,0,128,255,20,11,61,55,
+89,0,102,7,0,0,10,224,191,255,144,151,61,63,49,0,
+29,71,119,0,38,6,152,161,132,0,129,255,66,181,29,48,
+191,255,88,237,28,80,64,6,255,0,128,7,33,0,38,55,
+49,0,128,255,78,73,10,86,4,216,64,6,63,0,128,7,
+33,0,224,49,202,5,32,86,10,1,229,5,191,255,190,238,
+10,48,128,255,8,0,64,6,63,0,138,7,225,243,60,6,
+252,161,132,0,31,218,99,223,13,0,61,6,204,161,132,0,
+99,239,17,0,29,56,31,66,6,176,36,79,45,175,38,6,
+216,161,132,0,129,255,216,180,99,7,0,0,99,239,5,0,
+99,223,9,0,32,54,0,6,129,255,4,175,10,232,32,54,
+0,2,129,255,250,174,10,200,32,54,0,6,129,255,240,174,
+10,216,224,233,250,5,28,48,32,62,197,10,0,66,191,255,
+156,143,224,201,250,5,28,48,32,62,198,10,0,66,191,255,
+140,143,224,217,138,13,28,48,32,62,199,10,0,66,191,255,
+124,143,224,81,0,210,22,192,128,7,146,1,216,134,1,0,
+186,5,128,7,132,1,250,230,96,2,45,6,44,4,141,0,
+205,225,28,48,191,255,220,252,99,87,0,0,234,0,224,81,
+178,5,128,7,112,1,28,48,0,58,128,255,82,3,28,48,
+32,62,78,0,128,255,122,2,28,48,60,70,92,0,1,58,
+191,255,42,235,99,87,0,0,234,0,224,81,178,5,128,7,
+68,1,29,48,0,58,32,70,0,6,191,255,248,138,61,190,
+48,0,61,62,56,0,26,48,128,255,244,75,36,143,45,175,
+55,126,8,0,218,137,119,143,5,0,175,81,119,87,1,0,
+61,54,24,3,61,62,48,0,32,70,88,1,191,255,104,137,
+32,118,1,32,125,119,8,0,1,106,125,111,5,0,32,102,
+21,0,125,103,10,0,32,94,88,1,125,95,12,0,32,86,
+144,1,125,87,14,0,29,48,29,62,0,6,128,255,190,3,
+125,87,1,0,28,48,29,64,2,58,191,255,160,234,99,87,
+0,0,234,0,224,81,234,93,61,127,5,0,25,56,124,127,
+73,0,31,50,1,66,128,255,178,2,28,48,25,64,4,58,
+191,255,122,234,99,87,0,0,234,0,224,81,186,77,57,111,
+5,0,27,48,124,111,81,0,0,58,32,70,0,6,191,255,
+68,138,1,98,123,103,52,1,32,94,253,15,123,95,48,1,
+32,86,20,0,123,87,54,1,32,142,1,48,123,143,50,1,
+123,103,5,0,12,122,59,190,56,1,87,127,1,0,32,118,
+31,0,87,119,5,0,87,215,3,0,26,48,128,255,68,71,
+10,22,0,184,119,23,13,0,27,48,191,255,68,223,28,48,
+27,64,8,58,191,255,6,234,99,87,0,0,234,0,224,81,
+154,21,59,103,5,0,1,90,124,103,77,0,92,95,92,2,
+28,48,191,255,0,231,65,210,161,194,224,193,178,5,191,7,
+110,254,35,87,0,0,224,81,250,5,22,48,15,58,191,255,
+128,237,99,87,0,0,29,48,129,255,228,172,25,48,129,255,
+222,172,27,48,129,255,216,172,35,239,0,0,3,48,2,58,
+191,255,250,223,35,54,12,0,2,58,191,255,196,223,29,80,
+74,6,255,243,134,7,225,48,6,208,7,224,28,48,0,58,
+32,70,88,1,191,255,110,137,224,209,186,5,0,82,229,93,
+1,138,67,143,3,0,38,6,132,215,255,255,31,58,128,255,
+8,8,224,81,154,253,60,238,8,0,0,218,245,29,58,23,
+105,0,27,64,2,22,136,0,34,87,0,0,35,54,8,0,
+218,81,10,56,34,135,5,0,63,6,196,120,128,0,112,0,
+35,127,9,0,99,127,5,0,195,199,4,0,226,5,27,48,
+29,56,128,255,26,74,10,232,65,218,4,119,217,131,238,217,
+246,221,36,111,45,175,60,94,8,0,124,111,5,0,171,233,
+124,239,1,0,29,6,176,254,150,13,38,6,8,162,132,0,
+32,62,61,11,0,66,191,255,244,140,60,239,1,0,163,143,
+3,0,224,137,162,21,67,7,3,0,38,6,132,215,255,255,
+191,255,168,156,224,81,146,13,38,6,152,157,132,0,32,62,
+6,1,0,66,191,255,198,140,29,80,70,6,255,48,128,7,
+225,0,7,224,188,0,6,232,61,54,92,0,0,58,32,70,
+0,2,191,255,144,136,29,48,191,255,114,252,125,87,65,0,
+224,225,178,85,61,86,100,0,34,6,20,162,132,0,2,94,
+9,0,2,103,0,0,74,103,0,0,65,18,65,82,226,89,
+154,253,1,130,125,135,113,0,61,119,53,0,128,126,2,144,
+125,127,116,0,93,119,118,0,32,110,40,0,93,111,120,0,
+8,74,93,79,121,0,28,6,180,255,202,13,4,90,32,86,
+76,0,93,87,119,0,125,95,65,0,42,6,200,103,133,0,
+197,29,32,134,78,0,93,135,119,0,42,6,152,103,133,0,
+197,21,9,16,230,23,64,2,61,142,122,0,194,137,202,17,
+34,135,0,0,113,135,0,0,34,127,2,0,113,127,2,0,
+34,119,4,0,113,119,4,0,9,104,95,74,224,105,170,237,
+61,54,92,0,191,255,64,221,64,6,255,0,128,7,33,0,
+7,136,177,0,102,143,53,0,70,63,118,0,38,54,92,0,
+191,255,36,221,64,6,63,0,128,7,225,16,6,224,7,232,
+8,216,29,48,0,58,32,70,0,2,191,255,168,135,28,6,
+240,255,129,13,28,48,61,62,12,0,32,70,244,1,128,255,
+214,209,32,134,3,64,125,135,8,0,125,223,5,0,29,48,
+29,62,0,2,128,255,166,0,125,87,1,0,64,6,255,16,
+128,7,225,16,6,232,7,224,0,58,8,216,32,70,0,6,
+191,255,98,135,60,23,105,0,61,62,56,1,2,22,184,0,
+34,87,0,0,34,143,5,0,220,81,10,48,63,6,168,122,
+128,0,113,0,60,23,105,0,63,6,196,122,128,0,2,22,
+176,0,34,87,0,0,34,135,5,0,220,81,10,48,112,0,
+125,87,52,1,234,0,10,6,205,255,151,13,38,6,32,162,
+132,0,32,62,224,11,0,66,191,255,34,139,28,48,128,255,
+192,5,10,48,128,255,226,5,125,87,48,1,32,118,20,0,
+125,119,54,1,32,110,1,48,125,111,50,1,125,223,5,0,
+29,48,191,255,44,220,64,6,255,16,0,114,0,122,6,22,
+4,0,68,18,34,87,253,255,15,72,206,81,10,112,225,111,
+0,0,13,120,201,121,231,17,209,245,15,80,206,81,127,0,
+152,7,225,0,6,232,61,23,57,0,32,134,0,16,99,23,
+41,0,99,23,37,0,99,135,45,0,61,119,49,0,1,226,
+238,231,192,0,191,255,204,145,106,7,9,0,45,6,248,65,
+1,0,106,111,5,0,44,6,44,138,141,0,106,103,29,0,
+10,48,106,231,33,0,32,94,232,3,125,87,89,0,106,95,
+21,0,1,58,191,255,100,219,61,23,89,0,99,7,16,0,
+99,23,1,0,35,86,28,0,99,87,5,0,99,7,9,0,
+99,7,13,0,8,130,99,135,18,0,32,126,17,0,99,127,
+25,0,99,7,22,0,12,50,12,58,3,64,191,255,84,145,
+61,55,89,0,125,7,84,0,128,255,230,4,61,55,89,0,
+102,7,0,0,10,224,191,255,98,145,28,80,88,6,255,0,
+132,7,225,112,6,232,0,18,29,6,240,255,129,13,253,126,
+40,0,32,110,160,180,205,121,47,23,17,0,2,48,224,49,
+202,5,32,86,10,1,245,101,3,56,191,255,48,231,35,103,
+1,0,10,216,224,97,186,5,0,82,213,93,32,54,0,2,
+129,255,28,169,99,87,5,0,224,81,154,13,38,6,104,162,
+132,0,32,62,222,12,0,66,191,255,194,137,0,202,31,210,
+0,226,165,29,219,86,1,0,210,21,252,54,96,2,46,6,
+44,4,141,0,35,63,5,0,206,49,191,255,214,228,224,81,
+154,13,35,23,5,0,34,23,5,0,249,17,183,5,2,200,
+28,208,65,226,161,218,224,217,234,229,127,210,218,13,29,56,
+38,6,44,162,132,0,129,255,118,174,35,55,5,0,129,255,
+142,168,0,82,133,37,250,54,96,2,48,6,44,4,141,0,
+35,63,5,0,208,49,191,255,138,228,10,224,224,225,242,5,
+35,55,5,0,129,255,104,168,28,80,213,13,35,119,5,0,
+29,48,46,62,12,0,128,255,62,207,35,55,5,0,129,255,
+78,168,0,82,68,6,255,112,132,7,225,48,6,208,0,18,
+7,6,240,255,129,13,231,126,40,0,32,110,160,180,205,121,
+47,23,17,0,2,48,224,49,186,5,0,82,181,61,3,56,
+191,255,58,230,35,103,1,0,10,224,224,97,186,5,0,82,
+149,53,28,56,35,54,4,0,191,255,122,218,0,218,0,234,
+149,37,220,94,1,0,194,29,253,54,96,2,48,6,44,4,
+141,0,208,49,134,127,69,0,224,121,162,21,230,23,85,0,
+111,18,146,13,29,56,2,64,38,6,116,162,132,0,129,255,
+174,173,229,5,26,56,15,66,191,255,218,228,202,217,65,234,
+161,226,224,225,250,221,35,54,4,0,2,58,191,255,112,218,
+27,80,68,6,255,48,128,7,33,0,191,255,156,243,64,6,
+63,0,130,7,33,0,0,18,6,6,240,255,129,13,230,126,
+40,0,32,110,160,180,205,121,47,23,17,0,2,48,224,49,
+186,5,0,82,181,13,3,56,191,255,146,229,35,95,1,0,
+224,89,234,103,0,0,12,80,138,0,66,6,63,0,130,7,
 33,0,0,18,6,6,240,255,129,13,230,126,40,0,32,110,
 160,180,205,121,47,23,17,0,2,48,224,49,186,5,0,82,
-181,13,3,56,191,255,146,229,35,95,1,0,224,89,234,103,
-0,0,12,80,138,0,66,6,63,0,130,7,33,0,0,18,
-6,6,240,255,129,13,230,126,40,0,32,110,160,180,205,121,
-47,23,17,0,2,48,224,49,186,5,0,82,213,13,3,56,
-191,255,86,229,10,48,191,255,2,245,10,6,178,255,226,23,
-0,0,2,80,138,0,66,6,63,0,128,7,225,0,15,138,
-61,6,16,92,133,0,125,143,0,0,128,230,238,238,61,22,
-6,0,224,17,250,5,2,50,129,255,100,161,10,16,224,17,
-194,5,1,130,98,135,0,0,61,22,12,0,224,17,250,5,
-2,50,129,255,74,161,10,16,224,17,194,5,2,122,98,127,
-0,0,61,22,18,0,224,17,250,5,2,50,129,255,48,161,
-10,16,224,17,194,5,4,114,98,119,0,0,61,22,24,0,
-224,17,250,5,2,50,129,255,22,161,10,16,224,17,194,5,
-8,106,98,111,0,0,61,22,30,0,224,17,250,5,2,50,
-129,255,252,160,10,16,224,17,178,5,98,231,0,0,61,22,
-36,0,224,17,250,5,2,50,129,255,228,160,10,16,224,17,
-178,5,98,231,0,0,61,22,42,0,224,17,250,5,2,50,
-129,255,204,160,10,16,224,17,210,5,128,94,255,255,98,95,
-0,0,15,82,61,6,64,92,133,0,125,87,0,0,61,22,
-6,0,224,17,250,5,2,50,129,255,164,160,10,16,224,17,
-194,5,1,138,98,143,0,0,61,22,12,0,224,17,250,5,
-2,50,129,255,138,160,10,16,224,17,194,5,2,130,98,135,
-0,0,61,22,18,0,224,17,250,5,2,50,129,255,112,160,
-10,16,224,17,194,5,4,122,98,127,0,0,61,22,24,0,
-224,17,250,5,2,50,129,255,86,160,10,16,224,17,194,5,
-8,114,98,119,0,0,61,22,30,0,224,17,250,5,2,50,
-129,255,60,160,10,16,224,17,178,5,98,231,0,0,61,22,
-36,0,224,17,250,5,2,50,129,255,36,160,10,16,224,17,
-178,5,98,231,0,0,61,22,42,0,224,17,250,5,2,50,
-129,255,12,160,10,16,224,17,210,5,128,102,255,255,98,103,
-0,0,41,6,20,84,128,0,38,6,204,248,140,0,32,62,
-16,0,32,70,96,2,129,255,204,161,38,6,4,92,133,0,
-129,255,122,164,64,6,255,0,132,7,33,0,41,6,16,125,
-128,0,99,7,1,0,99,7,5,0,38,6,204,248,140,0,
-32,62,16,0,32,70,96,2,129,255,242,162,68,6,63,0,
-6,88,128,7,33,0,224,49,250,5,6,50,129,255,160,159,
-10,48,224,49,178,5,102,7,0,0,6,80,64,6,63,0,
-128,7,33,0,224,49,210,5,129,58,185,5,129,255,96,159,
-64,6,63,0,128,7,128,7,33,6,150,62,1,0,97,0,
-33,6,226,197,1,0,97,0,33,6,146,142,1,0,97,0,
-33,6,140,68,1,0,97,0,33,6,98,63,1,0,97,0,
-33,6,2,147,1,0,97,0,33,6,96,142,1,0,97,0,
-33,6,60,168,1,0,97,0,128,7,225,16,6,216,7,224,
-224,217,146,61,60,87,1,0,10,16,65,18,2,143,255,255,
-224,137,202,253,2,134,255,255,170,129,210,45,0,234,253,118,
-12,0,44,6,112,161,132,0,204,113,60,63,1,0,46,55,
-1,0,129,255,244,195,224,81,154,21,27,48,28,56,29,16,
-226,22,12,0,42,6,112,161,132,0,202,17,34,95,9,0,
-63,6,200,125,128,0,107,0,229,13,65,234,29,6,235,255,
-246,221,38,6,168,156,132,0,129,255,132,164,27,48,28,56,
-128,255,98,4,64,6,255,16,132,7,33,0,9,138,99,143,
-1,0,1,130,99,135,5,0,38,6,220,156,132,0,39,6,
-24,157,132,0,32,70,24,0,32,78,23,0,129,255,80,164,
-39,6,224,70,133,0,38,6,44,157,132,0,129,255,64,164,
-68,6,63,0,130,7,225,48,6,208,7,216,97,210,147,93,
-0,226,252,238,12,0,47,6,108,162,132,0,207,233,61,63,
-1,0,59,55,5,0,129,255,80,195,224,81,138,69,98,210,
-218,29,99,7,1,0,61,55,9,0,3,56,4,66,128,255,
-90,194,10,16,224,17,242,5,2,56,38,6,168,157,132,0,
-129,255,236,163,35,71,1,0,61,63,1,0,8,72,38,6,
-60,157,132,0,129,255,216,163,133,77,59,55,9,0,3,64,
-37,62,88,129,129,255,110,176,97,82,146,13,59,63,5,0,
-38,6,116,157,132,0,129,255,182,163,245,53,61,55,9,0,
-3,56,4,66,128,255,158,194,10,16,224,17,226,45,2,56,
-38,6,168,157,132,0,129,255,150,163,245,37,65,226,100,226,
-150,181,59,63,5,0,38,6,200,157,132,0,129,255,128,163,
-38,6,76,157,132,0,129,255,118,163,0,234,253,142,12,0,
-48,6,108,162,132,0,208,137,49,71,9,0,49,63,1,0,
-40,71,5,0,49,79,5,0,38,6,224,157,132,0,129,255,
-78,163,65,234,100,234,182,237,66,6,255,48,136,7,225,16,
-6,216,7,224,60,55,5,0,37,62,91,129,35,70,4,0,
-129,255,210,175,10,232,60,55,9,0,37,62,91,129,35,70,
-8,0,129,255,192,175,202,233,98,234,242,5,38,6,68,158,
-132,0,129,255,10,163,181,77,35,54,12,0,0,58,4,66,
-191,255,134,130,99,218,154,37,35,55,5,0,35,63,9,0,
-35,70,12,0,4,74,128,255,120,193,10,232,224,233,242,5,
-29,56,38,6,156,158,132,0,129,255,212,162,35,63,5,0,
-35,79,13,0,35,71,9,0,99,79,1,0,38,6,40,158,
-132,0,129,255,186,162,181,29,60,55,13,0,35,70,12,0,
-37,62,91,129,129,255,78,175,97,82,242,5,38,6,248,157,
-132,0,129,255,154,162,181,21,35,55,5,0,35,63,9,0,
-35,70,12,0,4,74,128,255,226,193,10,232,224,233,242,5,
-29,56,38,6,120,158,132,0,129,255,116,162,72,6,255,16,
-128,7,225,0,229,87,64,0,224,7,96,1,36,239,206,131,
+213,13,3,56,191,255,86,229,10,48,191,255,2,245,10,6,
+178,255,226,23,0,0,2,80,138,0,66,6,63,0,128,7,
+225,0,15,138,61,6,152,103,133,0,125,143,0,0,128,230,
+238,238,61,22,6,0,224,17,250,5,2,50,129,255,32,167,
+10,16,224,17,194,5,1,130,98,135,0,0,61,22,12,0,
+224,17,250,5,2,50,129,255,6,167,10,16,224,17,194,5,
+2,122,98,127,0,0,61,22,18,0,224,17,250,5,2,50,
+129,255,236,166,10,16,224,17,194,5,4,114,98,119,0,0,
+61,22,24,0,224,17,250,5,2,50,129,255,210,166,10,16,
+224,17,194,5,8,106,98,111,0,0,61,22,30,0,224,17,
+250,5,2,50,129,255,184,166,10,16,224,17,178,5,98,231,
+0,0,61,22,36,0,224,17,250,5,2,50,129,255,160,166,
+10,16,224,17,178,5,98,231,0,0,61,22,42,0,224,17,
+250,5,2,50,129,255,136,166,10,16,224,17,210,5,128,94,
+255,255,98,95,0,0,15,82,61,6,200,103,133,0,125,87,
+0,0,61,22,6,0,224,17,250,5,2,50,129,255,96,166,
+10,16,224,17,194,5,1,138,98,143,0,0,61,22,12,0,
+224,17,250,5,2,50,129,255,70,166,10,16,224,17,194,5,
+2,130,98,135,0,0,61,22,18,0,224,17,250,5,2,50,
+129,255,44,166,10,16,224,17,194,5,4,122,98,127,0,0,
+61,22,24,0,224,17,250,5,2,50,129,255,18,166,10,16,
+224,17,194,5,8,114,98,119,0,0,61,22,30,0,224,17,
+250,5,2,50,129,255,248,165,10,16,224,17,178,5,98,231,
+0,0,61,22,36,0,224,17,250,5,2,50,129,255,224,165,
+10,16,224,17,178,5,98,231,0,0,61,22,42,0,224,17,
+250,5,2,50,129,255,200,165,10,16,224,17,210,5,128,102,
+255,255,98,103,0,0,41,6,252,86,128,0,38,6,44,4,
+141,0,32,62,16,0,32,70,96,2,129,255,136,167,38,6,
+140,103,133,0,129,255,54,170,64,6,255,0,132,7,33,0,
+41,6,248,127,128,0,99,7,1,0,99,7,5,0,38,6,
+44,4,141,0,32,62,16,0,32,70,96,2,129,255,174,168,
+68,6,63,0,6,88,128,7,33,0,224,49,250,5,6,50,
+129,255,92,165,10,48,224,49,178,5,102,7,0,0,6,80,
+64,6,63,0,128,7,33,0,224,49,210,5,129,58,185,5,
+129,255,28,165,64,6,63,0,6,80,165,5,2,80,42,23,
+13,0,224,17,202,253,127,0,128,7,38,135,1,0,39,103,
+9,0,240,57,218,21,12,16,102,23,1,0,224,17,194,13,
+98,7,5,0,38,23,1,0,165,5,10,16,34,87,13,0,
+224,81,202,253,197,29,102,7,9,0,0,16,133,29,39,111,
+5,0,109,103,13,0,39,23,9,0,39,87,5,0,224,17,
+210,13,98,87,5,0,39,87,9,0,165,5,2,80,42,23,
+13,0,224,17,202,253,10,16,165,5,10,16,102,23,5,0,
+39,87,1,0,127,0,33,6,250,110,1,0,97,0,33,6,
+106,64,1,0,97,0,33,6,48,200,1,0,97,0,33,6,
+188,144,1,0,97,0,33,6,96,70,1,0,97,0,33,6,
+54,65,1,0,97,0,33,6,44,149,1,0,97,0,33,6,
+138,144,1,0,97,0,33,6,102,170,1,0,97,0,33,6,
+150,2,1,0,97,0,128,7,225,16,6,216,7,224,224,217,
+146,61,60,87,1,0,10,16,65,18,2,143,255,255,224,137,
+202,253,2,134,255,255,170,129,210,45,0,234,253,118,12,0,
+44,6,164,172,132,0,204,113,60,63,1,0,46,55,1,0,
+129,255,38,201,224,81,154,21,27,48,28,56,29,16,226,22,
+12,0,42,6,164,172,132,0,202,17,34,95,9,0,63,6,
+58,129,128,0,107,0,229,13,65,234,29,6,234,255,246,221,
+38,6,208,167,132,0,129,255,182,169,27,48,28,56,128,255,
+98,4,64,6,255,16,132,7,33,0,13,138,99,143,1,0,
+1,130,99,135,5,0,38,6,4,168,132,0,39,6,64,168,
+132,0,32,70,24,0,32,78,23,0,129,255,130,169,39,6,
+104,82,133,0,38,6,84,168,132,0,129,255,114,169,68,6,
+63,0,130,7,225,48,6,208,7,216,97,210,147,93,0,226,
+252,238,12,0,47,6,172,173,132,0,207,233,61,63,1,0,
+59,55,5,0,129,255,130,200,224,81,138,69,98,210,218,29,
+99,7,1,0,61,55,9,0,3,56,4,66,128,255,244,196,
+10,16,224,17,242,5,2,56,38,6,208,168,132,0,129,255,
+30,169,35,71,1,0,61,63,1,0,8,72,38,6,100,168,
+132,0,129,255,10,169,133,77,59,55,9,0,3,64,37,62,
+96,129,129,255,160,181,97,82,146,13,59,63,5,0,38,6,
+156,168,132,0,129,255,232,168,245,53,61,55,9,0,3,56,
+4,66,128,255,56,197,10,16,224,17,226,45,2,56,38,6,
+208,168,132,0,129,255,200,168,245,37,65,226,100,226,150,181,
+59,63,5,0,38,6,240,168,132,0,129,255,178,168,38,6,
+116,168,132,0,129,255,168,168,0,234,253,142,12,0,48,6,
+172,173,132,0,208,137,49,71,9,0,49,63,1,0,40,71,
+5,0,49,79,5,0,38,6,8,169,132,0,129,255,128,168,
+65,234,100,234,182,237,66,6,255,48,136,7,225,16,6,216,
+7,224,60,55,5,0,37,62,99,129,35,70,4,0,129,255,
+4,181,10,232,60,55,9,0,37,62,99,129,35,70,8,0,
+129,255,242,180,202,233,98,234,242,5,38,6,108,169,132,0,
+129,255,60,168,181,77,35,54,12,0,0,58,4,66,191,255,
+20,127,99,218,154,37,35,55,5,0,35,63,9,0,35,70,
+12,0,4,74,128,255,18,196,10,232,224,233,242,5,29,56,
+38,6,196,169,132,0,129,255,6,168,35,63,5,0,35,79,
+13,0,35,71,9,0,99,79,1,0,38,6,80,169,132,0,
+129,255,236,167,181,29,60,55,13,0,35,70,12,0,37,62,
+99,129,129,255,128,180,97,82,242,5,38,6,32,169,132,0,
+129,255,204,167,181,21,35,55,5,0,35,63,9,0,35,70,
+12,0,4,74,128,255,124,196,10,232,224,233,242,5,29,56,
+38,6,160,169,132,0,129,255,166,167,72,6,255,16,128,7,
+225,0,229,87,64,0,224,7,96,1,36,239,218,131,229,87,
+64,0,224,7,96,1,10,248,64,86,0,0,10,87,116,241,
+138,230,64,0,64,86,0,0,74,231,116,241,255,47,32,0,
 229,87,64,0,224,7,96,1,10,248,64,86,0,0,10,87,
-116,241,138,230,64,0,64,86,0,0,74,231,116,241,255,47,
+118,241,138,230,64,0,64,86,0,0,74,231,118,241,255,47,
 32,0,229,87,64,0,224,7,96,1,10,248,64,86,0,0,
-10,87,118,241,138,230,64,0,64,86,0,0,74,231,118,241,
-255,47,32,0,229,87,64,0,224,7,96,1,10,248,64,86,
-0,0,10,87,36,241,138,230,64,0,64,86,0,0,74,231,
-36,241,255,47,32,0,100,234,215,37,229,87,64,0,224,7,
-96,1,10,248,64,86,0,0,10,87,38,241,138,230,64,0,
-64,86,0,0,74,231,38,241,255,47,32,0,104,234,167,21,
+10,87,36,241,138,230,64,0,64,86,0,0,74,231,36,241,
+255,47,32,0,100,234,215,37,229,87,64,0,224,7,96,1,
+10,248,64,86,0,0,10,87,38,241,138,230,64,0,64,86,
+0,0,74,231,38,241,255,47,32,0,104,234,167,21,229,87,
+64,0,224,7,96,1,10,248,64,86,0,0,10,87,40,241,
+138,230,64,0,64,86,0,0,74,231,40,241,255,47,32,0,
 229,87,64,0,224,7,96,1,10,248,64,86,0,0,10,87,
-40,241,138,230,64,0,64,86,0,0,74,231,40,241,255,47,
+34,241,138,230,64,0,64,86,0,0,74,231,34,241,255,47,
 32,0,229,87,64,0,224,7,96,1,10,248,64,86,0,0,
-10,87,34,241,138,230,64,0,64,86,0,0,74,231,34,241,
-255,47,32,0,229,87,64,0,224,7,96,1,10,248,64,86,
-0,0,10,87,32,241,138,230,64,0,64,86,0,0,74,231,
-32,241,255,47,32,0,3,138,68,143,224,133,129,255,214,70,
-129,255,24,65,129,255,86,71,229,87,64,0,224,7,96,1,
-10,224,64,86,0,0,10,87,116,241,10,248,32,86,191,255,
-74,249,64,86,0,0,74,255,116,241,252,47,32,0,229,87,
-64,0,224,7,96,1,10,224,64,86,0,0,10,87,118,241,
-10,248,32,86,191,255,74,249,64,86,0,0,74,255,118,241,
-252,47,32,0,229,87,64,0,224,7,96,1,10,224,64,86,
-0,0,10,87,36,241,10,248,32,86,191,255,74,249,64,86,
-0,0,74,255,36,241,252,47,32,0,100,234,151,45,229,87,
-64,0,224,7,96,1,10,224,64,86,0,0,10,87,38,241,
-10,248,32,86,191,255,74,249,64,86,0,0,74,255,38,241,
-252,47,32,0,104,234,199,21,229,87,64,0,224,7,96,1,
-10,232,64,86,0,0,10,87,40,241,10,248,32,86,191,255,
-74,249,64,86,0,0,74,255,40,241,253,47,32,0,229,87,
-64,0,224,7,96,1,10,232,64,86,0,0,10,87,34,241,
-10,248,32,86,191,255,74,249,64,86,0,0,74,255,34,241,
-253,47,32,0,229,87,64,0,224,7,96,1,10,232,64,86,
-0,0,10,87,32,241,10,248,32,86,191,255,74,249,64,86,
-0,0,74,255,32,241,253,47,32,0,64,6,255,0,128,7,
-33,0,128,255,226,3,64,6,63,0,128,7,33,0,128,54,
-255,255,129,255,130,31,64,6,63,0,1,138,100,143,241,133,
-127,0,128,7,97,0,0,234,253,134,12,0,47,6,112,161,
-132,0,207,129,48,63,1,0,48,71,5,0,38,6,188,158,
-132,0,129,255,250,159,65,234,29,6,235,255,230,237,64,6,
-127,0,144,7,225,0,7,232,98,50,249,5,38,6,252,158,
-132,0,129,255,218,159,213,117,61,55,5,0,39,6,12,159,
-132,0,129,255,4,191,224,81,218,5,39,6,238,238,34,34,
-149,77,61,55,5,0,39,6,24,159,132,0,129,255,234,190,
-224,81,218,5,39,6,221,221,51,51,197,61,61,55,5,0,
-39,6,204,158,132,0,129,255,208,190,224,81,218,5,39,6,
-187,187,85,85,245,45,61,55,5,0,39,6,40,159,132,0,
-129,255,182,190,224,81,218,5,39,6,170,170,102,102,165,37,
-61,55,5,0,39,6,52,159,132,0,129,255,156,190,224,81,
-218,5,39,6,68,51,34,17,213,21,61,55,5,0,37,62,
-96,129,129,255,132,190,224,81,218,5,39,6,153,153,119,119,
-149,13,61,55,5,0,0,58,32,70,16,0,129,255,30,185,
-10,56,3,48,128,255,58,148,3,48,128,255,172,152,10,224,
-224,225,210,13,3,48,128,255,176,149,61,63,5,0,28,64,
-38,6,216,158,132,0,129,255,6,159,133,13,61,63,5,0,
-38,6,64,159,132,0,129,255,246,158,1,50,128,255,52,139,
-80,6,255,0,128,7,225,48,64,230,16,0,28,232,128,255,
-216,138,252,81,218,5,128,255,136,138,74,238,16,0,61,135,
-13,0,61,231,25,0,16,134,208,255,130,130,16,222,255,255,
-29,238,28,0,0,210,133,29,61,111,1,0,60,71,1,0,
-237,65,130,21,28,56,38,6,4,160,132,0,129,255,160,158,
-29,56,61,71,1,0,38,6,236,159,132,0,129,255,144,158,
-65,210,68,226,68,234,106,210,222,5,27,96,95,218,224,97,
-202,229,64,6,255,48,128,7,97,0,7,232,99,50,242,5,
-38,6,84,160,132,0,129,255,102,158,181,53,61,55,9,0,
-0,58,32,70,16,0,129,255,68,184,61,23,5,0,2,23,
-0,0,2,6,207,255,130,13,2,6,206,255,210,13,2,6,
-204,255,162,21,149,29,10,63,0,0,38,6,36,160,132,0,
-129,255,44,158,229,21,42,63,0,0,38,6,52,160,132,0,
-129,255,28,158,229,13,42,63,1,0,38,6,68,160,132,0,
-129,255,12,158,229,5,38,6,116,160,132,0,129,255,0,158,
-64,6,127,0,128,7,225,0,7,224,100,50,242,5,38,6,
-148,160,132,0,129,255,232,157,197,45,60,55,9,0,0,58,
-32,70,16,0,129,255,198,183,10,232,60,55,13,0,0,58,
-32,70,16,0,129,255,182,183,60,23,5,0,2,23,0,0,
-2,6,207,255,130,13,2,6,206,255,130,13,2,6,204,255,
-130,13,165,13,93,87,0,0,197,13,125,87,0,0,149,13,
-125,87,1,0,229,5,38,6,132,160,132,0,129,255,144,157,
-64,6,255,0,144,7,225,0,39,55,1,0,39,6,224,160,
-132,0,129,255,180,188,224,81,202,61,3,48,39,6,170,170,
-102,102,128,255,124,146,3,48,128,255,12,151,224,81,210,29,
-32,230,0,32,3,48,128,255,224,150,10,6,0,224,209,5,
-3,48,128,255,212,150,10,224,28,48,129,255,70,151,10,232,
-29,56,28,64,3,48,0,74,128,255,74,150,28,134,255,255,
-221,129,80,7,0,0,149,37,32,54,80,0,129,255,36,151,
-10,232,29,96,45,6,188,160,132,0,13,94,34,0,13,87,
-0,0,76,87,0,0,65,106,65,98,237,89,154,253,213,13,
-32,54,0,32,129,255,252,150,10,232,29,48,32,62,0,32,
-129,255,44,46,93,7,255,31,60,6,236,160,132,0,28,48,
-129,255,200,46,29,48,129,255,194,46,28,48,129,255,188,46,
-29,48,129,255,178,150,80,6,255,0,128,7,225,16,6,216,
-7,224,60,55,5,0,0,58,0,66,129,255,160,182,10,232,
-29,6,240,255,0,82,177,13,253,22,40,0,32,118,160,180,
-206,17,34,111,17,0,224,105,162,5,2,80,10,48,224,49,
-178,5,98,218,146,13,60,63,5,0,38,6,44,161,132,0,
-129,255,124,156,213,13,128,255,38,0,10,16,224,17,130,13,
-2,56,29,64,38,6,72,161,132,0,129,255,98,156,64,6,
-255,16,127,0,33,6,230,141,1,0,97,0,33,6,48,133,
-1,0,97,0,128,7,225,0,6,232,7,224,224,233,226,13,
-49,6,136,92,133,0,125,143,49,0,0,58,128,255,102,1,
-129,226,201,5,29,48,129,255,70,150,64,6,255,0,128,7,
-97,0,6,232,224,233,138,13,32,54,52,0,129,255,80,150,
-10,232,224,233,226,53,49,6,112,92,133,0,125,143,49,0,
-125,7,1,0,125,7,29,0,125,7,33,0,1,50,125,55,
-37,0,125,7,25,0,2,50,129,255,232,149,125,87,13,0,
-0,18,149,13,2,96,61,143,13,0,193,98,209,97,108,7,
-0,0,65,18,61,135,37,0,240,17,214,245,191,255,166,183,
-100,87,25,133,125,7,8,0,32,54,0,2,129,255,180,149,
-125,87,17,0,32,54,0,2,129,255,168,149,125,87,21,0,
-29,80,64,6,127,0,3,30,224,255,99,71,25,0,99,255,
-13,0,99,223,9,0,99,231,5,0,7,216,99,239,1,0,
-9,224,6,232,224,233,138,13,32,54,52,0,129,255,176,149,
-10,232,224,233,178,69,125,223,1,0,125,7,33,0,125,7,
-29,0,125,231,5,0,60,55,5,0,49,6,112,92,133,0,
-125,55,37,0,125,143,49,0,60,111,1,0,252,95,9,0,
-125,95,44,0,125,111,41,0,252,143,11,0,125,143,46,0,
-227,135,25,0,125,135,25,0,193,50,129,255,38,149,125,87,
-13,0,0,18,149,13,2,96,61,143,13,0,193,98,209,97,
-108,7,0,0,65,18,61,135,37,0,240,17,214,245,125,7,
-8,0,32,54,0,2,129,255,250,148,125,87,17,0,32,54,
-0,2,129,255,238,148,125,87,21,0,29,80,35,223,9,0,
-35,231,5,0,35,239,1,0,35,255,13,0,3,30,32,0,
-127,0,128,7,225,112,6,232,7,200,224,233,186,5,128,7,
-30,1,49,6,112,92,133,0,125,143,49,0,60,6,72,163,
-132,0,61,63,29,0,28,48,129,255,164,154,61,63,29,0,
-38,6,100,163,132,0,129,255,150,154,61,63,33,0,38,6,
-124,163,132,0,129,255,136,154,61,63,29,0,28,48,129,255,
-126,154,61,135,8,0,224,129,162,29,61,55,25,0,39,6,
-156,162,132,0,6,64,128,255,206,118,61,55,25,0,61,71,
-8,0,39,6,148,163,132,0,128,255,188,118,61,63,8,0,
-38,6,232,162,132,0,129,255,70,154,229,53,61,111,33,0,
-224,105,162,53,38,6,212,162,132,0,129,255,50,154,61,55,
-25,0,37,62,112,129,128,255,142,118,0,226,149,37,28,216,
-61,95,13,0,193,218,219,89,43,23,0,0,224,17,242,21,
-28,214,1,0,61,55,25,0,26,64,2,72,39,6,16,163,
-132,0,128,255,98,118,61,119,13,0,26,56,206,217,59,71,
-0,0,38,6,36,163,132,0,129,255,228,153,65,226,61,103,
-37,0,236,225,214,221,61,95,1,0,61,87,5,0,203,15,
-65,0,61,143,33,0,61,55,13,0,106,143,5,0,129,255,
-166,147,61,55,17,0,129,255,214,147,61,55,21,0,129,255,
-206,147,129,202,201,5,29,48,129,255,196,147,64,6,255,112,
-128,7,33,0,38,6,168,163,132,0,129,255,146,153,32,86,
-33,48,64,6,63,0,128,7,3,30,224,255,99,71,25,0,
-99,255,13,0,99,231,5,0,99,223,9,0,7,224,99,239,
-1,0,9,216,6,232,224,233,138,13,32,54,52,0,129,255,
-158,147,10,232,224,233,162,37,29,48,28,56,35,22,24,0,
-34,71,1,0,27,72,191,255,176,253,49,6,160,92,133,0,
-125,143,49,0,38,6,204,163,132,0,129,255,50,153,191,255,
-20,181,10,48,128,255,194,48,125,87,8,0,234,0,224,81,
-218,5,61,55,17,0,128,255,210,41,29,80,35,223,9,0,
-35,231,5,0,35,239,1,0,35,255,13,0,3,30,32,0,
-127,0,128,7,225,0,6,232,7,224,224,233,226,13,49,6,
-160,92,133,0,125,143,49,0,0,58,191,255,24,254,129,226,
-201,5,29,48,129,255,248,146,64,6,255,0,134,7,225,48,
-6,232,61,143,8,0,99,7,9,0,224,137,234,45,0,218,
-245,37,27,224,61,215,13,0,61,55,25,0,61,71,17,0,
-61,79,21,0,35,126,8,0,99,127,1,0,193,226,36,119,
-25,133,220,209,99,119,5,0,61,62,28,0,128,255,70,26,
-61,103,13,0,122,87,0,0,204,225,60,95,0,0,224,89,
-226,5,61,87,33,0,65,82,125,87,33,0,65,218,61,143,
-37,0,241,217,246,213,229,5,61,135,33,0,65,130,125,135,
-33,0,36,127,29,133,15,62,1,0,100,63,29,133,38,6,
-244,163,132,0,129,255,72,152,61,119,33,0,224,113,194,5,
-32,86,19,48,165,5,0,82,70,6,255,48,128,7,3,30,
-224,255,99,71,25,0,99,255,13,0,99,231,5,0,99,223,
-9,0,7,224,99,239,1,0,9,216,6,232,224,233,138,13,
-32,54,52,0,129,255,72,146,10,232,224,233,130,29,29,48,
-28,56,35,22,24,0,34,71,1,0,27,72,191,255,90,252,
-49,6,184,92,133,0,125,143,49,0,38,6,8,164,132,0,
-129,255,220,151,61,55,17,0,128,255,144,40,29,80,35,223,
+10,87,32,241,138,230,64,0,64,86,0,0,74,231,32,241,
+255,47,32,0,3,138,68,143,236,133,129,255,8,76,129,255,
+74,70,129,255,136,76,229,87,64,0,224,7,96,1,10,224,
+64,86,0,0,10,87,116,241,10,248,32,86,191,255,74,249,
+64,86,0,0,74,255,116,241,252,47,32,0,229,87,64,0,
+224,7,96,1,10,224,64,86,0,0,10,87,118,241,10,248,
+32,86,191,255,74,249,64,86,0,0,74,255,118,241,252,47,
+32,0,229,87,64,0,224,7,96,1,10,224,64,86,0,0,
+10,87,36,241,10,248,32,86,191,255,74,249,64,86,0,0,
+74,255,36,241,252,47,32,0,100,234,151,45,229,87,64,0,
+224,7,96,1,10,224,64,86,0,0,10,87,38,241,10,248,
+32,86,191,255,74,249,64,86,0,0,74,255,38,241,252,47,
+32,0,104,234,199,21,229,87,64,0,224,7,96,1,10,232,
+64,86,0,0,10,87,40,241,10,248,32,86,191,255,74,249,
+64,86,0,0,74,255,40,241,253,47,32,0,229,87,64,0,
+224,7,96,1,10,232,64,86,0,0,10,87,34,241,10,248,
+32,86,191,255,74,249,64,86,0,0,74,255,34,241,253,47,
+32,0,229,87,64,0,224,7,96,1,10,232,64,86,0,0,
+10,87,32,241,10,248,32,86,191,255,74,249,64,86,0,0,
+74,255,32,241,253,47,32,0,64,6,255,0,128,7,33,0,
+128,255,172,4,64,6,63,0,128,7,33,0,128,54,255,255,
+129,255,178,36,64,6,63,0,1,138,100,143,253,133,127,0,
+128,7,97,0,0,234,253,134,12,0,47,6,164,172,132,0,
+207,129,48,63,1,0,48,71,5,0,38,6,228,169,132,0,
+129,255,44,165,65,234,29,6,234,255,230,237,64,6,127,0,
+144,7,225,0,7,232,98,50,249,5,38,6,36,170,132,0,
+129,255,12,165,213,117,61,55,5,0,39,6,52,170,132,0,
+129,255,54,196,224,81,218,5,39,6,238,238,34,34,149,77,
+61,55,5,0,39,6,64,170,132,0,129,255,28,196,224,81,
+218,5,39,6,221,221,51,51,197,61,61,55,5,0,39,6,
+244,169,132,0,129,255,2,196,224,81,218,5,39,6,187,187,
+85,85,245,45,61,55,5,0,39,6,80,170,132,0,129,255,
+232,195,224,81,218,5,39,6,170,170,102,102,165,37,61,55,
+5,0,39,6,92,170,132,0,129,255,206,195,224,81,218,5,
+39,6,68,51,34,17,213,21,61,55,5,0,37,62,104,129,
+129,255,182,195,224,81,218,5,39,6,153,153,119,119,149,13,
+61,55,5,0,0,58,32,70,16,0,129,255,80,190,10,56,
+3,48,128,255,212,150,3,48,128,255,70,155,10,224,224,225,
+210,13,3,48,128,255,74,152,61,63,5,0,28,64,38,6,
+0,170,132,0,129,255,56,164,133,13,61,63,5,0,38,6,
+104,170,132,0,129,255,40,164,1,50,128,255,206,141,80,6,
+255,0,144,7,225,48,7,216,100,50,242,5,38,6,132,170,
+132,0,129,255,10,164,149,93,59,55,5,0,0,58,32,70,
+16,0,129,255,232,189,10,224,59,55,9,0,0,58,32,70,
+16,0,129,255,216,189,10,232,202,234,59,55,13,0,0,58,
+32,70,16,0,129,255,198,189,202,82,10,216,155,0,28,56,
+3,48,128,255,68,150,3,48,128,255,212,154,224,81,194,13,
+3,48,128,255,172,154,28,56,10,64,38,6,212,170,132,0,
+129,255,172,163,245,37,29,56,3,48,0,66,128,255,190,145,
+29,48,129,255,158,157,10,208,26,48,27,56,29,64,191,255,
+116,122,26,56,29,64,3,48,0,74,128,255,86,153,10,232,
+26,48,129,255,154,157,224,233,138,13,28,56,38,6,4,171,
+132,0,129,255,106,163,229,5,38,6,184,170,132,0,129,255,
+94,163,1,50,128,255,4,141,80,6,255,48,128,7,225,48,
+64,230,16,0,28,232,128,255,168,140,252,81,218,5,128,255,
+88,140,74,238,16,0,61,135,13,0,61,231,25,0,16,134,
+208,255,130,130,16,222,255,255,29,238,28,0,0,210,133,29,
+61,111,1,0,60,71,1,0,237,65,130,21,28,56,38,6,
+56,171,132,0,129,255,8,163,29,56,61,71,1,0,38,6,
+32,171,132,0,129,255,248,162,65,210,68,226,68,234,106,210,
+222,5,27,96,95,218,224,97,202,229,64,6,255,48,128,7,
+97,0,7,232,99,50,242,5,38,6,136,171,132,0,129,255,
+206,162,181,53,61,55,9,0,0,58,32,70,16,0,129,255,
+172,188,61,23,5,0,2,23,0,0,2,6,207,255,130,13,
+2,6,206,255,210,13,2,6,204,255,162,21,149,29,10,63,
+0,0,38,6,88,171,132,0,129,255,148,162,229,21,42,63,
+0,0,38,6,104,171,132,0,129,255,132,162,229,13,42,63,
+1,0,38,6,120,171,132,0,129,255,116,162,229,5,38,6,
+168,171,132,0,129,255,104,162,64,6,127,0,128,7,225,0,
+7,224,100,50,242,5,38,6,200,171,132,0,129,255,80,162,
+197,45,60,55,9,0,0,58,32,70,16,0,129,255,46,188,
+10,232,60,55,13,0,0,58,32,70,16,0,129,255,30,188,
+60,23,5,0,2,23,0,0,2,6,207,255,130,13,2,6,
+206,255,130,13,2,6,204,255,130,13,165,13,93,87,0,0,
+197,13,125,87,0,0,149,13,125,87,1,0,229,5,38,6,
+184,171,132,0,129,255,248,161,64,6,255,0,144,7,225,0,
+39,55,1,0,39,6,20,172,132,0,129,255,28,193,224,81,
+202,61,3,48,39,6,170,170,102,102,128,255,76,148,3,48,
+128,255,220,152,224,81,210,29,32,230,0,32,3,48,128,255,
+176,152,10,6,0,224,209,5,3,48,128,255,164,152,10,224,
+28,48,129,255,174,155,10,232,29,56,28,64,3,48,0,74,
+128,255,26,152,28,134,255,255,221,129,80,7,0,0,149,37,
+32,54,80,0,129,255,140,155,10,232,29,96,45,6,240,171,
+132,0,13,94,34,0,13,87,0,0,76,87,0,0,65,106,
+65,98,237,89,154,253,213,13,32,54,0,32,129,255,100,155,
+10,232,29,48,32,62,0,32,129,255,146,50,93,7,255,31,
+60,6,32,172,132,0,28,48,129,255,46,51,29,48,129,255,
+40,51,28,48,129,255,34,51,29,48,129,255,26,155,80,6,
+255,0,128,7,225,16,6,216,7,224,60,55,5,0,0,58,
+0,66,129,255,8,187,10,232,29,6,240,255,0,82,177,13,
+253,22,40,0,32,118,160,180,206,17,34,111,17,0,224,105,
+162,5,2,80,10,48,224,49,178,5,98,218,146,13,60,63,
+5,0,38,6,96,172,132,0,129,255,228,160,213,13,128,255,
+38,0,10,16,224,17,130,13,2,56,29,64,38,6,124,172,
+132,0,129,255,202,160,64,6,255,16,127,0,33,6,16,144,
+1,0,97,0,33,6,90,135,1,0,97,0,128,7,225,0,
+6,232,7,224,224,233,226,13,49,6,16,104,133,0,125,143,
+49,0,0,58,128,255,102,1,129,226,201,5,29,48,129,255,
+174,154,64,6,255,0,128,7,97,0,6,232,224,233,138,13,
+32,54,52,0,129,255,184,154,10,232,224,233,226,53,49,6,
+248,103,133,0,125,143,49,0,125,7,1,0,125,7,29,0,
+125,7,33,0,1,50,125,55,37,0,125,7,25,0,2,50,
+129,255,80,154,125,87,13,0,0,18,149,13,2,96,61,143,
+13,0,193,98,209,97,108,7,0,0,65,18,61,135,37,0,
+240,17,214,245,191,255,82,182,100,87,37,133,125,7,8,0,
+32,54,0,2,129,255,28,154,125,87,17,0,32,54,0,2,
+129,255,16,154,125,87,21,0,29,80,64,6,127,0,3,30,
+224,255,99,71,25,0,99,255,13,0,99,223,9,0,99,231,
+5,0,7,216,99,239,1,0,9,224,6,232,224,233,138,13,
+32,54,52,0,129,255,24,154,10,232,224,233,178,69,125,223,
+1,0,125,7,33,0,125,7,29,0,125,231,5,0,60,55,
+5,0,49,6,248,103,133,0,125,55,37,0,125,143,49,0,
+60,111,1,0,252,95,9,0,125,95,44,0,125,111,41,0,
+252,143,11,0,125,143,46,0,227,135,25,0,125,135,25,0,
+193,50,129,255,142,153,125,87,13,0,0,18,149,13,2,96,
+61,143,13,0,193,98,209,97,108,7,0,0,65,18,61,135,
+37,0,240,17,214,245,125,7,8,0,32,54,0,2,129,255,
+98,153,125,87,17,0,32,54,0,2,129,255,86,153,125,87,
+21,0,29,80,35,223,9,0,35,231,5,0,35,239,1,0,
+35,255,13,0,3,30,32,0,127,0,128,7,225,112,6,232,
+7,200,224,233,186,5,128,7,30,1,49,6,248,103,133,0,
+125,143,49,0,60,6,136,174,132,0,61,63,29,0,28,48,
+129,255,12,159,61,63,29,0,38,6,164,174,132,0,129,255,
+254,158,61,63,33,0,38,6,188,174,132,0,129,255,240,158,
+61,63,29,0,28,48,129,255,230,158,61,135,8,0,224,129,
+162,29,61,55,25,0,39,6,220,173,132,0,6,64,128,255,
+206,118,61,55,25,0,61,71,8,0,39,6,212,174,132,0,
+128,255,188,118,61,63,8,0,38,6,40,174,132,0,129,255,
+174,158,229,53,61,111,33,0,224,105,162,53,38,6,20,174,
+132,0,129,255,154,158,61,55,25,0,37,62,120,129,128,255,
+142,118,0,226,149,37,28,216,61,95,13,0,193,218,219,89,
+43,23,0,0,224,17,242,21,28,214,1,0,61,55,25,0,
+26,64,2,72,39,6,80,174,132,0,128,255,98,118,61,119,
+13,0,26,56,206,217,59,71,0,0,38,6,100,174,132,0,
+129,255,76,158,65,226,61,103,37,0,236,225,214,221,61,95,
+1,0,61,87,5,0,203,15,65,0,61,143,33,0,61,55,
+13,0,106,143,5,0,129,255,14,152,61,55,17,0,129,255,
+62,152,61,55,21,0,129,255,54,152,129,202,201,5,29,48,
+129,255,44,152,64,6,255,112,128,7,33,0,38,6,232,174,
+132,0,129,255,250,157,32,86,33,48,64,6,63,0,128,7,
+3,30,224,255,99,71,25,0,99,255,13,0,99,231,5,0,
+99,223,9,0,7,224,99,239,1,0,9,216,6,232,224,233,
+138,13,32,54,52,0,129,255,6,152,10,232,224,233,162,37,
+29,48,28,56,35,22,24,0,34,71,1,0,27,72,191,255,
+176,253,49,6,40,104,133,0,125,143,49,0,38,6,12,175,
+132,0,129,255,154,157,191,255,192,179,10,48,128,255,194,48,
+125,87,8,0,234,0,224,81,218,5,61,55,17,0,128,255,
+210,41,29,80,35,223,9,0,35,231,5,0,35,239,1,0,
+35,255,13,0,3,30,32,0,127,0,128,7,225,0,6,232,
+7,224,224,233,226,13,49,6,40,104,133,0,125,143,49,0,
+0,58,191,255,24,254,129,226,201,5,29,48,129,255,96,151,
+64,6,255,0,134,7,225,48,6,232,61,143,8,0,99,7,
+9,0,224,137,234,45,0,218,245,37,27,224,61,215,13,0,
+61,55,25,0,61,71,17,0,61,79,21,0,35,126,8,0,
+99,127,1,0,193,226,36,119,37,133,220,209,99,119,5,0,
+61,62,28,0,128,255,70,26,61,103,13,0,122,87,0,0,
+204,225,60,95,0,0,224,89,226,5,61,87,33,0,65,82,
+125,87,33,0,65,218,61,143,37,0,241,217,246,213,229,5,
+61,135,33,0,65,130,125,135,33,0,36,127,41,133,15,62,
+1,0,100,63,41,133,38,6,52,175,132,0,129,255,176,156,
+61,119,33,0,224,113,194,5,32,86,19,48,165,5,0,82,
+70,6,255,48,128,7,3,30,224,255,99,71,25,0,99,255,
+13,0,99,231,5,0,99,223,9,0,7,224,99,239,1,0,
+9,216,6,232,224,233,138,13,32,54,52,0,129,255,176,150,
+10,232,224,233,130,29,29,48,28,56,35,22,24,0,34,71,
+1,0,27,72,191,255,90,252,49,6,64,104,133,0,125,143,
+49,0,38,6,72,175,132,0,129,255,68,156,61,55,17,0,
+128,255,144,40,29,80,35,223,9,0,35,231,5,0,35,239,
+1,0,35,255,13,0,3,30,32,0,127,0,128,7,225,0,
+6,232,7,224,224,233,226,13,49,6,64,104,133,0,125,143,
+49,0,0,58,191,255,214,252,129,226,201,5,29,48,129,255,
+30,150,64,6,255,0,130,7,225,48,6,232,61,143,8,0,
+224,137,170,45,0,218,181,37,27,224,193,226,61,215,13,0,
+61,127,41,0,61,55,25,0,61,71,17,0,61,79,21,0,
+220,209,99,127,1,0,61,62,28,0,128,255,200,25,61,111,
+13,0,122,87,0,0,205,225,60,103,0,0,224,97,226,5,
+61,95,33,0,65,90,125,95,33,0,65,218,61,87,37,0,
+234,217,182,221,229,5,61,143,33,0,65,138,125,143,33,0,
+36,135,41,133,16,62,1,0,100,63,41,133,38,6,112,175,
+132,0,129,255,122,155,61,127,33,0,224,121,194,5,32,86,
+19,48,165,5,0,82,66,6,255,48,128,7,3,30,224,255,
+99,71,25,0,99,255,13,0,99,231,5,0,99,223,9,0,
+7,224,99,239,1,0,9,216,6,232,224,233,138,13,32,54,
+52,0,129,255,122,149,10,232,224,233,146,37,29,48,28,56,
+35,22,24,0,34,71,1,0,27,72,191,255,36,251,49,6,
+88,104,133,0,125,143,49,0,38,6,132,175,132,0,129,255,
+14,155,61,55,17,0,128,255,90,39,61,63,17,0,0,50,
+32,70,0,2,191,255,2,123,125,87,8,0,29,80,35,223,
 9,0,35,231,5,0,35,239,1,0,35,255,13,0,3,30,
 32,0,127,0,128,7,225,0,6,232,7,224,224,233,226,13,
-49,6,184,92,133,0,125,143,49,0,0,58,191,255,214,252,
-129,226,201,5,29,48,129,255,182,145,64,6,255,0,130,7,
+49,6,88,104,133,0,125,143,49,0,0,58,191,255,142,251,
+129,226,201,5,29,48,129,255,214,148,64,6,255,0,130,7,
 225,48,6,232,61,143,8,0,224,137,170,45,0,218,181,37,
 27,224,193,226,61,215,13,0,61,127,41,0,61,55,25,0,
 61,71,17,0,61,79,21,0,220,209,99,127,1,0,61,62,
-28,0,128,255,200,25,61,111,13,0,122,87,0,0,205,225,
+28,0,128,255,10,25,61,111,13,0,122,87,0,0,205,225,
 60,103,0,0,224,97,226,5,61,95,33,0,65,90,125,95,
 33,0,65,218,61,87,37,0,234,217,182,221,229,5,61,143,
-33,0,65,138,125,143,33,0,36,135,29,133,16,62,1,0,
-100,63,29,133,38,6,48,164,132,0,129,255,18,151,61,127,
+33,0,65,138,125,143,33,0,36,135,41,133,16,62,1,0,
+100,63,41,133,38,6,172,175,132,0,129,255,50,154,61,127,
 33,0,224,121,194,5,32,86,19,48,165,5,0,82,66,6,
-255,48,128,7,3,30,224,255,99,71,25,0,99,255,13,0,
-99,231,5,0,99,223,9,0,7,224,99,239,1,0,9,216,
-6,232,224,233,138,13,32,54,52,0,129,255,18,145,10,232,
-224,233,146,37,29,48,28,56,35,22,24,0,34,71,1,0,
-27,72,191,255,36,251,49,6,208,92,133,0,125,143,49,0,
-38,6,68,164,132,0,129,255,166,150,61,55,17,0,128,255,
-90,39,61,63,17,0,0,50,32,70,0,2,191,255,62,127,
-125,87,8,0,29,80,35,223,9,0,35,231,5,0,35,239,
-1,0,35,255,13,0,3,30,32,0,127,0,128,7,225,0,
-6,232,7,224,224,233,226,13,49,6,208,92,133,0,125,143,
-49,0,0,58,191,255,142,251,129,226,201,5,29,48,129,255,
-110,144,64,6,255,0,130,7,225,48,6,232,61,143,8,0,
-224,137,170,45,0,218,181,37,27,224,193,226,61,215,13,0,
-61,127,41,0,61,55,25,0,61,71,17,0,61,79,21,0,
-220,209,99,127,1,0,61,62,28,0,128,255,10,25,61,111,
-13,0,122,87,0,0,205,225,60,103,0,0,224,97,226,5,
-61,95,33,0,65,90,125,95,33,0,65,218,61,87,37,0,
-234,217,182,221,229,5,61,143,33,0,65,138,125,143,33,0,
-36,135,29,133,16,62,1,0,100,63,29,133,38,6,108,164,
-132,0,129,255,202,149,61,127,33,0,224,121,194,5,32,86,
-19,48,165,5,0,82,66,6,255,48,128,7,3,30,220,255,
-99,71,29,0,99,255,17,0,99,231,9,0,99,223,13,0,
-7,224,99,239,5,0,9,216,6,232,224,233,138,13,32,54,
-52,0,129,255,202,143,10,232,224,233,242,37,29,48,28,56,
-35,22,28,0,34,71,1,0,27,72,191,255,220,249,48,6,
-232,92,133,0,125,135,49,0,38,6,128,164,132,0,129,255,
-94,149,61,55,17,0,128,255,18,38,0,58,61,55,41,0,
-61,71,17,0,32,118,129,0,99,119,1,0,32,78,0,2,
-128,255,206,44,125,87,8,0,29,80,35,223,13,0,35,231,
-9,0,35,239,5,0,35,255,17,0,3,30,36,0,127,0,
-128,7,225,0,6,232,7,224,224,233,226,13,49,6,232,92,
-133,0,125,143,49,0,0,58,191,255,58,250,129,226,201,5,
-29,48,129,255,26,143,64,6,255,0,130,7,225,48,6,232,
-61,143,8,0,224,137,170,45,0,218,181,37,27,224,193,226,
-61,215,13,0,61,127,41,0,61,55,25,0,61,71,17,0,
-61,79,21,0,220,209,99,127,1,0,61,62,28,0,128,255,
-52,24,61,111,13,0,122,87,0,0,205,225,60,103,0,0,
-224,97,226,5,61,95,33,0,65,90,125,95,33,0,65,218,
-61,87,37,0,234,217,182,221,229,5,61,143,33,0,65,138,
-125,143,33,0,36,135,29,133,16,62,1,0,100,63,29,133,
-38,6,168,164,132,0,129,255,118,148,61,127,33,0,224,121,
-194,5,32,86,19,48,165,5,0,82,66,6,255,48,128,7,
-3,30,224,255,99,71,25,0,99,255,13,0,99,231,5,0,
-99,223,9,0,7,224,99,239,1,0,9,216,6,232,224,233,
-138,13,32,54,52,0,129,255,118,142,10,232,224,233,194,21,
-29,48,28,56,35,22,24,0,34,71,1,0,27,72,191,255,
-136,248,49,6,0,93,133,0,125,143,49,0,38,6,188,164,
-132,0,129,255,10,148,29,80,35,223,9,0,35,231,5,0,
-35,239,1,0,35,255,13,0,3,30,32,0,127,0,128,7,
-225,0,6,232,7,224,224,233,226,13,49,6,0,93,133,0,
-125,143,49,0,0,58,191,255,12,249,129,226,201,5,29,48,
-129,255,236,141,64,6,255,0,128,7,225,48,6,232,61,143,
-8,0,224,137,170,37,0,218,181,29,27,224,61,215,13,0,
-193,226,220,209,61,55,25,0,61,62,28,0,128,255,128,23,
+255,48,128,7,3,30,220,255,99,71,29,0,99,255,17,0,
+99,231,9,0,99,223,13,0,7,224,99,239,5,0,9,216,
+6,232,224,233,138,13,32,54,52,0,129,255,50,148,10,232,
+224,233,242,37,29,48,28,56,35,22,28,0,34,71,1,0,
+27,72,191,255,220,249,48,6,112,104,133,0,125,135,49,0,
+38,6,192,175,132,0,129,255,198,153,61,55,17,0,128,255,
+18,38,0,58,61,55,41,0,61,71,17,0,32,118,129,0,
+99,119,1,0,32,78,0,2,128,255,206,44,125,87,8,0,
+29,80,35,223,13,0,35,231,9,0,35,239,5,0,35,255,
+17,0,3,30,36,0,127,0,128,7,225,0,6,232,7,224,
+224,233,226,13,49,6,112,104,133,0,125,143,49,0,0,58,
+191,255,58,250,129,226,201,5,29,48,129,255,130,147,64,6,
+255,0,130,7,225,48,6,232,61,143,8,0,224,137,170,45,
+0,218,181,37,27,224,193,226,61,215,13,0,61,127,41,0,
+61,55,25,0,61,71,17,0,61,79,21,0,220,209,99,127,
+1,0,61,62,28,0,128,255,52,24,61,111,13,0,122,87,
+0,0,205,225,60,103,0,0,224,97,226,5,61,95,33,0,
+65,90,125,95,33,0,65,218,61,87,37,0,234,217,182,221,
+229,5,61,143,33,0,65,138,125,143,33,0,36,135,41,133,
+16,62,1,0,100,63,41,133,38,6,232,175,132,0,129,255,
+222,152,61,127,33,0,224,121,194,5,32,86,19,48,165,5,
+0,82,66,6,255,48,128,7,3,30,224,255,99,71,25,0,
+99,255,13,0,99,231,5,0,99,223,9,0,7,224,99,239,
+1,0,9,216,6,232,224,233,138,13,32,54,52,0,129,255,
+222,146,10,232,224,233,194,21,29,48,28,56,35,22,24,0,
+34,71,1,0,27,72,191,255,136,248,49,6,136,104,133,0,
+125,143,49,0,38,6,252,175,132,0,129,255,114,152,29,80,
+35,223,9,0,35,231,5,0,35,239,1,0,35,255,13,0,
+3,30,32,0,127,0,128,7,225,0,6,232,7,224,224,233,
+226,13,49,6,136,104,133,0,125,143,49,0,0,58,191,255,
+12,249,129,226,201,5,29,48,129,255,84,146,64,6,255,0,
+128,7,225,48,6,232,61,143,8,0,224,137,170,37,0,218,
+181,29,27,224,61,215,13,0,193,226,220,209,61,55,25,0,
+61,62,28,0,128,255,128,23,61,119,13,0,122,87,0,0,
+206,225,60,111,0,0,224,105,226,5,61,103,33,0,65,98,
+125,103,33,0,65,218,61,95,37,0,235,217,182,229,229,5,
+61,87,33,0,65,82,125,87,33,0,36,143,41,133,17,62,
+1,0,100,63,41,133,38,6,8,176,132,0,129,255,192,151,
+61,135,33,0,224,129,194,5,32,86,19,48,165,5,0,82,
+64,6,255,48,128,7,3,30,224,255,99,71,25,0,99,255,
+13,0,99,231,5,0,99,223,9,0,7,224,99,239,1,0,
+9,216,6,232,224,233,138,13,32,54,52,0,129,255,192,145,
+10,232,224,233,178,29,29,48,28,56,35,22,24,0,34,71,
+1,0,27,72,191,255,106,247,49,6,160,104,133,0,125,143,
+49,0,38,6,28,176,132,0,129,255,84,151,253,63,45,0,
+38,6,76,176,132,0,129,255,70,151,29,80,35,223,9,0,
+35,231,5,0,35,239,1,0,35,255,13,0,3,30,32,0,
+127,0,128,7,225,0,6,232,7,224,224,233,226,13,49,6,
+160,104,133,0,125,143,49,0,0,58,191,255,224,247,129,226,
+201,5,29,48,129,255,40,145,64,6,255,0,132,7,225,48,
+6,232,61,143,8,0,224,137,234,45,0,218,245,37,27,224,
+61,127,41,0,61,215,13,0,61,55,25,0,61,71,17,0,
+61,79,21,0,193,226,99,127,1,0,220,209,253,119,45,0,
+99,119,5,0,61,62,28,0,128,255,74,22,61,103,13,0,
+122,87,0,0,204,225,60,95,0,0,224,89,226,5,61,87,
+33,0,65,82,125,87,33,0,65,218,61,143,37,0,241,217,
+246,213,229,5,61,135,33,0,65,130,125,135,33,0,36,127,
+41,133,15,62,1,0,100,63,41,133,38,6,92,176,132,0,
+129,255,124,150,61,119,33,0,224,113,194,5,32,86,19,48,
+165,5,0,82,68,6,255,48,128,7,3,30,224,255,99,71,
+25,0,99,255,13,0,99,231,5,0,99,223,9,0,7,224,
+99,239,1,0,9,216,6,232,224,233,138,13,32,54,52,0,
+129,255,124,144,10,232,224,233,178,45,29,48,28,56,35,22,
+24,0,34,71,1,0,27,72,191,255,38,246,49,6,184,104,
+133,0,125,143,49,0,38,6,112,176,132,0,129,255,16,150,
+61,55,17,0,128,255,92,34,32,22,0,1,61,135,17,0,
+32,118,238,0,194,129,80,119,0,0,65,18,2,6,0,254,
+230,245,61,55,17,0,32,62,0,1,128,255,28,41,29,80,
+35,223,9,0,35,231,5,0,35,239,1,0,35,255,13,0,
+3,30,32,0,127,0,128,7,225,0,6,232,7,224,224,233,
+226,13,49,6,184,104,133,0,125,143,49,0,0,58,191,255,
+124,246,129,226,201,5,29,48,129,255,196,143,64,6,255,0,
+128,7,225,48,6,232,61,143,8,0,224,137,234,37,0,218,
+245,29,27,224,61,215,13,0,193,226,220,209,61,55,25,0,
+61,79,21,0,61,71,17,0,61,62,28,0,128,255,118,21,
 61,119,13,0,122,87,0,0,206,225,60,111,0,0,224,105,
 226,5,61,103,33,0,65,98,125,103,33,0,65,218,61,95,
-37,0,235,217,182,229,229,5,61,87,33,0,65,82,125,87,
-33,0,36,143,29,133,17,62,1,0,100,63,29,133,38,6,
-200,164,132,0,129,255,88,147,61,135,33,0,224,129,194,5,
+37,0,235,217,246,221,229,5,61,87,33,0,65,82,125,87,
+33,0,36,143,41,133,17,62,1,0,100,63,41,133,38,6,
+156,176,132,0,129,255,40,149,61,135,33,0,224,129,194,5,
 32,86,19,48,165,5,0,82,64,6,255,48,128,7,3,30,
+220,255,99,71,29,0,99,255,17,0,99,231,9,0,99,223,
+13,0,7,224,99,239,5,0,9,216,6,232,224,233,138,13,
+32,54,72,0,129,255,40,143,10,232,224,233,146,53,29,48,
+28,56,35,22,28,0,34,71,1,0,27,72,191,255,210,244,
+49,6,208,104,133,0,125,143,49,0,38,6,176,176,132,0,
+129,255,188,148,64,22,128,0,34,62,0,0,64,134,0,1,
+48,70,0,0,8,72,167,73,9,96,144,98,125,103,65,0,
+125,63,69,0,125,79,61,0,125,71,57,0,125,63,53,0,
+99,103,1,0,38,6,192,176,132,0,129,255,130,148,29,80,
+35,223,13,0,35,231,9,0,35,239,5,0,35,255,17,0,
+3,30,36,0,127,0,128,7,225,0,6,232,7,224,224,233,
+226,13,49,6,208,104,133,0,125,143,49,0,0,58,191,255,
+28,245,129,226,201,5,29,48,129,255,100,142,64,6,255,0,
+134,7,225,48,6,232,61,143,8,0,224,137,170,53,0,218,
+181,45,61,127,61,0,61,79,57,0,61,71,53,0,61,55,
+25,0,61,215,13,0,99,127,1,0,61,119,65,0,27,224,
+99,119,5,0,193,226,61,111,69,0,220,209,99,111,9,0,
+61,62,28,0,128,255,176,20,61,95,13,0,122,87,0,0,
+203,225,60,87,0,0,224,81,226,5,61,143,33,0,65,138,
+125,143,33,0,65,218,61,135,37,0,240,217,182,213,229,5,
+61,127,33,0,65,122,125,127,33,0,36,119,41,133,14,62,
+1,0,100,63,41,133,38,6,16,177,132,0,129,255,176,147,
+61,111,33,0,224,105,194,5,32,86,19,48,165,5,0,82,
+70,6,255,48,128,7,3,30,224,255,99,71,25,0,99,255,
+13,0,99,231,5,0,99,223,9,0,7,224,99,239,1,0,
+9,216,6,232,224,233,138,13,32,54,52,0,129,255,176,141,
+10,232,224,233,178,29,29,48,28,56,35,22,24,0,34,71,
+1,0,27,72,191,255,90,243,49,6,232,104,133,0,125,143,
+49,0,38,6,36,177,132,0,129,255,68,147,253,63,45,0,
+38,6,80,177,132,0,129,255,54,147,29,80,35,223,9,0,
+35,231,5,0,35,239,1,0,35,255,13,0,3,30,32,0,
+127,0,128,7,225,0,6,232,7,224,224,233,226,13,49,6,
+232,104,133,0,125,143,49,0,0,58,191,255,208,243,129,226,
+201,5,29,48,129,255,24,141,64,6,255,0,130,7,225,48,
+6,232,61,143,8,0,224,137,170,45,0,218,181,37,27,224,
+193,226,61,215,13,0,61,79,21,0,61,55,25,0,61,71,
+17,0,220,209,253,127,45,0,99,127,1,0,61,62,28,0,
+128,255,64,20,61,111,13,0,122,87,0,0,205,225,60,103,
+0,0,224,97,226,5,61,95,33,0,65,90,125,95,33,0,
+65,218,61,87,37,0,234,217,182,221,229,5,61,143,33,0,
+65,138,125,143,33,0,36,135,41,133,16,62,1,0,100,63,
+41,133,38,6,96,177,132,0,129,255,116,146,61,127,33,0,
+224,121,194,5,32,86,19,48,165,5,0,82,66,6,255,48,
+128,7,97,0,6,232,224,233,138,13,32,54,52,0,129,255,
+142,140,10,232,224,233,146,13,29,48,191,255,188,241,49,6,
+0,105,133,0,125,143,49,0,29,80,64,6,127,0,3,30,
 224,255,99,71,25,0,99,255,13,0,99,231,5,0,99,223,
 9,0,7,224,99,239,1,0,9,216,6,232,224,233,138,13,
-32,54,52,0,129,255,88,141,10,232,224,233,178,29,29,48,
-28,56,35,22,24,0,34,71,1,0,27,72,191,255,106,247,
-49,6,24,93,133,0,125,143,49,0,38,6,220,164,132,0,
-129,255,236,146,253,63,45,0,38,6,12,165,132,0,129,255,
-222,146,29,80,35,223,9,0,35,231,5,0,35,239,1,0,
-35,255,13,0,3,30,32,0,127,0,128,7,225,0,6,232,
-7,224,224,233,226,13,49,6,24,93,133,0,125,143,49,0,
-0,58,191,255,224,247,129,226,201,5,29,48,129,255,192,140,
-64,6,255,0,132,7,225,48,6,232,61,143,8,0,224,137,
-234,45,0,218,245,37,27,224,61,127,41,0,61,215,13,0,
-61,55,25,0,61,71,17,0,61,79,21,0,193,226,99,127,
-1,0,220,209,253,119,45,0,99,119,5,0,61,62,28,0,
-128,255,74,22,61,103,13,0,122,87,0,0,204,225,60,95,
+32,54,52,0,129,255,72,140,10,232,224,233,194,21,29,48,
+28,56,35,22,24,0,34,71,1,0,27,72,191,255,242,241,
+49,6,0,105,133,0,125,143,49,0,38,6,116,177,132,0,
+129,255,220,145,29,80,35,223,9,0,35,231,5,0,35,239,
+1,0,35,255,13,0,3,30,32,0,127,0,128,7,225,0,
+6,232,7,224,224,233,226,13,49,6,0,105,133,0,125,143,
+49,0,0,58,191,255,118,242,129,226,201,5,29,48,129,255,
+190,139,64,6,255,0,132,7,225,48,6,232,61,143,8,0,
+224,137,218,45,0,218,229,37,27,224,61,215,13,0,193,226,
+220,209,61,55,25,0,61,79,17,0,61,127,21,0,61,62,
+28,0,99,127,1,0,31,114,99,119,5,0,36,70,36,133,
+128,255,68,19,61,103,13,0,122,87,0,0,204,225,60,95,
 0,0,224,89,226,5,61,87,33,0,65,82,125,87,33,0,
-65,218,61,143,37,0,241,217,246,213,229,5,61,135,33,0,
-65,130,125,135,33,0,36,127,29,133,15,62,1,0,100,63,
-29,133,38,6,28,165,132,0,129,255,20,146,61,119,33,0,
+65,218,61,143,37,0,241,217,134,221,229,5,61,135,33,0,
+65,130,125,135,33,0,36,127,41,133,15,62,1,0,100,63,
+41,133,38,6,140,177,132,0,129,255,20,145,61,119,33,0,
 224,113,194,5,32,86,19,48,165,5,0,82,68,6,255,48,
+132,7,225,112,6,232,61,143,8,0,7,200,224,137,202,45,
+0,218,213,37,27,224,61,215,13,0,193,226,220,209,61,55,
+25,0,61,79,17,0,61,127,21,0,61,62,28,0,99,127,
+1,0,99,207,5,0,36,70,36,133,128,255,170,18,61,111,
+13,0,122,87,0,0,205,225,60,103,0,0,224,97,226,5,
+61,95,33,0,65,90,125,95,33,0,65,218,61,87,37,0,
+234,217,150,221,229,5,61,143,33,0,65,138,125,143,33,0,
+36,135,41,133,16,62,1,0,100,63,41,133,38,6,160,177,
+132,0,129,255,122,144,61,127,33,0,224,121,194,5,32,86,
+19,48,165,5,0,82,68,6,255,112,128,7,3,30,224,255,
+99,71,25,0,99,255,13,0,99,231,5,0,99,223,9,0,
+7,224,99,239,1,0,9,216,6,232,224,233,138,13,32,54,
+52,0,129,255,122,138,10,232,224,233,194,21,29,48,28,56,
+35,22,24,0,34,71,1,0,27,72,191,255,36,240,49,6,
+24,105,133,0,125,143,49,0,38,6,180,177,132,0,129,255,
+14,144,29,80,35,223,9,0,35,231,5,0,35,239,1,0,
+35,255,13,0,3,30,32,0,127,0,128,7,225,0,6,232,
+7,224,224,233,226,13,49,6,24,105,133,0,125,143,49,0,
+0,58,191,255,168,240,129,226,201,5,29,48,129,255,240,137,
+64,6,255,0,128,7,225,48,6,232,61,143,8,0,224,137,
+170,37,0,218,181,29,27,224,61,215,13,0,193,226,220,209,
+61,55,25,0,61,62,28,0,128,255,128,19,61,119,13,0,
+122,87,0,0,206,225,60,111,0,0,224,105,226,5,61,103,
+33,0,65,98,125,103,33,0,65,218,61,95,37,0,235,217,
+182,229,229,5,61,87,33,0,65,82,125,87,33,0,36,143,
+41,133,17,62,1,0,100,63,41,133,38,6,220,177,132,0,
+129,255,92,143,61,135,33,0,224,129,194,5,32,86,19,48,
+165,5,0,82,64,6,255,48,128,7,3,30,224,255,99,71,
+25,0,99,255,13,0,99,231,5,0,99,223,9,0,7,224,
+99,239,1,0,9,216,6,232,224,233,138,13,32,54,52,0,
+129,255,92,137,10,232,224,233,178,29,29,48,28,56,35,22,
+24,0,34,71,1,0,27,72,191,255,6,239,49,6,48,105,
+133,0,125,143,49,0,38,6,16,178,132,0,129,255,240,142,
+253,63,45,0,38,6,240,177,132,0,129,255,226,142,29,80,
+35,223,9,0,35,231,5,0,35,239,1,0,35,255,13,0,
+3,30,32,0,127,0,128,7,225,0,6,232,7,224,224,233,
+226,13,49,6,48,105,133,0,125,143,49,0,0,58,191,255,
+124,239,129,226,201,5,29,48,129,255,196,136,64,6,255,0,
+130,7,225,48,6,232,61,143,8,0,224,137,170,45,0,218,
+181,37,27,224,193,226,61,215,13,0,61,79,21,0,61,55,
+25,0,61,71,17,0,220,209,253,127,45,0,99,127,1,0,
+61,62,28,0,128,255,82,18,61,111,13,0,122,87,0,0,
+205,225,60,103,0,0,224,97,226,5,61,95,33,0,65,90,
+125,95,33,0,65,218,61,87,37,0,234,217,182,221,229,5,
+61,143,33,0,65,138,125,143,33,0,36,135,41,133,16,62,
+1,0,100,63,41,133,38,6,48,178,132,0,129,255,32,142,
+61,127,33,0,224,121,194,5,32,86,19,48,165,5,0,82,
+66,6,255,48,128,7,3,30,224,255,99,71,25,0,99,255,
+13,0,99,231,5,0,99,223,9,0,7,224,99,239,1,0,
+9,216,6,232,224,233,138,13,32,54,52,0,129,255,32,136,
+10,232,224,233,178,29,29,48,28,56,35,22,24,0,34,71,
+1,0,27,72,191,255,202,237,49,6,72,105,133,0,125,143,
+49,0,38,6,68,178,132,0,129,255,180,141,253,63,45,0,
+38,6,100,178,132,0,129,255,166,141,29,80,35,223,9,0,
+35,231,5,0,35,239,1,0,35,255,13,0,3,30,32,0,
+127,0,128,7,225,0,6,232,7,224,224,233,226,13,49,6,
+72,105,133,0,125,143,49,0,0,58,191,255,64,238,129,226,
+201,5,29,48,129,255,136,135,64,6,255,0,130,7,225,48,
+6,232,61,143,8,0,224,137,170,45,0,218,181,37,27,224,
+193,226,61,215,13,0,61,79,21,0,61,55,25,0,61,71,
+17,0,220,209,253,127,45,0,99,127,1,0,61,62,28,0,
+128,255,186,17,61,111,13,0,122,87,0,0,205,225,60,103,
+0,0,224,97,226,5,61,95,33,0,65,90,125,95,33,0,
+65,218,61,87,37,0,234,217,182,221,229,5,61,143,33,0,
+65,138,125,143,33,0,36,135,41,133,16,62,1,0,100,63,
+41,133,38,6,116,178,132,0,129,255,228,140,61,127,33,0,
+224,121,194,5,32,86,19,48,165,5,0,82,66,6,255,48,
+128,7,3,30,224,255,99,71,25,0,99,255,13,0,99,231,
+5,0,99,223,9,0,7,224,99,239,1,0,9,216,6,232,
+224,233,138,13,32,54,52,0,129,255,228,134,10,232,224,233,
+194,21,29,48,28,56,35,22,24,0,34,71,1,0,27,72,
+191,255,142,236,49,6,96,105,133,0,125,143,49,0,38,6,
+136,178,132,0,129,255,120,140,29,80,35,223,9,0,35,231,
+5,0,35,239,1,0,35,255,13,0,3,30,32,0,127,0,
+128,7,225,0,6,232,7,224,224,233,226,13,49,6,96,105,
+133,0,125,143,49,0,0,58,191,255,18,237,129,226,201,5,
+29,48,129,255,90,134,64,6,255,0,128,7,225,48,6,232,
+61,143,8,0,224,137,202,37,0,218,213,29,27,224,61,215,
+13,0,193,226,220,209,61,55,25,0,61,71,5,0,61,62,
+28,0,128,255,62,17,61,119,13,0,122,87,0,0,206,225,
+60,111,0,0,224,105,226,5,61,103,33,0,65,98,125,103,
+33,0,65,218,61,95,37,0,235,217,150,229,229,5,61,87,
+33,0,65,82,125,87,33,0,36,143,41,133,17,62,1,0,
+100,63,41,133,38,6,168,178,132,0,129,255,194,139,61,135,
+33,0,224,129,194,5,32,86,19,48,165,5,0,82,64,6,
+255,48,128,7,3,30,224,255,99,71,25,0,99,255,13,0,
+99,231,5,0,99,223,9,0,7,224,99,239,1,0,9,216,
+6,232,224,233,138,13,32,54,52,0,129,255,194,133,10,232,
+224,233,194,77,29,48,28,56,35,22,24,0,34,71,1,0,
+27,72,191,255,108,235,49,6,120,105,133,0,125,143,49,0,
+38,6,188,178,132,0,129,255,86,139,253,63,45,0,38,6,
+208,178,132,0,129,255,72,139,61,55,21,0,128,255,148,23,
+61,63,21,0,0,50,32,70,0,2,191,255,60,107,125,87,
+8,0,234,0,224,81,170,37,61,55,17,0,32,62,255,0,
+128,255,90,23,61,63,17,0,32,54,0,2,32,70,0,2,
+191,255,22,107,125,87,8,0,234,0,224,81,250,13,253,63,
+45,0,32,54,0,2,32,70,0,80,32,78,0,2,128,255,
+48,30,125,87,8,0,234,0,224,81,29,80,35,223,9,0,
+35,231,5,0,35,239,1,0,35,255,13,0,3,30,32,0,
+127,0,128,7,225,0,6,232,7,224,224,233,226,13,49,6,
+120,105,133,0,125,143,49,0,0,58,191,255,128,235,129,226,
+201,5,29,48,129,255,200,132,64,6,255,0,130,7,225,48,
+6,232,61,143,8,0,224,137,170,45,0,218,181,37,27,224,
+193,226,61,215,13,0,61,79,21,0,61,55,25,0,61,71,
+17,0,220,209,253,127,45,0,99,127,1,0,61,62,28,0,
+128,255,220,15,61,111,13,0,122,87,0,0,205,225,60,103,
+0,0,224,97,226,5,61,95,33,0,65,90,125,95,33,0,
+65,218,61,87,37,0,234,217,182,221,229,5,61,143,33,0,
+65,138,125,143,33,0,36,135,41,133,16,62,1,0,100,63,
+41,133,38,6,224,178,132,0,129,255,36,138,61,127,33,0,
+224,121,194,5,32,86,19,48,165,5,0,82,66,6,255,48,
 128,7,3,30,224,255,99,71,25,0,99,255,13,0,99,231,
 5,0,99,223,9,0,7,224,99,239,1,0,9,216,6,232,
-224,233,138,13,32,54,52,0,129,255,20,140,10,232,224,233,
-178,45,29,48,28,56,35,22,24,0,34,71,1,0,27,72,
-191,255,38,246,49,6,48,93,133,0,125,143,49,0,38,6,
-48,165,132,0,129,255,168,145,61,55,17,0,128,255,92,34,
-32,22,0,1,61,135,17,0,32,118,238,0,194,129,80,119,
-0,0,65,18,2,6,0,254,230,245,61,55,17,0,32,62,
-0,1,128,255,28,41,29,80,35,223,9,0,35,231,5,0,
+224,233,138,13,32,54,56,0,129,255,36,132,10,232,224,233,
+194,37,29,48,28,56,35,22,24,0,34,71,1,0,27,72,
+191,255,206,233,49,6,144,105,133,0,125,143,49,0,253,127,
+45,0,130,122,125,127,53,0,202,5,1,98,125,103,53,0,
+38,6,244,178,132,0,129,255,166,137,61,63,53,0,38,6,
+32,179,132,0,129,255,152,137,29,80,35,223,9,0,35,231,
+5,0,35,239,1,0,35,255,13,0,3,30,32,0,127,0,
+128,7,225,0,6,232,7,224,224,233,226,13,49,6,144,105,
+133,0,125,143,49,0,0,58,191,255,50,234,129,226,201,5,
+29,48,129,255,122,131,64,6,255,0,128,7,225,48,6,232,
+61,143,8,0,224,137,202,37,0,218,213,29,27,224,61,215,
+13,0,193,226,220,209,61,55,25,0,61,71,53,0,61,62,
+28,0,128,255,84,15,61,119,13,0,122,87,0,0,206,225,
+60,111,0,0,224,105,226,5,61,103,33,0,65,98,125,103,
+33,0,65,218,61,95,37,0,235,217,150,229,229,5,61,87,
+33,0,65,82,125,87,33,0,36,143,41,133,17,62,1,0,
+100,63,41,133,38,6,84,179,132,0,129,255,226,136,61,135,
+33,0,224,129,194,5,32,86,19,48,165,5,0,82,64,6,
+255,48,128,7,3,30,224,255,99,71,25,0,99,255,13,0,
+99,231,5,0,99,223,9,0,7,224,99,239,1,0,9,216,
+6,232,224,233,138,13,32,54,52,0,129,255,226,130,10,232,
+224,233,194,21,29,48,28,56,35,22,24,0,34,71,1,0,
+27,72,191,255,140,232,49,6,168,105,133,0,125,143,49,0,
+38,6,104,179,132,0,129,255,118,136,29,80,35,223,9,0,
+35,231,5,0,35,239,1,0,35,255,13,0,3,30,32,0,
+127,0,128,7,225,0,6,232,7,224,224,233,226,13,49,6,
+168,105,133,0,125,143,49,0,0,58,191,255,16,233,129,226,
+201,5,29,48,129,255,88,130,64,6,255,0,128,7,225,48,
+6,232,61,143,8,0,224,137,234,37,0,218,245,29,27,224,
+61,215,13,0,193,226,220,209,61,55,25,0,61,79,41,0,
+61,71,17,0,61,62,28,0,128,255,174,16,61,119,13,0,
+122,87,0,0,206,225,60,111,0,0,224,105,226,5,61,103,
+33,0,65,98,125,103,33,0,65,218,61,95,37,0,235,217,
+246,221,229,5,61,87,33,0,65,82,125,87,33,0,36,143,
+41,133,17,62,1,0,100,63,41,133,38,6,128,179,132,0,
+129,255,188,135,61,135,33,0,224,129,194,5,32,86,19,48,
+165,5,0,82,64,6,255,48,128,7,3,30,224,255,99,71,
+25,0,99,255,13,0,99,231,5,0,99,223,9,0,7,224,
+99,239,1,0,9,216,6,232,224,233,138,13,32,54,52,0,
+129,255,188,129,10,232,224,233,194,21,29,48,28,56,35,22,
+24,0,34,71,1,0,27,72,191,255,102,231,49,6,192,105,
+133,0,125,143,49,0,38,6,148,179,132,0,129,255,80,135,
+29,80,35,223,9,0,35,231,5,0,35,239,1,0,35,255,
+13,0,3,30,32,0,127,0,128,7,225,0,6,232,7,224,
+224,233,226,13,49,6,192,105,133,0,125,143,49,0,0,58,
+191,255,234,231,129,226,201,5,29,48,129,255,50,129,64,6,
+255,0,128,7,225,48,6,232,61,143,8,0,224,137,234,37,
+0,218,245,29,27,224,61,215,13,0,193,226,220,209,61,55,
+25,0,61,79,41,0,61,71,17,0,61,62,28,0,128,255,
+66,16,61,119,13,0,122,87,0,0,206,225,60,111,0,0,
+224,105,226,5,61,103,33,0,65,98,125,103,33,0,65,218,
+61,95,37,0,235,217,246,221,229,5,61,87,33,0,65,82,
+125,87,33,0,36,143,41,133,17,62,1,0,100,63,41,133,
+38,6,172,179,132,0,129,255,150,134,61,135,33,0,224,129,
+194,5,32,86,19,48,165,5,0,82,64,6,255,48,128,7,
+3,30,224,255,99,71,25,0,99,255,13,0,99,231,5,0,
+99,223,9,0,7,224,99,239,1,0,9,216,6,232,224,233,
+138,13,32,54,52,0,129,255,150,128,10,232,224,233,194,21,
+29,48,28,56,35,22,24,0,34,71,1,0,27,72,191,255,
+64,230,49,6,216,105,133,0,125,143,49,0,38,6,192,179,
+132,0,129,255,42,134,29,80,35,223,9,0,35,231,5,0,
 35,239,1,0,35,255,13,0,3,30,32,0,127,0,128,7,
-225,0,6,232,7,224,224,233,226,13,49,6,48,93,133,0,
-125,143,49,0,0,58,191,255,124,246,129,226,201,5,29,48,
-129,255,92,139,64,6,255,0,128,7,225,48,6,232,61,143,
+225,0,6,232,7,224,224,233,226,13,49,6,216,105,133,0,
+125,143,49,0,0,58,191,255,196,230,129,226,201,5,29,48,
+129,255,12,128,64,6,255,0,128,7,225,48,6,232,61,143,
 8,0,224,137,234,37,0,218,245,29,27,224,61,215,13,0,
-193,226,220,209,61,55,25,0,61,79,21,0,61,71,17,0,
-61,62,28,0,128,255,118,21,61,119,13,0,122,87,0,0,
+193,226,220,209,61,55,25,0,61,79,41,0,61,71,17,0,
+61,62,28,0,128,255,188,15,61,119,13,0,122,87,0,0,
 206,225,60,111,0,0,224,105,226,5,61,103,33,0,65,98,
 125,103,33,0,65,218,61,95,37,0,235,217,246,221,229,5,
-61,87,33,0,65,82,125,87,33,0,36,143,29,133,17,62,
-1,0,100,63,29,133,38,6,92,165,132,0,129,255,192,144,
+61,87,33,0,65,82,125,87,33,0,36,143,41,133,17,62,
+1,0,100,63,41,133,38,6,216,179,132,0,129,255,112,133,
 61,135,33,0,224,129,194,5,32,86,19,48,165,5,0,82,
-64,6,255,48,128,7,3,30,220,255,99,71,29,0,99,255,
-17,0,99,231,9,0,99,223,13,0,7,224,99,239,5,0,
-9,216,6,232,224,233,138,13,32,54,72,0,129,255,192,138,
-10,232,224,233,146,53,29,48,28,56,35,22,28,0,34,71,
-1,0,27,72,191,255,210,244,49,6,72,93,133,0,125,143,
-49,0,38,6,112,165,132,0,129,255,84,144,64,22,128,0,
-34,62,0,0,64,134,0,1,48,70,0,0,8,72,167,73,
-9,96,144,98,125,103,65,0,125,63,69,0,125,79,61,0,
-125,71,57,0,125,63,53,0,99,103,1,0,38,6,128,165,
-132,0,129,255,26,144,29,80,35,223,13,0,35,231,9,0,
-35,239,5,0,35,255,17,0,3,30,36,0,127,0,128,7,
-225,0,6,232,7,224,224,233,226,13,49,6,72,93,133,0,
-125,143,49,0,0,58,191,255,28,245,129,226,201,5,29,48,
-129,255,252,137,64,6,255,0,134,7,225,48,6,232,61,143,
-8,0,224,137,170,53,0,218,181,45,61,127,61,0,61,79,
-57,0,61,71,53,0,61,55,25,0,61,215,13,0,99,127,
-1,0,61,119,65,0,27,224,99,119,5,0,193,226,61,111,
-69,0,220,209,99,111,9,0,61,62,28,0,128,255,176,20,
-61,95,13,0,122,87,0,0,203,225,60,87,0,0,224,81,
-226,5,61,143,33,0,65,138,125,143,33,0,65,218,61,135,
-37,0,240,217,182,213,229,5,61,127,33,0,65,122,125,127,
-33,0,36,119,29,133,14,62,1,0,100,63,29,133,38,6,
-208,165,132,0,129,255,72,143,61,111,33,0,224,105,194,5,
-32,86,19,48,165,5,0,82,70,6,255,48,128,7,3,30,
-224,255,99,71,25,0,99,255,13,0,99,231,5,0,99,223,
-9,0,7,224,99,239,1,0,9,216,6,232,224,233,138,13,
-32,54,52,0,129,255,72,137,10,232,224,233,178,29,29,48,
-28,56,35,22,24,0,34,71,1,0,27,72,191,255,90,243,
-49,6,96,93,133,0,125,143,49,0,38,6,228,165,132,0,
-129,255,220,142,253,63,45,0,38,6,16,166,132,0,129,255,
-206,142,29,80,35,223,9,0,35,231,5,0,35,239,1,0,
-35,255,13,0,3,30,32,0,127,0,128,7,225,0,6,232,
-7,224,224,233,226,13,49,6,96,93,133,0,125,143,49,0,
-0,58,191,255,208,243,129,226,201,5,29,48,129,255,176,136,
-64,6,255,0,130,7,225,48,6,232,61,143,8,0,224,137,
-170,45,0,218,181,37,27,224,193,226,61,215,13,0,61,79,
-21,0,61,55,25,0,61,71,17,0,220,209,253,127,45,0,
-99,127,1,0,61,62,28,0,128,255,64,20,61,111,13,0,
-122,87,0,0,205,225,60,103,0,0,224,97,226,5,61,95,
-33,0,65,90,125,95,33,0,65,218,61,87,37,0,234,217,
-182,221,229,5,61,143,33,0,65,138,125,143,33,0,36,135,
-29,133,16,62,1,0,100,63,29,133,38,6,32,166,132,0,
-129,255,12,142,61,127,33,0,224,121,194,5,32,86,19,48,
-165,5,0,82,66,6,255,48,128,7,97,0,6,232,224,233,
-138,13,32,54,52,0,129,255,38,136,10,232,224,233,146,13,
-29,48,191,255,188,241,49,6,120,93,133,0,125,143,49,0,
-29,80,64,6,127,0,3,30,224,255,99,71,25,0,99,255,
+64,6,255,48,128,7,3,30,224,255,99,71,25,0,99,255,
 13,0,99,231,5,0,99,223,9,0,7,224,99,239,1,0,
-9,216,6,232,224,233,138,13,32,54,52,0,129,255,224,135,
+9,216,6,232,224,233,138,13,32,54,52,0,129,255,112,127,
 10,232,224,233,194,21,29,48,28,56,35,22,24,0,34,71,
-1,0,27,72,191,255,242,241,49,6,120,93,133,0,125,143,
-49,0,38,6,52,166,132,0,129,255,116,141,29,80,35,223,
+1,0,27,72,191,255,26,229,49,6,240,105,133,0,125,143,
+49,0,38,6,236,179,132,0,129,255,4,133,29,80,35,223,
 9,0,35,231,5,0,35,239,1,0,35,255,13,0,3,30,
 32,0,127,0,128,7,225,0,6,232,7,224,224,233,226,13,
-49,6,120,93,133,0,125,143,49,0,0,58,191,255,118,242,
-129,226,201,5,29,48,129,255,86,135,64,6,255,0,132,7,
-225,48,6,232,61,143,8,0,224,137,218,45,0,218,229,37,
+49,6,240,105,133,0,125,143,49,0,0,58,191,255,158,229,
+129,226,201,5,29,48,129,255,230,126,64,6,255,0,128,7,
+225,48,6,232,61,143,8,0,224,137,234,37,0,218,245,29,
 27,224,61,215,13,0,193,226,220,209,61,55,25,0,61,79,
-17,0,61,127,21,0,61,62,28,0,99,127,1,0,31,114,
-99,119,5,0,36,70,24,133,128,255,68,19,61,103,13,0,
-122,87,0,0,204,225,60,95,0,0,224,89,226,5,61,87,
-33,0,65,82,125,87,33,0,65,218,61,143,37,0,241,217,
-134,221,229,5,61,135,33,0,65,130,125,135,33,0,36,127,
-29,133,15,62,1,0,100,63,29,133,38,6,76,166,132,0,
-129,255,172,140,61,119,33,0,224,113,194,5,32,86,19,48,
-165,5,0,82,68,6,255,48,132,7,225,112,6,232,61,143,
-8,0,7,200,224,137,202,45,0,218,213,37,27,224,61,215,
-13,0,193,226,220,209,61,55,25,0,61,79,17,0,61,127,
-21,0,61,62,28,0,99,127,1,0,99,207,5,0,36,70,
-24,133,128,255,170,18,61,111,13,0,122,87,0,0,205,225,
-60,103,0,0,224,97,226,5,61,95,33,0,65,90,125,95,
-33,0,65,218,61,87,37,0,234,217,150,221,229,5,61,143,
-33,0,65,138,125,143,33,0,36,135,29,133,16,62,1,0,
-100,63,29,133,38,6,96,166,132,0,129,255,18,140,61,127,
-33,0,224,121,194,5,32,86,19,48,165,5,0,82,68,6,
-255,112,128,7,3,30,224,255,99,71,25,0,99,255,13,0,
-99,231,5,0,99,223,9,0,7,224,99,239,1,0,9,216,
-6,232,224,233,138,13,32,54,52,0,129,255,18,134,10,232,
-224,233,194,21,29,48,28,56,35,22,24,0,34,71,1,0,
-27,72,191,255,36,240,49,6,144,93,133,0,125,143,49,0,
-38,6,116,166,132,0,129,255,166,139,29,80,35,223,9,0,
-35,231,5,0,35,239,1,0,35,255,13,0,3,30,32,0,
-127,0,128,7,225,0,6,232,7,224,224,233,226,13,49,6,
-144,93,133,0,125,143,49,0,0,58,191,255,168,240,129,226,
-201,5,29,48,129,255,136,133,64,6,255,0,128,7,225,48,
-6,232,61,143,8,0,224,137,170,37,0,218,181,29,27,224,
-61,215,13,0,193,226,220,209,61,55,25,0,61,62,28,0,
-128,255,128,19,61,119,13,0,122,87,0,0,206,225,60,111,
-0,0,224,105,226,5,61,103,33,0,65,98,125,103,33,0,
-65,218,61,95,37,0,235,217,182,229,229,5,61,87,33,0,
-65,82,125,87,33,0,36,143,29,133,17,62,1,0,100,63,
-29,133,38,6,156,166,132,0,129,255,244,138,61,135,33,0,
-224,129,194,5,32,86,19,48,165,5,0,82,64,6,255,48,
-128,7,3,30,224,255,99,71,25,0,99,255,13,0,99,231,
-5,0,99,223,9,0,7,224,99,239,1,0,9,216,6,232,
-224,233,138,13,32,54,52,0,129,255,244,132,10,232,224,233,
-178,29,29,48,28,56,35,22,24,0,34,71,1,0,27,72,
-191,255,6,239,49,6,168,93,133,0,125,143,49,0,38,6,
-208,166,132,0,129,255,136,138,253,63,45,0,38,6,176,166,
-132,0,129,255,122,138,29,80,35,223,9,0,35,231,5,0,
-35,239,1,0,35,255,13,0,3,30,32,0,127,0,128,7,
-225,0,6,232,7,224,224,233,226,13,49,6,168,93,133,0,
-125,143,49,0,0,58,191,255,124,239,129,226,201,5,29,48,
-129,255,92,132,64,6,255,0,130,7,225,48,6,232,61,143,
-8,0,224,137,170,45,0,218,181,37,27,224,193,226,61,215,
-13,0,61,79,21,0,61,55,25,0,61,71,17,0,220,209,
-253,127,45,0,99,127,1,0,61,62,28,0,128,255,82,18,
-61,111,13,0,122,87,0,0,205,225,60,103,0,0,224,97,
-226,5,61,95,33,0,65,90,125,95,33,0,65,218,61,87,
-37,0,234,217,182,221,229,5,61,143,33,0,65,138,125,143,
-33,0,36,135,29,133,16,62,1,0,100,63,29,133,38,6,
-240,166,132,0,129,255,184,137,61,127,33,0,224,121,194,5,
-32,86,19,48,165,5,0,82,66,6,255,48,128,7,3,30,
-224,255,99,71,25,0,99,255,13,0,99,231,5,0,99,223,
-9,0,7,224,99,239,1,0,9,216,6,232,224,233,138,13,
-32,54,52,0,129,255,184,131,10,232,224,233,178,29,29,48,
-28,56,35,22,24,0,34,71,1,0,27,72,191,255,202,237,
-49,6,192,93,133,0,125,143,49,0,38,6,4,167,132,0,
-129,255,76,137,253,63,45,0,38,6,36,167,132,0,129,255,
-62,137,29,80,35,223,9,0,35,231,5,0,35,239,1,0,
-35,255,13,0,3,30,32,0,127,0,128,7,225,0,6,232,
-7,224,224,233,226,13,49,6,192,93,133,0,125,143,49,0,
-0,58,191,255,64,238,129,226,201,5,29,48,129,255,32,131,
-64,6,255,0,130,7,225,48,6,232,61,143,8,0,224,137,
-170,45,0,218,181,37,27,224,193,226,61,215,13,0,61,79,
-21,0,61,55,25,0,61,71,17,0,220,209,253,127,45,0,
-99,127,1,0,61,62,28,0,128,255,186,17,61,111,13,0,
-122,87,0,0,205,225,60,103,0,0,224,97,226,5,61,95,
-33,0,65,90,125,95,33,0,65,218,61,87,37,0,234,217,
-182,221,229,5,61,143,33,0,65,138,125,143,33,0,36,135,
-29,133,16,62,1,0,100,63,29,133,38,6,52,167,132,0,
-129,255,124,136,61,127,33,0,224,121,194,5,32,86,19,48,
-165,5,0,82,66,6,255,48,128,7,3,30,224,255,99,71,
-25,0,99,255,13,0,99,231,5,0,99,223,9,0,7,224,
-99,239,1,0,9,216,6,232,224,233,138,13,32,54,52,0,
-129,255,124,130,10,232,224,233,194,21,29,48,28,56,35,22,
-24,0,34,71,1,0,27,72,191,255,142,236,49,6,216,93,
-133,0,125,143,49,0,38,6,72,167,132,0,129,255,16,136,
-29,80,35,223,9,0,35,231,5,0,35,239,1,0,35,255,
-13,0,3,30,32,0,127,0,128,7,225,0,6,232,7,224,
-224,233,226,13,49,6,216,93,133,0,125,143,49,0,0,58,
-191,255,18,237,129,226,201,5,29,48,129,255,242,129,64,6,
-255,0,128,7,225,48,6,232,61,143,8,0,224,137,202,37,
-0,218,213,29,27,224,61,215,13,0,193,226,220,209,61,55,
-25,0,61,71,5,0,61,62,28,0,128,255,62,17,61,119,
+41,0,61,71,17,0,61,62,28,0,128,255,100,15,61,119,
 13,0,122,87,0,0,206,225,60,111,0,0,224,105,226,5,
 61,103,33,0,65,98,125,103,33,0,65,218,61,95,37,0,
-235,217,150,229,229,5,61,87,33,0,65,82,125,87,33,0,
-36,143,29,133,17,62,1,0,100,63,29,133,38,6,104,167,
-132,0,129,255,90,135,61,135,33,0,224,129,194,5,32,86,
+235,217,246,221,229,5,61,87,33,0,65,82,125,87,33,0,
+36,143,41,133,17,62,1,0,100,63,41,133,38,6,4,180,
+132,0,129,255,74,132,61,135,33,0,224,129,194,5,32,86,
 19,48,165,5,0,82,64,6,255,48,128,7,3,30,224,255,
 99,71,25,0,99,255,13,0,99,231,5,0,99,223,9,0,
 7,224,99,239,1,0,9,216,6,232,224,233,138,13,32,54,
-52,0,129,255,90,129,10,232,224,233,194,77,29,48,28,56,
-35,22,24,0,34,71,1,0,27,72,191,255,108,235,49,6,
-240,93,133,0,125,143,49,0,38,6,124,167,132,0,129,255,
-238,134,253,63,45,0,38,6,144,167,132,0,129,255,224,134,
-61,55,21,0,128,255,148,23,61,63,21,0,0,50,32,70,
-0,2,191,255,120,111,125,87,8,0,234,0,224,81,170,37,
-61,55,17,0,32,62,255,0,128,255,90,23,61,63,17,0,
-32,54,0,2,32,70,0,2,191,255,82,111,125,87,8,0,
-234,0,224,81,250,13,253,63,45,0,32,54,0,2,32,70,
-0,80,32,78,0,2,128,255,48,30,125,87,8,0,234,0,
-224,81,29,80,35,223,9,0,35,231,5,0,35,239,1,0,
-35,255,13,0,3,30,32,0,127,0,128,7,225,0,6,232,
-7,224,224,233,226,13,49,6,240,93,133,0,125,143,49,0,
-0,58,191,255,128,235,129,226,201,5,29,48,129,255,96,128,
-64,6,255,0,130,7,225,48,6,232,61,143,8,0,224,137,
-170,45,0,218,181,37,27,224,193,226,61,215,13,0,61,79,
-21,0,61,55,25,0,61,71,17,0,220,209,253,127,45,0,
-99,127,1,0,61,62,28,0,128,255,220,15,61,111,13,0,
-122,87,0,0,205,225,60,103,0,0,224,97,226,5,61,95,
-33,0,65,90,125,95,33,0,65,218,61,87,37,0,234,217,
-182,221,229,5,61,143,33,0,65,138,125,143,33,0,36,135,
-29,133,16,62,1,0,100,63,29,133,38,6,160,167,132,0,
-129,255,188,133,61,127,33,0,224,121,194,5,32,86,19,48,
-165,5,0,82,66,6,255,48,128,7,3,30,224,255,99,71,
-25,0,99,255,13,0,99,231,5,0,99,223,9,0,7,224,
-99,239,1,0,9,216,6,232,224,233,138,13,32,54,56,0,
-129,255,188,127,10,232,224,233,194,37,29,48,28,56,35,22,
-24,0,34,71,1,0,27,72,191,255,206,233,49,6,8,94,
-133,0,125,143,49,0,253,127,45,0,130,122,125,127,53,0,
-202,5,1,98,125,103,53,0,38,6,180,167,132,0,129,255,
-62,133,61,63,53,0,38,6,224,167,132,0,129,255,48,133,
+52,0,129,255,74,126,10,232,224,233,178,29,29,48,28,56,
+35,22,24,0,34,71,1,0,27,72,191,255,244,227,49,6,
+8,106,133,0,125,143,49,0,38,6,24,180,132,0,129,255,
+222,131,253,63,45,0,38,6,52,180,132,0,129,255,208,131,
 29,80,35,223,9,0,35,231,5,0,35,239,1,0,35,255,
 13,0,3,30,32,0,127,0,128,7,225,0,6,232,7,224,
-224,233,226,13,49,6,8,94,133,0,125,143,49,0,0,58,
-191,255,50,234,129,226,201,5,29,48,129,255,18,127,64,6,
-255,0,128,7,225,48,6,232,61,143,8,0,224,137,202,37,
-0,218,213,29,27,224,61,215,13,0,193,226,220,209,61,55,
-25,0,61,71,53,0,61,62,28,0,128,255,84,15,61,119,
-13,0,122,87,0,0,206,225,60,111,0,0,224,105,226,5,
-61,103,33,0,65,98,125,103,33,0,65,218,61,95,37,0,
-235,217,150,229,229,5,61,87,33,0,65,82,125,87,33,0,
-36,143,29,133,17,62,1,0,100,63,29,133,38,6,20,168,
-132,0,129,255,122,132,61,135,33,0,224,129,194,5,32,86,
-19,48,165,5,0,82,64,6,255,48,128,7,3,30,224,255,
-99,71,25,0,99,255,13,0,99,231,5,0,99,223,9,0,
-7,224,99,239,1,0,9,216,6,232,224,233,138,13,32,54,
-52,0,129,255,122,126,10,232,224,233,194,21,29,48,28,56,
-35,22,24,0,34,71,1,0,27,72,191,255,140,232,49,6,
-32,94,133,0,125,143,49,0,38,6,40,168,132,0,129,255,
-14,132,29,80,35,223,9,0,35,231,5,0,35,239,1,0,
-35,255,13,0,3,30,32,0,127,0,128,7,225,0,6,232,
-7,224,224,233,226,13,49,6,32,94,133,0,125,143,49,0,
-0,58,191,255,16,233,129,226,201,5,29,48,129,255,240,125,
-64,6,255,0,128,7,225,48,6,232,61,143,8,0,224,137,
-234,37,0,218,245,29,27,224,61,215,13,0,193,226,220,209,
-61,55,25,0,61,79,41,0,61,71,17,0,61,62,28,0,
-128,255,174,16,61,119,13,0,122,87,0,0,206,225,60,111,
-0,0,224,105,226,5,61,103,33,0,65,98,125,103,33,0,
-65,218,61,95,37,0,235,217,246,221,229,5,61,87,33,0,
-65,82,125,87,33,0,36,143,29,133,17,62,1,0,100,63,
-29,133,38,6,64,168,132,0,129,255,84,131,61,135,33,0,
-224,129,194,5,32,86,19,48,165,5,0,82,64,6,255,48,
-128,7,3,30,224,255,99,71,25,0,99,255,13,0,99,231,
-5,0,99,223,9,0,7,224,99,239,1,0,9,216,6,232,
-224,233,138,13,32,54,52,0,129,255,84,125,10,232,224,233,
-194,21,29,48,28,56,35,22,24,0,34,71,1,0,27,72,
-191,255,102,231,49,6,56,94,133,0,125,143,49,0,38,6,
-84,168,132,0,129,255,232,130,29,80,35,223,9,0,35,231,
-5,0,35,239,1,0,35,255,13,0,3,30,32,0,127,0,
-128,7,225,0,6,232,7,224,224,233,226,13,49,6,56,94,
-133,0,125,143,49,0,0,58,191,255,234,231,129,226,201,5,
-29,48,129,255,202,124,64,6,255,0,128,7,225,48,6,232,
-61,143,8,0,224,137,234,37,0,218,245,29,27,224,61,215,
-13,0,193,226,220,209,61,55,25,0,61,79,41,0,61,71,
-17,0,61,62,28,0,128,255,66,16,61,119,13,0,122,87,
-0,0,206,225,60,111,0,0,224,105,226,5,61,103,33,0,
-65,98,125,103,33,0,65,218,61,95,37,0,235,217,246,221,
-229,5,61,87,33,0,65,82,125,87,33,0,36,143,29,133,
-17,62,1,0,100,63,29,133,38,6,108,168,132,0,129,255,
-46,130,61,135,33,0,224,129,194,5,32,86,19,48,165,5,
-0,82,64,6,255,48,128,7,3,30,224,255,99,71,25,0,
-99,255,13,0,99,231,5,0,99,223,9,0,7,224,99,239,
-1,0,9,216,6,232,224,233,138,13,32,54,52,0,129,255,
-46,124,10,232,224,233,194,21,29,48,28,56,35,22,24,0,
-34,71,1,0,27,72,191,255,64,230,49,6,80,94,133,0,
-125,143,49,0,38,6,128,168,132,0,129,255,194,129,29,80,
-35,223,9,0,35,231,5,0,35,239,1,0,35,255,13,0,
-3,30,32,0,127,0,128,7,225,0,6,232,7,224,224,233,
-226,13,49,6,80,94,133,0,125,143,49,0,0,58,191,255,
-196,230,129,226,201,5,29,48,129,255,164,123,64,6,255,0,
-128,7,225,48,6,232,61,143,8,0,224,137,234,37,0,218,
-245,29,27,224,61,215,13,0,193,226,220,209,61,55,25,0,
-61,79,41,0,61,71,17,0,61,62,28,0,128,255,188,15,
-61,119,13,0,122,87,0,0,206,225,60,111,0,0,224,105,
-226,5,61,103,33,0,65,98,125,103,33,0,65,218,61,95,
-37,0,235,217,246,221,229,5,61,87,33,0,65,82,125,87,
-33,0,36,143,29,133,17,62,1,0,100,63,29,133,38,6,
-152,168,132,0,129,255,8,129,61,135,33,0,224,129,194,5,
-32,86,19,48,165,5,0,82,64,6,255,48,128,7,3,30,
-224,255,99,71,25,0,99,255,13,0,99,231,5,0,99,223,
-9,0,7,224,99,239,1,0,9,216,6,232,224,233,138,13,
-32,54,52,0,129,255,8,123,10,232,224,233,194,21,29,48,
-28,56,35,22,24,0,34,71,1,0,27,72,191,255,26,229,
-49,6,104,94,133,0,125,143,49,0,38,6,172,168,132,0,
-129,255,156,128,29,80,35,223,9,0,35,231,5,0,35,239,
-1,0,35,255,13,0,3,30,32,0,127,0,128,7,225,0,
-6,232,7,224,224,233,226,13,49,6,104,94,133,0,125,143,
-49,0,0,58,191,255,158,229,129,226,201,5,29,48,129,255,
-126,122,64,6,255,0,128,7,225,48,6,232,61,143,8,0,
-224,137,234,37,0,218,245,29,27,224,61,215,13,0,193,226,
-220,209,61,55,25,0,61,79,41,0,61,71,17,0,61,62,
-28,0,128,255,100,15,61,119,13,0,122,87,0,0,206,225,
-60,111,0,0,224,105,226,5,61,103,33,0,65,98,125,103,
-33,0,65,218,61,95,37,0,235,217,246,221,229,5,61,87,
-33,0,65,82,125,87,33,0,36,143,29,133,17,62,1,0,
-100,63,29,133,38,6,196,168,132,0,129,255,226,127,61,135,
-33,0,224,129,194,5,32,86,19,48,165,5,0,82,64,6,
-255,48,128,7,3,30,224,255,99,71,25,0,99,255,13,0,
-99,231,5,0,99,223,9,0,7,224,99,239,1,0,9,216,
-6,232,224,233,138,13,32,54,52,0,129,255,226,121,10,232,
-224,233,178,29,29,48,28,56,35,22,24,0,34,71,1,0,
-27,72,191,255,244,227,49,6,128,94,133,0,125,143,49,0,
-38,6,216,168,132,0,129,255,118,127,253,63,45,0,38,6,
-244,168,132,0,129,255,104,127,29,80,35,223,9,0,35,231,
-5,0,35,239,1,0,35,255,13,0,3,30,32,0,127,0,
-128,7,225,0,6,232,7,224,224,233,226,13,49,6,128,94,
-133,0,125,143,49,0,0,58,191,255,106,228,129,226,201,5,
-29,48,129,255,74,121,64,6,255,0,130,7,225,48,6,232,
-61,143,8,0,224,137,170,45,0,218,181,37,27,224,193,226,
-61,215,13,0,61,79,17,0,61,55,25,0,61,71,5,0,
-220,209,253,127,45,0,99,127,1,0,61,62,28,0,128,255,
-210,14,61,111,13,0,122,87,0,0,205,225,60,103,0,0,
-224,97,226,5,61,95,33,0,65,90,125,95,33,0,65,218,
-61,87,37,0,234,217,182,221,229,5,61,143,33,0,65,138,
-125,143,33,0,36,135,29,133,16,62,1,0,100,63,29,133,
-38,6,4,169,132,0,129,255,166,126,61,127,33,0,224,121,
-194,5,32,86,19,48,165,5,0,82,66,6,255,48,144,7,
-97,0,6,232,3,48,39,6,238,238,34,34,128,255,146,115,
-3,48,128,255,34,120,224,81,210,13,3,48,128,255,10,117,
-38,6,24,169,132,0,129,255,102,126,1,138,125,143,29,0,
-229,5,38,6,60,169,132,0,129,255,84,126,0,82,80,6,
-127,0,128,7,225,112,6,200,7,216,35,239,25,0,8,208,
-61,143,1,0,35,23,29,0,9,224,226,137,241,21,125,7,
-1,0,191,255,16,154,10,48,128,255,190,21,224,81,226,13,
-61,6,140,169,132,0,25,48,29,56,128,255,122,90,29,48,
-129,255,12,126,32,22,39,48,149,53,28,48,32,62,238,0,
-128,255,162,14,61,55,1,0,28,56,32,70,0,2,191,255,
-156,102,10,16,224,17,170,37,61,55,1,0,26,56,32,70,
-0,2,191,255,136,102,10,16,224,17,138,29,61,55,1,0,
-28,56,32,70,0,2,191,255,170,216,10,16,224,17,234,13,
-26,48,28,56,32,70,0,2,128,255,248,14,61,103,1,0,
-10,16,12,102,0,2,125,103,1,0,59,95,1,0,65,90,
-123,95,1,0,2,80,64,6,255,112,130,7,225,48,8,208,
-35,231,25,0,9,232,29,48,7,216,32,62,238,0,128,255,
-36,14,28,48,0,58,29,64,32,134,129,0,99,135,1,0,
-32,78,0,2,128,255,250,20,10,16,224,17,202,37,28,48,
-0,58,26,64,32,118,129,0,99,119,1,0,32,78,0,2,
-128,255,222,20,10,16,224,17,234,21,28,48,0,58,29,64,
-32,102,36,0,99,103,1,0,32,78,0,2,128,255,194,20,
-10,16,224,17,138,13,26,48,29,56,32,70,0,2,128,255,
-98,14,10,16,59,87,1,0,65,82,123,87,1,0,2,80,
-66,6,255,48,130,7,225,48,8,208,35,231,25,0,9,232,
-29,48,7,216,0,58,128,255,156,13,28,48,0,58,29,64,
-32,134,129,0,99,135,1,0,32,78,0,2,128,255,114,20,
-10,16,224,17,250,29,28,48,0,58,32,70,0,2,128,255,
-128,20,10,16,224,17,234,21,28,48,0,58,29,64,32,110,
-36,0,99,111,1,0,32,78,0,2,128,255,68,20,10,16,
-224,17,138,13,26,48,29,56,32,70,0,2,128,255,228,13,
-10,16,59,95,1,0,65,90,123,95,1,0,2,80,66,6,
-255,48,128,7,225,48,8,216,35,215,21,0,9,232,29,48,
-7,224,0,58,128,255,30,13,29,56,0,50,32,70,0,2,
-191,255,26,101,10,16,224,17,170,29,26,48,0,58,32,70,
-0,2,128,255,20,20,10,16,224,17,154,21,29,56,0,50,
-32,70,0,2,191,255,44,215,10,16,224,17,138,13,27,48,
-29,56,32,70,0,2,128,255,122,13,10,16,60,119,1,0,
-65,114,124,119,1,0,2,80,64,6,255,48,39,143,1,0,
-0,82,65,138,103,143,1,0,127,0,130,7,225,112,9,224,
-35,223,29,0,227,215,33,0,8,232,29,48,7,200,0,58,
-128,255,162,12,27,48,29,56,28,64,32,134,0,80,99,135,
-1,0,26,72,128,255,216,13,10,16,224,17,250,29,29,48,
-128,255,152,12,27,48,29,56,28,64,32,110,0,80,99,111,
-1,0,26,72,128,255,184,13,10,16,224,17,250,13,29,48,
-128,255,144,12,27,48,29,56,28,64,32,86,0,80,99,87,
-1,0,26,72,128,255,152,13,10,16,57,143,1,0,65,138,
-121,143,1,0,2,80,66,6,255,112,132,7,225,112,6,200,
-7,208,8,232,9,224,29,48,128,255,64,12,32,22,0,1,
-32,134,238,0,2,136,221,137,81,135,0,0,65,18,2,6,
-0,254,246,245,29,48,32,62,0,1,128,255,4,19,28,48,
-32,62,238,0,128,255,254,11,28,48,32,62,0,1,128,255,
-216,18,29,48,28,56,32,70,0,2,35,78,4,0,128,255,
-148,12,10,16,224,17,178,37,25,48,35,23,5,0,59,6,
-164,169,132,0,2,112,221,113,142,79,1,0,2,64,220,17,
-130,95,1,0,99,95,1,0,27,56,128,255,122,87,35,23,
-5,0,27,48,2,80,221,81,138,71,1,0,2,56,220,17,
-130,79,1,0,129,255,248,122,32,22,103,48,58,119,1,0,
-65,114,122,119,1,0,2,80,68,6,255,112,134,7,225,243,
-35,223,57,0,7,176,27,232,27,192,35,207,53,0,6,184,
-25,48,194,50,129,255,204,116,10,208,0,18,181,13,2,112,
-194,114,61,95,1,0,218,113,110,95,1,0,93,238,1,0,
-65,18,249,17,214,245,25,56,27,64,27,232,29,72,99,199,
-1,0,99,191,5,0,99,215,9,0,0,50,128,255,206,14,
-10,224,224,225,250,45,25,56,27,64,29,72,99,199,1,0,
-99,191,5,0,99,215,9,0,128,54,255,255,128,255,174,14,
-10,224,224,225,250,29,25,56,27,64,29,72,99,199,1,0,
-99,191,5,0,99,215,9,0,32,54,85,85,128,255,142,14,
-10,224,224,225,250,13,25,56,27,64,29,72,99,199,1,0,
-99,191,5,0,99,215,9,0,128,54,170,170,128,255,110,14,
-10,224,26,48,129,255,72,116,54,111,1,0,65,106,118,111,
-1,0,28,80,70,6,255,243,128,7,225,48,7,208,8,232,
-9,224,227,223,21,0,29,48,0,58,128,255,168,10,29,56,
-28,64,27,72,0,50,128,255,140,12,10,16,224,17,250,21,
+224,233,226,13,49,6,8,106,133,0,125,143,49,0,0,58,
+191,255,106,228,129,226,201,5,29,48,129,255,178,125,64,6,
+255,0,130,7,225,48,6,232,61,143,8,0,224,137,170,45,
+0,218,181,37,27,224,193,226,61,215,13,0,61,79,17,0,
+61,55,25,0,61,71,5,0,220,209,253,127,45,0,99,127,
+1,0,61,62,28,0,128,255,210,14,61,111,13,0,122,87,
+0,0,205,225,60,103,0,0,224,97,226,5,61,95,33,0,
+65,90,125,95,33,0,65,218,61,87,37,0,234,217,182,221,
+229,5,61,143,33,0,65,138,125,143,33,0,36,135,41,133,
+16,62,1,0,100,63,41,133,38,6,68,180,132,0,129,255,
+14,131,61,127,33,0,224,121,194,5,32,86,19,48,165,5,
+0,82,66,6,255,48,144,7,97,0,6,232,3,48,39,6,
+238,238,34,34,128,255,98,117,3,48,128,255,242,121,224,81,
+210,13,3,48,128,255,218,118,38,6,88,180,132,0,129,255,
+206,130,1,138,125,143,29,0,229,5,38,6,124,180,132,0,
+129,255,188,130,0,82,80,6,127,0,128,7,225,112,6,200,
+7,216,35,239,25,0,8,208,61,143,1,0,35,23,29,0,
+9,224,226,137,241,21,125,7,1,0,191,255,188,152,10,48,
+128,255,190,21,224,81,226,13,61,6,204,180,132,0,25,48,
+29,56,128,255,122,90,29,48,129,255,116,130,32,22,39,48,
+149,53,28,48,32,62,238,0,128,255,162,14,61,55,1,0,
+28,56,32,70,0,2,191,255,96,98,10,16,224,17,170,37,
+61,55,1,0,26,56,32,70,0,2,191,255,76,98,10,16,
+224,17,138,29,61,55,1,0,28,56,32,70,0,2,191,255,
+216,215,10,16,224,17,234,13,26,48,28,56,32,70,0,2,
+128,255,248,14,61,103,1,0,10,16,12,102,0,2,125,103,
+1,0,59,95,1,0,65,90,123,95,1,0,2,80,64,6,
+255,112,130,7,225,48,8,208,35,231,25,0,9,232,29,48,
+7,216,32,62,238,0,128,255,36,14,28,48,0,58,29,64,
+32,134,129,0,99,135,1,0,32,78,0,2,128,255,250,20,
+10,16,224,17,202,37,28,48,0,58,26,64,32,118,129,0,
+99,119,1,0,32,78,0,2,128,255,222,20,10,16,224,17,
+234,21,28,48,0,58,29,64,32,102,36,0,99,103,1,0,
+32,78,0,2,128,255,194,20,10,16,224,17,138,13,26,48,
+29,56,32,70,0,2,128,255,98,14,10,16,59,87,1,0,
+65,82,123,87,1,0,2,80,66,6,255,48,130,7,225,48,
+8,208,35,231,25,0,9,232,29,48,7,216,0,58,128,255,
+156,13,28,48,0,58,29,64,32,134,129,0,99,135,1,0,
+32,78,0,2,128,255,114,20,10,16,224,17,250,29,28,48,
+0,58,32,70,0,2,128,255,128,20,10,16,224,17,234,21,
+28,48,0,58,29,64,32,110,36,0,99,111,1,0,32,78,
+0,2,128,255,68,20,10,16,224,17,138,13,26,48,29,56,
+32,70,0,2,128,255,228,13,10,16,59,95,1,0,65,90,
+123,95,1,0,2,80,66,6,255,48,128,7,225,48,8,216,
+35,215,21,0,9,232,29,48,7,224,0,58,128,255,30,13,
+29,56,0,50,32,70,0,2,191,255,222,96,10,16,224,17,
+170,29,26,48,0,58,32,70,0,2,128,255,20,20,10,16,
+224,17,154,21,29,56,0,50,32,70,0,2,191,255,90,214,
+10,16,224,17,138,13,27,48,29,56,32,70,0,2,128,255,
+122,13,10,16,60,119,1,0,65,114,124,119,1,0,2,80,
+64,6,255,48,39,143,1,0,0,82,65,138,103,143,1,0,
+127,0,130,7,225,112,9,224,35,223,29,0,227,215,33,0,
+8,232,29,48,7,200,0,58,128,255,162,12,27,48,29,56,
+28,64,32,134,0,80,99,135,1,0,26,72,128,255,216,13,
+10,16,224,17,250,29,29,48,128,255,152,12,27,48,29,56,
+28,64,32,110,0,80,99,111,1,0,26,72,128,255,184,13,
+10,16,224,17,250,13,29,48,128,255,144,12,27,48,29,56,
+28,64,32,86,0,80,99,87,1,0,26,72,128,255,152,13,
+10,16,57,143,1,0,65,138,121,143,1,0,2,80,66,6,
+255,112,132,7,225,112,6,200,7,208,8,232,9,224,29,48,
+128,255,64,12,32,22,0,1,32,134,238,0,2,136,221,137,
+81,135,0,0,65,18,2,6,0,254,246,245,29,48,32,62,
+0,1,128,255,4,19,28,48,32,62,238,0,128,255,254,11,
+28,48,32,62,0,1,128,255,216,18,29,48,28,56,32,70,
+0,2,35,78,4,0,128,255,148,12,10,16,224,17,178,37,
+25,48,35,23,5,0,59,6,228,180,132,0,2,112,221,113,
+142,79,1,0,2,64,220,17,130,95,1,0,99,95,1,0,
+27,56,128,255,122,87,35,23,5,0,27,48,2,80,221,81,
+138,71,1,0,2,56,220,17,130,79,1,0,129,255,96,127,
+32,22,103,48,58,119,1,0,65,114,122,119,1,0,2,80,
+68,6,255,112,134,7,225,243,35,223,57,0,7,176,27,232,
+27,192,35,207,53,0,6,184,25,48,194,50,129,255,52,121,
+10,208,0,18,181,13,2,112,194,114,61,95,1,0,218,113,
+110,95,1,0,93,238,1,0,65,18,249,17,214,245,25,56,
+27,64,27,232,29,72,99,199,1,0,99,191,5,0,99,215,
+9,0,0,50,128,255,206,14,10,224,224,225,250,45,25,56,
+27,64,29,72,99,199,1,0,99,191,5,0,99,215,9,0,
+128,54,255,255,128,255,174,14,10,224,224,225,250,29,25,56,
+27,64,29,72,99,199,1,0,99,191,5,0,99,215,9,0,
+32,54,85,85,128,255,142,14,10,224,224,225,250,13,25,56,
+27,64,29,72,99,199,1,0,99,191,5,0,99,215,9,0,
+128,54,170,170,128,255,110,14,10,224,26,48,129,255,176,120,
+54,111,1,0,65,106,118,111,1,0,28,80,70,6,255,243,
+128,7,225,48,7,208,8,232,9,224,227,223,21,0,29,48,
+0,58,128,255,168,10,29,56,28,64,27,72,0,50,128,255,
+140,12,10,16,224,17,250,21,29,48,128,255,166,10,29,56,
+28,64,27,72,0,50,128,255,116,12,10,16,224,17,186,13,
 29,48,128,255,166,10,29,56,28,64,27,72,0,50,128,255,
-116,12,10,16,224,17,186,13,29,48,128,255,166,10,29,56,
-28,64,27,72,0,50,128,255,92,12,10,16,58,103,1,0,
-65,98,122,103,1,0,2,80,64,6,255,48,132,7,225,243,
-6,224,7,176,8,184,9,216,35,215,45,0,35,199,49,0,
-128,255,22,17,119,87,1,0,224,81,57,6,232,169,132,0,
-191,255,124,100,191,255,110,149,10,48,128,255,28,17,10,232,
-224,233,226,13,191,255,96,100,28,48,25,56,128,255,216,85,
-25,48,129,255,106,121,32,238,39,48,128,7,150,1,216,126,
-1,0,178,37,27,64,26,72,99,231,1,0,32,54,85,0,
-32,62,170,0,128,255,76,14,10,232,224,233,210,5,191,255,
-38,100,128,7,110,1,27,64,26,72,99,231,1,0,32,54,
-170,0,32,62,85,0,128,255,42,14,10,232,224,233,210,5,
-191,255,4,100,128,7,76,1,216,102,2,0,130,109,27,48,
-128,255,248,9,26,48,32,62,238,0,128,255,168,9,27,56,
-0,50,32,70,0,2,191,255,164,97,224,81,146,21,191,255,
-214,99,61,6,0,170,132,0,28,48,29,56,128,255,72,85,
-29,48,129,255,218,120,32,238,39,48,128,7,6,1,26,56,
-0,50,32,70,0,2,191,255,170,211,224,81,130,21,191,255,
-166,99,61,6,24,170,132,0,28,48,29,56,128,255,24,85,
-29,48,129,255,170,120,32,238,39,48,181,109,27,48,26,56,
-32,70,0,2,35,78,4,0,128,255,234,9,10,232,224,233,
-226,37,191,255,114,99,28,48,35,23,5,0,61,6,48,170,
-132,0,2,128,219,129,144,79,1,0,2,64,218,17,130,111,
-1,0,99,111,1,0,29,56,128,255,204,84,35,23,5,0,
-29,48,2,96,219,97,140,71,1,0,2,56,218,17,130,79,
-1,0,129,255,74,120,32,238,36,48,181,61,216,134,4,0,
-210,13,27,48,55,63,1,0,28,64,128,255,64,14,10,232,
-224,233,194,5,191,255,16,99,197,45,132,194,169,45,191,255,
-4,148,10,48,128,255,178,15,224,81,178,13,28,48,25,56,
-128,255,116,84,25,48,129,255,6,120,32,238,39,48,149,29,
-191,255,228,98,191,255,222,147,10,48,128,255,140,15,10,232,
-224,233,178,13,28,48,25,56,128,255,76,84,25,48,129,255,
-222,119,32,238,39,48,213,5,128,255,86,15,119,87,1,0,
-54,95,1,0,65,90,118,95,1,0,29,80,68,6,255,243,
-39,143,1,0,0,82,65,138,103,143,1,0,127,0,130,7,
-225,240,6,192,7,200,8,232,9,208,227,231,33,0,0,218,
-229,21,27,48,128,255,108,16,224,81,138,21,61,6,128,170,
-132,0,24,48,29,56,28,64,128,255,236,83,29,48,28,56,
-129,255,124,119,32,22,105,48,213,45,65,218,252,217,166,237,
-29,48,0,58,128,255,14,8,29,56,26,64,28,72,32,110,
-0,80,99,111,1,0,0,50,128,255,104,10,29,48,128,255,
-10,8,29,56,26,64,28,72,32,94,0,80,99,95,1,0,
-0,50,128,255,78,10,29,48,128,255,8,8,29,56,26,64,
-28,72,32,142,0,80,99,143,1,0,0,50,128,255,52,10,
-10,16,57,135,1,0,65,130,121,135,1,0,2,80,66,6,
-255,240,130,7,225,112,6,200,7,208,8,232,9,216,227,231,
-29,0,28,48,128,255,204,15,224,81,138,21,61,6,184,170,
-132,0,25,48,29,56,28,64,128,255,76,83,29,48,28,56,
-129,255,220,118,32,22,105,48,133,53,29,48,0,58,128,255,
-116,7,29,56,27,64,28,72,32,110,0,80,99,111,1,0,
-0,50,128,255,102,10,10,16,224,17,250,29,29,48,128,255,
-106,7,29,56,27,64,28,72,32,86,0,80,99,87,1,0,
-0,50,128,255,70,10,10,16,224,17,250,13,29,48,128,255,
-98,7,29,56,27,64,28,72,32,126,0,80,99,127,1,0,
-0,50,128,255,38,10,10,16,58,119,1,0,65,114,122,119,
-1,0,2,80,66,6,255,112,130,7,225,16,7,232,8,224,
-99,7,2,0,35,54,2,0,128,255,30,112,10,216,227,63,
-3,0,38,6,208,170,132,0,129,255,68,118,227,135,3,0,
-61,127,1,0,124,135,10,0,65,122,125,127,1,0,27,80,
-66,6,255,16,132,7,225,112,6,200,7,208,8,232,9,224,
-227,63,33,0,0,50,32,70,0,80,32,78,0,2,128,255,
-208,13,10,16,224,17,202,69,29,56,0,50,32,70,0,2,
-191,255,224,208,10,16,224,17,186,61,0,18,2,80,220,81,
-138,119,1,0,174,118,255,0,74,119,0,0,65,18,2,6,
-0,254,214,245,29,48,28,56,32,70,0,2,35,78,4,0,
-128,255,34,7,10,16,224,17,178,37,25,48,35,23,5,0,
-59,6,232,170,132,0,2,88,220,89,139,79,1,0,2,64,
-221,17,130,135,1,0,99,135,1,0,27,56,128,255,8,82,
-35,23,5,0,27,48,2,120,220,121,143,71,1,0,2,56,
-221,17,130,79,1,0,129,255,134,117,32,22,104,48,58,95,
-1,0,65,90,122,95,1,0,2,80,68,6,255,112,128,7,
-225,241,6,216,7,184,8,192,0,226,0,234,128,255,42,13,
-10,248,97,194,177,29,210,5,99,194,161,13,130,21,229,21,
-223,134,32,0,16,6,224,255,210,21,1,234,181,21,223,102,
-96,0,12,6,160,255,226,13,1,234,197,13,223,134,224,0,
-16,6,32,255,242,5,1,234,213,5,32,230,106,48,128,7,
-32,2,224,233,242,13,61,6,152,171,132,0,27,48,29,56,
-128,255,116,81,29,48,129,255,6,117,32,230,106,48,128,7,
-0,2,0,234,245,85,97,234,209,5,242,5,98,234,130,13,
-149,13,32,214,32,0,229,5,32,214,64,0,181,5,32,214,
-128,0,29,200,194,202,25,48,128,255,62,12,128,255,154,12,
-26,88,74,89,146,21,60,6,212,171,132,0,27,48,28,56,
-29,64,128,255,34,81,28,48,29,56,129,255,178,116,32,230,
-106,48,128,7,172,1,25,48,128,255,22,12,128,255,106,12,
-26,136,74,137,250,137,146,21,60,6,16,172,132,0,27,48,
-28,56,29,64,128,255,240,80,28,48,29,56,129,255,128,116,
-32,230,106,48,128,7,122,1,97,234,209,5,146,13,98,234,
-194,13,245,13,64,86,0,0,202,191,36,241,165,13,64,86,
-0,0,202,191,38,241,213,5,64,86,0,0,202,191,40,241,
-65,234,248,233,150,173,1,50,128,255,22,12,32,54,232,3,
-129,255,30,17,128,255,18,12,10,248,223,126,2,0,242,21,
-64,86,0,0,202,191,32,241,64,86,0,0,202,191,34,241,
-61,6,80,172,132,0,27,48,29,56,128,255,122,80,29,48,
-129,255,12,116,32,230,106,48,128,7,6,1,223,94,4,0,
-0,50,100,90,130,29,128,255,200,11,64,86,0,0,202,191,
-32,241,64,86,0,0,202,191,34,241,61,6,136,172,132,0,
-27,48,29,56,128,255,64,80,29,48,129,255,210,115,32,230,
-106,48,229,101,128,255,154,11,32,54,232,3,129,255,162,16,
-128,255,150,11,202,126,2,0,98,122,162,21,64,86,0,0,
-202,191,32,241,61,6,40,171,132,0,27,48,29,56,128,255,
-6,80,29,48,129,255,152,115,32,230,106,48,149,77,64,86,
-0,0,202,191,32,241,64,86,0,0,202,191,34,241,128,255,
-96,11,32,54,232,3,129,255,88,16,128,255,76,11,131,82,
-233,21,64,86,0,0,202,191,32,241,64,86,0,0,202,191,
-34,241,61,6,196,172,132,0,27,48,29,56,128,255,184,79,
-29,48,129,255,74,115,32,230,106,48,165,37,128,255,34,11,
-32,54,232,3,129,255,26,16,128,255,14,11,10,248,64,86,
-0,0,202,191,32,241,64,86,0,0,202,191,34,241,223,126,
-4,0,100,122,210,13,61,6,96,171,132,0,27,48,29,56,
-128,255,116,79,29,48,129,255,6,115,32,230,106,48,55,103,
-1,0,65,98,119,103,1,0,28,80,64,6,255,241,130,7,
-225,240,9,192,24,48,7,200,0,58,8,232,32,134,36,0,
-99,135,1,0,32,78,0,2,128,255,102,10,10,208,224,209,
-202,69,189,103,3,0,216,98,157,135,3,0,208,130,204,129,
-189,103,1,0,200,98,208,97,157,223,1,0,204,217,27,56,
-38,6,252,172,132,0,129,255,166,114,189,119,5,0,200,114,
-157,111,5,0,206,105,13,224,220,0,224,225,226,37,28,6,
-255,254,185,5,32,230,0,1,28,56,38,6,20,173,132,0,
-129,255,124,114,6,18,149,13,2,120,221,121,65,218,187,119,
-255,255,79,119,0,0,65,18,28,102,6,0,236,17,214,245,
-24,48,0,58,29,64,32,94,129,0,99,95,1,0,32,78,
-0,2,128,255,220,9,10,208,57,87,1,0,65,82,121,87,
-1,0,26,80,66,6,255,240,130,7,225,112,7,200,0,58,
-8,232,9,48,32,134,36,0,99,135,1,0,32,78,0,2,
-128,255,174,9,10,208,224,209,138,61,189,103,3,0,216,98,
+92,12,10,16,58,103,1,0,65,98,122,103,1,0,2,80,
+64,6,255,48,132,7,225,243,6,224,7,176,8,184,9,216,
+35,215,45,0,35,199,49,0,128,255,22,17,119,87,1,0,
+224,81,57,6,40,181,132,0,191,255,64,96,191,255,26,148,
+10,48,128,255,28,17,10,232,224,233,226,13,191,255,36,96,
+28,48,25,56,128,255,216,85,25,48,129,255,210,125,32,238,
+39,48,128,7,150,1,216,126,1,0,178,37,27,64,26,72,
+99,231,1,0,32,54,85,0,32,62,170,0,128,255,76,14,
+10,232,224,233,210,5,191,255,234,95,128,7,110,1,27,64,
+26,72,99,231,1,0,32,54,170,0,32,62,85,0,128,255,
+42,14,10,232,224,233,210,5,191,255,200,95,128,7,76,1,
+216,102,2,0,130,109,27,48,128,255,248,9,26,48,32,62,
+238,0,128,255,168,9,27,56,0,50,32,70,0,2,191,255,
+104,93,224,81,146,21,191,255,154,95,61,6,64,181,132,0,
+28,48,29,56,128,255,72,85,29,48,129,255,66,125,32,238,
+39,48,128,7,6,1,26,56,0,50,32,70,0,2,191,255,
+216,210,224,81,130,21,191,255,106,95,61,6,88,181,132,0,
+28,48,29,56,128,255,24,85,29,48,129,255,18,125,32,238,
+39,48,181,109,27,48,26,56,32,70,0,2,35,78,4,0,
+128,255,234,9,10,232,224,233,226,37,191,255,54,95,28,48,
+35,23,5,0,61,6,112,181,132,0,2,128,219,129,144,79,
+1,0,2,64,218,17,130,111,1,0,99,111,1,0,29,56,
+128,255,204,84,35,23,5,0,29,48,2,96,219,97,140,71,
+1,0,2,56,218,17,130,79,1,0,129,255,178,124,32,238,
+36,48,181,61,216,134,4,0,210,13,27,48,55,63,1,0,
+28,64,128,255,64,14,10,232,224,233,194,5,191,255,212,94,
+197,45,132,194,169,45,191,255,176,146,10,48,128,255,178,15,
+224,81,178,13,28,48,25,56,128,255,116,84,25,48,129,255,
+110,124,32,238,39,48,149,29,191,255,168,94,191,255,138,146,
+10,48,128,255,140,15,10,232,224,233,178,13,28,48,25,56,
+128,255,76,84,25,48,129,255,70,124,32,238,39,48,213,5,
+128,255,86,15,119,87,1,0,54,95,1,0,65,90,118,95,
+1,0,29,80,68,6,255,243,39,143,1,0,0,82,65,138,
+103,143,1,0,127,0,130,7,225,240,6,192,7,200,8,232,
+9,208,227,231,33,0,0,218,229,21,27,48,128,255,108,16,
+224,81,138,21,61,6,192,181,132,0,24,48,29,56,28,64,
+128,255,236,83,29,48,28,56,129,255,228,123,32,22,105,48,
+213,45,65,218,252,217,166,237,29,48,0,58,128,255,14,8,
+29,56,26,64,28,72,32,110,0,80,99,111,1,0,0,50,
+128,255,104,10,29,48,128,255,10,8,29,56,26,64,28,72,
+32,94,0,80,99,95,1,0,0,50,128,255,78,10,29,48,
+128,255,8,8,29,56,26,64,28,72,32,142,0,80,99,143,
+1,0,0,50,128,255,52,10,10,16,57,135,1,0,65,130,
+121,135,1,0,2,80,66,6,255,240,130,7,225,112,6,200,
+7,208,8,232,9,216,227,231,29,0,28,48,128,255,204,15,
+224,81,138,21,61,6,248,181,132,0,25,48,29,56,28,64,
+128,255,76,83,29,48,28,56,129,255,68,123,32,22,105,48,
+133,53,29,48,0,58,128,255,116,7,29,56,27,64,28,72,
+32,110,0,80,99,111,1,0,0,50,128,255,102,10,10,16,
+224,17,250,29,29,48,128,255,106,7,29,56,27,64,28,72,
+32,86,0,80,99,87,1,0,0,50,128,255,70,10,10,16,
+224,17,250,13,29,48,128,255,98,7,29,56,27,64,28,72,
+32,126,0,80,99,127,1,0,0,50,128,255,38,10,10,16,
+58,119,1,0,65,114,122,119,1,0,2,80,66,6,255,112,
+130,7,225,16,7,232,8,224,99,7,2,0,35,54,2,0,
+128,255,238,113,10,216,227,63,3,0,38,6,16,182,132,0,
+129,255,172,122,227,135,3,0,61,127,1,0,124,135,10,0,
+65,122,125,127,1,0,27,80,66,6,255,16,132,7,225,112,
+6,200,7,208,8,232,9,224,227,63,33,0,0,50,32,70,
+0,80,32,78,0,2,128,255,208,13,10,16,224,17,202,69,
+29,56,0,50,32,70,0,2,191,255,14,208,10,16,224,17,
+186,61,0,18,2,80,220,81,138,119,1,0,174,118,255,0,
+74,119,0,0,65,18,2,6,0,254,214,245,29,48,28,56,
+32,70,0,2,35,78,4,0,128,255,34,7,10,16,224,17,
+178,37,25,48,35,23,5,0,59,6,40,182,132,0,2,88,
+220,89,139,79,1,0,2,64,221,17,130,135,1,0,99,135,
+1,0,27,56,128,255,8,82,35,23,5,0,27,48,2,120,
+220,121,143,71,1,0,2,56,221,17,130,79,1,0,129,255,
+238,121,32,22,104,48,58,95,1,0,65,90,122,95,1,0,
+2,80,68,6,255,112,128,7,225,241,6,216,7,184,8,192,
+0,226,0,234,128,255,42,13,10,248,97,194,177,29,210,5,
+99,194,161,13,130,21,229,21,223,134,32,0,16,6,224,255,
+210,21,1,234,181,21,223,102,96,0,12,6,160,255,226,13,
+1,234,197,13,223,134,224,0,16,6,32,255,242,5,1,234,
+213,5,32,230,106,48,128,7,32,2,224,233,242,13,61,6,
+216,182,132,0,27,48,29,56,128,255,116,81,29,48,129,255,
+110,121,32,230,106,48,128,7,0,2,0,234,245,85,97,234,
+209,5,242,5,98,234,130,13,149,13,32,214,32,0,229,5,
+32,214,64,0,181,5,32,214,128,0,29,200,194,202,25,48,
+128,255,62,12,128,255,154,12,26,88,74,89,146,21,60,6,
+20,183,132,0,27,48,28,56,29,64,128,255,34,81,28,48,
+29,56,129,255,26,121,32,230,106,48,128,7,172,1,25,48,
+128,255,22,12,128,255,106,12,26,136,74,137,250,137,146,21,
+60,6,80,183,132,0,27,48,28,56,29,64,128,255,240,80,
+28,48,29,56,129,255,232,120,32,230,106,48,128,7,122,1,
+97,234,209,5,146,13,98,234,194,13,245,13,64,86,0,0,
+202,191,36,241,165,13,64,86,0,0,202,191,38,241,213,5,
+64,86,0,0,202,191,40,241,65,234,248,233,150,173,1,50,
+128,255,22,12,32,54,232,3,129,255,132,21,128,255,18,12,
+10,248,223,126,2,0,242,21,64,86,0,0,202,191,32,241,
+64,86,0,0,202,191,34,241,61,6,144,183,132,0,27,48,
+29,56,128,255,122,80,29,48,129,255,116,120,32,230,106,48,
+128,7,6,1,223,94,4,0,0,50,100,90,130,29,128,255,
+200,11,64,86,0,0,202,191,32,241,64,86,0,0,202,191,
+34,241,61,6,200,183,132,0,27,48,29,56,128,255,64,80,
+29,48,129,255,58,120,32,230,106,48,229,101,128,255,154,11,
+32,54,232,3,129,255,8,21,128,255,150,11,202,126,2,0,
+98,122,162,21,64,86,0,0,202,191,32,241,61,6,104,182,
+132,0,27,48,29,56,128,255,6,80,29,48,129,255,0,120,
+32,230,106,48,149,77,64,86,0,0,202,191,32,241,64,86,
+0,0,202,191,34,241,128,255,96,11,32,54,232,3,129,255,
+190,20,128,255,76,11,131,82,233,21,64,86,0,0,202,191,
+32,241,64,86,0,0,202,191,34,241,61,6,4,184,132,0,
+27,48,29,56,128,255,184,79,29,48,129,255,178,119,32,230,
+106,48,165,37,128,255,34,11,32,54,232,3,129,255,128,20,
+128,255,14,11,10,248,64,86,0,0,202,191,32,241,64,86,
+0,0,202,191,34,241,223,126,4,0,100,122,210,13,61,6,
+160,182,132,0,27,48,29,56,128,255,116,79,29,48,129,255,
+110,119,32,230,106,48,55,103,1,0,65,98,119,103,1,0,
+28,80,64,6,255,241,130,7,225,240,9,192,24,48,7,200,
+0,58,8,232,32,134,36,0,99,135,1,0,32,78,0,2,
+128,255,102,10,10,208,224,209,202,69,189,103,3,0,216,98,
 157,135,3,0,208,130,204,129,189,103,1,0,200,98,208,97,
-157,223,1,0,204,217,27,56,38,6,92,173,132,0,129,255,
-238,113,189,119,5,0,200,114,157,111,5,0,206,105,13,224,
-220,0,224,225,162,29,28,6,255,254,185,5,32,230,0,1,
-28,56,38,6,56,173,132,0,129,255,196,113,0,18,181,13,
-65,218,29,120,194,121,15,118,6,0,142,111,1,0,91,111,
-255,255,65,18,252,17,214,245,57,95,1,0,65,90,121,95,
-1,0,26,80,66,6,255,112,130,7,225,240,9,192,24,48,
-7,200,0,58,8,232,32,134,36,0,99,135,1,0,32,78,
-0,2,128,255,12,9,10,208,224,209,234,77,189,103,3,0,
-216,98,157,135,3,0,208,130,204,129,189,103,1,0,200,98,
-208,97,157,223,1,0,204,217,27,56,38,6,120,173,132,0,
-129,255,76,113,189,119,5,0,200,114,157,111,5,0,206,105,
-161,106,13,224,220,0,224,225,242,45,28,6,127,255,185,5,
-32,230,128,0,28,56,38,6,144,173,132,0,129,255,32,113,
-6,18,133,21,66,218,251,111,255,255,2,112,221,113,78,111,
-0,0,29,80,194,81,10,134,1,0,168,106,80,111,0,0,
-66,18,28,104,193,106,13,94,6,0,235,17,198,237,24,48,
-0,58,29,64,32,86,129,0,99,87,1,0,32,78,0,2,
-128,255,110,8,10,208,57,135,1,0,65,130,121,135,1,0,
-26,80,66,6,255,240,130,7,225,112,7,200,0,58,8,232,
-9,48,32,134,36,0,99,135,1,0,32,78,0,2,128,255,
-64,8,10,208,224,209,218,61,189,103,3,0,216,98,157,135,
-3,0,208,130,204,129,189,103,1,0,200,98,208,97,157,223,
-1,0,204,217,27,56,38,6,216,173,132,0,129,255,128,112,
-189,119,5,0,200,114,157,111,5,0,206,105,161,106,13,224,
-220,0,224,225,226,29,28,6,127,255,185,5,32,230,128,0,
-28,56,38,6,180,173,132,0,129,255,84,112,0,18,213,13,
-29,80,194,81,170,103,7,0,200,98,138,95,7,0,204,89,
-66,218,123,95,254,255,66,18,28,128,193,130,240,17,150,245,
-57,119,1,0,65,114,121,119,1,0,26,80,66,6,255,112,
-128,7,225,112,7,216,8,200,9,232,227,63,25,0,29,208,
-0,50,128,255,244,7,10,224,224,225,202,77,29,56,0,50,
-32,70,0,2,191,255,220,202,10,224,224,225,186,69,38,6,
-24,174,132,0,129,255,232,111,250,119,177,0,14,104,168,106,
-205,238,127,0,29,16,2,6,240,255,225,5,100,18,226,13,
-104,18,138,45,181,13,2,6,240,255,242,13,2,6,224,255,
-178,21,2,6,192,255,242,21,213,29,2,234,38,6,44,174,
-132,0,129,255,170,111,197,29,4,234,38,6,56,174,132,0,
-129,255,156,111,213,21,5,234,38,6,0,174,132,0,129,255,
-142,111,229,13,6,234,38,6,12,174,132,0,129,255,128,111,
-245,5,0,234,38,6,244,173,132,0,129,255,114,111,121,239,
-10,0,59,103,1,0,65,98,123,103,1,0,28,80,64,6,
-255,112,135,0,0,18,2,136,198,137,81,63,0,0,65,18,
-2,6,0,254,150,253,127,0,0,18,2,136,198,137,2,126,
-1,0,81,127,0,0,65,18,2,6,0,254,246,245,127,0,
-0,18,32,134,165,0,2,136,198,137,81,135,0,0,65,18,
-2,6,0,254,246,245,127,0,1,114,0,122,6,96,0,18,
-197,21,2,128,195,130,204,129,112,127,5,0,14,72,193,122,
-159,74,112,119,1,0,9,121,193,114,239,1,218,5,238,1,
-186,5,1,114,0,122,65,18,2,6,192,255,185,237,127,0,
-131,58,195,58,198,57,103,71,1,0,103,79,5,0,127,0,
-131,58,195,58,198,57,39,95,5,0,39,87,1,0,127,0,
-130,7,33,0,99,7,1,0,3,72,128,255,8,0,66,6,
-63,0,0,18,133,21,2,136,198,137,145,135,1,0,2,120,
-199,121,143,119,1,0,238,129,210,5,2,104,32,86,19,48,
-229,5,65,18,232,17,134,245,31,106,0,82,105,111,1,0,
-127,0,128,7,225,112,6,200,249,215,1,0,26,54,3,0,
-6,56,191,58,0,66,64,78,1,0,129,255,204,156,10,224,
-11,232,26,54,2,0,6,56,191,58,0,66,1,74,129,255,
-184,156,220,81,225,103,0,0,204,89,221,89,11,104,10,96,
-26,16,208,18,66,86,1,0,10,120,191,122,202,97,225,119,
-0,0,206,121,207,105,26,80,204,81,225,95,0,0,26,134,
-4,0,121,135,0,0,205,89,64,6,255,112,130,7,225,112,
-9,216,219,0,35,207,29,0,6,232,8,224,7,208,26,64,
-0,58,32,134,129,0,99,135,1,0,32,78,0,2,128,255,
-128,5,10,16,224,17,202,61,29,48,27,56,25,64,32,78,
-0,2,128,255,204,5,10,16,224,17,170,53,28,48,32,62,
-238,0,191,255,112,254,29,48,0,58,28,64,32,102,129,0,
-99,103,1,0,32,78,0,2,128,255,70,5,10,16,224,17,
-250,29,29,48,27,56,25,64,32,78,0,2,128,255,154,5,
-10,16,224,17,218,21,29,48,0,58,28,64,32,126,36,0,
-99,127,1,0,32,78,0,2,128,255,22,5,10,16,224,17,
-250,5,26,48,28,56,32,70,0,2,191,255,182,254,66,6,
-255,112,128,7,225,48,8,224,9,216,219,0,6,232,7,208,
-32,70,0,2,191,255,6,86,10,16,224,17,138,53,29,48,
-27,56,32,70,0,2,128,255,72,5,10,16,224,17,250,37,
-28,48,32,62,238,0,191,255,220,253,29,48,28,56,32,70,
-0,2,191,255,216,85,10,16,224,17,154,29,29,48,27,56,
-32,70,0,2,128,255,34,5,10,16,224,17,138,21,29,48,
-28,56,32,70,0,2,191,255,234,199,10,16,224,17,250,5,
-26,48,28,56,32,70,0,2,191,255,56,254,64,6,255,48,
-128,7,225,240,9,208,218,0,35,199,29,0,6,232,7,200,
-8,216,32,70,0,2,191,255,132,85,10,16,224,17,186,61,
-29,48,26,56,24,64,32,78,0,2,128,255,212,4,10,16,
-224,17,154,53,0,226,197,45,27,48,32,62,238,0,191,255,
-84,253,29,48,27,56,32,70,0,2,191,255,80,85,10,16,
-224,17,154,37,29,48,28,56,24,64,32,78,0,2,128,255,
-168,4,10,16,224,17,250,21,29,48,27,56,32,70,0,2,
-191,255,96,199,10,16,224,17,234,13,25,48,27,56,32,70,
-0,2,191,255,174,253,10,16,224,17,218,5,65,226,250,225,
-198,213,0,82,64,6,255,240,128,7,225,112,9,216,219,0,
-35,207,25,0,6,232,7,208,8,224,32,70,0,2,191,255,
-236,84,10,16,224,17,170,53,29,48,27,56,25,64,32,78,
-0,2,128,255,212,3,10,16,224,17,138,45,28,48,32,62,
-238,0,191,255,192,252,29,48,28,56,32,70,0,2,191,255,
-188,84,10,16,224,17,170,29,29,48,27,56,25,64,32,78,
-0,2,128,255,20,4,10,16,224,17,138,21,29,48,28,56,
-32,70,0,2,191,255,204,198,10,16,224,17,250,5,26,48,
-28,56,32,70,0,2,191,255,26,253,64,6,255,112,102,63,
-1,0,127,0,38,87,1,0,127,0,132,7,225,243,6,208,
-7,184,99,71,5,0,9,224,35,239,45,0,35,183,49,0,
-0,202,0,218,149,85,29,48,26,56,191,255,212,255,29,48,
-191,255,212,255,10,192,250,193,210,21,22,48,60,6,132,174,
-132,0,28,56,29,64,26,72,99,199,1,0,128,255,232,71,
-28,48,29,56,26,64,24,72,129,255,116,107,32,206,100,48,
-213,53,27,128,35,151,53,0,194,130,210,129,48,111,1,0,
-0,18,125,111,1,0,149,37,2,96,35,151,53,0,194,98,
-210,97,60,135,1,0,44,143,1,0,241,129,178,21,22,48,
-29,64,28,72,39,6,192,174,132,0,128,255,154,71,29,56,
-28,64,38,6,68,174,132,0,129,255,36,107,32,206,101,48,
-213,13,92,230,1,0,65,18,247,17,246,221,35,231,5,0,
-93,238,1,0,65,218,247,217,246,173,25,80,68,6,255,243,
-132,7,225,112,7,200,153,0,9,216,35,215,33,0,8,232,
-6,224,29,48,156,0,28,56,191,255,138,251,27,48,28,56,
-191,255,130,251,29,56,0,50,32,70,0,1,191,255,126,83,
-224,81,226,13,61,6,4,175,132,0,26,48,29,56,128,255,
-38,71,29,48,129,255,184,106,32,22,39,48,181,93,29,48,
-25,56,191,255,80,251,29,56,32,54,0,2,32,70,0,1,
-191,255,74,83,224,81,226,13,61,6,4,175,132,0,26,48,
-29,56,128,255,242,70,29,48,129,255,132,106,32,22,39,48,
-149,69,29,56,0,50,8,66,191,255,88,197,224,81,226,13,
-61,6,28,175,132,0,26,48,29,56,128,255,202,70,29,48,
-129,255,92,106,32,22,39,48,213,45,29,48,27,56,8,66,
-35,78,4,0,191,255,158,251,10,16,224,17,178,37,26,48,
-35,23,5,0,60,6,52,175,132,0,2,80,221,81,138,79,
-1,0,2,64,219,17,130,127,1,0,99,127,1,0,28,56,
-128,255,132,70,35,23,5,0,28,48,2,112,221,113,142,71,
-1,0,2,56,219,17,130,79,1,0,129,255,2,106,32,22,
-37,48,2,80,68,6,255,112,136,7,142,7,225,243,6,176,
-99,63,21,0,99,71,25,0,0,226,32,134,17,0,99,135,
-18,0,32,238,0,1,245,37,22,48,0,58,191,255,118,250,
-35,54,18,0,191,255,78,251,22,48,10,64,11,72,0,58,
-191,255,224,250,29,48,22,56,32,70,0,1,191,255,94,82,
-10,224,224,225,242,13,61,6,52,176,132,0,35,55,25,0,
-29,56,128,255,2,70,29,48,129,255,148,105,32,230,39,48,
-133,125,193,234,35,143,21,0,241,233,241,213,32,118,17,0,
-99,119,18,0,32,238,0,1,32,190,0,1,229,101,23,48,
-22,56,32,70,32,0,191,255,74,196,10,224,224,225,242,13,
-61,6,76,176,132,0,35,55,25,0,29,56,128,255,184,69,
-29,48,129,255,74,105,32,230,39,48,181,85,22,48,0,58,
-191,255,112,250,10,208,11,216,253,185,186,45,35,54,18,0,
-191,255,178,250,10,192,11,200,249,217,186,5,248,209,242,29,
-60,6,244,175,132,0,35,55,25,0,28,56,29,64,99,199,
-1,0,99,207,5,0,99,215,9,0,99,223,13,0,128,255,
-102,69,28,48,29,56,24,64,25,72,99,215,1,0,99,223,
-5,0,129,255,234,104,32,230,38,48,181,37,193,234,181,29,
-251,1,186,5,250,1,242,21,60,6,100,176,132,0,35,55,
-25,0,28,56,29,64,99,215,1,0,99,223,5,0,128,255,
-38,69,28,48,29,56,26,64,27,72,129,255,178,104,32,230,
-38,48,245,5,23,190,0,1,35,143,21,0,241,185,129,157,
-28,80,78,6,255,243,33,6,254,29,0,0,97,0,33,6,
-48,30,0,0,97,0,33,6,80,35,0,0,97,0,33,6,
-138,35,0,0,97,0,33,6,90,69,1,0,97,0,33,6,
-208,72,1,0,97,0,33,6,62,92,1,0,97,0,33,6,
-62,69,1,0,97,0,33,6,104,90,1,0,97,0,33,6,
-108,88,1,0,97,0,33,6,246,88,1,0,97,0,33,6,
-216,90,1,0,97,0,33,6,202,86,1,0,97,0,33,6,
-160,80,1,0,97,0,33,6,144,86,1,0,97,0,33,6,
-172,80,1,0,97,0,33,6,2,92,1,0,97,0,33,6,
-128,89,1,0,97,0,33,6,184,89,1,0,97,0,33,6,
-240,89,1,0,97,0,33,6,44,90,1,0,97,0,33,6,
-16,91,1,0,97,0,33,6,160,90,1,0,97,0,128,7,
-33,0,134,0,39,6,64,178,132,0,0,82,10,16,195,18,
-47,6,224,177,132,0,207,17,130,95,1,0,230,89,202,5,
-34,63,5,0,197,5,65,82,108,82,150,245,6,64,38,6,
-80,178,132,0,129,255,168,103,64,6,63,0,128,7,33,0,
-38,6,252,126,141,0,0,58,32,70,0,6,191,255,26,71,
-38,6,236,126,141,0,0,58,32,70,16,0,191,255,10,71,
-100,7,92,139,64,6,63,0,230,134,96,0,46,6,252,126,
-141,0,206,129,48,87,1,0,127,0,230,134,96,0,46,6,
-252,126,141,0,206,129,16,87,20,0,127,0,230,134,96,0,
-46,6,252,126,141,0,206,129,16,87,21,0,127,0,230,134,
-96,0,46,6,252,126,141,0,206,129,80,63,21,0,127,0,
-47,6,236,126,141,0,207,49,6,119,0,0,206,110,129,0,
-13,6,127,255,226,87,0,0,127,0,130,7,225,48,6,208,
-31,218,229,87,64,0,224,7,96,1,10,224,0,234,0,18,
-29,6,240,255,129,13,253,126,40,0,32,110,160,180,205,121,
-47,23,17,0,2,80,224,81,226,21,42,23,105,0,26,64,
-2,22,136,0,34,95,0,0,3,48,202,89,11,56,34,103,
-5,0,63,6,154,187,128,0,108,0,195,199,0,0,178,5,
-29,216,213,5,65,234,29,6,240,255,166,221,252,47,32,0,
-27,80,66,6,255,48,36,87,230,134,96,0,46,6,252,126,
-141,0,206,129,176,87,23,0,127,0,230,134,96,0,46,6,
-252,126,141,0,206,129,80,63,23,0,127,0,230,134,96,0,
-46,6,252,126,141,0,206,129,144,87,23,0,127,0,230,134,
-96,0,46,6,252,126,141,0,206,129,240,87,19,0,127,0,
-230,134,96,0,46,6,252,126,141,0,206,129,112,63,18,0,
-127,0,128,7,225,48,7,208,8,216,6,224,191,255,240,254,
-10,232,28,48,191,255,214,254,29,136,193,138,47,6,180,94,
-133,0,207,137,17,119,0,0,90,119,0,0,17,23,1,0,
-234,17,91,23,0,0,183,5,91,7,0,0,28,48,191,255,
-226,254,224,81,234,5,90,7,0,0,0,234,91,7,0,0,
-29,80,64,6,255,48,128,7,225,112,6,200,7,232,157,0,
-8,224,156,0,229,87,64,0,224,7,96,1,10,208,49,6,
-236,126,141,0,25,216,209,217,155,23,1,0,29,120,34,121,
-136,122,201,29,29,120,136,122,36,103,92,139,217,13,12,118,
-1,0,100,119,92,139,224,225,146,21,38,6,108,178,132,0,
-129,255,172,101,181,13,95,98,100,103,92,139,224,225,226,5,
-38,6,92,178,132,0,129,255,150,101,91,239,0,0,224,225,
-162,13,25,56,38,6,124,178,132,0,129,255,130,101,29,48,
-191,255,158,253,250,47,32,0,64,6,255,112,128,7,225,16,
-6,216,7,224,28,22,54,0,39,6,252,126,141,0,0,74,
-251,70,96,0,65,18,8,136,199,137,49,134,24,0,201,129,
-2,111,255,255,16,118,1,0,78,111,0,0,65,18,2,87,
-255,255,49,102,24,0,201,97,76,87,0,0,66,74,9,6,
-216,255,246,229,81,7,64,0,28,22,20,0,0,82,8,72,
-199,73,41,142,65,0,202,137,65,18,2,119,255,255,17,126,
-1,0,79,119,0,0,65,18,2,95,255,255,41,110,65,0,
-202,105,77,95,0,0,66,82,10,6,236,255,150,237,73,7,
-85,0,28,22,46,0,0,90,8,232,199,233,61,86,86,0,
-203,81,65,18,2,127,255,255,10,134,1,0,80,127,0,0,
-65,18,2,103,255,255,61,118,86,0,203,113,78,103,0,0,
-66,90,104,90,166,237,93,7,94,0,27,48,128,255,212,3,
-252,95,121,0,252,23,123,0,208,18,11,17,60,135,166,0,
-125,23,5,0,139,130,249,5,252,103,201,0,252,23,203,0,
-208,18,12,17,125,23,1,0,27,48,128,255,136,3,224,81,
-194,5,27,48,128,255,164,3,252,143,165,0,125,143,8,0,
-252,135,167,0,125,135,10,0,252,127,169,0,125,127,12,0,
-60,119,166,0,0,18,138,114,185,5,252,23,189,0,194,86,
-255,0,93,87,23,0,2,136,252,135,1,1,125,135,18,0,
-136,138,252,127,153,0,125,127,14,0,93,143,22,0,60,119,
-176,0,32,78,255,0,206,110,127,0,13,96,204,0,12,16,
-2,6,225,255,225,5,103,18,226,13,111,18,218,45,181,13,
-2,6,225,255,162,21,2,6,193,255,146,29,2,6,129,255,
-162,29,165,37,2,90,4,87,204,131,93,95,20,0,224,81,
-242,29,32,78,254,0,197,29,4,138,4,135,204,131,93,143,
-20,0,224,129,210,21,32,78,254,0,165,21,5,122,93,127,
-20,0,229,13,4,119,204,131,6,18,224,113,162,5,5,18,
-93,23,20,0,213,5,93,7,20,0,32,78,254,0,9,80,
-64,6,255,16,0,18,230,94,96,0,47,6,252,126,141,0,
-207,89,43,102,24,0,0,82,65,98,12,119,255,255,65,82,
-46,17,162,0,10,6,216,255,134,253,65,58,71,23,255,255,
-43,86,65,0,0,18,65,82,10,111,255,255,65,58,71,111,
-255,255,65,18,2,6,236,255,246,245,7,80,127,0,130,7,
-225,16,6,224,28,56,38,6,60,179,132,0,129,255,80,99,
-28,232,248,239,68,2,47,6,252,132,141,0,207,233,29,23,
-52,0,2,6,217,255,234,5,37,54,144,129,129,255,48,99,
-197,13,196,18,42,6,148,184,132,0,202,17,34,63,5,0,
-37,54,148,129,129,255,24,99,48,6,236,126,141,0,28,136,
-208,137,145,223,1,0,38,6,76,179,132,0,129,255,0,99,
-27,48,191,255,28,251,29,119,52,0,14,6,217,255,178,5,
-128,7,112,1,252,238,96,0,43,6,252,126,141,0,203,233,
-61,62,24,0,38,6,144,178,132,0,129,255,210,98,61,62,
-65,0,38,6,160,178,132,0,129,255,196,98,61,62,86,0,
-38,6,176,178,132,0,129,255,182,98,61,63,1,0,38,6,
-92,179,132,0,7,64,129,255,166,98,61,22,8,0,61,135,
-8,0,34,103,2,0,129,130,34,95,0,0,225,63,0,0,
-130,90,225,71,0,0,204,118,0,4,234,79,0,0,138,98,
-225,95,0,0,99,95,1,0,38,6,28,180,132,0,129,255,
-110,98,61,23,12,0,38,6,120,179,132,0,194,102,0,8,
-234,63,0,0,194,134,64,0,234,71,0,0,133,18,225,79,
-0,0,129,255,74,98,61,143,10,0,138,138,169,13,189,63,
-23,0,157,71,23,0,38,6,224,178,132,0,129,255,48,98,
-61,95,8,0,130,90,153,53,253,231,19,0,28,56,38,6,
-180,179,132,0,129,255,24,98,224,225,162,37,220,102,2,0,
-194,5,37,62,136,129,197,5,39,6,220,179,132,0,220,134,
-4,0,194,5,37,70,160,129,197,5,40,6,232,179,132,0,
-220,102,24,0,210,5,41,6,244,179,132,0,181,5,37,78,
-156,129,38,6,208,179,132,0,129,255,212,97,229,5,38,6,
-20,179,132,0,129,255,200,97,253,23,15,0,224,17,178,13,
-245,17,146,13,137,18,225,63,0,0,38,6,192,178,132,0,
-129,255,172,97,29,63,20,0,44,6,152,94,133,0,7,120,
-194,122,204,121,47,71,1,0,38,6,4,180,132,0,129,255,
-142,97,253,63,17,0,38,6,208,178,132,0,129,255,128,97,
-66,6,255,16,230,134,230,134,230,134,96,0,46,6,252,126,
-141,0,206,129,48,111,8,0,205,86,8,0,127,0,0,82,
-230,22,96,0,47,6,252,126,141,0,207,17,226,119,9,0,
-245,113,226,5,226,111,11,0,245,105,162,5,1,82,127,0,
-230,134,96,0,46,6,252,126,141,0,206,129,48,111,18,0,
-205,86,1,0,127,0,230,134,96,0,46,6,252,126,141,0,
-206,129,48,111,18,0,205,86,2,0,127,0,230,134,96,0,
-46,6,252,126,141,0,206,129,48,111,18,0,205,86,4,0,
-127,0,230,134,96,0,46,6,252,126,141,0,206,129,48,103,
-1,0,45,6,255,255,255,15,237,97,235,87,0,0,127,0,
-33,6,70,6,0,0,97,0,33,6,168,8,0,0,97,0,
-128,7,33,0,38,6,124,136,141,0,39,6,136,182,132,0,
-129,255,46,67,224,81,146,13,38,6,152,182,132,0,32,62,
-241,0,0,66,191,255,74,68,1,50,191,255,88,73,100,87,
-117,139,0,18,42,6,252,132,141,0,229,5,106,23,1,0,
-10,86,56,0,65,18,2,6,240,255,150,253,64,6,63,0,
-128,7,97,0,6,232,93,7,52,0,1,138,93,143,6,0,
-93,7,7,0,125,7,9,0,32,134,255,0,93,135,32,0,
-125,7,37,0,125,7,16,0,132,127,39,133,4,119,204,131,
-93,127,45,0,224,113,210,5,4,111,37,133,224,105,186,5,
-93,7,45,0,61,55,1,0,0,58,0,66,191,255,58,250,
-4,87,36,133,29,103,45,0,97,82,230,95,0,0,76,89,
-139,0,224,89,194,5,1,114,68,119,36,133,100,7,33,133,
-189,111,45,0,224,105,194,5,32,22,16,0,181,5,4,23,
-36,133,100,23,97,139,100,7,105,139,36,103,33,175,100,7,
-109,139,125,103,49,0,68,7,112,139,64,6,127,0,128,7,
-225,16,6,232,29,143,52,0,17,6,216,255,150,13,38,6,
-172,182,132,0,32,62,103,1,0,66,191,255,100,67,29,231,
-52,0,46,6,148,184,132,0,28,16,196,18,206,17,34,55,
-8,0,34,95,10,0,221,49,224,89,206,5,34,23,13,0,
-213,13,34,87,12,0,198,81,42,87,1,0,195,90,202,89,
-43,87,0,0,43,23,5,0,202,49,2,216,63,6,228,194,
-128,0,123,0,93,87,52,0,189,103,7,0,224,97,218,5,
-157,95,7,0,224,89,250,197,93,231,53,0,157,87,7,0,
-64,6,255,16,128,7,97,0,6,232,61,55,13,0,224,49,
-178,5,191,255,22,186,61,55,1,0,0,58,0,66,191,255,
-72,249,93,7,6,0,93,7,7,0,61,143,1,0,32,54,
-96,2,241,55,32,2,45,6,204,248,140,0,205,49,191,255,
-246,156,32,102,35,0,32,94,4,2,125,95,16,0,93,103,
-52,0,64,6,127,0,128,7,33,0,38,135,1,0,4,143,
-205,131,241,129,198,5,32,86,34,0,165,21,36,127,33,175,
-102,7,41,0,102,127,9,0,42,6,204,248,140,0,32,54,
-96,2,240,55,32,2,202,49,191,255,150,156,1,82,64,6,
-63,0,128,7,225,0,6,232,189,143,45,0,224,137,242,93,
-36,135,105,139,224,129,234,29,36,127,109,139,224,121,170,29,
-132,119,113,139,97,114,138,21,4,103,37,133,236,110,232,3,
-10,90,13,224,75,224,28,48,129,255,138,49,36,135,33,133,
-220,129,100,135,33,133,4,127,36,133,68,7,112,139,100,127,
-101,139,36,119,101,139,224,113,199,21,14,110,255,255,100,111,
-101,139,61,87,1,0,1,98,36,143,105,139,234,103,192,0,
-12,137,36,135,33,175,100,143,105,139,125,135,9,0,245,37,
-61,119,1,0,1,226,238,231,192,0,191,255,10,73,106,7,
-9,0,45,6,36,64,1,0,106,111,5,0,44,6,124,136,
-141,0,106,103,29,0,2,90,106,231,33,0,0,58,10,224,
-106,95,21,0,28,48,191,255,190,143,124,7,0,0,28,48,
-191,255,236,72,1,82,93,87,7,0,229,21,61,55,1,0,
-128,255,86,19,61,55,1,0,128,255,70,19,36,143,33,175,
-4,135,204,131,125,143,49,0,4,18,224,129,162,5,2,18,
-93,7,7,0,2,80,64,6,255,0,128,7,97,0,6,232,
-128,255,102,17,224,81,194,5,32,86,35,0,197,29,61,55,
-1,0,1,66,230,71,192,0,61,78,20,0,39,6,124,136,
-141,0,191,255,48,122,125,87,13,0,202,47,2,0,202,55,
-2,0,61,55,1,0,10,56,128,255,158,18,1,122,93,127,
-7,0,3,82,64,6,127,0,128,7,225,16,6,232,61,55,
-13,0,38,135,12,0,125,135,16,0,102,7,0,0,93,7,
-7,0,191,255,74,72,125,7,13,0,29,48,128,255,250,16,
-224,81,210,5,32,86,35,0,128,7,4,1,61,127,16,0,
-224,121,194,5,32,86,36,0,165,125,61,135,49,0,36,231,
-33,175,189,23,29,0,176,225,2,6,129,255,154,45,61,55,
-1,0,28,6,215,255,153,21,1,90,230,95,192,0,36,127,
-105,139,43,128,80,121,36,119,101,139,100,127,105,139,65,114,
-100,119,101,139,4,218,165,93,0,58,128,255,100,18,2,218,
-61,95,1,0,1,58,235,63,192,0,38,6,124,136,141,0,
-0,66,191,255,0,121,1,82,93,87,7,0,245,69,194,118,
-238,0,14,6,192,255,226,87,0,0,28,6,105,255,177,5,
-224,81,178,61,4,218,2,6,128,255,242,13,61,135,1,0,
-1,82,36,127,109,139,240,87,192,0,10,121,36,119,33,175,
-100,127,109,139,125,119,49,0,61,95,1,0,1,106,235,111,
-192,0,36,143,105,139,45,80,74,137,100,143,105,139,234,29,
-36,135,109,139,224,129,170,29,4,119,37,133,238,126,232,3,
-10,106,15,232,77,232,188,233,224,233,151,13,29,48,129,255,
-100,47,36,143,33,133,221,137,100,143,33,133,36,135,33,133,
-220,129,100,135,33,133,165,5,2,218,27,80,64,6,255,16,
-166,143,45,0,224,137,130,37,38,119,1,0,1,130,36,103,
-109,139,238,135,192,0,76,129,242,21,4,23,37,133,98,18,
-174,5,2,18,32,86,232,3,226,87,32,2,10,130,38,119,
-49,0,36,127,33,175,80,80,174,121,234,121,215,5,100,7,
-109,139,68,7,112,139,127,0,128,7,97,0,6,232,128,255,
-152,15,224,81,194,5,32,86,35,0,133,37,32,54,20,5,
-128,255,206,248,61,55,1,0,1,66,230,71,192,0,61,78,
-20,0,39,6,124,136,141,0,191,255,90,120,125,87,13,0,
-202,47,2,0,202,55,2,0,61,55,1,0,10,56,128,255,
-200,16,1,122,93,127,7,0,5,82,64,6,127,0,130,7,
-225,0,6,232,61,55,13,0,38,135,12,0,125,135,16,0,
-102,7,0,0,93,7,7,0,191,255,116,70,61,127,16,0,
-125,7,13,0,224,121,210,5,32,86,36,0,128,7,26,1,
-189,23,29,0,2,112,174,0,29,98,76,113,14,224,61,143,
-37,0,156,0,224,137,162,13,157,127,33,0,239,225,234,5,
-61,119,37,0,14,134,1,0,149,37,4,111,205,133,129,106,
-169,29,36,63,33,175,61,71,1,0,2,72,38,6,192,182,
-132,0,129,255,58,91,61,71,37,0,224,65,130,13,157,63,
-33,0,38,6,232,182,132,0,129,255,36,91,37,54,192,129,
-129,255,28,91,1,130,93,231,32,0,125,135,37,0,189,23,
-29,0,194,118,63,0,14,6,193,255,202,5,32,86,35,0,
-181,77,224,17,186,29,61,23,37,0,101,18,190,5,4,82,
-181,69,4,87,205,133,129,82,233,13,36,63,33,175,61,71,
-1,0,157,79,33,0,99,23,1,0,38,6,8,183,132,0,
-129,255,204,90,32,86,35,0,245,45,220,118,128,0,178,5,
-4,82,165,45,220,126,36,0,178,5,1,82,213,37,220,94,
-88,0,104,90,130,13,11,6,176,255,210,29,11,6,168,255,
-162,29,181,5,1,82,133,29,4,143,205,133,129,138,137,21,
-36,63,33,175,61,71,1,0,61,111,37,0,157,79,33,0,
-99,111,1,0,38,6,8,183,132,0,129,255,114,90,32,86,
-35,0,165,5,6,82,66,6,255,0,128,7,225,0,6,232,
-128,255,246,13,224,81,194,5,32,86,36,0,133,69,61,143,
-41,0,17,6,238,255,182,5,8,82,149,61,61,127,1,0,
-1,226,239,231,192,0,191,255,254,68,106,7,9,0,46,6,
-36,64,1,0,106,119,5,0,45,6,124,136,141,0,106,111,
-29,0,2,98,106,231,33,0,10,48,106,103,21,0,125,87,
-13,0,202,47,2,0,202,55,2,0,1,58,191,255,168,139,
-61,55,1,0,61,87,41,0,61,63,13,0,10,94,1,0,
-125,95,41,0,48,6,60,183,132,0,208,81,138,71,1,0,
-128,255,254,14,1,114,93,119,7,0,7,82,64,6,255,0,
-128,7,97,0,6,232,61,55,13,0,38,135,12,0,125,135,
-16,0,102,7,0,0,93,7,7,0,191,255,146,68,61,127,
-16,0,125,7,13,0,224,121,194,5,32,86,37,0,165,5,
-6,82,64,6,127,0,128,7,225,16,6,232,32,54,0,2,
-129,255,144,83,10,224,0,18,2,136,193,138,220,137,2,112,
-200,114,2,104,14,105,113,111,0,0,65,18,2,6,0,255,
-198,245,59,6,204,248,140,0,61,103,1,0,32,94,96,2,
-236,95,32,2,219,89,43,55,57,0,28,56,32,70,0,2,
-191,255,250,65,28,48,129,255,102,83,61,135,1,0,1,226,
-240,231,192,0,191,255,0,68,106,7,9,0,47,6,36,64,
-1,0,106,127,5,0,46,6,124,136,141,0,106,119,29,0,
-32,110,208,7,106,231,33,0,10,48,106,111,21,0,125,87,
-13,0,202,47,2,0,202,55,2,0,1,58,191,255,168,138,
-61,55,1,0,32,94,96,2,230,95,32,2,219,89,61,63,
-13,0,43,71,57,0,128,255,32,14,1,138,93,143,7,0,
-9,82,64,6,255,16,128,7,225,0,6,232,61,55,13,0,
-38,135,12,0,125,135,16,0,102,7,0,0,93,7,7,0,
-191,255,156,67,61,127,16,0,125,7,13,0,224,121,178,5,
-11,82,133,61,61,111,1,0,1,226,237,231,192,0,191,255,
-102,67,10,48,102,7,9,0,44,6,36,64,1,0,102,103,
-5,0,43,6,124,136,141,0,102,95,29,0,32,86,208,7,
-102,231,33,0,1,58,102,87,21,0,125,55,13,0,198,47,
-2,0,198,55,2,0,191,255,14,138,61,55,1,0,32,134,
-96,2,230,135,32,2,46,6,204,248,140,0,206,129,61,63,
-13,0,48,71,57,0,128,255,136,13,1,106,93,111,7,0,
-10,82,64,6,255,0,128,7,225,16,6,232,61,55,13,0,
+157,223,1,0,204,217,27,56,38,6,60,184,132,0,129,255,
+14,119,189,119,5,0,200,114,157,111,5,0,206,105,13,224,
+220,0,224,225,226,37,28,6,255,254,185,5,32,230,0,1,
+28,56,38,6,84,184,132,0,129,255,228,118,6,18,149,13,
+2,120,221,121,65,218,187,119,255,255,79,119,0,0,65,18,
+28,102,6,0,236,17,214,245,24,48,0,58,29,64,32,94,
+129,0,99,95,1,0,32,78,0,2,128,255,220,9,10,208,
+57,87,1,0,65,82,121,87,1,0,26,80,66,6,255,240,
+130,7,225,112,7,200,0,58,8,232,9,48,32,134,36,0,
+99,135,1,0,32,78,0,2,128,255,174,9,10,208,224,209,
+138,61,189,103,3,0,216,98,157,135,3,0,208,130,204,129,
+189,103,1,0,200,98,208,97,157,223,1,0,204,217,27,56,
+38,6,156,184,132,0,129,255,86,118,189,119,5,0,200,114,
+157,111,5,0,206,105,13,224,220,0,224,225,162,29,28,6,
+255,254,185,5,32,230,0,1,28,56,38,6,120,184,132,0,
+129,255,44,118,0,18,181,13,65,218,29,120,194,121,15,118,
+6,0,142,111,1,0,91,111,255,255,65,18,252,17,214,245,
+57,95,1,0,65,90,121,95,1,0,26,80,66,6,255,112,
+130,7,225,240,9,192,24,48,7,200,0,58,8,232,32,134,
+36,0,99,135,1,0,32,78,0,2,128,255,12,9,10,208,
+224,209,234,77,189,103,3,0,216,98,157,135,3,0,208,130,
+204,129,189,103,1,0,200,98,208,97,157,223,1,0,204,217,
+27,56,38,6,184,184,132,0,129,255,180,117,189,119,5,0,
+200,114,157,111,5,0,206,105,161,106,13,224,220,0,224,225,
+242,45,28,6,127,255,185,5,32,230,128,0,28,56,38,6,
+208,184,132,0,129,255,136,117,6,18,133,21,66,218,251,111,
+255,255,2,112,221,113,78,111,0,0,29,80,194,81,10,134,
+1,0,168,106,80,111,0,0,66,18,28,104,193,106,13,94,
+6,0,235,17,198,237,24,48,0,58,29,64,32,86,129,0,
+99,87,1,0,32,78,0,2,128,255,110,8,10,208,57,135,
+1,0,65,130,121,135,1,0,26,80,66,6,255,240,130,7,
+225,112,7,200,0,58,8,232,9,48,32,134,36,0,99,135,
+1,0,32,78,0,2,128,255,64,8,10,208,224,209,218,61,
+189,103,3,0,216,98,157,135,3,0,208,130,204,129,189,103,
+1,0,200,98,208,97,157,223,1,0,204,217,27,56,38,6,
+24,185,132,0,129,255,232,116,189,119,5,0,200,114,157,111,
+5,0,206,105,161,106,13,224,220,0,224,225,226,29,28,6,
+127,255,185,5,32,230,128,0,28,56,38,6,244,184,132,0,
+129,255,188,116,0,18,213,13,29,80,194,81,170,103,7,0,
+200,98,138,95,7,0,204,89,66,218,123,95,254,255,66,18,
+28,128,193,130,240,17,150,245,57,119,1,0,65,114,121,119,
+1,0,26,80,66,6,255,112,128,7,225,112,7,216,8,200,
+9,232,227,63,25,0,29,208,0,50,128,255,244,7,10,224,
+224,225,202,77,29,56,0,50,32,70,0,2,191,255,10,202,
+10,224,224,225,186,69,38,6,88,185,132,0,129,255,80,116,
+250,119,177,0,14,104,168,106,205,238,127,0,29,16,2,6,
+240,255,225,5,100,18,226,13,104,18,138,45,181,13,2,6,
+240,255,242,13,2,6,224,255,178,21,2,6,192,255,242,21,
+213,29,2,234,38,6,108,185,132,0,129,255,18,116,197,29,
+4,234,38,6,120,185,132,0,129,255,4,116,213,21,5,234,
+38,6,64,185,132,0,129,255,246,115,229,13,6,234,38,6,
+76,185,132,0,129,255,232,115,245,5,0,234,38,6,52,185,
+132,0,129,255,218,115,121,239,10,0,59,103,1,0,65,98,
+123,103,1,0,28,80,64,6,255,112,135,0,0,18,2,136,
+198,137,81,63,0,0,65,18,2,6,0,254,150,253,127,0,
+0,18,2,136,198,137,2,126,1,0,81,127,0,0,65,18,
+2,6,0,254,246,245,127,0,0,18,32,134,165,0,2,136,
+198,137,81,135,0,0,65,18,2,6,0,254,246,245,127,0,
+1,114,0,122,6,96,0,18,197,21,2,128,195,130,204,129,
+112,127,5,0,14,72,193,122,159,74,112,119,1,0,9,121,
+193,114,239,1,218,5,238,1,186,5,1,114,0,122,65,18,
+2,6,192,255,185,237,127,0,131,58,195,58,198,57,103,71,
+1,0,103,79,5,0,127,0,131,58,195,58,198,57,39,95,
+5,0,39,87,1,0,127,0,130,7,33,0,99,7,1,0,
+3,72,128,255,8,0,66,6,63,0,0,18,133,21,2,136,
+198,137,145,135,1,0,2,120,199,121,143,119,1,0,238,129,
+210,5,2,104,32,86,19,48,229,5,65,18,232,17,134,245,
+31,106,0,82,105,111,1,0,127,0,128,7,225,112,6,200,
+249,215,1,0,26,54,3,0,6,56,191,58,0,66,64,78,
+1,0,129,255,52,161,10,224,11,232,26,54,2,0,6,56,
+191,58,0,66,1,74,129,255,32,161,220,81,225,103,0,0,
+204,89,221,89,11,104,10,96,26,16,208,18,66,86,1,0,
+10,120,191,122,202,97,225,119,0,0,206,121,207,105,26,80,
+204,81,225,95,0,0,26,134,4,0,121,135,0,0,205,89,
+64,6,255,112,130,7,225,112,9,216,219,0,35,207,29,0,
+6,232,8,224,7,208,26,64,0,58,32,134,129,0,99,135,
+1,0,32,78,0,2,128,255,128,5,10,16,224,17,202,61,
+29,48,27,56,25,64,32,78,0,2,128,255,204,5,10,16,
+224,17,170,53,28,48,32,62,238,0,191,255,112,254,29,48,
+0,58,28,64,32,102,129,0,99,103,1,0,32,78,0,2,
+128,255,70,5,10,16,224,17,250,29,29,48,27,56,25,64,
+32,78,0,2,128,255,154,5,10,16,224,17,218,21,29,48,
+0,58,28,64,32,126,36,0,99,127,1,0,32,78,0,2,
+128,255,22,5,10,16,224,17,250,5,26,48,28,56,32,70,
+0,2,191,255,182,254,66,6,255,112,128,7,225,48,8,224,
+9,216,219,0,6,232,7,208,32,70,0,2,191,255,202,81,
+10,16,224,17,138,53,29,48,27,56,32,70,0,2,128,255,
+72,5,10,16,224,17,250,37,28,48,32,62,238,0,191,255,
+220,253,29,48,28,56,32,70,0,2,191,255,156,81,10,16,
+224,17,154,29,29,48,27,56,32,70,0,2,128,255,34,5,
+10,16,224,17,138,21,29,48,28,56,32,70,0,2,191,255,
+24,199,10,16,224,17,250,5,26,48,28,56,32,70,0,2,
+191,255,56,254,64,6,255,48,128,7,225,240,9,208,218,0,
+35,199,29,0,6,232,7,200,8,216,32,70,0,2,191,255,
+72,81,10,16,224,17,186,61,29,48,26,56,24,64,32,78,
+0,2,128,255,212,4,10,16,224,17,154,53,0,226,197,45,
+27,48,32,62,238,0,191,255,84,253,29,48,27,56,32,70,
+0,2,191,255,20,81,10,16,224,17,154,37,29,48,28,56,
+24,64,32,78,0,2,128,255,168,4,10,16,224,17,250,21,
+29,48,27,56,32,70,0,2,191,255,142,198,10,16,224,17,
+234,13,25,48,27,56,32,70,0,2,191,255,174,253,10,16,
+224,17,218,5,65,226,250,225,198,213,0,82,64,6,255,240,
+128,7,225,112,9,216,219,0,35,207,25,0,6,232,7,208,
+8,224,32,70,0,2,191,255,176,80,10,16,224,17,170,53,
+29,48,27,56,25,64,32,78,0,2,128,255,212,3,10,16,
+224,17,138,45,28,48,32,62,238,0,191,255,192,252,29,48,
+28,56,32,70,0,2,191,255,128,80,10,16,224,17,170,29,
+29,48,27,56,25,64,32,78,0,2,128,255,20,4,10,16,
+224,17,138,21,29,48,28,56,32,70,0,2,191,255,250,197,
+10,16,224,17,250,5,26,48,28,56,32,70,0,2,191,255,
+26,253,64,6,255,112,102,63,1,0,127,0,38,87,1,0,
+127,0,132,7,225,243,6,208,7,184,99,71,5,0,9,224,
+35,239,45,0,35,183,49,0,0,202,0,218,149,85,29,48,
+26,56,191,255,212,255,29,48,191,255,212,255,10,192,250,193,
+210,21,22,48,60,6,196,185,132,0,28,56,29,64,26,72,
+99,199,1,0,128,255,232,71,28,48,29,56,26,64,24,72,
+129,255,220,111,32,206,100,48,213,53,27,128,35,151,53,0,
+194,130,210,129,48,111,1,0,0,18,125,111,1,0,149,37,
+2,96,35,151,53,0,194,98,210,97,60,135,1,0,44,143,
+1,0,241,129,178,21,22,48,29,64,28,72,39,6,0,186,
+132,0,128,255,154,71,29,56,28,64,38,6,132,185,132,0,
+129,255,140,111,32,206,101,48,213,13,92,230,1,0,65,18,
+247,17,246,221,35,231,5,0,93,238,1,0,65,218,247,217,
+246,173,25,80,68,6,255,243,132,7,225,112,7,200,153,0,
+9,216,35,215,33,0,8,232,6,224,29,48,156,0,28,56,
+191,255,138,251,27,48,28,56,191,255,130,251,29,56,0,50,
+32,70,0,1,191,255,66,79,224,81,226,13,61,6,68,186,
+132,0,26,48,29,56,128,255,38,71,29,48,129,255,32,111,
+32,22,39,48,181,93,29,48,25,56,191,255,80,251,29,56,
+32,54,0,2,32,70,0,1,191,255,14,79,224,81,226,13,
+61,6,68,186,132,0,26,48,29,56,128,255,242,70,29,48,
+129,255,236,110,32,22,39,48,149,69,29,56,0,50,8,66,
+191,255,134,196,224,81,226,13,61,6,92,186,132,0,26,48,
+29,56,128,255,202,70,29,48,129,255,196,110,32,22,39,48,
+213,45,29,48,27,56,8,66,35,78,4,0,191,255,158,251,
+10,16,224,17,178,37,26,48,35,23,5,0,60,6,116,186,
+132,0,2,80,221,81,138,79,1,0,2,64,219,17,130,127,
+1,0,99,127,1,0,28,56,128,255,132,70,35,23,5,0,
+28,48,2,112,221,113,142,71,1,0,2,56,219,17,130,79,
+1,0,129,255,106,110,32,22,37,48,2,80,68,6,255,112,
+136,7,142,7,225,243,6,176,99,63,21,0,99,71,25,0,
+0,226,32,134,17,0,99,135,18,0,32,238,0,1,245,37,
+22,48,0,58,191,255,118,250,35,54,18,0,191,255,78,251,
+22,48,10,64,11,72,0,58,191,255,224,250,29,48,22,56,
+32,70,0,1,191,255,34,78,10,224,224,225,242,13,61,6,
+116,187,132,0,35,55,25,0,29,56,128,255,2,70,29,48,
+129,255,252,109,32,230,39,48,133,125,193,234,35,143,21,0,
+241,233,241,213,32,118,17,0,99,119,18,0,32,238,0,1,
+32,190,0,1,229,101,23,48,22,56,32,70,32,0,191,255,
+120,195,10,224,224,225,242,13,61,6,140,187,132,0,35,55,
+25,0,29,56,128,255,184,69,29,48,129,255,178,109,32,230,
+39,48,181,85,22,48,0,58,191,255,112,250,10,208,11,216,
+253,185,186,45,35,54,18,0,191,255,178,250,10,192,11,200,
+249,217,186,5,248,209,242,29,60,6,52,187,132,0,35,55,
+25,0,28,56,29,64,99,199,1,0,99,207,5,0,99,215,
+9,0,99,223,13,0,128,255,102,69,28,48,29,56,24,64,
+25,72,99,215,1,0,99,223,5,0,129,255,82,109,32,230,
+38,48,181,37,193,234,181,29,251,1,186,5,250,1,242,21,
+60,6,164,187,132,0,35,55,25,0,28,56,29,64,99,215,
+1,0,99,223,5,0,128,255,38,69,28,48,29,56,26,64,
+27,72,129,255,26,109,32,230,38,48,245,5,23,190,0,1,
+35,143,21,0,241,185,129,157,28,80,78,6,255,243,33,6,
+254,29,0,0,97,0,33,6,48,30,0,0,97,0,33,6,
+80,35,0,0,97,0,33,6,138,35,0,0,97,0,33,6,
+46,71,1,0,97,0,33,6,164,74,1,0,97,0,33,6,
+234,93,1,0,97,0,33,6,18,71,1,0,97,0,33,6,
+20,92,1,0,97,0,33,6,24,90,1,0,97,0,33,6,
+162,90,1,0,97,0,33,6,132,92,1,0,97,0,33,6,
+158,88,1,0,97,0,33,6,116,82,1,0,97,0,33,6,
+100,88,1,0,97,0,33,6,128,82,1,0,97,0,33,6,
+174,93,1,0,97,0,33,6,44,91,1,0,97,0,33,6,
+100,91,1,0,97,0,33,6,156,91,1,0,97,0,33,6,
+216,91,1,0,97,0,33,6,188,92,1,0,97,0,33,6,
+76,92,1,0,97,0,128,7,33,0,134,0,39,6,128,189,
+132,0,0,82,10,16,195,18,47,6,32,189,132,0,207,17,
+130,95,1,0,230,89,202,5,34,63,5,0,197,5,65,82,
+108,82,150,245,6,64,38,6,144,189,132,0,129,255,16,108,
+64,6,63,0,128,7,33,0,38,6,92,138,141,0,0,58,
+32,70,0,6,191,255,222,66,38,6,76,138,141,0,0,58,
+32,70,16,0,191,255,206,66,100,7,104,139,64,6,63,0,
+230,134,96,0,46,6,92,138,141,0,206,129,48,87,1,0,
+127,0,230,134,96,0,46,6,92,138,141,0,206,129,16,87,
+20,0,127,0,230,134,96,0,46,6,92,138,141,0,206,129,
+16,87,21,0,127,0,230,134,96,0,46,6,92,138,141,0,
+206,129,80,63,21,0,127,0,47,6,76,138,141,0,207,49,
+6,119,0,0,206,110,129,0,13,6,127,255,226,87,0,0,
+127,0,130,7,225,48,6,208,31,218,229,87,64,0,224,7,
+96,1,10,224,0,234,0,18,29,6,240,255,129,13,253,126,
+40,0,32,110,160,180,205,121,47,23,17,0,2,80,224,81,
+226,21,42,23,105,0,26,64,2,22,136,0,34,95,0,0,
+3,48,202,89,11,56,34,103,5,0,63,6,214,191,128,0,
+108,0,195,199,0,0,178,5,29,216,213,5,65,234,29,6,
+240,255,166,221,252,47,32,0,27,80,66,6,255,48,36,87,
+230,134,96,0,46,6,92,138,141,0,206,129,176,87,23,0,
+127,0,230,134,96,0,46,6,92,138,141,0,206,129,80,63,
+23,0,127,0,230,134,96,0,46,6,92,138,141,0,206,129,
+144,87,23,0,127,0,230,134,96,0,46,6,92,138,141,0,
+206,129,240,87,19,0,127,0,230,134,96,0,46,6,92,138,
+141,0,206,129,112,63,18,0,127,0,128,7,225,48,7,208,
+8,216,6,224,191,255,240,254,10,232,28,48,191,255,214,254,
+29,136,193,138,47,6,60,106,133,0,207,137,17,119,0,0,
+90,119,0,0,17,23,1,0,234,17,91,23,0,0,183,5,
+91,7,0,0,28,48,191,255,226,254,224,81,234,5,90,7,
+0,0,0,234,91,7,0,0,29,80,64,6,255,48,128,7,
+225,112,6,200,7,232,157,0,8,224,156,0,229,87,64,0,
+224,7,96,1,10,208,49,6,76,138,141,0,25,216,209,217,
+155,23,1,0,29,120,34,121,136,122,201,29,29,120,136,122,
+36,103,104,139,217,13,12,118,1,0,100,119,104,139,224,225,
+146,21,38,6,172,189,132,0,129,255,20,106,181,13,95,98,
+100,103,104,139,224,225,226,5,38,6,156,189,132,0,129,255,
+254,105,91,239,0,0,224,225,162,13,25,56,38,6,188,189,
+132,0,129,255,234,105,29,48,191,255,158,253,250,47,32,0,
+64,6,255,112,128,7,225,16,6,216,7,224,28,22,54,0,
+39,6,92,138,141,0,0,74,251,70,96,0,65,18,8,136,
+199,137,49,134,24,0,201,129,2,111,255,255,16,118,1,0,
+78,111,0,0,65,18,2,87,255,255,49,102,24,0,201,97,
+76,87,0,0,66,74,9,6,216,255,246,229,81,7,64,0,
+28,22,20,0,0,82,8,72,199,73,41,142,65,0,202,137,
+65,18,2,119,255,255,17,126,1,0,79,119,0,0,65,18,
+2,95,255,255,41,110,65,0,202,105,77,95,0,0,66,82,
+10,6,236,255,150,237,73,7,85,0,28,22,46,0,0,90,
+8,232,199,233,61,86,86,0,203,81,65,18,2,127,255,255,
+10,134,1,0,80,127,0,0,65,18,2,103,255,255,61,118,
+86,0,203,113,78,103,0,0,66,90,104,90,166,237,93,7,
+94,0,27,48,128,255,212,3,252,95,121,0,252,23,123,0,
+208,18,11,17,60,135,166,0,125,23,5,0,139,130,249,5,
+252,103,201,0,252,23,203,0,208,18,12,17,125,23,1,0,
+27,48,128,255,136,3,224,81,194,5,27,48,128,255,164,3,
+252,143,165,0,125,143,8,0,252,135,167,0,125,135,10,0,
+252,127,169,0,125,127,12,0,60,119,166,0,0,18,138,114,
+185,5,252,23,189,0,194,86,255,0,93,87,23,0,2,136,
+252,135,1,1,125,135,18,0,136,138,252,127,153,0,125,127,
+14,0,93,143,22,0,60,119,176,0,32,78,255,0,206,110,
+127,0,13,96,204,0,12,16,2,6,225,255,225,5,103,18,
+226,13,111,18,218,45,181,13,2,6,225,255,162,21,2,6,
+193,255,146,29,2,6,129,255,162,29,165,37,2,90,4,87,
+216,131,93,95,20,0,224,81,242,29,32,78,254,0,197,29,
+4,138,4,135,216,131,93,143,20,0,224,129,210,21,32,78,
+254,0,165,21,5,122,93,127,20,0,229,13,4,119,216,131,
+6,18,224,113,162,5,5,18,93,23,20,0,213,5,93,7,
+20,0,32,78,254,0,9,80,64,6,255,16,0,18,230,94,
+96,0,47,6,92,138,141,0,207,89,43,102,24,0,0,82,
+65,98,12,119,255,255,65,82,46,17,162,0,10,6,216,255,
+134,253,65,58,71,23,255,255,43,86,65,0,0,18,65,82,
+10,111,255,255,65,58,71,111,255,255,65,18,2,6,236,255,
+246,245,7,80,127,0,130,7,225,16,6,224,28,56,38,6,
+124,190,132,0,129,255,184,103,28,232,248,239,68,2,47,6,
+92,144,141,0,207,233,29,23,52,0,2,6,217,255,234,5,
+37,54,152,129,129,255,152,103,197,13,196,18,42,6,212,195,
+132,0,202,17,34,63,5,0,37,54,156,129,129,255,128,103,
+48,6,76,138,141,0,28,136,208,137,145,223,1,0,38,6,
+140,190,132,0,129,255,104,103,27,48,191,255,28,251,29,119,
+52,0,14,6,217,255,178,5,128,7,112,1,252,238,96,0,
+43,6,92,138,141,0,203,233,61,62,24,0,38,6,208,189,
+132,0,129,255,58,103,61,62,65,0,38,6,224,189,132,0,
+129,255,44,103,61,62,86,0,38,6,240,189,132,0,129,255,
+30,103,61,63,1,0,38,6,156,190,132,0,7,64,129,255,
+14,103,61,22,8,0,61,135,8,0,34,103,2,0,129,130,
+34,95,0,0,225,63,0,0,130,90,225,71,0,0,204,118,
+0,4,234,79,0,0,138,98,225,95,0,0,99,95,1,0,
+38,6,92,191,132,0,129,255,214,102,61,23,12,0,38,6,
+184,190,132,0,194,102,0,8,234,63,0,0,194,134,64,0,
+234,71,0,0,133,18,225,79,0,0,129,255,178,102,61,143,
+10,0,138,138,169,13,189,63,23,0,157,71,23,0,38,6,
+32,190,132,0,129,255,152,102,61,95,8,0,130,90,153,53,
+253,231,19,0,28,56,38,6,244,190,132,0,129,255,128,102,
+224,225,162,37,220,102,2,0,194,5,37,62,144,129,197,5,
+39,6,28,191,132,0,220,134,4,0,194,5,37,70,168,129,
+197,5,40,6,40,191,132,0,220,102,24,0,210,5,41,6,
+52,191,132,0,181,5,37,78,164,129,38,6,16,191,132,0,
+129,255,60,102,229,5,38,6,84,190,132,0,129,255,48,102,
+253,23,15,0,224,17,178,13,245,17,146,13,137,18,225,63,
+0,0,38,6,0,190,132,0,129,255,20,102,29,63,20,0,
+44,6,32,106,133,0,7,120,194,122,204,121,47,71,1,0,
+38,6,68,191,132,0,129,255,246,101,253,63,17,0,38,6,
+16,190,132,0,129,255,232,101,66,6,255,16,230,134,230,134,
+230,134,96,0,46,6,92,138,141,0,206,129,48,111,8,0,
+205,86,8,0,127,0,0,82,230,22,96,0,47,6,92,138,
+141,0,207,17,226,119,9,0,245,113,226,5,226,111,11,0,
+245,105,162,5,1,82,127,0,230,134,96,0,46,6,92,138,
+141,0,206,129,48,111,18,0,205,86,1,0,127,0,230,134,
+96,0,46,6,92,138,141,0,206,129,48,111,18,0,205,86,
+2,0,127,0,230,134,96,0,46,6,92,138,141,0,206,129,
+48,111,18,0,205,86,4,0,127,0,230,134,96,0,46,6,
+92,138,141,0,206,129,48,103,1,0,45,6,255,255,255,15,
+237,97,235,87,0,0,127,0,33,6,70,6,0,0,97,0,
+33,6,168,8,0,0,97,0,128,7,33,0,38,6,220,147,
+141,0,39,6,200,193,132,0,129,255,150,71,224,81,146,13,
+38,6,216,193,132,0,32,62,241,0,0,66,191,255,14,64,
+1,50,191,255,28,69,100,87,129,139,0,18,42,6,92,144,
+141,0,229,5,106,23,1,0,10,86,56,0,65,18,2,6,
+240,255,150,253,64,6,63,0,128,7,97,0,6,232,93,7,
+52,0,1,138,93,143,6,0,93,7,7,0,125,7,9,0,
+32,134,255,0,93,135,32,0,125,7,37,0,125,7,16,0,
+132,127,51,133,4,119,216,131,93,127,45,0,224,113,210,5,
+4,111,49,133,224,105,186,5,93,7,45,0,61,55,1,0,
+0,58,0,66,191,255,58,250,4,87,48,133,29,103,45,0,
+97,82,230,95,0,0,76,89,139,0,224,89,194,5,1,114,
+68,119,48,133,100,7,45,133,189,111,45,0,224,105,194,5,
+32,22,16,0,181,5,4,23,48,133,100,23,109,139,100,7,
+117,139,36,103,45,175,100,7,121,139,125,103,49,0,68,7,
+124,139,64,6,127,0,128,7,225,16,6,232,29,143,52,0,
+17,6,216,255,150,13,38,6,236,193,132,0,32,62,103,1,
+0,66,191,255,40,63,29,231,52,0,46,6,212,195,132,0,
+28,16,196,18,206,17,34,55,8,0,34,95,10,0,221,49,
+224,89,206,5,34,23,13,0,213,13,34,87,12,0,198,81,
+42,87,1,0,195,90,202,89,43,87,0,0,43,23,5,0,
+202,49,2,216,63,6,32,199,128,0,123,0,93,87,52,0,
+189,103,7,0,224,97,218,5,157,95,7,0,224,89,250,197,
+93,231,53,0,157,87,7,0,64,6,255,16,128,7,97,0,
+6,232,61,55,13,0,224,49,178,5,191,255,68,185,61,55,
+1,0,0,58,0,66,191,255,72,249,93,7,6,0,93,7,
+7,0,61,143,1,0,32,54,96,2,241,55,32,2,45,6,
+44,4,141,0,205,49,191,255,162,155,32,102,35,0,32,94,
+4,2,125,95,16,0,93,103,52,0,64,6,127,0,128,7,
+33,0,38,135,1,0,4,143,217,131,241,129,198,5,32,86,
+34,0,165,21,36,127,45,175,102,7,41,0,102,127,9,0,
+42,6,44,4,141,0,32,54,96,2,240,55,32,2,202,49,
+191,255,66,155,1,82,64,6,63,0,128,7,225,0,6,232,
+189,143,45,0,224,137,242,93,36,135,117,139,224,129,234,29,
+36,127,121,139,224,121,170,29,132,119,125,139,97,114,138,21,
+4,103,49,133,236,110,232,3,10,90,13,224,75,224,28,48,
+129,255,242,53,36,135,45,133,220,129,100,135,45,133,4,127,
+48,133,68,7,124,139,100,127,113,139,36,119,113,139,224,113,
+199,21,14,110,255,255,100,111,113,139,61,87,1,0,1,98,
+36,143,117,139,234,103,192,0,12,137,36,135,45,175,100,143,
+117,139,125,135,9,0,245,37,61,119,1,0,1,226,238,231,
+192,0,191,255,206,68,106,7,9,0,45,6,248,65,1,0,
+106,111,5,0,44,6,220,147,141,0,106,103,29,0,2,90,
+106,231,33,0,0,58,10,224,106,95,21,0,28,48,191,255,
+106,142,124,7,0,0,28,48,191,255,176,68,1,82,93,87,
+7,0,229,21,61,55,1,0,128,255,86,19,61,55,1,0,
+128,255,70,19,36,143,45,175,4,135,216,131,125,143,49,0,
+4,18,224,129,162,5,2,18,93,7,7,0,2,80,64,6,
+255,0,128,7,97,0,6,232,128,255,102,17,224,81,194,5,
+32,86,35,0,197,29,61,55,1,0,1,66,230,71,192,0,
+61,78,20,0,39,6,220,147,141,0,191,255,220,120,125,87,
+13,0,202,47,2,0,202,55,2,0,61,55,1,0,10,56,
+128,255,158,18,1,122,93,127,7,0,3,82,64,6,127,0,
+128,7,225,16,6,232,61,55,13,0,38,135,12,0,125,135,
+16,0,102,7,0,0,93,7,7,0,191,255,14,68,125,7,
+13,0,29,48,128,255,250,16,224,81,210,5,32,86,35,0,
+128,7,4,1,61,127,16,0,224,121,194,5,32,86,36,0,
+165,125,61,135,49,0,36,231,45,175,189,23,29,0,176,225,
+2,6,129,255,154,45,61,55,1,0,28,6,215,255,153,21,
+1,90,230,95,192,0,36,127,117,139,43,128,80,121,36,119,
+113,139,100,127,117,139,65,114,100,119,113,139,4,218,165,93,
+0,58,128,255,100,18,2,218,61,95,1,0,1,58,235,63,
+192,0,38,6,220,147,141,0,0,66,191,255,172,119,1,82,
+93,87,7,0,245,69,194,118,238,0,14,6,192,255,226,87,
+0,0,28,6,105,255,177,5,224,81,178,61,4,218,2,6,
+128,255,242,13,61,135,1,0,1,82,36,127,121,139,240,87,
+192,0,10,121,36,119,45,175,100,127,121,139,125,119,49,0,
+61,95,1,0,1,106,235,111,192,0,36,143,117,139,45,80,
+74,137,100,143,117,139,234,29,36,135,121,139,224,129,170,29,
+4,119,49,133,238,126,232,3,10,106,15,232,77,232,188,233,
+224,233,151,13,29,48,129,255,204,51,36,143,45,133,221,137,
+100,143,45,133,36,135,45,133,220,129,100,135,45,133,165,5,
+2,218,27,80,64,6,255,16,166,143,45,0,224,137,130,37,
+38,119,1,0,1,130,36,103,121,139,238,135,192,0,76,129,
+242,21,4,23,49,133,98,18,174,5,2,18,32,86,232,3,
+226,87,32,2,10,130,38,119,49,0,36,127,45,175,80,80,
+174,121,234,121,215,5,100,7,121,139,68,7,124,139,127,0,
+128,7,97,0,6,232,128,255,152,15,224,81,194,5,32,86,
+35,0,133,37,32,54,20,5,128,255,52,253,61,55,1,0,
+1,66,230,71,192,0,61,78,20,0,39,6,220,147,141,0,
+191,255,6,119,125,87,13,0,202,47,2,0,202,55,2,0,
+61,55,1,0,10,56,128,255,200,16,1,122,93,127,7,0,
+5,82,64,6,127,0,130,7,225,0,6,232,61,55,13,0,
 38,135,12,0,125,135,16,0,102,7,0,0,93,7,7,0,
-191,255,252,66,61,127,16,0,125,7,13,0,224,121,194,5,
-32,86,37,0,133,77,32,54,0,2,129,255,6,82,10,216,
-224,217,154,13,38,6,80,183,132,0,32,62,224,4,0,66,
-191,255,142,59,61,119,1,0,32,110,96,2,238,111,32,2,
-43,6,204,248,140,0,203,105,45,55,57,0,27,56,32,70,
-0,2,191,255,174,178,125,87,16,0,0,226,0,18,2,80,
-193,82,219,81,234,127,1,0,2,112,200,114,2,96,14,97,
-47,97,12,225,220,0,65,18,2,6,0,255,150,245,27,48,
-129,255,188,81,224,225,226,13,36,63,33,175,61,71,1,0,
-28,72,38,6,100,183,132,0,129,255,132,87,32,86,37,0,
-165,5,11,82,64,6,255,16,128,7,225,0,6,232,128,255,
-8,11,224,81,194,5,32,86,35,0,133,61,61,135,1,0,
-1,226,240,231,192,0,191,255,30,66,106,7,9,0,47,6,
-36,64,1,0,106,127,5,0,46,6,124,136,141,0,106,119,
-29,0,32,110,208,7,106,231,33,0,10,48,106,111,21,0,
-125,87,13,0,202,47,2,0,202,55,2,0,1,58,191,255,
-198,136,61,55,1,0,32,94,96,2,230,95,32,2,49,6,
-204,248,140,0,209,89,61,63,13,0,43,71,57,0,128,255,
-0,12,1,130,93,135,7,0,12,82,64,6,255,0,128,7,
-225,0,6,232,61,55,13,0,38,135,12,0,125,135,16,0,
-102,7,0,0,93,7,7,0,191,255,180,65,61,127,16,0,
-125,7,13,0,224,121,194,5,32,86,36,0,181,101,32,54,
-0,2,129,255,190,80,10,224,224,225,154,13,38,6,176,183,
-132,0,32,62,59,5,0,66,191,255,70,58,61,119,1,0,
-32,110,96,2,238,111,32,2,43,6,204,248,140,0,203,105,
-45,55,57,0,28,56,32,70,0,2,191,255,102,177,125,87,
-16,0,234,0,224,81,226,5,28,48,129,255,90,80,11,82,
-149,61,60,143,0,0,131,138,169,21,1,18,252,87,5,0,
-10,6,56,200,210,5,10,6,116,140,162,5,0,18,93,23,
-44,0,28,48,129,255,48,80,13,82,197,37,61,55,1,0,
-28,56,191,255,202,240,93,87,5,0,28,48,129,255,24,80,
-189,87,5,0,10,6,2,255,202,5,32,86,38,0,165,21,
-61,55,1,0,191,255,186,244,224,81,162,13,61,55,1,0,
-191,255,152,244,224,81,194,5,32,86,16,0,181,5,32,86,
-18,0,64,6,255,0,134,7,225,16,6,232,128,255,138,9,
-224,81,194,5,32,86,35,0,229,93,61,55,1,0,1,138,
-230,143,192,0,36,111,109,139,49,112,78,105,100,111,109,139,
-191,255,106,238,10,224,224,225,202,5,32,86,35,0,181,77,
-61,87,1,0,1,218,234,223,192,0,191,255,122,64,106,7,
-9,0,49,6,36,64,1,0,106,143,5,0,48,6,124,136,
-141,0,106,135,29,0,32,126,232,3,106,223,33,0,10,48,
-106,127,21,0,125,87,13,0,202,47,2,0,202,55,2,0,
-1,58,191,255,34,135,61,55,13,0,61,63,1,0,28,64,
-128,255,214,10,3,106,99,111,0,0,28,102,64,0,61,55,
-1,0,99,103,2,0,99,7,5,0,67,7,8,0,32,94,
-239,0,67,95,9,0,10,56,8,82,99,87,10,0,3,64,
-0,74,128,255,132,10,93,231,4,0,1,138,93,143,7,0,
-32,86,19,0,70,6,255,16,128,7,97,0,6,232,61,55,
+191,255,56,66,61,127,16,0,125,7,13,0,224,121,210,5,
+32,86,36,0,128,7,26,1,189,23,29,0,2,112,174,0,
+29,98,76,113,14,224,61,143,37,0,156,0,224,137,162,13,
+157,127,33,0,239,225,234,5,61,119,37,0,14,134,1,0,
+149,37,4,111,217,133,129,106,169,29,36,63,45,175,61,71,
+1,0,2,72,38,6,0,194,132,0,129,255,162,95,61,71,
+37,0,224,65,130,13,157,63,33,0,38,6,40,194,132,0,
+129,255,140,95,37,54,200,129,129,255,132,95,1,130,93,231,
+32,0,125,135,37,0,189,23,29,0,194,118,63,0,14,6,
+193,255,202,5,32,86,35,0,181,77,224,17,186,29,61,23,
+37,0,101,18,190,5,4,82,181,69,4,87,217,133,129,82,
+233,13,36,63,45,175,61,71,1,0,157,79,33,0,99,23,
+1,0,38,6,72,194,132,0,129,255,52,95,32,86,35,0,
+245,45,220,118,128,0,178,5,4,82,165,45,220,126,36,0,
+178,5,1,82,213,37,220,94,88,0,104,90,130,13,11,6,
+176,255,210,29,11,6,168,255,162,29,181,5,1,82,133,29,
+4,143,217,133,129,138,137,21,36,63,45,175,61,71,1,0,
+61,111,37,0,157,79,33,0,99,111,1,0,38,6,72,194,
+132,0,129,255,218,94,32,86,35,0,165,5,6,82,66,6,
+255,0,128,7,225,0,6,232,128,255,246,13,224,81,194,5,
+32,86,36,0,133,69,61,143,41,0,17,6,238,255,182,5,
+8,82,149,61,61,127,1,0,1,226,239,231,192,0,191,255,
+194,64,106,7,9,0,46,6,248,65,1,0,106,119,5,0,
+45,6,220,147,141,0,106,111,29,0,2,98,106,231,33,0,
+10,48,106,103,21,0,125,87,13,0,202,47,2,0,202,55,
+2,0,1,58,191,255,84,138,61,55,1,0,61,87,41,0,
+61,63,13,0,10,94,1,0,125,95,41,0,48,6,124,194,
+132,0,208,81,138,71,1,0,128,255,254,14,1,114,93,119,
+7,0,7,82,64,6,255,0,128,7,97,0,6,232,61,55,
 13,0,38,135,12,0,125,135,16,0,102,7,0,0,93,7,
-7,0,191,255,234,63,61,127,16,0,125,7,13,0,224,121,
-194,5,32,86,36,0,181,5,32,86,32,0,64,6,127,0,
-134,7,225,0,6,232,128,255,128,8,224,81,194,5,32,86,
-35,0,149,69,61,135,1,0,1,226,240,231,192,0,191,255,
-150,63,106,7,9,0,47,6,36,64,1,0,106,127,5,0,
-46,6,124,136,141,0,106,119,29,0,32,110,232,3,106,231,
-33,0,10,48,106,111,21,0,125,87,13,0,202,47,2,0,
-202,55,2,0,1,58,191,255,62,134,61,63,13,0,2,98,
-99,103,0,0,61,55,1,0,99,7,2,0,99,7,5,0,
-67,7,8,0,32,94,239,0,67,95,9,0,8,82,99,87,
-10,0,3,64,0,74,128,255,176,9,1,138,93,143,7,0,
-32,86,21,0,70,6,255,0,128,7,97,0,6,232,61,55,
-13,0,38,135,12,0,125,135,16,0,102,7,0,0,93,7,
-7,0,191,255,26,63,61,127,16,0,125,7,13,0,224,121,
-194,5,32,86,36,0,181,5,32,86,22,0,64,6,127,0,
-134,7,225,0,6,232,128,255,176,7,224,81,194,5,32,86,
-35,0,165,69,61,135,1,0,1,226,240,231,192,0,191,255,
-198,62,106,7,9,0,47,6,36,64,1,0,106,127,5,0,
-46,6,124,136,141,0,106,119,29,0,32,110,232,3,106,231,
+7,0,191,255,86,64,61,127,16,0,125,7,13,0,224,121,
+194,5,32,86,37,0,165,5,6,82,64,6,127,0,128,7,
+225,16,6,232,32,54,0,2,129,255,248,87,10,224,0,18,
+2,136,193,138,220,137,2,112,200,114,2,104,14,105,113,111,
+0,0,65,18,2,6,0,255,198,245,59,6,44,4,141,0,
+61,103,1,0,32,94,96,2,236,95,32,2,219,89,43,55,
+57,0,28,56,32,70,0,2,191,255,190,61,28,48,129,255,
+206,87,61,135,1,0,1,226,240,231,192,0,191,255,196,63,
+106,7,9,0,47,6,248,65,1,0,106,127,5,0,46,6,
+220,147,141,0,106,119,29,0,32,110,208,7,106,231,33,0,
+10,48,106,111,21,0,125,87,13,0,202,47,2,0,202,55,
+2,0,1,58,191,255,84,137,61,55,1,0,32,94,96,2,
+230,95,32,2,219,89,61,63,13,0,43,71,57,0,128,255,
+32,14,1,138,93,143,7,0,9,82,64,6,255,16,128,7,
+225,0,6,232,61,55,13,0,38,135,12,0,125,135,16,0,
+102,7,0,0,93,7,7,0,191,255,96,63,61,127,16,0,
+125,7,13,0,224,121,178,5,11,82,133,61,61,111,1,0,
+1,226,237,231,192,0,191,255,42,63,10,48,102,7,9,0,
+44,6,248,65,1,0,102,103,5,0,43,6,220,147,141,0,
+102,95,29,0,32,86,208,7,102,231,33,0,1,58,102,87,
+21,0,125,55,13,0,198,47,2,0,198,55,2,0,191,255,
+186,136,61,55,1,0,32,134,96,2,230,135,32,2,46,6,
+44,4,141,0,206,129,61,63,13,0,48,71,57,0,128,255,
+136,13,1,106,93,111,7,0,10,82,64,6,255,0,128,7,
+225,16,6,232,61,55,13,0,38,135,12,0,125,135,16,0,
+102,7,0,0,93,7,7,0,191,255,192,62,61,127,16,0,
+125,7,13,0,224,121,194,5,32,86,37,0,133,77,32,54,
+0,2,129,255,110,86,10,216,224,217,154,13,38,6,144,194,
+132,0,32,62,224,4,0,66,191,255,82,55,61,119,1,0,
+32,110,96,2,238,111,32,2,43,6,44,4,141,0,203,105,
+45,55,57,0,27,56,32,70,0,2,191,255,220,177,125,87,
+16,0,0,226,0,18,2,80,193,82,219,81,234,127,1,0,
+2,112,200,114,2,96,14,97,47,97,12,225,220,0,65,18,
+2,6,0,255,150,245,27,48,129,255,36,86,224,225,226,13,
+36,63,45,175,61,71,1,0,28,72,38,6,164,194,132,0,
+129,255,236,91,32,86,37,0,165,5,11,82,64,6,255,16,
+128,7,225,0,6,232,128,255,8,11,224,81,194,5,32,86,
+35,0,133,61,61,135,1,0,1,226,240,231,192,0,191,255,
+226,61,106,7,9,0,47,6,248,65,1,0,106,127,5,0,
+46,6,220,147,141,0,106,119,29,0,32,110,208,7,106,231,
 33,0,10,48,106,111,21,0,125,87,13,0,202,47,2,0,
-202,55,2,0,1,58,191,255,110,133,61,63,13,0,32,102,
-170,0,99,103,0,0,61,55,1,0,99,7,2,0,99,7,
-5,0,67,7,8,0,32,94,239,0,67,95,9,0,8,82,
-99,87,10,0,3,64,0,74,128,255,222,8,1,138,93,143,
-7,0,32,86,23,0,70,6,255,0,128,7,97,0,6,232,
-61,55,13,0,38,135,12,0,125,135,16,0,102,7,0,0,
-93,7,7,0,191,255,72,62,61,127,16,0,125,7,13,0,
-224,121,194,5,32,86,36,0,181,5,32,86,24,0,64,6,
-127,0,134,7,225,48,6,232,128,255,222,6,224,81,194,5,
-32,86,35,0,197,109,61,55,1,0,191,255,178,236,61,55,
-1,0,10,216,191,255,132,236,10,208,61,135,1,0,1,226,
-240,231,192,0,191,255,224,61,106,7,9,0,47,6,36,64,
-1,0,106,127,5,0,46,6,124,136,141,0,106,119,29,0,
-32,110,232,3,106,231,33,0,4,23,39,133,106,111,21,0,
-125,87,13,0,10,104,205,47,2,0,205,55,2,0,97,18,
-209,5,242,5,99,18,130,13,149,13,32,230,254,0,245,5,
-32,230,128,0,197,5,27,224,165,5,26,224,0,58,27,6,
-128,255,198,37,250,225,162,37,61,55,1,0,32,102,66,0,
-99,103,0,0,28,16,130,0,99,23,2,0,99,7,5,0,
-67,7,8,0,32,94,239,0,67,95,9,0,8,82,99,87,
-10,0,13,56,3,64,0,74,128,255,206,7,61,55,1,0,
-28,56,135,0,191,255,230,235,1,58,61,55,13,0,191,255,
-22,132,1,122,93,127,7,0,32,86,25,0,70,6,255,48,
+202,55,2,0,1,58,191,255,114,135,61,55,1,0,32,94,
+96,2,230,95,32,2,49,6,44,4,141,0,209,89,61,63,
+13,0,43,71,57,0,128,255,0,12,1,130,93,135,7,0,
+12,82,64,6,255,0,128,7,225,0,6,232,61,55,13,0,
+38,135,12,0,125,135,16,0,102,7,0,0,93,7,7,0,
+191,255,120,61,61,127,16,0,125,7,13,0,224,121,194,5,
+32,86,36,0,181,101,32,54,0,2,129,255,38,85,10,224,
+224,225,154,13,38,6,240,194,132,0,32,62,59,5,0,66,
+191,255,10,54,61,119,1,0,32,110,96,2,238,111,32,2,
+43,6,44,4,141,0,203,105,45,55,57,0,28,56,32,70,
+0,2,191,255,148,176,125,87,16,0,234,0,224,81,226,5,
+28,48,129,255,194,84,11,82,149,61,60,143,0,0,131,138,
+169,21,1,18,252,87,5,0,10,6,56,200,210,5,10,6,
+116,140,162,5,0,18,93,23,44,0,28,48,129,255,152,84,
+13,82,197,37,61,55,1,0,28,56,191,255,202,240,93,87,
+5,0,28,48,129,255,128,84,189,87,5,0,10,6,2,255,
+202,5,32,86,38,0,165,21,61,55,1,0,191,255,186,244,
+224,81,162,13,61,55,1,0,191,255,152,244,224,81,194,5,
+32,86,16,0,181,5,32,86,18,0,64,6,255,0,134,7,
+225,16,6,232,128,255,138,9,224,81,194,5,32,86,35,0,
+229,93,61,55,1,0,1,138,230,143,192,0,36,111,121,139,
+49,112,78,105,100,111,121,139,191,255,106,238,10,224,224,225,
+202,5,32,86,35,0,181,77,61,87,1,0,1,218,234,223,
+192,0,191,255,62,60,106,7,9,0,49,6,248,65,1,0,
+106,143,5,0,48,6,220,147,141,0,106,135,29,0,32,126,
+232,3,106,223,33,0,10,48,106,127,21,0,125,87,13,0,
+202,47,2,0,202,55,2,0,1,58,191,255,206,133,61,55,
+13,0,61,63,1,0,28,64,128,255,214,10,3,106,99,111,
+0,0,28,102,64,0,61,55,1,0,99,103,2,0,99,7,
+5,0,67,7,8,0,32,94,239,0,67,95,9,0,10,56,
+8,82,99,87,10,0,3,64,0,74,128,255,132,10,93,231,
+4,0,1,138,93,143,7,0,32,86,19,0,70,6,255,16,
 128,7,97,0,6,232,61,55,13,0,38,135,12,0,125,135,
-16,0,102,7,0,0,93,7,7,0,191,255,34,61,61,127,
+16,0,102,7,0,0,93,7,7,0,191,255,174,59,61,127,
 16,0,125,7,13,0,224,121,194,5,32,86,36,0,181,5,
-32,86,26,0,64,6,127,0,128,7,225,0,38,23,1,0,
-226,134,96,0,46,6,252,126,141,0,206,129,112,7,16,0,
-6,232,128,255,164,5,224,81,194,5,32,86,35,0,245,45,
-61,103,1,0,1,226,236,231,192,0,191,255,186,60,10,48,
-102,7,9,0,43,6,36,64,1,0,102,95,5,0,42,6,
-124,136,141,0,102,87,29,0,32,142,232,3,102,231,33,0,
-1,58,102,143,21,0,125,55,13,0,198,47,2,0,198,55,
-2,0,191,255,98,131,61,55,1,0,61,63,13,0,128,255,
-192,6,1,130,93,135,7,0,32,86,27,0,64,6,255,0,
+32,86,32,0,64,6,127,0,134,7,225,0,6,232,128,255,
+128,8,224,81,194,5,32,86,35,0,149,69,61,135,1,0,
+1,226,240,231,192,0,191,255,90,59,106,7,9,0,47,6,
+248,65,1,0,106,127,5,0,46,6,220,147,141,0,106,119,
+29,0,32,110,232,3,106,231,33,0,10,48,106,111,21,0,
+125,87,13,0,202,47,2,0,202,55,2,0,1,58,191,255,
+234,132,61,63,13,0,2,98,99,103,0,0,61,55,1,0,
+99,7,2,0,99,7,5,0,67,7,8,0,32,94,239,0,
+67,95,9,0,8,82,99,87,10,0,3,64,0,74,128,255,
+176,9,1,138,93,143,7,0,32,86,21,0,70,6,255,0,
 128,7,97,0,6,232,61,55,13,0,38,135,12,0,125,135,
-16,0,102,7,0,0,93,7,7,0,191,255,98,60,61,127,
-16,0,125,7,13,0,224,121,146,13,38,6,196,183,132,0,
-129,255,108,81,32,86,39,0,181,5,32,86,28,0,64,6,
-127,0,128,7,225,0,6,232,128,255,238,4,224,81,194,5,
-32,86,35,0,149,61,61,135,1,0,1,226,240,231,192,0,
-191,255,4,60,106,7,9,0,47,6,36,64,1,0,106,127,
-5,0,46,6,124,136,141,0,106,119,29,0,32,110,208,7,
+16,0,102,7,0,0,93,7,7,0,191,255,222,58,61,127,
+16,0,125,7,13,0,224,121,194,5,32,86,36,0,181,5,
+32,86,22,0,64,6,127,0,134,7,225,0,6,232,128,255,
+176,7,224,81,194,5,32,86,35,0,165,69,61,135,1,0,
+1,226,240,231,192,0,191,255,138,58,106,7,9,0,47,6,
+248,65,1,0,106,127,5,0,46,6,220,147,141,0,106,119,
+29,0,32,110,232,3,106,231,33,0,10,48,106,111,21,0,
+125,87,13,0,202,47,2,0,202,55,2,0,1,58,191,255,
+26,132,61,63,13,0,32,102,170,0,99,103,0,0,61,55,
+1,0,99,7,2,0,99,7,5,0,67,7,8,0,32,94,
+239,0,67,95,9,0,8,82,99,87,10,0,3,64,0,74,
+128,255,222,8,1,138,93,143,7,0,32,86,23,0,70,6,
+255,0,128,7,97,0,6,232,61,55,13,0,38,135,12,0,
+125,135,16,0,102,7,0,0,93,7,7,0,191,255,12,58,
+61,127,16,0,125,7,13,0,224,121,194,5,32,86,36,0,
+181,5,32,86,24,0,64,6,127,0,134,7,225,48,6,232,
+128,255,222,6,224,81,194,5,32,86,35,0,197,109,61,55,
+1,0,191,255,178,236,61,55,1,0,10,216,191,255,132,236,
+10,208,61,135,1,0,1,226,240,231,192,0,191,255,164,57,
+106,7,9,0,47,6,248,65,1,0,106,127,5,0,46,6,
+220,147,141,0,106,119,29,0,32,110,232,3,106,231,33,0,
+4,23,51,133,106,111,21,0,125,87,13,0,10,104,205,47,
+2,0,205,55,2,0,97,18,209,5,242,5,99,18,130,13,
+149,13,32,230,254,0,245,5,32,230,128,0,197,5,27,224,
+165,5,26,224,0,58,27,6,128,255,198,37,250,225,162,37,
+61,55,1,0,32,102,66,0,99,103,0,0,28,16,130,0,
+99,23,2,0,99,7,5,0,67,7,8,0,32,94,239,0,
+67,95,9,0,8,82,99,87,10,0,13,56,3,64,0,74,
+128,255,206,7,61,55,1,0,28,56,135,0,191,255,230,235,
+1,58,61,55,13,0,191,255,194,130,1,122,93,127,7,0,
+32,86,25,0,70,6,255,48,128,7,97,0,6,232,61,55,
+13,0,38,135,12,0,125,135,16,0,102,7,0,0,93,7,
+7,0,191,255,230,56,61,127,16,0,125,7,13,0,224,121,
+194,5,32,86,36,0,181,5,32,86,26,0,64,6,127,0,
+128,7,225,0,38,23,1,0,226,134,96,0,46,6,92,138,
+141,0,206,129,112,7,16,0,6,232,128,255,164,5,224,81,
+194,5,32,86,35,0,245,45,61,103,1,0,1,226,236,231,
+192,0,191,255,126,56,10,48,102,7,9,0,43,6,248,65,
+1,0,102,95,5,0,42,6,220,147,141,0,102,87,29,0,
+32,142,232,3,102,231,33,0,1,58,102,143,21,0,125,55,
+13,0,198,47,2,0,198,55,2,0,191,255,14,130,61,55,
+1,0,61,63,13,0,128,255,192,6,1,130,93,135,7,0,
+32,86,27,0,64,6,255,0,128,7,97,0,6,232,61,55,
+13,0,38,135,12,0,125,135,16,0,102,7,0,0,93,7,
+7,0,191,255,38,56,61,127,16,0,125,7,13,0,224,121,
+146,13,38,6,4,195,132,0,129,255,212,85,32,86,39,0,
+181,5,32,86,28,0,64,6,127,0,128,7,225,0,6,232,
+128,255,238,4,224,81,194,5,32,86,35,0,149,61,61,135,
+1,0,1,226,240,231,192,0,191,255,200,55,106,7,9,0,
+47,6,248,65,1,0,106,127,5,0,46,6,220,147,141,0,
+106,119,29,0,32,110,208,7,106,231,33,0,10,48,106,111,
+21,0,125,87,13,0,202,47,2,0,202,55,2,0,1,58,
+191,255,88,129,61,55,1,0,32,94,96,2,230,95,32,2,
+49,6,44,4,141,0,209,89,61,63,13,0,43,71,57,0,
+128,255,14,6,1,130,93,135,7,0,32,86,29,0,64,6,
+255,0,130,7,225,0,6,232,61,55,13,0,38,135,12,0,
+125,135,16,0,102,7,0,0,93,7,7,0,191,255,92,55,
+61,127,16,0,125,7,13,0,224,121,146,13,38,6,24,195,
+132,0,129,255,10,85,32,86,39,0,165,69,32,54,0,2,
+129,255,0,79,10,224,224,225,154,13,38,6,52,195,132,0,
+32,62,111,7,0,66,191,255,228,47,61,119,1,0,32,110,
+96,2,238,111,32,2,43,6,44,4,141,0,203,105,45,55,
+57,0,28,56,32,70,0,2,191,255,110,170,125,87,16,0,
+28,48,234,0,224,81,226,5,129,255,156,78,32,86,28,0,
+245,21,3,56,128,255,178,5,224,81,218,13,61,87,1,0,
+35,23,1,0,234,134,96,0,46,6,92,138,141,0,206,129,
+112,23,16,0,28,48,129,255,110,78,32,86,39,0,66,6,
+255,0,128,7,225,0,6,232,128,255,166,3,224,81,194,5,
+32,86,35,0,181,53,61,135,1,0,1,226,240,231,192,0,
+191,255,128,54,106,7,9,0,47,6,248,65,1,0,106,127,
+5,0,46,6,220,147,141,0,106,119,29,0,32,110,232,3,
 106,231,33,0,10,48,106,111,21,0,125,87,13,0,202,47,
-2,0,202,55,2,0,1,58,191,255,172,130,61,55,1,0,
-32,94,96,2,230,95,32,2,49,6,204,248,140,0,209,89,
-61,63,13,0,43,71,57,0,128,255,14,6,1,130,93,135,
-7,0,32,86,29,0,64,6,255,0,130,7,225,0,6,232,
-61,55,13,0,38,135,12,0,125,135,16,0,102,7,0,0,
-93,7,7,0,191,255,152,59,61,127,16,0,125,7,13,0,
-224,121,146,13,38,6,216,183,132,0,129,255,162,80,32,86,
-39,0,165,69,32,54,0,2,129,255,152,74,10,224,224,225,
-154,13,38,6,244,183,132,0,32,62,111,7,0,66,191,255,
-32,52,61,119,1,0,32,110,96,2,238,111,32,2,43,6,
-204,248,140,0,203,105,45,55,57,0,28,56,32,70,0,2,
-191,255,64,171,125,87,16,0,28,48,234,0,224,81,226,5,
-129,255,52,74,32,86,28,0,245,21,3,56,128,255,178,5,
-224,81,218,13,61,87,1,0,35,23,1,0,234,134,96,0,
-46,6,252,126,141,0,206,129,112,23,16,0,28,48,129,255,
-6,74,32,86,39,0,66,6,255,0,128,7,225,0,6,232,
-128,255,166,3,224,81,194,5,32,86,35,0,181,53,61,135,
-1,0,1,226,240,231,192,0,191,255,188,58,106,7,9,0,
-47,6,36,64,1,0,106,127,5,0,46,6,124,136,141,0,
-106,119,29,0,32,110,232,3,106,231,33,0,10,48,106,111,
+2,0,202,55,2,0,1,58,191,255,16,128,61,55,1,0,
+61,63,13,0,36,71,129,139,32,78,241,0,128,255,218,4,
+1,98,93,103,7,0,32,86,31,0,64,6,255,0,128,7,
+97,0,6,232,61,55,13,0,38,135,12,0,125,135,16,0,
+102,7,0,0,93,7,7,0,191,255,32,54,61,127,16,0,
+125,7,13,0,224,121,194,5,32,86,18,0,165,5,11,82,
+64,6,127,0,128,7,225,0,6,232,128,255,244,2,224,81,
+194,5,32,86,35,0,197,61,61,55,1,0,191,255,56,238,
+224,81,202,5,32,86,20,0,181,53,61,135,1,0,1,226,
+240,231,192,0,191,255,188,53,106,7,9,0,47,6,248,65,
+1,0,106,127,5,0,46,6,220,147,141,0,106,119,29,0,
+32,110,232,3,106,231,33,0,10,48,106,111,21,0,125,87,
+13,0,202,47,2,0,202,55,2,0,1,58,191,255,76,127,
+61,55,1,0,61,63,13,0,36,71,129,139,32,78,242,0,
+128,255,22,4,1,98,93,103,7,0,32,86,33,0,64,6,
+255,0,128,7,97,0,6,232,61,55,13,0,38,135,12,0,
+125,135,16,0,102,7,0,0,93,7,7,0,191,255,92,53,
+61,127,16,0,125,7,13,0,224,121,194,5,32,86,36,0,
+181,5,32,86,20,0,64,6,127,0,128,7,97,0,4,135,
+49,133,240,142,232,3,10,122,17,232,79,232,29,48,129,255,
+228,37,224,81,146,13,38,6,72,195,132,0,32,62,37,8,
+0,66,191,255,216,45,36,103,45,133,4,87,48,133,221,97,
+100,103,45,133,1,18,224,81,162,5,10,16,100,23,109,139,
+13,82,64,6,127,0,134,7,225,0,6,232,128,255,226,1,
+224,81,194,5,32,86,35,0,181,125,36,135,109,139,16,142,
+255,255,100,143,109,139,224,129,186,5,15,82,149,117,61,119,
+1,0,1,226,238,231,192,0,191,255,168,52,106,7,9,0,
+45,6,248,65,1,0,106,111,5,0,44,6,220,147,141,0,
+106,103,29,0,32,94,208,7,106,231,33,0,10,48,106,95,
 21,0,125,87,13,0,202,47,2,0,202,55,2,0,1,58,
-191,255,100,129,61,55,1,0,61,63,13,0,36,71,117,139,
-32,78,241,0,128,255,218,4,1,98,93,103,7,0,32,86,
-31,0,64,6,255,0,128,7,97,0,6,232,61,55,13,0,
-38,135,12,0,125,135,16,0,102,7,0,0,93,7,7,0,
-191,255,92,58,61,127,16,0,125,7,13,0,224,121,194,5,
-32,86,18,0,165,5,11,82,64,6,127,0,128,7,225,0,
-6,232,128,255,244,2,224,81,194,5,32,86,35,0,197,61,
-61,55,1,0,191,255,56,238,224,81,202,5,32,86,20,0,
-181,53,61,135,1,0,1,226,240,231,192,0,191,255,248,57,
-106,7,9,0,47,6,36,64,1,0,106,127,5,0,46,6,
-124,136,141,0,106,119,29,0,32,110,232,3,106,231,33,0,
-10,48,106,111,21,0,125,87,13,0,202,47,2,0,202,55,
-2,0,1,58,191,255,160,128,61,55,1,0,61,63,13,0,
-36,71,117,139,32,78,242,0,128,255,22,4,1,98,93,103,
-7,0,32,86,33,0,64,6,255,0,128,7,97,0,6,232,
-61,55,13,0,38,135,12,0,125,135,16,0,102,7,0,0,
-93,7,7,0,191,255,152,57,61,127,16,0,125,7,13,0,
-224,121,194,5,32,86,36,0,181,5,32,86,20,0,64,6,
-127,0,128,7,97,0,4,135,37,133,240,142,232,3,10,122,
-17,232,79,232,29,48,129,255,124,33,224,81,146,13,38,6,
-8,184,132,0,32,62,37,8,0,66,191,255,20,50,36,103,
-33,133,4,87,36,133,221,97,100,103,33,133,1,18,224,81,
-162,5,10,16,100,23,97,139,13,82,64,6,127,0,134,7,
-225,0,6,232,128,255,226,1,224,81,194,5,32,86,35,0,
-181,125,36,135,97,139,16,142,255,255,100,143,97,139,224,129,
-186,5,15,82,149,117,61,119,1,0,1,226,238,231,192,0,
-191,255,228,56,106,7,9,0,45,6,36,64,1,0,106,111,
-5,0,44,6,124,136,141,0,106,103,29,0,32,94,208,7,
-106,231,33,0,10,48,106,95,21,0,125,87,13,0,202,47,
-2,0,202,55,2,0,1,58,191,255,140,127,36,63,33,175,
-61,71,1,0,38,6,40,184,132,0,129,255,210,77,157,87,
-45,0,224,81,242,29,38,6,72,184,132,0,129,255,192,77,
-61,63,13,0,7,138,99,143,0,0,61,55,1,0,99,7,
-2,0,99,7,5,0,67,7,8,0,32,134,239,0,67,135,
-9,0,8,122,99,127,10,0,3,64,0,74,128,255,218,2,
-213,13,38,6,28,184,132,0,129,255,132,77,61,55,1,0,
-61,63,13,0,0,66,128,255,144,2,189,119,45,0,224,113,
-242,13,61,95,1,0,1,106,235,111,192,0,36,143,109,139,
-45,80,74,137,100,143,109,139,1,98,68,103,112,139,1,122,
-93,127,7,0,14,82,70,6,255,0,128,7,97,0,6,232,
-61,55,13,0,38,135,12,0,125,135,16,0,102,7,0,0,
-93,7,7,0,191,255,8,56,61,127,16,0,125,7,13,0,
-224,121,194,5,32,86,36,0,165,5,4,82,64,6,127,0,
-128,7,97,0,6,232,128,255,160,0,224,81,194,5,32,86,
-35,0,213,29,61,55,1,0,1,66,230,71,192,0,61,78,
-20,0,39,6,124,136,141,0,191,255,106,105,125,87,13,0,
-202,47,2,0,202,55,2,0,61,55,1,0,10,56,191,255,
-156,104,1,122,93,127,7,0,32,86,17,0,64,6,127,0,
-128,7,97,0,6,232,61,55,13,0,38,135,12,0,125,135,
-16,0,102,7,0,0,93,7,7,0,191,255,130,55,61,23,
-16,0,125,7,13,0,2,6,246,253,202,5,32,86,18,0,
-133,21,224,17,194,5,32,86,36,0,181,13,93,7,44,0,
-253,111,23,0,244,105,178,5,13,82,181,5,32,86,18,0,
-64,6,127,0,0,18,38,135,9,0,36,143,33,175,36,127,
-33,133,176,137,15,126,208,7,239,137,235,87,0,0,127,0,
-128,7,97,0,6,232,61,55,1,0,0,58,0,66,191,255,
-72,230,93,7,6,0,32,86,34,0,64,6,127,0,128,7,
-97,0,36,111,105,139,6,232,61,55,1,0,1,138,230,143,
-192,0,49,112,78,105,100,111,105,139,1,98,230,103,192,0,
-36,135,109,139,44,136,81,129,100,135,109,139,0,58,0,66,
-191,255,6,230,93,7,6,0,61,127,1,0,32,54,96,2,
-239,55,32,2,43,6,204,248,140,0,203,49,191,255,184,137,
-32,86,35,0,64,6,127,0,128,7,33,0,0,58,128,255,
-50,0,32,86,36,0,64,6,63,0,128,7,33,0,0,58,
-128,255,32,0,32,86,37,0,64,6,63,0,128,7,33,0,
-32,62,254,0,128,255,12,0,32,86,38,0,64,6,63,0,
-128,7,225,0,7,224,156,0,6,232,61,63,1,0,29,119,
-53,0,61,71,16,0,196,114,44,6,148,184,132,0,204,113,
-46,79,5,0,38,6,88,184,132,0,129,255,114,75,36,127,
-105,139,61,55,1,0,1,90,230,95,192,0,43,128,80,121,
-100,127,105,139,1,114,230,119,192,0,36,87,109,139,46,88,
-75,81,100,87,109,139,28,56,0,66,191,255,76,229,93,7,
-6,0,61,135,1,0,32,54,96,2,240,55,32,2,44,6,
-204,248,140,0,204,49,191,255,254,136,64,6,255,0,128,7,
-97,0,6,232,61,55,1,0,189,63,5,0,0,66,191,255,
-24,229,93,7,6,0,32,86,39,0,64,6,127,0,33,6,
-42,15,0,0,97,0,33,6,8,16,0,0,97,0,33,6,
-234,16,0,0,97,0,33,6,94,17,0,0,97,0,33,6,
-152,19,0,0,97,0,33,6,214,19,0,0,97,0,33,6,
-32,20,0,0,97,0,33,6,188,20,0,0,97,0,33,6,
-8,21,0,0,97,0,33,6,82,21,0,0,97,0,33,6,
-118,29,0,0,97,0,33,6,206,30,0,0,97,0,33,6,
-62,34,0,0,97,0,33,6,42,62,1,0,97,0,33,6,
-154,157,1,0,97,0,128,7,225,0,100,7,85,133,61,6,
-156,137,141,0,100,7,89,133,128,255,96,0,128,255,194,0,
-4,135,205,131,16,230,255,255,28,48,191,255,24,51,125,7,
-1,0,125,7,5,0,100,87,121,139,125,87,9,0,125,87,
-13,0,201,226,125,231,17,0,4,95,84,139,14,58,224,89,
-242,5,38,6,156,96,133,0,128,255,120,5,229,5,38,6,
-192,95,133,0,128,255,108,5,4,87,80,139,99,82,178,5,
-100,7,149,140,64,6,255,0,128,7,97,0,229,87,64,0,
-224,7,96,1,36,143,85,133,10,232,224,137,202,13,32,54,
-21,0,128,255,12,36,32,54,80,0,128,255,188,35,1,130,
-100,135,85,133,253,47,32,0,64,6,127,0,128,7,97,0,
-229,87,64,0,224,7,96,1,36,143,85,133,10,232,224,137,
-178,13,32,54,235,255,128,255,216,35,32,54,176,255,128,255,
-136,35,100,7,85,133,253,47,32,0,64,6,127,0,128,7,
-97,0,229,87,64,0,224,7,96,1,36,143,89,133,10,232,
-224,137,202,13,32,54,64,7,128,255,166,35,32,54,128,1,
-128,255,86,35,1,130,100,135,89,133,253,47,32,0,64,6,
-127,0,128,7,97,0,229,87,64,0,224,7,96,1,36,143,
-89,133,10,232,224,137,178,13,32,54,192,248,128,255,114,35,
-32,54,128,254,128,255,34,35,100,7,89,133,253,47,32,0,
-64,6,127,0,130,7,225,0,99,55,1,0,6,16,2,80,
-42,143,2,0,134,138,185,5,1,82,229,5,42,87,9,0,
-224,81,250,245,0,82,10,232,224,233,154,37,34,111,12,0,
-13,6,252,253,250,13,2,80,42,103,2,0,135,98,185,5,
+191,255,56,126,36,63,45,175,61,71,1,0,38,6,104,195,
+132,0,129,255,58,82,157,87,45,0,224,81,242,29,38,6,
+136,195,132,0,129,255,40,82,61,63,13,0,7,138,99,143,
+0,0,61,55,1,0,99,7,2,0,99,7,5,0,67,7,
+8,0,32,134,239,0,67,135,9,0,8,122,99,127,10,0,
+3,64,0,74,128,255,218,2,213,13,38,6,92,195,132,0,
+129,255,236,81,61,55,1,0,61,63,13,0,0,66,128,255,
+144,2,189,119,45,0,224,113,242,13,61,95,1,0,1,106,
+235,111,192,0,36,143,121,139,45,80,74,137,100,143,121,139,
+1,98,68,103,124,139,1,122,93,127,7,0,14,82,70,6,
+255,0,128,7,97,0,6,232,61,55,13,0,38,135,12,0,
+125,135,16,0,102,7,0,0,93,7,7,0,191,255,204,51,
+61,127,16,0,125,7,13,0,224,121,194,5,32,86,36,0,
+165,5,4,82,64,6,127,0,128,7,97,0,6,232,128,255,
+160,0,224,81,194,5,32,86,35,0,213,29,61,55,1,0,
+1,66,230,71,192,0,61,78,20,0,39,6,220,147,141,0,
+191,255,22,104,125,87,13,0,202,47,2,0,202,55,2,0,
+61,55,1,0,10,56,191,255,72,103,1,122,93,127,7,0,
+32,86,17,0,64,6,127,0,128,7,97,0,6,232,61,55,
+13,0,38,135,12,0,125,135,16,0,102,7,0,0,93,7,
+7,0,191,255,70,51,61,23,16,0,125,7,13,0,2,6,
+246,253,202,5,32,86,18,0,133,21,224,17,194,5,32,86,
+36,0,181,13,93,7,44,0,253,111,23,0,244,105,178,5,
+13,82,181,5,32,86,18,0,64,6,127,0,0,18,38,135,
+9,0,36,143,45,175,36,127,45,133,176,137,15,126,208,7,
+239,137,235,87,0,0,127,0,128,7,97,0,6,232,61,55,
+1,0,0,58,0,66,191,255,72,230,93,7,6,0,32,86,
+34,0,64,6,127,0,128,7,97,0,36,111,117,139,6,232,
+61,55,1,0,1,138,230,143,192,0,49,112,78,105,100,111,
+117,139,1,98,230,103,192,0,36,135,121,139,44,136,81,129,
+100,135,121,139,0,58,0,66,191,255,6,230,93,7,6,0,
+61,127,1,0,32,54,96,2,239,55,32,2,43,6,44,4,
+141,0,203,49,191,255,100,136,32,86,35,0,64,6,127,0,
+128,7,33,0,0,58,128,255,50,0,32,86,36,0,64,6,
+63,0,128,7,33,0,0,58,128,255,32,0,32,86,37,0,
+64,6,63,0,128,7,33,0,32,62,254,0,128,255,12,0,
+32,86,38,0,64,6,63,0,128,7,225,0,7,224,156,0,
+6,232,61,63,1,0,29,119,53,0,61,71,16,0,196,114,
+44,6,212,195,132,0,204,113,46,79,5,0,38,6,152,195,
+132,0,129,255,218,79,36,127,117,139,61,55,1,0,1,90,
+230,95,192,0,43,128,80,121,100,127,117,139,1,114,230,119,
+192,0,36,87,121,139,46,88,75,81,100,87,121,139,28,56,
+0,66,191,255,76,229,93,7,6,0,61,135,1,0,32,54,
+96,2,240,55,32,2,44,6,44,4,141,0,204,49,191,255,
+170,135,64,6,255,0,128,7,97,0,6,232,61,55,1,0,
+189,63,5,0,0,66,191,255,24,229,93,7,6,0,32,86,
+39,0,64,6,127,0,33,6,42,15,0,0,97,0,33,6,
+8,16,0,0,97,0,33,6,234,16,0,0,97,0,33,6,
+94,17,0,0,97,0,33,6,152,19,0,0,97,0,33,6,
+214,19,0,0,97,0,33,6,32,20,0,0,97,0,33,6,
+188,20,0,0,97,0,33,6,8,21,0,0,97,0,33,6,
+82,21,0,0,97,0,33,6,118,29,0,0,97,0,33,6,
+206,30,0,0,97,0,33,6,62,34,0,0,97,0,33,6,
+254,63,1,0,97,0,33,6,196,159,1,0,97,0,128,7,
+225,0,100,7,97,133,61,6,252,148,141,0,100,7,101,133,
+128,255,96,0,128,255,194,0,4,135,217,131,16,230,255,255,
+28,48,191,255,220,46,125,7,1,0,125,7,5,0,100,87,
+133,139,125,87,9,0,125,87,13,0,201,226,125,231,17,0,
+4,95,96,139,14,58,224,89,242,5,38,6,36,108,133,0,
+128,255,120,5,229,5,38,6,72,107,133,0,128,255,108,5,
+4,87,92,139,99,82,178,5,100,7,161,140,64,6,255,0,
+128,7,97,0,229,87,64,0,224,7,96,1,36,143,97,133,
+10,232,224,137,202,13,32,54,21,0,128,255,12,36,32,54,
+80,0,128,255,188,35,1,130,100,135,97,133,253,47,32,0,
+64,6,127,0,128,7,97,0,229,87,64,0,224,7,96,1,
+36,143,97,133,10,232,224,137,178,13,32,54,235,255,128,255,
+216,35,32,54,176,255,128,255,136,35,100,7,97,133,253,47,
+32,0,64,6,127,0,128,7,97,0,229,87,64,0,224,7,
+96,1,36,143,101,133,10,232,224,137,202,13,32,54,64,7,
+128,255,166,35,32,54,128,1,128,255,86,35,1,130,100,135,
+101,133,253,47,32,0,64,6,127,0,128,7,97,0,229,87,
+64,0,224,7,96,1,36,143,101,133,10,232,224,137,178,13,
+32,54,192,248,128,255,114,35,32,54,128,254,128,255,34,35,
+100,7,101,133,253,47,32,0,64,6,127,0,130,7,225,0,
+99,55,1,0,6,16,2,80,42,143,2,0,134,138,185,5,
 1,82,229,5,42,87,9,0,224,81,250,245,0,82,10,232,
-229,13,2,80,42,135,2,0,136,130,185,5,1,82,229,5,
-42,87,9,0,224,81,250,245,0,82,10,232,226,103,19,0,
-224,97,154,13,38,6,88,189,132,0,32,62,119,3,0,66,
-191,255,110,44,0,18,35,55,1,0,1,82,38,95,18,0,
-226,87,192,0,75,81,202,0,224,81,218,5,65,18,2,6,
-240,255,166,245,2,224,224,233,130,13,28,56,128,255,172,0,
-28,48,128,255,180,34,213,37,38,111,12,0,13,6,252,253,
-138,13,198,23,2,0,1,50,252,55,192,0,128,255,162,34,
-3,56,38,6,20,136,145,0,0,66,129,255,40,36,224,81,
-146,13,38,6,104,189,132,0,32,62,59,3,0,66,191,255,
-0,44,32,54,236,176,32,62,0,4,0,66,191,255,102,100,
-66,6,255,0,130,7,33,0,99,55,1,0,38,135,12,0,
-0,66,16,6,237,239,138,13,3,56,38,6,76,136,145,0,
-129,255,226,35,245,5,3,56,38,6,76,136,145,0,129,255,
-202,45,224,81,146,13,38,6,124,189,132,0,32,62,105,3,
-0,66,191,255,172,43,32,54,236,176,32,62,0,8,0,66,
-191,255,18,100,66,6,63,0,128,7,225,0,7,224,6,232,
-61,55,12,0,29,56,128,255,114,4,61,55,12,0,128,255,
-26,35,28,56,10,64,38,6,144,189,132,0,129,255,208,71,
-29,48,128,255,2,4,29,48,128,255,250,4,32,54,60,0,
-128,255,240,214,64,6,255,0,130,7,33,0,3,56,38,6,
-20,136,145,0,0,66,129,255,54,38,106,82,162,29,191,255,
-190,253,35,55,1,0,128,255,108,0,35,55,1,0,128,255,
-18,2,224,81,178,253,191,255,114,253,36,143,81,133,97,138,
-234,5,100,7,81,133,1,50,129,255,106,26,1,82,165,5,
-0,82,66,6,63,0,130,7,33,0,3,56,38,6,76,136,
-145,0,0,66,129,255,232,37,106,82,146,21,191,255,214,253,
-35,55,1,0,128,255,30,0,35,55,1,0,128,255,196,1,
-224,81,178,253,191,255,138,253,1,82,165,5,0,82,66,6,
-63,0,130,7,225,112,6,232,61,143,14,0,17,6,237,239,
-226,5,61,135,14,0,16,6,235,239,250,5,61,127,12,0,
-125,127,14,0,128,7,132,1,0,218,61,215,12,0,29,224,
-60,119,14,0,251,113,178,5,60,223,14,0,251,209,170,13,
-60,87,16,0,65,82,125,87,16,0,0,210,125,223,14,0,
-213,5,60,231,9,0,224,225,202,237,99,7,1,0,29,16,
-34,135,2,0,133,130,185,5,1,18,229,5,34,23,9,0,
-224,17,250,245,0,18,224,17,130,53,29,224,181,5,60,231,
-9,0,60,103,9,0,224,97,186,253,60,207,29,0,217,207,
-64,0,202,13,217,199,64,0,154,13,38,6,180,189,132,0,
-32,62,115,4,0,66,191,255,40,42,28,48,128,255,122,32,
-10,16,217,207,64,0,146,13,224,17,194,5,195,15,0,0,
-245,29,195,31,0,0,197,29,224,17,194,5,195,23,0,0,
-245,21,195,39,0,0,197,21,29,16,34,95,2,0,134,90,
-185,5,1,18,229,5,34,23,9,0,224,17,250,245,0,18,
-224,17,194,5,32,214,17,16,181,5,195,7,0,0,224,209,
-194,85,0,18,245,21,2,104,196,106,44,6,212,96,133,0,
-204,105,45,95,1,0,125,95,16,0,45,143,4,0,241,209,
-138,13,45,135,9,0,35,87,1,0,74,129,240,81,210,5,
-65,18,2,6,235,255,137,237,2,6,235,255,185,5,32,22,
-20,0,61,103,12,0,125,103,14,0,61,95,9,0,224,89,
-194,5,61,231,9,0,165,5,29,224,196,18,47,6,212,96,
-133,0,207,17,34,215,13,0,26,119,0,0,224,113,234,5,
-61,55,12,0,128,255,244,32,10,208,37,54,221,129,129,255,
-174,69,61,55,12,0,28,56,128,255,48,2,26,56,38,6,
-168,189,132,0,129,255,152,69,224,217,242,5,27,56,38,6,
-200,189,132,0,129,255,136,69,125,7,12,0,66,6,255,112,
-128,7,225,16,38,127,16,0,60,6,156,136,141,0,15,112,
-193,114,220,113,14,23,0,0,42,6,28,198,132,0,195,18,
-202,17,34,223,5,0,6,232,63,6,16,221,128,0,123,0,
-61,135,16,0,10,16,224,17,234,5,16,102,1,0,125,103,
-16,0,197,61,28,94,1,0,193,130,203,129,16,231,0,0,
-2,6,239,239,178,53,2,6,240,239,130,53,2,6,237,239,
-210,45,28,6,131,255,234,29,61,87,16,0,65,82,125,87,
-16,0,181,37,61,143,16,0,65,138,125,143,16,0,61,119,
-16,0,193,114,194,113,14,103,0,0,12,6,129,255,170,13,
-61,71,16,0,38,6,20,190,132,0,32,62,61,5,191,255,
-128,40,61,127,16,0,34,6,156,136,141,0,193,122,194,121,
-15,111,0,0,237,225,250,221,0,18,2,80,64,6,255,16,
-128,7,225,16,6,224,7,216,0,66,34,6,156,136,141,0,
-0,50,133,77,6,136,194,138,220,137,49,79,1,0,9,119,
-0,0,14,6,130,255,218,61,9,239,1,0,8,248,0,58,
-213,53,7,96,196,98,43,6,212,96,133,0,203,97,12,143,
-6,0,241,233,170,45,31,134,1,0,108,135,1,0,255,65,
-202,37,229,13,65,74,9,127,255,255,65,18,66,127,255,255,
-65,74,9,119,255,255,65,18,66,119,255,255,65,66,9,111,
-0,0,13,6,129,255,194,5,8,6,128,255,198,237,65,74,
-9,103,255,255,65,18,66,103,255,255,65,74,9,95,255,255,
-65,18,66,95,255,255,65,66,65,58,7,6,235,255,169,205,
-65,50,251,49,134,189,165,13,65,18,32,142,127,0,66,143,
-255,255,65,66,65,18,66,143,255,255,8,6,128,255,214,245,
-0,234,197,21,29,120,196,122,44,6,212,96,133,0,204,121,
-47,95,1,0,127,90,154,13,29,64,38,6,40,190,132,0,
-32,62,157,5,191,255,122,39,65,234,29,6,235,255,185,237,
-64,6,255,16,130,7,97,0,6,232,253,143,19,0,224,137,
-154,13,38,6,88,189,132,0,32,62,119,3,0,66,191,255,
-80,39,0,18,61,135,18,0,1,122,226,127,192,0,80,121,
-207,0,224,121,218,5,65,18,2,6,240,255,198,245,253,55,
-29,0,3,56,128,255,176,34,35,55,1,0,0,58,128,255,
-8,1,0,82,66,6,127,0,128,7,33,0,230,0,7,64,
-6,56,36,79,33,175,38,6,60,190,132,0,129,255,96,67,
-64,6,63,0,128,7,225,0,6,232,253,55,31,0,128,255,
-142,34,10,224,61,55,14,0,29,56,191,255,206,255,28,56,
-38,6,108,190,132,0,129,255,54,67,61,127,14,0,15,6,
-233,253,218,37,253,119,19,0,224,113,154,13,38,6,88,189,
-132,0,32,62,119,3,0,66,191,255,182,38,0,18,61,111,
-18,0,1,98,226,103,192,0,77,97,204,0,224,97,218,5,
-65,18,2,6,240,255,198,245,2,64,28,72,32,54,37,0,
-39,6,84,190,132,0,191,255,62,39,149,13,28,64,32,54,
-57,0,39,6,140,190,132,0,191,255,44,39,0,82,64,6,
-255,0,130,7,97,0,6,232,253,143,19,0,224,137,154,13,
-38,6,88,189,132,0,32,62,119,3,0,66,191,255,82,38,
-0,18,61,135,18,0,1,122,226,127,192,0,80,121,207,0,
-224,121,218,5,65,18,2,6,240,255,198,245,253,55,31,0,
-3,56,128,255,178,33,35,55,1,0,1,58,128,255,10,0,
-0,82,66,6,127,0,136,7,97,0,6,232,224,57,242,5,
-38,6,156,190,132,0,129,255,102,66,229,5,38,6,216,190,
-132,0,129,255,90,66,189,63,9,0,189,71,7,0,157,127,
-9,0,157,79,7,0,189,103,5,0,99,103,1,0,157,95,
-5,0,99,95,5,0,253,87,3,0,99,87,9,0,15,65,
-253,143,1,0,99,143,13,0,38,6,20,191,132,0,129,255,
-30,66,0,82,72,6,127,0,128,7,225,16,6,232,61,143,
-9,0,224,137,226,85,221,207,2,0,154,13,38,6,128,191,
-132,0,32,62,109,6,0,66,191,255,150,37,253,135,19,0,
-224,129,154,13,38,6,88,189,132,0,32,62,119,3,0,66,
-191,255,126,37,0,18,61,127,18,0,1,114,226,119,192,0,
-79,113,206,0,224,113,218,5,65,18,2,6,240,255,198,245,
-61,55,14,0,61,63,9,0,2,216,191,255,62,254,29,16,
-34,135,2,0,133,130,185,5,1,18,229,5,34,23,9,0,
-224,17,250,245,0,18,27,56,224,17,146,13,32,230,19,16,
-38,6,92,191,132,0,129,255,134,65,133,13,32,230,17,16,
-38,6,148,191,132,0,129,255,118,65,61,63,14,0,29,48,
-128,255,118,27,125,231,14,0,27,48,128,255,124,27,165,5,
-0,226,28,80,64,6,255,16,128,7,97,0,6,232,61,55,
-14,0,29,56,191,255,212,253,38,6,180,191,132,0,129,255,
-62,65,61,135,14,0,16,6,233,253,234,5,253,55,19,0,
-128,255,86,27,165,13,61,119,14,0,14,6,234,253,218,5,
-125,7,14,0,125,7,12,0,32,86,17,16,64,6,127,0,
-128,7,225,16,6,232,29,16,34,143,2,0,133,138,185,5,
+224,233,154,37,34,111,12,0,13,6,252,253,250,13,2,80,
+42,103,2,0,135,98,185,5,1,82,229,5,42,87,9,0,
+224,81,250,245,0,82,10,232,229,13,2,80,42,135,2,0,
+136,130,185,5,1,82,229,5,42,87,9,0,224,81,250,245,
+0,82,10,232,226,103,19,0,224,97,154,13,38,6,152,200,
+132,0,32,62,119,3,0,66,191,255,50,40,0,18,35,55,
+1,0,1,82,38,95,18,0,226,87,192,0,75,81,202,0,
+224,81,218,5,65,18,2,6,240,255,166,245,2,224,224,233,
+130,13,28,56,128,255,172,0,28,48,128,255,180,34,213,37,
+38,111,12,0,13,6,252,253,138,13,198,23,2,0,1,50,
+252,55,192,0,128,255,162,34,3,56,38,6,116,147,145,0,
+0,66,129,255,144,40,224,81,146,13,38,6,168,200,132,0,
+32,62,59,3,0,66,191,255,196,39,32,54,236,176,32,62,
+0,4,0,66,191,255,18,99,66,6,255,0,130,7,33,0,
+99,55,1,0,38,135,12,0,0,66,16,6,237,239,138,13,
+3,56,38,6,172,147,145,0,129,255,74,40,245,5,3,56,
+38,6,172,147,145,0,129,255,50,50,224,81,146,13,38,6,
+188,200,132,0,32,62,105,3,0,66,191,255,112,39,32,54,
+236,176,32,62,0,8,0,66,191,255,190,98,66,6,63,0,
+128,7,225,0,7,224,6,232,61,55,12,0,29,56,128,255,
+114,4,61,55,12,0,128,255,26,35,28,56,10,64,38,6,
+208,200,132,0,129,255,56,76,29,48,128,255,2,4,29,48,
+128,255,250,4,32,54,60,0,128,255,86,219,64,6,255,0,
+130,7,33,0,3,56,38,6,116,147,145,0,0,66,129,255,
+158,42,106,82,162,29,191,255,190,253,35,55,1,0,128,255,
+108,0,35,55,1,0,128,255,18,2,224,81,178,253,191,255,
+114,253,36,143,93,133,97,138,234,5,100,7,93,133,1,50,
+129,255,210,30,1,82,165,5,0,82,66,6,63,0,130,7,
+33,0,3,56,38,6,172,147,145,0,0,66,129,255,80,42,
+106,82,146,21,191,255,214,253,35,55,1,0,128,255,30,0,
+35,55,1,0,128,255,196,1,224,81,178,253,191,255,138,253,
+1,82,165,5,0,82,66,6,63,0,130,7,225,112,6,232,
+61,143,14,0,17,6,237,239,226,5,61,135,14,0,16,6,
+235,239,250,5,61,127,12,0,125,127,14,0,128,7,132,1,
+0,218,61,215,12,0,29,224,60,119,14,0,251,113,178,5,
+60,223,14,0,251,209,170,13,60,87,16,0,65,82,125,87,
+16,0,0,210,125,223,14,0,213,5,60,231,9,0,224,225,
+202,237,99,7,1,0,29,16,34,135,2,0,133,130,185,5,
 1,18,229,5,34,23,9,0,224,17,250,245,0,18,224,17,
-178,101,61,111,9,0,224,105,210,93,221,207,2,0,154,13,
-38,6,252,191,132,0,32,62,232,6,0,66,191,255,114,36,
-253,103,19,0,224,97,154,13,38,6,88,189,132,0,32,62,
-119,3,0,66,191,255,90,36,0,18,61,95,18,0,1,82,
-226,87,192,0,75,81,202,0,224,81,218,5,65,18,2,6,
-240,255,198,245,61,55,14,0,61,63,9,0,2,224,191,255,
-26,253,28,56,38,6,224,191,132,0,129,255,130,64,32,222,
-16,16,61,63,14,0,29,48,128,255,126,26,32,94,21,16,
-125,95,14,0,28,48,191,255,84,217,10,48,1,58,252,63,
-192,0,128,255,140,26,224,81,194,5,28,48,128,255,138,26,
-28,48,128,255,100,26,36,135,41,133,65,130,100,135,41,133,
-3,114,238,135,128,122,224,121,186,13,1,98,100,103,81,133,
-245,5,0,218,213,5,29,48,191,255,16,254,10,216,27,80,
-64,6,255,16,128,7,225,112,6,224,60,223,14,0,60,215,
-2,0,0,234,222,210,159,210,226,37,252,143,19,0,224,137,
-154,13,38,6,88,189,132,0,32,62,119,3,0,66,191,255,
-144,35,0,202,60,135,18,0,1,122,249,127,192,0,80,121,
-207,0,224,121,218,5,65,202,25,6,240,255,198,245,60,55,
-14,0,60,63,9,0,191,255,82,252,25,56,37,54,224,129,
-129,255,188,63,28,16,34,143,2,0,137,138,185,5,1,18,
-229,5,34,23,9,0,224,17,250,245,0,18,224,17,226,5,
-27,6,252,253,186,5,32,238,17,16,28,16,34,103,2,0,
-140,98,185,5,1,18,229,5,34,23,9,0,224,17,250,245,
-0,18,224,17,162,13,27,6,254,253,210,5,27,22,248,253,
-98,18,187,5,32,238,17,16,28,16,34,135,2,0,138,130,
-185,5,1,18,229,5,34,23,9,0,224,17,250,245,0,18,
-224,17,130,21,27,6,252,253,218,5,224,233,186,5,32,238,
-4,2,27,6,253,253,210,21,224,233,186,21,32,238,19,16,
-133,21,28,48,128,255,114,0,224,81,186,13,224,233,154,13,
-27,6,253,253,226,5,27,6,0,254,178,5,32,238,19,16,
-224,209,242,37,224,233,178,13,29,6,252,253,194,21,29,6,
-239,239,178,13,29,6,237,239,226,13,181,21,38,6,16,192,
-132,0,129,255,234,62,213,21,38,6,56,192,132,0,129,255,
-222,62,245,13,38,6,32,192,132,0,129,255,210,62,149,13,
-29,64,38,6,76,192,132,0,32,62,146,7,191,255,98,34,
-29,80,64,6,255,112,0,82,6,16,34,143,2,0,138,138,
-185,5,1,18,229,5,34,23,9,0,224,17,250,245,0,18,
-224,17,234,29,32,86,20,16,6,16,34,111,2,0,133,106,
+130,53,29,224,181,5,60,231,9,0,60,103,9,0,224,97,
+186,253,60,207,29,0,217,207,64,0,202,13,217,199,64,0,
+154,13,38,6,244,200,132,0,32,62,115,4,0,66,191,255,
+236,37,28,48,128,255,122,32,10,16,217,207,64,0,146,13,
+224,17,194,5,195,15,0,0,245,29,195,31,0,0,197,29,
+224,17,194,5,195,23,0,0,245,21,195,39,0,0,197,21,
+29,16,34,95,2,0,134,90,185,5,1,18,229,5,34,23,
+9,0,224,17,250,245,0,18,224,17,194,5,32,214,17,16,
+181,5,195,7,0,0,224,209,194,85,0,18,245,21,2,104,
+196,106,44,6,92,108,133,0,204,105,45,95,1,0,125,95,
+16,0,45,143,4,0,241,209,138,13,45,135,9,0,35,87,
+1,0,74,129,240,81,210,5,65,18,2,6,235,255,137,237,
+2,6,235,255,185,5,32,22,20,0,61,103,12,0,125,103,
+14,0,61,95,9,0,224,89,194,5,61,231,9,0,165,5,
+29,224,196,18,47,6,92,108,133,0,207,17,34,215,13,0,
+26,119,0,0,224,113,234,5,61,55,12,0,128,255,244,32,
+10,208,37,54,229,129,129,255,22,74,61,55,12,0,28,56,
+128,255,48,2,26,56,38,6,232,200,132,0,129,255,0,74,
+224,217,242,5,27,56,38,6,8,201,132,0,129,255,240,73,
+125,7,12,0,66,6,255,112,128,7,225,16,38,127,16,0,
+60,6,252,147,141,0,15,112,193,114,220,113,14,23,0,0,
+42,6,92,209,132,0,195,18,202,17,34,223,5,0,6,232,
+63,6,76,225,128,0,123,0,61,135,16,0,10,16,224,17,
+234,5,16,102,1,0,125,103,16,0,197,61,28,94,1,0,
+193,130,203,129,16,231,0,0,2,6,239,239,178,53,2,6,
+240,239,130,53,2,6,237,239,210,45,28,6,131,255,234,29,
+61,87,16,0,65,82,125,87,16,0,181,37,61,143,16,0,
+65,138,125,143,16,0,61,119,16,0,193,114,194,113,14,103,
+0,0,12,6,129,255,170,13,61,71,16,0,38,6,84,201,
+132,0,32,62,61,5,191,255,68,36,61,127,16,0,34,6,
+252,147,141,0,193,122,194,121,15,111,0,0,237,225,250,221,
+0,18,2,80,64,6,255,16,128,7,225,16,6,224,7,216,
+0,66,34,6,252,147,141,0,0,50,133,77,6,136,194,138,
+220,137,49,79,1,0,9,119,0,0,14,6,130,255,218,61,
+9,239,1,0,8,248,0,58,213,53,7,96,196,98,43,6,
+92,108,133,0,203,97,12,143,6,0,241,233,170,45,31,134,
+1,0,108,135,1,0,255,65,202,37,229,13,65,74,9,127,
+255,255,65,18,66,127,255,255,65,74,9,119,255,255,65,18,
+66,119,255,255,65,66,9,111,0,0,13,6,129,255,194,5,
+8,6,128,255,198,237,65,74,9,103,255,255,65,18,66,103,
+255,255,65,74,9,95,255,255,65,18,66,95,255,255,65,66,
+65,58,7,6,235,255,169,205,65,50,251,49,134,189,165,13,
+65,18,32,142,127,0,66,143,255,255,65,66,65,18,66,143,
+255,255,8,6,128,255,214,245,0,234,197,21,29,120,196,122,
+44,6,92,108,133,0,204,121,47,95,1,0,127,90,154,13,
+29,64,38,6,104,201,132,0,32,62,157,5,191,255,62,35,
+65,234,29,6,235,255,185,237,64,6,255,16,130,7,97,0,
+6,232,253,143,19,0,224,137,154,13,38,6,152,200,132,0,
+32,62,119,3,0,66,191,255,20,35,0,18,61,135,18,0,
+1,122,226,127,192,0,80,121,207,0,224,121,218,5,65,18,
+2,6,240,255,198,245,253,55,29,0,3,56,128,255,176,34,
+35,55,1,0,0,58,128,255,8,1,0,82,66,6,127,0,
+128,7,33,0,230,0,7,64,6,56,36,79,45,175,38,6,
+124,201,132,0,129,255,200,71,64,6,63,0,128,7,225,0,
+6,232,253,55,31,0,128,255,142,34,10,224,61,55,14,0,
+29,56,191,255,206,255,28,56,38,6,172,201,132,0,129,255,
+158,71,61,127,14,0,15,6,233,253,218,37,253,119,19,0,
+224,113,154,13,38,6,152,200,132,0,32,62,119,3,0,66,
+191,255,122,34,0,18,61,111,18,0,1,98,226,103,192,0,
+77,97,204,0,224,97,218,5,65,18,2,6,240,255,198,245,
+2,64,28,72,32,54,37,0,39,6,148,201,132,0,191,255,
+2,35,149,13,28,64,32,54,57,0,39,6,204,201,132,0,
+191,255,240,34,0,82,64,6,255,0,130,7,97,0,6,232,
+253,143,19,0,224,137,154,13,38,6,152,200,132,0,32,62,
+119,3,0,66,191,255,22,34,0,18,61,135,18,0,1,122,
+226,127,192,0,80,121,207,0,224,121,218,5,65,18,2,6,
+240,255,198,245,253,55,31,0,3,56,128,255,178,33,35,55,
+1,0,1,58,128,255,10,0,0,82,66,6,127,0,136,7,
+97,0,6,232,224,57,242,5,38,6,220,201,132,0,129,255,
+206,70,229,5,38,6,24,202,132,0,129,255,194,70,189,63,
+9,0,189,71,7,0,157,127,9,0,157,79,7,0,189,103,
+5,0,99,103,1,0,157,95,5,0,99,95,5,0,253,87,
+3,0,99,87,9,0,15,65,253,143,1,0,99,143,13,0,
+38,6,84,202,132,0,129,255,134,70,0,82,72,6,127,0,
+128,7,225,16,6,232,61,143,9,0,224,137,226,85,221,207,
+2,0,154,13,38,6,192,202,132,0,32,62,109,6,0,66,
+191,255,90,33,253,135,19,0,224,129,154,13,38,6,152,200,
+132,0,32,62,119,3,0,66,191,255,66,33,0,18,61,127,
+18,0,1,114,226,119,192,0,79,113,206,0,224,113,218,5,
+65,18,2,6,240,255,198,245,61,55,14,0,61,63,9,0,
+2,216,191,255,62,254,29,16,34,135,2,0,133,130,185,5,
+1,18,229,5,34,23,9,0,224,17,250,245,0,18,27,56,
+224,17,146,13,32,230,19,16,38,6,156,202,132,0,129,255,
+238,69,133,13,32,230,17,16,38,6,212,202,132,0,129,255,
+222,69,61,63,14,0,29,48,128,255,118,27,125,231,14,0,
+27,48,128,255,124,27,165,5,0,226,28,80,64,6,255,16,
+128,7,97,0,6,232,61,55,14,0,29,56,191,255,212,253,
+38,6,244,202,132,0,129,255,166,69,61,135,14,0,16,6,
+233,253,234,5,253,55,19,0,128,255,86,27,165,13,61,119,
+14,0,14,6,234,253,218,5,125,7,14,0,125,7,12,0,
+32,86,17,16,64,6,127,0,128,7,225,16,6,232,29,16,
+34,143,2,0,133,138,185,5,1,18,229,5,34,23,9,0,
+224,17,250,245,0,18,224,17,178,101,61,111,9,0,224,105,
+210,93,221,207,2,0,154,13,38,6,60,203,132,0,32,62,
+232,6,0,66,191,255,54,32,253,103,19,0,224,97,154,13,
+38,6,152,200,132,0,32,62,119,3,0,66,191,255,30,32,
+0,18,61,95,18,0,1,82,226,87,192,0,75,81,202,0,
+224,81,218,5,65,18,2,6,240,255,198,245,61,55,14,0,
+61,63,9,0,2,224,191,255,26,253,28,56,38,6,32,203,
+132,0,129,255,234,68,32,222,16,16,61,63,14,0,29,48,
+128,255,126,26,32,94,21,16,125,95,14,0,28,48,191,255,
+84,217,10,48,1,58,252,63,192,0,128,255,140,26,224,81,
+194,5,28,48,128,255,138,26,28,48,128,255,100,26,36,135,
+53,133,65,130,100,135,53,133,3,114,238,135,128,122,224,121,
+186,13,1,98,100,103,93,133,245,5,0,218,213,5,29,48,
+191,255,16,254,10,216,27,80,64,6,255,16,128,7,225,112,
+6,224,60,223,14,0,60,215,2,0,0,234,222,210,159,210,
+226,37,252,143,19,0,224,137,154,13,38,6,152,200,132,0,
+32,62,119,3,0,66,191,255,84,31,0,202,60,135,18,0,
+1,122,249,127,192,0,80,121,207,0,224,121,218,5,65,202,
+25,6,240,255,198,245,60,55,14,0,60,63,9,0,191,255,
+82,252,25,56,37,54,232,129,129,255,36,68,28,16,34,143,
+2,0,137,138,185,5,1,18,229,5,34,23,9,0,224,17,
+250,245,0,18,224,17,226,5,27,6,252,253,186,5,32,238,
+17,16,28,16,34,103,2,0,140,98,185,5,1,18,229,5,
+34,23,9,0,224,17,250,245,0,18,224,17,162,13,27,6,
+254,253,210,5,27,22,248,253,98,18,187,5,32,238,17,16,
+28,16,34,135,2,0,138,130,185,5,1,18,229,5,34,23,
+9,0,224,17,250,245,0,18,224,17,130,21,27,6,252,253,
+218,5,224,233,186,5,32,238,4,2,27,6,253,253,210,21,
+224,233,186,21,32,238,19,16,133,21,28,48,128,255,114,0,
+224,81,186,13,224,233,154,13,27,6,253,253,226,5,27,6,
+0,254,178,5,32,238,19,16,224,209,242,37,224,233,178,13,
+29,6,252,253,194,21,29,6,239,239,178,13,29,6,237,239,
+226,13,181,21,38,6,80,203,132,0,129,255,82,67,213,21,
+38,6,120,203,132,0,129,255,70,67,245,13,38,6,96,203,
+132,0,129,255,58,67,149,13,29,64,38,6,140,203,132,0,
+32,62,146,7,191,255,38,30,29,80,64,6,255,112,0,82,
+6,16,34,143,2,0,138,138,185,5,1,18,229,5,34,23,
+9,0,224,17,250,245,0,18,224,17,234,29,32,86,20,16,
+6,16,34,111,2,0,133,106,185,5,1,18,229,5,34,23,
+9,0,224,17,250,245,0,18,224,17,226,13,6,16,165,5,
+11,16,34,95,9,0,224,89,202,253,34,143,29,0,209,207,
+64,0,162,5,0,82,127,0,128,7,225,0,6,232,191,255,
+62,254,224,81,130,13,10,6,239,239,226,45,10,6,237,239,
+242,37,213,45,29,48,128,255,128,24,10,224,253,143,19,0,
+224,137,154,13,38,6,152,200,132,0,32,62,119,3,0,66,
+191,255,138,29,0,18,61,135,18,0,1,122,226,127,192,0,
+80,121,207,0,224,121,218,5,65,18,2,6,240,255,198,245,
+2,48,28,56,128,255,74,24,32,86,16,16,133,13,29,48,
+128,255,174,16,197,5,29,48,191,255,216,251,64,6,255,0,
+128,7,225,240,7,208,8,192,0,58,6,200,24,72,0,66,
+191,255,6,89,10,232,224,209,162,13,26,216,10,138,241,223,
+194,2,125,223,21,0,36,135,45,175,208,217,221,47,2,0,
+25,48,29,56,128,255,106,23,61,127,0,0,224,121,218,253,
+61,231,12,0,29,48,1,58,191,255,240,109,184,87,9,0,
+202,118,128,0,4,135,216,131,234,23,0,0,224,129,242,5,
+10,6,129,255,226,127,0,0,15,17,130,0,224,225,186,13,
+224,17,146,13,224,209,242,5,36,87,45,175,251,81,179,5,
+32,230,8,2,224,225,218,5,224,209,178,5,224,17,154,213,
+28,6,252,253,242,13,25,48,29,56,128,255,4,23,61,119,
+0,0,224,113,218,253,61,231,12,0,24,48,1,58,191,255,
+192,250,125,7,0,0,29,48,191,255,208,35,28,80,64,6,
+255,240,134,7,225,0,6,232,221,207,2,0,154,13,38,6,
+160,203,132,0,32,62,135,8,0,66,191,255,112,28,253,143,
+19,0,224,137,154,13,38,6,152,200,132,0,32,62,119,3,
+0,66,191,255,88,28,0,18,61,135,18,0,1,122,226,127,
+192,0,80,121,207,0,224,121,218,5,65,18,2,6,240,255,
+198,245,36,87,218,131,2,224,234,225,182,5,0,82,133,93,
+61,55,14,0,61,63,9,0,191,255,72,249,28,56,38,6,
+180,203,132,0,129,255,24,65,28,48,128,255,124,22,28,48,
+32,62,184,11,3,64,191,255,186,254,10,16,224,17,218,5,
+3,48,128,255,130,1,10,16,2,6,0,254,154,21,28,48,
+128,255,86,22,28,48,32,62,232,3,3,64,191,255,148,254,
+10,16,224,17,218,5,3,48,128,255,92,1,10,16,224,17,
+146,29,61,63,9,0,2,48,191,255,232,248,28,56,38,6,
+208,203,132,0,129,255,184,64,4,95,216,131,29,48,224,89,
+210,5,128,255,116,1,10,16,165,21,128,255,40,0,10,16,
+229,13,4,87,216,131,224,81,162,13,61,143,14,0,17,6,
+252,253,218,5,29,48,128,255,12,0,10,16,2,80,70,6,
+255,0,134,7,225,16,6,224,220,207,2,0,154,13,38,6,
+4,204,132,0,32,62,222,8,0,66,191,255,96,27,252,143,
+19,0,224,137,154,13,38,6,152,200,132,0,32,62,119,3,
+0,66,191,255,72,27,0,18,60,135,18,0,1,122,226,127,
+192,0,80,121,207,0,224,121,218,5,65,18,2,6,240,255,
+198,245,36,87,218,131,2,232,234,233,182,5,0,82,149,85,
+60,55,14,0,60,63,9,0,191,255,56,248,29,56,38,6,
+24,204,132,0,129,255,8,64,29,48,191,255,236,240,32,222,
+40,35,29,48,191,255,126,212,10,48,1,58,253,63,192,0,
+128,255,182,21,224,81,178,5,32,222,184,11,29,48,27,56,
+3,64,191,255,142,253,10,216,224,217,154,29,3,48,128,255,
+86,0,10,216,224,217,186,21,4,95,216,131,224,89,242,13,
+253,142,96,0,47,6,92,138,141,0,207,137,241,119,17,0,
+224,113,210,5,28,48,128,255,214,3,10,216,224,217,210,13,
+60,63,9,0,27,48,191,255,186,247,29,56,38,6,232,203,
+132,0,129,255,138,63,197,5,28,48,128,255,204,4,27,80,
+70,6,255,16,32,86,7,2,166,23,9,0,194,22,237,0,
+70,23,9,0,134,95,1,0,2,6,192,255,218,5,97,90,
+170,21,0,82,133,21,129,18,233,13,101,90,226,5,108,90,
+194,5,11,6,236,255,250,5,4,95,216,131,224,89,178,5,
+32,86,0,2,127,0,134,7,225,16,4,143,216,131,6,232,
+224,137,186,5,0,82,197,109,221,207,2,0,154,13,38,6,
+80,204,132,0,32,62,110,9,0,66,191,255,16,26,253,135,
+19,0,224,129,154,13,38,6,152,200,132,0,32,62,119,3,
+0,66,191,255,248,25,0,18,61,127,18,0,1,114,226,119,
+192,0,79,113,206,0,224,113,218,5,65,18,2,6,240,255,
+198,245,36,143,218,131,2,216,241,217,182,5,0,82,133,69,
+61,55,14,0,61,63,9,0,191,255,232,246,27,56,38,6,
+52,204,132,0,129,255,184,62,27,48,1,58,191,255,170,239,
+27,48,32,62,184,11,3,64,191,255,88,252,10,224,224,225,
+218,21,3,48,191,255,32,255,10,224,224,225,250,13,251,102,
+96,0,42,6,92,138,141,0,202,97,236,143,17,0,224,137,
+210,5,29,48,128,255,168,2,10,224,224,225,210,13,61,63,
+9,0,28,48,191,255,140,246,27,56,38,6,100,204,132,0,
+129,255,92,62,197,5,29,48,128,255,158,3,28,80,70,6,
+255,16,134,7,225,16,6,232,221,207,2,0,154,13,38,6,
+160,204,132,0,32,62,194,9,0,66,191,255,48,25,229,87,
+64,0,224,7,96,1,10,216,253,143,19,0,224,137,154,13,
+38,6,152,200,132,0,32,62,119,3,0,66,191,255,14,25,
+0,18,61,135,18,0,1,122,226,127,192,0,80,121,207,0,
+224,121,218,5,65,18,2,6,240,255,198,245,61,55,14,0,
+61,63,9,0,2,224,191,255,10,246,28,56,38,6,136,204,
+132,0,129,255,218,61,28,48,128,255,78,19,28,48,128,255,
+184,19,229,87,64,0,224,135,96,1,28,48,0,58,3,64,
+191,255,112,251,251,47,32,0,0,82,70,6,255,16,128,7,
+225,48,6,232,221,207,2,0,154,13,38,6,208,204,132,0,
+32,62,245,9,0,66,191,255,148,24,229,87,64,0,224,7,
+96,1,10,208,253,143,19,0,224,137,154,13,38,6,152,200,
+132,0,32,62,119,3,0,66,191,255,114,24,0,18,61,135,
+18,0,1,122,226,127,192,0,80,121,207,0,224,121,218,5,
+65,18,2,6,240,255,198,245,2,216,27,48,128,255,66,19,
+224,81,130,37,29,16,34,87,2,0,135,82,185,5,1,18,
+229,5,34,23,9,0,224,17,250,245,0,18,224,17,130,21,
+61,55,14,0,61,63,9,0,191,255,72,245,27,56,38,6,
+228,204,132,0,129,255,24,61,32,230,4,2,149,21,0,226,
+245,13,61,55,14,0,61,63,9,0,191,255,38,245,27,56,
+38,6,180,204,132,0,129,255,246,60,32,230,17,16,250,47,
+32,0,28,6,239,239,210,21,29,16,34,95,2,0,133,90,
 185,5,1,18,229,5,34,23,9,0,224,17,250,245,0,18,
-224,17,226,13,6,16,165,5,11,16,34,95,9,0,224,89,
-202,253,34,143,29,0,209,207,64,0,162,5,0,82,127,0,
-128,7,225,0,6,232,191,255,62,254,224,81,130,13,10,6,
-239,239,226,45,10,6,237,239,242,37,213,45,29,48,128,255,
-128,24,10,224,253,143,19,0,224,137,154,13,38,6,88,189,
-132,0,32,62,119,3,0,66,191,255,198,33,0,18,61,135,
+224,17,242,5,27,64,9,50,37,62,240,129,191,255,116,24,
+28,80,64,6,255,48,130,7,225,16,6,232,221,207,2,0,
+154,13,38,6,12,205,132,0,32,62,68,10,0,66,191,255,
+156,23,4,143,216,131,224,137,178,5,0,82,229,93,253,135,
+19,0,224,129,154,13,38,6,152,200,132,0,32,62,119,3,
+0,66,191,255,120,23,0,18,61,127,18,0,1,114,226,119,
+192,0,79,113,206,0,224,113,218,5,65,18,2,6,240,255,
+198,245,2,224,28,48,35,62,2,0,35,70,3,0,191,255,
+156,209,61,55,14,0,61,63,9,0,10,216,191,255,100,244,
+28,56,27,64,3,79,2,0,38,6,32,205,132,0,129,255,
+46,60,3,23,2,0,224,17,202,5,32,230,0,2,197,37,
+2,64,28,72,32,54,33,0,39,6,72,205,132,0,191,255,
+194,23,28,56,3,71,2,0,0,50,191,255,4,237,10,232,
+221,47,2,0,28,48,3,71,2,0,29,56,128,255,74,17,
+61,87,0,0,224,81,218,253,61,231,12,0,29,48,125,7,
+0,0,191,255,22,30,28,80,66,6,255,16,160,7,225,16,
+6,232,221,207,2,0,202,5,0,82,128,7,8,1,253,143,
+19,0,224,137,154,13,38,6,152,200,132,0,32,62,119,3,
+0,66,191,255,168,22,0,18,61,135,18,0,1,122,226,127,
+192,0,80,121,207,0,224,121,218,5,65,18,2,6,240,255,
+198,245,2,232,29,6,240,255,185,5,0,82,181,101,29,48,
+191,255,196,207,10,224,224,225,186,5,0,82,181,93,99,7,
+17,0,99,7,25,0,99,7,41,0,34,6,226,22,0,0,
+99,23,33,0,49,6,50,0,129,0,99,143,45,0,35,134,
+32,0,48,119,1,0,35,126,48,0,111,119,1,0,48,111,
+5,0,111,111,5,0,48,103,9,0,111,103,9,0,48,95,
+13,0,111,95,13,0,35,86,48,0,42,135,1,0,35,142,
+16,0,113,135,1,0,42,127,5,0,113,127,5,0,42,119,
+9,0,113,119,9,0,42,111,13,0,35,102,24,0,113,111,
+13,0,35,22,16,0,34,71,1,0,34,79,5,0,44,87,
+1,0,99,87,1,0,29,48,44,143,5,0,32,62,232,3,
+99,7,13,0,99,143,5,0,99,231,9,0,128,255,36,13,
+10,216,224,217,234,5,29,48,28,56,199,0,128,255,66,16,
+27,80,96,6,255,16,160,7,225,16,6,232,0,218,221,207,
+2,0,154,13,38,6,92,205,132,0,32,62,196,10,0,66,
+191,255,154,21,253,143,19,0,224,137,154,13,38,6,152,200,
+132,0,32,62,119,3,0,66,191,255,130,21,0,18,61,135,
 18,0,1,122,226,127,192,0,80,121,207,0,224,121,218,5,
-65,18,2,6,240,255,198,245,2,48,28,56,128,255,74,24,
-32,86,16,16,133,13,29,48,128,255,174,16,197,5,29,48,
-191,255,216,251,64,6,255,0,128,7,225,240,7,208,8,192,
-0,58,6,200,24,72,0,66,191,255,90,90,10,232,224,209,
-162,13,26,216,10,138,241,223,194,2,125,223,21,0,36,135,
-33,175,208,217,221,47,2,0,25,48,29,56,128,255,106,23,
-61,127,0,0,224,121,218,253,61,231,12,0,29,48,1,58,
-191,255,68,111,184,87,9,0,202,118,128,0,4,135,204,131,
-234,23,0,0,224,129,242,5,10,6,129,255,226,127,0,0,
-15,17,130,0,224,225,186,13,224,17,146,13,224,209,242,5,
-36,87,33,175,251,81,179,5,32,230,8,2,224,225,218,5,
-224,209,178,5,224,17,154,213,28,6,252,253,242,13,25,48,
-29,56,128,255,4,23,61,119,0,0,224,113,218,253,61,231,
-12,0,24,48,1,58,191,255,192,250,125,7,0,0,29,48,
-191,255,12,40,28,80,64,6,255,240,134,7,225,0,6,232,
-221,207,2,0,154,13,38,6,96,192,132,0,32,62,135,8,
-0,66,191,255,172,32,253,143,19,0,224,137,154,13,38,6,
-88,189,132,0,32,62,119,3,0,66,191,255,148,32,0,18,
+65,18,2,6,240,255,198,245,61,55,14,0,61,63,9,0,
+2,224,191,255,126,242,28,48,191,255,176,212,28,56,224,81,
+210,93,38,6,112,205,132,0,129,255,68,58,99,7,17,0,
+99,7,25,0,99,7,41,0,34,6,110,20,0,0,99,23,
+33,0,49,6,228,255,128,0,99,143,45,0,35,134,32,0,
+48,119,1,0,35,126,48,0,111,119,1,0,48,111,5,0,
+111,111,5,0,48,103,9,0,111,103,9,0,48,95,13,0,
+111,95,13,0,35,86,48,0,42,135,1,0,35,142,16,0,
+113,135,1,0,42,127,5,0,113,127,5,0,42,119,9,0,
+113,119,9,0,42,111,13,0,35,22,16,0,113,111,13,0,
+35,102,24,0,34,71,1,0,34,79,5,0,44,87,1,0,
+99,87,1,0,44,143,5,0,99,143,5,0,28,48,36,135,
+133,139,32,126,242,0,99,135,9,0,99,127,13,0,32,62,
+136,19,128,255,238,11,10,216,229,5,38,6,136,205,132,0,
+129,255,140,57,27,80,96,6,255,16,176,7,225,16,6,232,
+221,207,2,0,154,13,38,6,196,205,132,0,32,62,247,10,
+0,66,191,255,104,20,253,143,19,0,224,137,154,13,38,6,
+152,200,132,0,32,62,119,3,0,66,191,255,80,20,0,18,
 61,135,18,0,1,122,226,127,192,0,80,121,207,0,224,121,
-218,5,65,18,2,6,240,255,198,245,36,87,206,131,2,224,
-234,225,182,5,0,82,133,93,61,55,14,0,61,63,9,0,
-191,255,72,249,28,56,38,6,116,192,132,0,129,255,176,60,
-28,48,128,255,124,22,28,48,32,62,184,11,3,64,191,255,
-186,254,10,16,224,17,218,5,3,48,128,255,130,1,10,16,
-2,6,0,254,154,21,28,48,128,255,86,22,28,48,32,62,
-232,3,3,64,191,255,148,254,10,16,224,17,218,5,3,48,
-128,255,92,1,10,16,224,17,146,29,61,63,9,0,2,48,
-191,255,232,248,28,56,38,6,144,192,132,0,129,255,80,60,
-4,95,204,131,29,48,224,89,210,5,128,255,116,1,10,16,
-165,21,128,255,40,0,10,16,229,13,4,87,204,131,224,81,
-162,13,61,143,14,0,17,6,252,253,218,5,29,48,128,255,
-12,0,10,16,2,80,70,6,255,0,134,7,225,16,6,224,
-220,207,2,0,154,13,38,6,196,192,132,0,32,62,222,8,
-0,66,191,255,156,31,252,143,19,0,224,137,154,13,38,6,
-88,189,132,0,32,62,119,3,0,66,191,255,132,31,0,18,
-60,135,18,0,1,122,226,127,192,0,80,121,207,0,224,121,
-218,5,65,18,2,6,240,255,198,245,36,87,206,131,2,232,
-234,233,182,5,0,82,149,85,60,55,14,0,60,63,9,0,
-191,255,56,248,29,56,38,6,216,192,132,0,129,255,160,59,
-29,48,191,255,236,240,32,222,40,35,29,48,191,255,126,212,
-10,48,1,58,253,63,192,0,128,255,182,21,224,81,178,5,
-32,222,184,11,29,48,27,56,3,64,191,255,142,253,10,216,
-224,217,154,29,3,48,128,255,86,0,10,216,224,217,186,21,
-4,95,204,131,224,89,242,13,253,142,96,0,47,6,252,126,
-141,0,207,137,241,119,17,0,224,113,210,5,28,48,128,255,
-214,3,10,216,224,217,210,13,60,63,9,0,27,48,191,255,
-186,247,29,56,38,6,168,192,132,0,129,255,34,59,197,5,
-28,48,128,255,204,4,27,80,70,6,255,16,32,86,7,2,
-166,23,9,0,194,22,237,0,70,23,9,0,134,95,1,0,
-2,6,192,255,218,5,97,90,170,21,0,82,133,21,129,18,
-233,13,101,90,226,5,108,90,194,5,11,6,236,255,250,5,
-4,95,204,131,224,89,178,5,32,86,0,2,127,0,134,7,
-225,16,4,143,204,131,6,232,224,137,186,5,0,82,197,109,
-221,207,2,0,154,13,38,6,16,193,132,0,32,62,110,9,
-0,66,191,255,76,30,253,135,19,0,224,129,154,13,38,6,
-88,189,132,0,32,62,119,3,0,66,191,255,52,30,0,18,
-61,127,18,0,1,114,226,119,192,0,79,113,206,0,224,113,
-218,5,65,18,2,6,240,255,198,245,36,143,206,131,2,216,
-241,217,182,5,0,82,133,69,61,55,14,0,61,63,9,0,
-191,255,232,246,27,56,38,6,244,192,132,0,129,255,80,58,
-27,48,1,58,191,255,170,239,27,48,32,62,184,11,3,64,
-191,255,88,252,10,224,224,225,218,21,3,48,191,255,32,255,
-10,224,224,225,250,13,251,102,96,0,42,6,252,126,141,0,
-202,97,236,143,17,0,224,137,210,5,29,48,128,255,168,2,
-10,224,224,225,210,13,61,63,9,0,28,48,191,255,140,246,
-27,56,38,6,36,193,132,0,129,255,244,57,197,5,29,48,
-128,255,158,3,28,80,70,6,255,16,134,7,225,16,6,232,
-221,207,2,0,154,13,38,6,96,193,132,0,32,62,194,9,
-0,66,191,255,108,29,229,87,64,0,224,7,96,1,10,216,
-253,143,19,0,224,137,154,13,38,6,88,189,132,0,32,62,
-119,3,0,66,191,255,74,29,0,18,61,135,18,0,1,122,
+218,5,65,18,2,6,240,255,198,245,2,224,28,6,240,255,
+201,5,0,82,128,7,214,1,61,55,14,0,61,63,9,0,
+191,255,64,241,28,56,38,6,168,205,132,0,129,255,16,57,
+32,54,4,2,129,255,72,51,10,16,224,17,226,5,47,6,
+16,140,133,0,98,127,1,0,2,232,224,233,154,13,38,6,
+196,205,132,0,32,62,9,11,0,66,191,255,224,19,99,7,
+49,0,99,7,57,0,99,7,73,0,34,6,116,15,0,0,
+99,23,65,0,46,6,50,0,129,0,99,119,77,0,35,110,
+64,0,45,95,1,0,35,102,80,0,108,95,1,0,45,87,
+5,0,108,87,5,0,45,143,9,0,108,143,9,0,45,135,
+13,0,108,135,13,0,35,126,80,0,47,111,1,0,35,118,
+48,0,110,111,1,0,47,103,5,0,110,103,5,0,47,95,
+9,0,110,95,9,0,47,87,13,0,35,142,56,0,110,87,
+13,0,35,22,48,0,34,71,1,0,34,79,5,0,49,127,
+1,0,99,127,1,0,49,119,5,0,99,119,5,0,99,239,
+9,0,36,111,133,139,28,48,99,111,13,0,32,62,232,3,
+128,255,172,9,10,216,224,217,138,101,29,48,128,255,222,193,
+224,81,226,85,38,6,216,205,132,0,129,255,34,56,99,7,
+25,0,34,6,22,23,0,0,99,23,17,0,43,6,8,0,
+129,0,99,95,29,0,35,86,16,0,42,135,1,0,35,142,
+32,0,113,135,1,0,42,127,5,0,113,127,5,0,42,119,
+9,0,113,119,9,0,42,111,13,0,113,111,13,0,35,102,
+32,0,44,87,1,0,35,94,48,0,107,87,1,0,44,143,
+5,0,107,143,5,0,44,135,9,0,107,135,9,0,44,127,
+13,0,35,22,48,0,107,127,13,0,35,118,56,0,34,79,
+5,0,34,71,1,0,46,103,1,0,28,48,99,103,1,0,
+7,82,46,95,5,0,32,62,16,39,99,95,5,0,99,87,
+9,0,99,7,13,0,128,255,218,9,10,216,197,13,37,54,
+248,129,129,255,122,55,245,5,27,56,38,6,232,205,132,0,
+129,255,108,55,224,233,146,13,47,6,76,106,133,0,125,127,
+1,0,29,48,129,255,120,49,27,80,112,6,255,16,182,7,
+225,243,6,216,61,6,100,106,133,0,219,207,2,0,154,13,
+38,6,72,206,132,0,32,62,84,11,0,66,191,255,46,18,
+251,143,19,0,224,137,154,13,38,6,152,200,132,0,32,62,
+119,3,0,66,191,255,22,18,0,18,59,135,18,0,1,122,
 226,127,192,0,80,121,207,0,224,121,218,5,65,18,2,6,
-240,255,198,245,61,55,14,0,61,63,9,0,2,224,191,255,
-10,246,28,56,38,6,72,193,132,0,129,255,114,57,28,48,
-128,255,78,19,28,48,128,255,184,19,229,87,64,0,224,135,
-96,1,28,48,0,58,3,64,191,255,112,251,251,47,32,0,
-0,82,70,6,255,16,128,7,225,48,6,232,221,207,2,0,
-154,13,38,6,144,193,132,0,32,62,245,9,0,66,191,255,
-208,28,229,87,64,0,224,7,96,1,10,208,253,143,19,0,
-224,137,154,13,38,6,88,189,132,0,32,62,119,3,0,66,
-191,255,174,28,0,18,61,135,18,0,1,122,226,127,192,0,
-80,121,207,0,224,121,218,5,65,18,2,6,240,255,198,245,
-2,216,27,48,128,255,66,19,224,81,130,37,29,16,34,87,
-2,0,135,82,185,5,1,18,229,5,34,23,9,0,224,17,
-250,245,0,18,224,17,130,21,61,55,14,0,61,63,9,0,
-191,255,72,245,27,56,38,6,164,193,132,0,129,255,176,56,
-32,230,4,2,149,21,0,226,245,13,61,55,14,0,61,63,
-9,0,191,255,38,245,27,56,38,6,116,193,132,0,129,255,
-142,56,32,230,17,16,250,47,32,0,28,6,239,239,210,21,
-29,16,34,95,2,0,133,90,185,5,1,18,229,5,34,23,
-9,0,224,17,250,245,0,18,224,17,242,5,27,64,9,50,
-37,62,232,129,191,255,176,28,28,80,64,6,255,48,130,7,
-225,16,6,232,221,207,2,0,154,13,38,6,204,193,132,0,
-32,62,68,10,0,66,191,255,216,27,4,143,204,131,224,137,
-178,5,0,82,229,93,253,135,19,0,224,129,154,13,38,6,
-88,189,132,0,32,62,119,3,0,66,191,255,180,27,0,18,
-61,127,18,0,1,114,226,119,192,0,79,113,206,0,224,113,
-218,5,65,18,2,6,240,255,198,245,2,224,28,48,35,62,
-2,0,35,70,3,0,191,255,156,209,61,55,14,0,61,63,
-9,0,10,216,191,255,100,244,28,56,27,64,3,79,2,0,
-38,6,224,193,132,0,129,255,198,55,3,23,2,0,224,17,
-202,5,32,230,0,2,197,37,2,64,28,72,32,54,33,0,
-39,6,8,194,132,0,191,255,254,27,28,56,3,71,2,0,
-0,50,191,255,4,237,10,232,221,47,2,0,28,48,3,71,
-2,0,29,56,128,255,74,17,61,87,0,0,224,81,218,253,
-61,231,12,0,29,48,125,7,0,0,191,255,82,34,28,80,
-66,6,255,16,160,7,225,16,6,232,221,207,2,0,202,5,
-0,82,128,7,8,1,253,143,19,0,224,137,154,13,38,6,
-88,189,132,0,32,62,119,3,0,66,191,255,228,26,0,18,
+240,255,198,245,2,224,28,6,240,255,201,5,0,82,128,7,
+184,2,4,143,216,131,0,18,224,137,194,13,252,126,96,0,
+45,6,92,138,141,0,205,121,239,103,17,0,224,97,162,5,
+1,18,224,17,226,199,0,0,28,48,191,255,10,203,59,55,
+14,0,59,63,9,0,10,184,191,255,216,238,27,16,34,87,
+2,0,133,82,185,5,1,18,229,5,34,23,9,0,224,17,
+250,245,0,18,99,23,17,0,28,56,224,193,242,5,38,6,
+92,206,132,0,129,255,136,54,229,5,38,6,24,206,132,0,
+129,255,124,54,224,185,170,13,38,6,52,206,132,0,129,255,
+110,54,59,87,14,0,128,7,48,2,99,7,93,0,99,7,
+101,0,224,193,178,69,99,7,69,0,34,6,116,15,0,0,
+99,23,61,0,46,6,50,0,129,0,99,119,73,0,35,110,
+60,0,45,95,1,0,35,102,76,0,108,95,1,0,45,87,
+5,0,108,87,5,0,45,143,9,0,108,143,9,0,45,135,
+13,0,108,135,13,0,35,126,76,0,47,111,1,0,35,118,
+92,0,110,111,1,0,47,103,5,0,110,103,5,0,47,95,
+9,0,110,95,9,0,47,87,13,0,110,87,13,0,32,54,
+4,2,129,255,42,48,10,16,224,17,226,5,49,6,16,140,
+133,0,98,143,1,0,2,208,165,69,99,7,37,0,34,6,
+190,15,0,0,99,23,29,0,48,6,50,0,129,0,99,135,
+41,0,35,126,28,0,47,111,1,0,35,118,44,0,110,111,
+1,0,47,103,5,0,110,103,5,0,47,95,9,0,110,95,
+9,0,47,87,13,0,110,87,13,0,35,142,44,0,49,127,
+1,0,35,134,92,0,112,127,1,0,49,119,5,0,112,119,
+5,0,49,111,9,0,112,111,9,0,49,103,13,0,112,103,
+13,0,32,54,4,2,129,255,166,47,10,16,224,17,226,5,
+43,6,40,140,133,0,98,95,1,0,2,208,224,209,154,13,
+38,6,72,206,132,0,32,62,155,11,0,66,191,255,62,16,
+35,22,92,0,35,86,100,0,42,135,1,0,34,79,5,0,
+34,71,1,0,99,135,1,0,42,127,5,0,99,127,5,0,
+99,215,9,0,36,119,133,139,28,48,99,119,13,0,32,62,
+232,3,128,255,122,6,10,200,224,201,202,93,0,178,26,48,
+224,193,242,13,128,255,96,190,10,192,23,56,24,64,38,6,
+0,206,132,0,129,255,232,52,248,185,146,37,1,178,245,29,
+128,255,50,191,10,184,23,64,252,198,96,0,42,6,92,138,
+141,0,202,193,248,63,17,0,99,63,25,0,38,6,0,206,
+132,0,129,255,186,52,35,151,25,0,242,185,130,13,35,159,
+17,0,1,178,224,153,178,5,120,191,16,0,224,177,162,45,
+28,64,32,54,58,0,37,62,0,130,191,255,70,16,35,159,
+17,0,32,206,5,2,224,153,146,29,28,48,191,255,6,201,
+10,224,28,48,128,255,114,10,224,81,130,13,28,64,32,54,
+37,0,37,62,8,130,191,255,26,16,27,48,191,255,144,248,
+10,16,224,17,242,5,2,200,213,5,128,54,255,255,128,255,
+80,10,224,209,130,13,61,158,232,255,122,159,1,0,26,48,
+129,255,92,46,25,80,118,6,255,243,144,7,225,243,6,224,
+220,207,2,0,154,13,38,6,0,207,132,0,32,62,21,12,
+0,66,191,255,24,15,32,238,2,2,220,215,3,0,178,5,
+128,7,174,1,252,135,19,0,224,129,154,13,38,6,152,200,
+132,0,32,62,119,3,0,66,191,255,242,14,0,18,60,127,
+18,0,1,114,226,119,192,0,79,113,206,0,224,113,218,5,
+65,18,2,6,240,255,198,245,2,216,27,48,0,58,35,70,
+20,0,191,255,126,241,10,232,224,233,186,5,35,215,25,0,
+27,48,191,255,88,206,224,81,146,21,27,48,128,255,34,9,
+27,48,0,58,35,70,8,0,191,255,88,241,10,232,224,233,
+218,5,35,23,13,0,216,18,2,209,224,233,178,5,128,7,
+48,1,28,16,34,103,2,0,133,98,185,5,1,18,229,5,
+34,23,9,0,224,17,250,245,0,18,2,176,224,177,242,13,
+28,16,181,5,34,23,9,0,34,127,9,0,224,121,186,253,
+34,119,29,0,206,199,64,0,162,5,0,178,26,198,255,255,
+0,202,0,186,3,146,99,151,1,0,99,7,5,0,181,93,
+60,55,14,0,60,63,9,0,191,255,88,235,27,56,24,64,
+25,72,38,6,164,206,132,0,129,255,36,51,27,48,24,56,
+22,72,40,6,252,148,141,0,128,255,30,9,10,232,10,6,
+234,239,138,13,38,6,20,207,132,0,129,255,2,51,0,234,
+133,69,224,233,242,21,29,6,247,254,162,29,29,6,222,254,
+178,13,29,6,217,254,138,37,38,6,192,206,132,0,129,255,
+222,50,0,234,245,29,38,6,72,207,132,0,129,255,208,50,
+149,29,37,54,16,130,129,255,198,50,65,186,181,21,35,151,
+1,0,95,146,99,151,1,0,38,6,120,206,132,0,129,255,
+174,50,0,234,245,5,29,56,38,6,220,206,132,0,129,255,
+158,50,65,194,225,95,0,0,35,151,5,0,203,201,65,146,
+99,151,5,0,35,151,5,0,99,146,190,5,224,233,146,165,
+224,185,226,13,35,143,1,0,241,185,170,13,27,64,26,72,
+32,54,35,0,39,6,236,206,132,0,191,255,22,14,29,80,
+80,6,255,243,128,7,225,240,6,232,191,255,222,236,10,200,
+224,201,186,77,253,231,19,0,61,55,14,0,29,56,191,255,
+98,234,28,56,38,6,92,207,132,0,129,255,50,50,0,194,
+0,234,1,218,253,223,192,0,27,112,92,113,130,37,29,48,
+191,255,162,198,10,208,26,48,28,56,128,255,220,7,224,81,
+162,29,59,104,77,225,26,48,29,56,128,255,20,8,224,81,
+186,13,29,48,128,255,18,8,29,48,1,58,128,255,18,8,
+224,81,170,5,1,194,29,48,128,255,14,8,65,234,29,6,
+240,255,134,221,224,193,146,21,26,48,31,58,191,255,226,117,
+10,6,246,254,170,13,38,6,124,207,132,0,32,62,27,13,
+0,66,191,255,184,12,224,81,25,80,64,6,255,240,128,7,
+225,0,6,232,191,255,44,235,10,16,224,17,138,37,61,231,
+29,0,29,56,60,231,61,0,61,55,14,0,156,231,35,0,
+191,255,176,233,28,56,38,6,144,207,132,0,129,255,128,49,
+61,231,29,0,29,48,128,255,168,7,28,48,10,56,128,255,
+248,6,10,16,224,17,186,5,32,22,16,16,2,80,64,6,
+255,0,128,7,225,48,6,224,191,255,216,234,10,232,224,233,
+178,5,128,7,40,1,60,223,29,0,28,56,59,215,61,0,
+60,55,14,0,154,215,35,0,191,255,88,233,26,56,38,6,
+172,207,132,0,129,255,40,49,219,207,64,0,130,37,252,127,
+19,0,224,121,154,13,38,6,152,200,132,0,32,62,119,3,
+0,66,191,255,8,12,0,18,60,119,18,0,1,106,226,111,
+192,0,78,105,205,0,224,105,218,5,65,18,2,6,240,255,
+198,245,2,48,128,255,34,7,10,232,229,5,26,48,1,58,
+128,255,30,7,10,232,29,6,246,254,154,13,38,6,200,207,
+132,0,32,62,139,13,0,66,191,255,194,11,224,233,218,61,
+219,207,64,0,242,5,38,6,220,207,132,0,129,255,176,48,
+229,5,38,6,244,207,132,0,129,255,164,48,28,48,128,255,
+208,6,27,48,10,56,128,255,32,6,10,232,219,207,64,0,
+242,29,252,119,19,0,224,113,154,13,38,6,152,200,132,0,
+32,62,119,3,0,66,191,255,116,11,0,18,60,111,18,0,
+1,98,226,103,192,0,77,97,204,0,224,97,218,5,65,18,
+2,6,240,255,198,245,2,48,128,255,158,6,181,21,26,48,
+0,58,128,255,140,6,229,13,38,6,16,208,132,0,129,255,
+62,48,28,48,128,255,106,6,27,48,10,56,128,255,186,5,
+10,232,224,233,186,5,32,238,16,16,29,80,64,6,255,48,
+128,7,97,0,6,232,253,143,19,0,224,137,154,13,38,6,
+152,200,132,0,32,62,119,3,0,66,191,255,0,11,0,18,
+61,135,18,0,1,122,226,127,192,0,80,121,207,0,224,121,
+218,5,65,18,2,6,240,255,198,245,0,234,2,6,240,255,
+193,5,2,48,128,255,170,5,29,80,64,6,127,0,128,7,
+225,0,6,232,0,226,253,143,19,0,224,137,154,13,38,6,
+152,200,132,0,32,62,119,3,0,66,191,255,176,10,0,18,
 61,135,18,0,1,122,226,127,192,0,80,121,207,0,224,121,
 218,5,65,18,2,6,240,255,198,245,2,232,29,6,240,255,
-185,5,0,82,181,101,29,48,191,255,196,207,10,224,224,225,
-186,5,0,82,181,93,99,7,17,0,99,7,25,0,99,7,
-41,0,34,6,226,22,0,0,99,23,33,0,49,6,246,251,
-128,0,99,143,45,0,35,134,32,0,48,119,1,0,35,126,
-48,0,111,119,1,0,48,111,5,0,111,111,5,0,48,103,
-9,0,111,103,9,0,48,95,13,0,111,95,13,0,35,86,
-48,0,42,135,1,0,35,142,16,0,113,135,1,0,42,127,
-5,0,113,127,5,0,42,119,9,0,113,119,9,0,42,111,
-13,0,35,102,24,0,113,111,13,0,35,22,16,0,34,71,
-1,0,34,79,5,0,44,87,1,0,99,87,1,0,29,48,
-44,143,5,0,32,62,232,3,99,7,13,0,99,143,5,0,
-99,231,9,0,128,255,36,13,10,216,224,217,234,5,29,48,
-28,56,199,0,128,255,66,16,27,80,96,6,255,16,160,7,
-225,16,6,232,0,218,221,207,2,0,154,13,38,6,28,194,
-132,0,32,62,196,10,0,66,191,255,214,25,253,143,19,0,
-224,137,154,13,38,6,88,189,132,0,32,62,119,3,0,66,
-191,255,190,25,0,18,61,135,18,0,1,122,226,127,192,0,
-80,121,207,0,224,121,218,5,65,18,2,6,240,255,198,245,
-61,55,14,0,61,63,9,0,2,224,191,255,126,242,28,48,
-191,255,176,212,28,56,224,81,210,93,38,6,48,194,132,0,
-129,255,220,53,99,7,17,0,99,7,25,0,99,7,41,0,
-34,6,110,20,0,0,99,23,33,0,49,6,168,251,128,0,
-99,143,45,0,35,134,32,0,48,119,1,0,35,126,48,0,
-111,119,1,0,48,111,5,0,111,111,5,0,48,103,9,0,
-111,103,9,0,48,95,13,0,111,95,13,0,35,86,48,0,
-42,135,1,0,35,142,16,0,113,135,1,0,42,127,5,0,
-113,127,5,0,42,119,9,0,113,119,9,0,42,111,13,0,
-35,22,16,0,113,111,13,0,35,102,24,0,34,71,1,0,
-34,79,5,0,44,87,1,0,99,87,1,0,44,143,5,0,
-99,143,5,0,28,48,36,135,121,139,32,126,242,0,99,135,
-9,0,99,127,13,0,32,62,136,19,128,255,238,11,10,216,
-229,5,38,6,72,194,132,0,129,255,36,53,27,80,96,6,
-255,16,176,7,225,16,6,232,221,207,2,0,154,13,38,6,
-132,194,132,0,32,62,247,10,0,66,191,255,164,24,253,143,
-19,0,224,137,154,13,38,6,88,189,132,0,32,62,119,3,
-0,66,191,255,140,24,0,18,61,135,18,0,1,122,226,127,
-192,0,80,121,207,0,224,121,218,5,65,18,2,6,240,255,
-198,245,2,224,28,6,240,255,201,5,0,82,128,7,214,1,
-61,55,14,0,61,63,9,0,191,255,64,241,28,56,38,6,
-104,194,132,0,129,255,168,52,32,54,4,2,129,255,224,46,
-10,16,224,17,226,5,47,6,176,128,133,0,98,127,1,0,
-2,232,224,233,154,13,38,6,132,194,132,0,32,62,9,11,
-0,66,191,255,28,24,99,7,49,0,99,7,57,0,99,7,
-73,0,34,6,116,15,0,0,99,23,65,0,46,6,246,251,
-128,0,99,119,77,0,35,110,64,0,45,95,1,0,35,102,
-80,0,108,95,1,0,45,87,5,0,108,87,5,0,45,143,
-9,0,108,143,9,0,45,135,13,0,108,135,13,0,35,126,
-80,0,47,111,1,0,35,118,48,0,110,111,1,0,47,103,
-5,0,110,103,5,0,47,95,9,0,110,95,9,0,47,87,
-13,0,35,142,56,0,110,87,13,0,35,22,48,0,34,71,
-1,0,34,79,5,0,49,127,1,0,99,127,1,0,49,119,
-5,0,99,119,5,0,99,239,9,0,36,111,121,139,28,48,
-99,111,13,0,32,62,232,3,128,255,172,9,10,216,224,217,
-138,101,29,48,128,255,120,189,224,81,226,85,38,6,152,194,
-132,0,129,255,186,51,99,7,25,0,34,6,22,23,0,0,
-99,23,17,0,43,6,204,251,128,0,99,95,29,0,35,86,
-16,0,42,135,1,0,35,142,32,0,113,135,1,0,42,127,
-5,0,113,127,5,0,42,119,9,0,113,119,9,0,42,111,
-13,0,113,111,13,0,35,102,32,0,44,87,1,0,35,94,
-48,0,107,87,1,0,44,143,5,0,107,143,5,0,44,135,
-9,0,107,135,9,0,44,127,13,0,35,22,48,0,107,127,
-13,0,35,118,56,0,34,79,5,0,34,71,1,0,46,103,
-1,0,28,48,99,103,1,0,7,82,46,95,5,0,32,62,
-16,39,99,95,5,0,99,87,9,0,99,7,13,0,128,255,
-218,9,10,216,197,13,37,54,240,129,129,255,18,51,245,5,
-27,56,38,6,168,194,132,0,129,255,4,51,224,233,146,13,
-47,6,196,94,133,0,125,127,1,0,29,48,129,255,16,45,
-27,80,112,6,255,16,182,7,225,243,6,216,61,6,220,94,
-133,0,219,207,2,0,154,13,38,6,8,195,132,0,32,62,
-84,11,0,66,191,255,106,22,251,143,19,0,224,137,154,13,
-38,6,88,189,132,0,32,62,119,3,0,66,191,255,82,22,
-0,18,59,135,18,0,1,122,226,127,192,0,80,121,207,0,
-224,121,218,5,65,18,2,6,240,255,198,245,2,224,28,6,
-240,255,201,5,0,82,128,7,184,2,4,143,204,131,0,18,
-224,137,194,13,252,126,96,0,45,6,252,126,141,0,205,121,
-239,103,17,0,224,97,162,5,1,18,224,17,226,199,0,0,
-28,48,191,255,10,203,59,55,14,0,59,63,9,0,10,184,
-191,255,216,238,27,16,34,87,2,0,133,82,185,5,1,18,
-229,5,34,23,9,0,224,17,250,245,0,18,99,23,17,0,
-28,56,224,193,242,5,38,6,28,195,132,0,129,255,32,50,
-229,5,38,6,216,194,132,0,129,255,20,50,224,185,170,13,
-38,6,244,194,132,0,129,255,6,50,59,87,14,0,128,7,
-48,2,99,7,93,0,99,7,101,0,224,193,178,69,99,7,
-69,0,34,6,116,15,0,0,99,23,61,0,46,6,246,251,
-128,0,99,119,73,0,35,110,60,0,45,95,1,0,35,102,
-76,0,108,95,1,0,45,87,5,0,108,87,5,0,45,143,
-9,0,108,143,9,0,45,135,13,0,108,135,13,0,35,126,
-76,0,47,111,1,0,35,118,92,0,110,111,1,0,47,103,
-5,0,110,103,5,0,47,95,9,0,110,95,9,0,47,87,
-13,0,110,87,13,0,32,54,4,2,129,255,194,43,10,16,
-224,17,226,5,49,6,176,128,133,0,98,143,1,0,2,208,
-165,69,99,7,37,0,34,6,190,15,0,0,99,23,29,0,
-48,6,246,251,128,0,99,135,41,0,35,126,28,0,47,111,
-1,0,35,118,44,0,110,111,1,0,47,103,5,0,110,103,
-5,0,47,95,9,0,110,95,9,0,47,87,13,0,110,87,
-13,0,35,142,44,0,49,127,1,0,35,134,92,0,112,127,
-1,0,49,119,5,0,112,119,5,0,49,111,9,0,112,111,
-9,0,49,103,13,0,112,103,13,0,32,54,4,2,129,255,
-62,43,10,16,224,17,226,5,43,6,200,128,133,0,98,95,
-1,0,2,208,224,209,154,13,38,6,8,195,132,0,32,62,
-155,11,0,66,191,255,122,20,35,22,92,0,35,86,100,0,
-42,135,1,0,34,79,5,0,34,71,1,0,99,135,1,0,
-42,127,5,0,99,127,5,0,99,215,9,0,36,119,121,139,
-28,48,99,119,13,0,32,62,232,3,128,255,122,6,10,200,
-224,201,202,93,0,178,26,48,224,193,242,13,128,255,250,185,
-10,192,23,56,24,64,38,6,192,194,132,0,129,255,128,48,
-248,185,146,37,1,178,245,29,128,255,204,186,10,184,23,64,
-252,198,96,0,42,6,252,126,141,0,202,193,248,63,17,0,
-99,63,25,0,38,6,192,194,132,0,129,255,82,48,35,151,
-25,0,242,185,130,13,35,159,17,0,1,178,224,153,178,5,
-120,191,16,0,224,177,162,45,28,64,32,54,58,0,37,62,
-248,129,191,255,130,20,35,159,17,0,32,206,5,2,224,153,
-146,29,28,48,191,255,6,201,10,224,28,48,128,255,114,10,
-224,81,130,13,28,64,32,54,37,0,37,62,0,130,191,255,
-86,20,27,48,191,255,144,248,10,16,224,17,242,5,2,200,
-213,5,128,54,255,255,128,255,80,10,224,209,130,13,61,158,
-232,255,122,159,1,0,26,48,129,255,244,41,25,80,118,6,
-255,243,144,7,225,243,6,224,220,207,2,0,154,13,38,6,
-192,195,132,0,32,62,21,12,0,66,191,255,84,19,32,238,
-2,2,220,215,3,0,178,5,128,7,174,1,252,135,19,0,
-224,129,154,13,38,6,88,189,132,0,32,62,119,3,0,66,
-191,255,46,19,0,18,60,127,18,0,1,114,226,119,192,0,
-79,113,206,0,224,113,218,5,65,18,2,6,240,255,198,245,
-2,216,27,48,0,58,35,70,20,0,191,255,126,241,10,232,
-224,233,186,5,35,215,25,0,27,48,191,255,88,206,224,81,
-146,21,27,48,128,255,34,9,27,48,0,58,35,70,8,0,
-191,255,88,241,10,232,224,233,218,5,35,23,13,0,216,18,
-2,209,224,233,178,5,128,7,48,1,28,16,34,103,2,0,
-133,98,185,5,1,18,229,5,34,23,9,0,224,17,250,245,
-0,18,2,176,224,177,242,13,28,16,181,5,34,23,9,0,
-34,127,9,0,224,121,186,253,34,119,29,0,206,199,64,0,
-162,5,0,178,26,198,255,255,0,202,0,186,3,146,99,151,
-1,0,99,7,5,0,181,93,60,55,14,0,60,63,9,0,
-191,255,88,235,27,56,24,64,25,72,38,6,100,195,132,0,
-129,255,188,46,27,48,24,56,22,72,40,6,156,137,141,0,
-128,255,30,9,10,232,10,6,234,239,138,13,38,6,212,195,
-132,0,129,255,154,46,0,234,133,69,224,233,242,21,29,6,
-247,254,162,29,29,6,222,254,178,13,29,6,217,254,138,37,
-38,6,128,195,132,0,129,255,118,46,0,234,245,29,38,6,
-8,196,132,0,129,255,104,46,149,29,37,54,8,130,129,255,
-94,46,65,186,181,21,35,151,1,0,95,146,99,151,1,0,
-38,6,56,195,132,0,129,255,70,46,0,234,245,5,29,56,
-38,6,156,195,132,0,129,255,54,46,65,194,225,95,0,0,
-35,151,5,0,203,201,65,146,99,151,5,0,35,151,5,0,
-99,146,190,5,224,233,146,165,224,185,226,13,35,143,1,0,
-241,185,170,13,27,64,26,72,32,54,35,0,39,6,172,195,
-132,0,191,255,82,18,29,80,80,6,255,243,128,7,225,240,
-6,232,191,255,222,236,10,200,224,201,186,77,253,231,19,0,
-61,55,14,0,29,56,191,255,98,234,28,56,38,6,28,196,
-132,0,129,255,202,45,0,194,0,234,1,218,253,223,192,0,
-27,112,92,113,130,37,29,48,191,255,162,198,10,208,26,48,
-28,56,128,255,220,7,224,81,162,29,59,104,77,225,26,48,
-29,56,128,255,20,8,224,81,186,13,29,48,128,255,18,8,
-29,48,1,58,128,255,18,8,224,81,170,5,1,194,29,48,
-128,255,14,8,65,234,29,6,240,255,134,221,224,193,146,21,
-26,48,31,58,191,255,54,119,10,6,246,254,170,13,38,6,
-60,196,132,0,32,62,27,13,0,66,191,255,244,16,224,81,
-25,80,64,6,255,240,128,7,225,0,6,232,191,255,44,235,
-10,16,224,17,138,37,61,231,29,0,29,56,60,231,61,0,
-61,55,14,0,156,231,35,0,191,255,176,233,28,56,38,6,
-80,196,132,0,129,255,24,45,61,231,29,0,29,48,128,255,
-168,7,28,48,10,56,128,255,248,6,10,16,224,17,186,5,
-32,22,16,16,2,80,64,6,255,0,128,7,225,48,6,224,
-191,255,216,234,10,232,224,233,178,5,128,7,40,1,60,223,
-29,0,28,56,59,215,61,0,60,55,14,0,154,215,35,0,
-191,255,88,233,26,56,38,6,108,196,132,0,129,255,192,44,
-219,207,64,0,130,37,252,127,19,0,224,121,154,13,38,6,
-88,189,132,0,32,62,119,3,0,66,191,255,68,16,0,18,
-60,119,18,0,1,106,226,111,192,0,78,105,205,0,224,105,
-218,5,65,18,2,6,240,255,198,245,2,48,128,255,34,7,
-10,232,229,5,26,48,1,58,128,255,30,7,10,232,29,6,
-246,254,154,13,38,6,136,196,132,0,32,62,139,13,0,66,
-191,255,254,15,224,233,218,61,219,207,64,0,242,5,38,6,
-156,196,132,0,129,255,72,44,229,5,38,6,180,196,132,0,
-129,255,60,44,28,48,128,255,208,6,27,48,10,56,128,255,
-32,6,10,232,219,207,64,0,242,29,252,119,19,0,224,113,
-154,13,38,6,88,189,132,0,32,62,119,3,0,66,191,255,
-176,15,0,18,60,111,18,0,1,98,226,103,192,0,77,97,
-204,0,224,97,218,5,65,18,2,6,240,255,198,245,2,48,
-128,255,158,6,181,21,26,48,0,58,128,255,140,6,229,13,
-38,6,208,196,132,0,129,255,214,43,28,48,128,255,106,6,
-27,48,10,56,128,255,186,5,10,232,224,233,186,5,32,238,
-16,16,29,80,64,6,255,48,128,7,97,0,6,232,253,143,
-19,0,224,137,154,13,38,6,88,189,132,0,32,62,119,3,
-0,66,191,255,60,15,0,18,61,135,18,0,1,122,226,127,
-192,0,80,121,207,0,224,121,218,5,65,18,2,6,240,255,
-198,245,0,234,2,6,240,255,193,5,2,48,128,255,170,5,
-29,80,64,6,127,0,128,7,225,0,6,232,0,226,253,143,
-19,0,224,137,154,13,38,6,88,189,132,0,32,62,119,3,
-0,66,191,255,236,14,0,18,61,135,18,0,1,122,226,127,
-192,0,80,121,207,0,224,121,218,5,65,18,2,6,240,255,
-198,245,2,232,29,6,240,255,185,5,0,82,197,37,29,48,
-191,255,10,196,10,48,1,58,253,63,192,0,128,255,66,5,
-224,81,186,5,0,82,245,21,36,63,253,139,36,111,249,139,
-29,48,205,57,10,90,235,63,194,2,128,255,172,5,224,81,
-159,13,32,230,4,2,29,56,38,6,228,196,132,0,129,255,
-222,42,28,80,64,6,255,0,128,7,225,0,6,232,191,255,
-186,232,10,16,224,17,202,77,61,63,14,0,29,48,128,255,
-200,4,29,48,128,255,178,4,224,81,162,29,61,231,29,0,
-29,56,60,231,61,0,61,55,14,0,156,231,35,0,191,255,
-42,231,28,56,38,6,0,197,132,0,129,255,146,42,61,55,
-29,0,61,63,14,0,128,255,136,4,125,7,12,0,29,48,
-128,255,62,5,224,81,178,29,61,231,29,0,29,56,60,231,
-61,0,61,55,14,0,156,231,35,0,191,255,238,230,28,56,
-38,6,36,197,132,0,129,255,86,42,28,64,32,54,37,0,
-37,62,12,130,191,255,160,14,125,7,12,0,29,48,61,87,
-5,0,63,6,42,248,128,0,106,0,32,22,17,16,2,80,
-64,6,255,0,3,30,200,255,99,79,53,0,99,71,49,0,
-99,255,37,0,99,215,29,0,99,207,33,0,6,208,99,239,
-17,0,7,200,99,223,25,0,35,239,65,0,35,223,69,0,
-99,231,21,0,32,22,7,16,0,226,165,69,35,22,48,0,
-35,142,56,0,49,127,1,0,34,79,5,0,34,71,1,0,
-99,127,1,0,26,48,49,119,5,0,25,56,99,223,9,0,
-99,119,5,0,99,7,13,0,128,255,128,0,10,16,224,17,
-234,21,61,23,1,0,63,6,190,248,128,0,2,22,16,0,
-34,87,0,0,34,95,5,0,221,81,10,48,107,0,27,48,
-10,56,32,70,0,2,191,255,122,132,10,16,224,17,250,13,
-61,23,1,0,63,6,234,248,128,0,72,18,34,87,0,0,
-34,143,5,0,221,81,10,48,113,0,10,16,65,226,99,226,
-206,5,2,6,249,239,178,189,35,207,33,0,35,255,37,0,
-35,239,17,0,35,231,21,0,35,223,25,0,35,215,29,0,
-2,80,3,30,56,0,127,0,3,30,200,255,99,79,53,0,
-99,71,49,0,99,255,37,0,99,199,25,0,99,231,9,0,
-6,192,7,224,99,191,29,0,99,183,33,0,35,191,65,0,
-99,207,21,0,99,223,13,0,99,215,17,0,99,239,5,0,
-35,183,69,0,36,207,33,175,0,210,191,255,202,19,106,7,
-9,0,49,6,36,64,1,0,106,143,5,0,28,128,106,7,
-29,0,10,122,106,7,33,0,239,135,194,2,106,135,21,0,
-10,232,29,48,1,58,191,255,126,90,35,54,48,0,24,56,
-29,64,23,72,221,47,2,0,99,183,1,0,35,119,61,0,
-63,6,168,249,128,0,110,0,61,111,0,0,224,105,218,253,
-61,223,12,0,29,48,125,7,0,0,191,255,130,19,27,6,
-0,254,242,5,27,6,253,253,194,5,27,6,248,253,250,13,
-36,103,33,175,185,97,234,103,64,2,172,225,224,225,207,5,
-32,222,4,2,197,5,65,210,99,210,134,189,27,80,35,183,
-33,0,35,191,29,0,35,199,25,0,35,207,21,0,35,215,
-17,0,35,223,13,0,35,231,9,0,35,239,5,0,35,255,
-37,0,3,30,56,0,127,0,128,7,97,0,229,87,64,0,
-224,7,96,1,10,232,36,87,149,140,202,54,128,127,202,22,
-127,0,224,17,186,5,224,49,210,29,224,17,226,13,224,49,
-194,13,196,199,44,133,178,5,0,18,165,5,0,50,36,135,
-45,133,65,130,100,135,45,133,224,17,226,5,1,122,96,127,
-169,179,100,23,1,140,224,49,178,5,128,255,188,2,253,47,
-32,0,64,6,127,0,128,7,225,0,6,224,0,234,224,225,
-242,37,0,18,149,21,129,255,134,65,10,136,191,138,209,142,
-31,0,10,112,209,113,32,110,224,255,77,113,174,81,1,18,
-234,23,192,0,92,17,224,17,242,237,0,90,245,13,11,80,
-234,86,12,0,48,6,204,198,132,0,208,81,42,127,1,0,
-66,121,178,5,10,232,197,5,65,90,111,90,145,245,29,80,
-64,6,255,0,130,7,225,0,6,232,7,224,97,234,131,61,
-60,55,5,0,37,62,24,130,129,255,174,70,224,81,170,29,
-99,234,242,5,38,6,116,197,132,0,129,255,98,39,165,85,
-60,55,9,0,0,58,32,70,16,0,129,255,64,65,10,224,
-28,56,38,6,148,197,132,0,129,255,68,39,100,231,149,140,
-245,21,60,55,5,0,37,62,20,130,129,255,108,70,224,81,
-154,13,38,6,192,197,132,0,129,255,36,39,100,7,149,140,
-245,5,38,6,72,197,132,0,129,255,20,39,181,45,97,234,
-234,5,38,6,220,197,132,0,129,255,4,39,0,234,133,37,
-253,22,12,0,47,6,204,198,132,0,207,17,36,119,149,140,
-34,63,1,0,71,113,210,5,40,6,92,197,132,0,197,5,
-40,6,104,197,132,0,34,95,9,0,34,79,4,0,99,95,
-1,0,38,6,248,197,132,0,129,255,196,38,65,234,111,234,
-129,229,66,6,255,0,199,0,128,7,33,0,6,120,7,48,
-8,56,9,128,35,87,5,0,16,64,10,72,47,127,1,0,
-63,6,200,251,128,0,111,0,64,6,63,0,128,7,33,0,
-6,96,7,48,8,56,9,120,143,0,35,87,5,0,15,64,
-10,104,141,0,13,72,44,103,1,0,63,6,242,251,128,0,
-108,0,64,6,63,0,128,7,33,0,6,120,7,48,8,56,
-9,128,16,64,47,127,1,0,63,6,16,252,128,0,111,0,
-64,6,63,0,32,86,33,6,86,16,0,0,97,0,33,6,
-226,22,0,0,97,0,33,6,240,26,0,0,97,0,33,6,
-190,29,0,0,97,0,33,6,98,30,0,0,97,0,33,6,
-130,30,0,0,97,0,33,6,118,32,0,0,97,0,33,6,
-42,80,0,0,97,0,33,6,42,60,1,0,97,0,33,6,
-158,53,1,0,97,0,33,6,18,63,1,0,97,0,33,6,
-158,55,1,0,97,0,33,6,94,101,1,0,97,0,33,6,
-116,96,1,0,97,0,33,6,38,97,1,0,97,0,33,6,
-218,137,1,0,97,0,33,6,50,100,1,0,97,0,33,6,
-174,64,1,0,97,0,33,6,128,103,1,0,97,0,33,6,
-176,77,1,0,97,0,33,6,248,94,1,0,97,0,33,6,
-164,138,1,0,97,0,33,6,198,148,1,0,97,0,33,6,
-194,177,1,0,97,0,33,6,52,138,1,0,97,0,33,6,
-158,99,1,0,97,0,33,6,212,143,1,0,97,0,33,6,
-92,95,1,0,97,0,33,6,102,64,1,0,97,0,33,6,
-252,144,1,0,97,0,33,6,224,145,1,0,97,0,33,6,
-110,145,1,0,97,0,33,6,94,56,1,0,97,0,33,6,
-106,60,1,0,97,0,33,6,194,71,1,0,97,0,136,7,
-97,0,230,0,61,6,36,98,133,0,0,18,165,37,61,71,
-0,0,232,49,202,29,61,63,9,0,29,79,2,0,189,127,
-3,0,99,127,1,0,157,119,5,0,99,119,5,0,29,111,
-5,0,99,111,9,0,29,103,6,0,99,103,13,0,38,6,
-112,224,132,0,129,255,232,36,29,80,213,13,76,234,65,18,
-2,6,36,255,217,221,6,56,38,6,76,224,132,0,129,255,
-206,36,0,82,72,6,127,0,230,0,42,6,188,224,132,0,
-34,6,36,98,133,0,2,94,80,10,34,135,0,0,240,49,
-202,5,34,87,9,0,197,5,76,18,235,17,241,245,127,0,
-128,7,97,0,8,232,29,136,194,138,64,118,142,0,206,137,
-49,71,177,137,231,0,128,255,32,0,29,96,194,98,64,142,
-142,0,209,97,44,135,177,137,224,129,194,5,29,48,128,255,
-2,2,64,6,127,0,128,7,225,112,8,224,9,200,6,232,
-7,208,250,0,26,48,191,255,40,255,10,216,125,215,22,0,
-29,48,0,58,32,70,18,0,191,255,206,3,224,217,194,29,
-29,127,25,0,24,146,27,111,6,0,187,135,5,0,93,111,
-0,0,82,121,27,103,2,0,208,118,7,0,93,103,2,0,
-14,121,187,95,3,0,93,95,12,0,93,127,25,0,155,87,
-5,0,93,87,13,0,61,54,26,0,0,58,32,70,98,0,
-191,255,134,3,0,18,224,225,194,13,28,16,2,143,0,0,
-65,18,224,137,202,253,2,134,255,255,188,129,16,22,1,0,
-2,6,158,255,214,5,92,7,97,0,32,22,98,0,2,222,
-26,0,249,217,167,5,25,216,61,54,26,0,28,56,2,64,
-191,255,232,1,224,225,202,5,60,6,212,224,132,0,28,56,
-37,54,32,130,129,255,168,35,27,110,248,255,93,111,7,0,
-64,6,255,112,3,30,204,255,99,79,49,0,99,255,33,0,
-99,207,25,0,99,215,21,0,99,223,17,0,99,231,13,0,
-99,239,9,0,99,199,29,0,6,248,7,192,99,71,45,0,
-229,87,64,0,224,7,96,1,10,200,35,142,44,0,99,143,
-1,0,35,134,36,0,208,126,7,0,64,110,142,0,31,216,
-194,218,27,208,205,209,58,239,177,137,99,127,5,0,58,214,
-176,137,0,226,224,233,194,13,29,16,2,103,0,0,65,18,
-224,97,202,253,2,230,255,255,189,225,220,233,133,21,32,54,
-98,0,129,255,30,29,10,232,122,239,1,0,224,233,242,5,
-29,48,0,58,32,70,98,0,191,255,142,2,224,233,226,53,
-28,6,158,255,190,53,32,54,196,0,129,255,246,28,10,208,
-224,209,194,45,26,48,35,79,5,0,35,71,1,0,24,56,
-129,255,234,45,32,86,98,0,188,81,226,21,29,16,26,88,
-11,135,0,0,66,135,0,0,65,90,65,18,224,129,186,5,
-95,18,181,5,95,82,218,245,224,81,226,5,66,7,0,0,
-65,18,95,82,202,253,64,110,142,0,205,217,59,239,177,137,
-26,48,93,7,97,0,129,255,126,28,249,47,32,0,35,199,
-29,0,35,207,25,0,35,215,21,0,35,223,17,0,35,231,
-13,0,35,239,9,0,35,255,33,0,3,30,52,0,127,0,
-128,7,97,0,6,232,194,234,64,126,142,0,207,233,61,55,
-177,137,129,255,66,28,125,7,177,137,64,6,127,0,132,7,
-225,243,6,216,7,200,185,0,8,208,250,0,128,255,152,1,
-36,199,33,175,10,224,124,199,5,0,92,207,8,0,92,223,
-9,0,27,48,128,255,184,1,10,232,36,191,125,139,124,239,
-1,0,23,176,25,6,191,255,202,77,34,6,0,0,32,0,
-226,135,5,0,124,135,12,0,0,82,226,127,1,0,124,127,
-14,0,26,6,233,253,202,13,226,111,85,0,226,127,87,0,
-208,122,13,121,1,82,32,214,22,2,0,234,229,13,26,6,
-234,253,170,13,226,135,81,0,226,127,83,0,208,122,16,121,
-1,82,0,234,165,5,31,122,124,127,25,0,224,81,146,37,
-224,233,250,29,61,6,160,152,141,0,61,95,12,0,224,89,
-250,21,61,87,14,0,224,81,186,21,125,7,9,0,125,7,
-12,0,125,7,14,0,125,7,16,0,125,7,2,0,27,6,
-240,255,125,7,18,0,214,5,221,63,19,0,165,5,0,234,
-25,6,190,255,202,53,32,134,67,0,92,135,8,0,27,48,
-3,56,128,255,242,0,227,23,5,0,124,23,24,0,27,48,
-227,23,7,0,124,23,26,0,60,70,12,0,1,58,128,255,
-206,0,128,255,162,0,32,126,68,0,10,224,92,127,8,0,
-124,199,5,0,92,223,9,0,227,23,1,0,124,23,24,0,
-124,239,1,0,227,23,3,0,124,23,26,0,36,183,125,139,
-27,48,60,70,12,0,0,58,128,255,148,0,124,215,10,0,
-224,233,226,21,29,48,26,56,191,255,14,251,224,217,198,13,
-27,6,240,255,158,13,1,106,251,111,192,0,253,95,19,0,
-13,89,125,95,18,0,125,191,28,0,125,183,30,0,29,80,
-68,6,255,243,230,134,28,0,47,6,176,141,141,0,207,129,
-48,118,12,0,103,119,1,0,0,82,127,0,230,134,28,0,
-47,6,176,141,141,0,207,129,48,87,25,0,32,118,224,255,
-78,81,127,0,36,143,125,139,65,138,100,143,125,139,17,6,
-156,255,186,5,100,7,125,139,36,135,124,139,240,86,28,0,
-46,6,176,141,141,0,206,81,127,0,127,0,33,6,208,31,
-0,0,97,0,33,6,150,32,0,0,97,0,33,6,30,104,
-1,0,97,0,38,23,1,0,2,80,127,0,38,23,5,0,
-2,80,127,0,38,23,13,0,2,80,127,0,34,6,0,192,
-23,0,2,80,127,0,128,7,225,16,6,232,0,226,229,87,
-64,0,224,7,96,1,10,216,61,143,21,0,128,134,170,170,
-113,135,0,0,61,127,25,0,32,118,85,85,111,119,0,0,
-61,111,21,0,128,102,144,144,109,103,0,0,32,54,32,78,
-128,255,238,188,61,95,1,0,235,87,1,0,10,136,208,138,
-61,135,29,0,240,127,1,0,15,224,17,225,61,119,21,0,
-128,110,170,170,110,111,0,0,61,103,25,0,32,94,85,85,
-108,95,0,0,61,87,21,0,128,142,240,240,106,143,0,0,
-32,54,32,78,128,255,170,188,251,47,32,0,48,6,186,186,
-31,31,240,225,186,5,0,18,181,5,32,22,192,1,2,80,
-64,6,255,16,190,7,225,241,3,30,124,254,6,232,7,208,
-8,192,9,200,35,142,0,0,64,134,0,64,17,216,16,217,
-61,127,1,0,239,209,161,13,25,112,218,113,61,111,5,0,
-61,103,1,0,204,105,237,113,195,5,32,22,193,1,149,85,
-26,88,61,87,1,0,11,136,170,137,17,16,61,135,9,0,
-240,23,194,2,2,184,165,69,61,127,1,0,15,112,23,104,
-61,103,9,0,13,88,236,95,34,2,11,96,12,224,206,225,
-29,48,28,56,27,64,128,255,226,0,0,74,28,16,165,21,
-250,17,234,13,224,201,194,13,9,80,219,81,65,194,24,142,
-255,255,17,135,0,0,74,135,0,0,95,202,65,210,65,18,
-65,74,61,119,9,0,14,120,129,122,15,96,193,98,12,104,
-13,88,220,89,235,17,209,229,29,48,28,56,27,64,128,255,
-44,0,29,48,28,56,27,64,128,255,184,0,10,16,224,17,
-194,5,32,22,194,1,213,5,65,186,224,201,234,189,0,18,
-2,80,3,30,132,1,126,6,255,241,128,7,225,16,6,248,
-7,232,8,224,229,87,64,0,224,7,96,1,10,216,63,143,
-21,0,128,134,170,170,113,135,0,0,63,127,25,0,32,118,
-85,85,111,119,0,0,63,111,21,0,128,102,160,160,109,103,
-0,0,0,18,197,13,66,234,29,94,254,255,66,226,28,86,
-254,255,234,143,1,0,107,143,0,0,65,18,63,127,9,0,
-15,128,129,130,240,17,129,245,32,54,32,78,128,255,66,187,
-251,47,32,0,64,6,255,16,0,18,197,13,66,66,8,142,
-254,255,66,58,7,134,254,255,240,127,1,0,113,127,0,0,
-65,18,38,111,9,0,13,112,129,114,238,17,129,245,127,0,
-0,18,149,21,66,66,8,142,254,255,241,135,1,0,66,58,
-7,126,254,255,239,119,1,0,238,129,194,5,32,22,194,1,
-165,13,65,18,2,104,38,95,9,0,11,96,129,98,236,105,
-161,237,0,18,2,80,127,0,128,7,38,23,1,0,2,80,
-127,0,38,23,5,0,2,80,127,0,38,23,13,0,2,80,
-127,0,34,6,0,192,23,0,2,80,127,0,128,7,225,16,
-6,232,0,226,229,87,64,0,224,7,96,1,10,216,61,143,
-21,0,128,134,170,170,113,135,0,0,61,127,25,0,32,118,
-85,85,111,119,0,0,61,111,21,0,128,102,144,144,109,103,
-0,0,32,54,32,78,128,255,120,186,61,95,1,0,235,87,
-1,0,10,136,208,138,61,135,29,0,240,127,1,0,15,224,
-17,225,61,119,21,0,128,110,170,170,110,111,0,0,61,103,
-25,0,32,94,85,85,108,95,0,0,61,87,21,0,128,142,
-240,240,106,143,0,0,32,54,32,78,128,255,52,186,251,47,
-32,0,48,6,186,186,31,31,240,225,186,5,0,18,181,5,
-32,22,192,1,2,80,64,6,255,16,190,7,225,241,3,30,
-124,254,6,232,7,224,8,216,9,208,35,142,0,0,64,134,
-0,64,17,200,16,201,61,127,1,0,239,225,161,13,26,112,
-220,113,61,111,5,0,61,103,1,0,204,105,237,113,195,5,
-32,22,193,1,133,101,28,88,61,87,1,0,11,136,170,137,
-17,16,61,135,9,0,240,23,194,2,2,184,149,85,61,127,
-1,0,15,112,23,104,61,103,9,0,13,88,236,95,34,2,
-11,96,12,192,206,193,29,48,24,56,25,64,128,255,32,1,
-0,18,24,72,149,37,252,73,218,29,224,209,178,29,2,80,
-217,81,65,218,27,142,255,255,17,135,0,0,74,135,0,0,
-95,210,65,226,224,209,226,13,2,126,1,0,15,112,217,113,
-65,218,27,110,255,255,13,103,0,0,78,103,0,0,95,210,
-65,226,66,74,68,18,61,87,9,0,10,88,129,90,11,128,
-193,130,16,136,17,120,216,121,239,73,225,213,29,48,24,56,
-25,64,128,255,44,0,29,48,24,56,25,64,128,255,248,0,
-10,16,224,17,194,5,32,22,194,1,213,5,65,186,224,209,
-250,173,0,18,2,80,3,30,132,1,126,6,255,241,128,7,
-225,48,6,224,7,216,8,248,60,135,5,0,16,136,129,138,
-17,232,59,233,229,87,64,0,224,7,96,1,10,208,60,127,
-21,0,128,118,170,170,111,119,0,0,60,111,25,0,32,102,
-85,85,109,103,0,0,60,95,21,0,128,86,160,160,107,87,
-0,0,0,18,229,21,66,218,27,142,254,255,66,250,31,134,
-254,255,240,127,1,0,113,127,0,0,66,234,29,118,254,255,
-66,250,31,110,254,255,237,103,1,0,110,103,0,0,65,18,
-60,87,9,0,10,88,129,90,235,17,225,229,32,54,32,78,
-128,255,142,184,250,47,32,0,64,6,255,48,38,135,5,0,
-16,136,129,138,17,16,39,17,0,74,229,21,66,66,8,126,
-254,255,66,58,7,118,254,255,238,111,1,0,111,111,0,0,
-66,66,8,102,254,255,66,18,2,94,254,255,235,87,1,0,
-108,87,0,0,65,74,38,135,9,0,16,136,129,138,241,73,
-225,229,127,0,38,135,5,0,16,136,129,138,17,16,39,17,
-0,74,133,37,66,66,8,126,254,255,239,119,1,0,66,58,
-7,110,254,255,237,103,1,0,236,113,194,5,32,22,194,1,
-149,29,66,66,8,94,254,255,235,87,1,0,66,18,2,142,
-254,255,241,135,1,0,240,81,194,5,32,22,194,1,165,13,
-65,74,9,120,38,111,9,0,13,112,129,114,238,121,177,221,
-0,18,2,80,127,0,128,7,33,0,224,49,138,13,32,54,
-36,0,129,255,42,21,10,48,224,49,146,37,48,6,180,109,
-133,0,102,135,17,0,32,118,0,64,102,119,13,0,44,6,
-170,10,16,0,102,103,21,0,43,6,84,5,16,0,64,126,
-16,0,102,127,29,0,102,127,5,0,102,127,1,0,102,95,
-25,0,47,6,2,0,16,0,102,127,33,0,6,80,64,6,
-63,0,38,87,1,0,127,0,38,87,5,0,127,0,38,87,
-13,0,127,0,34,6,240,224,132,0,34,135,5,0,34,87,
-9,0,208,81,202,82,127,0,38,87,1,0,127,0,128,7,
-193,16,6,224,229,87,64,0,224,7,96,1,60,23,21,0,
-32,142,170,0,98,143,0,0,60,135,25,0,32,126,85,0,
-112,127,0,0,32,118,144,0,98,119,0,0,60,103,1,0,
-10,216,44,103,0,0,60,239,33,0,204,94,255,0,208,90,
-253,239,1,0,11,233,32,118,240,0,98,119,0,0,251,47,
-32,0,45,6,91,34,1,0,237,233,186,5,0,82,229,13,
-44,6,186,34,1,0,236,233,250,5,64,94,8,0,124,95,
-5,0,0,82,181,5,32,86,192,1,64,6,223,16,130,7,
-225,243,8,216,9,232,6,184,55,23,1,0,7,224,226,225,
-129,13,29,136,55,135,5,0,220,137,194,129,240,137,195,5,
-32,86,193,1,133,109,64,54,1,0,129,255,198,19,10,192,
-99,199,1,0,224,193,202,5,32,86,21,1,197,93,55,215,
-1,0,0,82,64,22,133,0,34,94,240,224,165,13,43,23,
-1,0,202,18,218,17,226,225,241,5,2,208,68,90,65,82,
-10,6,180,255,217,245,10,176,133,69,23,48,26,56,22,104,
-194,106,64,86,133,0,202,105,45,207,241,224,24,64,202,202,
-25,72,128,255,18,1,28,80,28,88,35,23,1,0,186,89,
-203,17,25,96,218,97,181,13,27,135,0,0,95,234,65,218,
+185,5,0,82,197,37,29,48,191,255,10,196,10,48,1,58,
+253,63,192,0,128,255,66,5,224,81,186,5,0,82,245,21,
+36,63,9,140,36,111,5,140,29,48,205,57,10,90,235,63,
+194,2,128,255,172,5,224,81,159,13,32,230,4,2,29,56,
+38,6,36,208,132,0,129,255,70,47,28,80,64,6,255,0,
+128,7,225,0,6,232,191,255,186,232,10,16,224,17,202,77,
+61,63,14,0,29,48,128,255,200,4,29,48,128,255,178,4,
+224,81,162,29,61,231,29,0,29,56,60,231,61,0,61,55,
+14,0,156,231,35,0,191,255,42,231,28,56,38,6,64,208,
+132,0,129,255,250,46,61,55,29,0,61,63,14,0,128,255,
+136,4,125,7,12,0,29,48,128,255,62,5,224,81,178,29,
+61,231,29,0,29,56,60,231,61,0,61,55,14,0,156,231,
+35,0,191,255,238,230,28,56,38,6,100,208,132,0,129,255,
+190,46,28,64,32,54,37,0,37,62,20,130,191,255,100,10,
+125,7,12,0,29,48,61,87,5,0,63,6,102,252,128,0,
+106,0,32,22,17,16,2,80,64,6,255,0,3,30,200,255,
+99,79,53,0,99,71,49,0,99,255,37,0,99,215,29,0,
+99,207,33,0,6,208,99,239,17,0,7,200,99,223,25,0,
+35,239,65,0,35,223,69,0,99,231,21,0,32,22,7,16,
+0,226,165,69,35,22,48,0,35,142,56,0,49,127,1,0,
+34,79,5,0,34,71,1,0,99,127,1,0,26,48,49,119,
+5,0,25,56,99,223,9,0,99,119,5,0,99,7,13,0,
+128,255,128,0,10,16,224,17,234,21,61,23,1,0,63,6,
+250,252,128,0,2,22,16,0,34,87,0,0,34,95,5,0,
+221,81,10,48,107,0,27,48,10,56,32,70,0,2,191,255,
+168,131,10,16,224,17,250,13,61,23,1,0,63,6,38,253,
+128,0,72,18,34,87,0,0,34,143,5,0,221,81,10,48,
+113,0,10,16,65,226,99,226,206,5,2,6,249,239,178,189,
+35,207,33,0,35,255,37,0,35,239,17,0,35,231,21,0,
+35,223,25,0,35,215,29,0,2,80,3,30,56,0,127,0,
+3,30,200,255,99,79,53,0,99,71,49,0,99,255,37,0,
+99,199,25,0,99,231,9,0,6,192,7,224,99,191,29,0,
+99,183,33,0,35,191,65,0,99,207,21,0,99,223,13,0,
+99,215,17,0,99,239,5,0,35,183,69,0,36,207,45,175,
+0,210,191,255,142,15,106,7,9,0,49,6,248,65,1,0,
+106,143,5,0,28,128,106,7,29,0,10,122,106,7,33,0,
+239,135,194,2,106,135,21,0,10,232,29,48,1,58,191,255,
+42,89,35,54,48,0,24,56,29,64,23,72,221,47,2,0,
+99,183,1,0,35,119,61,0,63,6,228,253,128,0,110,0,
+61,111,0,0,224,105,218,253,61,223,12,0,29,48,125,7,
+0,0,191,255,70,15,27,6,0,254,242,5,27,6,253,253,
+194,5,27,6,248,253,250,13,36,103,45,175,185,97,234,103,
+64,2,172,225,224,225,207,5,32,222,4,2,197,5,65,210,
+99,210,134,189,27,80,35,183,33,0,35,191,29,0,35,199,
+25,0,35,207,21,0,35,215,17,0,35,223,13,0,35,231,
+9,0,35,239,5,0,35,255,37,0,3,30,56,0,127,0,
+128,7,97,0,229,87,64,0,224,7,96,1,10,232,36,87,
+161,140,202,54,128,127,202,22,127,0,224,17,186,5,224,49,
+210,29,224,17,226,13,224,49,194,13,196,199,56,133,178,5,
+0,18,165,5,0,50,36,135,57,133,65,130,100,135,57,133,
+224,17,226,5,1,122,96,127,169,179,100,23,13,140,224,49,
+178,5,128,255,188,2,253,47,32,0,64,6,127,0,128,7,
+225,0,6,224,0,234,224,225,242,37,0,18,149,21,129,255,
+238,69,10,136,191,138,209,142,31,0,10,112,209,113,32,110,
+224,255,77,113,174,81,1,18,234,23,192,0,92,17,224,17,
+242,237,0,90,245,13,11,80,234,86,12,0,48,6,12,210,
+132,0,208,81,42,127,1,0,66,121,178,5,10,232,197,5,
+65,90,111,90,145,245,29,80,64,6,255,0,130,7,225,0,
+6,232,7,224,97,234,131,61,60,55,5,0,37,62,32,130,
+129,255,22,75,224,81,170,29,99,234,242,5,38,6,180,208,
+132,0,129,255,202,43,165,85,60,55,9,0,0,58,32,70,
+16,0,129,255,168,69,10,224,28,56,38,6,212,208,132,0,
+129,255,172,43,100,231,161,140,245,21,60,55,5,0,37,62,
+28,130,129,255,212,74,224,81,154,13,38,6,0,209,132,0,
+129,255,140,43,100,7,161,140,245,5,38,6,136,208,132,0,
+129,255,124,43,181,45,97,234,234,5,38,6,28,209,132,0,
+129,255,108,43,0,234,133,37,253,22,12,0,47,6,12,210,
+132,0,207,17,36,119,161,140,34,63,1,0,71,113,210,5,
+40,6,156,208,132,0,197,5,40,6,168,208,132,0,34,95,
+9,0,34,79,4,0,99,95,1,0,38,6,56,209,132,0,
+129,255,44,43,65,234,111,234,129,229,66,6,255,0,199,0,
+128,7,33,0,6,120,7,48,8,56,9,128,35,87,5,0,
+16,64,10,72,47,127,1,0,63,6,4,0,129,0,111,0,
+64,6,63,0,128,7,33,0,6,96,7,48,8,56,9,120,
+143,0,35,87,5,0,15,64,10,104,141,0,13,72,44,103,
+1,0,63,6,46,0,129,0,108,0,64,6,63,0,128,7,
+33,0,6,120,7,48,8,56,9,128,16,64,47,127,1,0,
+63,6,76,0,129,0,111,0,64,6,63,0,32,86,33,6,
+86,16,0,0,97,0,33,6,226,22,0,0,97,0,33,6,
+240,26,0,0,97,0,33,6,190,29,0,0,97,0,33,6,
+98,30,0,0,97,0,33,6,130,30,0,0,97,0,33,6,
+118,32,0,0,97,0,33,6,50,80,0,0,97,0,33,6,
+254,61,1,0,97,0,33,6,114,55,1,0,97,0,33,6,
+230,64,1,0,97,0,33,6,114,57,1,0,97,0,33,6,
+10,103,1,0,97,0,33,6,32,98,1,0,97,0,33,6,
+210,98,1,0,97,0,33,6,4,140,1,0,97,0,33,6,
+222,101,1,0,97,0,33,6,130,66,1,0,97,0,33,6,
+44,105,1,0,97,0,33,6,132,79,1,0,97,0,33,6,
+164,96,1,0,97,0,33,6,206,140,1,0,97,0,33,6,
+240,150,1,0,97,0,33,6,236,179,1,0,97,0,33,6,
+94,140,1,0,97,0,33,6,74,101,1,0,97,0,33,6,
+254,145,1,0,97,0,33,6,8,97,1,0,97,0,33,6,
+58,66,1,0,97,0,33,6,38,147,1,0,97,0,33,6,
+10,148,1,0,97,0,33,6,152,147,1,0,97,0,33,6,
+50,58,1,0,97,0,33,6,62,62,1,0,97,0,33,6,
+150,73,1,0,97,0,136,7,97,0,230,0,61,6,172,109,
+133,0,0,18,165,37,61,71,0,0,232,49,202,29,61,63,
+9,0,29,79,2,0,189,127,3,0,99,127,1,0,157,119,
+5,0,99,119,5,0,29,111,5,0,99,111,9,0,29,103,
+6,0,99,103,13,0,38,6,232,235,132,0,129,255,80,41,
+29,80,213,13,76,234,65,18,2,6,34,255,217,221,6,56,
+38,6,196,235,132,0,129,255,54,41,0,82,72,6,127,0,
+230,0,42,6,52,236,132,0,34,6,172,109,133,0,2,94,
+104,10,34,135,0,0,240,49,202,5,34,87,9,0,197,5,
+76,18,235,17,241,245,127,0,128,7,97,0,8,232,29,136,
+194,138,64,118,142,0,206,137,49,71,17,149,231,0,128,255,
+32,0,29,96,194,98,64,142,142,0,209,97,44,135,17,149,
+224,129,194,5,29,48,128,255,2,2,64,6,127,0,128,7,
+225,112,8,224,9,200,6,232,7,208,250,0,26,48,191,255,
+40,255,10,216,125,215,22,0,29,48,0,58,32,70,18,0,
+190,255,146,255,224,217,194,29,29,127,25,0,24,146,27,111,
+6,0,187,135,5,0,93,111,0,0,82,121,27,103,2,0,
+208,118,7,0,93,103,2,0,14,121,187,95,3,0,93,95,
+12,0,93,127,25,0,155,87,5,0,93,87,13,0,61,54,
+26,0,0,58,32,70,98,0,190,255,74,255,0,18,224,225,
+194,13,28,16,2,143,0,0,65,18,224,137,202,253,2,134,
+255,255,188,129,16,22,1,0,2,6,158,255,214,5,92,7,
+97,0,32,22,98,0,2,222,26,0,249,217,167,5,25,216,
+61,54,26,0,28,56,2,64,190,255,172,253,224,225,202,5,
+60,6,76,236,132,0,28,56,37,54,40,130,129,255,16,40,
+27,110,248,255,93,111,7,0,64,6,255,112,3,30,204,255,
+99,79,49,0,99,255,33,0,99,207,25,0,99,215,21,0,
+99,223,17,0,99,231,13,0,99,239,9,0,99,199,29,0,
+6,248,7,192,99,71,45,0,229,87,64,0,224,7,96,1,
+10,200,35,142,44,0,99,143,1,0,35,134,36,0,208,126,
+7,0,64,110,142,0,31,216,194,218,27,208,205,209,58,239,
+17,149,99,127,5,0,58,214,16,149,0,226,224,233,194,13,
+29,16,2,103,0,0,65,18,224,97,202,253,2,230,255,255,
+189,225,220,233,133,21,32,54,98,0,129,255,134,33,10,232,
+122,239,1,0,224,233,242,5,29,48,0,58,32,70,98,0,
+190,255,82,254,224,233,226,53,28,6,158,255,190,53,32,54,
+196,0,129,255,94,33,10,208,224,209,194,45,26,48,35,79,
+5,0,35,71,1,0,24,56,129,255,82,50,32,86,98,0,
+188,81,226,21,29,16,26,88,11,135,0,0,66,135,0,0,
+65,90,65,18,224,129,186,5,95,18,181,5,95,82,218,245,
+224,81,226,5,66,7,0,0,65,18,95,82,202,253,64,110,
+142,0,205,217,59,239,17,149,26,48,93,7,97,0,129,255,
+230,32,249,47,32,0,35,199,29,0,35,207,25,0,35,215,
+21,0,35,223,17,0,35,231,13,0,35,239,9,0,35,255,
+33,0,3,30,52,0,127,0,128,7,97,0,6,232,194,234,
+64,126,142,0,207,233,61,55,17,149,129,255,170,32,125,7,
+17,149,64,6,127,0,132,7,225,243,6,216,7,200,185,0,
+8,208,250,0,128,255,152,1,36,199,45,175,10,224,124,199,
+5,0,92,207,8,0,92,223,9,0,27,48,128,255,184,1,
+10,232,36,191,137,139,124,239,1,0,23,176,25,6,191,255,
+202,77,34,6,0,0,32,0,226,135,5,0,124,135,12,0,
+0,82,226,127,1,0,124,127,14,0,26,6,233,253,202,13,
+226,111,85,0,226,127,87,0,208,122,13,121,1,82,32,214,
+22,2,0,234,229,13,26,6,234,253,170,13,226,135,81,0,
+226,127,83,0,208,122,16,121,1,82,0,234,165,5,31,122,
+124,127,25,0,224,81,146,37,224,233,250,29,61,6,0,164,
+141,0,61,95,12,0,224,89,250,21,61,87,14,0,224,81,
+186,21,125,7,9,0,125,7,12,0,125,7,14,0,125,7,
+16,0,125,7,2,0,27,6,240,255,125,7,18,0,214,5,
+221,63,19,0,165,5,0,234,25,6,190,255,202,53,32,134,
+67,0,92,135,8,0,27,48,3,56,128,255,242,0,227,23,
+5,0,124,23,24,0,27,48,227,23,7,0,124,23,26,0,
+60,70,12,0,1,58,128,255,206,0,128,255,162,0,32,126,
+68,0,10,224,92,127,8,0,124,199,5,0,92,223,9,0,
+227,23,1,0,124,23,24,0,124,239,1,0,227,23,3,0,
+124,23,26,0,36,183,137,139,27,48,60,70,12,0,0,58,
+128,255,148,0,124,215,10,0,224,233,226,21,29,48,26,56,
+191,255,14,251,224,217,198,13,27,6,240,255,158,13,1,106,
+251,111,192,0,253,95,19,0,13,89,125,95,18,0,125,191,
+28,0,125,183,30,0,29,80,68,6,255,243,230,134,28,0,
+47,6,16,153,141,0,207,129,48,118,12,0,103,119,1,0,
+0,82,127,0,230,134,28,0,47,6,16,153,141,0,207,129,
+48,87,25,0,32,118,224,255,78,81,127,0,36,143,137,139,
+65,138,100,143,137,139,17,6,156,255,186,5,100,7,137,139,
+36,135,136,139,240,86,28,0,46,6,16,153,141,0,206,81,
+127,0,127,0,33,6,208,31,0,0,97,0,33,6,150,32,
+0,0,97,0,33,6,202,105,1,0,97,0,38,23,1,0,
+2,80,127,0,38,23,5,0,2,80,127,0,38,23,13,0,
+2,80,127,0,34,6,0,192,23,0,2,80,127,0,128,7,
+225,16,6,232,0,226,229,87,64,0,224,7,96,1,10,216,
+61,143,21,0,128,134,170,170,113,135,0,0,61,127,25,0,
+32,118,85,85,111,119,0,0,61,111,21,0,128,102,144,144,
+109,103,0,0,32,54,32,78,128,255,84,193,61,95,1,0,
+235,87,1,0,10,136,208,138,61,135,29,0,240,127,1,0,
+15,224,17,225,61,119,21,0,128,110,170,170,110,111,0,0,
+61,103,25,0,32,94,85,85,108,95,0,0,61,87,21,0,
+128,142,240,240,106,143,0,0,32,54,32,78,128,255,16,193,
+251,47,32,0,48,6,186,186,31,31,240,225,186,5,0,18,
+181,5,32,22,192,1,2,80,64,6,255,16,190,7,225,241,
+3,30,124,254,6,232,7,208,8,192,9,200,35,142,0,0,
+64,134,0,64,17,216,16,217,61,127,1,0,239,209,161,13,
+25,112,218,113,61,111,5,0,61,103,1,0,204,105,237,113,
+195,5,32,22,193,1,149,85,26,88,61,87,1,0,11,136,
+170,137,17,16,61,135,9,0,240,23,194,2,2,184,165,69,
+61,127,1,0,15,112,23,104,61,103,9,0,13,88,236,95,
+34,2,11,96,12,224,206,225,29,48,28,56,27,64,128,255,
+226,0,0,74,28,16,165,21,250,17,234,13,224,201,194,13,
+9,80,219,81,65,194,24,142,255,255,17,135,0,0,74,135,
+0,0,95,202,65,210,65,18,65,74,61,119,9,0,14,120,
+129,122,15,96,193,98,12,104,13,88,220,89,235,17,209,229,
+29,48,28,56,27,64,128,255,44,0,29,48,28,56,27,64,
+128,255,184,0,10,16,224,17,194,5,32,22,194,1,213,5,
+65,186,224,201,234,189,0,18,2,80,3,30,132,1,126,6,
+255,241,128,7,225,16,6,248,7,232,8,224,229,87,64,0,
+224,7,96,1,10,216,63,143,21,0,128,134,170,170,113,135,
+0,0,63,127,25,0,32,118,85,85,111,119,0,0,63,111,
+21,0,128,102,160,160,109,103,0,0,0,18,197,13,66,234,
+29,94,254,255,66,226,28,86,254,255,234,143,1,0,107,143,
+0,0,65,18,63,127,9,0,15,128,129,130,240,17,129,245,
+32,54,32,78,128,255,168,191,251,47,32,0,64,6,255,16,
+0,18,197,13,66,66,8,142,254,255,66,58,7,134,254,255,
+240,127,1,0,113,127,0,0,65,18,38,111,9,0,13,112,
+129,114,238,17,129,245,127,0,0,18,149,21,66,66,8,142,
+254,255,241,135,1,0,66,58,7,126,254,255,239,119,1,0,
+238,129,194,5,32,22,194,1,165,13,65,18,2,104,38,95,
+9,0,11,96,129,98,236,105,161,237,0,18,2,80,127,0,
+128,7,38,23,1,0,2,80,127,0,38,23,5,0,2,80,
+127,0,38,23,13,0,2,80,127,0,34,6,0,192,23,0,
+2,80,127,0,128,7,225,16,6,232,0,226,229,87,64,0,
+224,7,96,1,10,216,61,143,21,0,128,134,170,170,113,135,
+0,0,61,127,25,0,32,118,85,85,111,119,0,0,61,111,
+21,0,128,102,144,144,109,103,0,0,32,54,32,78,128,255,
+222,190,61,95,1,0,235,87,1,0,10,136,208,138,61,135,
+29,0,240,127,1,0,15,224,17,225,61,119,21,0,128,110,
+170,170,110,111,0,0,61,103,25,0,32,94,85,85,108,95,
+0,0,61,87,21,0,128,142,240,240,106,143,0,0,32,54,
+32,78,128,255,154,190,251,47,32,0,48,6,186,186,31,31,
+240,225,186,5,0,18,181,5,32,22,192,1,2,80,64,6,
+255,16,190,7,225,241,3,30,124,254,6,232,7,224,8,216,
+9,208,35,142,0,0,64,134,0,64,17,200,16,201,61,127,
+1,0,239,225,161,13,26,112,220,113,61,111,5,0,61,103,
+1,0,204,105,237,113,195,5,32,22,193,1,133,101,28,88,
+61,87,1,0,11,136,170,137,17,16,61,135,9,0,240,23,
+194,2,2,184,149,85,61,127,1,0,15,112,23,104,61,103,
+9,0,13,88,236,95,34,2,11,96,12,192,206,193,29,48,
+24,56,25,64,128,255,32,1,0,18,24,72,149,37,252,73,
+218,29,224,209,178,29,2,80,217,81,65,218,27,142,255,255,
+17,135,0,0,74,135,0,0,95,210,65,226,224,209,226,13,
+2,126,1,0,15,112,217,113,65,218,27,110,255,255,13,103,
+0,0,78,103,0,0,95,210,65,226,66,74,68,18,61,87,
+9,0,10,88,129,90,11,128,193,130,16,136,17,120,216,121,
+239,73,225,213,29,48,24,56,25,64,128,255,44,0,29,48,
+24,56,25,64,128,255,248,0,10,16,224,17,194,5,32,22,
+194,1,213,5,65,186,224,209,250,173,0,18,2,80,3,30,
+132,1,126,6,255,241,128,7,225,48,6,224,7,216,8,248,
+60,135,5,0,16,136,129,138,17,232,59,233,229,87,64,0,
+224,7,96,1,10,208,60,127,21,0,128,118,170,170,111,119,
+0,0,60,111,25,0,32,102,85,85,109,103,0,0,60,95,
+21,0,128,86,160,160,107,87,0,0,0,18,229,21,66,218,
+27,142,254,255,66,250,31,134,254,255,240,127,1,0,113,127,
+0,0,66,234,29,118,254,255,66,250,31,110,254,255,237,103,
+1,0,110,103,0,0,65,18,60,87,9,0,10,88,129,90,
+235,17,225,229,32,54,32,78,128,255,244,188,250,47,32,0,
+64,6,255,48,38,135,5,0,16,136,129,138,17,16,39,17,
+0,74,229,21,66,66,8,126,254,255,66,58,7,118,254,255,
+238,111,1,0,111,111,0,0,66,66,8,102,254,255,66,18,
+2,94,254,255,235,87,1,0,108,87,0,0,65,74,38,135,
+9,0,16,136,129,138,241,73,225,229,127,0,38,135,5,0,
+16,136,129,138,17,16,39,17,0,74,133,37,66,66,8,126,
+254,255,239,119,1,0,66,58,7,110,254,255,237,103,1,0,
+236,113,194,5,32,22,194,1,149,29,66,66,8,94,254,255,
+235,87,1,0,66,18,2,142,254,255,241,135,1,0,240,81,
+194,5,32,22,194,1,165,13,65,74,9,120,38,111,9,0,
+13,112,129,114,238,121,177,221,0,18,2,80,127,0,128,7,
+33,0,224,49,138,13,32,54,40,0,129,255,146,25,10,48,
+224,49,226,37,32,118,0,64,102,119,13,0,44,6,170,10,
+16,0,102,103,21,0,43,6,84,5,16,0,64,126,16,0,
+102,127,5,0,102,127,1,0,102,127,29,0,102,95,25,0,
+47,6,2,0,16,0,48,6,84,121,133,0,102,135,17,0,
+102,127,33,0,48,6,91,34,1,0,102,135,37,0,6,80,
+64,6,63,0,38,87,1,0,127,0,38,87,5,0,127,0,
+38,87,13,0,127,0,34,6,104,236,132,0,34,135,5,0,
+34,87,9,0,208,81,202,82,127,0,38,87,1,0,127,0,
+128,7,193,16,6,224,229,87,64,0,224,7,96,1,60,23,
+21,0,32,142,170,0,98,143,0,0,60,135,25,0,32,126,
+85,0,112,127,0,0,32,118,144,0,98,119,0,0,60,103,
+29,0,10,216,44,103,0,0,60,239,33,0,204,94,255,0,
+208,90,253,239,1,0,11,233,32,118,240,0,98,119,0,0,
+251,47,32,0,60,111,37,0,237,233,186,5,0,82,181,5,
+32,86,192,1,64,6,223,16,132,7,225,243,8,216,9,232,
+0,202,6,176,54,23,1,0,7,224,226,225,129,13,29,136,
+54,135,5,0,220,137,194,129,240,137,195,5,32,86,193,1,
+229,125,64,54,1,0,129,255,58,24,10,184,99,191,5,0,
+224,185,202,5,32,86,21,1,165,117,54,215,1,0,0,82,
+64,22,133,0,34,94,104,236,165,13,43,23,1,0,202,18,
+218,17,226,225,241,5,2,208,68,90,65,82,10,6,180,255,
+217,245,99,87,1,0,213,85,22,48,35,111,1,0,26,56,
+194,106,64,86,133,0,202,105,45,199,105,236,23,64,202,194,
+24,72,128,255,104,1,28,80,28,88,35,23,5,0,186,89,
+203,17,24,96,218,97,181,13,27,135,0,0,95,234,65,218,
 65,226,66,135,0,0,65,82,65,18,65,90,236,81,185,5,
-224,233,186,245,23,48,26,56,128,255,48,1,23,48,26,56,
-24,64,25,72,128,255,52,0,23,48,26,56,24,64,25,72,
-128,255,232,0,224,81,242,5,24,48,129,255,50,19,32,86,
-194,1,149,13,217,209,65,178,224,233,138,197,24,48,129,255,
-30,19,0,82,66,6,255,243,128,7,193,240,6,216,7,232,
-8,224,9,192,58,6,240,255,31,0,229,87,64,0,224,7,
-96,1,10,200,0,18,149,53,253,143,1,0,252,135,1,0,
-240,137,202,5,66,234,66,226,245,37,59,127,21,0,32,118,
-170,0,111,119,0,0,59,111,25,0,32,102,85,0,109,103,
-0,0,59,95,21,0,32,86,160,0,107,87,0,0,66,234,
-29,142,254,255,66,226,28,134,254,255,240,127,1,0,113,127,
-0,0,250,119,1,0,206,110,64,0,250,103,1,0,204,94,
-64,0,235,105,250,245,65,18,24,80,191,82,10,136,159,138,
-24,128,209,129,16,120,161,122,239,17,241,197,249,47,32,0,
-64,6,223,240,0,18,133,13,231,143,1,0,104,143,0,0,
-66,58,66,66,65,18,9,120,191,122,159,122,9,104,207,105,
-161,106,237,17,161,245,127,0,0,18,213,13,232,143,1,0,
-66,66,231,135,1,0,66,58,240,137,194,5,32,86,194,1,
-181,13,65,18,9,112,191,114,159,114,9,96,206,97,161,98,
-236,17,214,237,0,82,127,0,34,6,240,255,31,0,38,143,
-21,0,32,134,170,0,113,135,0,0,38,127,25,0,32,118,
-85,0,111,119,0,0,38,111,21,0,32,102,128,0,109,103,
-0,0,38,95,21,0,32,86,170,0,107,87,0,0,38,143,
-25,0,32,134,85,0,113,135,0,0,32,126,48,0,103,127,
-0,0,226,119,1,0,206,110,64,0,226,103,1,0,204,94,
-64,0,235,105,250,245,127,0,128,7,97,0,6,232,224,233,
-138,13,32,54,36,0,129,255,214,17,10,232,224,233,194,37,
-29,48,191,255,148,252,49,6,244,109,133,0,125,143,17,0,
-32,126,0,64,125,127,13,0,45,6,170,170,16,0,125,111,
-21,0,43,6,84,85,16,0,64,134,16,0,125,135,29,0,
-125,135,5,0,125,135,1,0,125,95,25,0,48,6,2,0,
-16,0,125,135,33,0,29,80,64,6,127,0,128,7,225,0,
-6,248,229,87,64,0,224,7,96,1,63,23,21,0,32,142,
-170,0,98,143,0,0,63,135,25,0,32,126,85,0,112,127,
-0,0,32,118,144,0,98,119,0,0,63,103,1,0,10,224,
-44,103,0,0,63,239,33,0,204,94,255,0,208,90,253,239,
-1,0,11,233,31,48,128,255,30,0,252,47,32,0,46,6,
-91,0,32,0,238,233,186,5,0,82,181,5,32,86,192,1,
-64,6,255,0,128,7,33,0,38,143,21,0,32,134,240,0,
-113,135,0,0,12,50,128,255,168,179,64,6,63,0,38,135,
-128,7,97,0,0,50,191,255,192,251,42,23,17,0,100,87,
-141,139,34,127,16,0,10,112,15,48,206,49,34,111,21,0,
-63,6,200,11,129,0,109,0,10,232,224,233,210,5,36,55,
-141,139,129,255,170,16,224,233,162,29,0,50,191,255,220,254,
-42,23,17,0,100,87,141,139,34,135,16,0,10,120,16,48,
-207,49,34,119,21,0,63,6,254,11,129,0,110,0,10,232,
-224,233,210,5,36,55,141,139,129,255,116,16,224,233,186,5,
-128,255,10,0,29,80,64,6,127,0,128,7,225,48,36,87,
-141,139,42,23,17,0,63,6,58,12,129,0,34,135,24,0,
-34,127,29,0,16,48,202,49,111,0,10,232,36,87,141,139,
-42,23,17,0,63,6,88,12,129,0,34,111,56,0,34,103,
-61,0,13,48,202,49,108,0,234,233,234,85,36,95,141,139,
-43,23,17,0,63,6,124,12,129,0,2,238,40,0,34,87,
-24,0,34,143,29,0,10,48,203,49,113,0,10,216,61,127,
-0,0,36,55,141,139,15,112,206,49,61,111,5,0,63,6,
-150,12,129,0,109,0,10,224,36,87,141,139,63,6,190,12,
-129,0,42,23,17,0,219,225,34,95,24,0,2,222,48,0,
-11,48,202,49,34,87,29,0,2,238,40,0,106,0,10,208,
-61,135,0,0,36,55,141,139,16,120,207,49,61,119,5,0,
-63,6,216,12,129,0,110,0,10,232,218,233,59,103,0,0,
-36,55,141,139,12,88,203,49,59,87,5,0,63,6,244,12,
-129,0,106,0,28,48,221,81,10,62,8,0,128,255,226,5,
-100,87,145,139,181,5,100,239,145,139,64,6,255,48,176,7,
-225,112,49,6,64,48,32,16,99,143,73,0,48,6,68,51,
-34,17,99,135,77,0,35,54,72,0,128,255,90,9,10,200,
-224,201,194,109,0,218,0,226,213,93,28,120,194,122,197,121,
-47,95,37,130,99,95,77,0,35,54,72,0,128,255,56,9,
-10,232,224,233,226,77,249,233,195,77,224,217,250,5,1,218,
-38,6,76,225,132,0,129,255,246,20,61,71,5,0,61,23,
-13,0,61,63,1,0,29,72,99,23,1,0,99,23,5,0,
-38,6,152,225,132,0,129,255,214,20,35,63,77,0,35,54,
-40,0,128,255,220,9,35,54,40,0,128,255,76,14,10,232,
-29,48,129,255,190,14,10,208,26,56,29,64,35,54,40,0,
-0,74,128,255,192,13,224,81,210,5,26,48,129,255,192,14,
-133,29,35,54,40,0,128,255,48,11,35,63,77,0,35,54,
-8,0,128,255,156,9,29,56,35,54,8,0,1,66,128,255,
-52,5,26,56,29,64,35,54,8,0,0,74,128,255,220,12,
-65,226,98,226,177,165,224,217,146,13,38,6,132,225,132,0,
-129,255,92,20,1,50,128,255,154,0,112,6,255,112,128,7,
-33,0,36,87,141,139,42,23,17,0,63,6,46,14,129,0,
-34,135,40,0,34,127,45,0,16,48,202,49,111,0,64,6,
-63,0,128,7,33,0,36,87,141,139,42,23,17,0,63,6,
-82,14,129,0,34,135,48,0,34,127,53,0,16,48,202,49,
-111,0,64,6,63,0,128,7,33,0,36,87,141,139,42,23,
-17,0,63,6,118,14,129,0,34,135,56,0,34,127,61,0,
-16,48,202,49,111,0,64,6,63,0,128,7,33,0,38,6,
-192,225,132,0,129,255,216,19,0,50,128,255,22,0,224,81,
-194,5,1,50,128,255,12,0,191,255,118,254,64,6,63,0,
-134,7,225,243,6,224,156,0,36,23,145,139,0,194,224,17,
-202,13,224,225,226,5,38,6,196,226,132,0,129,255,160,19,
-32,86,202,1,128,7,66,2,36,87,141,139,2,208,42,23,
-17,0,63,6,230,14,129,0,34,127,24,0,34,119,29,0,
-15,48,202,49,110,0,10,184,0,178,0,234,224,225,226,5,
-38,6,120,227,132,0,129,255,102,19,224,225,226,5,38,6,
-224,225,132,0,129,255,88,19,26,216,59,23,13,0,251,95,
-11,0,2,200,219,201,25,152,171,153,99,159,9,0,224,225,
-242,13,59,71,5,0,59,63,1,0,27,72,99,23,1,0,
-99,23,5,0,38,6,244,226,132,0,129,255,34,19,247,209,
-161,21,36,87,141,139,42,23,17,0,63,6,94,15,129,0,
-34,135,32,0,34,127,37,0,16,48,202,49,111,0,215,81,
-234,209,211,13,32,198,202,1,224,225,226,5,38,6,24,227,
-132,0,129,255,234,18,65,234,128,7,108,1,59,23,1,0,
-45,6,64,48,32,16,237,17,130,21,44,6,128,112,96,80,
-236,17,178,13,32,198,202,1,224,225,226,5,38,6,48,227,
-132,0,129,255,186,18,65,234,251,23,9,0,98,18,177,5,
-99,18,147,13,224,225,226,5,38,6,68,227,132,0,129,255,
-158,18,65,234,35,159,9,0,211,126,3,0,146,13,224,225,
-226,5,38,6,132,226,132,0,129,255,132,18,65,234,27,88,
-35,111,9,0,0,18,251,87,11,0,224,81,178,13,11,23,
-0,0,13,103,0,0,65,90,65,106,172,17,186,5,95,82,
-250,245,224,17,178,13,224,225,226,5,38,6,40,226,132,0,
-129,255,76,18,32,198,202,1,65,234,218,86,3,0,146,13,
-224,225,226,5,38,6,24,226,132,0,129,255,50,18,65,234,
-247,201,161,21,36,87,141,139,42,23,17,0,63,6,80,16,
-129,0,34,127,32,0,34,119,37,0,15,48,202,49,110,0,
-215,81,234,201,195,13,32,198,202,1,224,225,226,5,38,6,
-68,226,132,0,129,255,248,17,65,234,213,61,224,225,210,5,
-37,54,44,130,129,255,232,17,59,23,21,0,224,17,194,5,
-2,208,219,209,149,21,36,95,141,139,43,23,17,0,63,6,
-162,16,129,0,34,87,32,0,34,143,37,0,10,48,203,49,
-113,0,10,208,215,209,26,16,185,17,178,13,224,225,146,13,
-25,56,2,64,2,72,38,6,88,226,132,0,129,255,160,17,
-65,178,105,178,167,13,224,225,226,5,38,6,92,227,132,0,
-129,255,140,17,65,234,245,5,59,119,21,0,224,113,178,5,
-191,7,40,254,224,225,130,13,22,56,29,64,38,6,152,226,
-132,0,129,255,106,17,224,193,202,5,196,7,145,140,181,5,
-196,135,145,140,24,80,70,6,255,243,134,7,225,16,36,87,
-141,139,0,226,42,23,17,0,63,6,44,17,129,0,34,135,
-24,0,34,127,29,0,16,48,202,49,111,0,10,216,38,6,
-128,228,132,0,129,255,40,17,36,23,145,139,224,17,154,13,
-38,6,164,228,132,0,129,255,22,17,32,86,202,1,165,125,
-2,232,0,226,38,6,52,229,132,0,129,255,2,17,38,6,
-212,227,132,0,129,255,248,16,61,71,5,0,61,23,13,0,
-61,63,1,0,29,72,99,23,1,0,99,23,5,0,38,6,
-196,228,132,0,129,255,216,16,29,48,128,255,188,0,224,81,
-162,77,38,6,236,228,132,0,129,255,196,16,36,87,141,139,
-99,7,9,0,42,23,17,0,63,6,188,17,129,0,34,111,
-32,0,34,103,37,0,13,48,202,49,108,0,10,56,219,57,
-29,48,128,255,28,1,10,232,224,233,194,13,224,233,242,13,
-38,6,52,228,132,0,129,255,134,16,188,233,99,239,9,0,
-229,5,38,6,12,228,132,0,129,255,116,16,28,232,60,54,
-20,0,35,62,8,0,4,66,128,255,74,4,28,48,128,255,
-18,10,42,54,20,0,35,62,8,0,4,66,128,255,54,4,
-10,224,224,81,130,13,38,6,32,229,132,0,129,255,64,16,
-28,80,133,21,29,224,29,48,128,255,246,9,60,143,21,0,
-10,232,224,137,170,157,38,6,88,228,132,0,129,255,32,16,
-0,82,70,6,255,16,128,7,97,0,6,232,61,23,1,0,
-49,6,64,48,32,16,241,17,146,13,48,6,128,112,96,80,
-240,17,194,5,32,86,202,1,165,29,29,48,128,255,164,9,
-253,95,11,0,29,96,0,18,224,89,178,13,12,23,0,0,
-10,119,0,0,65,98,65,82,174,17,186,5,95,90,250,245,
-224,17,194,5,32,86,202,1,165,5,0,82,64,6,127,0,
-128,7,225,48,7,216,8,208,6,232,213,21,61,135,1,0,
-49,6,64,48,32,16,241,129,218,13,29,224,28,48,191,255,
-136,255,224,81,250,5,60,127,5,0,239,209,186,5,28,80,
-213,5,68,234,251,233,177,237,0,82,64,6,255,48,128,7,
-225,16,7,216,6,232,149,21,61,135,1,0,49,6,64,48,
-32,16,241,129,154,13,29,224,28,48,191,255,76,255,224,81,
-186,5,28,80,213,5,68,234,251,233,241,237,0,82,64,6,
-255,16,154,7,225,112,36,143,145,139,136,0,6,232,61,135,
-4,0,99,143,1,0,224,129,218,5,32,86,196,1,128,7,
-240,1,224,65,178,5,7,112,197,13,7,6,0,253,193,5,
-32,118,0,4,229,5,7,112,130,114,199,113,130,114,194,114,
-125,119,21,0,61,111,9,0,99,111,29,0,61,63,13,0,
-99,63,33,0,61,95,17,0,99,95,37,0,3,48,61,87,
-21,0,32,118,24,0,99,87,41,0,3,106,61,143,25,0,
-10,70,48,0,99,143,45,0,99,71,41,0,99,119,38,0,
-99,111,36,0,99,7,49,0,128,255,138,1,10,224,224,225,
-146,85,36,87,141,139,35,223,41,0,42,23,17,0,220,217,
-34,95,24,0,2,214,32,0,11,48,202,49,34,87,29,0,
-63,6,200,19,129,0,106,0,10,200,58,135,0,0,36,55,
-141,139,16,120,207,49,58,119,5,0,63,6,226,19,129,0,
-110,0,217,81,234,217,147,13,32,110,198,1,125,111,4,0,
-32,86,197,1,128,7,42,1,35,23,1,0,224,17,146,21,
-252,17,185,13,34,87,21,0,224,81,178,37,34,95,13,0,
-171,81,99,87,49,0,213,29,188,17,99,23,49,0,149,29,
-36,87,141,139,42,23,17,0,63,6,60,20,129,0,34,135,
-48,0,34,127,53,0,16,48,202,49,111,0,99,87,49,0,
-133,13,32,118,198,1,125,119,4,0,32,86,195,1,133,109,
-227,223,39,0,28,48,35,62,28,0,27,64,128,255,230,1,
-10,16,224,17,226,5,32,102,198,1,125,103,4,0,133,93,
-28,208,28,48,128,255,156,7,10,48,35,62,28,0,27,64,
-128,255,194,1,10,16,224,17,242,5,32,86,198,1,125,87,
-4,0,2,80,213,69,35,23,1,0,224,17,226,53,252,17,
-201,53,34,127,1,0,99,127,5,0,34,119,5,0,99,119,
-9,0,34,111,9,0,99,111,13,0,162,209,34,103,13,0,
-2,48,99,103,17,0,35,62,4,0,34,95,17,0,27,64,
-99,95,21,0,99,215,25,0,128,255,106,1,10,16,224,17,
-194,5,125,23,4,0,197,29,35,55,1,0,128,255,36,7,
-10,48,35,62,4,0,27,64,128,255,74,1,10,16,224,17,
-194,5,125,23,4,0,197,13,191,255,18,247,61,54,8,0,
-128,255,116,1,125,87,1,0,125,7,4,0,0,82,90,6,
-255,112,140,7,225,112,6,224,8,208,0,82,0,234,0,18,
-181,13,2,136,194,138,197,137,49,111,37,130,231,105,186,5,
-1,82,197,5,65,18,98,18,209,245,224,81,178,45,36,87,
-141,139,42,23,17,0,63,6,110,21,129,0,2,222,40,0,
-34,143,24,0,34,135,29,0,17,48,202,49,112,0,10,200,
-59,119,0,0,36,55,141,139,14,104,205,49,59,103,5,0,
-63,6,136,21,129,0,108,0,36,95,145,139,124,95,1,0,
-10,16,36,143,145,139,217,17,162,137,250,137,163,77,2,80,
-245,77,48,6,64,48,32,16,99,135,1,0,47,6,68,51,
-34,17,99,127,5,0,3,48,128,255,204,0,124,87,1,0,
-224,81,250,53,29,80,197,61,60,55,1,0,38,103,5,0,
-45,6,136,119,102,85,237,97,170,21,38,95,21,0,224,89,
-226,5,128,255,60,6,124,87,1,0,149,13,38,239,13,0,
-49,6,0,128,1,0,198,233,209,233,149,37,60,55,1,0,
-38,23,21,0,38,127,13,0,2,128,175,129,250,129,227,5,
-128,255,0,6,10,238,24,0,165,21,224,17,234,5,128,255,
-242,5,10,238,24,0,181,13,128,255,246,5,124,87,1,0,
-60,55,1,0,191,255,18,252,224,81,242,197,29,80,76,6,
-255,112,128,7,225,48,6,224,7,216,8,208,229,87,64,0,
-224,7,96,1,10,232,36,87,141,139,28,56,42,23,17,0,
-27,64,34,135,8,0,26,72,16,48,202,49,34,127,13,0,
-63,6,120,22,129,0,111,0,10,224,253,47,32,0,28,80,
-64,6,255,48,128,7,225,240,36,239,145,139,224,233,29,208,
-186,5,0,82,181,109,6,224,0,218,213,101,61,135,1,0,
-60,143,1,0,241,129,250,5,61,119,5,0,60,127,5,0,
-239,113,178,93,61,111,21,0,224,105,194,5,65,218,105,218,
-167,61,0,234,196,199,145,140,234,77,36,87,141,139,42,23,
-17,0,34,95,24,0,11,48,202,49,34,87,29,0,63,6,
-230,22,129,0,106,0,36,95,141,139,10,200,43,87,17,0,
-63,6,8,23,129,0,42,127,29,0,42,135,24,0,10,238,
-32,0,16,48,203,49,111,0,10,192,61,111,0,0,36,55,
-141,139,13,96,204,49,61,95,5,0,63,6,34,23,129,0,
-107,0,10,56,216,57,60,71,5,0,25,48,191,255,116,251,
-10,232,149,29,29,48,128,255,232,4,10,232,250,233,161,21,
-36,87,141,139,42,23,17,0,63,6,92,23,129,0,34,143,
-32,0,34,135,37,0,17,48,202,49,112,0,218,81,234,233,
-163,5,0,234,224,233,186,157,29,80,64,6,255,240,128,7,
-225,0,6,232,7,224,224,233,138,13,32,54,32,0,129,255,
-30,5,10,232,224,233,162,45,49,6,64,48,32,16,125,143,
-9,0,125,231,13,0,61,54,8,0,191,255,234,254,125,87,
-1,0,10,56,224,57,194,21,231,23,9,0,98,18,210,13,
-99,18,178,13,38,6,136,229,132,0,129,255,162,10,32,118,
-201,1,125,119,4,0,165,13,125,7,4,0,245,5,125,7,
-1,0,32,110,198,1,125,111,4,0,29,80,64,6,255,0,
-128,7,97,0,6,232,61,135,1,0,48,135,13,0,208,134,
-3,0,146,13,38,6,180,229,132,0,32,62,229,3,0,66,
-190,255,254,237,61,111,1,0,205,118,3,0,146,13,38,6,
-180,229,132,0,32,62,230,3,0,66,190,255,228,237,61,23,
-1,0,0,98,226,87,11,0,2,118,24,0,34,23,13,0,
-193,82,170,17,130,18,194,18,206,17,0,106,46,87,1,0,
-68,114,202,97,225,127,0,0,207,105,226,113,129,253,205,97,
-12,80,64,6,127,0,140,7,97,0,6,232,61,23,1,0,
-224,17,202,5,32,86,198,1,213,69,34,127,1,0,99,127,
-1,0,34,119,5,0,99,119,5,0,34,111,9,0,99,111,
-9,0,34,103,13,0,99,103,13,0,34,95,17,0,99,95,
-17,0,34,87,21,0,205,22,255,255,99,87,21,0,98,18,
-210,13,99,18,178,13,61,63,1,0,38,6,196,229,132,0,
-129,255,172,9,32,86,201,1,213,29,29,48,191,255,36,255,
-99,87,17,0,3,122,99,127,8,0,61,55,1,0,3,56,
-227,71,11,0,191,255,110,253,224,81,186,13,61,55,1,0,
-128,255,48,3,10,48,3,56,227,71,11,0,191,255,86,253,
-0,82,76,6,127,0,152,7,225,240,6,192,56,239,1,0,
-229,87,64,0,224,7,96,1,10,216,196,199,145,140,250,13,
-191,255,250,247,224,81,186,13,196,7,145,140,32,54,64,0,
-37,62,46,130,190,255,144,237,191,255,242,242,29,48,191,255,
-86,253,10,232,224,233,250,5,251,47,32,0,32,86,198,1,
-128,7,132,1,61,23,5,0,49,6,68,51,34,17,241,17,
-242,5,36,87,145,139,42,135,5,0,240,17,154,53,61,111,
-1,0,99,111,25,0,61,103,5,0,99,103,29,0,61,95,
-9,0,99,95,33,0,61,87,13,0,99,87,37,0,61,143,
-17,0,31,122,99,143,41,0,29,48,61,135,21,0,35,62,
-24,0,99,127,29,0,99,135,45,0,99,127,25,0,253,71,
-11,0,191,255,160,252,10,208,191,255,114,242,32,102,198,1,
-120,103,4,0,251,47,32,0,26,80,128,7,10,1,10,224,
-213,5,28,48,128,255,90,2,10,224,28,48,128,255,82,2,
-253,81,138,253,60,143,1,0,99,143,25,0,60,135,5,0,
-99,135,29,0,60,127,9,0,99,127,33,0,60,119,13,0,
-99,119,37,0,60,111,17,0,99,111,41,0,60,103,21,0,
-99,103,45,0,61,23,21,0,224,17,242,5,60,87,21,0,
-202,17,99,23,45,0,181,5,99,7,45,0,227,207,35,0,
-28,48,35,62,24,0,25,64,191,255,26,252,10,208,224,209,
-146,13,32,134,198,1,120,135,4,0,251,47,32,0,26,80,
-165,69,28,48,128,255,204,1,10,48,35,62,24,0,25,64,
-191,255,242,251,10,208,224,209,146,13,32,118,198,1,120,119,
-4,0,251,47,32,0,26,80,229,45,61,95,1,0,99,95,
-1,0,61,87,5,0,99,87,5,0,61,143,9,0,99,143,
-9,0,61,135,13,0,99,135,13,0,61,127,17,0,31,106,
-99,127,17,0,29,48,61,119,21,0,3,56,99,119,21,0,
-99,111,1,0,99,111,5,0,25,64,191,255,152,251,29,48,
-128,255,96,1,10,48,3,56,25,64,191,255,136,251,251,47,
-32,0,0,82,88,6,255,240,128,7,225,112,6,224,7,200,
-8,216,9,208,0,250,229,87,64,0,224,7,96,1,10,232,
-196,199,145,140,218,13,191,255,36,246,224,81,154,13,196,7,
-145,140,32,54,64,0,37,62,47,130,190,255,186,235,60,143,
-4,0,224,137,242,13,28,48,27,56,0,66,191,255,6,248,
-60,135,4,0,224,129,226,5,253,47,32,0,60,87,4,0,
-245,37,26,120,60,23,1,0,219,121,226,103,11,0,34,87,
-13,0,193,98,172,81,234,121,227,5,253,47,32,0,32,86,
-199,1,229,21,2,54,24,0,218,49,25,56,27,64,191,255,
-244,250,10,248,224,249,210,5,253,47,32,0,31,80,133,13,
-28,48,191,255,244,252,10,248,253,47,32,0,31,80,64,6,
-255,112,128,7,225,112,7,200,8,216,6,232,61,23,4,0,
-9,208,224,17,178,5,2,80,213,45,26,120,61,231,1,0,
-219,121,252,103,11,0,60,87,13,0,193,98,172,81,234,121,
-195,5,32,86,199,1,229,29,29,48,191,255,54,252,60,23,
-17,0,234,17,194,13,61,135,1,0,240,135,9,0,99,130,
-234,5,32,86,200,1,125,87,4,0,197,13,61,119,1,0,
-26,56,14,118,24,0,206,57,25,48,27,64,190,255,172,228,
-0,82,64,6,255,112,38,143,4,0,224,137,170,13,38,23,
-1,0,34,87,13,0,226,119,11,0,193,114,174,81,165,5,
-0,82,127,0,38,135,4,0,224,129,226,87,0,0,127,0,
-38,87,13,0,230,135,11,0,198,81,176,81,127,0,38,87,
-21,0,198,81,127,0,140,7,225,48,0,226,6,208,122,7,
-0,0,191,255,36,242,10,232,191,255,214,241,10,16,0,82,
-213,13,250,103,1,0,29,135,0,0,65,226,208,126,255,0,
-207,97,122,103,0,0,65,234,65,82,226,81,177,245,42,6,
-64,48,32,16,99,87,1,0,49,6,68,51,34,17,99,143,
-5,0,3,48,191,255,16,250,10,216,224,217,170,13,38,6,
-16,230,132,0,129,255,216,5,32,86,107,48,128,7,24,2,
-191,255,162,241,202,233,253,217,146,21,38,6,52,230,132,0,
-129,255,188,5,29,56,27,64,38,6,96,230,132,0,129,255,
-174,5,32,86,107,48,128,7,238,1,251,135,11,0,16,6,
-232,255,178,21,38,6,140,230,132,0,129,255,146,5,251,71,
-11,0,38,6,180,230,132,0,32,62,24,0,129,255,128,5,
-32,86,107,48,128,7,192,1,0,18,213,13,250,143,1,0,
-29,111,0,0,65,226,205,102,255,0,204,137,122,143,0,0,
-65,234,65,18,251,119,11,0,14,110,252,255,237,17,241,237,
-68,234,59,103,13,0,68,226,12,22,208,255,0,98,213,13,
-250,119,1,0,29,87,0,0,65,226,202,142,255,0,209,113,
-122,119,0,0,65,234,65,98,226,97,177,245,0,18,213,13,
-250,127,1,0,29,95,0,0,65,226,203,86,255,0,202,121,
-122,127,0,0,65,234,65,18,251,103,11,0,12,94,252,255,
-235,17,241,237,59,239,21,0,68,226,219,233,42,6,128,112,
-96,80,99,87,1,0,49,6,136,119,102,85,99,143,5,0,
-3,48,191,255,2,249,10,216,224,217,170,13,38,6,240,229,
-132,0,129,255,202,4,32,86,107,48,128,7,10,1,253,217,
-130,21,38,6,224,230,132,0,129,255,180,4,29,56,27,64,
-38,6,96,230,132,0,129,255,166,4,32,86,107,48,181,117,
-251,135,11,0,16,6,232,255,162,21,38,6,8,231,132,0,
-129,255,140,4,251,71,11,0,38,6,180,230,132,0,32,62,
-24,0,129,255,122,4,32,86,107,48,213,93,0,18,213,13,
-250,143,1,0,29,111,0,0,65,226,205,102,255,0,204,137,
-122,143,0,0,65,234,65,18,251,119,11,0,14,110,252,255,
-237,17,241,237,68,234,59,103,13,0,68,226,12,22,208,255,
-0,98,213,13,250,119,1,0,29,87,0,0,65,226,202,142,
-255,0,209,113,122,119,0,0,65,234,65,98,226,97,177,245,
-0,18,213,13,250,127,1,0,29,95,0,0,65,226,203,86,
-255,0,202,121,122,127,0,0,65,234,65,18,251,103,11,0,
-12,94,252,255,235,17,241,237,36,87,141,139,68,234,42,23,
-17,0,68,226,34,143,32,0,34,135,37,0,17,48,202,49,
-63,6,136,30,129,0,112,0,10,16,188,17,0,82,133,13,
-250,127,1,0,15,126,255,0,122,127,0,0,65,82,226,81,
-129,253,0,82,76,6,255,48,6,96,0,90,245,21,12,80,
-171,81,11,16,204,17,2,143,0,0,10,135,1,0,49,129,
-66,135,0,0,10,111,1,0,48,105,74,111,1,0,2,87,
-0,0,65,90,45,81,66,87,0,0,97,90,150,237,127,0,
+224,233,186,245,22,48,26,56,128,255,134,1,10,200,224,201,
+226,5,23,48,129,255,184,23,25,80,149,45,22,48,26,56,
+23,64,24,72,128,255,76,0,10,200,224,201,226,5,23,48,
+129,255,156,23,25,80,181,29,22,48,26,56,23,64,24,72,
+128,255,30,1,10,200,224,201,226,5,23,48,129,255,128,23,
+25,80,213,13,35,159,1,0,216,209,65,154,99,159,1,0,
+224,233,186,173,23,48,129,255,102,23,25,80,68,6,255,243,
+128,7,193,240,6,208,7,232,8,224,9,192,59,6,240,255,
+31,0,229,87,64,0,224,7,96,1,10,16,2,200,0,74,
+213,69,253,143,1,0,252,135,1,0,240,137,202,5,66,234,
+66,226,181,61,58,127,21,0,32,118,170,0,111,119,0,0,
+58,111,25,0,32,102,85,0,109,103,0,0,58,95,21,0,
+32,86,160,0,107,87,0,0,66,234,29,142,254,255,66,226,
+28,134,254,255,240,127,1,0,113,127,0,0,251,23,1,0,
+251,127,1,0,194,118,32,0,224,113,130,21,251,23,1,0,
+251,127,1,0,2,104,205,102,64,0,15,88,203,86,64,0,
+234,97,194,5,32,22,205,1,229,21,2,136,209,134,64,0,
+207,118,64,0,238,129,186,229,65,74,24,104,191,106,13,96,
+159,98,24,88,204,89,11,80,161,82,234,73,177,181,249,47,
+32,0,0,18,2,80,64,6,223,240,0,18,133,13,231,143,
+1,0,104,143,0,0,66,58,66,66,65,18,9,120,191,122,
+159,122,9,104,207,105,161,106,237,17,161,245,127,0,0,18,
+213,13,232,143,1,0,66,66,231,135,1,0,66,58,240,137,
+194,5,32,86,194,1,181,13,65,18,9,112,191,114,159,114,
+9,96,206,97,161,98,236,17,214,237,0,82,127,0,34,6,
+240,255,31,0,38,143,21,0,32,134,170,0,113,135,0,0,
+38,127,25,0,32,118,85,0,111,119,0,0,38,111,21,0,
+32,102,128,0,109,103,0,0,38,95,21,0,32,86,170,0,
+107,87,0,0,38,143,25,0,32,134,85,0,113,135,0,0,
+32,126,48,0,103,127,0,0,226,127,1,0,226,79,1,0,
+207,118,32,0,224,113,130,21,226,127,1,0,226,79,1,0,
+15,104,205,102,64,0,9,88,203,86,64,0,234,97,194,5,
+32,22,206,1,165,13,15,136,209,134,64,0,9,120,207,118,
+64,0,238,129,170,229,0,18,2,80,127,0,128,7,97,0,
+6,232,224,233,138,13,32,54,40,0,129,255,194,21,10,232,
+224,233,194,37,29,48,191,255,24,252,32,134,0,64,125,135,
+13,0,46,6,170,170,16,0,125,119,21,0,64,142,16,0,
+125,143,29,0,125,143,5,0,125,143,1,0,44,6,84,85,
+16,0,49,6,2,0,16,0,125,143,33,0,125,103,25,0,
+49,6,91,0,32,0,125,143,37,0,29,80,64,6,127,0,
+128,7,128,7,97,0,6,232,224,233,138,13,32,54,40,0,
+129,255,92,21,10,232,224,233,194,37,29,48,191,255,178,251,
+32,134,0,64,125,135,13,0,46,6,170,170,16,0,125,119,
+21,0,64,142,16,0,125,143,29,0,125,143,5,0,125,143,
+1,0,44,6,84,85,16,0,49,6,2,0,16,0,125,143,
+33,0,125,103,25,0,49,6,91,34,32,0,125,143,37,0,
+29,80,64,6,127,0,128,7,97,0,6,232,224,233,138,13,
+32,54,40,0,129,255,248,20,10,232,224,233,194,37,29,48,
+191,255,78,251,32,134,0,64,125,135,13,0,46,6,170,170,
+16,0,125,119,21,0,64,142,16,0,125,143,29,0,125,143,
+5,0,125,143,1,0,44,6,84,85,16,0,49,6,2,0,
+16,0,125,143,33,0,125,103,25,0,49,6,91,34,194,0,
+125,143,37,0,29,80,64,6,127,0,128,7,97,0,6,232,
+224,233,138,13,32,54,40,0,129,255,148,20,10,232,224,233,
+242,37,29,48,191,255,234,250,32,134,0,64,125,135,13,0,
+46,6,170,170,16,0,125,119,21,0,44,6,84,85,16,0,
+125,103,25,0,64,142,16,0,125,143,1,0,125,143,5,0,
+43,6,0,2,16,0,49,6,2,0,16,0,125,143,33,0,
+125,95,29,0,49,6,91,34,28,0,125,143,37,0,29,80,
+64,6,127,0,38,135,128,7,97,0,0,50,191,255,146,250,
+42,23,17,0,100,87,153,139,34,127,16,0,10,112,15,48,
+206,49,34,111,21,0,63,6,50,17,129,0,109,0,10,232,
+224,233,210,5,36,55,153,139,129,255,228,19,224,233,162,29,
+0,50,191,255,42,254,42,23,17,0,100,87,153,139,34,135,
+16,0,10,120,16,48,207,49,34,119,21,0,63,6,104,17,
+129,0,110,0,10,232,224,233,210,5,36,55,153,139,129,255,
+174,19,224,233,162,29,0,50,191,255,90,254,42,23,17,0,
+100,87,153,139,34,143,16,0,10,128,17,48,208,49,34,127,
+21,0,63,6,158,17,129,0,111,0,10,232,224,233,210,5,
+36,55,153,139,129,255,120,19,224,233,178,29,0,50,191,255,
+136,254,10,88,43,23,17,0,100,95,153,139,34,87,16,0,
+11,136,10,48,209,49,34,135,21,0,63,6,214,17,129,0,
+112,0,10,232,224,233,210,5,36,55,153,139,129,255,64,19,
+224,233,146,29,0,50,191,255,180,254,42,23,17,0,100,87,
+153,139,34,95,16,0,34,143,21,0,11,48,202,49,63,6,
+10,18,129,0,113,0,10,232,224,233,210,5,36,55,153,139,
+129,255,12,19,224,233,186,5,128,255,10,0,29,80,64,6,
+127,0,128,7,225,48,36,87,153,139,42,23,17,0,63,6,
+70,18,129,0,34,135,24,0,34,127,29,0,16,48,202,49,
+111,0,10,232,36,87,153,139,42,23,17,0,63,6,100,18,
+129,0,34,111,56,0,34,103,61,0,13,48,202,49,108,0,
+234,233,234,85,36,95,153,139,43,23,17,0,63,6,136,18,
+129,0,2,238,40,0,34,87,24,0,34,143,29,0,10,48,
+203,49,113,0,10,216,61,127,0,0,36,55,153,139,15,112,
+206,49,61,111,5,0,63,6,162,18,129,0,109,0,10,224,
+36,87,153,139,63,6,202,18,129,0,42,23,17,0,219,225,
+34,95,24,0,2,222,48,0,11,48,202,49,34,87,29,0,
+2,238,40,0,106,0,10,208,61,135,0,0,36,55,153,139,
+16,120,207,49,61,119,5,0,63,6,228,18,129,0,110,0,
+10,232,218,233,59,103,0,0,36,55,153,139,12,88,203,49,
+59,87,5,0,63,6,0,19,129,0,106,0,28,48,221,81,
+10,62,8,0,128,255,226,5,100,87,157,139,181,5,100,239,
+157,139,64,6,255,48,176,7,225,112,49,6,64,48,32,16,
+99,143,73,0,48,6,68,51,34,17,99,135,77,0,35,54,
+72,0,128,255,90,9,10,200,224,201,194,109,0,218,0,226,
+213,93,28,120,194,122,197,121,47,95,45,130,99,95,77,0,
+35,54,72,0,128,255,56,9,10,232,224,233,226,77,249,233,
+195,77,224,217,250,5,1,218,38,6,196,236,132,0,129,255,
+142,23,61,71,5,0,61,23,13,0,61,63,1,0,29,72,
+99,23,1,0,99,23,5,0,38,6,16,237,132,0,129,255,
+110,23,35,63,77,0,35,54,40,0,128,255,220,9,35,54,
+40,0,128,255,76,14,10,232,29,48,129,255,86,17,10,208,
+26,56,29,64,35,54,40,0,0,74,128,255,192,13,224,81,
+210,5,26,48,129,255,88,17,133,29,35,54,40,0,128,255,
+48,11,35,63,77,0,35,54,8,0,128,255,156,9,29,56,
+35,54,8,0,1,66,128,255,52,5,26,56,29,64,35,54,
+8,0,0,74,128,255,220,12,65,226,98,226,177,165,224,217,
+146,13,38,6,252,236,132,0,129,255,244,22,1,50,128,255,
+154,0,112,6,255,112,128,7,33,0,36,87,153,139,42,23,
+17,0,63,6,58,20,129,0,34,135,40,0,34,127,45,0,
+16,48,202,49,111,0,64,6,63,0,128,7,33,0,36,87,
+153,139,42,23,17,0,63,6,94,20,129,0,34,135,48,0,
+34,127,53,0,16,48,202,49,111,0,64,6,63,0,128,7,
+33,0,36,87,153,139,42,23,17,0,63,6,130,20,129,0,
+34,135,56,0,34,127,61,0,16,48,202,49,111,0,64,6,
+63,0,128,7,33,0,38,6,56,237,132,0,129,255,112,22,
+0,50,128,255,22,0,224,81,194,5,1,50,128,255,12,0,
+191,255,118,254,64,6,63,0,134,7,225,243,6,224,156,0,
+36,23,157,139,0,194,224,17,202,13,224,225,226,5,38,6,
+60,238,132,0,129,255,56,22,32,86,202,1,128,7,66,2,
+36,87,153,139,2,208,42,23,17,0,63,6,242,20,129,0,
+34,127,24,0,34,119,29,0,15,48,202,49,110,0,10,184,
+0,178,0,234,224,225,226,5,38,6,240,238,132,0,129,255,
+254,21,224,225,226,5,38,6,88,237,132,0,129,255,240,21,
+26,216,59,23,13,0,251,95,11,0,2,200,219,201,25,152,
+171,153,99,159,9,0,224,225,242,13,59,71,5,0,59,63,
+1,0,27,72,99,23,1,0,99,23,5,0,38,6,108,238,
+132,0,129,255,186,21,247,209,161,21,36,87,153,139,42,23,
+17,0,63,6,106,21,129,0,34,135,32,0,34,127,37,0,
+16,48,202,49,111,0,215,81,234,209,211,13,32,198,202,1,
+224,225,226,5,38,6,144,238,132,0,129,255,130,21,65,234,
+128,7,108,1,59,23,1,0,45,6,64,48,32,16,237,17,
+130,21,44,6,128,112,96,80,236,17,178,13,32,198,202,1,
+224,225,226,5,38,6,168,238,132,0,129,255,82,21,65,234,
+251,23,9,0,98,18,177,5,99,18,147,13,224,225,226,5,
+38,6,188,238,132,0,129,255,54,21,65,234,35,159,9,0,
+211,126,3,0,146,13,224,225,226,5,38,6,252,237,132,0,
+129,255,28,21,65,234,27,88,35,111,9,0,0,18,251,87,
+11,0,224,81,178,13,11,23,0,0,13,103,0,0,65,90,
+65,106,172,17,186,5,95,82,250,245,224,17,178,13,224,225,
+226,5,38,6,160,237,132,0,129,255,228,20,32,198,202,1,
+65,234,218,86,3,0,146,13,224,225,226,5,38,6,144,237,
+132,0,129,255,202,20,65,234,247,201,161,21,36,87,153,139,
+42,23,17,0,63,6,92,22,129,0,34,127,32,0,34,119,
+37,0,15,48,202,49,110,0,215,81,234,201,195,13,32,198,
+202,1,224,225,226,5,38,6,188,237,132,0,129,255,144,20,
+65,234,213,61,224,225,210,5,37,54,52,130,129,255,128,20,
+59,23,21,0,224,17,194,5,2,208,219,209,149,21,36,95,
+153,139,43,23,17,0,63,6,174,22,129,0,34,87,32,0,
+34,143,37,0,10,48,203,49,113,0,10,208,215,209,26,16,
+185,17,178,13,224,225,146,13,25,56,2,64,2,72,38,6,
+208,237,132,0,129,255,56,20,65,178,105,178,167,13,224,225,
+226,5,38,6,212,238,132,0,129,255,36,20,65,234,245,5,
+59,119,21,0,224,113,178,5,191,7,40,254,224,225,130,13,
+22,56,29,64,38,6,16,238,132,0,129,255,2,20,224,193,
+202,5,196,7,157,140,181,5,196,135,157,140,24,80,70,6,
+255,243,134,7,225,16,36,87,153,139,0,226,42,23,17,0,
+63,6,56,23,129,0,34,135,24,0,34,127,29,0,16,48,
+202,49,111,0,10,216,38,6,248,239,132,0,129,255,192,19,
+36,23,157,139,224,17,154,13,38,6,28,240,132,0,129,255,
+174,19,32,86,202,1,165,125,2,232,0,226,38,6,172,240,
+132,0,129,255,154,19,38,6,76,239,132,0,129,255,144,19,
+61,71,5,0,61,23,13,0,61,63,1,0,29,72,99,23,
+1,0,99,23,5,0,38,6,60,240,132,0,129,255,112,19,
+29,48,128,255,188,0,224,81,162,77,38,6,100,240,132,0,
+129,255,92,19,36,87,153,139,99,7,9,0,42,23,17,0,
+63,6,200,23,129,0,34,111,32,0,34,103,37,0,13,48,
+202,49,108,0,10,56,219,57,29,48,128,255,28,1,10,232,
+224,233,194,13,224,233,242,13,38,6,172,239,132,0,129,255,
+30,19,188,233,99,239,9,0,229,5,38,6,132,239,132,0,
+129,255,12,19,28,232,60,54,20,0,35,62,8,0,4,66,
+128,255,74,4,28,48,128,255,18,10,42,54,20,0,35,62,
+8,0,4,66,128,255,54,4,10,224,224,81,130,13,38,6,
+152,240,132,0,129,255,216,18,28,80,133,21,29,224,29,48,
+128,255,246,9,60,143,21,0,10,232,224,137,170,157,38,6,
+208,239,132,0,129,255,184,18,0,82,70,6,255,16,128,7,
+97,0,6,232,61,23,1,0,49,6,64,48,32,16,241,17,
+146,13,48,6,128,112,96,80,240,17,194,5,32,86,202,1,
+165,29,29,48,128,255,164,9,253,95,11,0,29,96,0,18,
+224,89,178,13,12,23,0,0,10,119,0,0,65,98,65,82,
+174,17,186,5,95,90,250,245,224,17,194,5,32,86,202,1,
+165,5,0,82,64,6,127,0,128,7,225,48,7,216,8,208,
+6,232,213,21,61,135,1,0,49,6,64,48,32,16,241,129,
+218,13,29,224,28,48,191,255,136,255,224,81,250,5,60,127,
+5,0,239,209,186,5,28,80,213,5,68,234,251,233,177,237,
+0,82,64,6,255,48,128,7,225,16,7,216,6,232,149,21,
+61,135,1,0,49,6,64,48,32,16,241,129,154,13,29,224,
+28,48,191,255,76,255,224,81,186,5,28,80,213,5,68,234,
+251,233,241,237,0,82,64,6,255,16,154,7,225,112,36,143,
+157,139,136,0,6,232,61,135,4,0,99,143,1,0,224,129,
+218,5,32,86,196,1,128,7,240,1,224,65,178,5,7,112,
+197,13,7,6,0,253,193,5,32,118,0,4,229,5,7,112,
+130,114,199,113,130,114,194,114,125,119,21,0,61,111,9,0,
+99,111,29,0,61,63,13,0,99,63,33,0,61,95,17,0,
+99,95,37,0,3,48,61,87,21,0,32,118,24,0,99,87,
+41,0,3,106,61,143,25,0,10,70,48,0,99,143,45,0,
+99,71,41,0,99,119,38,0,99,111,36,0,99,7,49,0,
+128,255,138,1,10,224,224,225,146,85,36,87,153,139,35,223,
+41,0,42,23,17,0,220,217,34,95,24,0,2,214,32,0,
+11,48,202,49,34,87,29,0,63,6,212,25,129,0,106,0,
+10,200,58,135,0,0,36,55,153,139,16,120,207,49,58,119,
+5,0,63,6,238,25,129,0,110,0,217,81,234,217,147,13,
+32,110,198,1,125,111,4,0,32,86,197,1,128,7,42,1,
+35,23,1,0,224,17,146,21,252,17,185,13,34,87,21,0,
+224,81,178,37,34,95,13,0,171,81,99,87,49,0,213,29,
+188,17,99,23,49,0,149,29,36,87,153,139,42,23,17,0,
+63,6,72,26,129,0,34,135,48,0,34,127,53,0,16,48,
+202,49,111,0,99,87,49,0,133,13,32,118,198,1,125,119,
+4,0,32,86,195,1,133,109,227,223,39,0,28,48,35,62,
+28,0,27,64,128,255,230,1,10,16,224,17,226,5,32,102,
+198,1,125,103,4,0,133,93,28,208,28,48,128,255,156,7,
+10,48,35,62,28,0,27,64,128,255,194,1,10,16,224,17,
+242,5,32,86,198,1,125,87,4,0,2,80,213,69,35,23,
+1,0,224,17,226,53,252,17,201,53,34,127,1,0,99,127,
+5,0,34,119,5,0,99,119,9,0,34,111,9,0,99,111,
+13,0,162,209,34,103,13,0,2,48,99,103,17,0,35,62,
+4,0,34,95,17,0,27,64,99,95,21,0,99,215,25,0,
+128,255,106,1,10,16,224,17,194,5,125,23,4,0,197,29,
+35,55,1,0,128,255,36,7,10,48,35,62,4,0,27,64,
+128,255,74,1,10,16,224,17,194,5,125,23,4,0,197,13,
+191,255,18,247,61,54,8,0,128,255,116,1,125,87,1,0,
+125,7,4,0,0,82,90,6,255,112,140,7,225,112,6,224,
+8,208,0,82,0,234,0,18,181,13,2,136,194,138,197,137,
+49,111,45,130,231,105,186,5,1,82,197,5,65,18,98,18,
+209,245,224,81,178,45,36,87,153,139,42,23,17,0,63,6,
+122,27,129,0,2,222,40,0,34,143,24,0,34,135,29,0,
+17,48,202,49,112,0,10,200,59,119,0,0,36,55,153,139,
+14,104,205,49,59,103,5,0,63,6,148,27,129,0,108,0,
+36,95,157,139,124,95,1,0,10,16,36,143,157,139,217,17,
+162,137,250,137,163,77,2,80,245,77,48,6,64,48,32,16,
+99,135,1,0,47,6,68,51,34,17,99,127,5,0,3,48,
+128,255,204,0,124,87,1,0,224,81,250,53,29,80,197,61,
+60,55,1,0,38,103,5,0,45,6,136,119,102,85,237,97,
+170,21,38,95,21,0,224,89,226,5,128,255,60,6,124,87,
+1,0,149,13,38,239,13,0,49,6,0,128,1,0,198,233,
+209,233,149,37,60,55,1,0,38,23,21,0,38,127,13,0,
+2,128,175,129,250,129,227,5,128,255,0,6,10,238,24,0,
+165,21,224,17,234,5,128,255,242,5,10,238,24,0,181,13,
+128,255,246,5,124,87,1,0,60,55,1,0,191,255,18,252,
+224,81,242,197,29,80,76,6,255,112,128,7,225,48,6,224,
+7,216,8,208,229,87,64,0,224,7,96,1,10,232,36,87,
+153,139,28,56,42,23,17,0,27,64,34,135,8,0,26,72,
+16,48,202,49,34,127,13,0,63,6,132,28,129,0,111,0,
+10,224,253,47,32,0,28,80,64,6,255,48,128,7,225,240,
+36,239,157,139,224,233,29,208,186,5,0,82,181,109,6,224,
+0,218,213,101,61,135,1,0,60,143,1,0,241,129,250,5,
+61,119,5,0,60,127,5,0,239,113,178,93,61,111,21,0,
+224,105,194,5,65,218,105,218,167,61,0,234,196,199,157,140,
+234,77,36,87,153,139,42,23,17,0,34,95,24,0,11,48,
+202,49,34,87,29,0,63,6,242,28,129,0,106,0,36,95,
+153,139,10,200,43,87,17,0,63,6,20,29,129,0,42,127,
+29,0,42,135,24,0,10,238,32,0,16,48,203,49,111,0,
+10,192,61,111,0,0,36,55,153,139,13,96,204,49,61,95,
+5,0,63,6,46,29,129,0,107,0,10,56,216,57,60,71,
+5,0,25,48,191,255,116,251,10,232,149,29,29,48,128,255,
+232,4,10,232,250,233,161,21,36,87,153,139,42,23,17,0,
+63,6,104,29,129,0,34,143,32,0,34,135,37,0,17,48,
+202,49,112,0,218,81,234,233,163,5,0,234,224,233,186,157,
+29,80,64,6,255,240,128,7,225,0,6,232,7,224,224,233,
+138,13,32,54,32,0,129,255,182,7,10,232,224,233,162,45,
+49,6,64,48,32,16,125,143,9,0,125,231,13,0,61,54,
+8,0,191,255,234,254,125,87,1,0,10,56,224,57,194,21,
+231,23,9,0,98,18,210,13,99,18,178,13,38,6,0,241,
+132,0,129,255,58,13,32,118,201,1,125,119,4,0,165,13,
+125,7,4,0,245,5,125,7,1,0,32,110,198,1,125,111,
+4,0,29,80,64,6,255,0,128,7,97,0,6,232,61,135,
+1,0,48,135,13,0,208,134,3,0,146,13,38,6,44,241,
+132,0,32,62,6,4,0,66,190,255,242,231,61,111,1,0,
+205,118,3,0,146,13,38,6,44,241,132,0,32,62,7,4,
+0,66,190,255,216,231,61,23,1,0,0,98,226,87,11,0,
+2,118,24,0,34,23,13,0,193,82,170,17,130,18,194,18,
+206,17,0,106,46,87,1,0,68,114,202,97,225,127,0,0,
+207,105,226,113,129,253,205,97,12,80,64,6,127,0,140,7,
+97,0,6,232,61,23,1,0,224,17,202,5,32,86,198,1,
+213,69,34,127,1,0,99,127,1,0,34,119,5,0,99,119,
+5,0,34,111,9,0,99,111,9,0,34,103,13,0,99,103,
+13,0,34,95,17,0,99,95,17,0,34,87,21,0,205,22,
+255,255,99,87,21,0,98,18,210,13,99,18,178,13,61,63,
+1,0,38,6,60,241,132,0,129,255,68,12,32,86,201,1,
+213,29,29,48,191,255,36,255,99,87,17,0,3,122,99,127,
+8,0,61,55,1,0,3,56,227,71,11,0,191,255,110,253,
+224,81,186,13,61,55,1,0,128,255,48,3,10,48,3,56,
+227,71,11,0,191,255,86,253,0,82,76,6,127,0,152,7,
+225,240,6,192,56,239,1,0,229,87,64,0,224,7,96,1,
+10,216,196,199,157,140,250,13,191,255,250,247,224,81,186,13,
+196,7,157,140,32,54,64,0,37,62,54,130,190,255,132,231,
+191,255,242,242,29,48,191,255,86,253,10,232,224,233,250,5,
+251,47,32,0,32,86,198,1,128,7,132,1,61,23,5,0,
+49,6,68,51,34,17,241,17,242,5,36,87,157,139,42,135,
+5,0,240,17,154,53,61,111,1,0,99,111,25,0,61,103,
+5,0,99,103,29,0,61,95,9,0,99,95,33,0,61,87,
+13,0,99,87,37,0,61,143,17,0,31,122,99,143,41,0,
+29,48,61,135,21,0,35,62,24,0,99,127,29,0,99,135,
+45,0,99,127,25,0,253,71,11,0,191,255,160,252,10,208,
+191,255,114,242,32,102,198,1,120,103,4,0,251,47,32,0,
+26,80,128,7,10,1,10,224,213,5,28,48,128,255,90,2,
+10,224,28,48,128,255,82,2,253,81,138,253,60,143,1,0,
+99,143,25,0,60,135,5,0,99,135,29,0,60,127,9,0,
+99,127,33,0,60,119,13,0,99,119,37,0,60,111,17,0,
+99,111,41,0,60,103,21,0,99,103,45,0,61,23,21,0,
+224,17,242,5,60,87,21,0,202,17,99,23,45,0,181,5,
+99,7,45,0,227,207,35,0,28,48,35,62,24,0,25,64,
+191,255,26,252,10,208,224,209,146,13,32,134,198,1,120,135,
+4,0,251,47,32,0,26,80,165,69,28,48,128,255,204,1,
+10,48,35,62,24,0,25,64,191,255,242,251,10,208,224,209,
+146,13,32,118,198,1,120,119,4,0,251,47,32,0,26,80,
+229,45,61,95,1,0,99,95,1,0,61,87,5,0,99,87,
+5,0,61,143,9,0,99,143,9,0,61,135,13,0,99,135,
+13,0,61,127,17,0,31,106,99,127,17,0,29,48,61,119,
+21,0,3,56,99,119,21,0,99,111,1,0,99,111,5,0,
+25,64,191,255,152,251,29,48,128,255,96,1,10,48,3,56,
+25,64,191,255,136,251,251,47,32,0,0,82,88,6,255,240,
+128,7,225,112,6,224,7,200,8,216,9,208,0,250,229,87,
+64,0,224,7,96,1,10,232,196,199,157,140,218,13,191,255,
+36,246,224,81,154,13,196,7,157,140,32,54,64,0,37,62,
+55,130,190,255,174,229,60,143,4,0,224,137,242,13,28,48,
+27,56,0,66,191,255,6,248,60,135,4,0,224,129,226,5,
+253,47,32,0,60,87,4,0,245,37,26,120,60,23,1,0,
+219,121,226,103,11,0,34,87,13,0,193,98,172,81,234,121,
+227,5,253,47,32,0,32,86,199,1,229,21,2,54,24,0,
+218,49,25,56,27,64,191,255,244,250,10,248,224,249,210,5,
+253,47,32,0,31,80,133,13,28,48,191,255,244,252,10,248,
+253,47,32,0,31,80,64,6,255,112,128,7,225,112,7,200,
+8,216,6,232,61,23,4,0,9,208,224,17,178,5,2,80,
+213,45,26,120,61,231,1,0,219,121,252,103,11,0,60,87,
+13,0,193,98,172,81,234,121,195,5,32,86,199,1,229,29,
+29,48,191,255,54,252,60,23,17,0,234,17,194,13,61,135,
+1,0,240,135,9,0,99,130,234,5,32,86,200,1,125,87,
+4,0,197,13,61,119,1,0,26,56,14,118,24,0,206,57,
+25,48,27,64,190,255,160,222,0,82,64,6,255,112,38,143,
+4,0,224,137,170,13,38,23,1,0,34,87,13,0,226,119,
+11,0,193,114,174,81,165,5,0,82,127,0,38,135,4,0,
+224,129,226,87,0,0,127,0,38,87,13,0,230,135,11,0,
+198,81,176,81,127,0,38,87,21,0,198,81,127,0,140,7,
+225,48,0,226,6,208,122,7,0,0,191,255,36,242,10,232,
+191,255,214,241,10,16,0,82,213,13,250,103,1,0,29,135,
+0,0,65,226,208,126,255,0,207,97,122,103,0,0,65,234,
+65,82,226,81,177,245,42,6,64,48,32,16,99,87,1,0,
+49,6,68,51,34,17,99,143,5,0,3,48,191,255,16,250,
+10,216,224,217,170,13,38,6,136,241,132,0,129,255,112,8,
+32,86,107,48,128,7,24,2,191,255,162,241,202,233,253,217,
+146,21,38,6,172,241,132,0,129,255,84,8,29,56,27,64,
+38,6,216,241,132,0,129,255,70,8,32,86,107,48,128,7,
+238,1,251,135,11,0,16,6,232,255,178,21,38,6,4,242,
+132,0,129,255,42,8,251,71,11,0,38,6,44,242,132,0,
+32,62,24,0,129,255,24,8,32,86,107,48,128,7,192,1,
+0,18,213,13,250,143,1,0,29,111,0,0,65,226,205,102,
+255,0,204,137,122,143,0,0,65,234,65,18,251,119,11,0,
+14,110,252,255,237,17,241,237,68,234,59,103,13,0,68,226,
+12,22,208,255,0,98,213,13,250,119,1,0,29,87,0,0,
+65,226,202,142,255,0,209,113,122,119,0,0,65,234,65,98,
+226,97,177,245,0,18,213,13,250,127,1,0,29,95,0,0,
+65,226,203,86,255,0,202,121,122,127,0,0,65,234,65,18,
+251,103,11,0,12,94,252,255,235,17,241,237,59,239,21,0,
+68,226,219,233,42,6,128,112,96,80,99,87,1,0,49,6,
+136,119,102,85,99,143,5,0,3,48,191,255,2,249,10,216,
+224,217,170,13,38,6,104,241,132,0,129,255,98,7,32,86,
+107,48,128,7,10,1,253,217,130,21,38,6,88,242,132,0,
+129,255,76,7,29,56,27,64,38,6,216,241,132,0,129,255,
+62,7,32,86,107,48,181,117,251,135,11,0,16,6,232,255,
+162,21,38,6,128,242,132,0,129,255,36,7,251,71,11,0,
+38,6,44,242,132,0,32,62,24,0,129,255,18,7,32,86,
+107,48,213,93,0,18,213,13,250,143,1,0,29,111,0,0,
+65,226,205,102,255,0,204,137,122,143,0,0,65,234,65,18,
+251,119,11,0,14,110,252,255,237,17,241,237,68,234,59,103,
+13,0,68,226,12,22,208,255,0,98,213,13,250,119,1,0,
+29,87,0,0,65,226,202,142,255,0,209,113,122,119,0,0,
+65,234,65,98,226,97,177,245,0,18,213,13,250,127,1,0,
+29,95,0,0,65,226,203,86,255,0,202,121,122,127,0,0,
+65,234,65,18,251,103,11,0,12,94,252,255,235,17,241,237,
+36,87,153,139,68,234,42,23,17,0,68,226,34,143,32,0,
+34,135,37,0,17,48,202,49,63,6,148,36,129,0,112,0,
+10,16,188,17,0,82,133,13,250,127,1,0,15,126,255,0,
+122,127,0,0,65,82,226,81,129,253,0,82,76,6,255,48,
 6,96,0,90,245,21,12,80,171,81,11,16,204,17,2,143,
-0,0,10,135,3,0,49,129,66,135,0,0,10,111,3,0,
-48,105,74,111,3,0,2,87,0,0,65,90,45,81,66,87,
-0,0,98,90,150,237,127,0,6,96,0,90,245,21,12,80,
-171,81,11,16,204,17,2,143,0,0,10,135,7,0,49,129,
-66,135,0,0,10,111,7,0,48,105,74,111,7,0,2,87,
-0,0,65,90,45,81,66,87,0,0,100,90,150,237,127,0,
+0,0,10,135,1,0,49,129,66,135,0,0,10,111,1,0,
+48,105,74,111,1,0,2,87,0,0,65,90,45,81,66,87,
+0,0,97,90,150,237,127,0,6,96,0,90,245,21,12,80,
+171,81,11,16,204,17,2,143,0,0,10,135,3,0,49,129,
+66,135,0,0,10,111,3,0,48,105,74,111,3,0,2,87,
+0,0,65,90,45,81,66,87,0,0,98,90,150,237,127,0,
 6,96,0,90,245,21,12,80,171,81,11,16,204,17,2,143,
-0,0,10,135,3,0,49,129,66,135,0,0,10,111,3,0,
-48,105,74,111,3,0,2,87,0,0,65,90,45,81,66,87,
-0,0,98,90,150,237,127,0,34,6,220,193,142,0,8,138,
-98,143,1,0,32,134,20,0,98,135,5,0,47,6,64,118,
-133,0,98,127,9,0,41,6,196,193,142,0,105,7,1,0,
-2,90,42,6,208,193,142,0,32,118,28,0,106,119,1,0,
-12,106,106,111,5,0,44,6,88,118,133,0,106,103,9,0,
-105,95,5,0,42,6,140,117,133,0,105,87,9,0,127,0,
-0,82,127,0,0,82,127,0,192,25,0,82,127,0,128,7,
-193,16,6,232,61,231,17,0,61,223,17,0,27,87,0,0,
-157,95,25,0,1,18,235,23,192,0,2,232,10,233,92,239,
-0,0,64,6,223,16,128,7,193,16,6,232,61,231,17,0,
+0,0,10,135,7,0,49,129,66,135,0,0,10,111,7,0,
+48,105,74,111,7,0,2,87,0,0,65,90,45,81,66,87,
+0,0,100,90,150,237,127,0,6,96,0,90,245,21,12,80,
+171,81,11,16,204,17,2,143,0,0,10,135,3,0,49,129,
+66,135,0,0,10,111,3,0,48,105,74,111,3,0,2,87,
+0,0,65,90,45,81,66,87,0,0,98,90,150,237,127,0,
+34,6,60,205,142,0,8,138,98,143,1,0,32,134,20,0,
+98,135,5,0,47,6,160,129,133,0,98,127,9,0,41,6,
+36,205,142,0,105,7,1,0,2,90,42,6,48,205,142,0,
+32,118,28,0,106,119,1,0,12,106,106,111,5,0,44,6,
+184,129,133,0,106,103,9,0,105,95,5,0,42,6,236,128,
+133,0,105,87,9,0,127,0,0,82,127,0,0,82,127,0,
+192,25,0,82,127,0,128,7,193,16,6,232,61,231,17,0,
 61,223,17,0,27,87,0,0,157,95,25,0,1,18,235,23,
-192,0,34,16,2,232,74,233,92,239,0,0,64,6,223,16,
-128,7,193,16,6,232,61,223,5,0,61,231,5,0,28,87,
-0,0,157,95,13,0,1,18,235,23,192,0,2,224,10,225,
-91,231,0,0,60,6,64,13,3,0,61,223,9,0,27,87,
-0,0,157,95,13,0,1,18,235,23,192,0,74,17,224,17,
-202,5,95,226,224,225,170,245,64,6,223,16,128,7,225,0,
-6,248,63,231,5,0,63,239,5,0,29,87,0,0,159,95,
-13,0,1,18,235,23,192,0,34,16,2,232,74,233,92,239,
-0,0,31,48,191,255,58,255,64,6,255,0,128,7,193,0,
-6,232,61,231,21,0,28,87,0,0,10,88,157,103,25,0,
-1,18,236,23,192,0,75,17,224,17,239,23,0,0,130,0,
-2,80,64,6,223,0,128,7,97,0,6,232,29,48,191,255,
-0,255,29,48,191,255,76,255,2,50,128,255,68,158,29,48,
-191,255,22,255,2,50,128,255,56,158,29,48,191,255,128,255,
-2,50,128,255,44,158,64,6,127,0,128,7,97,0,6,232,
-29,48,191,255,244,254,29,48,191,255,24,255,2,50,128,255,
-16,158,29,48,191,255,186,254,2,50,128,255,4,158,29,48,
-191,255,76,255,2,50,128,255,248,157,64,6,127,0,128,7,
-225,241,6,232,7,216,8,208,9,224,156,0,35,207,33,0,
-35,199,37,0,131,191,41,0,224,233,154,13,32,54,28,0,
-128,255,44,251,10,16,2,232,224,233,226,37,49,6,188,117,
-133,0,125,143,1,0,48,6,228,117,133,0,125,135,1,0,
-125,223,17,0,125,215,21,0,93,231,24,0,125,207,5,0,
-125,199,9,0,93,191,12,0,29,48,191,255,68,254,29,48,
-191,255,144,254,29,48,191,255,100,255,29,48,191,255,94,255,
-29,48,191,255,88,255,29,16,2,80,64,6,255,241,128,7,
-97,0,6,232,29,48,191,255,64,254,29,48,191,255,100,254,
-2,50,128,255,92,157,29,48,191,255,164,254,2,50,128,255,
-80,157,64,6,127,0,128,7,225,16,6,232,29,48,191,255,
-66,254,60,6,128,132,30,0,2,50,128,255,52,157,29,48,
-191,255,172,254,10,216,213,5,29,48,191,255,162,254,10,216,
-27,136,224,137,170,5,197,5,95,226,224,225,234,245,29,48,
-191,255,92,254,27,128,16,16,130,0,2,80,64,6,255,16,
-128,7,225,16,6,216,0,234,0,226,193,234,157,0,27,48,
-191,255,240,253,2,50,128,255,232,156,27,48,191,255,96,254,
-10,16,2,233,157,0,27,48,191,255,36,254,2,50,128,255,
-208,156,65,226,104,226,166,237,29,136,17,16,130,0,2,80,
-64,6,255,16,128,7,225,16,6,224,7,216,155,0,32,238,
-128,0,27,136,29,128,81,129,224,129,210,5,28,48,191,255,
-80,253,197,5,28,48,191,255,112,253,28,48,191,255,148,253,
-2,50,128,255,140,156,28,48,191,255,212,253,2,50,128,255,
-128,156,161,234,224,233,239,229,64,6,255,16,128,7,225,112,
-6,224,7,232,157,0,9,216,8,200,193,234,157,0,157,238,
-1,0,28,48,191,255,2,254,28,48,29,136,17,56,191,255,
-150,255,28,48,191,255,2,255,224,81,242,5,28,48,191,255,
-28,254,32,22,64,2,245,29,0,234,197,13,29,208,217,209,
-28,48,191,255,46,255,90,87,0,0,28,48,191,255,178,254,
-65,234,27,134,255,255,240,233,166,245,27,22,255,255,2,232,
-217,233,28,48,191,255,12,255,93,87,0,0,28,48,191,255,
-220,253,0,18,2,80,64,6,255,112,128,7,225,48,6,232,
-7,224,156,0,8,216,155,0,9,208,193,226,156,0,29,48,
-191,255,134,253,29,48,28,136,17,56,191,255,26,255,29,48,
-191,255,134,254,224,81,242,5,29,48,191,255,160,253,32,22,
-64,2,245,45,29,48,27,128,16,56,191,255,250,254,29,48,
-191,255,102,254,224,81,242,5,29,48,191,255,128,253,32,22,
-65,2,245,29,156,230,1,0,29,48,191,255,60,253,29,48,
-28,120,15,56,191,255,208,254,29,48,191,255,60,254,224,81,
-242,5,29,48,191,255,86,253,32,22,65,2,165,13,29,48,
-191,255,112,254,90,87,0,0,29,48,191,255,64,253,0,18,
-2,80,64,6,255,48,128,7,225,48,6,232,7,224,156,0,
-8,216,155,0,9,208,154,0,193,226,156,0,29,48,191,255,
-232,252,29,48,28,136,17,56,191,255,124,254,29,48,191,255,
-232,253,224,81,242,5,29,48,191,255,2,253,32,22,64,2,
-213,37,29,48,27,128,16,56,191,255,92,254,29,48,191,255,
-200,253,224,81,242,5,29,48,191,255,226,252,32,22,65,2,
-213,21,29,48,26,120,15,56,191,255,60,254,29,48,191,255,
-168,253,224,81,242,5,29,48,191,255,194,252,32,22,65,2,
-213,5,29,48,191,255,182,252,0,18,2,80,64,6,255,48,
-128,7,225,48,6,216,7,232,157,0,8,80,138,0,9,16,
-35,215,21,0,2,224,59,23,1,0,72,18,34,135,0,0,
-16,136,219,137,17,48,29,120,15,56,10,112,14,64,28,72,
-34,111,5,0,63,6,172,36,129,0,109,0,10,16,2,88,
-224,89,218,13,27,48,29,96,12,56,28,94,1,0,11,64,
-26,86,255,255,10,72,191,255,6,254,10,16,2,80,64,6,
-255,48,128,7,225,112,6,232,7,224,156,0,8,208,154,0,
-35,223,25,0,9,200,193,226,156,0,29,48,191,255,250,251,
-29,48,28,136,17,56,191,255,142,253,29,48,191,255,250,252,
-224,81,242,5,29,48,191,255,20,252,32,22,64,2,197,61,
-29,48,26,128,16,56,191,255,110,253,29,48,191,255,218,252,
-224,81,242,5,29,48,191,255,244,251,32,22,65,2,197,45,
-0,226,213,21,29,48,28,120,217,121,143,119,1,0,14,56,
-191,255,68,253,29,48,191,255,176,252,224,81,242,5,29,48,
-191,255,202,251,32,22,64,2,245,21,65,226,27,110,255,255,
-237,225,150,237,29,48,27,102,255,255,12,88,217,89,139,87,
-1,0,10,56,191,255,16,253,29,48,191,255,124,252,29,48,
-191,255,154,251,0,18,2,80,64,6,255,112,128,7,33,0,
-32,54,68,177,31,58,190,255,210,224,10,16,224,17,154,253,
-64,6,63,0,128,7,33,0,32,54,68,177,190,255,136,231,
-10,16,224,17,162,13,38,6,88,240,132,0,32,62,183,1,
-0,66,190,255,60,224,224,81,64,6,63,0,130,7,225,48,
-6,232,7,224,156,0,8,216,155,0,9,208,29,48,191,255,
-174,255,29,48,28,136,17,56,27,128,16,64,26,72,1,122,
-99,127,1,0,128,255,74,1,10,224,29,48,191,255,168,255,
-28,16,2,80,66,6,255,48,132,7,225,16,6,232,7,224,
-156,0,8,216,155,0,67,79,7,0,29,48,191,255,112,255,
-29,48,28,136,17,56,27,128,16,64,99,7,1,0,35,78,
-7,0,128,255,12,1,10,224,29,48,191,255,106,255,28,16,
-2,80,68,6,255,16,128,7,225,240,6,208,7,224,156,0,
-8,216,155,0,9,16,35,199,29,0,2,200,0,234,133,37,
-58,23,1,0,72,18,34,135,0,0,16,136,218,137,17,48,
-28,120,15,56,27,112,29,104,206,105,13,96,140,0,12,88,
-11,64,29,80,217,81,10,72,34,143,5,0,63,6,148,38,
-129,0,113,0,10,16,2,88,224,89,202,5,65,234,248,233,
-134,229,2,80,64,6,255,240,128,7,225,240,6,208,7,224,
-156,0,8,216,155,0,9,16,35,199,29,0,2,200,0,234,
-181,37,58,23,1,0,2,22,16,0,34,135,0,0,16,136,
-218,137,17,48,28,120,15,56,27,112,29,104,206,105,13,96,
-140,0,12,88,11,64,29,80,217,81,138,143,1,0,17,72,
-34,135,5,0,63,6,252,38,129,0,112,0,10,16,2,88,
-224,89,202,5,65,234,248,233,214,221,2,80,64,6,255,240,
-128,7,33,0,32,54,236,176,64,62,4,0,0,66,191,255,
-84,23,64,142,32,0,241,143,111,0,100,143,180,139,228,23,
-181,139,64,14,32,0,97,23,110,0,64,6,63,0,132,7,
-225,112,7,224,156,0,8,216,155,0,9,200,131,215,33,0,
-0,234,64,142,32,0,241,143,111,0,100,143,180,139,197,85,
-196,255,181,139,194,5,32,22,65,2,165,85,27,128,16,120,
-15,112,200,114,28,104,13,96,193,98,12,88,14,89,26,80,
-10,136,11,137,17,128,208,0,16,16,64,14,32,0,97,23,
-108,0,26,120,224,121,138,13,153,119,1,0,14,16,64,14,
-32,0,97,23,106,0,196,191,180,139,196,55,180,139,196,47,
-180,139,228,23,181,139,64,14,32,0,97,23,110,0,35,78,
-4,0,31,106,99,111,1,0,32,54,236,176,64,62,4,0,
-1,66,190,255,90,229,196,215,180,139,178,5,65,234,197,21,
-196,207,180,139,194,5,32,22,65,2,165,21,26,96,97,98,
-154,13,64,94,32,0,235,95,107,0,11,80,138,0,89,87,
-0,0,0,18,213,5,99,234,198,173,32,22,65,2,2,80,
-68,6,255,112,128,7,97,0,6,232,128,255,152,228,224,81,
-146,13,38,6,196,240,132,0,32,62,81,0,0,66,190,255,
-208,221,1,138,100,239,197,139,125,143,45,0,64,6,127,0,
-128,7,97,0,6,232,61,143,45,0,97,138,138,45,61,63,
-5,0,29,64,38,6,208,240,132,0,128,255,2,250,29,48,
-128,255,190,228,224,81,146,13,38,6,232,240,132,0,32,62,
-115,0,0,66,190,255,138,221,61,71,17,0,61,63,5,0,
-29,48,128,255,48,228,224,81,162,13,38,6,232,240,132,0,
-32,62,120,0,0,66,190,255,104,221,224,81,64,6,127,0,
-128,7,225,0,36,239,197,139,6,224,224,233,210,21,61,143,
-9,0,0,50,224,137,226,5,61,135,13,0,252,129,170,5,
-29,48,61,239,37,0,224,49,178,5,191,255,118,255,36,127,
-197,139,239,233,218,237,64,6,255,0,128,7,97,0,102,71,
-33,0,6,232,128,255,152,209,224,81,146,13,38,6,244,240,
-132,0,32,62,201,0,0,66,190,255,6,221,1,138,100,239,
-201,139,125,143,29,0,64,6,127,0,128,7,97,0,6,232,
-61,143,29,0,97,138,138,45,61,63,5,0,29,64,38,6,
-0,241,132,0,128,255,56,249,29,48,128,255,186,209,224,81,
-146,13,38,6,24,241,132,0,32,62,238,0,0,66,190,255,
-192,220,61,71,33,0,61,63,5,0,29,48,128,255,48,209,
-224,81,162,13,38,6,24,241,132,0,32,62,243,0,0,66,
-190,255,158,220,224,81,64,6,127,0,128,7,97,0,36,239,
-201,139,224,233,178,21,61,135,9,0,61,143,33,0,0,50,
-241,129,162,5,29,48,61,239,21,0,224,49,178,5,191,255,
-124,255,36,127,201,139,239,233,250,237,64,6,127,0,128,7,
-33,0,128,255,8,0,64,6,63,0,128,7,33,0,36,143,
-205,139,224,137,218,13,128,255,244,0,34,6,52,60,2,0,
-234,23,32,2,32,86,232,3,74,16,100,23,205,139,36,23,
-205,139,224,17,194,21,128,254,255,255,245,17,231,5,64,86,
-0,0,106,255,98,245,229,5,2,248,64,86,0,0,106,255,
-98,245,36,135,205,139,191,129,100,135,205,139,64,6,63,0,
-128,7,33,0,48,6,52,60,2,0,230,135,32,2,32,110,
-232,3,77,128,100,135,205,139,191,255,146,255,64,86,0,0,
-43,6,115,0,0,0,74,95,100,245,64,6,63,0,134,7,
-97,0,32,143,13,177,6,232,224,137,242,29,224,233,194,53,
-61,95,5,0,224,89,242,13,61,87,9,0,99,95,9,0,
-99,87,5,0,11,16,165,5,72,18,234,17,234,253,11,48,
-128,255,28,242,125,7,5,0,125,7,9,0,125,7,13,0,
-29,48,128,255,10,242,133,29,61,23,5,0,96,239,13,177,
-99,23,1,0,2,255,0,0,100,23,209,139,197,250,64,86,
-0,0,74,255,8,240,36,55,209,139,38,55,5,0,224,49,
-178,5,191,255,94,255,70,6,127,0,136,7,65,0,36,143,
-209,139,32,23,13,177,17,134,8,0,99,143,1,0,99,143,
-5,0,100,135,209,139,34,87,9,0,99,87,9,0,234,129,
-250,5,34,23,5,0,100,23,209,139,99,23,13,0,36,23,
-209,139,2,239,0,0,197,234,64,86,0,0,74,239,8,240,
-36,87,209,139,42,87,5,0,72,6,95,0,127,0,132,7,
-68,55,172,133,127,0,128,7,225,240,7,192,6,224,60,55,
-5,0,8,200,128,255,76,241,10,216,27,48,60,71,5,0,
-0,58,190,255,196,214,58,6,36,144,145,0,36,63,213,139,
-26,55,12,0,128,255,14,27,60,111,1,0,27,238,1,0,
-224,81,178,5,13,110,128,0,93,111,255,255,25,64,60,95,
-5,0,65,234,94,90,93,95,255,255,29,56,58,23,49,0,
-36,79,213,139,72,18,34,55,0,0,34,87,5,0,218,49,
-63,6,120,43,129,0,106,0,224,81,234,5,27,48,128,255,
-254,240,31,82,181,21,24,48,60,23,5,0,27,56,226,201,
-222,5,25,64,190,255,244,212,197,5,2,64,190,255,236,212,
-27,48,128,255,218,240,60,87,5,0,64,6,255,240,128,7,
-225,0,6,224,60,127,5,0,7,143,1,0,15,134,254,255,
-240,137,178,5,0,82,197,69,7,119,0,0,206,110,192,0,
-178,5,0,82,213,61,61,6,36,144,145,0,61,95,5,0,
-8,102,254,255,235,97,190,5,0,82,165,53,61,23,49,0,
-7,86,2,0,2,22,16,0,34,55,0,0,10,56,221,49,
-36,79,213,139,1,66,34,143,5,0,63,6,18,44,129,0,
-113,0,10,16,224,17,199,29,0,18,36,63,213,139,61,134,
-29,0,199,129,144,119,1,0,224,113,146,13,61,110,13,0,
-199,105,141,95,1,0,224,89,170,5,1,18,130,0,224,17,
-210,5,29,55,12,0,128,255,20,25,60,87,5,0,64,6,
-255,0,128,7,225,0,7,232,6,224,29,48,60,71,5,0,
-0,58,190,255,132,213,60,135,1,0,65,234,208,134,127,0,
-93,135,255,255,60,111,5,0,65,234,94,106,93,111,255,255,
-8,98,65,234,93,103,255,255,60,87,5,0,64,6,255,0,
-38,87,5,0,127,0,130,7,225,0,9,232,128,255,244,63,
-10,224,224,81,231,5,29,56,35,54,3,0,190,255,112,226,
-28,80,66,6,255,0,132,7,225,48,7,216,8,208,9,224,
-6,232,1,138,99,143,5,0,31,50,190,255,150,217,29,48,
-27,56,26,64,28,72,128,255,186,63,10,232,224,233,191,13,
-35,135,5,0,224,129,210,5,99,7,5,0,190,255,108,217,
-29,80,245,13,28,56,35,54,3,0,190,255,90,224,35,127,
-5,0,224,121,210,5,99,7,5,0,190,255,78,217,29,80,
-68,6,255,48,130,7,225,0,9,232,128,255,118,63,10,224,
-224,81,231,5,29,56,35,54,3,0,128,255,94,112,28,80,
-66,6,255,0,130,7,225,0,9,232,128,255,86,63,10,224,
-224,81,231,5,29,56,35,54,3,0,190,255,224,225,28,80,
-66,6,255,0,128,7,225,0,6,232,61,23,1,0,253,143,
-19,0,209,17,125,23,1,0,162,127,1,0,130,111,1,0,
-200,122,15,105,125,111,13,0,130,95,3,0,144,106,93,95,
-16,0,153,29,162,143,5,0,200,138,130,127,5,0,17,121,
-125,127,18,0,2,110,6,0,61,103,13,0,125,111,5,0,
-204,102,255,63,125,103,13,0,2,94,3,0,125,95,9,0,
-8,18,165,13,162,87,3,0,125,87,18,0,125,7,5,0,
-125,7,9,0,4,18,61,135,1,0,253,127,19,0,194,129,
-125,135,1,0,39,111,1,0,207,17,162,105,103,111,1,0,
-204,5,32,86,209,1,181,21,29,48,128,255,38,0,10,224,
-224,225,194,13,61,63,13,0,157,71,17,0,253,79,19,0,
-38,6,36,241,132,0,128,255,86,244,28,80,64,6,255,0,
-34,6,220,118,133,0,181,53,230,143,13,0,130,127,3,0,
-47,112,81,113,34,87,0,0,206,0,234,113,250,37,34,103,
-5,0,213,29,44,95,0,0,134,87,17,0,235,81,234,21,
-2,127,2,0,38,135,13,0,2,87,3,0,80,121,143,0,
-234,121,195,5,32,86,11,1,133,29,102,23,21,0,44,23,
-5,0,0,82,102,23,25,0,133,21,72,98,34,135,9,0,
-240,97,145,229,32,86,12,1,133,13,76,18,36,127,165,133,
-239,17,177,205,32,86,11,1,127,0,128,7,225,16,6,232,
-61,23,9,0,224,17,146,13,2,143,0,0,209,134,3,0,
-194,5,32,86,208,1,245,53,61,223,25,0,59,231,49,0,
-29,48,72,226,128,255,238,0,60,23,0,0,61,63,1,0,
-219,17,2,48,253,111,19,0,13,64,10,72,60,103,5,0,
-63,6,216,46,129,0,108,0,61,23,5,0,224,17,162,29,
-65,18,66,87,255,255,136,82,66,87,0,0,61,95,9,0,
-224,89,130,21,61,103,25,0,12,103,12,0,0,18,97,98,
-198,5,101,98,174,5,1,18,130,0,224,17,178,5,203,63,
-0,0,0,82,64,6,255,16,128,7,225,16,38,223,25,0,
-59,231,49,0,6,232,28,230,16,0,128,255,120,0,60,23,
-0,0,61,63,1,0,219,17,2,48,253,143,19,0,17,64,
-10,72,60,135,5,0,63,6,78,47,129,0,112,0,10,16,
-32,86,15,1,253,127,19,0,239,17,170,5,0,82,10,224,
-224,17,186,5,32,230,210,1,61,87,5,0,224,81,162,13,
-224,17,174,5,128,17,65,82,74,23,255,255,168,18,74,23,
-0,0,224,225,194,13,61,63,13,0,157,71,17,0,253,79,
-19,0,38,6,184,243,132,0,128,255,196,242,28,80,64,6,
-255,16,38,23,29,0,224,17,158,13,38,135,21,0,38,23,
-13,0,16,135,2,0,80,17,130,0,2,80,127,0,166,0,
-34,6,220,118,133,0,165,29,34,87,5,0,165,21,42,95,
-5,0,11,135,12,0,240,49,186,13,43,126,13,0,199,121,
-79,7,0,0,43,110,29,0,199,105,77,7,0,0,72,82,
-34,95,9,0,235,81,193,237,76,18,36,87,165,133,234,17,
-193,229,127,0,128,7,97,0,7,232,224,49,138,13,32,54,
-32,0,128,255,138,236,10,48,224,49,130,21,102,7,1,0,
-102,7,9,0,102,7,18,0,102,7,21,0,49,6,104,138,
-145,0,102,143,25,0,102,239,29,0,6,80,64,6,127,0,
-102,63,1,0,102,71,18,0,127,0,128,7,33,0,38,143,
-1,0,230,87,19,0,10,16,209,17,10,126,5,0,207,137,
-102,143,1,0,130,95,1,0,162,111,1,0,200,106,13,89,
-102,95,13,0,130,143,3,0,70,143,16,0,162,119,3,0,
-130,135,5,0,200,130,16,113,102,7,5,0,102,119,18,0,
-191,255,128,253,64,6,63,0,38,135,1,0,199,129,102,135,
-1,0,127,0,128,7,225,112,7,200,8,216,38,143,1,0,
-187,0,17,214,251,255,38,231,25,0,6,232,191,255,230,254,
-28,127,12,0,0,18,239,217,154,13,60,110,29,0,205,81,
-138,103,1,0,224,97,162,5,1,18,130,0,224,17,130,29,
-29,48,191,255,192,254,10,16,60,142,29,0,194,137,0,82,
-145,127,1,0,224,121,146,13,60,110,13,0,205,17,130,103,
-1,0,224,97,170,5,1,82,138,0,224,81,178,5,0,82,
-213,13,25,48,26,56,253,143,19,0,17,70,5,0,190,255,
-106,207,253,127,19,0,15,86,5,0,64,6,255,112,134,7,
-225,243,6,232,67,63,3,0,99,71,9,0,0,202,0,194,
-60,6,220,118,133,0,128,7,12,1,60,215,5,0,213,125,
-61,23,29,0,224,17,254,5,28,159,3,0,0,218,99,159,
-5,0,229,109,2,216,99,23,5,0,165,109,58,79,5,0,
-3,143,3,0,9,16,2,135,12,0,0,82,240,137,154,13,
-34,118,29,0,219,113,142,103,1,0,224,97,162,5,1,82,
-138,0,224,81,194,85,27,80,0,90,34,142,29,0,202,137,
-145,127,1,0,224,121,146,13,34,110,13,0,205,81,138,103,
-1,0,224,97,170,5,1,90,139,0,224,89,130,69,125,231,
-21,0,41,191,5,0,125,79,25,0,23,182,5,0,253,143,
-19,0,246,137,190,13,61,63,13,0,157,71,17,0,38,6,
-232,243,132,0,128,255,120,240,165,45,61,23,1,0,60,103,
-0,0,2,118,5,0,2,126,3,0,27,97,125,127,5,0,
-125,119,1,0,125,103,13,0,66,103,0,0,61,143,13,0,
-136,138,66,143,1,0,58,87,0,0,66,87,2,0,29,48,
-191,255,106,252,61,127,1,0,253,111,19,0,215,121,125,127,
-1,0,182,105,125,111,18,0,214,201,65,194,65,218,35,151,
-5,0,242,217,195,149,72,210,60,103,9,0,236,209,145,133,
-76,226,36,95,165,133,235,225,185,5,191,7,240,254,35,151,
-9,0,50,87,0,0,216,81,114,87,0,0,25,80,70,6,
-255,243,128,7,225,0,6,232,61,135,1,0,253,143,19,0,
-209,129,125,135,1,0,176,127,1,0,144,111,1,0,200,122,
-15,105,205,94,255,63,125,95,13,0,144,87,3,0,93,87,
-16,0,125,7,5,0,67,130,125,135,9,0,224,81,138,53,
-61,127,33,0,125,7,18,0,224,121,218,13,29,48,128,255,
-76,1,10,224,61,63,13,0,38,6,28,244,132,0,128,255,
-142,239,229,5,15,118,8,0,125,119,33,0,0,226,61,23,
-33,0,61,95,21,0,34,87,5,0,43,95,9,0,125,87,
-25,0,2,110,8,0,34,87,0,0,235,105,93,87,16,0,
-193,45,4,82,125,87,18,0,125,7,33,0,229,37,4,138,
-125,143,18,0,125,7,33,0,39,127,1,0,209,134,255,255,
-176,121,103,127,1,0,204,5,32,86,209,1,197,37,29,48,
-191,255,224,250,10,224,224,225,138,21,61,87,25,0,10,87,
-12,0,0,18,97,82,198,5,101,82,174,5,1,18,130,0,
-224,17,186,5,32,230,211,1,61,63,13,0,157,71,17,0,
-61,79,9,0,38,6,80,244,132,0,137,79,1,0,128,255,
-238,238,28,80,64,6,255,0,128,7,97,0,38,239,25,0,
-29,87,12,0,0,18,97,82,198,5,101,82,174,5,1,18,
-130,0,224,17,186,5,0,82,149,53,38,23,9,0,130,23,
-1,0,224,17,194,5,98,18,130,29,197,37,191,255,246,251,
-10,16,61,102,13,0,194,97,140,87,1,0,224,81,210,29,
-61,142,13,0,194,137,81,7,0,0,61,118,29,0,206,17,
-1,106,66,111,0,0,149,21,191,255,202,251,61,102,13,0,
-202,97,76,7,0,0,61,142,29,0,209,81,74,7,0,0,
-197,5,32,86,208,1,165,5,0,82,64,6,127,0,230,143,
-19,0,224,137,234,87,0,0,127,0,34,6,220,118,133,0,
-213,21,230,143,13,0,130,127,3,0,47,112,81,113,34,87,
-0,0,206,0,234,113,154,13,34,135,5,0,102,23,21,0,
-102,135,33,0,0,82,133,13,76,18,36,127,165,133,239,17,
-145,237,32,86,11,1,127,0,128,7,225,16,6,232,7,216,
-187,0,8,224,224,233,138,13,32,54,56,0,128,255,64,232,
-10,232,224,233,146,61,49,6,24,124,133,0,125,143,53,0,
-61,54,8,0,28,56,191,255,142,251,93,223,40,0,32,54,
-208,7,128,255,222,231,10,224,224,225,154,13,38,6,132,244,
-132,0,32,62,10,6,0,66,190,255,102,209,28,48,0,58,
-32,70,208,7,190,255,66,205,125,231,1,0,28,62,8,0,
-125,63,5,0,61,54,8,0,32,70,200,7,191,255,132,251,
-1,122,93,127,48,0,224,217,242,5,61,23,1,0,32,86,
-34,34,98,87,0,0,29,80,64,6,255,16,128,7,225,16,
-6,232,7,224,8,216,224,233,138,13,32,54,56,0,128,255,
-174,231,10,232,224,233,130,29,49,6,24,124,133,0,125,143,
-53,0,61,54,8,0,27,56,191,255,252,250,93,7,48,0,
+192,0,2,232,10,233,92,239,0,0,64,6,223,16,128,7,
+193,16,6,232,61,231,17,0,61,223,17,0,27,87,0,0,
+157,95,25,0,1,18,235,23,192,0,34,16,2,232,74,233,
+92,239,0,0,64,6,223,16,128,7,193,16,6,232,61,223,
+5,0,61,231,5,0,28,87,0,0,157,95,13,0,1,18,
+235,23,192,0,2,224,10,225,91,231,0,0,60,6,64,13,
+3,0,61,223,9,0,27,87,0,0,157,95,13,0,1,18,
+235,23,192,0,74,17,224,17,202,5,95,226,224,225,170,245,
+64,6,223,16,128,7,225,0,6,248,63,231,5,0,63,239,
+5,0,29,87,0,0,159,95,13,0,1,18,235,23,192,0,
+34,16,2,232,74,233,92,239,0,0,31,48,191,255,58,255,
+64,6,255,0,128,7,193,0,6,232,61,231,21,0,28,87,
+0,0,10,88,157,103,25,0,1,18,236,23,192,0,75,17,
+224,17,239,23,0,0,130,0,2,80,64,6,223,0,128,7,
+97,0,6,232,29,48,191,255,0,255,29,48,191,255,76,255,
+2,50,128,255,218,160,29,48,191,255,22,255,2,50,128,255,
+206,160,29,48,191,255,128,255,2,50,128,255,194,160,64,6,
+127,0,128,7,97,0,6,232,29,48,191,255,244,254,29,48,
+191,255,24,255,2,50,128,255,166,160,29,48,191,255,186,254,
+2,50,128,255,154,160,29,48,191,255,76,255,2,50,128,255,
+142,160,64,6,127,0,128,7,225,241,6,232,7,216,8,208,
+9,224,156,0,35,207,33,0,35,199,37,0,131,191,41,0,
+224,233,154,13,32,54,28,0,128,255,196,253,10,16,2,232,
+224,233,226,37,49,6,28,129,133,0,125,143,1,0,48,6,
+68,129,133,0,125,135,1,0,125,223,17,0,125,215,21,0,
+93,231,24,0,125,207,5,0,125,199,9,0,93,191,12,0,
+29,48,191,255,68,254,29,48,191,255,144,254,29,48,191,255,
+100,255,29,48,191,255,94,255,29,48,191,255,88,255,29,16,
+2,80,64,6,255,241,128,7,97,0,6,232,29,48,191,255,
+64,254,29,48,191,255,100,254,2,50,128,255,242,159,29,48,
+191,255,164,254,2,50,128,255,230,159,64,6,127,0,128,7,
+225,16,6,232,29,48,191,255,66,254,60,6,128,132,30,0,
+2,50,128,255,202,159,29,48,191,255,172,254,10,216,213,5,
+29,48,191,255,162,254,10,216,27,136,224,137,170,5,197,5,
+95,226,224,225,234,245,29,48,191,255,92,254,27,128,16,16,
+130,0,2,80,64,6,255,16,128,7,225,16,6,216,0,234,
+0,226,193,234,157,0,27,48,191,255,240,253,2,50,128,255,
+126,159,27,48,191,255,96,254,10,16,2,233,157,0,27,48,
+191,255,36,254,2,50,128,255,102,159,65,226,104,226,166,237,
+29,136,17,16,130,0,2,80,64,6,255,16,128,7,225,16,
+6,224,7,216,155,0,32,238,128,0,27,136,29,128,81,129,
+224,129,210,5,28,48,191,255,80,253,197,5,28,48,191,255,
+112,253,28,48,191,255,148,253,2,50,128,255,34,159,28,48,
+191,255,212,253,2,50,128,255,22,159,161,234,224,233,239,229,
+64,6,255,16,128,7,225,112,6,224,7,232,157,0,9,216,
+8,200,193,234,157,0,157,238,1,0,28,48,191,255,2,254,
+28,48,29,136,17,56,191,255,150,255,28,48,191,255,2,255,
+224,81,242,5,28,48,191,255,28,254,32,22,64,2,245,29,
+0,234,197,13,29,208,217,209,28,48,191,255,46,255,90,87,
+0,0,28,48,191,255,178,254,65,234,27,134,255,255,240,233,
+166,245,27,22,255,255,2,232,217,233,28,48,191,255,12,255,
+93,87,0,0,28,48,191,255,220,253,0,18,2,80,64,6,
+255,112,128,7,225,48,6,232,7,224,156,0,8,216,155,0,
+9,208,193,226,156,0,29,48,191,255,134,253,29,48,28,136,
+17,56,191,255,26,255,29,48,191,255,134,254,224,81,242,5,
+29,48,191,255,160,253,32,22,64,2,245,45,29,48,27,128,
+16,56,191,255,250,254,29,48,191,255,102,254,224,81,242,5,
+29,48,191,255,128,253,32,22,65,2,245,29,156,230,1,0,
+29,48,191,255,60,253,29,48,28,120,15,56,191,255,208,254,
+29,48,191,255,60,254,224,81,242,5,29,48,191,255,86,253,
+32,22,65,2,165,13,29,48,191,255,112,254,90,87,0,0,
+29,48,191,255,64,253,0,18,2,80,64,6,255,48,128,7,
+225,48,6,232,7,224,156,0,8,216,155,0,9,208,154,0,
+193,226,156,0,29,48,191,255,232,252,29,48,28,136,17,56,
+191,255,124,254,29,48,191,255,232,253,224,81,242,5,29,48,
+191,255,2,253,32,22,64,2,213,37,29,48,27,128,16,56,
+191,255,92,254,29,48,191,255,200,253,224,81,242,5,29,48,
+191,255,226,252,32,22,65,2,213,21,29,48,26,120,15,56,
+191,255,60,254,29,48,191,255,168,253,224,81,242,5,29,48,
+191,255,194,252,32,22,65,2,213,5,29,48,191,255,182,252,
+0,18,2,80,64,6,255,48,128,7,225,48,6,216,7,232,
+157,0,8,80,138,0,9,16,35,215,21,0,2,224,59,23,
+1,0,72,18,34,135,0,0,16,136,219,137,17,48,29,120,
+15,56,10,112,14,64,28,72,34,111,5,0,63,6,184,42,
+129,0,109,0,10,16,2,88,224,89,218,13,27,48,29,96,
+12,56,28,94,1,0,11,64,26,86,255,255,10,72,191,255,
+6,254,10,16,2,80,64,6,255,48,128,7,225,112,6,232,
+7,224,156,0,8,208,154,0,35,223,25,0,9,200,193,226,
+156,0,29,48,191,255,250,251,29,48,28,136,17,56,191,255,
+142,253,29,48,191,255,250,252,224,81,242,5,29,48,191,255,
+20,252,32,22,64,2,197,61,29,48,26,128,16,56,191,255,
+110,253,29,48,191,255,218,252,224,81,242,5,29,48,191,255,
+244,251,32,22,65,2,197,45,0,226,213,21,29,48,28,120,
+217,121,143,119,1,0,14,56,191,255,68,253,29,48,191,255,
+176,252,224,81,242,5,29,48,191,255,202,251,32,22,64,2,
+245,21,65,226,27,110,255,255,237,225,150,237,29,48,27,102,
+255,255,12,88,217,89,139,87,1,0,10,56,191,255,16,253,
+29,48,191,255,124,252,29,48,191,255,154,251,0,18,2,80,
+64,6,255,112,128,7,33,0,32,54,68,177,31,58,190,255,
+198,218,10,16,224,17,154,253,64,6,63,0,128,7,33,0,
+32,54,68,177,190,255,124,225,10,16,224,17,162,13,38,6,
+208,251,132,0,32,62,183,1,0,66,190,255,48,218,224,81,
+64,6,63,0,130,7,225,48,6,232,7,224,156,0,8,216,
+155,0,9,208,29,48,191,255,174,255,29,48,28,136,17,56,
+27,128,16,64,26,72,1,122,99,127,1,0,128,255,74,1,
+10,224,29,48,191,255,168,255,28,16,2,80,66,6,255,48,
+132,7,225,16,6,232,7,224,156,0,8,216,155,0,67,79,
+7,0,29,48,191,255,112,255,29,48,28,136,17,56,27,128,
+16,64,99,7,1,0,35,78,7,0,128,255,12,1,10,224,
+29,48,191,255,106,255,28,16,2,80,68,6,255,16,128,7,
+225,240,6,208,7,224,156,0,8,216,155,0,9,16,35,199,
+29,0,2,200,0,234,133,37,58,23,1,0,72,18,34,135,
+0,0,16,136,218,137,17,48,28,120,15,56,27,112,29,104,
+206,105,13,96,140,0,12,88,11,64,29,80,217,81,10,72,
+34,143,5,0,63,6,160,44,129,0,113,0,10,16,2,88,
+224,89,202,5,65,234,248,233,134,229,2,80,64,6,255,240,
+128,7,225,240,6,208,7,224,156,0,8,216,155,0,9,16,
+35,199,29,0,2,200,0,234,181,37,58,23,1,0,2,22,
+16,0,34,135,0,0,16,136,218,137,17,48,28,120,15,56,
+27,112,29,104,206,105,13,96,140,0,12,88,11,64,29,80,
+217,81,138,143,1,0,17,72,34,135,5,0,63,6,8,45,
+129,0,112,0,10,16,2,88,224,89,202,5,65,234,248,233,
+214,221,2,80,64,6,255,240,128,7,33,0,32,54,236,176,
+64,62,4,0,0,66,191,255,48,20,64,142,32,0,241,143,
+111,0,100,143,192,139,228,23,193,139,64,14,32,0,97,23,
+110,0,64,6,63,0,132,7,225,112,7,224,156,0,8,216,
+155,0,9,200,131,215,33,0,0,234,64,142,32,0,241,143,
+111,0,100,143,192,139,197,85,196,255,193,139,194,5,32,22,
+65,2,165,85,27,128,16,120,15,112,200,114,28,104,13,96,
+193,98,12,88,14,89,26,80,10,136,11,137,17,128,208,0,
+16,16,64,14,32,0,97,23,108,0,26,120,224,121,138,13,
+153,119,1,0,14,16,64,14,32,0,97,23,106,0,196,191,
+192,139,196,55,192,139,196,47,192,139,228,23,193,139,64,14,
+32,0,97,23,110,0,35,78,4,0,31,106,99,111,1,0,
+32,54,236,176,64,62,4,0,1,66,190,255,78,223,196,215,
+192,139,178,5,65,234,197,21,196,207,192,139,194,5,32,22,
+65,2,165,21,26,96,97,98,154,13,64,94,32,0,235,95,
+107,0,11,80,138,0,89,87,0,0,0,18,213,5,99,234,
+198,173,32,22,65,2,2,80,68,6,255,112,128,7,97,0,
+6,232,128,255,48,231,224,81,146,13,38,6,60,252,132,0,
+32,62,81,0,0,66,190,255,196,215,1,138,100,239,209,139,
+125,143,45,0,64,6,127,0,128,7,97,0,6,232,61,143,
+45,0,97,138,138,45,61,63,5,0,29,64,38,6,72,252,
+132,0,128,255,154,252,29,48,128,255,86,231,224,81,146,13,
+38,6,96,252,132,0,32,62,115,0,0,66,190,255,126,215,
+61,71,17,0,61,63,5,0,29,48,128,255,200,230,224,81,
+162,13,38,6,96,252,132,0,32,62,120,0,0,66,190,255,
+92,215,224,81,64,6,127,0,128,7,225,0,36,239,209,139,
+6,224,224,233,210,21,61,143,9,0,0,50,224,137,226,5,
+61,135,13,0,252,129,170,5,29,48,61,239,37,0,224,49,
+178,5,191,255,118,255,36,127,209,139,239,233,218,237,64,6,
+255,0,128,7,97,0,102,71,33,0,6,232,128,255,48,212,
+224,81,146,13,38,6,108,252,132,0,32,62,201,0,0,66,
+190,255,250,214,1,138,100,239,213,139,125,143,29,0,64,6,
+127,0,128,7,97,0,6,232,61,143,29,0,97,138,138,45,
+61,63,5,0,29,64,38,6,120,252,132,0,128,255,208,251,
+29,48,128,255,82,212,224,81,146,13,38,6,144,252,132,0,
+32,62,238,0,0,66,190,255,180,214,61,71,33,0,61,63,
+5,0,29,48,128,255,200,211,224,81,162,13,38,6,144,252,
+132,0,32,62,243,0,0,66,190,255,146,214,224,81,64,6,
+127,0,128,7,97,0,36,239,213,139,224,233,178,21,61,135,
+9,0,61,143,33,0,0,50,241,129,162,5,29,48,61,239,
+21,0,224,49,178,5,191,255,124,255,36,127,213,139,239,233,
+250,237,64,6,127,0,128,7,33,0,128,255,8,0,64,6,
+63,0,128,7,33,0,36,143,217,139,224,137,218,13,128,255,
+244,0,34,6,52,60,2,0,234,23,32,2,32,86,232,3,
+74,16,100,23,217,139,36,23,217,139,224,17,194,21,128,254,
+255,255,245,17,231,5,64,86,0,0,106,255,98,245,229,5,
+2,248,64,86,0,0,106,255,98,245,36,135,217,139,191,129,
+100,135,217,139,64,6,63,0,128,7,33,0,48,6,52,60,
+2,0,230,135,32,2,32,110,232,3,77,128,100,135,217,139,
+191,255,146,255,64,86,0,0,43,6,115,0,0,0,74,95,
+100,245,64,6,63,0,134,7,97,0,32,143,13,177,6,232,
+224,137,242,29,224,233,194,53,61,95,5,0,224,89,242,13,
+61,87,9,0,99,95,9,0,99,87,5,0,11,16,165,5,
+72,18,234,17,234,253,11,48,128,255,180,244,125,7,5,0,
+125,7,9,0,125,7,13,0,29,48,128,255,162,244,133,29,
+61,23,5,0,96,239,13,177,99,23,1,0,2,255,0,0,
+100,23,221,139,197,250,64,86,0,0,74,255,8,240,36,55,
+221,139,38,55,5,0,224,49,178,5,191,255,94,255,70,6,
+127,0,136,7,65,0,36,143,221,139,32,23,13,177,17,134,
+8,0,99,143,1,0,99,143,5,0,100,135,221,139,34,87,
+9,0,99,87,9,0,234,129,250,5,34,23,5,0,100,23,
+221,139,99,23,13,0,36,23,221,139,2,239,0,0,197,234,
+64,86,0,0,74,239,8,240,36,87,221,139,42,87,5,0,
+72,6,95,0,127,0,132,7,68,55,184,133,127,0,128,7,
+225,240,7,192,6,224,60,55,5,0,8,200,128,255,228,243,
+10,216,27,48,60,71,5,0,0,58,190,255,184,208,58,6,
+132,155,145,0,36,63,225,139,26,55,12,0,128,255,14,27,
+60,111,1,0,27,238,1,0,224,81,178,5,13,110,128,0,
+93,111,255,255,25,64,60,95,5,0,65,234,94,90,93,95,
+255,255,29,56,58,23,49,0,36,79,225,139,72,18,34,55,
+0,0,34,87,5,0,218,49,63,6,132,49,129,0,106,0,
+224,81,234,5,27,48,128,255,150,243,31,82,181,21,24,48,
+60,23,5,0,27,56,226,201,222,5,25,64,190,255,232,206,
+197,5,2,64,190,255,224,206,27,48,128,255,114,243,60,87,
+5,0,64,6,255,240,128,7,225,0,6,224,60,127,5,0,
+7,143,1,0,15,134,254,255,240,137,178,5,0,82,197,69,
+7,119,0,0,206,110,192,0,178,5,0,82,213,61,61,6,
+132,155,145,0,61,95,5,0,8,102,254,255,235,97,190,5,
+0,82,165,53,61,23,49,0,7,86,2,0,2,22,16,0,
+34,55,0,0,10,56,221,49,36,79,225,139,1,66,34,143,
+5,0,63,6,30,50,129,0,113,0,10,16,224,17,199,29,
+0,18,36,63,225,139,61,134,29,0,199,129,144,119,1,0,
+224,113,146,13,61,110,13,0,199,105,141,95,1,0,224,89,
+170,5,1,18,130,0,224,17,210,5,29,55,12,0,128,255,
+20,25,60,87,5,0,64,6,255,0,128,7,225,0,7,232,
+6,224,29,48,60,71,5,0,0,58,190,255,120,207,60,135,
+1,0,65,234,208,134,127,0,93,135,255,255,60,111,5,0,
+65,234,94,106,93,111,255,255,8,98,65,234,93,103,255,255,
+60,87,5,0,64,6,255,0,38,87,5,0,127,0,130,7,
+225,0,9,232,128,255,52,66,10,224,224,81,231,5,29,56,
+35,54,3,0,190,255,100,220,28,80,66,6,255,0,132,7,
+225,48,7,216,8,208,9,224,6,232,1,138,99,143,5,0,
+31,50,190,255,138,211,29,48,27,56,26,64,28,72,128,255,
+250,65,10,232,224,233,191,13,35,135,5,0,224,129,210,5,
+99,7,5,0,190,255,96,211,29,80,245,13,28,56,35,54,
+3,0,190,255,78,218,35,127,5,0,224,121,210,5,99,7,
+5,0,190,255,66,211,29,80,68,6,255,48,130,7,225,0,
+9,232,128,255,182,65,10,224,224,81,231,5,29,56,35,54,
+3,0,128,255,244,114,28,80,66,6,255,0,130,7,225,0,
+9,232,128,255,150,65,10,224,224,81,231,5,29,56,35,54,
+3,0,190,255,212,219,28,80,66,6,255,0,128,7,225,0,
+6,232,61,23,1,0,253,143,19,0,209,17,125,23,1,0,
+162,127,1,0,130,111,1,0,200,122,15,105,125,111,13,0,
+130,95,3,0,144,106,93,95,16,0,153,29,162,143,5,0,
+200,138,130,127,5,0,17,121,125,127,18,0,2,110,6,0,
+61,103,13,0,125,111,5,0,204,102,255,63,125,103,13,0,
+2,94,3,0,125,95,9,0,8,18,165,13,162,87,3,0,
+125,87,18,0,125,7,5,0,125,7,9,0,4,18,61,135,
+1,0,253,127,19,0,194,129,125,135,1,0,39,111,1,0,
+207,17,162,105,103,111,1,0,204,5,32,86,209,1,181,21,
+29,48,128,255,38,0,10,224,224,225,194,13,61,63,13,0,
+157,71,17,0,253,79,19,0,38,6,156,252,132,0,128,255,
+238,246,28,80,64,6,255,0,34,6,60,130,133,0,181,53,
+230,143,13,0,130,127,3,0,47,112,81,113,34,87,0,0,
+206,0,234,113,250,37,34,103,5,0,213,29,44,95,0,0,
+134,87,17,0,235,81,234,21,2,127,2,0,38,135,13,0,
+2,87,3,0,80,121,143,0,234,121,195,5,32,86,11,1,
+133,29,102,23,21,0,44,23,5,0,0,82,102,23,25,0,
+133,21,72,98,34,135,9,0,240,97,145,229,32,86,12,1,
+133,13,76,18,36,127,177,133,239,17,177,205,32,86,11,1,
+127,0,128,7,225,16,6,232,61,23,9,0,224,17,146,13,
+2,143,0,0,209,134,3,0,194,5,32,86,208,1,245,53,
+61,223,25,0,59,231,49,0,29,48,72,226,128,255,238,0,
+60,23,0,0,61,63,1,0,219,17,2,48,253,111,19,0,
+13,64,10,72,60,103,5,0,63,6,228,52,129,0,108,0,
+61,23,5,0,224,17,162,29,65,18,66,87,255,255,136,82,
+66,87,0,0,61,95,9,0,224,89,130,21,61,103,25,0,
+12,103,12,0,0,18,97,98,198,5,101,98,174,5,1,18,
+130,0,224,17,178,5,203,63,0,0,0,82,64,6,255,16,
+128,7,225,16,38,223,25,0,59,231,49,0,6,232,28,230,
+16,0,128,255,120,0,60,23,0,0,61,63,1,0,219,17,
+2,48,253,143,19,0,17,64,10,72,60,135,5,0,63,6,
+90,53,129,0,112,0,10,16,32,86,15,1,253,127,19,0,
+239,17,170,5,0,82,10,224,224,17,186,5,32,230,210,1,
+61,87,5,0,224,81,162,13,224,17,174,5,128,17,65,82,
+74,23,255,255,168,18,74,23,0,0,224,225,194,13,61,63,
+13,0,157,71,17,0,253,79,19,0,38,6,48,255,132,0,
+128,255,92,245,28,80,64,6,255,16,38,23,29,0,224,17,
+158,13,38,135,21,0,38,23,13,0,16,135,2,0,80,17,
+130,0,2,80,127,0,166,0,34,6,60,130,133,0,165,29,
+34,87,5,0,165,21,42,95,5,0,11,135,12,0,240,49,
+186,13,43,126,13,0,199,121,79,7,0,0,43,110,29,0,
+199,105,77,7,0,0,72,82,34,95,9,0,235,81,193,237,
+76,18,36,87,177,133,234,17,193,229,127,0,128,7,97,0,
+7,232,224,49,138,13,32,54,32,0,128,255,34,239,10,48,
+224,49,130,21,102,7,1,0,102,7,9,0,102,7,18,0,
+102,7,21,0,49,6,200,149,145,0,102,143,25,0,102,239,
+29,0,6,80,64,6,127,0,102,63,1,0,102,71,18,0,
+127,0,128,7,33,0,38,143,1,0,230,87,19,0,10,16,
+209,17,10,126,5,0,207,137,102,143,1,0,130,95,1,0,
+162,111,1,0,200,106,13,89,102,95,13,0,130,143,3,0,
+70,143,16,0,162,119,3,0,130,135,5,0,200,130,16,113,
+102,7,5,0,102,119,18,0,191,255,128,253,64,6,63,0,
+38,135,1,0,199,129,102,135,1,0,127,0,128,7,225,112,
+7,200,8,216,38,143,1,0,187,0,17,214,251,255,38,231,
+25,0,6,232,191,255,230,254,28,127,12,0,0,18,239,217,
+154,13,60,110,29,0,205,81,138,103,1,0,224,97,162,5,
+1,18,130,0,224,17,130,29,29,48,191,255,192,254,10,16,
+60,142,29,0,194,137,0,82,145,127,1,0,224,121,146,13,
+60,110,13,0,205,17,130,103,1,0,224,97,170,5,1,82,
+138,0,224,81,178,5,0,82,213,13,25,48,26,56,253,143,
+19,0,17,70,5,0,190,255,94,201,253,127,19,0,15,86,
+5,0,64,6,255,112,134,7,225,243,6,232,67,63,3,0,
+99,71,9,0,0,202,0,194,60,6,60,130,133,0,128,7,
+12,1,60,215,5,0,213,125,61,23,29,0,224,17,254,5,
+28,159,3,0,0,218,99,159,5,0,229,109,2,216,99,23,
+5,0,165,109,58,79,5,0,3,143,3,0,9,16,2,135,
+12,0,0,82,240,137,154,13,34,118,29,0,219,113,142,103,
+1,0,224,97,162,5,1,82,138,0,224,81,194,85,27,80,
+0,90,34,142,29,0,202,137,145,127,1,0,224,121,146,13,
+34,110,13,0,205,81,138,103,1,0,224,97,170,5,1,90,
+139,0,224,89,130,69,125,231,21,0,41,191,5,0,125,79,
+25,0,23,182,5,0,253,143,19,0,246,137,190,13,61,63,
+13,0,157,71,17,0,38,6,96,255,132,0,128,255,16,243,
+165,45,61,23,1,0,60,103,0,0,2,118,5,0,2,126,
+3,0,27,97,125,127,5,0,125,119,1,0,125,103,13,0,
+66,103,0,0,61,143,13,0,136,138,66,143,1,0,58,87,
+0,0,66,87,2,0,29,48,191,255,106,252,61,127,1,0,
+253,111,19,0,215,121,125,127,1,0,182,105,125,111,18,0,
+214,201,65,194,65,218,35,151,5,0,242,217,195,149,72,210,
+60,103,9,0,236,209,145,133,76,226,36,95,177,133,235,225,
+185,5,191,7,240,254,35,151,9,0,50,87,0,0,216,81,
+114,87,0,0,25,80,70,6,255,243,128,7,225,0,6,232,
+61,135,1,0,253,143,19,0,209,129,125,135,1,0,176,127,
+1,0,144,111,1,0,200,122,15,105,205,94,255,63,125,95,
+13,0,144,87,3,0,93,87,16,0,125,7,5,0,67,130,
+125,135,9,0,224,81,138,53,61,127,33,0,125,7,18,0,
+224,121,218,13,29,48,128,255,76,1,10,224,61,63,13,0,
+38,6,148,255,132,0,128,255,38,242,229,5,15,118,8,0,
+125,119,33,0,0,226,61,23,33,0,61,95,21,0,34,87,
+5,0,43,95,9,0,125,87,25,0,2,110,8,0,34,87,
+0,0,235,105,93,87,16,0,193,45,4,82,125,87,18,0,
+125,7,33,0,229,37,4,138,125,143,18,0,125,7,33,0,
+39,127,1,0,209,134,255,255,176,121,103,127,1,0,204,5,
+32,86,209,1,197,37,29,48,191,255,224,250,10,224,224,225,
+138,21,61,87,25,0,10,87,12,0,0,18,97,82,198,5,
+101,82,174,5,1,18,130,0,224,17,186,5,32,230,211,1,
+61,63,13,0,157,71,17,0,61,79,9,0,38,6,200,255,
+132,0,137,79,1,0,128,255,134,241,28,80,64,6,255,0,
+128,7,97,0,38,239,25,0,29,87,12,0,0,18,97,82,
+198,5,101,82,174,5,1,18,130,0,224,17,186,5,0,82,
+149,53,38,23,9,0,130,23,1,0,224,17,194,5,98,18,
+130,29,197,37,191,255,246,251,10,16,61,102,13,0,194,97,
+140,87,1,0,224,81,210,29,61,142,13,0,194,137,81,7,
+0,0,61,118,29,0,206,17,1,106,66,111,0,0,149,21,
+191,255,202,251,61,102,13,0,202,97,76,7,0,0,61,142,
+29,0,209,81,74,7,0,0,197,5,32,86,208,1,165,5,
+0,82,64,6,127,0,230,143,19,0,224,137,234,87,0,0,
+127,0,34,6,60,130,133,0,213,21,230,143,13,0,130,127,
+3,0,47,112,81,113,34,87,0,0,206,0,234,113,154,13,
+34,135,5,0,102,23,21,0,102,135,33,0,0,82,133,13,
+76,18,36,127,177,133,239,17,145,237,32,86,11,1,127,0,
+128,7,225,16,6,232,7,216,187,0,8,224,224,233,138,13,
+32,54,56,0,128,255,216,234,10,232,224,233,146,61,49,6,
+120,135,133,0,125,143,53,0,61,54,8,0,28,56,191,255,
+142,251,93,223,40,0,32,54,208,7,128,255,118,234,10,224,
+224,225,154,13,38,6,252,255,132,0,32,62,10,6,0,66,
+190,255,90,203,28,48,0,58,32,70,208,7,190,255,54,199,
 125,231,1,0,28,62,8,0,125,63,5,0,61,54,8,0,
-0,66,191,255,30,251,29,80,64,6,255,16,128,7,225,0,
-6,232,7,224,224,233,138,13,32,54,56,0,128,255,96,231,
-10,232,224,233,210,21,49,6,24,124,133,0,125,143,53,0,
-125,7,1,0,125,7,5,0,61,54,8,0,28,56,191,255,
-166,250,93,7,40,0,125,7,45,0,93,7,48,0,29,80,
-64,6,255,0,128,7,225,0,6,232,7,224,224,233,178,21,
-49,6,24,124,133,0,125,143,53,0,157,135,49,0,224,129,
-210,5,61,55,1,0,128,255,174,230,129,226,201,5,29,48,
-128,255,220,230,64,6,255,0,128,7,225,16,7,224,6,232,
-61,55,1,0,8,216,128,255,0,2,224,81,138,13,28,48,
-27,64,0,58,190,255,34,204,1,82,245,13,61,87,1,0,
-234,23,3,0,226,217,190,5,0,82,245,5,28,48,10,56,
-2,64,190,255,166,202,1,82,64,6,255,16,128,7,225,0,
-6,232,61,63,45,0,38,6,148,244,132,0,128,255,96,236,
-61,87,1,0,61,23,53,0,42,94,6,0,2,22,24,0,
-34,87,0,0,61,63,5,0,221,81,10,48,11,64,34,143,
-5,0,63,6,42,54,129,0,113,0,61,54,8,0,10,224,
-28,56,191,255,102,250,61,23,1,0,29,63,40,0,2,70,
-6,0,226,87,5,0,220,81,98,87,4,0,61,54,8,0,
-191,255,222,250,61,23,1,0,10,88,226,87,5,0,203,81,
-98,87,4,0,72,82,98,87,2,0,61,23,53,0,63,6,
-134,54,129,0,2,22,32,0,34,87,0,0,34,127,5,0,
-221,81,10,48,111,0,10,224,224,225,146,13,61,63,45,0,
-38,6,212,244,132,0,128,255,198,235,197,13,61,23,1,0,
-38,6,184,244,132,0,34,63,6,0,226,71,5,0,128,255,
-174,235,28,80,64,6,255,0,128,7,225,240,7,192,6,224,
-60,55,1,0,8,200,128,255,240,0,224,81,186,5,0,82,
-197,37,0,218,60,239,1,0,0,210,61,239,6,0,181,21,
-60,54,8,0,191,255,102,249,224,81,218,13,60,54,8,0,
-28,71,40,0,24,56,191,255,174,249,10,16,224,17,178,5,
-194,217,65,210,29,120,95,234,224,121,186,237,57,119,0,0,
-27,80,218,113,121,119,0,0,64,6,255,240,128,7,225,16,
-6,224,60,55,1,0,128,255,144,0,224,81,210,45,1,138,
-60,23,1,0,68,143,172,133,226,79,3,0,34,239,6,0,
-60,63,45,0,29,64,38,6,28,245,132,0,128,255,16,235,
-29,216,229,13,60,54,8,0,191,255,242,248,224,81,138,13,
-60,54,8,0,191,255,180,247,224,81,170,5,95,218,29,128,
-95,234,224,129,138,245,224,217,242,5,27,56,38,6,88,245,
-132,0,128,255,218,234,64,6,255,16,128,7,33,0,166,0,
-0,82,97,50,225,13,130,13,99,50,129,13,210,5,6,22,
-251,255,97,18,235,5,1,82,197,5,7,48,191,255,242,66,
-138,0,64,6,63,0,0,18,224,49,242,21,38,87,0,0,
-10,6,222,221,170,21,38,87,6,0,224,81,231,13,230,95,
-5,0,230,111,3,0,11,102,8,0,236,105,234,5,234,134,
-6,0,235,129,175,5,1,18,130,0,2,80,138,0,127,0,
-128,7,225,0,6,232,7,224,188,0,224,233,138,13,32,54,
-60,0,128,255,154,228,10,232,224,233,130,21,29,48,28,56,
-31,66,191,255,54,252,48,6,64,124,133,0,125,135,53,0,
-125,7,57,0,29,48,128,255,58,1,29,80,64,6,255,0,
-150,7,225,16,6,232,7,216,224,233,138,13,32,54,60,0,
-128,255,92,228,10,232,224,233,194,117,29,48,31,58,191,255,
-222,252,49,6,64,124,133,0,125,143,53,0,125,223,57,0,
-27,56,35,54,12,0,191,255,8,223,35,54,12,0,191,255,
-150,227,224,81,226,93,35,62,4,0,35,54,12,0,8,66,
-0,74,191,255,240,226,10,224,224,225,250,5,35,54,4,0,
-191,255,38,255,224,81,170,29,27,56,38,6,216,245,132,0,
-128,255,188,233,35,71,4,0,35,79,10,0,28,56,227,95,
-9,0,99,95,1,0,38,6,140,245,132,0,128,255,160,233,
-35,54,12,0,191,255,50,224,197,53,227,55,7,0,128,255,
-146,227,125,87,5,0,224,81,154,13,38,6,200,245,132,0,
-32,62,64,7,0,66,190,255,24,205,227,71,7,0,61,63,
-5,0,35,54,12,0,0,74,191,255,122,226,10,224,1,98,
-61,95,5,0,93,103,48,0,125,95,1,0,11,62,8,0,
-125,63,5,0,61,54,8,0,0,66,191,255,38,247,29,48,
-128,255,198,0,224,225,210,5,35,54,12,0,191,255,202,223,
-29,80,86,6,255,16,128,7,225,0,6,232,7,224,224,233,
-226,13,49,6,64,124,133,0,125,143,53,0,0,58,191,255,
-38,252,129,226,201,5,29,48,128,255,36,227,64,6,255,0,
-6,23,40,0,100,18,233,5,97,18,162,13,99,18,130,21,
-197,53,101,18,145,45,194,21,102,18,194,29,229,45,49,6,
-255,255,17,17,102,143,57,0,37,134,224,130,165,45,49,6,
-204,204,68,68,102,143,57,0,37,134,216,130,165,37,49,6,
-238,238,34,34,102,143,57,0,64,102,133,0,44,134,28,246,
-133,29,49,6,187,187,85,85,102,143,57,0,64,86,133,0,
-42,134,40,246,229,13,49,6,153,153,119,119,102,143,57,0,
-48,6,56,246,132,0,213,5,64,126,133,0,47,134,72,246,
-102,135,45,0,127,0,38,23,57,0,50,6,204,204,68,68,
-242,17,201,13,50,6,255,255,17,17,242,17,242,21,50,6,
-238,238,34,34,242,17,162,29,165,45,50,6,204,204,68,68,
-242,17,130,21,50,6,187,187,85,85,242,17,210,21,50,6,
-153,153,119,119,242,17,226,21,165,29,1,138,37,134,240,130,
-181,29,3,138,37,134,232,130,245,21,5,138,64,102,133,0,
-44,134,92,246,149,21,6,138,64,86,133,0,42,134,104,246,
-181,13,4,138,48,6,120,246,132,0,229,5,0,136,64,126,
-133,0,47,134,136,246,70,143,40,0,102,135,45,0,127,0,
-158,7,225,0,7,232,38,63,57,0,8,224,3,48,191,255,
-178,253,3,48,29,56,28,64,191,255,48,252,10,232,3,48,
-2,58,191,255,164,254,29,80,94,6,255,0,144,7,97,0,
-6,232,61,63,57,0,3,48,191,255,198,220,61,23,1,0,
-226,87,5,0,224,81,146,13,226,71,3,0,2,56,3,48,
-0,74,191,255,6,224,213,5,3,48,191,255,44,222,0,82,
-80,6,127,0,128,7,225,0,6,232,7,224,224,233,138,13,
-32,54,60,0,128,255,184,225,10,232,224,233,130,21,29,48,
-28,64,2,58,191,255,84,249,49,6,104,124,133,0,125,143,
-53,0,125,231,57,0,29,48,128,255,74,0,29,80,64,6,
-255,0,128,7,225,16,6,232,7,224,8,216,224,233,138,13,
-32,54,60,0,128,255,120,225,10,232,224,233,130,21,29,48,
-27,56,28,64,191,255,168,249,49,6,104,124,133,0,125,143,
-53,0,125,231,57,0,29,48,128,255,10,0,29,80,64,6,
-255,16,128,7,97,0,6,232,8,50,128,255,6,225,125,87,
-45,0,10,48,61,71,57,0,39,6,156,246,132,0,128,255,
-144,241,103,82,162,13,38,6,168,246,132,0,32,62,34,8,
-0,66,190,255,124,202,224,81,64,6,127,0,128,7,225,0,
-6,232,7,224,224,233,178,21,49,6,104,124,133,0,61,55,
-45,0,125,143,53,0,128,255,158,224,29,48,0,58,191,255,
-198,249,129,226,201,5,29,48,128,255,196,224,64,6,255,0,
-128,7,225,48,6,232,61,23,57,0,2,6,240,255,225,61,
-59,6,212,151,145,0,194,18,219,17,34,55,1,0,128,255,
-102,224,61,215,1,0,26,48,191,255,206,251,224,81,202,13,
-61,63,57,0,7,96,194,98,219,97,108,7,1,0,2,50,
-191,255,190,243,181,37,61,231,57,0,250,55,3,0,194,226,
-219,225,128,255,78,224,124,87,1,0,61,71,1,0,61,87,
-57,0,232,71,3,0,194,82,219,81,42,63,1,0,29,48,
-191,255,120,249,224,81,170,13,38,6,184,246,132,0,32,62,
-75,8,0,66,190,255,186,201,224,81,64,6,255,48,128,7,
-97,0,6,232,191,255,108,255,61,143,57,0,17,6,240,255,
-193,5,29,48,191,255,184,250,64,6,127,0,128,7,225,0,
-6,232,61,55,1,0,7,224,28,64,0,58,190,255,106,197,
-61,23,57,0,2,6,240,255,193,21,194,18,44,6,212,151,
-145,0,204,17,34,23,1,0,224,17,178,13,226,87,3,0,
-234,225,246,5,61,55,1,0,2,56,10,64,190,255,220,195,
-64,6,255,0,158,7,225,0,8,224,7,232,38,63,57,0,
-0,66,7,6,240,255,145,13,7,128,194,130,45,6,212,151,
-145,0,205,129,48,71,1,0,3,48,191,255,56,254,3,48,
-29,56,28,64,191,255,212,249,10,232,3,48,2,58,191,255,
-158,254,29,80,94,6,255,0,128,7,97,0,6,232,191,255,
-194,254,61,55,57,0,191,255,140,61,64,6,127,0,3,30,
-192,255,99,63,53,0,99,255,45,0,99,231,41,0,99,239,
-37,0,8,224,230,143,9,0,201,138,99,143,1,0,99,79,
-5,0,99,7,13,0,99,7,22,0,99,7,25,0,47,6,
-104,138,145,0,99,127,29,0,31,114,99,119,33,0,0,234,
-149,21,35,54,4,0,3,56,191,255,252,239,10,16,224,17,
-234,13,35,54,4,0,191,255,36,241,10,16,224,17,250,5,
-65,234,252,95,7,0,235,233,214,237,0,82,35,231,41,0,
-35,239,37,0,35,255,45,0,3,30,64,0,127,0,3,30,
-76,255,99,63,169,0,99,255,161,0,99,191,157,0,99,207,
-149,0,99,215,145,0,99,223,141,0,99,231,137,0,99,239,
-133,0,99,199,153,0,8,184,6,192,248,143,9,0,201,138,
-99,143,21,0,132,23,169,133,68,23,172,133,99,79,101,0,
-99,7,109,0,99,7,118,0,99,7,121,0,47,6,104,138,
-145,0,99,127,125,0,31,114,99,119,129,0,35,110,2,0,
-99,111,5,0,35,54,84,0,0,58,128,255,152,17,0,226,
-0,218,128,7,0,2,35,54,100,0,35,62,20,0,191,255,
-70,239,10,224,224,225,178,5,128,7,246,1,35,54,100,0,
-191,255,248,240,10,224,224,225,178,5,128,7,228,1,35,239,
-125,0,35,54,100,0,191,255,108,241,0,18,61,142,29,0,
-10,88,209,81,138,135,1,0,224,129,146,13,61,118,13,0,
-206,89,139,111,1,0,224,105,170,5,1,18,130,0,224,17,
-186,5,128,7,158,1,29,239,12,0,35,54,100,0,191,255,
-52,241,67,239,3,0,99,87,45,0,67,239,68,0,99,87,
+32,70,200,7,191,255,132,251,1,122,93,127,48,0,224,217,
+242,5,61,23,1,0,32,86,34,34,98,87,0,0,29,80,
+64,6,255,16,128,7,225,16,6,232,7,224,8,216,224,233,
+138,13,32,54,56,0,128,255,70,234,10,232,224,233,130,29,
+49,6,120,135,133,0,125,143,53,0,61,54,8,0,27,56,
+191,255,252,250,93,7,48,0,125,231,1,0,28,62,8,0,
+125,63,5,0,61,54,8,0,0,66,191,255,30,251,29,80,
+64,6,255,16,128,7,225,0,6,232,7,224,224,233,138,13,
+32,54,56,0,128,255,248,233,10,232,224,233,210,21,49,6,
+120,135,133,0,125,143,53,0,125,7,1,0,125,7,5,0,
+61,54,8,0,28,56,191,255,166,250,93,7,40,0,125,7,
+45,0,93,7,48,0,29,80,64,6,255,0,128,7,225,0,
+6,232,7,224,224,233,178,21,49,6,120,135,133,0,125,143,
+53,0,157,135,49,0,224,129,210,5,61,55,1,0,128,255,
+70,233,129,226,201,5,29,48,128,255,116,233,64,6,255,0,
+128,7,225,16,7,224,6,232,61,55,1,0,8,216,128,255,
+0,2,224,81,138,13,28,48,27,64,0,58,190,255,22,198,
+1,82,245,13,61,87,1,0,234,23,3,0,226,217,190,5,
+0,82,245,5,28,48,10,56,2,64,190,255,154,196,1,82,
+64,6,255,16,128,7,225,0,6,232,61,63,45,0,38,6,
+12,0,133,0,128,255,248,238,61,87,1,0,61,23,53,0,
+42,94,6,0,2,22,24,0,34,87,0,0,61,63,5,0,
+221,81,10,48,11,64,34,143,5,0,63,6,54,60,129,0,
+113,0,61,54,8,0,10,224,28,56,191,255,102,250,61,23,
+1,0,29,63,40,0,2,70,6,0,226,87,5,0,220,81,
+98,87,4,0,61,54,8,0,191,255,222,250,61,23,1,0,
+10,88,226,87,5,0,203,81,98,87,4,0,72,82,98,87,
+2,0,61,23,53,0,63,6,146,60,129,0,2,22,32,0,
+34,87,0,0,34,127,5,0,221,81,10,48,111,0,10,224,
+224,225,146,13,61,63,45,0,38,6,76,0,133,0,128,255,
+94,238,197,13,61,23,1,0,38,6,48,0,133,0,34,63,
+6,0,226,71,5,0,128,255,70,238,28,80,64,6,255,0,
+128,7,225,240,7,192,6,224,60,55,1,0,8,200,128,255,
+240,0,224,81,186,5,0,82,197,37,0,218,60,239,1,0,
+0,210,61,239,6,0,181,21,60,54,8,0,191,255,102,249,
+224,81,218,13,60,54,8,0,28,71,40,0,24,56,191,255,
+174,249,10,16,224,17,178,5,194,217,65,210,29,120,95,234,
+224,121,186,237,57,119,0,0,27,80,218,113,121,119,0,0,
+64,6,255,240,128,7,225,16,6,224,60,55,1,0,128,255,
+144,0,224,81,210,45,1,138,60,23,1,0,68,143,184,133,
+226,79,3,0,34,239,6,0,60,63,45,0,29,64,38,6,
+148,0,133,0,128,255,168,237,29,216,229,13,60,54,8,0,
+191,255,242,248,224,81,138,13,60,54,8,0,191,255,180,247,
+224,81,170,5,95,218,29,128,95,234,224,129,138,245,224,217,
+242,5,27,56,38,6,208,0,133,0,128,255,114,237,64,6,
+255,16,128,7,33,0,166,0,0,82,97,50,225,13,130,13,
+99,50,129,13,210,5,6,22,251,255,97,18,235,5,1,82,
+197,5,7,48,191,255,206,63,138,0,64,6,63,0,0,18,
+224,49,242,21,38,87,0,0,10,6,222,221,170,21,38,87,
+6,0,224,81,231,13,230,95,5,0,230,111,3,0,11,102,
+8,0,236,105,234,5,234,134,6,0,235,129,175,5,1,18,
+130,0,2,80,138,0,127,0,128,7,225,0,6,232,7,224,
+188,0,224,233,138,13,32,54,60,0,128,255,50,231,10,232,
+224,233,130,21,29,48,28,56,31,66,191,255,54,252,48,6,
+160,135,133,0,125,135,53,0,125,7,57,0,29,48,128,255,
+58,1,29,80,64,6,255,0,150,7,225,16,6,232,7,216,
+224,233,138,13,32,54,60,0,128,255,244,230,10,232,224,233,
+194,117,29,48,31,58,191,255,222,252,49,6,160,135,133,0,
+125,143,53,0,125,223,57,0,27,56,35,54,12,0,191,255,
+8,223,35,54,12,0,191,255,150,227,224,81,226,93,35,62,
+4,0,35,54,12,0,8,66,0,74,191,255,240,226,10,224,
+224,225,250,5,35,54,4,0,191,255,38,255,224,81,170,29,
+27,56,38,6,80,1,133,0,128,255,84,236,35,71,4,0,
+35,79,10,0,28,56,227,95,9,0,99,95,1,0,38,6,
+4,1,133,0,128,255,56,236,35,54,12,0,191,255,50,224,
+197,53,227,55,7,0,128,255,42,230,125,87,5,0,224,81,
+154,13,38,6,64,1,133,0,32,62,64,7,0,66,190,255,
+12,199,227,71,7,0,61,63,5,0,35,54,12,0,0,74,
+191,255,122,226,10,224,1,98,61,95,5,0,93,103,48,0,
+125,95,1,0,11,62,8,0,125,63,5,0,61,54,8,0,
+0,66,191,255,38,247,29,48,128,255,198,0,224,225,210,5,
+35,54,12,0,191,255,202,223,29,80,86,6,255,16,128,7,
+225,0,6,232,7,224,224,233,226,13,49,6,160,135,133,0,
+125,143,53,0,0,58,191,255,38,252,129,226,201,5,29,48,
+128,255,188,229,64,6,255,0,6,23,40,0,100,18,233,5,
+97,18,162,13,99,18,130,21,197,53,101,18,145,45,194,21,
+102,18,194,29,229,45,49,6,255,255,17,17,102,143,57,0,
+37,134,232,130,165,45,49,6,204,204,68,68,102,143,57,0,
+37,134,224,130,165,37,49,6,238,238,34,34,102,143,57,0,
+64,102,133,0,44,134,148,1,133,29,49,6,187,187,85,85,
+102,143,57,0,64,86,133,0,42,134,160,1,229,13,49,6,
+153,153,119,119,102,143,57,0,48,6,176,1,133,0,213,5,
+64,126,133,0,47,134,192,1,102,135,45,0,127,0,38,23,
+57,0,50,6,204,204,68,68,242,17,201,13,50,6,255,255,
+17,17,242,17,242,21,50,6,238,238,34,34,242,17,162,29,
+165,45,50,6,204,204,68,68,242,17,130,21,50,6,187,187,
+85,85,242,17,210,21,50,6,153,153,119,119,242,17,226,21,
+165,29,1,138,37,134,248,130,181,29,3,138,37,134,240,130,
+245,21,5,138,64,102,133,0,44,134,212,1,149,21,6,138,
+64,86,133,0,42,134,224,1,181,13,4,138,48,6,240,1,
+133,0,229,5,0,136,64,126,133,0,47,134,0,2,70,143,
+40,0,102,135,45,0,127,0,158,7,225,0,7,232,38,63,
+57,0,8,224,3,48,191,255,178,253,3,48,29,56,28,64,
+191,255,48,252,10,232,3,48,2,58,191,255,164,254,29,80,
+94,6,255,0,144,7,97,0,6,232,61,63,57,0,3,48,
+191,255,198,220,61,23,1,0,226,87,5,0,224,81,146,13,
+226,71,3,0,2,56,3,48,0,74,191,255,6,224,213,5,
+3,48,191,255,44,222,0,82,80,6,127,0,128,7,225,0,
+6,232,7,224,224,233,138,13,32,54,60,0,128,255,80,228,
+10,232,224,233,130,21,29,48,28,64,2,58,191,255,84,249,
+49,6,200,135,133,0,125,143,53,0,125,231,57,0,29,48,
+128,255,74,0,29,80,64,6,255,0,128,7,225,16,6,232,
+7,224,8,216,224,233,138,13,32,54,60,0,128,255,16,228,
+10,232,224,233,130,21,29,48,27,56,28,64,191,255,168,249,
+49,6,200,135,133,0,125,143,53,0,125,231,57,0,29,48,
+128,255,10,0,29,80,64,6,255,16,128,7,97,0,6,232,
+8,50,128,255,158,227,125,87,45,0,10,48,61,71,57,0,
+39,6,20,2,133,0,128,255,40,244,103,82,162,13,38,6,
+32,2,133,0,32,62,34,8,0,66,190,255,112,196,224,81,
+64,6,127,0,128,7,225,0,6,232,7,224,224,233,178,21,
+49,6,200,135,133,0,61,55,45,0,125,143,53,0,128,255,
+54,227,29,48,0,58,191,255,198,249,129,226,201,5,29,48,
+128,255,92,227,64,6,255,0,128,7,225,48,6,232,61,23,
+57,0,2,6,240,255,225,61,59,6,52,163,145,0,194,18,
+219,17,34,55,1,0,128,255,254,226,61,215,1,0,26,48,
+191,255,206,251,224,81,202,13,61,63,57,0,7,96,194,98,
+219,97,108,7,1,0,2,50,191,255,190,243,181,37,61,231,
+57,0,250,55,3,0,194,226,219,225,128,255,230,226,124,87,
+1,0,61,71,1,0,61,87,57,0,232,71,3,0,194,82,
+219,81,42,63,1,0,29,48,191,255,120,249,224,81,170,13,
+38,6,48,2,133,0,32,62,75,8,0,66,190,255,174,195,
+224,81,64,6,255,48,128,7,97,0,6,232,191,255,108,255,
+61,143,57,0,17,6,240,255,193,5,29,48,191,255,184,250,
+64,6,127,0,128,7,225,0,6,232,61,55,1,0,7,224,
+28,64,0,58,190,255,94,191,61,23,57,0,2,6,240,255,
+193,21,194,18,44,6,52,163,145,0,204,17,34,23,1,0,
+224,17,178,13,226,87,3,0,234,225,246,5,61,55,1,0,
+2,56,10,64,190,255,208,189,64,6,255,0,158,7,225,0,
+8,224,7,232,38,63,57,0,0,66,7,6,240,255,145,13,
+7,128,194,130,45,6,52,163,145,0,205,129,48,71,1,0,
+3,48,191,255,56,254,3,48,29,56,28,64,191,255,212,249,
+10,232,3,48,2,58,191,255,158,254,29,80,94,6,255,0,
+128,7,97,0,6,232,191,255,194,254,61,55,57,0,191,255,
+104,58,64,6,127,0,3,30,192,255,99,63,53,0,99,255,
+45,0,99,231,41,0,99,239,37,0,8,224,230,143,9,0,
+201,138,99,143,1,0,99,79,5,0,99,7,13,0,99,7,
+22,0,99,7,25,0,47,6,200,149,145,0,99,127,29,0,
+31,114,99,119,33,0,0,234,149,21,35,54,4,0,3,56,
+191,255,252,239,10,16,224,17,234,13,35,54,4,0,191,255,
+36,241,10,16,224,17,250,5,65,234,252,95,7,0,235,233,
+214,237,0,82,35,231,41,0,35,239,37,0,35,255,45,0,
+3,30,64,0,127,0,3,30,76,255,99,63,169,0,99,255,
+161,0,99,191,157,0,99,207,149,0,99,215,145,0,99,223,
+141,0,99,231,137,0,99,239,133,0,99,199,153,0,8,184,
+6,192,248,143,9,0,201,138,99,143,21,0,132,23,181,133,
+68,23,184,133,99,79,101,0,99,7,109,0,99,7,118,0,
+99,7,121,0,47,6,200,149,145,0,99,127,125,0,31,114,
+99,119,129,0,35,110,2,0,99,111,5,0,35,54,84,0,
+0,58,128,255,216,19,0,226,0,218,128,7,0,2,35,54,
+100,0,35,62,20,0,191,255,70,239,10,224,224,225,178,5,
+128,7,246,1,35,54,100,0,191,255,248,240,10,224,224,225,
+178,5,128,7,228,1,35,239,125,0,35,54,100,0,191,255,
+108,241,0,18,61,142,29,0,10,88,209,81,138,135,1,0,
+224,129,146,13,61,118,13,0,206,89,139,111,1,0,224,105,
+170,5,1,18,130,0,224,17,186,5,128,7,158,1,29,239,
+12,0,35,54,100,0,191,255,52,241,67,239,3,0,99,87,
+45,0,67,239,68,0,99,87,73,0,35,22,68,0,34,95,
+1,0,35,86,76,0,106,95,1,0,34,23,5,0,106,23,
+5,0,35,23,89,0,99,23,37,0,35,23,93,0,99,23,
+33,0,165,29,3,103,76,0,2,80,10,95,0,0,0,18,
+236,89,138,13,42,87,5,0,35,95,81,0,235,81,170,5,
+1,18,130,0,224,17,234,13,35,22,36,0,34,135,1,0,
+72,130,98,135,1,0,35,127,33,0,35,23,37,0,239,17,
+170,229,35,22,40,0,35,238,36,0,224,17,250,5,4,50,
+128,255,60,224,10,16,224,17,210,5,61,119,1,0,98,119,
+1,0,35,119,93,0,35,22,40,0,99,119,29,0,35,86,
+28,0,34,103,1,0,42,111,1,0,237,97,234,109,35,23,
+89,0,224,17,186,5,0,82,197,5,14,80,162,81,163,82,
+224,17,186,5,0,90,213,5,35,95,97,0,162,89,163,90,
+235,81,185,37,14,232,99,239,65,0,29,208,1,202,229,21,
+26,16,224,17,146,21,224,17,250,5,8,50,128,255,208,223,
+10,16,224,17,146,13,3,87,76,0,66,87,0,0,35,87,
+81,0,98,87,5,0,95,202,72,210,224,201,170,237,29,22,
+8,0,99,23,93,0,149,61,99,119,53,0,35,134,52,0,
+99,135,61,0,224,17,186,5,0,82,197,5,14,80,162,81,
+163,82,224,81,186,5,0,234,213,13,99,23,57,0,35,239,
+61,0,35,22,56,0,34,103,1,0,61,239,1,0,172,233,
+163,234,35,95,61,0,35,54,84,0,43,95,1,0,35,62,
+56,0,99,95,57,0,1,66,35,78,76,0,128,255,84,28,
+35,23,89,0,99,23,57,0,35,86,56,0,42,135,1,0,
+195,234,208,233,99,239,49,0,65,218,247,127,7,0,239,217,
+190,5,191,7,252,253,24,103,64,0,32,150,191,255,224,225,
+234,119,0,0,82,97,206,94,1,0,198,90,11,97,35,23,
+89,0,88,103,64,0,99,23,9,0,99,23,25,0,133,21,
+2,55,0,0,34,63,5,0,128,255,26,5,10,16,224,225,
+170,5,2,224,35,135,25,0,72,130,99,135,25,0,35,95,
+93,0,35,86,8,0,99,95,9,0,35,23,25,0,42,127,
+1,0,239,17,225,229,35,23,89,0,28,232,224,17,210,13,
+99,23,17,0,99,95,13,0,2,80,165,5,72,82,235,81,
+234,253,2,48,128,255,136,222,29,80,35,191,157,0,35,199,
+153,0,35,207,149,0,35,215,145,0,35,223,141,0,35,231,
+137,0,35,239,133,0,35,255,161,0,3,30,180,0,127,0,
+128,7,33,0,8,16,38,71,5,0,232,17,206,5,32,86,
+15,1,133,21,38,23,49,0,0,74,72,18,34,87,0,0,
+34,143,5,0,198,81,10,48,63,6,244,70,129,0,113,0,
+0,82,64,6,63,0,144,7,225,0,99,71,1,0,99,7,
+9,0,9,224,67,63,16,0,99,231,18,0,99,7,21,0,
+99,55,13,0,49,6,200,149,145,0,99,143,25,0,31,130,
+99,135,29,0,3,48,191,255,242,236,10,232,224,233,186,21,
+3,48,191,255,96,237,10,232,224,233,218,13,35,71,25,0,
+40,71,5,0,252,65,247,5,28,56,38,6,64,2,133,0,
+128,255,172,227,29,80,80,6,255,0,128,7,97,0,6,232,
+8,16,61,71,5,0,232,17,206,5,32,86,15,1,245,37,
+132,23,181,133,68,23,184,133,0,74,61,23,49,0,63,6,
+154,71,129,0,2,22,16,0,34,87,0,0,34,143,5,0,
+221,81,10,48,113,0,0,82,0,18,189,135,29,0,224,129,
+226,5,189,127,13,0,224,121,170,5,1,18,130,0,224,17,
+226,5,29,55,12,0,0,58,128,255,170,3,64,6,127,0,
+144,7,225,16,99,71,1,0,99,7,9,0,67,63,16,0,
+99,79,18,0,99,7,21,0,198,222,15,0,99,55,13,0,
+49,6,200,149,145,0,99,143,25,0,31,130,99,135,29,0,
+3,48,191,255,38,236,10,232,224,233,202,53,35,23,25,0,
+34,23,5,0,227,119,19,0,226,113,183,5,99,23,18,0,
+132,23,181,133,68,23,184,133,3,48,191,255,6,237,10,232,
+224,233,138,37,35,231,25,0,3,48,191,255,128,237,0,106,
+10,16,60,102,29,0,194,97,140,87,1,0,224,81,146,13,
+60,134,13,0,208,17,130,127,1,0,224,121,170,5,1,106,
+141,0,224,105,242,5,28,55,12,0,27,56,128,255,6,3,
+10,232,29,80,80,6,255,16,3,30,76,255,99,63,169,0,
+99,255,161,0,99,199,157,0,99,207,153,0,99,215,149,0,
+99,223,145,0,99,231,141,0,99,239,137,0,8,192,9,232,
+230,143,9,0,201,138,99,143,17,0,248,63,7,0,38,6,
+104,2,133,0,128,255,88,226,0,226,99,239,101,0,99,7,
+109,0,99,7,118,0,99,7,121,0,46,6,200,149,145,0,
+99,119,125,0,31,106,99,111,129,0,99,7,133,0,35,102,
+2,0,99,103,5,0,35,54,84,0,0,58,128,255,254,14,
+0,218,128,7,238,1,35,54,100,0,35,62,16,0,191,255,
+140,239,10,224,224,225,178,5,128,7,228,1,35,54,100,0,
+191,255,128,240,10,224,224,81,178,5,128,7,210,1,35,54,
+100,0,191,255,244,240,224,81,162,5,65,218,35,239,125,0,
+29,239,12,0,0,18,97,234,198,5,101,234,174,5,1,18,
+130,0,224,17,186,5,128,7,154,1,35,54,100,0,191,255,
+108,236,67,239,3,0,99,87,37,0,67,239,68,0,99,87,
 73,0,35,22,68,0,34,95,1,0,35,86,76,0,106,95,
 1,0,34,23,5,0,106,23,5,0,35,23,89,0,99,23,
-37,0,35,23,93,0,99,23,33,0,165,29,3,103,76,0,
+29,0,35,23,93,0,99,23,25,0,165,29,3,103,76,0,
 2,80,10,95,0,0,0,18,236,89,138,13,42,87,5,0,
 35,95,81,0,235,81,170,5,1,18,130,0,224,17,234,13,
-35,22,36,0,34,135,1,0,72,130,98,135,1,0,35,127,
-33,0,35,23,37,0,239,17,170,229,35,22,40,0,35,238,
-36,0,224,17,250,5,4,50,128,255,164,221,10,16,224,17,
-210,5,61,119,1,0,98,119,1,0,35,119,93,0,35,22,
-40,0,99,119,29,0,35,86,28,0,34,103,1,0,42,111,
-1,0,237,97,234,109,35,23,89,0,224,17,186,5,0,82,
-197,5,14,80,162,81,163,82,224,17,186,5,0,90,213,5,
-35,95,97,0,162,89,163,90,235,81,185,37,14,232,99,239,
-65,0,29,208,1,202,229,21,26,16,224,17,146,21,224,17,
-250,5,8,50,128,255,56,221,10,16,224,17,146,13,3,87,
+35,22,28,0,34,95,1,0,72,90,98,95,1,0,35,87,
+25,0,35,23,29,0,234,17,170,229,35,22,32,0,35,238,
+28,0,224,17,250,5,4,50,128,255,116,219,10,16,224,17,
+210,5,61,143,1,0,98,143,1,0,35,111,93,0,35,22,
+32,0,99,111,21,0,35,86,20,0,34,127,1,0,42,135,
+1,0,240,121,234,109,35,23,89,0,224,17,186,5,0,82,
+197,5,13,80,162,81,163,82,224,17,186,5,0,90,213,5,
+35,95,97,0,162,89,163,90,235,81,185,37,13,232,99,239,
+57,0,29,208,1,202,229,21,26,16,224,17,146,21,224,17,
+250,5,8,50,128,255,8,219,10,16,224,17,146,13,3,87,
 76,0,66,87,0,0,35,87,81,0,98,87,5,0,95,202,
 72,210,224,201,170,237,29,22,8,0,99,23,93,0,149,61,
-99,119,53,0,35,134,52,0,99,135,61,0,224,17,186,5,
-0,82,197,5,14,80,162,81,163,82,224,81,186,5,0,234,
-213,13,99,23,57,0,35,239,61,0,35,22,56,0,34,103,
-1,0,61,239,1,0,172,233,163,234,35,95,61,0,35,54,
-84,0,43,95,1,0,35,62,56,0,99,95,57,0,1,66,
-35,78,76,0,128,255,20,26,35,23,89,0,99,23,57,0,
-35,86,56,0,42,135,1,0,195,234,208,233,99,239,49,0,
-65,218,247,127,7,0,239,217,190,5,191,7,252,253,24,103,
-64,0,32,150,191,255,224,225,234,119,0,0,82,97,206,94,
-1,0,198,90,11,97,35,23,89,0,88,103,64,0,99,23,
-9,0,99,23,25,0,133,21,2,55,0,0,34,63,5,0,
-128,255,26,5,10,16,224,225,170,5,2,224,35,135,25,0,
-72,130,99,135,25,0,35,95,93,0,35,86,8,0,99,95,
-9,0,35,23,25,0,42,127,1,0,239,17,225,229,35,23,
-89,0,28,232,224,17,210,13,99,23,17,0,99,95,13,0,
-2,80,165,5,72,82,235,81,234,253,2,48,128,255,240,219,
-29,80,35,191,157,0,35,199,153,0,35,207,149,0,35,215,
-145,0,35,223,141,0,35,231,137,0,35,239,133,0,35,255,
-161,0,3,30,180,0,127,0,128,7,33,0,8,16,38,71,
-5,0,232,17,206,5,32,86,15,1,133,21,38,23,49,0,
-0,74,72,18,34,87,0,0,34,143,5,0,198,81,10,48,
-63,6,232,64,129,0,113,0,0,82,64,6,63,0,144,7,
-225,0,99,71,1,0,99,7,9,0,9,224,67,63,16,0,
-99,231,18,0,99,7,21,0,99,55,13,0,49,6,104,138,
-145,0,99,143,25,0,31,130,99,135,29,0,3,48,191,255,
-242,236,10,232,224,233,186,21,3,48,191,255,96,237,10,232,
-224,233,218,13,35,71,25,0,40,71,5,0,252,65,247,5,
-28,56,38,6,200,246,132,0,128,255,20,225,29,80,80,6,
-255,0,128,7,97,0,6,232,8,16,61,71,5,0,232,17,
-206,5,32,86,15,1,245,37,132,23,169,133,68,23,172,133,
-0,74,61,23,49,0,63,6,142,65,129,0,2,22,16,0,
-34,87,0,0,34,143,5,0,221,81,10,48,113,0,0,82,
-0,18,189,135,29,0,224,129,226,5,189,127,13,0,224,121,
-170,5,1,18,130,0,224,17,226,5,29,55,12,0,0,58,
-128,255,170,3,64,6,127,0,144,7,225,16,99,71,1,0,
-99,7,9,0,67,63,16,0,99,79,18,0,99,7,21,0,
-198,222,15,0,99,55,13,0,49,6,104,138,145,0,99,143,
-25,0,31,130,99,135,29,0,3,48,191,255,38,236,10,232,
-224,233,202,53,35,23,25,0,34,23,5,0,227,119,19,0,
-226,113,183,5,99,23,18,0,132,23,169,133,68,23,172,133,
-3,48,191,255,6,237,10,232,224,233,138,37,35,231,25,0,
-3,48,191,255,128,237,0,106,10,16,60,102,29,0,194,97,
-140,87,1,0,224,81,146,13,60,134,13,0,208,17,130,127,
-1,0,224,121,170,5,1,106,141,0,224,105,242,5,28,55,
-12,0,27,56,128,255,6,3,10,232,29,80,80,6,255,16,
-3,30,76,255,99,63,169,0,99,255,161,0,99,199,157,0,
-99,207,153,0,99,215,149,0,99,223,145,0,99,231,141,0,
-99,239,137,0,8,192,9,232,230,143,9,0,201,138,99,143,
-17,0,248,63,7,0,38,6,240,246,132,0,128,255,192,223,
-0,226,99,239,101,0,99,7,109,0,99,7,118,0,99,7,
-121,0,46,6,104,138,145,0,99,119,125,0,31,106,99,111,
-129,0,99,7,133,0,35,102,2,0,99,103,5,0,35,54,
-84,0,0,58,128,255,190,12,0,218,128,7,238,1,35,54,
-100,0,35,62,16,0,191,255,140,239,10,224,224,225,178,5,
-128,7,228,1,35,54,100,0,191,255,128,240,10,224,224,81,
-178,5,128,7,210,1,35,54,100,0,191,255,244,240,224,81,
-162,5,65,218,35,239,125,0,29,239,12,0,0,18,97,234,
-198,5,101,234,174,5,1,18,130,0,224,17,186,5,128,7,
-154,1,35,54,100,0,191,255,108,236,67,239,3,0,99,87,
-37,0,67,239,68,0,99,87,73,0,35,22,68,0,34,95,
-1,0,35,86,76,0,106,95,1,0,34,23,5,0,106,23,
-5,0,35,23,89,0,99,23,29,0,35,23,93,0,99,23,
-25,0,165,29,3,103,76,0,2,80,10,95,0,0,0,18,
-236,89,138,13,42,87,5,0,35,95,81,0,235,81,170,5,
-1,18,130,0,224,17,234,13,35,22,28,0,34,95,1,0,
-72,90,98,95,1,0,35,87,25,0,35,23,29,0,234,17,
-170,229,35,22,32,0,35,238,28,0,224,17,250,5,4,50,
-128,255,220,216,10,16,224,17,210,5,61,143,1,0,98,143,
-1,0,35,111,93,0,35,22,32,0,99,111,21,0,35,86,
-20,0,34,127,1,0,42,135,1,0,240,121,234,109,35,23,
-89,0,224,17,186,5,0,82,197,5,13,80,162,81,163,82,
-224,17,186,5,0,90,213,5,35,95,97,0,162,89,163,90,
-235,81,185,37,13,232,99,239,57,0,29,208,1,202,229,21,
-26,16,224,17,146,21,224,17,250,5,8,50,128,255,112,216,
-10,16,224,17,146,13,3,87,76,0,66,87,0,0,35,87,
-81,0,98,87,5,0,95,202,72,210,224,201,170,237,29,22,
-8,0,99,23,93,0,149,61,99,111,45,0,35,94,44,0,
-99,95,53,0,224,17,186,5,0,82,197,5,13,80,162,81,
-163,82,224,81,186,5,0,234,213,13,99,23,49,0,35,239,
-53,0,35,22,48,0,34,127,1,0,61,239,1,0,175,233,
-163,234,35,119,53,0,35,54,84,0,46,119,1,0,35,62,
-48,0,99,119,49,0,1,66,35,78,76,0,128,255,76,21,
-35,23,89,0,99,23,49,0,35,86,48,0,42,95,1,0,
-195,234,203,233,99,239,41,0,248,87,7,0,234,217,190,5,
-191,7,14,254,35,23,89,0,99,23,65,0,133,21,2,55,
-0,0,34,63,5,0,128,255,116,0,10,16,224,225,170,5,
-2,224,35,135,65,0,72,130,99,135,65,0,35,95,93,0,
-35,86,60,0,99,95,61,0,35,23,65,0,42,127,1,0,
-239,17,225,229,35,23,89,0,28,232,224,17,210,13,99,23,
-13,0,99,95,9,0,2,80,165,5,72,82,235,81,234,253,
-2,48,128,255,74,215,29,80,35,199,157,0,35,207,153,0,
-35,215,149,0,35,223,145,0,35,231,141,0,35,239,137,0,
-35,255,161,0,3,30,180,0,127,0,128,7,225,0,166,0,
-97,50,145,21,210,5,98,50,146,13,102,50,235,13,6,56,
-0,50,191,255,126,242,10,232,133,21,0,50,191,255,88,245,
-10,232,181,13,0,82,229,29,38,6,20,247,132,0,32,62,
-132,9,0,66,190,255,106,192,29,48,191,255,82,240,10,224,
-224,233,242,13,61,23,53,0,3,58,72,18,34,87,0,0,
-34,135,5,0,221,81,10,48,63,6,192,69,129,0,112,0,
-28,80,64,6,255,0,158,7,33,0,6,56,3,48,191,255,
-98,242,35,23,53,0,3,88,2,22,16,0,34,87,0,0,
-34,135,5,0,203,81,10,48,63,6,240,69,129,0,112,0,
-3,48,2,58,191,255,66,243,94,6,63,0,158,7,33,0,
-7,64,6,56,3,48,191,255,12,245,3,48,191,255,66,246,
-3,48,2,58,191,255,120,245,94,6,63,0,158,7,97,0,
-7,16,8,232,6,56,2,64,3,48,191,255,232,244,29,56,
-3,48,191,255,58,246,3,48,2,58,191,255,82,245,94,6,
-127,0,128,7,33,0,166,0,191,255,66,241,138,0,64,6,
-63,0,130,7,225,16,61,6,20,152,145,0,60,6,148,140,
-145,0,59,6,204,140,145,0,37,62,204,130,38,6,104,138,
-145,0,0,66,0,74,128,255,246,34,36,62,92,139,38,6,
-4,145,145,0,2,66,0,74,128,255,228,34,39,6,236,126,
-141,0,38,6,56,145,145,0,32,70,16,0,0,74,128,255,
-206,34,36,62,36,133,1,66,99,71,1,0,38,6,112,146,
-145,0,0,74,128,255,150,37,36,62,37,133,1,66,99,71,
-1,0,38,6,168,146,145,0,0,74,128,255,128,37,36,62,
-39,133,1,66,99,71,1,0,38,6,224,146,145,0,0,74,
-128,255,106,37,36,62,84,139,3,106,99,111,1,0,38,6,
-132,143,145,0,1,66,0,74,128,255,82,37,38,6,92,144,
-145,0,36,62,12,139,1,66,99,71,1,0,0,74,128,255,
-60,37,43,6,152,123,133,0,49,6,140,144,145,0,113,95,
-1,0,36,62,205,131,38,6,64,142,145,0,1,66,128,255,
-108,38,39,6,152,119,133,0,6,82,99,87,1,0,38,6,
-92,140,145,0,32,70,0,4,0,74,128,255,0,37,28,48,
-29,56,0,66,0,74,128,255,22,34,48,6,144,125,133,0,
-124,135,49,0,124,239,53,0,27,48,29,56,0,66,0,74,
-128,255,252,33,47,6,176,125,133,0,123,127,49,0,123,239,
-53,0,37,62,126,131,38,6,4,141,145,0,2,66,0,74,
-128,255,220,33,36,62,128,140,1,114,99,119,1,0,38,6,
-80,150,145,0,2,66,0,74,128,255,162,36,38,6,136,150,
-145,0,36,62,204,133,1,66,128,255,134,37,38,6,148,144,
-145,0,36,62,20,139,1,66,99,71,1,0,0,74,128,255,
-124,36,44,6,184,123,133,0,49,6,196,144,145,0,113,103,
-1,0,36,62,204,131,38,6,120,142,145,0,1,66,0,74,
-128,255,124,33,38,6,24,147,145,0,36,62,38,133,1,66,
-128,255,62,37,36,62,92,133,99,7,1,0,38,6,156,151,
-145,0,8,66,1,74,128,255,52,36,36,62,244,131,38,6,
-188,143,145,0,32,70,16,0,0,74,128,255,66,33,39,6,
-64,242,132,0,38,6,56,141,145,0,32,70,16,0,0,74,
-128,255,44,33,39,6,224,70,133,0,38,6,172,142,145,0,
-32,70,16,0,0,74,128,255,22,33,36,62,8,132,38,6,
-240,143,145,0,8,66,0,74,128,255,4,33,39,6,144,6,
-136,0,38,6,12,142,145,0,8,66,0,74,128,255,240,32,
-39,6,20,184,145,0,38,6,224,142,145,0,8,66,0,74,
-128,255,220,32,39,6,108,119,133,0,38,6,36,140,145,0,
-32,70,16,0,128,255,246,36,39,6,128,119,133,0,38,6,
-236,139,145,0,32,70,20,0,128,255,226,36,39,6,156,6,
-136,0,38,6,248,150,145,0,4,66,0,74,128,255,160,32,
-37,62,196,130,38,6,52,138,145,0,4,66,0,74,128,255,
-142,32,37,62,192,130,38,6,0,138,145,0,4,66,0,74,
-128,255,124,32,37,62,200,130,38,6,204,137,145,0,4,66,
-0,74,128,255,106,32,38,6,180,139,145,0,29,56,0,66,
-0,74,128,255,90,32,43,6,112,125,133,0,49,6,228,139,
-145,0,113,95,1,0,32,62,194,180,49,6,232,139,145,0,
-113,239,1,0,38,6,68,149,145,0,1,66,32,78,40,0,
-128,255,44,32,38,6,124,139,145,0,29,56,0,66,0,74,
-128,255,28,32,42,6,80,125,133,0,49,6,172,139,145,0,
-113,87,1,0,37,62,188,130,49,6,176,139,145,0,113,239,
-1,0,38,6,108,141,145,0,1,66,0,74,128,255,240,31,
-38,6,68,139,145,0,29,56,0,66,0,74,128,255,224,31,
-48,6,240,124,133,0,49,6,116,139,145,0,113,135,1,0,
-37,62,208,130,49,6,120,139,145,0,113,239,1,0,38,6,
-160,141,145,0,1,66,0,74,128,255,180,31,38,6,12,139,
-145,0,29,56,0,66,0,74,128,255,164,31,47,6,16,125,
-133,0,49,6,60,139,145,0,113,127,1,0,32,22,180,180,
-49,6,64,139,145,0,113,239,1,0,2,56,38,6,120,149,
-145,0,8,66,32,78,40,0,128,255,116,31,39,6,184,29,
-148,0,38,6,36,144,145,0,2,114,99,119,1,0,1,66,
-32,78,120,4,128,255,54,34,32,62,195,180,45,6,216,123,
-133,0,49,6,84,144,145,0,113,111,1,0,2,98,99,103,
-1,0,38,6,224,149,145,0,1,66,32,78,40,0,128,255,
-12,34,32,62,196,180,2,90,99,95,1,0,38,6,24,150,
-145,0,1,66,32,78,40,0,128,255,242,33,60,6,252,126,
-141,0,28,56,38,6,108,145,145,0,4,66,32,78,96,0,
-128,255,252,30,60,62,4,0,38,6,160,145,145,0,4,66,
-32,78,96,0,128,255,232,30,60,62,65,0,38,6,8,146,
-145,0,32,70,20,0,32,78,96,0,128,255,210,30,60,62,
-24,0,38,6,60,146,145,0,32,70,40,0,32,78,96,0,
-128,255,188,30,60,62,86,0,38,6,212,145,145,0,8,66,
-32,78,96,0,128,255,168,30,38,6,212,138,145,0,29,56,
-0,66,0,74,128,255,152,30,42,6,48,125,133,0,49,6,
-4,139,145,0,113,87,1,0,36,62,130,140,49,6,8,139,
-145,0,113,239,1,0,38,6,172,149,145,0,2,66,0,74,
-128,255,108,30,38,6,156,138,145,0,29,56,0,66,0,74,
-128,255,92,30,48,6,208,124,133,0,49,6,204,138,145,0,
-113,135,1,0,38,6,204,144,145,0,49,6,208,138,145,0,
-113,239,1,0,36,62,168,133,0,66,128,255,4,34,38,6,
-212,141,145,0,36,62,172,133,0,66,128,255,244,33,38,6,
-44,151,145,0,36,62,21,133,4,66,128,255,228,33,38,6,
-100,151,145,0,36,62,20,133,4,66,128,255,212,33,36,62,
-205,133,4,122,99,127,1,0,38,6,192,150,145,0,1,66,
-0,74,128,255,200,32,36,62,168,172,38,6,216,148,145,0,
-4,66,0,74,128,255,216,29,36,62,164,172,99,7,1,0,
-38,6,12,149,145,0,4,66,0,74,128,255,160,32,37,62,
-214,130,38,6,152,137,145,0,1,66,0,74,128,255,176,29,
-38,6,104,148,145,0,36,62,7,140,1,66,99,71,1,0,
-0,74,128,255,120,32,38,6,160,148,145,0,36,62,8,140,
-61,6,248,123,133,0,49,6,152,148,145,0,113,239,1,0,
-1,66,99,71,1,0,0,74,128,255,82,32,36,62,4,140,
-49,6,208,148,145,0,113,239,1,0,1,66,99,71,1,0,
-38,6,80,147,145,0,0,74,128,255,50,32,36,62,5,140,
-1,66,99,71,1,0,38,6,136,147,145,0,0,74,128,255,
-28,32,36,62,6,140,1,66,99,71,1,0,38,6,192,147,
-145,0,0,74,128,255,6,32,37,62,212,130,38,6,100,137,
-145,0,2,66,0,74,128,255,22,29,36,62,86,139,1,130,
-99,135,1,0,38,6,76,143,145,0,2,66,0,74,128,255,
-220,31,39,6,188,228,140,0,1,122,99,127,1,0,38,6,
-20,143,145,0,2,66,2,74,128,255,194,31,39,6,24,17,
-148,0,38,6,248,147,145,0,1,114,99,119,1,0,4,66,
-4,74,128,255,168,31,39,6,52,17,148,0,38,6,48,148,
-145,0,49,6,40,148,145,0,113,239,1,0,1,106,99,111,
-1,0,4,66,4,74,128,255,132,31,49,6,96,148,145,0,
-113,239,1,0,34,6,220,118,133,0,36,119,133,133,36,127,
-137,133,36,103,117,133,98,127,57,0,36,111,129,133,98,103,
-9,0,98,119,69,0,36,95,141,133,36,103,125,133,98,95,
-21,0,98,111,81,0,36,87,145,133,36,95,121,133,98,87,
-33,0,98,103,93,0,36,135,149,133,36,87,153,133,98,135,
-45,0,98,95,105,0,36,135,157,133,98,87,117,0,36,127,
-161,133,98,135,129,0,98,127,141,0,66,6,255,16,3,30,
-232,255,99,255,5,0,99,239,1,0,213,21,41,135,1,0,
-88,130,105,135,1,0,40,127,1,0,88,122,104,127,1,0,
-41,23,1,0,47,87,1,0,98,87,1,0,47,87,5,0,
-98,87,5,0,39,111,1,0,40,119,1,0,238,105,250,229,
-6,16,9,232,224,17,250,5,4,50,128,255,18,207,10,16,
-224,17,210,5,61,103,1,0,98,103,1,0,35,239,1,0,
-35,255,5,0,3,30,24,0,127,0,128,7,33,0,224,49,
-162,13,34,6,112,118,133,0,102,23,5,0,129,58,185,5,
-128,255,188,206,64,6,63,0,38,87,1,0,127,0,127,0,
-128,7,33,0,48,6,255,255,255,31,240,57,211,5,128,255,
-174,196,0,82,213,5,7,48,195,50,128,255,178,206,64,6,
-63,0,3,30,220,255,99,255,17,0,99,231,5,0,99,223,
-9,0,99,215,13,0,6,224,99,239,1,0,7,208,8,232,
-181,29,2,216,29,16,224,17,146,21,224,17,250,5,8,50,
-128,255,124,206,10,16,224,17,146,13,27,87,0,0,66,87,
-0,0,59,87,5,0,98,87,5,0,60,135,1,0,72,234,
-72,130,124,135,1,0,58,127,1,0,60,23,1,0,239,17,
-154,229,29,80,35,215,13,0,35,223,9,0,35,231,5,0,
-35,239,1,0,35,255,17,0,3,30,36,0,127,0,128,7,
-128,7,38,87,130,7,128,7,130,7,130,7,225,0,6,232,
-7,224,224,233,178,53,34,6,144,118,133,0,125,23,5,0,
-61,23,33,0,2,6,240,255,201,13,2,6,240,255,201,5,
-61,23,13,0,181,5,61,22,12,0,2,48,128,255,208,205,
-15,130,125,135,33,0,197,5,61,23,13,0,181,5,61,22,
-12,0,125,7,29,0,67,7,3,0,35,86,3,0,10,119,
-0,0,66,119,0,0,129,226,34,6,112,118,133,0,125,23,
-5,0,201,5,29,48,128,255,150,205,66,6,255,0,38,135,
-33,0,16,6,240,255,201,5,38,23,13,0,181,5,38,22,
-12,0,2,80,127,0,128,7,33,0,128,255,158,204,64,6,
-63,0,130,7,225,0,6,232,7,224,224,233,178,53,34,6,
-144,118,133,0,125,23,5,0,61,23,33,0,2,6,240,255,
+99,111,45,0,35,94,44,0,99,95,53,0,224,17,186,5,
+0,82,197,5,13,80,162,81,163,82,224,81,186,5,0,234,
+213,13,99,23,49,0,35,239,53,0,35,22,48,0,34,127,
+1,0,61,239,1,0,175,233,163,234,35,119,53,0,35,54,
+84,0,46,119,1,0,35,62,48,0,99,119,49,0,1,66,
+35,78,76,0,128,255,140,23,35,23,89,0,99,23,49,0,
+35,86,48,0,42,95,1,0,195,234,203,233,99,239,41,0,
+248,87,7,0,234,217,190,5,191,7,14,254,35,23,89,0,
+99,23,65,0,133,21,2,55,0,0,34,63,5,0,128,255,
+116,0,10,16,224,225,170,5,2,224,35,135,65,0,72,130,
+99,135,65,0,35,95,93,0,35,86,60,0,99,95,61,0,
+35,23,65,0,42,127,1,0,239,17,225,229,35,23,89,0,
+28,232,224,17,210,13,99,23,13,0,99,95,9,0,2,80,
+165,5,72,82,235,81,234,253,2,48,128,255,226,217,29,80,
+35,199,157,0,35,207,153,0,35,215,149,0,35,223,145,0,
+35,231,141,0,35,239,137,0,35,255,161,0,3,30,180,0,
+127,0,128,7,225,0,166,0,97,50,145,21,210,5,98,50,
+146,13,102,50,235,13,6,56,0,50,191,255,126,242,10,232,
+133,21,0,50,191,255,88,245,10,232,181,13,0,82,229,29,
+38,6,140,2,133,0,32,62,132,9,0,66,190,255,94,186,
+29,48,191,255,82,240,10,224,224,233,242,13,61,23,53,0,
+3,58,72,18,34,87,0,0,34,135,5,0,221,81,10,48,
+63,6,204,75,129,0,112,0,28,80,64,6,255,0,158,7,
+33,0,6,56,3,48,191,255,98,242,35,23,53,0,3,88,
+2,22,16,0,34,87,0,0,34,135,5,0,203,81,10,48,
+63,6,252,75,129,0,112,0,3,48,2,58,191,255,66,243,
+94,6,63,0,158,7,33,0,7,64,6,56,3,48,191,255,
+12,245,3,48,191,255,66,246,3,48,2,58,191,255,120,245,
+94,6,63,0,158,7,97,0,7,16,8,232,6,56,2,64,
+3,48,191,255,232,244,29,56,3,48,191,255,58,246,3,48,
+2,58,191,255,82,245,94,6,127,0,128,7,33,0,166,0,
+191,255,66,241,138,0,64,6,63,0,130,7,225,16,61,6,
+116,163,145,0,60,6,244,151,145,0,59,6,44,152,145,0,
+37,62,212,130,38,6,200,149,145,0,0,66,0,74,128,255,
+54,37,36,62,104,139,38,6,100,156,145,0,2,66,0,74,
+128,255,36,37,39,6,76,138,141,0,38,6,152,156,145,0,
+32,70,16,0,0,74,128,255,14,37,36,62,48,133,1,66,
+99,71,1,0,38,6,208,157,145,0,0,74,128,255,214,39,
+36,62,49,133,1,66,99,71,1,0,38,6,8,158,145,0,
+0,74,128,255,192,39,36,62,51,133,1,66,99,71,1,0,
+38,6,64,158,145,0,0,74,128,255,170,39,36,62,96,139,
+3,106,99,111,1,0,38,6,228,154,145,0,1,66,0,74,
+128,255,146,39,38,6,188,155,145,0,36,62,24,139,1,66,
+99,71,1,0,0,74,128,255,124,39,43,6,248,134,133,0,
+49,6,236,155,145,0,113,95,1,0,36,62,217,131,38,6,
+160,153,145,0,1,66,128,255,172,40,39,6,248,130,133,0,
+6,82,99,87,1,0,38,6,188,151,145,0,32,70,0,4,
+0,74,128,255,64,39,28,48,29,56,0,66,0,74,128,255,
+86,36,48,6,240,136,133,0,124,135,49,0,124,239,53,0,
+27,48,29,56,0,66,0,74,128,255,60,36,47,6,16,137,
+133,0,123,127,49,0,123,239,53,0,37,62,134,131,38,6,
+100,152,145,0,2,66,0,74,128,255,28,36,36,62,140,140,
+1,114,99,119,1,0,38,6,176,161,145,0,2,66,0,74,
+128,255,226,38,38,6,232,161,145,0,36,62,216,133,1,66,
+128,255,198,39,38,6,244,155,145,0,36,62,32,139,1,66,
+99,71,1,0,0,74,128,255,188,38,44,6,24,135,133,0,
+49,6,36,156,145,0,113,103,1,0,36,62,216,131,38,6,
+216,153,145,0,1,66,0,74,128,255,188,35,38,6,120,158,
+145,0,36,62,50,133,1,66,128,255,126,39,36,62,104,133,
+99,7,1,0,38,6,252,162,145,0,8,66,1,74,128,255,
+116,38,36,62,0,132,38,6,28,155,145,0,32,70,16,0,
+0,74,128,255,130,35,39,6,184,253,132,0,38,6,152,152,
+145,0,32,70,16,0,0,74,128,255,108,35,39,6,104,82,
+133,0,38,6,12,154,145,0,32,70,16,0,0,74,128,255,
+86,35,36,62,20,132,38,6,80,155,145,0,8,66,0,74,
+128,255,68,35,39,6,240,17,136,0,38,6,108,153,145,0,
+8,66,0,74,128,255,48,35,39,6,116,195,145,0,38,6,
+64,154,145,0,8,66,0,74,128,255,28,35,39,6,204,130,
+133,0,38,6,132,151,145,0,32,70,16,0,128,255,54,39,
+39,6,224,130,133,0,38,6,76,151,145,0,32,70,20,0,
+128,255,34,39,39,6,252,17,136,0,38,6,88,162,145,0,
+4,66,0,74,128,255,224,34,37,62,204,130,38,6,148,149,
+145,0,4,66,0,74,128,255,206,34,37,62,200,130,38,6,
+96,149,145,0,4,66,0,74,128,255,188,34,37,62,208,130,
+38,6,44,149,145,0,4,66,0,74,128,255,170,34,38,6,
+20,151,145,0,29,56,0,66,0,74,128,255,154,34,43,6,
+208,136,133,0,49,6,68,151,145,0,113,95,1,0,32,62,
+194,180,49,6,72,151,145,0,113,239,1,0,38,6,164,160,
+145,0,1,66,32,78,40,0,128,255,108,34,38,6,220,150,
+145,0,29,56,0,66,0,74,128,255,92,34,42,6,176,136,
+133,0,49,6,12,151,145,0,113,87,1,0,37,62,196,130,
+49,6,16,151,145,0,113,239,1,0,38,6,204,152,145,0,
+1,66,0,74,128,255,48,34,38,6,164,150,145,0,29,56,
+0,66,0,74,128,255,32,34,48,6,80,136,133,0,49,6,
+212,150,145,0,113,135,1,0,37,62,216,130,49,6,216,150,
+145,0,113,239,1,0,38,6,0,153,145,0,1,66,0,74,
+128,255,244,33,38,6,108,150,145,0,29,56,0,66,0,74,
+128,255,228,33,47,6,112,136,133,0,49,6,156,150,145,0,
+113,127,1,0,32,22,180,180,49,6,160,150,145,0,113,239,
+1,0,2,56,38,6,216,160,145,0,8,66,32,78,40,0,
+128,255,180,33,39,6,24,41,148,0,38,6,132,155,145,0,
+2,114,99,119,1,0,1,66,32,78,120,4,128,255,118,36,
+32,62,195,180,45,6,56,135,133,0,49,6,180,155,145,0,
+113,111,1,0,2,98,99,103,1,0,38,6,64,161,145,0,
+1,66,32,78,40,0,128,255,76,36,32,62,196,180,2,90,
+99,95,1,0,38,6,120,161,145,0,1,66,32,78,40,0,
+128,255,50,36,60,6,92,138,141,0,28,56,38,6,204,156,
+145,0,4,66,32,78,96,0,128,255,60,33,60,62,4,0,
+38,6,0,157,145,0,4,66,32,78,96,0,128,255,40,33,
+60,62,65,0,38,6,104,157,145,0,32,70,20,0,32,78,
+96,0,128,255,18,33,60,62,24,0,38,6,156,157,145,0,
+32,70,40,0,32,78,96,0,128,255,252,32,60,62,86,0,
+38,6,52,157,145,0,8,66,32,78,96,0,128,255,232,32,
+38,6,52,150,145,0,29,56,0,66,0,74,128,255,216,32,
+42,6,144,136,133,0,49,6,100,150,145,0,113,87,1,0,
+36,62,142,140,49,6,104,150,145,0,113,239,1,0,38,6,
+12,161,145,0,2,66,0,74,128,255,172,32,38,6,252,149,
+145,0,29,56,0,66,0,74,128,255,156,32,48,6,48,136,
+133,0,49,6,44,150,145,0,113,135,1,0,38,6,44,156,
+145,0,49,6,48,150,145,0,113,239,1,0,36,62,180,133,
+0,66,128,255,68,36,38,6,52,153,145,0,36,62,184,133,
+0,66,128,255,52,36,38,6,140,162,145,0,36,62,33,133,
+4,66,128,255,36,36,38,6,196,162,145,0,36,62,32,133,
+4,66,128,255,20,36,36,62,217,133,4,122,99,127,1,0,
+38,6,32,162,145,0,1,66,0,74,128,255,8,35,36,62,
+180,172,38,6,56,160,145,0,4,66,0,74,128,255,24,32,
+36,62,176,172,99,7,1,0,38,6,108,160,145,0,4,66,
+0,74,128,255,224,34,37,62,222,130,38,6,248,148,145,0,
+1,66,0,74,128,255,240,31,38,6,200,159,145,0,36,62,
+19,140,1,66,99,71,1,0,0,74,128,255,184,34,38,6,
+0,160,145,0,36,62,20,140,61,6,88,135,133,0,49,6,
+248,159,145,0,113,239,1,0,1,66,99,71,1,0,0,74,
+128,255,146,34,36,62,16,140,49,6,48,160,145,0,113,239,
+1,0,1,66,99,71,1,0,38,6,176,158,145,0,0,74,
+128,255,114,34,36,62,17,140,1,66,99,71,1,0,38,6,
+232,158,145,0,0,74,128,255,92,34,36,62,18,140,1,66,
+99,71,1,0,38,6,32,159,145,0,0,74,128,255,70,34,
+37,62,220,130,38,6,196,148,145,0,2,66,0,74,128,255,
+86,31,36,62,98,139,1,130,99,135,1,0,38,6,172,154,
+145,0,2,66,0,74,128,255,28,34,39,6,28,240,140,0,
+1,122,99,127,1,0,38,6,116,154,145,0,2,66,2,74,
+128,255,2,34,39,6,120,28,148,0,38,6,88,159,145,0,
+1,114,99,119,1,0,4,66,4,74,128,255,232,33,39,6,
+148,28,148,0,38,6,144,159,145,0,49,6,136,159,145,0,
+113,239,1,0,1,106,99,111,1,0,4,66,4,74,128,255,
+196,33,49,6,192,159,145,0,113,239,1,0,34,6,60,130,
+133,0,36,119,145,133,36,127,149,133,36,103,129,133,98,127,
+57,0,36,111,141,133,98,103,9,0,98,119,69,0,36,95,
+153,133,36,103,137,133,98,95,21,0,98,111,81,0,36,87,
+157,133,36,95,133,133,98,87,33,0,98,103,93,0,36,135,
+161,133,36,87,165,133,98,135,45,0,98,95,105,0,36,135,
+169,133,98,87,117,0,36,127,173,133,98,135,129,0,98,127,
+141,0,66,6,255,16,3,30,232,255,99,255,5,0,99,239,
+1,0,213,21,41,135,1,0,88,130,105,135,1,0,40,127,
+1,0,88,122,104,127,1,0,41,23,1,0,47,87,1,0,
+98,87,1,0,47,87,5,0,98,87,5,0,39,111,1,0,
+40,119,1,0,238,105,250,229,6,16,9,232,224,17,250,5,
+4,50,128,255,170,209,10,16,224,17,210,5,61,103,1,0,
+98,103,1,0,35,239,1,0,35,255,5,0,3,30,24,0,
+127,0,128,7,33,0,224,49,162,13,34,6,208,129,133,0,
+102,23,5,0,129,58,185,5,128,255,84,209,64,6,63,0,
+38,87,1,0,127,0,127,0,128,7,33,0,48,6,255,255,
+255,31,240,57,211,5,128,255,70,199,0,82,213,5,7,48,
+195,50,128,255,74,209,64,6,63,0,3,30,220,255,99,255,
+17,0,99,231,5,0,99,223,9,0,99,215,13,0,6,224,
+99,239,1,0,7,208,8,232,181,29,2,216,29,16,224,17,
+146,21,224,17,250,5,8,50,128,255,20,209,10,16,224,17,
+146,13,27,87,0,0,66,87,0,0,59,87,5,0,98,87,
+5,0,60,135,1,0,72,234,72,130,124,135,1,0,58,127,
+1,0,60,23,1,0,239,17,154,229,29,80,35,215,13,0,
+35,223,9,0,35,231,5,0,35,239,1,0,35,255,17,0,
+3,30,36,0,127,0,128,7,128,7,128,7,225,48,8,224,
+6,232,61,135,21,0,7,216,251,129,185,5,128,255,164,206,
+61,23,21,0,187,17,252,17,169,5,2,224,224,225,146,69,
+29,48,128,255,154,1,27,208,202,209,29,48,128,255,144,1,
+27,16,202,17,28,80,61,119,21,0,194,81,187,113,188,113,
+162,37,26,104,10,16,14,120,194,121,13,96,162,97,15,88,
+162,89,235,97,139,21,14,80,205,81,10,110,255,255,15,22,
+255,255,95,18,2,135,1,0,95,106,77,135,1,0,95,114,
+154,253,149,13,65,18,2,127,255,255,65,106,77,127,255,255,
+95,114,154,253,61,223,21,0,29,48,188,217,27,56,0,66,
+128,255,66,0,224,81,210,5,29,48,27,56,128,255,16,0,
+29,80,64,6,255,48,38,87,21,0,127,0,130,7,225,0,
+7,232,6,224,128,255,8,1,124,239,21,0,67,7,3,0,
+35,22,3,0,2,135,0,0,202,233,93,135,0,0,66,6,
+255,0,130,7,225,112,6,232,7,224,8,216,155,0,126,226,
+179,5,128,255,184,204,61,135,25,0,252,129,185,53,224,217,
+178,5,0,18,181,5,61,23,21,0,2,216,156,214,15,0,
+126,210,163,5,28,208,26,54,1,0,128,255,178,207,10,200,
+224,217,146,13,29,48,128,255,166,0,25,48,10,56,27,64,
+190,255,228,170,29,48,1,58,128,255,196,0,125,207,5,0,
+125,215,25,0,29,48,128,255,134,0,125,223,21,0,67,7,
+3,0,35,22,3,0,2,119,0,0,202,217,91,119,0,0,
+165,29,224,217,146,13,28,6,240,255,225,5,29,48,1,58,
+128,255,140,0,133,21,224,225,234,13,125,7,21,0,29,48,
+128,255,76,0,67,7,2,0,35,22,2,0,2,103,0,0,
+74,103,0,0,224,225,234,87,0,0,66,6,255,112,128,7,
+225,16,7,216,0,234,6,224,128,255,36,0,251,81,171,13,
+28,48,128,255,26,0,60,23,21,0,202,17,226,217,169,5,
+1,234,157,0,29,80,138,0,64,6,255,16,38,135,25,0,
+16,6,240,255,201,5,38,23,5,0,181,5,38,22,4,0,
+2,80,127,0,38,135,25,0,16,6,240,255,201,5,38,23,
+5,0,181,5,38,22,4,0,2,80,127,0,130,7,97,0,
+6,232,135,0,224,57,146,21,61,23,25,0,2,6,240,255,
+201,13,2,6,240,255,201,5,61,23,5,0,181,5,61,22,
+4,0,2,48,128,255,136,206,15,122,125,127,25,0,197,5,
+61,23,5,0,181,5,61,22,4,0,125,7,21,0,67,7,
+3,0,35,86,3,0,10,111,0,0,66,111,0,0,66,6,
+127,0,130,7,225,0,6,232,7,224,224,233,178,53,34,6,
+240,129,133,0,125,23,5,0,61,23,33,0,2,6,240,255,
 201,13,2,6,240,255,201,5,61,23,13,0,181,5,61,22,
-12,0,2,48,128,255,56,205,15,130,125,135,33,0,197,5,
+12,0,2,48,128,255,40,206,15,130,125,135,33,0,197,5,
 61,23,13,0,181,5,61,22,12,0,125,7,29,0,67,7,
 3,0,35,86,3,0,10,119,0,0,66,119,0,0,129,226,
-34,6,112,118,133,0,125,23,5,0,201,5,29,48,128,255,
-254,204,66,6,255,0,128,7,33,0,128,255,30,204,64,6,
-63,0,176,7,225,241,61,6,108,119,133,0,6,216,123,7,
-5,0,123,7,9,0,123,7,13,0,7,224,224,225,202,5,
-0,82,128,7,66,10,48,6,255,255,255,31,240,225,187,5,
-128,7,6,10,42,6,88,242,132,0,131,127,5,0,67,127,
-5,0,15,114,99,119,93,0,197,5,35,23,73,0,181,5,
-35,22,72,0,99,7,89,0,67,7,6,0,35,94,6,0,
-11,103,0,0,66,103,0,0,10,16,65,18,2,95,255,255,
-224,89,202,253,10,200,2,222,255,255,170,217,35,230,68,0,
-60,23,25,0,0,82,2,6,240,255,201,5,60,95,5,0,
-181,5,60,94,4,0,249,89,251,13,2,6,240,255,201,5,
-60,95,5,0,181,5,60,94,4,0,60,135,21,0,203,129,
-240,201,169,5,1,82,138,0,224,81,186,5,128,7,160,3,
-2,6,240,255,201,5,60,23,5,0,181,5,60,22,4,0,
-162,201,60,23,21,0,249,17,201,5,28,48,128,255,36,202,
-60,87,21,0,10,16,185,17,226,217,169,5,27,16,64,214,
-134,0,58,215,153,132,2,216,217,217,251,81,201,5,28,48,
-128,255,0,202,60,23,21,0,187,17,250,17,169,5,2,208,
-224,209,186,5,128,7,154,1,60,87,25,0,10,6,240,255,
-201,5,60,103,5,0,181,5,60,102,4,0,27,88,204,89,
-10,6,240,255,201,5,60,87,5,0,181,5,60,86,4,0,
-202,217,26,80,219,81,186,17,162,37,11,96,10,88,2,104,
-203,105,12,80,171,81,13,128,171,129,240,81,139,21,2,120,
-204,121,15,102,255,255,13,94,255,255,95,90,11,119,1,0,
-95,98,76,119,1,0,95,18,154,253,149,13,65,90,11,111,
-255,255,65,98,76,111,255,255,95,18,154,253,60,223,21,0,
-186,217,126,218,195,5,28,48,128,255,82,200,60,95,25,0,
-251,89,153,93,60,199,21,0,155,214,15,0,126,210,163,5,
-27,208,26,54,1,0,128,255,86,203,10,184,224,193,146,21,
-60,87,25,0,23,88,10,6,240,255,201,5,60,23,5,0,
-181,5,60,22,4,0,11,48,2,56,24,64,190,255,28,175,
-60,23,25,0,2,6,240,255,201,13,2,6,240,255,201,5,
-60,23,5,0,181,5,60,22,4,0,2,48,128,255,240,202,
-15,130,124,135,25,0,197,5,60,23,5,0,181,5,60,22,
-4,0,124,7,21,0,67,7,9,0,35,86,9,0,10,119,
-0,0,66,119,0,0,26,6,240,255,124,191,5,0,124,215,
-25,0,185,5,23,16,181,5,60,22,4,0,124,199,21,0,
-67,7,8,0,194,193,35,22,8,0,2,95,0,0,88,95,
-0,0,245,21,224,217,218,21,60,87,25,0,124,7,21,0,
-10,6,240,255,201,5,60,23,5,0,181,5,60,22,4,0,
-67,7,7,0,35,86,7,0,10,135,0,0,66,135,0,0,
-224,217,226,21,60,111,25,0,13,6,240,255,201,5,60,23,
-5,0,181,5,60,22,4,0,124,223,21,0,67,7,10,0,
-194,217,35,22,10,0,2,95,0,0,91,95,0,0,60,95,
-21,0,25,72,233,89,169,5,11,72,224,73,186,5,128,7,
-250,2,60,23,25,0,2,6,240,255,201,5,60,87,5,0,
-181,5,60,86,4,0,10,96,2,6,240,255,201,5,60,23,
-5,0,181,5,60,22,4,0,9,80,194,81,11,16,169,17,
-146,37,10,88,2,104,203,105,12,80,171,81,13,128,171,129,
-240,81,139,21,2,120,204,121,15,102,255,255,13,94,255,255,
-95,90,11,119,1,0,95,98,76,119,1,0,95,18,154,253,
-149,13,65,90,11,111,255,255,65,98,76,111,255,255,95,18,
-154,253,60,223,21,0,169,217,126,218,195,5,28,48,128,255,
-172,198,60,95,25,0,251,89,153,93,60,207,21,0,155,214,
-15,0,126,210,163,5,27,208,26,54,1,0,128,255,176,201,
-10,192,224,201,146,21,60,87,25,0,24,88,10,6,240,255,
-201,5,60,23,5,0,181,5,60,22,4,0,11,48,2,56,
-25,64,190,255,118,173,60,23,25,0,2,6,240,255,201,13,
-2,6,240,255,201,5,60,23,5,0,181,5,60,22,4,0,
-2,48,128,255,74,201,15,130,124,135,25,0,197,5,60,23,
-5,0,181,5,60,22,4,0,124,7,21,0,67,7,13,0,
-35,86,13,0,10,119,0,0,66,119,0,0,26,6,240,255,
-124,199,5,0,124,215,25,0,185,5,24,16,181,5,60,22,
-4,0,124,207,21,0,67,7,12,0,194,201,35,22,12,0,
-2,95,0,0,89,95,0,0,245,21,224,217,218,21,60,87,
-25,0,124,7,21,0,10,6,240,255,201,5,60,23,5,0,
-181,5,60,22,4,0,67,7,11,0,35,86,11,0,10,135,
-0,0,66,135,0,0,224,217,186,5,128,7,142,1,60,111,
-25,0,13,6,240,255,201,5,60,23,5,0,181,5,60,22,
-4,0,124,223,21,0,67,7,14,0,194,217,35,22,14,0,
-2,95,0,0,91,95,0,0,128,7,96,1,126,218,195,5,
-28,48,128,255,136,197,60,23,25,0,251,17,217,69,155,214,
-15,0,126,210,163,5,27,208,26,54,1,0,128,255,144,200,
-60,23,25,0,10,192,2,6,240,255,201,13,2,6,240,255,
-201,5,60,23,5,0,181,5,60,22,4,0,2,48,128,255,
-78,200,15,82,124,87,25,0,197,5,60,23,5,0,181,5,
-60,22,4,0,124,7,21,0,67,7,17,0,35,86,17,0,
-10,127,0,0,66,127,0,0,26,6,240,255,124,199,5,0,
-124,215,25,0,185,5,24,80,181,5,60,86,4,0,124,7,
-21,0,10,16,67,7,16,0,35,86,16,0,10,103,0,0,
-66,103,0,0,197,61,27,6,240,255,177,37,2,6,240,255,
-201,13,2,6,240,255,201,5,60,23,5,0,181,5,60,22,
-4,0,2,48,128,255,216,199,15,90,124,95,25,0,197,5,
-60,23,5,0,181,5,60,22,4,0,124,7,21,0,67,7,
-18,0,35,86,18,0,10,135,0,0,66,135,0,0,245,21,
-224,217,218,21,60,127,25,0,124,7,21,0,15,6,240,255,
-201,5,60,23,5,0,181,5,60,22,4,0,67,7,15,0,
-35,86,15,0,10,119,0,0,66,119,0,0,224,217,210,37,
-60,95,25,0,11,6,240,255,201,5,60,23,5,0,181,5,
-60,22,4,0,2,48,25,56,27,64,190,255,110,171,60,87,
-25,0,10,6,240,255,201,5,60,23,5,0,181,5,60,22,
-4,0,124,223,21,0,67,7,19,0,194,217,35,22,19,0,
-2,127,0,0,91,127,0,0,37,22,172,130,99,23,33,0,
-35,214,68,0,61,22,36,255,99,23,37,0,15,106,154,119,
-1,0,67,119,3,0,99,111,65,0,197,5,35,23,45,0,
-181,5,35,22,44,0,99,7,61,0,67,7,20,0,35,86,
-20,0,10,95,0,0,66,95,0,0,64,94,134,0,43,95,
-153,132,58,231,21,0,11,16,252,17,169,5,2,224,35,86,
-40,0,250,81,178,5,128,7,200,1,35,135,61,0,11,216,
-252,129,217,5,35,54,40,0,128,255,216,196,35,23,61,0,
-188,17,251,17,169,5,2,216,224,217,186,5,128,7,22,3,
-35,87,65,0,10,6,240,255,201,5,35,103,45,0,181,5,
-35,102,44,0,28,88,204,89,10,6,240,255,201,5,35,87,
-45,0,181,5,35,86,44,0,202,225,27,80,220,81,187,17,
-162,37,11,112,10,88,2,80,203,81,14,104,171,105,10,96,
-171,97,236,105,139,21,2,88,206,89,11,118,255,255,10,94,
-255,255,95,90,11,87,1,0,95,114,78,87,1,0,95,18,
-154,253,149,13,65,90,11,135,255,255,65,114,78,135,255,255,
-95,18,154,253,35,231,61,0,187,225,126,226,211,5,35,54,
-40,0,128,255,40,195,35,119,65,0,252,113,137,93,35,215,
-61,0,156,222,15,0,126,218,163,5,28,216,27,54,1,0,
-128,255,44,198,10,200,224,209,130,21,35,111,65,0,13,6,
-240,255,201,5,35,23,45,0,181,5,35,22,44,0,10,48,
-2,56,26,64,190,255,244,169,35,23,65,0,2,6,240,255,
-201,13,2,6,240,255,201,5,35,23,45,0,181,5,35,22,
-44,0,2,48,128,255,200,197,15,98,99,103,65,0,197,5,
-35,23,45,0,181,5,35,22,44,0,99,7,61,0,67,7,
-23,0,35,86,23,0,10,87,0,0,66,87,0,0,27,6,
-240,255,99,207,45,0,99,223,65,0,185,5,25,16,181,5,
-35,22,44,0,99,215,61,0,67,7,22,0,194,209,35,22,
-22,0,2,119,0,0,90,119,0,0,245,21,224,225,218,21,
-35,111,65,0,99,7,61,0,13,6,240,255,201,5,35,23,
-45,0,181,5,35,22,44,0,67,7,21,0,35,86,21,0,
-10,103,0,0,66,103,0,0,224,225,186,5,128,7,166,1,
-35,135,65,0,16,6,240,255,201,5,35,23,45,0,181,5,
-35,22,44,0,99,231,61,0,67,7,24,0,194,225,35,22,
-24,0,2,119,0,0,92,119,0,0,128,7,120,1,126,226,
-211,5,35,54,40,0,128,255,4,194,35,23,65,0,252,17,
-217,69,156,222,15,0,126,218,163,5,28,216,27,54,1,0,
-128,255,12,197,35,23,65,0,10,200,2,6,240,255,201,13,
-2,6,240,255,201,5,35,23,45,0,181,5,35,22,44,0,
-2,48,128,255,202,196,15,106,99,111,65,0,197,5,35,23,
-45,0,181,5,35,22,44,0,99,7,61,0,67,7,27,0,
-35,86,27,0,10,95,0,0,66,95,0,0,27,6,240,255,
-99,207,45,0,99,223,65,0,185,5,25,80,181,5,35,86,
-44,0,99,7,61,0,10,16,67,7,26,0,35,86,26,0,
-10,127,0,0,66,127,0,0,197,61,28,6,240,255,177,37,
-2,6,240,255,201,13,2,6,240,255,201,5,35,23,45,0,
-181,5,35,22,44,0,2,48,128,255,84,196,15,114,99,119,
-65,0,197,5,35,23,45,0,181,5,35,22,44,0,99,7,
-61,0,67,7,28,0,35,86,28,0,10,103,0,0,66,103,
-0,0,245,21,224,225,218,21,35,95,65,0,99,7,61,0,
-11,6,240,255,201,5,35,23,45,0,181,5,35,22,44,0,
-67,7,25,0,35,86,25,0,10,87,0,0,66,87,0,0,
-224,225,130,53,35,119,65,0,14,6,240,255,201,5,35,23,
-45,0,181,5,35,22,44,0,58,111,25,0,2,80,13,6,
-240,255,201,5,58,23,5,0,181,5,58,22,4,0,10,48,
-2,56,28,64,190,255,212,167,35,103,65,0,12,6,240,255,
-201,5,35,23,45,0,181,5,35,22,44,0,99,231,61,0,
-67,7,29,0,194,225,35,22,29,0,2,87,0,0,92,87,
-0,0,61,22,68,255,99,23,37,0,64,134,134,0,48,135,
-221,131,35,230,32,0,224,129,242,5,28,48,16,120,63,6,
-6,89,129,0,111,0,60,23,5,0,63,6,34,89,129,0,
-2,22,24,0,34,87,0,0,34,119,5,0,220,81,10,48,
-110,0,28,48,128,255,132,194,61,22,36,255,99,23,37,0,
-35,23,65,0,2,6,240,255,201,13,2,6,240,255,201,5,
-35,23,45,0,181,5,35,22,44,0,2,48,128,255,48,195,
-15,106,99,111,65,0,197,5,35,23,45,0,181,5,35,22,
-44,0,99,7,61,0,67,7,30,0,35,86,30,0,10,95,
-0,0,66,95,0,0,61,22,4,255,99,23,37,0,35,23,
-93,0,2,6,240,255,201,13,2,6,240,255,201,5,35,23,
-73,0,181,5,35,22,72,0,2,48,128,255,226,194,15,82,
-99,87,93,0,197,5,35,23,73,0,181,5,35,22,72,0,
-99,7,89,0,67,7,31,0,35,86,31,0,10,127,0,0,
-66,127,0,0,245,21,46,6,255,255,255,31,238,225,211,5,
-128,255,188,184,0,18,229,5,28,48,195,50,128,255,192,194,
-10,16,123,23,5,0,123,23,9,0,195,226,194,225,123,231,
-13,0,1,82,112,6,255,241,190,7,225,241,3,30,24,255,
-41,87,1,0,35,22,28,1,98,87,1,0,7,184,41,87,
-5,0,8,216,98,87,5,0,6,224,60,23,5,0,61,6,
-108,119,133,0,224,17,186,5,0,82,213,5,60,87,13,0,
-162,81,163,82,10,208,224,217,186,5,128,7,46,14,224,17,
-186,5,0,82,213,5,60,87,9,0,162,81,163,82,44,6,
-255,255,255,31,170,97,251,97,177,5,128,7,254,9,43,6,
-108,242,132,0,131,87,9,0,67,87,9,0,15,130,99,135,
-97,1,197,5,35,23,77,1,181,5,35,22,76,1,99,7,
-93,1,67,7,10,0,35,86,10,0,10,119,0,0,66,119,
-0,0,11,16,65,18,2,111,255,255,224,105,202,253,11,200,
-0,82,2,222,255,255,35,230,72,1,60,23,25,0,171,217,
-2,6,240,255,201,5,60,95,5,0,181,5,60,94,4,0,
-249,89,251,13,2,6,240,255,201,5,60,103,5,0,181,5,
-60,102,4,0,60,95,21,0,204,89,235,201,169,5,1,82,
-138,0,224,81,186,5,128,7,152,3,2,6,240,255,201,5,
-60,23,5,0,181,5,60,22,4,0,162,201,60,23,21,0,
-249,17,201,5,28,48,128,255,138,191,60,87,21,0,10,16,
-185,17,226,217,169,5,27,16,64,214,134,0,58,215,153,132,
-2,216,217,217,251,81,201,5,28,48,128,255,102,191,60,23,
-21,0,187,17,250,17,169,5,2,208,224,209,186,5,128,7,
-150,1,60,87,25,0,10,6,240,255,201,5,60,103,5,0,
-181,5,60,102,4,0,27,88,204,89,10,6,240,255,201,5,
-60,87,5,0,181,5,60,86,4,0,202,217,26,80,219,81,
-186,17,146,37,11,104,2,112,202,113,13,96,170,97,14,88,
-170,89,235,97,139,21,2,80,205,81,10,110,255,255,14,86,
-255,255,95,82,10,135,1,0,95,106,77,135,1,0,95,18,
-154,253,149,13,65,82,10,127,255,255,65,106,77,127,255,255,
+34,6,208,129,133,0,125,23,5,0,201,5,29,48,128,255,
+238,205,66,6,255,0,38,135,33,0,16,6,240,255,201,5,
+38,23,13,0,181,5,38,22,12,0,2,80,127,0,128,7,
+33,0,128,255,246,204,64,6,63,0,130,7,225,0,6,232,
+7,224,224,233,178,53,34,6,240,129,133,0,125,23,5,0,
+61,23,33,0,2,6,240,255,201,13,2,6,240,255,201,5,
+61,23,13,0,181,5,61,22,12,0,2,48,128,255,144,205,
+15,130,125,135,33,0,197,5,61,23,13,0,181,5,61,22,
+12,0,125,7,29,0,67,7,3,0,35,86,3,0,10,119,
+0,0,66,119,0,0,129,226,34,6,208,129,133,0,125,23,
+5,0,201,5,29,48,128,255,86,205,66,6,255,0,128,7,
+33,0,128,255,118,204,64,6,63,0,176,7,225,241,61,6,
+204,130,133,0,6,216,123,7,5,0,123,7,9,0,123,7,
+13,0,7,224,224,225,202,5,0,82,128,7,66,10,48,6,
+255,255,255,31,240,225,187,5,128,7,6,10,42,6,208,253,
+132,0,131,127,5,0,67,127,5,0,15,114,99,119,93,0,
+197,5,35,23,73,0,181,5,35,22,72,0,99,7,89,0,
+67,7,6,0,35,94,6,0,11,103,0,0,66,103,0,0,
+10,16,65,18,2,95,255,255,224,89,202,253,10,200,2,222,
+255,255,170,217,35,230,68,0,60,23,25,0,0,82,2,6,
+240,255,201,5,60,95,5,0,181,5,60,94,4,0,249,89,
+251,13,2,6,240,255,201,5,60,95,5,0,181,5,60,94,
+4,0,60,135,21,0,203,129,240,201,169,5,1,82,138,0,
+224,81,186,5,128,7,160,3,2,6,240,255,201,5,60,23,
+5,0,181,5,60,22,4,0,162,201,60,23,21,0,249,17,
+201,5,28,48,128,255,124,202,60,87,21,0,10,16,185,17,
+226,217,169,5,27,16,64,214,134,0,58,215,249,143,2,216,
+217,217,251,81,201,5,28,48,128,255,88,202,60,23,21,0,
+187,17,250,17,169,5,2,208,224,209,186,5,128,7,154,1,
+60,87,25,0,10,6,240,255,201,5,60,103,5,0,181,5,
+60,102,4,0,27,88,204,89,10,6,240,255,201,5,60,87,
+5,0,181,5,60,86,4,0,202,217,26,80,219,81,186,17,
+162,37,11,96,10,88,2,104,203,105,12,80,171,81,13,128,
+171,129,240,81,139,21,2,120,204,121,15,102,255,255,13,94,
+255,255,95,90,11,119,1,0,95,98,76,119,1,0,95,18,
+154,253,149,13,65,90,11,111,255,255,65,98,76,111,255,255,
 95,18,154,253,60,223,21,0,186,217,126,218,195,5,28,48,
-128,255,186,189,60,111,25,0,251,105,137,93,60,199,21,0,
+128,255,170,200,60,95,25,0,251,89,153,93,60,199,21,0,
 155,214,15,0,126,210,163,5,27,208,26,54,1,0,128,255,
-190,192,10,184,224,193,130,21,60,103,25,0,12,6,240,255,
-201,5,60,23,5,0,181,5,60,22,4,0,10,48,2,56,
-24,64,190,255,134,164,60,23,25,0,2,6,240,255,201,13,
-2,6,240,255,201,5,60,23,5,0,181,5,60,22,4,0,
-2,48,128,255,90,192,15,90,124,95,25,0,197,5,60,23,
-5,0,181,5,60,22,4,0,124,7,21,0,67,7,13,0,
-35,86,13,0,10,135,0,0,66,135,0,0,26,6,240,255,
-124,191,5,0,124,215,25,0,185,5,23,16,181,5,60,22,
-4,0,124,199,21,0,67,7,12,0,194,193,35,22,12,0,
-2,111,0,0,88,111,0,0,245,21,224,217,218,21,60,103,
-25,0,124,7,21,0,12,6,240,255,201,5,60,23,5,0,
-181,5,60,22,4,0,67,7,11,0,35,86,11,0,10,95,
-0,0,66,95,0,0,224,217,226,21,60,127,25,0,15,6,
-240,255,201,5,60,23,5,0,181,5,60,22,4,0,124,223,
-21,0,67,7,14,0,194,217,35,22,14,0,2,111,0,0,
-91,111,0,0,60,95,21,0,25,112,238,89,169,5,11,112,
-224,113,186,5,128,7,246,2,60,23,25,0,2,6,240,255,
-201,5,60,87,5,0,181,5,60,86,4,0,10,96,2,6,
-240,255,201,5,60,23,5,0,181,5,60,22,4,0,14,80,
-194,81,11,16,174,17,130,37,2,120,202,121,12,104,170,97,
-15,88,170,89,235,97,139,21,2,80,205,81,10,110,255,255,
-15,86,255,255,95,82,10,135,1,0,95,106,77,135,1,0,
-95,18,154,253,149,13,65,82,10,127,255,255,65,106,77,127,
-255,255,95,18,154,253,60,223,21,0,174,217,126,218,195,5,
-28,48,128,255,24,188,60,111,25,0,251,105,137,93,60,207,
-21,0,155,214,15,0,126,210,163,5,27,208,26,54,1,0,
-128,255,28,191,10,192,224,201,130,21,60,103,25,0,12,6,
-240,255,201,5,60,23,5,0,181,5,60,22,4,0,10,48,
-2,56,25,64,190,255,228,162,60,23,25,0,2,6,240,255,
+174,203,10,184,224,193,146,21,60,87,25,0,23,88,10,6,
+240,255,201,5,60,23,5,0,181,5,60,22,4,0,11,48,
+2,56,24,64,190,255,208,166,60,23,25,0,2,6,240,255,
 201,13,2,6,240,255,201,5,60,23,5,0,181,5,60,22,
-4,0,2,48,128,255,184,190,15,90,124,95,25,0,197,5,
+4,0,2,48,128,255,72,203,15,130,124,135,25,0,197,5,
 60,23,5,0,181,5,60,22,4,0,124,7,21,0,67,7,
-17,0,35,86,17,0,10,135,0,0,66,135,0,0,26,6,
-240,255,124,199,5,0,124,215,25,0,185,5,24,16,181,5,
-60,22,4,0,124,207,21,0,67,7,16,0,194,201,35,22,
-16,0,2,111,0,0,89,111,0,0,245,21,224,217,218,21,
-60,103,25,0,124,7,21,0,12,6,240,255,201,5,60,23,
-5,0,181,5,60,22,4,0,67,7,15,0,35,86,15,0,
-10,95,0,0,66,95,0,0,224,217,186,5,128,7,142,1,
-60,127,25,0,15,6,240,255,201,5,60,23,5,0,181,5,
-60,22,4,0,124,223,21,0,67,7,18,0,194,217,35,22,
-18,0,2,111,0,0,91,111,0,0,128,7,96,1,126,218,
-195,5,28,48,128,255,246,186,60,23,25,0,251,17,217,69,
-155,214,15,0,126,210,163,5,27,208,26,54,1,0,128,255,
-254,189,60,23,25,0,10,192,2,6,240,255,201,13,2,6,
-240,255,201,5,60,23,5,0,181,5,60,22,4,0,2,48,
-128,255,188,189,15,98,124,103,25,0,197,5,60,23,5,0,
-181,5,60,22,4,0,124,7,21,0,67,7,21,0,35,86,
-21,0,10,87,0,0,66,87,0,0,26,6,240,255,124,199,
-5,0,124,215,25,0,185,5,24,80,181,5,60,86,4,0,
-124,7,21,0,10,16,67,7,20,0,35,86,20,0,10,119,
-0,0,66,119,0,0,197,61,27,6,240,255,177,37,2,6,
-240,255,201,13,2,6,240,255,201,5,60,23,5,0,181,5,
-60,22,4,0,2,48,128,255,70,189,15,106,124,111,25,0,
-197,5,60,23,5,0,181,5,60,22,4,0,124,7,21,0,
-67,7,22,0,35,86,22,0,10,95,0,0,66,95,0,0,
+9,0,35,86,9,0,10,119,0,0,66,119,0,0,26,6,
+240,255,124,191,5,0,124,215,25,0,185,5,23,16,181,5,
+60,22,4,0,124,199,21,0,67,7,8,0,194,193,35,22,
+8,0,2,95,0,0,88,95,0,0,245,21,224,217,218,21,
+60,87,25,0,124,7,21,0,10,6,240,255,201,5,60,23,
+5,0,181,5,60,22,4,0,67,7,7,0,35,86,7,0,
+10,135,0,0,66,135,0,0,224,217,226,21,60,111,25,0,
+13,6,240,255,201,5,60,23,5,0,181,5,60,22,4,0,
+124,223,21,0,67,7,10,0,194,217,35,22,10,0,2,95,
+0,0,91,95,0,0,60,95,21,0,25,72,233,89,169,5,
+11,72,224,73,186,5,128,7,250,2,60,23,25,0,2,6,
+240,255,201,5,60,87,5,0,181,5,60,86,4,0,10,96,
+2,6,240,255,201,5,60,23,5,0,181,5,60,22,4,0,
+9,80,194,81,11,16,169,17,146,37,10,88,2,104,203,105,
+12,80,171,81,13,128,171,129,240,81,139,21,2,120,204,121,
+15,102,255,255,13,94,255,255,95,90,11,119,1,0,95,98,
+76,119,1,0,95,18,154,253,149,13,65,90,11,111,255,255,
+65,98,76,111,255,255,95,18,154,253,60,223,21,0,169,217,
+126,218,195,5,28,48,128,255,4,199,60,95,25,0,251,89,
+153,93,60,207,21,0,155,214,15,0,126,210,163,5,27,208,
+26,54,1,0,128,255,8,202,10,192,224,201,146,21,60,87,
+25,0,24,88,10,6,240,255,201,5,60,23,5,0,181,5,
+60,22,4,0,11,48,2,56,25,64,190,255,42,165,60,23,
+25,0,2,6,240,255,201,13,2,6,240,255,201,5,60,23,
+5,0,181,5,60,22,4,0,2,48,128,255,162,201,15,130,
+124,135,25,0,197,5,60,23,5,0,181,5,60,22,4,0,
+124,7,21,0,67,7,13,0,35,86,13,0,10,119,0,0,
+66,119,0,0,26,6,240,255,124,199,5,0,124,215,25,0,
+185,5,24,16,181,5,60,22,4,0,124,207,21,0,67,7,
+12,0,194,201,35,22,12,0,2,95,0,0,89,95,0,0,
 245,21,224,217,218,21,60,87,25,0,124,7,21,0,10,6,
 240,255,201,5,60,23,5,0,181,5,60,22,4,0,67,7,
-19,0,35,86,19,0,10,135,0,0,66,135,0,0,224,217,
-210,37,60,111,25,0,13,6,240,255,201,5,60,23,5,0,
-181,5,60,22,4,0,2,48,25,56,27,64,190,255,220,160,
+11,0,35,86,11,0,10,135,0,0,66,135,0,0,224,217,
+186,5,128,7,142,1,60,111,25,0,13,6,240,255,201,5,
+60,23,5,0,181,5,60,22,4,0,124,223,21,0,67,7,
+14,0,194,217,35,22,14,0,2,95,0,0,91,95,0,0,
+128,7,96,1,126,218,195,5,28,48,128,255,224,197,60,23,
+25,0,251,17,217,69,155,214,15,0,126,210,163,5,27,208,
+26,54,1,0,128,255,232,200,60,23,25,0,10,192,2,6,
+240,255,201,13,2,6,240,255,201,5,60,23,5,0,181,5,
+60,22,4,0,2,48,128,255,166,200,15,82,124,87,25,0,
+197,5,60,23,5,0,181,5,60,22,4,0,124,7,21,0,
+67,7,17,0,35,86,17,0,10,127,0,0,66,127,0,0,
+26,6,240,255,124,199,5,0,124,215,25,0,185,5,24,80,
+181,5,60,86,4,0,124,7,21,0,10,16,67,7,16,0,
+35,86,16,0,10,103,0,0,66,103,0,0,197,61,27,6,
+240,255,177,37,2,6,240,255,201,13,2,6,240,255,201,5,
+60,23,5,0,181,5,60,22,4,0,2,48,128,255,48,200,
+15,90,124,95,25,0,197,5,60,23,5,0,181,5,60,22,
+4,0,124,7,21,0,67,7,18,0,35,86,18,0,10,135,
+0,0,66,135,0,0,245,21,224,217,218,21,60,127,25,0,
+124,7,21,0,15,6,240,255,201,5,60,23,5,0,181,5,
+60,22,4,0,67,7,15,0,35,86,15,0,10,119,0,0,
+66,119,0,0,224,217,210,37,60,95,25,0,11,6,240,255,
+201,5,60,23,5,0,181,5,60,22,4,0,2,48,25,56,
+27,64,190,255,34,163,60,87,25,0,10,6,240,255,201,5,
+60,23,5,0,181,5,60,22,4,0,124,223,21,0,67,7,
+19,0,194,217,35,22,19,0,2,127,0,0,91,127,0,0,
+37,22,180,130,99,23,33,0,35,214,68,0,61,22,36,255,
+99,23,37,0,15,106,154,119,1,0,67,119,3,0,99,111,
+65,0,197,5,35,23,45,0,181,5,35,22,44,0,99,7,
+61,0,67,7,20,0,35,86,20,0,10,95,0,0,66,95,
+0,0,64,94,134,0,43,95,249,143,58,231,21,0,11,16,
+252,17,169,5,2,224,35,86,40,0,250,81,178,5,128,7,
+200,1,35,135,61,0,11,216,252,129,217,5,35,54,40,0,
+128,255,48,197,35,23,61,0,188,17,251,17,169,5,2,216,
+224,217,186,5,128,7,22,3,35,87,65,0,10,6,240,255,
+201,5,35,103,45,0,181,5,35,102,44,0,28,88,204,89,
+10,6,240,255,201,5,35,87,45,0,181,5,35,86,44,0,
+202,225,27,80,220,81,187,17,162,37,11,112,10,88,2,80,
+203,81,14,104,171,105,10,96,171,97,236,105,139,21,2,88,
+206,89,11,118,255,255,10,94,255,255,95,90,11,87,1,0,
+95,114,78,87,1,0,95,18,154,253,149,13,65,90,11,135,
+255,255,65,114,78,135,255,255,95,18,154,253,35,231,61,0,
+187,225,126,226,211,5,35,54,40,0,128,255,128,195,35,119,
+65,0,252,113,137,93,35,215,61,0,156,222,15,0,126,218,
+163,5,28,216,27,54,1,0,128,255,132,198,10,200,224,209,
+130,21,35,111,65,0,13,6,240,255,201,5,35,23,45,0,
+181,5,35,22,44,0,10,48,2,56,26,64,190,255,168,161,
+35,23,65,0,2,6,240,255,201,13,2,6,240,255,201,5,
+35,23,45,0,181,5,35,22,44,0,2,48,128,255,32,198,
+15,98,99,103,65,0,197,5,35,23,45,0,181,5,35,22,
+44,0,99,7,61,0,67,7,23,0,35,86,23,0,10,87,
+0,0,66,87,0,0,27,6,240,255,99,207,45,0,99,223,
+65,0,185,5,25,16,181,5,35,22,44,0,99,215,61,0,
+67,7,22,0,194,209,35,22,22,0,2,119,0,0,90,119,
+0,0,245,21,224,225,218,21,35,111,65,0,99,7,61,0,
+13,6,240,255,201,5,35,23,45,0,181,5,35,22,44,0,
+67,7,21,0,35,86,21,0,10,103,0,0,66,103,0,0,
+224,225,186,5,128,7,166,1,35,135,65,0,16,6,240,255,
+201,5,35,23,45,0,181,5,35,22,44,0,99,231,61,0,
+67,7,24,0,194,225,35,22,24,0,2,119,0,0,92,119,
+0,0,128,7,120,1,126,226,211,5,35,54,40,0,128,255,
+92,194,35,23,65,0,252,17,217,69,156,222,15,0,126,218,
+163,5,28,216,27,54,1,0,128,255,100,197,35,23,65,0,
+10,200,2,6,240,255,201,13,2,6,240,255,201,5,35,23,
+45,0,181,5,35,22,44,0,2,48,128,255,34,197,15,106,
+99,111,65,0,197,5,35,23,45,0,181,5,35,22,44,0,
+99,7,61,0,67,7,27,0,35,86,27,0,10,95,0,0,
+66,95,0,0,27,6,240,255,99,207,45,0,99,223,65,0,
+185,5,25,80,181,5,35,86,44,0,99,7,61,0,10,16,
+67,7,26,0,35,86,26,0,10,127,0,0,66,127,0,0,
+197,61,28,6,240,255,177,37,2,6,240,255,201,13,2,6,
+240,255,201,5,35,23,45,0,181,5,35,22,44,0,2,48,
+128,255,172,196,15,114,99,119,65,0,197,5,35,23,45,0,
+181,5,35,22,44,0,99,7,61,0,67,7,28,0,35,86,
+28,0,10,103,0,0,66,103,0,0,245,21,224,225,218,21,
+35,95,65,0,99,7,61,0,11,6,240,255,201,5,35,23,
+45,0,181,5,35,22,44,0,67,7,25,0,35,86,25,0,
+10,87,0,0,66,87,0,0,224,225,130,53,35,119,65,0,
+14,6,240,255,201,5,35,23,45,0,181,5,35,22,44,0,
+58,111,25,0,2,80,13,6,240,255,201,5,58,23,5,0,
+181,5,58,22,4,0,10,48,2,56,28,64,190,255,136,159,
+35,103,65,0,12,6,240,255,201,5,35,23,45,0,181,5,
+35,22,44,0,99,231,61,0,67,7,29,0,194,225,35,22,
+29,0,2,87,0,0,92,87,0,0,61,22,68,255,99,23,
+37,0,64,134,134,0,48,135,61,143,35,230,32,0,224,129,
+242,5,28,48,16,120,63,6,82,97,129,0,111,0,60,23,
+5,0,63,6,110,97,129,0,2,22,24,0,34,87,0,0,
+34,119,5,0,220,81,10,48,110,0,28,48,128,255,220,194,
+61,22,36,255,99,23,37,0,35,23,65,0,2,6,240,255,
+201,13,2,6,240,255,201,5,35,23,45,0,181,5,35,22,
+44,0,2,48,128,255,136,195,15,106,99,111,65,0,197,5,
+35,23,45,0,181,5,35,22,44,0,99,7,61,0,67,7,
+30,0,35,86,30,0,10,95,0,0,66,95,0,0,61,22,
+4,255,99,23,37,0,35,23,93,0,2,6,240,255,201,13,
+2,6,240,255,201,5,35,23,73,0,181,5,35,22,72,0,
+2,48,128,255,58,195,15,82,99,87,93,0,197,5,35,23,
+73,0,181,5,35,22,72,0,99,7,89,0,67,7,31,0,
+35,86,31,0,10,127,0,0,66,127,0,0,245,21,46,6,
+255,255,255,31,238,225,211,5,128,255,20,185,0,18,229,5,
+28,48,195,50,128,255,24,195,10,16,123,23,5,0,123,23,
+9,0,195,226,194,225,123,231,13,0,1,82,112,6,255,241,
+190,7,225,241,3,30,24,255,41,87,1,0,35,22,28,1,
+98,87,1,0,7,184,41,87,5,0,8,216,98,87,5,0,
+6,224,60,23,5,0,61,6,204,130,133,0,224,17,186,5,
+0,82,213,5,60,87,13,0,162,81,163,82,10,208,224,217,
+186,5,128,7,46,14,224,17,186,5,0,82,213,5,60,87,
+9,0,162,81,163,82,44,6,255,255,255,31,170,97,251,97,
+177,5,128,7,254,9,43,6,228,253,132,0,131,87,9,0,
+67,87,9,0,15,130,99,135,97,1,197,5,35,23,77,1,
+181,5,35,22,76,1,99,7,93,1,67,7,10,0,35,86,
+10,0,10,119,0,0,66,119,0,0,11,16,65,18,2,111,
+255,255,224,105,202,253,11,200,0,82,2,222,255,255,35,230,
+72,1,60,23,25,0,171,217,2,6,240,255,201,5,60,95,
+5,0,181,5,60,94,4,0,249,89,251,13,2,6,240,255,
+201,5,60,103,5,0,181,5,60,102,4,0,60,95,21,0,
+204,89,235,201,169,5,1,82,138,0,224,81,186,5,128,7,
+152,3,2,6,240,255,201,5,60,23,5,0,181,5,60,22,
+4,0,162,201,60,23,21,0,249,17,201,5,28,48,128,255,
+226,191,60,87,21,0,10,16,185,17,226,217,169,5,27,16,
+64,214,134,0,58,215,249,143,2,216,217,217,251,81,201,5,
+28,48,128,255,190,191,60,23,21,0,187,17,250,17,169,5,
+2,208,224,209,186,5,128,7,150,1,60,87,25,0,10,6,
+240,255,201,5,60,103,5,0,181,5,60,102,4,0,27,88,
+204,89,10,6,240,255,201,5,60,87,5,0,181,5,60,86,
+4,0,202,217,26,80,219,81,186,17,146,37,11,104,2,112,
+202,113,13,96,170,97,14,88,170,89,235,97,139,21,2,80,
+205,81,10,110,255,255,14,86,255,255,95,82,10,135,1,0,
+95,106,77,135,1,0,95,18,154,253,149,13,65,82,10,127,
+255,255,65,106,77,127,255,255,95,18,154,253,60,223,21,0,
+186,217,126,218,195,5,28,48,128,255,18,190,60,111,25,0,
+251,105,137,93,60,199,21,0,155,214,15,0,126,210,163,5,
+27,208,26,54,1,0,128,255,22,193,10,184,224,193,130,21,
 60,103,25,0,12,6,240,255,201,5,60,23,5,0,181,5,
-60,22,4,0,124,223,21,0,67,7,23,0,194,217,35,22,
-23,0,2,87,0,0,91,87,0,0,37,22,180,130,99,23,
-37,1,35,214,72,1,61,22,36,255,99,23,41,1,15,122,
-154,135,1,0,67,135,7,0,99,127,69,1,197,5,35,23,
-49,1,181,5,35,22,48,1,99,7,65,1,67,7,24,0,
-35,86,24,0,10,111,0,0,66,111,0,0,64,86,134,0,
-42,87,153,132,58,231,21,0,10,16,252,17,169,5,2,224,
-35,102,44,1,250,97,178,5,128,7,198,1,35,95,65,1,
-10,216,252,89,217,5,35,54,44,1,128,255,70,186,35,23,
-65,1,188,17,251,17,169,5,2,216,224,217,186,5,128,7,
-20,3,35,87,69,1,10,6,240,255,201,5,35,103,49,1,
-181,5,35,102,48,1,28,88,204,89,10,6,240,255,201,5,
-35,87,49,1,181,5,35,86,48,1,202,225,27,80,220,81,
-187,17,146,37,11,128,16,120,2,88,202,89,170,121,11,112,
-170,113,238,121,139,21,2,104,208,105,13,134,255,255,11,86,
-255,255,95,82,10,103,1,0,95,130,80,103,1,0,95,18,
-154,253,149,13,65,82,10,95,255,255,65,130,80,95,255,255,
-95,18,154,253,35,231,65,1,187,225,126,226,211,5,35,54,
-44,1,128,255,152,184,35,135,69,1,252,129,137,93,35,215,
-65,1,156,222,15,0,126,218,163,5,28,216,27,54,1,0,
-128,255,156,187,10,200,224,209,130,21,35,127,69,1,15,6,
-240,255,201,5,35,23,49,1,181,5,35,22,48,1,10,48,
-2,56,26,64,190,255,100,159,35,23,69,1,2,6,240,255,
+60,22,4,0,10,48,2,56,24,64,190,255,58,156,60,23,
+25,0,2,6,240,255,201,13,2,6,240,255,201,5,60,23,
+5,0,181,5,60,22,4,0,2,48,128,255,178,192,15,90,
+124,95,25,0,197,5,60,23,5,0,181,5,60,22,4,0,
+124,7,21,0,67,7,13,0,35,86,13,0,10,135,0,0,
+66,135,0,0,26,6,240,255,124,191,5,0,124,215,25,0,
+185,5,23,16,181,5,60,22,4,0,124,199,21,0,67,7,
+12,0,194,193,35,22,12,0,2,111,0,0,88,111,0,0,
+245,21,224,217,218,21,60,103,25,0,124,7,21,0,12,6,
+240,255,201,5,60,23,5,0,181,5,60,22,4,0,67,7,
+11,0,35,86,11,0,10,95,0,0,66,95,0,0,224,217,
+226,21,60,127,25,0,15,6,240,255,201,5,60,23,5,0,
+181,5,60,22,4,0,124,223,21,0,67,7,14,0,194,217,
+35,22,14,0,2,111,0,0,91,111,0,0,60,95,21,0,
+25,112,238,89,169,5,11,112,224,113,186,5,128,7,246,2,
+60,23,25,0,2,6,240,255,201,5,60,87,5,0,181,5,
+60,86,4,0,10,96,2,6,240,255,201,5,60,23,5,0,
+181,5,60,22,4,0,14,80,194,81,11,16,174,17,130,37,
+2,120,202,121,12,104,170,97,15,88,170,89,235,97,139,21,
+2,80,205,81,10,110,255,255,15,86,255,255,95,82,10,135,
+1,0,95,106,77,135,1,0,95,18,154,253,149,13,65,82,
+10,127,255,255,65,106,77,127,255,255,95,18,154,253,60,223,
+21,0,174,217,126,218,195,5,28,48,128,255,112,188,60,111,
+25,0,251,105,137,93,60,207,21,0,155,214,15,0,126,210,
+163,5,27,208,26,54,1,0,128,255,116,191,10,192,224,201,
+130,21,60,103,25,0,12,6,240,255,201,5,60,23,5,0,
+181,5,60,22,4,0,10,48,2,56,25,64,190,255,152,154,
+60,23,25,0,2,6,240,255,201,13,2,6,240,255,201,5,
+60,23,5,0,181,5,60,22,4,0,2,48,128,255,16,191,
+15,90,124,95,25,0,197,5,60,23,5,0,181,5,60,22,
+4,0,124,7,21,0,67,7,17,0,35,86,17,0,10,135,
+0,0,66,135,0,0,26,6,240,255,124,199,5,0,124,215,
+25,0,185,5,24,16,181,5,60,22,4,0,124,207,21,0,
+67,7,16,0,194,201,35,22,16,0,2,111,0,0,89,111,
+0,0,245,21,224,217,218,21,60,103,25,0,124,7,21,0,
+12,6,240,255,201,5,60,23,5,0,181,5,60,22,4,0,
+67,7,15,0,35,86,15,0,10,95,0,0,66,95,0,0,
+224,217,186,5,128,7,142,1,60,127,25,0,15,6,240,255,
+201,5,60,23,5,0,181,5,60,22,4,0,124,223,21,0,
+67,7,18,0,194,217,35,22,18,0,2,111,0,0,91,111,
+0,0,128,7,96,1,126,218,195,5,28,48,128,255,78,187,
+60,23,25,0,251,17,217,69,155,214,15,0,126,210,163,5,
+27,208,26,54,1,0,128,255,86,190,60,23,25,0,10,192,
+2,6,240,255,201,13,2,6,240,255,201,5,60,23,5,0,
+181,5,60,22,4,0,2,48,128,255,20,190,15,98,124,103,
+25,0,197,5,60,23,5,0,181,5,60,22,4,0,124,7,
+21,0,67,7,21,0,35,86,21,0,10,87,0,0,66,87,
+0,0,26,6,240,255,124,199,5,0,124,215,25,0,185,5,
+24,80,181,5,60,86,4,0,124,7,21,0,10,16,67,7,
+20,0,35,86,20,0,10,119,0,0,66,119,0,0,197,61,
+27,6,240,255,177,37,2,6,240,255,201,13,2,6,240,255,
+201,5,60,23,5,0,181,5,60,22,4,0,2,48,128,255,
+158,189,15,106,124,111,25,0,197,5,60,23,5,0,181,5,
+60,22,4,0,124,7,21,0,67,7,22,0,35,86,22,0,
+10,95,0,0,66,95,0,0,245,21,224,217,218,21,60,87,
+25,0,124,7,21,0,10,6,240,255,201,5,60,23,5,0,
+181,5,60,22,4,0,67,7,19,0,35,86,19,0,10,135,
+0,0,66,135,0,0,224,217,210,37,60,111,25,0,13,6,
+240,255,201,5,60,23,5,0,181,5,60,22,4,0,2,48,
+25,56,27,64,190,255,144,152,60,103,25,0,12,6,240,255,
+201,5,60,23,5,0,181,5,60,22,4,0,124,223,21,0,
+67,7,23,0,194,217,35,22,23,0,2,87,0,0,91,87,
+0,0,37,22,188,130,99,23,37,1,35,214,72,1,61,22,
+36,255,99,23,41,1,15,122,154,135,1,0,67,135,7,0,
+99,127,69,1,197,5,35,23,49,1,181,5,35,22,48,1,
+99,7,65,1,67,7,24,0,35,86,24,0,10,111,0,0,
+66,111,0,0,64,86,134,0,42,87,249,143,58,231,21,0,
+10,16,252,17,169,5,2,224,35,102,44,1,250,97,178,5,
+128,7,198,1,35,95,65,1,10,216,252,89,217,5,35,54,
+44,1,128,255,158,186,35,23,65,1,188,17,251,17,169,5,
+2,216,224,217,186,5,128,7,20,3,35,87,69,1,10,6,
+240,255,201,5,35,103,49,1,181,5,35,102,48,1,28,88,
+204,89,10,6,240,255,201,5,35,87,49,1,181,5,35,86,
+48,1,202,225,27,80,220,81,187,17,146,37,11,128,16,120,
+2,88,202,89,170,121,11,112,170,113,238,121,139,21,2,104,
+208,105,13,134,255,255,11,86,255,255,95,82,10,103,1,0,
+95,130,80,103,1,0,95,18,154,253,149,13,65,82,10,95,
+255,255,65,130,80,95,255,255,95,18,154,253,35,231,65,1,
+187,225,126,226,211,5,35,54,44,1,128,255,240,184,35,135,
+69,1,252,129,137,93,35,215,65,1,156,222,15,0,126,218,
+163,5,28,216,27,54,1,0,128,255,244,187,10,200,224,209,
+130,21,35,127,69,1,15,6,240,255,201,5,35,23,49,1,
+181,5,35,22,48,1,10,48,2,56,26,64,190,255,24,151,
+35,23,69,1,2,6,240,255,201,13,2,6,240,255,201,5,
+35,23,49,1,181,5,35,22,48,1,2,48,128,255,144,187,
+15,114,99,119,69,1,197,5,35,23,49,1,181,5,35,22,
+48,1,99,7,65,1,67,7,27,0,35,86,27,0,10,103,
+0,0,66,103,0,0,27,6,240,255,99,207,49,1,99,223,
+69,1,185,5,25,16,181,5,35,22,48,1,99,215,65,1,
+67,7,26,0,194,209,35,22,26,0,2,135,0,0,90,135,
+0,0,245,21,224,225,218,21,35,127,69,1,99,7,65,1,
+15,6,240,255,201,5,35,23,49,1,181,5,35,22,48,1,
+67,7,25,0,35,86,25,0,10,119,0,0,66,119,0,0,
+224,225,186,5,128,7,166,1,35,95,69,1,11,6,240,255,
+201,5,35,23,49,1,181,5,35,22,48,1,99,231,65,1,
+67,7,28,0,194,225,35,22,28,0,2,135,0,0,92,135,
+0,0,128,7,120,1,126,226,211,5,35,54,44,1,128,255,
+204,183,35,23,69,1,252,17,217,69,156,222,15,0,126,218,
+163,5,28,216,27,54,1,0,128,255,212,186,35,23,69,1,
+10,200,2,6,240,255,201,13,2,6,240,255,201,5,35,23,
+49,1,181,5,35,22,48,1,2,48,128,255,146,186,15,122,
+99,127,69,1,197,5,35,23,49,1,181,5,35,22,48,1,
+99,7,65,1,67,7,31,0,35,86,31,0,10,111,0,0,
+66,111,0,0,27,6,240,255,99,207,49,1,99,223,69,1,
+185,5,25,80,181,5,35,86,48,1,99,7,65,1,10,16,
+67,7,30,0,35,86,30,0,10,87,0,0,66,87,0,0,
+197,61,28,6,240,255,177,37,2,6,240,255,201,13,2,6,
+240,255,201,5,35,23,49,1,181,5,35,22,48,1,2,48,
+128,255,28,186,15,130,99,135,69,1,197,5,35,23,49,1,
+181,5,35,22,48,1,99,7,65,1,67,7,32,0,35,86,
+32,0,10,119,0,0,66,119,0,0,245,21,224,225,218,21,
+35,111,69,1,99,7,65,1,13,6,240,255,201,5,35,23,
+49,1,181,5,35,22,48,1,67,7,29,0,35,86,29,0,
+10,103,0,0,66,103,0,0,224,225,130,53,35,135,69,1,
+16,6,240,255,201,5,35,23,49,1,181,5,35,22,48,1,
+58,127,25,0,2,80,15,6,240,255,201,5,58,23,5,0,
+181,5,58,22,4,0,10,48,2,56,28,64,190,255,248,148,
+35,119,69,1,14,6,240,255,201,5,35,23,49,1,181,5,
+35,22,48,1,99,231,65,1,67,7,33,0,194,225,35,22,
+33,0,2,103,0,0,92,103,0,0,61,22,68,255,99,23,
+41,1,64,94,134,0,43,95,61,143,35,230,36,1,224,89,
+242,5,28,48,11,80,63,6,226,107,129,0,106,0,60,23,
+5,0,63,6,254,107,129,0,2,22,24,0,34,87,0,0,
+34,135,5,0,220,81,10,48,112,0,28,48,128,255,76,184,
+61,22,36,255,99,23,41,1,35,23,69,1,2,6,240,255,
 201,13,2,6,240,255,201,5,35,23,49,1,181,5,35,22,
-48,1,2,48,128,255,56,187,15,114,99,119,69,1,197,5,
+48,1,2,48,128,255,248,184,15,122,99,127,69,1,197,5,
 35,23,49,1,181,5,35,22,48,1,99,7,65,1,67,7,
-27,0,35,86,27,0,10,103,0,0,66,103,0,0,27,6,
-240,255,99,207,49,1,99,223,69,1,185,5,25,16,181,5,
-35,22,48,1,99,215,65,1,67,7,26,0,194,209,35,22,
-26,0,2,135,0,0,90,135,0,0,245,21,224,225,218,21,
-35,127,69,1,99,7,65,1,15,6,240,255,201,5,35,23,
-49,1,181,5,35,22,48,1,67,7,25,0,35,86,25,0,
-10,119,0,0,66,119,0,0,224,225,186,5,128,7,166,1,
-35,95,69,1,11,6,240,255,201,5,35,23,49,1,181,5,
-35,22,48,1,99,231,65,1,67,7,28,0,194,225,35,22,
-28,0,2,135,0,0,92,135,0,0,128,7,120,1,126,226,
-211,5,35,54,44,1,128,255,116,183,35,23,69,1,252,17,
-217,69,156,222,15,0,126,218,163,5,28,216,27,54,1,0,
-128,255,124,186,35,23,69,1,10,200,2,6,240,255,201,13,
-2,6,240,255,201,5,35,23,49,1,181,5,35,22,48,1,
-2,48,128,255,58,186,15,122,99,127,69,1,197,5,35,23,
-49,1,181,5,35,22,48,1,99,7,65,1,67,7,31,0,
-35,86,31,0,10,111,0,0,66,111,0,0,27,6,240,255,
-99,207,49,1,99,223,69,1,185,5,25,80,181,5,35,86,
-48,1,99,7,65,1,10,16,67,7,30,0,35,86,30,0,
-10,87,0,0,66,87,0,0,197,61,28,6,240,255,177,37,
-2,6,240,255,201,13,2,6,240,255,201,5,35,23,49,1,
-181,5,35,22,48,1,2,48,128,255,196,185,15,130,99,135,
-69,1,197,5,35,23,49,1,181,5,35,22,48,1,99,7,
-65,1,67,7,32,0,35,86,32,0,10,119,0,0,66,119,
-0,0,245,21,224,225,218,21,35,111,69,1,99,7,65,1,
-13,6,240,255,201,5,35,23,49,1,181,5,35,22,48,1,
-67,7,29,0,35,86,29,0,10,103,0,0,66,103,0,0,
-224,225,130,53,35,135,69,1,16,6,240,255,201,5,35,23,
-49,1,181,5,35,22,48,1,58,127,25,0,2,80,15,6,
-240,255,201,5,58,23,5,0,181,5,58,22,4,0,10,48,
-2,56,28,64,190,255,68,157,35,119,69,1,14,6,240,255,
-201,5,35,23,49,1,181,5,35,22,48,1,99,231,65,1,
-67,7,33,0,194,225,35,22,33,0,2,103,0,0,92,103,
-0,0,61,22,68,255,99,23,41,1,64,94,134,0,43,95,
-221,131,35,230,36,1,224,89,242,5,28,48,11,80,63,6,
-150,99,129,0,106,0,60,23,5,0,63,6,178,99,129,0,
-2,22,24,0,34,87,0,0,34,135,5,0,220,81,10,48,
-112,0,28,48,128,255,244,183,61,22,36,255,99,23,41,1,
-35,23,69,1,2,6,240,255,201,13,2,6,240,255,201,5,
-35,23,49,1,181,5,35,22,48,1,2,48,128,255,160,184,
-15,122,99,127,69,1,197,5,35,23,49,1,181,5,35,22,
-48,1,99,7,65,1,67,7,34,0,35,86,34,0,10,111,
-0,0,66,111,0,0,61,22,4,255,99,23,41,1,35,23,
-97,1,2,6,240,255,201,13,2,6,240,255,201,5,35,23,
-77,1,181,5,35,22,76,1,2,48,128,255,82,184,15,98,
-99,103,97,1,197,5,35,23,77,1,181,5,35,22,76,1,
-99,7,93,1,67,7,35,0,35,86,35,0,10,87,0,0,
-66,87,0,0,128,7,20,4,224,17,186,5,0,82,213,5,
-60,87,9,0,162,81,163,82,27,112,202,113,238,209,177,5,
-128,7,132,1,26,80,129,82,45,6,255,255,255,31,170,105,
-250,105,185,5,0,82,165,5,218,81,10,208,224,17,186,5,
-0,82,213,5,60,87,9,0,162,81,163,82,27,128,202,129,
-240,209,185,13,224,17,186,5,0,82,213,5,60,87,9,0,
-162,81,163,82,27,208,202,209,28,48,26,56,0,66,191,255,
-18,233,60,23,5,0,35,206,48,0,99,23,49,0,99,207,
-89,0,55,111,1,0,35,198,52,0,99,111,53,0,99,199,
-85,0,57,103,1,0,10,232,99,103,81,0,56,95,1,0,
-99,239,65,0,99,95,77,0,35,22,80,0,34,87,1,0,
-29,64,99,87,69,0,35,94,76,0,43,135,1,0,99,95,
-61,0,99,135,73,0,99,23,57,0,28,72,131,23,37,0,
-67,23,0,0,35,54,68,0,35,62,72,0,191,255,198,232,
-28,48,10,56,27,64,35,78,28,1,128,255,54,3,55,127,
-1,0,99,199,125,0,99,127,53,0,35,94,112,0,60,23,
-9,0,99,95,97,0,99,23,49,0,99,207,121,0,56,119,
-1,0,35,22,116,0,99,119,117,0,99,87,101,0,57,111,
-1,0,10,64,99,111,113,0,28,72,34,103,1,0,99,23,
-93,0,99,103,105,0,35,54,104,0,43,95,1,0,163,23,
-37,0,67,23,0,0,99,95,109,0,35,62,108,0,191,255,
-84,232,60,87,5,0,224,81,186,5,0,18,213,5,60,23,
-9,0,170,17,163,18,194,217,60,23,5,0,224,17,242,13,
-60,87,9,0,99,23,41,0,99,87,45,0,165,5,72,18,
-234,17,234,253,60,55,5,0,128,255,164,182,195,210,221,209,
-124,215,13,0,195,218,221,217,124,223,9,0,124,239,5,0,
-128,7,120,2,60,23,9,0,35,86,128,0,99,23,129,0,
-23,200,42,127,1,0,57,23,1,0,28,72,162,121,163,122,
-251,121,177,5,128,7,46,1,99,23,133,0,35,86,132,0,
-60,23,9,0,27,192,99,23,137,0,195,194,42,95,1,0,
-57,71,1,0,99,87,173,0,99,95,165,0,35,22,136,0,
-35,94,164,0,99,95,141,0,34,87,1,0,216,65,99,87,
-161,0,99,23,169,0,43,135,1,0,35,22,160,0,99,135,
-153,0,99,71,149,0,34,127,1,0,99,23,145,0,99,127,
-157,0,131,23,39,0,67,23,0,0,35,54,152,0,35,62,
-156,0,191,255,112,231,60,215,9,0,35,22,188,0,99,215,
-189,0,27,232,34,111,1,0,57,103,1,0,99,215,193,0,
-172,105,163,106,173,233,229,21,26,16,224,17,146,21,224,17,
-250,5,8,50,128,255,232,181,10,16,224,17,146,13,3,87,
-28,1,66,87,0,0,35,87,33,1,98,87,5,0,95,234,
-72,210,224,233,170,237,60,87,9,0,216,81,124,87,9,0,
-55,135,1,0,99,135,133,0,35,118,132,0,60,23,9,0,
-99,119,185,0,99,23,137,0,35,126,176,0,35,22,136,0,
-34,111,1,0,195,218,187,105,99,111,177,0,99,127,181,0,
-14,104,133,21,35,86,28,1,42,95,1,0,98,95,1,0,
-42,87,5,0,98,87,5,0,45,103,1,0,72,98,109,103,
-1,0,47,95,1,0,46,23,1,0,235,17,202,237,128,7,
-42,1,60,95,9,0,27,80,99,95,25,1,99,95,201,0,
-195,82,11,16,170,17,99,23,197,0,35,238,196,0,60,71,
-9,0,61,111,1,0,35,198,200,0,99,111,229,0,35,22,
-228,0,56,103,1,0,99,103,225,0,99,239,237,0,34,95,
-1,0,35,86,224,0,99,95,217,0,99,87,209,0,99,199,
-233,0,42,87,1,0,99,71,213,0,99,23,205,0,99,87,
-221,0,163,23,39,0,67,23,0,0,35,54,216,0,35,62,
-220,0,191,255,64,230,124,87,9,0,35,111,25,1,57,135,
-1,0,27,120,99,135,241,0,99,111,245,0,195,122,13,16,
-175,17,99,23,197,0,35,86,240,0,42,95,1,0,99,87,
-13,1,99,95,1,1,99,239,9,1,61,87,1,0,35,230,
-244,0,99,87,253,0,99,231,5,1,60,135,1,0,24,48,
-99,135,249,0,163,23,39,0,67,23,0,0,35,62,0,1,
-35,70,252,0,35,78,248,0,191,255,38,229,57,127,1,0,
-99,231,21,1,99,127,245,0,195,218,57,103,1,0,99,239,
-17,1,204,217,99,223,197,0,28,104,28,96,133,21,35,86,
-28,1,42,95,1,0,98,95,1,0,42,87,5,0,98,87,
-5,0,44,95,1,0,72,90,108,95,1,0,61,87,1,0,
-45,23,1,0,234,17,202,237,3,30,232,0,126,6,255,241,
-130,7,225,112,9,216,7,208,99,215,1,0,26,232,8,200,
-25,224,229,21,29,16,224,17,146,21,224,17,250,5,8,50,
-128,255,12,180,10,16,224,17,146,13,27,87,0,0,66,87,
-0,0,59,87,5,0,98,87,5,0,95,226,72,234,224,225,
-170,237,25,80,195,82,218,81,66,6,255,112,38,87,5,0,
-127,0,128,7,128,7,225,48,7,232,8,224,9,216,3,215,
-20,0,224,49,138,13,32,54,52,0,128,255,194,179,10,48,
-224,49,162,29,49,6,144,124,133,0,102,143,49,0,102,239,
-1,0,102,231,5,0,102,223,9,0,70,215,12,0,0,18,
-38,86,13,0,74,7,16,0,74,7,0,0,65,18,65,82,
-2,6,240,255,134,253,6,80,64,6,255,48,128,7,225,48,
-6,232,61,23,49,0,8,216,2,22,24,0,34,87,0,0,
-7,208,221,81,10,48,9,224,28,56,34,143,5,0,63,6,
-70,105,129,0,113,0,125,87,5,0,26,48,251,81,251,87,
-60,67,61,135,9,0,61,63,1,0,240,231,32,2,220,57,
-190,255,40,151,61,87,5,0,64,6,255,48,130,7,225,48,
-6,232,7,224,8,216,9,208,224,233,138,13,32,54,52,0,
-128,255,28,179,10,232,224,233,226,13,29,48,28,56,27,64,
-26,72,99,7,1,0,191,255,46,255,49,6,176,124,133,0,
-125,143,49,0,29,80,66,6,255,48,130,7,225,112,38,215,
-53,0,0,226,0,234,0,18,28,6,240,255,129,13,252,126,
-40,0,32,110,160,180,205,121,47,23,17,0,2,216,224,217,
-194,53,59,23,105,0,30,234,2,22,80,0,34,87,0,0,
-34,103,5,0,219,81,10,48,63,6,240,105,129,0,108,0,
-224,81,162,5,31,234,59,23,105,0,31,202,2,22,136,0,
-34,87,0,0,3,48,219,81,10,56,31,66,34,95,5,0,
-63,6,24,106,129,0,107,0,195,199,0,0,162,5,29,202,
-89,233,189,0,31,18,155,143,7,0,17,6,192,255,186,5,
-32,22,127,0,66,233,189,0,65,210,90,239,255,255,65,226,
-28,6,240,255,134,189,32,86,16,0,66,6,255,112,128,7,
-225,0,6,232,0,18,7,6,240,255,129,13,231,126,40,0,
-32,110,160,180,205,121,47,23,17,0,2,80,224,81,186,5,
-0,82,133,29,42,23,105,0,61,231,53,0,2,22,176,0,
-34,95,0,0,34,103,5,0,202,89,11,48,63,6,148,106,
-129,0,108,0,92,87,0,0,61,95,53,0,2,82,75,7,
-1,0,64,6,255,0,128,7,33,0,6,96,0,18,7,6,
+34,0,35,86,34,0,10,111,0,0,66,111,0,0,61,22,
+4,255,99,23,41,1,35,23,97,1,2,6,240,255,201,13,
+2,6,240,255,201,5,35,23,77,1,181,5,35,22,76,1,
+2,48,128,255,170,184,15,98,99,103,97,1,197,5,35,23,
+77,1,181,5,35,22,76,1,99,7,93,1,67,7,35,0,
+35,86,35,0,10,87,0,0,66,87,0,0,128,7,20,4,
+224,17,186,5,0,82,213,5,60,87,9,0,162,81,163,82,
+27,112,202,113,238,209,177,5,128,7,132,1,26,80,129,82,
+45,6,255,255,255,31,170,105,250,105,185,5,0,82,165,5,
+218,81,10,208,224,17,186,5,0,82,213,5,60,87,9,0,
+162,81,163,82,27,128,202,129,240,209,185,13,224,17,186,5,
+0,82,213,5,60,87,9,0,162,81,163,82,27,208,202,209,
+28,48,26,56,0,66,191,255,210,230,60,23,5,0,35,206,
+48,0,99,23,49,0,99,207,89,0,55,111,1,0,35,198,
+52,0,99,111,53,0,99,199,85,0,57,103,1,0,10,232,
+99,103,81,0,56,95,1,0,99,239,65,0,99,95,77,0,
+35,22,80,0,34,87,1,0,29,64,99,87,69,0,35,94,
+76,0,43,135,1,0,99,95,61,0,99,135,73,0,99,23,
+57,0,28,72,131,23,37,0,67,23,0,0,35,54,68,0,
+35,62,72,0,191,255,134,230,28,48,10,56,27,64,35,78,
+28,1,128,255,54,3,55,127,1,0,99,199,125,0,99,127,
+53,0,35,94,112,0,60,23,9,0,99,95,97,0,99,23,
+49,0,99,207,121,0,56,119,1,0,35,22,116,0,99,119,
+117,0,99,87,101,0,57,111,1,0,10,64,99,111,113,0,
+28,72,34,103,1,0,99,23,93,0,99,103,105,0,35,54,
+104,0,43,95,1,0,163,23,37,0,67,23,0,0,99,95,
+109,0,35,62,108,0,191,255,20,230,60,87,5,0,224,81,
+186,5,0,18,213,5,60,23,9,0,170,17,163,18,194,217,
+60,23,5,0,224,17,242,13,60,87,9,0,99,23,41,0,
+99,87,45,0,165,5,72,18,234,17,234,253,60,55,5,0,
+128,255,252,182,195,210,221,209,124,215,13,0,195,218,221,217,
+124,223,9,0,124,239,5,0,128,7,120,2,60,23,9,0,
+35,86,128,0,99,23,129,0,23,200,42,127,1,0,57,23,
+1,0,28,72,162,121,163,122,251,121,177,5,128,7,46,1,
+99,23,133,0,35,86,132,0,60,23,9,0,27,192,99,23,
+137,0,195,194,42,95,1,0,57,71,1,0,99,87,173,0,
+99,95,165,0,35,22,136,0,35,94,164,0,99,95,141,0,
+34,87,1,0,216,65,99,87,161,0,99,23,169,0,43,135,
+1,0,35,22,160,0,99,135,153,0,99,71,149,0,34,127,
+1,0,99,23,145,0,99,127,157,0,131,23,39,0,67,23,
+0,0,35,54,152,0,35,62,156,0,191,255,48,229,60,215,
+9,0,35,22,188,0,99,215,189,0,27,232,34,111,1,0,
+57,103,1,0,99,215,193,0,172,105,163,106,173,233,229,21,
+26,16,224,17,146,21,224,17,250,5,8,50,128,255,64,182,
+10,16,224,17,146,13,3,87,28,1,66,87,0,0,35,87,
+33,1,98,87,5,0,95,234,72,210,224,233,170,237,60,87,
+9,0,216,81,124,87,9,0,55,135,1,0,99,135,133,0,
+35,118,132,0,60,23,9,0,99,119,185,0,99,23,137,0,
+35,126,176,0,35,22,136,0,34,111,1,0,195,218,187,105,
+99,111,177,0,99,127,181,0,14,104,133,21,35,86,28,1,
+42,95,1,0,98,95,1,0,42,87,5,0,98,87,5,0,
+45,103,1,0,72,98,109,103,1,0,47,95,1,0,46,23,
+1,0,235,17,202,237,128,7,42,1,60,95,9,0,27,80,
+99,95,25,1,99,95,201,0,195,82,11,16,170,17,99,23,
+197,0,35,238,196,0,60,71,9,0,61,111,1,0,35,198,
+200,0,99,111,229,0,35,22,228,0,56,103,1,0,99,103,
+225,0,99,239,237,0,34,95,1,0,35,86,224,0,99,95,
+217,0,99,87,209,0,99,199,233,0,42,87,1,0,99,71,
+213,0,99,23,205,0,99,87,221,0,163,23,39,0,67,23,
+0,0,35,54,216,0,35,62,220,0,191,255,0,228,124,87,
+9,0,35,111,25,1,57,135,1,0,27,120,99,135,241,0,
+99,111,245,0,195,122,13,16,175,17,99,23,197,0,35,86,
+240,0,42,95,1,0,99,87,13,1,99,95,1,1,99,239,
+9,1,61,87,1,0,35,230,244,0,99,87,253,0,99,231,
+5,1,60,135,1,0,24,48,99,135,249,0,163,23,39,0,
+67,23,0,0,35,62,0,1,35,70,252,0,35,78,248,0,
+191,255,230,226,57,127,1,0,99,231,21,1,99,127,245,0,
+195,218,57,103,1,0,99,239,17,1,204,217,99,223,197,0,
+28,104,28,96,133,21,35,86,28,1,42,95,1,0,98,95,
+1,0,42,87,5,0,98,87,5,0,44,95,1,0,72,90,
+108,95,1,0,61,87,1,0,45,23,1,0,234,17,202,237,
+3,30,232,0,126,6,255,241,130,7,225,112,9,216,7,208,
+99,215,1,0,26,232,8,200,25,224,229,21,29,16,224,17,
+146,21,224,17,250,5,8,50,128,255,100,180,10,16,224,17,
+146,13,27,87,0,0,66,87,0,0,59,87,5,0,98,87,
+5,0,95,226,72,234,224,225,170,237,25,80,195,82,218,81,
+66,6,255,112,38,87,5,0,127,0,128,7,128,7,225,48,
+7,232,8,224,9,216,3,215,20,0,224,49,138,13,32,54,
+52,0,128,255,26,180,10,48,224,49,162,29,49,6,240,135,
+133,0,102,143,49,0,102,239,1,0,102,231,5,0,102,223,
+9,0,70,215,12,0,0,18,38,86,13,0,74,7,16,0,
+74,7,0,0,65,18,65,82,2,6,240,255,134,253,6,80,
+64,6,255,48,128,7,225,48,6,232,61,23,49,0,8,216,
+2,22,24,0,34,87,0,0,7,208,221,81,10,48,9,224,
+28,56,34,143,5,0,63,6,146,113,129,0,113,0,125,87,
+5,0,26,48,251,81,251,87,60,67,61,135,9,0,61,63,
+1,0,240,231,32,2,220,57,190,255,220,142,61,87,5,0,
+64,6,255,48,130,7,225,48,6,232,7,224,8,216,9,208,
+224,233,138,13,32,54,52,0,128,255,116,179,10,232,224,233,
+226,13,29,48,28,56,27,64,26,72,99,7,1,0,191,255,
+46,255,49,6,16,136,133,0,125,143,49,0,29,80,66,6,
+255,48,130,7,225,112,38,215,53,0,0,226,0,234,0,18,
+28,6,240,255,129,13,252,126,40,0,32,110,160,180,205,121,
+47,23,17,0,2,216,224,217,194,53,59,23,105,0,30,234,
+2,22,80,0,34,87,0,0,34,103,5,0,219,81,10,48,
+63,6,60,114,129,0,108,0,224,81,162,5,31,234,59,23,
+105,0,31,202,2,22,136,0,34,87,0,0,3,48,219,81,
+10,56,31,66,34,95,5,0,63,6,100,114,129,0,107,0,
+195,199,0,0,162,5,29,202,89,233,189,0,31,18,155,143,
+7,0,17,6,192,255,186,5,32,22,127,0,66,233,189,0,
+65,210,90,239,255,255,65,226,28,6,240,255,134,189,32,86,
+16,0,66,6,255,112,128,7,225,0,6,232,0,18,7,6,
 240,255,129,13,231,126,40,0,32,110,160,180,205,121,47,23,
-17,0,2,80,224,81,186,5,0,82,181,21,42,23,105,0,
-44,63,53,0,2,22,184,0,34,95,0,0,34,103,5,0,
-202,89,11,48,63,6,236,106,129,0,108,0,244,87,64,2,
-64,6,63,0,128,7,97,0,38,239,53,0,7,48,191,255,
-76,80,93,87,0,0,1,82,64,6,127,0,130,7,225,16,
-6,224,60,143,53,0,0,18,81,7,0,0,7,6,240,255,
-129,13,231,118,40,0,32,102,160,180,204,113,46,23,17,0,
-2,232,224,233,162,69,61,23,105,0,30,218,2,22,80,0,
-34,87,0,0,34,95,5,0,221,81,10,48,63,6,84,107,
-129,0,107,0,224,81,162,5,31,218,60,87,53,0,3,48,
-74,223,0,0,31,66,61,23,105,0,31,218,2,22,136,0,
-34,87,0,0,34,143,5,0,221,81,10,56,63,6,132,107,
-129,0,113,0,195,199,0,0,162,5,29,218,60,127,53,0,
-15,119,0,0,91,113,79,119,0,0,31,18,157,111,7,0,
-13,6,192,255,186,5,32,22,127,0,60,95,53,0,11,87,
-0,0,66,81,75,87,0,0,1,82,66,6,255,16,128,7,
-33,0,7,64,38,63,53,0,32,54,0,32,190,255,124,155,
-64,6,63,0,144,7,97,0,6,232,3,48,39,6,170,170,
-102,102,191,255,140,171,3,48,191,255,28,176,61,55,53,0,
-32,70,0,32,224,81,242,5,6,56,3,48,0,74,191,255,
-116,175,197,21,0,58,190,255,224,149,61,143,53,0,47,6,
-36,247,132,0,17,112,15,110,33,0,15,103,0,0,78,103,
-0,0,65,122,65,114,239,105,154,253,32,86,0,32,80,6,
-127,0,128,7,33,0,38,55,53,0,32,62,0,32,128,255,
-94,71,32,86,0,32,64,6,63,0,130,7,225,112,7,224,
-8,216,9,208,3,207,28,0,6,232,224,233,138,13,32,54,
-56,0,128,255,58,176,10,232,224,233,130,21,29,48,28,56,
-27,64,26,72,99,207,1,0,191,255,76,252,48,6,208,125,
-133,0,125,135,49,0,125,231,53,0,29,80,66,6,255,112,
-128,7,225,0,6,232,61,87,53,0,9,224,224,81,186,5,
-0,82,197,77,61,23,5,0,226,65,194,5,2,80,128,81,
-213,69,0,106,61,143,9,0,28,16,241,23,32,2,202,17,
-0,82,149,21,7,119,0,0,2,127,0,0,238,121,130,13,
-2,48,11,64,170,65,190,255,178,147,1,106,133,13,65,18,
-65,58,65,82,61,95,5,0,235,81,214,237,29,103,12,0,
-224,97,162,29,132,95,173,133,224,89,226,21,224,105,138,13,
-61,142,13,0,220,137,145,127,1,0,224,121,210,21,61,118,
-29,0,220,113,1,98,78,103,0,0,61,86,13,0,202,225,
-92,7,0,0,149,13,224,105,242,5,61,126,13,0,207,225,
-1,114,92,119,0,0,61,87,5,0,64,6,255,0,130,7,
-225,16,6,232,7,216,8,224,188,0,224,233,138,13,32,54,
-56,0,128,255,74,175,10,232,224,233,226,13,29,48,27,56,
-99,231,1,0,1,66,0,74,191,255,226,254,48,6,240,125,
-133,0,125,135,49,0,29,80,66,6,255,16,130,7,33,0,
-7,143,0,0,224,137,234,23,0,0,67,23,3,0,35,62,
-3,0,191,255,254,254,66,6,63,0,130,7,225,16,6,232,
-7,224,8,216,224,233,138,13,32,54,56,0,128,255,240,174,
-10,232,224,233,242,13,29,48,28,56,27,64,5,138,99,143,
-1,0,0,74,191,255,134,254,48,6,16,126,133,0,125,135,
-49,0,29,80,66,6,255,16,128,7,97,0,6,232,191,255,
-178,254,10,16,224,17,215,5,61,86,52,0,106,7,1,0,
-2,80,64,6,127,0,0,82,127,0,38,87,5,0,127,0,
-0,82,127,0,0,82,127,0,0,82,127,0,0,82,127,0,
+17,0,2,80,224,81,186,5,0,82,133,29,42,23,105,0,
+61,231,53,0,2,22,176,0,34,95,0,0,34,103,5,0,
+202,89,11,48,63,6,224,114,129,0,108,0,92,87,0,0,
+61,95,53,0,2,82,75,7,1,0,64,6,255,0,128,7,
+33,0,6,96,0,18,7,6,240,255,129,13,231,126,40,0,
+32,110,160,180,205,121,47,23,17,0,2,80,224,81,186,5,
+0,82,181,21,42,23,105,0,44,63,53,0,2,22,184,0,
+34,95,0,0,34,103,5,0,202,89,11,48,63,6,56,115,
+129,0,108,0,244,87,64,2,64,6,63,0,128,7,97,0,
+38,239,53,0,7,48,191,255,60,76,93,87,0,0,1,82,
+64,6,127,0,130,7,225,16,6,224,60,143,53,0,0,18,
+81,7,0,0,7,6,240,255,129,13,231,118,40,0,32,102,
+160,180,204,113,46,23,17,0,2,232,224,233,162,69,61,23,
+105,0,30,218,2,22,80,0,34,87,0,0,34,95,5,0,
+221,81,10,48,63,6,160,115,129,0,107,0,224,81,162,5,
+31,218,60,87,53,0,3,48,74,223,0,0,31,66,61,23,
+105,0,31,218,2,22,136,0,34,87,0,0,34,143,5,0,
+221,81,10,56,63,6,208,115,129,0,113,0,195,199,0,0,
+162,5,29,218,60,127,53,0,15,119,0,0,91,113,79,119,
+0,0,31,18,157,111,7,0,13,6,192,255,186,5,32,22,
+127,0,60,95,53,0,11,87,0,0,66,81,75,87,0,0,
+1,82,66,6,255,16,128,7,33,0,7,64,38,63,53,0,
+32,54,0,32,190,255,48,147,64,6,63,0,144,7,97,0,
+6,232,3,48,39,6,170,170,102,102,191,255,76,169,3,48,
+191,255,220,173,61,55,53,0,32,70,0,32,224,81,242,5,
+6,56,3,48,0,74,191,255,52,173,197,21,0,58,190,255,
+148,141,61,143,53,0,47,6,156,2,133,0,17,112,15,110,
+33,0,15,103,0,0,78,103,0,0,65,122,65,114,239,105,
+154,253,32,86,0,32,80,6,127,0,128,7,33,0,38,55,
+53,0,32,62,0,32,128,255,180,71,32,86,0,32,64,6,
+63,0,130,7,225,112,7,224,8,216,9,208,3,207,28,0,
+6,232,224,233,138,13,32,54,56,0,128,255,146,176,10,232,
+224,233,130,21,29,48,28,56,27,64,26,72,99,207,1,0,
+191,255,76,252,48,6,48,137,133,0,125,135,49,0,125,231,
+53,0,29,80,66,6,255,112,128,7,225,0,6,232,61,87,
+53,0,9,224,224,81,186,5,0,82,197,77,61,23,5,0,
+226,65,194,5,2,80,128,81,213,69,0,106,61,143,9,0,
+28,16,241,23,32,2,202,17,0,82,149,21,7,119,0,0,
+2,127,0,0,238,121,130,13,2,48,11,64,170,65,190,255,
+102,139,1,106,133,13,65,18,65,58,65,82,61,95,5,0,
+235,81,214,237,29,103,12,0,224,97,162,29,132,95,185,133,
+224,89,226,21,224,105,138,13,61,142,13,0,220,137,145,127,
+1,0,224,121,210,21,61,118,29,0,220,113,1,98,78,103,
+0,0,61,86,13,0,202,225,92,7,0,0,149,13,224,105,
+242,5,61,126,13,0,207,225,1,114,92,119,0,0,61,87,
+5,0,64,6,255,0,130,7,225,16,6,232,7,216,8,224,
+188,0,224,233,138,13,32,54,56,0,128,255,162,175,10,232,
+224,233,226,13,29,48,27,56,99,231,1,0,1,66,0,74,
+191,255,226,254,48,6,80,137,133,0,125,135,49,0,29,80,
+66,6,255,16,130,7,33,0,7,143,0,0,224,137,234,23,
+0,0,67,23,3,0,35,62,3,0,191,255,254,254,66,6,
+63,0,130,7,225,16,6,232,7,224,8,216,224,233,138,13,
+32,54,56,0,128,255,72,175,10,232,224,233,242,13,29,48,
+28,56,27,64,5,138,99,143,1,0,0,74,191,255,134,254,
+48,6,112,137,133,0,125,135,49,0,29,80,66,6,255,16,
+128,7,97,0,6,232,191,255,178,254,10,16,224,17,215,5,
+61,86,52,0,106,7,1,0,2,80,64,6,127,0,0,82,
+127,0,38,87,5,0,127,0,0,82,127,0,0,82,127,0,
 0,82,127,0,0,82,127,0,0,82,127,0,0,82,127,0,
-0,82,127,0,128,7,33,0,32,150,44,177,114,7,1,0,
-38,6,60,126,133,0,128,255,4,179,64,6,63,0,128,7,
-33,0,224,49,210,5,129,58,185,5,128,255,50,174,64,6,
-63,0,128,7,33,0,32,150,96,177,114,7,1,0,38,6,
-84,126,133,0,128,255,214,178,64,6,63,0,128,7,33,0,
-224,49,210,5,129,58,185,5,128,255,4,174,64,6,63,0,
-128,7,128,7,225,0,6,232,224,233,138,13,32,54,244,11,
-128,255,12,174,10,232,224,233,194,77,49,6,96,126,133,0,
-125,143,241,11,61,54,228,1,0,58,8,66,190,255,58,147,
-61,54,236,1,32,62,254,0,32,70,0,10,190,255,42,147,
+0,82,127,0,0,82,127,0,0,82,127,0,128,7,33,0,
+32,150,44,177,114,7,1,0,38,6,156,137,133,0,128,255,
+92,179,64,6,63,0,128,7,33,0,224,49,210,5,129,58,
+185,5,128,255,138,174,64,6,63,0,128,7,33,0,32,150,
+96,177,114,7,1,0,38,6,180,137,133,0,128,255,46,179,
+64,6,63,0,128,7,33,0,224,49,210,5,129,58,185,5,
+128,255,92,174,64,6,63,0,128,7,33,6,218,75,1,0,
+97,0,128,7,225,0,6,232,224,233,138,13,32,54,244,11,
+128,255,92,174,10,232,224,233,194,77,49,6,192,137,133,0,
+125,143,241,11,61,54,228,1,0,58,8,66,190,255,230,138,
+61,54,236,1,32,62,254,0,32,70,0,10,190,255,214,138,
 1,130,93,135,71,1,125,7,241,0,93,7,72,1,32,126,
 223,255,93,7,73,1,93,127,4,1,93,7,70,1,0,226,
 28,48,252,55,72,2,221,49,0,58,32,70,92,0,190,255,
-248,146,65,226,98,226,214,245,10,90,125,95,21,1,61,54,
-40,1,0,58,32,70,30,0,190,255,222,146,36,87,185,133,
+164,138,65,226,98,226,214,245,10,90,125,95,21,1,61,54,
+40,1,0,58,32,70,30,0,190,255,138,138,36,87,197,133,
 32,142,45,0,10,86,65,0,93,87,40,1,93,143,41,1,
-64,22,133,0,34,62,8,251,61,54,42,1,128,255,136,210,
+64,22,133,0,34,62,144,6,61,54,42,1,128,255,216,210,
 29,80,64,6,255,0,140,7,225,0,6,232,7,224,229,87,
-64,0,224,7,96,1,36,143,185,133,10,248,65,138,209,142,
-15,0,100,143,185,133,255,47,32,0,29,127,73,1,224,121,
+64,0,224,7,96,1,36,143,197,133,10,248,65,138,209,142,
+15,0,100,143,197,133,255,47,32,0,29,127,73,1,224,121,
 218,5,29,119,72,1,224,113,194,5,32,86,112,1,197,93,
 125,231,241,0,60,23,8,0,32,110,128,0,226,111,192,2,
 125,111,33,1,224,105,207,5,1,82,125,87,33,1,61,143,
 33,1,32,134,0,2,125,143,29,1,226,135,192,2,125,135,
 37,1,104,130,199,5,8,106,125,111,37,1,61,78,228,1,
 61,54,184,0,61,62,40,1,8,98,99,103,1,0,1,66,
-128,255,180,140,224,81,202,37,61,54,76,1,61,62,40,1,
-40,6,42,112,129,0,29,72,1,90,93,95,73,1,61,86,
+128,255,4,141,224,81,202,37,61,54,76,1,61,62,40,1,
+40,6,126,120,129,0,29,72,1,90,93,95,73,1,61,86,
 236,1,99,87,1,0,32,142,0,10,99,143,5,0,5,130,
 99,135,9,0,99,135,13,0,99,95,21,0,99,7,17,0,
-128,255,224,129,224,81,202,5,1,106,93,111,72,1,29,103,
+128,255,48,130,224,81,202,5,1,106,93,111,72,1,29,103,
 73,1,97,98,250,5,29,95,72,1,97,90,186,5,0,82,
 181,5,32,86,112,1,76,6,255,0,128,7,33,0,6,88,
-43,23,241,11,63,6,76,112,129,0,2,22,16,0,34,87,
+43,23,241,11,63,6,160,120,129,0,2,22,16,0,34,87,
 0,0,34,143,5,0,203,81,10,48,113,0,64,6,63,0,
-166,7,225,48,6,232,245,21,32,54,200,0,128,255,246,132,
-229,87,64,0,224,7,96,1,36,23,189,133,10,248,99,18,
-142,13,2,134,1,0,100,135,189,133,1,122,93,127,70,1,
+166,7,225,48,6,232,245,21,32,54,200,0,128,255,70,133,
+229,87,64,0,224,7,96,1,36,23,201,133,10,248,99,18,
+142,13,2,134,1,0,100,135,201,133,1,122,93,127,70,1,
 255,47,32,0,29,119,70,1,224,113,242,229,38,6,132,215,
-255,255,31,58,191,255,156,12,224,81,154,253,61,55,241,0,
-191,255,152,12,10,224,28,56,61,70,40,1,38,6,36,251,
-132,0,128,255,170,177,61,95,241,0,43,23,105,0,63,6,
-214,112,129,0,2,22,192,0,34,87,0,0,34,111,5,0,
+255,255,31,58,191,255,178,7,224,81,154,253,61,55,241,0,
+191,255,174,7,10,224,28,56,61,70,40,1,38,6,172,6,
+133,0,128,255,250,177,61,95,241,0,43,23,105,0,63,6,
+42,121,129,0,2,22,192,0,34,87,0,0,34,111,5,0,
 203,81,10,48,109,0,61,23,241,0,2,23,7,0,123,18,
 130,29,119,18,242,13,2,6,33,0,210,5,2,6,81,0,
-130,29,229,29,28,64,11,50,37,62,8,131,190,255,184,149,
-245,21,28,64,12,50,37,62,8,131,190,255,170,149,133,21,
-28,64,32,54,41,0,37,62,8,131,190,255,154,149,133,13,
-28,64,32,54,51,0,37,62,8,131,190,255,138,149,38,6,
-132,215,255,255,190,255,216,163,224,81,146,13,38,6,60,251,
-132,0,32,62,6,1,0,66,190,255,182,148,29,48,128,255,
-116,24,61,55,241,0,99,7,64,0,99,7,70,0,99,7,
+130,29,229,29,28,64,11,50,37,62,16,131,190,255,100,141,
+245,21,28,64,12,50,37,62,16,131,190,255,86,141,133,21,
+28,64,32,54,41,0,37,62,16,131,190,255,70,141,133,13,
+28,64,32,54,51,0,37,62,16,131,190,255,54,141,38,6,
+132,215,255,255,190,255,68,156,224,81,146,13,38,6,196,6,
+133,0,32,62,6,1,0,66,190,255,98,140,29,48,128,255,
+190,24,61,55,241,0,99,7,64,0,99,7,70,0,99,7,
 53,0,38,103,8,0,99,7,49,0,99,103,66,0,35,62,
-36,0,128,255,36,45,99,95,61,0,99,87,57,0,61,55,
-241,0,190,255,156,209,10,120,191,82,157,82,202,121,163,122,
+36,0,128,255,114,45,99,95,61,0,99,87,57,0,61,55,
+241,0,190,255,48,204,10,120,191,82,157,82,202,121,163,122,
 125,127,237,11,35,95,41,0,35,87,37,0,235,1,234,13,
 234,1,202,13,0,18,6,90,2,112,252,119,72,2,221,113,
 78,95,4,0,65,18,98,18,246,245,35,95,61,0,35,87,
@@ -11809,44 +11931,49 @@ unsigned char tw_fw_code[] __initdata = 
 245,0,125,7,17,1,125,95,1,1,125,95,249,0,0,82,
 177,13,252,22,40,0,32,118,160,180,206,17,34,111,17,0,
 224,105,162,5,2,80,42,103,29,0,125,7,9,1,125,103,
-13,1,58,6,20,251,132,0,61,54,184,0,35,62,4,0,
-31,66,128,255,218,142,35,95,5,0,98,90,241,5,26,48,
-32,62,197,1,0,66,190,255,216,147,35,87,5,0,61,23,
+13,1,58,6,156,6,133,0,61,54,184,0,35,62,4,0,
+31,66,128,255,42,143,35,95,5,0,98,90,241,5,26,48,
+32,62,198,1,0,66,190,255,132,139,35,87,5,0,61,23,
 241,11,252,87,72,2,221,81,10,231,4,0,2,22,24,0,
-34,87,0,0,28,120,221,81,10,48,15,56,132,119,5,140,
-14,64,35,78,8,0,34,111,5,0,63,6,98,114,129,0,
+34,87,0,0,28,120,221,81,10,48,15,56,132,119,17,140,
+14,64,35,78,8,0,34,111,5,0,63,6,182,122,129,0,
 109,0,97,82,154,13,61,54,184,0,35,62,4,0,31,66,
-128,255,162,139,245,197,97,226,138,21,3,87,70,0,35,95,
+128,255,242,139,245,197,97,226,138,21,3,87,70,0,35,95,
 9,0,29,138,224,89,226,23,0,0,81,81,194,134,1,0,
 193,130,16,81,67,87,70,0,61,95,1,1,61,87,253,0,
 29,48,99,87,29,0,99,95,33,0,35,71,5,0,61,95,
 249,0,61,87,245,0,35,126,20,0,99,95,25,0,99,87,
 21,0,99,127,1,0,35,62,48,0,35,78,28,0,128,255,
-164,18,10,224,35,95,33,0,35,87,29,0,125,87,253,0,
-125,95,1,1,35,87,21,0,35,95,25,0,103,226,125,87,
-245,0,125,95,249,0,250,93,61,23,241,11,35,231,5,0,
-2,22,56,0,34,87,0,0,28,110,1,0,221,81,10,48,
-205,222,1,0,27,56,34,103,5,0,63,6,34,115,129,0,
-108,0,224,81,242,21,27,16,252,23,72,2,221,17,34,87,
+244,18,10,224,35,95,33,0,35,87,29,0,125,87,253,0,
+125,95,1,1,35,87,21,0,35,95,25,0,104,226,125,87,
+245,0,125,95,249,0,138,45,29,48,128,255,116,24,0,218,
+29,48,27,56,128,255,152,23,65,218,98,218,166,253,61,55,
+241,0,35,62,12,0,128,255,206,43,1,106,61,55,241,0,
+125,111,29,1,125,95,249,0,125,87,245,0,125,95,1,1,
+125,87,253,0,191,255,26,5,10,48,31,58,190,255,130,243,
+29,48,128,255,202,22,103,226,234,93,61,23,241,11,35,231,
+5,0,2,22,56,0,34,55,0,0,28,94,1,0,221,49,
+203,222,1,0,27,56,34,87,5,0,63,6,198,123,129,0,
+106,0,224,81,242,21,27,16,252,23,72,2,221,17,34,87,
 21,0,34,95,25,0,28,16,252,23,72,2,221,17,34,111,
 25,0,34,103,21,0,237,89,219,5,177,5,236,81,169,5,
 27,224,61,23,241,11,28,56,2,22,64,0,34,87,0,0,
-34,95,5,0,221,81,10,48,63,6,112,115,129,0,107,0,
-10,224,61,55,241,0,35,62,12,0,128,255,28,43,125,95,
-1,1,125,87,253,0,125,87,245,0,125,95,249,0,1,82,
-125,87,29,1,103,226,250,13,29,48,128,255,8,24,61,54,
-76,1,128,255,54,132,26,48,32,62,18,2,0,66,190,255,
-80,146,224,81,102,226,178,5,191,7,74,254,35,119,5,0,
-65,114,206,22,1,0,252,23,72,2,221,17,2,95,4,0,
-102,90,178,5,191,7,46,254,61,55,241,0,191,255,92,9,
+34,135,5,0,221,81,10,48,63,6,20,124,129,0,112,0,
+10,224,61,55,241,0,35,62,12,0,128,255,26,43,125,87,
+253,0,125,95,1,1,125,87,245,0,125,95,249,0,1,122,
+125,127,29,1,103,226,250,13,29,48,128,255,2,24,61,54,
+76,1,128,255,54,132,26,48,32,62,36,2,0,66,190,255,
+172,137,224,81,102,226,178,5,191,7,250,253,35,103,5,0,
+65,98,204,22,1,0,252,23,72,2,221,17,2,135,4,0,
+102,130,178,5,191,7,222,253,61,55,241,0,191,255,34,4,
 61,23,241,0,2,23,7,0,10,64,123,18,226,21,119,18,
 226,13,2,6,33,0,210,5,2,6,81,0,210,21,165,29,
-5,50,37,62,8,131,190,255,174,146,197,21,7,50,37,62,
-8,131,190,255,162,146,229,13,32,54,43,0,37,62,8,131,
-190,255,148,146,245,5,32,54,53,0,37,62,8,131,190,255,
-134,146,31,82,93,87,4,1,29,48,128,255,104,23,61,54,
-76,1,128,255,150,131,26,48,32,62,69,2,0,66,190,255,
-176,145,224,81,186,5,191,7,172,253,191,7,168,253,130,7,
+5,50,37,62,16,131,190,255,10,138,197,21,7,50,37,62,
+16,131,190,255,254,137,229,13,32,54,43,0,37,62,16,131,
+190,255,240,137,245,5,32,54,53,0,37,62,16,131,190,255,
+226,137,31,122,93,127,4,1,29,48,128,255,98,23,61,54,
+76,1,128,255,150,131,26,48,32,62,87,2,0,66,190,255,
+12,137,224,81,186,5,191,7,92,253,191,7,88,253,130,7,
 225,112,7,216,187,0,8,208,154,0,9,200,6,232,61,143,
 9,1,0,226,97,138,218,45,97,218,234,37,61,54,184,0,
 3,56,32,70,100,0,128,255,102,140,224,81,170,29,61,54,
@@ -11854,7 +11981,7 @@ unsigned char tw_fw_code[] __initdata = 
 72,2,221,121,15,111,4,0,97,106,194,5,1,82,128,7,
 112,1,250,102,50,0,136,98,12,54,20,0,128,255,150,128,
 125,7,9,1,229,5,121,7,1,0,0,82,128,7,82,1,
-97,218,178,5,128,7,72,1,61,55,241,0,191,255,92,8,
+97,218,178,5,128,7,72,1,61,55,241,0,191,255,34,3,
 10,16,2,6,240,255,0,82,177,13,226,22,40,0,32,110,
 160,180,205,17,34,103,17,0,224,97,162,5,2,80,42,23,
 29,0,61,143,29,1,61,135,33,1,17,96,240,143,192,2,
@@ -11865,9 +11992,9 @@ unsigned char tw_fw_code[] __initdata = 
 100,82,230,77,125,23,13,1,125,7,25,1,61,23,21,1,
 224,105,170,37,224,17,231,5,61,135,21,1,95,130,125,135,
 21,1,51,6,5,0,32,0,211,231,0,0,170,21,36,127,
-193,133,65,122,100,127,193,133,98,122,167,53,36,119,189,133,
-129,114,14,54,1,0,128,255,188,127,100,7,193,133,133,45,
-100,7,193,133,213,37,195,210,26,86,200,0,234,105,185,21,
+205,133,65,122,100,127,205,133,98,122,167,53,36,119,201,133,
+129,114,14,54,1,0,128,255,188,127,100,7,205,133,133,45,
+100,7,205,133,213,37,195,210,26,86,200,0,234,105,185,21,
 224,17,247,5,61,135,21,1,95,130,125,135,21,1,133,29,
 1,226,125,231,9,1,61,111,33,1,125,231,21,1,125,111,
 29,1,229,13,2,88,191,90,158,90,203,17,162,18,2,6,
@@ -11876,89 +12003,89 @@ unsigned char tw_fw_code[] __initdata = 
 61,23,21,1,61,143,17,1,2,96,191,98,158,98,204,17,
 162,18,226,137,239,119,0,0,121,119,1,0,28,80,66,6,
 255,112,170,7,225,112,8,200,25,232,252,239,72,2,6,208,
-218,233,58,54,184,0,7,224,25,56,128,255,116,40,124,87,
+218,233,58,54,184,0,7,224,25,56,128,255,114,40,124,87,
 1,0,32,118,17,0,125,87,13,0,124,119,25,0,0,218,
 213,29,60,55,18,0,27,56,194,58,61,142,60,0,209,57,
-0,66,128,255,12,40,224,81,138,21,26,48,25,56,128,255,
-228,19,99,207,1,0,58,54,184,0,3,56,31,66,128,255,
+0,66,128,255,10,40,224,81,138,21,26,48,25,56,128,255,
+222,19,99,207,1,0,58,54,184,0,3,56,31,66,128,255,
 148,135,32,86,112,1,245,69,65,218,61,135,17,0,240,217,
 150,229,35,126,4,0,124,127,5,0,0,218,245,29,27,112,
 194,114,61,94,60,0,203,113,46,55,1,0,60,79,18,0,
-0,58,35,70,4,0,190,255,102,150,100,82,151,13,38,6,
-72,251,132,0,32,62,134,3,0,66,190,255,52,143,28,64,
-12,50,12,58,190,255,64,150,65,218,61,23,17,0,226,217,
+0,58,35,70,4,0,190,255,194,141,100,82,151,13,38,6,
+208,6,133,0,32,62,152,3,0,66,190,255,144,134,28,64,
+12,50,12,58,190,255,156,141,65,218,61,23,17,0,226,217,
 246,221,60,239,1,0,2,224,229,87,64,0,224,7,96,1,
 61,255,0,0,220,249,125,255,0,0,10,224,252,47,32,0,
-224,249,138,13,29,48,61,143,5,0,63,6,18,119,129,0,
+224,249,138,13,29,48,61,143,5,0,63,6,182,127,129,0,
 113,0,0,82,106,6,255,112,168,7,225,243,8,224,252,231,
 72,2,6,176,214,225,7,232,125,31,5,0,54,54,184,0,
-8,56,128,255,124,39,125,87,1,0,0,186,124,87,13,0,
-0,202,61,215,9,0,61,223,13,0,245,45,38,6,88,251,
-132,0,32,62,202,3,0,66,190,255,166,142,54,95,241,0,
+8,56,128,255,122,39,125,87,1,0,0,186,124,87,13,0,
+0,202,61,215,9,0,61,223,13,0,245,45,38,6,224,6,
+133,0,32,62,220,3,0,66,190,255,2,134,54,95,241,0,
 60,86,28,0,43,23,105,0,202,193,2,22,8,1,34,87,
 0,0,29,56,203,81,10,48,1,66,34,127,5,0,63,6,
-134,119,129,0,111,0,120,87,1,0,65,186,61,103,9,0,
+42,128,129,0,111,0,120,87,1,0,65,186,61,103,9,0,
 61,111,13,0,12,86,1,0,125,87,9,0,225,135,0,0,
 205,129,125,135,13,0,65,202,60,119,17,0,238,201,174,21,
 25,192,194,194,60,94,60,0,216,89,43,55,1,0,61,71,
-5,0,61,79,18,0,0,58,190,255,84,149,100,82,255,189,
+5,0,61,79,18,0,0,58,190,255,176,140,100,82,255,189,
 229,197,125,215,9,0,125,223,13,0,61,239,1,0,229,87,
 64,0,224,7,96,1,61,255,0,0,10,224,215,249,125,255,
 0,0,252,47,32,0,224,249,138,13,29,48,61,111,5,0,
-63,6,8,120,129,0,109,0,104,6,255,243,168,7,225,241,
+63,6,172,128,129,0,109,0,104,6,255,243,168,7,225,241,
 8,224,252,231,72,2,6,184,215,225,7,232,125,31,5,0,
-55,54,184,0,8,56,128,255,136,38,125,87,1,0,0,194,
+55,54,184,0,8,56,128,255,134,38,125,87,1,0,0,194,
 124,87,13,0,0,202,61,215,9,0,61,223,13,0,181,61,
 25,96,194,98,60,134,60,0,208,97,44,55,1,0,61,71,
-5,0,61,79,18,0,0,58,190,255,196,148,100,82,151,13,
-38,6,104,251,132,0,32,62,20,4,0,66,190,255,146,141,
-55,95,241,0,29,56,43,23,105,0,63,6,146,120,129,0,
+5,0,61,79,18,0,0,58,190,255,32,140,100,82,151,13,
+38,6,240,6,133,0,32,62,38,4,0,66,190,255,238,132,
+55,95,241,0,29,56,43,23,105,0,63,6,54,129,129,0,
 2,22,16,1,34,87,0,0,34,119,5,0,203,81,10,48,
 110,0,224,81,170,5,65,194,61,103,9,0,61,111,13,0,
 12,86,1,0,125,87,9,0,225,135,0,0,205,129,125,135,
 13,0,65,202,60,103,17,0,236,201,182,197,125,215,9,0,
 125,223,13,0,61,239,1,0,229,87,64,0,224,7,96,1,
 61,255,0,0,10,224,216,249,125,255,0,0,252,47,32,0,
-224,249,138,13,29,48,61,95,5,0,63,6,242,120,129,0,
+224,249,138,13,29,48,61,95,5,0,63,6,150,129,129,0,
 107,0,104,6,255,241,252,63,72,2,198,57,39,87,13,0,
 0,18,224,81,178,5,42,23,12,0,2,80,127,0,130,7,
 97,0,6,232,61,23,241,11,3,64,2,22,72,0,34,87,
-0,0,34,143,5,0,221,81,10,48,63,6,50,121,129,0,
+0,0,34,143,5,0,221,81,10,48,63,6,214,129,129,0,
 113,0,10,16,103,18,234,21,0,50,1,122,35,103,1,0,
 230,127,192,0,76,121,162,13,32,94,239,255,93,95,4,1,
-0,58,191,255,148,131,7,82,229,5,65,50,6,6,240,255,
+0,58,191,255,44,127,7,82,229,5,65,50,6,6,240,255,
 214,237,2,80,66,6,127,0,180,7,225,243,6,232,7,208,
 26,224,252,231,72,2,221,225,28,23,4,0,99,71,53,0,
 103,18,194,5,2,80,128,7,108,5,99,7,28,0,99,7,
 30,0,0,202,99,7,32,0,99,7,34,0,99,7,44,0,
-29,48,128,255,130,17,99,7,98,0,61,111,241,0,99,7,
+29,48,128,255,124,17,99,7,98,0,61,111,241,0,99,7,
 92,0,99,7,77,0,45,111,8,0,99,7,81,0,99,111,
 94,0,60,151,17,0,60,191,25,0,60,183,21,0,99,151,
 37,0,60,95,13,0,125,151,29,1,235,95,19,0,99,95,
 6,0,99,95,58,0,35,143,53,0,11,144,113,151,1,0,
-26,56,61,23,241,11,63,6,12,122,129,0,2,22,56,0,
+26,56,61,23,241,11,63,6,176,130,129,0,2,22,56,0,
 34,55,0,0,34,87,5,0,221,49,106,0,99,87,56,0,
-0,218,29,48,27,56,128,255,60,16,65,218,98,218,166,253,
-35,135,56,0,224,129,194,21,61,62,40,1,36,71,33,175,
-16,72,38,6,160,251,132,0,128,255,36,168,60,79,25,0,
-60,71,21,0,38,6,120,251,132,0,128,255,18,168,61,55,
-241,0,0,194,191,255,228,2,10,216,27,6,240,255,153,13,
-38,6,144,251,132,0,32,62,229,4,0,66,190,255,146,139,
+0,218,29,48,27,56,128,255,54,16,65,218,98,218,166,253,
+35,135,56,0,224,129,194,21,61,62,40,1,36,71,45,175,
+16,72,38,6,40,7,133,0,128,255,36,168,60,79,25,0,
+60,71,21,0,38,6,0,7,133,0,128,255,18,168,61,55,
+241,0,0,194,190,255,170,253,10,216,27,6,240,255,153,13,
+38,6,24,7,133,0,32,62,247,4,0,66,190,255,238,130,
 31,146,99,151,61,0,0,18,227,143,59,0,99,143,46,0,
 1,98,226,103,192,0,81,97,204,0,224,97,194,5,99,23,
 61,0,213,5,65,18,2,6,240,255,246,237,35,23,56,0,
 2,6,0,254,161,13,224,17,210,21,2,6,143,254,186,5,
 128,7,34,1,128,7,148,1,2,6,0,254,146,21,2,6,
 254,253,210,61,2,6,252,253,186,5,128,7,84,1,128,7,
-122,1,29,48,128,255,238,14,0,82,128,7,24,4,227,119,
+122,1,29,48,128,255,232,14,0,82,128,7,24,4,227,119,
 31,0,14,150,1,0,99,151,30,0,100,114,179,13,35,71,
-61,0,10,50,37,62,16,131,190,255,188,139,1,194,128,7,
+61,0,10,50,37,62,24,131,190,255,24,131,1,194,128,7,
 106,1,99,7,57,0,35,143,57,0,1,106,241,111,192,0,
 35,143,46,0,81,105,205,0,224,105,242,5,29,48,35,71,
 57,0,26,56,128,255,210,3,35,151,57,0,65,146,99,151,
 57,0,18,6,240,255,134,237,128,7,48,1,32,54,220,5,
 128,255,18,122,25,120,65,202,217,0,98,122,195,13,35,71,
-61,0,32,54,38,0,37,62,24,131,190,255,90,139,1,194,
+61,0,32,54,38,0,37,62,32,131,190,255,182,130,1,194,
 128,7,8,1,97,202,187,5,128,7,0,1,99,7,57,0,
 35,143,57,0,1,106,241,111,192,0,35,143,46,0,81,105,
 205,0,224,105,226,29,99,7,41,0,213,21,29,48,35,63,
@@ -11972,1139 +12099,1139 @@ unsigned char tw_fw_code[] __initdata = 
 236,6,224,81,170,53,35,151,57,0,65,146,99,151,57,0,
 35,151,57,0,35,143,37,0,241,145,150,237,229,37,227,127,
 33,0,15,150,1,0,99,151,32,0,98,122,147,13,35,71,
-61,0,9,50,37,62,16,131,190,255,124,138,1,194,32,54,
+61,0,9,50,37,62,24,131,190,255,216,129,1,194,32,54,
 220,5,128,255,16,121,149,21,227,119,45,0,14,150,1,0,
 99,151,44,0,100,114,147,13,35,71,61,0,10,50,37,62,
-16,131,190,255,82,138,1,194,97,194,178,5,128,7,2,1,
-38,6,132,215,255,255,31,58,191,255,184,0,224,81,154,253,
+24,131,190,255,174,129,1,194,97,194,178,5,128,7,2,1,
+38,6,132,215,255,255,31,58,190,255,126,251,224,81,154,253,
 61,23,241,0,2,23,7,0,123,18,146,85,119,18,130,77,
 2,6,33,0,210,5,2,6,81,0,146,85,245,85,0,226,
 61,95,241,0,28,64,43,23,105,0,35,54,16,0,2,22,
 136,0,34,87,0,0,34,111,5,0,203,81,10,56,63,6,
-198,124,129,0,109,0,35,103,17,0,99,103,13,0,195,199,
+106,133,129,0,109,0,35,103,17,0,99,103,13,0,195,199,
 12,0,178,29,195,215,12,0,130,29,35,135,53,0,1,18,
 48,135,1,0,252,23,192,0,226,129,242,13,35,143,53,0,
 27,64,113,23,1,0,32,54,45,0,35,79,61,0,39,6,
-200,251,132,0,190,255,176,137,65,226,28,6,240,255,150,205,
-27,64,4,50,37,62,32,131,190,255,156,137,245,21,27,64,
-14,50,37,62,32,131,190,255,142,137,133,21,27,64,32,54,
-42,0,37,62,32,131,190,255,126,137,133,13,27,64,32,54,
-52,0,37,62,32,131,190,255,110,137,38,6,132,215,255,255,
-190,255,188,151,224,81,146,13,38,6,220,251,132,0,32,62,
-6,1,0,66,190,255,154,136,7,82,128,7,136,1,32,54,
+80,7,133,0,190,255,12,129,65,226,28,6,240,255,150,205,
+27,64,4,50,37,62,40,131,190,255,248,128,245,21,27,64,
+14,50,37,62,40,131,190,255,234,128,133,21,27,64,32,54,
+42,0,37,62,40,131,190,255,218,128,133,13,27,64,32,54,
+52,0,37,62,40,131,190,255,202,128,38,6,132,215,255,255,
+190,255,216,143,224,81,146,13,38,6,100,7,133,0,32,62,
+6,1,0,66,190,255,246,127,7,82,128,7,136,1,32,54,
 144,1,128,255,224,119,38,6,132,215,255,255,31,58,190,255,
-178,255,224,81,154,253,0,218,1,122,35,143,46,0,251,127,
+120,250,224,81,154,253,0,218,1,122,35,143,46,0,251,127,
 192,0,81,121,207,0,224,121,162,13,227,87,29,0,224,81,
-226,5,61,55,241,0,27,56,128,255,222,32,65,218,27,6,
-240,255,182,237,38,6,132,215,255,255,190,255,82,151,224,81,
-146,13,38,6,220,251,132,0,32,62,6,1,0,66,190,255,
-48,136,35,151,37,0,1,130,124,151,17,0,124,135,9,0,
+226,5,61,55,241,0,27,56,128,255,220,32,65,218,27,6,
+240,255,182,237,38,6,132,215,255,255,190,255,110,143,224,81,
+146,13,38,6,100,7,133,0,32,62,6,1,0,66,190,255,
+140,127,35,151,37,0,1,130,124,151,17,0,124,135,9,0,
 99,215,9,0,92,7,4,0,26,126,1,0,207,22,1,0,
 252,23,72,2,221,17,66,7,4,0,61,54,184,0,35,62,
 8,0,31,66,128,255,14,128,61,54,184,0,35,62,8,0,
 31,66,128,255,218,130,35,95,9,0,235,209,146,13,38,6,
-144,251,132,0,32,62,199,5,0,66,190,255,212,135,99,183,
+24,7,133,0,32,62,217,5,0,66,190,255,48,127,99,183,
 65,0,99,191,69,0,29,48,35,71,9,0,35,86,64,0,
 99,87,1,0,35,62,76,0,35,78,64,0,128,255,38,7,
 10,216,102,218,178,5,101,218,202,69,61,54,184,0,35,62,
 8,0,0,66,128,255,136,130,38,6,132,215,255,255,31,58,
-190,255,192,254,224,81,154,253,0,226,61,95,241,0,28,64,
+190,255,134,249,224,81,154,253,0,226,61,95,241,0,28,64,
 43,23,105,0,35,54,20,0,2,22,136,0,34,87,0,0,
-34,119,5,0,203,81,10,56,63,6,160,126,129,0,110,0,
-195,199,20,0,226,5,61,55,241,0,28,56,128,255,226,31,
+34,119,5,0,203,81,10,56,63,6,68,135,129,0,110,0,
+195,199,20,0,226,5,61,55,241,0,28,56,128,255,224,31,
 65,226,28,6,240,255,166,229,38,6,132,215,255,255,190,255,
-78,150,224,81,146,13,38,6,220,251,132,0,32,62,6,1,
-0,66,190,255,44,135,29,48,128,255,234,10,27,80,165,13,
+106,142,224,81,146,13,38,6,100,7,133,0,32,62,6,1,
+0,66,190,255,136,126,29,48,128,255,228,10,27,80,165,13,
 103,218,186,149,227,151,29,0,65,146,99,151,28,0,191,7,
 178,250,116,6,255,243,138,7,225,240,6,208,8,216,27,48,
-7,192,35,62,2,0,35,70,3,0,191,255,8,61,3,23,
-2,0,0,202,224,17,162,125,4,135,204,131,224,129,234,117,
-60,6,132,215,255,255,27,56,10,64,2,72,38,6,232,251,
-132,0,128,255,42,163,28,48,31,58,190,255,246,253,224,81,
+7,192,35,62,2,0,35,70,3,0,191,255,160,56,3,23,
+2,0,0,202,224,17,162,125,4,135,216,131,224,129,234,117,
+60,6,132,215,255,255,27,56,10,64,2,72,38,6,112,7,
+133,0,128,255,42,163,28,48,31,58,190,255,188,248,224,81,
 186,253,24,232,252,239,72,2,218,233,58,54,184,0,24,56,
-128,255,94,31,125,87,13,0,1,90,106,95,0,0,10,48,
-3,71,2,0,27,56,191,255,96,88,3,130,1,138,106,143,
+128,255,92,31,125,87,13,0,1,90,106,95,0,0,10,48,
+3,71,2,0,27,56,191,255,248,83,3,130,1,138,106,143,
 0,0,3,23,2,0,99,135,8,0,2,126,64,0,99,127,
 10,0,99,7,13,0,67,7,16,0,32,118,239,0,67,119,
 17,0,8,106,99,111,18,0,27,48,10,56,35,70,8,0,
-0,74,191,255,4,88,28,48,190,255,100,149,224,81,146,13,
-38,6,20,252,132,0,32,62,6,1,0,66,190,255,66,134,
+0,74,191,255,156,83,28,48,190,255,128,141,224,81,146,13,
+38,6,156,7,133,0,32,62,6,1,0,66,190,255,158,125,
 58,54,184,0,35,62,4,0,31,66,128,255,34,129,28,48,
-31,58,190,255,94,253,224,81,186,253,61,55,13,0,38,207,
-12,0,102,7,0,0,190,255,86,141,125,7,13,0,28,48,
-190,255,28,149,224,81,162,13,38,6,20,252,132,0,32,62,
-6,1,0,66,190,255,250,133,224,81,25,80,74,6,255,240,
+31,58,190,255,36,248,224,81,186,253,61,55,13,0,38,207,
+12,0,102,7,0,0,190,255,178,132,125,7,13,0,28,48,
+190,255,56,141,224,81,162,13,38,6,156,7,133,0,32,62,
+6,1,0,66,190,255,86,125,224,81,25,80,74,6,255,240,
 190,7,225,243,0,226,99,63,13,0,99,7,112,0,99,7,
 118,0,99,7,97,0,35,134,16,0,99,79,109,0,99,71,
 105,0,6,232,61,151,241,0,99,135,101,0,99,151,5,0,
 29,216,50,151,8,0,0,210,99,151,5,0,55,6,132,215,
-255,255,54,6,48,252,132,0,0,194,128,7,118,2,29,48,
-0,58,128,255,240,9,26,6,254,253,218,5,32,54,232,3,
-128,255,226,116,23,48,31,58,190,255,184,252,224,81,186,253,
+255,255,54,6,184,7,133,0,0,194,128,7,118,2,29,48,
+0,58,128,255,234,9,26,6,254,253,218,5,32,54,232,3,
+128,255,226,116,23,48,31,58,190,255,126,247,224,81,186,253,
 28,200,194,202,59,62,60,0,217,57,1,50,31,66,128,255,
-224,29,59,94,60,0,217,89,43,55,1,0,0,58,35,70,
-16,0,1,74,190,255,120,140,61,54,184,0,28,56,128,255,
-0,30,99,87,97,0,10,128,123,135,13,0,16,120,1,114,
+222,29,59,94,60,0,217,89,43,55,1,0,0,58,35,70,
+16,0,1,74,190,255,212,131,61,54,184,0,28,56,128,255,
+254,29,99,87,97,0,10,128,123,135,13,0,16,120,1,114,
 111,119,0,0,59,150,28,0,61,95,241,0,99,199,114,0,
 43,23,105,0,217,145,2,22,32,1,34,87,0,0,99,151,
 9,0,203,81,10,48,35,71,13,0,35,62,96,0,1,74,
-34,111,5,0,63,6,252,128,129,0,109,0,35,143,9,0,
+34,111,5,0,63,6,160,137,129,0,109,0,35,143,9,0,
 59,94,28,0,113,87,1,0,203,201,57,87,1,0,23,48,
-224,81,186,21,59,135,13,0,112,7,0,0,190,255,240,147,
+224,81,186,21,59,135,13,0,112,7,0,0,190,255,12,140,
 224,81,186,5,128,7,184,1,22,48,32,62,6,1,0,66,
-190,255,206,132,128,7,168,1,190,255,212,147,224,81,242,5,
-22,48,32,62,6,1,0,66,190,255,182,132,61,54,184,0,
+190,255,42,124,128,7,168,1,190,255,240,139,224,81,242,5,
+22,48,32,62,6,1,0,66,190,255,18,124,61,54,184,0,
 3,56,31,66,128,255,152,127,35,127,1,0,239,225,146,13,
-38,6,32,252,132,0,32,62,202,6,0,66,190,255,146,132,
+38,6,168,7,133,0,32,62,220,6,0,66,190,255,238,123,
 61,23,241,11,28,56,2,22,56,0,34,87,0,0,34,119,
-5,0,221,81,10,48,63,6,142,129,129,0,110,0,10,208,
+5,0,221,81,10,48,63,6,50,138,129,0,110,0,10,208,
 224,209,186,5,128,7,58,1,26,6,254,253,178,5,128,7,
-62,1,61,55,241,0,190,255,146,251,234,86,40,0,32,126,
+62,1,61,55,241,0,190,255,88,246,234,86,40,0,32,126,
 160,180,207,81,138,119,37,0,224,113,186,5,128,7,18,1,
-23,48,31,58,190,255,108,251,224,81,186,253,59,55,13,0,
-102,7,0,0,190,255,104,139,61,54,184,0,28,56,128,255,
-208,28,10,104,13,96,1,90,108,95,0,0,99,87,97,0,
+23,48,31,58,190,255,50,246,224,81,186,253,59,55,13,0,
+102,7,0,0,190,255,196,130,61,54,184,0,28,56,128,255,
+206,28,10,104,13,96,1,90,108,95,0,0,99,87,97,0,
 61,95,241,0,123,111,13,0,43,23,105,0,35,71,13,0,
 2,22,40,1,34,55,0,0,35,62,96,0,203,49,34,87,
-5,0,63,6,26,130,129,0,106,0,23,48,10,208,224,209,
-130,21,59,127,13,0,111,7,0,0,190,255,226,146,224,81,
-242,69,22,48,32,62,6,1,0,66,190,255,196,131,133,69,
-190,255,204,146,224,81,242,5,22,48,32,62,6,1,0,66,
-190,255,174,131,35,63,13,0,24,64,38,6,60,252,132,0,
-128,255,252,159,35,71,13,0,32,54,44,0,39,6,100,252,
-132,0,190,255,66,132,61,54,184,0,3,56,31,66,128,255,
-110,126,35,119,1,0,238,225,146,13,38,6,32,252,132,0,
-32,62,9,7,0,66,190,255,104,131,61,23,241,11,28,56,
+5,0,63,6,190,138,129,0,106,0,23,48,10,208,224,209,
+130,21,59,127,13,0,111,7,0,0,190,255,254,138,224,81,
+242,69,22,48,32,62,6,1,0,66,190,255,32,123,133,69,
+190,255,232,138,224,81,242,5,22,48,32,62,6,1,0,66,
+190,255,10,123,35,63,13,0,24,64,38,6,196,7,133,0,
+128,255,252,159,35,71,13,0,32,54,44,0,39,6,236,7,
+133,0,190,255,158,123,61,54,184,0,3,56,31,66,128,255,
+110,126,35,119,1,0,238,225,146,13,38,6,168,7,133,0,
+32,62,27,7,0,66,190,255,196,122,61,23,241,11,28,56,
 2,22,56,0,34,87,0,0,34,111,5,0,221,81,10,48,
-63,6,184,130,129,0,109,0,10,208,224,209,138,21,29,48,
-28,56,128,255,144,7,32,54,232,3,128,255,136,114,65,194,
+63,6,92,139,129,0,109,0,10,208,224,209,138,21,29,48,
+28,56,128,255,138,7,32,54,232,3,128,255,136,114,65,194,
 35,143,5,0,241,193,190,5,191,7,134,253,29,48,28,56,
-128,255,114,7,26,80,126,6,255,243,184,7,225,115,6,232,
+128,255,108,7,26,80,126,6,255,243,184,7,225,115,6,232,
 61,223,241,0,29,224,59,223,8,0,8,176,99,183,93,0,
 9,184,99,191,97,0,99,7,100,0,99,7,106,0,99,7,
 85,0,35,134,4,0,99,135,89,0,99,223,102,0,132,127,
-7,140,224,121,210,5,32,86,113,1,128,7,68,2,58,6,
-132,215,255,255,0,58,128,255,28,7,26,48,31,58,190,255,
-242,249,224,81,186,253,57,6,128,252,132,0,27,48,60,62,
-60,0,31,66,128,255,26,27,60,55,61,0,27,72,0,58,
-35,70,4,0,190,255,184,137,60,55,61,0,190,255,220,135,
-224,81,194,21,26,48,190,255,150,145,224,81,242,5,25,48,
-32,62,6,1,0,66,190,255,120,130,29,48,0,58,128,255,
-196,6,32,86,113,1,128,7,216,1,61,54,184,0,0,58,
-128,255,14,27,99,87,85,0,10,112,14,104,61,95,241,0,
+19,140,224,121,210,5,32,86,113,1,128,7,68,2,58,6,
+132,215,255,255,0,58,128,255,22,7,26,48,31,58,190,255,
+184,244,224,81,186,253,57,6,8,8,133,0,27,48,60,62,
+60,0,31,66,128,255,24,27,60,55,61,0,27,72,0,58,
+35,70,4,0,190,255,20,129,60,55,61,0,190,255,56,127,
+224,81,194,21,26,48,190,255,178,137,224,81,242,5,25,48,
+32,62,6,1,0,66,190,255,212,121,29,48,0,58,128,255,
+190,6,32,86,113,1,128,7,216,1,61,54,184,0,0,58,
+128,255,12,27,99,87,85,0,10,112,14,104,61,95,241,0,
 1,98,43,23,105,0,109,103,0,0,2,22,8,1,34,87,
 0,0,124,119,13,0,203,81,10,48,35,62,84,0,1,66,
-34,95,5,0,63,6,220,131,129,0,107,0,124,87,29,0,
+34,95,5,0,63,6,128,140,129,0,107,0,124,87,29,0,
 26,48,224,81,186,21,60,135,13,0,112,7,0,0,190,255,
-30,145,224,81,242,5,25,48,32,62,6,1,0,66,190,255,
-0,130,32,222,34,1,128,7,94,1,190,255,2,145,224,81,
-242,5,25,48,32,62,6,1,0,66,190,255,228,129,61,54,
+58,137,224,81,242,5,25,48,32,62,6,1,0,66,190,255,
+92,121,32,222,34,1,128,7,94,1,190,255,30,137,224,81,
+242,5,25,48,32,62,6,1,0,66,190,255,64,121,61,54,
 184,0,3,56,31,66,128,255,198,124,35,127,1,0,224,121,
-146,13,38,6,112,252,132,0,32,62,158,7,0,66,190,255,
-192,129,61,23,241,11,0,58,2,22,56,0,34,87,0,0,
-34,119,5,0,221,81,10,48,63,6,96,132,129,0,110,0,
+146,13,38,6,248,7,133,0,32,62,176,7,0,66,190,255,
+28,121,61,23,241,11,0,58,2,22,56,0,34,87,0,0,
+34,119,5,0,221,81,10,48,63,6,4,141,129,0,110,0,
 10,216,224,217,178,5,128,7,254,0,26,48,31,58,190,255,
-194,248,224,81,186,253,60,55,13,0,102,7,0,0,190,255,
-190,136,61,54,184,0,0,58,128,255,38,26,99,87,85,0,
+136,243,224,81,186,253,60,55,13,0,102,7,0,0,190,255,
+26,128,61,54,184,0,0,58,128,255,36,26,99,87,85,0,
 10,96,61,95,241,0,1,82,43,23,105,0,108,87,0,0,
 2,22,16,1,34,87,0,0,124,103,13,0,203,81,10,48,
-35,62,84,0,34,135,5,0,63,6,192,132,129,0,112,0,
+35,62,84,0,34,135,5,0,63,6,100,141,129,0,112,0,
 26,48,10,216,224,217,146,21,60,119,13,0,110,7,0,0,
-190,255,60,144,224,81,242,69,25,48,32,62,6,1,0,66,
-190,255,30,129,224,81,245,61,190,255,36,144,224,81,242,5,
-25,48,32,62,6,1,0,66,190,255,6,129,22,64,23,72,
-38,6,140,252,132,0,128,255,86,157,61,55,241,0,190,255,
-42,248,10,64,32,54,54,0,37,62,40,131,190,255,152,129,
+190,255,88,136,224,81,242,69,25,48,32,62,6,1,0,66,
+190,255,122,120,224,81,245,61,190,255,64,136,224,81,242,5,
+25,48,32,62,6,1,0,66,190,255,98,120,22,64,23,72,
+38,6,20,8,133,0,128,255,86,157,61,55,241,0,190,255,
+240,242,10,64,32,54,54,0,37,62,48,131,190,255,244,120,
 61,54,184,0,3,56,31,66,128,255,196,123,35,111,1,0,
-224,105,146,13,38,6,112,252,132,0,32,62,214,7,0,66,
-190,255,190,128,61,23,241,11,0,58,2,22,56,0,34,87,
-0,0,34,103,5,0,221,81,10,48,63,6,98,133,129,0,
-108,0,10,216,29,48,0,58,128,255,234,4,27,80,120,6,
+224,105,146,13,38,6,248,7,133,0,32,62,232,7,0,66,
+190,255,26,120,61,23,241,11,0,58,2,22,56,0,34,87,
+0,0,34,103,5,0,221,81,10,48,63,6,6,142,129,0,
+108,0,10,216,29,48,0,58,128,255,228,4,27,80,120,6,
 255,115,140,7,225,243,99,71,13,0,9,184,35,207,61,0,
 99,71,1,0,7,208,8,56,7,224,252,231,72,2,6,232,
 61,23,241,11,221,225,2,22,56,0,34,87,0,0,28,223,
-4,0,221,81,10,48,34,119,5,0,63,6,178,133,129,0,
-110,0,224,81,226,5,7,82,92,87,4,0,128,7,2,4,
+4,0,221,81,10,48,34,119,5,0,63,6,86,142,129,0,
+110,0,224,81,226,5,7,82,92,87,4,0,128,7,252,3,
 101,218,186,5,1,218,197,5,101,218,174,5,65,218,92,223,
 4,0,54,6,132,215,255,255,22,48,32,62,50,0,190,255,
-82,247,224,81,226,5,7,82,92,87,4,0,128,7,210,3,
+24,242,224,81,226,5,7,82,92,87,4,0,128,7,204,3,
 60,23,13,0,224,17,226,5,98,7,0,0,2,48,190,255,
-62,135,124,7,13,0,97,218,178,5,128,7,26,1,61,199,
+154,126,124,7,13,0,97,218,178,5,128,7,26,1,61,199,
 29,1,104,194,167,5,8,194,61,55,241,0,35,62,16,0,
-128,255,118,24,57,63,5,0,35,119,17,0,7,88,55,79,
+128,255,116,24,57,63,5,0,35,119,17,0,7,88,55,79,
 5,0,57,55,1,0,55,71,1,0,6,96,168,97,225,135,
 0,0,176,89,169,89,172,113,99,119,17,0,35,127,21,0,
 225,111,0,0,173,121,171,121,99,127,21,0,170,37,238,1,
 138,37,1,122,35,95,1,0,6,218,65,90,203,22,1,0,
 99,23,5,0,92,223,4,0,252,23,72,2,221,17,2,119,
-4,0,98,127,9,0,98,114,178,5,128,7,22,3,61,54,
-184,0,35,62,4,0,31,66,128,255,122,119,128,7,4,3,
+4,0,98,127,9,0,98,114,178,5,128,7,16,3,61,54,
+184,0,35,62,4,0,31,66,128,255,122,119,128,7,254,2,
 35,87,17,0,35,95,21,0,24,104,191,106,235,105,209,5,
 187,5,234,193,163,5,10,192,124,55,21,0,124,63,25,0,
 124,199,17,0,61,23,241,11,26,56,2,22,32,0,34,87,
 0,0,35,71,1,0,221,81,10,48,34,111,5,0,63,6,
-230,134,129,0,109,0,224,81,202,21,60,103,17,0,57,119,
+138,143,129,0,109,0,224,81,202,21,60,103,17,0,57,119,
 1,0,12,88,191,90,206,97,121,103,1,0,57,127,5,0,
-225,135,0,0,208,89,207,89,121,95,5,0,128,7,148,2,
+225,135,0,0,208,89,207,89,121,95,5,0,128,7,142,2,
 95,218,1,50,125,55,29,1,92,223,4,0,128,255,54,110,
-128,7,128,2,99,218,242,5,98,218,218,37,60,119,9,0,
+128,7,122,2,99,218,242,5,98,218,218,37,60,119,9,0,
 224,113,151,37,60,95,25,0,60,87,21,0,3,106,122,95,
 13,0,122,87,9,0,26,56,61,23,241,11,124,7,9,0,
 2,22,40,0,34,87,0,0,92,111,4,0,221,81,10,48,
-35,71,1,0,34,103,5,0,63,6,112,135,129,0,108,0,
-128,7,48,2,100,218,138,61,60,95,25,0,60,87,21,0,
+35,71,1,0,34,103,5,0,63,6,20,144,129,0,108,0,
+128,7,42,2,100,218,138,61,60,95,25,0,60,87,21,0,
 26,56,122,95,13,0,122,87,9,0,35,71,1,0,61,23,
-241,11,63,6,170,135,129,0,2,22,48,0,34,87,0,0,
+241,11,63,6,78,144,129,0,2,22,48,0,34,87,0,0,
 34,95,5,0,221,81,10,48,107,0,35,87,1,0,65,82,
 202,22,1,0,99,23,5,0,252,23,72,2,221,17,34,119,
 9,0,2,111,4,0,65,114,98,119,9,0,98,106,178,5,
-128,7,208,1,61,54,184,0,35,62,4,0,31,66,128,255,
-52,118,128,7,190,1,101,218,178,5,128,7,182,1,60,199,
+128,7,202,1,61,54,184,0,35,62,4,0,31,66,128,255,
+52,118,128,7,184,1,101,218,178,5,128,7,176,1,60,199,
 21,0,55,95,5,0,60,207,25,0,55,87,1,0,235,201,
-186,5,234,193,146,53,22,48,190,255,4,141,224,81,146,13,
-38,6,180,252,132,0,32,62,6,1,0,66,190,255,226,125,
+186,5,234,193,146,53,22,48,190,255,32,133,224,81,146,13,
+38,6,60,8,133,0,32,62,6,1,0,66,190,255,62,117,
 61,54,184,0,35,62,4,0,31,66,128,255,194,120,35,103,
 5,0,1,82,252,103,72,2,221,97,108,87,9,0,61,54,
 184,0,35,62,4,0,31,66,128,255,202,117,95,218,92,223,
 4,0,61,54,184,0,3,56,31,66,128,255,184,117,27,80,
-170,0,128,7,92,1,61,55,241,0,35,62,16,0,128,255,
-40,22,235,201,138,29,234,193,234,21,61,95,241,0,60,135,
+170,0,128,7,86,1,61,55,241,0,35,62,16,0,128,255,
+38,22,235,201,138,29,234,193,234,21,61,95,241,0,60,135,
 17,0,43,23,105,0,16,72,2,22,232,0,34,55,0,0,
-191,74,203,49,16,80,10,64,34,127,5,0,63,6,164,136,
-129,0,111,0,35,63,1,0,29,48,128,255,168,1,61,55,
-241,0,35,62,16,0,128,255,224,21,119,95,5,0,119,87,
+191,74,203,49,16,80,10,64,34,127,5,0,63,6,72,145,
+129,0,111,0,35,63,1,0,29,48,128,255,162,1,61,55,
+241,0,35,62,16,0,128,255,222,21,119,95,5,0,119,87,
 1,0,35,95,21,0,35,87,17,0,235,1,250,5,234,1,
-218,5,6,218,92,223,4,0,197,101,22,48,190,255,48,140,
-224,81,146,13,38,6,180,252,132,0,32,62,6,1,0,66,
-190,255,14,125,35,151,13,0,18,110,1,0,205,22,1,0,
+218,5,6,218,92,223,4,0,149,101,22,48,190,255,76,132,
+224,81,146,13,38,6,60,8,133,0,32,62,6,1,0,66,
+190,255,106,116,35,151,13,0,18,110,1,0,205,22,1,0,
 99,23,5,0,252,23,72,2,2,88,221,89,11,87,4,0,
 224,81,226,21,221,17,2,127,4,0,102,122,146,21,61,54,
 184,0,35,62,4,0,10,66,128,255,196,119,224,81,138,13,
 61,54,184,0,35,62,4,0,31,66,128,255,216,116,61,54,
 184,0,3,56,31,66,128,255,204,116,61,119,17,1,97,114,
-223,37,35,151,13,0,224,145,154,37,61,55,241,0,190,255,
-192,185,10,64,61,111,237,11,131,66,237,65,242,21,36,103,
-177,133,65,98,100,103,177,133,204,94,15,0,111,90,218,5,
-34,6,192,252,132,0,181,5,37,22,48,131,125,71,237,11,
-29,63,40,1,2,48,128,255,198,152,27,80,170,0,133,21,
-22,48,190,255,106,139,224,81,146,13,38,6,180,252,132,0,
-32,62,6,1,0,66,190,255,72,124,27,80,170,0,76,6,
-255,243,130,7,97,0,6,232,0,74,9,16,252,23,72,2,
-2,120,221,121,79,7,4,0,2,128,221,129,112,79,1,0,
-2,112,221,113,110,7,9,0,2,104,221,105,2,96,221,97,
-108,7,13,0,109,7,17,0,0,98,12,88,194,90,2,80,
-221,81,42,142,60,0,203,137,113,7,1,0,2,120,221,121,
-47,110,28,0,205,89,107,7,1,0,65,98,104,98,230,237,
-65,74,98,74,182,213,1,98,125,103,9,0,99,7,1,0,
-61,54,184,0,3,56,31,66,128,255,218,115,1,90,99,95,
-1,0,61,54,184,0,3,56,31,66,128,255,200,115,66,6,
-127,0,132,7,225,48,6,208,7,232,252,239,72,2,218,233,
-61,127,13,0,224,121,178,13,197,5,2,50,128,255,230,106,
-61,111,13,0,45,111,0,0,224,105,138,253,58,54,76,1,
-0,58,3,64,128,255,202,107,224,81,146,13,38,6,204,252,
-132,0,32,62,205,9,0,66,190,255,102,123,61,23,13,0,
-125,7,17,0,224,17,130,13,98,7,0,0,2,48,190,255,
-142,130,125,7,13,0,0,218,27,224,194,226,61,94,60,0,
-220,89,43,143,1,0,224,137,226,13,61,134,60,0,220,129,
-48,55,1,0,1,58,128,255,144,19,61,118,60,0,220,113,
-110,7,1,0,61,102,28,0,220,97,44,87,1,0,224,81,
-210,13,61,142,28,0,220,137,49,55,1,0,190,255,222,197,
-61,118,28,0,206,225,124,7,1,0,65,218,104,218,214,213,
-35,63,1,0,58,54,76,1,35,70,4,0,128,255,50,107,
-68,6,255,48,132,7,225,0,6,224,0,234,0,18,2,136,
-252,143,72,2,220,137,17,87,4,0,224,81,242,5,98,82,
-210,5,102,82,178,5,103,82,170,5,65,234,65,18,98,18,
-246,237,98,234,190,29,60,54,184,0,35,62,4,0,31,66,
-128,255,140,117,35,95,5,0,98,90,145,13,38,6,220,252,
-132,0,32,62,44,10,0,66,190,255,134,122,35,87,5,0,
-252,87,72,2,220,81,74,7,4,0,98,234,246,205,60,54,
-184,0,3,56,0,66,128,255,86,117,224,81,146,253,68,6,
-255,0,136,7,225,48,6,232,58,6,132,215,255,255,26,48,
-31,58,190,255,126,241,224,81,186,253,29,143,72,1,97,138,
-170,101,29,135,71,1,97,130,234,93,60,6,236,252,132,0,
-32,223,37,183,93,7,71,1,27,48,0,58,3,64,128,255,
-112,106,224,81,242,5,28,48,32,62,116,10,0,66,190,255,
-16,122,61,126,76,1,239,217,210,13,61,54,76,1,128,255,
-218,107,224,81,242,5,28,48,32,62,122,10,0,66,190,255,
-240,121,26,48,190,255,248,136,224,81,146,13,38,6,252,252,
-132,0,32,62,6,1,0,66,190,255,214,121,99,239,9,0,
-1,18,67,23,12,0,35,62,8,0,38,6,188,136,145,0,
-31,66,128,255,208,113,224,81,242,5,28,48,32,62,140,10,
-0,66,190,255,172,121,32,54,236,176,32,62,32,0,0,66,
-190,255,18,178,224,81,242,5,28,48,32,62,144,10,0,66,
-190,255,142,121,35,63,1,0,27,48,35,70,4,0,128,255,
-208,105,245,13,26,48,190,255,134,136,224,81,162,13,38,6,
-252,252,132,0,32,62,6,1,0,66,190,255,100,121,224,81,
-72,6,255,48,128,7,225,16,6,232,29,223,72,1,61,55,
-241,0,93,7,72,1,224,49,130,61,190,255,126,240,10,224,
-29,63,4,1,28,48,31,66,128,255,222,17,61,23,241,0,
-2,23,7,0,123,18,162,29,119,18,130,21,2,6,33,0,
-210,5,2,6,81,0,162,29,133,37,28,64,32,54,59,0,
-37,62,56,131,190,255,192,121,133,29,28,64,32,54,60,0,
-37,62,56,131,190,255,176,121,133,21,28,64,32,54,61,0,
-37,62,56,131,190,255,160,121,133,13,28,64,32,54,62,0,
-37,62,56,131,190,255,144,121,0,226,29,48,28,56,191,255,
-36,253,65,226,98,226,166,253,29,135,73,1,60,6,8,253,
-132,0,97,130,250,13,61,54,184,0,128,255,234,111,224,81,
-242,5,28,48,32,62,238,10,0,66,190,255,164,120,93,7,
-73,1,97,218,170,29,61,54,76,1,128,255,110,106,224,81,
-242,5,28,48,32,62,246,10,0,66,190,255,132,120,61,54,
-76,1,128,255,78,104,224,81,130,13,28,48,32,62,249,10,
-0,66,190,255,108,120,224,81,64,6,255,16,128,7,225,0,
-6,232,7,224,224,233,178,45,49,6,96,126,133,0,125,143,
-241,11,191,255,242,254,229,87,64,0,224,7,96,1,29,135,
-70,1,10,248,97,130,138,13,93,7,70,1,36,127,189,133,
-95,122,100,127,189,133,255,47,32,0,61,55,241,0,190,255,
-90,239,10,56,61,70,40,1,38,6,24,253,132,0,128,255,
-110,148,129,226,201,5,29,48,128,255,132,142,64,6,255,0,
-100,7,189,133,32,142,200,0,100,7,185,133,68,143,4,140,
-68,143,5,140,100,7,13,140,100,7,17,140,2,122,68,127,
-7,140,68,127,8,140,0,82,32,126,60,0,49,6,128,81,
-1,0,7,98,10,88,236,95,128,106,237,143,32,2,79,136,
-45,6,24,17,148,0,10,16,194,18,2,112,205,113,110,143,
-0,0,44,6,52,17,148,0,204,17,98,143,0,0,32,94,
-160,5,110,95,2,0,98,95,2,0,65,82,103,82,214,221,
-127,0,136,7,225,112,36,143,197,133,224,137,178,5,128,7,
-62,2,38,6,132,215,255,255,31,58,190,255,166,238,224,81,
-154,253,99,7,4,0,0,234,0,18,29,6,240,255,129,13,
-253,118,40,0,32,102,160,180,204,113,46,23,17,0,2,216,
-224,217,130,37,0,226,59,23,105,0,28,64,2,22,136,0,
-34,87,0,0,35,54,8,0,219,81,10,56,34,95,5,0,
-63,6,216,142,129,0,107,0,35,87,9,0,35,135,4,0,
-99,87,13,0,10,129,99,135,4,0,65,226,28,6,240,255,
-182,229,65,234,29,6,240,255,134,213,38,6,132,215,255,255,
-190,255,12,134,224,81,146,13,38,6,48,253,132,0,32,62,
-6,1,0,66,190,255,234,118,3,239,4,0,4,23,7,140,
-29,224,29,216,220,234,159,234,221,218,159,218,28,208,219,226,
-159,226,218,210,159,210,224,17,130,109,224,233,218,5,224,217,
-186,5,224,209,162,101,98,18,146,13,38,6,24,17,148,0,
-7,58,128,255,182,1,224,81,162,53,224,225,194,13,0,226,
-28,48,0,58,27,66,128,255,56,15,65,226,28,6,240,255,
-134,253,0,226,1,106,100,111,13,140,0,202,224,209,178,13,
-25,48,1,58,32,70,175,255,128,255,22,15,36,103,189,133,
-224,97,191,61,224,217,242,5,25,48,1,58,32,70,223,255,
-128,255,254,14,224,233,226,5,25,48,1,58,23,66,128,255,
-240,14,65,202,25,6,240,255,166,229,245,37,36,95,189,133,
-224,89,151,37,36,87,13,140,97,82,218,29,0,202,224,217,
-242,5,25,48,0,58,32,70,223,255,128,255,196,14,224,209,
-242,5,25,48,0,58,32,70,175,255,128,255,180,14,224,233,
-226,5,25,48,0,58,23,66,128,255,166,14,65,202,25,6,
-240,255,230,229,100,7,13,140,4,23,8,140,224,17,242,85,
-98,18,146,13,38,6,52,17,148,0,7,58,128,255,236,0,
-224,81,242,53,1,122,100,127,17,140,224,225,194,13,0,234,
-29,48,1,58,27,66,128,255,104,14,65,234,29,6,240,255,
-134,253,213,61,35,54,3,0,35,62,12,0,128,255,142,47,
-36,119,189,133,224,113,186,53,4,111,180,133,3,23,3,0,
-226,105,210,45,68,23,180,133,0,234,253,86,40,0,32,134,
-160,180,208,81,170,127,35,0,224,121,226,5,29,48,27,58,
-31,66,128,255,36,14,65,234,29,6,240,255,246,237,245,21,
-224,225,210,21,36,119,189,133,224,113,247,13,36,111,17,140,
-97,106,186,13,0,234,29,48,0,58,27,66,128,255,242,13,
-65,234,29,6,240,255,134,253,100,7,17,140,72,6,255,112,
-128,7,33,0,196,239,144,140,226,29,196,231,144,140,178,29,
-4,23,7,140,98,18,146,13,97,18,242,5,4,23,8,140,
-98,18,178,5,97,18,250,13,36,111,173,172,224,105,202,5,
-1,50,128,255,170,46,32,54,236,176,128,62,0,128,0,66,
-190,255,114,173,64,6,63,0,132,7,225,0,6,232,7,224,
-35,54,3,0,35,62,4,0,128,255,194,46,10,16,32,142,
-60,0,241,23,194,2,0,90,213,29,61,111,2,0,61,87,
-0,0,13,120,202,121,32,118,96,39,238,127,194,98,68,234,
-224,105,242,13,236,81,251,5,234,17,179,13,236,17,153,13,
-1,82,181,13,234,17,185,5,236,17,185,5,1,82,213,5,
-65,90,252,89,182,229,0,82,68,6,255,0,128,7,33,0,
-229,87,64,0,224,7,96,1,10,248,1,138,36,135,201,133,
-100,143,197,133,65,130,100,135,201,133,255,47,32,0,128,255,
-52,0,64,6,63,0,128,7,65,0,229,87,64,0,224,7,
-96,1,36,143,201,133,10,232,95,138,100,143,201,133,224,137,
-223,5,100,7,201,133,100,7,197,133,253,47,32,0,64,6,
-95,0,128,7,97,0,0,234,29,48,128,255,236,12,65,234,
-29,6,240,255,166,253,64,6,127,0,128,7,97,0,6,232,
-224,233,138,13,32,54,244,11,128,255,180,138,10,232,224,233,
-178,29,29,48,191,255,142,220,49,6,176,126,133,0,125,143,
-241,11,64,22,133,0,36,135,185,133,34,62,60,253,16,134,
-65,0,93,135,40,1,32,126,45,0,93,127,41,1,61,54,
-42,1,128,255,146,175,29,80,64,6,127,0,130,7,225,240,
-6,216,7,192,8,208,0,202,26,232,252,239,72,2,219,233,
-0,226,213,21,56,55,18,0,28,56,194,58,61,94,60,0,
-203,57,0,66,128,255,26,12,224,81,138,13,27,48,26,56,
-191,255,242,247,32,206,112,1,229,5,65,226,61,87,17,0,
-234,225,150,237,99,215,1,0,59,54,184,0,3,56,31,66,
-128,255,146,107,25,80,66,6,255,240,128,7,97,0,6,232,
-224,233,138,13,32,54,244,11,128,255,4,138,10,232,224,233,
-178,29,29,48,191,255,222,219,49,6,0,127,133,0,125,143,
-241,11,64,22,133,0,36,135,185,133,34,62,76,253,16,134,
+175,37,35,151,13,0,224,145,234,29,61,55,241,0,190,255,
+4,180,10,64,61,111,237,11,131,66,237,65,194,21,36,103,
+189,133,37,22,56,131,65,98,100,103,189,133,204,94,15,0,
+111,90,170,5,8,218,125,71,237,11,29,63,40,1,2,48,
+128,255,204,152,27,80,170,0,133,21,22,48,190,255,140,131,
+224,81,146,13,38,6,60,8,133,0,32,62,6,1,0,66,
+190,255,170,115,27,80,170,0,76,6,255,243,130,7,97,0,
+6,232,0,74,9,16,252,23,72,2,2,120,221,121,79,7,
+4,0,2,128,221,129,112,79,1,0,2,112,221,113,110,7,
+9,0,2,104,221,105,2,96,221,97,108,7,13,0,109,7,
+17,0,0,98,12,88,194,90,2,80,221,81,42,142,60,0,
+203,137,113,7,1,0,2,120,221,121,47,110,28,0,205,89,
+107,7,1,0,65,98,104,98,230,237,65,74,98,74,182,213,
+1,98,125,103,9,0,99,7,1,0,61,54,184,0,3,56,
+31,66,128,255,224,115,1,90,99,95,1,0,61,54,184,0,
+3,56,31,66,128,255,206,115,66,6,127,0,132,7,225,48,
+6,208,7,232,252,239,72,2,218,233,61,127,13,0,224,121,
+178,13,197,5,2,50,128,255,236,106,61,111,13,0,45,111,
+0,0,224,105,138,253,58,54,76,1,0,58,3,64,128,255,
+208,107,224,81,146,13,38,6,72,8,133,0,32,62,226,9,
+0,66,190,255,200,114,61,23,13,0,125,7,17,0,224,17,
+130,13,98,7,0,0,2,48,190,255,240,121,125,7,13,0,
+0,218,27,224,194,226,61,94,60,0,220,89,43,143,1,0,
+224,137,226,13,61,134,60,0,220,129,48,55,1,0,1,58,
+128,255,148,19,61,118,60,0,220,113,110,7,1,0,61,102,
+28,0,220,97,44,87,1,0,224,81,210,13,61,142,28,0,
+220,137,49,55,1,0,190,255,40,192,61,118,28,0,206,225,
+124,7,1,0,65,218,104,218,214,213,35,63,1,0,58,54,
+76,1,35,70,4,0,128,255,56,107,68,6,255,48,132,7,
+225,0,6,224,0,234,0,18,2,136,252,143,72,2,220,137,
+17,87,4,0,224,81,242,5,98,82,210,5,102,82,178,5,
+103,82,170,5,65,234,65,18,98,18,246,237,98,234,190,29,
+60,54,184,0,35,62,4,0,31,66,128,255,146,117,35,95,
+5,0,98,90,145,13,38,6,88,8,133,0,32,62,65,10,
+0,66,190,255,232,113,35,87,5,0,252,87,72,2,220,81,
+74,7,4,0,98,234,246,205,60,54,184,0,3,56,0,66,
+128,255,92,117,224,81,146,253,68,6,255,0,136,7,225,48,
+6,232,58,6,132,215,255,255,26,48,31,58,190,255,74,236,
+224,81,186,253,29,143,72,1,97,138,170,101,29,135,71,1,
+97,130,234,93,60,6,104,8,133,0,32,223,37,183,93,7,
+71,1,27,48,0,58,3,64,128,255,118,106,224,81,242,5,
+28,48,32,62,137,10,0,66,190,255,114,113,61,126,76,1,
+239,217,210,13,61,54,76,1,128,255,224,107,224,81,242,5,
+28,48,32,62,143,10,0,66,190,255,82,113,26,48,190,255,
+26,129,224,81,146,13,38,6,120,8,133,0,32,62,6,1,
+0,66,190,255,56,113,99,239,9,0,1,18,67,23,12,0,
+35,62,8,0,38,6,28,148,145,0,31,66,128,255,214,113,
+224,81,242,5,28,48,32,62,161,10,0,66,190,255,14,113,
+32,54,236,176,32,62,32,0,0,66,190,255,92,172,224,81,
+242,5,28,48,32,62,165,10,0,66,190,255,240,112,35,63,
+1,0,27,48,35,70,4,0,128,255,214,105,245,13,26,48,
+190,255,168,128,224,81,162,13,38,6,120,8,133,0,32,62,
+6,1,0,66,190,255,198,112,224,81,72,6,255,48,128,7,
+225,16,6,232,29,223,72,1,61,55,241,0,93,7,72,1,
+224,49,130,61,190,255,74,235,10,224,29,63,4,1,28,48,
+31,66,128,255,226,17,61,23,241,0,2,23,7,0,123,18,
+162,29,119,18,130,21,2,6,33,0,210,5,2,6,81,0,
+162,29,133,37,28,64,32,54,59,0,37,62,64,131,190,255,
+34,113,133,29,28,64,32,54,60,0,37,62,64,131,190,255,
+18,113,133,21,28,64,32,54,61,0,37,62,64,131,190,255,
+2,113,133,13,28,64,32,54,62,0,37,62,64,131,190,255,
+242,112,0,226,29,48,28,56,191,255,36,253,65,226,98,226,
+166,253,29,135,73,1,60,6,132,8,133,0,97,130,250,13,
+61,54,184,0,128,255,240,111,224,81,242,5,28,48,32,62,
+3,11,0,66,190,255,6,112,93,7,73,1,97,218,170,29,
+61,54,76,1,128,255,116,106,224,81,242,5,28,48,32,62,
+11,11,0,66,190,255,230,111,61,54,76,1,128,255,84,104,
+224,81,130,13,28,48,32,62,14,11,0,66,190,255,206,111,
+224,81,64,6,255,16,128,7,225,0,6,232,7,224,224,233,
+178,45,49,6,192,137,133,0,125,143,241,11,191,255,242,254,
+229,87,64,0,224,7,96,1,29,135,70,1,10,248,97,130,
+138,13,93,7,70,1,36,127,201,133,95,122,100,127,201,133,
+255,47,32,0,61,55,241,0,190,255,38,234,10,56,61,70,
+40,1,38,6,148,8,133,0,128,255,116,148,129,226,201,5,
+29,48,128,255,138,142,64,6,255,0,100,7,201,133,32,142,
+200,0,100,7,197,133,68,143,16,140,68,143,17,140,100,7,
+25,140,100,7,29,140,2,122,68,127,19,140,68,127,20,140,
+0,82,32,126,60,0,49,6,128,81,1,0,7,98,10,88,
+236,95,128,106,237,143,32,2,79,136,45,6,120,28,148,0,
+10,16,194,18,2,112,205,113,110,143,0,0,44,6,148,28,
+148,0,204,17,98,143,0,0,32,94,160,5,110,95,2,0,
+98,95,2,0,65,82,103,82,214,221,127,0,136,7,225,112,
+36,143,209,133,224,137,178,5,128,7,62,2,38,6,132,215,
+255,255,31,58,190,255,114,233,224,81,154,253,99,7,4,0,
+0,234,0,18,29,6,240,255,129,13,253,118,40,0,32,102,
+160,180,204,113,46,23,17,0,2,216,224,217,130,37,0,226,
+59,23,105,0,28,64,2,22,136,0,34,87,0,0,35,54,
+8,0,219,81,10,56,34,95,5,0,63,6,118,151,129,0,
+107,0,35,87,9,0,35,135,4,0,99,87,13,0,10,129,
+99,135,4,0,65,226,28,6,240,255,182,229,65,234,29,6,
+240,255,134,213,38,6,132,215,255,255,190,255,46,126,224,81,
+146,13,38,6,172,8,133,0,32,62,6,1,0,66,190,255,
+76,110,3,239,4,0,4,23,19,140,29,224,29,216,220,234,
+159,234,221,218,159,218,28,208,219,226,159,226,218,210,159,210,
+224,17,130,109,224,233,218,5,224,217,186,5,224,209,162,101,
+98,18,146,13,38,6,120,28,148,0,7,58,128,255,182,1,
+224,81,162,53,224,225,194,13,0,226,28,48,0,58,27,66,
+128,255,60,15,65,226,28,6,240,255,134,253,0,226,1,106,
+100,111,25,140,0,202,224,209,178,13,25,48,1,58,32,70,
+175,255,128,255,26,15,36,103,201,133,224,97,191,61,224,217,
+242,5,25,48,1,58,32,70,223,255,128,255,2,15,224,233,
+226,5,25,48,1,58,23,66,128,255,244,14,65,202,25,6,
+240,255,166,229,245,37,36,95,201,133,224,89,151,37,36,87,
+25,140,97,82,218,29,0,202,224,217,242,5,25,48,0,58,
+32,70,223,255,128,255,200,14,224,209,242,5,25,48,0,58,
+32,70,175,255,128,255,184,14,224,233,226,5,25,48,0,58,
+23,66,128,255,170,14,65,202,25,6,240,255,230,229,100,7,
+25,140,4,23,20,140,224,17,242,85,98,18,146,13,38,6,
+148,28,148,0,7,58,128,255,236,0,224,81,242,53,1,122,
+100,127,29,140,224,225,194,13,0,234,29,48,1,58,27,66,
+128,255,108,14,65,234,29,6,240,255,134,253,213,61,35,54,
+3,0,35,62,12,0,128,255,146,47,36,119,201,133,224,113,
+186,53,4,111,192,133,3,23,3,0,226,105,210,45,68,23,
+192,133,0,234,253,86,40,0,32,134,160,180,208,81,170,127,
+35,0,224,121,226,5,29,48,27,58,31,66,128,255,40,14,
+65,234,29,6,240,255,246,237,245,21,224,225,210,21,36,119,
+201,133,224,113,247,13,36,111,29,140,97,106,186,13,0,234,
+29,48,0,58,27,66,128,255,246,13,65,234,29,6,240,255,
+134,253,100,7,29,140,72,6,255,112,128,7,33,0,196,239,
+156,140,226,29,196,231,156,140,178,29,4,23,19,140,98,18,
+146,13,97,18,242,5,4,23,20,140,98,18,178,5,97,18,
+250,13,36,111,185,172,224,105,202,5,1,50,128,255,174,46,
+32,54,236,176,128,62,0,128,0,66,190,255,188,167,64,6,
+63,0,132,7,225,0,6,232,7,224,35,54,3,0,35,62,
+4,0,128,255,198,46,10,16,32,142,60,0,241,23,194,2,
+0,90,213,29,61,111,2,0,61,87,0,0,13,120,202,121,
+32,118,96,39,238,127,194,98,68,234,224,105,242,13,236,81,
+251,5,234,17,179,13,236,17,153,13,1,82,181,13,234,17,
+185,5,236,17,185,5,1,82,213,5,65,90,252,89,182,229,
+0,82,68,6,255,0,128,7,33,0,229,87,64,0,224,7,
+96,1,10,248,1,138,36,135,213,133,100,143,209,133,65,130,
+100,135,213,133,255,47,32,0,128,255,52,0,64,6,63,0,
+128,7,65,0,229,87,64,0,224,7,96,1,36,143,213,133,
+10,232,95,138,100,143,213,133,224,137,223,5,100,7,213,133,
+100,7,209,133,253,47,32,0,64,6,95,0,128,7,97,0,
+0,234,29,48,128,255,240,12,65,234,29,6,240,255,166,253,
+64,6,127,0,128,7,97,0,6,232,224,233,138,13,32,54,
+244,11,128,255,186,138,10,232,224,233,178,29,29,48,191,255,
+68,220,49,6,16,138,133,0,125,143,241,11,64,22,133,0,
+36,135,197,133,34,62,184,8,16,134,65,0,93,135,40,1,
+32,126,45,0,93,127,41,1,61,54,42,1,128,255,152,175,
+29,80,64,6,127,0,130,7,225,240,6,216,7,192,8,208,
+0,202,26,232,252,239,72,2,219,233,0,226,213,21,56,55,
+18,0,28,56,194,58,61,94,60,0,203,57,0,66,128,255,
+30,12,224,81,138,13,27,48,26,56,191,255,242,247,32,206,
+112,1,229,5,65,226,61,87,17,0,234,225,150,237,99,215,
+1,0,59,54,184,0,3,56,31,66,128,255,152,107,25,80,
+66,6,255,240,128,7,97,0,6,232,224,233,138,13,32,54,
+244,11,128,255,10,138,10,232,224,233,178,29,29,48,191,255,
+148,219,49,6,96,138,133,0,125,143,241,11,64,22,133,0,
+36,135,197,133,34,62,200,8,16,134,65,0,93,135,40,1,
+32,126,45,0,93,127,41,1,61,54,42,1,128,255,232,174,
+29,80,64,6,127,0,128,7,225,0,167,0,136,0,6,232,
+7,224,191,255,124,225,10,16,101,226,186,13,61,119,241,0,
+14,119,7,0,119,114,218,5,61,111,37,1,125,111,29,1,
+2,80,64,6,255,0,128,7,97,0,6,232,224,233,138,13,
+32,54,244,11,128,255,136,137,10,232,224,233,146,29,29,48,
+191,255,18,219,49,6,176,138,133,0,125,143,241,11,36,135,
+197,133,37,62,72,131,16,134,65,0,93,135,40,1,32,126,
+45,0,93,127,41,1,61,54,42,1,128,255,106,174,29,80,
+64,6,127,0,130,7,33,0,38,54,184,0,99,71,1,0,
+3,56,31,66,128,255,174,106,66,6,63,0,180,7,225,243,
+8,224,252,231,72,2,6,176,214,225,54,54,184,0,7,232,
+8,56,128,255,42,11,125,87,1,0,61,151,18,0,124,87,
+13,0,99,151,17,0,61,199,9,0,61,207,13,0,54,223,
+241,0,99,151,21,0,59,223,14,0,11,106,125,223,18,0,
+125,111,25,0,242,223,192,2,27,48,194,50,244,55,66,2,
+128,255,160,136,10,208,125,215,5,0,61,63,13,0,61,71,
+18,0,61,55,9,0,8,72,191,74,128,255,236,188,125,87,
+9,0,125,95,13,0,99,7,1,0,224,209,130,117,0,186,
+229,101,23,96,194,98,60,134,60,0,208,97,44,55,1,0,
+35,79,21,0,0,58,35,70,24,0,190,255,110,112,99,87,
+5,0,100,82,151,13,38,6,216,8,133,0,32,62,99,14,
+0,66,190,255,56,105,99,215,9,0,99,7,13,0,149,29,
+35,55,9,0,35,71,5,0,35,62,24,0,244,71,66,2,
+190,255,164,99,35,95,5,0,35,151,9,0,244,95,64,2,
+203,145,99,151,9,0,35,151,13,0,65,146,99,151,13,0,
+35,151,13,0,251,145,214,229,54,95,241,0,29,56,43,23,
+105,0,35,70,24,0,2,22,48,0,34,87,0,0,34,127,
+5,0,203,81,10,48,63,6,50,157,129,0,111,0,61,87,
+18,0,61,103,9,0,10,120,191,122,204,81,125,87,9,0,
+61,111,13,0,225,135,0,0,208,121,205,121,125,127,13,0,
+35,151,1,0,65,186,65,146,99,151,1,0,60,119,17,0,
+238,185,134,157,26,48,128,255,126,135,245,5,61,111,1,0,
+32,102,112,1,109,103,12,0,61,231,1,0,229,87,64,0,
+224,7,96,1,35,143,1,0,60,255,0,0,10,216,209,249,
+124,255,0,0,251,47,32,0,224,249,138,13,28,48,60,95,
+5,0,63,6,174,157,129,0,107,0,35,151,17,0,125,207,
+13,0,125,151,18,0,125,199,9,0,116,6,255,243,128,7,
+97,0,6,232,224,233,138,13,32,54,244,11,128,255,112,135,
+10,232,224,233,178,29,29,48,191,255,250,216,49,6,0,139,
+133,0,125,143,241,11,64,22,133,0,36,135,197,133,34,62,
+232,8,16,134,65,0,93,135,40,1,32,126,45,0,93,127,
+41,1,61,54,42,1,128,255,78,172,29,80,64,6,127,0,
+168,7,225,243,8,224,252,231,72,2,6,176,214,225,7,232,
+125,31,5,0,54,54,184,0,8,56,128,255,34,9,125,87,
+1,0,12,98,124,87,13,0,125,103,25,0,61,223,13,0,
+61,215,9,0,0,186,0,202,245,61,25,192,194,194,60,86,
+60,0,216,81,42,55,1,0,61,71,5,0,61,79,18,0,
+0,58,190,255,182,110,100,82,151,13,38,6,244,8,133,0,
+32,62,223,14,0,66,190,255,132,103,54,95,241,0,60,86,
+28,0,43,23,105,0,202,193,2,22,24,1,34,87,0,0,
+29,56,203,81,10,48,1,66,34,119,5,0,63,6,168,158,
+129,0,110,0,120,87,1,0,65,186,61,103,9,0,61,111,
+13,0,12,86,1,0,125,87,9,0,225,135,0,0,205,129,
+125,135,13,0,65,202,60,111,17,0,237,201,246,189,125,215,
+9,0,125,223,13,0,61,239,1,0,229,87,64,0,224,7,
+96,1,61,255,0,0,10,224,215,249,125,255,0,0,252,47,
+32,0,224,249,138,13,29,48,61,103,5,0,63,6,8,159,
+129,0,108,0,104,6,255,243,168,7,225,48,6,216,8,208,
+26,224,252,231,72,2,219,225,7,232,125,31,5,0,190,255,
+2,110,106,7,9,0,32,118,232,3,106,119,21,0,45,6,
+184,62,1,0,106,111,5,0,106,215,33,0,59,102,184,0,
+106,103,29,0,0,218,125,87,1,0,0,210,124,87,13,0,
+133,45,27,80,194,82,60,126,60,0,207,81,42,55,1,0,
+61,71,5,0,61,79,18,0,0,58,190,255,174,109,100,82,
+151,13,38,6,4,9,133,0,32,62,34,15,0,66,190,255,
+124,102,32,110,16,0,125,111,25,0,221,7,22,0,29,64,
+12,50,12,58,190,255,124,109,65,210,221,135,22,0,65,218,
+60,103,17,0,236,217,230,213,61,239,1,0,229,87,64,0,
+224,7,96,1,61,255,0,0,10,224,218,249,125,255,0,0,
+252,47,32,0,224,249,138,13,29,48,61,95,5,0,63,6,
+218,159,129,0,107,0,104,6,255,48,128,7,225,16,6,232,
+61,23,241,11,7,224,2,22,56,0,34,87,0,0,34,143,
+5,0,221,81,10,48,63,6,2,160,129,0,113,0,10,216,
+29,48,28,56,191,255,170,225,10,224,103,226,250,21,27,6,
+143,254,202,21,23,114,93,119,4,1,38,6,20,9,133,0,
+128,255,220,138,61,55,241,0,190,255,118,224,10,64,32,54,
+42,0,37,62,80,131,190,255,122,102,28,80,64,6,255,16,
+128,7,225,16,167,0,38,231,9,1,6,232,164,71,17,140,
+191,255,174,220,10,216,97,226,234,13,61,127,9,1,224,121,
+170,13,164,111,17,140,237,118,50,0,136,114,14,54,1,0,
+128,255,130,93,27,80,64,6,255,16,128,7,97,0,6,232,
+224,233,138,13,32,54,244,11,128,255,180,132,10,232,224,233,
+178,29,29,48,191,255,62,214,49,6,80,139,133,0,125,143,
+241,11,64,22,133,0,36,135,197,133,34,62,44,9,16,134,
 65,0,93,135,40,1,32,126,45,0,93,127,41,1,61,54,
-42,1,128,255,226,174,29,80,64,6,127,0,128,7,225,0,
-167,0,136,0,6,232,7,224,191,255,118,225,10,16,101,226,
-186,13,61,119,241,0,14,119,7,0,119,114,218,5,61,111,
-37,1,125,111,29,1,2,80,64,6,255,0,128,7,97,0,
-6,232,224,233,138,13,32,54,244,11,128,255,130,137,10,232,
-224,233,146,29,29,48,191,255,92,219,49,6,80,127,133,0,
-125,143,241,11,36,135,185,133,37,62,64,131,16,134,65,0,
-93,135,40,1,32,126,45,0,93,127,41,1,61,54,42,1,
-128,255,100,174,29,80,64,6,127,0,130,7,33,0,38,54,
-184,0,99,71,1,0,3,56,31,66,128,255,168,106,66,6,
-63,0,180,7,225,243,8,224,252,231,72,2,6,176,214,225,
-54,54,184,0,7,232,8,56,128,255,38,11,125,87,1,0,
-61,151,18,0,124,87,13,0,99,151,17,0,61,199,9,0,
-61,207,13,0,54,223,241,0,99,151,21,0,59,223,14,0,
-11,106,125,223,18,0,125,111,25,0,242,223,192,2,27,48,
-194,50,244,55,66,2,128,255,154,136,10,208,125,215,5,0,
-61,63,13,0,61,71,18,0,61,55,9,0,8,72,191,74,
-128,255,230,188,125,87,9,0,125,95,13,0,99,7,1,0,
-224,209,226,109,0,186,197,101,23,96,194,98,60,134,60,0,
-208,97,44,55,1,0,35,79,21,0,0,58,35,70,24,0,
-190,255,12,121,99,87,5,0,100,82,151,13,38,6,92,253,
-132,0,32,62,78,14,0,66,190,255,214,113,99,215,9,0,
-99,7,13,0,149,29,35,55,9,0,35,71,5,0,35,62,
-24,0,244,71,66,2,190,255,66,108,35,95,5,0,35,151,
-9,0,244,95,64,2,203,145,99,151,9,0,35,151,13,0,
-65,146,99,151,13,0,35,151,13,0,251,145,214,229,54,95,
-241,0,29,56,43,23,105,0,63,6,144,148,129,0,2,22,
-16,0,34,87,0,0,34,127,5,0,203,81,10,48,111,0,
-61,87,18,0,61,103,9,0,10,120,191,122,204,81,125,87,
-9,0,61,111,13,0,225,135,0,0,208,121,205,121,125,127,
-13,0,35,151,1,0,65,186,65,146,99,151,1,0,60,119,
-17,0,238,185,166,157,26,48,128,255,124,135,245,5,61,111,
-1,0,32,102,112,1,109,103,12,0,61,231,1,0,229,87,
-64,0,224,7,96,1,35,143,1,0,60,255,0,0,10,216,
-209,249,124,255,0,0,251,47,32,0,224,249,138,13,28,48,
-60,95,5,0,63,6,12,149,129,0,107,0,35,151,17,0,
-125,207,13,0,125,151,18,0,125,199,9,0,116,6,255,243,
-128,7,97,0,6,232,224,233,138,13,32,54,244,11,128,255,
-110,135,10,232,224,233,178,29,29,48,191,255,72,217,49,6,
-160,127,133,0,125,143,241,11,64,22,133,0,36,135,185,133,
-34,62,108,253,16,134,65,0,93,135,40,1,32,126,45,0,
-93,127,41,1,61,54,42,1,128,255,76,172,29,80,64,6,
-127,0,168,7,225,243,8,224,252,231,72,2,6,176,214,225,
-7,232,125,31,5,0,54,54,184,0,8,56,128,255,34,9,
-125,87,1,0,12,98,124,87,13,0,125,103,25,0,61,223,
-13,0,61,215,9,0,0,186,0,202,245,61,25,192,194,194,
-60,86,60,0,216,81,42,55,1,0,61,71,5,0,61,79,
-18,0,0,58,190,255,88,119,100,82,151,13,38,6,120,253,
-132,0,32,62,202,14,0,66,190,255,38,112,54,95,241,0,
-60,86,28,0,43,23,105,0,202,193,2,22,24,1,34,87,
-0,0,29,56,203,81,10,48,1,66,34,119,5,0,63,6,
-6,150,129,0,110,0,120,87,1,0,65,186,61,103,9,0,
-61,111,13,0,12,86,1,0,125,87,9,0,225,135,0,0,
-205,129,125,135,13,0,65,202,60,111,17,0,237,201,246,189,
-125,215,9,0,125,223,13,0,61,239,1,0,229,87,64,0,
-224,7,96,1,61,255,0,0,10,224,215,249,125,255,0,0,
-252,47,32,0,224,249,138,13,29,48,61,103,5,0,63,6,
-102,150,129,0,108,0,104,6,255,243,168,7,225,48,6,216,
-8,208,26,224,252,231,72,2,219,225,7,232,125,31,5,0,
-190,255,164,118,106,7,9,0,32,118,232,3,106,119,21,0,
-45,6,228,60,1,0,106,111,5,0,106,215,33,0,59,102,
-184,0,106,103,29,0,0,218,125,87,1,0,0,210,124,87,
-13,0,133,45,27,80,194,82,60,126,60,0,207,81,42,55,
-1,0,61,71,5,0,61,79,18,0,0,58,190,255,80,118,
-100,82,151,13,38,6,136,253,132,0,32,62,13,15,0,66,
-190,255,30,111,32,110,16,0,125,111,25,0,221,7,22,0,
-29,64,12,50,12,58,190,255,30,118,65,210,221,135,22,0,
-65,218,60,103,17,0,236,217,230,213,61,239,1,0,229,87,
-64,0,224,7,96,1,61,255,0,0,10,224,218,249,125,255,
-0,0,252,47,32,0,224,249,138,13,29,48,61,95,5,0,
-63,6,56,151,129,0,107,0,104,6,255,48,128,7,225,16,
-6,232,61,23,241,11,7,224,2,22,56,0,34,87,0,0,
-34,143,5,0,221,81,10,48,63,6,96,151,129,0,113,0,
-10,216,29,48,28,56,191,255,168,225,10,224,103,226,250,21,
-27,6,143,254,202,21,23,114,93,119,4,1,38,6,152,253,
-132,0,128,255,218,138,61,55,241,0,190,255,174,229,10,64,
-32,54,42,0,37,62,72,131,190,255,28,111,28,80,64,6,
-255,16,128,7,225,16,167,0,38,231,9,1,6,232,164,71,
-5,140,191,255,172,220,10,216,97,226,234,13,61,127,9,1,
-224,121,170,13,164,111,5,140,237,118,50,0,136,114,14,54,
-1,0,128,255,128,93,27,80,64,6,255,16,128,7,97,0,
-6,232,224,233,138,13,32,54,244,11,128,255,178,132,10,232,
-224,233,178,29,29,48,191,255,140,214,49,6,240,127,133,0,
-125,143,241,11,64,22,133,0,36,135,185,133,34,62,176,253,
-16,134,65,0,93,135,40,1,32,126,45,0,93,127,41,1,
-61,54,42,1,128,255,144,169,29,80,64,6,127,0,130,7,
-33,0,38,54,184,0,99,71,1,0,3,56,31,66,128,255,
-212,101,0,82,66,6,63,0,130,7,33,0,38,54,184,0,
-99,71,1,0,3,56,31,66,128,255,186,101,66,6,63,0,
-128,7,225,241,8,224,252,231,72,2,6,200,217,225,57,54,
-184,0,7,232,8,56,128,255,56,6,57,71,241,0,125,87,
-1,0,40,71,14,0,124,87,13,0,125,71,18,0,61,215,
-9,0,0,194,61,223,13,0,26,48,27,56,8,72,191,74,
-128,255,38,184,125,87,9,0,125,95,13,0,0,186,149,29,
-57,55,241,0,29,56,128,255,192,5,61,87,18,0,61,103,
-9,0,10,120,191,122,204,81,125,87,9,0,61,111,13,0,
-225,135,0,0,208,121,205,121,125,127,13,0,65,194,65,186,
-60,103,17,0,236,185,214,229,61,231,1,0,229,87,64,0,
-224,7,96,1,60,255,0,0,10,200,216,249,124,255,0,0,
-249,47,32,0,224,249,138,13,28,48,60,95,5,0,63,6,
-22,153,129,0,107,0,125,223,13,0,125,215,9,0,64,6,
-255,241,128,7,225,16,167,0,38,231,9,1,6,232,164,71,
-5,140,191,255,44,219,10,216,97,226,234,13,61,127,9,1,
-224,121,170,13,164,111,5,140,237,118,50,0,136,114,14,54,
-1,0,128,255,0,92,27,80,64,6,255,16,132,7,225,16,
-6,232,61,23,241,11,7,224,2,22,56,0,34,87,0,0,
-34,135,5,0,221,81,10,48,63,6,128,153,129,0,112,0,
-10,216,29,48,28,56,191,255,136,223,10,224,103,226,234,85,
-27,6,254,253,250,37,61,95,241,0,1,66,43,23,105,0,
-0,74,2,22,232,0,34,87,0,0,34,111,5,0,203,81,
-10,48,63,6,186,153,129,0,109,0,61,55,241,0,3,56,
-128,255,214,4,35,95,5,0,35,87,1,0,235,1,218,5,
-234,1,186,5,6,226,165,53,29,48,191,255,232,239,0,226,
-213,45,38,6,132,215,255,255,31,58,190,255,70,227,224,81,
-154,253,61,95,241,0,4,58,43,23,105,0,27,66,2,22,
-56,1,34,87,0,0,34,103,5,0,203,81,10,48,63,6,
-22,154,129,0,108,0,38,6,132,215,255,255,190,255,240,122,
-224,81,146,13,38,6,188,253,132,0,32,62,6,1,0,66,
-190,255,206,107,31,90,93,95,4,1,28,80,68,6,255,16,
-128,7,97,0,6,232,224,233,138,13,32,54,244,11,128,255,
-78,130,10,232,224,233,178,29,29,48,191,255,40,212,49,6,
-64,128,133,0,125,143,241,11,64,22,133,0,36,135,185,133,
-34,62,200,253,16,134,65,0,93,135,40,1,32,126,45,0,
-93,127,41,1,61,54,42,1,128,255,44,167,29,80,64,6,
-127,0,130,7,225,0,6,224,8,232,29,16,252,23,72,2,
-220,17,97,234,138,13,6,122,66,127,4,0,98,7,17,0,
-0,82,213,29,1,114,39,55,18,0,98,119,17,0,34,62,
-60,0,0,66,128,255,170,3,224,81,138,13,28,48,29,56,
-191,255,130,239,32,86,112,1,165,13,99,239,1,0,60,54,
-184,0,3,56,31,66,128,255,44,99,0,82,66,6,255,0,
-128,7,225,48,8,232,252,239,72,2,6,216,219,233,59,54,
-184,0,7,224,8,56,128,255,168,3,124,87,1,0,59,215,
-241,0,125,87,13,0,58,215,14,0,12,114,124,119,25,0,
-32,54,0,5,128,255,60,129,124,87,5,0,10,64,224,65,
-210,37,61,55,61,0,26,72,0,58,190,255,226,113,60,111,
-1,0,59,95,241,0,1,98,43,23,105,0,109,103,0,0,
-2,22,8,1,34,87,0,0,28,56,203,81,10,48,1,66,
-34,95,5,0,63,6,108,155,129,0,107,0,125,87,29,0,
-60,55,5,0,128,255,208,128,245,5,60,87,1,0,32,142,
-112,1,106,143,12,0,1,130,125,135,9,0,64,6,255,48,
-128,7,225,48,8,224,252,231,72,2,6,216,219,225,59,54,
-184,0,7,232,8,56,128,255,8,3,125,87,1,0,59,215,
-241,0,124,87,13,0,58,215,14,0,11,114,125,119,25,0,
-32,54,0,5,128,255,156,128,125,87,5,0,10,64,224,65,
-162,37,60,55,61,0,26,72,0,58,190,255,66,113,61,111,
-1,0,59,95,241,0,1,98,43,23,105,0,109,103,0,0,
-2,22,16,1,34,87,0,0,29,56,203,81,10,48,34,95,
-5,0,63,6,10,156,129,0,107,0,61,55,5,0,128,255,
-54,128,245,5,61,87,1,0,32,142,112,1,106,143,12,0,
-64,6,255,48,130,7,225,0,6,224,60,23,241,11,3,64,
-2,22,72,0,34,87,0,0,34,143,5,0,220,81,10,48,
-63,6,72,156,129,0,113,0,10,16,103,18,154,29,0,234,
-1,122,35,103,1,0,253,127,192,0,76,121,146,13,29,48,
-0,58,191,255,132,96,224,81,178,5,7,82,165,13,65,234,
-29,6,240,255,230,237,28,48,191,255,74,237,0,18,2,80,
-66,6,255,0,134,7,225,48,6,232,7,208,224,233,178,125,
-49,6,64,128,133,0,125,143,241,11,191,255,10,240,61,54,
-76,1,10,58,3,64,128,255,168,89,224,81,146,13,38,6,
-212,253,132,0,32,62,246,17,0,66,190,255,68,105,31,50,
-190,255,160,105,61,54,76,1,0,58,35,70,4,0,128,255,
-128,89,61,87,241,0,10,135,7,0,127,130,250,61,42,23,
-105,0,63,6,250,156,129,0,2,22,176,0,34,95,0,0,
-34,127,5,0,202,89,11,48,111,0,10,48,244,55,66,2,
-128,255,96,127,10,224,224,225,162,37,61,95,241,0,28,56,
-43,23,105,0,63,6,42,157,129,0,2,22,184,0,34,55,
-0,0,34,87,5,0,203,49,106,0,28,48,128,255,82,1,
-10,216,28,48,128,255,16,127,224,217,146,13,61,55,241,0,
-190,255,248,223,10,48,27,56,128,255,118,1,32,54,236,176,
-32,62,64,0,0,66,190,255,28,161,125,7,241,0,190,255,
-250,104,35,63,1,0,61,54,76,1,35,70,8,0,128,255,
-224,88,29,48,0,58,191,255,38,240,129,210,201,5,29,48,
-128,255,252,126,70,6,255,48,128,7,33,0,191,255,52,243,
-64,6,63,0,128,7,225,0,6,232,7,224,224,233,226,13,
-48,6,176,126,133,0,125,135,241,11,0,58,191,255,240,239,
-129,226,201,5,29,48,128,255,198,126,64,6,255,0,128,7,
-225,0,6,232,7,224,224,233,226,13,48,6,0,127,133,0,
-125,135,241,11,0,58,191,255,198,239,129,226,201,5,29,48,
-128,255,156,126,64,6,255,0,128,7,225,0,6,232,7,224,
-224,233,226,13,48,6,80,127,133,0,125,135,241,11,0,58,
-191,255,156,239,129,226,201,5,29,48,128,255,114,126,64,6,
-255,0,128,7,225,0,6,232,7,224,224,233,226,13,48,6,
-160,127,133,0,125,135,241,11,0,58,191,255,114,239,129,226,
-201,5,29,48,128,255,72,126,64,6,255,0,128,7,225,0,
-6,232,7,224,224,233,226,13,48,6,240,127,133,0,125,135,
-241,11,0,58,191,255,72,239,129,226,201,5,29,48,128,255,
-30,126,64,6,255,0,33,6,182,42,0,0,97,0,33,6,
-182,40,0,0,97,0,33,6,244,107,0,0,97,0,33,6,
-108,109,0,0,97,0,33,6,134,115,0,0,97,0,33,6,
-176,115,0,0,97,0,33,6,182,130,0,0,97,0,33,6,
-16,172,1,0,97,0,33,6,92,146,1,0,97,0,33,6,
-180,61,1,0,97,0,33,6,170,172,1,0,97,0,33,6,
-82,140,1,0,97,0,128,7,225,16,37,54,81,131,128,255,
-142,131,128,54,255,255,128,255,100,1,4,143,80,139,99,138,
-226,63,0,0,128,54,255,255,128,255,22,5,10,232,128,255,
-148,12,0,218,190,255,48,110,106,7,9,0,47,6,36,64,
-1,0,106,127,5,0,46,6,124,136,141,0,106,119,29,0,
-32,110,32,3,106,239,33,0,0,226,106,111,21,0,10,232,
-221,7,3,0,221,31,3,0,28,48,190,255,210,217,28,48,
-128,255,102,0,29,48,28,56,190,255,188,218,202,217,65,226,
-28,6,240,255,166,245,29,48,27,56,190,255,186,180,29,48,
-190,255,248,221,10,224,125,7,0,0,29,48,190,255,224,109,
-224,225,242,5,28,56,38,6,64,254,132,0,128,255,240,130,
+42,1,128,255,146,169,29,80,64,6,127,0,130,7,33,0,
+38,54,184,0,99,71,1,0,3,56,31,66,128,255,214,101,
+0,82,66,6,63,0,130,7,33,0,38,54,184,0,99,71,
+1,0,3,56,31,66,128,255,188,101,66,6,63,0,128,7,
+225,241,8,224,252,231,72,2,6,200,217,225,57,54,184,0,
+7,232,8,56,128,255,56,6,57,71,241,0,125,87,1,0,
+40,71,14,0,124,87,13,0,125,71,18,0,61,215,9,0,
+0,194,61,223,13,0,26,48,27,56,8,72,191,74,128,255,
+40,184,125,87,9,0,125,95,13,0,0,186,149,29,57,55,
+241,0,29,56,128,255,192,5,61,87,18,0,61,103,9,0,
+10,120,191,122,204,81,125,87,9,0,61,111,13,0,225,135,
+0,0,208,121,205,121,125,127,13,0,65,194,65,186,60,103,
+17,0,236,185,214,229,61,231,1,0,229,87,64,0,224,7,
+96,1,60,255,0,0,10,200,216,249,124,255,0,0,249,47,
+32,0,224,249,138,13,28,48,60,95,5,0,63,6,184,161,
+129,0,107,0,125,223,13,0,125,215,9,0,64,6,255,241,
+128,7,225,16,167,0,38,231,9,1,6,232,164,71,17,140,
+191,255,46,219,10,216,97,226,234,13,61,127,9,1,224,121,
+170,13,164,111,17,140,237,118,50,0,136,114,14,54,1,0,
+128,255,2,92,27,80,64,6,255,16,132,7,225,16,6,232,
+61,23,241,11,7,224,2,22,56,0,34,87,0,0,34,135,
+5,0,221,81,10,48,63,6,34,162,129,0,112,0,10,216,
+29,48,28,56,191,255,138,223,10,224,103,226,234,85,27,6,
+254,253,250,37,61,95,241,0,1,66,43,23,105,0,0,74,
+2,22,232,0,34,87,0,0,34,111,5,0,203,81,10,48,
+63,6,92,162,129,0,109,0,61,55,241,0,3,56,128,255,
+214,4,35,95,5,0,35,87,1,0,235,1,218,5,234,1,
+186,5,6,226,165,53,29,48,191,255,228,239,0,226,213,45,
+38,6,132,215,255,255,31,58,190,255,14,222,224,81,154,253,
+61,95,241,0,4,58,43,23,105,0,27,66,2,22,56,1,
+34,87,0,0,34,103,5,0,203,81,10,48,63,6,184,162,
+129,0,108,0,38,6,132,215,255,255,190,255,14,115,224,81,
+146,13,38,6,56,9,133,0,32,62,6,1,0,66,190,255,
+44,99,31,90,93,95,4,1,28,80,68,6,255,16,128,7,
+97,0,6,232,224,233,138,13,32,54,244,11,128,255,80,130,
+10,232,224,233,178,29,29,48,191,255,218,211,49,6,160,139,
+133,0,125,143,241,11,64,22,133,0,36,135,197,133,34,62,
+68,9,16,134,65,0,93,135,40,1,32,126,45,0,93,127,
+41,1,61,54,42,1,128,255,46,167,29,80,64,6,127,0,
+130,7,225,0,6,224,8,232,29,16,252,23,72,2,220,17,
+97,234,138,13,6,122,66,127,4,0,98,7,17,0,0,82,
+213,29,1,114,39,55,18,0,98,119,17,0,34,62,60,0,
+0,66,128,255,170,3,224,81,138,13,28,48,29,56,191,255,
+126,239,32,86,112,1,165,13,99,239,1,0,60,54,184,0,
+3,56,31,66,128,255,46,99,0,82,66,6,255,0,128,7,
+225,48,8,232,252,239,72,2,6,216,219,233,59,54,184,0,
+7,224,8,56,128,255,168,3,124,87,1,0,59,215,241,0,
+125,87,13,0,58,215,14,0,12,114,124,119,25,0,32,54,
+0,5,128,255,62,129,124,87,5,0,10,64,224,65,210,37,
+61,55,61,0,26,72,0,58,190,255,64,105,60,111,1,0,
+59,95,241,0,1,98,43,23,105,0,109,103,0,0,2,22,
+8,1,34,87,0,0,28,56,203,81,10,48,1,66,34,95,
+5,0,63,6,14,164,129,0,107,0,125,87,29,0,60,55,
+5,0,128,255,210,128,245,5,60,87,1,0,32,142,112,1,
+106,143,12,0,1,130,125,135,9,0,64,6,255,48,128,7,
+225,48,8,224,252,231,72,2,6,216,219,225,59,54,184,0,
+7,232,8,56,128,255,8,3,125,87,1,0,59,215,241,0,
+124,87,13,0,58,215,14,0,11,114,125,119,25,0,32,54,
+0,5,128,255,158,128,125,87,5,0,10,64,224,65,162,37,
+60,55,61,0,26,72,0,58,190,255,160,104,61,111,1,0,
+59,95,241,0,1,98,43,23,105,0,109,103,0,0,2,22,
+16,1,34,87,0,0,29,56,203,81,10,48,34,95,5,0,
+63,6,172,164,129,0,107,0,61,55,5,0,128,255,56,128,
+245,5,61,87,1,0,32,142,112,1,106,143,12,0,64,6,
+255,48,130,7,225,0,6,224,60,23,241,11,3,64,2,22,
+72,0,34,87,0,0,34,143,5,0,220,81,10,48,63,6,
+234,164,129,0,113,0,10,16,103,18,154,29,0,234,1,122,
+35,103,1,0,253,127,192,0,76,121,146,13,29,48,0,58,
+191,255,30,92,224,81,178,5,7,82,165,13,65,234,29,6,
+240,255,230,237,28,48,191,255,70,237,0,18,2,80,66,6,
+255,0,134,7,225,48,6,232,7,208,224,233,178,125,49,6,
+160,139,133,0,125,143,241,11,191,255,6,240,61,54,76,1,
+10,58,3,64,128,255,170,89,224,81,146,13,38,6,80,9,
+133,0,32,62,11,18,0,66,190,255,162,96,31,50,190,255,
+254,96,61,54,76,1,0,58,35,70,4,0,128,255,130,89,
+61,87,241,0,10,135,7,0,127,130,250,61,42,23,105,0,
+63,6,156,165,129,0,2,22,176,0,34,95,0,0,34,127,
+5,0,202,89,11,48,111,0,10,48,244,55,66,2,128,255,
+98,127,10,224,224,225,162,37,61,95,241,0,28,56,43,23,
+105,0,63,6,204,165,129,0,2,22,184,0,34,55,0,0,
+34,87,5,0,203,49,106,0,28,48,128,255,82,1,10,216,
+28,48,128,255,18,127,224,217,146,13,61,55,241,0,190,255,
+192,218,10,48,27,56,128,255,118,1,32,54,236,176,32,62,
+64,0,0,66,190,255,98,155,125,7,241,0,190,255,88,96,
+35,63,1,0,61,54,76,1,35,70,8,0,128,255,226,88,
+29,48,0,58,191,255,34,240,129,210,201,5,29,48,128,255,
+254,126,70,6,255,48,128,7,33,0,191,255,48,243,64,6,
+63,0,128,7,225,0,6,232,7,224,224,233,226,13,48,6,
+16,138,133,0,125,135,241,11,0,58,191,255,236,239,129,226,
+201,5,29,48,128,255,200,126,64,6,255,0,128,7,225,0,
+6,232,7,224,224,233,226,13,48,6,96,138,133,0,125,135,
+241,11,0,58,191,255,194,239,129,226,201,5,29,48,128,255,
+158,126,64,6,255,0,128,7,225,0,6,232,7,224,224,233,
+226,13,48,6,176,138,133,0,125,135,241,11,0,58,191,255,
+152,239,129,226,201,5,29,48,128,255,116,126,64,6,255,0,
+128,7,225,0,6,232,7,224,224,233,226,13,48,6,0,139,
+133,0,125,135,241,11,0,58,191,255,110,239,129,226,201,5,
+29,48,128,255,74,126,64,6,255,0,128,7,225,0,6,232,
+7,224,224,233,226,13,48,6,80,139,133,0,125,135,241,11,
+0,58,191,255,68,239,129,226,201,5,29,48,128,255,32,126,
+64,6,255,0,33,6,182,42,0,0,97,0,33,6,182,40,
+0,0,97,0,33,6,156,108,0,0,97,0,33,6,20,110,
+0,0,97,0,33,6,46,116,0,0,97,0,33,6,88,116,
+0,0,97,0,33,6,94,131,0,0,97,0,33,6,58,174,
+1,0,97,0,33,6,134,148,1,0,97,0,33,6,136,63,
+1,0,97,0,33,6,212,174,1,0,97,0,33,6,124,142,
+1,0,97,0,128,7,225,16,37,54,89,131,128,255,144,131,
+128,54,255,255,128,255,100,1,4,143,92,139,99,138,226,63,
+0,0,128,54,255,255,128,255,22,5,10,232,128,255,148,12,
+0,218,190,255,142,101,106,7,9,0,47,6,248,65,1,0,
+106,127,5,0,46,6,220,147,141,0,106,119,29,0,32,110,
+32,3,106,239,33,0,0,226,106,111,21,0,10,232,221,7,
+3,0,221,31,3,0,28,48,190,255,24,212,28,48,128,255,
+102,0,29,48,28,56,190,255,2,213,202,217,65,226,28,6,
+240,255,166,245,29,48,27,56,190,255,0,175,29,48,190,255,
+192,216,10,224,125,7,0,0,29,48,190,255,62,101,224,225,
+242,5,28,56,38,6,188,9,133,0,128,255,242,130,224,217,
+194,13,27,136,191,138,159,138,27,56,209,57,161,58,38,6,
+240,9,133,0,128,255,216,130,190,255,20,226,128,255,48,4,
+64,6,255,16,132,7,225,48,6,224,0,18,28,6,240,255,
+129,13,252,126,40,0,32,110,160,180,205,121,47,23,17,0,
+2,208,224,209,130,69,0,234,165,61,58,23,105,0,29,64,
+2,22,136,0,34,87,0,0,35,54,4,0,218,81,10,56,
+34,103,5,0,63,6,128,168,129,0,108,0,35,95,5,0,
+99,95,1,0,195,199,0,0,146,37,253,222,20,0,48,6,
+176,28,148,0,208,217,155,127,17,0,224,121,242,21,28,56,
+29,64,38,6,56,10,133,0,128,255,84,130,28,48,0,58,
+190,255,140,192,91,7,16,0,28,64,29,72,32,54,252,0,
+39,6,36,10,133,0,190,255,234,93,65,234,4,119,217,131,
+238,233,198,197,68,6,255,48,130,7,225,243,198,206,255,255,
+196,223,156,140,130,13,38,6,124,10,133,0,128,255,16,130,
+128,7,94,1,38,6,172,10,133,0,128,255,2,130,54,6,
+92,144,141,0,0,234,1,138,253,143,192,0,89,137,162,13,
+29,48,248,55,68,2,214,49,191,255,0,29,29,48,128,255,
+210,2,65,234,29,6,240,255,246,237,36,95,45,175,25,232,
+100,95,33,140,25,192,128,190,255,255,55,80,74,233,0,226,
+1,218,252,223,192,0,27,128,89,129,178,85,28,208,248,215,
+68,2,214,209,26,48,191,255,242,32,27,104,87,105,146,77,
+27,96,88,97,194,29,26,48,191,255,78,29,224,81,178,5,
+27,233,245,61,26,87,52,0,10,6,217,255,170,61,32,54,
+96,2,252,55,32,2,50,6,44,4,141,0,210,49,190,255,
+70,176,224,81,226,45,27,233,59,193,181,45,32,214,96,2,
+252,215,32,2,50,6,44,4,141,0,210,209,26,48,190,255,
+168,175,224,81,178,5,27,233,197,29,252,22,20,0,47,6,
+176,28,148,0,207,17,2,119,0,0,101,114,162,21,26,87,
+92,2,97,82,177,5,226,5,149,13,1,106,66,111,0,0,
+133,13,3,106,66,111,0,0,197,5,2,90,66,95,0,0,
+65,226,28,6,240,255,214,165,1,50,128,255,248,83,224,233,
+226,5,128,255,144,1,10,184,224,185,138,157,0,226,181,29,
+221,86,1,0,210,21,216,142,1,0,130,13,28,48,248,55,
+68,2,214,49,191,255,24,29,181,13,32,54,96,2,252,55,
+32,2,50,6,44,4,141,0,210,49,190,255,164,180,129,234,
+129,194,65,226,224,233,218,229,25,48,128,255,8,0,66,6,
+255,243,128,7,225,0,6,224,0,234,1,138,253,143,192,0,
+92,137,194,5,29,48,191,255,208,24,65,234,29,6,240,255,
+214,245,64,6,255,0,128,7,225,48,6,224,0,234,1,138,
+253,143,192,0,92,137,146,29,29,48,191,255,248,20,10,6,
+240,255,185,21,29,48,191,255,210,20,224,81,226,13,253,22,
+20,0,44,6,176,28,148,0,204,17,2,95,0,0,101,90,
+202,5,3,82,66,87,0,0,65,234,29,6,224,255,134,229,
+220,54,255,255,0,58,128,255,214,1,10,208,0,218,190,255,
+82,98,106,7,9,0,48,6,248,65,1,0,106,135,5,0,
+47,6,220,147,141,0,106,127,29,0,32,118,32,3,106,215,
+33,0,10,224,106,119,21,0,0,234,220,7,3,0,220,31,
+3,0,133,37,218,110,1,0,178,29,29,48,190,255,212,208,
+29,48,128,255,22,9,29,48,31,58,190,255,244,195,29,48,
+191,255,20,253,28,48,29,56,190,255,176,209,202,217,38,6,
+216,10,133,0,128,255,200,127,29,48,128,255,222,8,65,234,
+129,210,224,209,138,229,28,48,27,56,190,255,158,171,28,48,
+190,255,94,213,10,232,124,7,0,0,28,48,190,255,220,97,
+224,233,242,5,29,56,38,6,24,11,133,0,128,255,144,127,
 224,217,194,13,27,136,191,138,159,138,27,56,209,57,161,58,
-38,6,116,254,132,0,128,255,214,130,190,255,122,230,128,255,
-48,4,64,6,255,16,132,7,225,48,6,224,0,18,28,6,
-240,255,129,13,252,126,40,0,32,110,160,180,205,121,47,23,
-17,0,2,208,224,209,130,69,0,234,165,61,58,23,105,0,
-29,64,2,22,136,0,34,87,0,0,35,54,4,0,218,81,
-10,56,34,103,5,0,63,6,222,159,129,0,108,0,35,95,
-5,0,99,95,1,0,195,199,0,0,146,37,253,222,20,0,
-48,6,80,17,148,0,208,217,155,127,17,0,224,121,242,21,
-28,56,29,64,38,6,188,254,132,0,128,255,82,130,28,48,
-0,58,190,255,70,198,91,7,16,0,28,64,29,72,32,54,
-252,0,39,6,168,254,132,0,190,255,140,102,65,234,4,119,
-205,131,238,233,198,197,68,6,255,48,130,7,225,243,198,206,
-255,255,196,223,144,140,130,13,38,6,0,255,132,0,128,255,
-14,130,128,7,94,1,38,6,48,255,132,0,128,255,0,130,
-54,6,252,132,141,0,0,234,1,138,253,143,192,0,89,137,
-162,13,29,48,248,55,68,2,214,49,191,255,102,33,29,48,
-128,255,210,2,65,234,29,6,240,255,246,237,36,95,33,175,
-25,232,100,95,21,140,25,192,128,190,255,255,55,80,74,233,
-0,226,1,218,252,223,192,0,27,128,89,129,178,85,28,208,
-248,215,68,2,214,209,26,48,191,255,88,37,27,104,87,105,
-146,77,27,96,88,97,194,29,26,48,191,255,180,33,224,81,
-178,5,27,233,245,61,26,87,52,0,10,6,217,255,170,61,
-32,54,96,2,252,55,32,2,50,6,204,248,140,0,210,49,
-190,255,0,182,224,81,226,45,27,233,59,193,181,45,32,214,
-96,2,252,215,32,2,50,6,204,248,140,0,210,209,26,48,
-190,255,98,181,224,81,178,5,27,233,197,29,252,22,20,0,
-47,6,80,17,148,0,207,17,2,119,0,0,101,114,162,21,
-26,87,92,2,97,82,177,5,226,5,149,13,1,106,66,111,
-0,0,133,13,3,106,66,111,0,0,197,5,2,90,66,95,
-0,0,65,226,28,6,240,255,214,165,1,50,128,255,246,83,
-224,233,226,5,128,255,144,1,10,184,224,185,138,157,0,226,
-181,29,221,86,1,0,210,21,216,142,1,0,130,13,28,48,
-248,55,68,2,214,49,191,255,126,33,181,13,32,54,96,2,
-252,55,32,2,50,6,204,248,140,0,210,49,190,255,94,186,
-129,234,129,194,65,226,224,233,218,229,25,48,128,255,8,0,
-66,6,255,243,128,7,225,0,6,224,0,234,1,138,253,143,
-192,0,92,137,194,5,29,48,191,255,54,29,65,234,29,6,
-240,255,214,245,64,6,255,0,128,7,225,48,6,224,0,234,
-1,138,253,143,192,0,92,137,146,29,29,48,191,255,94,25,
-10,6,240,255,185,21,29,48,191,255,56,25,224,81,226,13,
-253,22,20,0,44,6,80,17,148,0,204,17,2,95,0,0,
-101,90,202,5,3,82,66,87,0,0,65,234,29,6,224,255,
-134,229,220,54,255,255,0,58,128,255,214,1,10,208,0,218,
-190,255,244,106,106,7,9,0,48,6,36,64,1,0,106,135,
-5,0,47,6,124,136,141,0,106,127,29,0,32,118,32,3,
-106,215,33,0,10,224,106,119,21,0,0,234,220,7,3,0,
-220,31,3,0,133,37,218,110,1,0,178,29,29,48,190,255,
-142,214,29,48,128,255,22,9,29,48,31,58,190,255,174,201,
-29,48,191,255,20,253,28,48,29,56,190,255,106,215,202,217,
-38,6,92,255,132,0,128,255,198,127,29,48,128,255,222,8,
-65,234,129,210,224,209,138,229,28,48,27,56,190,255,88,177,
-28,48,190,255,150,218,10,232,124,7,0,0,28,48,190,255,
-126,106,224,233,242,5,29,56,38,6,156,255,132,0,128,255,
-142,127,224,217,194,13,27,136,191,138,159,138,27,56,209,57,
-161,58,38,6,108,255,132,0,128,255,116,127,128,255,210,0,
-64,6,255,48,132,7,33,0,36,135,21,140,36,143,33,175,
-36,127,33,133,176,137,15,22,84,11,177,17,188,5,0,82,
-181,21,99,23,1,0,38,6,124,136,141,0,128,62,255,255,
-1,66,35,78,4,0,190,255,6,106,224,81,178,5,0,82,
-181,5,35,87,5,0,68,6,63,0,128,7,97,0,0,234,
-29,48,128,255,16,0,65,234,29,6,240,255,166,253,64,6,
-127,0,49,6,208,255,132,0,49,127,1,0,3,30,236,255,
-99,127,1,0,49,119,5,0,99,119,5,0,49,111,9,0,
-99,111,9,0,49,103,13,0,99,103,13,0,47,6,80,17,
-148,0,49,95,17,0,230,110,20,0,99,95,17,0,35,103,
-1,0,207,105,109,103,1,0,35,95,5,0,109,95,5,0,
-35,87,9,0,109,87,9,0,35,143,13,0,109,143,13,0,
-35,127,17,0,109,127,17,0,3,30,20,0,127,0,128,7,
-225,0,61,6,80,17,148,0,0,226,61,23,13,0,224,17,
-226,5,2,48,128,255,168,120,125,7,13,0,61,23,9,0,
-224,17,226,5,2,48,128,255,150,120,125,7,9,0,65,226,
-29,238,20,0,28,6,240,255,150,237,64,6,255,0,168,7,
-225,243,67,63,43,0,0,210,54,6,80,17,148,0,22,232,
-6,192,38,6,252,255,132,0,128,255,68,126,0,226,128,7,
-68,1,1,218,252,223,192,0,24,120,91,121,186,5,128,7,
-46,1,4,119,205,133,130,114,169,21,29,23,0,0,224,17,
-226,13,38,6,44,0,133,0,194,18,50,6,144,128,133,0,
-210,17,34,71,1,0,28,56,128,255,4,126,29,23,0,0,
-97,18,250,45,15,114,67,119,61,0,32,110,31,0,67,111,
-65,0,67,7,60,0,67,7,64,0,67,7,62,0,67,231,
-63,0,99,7,69,0,28,48,191,255,96,22,99,87,73,0,
-31,18,132,103,205,133,224,97,130,13,163,63,43,0,35,54,
-60,0,128,255,208,6,10,16,127,18,130,13,5,82,93,87,
-0,0,1,138,226,143,192,0,17,209,59,120,79,193,245,77,
-99,18,178,5,103,18,186,77,32,54,0,6,128,255,208,119,
-125,87,13,0,224,81,154,13,38,6,108,0,133,0,32,62,
-224,2,0,66,190,255,26,97,32,54,0,6,128,255,176,119,
-125,87,9,0,224,81,154,13,38,6,108,0,133,0,32,62,
-226,2,0,66,190,255,250,96,32,222,96,2,252,223,32,2,
-47,6,204,248,140,0,207,217,61,63,9,0,27,48,190,255,
-206,183,10,200,61,63,13,0,27,48,190,255,120,184,10,16,
-224,201,186,5,224,17,194,13,2,98,93,103,0,0,28,48,
-32,62,221,0,0,66,191,255,32,23,95,226,133,13,59,95,
-53,0,3,82,125,95,5,0,93,87,0,0,65,226,29,238,
-20,0,4,143,205,131,241,225,190,5,191,7,184,254,38,6,
-124,0,133,0,128,255,232,124,22,232,0,218,128,7,216,1,
-1,130,251,135,192,0,24,112,80,113,186,5,128,7,194,1,
-29,23,0,0,99,18,162,29,4,103,205,133,131,98,177,5,
-128,7,174,1,224,17,186,5,128,7,166,1,38,6,44,0,
-133,0,194,18,50,6,144,128,133,0,210,17,34,71,1,0,
-27,56,128,255,154,124,128,7,136,1,27,48,24,56,128,255,
-140,2,10,16,224,17,194,5,34,230,48,0,133,13,251,102,
-20,0,214,97,44,87,9,0,42,230,48,0,27,48,128,255,
-124,1,10,200,25,48,35,62,44,0,128,255,196,1,25,143,
-57,1,31,50,108,138,234,191,0,0,146,13,57,54,56,1,
-28,56,163,71,43,0,128,255,124,5,10,48,127,50,138,117,
-224,185,178,101,35,63,45,0,38,6,164,0,133,0,128,255,
-46,124,0,18,245,13,1,106,35,95,45,0,226,111,192,0,
-77,89,242,5,226,142,20,0,7,122,214,137,81,127,0,0,
-65,18,4,119,205,131,238,17,246,237,57,63,52,1,38,6,
-60,0,133,0,128,255,248,123,57,230,56,1,0,186,133,61,
-28,87,2,0,28,79,1,0,28,71,0,0,99,87,1,0,
-28,143,3,0,99,143,5,0,28,135,4,0,99,135,9,0,
-28,127,5,0,99,127,13,0,60,119,6,0,209,114,177,114,
-99,119,17,0,60,111,9,0,99,111,21,0,60,103,13,0,
-99,103,25,0,60,23,16,0,99,23,29,0,28,23,18,0,
-99,23,33,0,28,23,19,0,23,56,99,23,37,0,38,6,
-212,0,133,0,128,255,136,123,65,186,28,230,20,0,57,95,
-52,1,235,185,230,197,245,29,4,87,205,133,131,82,185,29,
-27,56,38,6,228,255,132,0,128,255,100,123,197,21,1,122,
-230,127,192,0,15,209,249,63,49,1,128,255,144,4,224,81,
-162,13,38,6,108,0,133,0,32,62,86,3,0,66,190,255,
-224,94,224,81,4,95,205,133,131,90,169,21,29,23,0,0,
-224,17,226,13,38,6,44,0,133,0,194,18,50,6,144,128,
-133,0,210,17,34,71,1,0,27,56,128,255,18,123,65,218,
-29,238,20,0,4,103,205,131,236,217,190,5,191,7,36,254,
-128,255,66,4,26,81,104,6,255,243,128,7,97,0,0,234,
-0,90,6,16,197,21,226,86,20,0,47,6,80,17,148,0,
-207,81,10,119,0,0,100,114,154,13,42,103,13,0,44,87,
-5,0,234,89,185,5,10,88,12,232,65,18,4,103,205,131,
-236,17,166,237,224,89,154,13,38,6,100,1,133,0,32,62,
-140,3,0,66,190,255,74,94,29,80,64,6,127,0,128,7,
-65,0,103,7,1,0,38,239,52,1,0,74,38,22,56,1,
-0,82,197,13,2,143,0,0,224,137,218,5,31,130,66,135,
-3,0,65,74,65,82,2,22,20,0,253,81,198,245,49,6,
-80,17,148,0,0,66,149,45,17,127,0,0,100,122,170,37,
-0,82,38,22,56,1,149,21,2,119,0,0,224,113,170,13,
-49,103,5,0,2,111,4,0,236,105,202,5,66,71,3,0,
-95,74,65,82,2,22,20,0,253,81,246,237,5,90,81,95,
-0,0,1,82,39,135,1,0,232,87,192,0,10,129,103,135,
-1,0,65,66,17,142,20,0,4,127,205,131,239,65,214,213,
-224,73,226,87,0,0,64,6,95,0,140,7,225,112,7,200,
-6,232,253,222,20,0,58,6,80,17,148,0,27,16,218,17,
-34,87,9,0,0,226,42,78,48,0,41,135,1,0,42,70,
-24,3,224,129,170,13,29,56,38,6,116,1,133,0,128,255,
-206,121,0,82,128,7,216,2,29,56,128,7,4,1,2,127,
-0,0,99,122,170,125,1,114,231,119,192,0,25,96,78,97,
-194,117,34,87,9,0,41,119,1,0,42,54,48,0,38,95,
-1,0,42,254,24,3,235,113,250,29,41,143,5,0,38,87,
-5,0,234,137,154,29,41,102,8,0,38,110,8,0,14,88,
-0,82,224,89,194,13,65,98,12,135,255,255,65,106,13,127,
-255,255,16,80,175,81,186,5,95,90,234,245,224,81,202,5,
-4,114,66,119,0,0,63,111,1,0,40,87,1,0,237,81,
-234,29,40,95,5,0,63,103,5,0,236,89,138,29,40,102,
-8,0,63,110,8,0,10,88,224,89,0,82,178,13,65,98,
-65,106,13,143,255,255,12,87,255,255,177,81,186,5,95,90,
-250,245,224,81,202,5,4,130,66,135,0,0,2,127,0,0,
-100,122,186,37,224,225,154,37,38,119,1,0,63,87,1,0,
-234,113,234,21,38,118,8,0,63,126,8,0,10,88,224,89,
-0,82,194,13,65,114,14,111,255,255,65,122,15,103,255,255,
-13,80,172,81,186,5,95,90,234,245,224,81,226,5,34,231,
-9,0,1,90,66,95,16,0,2,22,20,0,65,58,4,87,
-205,131,234,54,20,0,26,88,6,136,203,137,241,17,185,5,
-191,7,238,254,224,225,130,109,29,56,60,70,24,3,60,78,
-48,0,27,16,203,17,197,93,2,135,0,0,99,130,218,85,
-1,122,231,127,192,0,25,104,79,105,242,77,34,103,9,0,
-40,119,1,0,44,102,24,3,44,95,1,0,235,113,234,29,
-40,143,5,0,44,87,5,0,234,137,138,29,40,110,8,0,
-72,98,14,88,0,82,224,89,194,13,65,106,13,135,255,255,
-65,98,12,127,255,255,16,80,175,81,186,5,95,90,234,245,
-224,81,202,5,4,114,66,119,0,0,34,111,9,0,41,119,
-1,0,45,110,48,0,45,103,1,0,236,113,234,29,41,87,
-5,0,45,95,5,0,235,81,138,29,41,102,8,0,72,106,
-14,88,0,82,224,89,194,13,65,98,12,143,255,255,65,106,
-13,135,255,255,17,80,176,81,186,5,95,90,234,245,224,81,
-202,5,4,122,66,127,0,0,2,22,20,0,65,58,6,112,
-218,113,238,17,161,165,0,18,31,90,35,110,8,0,194,105,
-77,95,0,0,65,18,2,6,240,255,246,245,181,101,253,222,
-20,0,26,200,217,217,27,135,0,0,100,130,170,93,4,127,
-205,133,131,122,201,13,29,56,50,6,160,128,133,0,50,71,
-1,0,38,6,160,1,133,0,128,255,148,119,155,103,17,0,
-224,97,242,5,29,56,38,6,176,1,133,0,128,255,128,119,
-59,23,5,0,35,94,8,0,203,17,2,95,0,0,127,90,
-202,5,66,239,0,0,213,53,32,134,96,2,253,135,32,2,
-11,16,43,6,204,248,140,0,203,129,32,102,96,2,226,103,
-32,2,203,97,44,95,73,0,48,87,73,0,235,81,233,5,
-29,56,10,120,2,72,11,80,197,5,29,72,2,56,11,120,
-231,134,20,0,6,114,217,129,4,111,205,133,80,119,0,0,
-131,106,249,13,50,6,168,128,133,0,50,71,1,0,99,127,
-1,0,99,87,5,0,38,6,220,1,133,0,128,255,0,119,
-65,234,4,87,205,131,234,233,182,157,28,80,76,6,255,112,
-6,88,33,6,240,138,1,0,97,0,33,6,204,140,1,0,
-97,0,33,6,104,168,1,0,97,0,33,6,248,166,1,0,
-97,0,33,6,142,139,1,0,97,0,33,6,180,167,1,0,
-97,0,33,6,202,168,1,0,97,0,0,18,7,88,0,82,
-65,90,171,143,255,255,209,17,130,0,65,82,10,6,0,254,
-134,253,2,80,127,0,230,143,181,0,17,128,168,130,208,22,
-127,0,2,6,240,255,225,5,100,18,226,13,104,18,202,21,
-181,13,2,6,240,255,162,13,2,6,224,255,146,13,2,6,
-192,255,130,13,149,13,2,18,133,13,4,18,229,5,5,18,
-197,5,6,18,165,5,0,18,2,80,127,0,38,143,4,0,
-0,18,131,138,201,13,1,18,230,87,9,0,10,6,56,200,
-210,5,10,6,116,140,162,5,0,18,130,0,2,80,138,0,
-127,0,128,7,225,0,6,232,61,143,2,2,0,226,209,134,
-255,0,16,6,91,255,250,21,61,23,1,0,63,6,100,172,
-129,0,2,22,16,0,34,87,0,0,34,111,5,0,221,81,
-10,48,109,0,29,48,10,56,191,255,66,255,224,81,178,5,
-32,230,7,16,28,80,64,6,255,0,128,7,225,0,6,232,
-61,23,1,0,0,226,2,22,16,0,34,87,0,0,34,143,
-5,0,221,81,10,48,63,6,158,172,129,0,113,0,29,48,
-10,56,191,255,8,255,224,81,178,5,32,230,7,16,28,80,
-64,6,255,0,128,7,33,0,12,58,128,255,8,0,64,6,
-63,0,0,18,38,86,6,0,0,90,138,135,1,0,231,129,
-138,13,170,127,5,0,138,23,7,0,200,18,207,17,229,5,
-76,82,65,90,11,6,226,255,150,245,2,80,127,0,38,86,
-4,0,127,0,38,86,4,0,127,0,128,7,33,0,38,6,
-16,2,133,0,128,255,68,7,133,5,128,7,97,0,36,239,
-33,140,128,255,188,0,36,54,208,133,128,255,152,7,100,7,
-241,133,68,7,224,133,128,255,58,12,213,21,64,86,0,0,
-10,87,174,241,136,82,185,253,64,86,0,0,10,87,38,250,
-68,87,48,140,64,86,0,0,202,191,174,241,4,55,48,140,
-128,255,104,7,36,135,241,133,224,129,146,237,1,122,68,127,
-224,133,29,48,128,255,78,7,128,255,248,11,128,255,122,28,
-64,6,127,0,128,7,225,0,7,224,6,56,4,23,224,133,
-8,232,224,17,234,13,28,64,29,72,38,6,1,0,4,0,
-128,255,114,169,28,48,29,56,128,255,130,6,29,16,213,21,
-99,18,186,5,0,18,149,21,98,18,186,5,0,18,213,13,
-28,64,29,72,38,6,1,0,4,0,128,255,72,169,28,48,
-29,56,128,255,102,1,10,16,2,80,64,6,255,0,128,7,
-65,0,64,86,0,0,10,87,32,250,32,94,111,255,202,238,
-111,0,64,86,0,0,74,239,32,250,0,18,65,18,2,6,
-156,255,214,253,64,86,0,0,43,6,144,0,0,0,74,95,
-32,250,64,86,0,0,43,6,162,0,0,0,106,95,34,250,
-64,86,0,0,43,6,242,0,0,0,74,95,32,250,64,6,
-95,0,184,7,33,0,4,23,80,139,97,18,162,29,100,18,
-130,29,36,23,157,172,36,126,156,140,226,121,171,21,36,118,
-156,140,14,86,0,32,234,17,201,13,36,95,161,172,36,110,
-156,140,235,105,235,5,234,89,201,5,66,7,0,0,181,101,
-36,102,156,140,100,103,157,172,38,6,96,2,133,0,128,255,
-218,5,35,54,80,0,39,6,170,170,102,102,191,255,242,104,
-35,54,80,0,191,255,128,109,224,81,242,29,36,62,156,140,
-35,54,80,0,32,70,0,32,0,74,191,255,216,108,224,81,
-202,21,36,86,156,140,10,86,255,31,229,5,36,143,157,172,
-65,138,100,143,157,172,36,23,157,172,2,135,0,0,224,129,
-178,13,234,17,193,245,133,13,36,54,156,140,0,58,32,70,
-0,32,190,255,20,83,36,71,157,172,36,118,156,140,100,71,
-161,172,3,48,174,65,39,6,136,2,133,0,128,255,18,126,
-3,16,36,110,156,140,13,110,0,32,149,21,36,103,157,172,
-65,98,100,103,157,172,76,87,255,255,36,95,157,172,237,89,
-209,5,36,86,156,140,100,87,157,172,65,18,2,87,0,0,
-224,81,218,237,120,6,63,0,128,7,225,240,6,224,7,232,
-29,216,36,142,156,140,17,198,0,32,165,69,36,207,33,175,
-229,87,64,0,224,7,96,1,10,208,24,96,10,106,13,138,
-36,87,157,172,10,22,1,0,236,17,177,5,36,22,156,140,
-36,135,161,172,240,17,178,29,28,95,0,0,106,90,138,21,
-74,143,0,0,66,111,0,0,65,18,236,17,177,5,36,22,
-156,140,36,119,161,172,238,17,162,13,65,218,181,5,74,95,
-0,0,100,23,157,172,65,226,95,234,186,221,250,47,32,0,
-128,255,90,0,134,210,225,13,36,95,33,175,185,89,11,6,
-190,255,233,5,36,87,157,172,100,87,161,172,181,5,224,233,
-234,189,36,143,157,172,27,80,81,7,0,0,189,81,64,6,
-255,240,128,7,33,0,64,86,0,0,202,191,146,241,36,23,
-233,133,36,143,157,172,100,23,161,172,68,7,236,133,241,17,
-178,5,128,255,8,0,64,6,63,0,128,7,33,0,132,143,
-237,133,224,137,250,101,63,6,64,13,3,0,64,86,0,0,
-10,87,36,250,136,82,185,5,95,250,154,253,224,249,162,93,
-36,134,156,140,36,127,161,172,16,94,0,32,235,121,209,5,
-36,118,156,140,100,119,161,172,36,87,161,172,36,23,157,172,
-234,17,169,37,36,110,156,140,100,111,233,133,11,16,170,17,
-97,18,218,29,36,103,161,172,65,98,100,103,161,172,12,55,
-255,255,128,255,18,3,64,86,0,0,10,87,36,250,136,82,
-177,253,36,23,157,172,36,86,156,140,100,23,233,133,100,87,
-161,172,170,17,197,5,100,23,233,133,170,17,97,18,250,21,
-36,87,161,172,65,82,100,87,161,172,10,55,255,255,128,255,
-214,2,36,126,156,140,36,119,161,172,15,134,0,32,240,113,
-145,21,36,110,156,140,100,111,161,172,197,13,224,17,162,13,
-1,98,68,103,236,133,36,55,161,172,2,56,199,0,128,255,
-254,8,64,6,63,0,128,7,33,0,31,250,229,87,64,0,
-134,82,129,13,132,143,237,133,224,137,162,29,95,250,186,253,
-245,21,132,135,237,133,224,129,178,21,64,86,0,0,10,87,
-224,240,136,82,177,5,95,250,154,253,36,127,233,133,68,7,
-236,133,100,127,161,172,64,86,0,0,202,191,146,241,63,6,
-64,13,3,0,64,86,0,0,10,87,36,250,136,82,185,5,
-95,250,154,253,36,119,157,172,36,23,161,172,226,113,233,13,
-2,48,36,102,156,140,172,17,32,62,0,32,162,57,128,255,
-204,2,36,142,156,140,100,143,161,172,36,135,157,172,80,7,
-0,0,36,55,161,172,128,255,226,2,36,127,157,172,63,6,
-64,13,3,0,100,127,161,172,100,127,233,133,64,86,0,0,
-10,87,36,250,136,82,185,5,95,250,154,253,64,6,63,0,
-128,7,225,16,4,143,84,139,224,137,194,5,100,7,229,133,
-245,85,224,49,186,21,36,135,229,133,65,130,100,135,229,133,
-97,130,202,5,0,50,128,255,156,0,36,127,229,133,224,121,
-250,69,1,114,100,119,229,133,181,69,32,238,232,3,230,239,
-32,2,10,82,74,232,224,233,170,5,1,234,36,143,229,133,
-224,137,222,5,1,130,100,135,229,133,133,13,17,126,1,0,
-100,127,229,133,15,6,0,255,191,45,59,6,184,2,133,0,
-60,6,56,24,148,0,28,48,128,255,106,71,224,81,242,5,
-27,48,32,62,199,2,0,66,190,255,230,83,28,48,29,56,
-0,66,128,255,16,72,224,81,242,5,27,48,32,62,200,2,
-0,66,190,255,204,83,28,48,128,255,20,71,224,81,130,13,
-27,48,32,62,201,2,0,66,190,255,182,83,224,81,64,6,
-255,16,144,7,225,0,36,143,229,133,224,137,214,5,4,135,
-84,139,224,129,194,5,100,7,229,133,213,101,60,6,244,2,
-133,0,36,63,33,175,38,6,200,2,133,0,128,255,224,111,
-32,54,0,32,128,255,220,105,10,232,224,233,250,5,28,48,
-32,62,241,2,0,66,190,255,104,83,29,48,32,62,0,32,
-128,255,252,0,3,48,39,6,170,170,102,102,191,255,194,100,
-3,48,32,62,0,32,1,66,191,255,90,96,29,56,3,48,
-32,70,0,32,0,74,191,255,2,104,36,63,33,175,38,6,
-232,2,133,0,128,255,136,111,29,48,128,255,106,105,31,122,
-100,127,229,133,61,6,56,24,148,0,29,48,128,255,134,70,
-224,81,242,5,28,48,32,62,255,2,0,66,190,255,2,83,
-29,48,32,62,112,23,0,66,128,255,42,71,224,81,242,5,
-28,48,32,62,0,3,0,66,190,255,230,82,29,48,128,255,
-46,70,224,81,130,13,28,48,32,62,1,3,0,66,190,255,
-208,82,224,81,80,6,255,0,128,7,33,0,64,86,0,0,
-10,87,38,250,68,87,48,140,64,86,0,0,202,191,174,241,
-4,143,224,133,224,137,234,5,4,55,48,140,128,255,92,1,
-133,13,32,54,236,176,32,62,0,2,0,66,190,255,6,139,
-64,6,63,0,128,7,65,0,6,232,4,143,224,133,189,0,
-99,138,178,13,64,86,0,0,10,87,36,250,136,82,177,253,
-64,86,0,0,74,239,40,250,64,6,95,0,130,7,193,0,
-6,224,7,232,29,6,255,223,185,5,32,238,0,32,229,87,
-64,0,224,7,96,1,36,23,157,172,99,87,1,0,189,17,
-36,126,156,140,239,17,217,13,2,22,0,32,165,13,65,18,
-36,110,156,140,13,118,0,32,238,17,177,5,36,22,156,140,
-2,103,0,0,224,97,194,245,36,94,156,140,11,94,0,32,
-181,13,2,87,0,0,92,87,0,0,65,18,65,226,235,17,
-177,5,36,22,156,140,29,136,95,234,224,137,186,245,35,239,
-1,0,253,47,32,0,66,6,223,0,128,7,225,16,7,216,
-0,226,6,232,229,13,29,143,0,0,106,138,202,5,13,50,
-191,255,68,255,29,55,0,0,191,255,60,255,65,234,65,226,
-251,225,166,245,64,6,255,16,128,7,97,0,6,232,181,13,
-106,18,202,5,13,50,191,255,30,255,29,55,0,0,65,234,
-191,255,20,255,29,23,0,0,224,17,186,245,64,6,127,0,
-128,7,33,0,0,82,34,6,144,18,148,0,133,143,109,131,
-66,143,0,0,65,82,2,22,128,0,106,82,134,253,37,54,
-100,131,128,255,32,0,100,7,41,140,100,7,37,140,64,14,
-148,0,65,7,144,23,100,7,25,140,100,7,29,140,64,6,
-63,0,100,55,33,140,127,0,128,7,33,0,166,0,6,6,
-229,255,218,5,1,130,100,135,41,140,245,93,6,6,177,255,
-194,5,6,6,165,255,154,13,36,111,41,140,97,106,218,5,
-2,98,100,103,41,140,149,85,36,95,41,140,98,90,186,45,
-6,16,2,6,188,255,145,13,2,6,191,255,153,37,242,13,
-2,6,189,255,249,13,149,21,2,6,188,255,146,21,2,6,
-184,255,146,21,2,6,181,255,146,21,165,21,128,255,30,2,
-245,13,128,255,108,2,197,13,128,255,214,2,149,13,128,255,
-176,2,229,5,128,255,84,3,181,5,128,255,112,3,100,7,
-41,140,181,37,6,16,109,18,233,5,104,18,210,13,105,18,
-226,13,149,29,109,18,226,13,2,6,238,255,226,13,2,6,
-129,255,226,13,133,21,128,255,116,3,245,13,128,255,190,2,
-197,13,128,255,26,0,149,13,128,255,232,3,229,5,128,255,
-128,3,181,5,128,255,248,0,64,6,63,0,128,7,225,0,
-61,6,144,23,148,0,29,224,28,48,37,62,109,131,128,255,
-248,139,224,81,130,29,36,55,29,140,44,6,144,18,148,0,
-6,142,1,0,100,143,29,140,199,50,204,49,28,56,128,255,
-246,139,36,95,29,140,10,82,234,95,194,90,100,95,29,140,
-100,95,25,140,37,54,110,131,191,255,112,254,29,48,128,255,
-38,0,36,55,45,140,39,6,16,24,148,0,128,255,132,0,
-165,143,109,131,93,143,0,0,100,7,37,140,128,255,100,3,
-64,6,255,0,132,7,225,0,37,127,117,131,99,127,1,0,
-5,119,120,131,64,230,148,0,67,119,4,0,3,56,100,7,
-45,140,128,255,30,140,124,87,17,24,60,230,16,24,245,21,
-36,239,45,140,3,56,65,234,100,239,45,140,0,50,194,234,
-220,233,128,255,254,139,36,23,45,140,125,87,1,0,105,18,
-234,5,2,110,1,0,100,111,45,140,149,13,36,87,45,140,
-194,82,220,81,42,135,1,0,224,129,186,229,68,6,255,0,
-128,7,33,0,190,255,244,198,64,6,63,0,128,7,225,48,
-6,224,188,0,28,134,224,255,16,6,161,255,209,85,28,102,
-191,255,12,6,230,255,233,119,0,0,197,114,206,225,188,0,
-58,6,144,23,148,0,26,16,2,143,0,0,65,18,224,137,
-202,253,2,134,255,255,186,129,16,6,130,255,217,5,7,50,
-191,255,180,252,149,61,36,127,37,140,218,121,15,119,0,0,
-224,113,154,21,28,48,191,255,158,252,36,95,37,140,11,102,
-1,0,100,103,37,140,218,89,75,231,0,0,218,97,76,7,
-0,0,165,37,36,239,37,140,28,216,29,134,1,0,100,135,
-37,140,29,224,218,225,27,16,28,223,0,0,29,112,218,113,
-78,23,0,0,65,226,65,234,224,17,146,13,2,48,191,255,
-86,252,165,245,36,55,217,133,191,255,32,253,36,95,37,140,
-95,234,235,233,139,253,64,6,255,48,128,7,225,0,36,239,
-25,140,224,233,194,5,29,134,255,255,165,5,9,130,100,135,
-25,140,60,6,144,18,148,0,16,48,199,50,220,49,37,62,
-124,131,128,255,52,138,224,81,202,5,100,239,25,140,229,13,
-36,63,25,140,38,6,144,23,148,0,199,58,220,57,128,255,
-54,138,128,255,222,1,128,255,36,1,64,6,255,0,128,7,
-225,0,36,239,25,140,10,122,29,54,1,0,239,55,194,50,
-100,55,25,140,60,6,144,18,148,0,199,50,220,49,37,62,
-125,131,128,255,228,137,224,81,202,5,100,239,25,140,229,13,
-36,63,25,140,38,6,144,23,148,0,199,58,220,57,128,255,
-230,137,128,255,142,1,128,255,212,0,64,6,255,0,128,7,
-33,0,36,143,37,140,224,137,146,13,17,134,255,255,36,55,
-217,133,100,135,37,140,191,255,82,252,64,6,63,0,128,7,
-33,0,36,143,37,140,64,134,148,0,208,137,17,127,144,23,
-224,121,162,13,36,119,37,140,36,55,213,133,65,114,100,119,
-37,140,191,255,38,252,64,6,63,0,128,7,97,0,61,6,
-144,23,148,0,165,13,36,143,37,140,36,55,213,133,65,138,
-100,143,37,140,191,255,4,252,36,135,37,140,221,129,16,23,
-0,0,2,6,224,255,210,13,224,17,234,237,165,13,36,111,
-37,140,36,55,213,133,65,106,100,111,37,140,191,255,220,251,
-36,103,37,140,64,94,148,0,203,97,12,87,144,23,10,6,
-224,255,226,237,64,6,127,0,128,7,33,0,149,13,16,142,
-255,255,36,55,217,133,100,143,37,140,191,255,174,251,36,135,
-37,140,224,129,218,245,64,6,63,0,128,7,97,0,61,6,
-144,23,148,0,165,13,36,143,37,140,36,55,213,133,65,138,
-100,143,37,140,191,255,132,251,36,135,37,140,221,129,16,127,
-0,0,224,121,154,245,64,6,127,0,128,7,33,0,36,143,
-37,140,224,137,178,13,17,134,255,255,36,55,217,133,100,135,
-37,140,191,255,86,251,128,255,8,0,64,6,63,0,128,7,
-225,16,36,87,37,140,34,6,144,23,148,0,10,136,194,137,
-17,135,0,0,224,129,178,37,10,232,65,18,29,224,194,225,
-2,222,255,255,28,23,0,0,29,112,219,113,78,23,0,0,
-65,226,65,234,224,17,210,5,2,48,191,255,58,250,181,245,
-32,54,32,0,191,255,48,250,229,5,36,55,217,133,95,234,
-191,255,248,250,36,95,37,140,235,233,139,253,64,6,255,16,
-128,7,225,0,36,55,221,133,191,255,224,250,36,55,33,140,
-191,255,216,250,32,54,62,0,191,255,252,249,64,22,148,0,
-34,230,144,23,28,48,191,255,194,250,13,50,191,255,232,249,
-36,55,33,140,191,255,180,250,32,54,62,0,191,255,216,249,
-0,234,229,13,28,143,0,0,224,137,202,5,100,239,37,140,
-181,13,36,55,213,133,191,255,146,250,65,226,65,234,36,135,
-37,140,240,233,138,245,64,6,255,0,36,87,33,6,16,105,
-0,0,97,0,128,7,33,0,224,49,210,5,129,58,185,5,
-128,255,156,98,64,6,63,0,128,7,33,0,38,6,100,24,
-148,0,39,6,4,3,133,0,0,66,191,255,26,110,64,6,
-63,0,128,7,33,0,64,14,148,0,97,7,145,24,38,6,
-236,128,133,0,128,255,38,103,64,6,63,0,128,7,225,16,
-6,232,7,224,188,0,8,216,224,233,138,13,32,54,136,0,
-128,255,108,98,10,232,224,233,226,13,93,231,2,0,125,7,
-0,0,125,223,5,0,61,54,8,0,0,58,32,70,128,0,
-190,255,150,71,29,80,64,6,255,16,130,7,97,0,6,232,
-61,87,5,0,157,127,3,0,42,23,1,0,15,112,34,135,
-24,0,14,56,16,48,202,49,61,78,8,0,32,110,128,0,
-99,111,1,0,0,66,34,103,29,0,63,6,146,186,129,0,
-108,0,125,87,0,0,10,16,226,0,224,17,178,5,234,0,
-245,5,29,48,128,255,54,0,125,87,0,0,234,0,66,6,
-127,0,166,143,11,0,134,135,13,0,209,129,166,119,13,0,
-208,113,38,103,0,0,14,22,4,0,224,97,178,5,0,82,
-197,5,1,82,226,87,192,0,127,0,128,7,225,0,6,232,
-0,226,0,18,61,94,8,0,0,82,139,143,1,0,209,17,
-130,0,65,90,65,82,10,6,193,255,134,253,189,119,71,0,
-238,17,146,13,2,56,38,6,28,3,133,0,128,255,80,103,
-32,230,66,2,157,23,9,0,2,6,128,255,145,13,2,56,
-38,6,32,4,133,0,128,255,54,103,32,230,66,2,157,23,
-11,0,100,18,178,13,2,56,38,6,208,4,133,0,128,255,
-30,103,32,86,67,2,128,7,50,2,189,23,11,0,194,134,
-240,0,178,13,2,56,38,6,172,3,133,0,128,255,0,103,
-32,86,67,2,128,7,20,2,157,23,13,0,104,18,225,5,
-108,18,203,5,194,126,240,0,146,13,2,56,38,6,244,4,
-133,0,128,255,218,102,32,230,66,2,189,23,13,0,98,18,
-187,5,224,17,186,13,2,56,38,6,48,5,133,0,128,255,
-190,102,32,86,67,2,128,7,210,1,253,23,15,0,2,6,
-192,255,226,13,2,6,184,255,178,13,2,56,38,6,68,4,
-133,0,128,255,154,102,32,86,67,2,128,7,174,1,2,6,
-184,255,250,5,2,56,38,6,60,3,133,0,128,255,128,102,
-157,23,17,0,97,18,178,13,2,56,38,6,80,5,133,0,
-128,255,108,102,32,86,67,2,128,7,128,1,189,23,17,0,
-2,6,95,255,153,13,2,56,38,6,216,3,133,0,128,255,
-78,102,32,230,66,2,189,23,19,0,98,18,177,13,2,56,
-38,6,100,4,133,0,128,255,54,102,32,86,67,2,128,7,
-74,1,157,23,21,0,194,86,128,0,186,13,2,56,38,6,
-120,5,133,0,128,255,24,102,32,86,67,2,128,7,44,1,
-189,23,23,0,100,18,179,13,2,56,38,6,52,6,133,0,
-128,255,252,101,32,86,67,2,128,7,16,1,157,23,25,0,
-194,142,128,0,170,13,2,56,38,6,156,5,133,0,128,255,
-222,101,32,86,67,2,149,125,189,23,25,0,100,18,162,13,
-2,56,38,6,252,3,133,0,128,255,196,101,32,86,67,2,
-197,109,157,23,27,0,194,126,7,0,170,13,2,56,38,6,
-116,3,133,0,128,255,168,101,32,86,67,2,229,93,189,23,
-27,0,194,86,1,0,170,13,2,56,38,6,192,5,133,0,
-128,255,140,101,32,86,67,2,133,85,157,23,29,0,194,110,
-1,0,170,13,2,56,38,6,224,5,133,0,128,255,112,101,
-32,86,67,2,165,69,189,23,29,0,194,134,98,0,162,13,
-2,56,38,6,144,4,133,0,128,255,84,101,32,86,67,2,
-197,53,189,23,35,0,224,17,154,13,2,56,38,6,184,4,
-133,0,128,255,58,101,32,230,66,2,189,23,35,0,2,6,
-225,255,153,13,2,56,38,6,148,3,133,0,128,255,32,101,
-32,230,66,2,189,23,37,0,224,17,154,13,2,56,38,6,
-0,6,133,0,128,255,8,101,32,230,66,2,189,23,37,0,
-2,6,214,255,153,13,2,56,38,6,24,6,133,0,128,255,
-238,100,32,230,66,2,28,80,64,6,255,0,166,87,11,0,
-127,0,134,87,13,0,127,0,6,143,20,0,209,134,127,0,
-16,120,143,0,15,16,99,18,217,5,97,18,145,13,178,13,
-213,13,100,18,225,13,130,21,101,18,146,21,197,21,32,86,
-9,61,165,21,32,86,60,15,245,13,32,86,120,30,197,13,
-32,86,68,122,149,13,128,86,36,244,229,5,42,6,72,232,
-1,0,165,5,0,82,127,0,166,87,35,0,127,0,166,87,
-37,0,127,0,128,7,33,0,34,6,0,191,151,0,166,17,
-2,6,0,255,128,255,44,1,190,255,170,87,4,135,80,139,
-97,130,202,5,0,50,128,255,90,60,64,6,63,0,128,7,
-33,0,50,6,156,29,148,0,114,7,1,0,38,6,4,129,
-133,0,128,255,24,99,48,6,244,174,148,0,47,6,244,158,
-148,0,175,129,100,135,101,140,47,6,196,223,255,255,48,6,
-196,231,255,255,175,129,100,135,89,140,45,6,244,206,148,0,
-44,6,244,190,148,0,172,105,44,6,244,158,148,0,43,6,
-244,142,148,0,171,97,100,103,81,140,48,6,244,254,148,0,
-47,6,244,238,148,0,175,129,100,111,97,140,46,6,244,190,
-148,0,45,6,244,174,148,0,173,113,100,119,85,140,100,135,
-73,140,46,6,244,14,149,0,45,6,244,254,148,0,173,113,
-100,119,69,140,34,6,16,129,133,0,98,103,117,0,98,135,
-213,0,42,6,244,222,148,0,49,6,244,206,148,0,177,81,
-100,87,93,140,36,95,89,140,36,103,93,140,98,95,21,0,
-42,6,244,238,148,0,49,6,244,222,148,0,177,81,100,87,
-77,140,98,87,69,0,98,119,5,1,36,87,85,140,36,95,
-97,140,98,87,165,0,98,103,53,1,36,87,101,140,98,95,
-101,1,98,87,149,1,64,6,63,0,128,7,33,0,224,49,
-210,5,129,58,185,5,128,255,102,93,64,6,63,0,128,7,
-33,6,214,111,1,0,97,0,36,143,141,140,224,137,250,5,
-100,7,165,172,100,7,169,172,100,7,173,172,127,0,128,7,
-225,16,6,232,128,222,26,183,29,6,155,255,233,5,32,230,
-213,1,29,238,156,255,229,13,48,6,140,134,71,0,253,135,
-34,2,45,6,64,66,15,0,237,135,194,2,16,230,1,0,
-0,234,251,225,163,13,128,54,26,183,128,255,160,0,50,6,
-230,72,255,255,210,225,213,5,28,48,128,255,144,0,0,226,
-224,225,138,245,224,233,154,221,64,6,255,16,128,7,33,0,
-224,49,202,5,32,22,184,11,197,5,36,23,245,133,198,17,
-100,23,245,133,2,6,71,244,249,13,196,239,144,140,162,13,
-32,54,49,0,37,62,144,131,190,255,236,70,1,130,100,135,
-173,172,100,7,245,133,64,6,63,0,36,23,165,172,32,126,
-44,1,239,23,194,2,236,23,102,2,2,112,43,6,128,81,
-1,0,2,96,235,103,194,2,7,130,240,103,194,82,70,87,
-0,0,235,119,194,122,2,80,103,127,1,0,127,0,64,86,
-0,0,42,87,80,245,202,0,127,0,128,7,225,0,6,232,
-191,255,238,255,10,224,220,233,128,126,27,183,239,239,192,234,
-252,233,231,5,191,255,218,255,253,81,214,253,181,13,191,255,
-208,255,181,5,191,255,202,255,10,16,252,17,207,253,253,17,
-166,253,64,6,255,0,128,7,97,0,6,232,224,233,138,13,
-32,54,68,2,128,255,56,92,10,232,224,233,226,13,128,142,
-173,222,125,143,0,0,125,7,2,0,61,54,4,0,0,58,
-32,70,64,2,190,255,98,65,29,80,64,6,127,0,128,7,
-33,0,38,23,2,0,224,17,242,5,230,135,1,0,128,126,
-237,172,239,129,178,5,0,82,197,13,108,18,151,13,12,106,
-102,111,2,0,38,6,232,16,133,0,128,255,162,97,1,82,
-64,6,63,0,128,7,225,0,7,224,128,142,237,172,6,232,
-61,135,2,0,125,143,0,0,108,130,246,5,0,58,128,255,
-74,0,11,122,125,127,2,0,61,23,2,0,61,102,4,0,
-226,110,48,0,2,118,1,0,125,119,2,0,60,95,5,0,
-204,105,109,95,1,0,45,54,4,0,60,62,8,0,32,70,
-42,0,190,255,118,63,61,63,2,0,38,6,44,17,133,0,
-128,255,60,97,64,6,255,0,38,23,2,0,226,57,238,53,
-167,17,2,94,255,255,240,95,70,2,224,89,162,45,240,63,
-68,2,38,22,4,0,199,17,38,86,4,0,202,57,7,86,
-48,0,11,96,202,97,2,136,170,137,12,128,170,129,240,137,
-139,21,11,120,194,121,15,22,255,255,12,86,255,255,95,82,
-10,119,1,0,95,18,66,119,1,0,95,90,154,253,149,13,
-65,82,10,111,255,255,65,18,66,111,255,255,95,90,154,253,
-38,103,2,0,95,98,102,103,2,0,127,0,0,82,229,37,
-10,16,240,23,68,2,38,134,4,0,194,129,48,111,1,0,
-39,119,5,0,238,105,154,29,38,94,4,0,203,17,34,94,
-4,0,39,102,8,0,32,110,42,0,65,90,11,119,255,255,
-65,98,12,127,255,255,14,16,175,17,218,5,224,113,178,5,
-95,106,202,245,224,17,226,5,65,82,38,127,2,0,239,81,
-134,221,127,0,32,102,32,0,236,47,32,0,45,6,32,183,
-255,255,109,31,1,0,44,6,0,191,150,0,45,6,192,29,
+38,6,232,10,133,0,128,255,118,127,128,255,210,0,64,6,
+255,48,132,7,33,0,36,135,33,140,36,143,45,175,36,127,
+45,133,176,137,15,22,84,11,177,17,188,5,0,82,181,21,
+99,23,1,0,38,6,220,147,141,0,128,62,255,255,1,66,
+35,78,4,0,190,255,100,97,224,81,178,5,0,82,181,5,
+35,87,5,0,68,6,63,0,128,7,97,0,0,234,29,48,
+128,255,16,0,65,234,29,6,240,255,166,253,64,6,127,0,
+49,6,76,11,133,0,49,127,1,0,3,30,236,255,99,127,
+1,0,49,119,5,0,99,119,5,0,49,111,9,0,99,111,
+9,0,49,103,13,0,99,103,13,0,47,6,176,28,148,0,
+49,95,17,0,230,110,20,0,99,95,17,0,35,103,1,0,
+207,105,109,103,1,0,35,95,5,0,109,95,5,0,35,87,
+9,0,109,87,9,0,35,143,13,0,109,143,13,0,35,127,
+17,0,109,127,17,0,3,30,20,0,127,0,128,7,225,0,
+61,6,176,28,148,0,0,226,61,23,13,0,224,17,226,5,
+2,48,128,255,170,120,125,7,13,0,61,23,9,0,224,17,
+226,5,2,48,128,255,152,120,125,7,9,0,65,226,29,238,
+20,0,28,6,240,255,150,237,64,6,255,0,168,7,225,243,
+67,63,43,0,0,210,54,6,176,28,148,0,22,232,6,192,
+38,6,120,11,133,0,128,255,70,126,0,226,128,7,68,1,
+1,218,252,223,192,0,24,120,91,121,186,5,128,7,46,1,
+4,119,217,133,130,114,169,21,29,23,0,0,224,17,226,13,
+38,6,168,11,133,0,194,18,50,6,240,139,133,0,210,17,
+34,71,1,0,28,56,128,255,6,126,29,23,0,0,97,18,
+250,45,15,114,67,119,61,0,32,110,31,0,67,111,65,0,
+67,7,60,0,67,7,64,0,67,7,62,0,67,231,63,0,
+99,7,69,0,28,48,191,255,250,17,99,87,73,0,31,18,
+132,103,217,133,224,97,130,13,163,63,43,0,35,54,60,0,
+128,255,208,6,10,16,127,18,130,13,5,82,93,87,0,0,
+1,138,226,143,192,0,17,209,59,120,79,193,245,77,99,18,
+178,5,103,18,186,77,32,54,0,6,128,255,210,119,125,87,
+13,0,224,81,154,13,38,6,232,11,133,0,32,62,224,2,
+0,66,190,255,120,88,32,54,0,6,128,255,178,119,125,87,
+9,0,224,81,154,13,38,6,232,11,133,0,32,62,226,2,
+0,66,190,255,88,88,32,222,96,2,252,223,32,2,47,6,
+44,4,141,0,207,217,61,63,9,0,27,48,190,255,20,178,
+10,200,61,63,13,0,27,48,190,255,190,178,10,16,224,201,
+186,5,224,17,194,13,2,98,93,103,0,0,28,48,32,62,
+221,0,0,66,191,255,186,18,95,226,133,13,59,95,53,0,
+3,82,125,95,5,0,93,87,0,0,65,226,29,238,20,0,
+4,143,217,131,241,225,190,5,191,7,184,254,38,6,248,11,
+133,0,128,255,234,124,22,232,0,218,128,7,216,1,1,130,
+251,135,192,0,24,112,80,113,186,5,128,7,194,1,29,23,
+0,0,99,18,162,29,4,103,217,133,131,98,177,5,128,7,
+174,1,224,17,186,5,128,7,166,1,38,6,168,11,133,0,
+194,18,50,6,240,139,133,0,210,17,34,71,1,0,27,56,
+128,255,156,124,128,7,136,1,27,48,24,56,128,255,140,2,
+10,16,224,17,194,5,34,230,48,0,133,13,251,102,20,0,
+214,97,44,87,9,0,42,230,48,0,27,48,128,255,124,1,
+10,200,25,48,35,62,44,0,128,255,196,1,25,143,57,1,
+31,50,108,138,234,191,0,0,146,13,57,54,56,1,28,56,
+163,71,43,0,128,255,124,5,10,48,127,50,138,117,224,185,
+178,101,35,63,45,0,38,6,32,12,133,0,128,255,48,124,
+0,18,245,13,1,106,35,95,45,0,226,111,192,0,77,89,
+242,5,226,142,20,0,7,122,214,137,81,127,0,0,65,18,
+4,119,217,131,238,17,246,237,57,63,52,1,38,6,184,11,
+133,0,128,255,250,123,57,230,56,1,0,186,133,61,28,87,
+2,0,28,79,1,0,28,71,0,0,99,87,1,0,28,143,
+3,0,99,143,5,0,28,135,4,0,99,135,9,0,28,127,
+5,0,99,127,13,0,60,119,6,0,209,114,177,114,99,119,
+17,0,60,111,9,0,99,111,21,0,60,103,13,0,99,103,
+25,0,60,23,16,0,99,23,29,0,28,23,18,0,99,23,
+33,0,28,23,19,0,23,56,99,23,37,0,38,6,80,12,
+133,0,128,255,138,123,65,186,28,230,20,0,57,95,52,1,
+235,185,230,197,245,29,4,87,217,133,131,82,185,29,27,56,
+38,6,96,11,133,0,128,255,102,123,197,21,1,122,230,127,
+192,0,15,209,249,63,49,1,128,255,144,4,224,81,162,13,
+38,6,232,11,133,0,32,62,86,3,0,66,190,255,62,86,
+224,81,4,95,217,133,131,90,169,21,29,23,0,0,224,17,
+226,13,38,6,168,11,133,0,194,18,50,6,240,139,133,0,
+210,17,34,71,1,0,27,56,128,255,20,123,65,218,29,238,
+20,0,4,103,217,131,236,217,190,5,191,7,36,254,128,255,
+66,4,26,81,104,6,255,243,128,7,97,0,0,234,0,90,
+6,16,197,21,226,86,20,0,47,6,176,28,148,0,207,81,
+10,119,0,0,100,114,154,13,42,103,13,0,44,87,5,0,
+234,89,185,5,10,88,12,232,65,18,4,103,217,131,236,17,
+166,237,224,89,154,13,38,6,224,12,133,0,32,62,140,3,
+0,66,190,255,168,85,29,80,64,6,127,0,128,7,65,0,
+103,7,1,0,38,239,52,1,0,74,38,22,56,1,0,82,
+197,13,2,143,0,0,224,137,218,5,31,130,66,135,3,0,
+65,74,65,82,2,22,20,0,253,81,198,245,49,6,176,28,
+148,0,0,66,149,45,17,127,0,0,100,122,170,37,0,82,
+38,22,56,1,149,21,2,119,0,0,224,113,170,13,49,103,
+5,0,2,111,4,0,236,105,202,5,66,71,3,0,95,74,
+65,82,2,22,20,0,253,81,246,237,5,90,81,95,0,0,
+1,82,39,135,1,0,232,87,192,0,10,129,103,135,1,0,
+65,66,17,142,20,0,4,127,217,131,239,65,214,213,224,73,
+226,87,0,0,64,6,95,0,140,7,225,112,7,200,6,232,
+253,222,20,0,58,6,176,28,148,0,27,16,218,17,34,87,
+9,0,0,226,42,78,48,0,41,135,1,0,42,70,24,3,
+224,129,170,13,29,56,38,6,240,12,133,0,128,255,208,121,
+0,82,128,7,216,2,29,56,128,7,4,1,2,127,0,0,
+99,122,170,125,1,114,231,119,192,0,25,96,78,97,194,117,
+34,87,9,0,41,119,1,0,42,54,48,0,38,95,1,0,
+42,254,24,3,235,113,250,29,41,143,5,0,38,87,5,0,
+234,137,154,29,41,102,8,0,38,110,8,0,14,88,0,82,
+224,89,194,13,65,98,12,135,255,255,65,106,13,127,255,255,
+16,80,175,81,186,5,95,90,234,245,224,81,202,5,4,114,
+66,119,0,0,63,111,1,0,40,87,1,0,237,81,234,29,
+40,95,5,0,63,103,5,0,236,89,138,29,40,102,8,0,
+63,110,8,0,10,88,224,89,0,82,178,13,65,98,65,106,
+13,143,255,255,12,87,255,255,177,81,186,5,95,90,250,245,
+224,81,202,5,4,130,66,135,0,0,2,127,0,0,100,122,
+186,37,224,225,154,37,38,119,1,0,63,87,1,0,234,113,
+234,21,38,118,8,0,63,126,8,0,10,88,224,89,0,82,
+194,13,65,114,14,111,255,255,65,122,15,103,255,255,13,80,
+172,81,186,5,95,90,234,245,224,81,226,5,34,231,9,0,
+1,90,66,95,16,0,2,22,20,0,65,58,4,87,217,131,
+234,54,20,0,26,88,6,136,203,137,241,17,185,5,191,7,
+238,254,224,225,130,109,29,56,60,70,24,3,60,78,48,0,
+27,16,203,17,197,93,2,135,0,0,99,130,218,85,1,122,
+231,127,192,0,25,104,79,105,242,77,34,103,9,0,40,119,
+1,0,44,102,24,3,44,95,1,0,235,113,234,29,40,143,
+5,0,44,87,5,0,234,137,138,29,40,110,8,0,72,98,
+14,88,0,82,224,89,194,13,65,106,13,135,255,255,65,98,
+12,127,255,255,16,80,175,81,186,5,95,90,234,245,224,81,
+202,5,4,114,66,119,0,0,34,111,9,0,41,119,1,0,
+45,110,48,0,45,103,1,0,236,113,234,29,41,87,5,0,
+45,95,5,0,235,81,138,29,41,102,8,0,72,106,14,88,
+0,82,224,89,194,13,65,98,12,143,255,255,65,106,13,135,
+255,255,17,80,176,81,186,5,95,90,234,245,224,81,202,5,
+4,122,66,127,0,0,2,22,20,0,65,58,6,112,218,113,
+238,17,161,165,0,18,31,90,35,110,8,0,194,105,77,95,
+0,0,65,18,2,6,240,255,246,245,181,101,253,222,20,0,
+26,200,217,217,27,135,0,0,100,130,170,93,4,127,217,133,
+131,122,201,13,29,56,50,6,0,140,133,0,50,71,1,0,
+38,6,28,13,133,0,128,255,150,119,155,103,17,0,224,97,
+242,5,29,56,38,6,44,13,133,0,128,255,130,119,59,23,
+5,0,35,94,8,0,203,17,2,95,0,0,127,90,202,5,
+66,239,0,0,213,53,32,134,96,2,253,135,32,2,11,16,
+43,6,44,4,141,0,203,129,32,102,96,2,226,103,32,2,
+203,97,44,95,73,0,48,87,73,0,235,81,233,5,29,56,
+10,120,2,72,11,80,197,5,29,72,2,56,11,120,231,134,
+20,0,6,114,217,129,4,111,217,133,80,119,0,0,131,106,
+249,13,50,6,8,140,133,0,50,71,1,0,99,127,1,0,
+99,87,5,0,38,6,88,13,133,0,128,255,2,119,65,234,
+4,87,217,131,234,233,182,157,28,80,76,6,255,112,6,88,
+33,6,26,141,1,0,97,0,33,6,246,142,1,0,97,0,
+33,6,146,170,1,0,97,0,33,6,34,169,1,0,97,0,
+33,6,184,141,1,0,97,0,33,6,222,169,1,0,97,0,
+33,6,244,170,1,0,97,0,0,18,7,88,0,82,65,90,
+171,143,255,255,209,17,130,0,65,82,10,6,0,254,134,253,
+2,80,127,0,230,143,181,0,17,128,168,130,208,22,127,0,
+2,6,240,255,225,5,100,18,226,13,104,18,202,21,181,13,
+2,6,240,255,162,13,2,6,224,255,146,13,2,6,192,255,
+130,13,149,13,2,18,133,13,4,18,229,5,5,18,197,5,
+6,18,165,5,0,18,2,80,127,0,38,143,4,0,0,18,
+131,138,201,13,1,18,230,87,9,0,10,6,56,200,210,5,
+10,6,116,140,162,5,0,18,130,0,2,80,138,0,127,0,
+128,7,225,0,6,232,61,143,2,2,0,226,209,134,255,0,
+16,6,91,255,250,21,61,23,1,0,63,6,6,181,129,0,
+2,22,16,0,34,87,0,0,34,111,5,0,221,81,10,48,
+109,0,29,48,10,56,191,255,66,255,224,81,178,5,32,230,
+7,16,28,80,64,6,255,0,128,7,225,0,6,232,61,23,
+1,0,0,226,2,22,16,0,34,87,0,0,34,143,5,0,
+221,81,10,48,63,6,64,181,129,0,113,0,29,48,10,56,
+191,255,8,255,224,81,178,5,32,230,7,16,28,80,64,6,
+255,0,128,7,33,0,12,58,128,255,8,0,64,6,63,0,
+0,18,38,86,6,0,0,90,138,135,1,0,231,129,138,13,
+170,127,5,0,138,23,7,0,200,18,207,17,229,5,76,82,
+65,90,11,6,226,255,150,245,2,80,127,0,38,86,4,0,
+127,0,38,86,4,0,127,0,128,7,33,0,38,6,140,13,
+133,0,128,255,68,7,133,5,128,7,97,0,36,239,45,140,
+128,255,188,0,36,54,220,133,128,255,152,7,100,7,253,133,
+68,7,236,133,128,255,58,12,213,21,64,86,0,0,10,87,
+174,241,136,82,185,253,64,86,0,0,10,87,38,250,68,87,
+60,140,64,86,0,0,202,191,174,241,4,55,60,140,128,255,
+104,7,36,135,253,133,224,129,146,237,1,122,68,127,236,133,
+29,48,128,255,78,7,128,255,248,11,128,255,124,28,64,6,
+127,0,128,7,225,0,7,224,6,56,4,23,236,133,8,232,
+224,17,234,13,28,64,29,72,38,6,1,0,4,0,128,255,
+116,169,28,48,29,56,128,255,130,6,29,16,213,21,99,18,
+186,5,0,18,149,21,98,18,186,5,0,18,213,13,28,64,
+29,72,38,6,1,0,4,0,128,255,74,169,28,48,29,56,
+128,255,102,1,10,16,2,80,64,6,255,0,128,7,65,0,
+64,86,0,0,10,87,32,250,32,94,111,255,202,238,111,0,
+64,86,0,0,74,239,32,250,0,18,65,18,2,6,156,255,
+214,253,64,86,0,0,43,6,144,0,0,0,74,95,32,250,
+64,86,0,0,43,6,162,0,0,0,106,95,34,250,64,86,
+0,0,43,6,242,0,0,0,74,95,32,250,64,6,95,0,
+184,7,33,0,4,23,92,139,97,18,162,29,100,18,130,29,
+36,23,169,172,36,126,168,140,226,121,171,21,36,118,168,140,
+14,86,0,32,234,17,201,13,36,95,173,172,36,110,168,140,
+235,105,235,5,234,89,201,5,66,7,0,0,181,101,36,102,
+168,140,100,103,169,172,38,6,220,13,133,0,128,255,218,5,
+35,54,80,0,39,6,170,170,102,102,191,255,92,102,35,54,
+80,0,191,255,234,106,224,81,242,29,36,62,168,140,35,54,
+80,0,32,70,0,32,0,74,191,255,66,106,224,81,202,21,
+36,86,168,140,10,86,255,31,229,5,36,143,169,172,65,138,
+100,143,169,172,36,23,169,172,2,135,0,0,224,129,178,13,
+234,17,193,245,133,13,36,54,168,140,0,58,32,70,0,32,
+190,255,114,74,36,71,169,172,36,118,168,140,100,71,173,172,
+3,48,174,65,39,6,4,14,133,0,128,255,20,126,3,16,
+36,110,168,140,13,110,0,32,149,21,36,103,169,172,65,98,
+100,103,169,172,76,87,255,255,36,95,169,172,237,89,209,5,
+36,86,168,140,100,87,169,172,65,18,2,87,0,0,224,81,
+218,237,120,6,63,0,128,7,225,240,6,224,7,232,29,216,
+36,142,168,140,17,198,0,32,165,69,36,207,45,175,229,87,
+64,0,224,7,96,1,10,208,24,96,10,106,13,138,36,87,
+169,172,10,22,1,0,236,17,177,5,36,22,168,140,36,135,
+173,172,240,17,178,29,28,95,0,0,106,90,138,21,74,143,
+0,0,66,111,0,0,65,18,236,17,177,5,36,22,168,140,
+36,119,173,172,238,17,162,13,65,218,181,5,74,95,0,0,
+100,23,169,172,65,226,95,234,186,221,250,47,32,0,128,255,
+90,0,134,210,225,13,36,95,45,175,185,89,11,6,190,255,
+233,5,36,87,169,172,100,87,173,172,181,5,224,233,234,189,
+36,143,169,172,27,80,81,7,0,0,189,81,64,6,255,240,
+128,7,33,0,64,86,0,0,202,191,146,241,36,23,245,133,
+36,143,169,172,100,23,173,172,68,7,248,133,241,17,178,5,
+128,255,8,0,64,6,63,0,128,7,33,0,132,143,249,133,
+224,137,250,101,63,6,64,13,3,0,64,86,0,0,10,87,
+36,250,136,82,185,5,95,250,154,253,224,249,162,93,36,134,
+168,140,36,127,173,172,16,94,0,32,235,121,209,5,36,118,
+168,140,100,119,173,172,36,87,173,172,36,23,169,172,234,17,
+169,37,36,110,168,140,100,111,245,133,11,16,170,17,97,18,
+218,29,36,103,173,172,65,98,100,103,173,172,12,55,255,255,
+128,255,18,3,64,86,0,0,10,87,36,250,136,82,177,253,
+36,23,169,172,36,86,168,140,100,23,245,133,100,87,173,172,
+170,17,197,5,100,23,245,133,170,17,97,18,250,21,36,87,
+173,172,65,82,100,87,173,172,10,55,255,255,128,255,214,2,
+36,126,168,140,36,119,173,172,15,134,0,32,240,113,145,21,
+36,110,168,140,100,111,173,172,197,13,224,17,162,13,1,98,
+68,103,248,133,36,55,173,172,2,56,199,0,128,255,254,8,
+64,6,63,0,128,7,33,0,31,250,229,87,64,0,134,82,
+129,13,132,143,249,133,224,137,162,29,95,250,186,253,245,21,
+132,135,249,133,224,129,178,21,64,86,0,0,10,87,224,240,
+136,82,177,5,95,250,154,253,36,127,245,133,68,7,248,133,
+100,127,173,172,64,86,0,0,202,191,146,241,63,6,64,13,
+3,0,64,86,0,0,10,87,36,250,136,82,185,5,95,250,
+154,253,36,119,169,172,36,23,173,172,226,113,233,13,2,48,
+36,102,168,140,172,17,32,62,0,32,162,57,128,255,204,2,
+36,142,168,140,100,143,173,172,36,135,169,172,80,7,0,0,
+36,55,173,172,128,255,226,2,36,127,169,172,63,6,64,13,
+3,0,100,127,173,172,100,127,245,133,64,86,0,0,10,87,
+36,250,136,82,185,5,95,250,154,253,64,6,63,0,128,7,
+225,16,4,143,96,139,224,137,194,5,100,7,241,133,245,85,
+224,49,186,21,36,135,241,133,65,130,100,135,241,133,97,130,
+202,5,0,50,128,255,156,0,36,127,241,133,224,121,250,69,
+1,114,100,119,241,133,181,69,32,238,232,3,230,239,32,2,
+10,82,74,232,224,233,170,5,1,234,36,143,241,133,224,137,
+222,5,1,130,100,135,241,133,133,13,17,126,1,0,100,127,
+241,133,15,6,0,255,191,45,59,6,52,14,133,0,60,6,
+152,35,148,0,28,48,128,255,108,71,224,81,242,5,27,48,
+32,62,199,2,0,66,190,255,68,75,28,48,29,56,0,66,
+128,255,18,72,224,81,242,5,27,48,32,62,200,2,0,66,
+190,255,42,75,28,48,128,255,22,71,224,81,130,13,27,48,
+32,62,201,2,0,66,190,255,20,75,224,81,64,6,255,16,
+144,7,225,0,36,143,241,133,224,137,214,5,4,135,96,139,
+224,129,194,5,100,7,241,133,213,101,60,6,112,14,133,0,
+36,63,45,175,38,6,68,14,133,0,128,255,226,111,32,54,
+0,32,128,255,222,105,10,232,224,233,250,5,28,48,32,62,
+241,2,0,66,190,255,198,74,29,48,32,62,0,32,128,255,
+252,0,3,48,39,6,170,170,102,102,191,255,44,98,3,48,
+32,62,0,32,1,66,191,255,196,93,29,56,3,48,32,70,
+0,32,0,74,191,255,108,101,36,63,45,175,38,6,100,14,
+133,0,128,255,138,111,29,48,128,255,108,105,31,122,100,127,
+241,133,61,6,152,35,148,0,29,48,128,255,136,70,224,81,
+242,5,28,48,32,62,255,2,0,66,190,255,96,74,29,48,
+32,62,112,23,0,66,128,255,44,71,224,81,242,5,28,48,
+32,62,0,3,0,66,190,255,68,74,29,48,128,255,48,70,
+224,81,130,13,28,48,32,62,1,3,0,66,190,255,46,74,
+224,81,80,6,255,0,128,7,33,0,64,86,0,0,10,87,
+38,250,68,87,60,140,64,86,0,0,202,191,174,241,4,143,
+236,133,224,137,234,5,4,55,60,140,128,255,92,1,133,13,
+32,54,236,176,32,62,0,2,0,66,190,255,76,133,64,6,
+63,0,128,7,65,0,6,232,4,143,236,133,189,0,99,138,
+178,13,64,86,0,0,10,87,36,250,136,82,177,253,64,86,
+0,0,74,239,40,250,64,6,95,0,130,7,193,0,6,224,
+7,232,29,6,255,223,185,5,32,238,0,32,229,87,64,0,
+224,7,96,1,36,23,169,172,99,87,1,0,189,17,36,126,
+168,140,239,17,217,13,2,22,0,32,165,13,65,18,36,110,
+168,140,13,118,0,32,238,17,177,5,36,22,168,140,2,103,
+0,0,224,97,194,245,36,94,168,140,11,94,0,32,181,13,
+2,87,0,0,92,87,0,0,65,18,65,226,235,17,177,5,
+36,22,168,140,29,136,95,234,224,137,186,245,35,239,1,0,
+253,47,32,0,66,6,223,0,128,7,225,16,7,216,0,226,
+6,232,229,13,29,143,0,0,106,138,202,5,13,50,191,255,
+68,255,29,55,0,0,191,255,60,255,65,234,65,226,251,225,
+166,245,64,6,255,16,128,7,97,0,6,232,181,13,106,18,
+202,5,13,50,191,255,30,255,29,55,0,0,65,234,191,255,
+20,255,29,23,0,0,224,17,186,245,64,6,127,0,128,7,
+33,0,0,82,34,6,240,29,148,0,133,143,117,131,66,143,
+0,0,65,82,2,22,128,0,106,82,134,253,37,54,108,131,
+128,255,32,0,100,7,53,140,100,7,49,140,64,14,148,0,
+65,7,240,34,100,7,37,140,100,7,41,140,64,6,63,0,
+100,55,45,140,127,0,128,7,33,0,166,0,6,6,229,255,
+218,5,1,130,100,135,53,140,245,93,6,6,177,255,194,5,
+6,6,165,255,154,13,36,111,53,140,97,106,218,5,2,98,
+100,103,53,140,149,85,36,95,53,140,98,90,186,45,6,16,
+2,6,188,255,145,13,2,6,191,255,153,37,242,13,2,6,
+189,255,249,13,149,21,2,6,188,255,146,21,2,6,184,255,
+146,21,2,6,181,255,146,21,165,21,128,255,30,2,245,13,
+128,255,108,2,197,13,128,255,214,2,149,13,128,255,176,2,
+229,5,128,255,84,3,181,5,128,255,112,3,100,7,53,140,
+181,37,6,16,109,18,233,5,104,18,210,13,105,18,226,13,
+149,29,109,18,226,13,2,6,238,255,226,13,2,6,129,255,
+226,13,133,21,128,255,116,3,245,13,128,255,190,2,197,13,
+128,255,26,0,149,13,128,255,232,3,229,5,128,255,128,3,
+181,5,128,255,248,0,64,6,63,0,128,7,225,0,61,6,
+240,34,148,0,29,224,28,48,37,62,117,131,128,255,250,139,
+224,81,130,29,36,55,41,140,44,6,240,29,148,0,6,142,
+1,0,100,143,41,140,199,50,204,49,28,56,128,255,248,139,
+36,95,41,140,10,82,234,95,194,90,100,95,41,140,100,95,
+37,140,37,54,118,131,191,255,112,254,29,48,128,255,38,0,
+36,55,57,140,39,6,112,35,148,0,128,255,132,0,165,143,
+117,131,93,143,0,0,100,7,49,140,128,255,100,3,64,6,
+255,0,132,7,225,0,37,127,125,131,99,127,1,0,5,119,
+128,131,64,230,148,0,67,119,4,0,3,56,100,7,57,140,
+128,255,32,140,124,87,113,35,60,230,112,35,245,21,36,239,
+57,140,3,56,65,234,100,239,57,140,0,50,194,234,220,233,
+128,255,0,140,36,23,57,140,125,87,1,0,105,18,234,5,
+2,110,1,0,100,111,57,140,149,13,36,87,57,140,194,82,
+220,81,42,135,1,0,224,129,186,229,68,6,255,0,128,7,
+33,0,190,255,196,193,64,6,63,0,128,7,225,48,6,224,
+188,0,28,134,224,255,16,6,161,255,209,85,28,102,191,255,
+12,6,230,255,233,119,0,0,197,114,206,225,188,0,58,6,
+240,34,148,0,26,16,2,143,0,0,65,18,224,137,202,253,
+2,134,255,255,186,129,16,6,130,255,217,5,7,50,191,255,
+180,252,149,61,36,127,49,140,218,121,15,119,0,0,224,113,
+154,21,28,48,191,255,158,252,36,95,49,140,11,102,1,0,
+100,103,49,140,218,89,75,231,0,0,218,97,76,7,0,0,
+165,37,36,239,49,140,28,216,29,134,1,0,100,135,49,140,
+29,224,218,225,27,16,28,223,0,0,29,112,218,113,78,23,
+0,0,65,226,65,234,224,17,146,13,2,48,191,255,86,252,
+165,245,36,55,229,133,191,255,32,253,36,95,49,140,95,234,
+235,233,139,253,64,6,255,48,128,7,225,0,36,239,37,140,
+224,233,194,5,29,134,255,255,165,5,9,130,100,135,37,140,
+60,6,240,29,148,0,16,48,199,50,220,49,37,62,132,131,
+128,255,54,138,224,81,202,5,100,239,37,140,229,13,36,63,
+37,140,38,6,240,34,148,0,199,58,220,57,128,255,56,138,
+128,255,222,1,128,255,36,1,64,6,255,0,128,7,225,0,
+36,239,37,140,10,122,29,54,1,0,239,55,194,50,100,55,
+37,140,60,6,240,29,148,0,199,50,220,49,37,62,133,131,
+128,255,230,137,224,81,202,5,100,239,37,140,229,13,36,63,
+37,140,38,6,240,34,148,0,199,58,220,57,128,255,232,137,
+128,255,142,1,128,255,212,0,64,6,255,0,128,7,33,0,
+36,143,49,140,224,137,146,13,17,134,255,255,36,55,229,133,
+100,135,49,140,191,255,82,252,64,6,63,0,128,7,33,0,
+36,143,49,140,64,134,148,0,208,137,17,127,240,34,224,121,
+162,13,36,119,49,140,36,55,225,133,65,114,100,119,49,140,
+191,255,38,252,64,6,63,0,128,7,97,0,61,6,240,34,
+148,0,165,13,36,143,49,140,36,55,225,133,65,138,100,143,
+49,140,191,255,4,252,36,135,49,140,221,129,16,23,0,0,
+2,6,224,255,210,13,224,17,234,237,165,13,36,111,49,140,
+36,55,225,133,65,106,100,111,49,140,191,255,220,251,36,103,
+49,140,64,94,148,0,203,97,12,87,240,34,10,6,224,255,
+226,237,64,6,127,0,128,7,33,0,149,13,16,142,255,255,
+36,55,229,133,100,143,49,140,191,255,174,251,36,135,49,140,
+224,129,218,245,64,6,63,0,128,7,97,0,61,6,240,34,
+148,0,165,13,36,143,49,140,36,55,225,133,65,138,100,143,
+49,140,191,255,132,251,36,135,49,140,221,129,16,127,0,0,
+224,121,154,245,64,6,127,0,128,7,33,0,36,143,49,140,
+224,137,178,13,17,134,255,255,36,55,229,133,100,135,49,140,
+191,255,86,251,128,255,8,0,64,6,63,0,128,7,225,16,
+36,87,49,140,34,6,240,34,148,0,10,136,194,137,17,135,
+0,0,224,129,178,37,10,232,65,18,29,224,194,225,2,222,
+255,255,28,23,0,0,29,112,219,113,78,23,0,0,65,226,
+65,234,224,17,210,5,2,48,191,255,58,250,181,245,32,54,
+32,0,191,255,48,250,229,5,36,55,229,133,95,234,191,255,
+248,250,36,95,49,140,235,233,139,253,64,6,255,16,128,7,
+225,0,36,55,233,133,191,255,224,250,36,55,45,140,191,255,
+216,250,32,54,62,0,191,255,252,249,64,22,148,0,34,230,
+240,34,28,48,191,255,194,250,13,50,191,255,232,249,36,55,
+45,140,191,255,180,250,32,54,62,0,191,255,216,249,0,234,
+229,13,28,143,0,0,224,137,202,5,100,239,49,140,181,13,
+36,55,225,133,191,255,146,250,65,226,65,234,36,135,49,140,
+240,233,138,245,64,6,255,0,36,87,33,6,184,105,0,0,
+97,0,128,7,33,0,224,49,210,5,129,58,185,5,128,255,
+158,98,64,6,63,0,128,7,33,0,38,6,196,35,148,0,
+39,6,128,14,133,0,0,66,191,255,132,107,64,6,63,0,
+128,7,33,0,64,14,148,0,97,7,241,35,38,6,76,140,
+133,0,128,255,40,103,64,6,63,0,128,7,225,16,6,232,
+7,224,188,0,8,216,224,233,138,13,32,54,136,0,128,255,
+110,98,10,232,224,233,226,13,93,231,2,0,125,7,0,0,
+125,223,5,0,61,54,8,0,0,58,32,70,128,0,190,255,
+244,62,29,80,64,6,255,16,130,7,97,0,6,232,61,87,
+5,0,157,127,3,0,42,23,1,0,15,112,34,135,24,0,
+14,56,16,48,202,49,61,78,8,0,32,110,128,0,99,111,
+1,0,0,66,34,103,29,0,63,6,52,195,129,0,108,0,
+125,87,0,0,10,16,226,0,224,17,178,5,234,0,245,5,
+29,48,128,255,54,0,125,87,0,0,234,0,66,6,127,0,
+166,143,11,0,134,135,13,0,209,129,166,119,13,0,208,113,
+38,103,0,0,14,22,4,0,224,97,178,5,0,82,197,5,
+1,82,226,87,192,0,127,0,128,7,225,0,6,232,0,226,
+0,18,61,94,8,0,0,82,139,143,1,0,209,17,130,0,
+65,90,65,82,10,6,193,255,134,253,189,119,71,0,238,17,
+146,13,2,56,38,6,152,14,133,0,128,255,82,103,32,230,
+66,2,157,23,9,0,2,6,128,255,145,13,2,56,38,6,
+156,15,133,0,128,255,56,103,32,230,66,2,157,23,11,0,
+100,18,178,13,2,56,38,6,76,16,133,0,128,255,32,103,
+32,86,67,2,128,7,50,2,189,23,11,0,194,134,240,0,
+178,13,2,56,38,6,40,15,133,0,128,255,2,103,32,86,
+67,2,128,7,20,2,157,23,13,0,104,18,225,5,108,18,
+203,5,194,126,240,0,146,13,2,56,38,6,112,16,133,0,
+128,255,220,102,32,230,66,2,189,23,13,0,98,18,187,5,
+224,17,186,13,2,56,38,6,172,16,133,0,128,255,192,102,
+32,86,67,2,128,7,210,1,253,23,15,0,2,6,192,255,
+226,13,2,6,184,255,178,13,2,56,38,6,192,15,133,0,
+128,255,156,102,32,86,67,2,128,7,174,1,2,6,184,255,
+250,5,2,56,38,6,184,14,133,0,128,255,130,102,157,23,
+17,0,97,18,178,13,2,56,38,6,204,16,133,0,128,255,
+110,102,32,86,67,2,128,7,128,1,189,23,17,0,2,6,
+95,255,153,13,2,56,38,6,84,15,133,0,128,255,80,102,
+32,230,66,2,189,23,19,0,98,18,177,13,2,56,38,6,
+224,15,133,0,128,255,56,102,32,86,67,2,128,7,74,1,
+157,23,21,0,194,86,128,0,186,13,2,56,38,6,244,16,
+133,0,128,255,26,102,32,86,67,2,128,7,44,1,189,23,
+23,0,100,18,179,13,2,56,38,6,176,17,133,0,128,255,
+254,101,32,86,67,2,128,7,16,1,157,23,25,0,194,142,
+128,0,170,13,2,56,38,6,24,17,133,0,128,255,224,101,
+32,86,67,2,149,125,189,23,25,0,100,18,162,13,2,56,
+38,6,120,15,133,0,128,255,198,101,32,86,67,2,197,109,
+157,23,27,0,194,126,7,0,170,13,2,56,38,6,240,14,
+133,0,128,255,170,101,32,86,67,2,229,93,189,23,27,0,
+194,86,1,0,170,13,2,56,38,6,60,17,133,0,128,255,
+142,101,32,86,67,2,133,85,157,23,29,0,194,110,1,0,
+170,13,2,56,38,6,92,17,133,0,128,255,114,101,32,86,
+67,2,165,69,189,23,29,0,194,134,98,0,162,13,2,56,
+38,6,12,16,133,0,128,255,86,101,32,86,67,2,197,53,
+189,23,35,0,224,17,154,13,2,56,38,6,52,16,133,0,
+128,255,60,101,32,230,66,2,189,23,35,0,2,6,225,255,
+153,13,2,56,38,6,16,15,133,0,128,255,34,101,32,230,
+66,2,189,23,37,0,224,17,154,13,2,56,38,6,124,17,
+133,0,128,255,10,101,32,230,66,2,189,23,37,0,2,6,
+214,255,153,13,2,56,38,6,148,17,133,0,128,255,240,100,
+32,230,66,2,28,80,64,6,255,0,166,87,11,0,127,0,
+134,87,13,0,127,0,6,143,20,0,209,134,127,0,16,120,
+143,0,15,16,99,18,217,5,97,18,145,13,178,13,213,13,
+100,18,225,13,130,21,101,18,146,21,197,21,32,86,9,61,
+165,21,32,86,60,15,245,13,32,86,120,30,197,13,32,86,
+68,122,149,13,128,86,36,244,229,5,42,6,72,232,1,0,
+165,5,0,82,127,0,166,87,35,0,127,0,166,87,37,0,
+127,0,128,7,33,0,34,6,96,202,151,0,166,17,2,6,
+0,255,128,255,44,1,190,255,200,79,4,135,92,139,97,130,
+202,5,0,50,128,255,92,60,64,6,63,0,128,7,33,0,
+50,6,252,40,148,0,114,7,1,0,38,6,100,140,133,0,
+128,255,26,99,48,6,84,186,148,0,47,6,84,170,148,0,
+175,129,100,135,113,140,47,6,196,223,255,255,48,6,196,231,
+255,255,175,129,100,135,101,140,45,6,84,218,148,0,44,6,
+84,202,148,0,172,105,44,6,84,170,148,0,43,6,84,154,
+148,0,171,97,100,103,93,140,48,6,84,10,149,0,47,6,
+84,250,148,0,175,129,100,111,109,140,46,6,84,202,148,0,
+45,6,84,186,148,0,173,113,100,119,97,140,100,135,85,140,
+46,6,84,26,149,0,45,6,84,10,149,0,173,113,100,119,
+81,140,34,6,112,140,133,0,98,103,117,0,98,135,213,0,
+42,6,84,234,148,0,49,6,84,218,148,0,177,81,100,87,
+105,140,36,95,101,140,36,103,105,140,98,95,21,0,42,6,
+84,250,148,0,49,6,84,234,148,0,177,81,100,87,89,140,
+98,87,69,0,98,119,5,1,36,87,97,140,36,95,109,140,
+98,87,165,0,98,103,53,1,36,87,113,140,98,95,101,1,
+98,87,149,1,64,6,63,0,128,7,33,0,224,49,210,5,
+129,58,185,5,128,255,104,93,64,6,63,0,128,7,33,6,
+0,114,1,0,97,0,36,143,153,140,224,137,250,5,100,7,
+177,172,100,7,181,172,100,7,185,172,127,0,128,7,225,16,
+6,232,128,222,26,183,29,6,155,255,233,5,32,230,213,1,
+29,238,156,255,229,13,48,6,140,134,71,0,253,135,34,2,
+45,6,64,66,15,0,237,135,194,2,16,230,1,0,0,234,
+251,225,163,13,128,54,26,183,128,255,160,0,50,6,230,72,
+255,255,210,225,213,5,28,48,128,255,144,0,0,226,224,225,
+138,245,224,233,154,221,64,6,255,16,128,7,33,0,224,49,
+202,5,32,22,184,11,197,5,36,23,1,134,198,17,100,23,
+1,134,2,6,71,244,249,13,196,239,156,140,162,13,32,54,
+49,0,37,62,152,131,190,255,74,62,1,130,100,135,185,172,
+100,7,1,134,64,6,63,0,36,23,177,172,32,126,44,1,
+239,23,194,2,236,23,102,2,2,112,43,6,128,81,1,0,
+2,96,235,103,194,2,7,130,240,103,194,82,70,87,0,0,
+235,119,194,122,2,80,103,127,1,0,127,0,64,86,0,0,
+42,87,80,245,202,0,127,0,128,7,225,0,6,232,191,255,
+238,255,10,224,220,233,128,126,27,183,239,239,192,234,252,233,
+231,5,191,255,218,255,253,81,214,253,181,13,191,255,208,255,
+181,5,191,255,202,255,10,16,252,17,207,253,253,17,166,253,
+64,6,255,0,128,7,97,0,6,232,224,233,138,13,32,54,
+68,2,128,255,58,92,10,232,224,233,226,13,128,142,173,222,
+125,143,0,0,125,7,2,0,61,54,4,0,0,58,32,70,
+64,2,190,255,192,56,29,80,64,6,127,0,128,7,33,0,
+38,23,2,0,224,17,242,5,230,135,1,0,128,126,237,172,
+239,129,178,5,0,82,197,13,108,18,151,13,12,106,102,111,
+2,0,38,6,100,28,133,0,128,255,164,97,1,82,64,6,
+63,0,128,7,225,0,7,224,128,142,237,172,6,232,61,135,
+2,0,125,143,0,0,108,130,246,5,0,58,128,255,74,0,
+11,122,125,127,2,0,61,23,2,0,61,102,4,0,226,110,
+48,0,2,118,1,0,125,119,2,0,60,95,5,0,204,105,
+109,95,1,0,45,54,4,0,60,62,8,0,32,70,42,0,
+190,255,212,54,61,63,2,0,38,6,168,28,133,0,128,255,
+62,97,64,6,255,0,38,23,2,0,226,57,238,53,167,17,
+2,94,255,255,240,95,70,2,224,89,162,45,240,63,68,2,
+38,22,4,0,199,17,38,86,4,0,202,57,7,86,48,0,
+11,96,202,97,2,136,170,137,12,128,170,129,240,137,139,21,
+11,120,194,121,15,22,255,255,12,86,255,255,95,82,10,119,
+1,0,95,18,66,119,1,0,95,90,154,253,149,13,65,82,
+10,111,255,255,65,18,66,111,255,255,95,90,154,253,38,103,
+2,0,95,98,102,103,2,0,127,0,0,82,229,37,10,16,
+240,23,68,2,38,134,4,0,194,129,48,111,1,0,39,119,
+5,0,238,105,154,29,38,94,4,0,203,17,34,94,4,0,
+39,102,8,0,32,110,42,0,65,90,11,119,255,255,65,98,
+12,127,255,255,14,16,175,17,218,5,224,113,178,5,95,106,
+202,245,224,17,226,5,65,82,38,127,2,0,239,81,134,221,
+127,0,0,0,32,102,32,0,236,47,32,0,45,6,32,183,
+255,255,109,31,1,0,44,6,96,202,150,0,45,6,72,41,
 133,0,109,103,1,0,127,0,224,7,32,0,0,0,224,15,
 32,0,0,0,224,23,32,0,0,0,224,31,32,0,0,0,
 224,135,32,0,0,0,224,143,32,0,0,0,224,151,32,0,
 0,0,224,159,32,0,0,0,0,0,128,7,190,8,64,30,
-148,0,35,30,228,115,128,255,198,28,128,255,112,25,181,45,
+148,0,35,30,68,127,128,255,198,28,128,255,112,25,181,45,
 128,7,92,8,124,255,125,0,128,255,230,0,64,14,130,0,
-33,14,118,194,97,0,64,14,148,0,33,14,228,115,225,25,
+33,14,26,203,97,0,64,14,148,0,33,14,68,127,225,25,
 223,5,1,14,112,254,225,25,239,5,64,14,148,0,33,14,
-228,115,1,24,228,55,64,0,229,15,64,0,193,14,128,0,
+68,127,1,24,228,55,64,0,229,15,64,0,193,14,128,0,
 162,5,144,50,198,54,255,255,60,62,128,0,128,255,164,25,
 0,81,196,5,128,255,20,27,0,0,128,255,116,1,60,255,
 125,0,60,231,113,0,0,0,224,7,64,1,0,0,128,7,
 20,8,124,255,125,0,128,255,108,2,64,14,130,0,33,14,
-228,194,97,0,64,14,148,0,33,14,228,115,225,25,223,5,
-1,14,112,254,225,25,239,5,64,14,148,0,33,14,228,115,
+136,203,97,0,64,14,148,0,33,14,68,127,225,25,223,5,
+1,14,112,254,225,25,239,5,64,14,148,0,33,14,68,127,
 1,24,32,54,96,0,60,62,128,0,128,255,70,25,0,81,
 196,21,128,255,96,27,0,0,224,7,96,1,0,50,128,255,
 252,38,0,0,0,0,64,248,0,0,0,0,0,0,1,50,
@@ -13182,7 +13309,7 @@ unsigned char tw_fw_code[] __initdata = 
 0,0,230,135,32,0,127,0,0,0,230,143,32,0,127,0,
 0,0,230,151,32,0,127,0,0,0,230,159,32,0,127,0,
 0,0,230,167,32,0,127,0,0,0,230,175,32,0,127,0,
-0,0,64,14,133,0,33,14,140,21,97,231,113,0,1,224,
+0,0,64,14,133,0,33,14,8,33,97,231,113,0,1,224,
 124,7,1,0,124,15,5,0,124,23,9,0,124,31,13,0,
 124,39,17,0,124,47,21,0,124,55,25,0,124,63,29,0,
 124,71,33,0,124,79,37,0,124,87,41,0,124,95,45,0,
@@ -13191,7 +13318,7 @@ unsigned char tw_fw_code[] __initdata = 
 124,167,81,0,124,175,85,0,124,183,89,0,124,191,93,0,
 124,199,97,0,124,207,101,0,124,215,105,0,124,223,109,0,
 124,239,117,0,124,247,121,0,127,0,64,230,133,0,60,230,
-140,21,60,7,1,0,60,15,5,0,60,23,9,0,60,31,
+8,33,60,7,1,0,60,15,5,0,60,23,9,0,60,31,
 13,0,60,39,17,0,60,47,21,0,60,55,25,0,60,63,
 29,0,60,71,33,0,60,79,37,0,60,87,41,0,60,95,
 45,0,60,103,49,0,60,111,53,0,60,119,57,0,60,127,
@@ -13199,7 +13326,7 @@ unsigned char tw_fw_code[] __initdata = 
 77,0,60,167,81,0,60,175,85,0,60,183,89,0,60,191,
 93,0,60,199,97,0,60,207,101,0,60,215,105,0,60,223,
 109,0,60,239,117,0,60,247,121,0,127,0,64,254,133,0,
-63,254,164,22,127,7,1,0,127,15,5,0,127,23,9,0,
+63,254,32,34,127,7,1,0,127,15,5,0,127,23,9,0,
 127,31,13,0,127,39,17,0,127,47,21,0,127,55,25,0,
 127,63,29,0,127,71,33,0,127,79,37,0,127,87,41,0,
 127,95,45,0,127,103,49,0,127,111,53,0,127,119,57,0,
@@ -13214,8 +13341,8 @@ unsigned char tw_fw_code[] __initdata = 
 245,127,64,0,0,0,244,135,64,0,0,0,127,95,197,0,
 127,103,201,0,127,111,205,0,127,119,209,0,127,127,217,0,
 127,135,213,0,127,111,129,0,127,119,153,0,228,15,64,0,
-127,15,149,0,64,30,150,0,35,30,244,190,64,254,130,0,
-63,254,10,173,127,0,64,14,133,0,33,14,164,22,1,224,
+127,15,149,0,64,30,150,0,35,30,84,202,64,254,130,0,
+63,254,172,181,127,0,64,14,133,0,33,14,32,34,1,224,
 60,55,133,0,60,63,137,0,60,71,141,0,60,79,145,0,
 230,7,32,0,0,0,231,15,32,0,0,0,232,23,32,0,
 0,0,233,31,32,0,0,0,60,95,197,0,60,103,201,0,
@@ -13229,63 +13356,63 @@ unsigned char tw_fw_code[] __initdata = 
 89,0,60,191,93,0,60,199,97,0,60,207,101,0,60,215,
 105,0,60,223,109,0,60,239,117,0,60,247,121,0,60,231,
 113,0,35,255,233,255,0,0,224,7,64,1,35,15,1,0,
-68,26,92,26,99,255,1,0,64,254,148,0,63,254,56,112,
+68,26,92,26,99,255,1,0,64,254,148,0,63,254,152,123,
 127,231,113,0,31,224,35,255,1,0,68,26,191,7,136,247,
 0,0,35,15,1,0,68,26,92,26,99,255,1,0,64,254,
-148,0,63,254,56,112,127,231,113,0,31,224,35,255,1,0,
-68,26,191,7,208,247,0,0,64,230,148,0,60,230,56,112,
+148,0,63,254,152,123,127,231,113,0,31,224,35,255,1,0,
+68,26,191,7,208,247,0,0,64,230,148,0,60,230,152,123,
 124,231,113,0,124,255,125,0,191,255,54,248,191,7,50,247,
-0,0,0,0,42,6,72,194,129,0,106,0,128,7,225,16,
-61,6,136,120,148,0,64,14,148,0,97,7,45,117,59,6,
-244,116,148,0,64,14,148,0,97,7,161,120,64,142,148,0,
-17,143,112,118,0,226,224,137,186,5,128,7,234,1,64,134,
-148,0,48,135,49,117,224,129,186,5,128,7,226,1,64,14,
-148,0,65,7,112,118,128,7,206,1,0,50,128,255,130,2,
-64,62,148,0,39,63,133,120,7,16,2,6,206,255,209,37,
+0,0,0,0,42,6,236,202,129,0,106,0,128,7,225,16,
+61,6,232,131,148,0,64,14,149,0,97,7,141,128,59,6,
+84,128,148,0,64,14,149,0,97,7,1,132,64,142,149,0,
+17,143,208,129,0,226,224,137,186,5,128,7,234,1,64,134,
+149,0,48,135,145,128,224,129,186,5,128,7,226,1,64,14,
+149,0,65,7,208,129,128,7,206,1,0,50,128,255,130,2,
+64,62,149,0,39,63,229,131,7,16,2,6,206,255,209,37,
 2,6,226,255,185,5,128,7,164,1,66,0,82,0,87,0,
 93,0,104,0,111,0,111,0,141,0,147,0,154,0,159,0,
 37,0,207,0,173,0,37,0,188,0,43,0,75,0,207,0,
 165,0,207,0,207,0,194,0,177,0,207,0,194,0,207,0,
 99,0,62,0,53,0,68,0,2,6,206,255,186,5,128,7,
 74,1,128,7,88,1,32,54,32,0,128,255,88,4,128,7,
-86,1,128,255,220,29,7,18,27,240,17,21,64,118,148,0,
-46,119,97,118,23,117,0,50,128,255,58,4,64,14,148,0,
-97,7,81,117,128,7,48,1,61,55,1,0,128,255,166,7,
+86,1,128,255,220,29,7,18,27,240,17,21,64,118,149,0,
+46,119,193,129,23,117,0,50,128,255,58,4,64,14,149,0,
+97,7,177,128,128,7,48,1,61,55,1,0,128,255,166,7,
 128,7,36,1,29,240,96,48,97,56,128,255,214,7,128,7,
 22,1,29,240,100,56,0,53,128,255,6,8,128,7,8,1,
 157,55,1,0,128,255,72,26,229,125,29,240,96,48,2,61,
 128,255,106,26,133,125,29,240,4,61,0,53,128,255,50,8,
 165,117,61,55,1,0,128,255,78,8,213,109,29,240,4,69,
 2,61,0,53,128,255,132,8,229,101,128,255,6,27,61,23,
-1,0,97,18,178,13,64,134,148,0,48,135,73,118,64,110,
-148,0,194,130,205,129,112,23,225,123,64,102,148,0,44,103,
-133,120,100,98,186,45,128,255,44,21,1,18,64,14,148,0,
-97,23,161,120,181,37,29,240,100,56,0,53,128,255,114,8,
+1,0,97,18,178,13,64,134,149,0,48,135,169,129,64,110,
+149,0,194,130,205,129,112,23,65,135,64,102,149,0,44,103,
+229,131,100,98,186,45,128,255,44,21,1,18,64,14,149,0,
+97,23,1,132,181,37,29,240,100,56,0,53,128,255,114,8,
 165,69,29,240,104,64,2,61,0,53,128,255,228,8,181,61,
 61,55,1,0,128,255,114,10,213,5,61,55,1,0,128,255,
-254,10,10,48,181,133,128,255,162,9,1,18,64,14,148,0,
-65,23,113,118,133,45,128,255,12,13,1,226,197,37,29,240,
+254,10,10,48,181,133,128,255,162,9,1,18,64,14,149,0,
+65,23,209,129,133,45,128,255,12,13,1,226,197,37,29,240,
 2,21,0,53,194,62,1,0,194,70,2,0,128,255,68,0,
 10,224,149,29,7,18,91,23,0,0,4,50,191,7,206,254,
-38,6,212,17,133,0,213,13,29,87,0,0,64,14,148,0,
-97,87,201,123,0,50,191,7,180,254,38,6,172,17,133,0,
+38,6,80,29,133,0,213,13,29,87,0,0,64,14,149,0,
+97,87,41,135,0,50,191,7,180,254,38,6,40,29,133,0,
 128,255,228,12,224,225,186,5,191,7,50,254,64,6,255,16,
 128,7,97,0,8,232,128,255,254,28,224,233,146,13,1,18,
-64,14,148,0,65,23,244,116,4,50,128,255,216,2,224,233,
+64,14,149,0,65,23,84,128,4,50,128,255,216,2,224,233,
 226,87,0,0,64,6,127,0,128,7,33,0,128,255,8,20,
-64,14,148,0,97,7,57,117,64,14,148,0,97,7,53,117,
-31,18,64,14,148,0,97,23,65,117,128,255,158,17,64,14,
-148,0,65,7,112,118,64,14,148,0,65,7,114,118,128,255,
-46,9,64,14,148,0,97,7,161,120,64,14,148,0,97,7,
-77,117,64,14,148,0,97,7,201,123,64,14,148,0,65,7,
-113,118,64,6,63,0,64,14,148,0,33,247,121,120,96,136,
+64,14,149,0,97,7,153,128,64,14,149,0,97,7,149,128,
+31,18,64,14,149,0,97,23,161,128,128,255,158,17,64,14,
+149,0,65,7,208,129,64,14,149,0,65,7,210,129,128,255,
+46,9,64,14,149,0,97,7,1,132,64,14,149,0,97,7,
+173,128,64,14,149,0,97,7,41,135,64,14,149,0,65,7,
+209,129,64,6,63,0,64,14,149,0,33,247,217,131,96,136,
 70,143,0,0,97,128,70,135,1,0,98,120,70,127,2,0,
-99,112,70,119,3,0,68,242,97,247,121,120,127,0,128,7,
-225,16,64,230,148,0,61,6,136,120,148,0,6,56,59,6,
-115,118,148,0,27,48,128,255,122,17,27,134,1,0,124,135,
-121,120,64,14,148,0,155,127,1,0,97,127,133,120,64,118,
-148,0,14,119,114,118,60,230,120,120,224,113,194,5,66,130,
-124,135,1,0,64,22,148,0,34,23,133,120,97,18,225,45,
+99,112,70,119,3,0,68,242,97,247,217,131,127,0,128,7,
+225,16,64,230,149,0,61,6,232,131,148,0,6,56,59,6,
+211,129,148,0,27,48,128,255,122,17,27,134,1,0,124,135,
+217,131,64,14,149,0,155,127,1,0,97,127,229,131,64,118,
+149,0,14,119,210,129,60,230,216,131,224,113,194,5,66,130,
+124,135,1,0,64,22,149,0,34,23,229,131,97,18,225,45,
 242,53,99,18,129,69,242,77,102,18,145,77,130,109,103,18,
 162,117,105,18,195,69,2,6,240,255,210,85,2,6,238,255,
 186,5,128,7,254,0,2,6,236,255,210,117,2,6,234,255,
@@ -13303,7 +13430,7 @@ unsigned char tw_fw_code[] __initdata = 
 168,254,28,240,0,93,65,90,1,93,171,87,255,255,93,87,
 4,0,165,77,29,48,191,255,144,254,61,54,4,0,191,255,
 136,254,28,240,0,133,65,130,1,133,176,127,255,255,93,127,
-8,0,165,61,38,6,4,18,133,0,128,255,4,9,197,53,
+8,0,165,61,38,6,128,29,133,0,128,255,4,9,197,53,
 28,240,0,109,65,106,1,109,13,134,1,0,173,103,255,255,
 200,98,125,103,0,0,1,133,141,127,1,0,207,97,125,103,
 0,0,165,37,28,240,0,85,65,82,1,85,170,143,255,255,
@@ -13314,20 +13441,20 @@ unsigned char tw_fw_code[] __initdata = 
 0,0,97,128,70,135,1,0,98,120,70,127,2,0,99,112,
 66,50,6,86,2,0,70,119,1,0,127,0,197,5,70,23,
 0,0,65,50,7,23,0,0,65,58,224,17,154,253,6,80,
-127,0,128,7,225,0,6,232,39,6,248,18,133,0,191,255,
+127,0,128,7,225,0,6,232,39,6,116,30,133,0,191,255,
 222,255,10,224,128,255,208,31,28,48,10,56,191,255,208,255,
-10,48,39,6,16,19,133,0,191,255,196,255,189,81,64,6,
-255,0,132,7,225,0,49,6,116,119,148,0,17,134,1,0,
-99,135,1,0,81,55,0,0,64,126,148,0,15,127,114,118,
-61,6,244,116,148,0,224,121,210,21,3,240,0,117,65,114,
-1,117,64,142,148,0,49,111,148,120,205,110,0,255,168,106,
-78,111,255,255,0,85,65,82,1,85,49,143,148,120,74,143,
-255,255,60,6,80,117,148,0,97,50,209,37,186,5,128,7,
+10,48,39,6,140,30,133,0,191,255,196,255,189,81,64,6,
+255,0,132,7,225,0,49,6,212,130,148,0,17,134,1,0,
+99,135,1,0,81,55,0,0,64,126,149,0,15,127,210,129,
+61,6,84,128,148,0,224,121,210,21,3,240,0,117,65,114,
+1,117,64,142,149,0,49,111,244,131,205,110,0,255,168,106,
+78,111,255,255,0,85,65,82,1,85,49,143,244,131,74,143,
+255,255,60,6,176,128,148,0,97,50,209,37,186,5,128,7,
 10,3,99,50,185,5,128,7,246,2,186,5,128,7,252,2,
 100,50,186,5,128,7,246,1,103,50,185,5,128,7,202,2,
 186,5,128,7,230,2,6,6,224,255,178,5,128,7,208,2,
 35,55,1,0,191,255,62,255,3,240,0,21,202,17,1,21,
-128,7,200,2,64,22,148,0,34,23,133,120,97,18,185,5,
+128,7,200,2,64,22,149,0,34,23,229,131,97,18,185,5,
 128,7,88,1,186,5,128,7,178,2,99,18,185,5,128,7,
 74,1,186,5,128,7,164,2,90,18,97,18,187,5,128,7,
 154,2,105,18,162,29,106,18,178,85,108,18,146,109,2,6,
@@ -13347,7 +13474,7 @@ unsigned char tw_fw_code[] __initdata = 
 0,133,61,127,0,0,65,130,1,133,207,126,0,255,168,122,
 80,127,255,255,0,101,65,98,1,101,61,95,0,0,76,95,
 255,255,128,7,150,1,35,55,1,0,28,56,191,255,190,253,
-0,234,181,13,10,48,29,56,194,58,46,6,84,117,148,0,
+0,234,181,13,10,48,29,56,194,58,46,6,180,128,148,0,
 206,57,191,255,168,253,65,234,60,111,1,0,99,87,1,0,
 237,233,150,245,128,7,100,1,35,55,1,0,29,56,165,181,
 3,240,0,101,65,98,1,101,157,95,1,0,76,95,255,255,
@@ -13368,43 +13495,43 @@ unsigned char tw_fw_code[] __initdata = 
 128,255,108,23,3,240,3,85,0,53,35,62,4,0,191,255,
 140,252,65,226,99,87,1,0,253,225,166,245,229,37,35,55,
 1,0,28,56,191,7,78,254,3,240,0,85,65,82,1,85,
-64,22,148,0,34,246,124,120,0,133,65,130,1,133,176,127,
-255,255,74,127,255,255,64,22,148,0,34,246,128,120,0,109,
+64,22,149,0,34,246,220,131,0,133,65,130,1,133,176,127,
+255,255,74,127,255,255,64,22,149,0,34,246,224,131,0,109,
 13,118,255,255,1,117,224,105,138,237,245,5,6,56,38,6,
-48,18,133,0,128,255,128,6,35,95,1,0,38,6,115,119,
+172,29,133,0,128,255,128,6,35,95,1,0,38,6,211,130,
 148,0,166,89,95,90,70,95,0,0,128,255,54,13,68,6,
-255,0,128,7,33,0,34,6,76,117,148,0,64,14,148,0,
-97,7,81,117,2,240,1,53,0,141,224,137,242,5,64,134,
-148,0,48,135,97,118,98,135,1,0,34,127,1,0,64,14,
-148,0,97,127,245,116,0,50,191,255,74,252,64,6,63,0,
-128,7,97,0,0,18,61,6,244,116,148,0,125,7,2,0,
+255,0,128,7,33,0,34,6,172,128,148,0,64,14,149,0,
+97,7,177,128,2,240,1,53,0,141,224,137,242,5,64,134,
+149,0,48,135,193,129,98,135,1,0,34,127,1,0,64,14,
+149,0,97,127,85,128,0,50,191,255,74,252,64,6,63,0,
+128,7,97,0,0,18,61,6,84,128,148,0,125,7,2,0,
 224,49,154,13,7,48,61,62,2,0,61,70,4,0,128,255,
 214,23,229,5,97,50,218,5,7,48,128,255,208,23,10,16,
 93,23,0,0,0,50,191,255,12,252,64,6,127,0,128,7,
-225,0,6,224,64,14,148,0,97,231,245,116,199,238,255,0,
-64,14,148,0,97,239,249,116,197,13,29,48,220,49,1,58,
-128,255,70,4,64,134,148,0,48,135,41,117,224,129,218,5,
-29,120,95,234,224,121,170,245,64,110,148,0,45,111,41,117,
+225,0,6,224,64,14,149,0,97,231,85,128,199,238,255,0,
+64,14,149,0,97,239,89,128,197,13,29,48,220,49,1,58,
+128,255,70,4,64,134,149,0,48,135,137,128,224,129,218,5,
+29,120,95,234,224,121,170,245,64,110,149,0,45,111,137,128,
 224,105,234,55,0,0,191,255,188,251,64,6,255,0,128,7,
-33,0,128,255,20,4,64,14,148,0,97,87,245,116,64,134,
-148,0,48,135,41,117,224,129,234,55,0,0,191,255,150,251,
+33,0,128,255,20,4,64,14,149,0,97,87,85,128,64,134,
+149,0,48,135,137,128,224,129,234,55,0,0,191,255,150,251,
 64,6,63,0,128,7,225,0,6,224,28,232,133,13,64,142,
-148,0,49,143,41,117,224,137,138,13,65,234,29,48,1,58,
-128,255,214,3,224,81,202,245,188,233,64,14,148,0,97,239,
-245,116,64,118,148,0,46,119,41,117,224,113,234,55,0,0,
+149,0,49,143,137,128,224,137,138,13,65,234,29,48,1,58,
+128,255,214,3,224,81,202,245,188,233,64,14,149,0,97,239,
+85,128,64,118,149,0,46,119,137,128,224,113,234,55,0,0,
 191,255,82,251,64,6,255,0,128,7,225,0,6,232,8,224,
-128,255,246,3,64,142,148,0,49,143,41,117,224,137,218,5,
-29,48,28,56,128,255,4,7,64,118,148,0,46,119,41,117,
+128,255,246,3,64,142,149,0,49,143,137,128,224,137,218,5,
+29,48,28,56,128,255,4,7,64,118,149,0,46,119,137,128,
 224,113,234,55,0,0,191,255,28,251,64,6,255,0,128,7,
-225,240,6,192,7,216,155,0,61,6,40,117,148,0,24,224,
-27,208,149,37,64,22,148,0,34,246,120,120,0,133,28,48,
+225,240,6,192,7,216,155,0,61,6,136,128,148,0,24,224,
+27,208,149,37,64,22,149,0,34,246,216,131,0,133,28,48,
 65,130,1,133,1,66,176,207,255,255,25,56,128,255,154,3,
 61,119,1,0,224,113,186,21,28,48,1,58,128,255,58,3,
 249,81,194,5,1,18,125,23,1,0,61,111,1,0,224,105,
 234,5,65,226,26,96,95,210,224,97,218,221,61,95,1,0,
 224,89,218,5,24,48,27,56,128,255,128,6,61,127,1,0,
 224,121,234,55,0,0,191,255,156,250,64,6,255,240,128,7,
-225,241,6,192,7,184,8,216,155,0,57,6,40,117,148,0,
+225,241,6,192,7,184,8,216,155,0,57,6,136,128,148,0,
 1,226,24,232,23,208,23,16,184,17,97,18,186,13,29,48,
 27,56,1,66,128,255,34,3,57,231,1,0,224,225,146,77,
 213,77,98,18,250,29,29,48,27,56,1,66,128,255,10,3,
@@ -13418,63 +13545,63 @@ unsigned char tw_fw_code[] __initdata = 
 26,64,189,65,128,255,146,2,57,231,1,0,224,225,234,5,
 24,48,23,56,184,57,128,255,162,5,224,225,234,55,0,0,
 191,255,194,249,64,6,255,241,128,7,33,0,191,255,236,246,
-128,255,176,5,64,22,148,0,34,23,136,120,64,14,148,0,
-224,17,234,143,0,0,65,143,114,118,32,86,100,0,127,18,
-162,5,2,80,64,14,148,0,97,87,148,120,64,54,148,0,
-64,14,148,0,97,87,244,116,64,62,148,0,39,63,109,118,
-134,55,77,118,128,255,230,15,64,6,63,0,0,18,2,136,
-195,138,64,118,148,0,206,137,113,7,165,120,65,18,2,6,
-156,255,230,245,64,14,148,0,97,7,197,123,127,0,128,7,
-225,16,7,216,64,62,148,0,39,63,85,118,6,232,7,22,
+128,255,176,5,64,22,149,0,34,23,232,131,64,14,149,0,
+224,17,234,143,0,0,65,143,210,129,32,86,100,0,127,18,
+162,5,2,80,64,14,149,0,97,87,244,131,64,54,149,0,
+64,14,149,0,97,87,84,128,64,62,149,0,39,63,205,129,
+134,55,173,129,128,255,230,15,64,6,63,0,0,18,2,136,
+195,138,64,118,149,0,206,137,113,7,5,132,65,18,2,6,
+156,255,230,245,64,14,149,0,97,7,37,135,127,0,128,7,
+225,16,7,216,64,62,149,0,39,63,181,129,6,232,7,22,
 255,255,97,18,179,5,99,18,234,13,29,48,128,255,138,1,
-10,224,29,48,64,70,148,0,40,71,85,118,27,56,128,255,
-200,1,245,5,38,6,104,18,133,0,128,255,52,1,31,226,
-28,80,64,6,255,16,128,7,225,0,6,224,42,6,196,123,
+10,224,29,48,64,70,149,0,40,71,181,129,27,56,128,255,
+200,1,245,5,38,6,228,29,133,0,128,255,52,1,31,226,
+28,80,64,6,255,16,128,7,225,0,6,224,42,6,36,135,
 148,0,31,234,0,18,0,90,165,21,2,136,195,138,64,118,
-148,0,206,137,49,103,165,120,252,97,226,53,224,97,218,5,
+149,0,206,137,49,103,5,132,252,97,226,53,224,97,218,5,
 127,234,202,5,2,232,165,5,65,90,65,18,2,6,156,255,
 222,5,42,111,1,0,237,89,150,237,127,234,170,5,2,232,
 10,240,0,101,65,98,1,101,12,6,156,255,215,5,95,98,
-1,101,3,82,165,29,195,234,64,134,148,0,208,233,125,231,
-165,120,64,62,148,0,61,238,164,120,39,63,81,118,28,48,
-191,255,62,255,125,87,5,0,64,62,148,0,39,63,85,118,
+1,101,3,82,165,29,195,234,64,134,149,0,208,233,125,231,
+5,132,64,62,149,0,61,238,4,132,39,63,177,129,28,48,
+191,255,62,255,125,87,5,0,64,62,149,0,39,63,181,129,
 28,48,128,255,70,4,0,82,64,6,255,0,128,7,225,48,
-6,216,0,226,0,210,229,53,28,232,195,234,64,126,148,0,
-207,233,61,55,165,120,224,49,61,238,164,120,162,45,224,217,
+6,216,0,226,0,210,229,53,28,232,195,234,64,126,149,0,
+207,233,61,55,5,132,224,49,61,238,4,132,162,45,224,217,
 210,5,230,217,178,5,65,210,197,37,61,63,5,0,191,255,
-240,254,64,22,148,0,34,23,81,118,226,81,130,13,61,63,
-1,0,38,6,136,18,133,0,128,255,252,1,61,55,1,0,
-4,58,128,255,230,3,64,22,148,0,34,246,196,123,0,109,
+240,254,64,22,149,0,34,23,177,129,226,81,130,13,61,63,
+1,0,38,6,4,30,133,0,128,255,252,1,61,55,1,0,
+4,58,128,255,230,3,64,22,149,0,34,246,36,135,0,109,
 125,7,1,0,95,106,1,109,224,217,178,5,0,82,229,13,
-65,226,28,6,156,255,254,5,64,102,148,0,44,103,197,123,
+65,226,28,6,156,255,254,5,64,102,149,0,44,103,37,135,
 236,209,182,197,224,217,178,245,7,82,64,6,255,48,128,7,
-33,0,34,6,247,115,148,0,6,143,0,0,66,143,0,0,
-65,50,145,0,65,18,224,137,138,253,2,82,38,6,244,115,
+33,0,34,6,87,127,148,0,6,143,0,0,66,143,0,0,
+65,50,145,0,65,18,224,137,138,253,2,82,38,6,84,127,
 148,0,166,17,6,240,128,19,129,83,93,18,130,19,128,255,
-82,8,64,6,63,0,128,7,225,16,1,18,64,14,148,0,
-97,23,45,117,0,234,7,216,6,224,28,56,27,64,0,50,
-128,255,64,23,224,81,226,23,0,0,64,14,148,0,97,23,
-41,117,64,22,148,0,34,23,41,117,224,17,234,5,28,48,
-27,56,128,255,174,21,10,232,64,14,148,0,97,7,45,117,
-29,80,64,6,255,16,128,7,33,0,1,18,64,14,148,0,
-97,23,41,117,224,65,64,14,148,0,97,23,45,117,242,5,
-64,14,148,0,97,7,41,117,128,255,210,21,64,14,148,0,
-97,7,45,117,64,6,63,0,0,82,181,13,65,82,104,82,
+82,8,64,6,63,0,128,7,225,16,1,18,64,14,149,0,
+97,23,141,128,0,234,7,216,6,224,28,56,27,64,0,50,
+128,255,64,23,224,81,226,23,0,0,64,14,149,0,97,23,
+137,128,64,22,149,0,34,23,137,128,224,17,234,5,28,48,
+27,56,128,255,174,21,10,232,64,14,149,0,97,7,141,128,
+29,80,64,6,255,16,128,7,33,0,1,18,64,14,149,0,
+97,23,137,128,224,65,64,14,149,0,97,23,141,128,242,5,
+64,14,149,0,97,7,137,128,128,255,210,21,64,14,149,0,
+97,7,141,128,64,6,63,0,0,82,181,13,65,82,104,82,
 250,5,32,22,48,0,7,240,128,19,129,3,165,29,196,50,
 64,126,0,240,6,128,79,129,162,245,245,13,6,16,156,18,
 106,18,206,5,2,22,48,0,181,5,2,22,87,0,71,23,
 0,0,196,50,65,58,65,82,104,82,150,245,71,7,0,0,
 127,0,8,16,245,5,38,143,1,0,103,143,1,0,68,50,
 68,58,2,128,95,18,224,129,250,245,127,0,4,18,42,6,
-68,114,148,0,43,6,228,115,148,0,165,13,44,6,240,240,
+164,125,148,0,43,6,68,127,148,0,165,13,44,6,240,240,
 240,240,107,103,1,0,106,103,1,0,68,90,68,82,2,136,
 95,18,224,137,202,245,127,0,128,7,33,0,4,18,42,6,
-68,114,148,0,43,6,228,115,148,0,42,135,1,0,49,6,
+164,125,148,0,43,6,68,127,148,0,42,135,1,0,49,6,
 240,240,240,240,68,82,241,129,154,13,43,119,1,0,47,6,
-240,240,240,240,68,90,239,113,146,13,38,6,192,18,133,0,
+240,240,240,240,68,90,239,113,146,13,38,6,60,30,133,0,
 191,255,126,254,191,255,152,255,181,5,95,18,250,229,64,6,
 63,0,128,7,33,0,0,50,191,255,212,253,1,18,64,14,
-148,0,65,23,112,118,0,50,191,255,42,246,128,255,28,5,
+149,0,65,23,208,129,0,50,191,255,42,246,128,255,28,5,
 64,6,63,0,190,7,33,0,3,30,180,255,7,16,3,56,
 213,5,71,135,0,0,65,50,65,58,6,135,0,0,224,129,
 154,253,2,48,191,255,228,254,3,48,191,255,36,254,3,30,
@@ -13482,93 +13609,93 @@ unsigned char tw_fw_code[] __initdata = 
 128,255,76,16,10,232,1,50,128,255,68,16,10,16,98,234,
 146,21,99,234,242,53,108,234,177,93,146,21,110,234,225,21,
 162,77,29,6,240,255,201,53,210,45,29,6,236,255,130,69,
-245,77,2,48,128,255,240,0,1,82,181,117,64,14,148,0,
-33,246,64,117,0,229,1,21,133,101,64,86,148,0,42,87,
-97,118,31,226,224,81,146,93,64,14,148,0,97,7,57,117,
-64,14,148,0,97,7,61,117,64,14,148,0,33,246,52,117,
-0,229,224,17,1,21,146,77,64,14,148,0,97,87,57,117,
+245,77,2,48,128,255,240,0,1,82,181,117,64,14,149,0,
+33,246,160,128,0,229,1,21,133,101,64,86,149,0,42,87,
+193,129,31,226,224,81,146,93,64,14,149,0,97,7,153,128,
+64,14,149,0,97,7,157,128,64,14,149,0,33,246,148,128,
+0,229,224,17,1,21,146,77,64,14,149,0,97,87,153,128,
 197,69,29,48,2,56,128,255,24,16,10,224,229,61,2,54,
-255,255,0,58,1,66,191,255,0,254,64,134,148,0,48,135,
-41,117,224,129,234,223,0,0,27,224,128,225,229,45,0,218,
-0,226,181,45,64,230,148,0,64,126,148,0,47,127,97,118,
-60,231,69,117,224,121,154,37,61,6,14,0,1,0,64,110,
+255,255,0,58,1,66,191,255,0,254,64,134,149,0,48,135,
+137,128,224,129,234,223,0,0,27,224,128,225,229,45,0,218,
+0,226,181,45,64,230,149,0,64,126,149,0,47,127,193,129,
+60,231,165,128,224,121,154,37,61,6,14,0,1,0,64,110,
 224,255,29,112,77,113,1,218,210,5,4,50,191,255,6,245,
 197,173,64,94,255,255,29,96,75,97,242,13,8,18,64,14,
-148,0,65,23,244,116,64,14,148,0,97,239,249,116,4,50,
-191,255,226,244,27,80,213,13,28,48,64,70,148,0,40,71,
-161,120,27,56,191,255,220,241,64,86,148,0,42,87,161,120,
-64,6,255,16,128,7,33,0,64,14,148,0,97,7,57,117,
-64,14,148,0,97,7,53,117,31,18,64,14,148,0,97,23,
-65,117,64,14,148,0,97,7,77,117,6,18,64,14,148,0,
-65,23,244,116,64,14,148,0,97,55,249,116,4,50,191,255,
+149,0,65,23,84,128,64,14,149,0,97,239,89,128,4,50,
+191,255,226,244,27,80,213,13,28,48,64,70,149,0,40,71,
+1,132,27,56,191,255,220,241,64,86,149,0,42,87,1,132,
+64,6,255,16,128,7,33,0,64,14,149,0,97,7,153,128,
+64,14,149,0,97,7,149,128,31,18,64,14,149,0,97,23,
+161,128,64,14,149,0,97,7,173,128,6,18,64,14,149,0,
+65,23,84,128,64,14,149,0,97,55,89,128,4,50,191,255,
 132,244,128,255,148,16,64,6,63,0,128,7,33,0,1,18,
-64,14,148,0,97,23,37,117,128,255,88,0,128,255,62,18,
-31,18,64,14,148,0,97,23,109,118,128,255,42,17,64,142,
-148,0,49,143,97,118,224,137,234,5,31,18,64,14,148,0,
-97,23,69,117,191,255,116,241,191,255,132,253,64,14,148,0,
-97,7,153,120,64,6,63,0,128,7,225,0,6,232,7,224,
+64,14,149,0,97,23,133,128,128,255,88,0,128,255,62,18,
+31,18,64,14,149,0,97,23,205,129,128,255,42,17,64,142,
+149,0,49,143,193,129,224,137,234,5,31,18,64,14,149,0,
+97,23,165,128,191,255,116,241,191,255,132,253,64,14,149,0,
+97,7,249,131,64,6,63,0,128,7,225,0,6,232,7,224,
 128,255,114,17,29,48,28,56,128,255,224,19,64,6,255,0,
 128,7,33,0,128,255,208,19,128,255,210,19,64,6,63,0,
 128,7,33,0,128,255,194,19,128,255,196,19,64,6,63,0,
 128,7,225,16,7,216,6,224,128,255,224,16,10,232,224,233,
-170,5,8,234,41,6,36,117,148,0,221,142,2,0,178,109,
-64,134,148,0,34,6,72,117,148,0,2,240,0,125,48,135,
-97,118,65,122,1,125,239,129,203,13,64,14,148,0,97,7,
-73,117,64,22,148,0,34,246,68,117,0,117,65,114,1,117,
-64,22,148,0,34,111,57,117,224,105,34,22,56,117,210,37,
-2,240,0,101,45,6,52,117,148,0,95,98,1,101,186,13,
-13,240,64,86,148,0,42,87,105,118,0,93,170,89,1,93,
-98,135,1,0,13,240,64,134,148,0,48,135,101,118,0,141,
-176,137,1,141,172,13,1,82,64,14,148,0,97,87,61,117,
-98,7,1,0,109,7,1,0,64,126,148,0,47,127,77,117,
-224,121,146,37,41,119,1,0,224,113,218,29,64,22,148,0,
-34,111,81,117,13,6,196,255,34,22,80,117,209,13,13,102,
-1,0,194,106,98,103,1,0,64,126,148,0,59,119,1,0,
-207,105,109,119,85,117,34,111,1,0,13,6,196,255,186,5,
+170,5,8,234,41,6,132,128,148,0,221,142,2,0,178,109,
+64,134,149,0,34,6,168,128,148,0,2,240,0,125,48,135,
+193,129,65,122,1,125,239,129,203,13,64,14,149,0,97,7,
+169,128,64,22,149,0,34,246,164,128,0,117,65,114,1,117,
+64,22,149,0,34,111,153,128,224,105,34,22,152,128,210,37,
+2,240,0,101,45,6,148,128,148,0,95,98,1,101,186,13,
+13,240,64,86,149,0,42,87,201,129,0,93,170,89,1,93,
+98,135,1,0,13,240,64,134,149,0,48,135,197,129,0,141,
+176,137,1,141,172,13,1,82,64,14,149,0,97,87,157,128,
+98,7,1,0,109,7,1,0,64,126,149,0,47,127,173,128,
+224,121,146,37,41,119,1,0,224,113,218,29,64,22,149,0,
+34,111,177,128,13,6,196,255,34,22,176,128,209,13,13,102,
+1,0,194,106,98,103,1,0,64,126,149,0,59,119,1,0,
+207,105,109,119,181,128,34,111,1,0,13,6,196,255,186,5,
 157,238,16,0,221,102,25,0,186,5,31,82,197,61,41,95,
-1,0,224,89,130,45,64,86,148,0,42,87,45,117,224,81,
+1,0,224,89,130,45,64,86,149,0,42,87,141,128,224,81,
 226,13,28,48,128,255,148,13,224,81,146,13,1,18,64,14,
-148,0,97,23,41,117,32,86,156,255,213,37,129,234,249,5,
-1,18,64,14,148,0,97,23,49,117,133,229,59,55,1,0,
+149,0,97,23,137,128,32,86,156,255,213,37,129,234,249,5,
+1,18,64,14,149,0,97,23,145,128,133,229,59,55,1,0,
 28,56,128,255,18,12,128,255,192,14,191,255,166,254,191,255,
-122,228,133,5,64,14,148,0,97,7,49,117,1,18,105,23,
-1,0,64,14,148,0,97,239,153,120,0,82,64,14,148,0,
-97,231,157,120,64,6,255,16,128,7,97,0,128,255,56,13,
-64,22,148,0,34,23,73,118,61,6,224,123,148,0,194,18,
-221,17,34,119,1,0,47,6,198,194,129,0,239,113,250,5,
-64,110,148,0,45,111,93,118,98,111,1,0,191,255,188,251,
-64,102,148,0,44,103,161,120,224,97,178,5,128,255,214,7,
-64,86,148,0,42,87,153,120,202,94,17,0,194,13,9,18,
-129,82,169,5,7,18,64,14,148,0,65,23,244,116,4,50,
-191,255,18,242,64,14,148,0,193,223,152,120,146,13,64,54,
-148,0,38,55,157,120,128,255,86,9,224,81,178,5,191,255,
-222,236,64,134,148,0,48,135,73,118,194,130,221,129,48,111,
-1,0,64,14,148,0,97,111,93,118,128,255,216,12,64,6,
-127,0,128,7,97,0,128,255,18,13,64,22,148,0,34,23,
-73,118,61,6,224,123,148,0,194,18,221,17,34,119,1,0,
-47,6,68,195,129,0,239,113,250,5,64,110,148,0,45,111,
-93,118,98,111,1,0,191,255,18,251,64,102,148,0,44,103,
-161,120,224,97,178,5,128,255,44,7,64,86,148,0,42,87,
-153,120,202,94,17,0,194,13,9,18,129,82,169,5,7,18,
-64,14,148,0,65,23,244,116,4,50,191,255,104,241,64,14,
-148,0,193,223,152,120,146,13,64,54,148,0,38,55,157,120,
-128,255,172,8,224,81,178,5,191,255,52,236,64,134,148,0,
-48,135,73,118,194,130,221,129,48,111,1,0,64,14,148,0,
-97,111,93,118,128,255,188,12,64,6,127,0,128,7,33,0,
-128,255,80,13,64,14,148,0,97,7,69,117,64,14,148,0,
-97,7,49,117,64,6,63,0,64,22,148,0,34,246,208,123,
+122,228,133,5,64,14,149,0,97,7,145,128,1,18,105,23,
+1,0,64,14,149,0,97,239,249,131,0,82,64,14,149,0,
+97,231,253,131,64,6,255,16,128,7,97,0,128,255,56,13,
+64,22,149,0,34,23,169,129,61,6,64,135,148,0,194,18,
+221,17,34,119,1,0,47,6,106,203,129,0,239,113,250,5,
+64,110,149,0,45,111,189,129,98,111,1,0,191,255,188,251,
+64,102,149,0,44,103,1,132,224,97,178,5,128,255,214,7,
+64,86,149,0,42,87,249,131,202,94,17,0,194,13,9,18,
+129,82,169,5,7,18,64,14,149,0,65,23,84,128,4,50,
+191,255,18,242,64,14,149,0,193,223,248,131,146,13,64,54,
+149,0,38,55,253,131,128,255,86,9,224,81,178,5,191,255,
+222,236,64,134,149,0,48,135,169,129,194,130,221,129,48,111,
+1,0,64,14,149,0,97,111,189,129,128,255,216,12,64,6,
+127,0,128,7,97,0,128,255,18,13,64,22,149,0,34,23,
+169,129,61,6,64,135,148,0,194,18,221,17,34,119,1,0,
+47,6,232,203,129,0,239,113,250,5,64,110,149,0,45,111,
+189,129,98,111,1,0,191,255,18,251,64,102,149,0,44,103,
+1,132,224,97,178,5,128,255,44,7,64,86,149,0,42,87,
+249,131,202,94,17,0,194,13,9,18,129,82,169,5,7,18,
+64,14,149,0,65,23,84,128,4,50,191,255,104,241,64,14,
+149,0,193,223,248,131,146,13,64,54,149,0,38,55,253,131,
+128,255,172,8,224,81,178,5,191,255,52,236,64,134,149,0,
+48,135,169,129,194,130,221,129,48,111,1,0,64,14,149,0,
+97,111,189,129,128,255,188,12,64,6,127,0,128,7,33,0,
+128,255,80,13,64,14,149,0,97,7,165,128,64,14,149,0,
+97,7,145,128,64,6,63,0,64,22,149,0,34,246,48,135,
 2,82,128,83,130,3,32,86,20,0,129,83,131,83,64,14,
-148,0,97,7,213,123,64,14,148,0,97,7,205,123,64,14,
-148,0,97,7,49,117,127,0,128,7,225,16,6,224,7,216,
+149,0,97,7,53,135,64,14,149,0,97,7,45,135,64,14,
+149,0,97,7,145,128,127,0,128,7,225,16,6,224,7,216,
 0,82,224,225,194,13,0,232,245,5,220,81,10,55,0,0,
 128,255,130,12,65,234,29,80,251,233,134,253,64,6,255,16,
-128,7,225,243,6,224,7,176,58,6,48,117,148,0,28,192,
+128,7,225,243,6,224,7,176,58,6,144,128,148,0,28,192,
 128,255,140,12,10,16,224,17,222,5,58,143,1,0,224,137,
 130,253,58,135,1,0,224,129,162,5,0,18,2,232,157,0,
 29,216,0,202,149,13,128,255,102,12,10,16,88,23,0,0,
 194,201,65,194,153,0,224,17,230,5,27,104,95,218,155,0,
 224,105,170,245,224,17,166,13,58,103,1,0,224,97,234,5,
-128,255,60,12,10,16,2,184,151,0,56,6,212,123,148,0,
+128,255,60,12,10,16,2,184,151,0,56,6,52,135,148,0,
 224,17,142,29,106,234,178,5,109,234,218,61,65,218,253,217,
 242,5,156,23,1,0,106,18,178,5,109,18,202,53,28,48,
 191,255,242,239,28,48,10,56,191,255,64,255,120,7,1,0,
@@ -13578,57 +13705,57 @@ unsigned char tw_fw_code[] __initdata = 
 54,0,122,7,1,0,149,157,156,135,1,0,16,6,236,255,
 218,13,56,119,1,0,188,127,1,0,239,113,207,5,128,255,
 74,0,181,141,128,255,16,0,133,141,120,7,1,0,29,80,
-64,6,255,243,128,7,33,0,38,6,208,123,148,0,64,22,
-148,0,34,23,213,123,6,240,130,19,2,142,20,0,131,139,
-4,58,191,255,182,254,64,22,148,0,34,246,212,123,0,133,
-65,130,1,133,64,6,63,0,128,7,33,0,64,22,148,0,
-34,246,212,123,0,141,64,22,148,0,65,138,1,141,34,54,
-115,119,162,63,115,119,66,58,191,255,128,254,64,6,63,0,
-128,7,225,0,6,232,64,142,148,0,49,143,213,123,157,231,
-1,0,224,137,226,29,64,22,148,0,34,246,204,123,0,125,
-65,122,1,125,15,6,235,255,185,13,64,14,148,0,97,7,
-205,123,38,6,202,19,133,0,191,255,70,247,133,5,189,119,
-1,0,98,114,226,5,38,6,222,19,133,0,191,255,50,247,
+64,6,255,243,128,7,33,0,38,6,48,135,148,0,64,22,
+149,0,34,23,53,135,6,240,130,19,2,142,20,0,131,139,
+4,58,191,255,182,254,64,22,149,0,34,246,52,135,0,133,
+65,130,1,133,64,6,63,0,128,7,33,0,64,22,149,0,
+34,246,52,135,0,141,64,22,149,0,65,138,1,141,34,54,
+211,130,162,63,211,130,66,58,191,255,128,254,64,6,63,0,
+128,7,225,0,6,232,64,142,149,0,49,143,53,135,157,231,
+1,0,224,137,226,29,64,22,149,0,34,246,44,135,0,125,
+65,122,1,125,15,6,235,255,185,13,64,14,149,0,97,7,
+45,135,38,6,70,31,133,0,191,255,70,247,133,5,189,119,
+1,0,98,114,226,5,38,6,90,31,133,0,191,255,50,247,
 0,18,29,86,1,0,229,5,138,111,1,0,205,17,130,0,
 65,82,28,88,221,89,65,90,235,81,241,245,74,23,0,0,
 28,62,2,0,29,48,191,255,2,254,189,119,1,0,98,114,
-130,13,64,22,148,0,34,246,212,123,0,109,65,106,1,109,
-64,6,255,0,32,142,3,14,64,14,148,0,97,143,69,118,
-3,130,64,14,148,0,97,135,77,118,32,126,32,0,64,14,
-148,0,97,127,73,118,128,118,64,248,64,14,148,0,97,119,
-81,118,2,106,64,14,148,0,97,111,85,118,32,102,0,16,
-64,14,148,0,97,103,89,118,64,14,148,0,97,7,234,125,
-127,0,128,7,225,112,2,210,64,142,148,0,49,143,73,118,
-17,128,194,130,16,136,46,6,224,123,148,0,17,120,206,121,
+130,13,64,22,149,0,34,246,52,135,0,109,65,106,1,109,
+64,6,255,0,32,142,3,14,64,14,149,0,97,143,165,129,
+3,130,64,14,149,0,97,135,173,129,32,126,32,0,64,14,
+149,0,97,127,169,129,128,118,64,248,64,14,149,0,97,119,
+177,129,2,106,64,14,149,0,97,111,181,129,32,102,0,16,
+64,14,149,0,97,103,185,129,64,14,149,0,97,7,74,137,
+127,0,128,7,225,112,2,210,64,142,149,0,49,143,169,129,
+17,128,194,130,16,136,46,6,64,135,148,0,17,120,206,121,
 47,239,1,0,29,48,2,58,191,255,174,246,202,0,10,16,
 2,104,13,96,167,98,204,94,15,0,11,80,138,0,10,200,
 2,136,17,128,165,130,208,126,63,0,15,112,142,0,14,216,
 25,104,107,106,211,13,2,208,208,210,29,102,2,0,12,48,
 2,58,191,255,116,246,10,224,26,225,4,210,165,5,2,224,
-64,14,148,0,97,7,234,125,25,88,107,90,250,69,1,82,
-64,14,148,0,97,87,234,125,29,142,2,0,64,14,148,0,
-97,143,245,125,64,54,148,0,38,55,245,125,2,58,191,255,
-56,246,202,0,64,14,148,0,97,87,236,125,64,54,148,0,
-38,55,245,125,64,70,148,0,40,71,85,118,128,62,64,248,
-191,255,102,246,64,54,148,0,38,55,245,125,64,134,148,0,
-48,135,85,118,16,56,191,255,114,249,28,120,131,122,207,118,
+64,14,149,0,97,7,74,137,25,88,107,90,250,69,1,82,
+64,14,149,0,97,87,74,137,29,142,2,0,64,14,149,0,
+97,143,85,137,64,54,149,0,38,55,85,137,2,58,191,255,
+56,246,202,0,64,14,149,0,97,87,76,137,64,54,149,0,
+38,55,85,137,64,70,149,0,40,71,181,129,128,62,64,248,
+191,255,102,246,64,54,149,0,38,55,85,137,64,134,149,0,
+48,135,181,129,16,56,191,255,114,249,28,120,131,122,207,118,
 14,0,28,104,135,106,205,102,240,1,12,216,14,217,27,88,
 136,90,11,80,128,81,32,134,0,254,10,136,80,137,27,16,
 17,17,2,120,207,233,128,7,204,2,27,112,98,114,170,45,
 28,104,139,106,205,102,31,0,224,97,138,37,26,88,11,80,
-221,81,220,142,31,0,17,120,194,122,15,128,45,6,224,123,
+221,81,220,142,31,0,17,120,194,122,15,128,45,6,64,135,
 148,0,16,112,205,113,46,95,1,0,11,96,193,98,12,216,
 202,217,27,80,193,82,10,48,2,58,191,255,140,245,10,16,
 2,136,218,137,209,233,128,7,124,2,26,128,208,233,128,7,
 116,2,27,120,99,122,186,29,28,112,139,114,206,110,31,0,
 224,105,154,21,220,102,31,0,12,80,194,82,10,88,48,6,
-224,123,148,0,11,136,208,137,49,239,1,0,30,122,79,233,
+64,135,148,0,11,136,208,137,49,239,1,0,30,122,79,233,
 128,7,66,2,26,112,206,233,128,7,58,2,27,104,13,6,
 240,255,210,5,27,96,12,6,239,255,170,45,28,88,139,90,
-203,86,31,0,224,81,138,37,48,6,224,123,148,0,16,142,
+203,86,31,0,224,81,138,37,48,6,64,135,148,0,16,142,
 212,0,220,126,63,0,15,112,193,114,49,111,1,0,14,216,
 205,217,27,48,2,58,191,255,0,245,202,0,10,16,43,6,
-224,123,148,0,11,102,212,0,2,80,44,143,1,0,10,232,
+64,135,148,0,11,102,212,0,2,80,44,143,1,0,10,232,
 209,233,128,7,224,1,26,128,208,233,128,7,216,1,27,120,
 15,6,207,255,234,13,28,112,155,114,206,110,31,0,224,105,
 202,5,70,234,128,7,190,1,26,96,204,233,128,7,182,1,
@@ -13641,14 +13768,14 @@ unsigned char tw_fw_code[] __initdata = 
 144,90,203,86,1,0,10,136,193,138,17,128,12,129,16,120,
 207,0,15,80,220,118,31,0,14,110,236,255,32,102,0,8,
 12,16,237,23,160,0,10,88,2,80,75,81,224,81,130,45,
-48,6,224,123,148,0,16,142,12,0,28,120,144,122,15,112,
+48,6,64,135,148,0,16,142,12,0,28,120,144,122,15,112,
 193,114,206,110,124,0,49,95,1,0,13,96,203,97,2,80,
 10,128,194,130,16,136,17,126,252,255,15,216,204,217,27,48,
 2,58,191,255,244,243,10,232,27,118,2,0,14,48,2,58,
 191,255,230,243,10,16,2,104,208,106,13,233,181,109,220,102,
-31,0,12,80,194,82,10,88,48,6,224,123,148,0,11,136,
+31,0,12,80,194,82,10,88,48,6,64,135,148,0,11,136,
 208,137,49,239,1,0,229,93,220,126,31,0,15,104,194,106,
-13,112,43,6,224,123,148,0,14,96,203,97,44,239,1,0,
+13,112,43,6,64,135,148,0,14,96,203,97,44,239,1,0,
 149,85,26,80,202,233,229,77,27,136,17,6,196,255,210,5,
 27,128,16,6,195,255,250,53,220,126,1,0,224,121,186,21,
 46,6,254,255,63,0,28,216,78,217,27,104,149,106,13,96,
@@ -13658,108 +13785,108 @@ unsigned char tw_fw_code[] __initdata = 
 186,5,70,234,245,29,28,96,155,98,0,90,224,89,130,13,
 220,86,31,0,10,6,229,255,186,5,72,234,181,21,26,136,
 209,233,133,21,48,6,68,1,224,7,240,225,154,13,46,6,
-224,123,148,0,14,126,196,0,47,239,1,0,181,5,26,104,
-205,233,64,14,148,0,97,239,241,125,29,48,2,58,191,255,
-248,242,202,0,64,14,148,0,97,87,232,125,29,48,64,70,
-148,0,40,71,85,118,128,62,64,248,191,255,44,243,29,48,
-64,102,148,0,44,103,85,118,12,56,191,255,62,246,64,6,
-255,112,128,7,33,0,64,54,148,0,38,55,241,125,64,142,
-148,0,241,143,233,125,17,56,64,70,148,0,40,71,85,118,
-191,255,246,242,64,54,148,0,38,55,241,125,64,134,148,0,
-48,135,85,118,16,56,191,255,2,246,64,126,148,0,239,127,
-235,125,224,121,178,29,64,54,148,0,38,55,245,125,64,118,
-148,0,238,119,237,125,14,56,64,70,148,0,40,71,85,118,
-191,255,182,242,64,54,148,0,38,55,245,125,64,110,148,0,
-45,111,85,118,13,56,191,255,194,245,43,6,224,123,148,0,
+64,135,148,0,14,126,196,0,47,239,1,0,181,5,26,104,
+205,233,64,14,149,0,97,239,81,137,29,48,2,58,191,255,
+248,242,202,0,64,14,149,0,97,87,72,137,29,48,64,70,
+149,0,40,71,181,129,128,62,64,248,191,255,44,243,29,48,
+64,102,149,0,44,103,181,129,12,56,191,255,62,246,64,6,
+255,112,128,7,33,0,64,54,149,0,38,55,81,137,64,142,
+149,0,241,143,73,137,17,56,64,70,149,0,40,71,181,129,
+191,255,246,242,64,54,149,0,38,55,81,137,64,134,149,0,
+48,135,181,129,16,56,191,255,2,246,64,126,149,0,239,127,
+75,137,224,121,178,29,64,54,149,0,38,55,85,137,64,118,
+149,0,238,119,77,137,14,56,64,70,149,0,40,71,181,129,
+191,255,182,242,64,54,149,0,38,55,85,137,64,110,149,0,
+45,111,181,129,13,56,191,255,194,245,43,6,64,135,148,0,
 11,102,204,0,12,80,42,143,1,0,94,138,106,143,1,0,
-64,14,148,0,97,7,236,125,64,14,148,0,97,7,232,125,
-64,14,148,0,97,7,234,125,64,6,63,0,128,7,33,0,
-6,16,130,0,2,128,194,130,16,136,46,6,224,123,148,0,
-17,120,206,121,47,111,1,0,64,14,148,0,97,111,245,116,
+64,14,149,0,97,7,76,137,64,14,149,0,97,7,72,137,
+64,14,149,0,97,7,74,137,64,6,63,0,128,7,33,0,
+6,16,130,0,2,128,194,130,16,136,46,6,64,135,148,0,
+17,120,206,121,47,111,1,0,64,14,149,0,97,111,85,128,
 0,50,191,255,144,233,64,6,63,0,128,7,33,0,6,16,
-130,0,2,128,194,130,16,136,46,6,224,123,148,0,17,120,
+130,0,2,128,194,130,16,136,46,6,64,135,148,0,17,120,
 206,121,111,63,1,0,0,50,191,255,106,233,64,6,63,0,
 0,66,38,79,1,0,0,18,2,128,194,130,16,136,46,6,
-228,124,148,0,17,120,206,121,2,96,194,98,12,104,42,6,
-224,123,148,0,13,88,202,89,43,143,1,0,47,135,1,0,
+68,136,148,0,17,120,206,121,2,96,194,98,12,104,42,6,
+64,135,148,0,13,88,202,89,43,143,1,0,47,135,1,0,
 241,129,178,5,65,66,168,0,65,18,162,0,2,120,15,6,
 191,255,182,229,65,74,9,118,255,255,8,104,141,0,78,111,
-0,0,0,18,2,88,194,90,11,96,49,6,228,124,148,0,
-12,80,209,81,2,120,194,122,15,128,45,6,224,123,148,0,
+0,0,0,18,2,88,194,90,11,96,49,6,68,136,148,0,
+12,80,209,81,2,120,194,122,15,128,45,6,64,135,148,0,
 16,112,205,113,46,103,1,0,42,95,1,0,236,89,130,13,
 65,74,9,86,255,255,2,136,145,0,74,143,0,0,65,18,
 162,0,2,128,16,6,191,255,230,221,102,79,1,0,127,0,
-128,7,33,0,38,6,224,123,148,0,39,6,228,124,148,0,
+128,7,33,0,38,6,64,135,148,0,39,6,68,136,148,0,
 32,70,65,0,191,255,222,241,64,6,63,0,128,7,225,0,
 6,224,28,16,32,150,68,0,242,17,242,5,32,150,96,0,
-242,17,146,29,128,7,162,1,64,142,148,0,49,143,73,118,
-17,128,194,130,16,136,46,6,224,123,148,0,17,120,206,121,
+242,17,146,29,128,7,162,1,64,142,149,0,49,143,169,129,
+17,128,194,130,16,136,46,6,64,135,148,0,17,120,206,121,
 47,111,1,0,92,106,111,111,1,0,191,255,124,242,10,16,
-128,7,144,1,64,102,148,0,44,103,73,118,12,88,194,90,
-11,96,49,6,224,123,148,0,12,80,209,81,42,135,1,0,
-94,130,106,135,1,0,64,126,148,0,47,127,161,120,224,121,
-226,77,64,118,148,0,46,119,73,118,14,104,194,106,13,112,
-43,6,224,123,148,0,14,96,203,97,44,55,1,0,2,58,
-191,255,118,240,10,232,208,234,64,142,148,0,49,143,73,118,
-17,128,194,130,16,136,46,6,224,123,148,0,17,120,206,121,
+128,7,144,1,64,102,149,0,44,103,169,129,12,88,194,90,
+11,96,49,6,64,135,148,0,12,80,209,81,42,135,1,0,
+94,130,106,135,1,0,64,126,149,0,47,127,1,132,224,121,
+226,77,64,118,149,0,46,119,169,129,14,104,194,106,13,112,
+43,6,64,135,148,0,14,96,203,97,44,55,1,0,2,58,
+191,255,118,240,10,232,208,234,64,142,149,0,49,143,169,129,
+17,128,194,130,16,136,46,6,64,135,148,0,17,120,206,121,
 47,87,1,0,66,82,10,48,2,58,191,255,76,240,10,233,
 29,104,135,106,205,102,15,0,12,88,139,0,11,16,49,6,
 1,0,224,7,29,80,81,81,64,134,224,7,240,81,154,21,
 2,120,103,122,225,13,2,112,111,114,187,13,3,106,64,14,
-148,0,65,111,244,116,64,14,148,0,97,231,249,116,213,101,
-1,98,64,14,148,0,65,103,244,116,245,93,64,94,148,0,
-43,95,73,118,11,80,194,82,10,88,48,6,224,123,148,0,
+149,0,65,111,84,128,64,14,149,0,97,231,89,128,213,101,
+1,98,64,14,149,0,65,103,84,128,245,93,64,94,149,0,
+43,95,169,129,11,80,194,82,10,88,48,6,64,135,148,0,
 11,136,208,137,49,55,1,0,2,58,191,255,220,239,128,22,
-64,248,226,81,234,5,64,14,148,0,65,7,244,116,213,69,
-64,126,148,0,47,127,73,118,15,112,194,114,14,120,44,6,
-224,123,148,0,15,104,204,105,45,55,1,0,2,58,191,255,
-168,239,128,22,64,216,226,81,218,29,7,90,64,14,148,0,
-65,95,244,116,64,86,148,0,42,87,73,118,10,136,194,138,
-17,80,47,6,224,123,148,0,10,128,207,129,48,55,1,0,
-64,118,148,0,238,119,5,126,14,56,2,66,191,255,186,239,
-197,21,3,106,64,14,148,0,65,111,244,116,64,14,148,0,
-97,231,249,116,165,13,3,98,64,14,148,0,65,103,244,116,
-64,14,148,0,97,231,249,116,4,50,191,255,216,230,1,18,
+64,248,226,81,234,5,64,14,149,0,65,7,84,128,213,69,
+64,126,149,0,47,127,169,129,15,112,194,114,14,120,44,6,
+64,135,148,0,15,104,204,105,45,55,1,0,2,58,191,255,
+168,239,128,22,64,216,226,81,218,29,7,90,64,14,149,0,
+65,95,84,128,64,86,149,0,42,87,169,129,10,136,194,138,
+17,80,47,6,64,135,148,0,10,128,207,129,48,55,1,0,
+64,118,149,0,238,119,101,137,14,56,2,66,191,255,186,239,
+197,21,3,106,64,14,149,0,65,111,84,128,64,14,149,0,
+97,231,89,128,165,13,3,98,64,14,149,0,65,103,84,128,
+64,14,149,0,97,231,89,128,4,50,191,255,216,230,1,18,
 2,80,64,6,255,0,92,26,99,7,2,0,1,138,67,143,
 2,0,35,135,2,0,97,130,186,5,0,18,149,13,35,127,
 2,0,15,6,0,255,186,5,1,18,165,5,1,18,2,80,
-68,26,127,0,128,7,33,0,6,16,2,138,64,14,148,0,
-65,143,244,116,64,14,148,0,97,23,249,116,64,14,148,0,
-97,63,253,116,4,50,191,255,124,230,64,6,63,0,128,7,
-33,0,191,255,164,255,170,0,64,14,148,0,65,87,244,116,
-32,142,3,14,64,14,148,0,97,143,249,116,32,134,32,0,
-64,14,148,0,97,135,253,116,3,122,64,14,148,0,97,127,
-1,117,31,114,64,14,148,0,97,119,25,117,4,106,64,14,
-148,0,97,111,29,117,64,6,63,0,224,49,154,21,64,142,
-133,0,49,143,69,36,64,14,148,0,97,143,217,123,48,6,
-44,195,129,0,64,14,133,0,97,135,69,36,149,13,64,126,
-148,0,47,127,217,123,64,14,133,0,97,127,69,36,127,0,
-128,7,32,22,224,57,162,13,48,6,224,123,148,0,16,142,
-152,0,17,120,207,31,0,0,149,13,45,6,224,123,148,0,
-13,118,152,0,14,96,204,159,0,0,42,6,224,123,148,0,
-10,94,40,0,107,55,1,0,64,142,148,0,49,143,73,118,
-17,128,194,130,16,136,46,6,224,123,148,0,17,120,206,121,
+68,26,127,0,128,7,33,0,6,16,2,138,64,14,149,0,
+65,143,84,128,64,14,149,0,97,23,89,128,64,14,149,0,
+97,63,93,128,4,50,191,255,124,230,64,6,63,0,128,7,
+33,0,191,255,164,255,170,0,64,14,149,0,65,87,84,128,
+32,142,3,14,64,14,149,0,97,143,89,128,32,134,32,0,
+64,14,149,0,97,135,93,128,3,122,64,14,149,0,97,127,
+97,128,31,114,64,14,149,0,97,119,121,128,4,106,64,14,
+149,0,97,111,125,128,64,6,63,0,224,49,154,21,64,142,
+133,0,49,143,205,47,64,14,149,0,97,143,57,135,48,6,
+208,203,129,0,64,14,133,0,97,135,205,47,149,13,64,126,
+149,0,47,127,57,135,64,14,133,0,97,127,205,47,127,0,
+128,7,32,22,224,57,162,13,48,6,64,135,148,0,16,142,
+152,0,17,120,207,31,0,0,149,13,45,6,64,135,148,0,
+13,118,152,0,14,96,204,159,0,0,42,6,64,135,148,0,
+10,94,40,0,107,55,1,0,64,142,149,0,49,143,169,129,
+17,128,194,130,16,136,46,6,64,135,148,0,17,120,206,121,
 47,111,1,0,68,106,111,111,1,0,127,0,128,7,33,0,
-6,16,100,18,238,13,48,6,224,123,148,0,16,142,24,0,
+6,16,100,18,238,13,48,6,64,135,148,0,16,142,24,0,
 2,112,194,114,14,120,15,104,209,105,45,23,1,0,165,21,
-43,6,224,123,148,0,11,102,12,0,2,136,194,138,17,80,
+43,6,64,135,148,0,11,102,12,0,2,136,194,138,17,80,
 44,127,1,0,10,128,207,129,16,48,4,58,191,255,186,237,
 10,16,2,80,64,6,63,0,0,18,2,80,127,0,31,18,
 2,80,127,0,128,7,33,0,191,255,42,220,202,22,128,0,
-224,17,202,13,38,6,56,112,148,0,39,6,224,123,148,0,
-32,70,65,0,191,255,78,238,181,13,38,6,64,113,148,0,
-39,6,224,123,148,0,32,70,65,0,191,255,56,238,64,6,
+224,17,202,13,38,6,152,123,148,0,39,6,64,135,148,0,
+32,70,65,0,191,255,78,238,181,13,38,6,160,124,148,0,
+39,6,64,135,148,0,32,70,65,0,191,255,56,238,64,6,
 63,0,128,7,33,0,191,255,236,219,202,22,128,0,224,17,
-202,13,38,6,224,123,148,0,39,6,56,112,148,0,32,70,
-65,0,191,255,16,238,181,13,38,6,224,123,148,0,39,6,
-64,113,148,0,32,70,65,0,191,255,250,237,64,14,148,0,
-97,7,37,117,64,6,63,0,128,7,33,0,38,6,56,112,
-148,0,39,6,224,123,148,0,32,70,65,0,191,255,214,237,
+202,13,38,6,64,135,148,0,39,6,152,123,148,0,32,70,
+65,0,191,255,16,238,181,13,38,6,64,135,148,0,39,6,
+160,124,148,0,32,70,65,0,191,255,250,237,64,14,149,0,
+97,7,133,128,64,6,63,0,128,7,33,0,38,6,152,123,
+148,0,39,6,64,135,148,0,32,70,65,0,191,255,214,237,
 92,26,99,103,1,0,229,103,64,0,0,0,236,159,32,0,
-64,102,130,0,44,102,196,235,236,151,32,0,224,7,70,1,
+64,102,130,0,44,102,104,244,236,151,32,0,224,7,70,1,
 0,0,0,0,0,0,35,103,1,0,68,26,64,6,63,0,
-128,7,33,0,38,6,224,123,148,0,39,6,56,112,148,0,
-32,70,65,0,191,255,142,237,64,14,148,0,97,7,37,117,
+128,7,33,0,38,6,64,135,148,0,39,6,152,123,148,0,
+32,70,65,0,191,255,142,237,64,14,149,0,97,7,133,128,
 64,6,63,0,0,18,2,80,127,0,0,18,2,80,127,0,
 34,6,166,0,64,22,1,0,245,13,0,143,47,250,209,142,
 31,0,162,13,64,55,40,250,32,22,32,0,2,128,95,18,
@@ -13776,15 +13903,15 @@ unsigned char tw_fw_code[] __initdata = 
 240,0,64,127,45,250,0,111,44,250,205,110,240,0,64,111,
 44,250,192,55,32,250,192,47,32,250,64,7,174,241,127,0,
 128,7,33,0,191,255,150,255,64,6,63,0,128,7,33,0,
-191,255,128,255,191,255,236,255,64,14,148,0,97,7,97,118,
-64,14,148,0,97,7,101,118,64,14,148,0,97,7,105,118,
+191,255,128,255,191,255,236,255,64,14,149,0,97,7,193,129,
+64,14,149,0,97,7,197,129,64,14,149,0,97,7,201,129,
 64,6,63,0,128,7,33,0,191,255,212,255,32,22,0,252,
-64,14,148,0,97,23,109,118,64,7,10,248,128,143,11,248,
+64,14,149,0,97,23,205,129,64,7,10,248,128,143,11,248,
 224,137,218,253,64,6,63,0,128,7,33,0,6,6,240,255,
 178,13,6,6,160,255,178,37,6,6,64,252,226,29,6,6,
-144,250,194,5,197,29,1,82,181,29,64,142,148,0,49,143,
-37,117,224,137,170,21,0,135,46,250,208,134,31,0,210,13,
-128,63,39,250,224,57,130,245,244,57,226,237,38,6,12,20,
+144,250,194,5,197,29,1,82,181,29,64,142,149,0,49,143,
+133,128,224,137,170,21,0,135,46,250,208,134,31,0,210,13,
+128,63,39,250,224,57,130,245,244,57,226,237,38,6,136,31,
 133,0,191,255,162,236,133,237,2,82,165,5,0,82,64,6,
 63,0,32,143,112,240,209,134,3,0,202,253,64,7,113,240,
 224,111,113,240,141,110,3,0,96,111,112,240,32,95,112,240,
@@ -13795,20 +13922,20 @@ unsigned char tw_fw_code[] __initdata = 
 1,93,7,16,43,6,1,0,64,14,3,93,226,0,162,57,
 144,58,64,94,33,15,11,57,5,61,194,22,254,255,47,6,
 1,0,97,0,15,17,7,21,127,0,128,7,33,0,3,18,
-64,23,10,248,64,142,130,0,49,62,96,194,32,54,96,5,
-191,255,138,255,64,134,130,0,48,62,96,194,32,54,112,5,
-191,255,122,255,64,126,130,0,47,62,96,194,32,54,128,5,
-191,255,106,255,64,118,130,0,46,62,96,194,32,54,144,5,
-191,255,90,255,32,54,96,0,64,110,133,0,45,62,68,36,
+64,23,10,248,64,142,130,0,49,62,4,203,32,54,96,5,
+191,255,138,255,64,134,130,0,48,62,4,203,32,54,112,5,
+191,255,122,255,64,126,130,0,47,62,4,203,32,54,128,5,
+191,255,106,255,64,118,130,0,46,62,4,203,32,54,144,5,
+191,255,90,255,32,54,96,0,64,110,133,0,45,62,204,47,
 191,255,120,255,0,50,32,62,48,6,191,255,158,237,44,6,
-206,194,129,0,64,14,133,0,97,103,69,36,64,6,63,0,
+114,203,129,0,64,14,133,0,97,103,205,47,64,6,63,0,
 31,18,64,142,240,15,6,80,81,81,154,13,128,95,11,248,
 64,7,10,248,128,135,11,248,224,129,218,253,97,58,226,5,
 98,58,242,5,100,58,130,13,165,13,134,23,1,0,197,13,
 230,23,1,0,149,13,38,23,1,0,229,5,1,98,64,14,
-148,0,97,103,41,117,224,81,250,5,64,95,10,248,128,127,
+149,0,97,103,137,128,224,81,250,5,64,95,10,248,128,127,
 11,248,235,121,218,253,2,80,127,0,130,7,225,243,6,232,
-7,216,8,208,4,18,100,210,169,5,26,16,56,6,40,117,
+7,216,8,208,4,18,100,210,169,5,26,16,56,6,136,128,
 148,0,2,224,64,126,240,15,29,128,79,129,250,85,2,18,
 97,226,146,13,98,226,242,5,100,226,210,5,1,18,120,23,
 1,0,245,101,64,94,1,0,29,200,75,201,154,13,191,255,
@@ -13824,62 +13951,62 @@ unsigned char tw_fw_code[] __initdata = 
 242,5,100,226,130,13,165,13,93,223,0,0,165,13,125,223,
 0,0,245,5,125,223,1,0,197,5,1,18,120,23,1,0,
 56,119,1,0,68,234,224,113,202,5,92,210,224,209,191,141,
-66,6,255,243,42,6,252,19,133,0,127,0,127,0,127,0,
+66,6,255,243,42,6,120,31,133,0,127,0,127,0,127,0,
 1,82,127,0,127,0,127,0,127,0,127,0,127,0,192,25,
 1,50,127,0,128,7,97,0,61,6,240,240,240,240,36,135,
-253,133,49,6,241,240,240,240,241,129,242,5,100,239,253,133,
-191,255,196,209,128,255,64,33,36,55,5,134,100,239,253,133,
-191,255,164,205,100,7,253,133,128,255,44,0,64,6,127,0,
-128,7,33,0,49,6,240,240,240,240,100,143,253,133,191,255,
-150,209,128,255,18,33,48,6,241,240,240,240,100,135,253,133,
-64,6,63,0,33,6,176,215,1,0,97,0,140,7,97,0,
-100,7,9,134,100,7,13,134,100,7,21,134,61,6,120,135,
-133,0,29,48,0,58,32,70,128,0,190,255,76,17,100,239,
-17,134,29,142,128,0,100,143,25,134,34,6,244,14,149,0,
-100,23,33,134,48,6,244,30,149,0,100,239,29,134,162,129,
-100,135,37,134,100,7,41,134,40,6,22,243,129,0,99,23,
-1,0,38,6,176,134,133,0,36,111,37,134,39,6,52,20,
+9,134,49,6,241,240,240,240,241,129,242,5,100,239,9,134,
+191,255,196,209,128,255,64,33,36,55,17,134,100,239,9,134,
+191,255,162,205,100,7,9,134,128,255,44,0,64,6,127,0,
+128,7,33,0,49,6,240,240,240,240,100,143,9,134,191,255,
+150,209,128,255,18,33,48,6,241,240,240,240,100,135,9,134,
+64,6,63,0,33,6,0,218,1,0,97,0,140,7,97,0,
+100,7,21,134,100,7,25,134,100,7,33,134,61,6,216,146,
+133,0,29,48,0,58,32,70,128,0,190,255,168,8,100,239,
+29,134,29,142,128,0,100,143,37,134,34,6,84,26,149,0,
+100,23,45,134,48,6,84,42,149,0,100,239,41,134,162,129,
+100,135,49,134,100,7,53,134,40,6,186,251,129,0,99,23,
+1,0,38,6,16,146,133,0,36,111,49,134,39,6,176,31,
 133,0,99,7,21,0,99,7,17,0,99,7,13,0,99,7,
 9,0,99,111,5,0,41,6,77,73,84,65,128,255,228,0,
-100,7,45,134,100,7,49,134,76,6,127,0,128,7,33,0,
+100,7,57,134,100,7,61,134,76,6,127,0,128,7,33,0,
 96,7,37,183,96,7,41,183,96,7,53,183,96,7,57,183,
 32,142,32,0,96,143,61,183,64,7,64,183,32,134,64,183,
 16,102,1,0,1,90,11,80,0,18,197,5,129,82,65,18,
 130,0,202,126,1,0,178,253,76,23,0,0,65,90,65,98,
 11,6,0,255,153,245,32,54,64,184,0,58,32,70,128,0,
-190,255,134,16,96,7,45,183,96,7,49,183,96,7,193,184,
+190,255,226,7,96,7,45,183,96,7,49,183,96,7,193,184,
 64,6,63,0,128,7,97,0,6,232,229,87,64,0,224,7,
 96,1,61,143,49,0,10,248,99,138,154,21,32,135,193,184,
 65,130,96,135,193,184,255,47,32,0,29,48,128,255,52,0,
 224,81,178,5,128,255,52,0,0,18,133,21,61,127,53,0,
 224,121,130,13,125,7,53,0,255,47,32,0,32,22,25,0,
 213,5,255,47,32,0,32,22,18,0,2,80,64,6,127,0,
-33,6,20,190,1,0,97,0,33,6,212,200,1,0,97,0,
+33,6,98,192,1,0,97,0,33,6,36,203,1,0,97,0,
 128,7,225,243,9,184,35,183,45,0,35,215,53,0,35,223,
 37,0,6,232,27,48,35,231,41,0,8,192,28,64,7,200,
-32,62,239,0,190,255,226,15,29,48,0,58,32,70,152,0,
-190,255,214,15,125,207,41,0,125,199,69,0,125,191,73,0,
+32,62,239,0,190,255,62,7,29,48,0,58,32,70,152,0,
+190,255,50,7,125,207,41,0,125,199,69,0,125,191,73,0,
 125,223,13,0,125,231,21,0,28,142,255,255,219,137,125,143,
 17,0,35,159,49,0,214,22,31,0,125,23,45,0,211,126,
 31,0,125,127,61,0,125,215,25,0,125,215,29,0,3,114,
-125,119,49,0,45,6,10,245,129,0,125,111,85,0,125,239,
+125,119,49,0,45,6,174,253,129,0,125,111,85,0,125,239,
 89,0,1,98,226,103,192,0,125,103,65,0,29,48,39,6,
-180,17,130,0,128,255,80,30,229,87,64,0,224,7,96,1,
+88,26,130,0,128,255,80,30,229,87,64,0,224,7,96,1,
 10,224,42,6,68,82,72,84,32,23,45,183,125,87,1,0,
 224,17,194,13,34,87,145,0,98,239,145,0,106,239,141,0,
 125,23,141,0,125,87,145,0,245,5,96,239,45,183,125,239,
 141,0,125,239,145,0,32,143,49,183,32,135,193,184,65,138,
-96,143,49,183,65,130,37,127,197,131,96,135,193,184,224,121,
-210,5,61,54,136,0,190,255,42,13,252,47,32,0,35,159,
+96,143,49,183,65,130,37,127,205,131,96,135,193,184,224,121,
+210,5,61,54,136,0,190,255,134,4,252,47,32,0,35,159,
 57,0,224,153,146,13,29,48,191,255,232,254,224,81,130,21,
 191,255,232,254,213,13,229,87,64,0,224,7,96,1,32,119,
 193,184,10,224,95,114,96,119,193,184,252,47,32,0,0,82,
 64,6,255,243,128,7,132,7,225,240,49,6,77,73,84,65,
 241,49,178,5,128,7,74,1,99,7,5,0,1,202,3,194,
-229,87,64,0,224,7,96,1,10,224,36,87,17,134,42,23,
+229,87,64,0,224,7,96,1,10,224,36,87,29,134,42,23,
 1,0,224,17,99,23,1,0,178,5,98,31,25,0,36,127,
-17,134,106,7,1,0,68,122,36,119,25,134,100,127,17,134,
-238,121,218,5,36,111,29,134,100,111,17,134,100,7,21,134,
+29,134,106,7,1,0,68,122,36,119,37,134,100,127,29,134,
+238,121,218,5,36,111,41,134,100,111,29,134,100,7,33,134,
 252,47,32,0,229,87,64,0,224,7,96,1,149,93,34,87,
 17,0,2,232,234,233,202,5,99,7,1,0,149,21,34,103,
 21,0,106,103,21,0,34,95,21,0,34,87,17,0,107,87,
@@ -13888,20 +14015,20 @@ unsigned char tw_fw_code[] __initdata = 
 0,218,35,142,4,0,125,239,17,0,149,21,61,223,9,0,
 61,95,5,0,61,215,13,0,125,95,1,0,224,89,226,5,
 35,142,4,0,125,239,17,0,165,5,0,136,125,143,25,0,
-252,47,32,0,224,217,226,5,26,48,63,6,2,244,129,0,
+252,47,32,0,224,217,226,5,26,48,63,6,166,252,129,0,
 123,0,229,87,64,0,224,7,96,1,10,224,61,127,25,0,
 35,134,4,0,240,121,234,5,125,7,25,0,29,48,128,255,
 92,0,252,47,32,0,229,87,64,0,224,7,96,1,35,23,
-1,0,10,224,224,17,202,165,36,119,21,134,224,113,202,21,
+1,0,10,224,224,17,202,165,36,119,33,134,224,113,202,21,
 32,23,37,183,32,111,193,184,98,199,49,0,98,207,57,0,
 65,106,96,111,193,184,252,47,32,0,32,55,37,183,128,255,
 20,0,191,7,206,254,252,47,32,0,191,7,198,254,68,6,
-255,240,33,6,92,201,1,0,97,0,128,7,193,0,6,232,
+255,240,33,6,172,203,1,0,97,0,128,7,193,0,6,232,
 229,87,64,0,224,7,96,1,61,23,1,0,10,224,224,17,
 130,61,61,143,25,0,224,137,202,53,2,6,223,255,201,5,
-32,22,31,0,165,5,95,18,194,18,36,119,17,134,36,87,
-25,134,206,17,234,17,129,13,170,17,162,18,2,136,36,23,
-29,134,194,138,209,17,34,87,1,0,224,81,162,21,125,87,
+32,22,31,0,165,5,95,18,194,18,36,119,29,134,36,87,
+37,134,206,17,234,17,129,13,170,17,162,18,2,136,36,23,
+41,134,194,138,209,17,34,87,1,0,224,81,162,21,125,87,
 17,0,34,127,1,0,47,127,21,0,125,127,21,0,111,239,
 17,0,34,111,1,0,125,23,25,0,109,239,21,0,149,13,
 125,239,21,0,125,239,17,0,125,23,25,0,98,239,1,0,
@@ -13909,9 +14036,9 @@ unsigned char tw_fw_code[] __initdata = 
 229,87,64,0,224,7,96,1,61,143,49,0,10,248,100,138,
 202,13,32,135,193,184,65,130,96,135,193,184,255,47,32,0,
 29,48,191,255,158,252,197,13,61,231,105,0,255,47,32,0,
-224,225,226,5,29,48,63,6,78,245,129,0,124,0,64,6,
+224,225,226,5,29,48,63,6,242,253,129,0,124,0,64,6,
 255,0,128,7,97,0,32,23,37,183,6,232,224,17,162,13,
-49,6,176,134,133,0,241,17,210,5,36,135,253,133,224,129,
+49,6,16,146,133,0,241,17,210,5,36,135,9,134,224,129,
 194,5,32,86,19,0,181,45,224,233,186,5,0,82,245,37,
 229,87,64,0,224,7,96,1,10,248,32,23,37,183,4,122,
 98,127,49,0,1,114,98,119,57,0,32,111,193,184,98,7,
@@ -13919,8 +14046,8 @@ unsigned char tw_fw_code[] __initdata = 
 98,239,77,0,34,54,76,0,191,255,194,254,32,55,37,183,
 191,255,178,254,32,87,37,183,42,87,133,0,64,6,127,0,
 128,7,225,16,6,232,61,23,49,0,0,218,97,18,178,5,
-98,18,154,53,229,87,64,0,224,7,96,1,37,143,201,131,
-10,224,224,137,210,5,61,54,136,0,190,255,6,10,61,23,
+98,18,154,53,229,87,64,0,224,7,96,1,37,143,209,131,
+10,224,224,137,210,5,61,54,136,0,190,255,98,1,61,23,
 141,0,125,7,1,0,226,233,202,5,96,7,45,183,181,21,
 61,135,145,0,98,135,145,0,32,111,45,183,61,119,141,0,
 61,127,145,0,253,105,111,119,141,0,218,5,61,103,141,0,
@@ -13949,15 +14076,15 @@ unsigned char tw_fw_code[] __initdata = 
 41,183,181,5,96,7,41,183,127,239,45,0,127,239,61,0,
 3,98,32,95,193,184,127,103,49,0,65,90,96,95,193,184,
 252,47,32,0,31,48,191,255,26,250,32,143,37,183,32,87,
-41,183,234,137,242,5,36,135,253,133,224,129,186,5,191,255,
+41,183,234,137,242,5,36,135,9,134,224,129,186,5,191,255,
 10,250,0,82,64,6,255,16,128,7,225,0,6,232,61,54,
 76,0,128,255,114,0,229,87,64,0,224,7,96,1,61,23,
 49,0,10,248,97,18,162,45,98,18,130,45,224,17,170,21,
 2,138,125,143,49,0,1,130,32,127,193,184,125,135,57,0,
 65,122,96,127,193,184,255,47,32,0,29,48,191,255,86,252,
 245,21,2,114,125,119,49,0,1,106,125,111,57,0,61,231,
-105,0,255,47,32,0,224,225,226,5,29,48,63,6,68,248,
-129,0,124,0,125,7,57,0,181,5,255,47,32,0,0,82,
+105,0,255,47,32,0,224,225,226,5,29,48,63,6,232,0,
+130,0,124,0,125,7,57,0,181,5,255,47,32,0,0,82,
 64,6,255,0,128,7,193,0,6,232,229,87,64,0,224,7,
 96,1,61,23,25,0,10,224,224,17,130,45,61,87,17,0,
 234,233,170,13,34,143,1,0,253,137,186,5,98,7,1,0,
@@ -13969,16 +14096,16 @@ unsigned char tw_fw_code[] __initdata = 
 35,87,17,0,6,248,127,63,5,0,127,23,9,0,127,87,
 13,0,127,71,17,0,127,79,21,0,127,7,33,0,229,87,
 64,0,224,7,96,1,10,232,49,6,77,73,84,65,36,23,
-45,134,127,143,1,0,224,17,194,13,34,87,41,0,98,255,
+57,134,127,143,1,0,224,17,194,13,34,87,41,0,98,255,
 41,0,106,255,37,0,127,23,37,0,127,87,41,0,245,5,
-100,255,45,134,127,255,37,0,127,255,41,0,36,135,49,134,
-65,130,100,135,49,134,253,47,32,0,224,225,210,5,63,54,
+100,255,57,134,127,255,37,0,127,255,41,0,36,135,61,134,
+65,130,100,135,61,134,253,47,32,0,224,225,210,5,63,54,
 8,0,191,255,56,251,0,82,64,6,255,0,128,7,33,0,
 38,143,33,0,224,137,218,5,38,135,9,0,224,129,202,5,
 32,86,23,0,213,5,72,50,191,255,18,251,0,82,64,6,
 63,0,128,7,193,0,38,238,8,0,229,87,64,0,224,7,
-96,1,10,224,36,103,29,134,61,87,25,0,236,81,161,37,
-36,23,25,134,226,81,233,29,36,95,17,134,235,81,209,5,
+96,1,10,224,36,103,41,134,61,87,25,0,236,81,161,37,
+36,23,37,134,226,81,233,29,36,95,29,134,235,81,209,5,
 171,81,162,82,10,16,133,13,61,119,25,0,171,17,172,113,
 162,114,162,18,206,17,61,87,1,0,65,18,10,6,223,255,
 249,5,10,86,224,255,202,17,125,23,1,0,181,5,125,23,
@@ -13992,19 +14119,19 @@ unsigned char tw_fw_code[] __initdata = 
 224,7,96,1,61,143,33,0,10,224,224,137,218,5,125,223,
 9,0,125,215,13,0,252,47,32,0,0,82,64,6,223,48,
 128,7,193,0,6,224,229,87,64,0,224,7,96,1,10,232,
-100,231,33,175,253,47,32,0,64,6,223,0,128,7,193,0,
+100,231,45,175,253,47,32,0,64,6,223,0,128,7,193,0,
 6,232,125,63,5,0,125,71,9,0,125,7,13,0,125,7,
 17,0,229,87,64,0,224,7,96,1,10,224,49,6,65,77,
-69,83,36,23,53,134,125,143,1,0,224,17,194,13,34,87,
+69,83,36,23,65,134,125,143,1,0,224,17,194,13,34,87,
 25,0,98,239,25,0,106,239,21,0,125,23,21,0,125,87,
-25,0,245,5,100,239,53,134,125,239,21,0,125,239,25,0,
-36,135,57,134,65,130,100,135,57,134,252,47,32,0,0,82,
+25,0,245,5,100,239,65,134,125,239,21,0,125,239,25,0,
+36,135,69,134,65,130,100,135,69,134,252,47,32,0,0,82,
 64,6,223,0,128,7,225,16,6,224,229,87,64,0,224,7,
-96,1,36,143,57,134,10,248,95,138,100,143,57,134,60,23,
-21,0,124,7,1,0,226,225,202,5,100,7,53,134,181,21,
-60,135,25,0,98,135,25,0,36,111,53,134,60,119,21,0,
+96,1,36,143,69,134,10,248,95,138,100,143,69,134,60,23,
+21,0,124,7,1,0,226,225,202,5,100,7,65,134,181,21,
+60,135,25,0,98,135,25,0,36,111,65,134,60,119,21,0,
 60,127,25,0,252,105,111,119,21,0,218,5,60,103,21,0,
-100,103,53,134,32,95,193,184,65,90,96,95,193,184,255,47,
+100,103,65,134,32,95,193,184,65,90,96,95,193,184,255,47,
 32,0,60,239,13,0,1,218,133,37,229,87,64,0,224,7,
 96,1,10,248,255,47,32,0,32,87,193,184,125,7,105,0,
 65,82,96,87,193,184,61,54,76,0,191,255,234,252,125,223,
@@ -14032,16 +14159,16 @@ unsigned char tw_fw_code[] __initdata = 
 196,82,125,79,25,0,194,82,201,81,125,87,29,0,125,79,
 33,0,125,79,37,0,125,7,17,0,125,23,21,0,125,23,
 13,0,229,87,64,0,224,7,96,1,10,224,42,6,85,69,
-85,81,36,23,61,134,125,87,1,0,224,17,194,13,34,87,
+85,81,36,23,73,134,125,87,1,0,224,17,194,13,34,87,
 53,0,98,239,53,0,106,239,49,0,125,23,49,0,125,87,
-53,0,245,5,100,239,61,134,125,239,49,0,125,239,53,0,
-36,143,65,134,65,138,100,143,65,134,252,47,32,0,0,82,
+53,0,245,5,100,239,73,134,125,239,49,0,125,239,53,0,
+36,143,77,134,65,138,100,143,77,134,252,47,32,0,0,82,
 64,6,223,0,128,7,225,16,6,224,229,87,64,0,224,7,
-96,1,36,143,65,134,10,248,95,138,100,143,65,134,60,23,
-49,0,124,7,1,0,226,225,202,5,100,7,61,134,181,21,
-60,135,53,0,98,135,53,0,36,111,61,134,60,119,49,0,
+96,1,36,143,77,134,10,248,95,138,100,143,77,134,60,23,
+49,0,124,7,1,0,226,225,202,5,100,7,73,134,181,21,
+60,135,53,0,98,135,53,0,36,111,73,134,60,119,49,0,
 60,127,53,0,252,105,111,119,49,0,218,5,60,103,49,0,
-100,103,61,134,32,95,193,184,65,90,96,95,193,184,255,47,
+100,103,73,134,32,95,193,184,65,90,96,95,193,184,255,47,
 32,0,60,239,41,0,1,218,165,37,229,87,64,0,224,7,
 96,1,10,248,255,47,32,0,32,87,193,184,125,7,105,0,
 65,82,96,87,193,184,61,54,76,0,191,255,154,250,125,223,
@@ -14086,7 +14213,7 @@ unsigned char tw_fw_code[] __initdata = 
 105,95,1,0,224,81,226,5,61,54,76,0,191,255,40,248,
 181,5,125,7,77,0,125,7,133,0,29,48,191,255,148,241,
 224,81,178,5,191,255,148,241,0,82,245,77,224,209,146,77,
-32,239,37,183,125,223,125,0,125,255,109,0,49,6,12,4,
+32,239,37,183,125,223,125,0,125,255,109,0,49,6,176,12,
 130,0,63,23,41,0,125,143,105,0,224,17,194,21,125,23,
 113,0,63,127,41,0,47,127,117,0,125,127,117,0,63,111,
 41,0,45,111,117,0,109,239,113,0,63,103,41,0,108,239,
@@ -14136,7 +14263,7 @@ unsigned char tw_fw_code[] __initdata = 
 61,143,101,0,224,137,226,5,61,54,76,0,191,255,8,245,
 181,5,125,7,77,0,125,7,133,0,29,48,191,255,116,238,
 224,81,178,5,191,255,116,238,0,82,245,77,224,217,146,77,
-32,239,37,183,125,215,125,0,125,255,109,0,48,6,12,4,
+32,239,37,183,125,215,125,0,125,255,109,0,48,6,176,12,
 130,0,63,23,41,0,125,135,105,0,224,17,194,21,125,23,
 113,0,63,119,41,0,46,119,117,0,125,119,117,0,63,103,
 41,0,44,103,117,0,108,239,113,0,63,95,41,0,107,239,
@@ -14160,10 +14287,10 @@ unsigned char tw_fw_code[] __initdata = 
 125,7,77,0,181,5,252,47,32,0,64,6,255,0,128,7,
 193,0,6,232,125,63,5,0,125,7,9,0,125,7,17,0,
 125,7,21,0,125,7,13,0,229,87,64,0,224,7,96,1,
-10,224,49,6,78,68,86,68,36,23,185,139,125,143,1,0,
+10,224,49,6,78,68,86,68,36,23,197,139,125,143,1,0,
 224,17,194,13,34,87,29,0,98,239,29,0,106,239,25,0,
-125,23,25,0,125,87,29,0,245,5,100,239,185,139,125,239,
-25,0,125,239,29,0,36,135,189,139,65,130,100,135,189,139,
+125,23,25,0,125,87,29,0,245,5,100,239,197,139,125,239,
+25,0,125,239,29,0,36,135,201,139,65,130,100,135,201,139,
 252,47,32,0,0,82,64,6,223,0,128,7,225,0,6,232,
 61,231,109,0,229,87,64,0,224,7,96,1,61,143,105,0,
 10,248,224,137,162,77,224,225,130,77,60,127,1,0,48,6,
@@ -14183,10 +14310,10 @@ unsigned char tw_fw_code[] __initdata = 
 13,16,202,17,236,17,147,253,8,102,4,0,172,81,106,7,
 1,0,125,95,9,0,125,95,13,0,224,89,194,5,125,79,
 17,0,181,5,125,7,17,0,229,87,64,0,224,7,96,1,
-10,224,43,6,67,79,76,66,36,23,69,134,125,95,1,0,
+10,224,43,6,67,79,76,66,36,23,81,134,125,95,1,0,
 224,17,194,13,34,87,45,0,98,239,45,0,106,239,41,0,
-125,23,41,0,125,87,45,0,245,5,100,239,69,134,125,239,
-41,0,125,239,45,0,36,87,73,134,65,82,100,87,73,134,
+125,23,41,0,125,87,45,0,245,5,100,239,81,134,125,239,
+41,0,125,239,45,0,36,87,85,134,65,82,100,87,85,134,
 252,47,32,0,0,82,64,6,223,0,128,7,225,0,6,232,
 61,231,109,0,229,87,64,0,224,7,96,1,61,143,105,0,
 10,248,224,137,178,77,224,225,146,77,60,127,1,0,48,6,
@@ -14199,16 +14326,16 @@ unsigned char tw_fw_code[] __initdata = 
 191,255,160,234,224,81,226,5,191,255,160,234,181,5,255,47,
 32,0,61,119,101,0,224,113,226,5,61,54,76,0,191,255,
 6,241,229,5,125,7,77,0,181,5,255,47,32,0,64,6,
-255,0,128,7,33,0,38,6,216,136,133,0,31,58,190,255,
-194,117,64,6,63,0,128,7,33,0,38,6,216,136,133,0,
-190,255,140,13,64,6,63,0,128,7,33,0,191,255,196,232,
-38,6,216,136,133,0,39,6,72,20,133,0,1,66,128,255,
-20,5,64,6,63,0,128,7,33,0,31,58,190,255,132,117,
-64,6,63,0,128,7,33,0,190,255,84,13,64,6,63,0,
-49,6,216,136,133,0,102,143,1,0,127,0,38,95,17,0,
+255,0,128,7,33,0,38,6,56,148,133,0,31,58,190,255,
+136,112,64,6,63,0,128,7,33,0,38,6,56,148,133,0,
+190,255,168,5,64,6,63,0,128,7,33,0,191,255,196,232,
+38,6,56,148,133,0,39,6,196,31,133,0,1,66,128,255,
+20,5,64,6,63,0,128,7,33,0,31,58,190,255,74,112,
+64,6,63,0,128,7,33,0,190,255,112,5,64,6,63,0,
+49,6,56,148,133,0,102,143,1,0,127,0,38,95,17,0,
 38,23,13,0,11,136,162,137,17,86,1,0,133,13,2,135,
 0,0,16,6,17,0,250,5,95,82,65,18,235,17,131,253,
-38,87,21,0,127,0,36,143,42,6,248,135,133,0,127,0,
+38,87,21,0,127,0,36,143,42,6,88,147,133,0,127,0,
 127,0,31,82,127,0,127,0,160,7,225,48,6,248,7,208,
 8,216,0,234,229,87,64,0,224,7,96,1,63,143,21,0,
 10,224,224,137,250,117,224,217,210,117,63,135,25,0,63,87,
@@ -14243,7 +14370,7 @@ unsigned char tw_fw_code[] __initdata = 
 34,103,5,0,105,103,5,0,72,18,72,74,34,95,1,0,
 105,95,1,0,68,18,68,74,34,87,1,0,224,233,105,87,
 1,0,162,77,32,239,37,183,125,31,125,0,125,255,109,0,
-49,6,12,4,130,0,63,23,41,0,125,143,105,0,224,17,
+49,6,176,12,130,0,63,23,41,0,125,143,105,0,224,17,
 194,21,125,23,113,0,63,119,41,0,46,119,117,0,125,119,
 117,0,63,103,41,0,44,103,117,0,108,239,113,0,63,95,
 41,0,107,239,117,0,213,5,125,239,113,0,125,239,117,0,
@@ -14286,16 +14413,16 @@ unsigned char tw_fw_code[] __initdata = 
 118,103,1,0,114,87,1,0,252,47,32,0,0,82,64,6,
 255,243,128,7,193,0,6,232,125,63,5,0,125,7,9,0,
 125,71,17,0,125,7,29,0,125,7,33,0,229,87,64,0,
-224,7,96,1,10,224,49,6,69,84,85,77,36,23,77,134,
+224,7,96,1,10,224,49,6,69,84,85,77,36,23,89,134,
 125,143,1,0,224,17,194,13,34,87,41,0,98,239,41,0,
 106,239,37,0,125,23,37,0,125,87,41,0,245,5,100,239,
-77,134,125,239,37,0,125,239,41,0,36,135,81,134,65,130,
-100,135,81,134,252,47,32,0,0,82,64,6,223,0,128,7,
-225,16,6,224,229,87,64,0,224,7,96,1,36,143,81,134,
-10,248,95,138,100,143,81,134,60,23,37,0,124,7,1,0,
-226,225,202,5,100,7,77,134,181,21,60,135,41,0,98,135,
-41,0,36,111,77,134,60,119,37,0,60,127,41,0,252,105,
-111,119,37,0,218,5,60,103,37,0,100,103,77,134,32,95,
+89,134,125,239,37,0,125,239,41,0,36,135,93,134,65,130,
+100,135,93,134,252,47,32,0,0,82,64,6,223,0,128,7,
+225,16,6,224,229,87,64,0,224,7,96,1,36,143,93,134,
+10,248,95,138,100,143,93,134,60,23,37,0,124,7,1,0,
+226,225,202,5,100,7,89,134,181,21,60,135,41,0,98,135,
+41,0,36,111,89,134,60,119,37,0,60,127,41,0,252,105,
+111,119,37,0,218,5,60,103,37,0,100,103,89,134,32,95,
 193,184,65,90,96,95,193,184,255,47,32,0,60,239,29,0,
 1,218,133,37,229,87,64,0,224,7,96,1,10,248,255,47,
 32,0,32,87,193,184,125,7,105,0,65,82,96,87,193,184,
@@ -14361,32 +14488,32 @@ unsigned char tw_fw_code[] __initdata = 
 108,111,121,0,241,111,64,0,108,111,125,0,240,111,64,0,
 108,111,129,0,0,106,108,111,133,0,108,63,137,0,102,103,
 9,0,127,0,128,7,33,0,191,255,148,223,191,255,0,223,
-100,7,53,134,100,7,57,134,100,7,61,134,100,7,65,134,
-100,7,185,139,100,7,189,139,100,7,69,134,100,7,73,134,
-100,7,85,134,100,7,89,134,100,7,77,134,100,7,81,134,
+100,7,65,134,100,7,69,134,100,7,73,134,100,7,77,134,
+100,7,197,139,100,7,201,139,100,7,81,134,100,7,85,134,
+100,7,97,134,100,7,101,134,100,7,89,134,100,7,93,134,
 64,6,63,0,128,7,33,0,32,23,37,183,34,55,73,0,
-34,135,69,0,63,6,204,17,130,0,112,0,229,87,64,0,
+34,135,69,0,63,6,112,26,130,0,112,0,229,87,64,0,
 224,7,96,1,10,248,32,23,37,183,1,122,98,127,49,0,
 32,111,193,184,98,127,57,0,65,106,96,111,193,184,255,47,
 32,0,32,55,37,183,191,255,124,226,64,6,63,0,88,26,
 99,255,5,0,99,231,1,0,224,49,3,224,178,13,68,102,
-0,0,44,102,196,235,102,103,5,0,129,58,185,5,128,255,
+0,0,44,102,168,235,102,103,5,0,129,58,185,5,128,255,
 94,10,35,255,5,0,35,231,1,0,72,26,127,0,88,26,
 99,255,5,0,99,231,1,0,72,26,38,87,1,0,127,0,
 88,26,99,255,5,0,99,231,1,0,224,49,3,224,178,13,
-68,94,0,0,43,94,196,235,102,95,5,0,129,58,185,5,
+68,94,0,0,43,94,168,235,102,95,5,0,129,58,185,5,
 128,255,28,10,35,255,5,0,35,231,1,0,72,26,127,0,
 88,26,99,255,5,0,99,231,1,0,3,224,128,255,44,9,
 35,255,5,0,35,231,1,0,72,26,127,0,84,26,99,255,
 9,0,99,239,1,0,99,231,5,0,68,238,15,0,61,238,
-76,230,68,102,15,0,44,103,85,230,3,230,4,0,224,97,
-234,29,1,50,68,14,15,0,97,55,85,230,68,86,0,0,
-68,54,0,0,68,94,0,0,43,94,196,235,125,95,5,0,
-38,54,16,236,125,55,1,0,42,86,228,235,125,87,5,0,
-68,54,0,0,38,54,4,236,128,255,82,14,29,48,128,255,
+48,230,68,102,15,0,44,103,57,230,3,230,4,0,224,97,
+234,29,1,50,68,14,15,0,97,55,57,230,68,86,0,0,
+68,54,0,0,68,94,0,0,43,94,168,235,125,95,5,0,
+38,54,244,235,125,55,1,0,42,86,200,235,125,87,5,0,
+68,54,0,0,38,54,232,235,128,255,82,14,29,48,128,255,
 186,8,35,239,1,0,35,255,9,0,35,231,5,0,76,26,
 127,0,192,25,127,0,88,26,99,255,5,0,99,231,1,0,
-224,49,3,224,178,13,68,102,0,0,44,102,36,236,102,103,
+224,49,3,224,178,13,68,102,0,0,44,102,8,236,102,103,
 5,0,129,58,185,5,128,255,86,9,35,255,5,0,35,231,
 1,0,72,26,127,0,88,26,99,255,5,0,99,231,1,0,
 72,26,38,87,1,0,127,0,3,30,228,255,99,255,25,0,
@@ -14398,7 +14525,7 @@ unsigned char tw_fw_code[] __initdata = 
 31,66,128,255,72,1,27,48,26,64,0,58,128,255,62,1,
 149,29,1,66,128,255,50,2,224,81,194,21,27,48,128,255,
 100,3,99,87,1,0,25,48,128,255,134,3,26,56,202,57,
-35,55,1,0,29,64,189,255,178,236,27,48,29,56,128,255,
+35,55,1,0,29,64,189,255,14,228,27,48,29,56,128,255,
 196,1,27,80,35,207,17,0,35,215,13,0,35,223,9,0,
 35,239,5,0,35,255,25,0,35,231,21,0,3,30,28,0,
 127,0,3,30,236,255,99,255,17,0,99,231,13,0,99,215,
@@ -14409,7 +14536,7 @@ unsigned char tw_fw_code[] __initdata = 
 169,5,26,56,29,48,219,57,31,66,128,255,144,0,29,48,
 27,64,0,58,128,255,134,0,181,21,26,56,1,66,128,255,
 120,1,224,81,210,13,29,48,128,255,170,2,10,48,27,56,
-26,64,189,255,6,236,29,48,26,56,128,255,24,1,29,80,
+26,64,189,255,98,227,29,48,26,56,128,255,24,1,29,80,
 35,215,9,0,35,223,5,0,35,239,1,0,35,255,17,0,
 35,231,13,0,3,30,20,0,127,0,80,26,99,255,13,0,
 99,231,9,0,99,223,5,0,3,230,8,0,99,239,1,0,
@@ -14438,7 +14565,7 @@ unsigned char tw_fw_code[] __initdata = 
 224,81,178,5,0,50,181,5,61,55,21,0,6,200,155,214,
 15,0,126,210,163,5,27,208,26,54,1,0,128,255,96,6,
 99,87,5,0,224,201,162,13,29,48,128,255,216,0,35,55,
-5,0,10,56,25,64,189,255,50,234,29,48,1,58,128,255,
+5,0,10,56,25,64,189,255,142,225,29,48,1,58,128,255,
 28,1,35,119,5,0,125,215,25,0,125,119,5,0,29,48,
 25,56,191,255,48,255,229,21,224,81,146,13,27,6,240,255,
 225,5,29,48,1,58,128,255,244,0,197,13,224,217,170,13,
@@ -14465,9 +14592,9 @@ unsigned char tw_fw_code[] __initdata = 
 35,231,13,0,35,255,17,0,35,239,5,0,35,223,9,0,
 3,30,20,0,127,0,80,26,99,255,13,0,99,223,5,0,
 99,231,9,0,7,216,99,239,1,0,3,230,8,0,6,232,
-224,233,242,21,68,102,0,0,44,102,68,236,125,103,5,0,
+224,233,242,21,68,102,0,0,44,102,40,236,125,103,5,0,
 61,54,8,0,1,58,191,255,100,255,68,94,0,0,43,94,
-36,236,125,95,5,0,129,218,201,5,29,48,128,255,80,4,
+8,236,125,95,5,0,129,218,201,5,29,48,128,255,80,4,
 35,223,5,0,35,239,1,0,35,255,13,0,35,231,9,0,
 3,30,16,0,127,0,88,26,99,255,5,0,99,231,1,0,
 72,50,3,224,191,255,250,254,35,231,1,0,35,255,5,0,
@@ -14475,30 +14602,30 @@ unsigned char tw_fw_code[] __initdata = 
 128,255,56,3,35,255,5,0,35,231,1,0,72,26,127,0,
 80,26,99,255,13,0,99,223,5,0,99,231,9,0,7,216,
 99,239,1,0,3,230,8,0,6,232,224,233,242,21,68,94,
-0,0,43,94,68,236,125,95,5,0,61,54,8,0,1,58,
-191,255,202,254,68,86,0,0,42,86,36,236,125,87,5,0,
+0,0,43,94,40,236,125,95,5,0,61,54,8,0,1,58,
+191,255,202,254,68,86,0,0,42,86,8,236,125,87,5,0,
 129,218,201,5,29,48,128,255,182,3,35,223,5,0,35,239,
 1,0,35,255,13,0,35,231,9,0,3,30,16,0,127,0,
 88,26,99,255,5,0,99,231,1,0,3,224,128,255,188,2,
 35,255,5,0,35,231,1,0,72,26,127,0,80,26,99,255,
 13,0,99,223,5,0,99,231,9,0,7,216,99,239,1,0,
 3,230,8,0,6,232,224,233,242,21,68,94,0,0,43,94,
-68,236,125,95,5,0,61,54,8,0,1,58,191,255,78,254,
-68,86,0,0,42,86,36,236,125,87,5,0,129,218,201,5,
+40,236,125,95,5,0,61,54,8,0,1,58,191,255,78,254,
+68,86,0,0,42,86,8,236,125,87,5,0,129,218,201,5,
 29,48,128,255,58,3,35,223,5,0,35,239,1,0,35,255,
 13,0,35,231,9,0,3,30,16,0,127,0,88,26,99,255,
 5,0,99,231,1,0,3,224,128,255,64,2,35,255,5,0,
 35,231,1,0,72,26,127,0,68,0,3,30,164,255,99,255,
 89,0,99,231,85,0,99,207,81,0,3,230,84,0,99,215,
 77,0,99,239,69,0,99,223,73,0,128,239,4,0,68,222,
-0,0,131,55,3,0,67,55,1,0,59,222,172,236,35,54,
+0,0,131,55,3,0,67,55,1,0,59,222,144,236,35,54,
 4,0,0,58,191,255,198,253,35,54,4,0,27,56,191,255,
-236,250,35,222,4,0,68,206,0,0,57,206,36,236,68,214,
-0,0,68,54,0,0,38,54,164,236,99,55,33,0,58,214,
-68,236,131,55,5,0,67,55,3,0,99,215,37,0,35,54,
+236,250,35,222,4,0,68,206,0,0,57,206,8,236,68,214,
+0,0,68,54,0,0,38,54,136,236,99,55,33,0,58,214,
+40,236,131,55,5,0,67,55,3,0,99,215,37,0,35,54,
 40,0,0,58,191,255,134,253,35,54,40,0,27,56,0,66,
-31,74,191,255,70,249,68,54,0,0,38,54,100,236,99,55,
-37,0,68,102,0,0,44,103,33,236,35,222,32,0,224,97,
+31,74,191,255,70,249,68,54,0,0,38,54,72,236,99,55,
+37,0,68,102,0,0,44,103,5,236,35,222,32,0,224,97,
 130,13,27,48,12,88,93,254,0,0,63,254,146,0,107,0,
 59,63,5,0,93,254,0,0,39,71,29,0,39,79,24,0,
 63,254,176,0,7,62,24,0,9,48,219,49,104,0,27,48,
@@ -14509,13 +14636,13 @@ unsigned char tw_fw_code[] __initdata = 
 3,30,164,255,99,255,89,0,99,231,85,0,99,207,81,0,
 3,230,84,0,99,215,77,0,99,239,69,0,99,223,73,0,
 128,239,4,0,68,222,0,0,131,55,3,0,67,55,1,0,
-59,222,196,236,35,54,4,0,0,58,191,255,176,252,35,54,
+59,222,168,236,35,54,4,0,0,58,191,255,176,252,35,54,
 4,0,27,56,191,255,214,249,35,222,4,0,68,206,0,0,
-57,206,36,236,68,214,0,0,68,54,0,0,38,54,188,236,
-99,55,33,0,58,214,68,236,131,55,5,0,67,55,3,0,
+57,206,8,236,68,214,0,0,68,54,0,0,38,54,160,236,
+99,55,33,0,58,214,40,236,131,55,5,0,67,55,3,0,
 99,215,37,0,35,54,40,0,0,58,191,255,112,252,35,54,
 40,0,27,56,0,66,31,74,191,255,48,248,68,54,0,0,
-38,54,132,236,99,55,37,0,68,102,0,0,44,103,33,236,
+38,54,104,236,99,55,37,0,68,102,0,0,44,103,5,236,
 35,222,32,0,224,97,130,13,27,48,12,88,93,254,0,0,
 63,254,146,0,107,0,59,63,5,0,93,254,0,0,39,71,
 29,0,39,79,24,0,63,254,176,0,7,62,24,0,9,48,
@@ -14528,10 +14655,10 @@ unsigned char tw_fw_code[] __initdata = 
 99,223,5,0,128,239,4,0,6,64,40,63,5,0,93,254,
 0,0,39,87,21,0,39,95,16,0,63,254,32,0,7,62,
 16,0,11,48,200,49,106,0,10,208,64,222,0,0,59,222,
-104,241,196,217,27,56,68,54,0,0,38,54,236,236,128,255,
+76,241,196,217,27,56,68,54,0,0,38,54,208,236,128,255,
 48,34,224,209,178,5,26,48,213,5,68,54,0,0,38,54,
-224,236,27,56,128,255,26,34,27,56,68,54,0,0,38,54,
-232,236,128,255,12,34,128,255,236,26,35,215,9,0,35,223,
+196,236,27,56,128,255,26,34,27,56,68,54,0,0,38,54,
+204,236,128,255,12,34,128,255,236,26,35,215,9,0,35,223,
 5,0,35,239,1,0,35,255,17,0,35,231,13,0,3,30,
 20,0,127,0,88,26,99,255,5,0,99,231,1,0,3,224,
 128,255,44,0,35,255,5,0,35,231,1,0,72,26,127,0,
@@ -14541,7 +14668,7 @@ unsigned char tw_fw_code[] __initdata = 
 35,255,5,0,35,231,1,0,72,26,127,0,3,30,236,255,
 99,255,17,0,99,231,13,0,99,215,9,0,3,230,12,0,
 99,239,1,0,99,223,5,0,128,239,4,0,6,208,224,209,
-186,29,1,210,149,29,68,54,0,0,38,55,1,237,224,49,
+186,29,1,210,149,29,68,54,0,0,38,55,229,236,224,49,
 218,5,93,54,0,0,38,54,116,3,6,216,93,254,0,0,
 63,254,42,0,123,0,93,102,0,0,44,102,116,3,236,217,
 186,5,0,48,245,5,26,48,128,255,178,29,10,48,224,49,
@@ -14554,10 +14681,10 @@ unsigned char tw_fw_code[] __initdata = 
 4,0,99,63,29,0,99,71,25,0,9,208,35,87,81,0,
 6,216,224,217,178,5,224,81,178,53,35,111,25,0,35,207,
 29,0,224,217,237,207,34,2,234,29,68,54,0,0,38,55,
-249,236,35,119,69,0,217,49,224,113,202,5,191,255,196,254,
+221,236,35,119,69,0,217,49,224,113,202,5,191,255,196,254,
 245,5,93,254,0,0,63,254,76,0,14,104,109,0,10,48,
-224,49,226,5,68,62,0,0,39,63,249,236,199,49,6,216,
-224,217,226,77,68,78,0,0,41,79,249,236,27,48,169,49,
+224,49,226,5,68,62,0,0,39,63,221,236,199,49,6,216,
+224,217,226,77,68,78,0,0,41,79,221,236,27,48,169,49,
 35,111,29,0,102,207,1,0,45,64,102,71,5,0,35,119,
 61,0,224,113,210,61,0,202,99,223,33,0,213,53,35,55,
 33,0,224,209,154,29,35,119,61,0,0,58,99,119,21,0,
@@ -14577,7 +14704,7 @@ unsigned char tw_fw_code[] __initdata = 
 3,230,32,0,99,215,25,0,99,239,17,0,99,223,21,0,
 128,239,4,0,7,208,99,71,13,0,99,79,9,0,99,7,
 5,0,6,200,224,201,178,101,127,210,186,29,68,102,0,0,
-44,103,249,236,25,48,172,49,38,87,5,0,38,223,1,0,
+44,103,221,236,25,48,172,49,38,87,5,0,38,223,1,0,
 35,55,13,0,42,88,235,55,34,2,230,217,178,5,128,255,
 238,0,99,223,5,0,35,111,13,0,27,208,237,215,194,2,
 35,119,9,0,224,113,130,37,99,7,1,0,35,111,13,0,
@@ -14585,7 +14712,7 @@ unsigned char tw_fw_code[] __initdata = 
 93,254,0,0,35,111,9,0,63,254,122,0,109,0,35,119,
 1,0,35,111,13,0,65,114,99,119,1,0,173,217,35,119,
 1,0,250,113,198,237,35,119,41,0,224,113,130,37,35,79,
-49,0,35,63,5,0,68,70,0,0,40,71,249,236,35,223,
+49,0,35,63,5,0,68,70,0,0,40,71,221,236,35,223,
 45,0,200,57,25,48,168,49,224,217,202,5,191,255,168,252,
 229,13,224,73,242,5,93,254,0,0,63,254,204,0,123,0,
 229,5,93,254,0,0,63,254,216,0,123,0,35,207,29,0,
@@ -14598,8 +14725,8 @@ unsigned char tw_fw_code[] __initdata = 
 1,0,35,255,5,0,72,26,127,0,3,30,12,0,3,30,
 192,25,127,0,3,30,236,255,99,255,17,0,99,231,13,0,
 99,215,9,0,3,230,12,0,99,239,1,0,99,223,5,0,
-128,239,4,0,68,102,0,0,44,103,253,236,0,218,224,97,
-218,37,1,50,68,14,0,0,97,55,253,236,93,54,0,0,
+128,239,4,0,68,102,0,0,44,103,225,236,0,218,224,97,
+218,37,1,50,68,14,0,0,97,55,225,236,93,54,0,0,
 38,54,112,0,128,255,24,23,133,21,27,48,65,218,194,50,
 68,62,255,255,39,62,156,124,199,49,38,215,1,0,93,254,
 0,0,63,254,68,0,122,0,27,88,194,90,68,70,255,255,
@@ -14607,33 +14734,33 @@ unsigned char tw_fw_code[] __initdata = 
 5,0,35,239,1,0,35,255,17,0,35,231,13,0,3,30,
 20,0,127,0,80,26,99,255,13,0,99,231,9,0,99,239,
 1,0,3,230,8,0,99,223,5,0,128,239,4,0,213,29,
-39,103,1,0,68,14,15,0,97,103,89,230,7,48,38,63,
+39,103,1,0,68,14,15,0,97,103,61,230,7,48,38,63,
 5,0,224,57,178,13,38,223,9,0,93,254,0,0,7,48,
 2,58,63,254,42,0,123,0,133,13,38,223,9,0,93,254,
-0,0,63,254,58,0,123,0,68,62,15,0,39,63,89,230,
+0,0,63,254,58,0,123,0,68,62,15,0,39,63,61,230,
 224,57,250,221,35,223,5,0,35,239,1,0,35,255,13,0,
 35,231,9,0,3,30,16,0,127,0,88,26,99,255,5,0,
 99,231,1,0,38,103,1,0,3,224,224,97,218,13,68,62,
-15,0,39,63,89,230,231,49,242,5,102,63,1,0,68,14,
-15,0,97,55,89,230,35,255,5,0,35,231,1,0,72,26,
+15,0,39,63,61,230,231,49,242,5,102,63,1,0,68,14,
+15,0,97,55,61,230,35,255,5,0,35,231,1,0,72,26,
 127,0,88,26,99,255,5,0,99,231,1,0,6,56,3,224,
 0,50,95,58,104,58,251,53,71,0,9,0,14,0,19,0,
 24,0,29,0,34,0,39,0,44,0,49,0,68,54,0,0,
-38,54,4,237,133,45,68,54,0,0,38,54,80,237,181,37,
-68,54,0,0,38,54,136,237,229,29,68,54,0,0,38,54,
-52,238,149,29,68,54,0,0,38,54,188,237,197,21,68,54,
-0,0,38,54,220,237,245,13,68,54,0,0,38,54,0,238,
-165,13,68,54,0,0,38,54,24,238,213,5,68,54,0,0,
-38,54,24,237,35,255,5,0,35,231,1,0,6,80,72,26,
+38,54,232,236,133,45,68,54,0,0,38,54,52,237,181,37,
+68,54,0,0,38,54,108,237,229,29,68,54,0,0,38,54,
+24,238,149,29,68,54,0,0,38,54,160,237,197,21,68,54,
+0,0,38,54,192,237,245,13,68,54,0,0,38,54,228,237,
+165,13,68,54,0,0,38,54,252,237,213,5,68,54,0,0,
+38,54,252,236,35,255,5,0,35,231,1,0,6,80,72,26,
 127,0,80,26,99,255,13,0,99,231,9,0,99,239,1,0,
 3,230,8,0,99,223,5,0,6,232,1,50,191,255,86,255,
-10,216,29,48,191,255,78,255,64,54,0,0,38,54,104,241,
-196,49,27,64,10,72,68,62,0,0,39,62,120,238,128,255,
+10,216,29,48,191,255,78,255,64,54,0,0,38,54,76,241,
+196,49,27,64,10,72,68,62,0,0,39,62,92,238,128,255,
 136,11,128,255,208,20,35,231,9,0,35,255,13,0,35,239,
 1,0,35,223,5,0,3,30,16,0,127,0,3,30,224,255,
 99,79,29,0,99,71,25,0,99,255,13,0,99,231,9,0,
 35,102,20,0,3,230,8,0,99,103,1,0,6,64,64,54,
-0,0,38,54,88,241,99,63,21,0,196,49,35,94,16,0,
+0,0,38,54,60,241,99,63,21,0,196,49,35,94,16,0,
 203,94,7,0,99,95,5,0,8,56,35,79,5,0,12,64,
 128,255,20,0,35,231,9,0,35,255,13,0,3,30,32,0,
 127,0,4,2,3,30,212,253,99,79,41,2,99,71,37,2,
@@ -14659,7 +14786,7 @@ unsigned char tw_fw_code[] __initdata = 
 3,230,40,0,99,215,33,0,99,239,25,0,99,223,29,0,
 128,239,4,0,99,55,21,0,38,119,9,0,99,119,17,0,
 7,216,38,207,13,0,224,217,99,223,1,0,250,5,68,222,
-0,0,59,222,128,238,99,223,1,0,27,48,128,255,158,29,
+0,0,59,222,100,238,99,223,1,0,27,48,128,255,158,29,
 35,111,21,0,10,48,13,71,21,0,45,63,5,0,224,65,
 194,5,230,57,169,5,7,48,6,112,219,113,99,119,9,0,
 35,119,21,0,46,119,1,0,230,113,99,119,5,0,190,5,
@@ -14683,7 +14810,7 @@ unsigned char tw_fw_code[] __initdata = 
 99,231,125,1,99,207,121,1,3,230,124,1,99,215,117,1,
 99,239,109,1,99,223,113,1,128,239,4,0,99,55,21,0,
 99,63,25,0,0,210,8,216,224,217,218,5,68,222,0,0,
-59,222,128,238,35,111,21,0,99,111,89,1,35,111,25,0,
+59,222,100,238,35,111,21,0,99,111,89,1,35,111,25,0,
 99,111,93,1,128,7,30,7,6,6,219,255,226,13,35,63,
 21,0,93,254,0,0,35,103,25,0,63,254,68,0,108,0,
 65,218,65,210,128,7,254,6,65,218,31,50,99,55,85,1,
@@ -14766,7 +14893,7 @@ unsigned char tw_fw_code[] __initdata = 
 229,5,32,62,48,0,89,63,255,255,95,202,230,201,171,253,
 25,56,128,7,22,2,99,87,29,0,3,71,105,1,3,206,
 135,0,8,6,168,255,226,111,0,0,99,95,33,0,196,106,
-68,94,0,0,43,94,136,238,203,105,99,111,9,0,67,7,
+68,94,0,0,43,94,108,238,203,105,99,111,9,0,67,7,
 135,0,35,79,33,0,10,64,0,50,0,58,128,255,34,36,
 97,82,186,5,67,7,100,1,3,87,105,1,10,6,145,255,
 138,13,3,106,99,111,13,0,7,106,99,111,17,0,165,45,
@@ -14783,7 +14910,7 @@ unsigned char tw_fw_code[] __initdata = 
 35,111,13,0,100,106,178,5,191,7,248,254,3,95,100,1,
 224,89,186,5,191,7,236,254,3,87,105,1,32,54,48,0,
 89,87,255,255,89,55,254,255,94,202,191,7,214,254,68,206,
-0,0,57,206,168,238,25,56,35,54,80,1,191,255,244,247,
+0,0,57,206,140,238,25,56,35,54,80,1,191,255,244,247,
 202,209,32,54,41,0,89,55,15,0,89,7,16,0,165,109,
 67,7,96,1,3,79,104,1,35,95,145,1,224,73,210,13,
 11,70,3,0,28,90,75,65,68,66,99,71,145,1,40,71,
@@ -14924,7 +15051,7 @@ unsigned char tw_fw_code[] __initdata = 
 35,103,25,0,35,55,49,0,35,63,53,0,108,63,5,0,
 108,55,1,0,165,13,35,103,25,0,35,63,49,0,108,63,
 1,0,35,111,9,0,97,106,29,48,6,216,127,218,190,5,
-128,7,12,2,128,7,238,1,68,94,0,0,43,94,227,238,
+128,7,12,2,128,7,238,1,68,94,0,0,43,94,199,238,
 99,95,1,0,29,6,141,255,202,5,99,31,37,0,213,5,
 35,110,4,0,99,111,37,0,35,111,17,0,99,7,45,0,
 224,105,210,13,35,87,89,1,28,58,67,82,71,81,68,82,
@@ -14932,7 +15059,7 @@ unsigned char tw_fw_code[] __initdata = 
 99,207,41,0,99,223,29,0,61,239,1,0,29,87,0,0,
 31,218,10,6,162,255,234,207,0,0,170,5,65,234,35,54,
 56,0,224,201,226,79,0,0,9,56,32,70,0,1,189,255,
-184,204,29,71,0,0,8,6,163,255,218,37,65,234,67,207,
+20,196,29,71,0,0,8,6,163,255,218,37,65,234,67,207,
 149,0,149,37,10,64,8,6,211,255,250,21,127,218,210,21,
 29,63,1,0,224,57,146,21,7,6,163,255,226,13,65,234,
 229,5,27,72,65,218,195,73,73,207,56,0,29,63,0,0,
@@ -14965,19 +15092,19 @@ unsigned char tw_fw_code[] __initdata = 
 127,0,88,26,99,255,5,0,99,231,1,0,6,50,3,224,
 128,255,110,34,35,231,1,0,35,255,5,0,72,26,127,0,
 8,2,191,255,48,208,32,230,35,0,28,48,194,50,68,86,
-15,0,202,49,38,63,93,230,224,57,38,54,92,230,162,13,
+15,0,202,49,38,63,65,230,224,57,38,54,64,230,162,13,
 7,216,0,58,102,7,1,0,93,254,0,0,63,254,48,0,
-123,0,95,226,188,237,68,230,0,0,60,79,137,242,224,73,
-60,230,136,242,146,13,9,216,93,254,0,0,63,254,80,0,
+123,0,95,226,188,237,68,230,0,0,60,79,109,242,224,73,
+60,230,108,242,146,13,9,216,93,254,0,0,63,254,80,0,
 123,0,124,7,1,0,191,255,240,207,30,2,8,2,6,216,
-68,230,15,0,191,255,206,207,60,103,237,230,224,97,60,230,
-236,230,170,13,93,94,0,0,43,94,162,255,124,95,1,0,
+68,230,15,0,191,255,206,207,60,103,209,230,224,97,60,230,
+208,230,170,13,93,94,0,0,43,94,162,255,124,95,1,0,
 28,48,128,255,146,32,0,74,9,48,194,50,68,70,15,0,
-200,49,38,63,93,230,224,57,38,54,92,230,250,5,102,223,
+200,49,38,63,65,230,224,57,38,54,64,230,250,5,102,223,
 1,0,191,255,164,207,0,82,133,13,65,74,9,6,220,255,
 198,237,191,255,148,207,31,82,30,2,80,26,80,26,99,255,
 13,0,99,239,1,0,99,223,5,0,6,232,99,231,9,0,
-68,222,15,0,59,222,244,230,59,103,33,0,3,230,8,0,
+68,222,15,0,59,222,216,230,59,103,33,0,3,230,8,0,
 224,97,218,5,32,54,0,8,123,55,33,0,59,55,33,0,
 29,56,95,50,6,72,221,73,72,74,38,232,73,233,180,5,
 231,233,185,5,0,216,149,61,29,48,128,255,104,32,10,48,
@@ -14993,7 +15120,7 @@ unsigned char tw_fw_code[] __initdata = 
 99,231,21,0,99,239,5,0,99,223,9,0,3,230,20,0,
 6,222,11,0,24,90,75,217,230,217,185,5,0,72,149,117,
 27,6,240,255,177,5,32,222,16,0,68,214,15,0,58,214,
-244,230,58,239,5,0,224,233,186,13,26,238,16,0,122,239,
+216,230,58,239,5,0,224,233,186,13,26,238,16,0,122,239,
 5,0,122,239,17,0,122,239,21,0,122,7,13,0,29,56,
 61,239,1,0,61,79,253,255,251,73,193,45,61,87,1,0,
 9,48,122,63,5,0,187,49,6,6,120,255,241,5,103,87,
@@ -15009,10 +15136,10 @@ unsigned char tw_fw_code[] __initdata = 
 35,207,17,0,35,231,21,0,35,255,25,0,35,239,5,0,
 35,223,9,0,35,215,13,0,9,80,3,30,28,0,127,0,
 84,26,99,255,9,0,99,239,1,0,99,231,5,0,68,70,
-15,0,38,79,253,255,40,71,249,230,3,230,4,0,232,49,
+15,0,38,79,253,255,40,71,221,230,3,230,4,0,232,49,
 169,13,8,56,7,64,40,63,5,0,231,49,185,13,232,57,
 161,253,133,13,8,56,39,71,1,0,232,57,185,5,230,65,
-163,253,68,14,15,0,97,63,249,230,0,250,39,87,253,255,
+163,253,68,14,15,0,97,63,221,230,0,250,39,87,253,255,
 0,234,10,96,199,97,230,97,138,13,7,48,38,63,5,0,
 202,73,102,79,253,255,1,250,9,88,198,89,232,89,170,21,
 40,95,1,0,40,87,253,255,103,55,1,0,202,73,102,63,
@@ -15042,9 +15169,9 @@ unsigned char tw_fw_code[] __initdata = 
 5,0,127,55,1,0,12,102,16,135,127,103,5,0,165,5,
 0,90,224,89,170,189,63,87,5,0,63,79,1,0,208,82,
 202,73,164,74,253,79,192,50,6,80,32,2,10,2,68,102,
-15,0,44,103,25,231,224,97,170,13,1,50,68,14,15,0,
-97,55,25,231,68,14,15,0,97,55,29,231,191,255,54,203,
-68,54,15,0,38,54,28,231,191,255,224,254,10,232,191,255,
+15,0,44,103,253,230,224,97,170,13,1,50,68,14,15,0,
+97,55,253,230,68,14,15,0,97,55,1,231,191,255,54,203,
+68,54,15,0,38,54,0,231,191,255,224,254,10,232,191,255,
 56,203,29,80,32,2,68,62,8,0,17,2,7,216,8,232,
 0,226,0,202,99,7,1,0,6,248,99,255,5,0,165,5,
 65,250,31,55,0,0,6,6,224,255,178,253,104,50,182,5,
@@ -15071,7 +15198,7 @@ unsigned char tw_fw_code[] __initdata = 
 15,0,218,53,61,103,1,0,230,97,163,37,221,255,13,0,
 146,13,61,95,12,0,0,58,203,54,255,63,2,66,128,255,
 140,24,61,87,12,0,61,79,1,0,61,63,5,0,202,54,
-255,63,167,73,9,64,191,255,142,111,61,63,5,0,61,55,
+255,63,167,73,9,64,191,255,140,111,61,63,5,0,61,55,
 1,0,167,49,230,81,206,5,221,31,15,0,31,226,61,95,
 5,0,221,183,13,0,125,95,1,0,224,89,202,5,125,7,
 9,0,213,5,32,54,0,2,125,55,9,0,29,48,128,255,
@@ -15080,7 +15207,7 @@ unsigned char tw_fw_code[] __initdata = 
 186,61,28,48,128,255,134,3,10,216,224,217,130,13,28,55,
 0,0,29,56,128,255,122,5,127,82,130,21,95,218,224,217,
 247,45,61,87,12,0,28,78,1,0,202,54,255,63,9,56,
-27,64,191,255,2,111,251,81,190,37,221,31,15,0,31,226,
+27,64,191,255,0,111,251,81,190,37,221,31,15,0,31,226,
 133,37,61,71,9,0,95,66,125,71,9,0,140,13,28,55,
 0,0,29,56,128,255,58,5,10,48,181,13,61,95,1,0,
 65,90,125,95,1,0,28,55,0,0,75,55,255,255,134,0,
@@ -15089,18 +15216,18 @@ unsigned char tw_fw_code[] __initdata = 
 146,0,61,103,9,0,95,98,125,103,9,0,236,5,29,48,
 128,255,44,4,10,224,133,13,61,95,1,0,65,90,125,95,
 1,0,171,231,255,255,29,48,128,255,146,0,28,80,31,2,
-0,2,68,94,0,0,43,94,72,241,171,49,164,50,6,6,
-236,255,193,13,6,72,194,74,68,62,0,0,39,62,140,242,
+0,2,68,94,0,0,43,94,44,241,171,49,164,50,6,6,
+236,255,193,13,6,72,194,74,68,62,0,0,39,62,112,242,
 9,64,199,65,8,48,191,255,154,200,22,2,10,2,68,94,
-0,0,43,94,72,241,171,49,164,50,6,6,236,255,129,21,
-6,232,194,234,68,70,0,0,200,233,61,55,141,242,224,49,
-61,238,140,242,210,5,191,255,176,200,125,7,1,0,32,2,
-0,2,68,94,0,0,43,94,72,241,171,49,164,50,6,6,
-236,255,177,13,194,50,68,62,0,0,199,49,38,55,141,242,
+0,0,43,94,44,241,171,49,164,50,6,6,236,255,129,21,
+6,232,194,234,68,70,0,0,200,233,61,55,113,242,224,49,
+61,238,112,242,210,5,191,255,176,200,125,7,1,0,32,2,
+0,2,68,94,0,0,43,94,44,241,171,49,164,50,6,6,
+236,255,177,13,194,50,68,62,0,0,199,49,38,55,113,242,
 224,49,178,5,191,255,34,200,22,2,0,2,68,94,0,0,
-43,94,72,241,171,49,164,50,6,6,236,255,177,13,194,50,
-68,62,0,0,199,49,38,55,141,242,224,49,178,5,191,255,
-6,200,22,2,0,2,9,2,68,54,0,0,38,54,72,241,
+43,94,44,241,171,49,164,50,6,6,236,255,177,13,194,50,
+68,62,0,0,199,49,38,55,113,242,224,49,178,5,191,255,
+6,200,22,2,0,2,9,2,68,54,0,0,38,54,44,241,
 198,47,15,0,6,238,16,0,198,55,31,0,6,230,32,0,
 38,103,28,0,32,110,0,192,77,97,140,102,1,0,38,87,
 44,0,102,103,28,0,77,81,138,86,2,0,102,87,44,0,
@@ -15115,8 +15242,8 @@ unsigned char tw_fw_code[] __initdata = 
 242,245,219,183,15,0,219,191,13,0,127,210,226,85,59,103,
 5,0,224,97,234,37,32,54,0,2,191,255,32,250,123,87,
 5,0,10,56,224,57,146,77,123,63,1,0,93,94,0,0,
-43,94,4,2,68,14,0,0,97,95,137,242,68,54,15,0,
-38,87,37,231,224,81,38,54,36,231,154,13,93,78,0,0,
+43,94,4,2,68,14,0,0,97,95,109,242,68,54,15,0,
+38,87,9,231,224,81,38,54,8,231,154,13,93,78,0,0,
 41,78,220,246,102,79,1,0,128,255,124,23,219,39,15,0,
 59,71,1,0,59,63,5,0,231,65,234,21,59,55,9,0,
 6,6,0,254,174,37,198,57,213,5,135,55,1,0,71,55,
@@ -15139,23 +15266,23 @@ unsigned char tw_fw_code[] __initdata = 
 186,5,0,232,197,37,29,48,28,56,128,255,244,2,10,48,
 6,96,221,97,12,95,0,0,224,89,194,245,198,233,29,48,
 28,56,128,255,174,2,10,48,221,81,10,79,0,0,224,73,
-234,5,68,70,15,0,40,62,44,231,197,5,6,56,221,57,
+234,5,68,70,15,0,40,62,16,231,197,5,6,56,221,57,
 65,58,123,63,1,0,221,49,70,7,0,0,29,80,30,2,
 9,2,6,232,7,224,191,255,178,197,29,48,28,56,42,70,
 180,0,191,255,140,255,31,2,10,2,0,234,181,13,29,48,
-196,50,68,78,0,0,41,78,72,241,201,49,128,255,20,0,
-65,234,68,70,0,0,232,71,237,238,232,233,150,245,32,2,
+196,50,68,78,0,0,41,78,44,241,201,49,128,255,20,0,
+65,234,68,70,0,0,232,71,209,238,232,233,150,245,32,2,
 8,2,6,224,0,218,191,255,220,196,224,225,242,13,220,247,
 15,0,226,5,28,48,191,255,242,250,10,216,229,13,220,239,
 15,0,186,13,220,255,15,0,138,13,9,50,128,255,190,20,
 191,255,198,196,31,218,133,45,60,103,12,0,204,54,255,63,
 128,255,118,19,127,82,170,5,31,218,68,94,0,0,43,95,
-221,242,224,89,130,13,28,48,11,80,93,254,0,0,63,254,
-98,0,106,0,28,48,0,58,32,70,16,0,189,255,250,190,
+193,242,224,89,130,13,28,48,11,80,93,254,0,0,63,254,
+98,0,106,0,28,48,0,58,32,70,16,0,189,255,86,182,
 60,79,12,0,137,78,255,63,124,79,12,0,28,48,191,255,
 46,252,191,255,116,196,27,80,30,2,4,0,21,2,6,232,
-68,54,0,0,38,54,72,241,230,233,129,85,68,86,0,0,
-234,87,237,238,196,82,198,81,234,233,137,77,29,71,15,0,
+68,54,0,0,38,54,44,241,230,233,129,85,68,86,0,0,
+234,87,209,238,196,82,198,81,234,233,137,77,29,71,15,0,
 200,70,3,0,99,66,162,69,221,239,15,0,202,5,221,31,
 15,0,197,61,221,183,15,0,61,63,5,0,221,191,13,0,
 224,57,234,13,221,183,13,0,61,103,12,0,35,62,3,0,
@@ -15166,15 +15293,15 @@ unsigned char tw_fw_code[] __initdata = 
 15,0,226,5,221,55,15,0,181,5,221,31,15,0,61,63,
 5,0,125,7,9,0,125,63,1,0,31,82,229,5,95,50,
 125,55,9,0,163,87,3,0,43,2,4,0,4,0,20,2,
-6,224,7,232,68,54,0,0,38,54,72,241,230,233,193,69,
-68,86,0,0,234,87,237,238,196,82,198,81,234,233,201,61,
+6,224,7,232,68,54,0,0,38,54,44,241,230,233,193,69,
+68,86,0,0,234,87,209,238,196,82,198,81,234,233,201,61,
 221,247,15,0,146,61,29,71,15,0,200,70,3,0,99,66,
 178,53,221,215,15,0,130,13,221,239,15,0,210,5,61,63,
 5,0,125,63,1,0,221,151,15,0,61,55,5,0,221,175,
 15,0,224,49,202,29,67,231,3,0,221,255,13,0,146,13,
 61,103,12,0,0,58,204,54,255,63,2,66,128,255,30,18,
 61,95,12,0,35,62,3,0,203,54,255,63,1,66,191,255,
-38,105,97,82,254,13,221,31,15,0,229,5,29,48,191,255,
+36,105,97,82,254,13,221,31,15,0,229,5,29,48,191,255,
 42,249,224,81,178,5,31,82,245,5,28,48,29,56,128,255,
 12,0,28,80,138,0,42,2,4,0,0,2,128,255,6,0,
 22,2,9,2,6,224,7,232,29,48,191,255,214,250,61,103,
@@ -15473,11 +15600,11 @@ unsigned char tw_fw_code[] __initdata = 
 5,0,72,26,127,0,88,26,99,255,5,0,99,231,1,0,
 8,80,3,224,7,72,9,64,10,72,6,56,38,6,19,0,
 4,0,128,255,16,0,35,231,1,0,35,255,5,0,72,26,
-127,0,92,26,99,255,1,0,97,2,0,82,130,255,124,189,
+127,0,92,26,99,255,1,0,97,2,0,82,130,255,84,192,
 217,5,10,48,128,255,86,0,31,82,35,255,1,0,68,26,
 127,0,84,26,99,255,9,0,99,231,5,0,99,239,1,0,
 3,230,4,0,128,239,4,0,93,102,0,0,44,102,192,176,
-224,97,234,5,68,86,0,0,42,86,224,242,245,5,191,255,
+224,97,234,5,68,86,0,0,42,86,196,242,245,5,191,255,
 170,176,10,48,224,49,170,5,0,80,35,239,1,0,35,255,
 9,0,35,231,5,0,76,26,127,0,84,26,99,255,9,0,
 99,231,5,0,99,239,1,0,3,230,4,0,6,232,191,255,
@@ -15486,25 +15613,25 @@ unsigned char tw_fw_code[] __initdata = 
 4,0,3,30,228,255,99,255,25,0,99,231,21,0,99,207,
 17,0,3,230,20,0,99,215,13,0,99,239,5,0,99,223,
 9,0,128,239,4,0,99,55,1,0,0,202,191,255,150,175,
-68,222,15,0,59,223,49,231,165,13,59,215,1,0,93,254,
+68,222,15,0,59,223,21,231,165,13,59,215,1,0,93,254,
 0,0,63,254,34,0,122,0,59,223,5,0,224,217,234,245,
-68,102,0,0,44,103,241,238,224,97,242,5,191,255,252,175,
-42,54,220,0,189,255,252,167,35,63,1,0,2,50,191,255,
+68,102,0,0,44,103,213,238,224,97,242,5,191,255,252,175,
+42,54,220,0,189,255,88,159,35,63,1,0,2,50,191,255,
 244,254,25,88,171,0,2,82,75,80,202,54,1,0,98,50,
 145,253,191,255,84,175,35,207,17,0,35,215,13,0,35,223,
 9,0,35,239,5,0,35,255,25,0,35,231,21,0,3,30,
 28,0,127,0,84,26,99,255,9,0,99,231,5,0,99,239,
 1,0,3,230,4,0,6,232,191,255,10,175,68,102,15,0,
-44,103,49,231,125,103,5,0,68,14,15,0,97,239,49,231,
+44,103,21,231,125,103,5,0,68,14,15,0,97,239,21,231,
 191,255,6,175,35,239,1,0,35,255,9,0,35,231,5,0,
 76,26,127,0,88,26,99,255,5,0,99,231,1,0,1,50,
 3,224,191,255,16,255,35,231,1,0,35,255,5,0,72,26,
 127,0,80,26,99,255,13,0,99,231,9,0,99,223,5,0,
 3,230,8,0,99,239,1,0,6,216,68,238,15,0,191,255,
-164,174,61,103,53,231,224,97,61,238,52,231,250,5,68,94,
-18,0,43,94,68,39,125,95,1,0,61,55,1,0,68,78,
-18,0,219,49,41,78,68,39,230,73,203,13,68,70,122,0,
-40,70,68,104,232,49,235,5,125,55,1,0,6,232,187,233,
+164,174,61,103,25,231,224,97,61,238,24,231,250,5,68,94,
+18,0,43,94,40,39,125,95,1,0,61,55,1,0,68,78,
+18,0,219,49,41,78,40,39,230,73,203,13,68,70,122,0,
+40,70,200,92,232,49,235,5,125,55,1,0,6,232,187,233,
 213,5,31,234,12,50,191,255,100,254,191,255,108,174,29,80,
 35,223,5,0,35,239,1,0,35,255,13,0,35,231,9,0,
 3,30,16,0,127,0,88,26,99,255,5,0,99,231,1,0,
@@ -15562,15 +15689,15 @@ unsigned char tw_fw_code[] __initdata = 
 129,50,230,63,128,0,166,65,167,65,8,80,127,0,0,0,
 115,116,114,105,110,103,32,110,111,116,32,102,111,117,110,100,
 0,0,0,0,0,0,0,0,248,12,128,0,0,0,0,0,
-0,0,0,0,152,175,138,0,26,11,128,0,0,0,0,0,
-240,20,128,0,0,0,0,0,0,0,0,0,140,228,140,0,
-172,20,128,0,0,0,0,0,0,0,0,0,0,0,0,0,
-254,34,128,0,0,0,0,0,28,35,128,0,0,0,0,0,
-34,35,128,0,0,0,0,0,0,0,0,0,0,0,0,0,
-206,35,128,0,0,0,0,0,66,36,128,0,0,0,0,0,
-90,36,128,0,0,0,0,0,0,0,0,0,0,0,0,0,
-102,36,128,0,0,0,0,0,66,36,128,0,0,0,0,0,
-218,36,128,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,248,186,138,0,26,11,128,0,0,0,0,0,
+176,21,128,0,0,0,0,0,0,0,0,0,236,239,140,0,
+108,21,128,0,0,0,0,0,0,0,0,0,0,0,0,0,
+190,35,128,0,0,0,0,0,220,35,128,0,0,0,0,0,
+226,35,128,0,0,0,0,0,0,0,0,0,0,0,0,0,
+182,38,128,0,0,0,0,0,42,39,128,0,0,0,0,0,
+66,39,128,0,0,0,0,0,0,0,0,0,0,0,0,0,
+78,39,128,0,0,0,0,0,42,39,128,0,0,0,0,0,
+194,39,128,0,0,0,0,0,0,0,0,0,0,0,0,0,
 1,0,0,0,64,2,0,0,2,0,0,0,66,2,0,0,
 3,0,0,0,198,1,0,0,4,0,0,0,67,2,0,0,
 5,0,0,0,19,48,0,0,6,0,0,0,192,1,0,0,
@@ -15579,187 +15706,187 @@ unsigned char tw_fw_code[] __initdata = 
 40,0,0,0,0,0,0,0,50,0,0,0,0,0,0,0,
 60,0,0,0,0,0,0,0,70,0,0,0,0,0,0,0,
 80,0,0,0,0,0,0,0,90,0,0,0,0,0,0,0,
-42,63,128,0,0,0,0,0,0,0,0,0,132,215,255,255,
-2,63,128,0,0,0,0,0,180,215,255,255,22,63,128,0,
-0,0,0,0,0,0,0,0,0,0,0,0,30,29,130,0,
-0,0,0,0,30,29,130,0,0,0,0,0,30,29,130,0,
-0,0,0,0,30,29,130,0,0,0,0,0,30,29,130,0,
-0,0,0,0,90,63,128,0,0,0,0,0,126,63,128,0,
-0,0,0,0,160,63,128,0,0,0,0,0,196,63,128,0,
-0,0,0,0,232,63,128,0,0,0,0,0,84,108,0,0,
-0,0,0,0,176,108,0,0,0,0,0,0,12,109,0,0,
-0,0,0,0,26,127,0,0,0,0,0,0,62,110,0,0,
-0,0,0,0,154,110,0,0,0,0,0,0,10,111,0,0,
-0,0,0,0,56,107,0,0,0,0,0,0,176,128,0,0,
-0,0,0,0,218,115,0,0,0,0,0,0,186,124,0,0,
-0,0,0,0,48,116,0,0,0,0,0,0,34,112,0,0,
-0,0,0,0,40,113,0,0,0,0,0,0,136,116,0,0,
-0,0,0,0,146,117,0,0,0,0,0,0,80,106,0,0,
-0,0,0,0,182,118,0,0,0,0,0,0,10,131,0,0,
-0,0,0,0,140,129,0,0,0,0,0,0,14,120,0,0,
-0,0,0,0,200,120,0,0,0,0,0,0,236,63,128,0,
-0,0,0,0,240,63,128,0,0,0,0,0,246,63,128,0,
-0,0,0,0,126,121,0,0,0,0,0,0,42,122,0,0,
-0,0,0,0,212,122,0,0,0,0,0,0,60,123,0,0,
-0,0,0,0,178,123,0,0,0,0,0,0,38,124,0,0,
-0,0,0,0,50,106,0,0,0,0,0,0,30,29,130,0,
-0,0,0,0,30,29,130,0,0,0,0,0,28,128,0,0,
-0,0,0,0,86,130,0,0,0,0,0,0,246,129,0,0,
-0,0,0,0,30,129,0,0,0,0,0,0,238,116,0,0,
-0,0,0,0,116,106,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,148,132,0,0,0,0,0,0,236,132,0,0,
-0,0,0,0,230,133,0,0,0,0,0,0,246,133,0,0,
-0,0,0,0,86,134,0,0,0,0,0,0,34,66,128,0,
-0,0,0,0,70,66,128,0,0,0,0,0,104,66,128,0,
-0,0,0,0,70,133,0,0,0,0,0,0,140,66,128,0,
-0,0,0,0,162,66,128,0,0,0,0,0,166,66,128,0,
-0,0,0,0,118,134,0,0,0,0,0,0,4,138,0,0,
-0,0,0,0,170,66,128,0,0,0,0,0,178,66,128,0,
-0,0,0,0,154,134,0,0,0,0,0,0,138,133,0,0,
-0,0,0,0,254,138,0,0,0,0,0,0,234,66,128,0,
-0,0,0,0,196,133,0,0,0,0,0,0,192,66,128,0,
-0,0,0,0,224,134,0,0,0,0,0,0,112,135,0,0,
-0,0,0,0,208,135,0,0,0,0,0,0,218,66,128,0,
-0,0,0,0,202,139,0,0,0,0,0,0,224,66,128,0,
-0,0,0,0,10,131,0,0,0,0,0,0,160,139,0,0,
-0,0,0,0,196,66,128,0,0,0,0,0,202,66,128,0,
-0,0,0,0,144,66,128,0,0,0,0,0,148,66,128,0,
-0,0,0,0,154,66,128,0,0,0,0,0,208,66,128,0,
-0,0,0,0,212,66,128,0,0,0,0,0,86,137,0,0,
-0,0,0,0,250,135,0,0,0,0,0,0,94,137,0,0,
-0,0,0,0,102,137,0,0,0,0,0,0,244,142,0,0,
-0,0,0,0,230,66,128,0,0,0,0,0,158,137,0,0,
-0,0,0,0,28,67,128,0,0,0,0,0,16,67,128,0,
-0,0,0,0,22,67,128,0,0,0,0,0,136,139,0,0,
-0,0,0,0,236,66,128,0,0,0,0,0,158,66,128,0,
-0,0,0,0,0,0,0,0,0,0,0,0,148,132,0,0,
-0,0,0,0,236,132,0,0,0,0,0,0,230,133,0,0,
-0,0,0,0,246,133,0,0,0,0,0,0,86,134,0,0,
-0,0,0,0,34,66,128,0,0,0,0,0,70,66,128,0,
-0,0,0,0,104,66,128,0,0,0,0,0,70,133,0,0,
-0,0,0,0,36,64,128,0,0,0,0,0,162,66,128,0,
-0,0,0,0,166,66,128,0,0,0,0,0,118,134,0,0,
-0,0,0,0,4,138,0,0,0,0,0,0,170,66,128,0,
-0,0,0,0,178,66,128,0,0,0,0,0,54,65,128,0,
-0,0,0,0,138,133,0,0,0,0,0,0,254,138,0,0,
-0,0,0,0,234,66,128,0,0,0,0,0,196,133,0,0,
-0,0,0,0,192,66,128,0,0,0,0,0,224,134,0,0,
-0,0,0,0,246,64,128,0,0,0,0,0,208,135,0,0,
-0,0,0,0,218,66,128,0,0,0,0,0,202,139,0,0,
-0,0,0,0,224,66,128,0,0,0,0,0,10,131,0,0,
-0,0,0,0,160,139,0,0,0,0,0,0,196,66,128,0,
-0,0,0,0,202,66,128,0,0,0,0,0,144,66,128,0,
-0,0,0,0,148,66,128,0,0,0,0,0,154,66,128,0,
-0,0,0,0,208,66,128,0,0,0,0,0,212,66,128,0,
-0,0,0,0,86,137,0,0,0,0,0,0,250,135,0,0,
-0,0,0,0,94,137,0,0,0,0,0,0,102,137,0,0,
-0,0,0,0,250,63,128,0,0,0,0,0,230,66,128,0,
-0,0,0,0,128,64,128,0,0,0,0,0,28,67,128,0,
-0,0,0,0,16,67,128,0,0,0,0,0,22,67,128,0,
-0,0,0,0,136,139,0,0,0,0,0,0,236,66,128,0,
-0,0,0,0,158,66,128,0,0,0,0,0,0,0,0,0,
-0,0,0,0,148,132,0,0,0,0,0,0,236,132,0,0,
-0,0,0,0,230,133,0,0,0,0,0,0,246,133,0,0,
-0,0,0,0,86,134,0,0,0,0,0,0,34,66,128,0,
-0,0,0,0,70,66,128,0,0,0,0,0,104,66,128,0,
-0,0,0,0,70,133,0,0,0,0,0,0,124,64,128,0,
-0,0,0,0,162,66,128,0,0,0,0,0,166,66,128,0,
-0,0,0,0,118,134,0,0,0,0,0,0,4,138,0,0,
-0,0,0,0,170,66,128,0,0,0,0,0,178,66,128,0,
-0,0,0,0,54,65,128,0,0,0,0,0,138,133,0,0,
-0,0,0,0,254,138,0,0,0,0,0,0,234,66,128,0,
-0,0,0,0,196,133,0,0,0,0,0,0,192,66,128,0,
-0,0,0,0,224,134,0,0,0,0,0,0,194,65,128,0,
-0,0,0,0,208,135,0,0,0,0,0,0,218,66,128,0,
-0,0,0,0,202,139,0,0,0,0,0,0,224,66,128,0,
-0,0,0,0,10,131,0,0,0,0,0,0,160,139,0,0,
-0,0,0,0,196,66,128,0,0,0,0,0,202,66,128,0,
-0,0,0,0,144,66,128,0,0,0,0,0,148,66,128,0,
-0,0,0,0,154,66,128,0,0,0,0,0,208,66,128,0,
-0,0,0,0,212,66,128,0,0,0,0,0,86,137,0,0,
-0,0,0,0,250,135,0,0,0,0,0,0,94,137,0,0,
-0,0,0,0,102,137,0,0,0,0,0,0,82,64,128,0,
-0,0,0,0,230,66,128,0,0,0,0,0,128,64,128,0,
-0,0,0,0,28,67,128,0,0,0,0,0,16,67,128,0,
-0,0,0,0,22,67,128,0,0,0,0,0,136,139,0,0,
-0,0,0,0,236,66,128,0,0,0,0,0,158,66,128,0,
-0,0,0,0,0,0,0,0,0,0,0,0,148,132,0,0,
-0,0,0,0,236,132,0,0,0,0,0,0,230,133,0,0,
-0,0,0,0,246,133,0,0,0,0,0,0,86,134,0,0,
-0,0,0,0,34,66,128,0,0,0,0,0,70,66,128,0,
-0,0,0,0,104,66,128,0,0,0,0,0,70,133,0,0,
-0,0,0,0,36,64,128,0,0,0,0,0,162,66,128,0,
-0,0,0,0,166,66,128,0,0,0,0,0,118,134,0,0,
-0,0,0,0,4,138,0,0,0,0,0,0,170,66,128,0,
-0,0,0,0,178,66,128,0,0,0,0,0,54,65,128,0,
-0,0,0,0,138,133,0,0,0,0,0,0,254,138,0,0,
-0,0,0,0,234,66,128,0,0,0,0,0,196,133,0,0,
-0,0,0,0,192,66,128,0,0,0,0,0,224,134,0,0,
-0,0,0,0,98,65,128,0,0,0,0,0,208,135,0,0,
-0,0,0,0,218,66,128,0,0,0,0,0,202,139,0,0,
-0,0,0,0,224,66,128,0,0,0,0,0,10,131,0,0,
-0,0,0,0,160,139,0,0,0,0,0,0,196,66,128,0,
-0,0,0,0,202,66,128,0,0,0,0,0,144,66,128,0,
-0,0,0,0,148,66,128,0,0,0,0,0,154,66,128,0,
-0,0,0,0,208,66,128,0,0,0,0,0,212,66,128,0,
-0,0,0,0,86,137,0,0,0,0,0,0,250,135,0,0,
-0,0,0,0,94,137,0,0,0,0,0,0,102,137,0,0,
-0,0,0,0,40,64,128,0,0,0,0,0,230,66,128,0,
-0,0,0,0,128,64,128,0,0,0,0,0,28,67,128,0,
-0,0,0,0,16,67,128,0,0,0,0,0,22,67,128,0,
-0,0,0,0,136,139,0,0,0,0,0,0,236,66,128,0,
-0,0,0,0,158,66,128,0,0,0,0,0,0,0,0,0,
-0,0,0,0,92,143,0,0,0,0,0,0,106,143,0,0,
-0,0,0,0,96,144,0,0,0,0,0,0,186,159,0,0,
-0,0,0,0,190,159,0,0,0,0,0,0,120,143,0,0,
-0,0,0,0,62,159,0,0,0,0,0,0,96,159,0,0,
-0,0,0,0,132,159,0,0,0,0,0,0,168,159,0,0,
-0,0,0,0,84,108,0,0,0,0,0,0,176,108,0,0,
-0,0,0,0,12,109,0,0,0,0,0,0,74,145,0,0,
-0,0,0,0,62,110,0,0,0,0,0,0,154,110,0,0,
-0,0,0,0,10,111,0,0,0,0,0,0,56,107,0,0,
-0,0,0,0,76,154,0,0,0,0,0,0,218,115,0,0,
-0,0,0,0,186,124,0,0,0,0,0,0,48,116,0,0,
-0,0,0,0,10,145,0,0,0,0,0,0,34,145,0,0,
-0,0,0,0,136,116,0,0,0,0,0,0,250,156,0,0,
-0,0,0,0,198,159,0,0,0,0,0,0,182,118,0,0,
-0,0,0,0,10,131,0,0,0,0,0,0,22,147,0,0,
-0,0,0,0,14,120,0,0,0,0,0,0,200,120,0,0,
-0,0,0,0,172,159,0,0,0,0,0,0,176,159,0,0,
-0,0,0,0,182,159,0,0,0,0,0,0,126,121,0,0,
-0,0,0,0,42,122,0,0,0,0,0,0,212,122,0,0,
-0,0,0,0,146,155,0,0,0,0,0,0,178,123,0,0,
-0,0,0,0,134,157,0,0,0,0,0,0,214,158,0,0,
-0,0,0,0,194,159,0,0,0,0,0,0,0,155,0,0,
-0,0,0,0,28,128,0,0,0,0,0,0,250,146,0,0,
-0,0,0,0,188,146,0,0,0,0,0,0,30,129,0,0,
-0,0,0,0,238,116,0,0,0,0,0,0,104,158,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,234,159,0,0,
-0,0,0,0,42,160,0,0,0,0,0,0,144,162,0,0,
-0,0,0,0,56,183,0,0,0,0,0,0,60,183,0,0,
-0,0,0,0,130,182,0,0,0,0,0,0,166,182,0,0,
-0,0,0,0,200,182,0,0,0,0,0,0,236,182,0,0,
-0,0,0,0,16,183,0,0,0,0,0,0,64,183,0,0,
-0,0,0,0,176,108,0,0,0,0,0,0,8,163,0,0,
-0,0,0,0,56,174,0,0,0,0,0,0,218,163,0,0,
-0,0,0,0,20,164,0,0,0,0,0,0,10,111,0,0,
-0,0,0,0,56,107,0,0,0,0,0,0,86,175,0,0,
-0,0,0,0,218,115,0,0,0,0,0,0,186,124,0,0,
-0,0,0,0,48,116,0,0,0,0,0,0,34,112,0,0,
-0,0,0,0,40,113,0,0,0,0,0,0,136,116,0,0,
-0,0,0,0,146,117,0,0,0,0,0,0,20,183,0,0,
-0,0,0,0,182,118,0,0,0,0,0,0,10,131,0,0,
-0,0,0,0,140,129,0,0,0,0,0,0,40,164,0,0,
-0,0,0,0,118,165,0,0,0,0,0,0,190,166,0,0,
-0,0,0,0,178,167,0,0,0,0,0,0,152,168,0,0,
-0,0,0,0,200,169,0,0,0,0,0,0,188,170,0,0,
-0,0,0,0,212,122,0,0,0,0,0,0,226,171,0,0,
-0,0,0,0,200,173,0,0,0,0,0,0,240,173,0,0,
-0,0,0,0,12,182,0,0,0,0,0,0,78,183,0,0,
-0,0,0,0,118,177,0,0,0,0,0,0,28,128,0,0,
-0,0,0,0,86,130,0,0,0,0,0,0,246,129,0,0,
-0,0,0,0,232,176,0,0,0,0,0,0,238,116,0,0,
-0,0,0,0,232,181,0,0,0,0,0,0,0,0,0,0,
+18,66,128,0,0,0,0,0,0,0,0,0,132,215,255,255,
+234,65,128,0,0,0,0,0,180,215,255,255,254,65,128,0,
+0,0,0,0,0,0,0,0,0,0,0,0,194,37,130,0,
+0,0,0,0,194,37,130,0,0,0,0,0,194,37,130,0,
+0,0,0,0,194,37,130,0,0,0,0,0,194,37,130,0,
+0,0,0,0,66,66,128,0,0,0,0,0,102,66,128,0,
+0,0,0,0,136,66,128,0,0,0,0,0,172,66,128,0,
+0,0,0,0,208,66,128,0,0,0,0,0,252,108,0,0,
+0,0,0,0,88,109,0,0,0,0,0,0,180,109,0,0,
+0,0,0,0,194,127,0,0,0,0,0,0,230,110,0,0,
+0,0,0,0,66,111,0,0,0,0,0,0,178,111,0,0,
+0,0,0,0,224,107,0,0,0,0,0,0,88,129,0,0,
+0,0,0,0,130,116,0,0,0,0,0,0,98,125,0,0,
+0,0,0,0,216,116,0,0,0,0,0,0,202,112,0,0,
+0,0,0,0,208,113,0,0,0,0,0,0,48,117,0,0,
+0,0,0,0,58,118,0,0,0,0,0,0,248,106,0,0,
+0,0,0,0,94,119,0,0,0,0,0,0,178,131,0,0,
+0,0,0,0,52,130,0,0,0,0,0,0,182,120,0,0,
+0,0,0,0,112,121,0,0,0,0,0,0,212,66,128,0,
+0,0,0,0,216,66,128,0,0,0,0,0,222,66,128,0,
+0,0,0,0,38,122,0,0,0,0,0,0,210,122,0,0,
+0,0,0,0,124,123,0,0,0,0,0,0,228,123,0,0,
+0,0,0,0,90,124,0,0,0,0,0,0,206,124,0,0,
+0,0,0,0,218,106,0,0,0,0,0,0,194,37,130,0,
+0,0,0,0,194,37,130,0,0,0,0,0,196,128,0,0,
+0,0,0,0,254,130,0,0,0,0,0,0,158,130,0,0,
+0,0,0,0,198,129,0,0,0,0,0,0,150,117,0,0,
+0,0,0,0,28,107,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,52,133,0,0,0,0,0,0,140,133,0,0,
+0,0,0,0,134,134,0,0,0,0,0,0,150,134,0,0,
+0,0,0,0,246,134,0,0,0,0,0,0,10,69,128,0,
+0,0,0,0,46,69,128,0,0,0,0,0,80,69,128,0,
+0,0,0,0,230,133,0,0,0,0,0,0,116,69,128,0,
+0,0,0,0,138,69,128,0,0,0,0,0,142,69,128,0,
+0,0,0,0,22,135,0,0,0,0,0,0,164,138,0,0,
+0,0,0,0,146,69,128,0,0,0,0,0,154,69,128,0,
+0,0,0,0,58,135,0,0,0,0,0,0,42,134,0,0,
+0,0,0,0,162,139,0,0,0,0,0,0,210,69,128,0,
+0,0,0,0,100,134,0,0,0,0,0,0,168,69,128,0,
+0,0,0,0,128,135,0,0,0,0,0,0,16,136,0,0,
+0,0,0,0,112,136,0,0,0,0,0,0,194,69,128,0,
+0,0,0,0,110,140,0,0,0,0,0,0,200,69,128,0,
+0,0,0,0,178,131,0,0,0,0,0,0,68,140,0,0,
+0,0,0,0,172,69,128,0,0,0,0,0,178,69,128,0,
+0,0,0,0,120,69,128,0,0,0,0,0,124,69,128,0,
+0,0,0,0,130,69,128,0,0,0,0,0,184,69,128,0,
+0,0,0,0,188,69,128,0,0,0,0,0,246,137,0,0,
+0,0,0,0,154,136,0,0,0,0,0,0,254,137,0,0,
+0,0,0,0,6,138,0,0,0,0,0,0,152,143,0,0,
+0,0,0,0,206,69,128,0,0,0,0,0,62,138,0,0,
+0,0,0,0,4,70,128,0,0,0,0,0,248,69,128,0,
+0,0,0,0,254,69,128,0,0,0,0,0,44,140,0,0,
+0,0,0,0,212,69,128,0,0,0,0,0,134,69,128,0,
+0,0,0,0,0,0,0,0,0,0,0,0,52,133,0,0,
+0,0,0,0,140,133,0,0,0,0,0,0,134,134,0,0,
+0,0,0,0,150,134,0,0,0,0,0,0,246,134,0,0,
+0,0,0,0,10,69,128,0,0,0,0,0,46,69,128,0,
+0,0,0,0,80,69,128,0,0,0,0,0,230,133,0,0,
+0,0,0,0,12,67,128,0,0,0,0,0,138,69,128,0,
+0,0,0,0,142,69,128,0,0,0,0,0,22,135,0,0,
+0,0,0,0,164,138,0,0,0,0,0,0,146,69,128,0,
+0,0,0,0,154,69,128,0,0,0,0,0,30,68,128,0,
+0,0,0,0,42,134,0,0,0,0,0,0,162,139,0,0,
+0,0,0,0,210,69,128,0,0,0,0,0,100,134,0,0,
+0,0,0,0,168,69,128,0,0,0,0,0,128,135,0,0,
+0,0,0,0,222,67,128,0,0,0,0,0,112,136,0,0,
+0,0,0,0,194,69,128,0,0,0,0,0,110,140,0,0,
+0,0,0,0,200,69,128,0,0,0,0,0,178,131,0,0,
+0,0,0,0,68,140,0,0,0,0,0,0,172,69,128,0,
+0,0,0,0,178,69,128,0,0,0,0,0,120,69,128,0,
+0,0,0,0,124,69,128,0,0,0,0,0,130,69,128,0,
+0,0,0,0,184,69,128,0,0,0,0,0,188,69,128,0,
+0,0,0,0,246,137,0,0,0,0,0,0,154,136,0,0,
+0,0,0,0,254,137,0,0,0,0,0,0,6,138,0,0,
+0,0,0,0,226,66,128,0,0,0,0,0,206,69,128,0,
+0,0,0,0,104,67,128,0,0,0,0,0,4,70,128,0,
+0,0,0,0,248,69,128,0,0,0,0,0,254,69,128,0,
+0,0,0,0,44,140,0,0,0,0,0,0,212,69,128,0,
+0,0,0,0,134,69,128,0,0,0,0,0,0,0,0,0,
+0,0,0,0,52,133,0,0,0,0,0,0,140,133,0,0,
+0,0,0,0,134,134,0,0,0,0,0,0,150,134,0,0,
+0,0,0,0,246,134,0,0,0,0,0,0,10,69,128,0,
+0,0,0,0,46,69,128,0,0,0,0,0,80,69,128,0,
+0,0,0,0,230,133,0,0,0,0,0,0,100,67,128,0,
+0,0,0,0,138,69,128,0,0,0,0,0,142,69,128,0,
+0,0,0,0,22,135,0,0,0,0,0,0,164,138,0,0,
+0,0,0,0,146,69,128,0,0,0,0,0,154,69,128,0,
+0,0,0,0,30,68,128,0,0,0,0,0,42,134,0,0,
+0,0,0,0,162,139,0,0,0,0,0,0,210,69,128,0,
+0,0,0,0,100,134,0,0,0,0,0,0,168,69,128,0,
+0,0,0,0,128,135,0,0,0,0,0,0,170,68,128,0,
+0,0,0,0,112,136,0,0,0,0,0,0,194,69,128,0,
+0,0,0,0,110,140,0,0,0,0,0,0,200,69,128,0,
+0,0,0,0,178,131,0,0,0,0,0,0,68,140,0,0,
+0,0,0,0,172,69,128,0,0,0,0,0,178,69,128,0,
+0,0,0,0,120,69,128,0,0,0,0,0,124,69,128,0,
+0,0,0,0,130,69,128,0,0,0,0,0,184,69,128,0,
+0,0,0,0,188,69,128,0,0,0,0,0,246,137,0,0,
+0,0,0,0,154,136,0,0,0,0,0,0,254,137,0,0,
+0,0,0,0,6,138,0,0,0,0,0,0,58,67,128,0,
+0,0,0,0,206,69,128,0,0,0,0,0,104,67,128,0,
+0,0,0,0,4,70,128,0,0,0,0,0,248,69,128,0,
+0,0,0,0,254,69,128,0,0,0,0,0,44,140,0,0,
+0,0,0,0,212,69,128,0,0,0,0,0,134,69,128,0,
+0,0,0,0,0,0,0,0,0,0,0,0,52,133,0,0,
+0,0,0,0,140,133,0,0,0,0,0,0,134,134,0,0,
+0,0,0,0,150,134,0,0,0,0,0,0,246,134,0,0,
+0,0,0,0,10,69,128,0,0,0,0,0,46,69,128,0,
+0,0,0,0,80,69,128,0,0,0,0,0,230,133,0,0,
+0,0,0,0,12,67,128,0,0,0,0,0,138,69,128,0,
+0,0,0,0,142,69,128,0,0,0,0,0,22,135,0,0,
+0,0,0,0,164,138,0,0,0,0,0,0,146,69,128,0,
+0,0,0,0,154,69,128,0,0,0,0,0,30,68,128,0,
+0,0,0,0,42,134,0,0,0,0,0,0,162,139,0,0,
+0,0,0,0,210,69,128,0,0,0,0,0,100,134,0,0,
+0,0,0,0,168,69,128,0,0,0,0,0,128,135,0,0,
+0,0,0,0,74,68,128,0,0,0,0,0,112,136,0,0,
+0,0,0,0,194,69,128,0,0,0,0,0,110,140,0,0,
+0,0,0,0,200,69,128,0,0,0,0,0,178,131,0,0,
+0,0,0,0,68,140,0,0,0,0,0,0,172,69,128,0,
+0,0,0,0,178,69,128,0,0,0,0,0,120,69,128,0,
+0,0,0,0,124,69,128,0,0,0,0,0,130,69,128,0,
+0,0,0,0,184,69,128,0,0,0,0,0,188,69,128,0,
+0,0,0,0,246,137,0,0,0,0,0,0,154,136,0,0,
+0,0,0,0,254,137,0,0,0,0,0,0,6,138,0,0,
+0,0,0,0,16,67,128,0,0,0,0,0,206,69,128,0,
+0,0,0,0,104,67,128,0,0,0,0,0,4,70,128,0,
+0,0,0,0,248,69,128,0,0,0,0,0,254,69,128,0,
+0,0,0,0,44,140,0,0,0,0,0,0,212,69,128,0,
+0,0,0,0,134,69,128,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,144,0,0,0,0,0,0,14,144,0,0,
+0,0,0,0,4,145,0,0,0,0,0,0,94,160,0,0,
+0,0,0,0,98,160,0,0,0,0,0,0,28,144,0,0,
+0,0,0,0,226,159,0,0,0,0,0,0,4,160,0,0,
+0,0,0,0,40,160,0,0,0,0,0,0,76,160,0,0,
+0,0,0,0,252,108,0,0,0,0,0,0,88,109,0,0,
+0,0,0,0,180,109,0,0,0,0,0,0,238,145,0,0,
+0,0,0,0,230,110,0,0,0,0,0,0,66,111,0,0,
+0,0,0,0,178,111,0,0,0,0,0,0,224,107,0,0,
+0,0,0,0,240,154,0,0,0,0,0,0,130,116,0,0,
+0,0,0,0,98,125,0,0,0,0,0,0,216,116,0,0,
+0,0,0,0,174,145,0,0,0,0,0,0,198,145,0,0,
+0,0,0,0,48,117,0,0,0,0,0,0,158,157,0,0,
+0,0,0,0,106,160,0,0,0,0,0,0,94,119,0,0,
+0,0,0,0,178,131,0,0,0,0,0,0,186,147,0,0,
+0,0,0,0,182,120,0,0,0,0,0,0,112,121,0,0,
+0,0,0,0,80,160,0,0,0,0,0,0,84,160,0,0,
+0,0,0,0,90,160,0,0,0,0,0,0,38,122,0,0,
+0,0,0,0,210,122,0,0,0,0,0,0,124,123,0,0,
+0,0,0,0,54,156,0,0,0,0,0,0,90,124,0,0,
+0,0,0,0,42,158,0,0,0,0,0,0,122,159,0,0,
+0,0,0,0,102,160,0,0,0,0,0,0,164,155,0,0,
+0,0,0,0,196,128,0,0,0,0,0,0,158,147,0,0,
+0,0,0,0,96,147,0,0,0,0,0,0,198,129,0,0,
+0,0,0,0,150,117,0,0,0,0,0,0,12,159,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,142,160,0,0,
+0,0,0,0,206,160,0,0,0,0,0,0,52,163,0,0,
+0,0,0,0,220,183,0,0,0,0,0,0,224,183,0,0,
+0,0,0,0,38,183,0,0,0,0,0,0,74,183,0,0,
+0,0,0,0,108,183,0,0,0,0,0,0,144,183,0,0,
+0,0,0,0,180,183,0,0,0,0,0,0,228,183,0,0,
+0,0,0,0,88,109,0,0,0,0,0,0,172,163,0,0,
+0,0,0,0,220,174,0,0,0,0,0,0,126,164,0,0,
+0,0,0,0,184,164,0,0,0,0,0,0,178,111,0,0,
+0,0,0,0,224,107,0,0,0,0,0,0,250,175,0,0,
+0,0,0,0,130,116,0,0,0,0,0,0,98,125,0,0,
+0,0,0,0,216,116,0,0,0,0,0,0,202,112,0,0,
+0,0,0,0,208,113,0,0,0,0,0,0,48,117,0,0,
+0,0,0,0,58,118,0,0,0,0,0,0,184,183,0,0,
+0,0,0,0,94,119,0,0,0,0,0,0,178,131,0,0,
+0,0,0,0,52,130,0,0,0,0,0,0,204,164,0,0,
+0,0,0,0,26,166,0,0,0,0,0,0,98,167,0,0,
+0,0,0,0,86,168,0,0,0,0,0,0,60,169,0,0,
+0,0,0,0,108,170,0,0,0,0,0,0,96,171,0,0,
+0,0,0,0,124,123,0,0,0,0,0,0,134,172,0,0,
+0,0,0,0,108,174,0,0,0,0,0,0,148,174,0,0,
+0,0,0,0,176,182,0,0,0,0,0,0,242,183,0,0,
+0,0,0,0,26,178,0,0,0,0,0,0,196,128,0,0,
+0,0,0,0,254,130,0,0,0,0,0,0,158,130,0,0,
+0,0,0,0,140,177,0,0,0,0,0,0,150,117,0,0,
+0,0,0,0,140,182,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,
@@ -15770,180 +15897,180 @@ unsigned char tw_fw_code[] __initdata = 
 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,130,183,0,0,
-0,0,0,0,194,183,0,0,0,0,0,0,66,186,0,0,
-0,0,0,0,160,244,0,0,0,0,0,0,164,244,0,0,
-0,0,0,0,2,184,0,0,0,0,0,0,14,244,0,0,
-0,0,0,0,48,244,0,0,0,0,0,0,84,244,0,0,
-0,0,0,0,120,244,0,0,0,0,0,0,168,244,0,0,
-0,0,0,0,172,244,0,0,0,0,0,0,222,186,0,0,
-0,0,0,0,8,199,0,0,0,0,0,0,176,187,0,0,
-0,0,0,0,234,187,0,0,0,0,0,0,10,111,0,0,
-0,0,0,0,56,107,0,0,0,0,0,0,78,200,0,0,
-0,0,0,0,94,202,0,0,0,0,0,0,186,124,0,0,
-0,0,0,0,48,116,0,0,0,0,0,0,34,112,0,0,
-0,0,0,0,254,187,0,0,0,0,0,0,136,116,0,0,
-0,0,0,0,146,117,0,0,0,0,0,0,124,244,0,0,
-0,0,0,0,182,118,0,0,0,0,0,0,10,131,0,0,
-0,0,0,0,106,202,0,0,0,0,0,0,38,188,0,0,
-0,0,0,0,146,190,0,0,0,0,0,0,176,191,0,0,
-0,0,0,0,222,192,0,0,0,0,0,0,182,193,0,0,
-0,0,0,0,174,194,0,0,0,0,0,0,136,195,0,0,
-0,0,0,0,212,122,0,0,0,0,0,0,140,196,0,0,
-0,0,0,0,146,198,0,0,0,0,0,0,186,198,0,0,
-0,0,0,0,150,243,0,0,0,0,0,0,176,244,0,0,
-0,0,0,0,74,203,0,0,0,0,0,0,28,128,0,0,
-0,0,0,0,182,244,0,0,0,0,0,0,188,244,0,0,
-0,0,0,0,214,201,0,0,0,0,0,0,238,116,0,0,
-0,0,0,0,118,208,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,12,245,0,0,0,0,0,0,42,245,0,0,
-0,0,0,0,230,133,0,0,0,0,0,0,234,247,0,0,
-0,0,0,0,6,246,0,0,0,0,0,0,158,252,0,0,
-0,0,0,0,28,245,0,0,0,0,0,0,194,252,0,0,
-0,0,0,0,70,133,0,0,0,0,0,0,116,253,0,0,
-0,0,0,0,248,252,0,0,0,0,0,0,252,252,0,0,
-0,0,0,0,118,134,0,0,0,0,0,0,140,251,0,0,
-0,0,0,0,0,253,0,0,0,0,0,0,8,253,0,0,
-0,0,0,0,72,250,0,0,0,0,0,0,138,133,0,0,
-0,0,0,0,18,252,0,0,0,0,0,0,64,253,0,0,
-0,0,0,0,196,133,0,0,0,0,0,0,22,253,0,0,
-0,0,0,0,224,134,0,0,0,0,0,0,30,250,0,0,
-0,0,0,0,208,135,0,0,0,0,0,0,48,253,0,0,
-0,0,0,0,202,139,0,0,0,0,0,0,54,253,0,0,
-0,0,0,0,10,131,0,0,0,0,0,0,102,252,0,0,
-0,0,0,0,26,253,0,0,0,0,0,0,32,253,0,0,
-0,0,0,0,230,252,0,0,0,0,0,0,234,252,0,0,
-0,0,0,0,240,252,0,0,0,0,0,0,38,253,0,0,
-0,0,0,0,42,253,0,0,0,0,0,0,86,137,0,0,
-0,0,0,0,250,135,0,0,0,0,0,0,94,137,0,0,
-0,0,0,0,102,137,0,0,0,0,0,0,226,244,0,0,
-0,0,0,0,60,253,0,0,0,0,0,0,160,251,0,0,
-0,0,0,0,114,253,0,0,0,0,0,0,102,253,0,0,
-0,0,0,0,108,253,0,0,0,0,0,0,136,139,0,0,
-0,0,0,0,66,253,0,0,0,0,0,0,244,252,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,2,254,0,0,
-0,0,0,0,42,160,0,0,0,0,0,0,144,162,0,0,
-0,0,0,0,140,1,1,0,0,0,0,0,144,1,1,0,
-0,0,0,0,214,0,1,0,0,0,0,0,250,0,1,0,
-0,0,0,0,28,1,1,0,0,0,0,0,64,1,1,0,
-0,0,0,0,100,1,1,0,0,0,0,0,148,1,1,0,
-0,0,0,0,176,108,0,0,0,0,0,0,8,163,0,0,
-0,0,0,0,64,0,1,0,0,0,0,0,218,163,0,0,
-0,0,0,0,20,164,0,0,0,0,0,0,10,111,0,0,
-0,0,0,0,56,107,0,0,0,0,0,0,86,175,0,0,
-0,0,0,0,218,115,0,0,0,0,0,0,186,124,0,0,
-0,0,0,0,48,116,0,0,0,0,0,0,34,112,0,0,
-0,0,0,0,40,113,0,0,0,0,0,0,136,116,0,0,
-0,0,0,0,146,117,0,0,0,0,0,0,104,1,1,0,
-0,0,0,0,182,118,0,0,0,0,0,0,10,131,0,0,
-0,0,0,0,140,129,0,0,0,0,0,0,40,164,0,0,
-0,0,0,0,118,165,0,0,0,0,0,0,190,166,0,0,
-0,0,0,0,178,167,0,0,0,0,0,0,152,168,0,0,
-0,0,0,0,200,169,0,0,0,0,0,0,188,170,0,0,
-0,0,0,0,212,122,0,0,0,0,0,0,226,171,0,0,
-0,0,0,0,200,173,0,0,0,0,0,0,240,173,0,0,
-0,0,0,0,120,253,0,0,0,0,0,0,162,1,1,0,
-0,0,0,0,194,255,0,0,0,0,0,0,28,128,0,0,
-0,0,0,0,86,130,0,0,0,0,0,0,246,129,0,0,
-0,0,0,0,232,255,0,0,0,0,0,0,238,116,0,0,
-0,0,0,0,232,181,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,62,67,128,0,0,0,0,0,76,67,128,0,
-0,0,0,0,42,80,128,0,0,0,0,0,84,80,128,0,
-0,0,0,0,88,80,128,0,0,0,0,0,112,79,128,0,
-0,0,0,0,148,79,128,0,0,0,0,0,182,79,128,0,
-0,0,0,0,218,79,128,0,0,0,0,0,254,79,128,0,
-0,0,0,0,186,69,128,0,0,0,0,0,92,80,128,0,
-0,0,0,0,12,109,0,0,0,0,0,0,126,75,128,0,
-0,0,0,0,62,110,0,0,0,0,0,0,154,110,0,0,
-0,0,0,0,10,111,0,0,0,0,0,0,96,80,128,0,
-0,0,0,0,26,77,128,0,0,0,0,0,218,115,0,0,
-0,0,0,0,186,124,0,0,0,0,0,0,170,70,128,0,
-0,0,0,0,226,70,128,0,0,0,0,0,130,70,128,0,
-0,0,0,0,136,116,0,0,0,0,0,0,146,117,0,0,
-0,0,0,0,6,80,128,0,0,0,0,0,182,118,0,0,
-0,0,0,0,226,76,128,0,0,0,0,0,150,80,128,0,
-0,0,0,0,26,71,128,0,0,0,0,0,216,71,128,0,
-0,0,0,0,146,72,128,0,0,0,0,0,254,72,128,0,
-0,0,0,0,2,80,128,0,0,0,0,0,88,73,128,0,
-0,0,0,0,128,74,128,0,0,0,0,0,212,122,0,0,
-0,0,0,0,116,78,128,0,0,0,0,0,18,70,128,0,
-0,0,0,0,138,80,128,0,0,0,0,0,250,78,128,0,
-0,0,0,0,142,80,128,0,0,0,0,0,200,77,128,0,
-0,0,0,0,28,128,0,0,0,0,0,0,86,130,0,0,
-0,0,0,0,246,129,0,0,0,0,0,0,30,129,0,0,
-0,0,0,0,238,116,0,0,0,0,0,0,146,80,128,0,
-0,0,0,0,0,0,0,0,0,0,0,0,100,83,128,0,
-0,0,0,0,112,83,128,0,0,0,0,0,40,81,128,0,
-0,0,0,0,124,83,128,0,0,0,0,0,128,83,128,0,
-0,0,0,0,196,82,128,0,0,0,0,0,232,82,128,0,
-0,0,0,0,10,83,128,0,0,0,0,0,46,83,128,0,
-0,0,0,0,132,83,128,0,0,0,0,0,136,83,128,0,
-0,0,0,0,140,83,128,0,0,0,0,0,12,109,0,0,
-0,0,0,0,226,83,128,0,0,0,0,0,144,83,128,0,
-0,0,0,0,148,83,128,0,0,0,0,0,92,81,128,0,
-0,0,0,0,156,83,128,0,0,0,0,0,238,83,128,0,
-0,0,0,0,160,83,128,0,0,0,0,0,162,83,128,0,
-0,0,0,0,188,81,128,0,0,0,0,0,238,81,128,0,
-0,0,0,0,34,82,128,0,0,0,0,0,166,83,128,0,
-0,0,0,0,172,83,128,0,0,0,0,0,250,83,128,0,
-0,0,0,0,178,83,128,0,0,0,0,0,184,83,128,0,
-0,0,0,0,246,83,128,0,0,0,0,0,186,83,128,0,
-0,0,0,0,192,83,128,0,0,0,0,0,82,83,128,0,
-0,0,0,0,86,83,128,0,0,0,0,0,92,83,128,0,
-0,0,0,0,198,83,128,0,0,0,0,0,202,83,128,0,
-0,0,0,0,212,122,0,0,0,0,0,0,208,83,128,0,
-0,0,0,0,210,83,128,0,0,0,0,0,214,83,128,0,
-0,0,0,0,112,82,128,0,0,0,0,0,218,83,128,0,
-0,0,0,0,222,83,128,0,0,0,0,0,28,128,0,0,
-0,0,0,0,230,83,128,0,0,0,0,0,234,83,128,0,
-0,0,0,0,242,83,128,0,0,0,0,0,0,84,128,0,
-0,0,0,0,96,83,128,0,0,0,0,0,26,123,128,0,
-0,0,0,0,0,0,0,0,0,0,0,0,200,124,128,0,
+0,0,0,0,0,0,0,0,0,0,0,0,38,184,0,0,
+0,0,0,0,102,184,0,0,0,0,0,0,230,186,0,0,
+0,0,0,0,68,245,0,0,0,0,0,0,72,245,0,0,
+0,0,0,0,166,184,0,0,0,0,0,0,178,244,0,0,
+0,0,0,0,212,244,0,0,0,0,0,0,248,244,0,0,
+0,0,0,0,28,245,0,0,0,0,0,0,76,245,0,0,
+0,0,0,0,80,245,0,0,0,0,0,0,130,187,0,0,
+0,0,0,0,172,199,0,0,0,0,0,0,84,188,0,0,
+0,0,0,0,142,188,0,0,0,0,0,0,178,111,0,0,
+0,0,0,0,224,107,0,0,0,0,0,0,242,200,0,0,
+0,0,0,0,2,203,0,0,0,0,0,0,98,125,0,0,
+0,0,0,0,216,116,0,0,0,0,0,0,202,112,0,0,
+0,0,0,0,162,188,0,0,0,0,0,0,48,117,0,0,
+0,0,0,0,58,118,0,0,0,0,0,0,32,245,0,0,
+0,0,0,0,94,119,0,0,0,0,0,0,178,131,0,0,
+0,0,0,0,14,203,0,0,0,0,0,0,202,188,0,0,
+0,0,0,0,54,191,0,0,0,0,0,0,84,192,0,0,
+0,0,0,0,130,193,0,0,0,0,0,0,90,194,0,0,
+0,0,0,0,82,195,0,0,0,0,0,0,44,196,0,0,
+0,0,0,0,124,123,0,0,0,0,0,0,48,197,0,0,
+0,0,0,0,54,199,0,0,0,0,0,0,94,199,0,0,
+0,0,0,0,58,244,0,0,0,0,0,0,84,245,0,0,
+0,0,0,0,238,203,0,0,0,0,0,0,196,128,0,0,
+0,0,0,0,90,245,0,0,0,0,0,0,96,245,0,0,
+0,0,0,0,122,202,0,0,0,0,0,0,150,117,0,0,
+0,0,0,0,26,209,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,176,245,0,0,0,0,0,0,206,245,0,0,
+0,0,0,0,134,134,0,0,0,0,0,0,142,248,0,0,
+0,0,0,0,170,246,0,0,0,0,0,0,66,253,0,0,
+0,0,0,0,192,245,0,0,0,0,0,0,102,253,0,0,
+0,0,0,0,230,133,0,0,0,0,0,0,24,254,0,0,
+0,0,0,0,156,253,0,0,0,0,0,0,160,253,0,0,
+0,0,0,0,22,135,0,0,0,0,0,0,48,252,0,0,
+0,0,0,0,164,253,0,0,0,0,0,0,172,253,0,0,
+0,0,0,0,236,250,0,0,0,0,0,0,42,134,0,0,
+0,0,0,0,182,252,0,0,0,0,0,0,228,253,0,0,
+0,0,0,0,100,134,0,0,0,0,0,0,186,253,0,0,
+0,0,0,0,128,135,0,0,0,0,0,0,194,250,0,0,
+0,0,0,0,112,136,0,0,0,0,0,0,212,253,0,0,
+0,0,0,0,110,140,0,0,0,0,0,0,218,253,0,0,
+0,0,0,0,178,131,0,0,0,0,0,0,10,253,0,0,
+0,0,0,0,190,253,0,0,0,0,0,0,196,253,0,0,
+0,0,0,0,138,253,0,0,0,0,0,0,142,253,0,0,
+0,0,0,0,148,253,0,0,0,0,0,0,202,253,0,0,
+0,0,0,0,206,253,0,0,0,0,0,0,246,137,0,0,
+0,0,0,0,154,136,0,0,0,0,0,0,254,137,0,0,
+0,0,0,0,6,138,0,0,0,0,0,0,134,245,0,0,
+0,0,0,0,224,253,0,0,0,0,0,0,68,252,0,0,
+0,0,0,0,22,254,0,0,0,0,0,0,10,254,0,0,
+0,0,0,0,16,254,0,0,0,0,0,0,44,140,0,0,
+0,0,0,0,230,253,0,0,0,0,0,0,152,253,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,166,254,0,0,
+0,0,0,0,206,160,0,0,0,0,0,0,52,163,0,0,
+0,0,0,0,48,2,1,0,0,0,0,0,52,2,1,0,
+0,0,0,0,122,1,1,0,0,0,0,0,158,1,1,0,
+0,0,0,0,192,1,1,0,0,0,0,0,228,1,1,0,
+0,0,0,0,8,2,1,0,0,0,0,0,56,2,1,0,
+0,0,0,0,88,109,0,0,0,0,0,0,172,163,0,0,
+0,0,0,0,228,0,1,0,0,0,0,0,126,164,0,0,
+0,0,0,0,184,164,0,0,0,0,0,0,178,111,0,0,
+0,0,0,0,224,107,0,0,0,0,0,0,250,175,0,0,
+0,0,0,0,130,116,0,0,0,0,0,0,98,125,0,0,
+0,0,0,0,216,116,0,0,0,0,0,0,202,112,0,0,
+0,0,0,0,208,113,0,0,0,0,0,0,48,117,0,0,
+0,0,0,0,58,118,0,0,0,0,0,0,12,2,1,0,
+0,0,0,0,94,119,0,0,0,0,0,0,178,131,0,0,
+0,0,0,0,52,130,0,0,0,0,0,0,204,164,0,0,
+0,0,0,0,26,166,0,0,0,0,0,0,98,167,0,0,
+0,0,0,0,86,168,0,0,0,0,0,0,60,169,0,0,
+0,0,0,0,108,170,0,0,0,0,0,0,96,171,0,0,
+0,0,0,0,124,123,0,0,0,0,0,0,134,172,0,0,
+0,0,0,0,108,174,0,0,0,0,0,0,148,174,0,0,
+0,0,0,0,28,254,0,0,0,0,0,0,70,2,1,0,
+0,0,0,0,102,0,1,0,0,0,0,0,196,128,0,0,
+0,0,0,0,254,130,0,0,0,0,0,0,158,130,0,0,
+0,0,0,0,140,0,1,0,0,0,0,0,150,117,0,0,
+0,0,0,0,140,182,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,38,70,128,0,0,0,0,0,52,70,128,0,
+0,0,0,0,18,83,128,0,0,0,0,0,60,83,128,0,
+0,0,0,0,64,83,128,0,0,0,0,0,88,82,128,0,
+0,0,0,0,124,82,128,0,0,0,0,0,158,82,128,0,
+0,0,0,0,194,82,128,0,0,0,0,0,230,82,128,0,
+0,0,0,0,162,72,128,0,0,0,0,0,68,83,128,0,
+0,0,0,0,180,109,0,0,0,0,0,0,102,78,128,0,
+0,0,0,0,230,110,0,0,0,0,0,0,66,111,0,0,
+0,0,0,0,178,111,0,0,0,0,0,0,72,83,128,0,
+0,0,0,0,2,80,128,0,0,0,0,0,130,116,0,0,
+0,0,0,0,98,125,0,0,0,0,0,0,146,73,128,0,
+0,0,0,0,202,73,128,0,0,0,0,0,106,73,128,0,
+0,0,0,0,48,117,0,0,0,0,0,0,58,118,0,0,
+0,0,0,0,238,82,128,0,0,0,0,0,94,119,0,0,
+0,0,0,0,202,79,128,0,0,0,0,0,126,83,128,0,
+0,0,0,0,2,74,128,0,0,0,0,0,192,74,128,0,
+0,0,0,0,122,75,128,0,0,0,0,0,230,75,128,0,
+0,0,0,0,234,82,128,0,0,0,0,0,64,76,128,0,
+0,0,0,0,104,77,128,0,0,0,0,0,124,123,0,0,
+0,0,0,0,92,81,128,0,0,0,0,0,250,72,128,0,
+0,0,0,0,114,83,128,0,0,0,0,0,226,81,128,0,
+0,0,0,0,118,83,128,0,0,0,0,0,176,80,128,0,
+0,0,0,0,196,128,0,0,0,0,0,0,254,130,0,0,
+0,0,0,0,158,130,0,0,0,0,0,0,198,129,0,0,
+0,0,0,0,150,117,0,0,0,0,0,0,122,83,128,0,
+0,0,0,0,0,0,0,0,0,0,0,0,76,86,128,0,
+0,0,0,0,88,86,128,0,0,0,0,0,16,84,128,0,
+0,0,0,0,100,86,128,0,0,0,0,0,104,86,128,0,
+0,0,0,0,172,85,128,0,0,0,0,0,208,85,128,0,
+0,0,0,0,242,85,128,0,0,0,0,0,22,86,128,0,
+0,0,0,0,108,86,128,0,0,0,0,0,112,86,128,0,
+0,0,0,0,116,86,128,0,0,0,0,0,180,109,0,0,
+0,0,0,0,202,86,128,0,0,0,0,0,120,86,128,0,
+0,0,0,0,124,86,128,0,0,0,0,0,68,84,128,0,
+0,0,0,0,132,86,128,0,0,0,0,0,214,86,128,0,
+0,0,0,0,136,86,128,0,0,0,0,0,138,86,128,0,
+0,0,0,0,164,84,128,0,0,0,0,0,214,84,128,0,
+0,0,0,0,10,85,128,0,0,0,0,0,142,86,128,0,
+0,0,0,0,148,86,128,0,0,0,0,0,226,86,128,0,
+0,0,0,0,154,86,128,0,0,0,0,0,160,86,128,0,
+0,0,0,0,222,86,128,0,0,0,0,0,162,86,128,0,
+0,0,0,0,168,86,128,0,0,0,0,0,58,86,128,0,
+0,0,0,0,62,86,128,0,0,0,0,0,68,86,128,0,
+0,0,0,0,174,86,128,0,0,0,0,0,178,86,128,0,
+0,0,0,0,124,123,0,0,0,0,0,0,184,86,128,0,
+0,0,0,0,186,86,128,0,0,0,0,0,190,86,128,0,
+0,0,0,0,88,85,128,0,0,0,0,0,194,86,128,0,
+0,0,0,0,198,86,128,0,0,0,0,0,196,128,0,0,
+0,0,0,0,206,86,128,0,0,0,0,0,210,86,128,0,
+0,0,0,0,218,86,128,0,0,0,0,0,232,86,128,0,
+0,0,0,0,72,86,128,0,0,0,0,0,2,126,128,0,
+0,0,0,0,0,0,0,0,0,0,0,0,176,127,128,0,
 0,0,0,0,8,0,0,0,0,0,1,0,0,0,1,0,
 3,0,0,0,4,0,1,0,0,0,5,0,3,0,0,0,
 252,223,4,32,0,0,16,0,236,3,0,0,252,223,0,36,
 0,0,0,0,8,0,0,0,0,0,1,0,0,0,1,0,
 3,0,0,0,4,0,1,0,0,0,5,0,3,0,0,0,
 252,255,4,0,0,0,16,0,236,3,0,0,252,255,0,4,
-0,0,0,0,0,0,0,0,0,0,0,0,146,135,128,0,
-0,0,0,0,192,136,128,0,0,0,0,0,0,0,0,0,
-0,0,0,0,20,134,128,0,0,0,0,0,206,163,128,0,
-0,0,0,0,0,0,0,0,0,0,0,0,98,137,128,0,
-0,0,0,0,140,137,128,0,0,0,0,0,0,0,0,0,
-0,0,0,0,164,138,128,0,0,0,0,0,206,138,128,0,
-0,0,0,0,0,0,0,0,0,0,0,0,236,139,128,0,
-0,0,0,0,22,140,128,0,0,0,0,0,0,0,0,0,
-0,0,0,0,64,141,128,0,0,0,0,0,106,141,128,0,
-0,0,0,0,0,0,0,0,0,0,0,0,110,142,128,0,
-0,0,0,0,152,142,128,0,0,0,0,0,0,0,0,0,
-0,0,0,0,154,143,128,0,0,0,0,0,196,143,128,0,
-0,0,0,0,0,0,0,0,0,0,0,0,254,144,128,0,
-0,0,0,0,40,145,128,0,0,0,0,0,0,0,0,0,
-0,0,0,0,94,146,128,0,0,0,0,0,136,146,128,0,
-0,0,0,0,0,0,0,0,0,0,0,0,170,147,128,0,
-0,0,0,0,212,147,128,0,0,0,0,0,0,0,0,0,
-0,0,0,0,4,149,128,0,0,0,0,0,46,149,128,0,
-0,0,0,0,0,0,0,0,0,0,0,0,210,150,128,0,
-0,0,0,0,252,150,128,0,0,0,0,0,0,0,0,0,
-0,0,0,0,254,151,128,0,0,0,0,0,40,152,128,0,
-0,0,0,0,0,0,0,0,0,0,0,0,58,153,128,0,
-0,0,0,0,100,153,128,0,0,0,0,0,0,0,0,0,
-0,0,0,0,104,154,128,0,0,0,0,0,146,154,128,0,
-0,0,0,0,0,0,0,0,0,0,0,0,250,155,128,0,
-0,0,0,0,36,156,128,0,0,0,0,0,0,0,0,0,
-0,0,0,0,72,157,128,0,0,0,0,0,114,157,128,0,
-0,0,0,0,0,0,0,0,0,0,0,0,106,158,128,0,
-0,0,0,0,148,158,128,0,0,0,0,0,0,0,0,0,
-0,0,0,0,144,159,128,0,0,0,0,0,186,159,128,0,
-0,0,0,0,0,0,0,0,0,0,0,0,182,160,128,0,
-0,0,0,0,224,160,128,0,0,0,0,0,0,0,0,0,
-0,0,0,0,220,161,128,0,0,0,0,0,6,162,128,0,
-0,0,0,0,0,0,0,0,0,0,0,0,16,163,128,0,
-0,0,0,0,58,163,128,0,0,177,132,0,0,177,132,0,
-52,25,133,0,52,25,133,0,60,25,133,0,200,177,132,0,
-212,177,132,0,0,0,0,2,0,4,2,4,2,5,4,6,
+0,0,0,0,0,0,0,0,0,0,0,0,206,139,128,0,
+0,0,0,0,252,140,128,0,0,0,0,0,0,0,0,0,
+0,0,0,0,80,138,128,0,0,0,0,0,10,168,128,0,
+0,0,0,0,0,0,0,0,0,0,0,0,158,141,128,0,
+0,0,0,0,200,141,128,0,0,0,0,0,0,0,0,0,
+0,0,0,0,224,142,128,0,0,0,0,0,10,143,128,0,
+0,0,0,0,0,0,0,0,0,0,0,0,40,144,128,0,
+0,0,0,0,82,144,128,0,0,0,0,0,0,0,0,0,
+0,0,0,0,124,145,128,0,0,0,0,0,166,145,128,0,
+0,0,0,0,0,0,0,0,0,0,0,0,170,146,128,0,
+0,0,0,0,212,146,128,0,0,0,0,0,0,0,0,0,
+0,0,0,0,214,147,128,0,0,0,0,0,0,148,128,0,
+0,0,0,0,0,0,0,0,0,0,0,0,58,149,128,0,
+0,0,0,0,100,149,128,0,0,0,0,0,0,0,0,0,
+0,0,0,0,154,150,128,0,0,0,0,0,196,150,128,0,
+0,0,0,0,0,0,0,0,0,0,0,0,230,151,128,0,
+0,0,0,0,16,152,128,0,0,0,0,0,0,0,0,0,
+0,0,0,0,64,153,128,0,0,0,0,0,106,153,128,0,
+0,0,0,0,0,0,0,0,0,0,0,0,14,155,128,0,
+0,0,0,0,56,155,128,0,0,0,0,0,0,0,0,0,
+0,0,0,0,58,156,128,0,0,0,0,0,100,156,128,0,
+0,0,0,0,0,0,0,0,0,0,0,0,118,157,128,0,
+0,0,0,0,160,157,128,0,0,0,0,0,0,0,0,0,
+0,0,0,0,164,158,128,0,0,0,0,0,206,158,128,0,
+0,0,0,0,0,0,0,0,0,0,0,0,54,160,128,0,
+0,0,0,0,96,160,128,0,0,0,0,0,0,0,0,0,
+0,0,0,0,132,161,128,0,0,0,0,0,174,161,128,0,
+0,0,0,0,0,0,0,0,0,0,0,0,166,162,128,0,
+0,0,0,0,208,162,128,0,0,0,0,0,0,0,0,0,
+0,0,0,0,204,163,128,0,0,0,0,0,246,163,128,0,
+0,0,0,0,0,0,0,0,0,0,0,0,242,164,128,0,
+0,0,0,0,28,165,128,0,0,0,0,0,0,0,0,0,
+0,0,0,0,24,166,128,0,0,0,0,0,66,166,128,0,
+0,0,0,0,0,0,0,0,0,0,0,0,76,167,128,0,
+0,0,0,0,118,167,128,0,64,188,132,0,64,188,132,0,
+184,36,133,0,184,36,133,0,192,36,133,0,8,189,132,0,
+20,189,132,0,0,0,0,2,0,4,2,4,2,5,4,6,
 4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-30,29,130,0,0,0,0,0,30,29,130,0,126,76,11,125,
+194,37,130,0,0,0,0,0,194,37,130,0,126,76,11,125,
 14,0,20,0,9,0,3,125,0,125,127,127,126,77,11,125,
 14,4,20,4,9,4,3,17,17,4,2,0,4,0,1,0,
 0,125,127,127,126,64,11,125,12,125,3,125,3,125,5,4,
@@ -15958,10 +16085,10 @@ unsigned char tw_fw_code[] __initdata = 
 11,125,7,4,21,4,12,125,8,4,9,4,3,17,17,4,
 2,0,4,0,1,0,0,125,127,127,0,0,126,71,8,4,
 3,125,8,4,3,125,4,0,1,0,0,125,127,127,0,0,
-236,28,133,0,244,28,133,0,252,28,133,0,4,29,133,0,
-220,94,133,0,236,94,133,0,4,95,133,0,36,95,133,0,
-56,95,133,0,72,95,133,0,96,95,133,0,120,95,133,0,
-140,95,133,0,172,95,133,0,126,64,11,125,12,125,3,125,
+116,40,133,0,124,40,133,0,132,40,133,0,140,40,133,0,
+100,106,133,0,116,106,133,0,140,106,133,0,172,106,133,0,
+192,106,133,0,208,106,133,0,232,106,133,0,0,107,133,0,
+20,107,133,0,52,107,133,0,126,64,11,125,12,125,3,125,
 5,4,3,125,2,0,4,0,1,0,0,125,127,127,0,0,
 126,65,8,4,2,0,4,0,1,0,0,125,127,127,0,0,
 126,66,19,125,11,125,10,0,2,125,0,125,127,127,0,0,
@@ -15971,378 +16098,375 @@ unsigned char tw_fw_code[] __initdata = 
 11,125,7,0,8,0,9,0,3,125,0,125,127,127,0,0,
 126,70,19,125,11,125,7,4,21,4,8,4,9,4,3,17,
 17,4,2,0,4,0,1,0,0,125,127,127,126,71,8,4,
-2,0,4,0,1,0,0,125,127,127,0,0,236,28,133,0,
-244,28,133,0,252,28,133,0,4,29,133,0,220,94,133,0,
-236,94,133,0,248,95,133,0,16,96,133,0,32,96,133,0,
-48,96,133,0,68,96,133,0,92,96,133,0,112,96,133,0,
-140,96,133,0,255,255,255,255,0,2,64,0,255,255,255,255,
-20,187,132,0,255,255,255,255,1,2,65,0,255,255,255,255,
-68,187,132,0,255,255,255,255,2,2,66,0,1,0,0,0,
-12,188,132,0,255,255,255,255,2,2,66,0,6,0,0,0,
-112,187,132,0,255,255,255,255,2,2,67,0,24,0,0,0,
-36,188,132,0,255,255,255,255,3,2,68,0,255,255,255,255,
-60,188,132,0,255,255,255,255,4,2,69,0,1,0,0,0,
-80,188,132,0,255,255,255,255,4,2,70,0,30,0,0,0,
-100,188,132,0,255,255,255,255,8,2,71,0,255,255,255,255,
-36,187,132,0,255,255,255,255,10,2,76,0,1,0,0,0,
-136,187,132,0,255,255,255,255,10,2,77,0,30,0,0,0,
-160,187,132,0,255,255,255,255,9,2,71,0,255,255,255,255,
-120,188,132,0,255,255,255,255,16,2,65,0,255,255,255,255,
-140,188,132,0,255,255,255,255,17,2,71,0,255,255,255,255,
-52,187,132,0,255,255,255,255,18,2,71,0,255,255,255,255,
-160,188,132,0,255,255,255,255,19,2,71,0,255,255,255,255,
-184,187,132,0,255,255,255,255,20,2,71,0,255,255,255,255,
-88,187,132,0,255,255,255,255,22,2,75,0,255,255,255,255,
-180,188,132,0,255,255,255,255,23,2,75,0,255,255,255,255,
-200,188,132,0,255,255,255,255,19,16,72,0,255,255,255,255,
-200,187,132,0,255,255,255,255,17,16,73,0,255,255,255,255,
-152,25,133,0,0,1,5,38,0,1,112,0,56,210,132,0,
-1,1,5,32,0,1,112,0,88,210,132,0,2,1,5,38,
-0,1,112,0,128,199,132,0,3,1,5,38,0,1,112,0,
-160,199,132,0,4,1,5,38,0,1,112,0,112,210,132,0,
-5,1,5,36,0,1,112,0,44,204,132,0,6,1,5,36,
-0,1,112,0,144,210,132,0,7,1,5,36,0,1,112,0,
-164,210,132,0,8,1,5,36,0,1,112,0,76,204,132,0,
-9,1,5,33,0,1,112,0,188,210,132,0,10,1,5,37,
-0,1,112,0,208,210,132,0,11,1,5,38,0,1,112,0,
-236,210,132,0,12,1,5,38,0,1,112,0,12,211,132,0,
-13,1,5,36,0,1,112,0,44,211,132,0,14,1,5,36,
-0,1,112,0,68,211,132,0,15,1,5,38,0,1,112,0,
-104,211,132,0,16,1,11,85,1,1,112,0,136,211,132,0,
-17,1,11,85,3,1,112,0,164,211,132,0,18,1,11,85,
-3,1,112,0,192,211,132,0,19,1,11,85,1,1,112,0,
-92,204,132,0,20,1,11,85,1,1,112,0,124,204,132,0,
-21,1,11,85,1,1,112,0,8,202,132,0,32,1,11,105,
-1,1,112,0,216,211,132,0,33,1,11,103,5,1,112,0,
-232,211,132,0,34,1,11,109,0,1,112,0,140,204,132,0,
-35,1,11,108,0,1,112,0,252,211,132,0,36,1,11,108,
-0,1,112,0,20,212,132,0,37,1,5,255,255,1,112,0,
-56,212,132,0,38,1,11,255,255,1,112,0,84,212,132,0,
-39,1,11,109,0,1,112,0,140,204,132,0,40,1,5,4,
-0,1,112,0,192,199,132,0,41,1,11,255,0,1,112,0,
-20,202,132,0,48,1,11,255,255,1,112,0,160,204,132,0,
-49,1,11,255,255,1,112,0,100,212,132,0,50,1,11,255,
-255,1,112,0,128,212,132,0,51,1,11,255,255,1,112,0,
-156,212,132,0,64,1,11,255,255,1,112,0,184,212,132,0,
-80,1,5,33,1,1,112,0,200,212,132,0,81,1,5,33,
-1,1,112,0,232,212,132,0,82,1,5,33,1,1,112,0,
-8,213,132,0,83,1,5,33,1,1,112,0,40,213,132,0,
-96,1,5,38,0,1,112,0,72,213,132,0,97,1,5,38,
-0,1,112,0,100,213,132,0,98,1,5,38,0,1,112,0,
-128,213,132,0,112,1,11,255,255,1,112,0,156,213,132,0,
-113,1,11,255,255,1,112,0,184,204,132,0,128,1,11,255,
-255,1,112,0,196,213,132,0,129,1,11,255,255,1,112,0,
-48,202,132,0,130,1,11,255,255,1,112,0,244,213,132,0,
-131,1,11,255,255,2,112,0,20,214,132,0,132,1,11,255,
-255,1,112,0,208,199,132,0,133,1,11,255,255,1,112,0,
-216,204,132,0,160,1,11,255,255,1,112,0,60,214,132,0,
-192,1,4,0,0,1,112,0,16,205,132,0,193,1,4,0,
-0,1,112,0,84,202,132,0,194,1,4,0,0,1,112,0,
-84,214,132,0,195,1,4,0,0,1,112,0,104,202,132,0,
-196,1,4,0,0,1,112,0,104,214,132,0,197,1,4,0,
-0,1,112,0,132,214,132,0,198,1,4,0,0,1,112,0,
-156,214,132,0,199,1,4,0,0,1,112,0,40,205,132,0,
-200,1,4,0,0,1,112,0,0,200,132,0,201,1,4,0,
-0,1,112,0,180,214,132,0,202,1,4,0,0,1,112,0,
-212,214,132,0,208,1,5,38,0,1,112,0,24,200,132,0,
-209,1,5,26,0,1,112,0,132,202,132,0,210,1,5,38,
-0,1,112,0,248,214,132,0,211,1,5,38,0,1,112,0,
-28,215,132,0,0,2,4,8,3,1,112,0,60,215,132,0,
-1,2,4,71,1,1,112,0,76,215,132,0,2,2,3,17,
-0,1,112,0,96,215,132,0,3,2,4,74,0,1,112,0,
-64,205,132,0,4,2,4,8,1,1,112,0,112,215,132,0,
-5,2,4,41,0,1,112,0,128,215,132,0,6,2,4,71,
-1,1,112,0,84,205,132,0,7,2,4,70,0,1,112,0,
-104,205,132,0,8,2,4,8,0,1,112,0,56,200,132,0,
-9,2,4,8,0,1,112,0,72,200,132,0,10,2,4,32,
-0,1,112,0,124,205,132,0,16,2,4,71,1,1,112,0,
-76,215,132,0,17,2,4,75,0,1,112,0,96,200,132,0,
-18,2,4,75,0,1,112,0,152,215,132,0,19,2,4,255,
-255,1,112,0,172,215,132,0,20,2,4,255,255,1,112,0,
-160,202,132,0,21,2,4,255,255,1,112,0,192,215,132,0,
-22,2,4,255,255,2,112,0,228,215,132,0,23,2,4,255,
-255,1,112,0,252,215,132,0,48,2,5,32,0,1,112,0,
-148,205,132,0,49,2,0,0,0,3,112,0,20,216,132,0,
-50,2,5,38,0,1,112,0,48,216,132,0,51,2,5,38,
-0,1,112,0,192,205,132,0,52,2,5,38,0,1,112,0,
-224,205,132,0,53,2,5,38,0,1,112,0,88,216,132,0,
-64,2,4,0,0,3,112,0,120,216,132,0,65,2,4,0,
-0,3,112,0,112,200,132,0,66,2,1,64,0,3,112,0,
-144,216,132,0,67,2,4,64,0,3,112,0,188,202,132,0,
-72,2,4,0,0,3,112,0,0,206,132,0,73,2,4,0,
-0,3,112,0,196,216,132,0,80,2,5,38,0,1,112,0,
-224,216,132,0,81,2,5,38,0,1,112,0,12,217,132,0,
-82,2,5,38,0,1,112,0,68,217,132,0,83,2,5,38,
-0,1,112,0,28,206,132,0,84,2,5,38,0,1,112,0,
-108,217,132,0,85,2,5,38,0,1,112,0,164,217,132,0,
-86,2,5,38,0,1,112,0,220,217,132,0,87,2,5,38,
-0,1,112,0,208,202,132,0,88,2,5,38,0,1,112,0,
-88,206,132,0,89,2,5,38,0,1,112,0,28,218,132,0,
-90,2,5,38,0,1,112,0,64,218,132,0,91,2,5,38,
-0,1,112,0,136,206,132,0,92,2,5,38,0,1,112,0,
-192,206,132,0,93,2,5,38,0,1,112,0,124,218,132,0,
-96,2,4,93,0,2,112,0,152,218,132,0,0,16,0,0,
-0,3,127,0,216,25,133,0,1,16,0,0,0,3,127,0,
-216,25,133,0,2,16,0,0,0,3,127,0,216,25,133,0,
-3,16,0,0,0,3,127,0,4,203,132,0,4,16,0,0,
-0,3,127,0,136,200,132,0,5,16,0,0,0,3,127,0,
-136,200,132,0,6,16,0,0,0,3,127,0,216,25,133,0,
-7,16,0,0,0,3,127,0,216,25,133,0,7,16,0,0,
-0,3,127,0,188,218,132,0,8,16,0,0,0,3,127,0,
-212,218,132,0,16,16,0,0,0,3,127,0,236,218,132,0,
-17,16,0,0,0,3,127,0,160,200,132,0,18,16,0,0,
-0,3,127,0,184,200,132,0,19,16,0,0,0,3,127,0,
-24,203,132,0,20,16,0,0,0,3,127,0,208,200,132,0,
-21,16,0,0,0,3,127,0,8,219,132,0,22,16,0,0,
-0,3,127,0,224,200,132,0,19,48,0,0,0,1,127,0,
-0,201,132,0,20,48,0,0,0,1,127,0,44,203,132,0,
-30,48,0,0,0,1,127,0,24,219,132,0,33,48,0,0,
-0,1,127,0,80,203,132,0,36,48,0,0,0,1,127,0,
-60,219,132,0,37,48,0,0,0,1,127,0,116,203,132,0,
-38,48,0,0,0,1,127,0,252,206,132,0,39,48,0,0,
-0,1,127,0,144,203,132,0,71,48,0,0,0,1,127,0,
-92,219,132,0,98,48,0,0,0,1,127,0,28,207,132,0,
-99,48,0,0,0,1,127,0,120,219,132,0,100,48,0,0,
-0,1,127,0,160,219,132,0,101,48,0,0,0,1,127,0,
-60,207,132,0,102,48,0,0,0,1,127,0,88,207,132,0,
-103,48,0,0,0,1,127,0,116,207,132,0,104,48,0,0,
-0,1,127,0,140,207,132,0,105,48,0,0,0,1,127,0,
-180,219,132,0,106,48,0,0,0,1,127,0,216,219,132,0,
-107,48,0,0,0,1,127,0,240,219,132,0,0,0,0,0,
-0,4,113,0,40,201,132,0,1,0,6,41,0,3,113,0,
-152,207,132,0,2,0,4,107,2,1,113,0,16,220,132,0,
-3,0,4,0,0,1,113,0,40,220,132,0,4,0,4,107,
-2,1,113,0,180,207,132,0,5,0,0,107,1,3,113,0,
-56,201,132,0,6,0,0,107,2,2,113,0,68,220,132,0,
-7,0,0,0,0,3,113,0,96,220,132,0,8,0,0,0,
-0,2,113,0,208,207,132,0,9,0,4,0,0,1,113,0,
-124,220,132,0,10,0,4,0,0,1,113,0,148,220,132,0,
-11,0,0,0,0,3,113,0,80,201,132,0,12,0,0,0,
-0,3,113,0,236,207,132,0,13,0,0,0,0,3,113,0,
-96,201,132,0,14,0,4,107,2,1,113,0,172,220,132,0,
-15,0,0,93,0,2,113,0,152,218,132,0,16,0,0,0,
-0,1,113,0,204,220,132,0,17,0,0,0,0,1,113,0,
-12,208,132,0,18,0,0,0,0,1,113,0,164,203,132,0,
-19,0,0,0,0,1,113,0,244,220,132,0,20,0,0,0,
-0,1,113,0,52,208,132,0,21,0,0,0,0,1,113,0,
-24,221,132,0,22,0,0,0,0,1,113,0,88,208,132,0,
-23,0,0,0,0,1,113,0,56,221,132,0,24,0,0,0,
-0,1,113,0,128,208,132,0,25,0,0,0,0,1,113,0,
-84,221,132,0,26,0,0,0,0,1,113,0,156,208,132,0,
-27,0,0,0,0,1,113,0,128,201,132,0,28,0,0,0,
-0,1,113,0,160,201,132,0,29,0,0,0,0,1,113,0,
-192,201,132,0,32,0,0,0,0,1,113,0,116,221,132,0,
-33,0,0,0,0,2,113,0,152,221,132,0,34,0,0,0,
-0,2,113,0,188,208,132,0,35,0,1,17,0,2,113,0,
-216,201,132,0,36,0,4,64,0,1,113,0,240,201,132,0,
-37,0,4,0,0,1,113,0,188,221,132,0,38,0,3,17,
-0,1,113,0,224,208,132,0,39,0,4,0,0,1,113,0,
-232,221,132,0,40,0,4,0,0,1,113,0,0,222,132,0,
-41,0,0,0,0,3,113,0,0,209,132,0,42,0,4,107,
-2,1,113,0,28,222,132,0,43,0,0,0,0,3,113,0,
-56,222,132,0,44,0,1,17,0,1,113,0,28,209,132,0,
-45,0,4,107,2,1,113,0,80,222,132,0,46,0,0,0,
-0,2,113,0,124,222,132,0,47,0,0,0,0,2,113,0,
-68,209,132,0,48,0,4,0,0,1,113,0,120,209,132,0,
-49,0,0,0,0,4,113,0,176,222,132,0,50,0,0,0,
-0,2,113,0,200,203,132,0,51,0,0,0,0,3,113,0,
-212,222,132,0,52,0,4,107,2,1,113,0,244,203,132,0,
-53,0,0,0,0,3,113,0,144,209,132,0,54,0,0,0,
-0,2,113,0,244,222,132,0,55,0,4,64,0,1,113,0,
-36,223,132,0,56,0,4,64,0,1,113,0,60,223,132,0,
-57,0,1,64,0,2,113,0,84,223,132,0,58,0,4,41,
-0,1,113,0,172,209,132,0,59,0,0,0,0,3,113,0,
-204,209,132,0,60,0,0,0,0,3,113,0,112,223,132,0,
-61,0,0,0,0,3,113,0,144,223,132,0,62,0,0,0,
-0,3,113,0,16,204,132,0,63,0,4,64,0,2,113,0,
-212,214,132,0,64,0,0,0,0,3,113,0,172,223,132,0,
-65,0,4,64,0,2,113,0,232,209,132,0,66,0,4,64,
-0,2,113,0,200,223,132,0,67,0,4,64,0,2,113,0,
-236,223,132,0,252,0,0,0,0,4,113,0,16,224,132,0,
-253,0,0,0,0,4,113,0,60,224,132,0,254,0,0,0,
-0,4,113,0,12,210,132,0,255,0,0,0,0,4,113,0,
-36,210,132,0,0,0,0,0,0,0,0,0,0,0,0,0,
-30,29,130,0,0,0,0,0,30,29,130,0,0,0,0,0,
-30,29,130,0,0,0,0,0,30,29,130,0,0,0,0,0,
-30,29,130,0,0,0,0,0,30,29,130,0,0,0,0,0,
-30,29,130,0,0,0,0,0,0,0,0,0,0,0,0,0,
-180,2,129,0,0,0,0,0,22,2,129,0,0,0,0,0,
-244,1,129,0,0,0,0,0,252,1,129,0,0,0,0,0,
-4,2,129,0,0,0,0,0,30,29,130,0,0,0,0,0,
-12,2,129,0,0,0,0,0,0,0,0,0,0,0,0,0,
-30,29,130,0,0,0,0,0,30,29,130,0,0,0,0,0,
-30,29,130,0,0,0,0,0,30,29,130,0,0,0,0,0,
-30,29,130,0,0,0,0,0,30,29,130,0,0,0,0,0,
-30,29,130,0,0,0,0,0,0,0,0,0,0,0,0,0,
-42,5,129,0,0,0,0,0,140,4,129,0,0,0,0,0,
-106,4,129,0,0,0,0,0,114,4,129,0,0,0,0,0,
-122,4,129,0,0,0,0,0,30,29,130,0,0,0,0,0,
-130,4,129,0,0,0,0,0,0,0,0,0,0,0,0,0,
-30,29,130,0,0,0,0,0,30,29,130,0,0,0,0,0,
-30,29,130,0,0,0,0,0,30,29,130,0,0,0,0,0,
-30,29,130,0,0,0,0,0,30,29,130,0,0,0,0,0,
-30,29,130,0,0,0,0,0,0,0,0,0,0,0,0,0,
-110,8,129,0,0,0,0,0,238,7,129,0,0,0,0,0,
-194,7,129,0,0,0,0,0,200,7,129,0,0,0,0,0,
-206,7,129,0,0,0,0,0,212,7,129,0,0,0,0,0,
-232,7,129,0,0,0,0,0,0,0,0,0,0,0,0,0,
-110,8,129,0,0,0,0,0,28,11,129,0,0,0,0,0,
-194,7,129,0,0,0,0,0,200,7,129,0,0,0,0,0,
-206,7,129,0,0,0,0,0,212,7,129,0,0,0,0,0,
-232,7,129,0,2,0,0,0,14,36,0,0,0,0,0,0,
-82,101,97,100,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,3,0,0,0,5,36,0,0,0,0,0,0,
-87,114,105,116,101,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,4,0,0,0,2,36,0,0,0,0,0,0,
-82,101,97,100,86,101,114,105,102,121,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,194,15,1,0,
-78,111,112,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,1,0,0,0,0,0,0,0,228,15,1,0,
-73,110,105,116,67,111,110,110,101,99,116,0,0,0,0,0,
-0,0,0,0,5,0,0,0,0,4,0,0,96,31,1,0,
-86,101,114,105,102,121,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,6,0,0,0,0,0,0,0,132,18,1,0,
-80,111,114,116,83,99,97,110,0,0,0,0,0,0,0,0,
-0,0,0,0,7,0,0,0,0,0,0,0,54,19,1,0,
-73,109,112,111,114,116,85,110,105,116,0,0,0,0,0,0,
-0,0,0,0,8,0,0,0,0,4,0,0,12,32,1,0,
-90,101,114,111,85,110,105,116,0,0,0,0,0,0,0,0,
-0,0,0,0,9,0,0,0,0,4,0,0,176,32,1,0,
-82,101,112,108,97,99,101,68,114,105,118,101,0,0,0,0,
-0,0,0,0,10,0,0,0,0,0,0,0,110,34,1,0,
-72,111,116,83,119,97,112,0,0,0,0,0,0,0,0,0,
-0,0,0,0,11,0,0,0,0,0,0,0,238,35,1,0,
-83,101,108,102,84,101,115,116,115,0,0,0,0,0,0,0,
-0,0,0,0,12,0,0,0,32,0,0,0,96,66,129,0,
-83,121,110,99,80,97,114,97,109,0,0,0,0,0,0,0,
-0,0,0,0,13,0,0,0,32,0,0,0,226,39,1,0,
-82,101,111,114,100,101,114,85,110,105,116,115,0,0,0,0,
-0,0,0,0,14,0,0,0,0,4,0,0,202,19,1,0,
-70,108,117,115,104,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,15,0,0,0,0,0,0,0,168,43,1,0,
-82,101,115,101,114,118,101,100,54,0,0,0,0,0,0,0,
-0,0,0,0,16,0,0,0,0,0,0,0,168,43,1,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,17,0,0,0,0,8,0,0,242,29,1,0,
-65,84,65,80,97,115,115,84,104,114,117,0,0,0,0,0,
-0,0,0,0,18,0,0,0,96,0,0,0,14,61,129,0,
-71,101,116,80,97,114,97,109,0,0,0,0,0,0,0,0,
-0,0,0,0,19,0,0,0,32,0,0,0,142,61,129,0,
-83,101,116,80,97,114,97,109,0,0,0,0,0,0,0,0,
-0,0,0,0,20,0,0,0,32,2,0,0,74,21,1,0,
-67,114,101,97,116,101,85,110,105,116,0,0,0,0,0,0,
-0,0,0,0,21,0,0,0,0,4,0,0,0,20,1,0,
-68,101,108,101,116,101,85,110,105,116,0,0,0,0,0,0,
-0,0,0,0,22,0,0,0,32,0,0,0,84,28,1,0,
-68,111,119,110,108,111,97,100,70,87,0,0,0,0,0,0,
-0,0,0,0,23,0,0,0,0,4,0,0,8,33,1,0,
-82,101,98,117,105,108,100,85,110,105,116,0,0,0,0,0,
-0,0,0,0,24,0,0,0,0,0,0,0,208,41,1,0,
-80,119,114,77,97,110,97,103,101,109,101,110,116,0,0,0,
-0,0,0,0,25,0,0,0,0,0,0,0,168,43,1,0,
-82,101,97,100,67,102,103,0,0,0,0,0,0,0,0,0,
-0,0,0,0,26,0,0,0,0,0,0,0,168,43,1,0,
-87,114,105,116,101,67,102,103,0,0,0,0,0,0,0,0,
-0,0,0,0,27,0,0,0,32,0,0,0,172,41,1,0,
-82,101,109,111,116,101,80,114,105,110,116,0,0,0,0,0,
-0,0,0,0,28,0,0,0,0,0,0,0,150,33,1,0,
-82,101,115,101,116,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,29,0,0,0,0,0,0,0,168,43,1,0,
-82,101,115,101,114,118,101,100,55,0,0,0,0,0,0,0,
-0,0,0,0,30,0,0,0,0,0,0,0,168,43,1,0,
-82,101,115,101,114,118,101,100,56,0,0,0,0,0,0,0,
-0,0,0,0,31,0,0,0,0,0,0,0,174,36,1,0,
-68,105,97,103,110,111,115,116,105,99,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,168,43,1,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,4,0,0,0,0,0,0,0,168,43,1,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,40,0,0,0,14,37,0,0,0,0,0,0,
-82,101,97,100,49,48,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,42,0,0,0,5,37,0,0,0,0,0,0,
-87,114,105,116,101,49,48,0,0,0,0,0,0,0,0,0,
-0,0,0,0,136,0,0,0,14,37,0,0,0,0,0,0,
-82,101,97,100,49,54,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,138,0,0,0,5,37,0,0,0,0,0,0,
-87,114,105,116,101,49,54,0,0,0,0,0,0,0,0,0,
-0,0,0,0,168,0,0,0,14,37,0,0,0,0,0,0,
-82,101,97,100,49,50,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,170,0,0,0,5,37,0,0,0,0,0,0,
-87,114,105,116,101,49,50,0,0,0,0,0,0,0,0,0,
-0,0,0,0,8,0,0,0,14,37,0,0,0,0,0,0,
-82,101,97,100,54,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,10,0,0,0,5,37,0,0,0,0,0,0,
-87,114,105,116,101,54,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,47,0,0,0,2,37,0,0,0,0,0,0,
-86,101,114,105,102,121,49,48,0,0,0,0,0,0,0,0,
-0,0,0,0,143,0,0,0,2,37,0,0,0,0,0,0,
-86,101,114,105,102,121,49,54,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,21,0,0,232,31,129,0,
-84,101,115,116,85,110,105,116,82,101,97,100,121,0,0,0,
-0,0,0,0,3,0,0,0,64,1,0,0,232,44,1,0,
-82,101,113,117,101,115,116,83,101,110,115,101,0,0,0,0,
-0,0,0,0,18,0,0,0,64,21,0,0,60,45,1,0,
-73,110,113,117,105,114,121,0,0,0,0,0,0,0,0,0,
-0,0,0,0,26,0,0,0,64,1,0,0,180,46,1,0,
-77,111,100,101,83,101,110,115,101,54,0,0,0,0,0,0,
-0,0,0,0,27,0,0,0,0,21,0,0,134,48,1,0,
-83,116,97,114,116,83,116,111,112,0,0,0,0,0,0,0,
-0,0,0,0,37,0,0,0,64,21,0,0,252,45,1,0,
-82,101,97,100,67,97,112,97,99,105,116,121,0,0,0,0,
-0,0,0,0,21,0,0,0,32,21,0,0,202,47,1,0,
-77,111,100,101,83,101,108,101,99,116,54,0,0,0,0,0,
-0,0,0,0,59,0,0,0,0,1,0,0,132,50,1,0,
-87,114,105,116,101,66,117,102,102,101,114,0,0,0,0,0,
-0,0,0,0,60,0,0,0,0,1,0,0,132,50,1,0,
-82,101,97,100,66,117,102,102,101,114,0,0,0,0,0,0,
-0,0,0,0,85,0,0,0,32,21,0,0,32,48,1,0,
-77,111,100,101,83,101,108,101,99,116,49,48,0,0,0,0,
-0,0,0,0,90,0,0,0,64,21,0,0,62,47,1,0,
-77,111,100,101,83,101,110,115,101,49,48,0,0,0,0,0,
-0,0,0,0,53,0,0,0,0,21,0,0,180,50,1,0,
-83,121,110,99,67,97,99,104,101,49,48,0,0,0,0,0,
-0,0,0,0,145,0,0,0,0,21,0,0,180,50,1,0,
-83,121,110,99,67,97,99,104,101,49,48,0,0,0,0,0,
-0,0,0,0,158,0,0,0,64,21,0,0,238,50,1,0,
-83,101,114,118,105,99,101,65,99,116,105,111,110,73,110,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-30,29,130,0,0,0,0,0,30,29,130,0,0,0,0,0,
-0,0,0,0,0,0,0,0,224,31,129,0,0,0,0,0,
-228,31,129,0,220,193,142,0,208,193,142,0,196,193,142,0,
-0,0,0,0,136,31,129,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,30,29,130,0,0,0,0,0,
-30,29,130,0,0,0,0,0,30,29,130,0,0,0,0,0,
-30,29,130,0,0,0,0,0,0,0,0,0,0,0,0,0,
-74,35,129,0,0,0,0,0,230,35,129,0,0,0,0,0,
-112,36,129,0,0,0,0,0,210,36,129,0,0,0,0,0,
-0,0,0,0,0,0,0,0,204,37,129,0,0,0,0,0,
-8,38,129,0,0,0,0,0,70,38,129,0,0,0,0,0,
-168,38,129,0,0,0,0,0,252,42,129,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,6,43,129,0,
-0,0,0,0,174,43,129,0,0,0,0,0,0,0,0,0,
-0,0,0,0,82,44,129,0,0,0,0,0,144,44,129,0,
-0,0,0,0,0,0,0,0,0,0,0,0,170,77,129,0,
-0,0,0,0,200,77,129,0,0,0,0,0,206,77,129,0,
-0,0,0,0,0,0,0,0,0,0,0,0,122,78,129,0,
-0,0,0,0,238,78,129,0,0,0,0,0,6,79,129,0,
-0,0,0,0,0,0,0,0,0,0,0,0,18,79,129,0,
-0,0,0,0,238,78,129,0,0,0,0,0,134,79,129,0,
-0,0,0,0,82,70,129,0,0,0,0,0,2,0,0,0,
-84,241,132,0,0,0,0,0,3,0,0,0,156,241,132,0,
-0,0,0,0,4,0,0,0,172,241,132,0,0,0,0,0,
-5,0,0,0,188,241,132,0,0,0,0,0,0,2,15,16,
-100,241,132,0,0,0,0,0,0,3,15,16,104,243,132,0,
-0,0,0,0,1,4,0,0,96,26,133,0,0,0,0,0,
-2,4,0,0,8,243,132,0,0,0,0,0,3,4,0,0,
-128,242,132,0,0,0,0,0,10,4,0,0,212,241,132,0,
-0,0,0,0,12,4,0,0,228,241,132,0,0,0,0,0,
-16,4,7,6,36,242,132,0,0,0,0,0,71,101,114,111,
-110,105,109,111,47,65,112,97,99,104,101,32,0,0,0,0,
-51,119,97,114,101,32,73,110,116,101,114,110,97,108,32,85,
-115,101,32,32,0,0,0,0,78,111,32,70,97,99,116,111,
-114,121,32,68,97,116,97,32,104,97,115,32,98,101,101,110,
-32,119,114,105,116,116,101,110,46,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,0,4,0,1,0,0,125,127,127,0,0,116,40,133,0,
+124,40,133,0,132,40,133,0,140,40,133,0,100,106,133,0,
+116,106,133,0,128,107,133,0,152,107,133,0,168,107,133,0,
+184,107,133,0,204,107,133,0,228,107,133,0,248,107,133,0,
+20,108,133,0,255,255,255,255,0,2,64,0,255,255,255,255,
+84,198,132,0,255,255,255,255,1,2,65,0,255,255,255,255,
+132,198,132,0,255,255,255,255,2,2,66,0,1,0,0,0,
+76,199,132,0,255,255,255,255,2,2,66,0,6,0,0,0,
+176,198,132,0,255,255,255,255,2,2,67,0,24,0,0,0,
+100,199,132,0,255,255,255,255,3,2,68,0,255,255,255,255,
+124,199,132,0,255,255,255,255,4,2,69,0,1,0,0,0,
+144,199,132,0,255,255,255,255,4,2,70,0,30,0,0,0,
+164,199,132,0,255,255,255,255,8,2,71,0,255,255,255,255,
+100,198,132,0,255,255,255,255,10,2,76,0,1,0,0,0,
+200,198,132,0,255,255,255,255,10,2,77,0,30,0,0,0,
+224,198,132,0,255,255,255,255,9,2,71,0,255,255,255,255,
+184,199,132,0,255,255,255,255,16,2,65,0,255,255,255,255,
+204,199,132,0,255,255,255,255,17,2,71,0,255,255,255,255,
+116,198,132,0,255,255,255,255,18,2,71,0,255,255,255,255,
+224,199,132,0,255,255,255,255,19,2,71,0,255,255,255,255,
+248,198,132,0,255,255,255,255,20,2,71,0,255,255,255,255,
+152,198,132,0,255,255,255,255,22,2,75,0,255,255,255,255,
+244,199,132,0,255,255,255,255,23,2,75,0,255,255,255,255,
+8,200,132,0,255,255,255,255,19,16,72,0,255,255,255,255,
+8,199,132,0,255,255,255,255,17,16,73,0,255,255,255,255,
+28,37,133,0,0,1,5,38,0,1,112,0,120,221,132,0,
+1,1,5,32,0,1,112,0,152,221,132,0,2,1,5,38,
+0,1,112,0,192,210,132,0,3,1,5,38,0,1,112,0,
+224,210,132,0,4,1,5,38,0,1,112,0,176,221,132,0,
+5,1,5,36,0,1,112,0,108,215,132,0,6,1,5,36,
+0,1,112,0,208,221,132,0,7,1,5,36,0,1,112,0,
+228,221,132,0,8,1,5,36,0,1,112,0,140,215,132,0,
+9,1,5,33,0,1,112,0,252,221,132,0,10,1,5,37,
+0,1,112,0,16,222,132,0,11,1,5,38,0,1,112,0,
+44,222,132,0,12,1,5,38,0,1,112,0,76,222,132,0,
+13,1,5,36,0,1,112,0,108,222,132,0,14,1,5,36,
+0,1,112,0,132,222,132,0,15,1,5,38,0,1,112,0,
+168,222,132,0,16,1,11,85,1,1,112,0,200,222,132,0,
+17,1,11,85,3,1,112,0,228,222,132,0,18,1,11,85,
+3,1,112,0,0,223,132,0,19,1,11,85,1,1,112,0,
+156,215,132,0,20,1,11,85,1,1,112,0,188,215,132,0,
+21,1,11,85,1,1,112,0,72,213,132,0,32,1,11,105,
+1,1,112,0,24,223,132,0,33,1,11,103,5,1,112,0,
+40,223,132,0,34,1,11,109,0,1,112,0,204,215,132,0,
+35,1,11,108,0,1,112,0,60,223,132,0,36,1,11,108,
+0,1,112,0,84,223,132,0,37,1,5,255,255,1,112,0,
+120,223,132,0,38,1,11,255,255,1,112,0,148,223,132,0,
+39,1,11,109,0,1,112,0,204,215,132,0,40,1,5,4,
+0,1,112,0,0,211,132,0,41,1,11,255,0,1,112,0,
+84,213,132,0,48,1,11,255,255,1,112,0,224,215,132,0,
+49,1,11,255,255,1,112,0,164,223,132,0,50,1,11,255,
+255,1,112,0,192,223,132,0,51,1,11,255,255,1,112,0,
+220,223,132,0,64,1,11,255,255,1,112,0,248,223,132,0,
+80,1,5,33,1,1,112,0,8,224,132,0,81,1,5,33,
+1,1,112,0,40,224,132,0,82,1,5,33,1,1,112,0,
+72,224,132,0,83,1,5,33,1,1,112,0,104,224,132,0,
+96,1,5,38,0,1,112,0,136,224,132,0,97,1,5,38,
+0,1,112,0,164,224,132,0,98,1,5,38,0,1,112,0,
+192,224,132,0,112,1,11,255,255,1,112,0,220,224,132,0,
+113,1,11,255,255,1,112,0,248,215,132,0,128,1,11,255,
+255,1,112,0,4,225,132,0,129,1,11,255,255,1,112,0,
+112,213,132,0,130,1,11,255,255,1,112,0,52,225,132,0,
+131,1,11,255,255,2,112,0,84,225,132,0,132,1,11,255,
+255,1,112,0,16,211,132,0,133,1,11,255,255,1,112,0,
+24,216,132,0,160,1,11,255,255,1,112,0,124,225,132,0,
+192,1,4,0,0,1,112,0,80,216,132,0,193,1,4,0,
+0,1,112,0,148,213,132,0,194,1,4,0,0,1,112,0,
+148,225,132,0,195,1,4,0,0,1,112,0,168,213,132,0,
+196,1,4,0,0,1,112,0,168,225,132,0,197,1,4,0,
+0,1,112,0,196,225,132,0,198,1,4,0,0,1,112,0,
+220,225,132,0,199,1,4,0,0,1,112,0,104,216,132,0,
+200,1,4,0,0,1,112,0,64,211,132,0,201,1,4,0,
+0,1,112,0,244,225,132,0,202,1,4,0,0,1,112,0,
+20,226,132,0,205,1,4,0,0,1,112,0,56,226,132,0,
+206,1,4,0,0,1,112,0,84,226,132,0,208,1,5,38,
+0,1,112,0,88,211,132,0,209,1,5,26,0,1,112,0,
+196,213,132,0,210,1,5,38,0,1,112,0,112,226,132,0,
+211,1,5,38,0,1,112,0,148,226,132,0,0,2,4,8,
+3,1,112,0,180,226,132,0,1,2,4,71,1,1,112,0,
+196,226,132,0,2,2,3,17,0,1,112,0,216,226,132,0,
+3,2,4,74,0,1,112,0,128,216,132,0,4,2,4,8,
+1,1,112,0,232,226,132,0,5,2,4,41,0,1,112,0,
+248,226,132,0,6,2,4,71,1,1,112,0,148,216,132,0,
+7,2,4,70,0,1,112,0,168,216,132,0,8,2,4,8,
+0,1,112,0,120,211,132,0,9,2,4,8,0,1,112,0,
+136,211,132,0,10,2,4,32,0,1,112,0,188,216,132,0,
+16,2,4,71,1,1,112,0,196,226,132,0,17,2,4,75,
+0,1,112,0,160,211,132,0,18,2,4,75,0,1,112,0,
+16,227,132,0,19,2,4,255,255,1,112,0,36,227,132,0,
+20,2,4,255,255,1,112,0,224,213,132,0,21,2,4,255,
+255,1,112,0,56,227,132,0,22,2,4,255,255,2,112,0,
+92,227,132,0,23,2,4,255,255,1,112,0,116,227,132,0,
+48,2,5,32,0,1,112,0,212,216,132,0,49,2,0,0,
+0,3,112,0,140,227,132,0,50,2,5,38,0,1,112,0,
+168,227,132,0,51,2,5,38,0,1,112,0,0,217,132,0,
+52,2,5,38,0,1,112,0,32,217,132,0,53,2,5,38,
+0,1,112,0,208,227,132,0,64,2,4,0,0,3,112,0,
+240,227,132,0,65,2,4,0,0,3,112,0,176,211,132,0,
+66,2,1,64,0,3,112,0,8,228,132,0,67,2,4,64,
+0,3,112,0,252,213,132,0,72,2,4,0,0,3,112,0,
+64,217,132,0,73,2,4,0,0,3,112,0,60,228,132,0,
+80,2,5,38,0,1,112,0,88,228,132,0,81,2,5,38,
+0,1,112,0,132,228,132,0,82,2,5,38,0,1,112,0,
+188,228,132,0,83,2,5,38,0,1,112,0,92,217,132,0,
+84,2,5,38,0,1,112,0,228,228,132,0,85,2,5,38,
+0,1,112,0,28,229,132,0,86,2,5,38,0,1,112,0,
+84,229,132,0,87,2,5,38,0,1,112,0,16,214,132,0,
+88,2,5,38,0,1,112,0,152,217,132,0,89,2,5,38,
+0,1,112,0,148,229,132,0,90,2,5,38,0,1,112,0,
+184,229,132,0,91,2,5,38,0,1,112,0,200,217,132,0,
+92,2,5,38,0,1,112,0,0,218,132,0,93,2,5,38,
+0,1,112,0,244,229,132,0,96,2,4,93,0,2,112,0,
+16,230,132,0,0,16,0,0,0,3,127,0,92,37,133,0,
+1,16,0,0,0,3,127,0,92,37,133,0,2,16,0,0,
+0,3,127,0,92,37,133,0,3,16,0,0,0,3,127,0,
+68,214,132,0,4,16,0,0,0,3,127,0,200,211,132,0,
+5,16,0,0,0,3,127,0,200,211,132,0,6,16,0,0,
+0,3,127,0,92,37,133,0,7,16,0,0,0,3,127,0,
+92,37,133,0,7,16,0,0,0,3,127,0,52,230,132,0,
+8,16,0,0,0,3,127,0,76,230,132,0,16,16,0,0,
+0,3,127,0,100,230,132,0,17,16,0,0,0,3,127,0,
+224,211,132,0,18,16,0,0,0,3,127,0,248,211,132,0,
+19,16,0,0,0,3,127,0,88,214,132,0,20,16,0,0,
+0,3,127,0,16,212,132,0,21,16,0,0,0,3,127,0,
+128,230,132,0,22,16,0,0,0,3,127,0,32,212,132,0,
+19,48,0,0,0,1,127,0,64,212,132,0,20,48,0,0,
+0,1,127,0,108,214,132,0,30,48,0,0,0,1,127,0,
+144,230,132,0,33,48,0,0,0,1,127,0,144,214,132,0,
+36,48,0,0,0,1,127,0,180,230,132,0,37,48,0,0,
+0,1,127,0,180,214,132,0,38,48,0,0,0,1,127,0,
+60,218,132,0,39,48,0,0,0,1,127,0,208,214,132,0,
+71,48,0,0,0,1,127,0,212,230,132,0,98,48,0,0,
+0,1,127,0,92,218,132,0,99,48,0,0,0,1,127,0,
+240,230,132,0,100,48,0,0,0,1,127,0,24,231,132,0,
+101,48,0,0,0,1,127,0,124,218,132,0,102,48,0,0,
+0,1,127,0,152,218,132,0,103,48,0,0,0,1,127,0,
+180,218,132,0,104,48,0,0,0,1,127,0,204,218,132,0,
+105,48,0,0,0,1,127,0,44,231,132,0,106,48,0,0,
+0,1,127,0,80,231,132,0,107,48,0,0,0,1,127,0,
+104,231,132,0,0,0,0,0,0,4,113,0,104,212,132,0,
+1,0,6,41,0,3,113,0,216,218,132,0,2,0,4,107,
+2,1,113,0,136,231,132,0,3,0,4,0,0,1,113,0,
+160,231,132,0,4,0,4,107,2,1,113,0,244,218,132,0,
+5,0,0,107,1,3,113,0,120,212,132,0,6,0,0,107,
+2,2,113,0,188,231,132,0,7,0,0,0,0,3,113,0,
+216,231,132,0,8,0,0,0,0,2,113,0,16,219,132,0,
+9,0,4,0,0,1,113,0,244,231,132,0,10,0,4,0,
+0,1,113,0,12,232,132,0,11,0,0,0,0,3,113,0,
+144,212,132,0,12,0,0,0,0,3,113,0,44,219,132,0,
+13,0,0,0,0,3,113,0,160,212,132,0,14,0,4,107,
+2,1,113,0,36,232,132,0,15,0,0,93,0,2,113,0,
+16,230,132,0,16,0,0,0,0,1,113,0,68,232,132,0,
+17,0,0,0,0,1,113,0,76,219,132,0,18,0,0,0,
+0,1,113,0,228,214,132,0,19,0,0,0,0,1,113,0,
+108,232,132,0,20,0,0,0,0,1,113,0,116,219,132,0,
+21,0,0,0,0,1,113,0,144,232,132,0,22,0,0,0,
+0,1,113,0,152,219,132,0,23,0,0,0,0,1,113,0,
+176,232,132,0,24,0,0,0,0,1,113,0,192,219,132,0,
+25,0,0,0,0,1,113,0,204,232,132,0,26,0,0,0,
+0,1,113,0,220,219,132,0,27,0,0,0,0,1,113,0,
+192,212,132,0,28,0,0,0,0,1,113,0,224,212,132,0,
+29,0,0,0,0,1,113,0,0,213,132,0,32,0,0,0,
+0,1,113,0,236,232,132,0,33,0,0,0,0,2,113,0,
+16,233,132,0,34,0,0,0,0,2,113,0,252,219,132,0,
+35,0,1,17,0,2,113,0,24,213,132,0,36,0,4,64,
+0,1,113,0,48,213,132,0,37,0,4,0,0,1,113,0,
+52,233,132,0,38,0,3,17,0,1,113,0,32,220,132,0,
+39,0,4,0,0,1,113,0,96,233,132,0,40,0,4,0,
+0,1,113,0,120,233,132,0,41,0,0,0,0,3,113,0,
+64,220,132,0,42,0,4,107,2,1,113,0,148,233,132,0,
+43,0,0,0,0,3,113,0,176,233,132,0,44,0,1,17,
+0,1,113,0,92,220,132,0,45,0,4,107,2,1,113,0,
+200,233,132,0,46,0,0,0,0,2,113,0,244,233,132,0,
+47,0,0,0,0,2,113,0,132,220,132,0,48,0,4,0,
+0,1,113,0,184,220,132,0,49,0,0,0,0,4,113,0,
+40,234,132,0,50,0,0,0,0,2,113,0,8,215,132,0,
+51,0,0,0,0,3,113,0,76,234,132,0,52,0,4,107,
+2,1,113,0,52,215,132,0,53,0,0,0,0,3,113,0,
+208,220,132,0,54,0,0,0,0,2,113,0,108,234,132,0,
+55,0,4,64,0,1,113,0,156,234,132,0,56,0,4,64,
+0,1,113,0,180,234,132,0,57,0,1,64,0,2,113,0,
+204,234,132,0,58,0,4,41,0,1,113,0,236,220,132,0,
+59,0,0,0,0,3,113,0,12,221,132,0,60,0,0,0,
+0,3,113,0,232,234,132,0,61,0,0,0,0,3,113,0,
+8,235,132,0,62,0,0,0,0,3,113,0,80,215,132,0,
+63,0,4,64,0,2,113,0,20,226,132,0,64,0,0,0,
+0,3,113,0,36,235,132,0,65,0,4,64,0,2,113,0,
+40,221,132,0,66,0,4,64,0,2,113,0,64,235,132,0,
+67,0,4,64,0,2,113,0,100,235,132,0,252,0,0,0,
+0,4,113,0,136,235,132,0,253,0,0,0,0,4,113,0,
+180,235,132,0,254,0,0,0,0,4,113,0,76,221,132,0,
+255,0,0,0,0,4,113,0,100,221,132,0,0,0,0,0,
+0,0,0,0,0,0,0,0,194,37,130,0,0,0,0,0,
+194,37,130,0,0,0,0,0,194,37,130,0,0,0,0,0,
+194,37,130,0,0,0,0,0,194,37,130,0,0,0,0,0,
+194,37,130,0,0,0,0,0,194,37,130,0,0,0,0,0,
+0,0,0,0,0,0,0,0,240,6,129,0,0,0,0,0,
+82,6,129,0,0,0,0,0,48,6,129,0,0,0,0,0,
+56,6,129,0,0,0,0,0,64,6,129,0,0,0,0,0,
+194,37,130,0,0,0,0,0,72,6,129,0,0,0,0,0,
+0,0,0,0,0,0,0,0,194,37,130,0,0,0,0,0,
+194,37,130,0,0,0,0,0,194,37,130,0,0,0,0,0,
+194,37,130,0,0,0,0,0,194,37,130,0,0,0,0,0,
+194,37,130,0,0,0,0,0,194,37,130,0,0,0,0,0,
+0,0,0,0,0,0,0,0,102,9,129,0,0,0,0,0,
+200,8,129,0,0,0,0,0,166,8,129,0,0,0,0,0,
+174,8,129,0,0,0,0,0,182,8,129,0,0,0,0,0,
+194,37,130,0,0,0,0,0,190,8,129,0,0,0,0,0,
+0,0,0,0,0,0,0,0,194,37,130,0,0,0,0,0,
+194,37,130,0,0,0,0,0,194,37,130,0,0,0,0,0,
+194,37,130,0,0,0,0,0,194,37,130,0,0,0,0,0,
+194,37,130,0,0,0,0,0,194,37,130,0,0,0,0,0,
+0,0,0,0,0,0,0,0,156,12,129,0,0,0,0,0,
+52,12,129,0,0,0,0,0,8,12,129,0,0,0,0,0,
+14,12,129,0,0,0,0,0,20,12,129,0,0,0,0,0,
+26,12,129,0,0,0,0,0,46,12,129,0,2,0,0,0,
+14,36,0,0,0,0,0,0,82,101,97,100,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,
+5,36,0,0,0,0,0,0,87,114,105,116,101,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,
+2,36,0,0,0,0,0,0,82,101,97,100,86,101,114,105,
+102,121,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,228,16,1,0,78,111,112,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,
+0,0,0,0,6,17,1,0,73,110,105,116,67,111,110,110,
+101,99,116,0,0,0,0,0,0,0,0,0,5,0,0,0,
+0,4,0,0,18,33,1,0,86,101,114,105,102,121,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,6,0,0,0,
+0,0,0,0,54,20,1,0,80,111,114,116,83,99,97,110,
+0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,0,
+0,0,0,0,232,20,1,0,73,109,112,111,114,116,85,110,
+105,116,0,0,0,0,0,0,0,0,0,0,8,0,0,0,
+0,4,0,0,190,33,1,0,90,101,114,111,85,110,105,116,
+0,0,0,0,0,0,0,0,0,0,0,0,9,0,0,0,
+0,4,0,0,98,34,1,0,82,101,112,108,97,99,101,68,
+114,105,118,101,0,0,0,0,0,0,0,0,10,0,0,0,
+0,0,0,0,32,36,1,0,72,111,116,83,119,97,112,0,
+0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,
+0,0,0,0,194,37,1,0,83,101,108,102,84,101,115,116,
+115,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,
+32,0,0,0,108,72,129,0,83,121,110,99,80,97,114,97,
+109,0,0,0,0,0,0,0,0,0,0,0,13,0,0,0,
+32,0,0,0,182,41,1,0,82,101,111,114,100,101,114,85,
+110,105,116,115,0,0,0,0,0,0,0,0,14,0,0,0,
+0,4,0,0,124,21,1,0,70,108,117,115,104,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,
+0,0,0,0,124,45,1,0,82,101,115,101,114,118,101,100,
+54,0,0,0,0,0,0,0,0,0,0,0,16,0,0,0,
+0,0,0,0,124,45,1,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,17,0,0,0,
+0,8,0,0,164,31,1,0,65,84,65,80,97,115,115,84,
+104,114,117,0,0,0,0,0,0,0,0,0,18,0,0,0,
+96,0,0,0,26,67,129,0,71,101,116,80,97,114,97,109,
+0,0,0,0,0,0,0,0,0,0,0,0,19,0,0,0,
+32,0,0,0,154,67,129,0,83,101,116,80,97,114,97,109,
+0,0,0,0,0,0,0,0,0,0,0,0,20,0,0,0,
+32,2,0,0,252,22,1,0,67,114,101,97,116,101,85,110,
+105,116,0,0,0,0,0,0,0,0,0,0,21,0,0,0,
+0,4,0,0,178,21,1,0,68,101,108,101,116,101,85,110,
+105,116,0,0,0,0,0,0,0,0,0,0,22,0,0,0,
+32,0,0,0,6,30,1,0,68,111,119,110,108,111,97,100,
+70,87,0,0,0,0,0,0,0,0,0,0,23,0,0,0,
+0,4,0,0,186,34,1,0,82,101,98,117,105,108,100,85,
+110,105,116,0,0,0,0,0,0,0,0,0,24,0,0,0,
+0,0,0,0,164,43,1,0,80,119,114,77,97,110,97,103,
+101,109,101,110,116,0,0,0,0,0,0,0,25,0,0,0,
+0,0,0,0,124,45,1,0,82,101,97,100,67,102,103,0,
+0,0,0,0,0,0,0,0,0,0,0,0,26,0,0,0,
+0,0,0,0,124,45,1,0,87,114,105,116,101,67,102,103,
+0,0,0,0,0,0,0,0,0,0,0,0,27,0,0,0,
+32,0,0,0,128,43,1,0,82,101,109,111,116,101,80,114,
+105,110,116,0,0,0,0,0,0,0,0,0,28,0,0,0,
+0,0,0,0,72,35,1,0,82,101,115,101,116,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,29,0,0,0,
+0,0,0,0,124,45,1,0,82,101,115,101,114,118,101,100,
+55,0,0,0,0,0,0,0,0,0,0,0,30,0,0,0,
+0,0,0,0,124,45,1,0,82,101,115,101,114,118,101,100,
+56,0,0,0,0,0,0,0,0,0,0,0,31,0,0,0,
+0,0,0,0,130,38,1,0,68,105,97,103,110,111,115,116,
+105,99,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,124,45,1,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,
+0,0,0,0,124,45,1,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,40,0,0,0,
+14,37,0,0,0,0,0,0,82,101,97,100,49,48,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,42,0,0,0,
+5,37,0,0,0,0,0,0,87,114,105,116,101,49,48,0,
+0,0,0,0,0,0,0,0,0,0,0,0,136,0,0,0,
+14,37,0,0,0,0,0,0,82,101,97,100,49,54,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,138,0,0,0,
+5,37,0,0,0,0,0,0,87,114,105,116,101,49,54,0,
+0,0,0,0,0,0,0,0,0,0,0,0,168,0,0,0,
+14,37,0,0,0,0,0,0,82,101,97,100,49,50,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,170,0,0,0,
+5,37,0,0,0,0,0,0,87,114,105,116,101,49,50,0,
+0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,
+14,37,0,0,0,0,0,0,82,101,97,100,54,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,10,0,0,0,
+5,37,0,0,0,0,0,0,87,114,105,116,101,54,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,47,0,0,0,
+2,37,0,0,0,0,0,0,86,101,114,105,102,121,49,48,
+0,0,0,0,0,0,0,0,0,0,0,0,143,0,0,0,
+2,37,0,0,0,0,0,0,86,101,114,105,102,121,49,54,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,21,0,0,244,37,129,0,84,101,115,116,85,110,105,116,
+82,101,97,100,121,0,0,0,0,0,0,0,3,0,0,0,
+64,1,0,0,188,46,1,0,82,101,113,117,101,115,116,83,
+101,110,115,101,0,0,0,0,0,0,0,0,18,0,0,0,
+64,21,0,0,16,47,1,0,73,110,113,117,105,114,121,0,
+0,0,0,0,0,0,0,0,0,0,0,0,26,0,0,0,
+64,1,0,0,136,48,1,0,77,111,100,101,83,101,110,115,
+101,54,0,0,0,0,0,0,0,0,0,0,27,0,0,0,
+0,21,0,0,90,50,1,0,83,116,97,114,116,83,116,111,
+112,0,0,0,0,0,0,0,0,0,0,0,37,0,0,0,
+64,21,0,0,208,47,1,0,82,101,97,100,67,97,112,97,
+99,105,116,121,0,0,0,0,0,0,0,0,21,0,0,0,
+32,21,0,0,158,49,1,0,77,111,100,101,83,101,108,101,
+99,116,54,0,0,0,0,0,0,0,0,0,59,0,0,0,
+0,1,0,0,88,52,1,0,87,114,105,116,101,66,117,102,
+102,101,114,0,0,0,0,0,0,0,0,0,60,0,0,0,
+0,1,0,0,88,52,1,0,82,101,97,100,66,117,102,102,
+101,114,0,0,0,0,0,0,0,0,0,0,85,0,0,0,
+32,21,0,0,244,49,1,0,77,111,100,101,83,101,108,101,
+99,116,49,48,0,0,0,0,0,0,0,0,90,0,0,0,
+64,21,0,0,18,49,1,0,77,111,100,101,83,101,110,115,
+101,49,48,0,0,0,0,0,0,0,0,0,53,0,0,0,
+0,21,0,0,136,52,1,0,83,121,110,99,67,97,99,104,
+101,49,48,0,0,0,0,0,0,0,0,0,145,0,0,0,
+0,21,0,0,136,52,1,0,83,121,110,99,67,97,99,104,
+101,49,48,0,0,0,0,0,0,0,0,0,158,0,0,0,
+64,21,0,0,194,52,1,0,83,101,114,118,105,99,101,65,
+99,116,105,111,110,73,110,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,194,37,130,0,0,0,0,0,
+194,37,130,0,0,0,0,0,0,0,0,0,0,0,0,0,
+236,37,129,0,0,0,0,0,240,37,129,0,60,205,142,0,
+48,205,142,0,36,205,142,0,0,0,0,0,148,37,129,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+194,37,130,0,0,0,0,0,194,37,130,0,0,0,0,0,
+194,37,130,0,0,0,0,0,194,37,130,0,0,0,0,0,
+0,0,0,0,0,0,0,0,86,41,129,0,0,0,0,0,
+242,41,129,0,0,0,0,0,124,42,129,0,0,0,0,0,
+222,42,129,0,0,0,0,0,0,0,0,0,0,0,0,0,
+216,43,129,0,0,0,0,0,20,44,129,0,0,0,0,0,
+82,44,129,0,0,0,0,0,180,44,129,0,0,0,0,0,
+8,49,129,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,18,49,129,0,0,0,0,0,186,49,129,0,
+0,0,0,0,0,0,0,0,0,0,0,0,94,50,129,0,
+0,0,0,0,156,50,129,0,0,0,0,0,0,0,0,0,
+0,0,0,0,182,83,129,0,0,0,0,0,212,83,129,0,
+0,0,0,0,218,83,129,0,0,0,0,0,0,0,0,0,
+0,0,0,0,198,86,129,0,0,0,0,0,58,87,129,0,
+0,0,0,0,82,87,129,0,0,0,0,0,0,0,0,0,
+0,0,0,0,94,87,129,0,0,0,0,0,58,87,129,0,
+0,0,0,0,210,87,129,0,0,0,0,0,94,76,129,0,
+0,0,0,0,2,0,0,0,204,252,132,0,0,0,0,0,
+3,0,0,0,20,253,132,0,0,0,0,0,4,0,0,0,
+36,253,132,0,0,0,0,0,5,0,0,0,52,253,132,0,
+0,0,0,0,0,2,15,16,220,252,132,0,0,0,0,0,
+0,3,15,16,224,254,132,0,0,0,0,0,1,4,0,0,
+228,37,133,0,0,0,0,0,2,4,0,0,128,254,132,0,
+0,0,0,0,3,4,0,0,248,253,132,0,0,0,0,0,
+10,4,0,0,76,253,132,0,0,0,0,0,12,4,0,0,
+92,253,132,0,0,0,0,0,16,4,7,6,156,253,132,0,
+0,0,0,0,71,101,114,111,110,105,109,111,47,65,112,97,
+99,104,101,32,0,0,0,0,51,119,97,114,101,32,73,110,
+116,101,114,110,97,108,32,85,115,101,32,32,0,0,0,0,
+78,111,32,70,97,99,116,111,114,121,32,68,97,116,97,32,
+104,97,115,32,98,101,101,110,32,119,114,105,116,116,101,110,
+46,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,
@@ -16404,241 +16528,242 @@ unsigned char tw_fw_code[] __initdata = 
 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,28,105,129,0,0,0,0,0,150,44,129,0,
-0,0,0,0,188,104,129,0,0,0,0,0,0,0,0,0,
-0,0,0,0,28,105,129,0,0,0,0,0,52,45,129,0,
-0,0,0,0,188,104,129,0,0,0,0,0,0,0,0,0,
-0,0,0,0,28,105,129,0,0,0,0,0,182,44,129,0,
-0,0,0,0,188,104,129,0,0,0,0,0,0,0,0,0,
-0,0,0,0,28,105,129,0,0,0,0,0,20,45,129,0,
-0,0,0,0,188,104,129,0,0,0,0,0,0,0,0,0,
-0,0,0,0,116,53,129,0,0,0,0,0,28,55,129,0,
-0,0,0,0,184,54,129,0,0,0,0,0,30,29,130,0,
-0,0,0,0,0,0,0,0,0,0,0,0,54,57,129,0,
-0,0,0,0,28,55,129,0,0,0,0,0,112,58,129,0,
-0,0,0,0,156,58,129,0,0,0,0,0,0,0,0,0,
-0,0,0,0,140,59,129,0,0,0,0,0,78,60,129,0,
-0,0,0,0,180,60,129,0,0,0,0,0,248,60,129,0,
-0,0,0,0,0,0,0,0,0,0,0,0,28,105,129,0,
-0,0,0,0,246,109,129,0,0,0,0,0,250,109,129,0,
-0,0,0,0,0,0,0,0,0,0,0,0,28,105,129,0,
-0,0,0,0,32,110,129,0,0,0,0,0,250,109,129,0,
-0,0,0,0,0,0,0,0,0,0,0,0,28,105,129,0,
-0,0,0,0,4,110,129,0,0,0,0,0,170,105,129,0,
-0,0,0,0,0,0,0,0,0,0,0,0,28,105,129,0,
-0,0,0,0,16,110,129,0,0,0,0,0,78,106,129,0,
-0,0,0,0,0,0,0,0,0,0,0,0,28,105,129,0,
-0,0,0,0,20,110,129,0,0,0,0,0,166,106,129,0,
-0,0,0,0,0,0,0,0,0,0,0,0,28,105,129,0,
-0,0,0,0,24,110,129,0,0,0,0,0,244,106,129,0,
-0,0,0,0,0,0,0,0,0,0,0,0,28,105,129,0,
-0,0,0,0,28,110,129,0,0,0,0,0,12,107,129,0,
-0,0,0,0,0,0,0,0,0,0,0,0,28,105,129,0,
-0,0,0,0,0,110,129,0,0,0,0,0,190,107,129,0,
-0,0,0,0,0,0,0,0,0,0,0,0,28,105,129,0,
-0,0,0,0,12,110,129,0,0,0,0,0,212,107,129,0,
-0,0,0,0,0,0,0,0,0,0,0,0,28,105,129,0,
-0,0,0,0,8,110,129,0,0,0,0,0,50,108,129,0,
-0,0,0,0,0,0,0,0,0,0,0,0,28,105,129,0,
-0,0,0,0,144,108,129,0,0,0,0,0,250,109,129,0,
-0,0,0,0,0,0,0,0,0,0,0,0,28,105,129,0,
-0,0,0,0,124,109,129,0,0,0,0,0,250,109,129,0,
-0,0,0,0,0,0,0,0,0,0,0,0,28,105,129,0,
-0,0,0,0,216,109,129,0,0,0,0,0,250,109,129,0,
-0,0,0,0,36,110,129,0,0,0,0,0,0,0,0,0,
-16,177,255,255,62,110,129,0,0,0,0,0,82,110,129,0,
-0,0,0,0,0,0,0,0,68,177,255,255,108,110,129,0,
-0,0,0,0,0,0,0,0,0,0,0,0,156,141,129,0,
-0,0,0,0,80,112,129,0,0,0,0,0,94,116,129,0,
-0,0,0,0,34,118,129,0,0,0,0,0,24,119,129,0,
-0,0,0,0,12,120,129,0,0,0,0,0,246,120,129,0,
-0,0,0,0,14,121,129,0,0,0,0,0,104,121,129,0,
-0,0,0,0,0,0,0,0,0,0,0,0,148,157,129,0,
-0,0,0,0,80,112,129,0,0,0,0,0,94,116,129,0,
-0,0,0,0,44,146,129,0,0,0,0,0,24,119,129,0,
-0,0,0,0,12,120,129,0,0,0,0,0,246,120,129,0,
-0,0,0,0,14,121,129,0,0,0,0,0,104,121,129,0,
-0,0,0,0,0,0,0,0,0,0,0,0,190,157,129,0,
-0,0,0,0,80,112,129,0,0,0,0,0,220,146,129,0,
-0,0,0,0,34,118,129,0,0,0,0,0,24,119,129,0,
-0,0,0,0,12,120,129,0,0,0,0,0,246,120,129,0,
-0,0,0,0,14,121,129,0,0,0,0,0,104,121,129,0,
-0,0,0,0,0,0,0,0,0,0,0,0,232,157,129,0,
-0,0,0,0,80,112,129,0,0,0,0,0,94,116,129,0,
-0,0,0,0,34,118,129,0,0,0,0,0,90,147,129,0,
-0,0,0,0,114,147,129,0,0,0,0,0,246,120,129,0,
-0,0,0,0,14,121,129,0,0,0,0,0,104,121,129,0,
-0,0,0,0,0,0,0,0,0,0,0,0,18,158,129,0,
-0,0,0,0,80,112,129,0,0,0,0,0,162,151,129,0,
-0,0,0,0,34,118,129,0,0,0,0,0,114,149,129,0,
-0,0,0,0,106,150,129,0,0,0,0,0,246,120,129,0,
-0,0,0,0,60,151,129,0,0,0,0,0,104,121,129,0,
-0,0,0,0,0,0,0,0,0,0,0,0,60,158,129,0,
-0,0,0,0,80,112,129,0,0,0,0,0,34,153,129,0,
-0,0,0,0,46,152,129,0,0,0,0,0,72,152,129,0,
-0,0,0,0,96,152,129,0,0,0,0,0,246,120,129,0,
-0,0,0,0,92,153,129,0,0,0,0,0,104,121,129,0,
-0,0,0,0,0,0,0,0,0,0,0,0,132,156,129,0,
-0,0,0,0,80,112,129,0,0,0,0,0,94,116,129,0,
-0,0,0,0,146,154,129,0,0,0,0,0,240,154,129,0,
-0,0,0,0,144,155,129,0,0,0,0,0,246,120,129,0,
-0,0,0,0,36,156,129,0,0,0,0,0,104,121,129,0,
-12,27,133,0,240,253,132,0,36,254,132,0,0,254,132,0,
-12,254,132,0,24,254,132,0,228,253,132,0,52,254,132,0,
-0,0,0,0,0,0,0,0,0,0,0,0,50,172,129,0,
-0,0,0,0,238,172,129,0,0,0,0,0,0,0,0,0,
-0,0,0,0,122,172,129,0,0,0,0,0,244,172,129,0,
-0,0,0,0,2,186,129,0,0,0,0,0,0,0,0,0,
-100,24,148,0,212,185,129,0,0,0,0,0,14,190,129,0,
-0,0,0,0,0,0,0,0,128,29,148,0,10,191,129,0,
-176,179,255,255,60,7,133,0,104,121,1,0,0,0,0,0,
-196,223,255,255,0,0,0,0,10,0,0,0,10,0,0,0,
-0,0,0,0,0,0,0,0,24,122,1,0,10,0,0,0,
-184,27,148,0,144,6,133,0,18,125,1,0,0,0,0,0,
-244,222,148,0,0,0,0,0,6,0,0,0,6,0,0,0,
-0,0,0,0,1,0,0,0,182,126,1,0,0,0,0,0,
-192,24,148,0,160,6,133,0,32,123,1,0,0,0,0,0,
-244,142,148,0,0,0,0,0,6,0,0,0,6,0,0,0,
-0,0,0,0,1,0,0,0,6,125,1,0,0,0,0,0,
-240,25,148,0,76,7,133,0,50,122,1,0,0,0,0,0,
-244,174,148,0,0,0,0,0,10,0,0,0,10,0,0,0,
-0,0,0,0,1,0,0,0,0,123,1,0,0,0,0,0,
-80,28,148,0,176,6,133,0,232,127,1,0,0,0,0,0,
-244,238,148,0,0,0,0,0,6,0,0,0,6,0,0,0,
-0,0,0,0,1,0,0,0,20,129,1,0,2,0,0,0,
-232,28,148,0,96,7,133,0,104,120,1,0,0,0,0,0,
-244,254,148,0,0,0,0,0,4,0,0,0,4,0,0,0,
-0,0,0,0,1,0,0,0,158,120,1,0,3,0,0,0,
-32,27,148,0,116,7,133,0,22,121,1,0,0,0,0,0,
-244,206,148,0,0,0,0,0,3,0,0,0,3,0,0,0,
-0,0,0,0,1,0,0,0,92,121,1,0,3,0,0,0,
-136,26,148,0,192,6,133,0,188,120,1,0,0,0,0,0,
-244,190,148,0,0,0,0,0,2,0,0,0,2,0,0,0,
-0,0,0,0,1,0,0,0,10,121,1,0,3,0,0,0,
-88,25,148,0,144,7,133,0,230,119,1,0,0,0,0,0,
-244,158,148,0,0,0,0,0,1,0,0,0,1,0,0,0,
-0,0,0,0,1,0,0,0,44,120,1,0,3,0,0,0,
-232,3,0,0,67,111,112,121,114,105,103,104,116,32,40,99,
-41,32,49,57,57,54,45,50,48,48,50,32,69,120,112,114,
-101,115,115,32,76,111,103,105,99,32,73,110,99,46,32,42,
-32,84,104,114,101,97,100,88,32,78,69,67,32,86,56,53,
-48,69,47,71,114,101,101,110,32,72,105,108,108,115,32,86,
-101,114,115,105,111,110,32,71,52,46,48,97,46,52,46,48,
-97,32,42,0,71,45,71,66,45,71,76,45,77,45,68,45,
-68,76,45,75,77,76,45,67,77,82,45,72,77,82,45,77,
-76,50,45,71,90,45,75,72,50,45,67,77,45,82,80,45,
-84,67,45,78,72,45,84,68,45,65,80,45,72,65,45,71,
-70,45,68,68,45,65,84,45,77,70,45,77,83,45,68,87,
-45,85,83,65,45,67,65,45,83,68,45,83,68,83,85,0,
-0,0,0,0,0,0,0,0,0,0,0,0,254,17,130,0,
-0,0,0,0,46,18,130,0,0,0,0,0,2,19,130,0,
-0,0,0,0,0,0,0,0,0,0,0,0,64,18,130,0,
-0,0,0,0,46,18,130,0,0,0,0,0,112,18,130,0,
-0,0,0,0,8,126,148,0,64,18,130,0,98,97,100,32,
-97,108,108,111,99,97,116,105,111,110,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,6,19,130,0,
-0,0,0,0,54,19,130,0,0,0,0,0,164,27,130,0,
-0,0,0,0,0,0,0,0,0,0,0,0,230,23,130,0,
-0,0,0,0,70,24,130,0,0,0,0,0,100,24,130,0,
-0,0,0,0,0,0,0,0,0,0,0,0,128,24,130,0,
-0,0,0,0,70,24,130,0,0,0,0,0,224,24,130,0,
-0,0,0,0,0,0,0,0,0,0,0,0,252,24,130,0,
-0,0,0,0,70,24,130,0,0,0,0,0,92,25,130,0,
-117,110,107,110,111,119,110,0,115,116,114,105,110,103,32,116,
-111,111,32,108,111,110,103,0,117,110,107,110,111,119,110,0,
-105,110,118,97,108,105,100,32,115,116,114,105,110,103,32,112,
-111,115,105,116,105,111,110,0,255,255,255,255,117,110,107,110,
-111,119,110,0,10,0,0,0,101,120,99,101,112,116,105,111,
-110,58,32,0,8,0,0,0,0,0,0,0,0,0,0,0,
-67,43,43,32,114,117,110,116,105,109,101,32,97,98,111,114,
-116,0,0,0,102,114,101,101,105,110,103,32,97,114,114,97,
-121,32,110,111,116,32,97,108,108,111,99,97,116,101,100,32,
-98,121,32,97,110,32,97,114,114,97,121,32,110,101,119,32,
-111,112,101,114,97,116,105,111,110,0,0,0,116,101,114,109,
-105,110,97,116,101,40,41,32,99,97,108,108,101,100,32,98,
-121,32,116,104,101,32,101,120,99,101,112,116,105,111,110,32,
-104,97,110,100,108,105,110,103,32,109,101,99,104,97,110,105,
-115,109,0,0,114,101,116,117,114,110,101,100,32,102,114,111,
-109,32,97,32,117,115,101,114,45,100,101,102,105,110,101,100,
-32,116,101,114,109,105,110,97,116,101,40,41,32,114,111,117,
-116,105,110,101,0,0,0,0,109,97,105,110,40,41,32,99,
-97,108,108,101,100,32,109,111,114,101,32,116,104,97,110,32,
-111,110,99,101,0,0,0,0,97,32,112,117,114,101,32,118,
-105,114,116,117,97,108,32,102,117,110,99,116,105,111,110,32,
-119,97,115,32,99,97,108,108,101,100,0,0,105,110,118,97,
-108,105,100,32,100,121,110,97,109,105,99,32,99,97,115,116,
-0,0,0,0,105,110,118,97,108,105,100,32,116,121,112,101,
-105,100,32,111,112,101,114,97,116,105,111,110,0,0,0,0,
-105,110,116,101,114,110,97,108,32,101,114,114,111,114,58,32,
-115,116,97,116,105,99,32,111,98,106,101,99,116,32,109,97,
-114,107,101,100,32,102,111,114,32,100,101,115,116,114,117,99,
-116,105,111,110,32,109,111,114,101,32,116,104,97,110,32,111,
-110,99,101,0,37,115,58,32,37,115,10,0,40,110,117,108,
-108,41,0,0,48,49,50,51,52,53,54,55,56,57,97,98,
-99,100,101,102,48,49,50,51,52,53,54,55,56,57,65,66,
-67,68,69,70,40,70,108,111,97,116,105,110,103,32,112,111,
-105,110,116,32,111,117,116,112,117,116,32,117,110,115,117,112,
-112,111,114,116,101,100,32,119,47,45,110,111,102,108,111,97,
-116,105,111,32,111,114,32,45,102,110,111,110,101,41,0,94,
-32,9,10,13,11,12,93,0,20,0,0,0,0,0,0,0,
-0,255,0,0,128,0,0,4,0,1,0,4,0,2,0,4,
-179,82,179,82,179,82,179,82,179,34,179,18,179,18,0,0,
-0,0,0,0,19,0,0,0,115,116,114,105,110,103,32,110,
-111,116,32,102,111,117,110,100,0,0,0,0,82,101,118,32,
-48,48,48,32,0,0,0,0,91,24,133,0,94,24,133,0,
-0,0,255,255,94,180,0,0,0,0,255,255,54,180,0,0,
-0,0,255,255,154,180,0,0,0,0,255,255,46,181,0,0,
-0,0,255,255,238,180,0,0,0,0,255,255,160,181,0,0,
-0,0,255,255,230,224,0,0,0,0,255,255,26,207,0,0,
-0,0,255,255,174,206,0,0,0,0,255,255,246,206,0,0,
-0,0,255,255,210,206,0,0,0,0,255,255,246,206,0,0,
-0,0,255,255,250,207,0,0,0,0,255,255,98,207,0,0,
-0,0,255,255,62,207,0,0,0,0,255,255,82,208,0,0,
-0,0,255,255,134,207,0,0,0,0,255,255,218,212,0,0,
-0,0,255,255,134,217,0,0,0,0,255,255,90,225,0,0,
-0,0,255,255,28,214,0,0,0,0,255,255,60,217,0,0,
-0,0,255,255,54,231,0,0,0,0,255,255,156,242,0,0,
-0,0,255,255,222,213,0,0,0,0,255,255,134,215,0,0,
-0,0,255,255,106,223,0,0,0,0,255,255,58,224,0,0,
-0,0,255,255,128,224,0,0,0,0,255,255,132,242,0,0,
-0,0,255,255,68,242,0,0,0,0,0,0,0,0,8,0,
-0,0,0,0,0,0,0,0,1,2,0,0,1,0,0,0,
-0,0,0,0,126,74,13,125,127,127,0,0,126,73,0,125,
-127,127,0,0,126,72,1,125,127,127,0,0,126,75,13,125,
-15,125,127,127,0,0,0,0,0,0,0,0,0,0,0,0,
-0,242,5,42,1,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,100,241,132,0,8,243,132,0,
-104,243,132,0,104,26,133,0,184,243,132,0,156,241,132,0,
-172,241,132,0,188,241,132,0,212,241,132,0,228,241,132,0,
-36,242,132,0,60,242,132,0,108,119,133,0,1,0,0,0,
-1,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,2,0,0,78,77,73,0,16,27,133,0,20,27,133,0,
-24,27,133,0,1,0,0,0,0,0,0,0,88,36,133,0,
-0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
-240,240,240,240,16,0,0,0,16,0,0,0,0,1,0,0,
-0,2,0,0,7,0,0,0,136,7,130,0,182,63,130,0,
-0,0,0,0,38,89,130,0,10,0,0,0,36,86,69,82,
-86,69,82,36,37,100,37,115,10,0,0,0,75,66,0,77,
-66,0,0,0,82,67,68,61,37,117,10,0,117,110,107,110,
-111,119,110,0,117,110,107,110,111,119,110,0,37,48,51,100,
-32,0,0,0,112,111,114,116,61,37,100,0,10,0,10,0,
-36,86,69,82,86,69,82,36,32,77,73,82,82,79,82,0,
-32,68,69,65,68,0,0,0,32,40,37,120,41,0,0,0,
-32,82,65,73,68,48,0,0,32,82,65,73,68,53,0,0,
-37,115,0,43,62,0,32,32,0,0,0,0,73,110,105,116,
-105,97,108,0,73,100,108,101,0,0,0,0,84,87,77,72,
-0,0,0,0,112,111,114,116,115,0,0,0,112,111,114,116,
-0,0,0,0,37,99,37,105,0,0,0,0,37,115,37,115,
-37,99,0,0,8,0,0,0,8,0,0,0,99,104,101,99,
-107,102,119,0,99,109,100,104,105,115,116,0,109,101,109,114,
-101,97,100,0,109,111,110,0,118,97,114,0,118,101,114,0,
-35,0,104,0,112,97,114,97,109,0,0,0,117,110,105,116,
-115,0,0,0,47,47,0,0,99,109,100,108,111,103,0,0,
-100,101,108,101,116,101,0,0,100,114,105,118,101,115,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,104,113,129,0,
+0,0,0,0,162,50,129,0,0,0,0,0,8,113,129,0,
+0,0,0,0,0,0,0,0,0,0,0,0,104,113,129,0,
+0,0,0,0,64,51,129,0,0,0,0,0,8,113,129,0,
+0,0,0,0,0,0,0,0,0,0,0,0,104,113,129,0,
+0,0,0,0,194,50,129,0,0,0,0,0,8,113,129,0,
+0,0,0,0,0,0,0,0,0,0,0,0,104,113,129,0,
+0,0,0,0,32,51,129,0,0,0,0,0,8,113,129,0,
+0,0,0,0,0,0,0,0,0,0,0,0,128,59,129,0,
+0,0,0,0,40,61,129,0,0,0,0,0,196,60,129,0,
+0,0,0,0,194,37,130,0,0,0,0,0,0,0,0,0,
+0,0,0,0,66,63,129,0,0,0,0,0,40,61,129,0,
+0,0,0,0,124,64,129,0,0,0,0,0,168,64,129,0,
+0,0,0,0,0,0,0,0,0,0,0,0,152,65,129,0,
+0,0,0,0,90,66,129,0,0,0,0,0,192,66,129,0,
+0,0,0,0,4,67,129,0,0,0,0,0,0,0,0,0,
+0,0,0,0,104,113,129,0,0,0,0,0,66,118,129,0,
+0,0,0,0,70,118,129,0,0,0,0,0,0,0,0,0,
+0,0,0,0,104,113,129,0,0,0,0,0,108,118,129,0,
+0,0,0,0,70,118,129,0,0,0,0,0,0,0,0,0,
+0,0,0,0,104,113,129,0,0,0,0,0,80,118,129,0,
+0,0,0,0,246,113,129,0,0,0,0,0,0,0,0,0,
+0,0,0,0,104,113,129,0,0,0,0,0,92,118,129,0,
+0,0,0,0,154,114,129,0,0,0,0,0,0,0,0,0,
+0,0,0,0,104,113,129,0,0,0,0,0,96,118,129,0,
+0,0,0,0,242,114,129,0,0,0,0,0,0,0,0,0,
+0,0,0,0,104,113,129,0,0,0,0,0,100,118,129,0,
+0,0,0,0,64,115,129,0,0,0,0,0,0,0,0,0,
+0,0,0,0,104,113,129,0,0,0,0,0,104,118,129,0,
+0,0,0,0,88,115,129,0,0,0,0,0,0,0,0,0,
+0,0,0,0,104,113,129,0,0,0,0,0,76,118,129,0,
+0,0,0,0,10,116,129,0,0,0,0,0,0,0,0,0,
+0,0,0,0,104,113,129,0,0,0,0,0,88,118,129,0,
+0,0,0,0,32,116,129,0,0,0,0,0,0,0,0,0,
+0,0,0,0,104,113,129,0,0,0,0,0,84,118,129,0,
+0,0,0,0,126,116,129,0,0,0,0,0,0,0,0,0,
+0,0,0,0,104,113,129,0,0,0,0,0,220,116,129,0,
+0,0,0,0,70,118,129,0,0,0,0,0,0,0,0,0,
+0,0,0,0,104,113,129,0,0,0,0,0,200,117,129,0,
+0,0,0,0,70,118,129,0,0,0,0,0,0,0,0,0,
+0,0,0,0,104,113,129,0,0,0,0,0,36,118,129,0,
+0,0,0,0,70,118,129,0,0,0,0,0,112,118,129,0,
+0,0,0,0,0,0,0,0,16,177,255,255,138,118,129,0,
+0,0,0,0,158,118,129,0,0,0,0,0,0,0,0,0,
+68,177,255,255,184,118,129,0,0,0,0,0,0,0,0,0,
+0,0,0,0,58,150,129,0,0,0,0,0,164,120,129,0,
+0,0,0,0,2,125,129,0,0,0,0,0,198,126,129,0,
+0,0,0,0,188,127,129,0,0,0,0,0,176,128,129,0,
+0,0,0,0,154,129,129,0,0,0,0,0,178,129,129,0,
+0,0,0,0,12,130,129,0,0,0,0,0,0,0,0,0,
+0,0,0,0,54,166,129,0,0,0,0,0,164,120,129,0,
+0,0,0,0,2,125,129,0,0,0,0,0,202,154,129,0,
+0,0,0,0,188,127,129,0,0,0,0,0,176,128,129,0,
+0,0,0,0,154,129,129,0,0,0,0,0,178,129,129,0,
+0,0,0,0,12,130,129,0,0,0,0,0,0,0,0,0,
+0,0,0,0,96,166,129,0,0,0,0,0,164,120,129,0,
+0,0,0,0,122,155,129,0,0,0,0,0,198,126,129,0,
+0,0,0,0,188,127,129,0,0,0,0,0,176,128,129,0,
+0,0,0,0,154,129,129,0,0,0,0,0,178,129,129,0,
+0,0,0,0,12,130,129,0,0,0,0,0,0,0,0,0,
+0,0,0,0,138,166,129,0,0,0,0,0,164,120,129,0,
+0,0,0,0,2,125,129,0,0,0,0,0,198,126,129,0,
+0,0,0,0,248,155,129,0,0,0,0,0,16,156,129,0,
+0,0,0,0,154,129,129,0,0,0,0,0,178,129,129,0,
+0,0,0,0,12,130,129,0,0,0,0,0,0,0,0,0,
+0,0,0,0,180,166,129,0,0,0,0,0,164,120,129,0,
+0,0,0,0,68,160,129,0,0,0,0,0,198,126,129,0,
+0,0,0,0,20,158,129,0,0,0,0,0,12,159,129,0,
+0,0,0,0,154,129,129,0,0,0,0,0,222,159,129,0,
+0,0,0,0,12,130,129,0,0,0,0,0,0,0,0,0,
+0,0,0,0,222,166,129,0,0,0,0,0,164,120,129,0,
+0,0,0,0,196,161,129,0,0,0,0,0,208,160,129,0,
+0,0,0,0,234,160,129,0,0,0,0,0,2,161,129,0,
+0,0,0,0,154,129,129,0,0,0,0,0,254,161,129,0,
+0,0,0,0,12,130,129,0,0,0,0,0,0,0,0,0,
+0,0,0,0,38,165,129,0,0,0,0,0,164,120,129,0,
+0,0,0,0,2,125,129,0,0,0,0,0,52,163,129,0,
+0,0,0,0,146,163,129,0,0,0,0,0,50,164,129,0,
+0,0,0,0,154,129,129,0,0,0,0,0,198,164,129,0,
+0,0,0,0,12,130,129,0,144,38,133,0,108,9,133,0,
+160,9,133,0,124,9,133,0,136,9,133,0,148,9,133,0,
+96,9,133,0,176,9,133,0,0,0,0,0,0,0,0,0,
+0,0,0,0,212,180,129,0,0,0,0,0,144,181,129,0,
+0,0,0,0,0,0,0,0,0,0,0,0,28,181,129,0,
+0,0,0,0,150,181,129,0,0,0,0,0,164,194,129,0,
+0,0,0,0,0,0,0,0,196,35,148,0,118,194,129,0,
+0,0,0,0,176,198,129,0,0,0,0,0,0,0,0,0,
+224,40,148,0,172,199,129,0,176,179,255,255,184,18,133,0,
+146,123,1,0,0,0,0,0,196,223,255,255,0,0,0,0,
+10,0,0,0,10,0,0,0,0,0,0,0,0,0,0,0,
+66,124,1,0,10,0,0,0,24,39,148,0,12,18,133,0,
+60,127,1,0,0,0,0,0,84,234,148,0,0,0,0,0,
+6,0,0,0,6,0,0,0,0,0,0,0,1,0,0,0,
+224,128,1,0,0,0,0,0,32,36,148,0,28,18,133,0,
+74,125,1,0,0,0,0,0,84,154,148,0,0,0,0,0,
+6,0,0,0,6,0,0,0,0,0,0,0,1,0,0,0,
+48,127,1,0,0,0,0,0,80,37,148,0,200,18,133,0,
+92,124,1,0,0,0,0,0,84,186,148,0,0,0,0,0,
+10,0,0,0,10,0,0,0,0,0,0,0,1,0,0,0,
+42,125,1,0,0,0,0,0,176,39,148,0,44,18,133,0,
+18,130,1,0,0,0,0,0,84,250,148,0,0,0,0,0,
+6,0,0,0,6,0,0,0,0,0,0,0,1,0,0,0,
+62,131,1,0,2,0,0,0,72,40,148,0,220,18,133,0,
+146,122,1,0,0,0,0,0,84,10,149,0,0,0,0,0,
+4,0,0,0,4,0,0,0,0,0,0,0,1,0,0,0,
+200,122,1,0,3,0,0,0,128,38,148,0,240,18,133,0,
+64,123,1,0,0,0,0,0,84,218,148,0,0,0,0,0,
+3,0,0,0,3,0,0,0,0,0,0,0,1,0,0,0,
+134,123,1,0,3,0,0,0,232,37,148,0,60,18,133,0,
+230,122,1,0,0,0,0,0,84,202,148,0,0,0,0,0,
+2,0,0,0,2,0,0,0,0,0,0,0,1,0,0,0,
+52,123,1,0,3,0,0,0,184,36,148,0,12,19,133,0,
+16,122,1,0,0,0,0,0,84,170,148,0,0,0,0,0,
+1,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,
+86,122,1,0,3,0,0,0,232,3,0,0,67,111,112,121,
+114,105,103,104,116,32,40,99,41,32,49,57,57,54,45,50,
+48,48,50,32,69,120,112,114,101,115,115,32,76,111,103,105,
+99,32,73,110,99,46,32,42,32,84,104,114,101,97,100,88,
+32,78,69,67,32,86,56,53,48,69,47,71,114,101,101,110,
+32,72,105,108,108,115,32,86,101,114,115,105,111,110,32,71,
+52,46,48,97,46,52,46,48,97,32,42,0,71,45,71,66,
+45,71,76,45,77,45,68,45,68,76,45,75,77,76,45,67,
+77,82,45,72,77,82,45,77,76,50,45,71,90,45,75,72,
+50,45,67,77,45,82,80,45,84,67,45,78,72,45,84,68,
+45,65,80,45,72,65,45,71,70,45,68,68,45,65,84,45,
+77,70,45,77,83,45,68,87,45,85,83,65,45,67,65,45,
+83,68,45,83,68,83,85,0,0,0,0,0,0,0,0,0,
+0,0,0,0,162,26,130,0,0,0,0,0,210,26,130,0,
+0,0,0,0,166,27,130,0,0,0,0,0,0,0,0,0,
+0,0,0,0,228,26,130,0,0,0,0,0,210,26,130,0,
+0,0,0,0,20,27,130,0,0,0,0,0,104,137,148,0,
+228,26,130,0,98,97,100,32,97,108,108,111,99,97,116,105,
+111,110,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,170,27,130,0,0,0,0,0,218,27,130,0,
+0,0,0,0,72,36,130,0,0,0,0,0,0,0,0,0,
+0,0,0,0,138,32,130,0,0,0,0,0,234,32,130,0,
+0,0,0,0,8,33,130,0,0,0,0,0,0,0,0,0,
+0,0,0,0,36,33,130,0,0,0,0,0,234,32,130,0,
+0,0,0,0,132,33,130,0,0,0,0,0,0,0,0,0,
+0,0,0,0,160,33,130,0,0,0,0,0,234,32,130,0,
+0,0,0,0,0,34,130,0,117,110,107,110,111,119,110,0,
+115,116,114,105,110,103,32,116,111,111,32,108,111,110,103,0,
+117,110,107,110,111,119,110,0,105,110,118,97,108,105,100,32,
+115,116,114,105,110,103,32,112,111,115,105,116,105,111,110,0,
+255,255,255,255,117,110,107,110,111,119,110,0,10,0,0,0,
+101,120,99,101,112,116,105,111,110,58,32,0,8,0,0,0,
+0,0,0,0,0,0,0,0,67,43,43,32,114,117,110,116,
+105,109,101,32,97,98,111,114,116,0,0,0,102,114,101,101,
+105,110,103,32,97,114,114,97,121,32,110,111,116,32,97,108,
+108,111,99,97,116,101,100,32,98,121,32,97,110,32,97,114,
+114,97,121,32,110,101,119,32,111,112,101,114,97,116,105,111,
+110,0,0,0,116,101,114,109,105,110,97,116,101,40,41,32,
+99,97,108,108,101,100,32,98,121,32,116,104,101,32,101,120,
+99,101,112,116,105,111,110,32,104,97,110,100,108,105,110,103,
+32,109,101,99,104,97,110,105,115,109,0,0,114,101,116,117,
+114,110,101,100,32,102,114,111,109,32,97,32,117,115,101,114,
+45,100,101,102,105,110,101,100,32,116,101,114,109,105,110,97,
+116,101,40,41,32,114,111,117,116,105,110,101,0,0,0,0,
+109,97,105,110,40,41,32,99,97,108,108,101,100,32,109,111,
+114,101,32,116,104,97,110,32,111,110,99,101,0,0,0,0,
+97,32,112,117,114,101,32,118,105,114,116,117,97,108,32,102,
+117,110,99,116,105,111,110,32,119,97,115,32,99,97,108,108,
+101,100,0,0,105,110,118,97,108,105,100,32,100,121,110,97,
+109,105,99,32,99,97,115,116,0,0,0,0,105,110,118,97,
+108,105,100,32,116,121,112,101,105,100,32,111,112,101,114,97,
+116,105,111,110,0,0,0,0,105,110,116,101,114,110,97,108,
+32,101,114,114,111,114,58,32,115,116,97,116,105,99,32,111,
+98,106,101,99,116,32,109,97,114,107,101,100,32,102,111,114,
+32,100,101,115,116,114,117,99,116,105,111,110,32,109,111,114,
+101,32,116,104,97,110,32,111,110,99,101,0,37,115,58,32,
+37,115,10,0,40,110,117,108,108,41,0,0,48,49,50,51,
+52,53,54,55,56,57,97,98,99,100,101,102,48,49,50,51,
+52,53,54,55,56,57,65,66,67,68,69,70,40,70,108,111,
+97,116,105,110,103,32,112,111,105,110,116,32,111,117,116,112,
+117,116,32,117,110,115,117,112,112,111,114,116,101,100,32,119,
+47,45,110,111,102,108,111,97,116,105,111,32,111,114,32,45,
+102,110,111,110,101,41,0,94,32,9,10,13,11,12,93,0,
+20,0,0,0,0,0,0,0,0,255,0,0,128,0,0,4,
+0,1,0,4,0,2,0,4,179,82,179,82,179,82,179,82,
+179,34,179,18,179,18,0,0,0,0,0,0,19,0,0,0,
+115,116,114,105,110,103,32,110,111,116,32,102,111,117,110,100,
+0,0,0,0,82,101,118,32,48,48,48,32,0,0,0,0,
+215,35,133,0,218,35,133,0,0,0,255,255,2,181,0,0,
+0,0,255,255,218,180,0,0,0,0,255,255,62,181,0,0,
+0,0,255,255,210,181,0,0,0,0,255,255,146,181,0,0,
+0,0,255,255,68,182,0,0,0,0,255,255,138,225,0,0,
+0,0,255,255,190,207,0,0,0,0,255,255,82,207,0,0,
+0,0,255,255,154,207,0,0,0,0,255,255,118,207,0,0,
+0,0,255,255,154,207,0,0,0,0,255,255,158,208,0,0,
+0,0,255,255,6,208,0,0,0,0,255,255,226,207,0,0,
+0,0,255,255,246,208,0,0,0,0,255,255,42,208,0,0,
+0,0,255,255,126,213,0,0,0,0,255,255,42,218,0,0,
+0,0,255,255,254,225,0,0,0,0,255,255,192,214,0,0,
+0,0,255,255,224,217,0,0,0,0,255,255,218,231,0,0,
+0,0,255,255,64,243,0,0,0,0,255,255,130,214,0,0,
+0,0,255,255,42,216,0,0,0,0,255,255,14,224,0,0,
+0,0,255,255,222,224,0,0,0,0,255,255,36,225,0,0,
+0,0,255,255,40,243,0,0,0,0,255,255,232,242,0,0,
+0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,
+1,2,0,0,1,0,0,0,0,0,0,0,126,74,13,125,
+127,127,0,0,126,73,0,125,127,127,0,0,126,72,1,125,
+127,127,0,0,126,75,13,125,15,125,127,127,0,0,0,0,
+0,0,0,0,0,0,0,0,0,242,5,42,1,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+220,252,132,0,128,254,132,0,224,254,132,0,236,37,133,0,
+48,255,132,0,20,253,132,0,36,253,132,0,52,253,132,0,
+76,253,132,0,92,253,132,0,156,253,132,0,180,253,132,0,
+204,130,133,0,1,0,0,0,1,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,2,0,0,78,77,73,0,
+148,38,133,0,152,38,133,0,156,38,133,0,1,0,0,0,
+0,0,0,0,224,47,133,0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,0,240,240,240,240,16,0,0,0,
+16,0,0,0,0,1,0,0,0,2,0,0,7,0,0,0,
+44,16,130,0,90,72,130,0,0,0,0,0,202,97,130,0,
+10,0,0,0,36,86,69,82,86,69,82,36,37,100,37,115,
+10,0,0,0,75,66,0,77,66,0,0,0,82,67,68,61,
+37,117,10,0,117,110,107,110,111,119,110,0,117,110,107,110,
+111,119,110,0,37,48,51,100,32,0,0,0,112,111,114,116,
+61,37,100,0,10,0,10,0,36,86,69,82,86,69,82,36,
+32,77,73,82,82,79,82,0,32,68,69,65,68,0,0,0,
+32,40,37,120,41,0,0,0,32,82,65,73,68,48,0,0,
+32,82,65,73,68,53,0,0,37,115,0,43,62,0,32,32,
+0,0,0,0,73,110,105,116,105,97,108,0,73,100,108,101,
+0,0,0,0,84,87,77,72,0,0,0,0,112,111,114,116,
+115,0,0,0,112,111,114,116,0,0,0,0,37,99,37,105,
+0,0,0,0,37,115,37,115,37,99,0,0,8,0,0,0,
+8,0,0,0,99,104,101,99,107,102,119,0,99,109,100,104,
+105,115,116,0,109,101,109,114,101,97,100,0,109,111,110,0,
+118,97,114,0,118,101,114,0,35,0,104,0,112,97,114,97,
+109,0,0,0,117,110,105,116,115,0,0,0,47,47,0,0,
+99,109,100,108,111,103,0,0,100,101,108,101,116,101,0,0,
+99,114,101,97,116,101,0,0,100,114,105,118,101,115,0,0,
 103,111,0,0,115,105,109,101,114,114,0,0,115,116,97,116,
 117,115,0,0,117,110,108,111,99,107,0,0,37,105,0,37,
-105,0,0,0,108,111,99,97,108,0,0,0,21,0,0,0,
+105,0,0,0,108,111,99,97,108,0,0,0,22,0,0,0,
 4,0,0,0,67,111,100,101,115,58,10,0,85,68,77,65,
 45,51,51,0,85,68,77,65,45,54,54,0,69,78,65,66,
 76,69,68,0,10,0,0,0,32,37,115,44,32,0,0,0,
@@ -16658,7 +16783,7 @@ unsigned char tw_fw_code[] __initdata = 
 61,37,100,0,121,101,115,0,110,111,0,0,68,111,110,101,
 46,10,10,0,32,37,105,60,45,37,105,0,10,0,0,0,
 117,112,10,0,100,111,119,110,10,0,0,0,49,46,48,48,
-0,0,0,0,10,0,0,0,2,0,0,0,180,139,145,0,
+0,0,0,0,10,0,0,0,2,0,0,0,20,151,145,0,
 117,110,107,110,111,119,110,0,117,110,107,110,111,119,110,0,
 1,0,0,0,5,0,0,0,24,0,0,0,23,0,0,0,
 0,0,0,0,20,0,0,0,3,0,7,0,69,65,82,76,
@@ -16680,12 +16805,9 @@ unsigned char tw_fw_code[] __initdata = 
 0,0,0,0,0,0,36,0,129,0,40,0,1,2,4,2,
 136,0,4,18,68,0,130,0,130,2,72,0,2,2,2,18,
 8,2,8,18,8,0,0,2,68,18,4,19,72,18,0,0,
-99,255,233,255,63,6,250,172,129,0,127,0,0,0,0,0,
-99,255,233,255,63,6,220,200,129,0,127,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,99,255,233,255,
+63,6,156,181,129,0,127,0,0,0,0,0,99,255,233,255,
+63,6,128,209,129,0,127,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,
@@ -16694,16 +16816,17 @@ unsigned char tw_fw_code[] __initdata = 
 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,
-99,255,233,255,63,6,250,172,129,0,127,0,0,0,0,0,
-99,255,233,255,63,6,250,172,129,0,127,0,0,0,0,0,
-99,255,233,255,63,6,32,211,1,0,127,0,0,0,0,0,
-99,255,233,255,63,6,54,211,1,0,127,0,0,0,0,0,
-99,255,233,255,63,6,76,211,1,0,127,0,0,0,0,0,
-99,255,233,255,63,6,76,211,1,0,127,0,0,0,0,0,
-99,255,233,255,63,6,76,211,1,0,127,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,99,255,233,255,
+63,6,156,181,129,0,127,0,0,0,0,0,99,255,233,255,
+63,6,156,181,129,0,127,0,0,0,0,0,99,255,233,255,
+63,6,112,213,1,0,127,0,0,0,0,0,99,255,233,255,
+63,6,134,213,1,0,127,0,0,0,0,0,99,255,233,255,
+63,6,156,213,1,0,127,0,0,0,0,0,99,255,233,255,
+63,6,156,213,1,0,127,0,0,0,0,0,99,255,233,255,
+63,6,156,213,1,0,127,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,
@@ -16737,11 +16860,12 @@ unsigned char tw_fw_code[] __initdata = 
 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,
-99,255,233,255,63,6,250,172,129,0,127,0,0,0,0,0,
-99,255,233,255,63,6,160,214,1,0,127,0,0,0,0,0,
-99,255,233,255,63,6,142,211,1,0,127,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,99,255,233,255,
+63,6,156,181,129,0,127,0,0,0,0,0,99,255,233,255,
+63,6,240,216,1,0,127,0,0,0,0,0,99,255,233,255,
+63,6,222,213,1,0,127,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,
@@ -16752,9 +16876,10 @@ unsigned char tw_fw_code[] __initdata = 
 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,
-99,255,233,255,63,6,250,172,129,0,127,0,0,0,0,0,
-99,255,233,255,63,6,98,211,1,0,127,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,99,255,233,255,
+63,6,156,181,129,0,127,0,0,0,0,0,99,255,233,255,
+63,6,178,213,1,0,127,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,
@@ -16766,8 +16891,9 @@ unsigned char tw_fw_code[] __initdata = 
 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,
-99,255,233,255,63,6,250,172,129,0,127,0,0,0,0,0,
-99,255,233,255,63,6,120,211,1,0,127,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,99,255,233,255,
+63,6,156,181,129,0,127,0,0,0,0,0,99,255,233,255,
+63,6,200,213,1,0,127,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,
@@ -16777,2131 +16903,2141 @@ unsigned char tw_fw_code[] __initdata = 
 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,
-99,255,233,255,63,6,250,172,129,0,127,0,0,0,128,7,
-97,0,0,234,29,48,128,255,16,0,65,234,29,6,240,255,
-166,253,64,6,127,0,6,6,240,255,185,5,128,7,90,2,
-6,120,198,122,36,134,104,134,16,22,20,0,194,121,8,98,
-111,103,0,0,6,128,36,102,104,134,6,120,198,122,198,130,
-194,129,6,88,198,90,194,89,12,22,12,0,75,7,2,0,
-194,121,6,88,198,90,32,110,231,255,80,111,3,0,194,89,
-8,130,107,135,0,0,32,102,224,255,79,103,2,0,6,88,
-36,126,104,134,198,90,194,89,15,22,16,0,6,112,198,114,
-32,134,64,0,75,135,3,0,194,113,8,90,110,95,0,0,
-6,80,6,112,198,114,198,82,194,81,74,103,2,0,194,113,
-78,135,3,0,6,104,6,128,6,80,198,82,36,126,104,134,
-207,81,9,114,106,119,0,0,198,106,36,86,104,134,202,105,
-77,103,2,0,198,130,36,110,104,134,205,129,32,102,200,255,
-80,103,3,0,36,94,104,134,11,22,4,0,6,80,198,82,
-194,81,106,119,0,0,32,94,224,255,6,112,198,114,194,113,
-78,95,2,0,6,80,36,118,104,134,198,82,194,81,14,22,
-8,0,6,104,198,106,74,103,3,0,194,105,9,82,109,87,
-0,0,6,136,198,138,194,137,81,95,2,0,6,104,36,142,
-104,134,198,106,194,105,17,22,24,0,6,128,198,130,36,118,
-104,134,6,120,77,103,3,0,194,129,11,106,112,111,0,0,
-6,96,198,98,194,97,76,95,2,0,198,122,36,102,104,134,
-6,128,198,130,194,129,12,22,28,0,194,121,6,88,36,86,
-104,134,10,86,32,0,6,136,198,138,198,90,32,110,202,255,
-80,111,3,0,194,89,11,130,107,135,0,0,32,102,224,255,
-79,103,2,0,6,88,198,90,194,89,75,111,3,0,14,118,
-32,0,6,104,198,106,206,105,109,135,0,0,6,120,36,134,
-104,134,16,134,32,0,198,122,208,121,79,103,2,0,6,88,
-36,102,104,134,12,102,36,0,198,90,204,89,32,118,202,255,
-202,137,81,119,3,0,11,130,107,135,0,0,6,120,36,134,
-104,134,16,134,36,0,198,122,208,121,32,86,224,255,36,118,
-104,134,14,118,36,0,6,104,198,106,206,105,77,87,2,0,
-32,102,202,255,79,103,3,0,6,88,36,102,104,134,12,102,
-40,0,198,90,204,89,36,86,104,134,10,86,40,0,6,136,
-198,138,202,137,11,114,113,119,0,0,32,134,224,255,75,135,
-2,0,6,120,36,134,104,134,16,134,44,0,36,118,104,134,
-14,118,40,0,6,104,198,106,206,105,32,86,202,255,77,87,
-3,0,6,136,36,86,104,134,10,86,44,0,198,138,202,137,
-11,98,198,122,208,121,111,103,0,0,32,118,224,255,81,119,
-2,0,36,102,104,134,12,102,44,0,198,50,204,49,32,134,
-202,255,70,135,3,0,127,0,6,6,240,255,185,5,128,7,
-108,2,6,120,198,122,36,134,104,134,16,22,20,0,194,121,
-8,98,111,103,0,0,6,128,36,102,104,134,6,120,198,122,
-198,130,194,129,6,88,198,90,194,89,12,22,12,0,75,7,
-2,0,194,121,6,88,198,90,32,110,231,255,80,111,3,0,
-194,89,32,134,8,1,107,135,0,0,32,102,64,0,79,103,
-2,0,6,88,36,126,104,134,198,90,194,89,15,22,16,0,
-6,112,198,114,32,134,66,0,75,135,3,0,194,113,32,94,
-8,1,110,95,0,0,6,80,6,112,198,114,198,82,194,81,
-74,103,2,0,194,113,78,135,3,0,6,104,6,128,6,80,
-198,82,36,126,104,134,207,81,32,118,9,1,106,119,0,0,
-198,106,36,86,104,134,202,105,77,103,2,0,198,130,36,110,
-104,134,205,129,32,102,37,0,80,103,3,0,36,94,104,134,
-11,22,4,0,6,80,198,82,194,81,106,119,0,0,32,94,
-64,0,6,112,198,114,194,113,78,95,2,0,6,80,36,118,
-104,134,198,82,194,81,14,22,8,0,6,104,198,106,74,103,
-3,0,194,105,32,86,9,1,109,87,0,0,6,136,198,138,
-194,137,81,95,2,0,6,104,36,142,104,134,198,106,194,105,
-17,22,24,0,6,128,198,130,36,118,104,134,6,120,77,103,
-3,0,194,129,32,110,11,1,112,111,0,0,6,96,198,98,
-194,97,76,95,2,0,198,122,36,102,104,134,6,128,198,130,
-194,129,12,22,28,0,194,121,6,88,36,86,104,134,10,86,
-32,0,6,136,198,138,198,90,32,110,53,0,80,111,3,0,
-194,89,32,134,11,1,107,135,0,0,32,102,64,0,79,103,
-2,0,6,88,198,90,194,89,75,111,3,0,14,118,32,0,
-6,104,198,106,206,105,109,135,0,0,6,120,36,134,104,134,
-16,134,32,0,198,122,208,121,79,103,2,0,6,88,36,102,
-104,134,12,102,36,0,198,90,204,89,32,118,53,0,202,137,
-81,119,3,0,32,134,11,1,107,135,0,0,6,120,36,134,
-104,134,16,134,36,0,198,122,208,121,32,86,64,0,36,118,
-104,134,14,118,36,0,6,104,198,106,206,105,77,87,2,0,
-32,102,53,0,79,103,3,0,6,88,36,102,104,134,12,102,
-40,0,198,90,204,89,36,86,104,134,10,86,40,0,6,136,
-198,138,202,137,32,118,11,1,113,119,0,0,32,134,64,0,
-75,135,2,0,6,120,36,134,104,134,16,134,44,0,36,118,
-104,134,14,118,40,0,6,104,198,106,206,105,32,86,53,0,
-77,87,3,0,6,136,36,86,104,134,10,86,44,0,198,138,
-202,137,32,102,11,1,198,122,208,121,111,103,0,0,32,118,
-64,0,81,119,2,0,36,102,104,134,12,102,44,0,198,50,
-204,49,32,134,53,0,70,135,3,0,127,0,128,7,33,0,
-128,255,14,0,10,48,129,255,70,86,64,6,63,0,128,7,
-225,112,6,200,7,208,8,224,60,223,1,0,128,255,252,15,
-10,232,125,7,32,0,125,207,26,0,125,239,9,0,1,130,
-125,135,24,0,125,7,13,0,125,7,17,0,125,7,21,0,
-3,138,60,127,22,0,125,223,1,0,207,126,3,0,125,127,
-32,0,93,143,34,0,29,216,220,231,22,0,210,5,36,103,
-105,138,125,103,21,0,108,210,242,13,26,48,28,56,27,64,
-128,255,92,2,28,48,27,56,128,255,194,2,26,48,27,56,
-128,255,36,0,213,13,28,48,27,56,128,255,176,2,61,23,
-9,0,34,95,26,0,139,94,0,128,98,95,26,0,27,80,
-64,6,255,112,142,7,97,0,7,232,98,50,227,5,104,50,
-211,13,107,50,163,21,149,45,61,23,9,0,34,135,26,0,
-144,134,0,128,98,135,26,0,197,53,61,23,5,0,34,118,
-18,0,206,47,0,0,213,45,99,7,9,0,99,7,13,0,
-99,7,18,0,61,111,1,0,99,7,22,0,99,111,1,0,
-29,64,5,50,3,56,128,255,214,1,61,23,9,0,34,102,
-18,0,204,47,0,0,213,21,108,50,170,13,61,23,9,0,
-34,95,26,0,139,94,0,128,98,95,26,0,165,13,6,64,
-38,6,156,125,132,0,32,62,158,2,128,255,112,14,224,81,
-78,6,127,0,140,7,225,243,67,55,3,0,9,176,54,191,
-18,0,7,200,54,223,16,0,201,186,201,218,54,199,5,0,
-181,5,57,207,13,0,185,23,5,0,162,65,188,253,8,232,
-128,233,201,234,8,224,194,225,57,23,1,0,201,226,194,225,
-99,7,5,0,54,215,1,0,128,255,160,14,106,7,32,0,
-3,106,74,111,34,0,12,98,106,103,26,0,106,87,9,0,
-1,90,106,95,24,0,106,7,13,0,106,7,17,0,106,215,
-1,0,106,7,21,0,10,208,253,185,174,5,23,232,189,185,
-99,7,9,0,54,151,1,0,99,151,21,0,58,151,9,0,
-99,151,17,0,128,255,84,14,10,16,2,82,35,151,21,0,
-66,87,34,0,98,151,1,0,35,143,17,0,27,120,113,23,
-5,0,191,122,122,23,9,0,56,103,1,0,27,112,204,113,
-225,135,0,0,56,111,5,0,208,121,205,121,98,119,9,0,
-98,127,13,0,32,102,0,176,54,119,25,0,3,87,3,0,
-193,114,204,113,46,95,0,0,224,81,98,95,26,0,154,13,
-98,231,17,0,56,127,9,0,219,121,98,127,21,0,133,13,
-56,103,9,0,98,231,21,0,219,97,98,103,17,0,56,87,
-17,0,187,81,253,81,199,5,221,217,29,80,197,5,24,198,
-20,0,0,218,10,120,169,122,35,151,9,0,98,127,24,0,
-65,146,99,151,9,0,202,225,170,233,224,233,207,165,35,151,
-5,0,224,145,202,5,99,215,5,0,213,5,35,143,13,0,
-113,215,13,0,58,23,9,0,34,111,26,0,141,110,0,128,
-98,111,26,0,35,143,9,0,58,95,24,0,122,7,13,0,
-209,89,122,95,24,0,57,207,13,0,99,215,13,0,224,201,
-226,5,57,231,1,0,185,239,5,0,201,234,224,185,183,5,
-191,7,180,254,35,87,5,0,76,6,255,243,128,7,225,112,
-6,232,7,216,59,207,1,0,8,224,60,215,9,0,128,255,
-58,13,1,130,74,135,34,0,122,87,5,0,60,127,24,0,
-65,122,124,127,24,0,124,87,9,0,106,207,1,0,106,7,
-5,0,59,103,9,0,106,103,13,0,59,119,18,0,106,119,
-10,0,106,7,8,0,60,23,26,0,36,126,104,134,196,18,
-194,233,194,234,207,233,61,119,2,0,106,119,16,0,61,111,
-0,0,106,111,18,0,64,6,255,112,130,7,225,243,7,200,
-6,224,60,239,5,0,60,223,18,0,60,23,25,0,201,218,
-224,17,162,93,193,18,32,102,0,176,204,17,60,215,16,0,
-34,183,0,0,201,210,0,194,57,191,9,0,60,151,1,0,
-99,151,1,0,128,255,164,12,10,16,119,23,5,0,2,82,
-35,151,1,0,66,87,34,0,98,151,1,0,65,194,61,103,
-1,0,26,112,204,113,61,111,5,0,225,135,0,0,205,129,
-98,135,13,0,98,119,9,0,61,135,9,0,218,129,98,135,
-17,0,61,119,13,0,218,113,98,119,21,0,98,183,26,0,
-61,87,17,0,2,184,186,81,251,81,163,5,27,80,10,88,
-137,90,98,95,24,0,170,217,210,5,29,238,20,0,0,210,
-229,197,220,215,22,0,146,13,60,87,20,0,60,135,1,0,
-98,87,28,0,208,7,2,0,57,119,24,0,121,191,9,0,
-216,113,121,119,24,0,66,6,255,243,128,7,225,16,6,232,
-7,224,8,216,128,255,4,12,106,7,32,0,3,138,74,143,
-34,0,106,231,1,0,106,87,9,0,1,130,106,135,24,0,
-106,7,13,0,106,7,17,0,106,239,26,0,106,7,21,0,
-10,232,29,48,27,56,128,255,226,7,29,48,129,255,0,82,
-64,6,255,16,128,7,225,16,6,232,7,224,8,216,128,255,
-186,11,106,7,32,0,3,138,74,143,34,0,106,231,1,0,
-106,87,9,0,1,130,106,135,24,0,106,7,13,0,106,7,
-17,0,106,239,26,0,106,7,21,0,10,232,29,48,27,56,
-128,255,152,7,29,48,129,255,16,83,64,6,255,16,128,7,
-225,16,6,232,7,224,8,216,128,255,112,11,106,7,32,0,
-3,138,74,143,34,0,106,231,1,0,106,87,9,0,1,130,
-106,135,24,0,106,7,13,0,106,7,17,0,106,239,26,0,
-106,7,21,0,10,232,29,48,27,56,128,255,12,8,29,48,
-129,255,198,82,64,6,255,16,128,7,225,0,6,232,7,224,
-128,255,40,11,106,7,32,0,3,138,74,143,34,0,106,231,
-1,0,106,87,9,0,1,130,106,135,24,0,106,7,13,0,
-106,7,17,0,106,239,26,0,106,7,21,0,10,232,29,48,
-128,255,218,5,42,126,18,0,207,47,0,0,29,48,129,255,
-30,81,64,6,255,0,128,7,225,0,6,232,7,224,128,255,
-218,10,106,7,32,0,3,138,74,143,34,0,106,231,1,0,
-106,87,9,0,1,130,106,135,24,0,106,7,13,0,106,7,
-17,0,106,239,26,0,106,7,21,0,10,232,29,48,128,255,
-140,5,42,126,18,0,207,47,0,0,29,48,129,255,42,82,
-64,6,255,0,134,7,33,0,32,142,218,0,99,143,0,0,
-99,7,2,0,99,7,5,0,32,134,79,0,67,135,5,0,
-32,126,194,0,67,127,6,0,32,118,160,0,67,119,8,0,
-32,110,176,0,67,111,9,0,8,98,99,103,10,0,3,64,
-1,74,128,255,112,4,70,6,63,0,134,7,33,0,32,142,
-216,0,99,143,0,0,99,7,2,0,99,7,5,0,32,134,
-79,0,67,135,5,0,32,126,194,0,67,127,6,0,32,118,
-160,0,67,119,8,0,32,110,176,0,67,111,9,0,8,98,
-99,103,10,0,3,64,0,74,128,255,42,4,70,6,63,0,
-134,7,33,0,99,7,0,0,99,7,2,0,99,7,5,0,
-67,7,8,0,32,142,229,0,67,143,9,0,8,130,99,135,
-10,0,3,64,1,74,128,255,252,3,70,6,63,0,134,7,
-33,0,99,7,0,0,99,7,2,0,99,71,5,0,32,142,
-64,0,67,143,8,0,32,134,112,0,67,135,9,0,8,122,
-99,127,10,0,3,64,0,74,128,255,202,3,70,6,63,0,
-142,7,225,16,6,216,99,7,9,0,99,7,13,0,99,7,
-18,0,7,224,99,231,1,0,128,255,144,9,3,130,10,232,
-93,135,34,0,125,231,1,0,125,223,26,0,125,239,9,0,
-1,122,125,127,24,0,125,7,13,0,125,7,17,0,125,7,
-32,0,125,7,21,0,221,15,32,0,29,64,5,50,3,56,
-191,255,12,252,61,23,9,0,29,48,34,118,18,0,206,47,
-0,0,129,255,122,79,78,6,255,16,134,7,33,0,99,7,
-0,0,99,7,2,0,99,7,5,0,32,142,64,0,67,143,
-8,0,32,134,224,0,67,135,9,0,8,122,99,127,10,0,
-3,64,0,74,128,255,46,3,70,6,63,0,128,7,225,48,
-6,208,9,224,35,239,21,0,168,0,8,16,111,18,203,109,
-66,0,16,0,28,0,82,0,42,0,94,0,21,0,88,0,
-35,0,49,0,62,0,106,0,75,0,100,0,55,0,106,0,
-68,0,125,7,25,0,124,7,10,0,133,101,9,130,125,135,
-25,0,5,122,124,127,10,0,149,93,9,114,125,119,25,0,
-1,106,124,111,10,0,165,85,8,98,125,103,25,0,7,90,
-124,95,10,0,181,77,8,82,125,87,25,0,3,138,124,143,
-10,0,197,69,125,7,25,0,8,130,124,135,10,0,229,61,
-9,122,125,127,25,0,13,114,124,119,10,0,245,53,9,106,
-125,111,25,0,124,111,10,0,149,53,8,90,125,95,25,0,
-15,82,124,87,10,0,165,45,8,138,125,143,25,0,11,130,
-124,135,10,0,181,37,125,7,25,0,2,122,124,127,10,0,
-213,29,125,7,25,0,6,114,124,119,10,0,245,21,125,7,
-25,0,4,106,124,111,10,0,149,21,125,7,25,0,12,98,
-124,103,10,0,181,13,61,55,1,0,32,86,13,1,102,87,
-12,0,31,58,129,255,184,43,229,53,97,58,218,5,60,142,
-10,0,209,7,1,0,61,223,1,0,128,255,254,7,106,7,
-32,0,3,130,74,135,34,0,106,215,26,0,106,87,9,0,
-1,122,106,127,24,0,106,7,13,0,106,7,17,0,106,223,
-1,0,106,7,21,0,10,216,27,48,28,56,128,255,6,3,
-61,119,25,0,224,113,210,5,29,48,27,56,191,255,222,250,
-27,48,128,255,152,2,42,110,18,0,205,47,0,0,27,48,
-129,255,220,77,64,6,255,48,134,7,33,0,32,142,255,0,
-99,143,0,0,136,0,40,16,67,23,4,0,67,23,5,0,
-67,7,7,0,67,7,9,0,99,71,2,0,67,7,8,0,
-67,71,6,0,12,122,99,127,10,0,3,64,0,74,128,255,
-132,1,70,6,63,0,128,7,225,16,6,232,7,224,8,216,
-128,255,88,7,106,7,32,0,3,138,74,143,34,0,106,231,
+0,0,0,0,0,0,0,0,0,0,0,0,99,255,233,255,
+63,6,156,181,129,0,127,0,0,0,128,7,97,0,0,234,
+29,48,128,255,16,0,65,234,29,6,240,255,166,253,64,6,
+127,0,6,6,240,255,185,5,128,7,90,2,6,120,198,122,
+36,134,116,134,16,22,20,0,194,121,8,98,111,103,0,0,
+6,128,36,102,116,134,6,120,198,122,198,130,194,129,6,88,
+198,90,194,89,12,22,12,0,75,7,2,0,194,121,6,88,
+198,90,32,110,231,255,80,111,3,0,194,89,8,130,107,135,
+0,0,32,102,224,255,79,103,2,0,6,88,36,126,116,134,
+198,90,194,89,15,22,16,0,6,112,198,114,32,134,64,0,
+75,135,3,0,194,113,8,90,110,95,0,0,6,80,6,112,
+198,114,198,82,194,81,74,103,2,0,194,113,78,135,3,0,
+6,104,6,128,6,80,198,82,36,126,116,134,207,81,9,114,
+106,119,0,0,198,106,36,86,116,134,202,105,77,103,2,0,
+198,130,36,110,116,134,205,129,32,102,200,255,80,103,3,0,
+36,94,116,134,11,22,4,0,6,80,198,82,194,81,106,119,
+0,0,32,94,224,255,6,112,198,114,194,113,78,95,2,0,
+6,80,36,118,116,134,198,82,194,81,14,22,8,0,6,104,
+198,106,74,103,3,0,194,105,9,82,109,87,0,0,6,136,
+198,138,194,137,81,95,2,0,6,104,36,142,116,134,198,106,
+194,105,17,22,24,0,6,128,198,130,36,118,116,134,6,120,
+77,103,3,0,194,129,11,106,112,111,0,0,6,96,198,98,
+194,97,76,95,2,0,198,122,36,102,116,134,6,128,198,130,
+194,129,12,22,28,0,194,121,6,88,36,86,116,134,10,86,
+32,0,6,136,198,138,198,90,32,110,202,255,80,111,3,0,
+194,89,11,130,107,135,0,0,32,102,224,255,79,103,2,0,
+6,88,198,90,194,89,75,111,3,0,14,118,32,0,6,104,
+198,106,206,105,109,135,0,0,6,120,36,134,116,134,16,134,
+32,0,198,122,208,121,79,103,2,0,6,88,36,102,116,134,
+12,102,36,0,198,90,204,89,32,118,202,255,202,137,81,119,
+3,0,11,130,107,135,0,0,6,120,36,134,116,134,16,134,
+36,0,198,122,208,121,32,86,224,255,36,118,116,134,14,118,
+36,0,6,104,198,106,206,105,77,87,2,0,32,102,202,255,
+79,103,3,0,6,88,36,102,116,134,12,102,40,0,198,90,
+204,89,36,86,116,134,10,86,40,0,6,136,198,138,202,137,
+11,114,113,119,0,0,32,134,224,255,75,135,2,0,6,120,
+36,134,116,134,16,134,44,0,36,118,116,134,14,118,40,0,
+6,104,198,106,206,105,32,86,202,255,77,87,3,0,6,136,
+36,86,116,134,10,86,44,0,198,138,202,137,11,98,198,122,
+208,121,111,103,0,0,32,118,224,255,81,119,2,0,36,102,
+116,134,12,102,44,0,198,50,204,49,32,134,202,255,70,135,
+3,0,127,0,6,6,240,255,185,5,128,7,108,2,6,120,
+198,122,36,134,116,134,16,22,20,0,194,121,8,98,111,103,
+0,0,6,128,36,102,116,134,6,120,198,122,198,130,194,129,
+6,88,198,90,194,89,12,22,12,0,75,7,2,0,194,121,
+6,88,198,90,32,110,231,255,80,111,3,0,194,89,32,134,
+8,1,107,135,0,0,32,102,64,0,79,103,2,0,6,88,
+36,126,116,134,198,90,194,89,15,22,16,0,6,112,198,114,
+32,134,66,0,75,135,3,0,194,113,32,94,8,1,110,95,
+0,0,6,80,6,112,198,114,198,82,194,81,74,103,2,0,
+194,113,78,135,3,0,6,104,6,128,6,80,198,82,36,126,
+116,134,207,81,32,118,9,1,106,119,0,0,198,106,36,86,
+116,134,202,105,77,103,2,0,198,130,36,110,116,134,205,129,
+32,102,37,0,80,103,3,0,36,94,116,134,11,22,4,0,
+6,80,198,82,194,81,106,119,0,0,32,94,64,0,6,112,
+198,114,194,113,78,95,2,0,6,80,36,118,116,134,198,82,
+194,81,14,22,8,0,6,104,198,106,74,103,3,0,194,105,
+32,86,9,1,109,87,0,0,6,136,198,138,194,137,81,95,
+2,0,6,104,36,142,116,134,198,106,194,105,17,22,24,0,
+6,128,198,130,36,118,116,134,6,120,77,103,3,0,194,129,
+32,110,11,1,112,111,0,0,6,96,198,98,194,97,76,95,
+2,0,198,122,36,102,116,134,6,128,198,130,194,129,12,22,
+28,0,194,121,6,88,36,86,116,134,10,86,32,0,6,136,
+198,138,198,90,32,110,53,0,80,111,3,0,194,89,32,134,
+11,1,107,135,0,0,32,102,64,0,79,103,2,0,6,88,
+198,90,194,89,75,111,3,0,14,118,32,0,6,104,198,106,
+206,105,109,135,0,0,6,120,36,134,116,134,16,134,32,0,
+198,122,208,121,79,103,2,0,6,88,36,102,116,134,12,102,
+36,0,198,90,204,89,32,118,53,0,202,137,81,119,3,0,
+32,134,11,1,107,135,0,0,6,120,36,134,116,134,16,134,
+36,0,198,122,208,121,32,86,64,0,36,118,116,134,14,118,
+36,0,6,104,198,106,206,105,77,87,2,0,32,102,53,0,
+79,103,3,0,6,88,36,102,116,134,12,102,40,0,198,90,
+204,89,36,86,116,134,10,86,40,0,6,136,198,138,202,137,
+32,118,11,1,113,119,0,0,32,134,64,0,75,135,2,0,
+6,120,36,134,116,134,16,134,44,0,36,118,116,134,14,118,
+40,0,6,104,198,106,206,105,32,86,53,0,77,87,3,0,
+6,136,36,86,116,134,10,86,44,0,198,138,202,137,32,102,
+11,1,198,122,208,121,111,103,0,0,32,118,64,0,81,119,
+2,0,36,102,116,134,12,102,44,0,198,50,204,49,32,134,
+53,0,70,135,3,0,127,0,128,7,33,0,128,255,14,0,
+10,48,129,255,242,87,64,6,63,0,128,7,225,112,6,200,
+7,208,8,224,60,223,1,0,128,255,252,15,10,232,125,7,
+32,0,125,207,26,0,125,239,9,0,1,130,125,135,24,0,
+125,7,13,0,125,7,17,0,125,7,21,0,3,138,60,127,
+22,0,125,223,1,0,207,126,3,0,125,127,32,0,93,143,
+34,0,29,216,220,231,22,0,210,5,36,103,117,138,125,103,
+21,0,108,210,242,13,26,48,28,56,27,64,128,255,92,2,
+28,48,27,56,128,255,194,2,26,48,27,56,128,255,36,0,
+213,13,28,48,27,56,128,255,176,2,61,23,9,0,34,95,
+26,0,139,94,0,128,98,95,26,0,27,80,64,6,255,112,
+142,7,97,0,7,232,98,50,227,5,104,50,211,13,107,50,
+163,21,149,45,61,23,9,0,34,135,26,0,144,134,0,128,
+98,135,26,0,197,53,61,23,5,0,34,118,18,0,206,47,
+0,0,213,45,99,7,9,0,99,7,13,0,99,7,18,0,
+61,111,1,0,99,7,22,0,99,111,1,0,29,64,5,50,
+3,56,128,255,214,1,61,23,9,0,34,102,18,0,204,47,
+0,0,213,21,108,50,170,13,61,23,9,0,34,95,26,0,
+139,94,0,128,98,95,26,0,165,13,6,64,38,6,124,136,
+132,0,32,62,158,2,128,255,112,14,224,81,78,6,127,0,
+140,7,225,243,67,55,3,0,9,176,54,191,18,0,7,200,
+54,223,16,0,201,186,201,218,54,199,5,0,181,5,57,207,
+13,0,185,23,5,0,162,65,188,253,8,232,128,233,201,234,
+8,224,194,225,57,23,1,0,201,226,194,225,99,7,5,0,
+54,215,1,0,128,255,160,14,106,7,32,0,3,106,74,111,
+34,0,12,98,106,103,26,0,106,87,9,0,1,90,106,95,
+24,0,106,7,13,0,106,7,17,0,106,215,1,0,106,7,
+21,0,10,208,253,185,174,5,23,232,189,185,99,7,9,0,
+54,151,1,0,99,151,21,0,58,151,9,0,99,151,17,0,
+128,255,84,14,10,16,2,82,35,151,21,0,66,87,34,0,
+98,151,1,0,35,143,17,0,27,120,113,23,5,0,191,122,
+122,23,9,0,56,103,1,0,27,112,204,113,225,135,0,0,
+56,111,5,0,208,121,205,121,98,119,9,0,98,127,13,0,
+32,102,0,176,54,119,25,0,3,87,3,0,193,114,204,113,
+46,95,0,0,224,81,98,95,26,0,154,13,98,231,17,0,
+56,127,9,0,219,121,98,127,21,0,133,13,56,103,9,0,
+98,231,21,0,219,97,98,103,17,0,56,87,17,0,187,81,
+253,81,199,5,221,217,29,80,197,5,24,198,20,0,0,218,
+10,120,169,122,35,151,9,0,98,127,24,0,65,146,99,151,
+9,0,202,225,170,233,224,233,207,165,35,151,5,0,224,145,
+202,5,99,215,5,0,213,5,35,143,13,0,113,215,13,0,
+58,23,9,0,34,111,26,0,141,110,0,128,98,111,26,0,
+35,143,9,0,58,95,24,0,122,7,13,0,209,89,122,95,
+24,0,57,207,13,0,99,215,13,0,224,201,226,5,57,231,
+1,0,185,239,5,0,201,234,224,185,183,5,191,7,180,254,
+35,87,5,0,76,6,255,243,128,7,225,112,6,232,7,216,
+59,207,1,0,8,224,60,215,9,0,128,255,58,13,1,130,
+74,135,34,0,122,87,5,0,60,127,24,0,65,122,124,127,
+24,0,124,87,9,0,106,207,1,0,106,7,5,0,59,103,
+9,0,106,103,13,0,59,119,18,0,106,119,10,0,106,7,
+8,0,60,23,26,0,36,126,116,134,196,18,194,233,194,234,
+207,233,61,119,2,0,106,119,16,0,61,111,0,0,106,111,
+18,0,64,6,255,112,130,7,225,243,7,200,6,224,60,239,
+5,0,60,223,18,0,60,23,25,0,201,218,224,17,162,93,
+193,18,32,102,0,176,204,17,60,215,16,0,34,183,0,0,
+201,210,0,194,57,191,9,0,60,151,1,0,99,151,1,0,
+128,255,164,12,10,16,119,23,5,0,2,82,35,151,1,0,
+66,87,34,0,98,151,1,0,65,194,61,103,1,0,26,112,
+204,113,61,111,5,0,225,135,0,0,205,129,98,135,13,0,
+98,119,9,0,61,135,9,0,218,129,98,135,17,0,61,119,
+13,0,218,113,98,119,21,0,98,183,26,0,61,87,17,0,
+2,184,186,81,251,81,163,5,27,80,10,88,137,90,98,95,
+24,0,170,217,210,5,29,238,20,0,0,210,229,197,220,215,
+22,0,146,13,60,87,20,0,60,135,1,0,98,87,28,0,
+208,7,2,0,57,119,24,0,121,191,9,0,216,113,121,119,
+24,0,66,6,255,243,128,7,225,16,6,232,7,224,8,216,
+128,255,4,12,106,7,32,0,3,138,74,143,34,0,106,231,
 1,0,106,87,9,0,1,130,106,135,24,0,106,7,13,0,
 106,7,17,0,106,239,26,0,106,7,21,0,10,232,29,48,
-27,56,128,255,244,3,29,48,129,255,84,77,64,6,255,16,
-128,7,225,48,6,232,7,224,8,216,9,208,128,255,12,7,
+27,56,128,255,226,7,29,48,129,255,172,83,64,6,255,16,
+128,7,225,16,6,232,7,224,8,216,128,255,186,11,106,7,
+32,0,3,138,74,143,34,0,106,231,1,0,106,87,9,0,
+1,130,106,135,24,0,106,7,13,0,106,7,17,0,106,239,
+26,0,106,7,21,0,10,232,29,48,27,56,128,255,152,7,
+29,48,129,255,188,84,64,6,255,16,128,7,225,16,6,232,
+7,224,8,216,128,255,112,11,106,7,32,0,3,138,74,143,
+34,0,106,231,1,0,106,87,9,0,1,130,106,135,24,0,
+106,7,13,0,106,7,17,0,106,239,26,0,106,7,21,0,
+10,232,29,48,27,56,128,255,12,8,29,48,129,255,114,84,
+64,6,255,16,128,7,225,0,6,232,7,224,128,255,40,11,
 106,7,32,0,3,138,74,143,34,0,106,231,1,0,106,87,
 9,0,1,130,106,135,24,0,106,7,13,0,106,7,17,0,
-106,239,26,0,106,7,21,0,10,232,29,48,27,56,26,64,
-128,255,120,4,29,48,129,255,6,77,64,6,255,48,128,7,
-225,48,6,232,7,224,8,216,9,208,128,255,190,6,106,7,
+106,239,26,0,106,7,21,0,10,232,29,48,128,255,218,5,
+42,126,18,0,207,47,0,0,29,48,129,255,202,82,64,6,
+255,0,128,7,225,0,6,232,7,224,128,255,218,10,106,7,
 32,0,3,138,74,143,34,0,106,231,1,0,106,87,9,0,
 1,130,106,135,24,0,106,7,13,0,106,7,17,0,106,239,
-26,0,106,7,21,0,10,232,29,48,27,56,26,64,128,255,
-42,4,29,48,129,255,18,78,64,6,255,48,128,7,225,16,
-6,232,7,224,8,216,128,255,114,6,106,7,32,0,3,138,
+26,0,106,7,21,0,10,232,29,48,128,255,140,5,42,126,
+18,0,207,47,0,0,29,48,129,255,214,83,64,6,255,0,
+134,7,33,0,32,142,218,0,99,143,0,0,99,7,2,0,
+99,7,5,0,32,134,79,0,67,135,5,0,32,126,194,0,
+67,127,6,0,32,118,160,0,67,119,8,0,32,110,176,0,
+67,111,9,0,8,98,99,103,10,0,3,64,1,74,128,255,
+112,4,70,6,63,0,134,7,33,0,32,142,216,0,99,143,
+0,0,99,7,2,0,99,7,5,0,32,134,79,0,67,135,
+5,0,32,126,194,0,67,127,6,0,32,118,160,0,67,119,
+8,0,32,110,176,0,67,111,9,0,8,98,99,103,10,0,
+3,64,0,74,128,255,42,4,70,6,63,0,134,7,33,0,
+99,7,0,0,99,7,2,0,99,7,5,0,67,7,8,0,
+32,142,229,0,67,143,9,0,8,130,99,135,10,0,3,64,
+1,74,128,255,252,3,70,6,63,0,134,7,33,0,99,7,
+0,0,99,7,2,0,99,71,5,0,32,142,64,0,67,143,
+8,0,32,134,112,0,67,135,9,0,8,122,99,127,10,0,
+3,64,0,74,128,255,202,3,70,6,63,0,142,7,225,16,
+6,216,99,7,9,0,99,7,13,0,99,7,18,0,7,224,
+99,231,1,0,128,255,144,9,3,130,10,232,93,135,34,0,
+125,231,1,0,125,223,26,0,125,239,9,0,1,122,125,127,
+24,0,125,7,13,0,125,7,17,0,125,7,32,0,125,7,
+21,0,221,15,32,0,29,64,5,50,3,56,191,255,12,252,
+61,23,9,0,29,48,34,118,18,0,206,47,0,0,129,255,
+38,81,78,6,255,16,134,7,33,0,99,7,0,0,99,7,
+2,0,99,7,5,0,32,142,64,0,67,143,8,0,32,134,
+224,0,67,135,9,0,8,122,99,127,10,0,3,64,0,74,
+128,255,46,3,70,6,63,0,128,7,225,48,6,208,9,224,
+35,239,21,0,168,0,8,16,111,18,203,109,66,0,16,0,
+28,0,82,0,42,0,94,0,21,0,88,0,35,0,49,0,
+62,0,106,0,75,0,100,0,55,0,106,0,68,0,125,7,
+25,0,124,7,10,0,133,101,9,130,125,135,25,0,5,122,
+124,127,10,0,149,93,9,114,125,119,25,0,1,106,124,111,
+10,0,165,85,8,98,125,103,25,0,7,90,124,95,10,0,
+181,77,8,82,125,87,25,0,3,138,124,143,10,0,197,69,
+125,7,25,0,8,130,124,135,10,0,229,61,9,122,125,127,
+25,0,13,114,124,119,10,0,245,53,9,106,125,111,25,0,
+124,111,10,0,149,53,8,90,125,95,25,0,15,82,124,87,
+10,0,165,45,8,138,125,143,25,0,11,130,124,135,10,0,
+181,37,125,7,25,0,2,122,124,127,10,0,213,29,125,7,
+25,0,6,114,124,119,10,0,245,21,125,7,25,0,4,106,
+124,111,10,0,149,21,125,7,25,0,12,98,124,103,10,0,
+181,13,61,55,1,0,32,86,13,1,102,87,12,0,31,58,
+129,255,140,45,229,53,97,58,218,5,60,142,10,0,209,7,
+1,0,61,223,1,0,128,255,254,7,106,7,32,0,3,130,
+74,135,34,0,106,215,26,0,106,87,9,0,1,122,106,127,
+24,0,106,7,13,0,106,7,17,0,106,223,1,0,106,7,
+21,0,10,216,27,48,28,56,128,255,6,3,61,119,25,0,
+224,113,210,5,29,48,27,56,191,255,222,250,27,48,128,255,
+152,2,42,110,18,0,205,47,0,0,27,48,129,255,136,79,
+64,6,255,48,134,7,33,0,32,142,255,0,99,143,0,0,
+136,0,40,16,67,23,4,0,67,23,5,0,67,7,7,0,
+67,7,9,0,99,71,2,0,67,7,8,0,67,71,6,0,
+12,122,99,127,10,0,3,64,0,74,128,255,132,1,70,6,
+63,0,128,7,225,16,6,232,7,224,8,216,128,255,88,7,
+106,7,32,0,3,138,74,143,34,0,106,231,1,0,106,87,
+9,0,1,130,106,135,24,0,106,7,13,0,106,7,17,0,
+106,239,26,0,106,7,21,0,10,232,29,48,27,56,128,255,
+244,3,29,48,129,255,0,79,64,6,255,16,128,7,225,48,
+6,232,7,224,8,216,9,208,128,255,12,7,106,7,32,0,
+3,138,74,143,34,0,106,231,1,0,106,87,9,0,1,130,
+106,135,24,0,106,7,13,0,106,7,17,0,106,239,26,0,
+106,7,21,0,10,232,29,48,27,56,26,64,128,255,120,4,
+29,48,129,255,178,78,64,6,255,48,128,7,225,48,6,232,
+7,224,8,216,9,208,128,255,190,6,106,7,32,0,3,138,
 74,143,34,0,106,231,1,0,106,87,9,0,1,130,106,135,
 24,0,106,7,13,0,106,7,17,0,106,239,26,0,106,7,
-21,0,10,232,29,48,27,56,0,66,128,255,210,4,29,48,
-129,255,108,76,64,6,255,16,128,7,225,16,6,232,7,224,
-8,216,128,255,38,6,106,7,32,0,3,138,74,143,34,0,
-106,231,1,0,106,87,9,0,1,66,106,71,24,0,106,7,
+21,0,10,232,29,48,27,56,26,64,128,255,42,4,29,48,
+129,255,190,79,64,6,255,48,128,7,225,16,6,232,7,224,
+8,216,128,255,114,6,106,7,32,0,3,138,74,143,34,0,
+106,231,1,0,106,87,9,0,1,130,106,135,24,0,106,7,
 13,0,106,7,17,0,106,239,26,0,106,7,21,0,10,232,
-29,48,27,56,128,255,136,4,29,48,129,255,34,76,64,6,
-255,16,128,7,225,48,6,232,7,216,8,208,9,224,188,0,
-128,255,216,5,106,7,32,0,3,138,74,143,34,0,106,223,
+29,48,27,56,0,66,128,255,210,4,29,48,129,255,24,78,
+64,6,255,16,128,7,225,16,6,232,7,224,8,216,128,255,
+38,6,106,7,32,0,3,138,74,143,34,0,106,231,1,0,
+106,87,9,0,1,66,106,71,24,0,106,7,13,0,106,7,
+17,0,106,239,26,0,106,7,21,0,10,232,29,48,27,56,
+128,255,136,4,29,48,129,255,206,77,64,6,255,16,128,7,
+225,48,6,232,7,216,8,208,9,224,188,0,128,255,216,5,
+106,7,32,0,3,138,74,143,34,0,106,223,1,0,106,87,
+9,0,1,130,106,135,24,0,106,7,13,0,106,7,17,0,
+106,239,26,0,106,7,21,0,10,232,29,48,26,56,128,255,
+224,0,10,16,97,226,218,5,29,48,128,255,124,0,10,16,
+34,118,18,0,206,47,0,0,29,48,129,255,106,77,64,6,
+255,48,128,7,225,48,6,232,7,216,8,208,9,224,188,0,
+128,255,116,5,106,7,32,0,3,138,74,143,34,0,106,223,
 1,0,106,87,9,0,1,130,106,135,24,0,106,7,13,0,
 106,7,17,0,106,239,26,0,106,7,21,0,10,232,29,48,
-26,56,128,255,224,0,10,16,97,226,218,5,29,48,128,255,
-124,0,10,16,34,118,18,0,206,47,0,0,29,48,129,255,
-190,75,64,6,255,48,128,7,225,48,6,232,7,216,8,208,
-9,224,188,0,128,255,116,5,106,7,32,0,3,138,74,143,
-34,0,106,223,1,0,106,87,9,0,1,130,106,135,24,0,
-106,7,13,0,106,7,17,0,106,239,26,0,106,7,21,0,
-10,232,29,48,26,56,128,255,124,0,10,16,97,226,218,5,
-29,48,128,255,24,0,10,16,34,118,18,0,206,47,0,0,
-29,48,129,255,180,76,64,6,255,48,128,7,225,16,6,232,
-61,223,1,0,61,231,9,0,128,255,16,5,1,138,124,87,
-5,0,74,143,34,0,61,135,24,0,65,130,125,135,24,0,
-125,87,9,0,2,122,106,7,13,0,106,7,8,0,74,7,
-15,0,106,127,18,0,106,7,10,0,74,7,16,0,74,7,
-17,0,106,223,1,0,221,15,32,0,221,7,32,0,64,6,
-255,16,128,7,225,48,7,224,6,232,61,215,1,0,61,223,
-9,0,128,255,182,4,10,16,1,138,123,23,5,0,66,143,
-34,0,61,135,24,0,65,130,125,135,24,0,125,23,9,0,
-252,127,1,0,98,127,8,0,252,119,3,0,98,119,10,0,
-60,111,5,0,98,111,13,0,188,103,9,0,66,103,17,0,
-156,95,9,0,66,95,16,0,252,87,11,0,98,87,18,0,
-98,215,1,0,221,15,32,0,2,80,221,7,32,0,64,6,
-255,48,134,7,33,0,3,138,99,143,0,0,8,134,64,0,
-99,135,2,0,99,7,5,0,67,7,8,0,32,126,239,0,
-67,127,9,0,8,114,99,119,10,0,3,64,0,74,191,255,
-168,254,70,6,63,0,134,7,33,0,99,7,5,0,67,7,
-8,0,136,0,99,71,0,0,32,142,239,0,67,143,9,0,
-8,130,99,135,10,0,137,0,99,79,2,0,3,64,0,74,
-191,255,118,254,70,6,63,0,152,7,225,16,7,224,6,232,
-61,223,1,0,128,255,228,3,1,130,74,135,34,0,106,223,
-1,0,61,127,24,0,10,216,65,122,125,127,24,0,125,223,
-9,0,125,87,5,0,32,110,236,255,106,135,10,0,106,7,
-13,0,106,7,8,0,74,7,15,0,74,111,17,0,13,98,
-106,103,18,0,74,7,16,0,32,94,0,2,99,7,33,0,
-99,7,29,0,99,231,37,0,99,231,41,0,61,87,1,0,
-99,95,45,0,99,87,1,0,35,134,28,0,99,135,5,0,
-99,7,9,0,99,7,13,0,1,122,99,127,18,0,12,114,
-99,119,25,0,99,7,16,0,99,7,20,0,99,7,22,0,
-29,56,3,48,191,255,118,246,61,23,9,0,34,111,26,0,
-141,110,0,128,98,111,26,0,27,80,221,15,32,0,221,7,
-32,0,88,6,255,16,152,7,225,48,7,216,6,224,60,215,
-1,0,128,255,38,3,10,232,1,130,93,135,34,0,124,239,
-5,0,60,127,24,0,124,239,9,0,65,122,124,127,24,0,
-32,118,208,0,13,122,125,127,18,0,125,119,8,0,93,7,
-12,0,32,102,79,0,93,103,13,0,32,94,194,255,93,95,
-14,0,32,86,160,255,125,135,10,0,93,87,16,0,32,134,
-176,255,93,135,17,0,125,215,1,0,99,223,37,0,99,223,
-41,0,99,7,33,0,99,7,29,0,32,118,0,2,60,111,
-1,0,99,119,45,0,99,111,1,0,35,102,28,0,99,103,
-5,0,99,7,9,0,99,7,13,0,1,90,99,95,18,0,
-12,82,99,87,25,0,99,7,16,0,99,7,20,0,99,7,
-22,0,28,56,3,48,191,255,164,245,60,23,9,0,34,135,
-26,0,144,134,0,128,98,135,26,0,29,80,220,15,32,0,
-220,7,32,0,88,6,255,48,152,7,225,240,6,224,7,200,
-25,48,39,6,156,123,132,0,8,216,32,70,0,2,129,255,
-200,43,60,215,1,0,128,255,66,2,10,232,1,130,93,135,
-34,0,29,192,60,127,24,0,65,122,124,127,24,0,124,239,
-5,0,124,199,9,0,125,215,1,0,125,7,8,0,125,7,
-13,0,125,135,10,0,93,7,15,0,93,7,16,0,27,208,
-154,0,27,6,15,255,130,13,27,6,14,255,130,21,27,6,
-10,255,210,13,197,5,220,7,33,0,149,13,27,64,38,6,
-172,125,132,0,32,62,37,9,128,255,98,1,15,106,125,111,
-18,0,93,215,17,0,32,102,0,2,99,7,33,0,99,7,
-29,0,99,207,41,0,99,207,37,0,60,95,1,0,99,103,
-45,0,99,95,1,0,35,86,28,0,99,87,5,0,99,7,
-9,0,99,7,13,0,1,130,99,135,18,0,11,122,99,127,
+26,56,128,255,124,0,10,16,97,226,218,5,29,48,128,255,
+24,0,10,16,34,118,18,0,206,47,0,0,29,48,129,255,
+96,78,64,6,255,48,128,7,225,16,6,232,61,223,1,0,
+61,231,9,0,128,255,16,5,1,138,124,87,5,0,74,143,
+34,0,61,135,24,0,65,130,125,135,24,0,125,87,9,0,
+2,122,106,7,13,0,106,7,8,0,74,7,15,0,106,127,
+18,0,106,7,10,0,74,7,16,0,74,7,17,0,106,223,
+1,0,221,15,32,0,221,7,32,0,64,6,255,16,128,7,
+225,48,7,224,6,232,61,215,1,0,61,223,9,0,128,255,
+182,4,10,16,1,138,123,23,5,0,66,143,34,0,61,135,
+24,0,65,130,125,135,24,0,125,23,9,0,252,127,1,0,
+98,127,8,0,252,119,3,0,98,119,10,0,60,111,5,0,
+98,111,13,0,188,103,9,0,66,103,17,0,156,95,9,0,
+66,95,16,0,252,87,11,0,98,87,18,0,98,215,1,0,
+221,15,32,0,2,80,221,7,32,0,64,6,255,48,134,7,
+33,0,3,138,99,143,0,0,8,134,64,0,99,135,2,0,
+99,7,5,0,67,7,8,0,32,126,239,0,67,127,9,0,
+8,114,99,119,10,0,3,64,0,74,191,255,168,254,70,6,
+63,0,134,7,33,0,99,7,5,0,67,7,8,0,136,0,
+99,71,0,0,32,142,239,0,67,143,9,0,8,130,99,135,
+10,0,137,0,99,79,2,0,3,64,0,74,191,255,118,254,
+70,6,63,0,152,7,225,16,7,224,6,232,61,223,1,0,
+128,255,228,3,1,130,74,135,34,0,106,223,1,0,61,127,
+24,0,10,216,65,122,125,127,24,0,125,223,9,0,125,87,
+5,0,32,110,236,255,106,135,10,0,106,7,13,0,106,7,
+8,0,74,7,15,0,74,111,17,0,13,98,106,103,18,0,
+74,7,16,0,32,94,0,2,99,7,33,0,99,7,29,0,
+99,231,37,0,99,231,41,0,61,87,1,0,99,95,45,0,
+99,87,1,0,35,134,28,0,99,135,5,0,99,7,9,0,
+99,7,13,0,1,122,99,127,18,0,12,114,99,119,25,0,
+99,7,16,0,99,7,20,0,99,7,22,0,29,56,3,48,
+191,255,118,246,61,23,9,0,34,111,26,0,141,110,0,128,
+98,111,26,0,27,80,221,15,32,0,221,7,32,0,88,6,
+255,16,152,7,225,48,7,216,6,224,60,215,1,0,128,255,
+38,3,10,232,1,130,93,135,34,0,124,239,5,0,60,127,
+24,0,124,239,9,0,65,122,124,127,24,0,32,118,208,0,
+13,122,125,127,18,0,125,119,8,0,93,7,12,0,32,102,
+79,0,93,103,13,0,32,94,194,255,93,95,14,0,32,86,
+160,255,125,135,10,0,93,87,16,0,32,134,176,255,93,135,
+17,0,125,215,1,0,99,223,37,0,99,223,41,0,99,7,
+33,0,99,7,29,0,32,118,0,2,60,111,1,0,99,119,
+45,0,99,111,1,0,35,102,28,0,99,103,5,0,99,7,
+9,0,99,7,13,0,1,90,99,95,18,0,12,82,99,87,
 25,0,99,7,16,0,99,7,20,0,99,7,22,0,28,56,
-3,48,191,255,168,244,61,118,18,0,206,47,0,0,220,15,
-32,0,220,7,32,0,24,80,88,6,255,240,152,7,225,112,
-7,200,8,216,187,0,6,224,60,215,1,0,128,255,92,1,
-10,232,125,215,1,0,1,130,93,135,34,0,124,239,5,0,
-60,127,24,0,29,208,65,122,124,127,24,0,124,215,9,0,
-32,110,0,2,93,7,16,0,125,7,8,0,125,7,13,0,
-125,135,10,0,93,7,15,0,35,94,28,0,99,7,33,0,
-99,7,29,0,99,207,37,0,99,207,41,0,60,103,1,0,
-99,111,45,0,99,103,1,0,99,95,5,0,99,7,9,0,
-99,7,13,0,99,135,18,0,99,7,16,0,99,7,20,0,
-99,7,22,0,97,218,138,13,32,94,228,255,13,82,12,106,
-99,111,25,0,149,21,224,217,146,13,38,6,188,125,132,0,
-32,62,148,9,0,66,128,255,68,0,32,94,232,255,15,82,
-11,130,99,135,25,0,93,95,17,0,125,87,18,0,28,56,
-3,48,191,255,200,243,60,23,9,0,34,127,26,0,143,126,
-0,128,98,127,26,0,26,80,220,15,32,0,220,7,32,0,
-88,6,255,112,32,86,0,1,127,0,33,6,254,5,128,0,
-97,0,96,7,53,176,34,6,144,162,133,0,96,23,49,176,
-32,142,0,17,96,143,57,176,0,82,2,134,36,0,98,135,
-5,0,65,82,2,22,36,0,10,6,1,239,246,245,127,0,
-128,7,193,0,6,224,229,87,64,0,224,7,96,1,32,23,
-57,176,10,232,188,17,224,17,231,5,2,6,0,239,191,5,
-96,23,57,176,253,47,32,0,64,6,223,0,128,7,225,0,
-0,226,38,239,13,0,129,255,32,176,29,48,65,226,224,233,
-154,253,28,80,64,6,255,0,128,7,193,0,229,87,64,0,
-224,7,96,1,32,143,53,176,10,232,32,135,57,176,17,22,
-1,0,240,137,238,13,96,23,53,176,32,231,49,176,60,127,
-5,0,96,127,49,176,253,47,32,0,28,80,64,6,223,0,
-229,87,64,0,224,135,96,1,32,119,57,176,32,111,53,176,
-238,105,190,253,253,47,32,0,165,221,128,7,225,241,68,55,
-204,131,224,49,226,5,38,6,216,126,132,0,128,255,148,7,
-0,226,0,186,0,210,56,6,144,6,136,0,26,136,194,138,
-36,118,208,131,206,137,49,223,1,0,59,239,8,0,59,207,
-8,0,216,234,156,234,217,206,15,0,98,202,202,69,99,234,
-170,69,23,104,65,186,224,105,154,29,24,48,32,62,32,0,
-9,66,128,255,70,7,88,7,8,0,29,102,48,0,88,103,
-0,0,32,94,46,0,88,95,1,0,25,86,48,0,88,87,
-2,0,32,142,48,0,88,143,3,0,26,56,29,64,25,72,
-38,6,228,126,132,0,128,255,26,7,0,106,28,96,194,98,
-27,16,36,86,172,138,204,81,36,94,108,138,204,89,68,98,
-106,23,1,0,107,223,1,0,68,82,68,90,65,226,2,22,
-32,0,65,106,100,106,198,245,26,48,128,255,30,6,26,48,
-128,255,248,0,65,210,99,210,166,173,97,186,177,77,162,53,
-99,186,145,29,250,69,64,86,0,0,202,191,40,241,229,87,
-64,0,224,7,96,1,10,232,64,86,0,0,10,87,40,241,
-10,248,32,86,191,255,74,249,64,86,0,0,74,255,40,241,
-253,47,32,0,64,86,0,0,202,191,38,241,229,87,64,0,
-224,7,96,1,10,232,64,86,0,0,10,87,38,241,10,248,
-32,86,191,255,74,249,64,86,0,0,74,255,38,241,253,47,
-32,0,64,86,0,0,202,191,36,241,229,87,64,0,224,7,
-96,1,10,232,64,86,0,0,10,87,36,241,10,248,32,86,
-191,255,74,249,64,86,0,0,74,255,36,241,253,47,32,0,
-245,13,23,56,38,6,248,126,132,0,128,255,54,6,23,64,
-38,6,12,127,132,0,32,62,179,0,191,255,176,253,32,22,
-16,0,28,6,240,255,190,5,28,16,226,0,100,23,206,131,
-4,87,205,131,226,0,226,81,227,13,224,81,135,13,10,56,
-2,64,38,6,24,127,132,0,128,255,248,5,36,135,206,131,
-68,135,205,131,64,6,255,241,194,50,36,118,208,131,206,49,
-38,23,1,0,32,110,0,80,98,111,8,0,127,0,194,50,
-36,118,208,131,206,49,38,23,1,0,128,110,0,160,98,111,
-8,0,127,0,128,7,128,7,97,0,6,232,29,136,194,138,
-36,118,172,138,206,137,49,23,1,0,29,104,193,106,36,86,
-236,138,202,105,237,143,1,0,145,142,0,1,98,143,0,0,
-32,54,100,0,226,23,1,0,128,255,144,5,29,48,128,255,
-212,0,32,54,184,11,128,255,130,5,64,6,127,0,128,7,
-97,0,194,50,36,118,172,138,206,49,38,239,1,0,6,106,
-125,111,16,0,4,98,125,103,22,0,10,50,253,23,1,0,
-128,255,88,5,6,90,125,95,16,0,125,7,22,0,32,54,
-136,19,253,23,1,0,128,255,66,5,64,6,127,0,128,7,
-33,0,6,136,194,138,36,118,172,138,206,137,49,23,1,0,
-193,50,36,86,236,138,202,49,230,143,1,0,145,142,0,64,
-98,143,0,0,32,54,232,3,128,255,16,5,64,6,63,0,
-128,7,33,0,6,136,194,138,36,118,172,138,206,137,49,23,
-1,0,193,50,36,86,236,138,202,49,230,143,1,0,145,142,
-0,128,98,143,0,0,32,54,232,3,128,255,222,4,64,6,
-63,0,194,50,36,118,172,138,206,49,38,23,1,0,6,106,
-98,111,16,0,32,102,128,0,98,103,22,0,226,23,1,0,
-127,0,128,7,225,0,6,232,29,136,194,138,36,118,172,138,
-206,137,49,231,1,0,29,104,193,106,36,86,236,138,202,105,
-237,143,1,0,145,142,224,0,124,143,0,0,10,50,252,23,
-1,0,128,255,134,4,193,234,36,102,236,138,204,233,253,95,
-1,0,124,95,0,0,252,23,1,0,64,6,255,0,128,7,
-33,0,6,136,194,138,36,118,172,138,206,137,49,23,1,0,
-6,104,193,106,36,86,236,138,202,105,237,143,1,0,145,142,
-0,16,98,143,0,0,128,255,2,4,64,6,63,0,194,50,
-36,118,172,138,206,49,38,79,1,0,39,87,18,0,32,110,
-223,255,10,16,77,17,234,17,178,5,130,22,160,0,194,102,
-0,1,130,0,170,37,7,95,8,0,200,90,11,17,105,23,
-16,0,7,119,12,0,39,103,10,0,200,114,140,0,14,97,
-105,103,18,0,7,143,14,0,167,127,13,0,200,138,17,121,
-105,127,20,0,167,87,15,0,7,103,17,0,135,119,17,0,
-200,98,12,81,10,113,165,53,7,103,9,0,200,98,140,102,
-12,0,105,103,16,0,7,143,15,0,39,127,10,0,200,138,
-168,122,17,121,105,127,18,0,105,7,20,0,105,7,22,0,
-7,103,8,0,200,98,12,17,105,23,16,0,7,127,12,0,
-39,111,10,0,200,122,141,0,15,105,105,111,18,0,7,87,
-14,0,167,135,13,0,200,82,10,129,105,135,20,0,7,111,
-17,0,135,119,17,0,200,106,13,113,105,119,22,0,127,0,
-194,50,36,118,172,138,206,49,38,79,1,0,167,0,224,57,
-218,37,169,103,25,0,104,103,0,0,137,95,25,0,104,95,
-10,0,41,23,26,0,2,80,138,0,168,18,72,23,4,0,
-104,87,2,0,41,23,28,0,72,23,5,0,168,18,72,23,
-6,0,41,23,30,0,194,126,240,0,2,104,205,94,15,0,
-11,80,72,127,8,0,168,106,165,37,169,95,17,0,104,95,
-0,0,137,87,17,0,104,87,10,0,41,23,18,0,2,136,
-145,0,168,18,104,143,2,0,72,23,4,0,41,23,20,0,
-41,111,22,0,72,23,5,0,205,118,240,0,168,18,72,23,
-6,0,72,119,8,0,205,86,15,0,168,106,72,87,7,0,
-72,111,9,0,127,0,194,50,36,118,172,138,206,49,199,0,
-193,58,36,86,220,131,202,57,39,143,0,0,38,23,1,0,
-98,143,4,0,127,0,194,50,36,134,172,138,198,129,48,23,
-1,0,226,87,1,0,103,87,0,0,36,110,108,138,226,23,
-7,0,103,23,2,0,205,49,38,23,1,0,226,87,9,0,
-103,87,4,0,226,23,11,0,103,23,6,0,127,0,128,7,
-225,112,0,234,36,222,172,138,32,230,104,177,36,214,236,138,
-165,61,59,87,1,0,10,200,249,23,1,0,194,142,224,0,
-242,29,29,48,129,255,200,62,224,81,226,5,29,48,2,58,
-129,255,250,62,181,37,25,48,128,255,112,0,29,48,10,64,
-32,62,66,0,128,255,44,2,10,200,29,48,2,58,129,255,
-220,62,224,201,178,21,25,48,128,255,32,2,245,13,194,126,
-1,64,15,6,255,191,170,13,250,119,1,0,142,118,0,128,
-106,119,0,0,28,48,129,255,108,175,68,218,28,230,32,0,
-66,210,65,234,36,103,206,131,236,233,198,197,64,86,0,0,
-202,191,36,241,64,86,0,0,202,191,38,241,64,86,0,0,
-202,191,40,241,64,6,255,112,38,143,0,0,32,86,9,2,
-209,134,192,0,194,5,32,86,1,2,149,93,38,111,0,0,
-134,106,217,85,134,23,25,0,194,134,1,0,226,45,131,18,
-153,45,166,23,25,0,2,6,240,255,161,13,97,18,242,29,
-100,18,162,29,101,18,146,21,108,18,154,69,229,13,2,6,
-240,255,210,21,2,6,236,255,130,13,2,6,192,255,242,13,
-2,6,124,255,226,5,181,53,4,143,204,131,224,137,242,45,
-32,86,0,2,197,45,32,86,10,2,149,45,32,86,2,2,
-229,37,32,86,8,2,181,37,194,126,112,0,226,21,194,94,
-112,0,11,6,192,255,178,13,11,6,176,255,210,5,11,6,
-144,255,130,13,197,21,32,86,8,2,149,21,32,86,3,2,
-229,13,32,86,6,2,181,13,194,134,128,0,194,5,32,86,
-4,2,213,5,132,18,185,5,32,86,8,2,127,0,128,7,
-225,0,6,232,4,143,204,131,7,224,224,137,194,13,128,255,
-126,0,29,48,128,255,164,0,224,225,210,5,32,54,136,19,
-128,255,216,0,64,6,255,0,128,7,225,48,6,232,191,255,
-240,250,194,234,0,218,32,214,36,17,29,48,128,255,80,0,
-29,128,194,130,36,110,172,138,205,129,48,231,1,0,29,96,
-193,98,36,142,236,138,209,97,236,135,1,0,144,134,224,128,
-124,135,0,0,10,50,124,215,2,0,128,255,142,0,29,112,
-193,114,36,94,236,138,203,113,238,87,1,0,124,87,0,0,
-65,234,65,218,100,218,166,221,64,6,255,48,4,143,204,131,
-224,137,162,21,6,128,194,130,36,110,172,138,205,129,193,50,
-36,142,236,138,209,49,102,7,0,0,48,23,1,0,98,7,
-0,0,226,23,1,0,127,0,4,143,204,131,224,137,194,21,
-6,128,193,50,36,142,236,138,194,130,36,110,172,138,205,129,
-48,23,1,0,209,49,32,134,0,2,102,135,0,0,98,135,
-0,0,226,23,1,0,127,0,33,6,230,1,128,0,97,0,
-33,6,92,34,130,0,97,0,33,6,62,191,129,0,97,0,
-33,6,14,0,129,0,97,0,33,6,20,217,128,0,97,0,
-128,7,33,0,36,55,77,139,128,255,170,7,4,135,144,140,
-23,146,224,81,226,23,0,0,82,129,194,126,1,0,195,122,
-15,129,68,135,144,140,10,112,231,119,66,2,131,114,64,14,
-136,0,97,119,157,6,64,6,63,0,128,7,33,0,38,6,
-4,128,132,0,191,255,156,255,64,54,136,0,38,55,157,6,
-128,255,16,0,64,86,136,0,42,87,157,6,64,6,63,0,
-128,7,33,0,64,142,16,0,241,49,158,13,6,120,191,122,
-150,122,207,49,170,50,37,70,56,128,133,13,6,96,191,98,
-140,98,204,49,180,50,37,70,59,128,6,56,37,54,48,128,
-191,255,80,255,64,6,63,0,64,86,136,0,42,87,157,6,
-127,0,128,7,97,0,61,6,156,6,136,0,191,255,84,255,
-191,255,138,255,125,7,5,0,61,143,1,0,125,143,9,0,
-125,7,13,0,125,7,17,0,125,7,21,0,125,7,25,0,
-125,7,29,0,125,7,33,0,125,7,37,0,125,7,41,0,
-61,23,1,0,224,17,210,29,139,18,64,126,1,0,239,17,
-177,5,64,22,1,0,2,6,255,253,177,5,32,22,0,2,
-61,111,9,0,61,103,5,0,125,23,49,0,172,105,137,106,
-162,105,125,111,45,0,31,130,125,135,245,0,221,135,248,0,
-64,6,127,0,130,7,225,0,61,6,20,128,132,0,60,6,
-156,6,136,0,60,143,29,0,41,6,152,7,136,0,244,143,
-66,2,99,143,1,0,38,6,196,184,255,255,39,6,36,128,
-132,0,32,70,16,0,128,255,100,6,224,81,242,5,29,48,
-32,62,195,1,0,66,191,255,4,246,60,119,37,0,41,6,
-152,135,138,0,244,119,66,2,99,119,1,0,38,6,36,185,
-255,255,39,6,56,128,132,0,32,70,16,0,128,255,46,6,
-224,81,242,5,29,48,32,62,207,1,0,66,191,255,206,245,
-60,95,33,0,41,6,152,71,137,0,244,95,66,2,99,95,
-1,0,38,6,244,184,255,255,39,6,80,128,132,0,32,70,
-16,0,128,255,248,5,224,81,242,5,29,48,32,62,219,1,
-0,66,191,255,152,245,60,135,41,0,41,6,152,155,138,0,
-244,135,66,2,99,135,1,0,38,6,84,185,255,255,39,6,
-100,128,132,0,32,70,16,0,128,255,194,5,224,81,130,13,
-29,48,32,62,231,1,0,66,191,255,98,245,224,81,66,6,
-255,0,130,7,225,16,6,216,196,223,144,140,194,5,31,82,
-128,7,4,1,61,6,156,6,136,0,61,231,245,0,65,226,
-28,6,240,255,198,5,32,86,18,1,213,117,221,199,248,0,
-178,53,27,6,128,255,199,5,32,86,17,1,197,109,31,66,
-27,6,240,255,223,21,3,56,38,6,196,184,255,255,129,255,
-154,158,224,81,194,5,32,86,16,1,213,93,28,16,236,23,
-64,2,61,86,52,0,202,17,32,86,16,0,165,61,3,56,
-38,6,244,184,255,255,129,255,114,158,224,81,194,5,32,86,
-16,1,149,77,28,16,236,23,64,2,61,86,52,0,202,17,
-32,86,128,0,229,37,61,127,45,0,61,135,49,0,207,129,
-16,118,0,252,238,217,195,5,32,86,20,1,197,53,61,111,
-5,0,61,135,9,0,99,111,1,0,27,96,201,98,204,105,
-125,111,5,0,173,129,61,103,49,0,137,130,172,129,125,135,
-45,0,28,16,236,23,64,2,61,86,52,0,202,17,27,80,
-66,87,5,0,35,95,1,0,28,16,236,23,64,2,61,86,
-52,0,194,81,106,95,1,0,61,142,52,0,61,86,52,0,
-194,81,209,17,1,130,98,135,8,0,74,223,4,0,125,231,
-245,0,11,80,66,6,255,16,128,7,33,0,128,255,16,0,
-128,255,78,1,191,255,240,253,64,6,63,0,128,7,97,0,
-61,6,156,6,136,0,61,23,9,0,61,127,5,0,2,112,
-175,113,61,103,49,0,137,114,172,113,125,119,45,0,32,94,
-0,1,12,80,191,82,155,82,12,128,202,129,165,130,16,6,
-0,255,254,5,12,112,191,114,155,114,12,88,206,89,165,90,
-125,95,37,0,11,96,61,111,49,0,196,90,171,105,125,111,
-49,0,205,98,172,17,125,23,21,0,32,94,0,1,13,112,
-191,114,153,114,13,96,206,97,167,98,12,6,0,255,254,5,
-13,80,191,82,153,82,13,88,202,89,167,90,125,95,41,0,
-61,103,45,0,208,90,171,17,125,23,25,0,32,86,0,16,
-12,104,191,106,155,106,12,88,205,89,165,90,11,6,0,240,
-254,5,12,136,191,138,155,138,12,80,209,81,165,82,125,87,
-29,0,10,120,61,95,45,0,196,82,170,89,125,95,45,0,
-205,122,175,17,125,23,13,0,32,86,0,16,11,136,191,138,
-153,138,11,120,209,121,167,122,15,6,0,240,254,5,11,104,
-191,106,153,106,11,80,205,81,167,82,125,87,33,0,208,82,
-170,17,125,23,5,0,125,23,17,0,38,6,140,128,132,0,
-191,255,160,251,61,143,41,0,61,55,37,0,199,138,196,50,
-209,49,201,50,191,255,12,252,38,6,124,128,132,0,191,255,
-130,251,61,87,33,0,61,55,29,0,199,82,196,50,202,49,
-201,50,191,255,238,251,221,7,248,0,64,6,127,0,130,7,
-97,0,61,6,156,6,136,0,61,63,13,0,61,71,29,0,
-38,6,156,7,136,0,99,7,1,0,32,78,16,0,128,255,
-98,1,61,63,17,0,61,71,29,0,38,6,156,71,137,0,
-99,7,1,0,32,78,128,0,128,255,72,1,38,6,156,135,
-138,0,61,63,21,0,61,71,37,0,1,114,99,119,1,0,
-32,78,16,0,128,255,44,1,38,6,156,155,138,0,61,63,
-25,0,61,71,41,0,1,98,99,103,1,0,32,78,128,0,
-128,255,16,1,66,6,127,0,134,7,225,16,6,232,38,6,
-20,129,132,0,7,224,29,56,8,216,0,66,35,78,8,0,
-128,255,250,1,10,48,29,56,35,71,9,0,28,72,31,138,
-99,143,5,0,99,223,1,0,128,255,22,1,70,6,255,16,
-134,7,225,16,6,232,38,6,192,128,132,0,7,224,29,56,
-8,216,0,66,35,78,8,0,128,255,194,1,10,48,29,56,
-35,71,9,0,28,72,99,223,1,0,99,7,5,0,128,255,
-224,0,70,6,255,16,136,7,225,16,6,232,38,6,192,128,
-132,0,7,224,29,56,8,216,1,66,35,78,8,0,128,255,
-140,1,10,48,29,56,35,71,9,0,28,72,35,142,12,0,
-99,143,1,0,99,223,5,0,128,255,166,0,72,6,255,16,
-0,90,224,73,199,45,181,5,38,55,13,0,134,103,5,0,
-172,57,188,253,7,80,128,81,7,16,204,17,38,103,1,0,
-201,18,204,17,170,73,172,5,201,81,104,23,13,0,10,128,
-201,130,104,135,17,0,104,7,5,0,104,7,1,0,104,23,
-9,0,38,55,13,0,8,70,20,0,65,90,224,49,210,5,
-38,23,1,0,134,87,5,0,224,73,223,229,11,80,127,0,
-35,103,1,0,6,80,0,90,133,29,10,16,98,63,1,0,
-66,79,4,0,66,7,5,0,98,7,9,0,98,7,13,0,
-97,98,186,5,194,7,6,0,194,15,6,0,10,86,20,0,
-9,136,201,138,209,57,65,90,232,89,134,237,127,0,130,7,
-225,243,9,224,35,191,41,0,35,183,45,0,0,234,7,200,
-25,216,6,192,56,215,5,0,97,66,186,21,56,55,1,0,
-22,64,3,56,129,255,148,154,224,81,218,61,35,143,1,0,
-26,232,119,143,1,0,81,207,5,0,124,143,1,0,181,53,
-124,7,1,0,0,202,56,55,1,0,22,64,3,56,129,255,
-106,154,60,127,1,0,224,81,194,13,15,16,224,17,210,5,
-2,48,1,58,128,255,194,0,124,7,1,0,0,234,181,29,
-35,23,1,0,218,233,224,121,186,5,124,23,1,0,119,23,
-1,0,251,209,98,7,13,0,98,207,9,0,251,215,60,83,
-66,87,5,0,224,201,178,5,121,23,13,0,2,200,186,217,
-224,217,175,213,224,233,242,13,60,23,1,0,162,23,5,0,
-224,17,154,13,29,64,38,6,160,128,132,0,32,62,188,4,
-191,255,106,240,29,80,66,6,255,243,7,6,240,255,135,13,
-6,54,28,0,7,6,128,255,183,5,6,54,28,0,97,66,
-202,5,38,103,5,0,181,5,38,103,1,0,0,18,2,136,
-194,138,38,118,8,0,206,137,49,95,1,0,43,111,5,0,
-7,86,255,255,237,87,192,2,10,110,1,0,43,87,1,0,
-42,87,9,0,234,105,195,5,65,18,236,17,150,237,105,111,
-1,0,11,80,127,0,128,7,225,16,7,224,188,0,6,232,
-61,223,13,0,29,23,6,0,125,7,13,0,29,146,82,17,
-220,86,1,0,193,82,10,17,93,23,6,0,29,48,129,255,
-76,154,224,81,146,13,29,64,38,6,176,128,132,0,32,62,
-79,5,191,255,200,239,27,232,224,233,186,229,64,6,255,16,
-34,6,33,6,178,186,129,0,97,0,33,6,240,5,130,0,
-97,0,128,7,97,0,6,232,38,6,220,129,132,0,191,255,
-18,248,29,63,2,0,38,6,208,129,132,0,221,58,159,58,
-191,255,0,248,29,135,2,0,37,54,64,128,208,62,1,0,
-191,255,240,247,61,54,40,4,129,255,236,145,64,6,127,0,
-128,7,33,0,5,138,68,143,12,139,32,134,244,1,100,135,
-17,139,68,7,20,139,128,255,130,30,128,255,120,12,129,255,
-164,145,128,255,150,10,128,255,56,214,64,6,63,0,130,7,
-97,0,31,82,6,232,125,87,9,0,125,87,13,0,125,7,
-17,0,93,7,20,0,93,7,21,0,93,7,22,0,93,7,
-23,0,32,134,1,3,93,7,4,0,125,135,0,0,221,199,
-3,0,234,5,32,126,1,3,125,127,2,0,213,5,35,54,
-3,0,128,255,236,11,61,54,24,0,128,255,4,12,61,54,
-48,4,0,58,128,255,248,215,61,54,100,4,129,255,234,63,
-66,6,127,0,128,7,33,0,38,55,41,4,224,49,178,5,
-129,255,94,136,64,6,63,0,128,7,225,0,7,224,60,71,
-1,0,60,79,5,0,8,112,143,114,9,16,209,18,14,17,
-32,142,104,176,113,23,1,0,49,142,220,255,113,71,1,0,
-113,79,5,0,1,114,32,142,76,176,60,111,5,0,60,103,
-1,0,252,135,9,0,16,80,204,81,225,127,0,0,205,121,
-174,81,225,63,0,0,167,121,113,87,1,0,113,127,5,0,
-72,138,113,135,0,0,6,232,61,95,13,0,61,87,9,0,
-235,73,218,5,234,65,186,5,192,39,128,176,32,142,76,176,
-49,103,1,0,49,111,5,0,12,86,1,0,125,87,9,0,
-225,135,0,0,205,129,125,135,13,0,88,138,49,23,1,0,
-252,111,9,0,194,118,127,0,2,120,135,122,96,127,133,176,
-13,102,255,255,204,113,135,114,207,113,32,142,136,176,113,119,
-1,0,221,215,2,0,162,13,29,48,28,56,128,255,214,6,
-224,81,194,5,0,82,128,7,172,1,221,199,2,0,202,5,
-220,223,11,0,194,5,1,82,128,7,154,1,29,23,20,0,
-224,17,250,61,0,18,60,87,1,0,61,111,13,0,60,95,
-5,0,61,103,9,0,237,89,170,21,236,81,138,21,189,111,
-23,0,65,106,93,111,23,0,205,102,255,0,106,98,227,5,
-3,90,93,95,20,0,93,7,23,0,1,18,224,17,154,29,
-32,142,104,176,49,135,1,0,61,87,17,0,234,129,154,21,
-157,127,23,0,65,122,93,127,22,0,207,118,255,0,99,114,
-131,13,1,106,93,111,20,0,93,7,22,0,93,7,21,0,
-32,142,104,176,49,103,1,0,125,103,17,0,128,7,16,1,
-97,18,170,53,32,142,104,176,61,87,17,0,49,23,1,0,
-234,17,234,5,29,48,28,56,128,255,254,0,133,125,125,23,
-17,0,32,142,104,176,49,63,1,0,61,54,24,0,128,255,
-126,10,224,81,130,13,29,48,28,56,128,255,220,0,93,7,
-21,0,213,101,2,130,93,135,20,0,189,127,21,0,65,122,
-93,127,21,0,207,118,255,0,106,114,147,93,93,7,20,0,
-93,7,22,0,197,85,98,18,170,85,32,142,104,176,61,103,
-17,0,49,63,1,0,236,57,234,29,157,95,23,0,65,90,
-93,95,22,0,203,86,255,0,99,82,147,13,1,18,93,23,
-20,0,93,7,22,0,93,7,21,0,165,5,0,18,224,17,
-226,53,61,54,24,0,128,255,76,10,29,48,28,56,128,255,
-104,0,213,45,61,54,24,0,128,255,244,9,224,81,178,13,
-29,48,28,56,128,255,82,0,93,7,21,0,1,122,93,127,
-20,0,213,29,189,119,21,0,65,114,93,119,21,0,206,110,
-255,0,106,106,243,5,93,7,20,0,93,7,22,0,1,18,
-165,5,0,18,224,17,210,5,61,54,24,0,128,255,246,9,
-32,142,104,176,49,103,1,0,125,103,17,0,220,7,66,0,
-1,82,64,6,255,0,128,7,225,0,6,232,7,224,61,54,
-24,0,128,255,84,15,224,81,178,5,1,82,229,37,61,54,
-24,0,28,56,128,255,230,9,224,81,162,29,61,54,24,0,
-32,150,108,176,50,63,1,0,0,66,128,255,186,10,29,48,
-28,56,32,150,124,176,242,143,1,0,224,137,202,5,128,255,
-216,1,165,13,128,255,24,0,220,39,66,0,213,5,29,48,
-28,56,128,255,196,1,0,82,64,6,255,0,136,7,225,48,
-6,208,32,142,112,176,49,231,1,0,7,232,60,231,1,0,
-0,18,76,138,241,135,1,0,98,130,186,13,32,142,116,176,
-49,23,1,0,34,23,1,0,2,23,42,0,194,22,1,0,
-2,216,229,87,64,0,224,7,96,1,10,248,220,199,42,0,
-178,5,128,7,92,1,224,217,178,5,128,7,84,1,255,47,
-32,0,28,48,253,63,9,0,35,70,8,0,35,78,12,0,
-128,255,0,27,35,23,9,0,192,7,128,176,224,17,182,21,
-35,111,13,0,224,105,255,13,221,63,65,0,125,231,21,0,
-253,103,9,0,125,103,24,0,125,23,26,0,125,7,36,0,
-128,7,34,1,221,55,65,0,224,17,198,13,253,95,9,0,
-35,135,13,0,125,231,21,0,176,89,125,95,24,0,125,23,
-26,0,224,17,246,5,32,142,124,176,241,127,1,0,98,122,
-154,45,32,142,124,176,241,119,1,0,98,114,138,21,32,142,
-116,176,49,231,1,0,253,63,9,0,60,231,1,0,35,70,
-8,0,28,48,35,78,12,0,128,255,120,26,125,231,45,0,
-253,103,9,0,35,87,13,0,12,88,170,89,125,95,48,0,
-125,7,50,0,203,0,171,97,253,111,25,0,173,97,99,103,
-13,0,35,95,13,0,224,89,202,5,125,7,36,0,165,77,
-61,231,57,0,129,255,202,15,10,16,98,231,9,0,32,86,
-16,0,98,87,2,0,48,6,132,67,1,0,98,135,5,0,
-1,122,98,127,0,0,96,23,157,176,98,239,29,0,35,119,
-13,0,61,111,5,0,253,71,25,0,61,103,1,0,221,39,
-66,0,204,65,225,79,0,0,32,142,108,176,49,63,1,0,
-205,73,99,119,1,0,76,138,49,111,1,0,99,111,5,0,
-58,54,24,0,128,255,156,15,35,103,13,0,125,87,33,0,
-202,7,42,0,125,103,36,0,125,7,38,0,181,13,255,47,
-32,0,38,6,240,129,132,0,32,62,49,3,1,66,191,255,
-44,234,72,6,255,48,134,7,225,16,6,224,7,232,61,223,
-57,0,129,255,44,15,106,223,9,0,32,134,16,0,106,135,
-2,0,47,6,132,67,1,0,106,127,5,0,1,114,106,119,
-0,0,96,87,157,176,106,239,29,0,99,7,9,0,221,39,
-66,0,32,150,128,176,210,207,0,0,194,13,35,54,8,0,
-128,255,186,18,35,63,9,0,60,54,24,0,128,255,202,6,
-213,21,32,142,108,176,49,111,1,0,128,103,127,176,99,111,
-9,0,224,97,186,13,45,54,12,0,32,62,60,176,128,255,
-176,6,32,142,120,176,113,87,1,0,35,87,9,0,224,81,
-154,13,38,6,0,130,132,0,32,62,108,3,0,66,191,255,
-140,233,32,142,68,176,49,79,5,0,49,71,1,0,253,135,
-9,0,99,135,1,0,49,142,52,0,49,127,1,0,35,63,
-9,0,99,127,5,0,60,54,24,0,128,255,166,14,125,87,
-33,0,202,7,42,0,0,82,70,6,255,16,128,7,97,0,
-6,232,221,199,2,0,138,21,61,54,24,0,128,255,254,6,
-224,81,162,13,61,54,24,0,32,150,108,176,50,63,1,0,
-1,66,128,255,210,7,64,6,127,0,128,7,225,16,7,232,
-61,71,1,0,61,79,5,0,8,112,143,114,9,16,209,18,
-14,17,32,142,104,176,113,23,1,0,6,224,49,142,220,255,
-113,79,5,0,113,71,1,0,1,114,61,111,5,0,253,63,
-9,0,61,103,1,0,7,80,204,81,225,127,0,0,205,121,
-174,81,225,55,0,0,166,121,32,142,76,176,113,87,1,0,
-113,127,5,0,72,138,113,63,0,0,0,130,60,95,13,0,
-60,87,9,0,235,73,234,5,234,65,202,5,192,39,128,176,
-1,130,32,142,76,176,49,103,1,0,49,111,5,0,12,86,
-1,0,124,87,9,0,225,79,0,0,9,16,205,17,124,23,
-13,0,88,138,49,23,1,0,253,111,9,0,194,118,127,0,
-2,120,135,122,96,127,133,176,13,102,255,255,204,113,135,114,
-207,113,32,142,136,176,113,119,1,0,16,216,28,48,29,56,
-191,255,12,255,28,48,29,56,220,215,2,0,154,13,128,255,
-208,0,221,39,66,0,221,31,11,0,0,82,245,93,128,255,
-20,1,224,81,178,5,0,82,149,93,221,7,66,0,29,56,
-221,223,11,0,130,13,28,48,128,255,166,0,221,39,66,0,
-0,82,197,77,60,55,41,4,27,64,129,255,104,131,224,81,
-170,69,28,48,29,56,128,255,136,0,60,54,24,0,29,56,
-128,255,56,12,224,81,210,53,220,239,3,0,242,21,60,54,
-48,4,128,255,210,210,60,119,117,4,29,48,238,81,131,13,
-128,255,198,35,61,55,61,0,1,58,129,255,94,80,60,54,
-48,4,29,56,128,255,2,209,197,21,60,111,117,4,60,23,
-108,4,29,48,237,17,131,13,128,255,158,35,61,55,61,0,
-1,58,129,255,54,80,60,54,100,4,29,56,129,255,184,56,
-61,23,57,0,44,6,46,57,1,0,98,103,5,0,181,5,
-0,82,197,5,221,39,66,0,1,82,64,6,255,16,128,7,
-225,0,32,142,68,176,7,232,49,63,5,0,49,55,1,0,
-253,71,9,0,128,255,60,23,10,224,224,225,250,21,29,48,
-128,255,70,35,61,55,61,0,1,58,129,255,222,79,197,13,
-32,142,68,176,49,63,5,0,49,55,1,0,253,71,9,0,
-128,255,16,23,10,224,224,225,194,245,125,231,33,0,64,6,
-255,0,128,7,225,0,6,232,61,54,24,0,7,224,128,255,
-100,10,224,81,138,13,61,55,41,4,28,56,129,255,206,130,
-224,81,242,5,32,142,144,176,209,39,0,0,1,82,165,5,
-0,82,64,6,255,0,128,7,97,0,6,232,167,0,221,215,
-2,0,146,45,97,58,129,37,178,29,99,58,177,5,242,5,
-165,37,61,55,41,4,129,255,214,135,213,29,61,55,41,4,
-129,255,204,135,36,119,17,139,61,111,113,4,36,103,33,175,
-205,113,238,97,131,21,29,48,128,255,32,0,197,13,29,48,
-128,255,24,0,133,13,61,55,41,4,129,255,162,135,29,48,
-128,255,8,0,64,6,127,0,132,7,225,243,6,224,60,54,
-24,0,128,255,6,2,10,208,224,209,162,253,1,130,99,135,
-1,0,31,50,128,255,214,46,36,151,33,175,0,186,99,151,
-5,0,0,218,220,239,3,0,234,199,0,0,224,193,178,13,
-224,217,178,5,27,232,197,21,60,54,48,4,128,255,184,208,
-10,232,229,13,60,119,108,4,224,113,146,13,60,239,101,4,
-60,54,100,4,29,56,129,255,176,55,165,5,0,234,224,233,
-186,5,128,7,74,1,221,215,66,0,130,29,61,255,33,0,
-63,255,40,0,128,249,229,87,64,0,224,7,96,1,36,103,
-53,139,10,200,223,97,100,103,53,139,249,47,32,0,60,54,
-24,0,29,56,128,255,154,9,165,205,1,186,224,193,226,69,
-0,202,60,54,48,4,128,255,78,208,10,216,224,217,194,61,
-219,215,66,0,146,29,61,255,33,0,63,255,40,0,1,202,
-128,249,229,87,64,0,224,7,96,1,36,135,53,139,10,176,
-223,129,100,135,53,139,246,47,32,0,60,54,24,0,27,56,
-128,255,78,9,149,37,61,103,1,0,61,111,5,0,253,87,
-9,0,204,81,225,135,0,0,205,129,59,111,5,0,59,103,
-1,0,240,105,154,21,234,97,250,13,60,54,24,0,29,56,
-27,64,128,255,180,12,253,127,9,0,15,6,0,240,233,207,
-0,0,169,5,0,218,224,201,202,189,26,48,29,56,128,255,
-56,1,129,255,108,10,10,16,98,7,9,0,32,102,232,3,
-98,103,21,0,1,90,98,95,0,0,32,86,16,0,98,87,
-2,0,48,6,252,66,1,0,98,135,5,0,98,239,29,0,
-98,215,25,0,61,183,33,0,54,255,40,0,125,23,57,0,
-128,249,229,87,64,0,224,7,96,1,36,119,53,139,10,200,
-223,113,100,119,53,139,249,47,32,0,253,87,37,0,10,16,
-54,103,26,0,226,0,226,97,186,253,29,48,61,63,57,0,
-0,66,0,74,128,255,50,27,191,7,132,254,26,48,224,185,
-130,13,35,151,5,0,124,151,113,4,128,255,62,1,181,5,
-128,255,130,0,35,135,1,0,224,129,210,5,99,7,1,0,
-128,255,2,45,68,6,255,243,0,18,226,134,24,0,42,6,
-188,175,138,0,202,129,10,118,24,0,2,104,248,111,64,2,
-206,105,112,111,5,0,65,18,2,6,209,255,246,237,106,7,
-109,4,100,87,25,139,127,0,128,7,225,16,6,216,229,87,
-64,0,224,7,96,1,36,239,25,139,10,224,224,233,210,13,
-61,54,8,0,129,255,114,53,125,223,1,0,61,143,5,0,
-125,7,22,0,100,143,25,139,252,47,32,0,29,80,64,6,
-255,16,128,7,193,0,6,224,229,87,64,0,224,7,96,1,
-36,143,25,139,10,232,124,143,5,0,100,231,25,139,253,47,
-32,0,64,6,223,0,128,7,225,0,6,232,7,248,229,87,
-64,0,224,7,96,1,10,224,61,54,8,0,31,56,129,255,
-38,53,61,143,20,0,65,138,125,143,20,0,252,47,32,0,
-64,6,255,0,128,7,97,0,6,248,229,87,64,0,224,7,
-96,1,63,143,20,0,95,138,127,143,20,0,10,232,241,0,
-224,137,138,13,63,127,22,0,224,121,194,5,31,48,128,255,
-12,0,253,47,32,0,64,6,127,0,130,7,33,0,99,55,
-1,0,3,56,32,54,104,180,0,66,128,255,188,0,224,81,
-162,13,38,6,16,130,132,0,32,62,166,6,0,66,191,255,
-156,227,224,81,66,6,63,0,128,7,97,0,6,248,229,87,
-64,0,224,7,96,1,10,232,1,138,63,135,20,0,127,143,
-22,0,224,129,202,5,31,48,191,255,178,255,253,47,32,0,
-64,6,127,0,128,7,225,0,6,232,61,143,20,0,224,137,
-226,13,38,6,32,130,132,0,32,62,232,6,0,66,191,255,
-76,227,213,5,61,55,1,0,128,255,230,6,61,135,16,0,
-224,129,146,13,61,231,9,0,61,54,8,0,28,56,129,255,
-168,52,165,5,0,226,28,56,224,57,218,237,29,48,191,255,
-212,254,64,6,255,0,128,7,134,135,166,135,128,7,33,6,
-84,13,128,0,97,0,33,6,102,15,128,0,97,0,33,6,
-200,18,128,0,97,0,33,6,18,254,129,0,97,0,102,7,
-1,0,102,7,5,0,8,138,102,143,10,0,102,7,8,0,
-127,0,128,7,33,0,50,6,200,6,136,0,50,143,1,0,
-100,7,49,139,100,143,57,139,100,7,53,139,128,255,62,11,
-128,255,66,13,128,255,172,17,64,6,63,0,128,7,225,16,
-6,224,60,143,8,0,7,216,224,137,146,29,60,239,1,0,
-61,135,1,0,240,217,186,5,1,82,165,21,61,239,17,0,
-224,233,154,13,38,6,80,130,132,0,32,62,209,0,0,66,
-191,255,122,226,60,127,5,0,239,233,186,237,0,82,64,6,
-255,16,130,7,97,0,6,232,99,7,1,0,149,13,29,48,
-3,56,128,255,62,17,35,55,1,0,128,255,232,11,61,143,
-8,0,224,137,218,245,66,6,127,0,128,7,97,0,192,15,
-128,176,32,142,108,176,113,7,1,0,49,142,16,0,113,7,
-0,0,32,142,120,176,113,7,1,0,88,138,113,7,1,0,
-32,142,116,176,113,7,1,0,38,135,8,0,64,7,126,176,
-224,129,226,85,199,199,66,0,186,85,38,239,1,0,32,142,
-104,176,49,119,1,0,61,127,1,0,239,113,186,69,253,111,
-25,0,224,105,154,13,38,6,96,130,132,0,32,62,47,1,
-0,66,191,255,216,225,192,143,128,176,32,142,108,176,113,239,
-1,0,61,23,13,0,49,142,224,255,34,23,1,0,49,87,
-1,0,34,111,13,0,49,95,5,0,34,103,9,0,237,89,
-241,29,187,5,236,81,193,29,32,142,68,176,49,87,1,0,
-61,111,9,0,49,95,5,0,61,103,5,0,237,89,139,21,
-177,5,236,81,219,13,61,54,12,0,32,62,60,176,128,255,
-162,16,224,81,178,5,1,82,197,13,0,82,165,13,0,82,
-133,13,38,103,1,0,61,239,17,0,236,233,154,181,0,82,
-64,6,127,0,132,7,225,243,6,184,7,176,32,142,112,176,
-136,0,8,128,49,71,1,0,224,129,242,5,32,78,124,176,
-128,255,38,4,128,7,30,4,32,142,68,176,40,23,1,0,
-49,87,1,0,34,111,13,0,49,95,5,0,34,103,9,0,
-237,89,171,53,177,5,236,81,249,45,32,142,116,176,49,23,
-1,0,224,17,170,5,8,16,32,142,76,176,49,55,1,0,
-34,23,1,0,49,63,5,0,34,111,13,0,34,87,24,0,
-34,103,9,0,10,120,191,122,204,81,225,135,0,0,208,121,
-205,121,1,114,174,81,225,135,0,0,176,121,239,57,193,13,
-187,5,234,49,147,13,23,48,22,56,32,78,124,176,128,255,
-168,3,128,7,160,3,32,142,124,176,241,127,1,0,97,122,
-186,5,128,7,144,3,58,6,64,130,132,0,0,218,0,194,
-128,7,80,1,32,142,112,176,49,239,1,0,224,233,154,13,
-38,6,48,130,132,0,32,62,147,3,0,66,191,255,126,224,
-99,7,1,0,61,23,9,0,0,74,253,17,130,117,2,200,
-61,23,1,0,99,207,1,0,194,199,42,0,138,109,57,135,
-1,0,208,199,42,0,186,101,34,111,13,0,34,87,24,0,
+3,48,191,255,164,245,60,23,9,0,34,135,26,0,144,134,
+0,128,98,135,26,0,29,80,220,15,32,0,220,7,32,0,
+88,6,255,48,152,7,225,240,6,224,7,200,25,48,39,6,
+124,134,132,0,8,216,32,70,0,2,129,255,156,45,60,215,
+1,0,128,255,66,2,10,232,1,130,93,135,34,0,29,192,
+60,127,24,0,65,122,124,127,24,0,124,239,5,0,124,199,
+9,0,125,215,1,0,125,7,8,0,125,7,13,0,125,135,
+10,0,93,7,15,0,93,7,16,0,27,208,154,0,27,6,
+15,255,130,13,27,6,14,255,130,21,27,6,10,255,210,13,
+197,5,220,7,33,0,149,13,27,64,38,6,140,136,132,0,
+32,62,37,9,128,255,98,1,15,106,125,111,18,0,93,215,
+17,0,32,102,0,2,99,7,33,0,99,7,29,0,99,207,
+41,0,99,207,37,0,60,95,1,0,99,103,45,0,99,95,
+1,0,35,86,28,0,99,87,5,0,99,7,9,0,99,7,
+13,0,1,130,99,135,18,0,11,122,99,127,25,0,99,7,
+16,0,99,7,20,0,99,7,22,0,28,56,3,48,191,255,
+168,244,61,118,18,0,206,47,0,0,220,15,32,0,220,7,
+32,0,24,80,88,6,255,240,152,7,225,112,7,200,8,216,
+187,0,6,224,60,215,1,0,128,255,92,1,10,232,125,215,
+1,0,1,130,93,135,34,0,124,239,5,0,60,127,24,0,
+29,208,65,122,124,127,24,0,124,215,9,0,32,110,0,2,
+93,7,16,0,125,7,8,0,125,7,13,0,125,135,10,0,
+93,7,15,0,35,94,28,0,99,7,33,0,99,7,29,0,
+99,207,37,0,99,207,41,0,60,103,1,0,99,111,45,0,
+99,103,1,0,99,95,5,0,99,7,9,0,99,7,13,0,
+99,135,18,0,99,7,16,0,99,7,20,0,99,7,22,0,
+97,218,138,13,32,94,228,255,13,82,12,106,99,111,25,0,
+149,21,224,217,146,13,38,6,156,136,132,0,32,62,148,9,
+0,66,128,255,68,0,32,94,232,255,15,82,11,130,99,135,
+25,0,93,95,17,0,125,87,18,0,28,56,3,48,191,255,
+200,243,60,23,9,0,34,127,26,0,143,126,0,128,98,127,
+26,0,26,80,220,15,32,0,220,7,32,0,88,6,255,112,
+32,86,0,1,127,0,33,6,254,5,128,0,97,0,96,7,
+53,176,34,6,240,173,133,0,96,23,49,176,32,142,0,17,
+96,143,57,176,0,82,2,134,36,0,98,135,5,0,65,82,
+2,22,36,0,10,6,1,239,246,245,127,0,128,7,193,0,
+6,224,229,87,64,0,224,7,96,1,32,23,57,176,10,232,
+188,17,224,17,231,5,2,6,0,239,191,5,96,23,57,176,
+253,47,32,0,64,6,223,0,128,7,225,0,0,226,38,239,
+13,0,129,255,112,178,29,48,65,226,224,233,154,253,28,80,
+64,6,255,0,128,7,193,0,229,87,64,0,224,7,96,1,
+32,143,53,176,10,232,32,135,57,176,17,22,1,0,240,137,
+238,13,96,23,53,176,32,231,49,176,60,127,5,0,96,127,
+49,176,253,47,32,0,28,80,64,6,223,0,229,87,64,0,
+224,135,96,1,32,119,57,176,32,111,53,176,238,105,190,253,
+253,47,32,0,165,221,128,7,225,241,68,55,216,131,224,49,
+226,5,38,6,184,137,132,0,128,255,148,7,0,226,0,186,
+0,210,56,6,240,17,136,0,26,136,194,138,36,118,220,131,
+206,137,49,223,1,0,59,239,8,0,59,207,8,0,216,234,
+156,234,217,206,15,0,98,202,202,69,99,234,170,69,23,104,
+65,186,224,105,154,29,24,48,32,62,32,0,9,66,128,255,
+70,7,88,7,8,0,29,102,48,0,88,103,0,0,32,94,
+46,0,88,95,1,0,25,86,48,0,88,87,2,0,32,142,
+48,0,88,143,3,0,26,56,29,64,25,72,38,6,196,137,
+132,0,128,255,26,7,0,106,28,96,194,98,27,16,36,86,
+184,138,204,81,36,94,120,138,204,89,68,98,106,23,1,0,
+107,223,1,0,68,82,68,90,65,226,2,22,32,0,65,106,
+100,106,198,245,26,48,128,255,30,6,26,48,128,255,248,0,
+65,210,99,210,166,173,97,186,177,77,162,53,99,186,145,29,
+250,69,64,86,0,0,202,191,40,241,229,87,64,0,224,7,
+96,1,10,232,64,86,0,0,10,87,40,241,10,248,32,86,
+191,255,74,249,64,86,0,0,74,255,40,241,253,47,32,0,
+64,86,0,0,202,191,38,241,229,87,64,0,224,7,96,1,
+10,232,64,86,0,0,10,87,38,241,10,248,32,86,191,255,
+74,249,64,86,0,0,74,255,38,241,253,47,32,0,64,86,
+0,0,202,191,36,241,229,87,64,0,224,7,96,1,10,232,
+64,86,0,0,10,87,36,241,10,248,32,86,191,255,74,249,
+64,86,0,0,74,255,36,241,253,47,32,0,245,13,23,56,
+38,6,216,137,132,0,128,255,54,6,23,64,38,6,236,137,
+132,0,32,62,179,0,191,255,176,253,32,22,16,0,28,6,
+240,255,190,5,28,16,226,0,100,23,218,131,4,87,217,131,
+226,0,226,81,227,13,224,81,135,13,10,56,2,64,38,6,
+248,137,132,0,128,255,248,5,36,135,218,131,68,135,217,131,
+64,6,255,241,194,50,36,118,220,131,206,49,38,23,1,0,
+32,110,0,80,98,111,8,0,127,0,194,50,36,118,220,131,
+206,49,38,23,1,0,128,110,0,160,98,111,8,0,127,0,
+128,7,128,7,97,0,6,232,29,136,194,138,36,118,184,138,
+206,137,49,23,1,0,29,104,193,106,36,86,248,138,202,105,
+237,143,1,0,145,142,0,1,98,143,0,0,32,54,100,0,
+226,23,1,0,128,255,144,5,29,48,128,255,212,0,32,54,
+184,11,128,255,130,5,64,6,127,0,128,7,97,0,194,50,
+36,118,184,138,206,49,38,239,1,0,6,106,125,111,16,0,
+4,98,125,103,22,0,10,50,253,23,1,0,128,255,88,5,
+6,90,125,95,16,0,125,7,22,0,32,54,136,19,253,23,
+1,0,128,255,66,5,64,6,127,0,128,7,33,0,6,136,
+194,138,36,118,184,138,206,137,49,23,1,0,193,50,36,86,
+248,138,202,49,230,143,1,0,145,142,0,64,98,143,0,0,
+32,54,232,3,128,255,16,5,64,6,63,0,128,7,33,0,
+6,136,194,138,36,118,184,138,206,137,49,23,1,0,193,50,
+36,86,248,138,202,49,230,143,1,0,145,142,0,128,98,143,
+0,0,32,54,232,3,128,255,222,4,64,6,63,0,194,50,
+36,118,184,138,206,49,38,23,1,0,6,106,98,111,16,0,
+32,102,128,0,98,103,22,0,226,23,1,0,127,0,128,7,
+225,0,6,232,29,136,194,138,36,118,184,138,206,137,49,231,
+1,0,29,104,193,106,36,86,248,138,202,105,237,143,1,0,
+145,142,224,0,124,143,0,0,10,50,252,23,1,0,128,255,
+134,4,193,234,36,102,248,138,204,233,253,95,1,0,124,95,
+0,0,252,23,1,0,64,6,255,0,128,7,33,0,6,136,
+194,138,36,118,184,138,206,137,49,23,1,0,6,104,193,106,
+36,86,248,138,202,105,237,143,1,0,145,142,0,16,98,143,
+0,0,128,255,2,4,64,6,63,0,194,50,36,118,184,138,
+206,49,38,79,1,0,39,87,18,0,32,110,223,255,10,16,
+77,17,234,17,178,5,130,22,160,0,194,102,0,1,130,0,
+170,37,7,95,8,0,200,90,11,17,105,23,16,0,7,119,
+12,0,39,103,10,0,200,114,140,0,14,97,105,103,18,0,
+7,143,14,0,167,127,13,0,200,138,17,121,105,127,20,0,
+167,87,15,0,7,103,17,0,135,119,17,0,200,98,12,81,
+10,113,165,53,7,103,9,0,200,98,140,102,12,0,105,103,
+16,0,7,143,15,0,39,127,10,0,200,138,168,122,17,121,
+105,127,18,0,105,7,20,0,105,7,22,0,7,103,8,0,
+200,98,12,17,105,23,16,0,7,127,12,0,39,111,10,0,
+200,122,141,0,15,105,105,111,18,0,7,87,14,0,167,135,
+13,0,200,82,10,129,105,135,20,0,7,111,17,0,135,119,
+17,0,200,106,13,113,105,119,22,0,127,0,194,50,36,118,
+184,138,206,49,38,79,1,0,167,0,224,57,218,37,169,103,
+25,0,104,103,0,0,137,95,25,0,104,95,10,0,41,23,
+26,0,2,80,138,0,168,18,72,23,4,0,104,87,2,0,
+41,23,28,0,72,23,5,0,168,18,72,23,6,0,41,23,
+30,0,194,126,240,0,2,104,205,94,15,0,11,80,72,127,
+8,0,168,106,165,37,169,95,17,0,104,95,0,0,137,87,
+17,0,104,87,10,0,41,23,18,0,2,136,145,0,168,18,
+104,143,2,0,72,23,4,0,41,23,20,0,41,111,22,0,
+72,23,5,0,205,118,240,0,168,18,72,23,6,0,72,119,
+8,0,205,86,15,0,168,106,72,87,7,0,72,111,9,0,
+127,0,194,50,36,118,184,138,206,49,199,0,193,58,36,86,
+232,131,202,57,39,143,0,0,38,23,1,0,98,143,4,0,
+127,0,194,50,36,134,184,138,198,129,48,23,1,0,226,87,
+1,0,103,87,0,0,36,110,120,138,226,23,7,0,103,23,
+2,0,205,49,38,23,1,0,226,87,9,0,103,87,4,0,
+226,23,11,0,103,23,6,0,127,0,128,7,225,112,0,234,
+36,222,184,138,32,230,104,177,36,214,248,138,165,61,59,87,
+1,0,10,200,249,23,1,0,194,142,224,0,242,29,29,48,
+129,255,116,64,224,81,226,5,29,48,2,58,129,255,166,64,
+181,37,25,48,128,255,112,0,29,48,10,64,32,62,66,0,
+128,255,44,2,10,200,29,48,2,58,129,255,136,64,224,201,
+178,21,25,48,128,255,32,2,245,13,194,126,1,64,15,6,
+255,191,170,13,250,119,1,0,142,118,0,128,106,119,0,0,
+28,48,129,255,188,177,68,218,28,230,32,0,66,210,65,234,
+36,103,218,131,236,233,198,197,64,86,0,0,202,191,36,241,
+64,86,0,0,202,191,38,241,64,86,0,0,202,191,40,241,
+64,6,255,112,38,143,0,0,32,86,9,2,209,134,192,0,
+194,5,32,86,1,2,149,93,38,111,0,0,134,106,217,85,
+134,23,25,0,194,134,1,0,226,45,131,18,153,45,166,23,
+25,0,2,6,240,255,161,13,97,18,242,29,100,18,162,29,
+101,18,146,21,108,18,154,69,229,13,2,6,240,255,210,21,
+2,6,236,255,130,13,2,6,192,255,242,13,2,6,124,255,
+226,5,181,53,4,143,216,131,224,137,242,45,32,86,0,2,
+197,45,32,86,10,2,149,45,32,86,2,2,229,37,32,86,
+8,2,181,37,194,126,112,0,226,21,194,94,112,0,11,6,
+192,255,178,13,11,6,176,255,210,5,11,6,144,255,130,13,
+197,21,32,86,8,2,149,21,32,86,3,2,229,13,32,86,
+6,2,181,13,194,134,128,0,194,5,32,86,4,2,213,5,
+132,18,185,5,32,86,8,2,127,0,128,7,225,0,6,232,
+4,143,216,131,7,224,224,137,194,13,128,255,126,0,29,48,
+128,255,164,0,224,225,210,5,32,54,136,19,128,255,216,0,
+64,6,255,0,128,7,225,48,6,232,191,255,240,250,194,234,
+0,218,32,214,36,17,29,48,128,255,80,0,29,128,194,130,
+36,110,184,138,205,129,48,231,1,0,29,96,193,98,36,142,
+248,138,209,97,236,135,1,0,144,134,224,128,124,135,0,0,
+10,50,124,215,2,0,128,255,142,0,29,112,193,114,36,94,
+248,138,203,113,238,87,1,0,124,87,0,0,65,234,65,218,
+100,218,166,221,64,6,255,48,4,143,216,131,224,137,162,21,
+6,128,194,130,36,110,184,138,205,129,193,50,36,142,248,138,
+209,49,102,7,0,0,48,23,1,0,98,7,0,0,226,23,
+1,0,127,0,4,143,216,131,224,137,194,21,6,128,193,50,
+36,142,248,138,194,130,36,110,184,138,205,129,48,23,1,0,
+209,49,32,134,0,2,102,135,0,0,98,135,0,0,226,23,
+1,0,127,0,33,6,230,1,128,0,97,0,33,6,0,43,
+130,0,97,0,33,6,224,199,129,0,97,0,33,6,74,4,
+129,0,97,0,33,6,80,221,128,0,97,0,128,7,33,0,
+36,55,89,139,128,255,170,7,4,135,156,140,23,146,224,81,
+226,23,0,0,82,129,194,126,1,0,195,122,15,129,68,135,
+156,140,10,112,231,119,66,2,131,114,64,14,136,0,97,119,
+253,17,64,6,63,0,128,7,33,0,38,6,228,138,132,0,
+191,255,156,255,64,54,136,0,38,55,253,17,128,255,16,0,
+64,86,136,0,42,87,253,17,64,6,63,0,128,7,33,0,
+64,142,16,0,241,49,158,13,6,120,191,122,150,122,207,49,
+170,50,37,70,56,128,133,13,6,96,191,98,140,98,204,49,
+180,50,37,70,59,128,6,56,37,54,48,128,191,255,80,255,
+64,6,63,0,64,86,136,0,42,87,253,17,127,0,128,7,
+97,0,61,6,252,17,136,0,191,255,84,255,191,255,138,255,
+125,7,5,0,61,143,1,0,125,143,9,0,125,7,13,0,
+125,7,17,0,125,7,21,0,125,7,25,0,125,7,29,0,
+125,7,33,0,125,7,37,0,125,7,41,0,61,23,1,0,
+224,17,210,29,139,18,64,126,1,0,239,17,177,5,64,22,
+1,0,2,6,255,253,177,5,32,22,0,2,61,111,9,0,
+61,103,5,0,125,23,49,0,172,105,137,106,162,105,125,111,
+45,0,31,130,125,135,245,0,221,135,248,0,64,6,127,0,
+130,7,225,0,61,6,244,138,132,0,60,6,252,17,136,0,
+60,143,29,0,41,6,248,18,136,0,244,143,66,2,99,143,
+1,0,38,6,196,184,255,255,39,6,4,139,132,0,32,70,
+16,0,128,255,100,6,224,81,242,5,29,48,32,62,195,1,
+0,66,191,255,4,246,60,119,37,0,41,6,248,146,138,0,
+244,119,66,2,99,119,1,0,38,6,36,185,255,255,39,6,
+24,139,132,0,32,70,16,0,128,255,46,6,224,81,242,5,
+29,48,32,62,207,1,0,66,191,255,206,245,60,95,33,0,
+41,6,248,82,137,0,244,95,66,2,99,95,1,0,38,6,
+244,184,255,255,39,6,48,139,132,0,32,70,16,0,128,255,
+248,5,224,81,242,5,29,48,32,62,219,1,0,66,191,255,
+152,245,60,135,41,0,41,6,248,166,138,0,244,135,66,2,
+99,135,1,0,38,6,84,185,255,255,39,6,68,139,132,0,
+32,70,16,0,128,255,194,5,224,81,130,13,29,48,32,62,
+231,1,0,66,191,255,98,245,224,81,66,6,255,0,130,7,
+225,16,6,216,196,223,156,140,194,5,31,82,128,7,4,1,
+61,6,252,17,136,0,61,231,245,0,65,226,28,6,240,255,
+198,5,32,86,18,1,213,117,221,199,248,0,178,53,27,6,
+128,255,199,5,32,86,17,1,197,109,31,66,27,6,240,255,
+223,21,3,56,38,6,196,184,255,255,129,255,232,160,224,81,
+194,5,32,86,16,1,213,93,28,16,236,23,64,2,61,86,
+52,0,202,17,32,86,16,0,165,61,3,56,38,6,244,184,
+255,255,129,255,192,160,224,81,194,5,32,86,16,1,149,77,
+28,16,236,23,64,2,61,86,52,0,202,17,32,86,128,0,
+229,37,61,127,45,0,61,135,49,0,207,129,16,118,0,252,
+238,217,195,5,32,86,20,1,197,53,61,111,5,0,61,135,
+9,0,99,111,1,0,27,96,201,98,204,105,125,111,5,0,
+173,129,61,103,49,0,137,130,172,129,125,135,45,0,28,16,
+236,23,64,2,61,86,52,0,202,17,27,80,66,87,5,0,
+35,95,1,0,28,16,236,23,64,2,61,86,52,0,194,81,
+106,95,1,0,61,142,52,0,61,86,52,0,194,81,209,17,
+1,130,98,135,8,0,74,223,4,0,125,231,245,0,11,80,
+66,6,255,16,128,7,33,0,128,255,16,0,128,255,78,1,
+191,255,240,253,64,6,63,0,128,7,97,0,61,6,252,17,
+136,0,61,23,9,0,61,127,5,0,2,112,175,113,61,103,
+49,0,137,114,172,113,125,119,45,0,32,94,0,1,12,80,
+191,82,155,82,12,128,202,129,165,130,16,6,0,255,254,5,
+12,112,191,114,155,114,12,88,206,89,165,90,125,95,37,0,
+11,96,61,111,49,0,196,90,171,105,125,111,49,0,205,98,
+172,17,125,23,21,0,32,94,0,1,13,112,191,114,153,114,
+13,96,206,97,167,98,12,6,0,255,254,5,13,80,191,82,
+153,82,13,88,202,89,167,90,125,95,41,0,61,103,45,0,
+208,90,171,17,125,23,25,0,32,86,0,16,12,104,191,106,
+155,106,12,88,205,89,165,90,11,6,0,240,254,5,12,136,
+191,138,155,138,12,80,209,81,165,82,125,87,29,0,10,120,
+61,95,45,0,196,82,170,89,125,95,45,0,205,122,175,17,
+125,23,13,0,32,86,0,16,11,136,191,138,153,138,11,120,
+209,121,167,122,15,6,0,240,254,5,11,104,191,106,153,106,
+11,80,205,81,167,82,125,87,33,0,208,82,170,17,125,23,
+5,0,125,23,17,0,38,6,108,139,132,0,191,255,160,251,
+61,143,41,0,61,55,37,0,199,138,196,50,209,49,201,50,
+191,255,12,252,38,6,92,139,132,0,191,255,130,251,61,87,
+33,0,61,55,29,0,199,82,196,50,202,49,201,50,191,255,
+238,251,221,7,248,0,64,6,127,0,130,7,97,0,61,6,
+252,17,136,0,61,63,13,0,61,71,29,0,38,6,252,18,
+136,0,99,7,1,0,32,78,16,0,128,255,98,1,61,63,
+17,0,61,71,29,0,38,6,252,82,137,0,99,7,1,0,
+32,78,128,0,128,255,72,1,38,6,252,146,138,0,61,63,
+21,0,61,71,37,0,1,114,99,119,1,0,32,78,16,0,
+128,255,44,1,38,6,252,166,138,0,61,63,25,0,61,71,
+41,0,1,98,99,103,1,0,32,78,128,0,128,255,16,1,
+66,6,127,0,134,7,225,16,6,232,38,6,244,139,132,0,
+7,224,29,56,8,216,0,66,35,78,8,0,128,255,250,1,
+10,48,29,56,35,71,9,0,28,72,31,138,99,143,5,0,
+99,223,1,0,128,255,22,1,70,6,255,16,134,7,225,16,
+6,232,38,6,160,139,132,0,7,224,29,56,8,216,0,66,
+35,78,8,0,128,255,194,1,10,48,29,56,35,71,9,0,
+28,72,99,223,1,0,99,7,5,0,128,255,224,0,70,6,
+255,16,136,7,225,16,6,232,38,6,160,139,132,0,7,224,
+29,56,8,216,1,66,35,78,8,0,128,255,140,1,10,48,
+29,56,35,71,9,0,28,72,35,142,12,0,99,143,1,0,
+99,223,5,0,128,255,166,0,72,6,255,16,0,90,224,73,
+199,45,181,5,38,55,13,0,134,103,5,0,172,57,188,253,
+7,80,128,81,7,16,204,17,38,103,1,0,201,18,204,17,
+170,73,172,5,201,81,104,23,13,0,10,128,201,130,104,135,
+17,0,104,7,5,0,104,7,1,0,104,23,9,0,38,55,
+13,0,8,70,20,0,65,90,224,49,210,5,38,23,1,0,
+134,87,5,0,224,73,223,229,11,80,127,0,35,103,1,0,
+6,80,0,90,133,29,10,16,98,63,1,0,66,79,4,0,
+66,7,5,0,98,7,9,0,98,7,13,0,97,98,186,5,
+194,7,6,0,194,15,6,0,10,86,20,0,9,136,201,138,
+209,57,65,90,232,89,134,237,127,0,130,7,225,243,9,224,
+35,191,41,0,35,183,45,0,0,234,7,200,25,216,6,192,
+56,215,5,0,97,66,186,21,56,55,1,0,22,64,3,56,
+129,255,226,156,224,81,218,61,35,143,1,0,26,232,119,143,
+1,0,81,207,5,0,124,143,1,0,181,53,124,7,1,0,
+0,202,56,55,1,0,22,64,3,56,129,255,184,156,60,127,
+1,0,224,81,194,13,15,16,224,17,210,5,2,48,1,58,
+128,255,194,0,124,7,1,0,0,234,181,29,35,23,1,0,
+218,233,224,121,186,5,124,23,1,0,119,23,1,0,251,209,
+98,7,13,0,98,207,9,0,251,215,60,83,66,87,5,0,
+224,201,178,5,121,23,13,0,2,200,186,217,224,217,175,213,
+224,233,242,13,60,23,1,0,162,23,5,0,224,17,154,13,
+29,64,38,6,128,139,132,0,32,62,188,4,191,255,106,240,
+29,80,66,6,255,243,7,6,240,255,135,13,6,54,28,0,
+7,6,128,255,183,5,6,54,28,0,97,66,202,5,38,103,
+5,0,181,5,38,103,1,0,0,18,2,136,194,138,38,118,
+8,0,206,137,49,95,1,0,43,111,5,0,7,86,255,255,
+237,87,192,2,10,110,1,0,43,87,1,0,42,87,9,0,
+234,105,195,5,65,18,236,17,150,237,105,111,1,0,11,80,
+127,0,128,7,225,16,7,224,188,0,6,232,61,223,13,0,
+29,23,6,0,125,7,13,0,29,146,82,17,220,86,1,0,
+193,82,10,17,93,23,6,0,29,48,129,255,154,156,224,81,
+146,13,29,64,38,6,144,139,132,0,32,62,79,5,191,255,
+200,239,27,232,224,233,186,229,64,6,255,16,34,6,33,6,
+84,195,129,0,97,0,33,6,148,14,130,0,97,0,128,7,
+97,0,6,232,38,6,188,140,132,0,191,255,18,248,29,63,
+2,0,38,6,176,140,132,0,221,58,159,58,191,255,0,248,
+29,135,2,0,37,54,64,128,208,62,1,0,191,255,240,247,
+61,54,40,4,129,255,58,148,64,6,127,0,128,7,33,0,
+5,138,68,143,24,139,32,134,244,1,100,135,29,139,68,7,
+32,139,128,255,138,30,128,255,128,12,129,255,242,147,128,255,
+150,10,128,255,220,214,64,6,63,0,130,7,97,0,31,82,
+6,232,125,87,9,0,125,87,13,0,125,7,17,0,93,7,
+20,0,93,7,21,0,93,7,22,0,93,7,23,0,32,134,
+1,3,93,7,4,0,125,135,0,0,221,199,3,0,234,5,
+32,126,1,3,125,127,2,0,213,5,35,54,3,0,128,255,
+244,11,61,54,24,0,128,255,12,12,61,54,48,4,0,58,
+128,255,170,216,61,54,100,4,129,255,20,66,66,6,127,0,
+128,7,33,0,38,55,41,4,224,49,178,5,129,255,172,138,
+64,6,63,0,128,7,225,0,7,224,60,71,1,0,60,79,
+5,0,8,112,143,114,9,16,209,18,14,17,32,142,104,176,
+113,23,1,0,49,142,220,255,113,71,1,0,113,79,5,0,
+1,114,32,142,76,176,60,111,5,0,60,103,1,0,252,135,
+9,0,16,80,204,81,225,127,0,0,205,121,174,81,225,63,
+0,0,167,121,113,87,1,0,113,127,5,0,72,138,113,135,
+0,0,6,232,61,95,13,0,61,87,9,0,235,73,218,5,
+234,65,186,5,192,39,128,176,32,142,76,176,49,103,1,0,
+49,111,5,0,12,86,1,0,125,87,9,0,225,135,0,0,
+205,129,125,135,13,0,88,138,49,23,1,0,252,111,9,0,
+194,118,127,0,2,120,135,122,96,127,133,176,13,102,255,255,
+204,113,135,114,207,113,32,142,136,176,113,119,1,0,221,215,
+2,0,162,13,29,48,28,56,128,255,214,6,224,81,194,5,
+0,82,128,7,172,1,221,199,2,0,202,5,220,223,11,0,
+194,5,1,82,128,7,154,1,29,23,20,0,224,17,250,61,
+0,18,60,87,1,0,61,111,13,0,60,95,5,0,61,103,
+9,0,237,89,170,21,236,81,138,21,189,111,23,0,65,106,
+93,111,23,0,205,102,255,0,106,98,227,5,3,90,93,95,
+20,0,93,7,23,0,1,18,224,17,154,29,32,142,104,176,
+49,135,1,0,61,87,17,0,234,129,154,21,157,127,23,0,
+65,122,93,127,22,0,207,118,255,0,99,114,131,13,1,106,
+93,111,20,0,93,7,22,0,93,7,21,0,32,142,104,176,
+49,103,1,0,125,103,17,0,128,7,16,1,97,18,170,53,
+32,142,104,176,61,87,17,0,49,23,1,0,234,17,234,5,
+29,48,28,56,128,255,254,0,133,125,125,23,17,0,32,142,
+104,176,49,63,1,0,61,54,24,0,128,255,134,10,224,81,
+130,13,29,48,28,56,128,255,220,0,93,7,21,0,213,101,
+2,130,93,135,20,0,189,127,21,0,65,122,93,127,21,0,
+207,118,255,0,106,114,147,93,93,7,20,0,93,7,22,0,
+197,85,98,18,170,85,32,142,104,176,61,103,17,0,49,63,
+1,0,236,57,234,29,157,95,23,0,65,90,93,95,22,0,
+203,86,255,0,99,82,147,13,1,18,93,23,20,0,93,7,
+22,0,93,7,21,0,165,5,0,18,224,17,226,53,61,54,
+24,0,128,255,84,10,29,48,28,56,128,255,104,0,213,45,
+61,54,24,0,128,255,252,9,224,81,178,13,29,48,28,56,
+128,255,82,0,93,7,21,0,1,122,93,127,20,0,213,29,
+189,119,21,0,65,114,93,119,21,0,206,110,255,0,106,106,
+243,5,93,7,20,0,93,7,22,0,1,18,165,5,0,18,
+224,17,210,5,61,54,24,0,128,255,254,9,32,142,104,176,
+49,103,1,0,125,103,17,0,220,7,66,0,1,82,64,6,
+255,0,128,7,225,0,6,232,7,224,61,54,24,0,128,255,
+92,15,224,81,178,5,1,82,229,37,61,54,24,0,28,56,
+128,255,238,9,224,81,162,29,61,54,24,0,32,150,108,176,
+50,63,1,0,0,66,128,255,194,10,29,48,28,56,32,150,
+124,176,242,143,1,0,224,137,202,5,128,255,216,1,165,13,
+128,255,24,0,220,39,66,0,213,5,29,48,28,56,128,255,
+196,1,0,82,64,6,255,0,136,7,225,48,6,208,32,142,
+112,176,49,231,1,0,7,232,60,231,1,0,0,18,76,138,
+241,135,1,0,98,130,186,13,32,142,116,176,49,23,1,0,
+34,23,1,0,2,23,42,0,194,22,1,0,2,216,229,87,
+64,0,224,7,96,1,10,248,220,199,42,0,178,5,128,7,
+92,1,224,217,178,5,128,7,84,1,255,47,32,0,28,48,
+253,63,9,0,35,70,8,0,35,78,12,0,128,255,8,27,
+35,23,9,0,192,7,128,176,224,17,182,21,35,111,13,0,
+224,105,255,13,221,63,65,0,125,231,21,0,253,103,9,0,
+125,103,24,0,125,23,26,0,125,7,36,0,128,7,34,1,
+221,55,65,0,224,17,198,13,253,95,9,0,35,135,13,0,
+125,231,21,0,176,89,125,95,24,0,125,23,26,0,224,17,
+246,5,32,142,124,176,241,127,1,0,98,122,154,45,32,142,
+124,176,241,119,1,0,98,114,138,21,32,142,116,176,49,231,
+1,0,253,63,9,0,60,231,1,0,35,70,8,0,28,48,
+35,78,12,0,128,255,128,26,125,231,45,0,253,103,9,0,
+35,87,13,0,12,88,170,89,125,95,48,0,125,7,50,0,
+203,0,171,97,253,111,25,0,173,97,99,103,13,0,35,95,
+13,0,224,89,202,5,125,7,36,0,165,77,61,231,57,0,
+129,255,158,17,10,16,98,231,9,0,32,86,16,0,98,87,
+2,0,48,6,88,69,1,0,98,135,5,0,1,122,98,127,
+0,0,96,23,157,176,98,239,29,0,35,119,13,0,61,111,
+5,0,253,71,25,0,61,103,1,0,221,39,66,0,204,65,
+225,79,0,0,32,142,108,176,49,63,1,0,205,73,99,119,
+1,0,76,138,49,111,1,0,99,111,5,0,58,54,24,0,
+128,255,164,15,35,103,13,0,125,87,33,0,202,7,42,0,
+125,103,36,0,125,7,38,0,181,13,255,47,32,0,38,6,
+208,140,132,0,32,62,49,3,1,66,191,255,44,234,72,6,
+255,48,134,7,225,16,6,224,7,232,61,223,57,0,129,255,
+0,17,106,223,9,0,32,134,16,0,106,135,2,0,47,6,
+88,69,1,0,106,127,5,0,1,114,106,119,0,0,96,87,
+157,176,106,239,29,0,99,7,9,0,221,39,66,0,32,150,
+128,176,210,207,0,0,194,13,35,54,8,0,128,255,194,18,
+35,63,9,0,60,54,24,0,128,255,210,6,213,21,32,142,
+108,176,49,111,1,0,128,103,127,176,99,111,9,0,224,97,
+186,13,45,54,12,0,32,62,60,176,128,255,184,6,32,142,
+120,176,113,87,1,0,35,87,9,0,224,81,154,13,38,6,
+224,140,132,0,32,62,108,3,0,66,191,255,140,233,32,142,
+68,176,49,79,5,0,49,71,1,0,253,135,9,0,99,135,
+1,0,49,142,52,0,49,127,1,0,35,63,9,0,99,127,
+5,0,60,54,24,0,128,255,174,14,125,87,33,0,202,7,
+42,0,0,82,70,6,255,16,128,7,97,0,6,232,221,199,
+2,0,138,21,61,54,24,0,128,255,6,7,224,81,162,13,
+61,54,24,0,32,150,108,176,50,63,1,0,1,66,128,255,
+218,7,64,6,127,0,128,7,225,16,7,232,61,71,1,0,
+61,79,5,0,8,112,143,114,9,16,209,18,14,17,32,142,
+104,176,113,23,1,0,6,224,49,142,220,255,113,79,5,0,
+113,71,1,0,1,114,61,111,5,0,253,63,9,0,61,103,
+1,0,7,80,204,81,225,127,0,0,205,121,174,81,225,55,
+0,0,166,121,32,142,76,176,113,87,1,0,113,127,5,0,
+72,138,113,63,0,0,0,130,60,95,13,0,60,87,9,0,
+235,73,234,5,234,65,202,5,192,39,128,176,1,130,32,142,
+76,176,49,103,1,0,49,111,5,0,12,86,1,0,124,87,
+9,0,225,79,0,0,9,16,205,17,124,23,13,0,88,138,
+49,23,1,0,253,111,9,0,194,118,127,0,2,120,135,122,
+96,127,133,176,13,102,255,255,204,113,135,114,207,113,32,142,
+136,176,113,119,1,0,16,216,28,48,29,56,191,255,12,255,
+28,48,29,56,220,215,2,0,154,13,128,255,208,0,221,39,
+66,0,221,31,11,0,0,82,245,93,128,255,20,1,224,81,
+178,5,0,82,149,93,221,7,66,0,29,56,221,223,11,0,
+130,13,28,48,128,255,166,0,221,39,66,0,0,82,197,77,
+60,55,41,4,27,64,129,255,182,133,224,81,170,69,28,48,
+29,56,128,255,136,0,60,54,24,0,29,56,128,255,64,12,
+224,81,210,53,220,239,3,0,242,21,60,54,48,4,128,255,
+244,211,60,119,117,4,29,48,238,81,131,13,128,255,206,35,
+61,55,61,0,1,58,129,255,136,82,60,54,48,4,29,56,
+128,255,204,209,197,21,60,111,117,4,60,23,108,4,29,48,
+237,17,131,13,128,255,166,35,61,55,61,0,1,58,129,255,
+96,82,60,54,100,4,29,56,129,255,226,58,61,23,57,0,
+44,6,2,59,1,0,98,103,5,0,181,5,0,82,197,5,
+221,39,66,0,1,82,64,6,255,16,128,7,225,0,32,142,
+68,176,7,232,49,63,5,0,49,55,1,0,253,71,9,0,
+128,255,68,23,10,224,224,225,250,21,29,48,128,255,78,35,
+61,55,61,0,1,58,129,255,8,82,197,13,32,142,68,176,
+49,63,5,0,49,55,1,0,253,71,9,0,128,255,24,23,
+10,224,224,225,194,245,125,231,33,0,64,6,255,0,128,7,
+225,0,6,232,61,54,24,0,7,224,128,255,108,10,224,81,
+138,13,61,55,41,4,28,56,129,255,28,133,224,81,242,5,
+32,142,144,176,209,39,0,0,1,82,165,5,0,82,64,6,
+255,0,128,7,97,0,6,232,167,0,221,215,2,0,146,45,
+97,58,129,37,178,29,99,58,177,5,242,5,165,37,61,55,
+41,4,129,255,36,138,213,29,61,55,41,4,129,255,26,138,
+36,119,29,139,61,111,113,4,36,103,45,175,205,113,238,97,
+131,21,29,48,128,255,32,0,197,13,29,48,128,255,24,0,
+133,13,61,55,41,4,129,255,240,137,29,48,128,255,8,0,
+64,6,127,0,132,7,225,243,6,224,60,54,24,0,128,255,
+6,2,10,208,224,209,162,253,1,130,99,135,1,0,31,50,
+128,255,126,47,36,151,45,175,0,186,99,151,5,0,0,218,
+220,239,3,0,234,199,0,0,224,193,178,13,224,217,178,5,
+27,232,197,21,60,54,48,4,128,255,188,209,10,232,229,13,
+60,119,108,4,224,113,146,13,60,239,101,4,60,54,100,4,
+29,56,129,255,218,57,165,5,0,234,224,233,186,5,128,7,
+74,1,221,215,66,0,130,29,61,255,33,0,63,255,40,0,
+128,249,229,87,64,0,224,7,96,1,36,103,65,139,10,200,
+223,97,100,103,65,139,249,47,32,0,60,54,24,0,29,56,
+128,255,162,9,165,205,1,186,224,193,226,69,0,202,60,54,
+48,4,128,255,82,209,10,216,224,217,194,61,219,215,66,0,
+146,29,61,255,33,0,63,255,40,0,1,202,128,249,229,87,
+64,0,224,7,96,1,36,135,65,139,10,176,223,129,100,135,
+65,139,246,47,32,0,60,54,24,0,27,56,128,255,86,9,
+149,37,61,103,1,0,61,111,5,0,253,87,9,0,204,81,
+225,135,0,0,205,129,59,111,5,0,59,103,1,0,240,105,
+154,21,234,97,250,13,60,54,24,0,29,56,27,64,128,255,
+188,12,253,127,9,0,15,6,0,240,233,207,0,0,169,5,
+0,218,224,201,202,189,26,48,29,56,128,255,56,1,129,255,
+64,12,10,16,98,7,9,0,32,102,232,3,98,103,21,0,
+1,90,98,95,0,0,32,86,16,0,98,87,2,0,48,6,
+208,68,1,0,98,135,5,0,98,239,29,0,98,215,25,0,
+61,183,33,0,54,255,40,0,125,23,57,0,128,249,229,87,
+64,0,224,7,96,1,36,119,65,139,10,200,223,113,100,119,
+65,139,249,47,32,0,253,87,37,0,10,16,54,103,26,0,
+226,0,226,97,186,253,29,48,61,63,57,0,0,66,0,74,
+128,255,58,27,191,7,132,254,26,48,224,185,130,13,35,151,
+5,0,124,151,113,4,128,255,62,1,181,5,128,255,130,0,
+35,135,1,0,224,129,210,5,99,7,1,0,128,255,170,45,
+68,6,255,243,0,18,226,134,24,0,42,6,28,187,138,0,
+202,129,10,118,24,0,2,104,248,111,64,2,206,105,112,111,
+5,0,65,18,2,6,209,255,246,237,106,7,109,4,100,87,
+37,139,127,0,128,7,225,16,6,216,229,87,64,0,224,7,
+96,1,36,239,37,139,10,224,224,233,210,13,61,54,8,0,
+129,255,156,55,125,223,1,0,61,143,5,0,125,7,22,0,
+100,143,37,139,252,47,32,0,29,80,64,6,255,16,128,7,
+193,0,6,224,229,87,64,0,224,7,96,1,36,143,37,139,
+10,232,124,143,5,0,100,231,37,139,253,47,32,0,64,6,
+223,0,128,7,225,0,6,232,7,248,229,87,64,0,224,7,
+96,1,10,224,61,54,8,0,31,56,129,255,80,55,61,143,
+20,0,65,138,125,143,20,0,252,47,32,0,64,6,255,0,
+128,7,97,0,6,248,229,87,64,0,224,7,96,1,63,143,
+20,0,95,138,127,143,20,0,10,232,241,0,224,137,138,13,
+63,127,22,0,224,121,194,5,31,48,128,255,12,0,253,47,
+32,0,64,6,127,0,130,7,33,0,99,55,1,0,3,56,
+32,54,104,180,0,66,128,255,196,0,224,81,162,13,38,6,
+240,140,132,0,32,62,166,6,0,66,191,255,156,227,224,81,
+66,6,63,0,128,7,97,0,6,248,229,87,64,0,224,7,
+96,1,10,232,1,138,63,135,20,0,127,143,22,0,224,129,
+202,5,31,48,191,255,178,255,253,47,32,0,64,6,127,0,
+128,7,225,0,6,232,61,143,20,0,224,137,226,13,38,6,
+0,141,132,0,32,62,232,6,0,66,191,255,76,227,213,5,
+61,55,1,0,128,255,238,6,61,135,16,0,224,129,146,13,
+61,231,9,0,61,54,8,0,28,56,129,255,210,54,165,5,
+0,226,28,56,224,57,218,237,29,48,191,255,212,254,64,6,
+255,0,128,7,134,135,166,135,128,7,33,6,32,37,130,0,
+97,0,33,6,84,13,128,0,97,0,33,6,102,15,128,0,
+97,0,33,6,200,18,128,0,97,0,33,6,182,6,130,0,
+97,0,102,7,1,0,102,7,5,0,8,138,102,143,10,0,
+102,7,8,0,127,0,128,7,33,0,50,6,40,18,136,0,
+50,143,1,0,100,7,61,139,100,143,69,139,100,7,65,139,
+128,255,62,11,128,255,66,13,128,255,172,17,64,6,63,0,
+128,7,225,16,6,224,60,143,8,0,7,216,224,137,146,29,
+60,239,1,0,61,135,1,0,240,217,186,5,1,82,165,21,
+61,239,17,0,224,233,154,13,38,6,48,141,132,0,32,62,
+209,0,0,66,191,255,114,226,60,127,5,0,239,233,186,237,
+0,82,64,6,255,16,130,7,97,0,6,232,99,7,1,0,
+149,13,29,48,3,56,128,255,62,17,35,55,1,0,128,255,
+232,11,61,143,8,0,224,137,218,245,66,6,127,0,128,7,
+97,0,192,15,128,176,32,142,108,176,113,7,1,0,49,142,
+16,0,113,7,0,0,32,142,120,176,113,7,1,0,88,138,
+113,7,1,0,32,142,116,176,113,7,1,0,38,135,8,0,
+64,7,126,176,224,129,226,85,199,199,66,0,186,85,38,239,
+1,0,32,142,104,176,49,119,1,0,61,127,1,0,239,113,
+186,69,253,111,25,0,224,105,154,13,38,6,64,141,132,0,
+32,62,47,1,0,66,191,255,208,225,192,143,128,176,32,142,
+108,176,113,239,1,0,61,23,13,0,49,142,224,255,34,23,
+1,0,49,87,1,0,34,111,13,0,49,95,5,0,34,103,
+9,0,237,89,241,29,187,5,236,81,193,29,32,142,68,176,
+49,87,1,0,61,111,9,0,49,95,5,0,61,103,5,0,
+237,89,139,21,177,5,236,81,219,13,61,54,12,0,32,62,
+60,176,128,255,162,16,224,81,178,5,1,82,197,13,0,82,
+165,13,0,82,133,13,38,103,1,0,61,239,17,0,236,233,
+154,181,0,82,64,6,127,0,132,7,225,243,6,184,7,176,
+32,142,112,176,136,0,8,128,49,71,1,0,224,129,242,5,
+32,78,124,176,128,255,38,4,128,7,30,4,32,142,68,176,
+40,23,1,0,49,87,1,0,34,111,13,0,49,95,5,0,
+34,103,9,0,237,89,171,53,177,5,236,81,249,45,32,142,
+116,176,49,23,1,0,224,17,170,5,8,16,32,142,76,176,
+49,55,1,0,34,23,1,0,49,63,5,0,34,111,13,0,
+34,87,24,0,34,103,9,0,10,120,191,122,204,81,225,135,
+0,0,208,121,205,121,1,114,174,81,225,135,0,0,176,121,
+239,57,193,13,187,5,234,49,147,13,23,48,22,56,32,78,
+124,176,128,255,168,3,128,7,160,3,32,142,124,176,241,127,
+1,0,97,122,186,5,128,7,144,3,58,6,32,141,132,0,
+0,218,0,194,128,7,80,1,32,142,112,176,49,239,1,0,
+224,233,154,13,38,6,16,141,132,0,32,62,147,3,0,66,
+191,255,118,224,99,7,1,0,61,23,9,0,0,74,253,17,
+130,117,2,200,61,23,1,0,99,207,1,0,194,199,42,0,
+138,109,57,135,1,0,208,199,42,0,186,101,34,111,13,0,
+34,87,24,0,34,103,9,0,10,120,191,122,204,81,225,71,
+0,0,200,121,205,121,48,111,13,0,48,103,9,0,237,121,
+138,85,236,81,234,77,224,233,250,5,26,48,32,62,201,4,
+0,66,191,255,20,224,61,239,1,0,57,231,1,0,61,151,
+37,0,224,233,99,151,5,0,250,5,26,48,32,62,207,4,
+0,66,191,255,244,223,35,151,5,0,224,145,250,5,26,48,
+32,62,208,4,0,66,191,255,224,223,61,111,24,0,60,119,
+24,0,60,135,29,0,206,105,61,87,33,0,125,111,24,0,
+106,135,13,0,60,103,26,0,61,119,33,0,60,127,29,0,
+61,95,26,0,111,119,9,0,204,89,60,111,33,0,125,95,
+26,0,125,111,33,0,29,48,128,255,204,16,220,143,42,0,
+124,7,37,0,35,55,5,0,25,56,128,255,70,6,1,74,
+137,0,224,73,226,21,32,142,124,176,241,87,1,0,95,82,
+113,87,0,0,88,138,49,135,1,0,35,127,1,0,240,121,
+170,21,1,194,1,218,32,142,116,176,113,7,1,0,181,13,
+35,111,1,0,32,142,116,176,49,119,1,0,1,194,238,105,
+170,5,1,218,224,193,186,5,191,7,176,254,32,142,116,176,
+49,239,1,0,128,7,30,1,61,239,5,0,224,233,154,13,
+38,6,16,141,132,0,32,62,147,3,0,66,191,255,26,223,
+99,7,1,0,61,23,9,0,0,74,253,17,178,109,2,200,
+61,23,1,0,99,207,1,0,194,199,42,0,186,101,57,135,
+1,0,208,199,42,0,234,93,34,111,13,0,34,87,24,0,
 34,103,9,0,10,120,191,122,204,81,225,71,0,0,200,121,
-205,121,48,111,13,0,48,103,9,0,237,121,138,85,236,81,
-234,77,224,233,250,5,26,48,32,62,201,4,0,66,191,255,
-28,224,61,239,1,0,57,231,1,0,61,151,37,0,224,233,
-99,151,5,0,250,5,26,48,32,62,207,4,0,66,191,255,
-252,223,35,151,5,0,224,145,250,5,26,48,32,62,208,4,
-0,66,191,255,232,223,61,111,24,0,60,119,24,0,60,135,
-29,0,206,105,61,87,33,0,125,111,24,0,106,135,13,0,
-60,103,26,0,61,119,33,0,60,127,29,0,61,95,26,0,
-111,119,9,0,204,89,60,111,33,0,125,95,26,0,125,111,
-33,0,29,48,128,255,204,16,220,143,42,0,124,7,37,0,
-35,55,5,0,25,56,128,255,70,6,1,74,137,0,224,73,
-226,21,32,142,124,176,241,87,1,0,95,82,113,87,0,0,
-88,138,49,135,1,0,35,127,1,0,240,121,170,21,1,194,
-1,218,32,142,116,176,113,7,1,0,181,13,35,111,1,0,
-32,142,116,176,49,119,1,0,1,194,238,105,170,5,1,218,
-224,193,186,5,191,7,176,254,32,142,116,176,49,239,1,0,
-128,7,30,1,61,239,5,0,224,233,154,13,38,6,48,130,
-132,0,32,62,147,3,0,66,191,255,34,223,99,7,1,0,
-61,23,9,0,0,74,253,17,178,109,2,200,61,23,1,0,
-99,207,1,0,194,199,42,0,186,101,57,135,1,0,208,199,
-42,0,234,93,34,111,13,0,34,87,24,0,34,103,9,0,
-10,120,191,122,204,81,225,71,0,0,200,121,205,121,48,111,
-13,0,48,103,9,0,237,121,186,77,236,81,154,77,224,233,
-250,5,26,48,32,62,201,4,0,66,191,255,192,222,61,231,
-1,0,57,223,1,0,60,199,37,0,224,225,250,5,26,48,
-32,62,207,4,0,66,191,255,164,222,224,193,250,5,26,48,
-32,62,208,4,0,66,191,255,148,222,60,87,24,0,59,95,
-24,0,59,111,29,0,203,81,60,119,33,0,124,87,24,0,
-110,111,13,0,59,135,26,0,60,95,33,0,59,103,29,0,
-60,127,26,0,108,95,9,0,208,121,59,87,33,0,124,127,
-26,0,124,87,33,0,28,48,128,255,120,15,219,143,42,0,
-123,7,37,0,24,48,25,56,128,255,244,4,1,74,137,0,
-224,73,210,13,32,142,124,176,241,119,1,0,95,114,113,119,
-0,0,1,218,88,138,113,239,1,0,165,5,1,218,224,217,
-186,5,191,7,226,254,32,142,124,176,241,231,1,0,84,138,
-49,239,1,0,165,85,61,23,1,0,61,223,9,0,34,87,
-9,0,32,142,68,176,49,111,5,0,34,95,13,0,49,103,
-1,0,235,105,139,69,177,5,234,97,217,61,32,142,76,176,
-49,71,1,0,10,96,34,87,24,0,49,79,5,0,10,120,
-191,122,204,81,225,135,0,0,208,121,203,121,1,114,174,81,
-225,135,0,0,176,121,239,73,225,37,187,5,234,65,179,37,
-23,48,22,56,29,64,128,255,16,4,32,142,124,176,241,103,
-1,0,95,98,113,103,0,0,84,138,49,95,1,0,235,233,
-138,13,32,142,116,176,49,87,1,0,92,138,113,87,1,0,
-32,142,116,176,49,239,1,0,224,233,210,5,32,142,116,176,
-113,7,1,0,95,226,27,232,224,225,234,173,32,142,112,176,
-49,135,1,0,224,129,250,13,32,142,116,176,49,127,1,0,
-224,121,154,13,38,6,112,130,132,0,32,62,43,2,0,66,
-191,255,58,221,32,142,124,176,241,119,1,0,224,113,170,13,
-38,6,112,130,132,0,32,62,48,2,0,66,191,255,30,221,
-224,81,68,6,255,243,128,7,225,48,6,216,7,208,9,232,
-213,13,40,231,9,0,27,48,26,56,128,255,108,3,253,143,
-1,0,95,138,125,143,0,0,28,64,253,135,1,0,224,129,
-154,245,64,6,255,48,32,142,76,176,49,103,1,0,49,111,
-5,0,143,98,13,80,209,82,10,97,143,106,49,142,28,0,
-49,119,1,0,234,87,0,0,238,97,234,23,0,0,2,81,
-127,0,128,7,225,48,6,208,32,231,133,176,7,216,219,199,
-66,0,186,37,28,136,32,134,1,1,240,143,194,234,245,21,
-32,150,140,176,114,239,1,0,29,48,194,50,58,102,12,0,
-204,49,27,56,128,255,118,9,224,81,178,5,1,82,229,13,
-65,226,65,234,29,6,255,254,170,5,0,234,32,150,136,176,
-50,95,1,0,235,225,211,229,0,82,64,6,255,48,128,7,
-225,240,6,192,7,208,218,215,66,0,154,13,38,6,128,130,
-132,0,32,62,200,2,0,66,191,255,66,220,58,239,33,0,
-1,58,253,135,43,0,208,134,244,255,125,135,42,0,29,48,
-128,255,198,12,29,48,128,255,218,12,58,23,1,0,250,127,
-9,0,194,230,127,0,15,118,255,255,206,225,135,226,2,232,
-135,234,221,225,29,104,32,102,1,1,236,111,194,218,229,87,
-64,0,224,7,96,1,10,200,245,13,27,48,194,50,56,126,
-12,0,207,49,26,56,128,255,26,8,65,234,65,218,27,6,
-255,254,170,5,0,218,252,233,147,245,249,47,32,0,26,48,
-129,255,224,45,64,6,255,240,128,7,225,48,7,232,61,231,
-33,0,6,208,60,231,40,0,229,87,64,0,224,7,96,1,
-36,143,53,139,10,248,220,137,100,143,53,139,255,47,32,0,
-36,127,49,139,36,135,57,139,36,87,53,139,175,129,16,104,
-191,106,159,106,205,129,161,130,240,81,151,13,29,48,128,255,
-104,23,61,55,61,0,1,58,129,255,0,68,29,48,0,58,
-128,255,66,6,133,13,29,48,128,255,78,23,29,48,0,58,
-128,255,50,6,10,16,224,17,242,245,2,248,229,87,64,0,
-224,7,96,1,32,150,140,176,50,55,1,0,10,224,194,50,
-58,110,12,0,205,49,31,56,128,255,4,7,252,47,32,0,
-32,231,133,176,213,45,28,88,32,86,1,1,234,95,194,98,
-32,150,140,176,114,103,1,0,29,48,0,58,128,255,230,5,
-133,13,29,48,128,255,242,22,29,48,0,58,128,255,214,5,
-10,16,224,17,242,245,2,248,229,87,64,0,224,7,96,1,
-32,150,140,176,50,55,1,0,10,216,194,50,58,110,12,0,
-205,49,31,56,128,255,168,6,251,47,32,0,65,226,32,150,
-136,176,50,103,1,0,236,225,241,205,1,82,64,6,255,48,
-128,7,225,48,35,215,25,0,7,224,9,56,6,216,35,23,
-21,0,8,48,2,64,128,255,122,10,10,232,224,233,146,13,
-125,231,37,0,27,48,28,56,29,64,26,72,128,255,10,0,
-29,80,64,6,255,48,128,7,225,112,9,200,8,48,38,79,
-13,0,38,231,24,0,38,71,9,0,28,232,191,234,200,225,
-225,111,0,0,205,233,201,233,7,216,1,58,167,225,225,87,
-0,0,170,233,128,255,84,9,10,208,224,201,186,29,59,135,
-13,0,224,129,250,21,251,127,25,0,224,121,146,13,38,6,
-144,130,132,0,32,62,1,4,0,66,191,255,48,218,123,231,
-5,0,123,239,9,0,59,54,12,0,26,56,128,255,44,9,
-197,21,59,95,9,0,59,87,5,0,235,233,129,13,187,5,
-234,225,211,5,123,231,5,0,123,239,9,0,59,54,12,0,
-26,56,25,64,128,255,252,8,251,119,25,0,65,114,251,111,
-27,0,65,106,123,111,26,0,123,119,24,0,64,6,255,112,
-128,7,225,0,6,224,60,239,37,0,253,143,25,0,224,137,
-154,13,38,6,160,130,132,0,32,62,53,4,0,66,191,255,
-188,217,61,54,12,0,28,56,128,255,208,8,10,56,253,135,
-25,0,29,48,97,130,195,5,128,255,208,3,181,5,128,255,
-52,3,64,6,255,0,128,7,225,16,6,224,7,232,8,216,
-253,143,25,0,224,137,154,13,38,6,176,130,132,0,32,62,
-92,4,0,66,191,255,118,217,253,135,25,0,97,130,227,5,
-29,48,27,56,128,255,148,3,133,13,28,48,29,56,128,255,
-74,8,29,48,128,255,238,2,64,6,255,16,128,7,225,0,
-6,232,7,224,224,225,178,5,224,233,154,13,38,6,192,130,
-132,0,32,62,136,4,0,66,191,255,50,217,61,54,12,0,
-28,56,128,255,62,8,253,135,25,0,97,130,234,5,125,7,
-5,0,125,7,9,0,133,37,61,87,13,0,0,18,224,81,
-178,5,42,23,5,0,34,23,1,0,1,114,34,103,9,0,
-34,87,24,0,34,111,13,0,10,120,191,122,204,81,225,135,
-0,0,208,121,205,121,174,81,125,87,5,0,225,135,0,0,
-176,121,125,127,9,0,253,127,25,0,95,122,125,127,24,0,
-64,6,255,0,128,7,128,7,225,243,6,176,8,232,253,135,
-9,0,7,200,249,119,9,0,208,113,121,119,8,0,57,255,
-33,0,61,231,33,0,229,87,64,0,224,7,96,1,10,216,
-60,87,24,0,63,103,17,0,10,120,63,111,21,0,191,122,
-10,112,204,113,225,79,0,0,201,121,205,121,63,103,24,0,
-127,127,21,0,202,97,127,119,17,0,127,103,24,0,60,111,
-29,0,60,95,26,0,63,119,33,0,63,87,26,0,110,111,
-13,0,203,81,127,87,26,0,60,103,29,0,60,135,40,0,
-63,95,33,0,63,127,40,0,108,95,9,0,208,121,60,87,
-33,0,127,127,40,0,127,87,33,0,251,47,32,0,253,135,
-37,0,249,119,37,0,208,113,61,231,33,0,121,119,36,0,
-28,48,252,111,43,0,205,110,244,255,124,111,42,0,0,58,
-128,255,166,8,28,48,128,255,186,8,61,63,5,0,61,55,
-1,0,1,66,6,192,168,193,225,87,0,0,135,194,198,222,
-127,0,253,127,9,0,15,118,255,255,206,217,135,218,6,224,
-135,226,220,217,28,104,32,102,1,1,236,111,194,210,229,87,
-64,0,224,7,96,1,10,184,133,29,26,48,194,50,29,56,
-248,225,131,13,54,126,12,0,207,49,25,64,128,255,16,4,
-229,5,54,94,12,0,203,49,128,255,216,3,65,226,65,210,
-26,6,255,254,170,5,0,210,251,225,131,237,247,47,32,0,
-29,48,129,255,158,41,64,6,255,243,32,134,128,0,100,135,
-37,139,100,7,41,139,43,6,60,20,139,0,11,16,100,23,
-45,139,0,82,181,29,31,122,98,127,1,0,98,7,5,0,
-98,7,9,0,98,7,13,0,98,7,24,0,98,7,26,0,
-66,87,28,0,10,6,129,255,130,13,2,22,32,0,107,7,
-21,0,107,23,17,0,2,88,65,82,10,6,128,255,198,229,
-107,7,17,0,107,7,21,0,127,0,128,7,97,0,6,232,
-229,87,64,0,224,7,96,1,10,248,149,13,229,87,64,0,
-224,135,96,1,229,87,64,0,224,7,96,1,36,127,41,139,
-36,135,37,139,240,121,178,245,36,23,45,139,125,23,1,0,
-15,110,1,0,34,119,17,0,100,111,41,139,100,119,45,139,
-255,47,32,0,36,63,41,139,97,58,231,13,38,6,224,130,
-132,0,191,255,62,223,38,6,208,130,132,0,32,62,174,5,
-1,66,191,255,184,214,61,95,1,0,235,95,25,0,224,89,
-146,13,38,6,208,130,132,0,32,62,178,5,0,66,191,255,
-156,214,32,142,104,176,49,87,1,0,61,23,1,0,98,87,
-1,0,34,86,12,0,106,7,1,0,98,7,24,0,98,7,
-9,0,98,7,5,0,98,7,26,0,36,87,41,139,64,6,
-127,0,128,7,225,0,6,232,60,6,40,131,132,0,253,143,
-27,0,224,137,242,5,28,48,32,62,216,5,0,66,191,255,
-76,214,253,135,25,0,97,130,217,13,28,48,32,62,219,5,
-0,66,191,255,56,214,229,5,61,63,13,0,29,48,128,255,
-90,0,253,23,25,0,224,17,138,253,224,17,242,5,28,48,
-32,62,232,5,0,66,191,255,20,214,229,87,64,0,224,7,
-96,1,36,111,45,139,10,248,125,111,17,0,36,103,41,139,
-100,239,45,139,95,98,100,103,41,139,255,47,32,0,36,95,
-41,139,224,89,142,13,28,48,32,62,247,5,0,66,191,255,
-220,213,224,81,64,6,255,0,128,7,225,48,6,216,7,208,
-251,143,25,0,224,137,154,13,38,6,56,131,132,0,32,62,
-17,6,0,66,191,255,182,213,58,239,1,0,61,255,26,0,
-128,249,229,87,64,0,224,7,96,1,36,127,49,139,10,224,
-223,121,100,127,49,139,252,47,32,0,29,48,1,58,128,255,
-40,6,221,143,42,0,27,48,26,56,191,255,50,252,64,6,
-255,48,49,6,60,36,139,0,100,143,65,139,100,7,61,139,
-0,18,226,126,12,0,44,6,60,36,139,0,204,121,12,118,
-12,0,2,104,236,111,64,2,206,105,111,111,9,0,111,7,
-5,0,111,7,1,0,65,18,2,6,1,248,182,237,226,86,
-12,0,204,81,106,7,9,0,106,7,5,0,106,7,1,0,
-127,0,128,7,193,16,6,216,7,224,229,87,64,0,224,7,
-96,1,10,232,133,21,224,225,162,13,229,87,64,0,224,135,
-96,1,229,87,64,0,224,7,96,1,213,5,253,47,32,0,
-0,82,213,21,36,143,65,139,224,137,226,237,36,231,65,139,
-36,127,61,139,60,135,9,0,65,122,100,135,65,139,100,127,
-61,139,253,47,32,0,124,223,1,0,28,80,64,6,223,16,
-128,7,97,0,6,232,224,233,154,13,38,6,120,131,132,0,
-32,62,103,7,0,66,191,255,180,212,229,87,64,0,224,7,
-96,1,36,23,65,139,10,248,125,23,9,0,36,143,61,139,
-100,239,65,139,95,138,100,143,61,139,255,47,32,0,64,6,
-127,0,128,7,225,16,6,216,7,232,8,224,224,233,154,13,
-38,6,152,131,132,0,32,62,148,7,0,66,191,255,110,212,
-59,23,1,0,224,17,178,21,224,225,194,5,60,23,9,0,
-213,5,34,231,5,0,123,239,1,0,125,231,5,0,124,239,
-9,0,125,23,9,0,98,239,5,0,245,5,125,239,9,0,
-125,239,5,0,123,239,1,0,64,6,255,16,128,7,225,0,
-7,224,60,63,1,0,6,232,128,255,172,0,29,48,28,56,
-10,64,191,255,144,255,64,6,255,0,128,7,97,0,38,143,
-1,0,1,234,241,57,186,13,39,23,9,0,226,57,218,5,
-102,7,1,0,0,234,181,5,102,23,1,0,39,23,5,0,
-39,87,9,0,106,23,5,0,39,87,5,0,39,23,9,0,
-106,23,9,0,7,48,191,255,10,255,29,80,64,6,127,0,
-128,7,225,0,6,224,128,255,148,0,10,232,224,233,154,13,
-38,6,184,131,132,0,32,62,35,8,0,66,191,255,174,211,
-28,48,29,56,191,255,150,255,64,6,255,0,128,7,225,0,
-8,224,128,255,104,0,10,232,224,233,154,13,38,6,200,131,
-132,0,32,62,69,8,0,66,191,255,130,211,125,231,1,0,
-64,6,255,0,38,87,1,0,224,81,10,16,210,29,34,135,
-1,0,39,127,5,0,48,103,1,0,48,111,5,0,39,119,
-1,0,239,105,177,13,187,5,238,97,131,13,234,17,186,5,
-0,82,181,13,34,87,5,0,133,13,34,23,9,0,234,17,
-250,229,34,23,5,0,2,80,127,0,38,87,1,0,224,81,
-10,16,162,13,34,143,1,0,231,137,226,5,34,23,9,0,
-234,17,154,253,0,18,2,80,127,0,130,7,225,241,6,224,
-7,232,0,218,229,87,64,0,224,7,96,1,10,184,60,135,
-1,0,99,7,1,0,224,129,186,5,128,7,198,1,28,48,
-29,56,191,255,114,255,10,248,221,199,64,0,224,249,234,5,
-60,23,1,0,195,15,0,0,149,13,60,127,1,0,63,23,
-9,0,239,17,186,5,195,23,0,0,61,87,1,0,61,95,
-5,0,253,71,9,0,202,65,225,79,0,0,203,73,195,207,
-0,0,178,13,133,77,60,119,1,0,238,249,202,5,195,15,
-0,0,133,13,63,255,5,0,63,135,1,0,208,215,66,0,
-186,245,195,207,0,0,250,53,61,87,1,0,48,199,1,0,
-48,207,5,0,240,103,9,0,216,97,225,111,0,0,61,95,
-5,0,217,105,237,89,219,37,177,5,236,81,169,37,29,119,
-64,0,206,118,1,0,194,21,249,89,171,21,177,5,248,81,
-251,13,233,105,219,13,177,5,232,97,171,13,208,23,66,0,
-60,135,1,0,240,249,250,13,195,15,0,0,197,13,224,113,
-218,5,65,218,219,0,195,15,0,0,195,7,0,0,181,5,
-195,15,0,0,195,215,0,0,218,85,34,127,1,0,207,215,
-66,0,178,21,213,5,60,119,1,0,238,17,130,13,34,23,
-9,0,34,111,1,0,205,215,66,0,234,245,60,103,1,0,
-236,17,186,5,195,23,0,0,195,215,0,0,186,61,34,119,
-1,0,46,95,5,0,46,87,1,0,235,73,145,53,187,5,
-234,65,227,45,29,215,64,0,218,214,1,0,146,37,61,111,
-5,0,61,103,1,0,235,105,187,29,177,5,234,97,139,29,
-10,96,238,87,9,0,204,81,225,127,0,0,203,121,239,73,
-241,13,187,5,234,65,193,13,206,23,66,0,34,111,9,0,
-60,119,1,0,238,105,234,13,195,23,0,0,181,13,224,209,
-202,5,224,217,65,218,219,0,195,7,0,0,181,5,195,23,
-0,0,221,199,64,0,242,13,195,199,0,0,170,29,195,207,
-0,0,186,5,191,7,170,254,195,215,0,0,186,5,191,7,
-160,254,245,13,34,23,9,0,195,207,0,0,194,5,195,215,
-0,0,250,5,60,95,1,0,235,17,178,5,191,7,130,254,
-247,47,32,0,3,87,0,0,202,86,1,0,66,6,255,241,
-33,6,200,15,128,0,97,0,33,6,90,16,128,0,97,0,
-33,6,26,17,128,0,97,0,33,6,106,17,128,0,97,0,
-33,6,10,18,128,0,97,0,33,6,100,18,128,0,97,0,
-33,6,130,18,128,0,97,0,33,6,14,19,128,0,97,0,
-33,6,46,19,128,0,97,0,32,142,0,7,42,6,60,132,
-139,0,106,7,17,0,43,6,84,132,139,0,11,16,106,23,
-13,0,106,23,9,0,106,23,5,0,106,143,21,0,0,98,
-106,23,1,0,149,13,107,23,1,0,65,98,11,16,11,94,
-44,0,98,95,5,0,42,111,21,0,237,97,214,245,42,103,
-1,0,98,103,5,0,42,95,1,0,107,23,1,0,127,0,
-128,7,225,0,9,224,38,119,9,0,32,142,68,176,49,103,
-1,0,8,232,174,97,125,103,1,0,38,119,26,0,204,57,
-174,57,124,63,1,0,61,103,1,0,224,97,142,21,224,57,
-151,13,38,6,248,131,132,0,32,62,133,0,0,66,191,255,
-60,208,61,135,1,0,128,129,124,135,1,0,64,6,255,0,
-132,7,225,240,6,192,7,200,8,208,60,6,60,132,139,0,
-229,87,64,0,224,7,96,1,60,127,17,0,60,135,21,0,
-10,216,240,121,218,5,251,47,32,0,0,18,245,37,60,239,
-9,0,61,119,42,0,206,110,9,0,146,13,38,6,232,131,
-132,0,32,62,76,1,0,66,191,255,226,207,61,87,37,0,
-221,15,42,0,224,81,194,5,29,48,191,255,246,245,61,135,
-5,0,60,127,17,0,124,135,9,0,124,239,5,0,65,122,
-124,127,17,0,251,47,32,0,29,16,2,232,224,233,146,37,
-26,48,3,56,35,70,4,0,191,255,104,221,10,16,224,17,
-199,21,125,207,13,0,125,199,9,0,125,215,24,0,35,111,
-1,0,125,7,26,0,35,103,5,0,125,111,29,0,125,103,
-33,0,125,23,40,0,213,5,29,48,128,255,38,0,0,234,
-29,80,68,6,255,240,128,7,33,0,102,7,37,0,224,57,
-226,5,38,55,29,0,1,58,191,255,78,223,64,6,63,0,
-128,7,225,0,6,232,229,87,64,0,224,7,96,1,10,224,
-29,48,221,199,42,0,194,21,128,255,88,0,253,143,43,0,
-209,142,246,255,125,143,42,0,221,215,42,0,186,13,61,135,
-37,0,240,127,27,0,95,122,112,127,26,0,181,5,128,255,
-182,0,34,6,60,132,139,0,34,239,17,0,95,234,98,239,
-17,0,252,47,32,0,224,233,158,13,38,6,8,132,132,0,
-32,62,22,1,0,66,191,255,228,206,29,80,64,6,255,0,
-34,6,60,132,139,0,34,143,13,0,241,49,178,61,34,135,
-1,0,240,49,234,5,38,127,5,0,98,127,1,0,133,53,
-34,119,9,0,238,49,234,5,38,111,5,0,98,111,9,0,
-149,13,34,103,5,0,236,49,218,5,38,95,1,0,98,95,
-5,0,38,143,1,0,38,87,5,0,106,143,1,0,38,135,
-1,0,38,127,5,0,112,127,5,0,34,87,1,0,42,87,
-1,0,234,49,42,95,5,0,178,13,235,49,146,13,102,87,
-1,0,106,55,5,0,102,95,5,0,107,55,1,0,98,55,
-13,0,127,0,128,7,225,0,60,6,60,132,139,0,60,143,
-9,0,6,232,241,233,194,53,221,223,42,0,146,13,38,6,
-24,132,132,0,32,62,8,2,0,66,191,255,48,206,60,135,
-13,0,240,233,218,5,61,127,1,0,124,127,13,0,61,111,
-1,0,61,119,5,0,110,111,1,0,61,103,1,0,61,95,
-5,0,108,95,5,0,60,23,9,0,34,23,1,0,226,233,
-34,87,5,0,178,13,234,233,146,13,125,23,1,0,98,239,
-5,0,125,87,5,0,106,239,1,0,124,239,9,0,64,6,
-255,0,127,0,34,6,132,185,255,255,0,82,98,7,5,0,
-98,7,17,0,98,7,9,0,98,7,13,0,98,7,1,0,
-65,82,2,22,20,0,10,6,128,254,150,245,34,6,132,185,
-255,255,96,23,165,176,2,134,236,29,96,135,177,176,96,7,
-181,176,96,7,185,176,127,0,150,7,225,48,48,6,84,204,
-140,0,99,135,5,0,35,54,4,0,0,66,0,74,128,255,
-92,230,224,81,226,5,10,6,250,239,210,5,128,7,216,2,
-0,120,181,5,1,122,149,5,96,127,181,176,229,87,64,0,
-224,7,96,1,32,111,185,176,99,87,1,0,13,118,1,0,
-96,119,185,176,224,105,202,13,32,103,13,177,224,97,138,13,
-64,86,0,0,43,6,32,0,0,0,74,95,8,240,35,255,
-1,0,255,47,32,0,133,13,128,255,14,9,43,6,84,204,
-140,0,99,95,5,0,229,87,64,0,224,7,96,1,32,23,
-173,179,99,87,9,0,224,17,234,5,10,248,255,47,32,0,
-0,18,181,13,34,87,73,0,2,232,96,87,173,179,35,255,
-9,0,255,47,32,0,29,16,2,232,29,48,224,233,210,221,
-35,63,5,0,32,70,156,176,128,255,62,184,32,135,217,176,
-32,127,213,176,96,135,153,176,96,127,149,176,10,224,28,6,
-0,240,178,5,128,7,242,1,96,7,144,176,125,7,21,0,
-253,87,9,0,125,7,29,0,125,7,33,0,125,7,45,0,
-125,7,53,0,29,56,221,207,64,0,162,45,61,22,24,0,
-98,7,1,0,61,55,61,0,61,22,36,0,98,87,1,0,
-38,55,13,0,61,22,48,0,98,7,1,0,0,226,191,255,
-170,221,224,81,162,21,221,255,65,0,226,5,96,7,157,176,
-99,7,13,0,149,61,61,55,61,0,29,56,129,255,104,29,
-1,90,99,95,13,0,133,53,32,230,0,16,213,45,61,22,
-24,0,98,7,1,0,61,55,61,0,61,22,36,0,98,87,
-1,0,38,55,13,0,61,22,48,0,98,7,1,0,0,226,
-191,255,250,226,224,81,226,5,99,7,13,0,96,7,157,176,
-245,13,192,231,144,176,194,5,32,230,0,16,149,13,1,130,
-99,135,13,0,61,55,61,0,29,56,129,255,10,29,61,23,
-61,0,98,7,32,0,28,6,0,240,186,85,29,48,128,255,
-200,7,61,55,61,0,0,58,129,255,96,52,61,223,61,0,
-59,223,17,0,99,7,34,0,99,7,25,0,99,7,29,0,
-128,255,206,240,106,7,9,0,45,6,36,64,1,0,106,111,
-5,0,106,7,29,0,32,102,232,3,106,7,33,0,0,210,
-106,103,21,0,99,87,17,0,99,7,38,0,59,23,105,0,
-35,62,16,0,2,22,144,0,34,87,0,0,34,95,5,0,
-219,81,10,48,63,6,76,79,0,0,107,0,35,55,17,0,
-10,56,128,255,138,239,224,209,250,5,35,23,17,0,34,87,
-0,0,224,81,218,253,65,210,98,210,150,229,35,55,17,0,
-128,255,38,239,224,135,145,176,208,134,239,255,96,135,144,176,
-28,6,0,240,186,5,191,7,130,254,224,225,234,69,253,87,
-9,0,61,23,61,0,32,79,149,176,34,103,29,0,32,63,
-157,176,202,97,98,103,29,0,32,71,153,176,29,48,128,255,
-88,1,61,223,57,0,35,215,13,0,229,87,64,0,224,7,
-96,1,59,255,0,0,218,249,123,255,0,0,10,208,250,47,
-32,0,224,249,138,13,27,48,59,95,5,0,63,6,228,79,
-0,0,107,0,192,247,144,176,130,29,61,55,61,0,2,58,
-129,255,88,51,165,21,224,225,138,21,61,223,57,0,1,122,
-123,127,0,0,29,48,128,255,170,7,123,87,12,0,61,55,
-57,0,31,58,128,255,200,238,224,225,210,5,29,48,28,56,
-128,255,172,5,0,82,86,6,255,48,134,7,225,48,7,208,
-6,216,59,231,57,0,0,234,28,48,128,255,240,235,224,81,
-146,77,48,6,112,216,140,0,99,135,9,0,60,79,37,0,
-60,71,33,0,35,54,8,0,128,255,66,227,10,232,224,233,
-146,13,29,64,38,6,160,132,132,0,32,62,153,1,191,255,
-76,202,35,23,9,0,2,111,0,0,205,110,31,0,13,6,
-240,255,186,13,162,103,5,0,34,94,8,0,203,97,226,87,
-7,0,99,87,5,0,213,29,130,87,1,0,216,82,157,82,
-67,87,3,0,8,90,10,112,194,114,194,113,132,111,153,140,
-97,106,170,5,12,90,11,104,0,90,224,81,242,5,162,95,
-1,0,170,89,130,106,237,95,194,2,99,95,5,0,14,96,
-12,64,224,233,234,21,27,48,35,79,5,0,26,56,128,255,
-40,0,10,232,224,233,146,13,29,64,38,6,160,132,132,0,
-32,62,166,1,191,255,198,201,26,48,1,58,128,255,224,237,
-29,80,70,6,255,48,148,7,225,243,6,232,7,208,8,216,
-9,192,57,6,132,215,255,255,1,130,67,135,3,0,25,48,
-31,58,129,255,192,116,224,81,186,253,61,127,65,0,99,127,
-5,0,0,226,195,215,4,0,242,5,29,48,27,56,24,64,
-128,255,152,7,10,224,35,150,1,0,210,239,4,0,210,37,
-32,119,181,176,224,113,242,29,96,7,181,176,32,142,24,177,
-49,111,1,0,224,105,146,13,38,6,172,132,132,0,32,62,
-69,1,0,66,191,255,70,201,32,54,16,177,129,255,198,110,
-224,81,146,13,38,6,184,132,132,0,32,62,183,1,0,66,
-191,255,42,201,221,175,65,0,35,103,5,0,43,6,5,0,
-16,0,75,97,235,97,234,101,224,225,202,101,0,18,221,199,
-67,0,234,199,0,0,1,218,27,224,236,231,64,2,61,118,
-20,0,220,113,46,103,1,0,224,97,226,77,224,17,202,77,
-61,86,20,0,220,81,234,191,5,0,27,120,194,122,32,102,
-164,176,204,121,47,183,1,0,99,199,9,0,32,54,16,177,
-31,58,129,255,134,109,224,81,170,253,35,151,9,0,32,22,
-4,2,224,145,178,5,32,22,4,19,22,48,23,56,2,64,
-200,0,128,255,244,247,32,142,24,177,49,135,1,0,10,184,
-224,129,146,13,38,6,76,132,132,0,32,62,69,1,0,66,
-191,255,138,200,32,54,16,177,129,255,10,110,224,81,146,13,
-38,6,100,132,132,0,32,62,183,1,0,66,191,255,110,200,
-23,16,224,17,158,13,61,110,20,0,205,225,60,23,1,0,
-194,7,43,0,0,18,65,218,99,218,246,165,2,224,221,151,
-64,0,224,225,130,29,28,232,163,95,3,0,224,89,130,21,
-67,7,3,0,25,48,129,255,142,116,224,81,146,13,38,6,
-112,132,132,0,32,62,6,1,0,66,191,255,32,200,29,80,
-128,7,40,3,224,209,186,5,128,7,4,2,61,55,61,0,
-61,102,32,0,38,55,17,0,195,207,4,0,162,93,61,95,
-5,0,61,87,1,0,44,23,4,0,195,215,4,0,178,61,
-32,142,168,176,49,71,1,0,10,112,11,120,2,72,195,231,
-6,0,154,13,99,119,21,0,99,127,25,0,9,130,99,135,
-37,0,229,13,253,87,25,0,206,81,99,87,21,0,225,23,
-0,0,207,17,99,23,25,0,10,122,99,127,37,0,99,7,
-28,0,99,79,30,0,99,7,34,0,38,23,105,0,99,215,
-13,0,72,18,34,87,0,0,99,71,17,0,198,81,10,48,
-35,62,12,0,34,119,5,0,63,6,64,83,0,0,110,0,
-128,7,108,1,99,7,28,0,99,215,13,0,99,7,17,0,
-99,87,21,0,99,95,25,0,99,23,30,0,99,7,37,0,
-99,7,34,0,35,62,12,0,128,255,140,24,128,7,64,1,
-221,223,11,0,0,18,162,5,8,18,2,128,195,231,6,0,
-178,85,43,6,132,185,255,255,236,111,5,0,236,127,7,0,
-44,87,1,0,15,16,42,87,29,0,133,13,170,119,5,0,
-174,17,196,5,42,87,13,0,2,120,224,17,143,253,133,37,
-15,112,42,23,1,0,201,114,194,113,170,23,5,0,175,17,
-226,105,195,5,162,105,201,18,197,5,13,16,201,18,162,105,
-107,7,1,0,107,7,5,0,107,119,13,0,107,23,17,0,
-107,119,9,0,42,87,13,0,11,94,20,0,0,122,224,105,
-143,229,44,111,1,0,0,226,205,7,42,0,44,23,4,0,
-61,95,5,0,61,87,1,0,44,6,132,185,255,255,99,103,
-17,0,99,87,21,0,99,95,25,0,99,23,30,0,11,90,
-99,95,37,0,229,21,32,142,168,176,49,111,1,0,61,95,
-5,0,61,87,1,0,44,23,4,0,99,111,17,0,99,95,
-25,0,99,87,21,0,99,23,30,0,8,82,99,87,37,0,
-99,7,28,0,99,215,13,0,99,135,34,0,35,150,1,0,
-210,199,6,0,194,21,38,23,105,0,61,71,69,0,2,22,
-48,0,34,87,0,0,35,62,12,0,198,81,10,48,34,135,
-5,0,63,6,138,84,0,0,112,0,149,21,38,23,105,0,
-35,62,12,0,2,22,16,0,34,87,0,0,34,127,5,0,
-198,81,10,48,63,6,172,84,0,0,111,0,35,119,5,0,
-206,118,6,0,102,114,202,117,35,150,1,0,210,247,4,0,
-234,5,35,150,1,0,210,255,4,0,162,109,61,223,24,0,
-224,217,151,53,32,215,165,176,32,54,16,177,31,58,129,255,
-154,106,224,81,170,253,26,48,27,56,32,70,136,0,128,255,
-24,245,32,142,24,177,49,95,1,0,10,216,224,89,146,13,
-38,6,64,132,132,0,32,62,69,1,0,66,191,255,174,197,
-32,54,16,177,129,255,46,107,224,81,146,13,38,6,88,132,
-132,0,32,62,183,1,0,66,191,255,146,197,27,16,224,17,
-174,5,0,18,61,239,48,0,224,233,167,53,224,17,138,53,
-32,142,172,176,49,223,1,0,32,54,16,177,31,58,129,255,
-42,106,224,81,170,253,27,48,29,56,32,70,136,0,128,255,
-168,244,32,142,24,177,49,111,1,0,10,232,224,105,146,13,
-38,6,64,132,132,0,32,62,69,1,0,66,191,255,62,197,
-32,54,16,177,129,255,190,106,224,81,146,13,38,6,88,132,
-132,0,32,62,183,1,0,66,191,255,34,197,224,233,28,232,
-163,95,3,0,224,89,130,21,67,7,3,0,25,48,129,255,
-102,113,224,81,146,13,38,6,112,132,132,0,32,62,6,1,
-0,66,191,255,248,196,29,80,84,6,255,243,130,7,225,0,
-6,232,7,224,32,143,181,176,252,0,224,137,210,29,32,150,
-24,177,50,135,1,0,224,129,146,13,38,6,196,132,132,0,
-32,62,69,1,0,66,191,255,196,196,32,54,16,177,129,255,
-68,106,224,81,146,13,38,6,208,132,132,0,32,62,183,1,
-0,66,191,255,168,196,29,48,28,56,128,255,132,223,29,48,
-129,255,176,22,61,55,57,0,224,49,178,5,128,255,216,225,
-224,231,209,176,149,21,229,87,64,0,32,22,159,255,10,232,
-29,248,66,249,255,47,32,0,29,248,255,47,32,0,4,119,
-80,139,224,113,250,37,51,6,5,0,32,0,211,255,0,0,
-186,237,229,87,64,0,224,7,96,1,32,111,185,176,99,87,
-1,0,95,106,96,111,185,176,202,13,32,103,13,177,224,97,
-138,13,64,86,0,0,43,6,96,0,0,0,74,95,8,240,
-35,255,1,0,255,47,32,0,50,6,54,0,32,0,114,231,
-0,0,66,6,255,0,130,7,225,0,32,143,181,176,6,224,
-224,137,210,85,96,7,181,176,61,6,84,204,140,0,29,48,
-32,62,0,1,128,255,150,238,32,150,24,177,50,135,1,0,
-224,129,146,13,38,6,220,132,132,0,32,62,69,1,0,66,
-191,255,218,195,32,54,16,177,129,255,90,105,224,81,146,13,
-38,6,232,132,132,0,32,62,183,1,0,66,191,255,190,195,
-224,225,210,45,29,127,0,0,207,126,31,0,15,6,240,255,
-154,13,189,87,5,0,61,110,8,0,205,81,253,23,7,0,
-165,29,157,103,1,0,216,98,157,98,67,103,3,0,8,18,
-12,80,194,82,221,81,132,135,153,140,97,130,170,5,12,18,
-2,88,0,18,224,97,242,5,189,23,1,0,172,17,130,90,
-235,23,194,2,96,23,149,176,96,87,153,176,66,6,255,0,
-130,7,225,112,8,232,9,200,7,224,0,218,197,29,61,63,
-5,0,61,55,1,0,61,215,17,0,28,64,26,72,224,201,
-130,13,32,134,36,0,99,135,1,0,128,255,70,241,245,5,
-32,126,129,0,99,127,1,0,128,255,56,241,218,225,29,238,
-20,0,65,218,32,111,149,176,237,217,166,229,66,6,255,112,
-128,7,225,48,6,232,58,6,84,184,140,0,128,255,248,11,
-61,55,57,0,128,255,106,226,0,218,221,239,64,0,250,5,
-221,247,64,0,202,5,221,223,65,0,194,13,125,7,36,0,
-29,48,32,63,153,176,32,71,149,176,26,72,128,255,250,8,
-10,216,32,143,181,176,224,137,210,29,32,150,24,177,50,135,
-1,0,224,129,146,13,38,6,244,132,132,0,32,62,69,1,
-0,66,191,255,168,194,32,54,16,177,129,255,40,104,224,81,
-146,13,38,6,0,133,132,0,32,62,183,1,0,66,191,255,
-140,194,224,217,202,77,0,226,125,7,8,0,221,239,64,0,
-202,5,221,247,64,0,194,29,0,18,26,80,0,90,245,5,
-42,119,17,0,65,90,10,86,20,0,206,17,32,111,149,176,
-237,89,246,245,2,96,169,98,125,103,8,0,2,48,128,255,
-36,10,10,224,224,225,202,5,32,222,21,1,133,45,221,239,
-64,0,242,5,29,48,28,56,26,64,1,74,191,255,212,254,
-221,223,65,0,178,5,26,16,165,5,28,16,29,48,2,56,
-128,255,104,179,10,216,221,247,64,0,242,5,29,48,28,56,
-26,64,0,74,191,255,172,254,221,207,65,0,178,5,128,255,
-36,179,224,225,194,5,28,48,128,255,210,9,31,50,128,255,
-204,10,27,80,64,6,255,48,160,7,225,243,6,232,7,16,
-132,135,153,140,224,129,162,13,34,111,5,0,34,103,1,0,
-34,126,8,0,47,87,1,0,149,13,34,87,1,0,0,106,
-10,96,34,86,4,0,42,87,1,0,32,127,205,176,32,119,
-201,176,239,105,129,13,187,5,238,97,211,5,96,103,201,176,
-96,111,205,176,46,6,132,185,255,255,253,199,37,0,253,95,
-9,0,221,199,67,0,186,5,128,7,212,3,12,208,99,23,
-21,0,99,87,13,0,14,200,137,82,99,87,17,0,13,216,
-253,111,49,0,216,105,235,105,130,45,224,55,209,176,221,207,
-64,0,162,13,221,215,64,0,194,5,32,22,82,0,197,13,
-32,22,86,0,149,13,221,199,64,0,194,5,32,22,87,0,
-181,5,32,22,88,0,39,6,124,132,132,0,26,64,35,151,
-13,0,99,23,5,0,99,151,1,0,27,72,128,255,6,9,
-32,22,3,1,128,7,98,3,253,151,25,0,99,151,57,0,
-61,150,32,0,99,151,25,0,1,146,99,151,49,0,35,135,
-25,0,48,135,1,0,224,129,138,13,35,151,25,0,76,146,
-99,151,25,0,128,7,30,3,35,127,49,0,32,102,164,176,
-15,88,194,122,204,121,111,207,1,0,236,95,64,2,61,126,
-20,0,207,89,43,231,9,0,35,143,25,0,99,231,61,0,
-241,95,7,0,49,183,1,0,11,80,10,16,54,183,29,0,
-229,5,172,17,196,5,54,183,13,0,2,80,182,103,5,0,
-224,17,143,253,10,144,54,23,1,0,201,146,194,145,99,151,
-29,0,170,97,35,199,57,0,99,103,33,0,248,95,192,90,
-60,23,17,0,171,193,137,18,224,89,247,21,229,5,28,230,
-20,0,60,23,17,0,137,18,162,89,172,253,11,80,128,81,
-234,193,234,199,50,147,99,151,37,0,11,184,194,185,60,111,
-13,0,201,186,205,185,133,13,226,193,226,199,50,147,99,151,
-37,0,60,191,13,0,35,151,25,0,242,151,5,0,99,151,
-53,0,32,87,177,176,99,7,42,0,234,201,227,5,32,150,
-97,1,99,151,42,0,245,29,251,1,186,5,250,1,210,5,
-35,151,13,0,224,145,234,5,32,150,0,1,99,151,42,0,
-165,21,218,86,3,0,226,5,32,150,2,1,99,151,42,0,
-165,13,35,151,13,0,210,118,255,1,210,5,32,150,4,1,
-99,151,42,0,35,111,42,0,224,105,194,37,224,55,209,176,
-221,207,64,0,162,13,221,215,64,0,194,5,32,22,82,0,
-197,13,32,22,86,0,149,13,221,199,64,0,194,5,32,22,
-87,0,181,5,32,22,88,0,39,6,124,132,132,0,26,64,
-35,151,13,0,99,23,5,0,99,151,1,0,27,72,128,255,
-116,7,35,23,42,0,224,17,178,5,128,7,204,1,35,151,
-33,0,35,143,17,0,241,145,241,151,50,139,35,151,37,0,
-241,145,241,151,50,147,99,151,9,0,35,151,29,0,121,215,
-1,0,121,151,9,0,121,223,5,0,35,151,53,0,35,143,
-9,0,121,191,13,0,177,145,99,151,53,0,224,145,239,29,
-224,145,146,13,38,6,52,132,132,0,32,62,153,7,0,66,
-191,255,42,191,35,135,9,0,35,151,25,0,201,130,76,146,
-121,135,17,0,99,151,25,0,50,119,1,0,25,206,20,0,
-224,113,186,5,128,7,62,1,229,5,201,138,121,143,17,0,
-25,206,20,0,35,143,9,0,17,144,201,146,99,151,41,0,
-35,151,17,0,177,145,99,151,17,0,154,45,132,135,153,140,
-224,129,146,21,35,151,21,0,76,146,99,151,21,0,50,223,
-5,0,50,215,1,0,50,126,8,0,47,151,1,0,99,151,
-13,0,245,13,35,151,21,0,72,146,99,151,21,0,50,215,
-1,0,50,22,4,0,34,151,1,0,0,218,99,151,13,0,
-35,151,13,0,137,146,99,151,17,0,245,13,35,143,41,0,
-35,151,13,0,17,72,191,74,209,209,225,103,0,0,204,73,
-201,217,177,145,99,151,13,0,35,151,53,0,224,145,167,85,
-35,151,33,0,35,143,9,0,177,145,99,151,33,0,234,21,
-54,183,13,0,224,177,154,13,38,6,52,132,132,0,32,62,
-222,7,0,66,191,255,70,190,182,151,5,0,99,151,33,0,
-54,151,1,0,99,151,29,0,133,13,35,151,29,0,35,143,
-41,0,209,145,99,151,29,0,35,143,9,0,177,193,154,21,
-35,231,61,0,35,199,57,0,60,111,17,0,60,191,13,0,
-137,106,237,193,237,199,50,147,99,151,37,0,191,7,214,253,
-35,151,37,0,177,145,99,151,37,0,250,13,28,230,20,0,
-60,87,17,0,60,191,13,0,137,82,234,193,234,199,50,147,
-99,151,37,0,191,7,174,253,35,143,41,0,209,185,191,7,
-164,253,35,151,49,0,65,146,99,151,49,0,99,146,190,5,
-191,7,190,252,0,18,2,80,128,7,218,3,221,231,66,0,
-186,5,128,7,110,2,12,208,13,216,10,224,2,176,14,184,
-253,127,25,0,207,193,253,103,49,0,216,97,235,97,226,37,
-224,55,209,176,221,207,64,0,162,13,221,215,64,0,194,5,
-32,22,82,0,197,13,32,22,86,0,149,13,221,199,64,0,
-194,5,32,22,87,0,181,5,32,22,88,0,39,6,124,132,
-132,0,26,64,27,72,99,23,5,0,99,231,1,0,128,255,
-52,5,32,22,3,1,128,7,4,2,61,150,20,0,99,151,
-53,0,99,7,61,0,35,135,53,0,48,135,1,0,224,129,
-186,5,128,7,202,1,35,151,61,0,224,145,247,5,194,146,
-32,102,164,176,204,145,114,191,1,0,35,143,53,0,49,207,
-1,0,241,95,7,0,11,16,57,207,29,0,229,5,170,17,
-196,5,57,207,13,0,2,88,185,87,5,0,224,17,143,253,
-35,151,53,0,242,151,5,0,99,151,49,0,57,23,1,0,
-11,144,201,146,194,145,99,151,41,0,35,151,49,0,171,81,
-234,145,234,151,60,195,201,194,128,7,88,1,32,87,177,176,
-99,7,58,0,234,185,227,5,32,150,97,1,99,151,58,0,
-181,29,251,1,186,5,250,1,178,5,224,225,234,5,32,150,
-0,1,99,151,58,0,133,21,218,86,3,0,226,5,32,150,
-2,1,99,151,58,0,133,13,220,118,255,1,210,5,32,150,
-4,1,99,151,58,0,35,111,58,0,224,105,162,37,224,55,
+205,121,48,111,13,0,48,103,9,0,237,121,186,77,236,81,
+154,77,224,233,250,5,26,48,32,62,201,4,0,66,191,255,
+184,222,61,231,1,0,57,223,1,0,60,199,37,0,224,225,
+250,5,26,48,32,62,207,4,0,66,191,255,156,222,224,193,
+250,5,26,48,32,62,208,4,0,66,191,255,140,222,60,87,
+24,0,59,95,24,0,59,111,29,0,203,81,60,119,33,0,
+124,87,24,0,110,111,13,0,59,135,26,0,60,95,33,0,
+59,103,29,0,60,127,26,0,108,95,9,0,208,121,59,87,
+33,0,124,127,26,0,124,87,33,0,28,48,128,255,120,15,
+219,143,42,0,123,7,37,0,24,48,25,56,128,255,244,4,
+1,74,137,0,224,73,210,13,32,142,124,176,241,119,1,0,
+95,114,113,119,0,0,1,218,88,138,113,239,1,0,165,5,
+1,218,224,217,186,5,191,7,226,254,32,142,124,176,241,231,
+1,0,84,138,49,239,1,0,165,85,61,23,1,0,61,223,
+9,0,34,87,9,0,32,142,68,176,49,111,5,0,34,95,
+13,0,49,103,1,0,235,105,139,69,177,5,234,97,217,61,
+32,142,76,176,49,71,1,0,10,96,34,87,24,0,49,79,
+5,0,10,120,191,122,204,81,225,135,0,0,208,121,203,121,
+1,114,174,81,225,135,0,0,176,121,239,73,225,37,187,5,
+234,65,179,37,23,48,22,56,29,64,128,255,16,4,32,142,
+124,176,241,103,1,0,95,98,113,103,0,0,84,138,49,95,
+1,0,235,233,138,13,32,142,116,176,49,87,1,0,92,138,
+113,87,1,0,32,142,116,176,49,239,1,0,224,233,210,5,
+32,142,116,176,113,7,1,0,95,226,27,232,224,225,234,173,
+32,142,112,176,49,135,1,0,224,129,250,13,32,142,116,176,
+49,127,1,0,224,121,154,13,38,6,80,141,132,0,32,62,
+43,2,0,66,191,255,50,221,32,142,124,176,241,119,1,0,
+224,113,170,13,38,6,80,141,132,0,32,62,48,2,0,66,
+191,255,22,221,224,81,68,6,255,243,128,7,225,48,6,216,
+7,208,9,232,213,13,40,231,9,0,27,48,26,56,128,255,
+108,3,253,143,1,0,95,138,125,143,0,0,28,64,253,135,
+1,0,224,129,154,245,64,6,255,48,32,142,76,176,49,103,
+1,0,49,111,5,0,143,98,13,80,209,82,10,97,143,106,
+49,142,28,0,49,119,1,0,234,87,0,0,238,97,234,23,
+0,0,2,81,127,0,128,7,225,48,6,208,32,231,133,176,
+7,216,219,199,66,0,186,37,28,136,32,134,1,1,240,143,
+194,234,245,21,32,150,140,176,114,239,1,0,29,48,194,50,
+58,102,12,0,204,49,27,56,128,255,118,9,224,81,178,5,
+1,82,229,13,65,226,65,234,29,6,255,254,170,5,0,234,
+32,150,136,176,50,95,1,0,235,225,211,229,0,82,64,6,
+255,48,128,7,225,240,6,192,7,208,218,215,66,0,154,13,
+38,6,96,141,132,0,32,62,200,2,0,66,191,255,58,220,
+58,239,33,0,1,58,253,135,43,0,208,134,244,255,125,135,
+42,0,29,48,128,255,198,12,29,48,128,255,218,12,58,23,
+1,0,250,127,9,0,194,230,127,0,15,118,255,255,206,225,
+135,226,2,232,135,234,221,225,29,104,32,102,1,1,236,111,
+194,218,229,87,64,0,224,7,96,1,10,200,245,13,27,48,
+194,50,56,126,12,0,207,49,26,56,128,255,26,8,65,234,
+65,218,27,6,255,254,170,5,0,218,252,233,147,245,249,47,
+32,0,26,48,129,255,2,48,64,6,255,240,128,7,225,48,
+7,232,61,231,33,0,6,208,60,231,40,0,229,87,64,0,
+224,7,96,1,36,143,65,139,10,248,220,137,100,143,65,139,
+255,47,32,0,36,127,61,139,36,135,69,139,36,87,65,139,
+175,129,16,104,191,106,159,106,205,129,161,130,240,81,151,13,
+29,48,128,255,104,23,61,55,61,0,1,58,129,255,34,70,
+29,48,0,58,128,255,66,6,133,13,29,48,128,255,78,23,
+29,48,0,58,128,255,50,6,10,16,224,17,242,245,2,248,
+229,87,64,0,224,7,96,1,32,150,140,176,50,55,1,0,
+10,224,194,50,58,110,12,0,205,49,31,56,128,255,4,7,
+252,47,32,0,32,231,133,176,213,45,28,88,32,86,1,1,
+234,95,194,98,32,150,140,176,114,103,1,0,29,48,0,58,
+128,255,230,5,133,13,29,48,128,255,242,22,29,48,0,58,
+128,255,214,5,10,16,224,17,242,245,2,248,229,87,64,0,
+224,7,96,1,32,150,140,176,50,55,1,0,10,216,194,50,
+58,110,12,0,205,49,31,56,128,255,168,6,251,47,32,0,
+65,226,32,150,136,176,50,103,1,0,236,225,241,205,1,82,
+64,6,255,48,128,7,225,48,35,215,25,0,7,224,9,56,
+6,216,35,23,21,0,8,48,2,64,128,255,122,10,10,232,
+224,233,146,13,125,231,37,0,27,48,28,56,29,64,26,72,
+128,255,10,0,29,80,64,6,255,48,128,7,225,112,9,200,
+8,48,38,79,13,0,38,231,24,0,38,71,9,0,28,232,
+191,234,200,225,225,111,0,0,205,233,201,233,7,216,1,58,
+167,225,225,87,0,0,170,233,128,255,84,9,10,208,224,201,
+186,29,59,135,13,0,224,129,250,21,251,127,25,0,224,121,
+146,13,38,6,112,141,132,0,32,62,1,4,0,66,191,255,
+40,218,123,231,5,0,123,239,9,0,59,54,12,0,26,56,
+128,255,44,9,197,21,59,95,9,0,59,87,5,0,235,233,
+129,13,187,5,234,225,211,5,123,231,5,0,123,239,9,0,
+59,54,12,0,26,56,25,64,128,255,252,8,251,119,25,0,
+65,114,251,111,27,0,65,106,123,111,26,0,123,119,24,0,
+64,6,255,112,128,7,225,0,6,224,60,239,37,0,253,143,
+25,0,224,137,154,13,38,6,128,141,132,0,32,62,53,4,
+0,66,191,255,180,217,61,54,12,0,28,56,128,255,208,8,
+10,56,253,135,25,0,29,48,97,130,195,5,128,255,208,3,
+181,5,128,255,52,3,64,6,255,0,128,7,225,16,6,224,
+7,232,8,216,253,143,25,0,224,137,154,13,38,6,144,141,
+132,0,32,62,92,4,0,66,191,255,110,217,253,135,25,0,
+97,130,227,5,29,48,27,56,128,255,148,3,133,13,28,48,
+29,56,128,255,74,8,29,48,128,255,238,2,64,6,255,16,
+128,7,225,0,6,232,7,224,224,225,178,5,224,233,154,13,
+38,6,160,141,132,0,32,62,136,4,0,66,191,255,42,217,
+61,54,12,0,28,56,128,255,62,8,253,135,25,0,97,130,
+234,5,125,7,5,0,125,7,9,0,133,37,61,87,13,0,
+0,18,224,81,178,5,42,23,5,0,34,23,1,0,1,114,
+34,103,9,0,34,87,24,0,34,111,13,0,10,120,191,122,
+204,81,225,135,0,0,208,121,205,121,174,81,125,87,5,0,
+225,135,0,0,176,121,125,127,9,0,253,127,25,0,95,122,
+125,127,24,0,64,6,255,0,128,7,128,7,225,243,6,176,
+8,232,253,135,9,0,7,200,249,119,9,0,208,113,121,119,
+8,0,57,255,33,0,61,231,33,0,229,87,64,0,224,7,
+96,1,10,216,60,87,24,0,63,103,17,0,10,120,63,111,
+21,0,191,122,10,112,204,113,225,79,0,0,201,121,205,121,
+63,103,24,0,127,127,21,0,202,97,127,119,17,0,127,103,
+24,0,60,111,29,0,60,95,26,0,63,119,33,0,63,87,
+26,0,110,111,13,0,203,81,127,87,26,0,60,103,29,0,
+60,135,40,0,63,95,33,0,63,127,40,0,108,95,9,0,
+208,121,60,87,33,0,127,127,40,0,127,87,33,0,251,47,
+32,0,253,135,37,0,249,119,37,0,208,113,61,231,33,0,
+121,119,36,0,28,48,252,111,43,0,205,110,244,255,124,111,
+42,0,0,58,128,255,166,8,28,48,128,255,186,8,61,63,
+5,0,61,55,1,0,1,66,6,192,168,193,225,87,0,0,
+135,194,198,222,127,0,253,127,9,0,15,118,255,255,206,217,
+135,218,6,224,135,226,220,217,28,104,32,102,1,1,236,111,
+194,210,229,87,64,0,224,7,96,1,10,184,133,29,26,48,
+194,50,29,56,248,225,131,13,54,126,12,0,207,49,25,64,
+128,255,16,4,229,5,54,94,12,0,203,49,128,255,216,3,
+65,226,65,210,26,6,255,254,170,5,0,210,251,225,131,237,
+247,47,32,0,29,48,129,255,192,43,64,6,255,243,32,134,
+128,0,100,135,49,139,100,7,53,139,43,6,156,31,139,0,
+11,16,100,23,57,139,0,82,181,29,31,122,98,127,1,0,
+98,7,5,0,98,7,9,0,98,7,13,0,98,7,24,0,
+98,7,26,0,66,87,28,0,10,6,129,255,130,13,2,22,
+32,0,107,7,21,0,107,23,17,0,2,88,65,82,10,6,
+128,255,198,229,107,7,17,0,107,7,21,0,127,0,128,7,
+97,0,6,232,229,87,64,0,224,7,96,1,10,248,149,13,
+229,87,64,0,224,135,96,1,229,87,64,0,224,7,96,1,
+36,127,53,139,36,135,49,139,240,121,178,245,36,23,57,139,
+125,23,1,0,15,110,1,0,34,119,17,0,100,111,53,139,
+100,119,57,139,255,47,32,0,36,63,53,139,97,58,231,13,
+38,6,192,141,132,0,191,255,54,223,38,6,176,141,132,0,
+32,62,174,5,1,66,191,255,176,214,61,95,1,0,235,95,
+25,0,224,89,146,13,38,6,176,141,132,0,32,62,178,5,
+0,66,191,255,148,214,32,142,104,176,49,87,1,0,61,23,
+1,0,98,87,1,0,34,86,12,0,106,7,1,0,98,7,
+24,0,98,7,9,0,98,7,5,0,98,7,26,0,36,87,
+53,139,64,6,127,0,128,7,225,0,6,232,60,6,8,142,
+132,0,253,143,27,0,224,137,242,5,28,48,32,62,216,5,
+0,66,191,255,68,214,253,135,25,0,97,130,217,13,28,48,
+32,62,219,5,0,66,191,255,48,214,229,5,61,63,13,0,
+29,48,128,255,90,0,253,23,25,0,224,17,138,253,224,17,
+242,5,28,48,32,62,232,5,0,66,191,255,12,214,229,87,
+64,0,224,7,96,1,36,111,57,139,10,248,125,111,17,0,
+36,103,53,139,100,239,57,139,95,98,100,103,53,139,255,47,
+32,0,36,95,53,139,224,89,142,13,28,48,32,62,247,5,
+0,66,191,255,212,213,224,81,64,6,255,0,128,7,225,48,
+6,216,7,208,251,143,25,0,224,137,154,13,38,6,24,142,
+132,0,32,62,17,6,0,66,191,255,174,213,58,239,1,0,
+61,255,26,0,128,249,229,87,64,0,224,7,96,1,36,127,
+61,139,10,224,223,121,100,127,61,139,252,47,32,0,29,48,
+1,58,128,255,40,6,221,143,42,0,27,48,26,56,191,255,
+50,252,64,6,255,48,49,6,156,47,139,0,100,143,77,139,
+100,7,73,139,0,18,226,126,12,0,44,6,156,47,139,0,
+204,121,12,118,12,0,2,104,236,111,64,2,206,105,111,111,
+9,0,111,7,5,0,111,7,1,0,65,18,2,6,1,248,
+182,237,226,86,12,0,204,81,106,7,9,0,106,7,5,0,
+106,7,1,0,127,0,128,7,193,16,6,216,7,224,229,87,
+64,0,224,7,96,1,10,232,133,21,224,225,162,13,229,87,
+64,0,224,135,96,1,229,87,64,0,224,7,96,1,213,5,
+253,47,32,0,0,82,213,21,36,143,77,139,224,137,226,237,
+36,231,77,139,36,127,73,139,60,135,9,0,65,122,100,135,
+77,139,100,127,73,139,253,47,32,0,124,223,1,0,28,80,
+64,6,223,16,128,7,97,0,6,232,224,233,154,13,38,6,
+88,142,132,0,32,62,103,7,0,66,191,255,172,212,229,87,
+64,0,224,7,96,1,36,23,77,139,10,248,125,23,9,0,
+36,143,73,139,100,239,77,139,95,138,100,143,73,139,255,47,
+32,0,64,6,127,0,128,7,225,16,6,216,7,232,8,224,
+224,233,154,13,38,6,120,142,132,0,32,62,148,7,0,66,
+191,255,102,212,59,23,1,0,224,17,178,21,224,225,194,5,
+60,23,9,0,213,5,34,231,5,0,123,239,1,0,125,231,
+5,0,124,239,9,0,125,23,9,0,98,239,5,0,245,5,
+125,239,9,0,125,239,5,0,123,239,1,0,64,6,255,16,
+128,7,225,0,7,224,60,63,1,0,6,232,128,255,172,0,
+29,48,28,56,10,64,191,255,144,255,64,6,255,0,128,7,
+97,0,38,143,1,0,1,234,241,57,186,13,39,23,9,0,
+226,57,218,5,102,7,1,0,0,234,181,5,102,23,1,0,
+39,23,5,0,39,87,9,0,106,23,5,0,39,87,5,0,
+39,23,9,0,106,23,9,0,7,48,191,255,10,255,29,80,
+64,6,127,0,128,7,225,0,6,224,128,255,148,0,10,232,
+224,233,154,13,38,6,152,142,132,0,32,62,35,8,0,66,
+191,255,166,211,28,48,29,56,191,255,150,255,64,6,255,0,
+128,7,225,0,8,224,128,255,104,0,10,232,224,233,154,13,
+38,6,168,142,132,0,32,62,69,8,0,66,191,255,122,211,
+125,231,1,0,64,6,255,0,38,87,1,0,224,81,10,16,
+210,29,34,135,1,0,39,127,5,0,48,103,1,0,48,111,
+5,0,39,119,1,0,239,105,177,13,187,5,238,97,131,13,
+234,17,186,5,0,82,181,13,34,87,5,0,133,13,34,23,
+9,0,234,17,250,229,34,23,5,0,2,80,127,0,38,87,
+1,0,224,81,10,16,162,13,34,143,1,0,231,137,226,5,
+34,23,9,0,234,17,154,253,0,18,2,80,127,0,130,7,
+225,241,6,224,7,232,0,218,229,87,64,0,224,7,96,1,
+10,184,60,135,1,0,99,7,1,0,224,129,186,5,128,7,
+198,1,28,48,29,56,191,255,114,255,10,248,221,199,64,0,
+224,249,234,5,60,23,1,0,195,15,0,0,149,13,60,127,
+1,0,63,23,9,0,239,17,186,5,195,23,0,0,61,87,
+1,0,61,95,5,0,253,71,9,0,202,65,225,79,0,0,
+203,73,195,207,0,0,178,13,133,77,60,119,1,0,238,249,
+202,5,195,15,0,0,133,13,63,255,5,0,63,135,1,0,
+208,215,66,0,186,245,195,207,0,0,250,53,61,87,1,0,
+48,199,1,0,48,207,5,0,240,103,9,0,216,97,225,111,
+0,0,61,95,5,0,217,105,237,89,219,37,177,5,236,81,
+169,37,29,119,64,0,206,118,1,0,194,21,249,89,171,21,
+177,5,248,81,251,13,233,105,219,13,177,5,232,97,171,13,
+208,23,66,0,60,135,1,0,240,249,250,13,195,15,0,0,
+197,13,224,113,218,5,65,218,219,0,195,15,0,0,195,7,
+0,0,181,5,195,15,0,0,195,215,0,0,218,85,34,127,
+1,0,207,215,66,0,178,21,213,5,60,119,1,0,238,17,
+130,13,34,23,9,0,34,111,1,0,205,215,66,0,234,245,
+60,103,1,0,236,17,186,5,195,23,0,0,195,215,0,0,
+186,61,34,119,1,0,46,95,5,0,46,87,1,0,235,73,
+145,53,187,5,234,65,227,45,29,215,64,0,218,214,1,0,
+146,37,61,111,5,0,61,103,1,0,235,105,187,29,177,5,
+234,97,139,29,10,96,238,87,9,0,204,81,225,127,0,0,
+203,121,239,73,241,13,187,5,234,65,193,13,206,23,66,0,
+34,111,9,0,60,119,1,0,238,105,234,13,195,23,0,0,
+181,13,224,209,202,5,224,217,65,218,219,0,195,7,0,0,
+181,5,195,23,0,0,221,199,64,0,242,13,195,199,0,0,
+170,29,195,207,0,0,186,5,191,7,170,254,195,215,0,0,
+186,5,191,7,160,254,245,13,34,23,9,0,195,207,0,0,
+194,5,195,215,0,0,250,5,60,95,1,0,235,17,178,5,
+191,7,130,254,247,47,32,0,3,87,0,0,202,86,1,0,
+66,6,255,241,33,6,200,15,128,0,97,0,33,6,90,16,
+128,0,97,0,33,6,26,17,128,0,97,0,33,6,106,17,
+128,0,97,0,33,6,10,18,128,0,97,0,33,6,100,18,
+128,0,97,0,33,6,130,18,128,0,97,0,33,6,14,19,
+128,0,97,0,33,6,46,19,128,0,97,0,32,142,0,7,
+42,6,156,143,139,0,106,7,17,0,43,6,180,143,139,0,
+11,16,106,23,13,0,106,23,9,0,106,23,5,0,106,143,
+21,0,0,98,106,23,1,0,149,13,107,23,1,0,65,98,
+11,16,11,94,44,0,98,95,5,0,42,111,21,0,237,97,
+214,245,42,103,1,0,98,103,5,0,42,95,1,0,107,23,
+1,0,127,0,128,7,225,0,9,224,38,119,9,0,32,142,
+68,176,49,103,1,0,8,232,174,97,125,103,1,0,38,119,
+26,0,204,57,174,57,124,63,1,0,61,103,1,0,224,97,
+142,21,224,57,151,13,38,6,216,142,132,0,32,62,133,0,
+0,66,191,255,52,208,61,135,1,0,128,129,124,135,1,0,
+64,6,255,0,132,7,225,240,6,192,7,200,8,208,60,6,
+156,143,139,0,229,87,64,0,224,7,96,1,60,127,17,0,
+60,135,21,0,10,216,240,121,218,5,251,47,32,0,0,18,
+245,37,60,239,9,0,61,119,42,0,206,110,9,0,146,13,
+38,6,200,142,132,0,32,62,76,1,0,66,191,255,218,207,
+61,87,37,0,221,15,42,0,224,81,194,5,29,48,191,255,
+246,245,61,135,5,0,60,127,17,0,124,135,9,0,124,239,
+5,0,65,122,124,127,17,0,251,47,32,0,29,16,2,232,
+224,233,146,37,26,48,3,56,35,70,4,0,191,255,96,221,
+10,16,224,17,199,21,125,207,13,0,125,199,9,0,125,215,
+24,0,35,111,1,0,125,7,26,0,35,103,5,0,125,111,
+29,0,125,103,33,0,125,23,40,0,213,5,29,48,128,255,
+38,0,0,234,29,80,68,6,255,240,128,7,33,0,102,7,
+37,0,224,57,226,5,38,55,29,0,1,58,191,255,70,223,
+64,6,63,0,128,7,225,0,6,232,229,87,64,0,224,7,
+96,1,10,224,29,48,221,199,42,0,194,21,128,255,88,0,
+253,143,43,0,209,142,246,255,125,143,42,0,221,215,42,0,
+186,13,61,135,37,0,240,127,27,0,95,122,112,127,26,0,
+181,5,128,255,182,0,34,6,156,143,139,0,34,239,17,0,
+95,234,98,239,17,0,252,47,32,0,224,233,158,13,38,6,
+232,142,132,0,32,62,22,1,0,66,191,255,220,206,29,80,
+64,6,255,0,34,6,156,143,139,0,34,143,13,0,241,49,
+178,61,34,135,1,0,240,49,234,5,38,127,5,0,98,127,
+1,0,133,53,34,119,9,0,238,49,234,5,38,111,5,0,
+98,111,9,0,149,13,34,103,5,0,236,49,218,5,38,95,
+1,0,98,95,5,0,38,143,1,0,38,87,5,0,106,143,
+1,0,38,135,1,0,38,127,5,0,112,127,5,0,34,87,
+1,0,42,87,1,0,234,49,42,95,5,0,178,13,235,49,
+146,13,102,87,1,0,106,55,5,0,102,95,5,0,107,55,
+1,0,98,55,13,0,127,0,128,7,225,0,60,6,156,143,
+139,0,60,143,9,0,6,232,241,233,194,53,221,223,42,0,
+146,13,38,6,248,142,132,0,32,62,8,2,0,66,191,255,
+40,206,60,135,13,0,240,233,218,5,61,127,1,0,124,127,
+13,0,61,111,1,0,61,119,5,0,110,111,1,0,61,103,
+1,0,61,95,5,0,108,95,5,0,60,23,9,0,34,23,
+1,0,226,233,34,87,5,0,178,13,234,233,146,13,125,23,
+1,0,98,239,5,0,125,87,5,0,106,239,1,0,124,239,
+9,0,64,6,255,0,127,0,34,6,132,185,255,255,0,82,
+98,7,5,0,98,7,17,0,98,7,9,0,98,7,13,0,
+98,7,1,0,65,82,2,22,20,0,10,6,128,254,150,245,
+34,6,132,185,255,255,96,23,165,176,2,134,236,29,96,135,
+177,176,96,7,181,176,96,7,185,176,127,0,150,7,225,48,
+48,6,180,215,140,0,99,135,5,0,35,54,4,0,0,66,
+0,74,128,255,40,232,224,81,226,5,10,6,250,239,210,5,
+128,7,216,2,0,120,181,5,1,122,149,5,96,127,181,176,
+229,87,64,0,224,7,96,1,32,111,185,176,99,87,1,0,
+13,118,1,0,96,119,185,176,224,105,202,13,32,103,13,177,
+224,97,138,13,64,86,0,0,43,6,32,0,0,0,74,95,
+8,240,35,255,1,0,255,47,32,0,133,13,128,255,14,9,
+43,6,180,215,140,0,99,95,5,0,229,87,64,0,224,7,
+96,1,32,23,173,179,99,87,9,0,224,17,234,5,10,248,
+255,47,32,0,0,18,181,13,34,87,73,0,2,232,96,87,
+173,179,35,255,9,0,255,47,32,0,29,16,2,232,29,48,
+224,233,210,221,35,63,5,0,32,70,156,176,128,255,88,185,
+32,135,217,176,32,127,213,176,96,135,153,176,96,127,149,176,
+10,224,28,6,0,240,178,5,128,7,242,1,96,7,144,176,
+125,7,21,0,253,87,9,0,125,7,29,0,125,7,33,0,
+125,7,45,0,125,7,53,0,29,56,221,207,64,0,162,45,
+61,22,24,0,98,7,1,0,61,55,61,0,61,22,36,0,
+98,87,1,0,38,55,13,0,61,22,48,0,98,7,1,0,
+0,226,191,255,162,221,224,81,162,21,221,255,65,0,226,5,
+96,7,157,176,99,7,13,0,149,61,61,55,61,0,29,56,
+129,255,138,31,1,90,99,95,13,0,133,53,32,230,0,16,
+213,45,61,22,24,0,98,7,1,0,61,55,61,0,61,22,
+36,0,98,87,1,0,38,55,13,0,61,22,48,0,98,7,
+1,0,0,226,191,255,242,226,224,81,226,5,99,7,13,0,
+96,7,157,176,245,13,192,231,144,176,194,5,32,230,0,16,
+149,13,1,130,99,135,13,0,61,55,61,0,29,56,129,255,
+44,31,61,23,61,0,98,7,32,0,28,6,0,240,186,85,
+29,48,128,255,200,7,61,55,61,0,0,58,129,255,130,54,
+61,223,61,0,59,223,17,0,99,7,34,0,99,7,25,0,
+99,7,29,0,128,255,154,242,106,7,9,0,45,6,248,65,
+1,0,106,111,5,0,106,7,29,0,32,102,232,3,106,7,
+33,0,0,210,106,103,21,0,99,87,17,0,99,7,38,0,
+59,23,105,0,35,62,16,0,2,22,144,0,34,87,0,0,
+34,95,5,0,219,81,10,48,63,6,84,79,0,0,107,0,
+35,55,17,0,10,56,128,255,86,241,224,209,250,5,35,23,
+17,0,34,87,0,0,224,81,218,253,65,210,98,210,150,229,
+35,55,17,0,128,255,242,240,224,135,145,176,208,134,239,255,
+96,135,144,176,28,6,0,240,186,5,191,7,130,254,224,225,
+234,69,253,87,9,0,61,23,61,0,32,79,149,176,34,103,
+29,0,32,63,157,176,202,97,98,103,29,0,32,71,153,176,
+29,48,128,255,88,1,61,223,57,0,35,215,13,0,229,87,
+64,0,224,7,96,1,59,255,0,0,218,249,123,255,0,0,
+10,208,250,47,32,0,224,249,138,13,27,48,59,95,5,0,
+63,6,236,79,0,0,107,0,192,247,144,176,130,29,61,55,
+61,0,2,58,129,255,122,53,165,21,224,225,138,21,61,223,
+57,0,1,122,123,127,0,0,29,48,128,255,170,7,123,87,
+12,0,61,55,57,0,31,58,128,255,148,240,224,225,210,5,
+29,48,28,56,128,255,172,5,0,82,86,6,255,48,134,7,
+225,48,7,208,6,216,59,231,57,0,0,234,28,48,128,255,
+188,237,224,81,146,77,48,6,208,227,140,0,99,135,9,0,
+60,79,37,0,60,71,33,0,35,54,8,0,128,255,14,229,
+10,232,224,233,146,13,29,64,38,6,128,143,132,0,32,62,
+153,1,191,255,68,202,35,23,9,0,2,111,0,0,205,110,
+31,0,13,6,240,255,186,13,162,103,5,0,34,94,8,0,
+203,97,226,87,7,0,99,87,5,0,213,29,130,87,1,0,
+216,82,157,82,67,87,3,0,8,90,10,112,194,114,194,113,
+132,111,165,140,97,106,170,5,12,90,11,104,0,90,224,81,
+242,5,162,95,1,0,170,89,130,106,237,95,194,2,99,95,
+5,0,14,96,12,64,224,233,234,21,27,48,35,79,5,0,
+26,56,128,255,40,0,10,232,224,233,146,13,29,64,38,6,
+128,143,132,0,32,62,166,1,191,255,190,201,26,48,1,58,
+128,255,172,239,29,80,70,6,255,48,148,7,225,243,6,232,
+7,208,8,216,9,192,57,6,132,215,255,255,1,130,67,135,
+3,0,25,48,31,58,129,255,6,119,224,81,186,253,61,127,
+65,0,99,127,5,0,0,226,195,215,4,0,242,5,29,48,
+27,56,24,64,128,255,152,7,10,224,35,150,1,0,210,239,
+4,0,210,37,32,119,181,176,224,113,242,29,96,7,181,176,
+32,142,24,177,49,111,1,0,224,105,146,13,38,6,140,143,
+132,0,32,62,69,1,0,66,191,255,62,201,32,54,16,177,
+129,255,12,113,224,81,146,13,38,6,152,143,132,0,32,62,
+183,1,0,66,191,255,34,201,221,175,65,0,35,103,5,0,
+43,6,5,0,16,0,75,97,235,97,234,101,224,225,202,101,
+0,18,221,199,67,0,234,199,0,0,1,218,27,224,236,231,
+64,2,61,118,20,0,220,113,46,103,1,0,224,97,226,77,
+224,17,202,77,61,86,20,0,220,81,234,191,5,0,27,120,
+194,122,32,102,164,176,204,121,47,183,1,0,99,199,9,0,
+32,54,16,177,31,58,129,255,204,111,224,81,170,253,35,151,
+9,0,32,22,4,2,224,145,178,5,32,22,4,19,22,48,
+23,56,2,64,200,0,128,255,192,249,32,142,24,177,49,135,
+1,0,10,184,224,129,146,13,38,6,44,143,132,0,32,62,
+69,1,0,66,191,255,130,200,32,54,16,177,129,255,80,112,
+224,81,146,13,38,6,68,143,132,0,32,62,183,1,0,66,
+191,255,102,200,23,16,224,17,158,13,61,110,20,0,205,225,
+60,23,1,0,194,7,43,0,0,18,65,218,99,218,246,165,
+2,224,221,151,64,0,224,225,130,29,28,232,163,95,3,0,
+224,89,130,21,67,7,3,0,25,48,129,255,212,118,224,81,
+146,13,38,6,80,143,132,0,32,62,6,1,0,66,191,255,
+24,200,29,80,128,7,40,3,224,209,186,5,128,7,4,2,
+61,55,61,0,61,102,32,0,38,55,17,0,195,207,4,0,
+162,93,61,95,5,0,61,87,1,0,44,23,4,0,195,215,
+4,0,178,61,32,142,168,176,49,71,1,0,10,112,11,120,
+2,72,195,231,6,0,154,13,99,119,21,0,99,127,25,0,
+9,130,99,135,37,0,229,13,253,87,25,0,206,81,99,87,
+21,0,225,23,0,0,207,17,99,23,25,0,10,122,99,127,
+37,0,99,7,28,0,99,79,30,0,99,7,34,0,38,23,
+105,0,99,215,13,0,72,18,34,87,0,0,99,71,17,0,
+198,81,10,48,35,62,12,0,34,119,5,0,63,6,72,83,
+0,0,110,0,128,7,108,1,99,7,28,0,99,215,13,0,
+99,7,17,0,99,87,21,0,99,95,25,0,99,23,30,0,
+99,7,37,0,99,7,34,0,35,62,12,0,128,255,44,25,
+128,7,64,1,221,223,11,0,0,18,162,5,8,18,2,128,
+195,231,6,0,178,85,43,6,132,185,255,255,236,111,5,0,
+236,127,7,0,44,87,1,0,15,16,42,87,29,0,133,13,
+170,119,5,0,174,17,196,5,42,87,13,0,2,120,224,17,
+143,253,133,37,15,112,42,23,1,0,201,114,194,113,170,23,
+5,0,175,17,226,105,195,5,162,105,201,18,197,5,13,16,
+201,18,162,105,107,7,1,0,107,7,5,0,107,119,13,0,
+107,23,17,0,107,119,9,0,42,87,13,0,11,94,20,0,
+0,122,224,105,143,229,44,111,1,0,0,226,205,7,42,0,
+44,23,4,0,61,95,5,0,61,87,1,0,44,6,132,185,
+255,255,99,103,17,0,99,87,21,0,99,95,25,0,99,23,
+30,0,11,90,99,95,37,0,229,21,32,142,168,176,49,111,
+1,0,61,95,5,0,61,87,1,0,44,23,4,0,99,111,
+17,0,99,95,25,0,99,87,21,0,99,23,30,0,8,82,
+99,87,37,0,99,7,28,0,99,215,13,0,99,135,34,0,
+35,150,1,0,210,199,6,0,194,21,38,23,105,0,61,71,
+69,0,2,22,48,0,34,87,0,0,35,62,12,0,198,81,
+10,48,34,135,5,0,63,6,146,84,0,0,112,0,149,21,
+38,23,105,0,35,62,12,0,2,22,16,0,34,87,0,0,
+34,127,5,0,198,81,10,48,63,6,180,84,0,0,111,0,
+35,119,5,0,206,118,6,0,102,114,202,117,35,150,1,0,
+210,247,4,0,234,5,35,150,1,0,210,255,4,0,162,109,
+61,223,24,0,224,217,151,53,32,215,165,176,32,54,16,177,
+31,58,129,255,224,108,224,81,170,253,26,48,27,56,32,70,
+136,0,128,255,228,246,32,142,24,177,49,95,1,0,10,216,
+224,89,146,13,38,6,32,143,132,0,32,62,69,1,0,66,
+191,255,166,197,32,54,16,177,129,255,116,109,224,81,146,13,
+38,6,56,143,132,0,32,62,183,1,0,66,191,255,138,197,
+27,16,224,17,174,5,0,18,61,239,48,0,224,233,167,53,
+224,17,138,53,32,142,172,176,49,223,1,0,32,54,16,177,
+31,58,129,255,112,108,224,81,170,253,27,48,29,56,32,70,
+136,0,128,255,116,246,32,142,24,177,49,111,1,0,10,232,
+224,105,146,13,38,6,32,143,132,0,32,62,69,1,0,66,
+191,255,54,197,32,54,16,177,129,255,4,109,224,81,146,13,
+38,6,56,143,132,0,32,62,183,1,0,66,191,255,26,197,
+224,233,28,232,163,95,3,0,224,89,130,21,67,7,3,0,
+25,48,129,255,172,115,224,81,146,13,38,6,80,143,132,0,
+32,62,6,1,0,66,191,255,240,196,29,80,84,6,255,243,
+130,7,225,0,6,232,7,224,32,143,181,176,252,0,224,137,
+210,29,32,150,24,177,50,135,1,0,224,129,146,13,38,6,
+164,143,132,0,32,62,69,1,0,66,191,255,188,196,32,54,
+16,177,129,255,138,108,224,81,146,13,38,6,176,143,132,0,
+32,62,183,1,0,66,191,255,160,196,29,48,28,56,128,255,
+80,225,29,48,129,255,210,24,61,55,57,0,224,49,178,5,
+128,255,164,227,224,231,209,176,149,21,229,87,64,0,32,22,
+159,255,10,232,29,248,66,249,255,47,32,0,29,248,255,47,
+32,0,4,119,92,139,224,113,250,37,51,6,5,0,32,0,
+211,255,0,0,186,237,229,87,64,0,224,7,96,1,32,111,
+185,176,99,87,1,0,95,106,96,111,185,176,202,13,32,103,
+13,177,224,97,138,13,64,86,0,0,43,6,96,0,0,0,
+74,95,8,240,35,255,1,0,255,47,32,0,50,6,54,0,
+32,0,114,231,0,0,66,6,255,0,130,7,225,0,32,143,
+181,176,6,224,224,137,210,85,96,7,181,176,61,6,180,215,
+140,0,29,48,32,62,0,1,128,255,98,240,32,150,24,177,
+50,135,1,0,224,129,146,13,38,6,188,143,132,0,32,62,
+69,1,0,66,191,255,210,195,32,54,16,177,129,255,160,107,
+224,81,146,13,38,6,200,143,132,0,32,62,183,1,0,66,
+191,255,182,195,224,225,210,45,29,127,0,0,207,126,31,0,
+15,6,240,255,154,13,189,87,5,0,61,110,8,0,205,81,
+253,23,7,0,165,29,157,103,1,0,216,98,157,98,67,103,
+3,0,8,18,12,80,194,82,221,81,132,135,165,140,97,130,
+170,5,12,18,2,88,0,18,224,97,242,5,189,23,1,0,
+172,17,130,90,235,23,194,2,96,23,149,176,96,87,153,176,
+66,6,255,0,130,7,225,112,8,232,9,200,7,224,0,218,
+197,29,61,63,5,0,61,55,1,0,61,215,17,0,28,64,
+26,72,224,201,130,13,32,134,36,0,99,135,1,0,128,255,
+18,243,245,5,32,126,129,0,99,127,1,0,128,255,4,243,
+218,225,29,238,20,0,65,218,32,111,149,176,237,217,166,229,
+66,6,255,112,128,7,225,48,6,232,58,6,180,195,140,0,
+128,255,152,12,61,55,57,0,128,255,54,228,0,218,221,239,
+64,0,250,5,221,247,64,0,202,5,221,223,65,0,194,13,
+125,7,36,0,29,48,32,63,153,176,32,71,149,176,26,72,
+128,255,250,8,10,216,32,143,181,176,224,137,210,29,32,150,
+24,177,50,135,1,0,224,129,146,13,38,6,212,143,132,0,
+32,62,69,1,0,66,191,255,160,194,32,54,16,177,129,255,
+110,106,224,81,146,13,38,6,224,143,132,0,32,62,183,1,
+0,66,191,255,132,194,224,217,202,77,0,226,125,7,8,0,
+221,239,64,0,202,5,221,247,64,0,194,29,0,18,26,80,
+0,90,245,5,42,119,17,0,65,90,10,86,20,0,206,17,
+32,111,149,176,237,89,246,245,2,96,169,98,125,103,8,0,
+2,48,128,255,196,10,10,224,224,225,202,5,32,222,21,1,
+133,45,221,239,64,0,242,5,29,48,28,56,26,64,1,74,
+191,255,212,254,221,223,65,0,178,5,26,16,165,5,28,16,
+29,48,2,56,128,255,130,180,10,216,221,247,64,0,242,5,
+29,48,28,56,26,64,0,74,191,255,172,254,221,207,65,0,
+178,5,128,255,62,180,224,225,194,5,28,48,128,255,114,10,
+31,50,128,255,108,11,27,80,64,6,255,48,160,7,225,243,
+6,232,7,16,132,135,165,140,224,129,162,13,34,111,5,0,
+34,103,1,0,34,126,8,0,47,87,1,0,149,13,34,87,
+1,0,0,106,10,96,34,86,4,0,42,87,1,0,32,127,
+205,176,32,119,201,176,239,105,129,13,187,5,238,97,211,5,
+96,103,201,176,96,111,205,176,46,6,132,185,255,255,253,199,
+37,0,253,95,9,0,221,199,67,0,186,5,128,7,212,3,
+12,208,99,23,21,0,99,87,13,0,14,200,137,82,99,87,
+17,0,13,216,253,111,49,0,216,105,235,105,130,45,224,55,
 209,176,221,207,64,0,162,13,221,215,64,0,194,5,32,22,
 82,0,197,13,32,22,86,0,149,13,221,199,64,0,194,5,
-32,22,87,0,181,5,32,22,88,0,39,6,124,132,132,0,
-26,64,27,72,99,23,5,0,99,231,1,0,128,255,22,4,
-35,23,58,0,224,17,170,117,252,193,252,199,50,19,2,80,
-35,151,49,0,137,82,170,145,99,151,49,0,119,215,1,0,
-35,151,41,0,119,23,17,0,119,151,13,0,119,151,9,0,
-119,223,5,0,23,190,20,0,252,17,154,29,132,135,153,140,
-224,129,178,13,76,178,54,223,5,0,54,215,1,0,54,126,
-8,0,47,231,1,0,133,21,72,178,54,87,1,0,0,218,
-10,208,54,86,4,0,42,231,1,0,229,5,194,209,225,103,
-0,0,204,217,162,225,248,17,234,29,35,151,49,0,224,145,
-135,37,57,207,13,0,224,201,154,13,38,6,40,132,132,0,
-32,62,201,6,0,66,191,255,148,187,57,151,1,0,99,151,
-41,0,35,151,49,0,185,23,5,0,226,145,226,151,60,195,
-201,194,245,5,35,151,41,0,162,193,194,145,99,151,41,0,
-35,151,49,0,224,145,183,5,191,7,164,254,35,151,53,0,
-76,146,99,151,53,0,35,151,61,0,65,146,99,151,61,0,
-99,146,190,5,191,7,18,254,0,18,2,80,128,7,102,1,
-12,208,13,216,10,224,2,184,99,71,61,0,14,200,235,193,
-231,37,224,55,209,176,221,207,64,0,162,13,221,215,64,0,
+32,22,87,0,181,5,32,22,88,0,39,6,92,143,132,0,
+26,64,35,151,13,0,99,23,5,0,99,151,1,0,27,72,
+128,255,166,9,32,22,3,1,128,7,98,3,253,151,25,0,
+99,151,57,0,61,150,32,0,99,151,25,0,1,146,99,151,
+49,0,35,135,25,0,48,135,1,0,224,129,138,13,35,151,
+25,0,76,146,99,151,25,0,128,7,30,3,35,127,49,0,
+32,102,164,176,15,88,194,122,204,121,111,207,1,0,236,95,
+64,2,61,126,20,0,207,89,43,231,9,0,35,143,25,0,
+99,231,61,0,241,95,7,0,49,183,1,0,11,80,10,16,
+54,183,29,0,229,5,172,17,196,5,54,183,13,0,2,80,
+182,103,5,0,224,17,143,253,10,144,54,23,1,0,201,146,
+194,145,99,151,29,0,170,97,35,199,57,0,99,103,33,0,
+248,95,192,90,60,23,17,0,171,193,137,18,224,89,247,21,
+229,5,28,230,20,0,60,23,17,0,137,18,162,89,172,253,
+11,80,128,81,234,193,234,199,50,147,99,151,37,0,11,184,
+194,185,60,111,13,0,201,186,205,185,133,13,226,193,226,199,
+50,147,99,151,37,0,60,191,13,0,35,151,25,0,242,151,
+5,0,99,151,53,0,32,87,177,176,99,7,42,0,234,201,
+227,5,32,150,97,1,99,151,42,0,245,29,251,1,186,5,
+250,1,210,5,35,151,13,0,224,145,234,5,32,150,0,1,
+99,151,42,0,165,21,218,86,3,0,226,5,32,150,2,1,
+99,151,42,0,165,13,35,151,13,0,210,118,255,1,210,5,
+32,150,4,1,99,151,42,0,35,111,42,0,224,105,194,37,
+224,55,209,176,221,207,64,0,162,13,221,215,64,0,194,5,
+32,22,82,0,197,13,32,22,86,0,149,13,221,199,64,0,
+194,5,32,22,87,0,181,5,32,22,88,0,39,6,92,143,
+132,0,26,64,35,151,13,0,99,23,5,0,99,151,1,0,
+27,72,128,255,20,8,35,23,42,0,224,17,178,5,128,7,
+204,1,35,151,33,0,35,143,17,0,241,145,241,151,50,139,
+35,151,37,0,241,145,241,151,50,147,99,151,9,0,35,151,
+29,0,121,215,1,0,121,151,9,0,121,223,5,0,35,151,
+53,0,35,143,9,0,121,191,13,0,177,145,99,151,53,0,
+224,145,239,29,224,145,146,13,38,6,20,143,132,0,32,62,
+153,7,0,66,191,255,34,191,35,135,9,0,35,151,25,0,
+201,130,76,146,121,135,17,0,99,151,25,0,50,119,1,0,
+25,206,20,0,224,113,186,5,128,7,62,1,229,5,201,138,
+121,143,17,0,25,206,20,0,35,143,9,0,17,144,201,146,
+99,151,41,0,35,151,17,0,177,145,99,151,17,0,154,45,
+132,135,165,140,224,129,146,21,35,151,21,0,76,146,99,151,
+21,0,50,223,5,0,50,215,1,0,50,126,8,0,47,151,
+1,0,99,151,13,0,245,13,35,151,21,0,72,146,99,151,
+21,0,50,215,1,0,50,22,4,0,34,151,1,0,0,218,
+99,151,13,0,35,151,13,0,137,146,99,151,17,0,245,13,
+35,143,41,0,35,151,13,0,17,72,191,74,209,209,225,103,
+0,0,204,73,201,217,177,145,99,151,13,0,35,151,53,0,
+224,145,167,85,35,151,33,0,35,143,9,0,177,145,99,151,
+33,0,234,21,54,183,13,0,224,177,154,13,38,6,20,143,
+132,0,32,62,222,7,0,66,191,255,62,190,182,151,5,0,
+99,151,33,0,54,151,1,0,99,151,29,0,133,13,35,151,
+29,0,35,143,41,0,209,145,99,151,29,0,35,143,9,0,
+177,193,154,21,35,231,61,0,35,199,57,0,60,111,17,0,
+60,191,13,0,137,106,237,193,237,199,50,147,99,151,37,0,
+191,7,214,253,35,151,37,0,177,145,99,151,37,0,250,13,
+28,230,20,0,60,87,17,0,60,191,13,0,137,82,234,193,
+234,199,50,147,99,151,37,0,191,7,174,253,35,143,41,0,
+209,185,191,7,164,253,35,151,49,0,65,146,99,151,49,0,
+99,146,190,5,191,7,190,252,0,18,2,80,128,7,218,3,
+221,231,66,0,186,5,128,7,110,2,12,208,13,216,10,224,
+2,176,14,184,253,127,25,0,207,193,253,103,49,0,216,97,
+235,97,226,37,224,55,209,176,221,207,64,0,162,13,221,215,
+64,0,194,5,32,22,82,0,197,13,32,22,86,0,149,13,
+221,199,64,0,194,5,32,22,87,0,181,5,32,22,88,0,
+39,6,92,143,132,0,26,64,27,72,99,23,5,0,99,231,
+1,0,128,255,212,5,32,22,3,1,128,7,4,2,61,150,
+20,0,99,151,53,0,99,7,61,0,35,135,53,0,48,135,
+1,0,224,129,186,5,128,7,202,1,35,151,61,0,224,145,
+247,5,194,146,32,102,164,176,204,145,114,191,1,0,35,143,
+53,0,49,207,1,0,241,95,7,0,11,16,57,207,29,0,
+229,5,170,17,196,5,57,207,13,0,2,88,185,87,5,0,
+224,17,143,253,35,151,53,0,242,151,5,0,99,151,49,0,
+57,23,1,0,11,144,201,146,194,145,99,151,41,0,35,151,
+49,0,171,81,234,145,234,151,60,195,201,194,128,7,88,1,
+32,87,177,176,99,7,58,0,234,185,227,5,32,150,97,1,
+99,151,58,0,181,29,251,1,186,5,250,1,178,5,224,225,
+234,5,32,150,0,1,99,151,58,0,133,21,218,86,3,0,
+226,5,32,150,2,1,99,151,58,0,133,13,220,118,255,1,
+210,5,32,150,4,1,99,151,58,0,35,111,58,0,224,105,
+162,37,224,55,209,176,221,207,64,0,162,13,221,215,64,0,
 194,5,32,22,82,0,197,13,32,22,86,0,149,13,221,199,
 64,0,194,5,32,22,87,0,181,5,32,22,88,0,39,6,
-124,132,132,0,26,64,27,72,99,23,5,0,99,231,1,0,
-128,255,210,2,32,22,3,1,128,7,8,1,224,193,202,5,
-56,6,255,255,255,127,32,142,168,176,113,207,1,0,165,117,
-32,135,177,176,0,178,240,201,195,5,32,182,97,1,213,21,
-251,1,186,5,250,1,178,5,224,225,202,5,32,182,0,1,
-197,13,218,86,3,0,194,5,32,182,2,1,229,5,220,110,
-255,1,178,5,32,182,4,1,224,177,162,37,224,55,209,176,
-221,207,64,0,162,13,221,215,64,0,194,5,32,22,82,0,
-197,13,32,22,86,0,149,13,221,199,64,0,194,5,32,22,
-87,0,181,5,32,22,88,0,39,6,124,132,132,0,26,64,
-27,72,99,23,5,0,99,231,1,0,128,255,56,2,22,16,
-224,17,250,53,28,128,137,130,176,193,204,5,24,224,201,226,
-128,225,35,151,61,0,121,7,9,0,95,146,121,7,13,0,
-121,231,17,0,121,223,5,0,121,215,1,0,99,151,61,0,
-25,206,20,0,132,111,153,140,224,105,178,13,76,186,55,223,
-5,0,55,215,1,0,55,102,8,0,44,231,1,0,165,13,
-72,186,55,23,1,0,0,218,2,208,55,22,4,0,34,231,
-1,0,35,151,61,0,224,145,183,5,224,193,175,141,0,18,
-2,80,96,6,255,243,134,7,225,243,6,184,7,16,132,135,
-153,140,224,129,162,13,34,95,5,0,34,87,1,0,34,126,
-8,0,47,103,1,0,133,13,34,87,1,0,0,90,34,102,
-4,0,44,103,1,0,10,208,11,216,12,232,2,200,99,71,
-9,0,9,224,247,199,37,0,247,119,9,0,238,193,231,37,
-224,55,209,176,215,207,64,0,162,13,215,215,64,0,194,5,
-32,22,82,0,197,13,32,22,86,0,149,13,215,199,64,0,
-194,5,32,22,87,0,181,5,32,22,88,0,26,64,27,72,
-99,239,1,0,99,23,5,0,39,6,124,132,132,0,128,255,
-52,1,32,22,3,1,128,7,8,1,224,193,202,5,56,6,
-255,255,255,127,32,142,168,176,113,231,1,0,165,117,32,103,
-177,176,0,178,236,225,195,5,32,182,97,1,213,21,251,1,
-186,5,250,1,178,5,224,233,202,5,32,182,0,1,197,13,
-218,86,3,0,194,5,32,182,2,1,229,5,221,134,255,1,
-178,5,32,182,4,1,224,177,162,37,224,55,209,176,215,207,
-64,0,162,13,215,215,64,0,194,5,32,22,82,0,197,13,
-32,22,86,0,149,13,215,199,64,0,194,5,32,22,87,0,
-181,5,32,22,88,0,26,64,27,72,99,239,1,0,99,23,
-5,0,39,6,124,132,132,0,128,255,154,0,22,16,224,17,
-250,53,29,96,137,98,172,193,204,5,24,232,201,234,128,233,
-35,151,9,0,124,7,9,0,95,146,124,7,13,0,124,239,
-17,0,124,223,5,0,124,215,1,0,99,151,9,0,28,230,
-20,0,132,135,153,140,224,129,178,13,76,202,57,223,5,0,
-57,215,1,0,57,126,8,0,47,239,1,0,165,13,72,202,
-57,23,1,0,0,218,2,208,57,22,4,0,34,239,1,0,
-35,151,9,0,224,145,183,5,224,193,175,141,0,18,2,80,
-70,6,255,243,128,7,130,7,128,7,142,7,128,7,140,7,
-130,7,33,6,96,28,130,0,97,0,33,6,68,28,130,0,
-97,0,33,6,196,254,128,0,97,0,128,7,33,0,38,6,
-140,228,140,0,39,6,24,133,132,0,0,66,128,255,18,1,
-64,6,63,0,128,7,33,0,32,135,37,183,32,142,176,179,
-241,129,234,21,32,150,24,177,50,127,1,0,97,122,146,13,
-38,6,40,133,132,0,32,62,98,0,0,66,191,255,206,183,
-128,255,196,0,224,81,194,5,31,50,128,255,160,0,64,6,
-63,0,128,7,33,0,32,23,37,183,32,142,176,179,241,17,
-178,5,128,255,162,0,64,6,63,0,132,7,225,112,6,200,
-0,210,32,239,37,183,32,142,176,179,241,233,194,53,60,6,
-52,133,132,0,29,48,0,58,3,64,128,255,156,0,224,81,
-242,5,28,48,32,62,194,0,0,66,191,255,112,183,32,54,
-72,180,2,58,0,66,129,255,148,94,10,216,224,217,242,5,
-28,48,32,62,201,0,0,66,191,255,82,183,25,48,128,255,
-44,0,10,208,35,63,1,0,29,48,35,70,4,0,128,255,
-88,0,224,217,130,13,28,48,32,62,210,0,0,66,191,255,
-44,183,224,81,26,80,68,6,255,112,128,7,33,0,6,56,
-38,6,140,228,140,0,129,255,60,98,224,81,226,87,0,0,
-64,6,63,0,128,7,33,0,38,6,140,228,140,0,128,255,
-8,0,64,6,63,0,33,6,192,20,128,0,97,0,33,6,
-20,40,129,0,97,0,33,6,78,246,129,0,97,0,128,7,
-97,0,128,255,72,6,229,87,64,0,224,7,96,1,10,248,
-64,86,0,0,10,87,116,241,138,238,64,0,64,86,0,0,
-74,239,116,241,255,47,32,0,64,86,0,0,202,191,116,241,
+92,143,132,0,26,64,27,72,99,23,5,0,99,231,1,0,
+128,255,182,4,35,23,58,0,224,17,170,117,252,193,252,199,
+50,19,2,80,35,151,49,0,137,82,170,145,99,151,49,0,
+119,215,1,0,35,151,41,0,119,23,17,0,119,151,13,0,
+119,151,9,0,119,223,5,0,23,190,20,0,252,17,154,29,
+132,135,165,140,224,129,178,13,76,178,54,223,5,0,54,215,
+1,0,54,126,8,0,47,231,1,0,133,21,72,178,54,87,
+1,0,0,218,10,208,54,86,4,0,42,231,1,0,229,5,
+194,209,225,103,0,0,204,217,162,225,248,17,234,29,35,151,
+49,0,224,145,135,37,57,207,13,0,224,201,154,13,38,6,
+8,143,132,0,32,62,201,6,0,66,191,255,140,187,57,151,
+1,0,99,151,41,0,35,151,49,0,185,23,5,0,226,145,
+226,151,60,195,201,194,245,5,35,151,41,0,162,193,194,145,
+99,151,41,0,35,151,49,0,224,145,183,5,191,7,164,254,
+35,151,53,0,76,146,99,151,53,0,35,151,61,0,65,146,
+99,151,61,0,99,146,190,5,191,7,18,254,0,18,2,80,
+128,7,102,1,12,208,13,216,10,224,2,184,99,71,61,0,
+14,200,235,193,231,37,224,55,209,176,221,207,64,0,162,13,
+221,215,64,0,194,5,32,22,82,0,197,13,32,22,86,0,
+149,13,221,199,64,0,194,5,32,22,87,0,181,5,32,22,
+88,0,39,6,92,143,132,0,26,64,27,72,99,23,5,0,
+99,231,1,0,128,255,114,3,32,22,3,1,128,7,8,1,
+224,193,202,5,56,6,255,255,255,127,32,142,168,176,113,207,
+1,0,165,117,32,135,177,176,0,178,240,201,195,5,32,182,
+97,1,213,21,251,1,186,5,250,1,178,5,224,225,202,5,
+32,182,0,1,197,13,218,86,3,0,194,5,32,182,2,1,
+229,5,220,110,255,1,178,5,32,182,4,1,224,177,162,37,
+224,55,209,176,221,207,64,0,162,13,221,215,64,0,194,5,
+32,22,82,0,197,13,32,22,86,0,149,13,221,199,64,0,
+194,5,32,22,87,0,181,5,32,22,88,0,39,6,92,143,
+132,0,26,64,27,72,99,23,5,0,99,231,1,0,128,255,
+216,2,22,16,224,17,250,53,28,128,137,130,176,193,204,5,
+24,224,201,226,128,225,35,151,61,0,121,7,9,0,95,146,
+121,7,13,0,121,231,17,0,121,223,5,0,121,215,1,0,
+99,151,61,0,25,206,20,0,132,111,165,140,224,105,178,13,
+76,186,55,223,5,0,55,215,1,0,55,102,8,0,44,231,
+1,0,165,13,72,186,55,23,1,0,0,218,2,208,55,22,
+4,0,34,231,1,0,35,151,61,0,224,145,183,5,224,193,
+175,141,0,18,2,80,96,6,255,243,134,7,225,243,6,184,
+7,16,132,135,165,140,224,129,162,13,34,95,5,0,34,87,
+1,0,34,126,8,0,47,103,1,0,133,13,34,87,1,0,
+0,90,34,102,4,0,44,103,1,0,10,208,11,216,12,232,
+2,200,99,71,9,0,9,224,247,199,37,0,247,119,9,0,
+238,193,231,37,224,55,209,176,215,207,64,0,162,13,215,215,
+64,0,194,5,32,22,82,0,197,13,32,22,86,0,149,13,
+215,199,64,0,194,5,32,22,87,0,181,5,32,22,88,0,
+26,64,27,72,99,239,1,0,99,23,5,0,39,6,92,143,
+132,0,128,255,212,1,32,22,3,1,128,7,8,1,224,193,
+202,5,56,6,255,255,255,127,32,142,168,176,113,231,1,0,
+165,117,32,103,177,176,0,178,236,225,195,5,32,182,97,1,
+213,21,251,1,186,5,250,1,178,5,224,233,202,5,32,182,
+0,1,197,13,218,86,3,0,194,5,32,182,2,1,229,5,
+221,134,255,1,178,5,32,182,4,1,224,177,162,37,224,55,
+209,176,215,207,64,0,162,13,215,215,64,0,194,5,32,22,
+82,0,197,13,32,22,86,0,149,13,215,199,64,0,194,5,
+32,22,87,0,181,5,32,22,88,0,26,64,27,72,99,239,
+1,0,99,23,5,0,39,6,92,143,132,0,128,255,58,1,
+22,16,224,17,250,53,29,96,137,98,172,193,204,5,24,232,
+201,234,128,233,35,151,9,0,124,7,9,0,95,146,124,7,
+13,0,124,239,17,0,124,223,5,0,124,215,1,0,99,151,
+9,0,28,230,20,0,132,135,165,140,224,129,178,13,76,202,
+57,223,5,0,57,215,1,0,57,126,8,0,47,239,1,0,
+165,13,72,202,57,23,1,0,0,218,2,208,57,22,4,0,
+34,239,1,0,35,151,9,0,224,145,183,5,224,193,175,141,
+0,18,2,80,70,6,255,243,128,7,130,7,128,7,142,7,
+128,7,140,7,130,7,97,0,35,23,13,0,32,135,177,176,
+35,87,17,0,0,234,240,81,195,5,32,238,97,1,213,21,
+233,1,186,5,232,1,178,5,224,17,202,5,32,238,0,1,
+197,13,200,86,3,0,194,5,32,238,2,1,229,5,194,110,
+255,1,178,5,32,238,4,1,224,233,210,5,99,23,1,0,
+128,255,10,0,29,80,66,6,127,0,132,7,33,0,35,95,
+13,0,224,87,209,176,198,207,64,0,162,13,198,215,64,0,
+194,5,32,22,82,0,197,13,32,22,86,0,149,13,198,199,
+64,0,194,5,32,22,87,0,181,5,32,22,88,0,10,48,
+99,95,1,0,99,23,5,0,39,6,92,143,132,0,128,255,
+24,0,68,6,63,0,33,6,4,37,130,0,97,0,33,6,
+232,36,130,0,97,0,33,6,0,3,129,0,97,0,128,7,
+33,0,38,6,236,239,140,0,39,6,248,143,132,0,0,66,
+128,255,18,1,64,6,63,0,128,7,33,0,32,135,37,183,
+32,142,176,179,241,129,234,21,32,150,24,177,50,127,1,0,
+97,122,146,13,38,6,8,144,132,0,32,62,98,0,0,66,
+191,255,38,183,128,255,196,0,224,81,194,5,31,50,128,255,
+160,0,64,6,63,0,128,7,33,0,32,23,37,183,32,142,
+176,179,241,17,178,5,128,255,162,0,64,6,63,0,132,7,
+225,112,6,200,0,210,32,239,37,183,32,142,176,179,241,233,
+194,53,60,6,20,144,132,0,29,48,0,58,3,64,128,255,
+156,0,224,81,242,5,28,48,32,62,194,0,0,66,191,255,
+200,182,32,54,72,180,2,58,0,66,129,255,58,96,10,216,
+224,217,242,5,28,48,32,62,201,0,0,66,191,255,170,182,
+25,48,128,255,44,0,10,208,35,63,1,0,29,48,35,70,
+4,0,128,255,88,0,224,217,130,13,28,48,32,62,210,0,
+0,66,191,255,132,182,224,81,26,80,68,6,255,112,128,7,
+33,0,6,56,38,6,236,239,140,0,129,255,226,99,224,81,
+226,87,0,0,64,6,63,0,128,7,33,0,38,6,236,239,
+140,0,128,255,8,0,64,6,63,0,33,6,128,21,128,0,
+97,0,33,6,32,46,129,0,97,0,33,6,242,254,129,0,
+97,0,128,7,97,0,128,255,72,6,229,87,64,0,224,7,
+96,1,10,248,64,86,0,0,10,87,116,241,138,238,64,0,
+64,86,0,0,74,239,116,241,255,47,32,0,64,86,0,0,
+202,191,116,241,229,87,64,0,224,7,96,1,10,248,64,86,
+0,0,10,87,118,241,138,238,64,0,64,86,0,0,74,239,
+118,241,255,47,32,0,64,86,0,0,202,191,118,241,229,87,
+64,0,224,7,96,1,10,248,64,86,0,0,10,87,146,241,
+138,238,64,0,64,86,0,0,74,239,146,241,255,47,32,0,
+64,86,0,0,202,191,146,241,229,87,64,0,224,7,96,1,
+10,248,64,86,0,0,10,87,32,241,138,238,64,0,64,86,
+0,0,74,239,32,241,255,47,32,0,64,86,0,0,202,191,
+32,241,229,87,64,0,224,7,96,1,10,248,64,86,0,0,
+10,87,34,241,138,238,64,0,64,86,0,0,74,239,34,241,
+255,47,32,0,64,86,0,0,202,191,34,241,229,87,64,0,
+224,7,96,1,10,248,64,86,0,0,10,87,36,241,138,238,
+64,0,64,86,0,0,74,239,36,241,255,47,32,0,64,86,
+0,0,202,191,36,241,229,87,64,0,224,7,96,1,10,248,
+64,86,0,0,10,87,38,241,138,238,64,0,64,86,0,0,
+74,239,38,241,255,47,32,0,64,86,0,0,202,191,38,241,
 229,87,64,0,224,7,96,1,10,248,64,86,0,0,10,87,
-118,241,138,238,64,0,64,86,0,0,74,239,118,241,255,47,
-32,0,64,86,0,0,202,191,118,241,229,87,64,0,224,7,
-96,1,10,248,64,86,0,0,10,87,146,241,138,238,64,0,
-64,86,0,0,74,239,146,241,255,47,32,0,64,86,0,0,
-202,191,146,241,229,87,64,0,224,7,96,1,10,248,64,86,
-0,0,10,87,32,241,138,238,64,0,64,86,0,0,74,239,
-32,241,255,47,32,0,64,86,0,0,202,191,32,241,229,87,
-64,0,224,7,96,1,10,248,64,86,0,0,10,87,34,241,
-138,238,64,0,64,86,0,0,74,239,34,241,255,47,32,0,
-64,86,0,0,202,191,34,241,229,87,64,0,224,7,96,1,
-10,248,64,86,0,0,10,87,36,241,138,238,64,0,64,86,
-0,0,74,239,36,241,255,47,32,0,64,86,0,0,202,191,
-36,241,229,87,64,0,224,7,96,1,10,248,64,86,0,0,
-10,87,38,241,138,238,64,0,64,86,0,0,74,239,38,241,
-255,47,32,0,64,86,0,0,202,191,38,241,229,87,64,0,
-224,7,96,1,10,248,64,86,0,0,10,87,40,241,138,238,
-64,0,64,86,0,0,74,239,40,241,255,47,32,0,64,86,
-0,0,202,191,40,241,229,87,64,0,224,7,96,1,10,248,
-64,86,0,0,10,87,174,241,138,238,64,0,64,86,0,0,
-74,239,174,241,255,47,32,0,64,86,0,0,202,191,174,241,
-64,86,0,0,0,90,74,95,14,244,64,86,0,0,43,6,
-32,0,0,0,74,95,10,244,64,86,0,0,43,6,28,0,
-0,0,74,95,14,244,64,86,0,0,43,6,40,0,0,0,
-74,95,10,244,128,255,8,0,64,6,127,0,128,7,65,0,
-4,23,80,139,4,87,81,139,99,18,178,5,224,81,210,13,
-2,232,224,7,96,1,29,48,0,58,0,66,64,254,128,0,
-63,254,0,0,127,0,197,13,2,232,224,7,96,1,29,56,
-0,66,0,74,64,254,16,0,63,254,2,0,127,0,64,6,
-95,0,128,7,33,0,128,255,8,0,64,6,63,0,128,7,
-65,0,229,87,64,0,224,7,96,1,10,232,64,86,0,0,
-42,87,112,240,224,81,186,253,64,86,0,0,3,90,106,95,
-112,240,64,86,0,0,42,87,112,240,224,81,186,253,253,47,
-32,0,64,6,95,0,128,7,193,16,128,230,27,183,64,86,
-0,0,4,90,74,95,106,240,64,86,0,0,43,6,48,0,
-0,0,106,95,144,244,64,86,0,0,0,90,106,95,146,244,
-64,86,0,0,43,6,119,34,0,0,106,95,132,244,64,86,
-0,0,43,6,119,119,0,0,106,95,134,244,128,238,163,255,
-64,86,0,0,106,239,136,244,128,238,175,255,64,86,0,0,
-106,239,138,244,64,86,0,0,43,6,224,0,0,0,74,95,
-76,244,64,86,0,0,0,90,74,95,108,244,64,86,0,0,
-0,90,74,95,44,252,64,86,0,0,43,6,224,0,0,0,
-74,95,12,252,64,86,0,0,0,90,74,95,78,244,64,86,
-0,0,43,6,227,0,0,0,74,95,46,244,64,86,0,0,
+40,241,138,238,64,0,64,86,0,0,74,239,40,241,255,47,
+32,0,64,86,0,0,202,191,40,241,229,87,64,0,224,7,
+96,1,10,248,64,86,0,0,10,87,174,241,138,238,64,0,
+64,86,0,0,74,239,174,241,255,47,32,0,64,86,0,0,
+202,191,174,241,64,86,0,0,0,90,74,95,14,244,64,86,
+0,0,43,6,32,0,0,0,74,95,10,244,64,86,0,0,
 43,6,28,0,0,0,74,95,14,244,64,86,0,0,43,6,
-22,0,0,0,74,95,74,244,64,86,0,0,43,6,215,0,
-0,0,74,95,42,244,64,86,0,0,0,90,74,95,106,244,
-64,86,0,0,0,90,74,95,42,252,64,86,0,0,7,90,
-74,95,10,252,64,86,0,0,43,6,40,0,0,0,74,95,
-10,244,64,86,0,0,43,6,16,0,0,0,74,95,0,242,
-64,86,0,0,2,90,74,95,1,242,64,86,0,0,43,6,
-199,0,0,0,74,95,68,244,64,86,0,0,43,6,199,0,
-0,0,74,95,100,244,64,86,0,0,43,6,249,0,0,0,
-74,95,36,244,64,86,0,0,43,6,144,0,0,0,74,95,
-32,250,64,86,0,0,43,6,162,0,0,0,106,95,34,250,
-64,86,0,0,43,6,242,0,0,0,74,95,32,250,64,86,
-0,0,43,6,62,0,0,0,74,95,16,248,64,86,0,0,
-43,6,32,0,0,0,106,95,208,240,64,86,0,0,43,6,
-255,15,0,0,106,95,134,240,128,238,40,250,64,86,0,0,
-106,239,132,240,229,87,64,0,224,7,96,1,10,216,64,86,
-0,0,10,87,146,241,10,232,32,86,191,255,74,233,64,86,
-0,0,74,239,146,241,251,47,32,0,229,87,64,0,224,7,
-96,1,10,216,64,86,0,0,10,87,174,241,10,232,32,86,
-191,255,74,233,64,86,0,0,74,239,174,241,251,47,32,0,
-64,86,0,0,1,90,74,95,84,245,64,86,0,0,106,231,
-82,245,229,87,64,0,224,7,96,1,10,224,64,86,0,0,
-10,87,116,241,10,232,32,86,191,255,74,233,64,86,0,0,
-74,239,116,241,252,47,32,0,64,86,0,0,43,6,35,0,
-0,0,74,95,84,245,64,86,0,0,1,90,74,95,100,245,
-229,87,64,0,224,7,96,1,10,224,64,86,0,0,10,87,
-118,241,10,232,32,86,191,255,74,233,64,86,0,0,74,239,
-118,241,252,47,32,0,64,86,0,0,43,6,113,0,0,0,
-74,95,100,245,64,86,0,0,0,90,74,95,40,240,64,86,
-0,0,43,6,159,0,0,0,74,95,72,240,64,86,0,0,
-43,6,32,0,0,0,74,95,8,240,64,86,0,0,1,90,
-74,95,2,244,64,86,0,0,43,6,240,0,0,0,74,95,
-34,244,64,86,0,0,2,90,74,95,98,244,64,86,0,0,
-43,6,56,0,0,0,74,95,1,253,64,86,0,0,43,6,
-144,0,0,0,74,95,0,253,64,86,0,0,8,90,74,95,
-9,253,64,86,0,0,14,90,74,95,66,244,64,6,223,16,
-128,7,193,48,6,224,7,232,221,0,224,233,146,61,28,215,
-0,0,95,234,65,226,221,0,224,233,178,5,95,234,221,0,
-64,86,0,0,10,87,16,248,32,94,127,255,202,222,127,0,
-64,86,0,0,74,223,16,248,28,16,144,18,194,222,255,15,
-64,86,0,0,106,223,130,240,64,86,0,0,106,231,128,240,
-64,86,0,0,106,239,192,240,64,86,0,0,10,87,224,240,
-64,86,0,0,10,87,224,240,138,238,1,0,64,86,0,0,
-74,239,224,240,26,232,64,86,0,0,74,239,40,250,64,6,
-223,48,128,7,193,48,6,208,154,0,26,232,64,86,0,0,
-74,239,2,242,0,226,0,218,64,86,0,0,10,87,0,242,
-138,238,128,0,64,86,0,0,74,239,0,242,61,6,64,13,
-3,0,64,86,0,0,10,87,0,242,135,82,177,5,95,234,
-154,253,61,6,64,13,3,0,64,86,0,0,10,87,0,242,
-135,82,185,5,95,234,154,253,64,86,0,0,10,87,0,242,
-32,94,127,255,202,238,127,0,64,86,0,0,74,239,0,242,
-26,16,193,18,2,238,16,242,61,87,1,0,202,225,65,218,
-100,218,182,205,28,128,191,130,158,130,208,225,130,226,220,0,
-28,80,202,0,64,6,223,48,127,0,33,6,214,176,129,0,
-97,0,128,7,33,0,224,49,162,13,49,6,48,72,133,0,
-102,143,105,0,129,58,185,5,128,255,28,26,64,6,63,0,
-128,7,33,0,38,23,105,0,63,6,112,106,0,0,2,22,
-208,0,34,87,0,0,34,143,5,0,198,81,10,48,113,0,
-64,6,63,0,0,82,127,0,128,7,193,48,6,208,229,87,
-64,0,224,7,96,1,10,216,58,239,93,0,58,231,89,0,
-251,47,32,0,29,88,28,80,64,6,223,48,128,7,33,0,
-224,49,138,13,32,54,108,0,128,255,204,25,10,48,224,49,
-178,45,48,6,48,72,133,0,102,135,105,0,102,7,85,0,
-102,7,81,0,102,7,4,0,70,7,1,0,70,7,0,0,
-70,7,7,0,102,7,89,0,102,7,93,0,0,18,1,82,
-102,87,97,0,102,7,101,0,102,87,8,0,102,87,14,0,
-2,104,194,106,38,86,16,0,202,105,109,7,1,0,65,18,
-2,6,240,255,230,245,6,80,64,6,63,0,128,7,33,0,
-38,6,132,215,255,255,39,6,204,135,132,0,0,66,191,255,
-176,248,38,6,180,215,255,255,39,6,220,135,132,0,1,66,
-128,255,60,25,64,6,63,0,128,7,225,240,6,232,7,208,
-58,199,1,0,128,255,138,212,49,6,148,204,1,0,106,143,
-5,0,0,202,106,199,9,0,0,226,122,87,1,0,213,61,
-28,216,194,218,61,126,16,0,219,121,47,111,1,0,224,105,
-178,53,29,103,7,0,12,6,17,0,154,21,61,23,105,0,
-63,6,152,107,0,0,2,22,88,1,34,87,0,0,34,95,
-5,0,221,81,10,48,107,0,252,81,226,29,61,86,16,0,
-27,136,209,81,42,23,1,0,26,56,34,23,105,0,61,86,
-16,0,219,81,2,22,144,0,34,95,0,0,42,55,1,0,
-11,96,204,49,34,127,5,0,63,6,208,107,0,0,111,0,
-224,81,162,5,65,202,65,226,61,119,4,0,238,225,150,197,
-58,55,1,0,25,56,128,255,246,210,122,199,1,0,1,82,
-64,6,255,240,138,7,225,16,99,7,1,0,99,7,5,0,
-99,7,9,0,39,231,5,0,99,7,13,0,39,127,16,0,
-39,111,18,0,15,128,208,105,201,106,99,111,17,0,3,96,
-39,223,25,0,38,23,105,0,103,103,5,0,72,18,34,87,
-0,0,103,7,25,0,198,81,10,48,7,232,34,95,5,0,
-63,6,72,108,0,0,107,0,125,223,25,0,125,231,5,0,
-74,6,255,16,128,7,225,0,6,224,0,234,181,37,29,16,
+40,0,0,0,74,95,10,244,128,255,8,0,64,6,127,0,
+128,7,65,0,4,23,92,139,4,87,93,139,99,18,178,5,
+224,81,210,13,2,232,224,7,96,1,29,48,0,58,0,66,
+64,254,128,0,63,254,0,0,127,0,197,13,2,232,224,7,
+96,1,29,56,0,66,0,74,64,254,16,0,63,254,2,0,
+127,0,64,6,95,0,128,7,33,0,128,255,8,0,64,6,
+63,0,128,7,65,0,229,87,64,0,224,7,96,1,10,232,
+64,86,0,0,42,87,112,240,224,81,186,253,64,86,0,0,
+3,90,106,95,112,240,64,86,0,0,42,87,112,240,224,81,
+186,253,253,47,32,0,64,6,95,0,128,7,193,16,128,230,
+27,183,64,86,0,0,4,90,74,95,106,240,64,86,0,0,
+43,6,48,0,0,0,106,95,144,244,64,86,0,0,0,90,
+106,95,146,244,64,86,0,0,43,6,119,34,0,0,106,95,
+132,244,64,86,0,0,43,6,119,119,0,0,106,95,134,244,
+128,238,163,255,64,86,0,0,106,239,136,244,128,238,175,255,
+64,86,0,0,106,239,138,244,64,86,0,0,43,6,224,0,
+0,0,74,95,76,244,64,86,0,0,0,90,74,95,108,244,
+64,86,0,0,0,90,74,95,44,252,64,86,0,0,43,6,
+224,0,0,0,74,95,12,252,64,86,0,0,0,90,74,95,
+78,244,64,86,0,0,43,6,227,0,0,0,74,95,46,244,
+64,86,0,0,43,6,28,0,0,0,74,95,14,244,64,86,
+0,0,43,6,22,0,0,0,74,95,74,244,64,86,0,0,
+43,6,215,0,0,0,74,95,42,244,64,86,0,0,0,90,
+74,95,106,244,64,86,0,0,0,90,74,95,42,252,64,86,
+0,0,7,90,74,95,10,252,64,86,0,0,43,6,40,0,
+0,0,74,95,10,244,64,86,0,0,43,6,16,0,0,0,
+74,95,0,242,64,86,0,0,2,90,74,95,1,242,64,86,
+0,0,43,6,199,0,0,0,74,95,68,244,64,86,0,0,
+43,6,199,0,0,0,74,95,100,244,64,86,0,0,43,6,
+249,0,0,0,74,95,36,244,64,86,0,0,43,6,144,0,
+0,0,74,95,32,250,64,86,0,0,43,6,162,0,0,0,
+106,95,34,250,64,86,0,0,43,6,242,0,0,0,74,95,
+32,250,64,86,0,0,43,6,62,0,0,0,74,95,16,248,
+64,86,0,0,43,6,32,0,0,0,106,95,208,240,64,86,
+0,0,43,6,255,15,0,0,106,95,134,240,128,238,40,250,
+64,86,0,0,106,239,132,240,229,87,64,0,224,7,96,1,
+10,216,64,86,0,0,10,87,146,241,10,232,32,86,191,255,
+74,233,64,86,0,0,74,239,146,241,251,47,32,0,229,87,
+64,0,224,7,96,1,10,216,64,86,0,0,10,87,174,241,
+10,232,32,86,191,255,74,233,64,86,0,0,74,239,174,241,
+251,47,32,0,64,86,0,0,1,90,74,95,84,245,64,86,
+0,0,106,231,82,245,229,87,64,0,224,7,96,1,10,224,
+64,86,0,0,10,87,116,241,10,232,32,86,191,255,74,233,
+64,86,0,0,74,239,116,241,252,47,32,0,64,86,0,0,
+43,6,35,0,0,0,74,95,84,245,64,86,0,0,1,90,
+74,95,100,245,229,87,64,0,224,7,96,1,10,224,64,86,
+0,0,10,87,118,241,10,232,32,86,191,255,74,233,64,86,
+0,0,74,239,118,241,252,47,32,0,64,86,0,0,43,6,
+113,0,0,0,74,95,100,245,64,86,0,0,0,90,74,95,
+40,240,64,86,0,0,43,6,159,0,0,0,74,95,72,240,
+64,86,0,0,43,6,32,0,0,0,74,95,8,240,64,86,
+0,0,1,90,74,95,2,244,64,86,0,0,43,6,240,0,
+0,0,74,95,34,244,64,86,0,0,2,90,74,95,98,244,
+64,86,0,0,43,6,56,0,0,0,74,95,1,253,64,86,
+0,0,43,6,144,0,0,0,74,95,0,253,64,86,0,0,
+8,90,74,95,9,253,64,86,0,0,14,90,74,95,66,244,
+64,6,223,16,128,7,193,48,6,224,7,232,221,0,224,233,
+146,61,28,215,0,0,95,234,65,226,221,0,224,233,178,5,
+95,234,221,0,64,86,0,0,10,87,16,248,32,94,127,255,
+202,222,127,0,64,86,0,0,74,223,16,248,28,16,144,18,
+194,222,255,15,64,86,0,0,106,223,130,240,64,86,0,0,
+106,231,128,240,64,86,0,0,106,239,192,240,64,86,0,0,
+10,87,224,240,64,86,0,0,10,87,224,240,138,238,1,0,
+64,86,0,0,74,239,224,240,26,232,64,86,0,0,74,239,
+40,250,64,6,223,48,128,7,193,48,6,208,154,0,26,232,
+64,86,0,0,74,239,2,242,0,226,0,218,64,86,0,0,
+10,87,0,242,138,238,128,0,64,86,0,0,74,239,0,242,
+61,6,64,13,3,0,64,86,0,0,10,87,0,242,135,82,
+177,5,95,234,154,253,61,6,64,13,3,0,64,86,0,0,
+10,87,0,242,135,82,185,5,95,234,154,253,64,86,0,0,
+10,87,0,242,32,94,127,255,202,238,127,0,64,86,0,0,
+74,239,0,242,26,16,193,18,2,238,16,242,61,87,1,0,
+202,225,65,218,100,218,182,205,28,128,191,130,158,130,208,225,
+130,226,220,0,28,80,202,0,64,6,223,48,127,0,33,6,
+120,185,129,0,97,0,128,7,33,0,224,49,162,13,49,6,
+184,83,133,0,102,143,105,0,129,58,185,5,191,255,190,204,
+64,6,63,0,128,7,33,0,38,23,105,0,63,6,24,107,
+0,0,2,22,208,0,34,87,0,0,34,143,5,0,198,81,
+10,48,113,0,64,6,63,0,0,82,127,0,128,7,193,48,
+6,208,229,87,64,0,224,7,96,1,10,216,58,239,93,0,
+58,231,89,0,251,47,32,0,29,88,28,80,64,6,223,48,
+128,7,33,0,224,49,138,13,32,54,108,0,128,255,196,25,
+10,48,224,49,178,45,48,6,184,83,133,0,102,135,105,0,
+102,7,85,0,102,7,81,0,102,7,4,0,70,7,1,0,
+70,7,0,0,70,7,7,0,102,7,89,0,102,7,93,0,
+0,18,1,82,102,87,97,0,102,7,101,0,102,87,8,0,
+102,87,14,0,2,104,194,106,38,86,16,0,202,105,109,7,
+1,0,65,18,2,6,240,255,230,245,6,80,64,6,63,0,
+128,7,33,0,38,6,132,215,255,255,39,6,172,146,132,0,
+0,66,191,255,176,248,38,6,180,215,255,255,39,6,188,146,
+132,0,1,66,128,255,52,25,64,6,63,0,128,7,225,240,
+6,232,7,208,58,199,1,0,128,255,182,213,49,6,228,206,
+1,0,106,143,5,0,0,202,106,199,9,0,0,226,122,87,
+1,0,213,61,28,216,194,218,61,126,16,0,219,121,47,111,
+1,0,224,105,178,53,29,103,7,0,12,6,17,0,154,21,
+61,23,105,0,63,6,64,108,0,0,2,22,88,1,34,87,
+0,0,34,95,5,0,221,81,10,48,107,0,252,81,226,29,
+61,86,16,0,27,136,209,81,42,23,1,0,26,56,34,23,
+105,0,61,86,16,0,219,81,2,22,144,0,34,95,0,0,
+42,55,1,0,11,96,204,49,34,127,5,0,63,6,120,108,
+0,0,111,0,224,81,162,5,65,202,65,226,61,119,4,0,
+238,225,150,197,58,55,1,0,25,56,128,255,34,212,122,199,
+1,0,1,82,64,6,255,240,138,7,225,16,99,7,1,0,
+99,7,5,0,99,7,9,0,39,231,5,0,99,7,13,0,
+39,127,16,0,39,111,18,0,15,128,208,105,201,106,99,111,
+17,0,3,96,39,223,25,0,38,23,105,0,103,103,5,0,
+72,18,34,87,0,0,103,7,25,0,198,81,10,48,7,232,
+34,95,5,0,63,6,240,108,0,0,107,0,125,223,25,0,
+125,231,5,0,74,6,255,16,128,7,225,0,6,224,0,234,
+181,37,29,16,194,18,60,134,16,0,194,129,48,119,1,0,
+224,113,146,29,60,110,16,0,2,96,204,105,45,95,1,0,
+43,23,105,0,2,22,88,0,34,87,0,0,63,6,64,109,
+0,0,203,81,34,95,5,0,10,48,107,0,97,82,186,5,
+1,82,245,5,65,234,60,87,4,0,234,233,182,221,0,82,
+64,6,255,0,128,7,225,0,6,224,0,234,181,37,29,16,
 194,18,60,134,16,0,194,129,48,119,1,0,224,113,146,29,
 60,110,16,0,2,96,204,105,45,95,1,0,43,23,105,0,
-2,22,88,0,34,87,0,0,63,6,152,108,0,0,203,81,
+2,22,96,0,34,87,0,0,63,6,156,109,0,0,203,81,
 34,95,5,0,10,48,107,0,97,82,186,5,1,82,245,5,
 65,234,60,87,4,0,234,233,182,221,0,82,64,6,255,0,
-128,7,225,0,6,224,0,234,181,37,29,16,194,18,60,134,
-16,0,194,129,48,119,1,0,224,113,146,29,60,110,16,0,
-2,96,204,105,45,95,1,0,43,23,105,0,2,22,96,0,
-34,87,0,0,63,6,244,108,0,0,203,81,34,95,5,0,
-10,48,107,0,97,82,186,5,1,82,245,5,65,234,60,87,
-4,0,234,233,182,221,0,82,64,6,255,0,128,7,225,16,
-6,224,7,216,0,234,197,37,29,16,194,18,60,134,16,0,
-194,129,48,119,1,0,224,113,162,29,60,110,16,0,2,96,
-204,105,45,95,1,0,43,23,105,0,27,56,2,22,104,0,
-34,87,0,0,63,6,84,109,0,0,203,81,34,95,5,0,
-10,48,107,0,224,81,186,5,0,82,245,5,65,234,60,87,
-4,0,234,233,166,221,1,82,64,6,255,16,132,7,225,0,
-6,224,188,55,1,0,128,255,0,16,10,232,224,233,210,93,
-61,23,105,0,99,7,5,0,2,22,112,0,34,87,0,0,
-28,56,221,81,10,48,0,66,35,126,4,0,99,127,1,0,
-32,78,128,0,34,119,5,0,63,6,176,109,0,0,110,0,
-10,224,224,225,183,29,61,23,105,0,63,6,210,109,0,0,
-2,22,96,1,34,87,0,0,34,111,5,0,221,81,10,48,
-109,0,224,81,186,13,29,56,0,50,128,255,162,22,10,232,
-38,6,240,135,132,0,191,255,74,181,224,225,234,37,38,6,
-4,136,132,0,191,255,60,181,61,23,105,0,63,6,20,110,
-0,0,2,22,192,0,34,87,0,0,34,103,5,0,221,81,
-10,48,108,0,224,233,130,21,61,23,105,0,3,58,2,22,
-80,1,34,87,0,0,34,95,5,0,221,81,10,48,63,6,
-54,110,0,0,107,0,0,234,29,80,68,6,255,0,128,7,
-225,16,6,224,1,218,0,234,165,37,29,16,194,18,60,134,
-16,0,194,129,48,119,1,0,224,113,130,29,60,110,16,0,
-2,96,204,105,45,95,1,0,43,23,105,0,2,22,120,0,
-34,87,0,0,63,6,132,110,0,0,203,81,34,95,5,0,
-10,48,107,0,224,81,170,5,0,218,65,234,60,87,4,0,
-234,233,198,221,27,80,64,6,255,16,128,7,225,48,1,218,
-7,208,122,7,1,0,6,224,220,207,2,0,178,5,0,82,
-181,45,0,234,197,37,29,16,194,18,60,134,16,0,194,129,
-48,119,1,0,224,113,162,29,60,110,16,0,2,96,204,105,
-45,95,1,0,43,23,105,0,26,56,2,22,128,0,34,87,
-0,0,63,6,242,110,0,0,203,81,34,95,5,0,10,48,
-107,0,224,81,186,5,0,218,229,5,65,234,60,87,4,0,
-234,233,166,221,27,80,64,6,255,48,134,7,225,48,6,216,
-7,232,8,208,99,7,0,0,0,226,213,117,28,16,194,18,
-61,134,16,0,194,129,48,119,1,0,224,113,178,109,61,110,
-16,0,2,96,204,105,45,95,1,0,26,64,43,23,105,0,
-35,54,8,0,2,22,136,0,34,87,0,0,63,6,92,111,
-0,0,203,81,34,95,5,0,10,56,107,0,35,87,9,0,
-99,87,5,0,10,16,226,0,224,17,194,77,35,127,0,0,
-2,128,16,121,35,119,6,0,99,127,0,0,29,23,7,0,
-99,119,2,0,2,6,17,0,129,13,2,6,33,0,242,29,
-2,6,81,0,210,53,229,53,123,18,242,45,119,18,162,45,
-2,6,17,0,250,45,61,23,105,0,63,6,194,111,0,0,
-2,22,88,1,34,87,0,0,34,111,5,0,221,81,10,48,
-109,0,252,81,250,29,195,15,0,0,197,29,61,23,105,0,
-63,6,232,111,0,0,2,22,88,1,34,87,0,0,34,103,
-5,0,221,81,10,48,108,0,252,81,202,13,195,23,0,0,
-149,13,195,31,0,0,229,5,195,39,0,0,181,5,195,47,
-0,0,65,226,61,95,4,0,235,225,150,141,35,135,0,0,
-123,135,0,0,35,127,2,0,123,127,2,0,27,80,70,6,
-255,48,128,7,225,48,7,224,6,232,157,135,7,0,92,135,
-1,0,61,119,4,0,29,127,7,0,61,23,105,0,92,127,
-5,0,92,119,0,0,2,22,88,1,29,111,1,0,34,87,
-0,0,92,111,4,0,221,81,10,48,34,103,5,0,63,6,
-102,112,0,0,108,0,61,95,10,0,92,87,3,0,92,95,
-2,0,61,87,89,0,124,87,9,0,61,111,93,0,124,111,
-13,0,29,48,128,255,238,18,60,23,6,0,32,142,0,128,
-81,17,202,86,255,127,10,17,124,23,6,0,61,87,85,0,
-28,135,7,0,32,142,127,255,224,81,234,23,0,0,81,129,
-194,126,1,0,199,122,15,129,92,135,7,0,124,7,16,0,
-29,119,2,0,1,218,92,7,18,0,92,119,19,0,0,210,
-213,37,26,16,194,18,61,102,16,0,194,97,44,87,1,0,
-224,81,178,29,61,134,16,0,2,120,207,129,48,95,1,0,
-251,118,20,0,43,23,105,0,14,56,2,22,184,0,34,87,
-0,0,220,57,203,81,10,48,34,103,5,0,63,6,20,113,
-0,0,108,0,202,217,251,0,65,210,61,95,4,0,235,209,
-150,221,27,80,64,6,255,48,128,7,225,48,6,232,29,23,
-7,0,2,6,17,0,209,13,224,17,242,61,2,6,81,0,
-226,53,2,6,65,0,210,45,2,6,33,0,194,37,181,61,
-127,18,146,13,123,18,210,13,119,18,146,21,2,6,17,0,
-194,21,149,53,38,6,40,136,132,0,191,255,198,177,133,53,
-38,6,52,136,132,0,191,255,186,177,165,45,38,6,64,136,
-132,0,191,255,174,177,197,37,38,6,76,136,132,0,191,255,
-162,177,229,29,38,6,88,136,132,0,191,255,150,177,133,29,
-38,6,100,136,132,0,191,255,138,177,165,21,38,6,112,136,
-132,0,191,255,126,177,197,13,38,6,124,136,132,0,191,255,
-114,177,229,5,38,6,136,136,132,0,191,255,102,177,157,23,
-7,0,101,18,249,5,97,18,225,13,242,21,98,18,162,29,
-165,45,101,18,210,13,2,6,224,255,162,29,2,6,192,255,
-210,29,149,37,37,54,140,128,191,255,56,177,149,37,37,54,
-148,128,191,255,46,177,197,29,37,54,116,128,191,255,36,177,
-245,21,38,6,148,136,132,0,191,255,24,177,149,21,38,6,
-176,136,132,0,191,255,12,177,181,13,37,54,124,128,191,255,
-2,177,229,5,38,6,28,136,132,0,191,255,246,176,29,63,
-1,0,37,54,132,128,135,0,191,255,232,176,61,23,105,0,
-63,6,104,114,0,0,2,22,24,0,34,87,0,0,34,119,
-5,0,221,81,10,48,110,0,10,64,11,72,38,6,188,136,
-132,0,32,62,32,0,191,255,186,176,29,48,128,255,246,16,
-228,87,76,2,10,96,191,98,150,98,10,56,204,57,170,58,
-38,6,160,136,132,0,191,255,154,176,29,63,2,0,38,6,
-200,136,132,0,222,58,159,58,191,255,136,176,0,226,165,85,
-28,216,194,218,61,126,16,0,219,121,47,111,1,0,224,105,
-130,77,0,210,133,13,36,63,25,132,37,54,156,128,191,255,
-98,176,65,210,29,103,0,0,236,209,231,245,61,23,105,0,
-36,215,25,132,2,22,88,1,34,87,0,0,34,95,5,0,
-221,81,10,48,63,6,252,114,0,0,107,0,234,225,186,13,
-29,23,7,0,2,6,17,0,194,5,2,6,33,0,186,5,
-36,215,21,132,26,56,37,54,156,128,191,255,22,176,61,86,
-16,0,27,128,208,81,42,23,1,0,63,6,80,115,0,0,
-34,23,105,0,61,86,16,0,219,81,2,22,192,0,34,95,
-0,0,42,55,1,0,11,96,34,119,5,0,204,49,110,0,
-65,226,61,111,4,0,237,225,198,173,64,6,255,48,130,7,
-33,0,38,23,105,0,167,0,2,22,152,0,34,87,0,0,
-3,72,198,81,10,48,34,135,5,0,63,6,130,115,0,0,
-112,0,66,6,63,0,130,7,33,0,38,23,105,0,7,64,
-2,22,128,1,34,87,0,0,0,58,198,81,10,48,3,72,
-34,143,5,0,63,6,172,115,0,0,113,0,66,6,63,0,
-130,7,33,0,38,23,105,0,7,64,2,22,128,1,34,87,
-0,0,1,58,198,81,10,48,3,72,34,143,5,0,63,6,
-214,115,0,0,113,0,66,6,63,0,128,7,225,16,6,224,
-7,216,0,234,133,37,29,16,194,18,60,134,16,0,194,129,
-48,119,1,0,224,113,226,21,60,110,16,0,2,96,204,105,
-45,95,1,0,43,23,105,0,27,56,2,22,160,0,34,87,
-0,0,63,6,34,116,0,0,203,81,34,95,5,0,10,48,
-107,0,65,234,60,87,4,0,234,233,230,221,64,6,255,16,
-128,7,225,16,6,216,1,226,0,234,133,37,29,16,194,18,
-59,134,16,0,194,129,48,119,1,0,224,113,226,21,59,110,
-16,0,2,96,204,105,45,95,1,0,43,23,105,0,2,22,
-176,0,34,87,0,0,63,6,118,116,0,0,203,81,34,95,
-5,0,10,48,107,0,202,225,65,234,59,87,4,0,234,233,
-230,221,28,80,64,6,255,16,132,7,225,0,6,232,61,23,
-105,0,7,224,2,22,136,0,34,87,0,0,28,64,221,81,
-10,56,35,54,4,0,34,143,5,0,63,6,178,116,0,0,
-113,0,35,135,5,0,99,135,1,0,195,199,0,0,194,5,
-195,207,0,0,202,5,32,86,33,1,133,21,61,23,105,0,
-28,56,2,22,136,1,34,87,0,0,34,127,5,0,221,81,
-10,48,63,6,234,116,0,0,111,0,68,6,255,0,132,7,
-225,112,6,224,7,200,0,210,0,218,213,69,27,232,194,234,
-60,134,16,0,221,129,48,119,1,0,224,113,178,61,60,110,
-16,0,29,96,204,105,45,95,1,0,25,64,43,23,105,0,
-35,54,4,0,2,22,136,0,34,87,0,0,63,6,60,117,
-0,0,203,81,34,95,5,0,10,56,107,0,35,87,5,0,
-99,87,1,0,195,199,0,0,210,29,60,142,16,0,29,128,
-208,137,49,23,1,0,60,86,16,0,34,23,105,0,221,81,
-2,22,136,1,34,95,0,0,42,55,1,0,11,96,204,49,
-25,56,34,119,5,0,63,6,126,117,0,0,110,0,10,208,
-229,5,65,218,60,111,4,0,237,217,150,189,26,80,68,6,
-255,112,132,7,225,243,6,232,7,184,8,176,31,210,31,218,
-0,226,197,37,28,16,194,18,61,126,16,0,194,121,47,111,
-1,0,224,105,162,29,61,102,16,0,194,97,44,95,1,0,
-43,23,105,0,63,6,218,117,0,0,2,22,24,0,34,55,
-0,0,34,87,5,0,203,49,106,0,251,89,235,5,177,5,
-250,81,185,5,10,208,11,216,65,226,61,135,4,0,240,225,
-166,221,32,198,35,1,0,226,133,93,28,200,194,202,61,118,
-16,0,217,113,46,103,1,0,224,97,226,77,29,95,7,0,
-11,6,17,0,154,77,61,23,105,0,63,6,48,118,0,0,
-2,22,88,1,34,55,0,0,34,87,5,0,221,49,106,0,
-234,225,170,61,61,134,16,0,25,120,207,129,48,23,1,0,
-61,86,16,0,34,23,105,0,217,81,2,22,216,0,34,95,
-0,0,42,55,1,0,11,96,204,49,23,56,99,223,5,0,
-99,215,1,0,22,64,34,111,5,0,63,6,114,118,0,0,
-109,0,10,200,224,201,202,21,61,23,105,0,32,94,223,255,
-2,22,96,1,34,55,0,0,93,95,7,0,221,49,34,87,
-5,0,63,6,154,118,0,0,106,0,25,192,165,13,25,6,
-221,254,162,5,25,192,65,226,61,127,4,0,239,225,230,165,
-24,80,68,6,255,243,134,7,225,48,6,232,61,23,105,0,
-7,216,2,22,64,1,34,87,0,0,3,56,221,81,10,48,
-34,135,5,0,63,6,220,118,0,0,112,0,35,127,1,0,
-224,121,202,5,32,86,35,1,197,93,31,82,123,87,1,0,
-123,87,5,0,0,210,133,85,26,224,194,226,61,110,16,0,
-220,105,45,95,1,0,224,89,226,69,61,86,16,0,28,128,
-208,81,42,95,1,0,35,62,4,0,43,23,105,0,63,6,
-54,119,0,0,2,22,224,0,34,87,0,0,34,127,5,0,
-203,81,10,48,111,0,224,81,210,29,61,86,16,0,61,118,
-16,0,28,104,205,113,46,23,1,0,220,81,34,23,105,0,
-42,55,1,0,2,22,24,0,34,103,0,0,34,95,5,0,
-204,49,63,6,106,119,0,0,107,0,99,87,5,0,99,95,
-9,0,35,87,5,0,59,111,5,0,35,95,9,0,59,103,
-1,0,237,89,139,13,177,5,236,81,217,5,123,87,1,0,
-123,95,5,0,65,210,61,87,4,0,234,209,230,173,0,82,
-70,6,255,48,128,7,225,16,6,232,61,23,105,0,7,224,
-2,22,112,1,34,87,0,0,8,216,221,81,10,48,34,143,
-5,0,63,6,202,119,0,0,113,0,124,87,1,0,10,6,
-1,128,218,5,32,126,0,2,124,127,1,0,61,23,105,0,
-63,6,248,119,0,0,2,22,120,1,34,87,0,0,34,119,
-5,0,221,81,10,48,110,0,123,87,1,0,10,6,1,128,
-218,5,32,102,0,2,123,103,1,0,64,6,255,16,132,7,
-225,241,6,224,8,192,7,200,57,143,18,0,9,184,97,138,
-194,5,32,86,37,1,245,77,32,214,34,1,0,218,229,69,
-27,232,194,234,60,126,16,0,221,121,47,111,1,0,224,105,
-194,61,60,102,16,0,221,97,44,95,1,0,24,64,43,23,
-105,0,35,54,4,0,2,22,136,0,34,63,0,0,34,87,
-5,0,203,57,63,6,108,120,0,0,106,0,35,143,5,0,
-99,143,1,0,195,199,0,0,130,37,60,134,16,0,29,120,
-207,129,48,23,1,0,60,86,16,0,34,23,105,0,221,81,
-2,22,248,0,34,95,0,0,42,55,1,0,11,96,204,49,
-25,56,24,64,23,72,34,111,5,0,63,6,178,120,0,0,
-109,0,10,208,224,209,234,5,65,218,60,95,4,0,235,217,
-134,189,26,80,68,6,255,241,132,7,225,240,6,224,8,192,
-7,200,57,143,18,0,32,214,34,1,97,138,194,5,32,86,
-34,1,197,77,0,218,213,69,27,232,194,234,60,126,16,0,
-221,121,47,111,1,0,224,105,178,61,60,102,16,0,221,97,
-44,95,1,0,24,64,43,23,105,0,35,54,4,0,2,22,
-136,0,34,63,0,0,34,87,5,0,203,57,63,6,36,121,
-0,0,106,0,35,143,5,0,99,143,1,0,195,199,0,0,
-242,29,60,134,16,0,29,120,207,129,48,23,1,0,60,86,
-16,0,34,23,105,0,221,81,2,22,0,1,34,95,0,0,
-42,55,1,0,11,96,204,49,25,56,24,64,34,111,5,0,
-63,6,104,121,0,0,109,0,10,208,224,209,226,5,65,218,
-60,95,4,0,235,217,150,189,26,80,68,6,255,240,132,7,
-225,241,6,224,7,192,8,200,9,184,0,210,0,218,245,69,
+128,7,225,16,6,224,7,216,0,234,197,37,29,16,194,18,
+60,134,16,0,194,129,48,119,1,0,224,113,162,29,60,110,
+16,0,2,96,204,105,45,95,1,0,43,23,105,0,27,56,
+2,22,104,0,34,87,0,0,63,6,252,109,0,0,203,81,
+34,95,5,0,10,48,107,0,224,81,186,5,0,82,245,5,
+65,234,60,87,4,0,234,233,166,221,1,82,64,6,255,16,
+132,7,225,0,6,224,188,55,1,0,128,255,0,16,10,232,
+224,233,210,93,61,23,105,0,99,7,5,0,2,22,112,0,
+34,87,0,0,28,56,221,81,10,48,0,66,35,126,4,0,
+99,127,1,0,32,78,128,0,34,119,5,0,63,6,88,110,
+0,0,110,0,10,224,224,225,183,29,61,23,105,0,63,6,
+122,110,0,0,2,22,96,1,34,87,0,0,34,111,5,0,
+221,81,10,48,109,0,224,81,186,13,29,56,0,50,128,255,
+154,22,10,232,38,6,208,146,132,0,191,255,162,180,224,225,
+234,37,38,6,228,146,132,0,191,255,148,180,61,23,105,0,
+63,6,188,110,0,0,2,22,192,0,34,87,0,0,34,103,
+5,0,221,81,10,48,108,0,224,233,130,21,61,23,105,0,
+3,58,2,22,80,1,34,87,0,0,34,95,5,0,221,81,
+10,48,63,6,222,110,0,0,107,0,0,234,29,80,68,6,
+255,0,128,7,225,16,6,224,1,218,0,234,165,37,29,16,
+194,18,60,134,16,0,194,129,48,119,1,0,224,113,130,29,
+60,110,16,0,2,96,204,105,45,95,1,0,43,23,105,0,
+2,22,120,0,34,87,0,0,63,6,44,111,0,0,203,81,
+34,95,5,0,10,48,107,0,224,81,170,5,0,218,65,234,
+60,87,4,0,234,233,198,221,27,80,64,6,255,16,128,7,
+225,48,1,218,7,208,122,7,1,0,6,224,220,207,2,0,
+178,5,0,82,181,45,0,234,197,37,29,16,194,18,60,134,
+16,0,194,129,48,119,1,0,224,113,162,29,60,110,16,0,
+2,96,204,105,45,95,1,0,43,23,105,0,26,56,2,22,
+128,0,34,87,0,0,63,6,154,111,0,0,203,81,34,95,
+5,0,10,48,107,0,224,81,186,5,0,218,229,5,65,234,
+60,87,4,0,234,233,166,221,27,80,64,6,255,48,134,7,
+225,48,6,216,7,232,8,208,99,7,0,0,0,226,213,117,
+28,16,194,18,61,134,16,0,194,129,48,119,1,0,224,113,
+178,109,61,110,16,0,2,96,204,105,45,95,1,0,26,64,
+43,23,105,0,35,54,8,0,2,22,136,0,34,87,0,0,
+63,6,4,112,0,0,203,81,34,95,5,0,10,56,107,0,
+35,87,9,0,99,87,5,0,10,16,226,0,224,17,194,77,
+35,127,0,0,2,128,16,121,35,119,6,0,99,127,0,0,
+29,23,7,0,99,119,2,0,2,6,17,0,129,13,2,6,
+33,0,242,29,2,6,81,0,210,53,229,53,123,18,242,45,
+119,18,162,45,2,6,17,0,250,45,61,23,105,0,63,6,
+106,112,0,0,2,22,88,1,34,87,0,0,34,111,5,0,
+221,81,10,48,109,0,252,81,250,29,195,15,0,0,197,29,
+61,23,105,0,63,6,144,112,0,0,2,22,88,1,34,87,
+0,0,34,103,5,0,221,81,10,48,108,0,252,81,202,13,
+195,23,0,0,149,13,195,31,0,0,229,5,195,39,0,0,
+181,5,195,47,0,0,65,226,61,95,4,0,235,225,150,141,
+35,135,0,0,123,135,0,0,35,127,2,0,123,127,2,0,
+27,80,70,6,255,48,128,7,225,48,7,224,6,232,157,135,
+7,0,92,135,1,0,61,119,4,0,29,127,7,0,61,23,
+105,0,92,127,5,0,92,119,0,0,2,22,88,1,29,111,
+1,0,34,87,0,0,92,111,4,0,221,81,10,48,34,103,
+5,0,63,6,14,113,0,0,108,0,61,95,10,0,92,87,
+3,0,92,95,2,0,61,87,89,0,124,87,9,0,61,111,
+93,0,124,111,13,0,29,48,128,255,238,18,60,23,6,0,
+32,142,0,128,81,17,202,86,255,127,10,17,124,23,6,0,
+61,87,85,0,28,135,7,0,32,142,127,255,224,81,234,23,
+0,0,81,129,194,126,1,0,199,122,15,129,92,135,7,0,
+124,7,16,0,29,119,2,0,1,218,92,7,18,0,92,119,
+19,0,0,210,213,37,26,16,194,18,61,102,16,0,194,97,
+44,87,1,0,224,81,178,29,61,134,16,0,2,120,207,129,
+48,95,1,0,251,118,20,0,43,23,105,0,14,56,2,22,
+184,0,34,87,0,0,220,57,203,81,10,48,34,103,5,0,
+63,6,188,113,0,0,108,0,202,217,251,0,65,210,61,95,
+4,0,235,209,150,221,27,80,64,6,255,48,128,7,225,48,
+6,232,29,23,7,0,2,6,17,0,209,13,224,17,242,61,
+2,6,81,0,226,53,2,6,65,0,210,45,2,6,33,0,
+194,37,181,61,127,18,146,13,123,18,210,13,119,18,146,21,
+2,6,17,0,194,21,149,53,38,6,8,147,132,0,191,255,
+30,177,133,53,38,6,20,147,132,0,191,255,18,177,165,45,
+38,6,32,147,132,0,191,255,6,177,197,37,38,6,44,147,
+132,0,191,255,250,176,229,29,38,6,56,147,132,0,191,255,
+238,176,133,29,38,6,68,147,132,0,191,255,226,176,165,21,
+38,6,80,147,132,0,191,255,214,176,197,13,38,6,92,147,
+132,0,191,255,202,176,229,5,38,6,104,147,132,0,191,255,
+190,176,157,23,7,0,101,18,249,5,97,18,225,13,242,21,
+98,18,162,29,165,45,101,18,210,13,2,6,224,255,162,29,
+2,6,192,255,210,29,149,37,37,54,140,128,191,255,144,176,
+149,37,37,54,148,128,191,255,134,176,197,29,37,54,116,128,
+191,255,124,176,245,21,38,6,116,147,132,0,191,255,112,176,
+149,21,38,6,144,147,132,0,191,255,100,176,181,13,37,54,
+124,128,191,255,90,176,229,5,38,6,252,146,132,0,191,255,
+78,176,29,63,1,0,37,54,132,128,135,0,191,255,64,176,
+61,23,105,0,63,6,16,115,0,0,2,22,24,0,34,87,
+0,0,34,119,5,0,221,81,10,48,110,0,10,64,11,72,
+38,6,156,147,132,0,32,62,32,0,191,255,18,176,29,48,
+128,255,246,16,228,87,76,2,10,96,191,98,150,98,10,56,
+204,57,170,58,38,6,128,147,132,0,191,255,242,175,29,63,
+2,0,38,6,168,147,132,0,222,58,159,58,191,255,224,175,
+0,226,165,85,28,216,194,218,61,126,16,0,219,121,47,111,
+1,0,224,105,130,77,0,210,133,13,36,63,37,132,37,54,
+156,128,191,255,186,175,65,210,29,103,0,0,236,209,231,245,
+61,23,105,0,36,215,37,132,2,22,88,1,34,87,0,0,
+34,95,5,0,221,81,10,48,63,6,164,115,0,0,107,0,
+234,225,186,13,29,23,7,0,2,6,17,0,194,5,2,6,
+33,0,186,5,36,215,33,132,26,56,37,54,156,128,191,255,
+110,175,61,86,16,0,27,128,208,81,42,23,1,0,63,6,
+248,115,0,0,34,23,105,0,61,86,16,0,219,81,2,22,
+192,0,34,95,0,0,42,55,1,0,11,96,34,119,5,0,
+204,49,110,0,65,226,61,111,4,0,237,225,198,173,64,6,
+255,48,130,7,33,0,38,23,105,0,167,0,2,22,152,0,
+34,87,0,0,3,72,198,81,10,48,34,135,5,0,63,6,
+42,116,0,0,112,0,66,6,63,0,130,7,33,0,38,23,
+105,0,7,64,2,22,128,1,34,87,0,0,0,58,198,81,
+10,48,3,72,34,143,5,0,63,6,84,116,0,0,113,0,
+66,6,63,0,130,7,33,0,38,23,105,0,7,64,2,22,
+128,1,34,87,0,0,1,58,198,81,10,48,3,72,34,143,
+5,0,63,6,126,116,0,0,113,0,66,6,63,0,128,7,
+225,16,6,224,7,216,0,234,133,37,29,16,194,18,60,134,
+16,0,194,129,48,119,1,0,224,113,226,21,60,110,16,0,
+2,96,204,105,45,95,1,0,43,23,105,0,27,56,2,22,
+160,0,34,87,0,0,63,6,202,116,0,0,203,81,34,95,
+5,0,10,48,107,0,65,234,60,87,4,0,234,233,230,221,
+64,6,255,16,128,7,225,16,6,216,1,226,0,234,133,37,
+29,16,194,18,59,134,16,0,194,129,48,119,1,0,224,113,
+226,21,59,110,16,0,2,96,204,105,45,95,1,0,43,23,
+105,0,2,22,176,0,34,87,0,0,63,6,30,117,0,0,
+203,81,34,95,5,0,10,48,107,0,202,225,65,234,59,87,
+4,0,234,233,230,221,28,80,64,6,255,16,132,7,225,0,
+6,232,61,23,105,0,7,224,2,22,136,0,34,87,0,0,
+28,64,221,81,10,56,35,54,4,0,34,143,5,0,63,6,
+90,117,0,0,113,0,35,135,5,0,99,135,1,0,195,199,
+0,0,194,5,195,207,0,0,202,5,32,86,33,1,133,21,
+61,23,105,0,28,56,2,22,136,1,34,87,0,0,34,127,
+5,0,221,81,10,48,63,6,146,117,0,0,111,0,68,6,
+255,0,132,7,225,112,6,224,7,200,0,210,0,218,213,69,
+27,232,194,234,60,134,16,0,221,129,48,119,1,0,224,113,
+178,61,60,110,16,0,29,96,204,105,45,95,1,0,25,64,
+43,23,105,0,35,54,4,0,2,22,136,0,34,87,0,0,
+63,6,228,117,0,0,203,81,34,95,5,0,10,56,107,0,
+35,87,5,0,99,87,1,0,195,199,0,0,210,29,60,142,
+16,0,29,128,208,137,49,23,1,0,60,86,16,0,34,23,
+105,0,221,81,2,22,136,1,34,95,0,0,42,55,1,0,
+11,96,204,49,25,56,34,119,5,0,63,6,38,118,0,0,
+110,0,10,208,229,5,65,218,60,111,4,0,237,217,150,189,
+26,80,68,6,255,112,132,7,225,243,6,232,7,184,8,176,
+31,210,31,218,0,226,197,37,28,16,194,18,61,126,16,0,
+194,121,47,111,1,0,224,105,162,29,61,102,16,0,194,97,
+44,95,1,0,43,23,105,0,63,6,130,118,0,0,2,22,
+24,0,34,55,0,0,34,87,5,0,203,49,106,0,251,89,
+235,5,177,5,250,81,185,5,10,208,11,216,65,226,61,135,
+4,0,240,225,166,221,32,198,35,1,0,226,133,93,28,200,
+194,202,61,118,16,0,217,113,46,103,1,0,224,97,226,77,
+29,95,7,0,11,6,17,0,154,77,61,23,105,0,63,6,
+216,118,0,0,2,22,88,1,34,55,0,0,34,87,5,0,
+221,49,106,0,234,225,170,61,61,134,16,0,25,120,207,129,
+48,23,1,0,61,86,16,0,34,23,105,0,217,81,2,22,
+216,0,34,95,0,0,42,55,1,0,11,96,204,49,23,56,
+99,223,5,0,99,215,1,0,22,64,34,111,5,0,63,6,
+26,119,0,0,109,0,10,200,224,201,202,21,61,23,105,0,
+32,94,223,255,2,22,96,1,34,55,0,0,93,95,7,0,
+221,49,34,87,5,0,63,6,66,119,0,0,106,0,25,192,
+165,13,25,6,221,254,162,5,25,192,65,226,61,127,4,0,
+239,225,230,165,24,80,68,6,255,243,134,7,225,48,6,232,
+61,23,105,0,7,216,2,22,64,1,34,87,0,0,3,56,
+221,81,10,48,34,135,5,0,63,6,132,119,0,0,112,0,
+35,127,1,0,224,121,202,5,32,86,35,1,197,93,31,82,
+123,87,1,0,123,87,5,0,0,210,133,85,26,224,194,226,
+61,110,16,0,220,105,45,95,1,0,224,89,226,69,61,86,
+16,0,28,128,208,81,42,95,1,0,35,62,4,0,43,23,
+105,0,63,6,222,119,0,0,2,22,224,0,34,87,0,0,
+34,127,5,0,203,81,10,48,111,0,224,81,210,29,61,86,
+16,0,61,118,16,0,28,104,205,113,46,23,1,0,220,81,
+34,23,105,0,42,55,1,0,2,22,24,0,34,103,0,0,
+34,95,5,0,204,49,63,6,18,120,0,0,107,0,99,87,
+5,0,99,95,9,0,35,87,5,0,59,111,5,0,35,95,
+9,0,59,103,1,0,237,89,139,13,177,5,236,81,217,5,
+123,87,1,0,123,95,5,0,65,210,61,87,4,0,234,209,
+230,173,0,82,70,6,255,48,128,7,225,16,6,232,61,23,
+105,0,7,224,2,22,112,1,34,87,0,0,8,216,221,81,
+10,48,34,143,5,0,63,6,114,120,0,0,113,0,124,87,
+1,0,10,6,1,128,218,5,32,126,0,2,124,127,1,0,
+61,23,105,0,63,6,160,120,0,0,2,22,120,1,34,87,
+0,0,34,119,5,0,221,81,10,48,110,0,123,87,1,0,
+10,6,1,128,218,5,32,102,0,2,123,103,1,0,64,6,
+255,16,132,7,225,241,6,224,8,192,7,200,57,143,18,0,
+9,184,97,138,194,5,32,86,37,1,245,77,32,214,34,1,
+0,218,229,69,27,232,194,234,60,126,16,0,221,121,47,111,
+1,0,224,105,194,61,60,102,16,0,221,97,44,95,1,0,
+24,64,43,23,105,0,35,54,4,0,2,22,136,0,34,63,
+0,0,34,87,5,0,203,57,63,6,20,121,0,0,106,0,
+35,143,5,0,99,143,1,0,195,199,0,0,130,37,60,134,
+16,0,29,120,207,129,48,23,1,0,60,86,16,0,34,23,
+105,0,221,81,2,22,248,0,34,95,0,0,42,55,1,0,
+11,96,204,49,25,56,24,64,23,72,34,111,5,0,63,6,
+90,121,0,0,109,0,10,208,224,209,234,5,65,218,60,95,
+4,0,235,217,134,189,26,80,68,6,255,241,132,7,225,240,
+6,224,8,192,7,200,57,143,18,0,32,214,34,1,97,138,
+194,5,32,86,34,1,197,77,0,218,213,69,27,232,194,234,
+60,126,16,0,221,121,47,111,1,0,224,105,178,61,60,102,
+16,0,221,97,44,95,1,0,24,64,43,23,105,0,35,54,
+4,0,2,22,136,0,34,63,0,0,34,87,5,0,203,57,
+63,6,204,121,0,0,106,0,35,143,5,0,99,143,1,0,
+195,199,0,0,242,29,60,134,16,0,29,120,207,129,48,23,
+1,0,60,86,16,0,34,23,105,0,221,81,2,22,0,1,
+34,95,0,0,42,55,1,0,11,96,204,49,25,56,24,64,
+34,111,5,0,63,6,16,122,0,0,109,0,10,208,224,209,
+226,5,65,218,60,95,4,0,235,217,150,189,26,80,68,6,
+255,240,132,7,225,241,6,224,7,192,8,200,9,184,0,210,
+0,218,245,69,27,232,194,234,60,134,16,0,221,129,48,119,
+1,0,224,113,210,61,60,110,16,0,29,96,204,105,45,95,
+1,0,25,64,43,23,105,0,35,54,4,0,2,22,136,0,
+34,87,0,0,63,6,120,122,0,0,203,81,34,95,5,0,
+10,56,107,0,35,87,5,0,99,87,1,0,195,199,0,0,
+242,29,60,142,16,0,29,128,208,137,49,23,1,0,60,86,
+16,0,34,23,105,0,221,81,2,22,32,1,34,95,0,0,
+42,55,1,0,11,96,204,49,24,56,25,64,23,72,34,119,
+5,0,63,6,190,122,0,0,110,0,10,208,229,5,65,218,
+60,111,4,0,237,217,246,181,26,80,68,6,255,241,132,7,
+225,240,6,224,7,192,8,200,32,214,34,1,0,218,229,69,
 27,232,194,234,60,134,16,0,221,129,48,119,1,0,224,113,
-210,61,60,110,16,0,29,96,204,105,45,95,1,0,25,64,
+194,61,60,110,16,0,29,96,204,105,45,95,1,0,25,64,
 43,23,105,0,35,54,4,0,2,22,136,0,34,87,0,0,
-63,6,208,121,0,0,203,81,34,95,5,0,10,56,107,0,
-35,87,5,0,99,87,1,0,195,199,0,0,242,29,60,142,
+63,6,36,123,0,0,203,81,34,95,5,0,10,56,107,0,
+35,87,5,0,99,87,1,0,195,199,0,0,226,29,60,142,
 16,0,29,128,208,137,49,23,1,0,60,86,16,0,34,23,
-105,0,221,81,2,22,32,1,34,95,0,0,42,55,1,0,
-11,96,204,49,24,56,25,64,23,72,34,119,5,0,63,6,
-22,122,0,0,110,0,10,208,229,5,65,218,60,111,4,0,
-237,217,246,181,26,80,68,6,255,241,132,7,225,240,6,224,
-7,192,8,200,32,214,34,1,0,218,229,69,27,232,194,234,
-60,134,16,0,221,129,48,119,1,0,224,113,194,61,60,110,
-16,0,29,96,204,105,45,95,1,0,25,64,43,23,105,0,
-35,54,4,0,2,22,136,0,34,87,0,0,63,6,124,122,
+105,0,221,81,2,22,40,1,34,95,0,0,42,55,1,0,
+11,96,204,49,24,56,25,64,34,119,5,0,63,6,104,123,
+0,0,110,0,10,208,229,5,65,218,60,111,4,0,237,217,
+134,189,26,80,68,6,255,240,128,7,225,16,6,224,7,216,
+252,217,186,5,1,82,181,45,0,234,197,37,29,16,194,18,
+60,134,16,0,194,129,48,119,1,0,224,113,162,29,60,110,
+16,0,2,96,204,105,45,95,1,0,43,23,105,0,27,56,
+2,22,48,1,34,87,0,0,63,6,204,123,0,0,203,81,
+34,95,5,0,10,48,107,0,97,82,186,5,1,82,245,5,
+65,234,60,87,4,0,234,233,166,221,0,82,64,6,255,16,
+128,7,225,48,6,216,7,208,186,0,8,232,189,0,123,234,
+146,13,119,234,242,5,29,6,33,0,194,5,29,6,81,0,
+154,45,0,226,181,37,28,16,194,18,59,102,16,0,194,97,
+44,87,1,0,224,81,146,29,59,142,16,0,2,128,208,137,
+49,95,1,0,26,120,43,23,105,0,15,56,2,22,56,1,
+34,87,0,0,29,112,203,81,10,48,14,64,34,111,5,0,
+63,6,76,124,0,0,109,0,65,226,59,103,4,0,236,225,
+182,221,64,6,255,48,130,7,225,112,6,216,7,200,1,226,
+1,210,0,234,165,45,29,16,194,18,59,134,16,0,194,129,
+48,119,1,0,224,113,130,37,59,110,16,0,2,96,204,105,
+45,95,1,0,43,23,105,0,3,56,2,22,64,1,34,87,
+0,0,63,6,166,124,0,0,203,81,34,95,5,0,10,48,
+107,0,224,81,170,5,0,226,35,87,1,0,224,81,202,5,
+0,210,0,226,229,5,65,234,59,143,4,0,241,233,198,213,
+121,215,1,0,28,80,66,6,255,112,128,7,225,48,7,208,
+6,232,157,135,7,0,61,127,4,0,61,23,105,0,90,135,
+1,0,2,22,24,0,34,87,0,0,90,127,0,0,221,81,
+10,48,34,119,5,0,63,6,2,125,0,0,110,0,122,87,
+9,0,1,226,0,218,213,37,27,16,194,18,61,102,16,0,
+194,97,44,87,1,0,224,81,178,29,61,134,16,0,2,120,
+207,129,48,95,1,0,252,118,12,0,43,23,105,0,14,56,
+2,22,72,1,34,87,0,0,218,57,203,81,10,48,34,103,
+5,0,63,6,78,125,0,0,108,0,202,225,252,0,65,218,
+61,95,4,0,235,217,150,221,28,80,64,6,255,48,128,7,
+225,240,6,232,7,208,58,199,1,0,128,255,52,196,49,6,
+228,206,1,0,106,143,5,0,0,202,106,199,9,0,0,226,
+122,87,1,0,213,61,28,216,194,218,61,126,16,0,219,121,
+47,111,1,0,224,105,178,53,29,103,7,0,12,6,17,0,
+154,21,61,23,105,0,63,6,194,125,0,0,2,22,88,1,
+34,87,0,0,34,95,5,0,221,81,10,48,107,0,252,81,
+226,29,61,86,16,0,27,136,209,81,42,23,1,0,26,56,
+34,23,105,0,61,86,16,0,219,81,2,22,168,0,34,95,
+0,0,42,55,1,0,11,96,204,49,34,127,5,0,63,6,
+250,125,0,0,111,0,224,81,162,5,65,202,65,226,61,119,
+4,0,238,225,150,197,58,55,1,0,25,56,128,255,160,194,
+122,199,1,0,1,82,64,6,255,240,128,7,225,16,134,0,
+60,6,80,85,133,0,59,6,232,86,133,0,6,16,107,18,
+153,13,97,18,241,13,242,29,98,18,226,45,101,18,130,53,
+229,125,108,18,193,77,194,93,109,18,130,109,111,18,146,61,
+229,117,32,54,112,0,128,255,186,6,10,232,224,233,146,13,
+29,48,191,255,222,236,49,6,176,91,133,0,125,143,105,0,
+29,80,197,109,32,54,140,0,128,255,152,6,10,232,224,233,
+146,13,29,48,191,255,188,236,48,6,72,93,133,0,125,135,
+105,0,29,80,181,93,0,50,128,255,170,127,245,85,32,54,
+140,0,128,255,110,6,10,232,224,233,146,13,29,48,191,255,
+146,236,47,6,136,95,133,0,125,127,105,0,29,80,229,69,
+32,54,124,0,128,255,76,6,10,232,224,233,226,5,29,48,
+191,255,112,236,125,231,105,0,29,80,133,61,32,54,124,0,
+128,255,48,6,10,232,224,233,146,13,29,48,191,255,84,236,
+46,6,128,88,133,0,125,119,105,0,29,80,245,37,32,54,
+124,0,128,255,14,6,10,232,224,233,226,5,29,48,191,255,
+50,236,125,223,105,0,29,80,149,29,32,54,124,0,128,255,
+242,5,10,232,224,233,146,13,29,48,191,255,22,236,45,6,
+24,90,133,0,125,111,105,0,29,80,133,13,6,56,38,6,
+184,147,132,0,191,255,232,163,0,82,64,6,255,16,132,7,
+225,48,6,224,7,208,31,218,0,234,181,45,29,16,194,18,
+60,134,16,0,194,129,48,119,1,0,224,113,146,37,60,110,
+16,0,2,96,204,105,45,95,1,0,26,64,43,23,105,0,
+35,54,4,0,2,22,136,0,34,87,0,0,63,6,160,127,
 0,0,203,81,34,95,5,0,10,56,107,0,35,87,5,0,
-99,87,1,0,195,199,0,0,226,29,60,142,16,0,29,128,
-208,137,49,23,1,0,60,86,16,0,34,23,105,0,221,81,
-2,22,40,1,34,95,0,0,42,55,1,0,11,96,204,49,
-24,56,25,64,34,119,5,0,63,6,192,122,0,0,110,0,
-10,208,229,5,65,218,60,111,4,0,237,217,134,189,26,80,
-68,6,255,240,128,7,225,16,6,224,7,216,252,217,186,5,
-1,82,181,45,0,234,197,37,29,16,194,18,60,134,16,0,
-194,129,48,119,1,0,224,113,162,29,60,110,16,0,2,96,
-204,105,45,95,1,0,43,23,105,0,27,56,2,22,48,1,
-34,87,0,0,63,6,36,123,0,0,203,81,34,95,5,0,
-10,48,107,0,97,82,186,5,1,82,245,5,65,234,60,87,
-4,0,234,233,166,221,0,82,64,6,255,16,128,7,225,48,
-6,216,7,208,186,0,8,232,189,0,123,234,146,13,119,234,
-242,5,29,6,33,0,194,5,29,6,81,0,154,45,0,226,
-181,37,28,16,194,18,59,102,16,0,194,97,44,87,1,0,
-224,81,146,29,59,142,16,0,2,128,208,137,49,95,1,0,
-26,120,43,23,105,0,15,56,2,22,56,1,34,87,0,0,
-29,112,203,81,10,48,14,64,34,111,5,0,63,6,164,123,
-0,0,109,0,65,226,59,103,4,0,236,225,182,221,64,6,
-255,48,130,7,225,112,6,216,7,200,1,226,1,210,0,234,
-165,45,29,16,194,18,59,134,16,0,194,129,48,119,1,0,
-224,113,130,37,59,110,16,0,2,96,204,105,45,95,1,0,
-43,23,105,0,3,56,2,22,64,1,34,87,0,0,63,6,
-254,123,0,0,203,81,34,95,5,0,10,48,107,0,224,81,
-170,5,0,226,35,87,1,0,224,81,202,5,0,210,0,226,
-229,5,65,234,59,143,4,0,241,233,198,213,121,215,1,0,
-28,80,66,6,255,112,128,7,225,48,7,208,6,232,157,135,
-7,0,61,127,4,0,61,23,105,0,90,135,1,0,2,22,
-24,0,34,87,0,0,90,127,0,0,221,81,10,48,34,119,
-5,0,63,6,90,124,0,0,110,0,122,87,9,0,1,226,
-0,218,213,37,27,16,194,18,61,102,16,0,194,97,44,87,
-1,0,224,81,178,29,61,134,16,0,2,120,207,129,48,95,
-1,0,252,118,12,0,43,23,105,0,14,56,2,22,72,1,
-34,87,0,0,218,57,203,81,10,48,34,103,5,0,63,6,
-166,124,0,0,108,0,202,225,252,0,65,218,61,95,4,0,
-235,217,150,221,28,80,64,6,255,48,128,7,225,240,6,232,
-7,208,58,199,1,0,128,255,8,195,49,6,148,204,1,0,
-106,143,5,0,0,202,106,199,9,0,0,226,122,87,1,0,
-213,61,28,216,194,218,61,126,16,0,219,121,47,111,1,0,
-224,105,178,53,29,103,7,0,12,6,17,0,154,21,61,23,
-105,0,63,6,26,125,0,0,2,22,88,1,34,87,0,0,
-34,95,5,0,221,81,10,48,107,0,252,81,226,29,61,86,
-16,0,27,136,209,81,42,23,1,0,26,56,34,23,105,0,
-61,86,16,0,219,81,2,22,168,0,34,95,0,0,42,55,
-1,0,11,96,204,49,34,127,5,0,63,6,82,125,0,0,
-111,0,224,81,162,5,65,202,65,226,61,119,4,0,238,225,
-150,197,58,55,1,0,25,56,128,255,116,193,122,199,1,0,
-1,82,64,6,255,240,128,7,225,16,134,0,60,6,200,73,
-133,0,59,6,96,75,133,0,6,16,107,18,153,13,97,18,
-241,13,242,29,98,18,226,45,101,18,130,53,229,125,108,18,
-193,77,194,93,109,18,130,109,111,18,146,61,229,117,32,54,
-112,0,128,255,194,6,10,232,224,233,146,13,29,48,191,255,
-222,236,49,6,40,80,133,0,125,143,105,0,29,80,197,109,
-32,54,140,0,128,255,160,6,10,232,224,233,146,13,29,48,
-191,255,188,236,48,6,192,81,133,0,125,135,105,0,29,80,
-181,93,0,50,128,255,174,127,245,85,32,54,140,0,128,255,
-118,6,10,232,224,233,146,13,29,48,191,255,146,236,47,6,
-0,84,133,0,125,127,105,0,29,80,229,69,32,54,124,0,
-128,255,84,6,10,232,224,233,226,5,29,48,191,255,112,236,
-125,231,105,0,29,80,133,61,32,54,124,0,128,255,56,6,
-10,232,224,233,146,13,29,48,191,255,84,236,46,6,248,76,
-133,0,125,119,105,0,29,80,245,37,32,54,124,0,128,255,
-22,6,10,232,224,233,226,5,29,48,191,255,50,236,125,223,
-105,0,29,80,149,29,32,54,124,0,128,255,250,5,10,232,
-224,233,146,13,29,48,191,255,22,236,45,6,144,78,133,0,
-125,111,105,0,29,80,133,13,6,56,38,6,216,136,132,0,
-191,255,144,164,0,82,64,6,255,16,132,7,225,48,6,224,
-7,208,31,218,0,234,181,45,29,16,194,18,60,134,16,0,
-194,129,48,119,1,0,224,113,146,37,60,110,16,0,2,96,
-204,105,45,95,1,0,26,64,43,23,105,0,35,54,4,0,
-2,22,136,0,34,87,0,0,63,6,248,126,0,0,203,81,
-34,95,5,0,10,56,107,0,35,87,5,0,99,87,1,0,
-195,199,0,0,178,5,29,216,229,5,65,234,60,143,4,0,
-241,233,182,213,27,80,68,6,255,48,132,7,225,243,7,200,
-25,143,1,0,6,232,93,143,6,0,93,71,0,0,25,135,
-5,0,93,135,7,0,25,23,0,0,99,79,5,0,93,79,
-1,0,2,6,240,255,25,119,19,0,125,23,4,0,93,119,
-2,0,183,13,2,56,38,6,4,137,132,0,191,255,212,163,
-125,7,4,0,0,82,149,93,1,194,1,226,0,218,229,61,
-27,208,194,210,61,182,16,0,252,190,20,0,218,177,217,185,
-183,55,1,0,191,255,242,253,118,87,1,0,61,126,16,0,
-218,121,47,111,1,0,224,105,226,37,61,102,16,0,218,97,
-44,95,1,0,29,87,0,0,43,23,105,0,23,56,2,22,
-112,0,34,55,0,0,65,82,203,49,35,79,5,0,35,159,
-45,0,10,64,99,159,1,0,219,73,34,127,5,0,63,6,
-214,127,0,0,111,0,234,0,202,225,252,0,224,81,218,5,
-0,194,181,5,0,194,229,5,65,218,61,103,4,0,236,217,
-134,197,224,193,226,13,61,23,105,0,63,6,16,128,0,0,
-2,22,96,1,34,55,0,0,34,87,5,0,221,49,106,0,
-224,193,170,5,0,226,28,80,68,6,255,243,128,7,225,16,
-6,224,0,218,133,69,27,232,194,234,60,134,16,0,221,129,
-48,119,1,0,224,113,226,53,60,110,16,0,29,96,204,105,
-45,95,1,0,43,23,105,0,2,22,104,1,34,87,0,0,
-63,6,96,128,0,0,203,81,34,95,5,0,10,48,107,0,
-60,86,16,0,221,81,42,135,1,0,224,129,226,21,60,126,
-16,0,29,112,206,121,47,95,1,0,3,58,43,23,105,0,
-63,6,152,128,0,0,2,22,80,1,34,87,0,0,34,111,
-5,0,203,81,10,48,109,0,60,94,16,0,203,233,125,7,
-1,0,65,218,60,87,4,0,234,217,230,189,64,6,255,16,
-128,7,225,112,6,224,7,216,187,0,8,200,9,208,0,82,
-0,234,133,45,29,16,194,18,60,134,16,0,194,129,48,119,
-1,0,224,113,226,29,60,110,16,0,2,96,204,105,45,95,
-1,0,25,64,43,23,105,0,26,72,2,22,152,0,34,55,
-0,0,34,87,5,0,203,49,27,88,11,56,63,6,4,129,
-0,0,106,0,10,6,224,254,202,5,122,239,1,0,229,5,
-65,234,60,135,4,0,240,233,230,213,64,6,255,112,128,7,
-225,112,6,224,7,216,187,0,8,200,9,208,0,82,0,234,
-133,45,29,16,194,18,60,134,16,0,194,129,48,119,1,0,
-224,113,226,29,60,110,16,0,2,96,204,105,45,95,1,0,
-25,64,43,23,105,0,26,72,2,22,128,1,34,55,0,0,
-34,87,5,0,203,49,27,88,11,56,63,6,114,129,0,0,
-106,0,10,6,224,254,202,5,122,239,1,0,229,5,65,234,
-60,135,4,0,240,233,230,213,64,6,255,112,128,7,225,112,
-6,224,7,208,8,200,9,216,0,234,245,37,29,16,194,18,
-60,134,16,0,194,129,48,119,1,0,224,113,210,29,60,110,
-16,0,2,96,204,105,45,95,1,0,26,56,43,23,105,0,
-25,64,2,22,240,0,34,87,0,0,27,72,203,81,10,48,
-34,95,5,0,63,6,220,129,0,0,107,0,123,239,1,0,
-10,88,224,81,234,5,65,234,60,143,4,0,241,233,246,213,
-11,80,64,6,255,112,128,7,225,16,6,216,32,230,255,127,
-0,234,181,37,29,16,194,18,59,134,16,0,194,129,48,119,
-1,0,224,113,146,29,59,110,16,0,2,96,204,105,45,95,
-1,0,43,23,105,0,2,22,120,1,34,87,0,0,63,6,
-62,130,0,0,203,81,34,95,5,0,10,48,107,0,10,16,
-226,225,167,5,2,224,65,234,59,87,4,0,234,233,182,221,
-28,80,64,6,255,16,128,7,225,16,6,216,32,230,255,127,
-0,234,181,37,29,16,194,18,59,134,16,0,194,129,48,119,
-1,0,224,113,146,29,59,110,16,0,2,96,204,105,45,95,
-1,0,43,23,105,0,2,22,112,1,34,87,0,0,63,6,
-158,130,0,0,203,81,34,95,5,0,10,48,107,0,10,16,
-226,225,167,5,2,224,65,234,59,87,4,0,234,233,182,221,
-28,80,64,6,255,16,128,7,225,0,7,224,6,232,191,255,
-186,231,10,64,29,23,7,0,11,72,123,18,226,13,119,18,
-194,13,2,6,33,0,146,13,2,6,81,0,226,5,124,7,
-1,0,124,7,5,0,229,13,61,103,97,0,61,111,101,0,
-168,97,124,103,1,0,225,135,0,0,176,105,169,105,124,111,
-5,0,8,80,9,88,64,6,255,0,128,7,193,48,6,232,
-8,208,9,216,229,87,64,0,224,7,96,1,29,23,7,0,
-10,224,123,18,146,13,119,18,242,5,2,6,33,0,194,5,
-2,6,81,0,186,29,61,103,89,0,61,111,93,0,204,209,
-125,215,89,0,225,135,0,0,208,217,205,217,125,223,93,0,
-61,95,101,0,61,87,97,0,235,217,129,13,187,5,234,209,
-209,5,125,87,89,0,125,95,93,0,252,47,32,0,64,6,
-223,48,128,7,33,0,38,79,101,0,38,71,97,0,233,1,
-218,5,232,1,186,5,0,82,229,21,38,95,93,0,38,55,
-89,0,202,90,6,56,150,58,11,57,202,50,233,1,250,5,
-231,1,218,5,6,16,232,23,194,2,197,5,128,255,216,0,
-10,16,2,80,64,6,63,0,134,7,225,112,7,216,0,226,
-6,200,129,255,208,10,10,208,127,210,162,77,0,234,25,56,
-28,64,3,48,191,255,54,235,3,143,0,0,209,142,1,0,
-195,207,0,0,226,135,0,0,81,129,129,130,217,5,1,98,
-252,103,192,0,12,233,65,226,28,6,240,255,150,237,99,239,
-10,0,99,239,8,0,35,22,8,0,34,55,1,0,35,62,
-4,0,129,255,2,24,35,135,5,0,10,224,48,136,81,233,
-242,5,26,48,29,56,128,255,102,0,0,226,149,29,224,217,
-242,21,229,87,64,0,224,7,96,1,32,126,41,1,123,127,
-12,0,10,248,35,111,5,0,251,119,19,0,13,113,123,119,
-18,0,255,47,32,0,27,48,31,58,128,255,130,186,28,80,
-70,6,255,112,33,6,124,28,130,0,97,0,33,6,218,40,
-129,0,97,0,33,6,156,28,130,0,97,0,33,6,226,80,
-128,0,97,0,33,6,94,83,130,0,97,0,33,6,42,108,
-128,0,97,0,128,7,225,0,6,16,7,232,61,135,25,0,
-0,82,224,129,170,5,3,82,34,119,110,0,61,127,18,0,
-34,63,108,0,238,121,207,21,34,23,113,0,61,231,9,0,
-125,7,13,0,220,17,125,23,9,0,7,48,10,56,29,64,
-191,255,76,134,125,231,9,0,125,7,13,0,229,5,2,48,
-10,64,29,72,128,255,200,7,64,6,255,0,128,7,225,0,
-6,16,7,232,221,151,22,0,9,82,221,223,22,0,170,5,
-6,82,34,127,110,0,61,135,18,0,34,63,108,0,239,129,
-207,21,34,23,113,0,61,231,9,0,125,7,13,0,220,17,
-125,23,9,0,7,48,10,56,29,64,191,255,242,133,125,231,
-9,0,125,7,13,0,229,5,2,48,10,64,29,72,128,255,
-110,7,64,6,255,0,128,7,225,0,7,232,221,151,22,0,
-9,82,221,223,22,0,170,5,6,82,38,23,113,0,61,231,
-9,0,125,7,13,0,220,17,125,23,9,0,10,56,38,55,
-108,0,29,64,191,255,186,133,125,231,9,0,125,7,13,0,
-10,48,128,255,68,221,64,6,255,0,128,7,225,0,7,224,
-6,232,61,87,108,0,0,18,10,6,240,255,145,21,10,48,
-128,255,162,226,61,55,108,0,60,63,1,0,220,223,22,0,
-194,5,191,255,222,139,181,5,191,255,80,138,1,18,2,80,
-64,6,255,0,128,7,33,0,38,87,108,0,0,18,10,6,
-240,255,241,5,39,63,1,0,10,48,191,255,32,140,1,18,
-2,80,64,6,63,0,1,82,38,23,117,0,0,90,224,17,
-162,5,2,80,127,0,128,7,225,112,39,223,25,0,13,138,
-39,207,16,0,39,215,5,0,103,7,16,0,6,224,60,23,
-105,0,103,143,25,0,72,18,34,87,0,0,103,71,5,0,
-220,81,10,48,7,232,34,135,5,0,63,6,50,134,0,0,
-112,0,125,215,5,0,125,207,16,0,125,223,25,0,9,18,
-221,223,22,0,170,5,6,18,28,48,2,56,29,64,128,255,
-128,7,64,6,255,112,128,7,33,0,9,18,104,7,1,0,
-7,80,202,223,22,0,170,5,6,18,2,56,10,64,128,255,
-96,7,64,6,63,0,0,18,1,138,226,143,192,0,71,137,
-242,5,38,119,108,0,238,17,186,5,0,82,229,5,65,18,
-2,6,224,255,166,245,1,82,127,0,92,26,39,143,108,0,
-99,7,0,0,232,137,170,21,7,135,1,0,195,7,0,0,
-7,23,7,0,99,135,2,0,123,18,226,5,119,18,234,5,
-195,31,0,0,181,5,195,39,0,0,35,111,0,0,102,111,
-0,0,35,103,2,0,6,80,102,103,2,0,68,26,127,0,
-128,7,225,0,7,232,134,143,7,0,93,143,1,0,6,135,
-7,0,93,135,5,0,93,7,0,0,6,127,1,0,93,127,
-4,0,6,224,191,255,110,252,61,23,6,0,32,150,0,128,
-82,17,202,86,255,127,10,17,125,23,6,0,60,119,85,0,
-29,111,7,0,32,150,127,255,224,113,234,23,0,0,82,105,
-194,102,1,0,199,98,12,105,93,111,7,0,7,90,60,143,
-113,0,60,87,108,0,125,143,9,0,93,87,3,0,93,95,
-2,0,60,135,117,0,28,127,2,0,125,135,13,0,93,127,
-19,0,125,7,16,0,93,7,18,0,1,82,64,6,255,0,
-128,7,97,0,6,232,29,143,7,0,123,138,234,5,38,6,
-56,137,132,0,191,255,172,155,29,63,1,0,61,71,108,0,
-38,6,68,137,132,0,191,255,154,155,61,63,117,0,61,71,
-113,0,38,6,84,137,132,0,191,255,136,155,29,48,191,255,
-196,251,228,87,76,2,10,104,191,106,150,106,10,56,205,57,
-170,58,38,6,108,137,132,0,191,255,104,155,64,6,127,0,
-128,7,97,0,6,232,61,143,108,0,231,137,202,13,61,55,
-85,0,224,49,210,5,128,255,86,7,125,7,85,0,31,130,
-125,135,108,0,0,82,64,6,127,0,134,7,225,48,8,216,
-187,0,6,232,61,215,85,0,7,224,188,0,100,226,234,53,
-29,23,7,0,226,217,170,53,123,18,138,53,224,209,226,5,
-125,7,85,0,26,48,128,255,22,7,29,48,35,62,4,0,
-191,255,134,250,61,23,105,0,35,79,9,0,2,22,232,0,
-34,87,0,0,35,71,5,0,221,81,10,48,34,103,5,0,
-63,6,88,136,0,0,108,0,61,23,105,0,31,58,2,22,
-152,0,34,87,0,0,31,66,221,81,10,48,3,72,34,95,
-5,0,63,6,122,136,0,0,107,0,224,225,218,5,29,127,
-7,0,239,217,178,5,99,226,138,61,61,111,85,0,224,105,
-226,5,125,7,85,0,26,48,128,255,164,6,99,226,218,45,
-125,7,89,0,125,7,93,0,224,209,242,37,29,95,7,0,
-123,90,234,5,0,50,128,255,142,6,125,87,85,0,61,55,
-85,0,224,49,162,29,29,56,128,255,132,6,224,81,210,21,
-61,87,85,0,224,81,242,13,42,23,241,11,3,58,72,18,
-34,95,0,0,63,6,244,136,0,0,202,89,34,87,5,0,
-11,48,106,0,125,7,85,0,97,226,202,45,29,23,7,0,
-226,217,138,45,61,111,85,0,224,105,202,37,123,18,234,5,
-0,50,128,255,50,6,125,87,85,0,61,55,85,0,224,49,
-146,29,29,56,128,255,40,6,224,81,194,21,61,87,85,0,
-224,81,226,13,42,23,241,11,3,58,72,18,34,55,0,0,
-34,95,5,0,202,49,63,6,78,137,0,0,107,0,125,7,
-85,0,70,6,255,48,230,57,226,87,0,0,127,0,103,7,
-1,0,0,82,127,0,71,7,0,0,38,135,108,0,134,143,
-7,0,71,135,2,0,71,143,1,0,38,119,117,0,6,127,
-1,0,103,119,9,0,71,7,7,0,71,7,6,0,71,7,
-5,0,71,7,4,0,71,127,3,0,1,82,127,0,128,7,
-97,0,6,232,29,135,7,0,0,74,16,6,225,255,170,13,
-93,7,2,0,125,7,89,0,125,7,93,0,31,122,93,127,
-7,0,29,119,7,0,224,113,202,5,31,106,93,111,7,0,
-61,23,108,0,224,17,230,13,2,6,240,255,190,13,61,87,
-117,0,224,81,242,5,2,48,191,255,204,144,10,120,1,74,
-213,5,32,126,0,1,93,7,7,0,125,127,110,0,9,80,
-64,6,127,0,128,7,97,0,35,23,9,0,6,232,93,71,
-0,0,34,111,1,0,7,135,1,0,1,122,93,111,1,0,
-93,135,6,0,125,127,4,0,7,103,5,0,13,118,1,0,
-93,103,7,0,98,119,1,0,7,95,2,0,125,239,17,0,
-125,95,10,0,98,90,198,5,12,6,225,255,202,5,7,122,
-125,127,10,0,61,119,10,0,1,106,238,111,192,0,125,111,
-14,0,39,127,9,0,125,111,8,0,125,127,113,0,95,106,
-39,119,13,0,7,103,19,0,125,111,12,0,93,103,2,0,
-125,119,117,0,7,95,3,0,125,119,121,0,39,55,6,0,
-125,95,108,0,209,50,177,50,6,56,61,71,97,0,61,79,
-101,0,191,58,128,255,176,4,10,48,11,56,32,70,0,4,
-0,74,191,255,210,249,125,87,89,0,61,23,105,0,125,95,
-93,0,2,22,96,1,34,55,0,0,34,87,5,0,221,49,
-63,6,216,138,0,0,106,0,61,87,14,0,61,23,117,0,
+99,87,1,0,195,199,0,0,178,5,29,216,229,5,65,234,
+60,143,4,0,241,233,182,213,27,80,68,6,255,48,132,7,
+225,243,7,200,25,143,1,0,6,232,93,143,6,0,93,71,
+0,0,25,135,5,0,93,135,7,0,25,23,0,0,99,79,
+5,0,93,79,1,0,2,6,240,255,25,119,19,0,125,23,
+4,0,93,119,2,0,183,13,2,56,38,6,228,147,132,0,
+191,255,44,163,125,7,4,0,0,82,149,93,1,194,1,226,
+0,218,229,61,27,208,194,210,61,182,16,0,252,190,20,0,
+218,177,217,185,183,55,1,0,191,255,242,253,118,87,1,0,
+61,126,16,0,218,121,47,111,1,0,224,105,226,37,61,102,
+16,0,218,97,44,95,1,0,29,87,0,0,43,23,105,0,
+23,56,2,22,112,0,34,55,0,0,65,82,203,49,35,79,
+5,0,35,159,45,0,10,64,99,159,1,0,219,73,34,127,
+5,0,63,6,126,128,0,0,111,0,234,0,202,225,252,0,
+224,81,218,5,0,194,181,5,0,194,229,5,65,218,61,103,
+4,0,236,217,134,197,224,193,226,13,61,23,105,0,63,6,
+184,128,0,0,2,22,96,1,34,55,0,0,34,87,5,0,
+221,49,106,0,224,193,170,5,0,226,28,80,68,6,255,243,
+128,7,225,16,6,224,0,218,133,69,27,232,194,234,60,134,
+16,0,221,129,48,119,1,0,224,113,226,53,60,110,16,0,
+29,96,204,105,45,95,1,0,43,23,105,0,2,22,104,1,
+34,87,0,0,63,6,8,129,0,0,203,81,34,95,5,0,
+10,48,107,0,60,86,16,0,221,81,42,135,1,0,224,129,
+226,21,60,126,16,0,29,112,206,121,47,95,1,0,3,58,
+43,23,105,0,63,6,64,129,0,0,2,22,80,1,34,87,
+0,0,34,111,5,0,203,81,10,48,109,0,60,94,16,0,
+203,233,125,7,1,0,65,218,60,87,4,0,234,217,230,189,
+64,6,255,16,128,7,225,112,6,224,7,216,187,0,8,200,
+9,208,0,82,0,234,133,45,29,16,194,18,60,134,16,0,
+194,129,48,119,1,0,224,113,226,29,60,110,16,0,2,96,
+204,105,45,95,1,0,25,64,43,23,105,0,26,72,2,22,
+152,0,34,55,0,0,34,87,5,0,203,49,27,88,11,56,
+63,6,172,129,0,0,106,0,10,6,224,254,202,5,122,239,
+1,0,229,5,65,234,60,135,4,0,240,233,230,213,64,6,
+255,112,128,7,225,112,6,224,7,216,187,0,8,200,9,208,
+0,82,0,234,133,45,29,16,194,18,60,134,16,0,194,129,
+48,119,1,0,224,113,226,29,60,110,16,0,2,96,204,105,
+45,95,1,0,25,64,43,23,105,0,26,72,2,22,128,1,
+34,55,0,0,34,87,5,0,203,49,27,88,11,56,63,6,
+26,130,0,0,106,0,10,6,224,254,202,5,122,239,1,0,
+229,5,65,234,60,135,4,0,240,233,230,213,64,6,255,112,
+128,7,225,112,6,224,7,208,8,200,9,216,0,234,245,37,
+29,16,194,18,60,134,16,0,194,129,48,119,1,0,224,113,
+210,29,60,110,16,0,2,96,204,105,45,95,1,0,26,56,
+43,23,105,0,25,64,2,22,240,0,34,87,0,0,27,72,
+203,81,10,48,34,95,5,0,63,6,132,130,0,0,107,0,
+123,239,1,0,10,88,224,81,234,5,65,234,60,143,4,0,
+241,233,246,213,11,80,64,6,255,112,128,7,225,16,6,216,
+32,230,255,127,0,234,181,37,29,16,194,18,59,134,16,0,
+194,129,48,119,1,0,224,113,146,29,59,110,16,0,2,96,
+204,105,45,95,1,0,43,23,105,0,2,22,120,1,34,87,
+0,0,63,6,230,130,0,0,203,81,34,95,5,0,10,48,
+107,0,10,16,226,225,167,5,2,224,65,234,59,87,4,0,
+234,233,182,221,28,80,64,6,255,16,128,7,225,16,6,216,
+32,230,255,127,0,234,181,37,29,16,194,18,59,134,16,0,
+194,129,48,119,1,0,224,113,146,29,59,110,16,0,2,96,
+204,105,45,95,1,0,43,23,105,0,2,22,112,1,34,87,
+0,0,63,6,70,131,0,0,203,81,34,95,5,0,10,48,
+107,0,10,16,226,225,167,5,2,224,65,234,59,87,4,0,
+234,233,182,221,28,80,64,6,255,16,128,7,225,0,7,224,
+6,232,191,255,186,231,10,64,29,23,7,0,11,72,123,18,
+226,13,119,18,194,13,2,6,33,0,146,13,2,6,81,0,
+226,5,124,7,1,0,124,7,5,0,229,13,61,103,97,0,
+61,111,101,0,168,97,124,103,1,0,225,135,0,0,176,105,
+169,105,124,111,5,0,8,80,9,88,64,6,255,0,128,7,
+193,48,6,232,8,208,9,216,229,87,64,0,224,7,96,1,
+29,23,7,0,10,224,123,18,146,13,119,18,242,5,2,6,
+33,0,194,5,2,6,81,0,186,29,61,103,89,0,61,111,
+93,0,204,209,125,215,89,0,225,135,0,0,208,217,205,217,
+125,223,93,0,61,95,101,0,61,87,97,0,235,217,129,13,
+187,5,234,209,209,5,125,87,89,0,125,95,93,0,252,47,
+32,0,64,6,223,48,128,7,33,0,38,79,101,0,38,71,
+97,0,233,1,218,5,232,1,186,5,0,82,229,21,38,95,
+93,0,38,55,89,0,202,90,6,56,150,58,11,57,202,50,
+233,1,250,5,231,1,218,5,6,16,232,23,194,2,197,5,
+128,255,208,0,10,16,2,80,64,6,63,0,134,7,225,112,
+7,216,0,226,6,200,129,255,82,12,10,208,127,210,162,77,
+0,234,25,56,28,64,3,48,191,255,54,235,3,143,0,0,
+209,142,1,0,195,207,0,0,226,135,0,0,81,129,129,130,
+217,5,1,98,252,103,192,0,12,233,65,226,28,6,240,255,
+150,237,99,239,10,0,99,239,8,0,35,22,8,0,34,55,
+1,0,35,62,4,0,129,255,132,25,35,135,5,0,10,224,
+48,136,81,233,242,5,26,48,29,56,128,255,94,0,0,226,
+149,29,224,217,242,21,229,87,64,0,224,7,96,1,32,126,
+41,1,123,127,12,0,10,248,35,111,5,0,251,119,19,0,
+13,113,123,119,18,0,255,47,32,0,27,48,31,58,128,255,
+174,187,28,80,70,6,255,112,33,6,230,46,129,0,97,0,
+33,6,64,37,130,0,97,0,33,6,202,83,128,0,97,0,
+33,6,2,92,130,0,97,0,33,6,18,111,128,0,97,0,
+128,7,225,0,6,16,7,232,61,135,25,0,0,82,224,129,
+170,5,3,82,34,119,110,0,61,127,18,0,34,63,108,0,
+238,121,207,21,34,23,113,0,61,231,9,0,125,7,13,0,
+220,17,125,23,9,0,7,48,10,56,29,64,191,255,172,133,
+125,231,9,0,125,7,13,0,229,5,2,48,10,64,29,72,
+128,255,204,7,64,6,255,0,128,7,225,0,6,16,7,232,
+221,151,22,0,9,82,221,223,22,0,170,5,6,82,34,127,
+110,0,61,135,18,0,34,63,108,0,239,129,207,21,34,23,
+113,0,61,231,9,0,125,7,13,0,220,17,125,23,9,0,
+7,48,10,56,29,64,191,255,82,133,125,231,9,0,125,7,
+13,0,229,5,2,48,10,64,29,72,128,255,114,7,64,6,
+255,0,128,7,225,0,7,232,221,151,22,0,9,82,221,223,
+22,0,170,5,6,82,38,23,113,0,61,231,9,0,125,7,
+13,0,220,17,125,23,9,0,10,56,38,55,108,0,29,64,
+191,255,26,133,125,231,9,0,125,7,13,0,10,48,128,255,
+80,222,64,6,255,0,128,7,225,0,7,224,6,232,61,87,
+108,0,0,18,10,6,240,255,145,21,10,48,128,255,174,227,
+61,55,108,0,60,63,1,0,220,223,22,0,194,5,191,255,
+62,139,181,5,191,255,176,137,1,18,2,80,64,6,255,0,
+128,7,33,0,38,87,108,0,0,18,10,6,240,255,241,5,
+39,63,1,0,10,48,191,255,128,139,1,18,2,80,64,6,
+63,0,1,82,38,23,117,0,0,90,224,17,162,5,2,80,
+127,0,128,7,225,112,39,223,25,0,13,138,39,207,16,0,
+39,215,5,0,103,7,16,0,6,224,60,23,105,0,103,143,
+25,0,72,18,34,87,0,0,103,71,5,0,220,81,10,48,
+7,232,34,135,5,0,63,6,210,134,0,0,112,0,125,215,
+5,0,125,207,16,0,125,223,25,0,9,18,221,223,22,0,
+170,5,6,18,28,48,2,56,29,64,128,255,132,7,64,6,
+255,112,128,7,33,0,9,18,104,7,1,0,7,80,202,223,
+22,0,170,5,6,18,2,56,10,64,128,255,100,7,64,6,
+63,0,0,18,1,138,226,143,192,0,71,137,242,5,38,119,
+108,0,238,17,186,5,0,82,229,5,65,18,2,6,224,255,
+166,245,1,82,127,0,92,26,39,143,108,0,99,7,0,0,
+232,137,170,21,7,135,1,0,195,7,0,0,7,23,7,0,
+99,135,2,0,123,18,226,5,119,18,234,5,195,31,0,0,
+181,5,195,39,0,0,35,111,0,0,102,111,0,0,35,103,
+2,0,6,80,102,103,2,0,68,26,127,0,128,7,225,0,
+7,232,134,143,7,0,93,143,1,0,6,135,7,0,93,135,
+5,0,93,7,0,0,6,127,1,0,93,127,4,0,6,224,
+191,255,118,252,61,23,6,0,32,150,0,128,82,17,202,86,
+255,127,10,17,125,23,6,0,60,119,85,0,29,111,7,0,
+32,150,127,255,224,113,234,23,0,0,82,105,194,102,1,0,
+199,98,12,105,93,111,7,0,7,90,60,143,113,0,60,87,
+108,0,125,143,9,0,93,87,3,0,93,95,2,0,60,135,
+117,0,28,127,2,0,125,135,13,0,93,127,19,0,125,7,
+16,0,93,7,18,0,1,82,64,6,255,0,128,7,97,0,
+6,232,29,143,7,0,123,138,234,5,38,6,24,148,132,0,
+191,255,12,155,29,63,1,0,61,71,108,0,38,6,36,148,
+132,0,191,255,250,154,61,63,117,0,61,71,113,0,38,6,
+52,148,132,0,191,255,232,154,29,48,191,255,204,251,228,87,
+76,2,10,104,191,106,150,106,10,56,205,57,170,58,38,6,
+76,148,132,0,191,255,200,154,64,6,127,0,128,7,97,0,
+6,232,61,143,108,0,231,137,202,13,61,55,85,0,224,49,
+210,5,128,255,90,7,125,7,85,0,31,130,125,135,108,0,
+0,82,64,6,127,0,134,7,225,48,8,216,187,0,6,232,
+61,215,85,0,7,224,188,0,100,226,234,53,29,23,7,0,
+226,217,170,53,123,18,138,53,224,209,226,5,125,7,85,0,
+26,48,128,255,26,7,29,48,35,62,4,0,191,255,142,250,
+61,23,105,0,35,79,9,0,2,22,232,0,34,87,0,0,
+35,71,5,0,221,81,10,48,34,103,5,0,63,6,248,136,
+0,0,108,0,61,23,105,0,31,58,2,22,152,0,34,87,
+0,0,31,66,221,81,10,48,3,72,34,95,5,0,63,6,
+26,137,0,0,107,0,224,225,218,5,29,127,7,0,239,217,
+178,5,99,226,138,61,61,111,85,0,224,105,226,5,125,7,
+85,0,26,48,128,255,168,6,99,226,218,45,125,7,89,0,
+125,7,93,0,224,209,242,37,29,95,7,0,123,90,234,5,
+0,50,128,255,146,6,125,87,85,0,61,55,85,0,224,49,
+162,29,29,56,128,255,136,6,224,81,210,21,61,87,85,0,
+224,81,242,13,42,23,241,11,3,58,72,18,34,95,0,0,
+63,6,148,137,0,0,202,89,34,87,5,0,11,48,106,0,
+125,7,85,0,97,226,202,45,29,23,7,0,226,217,138,45,
+61,111,85,0,224,105,202,37,123,18,234,5,0,50,128,255,
+54,6,125,87,85,0,61,55,85,0,224,49,146,29,29,56,
+128,255,44,6,224,81,194,21,61,87,85,0,224,81,226,13,
+42,23,241,11,3,58,72,18,34,55,0,0,34,95,5,0,
+202,49,63,6,238,137,0,0,107,0,125,7,85,0,70,6,
+255,48,230,57,226,87,0,0,127,0,103,7,1,0,0,82,
+127,0,71,7,0,0,38,135,108,0,134,143,7,0,71,135,
+2,0,71,143,1,0,38,119,117,0,6,127,1,0,103,119,
+9,0,71,7,7,0,71,7,6,0,71,7,5,0,71,7,
+4,0,71,127,3,0,1,82,127,0,128,7,97,0,6,232,
+29,135,7,0,0,74,16,6,225,255,170,13,93,7,2,0,
+125,7,89,0,125,7,93,0,31,122,93,127,7,0,29,119,
+7,0,224,113,202,5,31,106,93,111,7,0,61,23,108,0,
+224,17,230,13,2,6,240,255,190,13,61,87,117,0,224,81,
+242,5,2,48,191,255,44,144,10,120,1,74,213,5,32,126,
+0,1,93,7,7,0,125,127,110,0,9,80,64,6,127,0,
+128,7,97,0,35,23,9,0,6,232,93,71,0,0,34,111,
+1,0,7,135,1,0,1,122,93,111,1,0,93,135,6,0,
+125,127,4,0,7,103,5,0,13,118,1,0,93,103,7,0,
+98,119,1,0,7,95,2,0,125,239,17,0,125,95,10,0,
+98,90,198,5,12,6,225,255,202,5,7,122,125,127,10,0,
+61,119,10,0,1,106,238,111,192,0,7,103,19,0,13,94,
+255,255,93,103,2,0,125,95,12,0,39,127,9,0,7,95,
+3,0,125,127,113,0,125,95,108,0,125,111,8,0,39,71,
+13,0,125,111,14,0,125,71,117,0,125,71,121,0,237,0,
+237,71,194,2,39,55,6,0,0,74,209,50,177,50,6,56,
+191,58,128,255,178,4,10,48,11,56,32,70,0,4,0,74,
+191,255,208,249,125,87,89,0,61,23,105,0,125,95,93,0,
+2,22,96,1,34,87,0,0,34,119,5,0,221,81,10,48,
+63,6,124,139,0,0,110,0,61,87,14,0,61,23,117,0,
 125,7,101,0,234,23,194,2,125,23,97,0,234,5,1,82,
 125,87,97,0,125,7,101,0,1,82,64,6,127,0,128,7,
 225,0,6,232,167,0,0,226,127,58,242,5,123,58,210,37,
@@ -18929,19 +19065,19 @@ unsigned char tw_fw_code[] __initdata = 
 14,0,93,111,7,0,234,127,194,2,125,127,97,0,125,7,
 101,0,125,7,89,0,61,23,105,0,125,7,93,0,2,22,
 96,1,34,87,0,0,0,226,221,81,10,48,34,103,5,0,
-63,6,152,140,0,0,108,0,97,82,226,5,32,230,35,1,
+63,6,60,141,0,0,108,0,97,82,226,5,32,230,35,1,
 31,90,125,95,108,0,28,80,64,6,255,48,142,7,225,240,
 41,135,5,0,6,208,58,23,113,0,41,87,9,0,41,127,
 16,0,202,17,99,23,9,0,99,7,13,0,7,200,41,119,
 25,0,99,135,5,0,99,119,25,0,99,127,16,0,8,192,
 233,111,23,0,99,111,22,0,0,218,41,239,1,0,41,231,
-18,0,195,151,22,0,128,255,216,178,44,6,148,204,1,0,
+18,0,195,151,22,0,128,255,8,180,44,6,228,206,1,0,
 106,103,5,0,106,239,9,0,99,87,1,0,58,23,110,0,
 226,225,182,5,2,232,165,5,28,232,99,239,18,0,65,218,
 251,0,189,225,252,0,224,225,234,21,229,87,64,0,224,7,
 96,1,35,111,1,0,45,103,0,0,10,248,219,97,109,103,
-0,0,255,47,32,0,25,48,24,56,3,64,191,255,208,125,
-78,6,255,240,25,48,24,56,3,64,191,255,194,125,35,23,
+0,0,255,47,32,0,25,48,24,56,3,64,191,255,44,125,
+78,6,255,240,25,48,24,56,3,64,191,255,30,125,35,23,
 5,0,34,127,17,0,35,135,16,0,137,122,176,121,239,0,
 253,121,138,13,99,7,16,0,2,22,20,0,99,23,5,0,
 245,21,253,121,142,21,29,80,175,81,2,22,20,0,34,95,
@@ -18951,14 +19087,14 @@ unsigned char tw_fw_code[] __initdata = 
 225,135,0,0,208,121,205,121,99,127,13,0,133,165,142,7,
 225,240,6,224,60,127,110,0,8,232,61,135,18,0,7,192,
 239,129,207,21,60,23,113,0,61,223,9,0,219,17,125,23,
-9,0,125,7,13,0,60,55,108,0,191,255,52,125,10,200,
+9,0,125,7,13,0,60,55,108,0,191,255,144,124,10,200,
 125,223,9,0,125,7,13,0,181,117,61,111,5,0,61,103,
 16,0,60,23,113,0,61,87,9,0,99,111,5,0,99,7,
 13,0,202,17,99,23,9,0,99,103,16,0,61,95,25,0,
 61,87,1,0,99,95,25,0,99,87,1,0,253,135,23,0,
 99,135,22,0,0,210,195,151,22,0,61,223,18,0,60,127,
 110,0,60,55,108,0,239,217,239,223,60,235,253,0,99,239,
-18,0,24,56,3,64,191,255,200,124,10,16,224,209,194,5,
+18,0,24,56,3,64,191,255,36,124,10,16,224,209,194,5,
 122,23,13,0,165,5,2,200,2,208,189,217,146,61,35,23,
 5,0,34,95,17,0,35,87,16,0,137,90,139,81,234,0,
 253,81,138,13,99,7,16,0,2,22,20,0,99,23,5,0,
@@ -18968,17 +19104,17 @@ unsigned char tw_fw_code[] __initdata = 
 9,0,29,120,191,122,204,233,99,239,9,0,35,111,13,0,
 225,135,0,0,208,121,205,121,99,127,13,0,149,181,25,80,
 78,6,255,240,128,7,225,0,6,232,7,224,224,233,210,29,
-49,6,200,73,133,0,61,55,85,0,125,143,105,0,224,49,
-178,5,128,255,42,0,61,63,108,0,38,6,124,137,132,0,
-191,255,16,148,47,6,48,72,133,0,125,127,105,0,129,226,
-201,5,29,48,191,255,48,245,64,6,255,0,33,6,162,139,
-129,0,97,0,33,6,220,151,129,0,97,0,33,6,54,111,
-129,0,97,0,33,6,198,80,130,0,97,0,128,7,33,0,
+49,6,80,85,133,0,61,55,85,0,125,143,105,0,224,49,
+178,5,128,255,42,0,61,63,108,0,38,6,92,148,132,0,
+191,255,108,147,47,6,184,83,133,0,125,127,105,0,129,226,
+201,5,29,48,191,255,214,167,64,6,255,0,33,6,64,148,
+129,0,97,0,33,6,126,160,129,0,97,0,33,6,138,119,
+129,0,97,0,33,6,106,89,130,0,97,0,128,7,33,0,
 0,66,128,255,84,4,64,6,63,0,128,7,33,0,1,66,
 128,255,70,4,64,6,63,0,128,7,225,243,8,192,6,224,
 60,207,8,0,7,232,61,223,13,0,61,215,9,0,251,1,
 210,29,60,71,14,0,26,48,8,72,191,74,27,56,191,255,
-230,244,10,48,11,56,25,64,25,72,191,74,191,255,168,255,
+226,244,10,48,11,56,25,64,25,72,191,74,191,255,168,255,
 60,71,4,0,10,176,8,72,191,74,22,48,11,184,23,56,
 191,255,148,255,10,96,11,104,229,13,0,186,60,111,14,0,
 26,176,237,183,194,2,60,103,4,0,249,183,34,2,246,103,
@@ -18988,33 +19124,33 @@ unsigned char tw_fw_code[] __initdata = 
 60,134,16,0,194,82,10,96,208,81,42,23,1,0,29,56,
 34,23,105,0,60,86,16,0,204,81,2,22,48,0,34,95,
 0,0,42,55,1,0,11,96,204,49,24,64,34,119,5,0,
-63,6,72,144,0,0,110,0,125,215,9,0,125,223,13,0,
+63,6,236,144,0,0,110,0,125,215,9,0,125,223,13,0,
 229,5,28,48,29,56,1,66,128,255,94,3,64,6,255,243,
 128,7,225,48,6,208,31,226,31,234,0,218,197,37,27,16,
 194,18,58,126,16,0,194,121,47,111,1,0,224,105,162,29,
 58,102,16,0,194,97,44,95,1,0,43,23,105,0,63,6,
-164,144,0,0,2,22,24,0,34,55,0,0,34,87,5,0,
+72,145,0,0,2,22,24,0,34,55,0,0,34,87,5,0,
 203,49,106,0,253,89,235,5,177,5,252,81,185,5,10,224,
 11,232,65,218,58,23,4,0,226,217,166,221,31,82,253,81,
 234,5,252,81,202,5,0,82,0,90,229,29,2,64,2,72,
 191,74,28,48,29,56,191,255,126,254,10,48,58,239,14,0,
-11,56,224,233,247,13,29,64,29,72,191,74,191,255,152,243,
+11,56,224,233,247,13,29,64,29,72,191,74,191,255,148,243,
 10,48,11,56,29,64,29,72,191,74,191,255,90,254,10,48,
 11,56,6,80,7,88,64,6,255,48,128,7,225,0,6,232,
-7,224,191,255,16,223,61,143,108,0,92,143,2,0,64,6,
-255,0,128,7,97,0,6,232,61,63,8,0,38,6,80,138,
-132,0,7,128,191,130,159,130,208,57,161,58,191,255,244,145,
-29,48,191,255,230,223,64,6,127,0,130,7,225,0,35,255,
+7,224,191,255,20,223,61,143,108,0,92,143,2,0,64,6,
+255,0,128,7,97,0,6,232,61,63,8,0,38,6,48,149,
+132,0,7,128,191,130,159,130,208,57,161,58,191,255,80,145,
+29,48,191,255,234,223,64,6,127,0,130,7,225,0,35,255,
 17,0,6,232,7,23,0,0,7,127,1,0,125,23,4,0,
 93,127,6,0,2,6,240,255,191,5,224,17,170,13,2,56,
-38,6,100,138,132,0,191,255,186,145,0,82,128,7,60,1,
+38,6,68,149,132,0,191,255,22,145,0,82,128,7,60,1,
 39,103,9,0,0,112,204,113,39,95,13,0,225,135,0,0,
 208,89,125,119,89,0,125,95,93,0,1,122,7,95,2,0,
 61,135,4,0,235,127,192,0,125,95,10,0,125,95,108,0,
 125,127,8,0,15,110,255,255,239,128,125,111,12,0,125,135,
 14,0,11,16,100,18,190,5,224,17,186,5,105,18,151,13,
-2,56,38,6,160,138,132,0,191,255,88,145,0,82,213,109,
-99,255,1,0,29,48,191,255,52,237,10,224,224,225,146,85,
+2,56,38,6,128,149,132,0,191,255,180,144,0,82,213,109,
+99,255,1,0,29,48,191,255,56,237,10,224,224,225,146,85,
 0,122,149,53,15,80,194,82,61,118,16,0,206,81,42,23,
 1,0,1,130,34,23,14,0,0,98,1,106,236,111,192,0,
 226,105,186,5,0,130,213,5,65,98,12,6,224,255,233,245,
@@ -19022,21 +19158,21 @@ unsigned char tw_fw_code[] __initdata = 
 0,96,0,80,181,5,2,86,255,255,125,103,10,0,61,119,
 4,0,125,87,12,0,226,112,125,23,8,0,125,119,14,0,
 229,5,65,122,61,103,4,0,236,121,214,205,61,23,105,0,
-63,6,120,146,0,0,2,22,24,0,34,87,0,0,34,95,
+63,6,28,147,0,0,2,22,24,0,34,87,0,0,34,95,
 5,0,221,81,10,48,107,0,10,48,61,71,14,0,11,56,
-8,72,191,74,191,255,0,242,125,87,97,0,125,95,101,0,
+8,72,191,74,191,255,252,241,125,87,97,0,125,95,101,0,
 61,95,101,0,61,87,97,0,235,1,234,13,234,1,202,13,
-38,6,224,138,132,0,191,255,138,144,0,226,1,82,125,87,
+38,6,192,149,132,0,191,255,230,143,0,226,1,82,125,87,
 97,0,125,7,101,0,28,80,66,6,255,0,128,7,97,0,
-6,232,191,255,52,239,61,119,8,0,10,16,2,6,1,128,
+6,232,191,255,56,239,61,119,8,0,10,16,2,6,1,128,
 130,13,238,17,130,21,61,135,4,0,240,23,32,2,181,13,
 32,110,128,0,14,6,128,255,61,95,4,0,237,119,46,19,
 235,23,32,2,2,80,64,6,127,0,128,7,97,0,6,232,
-191,255,86,239,10,16,2,6,1,128,186,5,61,23,8,0,
+191,255,90,239,10,16,2,6,1,128,186,5,61,23,8,0,
 2,80,64,6,127,0,130,7,225,243,6,232,8,200,9,224,
-191,255,108,238,10,192,224,193,194,69,61,71,8,0,57,215,
+191,255,112,238,10,192,224,193,194,69,61,71,8,0,57,215,
 1,0,8,72,99,71,2,0,191,74,57,223,5,0,26,48,
-27,56,191,255,66,241,10,176,11,184,61,95,101,0,61,87,
+27,56,191,255,62,241,10,176,11,184,61,95,101,0,61,87,
 97,0,235,185,209,5,187,5,234,177,161,5,0,194,61,71,
 14,0,22,48,8,72,191,74,23,56,191,255,234,251,35,71,
 2,0,60,231,1,0,8,72,232,231,32,2,28,232,191,234,
@@ -19045,7 +19181,7 @@ unsigned char tw_fw_code[] __initdata = 
 121,215,1,0,225,119,0,0,206,217,221,217,121,223,5,0,
 24,80,66,6,255,243,150,7,225,240,8,192,7,224,60,215,
 9,0,6,232,60,223,13,0,61,207,8,0,251,1,210,29,
-61,71,14,0,26,48,8,72,191,74,27,56,191,255,168,240,
+61,71,14,0,26,48,8,72,191,74,27,56,191,255,164,240,
 10,48,11,56,25,64,25,72,191,74,191,255,106,251,99,95,
 33,0,99,87,29,0,10,48,61,71,4,0,11,56,8,72,
 191,74,191,255,82,251,149,21,61,111,14,0,26,112,237,119,
@@ -19061,16 +19197,16 @@ unsigned char tw_fw_code[] __initdata = 
 25,0,35,87,41,0,35,103,29,0,35,111,33,0,204,81,
 225,135,0,0,205,129,99,215,5,0,99,119,16,0,99,87,
 9,0,99,135,13,0,252,103,23,0,99,103,22,0,195,151,
-22,0,60,231,1,0,128,255,248,170,43,6,148,204,1,0,
+22,0,60,231,1,0,128,255,40,172,43,6,228,206,1,0,
 106,95,5,0,106,231,9,0,99,87,1,0,35,127,41,0,
 61,87,8,0,35,23,37,0,175,81,99,87,18,0,224,193,
 202,29,2,80,194,82,61,110,16,0,202,105,45,23,1,0,
 61,94,16,0,34,23,105,0,203,81,72,18,34,95,0,0,
 42,55,1,0,11,96,204,49,3,56,34,87,5,0,63,6,
-54,149,0,0,106,0,197,29,61,94,16,0,61,126,16,0,
+218,149,0,0,106,0,197,29,61,94,16,0,61,126,16,0,
 2,80,194,82,10,112,206,121,47,23,1,0,203,81,34,23,
 105,0,42,55,1,0,2,22,16,0,34,95,0,0,3,56,
-203,49,34,103,5,0,63,6,110,149,0,0,108,0,35,87,
+203,49,34,103,5,0,63,6,18,150,0,0,108,0,35,87,
 29,0,35,95,33,0,99,87,9,0,99,95,13,0,1,226,
 128,7,12,1,2,80,58,23,17,0,35,95,16,0,137,18,
 171,17,245,5,26,214,20,0,58,23,17,0,0,90,137,18,
@@ -19084,35 +19220,35 @@ unsigned char tw_fw_code[] __initdata = 
 208,121,205,121,99,127,13,0,35,23,37,0,224,193,202,29,
 2,80,194,82,61,102,16,0,202,97,44,23,1,0,61,94,
 16,0,34,23,105,0,203,81,72,18,34,95,0,0,42,55,
-1,0,11,96,204,49,3,56,34,135,5,0,63,6,84,150,
+1,0,11,96,204,49,3,56,34,135,5,0,63,6,248,150,
 0,0,112,0,197,29,61,94,16,0,61,118,16,0,2,80,
 194,82,10,104,205,113,46,23,1,0,203,81,34,23,105,0,
 42,55,1,0,2,22,16,0,34,103,0,0,3,56,204,49,
-34,95,5,0,63,6,140,150,0,0,107,0,35,23,18,0,
+34,95,5,0,63,6,48,151,0,0,107,0,35,23,18,0,
 162,217,224,217,183,5,191,7,238,254,197,85,60,215,9,0,
 35,111,33,0,60,223,13,0,35,103,29,0,2,80,10,112,
 204,113,124,119,9,0,225,135,0,0,16,120,205,121,124,127,
 13,0,0,90,35,23,37,0,28,56,224,193,202,29,61,134,
 16,0,2,80,194,82,10,120,207,129,48,23,1,0,61,94,
 16,0,34,23,105,0,203,81,72,18,34,95,0,0,42,55,
-1,0,11,96,204,49,34,111,5,0,63,6,2,151,0,0,
+1,0,11,96,204,49,34,111,5,0,63,6,166,151,0,0,
 109,0,197,29,61,94,16,0,2,96,194,98,12,80,202,89,
-43,23,1,0,63,6,58,151,0,0,34,23,105,0,61,94,
+43,23,1,0,63,6,222,151,0,0,34,23,105,0,61,94,
 16,0,203,97,2,22,16,0,34,95,0,0,44,103,1,0,
 11,48,34,127,5,0,204,49,111,0,124,215,9,0,124,223,
 13,0,86,6,255,240,148,7,225,243,8,200,6,232,99,79,
-9,0,38,6,180,215,255,255,7,216,0,58,129,255,28,40,
+9,0,38,6,180,215,255,255,7,216,0,58,129,255,198,41,
 224,81,194,5,0,82,128,7,226,2,61,135,4,0,98,130,
-206,5,0,82,128,7,212,2,47,6,204,228,140,0,59,119,
+206,5,0,82,128,7,212,2,47,6,44,240,140,0,59,119,
 25,0,99,7,28,0,99,119,37,0,99,127,17,0,251,111,
 23,0,99,111,34,0,59,231,1,0,195,151,34,0,128,255,
-48,168,44,6,148,204,1,0,106,103,5,0,106,231,9,0,
+96,169,44,6,228,206,1,0,106,103,5,0,106,231,9,0,
 99,87,13,0,10,88,61,87,4,0,107,87,0,0,57,111,
 5,0,57,87,13,0,57,103,1,0,10,112,204,113,225,79,
 0,0,205,73,99,79,25,0,99,119,21,0,99,7,1,0,
 59,215,5,0,61,231,8,0,57,207,9,0,59,191,18,0,
 170,225,59,223,16,0,128,7,34,2,99,7,30,0,27,192,
-99,215,5,0,40,6,204,228,140,0,0,178,23,248,188,185,
+99,215,5,0,40,6,44,240,140,0,0,178,23,248,188,185,
 224,185,167,21,58,23,17,0,28,80,137,18,187,17,245,5,
 26,214,20,0,58,23,17,0,0,218,137,18,162,81,156,253,
 219,17,10,216,194,217,35,79,5,0,61,87,4,0,24,56,
@@ -19134,37 +19270,37 @@ unsigned char tw_fw_code[] __initdata = 
 35,151,9,0,224,145,218,29,61,94,16,0,61,126,16,0,
 25,80,194,82,10,112,206,121,47,23,1,0,203,81,34,23,
 105,0,42,55,1,0,72,18,34,95,0,0,35,62,12,0,
-203,49,34,103,5,0,63,6,110,153,0,0,108,0,213,29,
+203,49,34,103,5,0,63,6,18,154,0,0,108,0,213,29,
 25,128,194,130,61,86,16,0,208,81,42,23,1,0,35,62,
 12,0,34,23,105,0,61,86,16,0,208,81,2,22,16,0,
 34,95,0,0,42,55,1,0,11,96,204,49,34,119,5,0,
-63,6,168,153,0,0,110,0,61,135,8,0,61,119,12,0,
+63,6,76,154,0,0,110,0,61,135,8,0,61,119,12,0,
 16,224,35,103,21,0,35,111,25,0,76,113,174,97,225,79,
 0,0,169,105,99,111,25,0,99,103,21,0,0,120,61,111,
 4,0,65,202,237,201,134,21,0,202,16,120,191,122,16,112,
 204,113,99,119,21,0,35,111,25,0,225,135,0,0,208,121,
-205,121,99,127,25,0,22,6,0,255,166,13,38,6,28,139,
-132,0,32,62,89,4,0,66,191,255,178,128,224,81,35,151,
+205,121,99,127,25,0,22,6,0,255,166,13,38,6,252,149,
+132,0,32,62,89,4,0,66,191,255,14,128,224,81,35,151,
 1,0,65,146,99,151,1,0,35,151,1,0,61,103,4,0,
 236,145,190,5,191,7,214,253,38,6,180,215,255,255,129,255,
-20,38,224,81,146,13,38,6,48,139,132,0,32,62,183,1,
-0,66,191,255,120,128,1,82,84,6,255,243,130,7,225,112,
+190,39,224,81,146,13,38,6,16,150,132,0,32,62,183,1,
+0,66,191,255,212,127,1,82,84,6,255,243,130,7,225,112,
 7,224,188,0,8,208,9,200,0,218,6,232,3,56,191,255,
-84,225,35,135,1,0,224,129,202,45,127,226,194,5,123,226,
+88,225,35,135,1,0,224,129,202,45,127,226,194,5,123,226,
 226,29,245,37,29,127,7,0,123,122,186,37,61,87,89,0,
 61,111,101,0,61,95,93,0,61,103,97,0,237,89,145,29,
 187,5,236,81,225,21,61,55,85,0,93,231,7,0,224,49,
 130,21,191,255,154,244,125,7,85,0,181,13,29,119,7,0,
 127,114,250,5,93,231,7,0,125,7,89,0,125,7,93,0,
 35,23,1,0,97,18,210,5,224,17,170,13,123,226,130,13,
-29,48,28,56,26,64,25,72,191,255,216,229,10,216,61,23,
-105,0,63,6,250,154,0,0,2,22,96,1,34,87,0,0,
+29,48,28,56,26,64,25,72,191,255,220,229,10,216,61,23,
+105,0,63,6,158,155,0,0,2,22,96,1,34,87,0,0,
 34,95,5,0,221,81,10,48,107,0,27,80,66,6,255,112,
 128,7,225,16,6,232,29,135,7,0,1,226,16,6,225,255,
 170,13,93,7,2,0,125,7,89,0,125,7,93,0,31,122,
 93,127,7,0,0,218,229,37,27,16,194,18,61,110,16,0,
 194,105,45,95,1,0,224,89,186,5,0,226,245,29,61,134,
-16,0,208,17,34,95,1,0,43,23,105,0,63,6,100,155,
+16,0,208,17,34,95,1,0,43,23,105,0,63,6,8,156,
 0,0,2,22,96,1,34,87,0,0,34,127,5,0,203,81,
 10,48,111,0,224,81,218,5,93,7,7,0,0,226,229,5,
 65,218,61,119,4,0,238,217,134,221,29,23,7,0,127,18,
@@ -19172,95 +19308,95 @@ unsigned char tw_fw_code[] __initdata = 
 255,16,134,7,225,48,8,216,187,0,6,232,61,215,85,0,
 7,224,188,0,100,226,234,53,29,23,7,0,226,217,170,53,
 123,18,138,53,224,209,226,5,125,7,85,0,26,48,191,255,
-126,243,29,48,35,62,4,0,191,255,238,230,61,23,105,0,
+126,243,29,48,35,62,4,0,191,255,242,230,61,23,105,0,
 35,79,9,0,2,22,232,0,34,87,0,0,35,71,5,0,
-221,81,10,48,34,103,5,0,63,6,240,155,0,0,108,0,
+221,81,10,48,34,103,5,0,63,6,148,156,0,0,108,0,
 61,23,105,0,31,58,2,22,152,0,34,87,0,0,31,66,
-221,81,10,48,3,72,34,95,5,0,63,6,18,156,0,0,
+221,81,10,48,3,72,34,95,5,0,63,6,182,156,0,0,
 107,0,224,225,218,5,29,127,7,0,239,217,178,5,99,226,
 138,61,61,111,85,0,224,105,226,5,125,7,85,0,26,48,
 191,255,12,243,99,226,218,45,125,7,89,0,125,7,93,0,
 224,209,242,37,29,95,7,0,123,90,234,5,0,50,191,255,
 246,242,125,87,85,0,61,55,85,0,224,49,162,29,29,56,
 191,255,236,242,224,81,210,21,61,87,85,0,224,81,242,13,
-42,23,241,11,3,58,72,18,34,95,0,0,63,6,140,156,
+42,23,241,11,3,58,72,18,34,95,0,0,63,6,48,157,
 0,0,202,89,34,87,5,0,11,48,106,0,125,7,85,0,
 97,226,218,45,29,23,7,0,226,217,154,45,61,111,85,0,
 224,105,170,45,123,18,234,5,0,50,191,255,154,242,125,87,
 85,0,61,55,85,0,224,49,242,29,29,56,191,255,144,242,
 224,81,162,29,61,87,85,0,224,81,226,13,42,23,241,11,
 3,58,72,18,34,55,0,0,34,95,5,0,202,49,63,6,
-230,156,0,0,107,0,125,7,85,0,229,5,29,48,28,56,
-27,64,191,255,74,222,70,6,255,48,128,7,225,112,6,232,
+138,157,0,0,107,0,125,7,85,0,229,5,29,48,28,56,
+27,64,191,255,78,222,70,6,255,48,128,7,225,112,6,232,
 7,208,8,200,0,226,149,61,28,16,194,18,61,134,16,0,
 194,129,48,119,1,0,32,222,35,1,224,113,210,45,61,110,
 16,0,2,96,204,105,45,95,1,0,26,56,43,23,105,0,
-25,64,2,22,208,0,34,87,0,0,63,6,74,157,0,0,
+25,64,2,22,208,0,34,87,0,0,63,6,238,157,0,0,
 203,81,34,95,5,0,10,48,107,0,10,216,10,16,224,81,
-138,21,61,23,105,0,63,6,110,157,0,0,2,22,96,1,
+138,21,61,23,105,0,63,6,18,158,0,0,2,22,96,1,
 34,87,0,0,34,143,5,0,221,81,10,48,113,0,149,13,
 2,6,220,254,226,5,65,226,61,127,4,0,239,225,214,197,
 27,80,64,6,255,112,128,7,225,16,6,224,60,23,17,0,
 7,232,130,23,7,0,106,18,210,5,108,18,178,5,111,18,
-250,5,28,48,29,56,191,255,128,222,10,216,245,61,28,48,
-76,234,29,56,191,255,114,222,10,216,29,48,0,58,12,66,
-191,255,104,133,32,134,255,0,93,135,0,0,93,7,1,0,
+250,5,28,48,29,56,191,255,132,222,10,216,245,61,28,48,
+76,234,29,56,191,255,118,222,10,216,29,48,0,58,12,66,
+191,255,196,132,32,134,255,0,93,135,0,0,93,7,1,0,
 0,18,133,21,2,120,194,122,60,102,16,0,204,121,47,135,
 1,0,61,94,2,0,16,135,7,0,194,89,75,135,0,0,
 65,18,60,127,4,0,239,17,230,237,6,114,84,234,93,119,
 1,0,60,23,105,0,15,104,2,22,24,0,34,87,0,0,
-93,111,0,0,220,81,10,48,34,103,5,0,63,6,36,158,
+93,111,0,0,220,81,10,48,34,103,5,0,63,6,200,158,
 0,0,108,0,125,87,9,0,66,218,60,23,105,0,60,95,
 10,0,2,22,144,1,34,55,0,0,93,95,2,0,220,49,
-34,87,5,0,63,6,76,158,0,0,106,0,93,7,5,0,
+34,87,5,0,63,6,240,158,0,0,106,0,93,7,5,0,
 93,87,3,0,93,7,6,0,168,82,93,87,4,0,93,7,
 7,0,27,80,64,6,255,16,128,7,225,112,6,208,0,226,
 0,202,0,218,149,45,58,134,16,0,27,232,194,234,29,120,
 207,129,48,23,1,0,58,86,16,0,34,23,105,0,221,81,
 2,22,144,1,34,95,0,0,42,55,1,0,11,96,204,49,
-34,111,5,0,63,6,172,158,0,0,109,0,249,87,192,0,
+34,111,5,0,63,6,80,159,0,0,109,0,249,87,192,0,
 10,225,58,86,16,0,202,233,61,143,1,0,49,143,4,0,
 220,0,209,201,65,218,58,135,4,0,240,217,214,213,28,80,
 202,0,64,6,255,112,128,7,225,0,6,232,7,224,224,233,
-210,45,49,6,40,80,133,0,61,55,85,0,125,143,105,0,
-224,49,178,5,191,255,72,240,61,23,105,0,63,6,20,159,
+210,45,49,6,176,91,133,0,61,55,85,0,125,143,105,0,
+224,49,178,5,191,255,72,240,61,23,105,0,63,6,184,159,
 0,0,2,22,104,1,34,87,0,0,34,135,5,0,221,81,
-10,48,112,0,29,63,0,0,29,71,1,0,38,6,60,139,
-132,0,191,255,14,132,45,6,48,72,133,0,125,111,105,0,
-129,226,201,5,29,48,191,255,46,229,64,6,255,0,128,7,
-33,0,38,23,105,0,63,6,92,159,0,0,72,18,34,87,
+10,48,112,0,29,63,0,0,29,71,1,0,38,6,28,150,
+132,0,191,255,106,131,45,6,184,83,133,0,125,111,105,0,
+129,226,201,5,29,48,191,255,212,151,64,6,255,0,128,7,
+33,0,38,23,105,0,63,6,0,160,0,0,72,18,34,87,
 0,0,34,135,5,0,198,81,10,48,112,0,64,6,63,0,
-128,7,33,0,38,23,105,0,63,6,128,159,0,0,2,22,
+128,7,33,0,38,23,105,0,63,6,36,160,0,0,2,22,
 16,0,34,87,0,0,34,135,5,0,198,81,10,48,112,0,
-64,6,63,0,128,7,33,0,38,23,105,0,63,6,164,159,
+64,6,63,0,128,7,33,0,38,23,105,0,63,6,72,160,
 0,0,2,22,16,0,34,87,0,0,34,135,5,0,198,81,
 10,48,112,0,64,6,63,0,1,82,127,0,0,82,127,0,
 32,86,34,1,127,0,0,82,127,0,0,82,127,0,0,82,
 127,0,31,82,127,0,128,7,33,0,38,23,105,0,63,6,
-230,159,0,0,2,22,208,0,34,87,0,0,34,135,5,0,
+138,160,0,0,2,22,208,0,34,87,0,0,34,135,5,0,
 198,81,10,48,112,0,64,6,63,0,128,7,97,0,6,16,
 34,55,124,0,34,95,126,0,194,49,224,89,206,5,34,23,
 129,0,213,13,34,87,128,0,198,81,42,87,1,0,195,90,
 202,89,43,87,0,0,43,23,5,0,202,49,2,232,63,6,
-38,160,0,0,125,0,64,6,127,0,146,7,225,243,6,232,
+202,160,0,0,125,0,64,6,127,0,146,7,225,243,6,232,
 61,71,10,0,7,224,8,72,60,199,9,0,191,74,60,207,
 13,0,24,48,25,56,128,255,28,23,10,176,60,87,25,0,
 61,215,14,0,61,119,12,0,60,103,5,0,60,223,18,0,
 11,184,60,95,16,0,99,103,13,0,99,207,21,0,99,199,
 17,0,99,95,24,0,60,135,22,0,99,87,33,0,99,135,
 30,0,60,231,1,0,88,113,174,209,250,217,255,5,27,16,
-99,231,9,0,0,218,0,226,245,13,128,255,52,159,46,6,
-148,204,1,0,106,119,5,0,10,200,106,231,9,0,26,16,
+99,231,9,0,0,218,0,226,245,13,128,255,100,160,46,6,
+228,206,1,0,106,119,5,0,10,200,106,231,9,0,26,16,
 99,207,9,0,2,224,99,23,26,0,22,64,61,55,81,0,
-23,72,99,7,1,0,128,255,44,205,10,208,35,199,9,0,
-128,255,254,158,106,199,9,0,106,215,33,0,45,6,126,66,
+23,72,99,7,1,0,128,255,178,206,10,208,35,199,9,0,
+128,255,46,160,106,199,9,0,106,215,33,0,45,6,82,68,
 1,0,61,23,134,0,61,55,132,0,99,87,9,0,106,111,
 5,0,221,49,224,17,206,5,61,23,137,0,213,13,61,87,
 136,0,198,81,42,87,1,0,195,18,202,17,34,87,0,0,
-34,23,5,0,202,49,2,208,35,62,8,0,63,6,36,161,
+34,23,5,0,202,49,2,208,35,62,8,0,63,6,200,161,
 0,0,122,0,10,192,35,215,9,0,229,87,64,0,224,7,
 96,1,58,255,0,0,216,249,122,255,0,0,10,192,248,47,
-32,0,224,249,138,13,26,48,58,95,5,0,63,6,84,161,
+32,0,224,249,138,13,26,48,58,95,5,0,63,6,248,161,
 0,0,107,0,1,146,99,151,5,0,128,7,40,1,35,135,
 13,0,35,79,24,0,48,23,17,0,35,103,17,0,137,18,
 169,17,28,120,191,122,28,112,204,113,99,119,17,0,35,111,
@@ -19271,67 +19407,67 @@ unsigned char tw_fw_code[] __initdata = 
 133,21,229,87,64,0,224,7,96,1,10,248,35,143,5,0,
 57,87,0,0,209,81,121,87,0,0,255,47,32,0,27,224,
 99,231,26,0,65,178,22,64,225,95,0,0,203,185,61,55,
-81,0,23,72,99,7,1,0,128,255,250,203,10,208,128,255,
-208,157,106,207,9,0,106,215,33,0,45,6,126,66,1,0,
+81,0,23,72,99,7,1,0,128,255,128,205,10,208,128,255,
+0,159,106,207,9,0,106,215,33,0,45,6,82,68,1,0,
 61,23,134,0,61,55,132,0,99,87,9,0,106,111,5,0,
 221,49,224,17,206,5,61,23,137,0,213,13,61,87,136,0,
 198,81,42,87,1,0,195,18,202,17,34,87,0,0,34,23,
-5,0,202,49,2,208,35,62,8,0,63,6,82,162,0,0,
+5,0,202,49,2,208,35,62,8,0,63,6,246,162,0,0,
 122,0,10,192,35,215,9,0,229,87,64,0,224,7,96,1,
 58,255,0,0,216,249,122,255,0,0,10,192,248,47,32,0,
-224,249,138,13,26,48,58,95,5,0,63,6,130,162,0,0,
+224,249,138,13,26,48,58,95,5,0,63,6,38,163,0,0,
 107,0,188,217,224,217,183,5,191,7,214,254,82,6,255,243,
 128,7,97,48,1,82,6,232,61,135,17,0,0,90,224,129,
-130,21,16,88,43,23,105,0,63,6,192,162,0,0,2,22,
+130,21,16,88,43,23,105,0,63,6,100,163,0,0,2,22,
 24,0,34,87,0,0,34,127,5,0,203,81,10,48,111,0,
 10,208,1,82,11,216,61,119,21,0,0,90,224,113,130,21,
-14,88,43,23,105,0,63,6,238,162,0,0,2,22,24,0,
+14,88,43,23,105,0,63,6,146,163,0,0,2,22,24,0,
 34,87,0,0,34,111,5,0,203,81,10,48,109,0,10,96,
 11,104,235,217,235,5,177,5,234,209,185,5,26,96,27,104,
 12,80,13,88,64,6,127,48,132,7,225,240,6,224,7,192,
-191,255,252,201,97,82,186,5,1,82,229,93,28,23,7,0,
+191,255,0,202,97,82,186,5,1,82,229,93,28,23,7,0,
 0,234,2,6,17,0,194,5,2,6,33,0,170,21,60,23,
-105,0,63,6,74,163,0,0,2,22,88,1,34,87,0,0,
+105,0,63,6,238,163,0,0,2,22,88,1,34,87,0,0,
 34,127,5,0,220,81,10,48,111,0,1,234,234,239,192,0,
 224,233,234,207,0,0,0,218,1,114,251,119,192,0,88,113,
 194,53,0,210,229,45,26,136,194,138,60,86,16,0,209,81,
 42,23,1,0,27,64,34,23,105,0,60,86,16,0,209,81,
 2,22,136,0,34,95,0,0,42,63,1,0,11,96,204,57,
-35,54,4,0,34,127,5,0,63,6,160,163,0,0,111,0,
+35,54,4,0,34,127,5,0,63,6,68,164,0,0,111,0,
 35,119,5,0,99,119,1,0,195,199,0,0,146,13,1,18,
 250,23,192,0,2,96,93,97,186,5,2,233,65,202,65,210,
 60,95,4,0,235,209,134,213,65,218,27,6,224,255,214,197,
 97,202,231,87,0,0,68,6,255,240,128,7,97,0,6,232,
-191,255,94,202,224,81,202,21,221,143,2,0,61,23,105,0,
+191,255,98,202,224,81,202,21,221,143,2,0,61,23,105,0,
 1,138,2,22,96,1,34,87,0,0,125,143,117,0,221,81,
-10,48,34,135,5,0,63,6,14,164,0,0,112,0,1,82,
-64,6,127,0,128,7,97,0,7,232,191,255,128,202,1,138,
+10,48,34,135,5,0,63,6,178,164,0,0,112,0,1,82,
+64,6,127,0,128,7,97,0,7,232,191,255,132,202,1,138,
 125,143,1,0,64,6,127,0,134,7,225,241,6,232,7,224,
-8,200,191,255,220,211,10,16,2,6,222,254,178,5,128,7,
+8,200,191,255,224,211,10,16,2,6,222,254,178,5,128,7,
 52,1,60,223,13,0,60,215,9,0,25,56,99,223,9,0,
 99,215,5,0,35,70,4,0,61,23,105,0,3,72,2,22,
 240,0,34,87,0,0,34,127,5,0,221,81,10,48,63,6,
-118,164,0,0,111,0,224,81,202,5,32,86,9,1,165,125,
+26,165,0,0,111,0,224,81,202,5,32,86,9,1,165,125,
 35,119,1,0,61,71,10,0,224,113,226,191,0,0,8,72,
 35,199,5,0,191,74,35,207,9,0,24,48,25,56,128,255,
 196,18,10,64,29,23,7,0,11,72,2,6,17,0,210,13,
 2,6,33,0,218,13,61,95,93,0,61,87,89,0,233,89,
 251,5,177,5,232,81,203,5,32,86,34,1,181,85,61,111,
 101,0,61,103,97,0,1,114,174,97,225,135,0,0,176,105,
-237,73,154,29,236,65,250,21,61,23,105,0,63,6,4,165,
+237,73,154,29,236,65,250,21,61,23,105,0,63,6,168,165,
 0,0,2,22,24,0,34,87,0,0,34,95,5,0,221,81,
 10,48,107,0,235,201,241,5,187,5,234,193,193,5,32,86,
 34,1,133,53,60,207,25,0,12,82,124,87,25,0,61,126,
 16,0,35,87,5,0,35,95,9,0,28,56,124,87,9,0,
 124,95,13,0,23,80,61,94,16,0,194,82,10,112,206,121,
 47,23,1,0,203,81,34,23,105,0,42,55,1,0,2,22,
-56,0,34,95,0,0,34,103,5,0,203,49,63,6,100,165,
+56,0,34,95,0,0,34,103,5,0,203,49,63,6,8,166,
 0,0,108,0,124,207,25,0,124,215,9,0,124,223,13,0,
 0,82,70,6,255,241,134,7,225,240,6,232,7,224,8,200,
-191,255,72,211,10,16,2,6,222,254,178,5,128,7,46,1,
+191,255,76,211,10,16,2,6,222,254,178,5,128,7,46,1,
 60,223,13,0,60,215,9,0,25,56,99,223,9,0,99,215,
 5,0,35,70,4,0,61,23,105,0,3,72,2,22,240,0,
-34,87,0,0,34,127,5,0,221,81,10,48,63,6,196,165,
+34,87,0,0,34,127,5,0,221,81,10,48,63,6,104,166,
 0,0,111,0,224,81,202,5,32,86,9,1,245,117,61,71,
 10,0,35,199,5,0,8,72,191,74,35,207,9,0,24,48,
 25,56,128,255,128,17,10,64,29,23,7,0,11,72,2,6,
@@ -19339,21 +19475,21 @@ unsigned char tw_fw_code[] __initdata = 
 89,0,233,89,251,5,177,5,232,81,203,5,32,86,34,1,
 213,85,61,111,101,0,61,103,97,0,1,114,174,97,225,135,
 0,0,176,105,237,73,154,29,236,65,250,21,61,23,105,0,
-63,6,72,166,0,0,2,22,24,0,34,87,0,0,34,103,
+63,6,236,166,0,0,2,22,24,0,34,87,0,0,34,103,
 5,0,221,81,10,48,108,0,235,201,241,5,187,5,234,193,
 193,5,32,86,34,1,165,53,60,207,25,0,11,90,124,95,
 25,0,61,134,16,0,35,87,5,0,35,95,9,0,28,56,
 124,87,9,0,124,95,13,0,35,87,1,0,61,94,16,0,
 194,82,10,120,207,129,48,23,1,0,203,81,34,23,105,0,
 42,55,1,0,2,22,72,0,34,95,0,0,34,111,5,0,
-11,96,204,49,63,6,172,166,0,0,109,0,124,207,25,0,
+11,96,204,49,63,6,80,167,0,0,109,0,124,207,25,0,
 124,215,9,0,124,223,13,0,0,82,70,6,255,240,130,7,
 225,241,7,232,6,224,28,23,7,0,8,96,2,6,33,0,
 242,5,119,18,210,5,123,18,178,5,0,82,149,109,61,215,
 9,0,60,95,101,0,61,223,13,0,60,87,97,0,235,217,
 225,5,187,5,234,209,177,5,0,82,165,93,60,111,14,0,
 61,207,18,0,237,201,178,5,0,82,165,85,60,55,81,0,
-26,64,99,103,1,0,27,72,128,255,218,198,60,71,10,0,
+26,64,99,103,1,0,27,72,128,255,96,200,60,71,10,0,
 10,192,8,72,191,74,26,48,27,56,128,255,64,16,10,64,
 11,72,60,111,101,0,60,103,97,0,1,114,174,97,225,135,
 0,0,176,105,237,217,250,5,236,209,218,5,60,103,121,0,
@@ -19361,7 +19497,7 @@ unsigned char tw_fw_code[] __initdata = 
 13,0,125,71,9,0,60,94,16,0,60,135,108,0,60,126,
 16,0,194,130,16,112,206,121,47,23,1,0,203,129,34,23,
 105,0,48,55,1,0,72,18,34,95,0,0,29,56,203,49,
-34,103,5,0,63,6,156,167,0,0,108,0,125,191,25,0,
+34,103,5,0,63,6,64,168,0,0,108,0,125,191,25,0,
 125,207,18,0,125,215,9,0,125,223,13,0,24,80,66,6,
 255,241,128,7,225,241,6,224,28,23,7,0,7,232,2,6,
 33,0,130,13,119,18,226,5,123,18,194,5,32,86,34,1,
@@ -19375,47 +19511,47 @@ unsigned char tw_fw_code[] __initdata = 
 60,127,108,0,125,119,25,0,224,121,226,87,0,0,194,82,
 60,102,16,0,202,97,44,23,1,0,60,94,16,0,34,23,
 105,0,203,81,2,22,16,0,34,95,0,0,42,55,1,0,
-11,96,204,49,29,56,34,135,5,0,63,6,130,168,0,0,
+11,96,204,49,29,56,34,135,5,0,63,6,38,169,0,0,
 112,0,125,207,25,0,125,191,18,0,125,215,9,0,125,223,
 13,0,0,82,64,6,255,241,132,7,225,243,7,232,6,224,
 28,135,7,0,8,16,123,130,194,5,0,82,128,7,24,1,
 61,215,9,0,60,95,101,0,61,223,13,0,60,87,97,0,
 235,217,225,5,187,5,234,209,177,5,0,82,197,125,60,127,
 14,0,61,199,18,0,239,193,178,5,0,82,197,117,60,55,
-81,0,26,64,99,23,1,0,27,72,128,255,8,197,60,71,
+81,0,26,64,99,23,1,0,27,72,128,255,142,198,60,71,
 10,0,10,176,8,72,191,74,26,48,27,56,128,255,110,14,
 10,64,11,72,60,111,101,0,60,103,97,0,1,114,174,97,
 225,135,0,0,176,105,237,217,250,5,236,209,218,5,60,119,
 121,0,125,119,18,0,125,71,9,0,61,151,25,0,125,79,
-13,0,99,151,5,0,61,191,1,0,128,255,148,150,45,6,
-148,204,1,0,106,111,5,0,10,88,106,191,9,0,13,98,
+13,0,99,151,5,0,61,191,1,0,128,255,196,151,45,6,
+228,206,1,0,106,111,5,0,10,88,106,191,9,0,13,98,
 125,87,1,0,125,103,25,0,60,87,4,0,61,23,1,0,
 107,87,0,0,0,202,194,15,3,0,197,29,60,94,16,0,
 60,126,16,0,25,80,194,82,10,112,206,121,47,23,1,0,
 203,81,34,23,105,0,42,55,1,0,72,18,34,95,0,0,
-29,56,203,49,34,103,5,0,63,6,160,169,0,0,108,0,
+29,56,203,49,34,103,5,0,63,6,68,170,0,0,108,0,
 65,202,60,95,4,0,235,201,166,229,35,151,5,0,125,191,
 1,0,125,151,25,0,125,199,18,0,125,215,9,0,125,223,
 13,0,22,80,68,6,255,243,130,7,225,241,7,232,9,184,
-6,224,8,56,191,255,214,212,10,192,224,193,190,5,0,82,
+6,224,8,56,191,255,218,212,10,192,224,193,190,5,0,82,
 197,109,61,215,9,0,61,207,18,0,60,95,101,0,61,223,
 13,0,60,87,97,0,235,217,225,5,187,5,234,209,177,5,
 0,82,181,93,60,135,8,0,240,201,182,5,0,82,213,85,
 1,66,168,81,225,111,0,0,173,89,235,217,154,13,234,209,
 250,5,60,95,121,0,235,201,177,5,0,82,229,69,26,64,
-60,55,81,0,27,72,99,191,1,0,128,255,184,195,60,71,
+60,55,81,0,27,72,99,191,1,0,128,255,62,197,60,71,
 10,0,10,184,8,72,191,74,26,48,27,56,128,255,30,13,
 25,120,191,122,25,112,202,113,225,135,0,0,208,121,203,121,
 125,119,9,0,125,127,13,0,1,82,125,87,18,0,60,118,
 16,0,24,80,194,82,10,104,205,113,46,23,1,0,12,130,
 34,23,105,0,60,94,16,0,2,22,56,0,34,103,0,0,
 203,81,42,55,1,0,125,135,25,0,204,49,29,56,34,95,
-5,0,63,6,170,170,0,0,107,0,125,215,9,0,125,223,
+5,0,63,6,78,171,0,0,107,0,125,215,9,0,125,223,
 13,0,125,207,18,0,23,80,66,6,255,241,130,7,225,240,
 6,232,61,23,105,0,8,216,2,22,64,1,34,87,0,0,
-7,224,221,81,10,48,3,56,34,135,5,0,63,6,228,170,
+7,224,221,81,10,48,3,56,34,135,5,0,63,6,136,171,
 0,0,112,0,224,81,194,5,32,86,34,1,149,125,29,48,
-27,56,191,255,184,211,10,192,224,193,206,5,32,86,34,1,
+27,56,191,255,188,211,10,192,224,193,206,5,32,86,34,1,
 245,109,61,127,108,0,239,193,194,5,32,86,34,1,133,109,
 60,215,9,0,60,207,18,0,61,95,101,0,60,223,13,0,
 61,87,97,0,235,217,241,5,187,5,234,209,193,5,32,86,
@@ -19428,16 +19564,16 @@ unsigned char tw_fw_code[] __initdata = 
 124,127,13,0,24,80,1,122,124,127,18,0,194,82,61,102,
 16,0,202,97,44,23,1,0,61,94,16,0,34,23,105,0,
 203,81,2,22,64,0,34,95,0,0,42,55,1,0,11,96,
-204,49,28,56,34,135,5,0,63,6,208,171,0,0,112,0,
+204,49,28,56,34,135,5,0,63,6,116,172,0,0,112,0,
 124,215,9,0,124,223,13,0,124,207,18,0,0,82,66,6,
 255,240,134,7,225,48,8,216,187,0,6,232,61,215,85,0,
 7,224,188,0,100,226,234,53,29,23,7,0,226,217,170,53,
 123,18,138,53,224,209,226,5,125,7,85,0,26,48,191,255,
-46,227,29,48,35,62,4,0,191,255,158,214,61,23,105,0,
+46,227,29,48,35,62,4,0,191,255,162,214,61,23,105,0,
 35,79,9,0,2,22,232,0,34,87,0,0,35,71,5,0,
-221,81,10,48,34,103,5,0,63,6,64,172,0,0,108,0,
+221,81,10,48,34,103,5,0,63,6,228,172,0,0,108,0,
 61,23,105,0,31,58,2,22,152,0,34,87,0,0,31,66,
-221,81,10,48,3,72,34,95,5,0,63,6,98,172,0,0,
+221,81,10,48,3,72,34,95,5,0,63,6,6,173,0,0,
 107,0,224,225,218,5,29,127,7,0,239,217,178,5,99,226,
 170,69,61,111,85,0,224,105,226,5,125,7,85,0,26,48,
 191,255,188,226,99,226,250,53,125,7,89,0,125,7,93,0,
@@ -19446,39 +19582,39 @@ unsigned char tw_fw_code[] __initdata = 
 229,5,0,50,128,255,198,10,125,87,85,0,61,55,85,0,
 224,49,146,29,29,56,191,255,134,226,224,81,194,21,61,87,
 85,0,224,81,226,13,42,23,241,11,3,58,72,18,34,55,
-0,0,34,95,5,0,202,49,63,6,240,172,0,0,107,0,
+0,0,34,95,5,0,202,49,63,6,148,173,0,0,107,0,
 125,7,85,0,97,226,178,5,98,226,138,101,29,23,7,0,
 226,217,202,93,61,119,85,0,224,113,218,93,123,18,194,13,
 119,18,194,5,2,6,33,0,186,53,0,50,128,255,86,10,
 125,87,85,0,213,45,221,255,2,0,218,37,29,111,1,0,
-32,54,47,0,205,70,127,0,39,6,100,139,132,0,128,255,
+32,54,47,0,205,70,127,0,39,6,68,150,132,0,128,255,
 28,10,61,23,105,0,23,58,2,22,152,0,34,87,0,0,
-31,66,221,81,10,48,3,72,34,95,5,0,63,6,100,173,
+31,66,221,81,10,48,3,72,34,95,5,0,63,6,8,174,
 0,0,107,0,224,81,202,13,0,50,128,255,8,10,125,87,
 85,0,229,5,0,50,128,255,4,10,125,87,85,0,61,55,
 85,0,224,49,130,37,29,56,191,255,196,225,224,81,178,29,
 61,87,85,0,224,81,242,13,42,23,241,11,3,58,72,18,
-34,95,0,0,63,6,180,173,0,0,202,89,34,87,5,0,
+34,95,0,0,63,6,88,174,0,0,202,89,34,87,5,0,
 11,48,106,0,125,7,85,0,229,5,29,48,28,56,27,64,
-191,255,124,205,70,6,255,48,130,7,33,0,1,138,6,23,
+191,255,128,205,70,6,255,48,130,7,33,0,1,138,6,23,
 7,0,103,143,1,0,2,6,33,0,194,5,2,6,17,0,
-218,5,3,56,191,255,206,205,165,5,1,82,66,6,63,0,
-128,7,225,16,6,224,7,232,191,255,46,206,60,23,105,0,
+218,5,3,56,191,255,210,205,165,5,1,82,66,6,63,0,
+128,7,225,16,6,224,7,232,191,255,50,206,60,23,105,0,
 10,216,2,22,144,1,34,87,0,0,93,7,2,0,220,81,
-10,48,34,143,5,0,63,6,30,174,0,0,113,0,93,7,
+10,48,34,143,5,0,63,6,194,174,0,0,113,0,93,7,
 4,0,93,7,5,0,93,7,6,0,93,87,3,0,93,7,
 7,0,27,80,64,6,255,16,130,7,225,48,35,255,25,0,
 6,232,125,7,113,0,7,135,0,0,125,7,117,0,98,130,
-162,13,61,63,4,0,38,6,120,139,132,0,191,255,212,116,
+162,13,61,63,4,0,38,6,88,150,132,0,191,255,48,116,
 0,82,133,125,7,119,3,0,39,95,13,0,224,113,226,23,
 0,0,39,103,9,0,0,112,204,113,225,135,0,0,208,89,
 125,95,93,0,7,106,32,94,128,0,125,95,14,0,125,95,
 8,0,125,111,10,0,32,94,127,0,125,95,12,0,125,119,
-89,0,125,23,108,0,99,255,1,0,191,255,112,208,10,224,
-224,225,146,53,61,23,105,0,63,6,208,174,0,0,2,22,
+89,0,125,23,108,0,99,255,1,0,191,255,116,208,10,224,
+224,225,146,53,61,23,105,0,63,6,116,175,0,0,2,22,
 24,0,34,87,0,0,34,111,5,0,221,81,10,48,109,0,
 61,71,14,0,10,208,8,72,191,74,26,48,11,56,191,255,
-166,213,125,87,97,0,61,103,12,0,125,95,101,0,12,104,
+162,213,125,87,97,0,61,103,12,0,125,95,101,0,12,104,
 191,106,90,97,125,103,121,0,162,13,65,82,125,87,97,0,
 225,135,0,0,203,129,125,135,101,0,213,5,61,119,14,0,
 125,119,121,0,61,95,101,0,61,87,97,0,235,1,154,13,
@@ -19486,7 +19622,7 @@ unsigned char tw_fw_code[] __initdata = 
 221,207,2,0,226,13,125,7,89,0,29,23,7,0,125,7,
 93,0,127,18,178,5,123,18,202,5,23,90,93,95,7,0,
 28,80,66,6,255,48,130,7,225,112,167,0,6,232,7,224,
-8,200,9,208,191,255,76,209,10,216,28,16,119,18,153,13,
+8,200,9,208,191,255,80,209,10,216,28,16,119,18,153,13,
 2,6,17,0,194,93,2,6,33,0,210,125,128,7,74,1,
 127,18,242,5,123,18,178,53,119,18,194,61,128,7,58,1,
 29,23,7,0,123,18,130,13,119,18,226,5,2,6,33,0,
@@ -19507,126 +19643,126 @@ unsigned char tw_fw_code[] __initdata = 
 0,18,229,13,2,112,194,114,61,94,16,0,203,113,46,87,
 1,0,10,87,7,0,224,81,170,5,0,98,65,18,61,135,
 4,0,240,17,134,245,97,98,250,13,29,56,25,64,3,48,
-191,255,90,190,195,207,0,0,242,5,93,231,7,0,125,7,
-89,0,125,7,93,0,61,23,105,0,63,6,226,176,0,0,
+191,255,94,190,195,207,0,0,242,5,93,231,7,0,125,7,
+89,0,125,7,93,0,61,23,105,0,63,6,134,177,0,0,
 2,22,96,1,34,87,0,0,34,127,5,0,221,81,10,48,
 111,0,27,80,66,6,255,112,130,7,225,112,167,0,6,232,
-7,224,8,208,9,200,191,255,40,208,10,216,27,6,224,254,
+7,224,8,208,9,200,191,255,44,208,10,216,27,6,224,254,
 138,37,224,225,234,29,29,23,7,0,127,18,210,5,119,18,
 178,5,123,18,234,45,57,95,1,0,224,89,226,23,0,0,
-125,23,108,0,36,22,28,132,34,95,1,0,61,86,124,0,
+125,23,108,0,36,22,40,132,34,95,1,0,61,86,124,0,
 106,95,1,0,34,23,5,0,0,218,106,23,5,0,149,29,
-97,226,250,21,29,56,26,64,3,48,191,255,192,189,195,199,
-0,0,242,13,61,23,105,0,63,6,112,177,0,0,2,22,
+97,226,250,21,29,56,26,64,3,48,191,255,196,189,195,199,
+0,0,242,13,61,23,105,0,63,6,20,178,0,0,2,22,
 96,1,34,87,0,0,34,143,5,0,221,81,10,48,113,0,
 27,80,66,6,255,112,128,7,225,112,6,232,29,135,7,0,
 1,226,16,6,225,255,170,13,93,7,2,0,125,7,89,0,
 125,7,93,0,31,122,93,127,7,0,0,210,31,218,0,202,
 213,37,25,16,194,18,61,110,16,0,194,105,45,95,1,0,
 224,89,202,5,65,210,25,216,133,29,61,134,16,0,208,17,
-34,95,1,0,43,23,105,0,63,6,224,177,0,0,2,22,
+34,95,1,0,43,23,105,0,63,6,132,178,0,0,2,22,
 96,1,34,87,0,0,34,127,5,0,203,81,10,48,111,0,
 224,81,186,5,65,210,25,216,65,202,61,119,4,0,238,201,
-150,221,97,210,135,13,26,56,38,6,180,139,132,0,191,255,
-50,113,0,226,97,226,138,77,224,209,231,69,29,23,7,0,
+150,221,97,210,135,13,26,56,38,6,148,150,132,0,191,255,
+142,112,0,226,97,226,138,77,224,209,231,69,29,23,7,0,
 119,18,137,13,2,6,17,0,130,53,2,6,33,0,210,21,
 133,61,127,18,210,5,123,18,178,5,119,18,170,53,32,102,
 239,255,93,103,7,0,224,217,226,23,0,0,125,23,108,0,
 1,90,125,95,113,0,165,45,61,87,108,0,234,217,154,13,
-27,56,38,6,100,140,132,0,191,255,216,112,0,226,165,13,
+27,56,38,6,68,151,132,0,191,255,52,112,0,226,165,13,
 32,134,239,255,93,135,7,0,224,217,226,23,0,0,125,23,
 108,0,125,7,113,0,165,21,61,127,108,0,239,217,234,13,
-27,56,38,6,180,140,132,0,191,255,168,112,0,226,229,5,
+27,56,38,6,148,151,132,0,191,255,4,112,0,226,229,5,
 125,7,113,0,181,5,125,7,113,0,97,226,178,5,128,7,
 100,1,29,63,7,0,0,218,7,16,119,18,153,13,2,6,
 17,0,162,77,2,6,33,0,178,117,128,7,24,1,127,18,
 242,5,123,18,146,13,119,18,178,37,128,7,8,1,125,7,
-89,0,125,7,93,0,36,22,36,132,34,95,1,0,61,86,
+89,0,125,7,93,0,36,22,48,132,34,95,1,0,61,86,
 124,0,106,95,1,0,34,23,5,0,106,23,5,0,36,22,
-44,132,34,95,1,0,61,86,132,0,106,95,1,0,34,23,
+56,132,34,95,1,0,61,86,132,0,106,95,1,0,34,23,
 5,0,106,23,5,0,1,218,125,7,108,0,149,109,125,7,
-108,0,36,22,28,132,34,95,1,0,61,86,124,0,106,95,
-1,0,34,23,5,0,106,23,5,0,36,22,44,132,34,95,
+108,0,36,22,40,132,34,95,1,0,61,86,124,0,106,95,
+1,0,34,23,5,0,106,23,5,0,36,22,56,132,34,95,
 1,0,61,86,132,0,106,95,1,0,34,23,5,0,1,218,
-106,23,5,0,213,77,36,22,28,132,34,95,1,0,61,86,
+106,23,5,0,213,77,36,22,40,132,34,95,1,0,61,86,
 124,0,106,95,1,0,34,23,5,0,106,23,5,0,61,111,
-113,0,224,105,194,13,36,22,52,132,34,95,1,0,61,86,
-132,0,106,95,1,0,34,23,5,0,181,13,36,22,60,132,
+113,0,224,105,194,13,36,22,64,132,34,95,1,0,61,86,
+132,0,106,95,1,0,34,23,5,0,181,13,36,22,72,132,
 34,95,1,0,61,86,132,0,106,95,1,0,34,23,5,0,
 106,23,5,0,125,7,93,0,125,7,89,0,149,37,36,22,
-28,132,34,95,1,0,61,86,124,0,106,95,1,0,34,23,
-5,0,106,23,5,0,36,22,44,132,34,95,1,0,61,86,
+40,132,34,95,1,0,61,86,124,0,106,95,1,0,34,23,
+5,0,106,23,5,0,36,22,56,132,34,95,1,0,61,86,
 132,0,106,95,1,0,34,23,5,0,1,218,106,23,5,0,
-245,5,38,6,244,139,132,0,191,255,88,111,0,226,97,218,
-154,21,61,103,117,0,97,98,218,13,36,22,68,132,34,95,
+245,5,38,6,212,150,132,0,191,255,180,110,0,226,97,218,
+154,21,61,103,117,0,97,98,218,13,36,22,80,132,34,95,
 1,0,61,86,132,0,106,95,1,0,34,23,5,0,106,23,
 5,0,97,226,170,21,61,87,81,0,224,81,234,13,29,48,
-128,255,60,185,125,87,81,0,224,81,250,5,38,6,52,140,
-132,0,191,255,14,111,0,226,224,225,186,5,93,7,7,0,
+128,255,194,186,125,87,81,0,224,81,250,5,38,6,20,151,
+132,0,191,255,106,110,0,226,224,225,186,5,93,7,7,0,
 28,80,64,6,255,112,128,7,33,0,38,143,17,0,63,6,
-90,180,0,0,49,23,105,0,17,88,72,18,34,87,0,0,
+254,180,0,0,49,23,105,0,17,88,72,18,34,87,0,0,
 34,135,5,0,203,81,10,48,112,0,64,6,63,0,128,7,
 33,0,38,94,16,0,38,135,108,0,38,126,16,0,194,130,
 16,112,206,121,47,23,1,0,203,129,34,23,105,0,48,55,
 1,0,72,18,34,95,0,0,34,103,5,0,203,49,63,6,
-150,180,0,0,108,0,64,6,63,0,128,7,225,0,6,232,
+58,181,0,0,108,0,64,6,63,0,128,7,225,0,6,232,
 61,143,17,0,7,224,49,23,105,0,17,88,2,22,16,0,
-34,87,0,0,34,135,5,0,203,81,10,48,63,6,196,180,
+34,87,0,0,34,135,5,0,203,81,10,48,63,6,104,181,
 0,0,112,0,61,127,21,0,28,56,47,23,105,0,15,88,
 2,22,16,0,34,87,0,0,34,119,5,0,203,81,10,48,
-63,6,232,180,0,0,110,0,2,82,64,6,255,0,128,7,
+63,6,140,181,0,0,110,0,2,82,64,6,255,0,128,7,
 33,0,38,94,16,0,38,135,108,0,38,126,16,0,194,130,
 16,112,206,121,47,23,1,0,203,129,34,23,105,0,48,55,
 1,0,2,22,16,0,34,95,0,0,34,103,5,0,203,49,
-63,6,40,181,0,0,108,0,1,82,64,6,63,0,128,7,
-225,0,7,224,60,63,1,0,6,232,191,255,126,206,224,81,
+63,6,204,181,0,0,108,0,1,82,64,6,63,0,128,7,
+225,0,7,224,60,63,1,0,6,232,191,255,130,206,224,81,
 218,45,61,23,105,0,125,7,113,0,2,22,96,1,34,87,
-0,0,34,143,5,0,221,81,10,48,63,6,98,181,0,0,
+0,0,34,143,5,0,221,81,10,48,63,6,6,182,0,0,
 113,0,61,94,16,0,61,127,108,0,61,118,16,0,194,122,
 15,104,205,113,46,23,1,0,203,121,34,23,105,0,47,55,
 1,0,2,22,16,0,34,103,0,0,28,56,204,49,34,95,
-5,0,63,6,154,181,0,0,107,0,1,82,64,6,255,0,
+5,0,63,6,62,182,0,0,107,0,1,82,64,6,255,0,
 128,7,225,0,198,15,2,0,7,224,60,63,1,0,6,232,
-191,255,8,206,224,81,234,21,61,23,105,0,125,7,117,0,
+191,255,12,206,224,81,234,21,61,23,105,0,125,7,117,0,
 2,22,96,1,34,87,0,0,34,143,5,0,221,81,10,48,
-63,6,216,181,0,0,113,0,29,48,28,56,191,255,190,254,
+63,6,124,182,0,0,113,0,29,48,28,56,191,255,190,254,
 165,5,1,82,64,6,255,0,6,87,7,0,0,18,10,6,
 17,0,194,5,10,6,33,0,250,5,38,127,108,0,1,18,
 224,121,170,5,2,18,2,80,202,0,127,0,128,7,225,0,
-6,232,7,224,224,233,194,53,49,6,192,81,133,0,61,63,
-81,0,125,143,105,0,224,57,194,5,29,48,128,255,118,183,
+6,232,7,224,224,233,194,53,49,6,72,93,133,0,61,63,
+81,0,125,143,105,0,224,57,194,5,29,48,128,255,252,184,
 61,55,85,0,224,49,178,5,191,255,4,217,61,23,105,0,
-63,6,88,182,0,0,2,22,104,1,34,87,0,0,34,135,
+63,6,252,182,0,0,2,22,104,1,34,87,0,0,34,135,
 5,0,221,81,10,48,112,0,29,63,0,0,29,71,1,0,
-38,6,0,141,132,0,191,255,202,108,45,6,48,72,133,0,
-125,111,105,0,129,226,201,5,29,48,191,255,234,205,64,6,
-255,0,128,7,33,0,38,23,105,0,63,6,162,182,0,0,
+38,6,224,151,132,0,191,255,38,108,45,6,184,83,133,0,
+125,111,105,0,129,226,201,5,29,48,191,255,144,128,64,6,
+255,0,128,7,33,0,38,23,105,0,63,6,70,183,0,0,
 2,22,16,0,34,87,0,0,34,135,5,0,198,81,10,48,
 112,0,64,6,63,0,128,7,33,0,38,23,105,0,63,6,
-196,182,0,0,72,18,34,87,0,0,34,135,5,0,198,81,
+104,183,0,0,72,18,34,87,0,0,34,135,5,0,198,81,
 10,48,112,0,64,6,63,0,128,7,33,0,38,23,105,0,
-63,6,232,182,0,0,2,22,16,0,34,87,0,0,34,135,
+63,6,140,183,0,0,2,22,16,0,34,87,0,0,34,135,
 5,0,198,81,10,48,112,0,64,6,63,0,128,7,33,0,
-38,23,105,0,63,6,12,183,0,0,2,22,16,0,34,87,
+38,23,105,0,63,6,176,183,0,0,2,22,16,0,34,87,
 0,0,34,135,5,0,198,81,10,48,112,0,64,6,63,0,
-1,82,127,0,128,7,33,0,38,23,105,0,63,6,52,183,
+1,82,127,0,128,7,33,0,38,23,105,0,63,6,216,183,
 0,0,2,22,208,0,34,87,0,0,34,135,5,0,198,81,
 10,48,112,0,64,6,63,0,0,82,127,0,0,82,127,0,
 6,135,7,0,16,6,17,0,234,87,0,0,127,0,38,135,
 108,0,224,129,226,87,0,0,127,0,33,6,180,6,128,0,
-97,0,33,6,218,82,130,0,97,0,33,6,92,82,130,0,
-97,0,33,6,218,145,129,0,97,0,33,6,32,149,129,0,
+97,0,33,6,126,91,130,0,97,0,33,6,0,91,130,0,
+97,0,33,6,120,154,129,0,97,0,33,6,194,157,129,0,
 97,0,128,7,97,0,6,16,34,55,124,0,34,95,126,0,
 194,49,224,89,206,5,34,23,129,0,213,13,34,87,128,0,
 198,81,42,87,1,0,195,90,202,89,43,87,0,0,43,23,
-5,0,202,49,2,232,63,6,190,183,0,0,125,0,64,6,
+5,0,202,49,2,232,63,6,98,184,0,0,125,0,64,6,
 127,0,128,7,97,0,6,16,34,55,132,0,34,95,134,0,
 194,49,224,89,206,5,34,23,137,0,213,13,34,87,136,0,
 198,81,42,87,1,0,195,90,202,89,43,87,0,0,43,23,
-5,0,202,49,2,232,63,6,254,183,0,0,125,0,64,6,
+5,0,202,49,2,232,63,6,162,184,0,0,125,0,64,6,
 127,0,160,7,225,241,6,232,7,224,99,231,41,0,8,184,
 60,223,13,0,60,215,9,0,251,1,226,45,61,71,14,0,
-26,48,8,72,191,74,27,56,191,255,92,204,61,71,4,0,
+26,48,8,72,191,74,27,56,191,255,88,204,61,71,4,0,
 10,192,8,72,191,74,24,48,11,200,25,56,128,255,142,60,
 99,87,56,0,24,48,61,71,10,0,25,56,8,72,191,74,
 191,255,26,255,99,87,49,0,99,95,53,0,10,48,61,23,
@@ -19640,69 +19776,69 @@ unsigned char tw_fw_code[] __initdata = 
 224,121,178,5,128,7,50,1,61,119,121,0,224,113,178,5,
 128,7,38,1,35,111,56,0,24,64,224,105,226,23,0,0,
 99,23,58,0,61,55,81,0,3,98,99,103,1,0,25,72,
-128,255,242,180,10,216,60,215,1,0,128,255,196,134,106,215,
-9,0,106,223,33,0,43,6,126,66,1,0,106,95,5,0,
-124,87,1,0,36,22,76,132,34,95,1,0,35,86,4,0,
+128,255,120,182,10,216,60,215,1,0,128,255,244,135,106,215,
+9,0,106,223,33,0,43,6,82,68,1,0,106,95,5,0,
+124,87,1,0,36,22,88,132,34,95,1,0,35,86,4,0,
 106,95,1,0,34,23,5,0,106,23,5,0,29,48,35,22,
 4,0,34,79,5,0,34,71,1,0,35,62,40,0,128,255,
 230,25,10,216,29,87,7,0,10,6,17,0,186,21,61,23,
 105,0,35,207,56,0,2,22,88,1,34,87,0,0,34,135,
-5,0,221,81,10,48,63,6,126,185,0,0,112,0,234,201,
+5,0,221,81,10,48,63,6,34,186,0,0,112,0,234,201,
 178,61,99,7,28,0,99,191,17,0,60,111,22,0,11,114,
 99,111,34,0,99,119,37,0,61,103,8,0,35,95,53,0,
 99,103,30,0,60,127,1,0,35,87,49,0,99,95,25,0,
 99,87,21,0,61,134,16,0,35,87,56,0,99,127,13,0,
 194,82,10,120,207,129,48,23,1,0,61,94,16,0,34,23,
 105,0,203,81,2,22,16,0,34,95,0,0,42,55,1,0,
-11,96,204,49,35,62,12,0,34,111,5,0,63,6,244,185,
-0,0,109,0,65,218,60,55,1,0,27,56,128,255,224,132,
+11,96,204,49,35,62,12,0,34,111,5,0,63,6,152,186,
+0,0,109,0,65,218,60,55,1,0,27,56,128,255,16,134,
 124,215,1,0,213,29,61,55,132,0,61,23,134,0,221,49,
 224,17,206,5,61,23,137,0,213,13,61,87,136,0,198,81,
 42,87,1,0,195,18,202,17,34,87,0,0,34,23,5,0,
-202,49,2,232,28,56,63,6,62,186,0,0,125,0,96,6,
+202,49,2,232,28,56,63,6,226,186,0,0,125,0,96,6,
 255,241,128,7,225,48,6,208,31,226,31,234,0,218,197,37,
 27,16,194,18,58,126,16,0,194,121,47,111,1,0,224,105,
 162,29,58,102,16,0,194,97,44,95,1,0,43,23,105,0,
-63,6,134,186,0,0,2,22,24,0,34,55,0,0,34,87,
+63,6,42,187,0,0,2,22,24,0,34,55,0,0,34,87,
 5,0,203,49,106,0,253,89,235,5,177,5,252,81,185,5,
 10,224,11,232,65,218,58,23,4,0,226,217,166,221,2,70,
 255,255,8,72,191,74,28,48,29,56,191,255,170,212,10,48,
 58,239,14,0,11,56,224,233,247,13,29,64,29,72,191,74,
-191,255,196,201,10,48,11,56,29,64,29,72,191,74,191,255,
+191,255,192,201,10,48,11,56,29,64,29,72,191,74,191,255,
 134,212,10,48,11,56,6,80,7,88,64,6,255,48,132,7,
-225,240,6,224,7,192,191,255,38,178,97,82,186,5,1,82,
+225,240,6,224,7,192,191,255,42,178,97,82,186,5,1,82,
 229,93,28,23,7,0,0,234,2,6,17,0,194,5,2,6,
-33,0,170,21,60,23,105,0,63,6,32,187,0,0,2,22,
+33,0,170,21,60,23,105,0,63,6,196,187,0,0,2,22,
 88,1,34,87,0,0,34,127,5,0,220,81,10,48,111,0,
 1,234,234,239,192,0,224,233,234,207,0,0,0,218,1,114,
 251,119,192,0,88,113,194,53,0,210,229,45,26,136,194,138,
 60,86,16,0,209,81,42,23,1,0,27,64,34,23,105,0,
 60,86,16,0,209,81,2,22,136,0,34,95,0,0,42,63,
 1,0,11,96,204,57,35,54,4,0,34,127,5,0,63,6,
-118,187,0,0,111,0,35,119,5,0,99,119,1,0,195,199,
+26,188,0,0,111,0,35,119,5,0,99,119,1,0,195,199,
 0,0,146,13,1,18,250,23,192,0,2,96,93,97,186,5,
 2,233,65,202,65,210,60,95,4,0,235,209,134,213,65,218,
 27,6,224,255,214,197,97,202,231,87,0,0,68,6,255,240,
-128,7,97,0,6,232,191,255,136,178,224,81,202,21,221,143,
+128,7,97,0,6,232,191,255,140,178,224,81,202,21,221,143,
 2,0,61,23,105,0,1,138,2,22,96,1,34,87,0,0,
-125,143,121,0,221,81,10,48,34,135,5,0,63,6,228,187,
+125,143,121,0,221,81,10,48,34,135,5,0,63,6,136,188,
 0,0,112,0,1,82,64,6,127,0,128,7,97,0,7,232,
-191,255,170,178,1,138,125,143,1,0,64,6,127,0,128,7,
-97,0,6,232,61,63,8,0,38,6,44,141,132,0,7,128,
-191,130,159,130,208,57,161,58,191,255,24,103,29,48,191,255,
-10,181,64,6,127,0,168,7,225,112,6,232,7,224,8,216,
-9,200,191,255,220,187,10,16,2,6,222,254,178,5,128,7,
+191,255,174,178,1,138,125,143,1,0,64,6,127,0,128,7,
+97,0,6,232,61,63,8,0,38,6,12,152,132,0,7,128,
+191,130,159,130,208,57,161,58,191,255,116,102,29,48,191,255,
+14,181,64,6,127,0,168,7,225,112,6,232,7,224,8,216,
+9,200,191,255,224,187,10,16,2,6,222,254,178,5,128,7,
 80,2,60,127,18,0,99,127,70,0,60,119,16,0,27,56,
 99,7,74,0,99,119,68,0,195,15,74,0,60,95,13,0,
 60,87,9,0,35,70,40,0,99,87,41,0,99,95,45,0,
-3,72,61,23,105,0,63,6,142,188,0,0,2,22,240,0,
+3,72,61,23,105,0,63,6,50,189,0,0,2,22,240,0,
 34,87,0,0,34,111,5,0,221,81,10,48,109,0,224,81,
 218,5,32,86,9,1,128,7,248,1,35,63,45,0,61,71,
-14,0,35,55,41,0,8,72,191,74,191,255,218,199,10,208,
+14,0,35,55,41,0,8,72,191,74,191,255,214,199,10,208,
 29,23,7,0,11,216,2,6,17,0,210,13,2,6,33,0,
 234,13,61,95,93,0,61,87,89,0,251,89,139,13,177,5,
 250,81,219,5,32,86,34,1,128,7,182,1,224,201,210,13,
-61,55,81,0,26,64,27,72,128,255,2,178,224,81,210,5,
+61,55,81,0,26,64,27,72,128,255,136,179,224,81,210,5,
 32,86,39,1,128,7,154,1,61,87,4,0,60,111,18,0,
 95,82,60,135,5,0,234,111,32,2,48,135,17,0,201,106,
 240,105,211,5,32,86,34,1,128,7,118,1,61,71,8,0,
@@ -19712,31 +19848,31 @@ unsigned char tw_fw_code[] __initdata = 
 205,89,99,87,61,0,99,95,65,0,60,23,5,0,34,23,
 9,0,99,7,37,0,99,23,25,0,99,7,33,0,35,23,
 70,0,67,7,30,0,67,23,29,0,67,23,28,0,60,223,
-1,0,128,255,76,130,106,223,9,0,106,7,29,0,47,6,
-174,65,1,0,106,7,33,0,0,218,106,7,37,0,1,18,
+1,0,128,255,124,131,106,223,9,0,106,7,29,0,47,6,
+130,67,1,0,106,7,33,0,0,218,106,7,37,0,1,18,
 99,87,53,0,61,111,4,0,106,127,5,0,60,95,5,0,
 95,106,106,111,0,0,99,95,57,0,213,101,35,87,1,0,
 234,217,130,101,224,17,234,61,35,79,70,0,35,87,25,0,
 9,16,201,18,194,81,99,87,25,0,35,54,24,0,0,58,
-35,70,4,0,191,255,12,107,97,82,146,13,38,6,64,141,
-132,0,32,62,81,2,0,66,191,255,194,92,60,127,5,0,
+35,70,4,0,191,255,104,106,97,82,146,13,38,6,32,152,
+132,0,32,62,81,2,0,66,191,255,30,92,60,127,5,0,
 15,114,99,127,57,0,99,119,77,0,0,50,35,62,24,0,
-0,66,35,78,52,0,191,255,62,78,35,95,53,0,43,23,
+0,66,35,78,52,0,191,255,154,77,35,95,53,0,43,23,
 33,0,224,17,218,5,107,87,33,0,133,13,11,16,34,95,
 13,0,224,89,202,253,98,87,13,0,35,110,4,0,99,111,
 57,0,12,98,27,128,194,130,61,86,16,0,208,81,42,23,
 1,0,99,103,77,0,61,86,16,0,34,23,105,0,208,81,
 2,22,56,0,34,95,0,0,42,55,1,0,11,96,204,49,
-35,62,52,0,34,119,5,0,63,6,128,190,0,0,110,0,
+35,62,52,0,34,119,5,0,63,6,36,191,0,0,110,0,
 0,18,65,218,61,111,4,0,237,217,150,157,0,82,104,6,
-255,112,134,7,225,241,6,232,7,224,8,200,191,255,44,186,
+255,112,134,7,225,241,6,232,7,224,8,200,191,255,48,186,
 10,16,2,6,222,254,178,5,128,7,4,1,60,223,13,0,
 60,215,9,0,25,56,99,223,9,0,99,215,5,0,35,70,
 4,0,61,23,105,0,3,72,2,22,240,0,34,87,0,0,
-34,127,5,0,221,81,10,48,63,6,224,190,0,0,111,0,
+34,127,5,0,221,81,10,48,63,6,132,191,0,0,111,0,
 224,81,202,5,32,86,9,1,165,101,61,71,14,0,35,199,
 5,0,8,72,191,74,35,207,9,0,24,48,25,56,191,255,
-134,197,10,48,29,23,7,0,11,56,2,6,17,0,210,13,
+130,197,10,48,29,23,7,0,11,56,2,6,17,0,210,13,
 2,6,33,0,218,13,61,95,93,0,61,87,89,0,231,89,
 251,5,177,5,230,81,203,5,32,86,34,1,133,69,60,191,
 25,0,11,98,61,71,8,0,124,103,25,0,8,72,191,74,
@@ -19745,7 +19881,7 @@ unsigned char tw_fw_code[] __initdata = 
 1,0,124,127,13,0,124,87,9,0,194,130,61,86,16,0,
 208,81,42,23,1,0,28,56,34,23,105,0,61,86,16,0,
 208,81,2,22,72,0,34,95,0,0,42,55,1,0,11,96,
-204,49,34,119,5,0,63,6,158,191,0,0,110,0,124,191,
+204,49,34,119,5,0,63,6,66,192,0,0,110,0,124,191,
 25,0,124,215,9,0,124,223,13,0,0,82,70,6,255,241,
 132,7,225,243,8,200,7,232,61,215,9,0,6,224,60,95,
 101,0,61,223,13,0,60,87,97,0,235,217,241,5,187,5,
@@ -19754,16 +19890,16 @@ unsigned char tw_fw_code[] __initdata = 
 33,0,202,5,60,199,108,0,149,21,119,18,178,5,123,18,
 186,13,60,71,4,0,26,48,8,72,191,74,27,56,128,255,
 188,52,10,192,181,5,0,82,149,101,26,64,60,55,81,0,
-27,72,99,207,1,0,128,255,204,173,60,71,8,0,10,176,
+27,72,99,207,1,0,128,255,82,175,60,71,8,0,10,176,
 8,72,191,74,26,48,27,56,191,255,28,207,125,87,9,0,
 61,151,25,0,125,95,13,0,99,151,5,0,61,191,1,0,
-128,255,126,127,43,6,148,204,1,0,106,95,5,0,106,191,
+128,255,174,128,43,6,228,206,1,0,106,95,5,0,106,191,
 9,0,125,87,1,0,0,202,61,23,1,0,13,82,194,15,
 3,0,60,127,4,0,125,87,25,0,95,122,98,127,0,0,
 229,29,248,201,178,29,25,80,194,82,60,102,16,0,202,97,
 44,23,1,0,60,94,16,0,34,23,105,0,203,81,72,18,
 34,95,0,0,42,55,1,0,11,96,204,49,29,56,34,135,
-5,0,63,6,186,192,0,0,112,0,65,202,60,127,4,0,
+5,0,63,6,94,193,0,0,112,0,65,202,60,127,4,0,
 239,201,134,229,35,151,5,0,125,191,1,0,125,151,25,0,
 125,215,9,0,125,223,13,0,22,80,68,6,255,243,128,7,
 225,240,7,232,61,215,9,0,6,224,60,95,101,0,61,223,
@@ -19777,42 +19913,42 @@ unsigned char tw_fw_code[] __initdata = 
 25,0,11,90,125,95,25,0,125,87,9,0,60,134,16,0,
 25,80,194,82,10,120,207,129,48,23,1,0,60,94,16,0,
 34,23,105,0,203,81,2,22,16,0,34,95,0,0,42,55,
-1,0,11,96,204,49,29,56,34,111,5,0,63,6,164,193,
+1,0,11,96,204,49,29,56,34,111,5,0,63,6,72,194,
 0,0,109,0,125,199,25,0,125,215,9,0,125,223,13,0,
 0,82,64,6,255,240,130,7,225,243,8,16,7,232,61,215,
 9,0,6,224,60,95,101,0,61,223,13,0,60,87,97,0,
 235,217,225,5,187,5,234,209,177,5,0,82,245,101,60,127,
 8,0,61,135,18,0,239,129,178,5,0,82,245,93,28,119,
 7,0,123,114,178,5,0,82,149,93,60,55,81,0,26,64,
-99,23,1,0,27,72,128,255,236,171,60,71,8,0,10,184,
+99,23,1,0,27,72,128,255,114,173,60,71,8,0,10,184,
 8,72,191,74,26,48,27,56,191,255,60,205,125,87,9,0,
-125,95,13,0,61,199,1,0,61,183,25,0,128,255,162,125,
-45,6,148,204,1,0,106,111,5,0,13,98,106,199,9,0,
+125,95,13,0,61,199,1,0,61,183,25,0,128,255,210,126,
+45,6,228,206,1,0,106,111,5,0,13,98,106,199,9,0,
 10,88,202,15,3,0,125,87,1,0,125,103,25,0,60,87,
 4,0,0,202,107,87,0,0,197,29,60,94,16,0,60,126,
 16,0,25,80,194,82,10,112,206,121,47,23,1,0,203,81,
 34,23,105,0,42,55,1,0,72,18,34,95,0,0,29,56,
-203,49,34,103,5,0,63,6,142,194,0,0,108,0,65,202,
+203,49,34,103,5,0,63,6,50,195,0,0,108,0,65,202,
 60,95,4,0,235,201,166,229,125,183,25,0,125,199,1,0,
 125,215,9,0,125,223,13,0,23,80,66,6,255,243,130,7,
-225,241,7,232,9,184,6,224,8,56,191,255,240,187,10,200,
+225,241,7,232,9,184,6,224,8,56,191,255,244,187,10,200,
 224,201,190,5,0,82,245,93,61,23,18,0,61,215,9,0,
 2,192,60,95,101,0,61,223,13,0,60,87,97,0,235,217,
 225,5,187,5,234,209,177,5,0,82,213,77,60,127,8,0,
 239,17,182,5,0,82,245,69,26,64,60,55,81,0,27,72,
-99,191,1,0,128,255,238,170,60,71,8,0,10,184,8,72,
+99,191,1,0,128,255,116,172,60,71,8,0,10,184,8,72,
 191,74,26,48,27,56,191,255,62,204,24,120,191,122,24,112,
 202,113,125,119,9,0,12,106,125,111,25,0,1,114,225,135,
 0,0,208,121,203,121,125,127,13,0,60,94,16,0,25,96,
 194,98,12,80,202,89,43,23,1,0,125,119,18,0,60,94,
 16,0,34,23,105,0,203,97,2,22,56,0,34,95,0,0,
 44,103,1,0,11,48,204,49,29,56,34,127,5,0,63,6,
-118,195,0,0,111,0,125,215,9,0,125,223,13,0,125,199,
+26,196,0,0,111,0,125,215,9,0,125,223,13,0,125,199,
 18,0,23,80,66,6,255,241,130,7,225,240,6,224,60,23,
 105,0,8,216,2,22,64,1,34,87,0,0,7,232,220,81,
-10,48,3,56,34,135,5,0,63,6,176,195,0,0,112,0,
+10,48,3,56,34,135,5,0,63,6,84,196,0,0,112,0,
 224,81,194,5,32,86,34,1,133,109,28,48,27,56,191,255,
-236,186,10,200,224,201,206,5,32,86,34,1,229,93,60,127,
+240,186,10,200,224,201,206,5,32,86,34,1,229,93,60,127,
 108,0,239,201,202,5,32,86,34,1,245,85,61,23,18,0,
 61,215,9,0,2,192,60,95,101,0,61,223,13,0,60,87,
 97,0,235,217,241,5,187,5,234,209,193,5,32,86,34,1,
@@ -19823,16 +19959,16 @@ unsigned char tw_fw_code[] __initdata = 
 25,0,125,103,18,0,25,80,194,82,10,120,207,129,48,23,
 1,0,60,94,16,0,34,23,105,0,203,81,2,22,64,0,
 34,95,0,0,42,55,1,0,11,96,204,49,29,56,34,111,
-5,0,63,6,122,196,0,0,109,0,125,215,9,0,125,223,
+5,0,63,6,30,197,0,0,109,0,125,215,9,0,125,223,
 13,0,125,199,18,0,0,82,66,6,255,240,134,7,225,48,
 8,216,187,0,6,232,61,215,85,0,7,224,188,0,100,226,
 234,53,29,23,7,0,226,217,170,53,123,18,138,53,224,209,
 226,5,125,7,85,0,26,48,191,255,132,202,29,48,35,62,
-4,0,191,255,244,189,61,23,105,0,35,79,9,0,2,22,
+4,0,191,255,248,189,61,23,105,0,35,79,9,0,2,22,
 232,0,34,87,0,0,35,71,5,0,221,81,10,48,34,103,
-5,0,63,6,234,196,0,0,108,0,61,23,105,0,31,58,
+5,0,63,6,142,197,0,0,108,0,61,23,105,0,31,58,
 2,22,152,0,34,87,0,0,31,66,221,81,10,48,3,72,
-34,95,5,0,63,6,12,197,0,0,107,0,224,225,218,5,
+34,95,5,0,63,6,176,197,0,0,107,0,224,225,218,5,
 29,127,7,0,239,217,178,5,99,226,170,69,61,111,85,0,
 224,105,226,5,125,7,85,0,26,48,191,255,18,202,99,226,
 250,53,125,7,89,0,125,7,93,0,224,209,146,53,29,23,
@@ -19841,51 +19977,51 @@ unsigned char tw_fw_code[] __initdata = 
 28,242,125,87,85,0,61,55,85,0,224,49,146,29,29,56,
 191,255,220,201,224,81,194,21,61,87,85,0,224,81,226,13,
 42,23,241,11,3,58,72,18,34,55,0,0,34,95,5,0,
-202,49,63,6,154,197,0,0,107,0,125,7,85,0,97,226,
+202,49,63,6,62,198,0,0,107,0,125,7,85,0,97,226,
 178,5,98,226,138,117,29,23,7,0,226,217,202,109,61,119,
 85,0,224,113,218,109,123,18,210,29,119,18,210,5,2,6,
 33,0,162,21,165,69,98,226,250,13,61,95,93,0,61,87,
 89,0,224,89,154,13,224,81,250,5,0,50,128,255,254,46,
 125,87,85,0,165,53,0,50,128,255,234,46,125,87,85,0,
 197,45,221,255,2,0,202,37,29,103,1,0,32,54,47,0,
-204,70,127,0,39,6,84,141,132,0,191,255,80,241,61,23,
+204,70,127,0,39,6,52,152,132,0,191,255,80,241,61,23,
 105,0,23,58,2,22,152,0,34,55,0,0,31,66,221,49,
-3,72,34,87,5,0,63,6,46,198,0,0,106,0,224,81,
+3,72,34,87,5,0,63,6,210,198,0,0,106,0,224,81,
 202,13,0,50,128,255,158,46,125,87,85,0,229,5,0,50,
 191,255,58,241,125,87,85,0,61,55,85,0,224,49,130,37,
 29,56,191,255,250,200,224,81,178,29,61,87,85,0,224,81,
 242,13,42,23,241,11,3,58,72,18,34,95,0,0,34,135,
-5,0,202,89,11,48,63,6,126,198,0,0,112,0,125,7,
-85,0,229,5,29,48,28,56,27,64,191,255,178,180,70,6,
+5,0,202,89,11,48,63,6,34,199,0,0,112,0,125,7,
+85,0,229,5,29,48,28,56,27,64,191,255,182,180,70,6,
 255,48,130,7,33,0,1,138,6,23,7,0,103,143,1,0,
 2,6,33,0,194,5,2,6,17,0,218,5,3,56,191,255,
-4,181,165,5,1,82,66,6,63,0,128,7,225,16,6,224,
-7,232,191,255,100,181,60,143,10,0,60,23,105,0,10,216,
+8,181,165,5,1,82,66,6,63,0,128,7,225,16,6,224,
+7,232,191,255,104,181,60,143,10,0,60,23,105,0,10,216,
 2,22,144,1,34,87,0,0,93,143,2,0,220,81,10,48,
-34,135,5,0,63,6,236,198,0,0,112,0,93,7,5,0,
+34,135,5,0,63,6,144,199,0,0,112,0,93,7,5,0,
 93,87,3,0,93,7,6,0,168,82,93,87,4,0,93,7,
 7,0,27,80,64,6,255,16,130,7,225,0,35,255,17,0,
 6,232,125,7,117,0,7,23,0,0,125,7,121,0,125,23,
 4,0,2,6,240,255,191,5,99,18,174,13,2,56,38,6,
-104,141,132,0,191,255,252,91,0,82,128,7,16,1,7,103,
+72,152,132,0,191,255,88,91,0,82,128,7,16,1,7,103,
 3,0,125,103,108,0,0,112,39,103,9,0,39,95,13,0,
 204,113,225,135,0,0,208,89,125,119,89,0,125,95,93,0,
 7,95,2,0,125,95,10,0,11,16,100,18,182,5,105,18,
-151,13,2,56,38,6,164,141,132,0,191,255,182,91,0,82,
+151,13,2,56,38,6,132,152,132,0,191,255,18,91,0,82,
 213,101,1,106,226,111,192,0,61,95,4,0,125,111,8,0,
 95,90,237,95,32,2,95,106,125,95,14,0,125,111,12,0,
 235,0,11,80,191,82,159,82,202,89,61,119,8,0,161,90,
 203,113,93,7,112,0,125,119,110,0,99,255,1,0,29,48,
-191,255,90,183,10,224,224,225,178,29,61,23,105,0,63,6,
-230,199,0,0,2,22,24,0,34,87,0,0,34,103,5,0,
+191,255,94,183,10,224,224,225,178,29,61,23,105,0,63,6,
+138,200,0,0,2,22,24,0,34,87,0,0,34,103,5,0,
 221,81,10,48,108,0,10,48,61,71,14,0,11,56,8,72,
-191,74,191,255,146,188,125,87,97,0,125,95,101,0,61,95,
+191,74,191,255,142,188,125,87,97,0,125,95,101,0,61,95,
 101,0,61,87,97,0,235,1,234,13,234,1,202,13,38,6,
-228,141,132,0,191,255,28,91,0,226,1,82,125,87,97,0,
+196,152,132,0,191,255,120,90,0,226,1,82,125,87,97,0,
 125,7,101,0,221,207,2,0,130,21,125,7,89,0,29,95,
 7,0,125,7,93,0,127,90,138,13,23,18,221,255,2,0,
 162,5,27,18,93,23,7,0,28,80,66,6,255,0,130,7,
-225,112,167,0,6,232,7,224,8,200,9,208,191,255,84,184,
+225,112,167,0,6,232,7,224,8,200,9,208,191,255,88,184,
 10,216,28,16,119,18,153,13,2,6,17,0,162,93,2,6,
 33,0,130,125,128,7,64,1,127,18,242,5,123,18,146,53,
 119,18,162,61,128,7,48,1,29,23,7,0,123,18,130,13,
@@ -19906,22 +20042,22 @@ unsigned char tw_fw_code[] __initdata = 
 229,13,2,112,194,114,61,94,16,0,203,113,46,87,1,0,
 10,87,7,0,224,81,170,5,0,98,65,18,61,135,4,0,
 240,17,134,245,97,98,250,13,29,56,25,64,3,48,191,255,
-108,165,195,207,0,0,242,5,93,231,7,0,125,7,89,0,
-125,7,93,0,61,23,105,0,63,6,208,201,0,0,2,22,
+112,165,195,207,0,0,242,5,93,231,7,0,125,7,89,0,
+125,7,93,0,61,23,105,0,63,6,116,202,0,0,2,22,
 96,1,34,87,0,0,34,127,5,0,221,81,10,48,111,0,
 27,80,66,6,255,112,130,7,225,112,167,0,6,232,7,224,
-8,208,9,200,191,255,58,183,10,216,27,6,224,254,218,29,
+8,208,9,200,191,255,62,183,10,216,27,6,224,254,218,29,
 224,225,186,29,29,23,7,0,127,18,210,5,119,18,178,5,
-123,18,186,45,57,95,1,0,125,95,108,0,36,22,84,132,
+123,18,186,45,57,95,1,0,125,95,108,0,36,22,96,132,
 34,95,1,0,61,86,124,0,106,95,1,0,34,23,5,0,
 0,218,106,23,5,0,149,29,97,226,250,21,29,56,26,64,
-3,48,191,255,216,164,195,199,0,0,242,13,61,23,105,0,
-63,6,88,202,0,0,2,22,96,1,34,87,0,0,34,143,
+3,48,191,255,220,164,195,199,0,0,242,13,61,23,105,0,
+63,6,252,202,0,0,2,22,96,1,34,87,0,0,34,143,
 5,0,221,81,10,48,113,0,27,80,66,6,255,112,97,58,
 226,23,0,0,70,23,112,0,127,0,130,7,225,243,6,232,
-8,216,9,224,191,255,24,183,98,82,178,5,0,82,197,101,
+8,216,9,224,191,255,28,183,98,82,178,5,0,82,197,101,
 61,71,8,0,59,183,1,0,8,72,99,71,2,0,191,74,
-59,191,5,0,22,48,23,56,191,255,236,185,61,71,4,0,
+59,191,5,0,22,48,23,56,191,255,232,185,61,71,4,0,
 10,192,8,72,191,74,24,48,11,200,25,56,128,255,30,42,
 10,16,61,95,101,0,61,87,97,0,235,201,225,5,187,5,
 234,193,177,5,0,82,133,69,60,231,1,0,252,17,226,37,
@@ -19938,82 +20074,82 @@ unsigned char tw_fw_code[] __initdata = 
 170,5,31,218,93,223,7,0,0,210,31,218,0,202,213,37,
 25,16,194,18,61,118,16,0,194,113,46,103,1,0,224,97,
 202,5,65,210,25,216,133,29,61,86,16,0,202,17,34,95,
-1,0,43,23,105,0,63,6,190,203,0,0,2,22,96,1,
+1,0,43,23,105,0,63,6,98,204,0,0,2,22,96,1,
 34,87,0,0,34,135,5,0,203,81,10,48,112,0,224,81,
 186,5,65,210,25,216,65,202,61,127,4,0,239,201,150,221,
-97,210,135,13,26,56,38,6,32,142,132,0,191,255,84,87,
+97,210,135,13,26,56,38,6,0,153,132,0,191,255,176,86,
 0,226,97,226,170,69,224,209,135,69,29,23,7,0,119,18,
 137,13,2,6,17,0,162,45,2,6,33,0,162,21,165,53,
 127,18,210,5,123,18,178,5,119,18,202,45,32,110,239,255,
 93,111,7,0,125,223,108,0,1,98,125,103,117,0,245,37,
-61,95,108,0,235,217,146,13,27,56,38,6,236,142,132,0,
-191,255,0,87,0,226,245,5,32,86,239,255,93,87,7,0,
+61,95,108,0,235,217,146,13,27,56,38,6,204,153,132,0,
+191,255,92,86,0,226,245,5,32,86,239,255,93,87,7,0,
 125,223,108,0,125,7,117,0,165,21,61,135,108,0,240,217,
-226,13,27,56,38,6,60,143,132,0,191,255,214,86,0,226,
+226,13,27,56,38,6,28,154,132,0,191,255,50,86,0,226,
 229,5,125,7,117,0,181,5,125,7,117,0,97,226,178,5,
-128,7,10,2,132,119,21,133,224,113,210,13,29,111,7,0,
-119,106,154,13,31,98,93,103,7,0,38,6,160,142,132,0,
-191,255,160,86,29,63,7,0,0,218,7,16,119,18,217,13,
+128,7,10,2,132,119,33,133,224,113,210,13,29,111,7,0,
+119,106,154,13,31,98,93,103,7,0,38,6,128,153,132,0,
+191,255,252,85,29,63,7,0,0,218,7,16,119,18,217,13,
 2,6,17,0,186,5,128,7,24,1,2,6,33,0,186,5,
 128,7,102,1,128,7,150,1,127,18,242,5,123,18,146,13,
 119,18,226,61,128,7,134,1,125,7,89,0,125,7,93,0,
-36,22,92,132,34,95,1,0,61,86,124,0,106,95,1,0,
+36,22,104,132,34,95,1,0,61,86,124,0,106,95,1,0,
 34,23,5,0,106,23,5,0,29,48,128,255,160,38,97,82,
-202,13,36,22,100,132,34,95,1,0,35,86,8,0,106,95,
-1,0,34,23,5,0,181,13,36,22,108,132,34,95,1,0,
+202,13,36,22,112,132,34,95,1,0,35,86,8,0,106,95,
+1,0,34,23,5,0,181,13,36,22,120,132,34,95,1,0,
 35,86,8,0,106,95,1,0,34,23,5,0,106,23,5,0,
 35,22,8,0,34,95,1,0,61,86,132,0,106,95,1,0,
 34,23,5,0,1,218,106,23,5,0,128,7,28,1,36,22,
-92,132,34,95,1,0,61,86,124,0,106,95,1,0,34,23,
-5,0,106,23,5,0,221,255,2,0,202,13,36,22,116,132,
+104,132,34,95,1,0,61,86,124,0,106,95,1,0,34,23,
+5,0,106,23,5,0,221,255,2,0,202,13,36,22,128,132,
 34,95,1,0,61,86,132,0,106,95,1,0,34,23,5,0,
-181,37,29,48,128,255,22,38,97,82,186,13,36,22,100,132,
+181,37,29,48,128,255,22,38,97,82,186,13,36,22,112,132,
 34,95,1,0,3,80,106,95,1,0,34,23,5,0,165,13,
-36,22,108,132,34,95,1,0,3,80,106,95,1,0,34,23,
+36,22,120,132,34,95,1,0,3,80,106,95,1,0,34,23,
 5,0,106,23,5,0,35,95,1,0,61,86,132,0,106,95,
 1,0,35,23,5,0,106,23,5,0,1,218,213,77,36,22,
-84,132,34,95,1,0,61,86,124,0,106,95,1,0,34,23,
+96,132,34,95,1,0,61,86,124,0,106,95,1,0,34,23,
 5,0,106,23,5,0,61,95,117,0,224,89,194,13,36,22,
-124,132,34,95,1,0,61,86,132,0,106,95,1,0,34,23,
-5,0,181,13,36,22,132,132,34,95,1,0,61,86,132,0,
+136,132,34,95,1,0,61,86,132,0,106,95,1,0,34,23,
+5,0,181,13,36,22,144,132,34,95,1,0,61,86,132,0,
 106,95,1,0,34,23,5,0,106,23,5,0,125,7,93,0,
-125,7,89,0,149,37,36,22,140,132,34,95,1,0,61,86,
+125,7,89,0,149,37,36,22,152,132,34,95,1,0,61,86,
 124,0,106,95,1,0,34,23,5,0,106,23,5,0,36,22,
-148,132,34,95,1,0,61,86,132,0,106,95,1,0,34,23,
-5,0,1,218,106,23,5,0,245,5,38,6,96,142,132,0,
-191,255,224,84,0,226,97,218,154,21,61,87,121,0,97,82,
-218,13,36,22,156,132,34,95,1,0,61,86,132,0,106,95,
+160,132,34,95,1,0,61,86,132,0,106,95,1,0,34,23,
+5,0,1,218,106,23,5,0,245,5,38,6,64,153,132,0,
+191,255,60,84,0,226,97,218,154,21,61,87,121,0,97,82,
+218,13,36,22,168,132,34,95,1,0,61,86,132,0,106,95,
 1,0,34,23,5,0,106,23,5,0,97,226,170,21,61,127,
-81,0,224,121,234,13,29,48,128,255,196,158,125,87,81,0,
-224,81,250,5,38,6,188,142,132,0,191,255,150,84,0,226,
+81,0,224,121,234,13,29,48,128,255,74,160,125,87,81,0,
+224,81,250,5,38,6,156,153,132,0,191,255,242,83,0,226,
 224,225,186,5,93,7,7,0,28,80,72,6,255,112,132,7,
-33,0,36,22,164,132,34,71,1,0,99,71,1,0,34,23,
+33,0,36,22,176,132,34,71,1,0,99,71,1,0,34,23,
 5,0,99,23,5,0,35,79,5,0,128,255,208,1,68,6,
-63,0,132,7,33,0,36,22,172,132,34,71,1,0,99,71,
+63,0,132,7,33,0,36,22,184,132,34,71,1,0,99,71,
 1,0,34,23,5,0,99,23,5,0,35,79,5,0,128,255,
-172,1,68,6,63,0,132,7,33,0,36,22,180,132,34,71,
+172,1,68,6,63,0,132,7,33,0,36,22,192,132,34,71,
 1,0,99,71,1,0,34,23,5,0,99,23,5,0,35,79,
 5,0,128,255,136,1,68,6,63,0,132,7,33,0,36,22,
-188,132,34,71,1,0,99,71,1,0,34,23,5,0,99,23,
+200,132,34,71,1,0,99,71,1,0,34,23,5,0,99,23,
 5,0,35,79,5,0,128,255,100,1,68,6,63,0,132,7,
-33,0,36,22,196,132,34,71,1,0,99,71,1,0,34,23,
+33,0,36,22,208,132,34,71,1,0,99,71,1,0,34,23,
 5,0,99,23,5,0,35,79,5,0,128,255,64,1,68,6,
-63,0,132,7,33,0,36,22,204,132,34,71,1,0,99,71,
+63,0,132,7,33,0,36,22,216,132,34,71,1,0,99,71,
 1,0,34,23,5,0,99,23,5,0,35,79,5,0,128,255,
 28,1,68,6,63,0,128,7,225,0,198,15,2,0,7,224,
-60,63,1,0,6,232,191,255,34,180,224,81,218,45,61,23,
+60,63,1,0,6,232,191,255,38,180,224,81,218,45,61,23,
 105,0,125,7,121,0,2,22,96,1,34,87,0,0,34,143,
-5,0,221,81,10,48,63,6,190,207,0,0,113,0,61,55,
+5,0,221,81,10,48,63,6,98,208,0,0,113,0,61,55,
 132,0,61,23,134,0,221,49,224,17,206,5,61,23,137,0,
 213,13,61,87,136,0,198,81,42,87,1,0,195,18,202,17,
 34,87,0,0,34,23,5,0,202,49,2,232,28,56,63,6,
-246,207,0,0,125,0,64,6,255,0,132,7,225,0,7,224,
-60,63,1,0,6,232,191,255,178,179,224,81,154,37,61,23,
+154,208,0,0,125,0,64,6,255,0,132,7,225,0,7,224,
+60,63,1,0,6,232,191,255,182,179,224,81,154,37,61,23,
 105,0,125,7,117,0,2,22,96,1,34,87,0,0,34,143,
-5,0,221,81,10,48,63,6,46,208,0,0,113,0,36,22,
-204,132,34,71,1,0,99,71,1,0,34,23,5,0,99,23,
+5,0,221,81,10,48,63,6,210,208,0,0,113,0,36,22,
+216,132,34,71,1,0,99,71,1,0,34,23,5,0,99,23,
 5,0,29,48,35,79,5,0,28,56,128,255,80,0,68,6,
-255,0,132,7,33,0,36,22,212,132,34,71,1,0,99,71,
+255,0,132,7,33,0,36,22,224,132,34,71,1,0,99,71,
 1,0,34,23,5,0,99,23,5,0,35,79,5,0,128,255,
 44,0,68,6,63,0,6,87,7,0,0,18,10,6,17,0,
 194,5,10,6,33,0,250,5,38,127,108,0,1,18,239,23,
@@ -20025,7 +20161,7 @@ unsigned char tw_fw_code[] __initdata = 
 59,119,16,0,99,127,29,0,59,111,25,0,99,119,40,0,
 99,111,49,0,6,232,59,207,13,0,59,199,9,0,249,1,
 162,53,61,71,14,0,24,48,8,72,191,74,25,56,191,255,
-118,179,99,95,37,0,99,87,33,0,10,176,61,71,4,0,
+114,179,99,95,37,0,99,87,33,0,10,176,61,71,4,0,
 22,48,8,72,191,74,11,184,23,56,128,255,160,35,99,87,
 16,0,22,48,61,71,10,0,23,56,8,72,191,74,191,255,
 44,230,99,87,9,0,99,95,13,0,10,48,61,23,4,0,
@@ -20038,12 +20174,12 @@ unsigned char tw_fw_code[] __initdata = 
 10,0,35,111,16,0,238,87,128,0,237,81,166,5,65,82,
 99,87,18,0,59,215,18,0,61,231,14,0,59,223,1,0,
 162,225,250,225,230,5,99,223,25,0,99,215,42,0,149,21,
-128,255,238,109,10,16,42,6,148,204,1,0,98,87,5,0,
+128,255,30,111,10,16,42,6,228,206,1,0,98,87,5,0,
 99,231,42,0,98,223,9,0,195,151,46,0,99,23,25,0,
 1,218,35,55,96,0,35,23,98,0,221,49,224,17,206,5,
 35,23,101,0,213,13,35,87,100,0,198,81,42,87,1,0,
 195,18,202,17,34,87,0,0,34,23,5,0,202,49,2,200,
-3,56,63,6,58,210,0,0,121,0,188,209,224,209,231,101,
+3,56,63,6,222,210,0,0,121,0,188,209,224,209,231,101,
 35,111,37,0,35,103,33,0,65,218,12,86,1,0,225,135,
 0,0,205,129,99,87,33,0,99,135,37,0,35,103,9,0,
 61,87,8,0,35,111,13,0,10,120,191,122,204,81,225,135,
@@ -20071,7 +20207,7 @@ unsigned char tw_fw_code[] __initdata = 
 70,0,195,151,22,0,57,95,8,0,217,49,176,89,99,95,
 18,0,224,17,206,5,35,23,73,0,213,13,35,87,72,0,
 198,81,42,87,1,0,195,18,202,17,34,87,0,0,34,23,
-5,0,202,49,2,224,27,56,29,72,3,64,63,6,4,212,
+5,0,202,49,2,224,27,56,29,72,3,64,63,6,168,212,
 0,0,124,0,61,231,1,0,10,192,61,87,9,0,61,95,
 13,0,60,231,5,0,99,95,13,0,99,87,9,0,213,69,
 2,80,60,23,17,0,35,95,16,0,137,18,171,17,245,5,
@@ -20082,30 +20218,30 @@ unsigned char tw_fw_code[] __initdata = 
 70,0,217,49,224,17,206,5,35,23,73,0,213,13,35,87,
 72,0,198,81,42,87,1,0,195,18,202,17,34,87,0,0,
 34,23,5,0,202,49,2,184,27,56,29,72,3,64,63,6,
-166,212,0,0,119,0,202,193,35,23,18,0,162,209,224,209,
+74,213,0,0,119,0,202,193,35,23,18,0,162,209,224,209,
 143,189,24,80,35,191,53,0,35,199,49,0,35,207,45,0,
 35,215,41,0,35,223,37,0,35,231,33,0,35,239,29,0,
 35,255,57,0,3,30,76,0,127,0,132,7,225,112,6,224,
 7,232,61,23,1,0,61,95,20,0,34,87,18,0,60,127,
-8,0,203,81,239,81,247,61,34,215,1,0,128,255,210,106,
-46,6,148,204,1,0,106,119,5,0,61,111,1,0,106,215,
-9,0,109,87,1,0,36,22,220,132,34,71,1,0,99,71,
+8,0,203,81,239,81,247,61,34,215,1,0,128,255,2,108,
+46,6,228,206,1,0,106,119,5,0,61,111,1,0,106,215,
+9,0,109,87,1,0,36,22,232,132,34,71,1,0,99,71,
 1,0,34,23,5,0,99,23,5,0,28,48,35,79,5,0,
 29,56,191,255,2,254,61,255,1,0,10,216,63,255,1,0,
 229,87,64,0,224,7,96,1,63,231,0,0,219,225,127,231,
 0,0,10,216,251,47,32,0,224,225,138,13,63,95,5,0,
-31,48,63,6,106,213,0,0,107,0,61,87,1,0,106,215,
+31,48,63,6,14,214,0,0,107,0,61,87,1,0,106,215,
 1,0,197,53,34,223,13,0,11,112,61,87,9,0,191,90,
 206,81,61,111,13,0,225,135,0,0,208,105,203,105,34,215,
 9,0,98,111,13,0,98,87,9,0,2,200,61,127,18,0,
 60,118,16,0,194,122,15,104,205,113,46,23,1,0,60,94,
 16,0,34,23,105,0,203,121,72,18,34,103,0,0,47,55,
-1,0,25,56,204,49,34,95,5,0,63,6,210,213,0,0,
+1,0,25,56,204,49,34,95,5,0,63,6,118,214,0,0,
 107,0,121,215,9,0,121,223,13,0,68,6,255,112,128,7,
 33,0,38,134,16,0,194,58,7,120,207,129,48,23,1,0,
 38,94,16,0,34,23,105,0,203,57,72,18,34,95,0,0,
 39,55,1,0,11,96,204,49,8,56,34,111,5,0,63,6,
-22,214,0,0,109,0,1,82,64,6,63,0,132,7,225,112,
+186,214,0,0,109,0,1,82,64,6,63,0,132,7,225,112,
 6,224,60,103,108,0,7,232,61,23,18,0,61,119,16,0,
 236,17,191,5,236,113,250,5,28,48,29,56,191,255,158,254,
 128,7,66,1,61,135,1,0,60,143,8,0,48,71,18,0,
@@ -20114,33 +20250,33 @@ unsigned char tw_fw_code[] __initdata = 
 29,56,236,17,222,5,191,255,100,254,128,7,8,1,48,207,
 1,0,8,136,207,137,237,137,183,61,13,64,128,255,148,28,
 224,81,138,125,61,223,1,0,28,48,29,56,0,66,128,255,
-74,1,123,87,1,0,36,22,228,132,34,71,1,0,99,71,
+74,1,123,87,1,0,36,22,240,132,34,71,1,0,99,71,
 1,0,34,23,5,0,99,23,5,0,28,48,35,79,5,0,
 29,56,191,255,114,252,61,255,1,0,10,222,1,0,63,255,
 1,0,229,87,64,0,224,7,96,1,63,231,0,0,219,225,
 127,231,0,0,10,216,251,47,32,0,224,225,250,69,63,127,
-5,0,31,48,63,6,252,214,0,0,111,0,245,61,128,255,
+5,0,31,48,63,6,160,215,0,0,111,0,245,61,128,255,
 34,28,224,81,250,61,61,223,1,0,28,48,29,56,1,66,
 128,255,216,0,123,87,1,0,59,215,25,0,10,224,224,209,
-130,29,26,112,195,114,43,6,88,83,133,0,203,113,46,87,
+130,29,26,112,195,114,43,6,224,94,133,0,203,113,46,87,
 1,0,61,63,5,0,123,87,25,0,27,72,0,50,0,66,
-191,255,20,53,124,87,33,0,61,143,1,0,113,215,25,0,
+191,255,112,52,124,87,33,0,61,143,1,0,113,215,25,0,
 229,87,64,0,224,7,96,1,60,255,0,0,10,216,65,250,
 124,255,0,0,251,47,32,0,224,249,138,13,28,48,60,135,
-5,0,63,6,122,215,0,0,112,0,61,127,1,0,111,207,
+5,0,63,6,30,216,0,0,112,0,61,127,1,0,111,207,
 1,0,68,6,255,112,128,7,225,16,38,143,108,0,8,232,
 241,57,226,5,0,74,191,255,72,254,1,82,197,37,41,135,
 18,0,0,18,240,57,186,5,41,23,20,0,61,231,25,0,
-2,64,224,225,242,21,28,120,195,122,44,6,88,83,133,0,
+2,64,224,225,242,21,28,120,195,122,44,6,224,94,133,0,
 204,121,47,95,1,0,41,63,5,0,125,95,25,0,61,223,
-1,0,29,72,0,50,191,255,126,52,123,87,33,0,125,231,
+1,0,29,72,0,50,191,255,218,51,123,87,33,0,125,231,
 25,0,0,82,64,6,255,16,184,7,225,240,7,232,61,23,
 1,0,8,208,34,79,13,0,34,71,9,0,6,224,60,55,
-81,0,3,130,99,135,1,0,186,0,128,255,232,149,61,223,
-1,0,10,192,59,223,1,0,61,207,5,0,128,255,178,103,
+81,0,3,130,99,135,1,0,186,0,128,255,110,151,61,223,
+1,0,10,192,59,223,1,0,61,207,5,0,128,255,226,104,
 106,223,9,0,106,207,29,0,106,7,33,0,106,7,37,0,
-46,6,174,65,1,0,106,119,5,0,10,216,202,15,3,0,
-128,255,142,103,106,223,9,0,45,6,126,66,1,0,106,199,
+46,6,130,67,1,0,106,119,5,0,10,216,202,15,3,0,
+128,255,190,104,106,223,9,0,45,6,82,68,1,0,106,199,
 33,0,35,134,32,0,60,103,4,0,106,111,5,0,95,98,
 106,103,0,0,99,87,5,0,202,15,3,0,13,82,99,135,
 9,0,99,7,20,0,99,7,26,0,99,87,29,0,224,209,
@@ -20149,12 +20285,12 @@ unsigned char tw_fw_code[] __initdata = 
 10,120,191,122,204,81,225,135,0,0,208,121,205,121,99,127,
 17,0,99,87,13,0,61,103,1,0,44,103,18,0,99,103,
 22,0,61,55,5,0,35,79,22,0,0,58,35,70,32,0,
-191,255,32,80,10,64,100,66,151,13,38,6,136,143,132,0,
-32,62,130,12,191,255,214,65,224,81,0,234,149,37,60,87,
+191,255,124,79,10,64,100,66,151,13,38,6,104,154,132,0,
+32,62,130,12,191,255,50,65,224,81,0,234,149,37,60,87,
 108,0,234,233,194,29,60,94,16,0,60,126,16,0,29,80,
 194,82,10,112,206,121,47,23,1,0,203,81,34,23,105,0,
 42,55,1,0,72,18,34,95,0,0,35,62,4,0,203,49,
-34,103,5,0,63,6,44,217,0,0,108,0,65,234,60,95,
+34,103,5,0,63,6,208,217,0,0,108,0,65,234,60,95,
 4,0,235,233,214,221,27,80,120,6,255,240,128,7,225,48,
 6,248,7,216,229,87,64,0,224,7,96,1,10,208,63,239,
 93,0,63,231,89,0,250,47,32,0,59,23,1,0,34,95,
@@ -20162,7 +20298,7 @@ unsigned char tw_fw_code[] __initdata = 
 31,48,27,56,191,255,102,251,213,5,31,48,27,56,191,255,
 158,252,64,6,255,48,130,7,225,0,7,224,60,23,1,0,
 6,232,34,71,9,0,34,79,13,0,61,55,81,0,3,130,
-99,135,1,0,128,255,78,148,29,48,28,56,10,64,128,255,
+99,135,1,0,128,255,212,149,29,48,28,56,10,64,128,255,
 8,0,66,6,255,0,134,7,225,112,6,224,7,232,61,23,
 1,0,60,135,14,0,34,23,18,0,8,216,240,17,218,5,
 128,255,56,3,128,7,54,1,60,119,110,0,28,111,112,0,
@@ -20170,73 +20306,73 @@ unsigned char tw_fw_code[] __initdata = 
 17,0,178,13,10,6,33,0,130,13,28,48,29,56,27,64,
 128,255,162,7,128,7,6,1,28,48,29,56,61,87,20,0,
 60,71,8,0,202,17,232,17,231,117,128,255,6,25,224,81,
-210,5,27,48,128,255,106,148,149,117,61,215,1,0,58,215,
-1,0,128,255,156,101,106,215,9,0,47,6,126,66,1,0,
+210,5,27,48,128,255,240,149,149,117,61,215,1,0,58,215,
+1,0,128,255,204,102,106,215,9,0,47,6,82,68,1,0,
 106,223,33,0,1,114,106,127,5,0,10,216,123,119,0,0,
-61,207,5,0,128,255,122,101,106,223,9,0,45,6,174,65,
+61,207,5,0,128,255,170,102,106,223,9,0,45,6,130,67,
 1,0,106,207,29,0,10,216,106,7,33,0,28,48,106,7,
 37,0,29,56,106,111,5,0,61,103,1,0,202,15,3,0,
 108,223,1,0,3,64,128,255,154,3,123,87,33,0,28,48,
-29,56,128,255,58,4,36,22,236,132,34,95,1,0,35,86,
+29,56,128,255,58,4,36,22,248,132,34,95,1,0,35,86,
 4,0,106,95,1,0,34,23,5,0,106,23,5,0,28,48,
 35,22,4,0,34,71,1,0,34,79,5,0,29,56,191,255,
 118,248,35,23,1,0,202,17,99,23,1,0,2,230,1,0,
 229,87,64,0,224,7,96,1,59,255,0,0,220,249,123,255,
 0,0,10,224,252,47,32,0,224,249,138,13,27,48,59,95,
-5,0,63,6,250,218,0,0,107,0,61,87,1,0,106,215,
+5,0,63,6,158,219,0,0,107,0,61,87,1,0,106,215,
 1,0,197,5,27,64,128,255,8,0,70,6,255,112,182,7,
 225,240,8,224,7,232,61,71,1,0,40,71,18,0,6,216,
-128,255,0,24,224,81,226,5,28,48,128,255,100,147,128,7,
-214,1,61,215,1,0,58,215,1,0,128,255,148,100,106,215,
-9,0,45,6,126,66,1,0,106,231,33,0,1,98,106,111,
-5,0,10,224,124,103,0,0,61,207,5,0,128,255,114,100,
-106,231,9,0,106,207,29,0,106,7,33,0,43,6,174,65,
+128,255,0,24,224,81,226,5,28,48,128,255,234,148,128,7,
+214,1,61,215,1,0,58,215,1,0,128,255,196,101,106,215,
+9,0,45,6,82,68,1,0,106,231,33,0,1,98,106,111,
+5,0,10,224,124,103,0,0,61,207,5,0,128,255,162,101,
+106,231,9,0,106,207,29,0,106,7,33,0,43,6,130,67,
 1,0,106,7,37,0,10,224,106,95,5,0,61,23,1,0,
 202,15,3,0,34,135,22,0,98,231,1,0,99,135,102,0,
 11,82,34,79,18,0,99,87,105,0,99,79,98,0,99,231,
 81,0,61,87,20,0,61,111,13,0,61,103,9,0,10,120,
 191,122,204,81,225,135,0,0,208,121,205,121,99,127,93,0,
-99,87,89,0,0,58,61,55,5,0,3,64,191,255,36,77,
-10,64,100,66,135,13,38,6,156,143,132,0,32,62,251,13,
-191,255,218,62,99,7,96,0,99,31,85,0,61,87,16,0,
+99,87,89,0,0,58,61,55,5,0,3,64,191,255,128,76,
+10,64,100,66,135,13,38,6,124,154,132,0,32,62,251,13,
+191,255,54,62,99,7,96,0,99,31,85,0,61,87,16,0,
 59,134,16,0,194,82,10,120,207,129,48,23,1,0,59,94,
 16,0,34,23,105,0,203,81,2,22,32,0,34,95,0,0,
 42,55,1,0,11,96,204,49,35,62,80,0,3,64,34,111,
-5,0,63,6,42,220,0,0,109,0,61,23,1,0,10,192,
+5,0,63,6,206,220,0,0,109,0,61,23,1,0,10,192,
 34,95,25,0,34,103,5,0,99,95,105,0,34,87,16,0,
 99,103,85,0,99,87,96,0,59,94,16,0,61,127,18,0,
 59,118,16,0,194,122,15,104,205,113,46,23,1,0,203,121,
 34,23,105,0,47,55,1,0,2,22,32,0,34,103,0,0,
-35,62,80,0,204,49,3,64,34,95,5,0,63,6,132,220,
+35,62,80,0,204,49,3,64,34,95,5,0,63,6,40,221,
 0,0,107,0,10,216,124,223,33,0,61,79,1,0,46,6,
-92,83,133,0,41,207,25,0,61,63,5,0,25,80,195,82,
+228,94,133,0,41,207,25,0,61,63,5,0,25,80,195,82,
 206,81,42,111,1,0,1,50,105,111,25,0,0,66,191,255,
-166,47,10,48,128,255,202,134,10,16,61,87,1,0,106,215,
+2,47,10,48,128,255,210,135,10,16,61,87,1,0,106,215,
 1,0,106,207,25,0,165,5,10,216,59,87,13,0,224,81,
 202,253,123,199,13,0,2,238,2,0,229,87,64,0,224,7,
 96,1,60,255,0,0,221,249,124,255,0,0,10,232,253,47,
-32,0,224,249,138,13,28,48,60,103,5,0,63,6,4,221,
+32,0,224,249,138,13,28,48,60,103,5,0,63,6,168,221,
 0,0,108,0,118,6,255,240,138,7,225,112,8,224,6,216,
 59,71,8,0,7,232,128,255,10,22,224,81,210,5,28,48,
-128,255,110,145,197,125,61,215,1,0,58,215,1,0,128,255,
-160,98,106,215,9,0,47,6,126,66,1,0,106,231,33,0,
+128,255,244,146,197,125,61,215,1,0,58,215,1,0,128,255,
+208,99,106,215,9,0,47,6,82,68,1,0,106,231,33,0,
 1,114,106,127,5,0,10,224,124,119,0,0,61,207,5,0,
-128,255,126,98,106,231,9,0,106,207,29,0,45,6,174,65,
+128,255,174,99,106,231,9,0,106,207,29,0,45,6,130,67,
 1,0,106,7,33,0,106,7,37,0,10,224,61,103,1,0,
-106,111,5,0,108,231,1,0,36,22,244,132,202,15,3,0,
+106,111,5,0,108,231,1,0,36,22,0,133,202,15,3,0,
 34,95,1,0,35,86,12,0,106,95,1,0,34,23,5,0,
 106,23,5,0,27,48,35,22,12,0,34,79,5,0,34,71,
 1,0,29,56,191,255,144,245,10,200,27,48,29,56,3,64,
 128,255,112,0,35,95,1,0,124,87,33,0,203,201,36,22,
-252,132,34,95,1,0,35,86,4,0,106,95,1,0,34,23,
+8,133,34,95,1,0,35,86,4,0,106,95,1,0,34,23,
 5,0,106,23,5,0,27,48,35,22,4,0,34,79,5,0,
 34,71,1,0,29,56,191,255,78,245,61,87,1,0,106,215,
 1,0,229,87,64,0,224,7,96,1,60,255,0,0,10,232,
 217,249,124,255,0,0,253,47,32,0,224,249,138,13,28,48,
-60,143,5,0,63,6,28,222,0,0,113,0,74,6,255,112,
+60,143,5,0,63,6,192,222,0,0,113,0,74,6,255,112,
 182,7,225,16,7,232,6,224,61,55,5,0,60,79,8,0,
-0,58,8,216,35,70,28,0,191,255,184,74,10,64,100,66,
-135,13,38,6,176,143,132,0,32,62,211,14,191,255,110,60,
+0,58,8,216,35,70,28,0,191,255,20,74,10,64,100,66,
+135,13,38,6,144,154,132,0,32,62,211,14,191,255,202,59,
 11,122,99,127,25,0,35,118,28,0,61,23,1,0,99,7,
 16,0,99,119,5,0,34,111,22,0,34,103,1,0,99,111,
 22,0,99,103,1,0,60,126,16,0,61,87,9,0,61,95,
@@ -20244,85 +20380,85 @@ unsigned char tw_fw_code[] __initdata = 
 3,56,99,95,18,0,61,135,16,0,60,94,16,0,194,130,
 16,112,206,121,47,23,1,0,203,129,34,23,105,0,48,55,
 1,0,2,22,40,0,34,95,0,0,34,103,5,0,203,49,
-63,6,200,222,0,0,108,0,118,6,255,16,182,7,225,0,
+63,6,108,223,0,0,108,0,118,6,255,16,182,7,225,0,
 13,130,99,135,105,0,99,31,85,0,7,232,61,111,1,0,
 99,7,96,0,45,111,1,0,99,7,102,0,99,111,81,0,
 6,224,61,55,5,0,60,79,8,0,0,58,3,64,191,255,
-242,73,10,64,100,66,135,13,38,6,196,143,132,0,32,62,
-26,15,191,255,168,59,61,95,13,0,61,87,9,0,60,126,
+78,73,10,64,100,66,135,13,38,6,164,154,132,0,32,62,
+26,15,191,255,4,59,61,95,13,0,61,87,9,0,60,126,
 16,0,99,95,93,0,99,87,89,0,35,62,80,0,61,135,
 16,0,60,95,8,0,194,130,99,95,98,0,16,112,60,94,
 16,0,206,121,47,23,1,0,203,129,34,23,105,0,48,55,
 1,0,72,18,34,95,0,0,34,103,5,0,203,49,63,6,
-102,223,0,0,108,0,118,6,255,0,168,7,225,112,6,208,
+10,224,0,0,108,0,118,6,255,0,168,7,225,112,6,208,
 8,232,0,18,9,224,60,143,18,0,7,200,241,201,186,5,
 60,23,20,0,2,216,60,55,5,0,27,56,61,79,18,0,
-3,64,191,255,94,73,10,64,100,66,135,13,38,6,216,143,
-132,0,32,62,76,15,191,255,20,59,58,94,16,0,58,118,
+3,64,191,255,186,72,10,64,100,66,135,13,38,6,184,154,
+132,0,32,62,76,15,191,255,112,58,58,94,16,0,58,118,
 16,0,25,80,194,82,10,104,205,113,46,23,1,0,203,81,
 34,23,105,0,42,55,1,0,2,22,32,0,34,103,0,0,
-29,56,204,49,3,64,34,95,5,0,63,6,226,223,0,0,
-107,0,61,207,25,0,10,208,25,80,195,82,47,6,92,83,
+29,56,204,49,3,64,34,95,5,0,63,6,134,224,0,0,
+107,0,61,207,25,0,10,208,25,80,195,82,47,6,228,94,
 133,0,207,81,42,119,1,0,60,63,5,0,125,119,25,0,
-27,64,29,72,1,50,191,255,78,44,10,48,128,255,114,131,
+27,64,29,72,1,50,191,255,170,43,10,48,128,255,122,132,
 61,95,1,0,125,207,25,0,43,23,33,0,224,17,218,5,
 107,215,33,0,133,13,11,16,34,95,13,0,224,89,202,253,
 98,215,13,0,65,82,104,6,255,112,128,7,225,0,8,232,
-61,231,25,0,46,6,92,83,133,0,28,136,195,138,206,137,
+61,231,25,0,46,6,228,94,133,0,28,136,195,138,206,137,
 49,111,1,0,41,103,18,0,125,111,25,0,0,66,236,57,
 186,5,41,71,20,0,41,63,5,0,1,50,29,72,191,255,
-230,43,10,48,128,255,10,131,125,231,25,0,64,6,255,0,
+66,43,10,48,128,255,18,132,125,231,25,0,64,6,255,0,
 130,7,97,0,38,134,16,0,194,58,7,120,207,129,48,23,
 1,0,38,94,16,0,34,23,105,0,203,57,2,22,40,0,
 34,95,0,0,39,55,1,0,11,96,204,49,8,232,29,56,
-3,64,34,111,5,0,63,6,190,224,0,0,109,0,61,95,
+3,64,34,111,5,0,63,6,98,225,0,0,109,0,61,95,
 1,0,43,23,33,0,224,17,218,5,107,87,33,0,133,13,
 11,16,34,95,13,0,224,89,202,253,98,87,13,0,35,87,
 1,0,66,6,127,0,128,7,225,16,7,224,6,232,29,143,
 7,0,8,216,17,6,17,0,186,21,61,23,105,0,63,6,
-22,225,0,0,2,22,88,1,34,87,0,0,34,135,5,0,
+186,225,0,0,2,22,88,1,34,87,0,0,34,135,5,0,
 221,81,10,48,112,0,234,225,186,5,0,82,213,29,61,94,
 16,0,61,118,16,0,28,80,194,82,10,104,205,113,46,23,
 1,0,203,81,34,23,105,0,42,55,1,0,2,22,16,0,
-34,103,0,0,27,56,204,49,34,95,5,0,63,6,84,225,
+34,103,0,0,27,56,204,49,34,95,5,0,63,6,248,225,
 0,0,107,0,1,82,64,6,255,16,130,7,225,0,7,224,
 60,23,1,0,6,232,34,71,9,0,34,79,13,0,61,55,
-81,0,3,130,99,135,1,0,128,255,122,140,29,127,112,0,
+81,0,3,130,99,135,1,0,128,255,0,142,29,127,112,0,
 10,64,224,121,194,5,221,255,2,0,234,5,29,48,28,56,
 128,255,18,0,213,5,29,48,28,56,191,255,28,248,66,6,
 255,0,138,7,225,112,8,216,6,224,39,87,1,0,38,127,
 14,0,42,87,18,0,7,232,239,81,218,5,191,255,76,251,
 128,7,72,1,61,23,20,0,60,71,8,0,202,17,232,17,
 191,5,128,7,48,1,128,255,74,17,224,81,226,5,27,48,
-128,255,174,140,128,7,36,1,61,215,1,0,58,215,1,0,
-128,255,222,93,106,215,9,0,44,6,126,66,1,0,106,223,
+128,255,52,142,128,7,36,1,61,215,1,0,58,215,1,0,
+128,255,14,95,106,215,9,0,44,6,82,68,1,0,106,223,
 33,0,1,90,106,103,5,0,10,216,123,95,0,0,61,207,
-5,0,128,255,188,93,10,16,98,223,9,0,42,6,174,65,
+5,0,128,255,236,94,10,16,98,223,9,0,42,6,130,67,
 1,0,98,207,29,0,98,7,33,0,28,48,98,7,37,0,
 2,216,61,143,1,0,98,87,5,0,113,223,1,0,29,56,
 194,15,3,0,3,64,191,255,218,251,123,87,33,0,28,48,
 29,56,128,255,248,2,35,23,1,0,202,17,99,23,1,0,
-36,22,244,132,34,95,1,0,35,86,12,0,106,95,1,0,
+36,22,0,133,34,95,1,0,35,86,12,0,106,95,1,0,
 34,23,5,0,106,23,5,0,28,48,35,22,12,0,34,79,
 5,0,34,71,1,0,29,56,191,255,172,240,35,23,1,0,
-202,17,99,23,1,0,36,22,252,132,34,95,1,0,35,86,
+202,17,99,23,1,0,36,22,8,133,34,95,1,0,35,86,
 4,0,106,95,1,0,34,23,5,0,106,23,5,0,28,48,
 35,22,4,0,34,79,5,0,34,71,1,0,29,56,191,255,
 118,240,35,23,1,0,61,135,1,0,202,17,99,23,1,0,
 112,215,1,0,2,232,229,87,64,0,224,7,96,1,59,255,
 0,0,221,249,123,255,0,0,10,232,253,47,32,0,224,249,
-202,13,27,48,59,127,5,0,63,6,0,227,0,0,111,0,
+202,13,27,48,59,127,5,0,63,6,164,227,0,0,111,0,
 197,5,27,64,128,255,8,0,74,6,255,112,184,7,225,243,
 8,224,7,232,61,71,1,0,40,71,18,0,6,216,128,255,
-2,16,224,81,226,5,28,48,128,255,102,139,128,7,26,2,
-61,207,1,0,57,207,1,0,128,255,150,92,106,207,9,0,
-45,6,126,66,1,0,106,231,33,0,1,98,106,111,5,0,
-10,224,124,103,0,0,61,215,5,0,128,255,116,92,106,231,
-9,0,106,215,29,0,43,6,174,65,1,0,106,7,33,0,
+2,16,224,81,226,5,28,48,128,255,236,140,128,7,26,2,
+61,207,1,0,57,207,1,0,128,255,198,93,106,207,9,0,
+45,6,82,68,1,0,106,231,33,0,1,98,106,111,5,0,
+10,224,124,103,0,0,61,215,5,0,128,255,164,93,106,231,
+9,0,106,215,29,0,43,6,130,67,1,0,106,7,33,0,
 10,224,106,7,37,0,0,58,106,95,5,0,61,23,1,0,
 202,15,3,0,98,231,1,0,34,79,18,0,61,55,5,0,
-35,70,4,0,191,255,92,69,10,64,100,66,135,13,38,6,
-236,143,132,0,32,62,33,17,191,255,18,55,11,130,35,126,
+35,70,4,0,191,255,184,68,10,64,100,66,135,13,38,6,
+204,154,132,0,32,62,33,17,191,255,110,54,11,130,35,126,
 4,0,61,119,1,0,99,7,100,0,99,127,89,0,46,111,
 22,0,99,231,85,0,99,111,106,0,99,135,109,0,61,87,
 20,0,61,103,9,0,10,72,191,74,204,81,225,127,0,0,
@@ -20331,16 +20467,16 @@ unsigned char tw_fw_code[] __initdata = 
 102,0,3,64,61,135,16,0,59,94,16,0,194,130,16,112,
 206,121,47,23,1,0,203,129,34,23,105,0,48,55,1,0,
 2,22,40,0,34,95,0,0,34,103,5,0,203,49,63,6,
-54,228,0,0,108,0,124,87,33,0,13,90,61,199,18,0,
+218,228,0,0,108,0,124,87,33,0,13,90,61,199,18,0,
 99,95,109,0,0,210,133,45,61,87,16,0,234,209,178,37,
 248,209,146,37,59,94,16,0,59,126,16,0,26,80,194,82,
 10,112,206,121,47,23,1,0,203,81,34,23,105,0,42,55,
 1,0,72,18,34,95,0,0,35,62,84,0,203,49,34,103,
-5,0,63,6,138,228,0,0,108,0,35,95,1,0,65,90,
+5,0,63,6,46,229,0,0,108,0,35,95,1,0,65,90,
 99,95,1,0,65,210,59,87,4,0,234,209,230,213,61,79,
-1,0,45,6,92,83,133,0,41,215,25,0,61,63,5,0,
+1,0,45,6,228,94,133,0,41,215,25,0,61,63,5,0,
 26,128,195,130,205,129,48,103,1,0,1,50,105,103,25,0,
-0,66,191,255,146,39,10,48,128,255,182,126,35,23,1,0,
+0,66,191,255,238,38,10,48,128,255,190,127,35,23,1,0,
 61,71,1,0,202,17,104,215,25,0,99,23,1,0,35,95,
 97,0,35,87,93,0,40,183,9,0,40,191,13,0,104,87,
 9,0,104,95,13,0,27,48,24,56,29,72,191,255,132,251,
@@ -20348,25 +20484,25 @@ unsigned char tw_fw_code[] __initdata = 
 1,0,106,191,13,0,106,183,9,0,2,232,229,87,64,0,
 224,7,96,1,60,255,0,0,221,249,124,255,0,0,10,232,
 253,47,32,0,224,249,138,13,28,48,60,87,5,0,63,6,
-70,229,0,0,106,0,120,6,255,243,182,7,225,241,13,130,
+234,229,0,0,106,0,120,6,255,243,182,7,225,241,13,130,
 99,135,105,0,99,31,85,0,7,224,60,111,1,0,99,7,
 96,0,45,111,1,0,99,7,102,0,99,111,81,0,6,232,
-60,55,5,0,61,79,8,0,0,58,3,64,191,255,116,67,
-10,64,100,66,135,13,38,6,0,144,132,0,32,62,159,17,
-191,255,42,53,60,87,9,0,60,95,13,0,0,202,99,87,
+60,55,5,0,61,79,8,0,0,58,3,64,191,255,208,66,
+10,64,100,66,135,13,38,6,224,154,132,0,32,62,159,17,
+191,255,134,52,60,87,9,0,60,95,13,0,0,202,99,87,
 89,0,99,95,93,0,0,210,60,191,18,0,60,199,16,0,
 61,95,8,0,0,218,99,95,98,0,128,7,106,1,248,209,
 186,5,128,7,96,1,247,209,170,53,60,23,20,0,224,17,
 183,37,61,94,16,0,99,23,98,0,61,126,16,0,26,80,
 194,82,10,112,206,121,47,23,1,0,203,81,34,23,105,0,
 42,55,1,0,72,18,34,95,0,0,35,62,80,0,203,49,
-34,103,5,0,63,6,12,230,0,0,108,0,61,95,8,0,
+34,103,5,0,63,6,176,230,0,0,108,0,61,95,8,0,
 65,202,99,95,98,0,60,135,1,0,60,223,20,0,48,135,
 18,0,61,111,8,0,208,217,173,217,197,37,224,217,250,29,
 61,94,16,0,26,96,194,98,12,80,202,89,43,23,1,0,
 35,62,80,0,34,23,105,0,61,94,16,0,203,97,72,18,
 34,95,0,0,44,103,1,0,11,48,204,49,34,127,5,0,
-63,6,104,230,0,0,111,0,65,202,197,5,61,119,8,0,
+63,6,12,231,0,0,111,0,65,202,197,5,61,119,8,0,
 174,217,224,217,254,85,27,96,128,97,99,103,98,0,35,79,
 85,0,60,111,13,0,41,71,17,0,61,23,8,0,60,103,
 9,0,219,17,2,120,191,122,2,112,204,113,99,119,89,0,
@@ -20375,13 +20511,13 @@ unsigned char tw_fw_code[] __initdata = 
 61,118,16,0,26,80,194,82,10,104,205,113,46,23,1,0,
 99,135,96,0,34,23,105,0,99,79,85,0,72,18,34,103,
 0,0,61,94,16,0,203,81,42,55,1,0,0,218,204,49,
-35,62,80,0,34,95,5,0,63,6,0,231,0,0,107,0,
+35,62,80,0,34,95,5,0,63,6,164,231,0,0,107,0,
 60,87,9,0,60,95,13,0,65,202,99,95,93,0,99,87,
 89,0,99,7,96,0,61,87,8,0,99,31,85,0,99,87,
 98,0,65,210,61,127,4,0,239,209,190,5,191,7,146,254,
 25,80,118,6,255,241,130,7,225,0,7,224,60,23,1,0,
 6,232,34,71,9,0,34,79,13,0,61,55,81,0,3,130,
-99,135,1,0,128,255,158,134,29,48,28,56,10,64,128,255,
+99,135,1,0,128,255,36,136,29,48,28,56,10,64,128,255,
 8,0,66,6,255,0,132,7,33,0,39,135,18,0,38,87,
 108,0,39,127,16,0,16,72,234,121,202,5,128,255,226,9,
 197,53,234,73,199,5,191,255,48,242,245,45,39,23,1,0,
@@ -20396,53 +20532,53 @@ unsigned char tw_fw_code[] __initdata = 
 20,0,39,103,9,0,10,72,191,74,204,81,225,127,0,0,
 9,16,39,111,13,0,207,17,205,17,99,23,13,0,99,87,
 9,0,8,208,46,71,18,0,6,216,99,71,18,0,7,232,
-128,255,224,10,224,81,226,5,26,48,128,255,68,134,128,7,
-92,1,61,231,1,0,60,231,1,0,128,255,116,87,106,231,
-9,0,47,6,126,66,1,0,106,215,33,0,10,224,106,127,
-5,0,1,114,124,119,0,0,61,215,5,0,128,255,82,87,
-106,231,9,0,106,215,29,0,106,7,33,0,45,6,174,65,
+128,255,224,10,224,81,226,5,26,48,128,255,202,135,128,7,
+92,1,61,231,1,0,60,231,1,0,128,255,164,88,106,231,
+9,0,47,6,82,68,1,0,106,215,33,0,10,224,106,127,
+5,0,1,114,124,119,0,0,61,215,5,0,128,255,130,88,
+106,231,9,0,106,215,29,0,106,7,33,0,45,6,130,67,
 1,0,106,7,37,0,0,58,106,111,5,0,99,87,1,0,
 202,15,3,0,35,79,18,0,61,55,5,0,35,70,28,0,
-191,255,64,64,10,64,100,66,135,13,38,6,20,144,132,0,
-32,62,42,19,191,255,246,49,59,95,4,0,61,207,16,0,
+191,255,156,63,10,64,100,66,135,13,38,6,244,154,132,0,
+32,62,42,19,191,255,82,49,59,95,4,0,61,207,16,0,
 11,214,254,255,0,226,165,37,249,225,242,29,59,87,108,0,
 234,225,178,29,59,94,16,0,59,126,16,0,28,80,194,82,
 10,112,206,121,47,23,1,0,203,81,34,23,105,0,42,55,
 1,0,72,18,34,95,0,0,3,56,203,49,34,103,5,0,
-63,6,24,233,0,0,108,0,65,226,59,95,4,0,235,225,
+63,6,188,233,0,0,108,0,65,226,59,95,4,0,235,225,
 198,221,61,231,1,0,35,87,1,0,60,199,25,0,60,191,
-1,0,24,128,195,130,45,6,92,83,133,0,205,129,48,103,
+1,0,24,128,195,130,45,6,228,94,133,0,205,129,48,103,
 1,0,124,87,1,0,124,103,25,0,61,63,5,0,28,72,
-1,50,0,66,191,255,0,35,10,48,128,255,36,122,202,209,
+1,50,0,66,191,255,92,34,10,48,128,255,44,123,202,209,
 124,191,1,0,124,199,25,0,11,90,99,95,25,0,27,48,
 25,56,29,72,3,64,191,255,10,247,202,209,35,239,1,0,
 229,87,64,0,224,7,96,1,61,255,0,0,10,224,218,249,
 125,255,0,0,252,47,32,0,224,249,138,13,29,48,61,87,
-5,0,63,6,170,233,0,0,106,0,118,6,255,241,190,7,
+5,0,63,6,78,234,0,0,106,0,118,6,255,241,190,7,
 225,243,80,26,99,79,13,0,35,207,177,0,35,199,181,0,
 8,208,6,224,60,71,8,0,7,232,128,255,86,9,224,81,
-226,5,26,48,128,255,186,132,128,7,126,7,61,223,1,0,
-54,6,40,144,132,0,59,223,1,0,128,255,228,85,106,223,
-9,0,46,6,126,66,1,0,106,215,33,0,10,216,106,119,
-5,0,1,106,123,111,0,0,61,215,5,0,128,255,194,85,
+226,5,26,48,128,255,64,134,128,7,126,7,61,223,1,0,
+54,6,8,155,132,0,59,223,1,0,128,255,20,87,106,223,
+9,0,46,6,82,68,1,0,106,215,33,0,10,216,106,119,
+5,0,1,106,123,111,0,0,61,215,5,0,128,255,242,86,
 106,223,9,0,106,215,29,0,106,7,33,0,13,90,106,7,
-37,0,44,6,174,65,1,0,106,103,5,0,61,127,1,0,
+37,0,44,6,130,67,1,0,106,103,5,0,61,127,1,0,
 202,15,3,0,99,7,48,0,99,87,33,0,47,127,22,0,
 35,86,60,0,99,127,54,0,99,87,37,0,99,95,57,0,
 25,120,61,111,13,0,61,103,9,0,191,122,25,112,204,113,
 225,135,0,0,208,121,205,121,99,119,41,0,99,127,45,0,
 24,72,61,55,5,0,185,73,99,79,50,0,25,56,233,0,
-35,70,60,0,191,255,108,62,100,82,247,5,22,48,32,62,
-254,19,0,66,191,255,38,48,0,218,35,151,13,0,61,191,
+35,70,60,0,191,255,200,61,100,82,247,5,22,48,32,62,
+254,19,0,66,191,255,130,47,0,218,35,151,13,0,61,191,
 16,0,18,214,1,0,149,37,247,209,226,29,60,94,16,0,
 26,96,194,98,12,80,202,89,43,23,1,0,35,62,32,0,
 34,23,105,0,60,94,16,0,203,97,72,18,34,95,0,0,
-44,103,1,0,11,48,204,49,34,127,5,0,63,6,228,234,
+44,103,1,0,11,48,204,49,34,127,5,0,63,6,136,235,
 0,0,111,0,65,218,65,210,60,119,4,0,238,209,214,221,
 0,210,133,37,247,209,210,29,26,80,194,82,60,102,16,0,
 202,97,44,23,1,0,60,94,16,0,34,23,105,0,203,81,
 72,18,34,95,0,0,42,55,1,0,11,96,204,49,35,62,
-32,0,34,135,5,0,63,6,46,235,0,0,112,0,65,218,
+32,0,34,135,5,0,63,6,210,235,0,0,112,0,65,218,
 65,210,61,127,18,0,239,209,234,221,61,111,1,0,60,103,
 8,0,45,111,18,0,236,105,239,151,0,0,99,151,13,0,
 199,109,61,127,13,0,61,119,9,0,224,201,202,21,24,56,
@@ -20450,30 +20586,30 @@ unsigned char tw_fw_code[] __initdata = 
 99,111,45,0,99,103,41,0,60,95,8,0,167,89,99,95,
 50,0,133,13,0,58,99,119,41,0,99,127,45,0,99,207,
 50,0,35,23,50,0,224,17,199,45,61,55,5,0,2,72,
-35,70,60,0,191,255,76,61,100,82,247,5,22,48,32,62,
-75,20,0,66,191,255,6,47,23,80,194,82,60,110,16,0,
+35,70,60,0,191,255,168,60,100,82,247,5,22,48,32,62,
+75,20,0,66,191,255,98,46,23,80,194,82,60,110,16,0,
 202,105,45,23,1,0,60,94,16,0,34,23,105,0,203,81,
 72,18,34,95,0,0,42,55,1,0,11,96,204,49,35,62,
-32,0,34,87,5,0,63,6,238,235,0,0,106,0,65,218,
+32,0,34,87,5,0,63,6,146,236,0,0,106,0,65,218,
 61,95,13,0,61,87,9,0,99,95,45,0,99,87,41,0,
 60,79,8,0,0,58,99,79,50,0,61,55,5,0,35,70,
-60,0,191,255,222,60,100,82,135,13,22,48,32,62,89,20,
-0,66,191,255,152,46,224,81,11,114,99,119,57,0,194,186,
+60,0,191,255,58,60,100,82,135,13,22,48,32,62,89,20,
+0,66,191,255,244,45,224,81,11,114,99,119,57,0,194,186,
 60,102,16,0,215,97,44,23,1,0,60,86,16,0,34,23,
 105,0,215,81,2,22,40,0,34,95,0,0,42,55,1,0,
 11,96,204,49,35,62,32,0,3,64,34,135,5,0,63,6,
-102,236,0,0,112,0,35,127,33,0,99,87,5,0,111,87,
+10,237,0,0,112,0,35,127,33,0,99,87,5,0,111,87,
 33,0,181,5,99,23,5,0,35,23,5,0,34,23,13,0,
 224,17,154,253,13,114,99,119,57,0,35,111,1,0,60,103,
 108,0,61,215,18,0,205,217,236,209,186,5,128,7,150,1,
 61,95,20,0,235,193,235,199,60,19,99,23,50,0,226,0,
 224,17,215,53,61,55,5,0,2,72,0,58,35,70,60,0,
-191,255,48,60,100,82,247,5,22,48,32,62,188,20,0,66,
-191,255,234,45,61,95,13,0,61,87,9,0,60,110,16,0,
+191,255,140,59,100,82,247,5,22,48,32,62,188,20,0,66,
+191,255,70,45,61,95,13,0,61,87,9,0,60,110,16,0,
 99,87,41,0,99,95,45,0,26,80,194,82,202,105,45,23,
 1,0,60,94,16,0,34,23,105,0,203,81,72,18,34,95,
 0,0,42,55,1,0,11,96,204,49,35,62,32,0,34,87,
-5,0,63,6,26,237,0,0,106,0,65,218,60,23,8,0,
+5,0,63,6,190,237,0,0,106,0,65,218,60,23,8,0,
 226,193,186,5,128,7,14,1,61,87,20,0,248,81,239,21,
 184,17,99,23,50,0,24,56,61,103,9,0,61,111,13,0,
 7,120,191,122,7,112,204,113,99,119,41,0,225,135,0,0,
@@ -20481,15 +20617,15 @@ unsigned char tw_fw_code[] __initdata = 
 61,103,9,0,61,63,20,0,61,111,13,0,7,120,191,122,
 7,112,204,113,99,119,41,0,225,135,0,0,208,121,205,121,
 99,127,45,0,61,55,5,0,35,79,50,0,35,70,60,0,
-191,255,96,59,100,82,247,5,22,48,32,62,221,20,0,66,
-191,255,26,45,26,80,194,82,60,102,16,0,202,97,44,23,
+191,255,188,58,100,82,247,5,22,48,32,62,221,20,0,66,
+191,255,118,44,26,80,194,82,60,102,16,0,202,97,44,23,
 1,0,60,94,16,0,34,23,105,0,203,81,72,18,34,95,
 0,0,42,55,1,0,11,96,204,49,35,62,32,0,34,135,
-5,0,63,6,218,237,0,0,112,0,35,151,13,0,65,218,
+5,0,63,6,126,238,0,0,112,0,35,151,13,0,65,218,
 224,145,138,45,60,118,16,0,23,104,205,113,46,23,1,0,
 11,122,34,23,105,0,60,86,16,0,2,22,32,0,34,103,
 0,0,215,81,42,55,1,0,99,127,57,0,204,49,35,62,
-32,0,35,70,60,0,34,95,5,0,63,6,34,238,0,0,
+32,0,35,70,60,0,34,95,5,0,63,6,198,238,0,0,
 107,0,35,143,5,0,113,87,13,0,65,218,13,82,99,87,
 57,0,61,151,1,0,61,23,20,0,99,151,9,0,60,87,
 8,0,50,151,18,0,162,81,99,151,9,0,229,93,61,119,
@@ -20499,26 +20635,26 @@ unsigned char tw_fw_code[] __initdata = 
 208,105,207,105,99,111,45,0,99,103,41,0,60,103,8,0,
 167,97,99,103,50,0,133,13,0,58,99,119,41,0,99,127,
 45,0,99,207,50,0,35,23,50,0,224,17,199,45,61,55,
-5,0,2,72,35,70,60,0,191,255,56,58,100,82,247,5,
-22,48,32,62,25,21,0,66,191,255,242,43,60,94,16,0,
+5,0,2,72,35,70,60,0,191,255,148,57,100,82,247,5,
+22,48,32,62,25,21,0,66,191,255,78,43,60,94,16,0,
 60,118,16,0,26,80,194,82,10,104,205,113,46,23,1,0,
 203,81,34,23,105,0,42,55,1,0,72,18,34,103,0,0,
-35,62,32,0,204,49,34,95,5,0,63,6,2,239,0,0,
+35,62,32,0,204,49,34,95,5,0,63,6,166,239,0,0,
 107,0,65,218,60,87,8,0,35,151,9,0,170,145,99,151,
 9,0,224,145,223,157,128,145,60,135,108,0,99,151,9,0,
 240,209,186,5,128,7,144,1,60,199,8,0,178,193,224,201,
 231,101,248,201,248,207,60,75,99,79,50,0,61,87,9,0,
 61,95,13,0,0,58,99,95,45,0,99,87,41,0,233,0,
-61,55,5,0,35,70,60,0,191,255,152,57,100,82,247,5,
-22,48,32,62,121,21,0,66,191,255,82,43,60,94,16,0,
+61,55,5,0,35,70,60,0,191,255,244,56,100,82,247,5,
+22,48,32,62,121,21,0,66,191,255,174,42,60,94,16,0,
 26,96,194,98,12,80,202,89,43,23,1,0,35,62,32,0,
 34,23,105,0,60,94,16,0,203,97,72,18,34,95,0,0,
-44,103,1,0,11,48,204,49,34,127,5,0,63,6,164,239,
+44,103,1,0,11,48,204,49,34,127,5,0,63,6,72,240,
 0,0,111,0,35,151,13,0,65,218,224,145,138,45,60,110,
 16,0,215,105,45,23,1,0,11,114,34,23,105,0,99,119,
 57,0,2,22,32,0,34,95,0,0,60,86,16,0,215,81,
 42,55,1,0,11,96,204,49,35,62,32,0,35,70,60,0,
-34,87,5,0,63,6,236,239,0,0,106,0,35,143,5,0,
+34,87,5,0,63,6,144,240,0,0,106,0,35,143,5,0,
 13,130,113,87,13,0,65,218,99,135,57,0,60,23,8,0,
 226,193,146,93,249,193,246,21,35,151,9,0,24,120,99,151,
 50,0,191,122,61,103,9,0,61,111,13,0,24,112,204,113,
@@ -20526,27 +20662,27 @@ unsigned char tw_fw_code[] __initdata = 
 24,56,213,21,185,17,99,23,50,0,25,120,61,103,9,0,
 61,111,13,0,191,122,25,112,204,113,99,119,41,0,225,135,
 0,0,208,121,205,121,99,127,45,0,25,56,61,55,5,0,
-35,79,50,0,35,70,60,0,191,255,136,56,100,82,247,5,
-22,48,32,62,163,21,0,66,191,255,66,42,26,80,194,82,
+35,79,50,0,35,70,60,0,191,255,228,55,100,82,247,5,
+22,48,32,62,163,21,0,66,191,255,158,41,26,80,194,82,
 60,102,16,0,202,97,44,23,1,0,60,94,16,0,34,23,
 105,0,203,81,72,18,34,95,0,0,42,55,1,0,11,96,
-204,49,35,62,32,0,34,135,5,0,63,6,178,240,0,0,
+204,49,35,62,32,0,34,135,5,0,63,6,86,241,0,0,
 112,0,65,218,61,23,1,0,35,127,33,0,34,215,1,0,
-98,127,1,0,36,22,244,132,34,95,1,0,35,86,24,0,
+98,127,1,0,36,22,0,133,34,95,1,0,35,86,24,0,
 106,95,1,0,34,23,5,0,106,23,5,0,28,48,35,22,
 24,0,34,79,5,0,34,71,1,0,29,56,191,255,72,226,
-202,217,36,22,4,133,34,95,1,0,35,86,16,0,106,95,
+202,217,36,22,16,133,34,95,1,0,35,86,16,0,106,95,
 1,0,34,23,5,0,106,23,5,0,28,48,35,22,16,0,
 34,71,1,0,34,79,5,0,29,56,191,255,26,226,202,217,
 35,231,33,0,229,87,64,0,224,7,96,1,60,255,0,0,
 219,249,124,255,0,0,10,216,251,47,32,0,224,249,138,13,
-28,48,60,119,5,0,63,6,78,241,0,0,110,0,61,111,
+28,48,60,119,5,0,63,6,242,241,0,0,110,0,61,111,
 1,0,109,215,1,0,3,30,16,0,126,6,255,243,132,7,
 225,240,6,224,7,232,61,223,1,0,8,208,59,223,1,0,
-128,255,94,78,106,223,9,0,47,6,126,66,1,0,106,215,
+128,255,142,79,106,223,9,0,47,6,82,68,1,0,106,215,
 33,0,28,48,61,23,1,0,106,127,5,0,98,87,1,0,
 34,119,18,0,61,87,20,0,60,103,8,0,202,113,236,113,
-167,21,36,22,12,133,34,71,1,0,99,71,1,0,34,23,
+167,21,36,22,24,133,34,71,1,0,99,71,1,0,34,23,
 5,0,99,23,5,0,35,79,5,0,29,56,191,255,120,225,
 10,208,165,37,34,207,13,0,61,103,9,0,10,120,191,122,
 204,81,225,135,0,0,208,121,61,111,13,0,34,199,9,0,
@@ -20555,15 +20691,15 @@ unsigned char tw_fw_code[] __initdata = 
 9,0,98,207,13,0,61,255,1,0,63,255,1,0,229,87,
 64,0,224,7,96,1,63,231,0,0,218,225,127,231,0,0,
 10,208,250,47,32,0,224,225,138,13,63,135,5,0,31,48,
-63,6,56,242,0,0,112,0,61,127,1,0,111,223,1,0,
+63,6,220,242,0,0,112,0,61,127,1,0,111,223,1,0,
 68,6,255,240,128,7,33,0,38,134,16,0,194,58,7,120,
 207,129,48,23,1,0,38,94,16,0,34,23,105,0,203,57,
 2,22,16,0,34,95,0,0,39,55,1,0,11,96,204,49,
-8,56,34,111,5,0,63,6,126,242,0,0,109,0,1,82,
+8,56,34,111,5,0,63,6,34,243,0,0,109,0,1,82,
 64,6,63,0,128,7,33,0,38,143,108,0,241,57,194,5,
 191,255,240,237,165,5,0,82,64,6,63,0,130,7,225,112,
 7,224,60,23,1,0,6,232,34,71,9,0,34,79,13,0,
-61,55,81,0,3,130,99,135,1,0,128,255,56,123,10,200,
+61,55,81,0,3,130,99,135,1,0,128,255,190,124,10,200,
 229,87,64,0,224,7,96,1,10,248,61,223,93,0,61,215,
 89,0,255,47,32,0,60,23,1,0,34,95,13,0,34,87,
 9,0,251,89,251,21,177,5,250,81,201,21,29,48,128,255,
@@ -20571,148 +20707,148 @@ unsigned char tw_fw_code[] __initdata = 
 28,56,25,64,194,5,191,255,156,238,149,13,191,255,170,230,
 229,5,29,48,28,56,25,64,191,255,78,244,66,6,255,112,
 130,7,225,0,7,232,61,62,4,0,8,48,3,64,191,255,
-26,53,61,55,5,0,0,82,6,16,194,207,6,0,178,5,
+118,52,61,55,5,0,0,82,6,16,194,207,6,0,178,5,
 1,82,213,5,34,23,13,0,224,17,138,253,0,226,224,81,
 162,29,128,255,112,1,10,224,224,225,210,21,61,55,5,0,
-1,58,191,255,84,55,61,55,1,0,38,55,1,0,32,62,
-160,1,128,255,160,75,61,55,1,0,38,55,1,0,31,58,
-128,255,92,75,28,80,66,6,255,0,38,143,4,0,100,138,
+1,58,191,255,176,54,61,55,1,0,38,55,1,0,32,62,
+160,1,128,255,208,76,61,55,1,0,38,55,1,0,31,58,
+128,255,140,76,28,80,66,6,255,0,38,143,4,0,100,138,
 231,87,0,0,127,0,128,7,225,0,6,232,7,224,224,233,
-194,53,49,6,0,84,133,0,61,63,81,0,125,143,105,0,
-224,57,194,5,29,48,128,255,236,121,61,55,85,0,224,49,
-178,5,191,255,122,155,61,23,105,0,63,6,226,243,0,0,
+194,53,49,6,136,95,133,0,61,63,81,0,125,143,105,0,
+224,57,194,5,29,48,128,255,114,123,61,55,85,0,224,49,
+178,5,191,255,122,155,61,23,105,0,63,6,134,244,0,0,
 2,22,104,1,34,87,0,0,34,135,5,0,221,81,10,48,
-112,0,29,63,0,0,29,71,1,0,38,6,60,144,132,0,
-191,255,64,47,45,6,48,72,133,0,125,111,105,0,129,226,
-201,5,29,48,191,255,96,144,64,6,255,0,128,7,128,7,
-33,0,38,23,105,0,63,6,44,244,0,0,72,18,34,87,
+112,0,29,63,0,0,29,71,1,0,38,6,28,155,132,0,
+191,255,156,46,45,6,184,83,133,0,125,111,105,0,129,226,
+201,5,29,48,191,255,6,67,64,6,255,0,128,7,128,7,
+33,0,38,23,105,0,63,6,208,244,0,0,72,18,34,87,
 0,0,34,135,5,0,198,81,10,48,112,0,64,6,63,0,
-128,7,33,0,38,23,105,0,63,6,80,244,0,0,2,22,
+128,7,33,0,38,23,105,0,63,6,244,244,0,0,2,22,
 16,0,34,87,0,0,34,135,5,0,198,81,10,48,112,0,
-64,6,63,0,128,7,33,0,38,23,105,0,63,6,116,244,
+64,6,63,0,128,7,33,0,38,23,105,0,63,6,24,245,
 0,0,2,22,16,0,34,87,0,0,34,135,5,0,198,81,
 10,48,112,0,64,6,63,0,1,82,127,0,128,7,33,0,
-38,23,105,0,63,6,156,244,0,0,2,22,208,0,34,87,
+38,23,105,0,63,6,64,245,0,0,2,22,208,0,34,87,
 0,0,34,135,5,0,198,81,10,48,112,0,64,6,63,0,
 0,82,127,0,0,82,127,0,1,82,127,0,1,82,127,0,
 38,87,108,0,127,0,38,87,8,0,127,0,38,87,14,0,
-127,0,33,6,72,11,128,0,97,0,33,6,128,84,130,0,
-97,0,33,6,138,146,129,0,97,0,33,6,12,147,129,0,
+127,0,33,6,72,11,128,0,97,0,33,6,36,93,130,0,
+97,0,33,6,40,155,129,0,97,0,33,6,170,155,129,0,
 97,0,128,7,225,0,6,232,7,224,224,233,226,13,47,6,
-96,75,133,0,125,127,105,0,0,58,191,255,250,153,129,226,
-201,5,29,48,191,255,96,143,64,6,255,0,128,7,33,0,
+232,86,133,0,125,127,105,0,0,58,191,255,250,153,129,226,
+201,5,29,48,191,255,6,66,64,6,255,0,128,7,33,0,
 38,71,125,0,128,255,100,5,64,6,63,0,128,7,33,0,
 2,66,128,255,86,5,64,6,63,0,130,7,225,48,7,232,
-6,216,38,6,100,144,132,0,191,255,248,45,61,95,13,0,
+6,216,38,6,68,155,132,0,191,255,84,45,61,95,13,0,
 61,87,9,0,61,103,18,0,202,22,31,0,202,29,204,134,
 31,0,154,29,221,223,22,0,178,5,10,58,165,5,7,58,
 59,55,108,0,59,23,113,0,10,224,220,17,125,23,9,0,
-125,7,13,0,29,64,191,255,166,21,125,231,9,0,125,7,
-13,0,133,69,61,215,1,0,128,255,70,74,106,215,9,0,
-10,224,106,7,29,0,47,6,174,65,1,0,106,7,33,0,
+125,7,13,0,29,64,191,255,2,21,125,231,9,0,125,7,
+13,0,133,69,61,215,1,0,128,255,118,75,106,215,9,0,
+10,224,106,7,29,0,47,6,130,67,1,0,106,7,33,0,
 29,56,106,7,37,0,3,64,59,23,105,0,106,127,5,0,
 2,22,40,0,34,87,0,0,125,231,1,0,219,81,10,48,
-34,119,5,0,63,6,204,245,0,0,110,0,124,87,33,0,
+34,119,5,0,63,6,112,246,0,0,110,0,124,87,33,0,
 125,215,1,0,35,239,1,0,229,87,64,0,224,7,96,1,
 60,255,0,0,221,249,124,255,0,0,10,232,253,47,32,0,
-224,249,138,13,28,48,60,111,5,0,63,6,2,246,0,0,
+224,249,138,13,28,48,60,111,5,0,63,6,166,246,0,0,
 109,0,66,6,255,48,156,7,225,243,7,224,6,216,99,71,
-5,0,38,6,136,144,132,0,191,255,24,45,60,87,18,0,
+5,0,38,6,104,155,132,0,191,255,116,44,60,87,18,0,
 60,23,9,0,10,120,194,121,15,94,255,255,194,206,31,0,
 202,13,202,118,31,0,154,13,27,48,35,71,5,0,28,56,
-191,255,22,144,128,7,162,1,133,18,11,80,133,82,10,104,
+191,255,18,144,128,7,162,1,133,18,11,80,133,82,10,104,
 162,105,13,214,1,0,197,210,59,191,113,0,197,18,23,192,
 194,193,11,118,1,0,206,118,31,0,35,238,8,0,125,7,
 13,0,125,7,1,0,125,7,5,0,32,182,32,0,99,239,
 33,0,197,82,202,185,12,82,60,95,1,0,99,87,53,0,
 99,95,29,0,174,177,220,151,22,0,252,135,23,0,99,135,
-50,0,32,54,64,0,3,56,31,66,191,255,12,50,35,55,
-1,0,29,64,0,58,32,78,64,0,191,255,54,50,97,82,
-146,13,38,6,120,144,132,0,32,62,15,1,0,66,191,255,
-236,35,0,234,32,126,32,0,99,127,46,0,224,201,135,21,
+50,0,32,54,64,0,3,56,31,66,191,255,104,49,35,55,
+1,0,29,64,0,58,32,78,64,0,191,255,146,49,97,82,
+146,13,38,6,88,155,132,0,32,62,15,1,0,66,191,255,
+72,35,0,234,32,126,32,0,99,127,46,0,224,201,135,21,
 99,7,41,0,99,199,37,0,99,7,44,0,59,55,108,0,
-59,63,125,0,35,70,28,0,191,255,36,20,1,234,224,177,
+59,63,125,0,35,70,28,0,191,255,128,19,1,234,224,177,
 167,21,32,110,32,0,99,7,41,0,99,191,37,0,99,111,
 44,0,59,55,108,0,59,63,125,0,35,70,28,0,191,255,
-254,19,65,234,35,143,5,0,113,239,1,0,35,151,29,0,
-99,151,5,0,59,191,108,0,191,255,0,36,10,232,125,7,
+90,19,65,234,35,143,5,0,113,239,1,0,35,151,29,0,
+99,151,5,0,59,191,108,0,191,255,92,35,10,232,125,7,
 32,0,35,151,5,0,3,90,125,151,1,0,125,191,26,0,
 125,239,9,0,1,82,125,87,24,0,125,7,13,0,35,135,
 1,0,125,7,21,0,125,135,17,0,93,95,34,0,11,122,
 99,215,46,0,99,7,41,0,99,199,37,0,99,127,53,0,
 220,223,22,0,178,5,10,50,165,5,7,50,29,64,35,62,
-28,0,191,255,90,22,224,201,167,13,99,7,44,0,99,207,
-46,0,29,56,35,54,28,0,191,255,178,22,28,48,29,56,
-191,255,170,22,60,119,18,0,217,113,174,209,99,215,46,0,
+28,0,191,255,182,21,224,201,167,13,99,7,44,0,99,207,
+46,0,29,56,35,54,28,0,191,255,14,22,28,48,29,56,
+191,255,6,22,60,119,18,0,217,113,174,209,99,215,46,0,
 250,0,224,209,183,13,32,86,64,0,182,81,99,87,44,0,
-29,56,35,54,28,0,191,255,132,22,59,55,125,0,29,56,
-191,255,228,19,29,80,92,6,255,243,158,7,225,243,7,224,
-6,192,99,71,9,0,38,6,204,144,132,0,191,255,52,43,
+29,56,35,54,28,0,191,255,224,21,59,55,125,0,29,56,
+191,255,64,19,29,80,92,6,255,243,158,7,225,243,7,224,
+6,192,99,71,9,0,38,6,172,155,132,0,191,255,144,42,
 60,95,9,0,60,23,18,0,203,206,31,0,203,17,95,18,
 133,18,11,80,133,82,170,17,2,222,1,0,197,218,56,183,
 113,0,197,82,202,177,35,214,40,0,32,54,32,0,3,56,
-31,66,191,255,132,48,35,55,1,0,26,64,0,58,32,78,
-32,0,191,255,174,48,97,82,146,13,38,6,164,144,132,0,
-32,62,223,1,0,66,191,255,100,34,99,223,30,0,99,183,
+31,66,191,255,224,47,35,55,1,0,26,64,0,58,32,78,
+32,0,191,255,10,48,97,82,146,13,38,6,132,155,132,0,
+32,62,223,1,0,66,191,255,192,33,99,223,30,0,99,183,
 21,0,99,7,25,0,12,82,122,7,1,0,122,7,5,0,
 122,7,13,0,99,215,17,0,99,7,28,0,99,87,37,0,
 220,151,22,0,252,135,23,0,99,135,34,0,56,151,108,0,
-60,191,1,0,99,151,5,0,99,191,13,0,191,255,156,34,
+60,191,1,0,99,151,5,0,99,191,13,0,191,255,248,33,
 106,7,32,0,3,114,74,119,34,0,106,191,1,0,35,151,
 5,0,106,7,21,0,106,151,26,0,106,87,9,0,1,106,
 106,111,24,0,106,7,13,0,106,7,17,0,10,232,56,55,
-125,0,29,64,35,62,12,0,191,255,20,21,224,201,135,13,
-99,207,30,0,29,56,35,54,12,0,191,255,112,21,13,98,
+125,0,29,64,35,62,12,0,191,255,112,20,224,201,135,13,
+99,207,30,0,29,56,35,54,12,0,191,255,204,20,13,98,
 60,95,18,0,35,151,9,0,99,95,30,0,99,103,37,0,
 60,87,16,0,99,151,17,0,99,87,28,0,29,56,35,54,
-12,0,191,255,72,21,99,215,17,0,12,130,60,127,18,0,
+12,0,191,255,164,20,99,215,17,0,12,130,60,127,18,0,
 99,135,37,0,217,121,27,96,175,97,99,103,30,0,99,127,
 28,0,236,0,224,97,231,5,29,56,35,54,12,0,191,255,
-28,21,56,55,125,0,29,56,191,255,124,18,29,48,128,255,
-30,104,38,6,180,144,132,0,191,255,216,41,56,151,108,0,
-99,151,5,0,35,191,13,0,191,255,208,33,10,232,35,127,
+120,20,56,55,125,0,29,56,191,255,216,17,29,48,128,255,
+38,105,38,6,148,155,132,0,191,255,52,41,56,151,108,0,
+99,151,5,0,35,191,13,0,191,255,44,33,10,232,35,127,
 1,0,125,7,32,0,125,127,17,0,3,82,35,151,5,0,
 93,87,34,0,125,151,26,0,125,239,9,0,1,130,125,135,
 24,0,125,7,13,0,125,7,21,0,125,191,1,0,99,223,
 30,0,99,7,25,0,99,183,21,0,220,223,22,0,178,5,
-10,50,165,5,7,50,29,64,35,62,12,0,191,255,48,20,
+10,50,165,5,7,50,29,64,35,62,12,0,191,255,140,19,
 224,201,215,13,99,207,30,0,11,114,99,119,37,0,99,7,
-28,0,29,56,35,54,12,0,191,255,130,20,28,48,29,56,
-191,255,122,20,99,215,17,0,11,106,60,103,18,0,99,111,
+28,0,29,56,35,54,12,0,191,255,222,19,28,48,29,56,
+191,255,214,19,99,215,17,0,11,106,60,103,18,0,99,111,
 37,0,217,97,172,217,99,223,30,0,99,103,28,0,251,0,
-224,217,231,5,29,56,35,54,12,0,191,255,80,20,56,55,
-125,0,29,56,191,255,176,17,29,80,94,6,255,243,128,7,
-97,0,6,232,29,63,1,0,61,71,108,0,38,6,236,144,
-132,0,191,255,254,40,61,63,117,0,38,6,252,144,132,0,
-191,255,240,40,64,6,127,0,130,7,97,0,6,232,3,48,
-191,255,74,140,195,199,0,0,210,5,195,63,0,0,195,55,
+224,217,231,5,29,56,35,54,12,0,191,255,172,19,56,55,
+125,0,29,56,191,255,12,17,29,80,94,6,255,243,128,7,
+97,0,6,232,29,63,1,0,61,71,108,0,38,6,204,155,
+132,0,191,255,90,40,61,63,117,0,38,6,220,155,132,0,
+191,255,76,40,64,6,127,0,130,7,97,0,6,232,3,48,
+191,255,70,140,195,199,0,0,210,5,195,63,0,0,195,55,
 0,0,35,127,0,0,125,127,0,0,35,119,2,0,125,119,
 2,0,29,80,66,6,127,0,152,7,225,241,7,216,8,184,
-6,192,38,6,8,145,132,0,191,255,168,40,59,95,9,0,
+6,192,38,6,232,155,132,0,191,255,4,40,59,95,9,0,
 59,23,18,0,11,80,203,17,95,18,133,18,133,82,170,17,
 2,238,1,0,56,23,113,0,197,82,202,17,12,82,99,87,
 45,0,3,224,99,7,33,0,99,7,36,0,197,234,99,239,
 38,0,99,23,29,0,99,231,25,0,219,151,22,0,251,135,
 23,0,99,135,42,0,203,206,31,0,59,215,1,0,56,199,
-108,0,99,215,21,0,191,255,82,32,106,7,32,0,3,114,
+108,0,99,215,21,0,191,255,174,31,106,7,32,0,3,114,
 74,119,34,0,106,199,26,0,106,87,9,0,1,106,106,111,
 24,0,106,7,13,0,106,7,17,0,106,7,21,0,106,215,
-1,0,23,48,10,208,26,64,35,62,20,0,191,255,208,18,
+1,0,23,48,10,208,26,64,35,62,20,0,191,255,44,18,
 124,7,9,0,124,7,13,0,124,7,1,0,124,7,5,0,
 25,96,201,98,124,103,17,0,224,201,130,13,99,207,38,0,
-26,56,35,54,20,0,191,255,20,19,27,48,26,56,191,255,
-12,19,59,95,18,0,217,89,171,233,99,239,38,0,99,95,
+26,56,35,54,20,0,191,255,112,18,27,48,26,56,191,255,
+104,18,59,95,18,0,217,89,171,233,99,239,38,0,99,95,
 36,0,253,0,29,104,201,106,124,111,17,0,224,233,231,5,
-26,56,35,54,20,0,191,255,228,18,23,48,26,56,191,255,
-70,16,26,48,128,255,232,101,88,6,255,241,130,7,33,0,
-35,23,9,0,99,23,1,0,191,255,108,142,66,6,63,0,
+26,56,35,54,20,0,191,255,64,18,23,48,26,56,191,255,
+162,15,26,48,128,255,240,102,88,6,255,241,130,7,33,0,
+35,23,9,0,99,23,1,0,191,255,104,142,66,6,63,0,
 128,7,225,0,6,232,29,143,7,0,0,226,17,6,225,255,
 202,5,31,130,93,135,7,0,61,23,108,0,224,17,198,5,
 2,6,240,255,134,13,93,7,7,0,31,106,125,111,117,0,
 0,82,229,29,29,71,7,0,127,66,194,5,119,66,226,5,
 165,13,1,226,125,231,125,0,165,21,2,90,125,95,125,0,
-1,226,213,13,38,6,28,145,132,0,32,62,153,3,191,255,
-188,30,93,7,7,0,31,82,125,87,117,0,28,80,64,6,
+1,226,213,13,38,6,252,155,132,0,32,62,153,3,191,255,
+24,30,93,7,7,0,31,82,125,87,117,0,28,80,64,6,
 255,0,128,7,225,16,167,0,6,232,7,224,191,255,226,142,
 10,216,224,217,234,29,127,226,202,29,29,119,7,0,119,114,
 138,29,61,87,89,0,61,111,101,0,61,95,93,0,61,103,
@@ -20722,9 +20858,9 @@ unsigned char tw_fw_code[] __initdata = 
 38,111,113,0,34,119,1,0,32,94,33,0,173,113,14,80,
 235,87,194,2,170,113,98,119,1,0,0,72,225,127,0,0,
 175,73,98,79,5,0,2,82,165,5,0,82,127,0,128,7,
-33,0,38,23,105,0,63,6,190,252,0,0,2,22,16,0,
+33,0,38,23,105,0,63,6,98,253,0,0,2,22,16,0,
 34,87,0,0,34,135,5,0,198,81,10,48,112,0,64,6,
-63,0,128,7,33,0,38,23,105,0,63,6,226,252,0,0,
+63,0,128,7,33,0,38,23,105,0,63,6,134,253,0,0,
 2,22,16,0,34,87,0,0,34,135,5,0,198,81,10,48,
 112,0,64,6,63,0,0,82,127,0,32,86,34,1,127,0,
 0,82,127,0,0,82,127,0,0,82,127,0,0,82,127,0,
@@ -20732,15 +20868,15 @@ unsigned char tw_fw_code[] __initdata = 
 226,87,0,0,127,0,1,82,127,0,32,86,34,1,127,0,
 32,86,34,1,127,0,0,82,127,0,32,86,34,1,127,0,
 32,86,35,1,127,0,32,86,35,1,127,0,31,82,127,0,
-127,0,128,7,33,0,38,23,105,0,63,6,98,253,0,0,
+127,0,128,7,33,0,38,23,105,0,63,6,6,254,0,0,
 2,22,200,0,34,87,0,0,34,135,5,0,198,81,10,48,
 112,0,64,6,63,0,32,86,255,127,127,0,32,86,255,127,
 127,0,127,0,1,82,127,0,128,7,225,0,6,232,7,224,
-224,233,226,13,49,6,48,87,133,0,125,143,105,0,0,58,
-191,255,124,184,129,226,201,5,29,48,191,255,202,134,64,6,
+224,233,226,13,49,6,184,98,133,0,125,143,105,0,0,58,
+191,255,124,184,129,226,201,5,29,48,191,255,112,57,64,6,
 255,0,128,7,97,0,6,232,224,233,138,13,32,54,160,8,
-191,255,196,134,10,232,224,233,162,37,29,48,191,255,224,108,
-48,6,48,87,133,0,125,135,105,0,0,82,61,22,140,0,
+191,255,192,134,10,232,224,233,162,37,29,48,191,255,228,108,
+48,6,184,98,133,0,125,135,105,0,0,82,61,22,140,0,
 98,7,0,0,98,7,6,0,98,7,2,0,65,82,72,18,
 10,6,0,255,230,245,125,7,141,8,29,48,125,7,145,8,
 32,62,176,4,32,70,0,3,128,255,106,1,29,80,64,6,
@@ -20748,8 +20884,8 @@ unsigned char tw_fw_code[] __initdata = 
 218,5,191,255,216,161,128,7,72,1,59,63,13,0,59,55,
 9,0,61,71,149,8,0,74,191,255,44,145,10,48,61,71,
 153,8,11,56,8,72,191,74,191,255,42,185,10,200,25,6,
-0,255,150,13,38,6,44,145,132,0,32,62,132,0,0,66,
-191,255,106,28,25,248,195,250,61,22,140,0,223,17,34,87,
+0,255,150,13,38,6,12,156,132,0,32,62,132,0,0,66,
+191,255,198,27,25,248,195,250,61,22,140,0,223,17,34,87,
 0,0,61,22,140,0,223,17,34,111,2,0,34,95,4,0,
 34,103,6,0,61,23,141,8,61,119,145,8,173,81,174,17,
 224,17,186,5,12,224,245,5,224,17,206,5,128,17,0,226,
@@ -20761,11 +20897,11 @@ unsigned char tw_fw_code[] __initdata = 
 2,88,202,89,43,87,0,0,216,81,10,6,1,128,206,13,
 61,94,140,0,223,89,203,17,98,87,0,0,61,22,140,0,
 194,249,127,231,6,0,247,47,32,0,59,191,1,0,29,56,
-23,48,25,64,28,72,99,199,1,0,128,255,70,63,61,110,
+23,48,25,64,28,72,99,199,1,0,128,255,118,64,61,110,
 16,0,218,105,45,23,1,0,1,114,34,23,105,0,10,120,
 111,119,0,0,72,18,123,87,1,0,34,95,0,0,61,86,
 16,0,218,81,42,55,1,0,11,96,204,49,27,56,34,87,
-5,0,63,6,90,255,0,0,106,0,123,191,1,0,66,6,
+5,0,63,6,254,255,0,0,106,0,123,191,1,0,66,6,
 255,241,199,0,200,0,7,16,232,23,32,2,2,120,191,122,
 150,122,207,17,170,18,7,112,162,113,195,114,14,136,191,138,
 152,138,209,113,168,114,7,80,195,82,0,90,38,102,140,0,
@@ -20775,581 +20911,600 @@ unsigned char tw_fw_code[] __initdata = 
 127,0,128,7,97,0,6,232,191,255,174,177,29,23,7,0,
 127,18,178,5,123,18,218,5,1,138,125,143,157,8,181,5,
 125,7,157,8,64,6,127,0,130,7,225,48,167,0,6,232,
-7,224,8,216,9,208,191,255,40,129,10,6,224,254,202,13,
+7,224,8,216,9,208,191,255,44,129,10,6,224,254,202,13,
 224,225,170,13,29,23,7,0,127,18,178,5,123,18,154,21,
 125,7,157,8,229,13,97,226,202,13,29,56,27,64,3,48,
-191,255,234,110,195,199,0,0,194,5,1,90,125,95,157,8,
+191,255,238,110,195,199,0,0,194,5,1,90,125,95,157,8,
 29,48,28,56,27,64,26,72,191,255,176,176,66,6,255,48,
 130,7,225,240,35,23,33,0,99,23,1,0,6,200,191,255,
 234,173,10,192,224,193,210,61,57,23,105,0,2,226,2,22,
 24,0,34,87,0,0,0,234,217,81,10,48,34,135,5,0,
-63,6,120,0,1,0,112,0,10,208,11,216,1,18,251,233,
+63,6,28,1,1,0,112,0,10,208,11,216,1,18,251,233,
 193,5,203,13,250,225,171,13,193,234,28,88,159,90,11,233,
 193,226,65,18,2,6,192,255,182,245,69,18,2,6,200,255,
 182,5,32,22,55,0,121,23,153,8,2,70,8,0,8,72,
 191,74,1,50,0,58,191,255,180,182,10,48,11,56,26,70,
-0,4,225,79,0,0,219,73,191,255,188,131,121,87,149,8,
+0,4,225,79,0,0,219,73,191,255,184,131,121,87,149,8,
 24,80,66,6,255,240,128,7,33,0,38,23,105,0,63,6,
-246,0,1,0,2,22,16,0,34,87,0,0,34,135,5,0,
+154,1,1,0,2,22,16,0,34,87,0,0,34,135,5,0,
 198,81,10,48,112,0,64,6,63,0,128,7,33,0,38,23,
-105,0,63,6,24,1,1,0,72,18,34,87,0,0,34,135,
+105,0,63,6,188,1,1,0,72,18,34,87,0,0,34,135,
 5,0,198,81,10,48,112,0,64,6,63,0,128,7,33,0,
-38,23,105,0,63,6,60,1,1,0,2,22,16,0,34,87,
+38,23,105,0,63,6,224,1,1,0,2,22,16,0,34,87,
 0,0,34,135,5,0,198,81,10,48,112,0,64,6,63,0,
-128,7,33,0,38,23,105,0,63,6,96,1,1,0,2,22,
+128,7,33,0,38,23,105,0,63,6,4,2,1,0,2,22,
 16,0,34,87,0,0,34,135,5,0,198,81,10,48,112,0,
 64,6,63,0,1,82,127,0,128,7,33,0,38,23,105,0,
-63,6,136,1,1,0,2,22,208,0,34,87,0,0,34,135,
+63,6,44,2,1,0,2,22,208,0,34,87,0,0,34,135,
 5,0,198,81,10,48,112,0,64,6,63,0,0,82,127,0,
 0,82,127,0,6,135,7,0,16,6,17,0,234,87,0,0,
 127,0,38,135,108,0,224,129,226,87,0,0,127,0,128,7,
-33,0,64,22,141,0,34,54,204,30,100,55,165,139,0,58,
-32,70,0,96,191,255,100,33,36,23,165,139,0,82,2,88,
+33,0,64,22,141,0,34,54,44,42,100,55,177,139,0,58,
+32,70,0,96,191,255,192,32,36,23,177,139,0,82,2,88,
 2,22,16,0,107,23,5,0,65,82,10,6,0,250,134,253,
-107,7,5,0,64,6,63,0,102,7,9,0,102,7,13,0,
+107,7,5,0,64,6,63,0,102,7,13,0,102,7,17,0,
 127,0,128,7,193,16,6,224,7,216,229,87,64,0,224,7,
-96,1,36,143,165,139,10,232,123,143,5,0,60,135,13,0,
-100,223,165,139,95,130,124,135,13,0,253,47,32,0,64,6,
+96,1,36,143,177,139,10,232,123,143,5,0,60,135,17,0,
+100,223,177,139,95,130,124,135,17,0,253,47,32,0,64,6,
 223,16,128,7,225,48,6,216,59,23,5,0,224,17,202,5,
-59,63,1,0,165,5,2,56,224,57,186,5,128,7,132,1,
-7,16,165,5,10,16,34,87,13,0,224,81,202,253,34,111,
-9,0,59,135,1,0,2,56,240,57,154,21,13,80,123,87,
-1,0,224,81,162,37,106,7,5,0,59,87,1,0,165,5,
-11,80,42,95,13,0,224,89,202,253,245,21,34,119,5,0,
-110,111,13,0,34,87,9,0,34,95,5,0,224,81,194,13,
-106,95,5,0,34,87,9,0,165,5,11,80,42,95,13,0,
-224,89,202,253,165,5,11,80,123,87,5,0,34,87,1,0,
-123,87,9,0,34,23,1,0,34,135,33,0,27,48,208,255,
-42,0,194,125,34,87,1,0,34,95,5,0,226,231,9,0,
-202,225,225,239,0,0,203,233,191,255,26,255,59,23,5,0,
-165,5,10,16,34,87,13,0,224,81,202,253,2,208,165,93,
-59,127,1,0,58,23,9,0,239,209,186,21,123,23,1,0,
-224,17,210,13,98,7,5,0,59,23,1,0,165,5,10,16,
-34,87,13,0,224,81,202,253,2,88,133,29,2,88,229,21,
-58,111,5,0,109,23,13,0,58,23,9,0,58,95,5,0,
-224,17,194,13,98,95,5,0,58,23,9,0,165,5,10,16,
-34,87,13,0,224,81,202,253,2,88,58,55,1,0,123,95,
-5,0,230,87,9,0,38,103,1,0,38,95,5,0,204,81,
-225,135,0,0,208,89,188,81,225,135,0,0,176,89,189,89,
-186,5,234,1,130,13,59,135,9,0,240,127,9,0,207,81,
-112,87,8,0,128,255,76,105,27,48,26,56,191,255,102,254,
-59,23,5,0,165,5,10,16,34,87,13,0,224,81,202,253,
-2,208,58,23,1,0,34,95,5,0,34,87,1,0,253,89,
-129,165,187,5,252,81,209,157,229,5,191,255,56,254,181,5,
-123,7,9,0,59,87,9,0,64,6,255,48,128,7,97,0,
-102,63,49,0,102,7,45,0,102,7,37,0,102,7,41,0,
-6,232,191,255,6,254,29,54,16,0,191,255,254,253,125,7,
-33,0,64,6,127,0,128,7,193,48,38,23,41,0,7,208,
-2,232,196,234,38,119,49,0,198,233,224,113,178,21,38,111,
-45,0,36,95,33,175,237,89,211,13,65,18,194,238,1,0,
-102,239,41,0,38,87,49,0,196,234,198,233,203,81,102,87,
-45,0,229,87,64,0,224,7,96,1,10,216,149,13,229,87,
-64,0,224,135,96,1,229,87,64,0,224,7,96,1,36,135,
-165,139,224,129,210,245,36,231,165,139,61,103,13,0,36,119,
-165,139,65,98,46,119,5,0,125,103,13,0,124,7,13,0,
-124,7,9,0,100,119,165,139,251,47,32,0,28,16,61,87,
-1,0,124,215,1,0,224,81,138,13,124,7,5,0,125,23,
-5,0,125,23,1,0,133,69,34,95,1,0,43,111,5,0,
-43,103,1,0,42,95,1,0,43,127,5,0,43,119,1,0,
-239,105,203,5,241,13,238,97,209,13,42,95,9,0,224,89,
-178,5,11,80,165,21,98,87,5,0,106,23,9,0,0,82,
-197,13,42,95,13,0,224,89,178,5,11,80,229,5,98,87,
-5,0,106,23,13,0,0,82,224,81,250,213,34,103,1,0,
-61,119,5,0,44,95,5,0,46,119,1,0,44,87,1,0,
-46,111,5,0,46,103,1,0,237,89,193,5,219,5,236,81,
-185,5,125,23,5,0,36,87,165,139,224,81,226,87,0,0,
-64,6,223,48,128,7,97,0,6,232,61,143,33,0,224,137,
-138,29,29,86,16,0,61,119,13,0,42,127,13,0,239,113,
-231,23,0,0,125,23,37,0,196,18,2,80,221,81,42,103,
-13,0,224,97,186,5,0,82,197,37,221,17,125,23,33,0,
-61,55,33,0,191,255,190,252,10,88,224,89,154,29,61,87,
-37,0,65,82,202,22,1,0,125,23,37,0,196,18,2,80,
-221,81,42,127,13,0,224,121,146,13,221,17,125,23,33,0,
-2,48,191,255,144,252,10,88,181,5,125,7,33,0,11,80,
-64,6,127,0,6,22,16,0,38,143,13,0,34,87,13,0,
-209,81,127,0,96,7,208,176,0,82,34,6,228,152,141,0,
-2,134,76,0,98,23,145,0,98,135,73,0,65,82,2,22,
-76,0,10,6,25,252,214,245,47,6,148,40,1,0,34,6,
-228,152,141,0,2,80,207,81,34,119,73,0,64,7,221,176,
-64,7,220,176,100,119,161,139,100,23,157,139,100,7,153,139,
-98,87,69,0,106,23,73,0,96,7,201,176,96,7,205,176,
-96,7,193,176,96,7,197,176,36,111,141,140,224,105,186,5,
-68,7,152,140,127,0,132,7,225,241,7,224,8,248,36,135,
-33,175,6,232,125,135,13,0,64,86,0,0,42,87,80,245,
-125,87,16,0,156,23,1,0,194,22,31,0,2,6,240,255,
-178,5,128,7,86,2,156,199,9,0,252,103,3,0,188,119,
-1,0,14,16,0,122,2,6,240,255,177,13,226,22,40,0,
-32,94,160,180,203,17,34,87,17,0,224,81,162,5,2,120,
-125,127,61,0,14,128,208,130,12,112,208,113,96,119,209,176,
-0,218,12,80,10,6,0,255,246,5,32,102,6,1,100,103,
-192,139,0,18,133,37,234,22,40,0,48,6,232,193,142,0,
-208,17,34,95,24,0,203,126,0,128,242,5,32,118,7,1,
-100,119,192,139,0,18,245,13,139,110,0,128,98,111,24,0,
-98,239,29,0,36,111,177,139,36,103,173,139,98,111,37,0,
-98,103,33,0,127,23,1,0,224,17,125,23,57,0,170,13,
-36,223,192,139,10,48,10,64,39,6,68,231,132,0,191,255,
-164,91,27,200,224,201,178,5,128,7,154,1,252,127,7,0,
-96,127,213,176,188,87,5,0,60,134,8,0,208,81,96,87,
-217,176,216,22,15,0,104,18,202,5,32,22,14,37,133,13,
-106,18,202,5,32,22,5,37,181,5,32,22,2,37,125,23,
-65,0,24,16,2,6,209,255,193,13,104,18,130,101,106,18,
-226,93,2,6,216,255,242,29,2,6,214,255,218,101,181,29,
-2,6,113,255,177,13,2,6,209,255,210,21,2,6,120,255,
-226,37,2,6,118,255,178,37,245,85,2,6,113,255,242,29,
-2,6,88,255,162,53,2,6,86,255,242,45,2,6,81,255,
-194,45,165,77,60,22,8,0,162,119,1,0,93,119,11,0,
-34,54,2,0,130,95,9,0,162,111,7,0,200,106,11,224,
-205,225,128,255,242,203,10,208,0,218,229,109,60,198,8,0,
-184,87,1,0,93,87,11,0,56,54,10,0,128,255,216,203,
-10,224,56,54,2,0,128,255,206,203,10,216,56,54,6,0,
-128,255,196,203,10,208,133,93,60,222,8,0,187,127,1,0,
-93,127,11,0,59,54,6,0,128,255,172,203,10,224,59,54,
-2,0,128,255,162,203,10,208,0,218,229,69,60,54,8,0,
-134,231,5,0,128,255,144,203,34,6,255,255,31,0,66,81,
-10,208,0,218,149,61,28,16,0,82,43,6,200,152,141,0,
-68,18,34,119,253,255,107,119,1,0,65,82,68,90,103,82,
-134,253,0,210,0,218,0,226,32,206,1,1,34,6,116,114,
-133,0,0,82,36,95,149,139,133,21,130,111,1,0,237,193,
-154,13,34,103,5,0,34,95,9,0,125,103,65,0,0,202,
-245,5,2,22,32,0,65,82,10,6,232,255,249,237,100,95,
-149,139,224,201,146,13,224,55,209,176,24,64,39,6,44,231,
-132,0,191,255,16,90,125,215,1,0,125,223,5,0,125,231,
-8,0,25,224,128,7,226,1,2,208,28,23,3,0,0,106,
-194,22,15,0,2,80,10,6,240,255,177,13,234,86,40,0,
-32,102,160,180,204,81,42,95,17,0,224,89,162,5,10,104,
-125,111,61,0,208,18,156,95,3,0,11,120,194,121,96,127,
-209,176,0,218,11,6,0,255,246,5,32,110,6,1,100,111,
-192,139,0,18,133,37,235,22,40,0,42,6,232,193,142,0,
-202,17,34,87,24,0,202,134,0,128,242,5,32,126,7,1,
-100,127,192,139,0,18,245,13,138,118,0,128,98,119,24,0,
-98,239,29,0,36,111,177,139,36,103,173,139,98,111,37,0,
-98,103,33,0,127,23,1,0,224,17,125,23,57,0,170,13,
-36,223,192,139,11,48,11,64,39,6,84,231,132,0,191,255,
-84,89,224,217,194,5,27,16,128,7,44,1,252,191,7,0,
-156,95,1,0,216,90,157,90,67,95,7,0,8,18,11,80,
-194,82,220,81,132,127,153,140,97,122,170,5,12,18,2,104,
-0,18,224,89,242,5,188,23,1,0,171,17,130,106,237,23,
-194,2,96,23,213,176,96,87,217,176,224,89,162,13,97,90,
-210,5,32,111,213,176,224,105,207,5,32,22,3,1,181,109,
-98,210,225,37,210,5,100,210,177,13,162,29,149,37,0,202,
-60,199,9,0,32,94,14,36,125,95,65,0,213,85,220,199,
-5,0,194,5,221,31,11,0,181,5,221,159,11,0,32,86,
-5,36,125,87,65,0,0,202,60,199,9,0,213,69,0,202,
-60,199,9,0,32,118,2,36,125,119,65,0,213,61,0,194,
-0,202,188,111,5,0,93,111,11,0,28,80,34,6,200,152,
-141,0,2,102,28,0,245,5,68,82,42,95,253,255,68,18,
-98,95,253,255,236,17,145,253,32,222,1,1,34,6,52,110,
-133,0,0,90,36,103,149,139,133,21,130,87,1,0,234,209,
-154,13,34,135,5,0,34,103,9,0,125,135,65,0,0,218,
-245,5,2,22,32,0,65,90,11,6,224,255,249,237,100,103,
-149,139,224,217,146,13,224,55,209,176,26,64,39,6,56,231,
-132,0,191,255,48,88,125,199,1,0,125,207,5,0,125,191,
-8,0,27,16,2,224,224,225,178,5,128,7,68,1,32,71,
-213,176,8,6,0,255,199,13,224,55,209,176,39,6,100,231,
-132,0,191,255,0,88,32,230,98,1,128,7,36,1,221,215,
-65,0,186,5,128,7,26,1,61,23,61,0,224,17,194,125,
-221,207,64,0,202,5,221,199,64,0,194,85,61,87,1,0,
-32,111,197,176,61,95,5,0,32,103,193,176,237,89,129,13,
-187,5,236,81,211,5,96,87,193,176,96,95,197,176,2,128,
-10,96,253,87,9,0,202,97,225,79,0,0,203,73,48,95,
-25,0,48,87,21,0,235,73,161,53,187,5,234,97,243,45,
-48,95,17,0,43,23,105,0,63,6,46,11,1,0,2,22,
-80,0,34,55,0,0,34,87,5,0,203,49,106,0,224,55,
-209,176,224,81,146,21,61,79,5,0,61,71,1,0,253,127,
-9,0,99,127,1,0,39,6,116,231,132,0,191,255,86,87,
-32,230,9,1,213,61,32,142,210,176,241,71,1,0,37,62,
-48,130,191,255,64,87,32,230,40,1,165,53,32,230,0,16,
-245,45,221,231,65,0,194,45,34,95,17,0,43,23,105,0,
-63,6,152,11,1,0,2,22,80,0,34,87,0,0,34,103,
-5,0,203,81,10,48,108,0,224,81,170,29,224,55,209,176,
-32,142,210,176,241,71,1,0,37,62,48,130,191,255,246,86,
-32,230,40,1,213,13,224,55,209,176,32,142,210,176,241,71,
-1,0,37,62,48,130,191,255,220,86,32,230,10,1,128,119,
-221,176,224,113,194,5,29,48,128,255,98,0,28,80,68,6,
-255,241,130,7,33,0,40,6,200,152,141,0,36,63,177,139,
-36,55,173,139,32,134,129,0,99,135,1,0,32,78,28,0,
-128,255,208,60,66,6,63,0,128,7,33,0,7,80,0,18,
-198,199,65,0,162,5,2,18,32,63,209,176,2,64,194,66,
-46,6,200,152,141,0,206,65,10,72,36,111,149,139,63,6,
-54,12,1,0,109,0,64,6,63,0,128,7,33,0,36,127,
-157,139,6,16,47,127,73,0,36,119,153,139,100,127,157,139,
-14,6,24,252,138,13,36,103,161,139,44,103,73,0,100,103,
-161,139,213,5,14,94,1,0,100,95,153,139,36,55,157,139,
-2,56,32,70,68,0,128,255,12,3,64,6,63,0,128,7,
-225,240,6,224,7,216,97,226,187,5,128,7,118,1,58,6,
-228,231,132,0,59,55,5,0,37,62,80,130,128,255,238,2,
-224,81,218,13,98,226,226,5,26,48,191,255,134,22,128,7,
-152,1,1,130,64,135,220,176,128,7,72,1,59,55,5,0,
-37,62,56,130,128,255,198,2,224,81,202,13,98,226,226,5,
-26,48,191,255,94,22,128,7,112,1,64,7,220,176,128,7,
-34,1,59,55,5,0,37,62,64,130,128,255,160,2,224,81,
-234,13,100,7,153,139,34,6,228,152,141,0,34,127,73,0,
-100,23,157,139,100,127,161,139,128,7,62,1,59,55,5,0,
-37,62,60,130,128,255,118,2,224,81,234,5,1,114,64,119,
-221,176,128,7,36,1,59,55,5,0,37,62,72,130,128,255,
-92,2,224,81,218,5,64,7,221,176,128,7,12,1,59,55,
-5,0,37,62,84,130,128,255,68,2,224,81,170,93,36,239,
-161,139,98,226,218,5,0,226,36,223,153,139,229,45,100,226,
-138,45,59,55,9,0,0,58,32,70,16,0,128,255,38,2,
-10,224,59,55,13,0,0,58,32,70,16,0,128,255,22,2,
-10,222,1,0,252,217,246,5,36,23,153,139,226,217,191,5,
-226,225,247,5,38,6,4,232,132,0,191,255,150,21,197,85,
-0,18,197,5,61,239,73,0,65,18,252,17,198,253,213,5,
-26,48,191,255,126,21,133,77,38,6,164,231,132,0,191,255,
-114,21,0,194,0,202,160,111,221,176,224,105,242,21,61,55,
-13,0,253,63,17,0,128,255,34,1,10,192,11,200,229,13,
-28,56,37,54,92,130,191,255,74,21,29,48,24,64,25,72,
-128,255,90,0,61,239,73,0,65,226,251,225,166,245,197,37,
-38,6,20,232,132,0,191,255,42,21,128,95,221,176,224,89,
-242,5,38,6,40,232,132,0,191,255,24,21,229,5,38,6,
-216,231,132,0,191,255,12,21,160,87,221,176,224,81,242,5,
-38,6,52,232,132,0,191,255,250,20,229,5,38,6,140,231,
-132,0,191,255,238,20,64,6,255,240,132,7,225,48,6,232,
-8,208,9,216,221,207,64,0,162,13,221,215,64,0,194,5,
-32,22,82,0,197,13,32,22,86,0,149,13,221,199,64,0,
-194,5,32,22,87,0,181,5,32,22,88,0,61,55,13,0,
-2,224,253,63,17,0,128,255,114,0,10,64,11,72,160,127,
-221,176,224,121,162,13,233,1,186,5,232,1,226,5,186,65,
-225,103,0,0,172,73,187,73,61,87,61,0,99,231,1,0,
-138,87,35,0,99,87,5,0,38,6,76,232,132,0,191,255,
-114,20,28,6,168,255,178,21,61,79,5,0,61,71,1,0,
-253,127,9,0,99,127,1,0,38,6,100,232,132,0,191,255,
-82,20,37,54,100,130,191,255,74,20,213,5,37,54,100,130,
-191,255,64,20,68,6,255,48,128,7,97,48,7,232,221,0,
-128,255,154,0,10,208,11,216,29,48,128,255,144,0,0,64,
-41,6,96,227,230,64,10,48,11,56,128,255,136,0,10,64,
-11,72,26,48,27,56,128,255,132,0,0,64,64,78,36,64,
-10,48,11,56,128,255,126,0,0,64,41,6,0,64,143,64,
-10,48,11,56,128,255,110,0,10,48,11,56,128,255,110,0,
-64,6,127,48,128,7,225,0,32,63,197,176,32,71,193,176,
-38,6,116,232,132,0,191,255,202,19,32,63,205,176,32,71,
-201,176,38,6,148,232,132,0,191,255,184,19,64,6,255,0,
-130,7,33,6,136,0,128,0,97,0,33,6,150,65,130,0,
-97,0,33,6,74,60,130,0,97,0,33,6,122,78,130,0,
-97,0,33,6,124,75,130,0,97,0,33,6,26,70,130,0,
-97,0,33,6,142,73,130,0,97,0,33,6,28,69,130,0,
-97,0,3,30,236,255,99,63,9,0,99,255,1,0,38,6,
-180,232,132,0,191,255,92,19,35,255,1,0,0,82,3,30,
-20,0,127,0,3,30,212,255,99,63,33,0,99,255,25,0,
-99,207,17,0,99,215,13,0,99,223,9,0,99,231,5,0,
-99,239,1,0,99,199,21,0,8,224,252,239,7,0,29,56,
-6,192,38,6,156,233,132,0,191,255,24,19,29,6,0,255,
-215,5,32,86,13,1,128,7,60,2,97,234,151,69,196,239,
-144,140,154,45,128,54,255,255,128,255,142,132,0,234,29,48,
-128,255,236,134,224,81,250,5,29,64,8,50,37,62,104,130,
-191,255,10,167,29,48,128,255,204,133,224,81,218,5,29,48,
-31,58,191,255,42,116,29,48,128,255,240,120,97,82,242,5,
-29,64,6,50,37,62,104,130,191,255,226,166,65,234,29,6,
-240,255,230,221,32,54,255,127,128,255,162,132,128,255,76,27,
-196,47,144,140,0,50,128,255,42,28,32,54,236,176,32,62,
-64,0,0,66,128,255,70,177,128,255,62,135,165,13,128,255,
-34,27,128,255,162,131,5,50,128,255,114,132,128,255,2,135,
-188,143,1,0,98,138,187,5,128,7,142,1,60,238,8,0,
-61,135,1,0,28,122,16,56,79,129,210,13,227,55,33,0,
-7,64,39,6,68,233,132,0,191,255,186,81,32,86,13,1,
-128,7,114,1,38,6,84,233,132,0,191,255,54,18,221,207,
-0,0,186,5,128,7,44,1,188,23,1,0,102,18,217,13,
-227,55,33,0,2,64,39,6,116,233,132,0,191,255,134,81,
-32,86,13,1,128,7,62,1,61,71,13,0,224,65,194,13,
-227,55,33,0,39,6,56,233,132,0,191,255,104,81,32,86,
-13,1,128,7,32,1,253,223,7,0,61,215,8,0,61,207,
-10,0,253,231,5,0,28,6,232,255,231,87,0,0,1,18,
-223,5,28,6,232,255,162,5,0,18,2,72,0,18,101,218,
-218,5,28,6,232,255,166,5,1,18,0,98,224,17,226,5,
-97,210,186,5,105,202,167,5,1,98,32,142,24,0,125,143,
-4,0,1,122,125,127,8,0,194,110,1,0,5,130,125,135,
-6,0,194,106,201,134,1,0,9,114,125,119,10,0,193,130,
-29,119,12,0,30,146,82,113,202,94,1,0,11,113,29,146,
-82,113,16,113,27,146,82,113,13,113,23,146,82,113,204,86,
-1,0,195,82,10,113,93,119,12,0,38,6,128,233,132,0,
-191,255,80,17,28,56,38,6,200,232,132,0,32,70,24,0,
-191,255,64,17,27,56,38,6,224,232,132,0,5,66,191,255,
-50,17,26,56,38,6,248,232,132,0,1,66,191,255,36,17,
-25,56,38,6,16,233,132,0,9,66,191,255,22,17,61,63,
-13,0,38,6,40,233,132,0,191,255,8,17,216,15,65,0,
-221,199,0,0,130,13,38,6,184,233,132,0,191,255,244,16,
-1,138,245,5,38,6,204,233,132,0,191,255,230,16,0,136,
-68,143,152,140,229,5,38,6,224,233,132,0,191,255,212,16,
-0,82,35,199,21,0,35,207,17,0,35,215,13,0,35,223,
-9,0,35,231,5,0,35,239,1,0,35,255,25,0,3,30,
-44,0,127,0,3,30,220,255,99,63,25,0,99,255,17,0,
-99,239,9,0,99,231,13,0,40,63,9,0,6,232,99,63,
-1,0,38,6,244,233,132,0,191,255,136,16,61,23,57,0,
-0,234,99,23,5,0,1,226,35,23,1,0,253,231,192,0,
-92,17,242,21,4,135,205,131,240,233,134,13,35,23,1,0,
-60,80,74,17,99,23,1,0,197,13,29,48,128,255,212,25,
-127,82,242,5,35,23,1,0,60,80,74,17,99,23,1,0,
-65,234,29,6,224,255,134,229,35,87,5,0,3,56,42,23,
-0,0,38,6,244,136,145,0,65,18,106,23,0,0,31,66,
-191,255,182,36,32,54,236,176,64,62,1,0,0,66,128,255,
-204,174,35,231,13,0,35,255,17,0,35,239,9,0,0,82,
-3,30,36,0,127,0,3,30,224,255,99,63,21,0,99,255,
-13,0,99,223,9,0,99,231,5,0,99,239,1,0,40,239,
-9,0,38,6,24,234,132,0,29,56,191,255,214,15,0,226,
-1,218,252,223,192,0,29,128,91,129,194,21,4,127,205,131,
-239,225,198,5,59,112,78,233,213,13,28,48,128,255,52,25,
-127,82,234,5,28,48,128,255,58,24,224,81,186,5,59,104,
-77,233,65,226,28,6,224,255,198,229,224,233,178,13,29,48,
-128,255,40,25,32,54,236,176,32,62,64,0,0,66,128,255,
-60,174,35,223,9,0,35,255,13,0,35,239,1,0,35,231,
-5,0,0,82,3,30,32,0,127,0,3,30,232,255,99,63,
-13,0,99,255,5,0,99,239,1,0,227,63,15,0,6,232,
-38,6,64,234,132,0,191,255,74,15,61,55,61,0,128,255,
-22,110,35,255,5,0,35,239,1,0,3,30,24,0,127,0,
-3,30,180,255,99,63,65,0,99,255,57,0,99,239,41,0,
-99,231,45,0,99,215,53,0,6,232,99,223,49,0,8,208,
-227,223,67,0,128,255,172,23,35,142,28,0,99,143,1,0,
-35,134,32,0,99,135,5,0,35,126,36,0,99,127,9,0,
-38,6,188,136,145,0,35,62,16,0,35,70,20,0,35,78,
-24,0,128,255,126,24,224,81,154,13,35,119,21,0,224,113,
-210,5,1,50,128,255,100,23,133,229,27,48,35,62,12,0,
-128,255,244,132,61,55,61,0,128,255,140,109,0,226,0,234,
-29,48,128,255,46,24,251,81,218,5,1,106,253,111,192,0,
-13,225,65,234,29,6,240,255,198,245,35,87,13,0,0,234,
-42,88,75,225,250,143,7,0,17,6,0,128,170,5,1,234,
-224,233,194,5,37,70,112,130,181,5,37,70,116,130,27,56,
-38,6,88,234,132,0,191,255,106,14,224,233,250,5,35,119,
-13,0,224,113,186,5,128,255,126,127,27,48,128,255,32,122,
-10,216,224,233,226,5,224,217,202,5,28,48,128,255,12,23,
-128,255,232,22,27,80,35,215,53,0,35,223,49,0,35,231,
-45,0,35,239,41,0,35,255,57,0,3,30,76,0,127,0,
-128,7,97,0,12,138,6,232,93,143,1,0,32,134,31,0,
-93,135,5,0,93,7,0,0,93,7,4,0,93,7,2,0,
-93,63,3,0,125,7,9,0,7,48,128,255,166,22,10,22,
-0,184,125,23,13,0,64,6,127,0,3,30,84,255,99,63,
-161,0,99,255,153,0,99,223,129,0,99,183,149,0,9,216,
-99,191,145,0,99,199,141,0,99,207,137,0,99,215,133,0,
-99,231,125,0,99,239,121,0,8,224,31,130,92,135,3,0,
-6,200,153,127,11,0,98,122,186,5,0,234,181,5,28,239,
-8,0,29,56,188,71,9,0,38,6,164,234,132,0,191,255,
-146,13,97,234,234,13,32,62,20,0,252,215,7,0,71,208,
-26,64,38,6,124,234,132,0,191,255,120,13,0,234,229,61,
-32,86,87,2,128,7,102,6,29,16,244,23,64,2,219,17,
-2,111,2,0,2,79,1,0,2,71,0,0,99,111,1,0,
-2,103,3,0,99,103,5,0,2,95,4,0,99,95,9,0,
-2,87,5,0,99,87,13,0,34,135,6,0,209,130,177,130,
-99,135,17,0,34,127,9,0,99,127,21,0,34,87,13,0,
-99,87,25,0,34,87,16,0,99,87,29,0,2,87,18,0,
-99,87,33,0,2,23,19,0,29,56,99,23,37,0,38,6,
-72,235,132,0,191,255,252,12,65,234,250,233,230,197,252,23,
-7,0,32,110,20,0,2,96,237,103,128,114,224,113,234,5,
-224,17,194,5,2,6,4,252,215,5,32,86,80,2,128,7,
-204,5,249,127,9,0,201,122,239,17,215,5,32,86,81,2,
-128,7,186,5,0,234,35,206,104,0,221,201,89,7,0,0,
-29,48,128,255,62,21,224,81,210,13,1,194,29,48,128,255,
-34,22,127,82,210,5,220,207,9,0,170,5,0,194,89,199,
-0,0,65,234,29,6,240,255,246,229,27,23,1,0,111,18,
-154,13,132,103,205,133,224,97,218,5,32,86,93,2,128,7,
-108,5,31,194,0,202,0,98,220,239,9,0,138,13,108,18,
-226,5,109,18,194,5,111,18,162,5,1,98,67,103,43,0,
-27,232,128,7,10,3,4,87,205,131,29,111,0,0,234,105,
-211,5,32,86,82,2,128,7,52,5,224,105,186,5,128,7,
-30,1,29,23,1,0,101,18,233,5,224,17,146,45,98,18,
-163,85,213,77,101,18,130,13,2,6,224,255,146,69,2,6,
-192,255,226,61,197,69,1,98,133,29,12,16,244,23,64,2,
-221,17,2,95,0,0,224,89,210,5,32,86,88,2,128,7,
-236,4,2,23,1,0,106,18,242,5,108,18,210,5,32,86,
-88,2,128,7,216,4,65,98,237,97,135,237,197,45,29,135,
-20,0,224,129,138,45,29,119,21,0,1,18,229,21,2,120,
-244,127,64,2,221,121,15,87,1,0,238,81,210,5,32,86,
-88,2,128,7,168,4,106,82,242,5,108,82,210,5,32,86,
-88,2,128,7,152,4,65,18,237,17,167,237,197,13,220,199,
-9,0,154,13,32,86,90,2,128,7,130,4,32,86,90,2,
-128,7,122,4,29,87,2,0,105,82,215,5,32,86,92,2,
-128,7,106,4,220,199,9,0,178,5,128,7,30,2,29,135,
-3,0,224,129,143,37,29,127,4,0,224,121,202,29,29,119,
-5,0,224,113,138,29,61,111,6,0,205,110,255,127,186,21,
-61,103,13,0,224,97,250,13,61,95,9,0,224,89,186,13,
-61,87,16,0,224,81,250,5,29,135,18,0,224,129,186,5,
-128,7,216,1,32,86,82,2,128,7,18,4,29,23,1,0,
-86,18,99,18,211,13,101,18,250,5,251,233,146,13,32,86,
-90,2,128,7,248,3,32,86,90,2,128,7,240,3,29,23,
-3,0,234,17,137,13,35,118,104,0,206,17,130,103,1,0,
-224,97,218,5,32,86,14,1,128,7,210,3,29,95,2,0,
-224,89,170,21,29,87,5,0,224,81,234,13,61,135,6,0,
-208,134,255,127,154,13,61,127,16,0,224,121,218,5,29,119,
-18,0,224,113,210,5,32,86,82,2,128,7,160,3,220,199,
-9,0,218,13,29,111,4,0,224,105,218,5,29,103,19,0,
-224,97,210,5,32,86,82,2,128,7,130,3,66,7,0,0,
-220,215,9,0,186,5,125,7,9,0,29,55,3,0,128,255,
-34,19,0,58,1,114,0,122,10,48,6,104,151,106,6,96,
-201,98,163,87,43,0,224,81,194,13,36,95,97,133,36,87,
-93,133,224,89,230,5,191,5,224,81,179,5,10,112,11,120,
-14,176,15,184,42,6,0,130,53,122,106,106,143,21,182,5,
-234,97,217,13,42,6,0,202,154,59,224,185,134,13,191,5,
-234,177,211,5,54,6,0,202,154,59,0,186,247,105,198,29,
-191,5,246,97,145,29,12,48,13,56,22,64,23,72,128,255,
-170,19,10,48,11,56,22,64,23,72,191,255,26,118,0,74,
-10,54,255,1,225,63,0,0,203,57,32,70,0,2,128,255,
-138,19,10,48,11,56,61,23,9,0,29,87,1,0,162,49,
-225,119,0,0,174,57,106,82,161,45,226,5,109,82,131,37,
-111,82,146,45,197,37,32,94,33,0,235,23,194,106,224,105,
-210,5,32,86,91,2,128,7,164,2,32,70,0,72,0,74,
-168,49,225,127,0,0,175,57,32,70,33,0,128,255,60,19,
-197,90,10,56,155,58,11,57,10,48,197,50,197,13,32,70,
-0,72,168,49,225,103,0,0,172,57,213,5,32,86,90,2,
-128,7,106,2,61,23,13,0,224,17,130,13,231,1,239,5,
-182,5,230,17,185,5,2,48,0,58,249,57,239,5,182,5,
-248,49,185,5,6,192,7,200,29,238,20,0,26,80,244,87,
-64,2,219,81,234,233,185,5,191,7,238,252,224,201,159,13,
-198,5,24,6,0,246,209,5,32,86,83,2,128,7,30,2,
-27,16,133,29,32,134,31,0,2,127,0,0,66,135,5,0,
-224,121,234,13,34,119,13,0,249,1,134,13,191,5,248,113,
-211,5,32,86,83,2,128,7,244,1,98,199,13,0,2,22,
-20,0,234,17,129,237,31,98,74,103,1,0,38,6,220,234,
-132,0,191,255,222,8,0,234,197,21,29,16,244,23,64,2,
-219,17,2,135,0,0,224,129,186,13,29,56,2,71,3,0,
-34,79,13,0,38,6,248,234,132,0,191,255,182,8,65,234,
-250,233,198,237,27,48,0,58,128,255,104,112,10,232,127,234,
-218,5,32,86,84,2,128,7,148,1,0,18,29,6,240,255,
-129,13,253,102,40,0,32,86,160,180,202,97,44,23,17,0,
-2,216,224,217,154,13,38,6,52,235,132,0,32,62,88,4,
-0,66,190,255,248,255,59,23,105,0,63,6,226,26,1,0,
-2,22,176,0,34,87,0,0,34,135,5,0,219,81,10,48,
-112,0,29,48,250,81,242,5,128,255,20,116,32,86,89,2,
-128,7,58,1,35,62,44,0,128,255,108,126,10,208,224,209,
-242,5,29,48,128,255,248,115,26,80,128,7,32,1,220,231,
-9,0,218,13,29,48,128,255,218,16,10,208,224,209,242,5,
-29,48,128,255,218,115,26,80,128,7,2,1,92,239,3,0,
-220,223,9,0,250,101,1,50,35,62,48,0,35,70,52,0,
-191,255,64,13,35,55,49,0,191,255,122,217,224,81,170,93,
-35,55,49,0,0,58,35,70,84,0,1,74,191,255,148,13,
-97,82,146,13,38,6,52,235,132,0,32,62,143,4,0,66,
-190,255,74,255,128,255,90,36,106,7,9,0,44,6,36,64,
-1,0,106,103,5,0,32,94,232,3,106,7,29,0,10,224,
-106,7,33,0,28,48,106,95,21,0,1,58,128,255,64,35,
-99,231,57,0,99,7,72,0,35,86,84,0,99,87,61,0,
-1,130,99,135,74,0,99,7,65,0,99,7,69,0,99,7,
-78,0,59,23,105,0,11,122,2,22,16,0,34,87,0,0,
-99,127,81,0,219,81,10,48,35,62,56,0,34,119,5,0,
-63,6,232,27,1,0,110,0,28,48,128,255,120,35,124,7,
-0,0,28,48,128,255,198,178,35,55,49,0,1,58,191,255,
-184,14,29,56,38,6,32,235,132,0,191,255,38,7,29,48,
-128,255,188,112,196,239,144,140,130,13,32,54,236,176,32,62,
-64,0,0,66,128,255,198,165,0,82,35,183,149,0,35,191,
-145,0,35,199,141,0,35,207,137,0,35,215,133,0,35,223,
-129,0,35,231,125,0,35,239,121,0,35,255,153,0,3,30,
-172,0,127,0,3,30,220,255,99,63,25,0,99,255,17,0,
-99,215,13,0,99,239,1,0,99,223,9,0,99,231,5,0,
-9,208,230,223,9,0,201,218,36,63,105,133,38,6,232,235,
-132,0,191,255,174,6,36,135,105,133,224,129,210,61,16,126,
-1,0,36,239,109,133,100,127,105,133,29,48,128,255,152,12,
-10,224,224,225,138,85,36,111,105,133,26,56,65,106,100,111,
-105,133,36,23,101,133,27,96,194,97,36,55,109,133,61,95,
-5,0,194,49,235,97,201,13,27,64,191,255,184,242,36,127,
-101,133,32,230,49,2,219,121,100,127,101,133,197,53,11,86,
-0,2,27,104,194,105,234,105,175,13,27,64,191,255,150,242,
-36,143,101,133,219,137,100,143,101,133,213,37,10,64,162,65,
-191,255,130,242,133,37,26,232,29,48,128,255,42,12,10,224,
-224,225,154,29,61,23,5,0,226,217,217,21,36,95,105,133,
-65,90,100,95,105,133,2,54,0,2,191,255,104,69,100,87,
-109,133,10,48,29,56,27,64,191,255,74,242,100,223,101,133,
-32,230,49,2,224,225,138,61,61,231,9,0,61,63,5,0,
-125,7,9,0,29,48,130,58,128,255,180,11,252,81,170,45,
-253,231,3,0,221,225,38,6,20,236,132,0,191,255,196,5,
-191,255,186,76,191,255,110,72,229,87,64,0,224,7,96,1,
-10,232,63,6,138,29,1,0,124,0,10,224,253,47,32,0,
-191,255,82,72,224,225,130,13,28,56,38,6,216,235,132,0,
-191,255,144,5,149,13,38,6,56,236,132,0,191,255,132,5,
-181,5,32,230,52,2,28,6,207,253,226,13,36,23,109,133,
-224,17,194,5,2,48,191,255,158,102,100,7,105,133,100,7,
-101,133,100,7,109,133,28,80,35,215,13,0,35,223,9,0,
-35,231,5,0,35,239,1,0,35,255,17,0,3,30,36,0,
-127,0,3,30,172,255,99,63,73,0,99,255,65,0,99,215,
-57,0,99,239,45,0,6,208,8,16,99,223,53,0,99,207,
-61,0,99,231,49,0,34,238,8,0,4,143,205,131,227,223,
-75,0,241,217,214,5,32,230,13,1,128,7,22,1,2,207,
-6,0,253,135,1,0,99,135,32,0,26,231,11,0,253,127,
-3,0,99,127,34,0,222,226,61,119,4,0,61,95,6,0,
-206,110,255,0,203,86,255,0,200,82,61,119,8,0,13,81,
-206,110,255,0,208,106,10,105,99,111,37,0,159,226,224,225,
-162,13,61,143,4,0,209,134,0,255,208,130,16,105,99,111,
-37,0,149,13,29,103,10,0,204,94,15,0,216,90,11,105,
-99,111,37,0,29,127,10,0,99,7,20,0,207,118,240,0,
-67,119,40,0,227,95,35,0,189,103,11,0,67,103,41,0,
-99,95,22,0,99,7,26,0,27,48,0,58,99,79,9,0,
-0,66,35,78,32,0,128,255,36,31,99,87,5,0,27,48,
-28,56,25,64,202,47,2,0,35,142,4,0,99,143,1,0,
-35,78,32,0,190,255,72,243,35,23,5,0,2,80,42,135,
-0,0,224,129,218,253,34,231,12,0,98,7,0,0,2,48,
-128,255,186,175,218,15,65,0,227,127,33,0,125,127,0,0,
-131,111,37,0,227,119,35,0,125,119,2,0,125,111,4,0,
-163,103,37,0,125,103,6,0,131,95,39,0,163,87,39,0,
-93,87,10,0,125,95,8,0,163,143,41,0,93,143,11,0,
-28,80,35,207,61,0,35,215,57,0,35,223,53,0,35,231,
-49,0,35,239,45,0,35,255,65,0,3,30,84,0,127,0,
-3,30,220,255,99,63,25,0,99,255,17,0,99,223,13,0,
-99,239,5,0,8,216,99,231,9,0,227,63,27,0,6,224,
-38,6,80,236,132,0,191,255,170,3,60,231,61,0,0,234,
-156,231,35,0,251,135,7,0,99,135,2,0,35,158,1,0,
-211,255,2,0,242,13,28,48,4,58,27,66,128,255,100,140,
-10,232,224,233,234,21,28,48,31,58,191,255,210,100,10,232,
-133,21,35,158,1,0,211,199,2,0,178,13,28,48,27,58,
-31,66,128,255,138,114,10,232,224,233,186,5,128,255,4,13,
-3,23,2,0,224,233,250,5,28,48,2,56,27,66,128,255,
-10,2,10,232,29,80,35,223,13,0,35,231,9,0,35,239,
-5,0,35,255,17,0,3,30,36,0,127,0,3,30,224,255,
-99,63,21,0,99,255,13,0,99,239,5,0,227,63,23,0,
-99,231,9,0,8,232,6,224,38,6,104,236,132,0,191,255,
-2,3,253,135,7,0,99,135,2,0,0,234,224,129,138,21,
-32,238,13,1,196,239,144,140,170,45,60,55,61,0,2,58,
-134,55,35,0,23,66,128,255,186,139,10,232,133,37,35,158,
-1,0,211,199,2,0,226,13,60,55,61,0,23,58,134,55,
-35,0,31,66,128,255,232,113,10,232,224,233,186,5,128,255,
-98,12,3,23,2,0,224,233,170,13,60,55,61,0,2,56,
-134,55,35,0,23,66,128,255,98,1,10,232,29,80,35,231,
-9,0,35,239,5,0,35,255,13,0,3,30,32,0,127,0,
-3,30,224,255,99,63,21,0,99,255,13,0,99,231,9,0,
-99,239,5,0,6,224,8,135,3,0,232,143,7,0,99,143,
-2,0,208,62,15,0,209,238,255,0,29,64,38,6,128,236,
-132,0,191,255,78,2,60,55,61,0,29,56,134,55,35,0,
-31,66,128,255,188,141,35,255,13,0,35,239,5,0,35,231,
-9,0,3,30,32,0,127,0,3,30,220,255,99,63,25,0,
-99,255,17,0,99,231,9,0,99,239,5,0,8,224,0,234,
-99,223,13,0,227,63,27,0,6,216,38,6,176,236,132,0,
-191,255,0,2,252,135,7,0,99,135,2,0,208,230,63,0,
-216,130,158,130,98,130,138,21,59,55,61,0,163,71,3,0,
-134,55,35,0,32,62,223,255,128,255,4,113,10,232,224,233,
-186,5,128,255,126,11,224,233,186,13,59,55,61,0,28,56,
-134,55,35,0,32,70,223,255,128,255,128,0,10,232,29,80,
-35,223,13,0,35,231,9,0,35,239,5,0,35,255,17,0,
-3,30,36,0,127,0,3,30,232,255,99,63,13,0,99,255,
-5,0,99,239,1,0,38,6,200,236,132,0,191,255,132,1,
-128,255,32,10,128,255,64,114,10,16,224,17,250,21,61,6,
-0,0,32,0,149,5,221,239,5,0,226,253,128,255,136,114,
-227,23,13,0,125,23,54,0,221,239,5,0,226,253,4,50,
-128,255,208,9,191,255,250,65,0,82,35,239,1,0,35,255,
-5,0,3,30,24,0,127,0,128,7,225,16,167,0,8,232,
-189,0,0,218,7,16,100,18,233,5,224,17,226,45,98,18,
-242,29,149,45,101,18,145,21,194,5,102,18,130,13,181,37,
-29,64,1,58,128,255,236,137,10,216,245,29,29,64,0,58,
-128,255,224,137,10,216,149,29,0,226,28,48,29,64,1,58,
-128,255,208,137,65,226,28,6,240,255,134,253,229,13,0,226,
-28,48,29,64,0,58,128,255,186,137,65,226,28,6,240,255,
-134,253,181,5,32,222,13,1,27,80,64,6,255,16,3,30,
-192,255,99,63,53,0,99,255,45,0,99,223,41,0,99,231,
-37,0,99,239,33,0,232,143,7,0,99,143,2,0,38,6,
-16,237,132,0,163,239,3,0,29,56,191,255,150,0,4,127,
-205,131,239,233,209,5,32,86,14,1,128,7,46,1,0,226,
-131,223,3,0,27,56,224,57,130,13,99,58,209,29,186,5,
-128,7,0,1,128,7,8,1,29,48,0,58,128,255,8,109,
-10,224,224,225,218,5,29,48,128,255,22,139,10,224,224,225,
-194,5,28,6,246,254,138,125,29,48,0,58,1,66,128,255,
-250,8,0,226,149,117,29,48,128,255,200,8,224,81,194,5,
-32,86,14,1,165,109,1,18,253,23,192,0,99,23,25,0,
-1,226,128,255,188,28,10,16,98,7,9,0,42,6,36,64,
-1,0,98,87,5,0,32,142,232,3,98,7,29,0,35,62,
-24,0,98,7,33,0,38,6,244,136,145,0,98,143,21,0,
-99,23,29,0,98,231,0,0,31,66,191,255,124,20,32,54,
-236,176,64,62,1,0,0,66,128,255,146,158,35,23,29,0,
-34,135,0,0,224,129,210,5,5,50,128,255,94,8,245,245,
-98,7,0,0,2,48,128,255,68,171,29,48,128,255,68,8,
-224,81,194,29,29,56,35,54,4,0,191,255,134,241,98,218,
-202,5,13,114,67,119,5,0,35,54,4,0,0,58,128,255,
-82,103,10,48,128,255,76,8,10,224,32,54,236,176,32,62,
-64,0,0,66,128,255,54,158,245,13,32,230,14,1,197,13,
-38,6,44,237,132,0,190,255,106,255,229,5,38,6,224,236,
-132,0,190,255,94,255,28,80,35,223,41,0,35,231,37,0,
+59,63,1,0,165,5,2,56,224,57,186,5,128,7,146,1,
+7,16,165,5,10,16,34,87,13,0,224,81,202,253,34,103,
+9,0,59,135,1,0,2,56,240,57,218,21,12,80,123,87,
+1,0,224,81,194,13,106,7,5,0,59,87,1,0,165,5,
+11,80,42,95,13,0,224,89,202,253,149,29,123,7,9,0,
+0,80,213,21,34,111,5,0,109,103,13,0,34,95,9,0,
+34,87,5,0,224,89,178,13,107,87,5,0,34,87,9,0,
+165,5,11,80,42,95,13,0,224,89,202,253,34,135,1,0,
+123,135,13,0,34,23,1,0,123,87,5,0,34,127,33,0,
+27,48,207,255,42,0,186,5,128,7,0,1,34,87,1,0,
+34,95,5,0,226,231,9,0,202,225,225,239,0,0,203,233,
+191,255,18,255,59,23,5,0,165,5,10,16,34,87,13,0,
+224,81,202,253,2,208,213,93,59,119,1,0,58,23,9,0,
+238,209,218,21,123,23,1,0,224,17,210,13,98,7,5,0,
+59,23,1,0,165,5,10,16,34,87,13,0,224,81,202,253,
+2,128,165,29,123,7,9,0,0,128,229,21,58,95,5,0,
+107,23,13,0,58,23,9,0,58,135,5,0,224,17,194,13,
+98,135,5,0,58,23,9,0,165,5,10,16,34,87,13,0,
+224,81,202,253,2,128,58,255,1,0,123,135,5,0,255,87,
+9,0,63,103,1,0,63,95,5,0,204,81,225,135,0,0,
+208,89,188,81,225,135,0,0,176,89,189,89,186,5,234,1,
+130,13,59,119,13,0,238,71,9,0,200,81,110,87,8,0,
+31,48,128,255,196,106,27,48,26,56,191,255,88,254,59,23,
+5,0,165,5,10,16,34,87,13,0,224,81,202,253,2,208,
+58,23,1,0,34,95,5,0,34,87,1,0,253,89,209,157,
+187,5,252,81,161,157,229,5,191,255,42,254,181,5,123,7,
+13,0,59,87,13,0,64,6,255,48,128,7,225,0,6,232,
+7,224,245,225,147,13,28,64,38,6,172,162,132,0,32,62,
+240,1,191,255,36,22,125,231,48,0,125,7,45,0,93,7,
+50,0,93,7,51,0,29,48,191,255,224,253,29,54,20,0,
+191,255,216,253,125,7,41,0,64,6,255,0,128,7,193,48,
+7,208,166,23,51,0,2,128,176,0,224,129,194,5,6,86,
+20,0,165,5,6,80,10,232,230,119,49,0,224,113,242,21,
+38,111,45,0,36,119,45,175,237,113,147,21,65,18,194,22,
+1,0,70,23,51,0,194,5,6,22,20,0,165,5,6,16,
+2,232,230,87,49,0,206,81,102,87,45,0,229,87,64,0,
+224,7,96,1,10,216,149,13,229,87,64,0,224,135,96,1,
+229,87,64,0,224,7,96,1,36,127,177,139,224,121,210,245,
+36,231,177,139,61,95,17,0,36,111,177,139,65,90,45,111,
+5,0,125,95,17,0,124,7,13,0,124,7,9,0,100,111,
+177,139,251,47,32,0,28,80,61,23,1,0,124,215,1,0,
+224,17,170,13,124,7,5,0,125,87,9,0,125,87,5,0,
+125,87,1,0,149,85,61,95,9,0,58,103,1,0,43,135,
+1,0,58,111,5,0,48,127,5,0,48,119,1,0,239,105,
+203,5,241,5,238,97,209,5,11,16,125,87,9,0,165,61,
+61,95,5,0,43,135,1,0,48,127,5,0,48,119,1,0,
+239,105,193,5,251,45,238,97,217,45,11,16,125,87,5,0,
+149,45,42,95,1,0,43,111,5,0,43,103,1,0,34,95,
+1,0,43,127,5,0,43,119,1,0,239,105,203,5,241,13,
+238,97,209,13,34,95,9,0,224,89,178,5,11,16,165,21,
+106,23,5,0,98,87,9,0,0,18,197,13,34,95,13,0,
+224,89,178,5,11,16,229,5,106,23,5,0,98,87,13,0,
+0,18,224,17,250,213,36,135,177,139,224,129,226,87,0,0,
+64,6,223,48,128,7,97,0,6,232,61,143,41,0,224,137,
+154,37,29,22,20,0,61,119,17,0,34,127,17,0,239,113,
+231,135,0,0,93,135,50,0,207,5,29,22,20,0,165,5,
+29,16,34,95,17,0,224,89,186,5,0,82,149,53,29,87,
+50,0,224,81,194,5,29,22,20,0,165,5,29,16,125,23,
+41,0,61,55,41,0,191,255,76,252,224,81,154,37,157,23,
+51,0,65,18,194,126,1,0,93,127,50,0,194,5,29,22,
+20,0,165,5,29,16,34,95,17,0,224,89,242,13,29,87,
+50,0,224,81,194,5,29,22,20,0,165,5,29,16,125,23,
+41,0,2,48,191,255,14,252,181,5,125,7,41,0,64,6,
+127,0,6,22,20,0,38,143,17,0,34,87,17,0,209,81,
+127,0,96,7,208,176,0,82,34,6,68,164,141,0,2,134,
+76,0,98,23,145,0,98,135,73,0,65,82,2,22,76,0,
+10,6,25,252,214,245,47,6,148,40,1,0,34,6,68,164,
+141,0,2,80,207,81,34,119,73,0,64,7,221,176,64,7,
+220,176,100,119,173,139,100,23,169,139,100,7,165,139,98,87,
+69,0,106,23,73,0,96,7,201,176,96,7,205,176,96,7,
+193,176,96,7,197,176,36,111,153,140,224,105,186,5,68,7,
+164,140,127,0,132,7,225,241,7,224,8,248,36,135,45,175,
+6,232,125,135,13,0,64,86,0,0,42,87,80,245,125,87,
+16,0,156,23,1,0,194,22,31,0,2,6,240,255,178,5,
+128,7,86,2,156,199,9,0,252,103,3,0,188,119,1,0,
+14,16,0,122,2,6,240,255,177,13,226,22,40,0,32,94,
+160,180,203,17,34,87,17,0,224,81,162,5,2,120,125,127,
+61,0,14,128,208,130,12,112,208,113,96,119,209,176,0,218,
+12,80,10,6,0,255,246,5,32,102,6,1,100,103,204,139,
+0,18,133,37,234,22,40,0,48,6,72,205,142,0,208,17,
+34,95,24,0,203,126,0,128,242,5,32,118,7,1,100,119,
+204,139,0,18,245,13,139,110,0,128,98,111,24,0,98,239,
+29,0,36,111,189,139,36,103,185,139,98,111,37,0,98,103,
+33,0,127,23,1,0,224,17,125,23,57,0,170,13,36,223,
+204,139,10,48,10,64,39,6,188,242,132,0,191,255,42,91,
+27,200,224,201,178,5,128,7,154,1,252,127,7,0,96,127,
+213,176,188,87,5,0,60,134,8,0,208,81,96,87,217,176,
+216,22,15,0,104,18,202,5,32,22,14,37,133,13,106,18,
+202,5,32,22,5,37,181,5,32,22,2,37,125,23,65,0,
+24,16,2,6,209,255,193,13,104,18,130,101,106,18,226,93,
+2,6,216,255,242,29,2,6,214,255,218,101,181,29,2,6,
+113,255,177,13,2,6,209,255,210,21,2,6,120,255,226,37,
+2,6,118,255,178,37,245,85,2,6,113,255,242,29,2,6,
+88,255,162,53,2,6,86,255,242,45,2,6,81,255,194,45,
+165,77,60,22,8,0,162,119,1,0,93,119,11,0,34,54,
+2,0,130,95,9,0,162,111,7,0,200,106,11,224,205,225,
+128,255,32,205,10,208,0,218,229,109,60,198,8,0,184,87,
+1,0,93,87,11,0,56,54,10,0,128,255,6,205,10,224,
+56,54,2,0,128,255,252,204,10,216,56,54,6,0,128,255,
+242,204,10,208,133,93,60,222,8,0,187,127,1,0,93,127,
+11,0,59,54,6,0,128,255,218,204,10,224,59,54,2,0,
+128,255,208,204,10,208,0,218,229,69,60,54,8,0,134,231,
+5,0,128,255,190,204,34,6,255,255,31,0,66,81,10,208,
+0,218,149,61,28,16,0,82,43,6,40,164,141,0,68,18,
+34,119,253,255,107,119,1,0,65,82,68,90,103,82,134,253,
+0,210,0,218,0,226,32,206,1,1,34,6,212,125,133,0,
+0,82,36,95,161,139,133,21,130,111,1,0,237,193,154,13,
+34,103,5,0,34,95,9,0,125,103,65,0,0,202,245,5,
+2,22,32,0,65,82,10,6,232,255,249,237,100,95,161,139,
+224,201,146,13,224,55,209,176,24,64,39,6,164,242,132,0,
+191,255,150,89,125,215,1,0,125,223,5,0,125,231,8,0,
+25,224,128,7,226,1,2,208,28,23,3,0,0,106,194,22,
+15,0,2,80,10,6,240,255,177,13,234,86,40,0,32,102,
+160,180,204,81,42,95,17,0,224,89,162,5,10,104,125,111,
+61,0,208,18,156,95,3,0,11,120,194,121,96,127,209,176,
+0,218,11,6,0,255,246,5,32,110,6,1,100,111,204,139,
+0,18,133,37,235,22,40,0,42,6,72,205,142,0,202,17,
+34,87,24,0,202,134,0,128,242,5,32,126,7,1,100,127,
+204,139,0,18,245,13,138,118,0,128,98,119,24,0,98,239,
+29,0,36,111,189,139,36,103,185,139,98,111,37,0,98,103,
+33,0,127,23,1,0,224,17,125,23,57,0,170,13,36,223,
+204,139,11,48,11,64,39,6,204,242,132,0,191,255,218,88,
+224,217,194,5,27,16,128,7,44,1,252,191,7,0,156,95,
+1,0,216,90,157,90,67,95,7,0,8,18,11,80,194,82,
+220,81,132,127,165,140,97,122,170,5,12,18,2,104,0,18,
+224,89,242,5,188,23,1,0,171,17,130,106,237,23,194,2,
+96,23,213,176,96,87,217,176,224,89,162,13,97,90,210,5,
+32,111,213,176,224,105,207,5,32,22,3,1,181,109,98,210,
+225,37,210,5,100,210,177,13,162,29,149,37,0,202,60,199,
+9,0,32,94,14,36,125,95,65,0,213,85,220,199,5,0,
+194,5,221,31,11,0,181,5,221,159,11,0,32,86,5,36,
+125,87,65,0,0,202,60,199,9,0,213,69,0,202,60,199,
+9,0,32,118,2,36,125,119,65,0,213,61,0,194,0,202,
+188,111,5,0,93,111,11,0,28,80,34,6,40,164,141,0,
+2,102,28,0,245,5,68,82,42,95,253,255,68,18,98,95,
+253,255,236,17,145,253,32,222,1,1,34,6,148,121,133,0,
+0,90,36,103,161,139,133,21,130,87,1,0,234,209,154,13,
+34,135,5,0,34,103,9,0,125,135,65,0,0,218,245,5,
+2,22,32,0,65,90,11,6,224,255,249,237,100,103,161,139,
+224,217,146,13,224,55,209,176,26,64,39,6,176,242,132,0,
+191,255,182,87,125,199,1,0,125,207,5,0,125,191,8,0,
+27,16,2,224,224,225,178,5,128,7,68,1,32,71,213,176,
+8,6,0,255,199,13,224,55,209,176,39,6,220,242,132,0,
+191,255,134,87,32,230,98,1,128,7,36,1,221,215,65,0,
+186,5,128,7,26,1,61,23,61,0,224,17,194,125,221,207,
+64,0,202,5,221,199,64,0,194,85,61,87,1,0,32,111,
+197,176,61,95,5,0,32,103,193,176,237,89,129,13,187,5,
+236,81,211,5,96,87,193,176,96,95,197,176,2,128,10,96,
+253,87,9,0,202,97,225,79,0,0,203,73,48,95,25,0,
+48,87,21,0,235,73,161,53,187,5,234,97,243,45,48,95,
+17,0,43,23,105,0,63,6,80,12,1,0,2,22,80,0,
+34,55,0,0,34,87,5,0,203,49,106,0,224,55,209,176,
+224,81,146,21,61,79,5,0,61,71,1,0,253,127,9,0,
+99,127,1,0,39,6,236,242,132,0,191,255,220,86,32,230,
+9,1,213,61,32,142,210,176,241,71,1,0,37,62,56,130,
+191,255,198,86,32,230,40,1,165,53,32,230,0,16,245,45,
+221,231,65,0,194,45,34,95,17,0,43,23,105,0,63,6,
+186,12,1,0,2,22,80,0,34,87,0,0,34,103,5,0,
+203,81,10,48,108,0,224,81,170,29,224,55,209,176,32,142,
+210,176,241,71,1,0,37,62,56,130,191,255,124,86,32,230,
+40,1,213,13,224,55,209,176,32,142,210,176,241,71,1,0,
+37,62,56,130,191,255,98,86,32,230,10,1,128,119,221,176,
+224,113,194,5,29,48,128,255,98,0,28,80,68,6,255,241,
+130,7,33,0,40,6,40,164,141,0,36,63,189,139,36,55,
+185,139,32,134,129,0,99,135,1,0,32,78,28,0,128,255,
+130,61,66,6,63,0,128,7,33,0,7,80,0,18,198,199,
+65,0,162,5,2,18,32,63,209,176,2,64,194,66,46,6,
+40,164,141,0,206,65,10,72,36,111,161,139,63,6,88,13,
+1,0,109,0,64,6,63,0,128,7,33,0,36,127,169,139,
+6,16,47,127,73,0,36,119,165,139,100,127,169,139,14,6,
+24,252,138,13,36,103,173,139,44,103,73,0,100,103,173,139,
+213,5,14,94,1,0,100,95,165,139,36,55,169,139,2,56,
+32,70,68,0,128,255,12,3,64,6,63,0,128,7,225,240,
+6,224,7,216,97,226,187,5,128,7,118,1,58,6,92,243,
+132,0,59,55,5,0,37,62,88,130,128,255,238,2,224,81,
+218,13,98,226,226,5,26,48,191,255,100,21,128,7,152,1,
+1,130,64,135,220,176,128,7,72,1,59,55,5,0,37,62,
+64,130,128,255,198,2,224,81,202,13,98,226,226,5,26,48,
+191,255,60,21,128,7,112,1,64,7,220,176,128,7,34,1,
+59,55,5,0,37,62,72,130,128,255,160,2,224,81,234,13,
+100,7,165,139,34,6,68,164,141,0,34,127,73,0,100,23,
+169,139,100,127,173,139,128,7,62,1,59,55,5,0,37,62,
+68,130,128,255,118,2,224,81,234,5,1,114,64,119,221,176,
+128,7,36,1,59,55,5,0,37,62,80,130,128,255,92,2,
+224,81,218,5,64,7,221,176,128,7,12,1,59,55,5,0,
+37,62,92,130,128,255,68,2,224,81,170,93,36,239,173,139,
+98,226,218,5,0,226,36,223,165,139,229,45,100,226,138,45,
+59,55,9,0,0,58,32,70,16,0,128,255,38,2,10,224,
+59,55,13,0,0,58,32,70,16,0,128,255,22,2,10,222,
+1,0,252,217,246,5,36,23,165,139,226,217,191,5,226,225,
+247,5,38,6,124,243,132,0,191,255,116,20,197,85,0,18,
+197,5,61,239,73,0,65,18,252,17,198,253,213,5,26,48,
+191,255,92,20,133,77,38,6,28,243,132,0,191,255,80,20,
+0,194,0,202,160,111,221,176,224,105,242,21,61,55,13,0,
+253,63,17,0,128,255,34,1,10,192,11,200,229,13,28,56,
+37,54,100,130,191,255,40,20,29,48,24,64,25,72,128,255,
+90,0,61,239,73,0,65,226,251,225,166,245,197,37,38,6,
+140,243,132,0,191,255,8,20,128,95,221,176,224,89,242,5,
+38,6,160,243,132,0,191,255,246,19,229,5,38,6,80,243,
+132,0,191,255,234,19,160,87,221,176,224,81,242,5,38,6,
+172,243,132,0,191,255,216,19,229,5,38,6,4,243,132,0,
+191,255,204,19,64,6,255,240,132,7,225,48,6,232,8,208,
+9,216,221,207,64,0,162,13,221,215,64,0,194,5,32,22,
+82,0,197,13,32,22,86,0,149,13,221,199,64,0,194,5,
+32,22,87,0,181,5,32,22,88,0,61,55,13,0,2,224,
+253,63,17,0,128,255,114,0,10,64,11,72,160,127,221,176,
+224,121,162,13,233,1,186,5,232,1,226,5,186,65,225,103,
+0,0,172,73,187,73,61,87,61,0,99,231,1,0,138,87,
+35,0,99,87,5,0,38,6,196,243,132,0,191,255,80,19,
+28,6,168,255,178,21,61,79,5,0,61,71,1,0,253,127,
+9,0,99,127,1,0,38,6,220,243,132,0,191,255,48,19,
+37,54,108,130,191,255,40,19,213,5,37,54,108,130,191,255,
+30,19,68,6,255,48,128,7,97,48,7,232,221,0,128,255,
+154,0,10,208,11,216,29,48,128,255,144,0,0,64,41,6,
+96,227,230,64,10,48,11,56,128,255,136,0,10,64,11,72,
+26,48,27,56,128,255,132,0,0,64,64,78,36,64,10,48,
+11,56,128,255,126,0,0,64,41,6,0,64,143,64,10,48,
+11,56,128,255,110,0,10,48,11,56,128,255,110,0,64,6,
+127,48,128,7,225,0,32,63,197,176,32,71,193,176,38,6,
+236,243,132,0,191,255,168,18,32,63,205,176,32,71,201,176,
+38,6,12,244,132,0,191,255,150,18,64,6,255,0,130,7,
+33,6,136,0,128,0,97,0,33,6,58,74,130,0,97,0,
+33,6,238,68,130,0,97,0,33,6,30,87,130,0,97,0,
+33,6,32,84,130,0,97,0,33,6,190,78,130,0,97,0,
+33,6,50,82,130,0,97,0,33,6,192,77,130,0,97,0,
+3,30,236,255,99,63,9,0,99,255,1,0,38,6,44,244,
+132,0,191,255,58,18,35,255,1,0,0,82,3,30,20,0,
+127,0,3,30,204,255,99,63,41,0,99,255,33,0,99,207,
+25,0,99,215,21,0,99,223,17,0,99,231,13,0,99,239,
+9,0,99,199,29,0,8,224,252,239,7,0,29,56,6,192,
+38,6,20,245,132,0,191,255,246,17,29,6,0,255,215,5,
+32,86,13,1,128,7,204,2,97,234,191,5,128,7,16,1,
+99,7,1,0,128,255,74,48,106,7,9,0,49,6,248,65,
+1,0,106,143,5,0,32,134,208,7,106,7,29,0,1,18,
+106,7,33,0,0,234,106,135,21,0,99,87,5,0,106,23,
+0,0,245,13,29,48,128,255,10,28,224,81,146,13,1,18,
+35,87,1,0,253,23,192,0,2,81,99,87,1,0,65,234,
+4,127,217,131,239,233,246,237,3,56,38,6,84,148,145,0,
+31,66,191,255,24,38,32,54,236,176,64,62,1,0,0,66,
+128,255,116,178,35,23,5,0,2,80,42,119,0,0,224,113,
+218,253,98,7,0,0,2,48,128,255,46,191,196,239,156,140,
+154,45,128,54,255,255,128,255,6,133,0,234,29,48,128,255,
+100,135,224,81,250,5,29,64,8,50,37,62,112,130,191,255,
+252,165,29,48,128,255,68,134,224,81,218,5,29,48,31,58,
+191,255,24,115,29,48,128,255,104,121,97,82,242,5,29,64,
+6,50,37,62,112,130,191,255,212,165,65,234,29,6,240,255,
+230,221,32,54,255,127,128,255,26,133,128,255,110,27,196,47,
+156,140,0,50,128,255,76,28,32,54,236,176,32,62,64,0,
+0,66,128,255,226,177,128,255,182,135,165,13,128,255,68,27,
+128,255,26,132,5,50,128,255,234,132,128,255,122,135,188,111,
+1,0,98,106,187,5,128,7,142,1,60,238,8,0,61,103,
+1,0,28,90,12,56,75,97,210,13,227,55,41,0,7,64,
+39,6,188,244,132,0,191,255,176,80,32,86,13,1,128,7,
+114,1,38,6,204,244,132,0,191,255,132,16,221,207,0,0,
+186,5,128,7,44,1,188,23,1,0,102,18,217,13,227,55,
+41,0,2,64,39,6,236,244,132,0,191,255,124,80,32,86,
+13,1,128,7,62,1,61,71,13,0,224,65,194,13,227,55,
+41,0,39,6,176,244,132,0,191,255,94,80,32,86,13,1,
+128,7,32,1,253,223,7,0,61,215,8,0,61,207,10,0,
+253,231,5,0,28,6,232,255,231,119,0,0,1,18,223,5,
+28,6,232,255,162,5,0,18,2,72,0,18,101,218,218,5,
+28,6,232,255,166,5,1,18,0,130,224,17,226,5,97,210,
+186,5,109,202,167,5,1,130,32,110,24,0,125,111,4,0,
+1,90,125,95,8,0,194,142,1,0,5,98,125,103,6,0,
+194,138,201,102,1,0,13,82,125,87,10,0,193,98,29,87,
+12,0,30,146,82,81,206,126,1,0,15,81,29,146,82,81,
+12,81,27,146,82,81,17,81,23,146,82,81,208,118,1,0,
+195,114,14,81,93,87,12,0,38,6,248,244,132,0,191,255,
+158,15,28,56,38,6,64,244,132,0,32,70,24,0,191,255,
+142,15,27,56,38,6,88,244,132,0,5,66,191,255,128,15,
+26,56,38,6,112,244,132,0,1,66,191,255,114,15,25,56,
+38,6,136,244,132,0,13,66,191,255,100,15,61,63,13,0,
+38,6,160,244,132,0,191,255,86,15,216,15,65,0,221,199,
+0,0,130,13,38,6,48,245,132,0,191,255,66,15,1,106,
+245,5,38,6,68,245,132,0,191,255,52,15,0,104,68,111,
+164,140,229,5,38,6,88,245,132,0,191,255,34,15,0,82,
+35,199,29,0,35,207,25,0,35,215,21,0,35,223,17,0,
+35,231,13,0,35,239,9,0,35,255,33,0,3,30,52,0,
+127,0,3,30,220,255,99,63,25,0,99,255,17,0,99,239,
+9,0,99,231,13,0,40,63,9,0,6,232,99,63,1,0,
+38,6,108,245,132,0,191,255,214,14,61,23,57,0,0,234,
+99,23,5,0,1,226,35,23,1,0,253,231,192,0,92,17,
+242,21,4,135,217,131,240,233,134,13,35,23,1,0,60,80,
+74,17,99,23,1,0,197,13,29,48,128,255,246,25,127,82,
+242,5,35,23,1,0,60,80,74,17,99,23,1,0,65,234,
+29,6,224,255,134,229,35,87,5,0,3,56,42,23,0,0,
+38,6,84,148,145,0,65,18,106,23,0,0,31,66,191,255,
+12,35,32,54,236,176,64,62,1,0,0,66,128,255,104,175,
+35,231,13,0,35,255,17,0,35,239,9,0,0,82,3,30,
+36,0,127,0,3,30,224,255,99,63,21,0,99,255,13,0,
+99,223,9,0,99,231,5,0,99,239,1,0,40,239,9,0,
+38,6,144,245,132,0,29,56,191,255,36,14,0,226,1,218,
+252,223,192,0,29,128,91,129,194,21,4,127,217,131,239,225,
+198,5,59,112,78,233,213,13,28,48,128,255,86,25,127,82,
+234,5,28,48,128,255,92,24,224,81,186,5,59,104,77,233,
+65,226,28,6,224,255,198,229,224,233,178,13,29,48,128,255,
+74,25,32,54,236,176,32,62,64,0,0,66,128,255,216,174,
+35,223,9,0,35,255,13,0,35,239,1,0,35,231,5,0,
+0,82,3,30,32,0,127,0,3,30,232,255,99,63,13,0,
+99,255,5,0,99,239,1,0,227,63,15,0,6,232,38,6,
+184,245,132,0,191,255,152,13,61,55,61,0,128,255,142,110,
+35,255,5,0,35,239,1,0,3,30,24,0,127,0,3,30,
+180,255,99,63,65,0,99,255,57,0,99,239,41,0,99,231,
+45,0,99,215,53,0,6,232,99,223,49,0,8,208,227,223,
+67,0,128,255,206,23,35,142,28,0,99,143,1,0,35,134,
+32,0,99,135,5,0,35,126,36,0,99,127,9,0,38,6,
+28,148,145,0,35,62,16,0,35,70,20,0,35,78,24,0,
+128,255,160,24,224,81,154,13,35,119,21,0,224,113,210,5,
+1,50,128,255,134,23,133,229,27,48,35,62,12,0,128,255,
+108,133,61,55,61,0,128,255,4,110,0,226,0,234,29,48,
+128,255,80,24,251,81,218,5,1,106,253,111,192,0,13,225,
+65,234,29,6,240,255,198,245,35,87,13,0,0,234,42,88,
+75,225,250,143,7,0,17,6,0,128,170,5,1,234,224,233,
+194,5,37,70,120,130,181,5,37,70,124,130,27,56,38,6,
+208,245,132,0,191,255,184,12,224,233,250,5,35,119,13,0,
+224,113,186,5,128,255,246,127,27,48,128,255,152,122,10,216,
+224,233,226,5,224,217,202,5,28,48,128,255,46,23,128,255,
+10,23,27,80,35,215,53,0,35,223,49,0,35,231,45,0,
+35,239,41,0,35,255,57,0,3,30,76,0,127,0,128,7,
+97,0,12,138,6,232,93,143,1,0,32,134,31,0,93,135,
+5,0,93,7,0,0,93,7,4,0,93,7,2,0,93,63,
+3,0,125,7,9,0,7,48,128,255,200,22,10,22,0,184,
+125,23,13,0,64,6,127,0,3,30,84,255,99,63,161,0,
+99,255,153,0,99,223,129,0,99,183,149,0,9,216,99,191,
+145,0,99,199,141,0,99,207,137,0,99,215,133,0,99,231,
+125,0,99,239,121,0,8,224,31,130,92,135,3,0,6,200,
+153,127,11,0,98,122,186,5,0,234,181,5,28,239,8,0,
+29,56,188,71,9,0,38,6,28,246,132,0,191,255,224,11,
+97,234,234,13,32,62,20,0,252,215,7,0,71,208,26,64,
+38,6,244,245,132,0,191,255,198,11,0,234,229,61,32,86,
+87,2,128,7,102,6,29,16,244,23,64,2,219,17,2,111,
+2,0,2,79,1,0,2,71,0,0,99,111,1,0,2,103,
+3,0,99,103,5,0,2,95,4,0,99,95,9,0,2,87,
+5,0,99,87,13,0,34,135,6,0,209,130,177,130,99,135,
+17,0,34,127,9,0,99,127,21,0,34,87,13,0,99,87,
+25,0,34,87,16,0,99,87,29,0,2,87,18,0,99,87,
+33,0,2,23,19,0,29,56,99,23,37,0,38,6,192,246,
+132,0,191,255,74,11,65,234,250,233,230,197,252,23,7,0,
+32,110,20,0,2,96,237,103,128,114,224,113,234,5,224,17,
+194,5,2,6,4,252,215,5,32,86,80,2,128,7,204,5,
+249,127,9,0,201,122,239,17,215,5,32,86,81,2,128,7,
+186,5,0,234,35,206,104,0,221,201,89,7,0,0,29,48,
+128,255,96,21,224,81,210,13,1,194,29,48,128,255,68,22,
+127,82,210,5,220,207,9,0,170,5,0,194,89,199,0,0,
+65,234,29,6,240,255,246,229,27,23,1,0,111,18,154,13,
+132,103,217,133,224,97,218,5,32,86,93,2,128,7,108,5,
+31,194,0,202,0,98,220,239,9,0,138,13,108,18,226,5,
+109,18,194,5,111,18,162,5,1,98,67,103,43,0,27,232,
+128,7,10,3,4,87,217,131,29,111,0,0,234,105,211,5,
+32,86,82,2,128,7,52,5,224,105,186,5,128,7,30,1,
+29,23,1,0,101,18,233,5,224,17,146,45,98,18,163,85,
+213,77,101,18,130,13,2,6,224,255,146,69,2,6,192,255,
+226,61,197,69,1,98,133,29,12,16,244,23,64,2,221,17,
+2,95,0,0,224,89,210,5,32,86,88,2,128,7,236,4,
+2,23,1,0,106,18,242,5,108,18,210,5,32,86,88,2,
+128,7,216,4,65,98,237,97,135,237,197,45,29,135,20,0,
+224,129,138,45,29,119,21,0,1,18,229,21,2,120,244,127,
+64,2,221,121,15,87,1,0,238,81,210,5,32,86,88,2,
+128,7,168,4,106,82,242,5,108,82,210,5,32,86,88,2,
+128,7,152,4,65,18,237,17,167,237,197,13,220,199,9,0,
+154,13,32,86,90,2,128,7,130,4,32,86,90,2,128,7,
+122,4,29,87,2,0,105,82,215,5,32,86,92,2,128,7,
+106,4,220,199,9,0,178,5,128,7,30,2,29,135,3,0,
+224,129,143,37,29,127,4,0,224,121,202,29,29,119,5,0,
+224,113,138,29,61,111,6,0,205,110,255,127,186,21,61,103,
+13,0,224,97,250,13,61,95,9,0,224,89,186,13,61,87,
+16,0,224,81,250,5,29,135,18,0,224,129,186,5,128,7,
+216,1,32,86,82,2,128,7,18,4,29,23,1,0,86,18,
+99,18,211,13,101,18,250,5,251,233,146,13,32,86,90,2,
+128,7,248,3,32,86,90,2,128,7,240,3,29,23,3,0,
+234,17,137,13,35,118,104,0,206,17,130,103,1,0,224,97,
+218,5,32,86,14,1,128,7,210,3,29,95,2,0,224,89,
+170,21,29,87,5,0,224,81,234,13,61,135,6,0,208,134,
+255,127,154,13,61,127,16,0,224,121,218,5,29,119,18,0,
+224,113,210,5,32,86,82,2,128,7,160,3,220,199,9,0,
+218,13,29,111,4,0,224,105,218,5,29,103,19,0,224,97,
+210,5,32,86,82,2,128,7,130,3,66,7,0,0,220,215,
+9,0,186,5,125,7,9,0,29,55,3,0,128,255,68,19,
+0,58,1,114,0,122,10,48,6,104,151,106,6,96,201,98,
+163,87,43,0,224,81,194,13,36,95,109,133,36,87,105,133,
+224,89,230,5,191,5,224,81,179,5,10,112,11,120,14,176,
+15,184,42,6,0,130,53,122,106,106,143,21,182,5,234,97,
+217,13,42,6,0,202,154,59,224,185,134,13,191,5,234,177,
+211,5,54,6,0,202,154,59,0,186,247,105,198,29,191,5,
+246,97,145,29,12,48,13,56,22,64,23,72,128,255,204,19,
+10,48,11,56,22,64,23,72,191,255,12,117,0,74,10,54,
+255,1,225,63,0,0,203,57,32,70,0,2,128,255,172,19,
+10,48,11,56,61,23,9,0,29,87,1,0,162,49,225,119,
+0,0,174,57,106,82,161,45,226,5,109,82,131,37,111,82,
+146,45,197,37,32,94,33,0,235,23,194,106,224,105,210,5,
+32,86,91,2,128,7,164,2,32,70,0,72,0,74,168,49,
+225,127,0,0,175,57,32,70,33,0,128,255,94,19,197,90,
+10,56,155,58,11,57,10,48,197,50,197,13,32,70,0,72,
+168,49,225,103,0,0,172,57,213,5,32,86,90,2,128,7,
+106,2,61,23,13,0,224,17,130,13,231,1,239,5,182,5,
+230,17,185,5,2,48,0,58,249,57,239,5,182,5,248,49,
+185,5,6,192,7,200,29,238,20,0,26,80,244,87,64,2,
+219,81,234,233,185,5,191,7,238,252,224,201,159,13,198,5,
+24,6,0,246,209,5,32,86,83,2,128,7,30,2,27,16,
+133,29,32,134,31,0,2,127,0,0,66,135,5,0,224,121,
+234,13,34,119,13,0,249,1,134,13,191,5,248,113,211,5,
+32,86,83,2,128,7,244,1,98,199,13,0,2,22,20,0,
+234,17,129,237,31,98,74,103,1,0,38,6,84,246,132,0,
+191,255,44,7,0,234,197,21,29,16,244,23,64,2,219,17,
+2,135,0,0,224,129,186,13,29,56,2,71,3,0,34,79,
+13,0,38,6,112,246,132,0,191,255,4,7,65,234,250,233,
+198,237,27,48,0,58,128,255,224,112,10,232,127,234,218,5,
+32,86,84,2,128,7,148,1,0,18,29,6,240,255,129,13,
+253,102,40,0,32,86,160,180,202,97,44,23,17,0,2,216,
+224,217,154,13,38,6,172,246,132,0,32,62,118,4,0,66,
+190,255,70,254,59,23,105,0,63,6,148,28,1,0,2,22,
+176,0,34,87,0,0,34,135,5,0,219,81,10,48,112,0,
+29,48,250,81,242,5,128,255,140,116,32,86,89,2,128,7,
+58,1,35,62,44,0,128,255,228,126,10,208,224,209,242,5,
+29,48,128,255,112,116,26,80,128,7,32,1,220,231,9,0,
+218,13,29,48,128,255,252,16,10,208,224,209,242,5,29,48,
+128,255,82,116,26,80,128,7,2,1,92,239,3,0,220,223,
+9,0,250,101,1,50,35,62,48,0,35,70,52,0,191,255,
+142,11,35,55,49,0,191,255,108,216,224,81,170,93,35,55,
+49,0,0,58,35,70,84,0,1,74,191,255,226,11,97,82,
+146,13,38,6,172,246,132,0,32,62,173,4,0,66,190,255,
+152,253,128,255,124,36,106,7,9,0,44,6,248,65,1,0,
+106,103,5,0,32,94,232,3,106,7,29,0,10,224,106,7,
+33,0,28,48,106,95,21,0,1,58,128,255,98,35,99,231,
+57,0,99,7,72,0,35,86,84,0,99,87,61,0,1,130,
+99,135,74,0,99,7,65,0,99,7,69,0,99,7,78,0,
+59,23,105,0,11,122,2,22,16,0,34,87,0,0,99,127,
+81,0,219,81,10,48,35,62,56,0,34,119,5,0,63,6,
+154,29,1,0,110,0,28,48,128,255,154,35,124,7,0,0,
+28,48,128,255,100,179,35,55,49,0,1,58,191,255,6,13,
+29,56,38,6,152,246,132,0,191,255,116,5,29,48,128,255,
+52,113,196,239,156,140,130,13,32,54,236,176,32,62,64,0,
+0,66,128,255,98,166,0,82,35,183,149,0,35,191,145,0,
+35,199,141,0,35,207,137,0,35,215,133,0,35,223,129,0,
+35,231,125,0,35,239,121,0,35,255,153,0,3,30,172,0,
+127,0,3,30,220,255,99,63,25,0,99,255,17,0,99,215,
+13,0,99,239,1,0,99,223,9,0,99,231,5,0,9,208,
+230,223,9,0,201,218,36,63,117,133,38,6,96,247,132,0,
+191,255,252,4,36,135,117,133,224,129,210,61,16,126,1,0,
+36,239,121,133,100,127,117,133,29,48,128,255,186,12,10,224,
+224,225,138,85,36,111,117,133,26,56,65,106,100,111,117,133,
+36,23,113,133,27,96,194,97,36,55,121,133,61,95,5,0,
+194,49,235,97,201,13,27,64,191,255,40,242,36,127,113,133,
+32,230,49,2,219,121,100,127,113,133,197,53,11,86,0,2,
+27,104,194,105,234,105,175,13,27,64,191,255,6,242,36,143,
+113,133,219,137,100,143,113,133,213,37,10,64,162,65,191,255,
+242,241,133,37,26,232,29,48,128,255,76,12,10,224,224,225,
+154,29,61,23,5,0,226,217,217,21,36,95,117,133,65,90,
+100,95,117,133,2,54,0,2,191,255,94,68,100,87,121,133,
+10,48,29,56,27,64,191,255,186,241,100,223,113,133,32,230,
+49,2,224,225,138,61,61,231,9,0,61,63,5,0,125,7,
+9,0,29,48,130,58,128,255,214,11,252,81,170,45,253,231,
+3,0,221,225,38,6,140,247,132,0,191,255,18,4,191,255,
+176,75,191,255,100,71,229,87,64,0,224,7,96,1,10,232,
+63,6,60,31,1,0,124,0,10,224,253,47,32,0,191,255,
+72,71,224,225,130,13,28,56,38,6,80,247,132,0,191,255,
+222,3,149,13,38,6,176,247,132,0,191,255,210,3,181,5,
+32,230,52,2,28,6,207,253,226,13,36,23,121,133,224,17,
+194,5,2,48,191,255,54,24,100,7,117,133,100,7,113,133,
+100,7,121,133,28,80,35,215,13,0,35,223,9,0,35,231,
+5,0,35,239,1,0,35,255,17,0,3,30,36,0,127,0,
+3,30,172,255,99,63,73,0,99,255,65,0,99,215,57,0,
+99,239,45,0,6,208,8,16,99,223,53,0,99,207,61,0,
+99,231,49,0,34,238,8,0,4,143,217,131,227,223,75,0,
+241,217,214,5,32,230,13,1,128,7,22,1,2,207,6,0,
+253,135,1,0,99,135,32,0,26,231,11,0,253,127,3,0,
+99,127,34,0,222,226,61,119,4,0,61,95,6,0,206,110,
+255,0,203,86,255,0,200,82,61,119,8,0,13,81,206,110,
+255,0,208,106,10,105,99,111,37,0,159,226,224,225,162,13,
+61,143,4,0,209,134,0,255,208,130,16,105,99,111,37,0,
+149,13,29,103,10,0,204,94,15,0,216,90,11,105,99,111,
+37,0,29,127,10,0,99,7,20,0,207,118,240,0,67,119,
+40,0,227,95,35,0,189,103,11,0,67,103,41,0,99,95,
+22,0,99,7,26,0,27,48,0,58,99,79,9,0,0,66,
+35,78,32,0,128,255,70,31,99,87,5,0,27,48,28,56,
+25,64,202,47,2,0,35,142,4,0,99,143,1,0,35,78,
+32,0,190,255,150,241,35,23,5,0,2,80,42,135,0,0,
+224,129,218,253,34,231,12,0,98,7,0,0,2,48,128,255,
+88,176,218,15,65,0,227,127,33,0,125,127,0,0,131,111,
+37,0,227,119,35,0,125,119,2,0,125,111,4,0,163,103,
+37,0,125,103,6,0,131,95,39,0,163,87,39,0,93,87,
+10,0,125,95,8,0,163,143,41,0,93,143,11,0,28,80,
+35,207,61,0,35,215,57,0,35,223,53,0,35,231,49,0,
+35,239,45,0,35,255,65,0,3,30,84,0,127,0,3,30,
+220,255,99,63,25,0,99,255,17,0,99,223,13,0,99,239,
+5,0,8,216,99,231,9,0,227,63,27,0,6,224,38,6,
+200,247,132,0,191,255,248,1,60,231,61,0,0,234,156,231,
+35,0,251,135,7,0,99,135,2,0,35,158,1,0,211,255,
+2,0,242,13,28,48,4,58,27,66,128,255,220,140,10,232,
+224,233,234,21,28,48,31,58,191,255,192,99,10,232,133,21,
+35,158,1,0,211,199,2,0,178,13,28,48,27,58,31,66,
+128,255,2,115,10,232,224,233,186,5,128,255,38,13,3,23,
+2,0,224,233,250,5,28,48,2,56,27,66,128,255,10,2,
+10,232,29,80,35,223,13,0,35,231,9,0,35,239,5,0,
+35,255,17,0,3,30,36,0,127,0,3,30,224,255,99,63,
+21,0,99,255,13,0,99,239,5,0,227,63,23,0,99,231,
+9,0,8,232,6,224,38,6,224,247,132,0,191,255,80,1,
+253,135,7,0,99,135,2,0,0,234,224,129,138,21,32,238,
+13,1,196,239,156,140,170,45,60,55,61,0,2,58,134,55,
+35,0,23,66,128,255,50,140,10,232,133,37,35,158,1,0,
+211,199,2,0,226,13,60,55,61,0,23,58,134,55,35,0,
+31,66,128,255,96,114,10,232,224,233,186,5,128,255,132,12,
+3,23,2,0,224,233,170,13,60,55,61,0,2,56,134,55,
+35,0,23,66,128,255,98,1,10,232,29,80,35,231,9,0,
+35,239,5,0,35,255,13,0,3,30,32,0,127,0,3,30,
+224,255,99,63,21,0,99,255,13,0,99,231,9,0,99,239,
+5,0,6,224,8,135,3,0,232,143,7,0,99,143,2,0,
+208,62,15,0,209,238,255,0,29,64,38,6,248,247,132,0,
+191,255,156,0,60,55,61,0,29,56,134,55,35,0,31,66,
+128,255,52,142,35,255,13,0,35,239,5,0,35,231,9,0,
+3,30,32,0,127,0,3,30,220,255,99,63,25,0,99,255,
+17,0,99,231,9,0,99,239,5,0,8,224,0,234,99,223,
+13,0,227,63,27,0,6,216,38,6,40,248,132,0,191,255,
+78,0,252,135,7,0,99,135,2,0,208,230,63,0,216,130,
+158,130,98,130,138,21,59,55,61,0,163,71,3,0,134,55,
+35,0,32,62,223,255,128,255,124,113,10,232,224,233,186,5,
+128,255,160,11,224,233,186,13,59,55,61,0,28,56,134,55,
+35,0,32,70,223,255,128,255,128,0,10,232,29,80,35,223,
+13,0,35,231,9,0,35,239,5,0,35,255,17,0,3,30,
+36,0,127,0,3,30,232,255,99,63,13,0,99,255,5,0,
+99,239,1,0,38,6,64,248,132,0,190,255,210,255,128,255,
+66,10,128,255,184,114,10,16,224,17,250,21,61,6,0,0,
+32,0,149,5,221,239,5,0,226,253,128,255,0,115,227,23,
+13,0,125,23,54,0,221,239,5,0,226,253,4,50,128,255,
+242,9,191,255,240,64,0,82,35,239,1,0,35,255,5,0,
+3,30,24,0,127,0,128,7,225,16,167,0,8,232,189,0,
+0,218,7,16,100,18,233,5,224,17,226,45,98,18,242,29,
+149,45,101,18,145,21,194,5,102,18,130,13,181,37,29,64,
+1,58,128,255,100,138,10,216,245,29,29,64,0,58,128,255,
+88,138,10,216,149,29,0,226,28,48,29,64,1,58,128,255,
+72,138,65,226,28,6,240,255,134,253,229,13,0,226,28,48,
+29,64,0,58,128,255,50,138,65,226,28,6,240,255,134,253,
+181,5,32,222,13,1,27,80,64,6,255,16,3,30,192,255,
+99,63,53,0,99,255,45,0,99,223,41,0,99,231,37,0,
+99,239,33,0,232,143,7,0,99,143,2,0,38,6,136,248,
+132,0,163,239,3,0,29,56,190,255,228,254,4,127,217,131,
+239,233,209,5,32,86,14,1,128,7,80,1,0,226,131,223,
+3,0,27,56,224,57,130,13,99,58,241,45,186,5,128,7,
+34,1,128,7,42,1,29,48,0,58,128,255,128,109,10,224,
+224,225,250,21,29,48,128,255,250,9,10,16,2,6,240,255,
+193,13,2,48,29,56,128,255,196,103,224,81,226,5,1,50,
+253,55,192,0,128,255,36,9,29,48,128,255,106,139,10,224,
+224,225,194,5,28,6,246,254,250,117,29,48,0,58,1,66,
+128,255,248,8,0,226,133,117,29,48,128,255,198,8,224,81,
+194,5,32,86,14,1,149,109,1,18,253,23,192,0,99,23,
+25,0,1,226,128,255,186,28,106,7,9,0,47,6,248,65,
+1,0,106,127,5,0,32,118,232,3,106,7,29,0,35,62,
+24,0,106,7,33,0,38,6,84,148,145,0,106,119,21,0,
+99,87,29,0,106,231,0,0,31,66,191,255,176,18,32,54,
+236,176,64,62,1,0,0,66,128,255,12,159,35,23,29,0,
+34,111,0,0,224,105,210,5,5,50,128,255,94,8,245,245,
+98,7,0,0,2,48,128,255,192,171,29,48,128,255,68,8,
+224,81,194,29,29,56,35,54,4,0,191,255,100,241,98,218,
+202,5,13,90,67,95,5,0,35,54,4,0,0,58,128,255,
+168,103,10,48,128,255,76,8,10,224,32,54,236,176,32,62,
+64,0,0,66,128,255,176,158,245,13,32,230,14,1,197,13,
+38,6,164,248,132,0,190,255,150,253,229,5,38,6,88,248,
+132,0,190,255,138,253,28,80,35,223,41,0,35,231,37,0,
 35,239,33,0,35,255,45,0,3,30,64,0,127,0,3,30,
 228,255,99,63,17,0,99,255,9,0,99,239,5,0,35,158,
 1,0,232,143,7,0,99,143,0,0,40,239,9,0,211,255,
@@ -21364,9 +21519,9 @@ unsigned char tw_fw_code[] __initdata = 
 22,6,10,16,213,5,11,48,128,255,32,7,0,18,2,80,
 35,239,5,0,35,255,9,0,3,30,28,0,127,0,3,30,
 224,255,99,63,21,0,99,255,13,0,99,231,5,0,99,223,
-9,0,99,239,1,0,8,224,6,232,38,6,132,237,132,0,
-190,255,96,254,252,223,7,0,27,56,38,6,148,237,132,0,
-190,255,80,254,60,254,8,0,229,87,64,0,224,7,96,1,
+9,0,99,239,1,0,8,224,6,232,38,6,252,248,132,0,
+190,255,140,252,252,223,7,0,27,56,38,6,12,249,132,0,
+190,255,124,252,60,254,8,0,229,87,64,0,224,7,96,1,
 10,224,27,16,2,6,237,255,209,21,66,0,34,0,46,0,
 58,0,70,0,82,0,94,0,106,0,118,0,130,0,142,0,
 154,0,166,0,178,0,189,0,200,0,211,0,222,0,233,0,
@@ -21402,40 +21557,40 @@ unsigned char tw_fw_code[] __initdata = 
 0,50,128,255,166,5,10,232,165,53,29,56,35,22,20,0,
 34,71,1,0,31,72,0,50,128,255,152,5,10,232,245,37,
 29,56,35,22,20,0,34,71,1,0,31,72,0,50,128,255,
-138,5,10,232,197,29,32,54,52,0,191,255,74,93,10,232,
-224,233,210,21,29,48,128,255,202,4,48,6,136,92,133,0,
-125,135,49,0,197,13,252,47,32,0,27,56,38,6,96,237,
-132,0,190,255,222,251,32,86,20,48,149,61,38,6,160,134,
-1,0,190,255,214,251,61,23,49,0,63,6,130,39,1,0,
+138,5,10,232,197,29,32,54,52,0,191,255,22,92,10,232,
+224,233,210,21,29,48,128,255,202,4,48,6,16,104,133,0,
+125,135,49,0,197,13,252,47,32,0,27,56,38,6,216,248,
+132,0,190,255,10,250,32,86,20,48,149,61,38,6,160,134,
+1,0,190,255,2,250,61,23,49,0,63,6,86,41,1,0,
 2,22,16,0,34,87,0,0,34,127,5,0,221,81,10,48,
-111,0,10,216,224,217,250,5,38,6,204,237,132,0,190,255,
-162,251,229,5,38,6,168,237,132,0,190,255,150,251,224,233,
+111,0,10,216,224,217,250,5,38,6,68,249,132,0,190,255,
+206,249,229,5,38,6,32,249,132,0,190,255,194,249,224,233,
 242,13,61,23,49,0,3,58,72,18,34,87,0,0,34,111,
-5,0,221,81,10,48,63,6,190,39,1,0,109,0,252,47,
-32,0,37,54,120,130,190,255,106,251,27,80,35,223,9,0,
+5,0,221,81,10,48,63,6,146,41,1,0,109,0,252,47,
+32,0,37,54,128,130,190,255,150,249,27,80,35,223,9,0,
 35,231,5,0,35,239,1,0,35,255,13,0,3,30,32,0,
 127,0,3,30,208,255,99,63,37,0,99,255,29,0,99,191,
 25,0,99,199,21,0,99,207,17,0,99,215,13,0,99,223,
-9,0,99,231,5,0,99,239,1,0,36,143,130,140,232,223,
+9,0,99,231,5,0,99,239,1,0,36,143,142,140,232,223,
 7,0,241,217,194,5,32,86,13,1,229,101,9,192,27,56,
-38,6,232,237,132,0,190,255,10,251,0,210,0,226,165,45,
-28,128,216,129,16,239,0,0,28,56,29,64,37,54,128,130,
-190,255,240,250,1,122,253,127,192,0,90,121,234,13,0,18,
+38,6,96,249,132,0,190,255,54,249,0,210,0,226,165,45,
+28,128,216,129,16,239,0,0,28,56,29,64,37,54,136,130,
+190,255,28,249,1,122,253,127,192,0,90,121,234,13,0,18,
 29,6,240,255,129,13,253,86,40,0,32,134,160,180,208,81,
-42,23,17,0,224,17,154,13,38,6,16,238,132,0,190,255,
-194,250,32,86,10,1,133,61,1,122,253,127,192,0,15,209,
-65,226,251,225,230,213,37,54,136,130,190,255,166,250,0,226,
-1,50,128,255,250,130,31,186,0,234,197,29,29,104,216,105,
-13,215,0,0,23,56,26,48,128,255,138,126,10,184,26,48,
-31,58,191,255,218,91,10,200,224,201,178,13,25,56,26,64,
-38,6,32,238,132,0,190,255,106,250,224,225,170,5,25,224,
-65,234,251,233,198,229,0,50,128,255,180,130,37,54,136,130,
-190,255,80,250,28,80,35,191,25,0,35,199,21,0,35,207,
+42,23,17,0,224,17,154,13,38,6,136,249,132,0,190,255,
+238,248,32,86,10,1,133,61,1,122,253,127,192,0,15,209,
+65,226,251,225,230,213,37,54,144,130,190,255,210,248,0,226,
+1,50,128,255,80,131,31,186,0,234,197,29,29,104,216,105,
+13,215,0,0,23,56,26,48,128,255,224,126,10,184,26,48,
+31,58,191,255,166,90,10,200,224,201,178,13,25,56,26,64,
+38,6,152,249,132,0,190,255,150,248,224,225,170,5,25,224,
+65,234,251,233,198,229,0,50,128,255,10,131,37,54,144,130,
+190,255,124,248,28,80,35,191,25,0,35,199,21,0,35,207,
 17,0,35,215,13,0,35,223,9,0,35,231,5,0,35,239,
 1,0,35,255,29,0,3,30,48,0,127,0,0,98,0,106,
 0,18,197,13,12,112,2,128,194,130,198,129,48,103,1,0,
 206,97,225,87,0,0,202,105,65,18,231,17,193,245,205,97,
-12,80,127,0,49,6,88,238,132,0,49,127,1,0,80,26,
+12,80,127,0,49,6,208,249,132,0,49,127,1,0,80,26,
 99,127,1,0,49,119,5,0,99,119,5,0,49,111,9,0,
 99,111,9,0,49,103,12,0,99,103,12,0,6,96,12,16,
 213,29,2,104,3,112,14,122,65,106,13,135,255,255,65,114,
@@ -21443,98 +21598,98 @@ unsigned char tw_fw_code[] __initdata = 
 202,245,224,89,170,13,38,135,13,0,101,130,194,5,32,86,
 50,2,165,13,0,82,133,13,65,18,12,126,2,16,239,17,
 145,229,32,86,51,2,3,30,16,0,127,0,3,30,236,255,
-99,63,9,0,99,255,1,0,9,56,38,6,104,238,132,0,
-190,255,112,249,35,255,1,0,0,82,3,30,20,0,127,0,
+99,63,9,0,99,255,1,0,9,56,38,6,224,249,132,0,
+190,255,156,247,35,255,1,0,0,82,3,30,20,0,127,0,
 3,30,216,255,99,63,29,0,99,255,21,0,99,231,13,0,
 99,239,9,0,99,223,17,0,0,226,232,239,7,0,6,216,
-38,6,128,238,132,0,190,255,58,249,97,234,177,5,130,37,
-245,61,37,54,144,130,190,255,42,249,128,255,74,106,0,234,
+38,6,248,249,132,0,190,255,102,247,97,234,177,5,130,37,
+245,61,37,54,152,130,190,255,86,247,128,255,160,106,0,234,
 253,22,40,0,32,126,160,180,207,17,34,87,17,0,224,81,
 162,13,0,50,29,6,240,255,193,5,224,81,162,5,2,48,
-128,255,42,89,65,234,29,6,240,255,182,237,133,45,37,54,
-140,130,190,255,238,248,128,86,255,255,99,87,1,0,59,23,
+128,255,128,89,65,234,29,6,240,255,182,237,133,45,37,54,
+148,130,190,255,26,247,128,86,255,255,99,87,1,0,59,23,
 57,0,3,56,34,87,0,0,99,23,5,0,65,82,98,87,
-0,0,38,6,244,136,145,0,31,66,191,255,92,13,32,54,
-236,176,64,62,1,0,0,66,128,255,114,151,133,13,32,230,
-13,1,38,6,160,238,132,0,190,255,168,248,28,80,35,223,
+0,0,38,6,84,148,145,0,31,66,191,255,144,11,32,54,
+236,176,64,62,1,0,0,66,128,255,236,151,133,13,32,230,
+13,1,38,6,24,250,132,0,190,255,212,246,28,80,35,223,
 17,0,35,231,13,0,35,239,9,0,35,255,21,0,3,30,
 40,0,127,0,134,7,225,0,6,224,128,255,22,1,224,81,
 202,5,32,86,14,1,149,45,28,48,0,58,0,66,3,72,
 128,255,42,19,1,138,10,232,125,143,0,0,28,48,29,56,
-190,255,212,229,61,135,0,0,224,129,218,253,61,231,12,0,
-29,48,125,7,0,0,128,255,212,163,224,225,218,13,163,119,
+190,255,0,228,61,135,0,0,224,129,218,253,61,231,12,0,
+29,48,125,7,0,0,128,255,80,164,224,225,218,13,163,119,
 5,0,14,6,12,255,138,13,131,111,7,0,13,6,212,255,
 186,5,32,230,96,2,28,80,70,6,255,0,138,7,225,0,
 6,224,128,255,174,0,224,81,202,5,32,86,14,1,149,69,
 28,48,35,62,2,0,35,70,3,0,128,255,142,1,3,143,
-3,0,32,22,1,16,224,137,218,5,4,135,204,131,224,129,
-242,45,1,234,252,239,192,0,4,119,204,131,99,239,14,0,
+3,0,32,22,1,16,224,137,218,5,4,135,216,131,224,129,
+242,45,1,234,252,239,192,0,4,119,216,131,99,239,14,0,
 224,113,178,5,0,18,213,13,99,239,12,0,35,22,12,0,
-34,55,1,0,35,62,4,0,128,255,172,112,10,16,226,0,
+34,55,1,0,35,62,4,0,128,255,2,113,10,16,226,0,
 224,17,234,21,99,239,18,0,99,239,16,0,35,22,16,0,
-34,55,1,0,35,62,8,0,128,255,152,110,10,16,224,81,
-250,5,4,143,204,131,224,137,178,5,32,22,1,16,2,80,
+34,55,1,0,35,62,8,0,128,255,238,110,10,16,224,81,
+250,5,4,143,216,131,224,137,178,5,32,22,1,16,2,80,
 74,6,255,0,6,88,192,25,192,25,32,86,1,1,127,0,
-33,6,64,21,128,0,97,0,33,6,244,23,128,0,97,0,
-33,6,48,187,128,0,97,0,33,6,82,245,129,0,97,0,
-33,6,108,145,129,0,97,0,33,6,150,145,129,0,97,0,
-33,6,232,186,128,0,97,0,33,6,102,188,128,0,97,0,
-33,6,228,99,128,0,97,0,33,6,22,115,128,0,97,0,
-33,6,62,134,128,0,97,0,33,6,216,136,128,0,97,0,
-33,6,46,138,128,0,97,0,33,6,100,139,128,0,97,0,
-33,6,172,140,128,0,97,0,33,6,0,142,128,0,97,0,
-33,6,30,143,128,0,97,0,33,6,98,144,128,0,97,0,
-33,6,182,145,128,0,97,0,33,6,46,147,128,0,97,0,
-33,6,150,148,128,0,97,0,33,6,100,150,128,0,97,0,
-33,6,130,151,128,0,97,0,33,6,190,152,128,0,97,0,
-33,6,250,153,128,0,97,0,33,6,28,155,128,0,97,0,
-33,6,186,156,128,0,97,0,33,6,252,157,128,0,97,0,
-33,6,34,159,128,0,97,0,33,6,72,160,128,0,97,0,
-33,6,110,161,128,0,97,0,33,6,148,162,128,0,97,0,
-33,6,74,187,128,0,97,0,33,6,18,188,128,0,97,0,
-33,6,156,191,129,0,97,0,33,6,216,161,129,0,97,0,
-33,6,226,11,130,0,97,0,33,6,178,79,130,0,97,0,
-33,6,192,144,129,0,97,0,3,30,100,255,99,63,145,0,
+33,6,0,22,128,0,97,0,33,6,180,24,128,0,97,0,
+33,6,108,191,128,0,97,0,33,6,246,253,129,0,97,0,
+33,6,10,154,129,0,97,0,33,6,52,154,129,0,97,0,
+33,6,36,191,128,0,97,0,33,6,162,192,128,0,97,0,
+33,6,204,102,128,0,97,0,33,6,254,117,128,0,97,0,
+33,6,122,138,128,0,97,0,33,6,20,141,128,0,97,0,
+33,6,106,142,128,0,97,0,33,6,160,143,128,0,97,0,
+33,6,232,144,128,0,97,0,33,6,60,146,128,0,97,0,
+33,6,90,147,128,0,97,0,33,6,158,148,128,0,97,0,
+33,6,242,149,128,0,97,0,33,6,106,151,128,0,97,0,
+33,6,210,152,128,0,97,0,33,6,160,154,128,0,97,0,
+33,6,190,155,128,0,97,0,33,6,250,156,128,0,97,0,
+33,6,54,158,128,0,97,0,33,6,88,159,128,0,97,0,
+33,6,246,160,128,0,97,0,33,6,56,162,128,0,97,0,
+33,6,94,163,128,0,97,0,33,6,132,164,128,0,97,0,
+33,6,170,165,128,0,97,0,33,6,208,166,128,0,97,0,
+33,6,134,191,128,0,97,0,33,6,78,192,128,0,97,0,
+33,6,62,200,129,0,97,0,33,6,122,170,129,0,97,0,
+33,6,134,20,130,0,97,0,33,6,86,88,130,0,97,0,
+33,6,94,153,129,0,97,0,3,30,100,255,99,63,145,0,
 99,255,137,0,99,231,133,0,99,239,129,0,9,224,28,48,
-136,239,5,0,29,64,0,58,190,255,32,246,3,48,128,255,
+136,239,5,0,29,64,0,58,190,255,76,244,3,48,128,255,
 92,6,28,48,35,62,4,0,32,118,124,0,29,6,132,255,
-238,239,34,67,191,255,94,226,35,231,133,0,35,255,137,0,
+238,239,34,67,191,255,172,225,35,231,133,0,35,255,137,0,
 35,239,129,0,0,82,3,30,156,0,127,0,3,30,224,255,
 99,63,21,0,99,255,13,0,99,223,9,0,99,239,1,0,
 6,216,9,232,99,231,5,0,29,48,136,231,5,0,28,64,
-0,58,190,255,198,245,29,135,0,0,208,134,224,0,93,135,
+0,58,190,255,242,243,29,135,0,0,208,134,224,0,93,135,
 0,0,28,6,224,255,201,5,32,22,31,0,181,5,28,16,
 130,0,93,23,4,0,93,7,2,0,221,15,7,0,61,54,
-8,0,39,6,200,238,132,0,8,66,191,255,232,225,61,54,
-16,0,39,6,212,238,132,0,32,70,16,0,191,255,214,225,
+8,0,39,6,64,250,132,0,8,66,191,255,54,225,61,54,
+16,0,39,6,76,250,132,0,32,70,16,0,191,255,36,225,
 59,23,61,0,10,82,130,23,35,0,2,88,74,88,11,94,
 48,0,61,102,30,0,76,95,255,255,234,23,128,130,16,134,
-48,0,76,135,0,0,61,54,32,0,37,62,152,130,4,66,
-191,255,162,225,35,223,9,0,35,255,13,0,35,239,1,0,
+48,0,76,135,0,0,61,54,32,0,37,62,160,130,4,66,
+191,255,240,224,35,223,9,0,35,255,13,0,35,239,1,0,
 35,231,5,0,0,82,3,30,32,0,127,0,3,30,228,255,
 99,63,17,0,99,255,9,0,99,231,5,0,99,239,1,0,
 6,224,9,232,0,58,200,207,1,0,202,37,29,48,8,66,
-190,255,8,245,60,23,61,0,1,114,34,87,21,0,34,95,
+190,255,52,243,60,23,61,0,1,114,34,87,21,0,34,95,
 25,0,174,81,225,135,0,0,176,89,186,5,127,82,177,5,
 31,18,165,5,10,16,125,23,1,0,29,48,128,255,62,5,
 32,22,0,2,125,23,5,0,61,54,4,0,128,255,46,5,
-133,37,29,48,32,70,16,0,190,255,192,244,60,23,61,0,
+133,37,29,48,32,70,16,0,190,255,236,242,60,23,61,0,
 1,114,34,103,21,0,34,111,25,0,174,97,125,103,1,0,
 225,135,0,0,176,105,125,111,5,0,29,48,128,255,246,4,
 32,134,0,2,125,135,9,0,61,54,8,0,128,255,238,4,
 35,231,5,0,35,255,9,0,35,239,1,0,0,82,3,30,
 28,0,127,0,3,30,220,255,99,63,25,0,99,255,17,0,
 99,223,13,0,99,239,5,0,99,231,9,0,9,216,38,23,
-61,0,4,138,130,23,35,0,100,23,213,139,8,232,29,23,
-2,0,99,143,1,0,216,18,158,18,100,23,217,139,9,224,
+61,0,4,138,130,23,35,0,100,23,225,139,8,232,29,23,
+2,0,99,143,1,0,216,18,158,18,100,23,229,139,9,224,
 157,23,5,0,224,17,186,5,0,82,245,21,28,48,2,64,
-0,58,190,255,38,244,28,48,157,119,5,0,29,111,2,0,
+0,58,190,255,82,242,28,48,157,119,5,0,29,111,2,0,
 14,64,205,78,63,0,3,56,128,255,244,2,35,103,1,0,
 12,94,255,255,91,95,0,0,35,223,13,0,35,231,9,0,
 35,239,5,0,35,255,17,0,3,30,36,0,127,0,3,30,
 220,255,99,63,25,0,99,255,17,0,99,239,9,0,99,231,
-13,0,38,23,61,0,8,224,130,23,35,0,100,23,213,139,
-9,232,28,23,2,0,6,138,216,18,158,18,100,23,217,139,
+13,0,38,23,61,0,8,224,130,23,35,0,100,23,225,139,
+9,232,28,23,2,0,6,138,216,18,158,18,100,23,229,139,
 99,143,1,0,252,23,5,0,99,23,5,0,35,54,4,0,
 128,255,250,3,125,7,4,0,93,7,2,0,28,23,2,0,
 93,7,3,0,194,78,63,0,29,48,35,71,5,0,3,56,
@@ -21542,101 +21697,101 @@ unsigned char tw_fw_code[] __initdata = 
 29,48,128,255,192,3,28,80,35,231,13,0,35,239,9,0,
 35,255,17,0,3,30,36,0,127,0,3,30,228,255,99,63,
 17,0,99,255,9,0,99,239,1,0,99,231,5,0,38,23,
-61,0,9,224,130,23,35,0,100,23,213,139,8,232,221,199,
+61,0,9,224,130,23,35,0,100,23,225,139,8,232,221,199,
 1,0,234,55,0,0,128,255,156,3,188,135,3,0,16,54,
 4,0,157,63,5,0,166,57,220,49,128,255,134,1,35,231,
 5,0,35,239,1,0,35,255,9,0,3,30,28,0,127,0,
 3,30,228,255,99,63,17,0,99,255,9,0,99,239,1,0,
 99,231,5,0,38,23,61,0,9,224,130,23,35,0,100,23,
-213,139,8,232,221,199,1,0,234,55,0,0,128,255,70,3,
+225,139,8,232,221,199,1,0,234,55,0,0,128,255,70,3,
 60,54,4,0,128,255,30,3,61,54,4,0,128,255,22,3,
 252,143,5,0,17,54,6,0,253,63,5,0,166,57,220,49,
 128,255,32,1,35,231,5,0,35,239,1,0,35,255,9,0,
 3,30,28,0,127,0,3,30,208,255,99,63,37,0,99,255,
 29,0,99,239,17,0,99,231,21,0,99,223,25,0,6,224,
 60,63,61,0,8,239,1,0,135,63,35,0,221,238,1,0,
-200,199,4,0,242,85,38,6,4,239,132,0,190,255,116,242,
-224,233,226,5,38,6,248,238,132,0,190,255,102,242,37,54,
-160,130,190,255,94,242,0,218,0,234,213,37,60,95,61,0,
+200,199,4,0,242,85,38,6,124,250,132,0,190,255,160,240,
+224,233,226,5,38,6,112,250,132,0,190,255,146,240,37,54,
+168,130,190,255,138,240,0,218,0,234,213,37,60,95,61,0,
 29,64,43,95,17,0,35,54,4,0,43,23,105,0,63,6,
-6,49,1,0,2,22,136,0,34,87,0,0,34,143,5,0,
+218,50,1,0,2,22,136,0,34,87,0,0,34,143,5,0,
 203,81,10,56,113,0,35,135,5,0,99,135,1,0,195,199,
 0,0,130,13,195,207,0,0,218,5,1,122,253,127,192,0,
-15,217,65,234,4,111,205,131,237,233,150,221,60,23,57,0,
+15,217,65,234,4,111,217,131,237,233,150,221,60,23,57,0,
 99,223,9,0,34,87,0,0,99,23,13,0,65,82,98,87,
-0,0,35,62,8,0,38,6,244,136,145,0,31,66,191,255,
-120,6,32,54,236,176,64,62,1,0,0,66,128,255,142,144,
-197,13,38,6,232,238,132,0,190,255,200,241,128,255,232,98,
-60,55,61,0,128,255,230,81,35,223,25,0,35,255,29,0,
+0,0,35,62,8,0,38,6,84,148,145,0,31,66,191,255,
+172,4,32,54,236,176,64,62,1,0,0,66,128,255,8,145,
+197,13,38,6,96,250,132,0,190,255,244,239,128,255,62,99,
+60,55,61,0,128,255,60,82,35,223,25,0,35,255,29,0,
 35,239,17,0,35,231,21,0,0,82,3,30,48,0,127,0,
 128,7,225,48,6,224,7,216,213,53,28,143,0,0,0,234,
-209,214,63,0,29,128,194,130,45,6,164,117,133,0,205,129,
+209,214,63,0,29,128,194,130,45,6,4,129,133,0,205,129,
 48,87,1,0,42,103,1,0,1,18,250,97,210,5,26,6,
 193,255,162,5,0,18,130,0,224,17,146,29,42,23,9,0,
 28,56,2,22,16,0,34,95,0,0,27,64,202,89,11,48,
-34,143,5,0,63,6,236,49,1,0,113,0,10,16,224,17,
+34,143,5,0,63,6,192,51,1,0,113,0,10,16,224,17,
 207,5,32,86,209,1,149,13,162,217,194,225,65,234,99,234,
 166,213,224,217,186,205,0,82,64,6,255,48,128,7,225,112,
 6,208,7,224,8,200,9,216,32,94,13,1,0,234,1,18,
-60,103,1,0,29,136,194,138,46,6,164,117,133,0,206,137,
+60,103,1,0,29,136,194,138,46,6,4,129,133,0,206,137,
 49,87,1,0,25,64,42,111,1,0,172,65,251,105,210,5,
 27,6,193,255,162,5,0,18,130,0,224,17,226,21,42,23,
 9,0,12,56,72,18,34,95,0,0,218,57,202,89,11,48,
-34,143,5,0,63,6,108,50,1,0,113,0,60,135,1,0,
+34,143,5,0,63,6,64,52,1,0,113,0,60,135,1,0,
 0,90,202,129,124,135,1,0,65,234,99,234,150,213,11,80,
 64,6,255,112,3,30,236,255,99,63,9,0,99,255,1,0,
 8,56,38,71,61,0,135,63,1,0,136,71,35,0,38,6,
-24,239,132,0,190,255,140,240,35,255,1,0,0,82,3,30,
+144,250,132,0,190,255,184,238,35,255,1,0,0,82,3,30,
 20,0,127,0,3,30,232,255,99,63,13,0,99,255,5,0,
 99,239,1,0,200,207,1,0,38,55,61,0,0,234,210,5,
-0,58,128,255,118,80,197,5,128,255,44,79,10,232,29,80,
+0,58,128,255,204,80,197,5,128,255,130,79,10,232,29,80,
 35,239,1,0,35,255,5,0,3,30,24,0,127,0,3,30,
 228,255,99,63,17,0,99,255,9,0,99,231,5,0,99,239,
 1,0,6,224,9,232,168,135,1,0,16,6,240,255,194,5,
 32,86,1,1,165,37,29,48,0,58,32,70,32,0,190,255,
-10,240,60,23,61,0,1,114,34,103,21,0,34,111,25,0,
+54,238,60,23,61,0,1,114,34,103,21,0,34,111,25,0,
 174,97,125,103,1,0,225,135,0,0,176,105,125,111,5,0,
 29,48,128,255,64,0,32,126,0,2,125,127,9,0,61,54,
 8,0,128,255,56,0,0,82,35,231,5,0,35,239,1,0,
 35,255,9,0,3,30,28,0,127,0,33,6,0,8,128,0,
-97,0,33,6,168,30,129,0,97,0,33,6,224,30,129,0,
-97,0,33,6,24,31,129,0,97,0,33,6,80,31,129,0,
-97,0,33,6,0,43,129,0,97,0,132,7,225,243,6,184,
-8,208,9,216,1,194,32,54,16,177,31,58,128,255,204,139,
+97,0,33,6,180,36,129,0,97,0,33,6,236,36,129,0,
+97,0,33,6,36,37,129,0,97,0,33,6,92,37,129,0,
+97,0,33,6,12,49,129,0,97,0,132,7,225,243,6,184,
+8,208,9,216,1,194,32,54,16,177,31,58,128,255,70,140,
 224,81,170,253,61,6,0,0,32,0,251,1,186,5,250,1,
 178,5,0,194,149,21,253,135,59,0,253,215,61,0,253,223,
-63,0,253,87,65,0,208,82,208,210,208,209,100,215,173,139,
-202,217,100,223,177,139,218,86,3,0,194,5,32,22,80,1,
-197,21,0,226,149,13,2,48,65,226,28,64,39,6,72,239,
-132,0,191,255,88,131,26,48,27,56,32,70,36,0,128,255,
-84,30,10,16,224,17,138,245,54,6,136,239,132,0,2,224,
+63,0,253,87,65,0,208,82,208,210,208,209,100,215,185,139,
+202,217,100,223,189,139,218,86,3,0,194,5,32,22,80,1,
+197,21,0,226,149,13,2,48,65,226,28,64,39,6,192,250,
+132,0,191,255,40,130,26,48,27,56,32,70,36,0,128,255,
+84,30,10,16,224,17,138,245,54,6,0,251,132,0,2,224,
 224,225,178,5,128,7,16,1,29,135,0,1,208,134,31,0,
 16,6,240,255,170,21,189,127,5,1,15,22,8,0,132,119,
-153,140,253,127,7,1,224,113,210,5,236,127,64,2,207,17,
+165,140,253,127,7,1,224,113,210,5,236,127,64,2,207,17,
 245,5,195,122,207,17,197,5,189,23,1,1,194,18,2,200,
 25,6,228,243,199,5,32,230,96,1,213,101,25,6,0,255,
 183,61,0,194,55,55,1,0,32,62,0,1,128,255,222,16,
-32,142,24,177,49,103,1,0,224,97,146,13,38,6,84,239,
-132,0,32,62,69,1,0,66,190,255,34,230,32,54,16,177,
-128,255,162,139,224,81,242,5,22,48,32,62,183,1,0,66,
-190,255,10,230,26,54,0,1,225,63,0,0,55,71,1,0,
+32,142,24,177,49,103,1,0,224,97,146,13,38,6,204,250,
+132,0,32,62,69,1,0,66,190,255,78,228,32,54,16,177,
+128,255,28,140,224,81,242,5,22,48,32,62,183,1,0,66,
+190,255,54,228,26,54,0,1,225,63,0,0,55,71,1,0,
 219,57,8,70,0,1,32,126,36,0,99,127,1,0,25,78,
 0,255,128,255,254,19,10,224,224,225,210,45,32,110,0,8,
 125,111,20,0,165,93,224,193,226,5,61,102,0,1,119,103,
 1,0,149,37,55,55,1,0,25,56,128,255,96,16,32,142,
-24,177,49,95,1,0,224,89,146,13,38,6,84,239,132,0,
-32,62,69,1,0,66,190,255,164,229,32,54,16,177,128,255,
-36,139,224,81,130,13,22,48,32,62,183,1,0,66,190,255,
-140,229,224,81,224,225,210,45,0,194,28,56,26,64,27,72,
-38,6,96,239,132,0,190,255,234,237,38,6,148,239,132,0,
-190,255,224,237,32,142,24,177,49,127,1,0,224,121,146,13,
-38,6,84,239,132,0,32,62,69,1,0,66,190,255,78,229,
-32,54,16,177,128,255,206,138,224,81,242,5,22,48,32,62,
-183,1,0,66,190,255,54,229,32,118,0,8,125,119,20,0,
+24,177,49,95,1,0,224,89,146,13,38,6,204,250,132,0,
+32,62,69,1,0,66,190,255,208,227,32,54,16,177,128,255,
+158,139,224,81,130,13,22,48,32,62,183,1,0,66,190,255,
+184,227,224,81,224,225,210,45,0,194,28,56,26,64,27,72,
+38,6,216,250,132,0,190,255,22,236,38,6,12,251,132,0,
+190,255,12,236,32,142,24,177,49,127,1,0,224,121,146,13,
+38,6,204,250,132,0,32,62,69,1,0,66,190,255,122,227,
+32,54,16,177,128,255,72,139,224,81,242,5,22,48,32,62,
+183,1,0,66,190,255,98,227,32,118,0,8,125,119,20,0,
 224,193,178,5,32,230,6,16,28,80,68,6,255,243,138,7,
 225,243,7,184,6,208,58,23,57,0,247,0,224,17,194,13,
 34,207,37,0,34,135,24,0,34,199,33,0,208,150,255,127,
-99,151,5,0,149,13,36,207,177,139,36,199,173,139,224,151,
+99,151,5,0,149,13,36,207,189,139,36,199,185,139,224,151,
 209,176,99,151,5,0,4,66,24,224,168,225,28,48,25,232,
 225,111,0,0,173,233,29,56,35,70,8,0,32,102,36,0,
 99,103,1,0,12,74,128,255,218,18,2,18,67,23,16,0,
@@ -21645,75 +21800,75 @@ unsigned char tw_fw_code[] __initdata = 
 11,0,28,48,29,56,35,70,8,0,32,134,129,0,99,135,
 1,0,12,74,128,255,156,18,58,23,61,0,224,17,194,5,
 130,183,35,0,213,5,32,142,210,176,241,183,1,0,22,56,
-38,6,188,239,132,0,190,255,218,236,32,54,124,0,191,255,
-22,78,10,208,224,209,154,13,38,6,208,239,132,0,32,62,
-96,1,0,66,190,255,70,228,26,48,0,58,32,70,124,0,
-190,255,168,236,26,48,23,56,35,71,5,0,27,72,128,255,
+38,6,52,251,132,0,190,255,6,235,32,54,124,0,191,255,
+226,76,10,208,224,209,154,13,38,6,72,251,132,0,32,62,
+96,1,0,66,190,255,114,226,26,48,0,58,32,70,124,0,
+190,255,212,234,26,48,23,56,35,71,5,0,27,72,128,255,
 98,0,187,193,225,95,0,0,171,201,224,217,194,21,27,78,
 252,255,24,48,25,56,27,22,225,255,58,134,26,0,208,17,
 66,7,0,0,32,126,129,0,99,127,1,0,26,64,128,255,
-18,18,149,21,22,56,23,64,38,6,16,240,132,0,190,255,
-98,236,131,63,9,0,28,64,29,72,38,6,232,239,132,0,
-190,255,80,236,26,48,191,255,126,77,74,6,255,243,127,0,
-33,6,192,253,128,0,97,0,0,18,226,126,40,0,46,6,
-232,193,142,0,206,121,111,23,24,0,111,7,9,0,32,110,
+18,18,149,21,22,56,23,64,38,6,136,251,132,0,190,255,
+142,234,131,63,9,0,28,64,29,72,38,6,96,251,132,0,
+190,255,124,234,26,48,190,255,244,254,74,6,255,243,127,0,
+33,6,252,1,129,0,97,0,0,18,226,126,40,0,46,6,
+72,205,142,0,206,121,111,23,24,0,111,7,9,0,32,110,
 16,0,111,111,2,0,111,7,33,0,111,7,12,0,111,7,
-37,0,111,7,14,0,44,6,20,205,1,0,111,7,0,0,
+37,0,111,7,14,0,44,6,100,207,1,0,111,7,0,0,
 65,18,111,7,18,0,2,6,0,255,111,103,5,0,230,221,
-43,6,232,233,142,0,96,95,233,176,32,86,192,16,96,7,
+43,6,72,245,142,0,96,95,233,176,32,86,192,16,96,7,
 225,176,0,18,96,87,229,176,2,88,232,95,68,2,11,80,
-44,6,232,233,142,0,204,81,12,126,40,0,207,89,106,95,
+44,6,72,245,142,0,204,81,12,126,40,0,207,89,106,95,
 25,0,106,7,9,0,106,7,2,0,106,7,12,0,106,7,
-14,0,45,6,148,204,1,0,106,7,0,0,65,18,106,7,
+14,0,45,6,228,206,1,0,106,7,0,0,65,18,106,7,
 18,0,2,6,64,239,106,111,5,0,246,221,127,0,128,7,
 193,0,6,224,229,87,64,0,224,7,96,1,32,23,229,176,
 10,232,188,17,224,17,231,5,2,6,64,239,191,5,96,23,
 229,176,253,47,32,0,64,6,223,0,128,7,193,0,0,234,
 229,87,64,0,224,7,96,1,10,224,0,18,226,134,40,0,
-46,6,232,193,142,0,206,129,48,111,24,0,144,106,169,5,
+46,6,72,205,142,0,206,129,48,111,24,0,144,106,169,5,
 65,234,65,18,2,6,0,255,166,245,252,47,32,0,29,80,
 64,6,223,0,128,7,33,0,38,23,24,0,194,142,0,128,
 17,6,0,128,194,5,32,22,8,1,245,29,32,126,16,0,
 194,134,255,127,102,135,24,0,38,22,12,0,98,7,1,0,
 102,127,2,0,68,18,98,7,1,0,38,55,24,0,43,6,
-176,137,141,0,6,112,194,114,203,113,46,87,1,0,224,81,
+16,149,141,0,6,112,194,114,203,113,46,87,1,0,224,81,
 178,5,128,255,164,11,0,18,2,80,64,6,63,0,128,7,
 225,16,6,248,7,216,61,6,255,255,255,127,229,87,64,0,
 224,7,96,1,10,224,31,48,191,255,56,244,10,120,239,134,
 40,0,32,118,160,180,206,129,48,111,17,0,224,105,146,61,
-0,90,235,22,40,0,42,6,232,193,142,0,202,17,34,143,
+0,90,235,22,40,0,42,6,72,205,142,0,202,17,34,143,
 24,0,144,138,169,45,34,119,29,0,46,119,61,0,224,113,
 194,37,34,103,29,0,44,103,61,0,140,103,35,0,239,97,
 202,29,34,87,29,0,42,87,13,0,27,16,202,17,36,87,
-33,175,48,6,255,255,255,15,240,81,190,13,46,6,1,0,
+45,175,48,6,255,255,255,15,240,81,190,13,46,6,1,0,
 0,240,238,81,231,5,45,6,255,255,255,63,205,17,205,81,
 170,17,253,17,174,5,2,232,65,90,11,6,0,255,166,205,
 252,47,32,0,29,80,64,6,255,16,134,7,97,0,6,248,
 229,87,64,0,224,7,96,1,10,232,255,55,35,0,0,58,
-3,64,190,255,174,230,253,47,32,0,70,6,127,0,130,7,
+3,64,190,255,218,228,253,47,32,0,70,6,127,0,130,7,
 225,48,6,232,61,143,12,0,224,137,138,125,229,87,64,0,
-224,7,96,1,61,223,29,0,48,6,20,205,1,0,125,135,
+224,7,96,1,61,223,29,0,48,6,100,207,1,0,125,135,
 5,0,10,224,61,23,24,0,59,215,33,0,194,126,0,128,
 15,6,0,128,234,29,32,110,16,0,194,118,255,127,125,119,
 24,0,61,22,12,0,98,7,1,0,125,111,2,0,68,18,
-98,7,1,0,61,55,24,0,49,6,176,137,141,0,6,96,
+98,7,1,0,61,55,24,0,49,6,16,149,141,0,6,96,
 194,98,209,97,44,135,1,0,224,129,178,5,128,255,90,10,
 58,119,26,0,59,23,36,0,194,113,122,119,26,0,221,199,
 2,0,170,61,61,223,24,0,149,21,229,87,64,0,32,22,
 159,255,10,232,29,248,66,249,255,47,32,0,29,248,255,47,
-32,0,4,111,80,139,224,105,250,37,51,6,5,0,32,0,
+32,0,4,111,92,139,224,105,250,37,51,6,5,0,32,0,
 211,255,0,0,186,237,229,87,64,0,224,7,96,1,32,103,
 185,176,99,87,1,0,95,98,96,103,185,176,202,13,32,95,
 13,177,224,89,138,13,64,86,0,0,43,6,96,0,0,0,
 74,95,8,240,35,255,1,0,255,47,32,0,50,6,54,0,
 32,0,114,223,0,0,252,47,32,0,66,6,255,48,49,6,
-66,58,1,0,102,143,5,0,32,134,32,0,102,135,2,0,
+22,60,1,0,102,143,5,0,32,134,32,0,102,135,2,0,
 127,0,130,7,225,16,6,232,61,143,12,0,224,137,170,85,
 229,87,64,0,224,7,96,1,61,55,29,0,32,134,16,0,
-125,135,2,0,47,6,20,205,1,0,125,127,5,0,10,224,
-128,255,96,50,29,48,191,255,142,253,61,223,24,0,149,21,
+125,135,2,0,47,6,100,207,1,0,125,127,5,0,10,224,
+128,255,182,50,29,48,191,255,142,253,61,223,24,0,149,21,
 229,87,64,0,32,22,159,255,10,232,29,248,66,249,255,47,
-32,0,29,248,255,47,32,0,4,119,80,139,224,113,250,37,
+32,0,29,248,255,47,32,0,4,119,92,139,224,113,250,37,
 51,6,5,0,32,0,211,255,0,0,186,237,229,87,64,0,
 224,7,96,1,32,111,185,176,99,87,1,0,95,106,96,111,
 185,176,202,13,32,103,13,177,224,97,138,13,64,86,0,0,
@@ -21721,81 +21876,81 @@ unsigned char tw_fw_code[] __initdata = 
 32,0,50,6,54,0,32,0,114,223,0,0,252,47,32,0,
 181,5,128,255,252,8,66,6,255,16,130,7,225,48,6,232,
 61,143,12,0,224,137,178,5,128,7,30,1,229,87,64,0,
-224,7,96,1,48,6,20,205,1,0,125,135,5,0,61,23,
+224,7,96,1,48,6,100,207,1,0,125,135,5,0,61,23,
 24,0,10,216,194,126,0,128,15,6,0,128,234,29,32,110,
 16,0,194,118,255,127,125,119,24,0,61,22,12,0,98,7,
 1,0,125,111,2,0,68,18,98,7,1,0,61,55,24,0,
-49,6,176,137,141,0,6,96,194,98,209,97,44,135,1,0,
+49,6,16,149,141,0,6,96,194,98,209,97,44,135,1,0,
 224,129,178,5,128,255,146,8,61,231,29,0,1,18,2,80,
 236,87,64,2,60,118,20,0,202,113,46,103,1,0,224,97,
 242,13,60,94,20,0,203,81,42,95,1,0,224,89,130,13,
 43,143,26,0,42,87,4,0,202,137,107,143,26,0,65,18,
 99,18,230,229,221,199,2,0,170,61,61,215,24,0,149,21,
 229,87,64,0,32,22,159,255,10,232,29,248,66,249,255,47,
-32,0,29,248,255,47,32,0,4,135,80,139,224,129,250,37,
+32,0,29,248,255,47,32,0,4,135,92,139,224,129,250,37,
 51,6,5,0,32,0,211,255,0,0,186,237,229,87,64,0,
 224,7,96,1,32,127,185,176,99,87,1,0,95,122,96,127,
 185,176,202,13,32,119,13,177,224,113,138,13,64,86,0,0,
 43,6,96,0,0,0,74,95,8,240,35,255,1,0,255,47,
 32,0,50,6,54,0,32,0,114,215,0,0,28,48,128,255,
-178,48,251,47,32,0,66,6,255,48,38,135,5,0,49,6,
-20,205,1,0,241,129,226,21,38,119,5,0,47,6,46,57,
-1,0,239,113,242,13,38,103,5,0,45,6,250,58,1,0,
-237,97,130,13,38,87,5,0,43,6,66,58,1,0,235,81,
+8,49,251,47,32,0,66,6,255,48,38,135,5,0,49,6,
+100,207,1,0,241,129,226,21,38,119,5,0,47,6,2,59,
+1,0,239,113,242,13,38,103,5,0,45,6,206,60,1,0,
+237,97,130,13,38,87,5,0,43,6,22,60,1,0,235,81,
 186,5,1,82,165,5,0,82,127,0,38,135,5,0,49,6,
-252,66,1,0,241,129,130,13,38,119,5,0,47,6,60,67,
+208,68,1,0,241,129,130,13,38,119,5,0,47,6,16,69,
 1,0,239,113,186,5,1,82,165,5,0,82,127,0,38,135,
-5,0,49,6,10,57,1,0,241,129,186,5,1,82,165,5,
+5,0,49,6,222,58,1,0,241,129,186,5,1,82,165,5,
 0,82,127,0,130,7,97,0,6,248,63,143,33,0,99,143,
 1,0,229,87,64,0,224,135,96,1,10,232,63,55,29,0,
-3,56,0,66,190,255,2,251,224,81,146,13,38,6,100,240,
-132,0,32,62,80,4,0,66,190,255,226,221,253,47,32,0,
+3,56,0,66,190,255,54,249,224,81,146,13,38,6,220,251,
+132,0,32,62,80,4,0,66,190,255,14,220,253,47,32,0,
 66,6,127,0,130,7,97,0,6,248,63,143,12,0,34,6,
 0,0,32,0,224,137,138,13,194,215,4,0,210,5,32,126,
 113,1,127,127,12,0,4,114,98,119,16,0,98,119,18,0,
 63,103,33,0,99,103,1,0,229,87,64,0,224,135,96,1,
-10,232,63,55,29,0,3,56,0,66,190,255,156,250,224,81,
-146,13,38,6,116,240,132,0,32,62,148,4,0,66,190,255,
-124,221,253,47,32,0,66,6,127,0,128,7,97,0,6,232,
+10,232,63,55,29,0,3,56,0,66,190,255,208,248,224,81,
+146,13,38,6,236,251,132,0,32,62,148,4,0,66,190,255,
+168,219,253,47,32,0,66,6,127,0,128,7,97,0,6,232,
 61,143,12,0,224,137,61,55,29,0,218,5,0,58,190,255,
-88,237,197,5,1,58,190,255,80,237,125,7,0,0,29,48,
-128,255,74,145,64,6,127,0,128,7,225,16,6,232,61,143,
+132,235,197,5,1,58,190,255,124,235,125,7,0,0,29,48,
+128,255,198,145,64,6,127,0,128,7,225,16,6,232,61,143,
 12,0,224,137,250,13,61,231,24,0,61,223,26,0,28,48,
-27,56,199,0,190,255,226,226,28,48,27,56,167,0,128,255,
-72,6,61,103,9,0,224,97,194,5,29,48,128,255,232,142,
+27,56,199,0,190,255,14,225,28,48,27,56,167,0,128,255,
+72,6,61,103,9,0,224,97,194,5,29,48,128,255,100,143,
 64,6,255,16,128,7,225,0,6,232,7,224,128,255,18,2,
-106,7,9,0,32,142,232,3,106,143,21,0,48,6,164,60,
+106,7,9,0,32,142,232,3,106,143,21,0,48,6,120,62,
 1,0,106,135,5,0,106,231,33,0,106,239,29,0,202,7,
 3,0,202,39,3,0,64,6,255,0,128,7,225,48,6,232,
 7,224,8,216,9,208,128,255,216,1,106,7,9,0,32,142,
-44,1,106,143,21,0,1,130,106,135,0,0,47,6,114,65,
+44,1,106,143,21,0,1,130,106,135,0,0,47,6,70,67,
 1,0,106,127,5,0,106,239,24,0,106,231,29,0,106,223,
 33,0,106,215,37,0,64,6,255,48,128,7,225,16,6,232,
 7,224,8,216,128,255,154,1,106,239,9,0,1,138,106,143,
-0,0,48,6,120,61,1,0,106,135,5,0,106,231,24,0,
+0,0,48,6,76,63,1,0,106,135,5,0,106,231,24,0,
 106,223,26,0,32,126,44,1,106,127,21,0,64,6,255,16,
 128,7,225,112,6,232,7,224,8,216,9,208,35,207,25,0,
 128,255,94,1,106,239,9,0,106,231,29,0,106,223,33,0,
-106,215,24,0,106,207,37,0,49,6,150,66,1,0,106,143,
+106,215,24,0,106,207,37,0,49,6,106,68,1,0,106,143,
 5,0,64,6,255,112,128,7,97,0,6,248,63,143,9,0,
 224,137,194,5,32,86,64,1,133,29,229,87,64,0,224,7,
-96,1,63,135,0,0,10,232,224,129,242,5,47,6,212,67,
+96,1,63,135,0,0,10,232,224,129,242,5,47,6,168,69,
 1,0,127,127,5,0,229,5,127,7,0,0,31,48,128,255,
-236,143,253,47,32,0,0,82,64,6,127,0,128,7,225,16,
+104,144,253,47,32,0,0,82,64,6,127,0,128,7,225,16,
 6,224,7,216,229,87,64,0,224,7,96,1,60,239,0,0,
 219,233,124,239,0,0,10,216,251,47,32,0,224,233,138,13,
-28,48,60,143,5,0,63,6,14,63,1,0,113,0,64,6,
+28,48,60,143,5,0,63,6,226,64,1,0,113,0,64,6,
 255,16,128,7,193,16,6,216,7,232,253,0,229,87,64,0,
 224,7,96,1,59,143,12,0,10,224,224,137,186,5,123,239,
 12,0,252,47,32,0,64,6,223,16,128,7,97,0,6,232,
 128,255,142,0,106,7,9,0,32,142,232,3,106,143,21,0,
-48,6,74,61,1,0,106,135,5,0,106,239,29,0,64,6,
+48,6,30,63,1,0,106,135,5,0,106,239,29,0,64,6,
 127,0,132,7,225,0,6,232,61,143,29,0,224,137,130,45,
 61,119,29,0,46,119,1,0,47,6,78,68,86,68,239,113,
 250,29,229,87,64,0,224,135,96,1,61,55,29,0,10,224,
 61,63,33,0,31,106,99,111,1,0,3,66,35,78,4,0,
-128,255,70,129,224,81,146,13,38,6,132,240,132,0,32,62,
-101,6,0,66,190,255,6,219,252,47,32,0,213,5,61,103,
+128,255,192,129,224,81,146,13,38,6,252,251,132,0,32,62,
+101,6,0,66,190,255,50,217,252,47,32,0,213,5,61,103,
 0,0,224,97,218,253,61,87,12,0,68,6,255,0,128,7,
 193,0,229,87,64,0,224,7,96,1,32,143,225,176,10,232,
 32,135,229,176,17,22,1,0,240,137,142,21,96,23,225,176,
@@ -21804,75 +21959,75 @@ unsigned char tw_fw_code[] __initdata = 
 96,1,32,111,229,176,32,103,225,176,237,97,190,253,253,47,
 32,0,133,221,128,7,97,0,6,248,63,143,29,0,224,137,
 146,29,229,87,64,0,224,135,96,1,63,55,29,0,10,232,
-63,63,33,0,0,66,128,255,164,129,224,81,146,13,38,6,
-164,240,132,0,32,62,24,7,0,66,190,255,96,218,253,47,
+63,63,33,0,0,66,128,255,30,130,224,81,146,13,38,6,
+28,252,132,0,32,62,24,7,0,66,190,255,140,216,253,47,
 32,0,64,6,127,0,128,7,97,0,6,232,191,255,98,255,
 10,16,98,239,9,0,32,142,232,3,98,143,21,0,1,130,
 125,135,0,0,253,127,19,0,98,127,18,0,98,135,28,0,
-45,6,58,65,1,0,98,111,5,0,61,103,14,0,12,6,
+45,6,14,67,1,0,98,111,5,0,61,103,14,0,12,6,
 252,253,186,5,194,23,2,0,2,80,64,6,127,0,128,7,
-225,0,6,224,60,239,9,0,61,135,5,0,49,6,26,65,
+225,0,6,224,60,239,9,0,61,135,5,0,49,6,238,66,
 1,0,241,129,186,13,253,127,29,0,65,122,125,127,28,0,
 1,114,125,119,0,0,29,80,245,29,191,255,244,254,10,16,
 98,239,9,0,32,110,232,3,98,111,21,0,1,98,98,103,
 0,0,252,95,19,0,98,95,18,0,220,215,2,0,178,5,
-194,23,2,0,1,82,98,87,28,0,49,6,26,65,1,0,
+194,23,2,0,1,82,98,87,28,0,49,6,238,66,1,0,
 98,143,5,0,2,80,64,6,255,0,128,7,97,0,6,232,
-61,143,12,0,224,137,218,5,253,55,19,0,128,255,250,31,
+61,143,12,0,224,137,218,5,253,55,19,0,128,255,210,31,
 29,48,128,255,20,0,64,6,127,0,128,7,33,0,128,255,
 8,0,64,6,63,0,128,7,97,0,6,232,221,215,2,0,
-210,5,253,55,19,0,128,255,118,31,61,135,12,0,47,6,
-148,204,1,0,125,127,5,0,29,48,128,255,42,139,64,6,
+210,5,253,55,19,0,128,255,78,31,61,135,12,0,47,6,
+228,206,1,0,125,127,5,0,29,48,128,255,166,139,64,6,
 127,0,128,7,225,0,6,232,61,55,24,0,61,71,37,0,
-0,58,190,255,78,222,61,135,29,0,224,129,242,13,229,87,
+0,58,190,255,122,220,61,135,29,0,224,129,242,13,229,87,
 64,0,224,135,96,1,61,55,29,0,10,224,61,63,33,0,
-0,66,128,255,72,128,252,47,32,0,64,6,255,0,130,7,
+0,66,128,255,194,128,252,47,32,0,64,6,255,0,130,7,
 225,48,6,232,0,218,229,87,64,0,224,7,96,1,61,55,
 33,0,10,208,61,231,37,0,224,49,146,29,125,7,33,0,
 61,143,12,0,224,137,154,13,221,143,3,0,221,167,3,0,
-128,255,158,33,10,216,181,21,190,255,52,217,224,225,242,13,
-28,48,190,255,42,217,125,7,37,0,149,13,224,225,242,5,
-125,7,37,0,28,48,128,255,120,33,10,216,61,135,0,0,
+128,255,118,33,10,216,181,21,190,255,96,215,224,225,242,13,
+28,48,190,255,86,215,125,7,37,0,149,13,224,225,242,5,
+125,7,37,0,28,48,128,255,80,33,10,216,61,135,0,0,
 219,129,125,135,0,0,61,127,0,0,224,121,218,45,229,87,
 64,0,224,135,96,1,61,119,29,0,224,113,99,119,1,0,
 130,37,11,18,206,199,6,0,146,13,3,56,38,6,216,215,
-255,255,0,66,190,255,130,245,10,16,224,17,162,21,107,18,
-250,5,35,55,1,0,1,58,190,255,94,232,165,13,38,6,
-180,240,132,0,32,62,189,8,0,66,190,255,80,216,224,81,
-29,48,128,255,34,138,250,47,32,0,66,6,255,48,128,7,
-97,0,6,232,61,55,33,0,128,255,6,44,29,48,128,255,
-6,138,64,6,127,0,128,7,225,48,38,215,33,0,38,231,
-24,0,38,223,37,0,38,239,29,0,128,255,234,137,229,87,
+255,255,0,66,190,255,182,243,10,16,224,17,162,21,107,18,
+250,5,35,55,1,0,1,58,190,255,138,230,165,13,38,6,
+44,252,132,0,32,62,189,8,0,66,190,255,124,214,224,81,
+29,48,128,255,158,138,250,47,32,0,66,6,255,48,128,7,
+97,0,6,232,61,55,33,0,128,255,92,44,29,48,128,255,
+130,138,64,6,127,0,128,7,225,48,38,215,33,0,38,231,
+24,0,38,223,37,0,38,239,29,0,128,255,102,138,229,87,
 64,0,224,7,96,1,28,16,194,18,10,248,61,86,140,8,
 202,17,34,87,1,0,28,88,187,81,98,87,1,0,193,90,
 61,22,140,0,26,80,195,82,202,17,11,96,194,97,44,23,
 0,0,187,17,172,5,0,18,61,102,140,0,204,81,202,89,
 107,23,0,0,255,47,32,0,64,6,255,48,128,7,225,16,
 6,232,61,143,12,0,224,137,234,21,61,223,29,0,229,87,
-64,0,224,7,96,1,61,55,25,0,10,224,190,255,168,243,
+64,0,224,7,96,1,61,55,25,0,10,224,190,255,212,241,
 219,23,66,0,252,47,32,0,125,7,0,0,29,48,128,255,
-140,139,181,5,128,255,186,0,64,6,255,16,128,7,225,16,
+8,140,181,5,128,255,186,0,64,6,255,16,128,7,225,16,
 6,248,63,143,12,0,224,137,170,29,63,239,29,0,61,231,
 33,0,229,87,64,0,224,7,96,1,252,135,43,0,208,134,
 244,255,124,135,42,0,10,216,125,7,65,0,251,47,32,0,
-127,7,0,0,31,48,128,255,68,139,181,5,128,255,114,0,
+127,7,0,0,31,48,128,255,192,139,181,5,128,255,114,0,
 64,6,255,16,128,7,225,16,6,232,61,143,12,0,224,137,
 218,29,61,23,29,0,34,255,33,0,226,223,37,0,27,16,
 63,127,26,0,226,0,194,121,127,127,26,0,229,87,64,0,
-224,7,96,1,36,119,49,139,10,224,219,113,100,119,49,139,
-252,47,32,0,31,48,191,255,170,7,29,48,128,255,200,136,
-64,6,255,16,128,7,33,0,102,7,0,0,128,255,222,138,
-64,6,63,0,128,7,33,6,30,187,128,0,97,0,33,6,
-20,218,128,0,97,0,33,6,240,255,128,0,97,0,128,7,
+224,7,96,1,36,119,61,139,10,224,219,113,100,119,61,139,
+252,47,32,0,31,48,191,255,222,5,29,48,128,255,68,137,
+64,6,255,16,128,7,33,0,102,7,0,0,128,255,90,139,
+64,6,63,0,128,7,33,6,90,191,128,0,97,0,33,6,
+80,222,128,0,97,0,33,6,44,4,129,0,97,0,128,7,
 33,0,32,142,0,8,50,6,18,0,32,0,114,143,0,0,
-38,6,124,247,132,0,128,255,46,6,31,50,32,62,17,0,
-0,66,190,255,30,223,4,23,80,139,224,17,186,21,3,50,
-191,255,128,231,196,255,144,140,178,13,164,127,21,133,224,121,
-242,5,38,6,88,247,132,0,128,255,252,5,181,5,128,255,
-234,51,64,6,63,0,128,7,33,0,2,50,191,255,84,231,
-38,6,144,247,132,0,190,255,202,222,36,63,33,175,38,6,
-164,247,132,0,190,255,188,222,31,50,32,62,18,0,0,66,
-190,255,192,222,191,255,90,31,64,6,63,0,130,7,33,0,
+38,6,244,2,133,0,128,255,46,6,31,50,32,62,17,0,
+0,66,190,255,74,221,4,23,92,139,224,17,186,21,3,50,
+191,255,128,231,196,255,156,140,178,13,164,127,33,133,224,121,
+242,5,38,6,208,2,133,0,128,255,252,5,181,5,128,255,
+64,52,64,6,63,0,128,7,33,0,2,50,191,255,84,231,
+38,6,8,3,133,0,190,255,246,220,36,63,45,175,38,6,
+28,3,133,0,190,255,232,220,31,50,32,62,18,0,0,66,
+190,255,236,220,191,255,46,30,64,6,63,0,130,7,33,0,
 7,16,8,80,198,134,255,0,194,5,32,86,82,1,165,13,
 0,56,2,64,32,126,40,0,99,127,1,0,10,72,128,255,
 34,4,66,6,63,0,130,7,33,0,7,80,8,16,198,134,
@@ -21885,10 +22040,10 @@ unsigned char tw_fw_code[] __initdata = 
 26,0,226,135,27,0,224,129,226,143,0,0,143,138,161,253,
 226,119,29,0,226,87,31,0,208,82,14,81,127,0,128,7,
 33,0,6,16,7,64,38,6,0,1,32,0,2,56,191,255,
-52,202,191,255,214,36,64,6,63,0,128,7,33,0,7,64,
-39,6,0,1,32,0,191,255,28,202,64,6,63,0,128,7,
+130,201,191,255,170,35,64,6,63,0,128,7,33,0,7,64,
+39,6,0,1,32,0,191,255,106,201,64,6,63,0,128,7,
 225,112,6,200,7,232,8,216,9,208,218,0,32,54,36,0,
-191,255,244,62,10,224,29,6,20,255,186,5,13,18,165,37,
+191,255,192,61,10,224,29,6,20,255,186,5,13,18,165,37,
 29,6,24,255,186,5,15,18,213,29,29,6,28,255,186,5,
 13,18,133,29,29,6,208,255,186,5,15,18,181,21,29,6,
 224,255,186,5,13,18,229,13,29,6,54,255,186,5,11,18,
@@ -21897,120 +22052,120 @@ unsigned char tw_fw_code[] __initdata = 
 124,215,10,0,64,142,255,0,27,128,81,129,144,130,92,223,
 12,0,92,135,14,0,64,118,0,15,219,102,0,255,78,217,
 152,218,92,223,15,0,136,98,92,103,13,0,92,239,17,0,
-32,102,224,255,92,103,16,0,25,48,28,56,190,255,226,216,
-28,48,191,255,66,62,0,82,64,6,255,112,128,7,225,112,
+32,102,224,255,92,103,16,0,25,48,28,56,190,255,14,215,
+28,48,190,255,184,239,0,82,64,6,255,112,128,7,225,112,
 59,6,0,0,32,0,128,255,186,11,32,142,0,64,123,143,
-24,0,251,231,255,0,28,208,224,209,170,53,38,6,180,247,
-132,0,32,62,142,1,0,66,190,255,98,212,149,45,0,234,
+24,0,251,231,255,0,28,208,224,209,170,53,38,6,44,3,
+133,0,32,62,142,1,0,66,190,255,142,210,149,45,0,234,
 28,16,181,5,161,18,65,234,194,126,1,0,194,253,28,112,
 1,106,253,111,192,0,45,224,78,225,220,0,29,6,240,255,
-158,29,29,48,128,255,56,25,224,81,170,21,29,48,32,62,
-65,0,32,70,16,2,190,255,170,220,10,200,29,48,2,58,
-128,255,90,25,224,201,194,5,25,48,190,255,158,220,224,225,
+158,29,29,48,128,255,16,25,224,81,170,21,29,48,32,62,
+65,0,32,70,16,2,190,255,214,218,10,200,29,48,2,58,
+128,255,50,25,224,201,194,5,25,48,190,255,202,218,224,225,
 250,213,32,126,0,64,123,127,24,0,251,111,255,0,237,209,
-146,13,38,6,180,247,132,0,32,62,177,1,0,66,190,255,
-236,211,32,102,16,0,123,103,18,0,128,255,248,10,64,6,
+146,13,38,6,44,3,133,0,32,62,177,1,0,66,190,255,
+24,210,32,102,16,0,123,103,18,0,128,255,248,10,64,6,
 255,112,128,7,225,0,128,255,10,11,0,234,29,48,128,255,
-48,33,224,81,242,21,29,48,128,255,196,24,224,81,170,21,
-29,48,32,62,65,0,32,70,17,2,190,255,54,220,10,224,
-29,48,2,58,128,255,230,24,224,225,194,5,28,48,190,255,
-42,220,65,234,29,6,240,255,166,229,160,143,53,177,224,137,
+8,33,224,81,242,21,29,48,128,255,156,24,224,81,170,21,
+29,48,32,62,65,0,32,70,17,2,190,255,98,218,10,224,
+29,48,2,58,128,255,190,24,224,225,194,5,28,48,190,255,
+86,218,65,234,29,6,240,255,166,229,160,143,53,177,224,137,
 210,5,32,134,17,2,96,135,54,177,128,255,126,10,32,126,
 0,2,50,6,18,0,32,0,114,127,0,0,128,255,134,10,
 64,6,255,0,128,7,225,0,128,255,152,10,0,234,29,48,
-128,255,190,32,224,81,242,21,29,48,128,255,82,24,224,81,
-170,21,29,48,32,62,65,0,32,70,18,2,190,255,196,219,
-10,224,29,48,2,58,128,255,116,24,224,225,194,5,28,48,
-190,255,184,219,65,234,29,6,240,255,166,229,160,143,53,177,
+128,255,150,32,224,81,242,21,29,48,128,255,42,24,224,81,
+170,21,29,48,32,62,65,0,32,70,18,2,190,255,240,217,
+10,224,29,48,2,58,128,255,76,24,224,225,194,5,28,48,
+190,255,228,217,65,234,29,6,240,255,166,229,160,143,53,177,
 224,137,210,5,32,134,18,2,96,135,54,177,32,126,0,2,
 50,6,18,0,32,0,114,127,0,0,128,255,24,10,64,6,
 255,0,130,7,225,16,6,224,0,234,213,5,28,48,128,255,
-126,2,10,232,224,233,178,253,61,63,9,0,38,6,192,247,
-132,0,190,255,78,219,61,223,4,0,27,6,239,253,194,61,
+126,2,10,232,224,233,178,253,61,63,9,0,38,6,56,3,
+133,0,190,255,122,217,61,223,4,0,27,6,239,253,194,61,
 27,6,235,253,201,61,226,5,27,6,233,253,249,5,162,45,
 229,53,1,130,64,135,52,177,165,101,128,255,74,2,32,103,
 65,177,202,126,31,0,195,122,207,97,96,103,65,177,10,16,
 191,18,194,22,63,0,202,17,32,94,192,255,75,17,162,81,
-10,64,10,72,191,74,1,50,0,58,191,255,48,111,11,72,
+10,64,10,72,191,74,1,50,0,58,191,255,0,110,11,72,
 32,55,65,177,1,90,99,95,1,0,10,64,128,255,214,6,
 229,61,32,55,65,177,1,82,99,87,1,0,3,66,0,74,
 128,255,194,6,197,53,128,255,208,7,149,53,128,255,132,9,
-0,234,29,48,128,255,170,31,10,16,224,17,194,29,34,55,
-9,0,191,255,12,244,224,81,234,21,29,48,128,255,48,23,
-224,81,154,21,29,48,27,64,32,62,65,0,190,255,164,218,
-10,224,29,48,2,58,128,255,84,23,224,225,194,5,28,48,
-190,255,152,218,65,234,29,6,240,255,198,221,160,127,53,177,
+0,234,29,48,128,255,130,31,10,16,224,17,194,29,34,55,
+9,0,191,255,12,244,224,81,234,21,29,48,128,255,8,23,
+224,81,154,21,29,48,27,64,32,62,65,0,190,255,208,216,
+10,224,29,48,2,58,128,255,44,23,224,225,194,5,28,48,
+190,255,196,216,65,234,29,6,240,255,198,221,160,127,53,177,
 224,121,178,5,96,223,54,177,128,255,10,9,66,6,255,16,
 138,7,225,243,6,176,7,184,8,232,9,224,32,54,16,177,
-31,58,128,255,150,118,224,81,170,253,29,208,0,202,99,231,
+31,58,128,255,16,119,224,81,170,253,29,208,0,202,99,231,
 1,0,35,151,56,0,0,218,129,146,35,127,56,0,233,151,
 0,0,207,94,32,0,99,151,5,0,207,0,226,151,0,0,
 99,151,9,0,15,6,127,255,234,151,0,0,99,151,13,0,
 35,119,1,0,32,142,0,1,185,113,14,6,0,255,35,151,
 5,0,241,119,60,235,224,145,170,45,29,6,0,255,174,29,
 35,151,13,0,32,198,40,0,224,145,202,13,32,198,36,0,
-149,13,28,48,65,218,27,64,39,6,224,247,132,0,191,255,
-252,109,22,48,23,56,24,64,128,255,250,8,10,224,224,225,
+149,13,28,48,65,218,27,64,39,6,88,3,133,0,191,255,
+204,108,22,48,23,56,24,64,128,255,250,8,10,224,224,225,
 154,245,26,48,29,56,191,255,200,251,149,13,28,48,65,218,
-27,64,39,6,224,247,132,0,191,255,210,109,22,48,23,56,
+27,64,39,6,88,3,133,0,191,255,162,108,22,48,23,56,
 227,71,57,0,128,255,206,8,10,224,224,225,138,245,35,151,
 9,0,224,145,218,5,26,48,29,56,191,255,176,251,221,201,
 29,72,191,74,221,177,225,103,0,0,204,73,201,185,35,143,
 1,0,221,209,241,201,214,173,32,142,24,177,49,87,1,0,
-224,81,146,13,38,6,212,247,132,0,32,62,69,1,0,66,
-190,255,218,208,32,54,16,177,128,255,90,118,224,81,146,13,
-38,6,236,247,132,0,32,62,183,1,0,66,190,255,190,208,
+224,81,146,13,38,6,76,3,133,0,32,62,69,1,0,66,
+190,255,6,207,32,54,16,177,128,255,212,118,224,81,146,13,
+38,6,100,3,133,0,32,62,183,1,0,66,190,255,234,206,
 28,80,74,6,255,243,128,7,225,112,6,208,7,200,8,216,
 219,0,0,234,0,226,165,13,2,224,28,48,65,234,29,64,
-39,6,248,247,132,0,191,255,52,109,26,48,25,56,27,64,
+39,6,112,3,133,0,191,255,4,108,26,48,25,56,27,64,
 128,255,222,9,10,16,224,17,138,245,0,80,188,81,234,0,
-64,6,255,112,33,6,72,180,129,0,97,0,33,6,118,250,
-128,0,97,0,33,6,12,60,130,0,97,0,128,7,225,48,
-61,6,0,0,32,0,32,54,16,177,37,62,248,130,1,66,
-191,255,252,57,32,54,68,177,39,6,52,248,132,0,1,66,
-191,255,236,57,32,134,195,4,125,135,12,0,128,255,242,2,
-128,118,0,192,125,119,12,0,32,110,48,42,4,103,204,131,
-125,111,18,0,224,97,242,5,36,95,206,131,100,90,239,23,
-0,0,197,13,1,18,132,87,83,139,224,81,226,5,36,127,
-206,131,104,122,175,5,0,18,130,0,128,86,0,128,224,17,
+64,6,255,112,33,6,234,188,129,0,97,0,33,6,178,254,
+128,0,97,0,33,6,176,68,130,0,97,0,128,7,225,48,
+61,6,0,0,32,0,32,54,16,177,37,62,0,131,1,66,
+191,255,200,56,32,54,68,177,39,6,172,3,133,0,1,66,
+191,255,184,56,32,134,195,4,125,135,12,0,128,255,242,2,
+128,118,0,192,125,119,12,0,32,110,48,42,4,103,216,131,
+125,111,18,0,224,97,242,5,36,95,218,131,100,90,239,23,
+0,0,197,13,1,18,132,87,95,139,224,81,226,5,36,127,
+218,131,104,122,175,5,0,18,130,0,128,86,0,128,224,17,
 178,5,32,86,0,64,125,87,20,0,8,106,125,111,20,0,
 32,102,51,0,125,103,48,0,61,126,32,6,125,7,48,0,
 96,127,61,177,96,7,193,223,61,86,0,6,96,87,57,177,
 0,18,61,86,0,4,1,90,106,7,30,0,11,112,32,103,
 193,223,226,119,192,0,46,104,77,97,96,103,193,223,10,86,
-32,0,65,18,2,6,238,255,134,245,100,7,224,139,68,7,
-232,139,64,7,52,177,96,7,54,177,64,7,53,177,61,231,
-2,0,38,6,204,248,132,0,208,226,61,223,2,0,156,226,
-28,56,212,218,156,218,27,64,190,255,216,215,58,6,20,184,
-145,0,26,48,32,62,32,0,9,66,190,255,190,215,90,7,
+32,0,65,18,2,6,238,255,134,245,100,7,236,139,68,7,
+244,139,64,7,52,177,96,7,54,177,64,7,53,177,61,231,
+2,0,38,6,68,4,133,0,208,226,61,223,2,0,156,226,
+28,56,212,218,156,218,27,64,190,255,4,214,58,6,116,195,
+145,0,26,48,32,62,32,0,9,66,190,255,234,213,90,7,
 8,0,28,94,48,0,90,95,0,0,32,86,46,0,90,87,
 1,0,27,134,48,0,90,135,2,0,32,126,48,0,90,127,
 3,0,181,5,61,23,64,0,221,231,5,0,194,253,11,50,
 39,6,193,19,2,16,191,255,70,249,15,50,191,255,104,249,
 202,0,64,118,9,0,14,81,10,56,15,50,191,255,48,249,
 7,50,191,255,82,249,16,18,66,81,32,110,16,4,125,111,
-14,0,15,98,125,103,74,0,100,87,229,139,125,103,74,0,
-32,54,150,0,190,255,84,215,32,86,0,4,125,87,76,0,
+14,0,15,98,125,103,74,0,100,87,241,139,125,103,74,0,
+32,54,150,0,190,255,128,213,32,86,0,4,125,87,76,0,
 10,130,125,135,74,0,15,122,125,127,74,0,32,118,41,0,
 125,119,74,0,32,110,25,0,125,111,74,0,125,119,74,0,
 32,86,39,0,125,111,74,0,8,130,125,87,76,0,36,55,
-77,139,125,135,74,0,128,255,92,16,10,16,224,17,226,5,
-2,6,236,255,225,23,0,0,165,5,1,18,36,55,77,139,
-125,23,76,0,128,255,70,16,10,224,224,225,154,13,28,56,
-38,6,64,248,132,0,190,255,218,214,3,226,213,13,10,90,
-75,224,220,0,99,226,131,13,28,56,38,6,64,248,132,0,
-190,255,192,214,3,226,198,226,36,55,77,139,220,0,128,255,
-20,16,10,16,104,18,153,13,2,56,38,6,92,248,132,0,
-190,255,160,214,0,18,213,13,108,18,147,13,2,56,38,6,
-92,248,132,0,190,255,140,214,4,18,181,5,88,18,194,0,
-200,18,2,225,220,230,208,111,156,230,47,144,36,55,77,139,
-125,231,74,0,128,255,214,15,10,22,244,255,206,18,36,55,
-77,139,100,23,226,139,128,255,204,15,10,16,10,82,234,23,
-194,2,228,87,227,139,2,81,138,110,0,144,100,111,226,139,
-125,111,78,0,38,6,224,248,132,0,190,255,54,214,253,63,
-77,0,38,6,132,248,132,0,190,255,40,214,253,63,75,0,
-38,6,156,248,132,0,190,255,26,214,253,63,79,0,38,6,
-180,248,132,0,190,255,12,214,32,126,28,0,125,127,72,0,
+89,139,125,135,74,0,128,255,52,16,10,16,224,17,226,5,
+2,6,236,255,225,23,0,0,165,5,1,18,36,55,89,139,
+125,23,76,0,128,255,30,16,10,224,224,225,154,13,28,56,
+38,6,184,3,133,0,190,255,6,213,3,226,213,13,10,90,
+75,224,220,0,99,226,131,13,28,56,38,6,184,3,133,0,
+190,255,236,212,3,226,198,226,36,55,89,139,220,0,128,255,
+236,15,10,16,104,18,153,13,2,56,38,6,212,3,133,0,
+190,255,204,212,0,18,213,13,108,18,147,13,2,56,38,6,
+212,3,133,0,190,255,184,212,4,18,181,5,88,18,194,0,
+200,18,2,225,220,230,208,111,156,230,47,144,36,55,89,139,
+125,231,74,0,128,255,174,15,10,22,244,255,206,18,36,55,
+89,139,100,23,238,139,128,255,164,15,10,16,10,82,234,23,
+194,2,228,87,239,139,2,81,138,110,0,144,100,111,238,139,
+125,111,78,0,38,6,88,4,133,0,190,255,98,212,253,63,
+77,0,38,6,252,3,133,0,190,255,84,212,253,63,75,0,
+38,6,20,4,133,0,190,255,70,212,253,63,79,0,38,6,
+44,4,133,0,190,255,56,212,32,126,28,0,125,127,72,0,
 0,50,0,58,32,70,40,0,128,255,42,5,32,118,15,16,
 125,119,14,0,64,86,0,0,202,191,32,241,229,87,64,0,
 224,7,96,1,10,232,64,86,0,0,10,87,32,241,10,248,
@@ -22021,47 +22176,47 @@ unsigned char tw_fw_code[] __initdata = 
 98,143,18,0,32,126,16,0,98,127,18,0,64,6,127,0,
 47,6,0,4,32,0,197,50,6,128,207,129,32,118,0,64,
 112,119,30,0,44,6,0,4,32,0,204,49,102,7,30,0,
-127,0,34,6,0,0,32,0,36,142,226,139,209,47,1,0,
-228,135,227,139,98,135,78,0,32,126,30,0,98,127,72,0,
+127,0,34,6,0,0,32,0,36,142,238,139,209,47,1,0,
+228,135,239,139,98,135,78,0,32,126,30,0,98,127,72,0,
 32,118,128,0,98,119,14,0,64,86,0,0,43,6,48,0,
 0,0,74,95,144,244,127,0,34,6,0,0,32,0,228,143,
-227,139,209,142,255,223,98,143,78,0,100,143,226,139,98,7,
+239,139,209,142,255,223,98,143,78,0,100,143,238,139,98,7,
 72,0,32,126,128,0,98,127,12,0,64,86,0,0,43,6,
 48,0,0,0,74,95,144,244,127,0,128,7,225,16,61,6,
 0,0,32,0,128,255,172,3,61,143,72,0,143,138,185,37,
 61,111,84,0,205,230,31,0,28,6,240,255,206,21,28,48,
-32,62,65,0,32,70,23,2,190,255,216,212,10,216,224,217,
-162,21,28,48,128,255,72,17,224,81,218,13,27,48,190,255,
-202,212,149,13,160,87,53,177,224,81,210,5,32,142,23,2,
+32,62,65,0,32,70,23,2,190,255,4,211,10,216,224,217,
+162,21,28,48,128,255,32,17,224,81,218,13,27,48,190,255,
+246,210,149,13,160,87,53,177,224,81,210,5,32,142,23,2,
 96,143,54,177,221,255,73,0,178,37,61,87,80,0,202,230,
 31,0,28,6,240,255,206,21,28,48,32,62,65,0,32,70,
-22,2,190,255,142,212,10,216,224,217,162,21,28,48,128,255,
-254,16,224,81,218,13,27,48,190,255,128,212,149,13,160,127,
+22,2,190,255,186,210,10,216,224,217,162,21,28,48,128,255,
+214,16,224,81,218,13,27,48,190,255,172,210,149,13,160,127,
 53,177,224,121,210,5,32,118,22,2,96,119,54,177,32,110,
 30,0,125,111,72,0,128,255,236,2,64,6,255,16,128,7,
-33,0,38,6,244,248,132,0,190,255,56,212,32,54,19,0,
-191,255,20,246,202,62,3,0,37,54,0,131,190,255,36,212,
+33,0,38,6,108,4,133,0,190,255,100,210,32,54,19,0,
+191,255,20,246,202,62,3,0,37,54,8,131,190,255,80,210,
 32,142,0,32,50,6,18,0,32,0,114,143,0,0,64,6,
 63,0,132,7,225,243,6,224,8,208,9,216,35,199,45,0,
-32,54,16,177,31,58,128,255,66,112,224,81,170,253,229,87,
+32,54,16,177,31,58,128,255,188,112,224,81,170,253,229,87,
 64,0,224,7,96,1,10,200,61,6,0,0,32,0,0,18,
 61,86,0,4,202,239,31,0,234,253,10,86,32,0,65,18,
 2,6,238,255,134,253,191,255,162,254,224,193,130,21,36,134,
-226,139,208,47,1,0,228,127,227,139,125,127,78,0,64,86,
+238,139,208,47,1,0,228,127,239,139,125,127,78,0,64,86,
 0,0,43,6,48,0,0,0,74,95,144,244,0,184,32,110,
 0,255,28,176,77,177,22,48,0,56,32,70,40,0,128,255,
 196,2,61,238,0,1,220,22,248,0,131,18,195,18,194,233,
 61,79,5,0,61,71,1,0,28,56,99,215,1,0,99,223,
-5,0,38,6,12,249,132,0,190,255,104,211,61,103,1,0,
+5,0,38,6,132,4,133,0,190,255,148,209,61,103,1,0,
 26,80,44,81,125,87,1,0,61,111,5,0,27,88,45,89,
 125,95,5,0,22,48,0,56,32,70,1,2,128,255,118,2,
 191,255,226,253,249,47,32,0,32,142,24,177,49,127,1,0,
-224,121,146,13,38,6,64,249,132,0,32,62,69,1,0,66,
-190,255,170,202,32,54,16,177,128,255,42,112,224,81,162,13,
-38,6,76,249,132,0,32,62,183,1,0,66,190,255,142,202,
+224,121,146,13,38,6,184,4,133,0,32,62,69,1,0,66,
+190,255,214,200,32,54,16,177,128,255,164,112,224,81,162,13,
+38,6,196,4,133,0,32,62,183,1,0,66,190,255,186,200,
 224,81,68,6,255,243,128,7,97,0,32,239,61,177,221,239,
-31,0,146,13,38,6,88,249,132,0,32,62,220,2,0,66,
-190,255,106,202,128,142,1,128,50,6,24,0,32,0,114,143,
+31,0,146,13,38,6,208,4,133,0,32,62,220,2,0,66,
+190,255,150,200,128,142,1,128,50,6,24,0,32,0,114,143,
 0,0,50,6,254,0,32,0,50,135,0,0,208,126,3,0,
 178,5,128,255,202,1,64,102,0,128,125,103,13,0,32,94,
 36,2,125,95,18,0,32,86,0,1,125,87,20,0,31,138,
@@ -22072,16 +22227,16 @@ unsigned char tw_fw_code[] __initdata = 
 251,239,1,0,0,18,221,134,0,16,178,5,59,23,33,0,
 2,224,0,18,131,234,217,5,251,143,37,0,17,16,194,0,
 2,225,181,61,221,118,0,4,242,13,32,94,0,4,123,95,
-18,0,36,87,224,139,224,81,202,5,191,255,76,243,197,5,
-1,138,68,143,232,139,221,126,0,8,178,5,191,255,226,242,
+18,0,36,87,236,139,224,81,202,5,191,255,76,243,197,5,
+1,138,68,143,244,139,221,126,0,8,178,5,191,255,226,242,
 221,94,0,1,210,5,32,134,0,1,123,135,18,0,221,118,
 16,0,178,5,191,255,248,244,221,86,8,0,178,5,128,255,
-60,11,221,118,0,2,178,5,191,255,12,246,221,86,2,0,
+20,11,221,118,0,2,178,5,191,255,12,246,221,86,2,0,
 178,5,191,255,144,245,221,118,128,0,178,5,191,255,222,252,
 142,234,185,5,191,255,138,253,251,239,1,0,221,118,154,47,
 170,197,224,225,210,21,0,234,1,218,213,13,27,16,253,23,
 192,0,2,88,92,89,226,5,34,80,74,225,29,48,128,255,
-120,126,65,234,29,6,238,255,190,5,224,225,138,245,64,86,
+244,126,65,234,29,6,238,255,190,5,224,225,138,245,64,86,
 0,0,43,6,48,0,0,0,74,95,144,244,64,86,0,0,
 202,191,34,241,64,6,255,16,128,142,0,192,50,6,16,0,
 32,0,114,143,0,0,50,6,18,0,32,0,114,143,0,0,
@@ -22089,18 +22244,18 @@ unsigned char tw_fw_code[] __initdata = 
 32,134,16,0,50,6,14,0,32,0,114,135,0,0,127,0,
 128,7,33,0,32,142,16,0,50,6,12,0,32,0,114,143,
 0,0,64,86,0,0,43,6,48,0,0,0,74,95,144,244,
-5,50,190,255,38,209,32,134,32,0,50,6,12,0,32,0,
+5,50,190,255,82,207,32,134,32,0,50,6,12,0,32,0,
 114,135,0,0,64,86,0,0,43,6,48,0,0,0,74,95,
-144,244,5,50,190,255,4,209,64,6,63,0,128,7,33,0,
+144,244,5,50,190,255,48,207,64,6,63,0,128,7,33,0,
 191,255,176,255,2,138,50,6,16,0,32,0,114,143,0,0,
 50,6,18,0,32,0,114,143,0,0,191,255,120,255,64,6,
 63,0,128,7,225,112,6,208,7,216,8,224,220,0,26,48,
-27,56,3,66,0,74,128,255,52,10,10,80,11,88,10,48,
-11,56,0,66,0,74,128,255,44,10,10,16,97,18,210,5,
+27,56,3,66,0,74,128,255,12,10,10,80,11,88,10,48,
+11,56,0,66,0,74,128,255,4,10,10,16,97,18,210,5,
 32,22,80,1,128,7,14,1,96,7,54,177,1,130,64,135,
 53,177,32,127,57,177,207,239,31,0,218,5,32,239,57,177,
 1,202,197,5,32,239,61,177,2,202,221,239,31,0,178,13,
-38,6,108,249,132,0,32,62,135,5,0,66,190,255,238,199,
+38,6,228,4,133,0,32,62,135,5,0,66,190,255,26,198,
 10,16,224,17,128,118,1,128,49,6,24,0,32,0,113,119,
 0,0,49,6,254,0,32,0,241,103,1,0,204,110,3,0,
 224,105,178,5,191,255,72,255,220,94,8,1,224,89,194,5,
@@ -22115,13 +22270,13 @@ unsigned char tw_fw_code[] __initdata = 
 29,238,32,0,32,111,61,177,237,233,178,5,32,239,57,177,
 220,102,4,0,224,97,194,5,29,48,128,255,38,2,32,23,
 54,177,2,80,64,6,255,112,200,0,34,6,0,0,32,0,
-213,37,38,127,1,0,36,135,33,175,175,129,97,130,163,29,
+213,37,38,127,1,0,36,135,45,175,175,129,97,130,163,29,
 32,118,1,16,98,119,24,0,34,111,254,0,205,102,0,12,
 218,13,128,142,1,128,98,143,24,0,34,135,254,0,208,126,
-3,0,194,5,32,86,21,2,165,21,36,103,33,175,102,103,
+3,0,194,5,32,86,21,2,165,21,36,103,45,175,102,103,
 1,0,32,95,54,177,224,89,138,13,39,87,30,0,8,136,
 74,137,209,0,224,137,234,213,32,87,54,177,127,0,130,7,
-225,243,6,216,36,143,33,175,7,192,99,143,1,0,32,239,
+225,243,6,216,36,143,45,175,7,192,99,143,1,0,32,239,
 57,177,128,134,1,128,50,6,24,0,32,0,114,135,0,0,
 8,200,50,6,254,0,32,0,50,127,0,0,217,0,207,118,
 3,0,162,13,32,54,16,0,191,255,104,249,191,255,240,253,
@@ -22134,13 +22289,13 @@ unsigned char tw_fw_code[] __initdata = 
 221,223,31,0,250,229,125,207,18,0,224,185,194,45,224,177,
 194,13,59,135,9,0,125,135,9,0,59,127,13,0,125,127,
 13,0,125,215,25,0,165,29,25,6,252,236,218,5,59,111,
-9,0,125,111,9,0,59,103,13,0,132,95,153,140,125,103,
+9,0,125,111,9,0,59,103,13,0,132,95,165,140,125,103,
 13,0,224,89,125,215,21,0,210,5,59,23,5,0,125,23,
 5,0,59,23,1,0,125,23,1,0,59,87,13,0,96,87,
-65,177,181,21,59,143,9,0,132,135,153,140,125,143,9,0,
+65,177,181,21,59,143,9,0,132,135,165,140,125,143,9,0,
 224,129,125,215,21,0,210,5,59,23,5,0,125,23,5,0,
 59,23,1,0,125,23,1,0,27,222,20,0,28,6,0,248,
-178,5,193,226,220,0,36,111,33,175,224,193,99,111,1,0,
+178,5,193,226,220,0,36,111,45,175,224,193,99,111,1,0,
 239,141,32,102,0,2,125,103,18,0,64,94,0,128,125,95,
 13,0,32,86,0,1,125,87,25,0,29,216,32,239,61,177,
 32,230,0,16,245,21,59,143,30,0,28,128,81,129,208,0,
@@ -22150,17 +22305,17 @@ unsigned char tw_fw_code[] __initdata = 
 29,48,128,255,14,0,0,82,64,7,53,177,66,6,255,243,
 64,134,0,128,102,135,9,0,32,126,0,247,102,127,12,0,
 32,118,0,1,102,119,20,0,32,110,128,1,102,111,18,0,
-36,87,173,139,102,87,1,0,127,0,128,7,225,48,6,232,
+36,87,185,139,102,87,1,0,127,0,128,7,225,48,6,232,
 7,224,8,208,59,6,32,6,32,0,224,209,138,13,32,54,
-16,177,31,58,128,255,116,105,224,81,170,253,61,23,17,0,
+16,177,31,58,128,255,238,105,224,81,170,253,61,23,17,0,
 2,136,169,138,177,225,204,5,28,128,201,130,208,17,219,223,
 31,0,234,253,32,126,0,2,61,119,13,0,123,127,18,0,
 29,238,20,0,123,119,13,0,224,225,123,23,25,0,255,229,
 50,6,4,3,32,0,50,111,0,0,130,106,161,253,224,209,
 218,29,32,150,24,177,50,95,1,0,224,89,146,13,38,6,
-128,249,132,0,32,62,69,1,0,66,190,255,80,196,32,54,
-16,177,128,255,208,105,224,81,146,13,38,6,140,249,132,0,
-32,62,183,1,0,66,190,255,52,196,0,82,64,6,255,48,
+248,4,133,0,32,62,69,1,0,66,190,255,124,194,32,54,
+16,177,128,255,74,106,224,81,146,13,38,6,4,5,133,0,
+32,62,183,1,0,66,190,255,96,194,0,82,64,6,255,48,
 128,7,193,0,64,86,0,0,10,87,74,244,10,232,29,16,
 32,86,159,255,194,230,159,0,64,86,0,0,74,231,74,244,
 64,86,0,0,10,87,10,244,10,224,64,86,0,0,74,239,
@@ -22168,2091 +22323,2099 @@ unsigned char tw_fw_code[] __initdata = 
 0,0,10,87,76,244,10,232,29,16,32,86,31,255,194,230,
 31,0,64,86,0,0,74,231,76,244,64,86,0,0,10,87,
 12,244,10,224,64,86,0,0,74,239,76,244,28,80,138,0,
-64,6,223,0,130,7,225,241,6,224,7,216,8,208,218,0,
-9,200,217,0,35,199,37,0,35,191,41,0,0,234,229,21,
-28,48,27,56,25,72,99,199,1,0,32,70,0,1,128,255,
-48,0,10,16,224,17,170,21,28,230,0,1,27,222,0,1,
-32,54,16,39,190,255,244,203,65,234,26,112,136,114,238,233,
-134,237,29,48,23,56,128,255,156,0,66,6,255,241,128,7,
-225,240,6,192,7,200,8,216,219,0,9,224,35,215,29,0,
-220,0,26,232,197,234,47,6,0,4,32,0,207,233,221,239,
-31,0,130,37,26,56,38,6,180,249,132,0,190,255,164,203,
-38,6,160,134,1,0,190,255,162,203,221,239,31,0,162,21,
-26,56,38,6,152,249,132,0,190,255,136,203,38,6,64,66,
-15,0,190,255,134,203,221,239,31,0,194,5,32,86,30,48,
-245,21,156,230,0,128,220,110,8,3,250,5,64,86,0,128,
-125,87,13,0,156,230,0,2,125,207,9,0,125,207,13,0,
-125,231,18,0,125,223,21,0,0,82,125,199,1,0,64,6,
-255,240,128,7,97,0,61,6,0,0,32,0,0,18,229,5,
-253,143,37,0,224,137,210,253,65,18,231,17,166,253,0,18,
-229,5,61,135,33,0,224,129,210,253,65,18,230,17,166,253,
-253,127,1,0,224,121,130,37,0,58,165,5,65,58,253,119,
-37,0,224,113,202,253,224,57,226,5,38,6,212,249,132,0,
-190,255,240,202,0,58,165,5,65,58,61,111,33,0,224,105,
-202,253,224,57,226,5,38,6,240,249,132,0,190,255,212,202,
-32,86,98,48,165,5,0,82,64,6,127,0,128,7,225,48,
-7,208,8,224,220,0,6,216,32,54,20,0,191,255,248,43,
-10,232,125,223,1,0,125,7,5,0,125,215,9,0,125,7,
-13,0,125,231,17,0,32,54,16,177,31,58,128,255,220,102,
-224,81,170,253,29,48,1,58,32,70,136,0,191,255,90,241,
-32,150,24,177,50,143,1,0,10,224,224,137,146,13,38,6,
-4,248,132,0,32,62,69,1,0,66,190,255,240,193,32,54,
-16,177,128,255,112,103,224,81,146,13,38,6,28,248,132,0,
-32,62,183,1,0,66,190,255,212,193,29,48,191,255,120,43,
-28,80,64,6,255,48,128,7,225,48,7,208,8,224,220,0,
-6,216,32,54,20,0,191,255,110,43,10,232,125,223,1,0,
-125,7,5,0,125,215,9,0,125,7,13,0,125,231,17,0,
-32,54,16,177,31,58,128,255,82,102,224,81,170,253,29,48,
-1,58,32,70,4,2,191,255,208,240,32,150,24,177,50,143,
-1,0,10,224,224,137,146,13,38,6,16,248,132,0,32,62,
-69,1,0,66,190,255,102,193,32,54,16,177,128,255,230,102,
-224,81,146,13,38,6,40,248,132,0,32,62,183,1,0,66,
-190,255,74,193,29,48,191,255,238,42,28,80,64,6,255,48,
-132,7,225,16,6,216,7,224,201,0,28,48,9,232,32,62,
-202,0,191,255,220,235,10,16,224,17,218,13,27,48,29,64,
-99,231,1,0,1,114,99,119,5,0,0,58,32,78,68,0,
-191,255,84,253,68,6,255,16,132,7,225,16,6,216,7,224,
-201,0,28,48,9,232,32,62,200,0,191,255,164,235,10,16,
+64,6,223,0,130,7,97,0,200,0,35,23,13,0,201,0,
+99,23,1,0,35,239,17,0,128,255,30,0,10,16,224,17,
+154,13,32,54,232,3,190,255,62,202,29,56,1,50,128,255,
+156,0,66,6,127,0,128,7,225,240,6,192,7,200,8,216,
+219,0,9,224,35,215,29,0,220,0,26,232,197,234,47,6,
+0,4,32,0,207,233,221,239,31,0,130,37,26,56,38,6,
+44,5,133,0,190,255,248,201,38,6,160,134,1,0,190,255,
+246,201,221,239,31,0,162,21,26,56,38,6,16,5,133,0,
+190,255,220,201,38,6,64,66,15,0,190,255,218,201,221,239,
+31,0,194,5,32,86,30,48,245,21,125,207,9,0,156,230,
+0,128,125,207,13,0,220,110,8,3,250,5,64,86,0,128,
+125,87,13,0,156,230,0,2,125,231,18,0,125,223,21,0,
+0,82,125,199,1,0,64,6,255,240,128,7,97,0,61,6,
+0,0,32,0,0,18,229,5,253,143,37,0,224,137,210,253,
+65,18,231,17,166,253,0,18,229,5,61,135,33,0,224,129,
+210,253,65,18,230,17,166,253,253,127,1,0,224,121,130,37,
+0,58,165,5,65,58,253,119,37,0,224,113,202,253,224,57,
+226,5,38,6,76,5,133,0,190,255,68,201,0,58,165,5,
+65,58,61,111,33,0,224,105,202,253,224,57,226,5,38,6,
+104,5,133,0,190,255,40,201,32,86,98,48,165,5,0,82,
+64,6,127,0,128,7,225,48,7,208,8,224,220,0,6,216,
+32,54,20,0,191,255,236,42,10,232,125,223,1,0,125,7,
+5,0,125,215,9,0,125,7,13,0,125,231,17,0,32,54,
+16,177,31,58,128,255,126,103,224,81,170,253,29,48,1,58,
+32,70,136,0,191,255,130,241,32,150,24,177,50,143,1,0,
+10,224,224,137,146,13,38,6,124,3,133,0,32,62,69,1,
+0,66,190,255,68,192,32,54,16,177,128,255,18,104,224,81,
+146,13,38,6,148,3,133,0,32,62,183,1,0,66,190,255,
+40,192,29,48,190,255,22,221,28,80,64,6,255,48,128,7,
+225,48,7,208,8,224,220,0,6,216,32,54,20,0,191,255,
+98,42,10,232,125,223,1,0,125,7,5,0,125,215,9,0,
+125,7,13,0,125,231,17,0,32,54,16,177,31,58,128,255,
+244,102,224,81,170,253,29,48,1,58,32,70,4,2,191,255,
+248,240,32,150,24,177,50,143,1,0,10,224,224,137,146,13,
+38,6,136,3,133,0,32,62,69,1,0,66,190,255,186,191,
+32,54,16,177,128,255,136,103,224,81,146,13,38,6,160,3,
+133,0,32,62,183,1,0,66,190,255,158,191,29,48,190,255,
+140,220,28,80,64,6,255,48,132,7,225,16,6,216,7,224,
+201,0,28,48,9,232,32,62,202,0,191,255,4,236,10,16,
 224,17,218,13,27,48,29,64,99,231,1,0,1,114,99,119,
-5,0,0,58,32,78,130,0,191,255,28,253,68,6,255,16,
-132,7,225,16,6,216,7,224,8,232,221,0,28,48,29,72,
-32,62,232,0,0,66,191,255,104,235,10,16,224,17,218,13,
-27,56,29,64,99,231,1,0,1,114,99,119,5,0,0,50,
-32,78,72,0,191,255,224,252,68,6,255,16,132,7,225,16,
-6,216,7,224,8,232,221,0,28,48,29,72,32,62,228,0,
-0,66,191,255,44,235,10,16,224,17,218,13,27,56,29,64,
-99,231,1,0,1,114,99,119,5,0,0,50,32,78,2,2,
-191,255,164,252,68,6,255,16,132,7,225,16,6,216,7,224,
-201,0,28,48,9,232,32,62,48,0,191,255,244,234,10,16,
+5,0,0,58,32,78,68,0,191,255,124,253,68,6,255,16,
+132,7,225,16,6,216,7,224,201,0,28,48,9,232,32,62,
+200,0,191,255,204,235,10,16,224,17,218,13,27,48,29,64,
+99,231,1,0,1,114,99,119,5,0,0,58,32,78,130,0,
+191,255,68,253,68,6,255,16,132,7,225,16,6,216,7,224,
+8,232,221,0,28,48,29,72,32,62,232,0,0,66,191,255,
+144,235,10,16,224,17,218,13,27,56,29,64,99,231,1,0,
+1,114,99,119,5,0,0,50,32,78,72,0,191,255,8,253,
+68,6,255,16,132,7,225,16,6,216,7,224,8,232,221,0,
+28,48,29,72,32,62,228,0,0,66,191,255,84,235,10,16,
 224,17,218,13,27,56,29,64,99,231,1,0,1,114,99,119,
-5,0,0,50,32,78,72,0,191,255,108,252,68,6,255,16,
+5,0,0,50,32,78,2,2,191,255,204,252,68,6,255,16,
 132,7,225,16,6,216,7,224,201,0,28,48,9,232,32,62,
-32,0,191,255,188,234,10,16,224,17,218,13,27,56,29,64,
-99,231,1,0,1,114,99,119,5,0,0,50,32,78,2,2,
-191,255,52,252,68,6,255,16,132,7,225,16,6,216,7,224,
-201,0,28,48,9,232,32,62,32,0,191,255,132,234,10,16,
+48,0,191,255,28,235,10,16,224,17,218,13,27,56,29,64,
+99,231,1,0,1,114,99,119,5,0,0,50,32,78,72,0,
+191,255,148,252,68,6,255,16,132,7,225,16,6,216,7,224,
+201,0,28,48,9,232,32,62,32,0,191,255,228,234,10,16,
 224,17,218,13,27,56,29,64,99,231,1,0,1,114,99,119,
-5,0,0,50,32,78,2,18,191,255,252,251,68,6,255,16,
-130,7,225,241,6,192,7,232,8,184,9,200,217,0,0,106,
-29,224,29,216,0,210,197,13,26,48,23,64,25,72,32,62,
-48,0,191,255,60,234,10,104,224,105,170,101,65,210,253,209,
-198,245,0,210,229,13,24,56,25,64,99,215,1,0,0,50,
-32,78,72,0,191,255,10,252,10,104,224,105,154,85,65,210,
-253,209,166,245,58,6,0,0,32,0,250,103,37,0,1,18,
-0,82,165,13,2,136,76,137,209,0,224,137,162,5,95,226,
-193,18,194,0,65,82,253,81,230,245,224,225,250,237,149,5,
-58,103,33,0,1,18,204,0,0,90,165,13,2,80,76,81,
-202,0,224,81,162,5,95,218,193,18,194,0,65,90,253,89,
-230,245,224,217,234,237,250,135,1,0,224,129,130,37,0,58,
-165,5,65,58,250,127,37,0,224,121,202,253,224,57,226,5,
-38,6,16,250,132,0,190,255,90,199,0,58,165,5,65,58,
-58,119,33,0,224,113,202,253,224,57,226,5,38,6,44,250,
-132,0,190,255,62,199,32,86,98,48,165,5,13,80,66,6,
-255,241,132,7,225,0,6,224,7,232,29,48,32,62,236,0,
-0,66,32,78,0,2,191,255,88,233,10,16,224,17,234,13,
-28,56,99,239,1,0,1,130,99,135,5,0,0,50,32,70,
-0,2,32,78,2,2,191,255,206,250,68,6,255,0,138,7,
-225,16,0,234,64,222,1,0,165,21,99,239,9,0,99,239,
-13,0,99,223,17,0,3,48,32,62,128,0,0,66,191,255,
-140,249,10,224,224,225,250,5,93,238,1,0,190,255,124,199,
-234,233,198,237,28,80,74,6,255,16,33,6,16,39,129,0,
-97,0,33,6,216,189,129,0,97,0,33,6,222,189,129,0,
-97,0,33,6,130,189,129,0,97,0,33,6,124,189,129,0,
-97,0,33,6,136,189,129,0,97,0,33,6,2,79,130,0,
-97,0,33,6,14,79,130,0,97,0,128,7,97,0,32,142,
-48,117,32,134,56,74,32,126,136,19,100,127,253,139,100,135,
-249,139,100,143,245,139,128,255,196,11,0,234,29,16,197,18,
-32,102,104,177,204,17,98,7,20,0,66,239,22,0,36,127,
-249,139,98,7,1,0,10,114,98,7,5,0,253,86,40,0,
-98,7,9,0,48,6,64,216,255,255,66,7,23,0,208,81,
-98,87,13,0,1,98,34,95,13,0,45,6,174,107,1,0,
-107,111,5,0,253,103,192,0,107,103,18,0,2,82,107,87,
-2,0,238,127,194,2,107,127,21,0,253,54,52,0,47,6,
-112,249,145,0,207,49,98,55,17,0,32,62,20,0,128,255,
-100,12,65,234,29,6,238,255,166,197,100,7,241,139,96,7,
-169,179,100,7,1,140,64,6,127,0,0,82,0,18,2,136,
-197,138,32,118,104,177,206,137,49,95,20,0,65,18,203,81,
-2,6,238,255,214,245,127,0,197,50,32,118,104,177,206,49,
-38,87,20,0,127,0,128,7,225,16,32,238,104,177,0,226,
-181,61,229,87,64,0,224,7,96,1,29,143,23,0,10,216,
-224,137,218,45,61,23,20,0,224,17,242,37,29,48,128,255,
-100,0,224,81,194,37,28,48,128,255,244,1,224,81,250,29,
-28,48,32,62,66,0,32,70,4,2,190,255,102,197,61,135,
-13,0,240,81,146,13,38,6,76,250,132,0,32,62,241,0,
-0,66,190,255,200,188,28,48,3,58,128,255,0,2,61,55,
-13,0,190,255,70,197,181,5,251,47,32,0,251,47,32,0,
-65,226,29,238,32,0,4,127,205,131,239,225,182,197,64,6,
-255,16,128,7,225,241,36,199,33,175,6,200,57,231,13,0,
-60,231,25,0,24,184,188,185,23,6,216,255,177,5,0,82,
-165,93,0,18,45,6,255,255,255,15,237,193,158,13,43,6,
-1,0,0,240,235,193,199,5,34,6,255,255,255,63,2,216,
-57,215,13,0,165,5,2,208,58,23,9,0,224,17,202,253,
-26,48,191,255,184,221,10,16,224,17,162,13,58,231,29,0,
-57,239,13,0,60,231,13,0,61,239,21,0,181,5,58,239,
-21,0,57,87,5,0,25,127,23,0,220,233,224,121,218,37,
-224,81,178,37,202,255,32,0,138,37,32,230,90,0,224,17,
-234,5,26,48,191,255,182,221,224,81,178,5,32,230,190,0,
-252,185,179,21,25,55,22,0,36,63,249,139,10,90,235,63,
-194,2,191,255,140,217,10,16,216,17,27,136,194,137,27,128,
-221,129,240,137,169,5,2,232,27,120,216,121,221,217,251,121,
-235,87,0,0,64,6,255,241,128,7,225,16,6,232,224,233,
-198,5,29,6,240,255,183,5,0,82,245,37,29,248,197,250,
-32,126,104,177,207,249,229,87,64,0,224,7,96,1,10,224,
-63,23,20,0,0,218,224,17,210,21,31,119,23,0,99,114,
-186,5,1,218,245,13,31,111,23,0,100,106,186,13,95,7,
-23,0,1,50,253,55,192,0,128,255,222,1,29,48,128,255,
-184,112,252,47,32,0,27,80,64,6,255,16,128,7,225,0,
-6,248,224,249,166,45,31,6,240,255,255,37,229,87,64,0,
-224,7,96,1,10,224,31,232,197,234,32,126,104,177,207,233,
-93,7,23,0,1,50,255,55,192,0,128,255,156,1,61,103,
-5,0,224,97,210,13,61,23,13,0,61,87,5,0,42,87,
-1,0,98,87,9,0,36,143,33,175,98,143,25,0,29,48,
-128,255,2,113,252,47,32,0,64,6,255,0,128,7,225,0,
-6,232,0,226,224,233,198,5,29,6,240,255,183,5,0,82,
-181,21,29,48,191,255,180,253,224,81,210,13,197,234,32,118,
-104,177,206,233,61,23,5,0,224,17,210,5,194,247,32,0,
-234,231,0,0,28,80,64,6,255,0,128,7,225,0,6,232,
-7,248,191,0,224,233,198,5,29,6,240,255,183,5,0,82,
-133,53,229,87,64,0,224,7,96,1,29,16,197,18,32,126,
-104,177,207,17,34,119,5,0,10,224,224,113,242,5,34,111,
-5,0,66,255,23,0,205,55,32,0,29,48,190,255,70,190,
-29,96,194,98,36,142,172,138,209,97,44,23,1,0,29,128,
-193,130,36,110,236,138,205,129,240,103,1,0,140,102,0,128,
-98,103,0,0,29,48,191,255,74,237,252,47,32,0,1,82,
-64,6,255,0,128,7,193,0,6,224,229,87,64,0,224,7,
-96,1,10,232,0,18,1,138,226,143,192,0,92,137,242,21,
-36,143,253,139,2,112,197,114,32,94,104,177,203,113,46,87,
-13,0,10,130,42,127,21,0,240,143,194,2,209,121,106,127,
-21,0,234,119,33,0,65,114,106,119,32,0,65,18,2,6,
-240,255,166,229,253,47,32,0,64,6,223,0,128,7,193,0,
+5,0,0,50,32,78,2,2,191,255,92,252,68,6,255,16,
+132,7,225,16,6,216,7,224,201,0,28,48,9,232,32,62,
+32,0,191,255,172,234,10,16,224,17,218,13,27,56,29,64,
+99,231,1,0,1,114,99,119,5,0,0,50,32,78,2,18,
+191,255,36,252,68,6,255,16,130,7,225,241,6,192,7,232,
+8,184,9,200,217,0,0,106,29,224,29,216,0,210,197,13,
+26,48,23,64,25,72,32,62,48,0,191,255,100,234,10,104,
+224,105,170,101,65,210,253,209,198,245,0,210,229,13,24,56,
+25,64,99,215,1,0,0,50,32,78,72,0,191,255,10,252,
+10,104,224,105,154,85,65,210,253,209,166,245,58,6,0,0,
+32,0,250,103,37,0,1,18,0,82,165,13,2,136,76,137,
+209,0,224,137,162,5,95,226,193,18,194,0,65,82,253,81,
+230,245,224,225,250,237,149,5,58,103,33,0,1,18,204,0,
+0,90,165,13,2,80,76,81,202,0,224,81,162,5,95,218,
+193,18,194,0,65,90,253,89,230,245,224,217,234,237,250,135,
+1,0,224,129,130,37,0,58,165,5,65,58,250,127,37,0,
+224,121,202,253,224,57,226,5,38,6,136,5,133,0,190,255,
+174,197,0,58,165,5,65,58,58,119,33,0,224,113,202,253,
+224,57,226,5,38,6,164,5,133,0,190,255,146,197,32,86,
+98,48,165,5,13,80,66,6,255,241,132,7,225,0,6,224,
+7,232,29,48,32,62,236,0,0,66,32,78,0,2,191,255,
+128,233,10,16,224,17,234,13,28,56,99,239,1,0,1,130,
+99,135,5,0,0,50,32,70,0,2,32,78,2,2,191,255,
+246,250,68,6,255,0,138,7,225,16,0,234,64,222,1,0,
+165,21,99,239,9,0,99,239,13,0,99,223,17,0,3,48,
+32,62,128,0,0,66,191,255,180,249,10,224,224,225,250,5,
+93,238,1,0,190,255,208,197,234,233,198,237,28,80,74,6,
+255,16,33,6,28,45,129,0,97,0,33,6,122,198,129,0,
+97,0,33,6,128,198,129,0,97,0,33,6,36,198,129,0,
+97,0,33,6,30,198,129,0,97,0,33,6,42,198,129,0,
+97,0,33,6,166,87,130,0,97,0,33,6,178,87,130,0,
+97,0,128,7,97,0,32,142,48,117,32,134,56,74,32,126,
+136,19,100,127,9,140,100,135,5,140,100,143,1,140,128,255,
+196,11,0,234,29,16,197,18,32,102,104,177,204,17,98,7,
+20,0,66,239,22,0,36,127,5,140,98,7,1,0,10,114,
+98,7,5,0,253,86,40,0,98,7,9,0,48,6,64,216,
+255,255,66,7,23,0,208,81,98,87,13,0,1,98,34,95,
+13,0,45,6,216,109,1,0,107,111,5,0,253,103,192,0,
+107,103,18,0,2,82,107,87,2,0,238,127,194,2,107,127,
+21,0,253,54,52,0,47,6,208,4,146,0,207,49,98,55,
+17,0,32,62,20,0,128,255,108,12,65,234,29,6,238,255,
+166,197,100,7,253,139,96,7,169,179,100,7,13,140,64,6,
+127,0,0,82,0,18,2,136,197,138,32,118,104,177,206,137,
+49,95,20,0,65,18,203,81,2,6,238,255,214,245,127,0,
+197,50,32,118,104,177,206,49,38,87,20,0,127,0,128,7,
+225,16,32,238,104,177,0,226,181,61,229,87,64,0,224,7,
+96,1,29,143,23,0,10,216,224,137,218,45,61,23,20,0,
+224,17,242,37,29,48,128,255,100,0,224,81,194,37,28,48,
+128,255,244,1,224,81,250,29,28,48,32,62,66,0,32,70,
+4,2,190,255,186,195,61,135,13,0,240,81,146,13,38,6,
+196,5,133,0,32,62,241,0,0,66,190,255,28,187,28,48,
+3,58,128,255,0,2,61,55,13,0,190,255,154,195,181,5,
+251,47,32,0,251,47,32,0,65,226,29,238,32,0,4,127,
+217,131,239,225,182,197,64,6,255,16,128,7,225,241,36,199,
+45,175,6,200,57,231,13,0,60,231,25,0,24,184,188,185,
+23,6,216,255,177,5,0,82,165,93,0,18,45,6,255,255,
+255,15,237,193,158,13,43,6,1,0,0,240,235,193,199,5,
+34,6,255,255,255,63,2,216,57,215,13,0,165,5,2,208,
+58,23,9,0,224,17,202,253,26,48,191,255,224,221,10,16,
+224,17,162,13,58,231,29,0,57,239,13,0,60,231,13,0,
+61,239,21,0,181,5,58,239,21,0,57,87,5,0,25,127,
+23,0,220,233,224,121,218,37,224,81,178,37,202,255,32,0,
+138,37,32,230,90,0,224,17,234,5,26,48,191,255,222,221,
+224,81,178,5,32,230,190,0,252,185,179,21,25,55,22,0,
+36,63,5,140,10,90,235,63,194,2,191,255,180,217,10,16,
+216,17,27,136,194,137,27,128,221,129,240,137,169,5,2,232,
+27,120,216,121,221,217,251,121,235,87,0,0,64,6,255,241,
+128,7,225,16,6,232,224,233,198,5,29,6,240,255,183,5,
+0,82,245,37,29,248,197,250,32,126,104,177,207,249,229,87,
+64,0,224,7,96,1,10,224,63,23,20,0,0,218,224,17,
+210,21,31,119,23,0,99,114,186,5,1,218,245,13,31,111,
+23,0,100,106,186,13,95,7,23,0,1,50,253,55,192,0,
+128,255,222,1,29,48,128,255,92,113,252,47,32,0,27,80,
+64,6,255,16,128,7,225,0,6,248,224,249,166,45,31,6,
+240,255,255,37,229,87,64,0,224,7,96,1,10,224,31,232,
+197,234,32,126,104,177,207,233,93,7,23,0,1,50,255,55,
+192,0,128,255,156,1,61,103,5,0,224,97,210,13,61,23,
+13,0,61,87,5,0,42,87,1,0,98,87,9,0,36,143,
+45,175,98,143,25,0,29,48,128,255,166,113,252,47,32,0,
+64,6,255,0,128,7,225,0,6,232,0,226,224,233,198,5,
+29,6,240,255,183,5,0,82,181,21,29,48,191,255,180,253,
+224,81,210,13,197,234,32,118,104,177,206,233,61,23,5,0,
+224,17,210,5,194,247,32,0,234,231,0,0,28,80,64,6,
+255,0,128,7,225,0,6,232,7,248,191,0,224,233,198,5,
+29,6,240,255,183,5,0,82,133,53,229,87,64,0,224,7,
+96,1,29,16,197,18,32,126,104,177,207,17,34,119,5,0,
+10,224,224,113,242,5,34,111,5,0,66,255,23,0,205,55,
+32,0,29,48,190,255,154,188,29,96,194,98,36,142,184,138,
+209,97,44,23,1,0,29,128,193,130,36,110,248,138,205,129,
+240,103,1,0,140,102,0,128,98,103,0,0,29,48,191,255,
+114,237,252,47,32,0,1,82,64,6,255,0,128,7,193,0,
 6,224,229,87,64,0,224,7,96,1,10,232,0,18,1,138,
-226,143,192,0,92,137,130,29,2,112,197,114,32,94,104,177,
-203,113,46,95,13,0,235,87,33,0,95,82,107,87,32,0,
-235,143,33,0,224,137,138,13,36,127,249,139,10,114,238,127,
-194,2,107,127,21,0,65,18,2,6,240,255,150,229,253,47,
-32,0,64,6,223,0,128,7,193,0,6,224,229,87,64,0,
-224,7,96,1,10,232,0,18,1,138,226,143,192,0,92,137,
-226,13,2,112,197,114,32,94,104,177,203,113,46,87,13,0,
-106,7,12,0,106,7,14,0,106,7,16,0,65,18,2,6,
-240,255,182,237,253,47,32,0,64,6,223,0,128,7,225,16,
-6,248,63,239,26,0,32,118,104,177,197,234,206,233,229,87,
-64,0,224,7,96,1,29,111,23,0,10,216,102,106,170,13,
-29,55,22,0,31,56,32,70,19,16,128,255,110,3,128,7,
-32,1,61,23,20,0,224,17,61,143,20,0,170,61,17,94,
-1,0,125,95,20,0,63,87,9,0,125,87,1,0,125,255,
-5,0,63,143,5,0,125,143,9,0,61,23,13,0,61,127,
-5,0,47,127,1,0,98,127,9,0,36,119,33,175,98,119,
-25,0,223,199,33,0,226,5,36,111,224,139,65,106,100,111,
-224,139,63,95,5,0,29,55,22,0,11,95,34,0,61,63,
-9,0,97,90,138,13,29,55,22,0,61,63,9,0,128,255,
-126,105,181,5,128,255,26,109,29,48,128,255,152,110,133,85,
-65,138,125,143,20,0,31,23,32,0,29,87,22,0,222,18,
-159,18,250,5,107,82,223,5,61,135,20,0,99,130,174,37,
-61,127,5,0,224,121,170,21,125,255,5,0,125,255,9,0,
-61,23,13,0,61,111,5,0,45,111,1,0,98,111,9,0,
-36,103,33,175,98,103,25,0,213,5,61,95,1,0,107,255,
-5,0,63,87,9,0,125,87,1,0,29,48,128,255,54,110,
-245,29,61,55,17,0,31,56,128,255,84,7,224,81,130,29,
-61,55,17,0,128,255,150,8,10,224,224,225,154,13,38,6,
-100,250,132,0,32,62,24,4,0,66,190,255,16,184,61,143,
-1,0,113,231,5,0,60,135,9,0,125,135,1,0,251,47,
-32,0,64,6,255,16,128,7,225,0,6,248,63,239,26,0,
-32,118,104,177,197,234,206,233,229,87,64,0,224,7,96,1,
-93,7,23,0,10,224,61,23,20,0,63,103,9,0,224,17,
-202,5,125,103,1,0,213,5,61,95,5,0,108,95,5,0,
-125,255,5,0,63,87,5,0,125,87,9,0,61,23,13,0,
-61,135,5,0,48,135,1,0,223,7,32,0,98,135,9,0,
-223,47,32,0,36,127,33,175,223,63,32,0,98,127,25,0,
-223,199,33,0,226,5,36,119,224,139,65,114,100,119,224,139,
-61,103,9,0,29,55,22,0,12,103,34,0,61,63,9,0,
-97,98,138,13,29,55,22,0,61,63,9,0,128,255,48,104,
-181,5,128,255,204,107,61,87,20,0,65,82,125,87,20,0,
-29,48,128,255,64,109,252,47,32,0,64,6,255,0,128,7,
-225,0,0,234,38,231,13,0,198,15,32,0,191,255,224,253,
-28,48,65,234,224,225,250,245,29,80,64,6,255,0,128,7,
-225,112,6,208,26,232,197,234,32,126,104,177,207,233,229,87,
-64,0,224,7,96,1,10,200,6,114,93,119,23,0,26,48,
-128,255,130,4,61,231,20,0,224,225,135,53,26,48,191,255,
-238,251,61,223,5,0,224,81,242,13,59,23,9,0,95,226,
-34,223,5,0,242,5,1,98,125,103,20,0,125,23,1,0,
-181,29,0,218,149,29,125,7,20,0,125,7,5,0,61,95,
-1,0,26,48,125,95,9,0,6,58,191,255,240,251,197,13,
-27,56,39,223,9,0,26,48,59,223,5,0,32,70,19,16,
-128,255,232,0,95,226,224,225,202,245,249,47,32,0,64,6,
-255,112,128,7,225,48,6,248,31,232,197,234,32,126,104,177,
-207,233,229,87,64,0,224,7,96,1,29,119,23,0,10,216,
-224,113,242,85,31,48,128,255,236,3,61,215,5,0,61,231,
-13,0,181,5,60,231,9,0,60,111,9,0,224,105,186,253,
-197,69,58,135,9,0,61,103,1,0,16,120,236,121,146,69,
-47,63,5,0,39,87,1,0,10,16,181,5,34,23,9,0,
-34,95,9,0,224,89,186,253,10,88,43,87,2,0,141,82,
-185,5,1,82,229,5,43,95,9,0,224,89,250,245,0,82,
-224,81,162,37,34,119,14,0,224,113,234,29,61,111,1,0,
-39,87,9,0,237,81,202,5,125,135,1,0,213,5,42,103,
-5,0,111,103,5,0,32,86,19,16,226,225,170,5,0,82,
-29,55,22,0,10,64,128,255,34,0,61,143,20,0,95,138,
-125,143,20,0,165,5,7,208,61,135,20,0,97,130,175,189,
-251,47,32,0,64,6,255,48,128,7,225,0,232,0,7,224,
-60,239,1,0,224,49,198,13,6,6,240,255,158,13,1,138,
-230,143,192,0,253,127,19,0,17,121,125,127,18,0,29,48,
-8,56,191,255,224,217,61,23,0,0,95,18,226,0,125,23,
-0,0,224,17,138,13,29,48,61,103,5,0,63,6,84,101,
-1,0,108,0,28,48,128,255,240,101,64,6,255,0,128,7,
-225,48,6,232,197,234,32,126,104,177,207,233,61,231,5,0,
-224,225,210,45,229,87,64,0,224,7,96,1,93,7,23,0,
-60,119,9,0,125,119,9,0,10,216,220,255,32,0,226,215,
-0,0,220,199,33,0,194,21,36,23,224,139,95,18,226,0,
-100,23,224,139,224,17,202,13,132,103,233,139,224,97,130,13,
-38,6,124,250,132,0,190,255,122,189,191,255,156,222,29,48,
-28,56,26,64,128,255,12,0,251,47,32,0,64,6,255,48,
-128,7,225,16,7,216,6,232,61,143,20,0,59,23,9,0,
-95,138,125,143,20,0,61,135,1,0,240,17,186,5,0,120,
-181,5,34,127,5,0,125,127,5,0,27,231,32,0,218,226,
-159,226,130,13,29,119,23,0,224,113,202,5,5,106,93,111,
-23,0,61,55,13,0,8,56,128,255,36,104,224,225,154,13,
-61,23,20,0,224,17,146,21,29,48,128,255,136,106,213,13,
-61,23,13,0,61,95,5,0,43,95,1,0,98,95,9,0,
-36,87,33,175,98,87,25,0,27,48,128,255,252,100,64,6,
-255,16,128,7,225,112,7,208,6,200,25,231,22,0,0,234,
-107,226,183,5,128,7,22,1,36,55,1,140,224,209,178,5,
-198,54,16,0,191,255,216,227,10,216,224,217,242,125,57,127,
-5,0,47,127,5,0,47,127,18,0,59,239,4,0,207,22,
-15,0,107,18,202,5,29,6,254,253,178,5,98,18,170,5,
-0,234,224,233,242,5,28,48,191,255,20,249,224,81,162,5,
-0,234,224,233,178,101,59,63,9,0,28,64,38,6,188,250,
-132,0,190,255,110,188,59,135,1,0,36,127,1,140,48,136,
-81,121,100,127,1,140,224,209,178,5,121,215,9,0,29,6,
-252,253,162,29,28,48,29,64,32,62,66,0,190,255,84,188,
-10,216,224,217,154,13,38,6,216,250,132,0,32,62,48,7,
-0,66,190,255,184,179,28,48,2,58,191,255,240,248,27,48,
-190,255,56,188,197,29,224,209,170,29,28,48,29,64,32,62,
-66,0,190,255,30,188,10,232,224,233,154,13,38,6,216,250,
-132,0,32,62,62,7,0,66,190,255,130,179,28,48,3,58,
-191,255,186,248,29,48,190,255,2,188,0,234,1,122,28,88,
-197,90,48,6,0,4,32,0,208,89,107,7,30,0,252,127,
-192,0,32,103,193,223,47,104,77,97,36,95,1,140,96,103,
-193,223,224,89,186,5,96,7,169,179,29,80,64,6,255,112,
-128,7,225,16,7,216,6,232,197,234,32,126,104,177,207,233,
-229,87,64,0,224,7,96,1,61,119,5,0,10,224,224,113,
-154,13,38,6,240,250,132,0,32,62,156,7,0,66,190,255,
-12,179,61,111,5,0,61,103,5,0,93,7,23,0,109,223,
-1,0,61,95,13,0,204,183,32,0,107,7,12,0,61,143,
-5,0,49,143,5,0,125,143,9,0,61,23,13,0,61,127,
-5,0,47,127,1,0,98,127,9,0,36,119,33,175,98,119,
-25,0,61,103,9,0,29,55,22,0,12,103,34,0,61,63,
-9,0,97,98,202,5,128,255,134,99,181,5,128,255,34,103,
-29,48,128,255,160,104,252,47,32,0,64,6,255,16,0,82,
-224,49,246,13,6,6,240,255,206,13,6,16,197,18,32,126,
-104,177,207,17,34,119,20,0,224,113,178,5,34,87,13,0,
-127,0,128,7,225,48,0,226,6,208,26,232,197,234,32,126,
-104,177,207,233,229,87,64,0,224,7,96,1,61,119,20,0,
-10,216,224,113,226,21,250,54,52,0,42,6,112,249,145,0,
-202,49,128,255,184,2,10,16,224,17,178,13,61,143,1,0,
-113,23,5,0,34,135,9,0,65,226,125,135,1,0,197,237,
-251,47,32,0,28,80,64,6,255,48,128,7,33,0,64,22,
-146,0,34,54,32,184,100,55,237,139,0,58,32,70,128,62,
-190,255,120,186,36,23,237,139,0,82,2,88,2,22,16,0,
-107,23,5,0,65,82,10,6,24,252,134,253,107,7,5,0,
-64,6,63,0,102,7,9,0,102,7,13,0,127,0,128,7,
-193,16,6,224,7,216,229,87,64,0,224,7,96,1,36,143,
-237,139,10,232,123,143,5,0,60,135,13,0,100,223,237,139,
-95,130,124,135,13,0,253,47,32,0,64,6,223,16,128,7,
-97,0,6,232,61,23,5,0,224,17,202,5,61,63,1,0,
-165,5,2,56,224,57,130,69,7,16,165,5,10,16,34,87,
-13,0,224,81,202,253,34,119,9,0,61,143,1,0,2,56,
-241,57,154,21,14,80,125,87,1,0,224,81,178,37,106,7,
-5,0,61,87,1,0,165,5,11,80,42,95,13,0,224,89,
-202,253,133,29,34,127,5,0,111,119,13,0,34,87,9,0,
-34,103,5,0,224,81,210,13,106,103,5,0,34,95,9,0,
+226,143,192,0,92,137,242,21,36,143,9,140,2,112,197,114,
+32,94,104,177,203,113,46,87,13,0,10,130,42,127,21,0,
+240,143,194,2,209,121,106,127,21,0,234,119,33,0,65,114,
+106,119,32,0,65,18,2,6,240,255,166,229,253,47,32,0,
+64,6,223,0,128,7,193,0,6,224,229,87,64,0,224,7,
+96,1,10,232,0,18,1,138,226,143,192,0,92,137,130,29,
+2,112,197,114,32,94,104,177,203,113,46,95,13,0,235,87,
+33,0,95,82,107,87,32,0,235,143,33,0,224,137,138,13,
+36,127,5,140,10,114,238,127,194,2,107,127,21,0,65,18,
+2,6,240,255,150,229,253,47,32,0,64,6,223,0,128,7,
+193,0,6,224,229,87,64,0,224,7,96,1,10,232,0,18,
+1,138,226,143,192,0,92,137,226,13,2,112,197,114,32,94,
+104,177,203,113,46,87,13,0,106,7,12,0,106,7,14,0,
+106,7,16,0,65,18,2,6,240,255,182,237,253,47,32,0,
+64,6,223,0,128,7,225,16,6,248,63,239,26,0,32,118,
+104,177,197,234,206,233,229,87,64,0,224,7,96,1,29,111,
+23,0,10,216,102,106,170,13,29,55,22,0,31,56,32,70,
+19,16,128,255,110,3,128,7,32,1,61,23,20,0,224,17,
+61,143,20,0,170,61,17,94,1,0,125,95,20,0,63,87,
+9,0,125,87,1,0,125,255,5,0,63,143,5,0,125,143,
+9,0,61,23,13,0,61,127,5,0,47,127,1,0,98,127,
+9,0,36,119,45,175,98,119,25,0,223,199,33,0,226,5,
+36,111,236,139,65,106,100,111,236,139,63,95,5,0,29,55,
+22,0,11,95,34,0,61,63,9,0,97,90,138,13,29,55,
+22,0,61,63,9,0,128,255,34,106,181,5,128,255,190,109,
+29,48,128,255,60,111,133,85,65,138,125,143,20,0,31,23,
+32,0,29,87,22,0,222,18,159,18,250,5,107,82,223,5,
+61,135,20,0,99,130,174,37,61,127,5,0,224,121,170,21,
+125,255,5,0,125,255,9,0,61,23,13,0,61,111,5,0,
+45,111,1,0,98,111,9,0,36,103,45,175,98,103,25,0,
+213,5,61,95,1,0,107,255,5,0,63,87,9,0,125,87,
+1,0,29,48,128,255,218,110,245,29,61,55,17,0,31,56,
+128,255,116,7,224,81,130,29,61,55,17,0,128,255,246,8,
+10,224,224,225,154,13,38,6,220,5,133,0,32,62,24,4,
+0,66,190,255,100,182,61,143,1,0,113,231,5,0,60,135,
+9,0,125,135,1,0,251,47,32,0,64,6,255,16,128,7,
+225,0,6,248,63,239,26,0,32,118,104,177,197,234,206,233,
+229,87,64,0,224,7,96,1,93,7,23,0,10,224,61,23,
+20,0,63,103,9,0,224,17,202,5,125,103,1,0,213,5,
+61,95,5,0,108,95,5,0,125,255,5,0,63,87,5,0,
+125,87,9,0,61,23,13,0,61,135,5,0,48,135,1,0,
+223,7,32,0,98,135,9,0,223,47,32,0,36,127,45,175,
+223,63,32,0,98,127,25,0,223,199,33,0,226,5,36,119,
+236,139,65,114,100,119,236,139,61,103,9,0,29,55,22,0,
+12,103,34,0,61,63,9,0,97,98,138,13,29,55,22,0,
+61,63,9,0,128,255,212,104,181,5,128,255,112,108,61,87,
+20,0,65,82,125,87,20,0,29,48,128,255,228,109,252,47,
+32,0,64,6,255,0,128,7,225,0,0,234,38,231,13,0,
+198,15,32,0,191,255,224,253,28,48,65,234,224,225,250,245,
+29,80,64,6,255,0,128,7,225,112,6,208,26,232,197,234,
+32,126,104,177,207,233,229,87,64,0,224,7,96,1,10,200,
+6,114,93,119,23,0,26,48,128,255,130,4,61,231,20,0,
+224,225,135,53,26,48,191,255,238,251,61,223,5,0,224,81,
+242,13,59,23,9,0,95,226,34,223,5,0,242,5,1,98,
+125,103,20,0,125,23,1,0,181,29,0,218,149,29,125,7,
+20,0,125,7,5,0,61,95,1,0,26,48,125,95,9,0,
+6,58,191,255,240,251,197,13,27,56,39,223,9,0,26,48,
+59,223,5,0,32,70,19,16,128,255,232,0,95,226,224,225,
+202,245,249,47,32,0,64,6,255,112,128,7,225,48,6,248,
+31,232,197,234,32,126,104,177,207,233,229,87,64,0,224,7,
+96,1,29,119,23,0,10,216,224,113,242,85,31,48,128,255,
+236,3,61,215,5,0,61,231,13,0,181,5,60,231,9,0,
+60,111,9,0,224,105,186,253,197,69,58,135,9,0,61,103,
+1,0,16,120,236,121,146,69,47,63,5,0,39,87,1,0,
+10,16,181,5,34,23,9,0,34,95,9,0,224,89,186,253,
+10,88,43,87,2,0,141,82,185,5,1,82,229,5,43,95,
+9,0,224,89,250,245,0,82,224,81,162,37,34,119,14,0,
+224,113,234,29,61,111,1,0,39,87,9,0,237,81,202,5,
+125,135,1,0,213,5,42,103,5,0,111,103,5,0,32,86,
+19,16,226,225,170,5,0,82,29,55,22,0,10,64,128,255,
+34,0,61,143,20,0,95,138,125,143,20,0,165,5,7,208,
+61,135,20,0,97,130,175,189,251,47,32,0,64,6,255,48,
+128,7,225,0,232,0,7,224,60,239,1,0,224,49,198,13,
+6,6,240,255,158,13,1,138,230,143,192,0,253,127,19,0,
+17,121,125,127,18,0,29,48,8,56,191,255,8,218,61,23,
+0,0,95,18,226,0,125,23,0,0,224,17,138,13,29,48,
+61,103,5,0,63,6,0,103,1,0,108,0,28,48,128,255,
+148,102,64,6,255,0,128,7,225,48,6,232,197,234,32,126,
+104,177,207,233,61,231,5,0,224,225,210,45,229,87,64,0,
+224,7,96,1,93,7,23,0,60,119,9,0,125,119,9,0,
+10,216,220,255,32,0,226,215,0,0,220,199,33,0,194,21,
+36,23,236,139,95,18,226,0,100,23,236,139,224,17,202,13,
+132,103,245,139,224,97,130,13,38,6,244,5,133,0,190,255,
+206,187,191,255,196,222,29,48,28,56,26,64,128,255,12,0,
+251,47,32,0,64,6,255,48,128,7,225,16,7,216,6,232,
+61,143,20,0,59,23,9,0,95,138,125,143,20,0,61,135,
+1,0,240,17,186,5,0,120,181,5,34,127,5,0,125,127,
+5,0,27,231,32,0,218,226,159,226,130,13,29,119,23,0,
+224,113,202,5,5,106,93,111,23,0,61,55,13,0,8,56,
+128,255,200,104,224,225,154,13,61,23,20,0,224,17,146,21,
+29,48,128,255,44,107,213,13,61,23,13,0,61,95,5,0,
+43,95,1,0,98,95,9,0,36,87,45,175,98,87,25,0,
+27,48,128,255,160,101,64,6,255,16,128,7,225,112,7,208,
+6,200,25,231,22,0,0,234,107,226,183,5,128,7,22,1,
+36,55,13,140,224,209,178,5,198,54,16,0,191,255,0,228,
+10,216,224,217,242,125,57,127,5,0,47,127,5,0,47,127,
+18,0,59,239,4,0,207,22,15,0,107,18,202,5,29,6,
+254,253,178,5,98,18,170,5,0,234,224,233,242,5,28,48,
+191,255,20,249,224,81,162,5,0,234,224,233,178,101,59,63,
+9,0,28,64,38,6,52,6,133,0,190,255,194,186,59,135,
+1,0,36,127,13,140,48,136,81,121,100,127,13,140,224,209,
+178,5,121,215,9,0,29,6,252,253,162,29,28,48,29,64,
+32,62,66,0,190,255,168,186,10,216,224,217,154,13,38,6,
+80,6,133,0,32,62,48,7,0,66,190,255,12,178,28,48,
+2,58,191,255,240,248,27,48,190,255,140,186,197,29,224,209,
+170,29,28,48,29,64,32,62,66,0,190,255,114,186,10,232,
+224,233,154,13,38,6,80,6,133,0,32,62,62,7,0,66,
+190,255,214,177,28,48,3,58,191,255,186,248,29,48,190,255,
+86,186,0,234,1,122,28,88,197,90,48,6,0,4,32,0,
+208,89,107,7,30,0,252,127,192,0,32,103,193,223,47,104,
+77,97,36,95,13,140,96,103,193,223,224,89,186,5,96,7,
+169,179,29,80,64,6,255,112,128,7,225,16,7,216,6,232,
+197,234,32,126,104,177,207,233,229,87,64,0,224,7,96,1,
+61,119,5,0,10,224,224,113,154,13,38,6,104,6,133,0,
+32,62,156,7,0,66,190,255,96,177,61,111,5,0,61,103,
+5,0,93,7,23,0,109,223,1,0,61,95,13,0,204,183,
+32,0,107,7,12,0,61,143,5,0,49,143,5,0,125,143,
+9,0,61,23,13,0,61,127,5,0,47,127,1,0,98,127,
+9,0,36,119,45,175,98,119,25,0,61,103,9,0,29,55,
+22,0,12,103,34,0,61,63,9,0,97,98,202,5,128,255,
+42,100,181,5,128,255,198,103,29,48,128,255,68,105,252,47,
+32,0,64,6,255,16,0,82,224,49,246,13,6,6,240,255,
+206,13,6,16,197,18,32,126,104,177,207,17,34,119,20,0,
+224,113,178,5,34,87,13,0,127,0,128,7,225,48,0,226,
+6,208,26,232,197,234,32,126,104,177,207,233,229,87,64,0,
+224,7,96,1,61,119,20,0,10,216,224,113,226,21,250,54,
+52,0,42,6,208,4,146,0,202,49,128,255,24,3,10,16,
+224,17,178,13,61,143,1,0,113,23,5,0,34,135,9,0,
+65,226,125,135,1,0,197,237,251,47,32,0,28,80,64,6,
+255,48,128,7,33,0,64,22,146,0,34,54,128,195,100,55,
+249,139,0,58,32,70,128,62,190,255,204,184,36,23,249,139,
+0,82,2,88,2,22,16,0,107,23,5,0,65,82,10,6,
+24,252,134,253,107,7,5,0,64,6,63,0,102,7,13,0,
+102,7,17,0,127,0,128,7,193,16,6,224,7,216,229,87,
+64,0,224,7,96,1,36,143,249,139,10,232,123,143,5,0,
+60,135,17,0,100,223,249,139,95,130,124,135,17,0,253,47,
+32,0,64,6,223,16,128,7,97,0,6,232,61,23,5,0,
+224,17,202,5,61,63,1,0,165,5,2,56,224,57,194,69,
+7,16,165,5,10,16,34,87,13,0,224,81,202,253,34,111,
+9,0,61,143,1,0,2,56,241,57,218,21,13,80,125,87,
+1,0,224,81,194,13,106,7,5,0,61,87,1,0,165,5,
+11,80,42,95,13,0,224,89,202,253,197,29,125,7,9,0,
+0,80,133,29,34,119,5,0,110,111,13,0,34,87,9,0,
+34,95,5,0,224,81,210,13,106,95,5,0,34,95,9,0,
 165,5,10,88,43,87,13,0,224,81,202,253,11,80,165,5,
-12,80,34,95,1,0,125,87,5,0,125,95,9,0,29,48,
-191,255,62,255,181,5,125,7,9,0,61,87,9,0,64,6,
-127,0,128,7,97,0,102,63,49,0,102,7,45,0,102,7,
-37,0,102,7,41,0,6,232,191,255,12,255,29,54,16,0,
-191,255,4,255,125,7,33,0,64,6,127,0,128,7,193,48,
-38,23,41,0,7,208,2,232,196,234,38,127,49,0,198,233,
-224,121,178,45,38,119,45,0,36,87,33,175,238,81,227,13,
-65,18,194,22,1,0,102,23,41,0,2,232,196,234,38,95,
-49,0,198,233,202,89,102,95,45,0,61,95,9,0,0,82,
-224,89,194,13,43,135,5,0,58,127,5,0,48,135,13,0,
-47,127,13,0,240,121,169,5,1,82,224,81,226,5,65,18,
-194,238,1,0,196,234,198,233,229,87,64,0,224,7,96,1,
+11,80,125,87,5,0,34,87,1,0,125,87,13,0,29,48,
+191,255,54,255,181,5,125,7,13,0,61,87,13,0,64,6,
+127,0,128,7,225,0,6,232,7,224,245,225,147,13,28,64,
+38,6,128,6,133,0,32,62,240,1,190,255,60,175,125,231,
+48,0,125,7,45,0,93,7,50,0,93,7,51,0,29,48,
+191,255,236,254,29,54,20,0,191,255,228,254,125,7,41,0,
+64,6,255,0,128,7,193,48,7,208,166,23,51,0,2,136,
+177,0,224,137,194,5,6,86,20,0,165,5,6,80,10,232,
+230,127,49,0,224,121,146,53,38,119,45,0,36,87,45,175,
+238,81,147,21,65,18,194,22,1,0,70,23,51,0,194,5,
+6,94,20,0,165,5,6,88,11,232,230,95,49,0,202,89,
+102,95,45,0,61,95,13,0,0,82,224,89,194,13,43,127,
+5,0,58,119,5,0,47,127,13,0,46,119,13,0,239,113,
+169,5,1,82,224,81,146,13,65,18,129,18,201,5,6,22,
+20,0,165,5,6,16,2,232,229,87,64,0,224,7,96,1,
 10,216,149,13,229,87,64,0,224,135,96,1,229,87,64,0,
-224,7,96,1,36,103,237,139,224,97,210,245,36,231,237,139,
-61,135,13,0,36,87,237,139,65,130,42,87,5,0,125,135,
-13,0,124,7,13,0,124,7,9,0,100,87,237,139,251,47,
-32,0,28,16,61,87,1,0,124,215,1,0,224,81,138,13,
-124,7,5,0,125,23,5,0,125,23,1,0,133,61,10,96,
-44,95,1,0,34,87,1,0,43,95,5,0,42,87,5,0,
-43,95,13,0,42,87,13,0,235,81,177,13,44,87,9,0,
-224,81,138,21,98,103,5,0,0,82,108,23,9,0,165,13,
-44,87,13,0,224,81,234,5,98,103,5,0,0,82,108,23,
-13,0,10,96,224,97,218,221,61,111,5,0,34,103,1,0,
-45,111,1,0,44,103,5,0,45,111,5,0,44,103,13,0,
-45,111,13,0,237,97,185,5,125,23,5,0,36,87,237,139,
-224,81,226,87,0,0,64,6,223,48,128,7,97,0,6,232,
-61,143,33,0,224,137,138,29,29,86,16,0,61,119,13,0,
-42,127,13,0,239,113,231,23,0,0,125,23,37,0,196,18,
-2,80,221,81,42,103,13,0,224,97,186,5,0,82,197,37,
-221,17,125,23,33,0,61,55,33,0,191,255,164,253,10,88,
-224,89,154,29,61,87,37,0,65,82,202,22,1,0,125,23,
-37,0,196,18,2,80,221,81,42,127,13,0,224,121,146,13,
-221,17,125,23,33,0,2,48,191,255,118,253,10,88,181,5,
-125,7,33,0,11,80,64,6,127,0,199,0,198,223,128,7,
-33,0,0,58,128,255,136,98,64,6,63,0,127,0,38,87,
-6,16,128,7,128,7,102,7,1,0,102,7,5,0,102,7,
-8,0,127,0,128,7,193,16,6,224,7,232,229,87,64,0,
-224,7,96,1,60,143,8,0,10,216,224,137,170,13,124,239,
-5,0,124,239,1,0,125,239,73,0,125,239,69,0,181,21,
-60,23,5,0,226,233,34,87,73,0,178,13,125,23,69,0,
-60,119,5,0,110,239,73,0,125,87,73,0,106,239,69,0,
-124,239,5,0,60,111,8,0,65,106,124,111,8,0,251,47,
-32,0,64,6,223,16,128,7,193,16,6,224,7,232,229,87,
-64,0,224,7,96,1,60,23,8,0,10,216,95,18,226,0,
-124,23,8,0,224,17,226,29,60,135,1,0,240,233,234,5,
-61,127,73,0,124,127,1,0,149,13,60,119,5,0,238,233,
-218,5,61,111,69,0,124,111,5,0,61,95,73,0,61,103,
-69,0,108,95,73,0,61,87,73,0,61,143,69,0,106,143,
-69,0,251,47,32,0,64,6,223,16,0,82,34,6,24,253,
-145,0,2,142,76,0,98,143,73,0,65,82,2,22,76,0,
-10,6,1,249,246,245,47,6,180,19,2,0,34,6,24,253,
-145,0,2,128,207,129,112,7,73,0,96,23,173,179,127,0,
-128,7,193,0,6,224,229,87,64,0,224,7,96,1,32,143,
-173,179,10,232,124,143,73,0,96,231,173,179,253,47,32,0,
-64,6,223,0,0,18,42,6,16,219,255,255,1,90,106,95,
-56,0,106,23,58,0,65,18,10,86,60,0,2,6,236,255,
-246,245,127,0,128,7,225,112,0,210,57,6,16,219,255,255,
-0,226,25,216,27,232,181,5,128,255,102,1,61,55,1,0,
-224,49,186,253,68,218,65,226,109,226,214,245,25,206,60,0,
-65,210,26,6,236,255,214,237,64,6,255,112,128,7,193,16,
-6,224,0,234,229,87,64,0,224,7,96,1,10,216,0,82,
-64,22,0,0,34,94,16,219,11,16,34,143,56,0,97,138,
-234,13,98,7,56,0,2,232,98,231,53,0,0,82,98,7,
-1,0,65,82,68,18,109,82,182,253,245,5,11,94,60,0,
-65,82,10,6,236,255,150,237,251,47,32,0,29,80,64,6,
-223,16,39,143,53,0,230,137,194,5,32,86,51,1,149,37,
-39,135,58,0,16,6,236,255,198,5,32,86,48,1,149,29,
-39,127,56,0,224,121,194,5,32,86,49,1,165,21,0,18,
-7,80,42,119,1,0,224,113,194,5,32,86,50,1,149,13,
-68,82,65,18,109,18,230,245,1,106,103,111,56,0,0,82,
-127,0,154,7,225,48,6,232,8,208,35,231,73,0,9,216,
-99,231,1,0,128,255,8,1,10,16,224,17,234,61,32,55,
-37,183,35,134,32,0,99,135,1,0,35,126,36,0,99,127,
-5,0,35,118,40,0,99,119,9,0,35,110,44,0,99,111,
-13,0,35,102,48,0,99,103,17,0,35,62,20,0,35,70,
-24,0,35,78,28,0,128,255,136,1,224,81,146,13,38,6,
-124,6,133,0,32,62,58,1,0,66,190,255,96,172,29,48,
-26,64,27,72,99,231,1,0,128,255,164,0,10,16,224,17,
-202,13,35,95,33,0,106,90,210,5,1,50,191,255,76,189,
-245,237,128,255,142,80,197,237,2,80,90,6,255,48,128,7,
-97,0,6,248,229,87,64,0,224,7,96,1,10,232,63,87,
-9,0,224,81,63,23,13,0,202,21,31,143,18,0,47,6,
-16,219,255,255,241,134,60,0,31,103,19,0,207,129,194,98,
-208,97,108,23,1,0,224,17,162,13,98,7,9,0,245,5,
-106,23,13,0,224,17,178,5,98,87,9,0,253,47,32,0,
-31,48,128,255,72,86,64,6,127,0,130,7,33,0,3,130,
-99,135,1,0,128,255,24,0,10,48,224,49,186,5,1,82,
-197,5,191,255,140,255,0,82,66,6,63,0,130,7,225,240,
-6,200,8,224,9,232,35,215,33,0,59,6,16,216,255,255,
-27,48,3,56,31,66,128,255,34,85,224,81,170,253,35,255,
-1,0,28,128,127,7,13,0,13,114,238,135,194,194,229,87,
-64,0,224,7,96,1,10,216,24,104,194,106,13,96,217,97,
-44,23,1,0,99,210,226,103,0,0,181,29,34,95,5,0,
-34,87,1,0,253,89,138,21,252,81,234,13,34,95,16,0,
-235,209,186,5,224,97,130,13,251,47,32,0,31,48,128,255,
-172,85,0,82,165,37,34,87,13,0,224,81,194,5,10,16,
-224,17,218,229,224,17,234,5,217,105,109,255,1,0,0,16,
-181,5,98,255,13,0,127,23,9,0,127,231,1,0,127,215,
-16,0,127,239,5,0,57,135,58,0,95,135,18,0,95,199,
-19,0,251,47,32,0,31,80,66,6,255,240,230,86,33,6,
-62,12,130,0,97,0,140,7,225,48,6,224,59,6,20,8,
-133,0,0,234,181,61,29,72,193,74,47,6,164,29,148,0,
-207,73,2,114,253,102,48,0,43,6,16,129,133,0,203,97,
-44,87,17,0,44,71,9,0,44,63,5,0,44,55,1,0,
-73,119,1,0,73,7,0,0,99,87,1,0,44,143,21,0,
-99,143,5,0,44,135,25,0,99,135,9,0,44,127,29,0,
-99,127,13,0,44,119,33,0,99,119,17,0,44,111,37,0,
-99,111,21,0,128,255,112,17,224,81,242,5,27,48,32,62,
-165,1,0,66,190,255,102,170,65,234,105,234,209,197,0,234,
-229,21,29,88,195,90,49,6,52,10,133,0,209,89,43,55,
-1,0,43,63,5,0,128,255,246,16,224,81,242,5,27,48,
-32,62,177,1,0,66,190,255,52,170,65,234,98,234,161,237,
-0,234,229,37,253,118,28,0,45,6,68,10,133,0,205,113,
-46,103,17,0,46,79,13,0,46,71,9,0,46,63,5,0,
-46,55,1,0,99,103,1,0,46,95,21,0,99,95,5,0,
-46,87,25,0,99,87,9,0,128,255,44,17,224,81,242,5,
-27,48,32,62,194,1,0,66,190,255,226,169,65,234,99,234,
-161,221,0,210,133,37,26,232,196,234,46,6,152,10,133,0,
-206,233,61,111,13,0,61,71,9,0,61,63,5,0,61,55,
-1,0,99,111,1,0,28,72,128,255,164,16,61,103,13,0,
-204,225,224,81,242,5,27,48,32,62,227,1,0,66,190,255,
-156,169,65,210,103,210,129,229,0,210,133,37,26,232,196,234,
-48,6,8,11,133,0,208,233,61,127,13,0,61,71,9,0,
-61,63,5,0,61,55,1,0,99,127,1,0,28,72,190,255,
-188,185,61,119,13,0,206,225,224,81,242,5,27,48,32,62,
-4,2,0,66,190,255,86,169,65,210,97,210,129,229,38,6,
-128,29,148,0,39,6,36,8,133,0,0,66,191,255,240,18,
-100,7,117,140,76,6,255,48,132,7,97,0,36,143,169,172,
-65,138,100,143,169,172,191,255,0,236,36,239,169,172,128,255,
-112,38,224,81,242,5,32,54,72,180,4,58,0,66,128,255,
-60,80,29,120,5,114,238,127,194,130,224,129,186,37,229,87,
-64,0,224,7,96,1,36,23,165,172,10,248,70,18,43,6,
-128,58,9,0,235,23,194,106,100,111,165,172,255,47,32,0,
-6,50,128,255,228,34,97,82,218,13,2,18,99,23,5,0,
-99,7,1,0,3,56,38,6,44,137,145,0,0,66,190,255,
-200,197,32,134,255,0,240,239,194,82,224,81,138,29,196,239,
-144,140,178,21,196,231,144,140,130,21,36,127,173,172,224,121,
-130,13,32,54,236,176,128,62,16,128,0,66,128,255,190,79,
-32,54,0,1,191,255,140,186,128,255,92,15,68,6,127,0,
-128,7,225,0,36,143,117,140,128,134,216,214,74,138,100,143,
-117,140,240,137,195,5,8,122,68,127,113,140,36,103,117,140,
-32,94,232,3,235,103,194,114,224,113,218,5,37,54,128,131,
-190,255,192,176,4,23,113,140,60,6,16,129,133,0,99,18,
-233,5,97,18,193,29,194,53,128,7,136,1,102,18,169,13,
-100,18,185,5,128,7,182,1,186,5,128,7,220,1,128,7,
-246,1,103,18,185,5,128,7,196,2,186,5,128,7,214,2,
-104,18,186,5,128,7,212,2,128,7,228,2,36,63,33,175,
-38,6,156,8,133,0,190,255,106,176,38,6,48,8,133,0,
-190,255,96,176,100,7,105,140,100,7,109,140,1,82,68,87,
-113,140,32,142,32,78,100,143,121,140,128,7,178,2,36,135,
-105,140,105,130,150,13,38,6,112,8,133,0,32,62,241,2,
-0,66,190,255,184,167,36,55,105,140,128,255,150,2,224,81,
-194,5,1,114,100,119,109,140,36,23,105,140,43,6,164,29,
-148,0,2,232,193,234,203,233,29,87,1,0,97,82,209,5,
-178,61,98,82,226,45,213,93,226,22,48,0,220,17,34,63,
-5,0,194,199,44,0,170,29,38,6,80,8,133,0,190,255,
-226,175,36,127,104,140,1,98,239,118,48,0,93,103,0,0,
-14,104,220,105,45,231,41,0,1,90,93,95,1,0,29,48,
-63,6,120,115,1,0,124,0,149,69,38,6,172,8,133,0,
-190,255,176,175,36,87,105,140,65,82,100,87,105,140,229,53,
-38,6,200,8,133,0,190,255,154,175,36,143,105,140,65,138,
-100,143,105,140,181,45,36,127,117,140,36,135,121,140,240,121,
-211,37,245,21,2,48,1,58,128,255,168,2,36,111,105,140,
-13,22,1,0,100,23,105,140,105,18,190,13,226,94,48,0,
-220,89,43,63,5,0,38,6,128,8,133,0,190,255,84,175,
-36,23,105,140,105,18,246,229,1,138,100,143,109,140,229,5,
-36,135,105,140,65,130,100,135,105,140,36,127,105,140,105,122,
-178,5,128,7,154,1,2,114,68,119,113,140,128,7,144,1,
-36,111,117,140,36,103,109,140,13,110,48,117,100,111,121,140,
-224,97,242,5,191,255,240,248,128,255,124,13,64,7,52,177,
-0,234,29,48,1,58,128,255,12,3,65,234,105,234,166,253,
-3,82,68,87,113,140,128,7,86,1,191,255,32,233,224,81,
-234,5,4,138,68,143,113,140,128,7,68,1,36,127,117,140,
-36,135,121,140,240,121,187,5,128,7,52,1,8,114,68,119,
-113,140,128,7,42,1,0,234,29,48,2,58,128,255,198,2,
-65,234,105,234,166,253,5,98,68,103,113,140,100,7,105,140,
-128,7,12,1,36,95,105,140,105,90,150,13,38,6,112,8,
-133,0,32,62,159,3,0,66,190,255,18,166,36,23,105,140,
-48,6,164,29,148,0,2,232,226,22,48,0,193,234,220,17,
-34,111,45,0,208,233,205,110,3,0,242,61,29,87,1,0,
-97,82,209,5,162,45,98,82,210,29,149,53,34,63,5,0,
-38,6,80,8,133,0,190,255,74,174,36,103,104,140,1,138,
-236,94,48,0,93,143,0,0,11,80,220,81,42,231,41,0,
-1,130,93,135,1,0,29,48,63,6,16,117,1,0,124,0,
-149,37,38,6,200,8,133,0,190,255,24,174,36,127,105,140,
-65,122,100,127,105,140,229,21,36,111,117,140,36,119,121,140,
-238,105,131,21,8,98,68,103,113,140,197,13,36,95,105,140,
-65,90,100,95,105,140,229,5,36,87,105,140,65,82,100,87,
-105,140,36,143,105,140,105,138,170,37,4,135,113,140,104,130,
-226,29,7,122,68,127,113,140,165,29,191,255,0,232,224,81,
-218,5,7,114,68,119,113,140,165,21,8,106,68,111,113,140,
-229,13,190,255,92,238,181,13,38,6,96,8,133,0,190,255,
-162,173,0,50,128,255,192,11,190,255,70,238,64,6,255,0,
-128,7,225,0,0,226,230,134,48,0,46,6,16,129,133,0,
-206,129,48,239,1,0,61,103,109,0,45,6,128,29,148,0,
-237,97,218,69,61,63,41,0,38,6,212,8,133,0,190,255,
-98,173,29,48,128,255,232,11,224,81,146,13,38,6,240,8,
-133,0,32,62,60,4,0,66,190,255,210,164,29,48,128,255,
-214,11,224,81,146,13,38,6,240,8,133,0,32,62,63,4,
-0,66,190,255,184,164,38,6,0,9,133,0,190,255,36,173,
-1,226,29,48,128,255,136,11,0,18,226,86,48,0,48,6,
-16,129,133,0,208,81,42,127,1,0,239,233,218,13,2,90,
-2,112,193,114,44,6,164,29,148,0,204,113,78,95,0,0,
-3,82,78,87,1,0,65,18,105,18,134,237,61,239,141,0,
-49,6,176,134,133,0,241,233,250,173,28,80,64,6,255,0,
-128,7,225,112,6,232,7,208,59,6,12,9,133,0,104,234,
-186,45,253,134,48,0,46,6,16,129,133,0,206,129,48,231,
-1,0,60,231,141,0,57,6,176,134,133,0,249,225,162,29,
-28,48,128,255,10,11,28,48,128,255,36,11,224,81,242,5,
-27,48,32,62,135,4,0,66,190,255,18,164,28,48,128,255,
-22,11,224,81,242,5,27,48,32,62,138,4,0,66,190,255,
-252,163,249,225,250,221,253,230,48,0,43,6,16,129,133,0,
-203,225,60,143,45,0,81,209,234,45,38,6,28,9,133,0,
-190,255,80,172,60,55,1,0,128,255,180,10,60,55,1,0,
-128,255,204,10,224,81,242,5,27,48,32,62,156,4,0,66,
-190,255,186,163,60,55,1,0,128,255,188,10,224,81,242,5,
-27,48,32,62,159,4,0,66,190,255,162,163,2,106,193,234,
-46,6,164,29,148,0,206,233,93,111,0,0,3,98,93,103,
-1,0,229,5,38,6,40,9,133,0,190,255,246,171,64,6,
-255,112,140,7,225,16,230,238,48,0,47,6,16,129,133,0,
-207,233,61,111,45,0,77,57,210,69,6,224,193,226,42,6,
-164,29,148,0,202,225,28,216,27,143,1,0,224,137,162,61,
-61,63,5,0,38,6,68,9,133,0,190,255,182,171,61,135,
-17,0,61,71,9,0,61,63,5,0,61,55,1,0,91,7,
-1,0,91,7,0,0,99,135,1,0,61,127,21,0,99,127,
-5,0,61,119,25,0,99,119,9,0,61,111,29,0,99,111,
-13,0,61,103,33,0,1,90,99,95,21,0,99,103,17,0,
-28,72,128,255,242,9,224,81,146,13,38,6,52,9,133,0,
-32,62,231,4,0,66,190,255,228,162,37,54,132,131,190,255,
-82,171,76,6,255,16,132,7,97,0,6,232,93,7,1,0,
-213,21,35,78,4,0,31,138,99,143,1,0,32,54,236,176,
-32,62,8,2,1,66,128,255,224,72,35,127,5,0,138,122,
-217,5,4,55,48,140,128,255,214,9,29,111,0,0,224,105,
-146,237,2,98,93,103,1,0,68,6,127,0,128,7,33,0,
-128,255,10,9,64,6,63,0,128,7,33,0,68,7,113,140,
-100,7,117,140,38,6,148,24,148,0,128,255,154,9,224,81,
-162,13,38,6,88,9,133,0,32,62,63,5,0,66,190,255,
-92,162,224,81,64,6,63,0,130,7,97,0,6,232,93,7,
-1,0,213,13,3,56,32,54,104,180,31,66,128,255,8,9,
-35,55,1,0,224,49,178,5,190,255,204,190,29,143,0,0,
-224,137,146,245,2,130,93,135,1,0,66,6,127,0,130,7,
-97,0,99,7,1,0,3,56,6,232,32,54,104,180,0,66,
-190,255,22,191,29,87,1,0,66,6,127,0,132,7,97,0,
-6,232,93,7,1,0,149,29,35,78,4,0,31,138,99,143,
-1,0,32,54,236,176,32,62,8,4,1,66,128,255,10,72,
-35,127,5,0,139,122,153,13,32,54,60,0,128,255,104,8,
-128,255,140,8,224,81,218,253,29,119,0,0,224,113,210,229,
-2,106,93,111,1,0,68,6,127,0,128,7,33,0,128,255,
-44,8,64,6,63,0,132,7,97,0,6,232,93,7,1,0,
-213,21,35,78,4,0,31,138,99,143,1,0,32,54,236,176,
-32,62,8,8,1,66,128,255,176,71,35,127,5,0,140,122,
-217,5,128,255,74,8,224,81,218,253,29,119,0,0,224,113,
-146,237,2,106,93,111,1,0,68,6,127,0,128,7,33,0,
-128,255,218,7,64,6,63,0,136,7,225,0,6,232,93,7,
-1,0,31,50,190,255,38,234,32,143,13,177,224,137,138,53,
-64,86,0,0,43,6,96,0,0,0,74,95,8,240,133,45,
-35,78,4,0,99,7,1,0,32,54,72,180,14,58,1,66,
-128,255,70,71,224,81,218,13,35,127,5,0,130,122,185,5,
-190,255,20,233,35,111,5,0,131,106,185,5,128,255,108,26,
-4,103,80,139,224,97,202,13,51,6,1,0,32,0,211,247,
-0,0,194,5,190,255,84,211,181,5,128,255,54,69,29,95,
-0,0,224,89,226,213,190,255,206,233,128,255,10,26,128,54,
-255,255,128,255,212,26,2,226,99,231,13,0,99,7,9,0,
-35,62,8,0,38,6,44,137,145,0,0,66,190,255,186,189,
-93,231,1,0,72,6,255,0,128,7,97,0,6,232,32,54,
-72,180,8,58,0,66,128,255,196,71,29,87,1,0,64,6,
-127,0,154,7,225,16,99,7,20,0,99,7,26,0,32,134,
-17,0,99,135,29,0,35,126,32,0,99,127,9,0,99,7,
-17,0,99,7,13,0,6,216,91,7,1,0,149,77,3,56,
-38,6,216,215,255,255,31,66,128,255,28,7,35,55,1,0,
-224,49,226,61,191,255,198,196,99,87,5,0,35,239,1,0,
-0,226,157,79,5,0,99,79,22,0,29,48,0,58,35,70,
-32,0,190,255,94,174,97,82,146,13,38,6,104,9,133,0,
-32,62,14,7,0,66,190,255,20,160,12,50,12,58,35,70,
-4,0,190,255,106,144,61,239,13,0,65,226,224,233,170,229,
-35,239,5,0,229,87,64,0,224,7,96,1,61,255,0,0,
-220,249,125,255,0,0,10,224,252,47,32,0,224,249,138,13,
-29,48,61,111,5,0,63,6,238,122,1,0,109,0,27,103,
-0,0,224,97,210,181,2,90,91,95,1,0,90,6,255,16,
-130,7,97,0,99,7,1,0,3,56,6,232,38,6,216,215,
-255,255,0,66,190,255,178,188,29,87,1,0,66,6,127,0,
-136,7,225,0,6,224,4,239,80,139,128,255,58,6,10,16,
-224,17,178,29,2,6,192,253,138,13,32,54,56,0,37,62,
-136,131,191,255,24,60,149,21,2,6,237,207,138,13,32,54,
-36,0,37,62,136,131,191,255,4,60,245,5,32,54,55,0,
-37,62,136,131,191,255,246,59,128,255,244,5,196,223,144,140,
-234,13,97,234,170,13,38,6,156,9,133,0,190,255,180,167,
-32,54,200,0,191,255,68,176,128,255,76,6,0,50,191,255,
-34,176,36,111,101,134,224,105,130,13,32,102,0,16,50,6,
-20,0,32,0,114,103,0,0,36,158,145,140,211,199,0,0,
-250,5,32,54,63,0,37,62,136,131,191,255,160,59,99,234,
-154,13,36,71,141,140,1,50,39,6,120,9,133,0,191,255,
-140,59,0,234,165,29,253,22,48,0,48,6,16,129,133,0,
-208,17,34,127,37,0,224,121,250,13,34,55,1,0,128,255,
-14,6,224,81,146,13,38,6,140,9,133,0,32,62,187,7,
-0,66,190,255,184,158,65,234,105,234,225,229,92,7,1,0,
-165,117,35,78,4,0,31,106,99,111,1,0,32,54,236,176,
-39,6,56,128,3,0,1,66,128,255,190,68,35,95,5,0,
-134,90,233,45,35,62,8,0,38,6,188,136,145,0,0,66,
-128,255,68,5,10,232,224,233,154,37,3,23,12,0,97,18,
-202,21,35,87,9,0,224,81,146,29,42,23,241,11,3,58,
-72,18,34,95,0,0,63,6,118,124,1,0,202,89,34,87,
-5,0,11,48,106,0,165,13,38,6,140,9,133,0,32,62,
-244,7,0,66,190,255,54,158,224,81,224,233,194,213,35,135,
-5,0,133,130,201,5,0,50,191,255,32,175,35,119,5,0,
-144,114,185,5,128,255,40,5,35,103,5,0,145,98,217,29,
-35,62,8,0,38,6,244,136,145,0,0,66,128,255,200,4,
-224,81,186,21,35,55,9,0,128,255,20,5,35,55,13,0,
-224,49,194,5,31,58,191,255,6,194,32,54,236,176,64,62,
-1,0,0,66,128,255,6,69,35,143,5,0,146,138,185,5,
-128,255,110,22,28,127,0,0,224,121,194,141,2,114,92,119,
-1,0,72,6,255,0,128,7,33,0,128,255,48,4,64,6,
-63,0,140,7,225,240,6,208,90,7,1,0,128,7,128,1,
-35,78,4,0,31,138,99,143,1,0,32,54,236,176,32,62,
-72,0,1,66,128,255,178,67,35,23,5,0,194,134,64,0,
-186,5,128,7,90,1,132,18,185,5,128,7,82,1,99,7,
-9,0,0,234,35,78,8,0,32,118,100,0,99,119,1,0,
-32,54,236,176,32,62,72,0,0,66,128,255,124,67,224,81,
-210,5,65,234,29,6,196,255,230,237,35,103,9,0,204,110,
-72,0,178,5,128,7,24,1,0,234,38,6,132,215,255,255,
-31,58,128,255,80,72,224,81,154,253,0,18,29,6,240,255,
-129,13,253,142,40,0,32,126,160,180,207,137,49,23,17,0,
-99,7,13,0,0,194,2,216,224,217,226,45,59,23,105,0,
-35,62,12,0,2,22,64,1,34,87,0,0,34,119,5,0,
-219,81,10,48,63,6,220,125,1,0,110,0,10,192,31,202,
-0,226,59,23,105,0,28,64,2,22,136,0,34,87,0,0,
-35,54,16,0,219,81,10,56,34,111,5,0,63,6,4,126,
-1,0,109,0,195,207,16,0,178,5,28,200,213,5,65,226,
-28,6,240,255,246,229,38,6,132,215,255,255,128,255,248,72,
-224,81,146,13,38,6,196,9,133,0,32,62,6,1,0,66,
-190,255,138,156,224,193,186,45,35,103,13,0,97,98,250,37,
-29,48,35,62,20,0,128,255,2,29,224,81,154,29,29,48,
-25,56,128,255,140,46,10,224,28,6,218,254,226,13,28,6,
-220,254,178,13,28,6,221,254,130,13,32,54,236,176,32,62,
-64,0,0,66,128,255,118,67,224,225,242,13,133,13,32,54,
-236,176,32,62,64,0,0,66,128,255,98,67,65,234,29,6,
-240,255,190,5,191,7,246,254,128,255,42,0,26,127,0,0,
-224,121,186,5,191,7,124,254,191,255,40,173,2,114,90,119,
-1,0,76,6,255,240,128,7,33,0,128,255,128,2,64,6,
-63,0,132,7,225,243,38,6,132,215,255,255,31,58,128,255,
-20,71,224,81,154,253,0,234,0,18,29,6,240,255,129,13,
-253,118,40,0,32,102,160,180,204,113,46,23,17,0,2,80,
-224,81,210,101,138,95,7,0,109,90,154,101,42,23,105,0,
-2,22,24,0,34,95,0,0,63,6,24,127,1,0,202,89,
-34,87,5,0,11,48,106,0,10,176,11,184,0,226,0,18,
-28,6,240,255,129,13,252,118,40,0,32,102,160,180,204,113,
-46,23,17,0,2,208,224,209,226,61,22,192,23,200,28,48,
-128,255,52,2,224,81,202,21,0,202,0,218,27,48,191,255,
-98,173,253,81,186,5,27,200,213,5,65,218,27,6,240,255,
-230,245,25,48,191,255,124,172,10,198,0,248,0,202,58,23,
-105,0,3,56,2,22,224,0,34,87,0,0,34,95,5,0,
-218,81,10,48,63,6,140,127,1,0,107,0,224,81,186,21,
-35,95,5,0,35,87,1,0,235,201,219,13,177,5,234,193,
-169,13,29,64,28,72,32,54,50,0,39,6,208,9,133,0,
-191,255,170,55,65,226,28,6,240,255,166,181,65,234,29,6,
-240,255,182,141,38,6,132,215,255,255,128,255,74,71,224,81,
-162,13,38,6,236,9,133,0,32,62,6,1,0,66,190,255,
-220,154,224,81,68,6,255,243,136,7,225,48,6,208,90,7,
-1,0,128,7,12,1,99,7,9,0,35,62,8,0,38,6,
-44,137,145,0,31,66,128,255,126,1,35,23,13,0,97,18,
-242,117,196,239,144,140,210,109,0,234,29,48,128,255,96,21,
-224,81,178,101,29,48,3,56,128,255,200,29,10,224,28,6,
-251,253,162,37,35,135,1,0,224,129,226,29,32,54,100,0,
-191,255,136,171,29,48,35,62,4,0,128,255,254,26,10,224,
-28,6,254,239,242,5,35,87,5,0,35,23,1,0,234,17,
-242,5,29,48,128,255,218,20,32,230,2,16,213,5,234,17,
-186,5,32,230,5,2,28,6,251,253,234,37,35,63,1,0,
-29,48,128,255,88,9,224,81,218,5,29,48,128,255,178,20,
-181,29,0,226,0,218,1,106,35,95,1,0,251,111,192,0,
-77,89,194,13,27,48,1,58,128,255,44,15,10,224,27,56,
-38,6,8,10,133,0,190,255,122,162,224,225,218,5,65,218,
-27,6,240,255,150,237,224,225,138,21,29,48,128,255,86,21,
-224,81,186,13,29,56,38,6,248,9,133,0,190,255,84,162,
-29,48,31,58,191,255,168,3,65,234,29,6,240,255,230,149,
-35,55,9,0,224,49,194,5,31,58,191,255,226,189,26,127,
-0,0,224,121,186,5,191,7,240,254,2,114,90,119,1,0,
-72,6,255,48,132,7,97,0,1,18,99,23,5,0,99,7,
-1,0,3,56,6,232,38,6,44,137,145,0,0,66,190,255,
-152,182,29,87,1,0,68,6,127,0,128,7,97,0,6,232,
-32,54,236,176,8,58,0,66,128,255,162,64,29,87,1,0,
-64,6,127,0,33,6,144,177,129,0,97,0,33,6,120,9,
-128,0,97,0,33,6,116,12,128,0,97,0,33,6,206,4,
-130,0,97,0,33,6,218,122,128,0,97,0,33,6,168,218,
-128,0,97,0,33,6,236,0,130,0,97,0,33,6,246,218,
-128,0,97,0,33,6,24,250,128,0,97,0,33,6,160,40,
-129,0,97,0,33,6,106,41,129,0,97,0,33,6,116,252,
-129,0,97,0,33,6,224,241,129,0,97,0,33,6,216,247,
-129,0,97,0,33,6,208,245,129,0,97,0,33,6,114,142,
-129,0,97,0,33,6,198,158,129,0,97,0,33,6,58,160,
-129,0,97,0,33,6,76,249,129,0,97,0,33,6,184,180,
-129,0,97,0,33,6,196,248,129,0,97,0,33,6,116,241,
-129,0,97,0,144,7,225,112,0,234,6,200,0,58,128,255,
-58,1,59,6,132,215,255,255,58,6,24,11,133,0,0,226,
-128,7,22,1,1,130,67,135,3,0,27,48,31,58,128,255,
-180,67,224,81,186,253,57,127,17,0,224,121,218,21,32,238,
-10,1,163,119,3,0,224,113,210,125,67,7,3,0,27,48,
-128,255,196,68,224,81,226,117,26,48,32,62,6,1,0,66,
-190,255,90,152,245,109,99,7,13,0,99,7,17,0,99,7,
-22,0,191,255,92,189,106,7,9,0,45,6,36,64,1,0,
-106,111,5,0,32,102,232,3,106,7,29,0,8,18,106,7,
-33,0,224,225,99,87,5,0,106,103,21,0,170,5,0,18,
-99,23,26,0,57,95,17,0,43,23,105,0,35,62,4,0,
-2,22,144,0,34,87,0,0,63,6,200,130,1,0,203,81,
-34,95,5,0,10,48,107,0,10,232,163,87,3,0,224,81,
-226,13,67,7,3,0,27,48,128,255,60,68,224,81,242,5,
-26,48,32,62,6,1,0,66,190,255,210,151,35,55,5,0,
-29,56,191,255,234,187,35,23,5,0,2,80,42,135,0,0,
-224,129,218,253,34,239,12,0,98,7,0,0,2,48,128,255,
-172,75,163,127,3,0,224,121,226,13,67,7,3,0,27,48,
-128,255,244,67,224,81,242,5,26,48,32,62,6,1,0,66,
-190,255,138,151,65,226,98,226,222,5,224,233,186,5,191,7,
-230,254,29,80,80,6,255,112,128,7,33,0,38,55,13,0,
-167,0,190,255,116,176,64,6,63,0,142,7,225,16,6,216,
-61,6,132,215,255,255,29,48,31,58,128,255,120,66,224,81,
-186,253,59,143,17,0,32,230,10,1,224,137,146,77,191,255,
-80,188,106,7,9,0,48,6,36,64,1,0,106,135,5,0,
-32,126,232,3,106,7,29,0,3,56,106,7,33,0,63,6,
-202,131,1,0,59,95,17,0,106,127,21,0,43,23,105,0,
-202,47,2,0,99,87,1,0,2,22,168,0,34,87,0,0,
-34,119,5,0,203,81,10,48,110,0,10,224,29,48,128,255,
-70,67,224,81,146,13,38,6,36,11,133,0,32,62,6,1,
-0,66,190,255,216,150,35,55,1,0,28,56,191,255,240,186,
-35,23,1,0,2,80,42,111,0,0,224,105,218,253,34,231,
-12,0,98,7,0,0,2,48,128,255,178,74,229,13,29,48,
-128,255,4,67,224,81,146,13,38,6,36,11,133,0,32,62,
-6,1,0,66,190,255,150,150,28,80,78,6,255,16,132,7,
-225,48,6,224,61,6,132,215,255,255,1,138,67,143,1,0,
-29,48,31,58,128,255,158,65,224,81,186,253,60,87,17,0,
-59,6,24,11,133,0,224,81,218,21,163,135,1,0,224,129,
-226,13,67,7,1,0,29,48,128,255,172,66,224,81,242,5,
-27,48,32,62,6,1,0,66,190,255,66,150,32,86,10,1,
-229,85,42,23,105,0,63,6,158,132,1,0,2,22,80,0,
-34,95,0,0,34,127,5,0,202,89,11,48,111,0,10,208,
-163,119,1,0,224,113,226,13,67,7,1,0,29,48,128,255,
-102,66,224,81,242,5,27,48,32,62,6,1,0,66,190,255,
-252,149,224,209,210,29,28,56,35,54,2,0,128,255,72,1,
-227,55,3,0,35,62,4,0,32,70,241,0,128,255,108,19,
-28,56,35,54,2,0,128,255,10,2,227,55,3,0,35,62,
-4,0,32,70,246,0,128,255,82,19,10,16,213,5,28,48,
-128,255,48,0,10,16,2,224,163,95,1,0,224,89,226,13,
-67,7,1,0,29,48,128,255,254,65,224,81,242,5,27,48,
-32,62,6,1,0,66,190,255,148,149,28,80,68,6,255,48,
-132,7,225,0,32,238,10,1,6,224,28,56,35,54,2,0,
-128,255,36,0,60,143,17,0,224,137,162,13,227,55,3,0,
-35,62,4,0,32,70,246,0,128,255,240,18,10,232,29,80,
-68,6,255,0,134,7,225,16,6,224,7,216,1,138,67,143,
-3,0,38,6,132,215,255,255,31,58,128,255,104,64,224,81,
-154,253,59,135,17,0,99,7,6,0,224,129,194,37,0,234,
-59,95,17,0,29,64,43,23,105,0,35,54,8,0,2,22,
-136,0,34,87,0,0,34,127,5,0,203,81,10,56,63,6,
-182,133,1,0,111,0,195,199,8,0,146,13,1,114,253,119,
-192,0,227,103,7,0,14,97,99,103,6,0,65,234,29,6,
-240,255,246,221,227,95,7,0,99,95,4,0,163,87,3,0,
-224,81,162,21,67,7,3,0,38,6,132,215,255,255,128,255,
-38,65,224,81,146,13,38,6,24,11,133,0,32,62,6,1,
-0,66,190,255,184,148,227,143,5,0,124,143,0,0,28,80,
-70,6,255,16,136,7,225,16,6,216,7,224,1,138,67,143,
-3,0,38,6,132,215,255,255,31,58,128,255,184,63,224,81,
-154,253,60,135,17,0,99,7,6,0,224,129,162,61,0,234,
-60,95,17,0,29,64,43,23,105,0,35,54,8,0,2,22,
-136,0,34,87,0,0,34,127,5,0,203,81,10,56,63,6,
-102,134,1,0,111,0,195,199,8,0,242,29,60,95,17,0,
-29,64,43,23,105,0,35,54,12,0,2,22,136,0,34,87,
-0,0,34,119,5,0,203,81,10,56,63,6,146,134,1,0,
-110,0,195,207,12,0,154,13,1,106,253,111,192,0,227,95,
-7,0,13,89,99,95,6,0,65,234,29,6,240,255,150,205,
-227,87,7,0,99,87,4,0,163,143,3,0,224,137,162,21,
-67,7,3,0,38,6,132,215,255,255,128,255,74,64,224,81,
-146,13,38,6,24,11,133,0,32,62,6,1,0,66,190,255,
-220,147,227,135,5,0,123,135,0,0,27,80,72,6,255,16,
-136,7,225,16,6,216,7,224,1,138,67,143,3,0,38,6,
-132,215,255,255,31,58,128,255,220,62,224,81,154,253,60,135,
-17,0,99,7,6,0,224,129,162,61,0,234,60,95,17,0,
-29,64,43,23,105,0,35,54,8,0,2,22,136,0,34,87,
-0,0,34,127,5,0,203,81,10,56,63,6,66,135,1,0,
-111,0,195,199,8,0,242,29,60,95,17,0,29,64,43,23,
-105,0,35,54,12,0,2,22,136,0,34,87,0,0,34,119,
-5,0,203,81,10,56,63,6,110,135,1,0,110,0,195,207,
-12,0,146,13,1,106,253,111,192,0,227,95,7,0,13,89,
-99,95,6,0,65,234,29,6,240,255,150,205,227,87,7,0,
-99,87,4,0,163,143,3,0,224,137,162,21,67,7,3,0,
-38,6,132,215,255,255,128,255,110,63,224,81,146,13,38,6,
-24,11,133,0,32,62,6,1,0,66,190,255,0,147,227,135,
-5,0,123,135,0,0,27,80,72,6,255,16,134,7,225,16,
-6,216,59,143,17,0,224,137,186,5,31,82,197,69,0,226,
-1,130,67,135,3,0,38,6,132,215,255,255,31,58,128,255,
-244,61,224,81,154,253,0,234,59,95,17,0,29,64,43,23,
-105,0,35,54,8,0,2,22,136,0,34,87,0,0,34,127,
-5,0,203,81,10,56,63,6,30,136,1,0,111,0,35,119,
-9,0,99,119,5,0,195,199,4,0,162,5,65,226,65,234,
-29,6,240,255,166,229,28,232,163,111,3,0,224,105,162,21,
-67,7,3,0,38,6,132,215,255,255,128,255,202,62,224,81,
-146,13,38,6,24,11,133,0,32,62,6,1,0,66,190,255,
-92,146,29,80,70,6,255,16,132,7,225,48,7,232,189,0,
-6,216,59,143,17,0,8,208,224,137,202,5,32,238,10,1,
-213,29,32,231,37,183,0,58,28,48,3,64,190,255,74,219,
-59,55,17,0,29,56,26,64,190,255,198,234,10,232,28,48,
-35,63,1,0,35,70,4,0,190,255,46,219,32,54,236,176,
-64,62,2,0,0,66,128,255,52,57,29,80,68,6,255,48,
-128,7,225,0,102,7,29,0,102,7,17,0,102,7,21,0,
-102,7,25,0,7,224,70,231,34,0,70,7,35,0,70,7,
-36,0,30,130,102,135,32,0,6,232,191,255,220,226,0,18,
-28,6,240,255,241,5,252,22,120,4,44,6,184,29,148,0,
-204,17,125,23,13,0,64,6,255,0,128,7,97,0,128,255,
-108,26,0,234,253,54,40,0,32,118,160,180,206,49,29,56,
-191,255,160,255,253,54,120,4,42,6,184,29,148,0,202,49,
-29,56,190,255,76,162,65,234,29,6,240,255,198,237,100,7,
-130,140,32,142,40,0,100,143,128,140,1,50,190,255,22,156,
-100,87,133,140,64,6,127,0,130,7,225,0,6,232,1,226,
-38,6,132,215,255,255,31,58,128,255,122,60,224,81,154,253,
-0,18,29,6,240,255,129,13,253,126,40,0,32,110,160,180,
-205,121,47,23,17,0,2,80,224,81,210,21,42,23,105,0,
-3,48,2,22,136,0,34,95,0,0,31,66,202,89,11,56,
-34,103,5,0,63,6,172,137,1,0,108,0,195,199,0,0,
-162,5,0,226,38,6,132,215,255,255,128,255,90,61,224,81,
-146,13,38,6,48,11,133,0,32,62,6,1,0,66,190,255,
-236,144,28,80,66,6,255,0,128,7,128,7,225,48,6,232,
-7,208,1,226,229,87,64,0,224,7,96,1,10,216,0,18,
-29,6,240,255,129,13,253,126,40,0,32,110,160,180,205,121,
-47,23,17,0,2,80,224,81,146,21,42,23,105,0,26,56,
-2,22,104,0,34,95,0,0,34,103,5,0,202,89,11,48,
-63,6,40,138,1,0,108,0,10,224,251,47,32,0,28,80,
-64,6,255,48,132,7,225,48,6,224,7,208,0,234,229,87,
-64,0,224,7,96,1,10,216,0,18,28,6,240,255,129,13,
-252,126,40,0,32,110,160,180,205,121,47,23,17,0,2,80,
-224,81,194,29,42,23,105,0,26,64,2,22,136,0,34,95,
-0,0,35,54,4,0,202,89,11,56,34,103,5,0,63,6,
-134,138,1,0,108,0,35,95,5,0,99,95,1,0,195,199,
-0,0,194,5,11,232,222,234,159,234,251,47,32,0,29,80,
-68,6,255,48,128,7,193,16,6,224,0,234,229,87,64,0,
-224,7,96,1,10,216,0,18,28,6,240,255,129,13,252,126,
-40,0,32,110,160,180,205,121,47,23,17,0,224,17,194,13,
-252,94,40,0,32,142,160,180,209,89,43,239,13,0,29,239,
-2,0,221,234,159,234,251,47,32,0,29,80,64,6,223,16,
-128,7,225,48,6,232,7,208,154,0,38,6,132,215,255,255,
-31,58,128,255,224,58,224,81,154,253,31,226,29,48,190,255,
-94,226,10,232,224,233,250,5,38,6,72,11,133,0,190,255,
-18,152,149,29,32,54,88,1,190,255,76,249,10,216,29,48,
-27,56,128,255,252,39,157,143,7,0,111,138,186,5,123,7,
-5,0,29,48,27,56,26,64,128,255,90,21,10,224,27,48,
-190,255,20,249,38,6,132,215,255,255,128,255,186,59,224,81,
-146,13,38,6,128,11,133,0,32,62,6,1,0,66,190,255,
-76,143,224,233,162,13,127,226,130,13,252,54,40,0,32,102,
-160,180,204,49,191,255,170,248,28,80,64,6,255,48,128,7,
-225,112,6,224,7,208,8,200,153,0,38,6,132,215,255,255,
-31,58,128,255,64,58,224,81,154,253,31,234,28,48,190,255,
-190,225,10,224,224,225,250,5,38,6,140,11,133,0,190,255,
-114,151,181,45,28,143,7,0,224,137,154,37,32,54,88,1,
-190,255,164,248,10,216,27,48,26,56,32,70,88,1,191,255,
-164,131,32,134,21,0,123,135,1,0,26,232,26,48,128,255,
-34,26,127,82,170,5,27,232,28,48,29,56,25,64,128,255,
-164,20,10,232,27,48,190,255,94,248,245,5,28,48,26,56,
-25,64,128,255,144,20,10,232,38,6,132,215,255,255,128,255,
-246,58,224,81,146,13,38,6,200,11,133,0,32,62,6,1,
-0,66,190,255,136,142,224,225,162,13,127,234,130,13,253,54,
-40,0,32,86,160,180,202,49,191,255,230,247,29,80,64,6,
-255,112,128,7,225,0,6,6,240,255,201,5,32,86,10,1,
-197,53,230,238,40,0,32,110,160,180,205,233,61,23,17,0,
-224,17,202,5,32,86,10,1,133,45,2,224,39,23,105,0,
-125,63,17,0,2,22,24,0,34,87,0,0,34,103,5,0,
-199,81,10,48,63,6,156,140,1,0,108,0,125,87,21,0,
-125,95,25,0,224,225,130,21,60,23,105,0,3,58,2,22,
-80,1,34,87,0,0,34,95,5,0,220,81,10,48,63,6,
-198,140,1,0,107,0,0,82,64,6,255,0,130,7,225,112,
-6,224,58,6,132,215,255,255,1,130,67,135,3,0,26,48,
-31,58,128,255,0,57,224,81,186,253,0,18,28,6,240,255,
-129,13,252,110,40,0,32,94,160,180,203,105,45,23,17,0,
-2,216,224,217,186,29,28,56,38,6,224,11,133,0,190,255,
-34,150,163,87,3,0,224,81,210,101,67,7,3,0,26,48,
-128,255,244,57,224,81,226,93,38,6,24,11,133,0,32,62,
-6,1,0,66,190,255,134,141,213,85,28,128,240,126,40,0,
-32,118,160,180,15,232,206,233,61,95,17,0,43,23,105,0,
-63,6,104,141,1,0,2,22,80,0,34,87,0,0,34,111,
-5,0,203,81,10,48,109,0,224,81,194,5,37,22,152,131,
-181,5,37,22,148,131,2,200,61,79,25,0,61,71,21,0,
-28,56,38,6,0,12,133,0,190,255,168,149,25,56,38,6,
-212,11,133,0,190,255,156,149,59,23,105,0,63,6,180,141,
-1,0,2,22,192,0,34,87,0,0,34,103,5,0,219,81,
-10,48,108,0,61,55,13,0,190,255,90,157,163,95,3,0,
-224,89,130,21,67,7,3,0,26,48,128,255,74,57,224,81,
-146,13,38,6,24,11,133,0,32,62,6,1,0,66,190,255,
-220,140,66,6,255,112,130,7,97,0,1,138,67,143,3,0,
-38,6,132,215,255,255,31,58,128,255,234,55,224,81,154,253,
-37,54,155,131,190,255,44,149,0,234,253,126,40,0,32,110,
-160,180,205,121,47,23,17,0,224,17,130,13,29,48,191,255,
-174,254,37,54,155,131,190,255,10,149,65,234,29,6,240,255,
-214,237,163,103,3,0,224,97,162,21,67,7,3,0,38,6,
-132,215,255,255,128,255,208,56,224,81,146,13,38,6,24,11,
-133,0,32,62,6,1,0,66,190,255,98,140,66,6,127,0,
-128,7,225,0,7,224,128,255,44,0,10,232,127,234,154,13,
-38,6,28,12,133,0,32,62,203,4,0,66,190,255,62,140,
-29,48,128,255,104,22,29,48,28,56,128,255,208,21,64,6,
-255,0,128,7,225,48,6,216,31,226,229,87,64,0,224,7,
-96,1,10,208,224,217,226,37,0,234,253,134,40,0,32,118,
-160,180,206,129,48,87,17,0,234,217,186,5,29,224,165,29,
-224,81,194,21,42,23,105,0,27,56,2,22,48,1,34,95,
-0,0,34,111,5,0,202,89,11,48,63,6,226,142,1,0,
-109,0,97,82,186,5,29,224,213,5,65,234,29,6,240,255,
-214,221,250,47,32,0,28,80,64,6,255,48,130,7,225,16,
-6,232,1,138,67,143,3,0,38,6,132,215,255,255,31,58,
-128,255,210,54,224,81,154,253,0,18,29,6,240,255,129,13,
-253,118,40,0,32,102,160,180,204,113,46,23,17,0,2,224,
-224,225,146,61,253,222,40,0,32,142,160,180,209,217,27,48,
-191,255,240,245,253,54,120,4,45,6,184,29,148,0,205,49,
-29,56,190,255,44,156,27,48,29,56,191,255,102,249,36,103,
-130,140,95,98,100,103,130,140,224,225,130,21,60,23,105,0,
-3,58,2,22,80,1,34,87,0,0,34,95,5,0,220,81,
-10,48,63,6,138,143,1,0,107,0,29,48,128,255,94,21,
-29,48,0,58,128,255,122,35,29,56,38,6,44,12,133,0,
-190,255,144,147,163,87,3,0,224,81,162,21,67,7,3,0,
-38,6,132,215,255,255,128,255,94,55,224,81,146,13,38,6,
-24,11,133,0,32,62,6,1,0,66,190,255,240,138,0,82,
-66,6,255,16,134,7,225,112,7,200,185,0,32,230,10,1,
-6,216,191,255,206,156,10,232,127,234,186,5,128,7,10,1,
-58,6,132,215,255,255,1,138,67,143,3,0,26,48,31,58,
-128,255,226,53,224,81,186,253,0,18,29,6,240,255,129,13,
-253,118,40,0,32,102,160,180,204,113,46,23,17,0,2,80,
-224,81,210,45,42,23,105,0,27,64,2,22,136,0,34,63,
-0,0,35,54,8,0,202,57,34,95,5,0,63,6,68,144,
-1,0,107,0,35,87,9,0,253,54,40,0,99,87,5,0,
-32,118,160,180,206,49,27,64,32,62,239,255,191,255,12,248,
-10,224,195,207,4,0,186,13,224,225,154,13,29,64,27,72,
-2,50,39,6,116,12,133,0,191,255,226,38,163,103,3,0,
-224,97,130,21,67,7,3,0,26,48,128,255,138,54,224,81,
-146,13,38,6,24,11,133,0,32,62,6,1,0,66,190,255,
-28,138,27,56,28,64,38,6,68,12,133,0,190,255,132,146,
-224,225,250,13,32,54,236,176,32,62,64,0,0,66,128,255,
-44,49,224,201,234,5,29,48,31,58,190,255,194,243,10,224,
-163,135,3,0,224,129,130,21,67,7,3,0,26,48,128,255,
-54,54,224,81,146,13,38,6,24,11,133,0,32,62,6,1,
-0,66,190,255,200,137,28,80,70,6,255,112,128,7,225,0,
-6,224,191,255,174,155,10,232,127,234,202,5,32,86,10,1,
-213,45,38,6,132,215,255,255,31,58,128,255,200,52,224,81,
-154,253,0,18,29,6,240,255,129,13,253,126,40,0,32,110,
-160,180,205,121,47,23,17,0,2,48,32,238,10,1,224,49,
-210,5,28,56,190,255,66,226,10,232,38,6,132,215,255,255,
-128,255,196,53,224,81,146,13,38,6,136,12,133,0,32,62,
-6,1,0,66,190,255,86,137,29,80,64,6,255,0,128,7,
-225,16,6,216,191,255,60,155,10,232,127,234,202,5,32,86,
-10,1,213,45,38,6,132,215,255,255,31,58,128,255,86,52,
-224,81,154,253,32,230,10,1,0,18,29,6,240,255,129,13,
-253,126,40,0,32,110,160,180,205,121,47,23,17,0,2,48,
-224,49,210,5,27,56,190,255,250,225,10,224,38,6,132,215,
-255,255,128,255,82,53,224,81,146,13,38,6,148,12,133,0,
-32,62,6,1,0,66,190,255,228,136,28,80,64,6,255,16,
-128,7,225,0,6,232,7,224,38,6,132,215,255,255,31,58,
-128,255,242,51,224,81,154,253,0,18,29,6,240,255,129,13,
-253,126,40,0,32,110,160,180,205,121,47,23,17,0,2,80,
-32,238,10,1,224,81,146,21,42,23,105,0,28,56,2,22,
-160,0,34,95,0,0,34,103,5,0,202,89,11,48,63,6,
-54,146,1,0,108,0,0,234,38,6,132,215,255,255,128,255,
-214,52,224,81,146,13,38,6,160,12,133,0,32,62,6,1,
-0,66,190,255,104,136,29,80,64,6,255,0,130,7,225,48,
-6,232,7,224,188,0,8,208,29,6,240,255,201,5,32,86,
-10,1,229,69,59,6,132,215,255,255,1,130,67,135,3,0,
-27,48,31,58,128,255,94,51,224,81,186,253,253,54,40,0,
-32,102,160,180,204,49,28,56,26,64,191,255,206,245,10,224,
-163,87,3,0,224,81,130,21,67,7,3,0,27,48,128,255,
-102,52,224,81,146,13,38,6,24,11,133,0,32,62,6,1,
-0,66,190,255,248,135,224,225,234,5,29,48,31,58,190,255,
-190,241,10,224,28,232,163,135,3,0,224,129,130,21,67,7,
-3,0,27,48,128,255,48,52,224,81,146,13,38,6,24,11,
-133,0,32,62,6,1,0,66,190,255,194,135,29,80,66,6,
-255,48,128,7,33,0,6,16,0,82,2,6,240,255,129,13,
-226,126,40,0,32,110,160,180,205,121,47,87,17,0,224,81,
-202,5,32,86,10,1,165,29,196,18,36,94,184,172,194,89,
-43,71,5,0,36,142,184,172,103,71,1,0,194,137,49,127,
-9,0,39,54,8,0,103,127,5,0,36,110,184,172,205,17,
-34,63,13,0,191,255,46,124,0,82,64,6,63,0,132,7,
-97,0,1,138,99,143,5,0,31,50,190,255,176,207,1,130,
-67,135,2,0,38,6,132,215,255,255,31,58,128,255,102,50,
-224,81,154,253,0,234,253,118,40,0,32,110,160,180,205,113,
-46,103,17,0,224,97,194,13,29,56,38,6,172,12,133,0,
-190,255,144,143,29,56,35,54,3,0,190,255,4,164,65,234,
-29,6,240,255,150,237,131,95,3,0,224,89,162,21,67,7,
-2,0,38,6,132,215,255,255,128,255,76,51,224,81,146,13,
-38,6,24,11,133,0,32,62,6,1,0,66,190,255,222,134,
-35,87,5,0,224,81,210,5,99,7,5,0,190,255,22,207,
-68,6,127,0,128,7,225,0,0,226,0,234,253,54,40,0,
-32,126,160,180,207,49,38,119,17,0,224,113,242,5,191,255,
-246,237,10,16,224,17,162,5,2,224,65,234,29,6,240,255,
-230,237,28,80,64,6,255,0,128,7,97,0,0,234,253,54,
-40,0,32,126,160,180,207,49,38,119,17,0,224,113,194,5,
-3,58,191,255,6,239,65,234,29,6,240,255,150,245,0,82,
-64,6,127,0,132,7,33,0,191,255,156,255,128,54,255,255,
-128,255,102,0,2,18,99,23,5,0,191,255,100,171,106,7,
-9,0,49,6,36,64,1,0,106,143,5,0,32,134,232,3,
-106,7,29,0,1,18,106,7,33,0,3,56,106,135,21,0,
-99,87,1,0,106,23,0,0,38,6,44,137,145,0,31,66,
-190,255,38,163,197,5,10,50,191,255,32,151,35,23,1,0,
-34,127,0,0,224,121,138,253,98,7,0,0,2,48,128,255,
-252,57,68,6,63,0,128,7,193,16,6,216,0,234,229,87,
-64,0,224,7,96,1,10,224,0,90,235,22,40,0,32,126,
-160,180,207,17,34,119,17,0,224,113,242,21,34,87,32,0,
-224,81,134,21,219,81,98,87,32,0,228,111,129,140,228,103,
-249,133,172,105,237,81,150,13,31,82,98,87,32,0,1,234,
-197,5,127,82,170,5,1,234,65,90,11,6,240,255,230,221,
-252,47,32,0,29,80,64,6,223,16,100,7,248,133,228,23,
-129,140,226,49,206,5,166,17,100,23,248,133,127,0,128,7,
-193,0,6,232,229,87,64,0,224,7,96,1,10,224,0,82,
-29,6,240,255,177,13,253,22,40,0,32,118,160,180,206,17,
-34,111,17,0,224,105,162,5,2,80,10,16,224,17,178,5,
-98,7,32,0,252,47,32,0,64,6,223,0,132,7,225,0,
-6,232,0,226,1,138,67,143,3,0,38,6,132,215,255,255,
-31,58,128,255,80,48,224,81,154,253,0,18,29,6,240,255,
-129,13,253,118,40,0,32,102,160,180,204,113,46,23,17,0,
-2,80,224,81,226,29,42,23,105,0,35,62,4,0,2,22,
-128,0,34,55,0,0,34,95,5,0,202,49,63,6,212,149,
-1,0,107,0,253,22,40,0,32,134,160,180,35,127,5,0,
-208,17,224,121,226,5,34,119,32,0,127,114,170,5,1,226,
-28,232,163,111,3,0,224,105,162,21,67,7,3,0,38,6,
-132,215,255,255,128,255,16,49,224,81,146,13,38,6,24,11,
-133,0,32,62,6,1,0,66,190,255,162,132,29,80,68,6,
-255,0,130,7,225,240,6,232,56,6,132,215,255,255,1,138,
-67,143,3,0,24,48,31,58,128,255,170,47,224,81,186,253,
-32,230,10,1,29,48,191,255,54,255,97,82,154,93,0,18,
+224,7,96,1,36,95,249,139,224,89,210,245,36,231,249,139,
+61,127,17,0,36,143,249,139,65,122,49,143,5,0,125,127,
+17,0,124,7,13,0,124,7,9,0,100,143,249,139,251,47,
+32,0,28,88,61,103,1,0,124,215,1,0,224,97,170,13,
+124,7,5,0,125,95,9,0,125,95,5,0,125,95,1,0,
+165,77,61,111,9,0,45,87,1,0,58,23,5,0,42,87,
+5,0,34,23,13,0,42,87,13,0,234,17,209,5,13,16,
+125,95,9,0,229,53,61,87,5,0,42,127,1,0,47,127,
+5,0,47,127,13,0,239,17,217,5,10,16,125,95,5,0,
+133,45,12,16,229,37,34,87,1,0,43,143,1,0,42,87,
+5,0,49,143,5,0,42,87,13,0,49,143,13,0,234,137,
+209,13,34,87,9,0,224,81,178,5,10,16,165,21,107,23,
+5,0,98,95,9,0,0,18,197,13,34,87,13,0,224,81,
+178,5,10,16,229,5,107,23,5,0,98,95,13,0,0,18,
+224,17,170,221,36,127,249,139,224,121,226,87,0,0,64,6,
+223,48,128,7,97,0,6,232,61,143,41,0,224,137,154,37,
+29,22,20,0,61,119,17,0,34,127,17,0,239,113,231,135,
+0,0,93,135,50,0,207,5,29,22,20,0,165,5,29,16,
+34,95,17,0,224,89,186,5,0,82,149,53,29,87,50,0,
+224,81,194,5,29,22,20,0,165,5,29,16,125,23,41,0,
+61,55,41,0,191,255,50,253,224,81,154,37,157,23,51,0,
+65,18,194,126,1,0,93,127,50,0,194,5,29,22,20,0,
+165,5,29,16,34,95,17,0,224,89,242,13,29,87,50,0,
+224,81,194,5,29,22,20,0,165,5,29,16,125,23,41,0,
+2,48,191,255,244,252,181,5,125,7,41,0,64,6,127,0,
+199,0,198,223,128,7,33,0,0,58,128,255,174,98,64,6,
+63,0,127,0,38,87,6,16,128,7,128,7,102,7,1,0,
+102,7,5,0,102,7,8,0,127,0,128,7,193,16,6,224,
+7,232,229,87,64,0,224,7,96,1,60,143,8,0,10,216,
+224,137,170,13,124,239,5,0,124,239,1,0,125,239,73,0,
+125,239,69,0,181,21,60,23,5,0,226,233,34,87,73,0,
+178,13,125,23,69,0,60,119,5,0,110,239,73,0,125,87,
+73,0,106,239,69,0,124,239,5,0,60,111,8,0,65,106,
+124,111,8,0,251,47,32,0,64,6,223,16,128,7,193,16,
+6,224,7,232,229,87,64,0,224,7,96,1,60,23,8,0,
+10,216,95,18,226,0,124,23,8,0,224,17,226,29,60,135,
+1,0,240,233,234,5,61,127,73,0,124,127,1,0,149,13,
+60,119,5,0,238,233,218,5,61,111,69,0,124,111,5,0,
+61,95,73,0,61,103,69,0,108,95,73,0,61,87,73,0,
+61,143,69,0,106,143,69,0,251,47,32,0,64,6,223,16,
+0,82,34,6,120,8,146,0,2,142,76,0,98,143,73,0,
+65,82,2,22,76,0,10,6,1,249,246,245,47,6,180,19,
+2,0,34,6,120,8,146,0,2,128,207,129,112,7,73,0,
+96,23,173,179,127,0,128,7,193,0,6,224,229,87,64,0,
+224,7,96,1,32,143,173,179,10,232,124,143,73,0,96,231,
+173,179,253,47,32,0,64,6,223,0,0,18,42,6,16,219,
+255,255,1,90,106,95,56,0,106,23,58,0,65,18,10,86,
+60,0,2,6,236,255,246,245,127,0,128,7,225,112,0,210,
+57,6,16,219,255,255,0,226,25,216,27,232,181,5,128,255,
+102,1,61,55,1,0,224,49,186,253,68,218,65,226,109,226,
+214,245,25,206,60,0,65,210,26,6,236,255,214,237,64,6,
+255,112,128,7,193,16,6,224,0,234,229,87,64,0,224,7,
+96,1,10,216,0,82,64,22,0,0,34,94,16,219,11,16,
+34,143,56,0,97,138,234,13,98,7,56,0,2,232,98,231,
+53,0,0,82,98,7,1,0,65,82,68,18,109,82,182,253,
+245,5,11,94,60,0,65,82,10,6,236,255,150,237,251,47,
+32,0,29,80,64,6,223,16,39,143,53,0,230,137,194,5,
+32,86,51,1,149,37,39,135,58,0,16,6,236,255,198,5,
+32,86,48,1,149,29,39,127,56,0,224,121,194,5,32,86,
+49,1,165,21,0,18,7,80,42,119,1,0,224,113,194,5,
+32,86,50,1,149,13,68,82,65,18,109,18,230,245,1,106,
+103,111,56,0,0,82,127,0,154,7,225,48,6,232,8,208,
+35,231,73,0,9,216,99,231,1,0,128,255,8,1,10,16,
+224,17,234,61,32,55,37,183,35,134,32,0,99,135,1,0,
+35,126,36,0,99,127,5,0,35,118,40,0,99,119,9,0,
+35,110,44,0,99,111,13,0,35,102,48,0,99,103,17,0,
+35,62,20,0,35,70,24,0,35,78,28,0,128,255,136,1,
+224,81,146,13,38,6,248,17,133,0,32,62,58,1,0,66,
+190,255,54,170,29,48,26,64,27,72,99,231,1,0,128,255,
+164,0,10,16,224,17,202,13,35,95,33,0,106,90,210,5,
+1,50,191,255,246,188,245,237,128,255,178,80,197,237,2,80,
+90,6,255,48,128,7,97,0,6,248,229,87,64,0,224,7,
+96,1,10,232,63,87,9,0,224,81,63,23,13,0,202,21,
+31,143,18,0,47,6,16,219,255,255,241,134,60,0,31,103,
+19,0,207,129,194,98,208,97,108,23,1,0,224,17,162,13,
+98,7,9,0,245,5,106,23,13,0,224,17,178,5,98,87,
+9,0,253,47,32,0,31,48,128,255,108,86,64,6,127,0,
+130,7,33,0,3,130,99,135,1,0,128,255,24,0,10,48,
+224,49,186,5,1,82,197,5,191,255,140,255,0,82,66,6,
+63,0,130,7,225,240,6,200,8,224,9,232,35,215,33,0,
+59,6,16,216,255,255,27,48,3,56,31,66,128,255,70,85,
+224,81,170,253,35,255,1,0,28,128,127,7,13,0,13,114,
+238,135,194,194,229,87,64,0,224,7,96,1,10,216,24,104,
+194,106,13,96,217,97,44,23,1,0,99,210,226,103,0,0,
+181,29,34,95,5,0,34,87,1,0,253,89,138,21,252,81,
+234,13,34,95,16,0,235,209,186,5,224,97,130,13,251,47,
+32,0,31,48,128,255,208,85,0,82,165,37,34,87,13,0,
+224,81,194,5,10,16,224,17,218,229,224,17,234,5,217,105,
+109,255,1,0,0,16,181,5,98,255,13,0,127,23,9,0,
+127,231,1,0,127,215,16,0,127,239,5,0,57,135,58,0,
+95,135,18,0,95,199,19,0,251,47,32,0,31,80,66,6,
+255,240,230,86,33,6,226,20,130,0,97,0,140,7,225,48,
+6,224,59,6,144,19,133,0,0,234,181,61,29,72,193,74,
+47,6,4,41,148,0,207,73,2,114,253,102,48,0,43,6,
+112,140,133,0,203,97,44,87,17,0,44,71,9,0,44,63,
+5,0,44,55,1,0,73,119,1,0,73,7,0,0,99,87,
+1,0,44,143,21,0,99,143,5,0,44,135,25,0,99,135,
+9,0,44,127,29,0,99,127,13,0,44,119,33,0,99,119,
+17,0,44,111,37,0,99,111,21,0,128,255,112,17,224,81,
+242,5,27,48,32,62,165,1,0,66,190,255,60,168,65,234,
+105,234,209,197,0,234,229,21,29,88,195,90,49,6,176,21,
+133,0,209,89,43,55,1,0,43,63,5,0,128,255,246,16,
+224,81,242,5,27,48,32,62,177,1,0,66,190,255,10,168,
+65,234,98,234,161,237,0,234,229,37,253,118,28,0,45,6,
+192,21,133,0,205,113,46,103,17,0,46,79,13,0,46,71,
+9,0,46,63,5,0,46,55,1,0,99,103,1,0,46,95,
+21,0,99,95,5,0,46,87,25,0,99,87,9,0,128,255,
+44,17,224,81,242,5,27,48,32,62,194,1,0,66,190,255,
+184,167,65,234,99,234,161,221,0,210,133,37,26,232,196,234,
+46,6,20,22,133,0,206,233,61,111,13,0,61,71,9,0,
+61,63,5,0,61,55,1,0,99,111,1,0,28,72,128,255,
+164,16,61,103,13,0,204,225,224,81,242,5,27,48,32,62,
+227,1,0,66,190,255,114,167,65,210,103,210,129,229,0,210,
+133,37,26,232,196,234,48,6,132,22,133,0,208,233,61,127,
+13,0,61,71,9,0,61,63,5,0,61,55,1,0,99,127,
+1,0,28,72,190,255,146,183,61,119,13,0,206,225,224,81,
+242,5,27,48,32,62,4,2,0,66,190,255,44,167,65,210,
+97,210,129,229,38,6,224,40,148,0,39,6,160,19,133,0,
+0,66,191,255,102,17,100,7,129,140,76,6,255,48,132,7,
+97,0,36,143,181,172,65,138,100,143,181,172,191,255,130,235,
+36,239,181,172,128,255,112,38,224,81,242,5,32,54,72,180,
+4,58,0,66,128,255,96,80,29,120,5,114,238,127,194,130,
+224,129,186,37,229,87,64,0,224,7,96,1,36,23,177,172,
+10,248,70,18,43,6,128,58,9,0,235,23,194,106,100,111,
+177,172,255,47,32,0,6,50,128,255,228,34,97,82,218,13,
+2,18,99,23,5,0,99,7,1,0,3,56,38,6,140,148,
+145,0,0,66,190,255,166,195,32,134,255,0,240,239,194,82,
+224,81,138,29,196,239,156,140,178,21,196,231,156,140,130,21,
+36,127,185,172,224,121,130,13,32,54,236,176,128,62,16,128,
+0,66,128,255,226,79,32,54,0,1,191,255,54,186,128,255,
+92,15,68,6,127,0,128,7,225,0,36,143,129,140,128,134,
+216,214,74,138,100,143,129,140,240,137,195,5,8,122,68,127,
+125,140,36,103,129,140,32,94,232,3,235,103,194,114,224,113,
+218,5,37,54,136,131,190,255,150,174,4,23,125,140,60,6,
+112,140,133,0,99,18,233,5,97,18,193,29,194,53,128,7,
+136,1,102,18,169,13,100,18,185,5,128,7,182,1,186,5,
+128,7,220,1,128,7,246,1,103,18,185,5,128,7,196,2,
+186,5,128,7,214,2,104,18,186,5,128,7,212,2,128,7,
+228,2,36,63,45,175,38,6,24,20,133,0,190,255,64,174,
+38,6,172,19,133,0,190,255,54,174,100,7,117,140,100,7,
+121,140,1,82,68,87,125,140,32,142,32,78,100,143,133,140,
+128,7,178,2,36,135,117,140,105,130,150,13,38,6,236,19,
+133,0,32,62,241,2,0,66,190,255,142,165,36,55,117,140,
+128,255,150,2,224,81,194,5,1,114,100,119,121,140,36,23,
+117,140,43,6,4,41,148,0,2,232,193,234,203,233,29,87,
+1,0,97,82,209,5,178,61,98,82,226,45,213,93,226,22,
+48,0,220,17,34,63,5,0,194,199,44,0,170,29,38,6,
+204,19,133,0,190,255,184,173,36,127,116,140,1,98,239,118,
+48,0,93,103,0,0,14,104,220,105,45,231,41,0,1,90,
+93,95,1,0,29,48,63,6,162,117,1,0,124,0,149,69,
+38,6,40,20,133,0,190,255,134,173,36,87,117,140,65,82,
+100,87,117,140,229,53,38,6,68,20,133,0,190,255,112,173,
+36,143,117,140,65,138,100,143,117,140,181,45,36,127,129,140,
+36,135,133,140,240,121,211,37,245,21,2,48,1,58,128,255,
+168,2,36,111,117,140,13,22,1,0,100,23,117,140,105,18,
+190,13,226,94,48,0,220,89,43,63,5,0,38,6,252,19,
+133,0,190,255,42,173,36,23,117,140,105,18,246,229,1,138,
+100,143,121,140,229,5,36,135,117,140,65,130,100,135,117,140,
+36,127,117,140,105,122,178,5,128,7,154,1,2,114,68,119,
+125,140,128,7,144,1,36,111,129,140,36,103,121,140,13,110,
+48,117,100,111,133,140,224,97,242,5,191,255,240,248,128,255,
+124,13,64,7,52,177,0,234,29,48,1,58,128,255,12,3,
+65,234,105,234,166,253,3,82,68,87,125,140,128,7,86,1,
+191,255,162,232,224,81,234,5,4,138,68,143,125,140,128,7,
+68,1,36,127,129,140,36,135,133,140,240,121,187,5,128,7,
+52,1,8,114,68,119,125,140,128,7,42,1,0,234,29,48,
+2,58,128,255,198,2,65,234,105,234,166,253,5,98,68,103,
+125,140,100,7,117,140,128,7,12,1,36,95,117,140,105,90,
+150,13,38,6,236,19,133,0,32,62,159,3,0,66,190,255,
+232,163,36,23,117,140,48,6,4,41,148,0,2,232,226,22,
+48,0,193,234,220,17,34,111,45,0,208,233,205,110,3,0,
+242,61,29,87,1,0,97,82,209,5,162,45,98,82,210,29,
+149,53,34,63,5,0,38,6,204,19,133,0,190,255,32,172,
+36,103,116,140,1,138,236,94,48,0,93,143,0,0,11,80,
+220,81,42,231,41,0,1,130,93,135,1,0,29,48,63,6,
+58,119,1,0,124,0,149,37,38,6,68,20,133,0,190,255,
+238,171,36,127,117,140,65,122,100,127,117,140,229,21,36,111,
+129,140,36,119,133,140,238,105,131,21,8,98,68,103,125,140,
+197,13,36,95,117,140,65,90,100,95,117,140,229,5,36,87,
+117,140,65,82,100,87,117,140,36,143,117,140,105,138,170,37,
+4,135,125,140,104,130,226,29,7,122,68,127,125,140,165,29,
+191,255,130,231,224,81,218,5,7,114,68,119,125,140,165,21,
+8,106,68,111,125,140,229,13,190,255,218,236,181,13,38,6,
+220,19,133,0,190,255,120,171,0,50,128,255,192,11,190,255,
+196,236,64,6,255,0,128,7,225,0,0,226,230,134,48,0,
+46,6,112,140,133,0,206,129,48,239,1,0,61,103,109,0,
+45,6,224,40,148,0,237,97,218,69,61,63,41,0,38,6,
+80,20,133,0,190,255,56,171,29,48,128,255,232,11,224,81,
+146,13,38,6,108,20,133,0,32,62,60,4,0,66,190,255,
+168,162,29,48,128,255,214,11,224,81,146,13,38,6,108,20,
+133,0,32,62,63,4,0,66,190,255,142,162,38,6,124,20,
+133,0,190,255,250,170,1,226,29,48,128,255,136,11,0,18,
+226,86,48,0,48,6,112,140,133,0,208,81,42,127,1,0,
+239,233,218,13,2,90,2,112,193,114,44,6,4,41,148,0,
+204,113,78,95,0,0,3,82,78,87,1,0,65,18,105,18,
+134,237,61,239,141,0,49,6,16,146,133,0,241,233,250,173,
+28,80,64,6,255,0,128,7,225,112,6,232,7,208,59,6,
+136,20,133,0,104,234,186,45,253,134,48,0,46,6,112,140,
+133,0,206,129,48,231,1,0,60,231,141,0,57,6,16,146,
+133,0,249,225,162,29,28,48,128,255,10,11,28,48,128,255,
+36,11,224,81,242,5,27,48,32,62,135,4,0,66,190,255,
+232,161,28,48,128,255,22,11,224,81,242,5,27,48,32,62,
+138,4,0,66,190,255,210,161,249,225,250,221,253,230,48,0,
+43,6,112,140,133,0,203,225,60,143,45,0,81,209,234,45,
+38,6,152,20,133,0,190,255,38,170,60,55,1,0,128,255,
+180,10,60,55,1,0,128,255,204,10,224,81,242,5,27,48,
+32,62,156,4,0,66,190,255,144,161,60,55,1,0,128,255,
+188,10,224,81,242,5,27,48,32,62,159,4,0,66,190,255,
+120,161,2,106,193,234,46,6,4,41,148,0,206,233,93,111,
+0,0,3,98,93,103,1,0,229,5,38,6,164,20,133,0,
+190,255,204,169,64,6,255,112,140,7,225,16,230,238,48,0,
+47,6,112,140,133,0,207,233,61,111,45,0,77,57,210,69,
+6,224,193,226,42,6,4,41,148,0,202,225,28,216,27,143,
+1,0,224,137,162,61,61,63,5,0,38,6,192,20,133,0,
+190,255,140,169,61,135,17,0,61,71,9,0,61,63,5,0,
+61,55,1,0,91,7,1,0,91,7,0,0,99,135,1,0,
+61,127,21,0,99,127,5,0,61,119,25,0,99,119,9,0,
+61,111,29,0,99,111,13,0,61,103,33,0,1,90,99,95,
+21,0,99,103,17,0,28,72,128,255,242,9,224,81,146,13,
+38,6,176,20,133,0,32,62,231,4,0,66,190,255,186,160,
+37,54,140,131,190,255,40,169,76,6,255,16,132,7,97,0,
+6,232,93,7,1,0,213,21,35,78,4,0,31,138,99,143,
+1,0,32,54,236,176,32,62,8,2,1,66,128,255,4,73,
+35,127,5,0,138,122,217,5,4,55,60,140,128,255,214,9,
+29,111,0,0,224,105,146,237,2,98,93,103,1,0,68,6,
+127,0,128,7,33,0,128,255,10,9,64,6,63,0,128,7,
+33,0,68,7,125,140,100,7,129,140,38,6,244,35,148,0,
+128,255,154,9,224,81,162,13,38,6,212,20,133,0,32,62,
+63,5,0,66,190,255,50,160,224,81,64,6,63,0,130,7,
+97,0,6,232,93,7,1,0,213,13,3,56,32,54,104,180,
+31,66,128,255,8,9,35,55,1,0,224,49,178,5,190,255,
+162,188,29,143,0,0,224,137,146,245,2,130,93,135,1,0,
+66,6,127,0,130,7,97,0,99,7,1,0,3,56,6,232,
+32,54,104,180,0,66,190,255,244,188,29,87,1,0,66,6,
+127,0,132,7,97,0,6,232,93,7,1,0,149,29,35,78,
+4,0,31,138,99,143,1,0,32,54,236,176,32,62,8,4,
+1,66,128,255,46,72,35,127,5,0,139,122,153,13,32,54,
+60,0,128,255,104,8,128,255,140,8,224,81,218,253,29,119,
+0,0,224,113,210,229,2,106,93,111,1,0,68,6,127,0,
+128,7,33,0,128,255,44,8,64,6,63,0,132,7,97,0,
+6,232,93,7,1,0,213,21,35,78,4,0,31,138,99,143,
+1,0,32,54,236,176,32,62,8,8,1,66,128,255,212,71,
+35,127,5,0,140,122,217,5,128,255,74,8,224,81,218,253,
+29,119,0,0,224,113,146,237,2,106,93,111,1,0,68,6,
+127,0,128,7,33,0,128,255,218,7,64,6,63,0,136,7,
+225,0,6,232,93,7,1,0,31,50,190,255,164,232,32,143,
+13,177,224,137,138,53,64,86,0,0,43,6,96,0,0,0,
+74,95,8,240,133,45,35,78,4,0,99,7,1,0,32,54,
+72,180,14,58,1,66,128,255,106,71,224,81,218,13,35,127,
+5,0,130,122,185,5,190,255,146,231,35,111,5,0,131,106,
+185,5,128,255,108,26,4,103,92,139,224,97,202,13,51,6,
+1,0,32,0,211,247,0,0,194,5,190,255,50,209,181,5,
+128,255,90,69,29,95,0,0,224,89,226,213,190,255,76,232,
+128,255,10,26,128,54,255,255,128,255,212,26,2,226,99,231,
+13,0,99,7,9,0,35,62,8,0,38,6,140,148,145,0,
+0,66,190,255,152,187,93,231,1,0,72,6,255,0,128,7,
+97,0,6,232,32,54,72,180,8,58,0,66,128,255,232,71,
+29,87,1,0,64,6,127,0,154,7,225,16,99,7,20,0,
+99,7,26,0,32,134,17,0,99,135,29,0,35,126,32,0,
+99,127,9,0,99,7,17,0,99,7,13,0,6,216,91,7,
+1,0,149,77,3,56,38,6,216,215,255,255,31,66,128,255,
+28,7,35,55,1,0,224,49,226,61,191,255,112,196,99,87,
+5,0,35,239,1,0,0,226,157,79,5,0,99,79,22,0,
+29,48,0,58,35,70,32,0,190,255,52,172,97,82,146,13,
+38,6,228,20,133,0,32,62,14,7,0,66,190,255,234,157,
+12,50,12,58,35,70,4,0,190,255,64,142,61,239,13,0,
+65,226,224,233,170,229,35,239,5,0,229,87,64,0,224,7,
+96,1,61,255,0,0,220,249,125,255,0,0,10,224,252,47,
+32,0,224,249,138,13,29,48,61,111,5,0,63,6,24,125,
+1,0,109,0,27,103,0,0,224,97,210,181,2,90,91,95,
+1,0,90,6,255,16,130,7,97,0,99,7,1,0,3,56,
+6,232,38,6,216,215,255,255,0,66,190,255,144,186,29,87,
+1,0,66,6,127,0,136,7,225,0,6,224,4,239,92,139,
+128,255,58,6,10,16,224,17,178,29,2,6,192,253,138,13,
+32,54,56,0,37,62,144,131,191,255,146,58,149,21,2,6,
+237,207,138,13,32,54,36,0,37,62,144,131,191,255,126,58,
+245,5,32,54,55,0,37,62,144,131,191,255,112,58,128,255,
+244,5,196,223,156,140,234,13,97,234,170,13,38,6,24,21,
+133,0,190,255,138,165,32,54,200,0,191,255,238,175,128,255,
+76,6,0,50,191,255,204,175,36,111,113,134,224,105,130,13,
+32,102,0,16,50,6,20,0,32,0,114,103,0,0,36,158,
+157,140,211,199,0,0,250,5,32,54,63,0,37,62,144,131,
+191,255,26,58,99,234,154,13,36,71,153,140,1,50,39,6,
+244,20,133,0,191,255,6,58,0,234,165,29,253,22,48,0,
+48,6,112,140,133,0,208,17,34,127,37,0,224,121,250,13,
+34,55,1,0,128,255,14,6,224,81,146,13,38,6,8,21,
+133,0,32,62,187,7,0,66,190,255,142,156,65,234,105,234,
+225,229,92,7,1,0,165,117,35,78,4,0,31,106,99,111,
+1,0,32,54,236,176,39,6,56,128,3,0,1,66,128,255,
+226,68,35,95,5,0,134,90,233,45,35,62,8,0,38,6,
+28,148,145,0,0,66,128,255,68,5,10,232,224,233,154,37,
+3,23,12,0,97,18,202,21,35,87,9,0,224,81,146,29,
+42,23,241,11,3,58,72,18,34,95,0,0,63,6,160,126,
+1,0,202,89,34,87,5,0,11,48,106,0,165,13,38,6,
+8,21,133,0,32,62,244,7,0,66,190,255,12,156,224,81,
+224,233,194,213,35,135,5,0,133,130,201,5,0,50,191,255,
+202,174,35,119,5,0,144,114,185,5,128,255,40,5,35,103,
+5,0,145,98,217,29,35,62,8,0,38,6,84,148,145,0,
+0,66,128,255,200,4,224,81,186,21,35,55,9,0,128,255,
+20,5,35,55,13,0,224,49,194,5,31,58,191,255,176,193,
+32,54,236,176,64,62,1,0,0,66,128,255,42,69,35,143,
+5,0,146,138,185,5,128,255,110,22,28,127,0,0,224,121,
+194,141,2,114,92,119,1,0,72,6,255,0,128,7,33,0,
+128,255,48,4,64,6,63,0,140,7,225,240,6,208,90,7,
+1,0,128,7,128,1,35,78,4,0,31,138,99,143,1,0,
+32,54,236,176,32,62,72,0,1,66,128,255,214,67,35,23,
+5,0,194,134,64,0,186,5,128,7,90,1,132,18,185,5,
+128,7,82,1,99,7,9,0,0,234,35,78,8,0,32,118,
+100,0,99,119,1,0,32,54,236,176,32,62,72,0,0,66,
+128,255,160,67,224,81,210,5,65,234,29,6,196,255,230,237,
+35,103,9,0,204,110,72,0,178,5,128,7,24,1,0,234,
+38,6,132,215,255,255,31,58,128,255,116,72,224,81,154,253,
+0,18,29,6,240,255,129,13,253,142,40,0,32,126,160,180,
+207,137,49,23,17,0,99,7,13,0,0,194,2,216,224,217,
+226,45,59,23,105,0,35,62,12,0,2,22,64,1,34,87,
+0,0,34,119,5,0,219,81,10,48,63,6,6,128,1,0,
+110,0,10,192,31,202,0,226,59,23,105,0,28,64,2,22,
+136,0,34,87,0,0,35,54,16,0,219,81,10,56,34,111,
+5,0,63,6,46,128,1,0,109,0,195,207,16,0,178,5,
+28,200,213,5,65,226,28,6,240,255,246,229,38,6,132,215,
+255,255,128,255,28,73,224,81,146,13,38,6,64,21,133,0,
+32,62,6,1,0,66,190,255,96,154,224,193,186,45,35,103,
+13,0,97,98,250,37,29,48,35,62,20,0,128,255,2,29,
+224,81,154,29,29,48,25,56,128,255,140,46,10,224,28,6,
+218,254,226,13,28,6,220,254,178,13,28,6,221,254,130,13,
+32,54,236,176,32,62,64,0,0,66,128,255,154,67,224,225,
+242,13,133,13,32,54,236,176,32,62,64,0,0,66,128,255,
+134,67,65,234,29,6,240,255,190,5,191,7,246,254,128,255,
+42,0,26,127,0,0,224,121,186,5,191,7,124,254,191,255,
+210,172,2,114,90,119,1,0,76,6,255,240,128,7,33,0,
+128,255,128,2,64,6,63,0,132,7,225,243,38,6,132,215,
+255,255,31,58,128,255,56,71,224,81,154,253,0,234,0,18,
 29,6,240,255,129,13,253,118,40,0,32,102,160,180,204,113,
-46,23,17,0,2,216,224,217,178,77,253,206,40,0,32,86,
-160,180,25,208,202,209,163,143,3,0,224,137,130,21,67,7,
-3,0,24,48,128,255,144,48,224,81,146,13,38,6,24,11,
-133,0,32,62,6,1,0,66,190,255,34,132,26,48,191,255,
-102,235,10,224,224,225,202,45,163,127,3,0,224,121,170,13,
-1,114,67,119,3,0,24,48,31,58,128,255,40,47,224,81,
-186,253,0,18,29,6,240,255,225,5,32,94,160,180,203,201,
-57,23,17,0,226,217,170,21,59,23,105,0,63,6,242,150,
-1,0,2,22,120,0,34,55,0,0,34,87,5,0,219,49,
-106,0,30,138,122,143,32,0,181,5,32,230,10,1,28,232,
-163,135,3,0,224,129,130,21,67,7,3,0,24,48,128,255,
-6,48,224,81,146,13,38,6,24,11,133,0,32,62,6,1,
-0,66,190,255,152,131,29,80,66,6,255,240,132,7,225,0,
-6,224,1,234,67,239,3,0,38,6,132,215,255,255,31,58,
-128,255,162,46,224,81,154,253,0,18,28,6,240,255,129,13,
-252,118,40,0,32,102,160,180,204,113,46,23,17,0,2,80,
-224,81,226,21,42,23,105,0,35,62,4,0,2,22,128,0,
-34,55,0,0,34,95,5,0,202,49,63,6,130,151,1,0,
-107,0,10,232,35,87,5,0,224,81,170,5,1,234,163,143,
+46,23,17,0,2,80,224,81,210,101,138,95,7,0,109,90,
+154,101,42,23,105,0,2,22,24,0,34,95,0,0,63,6,
+66,129,1,0,202,89,34,87,5,0,11,48,106,0,10,176,
+11,184,0,226,0,18,28,6,240,255,129,13,252,118,40,0,
+32,102,160,180,204,113,46,23,17,0,2,208,224,209,226,61,
+22,192,23,200,28,48,128,255,52,2,224,81,202,21,0,202,
+0,218,27,48,191,255,12,173,253,81,186,5,27,200,213,5,
+65,218,27,6,240,255,230,245,25,48,191,255,38,172,10,198,
+0,248,0,202,58,23,105,0,3,56,2,22,224,0,34,87,
+0,0,34,95,5,0,218,81,10,48,63,6,182,129,1,0,
+107,0,224,81,186,21,35,95,5,0,35,87,1,0,235,201,
+219,13,177,5,234,193,169,13,29,64,28,72,32,54,50,0,
+39,6,76,21,133,0,191,255,36,54,65,226,28,6,240,255,
+166,181,65,234,29,6,240,255,182,141,38,6,132,215,255,255,
+128,255,110,71,224,81,162,13,38,6,104,21,133,0,32,62,
+6,1,0,66,190,255,178,152,224,81,68,6,255,243,136,7,
+225,48,6,208,90,7,1,0,128,7,12,1,99,7,9,0,
+35,62,8,0,38,6,140,148,145,0,31,66,128,255,126,1,
+35,23,13,0,97,18,242,117,196,239,156,140,210,109,0,234,
+29,48,128,255,96,21,224,81,178,101,29,48,3,56,128,255,
+200,29,10,224,28,6,251,253,162,37,35,135,1,0,224,129,
+226,29,32,54,100,0,191,255,50,171,29,48,35,62,4,0,
+128,255,254,26,10,224,28,6,254,239,242,5,35,87,5,0,
+35,23,1,0,234,17,242,5,29,48,128,255,218,20,32,230,
+2,16,213,5,234,17,186,5,32,230,5,2,28,6,251,253,
+234,37,35,63,1,0,29,48,128,255,88,9,224,81,218,5,
+29,48,128,255,178,20,181,29,0,226,0,218,1,106,35,95,
+1,0,251,111,192,0,77,89,194,13,27,48,1,58,128,255,
+44,15,10,224,27,56,38,6,132,21,133,0,190,255,80,160,
+224,225,218,5,65,218,27,6,240,255,150,237,224,225,138,21,
+29,48,128,255,86,21,224,81,186,13,29,56,38,6,116,21,
+133,0,190,255,42,160,29,48,31,58,191,255,30,2,65,234,
+29,6,240,255,230,149,35,55,9,0,224,49,194,5,31,58,
+191,255,140,189,26,127,0,0,224,121,186,5,191,7,240,254,
+2,114,90,119,1,0,72,6,255,48,132,7,97,0,1,18,
+99,23,5,0,99,7,1,0,3,56,6,232,38,6,140,148,
+145,0,0,66,190,255,118,180,29,87,1,0,68,6,127,0,
+128,7,97,0,6,232,32,54,236,176,8,58,0,66,128,255,
+198,64,29,87,1,0,64,6,127,0,33,6,50,186,129,0,
+97,0,33,6,120,9,128,0,97,0,33,6,116,12,128,0,
+97,0,33,6,114,13,130,0,97,0,33,6,194,125,128,0,
+97,0,33,6,228,222,128,0,97,0,33,6,144,9,130,0,
+97,0,33,6,50,223,128,0,97,0,33,6,84,254,128,0,
+97,0,33,6,172,46,129,0,97,0,33,6,118,47,129,0,
+97,0,33,6,24,5,130,0,97,0,33,6,132,250,129,0,
+97,0,33,6,124,0,130,0,97,0,33,6,116,254,129,0,
+97,0,33,6,16,151,129,0,97,0,33,6,104,167,129,0,
+97,0,33,6,220,168,129,0,97,0,33,6,240,1,130,0,
+97,0,33,6,90,189,129,0,97,0,33,6,104,1,130,0,
+97,0,33,6,24,250,129,0,97,0,144,7,225,112,0,234,
+6,200,0,58,128,255,58,1,59,6,132,215,255,255,58,6,
+148,22,133,0,0,226,128,7,22,1,1,130,67,135,3,0,
+27,48,31,58,128,255,216,67,224,81,186,253,57,127,17,0,
+224,121,218,21,32,238,10,1,163,119,3,0,224,113,210,125,
+67,7,3,0,27,48,128,255,232,68,224,81,226,117,26,48,
+32,62,6,1,0,66,190,255,48,150,245,109,99,7,13,0,
+99,7,17,0,99,7,22,0,191,255,6,189,106,7,9,0,
+45,6,248,65,1,0,106,111,5,0,32,102,232,3,106,7,
+29,0,8,18,106,7,33,0,224,225,99,87,5,0,106,103,
+21,0,170,5,0,18,99,23,26,0,57,95,17,0,43,23,
+105,0,35,62,4,0,2,22,144,0,34,87,0,0,63,6,
+242,132,1,0,203,81,34,95,5,0,10,48,107,0,10,232,
+163,87,3,0,224,81,226,13,67,7,3,0,27,48,128,255,
+96,68,224,81,242,5,26,48,32,62,6,1,0,66,190,255,
+168,149,35,55,5,0,29,56,191,255,148,187,35,23,5,0,
+2,80,42,135,0,0,224,129,218,253,34,239,12,0,98,7,
+0,0,2,48,128,255,210,75,163,127,3,0,224,121,226,13,
+67,7,3,0,27,48,128,255,24,68,224,81,242,5,26,48,
+32,62,6,1,0,66,190,255,96,149,65,226,98,226,222,5,
+224,233,186,5,191,7,230,254,29,80,80,6,255,112,128,7,
+33,0,38,55,13,0,167,0,190,255,74,174,64,6,63,0,
+142,7,225,16,6,216,61,6,132,215,255,255,29,48,31,58,
+128,255,156,66,224,81,186,253,59,143,17,0,32,230,10,1,
+224,137,146,77,191,255,250,187,106,7,9,0,48,6,248,65,
+1,0,106,135,5,0,32,126,232,3,106,7,29,0,3,56,
+106,7,33,0,63,6,244,133,1,0,59,95,17,0,106,127,
+21,0,43,23,105,0,202,47,2,0,99,87,1,0,2,22,
+168,0,34,87,0,0,34,119,5,0,203,81,10,48,110,0,
+10,224,29,48,128,255,106,67,224,81,146,13,38,6,160,22,
+133,0,32,62,6,1,0,66,190,255,174,148,35,55,1,0,
+28,56,191,255,154,186,35,23,1,0,2,80,42,111,0,0,
+224,105,218,253,34,231,12,0,98,7,0,0,2,48,128,255,
+216,74,229,13,29,48,128,255,40,67,224,81,146,13,38,6,
+160,22,133,0,32,62,6,1,0,66,190,255,108,148,28,80,
+78,6,255,16,132,7,225,48,6,224,61,6,132,215,255,255,
+1,138,67,143,1,0,29,48,31,58,128,255,194,65,224,81,
+186,253,60,87,17,0,59,6,148,22,133,0,224,81,218,21,
+163,135,1,0,224,129,226,13,67,7,1,0,29,48,128,255,
+208,66,224,81,242,5,27,48,32,62,6,1,0,66,190,255,
+24,148,32,86,10,1,229,85,42,23,105,0,63,6,200,134,
+1,0,2,22,80,0,34,95,0,0,34,127,5,0,202,89,
+11,48,111,0,10,208,163,119,1,0,224,113,226,13,67,7,
+1,0,29,48,128,255,138,66,224,81,242,5,27,48,32,62,
+6,1,0,66,190,255,210,147,224,209,210,29,28,56,35,54,
+2,0,128,255,72,1,227,55,3,0,35,62,4,0,32,70,
+241,0,128,255,108,19,28,56,35,54,2,0,128,255,10,2,
+227,55,3,0,35,62,4,0,32,70,246,0,128,255,82,19,
+10,16,213,5,28,48,128,255,48,0,10,16,2,224,163,95,
+1,0,224,89,226,13,67,7,1,0,29,48,128,255,34,66,
+224,81,242,5,27,48,32,62,6,1,0,66,190,255,106,147,
+28,80,68,6,255,48,132,7,225,0,32,238,10,1,6,224,
+28,56,35,54,2,0,128,255,36,0,60,143,17,0,224,137,
+162,13,227,55,3,0,35,62,4,0,32,70,246,0,128,255,
+240,18,10,232,29,80,68,6,255,0,134,7,225,16,6,224,
+7,216,1,138,67,143,3,0,38,6,132,215,255,255,31,58,
+128,255,140,64,224,81,154,253,59,135,17,0,99,7,6,0,
+224,129,194,37,0,234,59,95,17,0,29,64,43,23,105,0,
+35,54,8,0,2,22,136,0,34,87,0,0,34,127,5,0,
+203,81,10,56,63,6,224,135,1,0,111,0,195,199,8,0,
+146,13,1,114,253,119,192,0,227,103,7,0,14,97,99,103,
+6,0,65,234,29,6,240,255,246,221,227,95,7,0,99,95,
+4,0,163,87,3,0,224,81,162,21,67,7,3,0,38,6,
+132,215,255,255,128,255,74,65,224,81,146,13,38,6,148,22,
+133,0,32,62,6,1,0,66,190,255,142,146,227,143,5,0,
+124,143,0,0,28,80,70,6,255,16,136,7,225,16,6,216,
+7,224,1,138,67,143,3,0,38,6,132,215,255,255,31,58,
+128,255,220,63,224,81,154,253,60,135,17,0,99,7,6,0,
+224,129,162,61,0,234,60,95,17,0,29,64,43,23,105,0,
+35,54,8,0,2,22,136,0,34,87,0,0,34,127,5,0,
+203,81,10,56,63,6,144,136,1,0,111,0,195,199,8,0,
+242,29,60,95,17,0,29,64,43,23,105,0,35,54,12,0,
+2,22,136,0,34,87,0,0,34,119,5,0,203,81,10,56,
+63,6,188,136,1,0,110,0,195,207,12,0,154,13,1,106,
+253,111,192,0,227,95,7,0,13,89,99,95,6,0,65,234,
+29,6,240,255,150,205,227,87,7,0,99,87,4,0,163,143,
 3,0,224,137,162,21,67,7,3,0,38,6,132,215,255,255,
-128,255,116,47,224,81,146,13,38,6,24,11,133,0,32,62,
-6,1,0,66,190,255,6,131,29,80,68,6,255,0,128,7,
+128,255,110,64,224,81,146,13,38,6,148,22,133,0,32,62,
+6,1,0,66,190,255,178,145,227,135,5,0,123,135,0,0,
+27,80,72,6,255,16,136,7,225,16,6,216,7,224,1,138,
+67,143,3,0,38,6,132,215,255,255,31,58,128,255,0,63,
+224,81,154,253,60,135,17,0,99,7,6,0,224,129,162,61,
+0,234,60,95,17,0,29,64,43,23,105,0,35,54,8,0,
+2,22,136,0,34,87,0,0,34,127,5,0,203,81,10,56,
+63,6,108,137,1,0,111,0,195,199,8,0,242,29,60,95,
+17,0,29,64,43,23,105,0,35,54,12,0,2,22,136,0,
+34,87,0,0,34,119,5,0,203,81,10,56,63,6,152,137,
+1,0,110,0,195,207,12,0,146,13,1,106,253,111,192,0,
+227,95,7,0,13,89,99,95,6,0,65,234,29,6,240,255,
+150,205,227,87,7,0,99,87,4,0,163,143,3,0,224,137,
+162,21,67,7,3,0,38,6,132,215,255,255,128,255,146,63,
+224,81,146,13,38,6,148,22,133,0,32,62,6,1,0,66,
+190,255,214,144,227,135,5,0,123,135,0,0,27,80,72,6,
+255,16,134,7,225,16,6,216,59,143,17,0,224,137,186,5,
+31,82,197,69,0,226,1,130,67,135,3,0,38,6,132,215,
+255,255,31,58,128,255,24,62,224,81,154,253,0,234,59,95,
+17,0,29,64,43,23,105,0,35,54,8,0,2,22,136,0,
+34,87,0,0,34,127,5,0,203,81,10,56,63,6,72,138,
+1,0,111,0,35,119,9,0,99,119,5,0,195,199,4,0,
+162,5,65,226,65,234,29,6,240,255,166,229,28,232,163,111,
+3,0,224,105,162,21,67,7,3,0,38,6,132,215,255,255,
+128,255,238,62,224,81,146,13,38,6,148,22,133,0,32,62,
+6,1,0,66,190,255,50,144,29,80,70,6,255,16,132,7,
+225,48,7,232,189,0,6,216,59,143,17,0,8,208,224,137,
+202,5,32,238,10,1,213,29,32,231,37,183,0,58,28,48,
+3,64,190,255,200,217,59,55,17,0,29,56,26,64,190,255,
+68,233,10,232,28,48,35,63,1,0,35,70,4,0,190,255,
+172,217,32,54,236,176,64,62,2,0,0,66,128,255,88,57,
+29,80,68,6,255,48,128,7,225,0,102,7,29,0,102,7,
+17,0,102,7,21,0,102,7,25,0,7,224,70,231,34,0,
+70,7,35,0,70,7,36,0,30,130,102,135,32,0,6,232,
+191,255,220,226,0,18,28,6,240,255,241,5,252,22,120,4,
+44,6,24,41,148,0,204,17,125,23,13,0,64,6,255,0,
+128,7,97,0,128,255,108,26,0,234,253,54,40,0,32,118,
+160,180,206,49,29,56,191,255,160,255,253,54,120,4,42,6,
+24,41,148,0,202,49,29,56,190,255,34,160,65,234,29,6,
+240,255,198,237,100,7,142,140,32,142,40,0,100,143,140,140,
+1,50,190,255,236,153,100,87,145,140,64,6,127,0,130,7,
+225,0,6,232,1,226,38,6,132,215,255,255,31,58,128,255,
+158,60,224,81,154,253,0,18,29,6,240,255,129,13,253,126,
+40,0,32,110,160,180,205,121,47,23,17,0,2,80,224,81,
+210,21,42,23,105,0,3,48,2,22,136,0,34,95,0,0,
+31,66,202,89,11,56,34,103,5,0,63,6,214,139,1,0,
+108,0,195,199,0,0,162,5,0,226,38,6,132,215,255,255,
+128,255,126,61,224,81,146,13,38,6,172,22,133,0,32,62,
+6,1,0,66,190,255,194,142,28,80,66,6,255,0,128,7,
+128,7,225,48,6,232,7,208,1,226,229,87,64,0,224,7,
+96,1,10,216,0,18,29,6,240,255,129,13,253,126,40,0,
+32,110,160,180,205,121,47,23,17,0,2,80,224,81,146,21,
+42,23,105,0,26,56,2,22,104,0,34,95,0,0,34,103,
+5,0,202,89,11,48,63,6,82,140,1,0,108,0,10,224,
+251,47,32,0,28,80,64,6,255,48,132,7,225,48,6,224,
+7,208,0,234,229,87,64,0,224,7,96,1,10,216,0,18,
+28,6,240,255,129,13,252,126,40,0,32,110,160,180,205,121,
+47,23,17,0,2,80,224,81,194,29,42,23,105,0,26,64,
+2,22,136,0,34,95,0,0,35,54,4,0,202,89,11,56,
+34,103,5,0,63,6,176,140,1,0,108,0,35,95,5,0,
+99,95,1,0,195,199,0,0,194,5,11,232,222,234,159,234,
+251,47,32,0,29,80,68,6,255,48,128,7,193,16,6,224,
+0,234,229,87,64,0,224,7,96,1,10,216,0,18,28,6,
+240,255,129,13,252,126,40,0,32,110,160,180,205,121,47,23,
+17,0,224,17,194,13,252,94,40,0,32,142,160,180,209,89,
+43,239,13,0,29,239,2,0,221,234,159,234,251,47,32,0,
+29,80,64,6,223,16,128,7,225,48,6,232,7,208,154,0,
+38,6,132,215,255,255,31,58,128,255,4,59,224,81,154,253,
+31,226,29,48,190,255,220,224,10,232,224,233,250,5,38,6,
+196,22,133,0,190,255,232,149,149,29,32,54,88,1,190,255,
+194,247,10,216,29,48,27,56,128,255,252,39,157,143,7,0,
+111,138,186,5,123,7,5,0,29,48,27,56,26,64,128,255,
+90,21,10,224,27,48,190,255,52,170,38,6,132,215,255,255,
+128,255,222,59,224,81,146,13,38,6,252,22,133,0,32,62,
+6,1,0,66,190,255,34,141,224,233,162,13,127,226,130,13,
+252,54,40,0,32,102,160,180,204,49,191,255,170,248,28,80,
+64,6,255,48,128,7,225,112,6,224,7,208,8,200,153,0,
+38,6,132,215,255,255,31,58,128,255,100,58,224,81,154,253,
+31,234,28,48,190,255,60,224,10,224,224,225,250,5,38,6,
+8,23,133,0,190,255,72,149,181,45,28,143,7,0,224,137,
+154,37,32,54,88,1,190,255,26,247,10,216,27,48,26,56,
+32,70,88,1,191,255,156,130,32,134,21,0,123,135,1,0,
+26,232,26,48,128,255,34,26,127,82,170,5,27,232,28,48,
+29,56,25,64,128,255,164,20,10,232,27,48,190,255,126,169,
+245,5,28,48,26,56,25,64,128,255,144,20,10,232,38,6,
+132,215,255,255,128,255,26,59,224,81,146,13,38,6,68,23,
+133,0,32,62,6,1,0,66,190,255,94,140,224,225,162,13,
+127,234,130,13,253,54,40,0,32,86,160,180,202,49,191,255,
+230,247,29,80,64,6,255,112,128,7,225,0,6,6,240,255,
+201,5,32,86,10,1,197,53,230,238,40,0,32,110,160,180,
+205,233,61,23,17,0,224,17,202,5,32,86,10,1,133,45,
+2,224,39,23,105,0,125,63,17,0,2,22,24,0,34,87,
+0,0,34,103,5,0,199,81,10,48,63,6,198,142,1,0,
+108,0,125,87,21,0,125,95,25,0,224,225,130,21,60,23,
+105,0,3,58,2,22,80,1,34,87,0,0,34,95,5,0,
+220,81,10,48,63,6,240,142,1,0,107,0,0,82,64,6,
+255,0,130,7,225,112,6,224,58,6,132,215,255,255,1,130,
+67,135,3,0,26,48,31,58,128,255,36,57,224,81,186,253,
+0,18,28,6,240,255,129,13,252,110,40,0,32,94,160,180,
+203,105,45,23,17,0,2,216,224,217,186,29,28,56,38,6,
+92,23,133,0,190,255,248,147,163,87,3,0,224,81,210,101,
+67,7,3,0,26,48,128,255,24,58,224,81,226,93,38,6,
+148,22,133,0,32,62,6,1,0,66,190,255,92,139,213,85,
+28,128,240,126,40,0,32,118,160,180,15,232,206,233,61,95,
+17,0,43,23,105,0,63,6,146,143,1,0,2,22,80,0,
+34,87,0,0,34,111,5,0,203,81,10,48,109,0,224,81,
+194,5,37,22,160,131,181,5,37,22,156,131,2,200,61,79,
+25,0,61,71,21,0,28,56,38,6,124,23,133,0,190,255,
+126,147,25,56,38,6,80,23,133,0,190,255,114,147,59,23,
+105,0,63,6,222,143,1,0,2,22,192,0,34,87,0,0,
+34,103,5,0,219,81,10,48,108,0,61,55,13,0,190,255,
+48,155,163,95,3,0,224,89,130,21,67,7,3,0,26,48,
+128,255,110,57,224,81,146,13,38,6,148,22,133,0,32,62,
+6,1,0,66,190,255,178,138,66,6,255,112,130,7,97,0,
+1,138,67,143,3,0,38,6,132,215,255,255,31,58,128,255,
+14,56,224,81,154,253,37,54,163,131,190,255,2,147,0,234,
+253,126,40,0,32,110,160,180,205,121,47,23,17,0,224,17,
+130,13,29,48,191,255,174,254,37,54,163,131,190,255,224,146,
+65,234,29,6,240,255,214,237,163,103,3,0,224,97,162,21,
+67,7,3,0,38,6,132,215,255,255,128,255,244,56,224,81,
+146,13,38,6,148,22,133,0,32,62,6,1,0,66,190,255,
+56,138,66,6,127,0,128,7,225,0,7,224,128,255,44,0,
+10,232,127,234,154,13,38,6,152,23,133,0,32,62,203,4,
+0,66,190,255,20,138,29,48,128,255,104,22,29,48,28,56,
+128,255,208,21,64,6,255,0,128,7,225,48,6,216,31,226,
+229,87,64,0,224,7,96,1,10,208,224,217,226,37,0,234,
+253,134,40,0,32,118,160,180,206,129,48,87,17,0,234,217,
+186,5,29,224,165,29,224,81,194,21,42,23,105,0,27,56,
+2,22,48,1,34,95,0,0,34,111,5,0,202,89,11,48,
+63,6,12,145,1,0,109,0,97,82,186,5,29,224,213,5,
+65,234,29,6,240,255,214,221,250,47,32,0,28,80,64,6,
+255,48,130,7,225,16,6,232,1,138,67,143,3,0,38,6,
+132,215,255,255,31,58,128,255,246,54,224,81,154,253,0,18,
+29,6,240,255,129,13,253,118,40,0,32,102,160,180,204,113,
+46,23,17,0,2,224,224,225,146,61,253,222,40,0,32,142,
+160,180,209,217,27,48,191,255,240,245,253,54,120,4,45,6,
+24,41,148,0,205,49,29,56,190,255,2,154,27,48,29,56,
+191,255,102,249,36,103,142,140,95,98,100,103,142,140,224,225,
+130,21,60,23,105,0,3,58,2,22,80,1,34,87,0,0,
+34,95,5,0,220,81,10,48,63,6,180,145,1,0,107,0,
+29,48,128,255,94,21,29,48,0,58,128,255,122,35,29,56,
+38,6,168,23,133,0,190,255,102,145,163,87,3,0,224,81,
+162,21,67,7,3,0,38,6,132,215,255,255,128,255,130,55,
+224,81,146,13,38,6,148,22,133,0,32,62,6,1,0,66,
+190,255,198,136,0,82,66,6,255,16,134,7,225,112,7,200,
+185,0,32,230,10,1,6,216,191,255,120,156,10,232,127,234,
+186,5,128,7,10,1,58,6,132,215,255,255,1,138,67,143,
+3,0,26,48,31,58,128,255,6,54,224,81,186,253,0,18,
+29,6,240,255,129,13,253,118,40,0,32,102,160,180,204,113,
+46,23,17,0,2,80,224,81,210,45,42,23,105,0,27,64,
+2,22,136,0,34,63,0,0,35,54,8,0,202,57,34,95,
+5,0,63,6,110,146,1,0,107,0,35,87,9,0,253,54,
+40,0,99,87,5,0,32,118,160,180,206,49,27,64,32,62,
+239,255,191,255,12,248,10,224,195,207,4,0,186,13,224,225,
+154,13,29,64,27,72,2,50,39,6,240,23,133,0,191,255,
+92,37,163,103,3,0,224,97,130,21,67,7,3,0,26,48,
+128,255,174,54,224,81,146,13,38,6,148,22,133,0,32,62,
+6,1,0,66,190,255,242,135,27,56,28,64,38,6,192,23,
+133,0,190,255,90,144,224,225,250,13,32,54,236,176,32,62,
+64,0,0,66,128,255,80,49,224,201,234,5,29,48,31,58,
+190,255,56,242,10,224,163,135,3,0,224,129,130,21,67,7,
+3,0,26,48,128,255,90,54,224,81,146,13,38,6,148,22,
+133,0,32,62,6,1,0,66,190,255,158,135,28,80,70,6,
+255,112,128,7,225,0,6,224,191,255,88,155,10,232,127,234,
+202,5,32,86,10,1,213,45,38,6,132,215,255,255,31,58,
+128,255,236,52,224,81,154,253,0,18,29,6,240,255,129,13,
+253,126,40,0,32,110,160,180,205,121,47,23,17,0,2,48,
+32,238,10,1,224,49,210,5,28,56,190,255,192,224,10,232,
+38,6,132,215,255,255,128,255,232,53,224,81,146,13,38,6,
+4,24,133,0,32,62,6,1,0,66,190,255,44,135,29,80,
+64,6,255,0,128,7,225,16,6,216,191,255,230,154,10,232,
+127,234,202,5,32,86,10,1,213,45,38,6,132,215,255,255,
+31,58,128,255,122,52,224,81,154,253,32,230,10,1,0,18,
+29,6,240,255,129,13,253,126,40,0,32,110,160,180,205,121,
+47,23,17,0,2,48,224,49,210,5,27,56,190,255,120,224,
+10,224,38,6,132,215,255,255,128,255,118,53,224,81,146,13,
+38,6,16,24,133,0,32,62,6,1,0,66,190,255,186,134,
+28,80,64,6,255,16,128,7,225,0,6,232,7,224,38,6,
+132,215,255,255,31,58,128,255,22,52,224,81,154,253,0,18,
+29,6,240,255,129,13,253,126,40,0,32,110,160,180,205,121,
+47,23,17,0,2,80,32,238,10,1,224,81,146,21,42,23,
+105,0,28,56,2,22,160,0,34,95,0,0,34,103,5,0,
+202,89,11,48,63,6,96,148,1,0,108,0,0,234,38,6,
+132,215,255,255,128,255,250,52,224,81,146,13,38,6,28,24,
+133,0,32,62,6,1,0,66,190,255,62,134,29,80,64,6,
+255,0,130,7,225,48,6,232,7,224,188,0,8,208,29,6,
+240,255,201,5,32,86,10,1,229,69,59,6,132,215,255,255,
+1,130,67,135,3,0,27,48,31,58,128,255,130,51,224,81,
+186,253,253,54,40,0,32,102,160,180,204,49,28,56,26,64,
+191,255,206,245,10,224,163,87,3,0,224,81,130,21,67,7,
+3,0,27,48,128,255,138,52,224,81,146,13,38,6,148,22,
+133,0,32,62,6,1,0,66,190,255,206,133,224,225,234,5,
+29,48,31,58,190,255,52,240,10,224,28,232,163,135,3,0,
+224,129,130,21,67,7,3,0,27,48,128,255,84,52,224,81,
+146,13,38,6,148,22,133,0,32,62,6,1,0,66,190,255,
+152,133,29,80,66,6,255,48,128,7,33,0,6,16,0,82,
+2,6,240,255,129,13,226,126,40,0,32,110,160,180,205,121,
+47,87,17,0,224,81,202,5,32,86,10,1,165,29,196,18,
+36,94,196,172,194,89,43,71,5,0,36,142,196,172,103,71,
+1,0,194,137,49,127,9,0,39,54,8,0,103,127,5,0,
+36,110,196,172,205,17,34,63,13,0,191,255,38,123,0,82,
+64,6,63,0,132,7,97,0,1,138,99,143,5,0,31,50,
+190,255,46,206,1,130,67,135,2,0,38,6,132,215,255,255,
+31,58,128,255,138,50,224,81,154,253,0,234,253,118,40,0,
+32,110,160,180,205,113,46,103,17,0,224,97,194,13,29,56,
+38,6,40,24,133,0,190,255,102,141,29,56,35,54,3,0,
+190,255,226,161,65,234,29,6,240,255,150,237,131,95,3,0,
+224,89,162,21,67,7,2,0,38,6,132,215,255,255,128,255,
+112,51,224,81,146,13,38,6,148,22,133,0,32,62,6,1,
+0,66,190,255,180,132,35,87,5,0,224,81,210,5,99,7,
+5,0,190,255,148,205,68,6,127,0,128,7,225,0,0,226,
+0,234,253,54,40,0,32,126,160,180,207,49,38,119,17,0,
+224,113,242,5,191,255,246,237,10,16,224,17,162,5,2,224,
+65,234,29,6,240,255,230,237,28,80,64,6,255,0,128,7,
 97,0,0,234,253,54,40,0,32,126,160,180,207,49,38,119,
-17,0,224,113,178,5,191,255,90,237,65,234,29,6,240,255,
-166,245,64,6,127,0,128,7,97,0,0,234,253,54,40,0,
-32,126,160,180,207,49,38,119,17,0,224,113,178,5,191,255,
-48,236,65,234,29,6,240,255,166,245,64,6,127,0,0,106,
-0,18,226,86,40,0,32,126,160,180,207,81,42,119,17,0,
-224,113,210,13,42,95,13,0,36,103,17,139,43,95,113,4,
-36,87,33,175,203,97,236,81,163,5,65,106,65,18,2,6,
-240,255,134,237,13,80,127,0,128,7,225,241,6,192,7,208,
-8,216,4,143,204,131,155,0,224,137,202,5,0,82,128,7,
-2,1,191,255,108,167,106,7,9,0,48,6,36,64,1,0,
-106,135,5,0,32,126,244,1,106,7,29,0,10,232,106,7,
-33,0,0,186,106,127,21,0,0,226,122,7,1,0,221,47,
-2,0,221,55,2,0,1,202,252,207,192,0,24,104,89,105,
-130,37,28,48,128,255,194,26,224,81,226,21,28,48,128,255,
-192,26,224,81,210,5,27,6,15,255,218,5,165,21,27,6,
-10,255,242,13,28,48,29,56,36,71,133,140,27,72,190,255,
-82,123,65,186,229,5,58,143,1,0,25,137,122,143,1,0,
-65,226,28,6,240,255,134,221,29,48,23,56,191,255,240,165,
-61,135,0,0,224,129,218,253,61,231,12,0,58,119,1,0,
-253,127,19,0,15,113,122,119,1,0,125,7,0,0,29,48,
-128,255,170,53,27,6,15,255,194,5,27,6,10,255,138,37,
-58,87,1,0,0,234,42,88,75,193,1,18,253,23,192,0,
-24,128,66,129,146,21,29,48,128,255,30,26,202,22,253,255,
-0,82,27,6,15,255,170,5,2,82,10,17,194,0,29,48,
-2,56,128,255,12,26,65,234,29,6,240,255,246,229,28,80,
-64,6,255,241,132,7,225,48,6,232,7,208,32,222,10,1,
-38,6,132,215,255,255,31,58,128,255,106,44,224,81,154,253,
-0,18,29,6,240,255,129,13,253,126,40,0,32,110,160,180,
-205,121,47,23,17,0,99,7,6,0,2,224,224,225,146,37,
-0,234,60,23,105,0,29,64,2,22,136,0,34,87,0,0,
-3,48,220,81,10,56,34,103,5,0,63,6,194,153,1,0,
-108,0,195,199,0,0,146,13,1,90,253,95,192,0,227,143,
-7,0,11,137,99,143,6,0,65,234,29,6,240,255,166,229,
-38,6,132,215,255,255,128,255,46,45,224,81,146,13,38,6,
-212,12,133,0,32,62,6,1,0,66,190,255,192,128,224,225,
-210,13,227,135,7,0,99,135,4,0,35,22,4,0,34,55,
-1,0,26,56,128,255,12,0,10,216,27,80,68,6,255,48,
-3,30,196,255,99,55,45,0,99,255,41,0,99,207,33,0,
-99,223,25,0,99,231,21,0,99,215,29,0,99,239,17,0,
-99,199,37,0,7,208,0,194,191,255,134,165,106,7,9,0,
-49,6,36,64,1,0,106,143,5,0,106,7,29,0,32,134,
-232,3,106,7,33,0,10,224,106,135,21,0,0,234,122,7,
-1,0,1,202,253,207,192,0,227,119,45,0,89,113,146,61,
-29,48,35,62,2,0,35,70,3,0,191,255,46,146,3,23,
-3,0,224,17,170,5,10,16,2,216,187,0,224,217,194,37,
-28,48,29,56,27,64,191,255,132,163,1,138,106,143,0,0,
-3,130,99,135,4,0,27,126,64,0,99,127,6,0,99,7,
-9,0,67,7,12,0,32,118,239,0,67,119,13,0,8,106,
-99,111,14,0,29,48,10,56,35,70,4,0,0,74,190,255,
-116,122,65,194,229,5,58,103,1,0,25,97,122,103,1,0,
-65,234,29,6,240,255,230,189,28,48,24,56,191,255,224,163,
-60,95,0,0,224,89,218,253,60,239,12,0,58,143,1,0,
-252,87,19,0,10,137,122,143,1,0,124,7,0,0,28,48,
-128,255,154,51,29,80,35,255,41,0,35,239,17,0,35,231,
-21,0,35,223,25,0,35,215,29,0,35,207,33,0,35,199,
-37,0,3,30,60,0,127,0,134,7,225,48,6,232,7,208,
-32,222,10,1,38,6,132,215,255,255,31,58,128,255,134,42,
-224,81,154,253,0,18,29,6,240,255,129,13,253,126,40,0,
-32,110,160,180,205,121,47,23,17,0,99,7,10,0,2,224,
-224,225,146,45,0,234,60,23,105,0,29,64,2,22,136,0,
-34,87,0,0,35,54,4,0,220,81,10,56,34,103,5,0,
-63,6,168,155,1,0,108,0,35,95,5,0,99,95,1,0,
-195,199,0,0,194,13,195,207,0,0,154,13,1,82,253,87,
-192,0,227,135,11,0,10,129,99,135,10,0,65,234,29,6,
-240,255,166,221,38,6,132,215,255,255,128,255,58,43,224,81,
-146,13,38,6,224,12,133,0,32,62,6,1,0,66,190,255,
-204,126,224,225,210,13,227,127,11,0,99,127,8,0,35,22,
-8,0,34,55,1,0,26,56,128,255,12,0,10,216,27,80,
-70,6,255,48,3,30,208,255,99,55,33,0,99,255,29,0,
-99,207,25,0,99,215,21,0,99,223,17,0,99,231,13,0,
-99,239,9,0,7,208,122,7,1,0,191,255,148,163,106,7,
-9,0,49,6,36,64,1,0,106,143,5,0,32,134,244,1,
-106,7,29,0,10,224,106,7,33,0,32,54,128,0,106,135,
-21,0,3,56,35,70,4,0,190,255,224,139,0,202,0,234,
-1,122,35,111,32,0,253,127,192,0,79,105,205,0,224,105,
-146,29,35,23,1,0,29,216,34,23,1,0,201,218,194,217,
-29,6,128,255,150,13,38,6,236,12,133,0,32,62,53,10,
-0,66,190,255,24,126,29,48,28,56,27,64,190,255,126,114,
-65,202,65,234,29,6,240,255,198,221,28,48,25,56,191,255,
-30,162,60,135,0,0,224,129,218,253,60,223,12,0,227,103,
-33,0,252,127,19,0,122,127,1,0,47,112,78,97,99,103,
-32,0,124,7,0,0,28,48,128,255,210,49,32,54,0,2,
-190,255,162,197,10,200,0,234,1,226,253,231,192,0,227,87,
-33,0,92,81,242,45,35,55,1,0,29,16,38,55,1,0,
-201,18,194,49,25,56,32,70,0,2,191,255,114,167,10,16,
-224,17,178,5,2,216,165,37,249,127,177,0,136,122,207,22,
-127,0,138,29,4,111,204,131,224,105,178,13,253,94,96,0,
-49,6,252,126,141,0,209,89,235,135,17,0,224,129,170,13,
-58,127,1,0,28,121,122,127,1,0,224,217,186,5,32,222,
-2,16,65,234,29,6,240,255,134,205,25,48,190,255,46,197,
-35,55,1,0,1,58,190,255,64,141,27,80,35,207,25,0,
-35,215,21,0,35,223,17,0,35,231,13,0,35,239,9,0,
-35,255,29,0,3,30,48,0,127,0,32,94,107,48,6,22,
-2,0,103,7,1,0,0,82,130,143,1,0,108,138,186,13,
-162,135,5,0,130,127,7,0,200,122,208,121,103,127,1,0,
-0,90,229,5,76,18,65,82,10,6,226,255,230,237,0,18,
-0,82,134,103,1,0,204,17,130,0,65,50,65,82,10,6,
-0,254,134,253,224,17,178,5,32,94,107,48,11,80,127,0,
-136,7,225,112,6,232,7,200,32,230,10,1,38,6,132,215,
-255,255,31,58,128,255,222,39,224,81,154,253,0,18,29,6,
-240,255,129,13,253,126,40,0,32,110,160,180,205,121,47,23,
-17,0,99,7,14,0,1,210,2,216,224,217,194,53,0,234,
-253,94,96,0,49,6,252,126,141,0,209,89,235,135,17,0,
-224,129,170,5,0,210,59,23,105,0,29,64,2,22,136,0,
-34,87,0,0,35,54,4,0,219,81,10,56,34,127,5,0,
-63,6,104,158,1,0,111,0,35,119,5,0,99,119,1,0,
-195,199,0,0,194,13,195,207,0,0,154,13,1,106,253,111,
-192,0,227,95,15,0,13,89,99,95,14,0,65,234,29,6,
-240,255,246,205,38,6,132,215,255,255,128,255,122,40,224,81,
-146,13,38,6,252,12,133,0,32,62,6,1,0,66,190,255,
-12,124,224,217,210,37,4,87,204,131,224,81,130,21,224,209,
-226,13,227,143,15,0,99,143,8,0,35,22,8,0,34,55,
-1,0,25,56,128,255,48,0,10,224,165,21,227,135,15,0,
-99,135,12,0,35,22,12,0,34,55,1,0,25,56,191,255,
-38,253,10,224,28,6,254,239,186,5,32,230,5,2,28,80,
-72,6,255,112,3,30,196,255,99,55,45,0,99,255,41,0,
-99,191,37,0,99,199,33,0,99,207,29,0,99,215,25,0,
-99,223,21,0,99,231,17,0,99,239,13,0,7,216,123,7,
-1,0,191,255,156,160,106,7,9,0,49,6,36,64,1,0,
-106,143,5,0,32,134,244,1,106,7,29,0,10,224,106,7,
-33,0,32,54,128,0,106,135,21,0,3,56,35,70,4,0,
-190,255,232,136,0,202,0,234,227,191,45,0,1,122,253,127,
-192,0,23,104,79,105,205,0,224,105,146,29,35,23,1,0,
-29,208,34,23,1,0,201,210,194,209,29,6,128,255,150,13,
-38,6,8,13,133,0,32,62,116,11,0,66,190,255,30,123,
-29,48,28,56,26,64,190,255,48,116,65,202,65,234,29,6,
-240,255,182,221,28,48,25,56,191,255,36,159,60,135,0,0,
-224,129,218,253,60,215,12,0,28,48,252,127,19,0,123,127,
-1,0,124,7,0,0,128,255,228,46,32,54,0,2,190,255,
-180,194,10,200,0,234,1,226,253,231,192,0,23,104,92,105,
-146,61,253,86,96,0,48,6,252,126,141,0,208,81,59,127,
-1,0,234,199,17,0,92,121,162,13,224,193,250,45,59,111,
-1,0,60,112,78,105,123,111,1,0,133,45,35,55,1,0,
+17,0,224,113,194,5,3,58,191,255,6,239,65,234,29,6,
+240,255,150,245,0,82,64,6,127,0,132,7,33,0,191,255,
+156,255,128,54,255,255,128,255,102,0,2,18,99,23,5,0,
+191,255,14,171,106,7,9,0,49,6,248,65,1,0,106,143,
+5,0,32,134,232,3,106,7,29,0,1,18,106,7,33,0,
+3,56,106,135,21,0,99,87,1,0,106,23,0,0,38,6,
+140,148,145,0,31,66,190,255,4,161,197,5,10,50,191,255,
+202,150,35,23,1,0,34,127,0,0,224,121,138,253,98,7,
+0,0,2,48,128,255,34,58,68,6,63,0,128,7,193,16,
+6,216,0,234,229,87,64,0,224,7,96,1,10,224,0,90,
+235,22,40,0,32,126,160,180,207,17,34,119,17,0,224,113,
+242,21,34,87,32,0,224,81,134,21,219,81,98,87,32,0,
+228,111,141,140,228,103,5,134,172,105,237,81,150,13,31,82,
+98,87,32,0,1,234,197,5,127,82,170,5,1,234,65,90,
+11,6,240,255,230,221,252,47,32,0,29,80,64,6,223,16,
+100,7,4,134,228,23,141,140,226,49,206,5,166,17,100,23,
+4,134,127,0,128,7,193,0,6,232,229,87,64,0,224,7,
+96,1,10,224,0,82,29,6,240,255,177,13,253,22,40,0,
+32,118,160,180,206,17,34,111,17,0,224,105,162,5,2,80,
+10,16,224,17,178,5,98,7,32,0,252,47,32,0,64,6,
+223,0,132,7,225,0,6,232,0,226,1,138,67,143,3,0,
+38,6,132,215,255,255,31,58,128,255,116,48,224,81,154,253,
+0,18,29,6,240,255,129,13,253,118,40,0,32,102,160,180,
+204,113,46,23,17,0,2,80,224,81,226,29,42,23,105,0,
+35,62,4,0,2,22,128,0,34,55,0,0,34,95,5,0,
+202,49,63,6,254,151,1,0,107,0,253,22,40,0,32,134,
+160,180,35,127,5,0,208,17,224,121,226,5,34,119,32,0,
+127,114,170,5,1,226,28,232,163,111,3,0,224,105,162,21,
+67,7,3,0,38,6,132,215,255,255,128,255,52,49,224,81,
+146,13,38,6,148,22,133,0,32,62,6,1,0,66,190,255,
+120,130,29,80,68,6,255,0,130,7,225,240,6,232,56,6,
+132,215,255,255,1,138,67,143,3,0,24,48,31,58,128,255,
+206,47,224,81,186,253,32,230,10,1,29,48,191,255,54,255,
+97,82,154,93,0,18,29,6,240,255,129,13,253,118,40,0,
+32,102,160,180,204,113,46,23,17,0,2,216,224,217,178,77,
+253,206,40,0,32,86,160,180,25,208,202,209,163,143,3,0,
+224,137,130,21,67,7,3,0,24,48,128,255,180,48,224,81,
+146,13,38,6,148,22,133,0,32,62,6,1,0,66,190,255,
+248,129,26,48,191,255,102,235,10,224,224,225,202,45,163,127,
+3,0,224,121,170,13,1,114,67,119,3,0,24,48,31,58,
+128,255,76,47,224,81,186,253,0,18,29,6,240,255,225,5,
+32,94,160,180,203,201,57,23,17,0,226,217,170,21,59,23,
+105,0,63,6,28,153,1,0,2,22,120,0,34,55,0,0,
+34,87,5,0,219,49,106,0,30,138,122,143,32,0,181,5,
+32,230,10,1,28,232,163,135,3,0,224,129,130,21,67,7,
+3,0,24,48,128,255,42,48,224,81,146,13,38,6,148,22,
+133,0,32,62,6,1,0,66,190,255,110,129,29,80,66,6,
+255,240,132,7,225,0,6,224,1,234,67,239,3,0,38,6,
+132,215,255,255,31,58,128,255,198,46,224,81,154,253,0,18,
+28,6,240,255,129,13,252,118,40,0,32,102,160,180,204,113,
+46,23,17,0,2,80,224,81,226,21,42,23,105,0,35,62,
+4,0,2,22,128,0,34,55,0,0,34,95,5,0,202,49,
+63,6,172,153,1,0,107,0,10,232,35,87,5,0,224,81,
+170,5,1,234,163,143,3,0,224,137,162,21,67,7,3,0,
+38,6,132,215,255,255,128,255,152,47,224,81,146,13,38,6,
+148,22,133,0,32,62,6,1,0,66,190,255,220,128,29,80,
+68,6,255,0,128,7,97,0,0,234,253,54,40,0,32,126,
+160,180,207,49,38,119,17,0,224,113,178,5,191,255,90,237,
+65,234,29,6,240,255,166,245,64,6,127,0,128,7,97,0,
+0,234,253,54,40,0,32,126,160,180,207,49,38,119,17,0,
+224,113,178,5,191,255,48,236,65,234,29,6,240,255,166,245,
+64,6,127,0,0,106,0,18,226,86,40,0,32,126,160,180,
+207,81,42,119,17,0,224,113,210,13,42,95,13,0,36,103,
+29,139,43,95,113,4,36,87,45,175,203,97,236,81,163,5,
+65,106,65,18,2,6,240,255,134,237,13,80,127,0,128,7,
+225,241,6,192,7,208,8,216,4,143,216,131,155,0,224,137,
+202,5,0,82,128,7,2,1,191,255,22,167,106,7,9,0,
+48,6,248,65,1,0,106,135,5,0,32,126,244,1,106,7,
+29,0,10,232,106,7,33,0,0,186,106,127,21,0,0,226,
+122,7,1,0,221,47,2,0,221,55,2,0,1,202,252,207,
+192,0,24,104,89,105,130,37,28,48,128,255,202,26,224,81,
+226,21,28,48,128,255,200,26,224,81,210,5,27,6,15,255,
+218,5,165,21,27,6,10,255,242,13,28,48,29,56,36,71,
+145,140,27,72,190,255,40,121,65,186,229,5,58,143,1,0,
+25,137,122,143,1,0,65,226,28,6,240,255,134,221,29,48,
+23,56,191,255,154,165,61,135,0,0,224,129,218,253,61,231,
+12,0,58,119,1,0,253,127,19,0,15,113,122,119,1,0,
+125,7,0,0,29,48,128,255,208,53,27,6,15,255,194,5,
+27,6,10,255,138,37,58,87,1,0,0,234,42,88,75,193,
+1,18,253,23,192,0,24,128,66,129,146,21,29,48,128,255,
+38,26,202,22,253,255,0,82,27,6,15,255,170,5,2,82,
+10,17,194,0,29,48,2,56,128,255,20,26,65,234,29,6,
+240,255,246,229,28,80,64,6,255,241,132,7,225,48,6,232,
+7,208,32,222,10,1,38,6,132,215,255,255,31,58,128,255,
+142,44,224,81,154,253,0,18,29,6,240,255,129,13,253,126,
+40,0,32,110,160,180,205,121,47,23,17,0,99,7,6,0,
+2,224,224,225,146,37,0,234,60,23,105,0,29,64,2,22,
+136,0,34,87,0,0,3,48,220,81,10,56,34,103,5,0,
+63,6,236,155,1,0,108,0,195,199,0,0,146,13,1,90,
+253,95,192,0,227,143,7,0,11,137,99,143,6,0,65,234,
+29,6,240,255,166,229,38,6,132,215,255,255,128,255,82,45,
+224,81,146,13,38,6,80,24,133,0,32,62,6,1,0,66,
+190,255,150,126,224,225,210,13,227,135,7,0,99,135,4,0,
+35,22,4,0,34,55,1,0,26,56,128,255,12,0,10,216,
+27,80,68,6,255,48,3,30,196,255,99,55,45,0,99,255,
+41,0,99,207,33,0,99,223,25,0,99,231,21,0,99,215,
+29,0,99,239,17,0,99,199,37,0,7,208,0,194,191,255,
+48,165,106,7,9,0,49,6,248,65,1,0,106,143,5,0,
+106,7,29,0,32,134,232,3,106,7,33,0,10,224,106,135,
+21,0,0,234,122,7,1,0,1,202,253,207,192,0,227,119,
+45,0,89,113,146,61,29,48,35,62,2,0,35,70,3,0,
+191,255,216,145,3,23,3,0,224,17,170,5,10,16,2,216,
+187,0,224,217,194,37,28,48,29,56,27,64,191,255,46,163,
+1,138,106,143,0,0,3,130,99,135,4,0,27,126,64,0,
+99,127,6,0,99,7,9,0,67,7,12,0,32,118,239,0,
+67,119,13,0,8,106,99,111,14,0,29,48,10,56,35,70,
+4,0,0,74,190,255,74,120,65,194,229,5,58,103,1,0,
+25,97,122,103,1,0,65,234,29,6,240,255,230,189,28,48,
+24,56,191,255,138,163,60,95,0,0,224,89,218,253,60,239,
+12,0,58,143,1,0,252,87,19,0,10,137,122,143,1,0,
+124,7,0,0,28,48,128,255,192,51,29,80,35,255,41,0,
+35,239,17,0,35,231,21,0,35,223,25,0,35,215,29,0,
+35,207,33,0,35,199,37,0,3,30,60,0,127,0,134,7,
+225,48,6,232,7,208,32,222,10,1,38,6,132,215,255,255,
+31,58,128,255,170,42,224,81,154,253,0,18,29,6,240,255,
+129,13,253,126,40,0,32,110,160,180,205,121,47,23,17,0,
+99,7,10,0,2,224,224,225,146,45,0,234,60,23,105,0,
+29,64,2,22,136,0,34,87,0,0,35,54,4,0,220,81,
+10,56,34,103,5,0,63,6,210,157,1,0,108,0,35,95,
+5,0,99,95,1,0,195,199,0,0,194,13,195,207,0,0,
+154,13,1,82,253,87,192,0,227,135,11,0,10,129,99,135,
+10,0,65,234,29,6,240,255,166,221,38,6,132,215,255,255,
+128,255,94,43,224,81,146,13,38,6,92,24,133,0,32,62,
+6,1,0,66,190,255,162,124,224,225,210,13,227,127,11,0,
+99,127,8,0,35,22,8,0,34,55,1,0,26,56,128,255,
+12,0,10,216,27,80,70,6,255,48,3,30,208,255,99,55,
+33,0,99,255,29,0,99,207,25,0,99,215,21,0,99,223,
+17,0,99,231,13,0,99,239,9,0,7,208,122,7,1,0,
+191,255,62,163,106,7,9,0,49,6,248,65,1,0,106,143,
+5,0,32,134,244,1,106,7,29,0,10,224,106,7,33,0,
+32,54,128,0,106,135,21,0,3,56,35,70,4,0,190,255,
+182,137,0,202,0,234,1,122,35,111,32,0,253,127,192,0,
+79,105,205,0,224,105,146,29,35,23,1,0,29,216,34,23,
+1,0,201,218,194,217,29,6,128,255,150,13,38,6,104,24,
+133,0,32,62,53,10,0,66,190,255,238,123,29,48,28,56,
+27,64,190,255,84,112,65,202,65,234,29,6,240,255,198,221,
+28,48,25,56,191,255,200,161,60,135,0,0,224,129,218,253,
+60,223,12,0,227,103,33,0,252,127,19,0,122,127,1,0,
+47,112,78,97,99,103,32,0,124,7,0,0,28,48,128,255,
+248,49,32,54,0,2,190,255,32,196,10,200,0,234,1,226,
+253,231,192,0,227,87,33,0,92,81,242,45,35,55,1,0,
 29,16,38,55,1,0,201,18,194,49,25,56,32,70,0,2,
-191,255,92,164,10,16,224,17,178,5,2,208,245,21,25,48,
-35,62,8,0,191,255,86,253,35,95,9,0,248,89,162,13,
-59,87,1,0,28,81,123,87,1,0,224,209,186,5,32,214,
-5,2,65,234,29,6,240,255,246,189,25,48,190,255,46,194,
-35,55,1,0,1,58,190,255,64,138,26,80,35,191,37,0,
-35,199,33,0,35,207,29,0,35,215,25,0,35,223,21,0,
-35,231,17,0,35,239,13,0,35,255,41,0,3,30,60,0,
-127,0,130,7,225,48,8,208,154,0,6,232,7,216,128,255,
-158,1,224,81,210,21,224,233,130,21,61,23,105,0,3,58,
+191,255,28,167,10,16,224,17,178,5,2,216,165,37,249,127,
+177,0,136,122,207,22,127,0,138,29,4,111,216,131,224,105,
+178,13,253,94,96,0,49,6,92,138,141,0,209,89,235,135,
+17,0,224,129,170,13,58,127,1,0,28,121,122,127,1,0,
+224,217,186,5,32,222,2,16,65,234,29,6,240,255,134,205,
+25,48,190,255,172,195,35,55,1,0,1,58,190,255,22,139,
+27,80,35,207,25,0,35,215,21,0,35,223,17,0,35,231,
+13,0,35,239,9,0,35,255,29,0,3,30,48,0,127,0,
+32,94,107,48,6,22,2,0,103,7,1,0,0,82,130,143,
+1,0,108,138,186,13,162,135,5,0,130,127,7,0,200,122,
+208,121,103,127,1,0,0,90,229,5,76,18,65,82,10,6,
+226,255,230,237,0,18,0,82,134,103,1,0,204,17,130,0,
+65,50,65,82,10,6,0,254,134,253,224,17,178,5,32,94,
+107,48,11,80,127,0,136,7,225,112,6,232,7,200,32,230,
+10,1,38,6,132,215,255,255,31,58,128,255,2,40,224,81,
+154,253,0,18,29,6,240,255,129,13,253,126,40,0,32,110,
+160,180,205,121,47,23,17,0,99,7,14,0,1,210,2,216,
+224,217,194,53,0,234,253,94,96,0,49,6,92,138,141,0,
+209,89,235,135,17,0,224,129,170,5,0,210,59,23,105,0,
+29,64,2,22,136,0,34,87,0,0,35,54,4,0,219,81,
+10,56,34,127,5,0,63,6,146,160,1,0,111,0,35,119,
+5,0,99,119,1,0,195,199,0,0,194,13,195,207,0,0,
+154,13,1,106,253,111,192,0,227,95,15,0,13,89,99,95,
+14,0,65,234,29,6,240,255,246,205,38,6,132,215,255,255,
+128,255,158,40,224,81,146,13,38,6,120,24,133,0,32,62,
+6,1,0,66,190,255,226,121,224,217,210,37,4,87,216,131,
+224,81,130,21,224,209,226,13,227,143,15,0,99,143,8,0,
+35,22,8,0,34,55,1,0,25,56,128,255,48,0,10,224,
+165,21,227,135,15,0,99,135,12,0,35,22,12,0,34,55,
+1,0,25,56,191,255,38,253,10,224,28,6,254,239,186,5,
+32,230,5,2,28,80,72,6,255,112,3,30,196,255,99,55,
+45,0,99,255,41,0,99,191,37,0,99,199,33,0,99,207,
+29,0,99,215,25,0,99,223,21,0,99,231,17,0,99,239,
+13,0,7,216,123,7,1,0,191,255,70,160,106,7,9,0,
+49,6,248,65,1,0,106,143,5,0,32,134,244,1,106,7,
+29,0,10,224,106,7,33,0,32,54,128,0,106,135,21,0,
+3,56,35,70,4,0,190,255,190,134,0,202,0,234,227,191,
+45,0,1,122,253,127,192,0,23,104,79,105,205,0,224,105,
+146,29,35,23,1,0,29,208,34,23,1,0,201,210,194,209,
+29,6,128,255,150,13,38,6,132,24,133,0,32,62,116,11,
+0,66,190,255,244,120,29,48,28,56,26,64,190,255,6,114,
+65,202,65,234,29,6,240,255,182,221,28,48,25,56,191,255,
+206,158,60,135,0,0,224,129,218,253,60,215,12,0,28,48,
+252,127,19,0,123,127,1,0,124,7,0,0,128,255,10,47,
+32,54,0,2,190,255,50,193,10,200,0,234,1,226,253,231,
+192,0,23,104,92,105,146,61,253,86,96,0,48,6,92,138,
+141,0,208,81,59,127,1,0,234,199,17,0,92,121,162,13,
+224,193,250,45,59,111,1,0,60,112,78,105,123,111,1,0,
+133,45,35,55,1,0,29,16,38,55,1,0,201,18,194,49,
+25,56,32,70,0,2,191,255,6,164,10,16,224,17,178,5,
+2,208,245,21,25,48,35,62,8,0,191,255,86,253,35,95,
+9,0,248,89,162,13,59,87,1,0,28,81,123,87,1,0,
+224,209,186,5,32,214,5,2,65,234,29,6,240,255,246,189,
+25,48,190,255,172,192,35,55,1,0,1,58,190,255,22,136,
+26,80,35,191,37,0,35,199,33,0,35,207,29,0,35,215,
+25,0,35,223,21,0,35,231,17,0,35,239,13,0,35,255,
+41,0,3,30,60,0,127,0,130,7,225,48,8,208,154,0,
+6,232,7,216,128,255,158,1,224,81,210,21,224,233,130,21,
+61,23,105,0,3,58,2,22,80,1,34,87,0,0,34,135,
+5,0,221,81,10,48,63,6,2,163,1,0,112,0,31,82,
+128,7,110,1,27,48,128,255,48,5,10,224,224,209,242,21,
+127,226,218,21,224,233,130,21,61,23,105,0,3,58,2,22,
+80,1,34,87,0,0,34,119,5,0,221,81,10,48,63,6,
+58,163,1,0,110,0,28,80,128,7,54,1,127,226,186,37,
+0,50,128,255,96,5,10,224,127,226,154,29,38,6,148,24,
+133,0,190,255,218,127,224,233,130,21,61,23,105,0,3,58,
+2,22,80,1,34,87,0,0,34,111,5,0,221,81,10,48,
+63,6,124,163,1,0,109,0,28,80,165,125,28,48,27,56,
+128,255,0,3,252,222,40,0,32,86,160,180,202,217,59,23,
+17,0,224,17,194,29,253,17,130,29,28,56,38,6,216,24,
+133,0,190,255,138,127,224,233,130,21,61,23,105,0,3,58,
 2,22,80,1,34,87,0,0,34,135,5,0,221,81,10,48,
-63,6,216,160,1,0,112,0,31,82,128,7,110,1,27,48,
-128,255,48,5,10,224,224,209,242,21,127,226,218,21,224,233,
-130,21,61,23,105,0,3,58,2,22,80,1,34,87,0,0,
-34,119,5,0,221,81,10,48,63,6,16,161,1,0,110,0,
-28,80,128,7,54,1,127,226,186,37,0,50,128,255,96,5,
-10,224,127,226,154,29,38,6,24,13,133,0,190,255,4,130,
-224,233,130,21,61,23,105,0,3,58,2,22,80,1,34,87,
-0,0,34,111,5,0,221,81,10,48,63,6,82,161,1,0,
-109,0,28,80,165,125,28,48,27,56,128,255,0,3,252,222,
-40,0,32,86,160,180,202,217,59,23,17,0,224,17,194,29,
-253,17,130,29,28,56,38,6,92,13,133,0,190,255,180,129,
-224,233,130,21,61,23,105,0,3,58,2,22,80,1,34,87,
-0,0,34,135,5,0,221,81,10,48,63,6,162,161,1,0,
-112,0,31,82,165,85,123,7,32,0,196,239,144,140,194,45,
-61,23,105,0,3,56,2,22,128,0,34,87,0,0,34,127,
-5,0,221,81,10,48,63,6,206,161,1,0,111,0,35,119,
-1,0,10,16,224,113,162,13,224,17,138,13,28,64,8,50,
-39,6,80,13,133,0,191,255,116,21,61,23,105,0,63,6,
-6,162,1,0,2,22,120,0,34,87,0,0,34,111,5,0,
-221,81,10,48,109,0,61,23,105,0,91,7,35,0,2,22,
-24,0,34,87,0,0,91,7,36,0,221,81,10,48,34,103,
-5,0,63,6,42,162,1,0,108,0,123,95,25,0,123,87,
-21,0,36,95,130,140,123,239,17,0,65,90,100,95,130,140,
-28,48,128,255,182,4,28,80,66,6,255,48,148,7,225,0,
-6,232,7,224,157,23,7,0,97,18,226,5,98,18,194,5,
-0,82,128,7,20,1,61,23,105,0,99,7,1,0,2,22,
-64,1,34,87,0,0,3,56,221,81,10,48,34,127,5,0,
-63,6,136,162,1,0,111,0,224,81,178,5,0,82,197,117,
-35,54,8,0,39,6,221,221,51,51,128,255,156,16,35,54,
-8,0,128,255,164,16,224,81,186,5,0,82,213,101,0,50,
-128,255,206,16,99,87,5,0,224,81,154,13,38,6,204,13,
-133,0,32,62,105,12,0,66,190,255,242,119,35,63,5,0,
-35,54,8,0,32,70,68,2,0,74,128,255,116,16,35,63,
-5,0,39,63,2,0,38,6,220,13,133,0,190,255,68,128,
-35,55,5,0,128,255,146,16,224,81,130,53,35,55,5,0,
-28,56,128,255,156,16,35,23,5,0,34,103,2,0,10,224,
-236,225,234,5,2,48,190,255,78,225,0,82,213,45,38,6,
-160,13,133,0,190,255,12,128,29,48,128,255,252,15,224,81,
-250,13,35,55,5,0,28,56,128,255,94,16,35,63,5,0,
-35,54,8,0,32,70,68,2,0,74,128,255,44,16,35,55,
-5,0,190,255,18,225,1,82,245,13,38,6,12,14,133,0,
-190,255,208,127,35,54,8,0,128,255,214,15,35,55,5,0,
-190,255,244,224,0,82,84,6,255,0,128,7,33,0,0,18,
-36,143,141,140,196,55,144,140,224,137,226,29,128,255,102,8,
-224,81,234,23,0,0,138,29,36,86,176,172,43,6,168,14,
-133,0,8,98,65,82,10,111,255,255,65,90,11,119,255,255,
-13,16,174,17,218,5,224,105,178,5,95,98,202,245,224,17,
-234,23,0,0,194,69,224,17,194,13,38,6,68,14,133,0,
-190,255,96,127,32,54,65,0,37,62,157,131,191,255,126,19,
-36,54,176,172,0,58,32,70,112,2,190,255,62,127,36,54,
-176,172,39,6,168,14,133,0,8,66,191,255,136,107,36,86,
-188,173,36,150,184,173,114,87,1,0,0,18,32,110,255,15,
-2,136,196,138,36,118,184,172,206,137,113,111,0,0,65,18,
-2,6,240,255,198,245,128,255,204,7,36,150,28,175,50,23,
-1,0,170,17,36,150,28,175,114,23,1,0,38,6,180,14,
-133,0,196,183,144,140,190,255,234,126,229,5,38,6,124,14,
-133,0,190,255,222,126,64,6,63,0,128,7,97,0,36,86,
-184,172,6,16,196,18,36,134,184,172,39,239,1,0,194,129,
-112,239,5,0,36,118,184,172,39,103,5,0,194,113,110,103,
-9,0,36,150,184,173,50,55,1,0,202,17,98,55,13,0,
-72,58,29,64,191,255,238,106,36,150,184,173,50,119,1,0,
-36,150,184,173,221,113,114,119,1,0,128,255,72,7,36,150,
-28,175,50,23,1,0,170,17,36,150,28,175,114,23,1,0,
-36,102,188,173,36,150,184,173,50,95,1,0,12,110,96,1,
-237,89,163,13,38,6,208,14,133,0,32,62,222,12,0,66,
-190,255,218,117,224,81,64,6,127,0,128,7,225,48,196,50,
-36,22,184,172,198,17,34,215,5,0,36,110,184,172,98,7,
-5,0,198,105,109,7,9,0,36,134,184,172,198,129,48,223,
-13,0,26,224,219,225,36,86,184,172,202,49,102,7,13,0,
-181,77,0,234,29,136,196,138,36,118,184,172,206,137,49,111,
-13,0,252,105,210,5,65,234,29,6,240,255,198,245,29,6,
-240,255,150,13,38,6,224,14,133,0,32,62,8,13,0,66,
-190,255,106,117,196,234,36,94,184,172,221,89,36,134,184,172,
-208,233,43,143,5,0,125,223,13,0,17,128,224,129,162,37,
-27,80,28,16,16,88,194,89,10,120,162,121,11,112,162,113,
-238,121,139,21,16,104,202,105,13,86,255,255,11,22,255,255,
-95,18,2,103,1,0,95,82,74,103,1,0,95,130,154,253,
-149,13,65,18,2,95,255,255,65,82,74,95,255,255,95,130,
-154,253,209,225,209,217,36,150,184,173,50,135,1,0,240,225,
-145,181,36,150,184,173,50,119,1,0,36,150,184,173,186,113,
-114,119,1,0,128,255,30,6,36,150,28,175,50,23,1,0,
-36,150,28,175,170,17,114,23,1,0,36,150,184,173,50,103,
-1,0,36,110,188,173,237,97,169,13,38,6,224,14,133,0,
-32,62,18,13,0,66,190,255,180,116,224,81,64,6,255,48,
-0,18,2,80,196,82,36,134,184,172,202,129,48,119,13,0,
-224,113,242,37,36,118,184,172,202,113,46,103,5,0,38,127,
-1,0,239,97,234,29,38,87,5,0,46,95,9,0,234,89,
-138,29,46,103,13,0,38,110,8,0,0,82,15,88,224,89,
-194,13,65,98,12,143,255,255,65,106,13,135,255,255,17,80,
-176,81,186,5,95,90,234,245,224,81,186,5,2,80,229,5,
-65,18,2,6,240,255,230,205,31,82,127,0,6,16,229,13,
-194,142,15,0,196,138,36,110,184,172,205,137,49,103,13,0,
-224,97,186,5,2,80,245,5,65,18,6,94,16,0,235,17,
-129,245,31,82,127,0,130,7,225,0,6,224,0,234,60,23,
-105,0,29,64,2,22,136,0,34,87,0,0,3,48,220,81,
-10,56,34,143,5,0,63,6,206,166,1,0,113,0,195,199,
-0,0,218,5,65,234,29,6,240,255,166,237,29,6,240,255,
-150,13,38,6,240,14,133,0,32,62,114,13,0,66,190,255,
-204,115,29,80,66,6,255,0,128,7,33,0,31,58,6,22,
-255,255,165,21,226,134,40,0,32,118,160,180,206,129,48,111,
-17,0,224,105,130,13,196,18,36,142,184,172,209,17,226,63,
-1,0,197,5,95,18,127,18,239,237,128,255,8,0,64,6,
-63,0,128,7,225,16,6,232,253,134,40,0,32,118,160,180,
-206,129,48,87,17,0,7,216,224,81,202,5,32,230,255,15,
-229,29,0,18,29,6,240,255,161,5,10,16,2,224,224,225,
-154,13,38,6,0,15,133,0,32,62,170,13,0,66,190,255,
-76,115,156,95,7,0,111,90,138,13,28,48,191,255,42,255,
-10,230,1,0,198,226,181,5,27,230,1,0,196,234,36,126,
-184,172,207,233,125,231,0,0,128,255,90,4,36,150,28,175,
-50,23,1,0,170,17,36,150,28,175,114,23,1,0,28,80,
-64,6,255,16,128,7,225,0,6,6,240,255,201,5,32,86,
-10,1,181,61,7,6,0,240,185,5,32,62,255,15,6,232,
-196,234,36,126,184,172,221,121,111,63,0,0,0,18,6,6,
-240,255,129,13,230,94,40,0,32,142,160,180,209,89,43,23,
-17,0,2,224,224,225,154,13,38,6,16,15,133,0,32,62,
-218,13,0,66,190,255,182,114,156,135,7,0,16,6,192,255,
-138,13,36,118,184,172,206,233,32,110,254,15,125,111,0,0,
-128,255,210,3,36,150,28,175,50,23,1,0,170,17,36,150,
-28,175,114,23,1,0,0,82,64,6,255,0,6,6,240,255,
-161,13,230,126,40,0,32,110,160,180,205,121,47,103,17,0,
-224,97,202,5,32,86,255,15,245,5,196,50,36,134,184,172,
-208,49,230,87,1,0,127,0,136,7,33,0,196,247,144,140,
-186,45,0,106,13,16,197,29,2,78,255,255,180,29,13,80,
-9,136,195,137,17,135,0,0,196,82,16,120,196,122,36,102,
-184,172,204,121,239,95,1,0,36,126,184,172,207,81,234,119,
-1,0,238,89,243,5,195,17,66,135,0,0,9,16,224,17,
-207,229,195,17,66,111,0,0,65,106,13,6,240,255,182,221,
-3,48,128,255,142,0,72,6,63,0,128,7,225,16,0,218,
-38,6,132,215,255,255,31,58,128,255,10,29,224,81,154,253,
-0,234,29,136,196,138,36,118,184,172,206,137,49,111,13,0,
-224,105,146,29,253,230,40,0,32,86,160,180,202,225,60,143,
-17,0,224,137,138,21,1,130,253,135,192,0,16,217,0,50,
-0,58,190,255,106,219,36,119,130,140,124,87,17,0,65,114,
-100,119,130,140,65,234,29,6,240,255,201,221,38,6,132,215,
-255,255,128,255,226,29,224,81,146,13,38,6,32,15,133,0,
-32,62,6,1,0,66,190,255,116,113,27,80,64,6,255,16,
-130,7,225,48,6,224,36,63,130,140,38,6,44,15,133,0,
-190,255,208,121,38,6,116,15,133,0,190,255,198,121,0,234,
-29,128,220,129,16,111,0,0,36,94,184,172,196,106,203,105,
-237,63,1,0,37,54,168,131,190,255,168,121,65,234,29,6,
-240,255,246,237,38,6,92,15,133,0,190,255,150,121,0,234,
-29,136,220,137,17,63,0,0,37,54,160,131,190,255,132,121,
-65,234,29,6,240,255,214,245,38,6,104,15,133,0,190,255,
-114,121,0,234,29,56,37,54,160,131,190,255,102,121,65,234,
-29,6,240,255,134,253,37,54,164,131,190,255,86,121,0,218,
-0,234,29,120,220,121,15,119,0,0,14,6,240,255,153,13,
-38,6,128,15,133,0,32,62,181,14,0,66,190,255,190,112,
-29,104,220,105,13,103,0,0,1,90,236,95,192,0,11,217,
-65,234,29,6,240,255,230,229,245,217,146,13,38,6,128,15,
-133,0,32,62,184,14,0,66,190,255,146,112,1,138,67,143,
-3,0,38,6,132,215,255,255,31,58,128,255,168,27,224,81,
-154,253,32,54,128,2,190,255,76,184,10,216,32,54,0,1,
-190,255,66,184,10,208,0,74,9,128,232,135,68,2,219,129,
-16,112,9,104,237,0,237,102,40,0,32,86,160,180,12,88,
-202,89,11,136,17,126,40,0,49,111,1,0,112,111,1,0,
-68,138,68,130,241,121,154,253,9,16,196,18,2,120,36,142,
-184,172,209,17,34,119,1,0,218,121,111,119,1,0,34,111,
-5,0,111,111,5,0,34,103,9,0,111,103,9,0,65,74,
-34,143,13,0,9,6,240,255,111,143,13,0,230,205,0,234,
-253,62,40,0,32,118,160,180,29,104,220,105,13,95,0,0,
-206,57,235,102,40,0,7,128,12,80,219,81,10,136,17,126,
-40,0,49,119,1,0,112,119,1,0,68,138,68,130,241,121,
-154,253,71,239,34,0,0,18,29,6,240,255,241,5,253,22,
-120,4,42,6,184,29,148,0,202,17,103,23,13,0,2,48,
-190,255,212,128,29,120,196,122,29,104,220,105,13,87,0,0,
-36,118,184,172,196,82,218,81,42,111,1,0,206,121,111,111,
-1,0,42,103,5,0,111,103,5,0,42,95,9,0,111,95,
-9,0,65,234,42,87,13,0,29,6,240,255,111,87,13,0,
-134,189,27,48,190,255,70,183,26,48,190,255,64,183,163,143,
-3,0,224,137,162,21,67,7,3,0,38,6,132,215,255,255,
-128,255,164,27,224,81,146,13,38,6,24,11,133,0,32,62,
-6,1,0,66,190,255,54,111,66,6,255,48,128,7,97,0,
-134,0,224,49,194,21,38,6,144,15,133,0,190,255,148,119,
-0,234,29,56,37,54,176,131,190,255,136,119,65,234,29,6,
-240,255,134,253,37,54,184,131,190,255,120,119,38,6,156,15,
-133,0,190,255,110,119,0,234,29,128,196,130,36,110,184,172,
-205,129,240,63,1,0,37,54,188,131,190,255,86,119,65,234,
-29,6,240,255,166,245,37,54,184,131,190,255,70,119,64,6,
-127,0,0,82,36,22,176,172,213,5,34,143,1,0,68,18,
-209,81,36,126,28,175,15,134,4,0,240,17,241,245,127,0,
-130,7,225,16,6,232,7,224,188,0,8,216,187,0,1,138,
-67,143,3,0,38,6,132,215,255,255,31,58,128,255,182,25,
-224,81,154,253,0,18,29,6,240,255,129,13,253,118,40,0,
-32,102,160,180,204,113,46,23,17,0,2,80,32,22,10,1,
-224,81,178,21,42,23,105,0,28,88,2,22,56,1,34,55,
-0,0,11,56,202,49,27,80,10,64,34,143,5,0,63,6,
-118,172,1,0,113,0,0,18,2,232,163,135,3,0,224,129,
-162,21,67,7,3,0,38,6,132,215,255,255,128,255,136,26,
-224,81,146,13,38,6,24,11,133,0,32,62,6,1,0,66,
-190,255,26,110,29,80,66,6,255,16,128,7,97,0,6,232,
-0,58,32,70,223,255,191,255,90,255,29,48,0,58,23,66,
-191,255,80,255,29,48,0,58,27,66,191,255,70,255,29,48,
-0,58,32,70,175,255,191,255,58,255,64,6,127,0,138,7,
-225,112,6,208,7,200,0,18,1,114,35,134,4,0,194,129,
-80,119,0,0,65,18,2,6,240,255,246,245,26,56,38,6,
-168,15,133,0,190,255,44,118,32,230,38,1,31,218,38,6,
-132,215,255,255,31,58,128,255,204,24,224,81,154,253,0,234,
-35,22,4,0,221,17,2,103,0,0,97,98,202,45,0,82,
-29,6,240,255,129,13,253,134,40,0,32,118,160,180,206,129,
-48,87,17,0,224,81,202,5,66,7,0,0,197,29,138,111,
-7,0,109,106,194,5,66,7,0,0,213,21,42,23,105,0,
-63,6,120,173,1,0,2,22,24,0,34,95,0,0,34,103,
-5,0,202,89,11,48,108,0,127,90,219,5,177,5,127,82,
-169,5,29,216,65,234,29,6,240,255,182,205,38,6,132,215,
-255,255,128,255,130,25,224,81,146,13,38,6,216,15,133,0,
-32,62,6,1,0,66,190,255,20,109,127,218,146,29,35,94,
-4,0,219,89,75,7,0,0,27,48,3,56,191,255,168,235,
-10,224,224,225,250,5,26,48,27,56,25,64,128,255,226,0,
-10,224,28,6,220,254,178,157,28,6,218,254,130,157,38,6,
-228,15,133,0,190,255,76,117,28,80,74,6,255,112,128,7,
-225,16,6,216,32,238,10,1,38,6,132,215,255,255,31,58,
-128,255,226,23,224,81,154,253,27,48,191,255,166,126,10,16,
-127,18,146,53,2,6,240,255,0,82,129,13,226,126,40,0,
-32,110,160,180,205,121,47,87,17,0,10,224,60,23,105,0,
-27,56,2,22,200,0,34,87,0,0,34,103,5,0,220,81,
-10,48,63,6,74,174,1,0,108,0,27,56,10,232,29,64,
-38,6,252,15,133,0,190,255,218,116,60,23,105,0,63,6,
-116,174,1,0,2,22,192,0,34,55,0,0,34,87,5,0,
-220,49,106,0,38,6,132,215,255,255,128,255,154,24,224,81,
-146,13,38,6,44,16,133,0,32,62,6,1,0,66,190,255,
-44,108,224,233,170,13,1,50,251,55,192,0,36,62,132,140,
-32,70,246,0,191,255,164,233,29,80,64,6,255,16,156,7,
-225,243,6,224,7,184,99,71,21,0,56,6,132,215,255,255,
-1,138,67,143,3,0,24,48,31,58,128,255,24,23,224,81,
-186,253,28,56,23,64,38,6,104,16,133,0,190,255,84,116,
-0,18,28,6,240,255,129,13,252,118,40,0,32,102,160,180,
-204,113,46,23,17,0,2,208,0,18,23,6,240,255,129,13,
-247,142,40,0,32,126,160,180,207,137,49,23,17,0,2,216,
-224,209,178,5,224,217,138,29,163,119,3,0,224,113,130,21,
-67,7,3,0,24,48,128,255,238,23,224,81,146,13,38,6,
-24,11,133,0,32,62,6,1,0,66,190,255,128,107,32,86,
-10,1,128,7,124,2,59,23,105,0,0,234,2,22,80,0,
-34,87,0,0,34,111,5,0,219,81,10,48,63,6,100,175,
-1,0,109,0,97,82,186,5,32,238,35,1,58,23,105,0,
-35,71,21,0,2,22,136,0,34,87,0,0,35,54,4,0,
-218,81,10,56,34,103,5,0,63,6,144,175,1,0,108,0,
-195,239,4,0,178,5,32,238,35,1,224,233,242,21,163,87,
-3,0,224,81,130,21,67,7,3,0,24,48,128,255,104,23,
-224,81,146,13,38,6,24,11,133,0,32,62,6,1,0,66,
-190,255,250,106,29,80,128,7,248,1,59,23,105,0,63,6,
-230,175,1,0,2,22,176,0,34,87,0,0,34,143,5,0,
-219,81,10,48,113,0,10,48,244,55,66,2,190,255,166,178,
-59,23,105,0,10,200,2,22,184,0,34,87,0,0,25,56,
-219,81,10,48,34,103,5,0,63,6,16,176,1,0,108,0,
-25,95,3,0,1,178,235,183,192,0,25,48,28,56,128,255,
-0,3,0,218,154,23,7,0,97,18,178,5,98,18,154,37,
-32,54,88,1,190,255,64,212,10,216,224,217,154,13,38,6,
-156,16,133,0,32,62,115,16,0,66,190,255,112,106,28,48,
-27,56,191,255,176,226,59,127,1,0,15,6,214,255,146,13,
-38,6,156,16,133,0,32,62,117,16,0,66,190,255,78,106,
-58,23,105,0,35,63,21,0,2,22,208,0,34,87,0,0,
-25,64,218,81,10,48,34,119,5,0,63,6,146,176,1,0,
-110,0,10,232,25,48,190,255,4,178,163,111,3,0,224,105,
-130,21,67,7,3,0,24,48,128,255,108,22,224,81,146,13,
-38,6,24,11,133,0,32,62,6,1,0,66,190,255,254,105,
-224,233,202,5,23,48,191,255,54,222,224,233,218,13,22,48,
-36,62,132,140,32,70,241,0,191,255,112,231,28,48,22,56,
-128,255,54,2,10,232,224,233,186,77,224,217,146,77,35,54,
-24,0,39,6,221,221,51,51,128,255,62,2,0,50,128,255,
-128,2,99,87,9,0,224,81,154,13,38,6,156,16,133,0,
-32,62,165,16,0,66,190,255,164,105,35,54,24,0,128,255,
-40,2,224,81,178,29,35,63,9,0,35,54,24,0,32,70,
-68,2,0,74,128,255,26,2,35,55,9,0,128,255,74,2,
-224,81,202,13,38,6,172,16,133,0,190,255,230,113,35,55,
-9,0,224,49,178,5,128,255,40,2,35,55,9,0,27,56,
-128,255,46,2,35,63,9,0,35,54,24,0,32,70,68,2,
-0,74,128,255,4,2,35,55,9,0,190,255,234,210,27,48,
-190,255,228,210,28,48,191,255,70,219,29,56,38,6,56,16,
-133,0,190,255,158,113,163,127,3,0,224,121,130,21,67,7,
-3,0,24,48,128,255,112,21,224,81,146,13,38,6,24,11,
-133,0,32,62,6,1,0,66,190,255,2,105,29,80,92,6,
-255,243,142,7,225,240,7,208,8,200,9,192,32,238,10,1,
-6,216,191,255,222,122,10,16,127,18,186,5,128,7,34,1,
-2,6,240,255,0,82,129,13,226,118,40,0,32,102,160,180,
-204,113,46,87,17,0,10,224,1,90,99,95,18,0,99,215,
-9,0,99,7,13,0,99,207,5,0,99,7,22,0,99,7,
-16,0,195,15,22,0,191,255,184,141,10,120,111,7,9,0,
-42,6,36,64,1,0,111,87,5,0,32,134,244,1,111,7,
-29,0,111,7,33,0,27,64,111,135,21,0,1,114,111,119,
-0,0,99,127,1,0,207,47,2,0,60,23,105,0,24,72,
-2,22,248,0,34,87,0,0,3,56,220,81,10,48,34,111,
-5,0,63,6,106,178,1,0,109,0,10,232,224,233,138,29,
-36,23,33,175,35,55,1,0,38,95,0,0,224,89,202,5,
-38,239,12,0,213,13,36,87,33,175,162,81,10,6,12,254,
-167,245,191,255,4,140,99,7,1,0,32,238,22,16,224,233,
-234,37,35,119,1,0,1,106,60,23,105,0,110,111,0,0,
-2,22,0,1,34,87,0,0,27,64,220,81,10,48,3,56,
-34,103,5,0,63,6,204,178,1,0,108,0,10,232,224,233,
-234,13,35,23,1,0,2,88,43,87,0,0,224,81,218,253,
-34,135,12,0,224,129,178,5,32,238,22,16,35,23,1,0,
-224,17,226,5,98,7,0,0,2,48,128,255,192,27,29,80,
-78,6,255,240,128,7,6,88,6,88,128,7,128,7,33,6,
-252,69,129,0,97,0,33,6,88,102,128,0,97,0,33,6,
-66,112,128,0,97,0,33,6,250,114,128,0,97,0,33,6,
-128,117,128,0,97,0,33,6,110,23,129,0,97,0,33,6,
-246,24,129,0,97,0,33,6,4,28,129,0,97,0,33,6,
-114,27,129,0,97,0,33,6,238,187,128,0,97,0,33,6,
-0,188,128,0,97,0,33,6,32,193,128,0,97,0,33,6,
-54,193,128,0,97,0,33,6,200,26,129,0,97,0,33,6,
-86,192,129,0,97,0,33,6,142,192,129,0,97,0,33,6,
-196,192,129,0,97,0,33,6,40,193,129,0,97,0,33,6,
-156,193,129,0,97,0,128,7,97,0,6,232,61,54,28,0,
-0,58,32,70,144,0,190,255,114,111,61,142,28,0,93,7,
-23,0,125,143,25,0,64,6,127,0,128,7,225,112,9,200,
-6,232,125,71,16,0,125,63,18,0,221,135,20,0,0,226,
-61,223,16,0,224,201,162,29,61,126,28,0,28,16,232,23,
-72,2,194,121,61,143,18,0,61,110,28,0,194,105,109,143,
-24,0,209,217,61,142,28,0,61,135,16,0,209,17,98,135,
-26,0,111,7,21,0,221,7,20,0,29,48,28,56,27,64,
-128,255,120,0,10,16,251,17,226,5,29,48,128,255,60,0,
-0,82,197,13,194,209,224,201,210,5,29,48,28,56,128,255,
-242,0,65,226,98,226,214,205,26,80,64,6,255,112,0,18,
-2,136,232,143,72,2,38,118,28,0,206,137,113,63,61,0,
-65,18,98,18,230,245,127,0,128,7,225,16,6,216,0,226,
-0,234,27,48,29,56,128,255,104,0,29,136,232,143,72,2,
-59,118,28,0,206,137,113,7,61,0,202,225,65,234,98,234,
-150,245,28,80,64,6,255,16,128,7,225,16,6,224,7,232,
-8,216,0,50,0,58,190,255,234,149,10,16,224,17,210,21,
-60,118,28,0,232,239,72,2,221,113,60,102,28,0,221,97,
-108,223,36,0,60,134,28,0,208,233,125,7,38,0,110,23,
-33,0,34,87,24,0,165,5,0,82,64,6,255,16,128,7,
-225,48,7,232,232,239,72,2,6,216,59,134,28,0,221,129,
-48,231,33,0,0,210,224,225,162,13,60,215,24,0,28,48,
-1,58,190,255,84,150,28,48,190,255,104,150,59,118,28,0,
-221,113,110,7,33,0,59,102,28,0,221,97,108,7,36,0,
-59,142,28,0,209,233,125,7,38,0,26,80,64,6,255,48,
-128,7,225,240,7,208,232,215,72,2,6,200,57,126,28,0,
-218,121,47,223,33,0,57,87,16,0,59,223,29,0,57,239,
-18,0,27,16,181,13,162,95,5,0,171,81,10,192,212,5,
-34,23,13,0,2,216,165,5,203,193,224,81,223,245,216,233,
-1,82,149,13,162,95,5,0,171,233,224,233,199,5,34,23,
-13,0,65,82,224,233,255,245,10,48,244,55,66,2,190,255,
-4,173,10,224,57,126,28,0,218,121,111,231,69,0,57,239,
-18,0,165,45,224,217,154,13,38,6,108,17,133,0,32,62,
-118,1,0,66,190,255,6,101,24,80,59,23,1,0,201,82,
-194,81,187,23,5,0,184,17,226,233,195,5,162,233,201,18,
-197,5,29,16,201,18,162,233,124,7,1,0,124,7,5,0,
-124,87,13,0,124,23,17,0,124,87,9,0,59,223,13,0,
-28,230,20,0,0,194,224,233,239,213,57,118,28,0,206,209,
-58,55,69,0,57,63,18,0,0,66,191,255,224,159,64,6,
-255,240,128,7,33,0,38,119,25,0,46,23,65,0,2,128,
-150,130,201,37,152,18,225,29,39,87,1,0,38,111,5,0,
-39,95,5,0,38,103,1,0,237,89,234,5,236,81,202,5,
-128,255,94,3,149,29,224,65,178,13,46,103,65,0,140,102,
-128,0,110,103,65,0,32,94,144,176,203,55,0,0,0,82,
-181,13,224,65,186,5,0,82,245,5,224,65,194,5,128,255,
-158,0,165,5,0,82,64,6,63,0,128,7,225,241,7,224,
-60,223,5,0,60,215,1,0,252,191,9,0,6,192,56,238,
-28,0,0,202,61,23,65,0,2,128,150,130,137,53,61,55,
-1,0,61,63,5,0,23,64,218,65,225,103,0,0,219,97,
-231,97,209,37,187,5,230,65,163,37,56,95,5,0,56,87,
-1,0,235,217,171,29,177,5,234,209,249,21,253,87,37,0,
-198,81,225,127,0,0,199,121,239,217,155,21,177,5,234,209,
-233,13,152,18,177,5,1,82,133,21,28,48,190,255,186,159,
-221,255,66,0,234,253,181,5,0,82,245,5,29,238,72,0,
-65,202,98,202,134,205,0,82,64,6,255,241,128,7,225,112,
-7,224,252,223,9,0,60,63,5,0,6,232,61,207,16,0,
-60,55,1,0,25,64,25,72,191,74,191,255,160,61,10,208,
-186,201,187,201,125,207,12,0,25,104,237,0,224,105,222,13,
-61,23,16,0,2,96,193,98,186,97,236,217,199,5,0,82,
-128,7,74,2,2,216,186,217,61,127,25,0,207,239,66,0,
-146,13,28,48,190,255,66,159,61,119,25,0,206,239,66,0,
-202,253,60,103,1,0,60,111,5,0,252,87,9,0,204,81,
-1,98,125,103,14,0,125,87,1,0,225,135,0,0,205,129,
-125,135,5,0,27,104,218,105,125,111,10,0,61,23,25,0,
-60,87,1,0,60,95,5,0,98,87,1,0,98,95,5,0,
-64,86,48,0,98,87,65,0,221,199,20,0,242,13,224,209,
-218,13,61,135,25,0,61,63,18,0,208,7,67,0,48,55,
-69,0,32,71,181,176,191,255,20,158,61,111,25,0,124,223,
-36,0,45,23,33,0,124,215,38,0,45,95,69,0,124,23,
-33,0,124,95,41,0,205,199,67,0,178,13,61,135,18,0,
-124,135,24,0,61,127,16,0,220,7,67,0,124,127,26,0,
-61,119,25,0,110,215,38,0,110,223,36,0,46,95,33,0,
-107,7,26,0,61,87,12,0,224,81,159,37,14,128,48,127,
-65,0,46,6,128,0,64,0,14,121,112,127,65,0,32,110,
-144,176,205,55,0,0,29,103,23,0,65,98,204,102,1,0,
-93,103,23,0,130,13,61,135,25,0,16,134,72,0,125,135,
-25,0,213,5,61,126,28,0,125,127,25,0,61,119,12,0,
-224,113,182,5,128,7,22,1,61,111,25,0,205,239,66,0,
-146,13,28,48,190,255,34,158,61,103,25,0,204,239,66,0,
-202,253,60,111,5,0,61,79,25,0,60,103,1,0,27,120,
-191,122,27,112,204,113,225,135,0,0,208,121,205,121,105,127,
-5,0,105,119,1,0,64,134,48,0,252,95,9,0,105,135,
-65,0,139,217,221,199,20,0,210,13,61,127,25,0,61,63,
-18,0,207,7,67,0,47,55,69,0,32,71,181,176,191,255,
-12,157,61,103,25,0,124,223,48,0,44,23,33,0,124,7,
-50,0,44,87,69,0,124,23,45,0,124,87,53,0,204,199,
-67,0,178,13,61,127,18,0,124,127,24,0,61,119,16,0,
-220,7,67,0,124,119,26,0,61,111,25,0,109,7,38,0,
-109,223,36,0,45,87,33,0,106,7,26,0,61,23,16,0,
-187,17,125,23,12,0,125,223,10,0,226,0,224,17,239,37,
-224,17,146,13,38,6,124,17,133,0,32,62,77,3,0,66,
-190,255,106,97,61,103,25,0,42,6,128,0,64,0,44,95,
-65,0,29,135,23,0,10,89,108,95,65,0,65,130,208,134,
-1,0,93,135,23,0,226,5,12,110,72,0,125,111,25,0,
-213,5,61,102,28,0,125,103,25,0,60,23,57,0,43,6,
-250,58,1,0,98,95,5,0,1,82,64,6,255,112,128,7,
-225,16,7,224,6,232,61,87,12,0,252,223,9,0,10,16,
-226,217,167,13,61,135,16,0,194,129,240,217,199,5,0,82,
-128,7,248,1,10,216,61,119,25,0,61,87,10,0,46,23,
-33,0,124,223,36,0,46,103,69,0,124,23,33,0,124,103,
-41,0,124,87,38,0,206,199,67,0,178,13,61,87,18,0,
-124,87,24,0,61,135,16,0,220,7,67,0,124,135,26,0,
-61,103,1,0,61,111,5,0,252,87,9,0,204,81,225,135,
-0,0,205,129,61,127,10,0,125,135,5,0,219,121,1,114,
-125,87,1,0,125,127,10,0,125,119,14,0,61,103,25,0,
-236,95,37,0,219,89,108,95,36,0,61,135,12,0,252,87,
-9,0,170,129,125,135,12,0,240,0,224,129,183,5,128,7,
-90,1,12,112,46,111,65,0,44,6,128,0,64,0,12,105,
-110,111,65,0,32,94,144,176,203,55,0,0,29,87,23,0,
-65,82,202,86,1,0,93,87,23,0,226,5,61,119,25,0,
-14,110,72,0,181,5,61,110,28,0,61,103,12,0,125,111,
-25,0,224,97,182,5,128,7,18,1,205,239,66,0,146,13,
-28,48,190,255,4,156,61,87,25,0,202,239,66,0,202,253,
-60,103,1,0,27,120,191,122,27,112,204,113,225,135,0,0,
-208,121,60,111,5,0,61,79,25,0,205,121,105,119,1,0,
-105,127,5,0,64,118,48,0,252,135,9,0,105,119,65,0,
-144,217,221,199,20,0,210,13,61,111,25,0,61,63,18,0,
-205,7,67,0,45,55,69,0,32,71,181,176,191,255,238,154,
-61,87,25,0,124,223,48,0,42,23,33,0,124,7,50,0,
-42,127,69,0,124,23,45,0,124,127,53,0,202,199,67,0,
-178,13,61,111,18,0,124,111,24,0,61,103,16,0,220,7,
-67,0,124,103,26,0,61,95,25,0,107,7,38,0,107,223,
-36,0,43,127,33,0,111,7,26,0,61,23,16,0,187,17,
-125,23,12,0,125,223,10,0,226,0,224,17,239,37,224,17,
-146,13,38,6,140,17,133,0,32,62,215,3,0,66,190,255,
-76,95,61,87,25,0,47,6,128,0,64,0,42,135,65,0,
-29,119,23,0,15,129,106,135,65,0,65,114,206,118,1,0,
-93,119,23,0,226,5,10,94,72,0,125,95,25,0,213,5,
-61,86,28,0,125,87,25,0,60,23,57,0,48,6,250,58,
-1,0,98,135,5,0,1,82,64,6,255,16,130,7,225,48,
-7,216,187,0,6,232,61,230,28,0,1,138,99,143,1,0,
-31,50,190,255,72,167,0,210,60,23,65,0,224,217,162,13,
-98,218,154,21,136,18,249,13,29,48,28,56,128,255,108,0,
-165,13,2,120,150,122,249,5,152,18,209,5,29,48,28,56,
-128,255,88,0,28,230,72,0,65,210,98,210,230,229,99,218,
-170,29,61,23,25,0,34,23,65,0,2,136,150,138,185,21,
-152,18,145,21,61,111,14,0,224,105,210,5,125,7,14,0,
-0,18,165,5,1,18,224,17,226,5,61,63,25,0,29,48,
-128,255,24,0,35,103,1,0,224,97,210,5,99,7,1,0,
-190,255,178,166,66,6,255,48,128,7,225,0,7,232,221,231,
-66,0,154,13,38,6,156,17,133,0,32,62,91,4,0,66,
-190,255,74,94,61,231,33,0,224,225,154,13,38,6,156,17,
-133,0,32,62,94,4,0,66,190,255,50,94,221,199,67,0,
-146,13,221,247,66,0,194,5,220,199,43,0,178,5,221,135,
-67,0,61,143,65,0,48,6,1,0,128,0,16,137,125,143,
-65,0,128,127,221,176,224,121,194,5,29,48,191,255,126,79,
-221,191,64,0,191,255,10,131,106,7,9,0,32,118,232,3,
-106,119,21,0,1,106,106,111,0,0,32,102,16,0,106,103,
-2,0,43,6,60,67,1,0,106,95,5,0,106,239,29,0,
-125,87,57,0,60,143,26,0,61,23,36,0,226,137,186,253,
-29,48,61,63,57,0,0,66,0,74,190,255,252,147,64,6,
-255,0,128,7,97,0,0,234,253,54,176,0,46,6,56,101,
-148,0,206,49,191,255,130,246,65,234,29,6,240,255,214,245,
-64,6,127,0,127,0,132,7,225,112,6,224,7,216,8,208,
-9,200,0,234,0,18,226,86,176,0,47,6,56,101,148,0,
-207,81,42,119,173,0,224,113,186,5,10,232,213,5,65,18,
-2,6,240,255,150,245,224,233,138,13,60,23,1,0,224,17,
-194,5,32,86,3,16,229,37,59,55,17,0,35,62,4,0,
-3,64,190,255,34,186,29,48,35,63,5,0,35,71,1,0,
-26,72,191,255,56,246,121,87,1,0,224,81,146,21,1,98,
-125,103,173,0,29,48,27,56,191,255,166,246,60,23,5,0,
-124,239,1,0,65,18,124,23,5,0,0,82,181,5,32,86,
-18,1,68,6,255,112,128,7,225,0,6,232,8,224,124,7,
-1,0,224,57,186,29,61,55,1,0,224,49,242,21,191,255,
-138,246,60,23,1,0,61,55,1,0,202,17,124,23,1,0,
-191,255,182,245,61,23,1,0,98,7,173,0,61,23,5,0,
-125,7,1,0,95,18,125,23,5,0,0,82,64,6,255,0,
-128,7,127,0,128,7,193,16,6,232,0,218,229,87,64,0,
-224,7,96,1,32,143,193,184,10,224,95,138,96,143,193,184,
-61,135,57,0,61,127,49,0,224,129,178,13,15,16,97,18,
-130,93,98,18,226,85,125,7,57,0,125,7,49,0,149,85,
-224,121,242,77,61,119,53,0,224,113,242,5,125,7,53,0,
-3,106,125,111,49,0,213,69,61,95,45,0,11,16,194,18,
-34,87,65,184,125,7,49,0,224,81,34,22,64,184,194,13,
-42,23,37,0,98,239,33,0,106,239,37,0,125,87,33,0,
-125,23,37,0,229,45,98,239,1,0,32,143,53,183,125,239,
-33,0,61,135,65,0,125,239,37,0,16,137,32,23,41,183,
-96,143,53,183,224,17,234,5,96,239,41,183,96,95,61,183,
-133,29,32,127,61,183,239,89,201,21,34,87,61,0,96,95,
-61,183,234,89,233,13,34,119,45,0,238,81,130,13,34,103,
-65,0,32,111,57,183,12,105,96,111,57,183,96,239,41,183,
-252,47,32,0,32,87,37,183,32,95,41,183,235,81,226,5,
-36,143,253,133,224,137,170,5,1,218,27,80,64,6,223,16,
-128,7,97,0,32,255,37,183,229,87,64,0,224,7,96,1,
-10,232,63,23,33,0,63,127,45,0,255,17,178,21,15,136,
-194,138,113,23,65,184,32,103,57,183,63,111,33,0,224,97,
-96,111,41,183,242,5,63,87,65,0,42,88,75,97,96,103,
-57,183,32,23,61,183,239,17,233,5,194,18,34,103,65,184,
-96,103,41,183,253,47,32,0,32,95,41,183,255,89,178,5,
-128,255,100,9,64,6,127,0,128,7,225,16,6,248,7,216,
-229,87,64,0,224,7,96,1,63,143,9,0,10,224,224,137,
-242,5,17,134,255,255,127,135,9,0,0,250,165,77,224,217,
-242,69,32,239,37,183,125,255,109,0,47,6,190,251,129,0,
-63,23,13,0,125,127,105,0,224,17,194,21,125,23,113,0,
-63,111,13,0,45,111,117,0,125,111,117,0,63,95,13,0,
-43,95,117,0,107,239,113,0,63,87,13,0,106,239,117,0,
-245,5,127,239,13,0,125,239,117,0,125,239,113,0,63,143,
-17,0,6,130,65,138,127,143,17,0,1,122,125,135,49,0,
-32,119,193,184,125,127,57,0,65,114,96,119,193,184,125,223,
-77,0,252,47,32,0,127,218,210,5,61,54,76,0,128,255,
-28,0,29,48,128,255,56,9,61,87,133,0,213,5,13,250,
-252,47,32,0,31,80,64,6,255,16,33,6,122,244,129,0,
-97,0,128,7,225,0,6,248,229,87,64,0,224,7,96,1,
-63,239,13,0,10,224,224,233,146,61,61,23,113,0,226,233,
-202,5,127,7,13,0,245,13,127,23,13,0,61,143,113,0,
-61,135,117,0,113,135,117,0,61,127,117,0,61,119,113,0,
-111,119,113,0,63,111,17,0,32,103,193,184,95,106,127,111,
-17,0,125,7,105,0,65,98,96,103,193,184,252,47,32,0,
-61,95,101,0,224,89,226,5,61,54,76,0,128,255,50,0,
-181,5,125,7,77,0,125,7,133,0,29,48,191,255,88,253,
-224,81,178,13,128,255,16,8,133,13,63,87,9,0,65,82,
-127,87,9,0,252,47,32,0,0,82,64,6,255,0,33,6,
-84,248,129,0,97,0,128,7,225,240,6,248,7,216,8,208,
-9,192,35,207,29,0,229,87,64,0,224,7,96,1,10,224,
-63,119,9,0,218,142,2,0,91,113,224,137,242,5,251,113,
-186,5,0,234,133,13,7,234,229,5,224,113,178,5,0,234,
-165,5,7,234,224,233,234,13,63,103,9,0,129,210,120,103,
-1,0,249,85,63,143,9,0,59,80,74,137,127,143,9,0,
-133,85,224,201,210,77,32,239,37,183,48,6,58,5,130,0,
-125,135,105,0,125,255,109,0,125,199,125,0,125,223,121,0,
-63,23,17,0,125,215,129,0,224,17,194,21,125,23,113,0,
-63,119,17,0,46,119,117,0,125,119,117,0,63,103,17,0,
-44,103,117,0,108,239,113,0,63,95,17,0,107,239,117,0,
-245,5,127,239,17,0,125,239,117,0,125,239,113,0,63,87,
-21,0,7,138,65,82,127,87,21,0,1,130,125,143,49,0,
-32,127,193,184,125,135,57,0,65,122,96,127,193,184,125,207,
-77,0,252,47,32,0,127,202,210,5,61,54,76,0,191,255,
-108,254,29,48,128,255,136,7,61,87,133,0,213,5,7,234,
-252,47,32,0,29,80,64,6,255,240,128,7,225,243,6,248,
-7,232,8,216,229,87,64,0,224,7,96,1,10,224,130,218,
-63,127,9,0,137,13,93,121,127,127,9,0,252,47,32,0,
-128,7,50,2,29,121,127,127,9,0,63,23,17,0,63,95,
-21,0,224,17,186,5,128,7,10,2,97,90,154,85,2,232,
-61,87,121,0,63,143,9,0,221,207,128,0,130,13,74,137,
-234,137,186,5,0,18,133,13,7,18,229,5,81,81,178,5,
-0,18,165,5,7,18,224,17,250,53,63,127,9,0,61,135,
-125,0,112,127,1,0,221,199,128,0,146,13,61,103,121,0,
-63,95,9,0,44,104,77,89,127,95,9,0,127,7,17,0,
-127,7,21,0,32,87,193,184,125,7,105,0,65,82,96,87,
-193,184,252,47,32,0,61,143,101,0,224,137,226,5,61,54,
-76,0,191,255,60,254,181,5,125,7,77,0,125,7,133,0,
-29,48,191,255,98,251,224,81,186,5,128,7,136,1,128,255,
-22,6,128,7,128,1,252,47,32,0,128,7,120,1,2,208,
-26,232,127,7,17,0,0,178,0,186,63,207,21,0,32,135,
-193,184,63,223,9,0,65,130,96,135,193,184,252,47,32,0,
-229,87,64,0,224,7,96,1,63,127,13,0,10,224,224,121,
-178,13,127,7,13,0,63,207,21,0,63,119,9,0,26,232,
-14,217,224,233,130,85,61,119,129,0,61,95,121,0,206,110,
-2,0,146,13,11,96,91,97,235,97,186,5,0,18,133,13,
-7,18,229,5,91,89,178,5,0,18,165,5,7,18,61,199,
-113,0,224,17,218,53,61,87,125,0,129,114,106,223,1,0,
-153,13,61,127,121,0,63,119,9,0,47,128,80,113,127,119,
-9,0,61,23,113,0,226,233,186,5,0,210,229,13,253,209,
-170,5,2,208,61,111,117,0,98,111,117,0,61,103,117,0,
-61,95,113,0,108,95,113,0,63,87,21,0,125,7,105,0,
-95,82,127,87,21,0,125,7,113,0,125,7,133,0,224,177,
-202,5,29,176,29,184,197,5,119,239,113,0,29,184,24,232,
-95,202,218,157,127,215,17,0,252,47,32,0,22,232,229,29,
-61,143,101,0,61,199,113,0,224,137,226,5,61,54,76,0,
-191,255,14,253,181,5,125,7,77,0,229,87,64,0,224,7,
-96,1,32,135,193,184,10,224,65,130,96,135,193,184,252,47,
-32,0,29,48,191,255,32,250,24,232,224,233,170,229,229,87,
-64,0,224,7,96,1,32,127,193,184,10,224,95,122,96,127,
-193,184,252,47,32,0,32,111,37,183,32,119,41,183,238,105,
-146,21,36,103,253,133,224,97,218,13,128,255,170,4,165,13,
-224,89,226,5,63,87,13,0,65,82,127,87,13,0,252,47,
-32,0,0,82,64,6,255,243,128,7,225,48,6,248,7,208,
-8,216,229,87,64,0,224,7,96,1,63,143,9,0,10,224,
-224,137,178,21,63,23,17,0,17,134,255,255,2,126,4,0,
-122,127,1,0,34,119,1,0,127,119,17,0,127,135,9,0,
-98,255,1,0,0,250,213,77,224,217,146,77,32,239,37,183,
-125,215,125,0,125,255,109,0,45,6,170,6,130,0,63,23,
-33,0,125,111,105,0,224,17,194,21,125,23,113,0,63,95,
-33,0,43,95,117,0,125,95,117,0,63,143,33,0,49,143,
-117,0,113,239,113,0,63,135,33,0,112,239,117,0,245,5,
-127,239,33,0,125,239,117,0,125,239,113,0,63,127,37,0,
-8,114,65,122,127,127,37,0,1,106,125,119,49,0,32,103,
-193,184,125,111,57,0,65,98,96,103,193,184,125,223,77,0,
-252,47,32,0,127,218,210,5,61,54,76,0,191,255,46,251,
-29,48,128,255,74,4,61,87,133,0,229,5,32,254,16,0,
-252,47,32,0,31,80,64,6,255,48,128,7,225,0,6,224,
-229,87,64,0,224,7,96,1,60,23,253,255,10,248,34,239,
-33,0,28,86,252,255,224,233,210,61,61,87,113,0,234,233,
-202,5,98,7,33,0,245,13,98,87,33,0,61,143,113,0,
-61,135,117,0,113,135,117,0,61,127,117,0,61,119,113,0,
-111,119,113,0,34,111,37,0,32,103,193,184,95,106,98,111,
-37,0,125,7,105,0,65,98,96,103,193,184,255,47,32,0,
-61,95,125,0,61,87,101,0,107,231,1,0,224,81,226,5,
-61,54,76,0,191,255,58,251,181,5,125,7,77,0,125,7,
-133,0,29,48,191,255,96,248,224,81,146,21,128,255,24,3,
-229,13,34,143,17,0,34,135,9,0,124,143,253,255,65,130,
-98,87,17,0,98,135,9,0,255,47,32,0,0,82,64,6,
-255,0,128,7,225,16,6,248,7,216,229,87,64,0,224,7,
-96,1,63,143,9,0,10,224,224,137,138,29,1,130,32,23,
-37,183,127,135,9,0,63,127,17,0,127,23,13,0,224,121,
-178,13,224,17,146,13,34,119,45,0,127,119,21,0,34,111,
-61,0,127,111,25,0,0,250,213,109,63,103,13,0,32,23,
-37,183,226,97,138,13,63,95,9,0,65,90,127,95,9,0,
-0,250,133,101,224,217,194,93,2,232,125,255,109,0,42,6,
-10,16,130,0,63,23,29,0,125,87,105,0,224,17,194,21,
-125,23,113,0,63,135,29,0,48,135,117,0,125,135,117,0,
-63,119,29,0,46,119,117,0,110,239,113,0,63,111,29,0,
-109,239,117,0,245,5,127,239,29,0,125,239,117,0,125,239,
-113,0,63,103,33,0,13,90,65,98,127,103,33,0,1,82,
-125,95,49,0,32,143,193,184,125,87,57,0,65,138,96,143,
-193,184,125,223,77,0,252,47,32,0,63,135,17,0,224,129,
-178,21,63,55,13,0,224,49,242,13,32,23,37,183,224,17,
-178,13,38,127,45,0,34,23,45,0,226,121,211,5,2,56,
-2,64,128,255,42,0,127,218,210,5,61,54,76,0,191,255,
-76,249,29,48,128,255,104,2,61,87,133,0,229,5,32,254,
-29,0,252,47,32,0,31,80,64,6,255,16,33,6,162,14,
-130,0,97,0,128,7,225,112,6,232,229,87,64,0,224,7,
-96,1,61,143,9,0,10,248,224,137,186,5,128,7,148,1,
-61,127,13,0,32,135,37,183,240,121,178,5,128,7,132,1,
-61,119,9,0,95,114,125,119,9,0,226,5,255,47,32,0,
-0,82,128,7,118,1,61,103,17,0,224,97,146,29,61,95,
-29,0,224,89,210,21,32,87,193,184,65,82,96,87,193,184,
-255,47,32,0,29,48,128,255,86,1,229,87,64,0,224,7,
-96,1,32,143,193,184,10,248,95,138,96,143,193,184,61,23,
-29,0,224,17,234,53,32,135,193,184,65,130,96,135,193,184,
-255,47,32,0,61,127,17,0,224,121,146,21,32,23,37,183,
-224,17,210,13,34,119,45,0,61,63,21,0,231,113,242,5,
-61,71,25,0,61,55,13,0,191,255,68,255,229,87,64,0,
-224,7,96,1,32,111,193,184,10,248,95,106,96,111,193,184,
-255,47,32,0,32,95,37,183,32,103,41,183,236,89,242,5,
-36,87,253,133,224,81,186,5,128,255,220,0,0,82,213,101,
-61,143,17,0,2,224,224,137,242,13,61,215,21,0,60,135,
-45,0,125,135,21,0,61,207,25,0,60,127,61,0,61,223,
-13,0,125,127,25,0,125,231,13,0,1,114,60,23,113,0,
-125,119,9,0,226,225,202,5,125,7,29,0,245,13,125,23,
-29,0,60,111,113,0,60,103,117,0,109,103,117,0,60,95,
-117,0,60,87,113,0,107,87,113,0,61,143,33,0,32,135,
-193,184,95,138,125,143,33,0,124,7,105,0,65,130,96,135,
-193,184,255,47,32,0,60,127,101,0,224,121,226,5,60,54,
-76,0,191,255,92,248,181,5,124,7,77,0,124,7,133,0,
-61,119,17,0,224,113,194,13,224,217,162,13,59,111,45,0,
-250,105,226,5,27,48,26,56,25,64,191,255,98,254,28,48,
-191,255,100,245,224,81,178,5,128,255,28,0,0,82,213,5,
-255,47,32,0,32,86,30,0,64,6,255,112,33,6,248,13,
-130,0,97,0,229,103,64,0,3,30,196,255,0,106,99,111,
-1,0,99,47,5,0,99,167,9,0,99,175,13,0,99,183,
-17,0,99,191,21,0,99,199,25,0,99,207,29,0,99,215,
-33,0,99,223,37,0,99,231,41,0,99,239,45,0,99,247,
-49,0,99,255,53,0,99,103,57,0,44,6,36,183,255,255,
-44,55,1,0,45,6,196,29,133,0,45,119,1,0,224,7,
-96,1,102,31,9,0,47,6,32,183,255,255,47,31,1,0,
-224,113,186,5,128,7,16,0,38,127,29,0,109,7,1,0,
-102,127,25,0,108,7,1,0,128,7,88,14,128,7,97,0,
-6,248,229,87,64,0,224,7,96,1,32,143,193,184,10,232,
-95,138,63,135,57,0,96,143,193,184,224,129,186,5,128,7,
-168,1,127,7,57,0,63,87,33,0,63,23,45,0,255,81,
-146,53,63,127,37,0,106,127,37,0,63,119,37,0,63,111,
-33,0,110,111,33,0,194,18,34,143,65,184,255,137,34,22,
-64,184,178,5,128,7,114,1,63,135,33,0,32,127,57,183,
-98,135,1,0,224,121,242,5,63,111,65,0,45,112,78,121,
-96,127,57,183,32,95,41,183,235,249,178,5,128,7,74,1,
-32,135,61,183,194,130,48,111,65,184,96,111,41,183,128,7,
-56,1,194,18,63,135,65,0,98,7,65,184,32,127,53,183,
-48,16,66,121,32,119,57,183,96,127,53,183,224,113,194,5,
-66,113,96,119,57,183,32,23,53,183,194,102,255,0,194,5,
-2,112,0,18,181,45,194,94,0,255,210,5,2,112,136,114,
-8,18,197,37,64,142,255,0,2,80,81,81,226,5,2,112,
-144,114,32,22,16,0,165,29,64,126,0,255,2,128,79,129,
-226,5,2,112,152,114,32,22,24,0,133,21,32,118,32,0,
-96,119,61,183,96,7,41,183,253,47,32,0,36,111,253,133,
-224,105,138,109,191,255,96,254,213,101,206,102,255,0,140,143,
-65,183,194,137,32,127,41,183,96,143,61,183,239,249,202,77,
-194,138,49,143,65,184,32,135,57,183,96,143,41,183,224,129,
-178,69,32,127,193,184,65,122,96,127,193,184,253,47,32,0,
-229,87,64,0,224,7,96,1,32,23,57,183,32,119,193,184,
-10,232,95,114,96,119,193,184,194,110,255,0,2,112,178,5,
-0,18,165,21,194,102,0,255,194,5,136,114,8,18,197,13,
-64,86,255,0,74,17,210,5,144,114,32,22,16,0,197,5,
-152,114,32,22,24,0,206,142,255,0,145,119,65,183,206,17,
-194,18,34,23,65,184,32,135,61,183,34,143,61,0,241,129,
-177,13,96,23,41,183,34,119,65,0,32,111,57,183,46,120,
-79,105,96,111,57,183,253,47,32,0,32,95,37,183,32,103,
-41,183,236,89,242,5,36,87,253,133,224,81,186,5,191,255,
-150,253,64,6,127,0,128,7,225,0,6,232,229,87,64,0,
-224,7,96,1,61,23,17,0,10,224,224,17,210,5,2,48,
-1,58,190,255,84,95,32,135,49,176,61,143,9,0,113,135,
-5,0,96,239,49,176,61,127,24,0,32,119,53,176,175,113,
-96,119,53,176,252,47,32,0,64,6,255,0,194,50,36,118,
-172,138,206,49,38,79,1,0,39,87,18,0,32,110,223,255,
-10,16,77,17,234,17,178,5,130,22,160,0,194,102,0,1,
-130,0,170,37,7,95,8,0,200,90,11,17,105,23,16,0,
-7,119,12,0,39,103,10,0,200,114,140,0,14,97,105,103,
-18,0,7,143,14,0,167,127,13,0,200,138,17,121,105,127,
-20,0,167,87,15,0,7,103,17,0,135,119,17,0,200,98,
-12,81,10,113,165,53,7,103,9,0,200,98,140,102,12,0,
-105,103,16,0,7,143,15,0,39,127,10,0,200,138,168,122,
-17,121,105,127,18,0,105,7,20,0,105,7,22,0,7,103,
-8,0,200,98,12,17,105,23,16,0,7,127,12,0,39,111,
-10,0,200,122,141,0,15,105,105,111,18,0,7,87,14,0,
-167,135,13,0,200,82,10,129,105,135,20,0,7,111,17,0,
-135,119,17,0,200,106,13,113,105,119,22,0,127,0,107,50,
-183,5,1,82,245,21,194,50,36,118,172,138,206,49,38,23,
-1,0,194,255,24,0,130,13,32,110,162,0,98,111,16,0,
-98,7,22,0,229,5,194,239,0,0,186,5,1,82,165,5,
-0,82,127,0,128,7,225,16,6,248,63,239,9,0,63,231,
-12,0,229,87,64,0,224,7,96,1,10,216,224,225,226,21,
-61,135,12,0,224,129,186,13,63,127,16,0,125,127,16,0,
-63,119,14,0,125,119,14,0,125,231,12,0,255,111,19,0,
-253,95,19,0,13,89,125,95,18,0,63,231,2,0,31,48,
-128,255,218,1,61,143,2,0,28,137,125,143,2,0,61,23,
-0,0,95,18,226,0,125,23,0,0,224,17,138,13,29,48,
-61,127,5,0,63,6,12,205,1,0,111,0,251,47,32,0,
-64,6,255,16,130,7,225,48,6,232,61,143,12,0,224,137,
-178,5,128,7,18,1,229,87,64,0,224,7,96,1,61,231,
-29,0,10,208,220,199,64,0,178,21,220,231,66,0,130,21,
-60,223,33,0,1,58,251,135,43,0,208,134,244,255,123,135,
-42,0,27,48,190,255,2,126,27,48,190,255,22,126,60,55,
-61,0,28,56,191,255,210,158,28,48,191,255,102,159,61,23,
-24,0,194,118,0,128,14,6,0,128,234,29,32,102,16,0,
-194,110,255,127,125,111,24,0,61,22,12,0,98,7,1,0,
-125,103,2,0,68,18,98,7,1,0,61,55,24,0,48,6,
-176,137,141,0,6,88,194,90,208,89,43,127,1,0,224,121,
-178,5,191,255,68,118,221,199,2,0,170,61,61,231,24,0,
-149,21,229,87,64,0,32,22,159,255,10,232,29,248,66,249,
-255,47,32,0,29,248,255,47,32,0,4,119,80,139,224,113,
-250,37,51,6,5,0,32,0,211,255,0,0,186,237,229,87,
-64,0,224,7,96,1,32,111,185,176,99,87,1,0,95,106,
-96,111,185,176,202,13,32,103,13,177,224,97,138,13,64,86,
-0,0,43,6,96,0,0,0,74,95,8,240,35,255,1,0,
-255,47,32,0,50,6,54,0,32,0,114,231,0,0,250,47,
-32,0,181,5,191,255,186,117,66,6,255,48,128,7,225,112,
-6,224,60,239,9,0,7,200,60,223,12,0,229,87,64,0,
-224,7,96,1,10,208,224,217,130,29,61,135,12,0,224,129,
-186,13,60,127,16,0,125,127,16,0,60,119,14,0,125,119,
-14,0,125,223,12,0,252,111,19,0,253,95,19,0,13,89,
-125,95,18,0,124,7,12,0,224,201,210,5,124,7,14,0,
-124,7,16,0,61,23,0,0,95,18,226,0,125,23,0,0,
-224,17,138,13,29,48,61,143,5,0,63,6,178,206,1,0,
-113,0,250,47,32,0,64,6,255,112,128,7,225,0,6,232,
-60,6,232,233,142,0,252,233,153,13,29,64,38,6,148,240,
-132,0,32,62,194,0,190,255,228,75,47,6,0,158,2,0,
-207,225,252,233,145,13,29,64,38,6,148,240,132,0,32,62,
-195,0,190,255,200,75,125,7,12,0,125,7,14,0,125,7,
-18,0,125,7,2,0,229,87,64,0,224,7,96,1,32,111,
-233,176,125,111,25,0,96,239,233,176,32,103,225,176,10,248,
-95,98,96,103,225,176,255,47,32,0,64,6,255,0,6,16,
-197,18,47,6,0,4,32,0,207,17,39,127,26,0,207,118,
-8,1,210,5,39,111,17,0,98,111,9,0,207,102,0,2,
-210,5,39,95,21,0,98,95,13,0,207,86,8,3,250,5,
-64,142,0,128,98,143,13,0,143,126,0,2,39,87,24,0,
-98,127,18,0,201,82,207,126,132,0,130,21,98,87,21,0,
-132,119,153,140,224,113,210,5,39,87,13,0,98,87,5,0,
-39,87,9,0,98,87,1,0,181,5,98,87,25,0,127,0,
-128,7,225,48,32,23,193,223,224,17,146,37,50,6,0,3,
-32,0,50,231,1,0,66,225,162,29,0,234,32,222,104,177,
-1,210,245,13,26,16,253,23,192,0,2,120,92,121,226,5,
-34,112,78,225,27,48,128,255,220,0,27,222,32,0,65,234,
-29,6,238,255,142,229,224,225,234,237,213,221,64,86,0,0,
-43,6,48,0,0,0,74,95,144,244,64,86,0,0,202,191,
-32,241,64,6,255,48,128,7,225,0,6,232,197,234,32,126,
-104,177,207,233,61,231,5,0,224,225,162,77,191,255,66,252,
-224,81,226,69,32,119,169,179,224,113,242,5,29,48,0,58,
-191,255,34,150,224,81,202,61,220,199,33,0,194,21,36,23,
-224,139,95,18,226,0,100,23,224,139,224,17,202,13,132,103,
-233,139,224,97,130,13,38,6,144,250,132,0,190,255,212,82,
-191,255,246,115,29,95,23,0,224,89,210,29,29,87,23,0,
-98,82,210,13,29,143,23,0,99,138,146,13,38,6,164,250,
-132,0,32,62,79,6,0,66,190,255,50,74,29,135,23,0,
-99,130,218,5,4,122,93,127,23,0,165,13,29,119,23,0,
-98,114,226,5,29,48,28,56,0,66,191,255,38,149,64,6,
-255,0,128,7,225,241,6,224,60,239,9,0,28,223,22,0,
-58,6,0,4,32,0,28,143,23,0,0,202,224,137,146,21,
-1,106,27,128,197,130,218,129,112,7,30,0,251,111,192,0,
-32,87,193,223,45,88,75,81,96,87,193,223,128,7,46,2,
-0,194,128,7,170,1,29,184,61,239,5,0,29,143,34,0,
-98,138,250,109,32,135,169,179,224,129,146,13,28,48,29,56,
-191,255,66,149,224,81,178,5,128,7,2,2,27,16,197,18,
-2,112,218,113,206,223,31,0,202,13,101,202,174,13,124,239,
-9,0,27,48,29,56,191,255,248,253,65,202,128,7,96,1,
-101,202,134,21,218,17,4,98,98,103,30,0,1,90,32,143,
-193,223,251,95,192,0,11,137,96,143,193,223,23,232,128,7,
-74,1,2,128,218,129,208,231,31,0,154,61,60,127,1,0,
-239,233,242,29,61,87,5,0,10,87,34,0,99,82,146,29,
+63,6,204,163,1,0,112,0,31,82,165,85,123,7,32,0,
+196,239,156,140,194,45,61,23,105,0,3,56,2,22,128,0,
+34,87,0,0,34,127,5,0,221,81,10,48,63,6,248,163,
+1,0,111,0,35,119,1,0,10,16,224,113,162,13,224,17,
+138,13,28,64,8,50,39,6,204,24,133,0,191,255,238,19,
+61,23,105,0,63,6,48,164,1,0,2,22,120,0,34,87,
+0,0,34,111,5,0,221,81,10,48,109,0,61,23,105,0,
+91,7,35,0,2,22,24,0,34,87,0,0,91,7,36,0,
+221,81,10,48,34,103,5,0,63,6,84,164,1,0,108,0,
+123,95,25,0,123,87,21,0,36,95,142,140,123,239,17,0,
+65,90,100,95,142,140,28,48,128,255,182,4,28,80,66,6,
+255,48,148,7,225,0,6,232,7,224,157,23,7,0,97,18,
+226,5,98,18,194,5,0,82,128,7,20,1,61,23,105,0,
+99,7,1,0,2,22,64,1,34,87,0,0,3,56,221,81,
+10,48,34,127,5,0,63,6,178,164,1,0,111,0,224,81,
+178,5,0,82,197,117,35,54,8,0,39,6,221,221,51,51,
+128,255,156,16,35,54,8,0,128,255,164,16,224,81,186,5,
+0,82,213,101,0,50,128,255,206,16,99,87,5,0,224,81,
+154,13,38,6,72,25,133,0,32,62,105,12,0,66,190,255,
+200,117,35,63,5,0,35,54,8,0,32,70,68,2,0,74,
+128,255,124,16,35,63,5,0,39,63,2,0,38,6,88,25,
+133,0,190,255,26,126,35,55,5,0,128,255,146,16,224,81,
+130,53,35,55,5,0,28,56,128,255,156,16,35,23,5,0,
+34,103,2,0,10,224,236,225,234,5,2,48,190,255,110,146,
+0,82,213,45,38,6,28,25,133,0,190,255,226,125,29,48,
+128,255,252,15,224,81,250,13,35,55,5,0,28,56,128,255,
+94,16,35,63,5,0,35,54,8,0,32,70,68,2,0,74,
+128,255,4,16,35,55,5,0,190,255,50,146,1,82,245,13,
+38,6,136,25,133,0,190,255,166,125,35,54,8,0,128,255,
+214,15,35,55,5,0,190,255,20,146,0,82,84,6,255,0,
+128,7,33,0,0,18,36,143,153,140,196,55,156,140,224,137,
+226,29,128,255,102,8,224,81,234,23,0,0,138,29,36,86,
+188,172,43,6,36,26,133,0,8,98,65,82,10,111,255,255,
+65,90,11,119,255,255,13,16,174,17,218,5,224,105,178,5,
+95,98,202,245,224,17,234,23,0,0,194,69,224,17,194,13,
+38,6,192,25,133,0,190,255,54,125,32,54,65,0,37,62,
+165,131,191,255,248,17,36,54,188,172,0,58,32,70,112,2,
+190,255,20,125,36,54,188,172,39,6,36,26,133,0,8,66,
+191,255,128,106,36,86,200,173,36,150,196,173,114,87,1,0,
+0,18,32,110,255,15,2,136,196,138,36,118,196,172,206,137,
+113,111,0,0,65,18,2,6,240,255,198,245,128,255,204,7,
+36,150,40,175,50,23,1,0,170,17,36,150,40,175,114,23,
+1,0,38,6,48,26,133,0,196,183,156,140,190,255,192,124,
+229,5,38,6,248,25,133,0,190,255,180,124,64,6,63,0,
+128,7,97,0,36,86,196,172,6,16,196,18,36,134,196,172,
+39,239,1,0,194,129,112,239,5,0,36,118,196,172,39,103,
+5,0,194,113,110,103,9,0,36,150,196,173,50,55,1,0,
+202,17,98,55,13,0,72,58,29,64,191,255,230,105,36,150,
+196,173,50,119,1,0,36,150,196,173,221,113,114,119,1,0,
+128,255,72,7,36,150,40,175,50,23,1,0,170,17,36,150,
+40,175,114,23,1,0,36,102,200,173,36,150,196,173,50,95,
+1,0,12,110,96,1,237,89,163,13,38,6,76,26,133,0,
+32,62,222,12,0,66,190,255,176,115,224,81,64,6,127,0,
+128,7,225,48,196,50,36,22,196,172,198,17,34,215,5,0,
+36,110,196,172,98,7,5,0,198,105,109,7,9,0,36,134,
+196,172,198,129,48,223,13,0,26,224,219,225,36,86,196,172,
+202,49,102,7,13,0,181,77,0,234,29,136,196,138,36,118,
+196,172,206,137,49,111,13,0,252,105,210,5,65,234,29,6,
+240,255,198,245,29,6,240,255,150,13,38,6,92,26,133,0,
+32,62,8,13,0,66,190,255,64,115,196,234,36,94,196,172,
+221,89,36,134,196,172,208,233,43,143,5,0,125,223,13,0,
+17,128,224,129,162,37,27,80,28,16,16,88,194,89,10,120,
+162,121,11,112,162,113,238,121,139,21,16,104,202,105,13,86,
+255,255,11,22,255,255,95,18,2,103,1,0,95,82,74,103,
+1,0,95,130,154,253,149,13,65,18,2,95,255,255,65,82,
+74,95,255,255,95,130,154,253,209,225,209,217,36,150,196,173,
+50,135,1,0,240,225,145,181,36,150,196,173,50,119,1,0,
+36,150,196,173,186,113,114,119,1,0,128,255,30,6,36,150,
+40,175,50,23,1,0,36,150,40,175,170,17,114,23,1,0,
+36,150,196,173,50,103,1,0,36,110,200,173,237,97,169,13,
+38,6,92,26,133,0,32,62,18,13,0,66,190,255,138,114,
+224,81,64,6,255,48,0,18,2,80,196,82,36,134,196,172,
+202,129,48,119,13,0,224,113,242,37,36,118,196,172,202,113,
+46,103,5,0,38,127,1,0,239,97,234,29,38,87,5,0,
+46,95,9,0,234,89,138,29,46,103,13,0,38,110,8,0,
+0,82,15,88,224,89,194,13,65,98,12,143,255,255,65,106,
+13,135,255,255,17,80,176,81,186,5,95,90,234,245,224,81,
+186,5,2,80,229,5,65,18,2,6,240,255,230,205,31,82,
+127,0,6,16,229,13,194,142,15,0,196,138,36,110,196,172,
+205,137,49,103,13,0,224,97,186,5,2,80,245,5,65,18,
+6,94,16,0,235,17,129,245,31,82,127,0,130,7,225,0,
+6,224,0,234,60,23,105,0,29,64,2,22,136,0,34,87,
+0,0,3,48,220,81,10,56,34,143,5,0,63,6,248,168,
+1,0,113,0,195,199,0,0,218,5,65,234,29,6,240,255,
+166,237,29,6,240,255,150,13,38,6,108,26,133,0,32,62,
+114,13,0,66,190,255,162,113,29,80,66,6,255,0,128,7,
+33,0,31,58,6,22,255,255,165,21,226,134,40,0,32,118,
+160,180,206,129,48,111,17,0,224,105,130,13,196,18,36,142,
+196,172,209,17,226,63,1,0,197,5,95,18,127,18,239,237,
+128,255,8,0,64,6,63,0,128,7,225,16,6,232,253,134,
+40,0,32,118,160,180,206,129,48,87,17,0,7,216,224,81,
+202,5,32,230,255,15,229,29,0,18,29,6,240,255,161,5,
+10,16,2,224,224,225,154,13,38,6,124,26,133,0,32,62,
+170,13,0,66,190,255,34,113,156,95,7,0,111,90,138,13,
+28,48,191,255,42,255,10,230,1,0,198,226,181,5,27,230,
+1,0,196,234,36,126,196,172,207,233,125,231,0,0,128,255,
+90,4,36,150,40,175,50,23,1,0,170,17,36,150,40,175,
+114,23,1,0,28,80,64,6,255,16,128,7,225,0,6,6,
+240,255,201,5,32,86,10,1,181,61,7,6,0,240,185,5,
+32,62,255,15,6,232,196,234,36,126,196,172,221,121,111,63,
+0,0,0,18,6,6,240,255,129,13,230,94,40,0,32,142,
+160,180,209,89,43,23,17,0,2,224,224,225,154,13,38,6,
+140,26,133,0,32,62,218,13,0,66,190,255,140,112,156,135,
+7,0,16,6,192,255,138,13,36,118,196,172,206,233,32,110,
+254,15,125,111,0,0,128,255,210,3,36,150,40,175,50,23,
+1,0,170,17,36,150,40,175,114,23,1,0,0,82,64,6,
+255,0,6,6,240,255,161,13,230,126,40,0,32,110,160,180,
+205,121,47,103,17,0,224,97,202,5,32,86,255,15,245,5,
+196,50,36,134,196,172,208,49,230,87,1,0,127,0,136,7,
+33,0,196,247,156,140,186,45,0,106,13,16,197,29,2,78,
+255,255,180,29,13,80,9,136,195,137,17,135,0,0,196,82,
+16,120,196,122,36,102,196,172,204,121,239,95,1,0,36,126,
+196,172,207,81,234,119,1,0,238,89,243,5,195,17,66,135,
+0,0,9,16,224,17,207,229,195,17,66,111,0,0,65,106,
+13,6,240,255,182,221,3,48,128,255,142,0,72,6,63,0,
+128,7,225,16,0,218,38,6,132,215,255,255,31,58,128,255,
+46,29,224,81,154,253,0,234,29,136,196,138,36,118,196,172,
+206,137,49,111,13,0,224,105,146,29,253,230,40,0,32,86,
+160,180,202,225,60,143,17,0,224,137,138,21,1,130,253,135,
+192,0,16,217,0,50,0,58,190,255,224,217,36,119,142,140,
+124,87,17,0,65,114,100,119,142,140,65,234,29,6,240,255,
+201,221,38,6,132,215,255,255,128,255,6,30,224,81,146,13,
+38,6,156,26,133,0,32,62,6,1,0,66,190,255,74,111,
+27,80,64,6,255,16,130,7,225,48,6,224,36,63,142,140,
+38,6,168,26,133,0,190,255,166,119,38,6,240,26,133,0,
+190,255,156,119,0,234,29,128,220,129,16,111,0,0,36,94,
+196,172,196,106,203,105,237,63,1,0,37,54,176,131,190,255,
+126,119,65,234,29,6,240,255,246,237,38,6,216,26,133,0,
+190,255,108,119,0,234,29,136,220,137,17,63,0,0,37,54,
+168,131,190,255,90,119,65,234,29,6,240,255,214,245,38,6,
+228,26,133,0,190,255,72,119,0,234,29,56,37,54,168,131,
+190,255,60,119,65,234,29,6,240,255,134,253,37,54,172,131,
+190,255,44,119,0,218,0,234,29,120,220,121,15,119,0,0,
+14,6,240,255,153,13,38,6,252,26,133,0,32,62,181,14,
+0,66,190,255,148,110,29,104,220,105,13,103,0,0,1,90,
+236,95,192,0,11,217,65,234,29,6,240,255,230,229,245,217,
+146,13,38,6,252,26,133,0,32,62,184,14,0,66,190,255,
+104,110,1,138,67,143,3,0,38,6,132,215,255,255,31,58,
+128,255,204,27,224,81,154,253,32,54,128,2,190,255,202,182,
+10,216,32,54,0,1,190,255,192,182,10,208,0,74,9,128,
+232,135,68,2,219,129,16,112,9,104,237,0,237,102,40,0,
+32,86,160,180,12,88,202,89,11,136,17,126,40,0,49,111,
+1,0,112,111,1,0,68,138,68,130,241,121,154,253,9,16,
+196,18,2,120,36,142,196,172,209,17,34,119,1,0,218,121,
+111,119,1,0,34,111,5,0,111,111,5,0,34,103,9,0,
+111,103,9,0,65,74,34,143,13,0,9,6,240,255,111,143,
+13,0,230,205,0,234,253,62,40,0,32,118,160,180,29,104,
+220,105,13,95,0,0,206,57,235,102,40,0,7,128,12,80,
+219,81,10,136,17,126,40,0,49,119,1,0,112,119,1,0,
+68,138,68,130,241,121,154,253,71,239,34,0,0,18,29,6,
+240,255,241,5,253,22,120,4,42,6,24,41,148,0,202,17,
+103,23,13,0,2,48,190,255,170,126,29,120,196,122,29,104,
+220,105,13,87,0,0,36,118,196,172,196,82,218,81,42,111,
+1,0,206,121,111,111,1,0,42,103,5,0,111,103,5,0,
+42,95,9,0,111,95,9,0,65,234,42,87,13,0,29,6,
+240,255,111,87,13,0,134,189,27,48,190,255,196,181,26,48,
+190,255,190,181,163,143,3,0,224,137,162,21,67,7,3,0,
+38,6,132,215,255,255,128,255,200,27,224,81,146,13,38,6,
+148,22,133,0,32,62,6,1,0,66,190,255,12,109,66,6,
+255,48,128,7,97,0,134,0,224,49,194,21,38,6,12,27,
+133,0,190,255,106,117,0,234,29,56,37,54,184,131,190,255,
+94,117,65,234,29,6,240,255,134,253,37,54,192,131,190,255,
+78,117,38,6,24,27,133,0,190,255,68,117,0,234,29,128,
+196,130,36,110,196,172,205,129,240,63,1,0,37,54,196,131,
+190,255,44,117,65,234,29,6,240,255,166,245,37,54,192,131,
+190,255,28,117,64,6,127,0,0,82,36,22,188,172,213,5,
+34,143,1,0,68,18,209,81,36,126,40,175,15,134,4,0,
+240,17,241,245,127,0,130,7,225,16,6,232,7,224,188,0,
+8,216,187,0,1,138,67,143,3,0,38,6,132,215,255,255,
+31,58,128,255,218,25,224,81,154,253,0,18,29,6,240,255,
+129,13,253,118,40,0,32,102,160,180,204,113,46,23,17,0,
+2,80,32,22,10,1,224,81,178,21,42,23,105,0,28,88,
+2,22,56,1,34,55,0,0,11,56,202,49,27,80,10,64,
+34,143,5,0,63,6,160,174,1,0,113,0,0,18,2,232,
+163,135,3,0,224,129,162,21,67,7,3,0,38,6,132,215,
+255,255,128,255,172,26,224,81,146,13,38,6,148,22,133,0,
+32,62,6,1,0,66,190,255,240,107,29,80,66,6,255,16,
+128,7,97,0,6,232,0,58,32,70,223,255,191,255,90,255,
+29,48,0,58,23,66,191,255,80,255,29,48,0,58,27,66,
+191,255,70,255,29,48,0,58,32,70,175,255,191,255,58,255,
+64,6,127,0,138,7,225,112,6,208,7,200,0,18,1,114,
+35,134,4,0,194,129,80,119,0,0,65,18,2,6,240,255,
+246,245,26,56,38,6,36,27,133,0,190,255,2,116,32,230,
+38,1,31,218,38,6,132,215,255,255,31,58,128,255,240,24,
+224,81,154,253,0,234,35,22,4,0,221,17,2,103,0,0,
+97,98,202,45,0,82,29,6,240,255,129,13,253,134,40,0,
+32,118,160,180,206,129,48,87,17,0,224,81,202,5,66,7,
+0,0,197,29,138,111,7,0,109,106,194,5,66,7,0,0,
+213,21,42,23,105,0,63,6,162,175,1,0,2,22,24,0,
+34,95,0,0,34,103,5,0,202,89,11,48,108,0,127,90,
+219,5,177,5,127,82,169,5,29,216,65,234,29,6,240,255,
+182,205,38,6,132,215,255,255,128,255,166,25,224,81,146,13,
+38,6,84,27,133,0,32,62,6,1,0,66,190,255,234,106,
+127,218,146,29,35,94,4,0,219,89,75,7,0,0,27,48,
+3,56,191,255,168,235,10,224,224,225,250,5,26,48,27,56,
+25,64,128,255,226,0,10,224,28,6,220,254,178,157,28,6,
+218,254,130,157,38,6,96,27,133,0,190,255,34,115,28,80,
+74,6,255,112,128,7,225,16,6,216,32,238,10,1,38,6,
+132,215,255,255,31,58,128,255,6,24,224,81,154,253,27,48,
+191,255,80,126,10,16,127,18,146,53,2,6,240,255,0,82,
+129,13,226,126,40,0,32,110,160,180,205,121,47,87,17,0,
+10,224,60,23,105,0,27,56,2,22,200,0,34,87,0,0,
+34,103,5,0,220,81,10,48,63,6,116,176,1,0,108,0,
+27,56,10,232,29,64,38,6,120,27,133,0,190,255,176,114,
+60,23,105,0,63,6,158,176,1,0,2,22,192,0,34,55,
+0,0,34,87,5,0,220,49,106,0,38,6,132,215,255,255,
+128,255,190,24,224,81,146,13,38,6,168,27,133,0,32,62,
+6,1,0,66,190,255,2,106,224,233,170,13,1,50,251,55,
+192,0,36,62,144,140,32,70,246,0,191,255,164,233,29,80,
+64,6,255,16,156,7,225,243,6,224,7,184,99,71,21,0,
+56,6,132,215,255,255,1,138,67,143,3,0,24,48,31,58,
+128,255,60,23,224,81,186,253,28,56,23,64,38,6,228,27,
+133,0,190,255,42,114,0,18,28,6,240,255,129,13,252,118,
+40,0,32,102,160,180,204,113,46,23,17,0,2,208,0,18,
+23,6,240,255,129,13,247,142,40,0,32,126,160,180,207,137,
+49,23,17,0,2,216,224,209,178,5,224,217,138,29,163,119,
+3,0,224,113,130,21,67,7,3,0,24,48,128,255,18,24,
+224,81,146,13,38,6,148,22,133,0,32,62,6,1,0,66,
+190,255,86,105,32,86,10,1,128,7,124,2,59,23,105,0,
+0,234,2,22,80,0,34,87,0,0,34,111,5,0,219,81,
+10,48,63,6,142,177,1,0,109,0,97,82,186,5,32,238,
+35,1,58,23,105,0,35,71,21,0,2,22,136,0,34,87,
+0,0,35,54,4,0,218,81,10,56,34,103,5,0,63,6,
+186,177,1,0,108,0,195,239,4,0,178,5,32,238,35,1,
+224,233,242,21,163,87,3,0,224,81,130,21,67,7,3,0,
+24,48,128,255,140,23,224,81,146,13,38,6,148,22,133,0,
+32,62,6,1,0,66,190,255,208,104,29,80,128,7,248,1,
+59,23,105,0,63,6,16,178,1,0,2,22,176,0,34,87,
+0,0,34,143,5,0,219,81,10,48,113,0,10,48,244,55,
+66,2,190,255,36,177,59,23,105,0,10,200,2,22,184,0,
+34,87,0,0,25,56,219,81,10,48,34,103,5,0,63,6,
+58,178,1,0,108,0,25,95,3,0,1,178,235,183,192,0,
+25,48,28,56,128,255,0,3,0,218,154,23,7,0,97,18,
+178,5,98,18,154,37,32,54,88,1,190,255,182,210,10,216,
+224,217,154,13,38,6,24,28,133,0,32,62,115,16,0,66,
+190,255,70,104,28,48,27,56,191,255,176,226,59,127,1,0,
+15,6,214,255,146,13,38,6,24,28,133,0,32,62,117,16,
+0,66,190,255,36,104,58,23,105,0,35,63,21,0,2,22,
+208,0,34,87,0,0,25,64,218,81,10,48,34,119,5,0,
+63,6,188,178,1,0,110,0,10,232,25,48,190,255,130,176,
+163,111,3,0,224,105,130,21,67,7,3,0,24,48,128,255,
+144,22,224,81,146,13,38,6,148,22,133,0,32,62,6,1,
+0,66,190,255,212,103,224,233,202,5,23,48,191,255,54,222,
+224,233,218,13,22,48,36,62,144,140,32,70,241,0,191,255,
+112,231,28,48,22,56,128,255,54,2,10,232,224,233,186,77,
+224,217,146,77,35,54,24,0,39,6,221,221,51,51,128,255,
+62,2,0,50,128,255,128,2,99,87,9,0,224,81,154,13,
+38,6,24,28,133,0,32,62,165,16,0,66,190,255,122,103,
+35,54,24,0,128,255,40,2,224,81,178,29,35,63,9,0,
+35,54,24,0,32,70,68,2,0,74,128,255,34,2,35,55,
+9,0,128,255,74,2,224,81,202,13,38,6,40,28,133,0,
+190,255,188,111,35,55,9,0,224,49,178,5,128,255,40,2,
+35,55,9,0,27,56,128,255,46,2,35,63,9,0,35,54,
+24,0,32,70,68,2,0,74,128,255,220,1,35,55,9,0,
+190,255,10,132,27,48,190,255,4,132,28,48,191,255,70,219,
+29,56,38,6,180,27,133,0,190,255,116,111,163,127,3,0,
+224,121,130,21,67,7,3,0,24,48,128,255,148,21,224,81,
+146,13,38,6,148,22,133,0,32,62,6,1,0,66,190,255,
+216,102,29,80,92,6,255,243,142,7,225,240,7,208,8,200,
+9,192,32,238,10,1,6,216,191,255,136,122,10,16,127,18,
+186,5,128,7,34,1,2,6,240,255,0,82,129,13,226,118,
+40,0,32,102,160,180,204,113,46,87,17,0,10,224,1,90,
+99,95,18,0,99,215,9,0,99,7,13,0,99,207,5,0,
+99,7,22,0,99,7,16,0,195,15,22,0,191,255,98,141,
+10,120,111,7,9,0,42,6,248,65,1,0,111,87,5,0,
+32,134,244,1,111,7,29,0,111,7,33,0,27,64,111,135,
+21,0,1,114,111,119,0,0,99,127,1,0,207,47,2,0,
+60,23,105,0,24,72,2,22,248,0,34,87,0,0,3,56,
+220,81,10,48,34,111,5,0,63,6,148,180,1,0,109,0,
+10,232,224,233,138,29,36,23,45,175,35,55,1,0,38,95,
+0,0,224,89,202,5,38,239,12,0,213,13,36,87,45,175,
+162,81,10,6,12,254,167,245,191,255,174,139,99,7,1,0,
+32,238,22,16,224,233,234,37,35,119,1,0,1,106,60,23,
+105,0,110,111,0,0,2,22,0,1,34,87,0,0,27,64,
+220,81,10,48,3,56,34,103,5,0,63,6,246,180,1,0,
+108,0,10,232,224,233,234,13,35,23,1,0,2,88,43,87,
+0,0,224,81,218,253,34,135,12,0,224,129,178,5,32,238,
+22,16,35,23,1,0,224,17,226,5,98,7,0,0,2,48,
+128,255,230,27,29,80,78,6,255,240,128,7,6,88,6,88,
+128,7,128,7,33,6,8,76,129,0,97,0,33,6,64,105,
+128,0,97,0,33,6,42,115,128,0,97,0,33,6,226,117,
+128,0,97,0,33,6,104,120,128,0,97,0,33,6,122,29,
+129,0,97,0,33,6,2,31,129,0,97,0,33,6,16,34,
+129,0,97,0,33,6,212,32,129,0,97,0,33,6,126,33,
+129,0,97,0,33,6,42,192,128,0,97,0,33,6,60,192,
+128,0,97,0,33,6,92,197,128,0,97,0,33,6,114,197,
+128,0,97,0,33,6,248,200,129,0,97,0,33,6,48,201,
+129,0,97,0,33,6,102,201,129,0,97,0,33,6,202,201,
+129,0,97,0,33,6,62,202,129,0,97,0,128,7,97,0,
+6,232,61,54,28,0,0,58,32,70,144,0,190,255,72,109,
+61,142,28,0,93,7,23,0,125,143,25,0,64,6,127,0,
+128,7,225,112,6,232,9,208,224,209,154,21,1,82,224,65,
+162,5,8,80,32,22,0,8,234,23,192,2,97,18,225,23,
+14,131,240,71,32,2,125,71,16,0,181,5,125,71,16,0,
+125,63,18,0,221,135,20,0,0,226,61,223,16,0,224,209,
+162,29,61,86,28,0,28,16,232,23,72,2,194,81,61,103,
+18,0,61,134,28,0,194,129,112,103,24,0,204,217,61,102,
+28,0,61,95,16,0,204,17,98,95,26,0,106,7,21,0,
+221,7,20,0,29,48,28,56,27,64,128,255,120,0,10,16,
+251,17,226,5,29,48,128,255,60,0,0,82,197,13,194,201,
+224,209,210,5,29,48,28,56,128,255,242,0,65,226,98,226,
+214,205,25,80,64,6,255,112,0,18,2,136,232,143,72,2,
+38,118,28,0,206,137,113,63,61,0,65,18,98,18,230,245,
+127,0,128,7,225,16,6,216,0,226,0,234,27,48,29,56,
+128,255,104,0,29,136,232,143,72,2,59,118,28,0,206,137,
+113,7,61,0,202,225,65,234,98,234,150,245,28,80,64,6,
+255,16,128,7,225,16,6,224,7,232,8,216,0,50,0,58,
+190,255,164,147,10,16,224,17,210,21,60,118,28,0,232,239,
+72,2,221,113,60,102,28,0,221,97,108,223,36,0,60,134,
+28,0,208,233,125,7,38,0,110,23,33,0,34,87,24,0,
+165,5,0,82,64,6,255,16,128,7,225,48,7,232,232,239,
+72,2,6,216,59,134,28,0,221,129,48,231,33,0,0,210,
+224,225,162,13,60,215,24,0,28,48,1,58,190,255,14,148,
+28,48,190,255,34,148,59,118,28,0,221,113,110,7,33,0,
+59,102,28,0,221,97,108,7,36,0,59,142,28,0,209,233,
+125,7,38,0,26,80,64,6,255,48,128,7,225,240,7,208,
+232,215,72,2,6,200,57,126,28,0,218,121,47,223,33,0,
+57,87,16,0,59,223,29,0,57,239,18,0,27,16,181,13,
+162,95,5,0,171,81,10,192,212,5,34,23,13,0,2,216,
+165,5,203,193,224,81,223,245,216,233,1,82,149,13,162,95,
+5,0,171,233,224,233,199,5,34,23,13,0,65,82,224,233,
+255,245,10,48,244,55,66,2,190,255,94,171,10,224,57,126,
+28,0,218,121,111,231,69,0,57,239,18,0,165,45,224,217,
+154,13,38,6,232,28,133,0,32,62,141,1,0,66,190,255,
+184,98,24,80,59,23,1,0,201,82,194,81,187,23,5,0,
+184,17,226,233,195,5,162,233,201,18,197,5,29,16,201,18,
+162,233,124,7,1,0,124,7,5,0,124,87,13,0,124,23,
+17,0,124,87,9,0,59,223,13,0,28,230,20,0,0,194,
+224,233,239,213,57,118,28,0,206,209,58,55,69,0,57,63,
+18,0,0,66,191,255,102,159,64,6,255,240,128,7,33,0,
+38,119,25,0,46,23,65,0,2,128,150,130,201,37,152,18,
+225,29,39,87,1,0,38,111,5,0,39,95,5,0,38,103,
+1,0,237,89,234,5,236,81,202,5,128,255,94,3,149,29,
+224,65,178,13,46,103,65,0,140,102,128,0,110,103,65,0,
+32,94,144,176,203,55,0,0,0,82,181,13,224,65,186,5,
+0,82,245,5,224,65,194,5,128,255,158,0,165,5,0,82,
+64,6,63,0,128,7,225,241,7,224,60,223,5,0,60,215,
+1,0,252,191,9,0,6,192,56,238,28,0,0,202,61,23,
+65,0,2,128,150,130,137,53,61,55,1,0,61,63,5,0,
+23,64,218,65,225,103,0,0,219,97,231,97,209,37,187,5,
+230,65,163,37,56,95,5,0,56,87,1,0,235,217,171,29,
+177,5,234,209,249,21,253,87,37,0,198,81,225,127,0,0,
+199,121,239,217,155,21,177,5,234,209,233,13,152,18,177,5,
+1,82,133,21,28,48,190,255,116,157,221,255,66,0,234,253,
+181,5,0,82,245,5,29,238,72,0,65,202,98,202,134,205,
+0,82,64,6,255,241,128,7,225,112,7,224,252,223,9,0,
+60,63,5,0,6,232,61,207,16,0,60,55,1,0,25,64,
+25,72,191,74,191,255,246,59,10,208,186,201,187,201,125,207,
+12,0,25,104,237,0,224,105,222,13,61,23,16,0,2,96,
+193,98,186,97,236,217,199,5,0,82,128,7,74,2,2,216,
+186,217,61,127,25,0,207,239,66,0,146,13,28,48,190,255,
+252,156,61,119,25,0,206,239,66,0,202,253,60,103,1,0,
+60,111,5,0,252,87,9,0,204,81,1,98,125,103,14,0,
+125,87,1,0,225,135,0,0,205,129,125,135,5,0,27,104,
+218,105,125,111,10,0,61,23,25,0,60,87,1,0,60,95,
+5,0,98,87,1,0,98,95,5,0,64,86,48,0,98,87,
+65,0,221,199,20,0,242,13,224,209,218,13,61,135,25,0,
+61,63,18,0,208,7,67,0,48,55,69,0,32,71,181,176,
+191,255,154,157,61,111,25,0,124,223,36,0,45,23,33,0,
+124,215,38,0,45,95,69,0,124,23,33,0,124,95,41,0,
+205,199,67,0,178,13,61,135,18,0,124,135,24,0,61,127,
+16,0,220,7,67,0,124,127,26,0,61,119,25,0,110,215,
+38,0,110,223,36,0,46,95,33,0,107,7,26,0,61,87,
+12,0,224,81,159,37,14,128,48,127,65,0,46,6,128,0,
+64,0,14,121,112,127,65,0,32,110,144,176,205,55,0,0,
+29,103,23,0,65,98,204,102,1,0,93,103,23,0,130,13,
+61,135,25,0,16,134,72,0,125,135,25,0,213,5,61,126,
+28,0,125,127,25,0,61,119,12,0,224,113,182,5,128,7,
+22,1,61,111,25,0,205,239,66,0,146,13,28,48,190,255,
+220,155,61,103,25,0,204,239,66,0,202,253,60,111,5,0,
+61,79,25,0,60,103,1,0,27,120,191,122,27,112,204,113,
+225,135,0,0,208,121,205,121,105,127,5,0,105,119,1,0,
+64,134,48,0,252,95,9,0,105,135,65,0,139,217,221,199,
+20,0,210,13,61,127,25,0,61,63,18,0,207,7,67,0,
+47,55,69,0,32,71,181,176,191,255,146,156,61,103,25,0,
+124,223,48,0,44,23,33,0,124,7,50,0,44,87,69,0,
+124,23,45,0,124,87,53,0,204,199,67,0,178,13,61,127,
+18,0,124,127,24,0,61,119,16,0,220,7,67,0,124,119,
+26,0,61,111,25,0,109,7,38,0,109,223,36,0,45,87,
+33,0,106,7,26,0,61,23,16,0,187,17,125,23,12,0,
+125,223,10,0,226,0,224,17,239,37,224,17,146,13,38,6,
+248,28,133,0,32,62,100,3,0,66,190,255,28,95,61,103,
+25,0,42,6,128,0,64,0,44,95,65,0,29,135,23,0,
+10,89,108,95,65,0,65,130,208,134,1,0,93,135,23,0,
+226,5,12,110,72,0,125,111,25,0,213,5,61,102,28,0,
+125,103,25,0,60,23,57,0,43,6,206,60,1,0,98,95,
+5,0,1,82,64,6,255,112,128,7,225,16,7,224,6,232,
+61,87,12,0,252,223,9,0,10,16,226,217,167,13,61,135,
+16,0,194,129,240,217,199,5,0,82,128,7,248,1,10,216,
+61,119,25,0,61,87,10,0,46,23,33,0,124,223,36,0,
+46,103,69,0,124,23,33,0,124,103,41,0,124,87,38,0,
+206,199,67,0,178,13,61,87,18,0,124,87,24,0,61,135,
+16,0,220,7,67,0,124,135,26,0,61,103,1,0,61,111,
+5,0,252,87,9,0,204,81,225,135,0,0,205,129,61,127,
+10,0,125,135,5,0,219,121,1,114,125,87,1,0,125,127,
+10,0,125,119,14,0,61,103,25,0,236,95,37,0,219,89,
+108,95,36,0,61,135,12,0,252,87,9,0,170,129,125,135,
+12,0,240,0,224,129,183,5,128,7,90,1,12,112,46,111,
+65,0,44,6,128,0,64,0,12,105,110,111,65,0,32,94,
+144,176,203,55,0,0,29,87,23,0,65,82,202,86,1,0,
+93,87,23,0,226,5,61,119,25,0,14,110,72,0,181,5,
+61,110,28,0,61,103,12,0,125,111,25,0,224,97,182,5,
+128,7,18,1,205,239,66,0,146,13,28,48,190,255,190,153,
+61,87,25,0,202,239,66,0,202,253,60,103,1,0,27,120,
+191,122,27,112,204,113,225,135,0,0,208,121,60,111,5,0,
+61,79,25,0,205,121,105,119,1,0,105,127,5,0,64,118,
+48,0,252,135,9,0,105,119,65,0,144,217,221,199,20,0,
+210,13,61,111,25,0,61,63,18,0,205,7,67,0,45,55,
+69,0,32,71,181,176,191,255,116,154,61,87,25,0,124,223,
+48,0,42,23,33,0,124,7,50,0,42,127,69,0,124,23,
+45,0,124,127,53,0,202,199,67,0,178,13,61,111,18,0,
+124,111,24,0,61,103,16,0,220,7,67,0,124,103,26,0,
+61,95,25,0,107,7,38,0,107,223,36,0,43,127,33,0,
+111,7,26,0,61,23,16,0,187,17,125,23,12,0,125,223,
+10,0,226,0,224,17,239,37,224,17,146,13,38,6,8,29,
+133,0,32,62,238,3,0,66,190,255,254,92,61,87,25,0,
+47,6,128,0,64,0,42,135,65,0,29,119,23,0,15,129,
+106,135,65,0,65,114,206,118,1,0,93,119,23,0,226,5,
+10,94,72,0,125,95,25,0,213,5,61,86,28,0,125,87,
+25,0,60,23,57,0,48,6,206,60,1,0,98,135,5,0,
+1,82,64,6,255,16,130,7,225,48,7,216,187,0,6,232,
+61,230,28,0,1,138,99,143,1,0,31,50,190,255,162,165,
+0,210,60,23,65,0,224,217,162,13,98,218,154,21,136,18,
+249,13,29,48,28,56,128,255,108,0,165,13,2,120,150,122,
+249,5,152,18,209,5,29,48,28,56,128,255,88,0,28,230,
+72,0,65,210,98,210,230,229,99,218,170,29,61,23,25,0,
+34,23,65,0,2,136,150,138,185,21,152,18,145,21,61,111,
+14,0,224,105,210,5,125,7,14,0,0,18,165,5,1,18,
+224,17,226,5,61,63,25,0,29,48,128,255,24,0,35,103,
+1,0,224,97,210,5,99,7,1,0,190,255,12,165,66,6,
+255,48,128,7,225,0,7,232,221,231,66,0,154,13,38,6,
+24,29,133,0,32,62,114,4,0,66,190,255,252,91,61,231,
+33,0,224,225,154,13,38,6,24,29,133,0,32,62,117,4,
+0,66,190,255,228,91,221,199,67,0,146,13,221,247,66,0,
+194,5,220,199,43,0,178,5,221,135,67,0,61,143,65,0,
+48,6,1,0,128,0,16,137,125,143,65,0,128,127,221,176,
+224,121,194,5,29,48,191,255,82,78,221,191,64,0,191,255,
+144,130,106,7,9,0,32,118,232,3,106,119,21,0,1,106,
+106,111,0,0,32,102,16,0,106,103,2,0,43,6,16,69,
+1,0,106,95,5,0,106,239,29,0,125,87,57,0,60,143,
+26,0,61,23,36,0,226,137,186,253,29,48,61,63,57,0,
+0,66,0,74,190,255,182,145,64,6,255,0,128,7,97,0,
+0,234,253,54,176,0,46,6,152,112,148,0,206,49,191,255,
+94,246,65,234,29,6,240,255,214,245,64,6,127,0,127,0,
+132,7,225,112,6,224,7,216,8,208,9,200,0,234,0,18,
+226,86,176,0,47,6,152,112,148,0,207,81,42,119,173,0,
+224,113,186,5,10,232,213,5,65,18,2,6,240,255,150,245,
+224,233,138,13,60,23,1,0,224,17,194,5,32,86,3,16,
+229,37,59,55,17,0,35,62,4,0,3,64,190,255,124,184,
+29,48,35,63,5,0,35,71,1,0,26,72,191,255,20,246,
+121,87,1,0,224,81,146,21,1,98,125,103,173,0,29,48,
+27,56,191,255,166,246,60,23,5,0,124,239,1,0,65,18,
+124,23,5,0,0,82,181,5,32,86,18,1,68,6,255,112,
+128,7,225,0,6,232,8,224,124,7,1,0,224,57,186,29,
+61,55,1,0,224,49,242,21,191,255,138,246,60,23,1,0,
+61,55,1,0,202,17,124,23,1,0,191,255,146,245,61,23,
+1,0,98,7,173,0,61,23,5,0,125,7,1,0,95,18,
+125,23,5,0,0,82,64,6,255,0,128,7,127,0,128,7,
+193,16,6,232,0,218,229,87,64,0,224,7,96,1,32,143,
+193,184,10,224,95,138,96,143,193,184,61,135,57,0,61,127,
+49,0,224,129,178,13,15,16,97,18,130,93,98,18,226,85,
+125,7,57,0,125,7,49,0,149,85,224,121,242,77,61,119,
+53,0,224,113,242,5,125,7,53,0,3,106,125,111,49,0,
+213,69,61,95,45,0,11,16,194,18,34,87,65,184,125,7,
+49,0,224,81,34,22,64,184,194,13,42,23,37,0,98,239,
+33,0,106,239,37,0,125,87,33,0,125,23,37,0,229,45,
+98,239,1,0,32,143,53,183,125,239,33,0,61,135,65,0,
+125,239,37,0,16,137,32,23,41,183,96,143,53,183,224,17,
+234,5,96,239,41,183,96,95,61,183,133,29,32,127,61,183,
+239,89,201,21,34,87,61,0,96,95,61,183,234,89,233,13,
+34,119,45,0,238,81,130,13,34,103,65,0,32,111,57,183,
+12,105,96,111,57,183,96,239,41,183,252,47,32,0,32,87,
+37,183,32,95,41,183,235,81,226,5,36,143,9,134,224,137,
+170,5,1,218,27,80,64,6,223,16,128,7,97,0,32,255,
+37,183,229,87,64,0,224,7,96,1,10,232,63,23,33,0,
+63,127,45,0,255,17,178,21,15,136,194,138,113,23,65,184,
+32,103,57,183,63,111,33,0,224,97,96,111,41,183,242,5,
+63,87,65,0,42,88,75,97,96,103,57,183,32,23,61,183,
+239,17,233,5,194,18,34,103,65,184,96,103,41,183,253,47,
+32,0,32,95,41,183,255,89,178,5,128,255,102,9,64,6,
+127,0,128,7,225,16,6,248,7,216,229,87,64,0,224,7,
+96,1,63,143,9,0,10,224,224,137,242,5,17,134,255,255,
+127,135,9,0,0,250,165,77,224,217,242,69,32,239,37,183,
+125,255,109,0,47,6,98,4,130,0,63,23,13,0,125,127,
+105,0,224,17,194,21,125,23,113,0,63,111,13,0,45,111,
+117,0,125,111,117,0,63,95,13,0,43,95,117,0,107,239,
+113,0,63,87,13,0,106,239,117,0,245,5,127,239,13,0,
+125,239,117,0,125,239,113,0,63,143,17,0,6,130,65,138,
+127,143,17,0,1,122,125,135,49,0,32,119,193,184,125,127,
+57,0,65,114,96,119,193,184,125,223,77,0,252,47,32,0,
+127,218,210,5,61,54,76,0,128,255,28,0,29,48,128,255,
+58,9,61,87,133,0,213,5,13,250,252,47,32,0,31,80,
+64,6,255,16,33,6,30,253,129,0,97,0,128,7,225,0,
+6,248,229,87,64,0,224,7,96,1,63,239,13,0,10,224,
+224,233,146,61,61,23,113,0,226,233,202,5,127,7,13,0,
+245,13,127,23,13,0,61,143,113,0,61,135,117,0,113,135,
+117,0,61,127,117,0,61,119,113,0,111,119,113,0,63,111,
+17,0,32,103,193,184,95,106,127,111,17,0,125,7,105,0,
+65,98,96,103,193,184,252,47,32,0,61,95,101,0,224,89,
+226,5,61,54,76,0,128,255,50,0,181,5,125,7,77,0,
+125,7,133,0,29,48,191,255,88,253,224,81,178,13,128,255,
+18,8,133,13,63,87,9,0,65,82,127,87,9,0,252,47,
+32,0,0,82,64,6,255,0,33,6,248,0,130,0,97,0,
+128,7,225,240,6,248,7,216,8,208,9,192,35,207,29,0,
+229,87,64,0,224,7,96,1,10,224,63,119,9,0,218,142,
+2,0,91,113,224,137,242,5,251,113,186,5,0,234,133,13,
+7,234,229,5,224,113,178,5,0,234,165,5,7,234,224,233,
+234,13,63,103,9,0,129,210,120,103,1,0,249,85,63,143,
+9,0,59,80,74,137,127,143,9,0,133,85,224,201,210,77,
+32,239,37,183,48,6,222,13,130,0,125,135,105,0,125,255,
+109,0,125,199,125,0,125,223,121,0,63,23,17,0,125,215,
+129,0,224,17,194,21,125,23,113,0,63,119,17,0,46,119,
+117,0,125,119,117,0,63,103,17,0,44,103,117,0,108,239,
+113,0,63,95,17,0,107,239,117,0,245,5,127,239,17,0,
+125,239,117,0,125,239,113,0,63,87,21,0,7,138,65,82,
+127,87,21,0,1,130,125,143,49,0,32,127,193,184,125,135,
+57,0,65,122,96,127,193,184,125,207,77,0,252,47,32,0,
+127,202,210,5,61,54,76,0,191,255,108,254,29,48,128,255,
+138,7,61,87,133,0,213,5,7,234,252,47,32,0,29,80,
+64,6,255,240,128,7,225,243,6,248,7,232,8,216,229,87,
+64,0,224,7,96,1,10,224,130,218,63,127,9,0,137,13,
+93,121,127,127,9,0,252,47,32,0,128,7,50,2,29,121,
+127,127,9,0,63,23,17,0,63,95,21,0,224,17,186,5,
+128,7,10,2,97,90,154,85,2,232,61,87,121,0,63,143,
+9,0,221,207,128,0,130,13,74,137,234,137,186,5,0,18,
+133,13,7,18,229,5,81,81,178,5,0,18,165,5,7,18,
+224,17,250,53,63,127,9,0,61,135,125,0,112,127,1,0,
+221,199,128,0,146,13,61,103,121,0,63,95,9,0,44,104,
+77,89,127,95,9,0,127,7,17,0,127,7,21,0,32,87,
+193,184,125,7,105,0,65,82,96,87,193,184,252,47,32,0,
+61,143,101,0,224,137,226,5,61,54,76,0,191,255,60,254,
+181,5,125,7,77,0,125,7,133,0,29,48,191,255,98,251,
+224,81,186,5,128,7,136,1,128,255,24,6,128,7,128,1,
+252,47,32,0,128,7,120,1,2,208,26,232,127,7,17,0,
+0,178,0,186,63,207,21,0,32,135,193,184,63,223,9,0,
+65,130,96,135,193,184,252,47,32,0,229,87,64,0,224,7,
+96,1,63,127,13,0,10,224,224,121,178,13,127,7,13,0,
+63,207,21,0,63,119,9,0,26,232,14,217,224,233,130,85,
+61,119,129,0,61,95,121,0,206,110,2,0,146,13,11,96,
+91,97,235,97,186,5,0,18,133,13,7,18,229,5,91,89,
+178,5,0,18,165,5,7,18,61,199,113,0,224,17,218,53,
+61,87,125,0,129,114,106,223,1,0,153,13,61,127,121,0,
+63,119,9,0,47,128,80,113,127,119,9,0,61,23,113,0,
+226,233,186,5,0,210,229,13,253,209,170,5,2,208,61,111,
+117,0,98,111,117,0,61,103,117,0,61,95,113,0,108,95,
+113,0,63,87,21,0,125,7,105,0,95,82,127,87,21,0,
+125,7,113,0,125,7,133,0,224,177,202,5,29,176,29,184,
+197,5,119,239,113,0,29,184,24,232,95,202,218,157,127,215,
+17,0,252,47,32,0,22,232,229,29,61,143,101,0,61,199,
+113,0,224,137,226,5,61,54,76,0,191,255,14,253,181,5,
+125,7,77,0,229,87,64,0,224,7,96,1,32,135,193,184,
+10,224,65,130,96,135,193,184,252,47,32,0,29,48,191,255,
+32,250,24,232,224,233,170,229,229,87,64,0,224,7,96,1,
+32,127,193,184,10,224,95,122,96,127,193,184,252,47,32,0,
+32,111,37,183,32,119,41,183,238,105,146,21,36,103,9,134,
+224,97,218,13,128,255,172,4,165,13,224,89,226,5,63,87,
+13,0,65,82,127,87,13,0,252,47,32,0,0,82,64,6,
+255,243,128,7,225,48,6,248,7,208,8,216,229,87,64,0,
+224,7,96,1,63,143,9,0,10,224,224,137,178,21,63,23,
+17,0,17,134,255,255,2,126,4,0,122,127,1,0,34,119,
+1,0,127,119,17,0,127,135,9,0,98,255,1,0,0,250,
+213,77,224,217,146,77,32,239,37,183,125,215,125,0,125,255,
+109,0,45,6,78,15,130,0,63,23,33,0,125,111,105,0,
+224,17,194,21,125,23,113,0,63,95,33,0,43,95,117,0,
+125,95,117,0,63,143,33,0,49,143,117,0,113,239,113,0,
+63,135,33,0,112,239,117,0,245,5,127,239,33,0,125,239,
+117,0,125,239,113,0,63,127,37,0,8,114,65,122,127,127,
+37,0,1,106,125,119,49,0,32,103,193,184,125,111,57,0,
+65,98,96,103,193,184,125,223,77,0,252,47,32,0,127,218,
+210,5,61,54,76,0,191,255,46,251,29,48,128,255,76,4,
+61,87,133,0,229,5,32,254,16,0,252,47,32,0,31,80,
+64,6,255,48,128,7,225,0,6,224,229,87,64,0,224,7,
+96,1,60,23,253,255,10,248,34,239,33,0,28,86,252,255,
+224,233,210,61,61,87,113,0,234,233,202,5,98,7,33,0,
+245,13,98,87,33,0,61,143,113,0,61,135,117,0,113,135,
+117,0,61,127,117,0,61,119,113,0,111,119,113,0,34,111,
+37,0,32,103,193,184,95,106,98,111,37,0,125,7,105,0,
+65,98,96,103,193,184,255,47,32,0,61,95,125,0,61,87,
+101,0,107,231,1,0,224,81,226,5,61,54,76,0,191,255,
+58,251,181,5,125,7,77,0,125,7,133,0,29,48,191,255,
+96,248,224,81,146,21,128,255,26,3,229,13,34,143,17,0,
+34,135,9,0,124,143,253,255,65,130,98,87,17,0,98,135,
+9,0,255,47,32,0,0,82,64,6,255,0,128,7,225,16,
+6,248,7,216,229,87,64,0,224,7,96,1,63,143,9,0,
+10,224,224,137,138,29,1,130,32,23,37,183,127,135,9,0,
+63,127,17,0,127,23,13,0,224,121,178,13,224,17,146,13,
+34,119,45,0,127,119,21,0,34,111,61,0,127,111,25,0,
+0,250,213,109,63,103,13,0,32,23,37,183,226,97,138,13,
+63,95,9,0,65,90,127,95,9,0,0,250,133,101,224,217,
+194,93,2,232,125,255,109,0,42,6,174,24,130,0,63,23,
+29,0,125,87,105,0,224,17,194,21,125,23,113,0,63,135,
+29,0,48,135,117,0,125,135,117,0,63,119,29,0,46,119,
+117,0,110,239,113,0,63,111,29,0,109,239,117,0,245,5,
+127,239,29,0,125,239,117,0,125,239,113,0,63,103,33,0,
+13,90,65,98,127,103,33,0,1,82,125,95,49,0,32,143,
+193,184,125,87,57,0,65,138,96,143,193,184,125,223,77,0,
+252,47,32,0,63,135,17,0,224,129,178,21,63,55,13,0,
+224,49,242,13,32,23,37,183,224,17,178,13,38,127,45,0,
+34,23,45,0,226,121,211,5,2,56,2,64,128,255,42,0,
+127,218,210,5,61,54,76,0,191,255,76,249,29,48,128,255,
+106,2,61,87,133,0,229,5,32,254,29,0,252,47,32,0,
+31,80,64,6,255,16,33,6,70,23,130,0,97,0,128,7,
+225,112,6,232,229,87,64,0,224,7,96,1,61,143,9,0,
+10,248,224,137,186,5,128,7,148,1,61,127,13,0,32,135,
+37,183,240,121,178,5,128,7,132,1,61,119,9,0,95,114,
+125,119,9,0,226,5,255,47,32,0,0,82,128,7,118,1,
+61,103,17,0,224,97,146,29,61,95,29,0,224,89,210,21,
+32,87,193,184,65,82,96,87,193,184,255,47,32,0,29,48,
+128,255,86,1,229,87,64,0,224,7,96,1,32,143,193,184,
+10,248,95,138,96,143,193,184,61,23,29,0,224,17,234,53,
+32,135,193,184,65,130,96,135,193,184,255,47,32,0,61,127,
+17,0,224,121,146,21,32,23,37,183,224,17,210,13,34,119,
+45,0,61,63,21,0,231,113,242,5,61,71,25,0,61,55,
+13,0,191,255,68,255,229,87,64,0,224,7,96,1,32,111,
+193,184,10,248,95,106,96,111,193,184,255,47,32,0,32,95,
+37,183,32,103,41,183,236,89,242,5,36,87,9,134,224,81,
+186,5,128,255,222,0,0,82,213,101,61,143,17,0,2,224,
+224,137,242,13,61,215,21,0,60,135,45,0,125,135,21,0,
+61,207,25,0,60,127,61,0,61,223,13,0,125,127,25,0,
+125,231,13,0,1,114,60,23,113,0,125,119,9,0,226,225,
+202,5,125,7,29,0,245,13,125,23,29,0,60,111,113,0,
+60,103,117,0,109,103,117,0,60,95,117,0,60,87,113,0,
+107,87,113,0,61,143,33,0,32,135,193,184,95,138,125,143,
+33,0,124,7,105,0,65,130,96,135,193,184,255,47,32,0,
+60,127,101,0,224,121,226,5,60,54,76,0,191,255,92,248,
+181,5,124,7,77,0,124,7,133,0,61,119,17,0,224,113,
+194,13,224,217,162,13,59,111,45,0,250,105,226,5,27,48,
+26,56,25,64,191,255,98,254,28,48,191,255,100,245,224,81,
+178,5,128,255,30,0,0,82,213,5,255,47,32,0,32,86,
+30,0,64,6,255,112,33,6,156,22,130,0,97,0,0,0,
+229,103,64,0,3,30,196,255,0,106,99,111,1,0,99,47,
+5,0,99,167,9,0,99,175,13,0,99,183,17,0,99,191,
+21,0,99,199,25,0,99,207,29,0,99,215,33,0,99,223,
+37,0,99,231,41,0,99,239,45,0,99,247,49,0,99,255,
+53,0,99,103,57,0,44,6,36,183,255,255,44,55,1,0,
+45,6,76,41,133,0,45,119,1,0,224,7,96,1,102,31,
+9,0,47,6,32,183,255,255,47,31,1,0,224,113,186,5,
+128,7,16,0,38,127,29,0,109,7,1,0,102,127,25,0,
+108,7,1,0,128,7,88,14,128,7,97,0,6,248,229,87,
+64,0,224,7,96,1,32,143,193,184,10,232,95,138,63,135,
+57,0,96,143,193,184,224,129,186,5,128,7,168,1,127,7,
+57,0,63,87,33,0,63,23,45,0,255,81,146,53,63,127,
+37,0,106,127,37,0,63,119,37,0,63,111,33,0,110,111,
+33,0,194,18,34,143,65,184,255,137,34,22,64,184,178,5,
+128,7,114,1,63,135,33,0,32,127,57,183,98,135,1,0,
+224,121,242,5,63,111,65,0,45,112,78,121,96,127,57,183,
+32,95,41,183,235,249,178,5,128,7,74,1,32,135,61,183,
+194,130,48,111,65,184,96,111,41,183,128,7,56,1,194,18,
+63,135,65,0,98,7,65,184,32,127,53,183,48,16,66,121,
+32,119,57,183,96,127,53,183,224,113,194,5,66,113,96,119,
+57,183,32,23,53,183,194,102,255,0,194,5,2,112,0,18,
+181,45,194,94,0,255,210,5,2,112,136,114,8,18,197,37,
+64,142,255,0,2,80,81,81,226,5,2,112,144,114,32,22,
+16,0,165,29,64,126,0,255,2,128,79,129,226,5,2,112,
+152,114,32,22,24,0,133,21,32,118,32,0,96,119,61,183,
+96,7,41,183,253,47,32,0,36,111,9,134,224,105,138,109,
+191,255,96,254,213,101,206,102,255,0,140,143,65,183,194,137,
+32,127,41,183,96,143,61,183,239,249,202,77,194,138,49,143,
+65,184,32,135,57,183,96,143,41,183,224,129,178,69,32,127,
+193,184,65,122,96,127,193,184,253,47,32,0,229,87,64,0,
+224,7,96,1,32,23,57,183,32,119,193,184,10,232,95,114,
+96,119,193,184,194,110,255,0,2,112,178,5,0,18,165,21,
+194,102,0,255,194,5,136,114,8,18,197,13,64,86,255,0,
+74,17,210,5,144,114,32,22,16,0,197,5,152,114,32,22,
+24,0,206,142,255,0,145,119,65,183,206,17,194,18,34,23,
+65,184,32,135,61,183,34,143,61,0,241,129,177,13,96,23,
+41,183,34,119,65,0,32,111,57,183,46,120,79,105,96,111,
+57,183,253,47,32,0,32,95,37,183,32,103,41,183,236,89,
+242,5,36,87,9,134,224,81,186,5,191,255,150,253,64,6,
+127,0,128,7,225,0,6,232,229,87,64,0,224,7,96,1,
+61,23,17,0,10,224,224,17,210,5,2,48,1,58,190,255,
+4,93,32,135,49,176,61,143,9,0,113,135,5,0,96,239,
+49,176,61,127,24,0,32,119,53,176,175,113,96,119,53,176,
+252,47,32,0,64,6,255,0,194,50,36,118,184,138,206,49,
+38,79,1,0,39,87,18,0,32,110,223,255,10,16,77,17,
+234,17,178,5,130,22,160,0,194,102,0,1,130,0,170,37,
+7,95,8,0,200,90,11,17,105,23,16,0,7,119,12,0,
+39,103,10,0,200,114,140,0,14,97,105,103,18,0,7,143,
+14,0,167,127,13,0,200,138,17,121,105,127,20,0,167,87,
+15,0,7,103,17,0,135,119,17,0,200,98,12,81,10,113,
+165,53,7,103,9,0,200,98,140,102,12,0,105,103,16,0,
+7,143,15,0,39,127,10,0,200,138,168,122,17,121,105,127,
+18,0,105,7,20,0,105,7,22,0,7,103,8,0,200,98,
+12,17,105,23,16,0,7,127,12,0,39,111,10,0,200,122,
+141,0,15,105,105,111,18,0,7,87,14,0,167,135,13,0,
+200,82,10,129,105,135,20,0,7,111,17,0,135,119,17,0,
+200,106,13,113,105,119,22,0,127,0,107,50,183,5,1,82,
+245,21,194,50,36,118,184,138,206,49,38,23,1,0,194,255,
+24,0,130,13,32,110,162,0,98,111,16,0,98,7,22,0,
+229,5,194,239,0,0,186,5,1,82,165,5,0,82,127,0,
+128,7,225,16,6,248,63,239,9,0,63,231,12,0,229,87,
+64,0,224,7,96,1,10,216,224,225,226,21,61,135,12,0,
+224,129,186,13,63,127,16,0,125,127,16,0,63,119,14,0,
+125,119,14,0,125,231,12,0,255,111,19,0,253,95,19,0,
+13,89,125,95,18,0,63,231,2,0,31,48,128,255,218,1,
+61,143,2,0,28,137,125,143,2,0,61,23,0,0,95,18,
+226,0,125,23,0,0,224,17,138,13,29,48,61,127,5,0,
+63,6,92,207,1,0,111,0,251,47,32,0,64,6,255,16,
+130,7,225,48,6,232,61,143,12,0,224,137,178,5,128,7,
+18,1,229,87,64,0,224,7,96,1,61,231,29,0,10,208,
+220,199,64,0,178,21,220,231,66,0,130,21,60,223,33,0,
+1,58,251,135,43,0,208,134,244,255,123,135,42,0,27,48,
+190,255,186,123,27,48,190,255,206,123,60,55,61,0,28,56,
+191,255,172,158,28,48,191,255,64,159,61,23,24,0,194,118,
+0,128,14,6,0,128,234,29,32,102,16,0,194,110,255,127,
+125,111,24,0,61,22,12,0,98,7,1,0,125,103,2,0,
+68,18,98,7,1,0,61,55,24,0,48,6,16,149,141,0,
+6,88,194,90,208,89,43,127,1,0,224,121,178,5,191,255,
+200,117,221,199,2,0,170,61,61,231,24,0,149,21,229,87,
+64,0,32,22,159,255,10,232,29,248,66,249,255,47,32,0,
+29,248,255,47,32,0,4,119,92,139,224,113,250,37,51,6,
+5,0,32,0,211,255,0,0,186,237,229,87,64,0,224,7,
+96,1,32,111,185,176,99,87,1,0,95,106,96,111,185,176,
+202,13,32,103,13,177,224,97,138,13,64,86,0,0,43,6,
+96,0,0,0,74,95,8,240,35,255,1,0,255,47,32,0,
+50,6,54,0,32,0,114,231,0,0,250,47,32,0,181,5,
+191,255,62,117,66,6,255,48,128,7,225,112,6,224,60,239,
+9,0,7,200,60,223,12,0,229,87,64,0,224,7,96,1,
+10,208,224,217,130,29,61,135,12,0,224,129,186,13,60,127,
+16,0,125,127,16,0,60,119,14,0,125,119,14,0,125,223,
+12,0,252,111,19,0,253,95,19,0,13,89,125,95,18,0,
+124,7,12,0,224,201,210,5,124,7,14,0,124,7,16,0,
+61,23,0,0,95,18,226,0,125,23,0,0,224,17,138,13,
+29,48,61,143,5,0,63,6,2,209,1,0,113,0,250,47,
+32,0,64,6,255,112,128,7,225,0,6,232,60,6,72,245,
+142,0,252,233,153,13,29,64,38,6,12,252,132,0,32,62,
+194,0,190,255,148,73,47,6,0,158,2,0,207,225,252,233,
+145,13,29,64,38,6,12,252,132,0,32,62,195,0,190,255,
+120,73,125,7,12,0,125,7,14,0,125,7,18,0,125,7,
+2,0,229,87,64,0,224,7,96,1,32,111,233,176,125,111,
+25,0,96,239,233,176,32,103,225,176,10,248,95,98,96,103,
+225,176,255,47,32,0,64,6,255,0,6,16,197,18,47,6,
+0,4,32,0,207,17,39,127,26,0,207,118,8,1,210,5,
+39,111,17,0,98,111,9,0,207,102,0,2,210,5,39,95,
+21,0,98,95,13,0,207,86,8,3,250,5,64,142,0,128,
+98,143,13,0,143,126,0,2,39,87,24,0,98,127,18,0,
+201,82,207,126,132,0,130,21,98,87,21,0,132,119,165,140,
+224,113,210,5,39,87,13,0,98,87,5,0,39,87,9,0,
+98,87,1,0,181,5,98,87,25,0,127,0,128,7,225,48,
+32,23,193,223,224,17,146,37,50,6,0,3,32,0,50,231,
+1,0,66,225,162,29,0,234,32,222,104,177,1,210,245,13,
+26,16,253,23,192,0,2,120,92,121,226,5,34,112,78,225,
+27,48,128,255,220,0,27,222,32,0,65,234,29,6,238,255,
+142,229,224,225,234,237,213,221,64,86,0,0,43,6,48,0,
+0,0,74,95,144,244,64,86,0,0,202,191,32,241,64,6,
+255,48,128,7,225,0,6,232,197,234,32,126,104,177,207,233,
+61,231,5,0,224,225,162,77,191,255,66,252,224,81,226,69,
+32,119,169,179,224,113,242,5,29,48,0,58,191,255,126,149,
+224,81,202,61,220,199,33,0,194,21,36,23,236,139,95,18,
+226,0,100,23,236,139,224,17,202,13,132,103,245,139,224,97,
+130,13,38,6,8,6,133,0,190,255,132,80,191,255,122,115,
+29,95,23,0,224,89,210,29,29,87,23,0,98,82,210,13,
+29,143,23,0,99,138,146,13,38,6,28,6,133,0,32,62,
+79,6,0,66,190,255,226,71,29,135,23,0,99,130,218,5,
+4,122,93,127,23,0,165,13,29,119,23,0,98,114,226,5,
+29,48,28,56,0,66,191,255,130,148,64,6,255,0,128,7,
+225,241,6,224,60,239,9,0,28,223,22,0,58,6,0,4,
+32,0,28,143,23,0,0,202,224,137,146,21,1,106,27,128,
+197,130,218,129,112,7,30,0,251,111,192,0,32,87,193,223,
+45,88,75,81,96,87,193,223,128,7,46,2,0,194,128,7,
+170,1,29,184,61,239,5,0,29,143,34,0,98,138,250,109,
+32,135,169,179,224,129,146,13,28,48,29,56,191,255,158,148,
+224,81,178,5,128,7,2,2,27,16,197,18,2,112,218,113,
+206,223,31,0,202,13,101,202,174,13,124,239,9,0,27,48,
+29,56,191,255,248,253,65,202,128,7,96,1,101,202,134,21,
 218,17,4,98,98,103,30,0,1,90,32,143,193,223,251,95,
-192,0,11,137,96,143,193,223,98,82,154,13,124,239,9,0,
-27,48,29,56,191,255,138,253,128,7,0,1,23,232,213,125,
-224,193,234,13,1,114,218,17,98,7,30,0,251,119,192,0,
-32,95,193,223,46,96,76,89,96,95,193,223,1,194,124,239,
-9,0,27,48,29,56,191,255,88,253,245,101,23,232,213,101,
-17,16,97,18,234,45,27,136,194,138,36,118,172,138,206,137,
-49,23,1,0,194,199,0,0,130,13,124,239,9,0,27,48,
-29,56,191,255,138,249,181,77,27,104,197,106,218,105,109,7,
-30,0,1,82,32,127,193,223,251,87,192,0,42,128,80,121,
-96,127,193,223,27,112,193,114,36,94,236,138,203,113,238,87,
-1,0,138,86,0,64,98,87,0,0,1,194,23,232,213,53,
-99,18,218,45,60,127,5,0,239,233,210,21,224,193,218,45,
-224,201,183,45,1,82,27,104,197,106,218,105,109,7,30,0,
-251,87,192,0,32,127,193,223,42,128,80,121,96,127,193,223,
-1,194,181,29,221,199,33,0,226,5,36,119,224,139,65,114,
-100,119,224,139,60,23,13,0,60,103,5,0,44,103,1,0,
-98,103,9,0,36,95,33,175,98,95,25,0,60,87,1,0,
-234,233,178,5,191,7,82,254,60,143,1,0,241,233,234,53,
-60,55,17,0,191,255,118,152,10,16,224,17,210,29,60,135,
-1,0,112,23,5,0,34,127,9,0,124,127,1,0,60,119,
-5,0,224,113,202,229,124,23,5,0,2,232,60,23,13,0,
-60,103,5,0,44,103,1,0,98,103,9,0,36,95,33,175,
-98,95,25,0,197,213,224,193,154,21,224,201,247,13,1,114,
-27,136,197,138,218,137,113,7,30,0,251,119,192,0,32,95,
-193,223,46,96,76,89,96,95,193,223,64,6,255,241,0,0,
-3,30,116,255,128,255,160,0,63,6,228,212,1,0,44,6,
-160,207,1,0,108,0,3,30,116,255,128,255,138,0,63,6,
-228,212,1,0,44,6,198,80,1,0,108,0,3,30,116,255,
-128,255,116,0,63,6,228,212,1,0,44,6,206,32,0,0,
-108,0,3,30,116,255,128,255,94,0,63,6,228,212,1,0,
-44,6,210,175,129,0,108,0,3,30,116,255,128,255,72,0,
-63,6,228,212,1,0,44,6,56,179,129,0,108,0,3,30,
-116,255,128,255,50,0,63,6,228,212,1,0,44,6,158,41,
-129,0,108,0,230,103,3,0,204,94,255,0,200,90,136,98,
-203,97,230,87,1,0,202,94,0,255,216,82,200,90,203,81,
-204,81,127,0,99,95,37,0,99,103,41,0,43,6,184,29,
-133,0,43,103,1,0,224,97,186,5,128,7,116,0,65,98,
-107,103,1,0,99,15,5,0,99,23,9,0,99,47,13,0,
-99,55,17,0,99,63,21,0,99,71,25,0,99,79,29,0,
-99,87,33,0,99,111,45,0,99,119,49,0,99,127,53,0,
-99,135,57,0,99,143,61,0,99,151,65,0,99,159,69,0,
-99,247,113,0,244,111,64,0,241,119,64,0,240,127,64,0,
-225,135,64,0,224,143,64,0,99,111,121,0,99,119,125,0,
-99,127,129,0,99,135,133,0,99,143,137,0,127,0,65,98,
-107,103,1,0,43,6,36,183,255,255,43,103,1,0,224,97,
-186,5,128,7,124,0,99,15,5,0,99,23,9,0,99,47,
-13,0,99,55,17,0,99,63,21,0,99,71,25,0,99,79,
-29,0,99,87,33,0,99,111,45,0,99,119,49,0,99,127,
-53,0,99,135,57,0,99,143,61,0,99,151,65,0,99,159,
-69,0,99,247,113,0,244,111,64,0,241,119,64,0,240,127,
-64,0,225,135,64,0,224,143,64,0,99,111,121,0,99,119,
-125,0,99,127,129,0,99,135,133,0,99,143,137,0,108,31,
-9,0,43,6,32,183,255,255,43,31,1,0,127,0,3,30,
-140,0,127,0,224,7,96,1,43,6,184,29,133,0,43,103,
-1,0,95,98,107,103,1,0,224,97,186,5,128,7,128,0,
-35,103,121,0,35,111,125,0,35,119,129,0,35,127,133,0,
-35,135,137,0,236,167,32,0,237,143,32,0,238,135,32,0,
-239,15,32,0,240,7,32,0,35,15,5,0,35,23,9,0,
-35,47,13,0,35,55,17,0,35,63,21,0,35,71,25,0,
-35,79,29,0,35,87,33,0,35,95,37,0,35,103,41,0,
-35,111,45,0,35,119,49,0,35,127,53,0,35,135,57,0,
-35,143,61,0,35,151,65,0,35,159,69,0,35,247,113,0,
-35,255,117,0,3,30,140,0,224,7,64,1,43,6,36,183,
-255,255,43,103,1,0,45,6,192,184,255,255,224,97,186,5,
-128,7,0,1,45,119,1,0,47,6,40,183,255,255,224,113,
-178,5,128,7,16,0,47,135,1,0,240,97,178,5,128,7,
-132,0,44,31,9,0,35,103,121,0,35,111,125,0,35,119,
-129,0,35,127,133,0,35,135,137,0,236,167,32,0,237,143,
-32,0,238,135,32,0,239,15,32,0,240,7,32,0,35,15,
-5,0,35,23,9,0,35,47,13,0,35,55,17,0,35,63,
-21,0,35,71,25,0,35,79,29,0,35,87,33,0,35,95,
-37,0,35,103,41,0,35,111,45,0,35,119,49,0,35,127,
-53,0,35,135,57,0,35,143,61,0,35,151,65,0,35,159,
-69,0,35,247,113,0,35,255,117,0,3,30,140,0,224,7,
-64,1,44,55,9,0,1,114,102,119,1,0,102,167,73,0,
-102,175,77,0,102,183,81,0,102,191,85,0,102,199,89,0,
-102,207,93,0,102,215,97,0,102,223,101,0,102,231,105,0,
-102,239,109,0,47,6,196,29,133,0,47,135,1,0,224,129,
-186,5,128,7,12,0,108,135,25,0,111,7,1,0,107,7,
-1,0,45,6,176,215,1,0,237,7,32,0,224,7,64,1,
-45,6,176,215,1,0,237,7,32,0,224,7,64,1,0,0,
-3,30,116,255,99,95,37,0,99,103,41,0,99,111,45,0,
-99,119,49,0,99,127,53,0,43,6,220,70,133,0,43,103,
-1,0,65,98,107,103,1,0,43,6,196,29,133,0,43,103,
-1,0,0,120,224,97,186,5,128,7,30,0,95,98,107,103,
-1,0,224,97,178,5,128,7,16,0,43,6,200,29,133,0,
-1,122,107,127,1,0,43,6,204,29,133,0,43,103,1,0,
-44,111,1,0,224,105,186,5,128,7,20,0,43,6,208,29,
-133,0,1,122,107,127,1,0,128,7,38,0,68,98,45,6,
-212,29,133,0,45,119,1,0,236,113,178,5,128,7,14,0,
-45,6,216,29,133,0,45,103,1,0,107,103,1,0,224,121,
-186,5,128,7,76,0,35,95,37,0,35,103,41,0,35,111,
-45,0,35,119,49,0,35,127,53,0,191,255,106,252,43,6,
-208,29,133,0,43,103,1,0,224,97,186,5,128,7,30,0,
-43,6,192,184,255,255,43,103,1,0,65,98,107,103,1,0,
-38,6,176,134,133,0,191,255,142,230,191,7,90,253,35,95,
-37,0,35,103,41,0,35,111,45,0,35,119,49,0,35,127,
-53,0,35,255,117,0,3,30,140,0,224,7,64,1,0,0,
-224,135,96,1,44,6,40,183,255,255,44,55,1,0,224,49,
-186,5,191,7,248,255,224,7,96,1,44,6,36,183,255,255,
-108,55,1,0,38,111,5,0,38,119,25,0,38,31,9,0,
-65,106,102,111,5,0,35,127,1,0,44,6,196,29,133,0,
-108,119,1,0,224,121,178,5,128,7,70,0,35,47,5,0,
-35,167,9,0,35,175,13,0,35,183,17,0,35,191,21,0,
-35,199,25,0,35,207,29,0,35,215,33,0,35,223,37,0,
-35,231,41,0,35,239,45,0,35,247,49,0,35,255,53,0,
-35,103,57,0,3,30,60,0,236,47,32,0,127,0,35,103,
-121,0,35,111,125,0,35,119,129,0,35,127,133,0,35,135,
-137,0,236,167,32,0,237,143,32,0,238,135,32,0,239,15,
-32,0,240,7,32,0,35,15,5,0,35,23,9,0,35,47,
-13,0,35,55,17,0,35,63,21,0,35,71,25,0,35,79,
-29,0,35,87,33,0,35,95,37,0,35,103,41,0,35,111,
-45,0,35,119,49,0,35,127,53,0,35,135,57,0,35,143,
-61,0,35,151,65,0,35,159,69,0,35,167,73,0,35,175,
-77,0,35,183,81,0,35,191,85,0,35,199,89,0,35,207,
-93,0,35,215,97,0,35,223,101,0,35,231,105,0,35,239,
-109,0,35,247,113,0,35,255,117,0,3,30,140,0,224,7,
-64,1,0,0,65,115,115,101,114,116,58,37,100,32,102,114,
-111,109,32,37,115,10,70,105,108,101,58,37,115,32,76,105,
-110,101,58,37,100,10,0,0,83,101,110,100,32,65,69,78,
-32,40,99,111,100,101,44,32,116,105,109,101,41,58,32,48,
-120,37,120,44,32,48,120,37,120,10,0,0,0,0,51,119,
-97,114,101,85,115,101,114,80,97,115,115,119,111,114,100,32,
-32,32,32,32,32,32,32,32,32,32,32,32,32,32,0,0,
+192,0,11,137,96,143,193,223,23,232,128,7,74,1,2,128,
+218,129,208,231,31,0,154,61,60,127,1,0,239,233,242,29,
+61,87,5,0,10,87,34,0,99,82,146,29,218,17,4,98,
+98,103,30,0,1,90,32,143,193,223,251,95,192,0,11,137,
+96,143,193,223,98,82,154,13,124,239,9,0,27,48,29,56,
+191,255,138,253,128,7,0,1,23,232,213,125,224,193,234,13,
+1,114,218,17,98,7,30,0,251,119,192,0,32,95,193,223,
+46,96,76,89,96,95,193,223,1,194,124,239,9,0,27,48,
+29,56,191,255,88,253,245,101,23,232,213,101,17,16,97,18,
+234,45,27,136,194,138,36,118,184,138,206,137,49,23,1,0,
+194,199,0,0,130,13,124,239,9,0,27,48,29,56,191,255,
+138,249,181,77,27,104,197,106,218,105,109,7,30,0,1,82,
+32,127,193,223,251,87,192,0,42,128,80,121,96,127,193,223,
+27,112,193,114,36,94,248,138,203,113,238,87,1,0,138,86,
+0,64,98,87,0,0,1,194,23,232,213,53,99,18,218,45,
+60,127,5,0,239,233,210,21,224,193,218,45,224,201,183,45,
+1,82,27,104,197,106,218,105,109,7,30,0,251,87,192,0,
+32,127,193,223,42,128,80,121,96,127,193,223,1,194,181,29,
+221,199,33,0,226,5,36,119,236,139,65,114,100,119,236,139,
+60,23,13,0,60,103,5,0,44,103,1,0,98,103,9,0,
+36,95,45,175,98,95,25,0,60,87,1,0,234,233,178,5,
+191,7,82,254,60,143,1,0,241,233,234,53,60,55,17,0,
+191,255,50,152,10,16,224,17,210,29,60,135,1,0,112,23,
+5,0,34,127,9,0,124,127,1,0,60,119,5,0,224,113,
+202,229,124,23,5,0,2,232,60,23,13,0,60,103,5,0,
+44,103,1,0,98,103,9,0,36,95,45,175,98,95,25,0,
+197,213,224,193,154,21,224,201,247,13,1,114,27,136,197,138,
+218,137,113,7,30,0,251,119,192,0,32,95,193,223,46,96,
+76,89,96,95,193,223,64,6,255,241,0,0,3,30,116,255,
+128,255,160,0,63,6,52,215,1,0,44,6,240,209,1,0,
+108,0,3,30,116,255,128,255,138,0,63,6,52,215,1,0,
+44,6,154,82,1,0,108,0,3,30,116,255,128,255,116,0,
+63,6,52,215,1,0,44,6,206,32,0,0,108,0,3,30,
+116,255,128,255,94,0,63,6,52,215,1,0,44,6,116,184,
+129,0,108,0,3,30,116,255,128,255,72,0,63,6,52,215,
+1,0,44,6,218,187,129,0,108,0,3,30,116,255,128,255,
+50,0,63,6,52,215,1,0,44,6,170,47,129,0,108,0,
+230,103,3,0,204,94,255,0,200,90,136,98,203,97,230,87,
+1,0,202,94,0,255,216,82,200,90,203,81,204,81,127,0,
+99,95,37,0,99,103,41,0,43,6,64,41,133,0,43,103,
+1,0,224,97,186,5,128,7,116,0,65,98,107,103,1,0,
+99,15,5,0,99,23,9,0,99,47,13,0,99,55,17,0,
+99,63,21,0,99,71,25,0,99,79,29,0,99,87,33,0,
+99,111,45,0,99,119,49,0,99,127,53,0,99,135,57,0,
+99,143,61,0,99,151,65,0,99,159,69,0,99,247,113,0,
+244,111,64,0,241,119,64,0,240,127,64,0,225,135,64,0,
+224,143,64,0,99,111,121,0,99,119,125,0,99,127,129,0,
+99,135,133,0,99,143,137,0,127,0,65,98,107,103,1,0,
+43,6,36,183,255,255,43,103,1,0,224,97,186,5,128,7,
+124,0,99,15,5,0,99,23,9,0,99,47,13,0,99,55,
+17,0,99,63,21,0,99,71,25,0,99,79,29,0,99,87,
+33,0,99,111,45,0,99,119,49,0,99,127,53,0,99,135,
+57,0,99,143,61,0,99,151,65,0,99,159,69,0,99,247,
+113,0,244,111,64,0,241,119,64,0,240,127,64,0,225,135,
+64,0,224,143,64,0,99,111,121,0,99,119,125,0,99,127,
+129,0,99,135,133,0,99,143,137,0,108,31,9,0,43,6,
+32,183,255,255,43,31,1,0,127,0,3,30,140,0,127,0,
+224,7,96,1,43,6,64,41,133,0,43,103,1,0,95,98,
+107,103,1,0,224,97,186,5,128,7,128,0,35,103,121,0,
+35,111,125,0,35,119,129,0,35,127,133,0,35,135,137,0,
+236,167,32,0,237,143,32,0,238,135,32,0,239,15,32,0,
+240,7,32,0,35,15,5,0,35,23,9,0,35,47,13,0,
+35,55,17,0,35,63,21,0,35,71,25,0,35,79,29,0,
+35,87,33,0,35,95,37,0,35,103,41,0,35,111,45,0,
+35,119,49,0,35,127,53,0,35,135,57,0,35,143,61,0,
+35,151,65,0,35,159,69,0,35,247,113,0,35,255,117,0,
+3,30,140,0,224,7,64,1,43,6,36,183,255,255,43,103,
+1,0,45,6,192,184,255,255,224,97,186,5,128,7,0,1,
+45,119,1,0,47,6,40,183,255,255,224,113,178,5,128,7,
+16,0,47,135,1,0,240,97,178,5,128,7,132,0,44,31,
+9,0,35,103,121,0,35,111,125,0,35,119,129,0,35,127,
+133,0,35,135,137,0,236,167,32,0,237,143,32,0,238,135,
+32,0,239,15,32,0,240,7,32,0,35,15,5,0,35,23,
+9,0,35,47,13,0,35,55,17,0,35,63,21,0,35,71,
+25,0,35,79,29,0,35,87,33,0,35,95,37,0,35,103,
+41,0,35,111,45,0,35,119,49,0,35,127,53,0,35,135,
+57,0,35,143,61,0,35,151,65,0,35,159,69,0,35,247,
+113,0,35,255,117,0,3,30,140,0,224,7,64,1,44,55,
+9,0,1,114,102,119,1,0,102,167,73,0,102,175,77,0,
+102,183,81,0,102,191,85,0,102,199,89,0,102,207,93,0,
+102,215,97,0,102,223,101,0,102,231,105,0,102,239,109,0,
+47,6,76,41,133,0,47,135,1,0,224,129,186,5,128,7,
+12,0,108,135,25,0,111,7,1,0,107,7,1,0,45,6,
+0,218,1,0,237,7,32,0,224,7,64,1,45,6,0,218,
+1,0,237,7,32,0,224,7,64,1,0,0,3,30,116,255,
+99,95,37,0,99,103,41,0,99,111,45,0,99,119,49,0,
+99,127,53,0,43,6,100,82,133,0,43,103,1,0,65,98,
+107,103,1,0,43,6,76,41,133,0,43,103,1,0,0,120,
+224,97,186,5,128,7,30,0,95,98,107,103,1,0,224,97,
+178,5,128,7,16,0,43,6,80,41,133,0,1,122,107,127,
+1,0,43,6,84,41,133,0,43,103,1,0,44,111,1,0,
+224,105,186,5,128,7,20,0,43,6,88,41,133,0,1,122,
+107,127,1,0,128,7,38,0,68,98,45,6,92,41,133,0,
+45,119,1,0,236,113,178,5,128,7,14,0,45,6,96,41,
+133,0,45,103,1,0,107,103,1,0,224,121,186,5,128,7,
+76,0,35,95,37,0,35,103,41,0,35,111,45,0,35,119,
+49,0,35,127,53,0,191,255,106,252,43,6,88,41,133,0,
+43,103,1,0,224,97,186,5,128,7,30,0,43,6,192,184,
+255,255,43,103,1,0,65,98,107,103,1,0,38,6,16,146,
+133,0,191,255,140,230,191,7,90,253,35,95,37,0,35,103,
+41,0,35,111,45,0,35,119,49,0,35,127,53,0,35,255,
+117,0,3,30,140,0,224,7,64,1,0,0,224,135,96,1,
+44,6,40,183,255,255,44,55,1,0,224,49,186,5,191,7,
+248,255,224,7,96,1,44,6,36,183,255,255,108,55,1,0,
+38,111,5,0,38,119,25,0,38,31,9,0,65,106,102,111,
+5,0,35,127,1,0,44,6,76,41,133,0,108,119,1,0,
+224,121,178,5,128,7,70,0,35,47,5,0,35,167,9,0,
+35,175,13,0,35,183,17,0,35,191,21,0,35,199,25,0,
+35,207,29,0,35,215,33,0,35,223,37,0,35,231,41,0,
+35,239,45,0,35,247,49,0,35,255,53,0,35,103,57,0,
+3,30,60,0,236,47,32,0,127,0,35,103,121,0,35,111,
+125,0,35,119,129,0,35,127,133,0,35,135,137,0,236,167,
+32,0,237,143,32,0,238,135,32,0,239,15,32,0,240,7,
+32,0,35,15,5,0,35,23,9,0,35,47,13,0,35,55,
+17,0,35,63,21,0,35,71,25,0,35,79,29,0,35,87,
+33,0,35,95,37,0,35,103,41,0,35,111,45,0,35,119,
+49,0,35,127,53,0,35,135,57,0,35,143,61,0,35,151,
+65,0,35,159,69,0,35,167,73,0,35,175,77,0,35,183,
+81,0,35,191,85,0,35,199,89,0,35,207,93,0,35,215,
+97,0,35,223,101,0,35,231,105,0,35,239,109,0,35,247,
+113,0,35,255,117,0,3,30,140,0,224,7,64,1,0,0,
+65,115,115,101,114,116,58,37,100,32,102,114,111,109,32,37,
+115,10,70,105,108,101,58,37,115,32,76,105,110,101,58,37,
+100,10,0,0,83,101,110,100,32,65,69,78,32,40,99,111,
+100,101,44,32,116,105,109,101,41,58,32,48,120,37,120,44,
+32,48,120,37,120,10,0,0,0,0,51,119,97,114,101,85,
+115,101,114,80,97,115,115,119,111,114,100,32,32,32,32,32,
+32,32,32,32,32,32,32,32,32,32,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,
@@ -24282,294 +24445,295 @@ unsigned char tw_fw_code[] __initdata = 
 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,97,111,112,67,
-111,109,112,105,108,101,114,46,99,112,112,0,97,111,112,67,
-111,109,112,105,108,101,114,46,99,112,112,0,97,111,112,67,
-111,109,112,105,108,101,114,46,99,112,112,0,10,42,42,42,
-42,42,42,42,42,42,42,42,42,42,42,0,77,97,114,32,
-49,57,32,50,48,48,52,0,10,66,117,105,108,100,32,116,
-97,114,103,101,116,32,58,32,77,69,50,0,10,83,82,76,
-32,114,97,110,103,101,32,32,32,32,58,32,48,120,37,48,
-52,88,45,48,120,37,48,52,88,0,0,0,10,66,114,97,
-110,99,104,47,98,117,105,108,100,32,58,32,48,120,37,48,
-52,88,47,48,120,37,48,52,88,0,0,0,10,10,65,112,
-97,99,104,101,32,82,65,73,68,32,70,105,114,109,119,97,
-114,101,32,40,67,41,32,50,48,48,49,45,50,48,48,52,
-32,51,119,97,114,101,44,32,73,110,99,10,0,0,0,0,
-10,86,101,114,115,105,111,110,32,116,97,103,32,32,58,32,
-70,69,57,88,32,50,46,48,50,46,48,48,46,48,48,56,
-0,0,0,0,10,67,111,109,112,105,108,101,32,116,105,109,
-101,32,58,32,37,115,32,97,116,32,37,115,0,0,0,0,
-49,50,58,50,57,58,53,55,0,0,0,0,10,83,116,97,
-114,116,117,112,32,105,110,102,111,32,58,32,48,120,37,48,
-50,88,37,48,50,88,0,0,45,45,32,83,65,84,65,32,
-45,45,10,0,65,99,104,105,112,32,40,37,100,41,32,37,
-100,46,37,100,10,0,0,0,70,111,117,110,100,32,37,100,
-32,97,99,104,105,112,115,33,10,0,0,0,97,99,104,105,
-112,46,99,112,112,0,0,0,42,42,32,73,110,118,97,108,
-105,100,32,112,111,114,116,32,99,111,117,110,116,32,115,101,
-116,116,105,110,103,32,40,37,100,41,44,32,117,115,105,110,
-103,32,104,97,114,100,119,97,114,101,32,99,111,117,110,116,
-32,40,37,100,41,46,32,42,42,10,0,0,98,105,111,115,
-46,99,112,112,0,0,0,0,69,114,114,111,114,32,108,111,
-97,100,105,110,103,32,66,73,79,83,58,32,48,120,37,48,
-52,120,44,32,37,115,10,0,66,73,79,83,32,105,109,97,
-103,101,32,110,111,116,32,102,111,117,110,100,10,0,0,0,
-10,83,98,117,102,32,102,97,105,108,117,114,101,32,100,101,
-116,101,99,116,101,100,46,32,66,73,79,83,32,108,111,97,
-100,105,110,103,32,115,107,105,112,112,101,100,10,0,0,0,
-66,73,79,83,32,97,108,114,101,97,100,121,32,108,111,97,
-100,101,100,58,32,37,115,10,0,0,0,0,66,73,79,83,
-32,105,109,97,103,101,32,108,111,97,100,101,100,58,32,37,
-115,10,0,0,66,117,102,102,101,114,32,115,105,122,101,32,
-61,32,0,0,98,117,102,102,101,114,77,103,114,46,99,112,
-112,0,0,0,83,109,97,108,108,68,97,116,97,66,108,111,
-99,107,80,111,111,108,0,0,83,109,97,108,108,80,97,114,
-105,116,121,66,108,111,99,107,80,111,111,108,0,0,0,0,
-76,97,114,103,101,68,97,116,97,66,108,111,99,107,80,111,
-111,108,0,0,76,97,114,103,101,80,97,114,105,116,121,66,
-108,111,99,107,80,111,111,108,0,0,0,0,68,97,116,97,
-32,99,97,99,104,101,32,61,32,0,0,0,80,97,114,105,
-116,121,32,98,117,102,102,101,114,32,61,32,0,0,0,0,
+0,0,0,0,0,0,0,0,97,111,112,67,111,109,112,105,
+108,101,114,46,99,112,112,0,97,111,112,67,111,109,112,105,
+108,101,114,46,99,112,112,0,97,111,112,67,111,109,112,105,
+108,101,114,46,99,112,112,0,10,42,42,42,42,42,42,42,
+42,42,42,42,42,42,42,0,74,117,110,32,32,57,32,50,
+48,48,52,0,10,66,117,105,108,100,32,116,97,114,103,101,
+116,32,58,32,77,69,50,0,10,83,82,76,32,114,97,110,
+103,101,32,32,32,32,58,32,48,120,37,48,52,88,45,48,
+120,37,48,52,88,0,0,0,10,66,114,97,110,99,104,47,
+98,117,105,108,100,32,58,32,48,120,37,48,52,88,47,48,
+120,37,48,52,88,0,0,0,10,10,65,112,97,99,104,101,
+32,82,65,73,68,32,70,105,114,109,119,97,114,101,32,40,
+67,41,32,50,48,48,49,45,50,48,48,52,32,51,119,97,
+114,101,44,32,73,110,99,10,0,0,0,0,10,86,101,114,
+115,105,111,110,32,116,97,103,32,32,58,32,70,69,57,88,
+32,50,46,48,50,46,48,48,46,48,49,50,0,0,0,0,
+10,67,111,109,112,105,108,101,32,116,105,109,101,32,58,32,
+37,115,32,97,116,32,37,115,0,0,0,0,49,54,58,51,
+56,58,52,57,0,0,0,0,10,83,116,97,114,116,117,112,
+32,105,110,102,111,32,58,32,48,120,37,48,50,88,37,48,
+50,88,0,0,45,45,32,83,65,84,65,32,45,45,10,0,
+65,99,104,105,112,32,40,37,100,41,32,37,100,46,37,100,
+10,0,0,0,70,111,117,110,100,32,37,100,32,97,99,104,
+105,112,115,33,10,0,0,0,97,99,104,105,112,46,99,112,
+112,0,0,0,42,42,32,73,110,118,97,108,105,100,32,112,
+111,114,116,32,99,111,117,110,116,32,115,101,116,116,105,110,
+103,32,40,37,100,41,44,32,117,115,105,110,103,32,104,97,
+114,100,119,97,114,101,32,99,111,117,110,116,32,40,37,100,
+41,46,32,42,42,10,0,0,98,105,111,115,46,99,112,112,
+0,0,0,0,69,114,114,111,114,32,108,111,97,100,105,110,
+103,32,66,73,79,83,58,32,48,120,37,48,52,120,44,32,
+37,115,10,0,66,73,79,83,32,105,109,97,103,101,32,110,
+111,116,32,102,111,117,110,100,10,0,0,0,10,83,98,117,
+102,32,102,97,105,108,117,114,101,32,100,101,116,101,99,116,
+101,100,46,32,66,73,79,83,32,108,111,97,100,105,110,103,
+32,115,107,105,112,112,101,100,10,0,0,0,66,73,79,83,
+32,97,108,114,101,97,100,121,32,108,111,97,100,101,100,58,
+32,37,115,10,0,0,0,0,66,73,79,83,32,105,109,97,
+103,101,32,108,111,97,100,101,100,58,32,37,115,10,0,0,
+66,117,102,102,101,114,32,115,105,122,101,32,61,32,0,0,
 98,117,102,102,101,114,77,103,114,46,99,112,112,0,0,0,
-98,117,102,102,101,114,77,103,114,46,99,112,112,0,0,0,
-3,0,0,0,2,0,0,0,104,129,132,0,120,129,132,0,
-104,129,132,0,0,0,0,0,0,0,0,0,3,0,0,0,
-1,0,0,0,120,129,132,0,104,129,132,0,120,129,132,0,
-0,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,
-120,129,132,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,5,0,0,0,1,0,0,0,112,129,132,0,
-104,129,132,0,128,129,132,0,120,129,132,0,128,129,132,0,
-3,0,0,0,1,0,0,0,128,129,132,0,120,129,132,0,
-128,129,132,0,0,0,0,0,0,0,0,0,3,0,0,0,
-1,0,0,0,128,129,132,0,120,129,132,0,128,129,132,0,
-0,0,0,0,0,0,0,0,196,184,255,255,16,0,0,0,
-36,185,255,255,16,0,0,0,244,184,255,255,128,0,0,0,
-84,185,255,255,128,0,0,0,83,101,109,90,101,114,111,77,
-83,101,103,115,0,0,0,0,98,117,102,102,101,114,85,116,
-105,108,115,46,99,112,112,0,107,101,114,110,101,108,46,104,
-112,112,0,0,80,101,114,102,111,114,109,105,110,103,32,83,
-98,117,102,32,116,101,115,116,115,46,46,46,10,0,0,0,
-87,67,69,61,37,117,32,45,32,0,0,0,67,97,99,104,
-101,32,83,101,116,116,105,110,103,115,58,32,0,0,0,0,
-99,97,99,104,101,77,103,114,46,99,112,112,0,0,0,0,
-99,97,99,104,101,77,103,114,46,99,112,112,0,0,0,0,
-99,97,99,104,101,77,103,114,46,99,112,112,0,0,0,0,
-99,97,99,104,101,77,103,114,46,99,112,112,0,0,0,0,
-99,97,99,104,101,66,105,110,77,103,114,46,99,112,112,0,
-99,97,99,104,101,66,105,110,77,103,114,46,99,112,112,0,
-99,97,99,104,101,66,105,110,77,103,114,46,99,112,112,0,
-99,97,99,104,101,66,105,110,77,103,114,46,99,112,112,0,
-99,97,99,104,101,66,105,110,77,103,114,46,99,112,112,0,
-99,97,99,104,101,66,105,110,77,103,114,46,99,112,112,0,
-99,97,99,104,101,66,105,110,77,103,114,46,99,112,112,0,
-99,97,99,104,101,66,105,110,77,103,114,46,99,112,112,0,
-99,97,99,104,101,66,105,110,77,103,114,46,99,112,112,0,
-99,97,99,104,101,66,105,110,77,103,114,46,99,112,112,0,
-99,97,99,104,101,66,105,110,77,103,114,46,99,112,112,0,
-78,117,109,98,101,114,32,111,102,32,98,105,110,115,32,61,
-32,37,100,32,103,114,101,97,116,101,114,32,116,104,97,110,
-32,49,32,105,115,32,110,111,116,32,115,117,112,112,111,114,
-116,101,100,32,45,32,97,115,115,101,114,116,32,102,111,114,
-32,110,111,119,46,0,0,0,99,97,99,104,101,66,105,110,
-77,103,114,46,99,112,112,0,99,97,99,104,101,66,105,110,
-77,103,114,46,99,112,112,0,99,97,99,104,101,66,105,110,
-77,103,114,46,99,112,112,0,99,97,99,104,101,66,105,110,
-77,103,114,46,99,112,112,0,99,97,99,104,101,66,105,110,
-77,103,114,46,99,112,112,0,99,97,99,104,101,66,105,110,
-77,103,114,46,99,112,112,0,99,97,99,104,101,66,105,110,
-77,103,114,46,99,112,112,0,99,97,99,104,101,66,105,110,
-77,103,114,46,99,112,112,0,99,97,99,104,101,66,105,110,
-77,103,114,46,99,112,112,0,99,97,99,104,101,66,105,110,
-77,103,114,46,99,112,112,0,99,97,99,104,101,66,105,110,
-77,103,114,46,99,112,112,0,99,97,99,104,101,66,105,110,
-77,103,114,46,99,112,112,0,99,97,99,104,101,83,101,103,
-77,103,114,46,99,112,112,0,99,97,99,104,101,83,101,103,
-77,103,114,46,99,112,112,0,99,97,99,104,101,83,101,103,
-77,103,114,46,99,112,112,0,99,97,99,104,101,83,101,103,
-77,103,114,46,99,112,112,0,99,109,100,69,120,101,99,46,
+83,109,97,108,108,68,97,116,97,66,108,111,99,107,80,111,
+111,108,0,0,83,109,97,108,108,80,97,114,105,116,121,66,
+108,111,99,107,80,111,111,108,0,0,0,0,76,97,114,103,
+101,68,97,116,97,66,108,111,99,107,80,111,111,108,0,0,
+76,97,114,103,101,80,97,114,105,116,121,66,108,111,99,107,
+80,111,111,108,0,0,0,0,68,97,116,97,32,99,97,99,
+104,101,32,61,32,0,0,0,80,97,114,105,116,121,32,98,
+117,102,102,101,114,32,61,32,0,0,0,0,98,117,102,102,
+101,114,77,103,114,46,99,112,112,0,0,0,98,117,102,102,
+101,114,77,103,114,46,99,112,112,0,0,0,3,0,0,0,
+2,0,0,0,72,140,132,0,88,140,132,0,72,140,132,0,
+0,0,0,0,0,0,0,0,3,0,0,0,1,0,0,0,
+88,140,132,0,72,140,132,0,88,140,132,0,0,0,0,0,
+0,0,0,0,1,0,0,0,1,0,0,0,88,140,132,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+5,0,0,0,1,0,0,0,80,140,132,0,72,140,132,0,
+96,140,132,0,88,140,132,0,96,140,132,0,3,0,0,0,
+1,0,0,0,96,140,132,0,88,140,132,0,96,140,132,0,
+0,0,0,0,0,0,0,0,3,0,0,0,1,0,0,0,
+96,140,132,0,88,140,132,0,96,140,132,0,0,0,0,0,
+0,0,0,0,196,184,255,255,16,0,0,0,36,185,255,255,
+16,0,0,0,244,184,255,255,128,0,0,0,84,185,255,255,
+128,0,0,0,83,101,109,90,101,114,111,77,83,101,103,115,
+0,0,0,0,98,117,102,102,101,114,85,116,105,108,115,46,
+99,112,112,0,107,101,114,110,101,108,46,104,112,112,0,0,
+80,101,114,102,111,114,109,105,110,103,32,83,98,117,102,32,
+116,101,115,116,115,46,46,46,10,0,0,0,87,67,69,61,
+37,117,32,45,32,0,0,0,67,97,99,104,101,32,83,101,
+116,116,105,110,103,115,58,32,0,0,0,0,99,97,99,104,
+101,77,103,114,46,99,112,112,0,0,0,0,99,97,99,104,
+101,77,103,114,46,99,112,112,0,0,0,0,99,97,99,104,
+101,77,103,114,46,99,112,112,0,0,0,0,99,97,99,104,
+101,77,103,114,46,99,112,112,0,0,0,0,99,97,99,104,
+101,66,105,110,77,103,114,46,99,112,112,0,99,97,99,104,
+101,66,105,110,77,103,114,46,99,112,112,0,99,97,99,104,
+101,66,105,110,77,103,114,46,99,112,112,0,99,97,99,104,
+101,66,105,110,77,103,114,46,99,112,112,0,99,97,99,104,
+101,66,105,110,77,103,114,46,99,112,112,0,99,97,99,104,
+101,66,105,110,77,103,114,46,99,112,112,0,99,97,99,104,
+101,66,105,110,77,103,114,46,99,112,112,0,99,97,99,104,
+101,66,105,110,77,103,114,46,99,112,112,0,99,97,99,104,
+101,66,105,110,77,103,114,46,99,112,112,0,99,97,99,104,
+101,66,105,110,77,103,114,46,99,112,112,0,99,97,99,104,
+101,66,105,110,77,103,114,46,99,112,112,0,78,117,109,98,
+101,114,32,111,102,32,98,105,110,115,32,61,32,37,100,32,
+103,114,101,97,116,101,114,32,116,104,97,110,32,49,32,105,
+115,32,110,111,116,32,115,117,112,112,111,114,116,101,100,32,
+45,32,97,115,115,101,114,116,32,102,111,114,32,110,111,119,
+46,0,0,0,99,97,99,104,101,66,105,110,77,103,114,46,
+99,112,112,0,99,97,99,104,101,66,105,110,77,103,114,46,
+99,112,112,0,99,97,99,104,101,66,105,110,77,103,114,46,
+99,112,112,0,99,97,99,104,101,66,105,110,77,103,114,46,
+99,112,112,0,99,97,99,104,101,66,105,110,77,103,114,46,
+99,112,112,0,99,97,99,104,101,66,105,110,77,103,114,46,
+99,112,112,0,99,97,99,104,101,66,105,110,77,103,114,46,
+99,112,112,0,99,97,99,104,101,66,105,110,77,103,114,46,
+99,112,112,0,99,97,99,104,101,66,105,110,77,103,114,46,
+99,112,112,0,99,97,99,104,101,66,105,110,77,103,114,46,
+99,112,112,0,99,97,99,104,101,66,105,110,77,103,114,46,
+99,112,112,0,99,97,99,104,101,66,105,110,77,103,114,46,
+99,112,112,0,99,97,99,104,101,83,101,103,77,103,114,46,
+99,112,112,0,99,97,99,104,101,83,101,103,77,103,114,46,
+99,112,112,0,99,97,99,104,101,83,101,103,77,103,114,46,
+99,112,112,0,99,97,99,104,101,83,101,103,77,103,114,46,
 99,112,112,0,99,109,100,69,120,101,99,46,99,112,112,0,
-112,99,104,105,112,46,104,112,112,0,0,0,112,99,104,105,
-112,46,104,112,112,0,0,0,107,101,114,110,101,108,46,104,
-112,112,0,0,107,101,114,110,101,108,46,104,112,112,0,0,
-107,101,114,110,101,108,46,104,112,112,0,0,97,100,100,114,
-101,115,115,61,48,120,37,76,88,44,32,108,101,110,103,116,
-104,61,48,120,37,88,44,32,99,109,100,61,37,99,0,0,
 99,109,100,69,120,101,99,46,99,112,112,0,112,99,104,105,
-112,46,104,112,112,0,0,0,107,101,114,110,101,108,46,104,
-112,112,0,0,112,99,104,105,112,46,104,112,112,0,0,0,
-107,101,114,110,101,108,46,104,112,112,0,0,112,99,104,105,
-112,46,104,112,112,0,0,0,107,101,114,110,101,108,46,104,
-112,112,0,0,112,99,104,105,112,46,104,112,112,0,0,0,
+112,46,104,112,112,0,0,0,112,99,104,105,112,46,104,112,
+112,0,0,0,107,101,114,110,101,108,46,104,112,112,0,0,
 107,101,114,110,101,108,46,104,112,112,0,0,107,101,114,110,
-101,108,46,104,112,112,0,0,77,117,116,67,111,109,109,97,
-110,100,76,111,99,107,0,0,99,109,100,84,97,115,107,46,
-99,112,112,0,99,109,100,84,97,115,107,46,99,112,112,0,
+101,108,46,104,112,112,0,0,97,100,100,114,101,115,115,61,
+48,120,37,76,88,44,32,108,101,110,103,116,104,61,48,120,
+37,88,44,32,99,109,100,61,37,99,0,0,99,109,100,69,
+120,101,99,46,99,112,112,0,112,99,104,105,112,46,104,112,
+112,0,0,0,107,101,114,110,101,108,46,104,112,112,0,0,
+112,99,104,105,112,46,104,112,112,0,0,0,107,101,114,110,
+101,108,46,104,112,112,0,0,112,99,104,105,112,46,104,112,
+112,0,0,0,107,101,114,110,101,108,46,104,112,112,0,0,
+112,99,104,105,112,46,104,112,112,0,0,0,107,101,114,110,
+101,108,46,104,112,112,0,0,107,101,114,110,101,108,46,104,
+112,112,0,0,77,117,116,67,111,109,109,97,110,100,76,111,
+99,107,0,0,99,109,100,84,97,115,107,46,99,112,112,0,
+99,109,100,84,97,115,107,46,99,112,112,0,118,101,99,116,
+111,114,60,84,62,32,116,111,111,32,108,111,110,103,0,0,
 118,101,99,116,111,114,60,84,62,32,116,111,111,32,108,111,
-110,103,0,0,118,101,99,116,111,114,60,84,62,32,116,111,
-111,32,108,111,110,103,0,0,83,80,68,32,68,97,116,97,
-32,101,114,114,111,114,10,0,88,88,88,88,88,88,88,88,
-88,88,88,88,88,88,88,88,88,88,88,88,88,88,88,88,
+110,103,0,0,83,80,68,32,68,97,116,97,32,101,114,114,
+111,114,10,0,88,88,88,88,88,88,88,88,88,88,88,88,
 88,88,88,88,88,88,88,88,88,88,88,88,88,88,88,88,
-88,88,10,0,80,67,66,32,114,101,118,105,115,105,111,110,
-58,32,37,115,10,0,0,0,83,80,68,32,68,101,118,105,
-99,101,32,110,111,116,32,102,111,117,110,100,32,105,110,32,
-116,104,101,32,73,50,67,32,98,117,115,10,0,0,0,0,
-83,111,102,116,32,82,101,115,101,116,115,32,61,32,37,100,
-10,0,0,0,65,99,116,105,118,101,32,73,80,82,115,32,
-61,32,37,100,10,0,0,0,76,111,99,107,101,100,32,73,
-80,82,115,32,61,32,37,100,10,0,0,0,65,99,116,105,
-118,101,32,65,79,80,115,32,61,32,37,100,10,0,0,0,
-65,99,116,105,118,101,32,68,79,80,115,32,61,32,37,100,
-10,0,0,0,70,87,32,82,117,110,32,84,105,109,101,32,
-61,32,37,100,115,10,0,0,83,66,117,102,32,115,116,101,
-112,32,35,37,100,58,32,0,83,69,76,70,32,84,69,83,
-84,58,32,0,97,108,108,32,116,101,115,116,115,32,99,111,
-109,112,108,101,116,101,100,46,10,0,0,0,112,111,114,116,
-32,35,37,100,58,32,0,0,117,100,109,97,32,117,112,103,
-114,97,100,101,32,100,105,115,97,98,108,101,100,59,32,0,
-117,100,109,97,32,117,112,103,114,97,100,101,32,102,97,105,
-108,101,100,59,32,0,0,0,83,77,65,82,84,32,111,112,
-99,111,100,101,32,102,97,105,108,101,100,59,32,0,0,0,
-110,111,32,100,114,105,118,101,32,112,114,101,115,101,110,116,
-46,10,0,0,109,111,100,101,61,37,100,44,32,112,111,114,
-116,61,37,100,0,0,0,0,83,77,65,82,84,32,99,104,
-101,99,107,32,112,97,115,115,101,100,59,32,0,0,0,0,
-83,77,65,82,84,32,99,104,101,99,107,32,100,105,115,97,
-98,108,101,100,59,32,0,0,83,77,65,82,84,32,99,104,
-101,99,107,32,98,121,112,97,115,115,101,100,58,32,100,114,
-105,118,101,32,105,110,32,115,116,97,110,100,98,121,32,111,
-114,32,97,118,77,111,100,101,32,115,101,116,59,32,0,0,
-112,114,101,112,97,114,97,116,105,111,110,59,32,0,0,0,
-113,117,105,99,107,32,116,101,115,116,32,100,105,115,97,98,
-108,101,100,59,32,0,0,0,113,117,105,99,107,32,116,101,
-115,116,59,32,0,0,0,0,99,108,101,97,110,45,117,112,
-59,32,0,0,66,111,111,116,32,82,111,109,32,118,101,114,
-115,105,111,110,58,32,37,115,10,0,0,0,77,117,116,68,
-99,104,110,108,65,99,99,101,115,115,0,0,83,101,109,82,
-97,105,100,48,67,111,97,108,101,115,99,101,0,0,0,0,
-42,42,32,68,101,97,100,32,68,97,116,97,67,104,110,108,
-10,0,0,0,67,111,110,115,116,114,117,99,116,68,99,104,
-110,108,32,69,114,114,111,114,10,0,0,0,32,67,111,110,
-102,105,103,32,63,63,63,0,32,78,111,114,109,97,108,32,
-32,0,0,0,32,86,101,114,105,102,121,32,32,0,0,0,
-32,73,110,105,116,32,32,32,32,0,0,0,32,68,101,103,
-114,97,100,101,32,0,0,0,32,82,101,98,117,105,108,100,
-32,0,0,0,32,69,120,112,97,110,100,32,32,0,0,0,
-32,77,105,103,114,97,116,101,32,0,0,0,32,120,68,69,
-65,68,120,32,32,0,0,0,32,77,111,100,101,32,63,63,
-63,0,0,0,32,84,87,73,78,83,84,79,82,0,0,0,
-32,40,116,97,115,107,58,32,37,100,37,37,41,0,0,0,
-32,77,73,71,82,65,84,73,79,78,0,0,32,99,97,112,
-58,37,115,37,76,117,0,0,32,40,85,110,99,108,101,97,
-110,61,37,100,41,10,0,0,42,42,32,67,97,110,110,111,
-116,32,99,114,101,97,116,101,32,68,97,116,97,67,104,110,
-108,32,102,111,114,32,99,111,110,102,105,103,32,48,120,37,
-88,10,0,0,42,42,32,67,97,110,110,111,116,32,99,111,
-110,115,116,114,117,99,116,32,68,97,116,97,67,104,110,108,
-32,119,105,116,104,32,37,105,32,115,117,98,45,99,104,97,
-110,110,101,108,115,10,0,0,32,86,101,114,105,102,121,32,
-0,0,0,0,32,74,66,79,68,32,40,37,100,41,91,37,
-100,93,0,0,32,99,97,112,58,32,37,117,32,40,108,98,
-97,79,102,102,32,37,117,41,0,0,0,0,32,40,116,97,
-115,107,58,32,37,100,37,37,41,10,0,0,68,101,108,101,
-116,101,32,74,47,73,47,67,47,83,98,111,100,58,32,37,
-100,10,0,0,32,99,97,112,58,32,37,117,32,40,108,98,
-97,79,102,102,32,37,117,41,10,0,0,0,32,86,101,114,
-105,102,121,32,0,0,0,0,32,67,66,79,68,32,40,37,
-100,41,91,37,100,93,0,0,32,86,101,114,105,102,121,32,
-0,0,0,0,32,83,66,79,68,32,40,37,100,41,91,37,
+88,88,88,88,88,88,88,88,88,88,88,88,88,88,10,0,
+80,67,66,32,114,101,118,105,115,105,111,110,58,32,37,115,
+10,0,0,0,83,80,68,32,68,101,118,105,99,101,32,110,
+111,116,32,102,111,117,110,100,32,105,110,32,116,104,101,32,
+73,50,67,32,98,117,115,10,0,0,0,0,83,111,102,116,
+32,82,101,115,101,116,115,32,61,32,37,100,10,0,0,0,
+65,99,116,105,118,101,32,73,80,82,115,32,61,32,37,100,
+10,0,0,0,76,111,99,107,101,100,32,73,80,82,115,32,
+61,32,37,100,10,0,0,0,65,99,116,105,118,101,32,65,
+79,80,115,32,61,32,37,100,10,0,0,0,65,99,116,105,
+118,101,32,68,79,80,115,32,61,32,37,100,10,0,0,0,
+70,87,32,82,117,110,32,84,105,109,101,32,61,32,37,100,
+115,10,0,0,83,66,117,102,32,115,116,101,112,32,35,37,
+100,58,32,0,83,69,76,70,32,84,69,83,84,58,32,0,
+97,108,108,32,116,101,115,116,115,32,99,111,109,112,108,101,
+116,101,100,46,10,0,0,0,112,111,114,116,32,35,37,100,
+58,32,0,0,117,100,109,97,32,117,112,103,114,97,100,101,
+32,100,105,115,97,98,108,101,100,59,32,0,117,100,109,97,
+32,117,112,103,114,97,100,101,32,102,97,105,108,101,100,59,
+32,0,0,0,83,77,65,82,84,32,111,112,99,111,100,101,
+32,102,97,105,108,101,100,59,32,0,0,0,110,111,32,100,
+114,105,118,101,32,112,114,101,115,101,110,116,46,10,0,0,
+109,111,100,101,61,37,100,44,32,112,111,114,116,61,37,100,
+0,0,0,0,83,77,65,82,84,32,99,104,101,99,107,32,
+112,97,115,115,101,100,59,32,0,0,0,0,83,77,65,82,
+84,32,99,104,101,99,107,32,100,105,115,97,98,108,101,100,
+59,32,0,0,83,77,65,82,84,32,99,104,101,99,107,32,
+98,121,112,97,115,115,101,100,58,32,100,114,105,118,101,32,
+105,110,32,115,116,97,110,100,98,121,32,111,114,32,97,118,
+77,111,100,101,32,115,101,116,59,32,0,0,112,114,101,112,
+97,114,97,116,105,111,110,59,32,0,0,0,113,117,105,99,
+107,32,116,101,115,116,32,100,105,115,97,98,108,101,100,59,
+32,0,0,0,113,117,105,99,107,32,116,101,115,116,59,32,
+0,0,0,0,99,108,101,97,110,45,117,112,59,32,0,0,
+66,111,111,116,32,82,111,109,32,118,101,114,115,105,111,110,
+58,32,37,115,10,0,0,0,77,117,116,68,99,104,110,108,
+65,99,99,101,115,115,0,0,83,101,109,82,97,105,100,48,
+67,111,97,108,101,115,99,101,0,0,0,0,42,42,32,68,
+101,97,100,32,68,97,116,97,67,104,110,108,10,0,0,0,
+67,111,110,115,116,114,117,99,116,68,99,104,110,108,32,69,
+114,114,111,114,10,0,0,0,32,67,111,110,102,105,103,32,
+63,63,63,0,32,78,111,114,109,97,108,32,32,0,0,0,
+32,86,101,114,105,102,121,32,32,0,0,0,32,73,110,105,
+116,32,32,32,32,0,0,0,32,68,101,103,114,97,100,101,
+32,0,0,0,32,82,101,98,117,105,108,100,32,0,0,0,
+32,69,120,112,97,110,100,32,32,0,0,0,32,77,105,103,
+114,97,116,101,32,0,0,0,32,120,68,69,65,68,120,32,
+32,0,0,0,32,77,111,100,101,32,63,63,63,0,0,0,
+32,84,87,73,78,83,84,79,82,0,0,0,32,40,116,97,
+115,107,58,32,37,100,37,37,41,0,0,0,32,77,73,71,
+82,65,84,73,79,78,0,0,32,99,97,112,58,37,115,37,
+76,117,0,0,32,40,85,110,99,108,101,97,110,61,37,100,
+41,10,0,0,42,42,32,67,97,110,110,111,116,32,99,114,
+101,97,116,101,32,68,97,116,97,67,104,110,108,32,102,111,
+114,32,99,111,110,102,105,103,32,48,120,37,88,10,0,0,
+42,42,32,67,97,110,110,111,116,32,99,111,110,115,116,114,
+117,99,116,32,68,97,116,97,67,104,110,108,32,119,105,116,
+104,32,37,105,32,115,117,98,45,99,104,97,110,110,101,108,
+115,10,0,0,32,86,101,114,105,102,121,32,0,0,0,0,
+32,74,66,79,68,32,40,37,100,41,91,37,100,93,0,0,
+32,99,97,112,58,32,37,117,32,40,108,98,97,79,102,102,
+32,37,117,41,0,0,0,0,32,40,116,97,115,107,58,32,
+37,100,37,37,41,10,0,0,68,101,108,101,116,101,32,74,
+47,73,47,67,47,83,98,111,100,58,32,37,100,10,0,0,
+32,99,97,112,58,32,37,117,32,40,108,98,97,79,102,102,
+32,37,117,41,10,0,0,0,32,86,101,114,105,102,121,32,
+0,0,0,0,32,67,66,79,68,32,40,37,100,41,91,37,
+100,93,0,0,32,86,101,114,105,102,121,32,0,0,0,0,
+32,83,66,79,68,32,40,37,100,41,91,37,100,93,0,0,
+32,99,97,112,58,32,37,117,32,40,108,98,97,79,102,102,
+32,37,117,41,0,0,0,0,32,40,116,97,115,107,58,32,
+37,100,37,37,41,10,0,0,32,86,101,114,105,102,121,32,
+0,0,0,0,32,73,66,79,68,32,40,37,100,41,91,37,
 100,93,0,0,32,99,97,112,58,32,37,117,32,40,108,98,
 97,79,102,102,32,37,117,41,0,0,0,0,32,40,116,97,
-115,107,58,32,37,100,37,37,41,10,0,0,32,86,101,114,
-105,102,121,32,0,0,0,0,32,73,66,79,68,32,40,37,
-100,41,91,37,100,93,0,0,32,99,97,112,58,32,37,117,
-32,40,108,98,97,79,102,102,32,37,117,41,0,0,0,0,
-32,40,116,97,115,107,58,32,37,100,37,37,41,10,0,0,
-83,116,114,105,112,101,108,101,116,32,83,105,122,101,61,37,
-117,107,10,0,42,42,32,67,97,110,110,111,116,32,99,111,
-110,115,116,114,117,99,116,32,82,65,73,68,45,48,32,68,
-97,116,97,67,104,110,108,32,119,105,116,104,32,37,105,32,
-115,117,98,45,99,104,97,110,110,101,108,115,10,0,0,0,
-42,42,32,67,97,110,110,111,116,32,99,111,110,115,116,114,
-117,99,116,32,82,65,73,68,45,48,32,68,97,116,97,67,
-104,110,108,32,119,105,116,104,32,115,116,114,105,112,101,108,
-101,116,83,105,122,101,76,111,103,50,61,37,105,10,0,0,
+115,107,58,32,37,100,37,37,41,10,0,0,83,116,114,105,
+112,101,108,101,116,32,83,105,122,101,61,37,117,107,10,0,
 42,42,32,67,97,110,110,111,116,32,99,111,110,115,116,114,
 117,99,116,32,82,65,73,68,45,48,32,68,97,116,97,67,
-104,110,108,59,32,116,111,116,97,108,32,115,116,114,105,112,
-101,115,32,97,114,101,32,48,46,10,0,0,100,97,116,97,
-67,104,110,108,82,97,105,100,48,46,99,112,112,0,0,0,
-107,101,114,110,101,108,46,104,112,112,0,0,68,101,108,101,
-116,101,32,82,97,105,100,48,32,40,108,101,118,101,108,44,
-32,76,111,103,78,117,109,98,101,114,41,58,32,37,100,32,
-37,100,10,0,82,65,73,68,49,32,115,117,98,117,110,105,
-116,61,37,100,0,0,0,0,42,42,32,67,97,110,110,111,
-116,32,99,111,110,115,116,114,117,99,116,32,82,65,73,68,
-45,49,32,68,97,116,97,67,104,110,108,32,119,105,116,104,
-32,37,105,32,115,117,98,45,99,104,97,110,110,101,108,115,
-10,0,0,0,42,42,32,67,97,110,110,111,116,32,99,111,
-110,102,105,103,117,114,101,32,82,65,73,68,45,49,32,68,
+104,110,108,32,119,105,116,104,32,37,105,32,115,117,98,45,
+99,104,97,110,110,101,108,115,10,0,0,0,42,42,32,67,
+97,110,110,111,116,32,99,111,110,115,116,114,117,99,116,32,
+82,65,73,68,45,48,32,68,97,116,97,67,104,110,108,32,
+119,105,116,104,32,115,116,114,105,112,101,108,101,116,83,105,
+122,101,76,111,103,50,61,37,105,10,0,0,42,42,32,67,
+97,110,110,111,116,32,99,111,110,115,116,114,117,99,116,32,
+82,65,73,68,45,48,32,68,97,116,97,67,104,110,108,59,
+32,116,111,116,97,108,32,115,116,114,105,112,101,115,32,97,
+114,101,32,48,46,10,0,0,100,97,116,97,67,104,110,108,
+82,97,105,100,48,46,99,112,112,0,0,0,107,101,114,110,
+101,108,46,104,112,112,0,0,68,101,108,101,116,101,32,82,
+97,105,100,48,32,40,108,101,118,101,108,44,32,76,111,103,
+78,117,109,98,101,114,41,58,32,37,100,32,37,100,10,0,
+82,65,73,68,49,32,115,117,98,117,110,105,116,61,37,100,
+0,0,0,0,42,42,32,67,97,110,110,111,116,32,99,111,
+110,115,116,114,117,99,116,32,82,65,73,68,45,49,32,68,
 97,116,97,67,104,110,108,32,119,105,116,104,32,37,105,32,
-98,97,100,32,115,117,98,45,99,104,97,110,110,101,108,115,
-10,0,0,0,42,42,32,67,97,110,110,111,116,32,99,111,
-110,102,105,103,117,114,101,32,82,65,73,68,45,49,32,68,
-97,116,97,67,104,110,108,32,119,105,116,104,32,117,110,107,
-110,111,119,110,32,111,112,109,111,100,101,32,48,120,37,88,
-10,0,0,0,42,42,32,67,111,117,108,100,32,110,111,116,
-32,97,108,108,111,99,97,116,101,32,115,116,114,105,112,101,
-32,72,97,110,100,108,101,32,105,110,32,82,65,73,68,45,
-49,10,0,0,42,42,32,67,97,110,110,111,116,32,99,111,
-110,102,105,103,117,114,101,32,82,69,66,85,73,76,68,73,
-78,71,32,82,65,73,68,45,49,32,68,97,116,97,67,104,
-110,108,32,100,117,101,32,116,111,32,50,110,100,32,98,97,
-100,32,115,117,98,45,99,104,97,110,110,101,108,32,37,105,
-10,0,0,0,42,42,32,67,97,110,110,111,116,32,99,111,
-110,102,105,103,117,114,101,32,68,69,71,82,65,68,69,68,
-32,82,65,73,68,45,49,32,68,97,116,97,67,104,110,108,
-32,100,117,101,32,116,111,32,50,110,100,32,98,97,100,32,
-115,117,98,45,99,104,97,110,110,101,108,32,37,105,10,0,
-68,101,108,101,116,101,32,77,105,114,114,111,114,32,40,108,
-101,118,101,108,44,32,76,111,103,78,117,109,98,101,114,41,
-58,32,37,100,32,37,100,10,0,0,0,0,83,116,114,105,
-112,101,108,101,116,32,83,105,122,101,61,37,117,107,10,0,
-100,97,116,97,67,104,110,108,82,97,105,100,53,46,99,112,
-112,0,0,0,82,65,73,68,53,32,115,117,98,117,110,105,
-116,61,37,100,0,0,0,0,42,42,32,67,97,110,110,111,
-116,32,99,111,110,115,116,114,117,99,116,32,82,65,73,68,
-45,53,32,68,97,116,97,67,104,110,108,32,119,105,116,104,
-32,37,105,32,115,117,98,45,99,104,97,110,110,101,108,115,
-10,0,0,0,42,42,32,67,97,110,110,111,116,32,99,111,
-110,115,116,114,117,99,116,32,82,65,73,68,45,53,32,68,
-97,116,97,67,104,110,108,32,119,105,116,104,32,115,116,114,
-105,112,101,108,101,116,83,105,122,101,76,111,103,50,61,37,
-105,10,0,0,42,42,32,67,97,110,110,111,116,32,99,111,
-110,115,116,114,117,99,116,32,82,65,73,68,45,53,32,68,
-97,116,97,67,104,110,108,59,32,116,111,116,97,108,32,115,
-116,114,105,112,101,115,32,97,114,101,32,48,46,10,0,0,
+115,117,98,45,99,104,97,110,110,101,108,115,10,0,0,0,
 42,42,32,67,97,110,110,111,116,32,99,111,110,102,105,103,
-117,114,101,32,82,65,73,68,45,53,32,68,97,116,97,67,
+117,114,101,32,82,65,73,68,45,49,32,68,97,116,97,67,
 104,110,108,32,119,105,116,104,32,37,105,32,98,97,100,32,
 115,117,98,45,99,104,97,110,110,101,108,115,10,0,0,0,
 42,42,32,67,97,110,110,111,116,32,99,111,110,102,105,103,
-117,114,101,32,82,65,73,68,45,53,32,68,97,116,97,67,
+117,114,101,32,82,65,73,68,45,49,32,68,97,116,97,67,
 104,110,108,32,119,105,116,104,32,117,110,107,110,111,119,110,
 32,111,112,109,111,100,101,32,48,120,37,88,10,0,0,0,
-70,111,114,99,101,32,82,65,73,68,53,32,78,111,114,109,
-97,108,32,109,111,100,101,10,0,0,0,0,42,42,32,67,
-111,117,108,100,32,110,111,116,32,97,108,108,111,99,97,116,
-101,32,115,116,114,105,112,101,32,72,97,110,100,108,101,32,
-105,110,32,82,65,73,68,45,53,10,0,0,42,42,32,67,
+42,42,32,67,111,117,108,100,32,110,111,116,32,97,108,108,
+111,99,97,116,101,32,115,116,114,105,112,101,32,72,97,110,
+100,108,101,32,105,110,32,82,65,73,68,45,49,10,0,0,
+42,42,32,67,97,110,110,111,116,32,99,111,110,102,105,103,
+117,114,101,32,82,69,66,85,73,76,68,73,78,71,32,82,
+65,73,68,45,49,32,68,97,116,97,67,104,110,108,32,100,
+117,101,32,116,111,32,50,110,100,32,98,97,100,32,115,117,
+98,45,99,104,97,110,110,101,108,32,37,105,10,0,0,0,
+42,42,32,67,97,110,110,111,116,32,99,111,110,102,105,103,
+117,114,101,32,68,69,71,82,65,68,69,68,32,82,65,73,
+68,45,49,32,68,97,116,97,67,104,110,108,32,100,117,101,
+32,116,111,32,50,110,100,32,98,97,100,32,115,117,98,45,
+99,104,97,110,110,101,108,32,37,105,10,0,68,101,108,101,
+116,101,32,77,105,114,114,111,114,32,40,108,101,118,101,108,
+44,32,76,111,103,78,117,109,98,101,114,41,58,32,37,100,
+32,37,100,10,0,0,0,0,83,116,114,105,112,101,108,101,
+116,32,83,105,122,101,61,37,117,107,10,0,100,97,116,97,
+67,104,110,108,82,97,105,100,53,46,99,112,112,0,0,0,
+82,65,73,68,53,32,115,117,98,117,110,105,116,61,37,100,
+0,0,0,0,42,42,32,67,97,110,110,111,116,32,99,111,
+110,115,116,114,117,99,116,32,82,65,73,68,45,53,32,68,
+97,116,97,67,104,110,108,32,119,105,116,104,32,37,105,32,
+115,117,98,45,99,104,97,110,110,101,108,115,10,0,0,0,
+42,42,32,67,97,110,110,111,116,32,99,111,110,115,116,114,
+117,99,116,32,82,65,73,68,45,53,32,68,97,116,97,67,
+104,110,108,32,119,105,116,104,32,115,116,114,105,112,101,108,
+101,116,83,105,122,101,76,111,103,50,61,37,105,10,0,0,
+42,42,32,67,97,110,110,111,116,32,99,111,110,115,116,114,
+117,99,116,32,82,65,73,68,45,53,32,68,97,116,97,67,
+104,110,108,59,32,116,111,116,97,108,32,115,116,114,105,112,
+101,115,32,97,114,101,32,48,46,10,0,0,42,42,32,67,
 97,110,110,111,116,32,99,111,110,102,105,103,117,114,101,32,
-82,69,66,85,73,76,68,73,78,71,32,82,65,73,68,45,
-53,32,68,97,116,97,67,104,110,108,32,100,117,101,32,116,
-111,32,50,110,100,32,98,97,100,32,115,117,98,45,99,104,
-97,110,110,101,108,32,37,105,10,0,0,0,42,42,32,67,
+82,65,73,68,45,53,32,68,97,116,97,67,104,110,108,32,
+119,105,116,104,32,37,105,32,98,97,100,32,115,117,98,45,
+99,104,97,110,110,101,108,115,10,0,0,0,42,42,32,67,
 97,110,110,111,116,32,99,111,110,102,105,103,117,114,101,32,
-68,69,71,82,65,68,69,68,32,82,65,73,68,45,53,32,
-68,97,116,97,67,104,110,108,32,100,117,101,32,116,111,32,
-50,110,100,32,98,97,100,32,115,117,98,45,99,104,97,110,
-110,101,108,32,37,105,10,0,100,97,116,97,67,104,110,108,
+82,65,73,68,45,53,32,68,97,116,97,67,104,110,108,32,
+119,105,116,104,32,117,110,107,110,111,119,110,32,111,112,109,
+111,100,101,32,48,120,37,88,10,0,0,0,70,111,114,99,
+101,32,82,65,73,68,53,32,78,111,114,109,97,108,32,109,
+111,100,101,10,0,0,0,0,42,42,32,67,111,117,108,100,
+32,110,111,116,32,97,108,108,111,99,97,116,101,32,115,116,
+114,105,112,101,32,72,97,110,100,108,101,32,105,110,32,82,
+65,73,68,45,53,10,0,0,42,42,32,67,97,110,110,111,
+116,32,99,111,110,102,105,103,117,114,101,32,82,69,66,85,
+73,76,68,73,78,71,32,82,65,73,68,45,53,32,68,97,
+116,97,67,104,110,108,32,100,117,101,32,116,111,32,50,110,
+100,32,98,97,100,32,115,117,98,45,99,104,97,110,110,101,
+108,32,37,105,10,0,0,0,42,42,32,67,97,110,110,111,
+116,32,99,111,110,102,105,103,117,114,101,32,68,69,71,82,
+65,68,69,68,32,82,65,73,68,45,53,32,68,97,116,97,
+67,104,110,108,32,100,117,101,32,116,111,32,50,110,100,32,
+98,97,100,32,115,117,98,45,99,104,97,110,110,101,108,32,
+37,105,10,0,100,97,116,97,67,104,110,108,82,97,105,100,
+53,46,99,112,112,0,0,0,100,97,116,97,67,104,110,108,
 82,97,105,100,53,46,99,112,112,0,0,0,100,97,116,97,
 67,104,110,108,82,97,105,100,53,46,99,112,112,0,0,0,
 100,97,116,97,67,104,110,108,82,97,105,100,53,46,99,112,
@@ -24579,253 +24743,257 @@ unsigned char tw_fw_code[] __initdata = 
 67,104,110,108,82,97,105,100,53,46,99,112,112,0,0,0,
 100,97,116,97,67,104,110,108,82,97,105,100,53,46,99,112,
 112,0,0,0,100,97,116,97,67,104,110,108,82,97,105,100,
-53,46,99,112,112,0,0,0,100,97,116,97,67,104,110,108,
-82,97,105,100,53,46,99,112,112,0,0,0,68,101,108,101,
-116,101,32,82,97,105,100,53,32,40,108,101,118,101,108,44,
-32,76,111,103,78,117,109,98,101,114,41,58,32,37,100,32,
-37,100,10,0,65,68,80,32,78,111,114,109,97,108,32,87,
-114,105,116,101,10,0,0,0,100,97,116,97,67,104,110,108,
-65,100,112,46,99,112,112,0,65,68,80,32,71,101,110,101,
-114,97,116,101,32,83,121,110,99,32,87,114,105,116,101,10,
-0,0,0,0,100,97,116,97,67,104,110,108,65,100,112,46,
+53,46,99,112,112,0,0,0,68,101,108,101,116,101,32,82,
+97,105,100,53,32,40,108,101,118,101,108,44,32,76,111,103,
+78,117,109,98,101,114,41,58,32,37,100,32,37,100,10,0,
+65,68,80,32,78,111,114,109,97,108,32,87,114,105,116,101,
+10,0,0,0,100,97,116,97,67,104,110,108,65,100,112,46,
 99,112,112,0,65,68,80,32,71,101,110,101,114,97,116,101,
-32,83,121,110,99,87,114,105,116,101,10,0,65,68,80,32,
-82,101,97,100,88,111,114,83,98,117,102,87,105,116,104,83,
-121,110,99,87,114,105,116,101,10,0,0,0,32,65,68,80,
-32,40,37,100,41,91,37,100,93,0,0,0,32,99,97,112,
-58,32,37,117,10,0,0,0,65,68,80,32,78,111,114,109,
-97,108,32,82,101,97,100,10,0,0,0,0,100,97,116,97,
-67,104,110,108,65,100,112,46,99,112,112,0,100,97,116,97,
-67,104,110,108,84,119,105,110,46,99,112,112,0,0,0,0,
-83,116,114,105,112,101,32,83,105,122,101,61,37,117,107,10,
-0,0,0,0,42,42,32,67,97,110,110,111,116,32,99,111,
-110,115,116,114,117,99,116,32,109,105,103,114,97,116,105,111,
-110,32,68,97,116,97,67,104,110,108,32,119,105,116,104,32,
-37,105,32,115,117,98,45,99,104,97,110,110,101,108,115,10,
-0,0,0,0,67,97,110,110,111,116,32,65,108,108,111,99,
-97,116,101,32,72,97,110,100,108,101,32,105,110,32,77,105,
-103,10,0,0,68,101,108,101,116,101,32,77,105,103,32,40,
-108,101,118,101,108,44,32,76,111,103,78,117,109,98,101,114,
-41,58,32,37,100,32,37,100,10,0,0,0,68,101,108,101,
-116,101,32,79,102,102,40,108,105,110,101,41,32,40,108,101,
-118,101,108,41,58,32,37,100,10,0,0,0,73,115,115,117,
-101,82,101,97,100,66,97,99,107,117,112,0,82,101,97,100,
-76,101,103,97,99,121,80,114,105,109,97,114,121,0,0,0,
-80,114,111,99,101,115,115,66,97,99,107,117,112,0,0,0,
-80,114,111,99,101,115,115,76,101,103,97,99,121,0,0,0,
-73,115,115,117,101,82,101,97,100,80,114,105,109,97,114,121,
-0,0,0,0,73,115,115,117,101,83,110,105,102,102,66,97,
-99,107,117,112,0,0,0,0,82,101,97,100,76,101,103,97,
-99,121,66,97,99,107,117,112,0,0,0,0,80,114,111,99,
-101,115,115,80,114,105,109,97,114,121,0,0,67,104,101,99,
-107,83,110,105,102,102,66,97,99,107,117,112,0,0,0,0,
-67,111,109,112,108,101,116,101,0,0,0,0,68,105,115,107,
-70,97,105,108,101,100,0,0,107,101,114,110,101,108,46,104,
-112,112,0,0,68,99,98,77,103,114,58,58,37,115,58,32,
-32,32,32,32,32,32,32,32,40,102,105,110,105,115,104,32,
-37,100,41,10,0,0,0,0,42,42,42,68,99,98,77,103,
-114,58,58,37,115,58,32,85,78,73,84,32,37,50,100,32,
-45,32,69,114,114,111,114,32,37,35,88,10,0,0,0,0,
-68,99,98,77,103,114,58,58,87,114,105,116,101,70,108,97,
-103,115,0,0,100,99,98,77,103,114,46,99,112,112,0,0,
-68,99,98,77,103,114,58,58,109,117,116,101,120,68,99,98,
-0,0,0,0,100,99,98,77,103,114,46,99,112,112,0,0,
-68,99,98,77,103,114,58,58,73,115,115,117,101,82,101,97,
-100,66,97,99,107,117,112,58,32,112,111,114,116,61,37,100,
-44,32,76,66,65,61,48,120,37,88,10,0,68,99,98,77,
-103,114,58,58,82,101,97,100,76,101,103,97,99,121,66,97,
-99,107,117,112,58,32,112,111,114,116,61,37,100,44,32,76,
-66,65,61,48,120,37,88,10,0,0,0,0,112,111,114,116,
+32,83,121,110,99,32,87,114,105,116,101,10,0,0,0,0,
+100,97,116,97,67,104,110,108,65,100,112,46,99,112,112,0,
+65,68,80,32,71,101,110,101,114,97,116,101,32,83,121,110,
+99,87,114,105,116,101,10,0,65,68,80,32,82,101,97,100,
+88,111,114,83,98,117,102,87,105,116,104,83,121,110,99,87,
+114,105,116,101,10,0,0,0,32,65,68,80,32,40,37,100,
+41,91,37,100,93,0,0,0,32,99,97,112,58,32,37,117,
+10,0,0,0,65,68,80,32,78,111,114,109,97,108,32,82,
+101,97,100,10,0,0,0,0,100,97,116,97,67,104,110,108,
+65,100,112,46,99,112,112,0,100,97,116,97,67,104,110,108,
+84,119,105,110,46,99,112,112,0,0,0,0,83,116,114,105,
+112,101,32,83,105,122,101,61,37,117,107,10,0,0,0,0,
+42,42,32,67,97,110,110,111,116,32,99,111,110,115,116,114,
+117,99,116,32,109,105,103,114,97,116,105,111,110,32,68,97,
+116,97,67,104,110,108,32,119,105,116,104,32,37,105,32,115,
+117,98,45,99,104,97,110,110,101,108,115,10,0,0,0,0,
+67,97,110,110,111,116,32,65,108,108,111,99,97,116,101,32,
+72,97,110,100,108,101,32,105,110,32,77,105,103,10,0,0,
+68,101,108,101,116,101,32,77,105,103,32,40,108,101,118,101,
+108,44,32,76,111,103,78,117,109,98,101,114,41,58,32,37,
+100,32,37,100,10,0,0,0,68,101,108,101,116,101,32,79,
+102,102,40,108,105,110,101,41,32,40,108,101,118,101,108,41,
+58,32,37,100,10,0,0,0,73,115,115,117,101,82,101,97,
+100,66,97,99,107,117,112,0,82,101,97,100,76,101,103,97,
+99,121,80,114,105,109,97,114,121,0,0,0,80,114,111,99,
+101,115,115,66,97,99,107,117,112,0,0,0,80,114,111,99,
+101,115,115,76,101,103,97,99,121,0,0,0,73,115,115,117,
+101,82,101,97,100,80,114,105,109,97,114,121,0,0,0,0,
+73,115,115,117,101,83,110,105,102,102,66,97,99,107,117,112,
+0,0,0,0,82,101,97,100,76,101,103,97,99,121,66,97,
+99,107,117,112,0,0,0,0,80,114,111,99,101,115,115,80,
+114,105,109,97,114,121,0,0,67,104,101,99,107,83,110,105,
+102,102,66,97,99,107,117,112,0,0,0,0,67,111,109,112,
+108,101,116,101,0,0,0,0,68,105,115,107,70,97,105,108,
+101,100,0,0,107,101,114,110,101,108,46,104,112,112,0,0,
+68,99,98,77,103,114,58,58,37,115,58,32,32,32,32,32,
+32,32,32,32,40,102,105,110,105,115,104,32,37,100,41,10,
+0,0,0,0,42,42,42,68,99,98,77,103,114,58,58,37,
+115,58,32,85,78,73,84,32,37,50,100,32,45,32,69,114,
+114,111,114,32,37,35,88,10,0,0,0,0,68,99,98,77,
+103,114,58,58,87,114,105,116,101,70,108,97,103,115,0,0,
+100,99,98,77,103,114,46,99,112,112,0,0,68,99,98,77,
+103,114,58,58,109,117,116,101,120,68,99,98,0,0,0,0,
+100,99,98,77,103,114,46,99,112,112,0,0,68,99,98,77,
+103,114,58,58,73,115,115,117,101,82,101,97,100,66,97,99,
+107,117,112,58,32,112,111,114,116,61,37,100,44,32,76,66,
+65,61,48,120,37,88,10,0,68,99,98,77,103,114,58,58,
+82,101,97,100,76,101,103,97,99,121,66,97,99,107,117,112,
+58,32,112,111,114,116,61,37,100,44,32,76,66,65,61,48,
+120,37,88,10,0,0,0,0,112,111,114,116,61,37,100,44,
+32,101,114,114,111,114,61,48,120,37,88,0,68,99,98,77,
+103,114,58,58,80,114,111,99,101,115,115,80,114,105,109,97,
+114,121,58,32,112,111,114,116,61,37,100,44,32,101,114,114,
+111,114,61,48,120,37,48,52,88,10,0,0,68,99,98,77,
+103,114,58,58,80,114,111,99,101,115,115,66,97,99,107,117,
+112,58,32,112,111,114,116,61,37,100,44,32,101,114,114,111,
+114,32,61,32,48,120,37,48,52,88,10,0,68,99,98,77,
+103,114,58,58,80,114,111,99,101,115,115,76,101,103,97,99,
+121,58,32,112,111,114,116,61,37,100,44,32,101,114,114,111,
+114,32,61,32,48,120,37,48,52,88,10,0,112,111,114,116,
 61,37,100,44,32,101,114,114,111,114,61,48,120,37,88,0,
-68,99,98,77,103,114,58,58,80,114,111,99,101,115,115,80,
-114,105,109,97,114,121,58,32,112,111,114,116,61,37,100,44,
-32,101,114,114,111,114,61,48,120,37,48,52,88,10,0,0,
-68,99,98,77,103,114,58,58,80,114,111,99,101,115,115,66,
-97,99,107,117,112,58,32,112,111,114,116,61,37,100,44,32,
-101,114,114,111,114,32,61,32,48,120,37,48,52,88,10,0,
-68,99,98,77,103,114,58,58,80,114,111,99,101,115,115,76,
-101,103,97,99,121,58,32,112,111,114,116,61,37,100,44,32,
-101,114,114,111,114,32,61,32,48,120,37,48,52,88,10,0,
-112,111,114,116,61,37,100,44,32,101,114,114,111,114,61,48,
-120,37,88,0,51,87,97,114,101,68,67,66,0,0,0,0,
+51,87,97,114,101,68,67,66,0,0,0,0,68,99,98,77,
+103,114,58,58,70,101,116,99,104,71,117,105,100,40,41,58,
+32,73,110,118,97,108,105,100,32,71,85,73,68,44,32,112,
+111,114,116,32,37,100,10,0,100,99,98,77,103,114,46,99,
+112,112,0,0,100,99,98,77,103,114,46,99,112,112,0,0,
 68,99,98,77,103,114,58,58,70,101,116,99,104,71,117,105,
-100,40,41,58,32,73,110,118,97,108,105,100,32,71,85,73,
-68,44,32,112,111,114,116,32,37,100,10,0,100,99,98,77,
-103,114,46,99,112,112,0,0,100,99,98,77,103,114,46,99,
-112,112,0,0,68,99,98,77,103,114,58,58,70,101,116,99,
-104,71,117,105,100,40,41,58,32,73,110,118,97,108,105,100,
-32,85,68,66,44,32,112,111,114,116,32,37,100,10,0,0,
-100,99,98,77,103,114,46,99,112,112,0,0,42,42,32,73,
-110,118,97,108,105,100,32,115,117,112,112,111,114,116,32,115,
-101,103,109,101,110,116,32,40,105,103,110,111,114,101,100,41,
-58,32,112,111,114,116,32,37,100,10,0,0,107,101,114,110,
-101,108,46,104,112,112,0,0,100,99,98,77,103,114,46,99,
-112,112,0,0,68,99,98,77,103,114,58,58,87,114,105,116,
-101,83,101,103,109,101,110,116,40,109,97,112,61,48,120,37,
-88,44,32,115,101,103,73,68,61,48,120,37,88,44,32,101,
-118,101,110,116,115,61,37,105,44,32,101,114,114,111,114,61,
-48,120,37,88,41,10,0,0,68,99,98,77,103,114,58,58,
-37,115,58,32,85,78,73,84,32,37,50,100,32,40,116,105,
-109,101,32,32,32,37,100,41,10,0,0,0,87,114,105,116,
-101,78,101,119,0,0,0,0,100,99,98,77,103,114,46,99,
-112,112,0,0,85,112,100,97,116,101,65,114,114,97,121,0,
-68,99,98,77,103,114,58,58,37,115,58,32,85,78,73,84,
-32,37,50,100,32,40,116,105,109,101,32,32,32,37,100,41,
-10,0,0,0,100,99,98,77,103,114,46,99,112,112,0,0,
-68,99,98,77,103,114,58,58,37,115,58,32,85,78,73,84,
-32,37,50,100,32,40,116,105,109,101,32,32,32,37,100,41,
-10,0,0,0,85,112,100,97,116,101,83,116,97,116,117,115,
+100,40,41,58,32,73,110,118,97,108,105,100,32,85,68,66,
+44,32,112,111,114,116,32,37,100,10,0,0,100,99,98,77,
+103,114,46,99,112,112,0,0,42,42,32,73,110,118,97,108,
+105,100,32,115,117,112,112,111,114,116,32,115,101,103,109,101,
+110,116,32,40,105,103,110,111,114,101,100,41,58,32,112,111,
+114,116,32,37,100,10,0,0,107,101,114,110,101,108,46,104,
+112,112,0,0,100,99,98,77,103,114,46,99,112,112,0,0,
+68,99,98,77,103,114,58,58,87,114,105,116,101,83,101,103,
+109,101,110,116,40,109,97,112,61,48,120,37,88,44,32,115,
+101,103,73,68,61,48,120,37,88,44,32,101,118,101,110,116,
+115,61,37,105,44,32,101,114,114,111,114,61,48,120,37,88,
+41,10,0,0,68,99,98,77,103,114,58,58,37,115,58,32,
+85,78,73,84,32,37,50,100,32,40,116,105,109,101,32,32,
+32,37,100,41,10,0,0,0,87,114,105,116,101,78,101,119,
 0,0,0,0,100,99,98,77,103,114,46,99,112,112,0,0,
-85,112,100,97,116,101,83,117,112,112,111,114,116,0,0,0,
-68,99,98,77,103,114,58,58,37,115,58,32,85,78,73,84,
-32,37,50,100,32,40,116,105,109,101,32,32,32,37,100,41,
-10,0,0,0,100,99,98,77,103,114,46,99,112,112,0,0,
+85,112,100,97,116,101,65,114,114,97,121,0,68,99,98,77,
+103,114,58,58,37,115,58,32,85,78,73,84,32,37,50,100,
+32,40,116,105,109,101,32,32,32,37,100,41,10,0,0,0,
 100,99,98,77,103,114,46,99,112,112,0,0,68,99,98,77,
-103,114,58,58,67,108,101,97,114,80,114,101,118,105,111,117,
-115,68,99,98,58,32,112,111,114,116,32,37,50,100,44,32,
-115,101,99,116,111,114,115,32,37,100,10,0,100,99,98,77,
+103,114,58,58,37,115,58,32,85,78,73,84,32,37,50,100,
+32,40,116,105,109,101,32,32,32,37,100,41,10,0,0,0,
+85,112,100,97,116,101,83,116,97,116,117,115,0,0,0,0,
+100,99,98,77,103,114,46,99,112,112,0,0,85,112,100,97,
+116,101,83,117,112,112,111,114,116,0,0,0,68,99,98,77,
+103,114,58,58,37,115,58,32,85,78,73,84,32,37,50,100,
+32,40,116,105,109,101,32,32,32,37,100,41,10,0,0,0,
+100,99,98,77,103,114,46,99,112,112,0,0,100,99,98,77,
 103,114,46,99,112,112,0,0,68,99,98,77,103,114,58,58,
-69,114,97,115,101,68,99,98,66,97,115,101,58,32,112,111,
-114,116,32,37,50,100,44,32,108,111,99,97,116,105,111,110,
-67,111,100,101,32,39,37,99,39,10,0,0,77,97,107,101,
-67,98,111,100,115,0,0,0,68,99,98,77,103,114,58,58,
-37,115,58,32,85,78,73,84,32,37,50,100,32,40,116,105,
-109,101,32,32,32,37,100,41,10,0,0,0,100,99,98,77,
-103,114,46,99,112,112,0,0,100,99,98,77,103,114,46,99,
-112,112,0,0,51,87,97,114,101,68,67,66,0,0,0,0,
-100,99,98,77,103,114,46,99,112,112,0,0,32,32,42,42,
-32,68,105,100,32,110,111,116,32,102,105,110,100,32,97,110,
-121,32,118,97,108,105,100,32,115,117,112,112,111,114,116,32,
-115,101,103,109,101,110,116,115,32,102,111,114,32,85,110,105,
-116,32,37,100,10,0,0,0,100,99,98,77,103,114,46,99,
-112,112,0,0,68,99,98,77,103,114,91,37,105,93,32,45,
-32,99,97,110,110,111,116,32,115,99,114,117,98,32,68,67,
-66,44,32,99,117,114,114,101,110,116,32,83,98,117,102,32,
-83,101,103,73,100,61,48,120,37,88,10,0,0,0,0,0,
-108,24,133,0,0,0,255,255,30,87,128,0,1,0,0,0,
-100,24,133,0,0,0,255,255,42,87,128,0,2,0,0,0,
-64,146,132,0,0,0,255,255,16,88,128,0,3,0,0,0,
-84,146,132,0,0,0,255,255,78,88,128,0,4,0,0,0,
-252,145,132,0,0,0,255,255,36,88,128,0,5,0,0,0,
-12,146,132,0,0,0,255,255,220,88,128,0,6,0,0,0,
-104,146,132,0,0,0,255,255,244,88,128,0,7,0,0,0,
-124,146,132,0,0,0,255,255,26,89,128,0,8,0,0,0,
-140,146,132,0,0,0,255,255,116,91,128,0,9,0,0,0,
-32,146,132,0,0,0,255,255,236,89,128,0,10,0,0,0,
-48,146,132,0,0,0,255,255,182,90,128,0,11,0,0,0,
-160,146,132,0,0,0,255,255,182,91,128,0,12,0,0,0,
-172,146,132,0,0,0,255,255,208,91,128,0,69,110,116,101,
-114,115,32,116,104,101,32,109,111,110,105,116,111,114,32,109,
-111,100,101,0,83,105,109,117,108,97,116,101,32,101,114,114,
-111,114,115,0,68,105,115,112,108,97,121,32,102,105,114,109,
-119,97,114,101,32,115,116,97,116,117,115,0,70,105,114,109,
-119,97,114,101,44,32,66,73,79,83,32,118,101,114,115,105,
-111,110,115,0,105,102,32,110,111,110,45,122,101,114,111,44,
-32,115,97,118,101,32,97,110,121,32,83,69,84,84,73,78,
-71,83,32,116,104,97,116,32,103,101,116,32,99,104,97,110,
-103,101,100,0,80,114,105,110,116,32,108,105,115,116,32,111,
-102,32,117,110,105,116,115,0,60,117,110,105,116,35,62,32,
-45,32,117,110,108,111,99,107,32,97,108,108,32,100,114,105,
-118,101,115,32,111,102,32,117,110,105,116,0,60,111,110,124,
-111,102,102,124,99,108,101,97,114,124,115,104,111,119,124,114,
-101,108,124,110,111,114,101,108,62,32,99,111,109,109,97,110,
-100,32,104,105,115,116,111,114,121,0,0,0,67,111,110,116,
-105,110,117,101,115,32,102,114,111,109,32,97,110,32,78,77,
-73,0,0,0,60,115,105,122,101,62,32,60,97,100,100,114,
-62,0,0,0,60,115,105,122,101,62,32,60,97,100,100,114,
-62,32,60,118,97,108,117,101,62,0,0,0,60,118,97,114,
-105,97,98,108,101,32,110,97,109,101,62,32,91,60,118,97,
-108,117,101,62,93,0,0,0,115,107,105,112,114,101,115,101,
-116,0,0,0,118,101,114,98,111,115,105,116,121,0,0,0,
-99,111,109,109,101,110,116,32,108,105,110,101,32,45,32,110,
-111,32,97,99,116,105,111,110,0,0,0,0,67,111,109,112,
-97,114,101,32,82,79,77,32,97,110,100,32,82,65,77,32,
-105,109,97,103,101,115,0,0,68,105,115,112,108,97,121,32,
-109,97,120,32,76,66,65,32,97,110,100,32,104,111,115,116,
-32,97,100,100,114,101,115,115,0,0,0,0,80,114,105,110,
-116,32,108,105,115,116,32,111,102,32,100,114,105,118,101,115,
-0,0,0,0,72,101,108,112,32,45,32,108,105,115,116,32,
-99,111,109,109,97,110,100,115,0,0,0,0,109,101,109,119,
-114,105,116,101,0,0,0,0,60,116,97,98,108,101,62,32,
-60,105,110,100,101,120,62,32,91,60,110,101,119,32,118,97,
-108,117,101,93,32,71,101,116,47,91,83,101,116,93,32,112,
-97,114,97,109,101,116,101,114,32,118,97,114,0,0,0,0,
-112,114,105,110,116,98,117,102,0,0,0,0,68,105,115,112,
-108,97,121,32,112,114,105,110,116,32,98,117,102,102,101,114,
-0,0,0,0,112,114,105,110,116,108,111,103,0,0,0,0,
-68,105,115,112,108,97,121,32,116,104,101,32,112,114,105,110,
-116,108,111,103,0,0,0,0,105,102,32,110,111,110,45,122,
-101,114,111,32,45,32,105,103,110,111,114,101,115,32,115,111,
-102,116,32,114,101,115,101,116,115,32,97,102,116,101,114,32,
-97,115,115,101,114,116,0,0,115,107,105,112,105,110,105,116,
-0,0,0,0,105,102,32,110,111,110,45,122,101,114,111,32,
-45,32,115,107,105,112,32,114,97,105,100,53,32,122,101,114,
-111,47,105,110,105,116,32,111,110,32,99,114,101,97,116,105,
-111,110,0,0,97,117,116,111,115,97,118,101,0,0,0,0,
-60,119,114,105,116,101,111,110,99,101,124,101,120,99,108,117,
-100,101,100,117,110,105,116,115,124,102,97,99,116,111,114,121,
-100,97,116,97,124,10,32,32,32,32,32,32,32,32,32,32,
-32,32,32,32,32,32,32,32,112,114,105,110,116,108,111,103,
-124,102,105,114,109,119,97,114,101,124,108,111,99,97,108,62,
-32,102,108,97,115,104,32,102,105,108,101,0,115,101,116,32,
-98,105,116,115,32,116,111,32,101,110,97,98,108,101,32,114,
-111,108,108,99,97,108,108,32,112,114,105,110,116,111,117,116,
-115,58,10,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,32,32,32,32,32,32,32,32,32,32,32,32,49,32,45,
-32,102,105,110,100,32,100,114,105,118,101,115,32,112,104,97,
-115,101,10,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,32,32,32,32,32,32,32,32,32,32,32,32,50,32,45,
-32,99,104,101,99,107,32,68,67,66,115,32,112,104,97,115,
-101,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,32,32,32,32,32,32,32,32,32,32,32,52,32,45,32,
-109,97,107,101,32,82,65,73,68,32,117,110,105,116,115,32,
-112,104,97,115,101,0,0,0,68,101,98,117,103,32,67,111,
-109,109,97,110,100,32,110,111,116,32,70,111,117,110,100,46,
-32,65,118,97,105,108,97,98,108,101,32,99,111,109,109,97,
-110,100,115,32,97,114,101,58,10,0,0,0,70,105,114,109,
-119,97,114,101,32,58,32,37,115,44,32,83,82,76,58,32,
-37,100,44,32,83,82,76,95,77,73,78,58,32,37,100,44,
-32,66,85,73,76,68,58,32,37,100,44,32,66,82,65,78,
-67,72,58,32,37,100,10,0,70,69,57,88,32,50,46,48,
-50,46,48,48,46,48,48,56,0,0,0,0,66,105,111,115,
-32,32,32,32,32,58,32,37,115,10,0,0,37,115,32,61,
-32,37,117,32,40,48,120,37,88,41,10,0,84,104,101,32,
-102,111,108,108,111,119,105,110,103,32,118,97,114,105,97,98,
-108,101,115,32,97,114,101,32,115,117,112,112,111,114,116,101,
-100,58,10,0,42,42,32,84,104,105,114,100,32,97,114,103,
-117,109,101,110,116,32,109,117,115,116,32,98,101,32,110,117,
-109,101,114,105,99,59,32,99,97,110,110,111,116,32,115,101,
-116,32,37,115,10,0,0,0,42,42,32,69,114,114,111,114,
-32,48,120,37,88,32,102,114,111,109,32,71,101,116,80,97,
-114,97,109,10,0,0,0,0,85,110,107,110,111,119,110,32,
-118,97,114,105,97,98,108,101,58,32,37,115,46,32,0,0,
-37,49,50,115,32,40,37,105,32,98,121,116,101,115,41,58,
-32,37,115,10,0,0,0,0,42,42,32,84,104,105,114,100,
+67,108,101,97,114,80,114,101,118,105,111,117,115,68,99,98,
+58,32,112,111,114,116,32,37,50,100,44,32,115,101,99,116,
+111,114,115,32,37,100,10,0,100,99,98,77,103,114,46,99,
+112,112,0,0,68,99,98,77,103,114,58,58,69,114,97,115,
+101,68,99,98,66,97,115,101,58,32,112,111,114,116,32,37,
+50,100,44,32,108,111,99,97,116,105,111,110,67,111,100,101,
+32,39,37,99,39,10,0,0,77,97,107,101,67,98,111,100,
+115,0,0,0,68,99,98,77,103,114,58,58,37,115,58,32,
+85,78,73,84,32,37,50,100,32,40,116,105,109,101,32,32,
+32,37,100,41,10,0,0,0,100,99,98,77,103,114,46,99,
+112,112,0,0,100,99,98,77,103,114,46,99,112,112,0,0,
+51,87,97,114,101,68,67,66,0,0,0,0,100,99,98,77,
+103,114,46,99,112,112,0,0,32,32,42,42,32,68,105,100,
+32,110,111,116,32,102,105,110,100,32,97,110,121,32,118,97,
+108,105,100,32,115,117,112,112,111,114,116,32,115,101,103,109,
+101,110,116,115,32,102,111,114,32,85,110,105,116,32,37,100,
+10,0,0,0,100,99,98,77,103,114,46,99,112,112,0,0,
+68,99,98,77,103,114,91,37,105,93,32,45,32,99,97,110,
+110,111,116,32,115,99,114,117,98,32,68,67,66,44,32,99,
+117,114,114,101,110,116,32,83,98,117,102,32,83,101,103,73,
+100,61,48,120,37,88,10,0,114,101,111,114,100,101,114,84,
+114,101,101,46,67,80,80,0,0,0,0,0,232,35,133,0,
+0,0,255,255,6,90,128,0,1,0,0,0,224,35,133,0,
+0,0,255,255,18,90,128,0,2,0,0,0,32,157,132,0,
+0,0,255,255,248,90,128,0,3,0,0,0,52,157,132,0,
+0,0,255,255,54,91,128,0,4,0,0,0,220,156,132,0,
+0,0,255,255,12,91,128,0,5,0,0,0,236,156,132,0,
+0,0,255,255,196,91,128,0,6,0,0,0,72,157,132,0,
+0,0,255,255,220,91,128,0,7,0,0,0,92,157,132,0,
+0,0,255,255,2,92,128,0,8,0,0,0,108,157,132,0,
+0,0,255,255,92,94,128,0,9,0,0,0,0,157,132,0,
+0,0,255,255,212,92,128,0,10,0,0,0,16,157,132,0,
+0,0,255,255,158,93,128,0,11,0,0,0,128,157,132,0,
+0,0,255,255,158,94,128,0,12,0,0,0,140,157,132,0,
+0,0,255,255,184,94,128,0,69,110,116,101,114,115,32,116,
+104,101,32,109,111,110,105,116,111,114,32,109,111,100,101,0,
+83,105,109,117,108,97,116,101,32,101,114,114,111,114,115,0,
+68,105,115,112,108,97,121,32,102,105,114,109,119,97,114,101,
+32,115,116,97,116,117,115,0,70,105,114,109,119,97,114,101,
+44,32,66,73,79,83,32,118,101,114,115,105,111,110,115,0,
+105,102,32,110,111,110,45,122,101,114,111,44,32,115,97,118,
+101,32,97,110,121,32,83,69,84,84,73,78,71,83,32,116,
+104,97,116,32,103,101,116,32,99,104,97,110,103,101,100,0,
+80,114,105,110,116,32,108,105,115,116,32,111,102,32,117,110,
+105,116,115,0,60,117,110,105,116,35,62,32,45,32,117,110,
+108,111,99,107,32,97,108,108,32,100,114,105,118,101,115,32,
+111,102,32,117,110,105,116,0,60,111,110,124,111,102,102,124,
+99,108,101,97,114,124,115,104,111,119,124,114,101,108,124,110,
+111,114,101,108,62,32,99,111,109,109,97,110,100,32,104,105,
+115,116,111,114,121,0,0,0,67,111,110,116,105,110,117,101,
+115,32,102,114,111,109,32,97,110,32,78,77,73,0,0,0,
+60,115,105,122,101,62,32,60,97,100,100,114,62,0,0,0,
+60,115,105,122,101,62,32,60,97,100,100,114,62,32,60,118,
+97,108,117,101,62,0,0,0,60,118,97,114,105,97,98,108,
+101,32,110,97,109,101,62,32,91,60,118,97,108,117,101,62,
+93,0,0,0,115,107,105,112,114,101,115,101,116,0,0,0,
+118,101,114,98,111,115,105,116,121,0,0,0,99,111,109,109,
+101,110,116,32,108,105,110,101,32,45,32,110,111,32,97,99,
+116,105,111,110,0,0,0,0,67,111,109,112,97,114,101,32,
+82,79,77,32,97,110,100,32,82,65,77,32,105,109,97,103,
+101,115,0,0,68,105,115,112,108,97,121,32,109,97,120,32,
+76,66,65,32,97,110,100,32,104,111,115,116,32,97,100,100,
+114,101,115,115,0,0,0,0,60,115,105,103,110,97,116,117,
+114,101,62,32,60,115,105,122,101,32,105,110,32,75,66,62,
+32,60,102,105,108,108,32,98,121,116,101,62,32,99,114,101,
+97,116,101,32,102,108,97,115,104,32,102,105,108,101,0,0,
+80,114,105,110,116,32,108,105,115,116,32,111,102,32,100,114,
+105,118,101,115,0,0,0,0,72,101,108,112,32,45,32,108,
+105,115,116,32,99,111,109,109,97,110,100,115,0,0,0,0,
+109,101,109,119,114,105,116,101,0,0,0,0,60,116,97,98,
+108,101,62,32,60,105,110,100,101,120,62,32,91,60,110,101,
+119,32,118,97,108,117,101,93,32,71,101,116,47,91,83,101,
+116,93,32,112,97,114,97,109,101,116,101,114,32,118,97,114,
+0,0,0,0,112,114,105,110,116,98,117,102,0,0,0,0,
+68,105,115,112,108,97,121,32,112,114,105,110,116,32,98,117,
+102,102,101,114,0,0,0,0,112,114,105,110,116,108,111,103,
+0,0,0,0,68,105,115,112,108,97,121,32,116,104,101,32,
+112,114,105,110,116,108,111,103,0,0,0,0,105,102,32,110,
+111,110,45,122,101,114,111,32,45,32,105,103,110,111,114,101,
+115,32,115,111,102,116,32,114,101,115,101,116,115,32,97,102,
+116,101,114,32,97,115,115,101,114,116,0,0,115,107,105,112,
+105,110,105,116,0,0,0,0,105,102,32,110,111,110,45,122,
+101,114,111,32,45,32,115,107,105,112,32,114,97,105,100,53,
+32,122,101,114,111,47,105,110,105,116,32,111,110,32,99,114,
+101,97,116,105,111,110,0,0,97,117,116,111,115,97,118,101,
+0,0,0,0,60,119,114,105,116,101,111,110,99,101,124,101,
+120,99,108,117,100,101,100,117,110,105,116,115,124,102,97,99,
+116,111,114,121,100,97,116,97,124,10,32,32,32,32,32,32,
+32,32,32,32,32,32,32,32,32,32,32,32,112,114,105,110,
+116,108,111,103,124,102,105,114,109,119,97,114,101,124,108,111,
+99,97,108,62,32,102,108,97,115,104,32,102,105,108,101,0,
+115,101,116,32,98,105,116,115,32,116,111,32,101,110,97,98,
+108,101,32,114,111,108,108,99,97,108,108,32,112,114,105,110,
+116,111,117,116,115,58,10,32,32,32,32,32,32,32,32,32,
+32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
+32,49,32,45,32,102,105,110,100,32,100,114,105,118,101,115,
+32,112,104,97,115,101,10,32,32,32,32,32,32,32,32,32,
+32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
+32,50,32,45,32,99,104,101,99,107,32,68,67,66,115,32,
+112,104,97,115,101,10,32,32,32,32,32,32,32,32,32,32,
+32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
+52,32,45,32,109,97,107,101,32,82,65,73,68,32,117,110,
+105,116,115,32,112,104,97,115,101,0,0,0,68,101,98,117,
+103,32,67,111,109,109,97,110,100,32,110,111,116,32,70,111,
+117,110,100,46,32,65,118,97,105,108,97,98,108,101,32,99,
+111,109,109,97,110,100,115,32,97,114,101,58,10,0,0,0,
+70,105,114,109,119,97,114,101,32,58,32,37,115,44,32,83,
+82,76,58,32,37,100,44,32,83,82,76,95,77,73,78,58,
+32,37,100,44,32,66,85,73,76,68,58,32,37,100,44,32,
+66,82,65,78,67,72,58,32,37,100,10,0,70,69,57,88,
+32,50,46,48,50,46,48,48,46,48,49,50,0,0,0,0,
+66,105,111,115,32,32,32,32,32,58,32,37,115,10,0,0,
+37,115,32,61,32,37,117,32,40,48,120,37,88,41,10,0,
+84,104,101,32,102,111,108,108,111,119,105,110,103,32,118,97,
+114,105,97,98,108,101,115,32,97,114,101,32,115,117,112,112,
+111,114,116,101,100,58,10,0,42,42,32,84,104,105,114,100,
 32,97,114,103,117,109,101,110,116,32,109,117,115,116,32,98,
-101,32,110,117,109,101,114,105,99,32,116,111,32,115,101,116,
-32,112,97,114,97,109,10,0,116,97,98,108,101,32,48,120,
-37,120,91,37,117,93,32,61,32,37,100,32,40,48,120,37,
-88,41,10,0,42,42,32,69,114,114,111,114,58,32,116,97,
-98,108,101,32,110,117,109,98,101,114,32,97,110,100,32,105,
-110,100,101,120,32,109,117,115,116,32,98,101,32,110,117,109,
-101,114,105,99,10,0,0,0,42,42,32,69,114,114,111,114,
-32,48,120,37,88,32,102,114,111,109,32,71,101,116,47,83,
-101,116,32,80,97,114,97,109,10,0,0,0,42,42,32,69,
+101,32,110,117,109,101,114,105,99,59,32,99,97,110,110,111,
+116,32,115,101,116,32,37,115,10,0,0,0,42,42,32,69,
 114,114,111,114,32,48,120,37,88,32,102,114,111,109,32,71,
-101,116,80,97,114,97,109,10,0,0,0,0,37,49,50,115,
-32,61,61,62,32,37,115,10,0,0,0,0,102,97,99,116,
-111,114,121,100,97,116,97,0,70,108,97,115,104,70,105,108,
-101,32,100,101,108,101,116,101,100,58,32,37,115,32,45,32,
-48,120,37,88,32,98,121,116,101,115,10,0,68,101,108,101,
-116,101,32,119,104,97,116,63,10,0,0,0,119,114,105,116,
-101,111,110,99,101,0,0,0,101,120,99,108,117,100,101,100,
-117,110,105,116,115,0,0,0,112,114,105,110,116,108,111,103,
-0,0,0,0,102,105,114,109,119,97,114,101,0,0,0,0,
-70,108,97,115,104,70,105,108,101,32,110,111,116,32,112,114,
-101,115,101,110,116,58,32,37,115,10,0,0,85,115,97,103,
-101,58,32,99,114,101,97,116,101,32,60,115,105,103,110,97,
-116,117,114,101,62,32,60,115,105,122,101,32,105,110,32,75,
-66,62,10,0,70,108,97,115,104,32,102,105,108,101,32,99,
+101,116,80,97,114,97,109,10,0,0,0,0,85,110,107,110,
+111,119,110,32,118,97,114,105,97,98,108,101,58,32,37,115,
+46,32,0,0,37,49,50,115,32,40,37,105,32,98,121,116,
+101,115,41,58,32,37,115,10,0,0,0,0,42,42,32,84,
+104,105,114,100,32,97,114,103,117,109,101,110,116,32,109,117,
+115,116,32,98,101,32,110,117,109,101,114,105,99,32,116,111,
+32,115,101,116,32,112,97,114,97,109,10,0,116,97,98,108,
+101,32,48,120,37,120,91,37,117,93,32,61,32,37,100,32,
+40,48,120,37,88,41,10,0,42,42,32,69,114,114,111,114,
+58,32,116,97,98,108,101,32,110,117,109,98,101,114,32,97,
+110,100,32,105,110,100,101,120,32,109,117,115,116,32,98,101,
+32,110,117,109,101,114,105,99,10,0,0,0,42,42,32,69,
+114,114,111,114,32,48,120,37,88,32,102,114,111,109,32,71,
+101,116,47,83,101,116,32,80,97,114,97,109,10,0,0,0,
+42,42,32,69,114,114,111,114,32,48,120,37,88,32,102,114,
+111,109,32,71,101,116,80,97,114,97,109,10,0,0,0,0,
+37,49,50,115,32,61,61,62,32,37,115,10,0,0,0,0,
+102,97,99,116,111,114,121,100,97,116,97,0,70,108,97,115,
+104,70,105,108,101,32,100,101,108,101,116,101,100,58,32,37,
+115,32,45,32,48,120,37,88,32,98,121,116,101,115,10,0,
+68,101,108,101,116,101,32,119,104,97,116,63,10,0,0,0,
+119,114,105,116,101,111,110,99,101,0,0,0,101,120,99,108,
+117,100,101,100,117,110,105,116,115,0,0,0,112,114,105,110,
+116,108,111,103,0,0,0,0,102,105,114,109,119,97,114,101,
+0,0,0,0,70,108,97,115,104,70,105,108,101,32,110,111,
+116,32,112,114,101,115,101,110,116,58,32,37,115,10,0,0,
+85,115,97,103,101,58,32,99,114,101,97,116,101,32,60,115,
+105,103,110,97,116,117,114,101,62,32,60,115,105,122,101,32,
+105,110,32,75,66,62,32,60,102,105,108,108,32,98,121,116,
+101,62,10,0,70,108,97,115,104,32,102,105,108,101,32,99,
 114,101,97,116,105,111,110,32,101,114,111,114,10,0,0,0,
 70,108,97,115,104,32,102,105,108,101,32,48,120,37,48,56,
 88,32,97,108,114,101,97,100,121,32,112,114,101,115,101,110,
@@ -24856,1864 +25024,1869 @@ unsigned char tw_fw_code[] __initdata = 
 32,37,115,10,0,0,0,0,69,114,114,111,114,32,48,120,
 37,88,32,100,117,114,105,110,103,32,85,110,108,111,99,107,
 32,111,102,32,117,110,105,116,32,37,100,10,0,0,0,0,
-200,24,133,0,0,154,132,0,2,134,128,0,220,24,133,0,
-0,154,132,0,2,134,128,0,164,24,133,0,28,154,132,0,
-116,131,128,0,172,24,133,0,92,153,132,0,126,12,1,0,
-224,24,133,0,56,154,132,0,84,15,1,0,232,24,133,0,
-144,155,132,0,114,130,128,0,240,24,133,0,92,154,132,0,
-42,130,128,0,248,24,133,0,140,153,132,0,58,130,128,0,
-202,24,133,0,116,154,132,0,66,130,128,0,180,24,133,0,
-164,153,132,0,230,131,128,0,140,154,132,0,180,153,132,0,
-100,132,128,0,188,24,133,0,156,152,132,0,240,127,128,0,
-204,24,133,0,152,154,132,0,28,127,128,0,208,154,132,0,
-220,154,132,0,212,132,128,0,244,154,132,0,0,155,132,0,
-212,132,128,0,252,24,133,0,180,152,132,0,212,250,128,0,
-4,25,133,0,196,152,132,0,220,22,128,0,212,24,133,0,
-36,153,132,0,30,130,128,0,12,25,133,0,56,153,132,0,
-154,133,128,0,192,24,133,0,204,153,132,0,36,126,128,0,
-196,24,133,0,220,152,132,0,232,125,128,0,232,153,132,0,
-24,155,132,0,44,151,145,0,72,155,132,0,84,155,132,0,
-100,151,145,0,244,153,132,0,236,155,132,0,192,150,145,0,
-132,155,132,0,244,152,132,0,204,144,145,0,67,111,117,108,
-100,110,39,116,32,105,110,105,116,105,97,108,105,122,101,32,
-100,105,97,103,110,111,115,116,105,99,32,116,101,115,116,32,
-102,111,114,32,114,101,113,32,73,68,32,61,32,37,48,52,
-88,46,10,0,100,101,116,97,105,108,115,32,111,102,32,101,
-114,114,111,114,115,58,10,0,32,32,69,114,114,111,114,32,
-105,110,32,105,110,105,116,105,97,108,105,122,105,110,103,32,
-116,101,115,116,58,32,48,120,37,48,52,120,10,0,0,0,
-32,116,101,115,116,37,105,32,69,114,114,61,37,48,52,120,
-10,0,0,0,32,32,32,32,116,101,115,116,32,37,45,51,
-105,58,32,32,69,114,114,111,114,67,111,100,101,32,61,32,
-37,48,52,120,10,0,0,0,45,45,45,45,45,45,45,45,
-45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,10,
-0,0,0,0,32,84,101,115,116,115,32,112,101,114,102,111,
-114,109,101,100,58,32,32,37,105,10,0,0,32,32,32,32,
-32,35,32,111,102,32,101,114,114,111,114,115,58,32,32,37,
-105,10,0,0,69,114,114,111,114,67,111,100,101,32,61,32,
-37,48,52,88,46,10,0,0,32,32,84,104,105,115,32,115,
-104,111,117,108,100,32,110,101,118,101,114,32,98,101,32,101,
-120,101,99,117,116,101,100,33,10,0,0,0,117,80,32,60,
-45,62,32,83,98,117,102,32,100,97,116,97,32,105,110,116,
-101,103,114,105,116,121,32,116,101,115,116,115,46,46,46,10,
-0,0,0,0,84,101,115,116,32,67,111,117,110,116,32,61,
-32,37,105,10,0,0,0,0,117,80,32,60,45,62,32,104,
-111,115,116,32,100,97,116,97,32,105,110,116,101,103,114,105,
+68,36,133,0,240,164,132,0,62,138,128,0,88,36,133,0,
+240,164,132,0,62,138,128,0,32,36,133,0,12,165,132,0,
+176,135,128,0,40,36,133,0,76,164,132,0,160,13,1,0,
+92,36,133,0,40,165,132,0,118,16,1,0,100,36,133,0,
+184,166,132,0,228,133,128,0,108,36,133,0,76,165,132,0,
+230,134,128,0,116,36,133,0,132,165,132,0,156,133,128,0,
+124,36,133,0,124,164,132,0,172,133,128,0,70,36,133,0,
+156,165,132,0,180,133,128,0,48,36,133,0,148,164,132,0,
+34,136,128,0,180,165,132,0,164,164,132,0,160,136,128,0,
+56,36,133,0,140,163,132,0,98,131,128,0,72,36,133,0,
+192,165,132,0,142,130,128,0,248,165,132,0,4,166,132,0,
+16,137,128,0,28,166,132,0,40,166,132,0,16,137,128,0,
+128,36,133,0,164,163,132,0,16,255,128,0,136,36,133,0,
+180,163,132,0,156,23,128,0,80,36,133,0,20,164,132,0,
+144,133,128,0,144,36,133,0,40,164,132,0,214,137,128,0,
+60,36,133,0,188,164,132,0,150,129,128,0,64,36,133,0,
+204,163,132,0,90,129,128,0,216,164,132,0,64,166,132,0,
+140,162,145,0,112,166,132,0,124,166,132,0,196,162,145,0,
+228,164,132,0,20,167,132,0,32,162,145,0,172,166,132,0,
+228,163,132,0,44,156,145,0,67,111,117,108,100,110,39,116,
+32,105,110,105,116,105,97,108,105,122,101,32,100,105,97,103,
+110,111,115,116,105,99,32,116,101,115,116,32,102,111,114,32,
+114,101,113,32,73,68,32,61,32,37,48,52,88,46,10,0,
+100,101,116,97,105,108,115,32,111,102,32,101,114,114,111,114,
+115,58,10,0,32,32,69,114,114,111,114,32,105,110,32,105,
+110,105,116,105,97,108,105,122,105,110,103,32,116,101,115,116,
+58,32,48,120,37,48,52,120,10,0,0,0,32,116,101,115,
+116,37,105,32,69,114,114,61,37,48,52,120,10,0,0,0,
+32,32,32,32,116,101,115,116,32,37,45,51,105,58,32,32,
+69,114,114,111,114,67,111,100,101,32,61,32,37,48,52,120,
+10,0,0,0,45,45,45,45,45,45,45,45,45,45,45,45,
+45,45,45,45,45,45,45,45,45,45,45,10,0,0,0,0,
+32,84,101,115,116,115,32,112,101,114,102,111,114,109,101,100,
+58,32,32,37,105,10,0,0,32,32,32,32,32,35,32,111,
+102,32,101,114,114,111,114,115,58,32,32,37,105,10,0,0,
+69,114,114,111,114,67,111,100,101,32,61,32,37,48,52,88,
+46,10,0,0,32,32,84,104,105,115,32,115,104,111,117,108,
+100,32,110,101,118,101,114,32,98,101,32,101,120,101,99,117,
+116,101,100,33,10,0,0,0,117,80,32,60,45,62,32,83,
+98,117,102,32,100,97,116,97,32,105,110,116,101,103,114,105,
 116,121,32,116,101,115,116,115,46,46,46,10,0,0,0,0,
 84,101,115,116,32,67,111,117,110,116,32,61,32,37,105,10,
-0,0,0,0,83,98,117,102,32,116,111,32,104,111,115,116,
-32,100,97,116,97,32,105,110,116,101,103,114,105,116,121,32,
-116,101,115,116,115,46,46,46,10,0,0,0,84,101,115,116,
+0,0,0,0,117,80,32,60,45,62,32,104,111,115,116,32,
+100,97,116,97,32,105,110,116,101,103,114,105,116,121,32,116,
+101,115,116,115,46,46,46,10,0,0,0,0,84,101,115,116,
 32,67,111,117,110,116,32,61,32,37,105,10,0,0,0,0,
-72,111,115,116,32,116,111,32,83,98,117,102,32,100,97,116,
+83,98,117,102,32,116,111,32,104,111,115,116,32,100,97,116,
 97,32,105,110,116,101,103,114,105,116,121,32,116,101,115,116,
 115,46,46,46,10,0,0,0,84,101,115,116,32,67,111,117,
-110,116,32,61,32,37,105,10,0,0,0,0,78,117,108,108,
-32,116,101,115,116,46,10,0,84,101,115,116,32,67,111,117,
-110,116,32,61,32,37,105,10,0,0,0,0,65,112,111,114,
-116,32,60,45,62,32,104,111,115,116,32,60,45,62,32,117,
-80,32,100,97,116,97,32,105,110,116,101,103,114,105,116,121,
-32,116,101,115,116,115,46,46,46,10,0,0,65,112,111,114,
+110,116,32,61,32,37,105,10,0,0,0,0,72,111,115,116,
+32,116,111,32,83,98,117,102,32,100,97,116,97,32,105,110,
+116,101,103,114,105,116,121,32,116,101,115,116,115,46,46,46,
+10,0,0,0,84,101,115,116,32,67,111,117,110,116,32,61,
+32,37,105,10,0,0,0,0,78,117,108,108,32,116,101,115,
+116,46,10,0,84,101,115,116,32,67,111,117,110,116,32,61,
+32,37,105,10,0,0,0,0,65,112,111,114,116,32,60,45,
+62,32,104,111,115,116,32,60,45,62,32,117,80,32,100,97,
+116,97,32,105,110,116,101,103,114,105,116,121,32,116,101,115,
+116,115,46,46,46,10,0,0,65,112,111,114,116,35,32,61,
+32,37,105,10,0,0,0,0,84,101,115,116,32,67,111,117,
+110,116,32,61,32,37,105,10,0,0,0,0,117,80,32,60,
+45,62,32,80,99,104,105,112,32,80,98,117,102,32,100,97,
+116,97,32,105,110,116,101,103,114,105,116,121,32,116,101,115,
+116,115,46,46,46,10,0,0,84,101,115,116,32,67,111,117,
+110,116,32,61,32,37,105,10,0,0,0,0,117,80,32,82,
+65,77,32,116,101,115,116,46,46,46,10,0,32,32,32,32,
+82,65,77,32,115,116,97,114,116,32,97,100,100,114,58,32,
+48,120,37,120,32,32,101,110,100,32,97,100,100,114,58,32,
+48,120,37,120,32,32,115,105,122,101,32,48,120,37,120,10,
+32,32,32,32,35,32,116,101,115,116,32,108,111,99,97,116,
+105,111,110,115,58,32,37,105,10,0,0,0,84,101,115,116,
+32,67,111,117,110,116,32,61,32,37,105,10,0,0,0,0,
+65,112,111,114,116,45,100,114,105,118,101,110,32,83,98,117,
+102,32,60,45,62,32,100,105,115,107,32,98,117,102,102,101,
+114,32,116,101,115,116,115,46,46,46,10,0,65,112,111,114,
 116,35,32,61,32,37,105,10,0,0,0,0,84,101,115,116,
 32,67,111,117,110,116,32,61,32,37,105,10,0,0,0,0,
-117,80,32,60,45,62,32,80,99,104,105,112,32,80,98,117,
-102,32,100,97,116,97,32,105,110,116,101,103,114,105,116,121,
-32,116,101,115,116,115,46,46,46,10,0,0,84,101,115,116,
+83,98,117,102,32,109,101,109,111,114,121,32,116,101,115,116,
+46,46,46,10,0,0,0,0,84,101,115,116,32,67,111,117,
+110,116,32,61,32,37,105,10,0,0,0,0,84,101,115,116,
 32,67,111,117,110,116,32,61,32,37,105,10,0,0,0,0,
-117,80,32,82,65,77,32,116,101,115,116,46,46,46,10,0,
-32,32,32,32,82,65,77,32,115,116,97,114,116,32,97,100,
-100,114,58,32,48,120,37,120,32,32,101,110,100,32,97,100,
-100,114,58,32,48,120,37,120,32,32,115,105,122,101,32,48,
-120,37,120,10,32,32,32,32,35,32,116,101,115,116,32,108,
-111,99,97,116,105,111,110,115,58,32,37,105,10,0,0,0,
-84,101,115,116,32,67,111,117,110,116,32,61,32,37,105,10,
-0,0,0,0,65,112,111,114,116,45,100,114,105,118,101,110,
-32,83,98,117,102,32,60,45,62,32,100,105,115,107,32,98,
-117,102,102,101,114,32,116,101,115,116,115,46,46,46,10,0,
+79,98,115,111,108,101,116,101,32,116,101,115,116,32,45,45,
+32,110,111,32,116,101,115,116,115,32,112,101,114,102,111,114,
+109,101,100,46,10,0,0,0,84,101,115,116,32,67,111,117,
+110,116,32,61,32,37,105,10,0,0,0,0,78,117,109,98,
+101,114,32,111,102,32,65,112,111,114,116,115,32,116,111,32,
+116,101,115,116,58,32,37,105,10,0,0,0,77,117,108,116,
+105,45,65,112,111,114,116,115,32,100,105,115,107,32,82,47,
+87,32,116,101,115,116,46,46,46,10,0,0,84,101,115,116,
+32,67,111,117,110,116,32,61,32,37,105,10,0,0,0,0,
+83,105,110,103,108,101,45,65,112,111,114,116,32,100,105,115,
+107,32,82,47,87,32,116,101,115,116,46,46,46,10,0,0,
 65,112,111,114,116,35,32,61,32,37,105,10,0,0,0,0,
 84,101,115,116,32,67,111,117,110,116,32,61,32,37,105,10,
-0,0,0,0,83,98,117,102,32,109,101,109,111,114,121,32,
-116,101,115,116,46,46,46,10,0,0,0,0,84,101,115,116,
+0,0,0,0,67,104,101,99,107,115,117,109,32,111,102,32,
+102,108,97,115,104,32,82,79,77,32,116,101,115,116,46,46,
+46,10,0,0,84,101,115,116,32,67,111,117,110,116,32,61,
+32,37,105,10,0,0,0,0,65,99,104,105,112,32,88,79,
+82,32,116,101,115,116,46,46,46,10,0,0,65,112,111,114,
+116,35,32,61,32,37,105,10,0,0,0,0,84,101,115,116,
 32,67,111,117,110,116,32,61,32,37,105,10,0,0,0,0,
+65,99,104,105,112,32,38,32,80,99,104,105,112,32,116,111,
+32,117,80,32,105,110,116,101,114,114,117,112,116,32,108,105,
+110,101,32,116,101,115,116,46,46,46,10,0,32,32,32,32,
+84,101,115,116,105,110,103,32,102,111,114,32,37,105,32,65,
+99,104,105,112,32,105,110,116,115,32,97,110,100,32,50,32,
+80,99,104,105,112,32,105,110,116,115,46,10,0,0,0,0,
 84,101,115,116,32,67,111,117,110,116,32,61,32,37,105,10,
-0,0,0,0,79,98,115,111,108,101,116,101,32,116,101,115,
-116,32,45,45,32,110,111,32,116,101,115,116,115,32,112,101,
-114,102,111,114,109,101,100,46,10,0,0,0,84,101,115,116,
+0,0,0,0,82,101,97,100,32,117,80,32,109,101,109,32,
+98,121,116,101,115,46,46,46,10,0,0,0,84,101,115,116,
 32,67,111,117,110,116,32,61,32,37,105,10,0,0,0,0,
-78,117,109,98,101,114,32,111,102,32,65,112,111,114,116,115,
-32,116,111,32,116,101,115,116,58,32,37,105,10,0,0,0,
-77,117,108,116,105,45,65,112,111,114,116,115,32,100,105,115,
-107,32,82,47,87,32,116,101,115,116,46,46,46,10,0,0,
+87,114,105,116,101,32,117,80,32,109,101,109,32,98,121,116,
+101,115,46,46,46,10,0,0,84,101,115,116,32,67,111,117,
+110,116,32,61,32,37,105,10,0,0,0,0,82,101,97,100,
+32,117,80,32,109,101,109,32,119,111,114,100,115,46,46,46,
+10,0,0,0,84,101,115,116,32,67,111,117,110,116,32,61,
+32,37,105,10,0,0,0,0,87,114,105,116,101,32,117,80,
+32,109,101,109,32,119,111,114,100,115,46,46,46,10,0,0,
 84,101,115,116,32,67,111,117,110,116,32,61,32,37,105,10,
-0,0,0,0,83,105,110,103,108,101,45,65,112,111,114,116,
-32,100,105,115,107,32,82,47,87,32,116,101,115,116,46,46,
-46,10,0,0,65,112,111,114,116,35,32,61,32,37,105,10,
-0,0,0,0,84,101,115,116,32,67,111,117,110,116,32,61,
-32,37,105,10,0,0,0,0,67,104,101,99,107,115,117,109,
-32,111,102,32,102,108,97,115,104,32,82,79,77,32,116,101,
-115,116,46,46,46,10,0,0,84,101,115,116,32,67,111,117,
-110,116,32,61,32,37,105,10,0,0,0,0,65,99,104,105,
-112,32,88,79,82,32,116,101,115,116,46,46,46,10,0,0,
+0,0,0,0,68,114,105,118,101,32,85,68,77,65,32,109,
+111,100,101,32,116,101,115,116,46,46,46,10,0,0,0,0,
 65,112,111,114,116,35,32,61,32,37,105,10,0,0,0,0,
 84,101,115,116,32,67,111,117,110,116,32,61,32,37,105,10,
-0,0,0,0,65,99,104,105,112,32,38,32,80,99,104,105,
-112,32,116,111,32,117,80,32,105,110,116,101,114,114,117,112,
-116,32,108,105,110,101,32,116,101,115,116,46,46,46,10,0,
-32,32,32,32,84,101,115,116,105,110,103,32,102,111,114,32,
-37,105,32,65,99,104,105,112,32,105,110,116,115,32,97,110,
-100,32,50,32,80,99,104,105,112,32,105,110,116,115,46,10,
-0,0,0,0,84,101,115,116,32,67,111,117,110,116,32,61,
-32,37,105,10,0,0,0,0,82,101,97,100,32,117,80,32,
-109,101,109,32,98,121,116,101,115,46,46,46,10,0,0,0,
-84,101,115,116,32,67,111,117,110,116,32,61,32,37,105,10,
-0,0,0,0,87,114,105,116,101,32,117,80,32,109,101,109,
-32,98,121,116,101,115,46,46,46,10,0,0,84,101,115,116,
-32,67,111,117,110,116,32,61,32,37,105,10,0,0,0,0,
-82,101,97,100,32,117,80,32,109,101,109,32,119,111,114,100,
-115,46,46,46,10,0,0,0,84,101,115,116,32,67,111,117,
-110,116,32,61,32,37,105,10,0,0,0,0,87,114,105,116,
-101,32,117,80,32,109,101,109,32,119,111,114,100,115,46,46,
-46,10,0,0,84,101,115,116,32,67,111,117,110,116,32,61,
-32,37,105,10,0,0,0,0,68,114,105,118,101,32,85,68,
-77,65,32,109,111,100,101,32,116,101,115,116,46,46,46,10,
-0,0,0,0,65,112,111,114,116,35,32,61,32,37,105,10,
-0,0,0,0,84,101,115,116,32,67,111,117,110,116,32,61,
-32,37,105,10,0,0,0,0,83,69,84,84,73,78,71,83,
+0,0,0,0,83,69,84,84,73,78,71,83,32,68,101,108,
+101,116,105,111,110,58,32,87,82,73,84,69,32,79,78,67,
+69,32,116,121,112,101,10,0,83,69,84,84,73,78,71,83,
 32,68,101,108,101,116,105,111,110,58,32,87,82,73,84,69,
-32,79,78,67,69,32,116,121,112,101,10,0,83,69,84,84,
-73,78,71,83,32,68,101,108,101,116,105,111,110,58,32,87,
-82,73,84,69,32,79,78,67,69,32,116,121,112,101,44,32,
-110,111,32,102,108,97,115,104,32,102,105,108,101,32,112,114,
-101,115,101,110,116,32,40,97,108,114,101,97,100,121,32,100,
-101,108,101,116,101,100,41,10,0,0,0,0,67,111,117,108,
-100,110,39,116,32,99,108,101,97,114,32,83,98,117,102,33,
-10,0,0,0,80,98,117,102,32,101,114,114,111,114,33,32,
-32,32,32,80,98,117,102,32,98,121,116,101,32,111,102,102,
-115,101,116,32,37,48,51,120,58,32,32,119,114,111,116,101,
-32,37,48,50,120,32,44,32,32,114,101,97,100,32,37,48,
-50,120,32,46,10,0,0,0,67,111,117,108,100,110,39,116,
+32,79,78,67,69,32,116,121,112,101,44,32,110,111,32,102,
+108,97,115,104,32,102,105,108,101,32,112,114,101,115,101,110,
+116,32,40,97,108,114,101,97,100,121,32,100,101,108,101,116,
+101,100,41,10,0,0,0,0,67,111,117,108,100,110,39,116,
 32,99,108,101,97,114,32,83,98,117,102,33,10,0,0,0,
-67,111,117,108,100,110,39,116,32,119,114,105,116,101,32,83,
-98,117,102,33,10,0,0,0,67,111,117,108,100,110,39,116,
-32,114,101,97,100,32,83,98,117,102,33,10,0,0,0,0,
-83,104,111,114,116,32,105,110,32,83,98,117,102,32,100,97,
-116,97,32,108,105,110,101,33,32,32,32,32,83,98,117,102,
-32,98,121,116,101,32,111,102,102,115,101,116,32,37,48,51,
-120,58,32,32,119,114,111,116,101,32,37,48,50,120,32,44,
-32,32,114,101,97,100,32,37,48,50,120,32,46,10,0,0,
-84,104,101,114,101,32,97,114,101,110,39,116,32,97,116,32,
-108,101,97,115,116,32,37,105,32,65,112,111,114,116,115,32,
-119,105,116,104,32,100,114,105,118,101,115,32,97,116,116,97,
-99,104,101,100,33,10,0,0,78,111,32,100,114,105,118,101,
-32,111,110,32,65,112,111,114,116,32,37,105,33,10,0,0,
-32,32,32,32,67,104,101,99,107,115,117,109,32,61,32,37,
-48,52,88,10,0,0,0,0,88,79,82,32,101,114,114,111,
-114,33,32,32,32,32,83,98,117,102,32,97,100,100,114,32,
-37,120,58,32,32,115,104,111,117,108,100,32,98,101,32,37,
-48,50,120,32,44,32,32,98,117,116,32,114,101,97,100,32,
-37,48,50,120,32,46,10,0,73,110,116,32,108,105,110,101,
-32,101,114,114,111,114,33,32,32,32,32,80,99,104,105,112,
-32,65,32,105,110,116,32,119,111,117,108,100,110,39,116,32,
-103,111,32,72,105,103,104,32,97,116,32,117,80,46,10,0,
-73,110,116,32,108,105,110,101,32,101,114,114,111,114,33,32,
-32,32,32,80,99,104,105,112,32,66,32,105,110,116,32,119,
-111,117,108,100,110,39,116,32,103,111,32,72,105,103,104,32,
-97,116,32,117,80,46,10,0,73,110,116,32,108,105,110,101,
-32,101,114,114,111,114,33,32,32,32,32,65,108,108,32,65,
-99,104,105,112,32,105,110,116,32,108,105,110,101,115,32,119,
-101,114,101,110,39,116,32,72,105,103,104,32,97,116,32,117,
+80,98,117,102,32,101,114,114,111,114,33,32,32,32,32,80,
+98,117,102,32,98,121,116,101,32,111,102,102,115,101,116,32,
+37,48,51,120,58,32,32,119,114,111,116,101,32,37,48,50,
+120,32,44,32,32,114,101,97,100,32,37,48,50,120,32,46,
+10,0,0,0,67,111,117,108,100,110,39,116,32,99,108,101,
+97,114,32,83,98,117,102,33,10,0,0,0,67,111,117,108,
+100,110,39,116,32,119,114,105,116,101,32,83,98,117,102,33,
+10,0,0,0,67,111,117,108,100,110,39,116,32,114,101,97,
+100,32,83,98,117,102,33,10,0,0,0,0,83,104,111,114,
+116,32,105,110,32,83,98,117,102,32,100,97,116,97,32,108,
+105,110,101,33,32,32,32,32,83,98,117,102,32,98,121,116,
+101,32,111,102,102,115,101,116,32,37,48,51,120,58,32,32,
+119,114,111,116,101,32,37,48,50,120,32,44,32,32,114,101,
+97,100,32,37,48,50,120,32,46,10,0,0,84,104,101,114,
+101,32,97,114,101,110,39,116,32,97,116,32,108,101,97,115,
+116,32,37,105,32,65,112,111,114,116,115,32,119,105,116,104,
+32,100,114,105,118,101,115,32,97,116,116,97,99,104,101,100,
+33,10,0,0,78,111,32,100,114,105,118,101,32,111,110,32,
+65,112,111,114,116,32,37,105,33,10,0,0,32,32,32,32,
+67,104,101,99,107,115,117,109,32,61,32,37,48,52,88,10,
+0,0,0,0,88,79,82,32,101,114,114,111,114,33,32,32,
+32,32,83,98,117,102,32,97,100,100,114,32,37,120,58,32,
+32,115,104,111,117,108,100,32,98,101,32,37,48,50,120,32,
+44,32,32,98,117,116,32,114,101,97,100,32,37,48,50,120,
+32,46,10,0,73,110,116,32,108,105,110,101,32,101,114,114,
+111,114,33,32,32,32,32,80,99,104,105,112,32,65,32,105,
+110,116,32,119,111,117,108,100,110,39,116,32,103,111,32,72,
+105,103,104,32,97,116,32,117,80,46,10,0,73,110,116,32,
+108,105,110,101,32,101,114,114,111,114,33,32,32,32,32,80,
+99,104,105,112,32,66,32,105,110,116,32,119,111,117,108,100,
+110,39,116,32,103,111,32,72,105,103,104,32,97,116,32,117,
 80,46,10,0,73,110,116,32,108,105,110,101,32,101,114,114,
-111,114,33,32,32,32,32,65,99,104,105,112,37,105,32,105,
-110,116,32,108,105,110,101,32,119,111,117,108,100,110,39,116,
-32,103,111,32,76,111,119,32,97,116,32,117,80,46,10,0,
+111,114,33,32,32,32,32,65,108,108,32,65,99,104,105,112,
+32,105,110,116,32,108,105,110,101,115,32,119,101,114,101,110,
+39,116,32,72,105,103,104,32,97,116,32,117,80,46,10,0,
 73,110,116,32,108,105,110,101,32,101,114,114,111,114,33,32,
 32,32,32,65,99,104,105,112,37,105,32,105,110,116,32,108,
 105,110,101,32,119,111,117,108,100,110,39,116,32,103,111,32,
-72,105,103,104,32,97,116,32,117,80,46,10,0,0,0,0,
+76,111,119,32,97,116,32,117,80,46,10,0,73,110,116,32,
+108,105,110,101,32,101,114,114,111,114,33,32,32,32,32,65,
+99,104,105,112,37,105,32,105,110,116,32,108,105,110,101,32,
+119,111,117,108,100,110,39,116,32,103,111,32,72,105,103,104,
+32,97,116,32,117,80,46,10,0,0,0,0,73,110,116,32,
+108,105,110,101,32,101,114,114,111,114,33,32,32,32,32,80,
+99,104,105,112,32,65,32,105,110,116,32,119,111,117,108,100,
+110,39,116,32,103,111,32,76,111,119,32,97,116,32,117,80,
+46,10,0,0,73,110,116,32,108,105,110,101,32,101,114,114,
+111,114,33,32,32,32,32,80,99,104,105,112,32,65,32,105,
+110,116,32,105,115,32,115,104,111,114,116,101,100,32,116,111,
+32,80,99,104,105,112,32,66,32,105,110,116,46,10,0,0,
 73,110,116,32,108,105,110,101,32,101,114,114,111,114,33,32,
-32,32,32,80,99,104,105,112,32,65,32,105,110,116,32,119,
+32,32,32,80,99,104,105,112,32,66,32,105,110,116,32,119,
 111,117,108,100,110,39,116,32,103,111,32,76,111,119,32,97,
-116,32,117,80,46,10,0,0,73,110,116,32,108,105,110,101,
-32,101,114,114,111,114,33,32,32,32,32,80,99,104,105,112,
-32,65,32,105,110,116,32,105,115,32,115,104,111,114,116,101,
-100,32,116,111,32,80,99,104,105,112,32,66,32,105,110,116,
-46,10,0,0,73,110,116,32,108,105,110,101,32,101,114,114,
-111,114,33,32,32,32,32,80,99,104,105,112,32,66,32,105,
-110,116,32,119,111,117,108,100,110,39,116,32,103,111,32,76,
-111,119,32,97,116,32,117,80,46,10,0,0,32,32,32,32,
-82,101,97,100,32,65,100,100,114,101,115,115,58,32,48,120,
-37,120,10,0,32,32,32,32,78,117,109,98,101,114,32,111,
-102,32,66,121,116,101,115,32,116,111,32,114,101,97,100,58,
-32,48,120,37,120,10,0,0,32,32,32,32,78,117,109,98,
-101,114,32,111,102,32,66,121,116,101,115,32,116,111,32,119,
-114,105,116,101,58,32,48,120,37,120,10,0,32,32,32,32,
-87,114,105,116,101,32,65,100,100,114,101,115,115,58,32,48,
-120,37,120,10,0,0,0,0,32,32,32,32,82,101,97,100,
+116,32,117,80,46,10,0,0,32,32,32,32,82,101,97,100,
 32,65,100,100,114,101,115,115,58,32,48,120,37,120,10,0,
-32,32,32,32,78,117,109,98,101,114,32,111,102,32,119,111,
-114,100,115,32,116,111,32,114,101,97,100,58,32,48,120,37,
+32,32,32,32,78,117,109,98,101,114,32,111,102,32,66,121,
+116,101,115,32,116,111,32,114,101,97,100,58,32,48,120,37,
 120,10,0,0,32,32,32,32,78,117,109,98,101,114,32,111,
-102,32,119,111,114,100,115,32,116,111,32,119,114,105,116,101,
+102,32,66,121,116,101,115,32,116,111,32,119,114,105,116,101,
 58,32,48,120,37,120,10,0,32,32,32,32,87,114,105,116,
 101,32,65,100,100,114,101,115,115,58,32,48,120,37,120,10,
-0,0,0,0,117,110,100,101,102,105,110,101,100,33,10,0,
-85,68,77,65,45,49,48,48,10,0,0,0,85,68,77,65,
-45,49,51,51,10,0,0,0,32,32,32,32,85,68,77,65,
-32,109,111,100,101,32,61,32,0,0,0,0,85,68,77,65,
-45,51,51,10,0,0,0,0,85,68,77,65,45,54,54,10,
-0,0,0,0,66,97,100,32,82,65,77,32,108,111,99,97,
-116,105,111,110,33,32,32,32,32,87,114,111,116,101,32,116,
-111,32,65,100,100,114,32,37,120,44,32,97,110,100,32,105,
-116,32,99,104,97,110,103,101,100,32,65,100,100,114,32,37,
-120,46,10,0,66,97,100,32,82,65,77,32,108,111,99,97,
-116,105,111,110,33,32,32,32,32,65,100,100,114,32,37,120,
-58,32,32,119,114,111,116,101,32,37,120,32,44,32,114,101,
-97,100,32,98,97,99,107,32,37,120,32,46,10,0,0,0,
+0,0,0,0,32,32,32,32,82,101,97,100,32,65,100,100,
+114,101,115,115,58,32,48,120,37,120,10,0,32,32,32,32,
+78,117,109,98,101,114,32,111,102,32,119,111,114,100,115,32,
+116,111,32,114,101,97,100,58,32,48,120,37,120,10,0,0,
+32,32,32,32,78,117,109,98,101,114,32,111,102,32,119,111,
+114,100,115,32,116,111,32,119,114,105,116,101,58,32,48,120,
+37,120,10,0,32,32,32,32,87,114,105,116,101,32,65,100,
+100,114,101,115,115,58,32,48,120,37,120,10,0,0,0,0,
+117,110,100,101,102,105,110,101,100,33,10,0,85,68,77,65,
+45,49,48,48,10,0,0,0,85,68,77,65,45,49,51,51,
+10,0,0,0,32,32,32,32,85,68,77,65,32,109,111,100,
+101,32,61,32,0,0,0,0,85,68,77,65,45,51,51,10,
+0,0,0,0,85,68,77,65,45,54,54,10,0,0,0,0,
 66,97,100,32,82,65,77,32,108,111,99,97,116,105,111,110,
 33,32,32,32,32,87,114,111,116,101,32,116,111,32,65,100,
-100,114,32,37,120,32,44,32,97,110,100,32,105,116,32,99,
-104,97,110,103,101,100,32,65,100,100,114,32,37,120,32,46,
-10,0,0,0,67,111,117,108,100,110,39,116,32,119,114,105,
-116,101,32,83,98,117,102,33,10,0,0,0,67,111,117,108,
-100,110,39,116,32,114,101,97,100,32,83,98,117,102,33,10,
-0,0,0,0,79,112,101,110,32,105,110,32,83,98,117,102,
-32,100,97,116,97,32,108,105,110,101,33,32,32,32,32,83,
-98,117,102,32,98,121,116,101,32,111,102,102,115,101,116,32,
-37,48,51,120,58,32,32,119,114,111,116,101,32,37,48,50,
-120,32,44,32,32,114,101,97,100,32,37,48,50,120,32,46,
-10,0,0,0,66,97,100,32,83,98,117,102,32,108,111,99,
-97,116,105,111,110,33,32,32,32,32,83,98,117,102,32,97,
-100,100,114,32,37,120,58,32,32,119,114,111,116,101,32,37,
-48,50,120,32,44,32,32,114,101,97,100,32,37,48,50,120,
-32,46,10,0,67,111,117,108,100,110,39,116,32,119,114,105,
-116,101,32,83,98,117,102,33,10,0,0,0,67,111,117,108,
-100,110,39,116,32,114,101,97,100,32,83,98,117,102,33,10,
-0,0,0,0,66,97,100,32,83,98,117,102,32,97,100,100,
-114,101,115,115,32,108,105,110,101,33,32,83,98,117,102,32,
-97,100,100,114,32,37,120,58,32,32,119,114,111,116,101,32,
-37,48,49,54,120,44,32,32,114,101,97,100,32,37,48,49,
-54,120,10,0,67,111,117,108,100,110,39,116,32,119,114,105,
-116,101,32,83,98,117,102,33,10,0,0,0,67,111,117,108,
-100,110,39,116,32,114,101,97,100,32,83,98,117,102,33,10,
-0,0,0,0,66,97,100,32,83,98,117,102,32,97,100,100,
-114,101,115,115,32,108,105,110,101,33,32,83,98,117,102,32,
-97,100,100,114,32,37,120,58,32,32,115,104,111,117,108,100,
-32,98,101,32,48,44,32,98,117,116,32,105,116,32,119,97,
-115,32,99,104,97,110,103,101,100,32,116,111,32,37,48,49,
-54,120,10,0,68,82,86,95,78,79,84,95,80,82,69,83,
-69,78,84,0,68,82,86,95,72,65,83,95,85,78,67,79,
-78,86,69,82,84,69,68,95,68,67,66,0,68,82,86,95,
-72,65,83,95,85,78,83,85,80,80,79,82,84,69,68,95,
-68,67,66,0,68,82,86,95,80,82,69,83,69,78,84,0,
-85,78,83,85,80,80,79,82,84,69,68,0,68,82,86,95,
-70,65,73,76,69,68,95,67,65,66,76,69,95,84,69,83,
-84,0,0,0,68,82,86,95,70,65,73,76,69,68,95,67,
-79,78,70,73,71,95,79,80,83,0,0,0,68,82,86,95,
-78,79,84,95,83,85,80,80,79,82,84,69,68,0,0,0,
-68,82,86,95,82,69,77,79,86,69,68,95,74,66,79,68,
-0,0,0,0,68,82,86,95,72,65,83,95,68,67,66,95,
-68,65,84,65,95,67,72,69,67,75,0,0,68,82,86,95,
-72,65,83,95,68,67,66,95,79,82,80,72,65,78,0,0,
-68,82,86,95,72,65,83,95,68,67,66,95,82,69,65,68,
-95,70,65,73,76,85,82,69,0,0,0,0,68,82,86,95,
-72,65,83,95,68,67,66,95,82,69,65,68,95,84,73,77,
-69,79,85,84,0,0,0,0,85,68,77,65,45,49,48,48,
-0,0,0,0,85,68,77,65,45,49,51,51,0,0,0,0,
-0,0,0,0,180,176,132,0,1,0,0,0,80,177,132,0,
-217,0,0,0,196,176,132,0,219,0,0,0,220,176,132,0,
-221,0,0,0,100,177,132,0,223,0,0,0,124,177,132,0,
-236,0,0,0,144,177,132,0,238,0,0,0,172,177,132,0,
-0,0,0,0,12,177,132,0,0,0,0,0,36,177,132,0,
-254,0,0,0,60,177,132,0,255,0,0,0,244,176,132,0,
-85,78,75,78,79,87,78,32,83,84,65,84,85,83,0,0,
-37,115,32,40,48,120,37,88,41,10,0,0,68,114,105,118,
-101,32,114,101,109,111,118,101,100,44,32,0,68,114,105,118,
-101,32,97,100,100,101,100,44,32,0,0,0,68,73,84,91,
-37,50,105,93,46,115,116,97,116,117,115,32,61,32,0,0,
-32,32,32,77,111,100,101,108,32,35,58,32,37,115,10,0,
-32,32,83,101,114,105,97,108,32,35,58,32,37,115,10,0,
-32,32,68,114,118,32,70,87,32,35,58,32,37,115,10,0,
-32,32,83,65,84,65,32,78,67,81,58,32,37,100,10,0,
-80,119,114,32,67,121,99,108,101,115,58,32,37,100,10,0,
-32,32,65,99,111,117,115,116,105,99,58,32,48,120,37,88,
-44,32,100,101,102,61,48,120,37,88,32,40,48,120,70,69,
-61,98,101,115,116,32,112,101,114,102,111,114,109,97,110,99,
-101,41,10,0,40,115,101,99,117,114,105,116,121,32,102,101,
-97,116,117,114,101,32,110,111,116,32,115,117,112,112,111,114,
-116,101,100,32,33,33,32,93,10,0,0,0,45,45,80,111,
-114,116,91,37,50,100,93,45,0,0,0,0,68,73,84,32,
-115,116,97,116,117,115,58,32,0,0,0,0,32,32,67,97,
-112,97,99,105,116,121,58,32,37,108,117,32,40,48,120,37,
-48,56,108,88,41,10,0,0,32,70,101,97,116,46,32,69,
-120,116,58,32,84,105,109,101,76,105,109,105,116,101,100,32,
-82,47,87,58,32,37,100,44,32,87,68,77,65,32,70,85,
-65,58,32,37,100,44,32,83,116,114,101,97,109,58,32,37,
-100,10,0,0,32,32,83,101,99,117,114,105,116,121,58,32,
-83,116,97,116,117,115,61,48,120,37,88,32,0,0,0,0,
-40,37,115,44,32,37,115,37,115,10,0,0,100,105,115,97,
-98,108,101,100,0,0,0,0,117,110,108,111,99,107,101,100,
-0,0,0,0,44,32,43,32,109,111,114,101,46,46,46,41,
-0,0,0,0,32,85,100,109,97,32,77,111,100,101,58,32,
-48,120,37,88,32,40,37,115,41,10,0,0,32,32,70,101,
-97,116,117,114,101,115,58,32,83,77,65,82,84,58,32,37,
-100,44,32,83,101,99,117,114,105,116,121,58,32,37,100,44,
-32,52,56,45,98,105,116,32,97,100,100,114,58,32,37,100,
-44,32,65,99,111,117,115,116,105,99,58,32,37,100,44,32,
-10,0,0,0,87,97,105,116,83,116,97,103,103,101,114,84,
-105,109,101,0,80,114,111,99,101,115,115,67,104,101,99,107,
-80,119,114,0,68,111,110,101,67,97,99,104,101,69,110,97,
-98,108,101,0,83,101,116,65,99,111,117,115,116,105,99,77,
-111,100,101,0,68,111,110,101,83,109,97,114,116,69,110,97,
-98,108,101,0,68,111,110,101,83,101,116,80,97,115,115,119,
-111,114,100,0,83,97,116,97,87,97,105,116,79,79,66,0,
-84,101,115,116,66,117,102,82,101,97,100,0,68,111,110,101,
-66,117,102,82,101,97,100,0,73,115,115,117,101,83,112,105,
-110,117,112,0,73,115,115,117,101,85,110,108,111,99,107,0,
-70,97,105,108,101,100,68,114,105,118,101,0,70,97,105,108,
-101,100,67,97,98,108,101,0,70,105,110,100,68,114,105,118,
-101,0,0,0,73,115,115,117,101,67,104,101,99,107,80,119,
-114,0,0,0,83,101,116,85,100,109,97,84,105,109,105,110,
-103,0,0,0,68,111,110,101,76,111,111,107,65,104,101,97,
-100,0,0,0,82,101,115,101,116,68,114,105,118,101,0,0,
-83,97,116,97,67,104,101,99,107,79,79,66,0,0,0,0,
-84,101,115,116,68,114,105,118,101,82,101,97,100,121,0,0,
-84,101,115,116,84,102,82,101,103,115,0,0,68,111,110,101,
-84,102,82,101,103,115,0,0,84,101,115,116,66,117,102,87,
-114,105,116,101,0,0,0,0,73,115,115,117,101,73,100,101,
-110,116,0,0,80,114,111,99,101,115,115,73,100,101,110,116,
-0,0,0,0,68,111,110,101,83,112,105,110,117,112,0,0,
-68,111,110,101,85,100,109,97,84,105,109,105,110,103,0,0,
-83,101,116,67,97,99,104,101,69,110,97,98,108,101,0,0,
-83,101,116,76,111,111,107,65,104,101,97,100,0,0,0,0,
-68,111,110,101,65,99,111,117,115,116,105,99,77,111,100,101,
-0,0,0,0,83,101,116,83,109,97,114,116,69,110,97,98,
-108,101,0,0,73,115,115,117,101,83,109,97,114,116,65,116,
-116,114,0,0,80,114,111,99,101,115,115,83,109,97,114,116,
-65,116,116,114,0,0,0,0,73,115,115,117,101,83,101,116,
-80,97,115,115,119,111,114,100,0,0,0,0,68,111,110,101,
-85,110,108,111,99,107,0,0,85,110,115,117,112,112,111,114,
-116,101,100,68,114,105,118,101,0,0,0,0,67,111,109,112,
-108,101,116,101,0,0,0,0,68,114,118,73,110,118,101,110,
-116,111,114,121,0,0,0,0,100,114,105,118,101,73,110,118,
-101,110,116,111,114,121,46,99,112,112,0,0,100,114,105,118,
+100,114,32,37,120,44,32,97,110,100,32,105,116,32,99,104,
+97,110,103,101,100,32,65,100,100,114,32,37,120,46,10,0,
+66,97,100,32,82,65,77,32,108,111,99,97,116,105,111,110,
+33,32,32,32,32,65,100,100,114,32,37,120,58,32,32,119,
+114,111,116,101,32,37,120,32,44,32,114,101,97,100,32,98,
+97,99,107,32,37,120,32,46,10,0,0,0,66,97,100,32,
+82,65,77,32,108,111,99,97,116,105,111,110,33,32,32,32,
+32,87,114,111,116,101,32,116,111,32,65,100,100,114,32,37,
+120,32,44,32,97,110,100,32,105,116,32,99,104,97,110,103,
+101,100,32,65,100,100,114,32,37,120,32,46,10,0,0,0,
+67,111,117,108,100,110,39,116,32,119,114,105,116,101,32,83,
+98,117,102,33,10,0,0,0,67,111,117,108,100,110,39,116,
+32,114,101,97,100,32,83,98,117,102,33,10,0,0,0,0,
+79,112,101,110,32,105,110,32,83,98,117,102,32,100,97,116,
+97,32,108,105,110,101,33,32,32,32,32,83,98,117,102,32,
+98,121,116,101,32,111,102,102,115,101,116,32,37,48,51,120,
+58,32,32,119,114,111,116,101,32,37,48,50,120,32,44,32,
+32,114,101,97,100,32,37,48,50,120,32,46,10,0,0,0,
+66,97,100,32,83,98,117,102,32,108,111,99,97,116,105,111,
+110,33,32,32,32,32,83,98,117,102,32,97,100,100,114,32,
+37,120,58,32,32,119,114,111,116,101,32,37,48,50,120,32,
+44,32,32,114,101,97,100,32,37,48,50,120,32,46,10,0,
+67,111,117,108,100,110,39,116,32,119,114,105,116,101,32,83,
+98,117,102,33,10,0,0,0,67,111,117,108,100,110,39,116,
+32,114,101,97,100,32,83,98,117,102,33,10,0,0,0,0,
+66,97,100,32,83,98,117,102,32,97,100,100,114,101,115,115,
+32,108,105,110,101,33,32,83,98,117,102,32,97,100,100,114,
+32,37,120,58,32,32,119,114,111,116,101,32,37,48,49,54,
+120,44,32,32,114,101,97,100,32,37,48,49,54,120,10,0,
+67,111,117,108,100,110,39,116,32,119,114,105,116,101,32,83,
+98,117,102,33,10,0,0,0,67,111,117,108,100,110,39,116,
+32,114,101,97,100,32,83,98,117,102,33,10,0,0,0,0,
+66,97,100,32,83,98,117,102,32,97,100,100,114,101,115,115,
+32,108,105,110,101,33,32,83,98,117,102,32,97,100,100,114,
+32,37,120,58,32,32,115,104,111,117,108,100,32,98,101,32,
+48,44,32,98,117,116,32,105,116,32,119,97,115,32,99,104,
+97,110,103,101,100,32,116,111,32,37,48,49,54,120,10,0,
+68,82,86,95,78,79,84,95,80,82,69,83,69,78,84,0,
+68,82,86,95,72,65,83,95,85,78,67,79,78,86,69,82,
+84,69,68,95,68,67,66,0,68,82,86,95,72,65,83,95,
+85,78,83,85,80,80,79,82,84,69,68,95,68,67,66,0,
+68,82,86,95,80,82,69,83,69,78,84,0,85,78,83,85,
+80,80,79,82,84,69,68,0,68,82,86,95,70,65,73,76,
+69,68,95,67,65,66,76,69,95,84,69,83,84,0,0,0,
+68,82,86,95,70,65,73,76,69,68,95,67,79,78,70,73,
+71,95,79,80,83,0,0,0,68,82,86,95,78,79,84,95,
+83,85,80,80,79,82,84,69,68,0,0,0,68,82,86,95,
+82,69,77,79,86,69,68,95,74,66,79,68,0,0,0,0,
+68,82,86,95,72,65,83,95,68,67,66,95,68,65,84,65,
+95,67,72,69,67,75,0,0,68,82,86,95,72,65,83,95,
+68,67,66,95,79,82,80,72,65,78,0,0,68,82,86,95,
+72,65,83,95,68,67,66,95,82,69,65,68,95,70,65,73,
+76,85,82,69,0,0,0,0,68,82,86,95,72,65,83,95,
+68,67,66,95,82,69,65,68,95,84,73,77,69,79,85,84,
+0,0,0,0,85,68,77,65,45,49,48,48,0,0,0,0,
+85,68,77,65,45,49,51,51,0,0,0,0,0,0,0,0,
+244,187,132,0,1,0,0,0,144,188,132,0,217,0,0,0,
+4,188,132,0,219,0,0,0,28,188,132,0,221,0,0,0,
+164,188,132,0,223,0,0,0,188,188,132,0,236,0,0,0,
+208,188,132,0,238,0,0,0,236,188,132,0,0,0,0,0,
+76,188,132,0,0,0,0,0,100,188,132,0,254,0,0,0,
+124,188,132,0,255,0,0,0,52,188,132,0,85,78,75,78,
+79,87,78,32,83,84,65,84,85,83,0,0,37,115,32,40,
+48,120,37,88,41,10,0,0,68,114,105,118,101,32,114,101,
+109,111,118,101,100,44,32,0,68,114,105,118,101,32,97,100,
+100,101,100,44,32,0,0,0,68,73,84,91,37,50,105,93,
+46,115,116,97,116,117,115,32,61,32,0,0,32,32,32,77,
+111,100,101,108,32,35,58,32,37,115,10,0,32,32,83,101,
+114,105,97,108,32,35,58,32,37,115,10,0,32,32,68,114,
+118,32,70,87,32,35,58,32,37,115,10,0,32,32,83,65,
+84,65,32,78,67,81,58,32,37,100,10,0,80,119,114,32,
+67,121,99,108,101,115,58,32,37,100,10,0,32,32,65,99,
+111,117,115,116,105,99,58,32,48,120,37,88,44,32,100,101,
+102,61,48,120,37,88,32,40,48,120,70,69,61,98,101,115,
+116,32,112,101,114,102,111,114,109,97,110,99,101,41,10,0,
+40,115,101,99,117,114,105,116,121,32,102,101,97,116,117,114,
+101,32,110,111,116,32,115,117,112,112,111,114,116,101,100,32,
+33,33,32,93,10,0,0,0,45,45,80,111,114,116,91,37,
+50,100,93,45,0,0,0,0,68,73,84,32,115,116,97,116,
+117,115,58,32,0,0,0,0,32,32,67,97,112,97,99,105,
+116,121,58,32,37,108,117,32,40,48,120,37,48,56,108,88,
+41,10,0,0,32,70,101,97,116,46,32,69,120,116,58,32,
+84,105,109,101,76,105,109,105,116,101,100,32,82,47,87,58,
+32,37,100,44,32,87,68,77,65,32,70,85,65,58,32,37,
+100,44,32,83,116,114,101,97,109,58,32,37,100,10,0,0,
+32,32,83,101,99,117,114,105,116,121,58,32,83,116,97,116,
+117,115,61,48,120,37,88,32,0,0,0,0,40,37,115,44,
+32,37,115,37,115,10,0,0,100,105,115,97,98,108,101,100,
+0,0,0,0,117,110,108,111,99,107,101,100,0,0,0,0,
+44,32,43,32,109,111,114,101,46,46,46,41,0,0,0,0,
+32,85,100,109,97,32,77,111,100,101,58,32,48,120,37,88,
+32,40,37,115,41,10,0,0,32,32,70,101,97,116,117,114,
+101,115,58,32,83,77,65,82,84,58,32,37,100,44,32,83,
+101,99,117,114,105,116,121,58,32,37,100,44,32,52,56,45,
+98,105,116,32,97,100,100,114,58,32,37,100,44,32,65,99,
+111,117,115,116,105,99,58,32,37,100,44,32,10,0,0,0,
+87,97,105,116,83,116,97,103,103,101,114,84,105,109,101,0,
+80,114,111,99,101,115,115,67,104,101,99,107,80,119,114,0,
+68,111,110,101,67,97,99,104,101,69,110,97,98,108,101,0,
+83,101,116,65,99,111,117,115,116,105,99,77,111,100,101,0,
+68,111,110,101,83,109,97,114,116,69,110,97,98,108,101,0,
+68,111,110,101,83,101,116,80,97,115,115,119,111,114,100,0,
+83,97,116,97,87,97,105,116,79,79,66,0,84,101,115,116,
+66,117,102,82,101,97,100,0,68,111,110,101,66,117,102,82,
+101,97,100,0,73,115,115,117,101,83,112,105,110,117,112,0,
+73,115,115,117,101,85,110,108,111,99,107,0,70,97,105,108,
+101,100,68,114,105,118,101,0,70,97,105,108,101,100,67,97,
+98,108,101,0,70,105,110,100,68,114,105,118,101,0,0,0,
+73,115,115,117,101,67,104,101,99,107,80,119,114,0,0,0,
+83,101,116,85,100,109,97,84,105,109,105,110,103,0,0,0,
+68,111,110,101,76,111,111,107,65,104,101,97,100,0,0,0,
+82,101,115,101,116,68,114,105,118,101,0,0,83,97,116,97,
+67,104,101,99,107,79,79,66,0,0,0,0,84,101,115,116,
+68,114,105,118,101,82,101,97,100,121,0,0,84,101,115,116,
+84,102,82,101,103,115,0,0,68,111,110,101,84,102,82,101,
+103,115,0,0,84,101,115,116,66,117,102,87,114,105,116,101,
+0,0,0,0,73,115,115,117,101,73,100,101,110,116,0,0,
+80,114,111,99,101,115,115,73,100,101,110,116,0,0,0,0,
+68,111,110,101,83,112,105,110,117,112,0,0,68,111,110,101,
+85,100,109,97,84,105,109,105,110,103,0,0,83,101,116,67,
+97,99,104,101,69,110,97,98,108,101,0,0,83,101,116,76,
+111,111,107,65,104,101,97,100,0,0,0,0,68,111,110,101,
+65,99,111,117,115,116,105,99,77,111,100,101,0,0,0,0,
+83,101,116,83,109,97,114,116,69,110,97,98,108,101,0,0,
+73,115,115,117,101,83,109,97,114,116,65,116,116,114,0,0,
+80,114,111,99,101,115,115,83,109,97,114,116,65,116,116,114,
+0,0,0,0,73,115,115,117,101,83,101,116,80,97,115,115,
+119,111,114,100,0,0,0,0,68,111,110,101,85,110,108,111,
+99,107,0,0,85,110,115,117,112,112,111,114,116,101,100,68,
+114,105,118,101,0,0,0,0,67,111,109,112,108,101,116,101,
+0,0,0,0,68,114,118,73,110,118,101,110,116,111,114,121,
+0,0,0,0,100,114,105,118,101,73,110,118,101,110,116,111,
+114,121,46,99,112,112,0,0,100,114,105,118,101,73,110,118,
+101,110,116,111,114,121,46,99,112,112,0,0,91,116,105,109,
+101,32,37,53,100,93,32,80,111,114,116,32,37,50,100,32,
+84,70,95,83,84,65,84,85,83,58,32,48,120,37,48,50,
+120,0,0,0,44,32,112,114,101,118,105,111,117,115,58,32,
+48,120,37,48,50,120,32,40,37,100,32,116,105,109,101,115,
+41,0,0,0,91,116,105,109,101,32,37,53,100,93,32,80,
+111,114,116,32,37,50,100,32,84,70,95,83,84,65,84,85,
+83,58,32,48,120,37,48,50,120,32,40,37,100,32,116,105,
+109,101,115,41,10,0,0,0,1,2,4,8,16,32,64,128,
+0,255,254,253,251,231,239,223,191,127,0,0,100,114,105,118,
 101,73,110,118,101,110,116,111,114,121,46,99,112,112,0,0,
 91,116,105,109,101,32,37,53,100,93,32,80,111,114,116,32,
-37,50,100,32,84,70,95,83,84,65,84,85,83,58,32,48,
-120,37,48,50,120,0,0,0,44,32,112,114,101,118,105,111,
-117,115,58,32,48,120,37,48,50,120,32,40,37,100,32,116,
-105,109,101,115,41,0,0,0,91,116,105,109,101,32,37,53,
-100,93,32,80,111,114,116,32,37,50,100,32,84,70,95,83,
-84,65,84,85,83,58,32,48,120,37,48,50,120,32,40,37,
-100,32,116,105,109,101,115,41,10,0,0,0,1,2,4,8,
-16,32,64,128,0,255,254,253,251,231,239,223,191,127,0,0,
-100,114,105,118,101,73,110,118,101,110,116,111,114,121,46,99,
-112,112,0,0,91,116,105,109,101,32,37,53,100,93,32,80,
-111,114,116,32,37,50,100,32,77,73,83,67,79,77,80,65,
-82,69,40,115,41,32,100,117,114,105,110,103,32,98,117,102,
-102,101,114,32,82,47,87,32,116,101,115,116,46,32,40,66,
-105,116,115,58,32,48,120,37,48,52,88,41,10,0,0,0,
+37,50,100,32,77,73,83,67,79,77,80,65,82,69,40,115,
+41,32,100,117,114,105,110,103,32,98,117,102,102,101,114,32,
+82,47,87,32,116,101,115,116,46,32,40,66,105,116,115,58,
+32,48,120,37,48,52,88,41,10,0,0,0,100,114,105,118,
+101,73,110,118,101,110,116,111,114,121,46,99,112,112,0,0,
+10,70,97,105,108,32,83,109,97,114,116,32,69,110,97,98,
+108,101,0,0,10,70,97,105,108,32,82,101,97,100,32,83,
+109,97,114,116,32,65,116,116,114,105,98,117,116,101,115,0,
 100,114,105,118,101,73,110,118,101,110,116,111,114,121,46,99,
-112,112,0,0,10,70,97,105,108,32,83,109,97,114,116,32,
-69,110,97,98,108,101,0,0,10,70,97,105,108,32,82,101,
-97,100,32,83,109,97,114,116,32,65,116,116,114,105,98,117,
-116,101,115,0,100,114,105,118,101,73,110,118,101,110,116,111,
-114,121,46,99,112,112,0,0,100,114,105,118,101,73,110,118,
-101,110,116,111,114,121,46,99,112,112,0,0,83,101,101,107,
-32,76,66,65,32,48,10,0,91,116,105,109,101,32,37,53,
-100,93,32,83,112,105,110,117,112,32,100,114,105,118,101,32,
-37,50,100,32,45,32,0,0,83,101,116,32,70,101,97,116,
-117,114,101,10,0,0,0,0,42,42,80,111,114,116,32,37,
-53,100,32,70,65,73,76,69,68,46,32,73,80,82,32,101,
-114,114,111,114,32,99,111,100,101,58,32,48,120,37,48,50,
-120,44,32,102,114,111,109,32,115,116,97,116,101,32,37,115,
-10,0,0,0,0,0,0,0,100,25,133,0,0,0,255,255,
-86,195,128,0,1,0,0,0,84,181,132,0,0,0,255,255,
-146,195,128,0,2,0,0,0,196,180,132,0,0,0,255,255,
-138,196,128,0,3,0,0,0,96,181,132,0,0,0,255,255,
-216,196,128,0,4,0,0,0,24,181,132,0,0,0,255,255,
-88,198,128,0,5,0,0,0,112,181,132,0,0,0,255,255,
-174,198,128,0,6,0,0,0,128,181,132,0,0,0,255,255,
-250,199,128,0,7,0,0,0,140,181,132,0,0,0,255,255,
-144,200,128,0,8,0,0,0,152,181,132,0,0,0,255,255,
-198,200,128,0,9,0,0,0,208,180,132,0,0,0,255,255,
-134,201,128,0,10,0,0,0,220,180,132,0,0,0,255,255,
-38,202,128,0,11,0,0,0,168,181,132,0,0,0,255,255,
-232,202,128,0,12,0,0,0,180,181,132,0,0,0,255,255,
-110,203,128,0,13,0,0,0,232,180,132,0,0,0,255,255,
-14,212,128,0,14,0,0,0,196,181,132,0,0,0,255,255,
-26,213,128,0,15,0,0,0,100,180,132,0,0,0,255,255,
-194,211,128,0,16,0,0,0,36,181,132,0,0,0,255,255,
-80,213,128,0,17,0,0,0,116,180,132,0,0,0,255,255,
-160,213,128,0,18,0,0,0,52,181,132,0,0,0,255,255,
-102,204,128,0,19,0,0,0,208,181,132,0,0,0,255,255,
-56,205,128,0,20,0,0,0,224,181,132,0,0,0,255,255,
-112,205,128,0,21,0,0,0,132,180,132,0,0,0,255,255,
-8,206,128,0,22,0,0,0,240,181,132,0,0,0,255,255,
-64,206,128,0,23,0,0,0,68,181,132,0,0,0,255,255,
-218,206,128,0,24,0,0,0,148,180,132,0,0,0,255,255,
-18,207,128,0,25,0,0,0,0,182,132,0,0,0,255,255,
-0,208,128,0,26,0,0,0,20,182,132,0,0,0,255,255,
-56,208,128,0,27,0,0,0,164,180,132,0,0,0,255,255,
-192,208,128,0,28,0,0,0,36,182,132,0,0,0,255,255,
-2,209,128,0,29,0,0,0,52,182,132,0,0,0,255,255,
-138,209,128,0,30,0,0,0,72,182,132,0,0,0,255,255,
-74,210,128,0,31,0,0,0,180,180,132,0,0,0,255,255,
-198,210,128,0,32,0,0,0,244,180,132,0,0,0,255,255,
-252,210,128,0,33,0,0,0,92,182,132,0,0,0,255,255,
-138,211,128,0,34,0,0,0,116,25,133,0,0,0,255,255,
-16,214,128,0,35,0,0,0,108,25,133,0,0,0,255,255,
-46,214,128,0,36,0,0,0,0,181,132,0,0,0,255,255,
-136,214,128,0,37,0,0,0,12,181,132,0,0,0,255,255,
-154,214,128,0,38,0,0,0,104,182,132,0,0,0,255,255,
-172,214,128,0,39,0,0,0,124,182,132,0,0,0,255,255,
-62,215,128,0,67,97,98,108,101,32,67,82,67,32,101,114,
-114,111,114,0,78,111,116,32,114,101,97,100,121,32,101,114,
-114,111,114,0,80,67,73,32,97,98,111,114,116,32,101,114,
-114,111,114,0,66,70,66,32,67,82,67,32,119,114,105,116,
-101,32,101,114,114,111,114,0,84,111,107,101,110,32,101,114,
-114,111,114,0,80,67,73,32,116,105,109,101,111,117,116,0,
+112,112,0,0,100,114,105,118,101,73,110,118,101,110,116,111,
+114,121,46,99,112,112,0,0,83,101,101,107,32,76,66,65,
+32,48,10,0,91,116,105,109,101,32,37,53,100,93,32,83,
+112,105,110,117,112,32,100,114,105,118,101,32,37,50,100,32,
+45,32,0,0,83,101,116,32,70,101,97,116,117,114,101,10,
+0,0,0,0,42,42,80,111,114,116,32,37,53,100,32,70,
+65,73,76,69,68,46,32,73,80,82,32,101,114,114,111,114,
+32,99,111,100,101,58,32,48,120,37,48,50,120,44,32,102,
+114,111,109,32,115,116,97,116,101,32,37,115,10,0,0,0,
+0,0,0,0,232,36,133,0,0,0,255,255,146,199,128,0,
+1,0,0,0,148,192,132,0,0,0,255,255,206,199,128,0,
+2,0,0,0,4,192,132,0,0,0,255,255,198,200,128,0,
+3,0,0,0,160,192,132,0,0,0,255,255,20,201,128,0,
+4,0,0,0,88,192,132,0,0,0,255,255,148,202,128,0,
+5,0,0,0,176,192,132,0,0,0,255,255,234,202,128,0,
+6,0,0,0,192,192,132,0,0,0,255,255,54,204,128,0,
+7,0,0,0,204,192,132,0,0,0,255,255,204,204,128,0,
+8,0,0,0,216,192,132,0,0,0,255,255,2,205,128,0,
+9,0,0,0,16,192,132,0,0,0,255,255,194,205,128,0,
+10,0,0,0,28,192,132,0,0,0,255,255,98,206,128,0,
+11,0,0,0,232,192,132,0,0,0,255,255,36,207,128,0,
+12,0,0,0,244,192,132,0,0,0,255,255,170,207,128,0,
+13,0,0,0,40,192,132,0,0,0,255,255,74,216,128,0,
+14,0,0,0,4,193,132,0,0,0,255,255,86,217,128,0,
+15,0,0,0,164,191,132,0,0,0,255,255,254,215,128,0,
+16,0,0,0,100,192,132,0,0,0,255,255,140,217,128,0,
+17,0,0,0,180,191,132,0,0,0,255,255,220,217,128,0,
+18,0,0,0,116,192,132,0,0,0,255,255,162,208,128,0,
+19,0,0,0,16,193,132,0,0,0,255,255,116,209,128,0,
+20,0,0,0,32,193,132,0,0,0,255,255,172,209,128,0,
+21,0,0,0,196,191,132,0,0,0,255,255,68,210,128,0,
+22,0,0,0,48,193,132,0,0,0,255,255,124,210,128,0,
+23,0,0,0,132,192,132,0,0,0,255,255,22,211,128,0,
+24,0,0,0,212,191,132,0,0,0,255,255,78,211,128,0,
+25,0,0,0,64,193,132,0,0,0,255,255,60,212,128,0,
+26,0,0,0,84,193,132,0,0,0,255,255,116,212,128,0,
+27,0,0,0,228,191,132,0,0,0,255,255,252,212,128,0,
+28,0,0,0,100,193,132,0,0,0,255,255,62,213,128,0,
+29,0,0,0,116,193,132,0,0,0,255,255,198,213,128,0,
+30,0,0,0,136,193,132,0,0,0,255,255,134,214,128,0,
+31,0,0,0,244,191,132,0,0,0,255,255,2,215,128,0,
+32,0,0,0,52,192,132,0,0,0,255,255,56,215,128,0,
+33,0,0,0,156,193,132,0,0,0,255,255,198,215,128,0,
+34,0,0,0,248,36,133,0,0,0,255,255,76,218,128,0,
+35,0,0,0,240,36,133,0,0,0,255,255,106,218,128,0,
+36,0,0,0,64,192,132,0,0,0,255,255,196,218,128,0,
+37,0,0,0,76,192,132,0,0,0,255,255,214,218,128,0,
+38,0,0,0,168,193,132,0,0,0,255,255,232,218,128,0,
+39,0,0,0,188,193,132,0,0,0,255,255,122,219,128,0,
+67,97,98,108,101,32,67,82,67,32,101,114,114,111,114,0,
+78,111,116,32,114,101,97,100,121,32,101,114,114,111,114,0,
+80,67,73,32,97,98,111,114,116,32,101,114,114,111,114,0,
+66,70,66,32,67,82,67,32,119,114,105,116,101,32,101,114,
+114,111,114,0,84,111,107,101,110,32,101,114,114,111,114,0,
+80,67,73,32,116,105,109,101,111,117,116,0,68,97,116,97,
+32,69,67,67,32,101,114,114,111,114,32,40,104,111,115,116,
+41,0,0,0,65,98,111,114,116,101,100,32,99,111,109,109,
+97,110,100,32,40,105,110,116,41,0,0,0,65,98,111,114,
+116,101,100,32,99,111,109,109,97,110,100,32,40,101,120,116,
+41,0,0,0,72,97,110,100,108,101,114,32,101,114,114,111,
+114,0,0,0,67,111,109,109,97,110,100,32,114,101,116,114,
+121,0,0,0,99,97,98,108,101,32,67,82,67,0,0,0,
+66,70,66,32,67,82,67,32,119,114,105,116,101,0,0,0,
+110,111,116,32,114,101,97,100,121,0,0,0,80,67,73,32,
+97,98,111,114,116,0,0,0,68,97,116,97,32,69,67,67,
+32,101,114,114,111,114,32,40,105,110,116,41,0,0,0,0,
 68,97,116,97,32,69,67,67,32,101,114,114,111,114,32,40,
-104,111,115,116,41,0,0,0,65,98,111,114,116,101,100,32,
-99,111,109,109,97,110,100,32,40,105,110,116,41,0,0,0,
-65,98,111,114,116,101,100,32,99,111,109,109,97,110,100,32,
-40,101,120,116,41,0,0,0,72,97,110,100,108,101,114,32,
-101,114,114,111,114,0,0,0,67,111,109,109,97,110,100,32,
-114,101,116,114,121,0,0,0,99,97,98,108,101,32,67,82,
-67,0,0,0,66,70,66,32,67,82,67,32,119,114,105,116,
-101,0,0,0,110,111,116,32,114,101,97,100,121,0,0,0,
-80,67,73,32,97,98,111,114,116,0,0,0,68,97,116,97,
-32,69,67,67,32,101,114,114,111,114,32,40,105,110,116,41,
-0,0,0,0,68,97,116,97,32,69,67,67,32,101,114,114,
-111,114,32,40,99,97,99,104,101,41,0,0,84,70,82,32,
-114,101,97,100,98,97,99,107,32,101,114,114,111,114,0,0,
-80,111,114,116,32,116,105,109,101,111,117,116,32,40,105,110,
-116,41,0,0,80,111,114,116,32,116,105,109,101,111,117,116,
-32,40,101,120,116,41,0,0,71,101,110,101,114,105,99,32,
-112,111,114,116,32,101,114,114,111,114,0,0,66,70,66,32,
-67,82,67,32,114,101,97,100,32,101,114,114,111,114,0,0,
-80,67,73,32,112,97,114,105,116,121,32,101,114,114,111,114,
-0,0,0,0,67,111,114,114,101,99,116,101,100,32,83,66,
-85,70,32,69,67,67,0,0,85,110,99,111,114,114,101,99,
-116,101,100,32,83,66,85,70,32,69,67,67,0,0,0,0,
-100,97,116,97,32,69,67,67,0,0,0,0,84,70,82,32,
-114,101,97,100,98,97,99,107,0,0,0,0,117,110,107,110,
-111,119,110,32,100,105,115,107,0,0,0,0,66,70,66,32,
-67,82,67,32,114,101,97,100,0,0,0,0,80,67,73,32,
-112,97,114,105,116,121,0,0,99,111,114,114,101,99,116,97,
-98,108,101,32,83,66,85,70,32,69,67,67,0,0,0,0,
-117,110,99,111,114,114,101,99,116,97,98,108,101,32,83,66,
-85,70,32,69,67,67,0,0,105,112,114,77,97,110,97,103,
-101,114,46,104,112,112,0,0,101,114,114,111,114,72,97,110,
-100,108,101,114,46,99,112,112,0,0,0,0,101,114,114,111,
-114,72,97,110,100,108,101,114,46,99,112,112,0,0,0,0,
-80,61,37,88,32,58,32,37,115,44,32,110,111,32,114,101,
-116,114,105,101,115,10,0,0,32,32,32,32,58,32,37,115,
-10,0,0,0,101,114,114,111,114,72,97,110,100,108,101,114,
-46,99,112,112,0,0,0,0,32,32,32,32,32,32,32,32,
-32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,32,32,32,32,32,32,32,32,58,32,82,101,99,117,114,
-115,105,118,101,32,114,101,99,111,118,101,114,121,44,32,112,
-114,101,118,105,111,117,115,32,101,99,32,48,120,37,48,52,
-88,10,0,0,101,114,114,111,114,72,97,110,100,108,101,114,
+99,97,99,104,101,41,0,0,84,70,82,32,114,101,97,100,
+98,97,99,107,32,101,114,114,111,114,0,0,80,111,114,116,
+32,116,105,109,101,111,117,116,32,40,105,110,116,41,0,0,
+80,111,114,116,32,116,105,109,101,111,117,116,32,40,101,120,
+116,41,0,0,71,101,110,101,114,105,99,32,112,111,114,116,
+32,101,114,114,111,114,0,0,66,70,66,32,67,82,67,32,
+114,101,97,100,32,101,114,114,111,114,0,0,80,67,73,32,
+112,97,114,105,116,121,32,101,114,114,111,114,0,0,0,0,
+67,111,114,114,101,99,116,101,100,32,83,66,85,70,32,69,
+67,67,0,0,85,110,99,111,114,114,101,99,116,101,100,32,
+83,66,85,70,32,69,67,67,0,0,0,0,100,97,116,97,
+32,69,67,67,0,0,0,0,84,70,82,32,114,101,97,100,
+98,97,99,107,0,0,0,0,117,110,107,110,111,119,110,32,
+100,105,115,107,0,0,0,0,66,70,66,32,67,82,67,32,
+114,101,97,100,0,0,0,0,80,67,73,32,112,97,114,105,
+116,121,0,0,99,111,114,114,101,99,116,97,98,108,101,32,
+83,66,85,70,32,69,67,67,0,0,0,0,117,110,99,111,
+114,114,101,99,116,97,98,108,101,32,83,66,85,70,32,69,
+67,67,0,0,105,112,114,77,97,110,97,103,101,114,46,104,
+112,112,0,0,101,114,114,111,114,72,97,110,100,108,101,114,
 46,99,112,112,0,0,0,0,101,114,114,111,114,72,97,110,
-100,108,101,114,46,99,112,112,0,0,0,0,69,61,37,48,
-52,88,32,73,61,37,48,56,88,32,84,61,37,48,56,88,
-32,0,0,0,112,111,114,116,61,37,100,44,32,97,100,100,
-114,101,115,115,61,48,120,37,88,0,0,0,32,32,32,32,
-58,32,66,117,102,102,101,114,32,97,100,100,114,101,115,115,
-32,48,120,37,48,56,88,10,0,0,0,0,97,100,100,114,
-101,115,115,61,48,120,37,88,0,0,0,0,32,32,32,32,
-32,32,32,32,32,97,116,97,32,116,97,115,107,32,102,105,
-108,101,32,114,101,97,100,32,98,97,99,107,32,58,32,115,
-116,32,100,104,32,99,104,32,99,108,32,115,110,32,115,99,
-32,101,114,10,0,0,0,0,32,32,32,32,32,32,32,97,
-116,97,32,116,97,115,107,32,102,105,108,101,32,119,114,105,
-116,116,101,110,32,111,117,116,32,58,32,99,100,32,100,104,
-32,99,104,32,99,108,32,115,110,32,115,99,32,102,116,10,
+100,108,101,114,46,99,112,112,0,0,0,0,80,61,37,88,
+32,58,32,37,115,44,32,110,111,32,114,101,116,114,105,101,
+115,10,0,0,32,32,32,32,58,32,37,115,10,0,0,0,
+101,114,114,111,114,72,97,110,100,108,101,114,46,99,112,112,
 0,0,0,0,32,32,32,32,32,32,32,32,32,32,32,32,
 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,32,32,32,32,58,32,37,48,50,88,32,37,48,50,88,
-32,37,48,50,88,32,37,48,50,88,32,37,48,50,88,32,
-37,48,50,88,32,37,48,50,88,10,0,0,80,61,37,88,
-32,58,32,80,114,101,112,97,114,101,32,102,111,114,32,99,
-111,109,109,97,110,100,32,114,101,116,114,121,10,0,0,0,
+32,32,32,32,32,58,32,82,101,99,117,114,115,105,118,101,
+32,114,101,99,111,118,101,114,121,44,32,112,114,101,118,105,
+111,117,115,32,101,99,32,48,120,37,48,52,88,10,0,0,
 101,114,114,111,114,72,97,110,100,108,101,114,46,99,112,112,
-0,0,0,0,80,61,37,88,32,58,32,67,111,109,112,108,
-101,116,101,32,73,80,82,115,32,105,110,32,101,114,114,111,
-114,10,0,0,32,32,32,32,58,32,82,101,99,111,118,101,
-114,121,32,99,111,109,112,108,101,116,101,32,119,105,116,104,
-111,117,116,32,114,101,116,114,105,101,115,10,0,0,0,0,
-80,61,37,88,32,58,32,80,114,101,112,97,114,101,32,102,
-111,114,32,100,101,103,114,97,100,101,10,0,101,114,114,111,
+0,0,0,0,101,114,114,111,114,72,97,110,100,108,101,114,
+46,99,112,112,0,0,0,0,69,61,37,48,52,88,32,73,
+61,37,48,56,88,32,84,61,37,48,56,88,32,0,0,0,
+112,111,114,116,61,37,100,44,32,97,100,100,114,101,115,115,
+61,48,120,37,88,0,0,0,32,32,32,32,58,32,66,117,
+102,102,101,114,32,97,100,100,114,101,115,115,32,48,120,37,
+48,56,88,10,0,0,0,0,97,100,100,114,101,115,115,61,
+48,120,37,88,0,0,0,0,32,32,32,32,32,32,32,32,
+32,97,116,97,32,116,97,115,107,32,102,105,108,101,32,114,
+101,97,100,32,98,97,99,107,32,58,32,115,116,32,100,104,
+32,99,104,32,99,108,32,115,110,32,115,99,32,101,114,10,
+0,0,0,0,32,32,32,32,32,32,32,97,116,97,32,116,
+97,115,107,32,102,105,108,101,32,119,114,105,116,116,101,110,
+32,111,117,116,32,58,32,99,100,32,100,104,32,99,104,32,
+99,108,32,115,110,32,115,99,32,102,116,10,0,0,0,0,
+32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
+32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
+32,58,32,37,48,50,88,32,37,48,50,88,32,37,48,50,
+88,32,37,48,50,88,32,37,48,50,88,32,37,48,50,88,
+32,37,48,50,88,10,0,0,80,61,37,88,32,58,32,80,
+114,101,112,97,114,101,32,102,111,114,32,99,111,109,109,97,
+110,100,32,114,101,116,114,121,10,0,0,0,101,114,114,111,
 114,72,97,110,100,108,101,114,46,99,112,112,0,0,0,0,
-82,101,116,114,121,105,110,103,32,99,104,97,105,110,10,0,
-80,111,114,116,32,114,101,116,114,121,32,110,111,116,32,97,
-108,108,111,119,101,100,10,0,82,101,116,114,121,32,110,111,
-116,32,97,108,108,111,119,101,100,10,0,0,101,114,114,111,
+80,61,37,88,32,58,32,67,111,109,112,108,101,116,101,32,
+73,80,82,115,32,105,110,32,101,114,114,111,114,10,0,0,
+32,32,32,32,58,32,82,101,99,111,118,101,114,121,32,99,
+111,109,112,108,101,116,101,32,119,105,116,104,111,117,116,32,
+114,101,116,114,105,101,115,10,0,0,0,0,80,61,37,88,
+32,58,32,80,114,101,112,97,114,101,32,102,111,114,32,100,
+101,103,114,97,100,101,10,0,101,114,114,111,114,72,97,110,
+100,108,101,114,46,99,112,112,0,0,0,0,82,101,116,114,
+121,105,110,103,32,99,104,97,105,110,10,0,80,111,114,116,
+32,114,101,116,114,121,32,110,111,116,32,97,108,108,111,119,
+101,100,10,0,82,101,116,114,121,32,110,111,116,32,97,108,
+108,111,119,101,100,10,0,0,101,114,114,111,114,72,97,110,
+100,108,101,114,46,99,112,112,0,0,0,0,101,114,114,111,
 114,72,97,110,100,108,101,114,46,99,112,112,0,0,0,0,
+80,61,37,88,32,58,32,83,111,102,116,32,114,101,115,101,
+116,32,100,114,105,118,101,10,0,0,0,0,80,61,37,88,
+32,58,32,82,101,115,101,116,32,102,97,105,108,101,100,10,
+0,0,0,0,80,61,37,88,32,58,32,72,97,114,100,32,
+114,101,115,101,116,32,102,97,105,108,101,100,10,0,0,0,
 101,114,114,111,114,72,97,110,100,108,101,114,46,99,112,112,
-0,0,0,0,80,61,37,88,32,58,32,83,111,102,116,32,
+0,0,0,0,80,61,37,88,32,58,32,72,97,114,100,32,
 114,101,115,101,116,32,100,114,105,118,101,10,0,0,0,0,
-80,61,37,88,32,58,32,82,101,115,101,116,32,102,97,105,
-108,101,100,10,0,0,0,0,80,61,37,88,32,58,32,72,
-97,114,100,32,114,101,115,101,116,32,102,97,105,108,101,100,
-10,0,0,0,101,114,114,111,114,72,97,110,100,108,101,114,
-46,99,112,112,0,0,0,0,80,61,37,88,32,58,32,72,
-97,114,100,32,114,101,115,101,116,32,100,114,105,118,101,10,
-0,0,0,0,80,61,37,88,32,58,32,83,97,116,97,32,
-98,114,105,100,103,101,32,114,101,115,101,116,10,0,0,0,
-101,114,114,111,114,72,97,110,100,108,101,114,46,99,112,112,
-0,0,0,0,80,61,37,88,32,58,32,83,97,116,97,32,
-98,114,105,100,103,101,32,114,101,115,101,116,32,102,97,105,
-108,101,100,10,0,0,0,0,80,61,37,88,32,58,32,82,
-101,115,101,116,32,115,101,113,117,101,110,99,101,114,10,0,
-101,114,114,111,114,72,97,110,100,108,101,114,46,99,112,112,
-0,0,0,0,80,61,37,88,32,58,32,84,105,109,101,111,
-117,116,32,114,101,99,111,118,101,114,101,100,10,0,0,0,
-101,114,114,111,114,72,97,110,100,108,101,114,46,99,112,112,
-0,0,0,0,80,61,37,88,32,58,32,84,105,109,101,111,
-117,116,32,114,101,99,111,118,101,114,121,32,110,111,116,32,
-97,108,108,111,119,101,100,10,0,0,0,0,101,114,114,111,
+80,61,37,88,32,58,32,83,97,116,97,32,98,114,105,100,
+103,101,32,114,101,115,101,116,10,0,0,0,101,114,114,111,
 114,72,97,110,100,108,101,114,46,99,112,112,0,0,0,0,
-80,61,37,88,32,58,32,68,111,119,110,103,114,97,100,105,
-110,103,32,102,114,111,109,32,85,68,77,65,32,37,100,32,
-116,111,32,37,100,10,0,0,109,111,100,101,61,37,100,44,
-32,112,111,114,116,61,37,100,0,0,0,0,101,114,114,111,
+80,61,37,88,32,58,32,83,97,116,97,32,98,114,105,100,
+103,101,32,114,101,115,101,116,32,102,97,105,108,101,100,10,
+0,0,0,0,80,61,37,88,32,58,32,82,101,115,101,116,
+32,115,101,113,117,101,110,99,101,114,10,0,101,114,114,111,
 114,72,97,110,100,108,101,114,46,99,112,112,0,0,0,0,
-80,61,37,88,32,58,32,85,110,108,111,99,107,32,100,114,
-105,118,101,10,0,0,0,0,80,61,37,88,32,58,32,83,
-101,99,117,114,105,116,121,32,110,111,116,32,115,117,112,112,
-111,114,116,101,100,10,0,0,80,61,37,88,32,58,32,67,
-104,101,99,107,32,112,111,119,101,114,32,109,111,100,101,44,
-32,0,0,0,101,114,114,111,114,72,97,110,100,108,101,114,
-46,99,112,112,0,0,0,0,115,112,105,110,32,117,112,32,
-46,46,46,10,0,0,0,0,105,100,101,110,116,105,102,121,
-32,101,114,114,111,114,32,48,120,37,48,52,88,10,0,0,
-105,110,105,116,105,97,108,61,37,100,44,32,99,117,114,114,
-101,110,116,61,37,100,10,0,80,61,37,88,32,58,32,67,
-104,101,99,107,32,112,111,119,101,114,32,99,121,99,108,101,
-115,44,32,0,85,68,77,65,32,105,115,32,100,105,115,97,
-98,108,101,100,10,0,0,0,101,114,114,111,114,72,97,110,
+80,61,37,88,32,58,32,84,105,109,101,111,117,116,32,114,
+101,99,111,118,101,114,101,100,10,0,0,0,101,114,114,111,
+114,72,97,110,100,108,101,114,46,99,112,112,0,0,0,0,
+80,61,37,88,32,58,32,84,105,109,101,111,117,116,32,114,
+101,99,111,118,101,114,121,32,110,111,116,32,97,108,108,111,
+119,101,100,10,0,0,0,0,101,114,114,111,114,72,97,110,
+100,108,101,114,46,99,112,112,0,0,0,0,80,61,37,88,
+32,58,32,68,111,119,110,103,114,97,100,105,110,103,32,102,
+114,111,109,32,85,68,77,65,32,37,100,32,116,111,32,37,
+100,10,0,0,109,111,100,101,61,37,100,44,32,112,111,114,
+116,61,37,100,0,0,0,0,101,114,114,111,114,72,97,110,
 100,108,101,114,46,99,112,112,0,0,0,0,80,61,37,88,
-32,58,32,67,104,101,99,107,32,85,68,77,65,32,109,111,
-100,101,44,32,0,0,0,0,83,101,99,116,111,114,32,105,
-115,32,98,101,121,111,110,100,32,117,115,101,114,32,100,97,
-116,97,32,97,114,101,97,32,45,32,115,107,105,112,112,105,
-110,103,10,0,80,61,37,88,32,58,32,82,101,112,97,105,
-114,32,76,66,65,32,48,120,37,88,46,46,46,0,0,0,
-83,116,114,105,112,101,32,108,111,99,107,101,100,32,45,32,
-115,107,105,112,112,105,110,103,10,0,0,0,69,114,114,111,
-114,32,48,120,37,48,52,88,10,0,0,0,112,111,114,116,
-61,37,100,44,32,76,66,65,61,48,120,37,88,0,0,0,
+32,58,32,85,110,108,111,99,107,32,100,114,105,118,101,10,
+0,0,0,0,80,61,37,88,32,58,32,83,101,99,117,114,
+105,116,121,32,110,111,116,32,115,117,112,112,111,114,116,101,
+100,10,0,0,80,61,37,88,32,58,32,67,104,101,99,107,
+32,112,111,119,101,114,32,109,111,100,101,44,32,0,0,0,
 101,114,114,111,114,72,97,110,100,108,101,114,46,99,112,112,
-0,0,0,0,82,101,112,97,105,114,32,116,105,109,101,100,
-45,111,117,116,32,111,114,32,101,114,114,111,114,32,100,117,
-114,105,110,103,32,119,114,105,116,101,32,45,32,115,107,105,
-112,112,105,110,103,10,0,0,82,101,99,111,110,115,116,114,
-117,99,116,32,101,114,114,111,114,10,0,0,32,32,32,32,
-58,32,68,101,103,114,97,100,101,32,112,111,114,116,109,97,
-112,32,48,120,37,48,52,88,10,0,0,0,101,114,114,111,
+0,0,0,0,115,112,105,110,32,117,112,32,46,46,46,10,
+0,0,0,0,105,100,101,110,116,105,102,121,32,101,114,114,
+111,114,32,48,120,37,48,52,88,10,0,0,105,110,105,116,
+105,97,108,61,37,100,44,32,99,117,114,114,101,110,116,61,
+37,100,10,0,80,61,37,88,32,58,32,67,104,101,99,107,
+32,112,111,119,101,114,32,99,121,99,108,101,115,44,32,0,
+85,68,77,65,32,105,115,32,100,105,115,97,98,108,101,100,
+10,0,0,0,101,114,114,111,114,72,97,110,100,108,101,114,
+46,99,112,112,0,0,0,0,80,61,37,88,32,58,32,67,
+104,101,99,107,32,85,68,77,65,32,109,111,100,101,44,32,
+0,0,0,0,83,101,99,116,111,114,32,105,115,32,98,101,
+121,111,110,100,32,117,115,101,114,32,100,97,116,97,32,97,
+114,101,97,32,45,32,115,107,105,112,112,105,110,103,10,0,
+80,61,37,88,32,58,32,82,101,112,97,105,114,32,76,66,
+65,32,48,120,37,88,46,46,46,0,0,0,83,116,114,105,
+112,101,32,108,111,99,107,101,100,32,45,32,115,107,105,112,
+112,105,110,103,10,0,0,0,69,114,114,111,114,32,48,120,
+37,48,52,88,10,0,0,0,112,111,114,116,61,37,100,44,
+32,76,66,65,61,48,120,37,88,0,0,0,101,114,114,111,
 114,72,97,110,100,108,101,114,46,99,112,112,0,0,0,0,
-85,61,37,88,32,58,32,82,101,116,114,121,105,110,103,32,
-99,111,109,109,97,110,100,10,0,0,0,0,85,61,37,88,
+82,101,112,97,105,114,32,116,105,109,101,100,45,111,117,116,
+32,111,114,32,101,114,114,111,114,32,100,117,114,105,110,103,
+32,119,114,105,116,101,32,45,32,115,107,105,112,112,105,110,
+103,10,0,0,82,101,99,111,110,115,116,114,117,99,116,32,
+101,114,114,111,114,10,0,0,32,32,32,32,58,32,68,101,
+103,114,97,100,101,32,112,111,114,116,109,97,112,32,48,120,
+37,48,52,88,10,0,0,0,101,114,114,111,114,72,97,110,
+100,108,101,114,46,99,112,112,0,0,0,0,85,61,37,88,
 32,58,32,82,101,116,114,121,105,110,103,32,99,111,109,109,
-97,110,100,32,0,0,0,0,101,114,114,111,114,72,97,110,
-100,108,101,114,46,99,112,112,0,0,0,0,105,110,32,100,
-101,103,114,97,100,101,100,32,114,101,97,100,32,109,111,100,
-101,10,0,0,105,110,32,97,108,116,101,114,110,97,116,101,
-32,119,114,105,116,101,32,109,111,100,101,10,0,0,0,0,
-105,110,32,99,117,114,114,101,110,116,32,109,111,100,101,10,
-0,0,0,0,80,61,37,88,32,58,32,78,101,101,100,32,
-69,97,114,108,121,32,68,101,103,114,97,100,101,10,0,0,
-85,61,37,88,32,58,32,82,101,116,117,114,110,32,101,114,
-114,111,114,32,115,116,97,116,117,115,32,116,111,32,104,111,
-115,116,10,0,85,61,37,88,32,58,32,70,97,105,108,101,
-100,32,116,111,32,119,114,105,116,101,32,99,97,99,104,101,
-32,100,97,116,97,10,0,0,73,110,118,97,108,105,100,32,
-97,114,103,117,109,101,110,116,10,0,0,0,101,110,97,98,
-108,101,100,44,32,0,0,0,100,105,115,97,98,108,101,100,
-44,0,0,0,73,110,118,97,108,105,100,32,110,117,109,98,
-101,114,32,111,102,32,97,114,103,117,109,101,110,116,115,10,
-0,0,0,0,69,114,114,111,114,32,115,105,109,117,108,97,
-116,105,111,110,32,101,110,97,98,108,101,100,32,119,105,116,
-104,32,109,97,115,107,32,48,120,37,48,52,88,10,0,0,
+97,110,100,10,0,0,0,0,85,61,37,88,32,58,32,82,
+101,116,114,121,105,110,103,32,99,111,109,109,97,110,100,32,
+0,0,0,0,101,114,114,111,114,72,97,110,100,108,101,114,
+46,99,112,112,0,0,0,0,105,110,32,100,101,103,114,97,
+100,101,100,32,114,101,97,100,32,109,111,100,101,10,0,0,
+105,110,32,97,108,116,101,114,110,97,116,101,32,119,114,105,
+116,101,32,109,111,100,101,10,0,0,0,0,105,110,32,99,
+117,114,114,101,110,116,32,109,111,100,101,10,0,0,0,0,
+80,61,37,88,32,58,32,78,101,101,100,32,69,97,114,108,
+121,32,68,101,103,114,97,100,101,10,0,0,85,61,37,88,
+32,58,32,82,101,116,117,114,110,32,101,114,114,111,114,32,
+115,116,97,116,117,115,32,116,111,32,104,111,115,116,10,0,
+85,61,37,88,32,58,32,70,97,105,108,101,100,32,116,111,
+32,119,114,105,116,101,32,99,97,99,104,101,32,100,97,116,
+97,10,0,0,73,110,118,97,108,105,100,32,97,114,103,117,
+109,101,110,116,10,0,0,0,101,110,97,98,108,101,100,44,
+32,0,0,0,100,105,115,97,98,108,101,100,44,0,0,0,
+73,110,118,97,108,105,100,32,110,117,109,98,101,114,32,111,
+102,32,97,114,103,117,109,101,110,116,115,10,0,0,0,0,
 69,114,114,111,114,32,115,105,109,117,108,97,116,105,111,110,
-32,100,105,115,97,98,108,101,100,10,0,0,69,114,114,111,
-114,32,115,105,109,117,108,97,116,105,111,110,32,115,116,97,
-116,117,115,10,0,0,0,0,109,97,115,107,32,48,120,37,
-48,52,88,32,37,115,32,101,99,32,48,120,37,48,52,88,
-32,37,115,32,101,114,114,111,114,10,0,0,0,0,0,0,
-136,247,128,0,1,0,0,0,22,245,128,0,2,0,0,0,
-106,245,128,0,3,0,0,0,0,228,128,0,4,0,0,0,
-108,244,128,0,5,0,0,0,14,234,128,0,6,0,0,0,
-122,232,128,0,7,0,0,0,22,233,128,0,8,0,0,0,
-58,229,128,0,9,0,0,0,118,239,128,0,10,0,0,0,
-146,242,128,0,11,0,0,0,148,222,128,0,12,0,0,0,
-146,223,128,0,13,0,0,0,4,223,128,0,14,0,0,0,
-66,237,128,0,15,0,0,0,8,225,128,0,16,0,0,0,
-68,226,128,0,17,0,0,0,166,227,128,0,18,0,0,0,
-142,231,128,0,19,0,0,0,168,246,128,0,20,0,0,0,
-14,236,128,0,21,0,0,0,246,246,128,0,1,0,0,0,
-0,2,0,0,216,187,132,0,2,0,0,0,1,2,0,0,
-228,187,132,0,4,0,0,0,2,2,0,0,224,188,132,0,
-8,0,0,0,3,2,0,0,236,188,132,0,16,0,0,0,
-4,2,0,0,128,25,133,0,32,0,0,0,8,2,0,0,
-244,187,132,0,64,0,0,0,9,2,0,0,252,188,132,0,
-128,0,0,0,16,2,0,0,12,189,132,0,0,1,0,0,
-17,2,0,0,0,188,132,0,0,2,0,0,18,2,0,0,
-28,189,132,0,0,4,0,0,19,2,0,0,136,25,133,0,
-0,8,0,0,20,2,0,0,144,25,133,0,0,16,0,0,
-21,2,0,0,100,187,132,0,0,32,0,0,22,2,0,0,
-40,189,132,0,0,64,0,0,23,2,0,0,64,189,132,0,
-83,71,76,32,101,110,116,114,121,32,104,97,115,32,117,110,
-97,108,105,103,110,101,100,32,97,100,100,114,101,115,115,0,
-83,71,76,32,115,105,122,101,32,100,111,101,115,32,110,111,
-116,32,109,97,116,99,104,32,99,111,109,109,97,110,100,0,
-85,110,105,116,32,105,115,32,111,102,102,108,105,110,101,0,
-68,67,66,32,85,68,66,32,40,117,110,105,116,32,100,101,
-115,99,114,105,112,116,111,114,32,98,108,111,99,107,41,32,
-115,101,103,109,101,110,116,32,105,110,118,97,108,105,100,0,
-66,97,100,32,102,108,97,115,104,32,102,105,108,101,32,99,
-104,101,99,107,115,117,109,0,73,110,118,97,108,105,100,32,
-102,105,101,108,100,32,105,110,32,112,97,114,97,109,101,116,
-101,114,32,108,105,115,116,0,68,114,105,118,101,32,110,111,
-116,32,114,101,97,100,121,0,85,110,99,108,97,115,115,105,
-102,105,101,100,32,112,111,114,116,32,101,114,114,111,114,0,
-80,67,73,32,97,98,111,114,116,32,101,114,114,111,114,0,
-73,50,67,32,116,114,97,110,115,97,99,116,105,111,110,32,
-97,98,111,114,116,101,100,0,69,114,114,111,114,32,100,117,
-114,105,110,103,32,100,101,97,108,108,111,99,97,116,101,0,
-69,114,114,111,114,32,114,101,99,111,118,101,114,121,32,99,
-111,109,112,108,101,116,101,0,78,111,32,76,66,65,32,116,
-111,32,114,101,112,97,105,114,32,115,101,99,116,111,114,0,
-68,111,32,101,114,114,111,114,32,97,99,116,105,111,110,0,
-83,101,99,116,111,114,32,114,101,112,97,105,114,32,119,97,
-115,32,110,111,116,32,99,111,109,112,108,101,116,101,100,0,
-68,97,116,97,32,105,110,116,101,103,114,105,116,121,32,101,
-114,114,111,114,32,105,110,32,100,105,97,103,110,111,115,116,
-105,99,32,116,101,115,116,0,65,69,78,32,113,117,101,117,
-101,32,101,109,112,116,121,0,66,97,99,107,103,114,111,117,
-110,100,32,114,101,98,117,105,108,100,32,100,111,110,101,0,
-82,101,98,117,105,108,100,32,115,116,97,114,116,101,100,0,
-69,110,116,105,114,101,32,108,111,103,105,99,97,108,32,117,
-110,105,116,32,119,97,115,32,100,101,108,101,116,101,100,0,
-68,114,105,118,101,32,98,97,121,32,99,111,118,101,114,32,
-100,111,111,114,32,119,97,115,32,111,112,101,110,101,100,0,
-68,114,105,118,101,32,98,97,121,32,99,111,118,101,114,32,
-100,111,111,114,32,119,97,115,32,99,108,111,115,101,100,0,
-80,114,111,100,117,99,116,32,99,97,115,101,32,119,97,115,
-32,111,112,101,110,101,100,0,83,101,99,116,111,114,32,114,
-101,112,97,105,114,32,99,111,109,112,108,101,116,101,100,0,
-83,98,117,102,32,109,101,109,111,114,121,32,116,101,115,116,
-32,102,97,105,108,101,100,0,79,117,116,32,111,102,32,104,
-101,97,112,0,67,97,110,110,111,116,32,117,112,100,97,116,
-101,32,115,116,97,116,117,115,32,116,111,32,68,67,66,0,
-68,67,66,32,115,101,103,109,101,110,116,32,104,97,115,32,
-117,110,115,117,112,112,111,114,116,101,100,32,118,101,114,115,
-105,111,110,0,70,108,97,115,104,32,111,117,116,32,111,102,
-32,98,111,117,110,100,115,0,70,108,97,115,104,32,102,105,
-108,101,32,111,98,106,101,99,116,32,110,111,116,32,102,111,
-117,110,100,0,80,97,114,97,109,101,116,101,114,32,108,105,
-115,116,32,108,101,110,103,116,104,32,101,114,114,111,114,0,
-84,111,107,101,110,32,105,110,116,101,114,114,117,112,116,32,
-99,111,117,110,116,32,101,114,114,111,114,0,83,79,45,68,
-73,77,77,32,117,110,115,117,112,112,111,114,116,101,100,0,
-67,114,101,97,116,101,85,110,105,116,32,100,111,101,115,32,
-110,111,116,32,115,117,112,112,111,114,116,32,116,104,105,115,
-32,100,101,115,99,114,105,112,116,111,114,32,118,101,114,115,
-105,111,110,0,78,111,32,115,116,114,101,97,109,32,97,118,
-97,105,108,97,98,108,101,0,82,101,116,114,121,32,114,101,
-99,111,118,101,114,121,32,115,116,101,112,0,85,110,100,101,
-102,105,110,101,100,32,83,117,98,45,99,111,109,109,97,110,
-100,32,102,111,114,32,100,105,97,103,32,116,101,115,116,0,
-65,110,32,117,110,105,109,112,108,101,109,101,110,116,101,100,
-32,109,101,116,104,111,100,32,119,97,115,32,105,110,118,111,
-107,101,100,0,68,97,116,97,32,108,105,110,101,115,32,111,
-112,101,110,32,105,110,32,83,98,117,102,32,82,65,77,0,
-83,98,117,102,32,82,65,77,32,117,110,114,101,97,100,97,
-98,108,101,0,80,111,119,101,114,32,115,117,112,112,108,121,
-32,114,101,112,111,114,116,101,100,32,97,32,109,97,108,102,
-117,110,99,116,105,111,110,0,83,112,97,114,101,32,99,97,
-112,97,99,105,116,121,32,105,115,32,105,110,97,100,101,113,
-117,97,116,101,32,102,111,114,32,115,111,109,101,32,117,110,
-105,116,115,0,66,97,99,107,103,114,111,117,110,100,32,109,
-105,103,114,97,116,105,111,110,32,102,97,105,108,101,100,0,
+32,101,110,97,98,108,101,100,32,119,105,116,104,32,109,97,
+115,107,32,48,120,37,48,52,88,10,0,0,69,114,114,111,
+114,32,115,105,109,117,108,97,116,105,111,110,32,100,105,115,
+97,98,108,101,100,10,0,0,69,114,114,111,114,32,115,105,
+109,117,108,97,116,105,111,110,32,115,116,97,116,117,115,10,
+0,0,0,0,109,97,115,107,32,48,120,37,48,52,88,32,
+37,115,32,101,99,32,48,120,37,48,52,88,32,37,115,32,
+101,114,114,111,114,10,0,0,0,0,0,0,196,251,128,0,
+1,0,0,0,82,249,128,0,2,0,0,0,166,249,128,0,
+3,0,0,0,60,232,128,0,4,0,0,0,168,248,128,0,
+5,0,0,0,74,238,128,0,6,0,0,0,182,236,128,0,
+7,0,0,0,82,237,128,0,8,0,0,0,118,233,128,0,
+9,0,0,0,178,243,128,0,10,0,0,0,206,246,128,0,
+11,0,0,0,208,226,128,0,12,0,0,0,206,227,128,0,
+13,0,0,0,64,227,128,0,14,0,0,0,126,241,128,0,
+15,0,0,0,68,229,128,0,16,0,0,0,128,230,128,0,
+17,0,0,0,226,231,128,0,18,0,0,0,202,235,128,0,
+19,0,0,0,228,250,128,0,20,0,0,0,74,240,128,0,
+21,0,0,0,50,251,128,0,1,0,0,0,0,2,0,0,
+24,199,132,0,2,0,0,0,1,2,0,0,36,199,132,0,
+4,0,0,0,2,2,0,0,32,200,132,0,8,0,0,0,
+3,2,0,0,44,200,132,0,16,0,0,0,4,2,0,0,
+4,37,133,0,32,0,0,0,8,2,0,0,52,199,132,0,
+64,0,0,0,9,2,0,0,60,200,132,0,128,0,0,0,
+16,2,0,0,76,200,132,0,0,1,0,0,17,2,0,0,
+64,199,132,0,0,2,0,0,18,2,0,0,92,200,132,0,
+0,4,0,0,19,2,0,0,12,37,133,0,0,8,0,0,
+20,2,0,0,20,37,133,0,0,16,0,0,21,2,0,0,
+164,198,132,0,0,32,0,0,22,2,0,0,104,200,132,0,
+0,64,0,0,23,2,0,0,128,200,132,0,83,71,76,32,
+101,110,116,114,121,32,104,97,115,32,117,110,97,108,105,103,
+110,101,100,32,97,100,100,114,101,115,115,0,83,71,76,32,
+115,105,122,101,32,100,111,101,115,32,110,111,116,32,109,97,
+116,99,104,32,99,111,109,109,97,110,100,0,85,110,105,116,
+32,105,115,32,111,102,102,108,105,110,101,0,68,67,66,32,
+85,68,66,32,40,117,110,105,116,32,100,101,115,99,114,105,
+112,116,111,114,32,98,108,111,99,107,41,32,115,101,103,109,
+101,110,116,32,105,110,118,97,108,105,100,0,66,97,100,32,
+102,108,97,115,104,32,102,105,108,101,32,99,104,101,99,107,
+115,117,109,0,73,110,118,97,108,105,100,32,102,105,101,108,
+100,32,105,110,32,112,97,114,97,109,101,116,101,114,32,108,
+105,115,116,0,68,114,105,118,101,32,110,111,116,32,114,101,
+97,100,121,0,85,110,99,108,97,115,115,105,102,105,101,100,
+32,112,111,114,116,32,101,114,114,111,114,0,80,67,73,32,
+97,98,111,114,116,32,101,114,114,111,114,0,73,50,67,32,
+116,114,97,110,115,97,99,116,105,111,110,32,97,98,111,114,
+116,101,100,0,69,114,114,111,114,32,100,117,114,105,110,103,
+32,100,101,97,108,108,111,99,97,116,101,0,69,114,114,111,
+114,32,114,101,99,111,118,101,114,121,32,99,111,109,112,108,
+101,116,101,0,78,111,32,76,66,65,32,116,111,32,114,101,
+112,97,105,114,32,115,101,99,116,111,114,0,68,111,32,101,
+114,114,111,114,32,97,99,116,105,111,110,0,83,101,99,116,
+111,114,32,114,101,112,97,105,114,32,119,97,115,32,110,111,
+116,32,99,111,109,112,108,101,116,101,100,0,68,97,116,97,
+32,105,110,116,101,103,114,105,116,121,32,101,114,114,111,114,
+32,105,110,32,100,105,97,103,110,111,115,116,105,99,32,116,
+101,115,116,0,65,69,78,32,113,117,101,117,101,32,101,109,
+112,116,121,0,66,97,99,107,103,114,111,117,110,100,32,114,
+101,98,117,105,108,100,32,100,111,110,101,0,82,101,98,117,
+105,108,100,32,115,116,97,114,116,101,100,0,69,110,116,105,
+114,101,32,108,111,103,105,99,97,108,32,117,110,105,116,32,
+119,97,115,32,100,101,108,101,116,101,100,0,68,114,105,118,
+101,32,98,97,121,32,99,111,118,101,114,32,100,111,111,114,
+32,119,97,115,32,111,112,101,110,101,100,0,68,114,105,118,
+101,32,98,97,121,32,99,111,118,101,114,32,100,111,111,114,
+32,119,97,115,32,99,108,111,115,101,100,0,80,114,111,100,
+117,99,116,32,99,97,115,101,32,119,97,115,32,111,112,101,
+110,101,100,0,83,101,99,116,111,114,32,114,101,112,97,105,
+114,32,99,111,109,112,108,101,116,101,100,0,83,98,117,102,
+32,109,101,109,111,114,121,32,116,101,115,116,32,102,97,105,
+108,101,100,0,79,117,116,32,111,102,32,104,101,97,112,0,
+67,97,110,110,111,116,32,117,112,100,97,116,101,32,115,116,
+97,116,117,115,32,116,111,32,68,67,66,0,68,67,66,32,
+115,101,103,109,101,110,116,32,104,97,115,32,117,110,115,117,
+112,112,111,114,116,101,100,32,118,101,114,115,105,111,110,0,
+70,108,97,115,104,32,111,117,116,32,111,102,32,98,111,117,
+110,100,115,0,70,108,97,115,104,32,102,105,108,101,32,111,
+98,106,101,99,116,32,110,111,116,32,102,111,117,110,100,0,
+80,97,114,97,109,101,116,101,114,32,108,105,115,116,32,108,
+101,110,103,116,104,32,101,114,114,111,114,0,84,111,107,101,
+110,32,105,110,116,101,114,114,117,112,116,32,99,111,117,110,
+116,32,101,114,114,111,114,0,83,79,45,68,73,77,77,32,
+117,110,115,117,112,112,111,114,116,101,100,0,67,114,101,97,
+116,101,85,110,105,116,32,100,111,101,115,32,110,111,116,32,
+115,117,112,112,111,114,116,32,116,104,105,115,32,100,101,115,
+99,114,105,112,116,111,114,32,118,101,114,115,105,111,110,0,
+78,111,32,115,116,114,101,97,109,32,97,118,97,105,108,97,
+98,108,101,0,82,101,116,114,121,32,114,101,99,111,118,101,
+114,121,32,115,116,101,112,0,85,110,100,101,102,105,110,101,
+100,32,83,117,98,45,99,111,109,109,97,110,100,32,102,111,
+114,32,100,105,97,103,32,116,101,115,116,0,65,110,32,117,
+110,105,109,112,108,101,109,101,110,116,101,100,32,109,101,116,
+104,111,100,32,119,97,115,32,105,110,118,111,107,101,100,0,
+68,97,116,97,32,108,105,110,101,115,32,111,112,101,110,32,
+105,110,32,83,98,117,102,32,82,65,77,0,83,98,117,102,
+32,82,65,77,32,117,110,114,101,97,100,97,98,108,101,0,
+80,111,119,101,114,32,115,117,112,112,108,121,32,114,101,112,
+111,114,116,101,100,32,97,32,109,97,108,102,117,110,99,116,
+105,111,110,0,83,112,97,114,101,32,99,97,112,97,99,105,
+116,121,32,105,115,32,105,110,97,100,101,113,117,97,116,101,
+32,102,111,114,32,115,111,109,101,32,117,110,105,116,115,0,
 66,97,99,107,103,114,111,117,110,100,32,109,105,103,114,97,
-116,105,111,110,32,112,97,117,115,101,100,0,67,111,109,109,
-97,110,100,32,112,97,99,107,101,116,32,105,115,32,110,111,
-116,32,97,108,105,103,110,101,100,0,0,0,73,68,32,110,
-111,116,32,108,111,99,107,101,100,0,0,0,73,110,118,97,
-108,105,100,32,97,100,100,114,101,115,115,32,116,111,32,100,
-101,97,108,108,111,99,97,116,101,0,0,0,79,117,116,32,
-111,102,32,109,101,109,111,114,121,0,0,0,82,101,99,111,
-110,115,116,114,117,99,116,32,101,114,114,111,114,0,0,0,
-73,110,118,97,108,105,100,32,115,116,114,105,112,101,32,104,
-97,110,100,108,101,0,0,0,86,101,114,105,102,121,32,101,
-114,114,111,114,32,40,100,97,116,97,32,33,61,32,112,97,
-114,105,116,121,41,0,0,0,68,67,66,32,71,85,73,68,
-32,40,103,108,111,98,97,108,108,121,32,117,110,105,113,117,
-101,32,105,100,101,110,116,105,102,105,101,114,41,32,115,101,
-103,109,101,110,116,32,105,110,118,97,108,105,100,0,0,0,
-70,108,97,115,104,32,105,100,101,110,116,105,102,121,32,102,
-97,105,108,101,100,0,0,0,70,108,97,115,104,32,102,105,
-108,101,32,115,105,122,101,32,101,114,114,111,114,0,0,0,
-65,68,80,32,108,101,118,101,108,32,49,32,101,114,114,111,
-114,0,0,0,65,68,80,32,108,101,118,101,108,32,50,32,
-101,114,114,111,114,0,0,0,83,111,102,116,32,114,101,115,
-101,116,32,102,97,105,108,101,100,0,0,0,68,114,105,118,
-101,32,97,98,111,114,116,101,100,32,99,111,109,109,97,110,
-100,0,0,0,85,110,115,117,112,112,111,114,116,101,100,32,
-99,111,109,109,97,110,100,32,100,117,114,105,110,103,32,102,
-108,97,115,104,32,114,101,99,111,118,101,114,121,0,0,0,
-66,105,110,97,114,121,32,105,109,97,103,101,32,104,97,115,
-32,110,111,32,115,105,103,110,97,116,117,114,101,0,0,0,
-66,105,110,97,114,121,32,105,109,97,103,101,32,104,97,115,
-32,98,97,100,32,99,104,101,99,107,115,117,109,0,0,0,
-83,80,73,32,116,114,97,110,115,102,101,114,32,115,116,97,
-116,117,115,32,101,114,114,111,114,0,0,0,73,110,97,100,
-101,113,117,97,116,101,32,100,105,115,107,32,115,112,97,99,
-101,32,116,111,32,115,117,112,112,111,114,116,32,100,101,115,
-99,114,105,112,116,111,114,32,105,110,32,67,114,101,97,116,
-101,85,110,105,116,0,0,0,73,110,118,97,108,105,100,32,
-115,117,98,117,110,105,116,32,102,111,114,32,82,65,73,68,
-32,48,32,111,114,32,53,32,105,110,32,67,114,101,97,116,
-101,85,110,105,116,0,0,0,73,110,118,97,108,105,100,32,
-76,66,65,32,111,102,102,115,101,116,32,115,112,101,99,105,
-102,105,101,100,32,105,110,32,67,114,101,97,116,101,85,110,
-105,116,32,100,101,115,99,114,105,112,116,111,114,0,0,0,
-73,110,118,97,108,105,100,32,115,116,114,105,112,101,108,101,
-116,32,115,105,122,101,32,115,112,101,99,105,102,105,101,100,
+116,105,111,110,32,102,97,105,108,101,100,0,66,97,99,107,
+103,114,111,117,110,100,32,109,105,103,114,97,116,105,111,110,
+32,112,97,117,115,101,100,0,67,111,109,109,97,110,100,32,
+112,97,99,107,101,116,32,105,115,32,110,111,116,32,97,108,
+105,103,110,101,100,0,0,0,73,68,32,110,111,116,32,108,
+111,99,107,101,100,0,0,0,73,110,118,97,108,105,100,32,
+97,100,100,114,101,115,115,32,116,111,32,100,101,97,108,108,
+111,99,97,116,101,0,0,0,79,117,116,32,111,102,32,109,
+101,109,111,114,121,0,0,0,82,101,99,111,110,115,116,114,
+117,99,116,32,101,114,114,111,114,0,0,0,73,110,118,97,
+108,105,100,32,115,116,114,105,112,101,32,104,97,110,100,108,
+101,0,0,0,86,101,114,105,102,121,32,101,114,114,111,114,
+32,40,100,97,116,97,32,33,61,32,112,97,114,105,116,121,
+41,0,0,0,68,67,66,32,71,85,73,68,32,40,103,108,
+111,98,97,108,108,121,32,117,110,105,113,117,101,32,105,100,
+101,110,116,105,102,105,101,114,41,32,115,101,103,109,101,110,
+116,32,105,110,118,97,108,105,100,0,0,0,70,108,97,115,
+104,32,105,100,101,110,116,105,102,121,32,102,97,105,108,101,
+100,0,0,0,70,108,97,115,104,32,102,105,108,101,32,115,
+105,122,101,32,101,114,114,111,114,0,0,0,65,68,80,32,
+108,101,118,101,108,32,49,32,101,114,114,111,114,0,0,0,
+65,68,80,32,108,101,118,101,108,32,50,32,101,114,114,111,
+114,0,0,0,83,111,102,116,32,114,101,115,101,116,32,102,
+97,105,108,101,100,0,0,0,68,114,105,118,101,32,97,98,
+111,114,116,101,100,32,99,111,109,109,97,110,100,0,0,0,
+85,110,115,117,112,112,111,114,116,101,100,32,99,111,109,109,
+97,110,100,32,100,117,114,105,110,103,32,102,108,97,115,104,
+32,114,101,99,111,118,101,114,121,0,0,0,66,105,110,97,
+114,121,32,105,109,97,103,101,32,104,97,115,32,110,111,32,
+115,105,103,110,97,116,117,114,101,0,0,0,66,105,110,97,
+114,121,32,105,109,97,103,101,32,104,97,115,32,98,97,100,
+32,99,104,101,99,107,115,117,109,0,0,0,83,80,73,32,
+116,114,97,110,115,102,101,114,32,115,116,97,116,117,115,32,
+101,114,114,111,114,0,0,0,73,110,97,100,101,113,117,97,
+116,101,32,100,105,115,107,32,115,112,97,99,101,32,116,111,
+32,115,117,112,112,111,114,116,32,100,101,115,99,114,105,112,
+116,111,114,32,105,110,32,67,114,101,97,116,101,85,110,105,
+116,0,0,0,73,110,118,97,108,105,100,32,115,117,98,117,
+110,105,116,32,102,111,114,32,82,65,73,68,32,48,32,111,
+114,32,53,32,105,110,32,67,114,101,97,116,101,85,110,105,
+116,0,0,0,73,110,118,97,108,105,100,32,76,66,65,32,
+111,102,102,115,101,116,32,115,112,101,99,105,102,105,101,100,
 32,105,110,32,67,114,101,97,116,101,85,110,105,116,32,100,
-101,115,99,114,105,112,116,111,114,0,0,0,65,100,100,114,
-32,108,105,110,101,32,112,114,111,98,108,101,109,32,105,110,
-32,83,98,117,102,32,82,65,77,0,0,0,105,72,97,110,
-100,108,101,114,32,101,114,114,111,114,32,100,117,114,105,110,
-103,32,120,102,101,114,32,111,112,0,0,0,66,97,100,32,
-83,104,97,100,111,119,101,100,32,82,65,77,32,108,111,99,
-97,116,105,111,110,0,0,0,67,97,110,39,116,32,100,101,
-116,101,114,109,105,110,101,32,83,98,117,102,32,115,105,122,
-101,0,0,0,80,98,117,102,32,114,101,97,100,47,119,114,
-105,116,101,32,101,114,114,111,114,0,0,0,88,79,82,32,
-101,114,114,111,114,0,0,0,67,111,110,116,114,111,108,108,
-101,114,32,114,101,115,101,116,32,111,99,99,117,114,114,101,
-100,0,0,0,66,97,99,107,103,114,111,117,110,100,32,114,
-101,98,117,105,108,100,32,102,97,105,108,101,100,0,0,0,
-85,110,99,108,101,97,110,32,115,104,117,116,100,111,119,110,
-32,100,101,116,101,99,116,101,100,0,0,0,66,97,99,107,
-103,114,111,117,110,100,32,105,110,105,116,105,97,108,105,122,
-101,32,115,116,97,114,116,101,100,0,0,0,80,111,119,101,
-114,32,115,117,112,112,108,121,32,114,101,112,111,114,116,101,
-100,32,68,67,32,111,117,116,32,111,102,32,114,97,110,103,
-101,0,0,0,66,97,116,116,101,114,121,32,99,104,97,114,
-103,101,32,105,115,32,98,101,108,111,119,32,116,104,114,101,
-115,104,111,108,100,0,0,0,84,101,109,112,101,114,97,116,
-117,114,101,32,115,101,110,115,111,114,32,105,115,32,97,98,
-111,118,101,32,116,104,114,101,115,104,111,108,100,0,0,0,
-80,111,119,101,114,32,115,117,112,112,108,121,32,119,97,115,
-32,105,110,115,101,114,116,101,100,0,0,0,68,114,105,118,
-101,32,119,97,115,32,105,110,115,101,114,116,101,100,32,105,
-110,116,111,32,97,32,98,97,121,0,0,0,85,112,103,114,
-97,100,101,32,85,68,77,65,32,109,111,100,101,32,116,111,
-32,104,105,103,104,101,114,32,115,112,101,101,100,0,0,0,
-68,114,105,118,101,32,114,101,112,111,114,116,101,100,32,100,
-97,116,97,32,69,67,67,32,101,114,114,111,114,0,0,0,
-66,97,99,107,103,114,111,117,110,100,32,118,101,114,105,102,
-121,32,115,116,97,114,116,101,100,0,0,0,66,97,100,32,
-115,101,99,116,111,114,32,111,118,101,114,119,114,105,116,116,
-101,110,32,100,117,114,105,110,103,32,114,101,98,117,105,108,
-100,0,0,0,86,101,114,105,102,121,32,102,97,105,108,101,
-100,32,98,101,99,97,117,115,101,32,97,114,114,97,121,32,
-119,97,115,32,110,101,118,101,114,32,105,110,105,116,105,97,
-108,105,122,101,100,0,0,0,85,110,115,117,112,112,111,114,
-116,101,100,32,65,84,65,32,100,114,105,118,101,0,0,0,
-66,97,99,107,103,114,111,117,110,100,32,109,105,103,114,97,
-116,105,111,110,32,100,111,110,101,0,0,0,68,114,105,118,
-101,32,112,111,119,101,114,32,111,110,32,114,101,115,101,116,
-32,100,101,116,101,99,116,101,100,0,0,0,66,97,99,107,
-103,114,111,117,110,100,32,114,101,98,117,105,108,100,32,112,
-97,117,115,101,100,0,0,0,85,110,105,116,32,110,117,109,
-98,101,114,32,97,115,115,105,103,110,109,101,110,116,115,32,
-119,101,114,101,32,108,111,115,116,0,0,0,82,101,116,114,
-121,105,110,103,32,80,67,73,32,116,114,97,110,115,102,101,
-114,0,0,0,65,69,78,32,113,117,101,117,101,32,105,115,
-32,102,117,108,108,0,0,0,83,71,76,32,101,110,116,114,
-121,32,99,111,110,116,97,105,110,115,32,122,101,114,111,32,
-100,97,116,97,0,0,0,0,73,110,118,97,108,105,100,32,
-99,111,109,109,97,110,100,32,111,112,99,111,100,101,0,0,
-83,71,76,32,101,110,116,114,121,32,104,97,115,32,105,108,
-108,101,103,97,108,32,108,101,110,103,116,104,0,0,0,0,
-73,110,118,97,108,105,100,32,114,101,113,117,101,115,116,32,
-73,68,0,0,68,117,112,108,105,99,97,116,101,32,114,101,
-113,117,101,115,116,32,73,68,0,0,0,0,76,66,65,32,
-111,117,116,32,111,102,32,114,97,110,103,101,0,0,0,0,
-76,111,103,105,99,97,108,32,117,110,105,116,32,110,111,116,
-32,115,117,112,112,111,114,116,101,100,0,0,80,97,114,97,
-109,101,116,101,114,32,116,97,98,108,101,32,100,111,101,115,
-32,110,111,116,32,101,120,105,115,116,0,0,80,97,114,97,
-109,101,116,101,114,32,105,110,100,101,120,32,100,111,101,115,
-32,110,111,116,32,101,120,105,115,116,0,0,73,110,118,97,
-108,105,100,32,102,105,101,108,100,32,105,110,32,67,68,66,
-0,0,0,0,83,112,101,99,105,102,105,101,100,32,112,111,
-114,116,32,104,97,115,32,105,110,118,97,108,105,100,32,100,
-114,105,118,101,0,0,0,0,80,97,114,97,109,101,116,101,
-114,32,105,116,101,109,32,115,105,122,101,32,109,105,115,109,
-97,116,99,104,0,0,0,0,70,97,105,108,101,100,32,109,
-101,109,111,114,121,32,97,108,108,111,99,97,116,105,111,110,
-0,0,0,0,77,101,109,111,114,121,32,114,101,113,117,101,
-115,116,32,116,111,111,32,108,97,114,103,101,0,0,0,0,
-79,117,116,32,111,102,32,109,101,109,111,114,121,32,115,101,
-103,109,101,110,116,115,0,0,68,111,117,98,108,101,32,100,
-101,103,114,97,100,101,0,0,68,114,105,118,101,32,110,111,
-116,32,100,101,103,114,97,100,101,100,0,0,82,101,112,108,
-97,99,101,32,110,111,116,32,97,99,99,101,112,116,101,100,
-0,0,0,0,82,101,112,108,97,99,101,32,100,114,105,118,
-101,32,99,97,112,97,99,105,116,121,32,116,111,111,32,115,
-109,97,108,108,0,0,0,0,83,101,99,116,111,114,32,99,
-111,117,110,116,32,110,111,116,32,97,108,108,111,119,101,100,
-0,0,0,0,78,111,32,115,112,97,114,101,115,32,108,101,
-102,116,0,0,72,97,110,100,108,101,32,116,104,97,116,32,
-119,97,115,32,110,111,116,32,108,111,99,107,101,100,0,0,
+101,115,99,114,105,112,116,111,114,0,0,0,73,110,118,97,
+108,105,100,32,115,116,114,105,112,101,108,101,116,32,115,105,
+122,101,32,115,112,101,99,105,102,105,101,100,32,105,110,32,
+67,114,101,97,116,101,85,110,105,116,32,100,101,115,99,114,
+105,112,116,111,114,0,0,0,65,100,100,114,32,108,105,110,
+101,32,112,114,111,98,108,101,109,32,105,110,32,83,98,117,
+102,32,82,65,77,0,0,0,105,72,97,110,100,108,101,114,
+32,101,114,114,111,114,32,100,117,114,105,110,103,32,120,102,
+101,114,32,111,112,0,0,0,66,97,100,32,83,104,97,100,
+111,119,101,100,32,82,65,77,32,108,111,99,97,116,105,111,
+110,0,0,0,67,97,110,39,116,32,100,101,116,101,114,109,
+105,110,101,32,83,98,117,102,32,115,105,122,101,0,0,0,
+80,98,117,102,32,114,101,97,100,47,119,114,105,116,101,32,
+101,114,114,111,114,0,0,0,88,79,82,32,101,114,114,111,
+114,0,0,0,67,111,110,116,114,111,108,108,101,114,32,114,
+101,115,101,116,32,111,99,99,117,114,114,101,100,0,0,0,
+66,97,99,107,103,114,111,117,110,100,32,114,101,98,117,105,
+108,100,32,102,97,105,108,101,100,0,0,0,85,110,99,108,
+101,97,110,32,115,104,117,116,100,111,119,110,32,100,101,116,
+101,99,116,101,100,0,0,0,66,97,99,107,103,114,111,117,
+110,100,32,105,110,105,116,105,97,108,105,122,101,32,115,116,
+97,114,116,101,100,0,0,0,80,111,119,101,114,32,115,117,
+112,112,108,121,32,114,101,112,111,114,116,101,100,32,68,67,
+32,111,117,116,32,111,102,32,114,97,110,103,101,0,0,0,
+66,97,116,116,101,114,121,32,99,104,97,114,103,101,32,105,
+115,32,98,101,108,111,119,32,116,104,114,101,115,104,111,108,
+100,0,0,0,84,101,109,112,101,114,97,116,117,114,101,32,
+115,101,110,115,111,114,32,105,115,32,97,98,111,118,101,32,
+116,104,114,101,115,104,111,108,100,0,0,0,80,111,119,101,
+114,32,115,117,112,112,108,121,32,119,97,115,32,105,110,115,
+101,114,116,101,100,0,0,0,68,114,105,118,101,32,119,97,
+115,32,105,110,115,101,114,116,101,100,32,105,110,116,111,32,
+97,32,98,97,121,0,0,0,85,112,103,114,97,100,101,32,
+85,68,77,65,32,109,111,100,101,32,116,111,32,104,105,103,
+104,101,114,32,115,112,101,101,100,0,0,0,68,114,105,118,
+101,32,114,101,112,111,114,116,101,100,32,100,97,116,97,32,
+69,67,67,32,101,114,114,111,114,0,0,0,66,97,99,107,
+103,114,111,117,110,100,32,118,101,114,105,102,121,32,115,116,
+97,114,116,101,100,0,0,0,66,97,100,32,115,101,99,116,
+111,114,32,111,118,101,114,119,114,105,116,116,101,110,32,100,
+117,114,105,110,103,32,114,101,98,117,105,108,100,0,0,0,
+86,101,114,105,102,121,32,102,97,105,108,101,100,32,98,101,
+99,97,117,115,101,32,97,114,114,97,121,32,119,97,115,32,
+110,101,118,101,114,32,105,110,105,116,105,97,108,105,122,101,
+100,0,0,0,85,110,115,117,112,112,111,114,116,101,100,32,
+65,84,65,32,100,114,105,118,101,0,0,0,66,97,99,107,
+103,114,111,117,110,100,32,109,105,103,114,97,116,105,111,110,
+32,100,111,110,101,0,0,0,68,114,105,118,101,32,112,111,
+119,101,114,32,111,110,32,114,101,115,101,116,32,100,101,116,
+101,99,116,101,100,0,0,0,66,97,99,107,103,114,111,117,
+110,100,32,114,101,98,117,105,108,100,32,112,97,117,115,101,
+100,0,0,0,85,110,105,116,32,110,117,109,98,101,114,32,
+97,115,115,105,103,110,109,101,110,116,115,32,119,101,114,101,
+32,108,111,115,116,0,0,0,82,101,116,114,121,105,110,103,
+32,80,67,73,32,116,114,97,110,115,102,101,114,0,0,0,
+65,69,78,32,113,117,101,117,101,32,105,115,32,102,117,108,
+108,0,0,0,83,71,76,32,101,110,116,114,121,32,99,111,
+110,116,97,105,110,115,32,122,101,114,111,32,100,97,116,97,
+0,0,0,0,73,110,118,97,108,105,100,32,99,111,109,109,
+97,110,100,32,111,112,99,111,100,101,0,0,83,71,76,32,
+101,110,116,114,121,32,104,97,115,32,105,108,108,101,103,97,
+108,32,108,101,110,103,116,104,0,0,0,0,73,110,118,97,
+108,105,100,32,114,101,113,117,101,115,116,32,73,68,0,0,
+68,117,112,108,105,99,97,116,101,32,114,101,113,117,101,115,
+116,32,73,68,0,0,0,0,76,66,65,32,111,117,116,32,
+111,102,32,114,97,110,103,101,0,0,0,0,76,111,103,105,
+99,97,108,32,117,110,105,116,32,110,111,116,32,115,117,112,
+112,111,114,116,101,100,0,0,80,97,114,97,109,101,116,101,
+114,32,116,97,98,108,101,32,100,111,101,115,32,110,111,116,
+32,101,120,105,115,116,0,0,80,97,114,97,109,101,116,101,
+114,32,105,110,100,101,120,32,100,111,101,115,32,110,111,116,
+32,101,120,105,115,116,0,0,73,110,118,97,108,105,100,32,
+102,105,101,108,100,32,105,110,32,67,68,66,0,0,0,0,
+83,112,101,99,105,102,105,101,100,32,112,111,114,116,32,104,
+97,115,32,105,110,118,97,108,105,100,32,100,114,105,118,101,
+0,0,0,0,80,97,114,97,109,101,116,101,114,32,105,116,
+101,109,32,115,105,122,101,32,109,105,115,109,97,116,99,104,
+0,0,0,0,70,97,105,108,101,100,32,109,101,109,111,114,
+121,32,97,108,108,111,99,97,116,105,111,110,0,0,0,0,
+77,101,109,111,114,121,32,114,101,113,117,101,115,116,32,116,
+111,111,32,108,97,114,103,101,0,0,0,0,79,117,116,32,
+111,102,32,109,101,109,111,114,121,32,115,101,103,109,101,110,
+116,115,0,0,68,111,117,98,108,101,32,100,101,103,114,97,
+100,101,0,0,68,114,105,118,101,32,110,111,116,32,100,101,
+103,114,97,100,101,100,0,0,82,101,112,108,97,99,101,32,
+110,111,116,32,97,99,99,101,112,116,101,100,0,0,0,0,
+82,101,112,108,97,99,101,32,100,114,105,118,101,32,99,97,
+112,97,99,105,116,121,32,116,111,111,32,115,109,97,108,108,
+0,0,0,0,83,101,99,116,111,114,32,99,111,117,110,116,
+32,110,111,116,32,97,108,108,111,119,101,100,0,0,0,0,
+78,111,32,115,112,97,114,101,115,32,108,101,102,116,0,0,
 72,97,110,100,108,101,32,116,104,97,116,32,119,97,115,32,
-110,111,116,32,101,109,112,121,0,0,0,0,72,97,110,100,
-108,101,32,104,97,115,32,100,105,102,102,101,114,101,110,116,
-32,111,119,110,101,114,0,0,73,80,82,32,104,97,115,32,
-112,97,114,101,110,116,0,0,73,108,108,101,103,97,108,32,
-80,98,117,102,32,97,100,100,114,101,115,115,32,97,108,105,
-103,110,109,101,110,116,0,0,73,108,108,101,103,97,108,32,
-80,98,117,102,32,116,114,97,110,115,102,101,114,32,108,101,
-110,103,116,104,0,0,0,0,73,108,108,101,103,97,108,32,
-83,98,117,102,32,97,100,100,114,101,115,115,32,97,108,105,
-103,110,109,101,110,116,0,0,73,108,108,101,103,97,108,32,
-83,98,117,102,32,116,114,97,110,115,102,101,114,32,108,101,
-110,103,116,104,0,0,0,0,67,111,109,109,97,110,100,32,
-112,97,99,107,101,116,32,116,111,111,32,108,97,114,103,101,
-0,0,0,0,83,71,76,32,101,120,99,101,101,100,115,32,
-109,97,120,105,109,117,109,32,108,101,110,103,116,104,0,0,
-83,71,76,32,104,97,115,32,116,111,111,32,109,97,110,121,
-32,101,110,116,114,105,101,115,0,0,0,0,73,110,115,117,
-102,102,105,99,105,101,110,116,32,114,101,115,111,117,114,99,
-101,115,32,102,111,114,32,114,101,98,117,105,108,100,101,114,
-0,0,0,0,82,101,113,117,101,115,116,101,100,32,115,101,
-103,109,101,110,116,32,110,111,116,32,105,110,32,100,105,114,
-101,99,116,111,114,121,32,111,102,32,116,104,105,115,32,68,
-67,66,0,0,68,67,66,32,115,101,103,109,101,110,116,32,
-104,97,115,32,99,104,101,99,107,115,117,109,32,101,114,114,
-111,114,0,0,68,67,66,32,115,117,112,112,111,114,116,32,
-40,115,101,116,116,105,110,103,115,41,32,115,101,103,109,101,
-110,116,32,105,110,118,97,108,105,100,0,0,67,111,117,108,
-100,32,110,111,116,32,99,108,101,97,114,32,83,98,117,102,
-0,0,0,0,70,108,97,115,104,32,118,101,114,105,102,121,
-32,101,114,114,111,114,0,0,70,108,97,115,104,32,102,105,
-108,101,32,97,108,114,101,97,100,121,32,112,114,101,115,101,
-110,116,0,0,70,108,97,115,104,32,102,105,108,101,32,115,
-121,115,116,101,109,32,102,117,108,108,0,0,70,108,97,115,
-104,32,102,105,108,101,32,110,111,116,32,112,114,101,115,101,
-110,116,0,0,85,110,115,117,112,112,111,114,116,101,100,32,
-102,108,97,115,104,32,102,105,108,101,32,118,101,114,115,105,
-111,110,0,0,67,111,114,114,117,112,116,32,102,108,97,115,
-104,32,102,105,108,101,32,115,121,115,116,101,109,32,100,101,
-116,101,99,116,101,100,0,0,80,97,114,97,109,101,116,101,
-114,32,105,116,101,109,32,105,115,32,110,111,116,32,99,104,
-97,110,103,101,97,98,108,101,0,0,0,0,80,97,114,97,
+110,111,116,32,108,111,99,107,101,100,0,0,72,97,110,100,
+108,101,32,116,104,97,116,32,119,97,115,32,110,111,116,32,
+101,109,112,121,0,0,0,0,72,97,110,100,108,101,32,104,
+97,115,32,100,105,102,102,101,114,101,110,116,32,111,119,110,
+101,114,0,0,73,80,82,32,104,97,115,32,112,97,114,101,
+110,116,0,0,73,108,108,101,103,97,108,32,80,98,117,102,
+32,97,100,100,114,101,115,115,32,97,108,105,103,110,109,101,
+110,116,0,0,73,108,108,101,103,97,108,32,80,98,117,102,
+32,116,114,97,110,115,102,101,114,32,108,101,110,103,116,104,
+0,0,0,0,73,108,108,101,103,97,108,32,83,98,117,102,
+32,97,100,100,114,101,115,115,32,97,108,105,103,110,109,101,
+110,116,0,0,73,108,108,101,103,97,108,32,83,98,117,102,
+32,116,114,97,110,115,102,101,114,32,108,101,110,103,116,104,
+0,0,0,0,67,111,109,109,97,110,100,32,112,97,99,107,
+101,116,32,116,111,111,32,108,97,114,103,101,0,0,0,0,
+83,71,76,32,101,120,99,101,101,100,115,32,109,97,120,105,
+109,117,109,32,108,101,110,103,116,104,0,0,83,71,76,32,
+104,97,115,32,116,111,111,32,109,97,110,121,32,101,110,116,
+114,105,101,115,0,0,0,0,73,110,115,117,102,102,105,99,
+105,101,110,116,32,114,101,115,111,117,114,99,101,115,32,102,
+111,114,32,114,101,98,117,105,108,100,101,114,0,0,0,0,
+82,101,113,117,101,115,116,101,100,32,115,101,103,109,101,110,
+116,32,110,111,116,32,105,110,32,100,105,114,101,99,116,111,
+114,121,32,111,102,32,116,104,105,115,32,68,67,66,0,0,
+68,67,66,32,115,101,103,109,101,110,116,32,104,97,115,32,
+99,104,101,99,107,115,117,109,32,101,114,114,111,114,0,0,
+68,67,66,32,115,117,112,112,111,114,116,32,40,115,101,116,
+116,105,110,103,115,41,32,115,101,103,109,101,110,116,32,105,
+110,118,97,108,105,100,0,0,67,111,117,108,100,32,110,111,
+116,32,99,108,101,97,114,32,83,98,117,102,0,0,0,0,
+70,108,97,115,104,32,118,101,114,105,102,121,32,101,114,114,
+111,114,0,0,70,108,97,115,104,32,102,105,108,101,32,97,
+108,114,101,97,100,121,32,112,114,101,115,101,110,116,0,0,
+70,108,97,115,104,32,102,105,108,101,32,115,121,115,116,101,
+109,32,102,117,108,108,0,0,70,108,97,115,104,32,102,105,
+108,101,32,110,111,116,32,112,114,101,115,101,110,116,0,0,
+85,110,115,117,112,112,111,114,116,101,100,32,102,108,97,115,
+104,32,102,105,108,101,32,118,101,114,115,105,111,110,0,0,
+67,111,114,114,117,112,116,32,102,108,97,115,104,32,102,105,
+108,101,32,115,121,115,116,101,109,32,100,101,116,101,99,116,
+101,100,0,0,70,108,97,115,104,32,87,114,105,116,101,32,
+99,121,99,108,101,32,70,97,105,108,101,100,0,0,0,0,
+70,108,97,115,104,32,69,114,97,115,101,32,99,121,99,108,
+101,32,70,97,105,108,101,100,0,0,0,0,80,97,114,97,
 109,101,116,101,114,32,105,116,101,109,32,105,115,32,110,111,
-116,32,115,97,118,101,97,98,108,101,0,0,85,68,77,65,
-32,67,82,67,32,101,114,114,111,114,0,0,73,110,116,101,
-114,110,97,108,32,67,82,67,32,101,114,114,111,114,0,0,
-68,97,116,97,32,69,67,67,32,101,114,114,111,114,0,0,
-80,111,114,116,32,116,105,109,101,111,117,116,0,0,0,0,
-68,114,105,118,101,32,112,111,119,101,114,32,111,110,32,114,
-101,115,101,116,0,0,0,0,80,67,73,32,112,97,114,105,
-116,121,32,101,114,114,111,114,0,0,0,0,80,111,114,116,
-32,104,97,110,100,108,101,114,32,101,114,114,111,114,0,0,
-84,105,109,101,111,117,116,32,119,97,105,116,105,110,103,32,
-102,111,114,32,80,67,73,32,116,114,97,110,115,102,101,114,
-0,0,0,0,67,111,114,114,101,99,116,101,100,32,98,117,
-102,102,101,114,32,69,67,67,0,0,0,0,85,110,99,111,
-114,114,101,99,116,101,100,32,98,117,102,102,101,114,32,69,
-67,67,0,0,78,101,120,116,32,105,109,97,103,101,32,98,
-117,102,102,101,114,32,101,120,112,101,99,116,101,100,0,0,
-66,105,110,97,114,121,32,105,109,97,103,101,32,97,114,99,
-104,105,116,101,99,116,117,114,101,32,105,110,99,111,109,112,
-97,116,105,98,108,101,0,0,66,105,110,97,114,121,32,105,
-109,97,103,101,32,111,118,101,114,102,108,111,119,101,100,32,
-98,117,102,102,101,114,0,0,73,50,67,32,100,101,118,105,
-99,101,32,110,111,116,32,102,111,117,110,100,0,0,0,0,
-83,79,45,68,73,77,77,32,112,97,114,97,109,101,116,101,
-114,40,115,41,32,105,110,99,111,109,112,97,116,105,98,108,
-101,32,117,115,105,110,103,32,100,101,102,97,117,108,116,115,
-0,0,0,0,83,80,73,32,116,114,97,110,115,102,101,114,
-32,116,105,109,101,111,117,116,32,101,114,114,111,114,0,0,
-73,110,118,97,108,105,100,32,117,110,105,116,32,100,101,115,
-99,114,105,112,116,111,114,32,115,105,122,101,32,105,110,32,
-67,114,101,97,116,101,85,110,105,116,0,0,85,110,105,116,
+116,32,99,104,97,110,103,101,97,98,108,101,0,0,0,0,
+80,97,114,97,109,101,116,101,114,32,105,116,101,109,32,105,
+115,32,110,111,116,32,115,97,118,101,97,98,108,101,0,0,
+85,68,77,65,32,67,82,67,32,101,114,114,111,114,0,0,
+73,110,116,101,114,110,97,108,32,67,82,67,32,101,114,114,
+111,114,0,0,68,97,116,97,32,69,67,67,32,101,114,114,
+111,114,0,0,80,111,114,116,32,116,105,109,101,111,117,116,
+0,0,0,0,68,114,105,118,101,32,112,111,119,101,114,32,
+111,110,32,114,101,115,101,116,0,0,0,0,80,67,73,32,
+112,97,114,105,116,121,32,101,114,114,111,114,0,0,0,0,
+80,111,114,116,32,104,97,110,100,108,101,114,32,101,114,114,
+111,114,0,0,84,105,109,101,111,117,116,32,119,97,105,116,
+105,110,103,32,102,111,114,32,80,67,73,32,116,114,97,110,
+115,102,101,114,0,0,0,0,67,111,114,114,101,99,116,101,
+100,32,98,117,102,102,101,114,32,69,67,67,0,0,0,0,
+85,110,99,111,114,114,101,99,116,101,100,32,98,117,102,102,
+101,114,32,69,67,67,0,0,78,101,120,116,32,105,109,97,
+103,101,32,98,117,102,102,101,114,32,101,120,112,101,99,116,
+101,100,0,0,66,105,110,97,114,121,32,105,109,97,103,101,
+32,97,114,99,104,105,116,101,99,116,117,114,101,32,105,110,
+99,111,109,112,97,116,105,98,108,101,0,0,66,105,110,97,
+114,121,32,105,109,97,103,101,32,111,118,101,114,102,108,111,
+119,101,100,32,98,117,102,102,101,114,0,0,73,50,67,32,
+100,101,118,105,99,101,32,110,111,116,32,102,111,117,110,100,
+0,0,0,0,83,79,45,68,73,77,77,32,112,97,114,97,
+109,101,116,101,114,40,115,41,32,105,110,99,111,109,112,97,
+116,105,98,108,101,32,117,115,105,110,103,32,100,101,102,97,
+117,108,116,115,0,0,0,0,83,80,73,32,116,114,97,110,
+115,102,101,114,32,116,105,109,101,111,117,116,32,101,114,114,
+111,114,0,0,73,110,118,97,108,105,100,32,117,110,105,116,
 32,100,101,115,99,114,105,112,116,111,114,32,115,105,122,101,
-32,101,120,99,101,101,100,115,32,100,97,116,97,32,98,117,
-102,102,101,114,32,105,110,32,67,114,101,97,116,101,85,110,
-105,116,0,0,73,110,118,97,108,105,100,32,118,97,108,117,
-101,32,105,110,32,67,114,101,97,116,101,85,110,105,116,32,
-100,101,115,99,114,105,112,116,111,114,0,0,85,110,97,98,
-108,101,32,116,111,32,99,114,101,97,116,101,32,100,97,116,
-97,32,99,104,97,110,110,101,108,32,102,111,114,32,116,104,
-105,115,32,117,110,105,116,32,100,101,115,99,114,105,112,116,
-111,114,0,0,67,114,101,97,116,101,85,110,105,116,32,100,
-101,115,99,114,105,112,116,111,114,32,115,112,101,99,105,102,
-105,101,115,32,97,32,100,114,105,118,101,32,97,108,114,101,
-97,100,121,32,105,110,32,117,115,101,0,0,85,110,97,98,
-108,101,32,116,111,32,119,114,105,116,101,32,99,111,110,102,
-105,103,117,114,97,116,105,111,110,32,116,111,32,97,108,108,
-32,100,105,115,107,115,32,100,117,114,105,110,103,32,67,114,
-101,97,116,101,85,110,105,116,0,0,0,0,84,111,111,32,
-109,97,110,121,32,100,101,115,99,114,105,112,116,111,114,115,
 32,105,110,32,67,114,101,97,116,101,85,110,105,116,0,0,
-73,110,118,97,108,105,100,32,99,111,110,102,105,103,117,114,
-97,116,105,111,110,32,115,112,101,99,105,102,105,101,100,32,
-105,110,32,67,114,101,97,116,101,85,110,105,116,32,100,101,
-115,99,114,105,112,116,111,114,0,0,0,0,74,66,79,68,
-32,117,110,105,116,32,105,115,32,110,111,116,32,97,108,108,
-111,119,101,100,0,0,0,0,83,77,65,82,84,32,97,116,
-116,114,105,98,117,116,101,32,101,120,99,101,101,100,101,100,
-32,116,104,114,101,115,104,111,108,100,0,0,68,114,105,118,
-101,32,104,97,115,32,98,101,101,110,32,97,100,100,101,100,
-0,0,0,0,68,114,105,118,101,32,104,97,115,32,98,101,
-101,110,32,114,101,109,111,118,101,100,0,0,69,114,114,111,
-114,32,114,101,99,111,118,101,114,121,32,105,110,32,112,114,
-111,103,114,101,115,115,0,0,68,101,103,114,97,100,101,32,
-117,110,105,116,0,0,0,0,105,72,97,110,100,108,101,114,
-32,119,97,115,32,98,117,115,121,32,98,101,102,111,114,101,
-32,100,105,97,103,32,116,101,115,116,0,0,68,97,116,97,
-32,108,105,110,101,115,32,115,104,111,114,116,101,100,32,105,
-110,32,83,98,117,102,32,82,65,77,0,0,67,97,110,39,
-116,32,102,105,108,108,32,83,98,117,102,32,119,105,116,104,
-32,122,101,114,111,115,0,0,66,97,100,32,100,105,115,107,
-32,115,101,113,117,101,110,99,101,114,32,99,109,100,32,105,
-115,115,117,101,100,32,116,111,32,65,112,111,114,116,0,0,
-66,97,100,32,82,65,77,32,108,111,99,97,116,105,111,110,
-0,0,0,0,78,111,32,100,105,115,107,32,102,111,117,110,
-100,32,111,110,32,114,101,113,117,101,115,116,101,100,32,65,
-112,111,114,116,0,0,0,0,73,110,116,101,114,114,117,112,
-116,32,108,105,110,101,32,101,114,114,111,114,0,0,0,0,
-85,110,97,98,108,101,32,116,111,32,99,97,108,99,117,108,
-97,116,101,32,99,104,101,99,107,115,117,109,0,0,0,0,
-68,101,103,114,97,100,101,100,32,117,110,105,116,32,100,101,
-116,101,99,116,101,100,0,0,67,111,110,116,114,111,108,108,
-101,114,32,101,114,114,111,114,32,111,99,99,117,114,101,100,
-0,0,0,0,73,110,99,111,109,112,108,101,116,101,32,117,
-110,105,116,32,100,101,116,101,99,116,101,100,0,0,0,0,
-66,97,99,107,103,114,111,117,110,100,32,105,110,105,116,105,
-97,108,105,122,101,32,100,111,110,101,0,0,68,114,105,118,
-101,32,116,105,109,101,111,117,116,32,100,101,116,101,99,116,
-101,100,0,0,68,114,105,118,101,32,101,114,114,111,114,32,
-100,101,116,101,99,116,101,100,0,0,0,0,66,97,99,107,
-103,114,111,117,110,100,32,105,110,105,116,105,97,108,105,122,
-101,32,102,97,105,108,101,100,0,0,0,0,80,111,119,101,
-114,32,115,117,112,112,108,121,32,114,101,112,111,114,116,101,
-100,32,65,67,32,117,110,100,101,114,32,114,97,110,103,101,
-0,0,0,0,80,111,119,101,114,32,115,117,112,112,108,121,
-32,112,114,101,100,105,99,116,101,100,32,109,97,108,102,117,
-110,99,116,105,111,110,0,0,70,97,110,32,115,112,101,101,
-100,32,105,115,32,98,101,108,111,119,32,116,104,114,101,115,
-104,111,108,100,0,0,0,0,80,111,119,101,114,32,115,117,
-112,112,108,121,32,119,97,115,32,114,101,109,111,118,101,100,
-0,0,0,0,68,114,105,118,101,32,119,97,115,32,114,101,
-109,111,118,101,100,32,102,114,111,109,32,97,32,98,97,121,
-0,0,0,0,80,114,101,112,97,114,101,32,102,111,114,32,
-115,104,117,116,100,111,119,110,32,40,112,111,119,101,114,45,
-111,102,102,41,0,0,0,0,68,111,119,110,103,114,97,100,
-101,32,85,68,77,65,32,109,111,100,101,32,116,111,32,108,
-111,119,101,114,32,115,112,101,101,100,0,0,69,114,114,111,
-114,32,102,108,117,115,104,105,110,103,32,99,97,99,104,101,
-100,32,119,114,105,116,101,32,100,97,116,97,32,116,111,32,
-100,105,115,107,0,0,0,0,68,67,66,32,104,97,115,32,
-99,104,101,99,107,115,117,109,32,101,114,114,111,114,0,0,
-68,67,66,32,118,101,114,115,105,111,110,32,105,115,32,117,
-110,115,117,112,112,111,114,116,101,100,0,0,66,97,99,107,
-103,114,111,117,110,100,32,118,101,114,105,102,121,32,102,97,
-105,108,101,100,0,0,0,0,66,97,99,107,103,114,111,117,
-110,100,32,118,101,114,105,102,121,32,100,111,110,101,0,0,
-66,97,99,107,103,114,111,117,110,100,32,114,101,98,117,105,
-108,100,32,101,114,114,111,114,32,111,110,32,115,111,117,114,
-99,101,32,100,114,105,118,101,0,0,0,0,82,101,112,108,
-97,99,101,32,102,97,105,108,101,100,32,98,101,99,97,117,
-115,101,32,114,101,112,108,97,99,101,109,101,110,116,32,100,
-114,105,118,101,32,116,111,111,32,115,109,97,108,108,0,0,
-83,121,110,99,104,114,111,110,105,122,101,32,104,111,115,116,
-47,99,111,110,116,114,111,108,108,101,114,32,116,105,109,101,
-0,0,0,0,66,97,99,107,103,114,111,117,110,100,32,109,
-105,103,114,97,116,105,111,110,32,115,116,97,114,116,101,100,
-0,0,0,0,86,101,114,105,102,121,32,100,101,116,101,99,
-116,101,100,32,97,110,100,32,102,105,120,101,100,32,100,97,
-116,97,47,112,97,114,105,116,121,32,109,105,115,109,97,116,
-99,104,0,0,83,79,45,68,73,77,77,32,105,110,99,111,
-109,112,97,116,105,98,108,101,0,0,0,0,83,79,45,68,
-73,77,77,32,110,111,116,32,100,101,116,101,99,116,101,100,
-0,0,0,0,67,111,114,114,101,99,116,101,100,32,83,98,
-117,102,32,69,67,67,32,101,114,114,111,114,0,0,0,0,
+85,110,105,116,32,100,101,115,99,114,105,112,116,111,114,32,
+115,105,122,101,32,101,120,99,101,101,100,115,32,100,97,116,
+97,32,98,117,102,102,101,114,32,105,110,32,67,114,101,97,
+116,101,85,110,105,116,0,0,73,110,118,97,108,105,100,32,
+118,97,108,117,101,32,105,110,32,67,114,101,97,116,101,85,
+110,105,116,32,100,101,115,99,114,105,112,116,111,114,0,0,
+85,110,97,98,108,101,32,116,111,32,99,114,101,97,116,101,
+32,100,97,116,97,32,99,104,97,110,110,101,108,32,102,111,
+114,32,116,104,105,115,32,117,110,105,116,32,100,101,115,99,
+114,105,112,116,111,114,0,0,67,114,101,97,116,101,85,110,
+105,116,32,100,101,115,99,114,105,112,116,111,114,32,115,112,
+101,99,105,102,105,101,115,32,97,32,100,114,105,118,101,32,
+97,108,114,101,97,100,121,32,105,110,32,117,115,101,0,0,
+85,110,97,98,108,101,32,116,111,32,119,114,105,116,101,32,
+99,111,110,102,105,103,117,114,97,116,105,111,110,32,116,111,
+32,97,108,108,32,100,105,115,107,115,32,100,117,114,105,110,
+103,32,67,114,101,97,116,101,85,110,105,116,0,0,0,0,
+84,111,111,32,109,97,110,121,32,100,101,115,99,114,105,112,
+116,111,114,115,32,105,110,32,67,114,101,97,116,101,85,110,
+105,116,0,0,73,110,118,97,108,105,100,32,99,111,110,102,
+105,103,117,114,97,116,105,111,110,32,115,112,101,99,105,102,
+105,101,100,32,105,110,32,67,114,101,97,116,101,85,110,105,
+116,32,100,101,115,99,114,105,112,116,111,114,0,0,0,0,
+74,66,79,68,32,117,110,105,116,32,105,115,32,110,111,116,
+32,97,108,108,111,119,101,100,0,0,0,0,83,77,65,82,
+84,32,97,116,116,114,105,98,117,116,101,32,101,120,99,101,
+101,100,101,100,32,116,104,114,101,115,104,111,108,100,0,0,
+68,114,105,118,101,32,104,97,115,32,98,101,101,110,32,97,
+100,100,101,100,0,0,0,0,68,114,105,118,101,32,104,97,
+115,32,98,101,101,110,32,114,101,109,111,118,101,100,0,0,
+69,114,114,111,114,32,114,101,99,111,118,101,114,121,32,105,
+110,32,112,114,111,103,114,101,115,115,0,0,68,101,103,114,
+97,100,101,32,117,110,105,116,0,0,0,0,105,72,97,110,
+100,108,101,114,32,119,97,115,32,98,117,115,121,32,98,101,
+102,111,114,101,32,100,105,97,103,32,116,101,115,116,0,0,
+68,97,116,97,32,108,105,110,101,115,32,115,104,111,114,116,
+101,100,32,105,110,32,83,98,117,102,32,82,65,77,0,0,
+67,97,110,39,116,32,102,105,108,108,32,83,98,117,102,32,
+119,105,116,104,32,122,101,114,111,115,0,0,66,97,100,32,
+100,105,115,107,32,115,101,113,117,101,110,99,101,114,32,99,
+109,100,32,105,115,115,117,101,100,32,116,111,32,65,112,111,
+114,116,0,0,66,97,100,32,82,65,77,32,108,111,99,97,
+116,105,111,110,0,0,0,0,78,111,32,100,105,115,107,32,
+102,111,117,110,100,32,111,110,32,114,101,113,117,101,115,116,
+101,100,32,65,112,111,114,116,0,0,0,0,73,110,116,101,
+114,114,117,112,116,32,108,105,110,101,32,101,114,114,111,114,
+0,0,0,0,85,110,97,98,108,101,32,116,111,32,99,97,
+108,99,117,108,97,116,101,32,99,104,101,99,107,115,117,109,
+0,0,0,0,68,101,103,114,97,100,101,100,32,117,110,105,
+116,32,100,101,116,101,99,116,101,100,0,0,67,111,110,116,
+114,111,108,108,101,114,32,101,114,114,111,114,32,111,99,99,
+117,114,101,100,0,0,0,0,73,110,99,111,109,112,108,101,
+116,101,32,117,110,105,116,32,100,101,116,101,99,116,101,100,
+0,0,0,0,66,97,99,107,103,114,111,117,110,100,32,105,
+110,105,116,105,97,108,105,122,101,32,100,111,110,101,0,0,
+68,114,105,118,101,32,116,105,109,101,111,117,116,32,100,101,
+116,101,99,116,101,100,0,0,68,114,105,118,101,32,101,114,
+114,111,114,32,100,101,116,101,99,116,101,100,0,0,0,0,
 66,97,99,107,103,114,111,117,110,100,32,105,110,105,116,105,
-97,108,105,122,101,32,112,97,117,115,101,100,0,0,0,0,
+97,108,105,122,101,32,102,97,105,108,101,100,0,0,0,0,
+80,111,119,101,114,32,115,117,112,112,108,121,32,114,101,112,
+111,114,116,101,100,32,65,67,32,117,110,100,101,114,32,114,
+97,110,103,101,0,0,0,0,80,111,119,101,114,32,115,117,
+112,112,108,121,32,112,114,101,100,105,99,116,101,100,32,109,
+97,108,102,117,110,99,116,105,111,110,0,0,70,97,110,32,
+115,112,101,101,100,32,105,115,32,98,101,108,111,119,32,116,
+104,114,101,115,104,111,108,100,0,0,0,0,80,111,119,101,
+114,32,115,117,112,112,108,121,32,119,97,115,32,114,101,109,
+111,118,101,100,0,0,0,0,68,114,105,118,101,32,119,97,
+115,32,114,101,109,111,118,101,100,32,102,114,111,109,32,97,
+32,98,97,121,0,0,0,0,80,114,101,112,97,114,101,32,
+102,111,114,32,115,104,117,116,100,111,119,110,32,40,112,111,
+119,101,114,45,111,102,102,41,0,0,0,0,68,111,119,110,
+103,114,97,100,101,32,85,68,77,65,32,109,111,100,101,32,
+116,111,32,108,111,119,101,114,32,115,112,101,101,100,0,0,
+69,114,114,111,114,32,102,108,117,115,104,105,110,103,32,99,
+97,99,104,101,100,32,119,114,105,116,101,32,100,97,116,97,
+32,116,111,32,100,105,115,107,0,0,0,0,68,67,66,32,
+104,97,115,32,99,104,101,99,107,115,117,109,32,101,114,114,
+111,114,0,0,68,67,66,32,118,101,114,115,105,111,110,32,
+105,115,32,117,110,115,117,112,112,111,114,116,101,100,0,0,
 66,97,99,107,103,114,111,117,110,100,32,118,101,114,105,102,
-121,32,112,97,117,115,101,100,0,0,0,0,70,108,97,115,
-104,32,102,105,108,101,32,115,121,115,116,101,109,32,114,101,
-112,97,105,114,101,100,0,0,69,114,114,111,114,32,100,117,
-114,105,110,103,32,114,101,97,100,32,111,102,32,112,114,105,
-109,97,114,121,32,68,67,66,0,0,0,0,76,97,116,101,
-110,116,32,101,114,114,111,114,32,102,111,117,110,100,32,105,
-110,32,98,97,99,107,117,112,32,68,67,66,0,0,0,0,
-82,101,99,111,118,101,114,101,100,47,102,105,110,105,115,104,
-101,100,32,97,114,114,97,121,32,109,101,109,98,101,114,115,
-104,105,112,32,117,112,100,97,116,101,0,0,72,97,110,100,
-108,101,114,32,108,111,99,107,117,112,0,0,68,105,100,32,
-110,111,116,32,102,105,110,100,32,101,114,114,111,114,32,99,
-111,100,101,58,32,48,120,37,48,50,88,10,0,0,0,0,
-37,115,10,40,69,67,58,48,120,37,48,50,120,44,32,83,
-75,61,48,120,37,48,50,120,44,32,65,83,67,61,48,120,
-37,48,50,120,44,32,65,83,67,81,61,48,120,37,48,50,
-120,44,32,83,69,86,61,37,48,50,120,44,32,84,121,112,
-101,61,48,120,37,48,50,120,41,10,0,0,69,114,114,111,
-114,32,115,116,114,105,110,103,32,110,111,116,32,102,111,117,
-110,100,0,0,78,111,32,97,100,100,105,116,105,111,110,97,
-108,32,115,101,110,115,101,32,100,97,116,97,0,0,0,0,
-16,0,0,0,8,0,0,0,8,0,0,0,32,0,0,0,
+121,32,102,97,105,108,101,100,0,0,0,0,66,97,99,107,
+103,114,111,117,110,100,32,118,101,114,105,102,121,32,100,111,
+110,101,0,0,66,97,99,107,103,114,111,117,110,100,32,114,
+101,98,117,105,108,100,32,101,114,114,111,114,32,111,110,32,
+115,111,117,114,99,101,32,100,114,105,118,101,0,0,0,0,
+82,101,112,108,97,99,101,32,102,97,105,108,101,100,32,98,
+101,99,97,117,115,101,32,114,101,112,108,97,99,101,109,101,
+110,116,32,100,114,105,118,101,32,116,111,111,32,115,109,97,
+108,108,0,0,83,121,110,99,104,114,111,110,105,122,101,32,
+104,111,115,116,47,99,111,110,116,114,111,108,108,101,114,32,
+116,105,109,101,0,0,0,0,66,97,99,107,103,114,111,117,
+110,100,32,109,105,103,114,97,116,105,111,110,32,115,116,97,
+114,116,101,100,0,0,0,0,86,101,114,105,102,121,32,100,
+101,116,101,99,116,101,100,32,97,110,100,32,102,105,120,101,
+100,32,100,97,116,97,47,112,97,114,105,116,121,32,109,105,
+115,109,97,116,99,104,0,0,83,79,45,68,73,77,77,32,
+105,110,99,111,109,112,97,116,105,98,108,101,0,0,0,0,
+83,79,45,68,73,77,77,32,110,111,116,32,100,101,116,101,
+99,116,101,100,0,0,0,0,67,111,114,114,101,99,116,101,
+100,32,83,98,117,102,32,69,67,67,32,101,114,114,111,114,
+0,0,0,0,66,97,99,107,103,114,111,117,110,100,32,105,
+110,105,116,105,97,108,105,122,101,32,112,97,117,115,101,100,
+0,0,0,0,66,97,99,107,103,114,111,117,110,100,32,118,
+101,114,105,102,121,32,112,97,117,115,101,100,0,0,0,0,
+70,108,97,115,104,32,102,105,108,101,32,115,121,115,116,101,
+109,32,114,101,112,97,105,114,101,100,0,0,69,114,114,111,
+114,32,100,117,114,105,110,103,32,114,101,97,100,32,111,102,
+32,112,114,105,109,97,114,121,32,68,67,66,0,0,0,0,
+76,97,116,101,110,116,32,101,114,114,111,114,32,102,111,117,
+110,100,32,105,110,32,98,97,99,107,117,112,32,68,67,66,
+0,0,0,0,82,101,99,111,118,101,114,101,100,47,102,105,
+110,105,115,104,101,100,32,97,114,114,97,121,32,109,101,109,
+98,101,114,115,104,105,112,32,117,112,100,97,116,101,0,0,
+72,97,110,100,108,101,114,32,108,111,99,107,117,112,0,0,
+68,105,100,32,110,111,116,32,102,105,110,100,32,101,114,114,
+111,114,32,99,111,100,101,58,32,48,120,37,48,50,88,10,
+0,0,0,0,37,115,10,40,69,67,58,48,120,37,48,50,
+120,44,32,83,75,61,48,120,37,48,50,120,44,32,65,83,
+67,61,48,120,37,48,50,120,44,32,65,83,67,81,61,48,
+120,37,48,50,120,44,32,83,69,86,61,37,48,50,120,44,
+32,84,121,112,101,61,48,120,37,48,50,120,41,10,0,0,
+69,114,114,111,114,32,115,116,114,105,110,103,32,110,111,116,
+32,102,111,117,110,100,0,0,78,111,32,97,100,100,105,116,
+105,111,110,97,108,32,115,101,110,115,101,32,100,97,116,97,
+0,0,0,0,16,0,0,0,8,0,0,0,8,0,0,0,
+32,0,0,0,64,0,0,0,64,0,0,0,64,0,0,0,
 64,0,0,0,64,0,0,0,64,0,0,0,64,0,0,0,
 64,0,0,0,64,0,0,0,64,0,0,0,64,0,0,0,
 64,0,0,0,64,0,0,0,64,0,0,0,64,0,0,0,
-64,0,0,0,64,0,0,0,64,0,0,0,102,108,97,115,
-104,70,105,108,101,46,99,112,112,0,0,0,109,111,118,105,
-110,103,32,112,111,115,115,105,98,108,101,32,115,112,101,99,
-105,97,108,32,102,105,108,101,115,32,116,111,32,112,97,114,
-97,109,101,116,101,114,32,98,108,111,99,107,46,46,46,10,
-10,0,0,0,77,111,118,101,32,99,111,109,112,108,101,116,
-101,100,46,10,10,0,0,0,48,120,37,48,56,88,46,48,
-120,37,48,56,88,32,58,32,32,48,120,37,48,56,120,32,
-32,37,54,100,32,40,61,37,35,120,41,10,0,0,0,0,
-67,104,101,99,107,105,110,103,32,102,108,97,115,104,32,109,
-101,109,111,114,121,32,102,105,108,101,115,10,0,0,0,0,
-45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
-45,45,45,45,45,32,58,32,32,45,45,45,45,45,45,45,
-45,45,45,32,32,45,45,45,45,45,45,45,45,45,45,45,
-45,45,45,45,45,45,10,0,32,85,78,65,76,73,71,78,
-69,68,32,70,73,76,69,0,32,72,69,65,68,69,82,32,
-47,32,70,79,79,84,69,82,32,77,73,83,67,79,77,80,
-65,82,69,0,32,73,78,86,65,76,73,68,32,70,73,76,
-69,32,83,73,90,69,10,0,32,32,32,32,32,32,32,32,
-32,32,32,102,114,101,101,32,115,112,97,99,101,32,58,32,
-32,48,120,37,56,120,32,32,37,54,100,32,40,61,37,35,
-120,41,10,0,32,85,78,65,76,73,71,78,69,68,32,70,
-79,79,84,69,82,0,0,0,32,32,102,105,108,101,115,32,
-102,111,117,110,100,58,32,37,100,44,32,32,101,114,114,111,
-114,115,32,100,101,116,101,99,116,101,100,58,32,37,100,10,
-10,0,0,0,10,32,42,42,32,32,78,111,32,70,108,97,
-115,104,32,109,101,109,111,114,121,32,70,105,108,101,32,115,
-121,115,116,101,109,32,102,111,117,110,100,32,42,42,10,10,
-0,0,0,0,48,120,37,48,56,88,46,48,120,37,48,56,
-88,32,58,32,32,48,120,37,48,56,120,32,32,37,54,100,
-32,40,37,35,120,41,0,0,32,73,78,86,65,76,73,68,
-32,70,73,76,69,32,65,68,68,82,69,83,83,10,0,0,
-32,73,78,86,65,76,73,68,32,83,73,71,78,65,84,85,
-82,69,0,0,32,85,78,83,85,80,80,79,82,84,69,68,
-32,86,69,82,83,73,79,78,0,0,0,0,32,42,42,32,
-84,79,79,32,77,65,78,89,32,39,70,73,76,69,83,39,
-32,42,42,10,0,0,0,0,32,32,32,32,32,32,32,32,
-32,32,32,70,32,76,32,65,32,83,32,72,32,32,32,77,
-32,69,32,77,32,79,32,82,32,89,32,32,32,77,32,65,
-32,80,10,115,105,103,110,97,116,117,114,101,49,46,115,105,
-103,110,97,116,117,114,101,50,32,58,32,32,97,100,100,114,
-101,115,115,32,32,32,32,32,116,111,116,97,108,32,115,105,
-122,101,10,0,45,45,45,45,45,45,45,45,45,45,45,45,
+102,108,97,115,104,70,105,108,101,46,99,112,112,0,0,0,
+109,111,118,105,110,103,32,112,111,115,115,105,98,108,101,32,
+115,112,101,99,105,97,108,32,102,105,108,101,115,32,116,111,
+32,112,97,114,97,109,101,116,101,114,32,98,108,111,99,107,
+46,46,46,10,10,0,0,0,77,111,118,101,32,99,111,109,
+112,108,101,116,101,100,46,10,10,0,0,0,48,120,37,48,
+56,88,46,48,120,37,48,56,88,32,58,32,32,48,120,37,
+48,56,120,32,32,37,54,100,32,40,61,37,35,120,41,10,
+0,0,0,0,67,104,101,99,107,105,110,103,32,102,108,97,
+115,104,32,109,101,109,111,114,121,32,102,105,108,101,115,10,
+0,0,0,0,45,45,45,45,45,45,45,45,45,45,45,45,
 45,45,45,45,45,45,45,45,45,32,58,32,32,45,45,45,
 45,45,45,45,45,45,45,32,32,45,45,45,45,45,45,45,
-45,45,45,45,45,45,45,45,45,45,10,0,32,110,111,110,
-101,32,102,111,117,110,100,10,109,97,114,107,105,110,103,32,
-108,97,115,116,32,118,97,108,105,100,32,102,105,108,101,46,
-46,46,46,0,32,102,111,117,110,100,46,10,76,105,110,107,
-105,110,103,32,118,97,108,105,100,32,102,105,108,101,115,46,
-46,46,46,32,10,0,0,0,32,68,111,110,101,10,82,101,
-112,97,105,114,32,99,111,109,112,108,101,116,101,100,32,115,
-117,99,99,101,115,115,102,117,108,108,121,32,10,0,0,0,
-10,10,82,101,112,97,105,114,105,110,103,32,116,104,101,32,
-102,108,97,115,104,32,102,105,108,101,32,115,121,115,116,101,
-109,10,0,0,66,97,100,32,100,105,114,101,99,116,111,114,
-121,44,32,114,101,112,97,105,114,32,97,98,111,114,116,101,
-100,10,0,0,48,120,37,48,56,88,46,48,120,37,48,56,
-88,32,58,32,32,48,120,37,48,56,120,32,32,37,54,100,
-32,40,61,37,35,120,41,10,0,0,0,0,118,97,108,105,
-100,97,116,105,111,110,32,102,97,105,108,101,100,44,32,115,
-101,97,114,99,104,105,110,103,32,102,111,114,32,118,97,108,
-105,100,32,102,105,108,101,115,46,46,46,46,0,0,0,0,
-32,82,101,112,97,105,114,32,102,97,105,108,101,100,32,10,
-0,0,0,0,86,97,108,105,100,97,116,105,110,103,32,102,
-108,97,115,104,32,102,105,108,101,32,115,121,115,116,101,109,
-46,46,46,46,46,10,115,105,103,110,97,116,117,114,101,49,
-46,115,105,103,110,97,116,117,114,101,50,32,58,32,32,97,
-100,100,114,101,115,115,32,32,32,32,32,116,111,116,97,108,
-32,115,105,122,101,10,0,0,85,110,115,117,112,112,111,114,
+45,45,45,45,45,45,45,45,45,45,10,0,32,85,78,65,
+76,73,71,78,69,68,32,70,73,76,69,0,32,72,69,65,
+68,69,82,32,47,32,70,79,79,84,69,82,32,77,73,83,
+67,79,77,80,65,82,69,0,32,73,78,86,65,76,73,68,
+32,70,73,76,69,32,83,73,90,69,10,0,32,32,32,32,
+32,32,32,32,32,32,32,102,114,101,101,32,115,112,97,99,
+101,32,58,32,32,48,120,37,56,120,32,32,37,54,100,32,
+40,61,37,35,120,41,10,0,32,85,78,65,76,73,71,78,
+69,68,32,70,79,79,84,69,82,0,0,0,32,32,102,105,
+108,101,115,32,102,111,117,110,100,58,32,37,100,44,32,32,
+101,114,114,111,114,115,32,100,101,116,101,99,116,101,100,58,
+32,37,100,10,10,0,0,0,10,32,42,42,32,32,78,111,
+32,70,108,97,115,104,32,109,101,109,111,114,121,32,70,105,
+108,101,32,115,121,115,116,101,109,32,102,111,117,110,100,32,
+42,42,10,10,0,0,0,0,48,120,37,48,56,88,46,48,
+120,37,48,56,88,32,58,32,32,48,120,37,48,56,120,32,
+32,37,54,100,32,40,37,35,120,41,0,0,32,73,78,86,
+65,76,73,68,32,70,73,76,69,32,65,68,68,82,69,83,
+83,10,0,0,32,73,78,86,65,76,73,68,32,83,73,71,
+78,65,84,85,82,69,0,0,32,85,78,83,85,80,80,79,
+82,84,69,68,32,86,69,82,83,73,79,78,0,0,0,0,
+32,42,42,32,84,79,79,32,77,65,78,89,32,39,70,73,
+76,69,83,39,32,42,42,10,0,0,0,0,32,32,32,32,
+32,32,32,32,32,32,32,70,32,76,32,65,32,83,32,72,
+32,32,32,77,32,69,32,77,32,79,32,82,32,89,32,32,
+32,77,32,65,32,80,10,115,105,103,110,97,116,117,114,101,
+49,46,115,105,103,110,97,116,117,114,101,50,32,58,32,32,
+97,100,100,114,101,115,115,32,32,32,32,32,116,111,116,97,
+108,32,115,105,122,101,10,0,45,45,45,45,45,45,45,45,
+45,45,45,45,45,45,45,45,45,45,45,45,45,32,58,32,
+32,45,45,45,45,45,45,45,45,45,45,32,32,45,45,45,
+45,45,45,45,45,45,45,45,45,45,45,45,45,45,10,0,
+32,110,111,110,101,32,102,111,117,110,100,10,109,97,114,107,
+105,110,103,32,108,97,115,116,32,118,97,108,105,100,32,102,
+105,108,101,46,46,46,46,0,32,102,111,117,110,100,46,10,
+76,105,110,107,105,110,103,32,118,97,108,105,100,32,102,105,
+108,101,115,46,46,46,46,32,10,0,0,0,32,68,111,110,
+101,10,82,101,112,97,105,114,32,99,111,109,112,108,101,116,
+101,100,32,115,117,99,99,101,115,115,102,117,108,108,121,32,
+10,0,0,0,10,10,82,101,112,97,105,114,105,110,103,32,
+116,104,101,32,102,108,97,115,104,32,102,105,108,101,32,115,
+121,115,116,101,109,10,0,0,66,97,100,32,100,105,114,101,
+99,116,111,114,121,44,32,114,101,112,97,105,114,32,97,98,
+111,114,116,101,100,10,0,0,48,120,37,48,56,88,46,48,
+120,37,48,56,88,32,58,32,32,48,120,37,48,56,120,32,
+32,37,54,100,32,40,61,37,35,120,41,10,0,0,0,0,
+118,97,108,105,100,97,116,105,111,110,32,102,97,105,108,101,
+100,44,32,115,101,97,114,99,104,105,110,103,32,102,111,114,
+32,118,97,108,105,100,32,102,105,108,101,115,46,46,46,46,
+0,0,0,0,32,82,101,112,97,105,114,32,102,97,105,108,
+101,100,32,10,0,0,0,0,86,97,108,105,100,97,116,105,
+110,103,32,102,108,97,115,104,32,102,105,108,101,32,115,121,
+115,116,101,109,46,46,46,46,46,10,115,105,103,110,97,116,
+117,114,101,49,46,115,105,103,110,97,116,117,114,101,50,32,
+58,32,32,97,100,100,114,101,115,115,32,32,32,32,32,116,
+111,116,97,108,32,115,105,122,101,10,0,0,85,110,115,117,
+112,112,111,114,116,101,100,32,70,108,97,115,104,70,105,108,
+101,32,118,101,114,115,105,111,110,32,40,97,100,100,114,61,
+48,120,37,88,41,10,0,0,102,108,97,115,104,70,105,108,
+101,46,99,112,112,0,0,0,85,110,115,117,112,112,111,114,
 116,101,100,32,70,108,97,115,104,70,105,108,101,32,118,101,
 114,115,105,111,110,32,40,97,100,100,114,61,48,120,37,88,
-41,10,0,0,102,108,97,115,104,70,105,108,101,46,99,112,
-112,0,0,0,85,110,115,117,112,112,111,114,116,101,100,32,
-70,108,97,115,104,70,105,108,101,32,118,101,114,115,105,111,
-110,32,40,97,100,100,114,61,48,120,37,88,41,10,0,0,
-66,73,79,83,32,105,109,97,103,101,32,110,111,116,32,102,
-111,117,110,100,32,105,110,32,102,108,97,115,104,33,10,0,
-70,105,114,109,119,97,114,101,32,105,109,97,103,101,32,110,
+41,10,0,0,66,73,79,83,32,105,109,97,103,101,32,110,
 111,116,32,102,111,117,110,100,32,105,110,32,102,108,97,115,
-104,33,10,0,85,110,101,120,112,101,99,116,101,100,32,108,
-111,99,97,116,105,111,110,32,111,102,32,70,105,114,109,119,
-97,114,101,32,105,110,32,102,108,97,115,104,33,10,0,0,
-32,32,32,69,120,112,101,99,116,101,100,32,97,100,100,114,
-58,32,37,120,32,32,32,32,65,99,116,117,97,108,32,97,
-100,100,114,58,32,37,120,10,0,0,0,0,85,110,101,120,
-112,101,99,116,101,100,32,115,105,122,101,32,111,102,32,70,
-105,114,109,119,97,114,101,32,104,101,97,100,101,114,33,10,
-0,0,0,0,32,32,32,69,120,112,101,99,116,101,100,32,
-115,105,122,101,58,32,37,120,32,32,32,32,65,99,116,117,
-97,108,32,115,105,122,101,58,32,37,120,10,0,0,0,0,
-85,110,101,120,112,101,99,116,101,100,32,108,111,99,97,116,
-105,111,110,32,111,102,32,66,73,79,83,32,105,110,32,102,
-108,97,115,104,33,10,0,0,85,110,101,120,112,101,99,116,
-101,100,32,115,105,122,101,32,111,102,32,66,73,79,83,32,
-104,101,97,100,101,114,33,10,0,0,0,0,111,112,99,111,
-100,101,61,48,120,37,88,0,111,112,99,111,100,101,61,48,
-120,37,88,0,82,101,113,117,101,115,116,73,68,61,37,105,
-0,0,0,0,82,101,113,117,101,115,116,73,68,61,37,105,
-0,0,0,0,101,110,116,114,105,101,115,61,48,120,37,88,
-0,0,0,0,76,66,65,61,48,120,37,76,88,44,32,108,
-101,110,103,116,104,61,48,120,37,88,0,0,82,101,108,97,
-116,105,118,101,32,116,105,109,101,32,100,105,115,97,98,108,
-101,100,10,0,73,100,32,32,32,32,84,105,109,101,32,32,
-32,32,32,32,32,32,32,32,32,32,32,32,67,109,100,32,
-32,85,110,105,116,32,32,76,98,97,32,32,32,32,32,32,
-32,67,110,116,10,0,0,0,100,105,115,97,98,108,101,100,
-10,0,0,0,73,110,118,97,108,105,100,32,110,117,109,98,
-101,114,32,111,102,32,97,114,103,117,109,101,110,116,115,10,
-0,0,0,0,73,110,118,97,108,105,100,32,114,97,110,103,
-101,10,0,0,67,111,109,109,97,110,100,32,104,105,115,116,
-111,114,121,32,0,0,0,0,101,110,97,98,108,101,100,10,
-0,0,0,0,82,101,108,97,116,105,118,101,32,116,105,109,
-101,32,101,110,97,98,108,101,100,10,0,0,37,48,49,54,
-76,117,32,32,37,49,99,32,32,32,32,37,48,50,120,32,
-32,32,32,0,37,48,56,76,120,32,32,37,48,52,120,32,
-32,0,0,0,77,97,120,32,76,66,65,32,97,99,99,101,
-115,115,101,100,32,58,32,48,120,37,48,56,88,95,37,48,
-56,88,10,0,77,97,120,32,104,111,115,116,32,97,100,100,
-114,101,115,115,32,58,32,48,120,37,48,56,88,95,37,48,
-56,88,10,0,78,111,112,32,101,120,101,99,117,116,101,100,
-32,79,75,10,0,0,0,0,83,82,76,32,32,32,32,32,
-48,120,37,48,52,88,32,32,48,120,37,48,52,88,10,0,
-65,114,99,104,73,100,32,32,48,120,37,48,52,88,32,32,
-48,120,37,48,52,88,10,0,66,114,97,110,99,104,32,32,
-48,120,37,48,52,88,32,32,48,120,37,48,52,88,10,0,
-66,117,105,108,100,32,32,32,48,120,37,48,52,88,32,32,
-48,120,37,48,52,88,10,0,82,101,115,117,108,116,32,32,
-48,120,37,48,56,88,10,0,114,101,115,117,108,116,61,48,
-120,37,88,0,102,101,97,116,117,114,101,115,61,48,120,37,
-88,0,0,0,73,110,105,116,67,111,110,110,101,99,116,32,
-102,101,97,116,117,114,101,115,58,32,48,120,37,48,56,88,
-10,0,0,0,115,105,122,101,61,48,120,37,88,0,0,0,
-32,32,32,32,32,32,32,32,68,114,105,118,101,114,32,32,
-70,105,114,109,119,97,114,101,10,0,0,0,73,110,105,116,
-67,111,110,110,101,99,116,32,99,114,101,100,105,116,115,58,
-32,37,100,10,0,0,0,0,54,52,32,98,105,116,32,83,
-71,76,32,102,111,114,109,97,116,10,0,0,51,50,32,98,
+104,33,10,0,70,105,114,109,119,97,114,101,32,105,109,97,
+103,101,32,110,111,116,32,102,111,117,110,100,32,105,110,32,
+102,108,97,115,104,33,10,0,85,110,101,120,112,101,99,116,
+101,100,32,108,111,99,97,116,105,111,110,32,111,102,32,70,
+105,114,109,119,97,114,101,32,105,110,32,102,108,97,115,104,
+33,10,0,0,32,32,32,69,120,112,101,99,116,101,100,32,
+97,100,100,114,58,32,37,120,32,32,32,32,65,99,116,117,
+97,108,32,97,100,100,114,58,32,37,120,10,0,0,0,0,
+85,110,101,120,112,101,99,116,101,100,32,115,105,122,101,32,
+111,102,32,70,105,114,109,119,97,114,101,32,104,101,97,100,
+101,114,33,10,0,0,0,0,32,32,32,69,120,112,101,99,
+116,101,100,32,115,105,122,101,58,32,37,120,32,32,32,32,
+65,99,116,117,97,108,32,115,105,122,101,58,32,37,120,10,
+0,0,0,0,85,110,101,120,112,101,99,116,101,100,32,108,
+111,99,97,116,105,111,110,32,111,102,32,66,73,79,83,32,
+105,110,32,102,108,97,115,104,33,10,0,0,85,110,101,120,
+112,101,99,116,101,100,32,115,105,122,101,32,111,102,32,66,
+73,79,83,32,104,101,97,100,101,114,33,10,0,0,0,0,
+111,112,99,111,100,101,61,48,120,37,88,0,111,112,99,111,
+100,101,61,48,120,37,88,0,82,101,113,117,101,115,116,73,
+68,61,37,105,0,0,0,0,82,101,113,117,101,115,116,73,
+68,61,37,105,0,0,0,0,101,110,116,114,105,101,115,61,
+48,120,37,88,0,0,0,0,76,66,65,61,48,120,37,76,
+88,44,32,108,101,110,103,116,104,61,48,120,37,88,0,0,
+82,101,108,97,116,105,118,101,32,116,105,109,101,32,100,105,
+115,97,98,108,101,100,10,0,73,100,32,32,32,32,84,105,
+109,101,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
+67,109,100,32,32,85,110,105,116,32,32,76,98,97,32,32,
+32,32,32,32,32,67,110,116,10,0,0,0,100,105,115,97,
+98,108,101,100,10,0,0,0,73,110,118,97,108,105,100,32,
+110,117,109,98,101,114,32,111,102,32,97,114,103,117,109,101,
+110,116,115,10,0,0,0,0,73,110,118,97,108,105,100,32,
+114,97,110,103,101,10,0,0,67,111,109,109,97,110,100,32,
+104,105,115,116,111,114,121,32,0,0,0,0,101,110,97,98,
+108,101,100,10,0,0,0,0,82,101,108,97,116,105,118,101,
+32,116,105,109,101,32,101,110,97,98,108,101,100,10,0,0,
+37,48,49,54,76,117,32,32,37,49,99,32,32,32,32,37,
+48,50,120,32,32,32,32,0,37,48,56,76,120,32,32,37,
+48,52,120,32,32,0,0,0,77,97,120,32,76,66,65,32,
+97,99,99,101,115,115,101,100,32,58,32,48,120,37,48,56,
+88,95,37,48,56,88,10,0,77,97,120,32,104,111,115,116,
+32,97,100,100,114,101,115,115,32,58,32,48,120,37,48,56,
+88,95,37,48,56,88,10,0,78,111,112,32,101,120,101,99,
+117,116,101,100,32,79,75,10,0,0,0,0,83,82,76,32,
+32,32,32,32,48,120,37,48,52,88,32,32,48,120,37,48,
+52,88,10,0,65,114,99,104,73,100,32,32,48,120,37,48,
+52,88,32,32,48,120,37,48,52,88,10,0,66,114,97,110,
+99,104,32,32,48,120,37,48,52,88,32,32,48,120,37,48,
+52,88,10,0,66,117,105,108,100,32,32,32,48,120,37,48,
+52,88,32,32,48,120,37,48,52,88,10,0,82,101,115,117,
+108,116,32,32,48,120,37,48,56,88,10,0,114,101,115,117,
+108,116,61,48,120,37,88,0,102,101,97,116,117,114,101,115,
+61,48,120,37,88,0,0,0,73,110,105,116,67,111,110,110,
+101,99,116,32,102,101,97,116,117,114,101,115,58,32,48,120,
+37,48,56,88,10,0,0,0,115,105,122,101,61,48,120,37,
+88,0,0,0,32,32,32,32,32,32,32,32,68,114,105,118,
+101,114,32,32,70,105,114,109,119,97,114,101,10,0,0,0,
+73,110,105,116,67,111,110,110,101,99,116,32,99,114,101,100,
+105,116,115,58,32,37,100,10,0,0,0,0,54,52,32,98,
 105,116,32,83,71,76,32,102,111,114,109,97,116,10,0,0,
-78,111,32,115,101,116,32,102,101,97,116,117,114,101,115,10,
-0,0,0,0,80,111,114,116,83,99,97,110,32,99,111,109,
-109,97,110,100,32,40,112,111,114,116,32,109,97,112,41,58,
-32,48,120,37,120,10,0,0,73,109,112,111,114,116,85,110,
-105,116,32,99,111,109,109,97,110,100,32,40,112,111,114,116,
-32,109,97,112,41,58,32,48,120,37,120,10,0,0,0,0,
-70,108,117,115,104,32,99,111,109,109,97,110,100,44,32,117,
-110,105,116,61,37,105,10,0,10,68,101,108,101,116,101,85,
-110,105,116,32,37,100,32,99,111,109,109,97,110,100,44,32,
-100,101,115,116,114,111,121,61,37,115,10,0,115,105,122,101,
-79,102,68,101,115,99,114,105,112,116,111,114,61,37,105,44,
-32,110,117,109,68,101,115,99,114,105,112,116,111,114,115,61,
-37,105,10,0,10,67,114,101,97,116,101,85,110,105,116,32,
-117,115,105,110,103,32,100,101,115,99,114,105,112,116,111,114,
-32,118,101,114,115,105,111,110,32,37,100,44,32,102,108,97,
-103,115,61,37,35,48,50,120,10,0,0,0,67,111,110,115,
-116,114,117,99,116,105,111,110,32,99,97,112,97,99,105,116,
-105,101,115,58,10,0,0,0,100,101,115,99,114,105,112,116,
-111,114,91,37,50,105,93,32,32,112,111,114,116,61,37,50,
-117,44,32,99,97,112,61,37,35,48,56,120,10,0,0,0,
-67,82,69,65,84,69,68,32,85,78,73,84,32,37,50,100,
-10,0,0,0,104,111,115,116,76,101,103,97,99,121,67,109,
-100,115,46,99,112,112,0,0,91,37,50,105,93,32,115,117,
-98,115,61,37,105,44,32,99,102,103,61,37,35,104,120,44,
-32,115,116,114,105,112,76,111,103,50,61,37,35,104,120,44,
-32,112,111,114,116,61,37,105,44,32,108,111,103,68,114,118,
-61,37,105,44,32,109,111,100,101,61,37,35,104,120,44,32,
-114,98,108,100,37,37,61,37,105,44,10,32,32,32,32,32,
-32,79,102,102,115,101,116,61,37,35,48,56,120,44,32,99,
-97,112,61,37,35,48,56,120,44,32,114,115,118,100,61,37,
-35,104,120,32,37,35,104,120,44,32,102,108,97,103,115,61,
-37,35,104,120,10,0,0,0,70,108,97,115,104,32,101,114,
-114,111,114,32,37,120,10,0,68,111,119,110,108,111,97,100,
-70,105,114,109,119,97,114,101,32,99,111,109,109,97,110,100,
-44,32,98,117,102,102,101,114,32,110,117,109,98,101,114,32,
-37,105,10,0,80,97,115,115,105,110,103,32,99,111,110,116,
-114,111,108,32,116,111,32,70,108,97,115,104,32,85,112,100,
-97,116,101,114,10,0,0,0,70,108,97,115,104,105,110,103,
-32,99,111,109,112,108,101,116,101,100,32,79,75,10,0,0,
-86,101,114,105,102,121,85,110,105,116,32,37,105,32,99,111,
-109,109,97,110,100,10,0,0,90,101,114,111,85,110,105,116,
-32,37,105,32,99,111,109,109,97,110,100,10,0,0,0,0,
-82,101,112,108,97,99,101,68,114,105,118,101,58,32,100,101,
-103,114,97,100,101,100,32,117,110,105,116,32,37,100,44,32,
-115,112,97,114,101,32,117,110,105,116,32,37,100,10,0,0,
-82,101,98,117,105,108,100,85,110,105,116,32,37,105,32,99,
-111,109,109,97,110,100,10,0,10,60,60,32,67,111,109,109,
-97,110,100,101,100,32,82,101,115,101,116,32,62,62,10,0,
-72,111,116,83,119,97,112,40,117,110,107,110,111,119,110,32,
-97,99,116,105,111,110,32,48,120,37,88,41,58,32,110,111,
-32,97,99,116,105,111,110,32,116,97,107,101,110,46,10,0,
-72,111,116,83,119,97,112,32,99,111,109,109,97,110,100,44,
-32,112,111,114,116,32,37,105,10,0,0,0,72,111,116,83,
-119,97,112,40,82,69,80,76,65,67,69,95,74,66,79,68,
-41,32,117,110,115,117,112,112,111,114,116,101,100,59,32,97,
-99,116,115,32,97,115,32,78,111,112,46,10,0,0,0,0,
-32,32,69,114,114,111,114,58,32,117,110,100,101,102,105,110,
-101,100,32,116,101,115,116,32,73,68,33,32,40,48,120,37,
-88,41,10,0,10,68,105,97,103,110,111,115,116,105,99,58,
-10,0,0,0,32,32,32,32,84,101,115,116,32,73,68,32,
-61,32,37,88,10,0,0,0,68,105,97,103,110,111,115,116,
-105,99,32,102,105,110,105,115,104,101,100,32,119,105,116,104,
-32,101,114,114,111,114,115,33,10,0,0,0,68,105,97,103,
+51,50,32,98,105,116,32,83,71,76,32,102,111,114,109,97,
+116,10,0,0,78,111,32,115,101,116,32,102,101,97,116,117,
+114,101,115,10,0,0,0,0,80,111,114,116,83,99,97,110,
+32,99,111,109,109,97,110,100,32,40,112,111,114,116,32,109,
+97,112,41,58,32,48,120,37,120,10,0,0,73,109,112,111,
+114,116,85,110,105,116,32,99,111,109,109,97,110,100,32,40,
+112,111,114,116,32,109,97,112,41,58,32,48,120,37,120,10,
+0,0,0,0,70,108,117,115,104,32,99,111,109,109,97,110,
+100,44,32,117,110,105,116,61,37,105,10,0,10,68,101,108,
+101,116,101,85,110,105,116,32,37,100,32,99,111,109,109,97,
+110,100,44,32,100,101,115,116,114,111,121,61,37,115,10,0,
+115,105,122,101,79,102,68,101,115,99,114,105,112,116,111,114,
+61,37,105,44,32,110,117,109,68,101,115,99,114,105,112,116,
+111,114,115,61,37,105,10,0,10,67,114,101,97,116,101,85,
+110,105,116,32,117,115,105,110,103,32,100,101,115,99,114,105,
+112,116,111,114,32,118,101,114,115,105,111,110,32,37,100,44,
+32,102,108,97,103,115,61,37,35,48,50,120,10,0,0,0,
+67,111,110,115,116,114,117,99,116,105,111,110,32,99,97,112,
+97,99,105,116,105,101,115,58,10,0,0,0,100,101,115,99,
+114,105,112,116,111,114,91,37,50,105,93,32,32,112,111,114,
+116,61,37,50,117,44,32,99,97,112,61,37,35,48,56,120,
+10,0,0,0,67,82,69,65,84,69,68,32,85,78,73,84,
+32,37,50,100,10,0,0,0,104,111,115,116,76,101,103,97,
+99,121,67,109,100,115,46,99,112,112,0,0,91,37,50,105,
+93,32,115,117,98,115,61,37,105,44,32,99,102,103,61,37,
+35,104,120,44,32,115,116,114,105,112,76,111,103,50,61,37,
+35,104,120,44,32,112,111,114,116,61,37,105,44,32,108,111,
+103,68,114,118,61,37,105,44,32,109,111,100,101,61,37,35,
+104,120,44,32,114,98,108,100,37,37,61,37,105,44,10,32,
+32,32,32,32,32,79,102,102,115,101,116,61,37,35,48,56,
+120,44,32,99,97,112,61,37,35,48,56,120,44,32,114,115,
+118,100,61,37,35,104,120,32,37,35,104,120,44,32,102,108,
+97,103,115,61,37,35,104,120,10,0,0,0,70,108,97,115,
+104,32,101,114,114,111,114,32,37,120,10,0,68,111,119,110,
+108,111,97,100,70,105,114,109,119,97,114,101,32,99,111,109,
+109,97,110,100,44,32,98,117,102,102,101,114,32,110,117,109,
+98,101,114,32,37,105,10,0,80,97,115,115,105,110,103,32,
+99,111,110,116,114,111,108,32,116,111,32,70,108,97,115,104,
+32,85,112,100,97,116,101,114,10,0,0,0,70,108,97,115,
+104,105,110,103,32,99,111,109,112,108,101,116,101,100,32,79,
+75,10,0,0,86,101,114,105,102,121,85,110,105,116,32,37,
+105,32,99,111,109,109,97,110,100,10,0,0,90,101,114,111,
+85,110,105,116,32,37,105,32,99,111,109,109,97,110,100,10,
+0,0,0,0,82,101,112,108,97,99,101,68,114,105,118,101,
+58,32,100,101,103,114,97,100,101,100,32,117,110,105,116,32,
+37,100,44,32,115,112,97,114,101,32,117,110,105,116,32,37,
+100,10,0,0,82,101,98,117,105,108,100,85,110,105,116,32,
+37,105,32,99,111,109,109,97,110,100,10,0,10,60,60,32,
+67,111,109,109,97,110,100,101,100,32,82,101,115,101,116,32,
+62,62,10,0,72,111,116,83,119,97,112,40,117,110,107,110,
+111,119,110,32,97,99,116,105,111,110,32,48,120,37,88,41,
+58,32,110,111,32,97,99,116,105,111,110,32,116,97,107,101,
+110,46,10,0,72,111,116,83,119,97,112,32,99,111,109,109,
+97,110,100,44,32,112,111,114,116,32,37,105,10,0,0,0,
+72,111,116,83,119,97,112,40,82,69,80,76,65,67,69,95,
+74,66,79,68,41,32,117,110,115,117,112,112,111,114,116,101,
+100,59,32,97,99,116,115,32,97,115,32,78,111,112,46,10,
+0,0,0,0,32,32,69,114,114,111,114,58,32,117,110,100,
+101,102,105,110,101,100,32,116,101,115,116,32,73,68,33,32,
+40,48,120,37,88,41,10,0,10,68,105,97,103,110,111,115,
+116,105,99,58,10,0,0,0,32,32,32,32,84,101,115,116,
+32,73,68,32,61,32,37,88,10,0,0,0,68,105,97,103,
 110,111,115,116,105,99,32,102,105,110,105,115,104,101,100,32,
-79,75,46,10,0,0,0,0,10,82,101,111,114,100,101,114,
-85,110,105,116,115,32,99,111,109,109,97,110,100,58,32,99,
-111,117,110,116,61,37,105,44,32,109,97,112,0,0,0,0,
-32,73,110,118,97,108,105,100,32,77,97,112,33,10,0,0,
-42,42,32,69,114,114,111,114,32,48,120,37,88,32,117,112,
-100,97,116,105,110,103,32,68,67,66,32,105,110,32,82,101,
-111,114,100,101,114,85,110,105,116,115,44,32,117,110,105,116,
-61,37,105,10,0,0,0,0,70,108,97,115,104,32,85,112,
-100,97,116,101,114,0,0,0,45,45,32,72,111,115,116,32,
-109,101,115,115,97,103,101,58,32,37,115,10,0,0,0,0,
-80,111,119,101,114,77,97,110,97,103,101,109,101,110,116,32,
-99,111,109,109,97,110,100,44,32,115,112,105,110,32,0,0,
-105,110,118,97,108,105,100,32,112,97,114,97,109,10,0,0,
-112,99,104,105,112,46,104,112,112,0,0,0,107,101,114,110,
-101,108,46,104,112,112,0,0,51,119,97,114,101,32,32,32,
-0,0,0,0,76,111,103,105,99,97,108,32,68,105,115,107,
-32,32,32,32,0,0,0,0,83,116,111,112,32,117,110,105,
-116,32,48,120,37,120,10,0,105,109,109,101,100,105,97,116,
-101,0,0,0,83,116,97,114,116,32,117,110,105,116,32,48,
-120,37,120,32,0,0,0,0,85,110,104,97,110,100,108,101,
-100,32,99,111,109,109,97,110,100,32,99,111,100,101,32,37,
-120,32,115,101,110,116,32,102,111,114,32,85,110,105,116,32,
-45,32,37,120,10,0,0,0,114,101,116,114,105,101,115,61,
-37,100,0,0,112,99,104,105,112,46,104,112,112,0,0,0,
-69,114,114,111,114,32,48,120,37,88,32,102,101,116,99,104,
-105,110,103,32,99,111,109,109,97,110,100,32,97,116,32,48,
-120,37,76,88,10,0,0,0,107,101,114,110,101,108,46,104,
-112,112,0,0,83,101,116,116,105,110,103,32,117,67,32,101,
-114,114,111,114,32,105,110,32,115,116,97,116,117,115,32,114,
-101,103,105,115,116,101,114,10,0,0,0,0,69,114,114,111,
-114,44,32,85,110,105,116,32,37,100,58,32,0,0,0,0,
-104,111,115,116,73,110,116,101,114,102,97,99,101,80,99,105,
-46,99,112,112,0,0,0,0,115,101,110,115,101,32,98,117,
-102,102,101,114,58,32,108,101,110,61,37,35,120,44,32,97,
-100,100,114,101,115,115,61,37,35,76,120,10,0,0,0,0,
+119,105,116,104,32,101,114,114,111,114,115,33,10,0,0,0,
+68,105,97,103,110,111,115,116,105,99,32,102,105,110,105,115,
+104,101,100,32,79,75,46,10,0,0,0,0,10,82,101,111,
+114,100,101,114,85,110,105,116,115,32,99,111,109,109,97,110,
+100,58,32,99,111,117,110,116,61,37,105,44,32,109,97,112,
+0,0,0,0,32,73,110,118,97,108,105,100,32,77,97,112,
+33,10,0,0,42,42,32,69,114,114,111,114,32,48,120,37,
+88,32,117,112,100,97,116,105,110,103,32,68,67,66,32,105,
+110,32,82,101,111,114,100,101,114,85,110,105,116,115,44,32,
+117,110,105,116,61,37,105,10,0,0,0,0,70,108,97,115,
+104,32,85,112,100,97,116,101,114,0,0,0,45,45,32,72,
+111,115,116,32,109,101,115,115,97,103,101,58,32,37,115,10,
+0,0,0,0,80,111,119,101,114,77,97,110,97,103,101,109,
+101,110,116,32,99,111,109,109,97,110,100,44,32,115,112,105,
+110,32,0,0,105,110,118,97,108,105,100,32,112,97,114,97,
+109,10,0,0,112,99,104,105,112,46,104,112,112,0,0,0,
+107,101,114,110,101,108,46,104,112,112,0,0,51,119,97,114,
+101,32,32,32,0,0,0,0,76,111,103,105,99,97,108,32,
+68,105,115,107,32,32,32,32,0,0,0,0,83,116,111,112,
+32,117,110,105,116,32,48,120,37,120,10,0,105,109,109,101,
+100,105,97,116,101,0,0,0,83,116,97,114,116,32,117,110,
+105,116,32,48,120,37,120,32,0,0,0,0,85,110,104,97,
+110,100,108,101,100,32,99,111,109,109,97,110,100,32,99,111,
+100,101,32,37,120,32,115,101,110,116,32,102,111,114,32,85,
+110,105,116,32,45,32,37,120,10,0,0,0,114,101,116,114,
+105,101,115,61,37,100,0,0,112,99,104,105,112,46,104,112,
+112,0,0,0,69,114,114,111,114,32,48,120,37,88,32,102,
+101,116,99,104,105,110,103,32,99,111,109,109,97,110,100,32,
+97,116,32,48,120,37,76,88,10,0,0,0,107,101,114,110,
+101,108,46,104,112,112,0,0,83,101,116,116,105,110,103,32,
+117,67,32,101,114,114,111,114,32,105,110,32,115,116,97,116,
+117,115,32,114,101,103,105,115,116,101,114,10,0,0,0,0,
 69,114,114,111,114,44,32,85,110,105,116,32,37,100,58,32,
-48,120,37,88,32,79,86,69,82,82,73,68,68,69,78,32,
-100,117,101,32,116,111,32,105,110,118,97,108,105,100,32,115,
-101,110,115,101,32,98,117,102,102,101,114,32,100,101,115,99,
-114,105,112,116,111,114,10,0,107,101,114,110,101,108,46,104,
-112,112,0,0,105,112,114,77,97,110,97,103,101,114,46,99,
-112,112,0,0,105,112,114,77,97,110,97,103,101,114,46,99,
-112,112,0,0,105,112,114,77,97,110,97,103,101,114,46,99,
-112,112,0,0,105,112,114,77,97,110,97,103,101,114,46,99,
-112,112,0,0,105,112,114,77,97,110,97,103,101,114,46,99,
-112,112,0,0,105,112,114,77,97,110,97,103,101,114,46,99,
-112,112,0,0,107,101,114,110,101,108,46,99,112,112,0,0,
-82,101,108,101,97,115,105,110,103,32,37,115,32,40,48,120,
-37,48,56,88,41,10,0,0,107,101,114,110,101,108,46,99,
-112,112,0,0,107,101,114,110,101,108,46,99,112,112,0,0,
-82,101,108,101,97,115,105,110,103,32,37,115,32,40,48,120,
-37,48,56,88,41,10,0,0,107,101,114,110,101,108,46,99,
-112,112,0,0,112,97,114,97,109,32,32,32,58,32,84,97,
-98,108,101,32,48,120,37,48,52,88,44,32,112,97,114,97,
-109,32,48,120,37,48,50,88,44,32,115,105,122,101,32,37,
-51,100,10,0,2,0,0,0,4,145,145,0,3,0,0,0,
-56,145,145,0,2,0,0,0,108,145,145,0,13,0,0,0,
-160,145,145,0,4,0,0,0,8,146,145,0,14,0,0,0,
-212,145,145,0,3,0,0,0,60,146,145,0,11,0,0,0,
-212,138,145,0,12,0,0,0,104,138,145,0,2,0,0,0,
-172,149,145,0,3,0,0,0,156,138,145,0,2,0,0,0,
-212,141,145,0,3,0,0,0,204,144,145,0,2,0,0,0,
-44,151,145,0,3,0,0,0,100,151,145,0,4,0,0,0,
-192,150,145,0,2,0,0,0,216,148,145,0,3,0,0,0,
-12,149,145,0,2,0,0,0,152,137,145,0,3,0,0,0,
-104,148,145,0,4,0,0,0,160,148,145,0,5,0,0,0,
-80,147,145,0,6,0,0,0,136,147,145,0,7,0,0,0,
-192,147,145,0,8,0,0,0,100,137,145,0,9,0,0,0,
-76,143,145,0,2,0,0,0,20,143,145,0,3,0,0,0,
-248,147,145,0,4,0,0,0,48,148,145,0,36,86,69,82,
-70,69,57,88,32,50,46,48,50,46,48,48,46,48,48,56,
-0,86,69,82,36,0,0,0,118,101,99,116,111,114,60,84,
-62,32,116,111,111,32,108,111,110,103,0,0,118,101,99,116,
-111,114,60,84,62,32,116,111,111,32,108,111,110,103,0,0,
-3,0,0,0,64,142,145,0,6,0,0,0,104,138,145,0,
-7,0,0,0,112,146,145,0,8,0,0,0,168,146,145,0,
-9,0,0,0,224,146,145,0,10,0,0,0,132,143,145,0,
-11,0,0,0,92,144,145,0,12,0,0,0,92,140,145,0,
-13,0,0,0,148,140,145,0,14,0,0,0,204,140,145,0,
-15,0,0,0,4,141,145,0,16,0,0,0,80,150,145,0,
-17,0,0,0,136,150,145,0,18,0,0,0,148,144,145,0,
-19,0,0,0,120,142,145,0,20,0,0,0,24,147,145,0,
-21,0,0,0,156,151,145,0,2,0,0,0,188,143,145,0,
-3,0,0,0,56,141,145,0,4,0,0,0,172,142,145,0,
-5,0,0,0,240,143,145,0,6,0,0,0,12,142,145,0,
-7,0,0,0,224,142,145,0,8,0,0,0,36,140,145,0,
-9,0,0,0,236,139,145,0,10,0,0,0,248,150,145,0,
-11,0,0,0,52,138,145,0,14,0,0,0,0,138,145,0,
-15,0,0,0,204,137,145,0,2,0,0,0,68,149,145,0,
-3,0,0,0,124,139,145,0,8,0,0,0,108,141,145,0,
-9,0,0,0,68,139,145,0,10,0,0,0,160,141,145,0,
-11,0,0,0,12,139,145,0,12,0,0,0,120,149,145,0,
-13,0,0,0,36,144,145,0,14,0,0,0,224,149,145,0,
-15,0,0,0,24,150,145,0,112,97,114,97,109,32,32,32,
+0,0,0,0,104,111,115,116,73,110,116,101,114,102,97,99,
+101,80,99,105,46,99,112,112,0,0,0,0,115,101,110,115,
+101,32,98,117,102,102,101,114,58,32,108,101,110,61,37,35,
+120,44,32,97,100,100,114,101,115,115,61,37,35,76,120,10,
+0,0,0,0,69,114,114,111,114,44,32,85,110,105,116,32,
+37,100,58,32,48,120,37,88,32,79,86,69,82,82,73,68,
+68,69,78,32,100,117,101,32,116,111,32,105,110,118,97,108,
+105,100,32,115,101,110,115,101,32,98,117,102,102,101,114,32,
+100,101,115,99,114,105,112,116,111,114,10,0,107,101,114,110,
+101,108,46,104,112,112,0,0,105,112,114,77,97,110,97,103,
+101,114,46,99,112,112,0,0,105,112,114,77,97,110,97,103,
+101,114,46,99,112,112,0,0,105,112,114,77,97,110,97,103,
+101,114,46,99,112,112,0,0,105,112,114,77,97,110,97,103,
+101,114,46,99,112,112,0,0,105,112,114,77,97,110,97,103,
+101,114,46,99,112,112,0,0,105,112,114,77,97,110,97,103,
+101,114,46,99,112,112,0,0,107,101,114,110,101,108,46,99,
+112,112,0,0,82,101,108,101,97,115,105,110,103,32,37,115,
+32,40,48,120,37,48,56,88,41,10,0,0,107,101,114,110,
+101,108,46,99,112,112,0,0,107,101,114,110,101,108,46,99,
+112,112,0,0,82,101,108,101,97,115,105,110,103,32,37,115,
+32,40,48,120,37,48,56,88,41,10,0,0,107,101,114,110,
+101,108,46,99,112,112,0,0,112,97,114,97,109,32,32,32,
 58,32,84,97,98,108,101,32,48,120,37,48,52,88,44,32,
 112,97,114,97,109,32,48,120,37,48,50,88,44,32,115,105,
-122,101,32,37,51,100,10,0,83,69,84,84,73,78,71,83,
-58,32,42,42,32,110,111,32,115,112,97,99,101,32,102,111,
-114,32,112,97,114,97,109,101,116,101,114,32,48,120,37,48,
-52,88,44,37,88,32,42,42,32,10,0,0,115,101,116,116,
-105,110,103,32,58,32,84,97,98,108,101,32,48,120,37,48,
-52,88,44,32,97,108,108,32,112,97,114,97,109,101,116,101,
-114,115,32,105,110,32,116,97,98,108,101,10,0,0,0,0,
+122,101,32,37,51,100,10,0,2,0,0,0,100,156,145,0,
+3,0,0,0,152,156,145,0,2,0,0,0,204,156,145,0,
+13,0,0,0,0,157,145,0,4,0,0,0,104,157,145,0,
+14,0,0,0,52,157,145,0,3,0,0,0,156,157,145,0,
+11,0,0,0,52,150,145,0,12,0,0,0,200,149,145,0,
+2,0,0,0,12,161,145,0,3,0,0,0,252,149,145,0,
+2,0,0,0,52,153,145,0,3,0,0,0,44,156,145,0,
+2,0,0,0,140,162,145,0,3,0,0,0,196,162,145,0,
+4,0,0,0,32,162,145,0,2,0,0,0,56,160,145,0,
+3,0,0,0,108,160,145,0,2,0,0,0,248,148,145,0,
+3,0,0,0,200,159,145,0,4,0,0,0,0,160,145,0,
+5,0,0,0,176,158,145,0,6,0,0,0,232,158,145,0,
+7,0,0,0,32,159,145,0,8,0,0,0,196,148,145,0,
+9,0,0,0,172,154,145,0,2,0,0,0,116,154,145,0,
+3,0,0,0,88,159,145,0,4,0,0,0,144,159,145,0,
+36,86,69,82,70,69,57,88,32,50,46,48,50,46,48,48,
+46,48,49,50,0,86,69,82,36,0,0,0,118,101,99,116,
+111,114,60,84,62,32,116,111,111,32,108,111,110,103,0,0,
+118,101,99,116,111,114,60,84,62,32,116,111,111,32,108,111,
+110,103,0,0,3,0,0,0,160,153,145,0,6,0,0,0,
+200,149,145,0,7,0,0,0,208,157,145,0,8,0,0,0,
+8,158,145,0,9,0,0,0,64,158,145,0,10,0,0,0,
+228,154,145,0,11,0,0,0,188,155,145,0,12,0,0,0,
+188,151,145,0,13,0,0,0,244,151,145,0,14,0,0,0,
+44,152,145,0,15,0,0,0,100,152,145,0,16,0,0,0,
+176,161,145,0,17,0,0,0,232,161,145,0,18,0,0,0,
+244,155,145,0,19,0,0,0,216,153,145,0,20,0,0,0,
+120,158,145,0,21,0,0,0,252,162,145,0,2,0,0,0,
+28,155,145,0,3,0,0,0,152,152,145,0,4,0,0,0,
+12,154,145,0,5,0,0,0,80,155,145,0,6,0,0,0,
+108,153,145,0,7,0,0,0,64,154,145,0,8,0,0,0,
+132,151,145,0,9,0,0,0,76,151,145,0,10,0,0,0,
+88,162,145,0,11,0,0,0,148,149,145,0,14,0,0,0,
+96,149,145,0,15,0,0,0,44,149,145,0,2,0,0,0,
+164,160,145,0,3,0,0,0,220,150,145,0,8,0,0,0,
+204,152,145,0,9,0,0,0,164,150,145,0,10,0,0,0,
+0,153,145,0,11,0,0,0,108,150,145,0,12,0,0,0,
+216,160,145,0,13,0,0,0,132,155,145,0,14,0,0,0,
+64,161,145,0,15,0,0,0,120,161,145,0,112,97,114,97,
+109,32,32,32,58,32,84,97,98,108,101,32,48,120,37,48,
+52,88,44,32,112,97,114,97,109,32,48,120,37,48,50,88,
+44,32,115,105,122,101,32,37,51,100,10,0,83,69,84,84,
+73,78,71,83,58,32,42,42,32,110,111,32,115,112,97,99,
+101,32,102,111,114,32,112,97,114,97,109,101,116,101,114,32,
+48,120,37,48,52,88,44,37,88,32,42,42,32,10,0,0,
 115,101,116,116,105,110,103,32,58,32,84,97,98,108,101,32,
-48,120,37,48,52,88,44,32,112,97,114,97,109,32,48,120,
-37,48,50,88,44,32,97,99,116,105,111,110,32,37,100,10,
-0,0,0,0,112,97,114,97,109,84,97,98,108,101,46,99,
-112,112,0,0,83,69,84,84,73,78,71,83,58,32,83,97,
-118,105,110,103,32,37,115,32,112,97,114,97,109,101,116,101,
-114,115,32,46,46,46,32,0,100,111,110,101,46,32,40,99,
-111,117,110,116,61,37,100,44,32,98,121,116,101,115,61,37,
-100,41,10,0,10,83,69,84,84,73,78,71,83,58,32,42,
-42,32,32,85,110,97,98,108,101,32,116,111,32,115,97,118,
-101,32,37,115,32,112,97,114,97,109,101,116,101,114,115,32,
-40,100,105,115,107,32,111,114,32,102,108,97,115,104,32,101,
-114,114,111,114,41,32,42,42,10,0,0,0,83,69,84,84,
-73,78,71,83,58,32,68,105,115,116,114,105,98,117,116,105,
-110,103,32,37,115,32,112,97,114,97,109,101,116,101,114,115,
-32,40,99,111,117,110,116,61,37,100,44,32,98,121,116,101,
-115,61,37,100,41,10,0,0,83,69,84,84,73,78,71,83,
-58,32,84,104,101,114,101,32,119,101,114,101,32,37,100,32,
-117,110,114,101,115,116,111,114,97,98,108,101,32,112,97,114,
-97,109,101,116,101,114,115,10,0,0,0,0,32,32,32,32,
-32,32,32,32,58,32,101,114,114,111,114,61,37,35,120,44,
-32,118,101,114,61,37,35,120,44,32,99,111,117,110,116,61,
-37,105,44,32,115,105,122,101,67,111,108,108,101,99,116,101,
-100,61,37,117,10,0,0,0,112,97,114,97,109,84,97,98,
+48,120,37,48,52,88,44,32,97,108,108,32,112,97,114,97,
+109,101,116,101,114,115,32,105,110,32,116,97,98,108,101,10,
+0,0,0,0,115,101,116,116,105,110,103,32,58,32,84,97,
+98,108,101,32,48,120,37,48,52,88,44,32,112,97,114,97,
+109,32,48,120,37,48,50,88,44,32,97,99,116,105,111,110,
+32,37,100,10,0,0,0,0,112,97,114,97,109,84,97,98,
 108,101,46,99,112,112,0,0,83,69,84,84,73,78,71,83,
-58,32,68,101,108,101,116,105,110,103,32,101,109,112,116,121,
-32,111,114,32,105,110,118,97,108,105,100,32,102,108,97,115,
-104,32,102,105,108,101,32,40,115,105,103,110,97,116,117,114,
-101,32,37,48,56,120,41,10,0,0,0,0,87,82,73,84,
-69,32,79,78,67,69,0,0,70,65,67,84,79,82,89,32,
-68,65,84,65,0,0,0,0,70,73,82,77,87,65,82,69,
-32,76,79,67,65,76,0,0,33,33,69,114,114,111,114,33,
-33,32,78,79,83,65,86,69,0,0,0,0,87,82,73,84,
-69,32,79,78,67,69,0,0,70,65,67,84,79,82,89,32,
-68,65,84,65,0,0,0,0,70,73,82,77,87,65,82,69,
-32,76,79,67,65,76,0,0,33,33,69,114,114,111,114,33,
-33,32,78,79,83,65,86,69,0,0,0,0,85,78,73,84,
-32,37,50,100,0,0,0,0,112,97,114,97,109,84,97,98,
-108,101,46,99,112,112,0,0,112,97,114,97,109,84,97,98,
-108,101,46,99,112,112,0,0,71,101,116,80,97,114,97,109,
-32,116,114,117,110,99,97,116,101,100,32,116,111,32,37,105,
-32,111,102,32,37,105,32,98,121,116,101,115,10,0,0,0,
-80,65,82,65,77,32,83,121,110,99,104,114,111,110,105,122,
-101,32,37,100,32,100,101,115,99,114,105,112,116,111,114,115,
-10,0,0,0,112,97,114,97,109,84,97,98,108,101,46,99,
-112,112,0,0,78,111,32,112,114,105,110,116,32,108,111,103,
-32,104,97,115,32,98,101,101,110,32,115,97,118,101,100,32,
-121,101,116,46,0,0,0,0,112,97,114,97,109,86,97,114,
-46,99,112,112,0,0,0,0,70,105,114,109,119,97,114,101,
-32,97,115,115,101,114,116,101,100,44,32,114,101,115,101,116,
-32,105,103,110,111,114,101,100,33,13,10,0,60,60,32,83,
-111,102,116,32,82,101,115,101,116,32,62,62,13,10,0,0,
-60,60,32,72,97,114,100,32,82,101,115,101,116,32,62,62,
-10,0,0,0,84,105,109,101,32,32,58,32,32,37,48,56,
-120,10,0,0,112,99,104,105,112,46,99,112,112,0,0,0,
-83,105,109,117,108,97,116,101,32,37,115,32,101,114,114,111,
-114,10,0,0,112,99,104,105,112,46,104,112,112,0,0,0,
-114,101,116,114,105,101,115,61,37,100,0,0,107,101,114,110,
-101,108,46,104,112,112,0,0,114,101,116,114,105,101,115,61,
-37,100,0,0,112,99,104,105,112,46,104,112,112,0,0,0,
-112,99,104,105,112,46,104,112,112,0,0,0,107,101,114,110,
-101,108,46,104,112,112,0,0,107,101,114,110,101,108,46,104,
-112,112,0,0,83,101,109,80,99,104,105,112,73,50,67,0,
+58,32,83,97,118,105,110,103,32,37,115,32,112,97,114,97,
+109,101,116,101,114,115,32,46,46,46,32,0,100,111,110,101,
+46,32,40,99,111,117,110,116,61,37,100,44,32,98,121,116,
+101,115,61,37,100,41,10,0,10,83,69,84,84,73,78,71,
+83,58,32,42,42,32,32,85,110,97,98,108,101,32,116,111,
+32,115,97,118,101,32,37,115,32,112,97,114,97,109,101,116,
+101,114,115,32,40,100,105,115,107,32,111,114,32,102,108,97,
+115,104,32,101,114,114,111,114,41,32,42,42,10,0,0,0,
+83,69,84,84,73,78,71,83,58,32,68,105,115,116,114,105,
+98,117,116,105,110,103,32,37,115,32,112,97,114,97,109,101,
+116,101,114,115,32,40,99,111,117,110,116,61,37,100,44,32,
+98,121,116,101,115,61,37,100,41,10,0,0,83,69,84,84,
+73,78,71,83,58,32,84,104,101,114,101,32,119,101,114,101,
+32,37,100,32,117,110,114,101,115,116,111,114,97,98,108,101,
+32,112,97,114,97,109,101,116,101,114,115,10,0,0,0,0,
+32,32,32,32,32,32,32,32,58,32,101,114,114,111,114,61,
+37,35,120,44,32,118,101,114,61,37,35,120,44,32,99,111,
+117,110,116,61,37,105,44,32,115,105,122,101,67,111,108,108,
+101,99,116,101,100,61,37,117,10,0,0,0,112,97,114,97,
+109,84,97,98,108,101,46,99,112,112,0,0,83,69,84,84,
+73,78,71,83,58,32,68,101,108,101,116,105,110,103,32,101,
+109,112,116,121,32,111,114,32,105,110,118,97,108,105,100,32,
+102,108,97,115,104,32,102,105,108,101,32,40,115,105,103,110,
+97,116,117,114,101,32,37,48,56,120,41,10,0,0,0,0,
+87,82,73,84,69,32,79,78,67,69,0,0,70,65,67,84,
+79,82,89,32,68,65,84,65,0,0,0,0,70,73,82,77,
+87,65,82,69,32,76,79,67,65,76,0,0,33,33,69,114,
+114,111,114,33,33,32,78,79,83,65,86,69,0,0,0,0,
+87,82,73,84,69,32,79,78,67,69,0,0,70,65,67,84,
+79,82,89,32,68,65,84,65,0,0,0,0,70,73,82,77,
+87,65,82,69,32,76,79,67,65,76,0,0,33,33,69,114,
+114,111,114,33,33,32,78,79,83,65,86,69,0,0,0,0,
+85,78,73,84,32,37,50,100,0,0,0,0,112,97,114,97,
+109,84,97,98,108,101,46,99,112,112,0,0,112,97,114,97,
+109,84,97,98,108,101,46,99,112,112,0,0,71,101,116,80,
+97,114,97,109,32,116,114,117,110,99,97,116,101,100,32,116,
+111,32,37,105,32,111,102,32,37,105,32,98,121,116,101,115,
+10,0,0,0,80,65,82,65,77,32,83,121,110,99,104,114,
+111,110,105,122,101,32,37,100,32,100,101,115,99,114,105,112,
+116,111,114,115,10,0,0,0,112,97,114,97,109,84,97,98,
+108,101,46,99,112,112,0,0,78,111,32,112,114,105,110,116,
+32,108,111,103,32,104,97,115,32,98,101,101,110,32,115,97,
+118,101,100,32,121,101,116,46,0,0,0,0,112,97,114,97,
+109,86,97,114,46,99,112,112,0,0,0,0,70,105,114,109,
+119,97,114,101,32,97,115,115,101,114,116,101,100,44,32,114,
+101,115,101,116,32,105,103,110,111,114,101,100,33,13,10,0,
+60,60,32,83,111,102,116,32,82,101,115,101,116,32,62,62,
+13,10,0,0,60,60,32,72,97,114,100,32,82,101,115,101,
+116,32,62,62,10,0,0,0,84,105,109,101,32,32,58,32,
+32,37,48,56,120,10,0,0,112,99,104,105,112,46,99,112,
+112,0,0,0,83,105,109,117,108,97,116,101,32,37,115,32,
+101,114,114,111,114,10,0,0,112,99,104,105,112,46,104,112,
+112,0,0,0,114,101,116,114,105,101,115,61,37,100,0,0,
+107,101,114,110,101,108,46,104,112,112,0,0,114,101,116,114,
+105,101,115,61,37,100,0,0,112,99,104,105,112,46,104,112,
+112,0,0,0,112,99,104,105,112,46,104,112,112,0,0,0,
+107,101,114,110,101,108,46,104,112,112,0,0,107,101,114,110,
+101,108,46,104,112,112,0,0,83,101,109,80,99,104,105,112,
+73,50,67,0,83,68,82,65,77,58,32,85,110,115,117,112,
+112,111,114,116,101,100,32,116,114,99,100,32,37,100,10,0,
 83,68,82,65,77,58,32,85,110,115,117,112,112,111,114,116,
-101,100,32,116,114,99,100,32,37,100,10,0,83,68,82,65,
-77,58,32,85,110,115,117,112,112,111,114,116,101,100,32,110,
-111,46,32,111,102,32,99,111,108,117,109,110,115,32,37,100,
-10,0,0,0,32,32,99,111,110,102,105,103,32,32,32,32,
-32,32,32,58,32,37,52,120,10,0,0,0,32,32,99,111,
-110,116,114,111,108,32,32,32,32,32,32,58,32,37,52,120,
-10,0,0,0,32,32,114,101,102,114,101,115,104,32,99,111,
-117,110,116,58,32,37,52,120,10,0,0,0,80,99,104,105,
-112,32,32,32,32,32,37,100,46,37,100,10,0,0,0,0,
-83,68,82,65,77,32,114,101,103,105,115,116,101,114,115,10,
-0,0,0,0,80,111,119,101,114,32,115,116,97,116,101,32,
-105,110,116,101,114,114,117,112,116,32,0,0,65,100,100,114,
-101,115,115,32,48,120,37,48,56,120,44,32,100,97,116,97,
-32,48,120,37,48,49,54,76,120,44,32,109,111,100,105,102,
-105,101,114,32,48,120,37,48,49,54,76,120,10,0,0,0,
-112,99,104,105,112,46,104,112,112,0,0,0,107,101,114,110,
-101,108,46,104,112,112,0,0,112,99,104,105,112,71,101,114,
-111,110,105,109,111,46,99,112,112,0,0,0,112,99,104,105,
+101,100,32,110,111,46,32,111,102,32,99,111,108,117,109,110,
+115,32,37,100,10,0,0,0,32,32,99,111,110,102,105,103,
+32,32,32,32,32,32,32,58,32,37,52,120,10,0,0,0,
+32,32,99,111,110,116,114,111,108,32,32,32,32,32,32,58,
+32,37,52,120,10,0,0,0,32,32,114,101,102,114,101,115,
+104,32,99,111,117,110,116,58,32,37,52,120,10,0,0,0,
+80,99,104,105,112,32,32,32,32,32,37,100,46,37,100,10,
+0,0,0,0,83,68,82,65,77,32,114,101,103,105,115,116,
+101,114,115,10,0,0,0,0,80,111,119,101,114,32,115,116,
+97,116,101,32,105,110,116,101,114,114,117,112,116,32,0,0,
+65,100,100,114,101,115,115,32,48,120,37,48,56,120,44,32,
+100,97,116,97,32,48,120,37,48,49,54,76,120,44,32,109,
+111,100,105,102,105,101,114,32,48,120,37,48,49,54,76,120,
+10,0,0,0,112,99,104,105,112,46,104,112,112,0,0,0,
+107,101,114,110,101,108,46,104,112,112,0,0,112,99,104,105,
 112,71,101,114,111,110,105,109,111,46,99,112,112,0,0,0,
-112,99,104,105,112,46,104,112,112,0,0,0,107,101,114,110,
-101,108,46,104,112,112,0,0,32,87,65,73,84,73,78,71,
-32,49,32,83,69,67,32,45,45,32,65,112,111,114,116,32,
-37,88,10,0,32,87,65,73,84,73,78,71,32,46,49,32,
-83,69,67,32,45,45,32,65,112,111,114,116,32,37,88,10,
-0,0,0,0,84,104,101,114,101,32,119,101,114,101,32,37,
+112,99,104,105,112,71,101,114,111,110,105,109,111,46,99,112,
+112,0,0,0,112,99,104,105,112,46,104,112,112,0,0,0,
+107,101,114,110,101,108,46,104,112,112,0,0,32,87,65,73,
+84,73,78,71,32,49,32,83,69,67,32,45,45,32,65,112,
+111,114,116,32,37,88,10,0,32,87,65,73,84,73,78,71,
+32,46,49,32,83,69,67,32,45,45,32,65,112,111,114,116,
+32,37,88,10,0,0,0,0,84,104,101,114,101,32,119,101,
+114,101,32,37,105,32,101,120,116,114,97,32,65,116,97,103,
+115,33,10,0,84,104,101,114,101,32,119,101,114,101,32,37,
+105,32,101,120,116,114,97,32,100,97,116,97,84,97,103,115,
+33,10,0,0,84,104,101,114,101,32,119,101,114,101,32,37,
 105,32,101,120,116,114,97,32,65,116,97,103,115,33,10,0,
 84,104,101,114,101,32,119,101,114,101,32,37,105,32,101,120,
 116,114,97,32,100,97,116,97,84,97,103,115,33,10,0,0,
-84,104,101,114,101,32,119,101,114,101,32,37,105,32,101,120,
-116,114,97,32,65,116,97,103,115,33,10,0,84,104,101,114,
-101,32,119,101,114,101,32,37,105,32,101,120,116,114,97,32,
-100,97,116,97,84,97,103,115,33,10,0,0,112,111,114,116,
-81,117,101,117,101,77,97,110,97,103,101,114,46,99,112,112,
-0,0,0,0,112,111,114,116,81,117,101,117,101,77,97,110,
-97,103,101,114,46,99,112,112,0,0,0,0,68,101,102,101,
-114,114,101,100,32,80,67,73,32,114,101,115,101,116,10,0,
+112,111,114,116,81,117,101,117,101,77,97,110,97,103,101,114,
+46,99,112,112,0,0,0,0,112,111,114,116,81,117,101,117,
+101,77,97,110,97,103,101,114,46,99,112,112,0,0,0,0,
 68,101,102,101,114,114,101,100,32,80,67,73,32,114,101,115,
-101,116,10,0,112,111,114,116,81,117,101,117,101,77,97,110,
-97,103,101,114,46,99,112,112,0,0,0,0,83,105,109,117,
-108,97,116,101,32,37,115,32,101,114,114,111,114,44,32,112,
-111,114,116,32,37,100,10,0,112,111,114,116,81,117,101,117,
+101,116,10,0,68,101,102,101,114,114,101,100,32,80,67,73,
+32,114,101,115,101,116,10,0,112,111,114,116,81,117,101,117,
 101,77,97,110,97,103,101,114,46,99,112,112,0,0,0,0,
-112,111,114,116,81,117,101,117,101,77,97,110,97,103,101,114,
-46,99,112,112,0,0,0,0,82,101,98,117,105,108,100,101,
-114,0,0,0,114,101,98,117,105,108,100,101,114,46,99,112,
-112,0,0,0,10,85,110,105,116,32,37,100,32,37,115,32,
-83,84,65,82,84,69,68,10,0,0,0,0,107,101,114,110,
-101,108,46,104,112,112,0,0,114,101,98,117,105,108,100,101,
-114,46,99,112,112,0,0,0,114,101,98,117,105,108,100,101,
-114,46,99,112,112,0,0,0,114,101,98,117,105,108,100,101,
-114,46,99,112,112,0,0,0,32,83,116,97,114,116,32,83,
-116,114,105,112,101,32,35,58,32,37,48,56,76,120,10,0,
-114,101,98,117,105,108,100,101,114,46,99,112,112,0,0,0,
-10,37,115,32,69,82,82,79,82,44,32,116,105,109,101,58,
-32,37,120,32,40,69,114,114,111,114,67,111,100,101,41,58,
-32,37,120,10,0,0,0,0,117,110,105,116,61,37,100,44,
-32,112,111,114,116,61,37,100,0,0,0,0,107,101,114,110,
-101,108,46,104,112,112,0,0,32,80,111,114,116,32,37,100,
-32,58,32,68,111,119,110,103,114,97,100,105,110,103,32,102,
-114,111,109,32,85,68,77,65,32,37,100,32,116,111,32,37,
-100,10,0,0,107,101,114,110,101,108,46,104,112,112,0,0,
-114,101,98,117,105,108,100,101,114,46,99,112,112,0,0,0,
-107,101,114,110,101,108,46,104,112,112,0,0,83,101,99,116,
-111,114,32,79,118,101,114,119,114,105,116,101,32,40,112,111,
-114,116,44,32,111,102,102,115,41,58,32,37,120,44,32,37,
-100,10,0,0,112,111,114,116,61,37,100,0,0,0,0,0,
-114,101,98,117,105,108,100,101,114,46,99,112,112,0,0,0,
-107,101,114,110,101,108,46,104,112,112,0,0,82,101,99,111,
-110,115,116,114,117,99,116,32,40,114,101,112,97,105,114,41,
-32,115,116,114,105,112,101,108,101,116,58,32,37,48,56,76,
-120,10,0,0,107,101,114,110,101,108,46,104,112,112,0,0,
-91,37,99,58,37,120,93,10,0,0,0,0,114,101,98,117,
+83,105,109,117,108,97,116,101,32,37,115,32,101,114,114,111,
+114,44,32,112,111,114,116,32,37,100,10,0,112,111,114,116,
+81,117,101,117,101,77,97,110,97,103,101,114,46,99,112,112,
+0,0,0,0,112,111,114,116,81,117,101,117,101,77,97,110,
+97,103,101,114,46,99,112,112,0,0,0,0,114,101,111,114,
+100,101,114,84,114,101,101,46,67,80,80,0,82,101,98,117,
+105,108,100,101,114,0,0,0,114,101,98,117,105,108,100,101,
+114,46,99,112,112,0,0,0,10,85,110,105,116,32,37,100,
+32,37,115,32,83,84,65,82,84,69,68,10,0,0,0,0,
+107,101,114,110,101,108,46,104,112,112,0,0,114,101,98,117,
 105,108,100,101,114,46,99,112,112,0,0,0,114,101,98,117,
 105,108,100,101,114,46,99,112,112,0,0,0,114,101,98,117,
-105,108,100,101,114,46,99,112,112,0,0,0,107,101,114,110,
-101,108,46,104,112,112,0,0,114,101,98,117,105,108,100,101,
-114,46,99,112,112,0,0,0,10,85,110,105,116,32,37,100,
-32,37,115,32,83,84,79,80,80,69,68,10,0,0,0,0,
-107,101,114,110,101,108,46,104,112,112,0,0,82,101,98,117,
-105,108,100,101,114,82,97,105,100,49,0,0,82,101,98,117,
-105,108,100,101,114,82,97,105,100,53,0,0,114,101,98,117,
-105,108,100,101,114,46,99,112,112,0,0,0,86,101,114,105,
-102,105,101,114,0,0,0,0,114,101,98,117,105,108,100,101,
-114,46,99,112,112,0,0,0,114,101,98,117,105,108,100,101,
-114,46,99,112,112,0,0,0,86,69,82,73,70,89,32,40,
-80,65,82,73,84,89,41,32,69,82,82,79,82,10,0,0,
-83,99,114,117,98,98,101,114,0,0,0,0,107,101,114,110,
-101,108,46,104,112,112,0,0,77,105,103,114,97,116,101,114,
+105,108,100,101,114,46,99,112,112,0,0,0,32,83,116,97,
+114,116,32,83,116,114,105,112,101,32,35,58,32,37,48,56,
+76,120,10,0,114,101,98,117,105,108,100,101,114,46,99,112,
+112,0,0,0,10,37,115,32,69,82,82,79,82,44,32,116,
+105,109,101,58,32,37,120,32,40,69,114,114,111,114,67,111,
+100,101,41,58,32,37,120,10,0,0,0,0,117,110,105,116,
+61,37,100,44,32,112,111,114,116,61,37,100,0,0,0,0,
+107,101,114,110,101,108,46,104,112,112,0,0,32,80,111,114,
+116,32,37,100,32,58,32,68,111,119,110,103,114,97,100,105,
+110,103,32,102,114,111,109,32,85,68,77,65,32,37,100,32,
+116,111,32,37,100,10,0,0,107,101,114,110,101,108,46,104,
+112,112,0,0,114,101,98,117,105,108,100,101,114,46,99,112,
+112,0,0,0,107,101,114,110,101,108,46,104,112,112,0,0,
+83,101,99,116,111,114,32,79,118,101,114,119,114,105,116,101,
+32,40,112,111,114,116,44,32,111,102,102,115,41,58,32,37,
+120,44,32,37,100,10,0,0,112,111,114,116,61,37,100,0,
 0,0,0,0,114,101,98,117,105,108,100,101,114,46,99,112,
-112,0,0,0,32,32,68,117,112,108,105,99,97,116,101,0,
-78,111,32,68,67,66,32,40,74,66,79,68,41,0,0,0,
-86,97,108,105,100,32,68,67,66,0,0,0,32,32,77,97,
-116,99,104,101,100,0,0,0,80,114,111,99,101,115,115,101,
-100,0,0,0,85,110,117,115,97,98,108,101,32,68,67,66,
-0,0,0,0,79,114,112,104,97,110,32,68,67,66,0,0,
-42,42,32,69,114,114,111,114,32,48,120,37,88,32,100,117,
-114,105,110,103,32,68,67,66,32,114,101,45,119,114,105,116,
-101,32,40,114,111,108,108,99,97,108,108,32,115,99,114,117,
-98,41,10,0,42,42,32,84,104,101,114,101,32,119,101,114,
-101,32,37,105,32,68,67,66,32,114,101,45,119,114,105,116,
-101,115,32,105,110,32,116,104,105,115,32,114,111,108,108,99,
-97,108,108,10,0,0,0,0,117,110,105,116,61,37,100,44,
-32,112,111,114,116,61,37,100,0,0,0,0,82,101,99,111,
-118,101,114,105,110,103,32,85,110,102,105,110,105,115,104,101,
-100,32,65,114,114,97,121,32,85,112,100,97,116,101,44,32,
-85,78,73,84,32,37,50,100,44,32,100,101,116,101,99,116,
-101,100,32,111,110,32,112,111,114,116,32,37,105,10,0,0,
-42,42,32,83,98,117,102,32,102,97,105,108,117,114,101,32,
-100,101,116,101,99,116,101,100,46,32,80,111,114,116,32,115,
-99,97,110,32,115,107,105,112,112,101,100,46,10,0,0,0,
-82,111,108,108,99,97,108,108,44,32,66,101,103,105,110,32,
-32,58,32,102,105,110,100,32,100,114,105,118,101,115,44,32,
-114,101,97,100,32,68,67,66,115,10,0,0,73,109,112,111,
-114,116,101,100,32,85,110,105,116,58,10,0,84,104,101,114,
-101,32,119,101,114,101,32,37,105,32,68,67,66,32,114,101,
-45,119,114,105,116,101,115,32,105,110,32,116,104,105,115,32,
-114,111,108,108,99,97,108,108,10,0,0,0,69,114,114,111,
-114,32,48,120,37,88,32,100,117,114,105,110,103,32,68,67,
-66,32,114,101,45,119,114,105,116,101,32,40,114,111,108,108,
-99,97,108,108,32,115,99,114,117,98,41,10,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,112,111,114,116,32,37,50,100,58,32,67,98,
-111,100,32,79,102,102,108,105,110,101,10,0,10,82,111,108,
-108,99,97,108,108,44,32,109,105,100,100,108,101,32,58,32,
-99,104,101,99,107,32,68,67,66,115,44,32,101,120,112,111,
-114,116,32,74,66,79,68,115,10,0,0,0,112,111,114,116,
-32,37,50,100,58,32,37,115,10,0,0,0,82,111,108,108,
-99,97,108,108,32,100,101,115,99,114,105,112,116,111,114,32,
-98,108,111,99,107,44,32,110,117,109,68,101,115,99,114,105,
-112,116,111,114,115,61,37,105,10,0,0,0,114,111,108,108,
-99,97,108,108,46,99,112,112,0,0,0,0,10,82,111,108,
-108,99,97,108,108,44,32,102,105,110,105,115,104,32,58,32,
-109,97,107,101,32,82,65,73,68,32,85,110,105,116,115,10,
-0,0,0,0,82,79,76,76,67,65,76,76,58,32,67,114,
-101,97,116,101,85,110,105,116,32,102,97,105,108,101,100,44,
-32,112,111,114,116,109,97,112,32,48,120,37,48,52,88,10,
-0,0,0,0,91,37,50,105,93,32,115,117,98,115,61,37,
-105,44,32,99,102,103,61,37,35,104,120,44,32,115,116,114,
-105,112,76,111,103,50,61,37,35,104,120,44,32,112,111,114,
-116,61,37,105,44,32,108,111,103,68,114,118,61,37,105,44,
-32,109,111,100,101,61,37,35,104,120,44,32,114,98,108,100,
-37,37,61,37,105,44,10,32,32,32,32,32,32,79,102,102,
-115,101,116,61,37,35,48,56,120,44,32,99,97,112,61,37,
-35,48,56,120,44,32,114,115,118,100,61,37,35,104,120,32,
-37,35,104,120,44,32,102,108,97,103,115,61,37,35,104,120,
+112,0,0,0,107,101,114,110,101,108,46,104,112,112,0,0,
+82,101,99,111,110,115,116,114,117,99,116,32,40,114,101,112,
+97,105,114,41,32,115,116,114,105,112,101,108,101,116,58,32,
+37,48,56,76,120,10,0,0,107,101,114,110,101,108,46,104,
+112,112,0,0,114,101,98,117,105,108,100,101,114,46,99,112,
+112,0,0,0,114,101,98,117,105,108,100,101,114,46,99,112,
+112,0,0,0,114,101,98,117,105,108,100,101,114,46,99,112,
+112,0,0,0,107,101,114,110,101,108,46,104,112,112,0,0,
+114,101,98,117,105,108,100,101,114,46,99,112,112,0,0,0,
+10,85,110,105,116,32,37,100,32,37,115,32,83,84,79,80,
+80,69,68,10,0,0,0,0,107,101,114,110,101,108,46,104,
+112,112,0,0,82,101,98,117,105,108,100,101,114,82,97,105,
+100,49,0,0,82,101,98,117,105,108,100,101,114,82,97,105,
+100,53,0,0,114,101,98,117,105,108,100,101,114,46,99,112,
+112,0,0,0,86,101,114,105,102,105,101,114,0,0,0,0,
+114,101,98,117,105,108,100,101,114,46,99,112,112,0,0,0,
+114,101,98,117,105,108,100,101,114,46,99,112,112,0,0,0,
+86,69,82,73,70,89,32,40,80,65,82,73,84,89,41,32,
+69,82,82,79,82,10,0,0,83,99,114,117,98,98,101,114,
+0,0,0,0,107,101,114,110,101,108,46,104,112,112,0,0,
+77,105,103,114,97,116,101,114,0,0,0,0,114,101,98,117,
+105,108,100,101,114,46,99,112,112,0,0,0,32,32,68,117,
+112,108,105,99,97,116,101,0,78,111,32,68,67,66,32,40,
+74,66,79,68,41,0,0,0,86,97,108,105,100,32,68,67,
+66,0,0,0,32,32,77,97,116,99,104,101,100,0,0,0,
+80,114,111,99,101,115,115,101,100,0,0,0,85,110,117,115,
+97,98,108,101,32,68,67,66,0,0,0,0,79,114,112,104,
+97,110,32,68,67,66,0,0,42,42,32,69,114,114,111,114,
+32,48,120,37,88,32,100,117,114,105,110,103,32,68,67,66,
+32,114,101,45,119,114,105,116,101,32,40,114,111,108,108,99,
+97,108,108,32,115,99,114,117,98,41,10,0,42,42,32,84,
+104,101,114,101,32,119,101,114,101,32,37,105,32,68,67,66,
+32,114,101,45,119,114,105,116,101,115,32,105,110,32,116,104,
+105,115,32,114,111,108,108,99,97,108,108,10,0,0,0,0,
+117,110,105,116,61,37,100,44,32,112,111,114,116,61,37,100,
+0,0,0,0,82,101,99,111,118,101,114,105,110,103,32,85,
+110,102,105,110,105,115,104,101,100,32,65,114,114,97,121,32,
+85,112,100,97,116,101,44,32,85,78,73,84,32,37,50,100,
+44,32,100,101,116,101,99,116,101,100,32,111,110,32,112,111,
+114,116,32,37,105,10,0,0,42,42,32,83,98,117,102,32,
+102,97,105,108,117,114,101,32,100,101,116,101,99,116,101,100,
+46,32,80,111,114,116,32,115,99,97,110,32,115,107,105,112,
+112,101,100,46,10,0,0,0,82,111,108,108,99,97,108,108,
+44,32,66,101,103,105,110,32,32,58,32,102,105,110,100,32,
+100,114,105,118,101,115,44,32,114,101,97,100,32,68,67,66,
+115,10,0,0,73,109,112,111,114,116,101,100,32,85,110,105,
+116,58,10,0,84,104,101,114,101,32,119,101,114,101,32,37,
+105,32,68,67,66,32,114,101,45,119,114,105,116,101,115,32,
+105,110,32,116,104,105,115,32,114,111,108,108,99,97,108,108,
+10,0,0,0,69,114,114,111,114,32,48,120,37,88,32,100,
+117,114,105,110,103,32,68,67,66,32,114,101,45,119,114,105,
+116,101,32,40,114,111,108,108,99,97,108,108,32,115,99,114,
+117,98,41,10,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,112,111,114,116,
+32,37,50,100,58,32,67,98,111,100,32,79,102,102,108,105,
+110,101,10,0,10,82,111,108,108,99,97,108,108,44,32,109,
+105,100,100,108,101,32,58,32,99,104,101,99,107,32,68,67,
+66,115,44,32,101,120,112,111,114,116,32,74,66,79,68,115,
+10,0,0,0,112,111,114,116,32,37,50,100,58,32,37,115,
+10,0,0,0,82,111,108,108,99,97,108,108,32,100,101,115,
+99,114,105,112,116,111,114,32,98,108,111,99,107,44,32,110,
+117,109,68,101,115,99,114,105,112,116,111,114,115,61,37,105,
 10,0,0,0,114,111,108,108,99,97,108,108,46,99,112,112,
-0,0,0,0,82,111,108,108,99,97,108,108,32,101,114,114,
-111,114,58,32,90,101,114,111,32,108,101,110,103,116,104,32,
-71,85,73,68,44,32,112,111,114,116,32,37,50,100,10,0,
-112,111,114,116,32,37,50,100,58,32,37,115,10,0,0,0,
-112,111,114,116,32,37,50,100,58,32,78,101,101,100,115,32,
-65,114,114,97,121,32,85,112,100,97,116,101,32,99,111,109,
-112,108,101,116,105,111,110,46,10,0,0,0,112,111,114,116,
-32,37,50,100,58,32,37,115,32,40,111,102,32,112,111,114,
-116,61,37,100,41,46,32,85,112,100,97,116,101,32,99,111,
-117,110,116,115,58,32,37,117,44,32,37,117,10,0,0,0,
-10,13,32,42,32,42,32,42,32,85,110,101,120,112,101,99,
-116,101,100,32,73,110,116,101,114,114,117,112,116,32,42,32,
-42,32,42,10,13,0,0,0,10,13,32,42,32,42,32,42,
-32,69,120,99,101,112,116,105,111,110,32,73,110,116,101,114,
-114,117,112,116,32,42,32,42,32,42,10,13,0,0,0,0,
-13,10,13,10,32,62,62,62,32,105,110,105,116,105,97,108,
-105,122,105,110,103,32,112,114,105,110,116,66,117,102,32,60,
-60,60,13,10,0,0,0,0,94,94,94,32,37,105,32,99,
-104,97,114,115,32,114,101,116,97,105,110,101,100,32,102,114,
-111,109,32,111,108,100,32,112,114,105,110,116,76,111,103,32,
-94,94,94,13,10,0,0,0,115,101,114,105,97,108,73,79,
-46,99,112,112,0,0,0,0,83,97,118,105,110,103,32,80,
-82,73,78,84,76,79,71,44,32,116,105,109,101,61,37,105,
-32,46,46,46,32,0,0,0,37,105,32,68,111,110,101,46,
-10,0,0,0,115,101,114,105,97,108,73,79,46,99,112,112,
-0,0,0,0,77,117,116,83,112,105,78,86,82,97,109,0,
-107,101,114,110,101,108,46,104,112,112,0,0,83,80,68,32,
-99,104,101,99,107,32,115,117,109,32,101,114,114,111,114,58,
-48,120,37,120,32,98,121,116,101,115,10,0,87,101,32,117,
-115,101,32,111,110,108,121,32,54,52,32,98,105,116,32,100,
-97,116,97,32,119,105,100,116,104,46,32,116,104,101,32,100,
-101,118,105,99,101,32,104,97,115,32,58,37,100,32,98,105,
-116,115,10,0,85,110,115,117,112,112,111,114,116,101,100,32,
-67,65,83,32,108,97,116,101,110,99,121,32,58,48,120,37,
+0,0,0,0,10,82,111,108,108,99,97,108,108,44,32,102,
+105,110,105,115,104,32,58,32,109,97,107,101,32,82,65,73,
+68,32,85,110,105,116,115,10,0,0,0,0,82,79,76,76,
+67,65,76,76,58,32,67,114,101,97,116,101,85,110,105,116,
+32,102,97,105,108,101,100,44,32,112,111,114,116,109,97,112,
+32,48,120,37,48,52,88,10,0,0,0,0,91,37,50,105,
+93,32,115,117,98,115,61,37,105,44,32,99,102,103,61,37,
+35,104,120,44,32,115,116,114,105,112,76,111,103,50,61,37,
+35,104,120,44,32,112,111,114,116,61,37,105,44,32,108,111,
+103,68,114,118,61,37,105,44,32,109,111,100,101,61,37,35,
+104,120,44,32,114,98,108,100,37,37,61,37,105,44,10,32,
+32,32,32,32,32,79,102,102,115,101,116,61,37,35,48,56,
+120,44,32,99,97,112,61,37,35,48,56,120,44,32,114,115,
+118,100,61,37,35,104,120,32,37,35,104,120,44,32,102,108,
+97,103,115,61,37,35,104,120,10,0,0,0,114,111,108,108,
+99,97,108,108,46,99,112,112,0,0,0,0,82,111,108,108,
+99,97,108,108,32,101,114,114,111,114,58,32,90,101,114,111,
+32,108,101,110,103,116,104,32,71,85,73,68,44,32,112,111,
+114,116,32,37,50,100,10,0,112,111,114,116,32,37,50,100,
+58,32,37,115,10,0,0,0,112,111,114,116,32,37,50,100,
+58,32,78,101,101,100,115,32,65,114,114,97,121,32,85,112,
+100,97,116,101,32,99,111,109,112,108,101,116,105,111,110,46,
+10,0,0,0,112,111,114,116,32,37,50,100,58,32,37,115,
+32,40,111,102,32,112,111,114,116,61,37,100,41,46,32,85,
+112,100,97,116,101,32,99,111,117,110,116,115,58,32,37,117,
+44,32,37,117,10,0,0,0,10,13,32,42,32,42,32,42,
+32,85,110,101,120,112,101,99,116,101,100,32,73,110,116,101,
+114,114,117,112,116,32,42,32,42,32,42,10,13,0,0,0,
+10,13,32,42,32,42,32,42,32,69,120,99,101,112,116,105,
+111,110,32,73,110,116,101,114,114,117,112,116,32,42,32,42,
+32,42,10,13,0,0,0,0,13,10,13,10,32,62,62,62,
+32,105,110,105,116,105,97,108,105,122,105,110,103,32,112,114,
+105,110,116,66,117,102,32,60,60,60,13,10,0,0,0,0,
+94,94,94,32,37,105,32,99,104,97,114,115,32,114,101,116,
+97,105,110,101,100,32,102,114,111,109,32,111,108,100,32,112,
+114,105,110,116,76,111,103,32,94,94,94,13,10,0,0,0,
+115,101,114,105,97,108,73,79,46,99,112,112,0,0,0,0,
+83,97,118,105,110,103,32,80,82,73,78,84,76,79,71,44,
+32,116,105,109,101,61,37,105,32,46,46,46,32,0,0,0,
+37,105,32,68,111,110,101,46,10,0,0,0,115,101,114,105,
+97,108,73,79,46,99,112,112,0,0,0,0,77,117,116,83,
+112,105,78,86,82,97,109,0,107,101,114,110,101,108,46,104,
+112,112,0,0,83,80,68,32,99,104,101,99,107,32,115,117,
+109,32,101,114,114,111,114,58,48,120,37,120,32,98,121,116,
+101,115,10,0,87,101,32,117,115,101,32,111,110,108,121,32,
+54,52,32,98,105,116,32,100,97,116,97,32,119,105,100,116,
+104,46,32,116,104,101,32,100,101,118,105,99,101,32,104,97,
+115,32,58,37,100,32,98,105,116,115,10,0,85,110,115,117,
+112,112,111,114,116,101,100,32,67,65,83,32,108,97,116,101,
+110,99,121,32,58,48,120,37,120,32,10,0,85,110,115,117,
+112,112,111,114,116,101,100,32,116,114,112,32,58,48,120,37,
+120,32,10,0,77,111,100,117,108,101,32,104,97,115,32,110,
+111,110,45,105,100,101,110,116,105,99,97,108,32,98,97,110,
+107,115,40,114,111,119,115,41,58,48,120,37,120,32,10,0,
+85,110,115,117,112,112,111,114,116,101,100,32,83,68,82,65,
+77,32,99,121,99,108,101,32,116,105,109,101,58,48,120,37,
 120,32,10,0,85,110,115,117,112,112,111,114,116,101,100,32,
-116,114,112,32,58,48,120,37,120,32,10,0,77,111,100,117,
+110,111,32,111,102,32,98,97,110,107,115,47,114,111,119,32,
+58,48,120,37,120,32,10,0,73,110,115,117,102,102,105,99,
+105,101,110,116,32,83,80,68,32,100,97,116,97,58,48,120,
+37,120,32,98,121,116,101,115,10,0,0,0,85,110,115,117,
+112,112,111,114,116,101,100,32,100,97,116,97,32,119,105,100,
+116,104,58,48,120,37,120,32,10,0,0,0,85,110,115,117,
+112,112,111,114,116,101,100,32,101,114,114,111,114,32,100,101,
+116,101,99,116,105,111,110,32,115,99,104,101,109,101,58,48,
+120,37,120,32,10,0,0,0,85,110,115,117,112,112,111,114,
+116,101,100,32,77,111,100,117,108,101,32,97,116,116,114,105,
+98,117,116,101,115,32,58,48,120,37,120,32,10,0,0,0,
+85,110,100,101,102,105,110,101,100,32,116,114,112,32,58,48,
+120,37,120,32,10,0,0,0,73,110,99,111,109,112,97,116,
+105,98,108,101,32,77,101,109,111,114,121,32,116,121,112,101,
+32,58,48,120,37,120,32,10,0,0,0,0,77,111,100,117,
 108,101,32,104,97,115,32,110,111,110,45,105,100,101,110,116,
-105,99,97,108,32,98,97,110,107,115,40,114,111,119,115,41,
-58,48,120,37,120,32,10,0,85,110,115,117,112,112,111,114,
-116,101,100,32,83,68,82,65,77,32,99,121,99,108,101,32,
-116,105,109,101,58,48,120,37,120,32,10,0,85,110,115,117,
-112,112,111,114,116,101,100,32,110,111,32,111,102,32,98,97,
-110,107,115,47,114,111,119,32,58,48,120,37,120,32,10,0,
-73,110,115,117,102,102,105,99,105,101,110,116,32,83,80,68,
-32,100,97,116,97,58,48,120,37,120,32,98,121,116,101,115,
-10,0,0,0,85,110,115,117,112,112,111,114,116,101,100,32,
-100,97,116,97,32,119,105,100,116,104,58,48,120,37,120,32,
-10,0,0,0,85,110,115,117,112,112,111,114,116,101,100,32,
-101,114,114,111,114,32,100,101,116,101,99,116,105,111,110,32,
-115,99,104,101,109,101,58,48,120,37,120,32,10,0,0,0,
-85,110,115,117,112,112,111,114,116,101,100,32,77,111,100,117,
-108,101,32,97,116,116,114,105,98,117,116,101,115,32,58,48,
-120,37,120,32,10,0,0,0,85,110,100,101,102,105,110,101,
-100,32,116,114,112,32,58,48,120,37,120,32,10,0,0,0,
-73,110,99,111,109,112,97,116,105,98,108,101,32,77,101,109,
-111,114,121,32,116,121,112,101,32,58,48,120,37,120,32,10,
-0,0,0,0,77,111,100,117,108,101,32,104,97,115,32,110,
-111,110,45,105,100,101,110,116,105,99,97,108,47,117,110,115,
-117,112,112,111,114,116,101,100,32,98,97,110,107,115,40,99,
-111,108,117,109,110,115,41,58,48,120,37,120,32,10,0,0,
-85,110,115,117,112,112,111,114,116,101,100,32,77,111,100,117,
-108,101,32,82,111,119,115,58,48,120,37,120,32,10,0,0,
-85,110,115,117,112,112,111,114,116,101,100,32,118,111,108,116,
-97,103,101,32,105,110,116,101,114,102,97,99,101,58,48,120,
-37,120,32,10,0,0,0,0,78,111,32,115,101,108,102,32,
-114,101,102,114,101,115,104,32,102,111,114,32,68,73,77,77,
-32,58,48,120,37,120,32,10,0,0,0,0,85,110,115,117,
-112,112,111,114,116,101,100,32,98,117,114,115,116,32,108,101,
-110,103,116,104,32,58,48,120,37,120,32,10,0,0,0,0,
-85,110,115,117,112,112,111,114,116,101,100,32,67,83,32,108,
-97,116,101,110,99,121,32,58,48,120,37,120,32,10,0,0,
-85,110,115,117,112,112,111,114,116,101,100,32,87,69,32,108,
-97,116,101,110,99,121,32,58,48,120,37,120,32,10,0,0,
-85,110,100,101,102,105,110,101,100,32,116,114,99,100,32,58,
+105,99,97,108,47,117,110,115,117,112,112,111,114,116,101,100,
+32,98,97,110,107,115,40,99,111,108,117,109,110,115,41,58,
+48,120,37,120,32,10,0,0,85,110,115,117,112,112,111,114,
+116,101,100,32,77,111,100,117,108,101,32,82,111,119,115,58,
 48,120,37,120,32,10,0,0,85,110,115,117,112,112,111,114,
-116,101,100,32,116,114,99,100,32,58,48,120,37,120,32,10,
+116,101,100,32,118,111,108,116,97,103,101,32,105,110,116,101,
+114,102,97,99,101,58,48,120,37,120,32,10,0,0,0,0,
+78,111,32,115,101,108,102,32,114,101,102,114,101,115,104,32,
+102,111,114,32,68,73,77,77,32,58,48,120,37,120,32,10,
 0,0,0,0,85,110,115,117,112,112,111,114,116,101,100,32,
-99,108,111,99,107,32,100,101,108,97,121,32,102,111,114,32,
-98,97,99,107,32,116,111,32,98,97,99,107,32,114,97,110,
-100,111,109,32,99,111,108,117,109,110,32,97,100,100,114,101,
-115,115,58,48,120,37,120,32,10,0,0,0,115,116,114,105,
-112,101,77,97,110,97,103,101,114,46,99,112,112,0,0,0,
-65,117,116,111,32,83,112,97,114,101,32,84,97,115,107,0,
-66,97,99,107,103,114,111,117,110,100,32,84,97,115,107,0,
-65,117,116,111,32,67,108,101,97,110,32,84,97,115,107,0,
-80,111,114,116,32,69,114,114,111,114,32,72,97,110,100,108,
-101,114,32,84,97,115,107,0,81,117,101,117,101,66,117,102,
-102,101,114,90,101,114,111,0,83,101,99,111,110,100,84,105,
-109,101,114,0,80,114,105,110,116,76,111,103,84,105,109,101,
-114,0,0,0,81,117,101,117,101,80,111,114,116,73,112,114,
-69,114,114,111,114,0,0,0,81,117,101,117,101,79,98,106,
-101,99,116,68,101,108,101,116,101,0,0,0,81,117,101,117,
-101,80,111,114,116,83,99,97,110,0,0,0,67,111,109,109,
-97,110,100,32,84,97,115,107,0,0,0,0,66,117,102,102,
-101,114,32,90,101,114,111,32,84,97,115,107,0,0,0,0,
-70,108,117,115,104,32,77,111,110,105,116,111,114,32,84,97,
-115,107,0,0,67,111,109,109,97,110,100,32,69,114,114,111,
-114,32,72,97,110,100,108,101,114,32,84,97,115,107,0,0,
-68,101,98,117,103,32,84,97,115,107,0,0,69,118,101,110,
-116,70,108,97,103,115,83,108,111,119,0,0,69,118,101,110,
-116,70,108,97,103,115,70,97,115,116,0,0,83,111,102,116,
-82,101,115,101,116,84,105,109,101,114,0,0,81,117,101,117,
-101,67,109,100,73,112,114,69,114,114,111,114,0,0,0,0,
-81,117,101,117,101,65,117,116,111,67,108,101,97,110,0,0,
-81,117,101,117,101,70,108,117,115,104,67,111,109,112,108,101,
-116,101,0,0,83,116,114,105,112,101,78,111,100,101,80,111,
-111,108,0,0,116,97,115,107,69,110,116,114,121,46,99,112,
-112,0,0,0,115,101,109,65,115,115,101,114,116,0,0,0,
-83,111,102,116,32,82,101,115,101,116,32,72,97,110,100,108,
-101,114,32,83,116,97,114,116,101,100,32,46,46,46,10,0,
-83,116,111,112,112,105,110,103,32,37,115,32,46,46,46,0,
-82,101,115,101,116,32,70,97,105,108,101,100,33,33,10,0,
+98,117,114,115,116,32,108,101,110,103,116,104,32,58,48,120,
+37,120,32,10,0,0,0,0,85,110,115,117,112,112,111,114,
+116,101,100,32,67,83,32,108,97,116,101,110,99,121,32,58,
+48,120,37,120,32,10,0,0,85,110,115,117,112,112,111,114,
+116,101,100,32,87,69,32,108,97,116,101,110,99,121,32,58,
+48,120,37,120,32,10,0,0,85,110,100,101,102,105,110,101,
+100,32,116,114,99,100,32,58,48,120,37,120,32,10,0,0,
+85,110,115,117,112,112,111,114,116,101,100,32,116,114,99,100,
+32,58,48,120,37,120,32,10,0,0,0,0,85,110,115,117,
+112,112,111,114,116,101,100,32,99,108,111,99,107,32,100,101,
+108,97,121,32,102,111,114,32,98,97,99,107,32,116,111,32,
+98,97,99,107,32,114,97,110,100,111,109,32,99,111,108,117,
+109,110,32,97,100,100,114,101,115,115,58,48,120,37,120,32,
+10,0,0,0,115,116,114,105,112,101,77,97,110,97,103,101,
+114,46,99,112,112,0,0,0,65,117,116,111,32,83,112,97,
+114,101,32,84,97,115,107,0,66,97,99,107,103,114,111,117,
+110,100,32,84,97,115,107,0,65,117,116,111,32,67,108,101,
+97,110,32,84,97,115,107,0,80,111,114,116,32,69,114,114,
+111,114,32,72,97,110,100,108,101,114,32,84,97,115,107,0,
+81,117,101,117,101,66,117,102,102,101,114,90,101,114,111,0,
+83,101,99,111,110,100,84,105,109,101,114,0,80,114,105,110,
+116,76,111,103,84,105,109,101,114,0,0,0,81,117,101,117,
+101,80,111,114,116,73,112,114,69,114,114,111,114,0,0,0,
+81,117,101,117,101,79,98,106,101,99,116,68,101,108,101,116,
+101,0,0,0,81,117,101,117,101,80,111,114,116,83,99,97,
+110,0,0,0,67,111,109,109,97,110,100,32,84,97,115,107,
+0,0,0,0,66,117,102,102,101,114,32,90,101,114,111,32,
+84,97,115,107,0,0,0,0,70,108,117,115,104,32,77,111,
+110,105,116,111,114,32,84,97,115,107,0,0,67,111,109,109,
+97,110,100,32,69,114,114,111,114,32,72,97,110,100,108,101,
+114,32,84,97,115,107,0,0,68,101,98,117,103,32,84,97,
+115,107,0,0,69,118,101,110,116,70,108,97,103,115,83,108,
+111,119,0,0,69,118,101,110,116,70,108,97,103,115,70,97,
+115,116,0,0,83,111,102,116,82,101,115,101,116,84,105,109,
+101,114,0,0,81,117,101,117,101,67,109,100,73,112,114,69,
+114,114,111,114,0,0,0,0,81,117,101,117,101,65,117,116,
+111,67,108,101,97,110,0,0,81,117,101,117,101,70,108,117,
+115,104,67,111,109,112,108,101,116,101,0,0,83,116,114,105,
+112,101,78,111,100,101,80,111,111,108,0,0,116,97,115,107,
+69,110,116,114,121,46,99,112,112,0,0,0,115,101,109,65,
+115,115,101,114,116,0,0,0,83,111,102,116,32,82,101,115,
+101,116,32,72,97,110,100,108,101,114,32,83,116,97,114,116,
+101,100,32,46,46,46,10,0,83,116,111,112,112,105,110,103,
+32,37,115,32,46,46,46,0,82,101,115,101,116,32,70,97,
+105,108,101,100,33,33,10,0,116,97,115,107,69,110,116,114,
+121,46,99,112,112,0,0,0,83,116,111,112,112,105,110,103,
+32,37,115,32,40,84,105,109,101,111,117,116,41,32,46,46,
+46,0,0,0,84,105,109,101,32,32,58,32,32,37,48,56,
+120,10,0,0,83,116,111,112,112,105,110,103,32,37,115,32,
+46,46,46,32,83,107,105,112,112,101,100,10,0,0,0,0,
+32,72,97,108,116,101,100,10,0,0,0,0,83,116,111,112,
+112,105,110,103,32,37,115,32,40,65,115,115,101,114,116,41,
+32,46,46,46,32,0,0,0,116,97,115,107,69,110,116,114,
+121,46,99,112,112,0,0,0,65,98,111,114,116,101,100,10,
+0,0,0,0,116,97,115,107,69,110,116,114,121,46,99,112,
+112,0,0,0,32,65,98,111,114,116,101,100,10,0,0,0,
+32,73,103,110,111,114,101,100,10,0,0,0,116,97,115,107,
+69,110,116,114,121,46,99,112,112,0,0,0,82,101,115,116,
+97,114,116,105,110,103,32,37,115,32,46,46,46,32,0,0,
 116,97,115,107,69,110,116,114,121,46,99,112,112,0,0,0,
-83,116,111,112,112,105,110,103,32,37,115,32,40,84,105,109,
-101,111,117,116,41,32,46,46,46,0,0,0,84,105,109,101,
-32,32,58,32,32,37,48,56,120,10,0,0,83,116,111,112,
-112,105,110,103,32,37,115,32,46,46,46,32,83,107,105,112,
-112,101,100,10,0,0,0,0,32,72,97,108,116,101,100,10,
-0,0,0,0,83,116,111,112,112,105,110,103,32,37,115,32,
-40,65,115,115,101,114,116,41,32,46,46,46,32,0,0,0,
 116,97,115,107,69,110,116,114,121,46,99,112,112,0,0,0,
-65,98,111,114,116,101,100,10,0,0,0,0,116,97,115,107,
-69,110,116,114,121,46,99,112,112,0,0,0,32,65,98,111,
-114,116,101,100,10,0,0,0,32,73,103,110,111,114,101,100,
-10,0,0,0,116,97,115,107,69,110,116,114,121,46,99,112,
-112,0,0,0,82,101,115,116,97,114,116,105,110,103,32,37,
-115,32,46,46,46,32,0,0,116,97,115,107,69,110,116,114,
-121,46,99,112,112,0,0,0,116,97,115,107,69,110,116,114,
-121,46,99,112,112,0,0,0,83,111,102,116,82,101,115,101,
-116,67,111,117,110,116,61,37,100,0,0,0,116,97,115,107,
-69,110,116,114,121,46,99,112,112,0,0,0,46,46,112,111,
-119,101,114,32,115,101,116,116,108,101,32,40,112,114,101,45,
-114,111,108,108,99,97,108,108,41,32,112,97,117,115,101,46,
-46,10,0,0,107,101,114,110,101,108,46,104,112,112,0,0,
-115,112,97,114,101,32,117,110,105,116,61,37,100,44,32,82,
-65,73,68,32,117,110,105,116,61,37,100,0,107,101,114,110,
-101,108,46,104,112,112,0,0,65,117,116,111,32,67,108,101,
-97,110,58,32,37,100,10,0,10,65,117,116,111,67,108,101,
-97,110,32,100,101,116,101,99,116,101,100,32,112,111,114,116,
-32,37,100,32,80,111,119,101,114,32,67,121,99,108,101,100,
-46,10,0,0,236,176,255,255,156,7,133,0,72,180,255,255,
-172,7,133,0,232,135,145,0,232,6,133,0,136,113,1,0,
-0,0,0,0,100,0,0,0,100,0,0,0,1,0,0,0,
-148,24,148,0,188,7,133,0,64,114,1,0,0,0,0,0,
-1,0,0,0,1,0,0,0,0,0,0,0,56,24,148,0,
-244,6,133,0,82,178,129,0,1,0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,0,20,136,145,0,4,7,133,0,
-1,0,0,0,152,0,0,0,76,136,145,0,204,7,133,0,
-1,0,0,0,0,71,0,0,216,215,255,255,216,6,133,0,
-1,0,0,0,64,0,0,0,188,136,145,0,24,7,133,0,
-2,0,0,0,128,0,0,0,244,136,145,0,44,7,133,0,
-2,0,0,0,32,0,0,0,44,137,145,0,224,7,133,0,
-2,0,0,0,8,0,0,0,104,180,255,255,240,7,133,0,
-1,0,0,0,192,0,0,0,16,216,255,255,4,8,133,0,
-20,0,0,0,128,112,0,0,107,101,114,110,101,108,46,104,
+83,111,102,116,82,101,115,101,116,67,111,117,110,116,61,37,
+100,0,0,0,116,97,115,107,69,110,116,114,121,46,99,112,
+112,0,0,0,46,46,112,111,119,101,114,32,115,101,116,116,
+108,101,32,40,112,114,101,45,114,111,108,108,99,97,108,108,
+41,32,112,97,117,115,101,46,46,10,0,0,107,101,114,110,
+101,108,46,104,112,112,0,0,115,112,97,114,101,32,117,110,
+105,116,61,37,100,44,32,82,65,73,68,32,117,110,105,116,
+61,37,100,0,107,101,114,110,101,108,46,104,112,112,0,0,
+65,117,116,111,32,67,108,101,97,110,58,32,37,100,10,0,
+10,65,117,116,111,67,108,101,97,110,32,100,101,116,101,99,
+116,101,100,32,112,111,114,116,32,37,100,32,80,111,119,101,
+114,32,67,121,99,108,101,100,46,10,0,0,236,176,255,255,
+24,19,133,0,72,180,255,255,40,19,133,0,72,147,145,0,
+100,18,133,0,178,115,1,0,0,0,0,0,100,0,0,0,
+100,0,0,0,1,0,0,0,244,35,148,0,56,19,133,0,
+106,116,1,0,0,0,0,0,1,0,0,0,1,0,0,0,
+0,0,0,0,152,35,148,0,112,18,133,0,244,186,129,0,
+1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
+116,147,145,0,128,18,133,0,1,0,0,0,152,0,0,0,
+172,147,145,0,72,19,133,0,1,0,0,0,0,71,0,0,
+216,215,255,255,84,18,133,0,1,0,0,0,64,0,0,0,
+28,148,145,0,148,18,133,0,2,0,0,0,128,0,0,0,
+84,148,145,0,168,18,133,0,2,0,0,0,32,0,0,0,
+140,148,145,0,92,19,133,0,2,0,0,0,8,0,0,0,
+104,180,255,255,108,19,133,0,1,0,0,0,192,0,0,0,
+16,216,255,255,128,19,133,0,20,0,0,0,128,112,0,0,
+107,101,114,110,101,108,46,104,112,112,0,0,107,101,114,110,
+101,108,46,104,112,112,0,0,107,101,114,110,101,108,46,104,
 112,112,0,0,107,101,114,110,101,108,46,104,112,112,0,0,
+32,42,32,42,32,42,32,67,114,101,97,116,101,32,117,110,
+105,116,32,102,97,105,108,101,100,58,32,68,97,116,97,32,
+99,104,97,110,110,101,108,32,110,111,116,32,99,111,110,115,
+116,117,99,116,101,100,10,0,107,101,114,110,101,108,46,104,
+112,112,0,0,32,42,32,42,32,42,32,67,114,101,97,116,
+101,32,117,110,105,116,32,102,97,105,108,101,100,58,32,68,
+97,116,97,32,99,104,97,110,110,101,108,32,110,111,116,32,
+99,111,110,115,116,114,117,99,116,101,100,10,0,0,0,0,
+107,101,114,110,101,108,46,104,112,112,0,0,32,105,115,32,
+37,115,108,105,110,101,10,0,85,78,73,84,58,32,37,50,
+100,32,45,32,78,111,116,32,97,32,118,97,108,105,100,32,
+117,110,105,116,10,0,0,0,85,78,73,84,58,32,37,50,
+100,44,32,99,97,112,97,99,105,116,121,58,32,37,76,117,
+44,0,0,0,117,110,105,116,65,99,99,101,115,115,46,99,
+112,112,0,0,85,78,73,84,58,32,37,50,100,32,32,100,
+101,108,101,116,101,100,46,10,0,0,0,0,85,65,58,68,
+101,103,114,97,100,101,80,111,114,116,32,40,112,111,114,116,
+78,117,109,98,101,114,44,32,101,114,114,111,114,67,111,100,
+101,41,58,32,37,120,44,32,37,120,10,0,117,110,105,116,
+61,37,100,44,32,112,111,114,116,61,37,100,0,0,0,0,
 107,101,114,110,101,108,46,104,112,112,0,0,107,101,114,110,
-101,108,46,104,112,112,0,0,32,42,32,42,32,42,32,67,
-114,101,97,116,101,32,117,110,105,116,32,102,97,105,108,101,
-100,58,32,68,97,116,97,32,99,104,97,110,110,101,108,32,
-110,111,116,32,99,111,110,115,116,117,99,116,101,100,10,0,
-107,101,114,110,101,108,46,104,112,112,0,0,32,42,32,42,
-32,42,32,67,114,101,97,116,101,32,117,110,105,116,32,102,
-97,105,108,101,100,58,32,68,97,116,97,32,99,104,97,110,
-110,101,108,32,110,111,116,32,99,111,110,115,116,114,117,99,
-116,101,100,10,0,0,0,0,107,101,114,110,101,108,46,104,
-112,112,0,0,32,105,115,32,37,115,108,105,110,101,10,0,
-85,78,73,84,58,32,37,50,100,32,45,32,78,111,116,32,
-97,32,118,97,108,105,100,32,117,110,105,116,10,0,0,0,
-85,78,73,84,58,32,37,50,100,44,32,99,97,112,97,99,
-105,116,121,58,32,37,76,117,44,0,0,0,117,110,105,116,
-65,99,99,101,115,115,46,99,112,112,0,0,85,78,73,84,
-58,32,37,50,100,32,32,100,101,108,101,116,101,100,46,10,
-0,0,0,0,85,65,58,68,101,103,114,97,100,101,80,111,
-114,116,32,40,112,111,114,116,78,117,109,98,101,114,44,32,
-101,114,114,111,114,67,111,100,101,41,58,32,37,120,44,32,
-37,120,10,0,117,110,105,116,61,37,100,44,32,112,111,114,
-116,61,37,100,0,0,0,0,107,101,114,110,101,108,46,104,
+101,108,46,104,112,112,0,0,107,101,114,110,101,108,46,104,
+112,112,0,0,85,112,100,97,116,105,110,103,32,99,97,99,
+104,101,32,115,101,116,116,105,110,103,115,32,102,111,114,32,
+117,110,105,116,58,32,37,100,10,0,0,0,107,101,114,110,
+101,108,46,104,112,112,0,0,107,101,114,110,101,108,46,104,
+112,112,0,0,117,110,105,116,65,99,99,101,115,115,46,99,
 112,112,0,0,107,101,114,110,101,108,46,104,112,112,0,0,
-107,101,114,110,101,108,46,104,112,112,0,0,85,112,100,97,
-116,105,110,103,32,99,97,99,104,101,32,115,101,116,116,105,
-110,103,115,32,102,111,114,32,117,110,105,116,58,32,37,100,
-10,0,0,0,107,101,114,110,101,108,46,104,112,112,0,0,
-107,101,114,110,101,108,46,104,112,112,0,0,117,110,105,116,
-65,99,99,101,115,115,46,99,112,112,0,0,107,101,114,110,
-101,108,46,104,112,112,0,0,117,110,105,116,65,99,99,101,
-115,115,46,99,112,112,0,0,32,42,32,42,32,42,32,67,
-114,101,97,116,101,32,117,110,105,116,32,102,97,105,108,101,
-100,58,32,78,111,32,117,110,105,116,32,110,117,109,98,101,
-114,32,97,118,97,105,108,97,98,108,101,10,0,0,0,0,
-85,110,105,116,32,37,100,0,0,0,0,0,32,42,32,42,
-32,42,32,85,110,105,116,32,37,50,100,32,97,108,114,101,
-97,100,121,32,101,120,105,115,116,115,44,32,100,101,108,101,
-116,105,110,103,32,100,117,112,108,105,99,97,116,101,32,100,
-97,116,97,32,99,104,97,110,110,101,108,40,115,41,10,0,
-85,65,58,32,69,120,99,108,117,100,105,110,103,32,97,32,
-115,116,97,108,101,47,100,101,103,114,97,100,101,100,32,82,
-97,105,100,49,32,100,114,105,118,101,10,0,117,110,105,116,
-65,99,99,101,115,115,46,99,112,112,0,0,85,65,58,32,
-67,104,101,99,107,105,110,103,32,82,97,105,100,49,32,69,
-120,99,108,117,115,105,111,110,32,76,105,115,116,32,40,99,
-111,117,110,116,32,37,100,41,46,10,0,0,85,65,58,32,
-68,101,108,101,116,105,110,103,32,105,110,118,97,108,105,100,
-32,111,114,32,101,109,112,116,121,32,82,97,105,100,49,32,
-69,120,99,108,117,115,105,111,110,32,76,105,115,116,46,10,
-0,0,0,0,32,32,42,42,32,85,71,84,47,80,85,78,
-32,116,97,98,108,101,32,119,97,115,32,99,111,114,114,117,
-112,116,101,100,59,32,114,101,45,105,110,105,116,105,97,108,
-105,122,105,110,103,32,42,42,10,0,0,0,85,71,84,47,
-80,85,78,32,84,97,98,108,101,32,114,101,116,97,105,110,
-101,100,32,97,99,114,111,115,115,32,115,111,102,116,32,114,
-101,115,101,116,10,0,0,0,51,87,97,114,101,68,67,66,
-0,0,0,0,85,71,84,47,80,85,78,32,84,97,98,108,
-101,32,105,110,105,116,105,97,108,105,122,101,100,10,0,0,
 117,110,105,116,65,99,99,101,115,115,46,99,112,112,0,0,
-117,110,105,116,65,99,99,101,115,115,46,99,112,112,0,0,
-117,110,105,116,65,99,99,101,115,115,46,99,112,112,0,0,
-117,110,105,116,65,99,99,101,115,115,46,99,112,112,0,0,
-117,110,105,116,65,99,99,101,115,115,46,99,112,112,0,0,
-107,101,114,110,101,108,46,104,112,112,0,0,82,101,45,110,
-117,109,98,101,114,105,110,103,32,117,110,105,116,115,58,32,
-40,116,104,101,114,101,32,97,114,101,32,37,100,32,118,97,
-108,105,100,32,117,110,105,116,115,41,10,0,10,111,108,100,
-32,117,110,105,116,35,58,0,10,110,101,119,32,117,110,105,
-116,35,58,0,114,97,110,107,32,35,32,48,120,58,0,0,
-117,110,105,116,65,99,99,101,115,115,46,99,112,112,0,0,
-32,32,32,91,117,110,105,116,93,58,0,0,114,97,110,107,
-32,35,32,48,120,58,0,0,85,65,58,58,83,112,97,114,
-101,85,110,105,116,40,37,105,41,32,99,104,101,99,107,105,
-110,103,32,102,111,114,32,115,112,97,114,101,32,110,101,101,
-100,101,100,10,0,0,0,0,107,101,114,110,101,108,46,104,
-112,112,0,0,85,65,58,58,83,112,97,114,101,85,110,105,
-116,32,100,111,110,101,46,10,0,0,0,0,85,65,58,82,
-101,109,111,118,101,80,111,114,116,32,40,112,111,114,116,78,
-117,109,98,101,114,44,32,101,114,114,111,114,67,111,100,101,
-41,58,32,37,120,44,32,37,120,10,0,0,107,101,114,110,
-101,108,46,104,112,112,0,0,85,65,58,82,101,112,108,97,
-99,101,85,110,105,116,80,111,114,116,32,99,111,109,112,108,
-101,116,101,32,40,101,114,114,111,114,67,111,100,101,41,58,
-32,37,35,120,10,0,0,0,85,65,58,58,82,101,112,108,
-97,99,101,85,110,105,116,80,111,114,116,32,40,112,97,114,
-101,110,116,44,32,114,101,112,108,97,99,101,109,101,110,116,
-41,58,32,37,120,44,32,37,120,10,0,0,117,110,105,116,
-65,99,99,101,115,115,46,99,112,112,0,0,70,111,117,110,
-100,32,105,110,118,97,108,105,100,32,82,97,105,100,49,32,
-69,120,99,108,117,115,105,111,110,32,76,105,115,116,59,32,
-119,105,108,108,32,98,101,32,111,118,101,114,119,114,105,116,
-116,101,110,10,0,0,0,0,85,65,58,32,69,110,100,32,
-111,102,32,82,97,105,100,49,32,69,120,99,108,117,115,105,
-111,110,32,76,105,115,116,32,101,120,99,101,101,100,101,100,
-32,109,97,120,105,109,117,109,44,32,110,111,119,32,99,111,
-114,114,101,99,116,101,100,10,0,0,0,0,85,65,58,32,
-65,100,100,105,110,103,32,116,111,32,82,97,105,100,49,32,
-69,120,99,108,117,115,105,111,110,32,76,105,115,116,59,32,
-108,105,115,116,32,110,111,119,32,104,97,115,32,37,100,32,
-101,110,116,114,105,101,115,46,10,0,0,0,120,83,116,114,
-101,97,109,77,103,114,46,99,112,112,0,0,120,83,116,114,
-101,97,109,77,103,114,46,99,112,112,0,0,120,83,116,114,
-101,97,109,77,103,114,46,99,112,112,0,0,120,83,116,114,
-101,97,109,77,103,114,46,99,112,112,0,0,69,82,82,79,
-82,45,114,101,99,101,105,118,101,100,32,117,110,107,110,111,
-119,110,32,100,101,98,117,103,32,114,101,113,117,101,115,116,
-32,48,120,0,69,82,82,79,82,45,114,101,99,101,105,118,
-101,100,32,105,110,97,112,112,114,111,112,114,105,97,116,101,
-32,100,101,98,117,103,32,114,101,113,117,101,115,116,32,48,
-120,0,0,0,69,82,82,79,82,45,114,101,99,101,105,118,
-101,100,32,77,111,110,82,101,116,114,121,32,105,110,32,82,
-101,99,101,105,118,101,82,101,113,117,101,115,116,0,0,0,
-73,110,116,101,114,110,97,108,32,101,114,114,111,114,32,45,
-32,117,110,107,110,111,119,110,32,109,101,115,115,97,103,101,
-32,105,110,32,83,101,110,100,82,101,115,112,111,110,115,101,
-58,32,48,120,0,0,0,0,69,82,82,79,82,32,45,32,
-117,110,107,110,111,119,110,32,98,114,101,97,107,112,111,105,
-110,116,32,115,105,122,101,0,69,82,82,79,82,32,45,32,
-98,114,101,97,107,112,111,105,110,116,32,105,110,115,116,114,
-117,99,116,105,111,110,32,97,108,114,101,97,100,121,32,114,
-101,109,111,118,101,100,32,97,116,32,48,120,0,0,0,0,
-87,65,82,78,73,78,71,32,45,32,109,111,110,105,116,111,
-114,32,115,116,97,99,107,32,98,111,117,110,100,97,114,105,
-101,115,32,104,97,118,101,32,98,101,101,110,32,97,108,116,
-101,114,101,100,0,0,0,0,13,10,77,85,76,84,73,32,
-77,111,110,105,116,111,114,32,49,46,56,46,55,32,0,0,
-13,10,67,111,112,121,114,105,103,104,116,32,40,67,41,32,
-49,57,57,49,44,49,57,57,50,44,49,57,57,51,44,49,
-57,57,52,32,98,121,32,71,114,101,101,110,32,72,105,108,
-108,115,32,83,111,102,116,119,97,114,101,44,32,73,110,99,
-46,13,10,65,108,108,32,114,105,103,104,116,115,32,114,101,
-115,101,114,118,101,100,46,32,70,101,98,32,48,53,32,49,
-57,57,57,32,50,48,58,49,56,58,51,56,32,13,10,82,
-84,69,86,56,53,48,69,77,69,44,56,51,44,76,51,50,
-44,86,51,46,48,51,46,48,44,78,111,118,32,49,54,32,
-50,48,48,50,44,32,67,111,112,121,114,105,103,104,116,32,
-40,99,41,32,49,57,57,57,32,77,105,100,97,115,32,108,
-97,98,44,73,110,99,46,10,13,0,103,111,111,100,98,121,
-101,32,99,114,117,101,108,32,119,111,114,108,100,0,83,101,
-110,100,77,101,115,115,97,103,101,32,112,114,111,116,111,99,
-111,108,32,118,105,111,108,97,116,101,100,0,78,69,67,32,
-86,56,53,48,69,47,77,69,50,0,0,0,69,114,114,111,
-114,58,32,101,120,112,101,99,116,101,100,32,104,97,108,116,
-32,99,104,97,114,97,99,116,101,114,44,32,110,111,116,32,
-48,120,0,0,83,121,115,116,101,109,32,84,105,109,101,114,
-32,84,104,114,101,97,100,0,95,95,103,104,76,111,99,107,
-77,117,116,101,120,0,0,0,248,12,128,0,240,20,128,0,
-42,63,128,0,26,123,128,0,136,31,129,0,252,42,129,0,
-82,70,129,0,36,110,129,0,82,110,129,0,2,186,129,0,
-14,190,129,0,0,0,0,0,0,0,0,0,127,0,0,0,
-192,29,133,0,0,0,0,0,136,6,0,0,176,134,133,0,
-0,0,0,0,68,248,14,0,48,176,255,255,0,0,0,0,
-148,8,0,0,196,184,255,255,0,0,0,0,252,38,0,0,
-196,223,255,255,0,0,0,0,0,0,0,0,224,70,133,0,
-112,92,130,0,208,63,0,0,136,27,133,0,64,156,130,0,
-52,2,0,0,188,23,133,0,116,158,130,0,204,3,0,0,
-192,223,255,255,64,162,130,0,4,0,0,0,0,176,255,255,
-68,162,130,0,44,0,0,0,196,184,255,255,112,162,130,0,
-0,0,0,0,0,0,0,0,112,162,130,0,226,216,1,0,
-140,131,133,0,148,131,133,0,156,131,133,0,172,131,133,0,
-180,131,133,0,188,131,133,0,196,131,133,0,200,131,133,0,
-236,131,133,0,244,131,133,0,252,131,133,0,12,132,133,0,
-20,132,133,0,28,132,133,0,44,132,133,0,52,132,133,0,
-60,132,133,0,76,132,133,0,84,132,133,0,92,132,133,0,
-172,134,133,0,49,49,49,49,49,49,51,49,49,49,49,49,
-49,49,49,49,49,49,49,49,177,0,0,0,0,0,0,0,
+32,42,32,42,32,42,32,67,114,101,97,116,101,32,117,110,
+105,116,32,102,97,105,108,101,100,58,32,78,111,32,117,110,
+105,116,32,110,117,109,98,101,114,32,97,118,97,105,108,97,
+98,108,101,10,0,0,0,0,85,110,105,116,32,37,100,0,
+0,0,0,0,32,42,32,42,32,42,32,85,110,105,116,32,
+37,50,100,32,97,108,114,101,97,100,121,32,101,120,105,115,
+116,115,44,32,100,101,108,101,116,105,110,103,32,100,117,112,
+108,105,99,97,116,101,32,100,97,116,97,32,99,104,97,110,
+110,101,108,40,115,41,10,0,85,65,58,32,69,120,99,108,
+117,100,105,110,103,32,97,32,115,116,97,108,101,47,100,101,
+103,114,97,100,101,100,32,82,97,105,100,49,32,100,114,105,
+118,101,10,0,117,110,105,116,65,99,99,101,115,115,46,99,
+112,112,0,0,85,65,58,32,67,104,101,99,107,105,110,103,
+32,82,97,105,100,49,32,69,120,99,108,117,115,105,111,110,
+32,76,105,115,116,32,40,99,111,117,110,116,32,37,100,41,
+46,10,0,0,85,65,58,32,68,101,108,101,116,105,110,103,
+32,105,110,118,97,108,105,100,32,111,114,32,101,109,112,116,
+121,32,82,97,105,100,49,32,69,120,99,108,117,115,105,111,
+110,32,76,105,115,116,46,10,0,0,0,0,32,32,42,42,
+32,85,71,84,47,80,85,78,32,116,97,98,108,101,32,119,
+97,115,32,99,111,114,114,117,112,116,101,100,59,32,114,101,
+45,105,110,105,116,105,97,108,105,122,105,110,103,32,42,42,
+10,0,0,0,85,71,84,47,80,85,78,32,84,97,98,108,
+101,32,114,101,116,97,105,110,101,100,32,97,99,114,111,115,
+115,32,115,111,102,116,32,114,101,115,101,116,10,0,0,0,
+51,87,97,114,101,68,67,66,0,0,0,0,85,71,84,47,
+80,85,78,32,84,97,98,108,101,32,105,110,105,116,105,97,
+108,105,122,101,100,10,0,0,117,110,105,116,65,99,99,101,
+115,115,46,99,112,112,0,0,117,110,105,116,65,99,99,101,
+115,115,46,99,112,112,0,0,117,110,105,116,65,99,99,101,
+115,115,46,99,112,112,0,0,117,110,105,116,65,99,99,101,
+115,115,46,99,112,112,0,0,117,110,105,116,65,99,99,101,
+115,115,46,99,112,112,0,0,107,101,114,110,101,108,46,104,
+112,112,0,0,82,101,45,110,117,109,98,101,114,105,110,103,
+32,117,110,105,116,115,58,32,40,116,104,101,114,101,32,97,
+114,101,32,37,100,32,118,97,108,105,100,32,117,110,105,116,
+115,41,10,0,10,111,108,100,32,117,110,105,116,35,58,0,
+10,110,101,119,32,117,110,105,116,35,58,0,114,97,110,107,
+32,35,32,48,120,58,0,0,117,110,105,116,65,99,99,101,
+115,115,46,99,112,112,0,0,32,32,32,91,117,110,105,116,
+93,58,0,0,114,97,110,107,32,35,32,48,120,58,0,0,
+85,65,58,58,83,112,97,114,101,85,110,105,116,40,37,105,
+41,32,99,104,101,99,107,105,110,103,32,102,111,114,32,115,
+112,97,114,101,32,110,101,101,100,101,100,10,0,0,0,0,
+107,101,114,110,101,108,46,104,112,112,0,0,85,65,58,58,
+83,112,97,114,101,85,110,105,116,32,100,111,110,101,46,10,
+0,0,0,0,85,65,58,82,101,109,111,118,101,80,111,114,
+116,32,40,112,111,114,116,78,117,109,98,101,114,44,32,101,
+114,114,111,114,67,111,100,101,41,58,32,37,120,44,32,37,
+120,10,0,0,107,101,114,110,101,108,46,104,112,112,0,0,
+85,65,58,82,101,112,108,97,99,101,85,110,105,116,80,111,
+114,116,32,99,111,109,112,108,101,116,101,32,40,101,114,114,
+111,114,67,111,100,101,41,58,32,37,35,120,10,0,0,0,
+85,65,58,58,82,101,112,108,97,99,101,85,110,105,116,80,
+111,114,116,32,40,112,97,114,101,110,116,44,32,114,101,112,
+108,97,99,101,109,101,110,116,41,58,32,37,120,44,32,37,
+120,10,0,0,117,110,105,116,65,99,99,101,115,115,46,99,
+112,112,0,0,70,111,117,110,100,32,105,110,118,97,108,105,
+100,32,82,97,105,100,49,32,69,120,99,108,117,115,105,111,
+110,32,76,105,115,116,59,32,119,105,108,108,32,98,101,32,
+111,118,101,114,119,114,105,116,116,101,110,10,0,0,0,0,
+85,65,58,32,69,110,100,32,111,102,32,82,97,105,100,49,
+32,69,120,99,108,117,115,105,111,110,32,76,105,115,116,32,
+101,120,99,101,101,100,101,100,32,109,97,120,105,109,117,109,
+44,32,110,111,119,32,99,111,114,114,101,99,116,101,100,10,
+0,0,0,0,85,65,58,32,65,100,100,105,110,103,32,116,
+111,32,82,97,105,100,49,32,69,120,99,108,117,115,105,111,
+110,32,76,105,115,116,59,32,108,105,115,116,32,110,111,119,
+32,104,97,115,32,37,100,32,101,110,116,114,105,101,115,46,
+10,0,0,0,120,83,116,114,101,97,109,77,103,114,46,99,
+112,112,0,0,120,83,116,114,101,97,109,77,103,114,46,99,
+112,112,0,0,120,83,116,114,101,97,109,77,103,114,46,99,
+112,112,0,0,120,83,116,114,101,97,109,77,103,114,46,99,
+112,112,0,0,69,82,82,79,82,45,114,101,99,101,105,118,
+101,100,32,117,110,107,110,111,119,110,32,100,101,98,117,103,
+32,114,101,113,117,101,115,116,32,48,120,0,69,82,82,79,
+82,45,114,101,99,101,105,118,101,100,32,105,110,97,112,112,
+114,111,112,114,105,97,116,101,32,100,101,98,117,103,32,114,
+101,113,117,101,115,116,32,48,120,0,0,0,69,82,82,79,
+82,45,114,101,99,101,105,118,101,100,32,77,111,110,82,101,
+116,114,121,32,105,110,32,82,101,99,101,105,118,101,82,101,
+113,117,101,115,116,0,0,0,73,110,116,101,114,110,97,108,
+32,101,114,114,111,114,32,45,32,117,110,107,110,111,119,110,
+32,109,101,115,115,97,103,101,32,105,110,32,83,101,110,100,
+82,101,115,112,111,110,115,101,58,32,48,120,0,0,0,0,
+69,82,82,79,82,32,45,32,117,110,107,110,111,119,110,32,
+98,114,101,97,107,112,111,105,110,116,32,115,105,122,101,0,
+69,82,82,79,82,32,45,32,98,114,101,97,107,112,111,105,
+110,116,32,105,110,115,116,114,117,99,116,105,111,110,32,97,
+108,114,101,97,100,121,32,114,101,109,111,118,101,100,32,97,
+116,32,48,120,0,0,0,0,87,65,82,78,73,78,71,32,
+45,32,109,111,110,105,116,111,114,32,115,116,97,99,107,32,
+98,111,117,110,100,97,114,105,101,115,32,104,97,118,101,32,
+98,101,101,110,32,97,108,116,101,114,101,100,0,0,0,0,
+13,10,77,85,76,84,73,32,77,111,110,105,116,111,114,32,
+49,46,56,46,55,32,0,0,13,10,67,111,112,121,114,105,
+103,104,116,32,40,67,41,32,49,57,57,49,44,49,57,57,
+50,44,49,57,57,51,44,49,57,57,52,32,98,121,32,71,
+114,101,101,110,32,72,105,108,108,115,32,83,111,102,116,119,
+97,114,101,44,32,73,110,99,46,13,10,65,108,108,32,114,
+105,103,104,116,115,32,114,101,115,101,114,118,101,100,46,32,
+70,101,98,32,48,53,32,49,57,57,57,32,50,48,58,49,
+56,58,51,56,32,13,10,82,84,69,86,56,53,48,69,77,
+69,44,56,51,44,76,51,50,44,86,51,46,48,51,46,48,
+44,78,111,118,32,49,54,32,50,48,48,50,44,32,67,111,
+112,121,114,105,103,104,116,32,40,99,41,32,49,57,57,57,
+32,77,105,100,97,115,32,108,97,98,44,73,110,99,46,10,
+13,0,103,111,111,100,98,121,101,32,99,114,117,101,108,32,
+119,111,114,108,100,0,83,101,110,100,77,101,115,115,97,103,
+101,32,112,114,111,116,111,99,111,108,32,118,105,111,108,97,
+116,101,100,0,78,69,67,32,86,56,53,48,69,47,77,69,
+50,0,0,0,69,114,114,111,114,58,32,101,120,112,101,99,
+116,101,100,32,104,97,108,116,32,99,104,97,114,97,99,116,
+101,114,44,32,110,111,116,32,48,120,0,0,83,121,115,116,
+101,109,32,84,105,109,101,114,32,84,104,114,101,97,100,0,
+95,95,103,104,76,111,99,107,77,117,116,101,120,0,0,0,
+248,12,128,0,176,21,128,0,18,66,128,0,2,126,128,0,
+148,37,129,0,8,49,129,0,94,76,129,0,112,118,129,0,
+158,118,129,0,164,194,129,0,176,198,129,0,0,0,0,0,
+0,0,0,0,127,0,0,0,72,41,133,0,0,0,0,0,
+136,6,0,0,16,146,133,0,0,0,0,0,68,248,14,0,
+48,176,255,255,0,0,0,0,148,8,0,0,196,184,255,255,
+0,0,0,0,252,38,0,0,196,223,255,255,0,0,0,0,
+0,0,0,0,104,82,133,0,20,101,130,0,168,63,0,0,
+16,39,133,0,188,164,130,0,52,2,0,0,56,35,133,0,
+240,166,130,0,212,3,0,0,192,223,255,255,196,170,130,0,
+4,0,0,0,0,176,255,255,200,170,130,0,44,0,0,0,
+196,184,255,255,244,170,130,0,0,0,0,0,0,0,0,0,
+0,171,130,0,50,219,1,0,236,142,133,0,244,142,133,0,
+252,142,133,0,12,143,133,0,20,143,133,0,28,143,133,0,
+36,143,133,0,40,143,133,0,76,143,133,0,84,143,133,0,
+92,143,133,0,108,143,133,0,116,143,133,0,124,143,133,0,
+140,143,133,0,148,143,133,0,156,143,133,0,172,143,133,0,
+180,143,133,0,188,143,133,0,12,146,133,0,49,49,49,49,
+49,49,51,49,49,49,49,49,49,49,49,49,49,49,49,49,
+177,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,
@@ -26748,2878 +26921,2878 @@ unsigned char tw_fw_code[] __initdata = 
 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,64,48,32,16,
-68,51,34,17,3,0,24,0,240,23,5,0,173,147,200,40,
-240,23,5,0,128,112,96,80,136,119,102,85,3,0,24,0,
-64,192,0,0,184,31,233,31,0,0,0,0,85,170,96,233,
-84,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,125,0,28,0,36,80,110,80,1,2,0,0,
-0,111,1,16,19,39,91,0,97,0,1,0,0,68,83,0,
-90,0,0,0,0,0,83,16,0,0,0,0,0,80,78,80,
-32,72,111,111,107,85,112,32,99,97,108,108,101,100,0,144,
-144,144,232,237,14,203,203,51,119,97,114,101,0,51,119,97,
-114,101,32,83,116,111,114,97,103,101,32,67,111,110,116,114,
-111,108,108,101,114,0,0,0,0,80,67,73,82,193,19,2,
-16,0,0,24,0,0,0,0,16,96,0,1,0,0,128,0,
-0,0,0,0,0,0,0,0,0,0,36,86,69,82,66,69,
-57,88,32,50,46,48,50,46,48,49,46,48,51,55,0,86,
-69,82,36,233,160,15,0,0,0,11,0,11,129,2,197,3,
-62,2,249,10,249,10,249,10,15,5,0,11,249,10,249,10,
-0,11,0,11,249,10,249,10,0,11,0,11,0,11,0,11,
-0,11,66,5,107,5,129,5,224,6,107,9,249,10,249,10,
-0,11,78,8,249,10,1,102,85,102,86,30,15,160,80,83,
-140,216,139,222,232,194,13,137,132,7,6,137,156,9,6,91,
-88,46,58,22,154,0,114,64,46,58,22,155,0,119,57,87,
-81,191,83,16,46,15,182,14,156,0,131,199,13,87,46,128,
-125,25,0,117,6,95,129,199,95,1,87,46,56,85,25,117,
-14,137,188,205,6,95,131,239,13,137,188,203,6,235,5,131,
-199,26,226,218,89,95,235,41,246,194,128,116,18,102,139,172,
-0,6,15,161,31,102,94,156,14,104,122,1,102,85,203,15,
-161,31,102,94,205,64,102,93,202,2,0,180,1,249,233,175,
-0,128,252,21,119,2,235,18,46,128,62,250,0,0,116,235,
-128,252,73,119,230,128,252,65,114,225,137,132,15,6,156,88,
-137,132,21,6,250,137,164,11,6,140,208,137,132,13,6,184,
-122,1,3,198,139,224,140,216,142,208,139,132,21,6,80,157,
-139,132,15,6,128,252,21,119,18,86,139,240,129,230,0,255,
-193,238,7,46,255,148,188,0,94,235,42,128,236,65,30,86,
-80,83,139,132,7,6,139,156,9,6,142,216,139,243,91,88,
-87,139,248,129,231,0,255,193,239,7,128,196,65,46,255,149,
-232,0,95,94,31,102,137,132,17,6,137,132,15,6,156,88,
-137,132,21,6,250,139,132,11,6,139,224,139,132,13,6,142,
-208,139,132,21,6,80,157,102,139,132,17,6,139,132,15,6,
-15,161,31,102,94,102,93,202,2,0,102,15,200,80,102,15,
-200,83,82,81,87,232,129,12,139,188,205,6,136,132,5,6,
-232,232,11,46,138,117,24,178,4,51,201,138,140,5,6,179,
-3,232,2,8,114,6,138,132,5,6,235,2,176,0,232,145,
-8,95,89,90,91,102,15,200,88,102,15,200,195,102,15,200,
-80,102,15,200,30,86,6,87,102,83,102,81,102,82,30,86,
-232,54,12,199,132,177,6,0,0,199,132,175,6,0,0,199,
-132,37,6,1,0,199,132,187,6,0,0,199,132,185,6,0,
-0,94,31,232,7,9,115,27,128,252,0,117,3,248,235,1,
-249,102,90,102,89,102,91,95,7,94,31,102,15,200,88,102,
-15,200,195,30,86,232,241,11,131,188,189,6,2,116,33,87,
-139,188,205,6,136,132,5,6,46,138,117,24,178,2,232,36,
-7,114,6,138,132,5,6,235,2,176,0,95,94,31,235,179,
-131,196,4,136,132,6,6,136,132,4,6,102,80,102,83,102,
-51,192,140,192,102,193,224,4,102,15,183,219,102,3,195,102,
-169,255,1,0,0,102,91,102,88,117,5,232,94,0,235,131,
-87,81,82,83,83,6,30,138,132,6,6,60,1,114,2,176,
-1,30,7,187,0,4,3,222,232,65,0,31,7,91,114,45,
-156,81,86,252,139,251,129,198,0,4,15,182,200,193,225,8,
-243,165,94,89,157,40,132,6,6,116,18,50,228,80,80,232,
-53,7,131,196,2,88,193,224,9,3,216,235,183,138,132,4,
-6,42,132,6,6,91,90,89,95,233,39,255,102,81,102,82,
-87,232,53,11,136,132,5,6,232,160,10,139,188,205,6,46,
-138,117,24,178,2,51,201,138,140,5,6,232,0,6,114,6,
-138,132,5,6,235,2,176,0,232,71,7,95,102,90,102,89,
-195,102,15,200,80,102,15,200,30,86,6,87,102,83,102,81,
-102,82,30,86,232,242,10,199,132,177,6,0,0,199,132,175,
-6,0,0,199,132,37,6,1,0,199,132,187,6,0,0,199,
-132,185,6,0,0,94,31,232,195,7,115,27,128,252,0,117,
-3,248,235,1,249,102,90,102,89,102,91,95,7,94,31,102,
-15,200,88,102,15,200,195,30,86,232,173,10,131,188,189,6,
-2,116,33,87,139,188,205,6,136,132,5,6,46,138,117,24,
-178,3,232,224,5,114,6,138,132,5,6,235,2,176,0,95,
-94,31,235,179,131,196,4,136,132,6,6,136,132,4,6,102,
-80,102,83,102,51,192,140,192,102,193,224,4,102,15,183,219,
-102,3,195,102,169,255,1,0,0,102,91,102,88,117,5,232,
-100,0,235,131,87,81,82,83,83,6,30,138,132,6,6,60,
-1,114,2,176,1,139,254,140,198,30,30,7,142,222,139,243,
-129,199,0,4,87,156,81,252,15,182,200,193,225,8,243,165,
-89,157,91,31,232,47,0,31,7,91,114,27,232,26,10,40,
-132,6,6,116,18,50,228,80,80,232,235,5,131,196,2,88,
-193,224,9,3,216,235,177,138,132,4,6,42,132,6,6,91,
-90,89,95,233,33,255,102,81,102,82,87,232,235,9,136,132,
-5,6,232,86,9,139,188,205,6,46,138,117,24,178,3,51,
-201,138,140,5,6,232,182,4,114,6,138,132,5,6,235,2,
-176,0,232,253,5,95,102,90,102,89,195,87,232,186,9,139,
-188,205,6,46,139,21,138,234,42,210,193,234,2,46,138,77,
-14,10,202,46,138,117,2,254,206,86,30,190,64,0,142,222,
-190,117,0,138,20,31,94,51,192,232,198,5,95,195,86,87,
-232,134,9,139,188,205,6,46,139,77,20,227,7,51,201,73,
-139,209,235,8,46,139,77,18,46,139,85,16,50,228,232,161,
-5,180,3,248,95,94,195,129,251,170,85,117,12,185,1,0,
-184,0,33,187,85,170,248,235,3,180,1,249,195,102,15,200,
-80,102,15,200,30,86,6,87,102,83,102,81,102,82,30,86,
-232,54,9,199,132,177,6,0,0,199,132,175,6,0,0,199,
-132,37,6,1,0,199,132,187,6,0,0,199,132,185,6,0,
-0,94,31,30,7,139,254,232,3,6,115,27,128,252,0,117,
-3,248,235,1,249,102,90,102,89,102,91,95,7,94,31,102,
-15,200,88,102,15,200,195,30,86,30,7,139,254,232,233,8,
-140,132,207,6,137,188,209,6,131,188,189,6,2,116,27,87,
-139,188,205,6,46,138,117,24,178,2,232,24,4,95,94,31,
-115,177,38,199,69,2,0,0,235,169,131,196,4,102,38,139,
-85,8,38,139,69,2,137,132,6,6,137,132,4,6,38,139,
-93,4,80,38,139,69,6,142,192,88,102,80,102,83,102,51,
-192,140,192,102,193,224,4,102,15,183,219,102,3,195,102,169,
-255,1,0,0,102,91,102,88,117,6,232,88,0,233,99,255,
-83,6,30,184,1,0,30,7,187,0,4,3,222,80,232,68,
-0,88,31,7,91,115,2,235,49,156,81,86,252,139,251,129,
-198,0,4,139,200,193,225,8,243,165,94,89,157,41,132,6,
-6,117,5,180,0,248,235,18,102,80,102,37,255,255,0,0,
-102,3,208,102,88,232,244,4,235,182,138,132,4,6,42,132,
-6,6,233,14,255,102,81,102,82,87,232,28,8,139,188,205,
-6,139,200,102,139,194,46,138,117,24,178,2,232,239,2,115,
-18,6,87,142,132,207,6,139,188,209,6,38,199,69,2,0,
-0,95,7,232,44,4,95,102,90,102,89,195,102,15,200,80,
-102,15,200,30,86,6,87,102,83,102,81,102,82,30,86,232,
-215,7,199,132,177,6,0,0,199,132,175,6,0,0,199,132,
-37,6,1,0,199,132,187,6,0,0,199,132,185,6,0,0,
-94,31,30,7,139,254,232,164,4,115,27,128,252,0,117,3,
-248,235,1,249,102,90,102,89,102,91,95,7,94,31,102,15,
-200,88,102,15,200,195,30,86,30,7,139,254,232,138,7,140,
-132,207,6,137,188,209,6,131,188,189,6,2,116,27,87,139,
-188,205,6,46,138,117,24,178,3,232,185,2,95,94,31,115,
-177,38,199,69,2,0,0,235,169,131,196,4,102,38,139,85,
-8,38,139,69,2,137,132,6,6,137,132,4,6,38,139,93,
-4,80,38,139,69,6,142,192,88,102,80,102,83,102,51,192,
-140,192,102,193,224,4,102,15,183,219,102,3,195,102,169,255,
-1,0,0,102,91,102,88,117,6,232,103,0,233,99,255,83,
-6,30,139,132,6,6,131,248,1,114,3,184,1,0,139,254,
-140,198,30,30,7,142,222,139,243,129,199,0,4,87,156,81,
-252,139,200,193,225,8,243,165,89,157,91,31,80,232,51,0,
-88,31,7,91,115,2,235,32,232,222,6,41,132,6,6,117,
-5,180,0,248,235,18,102,80,102,37,255,255,0,0,102,3,
-208,102,88,232,134,3,235,167,138,132,4,6,42,132,6,6,
-233,255,254,102,81,102,82,87,232,174,6,139,188,205,6,139,
-200,102,139,194,46,138,117,24,178,3,232,129,1,115,18,6,
-87,142,132,207,6,139,188,209,6,38,199,69,2,0,0,95,
-7,232,190,2,95,102,90,102,89,195,30,86,6,87,83,102,
-82,81,102,80,30,86,232,112,6,139,188,205,6,102,46,139,
-69,16,102,46,139,85,20,94,31,139,12,131,249,26,15,130,
-231,0,199,68,2,0,0,199,68,4,0,0,199,68,6,0,
-0,199,68,8,0,0,199,68,10,0,0,199,68,12,0,0,
-199,68,14,0,0,102,137,68,16,102,137,84,20,199,68,24,
-0,2,131,60,30,15,130,164,0,102,199,68,26,255,255,255,
-255,233,159,0,198,68,30,190,198,68,31,221,198,68,32,36,
-198,68,33,0,199,68,34,0,0,198,68,36,80,198,68,37,
-67,198,68,38,73,199,68,40,83,67,199,68,42,83,73,30,
-86,87,232,228,5,139,188,203,6,46,138,69,2,46,138,93,
-3,46,138,77,4,95,94,31,136,68,48,136,92,49,136,76,
-50,198,68,51,0,102,199,68,52,0,0,0,0,82,129,234,
-128,0,136,84,56,90,198,68,57,0,199,68,58,0,0,102,
-199,68,60,0,0,0,0,198,68,64,0,50,192,185,35,0,
-139,222,131,195,30,2,7,67,226,251,246,216,136,68,65,102,
-88,180,0,89,102,90,91,95,7,94,31,248,195,199,4,26,
-0,235,236,199,4,30,0,235,230,102,88,180,1,89,102,90,
-91,95,7,94,31,249,195,102,15,200,80,102,15,200,6,83,
-82,81,87,86,30,7,139,254,232,78,5,102,38,139,69,8,
-38,139,77,2,87,139,188,205,6,46,138,117,24,178,4,179,
-3,232,210,0,95,115,6,38,199,69,2,0,0,232,98,1,
-94,95,89,90,91,7,102,15,200,88,102,15,200,195,30,87,
-102,81,102,82,102,83,191,0,2,3,254,128,202,96,136,21,
-198,69,1,5,198,69,2,0,136,117,3,198,69,4,0,198,
-69,5,0,42,237,137,77,6,102,137,69,8,102,51,192,140,
-192,102,193,224,4,102,15,183,219,102,3,195,102,137,69,12,
-102,15,183,201,102,193,225,9,102,137,77,16,232,18,1,232,
-24,1,138,101,4,10,228,116,3,180,32,249,102,91,102,90,
-102,89,95,31,195,30,87,102,83,81,191,0,2,3,254,128,
-202,96,136,21,198,69,1,3,198,69,2,0,136,117,3,198,
-69,4,0,198,69,5,0,139,140,183,6,137,77,6,102,139,
-156,179,6,102,137,93,8,139,132,177,6,209,224,1,69,1,
-232,190,0,232,196,0,138,101,4,10,228,116,3,180,32,249,
-89,102,91,95,31,195,30,87,102,81,102,82,102,83,191,0,
-2,3,254,136,21,136,93,1,198,69,2,0,136,117,3,198,
-69,4,0,198,69,5,0,137,77,6,102,137,69,8,232,128,
-0,232,134,0,138,101,4,10,228,116,3,180,16,249,102,91,
-102,90,102,89,95,31,195,85,139,236,80,139,70,4,131,248,
-0,116,6,232,6,0,72,235,245,88,93,195,80,87,138,193,
-36,63,254,192,139,188,205,6,46,58,69,14,118,31,176,1,
-254,198,46,58,117,2,114,21,50,246,138,229,193,225,2,129,
-225,255,3,138,204,65,138,225,193,233,2,138,236,128,225,192,
-10,200,95,88,195,180,1,232,8,0,249,195,51,192,232,1,
-0,195,30,86,190,64,0,142,222,190,116,0,136,36,94,31,
-195,139,215,232,162,3,232,16,0,195,232,45,0,102,37,0,
-64,0,0,117,245,232,67,0,195,87,139,188,203,6,46,131,
-61,0,116,10,82,46,139,85,7,102,239,90,95,195,86,46,
-139,117,7,102,100,137,4,94,95,195,87,139,188,203,6,46,
-131,61,0,116,10,82,46,139,85,5,102,237,90,95,195,86,
-46,139,117,5,102,100,139,4,94,95,195,87,139,188,203,6,
-46,131,61,0,116,10,82,46,139,85,9,102,237,90,95,195,
-86,46,139,117,9,102,100,139,4,94,95,195,102,80,102,81,
-82,139,208,193,226,9,102,51,192,102,51,201,139,195,139,203,
-3,194,102,59,193,127,14,139,195,131,227,15,193,232,4,140,
-193,3,200,142,193,3,218,90,102,89,102,88,195,30,86,87,
-6,232,5,3,131,188,185,6,0,116,32,128,188,196,6,21,
-118,9,38,131,125,2,0,116,16,235,4,60,0,116,10,139,
-132,185,6,1,132,187,6,235,70,235,86,137,132,195,6,137,
-156,197,6,137,140,199,6,137,148,201,6,128,252,21,118,30,
-102,38,139,69,8,102,137,132,191,6,102,38,15,183,85,2,
-80,38,139,93,4,38,139,69,6,142,192,88,235,57,232,26,
-2,102,137,132,191,6,102,51,210,138,148,195,6,235,40,139,
-132,175,6,59,132,37,6,117,30,51,192,138,132,187,6,180,
-0,139,156,197,6,139,140,199,6,139,148,201,6,232,178,254,
-232,60,2,249,233,139,1,30,106,64,31,246,6,123,0,32,
-31,117,33,199,132,177,6,1,0,137,148,185,6,139,148,201,
-6,139,132,195,6,131,132,175,6,1,199,132,189,6,2,0,
-248,233,94,1,247,132,124,1,1,0,117,17,102,193,226,9,
-232,84,1,114,2,235,6,180,2,176,0,235,164,102,80,81,
-87,139,132,175,6,193,224,3,139,254,129,199,39,6,3,248,
-199,132,177,6,0,0,102,139,5,102,169,255,1,0,0,117,
-22,131,132,177,6,1,139,140,175,6,3,140,177,6,131,199,
-8,59,140,37,6,114,223,95,89,102,88,131,188,177,6,0,
-15,132,136,0,6,87,86,81,30,7,191,0,2,3,254,131,
-199,12,139,140,177,6,193,225,3,139,132,175,6,193,224,3,
-129,198,39,6,3,240,243,164,89,94,95,7,81,102,82,51,
-201,102,51,210,59,140,177,6,116,24,139,132,175,6,3,193,
-193,224,3,86,129,198,39,6,3,240,102,3,84,4,94,65,
-235,226,102,193,234,9,137,148,183,6,102,81,102,51,201,102,
-139,132,191,6,139,140,187,6,102,3,193,102,137,132,179,6,
-102,89,139,132,177,6,1,132,175,6,137,148,185,6,139,194,
-102,90,89,199,132,189,6,3,0,248,235,118,102,83,139,156,
-175,6,193,227,3,86,129,198,39,6,3,243,102,139,92,4,
-102,193,235,9,94,128,188,196,6,21,118,37,102,81,102,51,
-201,102,139,132,191,6,139,140,187,6,102,3,193,102,38,137,
-69,8,102,89,38,137,93,2,137,156,185,6,102,91,7,235,
-35,139,140,199,6,139,148,201,6,255,180,187,6,232,231,252,
-131,196,2,137,156,185,6,102,91,139,132,195,6,138,132,185,
-6,131,196,2,199,132,189,6,2,0,131,132,175,6,1,248,
-235,1,7,95,94,31,195,102,80,102,82,137,148,23,6,102,
-193,234,16,137,148,25,6,137,156,27,6,199,132,29,6,0,
-0,140,192,137,132,31,6,199,132,33,6,0,0,199,132,35,
-6,17,0,199,132,37,6,0,0,6,87,30,7,139,254,129,
-199,23,6,51,210,184,5,129,205,75,95,7,115,2,235,6,
-131,140,124,1,1,248,102,90,102,88,195,102,81,102,82,86,
-87,139,188,205,6,82,81,102,51,192,46,138,69,2,46,138,
-85,14,246,226,102,51,210,138,209,193,226,2,138,213,102,15,
-183,202,102,51,210,102,247,225,89,90,102,80,42,228,138,198,
-46,138,85,14,246,226,102,15,183,208,102,131,225,63,102,88,
-102,3,194,102,3,193,102,72,95,94,102,90,102,89,195,6,
-80,82,87,247,132,124,1,1,0,116,22,140,216,142,192,139,
-254,129,199,23,6,51,210,184,6,129,205,75,131,164,124,1,
-254,95,90,88,7,195,0,0,102,51,192,140,216,102,193,224,
-4,102,15,183,210,102,3,194,195,80,83,46,128,62,153,0,
-1,117,12,106,64,31,187,14,0,139,7,142,216,235,7,46,
-139,54,149,0,142,222,46,139,54,151,0,91,88,195,0,30,
-102,83,102,80,156,250,51,192,142,216,187,76,0,102,139,7,
-187,0,1,102,137,7,157,102,88,102,91,31,195,102,86,30,
-102,193,224,2,51,246,142,222,102,139,240,156,250,103,102,139,
-6,103,137,62,103,137,94,2,157,31,102,94,195,30,86,80,
-190,64,0,142,222,190,117,0,46,138,69,12,0,4,88,94,
-31,195,102,83,102,81,102,87,30,6,85,102,46,129,60,36,
-80,110,80,117,11,139,254,46,139,125,30,185,1,0,235,9,
-191,83,16,46,15,182,14,157,0,86,30,190,64,0,142,222,
-190,117,0,138,4,31,94,4,128,138,216,46,2,93,12,254,
-203,46,136,30,155,0,81,46,15,182,77,12,80,87,131,199,
-13,46,136,69,25,254,192,131,199,26,226,245,95,232,41,255,
-46,160,154,0,10,192,88,89,117,32,46,162,154,0,60,128,
-117,3,232,58,255,87,191,251,0,140,203,102,184,19,0,0,
-0,232,73,255,95,102,137,132,0,6,232,96,255,129,199,95,
-1,226,150,184,32,1,93,7,31,102,95,102,89,102,91,195,
-190,28,0,232,92,255,203,85,139,236,139,70,4,169,255,7,
-116,6,37,0,248,5,0,8,93,195,131,248,0,116,24,80,
-83,81,139,200,73,51,219,51,192,46,2,7,67,226,250,246,
-216,46,136,7,89,91,88,195,0,0,0,0,0,0,0,0,
-0,0,0,0,86,185,32,0,46,198,68,9,0,50,192,46,
-2,4,70,226,250,50,201,42,200,94,46,136,76,9,46,131,
-124,6,0,116,9,86,46,139,116,6,232,215,255,94,195,199,
-6,126,21,87,40,195,80,176,48,230,128,88,83,81,82,87,
-86,30,6,15,160,15,168,46,136,38,36,16,46,162,37,16,
-80,38,139,5,46,163,61,0,38,139,69,2,46,163,63,0,
-88,46,198,6,60,0,0,102,38,129,61,36,80,110,80,117,
-6,46,198,6,60,0,1,80,176,49,230,128,88,184,64,0,
-232,233,78,15,130,42,1,142,216,46,163,38,16,198,6,12,
-0,0,232,245,14,80,176,50,230,128,232,26,91,88,232,142,
-255,232,104,92,232,161,91,232,195,89,198,6,253,18,0,198,
-6,241,18,0,199,6,251,18,0,0,198,6,125,21,2,198,
-6,124,20,0,80,176,51,230,128,232,235,90,88,232,244,1,
-232,44,92,128,234,4,232,23,92,184,32,4,232,99,90,232,
-14,92,232,51,81,11,201,116,85,232,53,2,139,54,195,20,
-80,176,52,230,128,88,137,54,197,20,232,28,77,80,176,53,
-230,128,88,232,32,3,232,52,8,232,158,73,80,176,54,230,
-128,88,139,52,131,254,255,117,221,191,106,170,232,54,14,232,
-104,14,80,176,55,230,128,88,232,22,2,11,192,116,29,198,
-6,241,18,1,232,54,89,96,232,161,14,97,235,14,232,221,
-88,102,185,91,0,0,0,232,227,88,115,251,38,198,6,49,
-198,2,128,62,253,18,1,116,10,15,182,14,199,20,232,185,
-79,235,78,80,176,56,230,128,88,232,179,91,232,226,90,232,
-160,71,80,176,57,230,128,88,46,163,28,16,15,182,14,199,
-20,184,62,97,255,208,80,176,58,230,128,88,46,129,62,28,
-16,0,1,116,28,46,128,62,60,0,1,116,13,51,246,184,
-70,15,255,208,80,176,59,230,128,88,184,53,106,255,208,235,
-85,227,33,80,176,60,230,128,88,87,191,208,111,184,121,31,
-255,208,81,185,5,0,184,120,106,255,208,226,249,89,95,184,
-174,31,255,208,46,128,62,60,0,1,117,34,86,190,28,0,
-46,199,68,6,0,0,46,199,68,22,0,0,184,40,16,255,
-208,94,46,199,6,28,16,0,1,189,0,0,235,3,189,1,
-0,184,0,8,235,79,80,176,61,230,128,88,46,129,62,28,
-16,0,1,117,12,87,191,208,111,184,121,31,255,208,95,235,
-10,87,191,173,111,184,121,31,255,208,95,80,176,62,230,128,
-88,184,174,31,255,208,189,0,0,46,128,62,60,0,1,116,
-2,235,48,46,131,62,12,88,0,117,6,141,6,28,16,235,
-4,46,161,12,88,80,176,63,230,128,88,80,187,235,15,255,
-211,131,196,2,193,232,9,46,162,2,0,193,224,9,187,254,
-15,255,211,80,176,64,230,128,88,46,161,28,16,15,169,15,
-161,7,31,94,95,90,89,91,203,0,0,0,80,81,86,87,
-51,201,46,136,14,157,0,139,54,195,20,191,193,20,38,15,
-182,140,113,3,227,12,137,53,139,254,131,199,2,46,254,6,
-157,0,139,52,131,254,255,117,229,199,5,255,255,95,94,89,
-88,195,0,0,139,30,126,21,102,15,183,195,131,227,31,116,
-5,131,192,32,43,195,140,219,15,186,227,0,115,3,131,192,
-16,185,4,0,191,0,0,5,128,0,137,133,223,18,131,192,
-32,131,199,2,226,241,102,51,219,140,219,102,193,227,4,102,
-3,216,102,247,195,255,1,0,0,116,6,102,64,102,67,235,
-241,163,231,18,5,0,32,163,195,20,5,45,8,163,126,21,
-195,96,232,218,89,50,210,232,198,89,191,89,124,232,37,12,
-97,195,96,232,84,12,191,237,111,232,25,12,232,75,12,97,
-195,102,83,102,81,232,214,86,102,185,91,0,0,0,128,62,
-124,20,0,116,6,102,185,35,2,0,0,102,83,102,81,232,
-236,81,102,89,102,91,117,7,232,194,86,115,238,235,52,232,
-227,81,61,0,48,117,7,198,6,253,18,0,235,37,61,27,
-1,116,32,198,6,12,0,1,61,52,5,116,17,61,51,4,
-117,7,198,6,12,0,0,235,5,61,0,122,117,189,184,1,
-0,235,3,184,0,0,102,89,102,91,195,187,3,0,139,62,
-231,18,102,184,0,0,2,2,139,195,102,137,5,102,184,0,
-0,3,16,139,195,102,137,69,6,232,35,0,195,187,2,0,
-139,62,231,18,102,184,0,0,2,2,139,195,102,137,5,102,
-184,0,0,3,16,139,195,102,137,69,6,232,1,0,195,139,
-62,223,18,102,184,82,4,1,0,102,137,5,102,184,0,0,
-2,0,102,137,69,4,139,22,231,18,232,139,250,102,137,69,
-8,102,187,0,2,0,0,102,137,93,12,232,196,79,232,253,
-79,139,62,231,18,195,87,139,62,231,18,102,184,3,4,3,
-1,102,137,5,131,199,5,102,184,3,4,17,1,102,137,5,
-131,199,5,102,184,3,4,7,1,102,137,5,131,199,5,102,
-184,3,4,8,1,102,137,5,131,199,5,102,184,3,4,18,
-1,102,137,5,131,199,5,102,184,3,4,19,1,102,137,5,
-131,199,5,102,184,3,4,20,1,102,137,5,139,62,223,18,
-102,184,82,4,2,0,102,137,5,102,184,0,0,7,0,102,
-137,69,4,139,22,231,18,232,254,249,102,137,69,8,102,187,
-0,2,0,0,102,137,93,12,232,55,79,232,112,79,139,62,
-231,18,138,69,4,136,68,21,138,69,9,136,68,22,138,69,
-14,136,68,23,138,69,19,136,68,24,138,69,24,136,68,26,
-138,69,29,36,1,136,68,25,10,192,116,10,138,69,34,36,
-1,208,224,8,68,25,95,195,191,174,112,46,128,61,255,117,
-2,249,195,46,56,5,117,5,46,139,125,1,195,131,199,3,
-235,233,85,86,139,62,231,18,129,199,0,2,87,102,184,0,
-2,3,40,3,197,102,137,5,139,62,225,18,102,184,82,4,
-1,0,102,137,5,102,184,0,0,1,0,102,137,69,4,139,
-22,231,18,129,194,0,2,232,94,249,102,137,69,8,102,187,
-0,2,0,0,102,137,93,12,232,151,78,232,208,78,95,176,
-0,136,69,44,6,140,216,142,192,131,199,4,139,247,80,81,
-82,86,87,156,252,139,197,178,31,246,226,191,254,18,3,248,
-185,30,0,243,164,50,192,170,157,95,94,90,89,88,7,94,
-93,195,96,51,237,15,182,76,21,139,62,231,18,129,199,0,
-2,87,102,184,0,2,3,40,3,197,102,137,5,139,62,225,
-18,102,184,82,4,1,0,102,137,5,102,184,0,0,1,0,
-102,137,69,4,139,22,231,18,129,194,0,2,232,217,248,102,
-137,69,8,102,187,0,2,0,0,102,137,93,12,232,18,78,
-232,75,78,95,176,0,136,69,44,6,140,216,142,192,131,199,
-4,139,247,80,81,82,86,87,156,252,139,197,178,31,246,226,
-191,254,18,3,248,185,30,0,243,164,50,192,170,157,95,94,
-90,89,88,7,69,73,116,3,233,126,255,97,195,102,80,102,
-82,139,62,231,18,87,102,184,2,4,2,16,102,137,5,102,
-184,2,4,3,16,102,137,69,20,102,184,2,4,8,16,102,
-137,69,40,139,62,223,18,102,184,82,4,0,0,102,137,5,
-102,184,0,0,3,0,102,137,69,4,139,22,231,18,232,71,
-248,102,137,69,8,102,184,0,2,0,0,102,137,69,12,232,
-128,77,232,185,77,95,102,90,102,88,195,102,80,102,82,139,
-62,231,18,87,102,184,2,4,10,4,102,137,5,102,184,2,
-4,9,20,102,137,69,8,139,62,223,18,102,184,82,4,0,
+0,0,0,0,64,48,32,16,68,51,34,17,3,0,24,0,
+108,35,5,0,34,197,156,1,108,35,5,0,128,112,96,80,
+136,119,102,85,3,0,24,0,64,192,0,0,184,31,233,31,
+0,0,0,0,85,170,96,233,84,16,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,125,0,28,0,
+36,80,110,80,1,2,0,0,0,111,1,16,19,39,91,0,
+97,0,1,0,0,68,83,0,90,0,0,0,0,0,83,16,
+0,0,0,0,0,80,78,80,32,72,111,111,107,85,112,32,
+99,97,108,108,101,100,0,144,144,144,232,237,14,203,203,51,
+119,97,114,101,0,51,119,97,114,101,32,83,116,111,114,97,
+103,101,32,67,111,110,116,114,111,108,108,101,114,0,0,0,
+0,80,67,73,82,193,19,2,16,0,0,24,0,0,0,0,
+16,96,0,1,0,0,128,0,0,0,0,0,0,0,0,0,
+0,0,36,86,69,82,66,69,57,88,32,50,46,48,50,46,
+48,49,46,48,51,55,0,86,69,82,36,233,160,15,0,0,
+0,11,0,11,129,2,197,3,62,2,249,10,249,10,249,10,
+15,5,0,11,249,10,249,10,0,11,0,11,249,10,249,10,
+0,11,0,11,0,11,0,11,0,11,66,5,107,5,129,5,
+224,6,107,9,249,10,249,10,0,11,78,8,249,10,1,102,
+85,102,86,30,15,160,80,83,140,216,139,222,232,194,13,137,
+132,7,6,137,156,9,6,91,88,46,58,22,154,0,114,64,
+46,58,22,155,0,119,57,87,81,191,83,16,46,15,182,14,
+156,0,131,199,13,87,46,128,125,25,0,117,6,95,129,199,
+95,1,87,46,56,85,25,117,14,137,188,205,6,95,131,239,
+13,137,188,203,6,235,5,131,199,26,226,218,89,95,235,41,
+246,194,128,116,18,102,139,172,0,6,15,161,31,102,94,156,
+14,104,122,1,102,85,203,15,161,31,102,94,205,64,102,93,
+202,2,0,180,1,249,233,175,0,128,252,21,119,2,235,18,
+46,128,62,250,0,0,116,235,128,252,73,119,230,128,252,65,
+114,225,137,132,15,6,156,88,137,132,21,6,250,137,164,11,
+6,140,208,137,132,13,6,184,122,1,3,198,139,224,140,216,
+142,208,139,132,21,6,80,157,139,132,15,6,128,252,21,119,
+18,86,139,240,129,230,0,255,193,238,7,46,255,148,188,0,
+94,235,42,128,236,65,30,86,80,83,139,132,7,6,139,156,
+9,6,142,216,139,243,91,88,87,139,248,129,231,0,255,193,
+239,7,128,196,65,46,255,149,232,0,95,94,31,102,137,132,
+17,6,137,132,15,6,156,88,137,132,21,6,250,139,132,11,
+6,139,224,139,132,13,6,142,208,139,132,21,6,80,157,102,
+139,132,17,6,139,132,15,6,15,161,31,102,94,102,93,202,
+2,0,102,15,200,80,102,15,200,83,82,81,87,232,129,12,
+139,188,205,6,136,132,5,6,232,232,11,46,138,117,24,178,
+4,51,201,138,140,5,6,179,3,232,2,8,114,6,138,132,
+5,6,235,2,176,0,232,145,8,95,89,90,91,102,15,200,
+88,102,15,200,195,102,15,200,80,102,15,200,30,86,6,87,
+102,83,102,81,102,82,30,86,232,54,12,199,132,177,6,0,
+0,199,132,175,6,0,0,199,132,37,6,1,0,199,132,187,
+6,0,0,199,132,185,6,0,0,94,31,232,7,9,115,27,
+128,252,0,117,3,248,235,1,249,102,90,102,89,102,91,95,
+7,94,31,102,15,200,88,102,15,200,195,30,86,232,241,11,
+131,188,189,6,2,116,33,87,139,188,205,6,136,132,5,6,
+46,138,117,24,178,2,232,36,7,114,6,138,132,5,6,235,
+2,176,0,95,94,31,235,179,131,196,4,136,132,6,6,136,
+132,4,6,102,80,102,83,102,51,192,140,192,102,193,224,4,
+102,15,183,219,102,3,195,102,169,255,1,0,0,102,91,102,
+88,117,5,232,94,0,235,131,87,81,82,83,83,6,30,138,
+132,6,6,60,1,114,2,176,1,30,7,187,0,4,3,222,
+232,65,0,31,7,91,114,45,156,81,86,252,139,251,129,198,
+0,4,15,182,200,193,225,8,243,165,94,89,157,40,132,6,
+6,116,18,50,228,80,80,232,53,7,131,196,2,88,193,224,
+9,3,216,235,183,138,132,4,6,42,132,6,6,91,90,89,
+95,233,39,255,102,81,102,82,87,232,53,11,136,132,5,6,
+232,160,10,139,188,205,6,46,138,117,24,178,2,51,201,138,
+140,5,6,232,0,6,114,6,138,132,5,6,235,2,176,0,
+232,71,7,95,102,90,102,89,195,102,15,200,80,102,15,200,
+30,86,6,87,102,83,102,81,102,82,30,86,232,242,10,199,
+132,177,6,0,0,199,132,175,6,0,0,199,132,37,6,1,
+0,199,132,187,6,0,0,199,132,185,6,0,0,94,31,232,
+195,7,115,27,128,252,0,117,3,248,235,1,249,102,90,102,
+89,102,91,95,7,94,31,102,15,200,88,102,15,200,195,30,
+86,232,173,10,131,188,189,6,2,116,33,87,139,188,205,6,
+136,132,5,6,46,138,117,24,178,3,232,224,5,114,6,138,
+132,5,6,235,2,176,0,95,94,31,235,179,131,196,4,136,
+132,6,6,136,132,4,6,102,80,102,83,102,51,192,140,192,
+102,193,224,4,102,15,183,219,102,3,195,102,169,255,1,0,
+0,102,91,102,88,117,5,232,100,0,235,131,87,81,82,83,
+83,6,30,138,132,6,6,60,1,114,2,176,1,139,254,140,
+198,30,30,7,142,222,139,243,129,199,0,4,87,156,81,252,
+15,182,200,193,225,8,243,165,89,157,91,31,232,47,0,31,
+7,91,114,27,232,26,10,40,132,6,6,116,18,50,228,80,
+80,232,235,5,131,196,2,88,193,224,9,3,216,235,177,138,
+132,4,6,42,132,6,6,91,90,89,95,233,33,255,102,81,
+102,82,87,232,235,9,136,132,5,6,232,86,9,139,188,205,
+6,46,138,117,24,178,3,51,201,138,140,5,6,232,182,4,
+114,6,138,132,5,6,235,2,176,0,232,253,5,95,102,90,
+102,89,195,87,232,186,9,139,188,205,6,46,139,21,138,234,
+42,210,193,234,2,46,138,77,14,10,202,46,138,117,2,254,
+206,86,30,190,64,0,142,222,190,117,0,138,20,31,94,51,
+192,232,198,5,95,195,86,87,232,134,9,139,188,205,6,46,
+139,77,20,227,7,51,201,73,139,209,235,8,46,139,77,18,
+46,139,85,16,50,228,232,161,5,180,3,248,95,94,195,129,
+251,170,85,117,12,185,1,0,184,0,33,187,85,170,248,235,
+3,180,1,249,195,102,15,200,80,102,15,200,30,86,6,87,
+102,83,102,81,102,82,30,86,232,54,9,199,132,177,6,0,
+0,199,132,175,6,0,0,199,132,37,6,1,0,199,132,187,
+6,0,0,199,132,185,6,0,0,94,31,30,7,139,254,232,
+3,6,115,27,128,252,0,117,3,248,235,1,249,102,90,102,
+89,102,91,95,7,94,31,102,15,200,88,102,15,200,195,30,
+86,30,7,139,254,232,233,8,140,132,207,6,137,188,209,6,
+131,188,189,6,2,116,27,87,139,188,205,6,46,138,117,24,
+178,2,232,24,4,95,94,31,115,177,38,199,69,2,0,0,
+235,169,131,196,4,102,38,139,85,8,38,139,69,2,137,132,
+6,6,137,132,4,6,38,139,93,4,80,38,139,69,6,142,
+192,88,102,80,102,83,102,51,192,140,192,102,193,224,4,102,
+15,183,219,102,3,195,102,169,255,1,0,0,102,91,102,88,
+117,6,232,88,0,233,99,255,83,6,30,184,1,0,30,7,
+187,0,4,3,222,80,232,68,0,88,31,7,91,115,2,235,
+49,156,81,86,252,139,251,129,198,0,4,139,200,193,225,8,
+243,165,94,89,157,41,132,6,6,117,5,180,0,248,235,18,
+102,80,102,37,255,255,0,0,102,3,208,102,88,232,244,4,
+235,182,138,132,4,6,42,132,6,6,233,14,255,102,81,102,
+82,87,232,28,8,139,188,205,6,139,200,102,139,194,46,138,
+117,24,178,2,232,239,2,115,18,6,87,142,132,207,6,139,
+188,209,6,38,199,69,2,0,0,95,7,232,44,4,95,102,
+90,102,89,195,102,15,200,80,102,15,200,30,86,6,87,102,
+83,102,81,102,82,30,86,232,215,7,199,132,177,6,0,0,
+199,132,175,6,0,0,199,132,37,6,1,0,199,132,187,6,
+0,0,199,132,185,6,0,0,94,31,30,7,139,254,232,164,
+4,115,27,128,252,0,117,3,248,235,1,249,102,90,102,89,
+102,91,95,7,94,31,102,15,200,88,102,15,200,195,30,86,
+30,7,139,254,232,138,7,140,132,207,6,137,188,209,6,131,
+188,189,6,2,116,27,87,139,188,205,6,46,138,117,24,178,
+3,232,185,2,95,94,31,115,177,38,199,69,2,0,0,235,
+169,131,196,4,102,38,139,85,8,38,139,69,2,137,132,6,
+6,137,132,4,6,38,139,93,4,80,38,139,69,6,142,192,
+88,102,80,102,83,102,51,192,140,192,102,193,224,4,102,15,
+183,219,102,3,195,102,169,255,1,0,0,102,91,102,88,117,
+6,232,103,0,233,99,255,83,6,30,139,132,6,6,131,248,
+1,114,3,184,1,0,139,254,140,198,30,30,7,142,222,139,
+243,129,199,0,4,87,156,81,252,139,200,193,225,8,243,165,
+89,157,91,31,80,232,51,0,88,31,7,91,115,2,235,32,
+232,222,6,41,132,6,6,117,5,180,0,248,235,18,102,80,
+102,37,255,255,0,0,102,3,208,102,88,232,134,3,235,167,
+138,132,4,6,42,132,6,6,233,255,254,102,81,102,82,87,
+232,174,6,139,188,205,6,139,200,102,139,194,46,138,117,24,
+178,3,232,129,1,115,18,6,87,142,132,207,6,139,188,209,
+6,38,199,69,2,0,0,95,7,232,190,2,95,102,90,102,
+89,195,30,86,6,87,83,102,82,81,102,80,30,86,232,112,
+6,139,188,205,6,102,46,139,69,16,102,46,139,85,20,94,
+31,139,12,131,249,26,15,130,231,0,199,68,2,0,0,199,
+68,4,0,0,199,68,6,0,0,199,68,8,0,0,199,68,
+10,0,0,199,68,12,0,0,199,68,14,0,0,102,137,68,
+16,102,137,84,20,199,68,24,0,2,131,60,30,15,130,164,
+0,102,199,68,26,255,255,255,255,233,159,0,198,68,30,190,
+198,68,31,221,198,68,32,36,198,68,33,0,199,68,34,0,
+0,198,68,36,80,198,68,37,67,198,68,38,73,199,68,40,
+83,67,199,68,42,83,73,30,86,87,232,228,5,139,188,203,
+6,46,138,69,2,46,138,93,3,46,138,77,4,95,94,31,
+136,68,48,136,92,49,136,76,50,198,68,51,0,102,199,68,
+52,0,0,0,0,82,129,234,128,0,136,84,56,90,198,68,
+57,0,199,68,58,0,0,102,199,68,60,0,0,0,0,198,
+68,64,0,50,192,185,35,0,139,222,131,195,30,2,7,67,
+226,251,246,216,136,68,65,102,88,180,0,89,102,90,91,95,
+7,94,31,248,195,199,4,26,0,235,236,199,4,30,0,235,
+230,102,88,180,1,89,102,90,91,95,7,94,31,249,195,102,
+15,200,80,102,15,200,6,83,82,81,87,86,30,7,139,254,
+232,78,5,102,38,139,69,8,38,139,77,2,87,139,188,205,
+6,46,138,117,24,178,4,179,3,232,210,0,95,115,6,38,
+199,69,2,0,0,232,98,1,94,95,89,90,91,7,102,15,
+200,88,102,15,200,195,30,87,102,81,102,82,102,83,191,0,
+2,3,254,128,202,96,136,21,198,69,1,5,198,69,2,0,
+136,117,3,198,69,4,0,198,69,5,0,42,237,137,77,6,
+102,137,69,8,102,51,192,140,192,102,193,224,4,102,15,183,
+219,102,3,195,102,137,69,12,102,15,183,201,102,193,225,9,
+102,137,77,16,232,18,1,232,24,1,138,101,4,10,228,116,
+3,180,32,249,102,91,102,90,102,89,95,31,195,30,87,102,
+83,81,191,0,2,3,254,128,202,96,136,21,198,69,1,3,
+198,69,2,0,136,117,3,198,69,4,0,198,69,5,0,139,
+140,183,6,137,77,6,102,139,156,179,6,102,137,93,8,139,
+132,177,6,209,224,1,69,1,232,190,0,232,196,0,138,101,
+4,10,228,116,3,180,32,249,89,102,91,95,31,195,30,87,
+102,81,102,82,102,83,191,0,2,3,254,136,21,136,93,1,
+198,69,2,0,136,117,3,198,69,4,0,198,69,5,0,137,
+77,6,102,137,69,8,232,128,0,232,134,0,138,101,4,10,
+228,116,3,180,16,249,102,91,102,90,102,89,95,31,195,85,
+139,236,80,139,70,4,131,248,0,116,6,232,6,0,72,235,
+245,88,93,195,80,87,138,193,36,63,254,192,139,188,205,6,
+46,58,69,14,118,31,176,1,254,198,46,58,117,2,114,21,
+50,246,138,229,193,225,2,129,225,255,3,138,204,65,138,225,
+193,233,2,138,236,128,225,192,10,200,95,88,195,180,1,232,
+8,0,249,195,51,192,232,1,0,195,30,86,190,64,0,142,
+222,190,116,0,136,36,94,31,195,139,215,232,162,3,232,16,
+0,195,232,45,0,102,37,0,64,0,0,117,245,232,67,0,
+195,87,139,188,203,6,46,131,61,0,116,10,82,46,139,85,
+7,102,239,90,95,195,86,46,139,117,7,102,100,137,4,94,
+95,195,87,139,188,203,6,46,131,61,0,116,10,82,46,139,
+85,5,102,237,90,95,195,86,46,139,117,5,102,100,139,4,
+94,95,195,87,139,188,203,6,46,131,61,0,116,10,82,46,
+139,85,9,102,237,90,95,195,86,46,139,117,9,102,100,139,
+4,94,95,195,102,80,102,81,82,139,208,193,226,9,102,51,
+192,102,51,201,139,195,139,203,3,194,102,59,193,127,14,139,
+195,131,227,15,193,232,4,140,193,3,200,142,193,3,218,90,
+102,89,102,88,195,30,86,87,6,232,5,3,131,188,185,6,
+0,116,32,128,188,196,6,21,118,9,38,131,125,2,0,116,
+16,235,4,60,0,116,10,139,132,185,6,1,132,187,6,235,
+70,235,86,137,132,195,6,137,156,197,6,137,140,199,6,137,
+148,201,6,128,252,21,118,30,102,38,139,69,8,102,137,132,
+191,6,102,38,15,183,85,2,80,38,139,93,4,38,139,69,
+6,142,192,88,235,57,232,26,2,102,137,132,191,6,102,51,
+210,138,148,195,6,235,40,139,132,175,6,59,132,37,6,117,
+30,51,192,138,132,187,6,180,0,139,156,197,6,139,140,199,
+6,139,148,201,6,232,178,254,232,60,2,249,233,139,1,30,
+106,64,31,246,6,123,0,32,31,117,33,199,132,177,6,1,
+0,137,148,185,6,139,148,201,6,139,132,195,6,131,132,175,
+6,1,199,132,189,6,2,0,248,233,94,1,247,132,124,1,
+1,0,117,17,102,193,226,9,232,84,1,114,2,235,6,180,
+2,176,0,235,164,102,80,81,87,139,132,175,6,193,224,3,
+139,254,129,199,39,6,3,248,199,132,177,6,0,0,102,139,
+5,102,169,255,1,0,0,117,22,131,132,177,6,1,139,140,
+175,6,3,140,177,6,131,199,8,59,140,37,6,114,223,95,
+89,102,88,131,188,177,6,0,15,132,136,0,6,87,86,81,
+30,7,191,0,2,3,254,131,199,12,139,140,177,6,193,225,
+3,139,132,175,6,193,224,3,129,198,39,6,3,240,243,164,
+89,94,95,7,81,102,82,51,201,102,51,210,59,140,177,6,
+116,24,139,132,175,6,3,193,193,224,3,86,129,198,39,6,
+3,240,102,3,84,4,94,65,235,226,102,193,234,9,137,148,
+183,6,102,81,102,51,201,102,139,132,191,6,139,140,187,6,
+102,3,193,102,137,132,179,6,102,89,139,132,177,6,1,132,
+175,6,137,148,185,6,139,194,102,90,89,199,132,189,6,3,
+0,248,235,118,102,83,139,156,175,6,193,227,3,86,129,198,
+39,6,3,243,102,139,92,4,102,193,235,9,94,128,188,196,
+6,21,118,37,102,81,102,51,201,102,139,132,191,6,139,140,
+187,6,102,3,193,102,38,137,69,8,102,89,38,137,93,2,
+137,156,185,6,102,91,7,235,35,139,140,199,6,139,148,201,
+6,255,180,187,6,232,231,252,131,196,2,137,156,185,6,102,
+91,139,132,195,6,138,132,185,6,131,196,2,199,132,189,6,
+2,0,131,132,175,6,1,248,235,1,7,95,94,31,195,102,
+80,102,82,137,148,23,6,102,193,234,16,137,148,25,6,137,
+156,27,6,199,132,29,6,0,0,140,192,137,132,31,6,199,
+132,33,6,0,0,199,132,35,6,17,0,199,132,37,6,0,
+0,6,87,30,7,139,254,129,199,23,6,51,210,184,5,129,
+205,75,95,7,115,2,235,6,131,140,124,1,1,248,102,90,
+102,88,195,102,81,102,82,86,87,139,188,205,6,82,81,102,
+51,192,46,138,69,2,46,138,85,14,246,226,102,51,210,138,
+209,193,226,2,138,213,102,15,183,202,102,51,210,102,247,225,
+89,90,102,80,42,228,138,198,46,138,85,14,246,226,102,15,
+183,208,102,131,225,63,102,88,102,3,194,102,3,193,102,72,
+95,94,102,90,102,89,195,6,80,82,87,247,132,124,1,1,
+0,116,22,140,216,142,192,139,254,129,199,23,6,51,210,184,
+6,129,205,75,131,164,124,1,254,95,90,88,7,195,0,0,
+102,51,192,140,216,102,193,224,4,102,15,183,210,102,3,194,
+195,80,83,46,128,62,153,0,1,117,12,106,64,31,187,14,
+0,139,7,142,216,235,7,46,139,54,149,0,142,222,46,139,
+54,151,0,91,88,195,0,30,102,83,102,80,156,250,51,192,
+142,216,187,76,0,102,139,7,187,0,1,102,137,7,157,102,
+88,102,91,31,195,102,86,30,102,193,224,2,51,246,142,222,
+102,139,240,156,250,103,102,139,6,103,137,62,103,137,94,2,
+157,31,102,94,195,30,86,80,190,64,0,142,222,190,117,0,
+46,138,69,12,0,4,88,94,31,195,102,83,102,81,102,87,
+30,6,85,102,46,129,60,36,80,110,80,117,11,139,254,46,
+139,125,30,185,1,0,235,9,191,83,16,46,15,182,14,157,
+0,86,30,190,64,0,142,222,190,117,0,138,4,31,94,4,
+128,138,216,46,2,93,12,254,203,46,136,30,155,0,81,46,
+15,182,77,12,80,87,131,199,13,46,136,69,25,254,192,131,
+199,26,226,245,95,232,41,255,46,160,154,0,10,192,88,89,
+117,32,46,162,154,0,60,128,117,3,232,58,255,87,191,251,
+0,140,203,102,184,19,0,0,0,232,73,255,95,102,137,132,
+0,6,232,96,255,129,199,95,1,226,150,184,32,1,93,7,
+31,102,95,102,89,102,91,195,190,28,0,232,92,255,203,85,
+139,236,139,70,4,169,255,7,116,6,37,0,248,5,0,8,
+93,195,131,248,0,116,24,80,83,81,139,200,73,51,219,51,
+192,46,2,7,67,226,250,246,216,46,136,7,89,91,88,195,
+0,0,0,0,0,0,0,0,0,0,0,0,86,185,32,0,
+46,198,68,9,0,50,192,46,2,4,70,226,250,50,201,42,
+200,94,46,136,76,9,46,131,124,6,0,116,9,86,46,139,
+116,6,232,215,255,94,195,199,6,126,21,87,40,195,80,176,
+48,230,128,88,83,81,82,87,86,30,6,15,160,15,168,46,
+136,38,36,16,46,162,37,16,80,38,139,5,46,163,61,0,
+38,139,69,2,46,163,63,0,88,46,198,6,60,0,0,102,
+38,129,61,36,80,110,80,117,6,46,198,6,60,0,1,80,
+176,49,230,128,88,184,64,0,232,233,78,15,130,42,1,142,
+216,46,163,38,16,198,6,12,0,0,232,245,14,80,176,50,
+230,128,232,26,91,88,232,142,255,232,104,92,232,161,91,232,
+195,89,198,6,253,18,0,198,6,241,18,0,199,6,251,18,
+0,0,198,6,125,21,2,198,6,124,20,0,80,176,51,230,
+128,232,235,90,88,232,244,1,232,44,92,128,234,4,232,23,
+92,184,32,4,232,99,90,232,14,92,232,51,81,11,201,116,
+85,232,53,2,139,54,195,20,80,176,52,230,128,88,137,54,
+197,20,232,28,77,80,176,53,230,128,88,232,32,3,232,52,
+8,232,158,73,80,176,54,230,128,88,139,52,131,254,255,117,
+221,191,106,170,232,54,14,232,104,14,80,176,55,230,128,88,
+232,22,2,11,192,116,29,198,6,241,18,1,232,54,89,96,
+232,161,14,97,235,14,232,221,88,102,185,91,0,0,0,232,
+227,88,115,251,38,198,6,49,198,2,128,62,253,18,1,116,
+10,15,182,14,199,20,232,185,79,235,78,80,176,56,230,128,
+88,232,179,91,232,226,90,232,160,71,80,176,57,230,128,88,
+46,163,28,16,15,182,14,199,20,184,62,97,255,208,80,176,
+58,230,128,88,46,129,62,28,16,0,1,116,28,46,128,62,
+60,0,1,116,13,51,246,184,70,15,255,208,80,176,59,230,
+128,88,184,53,106,255,208,235,85,227,33,80,176,60,230,128,
+88,87,191,208,111,184,121,31,255,208,81,185,5,0,184,120,
+106,255,208,226,249,89,95,184,174,31,255,208,46,128,62,60,
+0,1,117,34,86,190,28,0,46,199,68,6,0,0,46,199,
+68,22,0,0,184,40,16,255,208,94,46,199,6,28,16,0,
+1,189,0,0,235,3,189,1,0,184,0,8,235,79,80,176,
+61,230,128,88,46,129,62,28,16,0,1,117,12,87,191,208,
+111,184,121,31,255,208,95,235,10,87,191,173,111,184,121,31,
+255,208,95,80,176,62,230,128,88,184,174,31,255,208,189,0,
+0,46,128,62,60,0,1,116,2,235,48,46,131,62,12,88,
+0,117,6,141,6,28,16,235,4,46,161,12,88,80,176,63,
+230,128,88,80,187,235,15,255,211,131,196,2,193,232,9,46,
+162,2,0,193,224,9,187,254,15,255,211,80,176,64,230,128,
+88,46,161,28,16,15,169,15,161,7,31,94,95,90,89,91,
+203,0,0,0,80,81,86,87,51,201,46,136,14,157,0,139,
+54,195,20,191,193,20,38,15,182,140,113,3,227,12,137,53,
+139,254,131,199,2,46,254,6,157,0,139,52,131,254,255,117,
+229,199,5,255,255,95,94,89,88,195,0,0,139,30,126,21,
+102,15,183,195,131,227,31,116,5,131,192,32,43,195,140,219,
+15,186,227,0,115,3,131,192,16,185,4,0,191,0,0,5,
+128,0,137,133,223,18,131,192,32,131,199,2,226,241,102,51,
+219,140,219,102,193,227,4,102,3,216,102,247,195,255,1,0,
+0,116,6,102,64,102,67,235,241,163,231,18,5,0,32,163,
+195,20,5,45,8,163,126,21,195,96,232,218,89,50,210,232,
+198,89,191,89,124,232,37,12,97,195,96,232,84,12,191,237,
+111,232,25,12,232,75,12,97,195,102,83,102,81,232,214,86,
+102,185,91,0,0,0,128,62,124,20,0,116,6,102,185,35,
+2,0,0,102,83,102,81,232,236,81,102,89,102,91,117,7,
+232,194,86,115,238,235,52,232,227,81,61,0,48,117,7,198,
+6,253,18,0,235,37,61,27,1,116,32,198,6,12,0,1,
+61,52,5,116,17,61,51,4,117,7,198,6,12,0,0,235,
+5,61,0,122,117,189,184,1,0,235,3,184,0,0,102,89,
+102,91,195,187,3,0,139,62,231,18,102,184,0,0,2,2,
+139,195,102,137,5,102,184,0,0,3,16,139,195,102,137,69,
+6,232,35,0,195,187,2,0,139,62,231,18,102,184,0,0,
+2,2,139,195,102,137,5,102,184,0,0,3,16,139,195,102,
+137,69,6,232,1,0,195,139,62,223,18,102,184,82,4,1,
 0,102,137,5,102,184,0,0,2,0,102,137,69,4,139,22,
-231,18,232,243,247,102,137,69,8,102,184,0,2,0,0,102,
-137,69,12,232,44,77,232,101,77,95,102,90,102,88,195,102,
-80,102,82,139,62,231,18,87,102,184,2,4,11,4,102,137,
-5,102,184,2,4,15,4,102,137,69,8,139,62,223,18,102,
-184,82,4,0,0,102,137,5,102,184,0,0,2,0,102,137,
-69,4,139,22,231,18,232,159,247,102,137,69,8,102,184,0,
-2,0,0,102,137,69,12,232,216,76,232,17,77,95,102,90,
-102,88,195,96,139,62,231,18,129,199,0,2,87,102,184,2,
-0,3,16,102,137,5,139,62,225,18,102,184,82,4,1,0,
-102,137,5,102,184,0,0,1,0,102,137,69,4,139,22,231,
-18,129,194,0,2,232,80,247,102,137,69,8,102,187,0,2,
-0,0,102,137,93,12,232,137,76,232,194,76,95,97,195,85,
-139,62,231,18,129,199,0,2,87,102,184,0,2,2,4,3,
-197,102,137,5,139,62,225,18,102,184,82,4,1,0,102,137,
-5,102,184,0,0,1,0,102,137,69,4,139,22,231,18,129,
-194,0,2,232,2,247,102,137,69,8,102,187,0,2,0,0,
-102,137,93,12,232,59,76,232,116,76,95,93,195,139,62,231,
-18,129,199,0,2,87,102,80,102,184,0,131,13,0,3,197,
-102,137,5,131,199,4,102,184,1,0,0,0,102,137,5,131,
-199,5,102,184,0,131,15,0,3,197,102,137,5,131,199,4,
-102,51,192,102,64,102,137,5,131,199,5,102,184,0,131,11,
-0,3,197,102,137,5,131,199,4,102,88,102,137,5,131,199,
-4,3,248,139,62,225,18,102,184,82,4,1,0,102,137,5,
-102,184,0,0,3,0,102,137,69,4,139,22,231,18,129,194,
-0,2,232,115,246,102,137,69,8,102,187,0,2,0,0,102,
-137,93,12,232,172,75,232,229,75,95,195,82,139,62,231,18,
-129,199,0,2,87,102,184,0,131,10,0,3,197,102,137,5,
-102,184,1,0,0,0,131,199,4,102,137,5,131,199,4,87,
-131,199,1,102,184,0,131,9,0,3,197,102,137,5,102,184,
-2,0,0,0,131,199,4,102,137,5,131,199,4,87,131,199,
-2,102,184,0,131,12,0,3,197,102,137,5,102,184,8,0,
-0,0,131,199,4,102,137,5,131,199,4,87,139,62,225,18,
-102,184,82,4,1,0,102,137,5,102,184,0,0,3,0,102,
-137,69,4,139,22,231,18,129,194,0,2,232,218,245,102,137,
-69,8,102,187,0,2,0,0,102,137,93,12,232,19,75,232,
-76,75,95,102,139,5,102,163,132,20,102,139,69,4,102,163,
-136,20,95,139,5,95,138,21,246,226,102,15,183,192,95,90,
-195,139,62,231,18,129,199,0,2,87,102,184,0,3,2,1,
+231,18,232,139,250,102,137,69,8,102,187,0,2,0,0,102,
+137,93,12,232,196,79,232,253,79,139,62,231,18,195,87,139,
+62,231,18,102,184,3,4,3,1,102,137,5,131,199,5,102,
+184,3,4,17,1,102,137,5,131,199,5,102,184,3,4,7,
+1,102,137,5,131,199,5,102,184,3,4,8,1,102,137,5,
+131,199,5,102,184,3,4,18,1,102,137,5,131,199,5,102,
+184,3,4,19,1,102,137,5,131,199,5,102,184,3,4,20,
+1,102,137,5,139,62,223,18,102,184,82,4,2,0,102,137,
+5,102,184,0,0,7,0,102,137,69,4,139,22,231,18,232,
+254,249,102,137,69,8,102,187,0,2,0,0,102,137,93,12,
+232,55,79,232,112,79,139,62,231,18,138,69,4,136,68,21,
+138,69,9,136,68,22,138,69,14,136,68,23,138,69,19,136,
+68,24,138,69,24,136,68,26,138,69,29,36,1,136,68,25,
+10,192,116,10,138,69,34,36,1,208,224,8,68,25,95,195,
+191,174,112,46,128,61,255,117,2,249,195,46,56,5,117,5,
+46,139,125,1,195,131,199,3,235,233,85,86,139,62,231,18,
+129,199,0,2,87,102,184,0,2,3,40,3,197,102,137,5,
+139,62,225,18,102,184,82,4,1,0,102,137,5,102,184,0,
+0,1,0,102,137,69,4,139,22,231,18,129,194,0,2,232,
+94,249,102,137,69,8,102,187,0,2,0,0,102,137,93,12,
+232,151,78,232,208,78,95,176,0,136,69,44,6,140,216,142,
+192,131,199,4,139,247,80,81,82,86,87,156,252,139,197,178,
+31,246,226,191,254,18,3,248,185,30,0,243,164,50,192,170,
+157,95,94,90,89,88,7,94,93,195,96,51,237,15,182,76,
+21,139,62,231,18,129,199,0,2,87,102,184,0,2,3,40,
 3,197,102,137,5,139,62,225,18,102,184,82,4,1,0,102,
 137,5,102,184,0,0,1,0,102,137,69,4,139,22,231,18,
-129,194,0,2,232,113,245,102,137,69,8,102,187,0,2,0,
-0,102,137,93,12,232,170,74,232,227,74,95,195,96,6,102,
-80,30,7,51,192,185,131,7,252,191,27,0,3,254,243,170,
-86,87,139,254,185,12,0,254,204,136,165,168,1,136,165,216,
-5,136,68,27,198,68,29,3,136,100,31,136,100,35,131,198,
-32,131,199,38,4,17,226,225,95,94,136,46,120,20,232,42,
-250,189,72,3,3,238,137,172,164,1,139,77,4,11,201,15,
-132,78,2,131,199,10,51,237,86,87,139,221,136,30,151,20,
-138,5,162,121,20,60,0,117,4,65,233,39,2,80,232,138,
-254,232,249,253,138,69,8,192,232,2,131,199,9,138,101,8,
-208,228,10,196,162,141,20,131,199,17,138,69,5,162,118,20,
-88,128,61,0,117,111,128,125,1,6,117,29,138,69,1,136,
-132,156,1,102,139,69,12,102,137,132,157,1,232,2,255,138,
-69,4,136,132,155,1,233,219,1,80,232,97,4,131,198,27,
-198,68,4,255,138,69,1,136,68,2,160,141,20,136,68,7,
-160,151,20,136,68,1,88,139,30,197,20,168,1,116,27,138,
-135,162,1,180,3,246,228,254,135,162,1,129,195,111,3,3,
-216,137,55,198,71,2,2,233,154,1,128,76,7,64,254,135,
-161,1,233,143,1,51,192,162,140,20,128,125,1,0,117,69,
-87,131,199,20,176,20,138,21,246,226,139,208,138,69,1,138,
-101,2,95,11,210,116,46,86,139,180,164,1,198,68,2,96,
-136,100,1,138,37,136,36,131,198,3,137,54,116,20,94,131,
-194,20,60,5,116,6,198,69,1,7,235,9,138,37,176,80,
-10,224,136,101,1,102,199,6,142,20,255,255,255,255,102,199,
-6,146,20,255,255,255,255,198,6,150,20,0,199,6,234,18,
-0,0,138,69,2,162,130,20,138,69,1,162,131,20,81,15,
-182,13,136,46,119,20,131,199,20,246,6,121,20,128,117,5,
-128,14,141,20,128,128,61,0,15,132,175,0,81,183,255,81,
-15,182,13,246,6,121,20,128,116,72,86,139,54,116,20,138,
-93,5,136,28,136,124,3,94,128,227,252,128,251,236,117,11,
-128,38,118,20,254,254,6,124,20,235,34,128,251,220,116,24,
-128,251,248,117,7,128,38,118,20,247,235,22,128,251,244,117,
-17,128,38,118,20,251,235,10,128,38,118,20,253,138,125,3,
-138,223,131,199,20,246,6,121,20,128,116,44,86,139,54,116,
-20,15,182,69,3,60,255,116,4,15,171,68,1,10,255,117,
-20,60,255,117,8,138,69,4,192,224,4,235,8,128,14,119,
-20,128,136,68,3,94,254,207,232,10,1,226,200,131,6,116,
-20,4,208,46,119,20,89,73,15,133,97,255,89,176,8,42,
-193,138,200,254,201,210,46,119,20,235,69,131,239,20,138,93,
-5,183,255,128,227,252,128,251,236,117,6,254,6,124,20,235,
-5,128,251,220,117,5,138,125,3,138,223,131,199,20,138,69,
-3,10,255,117,20,60,255,116,7,12,16,162,119,20,235,9,
-138,195,128,203,32,136,30,119,20,232,169,0,254,207,226,222,
-89,232,162,1,95,94,69,71,254,6,151,20,73,15,133,183,
-253,51,237,139,221,15,182,76,21,86,83,232,113,251,102,139,
-69,4,102,137,68,43,102,131,124,47,0,117,4,102,137,68,
-47,232,15,251,91,131,199,4,3,253,138,5,60,0,116,66,
-254,195,168,1,116,81,254,199,128,124,29,3,117,52,60,255,
-117,26,176,12,136,68,29,139,197,136,68,35,198,68,28,114,
-86,139,54,197,20,254,132,161,1,94,235,22,136,68,29,139,
-197,136,68,35,198,68,28,115,86,139,54,197,20,254,132,110,
-3,94,69,131,198,32,226,146,94,136,92,4,136,124,5,232,
-60,2,102,88,7,97,195,136,68,29,139,197,136,68,35,198,
-68,28,116,235,221,254,6,140,20,86,232,225,1,198,68,28,
-113,115,108,160,120,20,136,68,31,198,68,29,1,15,182,69,
-3,15,171,6,234,18,102,80,102,83,81,102,187,15,0,0,
-0,102,35,195,138,14,150,20,138,233,128,249,32,114,3,128,
-233,32,128,249,0,116,6,102,211,224,102,211,227,102,131,243,
-255,128,253,32,114,12,102,33,30,146,20,102,9,6,146,20,
-235,10,102,33,30,142,20,102,9,6,142,20,128,6,150,20,
-4,89,102,91,102,88,131,199,20,137,54,128,20,94,195,128,
-6,150,20,4,235,240,96,183,255,81,15,182,13,138,93,5,
-136,28,136,124,3,128,227,252,128,251,236,117,7,62,128,102,
-8,254,235,34,128,251,220,116,24,128,251,248,117,7,62,128,
-102,8,247,235,22,128,251,244,117,17,62,128,102,8,251,235,
-10,62,128,102,8,253,138,125,3,138,223,131,199,20,51,192,
-137,68,1,15,182,69,3,60,255,116,4,15,171,68,1,10,
-255,117,20,60,255,117,8,138,69,4,192,224,4,235,8,128,
-14,119,20,128,136,68,3,254,207,131,199,20,226,213,131,198,
-4,89,226,131,97,195,83,86,160,120,20,179,38,246,227,139,
-216,3,222,138,38,118,20,136,167,174,1,160,131,20,136,135,
-168,1,60,7,124,25,10,228,116,62,139,132,164,1,137,135,
-180,1,131,232,38,137,132,164,1,138,38,119,20,235,41,176,
-255,136,135,202,1,160,119,20,138,224,128,228,240,128,252,16,
-116,14,128,252,32,117,21,50,228,192,224,4,12,15,235,4,
-180,1,36,15,136,135,202,1,136,167,203,1,102,161,142,20,
-102,137,135,186,1,102,161,146,20,102,137,135,190,1,160,151,
-20,136,135,166,1,160,120,20,136,135,167,1,160,130,20,136,
-135,169,1,160,140,20,136,135,170,1,160,141,20,136,135,178,
-1,102,161,132,20,102,137,135,182,1,102,161,136,20,102,137,
-135,198,1,161,234,18,137,135,171,1,129,195,166,1,139,54,
-197,20,160,121,20,168,128,116,26,138,132,162,1,254,132,162,
-1,180,3,246,228,129,198,111,3,3,240,137,28,198,68,2,
-1,235,4,254,132,163,1,94,91,254,6,120,20,195,138,69,
-3,60,255,117,6,139,54,128,20,248,195,80,180,32,246,228,
-3,240,131,248,0,117,11,128,188,156,1,0,116,4,254,14,
-151,20,88,136,68,35,138,69,4,136,68,36,102,139,69,8,
-102,137,68,51,102,139,69,12,102,137,68,47,249,195,30,6,
-87,81,83,139,54,197,20,15,182,132,161,1,136,132,198,7,
-138,132,162,1,136,132,223,7,138,132,110,3,136,132,248,7,
-138,132,163,1,136,132,17,8,136,164,199,7,136,164,224,7,
-136,164,249,7,136,164,18,8,140,217,142,193,185,128,1,86,
-139,254,129,199,86,4,131,198,27,252,243,164,94,86,139,140,
-164,1,131,193,38,139,254,129,199,214,5,129,198,166,1,43,
-206,243,164,94,139,254,129,199,150,3,51,192,185,192,0,243,
-170,185,13,0,139,254,129,199,158,7,129,198,111,3,138,92,
-2,136,93,2,128,251,1,116,9,128,251,2,116,12,139,28,
-235,14,139,28,129,195,48,4,235,6,139,28,129,195,59,4,
-137,29,131,198,3,131,199,3,226,212,91,89,95,7,31,195,
-83,80,30,235,5,83,80,30,14,31,180,14,138,5,10,192,
-116,36,60,19,117,27,80,83,82,180,15,205,16,180,3,205,
-16,180,14,176,32,205,16,254,194,128,250,79,114,243,90,91,
-88,205,16,71,235,212,31,88,91,195,87,191,234,111,232,196,
-255,80,82,160,152,20,60,0,116,8,232,98,77,2,208,232,
-78,77,90,88,95,195,83,51,201,11,192,116,9,15,188,216,
-15,179,216,65,235,243,91,195,87,83,102,51,192,139,62,225,
-18,198,5,28,136,69,3,198,69,1,2,136,69,2,102,137,
-69,4,232,13,68,232,70,68,91,95,195,0,30,6,15,168,
-198,6,13,0,1,128,62,12,0,0,116,15,180,15,205,16,
-80,184,18,0,205,16,198,6,13,0,0,139,54,195,20,137,
-54,197,20,232,141,0,232,52,249,139,52,131,254,255,117,239,
-30,7,14,31,14,15,169,38,139,54,195,20,38,137,54,197,
-20,38,138,14,199,20,128,249,1,116,49,190,24,21,38,136,
-76,1,232,87,2,186,24,21,191,19,113,190,201,112,51,237,
-232,44,69,60,9,117,5,232,167,21,235,47,60,8,117,12,
-235,41,232,187,22,232,96,21,116,219,235,31,38,139,22,197,
-20,129,194,197,7,191,137,117,190,42,119,51,237,232,255,68,
-60,7,116,193,60,9,117,3,232,118,21,38,128,62,12,0,
-0,116,11,88,180,0,205,16,38,198,6,12,0,0,15,169,
-7,31,195,81,86,51,192,136,132,41,8,136,132,42,8,136,
-132,43,8,136,132,44,8,185,12,0,136,132,249,7,136,132,
-199,7,136,132,224,7,136,132,150,3,136,132,151,3,136,132,
-153,3,136,132,198,3,136,132,199,3,136,132,201,3,136,132,
-246,3,136,132,247,3,136,132,249,3,136,132,38,4,136,132,
-39,4,136,132,41,4,131,198,4,226,203,94,86,199,132,200,
-7,254,255,185,222,7,3,206,137,140,202,7,185,198,3,3,
-206,137,140,204,7,199,132,206,7,115,80,199,132,208,7,188,
-79,199,132,210,7,172,82,199,132,212,7,187,82,199,132,214,
-7,201,79,199,132,216,7,228,79,199,132,218,7,251,80,199,
-132,220,7,111,82,185,197,7,3,206,137,140,225,7,185,16,
-8,3,206,137,140,227,7,185,246,3,3,206,137,140,229,7,
-199,132,231,7,115,80,199,132,233,7,188,79,199,132,235,7,
-172,82,199,132,237,7,187,82,199,132,239,7,255,79,199,132,
-241,7,26,80,199,132,243,7,238,58,199,132,245,7,111,82,
-185,222,7,3,206,137,140,19,8,185,247,7,3,206,137,140,
-21,8,185,38,4,3,206,137,140,23,8,199,132,25,8,115,
-80,199,132,27,8,188,79,199,132,29,8,172,82,199,132,31,
-8,187,82,199,132,33,8,202,82,199,132,35,8,202,82,199,
-132,37,8,202,82,199,132,39,8,111,82,185,16,8,3,206,
-137,140,250,7,199,132,252,7,255,255,185,150,3,3,206,137,
-140,254,7,199,132,0,8,115,80,199,132,2,8,188,79,199,
-132,4,8,172,82,199,132,6,8,187,82,199,132,8,8,202,
-82,199,132,10,8,202,82,199,132,12,8,202,82,199,132,14,
-8,111,82,94,89,195,30,6,96,6,180,31,232,36,75,51,
-210,187,79,29,176,2,180,31,232,46,75,140,200,142,232,142,
-192,185,9,0,141,54,225,112,232,207,75,182,2,178,5,232,
-174,74,31,139,54,195,20,191,200,20,179,23,232,35,0,138,
-68,10,136,5,136,117,1,131,199,4,254,198,254,198,139,52,
-131,254,255,117,229,140,192,30,7,142,216,232,127,0,97,7,
-31,195,232,123,74,6,86,140,200,142,192,190,24,172,232,157,
-72,94,7,138,68,10,179,1,232,62,73,195,38,199,68,3,
-254,255,38,199,68,5,255,255,185,200,20,38,137,76,7,38,
-199,68,9,115,80,38,199,68,11,188,79,38,199,68,13,172,
-82,38,199,68,15,187,82,38,199,68,17,202,82,38,199,68,
-19,202,82,38,199,68,21,202,82,38,199,68,23,202,82,195,
-81,86,38,15,182,14,24,21,38,139,54,195,20,227,5,38,
-139,52,226,251,38,137,54,197,20,249,94,89,195,38,128,62,
-241,18,1,117,68,38,198,6,241,18,16,38,128,62,124,20,
-0,116,28,186,7,1,187,72,23,176,1,180,71,185,27,0,
-141,54,105,113,232,201,70,232,59,66,232,232,70,235,26,186,
-7,4,187,72,18,176,1,180,112,185,14,0,141,54,35,113,
-232,173,70,232,31,66,232,204,70,195,0,0,96,160,241,18,
-60,1,124,56,186,17,11,187,58,15,176,1,180,112,185,3,
-0,190,240,113,232,137,70,186,29,12,232,147,73,139,69,151,
-232,84,72,139,69,150,232,78,72,186,44,12,232,129,73,138,
-5,36,31,232,65,72,232,220,65,232,137,70,97,195,0,0,
-80,83,81,82,86,176,1,177,30,232,239,69,232,82,0,185,
-22,0,190,59,115,6,14,7,232,111,74,7,232,182,65,61,
-0,80,116,12,61,0,81,116,7,61,27,1,116,38,235,236,
-232,46,0,185,24,0,190,169,115,6,14,7,232,75,74,7,
-232,146,65,61,0,72,116,196,61,0,73,116,191,61,27,1,
-116,2,235,236,176,1,177,30,232,204,69,94,90,89,91,88,
-195,185,73,22,186,6,2,183,112,232,52,73,186,6,2,187,
-73,22,180,112,176,1,232,96,73,195,80,83,81,82,86,186,
-7,2,187,72,19,176,1,180,112,185,10,0,190,33,116,232,
-206,69,232,64,65,232,237,69,94,90,89,91,88,195,80,83,
-81,82,86,186,5,4,187,74,17,176,1,180,112,185,11,0,
-190,83,116,232,170,69,232,28,65,232,201,69,94,90,89,91,
-88,195,83,81,82,86,186,10,18,187,69,22,176,1,180,112,
-185,1,0,190,203,116,232,135,69,232,92,17,116,10,30,6,
-31,232,58,250,184,5,0,31,232,154,69,248,94,90,89,91,
-195,30,6,31,139,54,197,20,86,232,0,18,115,28,139,54,
-195,20,137,54,197,20,232,71,34,139,52,131,254,255,117,242,
-249,94,137,54,197,20,176,8,31,195,94,137,54,197,20,248,
-31,195,176,9,249,195,38,160,199,20,60,1,116,4,176,7,
-235,2,176,9,249,195,38,199,6,61,21,185,42,232,240,3,
-51,192,249,195,96,38,139,54,197,20,30,6,31,232,178,240,
-31,30,6,15,168,6,180,31,232,104,72,51,210,187,79,29,
-176,2,180,31,232,114,72,140,200,142,232,142,192,185,7,0,
-141,54,65,114,232,19,73,7,38,128,62,199,20,1,6,14,
-7,127,12,185,4,0,141,54,100,114,232,253,72,235,10,185,
-4,0,141,54,120,114,232,241,72,7,50,246,178,52,232,207,
-71,38,139,54,197,20,38,138,68,21,86,129,198,198,3,232,
-48,3,94,86,129,198,246,3,232,39,3,94,38,138,68,10,
-232,134,70,182,2,178,5,232,166,71,38,139,54,197,20,38,
-15,182,140,198,7,227,117,178,5,179,30,86,6,14,7,190,
-69,133,232,185,69,254,198,7,94,51,237,38,139,188,204,7,
-129,198,86,4,38,138,92,2,128,251,12,116,19,128,251,15,
-116,7,128,251,13,116,9,235,60,38,246,68,7,64,116,53,
-179,31,69,176,128,178,5,232,193,12,232,98,71,38,246,69,
-3,1,116,10,178,4,232,71,71,176,42,232,39,71,38,138,
-68,8,38,136,5,38,136,117,1,38,136,117,2,131,199,4,
-254,198,73,227,5,131,198,32,235,170,254,198,51,237,38,139,
-54,197,20,129,198,158,7,38,15,182,76,2,11,201,116,127,
-6,86,81,14,7,190,88,133,179,30,178,5,232,47,69,89,
-94,7,254,198,179,31,38,136,30,14,0,38,139,62,197,20,
-38,139,189,229,7,38,15,182,76,2,227,83,87,82,128,249,
-1,117,17,38,139,60,179,31,183,23,178,5,232,126,13,232,
-221,70,235,12,86,38,139,52,176,64,178,5,232,44,12,94,
-138,254,90,95,38,246,69,3,1,116,10,178,4,232,176,70,
-176,42,232,144,70,139,197,38,136,5,38,136,117,1,38,136,
-125,2,131,199,4,131,198,3,138,247,254,198,69,235,166,51,
-237,38,139,54,197,20,38,15,182,140,17,8,11,201,116,123,
-129,198,214,5,6,86,81,14,7,190,205,134,179,30,178,5,
-232,155,68,89,94,7,254,198,179,31,38,136,30,14,0,38,
-139,62,197,20,38,139,189,23,8,131,238,38,131,198,38,38,
-128,124,4,0,116,246,38,246,68,12,128,116,239,87,82,139,
-254,179,31,183,23,178,5,232,227,12,232,66,70,138,254,90,
-95,38,246,69,3,1,116,10,178,4,232,35,70,176,42,232,
-3,70,38,138,68,1,38,136,5,38,136,117,1,38,136,125,
-2,131,199,4,138,247,254,198,69,226,177,38,128,14,13,0,
-1,51,237,185,12,0,38,139,54,197,20,38,139,188,254,7,
-129,198,86,4,38,138,92,2,128,251,217,114,94,131,253,0,
-117,20,83,178,5,179,30,86,6,14,7,190,174,134,232,253,
-67,254,198,7,94,91,246,195,1,116,4,179,31,235,2,179,
-23,38,136,30,14,0,176,128,178,5,232,30,11,232,191,69,
-69,128,251,23,116,35,38,246,69,3,1,116,10,178,4,232,
-158,69,176,42,232,126,69,38,138,68,8,38,136,5,38,136,
-117,1,38,136,117,2,131,199,4,254,198,131,198,32,226,148,
-38,128,38,13,0,254,232,116,251,248,15,169,7,31,97,195,
-96,83,30,6,15,168,102,80,38,139,30,197,20,38,15,182,
-183,199,7,131,254,1,115,29,186,10,18,187,69,23,176,1,
-180,112,185,4,0,190,208,116,232,53,66,232,167,61,232,84,
-66,249,233,164,0,87,80,83,191,169,117,78,193,230,2,187,
-65,117,138,64,2,136,69,12,254,192,2,5,136,69,2,139,
-0,137,69,10,139,248,138,64,3,190,61,119,38,199,6,53,
-21,0,0,38,199,6,90,21,1,0,38,199,6,57,21,0,
-0,91,88,95,180,31,232,74,69,51,210,187,79,24,176,2,
-180,31,232,84,69,6,140,200,142,232,142,192,185,16,0,141,
-54,140,114,232,244,69,88,142,232,142,192,182,6,38,139,30,
-197,20,38,15,182,143,198,7,38,139,191,204,7,38,246,69,
-3,1,116,32,38,138,5,179,32,246,227,38,139,54,197,20,
-3,240,129,198,86,4,176,128,179,31,178,10,232,12,10,232,
-173,68,254,198,131,199,4,226,212,102,88,15,169,7,31,91,
-97,195,96,15,182,200,38,128,124,1,0,116,7,131,198,4,
-226,244,235,58,139,254,131,249,1,126,51,73,131,198,4,38,
-15,182,68,1,10,192,116,33,38,136,100,1,38,136,69,1,
-38,138,4,38,136,5,38,138,68,2,38,136,69,2,38,138,
-68,3,38,136,69,3,131,199,4,131,198,4,226,209,97,195,
-96,30,6,31,60,1,15,133,33,1,131,62,49,21,4,117,
-6,232,136,17,233,20,1,51,210,137,22,234,18,38,139,30,
-197,20,38,15,182,143,198,7,38,139,159,204,7,83,246,71,
-3,1,116,9,15,182,7,15,171,6,234,18,66,131,195,4,
-226,236,255,22,61,21,115,31,96,186,14,8,187,65,13,176,
-1,180,112,185,4,0,190,138,116,232,212,64,232,70,60,232,
-243,64,97,91,233,196,0,38,139,30,197,20,38,40,151,198,
-7,38,40,151,199,7,232,176,2,160,123,21,232,203,3,91,
-15,182,202,235,5,131,195,4,235,2,83,81,246,71,3,1,
-116,243,15,182,7,182,32,246,230,38,139,62,197,20,3,248,
-160,123,21,136,133,90,4,198,133,88,4,1,131,195,4,226,
-219,89,91,51,246,235,3,131,195,4,246,71,3,1,116,247,
-15,182,7,182,32,246,230,38,139,62,197,20,3,248,198,133,
-87,4,113,139,198,136,133,95,4,160,123,21,136,133,90,4,
-102,80,83,102,82,138,248,232,216,43,86,102,83,102,139,216,
-138,165,90,4,176,38,246,228,38,139,54,197,20,3,240,102,
-137,156,230,5,102,137,148,246,5,102,139,195,102,91,94,102,
-90,91,102,88,51,192,136,71,1,136,71,3,70,131,195,4,
-226,152,38,139,30,197,20,254,135,223,7,31,97,195,80,86,
-232,22,0,51,192,190,211,117,232,162,61,232,109,0,51,192,
-190,232,117,232,151,61,94,88,195,38,199,6,55,21,1,0,
-86,190,211,117,38,161,49,21,131,248,4,116,46,131,248,1,
-116,41,131,248,2,116,36,131,248,5,116,18,131,248,82,125,
-13,198,68,12,3,199,68,10,125,117,176,4,235,31,198,68,
-12,3,199,68,10,125,117,176,4,235,18,198,68,12,1,199,
-68,10,80,172,38,199,6,55,21,0,0,176,2,2,4,136,
-68,2,94,38,199,6,51,21,7,0,195,38,199,6,57,21,
-0,0,86,190,232,117,38,161,49,21,232,175,41,114,13,198,
-68,12,1,199,68,10,80,172,176,2,235,11,198,68,12,2,
-199,68,10,117,117,176,3,2,4,136,68,2,94,38,199,6,
-59,21,0,0,195,87,86,102,80,83,81,82,161,49,21,60,
-7,15,140,35,1,117,5,185,2,0,235,9,36,15,134,194,
-246,242,15,182,200,73,139,209,102,51,192,139,216,102,72,102,
-163,72,21,102,163,76,21,161,234,18,163,80,21,163,86,21,
-51,192,163,84,21,15,188,6,80,21,15,132,176,0,15,171,
-6,84,21,15,179,6,80,21,138,248,161,80,21,163,82,21,
-139,202,15,188,6,82,21,116,215,15,179,6,82,21,138,216,
-176,31,246,231,191,254,18,3,248,176,31,246,227,190,254,18,
-3,240,81,185,31,0,243,166,89,117,215,139,62,197,20,131,
-199,27,139,247,176,32,246,231,3,248,176,32,246,227,3,240,
-102,139,69,16,102,59,68,16,117,184,15,182,195,15,171,6,
-84,21,226,174,15,188,6,84,21,15,179,6,86,21,15,179,
-6,84,21,15,179,6,80,21,102,193,6,76,21,4,102,139,
-30,76,21,138,227,128,227,240,10,216,102,137,30,76,21,138,
-220,128,227,15,102,193,38,72,21,4,102,161,72,21,10,195,
-102,163,72,21,131,62,84,21,0,117,185,233,66,255,15,188,
-6,86,21,116,51,15,179,6,86,21,102,193,6,76,21,4,
-102,139,30,76,21,138,227,128,227,240,10,216,102,137,30,76,
-21,138,220,128,227,15,102,193,38,72,21,4,102,161,72,21,
-10,195,102,163,72,21,235,198,102,161,76,21,102,161,72,21,
-90,89,91,102,88,94,95,248,195,102,80,83,81,82,86,87,
-85,38,139,54,197,20,139,254,185,12,0,50,219,128,188,216,
-5,255,116,15,131,188,219,5,0,116,8,254,195,131,198,38,
-226,235,204,138,133,223,7,180,3,246,228,5,158,7,3,248,
-139,198,5,214,5,198,69,2,1,137,5,198,132,250,5,255,
-102,161,76,21,102,137,132,234,5,102,161,72,21,102,137,132,
-238,5,136,156,215,5,136,30,123,21,161,88,21,128,164,226,
-5,254,8,132,226,5,161,59,21,131,224,1,208,224,8,132,
-226,5,161,51,21,131,62,49,21,82,124,2,51,192,136,132,
-217,5,161,234,18,137,132,219,5,198,132,214,5,112,136,148,
-218,5,198,132,221,5,1,198,132,222,5,255,161,49,21,136,
-132,216,5,60,7,124,106,60,7,117,9,15,182,202,209,233,
-179,2,235,13,138,218,36,15,15,182,200,134,195,246,243,138,
-216,232,91,41,137,188,228,5,198,69,2,96,136,13,161,51,
-21,136,69,1,131,199,3,102,139,132,234,5,51,237,81,15,
-182,203,51,210,137,85,1,138,248,128,231,15,15,182,215,15,
-171,85,1,102,193,232,4,69,131,253,8,117,5,102,139,132,
-238,5,226,227,198,5,255,198,69,3,255,131,199,4,89,226,
-205,93,95,94,90,89,91,102,88,195,87,86,102,85,102,80,
-102,83,81,82,179,38,246,227,38,139,54,197,20,3,240,138,
-148,217,5,138,180,216,5,139,188,219,5,15,182,140,218,5,
-81,102,187,255,255,255,255,139,199,232,52,0,102,139,132,106,
-4,102,45,0,8,0,0,81,138,202,232,147,8,89,102,59,
-195,119,3,102,139,216,226,223,89,139,199,232,18,0,102,137,
-156,106,4,226,244,90,89,102,91,102,88,102,93,94,95,195,
-80,83,81,181,255,254,197,209,200,114,2,235,248,254,201,117,
-244,138,197,179,32,246,227,38,139,54,197,20,3,240,89,91,
-88,195,102,80,83,81,82,87,86,30,6,15,168,85,38,139,
-30,197,20,129,195,222,7,232,165,2,117,57,38,139,30,197,
-20,129,195,247,7,232,151,2,117,43,38,139,30,197,20,129,
-195,16,8,232,137,2,117,29,186,9,18,187,70,23,176,1,
-180,112,185,4,0,190,228,116,232,21,60,232,135,55,232,52,
-60,249,233,238,0,180,31,232,105,63,186,0,0,187,79,24,
-176,2,180,31,232,114,63,6,140,200,142,232,142,192,185,6,
-0,141,54,220,114,232,18,64,7,182,6,38,139,30,197,20,
-38,15,182,143,223,7,129,195,222,7,232,50,2,116,62,139,
-251,38,246,69,3,1,116,48,38,138,5,179,3,246,227,38,
-139,54,197,20,3,240,129,198,158,7,38,138,92,2,128,251,
-2,116,15,87,38,139,60,232,150,0,95,232,193,62,254,198,
-235,6,38,139,52,232,146,0,131,199,4,226,196,38,139,30,
-197,20,38,15,182,143,17,8,129,195,16,8,232,224,1,116,
-42,139,251,38,246,69,3,1,116,28,38,138,5,179,38,246,
-227,87,38,139,62,197,20,3,248,129,199,214,5,232,80,0,
-95,232,123,62,254,198,131,199,4,226,216,38,139,30,197,20,
-38,15,182,143,248,7,129,195,247,7,232,162,1,116,35,139,
-251,38,246,69,3,1,116,21,38,138,5,179,32,246,227,38,
-139,54,197,20,3,240,129,198,86,4,232,29,0,131,199,4,
-226,223,248,93,15,169,7,31,94,95,90,89,91,102,88,195,
-179,31,183,23,178,5,232,196,4,195,179,31,183,23,178,3,
-176,1,232,118,3,232,23,62,254,198,195,96,30,6,31,60,
-1,117,50,190,222,7,191,245,47,232,44,0,232,251,0,190,
-247,7,191,123,47,232,32,0,190,16,8,191,130,47,232,23,
-0,38,139,54,197,20,38,136,140,224,7,38,136,140,249,7,
-38,136,140,18,8,31,97,195,38,3,54,197,20,38,15,182,
-76,2,227,34,38,40,76,1,38,139,116,7,131,238,4,131,
-198,4,246,68,3,1,116,247,136,108,1,136,108,3,138,28,
-87,255,215,95,226,233,195,232,221,2,232,8,0,195,232,232,
-2,232,41,0,195,198,69,2,12,102,80,138,69,8,198,69,
-1,114,198,69,7,0,102,139,69,16,102,137,69,20,102,88,
-87,38,139,62,197,20,38,254,133,198,7,95,195,51,192,139,
-93,14,11,219,116,11,137,69,14,254,200,38,136,71,2,254,
-192,136,69,12,136,69,4,254,200,136,69,36,136,69,2,198,
-69,7,0,198,69,9,0,51,219,139,69,5,137,93,5,209,
-200,115,6,232,145,255,136,125,4,254,195,128,251,16,117,239,
-195,176,3,246,227,38,139,62,197,20,3,248,129,199,158,7,
-138,93,2,87,139,61,128,251,2,116,5,232,159,255,235,3,
-232,114,255,95,50,192,136,69,2,195,38,139,62,197,20,129,
-199,158,7,176,13,180,3,246,228,139,232,3,239,138,69,2,
-10,192,116,9,131,199,3,59,239,127,242,235,33,139,247,131,
-198,3,15,182,68,2,10,192,116,13,136,69,2,136,100,2,
-139,4,137,5,131,199,3,131,198,3,59,238,127,228,195,81,
-38,15,182,79,1,227,16,38,139,95,7,38,246,71,3,1,
-117,7,131,195,4,226,244,51,219,89,11,219,195,96,30,6,
-15,168,176,1,177,30,232,18,57,6,180,31,232,212,60,186,
-0,0,187,79,24,176,2,180,31,232,221,60,140,200,142,232,
-142,192,185,13,0,141,54,250,114,232,126,61,7,38,139,54,
-197,20,186,45,1,232,88,60,38,138,68,8,232,24,59,176,
-46,232,182,59,38,138,68,9,192,232,3,232,9,59,176,46,
-232,167,59,38,138,68,9,36,7,232,13,59,38,138,68,10,
-186,61,1,232,42,60,232,0,59,186,73,1,232,33,60,38,
-139,68,6,232,214,58,30,6,31,232,49,229,31,96,139,247,
-131,198,4,38,198,68,16,0,38,198,68,36,0,38,198,68,
-56,0,186,49,2,179,23,232,36,58,131,198,20,186,13,2,
-179,23,232,25,58,131,198,20,186,8,3,179,23,232,14,58,
-6,14,7,190,223,167,46,128,62,60,0,1,116,3,190,219,
-167,186,24,5,179,23,232,245,57,7,97,30,6,31,232,58,
-229,31,96,38,139,69,6,193,232,4,186,22,4,232,176,59,
-179,23,179,31,38,136,30,14,0,179,0,232,123,58,179,30,
-38,136,30,14,0,232,167,59,254,194,232,147,59,176,77,232,
-115,59,176,66,232,110,59,139,247,131,198,12,38,198,68,20,
-0,186,49,3,179,23,232,165,57,97,6,31,178,1,182,4,
-232,109,59,232,207,51,176,1,177,30,232,26,56,248,15,169,
-7,31,97,184,32,57,195,83,81,82,232,83,59,139,202,187,
-0,0,232,176,51,61,0,75,116,57,61,13,28,116,74,61,
-27,1,117,3,249,235,69,60,48,114,231,60,57,119,13,44,
-48,180,48,193,227,4,10,216,2,196,235,16,12,32,60,97,
-114,208,60,102,119,204,44,87,180,87,235,231,232,123,58,254,
-194,235,191,59,202,116,187,193,235,4,254,202,232,1,59,176,
-32,232,102,58,232,249,58,235,169,139,195,248,90,89,91,195,
-87,6,80,81,60,0,117,6,140,200,142,192,235,6,46,161,
-38,16,142,192,232,217,58,138,225,38,138,5,232,152,57,71,
-176,32,232,53,58,254,204,117,240,232,94,237,254,198,254,205,
-117,226,89,88,7,95,195,38,139,62,197,20,80,176,32,246,
-227,3,248,129,199,86,4,88,195,38,139,62,197,20,80,176,
-38,246,227,3,248,129,199,214,5,88,195,96,6,15,168,102,
-80,6,15,169,232,137,58,138,200,128,225,127,168,128,117,36,
-38,138,68,1,60,112,127,28,6,86,14,7,190,138,125,232,
-156,56,94,7,60,112,116,7,83,179,0,232,59,57,91,232,
-109,58,178,13,38,138,68,8,38,162,123,20,102,38,139,68,
-16,139,254,86,102,80,6,140,200,142,192,190,122,125,246,193,
-1,116,3,190,129,125,232,101,56,7,38,160,123,20,83,179,
-0,232,5,57,91,190,118,125,184,32,3,246,193,1,116,3,
-184,32,1,38,128,62,123,20,10,114,2,254,204,232,98,56,
-6,140,200,142,192,232,23,58,232,51,56,246,193,64,116,16,
-190,189,124,101,128,125,2,15,117,3,190,203,124,232,30,56,
-7,232,251,57,138,227,38,160,123,20,232,58,34,102,88,102,
-82,102,51,210,232,25,33,102,90,190,153,20,232,195,34,185,
-9,0,232,204,34,190,153,20,232,212,57,232,240,55,94,101,
-138,68,2,60,11,117,5,190,14,125,235,90,60,15,117,5,
-190,11,125,235,72,60,13,117,5,190,170,124,235,63,60,12,
-117,5,190,14,125,235,63,60,217,117,5,190,17,125,235,45,
-60,219,117,5,190,34,125,235,36,60,221,117,5,190,51,125,
-235,27,60,236,117,5,190,67,125,235,18,60,238,117,5,190,
-85,125,235,9,60,254,117,14,190,103,125,235,0,178,61,6,
-30,7,232,137,55,7,102,88,15,169,7,97,195,96,6,15,
-168,102,80,140,192,142,232,101,136,22,122,20,6,140,200,142,
-192,190,151,124,232,103,55,101,138,5,60,112,117,5,184,32,
-2,235,18,83,179,0,232,0,56,91,184,32,1,101,128,61,
-10,114,2,254,204,232,106,55,190,118,125,232,33,57,232,61,
-55,7,6,140,200,142,192,83,101,138,69,4,179,0,232,216,
-55,91,190,38,112,232,7,57,232,35,55,7,30,6,83,140,
-232,142,216,142,192,138,93,2,138,125,3,232,208,32,131,198,
-5,91,7,31,6,232,231,56,232,3,55,7,101,138,69,2,
-87,6,14,7,232,193,224,139,247,232,211,56,232,239,54,7,
-95,176,32,232,159,56,102,82,102,101,139,69,16,102,101,139,
-85,32,232,235,31,102,90,190,153,20,232,149,33,185,9,0,
-232,158,33,190,153,20,232,166,56,232,194,54,38,139,69,14,
-11,192,117,31,6,15,168,7,38,138,69,8,232,77,31,7,
-232,140,56,128,194,4,6,14,7,83,179,31,232,159,54,91,
-7,235,0,101,128,14,13,0,1,101,198,6,14,0,23,101,
-131,125,14,0,117,14,101,138,85,36,101,139,125,5,232,158,
-0,233,142,0,101,139,117,14,101,15,182,12,101,138,100,1,
-131,198,3,101,138,69,2,60,7,117,4,176,2,235,2,176,
-5,101,128,125,8,0,117,3,80,235,81,87,86,30,6,83,
-80,14,7,190,166,125,232,38,56,101,138,22,122,20,254,198,
-232,59,54,140,232,142,216,142,192,91,232,241,31,139,195,91,
-232,12,56,232,40,54,232,239,223,139,247,232,1,56,14,7,
-232,27,54,7,31,94,80,101,138,4,86,232,174,30,232,238,
-55,6,14,7,232,7,54,7,232,213,55,94,101,139,124,1,
-101,138,84,3,86,83,232,22,0,91,94,88,95,131,198,4,
-226,143,101,128,38,13,0,254,102,88,15,169,7,97,195,11,
-255,116,116,96,82,80,15,188,207,15,187,207,176,32,246,225,
-101,139,54,197,20,3,240,129,198,86,4,138,223,232,159,55,
-254,198,101,138,22,122,20,176,129,232,239,252,88,90,82,15,
-186,242,7,115,31,128,226,15,56,202,117,53,6,14,7,190,
-150,125,232,122,55,232,150,53,190,246,153,232,113,55,232,141,
-53,7,235,29,128,226,15,56,202,117,22,6,14,7,190,150,
-125,232,91,55,232,119,53,190,234,153,232,82,55,232,110,53,
-7,90,11,255,117,142,97,195,232,150,54,232,151,47,36,223,
-60,78,116,6,60,89,117,240,12,89,156,232,122,54,157,195,
-102,83,102,82,81,102,80,102,187,1,0,0,0,102,211,227,
-102,51,210,102,247,243,102,88,102,43,194,89,102,90,102,91,
-195,96,30,6,31,184,1,0,232,41,1,115,7,232,48,0,
-114,25,235,41,232,66,3,114,10,232,237,2,114,5,232,87,
-1,115,26,232,250,0,232,159,255,116,18,139,54,195,20,137,
-54,197,20,232,170,16,139,52,131,254,255,117,242,31,97,195,
-186,1,1,187,78,24,176,1,180,112,185,5,0,190,158,116,
-232,157,51,184,0,0,232,219,0,115,48,160,118,20,36,223,
-60,78,116,35,60,89,116,25,232,250,46,61,0,73,117,5,
-232,15,1,235,222,36,223,60,78,116,12,60,89,116,2,235,
-231,232,145,51,249,235,4,232,139,51,248,195,96,184,1,0,
-232,161,0,114,20,232,193,2,114,10,232,108,2,114,5,232,
-214,0,115,0,232,121,0,235,95,186,1,1,187,78,24,176,
-1,180,112,185,5,0,190,158,116,232,52,51,184,0,0,232,
-114,0,115,38,160,118,20,36,223,60,78,116,77,60,89,116,
-67,232,145,46,61,0,73,117,5,232,166,0,235,222,36,223,
-60,78,116,54,60,89,116,44,235,231,182,22,6,14,7,190,
-109,131,232,253,30,7,178,3,2,208,232,3,54,235,16,182,
-14,178,59,232,250,53,235,7,182,14,178,62,232,241,53,232,
-182,254,116,6,232,254,50,249,235,4,232,248,50,248,97,195,
-186,9,18,187,70,23,176,1,180,112,185,2,0,190,183,116,
-232,189,50,195,102,80,96,139,232,182,7,187,164,55,232,119,
-28,162,118,20,114,16,187,110,55,232,108,28,114,8,131,253,
-1,117,3,248,235,0,97,102,88,195,15,182,140,41,8,248,
-227,1,249,195,15,182,140,42,8,248,227,1,249,195,15,182,
-140,43,8,248,227,1,249,195,15,182,140,44,8,248,227,1,
-249,195,81,186,2,7,185,77,21,183,112,232,162,53,89,195,
-86,83,11,237,117,58,15,182,140,41,8,10,201,15,132,100,
-1,178,4,232,90,53,102,80,102,83,102,82,86,6,140,200,
-142,192,190,224,125,232,100,51,7,94,138,68,10,179,1,232,
-23,52,232,205,221,102,90,102,91,102,88,178,18,232,48,53,
-139,254,51,201,136,140,41,8,131,198,27,129,199,86,4,185,
-12,0,38,138,68,2,38,138,101,2,128,252,30,15,132,9,
-1,38,58,69,2,117,87,60,15,116,56,60,0,116,52,60,
-1,15,133,245,0,87,86,179,38,38,138,68,4,139,54,197,
-20,129,198,166,1,246,227,3,240,38,138,69,4,139,62,197,
-20,129,199,214,5,246,227,3,248,232,214,16,94,95,115,30,
-233,199,0,102,38,139,68,24,102,38,59,69,24,117,15,102,
-38,139,68,20,102,38,59,69,20,117,3,233,172,0,86,139,
-54,197,20,254,132,41,8,94,131,253,1,15,132,155,0,87,
-86,6,80,140,200,142,192,190,129,125,232,175,50,88,7,94,
-38,138,68,8,83,179,0,232,95,51,91,176,32,232,234,51,
-6,15,168,140,216,142,232,142,192,232,131,52,138,68,8,180,
-112,232,195,28,15,169,7,232,117,52,254,198,178,18,232,95,
-52,95,128,254,22,117,83,86,6,140,200,142,192,190,234,125,
-232,105,50,7,94,182,14,178,62,232,68,52,81,232,161,51,
-89,232,161,44,61,0,81,117,12,232,182,254,182,7,178,18,
-232,45,52,235,37,61,0,73,117,20,232,165,254,91,94,139,
-54,195,20,137,54,197,20,86,83,182,7,233,179,254,36,223,
-60,78,116,17,60,89,116,13,235,199,131,198,32,131,199,32,
-73,15,133,221,254,91,94,248,195,96,187,44,57,232,168,26,
-187,130,55,232,162,26,97,195,86,139,62,197,20,139,247,15,
-182,141,160,7,227,49,86,87,139,189,158,7,139,180,111,3,
-128,249,1,117,16,138,13,58,12,116,18,139,62,197,20,254,
-133,43,8,235,8,138,77,1,58,76,1,117,238,95,94,131,
-199,3,131,198,3,235,200,94,195,96,187,130,57,232,88,26,
-187,161,57,232,82,26,187,120,55,232,76,26,97,195,185,12,
-0,139,62,197,20,38,128,189,223,5,1,116,7,131,199,38,
-226,243,235,8,139,62,197,20,254,133,42,8,195,86,185,12,
-0,139,62,197,20,38,128,189,216,5,255,116,73,38,128,189,
-216,5,96,116,70,38,139,133,219,5,81,139,54,197,20,38,
-128,188,168,1,255,116,41,38,128,188,168,1,96,116,38,38,
-59,132,171,1,117,26,38,138,133,226,5,36,1,38,50,132,
-178,1,10,192,116,15,139,54,197,20,254,132,42,8,235,5,
-131,198,38,226,202,89,131,199,38,226,170,94,195,61,0,30,
-249,117,69,30,83,81,82,87,46,161,38,16,142,216,139,30,
-197,20,139,251,15,182,77,21,129,195,198,3,128,127,1,0,
-116,27,246,71,3,1,117,21,176,42,128,79,3,1,254,133,
-199,7,30,6,30,7,14,31,232,140,24,7,31,131,195,4,
-226,218,95,90,89,91,31,248,195,80,83,81,82,186,9,18,
-187,70,23,176,1,180,112,185,2,0,232,163,47,232,120,251,
-156,232,193,47,157,90,89,91,88,195,0,0,232,96,0,38,
-139,30,197,20,38,15,182,143,199,7,38,136,175,199,7,38,
-40,143,198,7,38,0,143,223,7,38,139,159,204,7,246,71,
-3,1,116,53,15,182,7,136,103,3,136,103,1,182,32,246,
-230,139,62,197,20,3,248,129,199,86,4,161,88,21,136,69,
-7,128,77,7,128,198,69,2,11,198,69,1,112,198,68,2,
-2,137,60,131,198,3,73,227,5,131,195,4,235,192,195,80,
-83,38,139,30,197,20,38,138,135,223,7,180,3,246,228,139,
-243,3,240,129,198,158,7,91,88,195,61,0,73,116,94,61,
-0,81,116,66,61,114,19,116,5,61,82,19,117,106,96,30,
-6,31,80,83,86,139,243,38,138,7,38,255,87,11,51,192,
-38,136,103,1,38,246,71,3,1,116,8,38,136,103,3,38,
-254,76,2,94,91,88,38,138,31,232,62,0,232,235,244,31,
-97,184,5,0,235,48,38,138,7,254,192,38,58,71,1,116,
-35,38,255,87,15,38,138,7,38,254,7,235,16,38,138,7,
-10,192,116,16,38,255,87,15,38,254,15,254,200,232,134,0,
-38,255,87,13,51,192,249,195,248,195,176,3,246,227,38,139,
-62,197,20,3,248,129,199,158,7,87,138,69,2,139,61,60,
-2,116,45,128,61,112,116,67,198,69,2,30,81,139,77,5,
-227,27,15,188,193,15,179,193,180,32,246,228,38,139,62,197,
-20,129,199,86,4,3,248,198,69,2,30,235,227,89,235,10,
-128,125,1,112,116,21,198,69,2,30,95,50,192,136,69,2,
-38,139,62,197,20,254,141,223,7,235,26,95,186,10,18,187,
-69,22,176,1,180,112,185,1,0,190,91,119,232,33,46,232,
-147,41,232,64,46,195,96,80,38,255,87,11,139,251,139,247,
-131,198,4,38,138,69,3,38,134,68,3,38,136,69,3,88,
-38,139,30,197,20,180,3,246,228,3,216,129,195,158,7,135,
-251,139,247,131,198,3,38,139,5,38,135,4,38,137,5,38,
-138,69,2,38,134,68,2,38,136,69,2,83,50,210,38,138,
-119,1,131,195,4,177,79,38,138,111,2,183,31,232,0,49,
-91,232,25,0,38,136,119,2,254,198,131,199,3,131,195,4,
-38,136,119,1,232,6,0,38,136,119,2,97,195,96,38,138,
-69,2,38,139,53,179,31,60,1,117,14,183,23,178,5,139,
-254,232,73,247,97,232,167,48,195,176,64,178,5,232,251,245,
-97,195,0,0,96,6,15,168,38,139,30,197,20,38,15,182,
-143,224,7,131,249,1,15,133,198,0,38,139,159,229,7,38,
-246,71,3,1,117,5,131,195,4,235,244,38,138,39,38,136,
-38,96,21,176,3,246,228,38,139,62,197,20,129,199,158,7,
-3,248,38,138,69,2,38,139,61,80,60,2,116,7,38,15,
-182,69,12,235,15,38,138,69,2,60,15,15,132,157,0,38,
-15,182,69,7,131,224,1,38,163,90,21,38,199,6,92,21,
-0,0,87,180,31,232,107,48,51,210,187,79,24,176,2,180,
-31,232,117,48,6,140,200,142,232,142,192,185,12,0,141,54,
-113,119,232,21,49,7,95,88,182,3,190,9,120,60,1,117,
-45,199,68,1,45,120,38,15,182,69,2,232,14,23,115,19,
-199,68,1,24,120,38,15,182,69,12,209,232,131,224,1,38,
-163,57,21,179,31,183,23,178,5,232,113,246,235,75,199,68,
-1,45,120,139,247,50,192,178,5,179,31,232,29,245,235,57,
-186,9,18,187,70,23,176,1,180,112,227,8,185,5,0,190,
-134,120,235,25,185,4,0,190,228,116,235,17,88,186,19,18,
-187,60,23,176,1,180,112,185,5,0,190,159,120,232,112,44,
-232,226,39,232,143,44,249,235,1,248,15,169,7,97,195,96,
-60,1,15,133,65,1,176,1,38,131,62,88,21,1,116,2,
-176,0,80,38,160,96,21,180,3,246,228,38,139,62,197,20,
-129,199,158,7,3,248,38,138,93,2,38,139,61,88,36,1,
-128,251,2,117,23,38,128,101,7,254,38,8,69,7,232,8,
-1,15,133,2,1,38,138,101,1,233,183,0,38,138,101,12,
-128,228,1,56,196,116,14,38,128,101,12,254,38,8,69,12,
-38,128,117,12,32,38,15,182,69,2,232,47,22,115,36,38,
-161,59,21,131,224,1,208,224,138,224,38,50,101,12,128,228,
-2,10,228,116,14,38,128,101,12,253,38,8,69,12,38,128,
-117,12,64,232,179,0,15,133,173,0,38,128,125,7,0,116,
-28,186,8,12,187,71,17,176,1,180,112,185,3,0,190,173,
-119,232,172,43,232,30,39,232,203,43,233,138,0,38,139,69,
-14,11,192,116,12,38,138,69,8,36,15,60,15,117,22,235,
-47,38,138,69,8,138,224,128,228,2,128,252,0,116,6,36,
-252,60,252,116,27,186,8,12,187,71,17,176,1,180,112,185,
-4,0,190,188,119,232,104,43,232,218,38,232,135,43,235,71,
-38,138,37,30,6,31,232,178,0,114,56,232,63,1,31,60,
-0,117,6,190,119,120,185,3,0,186,21,10,187,56,15,80,
-176,1,180,112,232,57,43,88,128,252,0,116,14,186,34,11,
-232,61,46,187,1,0,138,196,232,14,45,232,151,38,232,68,
-43,235,1,31,232,41,0,97,195,38,161,94,21,131,248,1,
-195,96,186,5,4,187,74,17,176,1,180,112,185,9,0,190,
-184,120,232,251,42,232,109,38,232,26,43,97,195,96,97,195,
-30,96,6,31,160,96,21,180,3,246,228,139,62,197,20,129,
-199,158,7,3,248,138,93,2,139,53,128,251,2,116,41,138,
-4,15,182,232,232,36,217,232,147,216,131,199,26,138,69,5,
-136,68,8,139,238,15,182,13,131,199,20,139,116,14,11,246,
-116,6,131,198,3,232,190,221,97,31,195,96,6,80,15,182,
-236,89,176,5,128,249,244,117,2,176,8,139,62,223,18,136,
-5,198,69,1,2,198,69,2,0,139,197,136,69,3,199,69,
-6,5,1,232,124,36,232,181,36,190,184,63,232,104,23,190,
-229,120,185,6,0,184,46,12,163,114,20,184,51,12,163,116,
-20,139,197,186,21,10,187,56,15,191,45,11,232,137,22,114,
-4,248,7,97,195,139,62,223,18,198,5,8,198,69,1,2,
-198,69,2,0,139,197,136,69,3,199,69,6,2,0,232,49,
-36,232,106,36,198,5,5,232,40,36,232,97,36,198,5,23,
-232,31,36,232,88,36,232,60,42,249,7,97,195,51,192,96,
-15,182,236,50,219,190,54,64,232,252,22,246,199,1,117,35,
-128,251,0,117,4,97,176,0,195,136,30,118,20,97,138,38,
-118,20,190,3,121,185,3,0,235,21,97,190,18,121,185,3,
-0,235,12,246,199,6,117,242,97,190,33,121,185,3,0,176,
-1,195,138,69,22,60,9,116,32,60,10,116,28,60,4,116,
-20,60,42,116,16,60,14,116,12,60,38,116,16,60,54,117,
-2,254,195,248,195,128,207,1,195,128,207,2,195,128,207,4,
-195,0,0,0,102,80,96,6,15,168,38,139,54,197,20,38,
-15,182,68,22,38,163,97,21,38,163,113,21,38,15,182,68,
-26,38,163,115,21,187,1,0,139,203,38,138,68,24,60,0,
-116,22,60,6,118,2,176,6,138,200,38,138,68,23,38,58,
-68,21,119,4,254,196,138,216,15,182,196,38,163,101,21,75,
-38,137,30,105,21,73,38,137,14,109,21,139,254,139,216,6,
-15,168,83,82,180,31,232,154,44,51,210,187,79,24,176,2,
-180,31,232,164,44,140,200,142,232,142,192,185,13,0,141,54,
-97,121,232,69,45,90,91,15,169,7,248,15,169,7,97,102,
-88,195,96,191,212,122,189,16,123,38,139,54,197,20,38,139,
-14,103,21,227,45,129,251,246,64,117,28,187,0,0,38,137,
-30,105,21,67,38,137,30,107,21,185,1,0,38,137,14,109,
-21,65,38,137,14,111,21,180,1,232,75,0,38,138,76,21,
-235,12,138,225,232,64,0,191,80,172,139,239,254,193,138,233,
-190,108,122,136,76,12,137,124,10,254,193,138,4,2,193,136,
-68,2,138,205,128,249,1,116,2,177,6,50,192,190,129,122,
-136,76,12,137,108,10,232,68,38,190,108,122,232,62,38,190,
-171,122,232,56,38,97,195,51,201,38,137,14,119,21,10,228,
-116,54,38,15,182,76,25,138,233,246,193,1,116,26,15,182,
-205,209,233,38,137,14,119,21,86,190,171,122,199,68,10,200,
-122,198,68,12,2,94,235,30,86,190,171,122,199,68,10,208,
-122,198,68,12,1,94,235,14,86,190,171,122,199,68,10,80,
-172,198,68,12,1,94,195,96,30,6,31,60,1,15,133,10,
-1,38,139,54,197,20,187,255,0,38,139,14,103,21,227,5,
-38,139,30,107,21,38,58,92,23,116,26,81,38,136,92,23,
-102,80,102,184,3,4,7,1,139,203,38,254,132,44,8,232,
-220,0,102,88,89,38,139,14,103,21,227,5,38,139,14,111,
-21,58,76,24,116,24,136,76,24,102,80,102,184,3,4,8,
-1,15,182,201,38,254,132,44,8,232,178,0,102,88,38,139,
-14,117,21,38,58,76,26,116,22,38,136,76,26,102,80,102,
-184,3,4,18,1,38,254,132,44,8,232,145,0,102,88,38,
-246,68,25,1,116,48,38,139,14,121,21,208,225,138,233,128,
-201,1,38,50,76,25,116,30,128,205,1,38,136,108,25,102,
-80,102,184,3,4,20,1,15,182,205,209,233,38,254,132,44,
-8,232,90,0,102,88,38,139,14,99,21,38,59,14,97,21,
-116,73,81,186,13,8,187,65,17,176,1,180,71,185,6,0,
-141,54,172,121,14,15,169,232,86,39,232,43,243,156,232,116,
-39,157,89,116,38,38,139,54,197,20,38,136,76,22,102,80,
-102,184,3,4,17,1,38,254,132,44,8,232,16,0,232,7,
-221,102,88,38,139,54,197,20,232,130,214,31,97,195,96,81,
-102,80,139,62,223,18,176,19,12,64,136,5,198,69,1,4,
-198,69,2,0,198,69,3,0,199,69,6,1,0,139,22,231,
-18,232,180,203,102,137,69,8,102,199,69,12,0,2,0,0,
-139,62,231,18,102,88,102,137,5,131,199,4,88,136,5,139,
-62,223,18,232,220,32,232,21,33,97,195,96,186,5,4,187,
-74,17,176,1,180,112,185,10,0,190,40,123,232,193,38,232,
-51,34,232,224,38,97,195,0,102,80,96,6,15,168,38,139,
-30,197,20,38,15,182,143,224,7,128,249,1,15,133,170,0,
-38,139,159,229,7,38,246,71,3,1,117,5,131,195,4,235,
-244,38,138,7,180,3,246,228,38,139,54,197,20,3,240,129,
-198,158,7,38,138,68,2,38,139,52,60,2,116,124,38,138,
-68,2,232,167,16,115,115,38,139,92,14,11,219,117,22,38,
-138,68,8,138,224,36,252,60,236,116,43,128,228,2,128,252,
-0,116,35,235,85,38,15,182,15,131,195,3,38,138,7,138,
-224,36,252,60,236,116,15,128,228,2,128,252,0,116,7,131,
-195,4,226,232,235,52,38,139,68,5,232,233,219,139,193,38,
-15,182,76,4,43,200,138,241,10,201,15,132,211,0,38,139,
-30,197,20,38,138,151,199,7,56,242,127,14,10,210,117,39,
-38,15,182,76,37,227,3,233,183,0,186,9,18,187,70,23,
-176,1,180,112,185,2,0,190,131,123,232,227,37,232,85,33,
-232,2,38,249,233,28,1,15,182,202,102,87,102,80,38,15,
-188,68,5,86,139,243,180,32,246,228,139,251,129,199,86,4,
-87,3,248,102,38,139,125,20,91,38,139,180,204,7,38,246,
-68,3,1,116,30,38,138,4,180,32,246,228,83,3,216,102,
-38,139,71,16,91,102,45,0,8,0,0,102,59,199,114,15,
-73,227,5,131,198,4,235,214,94,102,88,102,95,235,66,94,
-102,88,102,95,186,10,8,187,67,12,176,1,180,112,185,4,
-0,190,141,123,232,105,37,102,82,102,51,210,102,38,139,133,
-106,4,232,171,15,102,90,190,153,20,186,48,10,179,126,232,
-140,38,176,46,232,62,40,232,187,32,232,104,37,249,233,130,
-0,139,254,139,216,6,15,168,83,82,180,31,232,148,40,51,
-210,187,79,24,176,2,180,31,232,158,40,140,200,142,232,142,
-192,185,6,0,141,54,101,123,232,63,41,90,91,15,169,7,
-128,254,0,116,66,15,182,206,186,8,5,38,139,30,197,20,
-38,139,159,204,7,38,246,71,3,1,117,5,131,195,4,235,
-244,38,138,7,180,32,246,228,38,139,54,197,20,3,240,129,
-198,86,4,83,176,0,179,31,232,80,237,91,131,195,4,254,
-198,226,210,254,198,235,2,182,5,179,31,183,23,178,8,232,
-123,238,248,15,169,7,97,102,88,195,96,30,6,31,60,1,
-15,133,185,0,38,139,30,197,20,38,254,143,224,7,129,195,
-222,7,232,250,234,128,103,3,254,138,7,180,3,246,228,38,
-139,54,197,20,3,240,129,198,158,7,38,139,52,38,198,68,
-9,1,38,139,92,14,11,219,117,8,180,223,38,136,100,8,
-235,7,38,128,100,8,253,235,22,38,139,68,5,232,38,218,
-139,193,38,15,182,76,4,59,200,116,98,38,139,92,14,11,
-219,38,138,20,38,138,116,1,117,86,38,139,30,197,20,15,
-182,143,198,7,227,71,139,191,204,7,246,69,3,1,87,116,
-54,254,143,198,7,254,143,199,7,50,192,136,69,3,136,69,
-1,87,138,37,176,32,246,228,38,139,62,197,20,3,248,198,
-133,88,4,1,136,181,90,4,95,15,182,5,15,171,68,5,
-128,100,36,240,8,68,36,95,131,199,4,226,189,31,97,195,
-232,12,16,38,137,124,14,86,81,139,243,185,38,0,243,164,
-89,94,38,139,92,14,139,238,38,15,182,116,37,38,139,62,
-197,20,131,195,3,86,83,15,182,141,198,7,227,119,139,189,
-204,7,246,69,3,1,116,104,50,192,136,69,3,136,69,1,
-138,37,87,38,139,62,197,20,254,141,198,7,254,141,199,7,
-176,32,246,228,38,139,62,197,20,3,248,198,133,88,4,1,
-136,181,90,4,95,138,7,138,224,36,252,60,236,116,8,128,
-228,2,128,252,0,117,6,209,238,115,9,235,2,209,238,131,
-195,4,235,225,180,223,136,39,15,182,5,15,171,71,1,62,
-15,171,70,5,128,103,3,240,8,71,3,131,195,4,235,146,
-131,199,4,226,141,91,94,185,8,0,209,238,115,12,138,7,
-36,252,60,236,117,4,180,223,136,39,131,195,4,226,235,233,
-59,255,96,186,5,4,187,74,17,176,1,180,112,185,10,0,
-190,191,123,232,26,35,232,140,30,232,57,35,97,195,0,0,
-30,6,30,7,139,54,197,20,139,254,232,165,0,232,7,1,
-232,244,1,232,58,1,232,107,1,232,149,1,86,139,254,129,
-198,214,5,129,199,120,7,128,124,4,0,116,59,138,12,128,
-249,255,116,52,139,76,14,227,10,59,241,127,6,59,249,126,
-2,139,249,138,68,12,138,100,7,10,228,116,15,36,3,10,
-192,116,21,138,224,192,228,5,10,196,235,7,138,224,128,228,
-96,116,5,138,36,232,193,4,131,198,38,59,247,126,184,94,
-86,15,182,76,21,138,132,88,4,60,11,117,38,138,132,93,
-4,168,128,116,4,12,32,235,14,36,1,138,100,34,128,228,
-1,56,196,116,14,12,32,138,164,87,4,128,252,255,116,3,
-232,134,4,131,198,32,226,205,94,232,84,11,232,108,6,7,
-31,195,96,138,140,162,1,138,172,163,1,2,205,15,182,201,
-227,83,139,222,129,198,166,1,129,199,214,5,59,183,164,1,
-125,67,128,124,2,255,116,56,87,86,81,185,12,0,128,125,
-2,255,116,29,232,59,1,114,36,80,139,69,5,59,68,5,
-88,117,14,128,125,2,30,117,8,15,182,4,232,86,1,235,
-12,131,199,38,226,216,138,4,180,128,232,72,1,89,94,95,
-131,198,38,235,183,97,195,96,131,198,27,129,199,86,4,185,
-12,0,138,68,2,60,11,116,8,60,15,116,4,60,13,117,
-21,56,69,2,116,16,180,128,128,125,2,30,117,2,50,228,
-138,68,1,232,15,1,131,198,32,131,199,32,226,212,97,195,
-96,129,199,86,4,131,198,27,185,12,0,138,69,2,60,13,
-116,8,60,15,116,4,60,11,117,16,56,68,2,117,8,138,
-68,1,136,69,1,235,3,232,48,1,131,199,32,131,198,32,
-226,217,97,195,96,129,199,158,7,15,182,140,223,7,227,31,
-138,69,2,60,2,116,19,60,1,117,20,139,53,128,124,9,
-1,117,7,87,139,254,232,14,3,95,131,199,3,226,225,97,
-195,96,129,199,158,7,15,182,140,223,7,227,72,138,69,2,
-60,2,116,60,60,1,117,61,86,87,81,139,61,15,182,140,
-162,1,129,198,111,3,227,34,86,138,68,2,60,2,116,20,
-60,1,117,16,139,52,232,57,0,114,2,235,7,198,69,7,
-0,94,235,9,94,131,198,3,226,222,232,234,0,89,95,94,
-131,199,3,226,184,97,195,96,129,199,86,4,185,12,0,128,
-125,2,30,117,6,138,69,8,232,103,0,131,199,32,226,239,
-97,195,80,138,5,58,4,117,41,138,69,3,58,68,3,117,
-33,138,69,2,58,68,2,117,25,138,69,4,58,68,4,117,
-17,139,69,5,59,68,5,116,6,128,125,9,1,117,3,249,
-235,1,248,88,195,87,83,80,15,182,216,139,62,225,18,198,
-5,21,136,69,3,198,69,1,2,102,51,192,136,69,2,102,
-137,69,4,88,138,196,136,69,7,232,150,26,232,207,26,91,
-95,195,87,83,139,62,225,18,198,5,10,198,69,1,2,80,
-102,51,192,136,69,3,136,69,2,102,137,69,4,88,136,69,
-7,232,110,26,232,167,26,91,95,195,85,86,87,82,102,80,
-139,247,139,22,231,18,139,62,223,18,189,20,0,232,255,3,
-87,139,62,231,18,138,100,2,50,192,232,52,4,95,232,65,
-26,232,122,26,138,69,3,162,123,21,102,88,90,95,94,93,
-160,123,21,136,69,1,195,85,86,87,82,81,102,80,139,247,
-128,124,2,7,124,6,232,190,0,233,174,0,139,62,197,20,
-129,199,86,4,185,12,0,138,84,1,136,22,123,21,87,81,
-102,51,192,15,182,108,4,138,116,3,136,54,233,18,138,116,
-2,136,54,124,21,85,51,210,184,20,0,69,247,229,139,232,
-139,22,231,18,139,62,223,18,232,132,3,139,62,231,18,93,
-86,139,247,232,97,1,94,139,197,136,5,160,233,18,136,69,
-2,138,54,124,21,136,117,1,198,69,3,255,102,51,192,136,
-69,5,136,69,4,137,69,6,102,137,69,8,102,137,69,12,
-131,199,20,89,94,42,192,50,210,128,124,2,1,117,22,138,
-38,123,21,56,100,4,117,13,180,12,136,84,9,232,113,3,
-254,194,131,199,20,131,198,32,226,223,139,62,223,18,232,113,
-25,232,170,25,138,69,3,162,123,21,102,88,89,90,95,94,
-93,160,123,21,136,5,195,96,102,83,102,51,219,138,69,2,
-139,54,231,18,232,224,0,136,92,1,138,77,4,60,7,117,
-6,178,2,208,233,235,7,178,5,138,200,128,225,15,136,12,
-138,69,3,36,15,136,68,2,198,68,3,255,136,92,4,136,
+129,194,0,2,232,217,248,102,137,69,8,102,187,0,2,0,
+0,102,137,93,12,232,18,78,232,75,78,95,176,0,136,69,
+44,6,140,216,142,192,131,199,4,139,247,80,81,82,86,87,
+156,252,139,197,178,31,246,226,191,254,18,3,248,185,30,0,
+243,164,50,192,170,157,95,94,90,89,88,7,69,73,116,3,
+233,126,255,97,195,102,80,102,82,139,62,231,18,87,102,184,
+2,4,2,16,102,137,5,102,184,2,4,3,16,102,137,69,
+20,102,184,2,4,8,16,102,137,69,40,139,62,223,18,102,
+184,82,4,0,0,102,137,5,102,184,0,0,3,0,102,137,
+69,4,139,22,231,18,232,71,248,102,137,69,8,102,184,0,
+2,0,0,102,137,69,12,232,128,77,232,185,77,95,102,90,
+102,88,195,102,80,102,82,139,62,231,18,87,102,184,2,4,
+10,4,102,137,5,102,184,2,4,9,20,102,137,69,8,139,
+62,223,18,102,184,82,4,0,0,102,137,5,102,184,0,0,
+2,0,102,137,69,4,139,22,231,18,232,243,247,102,137,69,
+8,102,184,0,2,0,0,102,137,69,12,232,44,77,232,101,
+77,95,102,90,102,88,195,102,80,102,82,139,62,231,18,87,
+102,184,2,4,11,4,102,137,5,102,184,2,4,15,4,102,
+137,69,8,139,62,223,18,102,184,82,4,0,0,102,137,5,
+102,184,0,0,2,0,102,137,69,4,139,22,231,18,232,159,
+247,102,137,69,8,102,184,0,2,0,0,102,137,69,12,232,
+216,76,232,17,77,95,102,90,102,88,195,96,139,62,231,18,
+129,199,0,2,87,102,184,2,0,3,16,102,137,5,139,62,
+225,18,102,184,82,4,1,0,102,137,5,102,184,0,0,1,
+0,102,137,69,4,139,22,231,18,129,194,0,2,232,80,247,
+102,137,69,8,102,187,0,2,0,0,102,137,93,12,232,137,
+76,232,194,76,95,97,195,85,139,62,231,18,129,199,0,2,
+87,102,184,0,2,2,4,3,197,102,137,5,139,62,225,18,
+102,184,82,4,1,0,102,137,5,102,184,0,0,1,0,102,
+137,69,4,139,22,231,18,129,194,0,2,232,2,247,102,137,
+69,8,102,187,0,2,0,0,102,137,93,12,232,59,76,232,
+116,76,95,93,195,139,62,231,18,129,199,0,2,87,102,80,
+102,184,0,131,13,0,3,197,102,137,5,131,199,4,102,184,
+1,0,0,0,102,137,5,131,199,5,102,184,0,131,15,0,
+3,197,102,137,5,131,199,4,102,51,192,102,64,102,137,5,
+131,199,5,102,184,0,131,11,0,3,197,102,137,5,131,199,
+4,102,88,102,137,5,131,199,4,3,248,139,62,225,18,102,
+184,82,4,1,0,102,137,5,102,184,0,0,3,0,102,137,
+69,4,139,22,231,18,129,194,0,2,232,115,246,102,137,69,
+8,102,187,0,2,0,0,102,137,93,12,232,172,75,232,229,
+75,95,195,82,139,62,231,18,129,199,0,2,87,102,184,0,
+131,10,0,3,197,102,137,5,102,184,1,0,0,0,131,199,
+4,102,137,5,131,199,4,87,131,199,1,102,184,0,131,9,
+0,3,197,102,137,5,102,184,2,0,0,0,131,199,4,102,
+137,5,131,199,4,87,131,199,2,102,184,0,131,12,0,3,
+197,102,137,5,102,184,8,0,0,0,131,199,4,102,137,5,
+131,199,4,87,139,62,225,18,102,184,82,4,1,0,102,137,
+5,102,184,0,0,3,0,102,137,69,4,139,22,231,18,129,
+194,0,2,232,218,245,102,137,69,8,102,187,0,2,0,0,
+102,137,93,12,232,19,75,232,76,75,95,102,139,5,102,163,
+132,20,102,139,69,4,102,163,136,20,95,139,5,95,138,21,
+246,226,102,15,183,192,95,90,195,139,62,231,18,129,199,0,
+2,87,102,184,0,3,2,1,3,197,102,137,5,139,62,225,
+18,102,184,82,4,1,0,102,137,5,102,184,0,0,1,0,
+102,137,69,4,139,22,231,18,129,194,0,2,232,113,245,102,
+137,69,8,102,187,0,2,0,0,102,137,93,12,232,170,74,
+232,227,74,95,195,96,6,102,80,30,7,51,192,185,131,7,
+252,191,27,0,3,254,243,170,86,87,139,254,185,12,0,254,
+204,136,165,168,1,136,165,216,5,136,68,27,198,68,29,3,
+136,100,31,136,100,35,131,198,32,131,199,38,4,17,226,225,
+95,94,136,46,120,20,232,42,250,189,72,3,3,238,137,172,
+164,1,139,77,4,11,201,15,132,78,2,131,199,10,51,237,
+86,87,139,221,136,30,151,20,138,5,162,121,20,60,0,117,
+4,65,233,39,2,80,232,138,254,232,249,253,138,69,8,192,
+232,2,131,199,9,138,101,8,208,228,10,196,162,141,20,131,
+199,17,138,69,5,162,118,20,88,128,61,0,117,111,128,125,
+1,6,117,29,138,69,1,136,132,156,1,102,139,69,12,102,
+137,132,157,1,232,2,255,138,69,4,136,132,155,1,233,219,
+1,80,232,97,4,131,198,27,198,68,4,255,138,69,1,136,
+68,2,160,141,20,136,68,7,160,151,20,136,68,1,88,139,
+30,197,20,168,1,116,27,138,135,162,1,180,3,246,228,254,
+135,162,1,129,195,111,3,3,216,137,55,198,71,2,2,233,
+154,1,128,76,7,64,254,135,161,1,233,143,1,51,192,162,
+140,20,128,125,1,0,117,69,87,131,199,20,176,20,138,21,
+246,226,139,208,138,69,1,138,101,2,95,11,210,116,46,86,
+139,180,164,1,198,68,2,96,136,100,1,138,37,136,36,131,
+198,3,137,54,116,20,94,131,194,20,60,5,116,6,198,69,
+1,7,235,9,138,37,176,80,10,224,136,101,1,102,199,6,
+142,20,255,255,255,255,102,199,6,146,20,255,255,255,255,198,
+6,150,20,0,199,6,234,18,0,0,138,69,2,162,130,20,
+138,69,1,162,131,20,81,15,182,13,136,46,119,20,131,199,
+20,246,6,121,20,128,117,5,128,14,141,20,128,128,61,0,
+15,132,175,0,81,183,255,81,15,182,13,246,6,121,20,128,
+116,72,86,139,54,116,20,138,93,5,136,28,136,124,3,94,
+128,227,252,128,251,236,117,11,128,38,118,20,254,254,6,124,
+20,235,34,128,251,220,116,24,128,251,248,117,7,128,38,118,
+20,247,235,22,128,251,244,117,17,128,38,118,20,251,235,10,
+128,38,118,20,253,138,125,3,138,223,131,199,20,246,6,121,
+20,128,116,44,86,139,54,116,20,15,182,69,3,60,255,116,
+4,15,171,68,1,10,255,117,20,60,255,117,8,138,69,4,
+192,224,4,235,8,128,14,119,20,128,136,68,3,94,254,207,
+232,10,1,226,200,131,6,116,20,4,208,46,119,20,89,73,
+15,133,97,255,89,176,8,42,193,138,200,254,201,210,46,119,
+20,235,69,131,239,20,138,93,5,183,255,128,227,252,128,251,
+236,117,6,254,6,124,20,235,5,128,251,220,117,5,138,125,
+3,138,223,131,199,20,138,69,3,10,255,117,20,60,255,116,
+7,12,16,162,119,20,235,9,138,195,128,203,32,136,30,119,
+20,232,169,0,254,207,226,222,89,232,162,1,95,94,69,71,
+254,6,151,20,73,15,133,183,253,51,237,139,221,15,182,76,
+21,86,83,232,113,251,102,139,69,4,102,137,68,43,102,131,
+124,47,0,117,4,102,137,68,47,232,15,251,91,131,199,4,
+3,253,138,5,60,0,116,66,254,195,168,1,116,81,254,199,
+128,124,29,3,117,52,60,255,117,26,176,12,136,68,29,139,
+197,136,68,35,198,68,28,114,86,139,54,197,20,254,132,161,
+1,94,235,22,136,68,29,139,197,136,68,35,198,68,28,115,
+86,139,54,197,20,254,132,110,3,94,69,131,198,32,226,146,
+94,136,92,4,136,124,5,232,60,2,102,88,7,97,195,136,
+68,29,139,197,136,68,35,198,68,28,116,235,221,254,6,140,
+20,86,232,225,1,198,68,28,113,115,108,160,120,20,136,68,
+31,198,68,29,1,15,182,69,3,15,171,6,234,18,102,80,
+102,83,81,102,187,15,0,0,0,102,35,195,138,14,150,20,
+138,233,128,249,32,114,3,128,233,32,128,249,0,116,6,102,
+211,224,102,211,227,102,131,243,255,128,253,32,114,12,102,33,
+30,146,20,102,9,6,146,20,235,10,102,33,30,142,20,102,
+9,6,142,20,128,6,150,20,4,89,102,91,102,88,131,199,
+20,137,54,128,20,94,195,128,6,150,20,4,235,240,96,183,
+255,81,15,182,13,138,93,5,136,28,136,124,3,128,227,252,
+128,251,236,117,7,62,128,102,8,254,235,34,128,251,220,116,
+24,128,251,248,117,7,62,128,102,8,247,235,22,128,251,244,
+117,17,62,128,102,8,251,235,10,62,128,102,8,253,138,125,
+3,138,223,131,199,20,51,192,137,68,1,15,182,69,3,60,
+255,116,4,15,171,68,1,10,255,117,20,60,255,117,8,138,
+69,4,192,224,4,235,8,128,14,119,20,128,136,68,3,254,
+207,131,199,20,226,213,131,198,4,89,226,131,97,195,83,86,
+160,120,20,179,38,246,227,139,216,3,222,138,38,118,20,136,
+167,174,1,160,131,20,136,135,168,1,60,7,124,25,10,228,
+116,62,139,132,164,1,137,135,180,1,131,232,38,137,132,164,
+1,138,38,119,20,235,41,176,255,136,135,202,1,160,119,20,
+138,224,128,228,240,128,252,16,116,14,128,252,32,117,21,50,
+228,192,224,4,12,15,235,4,180,1,36,15,136,135,202,1,
+136,167,203,1,102,161,142,20,102,137,135,186,1,102,161,146,
+20,102,137,135,190,1,160,151,20,136,135,166,1,160,120,20,
+136,135,167,1,160,130,20,136,135,169,1,160,140,20,136,135,
+170,1,160,141,20,136,135,178,1,102,161,132,20,102,137,135,
+182,1,102,161,136,20,102,137,135,198,1,161,234,18,137,135,
+171,1,129,195,166,1,139,54,197,20,160,121,20,168,128,116,
+26,138,132,162,1,254,132,162,1,180,3,246,228,129,198,111,
+3,3,240,137,28,198,68,2,1,235,4,254,132,163,1,94,
+91,254,6,120,20,195,138,69,3,60,255,117,6,139,54,128,
+20,248,195,80,180,32,246,228,3,240,131,248,0,117,11,128,
+188,156,1,0,116,4,254,14,151,20,88,136,68,35,138,69,
+4,136,68,36,102,139,69,8,102,137,68,51,102,139,69,12,
+102,137,68,47,249,195,30,6,87,81,83,139,54,197,20,15,
+182,132,161,1,136,132,198,7,138,132,162,1,136,132,223,7,
+138,132,110,3,136,132,248,7,138,132,163,1,136,132,17,8,
+136,164,199,7,136,164,224,7,136,164,249,7,136,164,18,8,
+140,217,142,193,185,128,1,86,139,254,129,199,86,4,131,198,
+27,252,243,164,94,86,139,140,164,1,131,193,38,139,254,129,
+199,214,5,129,198,166,1,43,206,243,164,94,139,254,129,199,
+150,3,51,192,185,192,0,243,170,185,13,0,139,254,129,199,
+158,7,129,198,111,3,138,92,2,136,93,2,128,251,1,116,
+9,128,251,2,116,12,139,28,235,14,139,28,129,195,48,4,
+235,6,139,28,129,195,59,4,137,29,131,198,3,131,199,3,
+226,212,91,89,95,7,31,195,83,80,30,235,5,83,80,30,
+14,31,180,14,138,5,10,192,116,36,60,19,117,27,80,83,
+82,180,15,205,16,180,3,205,16,180,14,176,32,205,16,254,
+194,128,250,79,114,243,90,91,88,205,16,71,235,212,31,88,
+91,195,87,191,234,111,232,196,255,80,82,160,152,20,60,0,
+116,8,232,98,77,2,208,232,78,77,90,88,95,195,83,51,
+201,11,192,116,9,15,188,216,15,179,216,65,235,243,91,195,
+87,83,102,51,192,139,62,225,18,198,5,28,136,69,3,198,
+69,1,2,136,69,2,102,137,69,4,232,13,68,232,70,68,
+91,95,195,0,30,6,15,168,198,6,13,0,1,128,62,12,
+0,0,116,15,180,15,205,16,80,184,18,0,205,16,198,6,
+13,0,0,139,54,195,20,137,54,197,20,232,141,0,232,52,
+249,139,52,131,254,255,117,239,30,7,14,31,14,15,169,38,
+139,54,195,20,38,137,54,197,20,38,138,14,199,20,128,249,
+1,116,49,190,24,21,38,136,76,1,232,87,2,186,24,21,
+191,19,113,190,201,112,51,237,232,44,69,60,9,117,5,232,
+167,21,235,47,60,8,117,12,235,41,232,187,22,232,96,21,
+116,219,235,31,38,139,22,197,20,129,194,197,7,191,137,117,
+190,42,119,51,237,232,255,68,60,7,116,193,60,9,117,3,
+232,118,21,38,128,62,12,0,0,116,11,88,180,0,205,16,
+38,198,6,12,0,0,15,169,7,31,195,81,86,51,192,136,
+132,41,8,136,132,42,8,136,132,43,8,136,132,44,8,185,
+12,0,136,132,249,7,136,132,199,7,136,132,224,7,136,132,
+150,3,136,132,151,3,136,132,153,3,136,132,198,3,136,132,
+199,3,136,132,201,3,136,132,246,3,136,132,247,3,136,132,
+249,3,136,132,38,4,136,132,39,4,136,132,41,4,131,198,
+4,226,203,94,86,199,132,200,7,254,255,185,222,7,3,206,
+137,140,202,7,185,198,3,3,206,137,140,204,7,199,132,206,
+7,115,80,199,132,208,7,188,79,199,132,210,7,172,82,199,
+132,212,7,187,82,199,132,214,7,201,79,199,132,216,7,228,
+79,199,132,218,7,251,80,199,132,220,7,111,82,185,197,7,
+3,206,137,140,225,7,185,16,8,3,206,137,140,227,7,185,
+246,3,3,206,137,140,229,7,199,132,231,7,115,80,199,132,
+233,7,188,79,199,132,235,7,172,82,199,132,237,7,187,82,
+199,132,239,7,255,79,199,132,241,7,26,80,199,132,243,7,
+238,58,199,132,245,7,111,82,185,222,7,3,206,137,140,19,
+8,185,247,7,3,206,137,140,21,8,185,38,4,3,206,137,
+140,23,8,199,132,25,8,115,80,199,132,27,8,188,79,199,
+132,29,8,172,82,199,132,31,8,187,82,199,132,33,8,202,
+82,199,132,35,8,202,82,199,132,37,8,202,82,199,132,39,
+8,111,82,185,16,8,3,206,137,140,250,7,199,132,252,7,
+255,255,185,150,3,3,206,137,140,254,7,199,132,0,8,115,
+80,199,132,2,8,188,79,199,132,4,8,172,82,199,132,6,
+8,187,82,199,132,8,8,202,82,199,132,10,8,202,82,199,
+132,12,8,202,82,199,132,14,8,111,82,94,89,195,30,6,
+96,6,180,31,232,36,75,51,210,187,79,29,176,2,180,31,
+232,46,75,140,200,142,232,142,192,185,9,0,141,54,225,112,
+232,207,75,182,2,178,5,232,174,74,31,139,54,195,20,191,
+200,20,179,23,232,35,0,138,68,10,136,5,136,117,1,131,
+199,4,254,198,254,198,139,52,131,254,255,117,229,140,192,30,
+7,142,216,232,127,0,97,7,31,195,232,123,74,6,86,140,
+200,142,192,190,24,172,232,157,72,94,7,138,68,10,179,1,
+232,62,73,195,38,199,68,3,254,255,38,199,68,5,255,255,
+185,200,20,38,137,76,7,38,199,68,9,115,80,38,199,68,
+11,188,79,38,199,68,13,172,82,38,199,68,15,187,82,38,
+199,68,17,202,82,38,199,68,19,202,82,38,199,68,21,202,
+82,38,199,68,23,202,82,195,81,86,38,15,182,14,24,21,
+38,139,54,195,20,227,5,38,139,52,226,251,38,137,54,197,
+20,249,94,89,195,38,128,62,241,18,1,117,68,38,198,6,
+241,18,16,38,128,62,124,20,0,116,28,186,7,1,187,72,
+23,176,1,180,71,185,27,0,141,54,105,113,232,201,70,232,
+59,66,232,232,70,235,26,186,7,4,187,72,18,176,1,180,
+112,185,14,0,141,54,35,113,232,173,70,232,31,66,232,204,
+70,195,0,0,96,160,241,18,60,1,124,56,186,17,11,187,
+58,15,176,1,180,112,185,3,0,190,240,113,232,137,70,186,
+29,12,232,147,73,139,69,151,232,84,72,139,69,150,232,78,
+72,186,44,12,232,129,73,138,5,36,31,232,65,72,232,220,
+65,232,137,70,97,195,0,0,80,83,81,82,86,176,1,177,
+30,232,239,69,232,82,0,185,22,0,190,59,115,6,14,7,
+232,111,74,7,232,182,65,61,0,80,116,12,61,0,81,116,
+7,61,27,1,116,38,235,236,232,46,0,185,24,0,190,169,
+115,6,14,7,232,75,74,7,232,146,65,61,0,72,116,196,
+61,0,73,116,191,61,27,1,116,2,235,236,176,1,177,30,
+232,204,69,94,90,89,91,88,195,185,73,22,186,6,2,183,
+112,232,52,73,186,6,2,187,73,22,180,112,176,1,232,96,
+73,195,80,83,81,82,86,186,7,2,187,72,19,176,1,180,
+112,185,10,0,190,33,116,232,206,69,232,64,65,232,237,69,
+94,90,89,91,88,195,80,83,81,82,86,186,5,4,187,74,
+17,176,1,180,112,185,11,0,190,83,116,232,170,69,232,28,
+65,232,201,69,94,90,89,91,88,195,83,81,82,86,186,10,
+18,187,69,22,176,1,180,112,185,1,0,190,203,116,232,135,
+69,232,92,17,116,10,30,6,31,232,58,250,184,5,0,31,
+232,154,69,248,94,90,89,91,195,30,6,31,139,54,197,20,
+86,232,0,18,115,28,139,54,195,20,137,54,197,20,232,71,
+34,139,52,131,254,255,117,242,249,94,137,54,197,20,176,8,
+31,195,94,137,54,197,20,248,31,195,176,9,249,195,38,160,
+199,20,60,1,116,4,176,7,235,2,176,9,249,195,38,199,
+6,61,21,185,42,232,240,3,51,192,249,195,96,38,139,54,
+197,20,30,6,31,232,178,240,31,30,6,15,168,6,180,31,
+232,104,72,51,210,187,79,29,176,2,180,31,232,114,72,140,
+200,142,232,142,192,185,7,0,141,54,65,114,232,19,73,7,
+38,128,62,199,20,1,6,14,7,127,12,185,4,0,141,54,
+100,114,232,253,72,235,10,185,4,0,141,54,120,114,232,241,
+72,7,50,246,178,52,232,207,71,38,139,54,197,20,38,138,
+68,21,86,129,198,198,3,232,48,3,94,86,129,198,246,3,
+232,39,3,94,38,138,68,10,232,134,70,182,2,178,5,232,
+166,71,38,139,54,197,20,38,15,182,140,198,7,227,117,178,
+5,179,30,86,6,14,7,190,69,133,232,185,69,254,198,7,
+94,51,237,38,139,188,204,7,129,198,86,4,38,138,92,2,
+128,251,12,116,19,128,251,15,116,7,128,251,13,116,9,235,
+60,38,246,68,7,64,116,53,179,31,69,176,128,178,5,232,
+193,12,232,98,71,38,246,69,3,1,116,10,178,4,232,71,
+71,176,42,232,39,71,38,138,68,8,38,136,5,38,136,117,
+1,38,136,117,2,131,199,4,254,198,73,227,5,131,198,32,
+235,170,254,198,51,237,38,139,54,197,20,129,198,158,7,38,
+15,182,76,2,11,201,116,127,6,86,81,14,7,190,88,133,
+179,30,178,5,232,47,69,89,94,7,254,198,179,31,38,136,
+30,14,0,38,139,62,197,20,38,139,189,229,7,38,15,182,
+76,2,227,83,87,82,128,249,1,117,17,38,139,60,179,31,
+183,23,178,5,232,126,13,232,221,70,235,12,86,38,139,52,
+176,64,178,5,232,44,12,94,138,254,90,95,38,246,69,3,
+1,116,10,178,4,232,176,70,176,42,232,144,70,139,197,38,
+136,5,38,136,117,1,38,136,125,2,131,199,4,131,198,3,
+138,247,254,198,69,235,166,51,237,38,139,54,197,20,38,15,
+182,140,17,8,11,201,116,123,129,198,214,5,6,86,81,14,
+7,190,205,134,179,30,178,5,232,155,68,89,94,7,254,198,
+179,31,38,136,30,14,0,38,139,62,197,20,38,139,189,23,
+8,131,238,38,131,198,38,38,128,124,4,0,116,246,38,246,
+68,12,128,116,239,87,82,139,254,179,31,183,23,178,5,232,
+227,12,232,66,70,138,254,90,95,38,246,69,3,1,116,10,
+178,4,232,35,70,176,42,232,3,70,38,138,68,1,38,136,
+5,38,136,117,1,38,136,125,2,131,199,4,138,247,254,198,
+69,226,177,38,128,14,13,0,1,51,237,185,12,0,38,139,
+54,197,20,38,139,188,254,7,129,198,86,4,38,138,92,2,
+128,251,217,114,94,131,253,0,117,20,83,178,5,179,30,86,
+6,14,7,190,174,134,232,253,67,254,198,7,94,91,246,195,
+1,116,4,179,31,235,2,179,23,38,136,30,14,0,176,128,
+178,5,232,30,11,232,191,69,69,128,251,23,116,35,38,246,
+69,3,1,116,10,178,4,232,158,69,176,42,232,126,69,38,
+138,68,8,38,136,5,38,136,117,1,38,136,117,2,131,199,
+4,254,198,131,198,32,226,148,38,128,38,13,0,254,232,116,
+251,248,15,169,7,31,97,195,96,83,30,6,15,168,102,80,
+38,139,30,197,20,38,15,182,183,199,7,131,254,1,115,29,
+186,10,18,187,69,23,176,1,180,112,185,4,0,190,208,116,
+232,53,66,232,167,61,232,84,66,249,233,164,0,87,80,83,
+191,169,117,78,193,230,2,187,65,117,138,64,2,136,69,12,
+254,192,2,5,136,69,2,139,0,137,69,10,139,248,138,64,
+3,190,61,119,38,199,6,53,21,0,0,38,199,6,90,21,
+1,0,38,199,6,57,21,0,0,91,88,95,180,31,232,74,
+69,51,210,187,79,24,176,2,180,31,232,84,69,6,140,200,
+142,232,142,192,185,16,0,141,54,140,114,232,244,69,88,142,
+232,142,192,182,6,38,139,30,197,20,38,15,182,143,198,7,
+38,139,191,204,7,38,246,69,3,1,116,32,38,138,5,179,
+32,246,227,38,139,54,197,20,3,240,129,198,86,4,176,128,
+179,31,178,10,232,12,10,232,173,68,254,198,131,199,4,226,
+212,102,88,15,169,7,31,91,97,195,96,15,182,200,38,128,
+124,1,0,116,7,131,198,4,226,244,235,58,139,254,131,249,
+1,126,51,73,131,198,4,38,15,182,68,1,10,192,116,33,
+38,136,100,1,38,136,69,1,38,138,4,38,136,5,38,138,
+68,2,38,136,69,2,38,138,68,3,38,136,69,3,131,199,
+4,131,198,4,226,209,97,195,96,30,6,31,60,1,15,133,
+33,1,131,62,49,21,4,117,6,232,136,17,233,20,1,51,
+210,137,22,234,18,38,139,30,197,20,38,15,182,143,198,7,
+38,139,159,204,7,83,246,71,3,1,116,9,15,182,7,15,
+171,6,234,18,66,131,195,4,226,236,255,22,61,21,115,31,
+96,186,14,8,187,65,13,176,1,180,112,185,4,0,190,138,
+116,232,212,64,232,70,60,232,243,64,97,91,233,196,0,38,
+139,30,197,20,38,40,151,198,7,38,40,151,199,7,232,176,
+2,160,123,21,232,203,3,91,15,182,202,235,5,131,195,4,
+235,2,83,81,246,71,3,1,116,243,15,182,7,182,32,246,
+230,38,139,62,197,20,3,248,160,123,21,136,133,90,4,198,
+133,88,4,1,131,195,4,226,219,89,91,51,246,235,3,131,
+195,4,246,71,3,1,116,247,15,182,7,182,32,246,230,38,
+139,62,197,20,3,248,198,133,87,4,113,139,198,136,133,95,
+4,160,123,21,136,133,90,4,102,80,83,102,82,138,248,232,
+216,43,86,102,83,102,139,216,138,165,90,4,176,38,246,228,
+38,139,54,197,20,3,240,102,137,156,230,5,102,137,148,246,
+5,102,139,195,102,91,94,102,90,91,102,88,51,192,136,71,
+1,136,71,3,70,131,195,4,226,152,38,139,30,197,20,254,
+135,223,7,31,97,195,80,86,232,22,0,51,192,190,211,117,
+232,162,61,232,109,0,51,192,190,232,117,232,151,61,94,88,
+195,38,199,6,55,21,1,0,86,190,211,117,38,161,49,21,
+131,248,4,116,46,131,248,1,116,41,131,248,2,116,36,131,
+248,5,116,18,131,248,82,125,13,198,68,12,3,199,68,10,
+125,117,176,4,235,31,198,68,12,3,199,68,10,125,117,176,
+4,235,18,198,68,12,1,199,68,10,80,172,38,199,6,55,
+21,0,0,176,2,2,4,136,68,2,94,38,199,6,51,21,
+7,0,195,38,199,6,57,21,0,0,86,190,232,117,38,161,
+49,21,232,175,41,114,13,198,68,12,1,199,68,10,80,172,
+176,2,235,11,198,68,12,2,199,68,10,117,117,176,3,2,
+4,136,68,2,94,38,199,6,59,21,0,0,195,87,86,102,
+80,83,81,82,161,49,21,60,7,15,140,35,1,117,5,185,
+2,0,235,9,36,15,134,194,246,242,15,182,200,73,139,209,
+102,51,192,139,216,102,72,102,163,72,21,102,163,76,21,161,
+234,18,163,80,21,163,86,21,51,192,163,84,21,15,188,6,
+80,21,15,132,176,0,15,171,6,84,21,15,179,6,80,21,
+138,248,161,80,21,163,82,21,139,202,15,188,6,82,21,116,
+215,15,179,6,82,21,138,216,176,31,246,231,191,254,18,3,
+248,176,31,246,227,190,254,18,3,240,81,185,31,0,243,166,
+89,117,215,139,62,197,20,131,199,27,139,247,176,32,246,231,
+3,248,176,32,246,227,3,240,102,139,69,16,102,59,68,16,
+117,184,15,182,195,15,171,6,84,21,226,174,15,188,6,84,
+21,15,179,6,86,21,15,179,6,84,21,15,179,6,80,21,
+102,193,6,76,21,4,102,139,30,76,21,138,227,128,227,240,
+10,216,102,137,30,76,21,138,220,128,227,15,102,193,38,72,
+21,4,102,161,72,21,10,195,102,163,72,21,131,62,84,21,
+0,117,185,233,66,255,15,188,6,86,21,116,51,15,179,6,
+86,21,102,193,6,76,21,4,102,139,30,76,21,138,227,128,
+227,240,10,216,102,137,30,76,21,138,220,128,227,15,102,193,
+38,72,21,4,102,161,72,21,10,195,102,163,72,21,235,198,
+102,161,76,21,102,161,72,21,90,89,91,102,88,94,95,248,
+195,102,80,83,81,82,86,87,85,38,139,54,197,20,139,254,
+185,12,0,50,219,128,188,216,5,255,116,15,131,188,219,5,
+0,116,8,254,195,131,198,38,226,235,204,138,133,223,7,180,
+3,246,228,5,158,7,3,248,139,198,5,214,5,198,69,2,
+1,137,5,198,132,250,5,255,102,161,76,21,102,137,132,234,
+5,102,161,72,21,102,137,132,238,5,136,156,215,5,136,30,
+123,21,161,88,21,128,164,226,5,254,8,132,226,5,161,59,
+21,131,224,1,208,224,8,132,226,5,161,51,21,131,62,49,
+21,82,124,2,51,192,136,132,217,5,161,234,18,137,132,219,
+5,198,132,214,5,112,136,148,218,5,198,132,221,5,1,198,
+132,222,5,255,161,49,21,136,132,216,5,60,7,124,106,60,
+7,117,9,15,182,202,209,233,179,2,235,13,138,218,36,15,
+15,182,200,134,195,246,243,138,216,232,91,41,137,188,228,5,
+198,69,2,96,136,13,161,51,21,136,69,1,131,199,3,102,
+139,132,234,5,51,237,81,15,182,203,51,210,137,85,1,138,
+248,128,231,15,15,182,215,15,171,85,1,102,193,232,4,69,
+131,253,8,117,5,102,139,132,238,5,226,227,198,5,255,198,
+69,3,255,131,199,4,89,226,205,93,95,94,90,89,91,102,
+88,195,87,86,102,85,102,80,102,83,81,82,179,38,246,227,
+38,139,54,197,20,3,240,138,148,217,5,138,180,216,5,139,
+188,219,5,15,182,140,218,5,81,102,187,255,255,255,255,139,
+199,232,52,0,102,139,132,106,4,102,45,0,8,0,0,81,
+138,202,232,147,8,89,102,59,195,119,3,102,139,216,226,223,
+89,139,199,232,18,0,102,137,156,106,4,226,244,90,89,102,
+91,102,88,102,93,94,95,195,80,83,81,181,255,254,197,209,
+200,114,2,235,248,254,201,117,244,138,197,179,32,246,227,38,
+139,54,197,20,3,240,89,91,88,195,102,80,83,81,82,87,
+86,30,6,15,168,85,38,139,30,197,20,129,195,222,7,232,
+165,2,117,57,38,139,30,197,20,129,195,247,7,232,151,2,
+117,43,38,139,30,197,20,129,195,16,8,232,137,2,117,29,
+186,9,18,187,70,23,176,1,180,112,185,4,0,190,228,116,
+232,21,60,232,135,55,232,52,60,249,233,238,0,180,31,232,
+105,63,186,0,0,187,79,24,176,2,180,31,232,114,63,6,
+140,200,142,232,142,192,185,6,0,141,54,220,114,232,18,64,
+7,182,6,38,139,30,197,20,38,15,182,143,223,7,129,195,
+222,7,232,50,2,116,62,139,251,38,246,69,3,1,116,48,
+38,138,5,179,3,246,227,38,139,54,197,20,3,240,129,198,
+158,7,38,138,92,2,128,251,2,116,15,87,38,139,60,232,
+150,0,95,232,193,62,254,198,235,6,38,139,52,232,146,0,
+131,199,4,226,196,38,139,30,197,20,38,15,182,143,17,8,
+129,195,16,8,232,224,1,116,42,139,251,38,246,69,3,1,
+116,28,38,138,5,179,38,246,227,87,38,139,62,197,20,3,
+248,129,199,214,5,232,80,0,95,232,123,62,254,198,131,199,
+4,226,216,38,139,30,197,20,38,15,182,143,248,7,129,195,
+247,7,232,162,1,116,35,139,251,38,246,69,3,1,116,21,
+38,138,5,179,32,246,227,38,139,54,197,20,3,240,129,198,
+86,4,232,29,0,131,199,4,226,223,248,93,15,169,7,31,
+94,95,90,89,91,102,88,195,179,31,183,23,178,5,232,196,
+4,195,179,31,183,23,178,3,176,1,232,118,3,232,23,62,
+254,198,195,96,30,6,31,60,1,117,50,190,222,7,191,245,
+47,232,44,0,232,251,0,190,247,7,191,123,47,232,32,0,
+190,16,8,191,130,47,232,23,0,38,139,54,197,20,38,136,
+140,224,7,38,136,140,249,7,38,136,140,18,8,31,97,195,
+38,3,54,197,20,38,15,182,76,2,227,34,38,40,76,1,
+38,139,116,7,131,238,4,131,198,4,246,68,3,1,116,247,
+136,108,1,136,108,3,138,28,87,255,215,95,226,233,195,232,
+221,2,232,8,0,195,232,232,2,232,41,0,195,198,69,2,
+12,102,80,138,69,8,198,69,1,114,198,69,7,0,102,139,
+69,16,102,137,69,20,102,88,87,38,139,62,197,20,38,254,
+133,198,7,95,195,51,192,139,93,14,11,219,116,11,137,69,
+14,254,200,38,136,71,2,254,192,136,69,12,136,69,4,254,
+200,136,69,36,136,69,2,198,69,7,0,198,69,9,0,51,
+219,139,69,5,137,93,5,209,200,115,6,232,145,255,136,125,
+4,254,195,128,251,16,117,239,195,176,3,246,227,38,139,62,
+197,20,3,248,129,199,158,7,138,93,2,87,139,61,128,251,
+2,116,5,232,159,255,235,3,232,114,255,95,50,192,136,69,
+2,195,38,139,62,197,20,129,199,158,7,176,13,180,3,246,
+228,139,232,3,239,138,69,2,10,192,116,9,131,199,3,59,
+239,127,242,235,33,139,247,131,198,3,15,182,68,2,10,192,
+116,13,136,69,2,136,100,2,139,4,137,5,131,199,3,131,
+198,3,59,238,127,228,195,81,38,15,182,79,1,227,16,38,
+139,95,7,38,246,71,3,1,117,7,131,195,4,226,244,51,
+219,89,11,219,195,96,30,6,15,168,176,1,177,30,232,18,
+57,6,180,31,232,212,60,186,0,0,187,79,24,176,2,180,
+31,232,221,60,140,200,142,232,142,192,185,13,0,141,54,250,
+114,232,126,61,7,38,139,54,197,20,186,45,1,232,88,60,
+38,138,68,8,232,24,59,176,46,232,182,59,38,138,68,9,
+192,232,3,232,9,59,176,46,232,167,59,38,138,68,9,36,
+7,232,13,59,38,138,68,10,186,61,1,232,42,60,232,0,
+59,186,73,1,232,33,60,38,139,68,6,232,214,58,30,6,
+31,232,49,229,31,96,139,247,131,198,4,38,198,68,16,0,
+38,198,68,36,0,38,198,68,56,0,186,49,2,179,23,232,
+36,58,131,198,20,186,13,2,179,23,232,25,58,131,198,20,
+186,8,3,179,23,232,14,58,6,14,7,190,223,167,46,128,
+62,60,0,1,116,3,190,219,167,186,24,5,179,23,232,245,
+57,7,97,30,6,31,232,58,229,31,96,38,139,69,6,193,
+232,4,186,22,4,232,176,59,179,23,179,31,38,136,30,14,
+0,179,0,232,123,58,179,30,38,136,30,14,0,232,167,59,
+254,194,232,147,59,176,77,232,115,59,176,66,232,110,59,139,
+247,131,198,12,38,198,68,20,0,186,49,3,179,23,232,165,
+57,97,6,31,178,1,182,4,232,109,59,232,207,51,176,1,
+177,30,232,26,56,248,15,169,7,31,97,184,32,57,195,83,
+81,82,232,83,59,139,202,187,0,0,232,176,51,61,0,75,
+116,57,61,13,28,116,74,61,27,1,117,3,249,235,69,60,
+48,114,231,60,57,119,13,44,48,180,48,193,227,4,10,216,
+2,196,235,16,12,32,60,97,114,208,60,102,119,204,44,87,
+180,87,235,231,232,123,58,254,194,235,191,59,202,116,187,193,
+235,4,254,202,232,1,59,176,32,232,102,58,232,249,58,235,
+169,139,195,248,90,89,91,195,87,6,80,81,60,0,117,6,
+140,200,142,192,235,6,46,161,38,16,142,192,232,217,58,138,
+225,38,138,5,232,152,57,71,176,32,232,53,58,254,204,117,
+240,232,94,237,254,198,254,205,117,226,89,88,7,95,195,38,
+139,62,197,20,80,176,32,246,227,3,248,129,199,86,4,88,
+195,38,139,62,197,20,80,176,38,246,227,3,248,129,199,214,
+5,88,195,96,6,15,168,102,80,6,15,169,232,137,58,138,
+200,128,225,127,168,128,117,36,38,138,68,1,60,112,127,28,
+6,86,14,7,190,138,125,232,156,56,94,7,60,112,116,7,
+83,179,0,232,59,57,91,232,109,58,178,13,38,138,68,8,
+38,162,123,20,102,38,139,68,16,139,254,86,102,80,6,140,
+200,142,192,190,122,125,246,193,1,116,3,190,129,125,232,101,
+56,7,38,160,123,20,83,179,0,232,5,57,91,190,118,125,
+184,32,3,246,193,1,116,3,184,32,1,38,128,62,123,20,
+10,114,2,254,204,232,98,56,6,140,200,142,192,232,23,58,
+232,51,56,246,193,64,116,16,190,189,124,101,128,125,2,15,
+117,3,190,203,124,232,30,56,7,232,251,57,138,227,38,160,
+123,20,232,58,34,102,88,102,82,102,51,210,232,25,33,102,
+90,190,153,20,232,195,34,185,9,0,232,204,34,190,153,20,
+232,212,57,232,240,55,94,101,138,68,2,60,11,117,5,190,
+14,125,235,90,60,15,117,5,190,11,125,235,72,60,13,117,
+5,190,170,124,235,63,60,12,117,5,190,14,125,235,63,60,
+217,117,5,190,17,125,235,45,60,219,117,5,190,34,125,235,
+36,60,221,117,5,190,51,125,235,27,60,236,117,5,190,67,
+125,235,18,60,238,117,5,190,85,125,235,9,60,254,117,14,
+190,103,125,235,0,178,61,6,30,7,232,137,55,7,102,88,
+15,169,7,97,195,96,6,15,168,102,80,140,192,142,232,101,
+136,22,122,20,6,140,200,142,192,190,151,124,232,103,55,101,
+138,5,60,112,117,5,184,32,2,235,18,83,179,0,232,0,
+56,91,184,32,1,101,128,61,10,114,2,254,204,232,106,55,
+190,118,125,232,33,57,232,61,55,7,6,140,200,142,192,83,
+101,138,69,4,179,0,232,216,55,91,190,38,112,232,7,57,
+232,35,55,7,30,6,83,140,232,142,216,142,192,138,93,2,
+138,125,3,232,208,32,131,198,5,91,7,31,6,232,231,56,
+232,3,55,7,101,138,69,2,87,6,14,7,232,193,224,139,
+247,232,211,56,232,239,54,7,95,176,32,232,159,56,102,82,
+102,101,139,69,16,102,101,139,85,32,232,235,31,102,90,190,
+153,20,232,149,33,185,9,0,232,158,33,190,153,20,232,166,
+56,232,194,54,38,139,69,14,11,192,117,31,6,15,168,7,
+38,138,69,8,232,77,31,7,232,140,56,128,194,4,6,14,
+7,83,179,31,232,159,54,91,7,235,0,101,128,14,13,0,
+1,101,198,6,14,0,23,101,131,125,14,0,117,14,101,138,
+85,36,101,139,125,5,232,158,0,233,142,0,101,139,117,14,
+101,15,182,12,101,138,100,1,131,198,3,101,138,69,2,60,
+7,117,4,176,2,235,2,176,5,101,128,125,8,0,117,3,
+80,235,81,87,86,30,6,83,80,14,7,190,166,125,232,38,
+56,101,138,22,122,20,254,198,232,59,54,140,232,142,216,142,
+192,91,232,241,31,139,195,91,232,12,56,232,40,54,232,239,
+223,139,247,232,1,56,14,7,232,27,54,7,31,94,80,101,
+138,4,86,232,174,30,232,238,55,6,14,7,232,7,54,7,
+232,213,55,94,101,139,124,1,101,138,84,3,86,83,232,22,
+0,91,94,88,95,131,198,4,226,143,101,128,38,13,0,254,
+102,88,15,169,7,97,195,11,255,116,116,96,82,80,15,188,
+207,15,187,207,176,32,246,225,101,139,54,197,20,3,240,129,
+198,86,4,138,223,232,159,55,254,198,101,138,22,122,20,176,
+129,232,239,252,88,90,82,15,186,242,7,115,31,128,226,15,
+56,202,117,53,6,14,7,190,150,125,232,122,55,232,150,53,
+190,246,153,232,113,55,232,141,53,7,235,29,128,226,15,56,
+202,117,22,6,14,7,190,150,125,232,91,55,232,119,53,190,
+234,153,232,82,55,232,110,53,7,90,11,255,117,142,97,195,
+232,150,54,232,151,47,36,223,60,78,116,6,60,89,117,240,
+12,89,156,232,122,54,157,195,102,83,102,82,81,102,80,102,
+187,1,0,0,0,102,211,227,102,51,210,102,247,243,102,88,
+102,43,194,89,102,90,102,91,195,96,30,6,31,184,1,0,
+232,41,1,115,7,232,48,0,114,25,235,41,232,66,3,114,
+10,232,237,2,114,5,232,87,1,115,26,232,250,0,232,159,
+255,116,18,139,54,195,20,137,54,197,20,232,170,16,139,52,
+131,254,255,117,242,31,97,195,186,1,1,187,78,24,176,1,
+180,112,185,5,0,190,158,116,232,157,51,184,0,0,232,219,
+0,115,48,160,118,20,36,223,60,78,116,35,60,89,116,25,
+232,250,46,61,0,73,117,5,232,15,1,235,222,36,223,60,
+78,116,12,60,89,116,2,235,231,232,145,51,249,235,4,232,
+139,51,248,195,96,184,1,0,232,161,0,114,20,232,193,2,
+114,10,232,108,2,114,5,232,214,0,115,0,232,121,0,235,
+95,186,1,1,187,78,24,176,1,180,112,185,5,0,190,158,
+116,232,52,51,184,0,0,232,114,0,115,38,160,118,20,36,
+223,60,78,116,77,60,89,116,67,232,145,46,61,0,73,117,
+5,232,166,0,235,222,36,223,60,78,116,54,60,89,116,44,
+235,231,182,22,6,14,7,190,109,131,232,253,30,7,178,3,
+2,208,232,3,54,235,16,182,14,178,59,232,250,53,235,7,
+182,14,178,62,232,241,53,232,182,254,116,6,232,254,50,249,
+235,4,232,248,50,248,97,195,186,9,18,187,70,23,176,1,
+180,112,185,2,0,190,183,116,232,189,50,195,102,80,96,139,
+232,182,7,187,164,55,232,119,28,162,118,20,114,16,187,110,
+55,232,108,28,114,8,131,253,1,117,3,248,235,0,97,102,
+88,195,15,182,140,41,8,248,227,1,249,195,15,182,140,42,
+8,248,227,1,249,195,15,182,140,43,8,248,227,1,249,195,
+15,182,140,44,8,248,227,1,249,195,81,186,2,7,185,77,
+21,183,112,232,162,53,89,195,86,83,11,237,117,58,15,182,
+140,41,8,10,201,15,132,100,1,178,4,232,90,53,102,80,
+102,83,102,82,86,6,140,200,142,192,190,224,125,232,100,51,
+7,94,138,68,10,179,1,232,23,52,232,205,221,102,90,102,
+91,102,88,178,18,232,48,53,139,254,51,201,136,140,41,8,
+131,198,27,129,199,86,4,185,12,0,38,138,68,2,38,138,
+101,2,128,252,30,15,132,9,1,38,58,69,2,117,87,60,
+15,116,56,60,0,116,52,60,1,15,133,245,0,87,86,179,
+38,38,138,68,4,139,54,197,20,129,198,166,1,246,227,3,
+240,38,138,69,4,139,62,197,20,129,199,214,5,246,227,3,
+248,232,214,16,94,95,115,30,233,199,0,102,38,139,68,24,
+102,38,59,69,24,117,15,102,38,139,68,20,102,38,59,69,
+20,117,3,233,172,0,86,139,54,197,20,254,132,41,8,94,
+131,253,1,15,132,155,0,87,86,6,80,140,200,142,192,190,
+129,125,232,175,50,88,7,94,38,138,68,8,83,179,0,232,
+95,51,91,176,32,232,234,51,6,15,168,140,216,142,232,142,
+192,232,131,52,138,68,8,180,112,232,195,28,15,169,7,232,
+117,52,254,198,178,18,232,95,52,95,128,254,22,117,83,86,
+6,140,200,142,192,190,234,125,232,105,50,7,94,182,14,178,
+62,232,68,52,81,232,161,51,89,232,161,44,61,0,81,117,
+12,232,182,254,182,7,178,18,232,45,52,235,37,61,0,73,
+117,20,232,165,254,91,94,139,54,195,20,137,54,197,20,86,
+83,182,7,233,179,254,36,223,60,78,116,17,60,89,116,13,
+235,199,131,198,32,131,199,32,73,15,133,221,254,91,94,248,
+195,96,187,44,57,232,168,26,187,130,55,232,162,26,97,195,
+86,139,62,197,20,139,247,15,182,141,160,7,227,49,86,87,
+139,189,158,7,139,180,111,3,128,249,1,117,16,138,13,58,
+12,116,18,139,62,197,20,254,133,43,8,235,8,138,77,1,
+58,76,1,117,238,95,94,131,199,3,131,198,3,235,200,94,
+195,96,187,130,57,232,88,26,187,161,57,232,82,26,187,120,
+55,232,76,26,97,195,185,12,0,139,62,197,20,38,128,189,
+223,5,1,116,7,131,199,38,226,243,235,8,139,62,197,20,
+254,133,42,8,195,86,185,12,0,139,62,197,20,38,128,189,
+216,5,255,116,73,38,128,189,216,5,96,116,70,38,139,133,
+219,5,81,139,54,197,20,38,128,188,168,1,255,116,41,38,
+128,188,168,1,96,116,38,38,59,132,171,1,117,26,38,138,
+133,226,5,36,1,38,50,132,178,1,10,192,116,15,139,54,
+197,20,254,132,42,8,235,5,131,198,38,226,202,89,131,199,
+38,226,170,94,195,61,0,30,249,117,69,30,83,81,82,87,
+46,161,38,16,142,216,139,30,197,20,139,251,15,182,77,21,
+129,195,198,3,128,127,1,0,116,27,246,71,3,1,117,21,
+176,42,128,79,3,1,254,133,199,7,30,6,30,7,14,31,
+232,140,24,7,31,131,195,4,226,218,95,90,89,91,31,248,
+195,80,83,81,82,186,9,18,187,70,23,176,1,180,112,185,
+2,0,232,163,47,232,120,251,156,232,193,47,157,90,89,91,
+88,195,0,0,232,96,0,38,139,30,197,20,38,15,182,143,
+199,7,38,136,175,199,7,38,40,143,198,7,38,0,143,223,
+7,38,139,159,204,7,246,71,3,1,116,53,15,182,7,136,
+103,3,136,103,1,182,32,246,230,139,62,197,20,3,248,129,
+199,86,4,161,88,21,136,69,7,128,77,7,128,198,69,2,
+11,198,69,1,112,198,68,2,2,137,60,131,198,3,73,227,
+5,131,195,4,235,192,195,80,83,38,139,30,197,20,38,138,
+135,223,7,180,3,246,228,139,243,3,240,129,198,158,7,91,
+88,195,61,0,73,116,94,61,0,81,116,66,61,114,19,116,
+5,61,82,19,117,106,96,30,6,31,80,83,86,139,243,38,
+138,7,38,255,87,11,51,192,38,136,103,1,38,246,71,3,
+1,116,8,38,136,103,3,38,254,76,2,94,91,88,38,138,
+31,232,62,0,232,235,244,31,97,184,5,0,235,48,38,138,
+7,254,192,38,58,71,1,116,35,38,255,87,15,38,138,7,
+38,254,7,235,16,38,138,7,10,192,116,16,38,255,87,15,
+38,254,15,254,200,232,134,0,38,255,87,13,51,192,249,195,
+248,195,176,3,246,227,38,139,62,197,20,3,248,129,199,158,
+7,87,138,69,2,139,61,60,2,116,45,128,61,112,116,67,
+198,69,2,30,81,139,77,5,227,27,15,188,193,15,179,193,
+180,32,246,228,38,139,62,197,20,129,199,86,4,3,248,198,
+69,2,30,235,227,89,235,10,128,125,1,112,116,21,198,69,
+2,30,95,50,192,136,69,2,38,139,62,197,20,254,141,223,
+7,235,26,95,186,10,18,187,69,22,176,1,180,112,185,1,
+0,190,91,119,232,33,46,232,147,41,232,64,46,195,96,80,
+38,255,87,11,139,251,139,247,131,198,4,38,138,69,3,38,
+134,68,3,38,136,69,3,88,38,139,30,197,20,180,3,246,
+228,3,216,129,195,158,7,135,251,139,247,131,198,3,38,139,
+5,38,135,4,38,137,5,38,138,69,2,38,134,68,2,38,
+136,69,2,83,50,210,38,138,119,1,131,195,4,177,79,38,
+138,111,2,183,31,232,0,49,91,232,25,0,38,136,119,2,
+254,198,131,199,3,131,195,4,38,136,119,1,232,6,0,38,
+136,119,2,97,195,96,38,138,69,2,38,139,53,179,31,60,
+1,117,14,183,23,178,5,139,254,232,73,247,97,232,167,48,
+195,176,64,178,5,232,251,245,97,195,0,0,96,6,15,168,
+38,139,30,197,20,38,15,182,143,224,7,131,249,1,15,133,
+198,0,38,139,159,229,7,38,246,71,3,1,117,5,131,195,
+4,235,244,38,138,39,38,136,38,96,21,176,3,246,228,38,
+139,62,197,20,129,199,158,7,3,248,38,138,69,2,38,139,
+61,80,60,2,116,7,38,15,182,69,12,235,15,38,138,69,
+2,60,15,15,132,157,0,38,15,182,69,7,131,224,1,38,
+163,90,21,38,199,6,92,21,0,0,87,180,31,232,107,48,
+51,210,187,79,24,176,2,180,31,232,117,48,6,140,200,142,
+232,142,192,185,12,0,141,54,113,119,232,21,49,7,95,88,
+182,3,190,9,120,60,1,117,45,199,68,1,45,120,38,15,
+182,69,2,232,14,23,115,19,199,68,1,24,120,38,15,182,
+69,12,209,232,131,224,1,38,163,57,21,179,31,183,23,178,
+5,232,113,246,235,75,199,68,1,45,120,139,247,50,192,178,
+5,179,31,232,29,245,235,57,186,9,18,187,70,23,176,1,
+180,112,227,8,185,5,0,190,134,120,235,25,185,4,0,190,
+228,116,235,17,88,186,19,18,187,60,23,176,1,180,112,185,
+5,0,190,159,120,232,112,44,232,226,39,232,143,44,249,235,
+1,248,15,169,7,97,195,96,60,1,15,133,65,1,176,1,
+38,131,62,88,21,1,116,2,176,0,80,38,160,96,21,180,
+3,246,228,38,139,62,197,20,129,199,158,7,3,248,38,138,
+93,2,38,139,61,88,36,1,128,251,2,117,23,38,128,101,
+7,254,38,8,69,7,232,8,1,15,133,2,1,38,138,101,
+1,233,183,0,38,138,101,12,128,228,1,56,196,116,14,38,
+128,101,12,254,38,8,69,12,38,128,117,12,32,38,15,182,
+69,2,232,47,22,115,36,38,161,59,21,131,224,1,208,224,
+138,224,38,50,101,12,128,228,2,10,228,116,14,38,128,101,
+12,253,38,8,69,12,38,128,117,12,64,232,179,0,15,133,
+173,0,38,128,125,7,0,116,28,186,8,12,187,71,17,176,
+1,180,112,185,3,0,190,173,119,232,172,43,232,30,39,232,
+203,43,233,138,0,38,139,69,14,11,192,116,12,38,138,69,
+8,36,15,60,15,117,22,235,47,38,138,69,8,138,224,128,
+228,2,128,252,0,116,6,36,252,60,252,116,27,186,8,12,
+187,71,17,176,1,180,112,185,4,0,190,188,119,232,104,43,
+232,218,38,232,135,43,235,71,38,138,37,30,6,31,232,178,
+0,114,56,232,63,1,31,60,0,117,6,190,119,120,185,3,
+0,186,21,10,187,56,15,80,176,1,180,112,232,57,43,88,
+128,252,0,116,14,186,34,11,232,61,46,187,1,0,138,196,
+232,14,45,232,151,38,232,68,43,235,1,31,232,41,0,97,
+195,38,161,94,21,131,248,1,195,96,186,5,4,187,74,17,
+176,1,180,112,185,9,0,190,184,120,232,251,42,232,109,38,
+232,26,43,97,195,96,97,195,30,96,6,31,160,96,21,180,
+3,246,228,139,62,197,20,129,199,158,7,3,248,138,93,2,
+139,53,128,251,2,116,41,138,4,15,182,232,232,36,217,232,
+147,216,131,199,26,138,69,5,136,68,8,139,238,15,182,13,
+131,199,20,139,116,14,11,246,116,6,131,198,3,232,190,221,
+97,31,195,96,6,80,15,182,236,89,176,5,128,249,244,117,
+2,176,8,139,62,223,18,136,5,198,69,1,2,198,69,2,
+0,139,197,136,69,3,199,69,6,5,1,232,124,36,232,181,
+36,190,184,63,232,104,23,190,229,120,185,6,0,184,46,12,
+163,114,20,184,51,12,163,116,20,139,197,186,21,10,187,56,
+15,191,45,11,232,137,22,114,4,248,7,97,195,139,62,223,
+18,198,5,8,198,69,1,2,198,69,2,0,139,197,136,69,
+3,199,69,6,2,0,232,49,36,232,106,36,198,5,5,232,
+40,36,232,97,36,198,5,23,232,31,36,232,88,36,232,60,
+42,249,7,97,195,51,192,96,15,182,236,50,219,190,54,64,
+232,252,22,246,199,1,117,35,128,251,0,117,4,97,176,0,
+195,136,30,118,20,97,138,38,118,20,190,3,121,185,3,0,
+235,21,97,190,18,121,185,3,0,235,12,246,199,6,117,242,
+97,190,33,121,185,3,0,176,1,195,138,69,22,60,9,116,
+32,60,10,116,28,60,4,116,20,60,42,116,16,60,14,116,
+12,60,38,116,16,60,54,117,2,254,195,248,195,128,207,1,
+195,128,207,2,195,128,207,4,195,0,0,0,102,80,96,6,
+15,168,38,139,54,197,20,38,15,182,68,22,38,163,97,21,
+38,163,113,21,38,15,182,68,26,38,163,115,21,187,1,0,
+139,203,38,138,68,24,60,0,116,22,60,6,118,2,176,6,
+138,200,38,138,68,23,38,58,68,21,119,4,254,196,138,216,
+15,182,196,38,163,101,21,75,38,137,30,105,21,73,38,137,
+14,109,21,139,254,139,216,6,15,168,83,82,180,31,232,154,
+44,51,210,187,79,24,176,2,180,31,232,164,44,140,200,142,
+232,142,192,185,13,0,141,54,97,121,232,69,45,90,91,15,
+169,7,248,15,169,7,97,102,88,195,96,191,212,122,189,16,
+123,38,139,54,197,20,38,139,14,103,21,227,45,129,251,246,
+64,117,28,187,0,0,38,137,30,105,21,67,38,137,30,107,
+21,185,1,0,38,137,14,109,21,65,38,137,14,111,21,180,
+1,232,75,0,38,138,76,21,235,12,138,225,232,64,0,191,
+80,172,139,239,254,193,138,233,190,108,122,136,76,12,137,124,
+10,254,193,138,4,2,193,136,68,2,138,205,128,249,1,116,
+2,177,6,50,192,190,129,122,136,76,12,137,108,10,232,68,
+38,190,108,122,232,62,38,190,171,122,232,56,38,97,195,51,
+201,38,137,14,119,21,10,228,116,54,38,15,182,76,25,138,
+233,246,193,1,116,26,15,182,205,209,233,38,137,14,119,21,
+86,190,171,122,199,68,10,200,122,198,68,12,2,94,235,30,
+86,190,171,122,199,68,10,208,122,198,68,12,1,94,235,14,
+86,190,171,122,199,68,10,80,172,198,68,12,1,94,195,96,
+30,6,31,60,1,15,133,10,1,38,139,54,197,20,187,255,
+0,38,139,14,103,21,227,5,38,139,30,107,21,38,58,92,
+23,116,26,81,38,136,92,23,102,80,102,184,3,4,7,1,
+139,203,38,254,132,44,8,232,220,0,102,88,89,38,139,14,
+103,21,227,5,38,139,14,111,21,58,76,24,116,24,136,76,
+24,102,80,102,184,3,4,8,1,15,182,201,38,254,132,44,
+8,232,178,0,102,88,38,139,14,117,21,38,58,76,26,116,
+22,38,136,76,26,102,80,102,184,3,4,18,1,38,254,132,
+44,8,232,145,0,102,88,38,246,68,25,1,116,48,38,139,
+14,121,21,208,225,138,233,128,201,1,38,50,76,25,116,30,
+128,205,1,38,136,108,25,102,80,102,184,3,4,20,1,15,
+182,205,209,233,38,254,132,44,8,232,90,0,102,88,38,139,
+14,99,21,38,59,14,97,21,116,73,81,186,13,8,187,65,
+17,176,1,180,71,185,6,0,141,54,172,121,14,15,169,232,
+86,39,232,43,243,156,232,116,39,157,89,116,38,38,139,54,
+197,20,38,136,76,22,102,80,102,184,3,4,17,1,38,254,
+132,44,8,232,16,0,232,7,221,102,88,38,139,54,197,20,
+232,130,214,31,97,195,96,81,102,80,139,62,223,18,176,19,
+12,64,136,5,198,69,1,4,198,69,2,0,198,69,3,0,
+199,69,6,1,0,139,22,231,18,232,180,203,102,137,69,8,
+102,199,69,12,0,2,0,0,139,62,231,18,102,88,102,137,
+5,131,199,4,88,136,5,139,62,223,18,232,220,32,232,21,
+33,97,195,96,186,5,4,187,74,17,176,1,180,112,185,10,
+0,190,40,123,232,193,38,232,51,34,232,224,38,97,195,0,
+102,80,96,6,15,168,38,139,30,197,20,38,15,182,143,224,
+7,128,249,1,15,133,170,0,38,139,159,229,7,38,246,71,
+3,1,117,5,131,195,4,235,244,38,138,7,180,3,246,228,
+38,139,54,197,20,3,240,129,198,158,7,38,138,68,2,38,
+139,52,60,2,116,124,38,138,68,2,232,167,16,115,115,38,
+139,92,14,11,219,117,22,38,138,68,8,138,224,36,252,60,
+236,116,43,128,228,2,128,252,0,116,35,235,85,38,15,182,
+15,131,195,3,38,138,7,138,224,36,252,60,236,116,15,128,
+228,2,128,252,0,116,7,131,195,4,226,232,235,52,38,139,
+68,5,232,233,219,139,193,38,15,182,76,4,43,200,138,241,
+10,201,15,132,211,0,38,139,30,197,20,38,138,151,199,7,
+56,242,127,14,10,210,117,39,38,15,182,76,37,227,3,233,
+183,0,186,9,18,187,70,23,176,1,180,112,185,2,0,190,
+131,123,232,227,37,232,85,33,232,2,38,249,233,28,1,15,
+182,202,102,87,102,80,38,15,188,68,5,86,139,243,180,32,
+246,228,139,251,129,199,86,4,87,3,248,102,38,139,125,20,
+91,38,139,180,204,7,38,246,68,3,1,116,30,38,138,4,
+180,32,246,228,83,3,216,102,38,139,71,16,91,102,45,0,
+8,0,0,102,59,199,114,15,73,227,5,131,198,4,235,214,
+94,102,88,102,95,235,66,94,102,88,102,95,186,10,8,187,
+67,12,176,1,180,112,185,4,0,190,141,123,232,105,37,102,
+82,102,51,210,102,38,139,133,106,4,232,171,15,102,90,190,
+153,20,186,48,10,179,126,232,140,38,176,46,232,62,40,232,
+187,32,232,104,37,249,233,130,0,139,254,139,216,6,15,168,
+83,82,180,31,232,148,40,51,210,187,79,24,176,2,180,31,
+232,158,40,140,200,142,232,142,192,185,6,0,141,54,101,123,
+232,63,41,90,91,15,169,7,128,254,0,116,66,15,182,206,
+186,8,5,38,139,30,197,20,38,139,159,204,7,38,246,71,
+3,1,117,5,131,195,4,235,244,38,138,7,180,32,246,228,
+38,139,54,197,20,3,240,129,198,86,4,83,176,0,179,31,
+232,80,237,91,131,195,4,254,198,226,210,254,198,235,2,182,
+5,179,31,183,23,178,8,232,123,238,248,15,169,7,97,102,
+88,195,96,30,6,31,60,1,15,133,185,0,38,139,30,197,
+20,38,254,143,224,7,129,195,222,7,232,250,234,128,103,3,
+254,138,7,180,3,246,228,38,139,54,197,20,3,240,129,198,
+158,7,38,139,52,38,198,68,9,1,38,139,92,14,11,219,
+117,8,180,223,38,136,100,8,235,7,38,128,100,8,253,235,
+22,38,139,68,5,232,38,218,139,193,38,15,182,76,4,59,
+200,116,98,38,139,92,14,11,219,38,138,20,38,138,116,1,
+117,86,38,139,30,197,20,15,182,143,198,7,227,71,139,191,
+204,7,246,69,3,1,87,116,54,254,143,198,7,254,143,199,
+7,50,192,136,69,3,136,69,1,87,138,37,176,32,246,228,
+38,139,62,197,20,3,248,198,133,88,4,1,136,181,90,4,
+95,15,182,5,15,171,68,5,128,100,36,240,8,68,36,95,
+131,199,4,226,189,31,97,195,232,12,16,38,137,124,14,86,
+81,139,243,185,38,0,243,164,89,94,38,139,92,14,139,238,
+38,15,182,116,37,38,139,62,197,20,131,195,3,86,83,15,
+182,141,198,7,227,119,139,189,204,7,246,69,3,1,116,104,
+50,192,136,69,3,136,69,1,138,37,87,38,139,62,197,20,
+254,141,198,7,254,141,199,7,176,32,246,228,38,139,62,197,
+20,3,248,198,133,88,4,1,136,181,90,4,95,138,7,138,
+224,36,252,60,236,116,8,128,228,2,128,252,0,117,6,209,
+238,115,9,235,2,209,238,131,195,4,235,225,180,223,136,39,
+15,182,5,15,171,71,1,62,15,171,70,5,128,103,3,240,
+8,71,3,131,195,4,235,146,131,199,4,226,141,91,94,185,
+8,0,209,238,115,12,138,7,36,252,60,236,117,4,180,223,
+136,39,131,195,4,226,235,233,59,255,96,186,5,4,187,74,
+17,176,1,180,112,185,10,0,190,191,123,232,26,35,232,140,
+30,232,57,35,97,195,0,0,30,6,30,7,139,54,197,20,
+139,254,232,165,0,232,7,1,232,244,1,232,58,1,232,107,
+1,232,149,1,86,139,254,129,198,214,5,129,199,120,7,128,
+124,4,0,116,59,138,12,128,249,255,116,52,139,76,14,227,
+10,59,241,127,6,59,249,126,2,139,249,138,68,12,138,100,
+7,10,228,116,15,36,3,10,192,116,21,138,224,192,228,5,
+10,196,235,7,138,224,128,228,96,116,5,138,36,232,193,4,
+131,198,38,59,247,126,184,94,86,15,182,76,21,138,132,88,
+4,60,11,117,38,138,132,93,4,168,128,116,4,12,32,235,
+14,36,1,138,100,34,128,228,1,56,196,116,14,12,32,138,
+164,87,4,128,252,255,116,3,232,134,4,131,198,32,226,205,
+94,232,84,11,232,108,6,7,31,195,96,138,140,162,1,138,
+172,163,1,2,205,15,182,201,227,83,139,222,129,198,166,1,
+129,199,214,5,59,183,164,1,125,67,128,124,2,255,116,56,
+87,86,81,185,12,0,128,125,2,255,116,29,232,59,1,114,
+36,80,139,69,5,59,68,5,88,117,14,128,125,2,30,117,
+8,15,182,4,232,86,1,235,12,131,199,38,226,216,138,4,
+180,128,232,72,1,89,94,95,131,198,38,235,183,97,195,96,
+131,198,27,129,199,86,4,185,12,0,138,68,2,60,11,116,
+8,60,15,116,4,60,13,117,21,56,69,2,116,16,180,128,
+128,125,2,30,117,2,50,228,138,68,1,232,15,1,131,198,
+32,131,199,32,226,212,97,195,96,129,199,86,4,131,198,27,
+185,12,0,138,69,2,60,13,116,8,60,15,116,4,60,11,
+117,16,56,68,2,117,8,138,68,1,136,69,1,235,3,232,
+48,1,131,199,32,131,198,32,226,217,97,195,96,129,199,158,
+7,15,182,140,223,7,227,31,138,69,2,60,2,116,19,60,
+1,117,20,139,53,128,124,9,1,117,7,87,139,254,232,14,
+3,95,131,199,3,226,225,97,195,96,129,199,158,7,15,182,
+140,223,7,227,72,138,69,2,60,2,116,60,60,1,117,61,
+86,87,81,139,61,15,182,140,162,1,129,198,111,3,227,34,
+86,138,68,2,60,2,116,20,60,1,117,16,139,52,232,57,
+0,114,2,235,7,198,69,7,0,94,235,9,94,131,198,3,
+226,222,232,234,0,89,95,94,131,199,3,226,184,97,195,96,
+129,199,86,4,185,12,0,128,125,2,30,117,6,138,69,8,
+232,103,0,131,199,32,226,239,97,195,80,138,5,58,4,117,
+41,138,69,3,58,68,3,117,33,138,69,2,58,68,2,117,
+25,138,69,4,58,68,4,117,17,139,69,5,59,68,5,116,
+6,128,125,9,1,117,3,249,235,1,248,88,195,87,83,80,
+15,182,216,139,62,225,18,198,5,21,136,69,3,198,69,1,
+2,102,51,192,136,69,2,102,137,69,4,88,138,196,136,69,
+7,232,150,26,232,207,26,91,95,195,87,83,139,62,225,18,
+198,5,10,198,69,1,2,80,102,51,192,136,69,3,136,69,
+2,102,137,69,4,88,136,69,7,232,110,26,232,167,26,91,
+95,195,85,86,87,82,102,80,139,247,139,22,231,18,139,62,
+223,18,189,20,0,232,255,3,87,139,62,231,18,138,100,2,
+50,192,232,52,4,95,232,65,26,232,122,26,138,69,3,162,
+123,21,102,88,90,95,94,93,160,123,21,136,69,1,195,85,
+86,87,82,81,102,80,139,247,128,124,2,7,124,6,232,190,
+0,233,174,0,139,62,197,20,129,199,86,4,185,12,0,138,
+84,1,136,22,123,21,87,81,102,51,192,15,182,108,4,138,
+116,3,136,54,233,18,138,116,2,136,54,124,21,85,51,210,
+184,20,0,69,247,229,139,232,139,22,231,18,139,62,223,18,
+232,132,3,139,62,231,18,93,86,139,247,232,97,1,94,139,
+197,136,5,160,233,18,136,69,2,138,54,124,21,136,117,1,
+198,69,3,255,102,51,192,136,69,5,136,69,4,137,69,6,
+102,137,69,8,102,137,69,12,131,199,20,89,94,42,192,50,
+210,128,124,2,1,117,22,138,38,123,21,56,100,4,117,13,
+180,12,136,84,9,232,113,3,254,194,131,199,20,131,198,32,
+226,223,139,62,223,18,232,113,25,232,170,25,138,69,3,162,
+123,21,102,88,89,90,95,94,93,160,123,21,136,5,195,96,
+102,83,102,51,219,138,69,2,139,54,231,18,232,224,0,136,
+92,1,138,77,4,60,7,117,6,178,2,208,233,235,7,178,
+5,138,200,128,225,15,136,12,138,69,3,36,15,136,68,2,
+198,68,3,255,136,92,4,136,92,5,137,92,6,102,137,92,
+8,102,137,92,12,131,198,20,232,164,0,138,69,4,138,231,
+246,241,15,182,232,15,182,201,50,246,139,125,14,138,69,1,
+138,226,131,199,3,136,68,2,136,100,1,80,139,197,136,4,
+82,15,182,198,139,213,246,242,90,136,92,3,136,92,4,136,
 92,5,137,92,6,102,137,92,8,102,137,92,12,131,198,20,
-232,164,0,138,69,4,138,231,246,241,15,182,232,15,182,201,
-50,246,139,125,14,138,69,1,138,226,131,199,3,136,68,2,
-136,100,1,80,139,197,136,4,82,15,182,198,139,213,246,242,
-90,136,92,3,136,92,4,136,92,5,137,92,6,102,137,92,
-8,102,137,92,12,131,198,20,232,92,0,81,139,205,136,28,
-198,68,1,12,15,188,69,1,15,187,69,1,136,68,3,136,
-92,2,136,92,4,136,92,5,137,92,6,102,137,92,8,102,
-137,92,12,254,198,131,198,20,232,44,0,226,209,131,199,4,
-89,88,226,153,139,238,139,54,231,18,43,238,139,62,223,18,
-139,22,231,18,232,40,2,232,120,24,232,177,24,138,69,3,
-162,123,21,102,91,97,195,80,81,87,139,254,51,192,185,10,
-0,243,171,95,89,88,195,102,80,102,83,81,82,139,117,14,
-11,246,117,42,102,51,192,138,69,37,10,192,117,18,138,69,
-36,138,240,128,230,15,232,250,0,139,247,138,21,232,51,1,
-139,247,138,21,232,77,1,90,89,102,91,102,88,195,138,93,
-37,138,21,15,182,12,131,198,3,138,4,36,252,60,220,117,
-31,246,195,1,117,14,138,116,3,128,230,15,232,196,0,232,
-1,1,235,12,86,81,138,76,3,139,247,232,126,1,89,94,
-208,235,131,198,4,226,210,235,190,96,80,139,62,223,18,176,
-19,12,64,136,5,198,69,1,4,198,69,2,0,136,101,3,
-199,69,6,0,0,139,22,231,18,232,124,194,102,137,69,8,
-102,199,69,12,0,2,0,0,88,138,220,15,186,224,5,115,
-3,255,69,6,15,186,224,6,115,3,255,69,6,139,62,231,
-18,15,186,224,5,115,40,80,102,184,0,131,13,0,10,195,
-102,137,5,131,199,4,102,184,1,0,1,0,102,137,5,131,
-199,4,88,80,36,1,192,224,2,12,1,136,5,71,88,15,
-186,224,6,115,34,80,102,184,0,131,15,0,10,195,102,137,
-5,131,199,4,102,184,1,0,1,0,102,137,5,131,199,4,
-88,208,232,36,1,136,5,139,62,223,18,232,68,23,232,125,
-23,97,195,96,82,139,22,231,18,139,62,223,18,189,20,0,
-232,220,0,90,176,32,246,230,139,54,197,20,3,240,129,198,
-86,4,139,62,231,18,180,12,176,0,232,4,1,139,62,223,
-18,232,14,23,232,71,23,138,69,3,162,123,21,97,138,54,
-123,21,195,96,139,62,223,18,198,5,9,198,69,1,2,198,
-69,2,0,136,85,3,15,182,198,137,69,6,232,227,22,232,
-28,23,97,195,102,96,128,124,2,7,125,8,138,76,36,232,
-90,0,235,36,139,116,14,15,182,12,131,198,3,138,68,3,
-60,255,116,18,15,186,240,7,81,15,188,68,1,138,232,232,
-58,0,131,198,4,89,226,229,102,97,195,209,233,56,216,116,
-32,138,216,36,15,60,15,117,5,192,235,4,235,12,138,195,
-192,232,4,60,15,117,20,128,227,15,81,138,235,232,12,0,
-89,102,193,232,8,102,193,235,8,226,210,195,96,50,237,139,
-62,223,18,198,5,23,198,69,1,2,136,109,2,136,85,3,
-138,225,176,128,137,69,6,232,88,22,232,145,22,97,195,83,
-81,102,80,51,219,176,20,12,96,136,5,51,192,198,69,1,
-5,136,69,2,136,69,3,137,109,6,198,69,8,1,136,69,
-9,136,69,10,232,225,192,102,137,69,12,102,15,183,197,102,
-5,255,1,0,0,37,0,254,102,137,69,16,102,88,89,91,
-195,80,86,139,247,232,159,253,94,136,5,136,101,1,138,68,
-8,136,69,3,50,192,136,69,4,88,195,96,102,80,15,182,
-140,223,7,10,201,15,132,203,0,139,46,231,18,129,198,158,
-7,51,219,138,68,2,60,1,116,7,139,60,138,69,1,235,
-4,139,60,138,5,56,216,116,6,60,255,116,9,254,199,254,
-195,62,136,70,0,69,131,198,3,226,216,139,54,197,20,15,
-182,140,198,7,227,44,129,198,86,4,138,68,2,60,13,116,
-14,60,12,116,5,131,198,32,235,240,131,198,32,235,17,138,
-68,1,131,198,32,60,112,125,225,62,136,70,0,254,195,69,
-226,216,139,54,197,20,15,182,140,17,8,227,30,129,198,176,
-5,131,198,38,128,124,4,0,116,247,128,124,8,0,117,241,
-138,4,62,136,70,0,254,195,69,226,230,10,255,116,53,138,
-203,139,62,223,18,176,13,12,64,136,5,198,69,1,4,136,
-109,2,136,109,3,137,77,6,139,22,231,18,232,233,191,102,
-137,69,8,102,199,69,12,0,2,0,0,232,36,21,232,93,
-21,232,1,9,102,88,97,195,81,82,82,139,218,38,2,111,
-1,38,139,87,5,131,250,255,117,241,10,237,181,0,90,116,
-2,235,17,131,248,0,15,132,148,0,131,248,1,15,132,141,
-0,233,155,0,131,248,0,116,18,131,248,1,116,13,38,128,
-127,1,0,117,27,38,139,95,3,235,243,139,218,38,128,127,
-1,0,117,6,38,139,95,5,235,243,38,198,7,0,235,9,
-38,138,71,1,254,200,38,136,7,38,255,87,13,38,255,87,
-17,232,33,22,248,38,255,87,21,114,19,38,255,87,23,114,
-240,139,211,232,191,23,114,75,11,219,139,218,116,8,131,248,
-5,117,222,249,235,61,232,200,23,116,214,232,120,23,115,14,
-59,197,116,205,38,255,87,19,38,255,87,15,235,36,38,255,
-87,9,131,251,254,116,16,131,251,255,116,2,235,179,69,59,
-233,117,15,51,237,235,11,131,253,0,116,3,77,235,3,139,
-233,77,248,90,89,195,0,0,38,139,95,7,83,179,4,246,
-227,91,3,216,195,6,15,168,81,86,140,200,142,232,142,192,
-185,2,0,141,54,19,124,232,80,30,94,89,15,169,7,195,
-6,15,168,81,86,140,200,142,232,142,192,185,1,0,141,54,
-14,124,232,53,30,94,89,15,169,7,195,6,15,168,81,86,
-140,200,142,232,142,192,185,3,0,141,54,255,123,232,26,30,
-94,89,15,169,7,195,6,15,168,81,86,140,200,142,232,142,
-192,185,2,0,141,54,245,123,232,255,29,94,89,15,169,7,
-195,80,81,82,30,6,31,138,71,1,254,192,182,2,185,78,
-0,178,48,232,120,26,31,90,89,88,195,80,81,82,30,6,
-31,138,71,1,254,192,182,2,185,78,0,246,71,3,2,117,
-4,178,31,235,2,178,23,232,84,26,31,90,89,88,195,81,
-61,0,15,116,10,61,0,75,116,5,61,0,72,117,51,38,
-255,87,15,38,138,7,10,192,116,5,38,254,15,235,98,38,
-255,87,19,38,139,95,3,131,251,254,116,89,38,128,127,1,
-0,116,240,38,138,71,1,254,200,38,136,7,38,255,87,17,
-235,63,61,9,15,116,10,61,0,77,116,5,61,0,80,117,
-52,38,255,87,15,38,138,7,254,192,38,56,71,1,116,5,
-38,136,7,235,28,38,255,87,19,38,139,95,5,131,251,255,
-116,19,38,128,127,1,0,116,240,38,198,7,0,38,255,87,
-17,38,255,87,13,89,195,61,115,31,116,7,61,106,36,15,
-133,252,0,83,81,139,200,38,138,7,38,255,87,11,83,38,
-138,7,179,32,246,227,139,216,129,195,86,4,38,3,30,197,
-20,102,80,129,249,106,36,117,116,38,128,127,2,15,15,132,
-198,0,38,139,54,197,20,38,128,124,22,1,15,133,184,0,
-38,198,71,2,15,102,38,139,71,20,102,5,0,8,0,0,
-102,38,137,71,20,38,198,71,1,112,38,128,103,7,191,232,
-109,233,38,198,68,2,2,38,137,28,38,139,54,197,20,38,
-254,132,223,7,38,254,140,198,7,102,88,91,38,15,182,79,
-3,128,225,1,116,9,38,136,111,3,38,254,140,199,7,38,
-136,111,1,184,5,0,235,99,190,231,124,235,71,38,138,71,
-2,60,13,117,7,38,198,71,2,12,235,236,232,82,0,131,
-249,2,116,20,227,10,190,39,124,232,141,232,116,58,235,8,
-190,29,124,232,131,232,116,48,60,15,117,16,102,38,139,71,
-20,102,45,0,8,0,0,102,38,137,71,20,38,198,71,2,
-13,190,170,124,102,88,91,38,138,119,1,178,61,179,48,6,
-30,7,232,73,25,7,235,3,102,88,91,89,91,249,195,248,
-195,80,87,38,139,54,197,20,129,198,158,7,38,15,182,76,
-2,227,85,128,249,1,117,12,38,139,60,38,138,69,2,232,
-26,2,114,5,131,198,3,235,227,177,1,102,38,139,71,16,
-86,80,38,139,69,5,38,139,54,197,20,15,188,192,181,32,
-246,229,3,240,129,198,86,4,88,102,38,59,68,20,94,124,
-5,185,2,0,235,18,131,198,3,38,138,108,2,10,237,116,
-7,128,253,1,117,240,235,200,95,88,195,61,32,57,116,5,
-61,13,28,117,49,86,139,243,38,138,7,38,255,87,11,176,
-42,38,246,71,3,1,117,11,38,254,68,2,38,128,79,3,
-1,235,11,38,254,76,2,176,32,38,128,103,3,254,232,38,
-0,139,222,94,249,195,248,195,83,80,38,138,7,38,255,87,
-11,88,232,124,253,91,195,83,80,38,138,7,38,255,87,11,
-88,232,135,253,91,195,195,178,4,38,138,119,1,232,64,26,
-83,87,30,80,81,140,192,142,216,139,202,232,198,27,38,161,
-130,21,142,216,138,93,1,89,88,31,95,232,7,26,91,195,
-96,139,54,197,20,139,254,15,182,140,223,7,227,44,138,100,
-10,128,204,128,129,199,214,5,129,198,120,7,128,125,4,0,
-116,17,128,125,7,1,117,11,138,5,87,139,62,223,18,232,
-10,0,95,131,199,38,59,254,126,226,97,195,96,6,190,183,
-83,232,195,3,198,5,8,198,69,1,2,198,69,2,0,136,
-69,3,51,219,137,93,6,80,232,183,16,232,240,16,184,51,
-10,163,116,20,184,46,10,163,114,20,88,80,190,49,124,185,
-7,0,186,12,8,187,65,13,191,53,9,232,202,2,88,114,
-35,190,184,83,232,128,3,115,56,186,10,18,187,69,22,176,
-1,180,112,185,1,0,190,84,124,232,116,22,232,230,17,232,
-147,22,235,29,139,62,223,18,198,5,8,198,69,1,2,198,
-69,2,0,136,69,3,199,69,6,2,1,232,84,16,232,141,
-16,7,97,195,138,69,22,60,4,116,10,60,14,116,6,60,
-42,116,2,248,195,249,195,0,139,54,195,20,137,54,197,20,
-255,211,114,7,139,52,131,254,255,117,241,195,80,10,192,116,
-76,138,224,128,228,2,128,252,2,116,9,38,138,69,2,232,
-74,0,114,62,36,252,60,236,116,56,60,244,116,10,60,220,
-116,22,60,248,116,34,235,47,190,27,154,38,128,62,241,18,
-0,116,3,190,4,154,235,34,190,185,153,38,128,62,241,18,
-0,116,3,190,162,153,235,18,190,213,153,235,13,190,197,153,
-235,8,190,224,153,235,3,190,39,154,88,195,60,2,116,14,
-60,1,116,10,60,7,125,6,60,5,116,2,248,195,249,195,
-87,102,83,102,82,102,187,0,0,32,0,102,11,210,117,7,
-102,59,195,119,2,235,80,102,139,216,102,37,0,0,224,255,
-139,194,102,193,192,11,102,61,0,4,0,0,114,25,232,81,
-0,38,198,69,3,32,38,198,69,4,84,38,198,69,5,66,
-38,198,69,6,0,235,53,102,139,195,102,193,232,11,232,49,
-0,38,198,69,3,32,38,198,69,4,71,38,198,69,5,66,
-38,198,69,6,0,235,21,102,209,232,232,21,0,38,198,69,
-3,32,38,198,69,4,77,38,198,69,5,0,102,90,102,91,
-95,195,83,102,187,232,3,0,0,102,247,227,102,187,0,4,
-0,0,102,247,243,191,153,20,232,135,22,131,232,3,3,248,
-38,139,29,38,199,5,46,0,38,137,93,1,91,195,96,185,
-12,0,176,32,191,153,20,243,170,128,251,5,116,26,128,251,
-0,116,21,10,255,116,5,128,251,7,125,12,191,153,20,131,
-199,7,51,192,170,249,235,58,191,158,20,246,199,240,116,28,
-191,153,20,138,207,128,225,15,254,201,102,51,192,64,102,211,
-224,232,46,22,3,248,176,45,170,192,239,4,138,207,254,201,
-102,51,192,64,102,211,224,232,24,22,3,248,176,75,170,50,
-192,170,97,190,153,20,195,80,83,81,86,190,236,18,101,136,
-100,4,187,31,0,246,227,187,254,18,3,216,101,136,52,101,
-136,84,1,101,137,92,2,185,1,0,232,157,24,94,89,91,
-88,195,83,81,86,176,38,246,231,38,139,54,197,20,3,240,
-138,132,218,5,128,188,216,5,0,116,16,139,156,228,5,11,
-219,117,4,254,200,235,4,138,39,42,196,15,182,200,102,51,
-210,102,74,102,209,234,139,156,219,5,15,188,195,15,187,195,
-38,139,54,197,20,180,32,246,228,3,240,102,38,59,148,102,
-4,124,6,102,38,139,148,102,4,11,219,117,221,102,51,192,
-139,216,102,3,194,18,223,226,249,102,51,210,139,211,94,89,
-91,195,86,51,192,38,128,60,0,116,4,70,64,235,246,94,
-195,59,193,115,9,43,200,176,32,232,94,22,226,249,195,81,
-185,4,0,139,62,197,20,129,199,120,7,128,125,2,96,117,
-5,131,239,38,226,245,89,195,136,46,122,20,83,82,87,15,
-182,232,80,232,37,1,93,95,90,91,15,131,163,0,87,176,
-1,180,112,232,170,19,90,139,197,246,196,128,116,21,128,228,
-127,138,196,82,131,194,7,232,166,22,232,124,21,90,139,197,
-15,182,232,232,154,22,232,112,21,198,6,118,20,0,198,6,
-119,20,255,235,46,232,230,14,116,8,232,232,14,61,27,1,
-116,94,139,22,114,20,232,119,22,128,62,119,20,0,117,19,
-232,200,0,115,76,186,50,0,247,226,208,236,138,196,179,1,
-232,54,21,139,22,116,20,232,86,22,160,118,20,60,0,116,
-12,60,1,116,12,60,2,116,12,176,124,235,10,176,47,235,
-6,176,45,235,2,176,92,254,6,118,20,128,62,118,20,4,
-117,9,198,6,118,20,0,254,6,119,20,232,140,21,235,149,
-249,156,232,48,19,157,195,80,87,51,219,232,28,0,138,5,
-10,192,116,19,60,113,116,7,60,112,116,3,249,235,8,11,
-246,116,232,255,214,115,228,95,88,195,102,80,102,82,139,62,
-223,18,102,51,192,139,197,138,224,176,16,102,137,5,102,184,
-128,16,1,0,102,137,69,4,102,51,192,176,3,102,137,69,
-8,102,51,192,176,128,102,137,69,12,184,0,2,102,137,69,
-28,139,22,231,18,232,96,183,102,137,69,24,232,163,12,232,
-220,12,102,90,102,88,139,62,231,18,195,232,237,192,232,92,
-192,131,199,26,139,69,6,15,186,240,15,115,1,195,81,83,
-82,51,219,15,182,13,11,201,116,87,131,199,20,138,21,10,
-210,116,78,176,20,254,194,246,226,139,208,81,139,69,6,15,
-186,240,15,115,9,128,14,122,20,1,3,216,235,11,246,6,
-122,20,1,116,4,129,195,0,4,208,14,122,20,3,250,226,
-219,89,184,8,0,43,193,145,210,14,122,20,145,51,210,139,
-195,247,241,61,0,4,116,9,248,15,182,14,122,20,227,1,
-249,90,91,89,195,87,80,139,62,223,18,198,5,28,198,69,
-1,2,102,51,192,136,69,2,136,69,3,102,137,69,4,232,
-0,12,232,57,12,88,95,195,0,0,102,82,102,80,102,83,
-102,51,210,102,187,255,0,0,0,102,247,243,102,51,210,102,
-187,63,0,0,0,102,247,243,139,200,102,61,255,3,0,0,
-118,3,185,255,3,102,91,102,88,102,90,178,255,182,63,195,
-83,38,129,191,254,1,85,170,117,68,129,195,190,1,180,4,
-128,252,0,116,57,38,138,7,60,128,116,7,131,195,16,254,
-204,235,237,38,138,87,5,128,250,0,116,34,254,194,38,138,
-119,6,128,230,63,128,254,0,116,20,128,250,0,117,6,138,
-230,176,0,235,10,180,0,138,198,246,226,248,235,1,249,91,
-195,102,80,102,83,30,6,86,81,82,232,44,182,137,132,203,
-6,30,7,187,0,4,3,222,102,184,0,0,0,0,46,138,
-117,24,178,2,51,201,177,1,232,243,176,114,52,232,128,255,
-114,47,102,15,183,216,102,82,102,46,139,69,20,102,11,192,
-117,19,102,51,210,102,46,139,69,16,102,247,243,102,61,255,
-3,0,0,118,3,184,255,3,102,90,139,200,131,196,4,235,
-2,90,89,94,7,31,102,91,102,88,51,192,46,137,13,46,
-136,85,2,46,137,69,3,46,137,69,5,46,136,69,7,46,
-136,69,8,128,250,8,118,5,46,128,77,8,8,46,137,69,
-9,46,136,69,11,46,137,69,12,46,136,117,14,46,136,69,
-15,195,102,83,102,81,82,102,87,30,6,30,7,139,54,195,
-20,137,54,197,20,232,21,192,38,139,52,131,254,255,117,241,
-232,89,185,51,246,86,139,54,193,20,131,254,255,15,132,64,
-1,94,190,83,16,46,15,182,14,157,0,46,128,62,60,0,
-1,117,19,131,249,2,124,14,191,65,0,51,210,139,193,247,
-231,131,232,40,3,240,184,95,1,247,225,3,240,46,137,54,
-12,88,51,192,129,254,156,17,126,32,185,173,18,191,156,17,
-43,207,139,249,3,254,190,172,18,253,30,6,140,200,142,216,
-142,192,243,164,7,31,252,71,139,199,80,189,2,0,232,187,
-7,191,83,16,139,54,193,20,185,95,1,51,192,6,14,7,
-87,243,170,95,7,38,139,84,19,46,137,85,9,38,139,84,
-17,46,137,85,7,38,139,84,15,46,137,85,5,38,139,84,
-6,46,137,21,38,138,84,8,46,136,85,2,38,138,84,9,
-46,136,85,3,38,138,84,10,46,136,85,11,179,0,86,38,
-128,188,156,1,6,117,19,102,38,139,132,157,1,38,138,188,
-155,1,254,203,129,198,54,4,235,45,129,198,111,3,38,138,
-68,2,10,192,116,88,86,38,139,52,60,1,116,11,102,38,
-139,68,16,38,138,124,1,235,13,102,38,139,68,16,102,38,
-139,84,32,38,138,60,94,87,80,46,138,69,12,180,26,246,
-228,131,199,13,3,248,88,46,136,125,24,102,46,137,69,16,
-102,46,137,85,20,46,254,6,156,0,232,141,253,88,80,232,
-15,254,95,46,254,69,12,131,198,3,254,195,235,160,94,129,
-199,95,1,38,139,116,2,131,254,255,15,133,42,255,232,207,
-3,184,0,1,46,128,62,156,0,0,116,11,38,128,62,253,
-18,0,116,3,131,200,32,93,7,31,102,95,90,102,89,102,
-91,11,237,116,4,131,196,2,85,195,30,86,87,85,83,232,
-27,185,139,93,4,131,199,10,189,0,0,131,251,0,116,20,
-138,5,60,0,116,10,75,83,85,87,232,53,186,95,93,91,
-69,71,235,231,15,182,76,21,86,187,0,0,198,6,125,20,
-1,139,254,129,199,111,3,15,182,77,2,227,52,87,139,61,
-128,249,2,117,35,139,247,131,238,27,87,191,151,124,232,84,
-196,95,50,219,138,69,1,232,191,16,138,93,8,191,129,125,
-232,11,2,232,116,196,235,3,232,19,0,95,131,199,3,235,
-198,94,232,101,196,232,67,1,91,93,95,94,31,195,102,96,
-87,138,5,232,84,196,191,151,124,232,25,196,83,50,219,232,
-135,16,91,191,145,125,232,12,196,95,86,6,83,30,7,138,
-93,2,138,125,3,232,134,249,91,7,6,102,80,83,81,138,
-4,10,192,116,6,232,242,16,70,235,244,138,69,2,87,232,
-118,185,232,224,195,95,89,91,102,88,7,94,87,191,154,125,
-232,210,195,95,86,87,6,140,216,142,192,102,139,69,16,102,
-139,85,32,7,6,30,7,232,150,248,86,81,190,153,20,232,
-64,250,185,9,0,232,73,250,89,94,7,191,153,20,232,159,
-195,128,62,152,20,0,116,8,232,154,195,83,232,222,15,91,
-176,32,180,6,232,123,15,95,139,69,14,11,192,117,18,6,
-30,7,38,138,69,8,232,227,247,7,87,139,254,232,117,195,
-95,232,166,195,139,54,197,20,15,182,76,21,94,131,125,14,
-0,117,11,138,85,36,139,125,5,232,248,0,235,106,139,117,
-14,15,182,12,138,100,1,131,198,3,138,69,2,60,7,117,
-4,176,2,235,2,176,5,86,87,191,166,125,232,54,195,95,
-94,87,86,86,6,30,7,139,216,232,178,248,7,138,4,10,
-192,116,6,232,36,16,70,235,244,138,195,232,170,184,232,20,
-195,94,138,4,232,117,247,139,254,232,9,195,232,59,195,94,
-139,124,1,138,84,3,86,83,232,153,0,88,94,95,131,198,
-4,226,180,198,6,125,20,1,102,97,195,102,80,96,15,182,
-76,21,51,219,139,235,138,132,88,4,60,15,117,9,246,132,
-93,4,64,117,18,235,40,60,12,116,12,60,0,116,8,60,
-13,116,4,60,217,114,24,131,253,0,117,9,191,178,125,232,
-179,194,232,229,194,191,122,125,232,115,0,232,220,194,69,131,
-198,32,67,226,193,139,54,197,20,15,182,140,17,8,227,40,
-131,253,0,117,9,191,178,125,232,138,194,232,188,194,139,254,
-129,199,176,5,131,199,38,128,125,4,0,116,247,246,69,12,
-128,116,241,232,72,254,226,236,131,253,0,116,3,232,154,194,
-97,102,88,195,15,188,223,15,187,223,176,32,246,227,87,139,
-54,197,20,3,240,191,129,125,232,19,0,56,218,117,6,191,
-234,153,232,64,194,232,114,194,95,11,255,117,215,195,82,232,
-51,194,138,195,83,179,0,232,159,14,91,184,32,3,128,251,
-10,114,2,254,204,232,10,14,191,118,125,232,23,194,6,15,
-168,140,216,142,232,142,192,232,181,15,138,132,94,4,180,7,
-128,62,152,20,0,116,2,180,31,232,235,247,15,169,7,86,
-6,81,140,216,142,192,102,139,132,102,4,102,51,210,102,80,
-232,189,246,190,153,20,232,105,248,185,9,0,232,114,248,102,
-88,89,7,94,191,153,20,232,198,193,128,62,152,20,0,116,
-11,191,150,125,232,190,193,83,232,2,14,91,191,150,125,232,
-179,193,138,132,88,4,60,15,117,6,191,11,125,232,165,193,
-60,12,117,6,191,8,125,232,155,193,60,11,117,6,191,245,
-124,232,145,193,60,13,117,6,191,170,124,232,135,193,60,217,
-117,6,191,17,125,232,125,193,60,219,117,6,191,34,125,232,
-115,193,60,221,117,6,191,51,125,232,105,193,60,236,117,6,
-191,67,125,232,95,193,60,238,117,6,191,85,125,232,85,193,
-60,254,117,6,191,103,125,232,75,193,128,188,88,4,0,117,
-6,191,158,124,232,62,193,90,195,96,232,240,183,198,69,60,
-0,87,131,199,44,232,40,193,232,95,193,191,129,124,232,36,
-193,191,162,0,232,30,193,191,137,124,232,24,193,95,198,69,
-40,0,131,199,24,232,8,193,232,63,193,97,195,0,0,0,
-96,46,15,182,14,157,0,131,249,2,15,140,173,0,46,128,
-62,60,0,1,15,133,163,0,190,28,0,189,83,16,46,137,
-108,30,129,197,95,1,46,15,182,68,5,177,3,211,192,139,
-208,30,6,140,200,142,216,142,192,139,198,46,15,182,14,157,
-0,73,81,139,202,139,240,46,137,124,6,139,199,190,28,0,
-243,165,46,137,109,254,129,197,95,1,89,226,229,7,31,139,
-240,46,199,68,6,0,0,190,28,0,189,83,16,6,14,7,
-87,191,97,0,232,70,0,129,197,95,1,191,83,0,176,190,
-170,139,198,171,46,139,116,6,186,231,15,14,89,95,46,137,
-124,16,232,40,0,129,197,95,1,46,137,124,22,176,190,170,
-139,198,171,176,234,170,139,194,171,139,193,171,46,139,116,6,
-11,246,117,218,7,190,28,0,232,249,176,97,195,80,86,81,
-6,30,190,106,95,140,201,142,217,142,193,185,5,0,243,164,
-31,30,46,138,70,11,4,48,46,136,5,71,190,111,95,140,
-201,142,217,142,193,185,17,0,243,164,50,192,46,136,5,71,
-31,7,89,94,88,195,83,108,111,116,32,32,51,119,97,114,
-101,32,99,111,110,116,114,111,108,108,101,114,0,160,0,0,
-0,0,0,0,0,0,0,0,36,80,77,77,80,6,86,46,
-198,6,135,95,0,141,6,140,95,80,232,41,0,114,16,46,
-198,6,134,95,1,46,140,6,130,95,46,137,54,132,95,131,
-196,2,94,7,14,7,88,232,219,0,115,9,87,191,158,170,
-232,178,191,249,95,195,85,139,236,102,80,83,81,87,187,0,
-224,142,195,51,246,139,126,4,102,46,139,5,102,38,57,4,
-117,27,38,128,124,4,1,117,20,86,185,16,0,51,192,38,
-2,4,70,226,250,94,60,0,117,3,248,235,13,70,131,254,
-16,114,210,67,131,251,255,117,200,249,95,89,91,102,88,93,
-195,85,139,236,80,82,86,46,142,6,130,95,46,139,54,132,
-95,106,1,106,255,106,255,139,70,4,193,232,3,106,0,80,
-106,0,38,255,92,7,131,196,12,131,250,0,117,5,131,248,
-0,116,22,46,137,22,136,95,46,163,138,95,193,232,4,193,
-226,12,3,208,142,194,248,235,1,249,94,90,88,93,195,6,
-86,82,46,142,6,130,95,46,139,54,132,95,102,46,131,62,
-136,95,0,116,27,46,255,54,136,95,46,255,54,138,95,106,
-2,38,255,92,7,131,196,6,131,250,0,117,3,248,235,1,
-249,90,94,7,195,81,87,6,30,80,184,64,0,142,216,191,
-19,0,139,5,131,232,2,193,224,6,46,163,128,95,88,31,
-80,193,224,6,46,41,6,128,95,88,46,128,62,134,95,0,
-116,35,193,224,9,80,232,72,255,114,23,131,196,2,46,198,
-6,135,95,1,46,140,6,30,16,46,163,34,16,140,192,248,
-235,84,131,196,2,46,131,62,34,16,0,117,55,193,224,9,
-139,200,184,0,112,80,81,142,192,51,255,51,192,252,243,175,
-89,116,36,81,184,255,255,51,255,252,243,175,89,116,24,88,
-131,192,4,61,0,112,116,12,46,59,6,128,95,117,214,184,
-0,16,235,209,249,235,15,46,163,32,16,88,46,163,30,16,
-46,137,14,34,16,248,7,95,89,195,80,81,87,6,46,131,
-62,34,16,0,116,46,46,128,62,135,95,0,116,6,232,14,
-255,248,235,35,46,161,30,16,142,192,51,255,46,139,14,34,
-16,46,161,32,16,243,171,51,192,46,163,34,16,46,163,30,
-16,248,235,3,249,235,0,7,95,89,88,195,6,86,87,83,
-81,82,30,184,64,0,142,216,187,19,0,139,7,193,224,6,
-80,180,193,248,205,21,88,114,16,187,14,0,139,15,139,209,
-131,225,63,117,4,59,194,116,47,139,221,193,227,6,43,195,
-142,192,51,255,139,221,193,227,9,139,203,51,192,252,243,171,
-51,255,38,137,45,187,19,0,41,47,46,199,6,151,0,0,
-0,46,140,6,149,0,235,88,46,198,6,153,0,1,140,192,
-142,216,51,246,51,255,139,221,193,227,6,43,195,51,201,142,
-192,138,12,193,225,9,252,243,165,139,205,193,225,9,51,192,
-252,243,171,106,64,31,187,19,0,41,47,140,192,187,14,0,
-137,7,51,255,38,139,29,139,203,193,225,10,3,221,38,137,
-29,3,249,38,137,45,46,137,14,151,0,46,140,6,149,0,
-31,90,89,91,95,94,7,195,85,87,51,201,136,14,199,20,
-46,138,62,36,16,46,138,30,37,16,232,46,1,131,224,254,
-131,192,40,139,208,237,11,192,15,133,231,0,139,46,195,20,
-139,241,232,225,0,128,252,0,116,7,128,252,134,15,132,193,
-0,191,46,0,232,117,1,61,2,16,116,4,65,70,235,226,
-232,248,0,169,1,0,15,132,164,0,131,224,254,80,82,131,
-192,40,139,208,237,11,192,90,88,15,133,145,0,62,136,126,
-8,62,136,94,9,232,175,0,232,223,0,62,136,70,10,62,
-199,70,11,96,35,87,81,62,138,126,8,62,138,94,9,191,
-4,0,232,39,1,169,4,0,117,14,62,138,126,8,62,138,
-94,9,131,200,4,232,31,1,86,139,245,137,46,197,20,232,
-201,1,232,238,1,115,35,62,138,126,8,46,58,62,36,16,
-117,57,62,138,94,9,46,58,30,37,16,117,46,191,130,111,
-232,114,188,51,201,94,89,95,235,57,80,87,82,62,139,86,
-6,131,194,40,191,162,0,131,199,14,46,139,5,239,90,95,
-88,254,6,199,20,129,197,45,8,137,44,94,89,95,70,233,
-48,255,15,182,14,199,20,227,10,129,237,45,8,62,199,70,
-0,255,255,95,93,195,81,82,180,177,176,2,185,2,16,186,
-193,19,205,26,90,89,195,139,208,62,137,70,6,139,216,62,
-137,70,13,131,192,12,62,137,70,19,139,195,131,192,8,62,
-137,70,17,131,195,4,62,137,94,15,195,191,18,0,232,107,
-0,139,208,191,16,0,232,99,0,195,87,30,6,83,161,231,
-18,46,163,236,99,140,216,46,163,238,99,184,0,240,142,216,
-180,177,176,14,187,0,0,14,7,191,234,99,205,26,114,45,
-46,139,30,234,99,46,161,238,99,142,216,46,139,62,236,99,
-62,138,70,8,62,138,102,9,128,228,248,57,5,116,11,131,
-199,16,131,235,16,117,244,249,235,3,138,69,14,115,2,176,
-255,91,7,31,95,195,0,2,0,0,0,0,81,180,177,176,
-9,205,26,139,193,89,195,81,139,200,180,177,176,12,205,26,
-89,195,232,32,0,81,6,30,7,129,239,128,0,185,32,0,
-102,51,192,243,102,171,7,89,198,69,252,128,139,215,232,151,
-170,232,238,0,195,102,80,102,83,102,81,232,1,1,102,37,
-0,32,0,0,116,245,248,102,89,102,91,102,88,195,102,83,
-102,81,82,85,232,247,5,102,185,35,2,0,0,232,223,0,
-232,250,5,115,54,160,241,18,60,16,124,27,186,9,18,187,
-70,23,176,1,180,112,185,2,0,190,84,172,232,145,5,232,
-3,1,232,176,5,235,37,191,1,127,232,248,186,232,42,187,
-191,42,127,232,239,186,232,236,0,235,17,102,37,0,64,0,
-0,117,186,232,182,0,248,139,77,150,227,8,139,46,197,20,
-62,255,86,11,93,90,102,89,102,91,195,102,80,82,86,139,
-54,197,20,102,184,0,0,219,0,232,57,0,232,112,0,102,
-37,0,64,0,0,117,7,139,84,19,102,237,235,238,94,90,
-102,88,195,102,80,87,232,6,178,139,62,231,18,102,46,161,
-241,123,102,59,69,4,116,3,249,235,6,198,6,253,18,1,
-248,95,102,88,195,86,139,54,197,20,131,124,6,0,116,9,
-82,139,84,13,102,239,90,94,195,139,116,13,102,100,137,4,
-94,195,86,139,54,197,20,131,124,6,0,116,9,82,139,84,
-17,102,239,90,94,195,139,116,17,102,100,137,4,94,195,86,
-139,54,197,20,131,124,6,0,116,9,82,139,84,15,102,237,
-90,94,195,139,116,15,102,100,139,4,94,195,86,139,54,197,
-20,131,124,6,0,116,9,82,139,84,19,102,237,90,94,195,
-139,116,19,102,100,139,4,94,195,0,0,0,0,0,96,180,
-1,205,22,97,195,30,83,81,140,200,142,216,180,0,205,22,
-46,139,14,112,101,227,4,255,209,115,241,89,91,31,195,83,
-86,87,139,28,255,211,15,130,88,1,139,76,5,46,137,14,
-112,101,15,182,76,4,131,198,7,38,137,54,126,20,81,86,
-51,219,86,139,52,138,4,60,0,116,18,60,3,117,3,232,
-157,1,50,192,59,221,117,2,176,1,232,187,1,94,131,198,
-2,67,226,222,94,89,184,1,0,87,86,139,221,209,227,139,
-48,128,60,0,117,55,139,92,3,255,211,115,10,131,248,5,
-15,132,223,0,233,249,0,94,86,139,221,209,227,139,48,128,
-60,0,116,21,128,60,3,117,11,86,139,116,1,128,124,12,
-1,94,126,33,176,1,232,111,1,94,95,235,188,232,85,255,
-61,9,15,116,10,61,0,80,116,5,61,0,77,117,24,184,
-1,0,232,34,1,3,232,131,253,255,117,3,139,233,77,59,
-233,117,180,51,237,235,176,61,0,15,116,10,61,0,72,116,
-5,61,0,75,117,17,131,253,0,116,5,184,255,255,235,210,
-139,233,184,255,255,235,203,61,13,28,117,87,128,60,1,116,
-5,128,60,2,117,21,138,4,38,139,54,126,20,131,238,7,
-131,124,2,0,116,3,255,84,2,235,101,128,60,6,117,9,
-139,116,1,139,52,255,214,235,8,128,60,3,117,9,139,116,
-1,232,108,1,233,114,255,128,60,4,117,23,81,85,139,124,
-9,139,116,7,51,237,232,214,254,93,89,94,95,95,94,91,
-233,204,254,232,95,0,114,40,11,219,116,11,131,248,5,15,
-133,70,255,94,95,235,230,232,103,0,117,3,233,58,255,232,
-20,0,15,131,51,255,85,139,232,232,107,0,93,233,7,255,
-94,95,95,94,91,195,83,81,86,82,38,139,54,126,20,51,
-210,139,28,131,127,11,0,116,16,57,71,11,116,5,57,71,
-13,117,6,139,194,149,249,235,7,66,131,198,2,226,226,248,
-90,94,89,91,195,139,223,11,219,116,21,131,63,0,116,14,
-57,7,117,5,255,87,2,235,7,131,195,4,235,237,51,219,
-195,61,0,59,116,5,61,0,104,117,11,131,124,5,0,116,
-5,255,84,5,51,192,195,80,176,0,232,43,0,88,195,86,
-87,139,116,1,139,124,14,38,139,5,180,4,246,228,139,124,
-10,3,248,139,69,2,139,124,16,38,137,5,139,124,19,11,
-255,116,2,255,215,95,94,195,86,87,139,254,128,61,6,117,
-9,139,117,1,139,52,255,214,235,8,139,117,1,128,61,3,
-117,5,232,8,0,235,3,232,70,1,95,94,195,30,6,86,
-87,80,83,81,82,85,156,252,191,132,21,86,87,185,10,0,
-243,164,95,94,157,138,36,128,196,2,38,136,101,2,139,92,
-14,38,139,23,50,246,254,194,58,84,12,126,3,138,84,12,
-254,202,193,226,2,139,92,10,3,218,101,139,31,38,137,93,
-11,138,100,9,38,136,101,10,138,100,18,38,136,101,9,6,
-31,139,247,232,234,0,93,90,89,91,88,95,94,7,31,195,
-83,81,82,87,85,86,176,1,185,30,0,232,125,1,138,52,
-138,84,1,138,108,2,138,76,3,138,124,8,232,17,5,138,
-68,4,138,124,2,138,92,3,138,100,5,232,59,5,139,254,
-15,182,77,12,139,117,10,139,93,14,38,139,7,138,117,6,
-138,85,7,82,80,81,86,101,139,52,138,93,8,56,196,117,
-3,138,93,18,6,15,168,7,80,232,210,2,88,7,254,196,
-94,131,198,4,254,198,226,222,89,91,90,73,117,2,235,77,
-139,247,232,240,252,61,0,72,116,42,61,0,80,116,50,61,
-27,1,116,29,61,13,28,117,233,139,117,14,38,137,28,139,
-117,10,193,227,2,139,88,2,139,117,16,38,137,28,248,235,
-28,249,235,25,131,251,0,116,201,139,235,75,232,166,0,235,
-193,59,217,116,189,139,235,67,232,154,0,235,181,94,86,80,
-156,176,1,185,30,0,232,238,0,176,1,232,207,254,157,88,
-94,139,92,19,11,219,116,2,255,211,93,95,90,89,91,195,
-83,81,82,86,87,85,80,138,52,134,240,232,24,2,134,240,
-138,84,1,138,108,2,134,232,232,11,2,134,232,138,76,3,
-138,124,8,232,42,4,88,80,138,100,5,60,0,116,3,138,
-100,10,138,124,2,134,248,232,236,1,134,248,138,92,3,138,
-68,4,232,68,4,139,254,139,117,11,138,117,6,134,240,232,
-212,1,134,240,138,85,7,88,82,86,138,93,8,60,0,116,
-3,138,93,9,6,15,168,7,232,227,1,7,94,90,93,95,
-94,90,89,91,195,30,80,82,81,254,198,254,194,138,198,42,
-228,3,197,138,242,42,237,138,76,13,138,84,8,30,6,31,
-232,59,1,31,59,235,114,4,254,200,235,2,254,192,138,84,
-18,6,31,232,40,1,89,90,88,31,195,30,86,87,81,83,
-80,179,160,254,200,246,227,139,240,191,145,21,138,193,246,227,
-139,200,38,139,30,130,21,142,219,156,252,209,233,243,165,157,
-88,91,89,95,94,31,195,6,30,86,87,81,83,80,6,31,
-139,30,130,21,142,195,190,145,21,179,160,254,200,246,227,139,
-248,138,193,246,227,139,200,209,233,156,252,243,165,128,62,12,
-0,1,117,3,232,192,4,157,88,91,89,95,94,31,7,195,
-80,81,176,1,177,30,232,146,255,89,88,10,192,116,14,83,
-81,139,203,138,252,232,40,3,89,91,232,92,3,6,14,7,
-232,7,4,7,195,80,81,176,1,177,30,232,153,255,89,88,
-195,180,1,205,22,116,6,180,0,205,22,235,244,195,30,80,
-184,64,0,142,216,102,139,30,108,0,88,31,195,30,102,80,
-102,81,250,102,3,203,184,64,0,142,216,102,161,108,0,102,
-59,195,115,6,102,5,178,0,24,0,102,59,200,251,102,89,
-102,88,31,195,80,81,82,85,180,2,205,26,139,234,180,2,
-205,26,114,4,59,234,116,246,93,90,89,88,195,128,62,12,
-0,1,117,21,80,83,140,219,184,15,0,193,232,4,3,195,
-131,192,1,163,130,21,91,88,195,199,6,130,21,0,184,205,
-17,36,48,60,48,117,6,199,6,130,21,0,176,195,80,83,
-81,82,87,6,82,232,87,2,137,22,114,20,90,80,82,254,
-200,254,206,138,214,138,240,232,54,2,90,88,139,30,130,21,
-142,195,187,160,0,254,200,246,227,139,248,138,222,254,203,209,
-227,3,251,138,218,232,39,2,38,138,5,232,247,1,254,194,
-232,13,2,131,199,2,226,240,139,22,114,20,232,1,2,7,
-95,90,89,91,88,195,38,128,62,241,18,0,116,10,38,128,
-62,12,0,1,116,2,44,5,195,0,0,0,85,51,237,38,
-138,2,60,0,116,6,232,65,1,69,235,243,93,195,96,51,
-237,232,204,1,38,138,2,60,0,116,8,232,167,1,69,254,
-194,235,241,97,195,82,232,198,1,254,198,178,0,232,176,1,
-90,195,128,252,0,116,10,81,15,182,204,232,12,1,226,251,
-89,195,87,102,86,85,83,81,102,82,51,201,65,102,51,210,
-102,190,10,0,0,0,102,247,246,102,80,138,194,232,179,0,
-102,88,83,102,131,248,0,117,227,139,236,139,217,138,86,1,
-38,136,21,131,197,2,71,226,244,38,199,5,0,0,3,227,
-3,227,139,195,102,90,89,91,93,102,94,95,195,139,216,83,
-102,193,232,16,232,5,0,88,232,1,0,195,80,138,196,232,
-5,0,88,232,1,0,195,83,232,104,0,83,138,195,232,153,
-0,91,138,199,232,147,0,91,195,80,81,82,50,246,178,100,
-60,0,117,13,128,251,1,117,6,232,63,0,232,60,0,235,
-49,50,228,246,242,10,192,116,2,182,1,10,246,116,7,4,
-48,232,102,0,235,8,128,251,1,117,3,232,29,0,138,204,
-138,194,50,228,178,10,246,242,60,1,138,208,138,193,116,2,
-235,207,4,48,232,67,0,90,89,88,195,80,176,32,232,57,
-0,88,195,232,9,0,138,251,192,232,4,232,1,0,195,80,
-36,15,138,216,60,10,125,5,128,195,48,88,195,128,235,10,
-128,195,65,88,195,0,0,0,184,0,1,185,32,32,205,16,
-195,184,0,1,185,7,6,205,16,195,82,232,161,0,60,13,
-117,7,178,0,232,137,0,90,195,60,10,117,12,128,254,29,
-115,5,254,198,232,121,0,90,195,30,80,46,161,38,16,142,
-216,128,62,12,0,0,88,31,117,14,90,80,83,30,42,255,
-180,14,205,16,31,91,88,195,83,30,80,81,87,46,161,38,
-16,142,216,246,6,13,0,1,116,6,138,30,14,0,235,13,
-139,202,232,207,1,161,130,21,142,216,138,93,1,95,89,88,
-31,232,128,1,91,254,194,128,250,80,117,4,50,210,254,198,
-232,29,0,90,195,80,83,81,82,185,1,0,42,255,180,9,
-232,97,1,232,25,0,254,194,232,5,0,90,89,91,88,195,
-80,83,81,30,42,255,180,2,205,16,31,89,91,88,195,80,
-83,81,42,255,180,3,205,16,89,91,88,195,180,15,205,16,
-136,62,82,40,180,7,232,59,0,198,6,152,20,0,195,195,
-80,83,81,82,138,223,176,32,138,250,138,215,232,193,255,232,
-163,255,254,194,56,202,118,244,254,198,56,238,118,236,90,89,
-91,88,195,181,29,177,79,51,210,138,252,232,210,255,51,210,
-232,157,255,195,136,38,81,40,195,80,83,81,82,86,30,85,
-30,46,255,54,38,16,31,190,94,172,128,62,12,0,0,116,
-3,190,106,172,10,192,116,20,190,100,172,128,62,12,0,0,
-116,3,190,112,172,60,2,117,3,190,118,172,31,232,96,255,
-46,138,4,83,138,220,232,60,255,91,42,237,138,203,254,201,
-42,202,139,233,46,138,68,4,83,138,220,232,39,255,226,251,
-46,138,68,1,232,30,255,91,138,207,42,206,254,201,46,138,
-68,5,138,250,254,198,138,215,232,37,255,83,138,220,232,4,
-255,91,138,211,232,25,255,83,138,220,232,248,254,91,226,228,
-254,198,138,215,46,138,68,2,232,5,255,138,220,232,229,254,
-139,205,46,138,68,4,232,220,254,226,251,46,138,68,3,232,
-211,254,93,31,94,90,89,91,88,195,83,81,82,86,81,101,
-138,52,128,254,22,124,17,80,6,46,255,54,38,16,7,138,
-198,232,210,252,138,240,7,88,101,138,84,1,101,138,92,4,
-86,101,139,116,2,232,230,252,94,131,198,5,89,226,207,94,
-90,89,91,195,30,80,46,161,38,16,142,216,88,128,62,12,
-0,1,116,4,205,16,235,15,81,82,232,162,254,139,202,232,
-7,0,232,105,0,90,89,31,195,87,6,80,83,81,232,19,
-0,139,14,130,21,142,193,38,136,5,38,136,93,1,89,91,
-88,7,95,195,80,81,51,255,176,160,246,229,50,237,208,225,
-3,193,3,248,89,88,195,86,30,6,80,83,81,46,161,38,
-16,142,216,161,130,21,142,192,51,246,181,0,177,0,38,139,
-4,138,220,232,24,0,131,198,2,254,193,128,249,80,117,238,
-254,197,128,253,30,117,229,89,91,88,7,31,94,195,6,96,
-60,18,115,3,233,132,0,60,126,118,2,235,126,190,92,171,
-180,16,246,228,3,240,137,54,83,40,184,0,160,142,192,176,
-80,246,229,193,224,4,15,182,241,3,240,137,54,85,40,186,
-196,3,176,2,238,183,255,176,1,186,197,3,139,62,85,40,
-139,54,83,40,238,185,16,0,246,195,1,116,31,246,195,16,
-116,12,138,231,38,136,37,131,199,80,226,248,235,37,46,138,
-36,38,136,37,131,199,80,70,226,244,235,23,246,195,16,117,
-4,50,228,235,223,46,138,36,246,212,38,136,37,131,199,80,
-70,226,242,208,203,208,224,60,16,117,177,97,7,195,84,104,
-101,32,102,105,114,109,119,97,114,101,32,105,115,32,105,110,
-99,111,109,112,97,116,105,98,108,101,32,119,105,116,104,32,
-66,73,79,83,46,13,10,0,0,51,119,97,114,101,32,66,
-73,79,83,32,105,110,115,116,97,108,108,101,100,32,115,117,
-99,99,101,115,115,102,117,108,108,121,0,0,51,119,97,114,
-101,32,66,73,79,83,32,110,111,116,32,105,110,115,116,97,
-108,108,101,100,0,0,13,10,0,13,10,87,65,82,78,73,
-78,71,58,32,51,119,97,114,101,32,71,105,103,97,80,97,
-116,104,32,67,111,110,116,114,111,108,108,101,114,32,110,111,
-116,32,102,111,117,110,100,13,10,0,0,32,32,32,45,32,
-0,0,32,100,114,105,118,101,32,0,0,32,32,68,114,105,
-118,101,32,0,0,32,32,85,110,105,116,32,0,0,32,32,
-99,97,112,97,99,105,116,121,32,0,0,32,98,108,111,99,
-107,115,46,0,0,78,117,109,98,101,114,32,111,102,32,117,
-110,105,116,115,32,102,111,117,110,100,58,32,0,0,32,82,
-65,73,68,32,48,32,0,0,32,82,65,73,68,32,49,32,
-0,0,32,77,105,114,114,111,114,32,0,0,32,82,65,73,
-68,32,49,48,0,0,32,82,65,73,68,32,53,32,0,0,
-32,82,65,73,68,32,53,48,0,0,0,114,112,1,124,112,
-2,134,112,7,144,112,5,154,112,82,164,112,83,164,112,84,
-164,112,255,0,0,58,34,0,0,1,0,0,210,112,0,0,
-0,236,78,0,0,0,0,0,0,0,0,0,0,0,0,193,
-170,48,28,0,19,171,63,28,18,101,171,48,28,63,116,171,
-48,28,42,133,171,48,29,0,160,171,63,29,5,242,171,48,
-29,36,10,172,48,29,60,18,172,48,20,14,205,126,112,13,
-28,244,34,0,66,149,36,27,1,198,36,0,0,0,0,6,
-13,162,143,126,8,13,61,142,112,9,13,118,142,112,9,18,
-189,143,126,10,13,151,142,112,10,30,217,143,126,11,13,206,
-142,112,12,13,4,143,112,13,13,58,143,112,13,57,223,143,
-126,14,13,110,143,112,14,37,231,143,126,16,13,88,130,112,
-16,19,116,130,126,2,10,252,143,71,2,49,56,144,79,3,
-10,77,144,71,4,10,137,144,71,5,10,198,144,71,5,59,
-2,145,79,6,10,13,145,79,8,10,30,145,71,9,10,86,
-145,71,9,14,150,145,79,10,10,206,145,71,11,10,13,146,
-71,12,10,76,146,71,12,14,134,146,79,13,10,178,146,71,
-14,10,229,146,71,14,18,34,147,79,15,10,70,147,71,16,
-10,125,147,71,17,10,180,147,71,17,18,242,147,79,18,10,
-24,148,71,19,10,60,148,71,19,14,122,148,79,20,10,134,
-148,71,22,13,88,130,71,22,19,116,130,79,12,23,255,113,
-112,14,23,88,130,112,14,29,116,130,126,69,114,114,111,114,
-32,32,32,32,32,32,105,110,32,111,112,99,111,100,101,32,
-32,32,46,0,0,10,18,151,148,71,10,42,196,148,79,11,
-18,214,148,71,12,18,2,149,71,13,18,38,149,71,14,18,
-82,149,71,14,18,100,149,79,16,21,105,149,71,0,0,244,
-132,48,28,0,107,133,63,28,8,189,133,48,28,17,195,133,
-48,28,68,210,133,48,28,54,242,133,56,28,38,250,133,48,
-29,0,7,135,63,29,5,89,134,48,29,33,113,134,48,29,
-53,121,134,48,29,0,7,135,63,29,5,89,134,48,29,33,
-127,134,48,29,53,121,134,48,0,0,237,149,48,2,5,63,
-150,23,4,5,132,150,30,19,7,172,150,30,20,7,178,150,
-30,22,45,237,150,30,23,45,250,150,30,24,45,8,151,30,
-19,45,194,150,30,20,45,209,150,30,23,7,223,150,30,29,
-0,25,151,63,29,9,107,151,48,29,24,113,151,48,29,49,
-128,151,48,29,72,142,151,48,0,0,89,155,48,2,5,171,
-155,23,4,5,237,155,30,29,0,18,156,63,29,9,100,156,
-48,29,72,106,156,48,0,0,55,169,48,1,1,137,169,30,
-1,15,162,0,23,1,32,152,169,30,1,55,166,169,30,1,
-65,173,169,30,2,1,182,169,30,2,32,195,169,30,3,1,
-213,169,30,3,32,243,169,30,4,1,221,169,30,5,1,3,
-170,30,29,0,24,170,48,3,8,89,135,112,5,8,155,135,
-112,5,16,251,137,126,6,8,215,135,112,8,8,24,136,112,
-8,11,7,138,126,9,8,87,136,112,10,8,150,136,112,12,
-8,188,136,112,12,11,25,138,126,13,8,253,136,112,14,8,
-62,137,112,16,8,71,137,112,16,11,43,138,126,17,8,130,
-137,112,17,37,61,138,126,18,8,189,137,112,18,8,91,138,
+232,92,0,81,139,205,136,28,198,68,1,12,15,188,69,1,
+15,187,69,1,136,68,3,136,92,2,136,92,4,136,92,5,
+137,92,6,102,137,92,8,102,137,92,12,254,198,131,198,20,
+232,44,0,226,209,131,199,4,89,88,226,153,139,238,139,54,
+231,18,43,238,139,62,223,18,139,22,231,18,232,40,2,232,
+120,24,232,177,24,138,69,3,162,123,21,102,91,97,195,80,
+81,87,139,254,51,192,185,10,0,243,171,95,89,88,195,102,
+80,102,83,81,82,139,117,14,11,246,117,42,102,51,192,138,
+69,37,10,192,117,18,138,69,36,138,240,128,230,15,232,250,
+0,139,247,138,21,232,51,1,139,247,138,21,232,77,1,90,
+89,102,91,102,88,195,138,93,37,138,21,15,182,12,131,198,
+3,138,4,36,252,60,220,117,31,246,195,1,117,14,138,116,
+3,128,230,15,232,196,0,232,1,1,235,12,86,81,138,76,
+3,139,247,232,126,1,89,94,208,235,131,198,4,226,210,235,
+190,96,80,139,62,223,18,176,19,12,64,136,5,198,69,1,
+4,198,69,2,0,136,101,3,199,69,6,0,0,139,22,231,
+18,232,124,194,102,137,69,8,102,199,69,12,0,2,0,0,
+88,138,220,15,186,224,5,115,3,255,69,6,15,186,224,6,
+115,3,255,69,6,139,62,231,18,15,186,224,5,115,40,80,
+102,184,0,131,13,0,10,195,102,137,5,131,199,4,102,184,
+1,0,1,0,102,137,5,131,199,4,88,80,36,1,192,224,
+2,12,1,136,5,71,88,15,186,224,6,115,34,80,102,184,
+0,131,15,0,10,195,102,137,5,131,199,4,102,184,1,0,
+1,0,102,137,5,131,199,4,88,208,232,36,1,136,5,139,
+62,223,18,232,68,23,232,125,23,97,195,96,82,139,22,231,
+18,139,62,223,18,189,20,0,232,220,0,90,176,32,246,230,
+139,54,197,20,3,240,129,198,86,4,139,62,231,18,180,12,
+176,0,232,4,1,139,62,223,18,232,14,23,232,71,23,138,
+69,3,162,123,21,97,138,54,123,21,195,96,139,62,223,18,
+198,5,9,198,69,1,2,198,69,2,0,136,85,3,15,182,
+198,137,69,6,232,227,22,232,28,23,97,195,102,96,128,124,
+2,7,125,8,138,76,36,232,90,0,235,36,139,116,14,15,
+182,12,131,198,3,138,68,3,60,255,116,18,15,186,240,7,
+81,15,188,68,1,138,232,232,58,0,131,198,4,89,226,229,
+102,97,195,209,233,56,216,116,32,138,216,36,15,60,15,117,
+5,192,235,4,235,12,138,195,192,232,4,60,15,117,20,128,
+227,15,81,138,235,232,12,0,89,102,193,232,8,102,193,235,
+8,226,210,195,96,50,237,139,62,223,18,198,5,23,198,69,
+1,2,136,109,2,136,85,3,138,225,176,128,137,69,6,232,
+88,22,232,145,22,97,195,83,81,102,80,51,219,176,20,12,
+96,136,5,51,192,198,69,1,5,136,69,2,136,69,3,137,
+109,6,198,69,8,1,136,69,9,136,69,10,232,225,192,102,
+137,69,12,102,15,183,197,102,5,255,1,0,0,37,0,254,
+102,137,69,16,102,88,89,91,195,80,86,139,247,232,159,253,
+94,136,5,136,101,1,138,68,8,136,69,3,50,192,136,69,
+4,88,195,96,102,80,15,182,140,223,7,10,201,15,132,203,
+0,139,46,231,18,129,198,158,7,51,219,138,68,2,60,1,
+116,7,139,60,138,69,1,235,4,139,60,138,5,56,216,116,
+6,60,255,116,9,254,199,254,195,62,136,70,0,69,131,198,
+3,226,216,139,54,197,20,15,182,140,198,7,227,44,129,198,
+86,4,138,68,2,60,13,116,14,60,12,116,5,131,198,32,
+235,240,131,198,32,235,17,138,68,1,131,198,32,60,112,125,
+225,62,136,70,0,254,195,69,226,216,139,54,197,20,15,182,
+140,17,8,227,30,129,198,176,5,131,198,38,128,124,4,0,
+116,247,128,124,8,0,117,241,138,4,62,136,70,0,254,195,
+69,226,230,10,255,116,53,138,203,139,62,223,18,176,13,12,
+64,136,5,198,69,1,4,136,109,2,136,109,3,137,77,6,
+139,22,231,18,232,233,191,102,137,69,8,102,199,69,12,0,
+2,0,0,232,36,21,232,93,21,232,1,9,102,88,97,195,
+81,82,82,139,218,38,2,111,1,38,139,87,5,131,250,255,
+117,241,10,237,181,0,90,116,2,235,17,131,248,0,15,132,
+148,0,131,248,1,15,132,141,0,233,155,0,131,248,0,116,
+18,131,248,1,116,13,38,128,127,1,0,117,27,38,139,95,
+3,235,243,139,218,38,128,127,1,0,117,6,38,139,95,5,
+235,243,38,198,7,0,235,9,38,138,71,1,254,200,38,136,
+7,38,255,87,13,38,255,87,17,232,33,22,248,38,255,87,
+21,114,19,38,255,87,23,114,240,139,211,232,191,23,114,75,
+11,219,139,218,116,8,131,248,5,117,222,249,235,61,232,200,
+23,116,214,232,120,23,115,14,59,197,116,205,38,255,87,19,
+38,255,87,15,235,36,38,255,87,9,131,251,254,116,16,131,
+251,255,116,2,235,179,69,59,233,117,15,51,237,235,11,131,
+253,0,116,3,77,235,3,139,233,77,248,90,89,195,0,0,
+38,139,95,7,83,179,4,246,227,91,3,216,195,6,15,168,
+81,86,140,200,142,232,142,192,185,2,0,141,54,19,124,232,
+80,30,94,89,15,169,7,195,6,15,168,81,86,140,200,142,
+232,142,192,185,1,0,141,54,14,124,232,53,30,94,89,15,
+169,7,195,6,15,168,81,86,140,200,142,232,142,192,185,3,
+0,141,54,255,123,232,26,30,94,89,15,169,7,195,6,15,
+168,81,86,140,200,142,232,142,192,185,2,0,141,54,245,123,
+232,255,29,94,89,15,169,7,195,80,81,82,30,6,31,138,
+71,1,254,192,182,2,185,78,0,178,48,232,120,26,31,90,
+89,88,195,80,81,82,30,6,31,138,71,1,254,192,182,2,
+185,78,0,246,71,3,2,117,4,178,31,235,2,178,23,232,
+84,26,31,90,89,88,195,81,61,0,15,116,10,61,0,75,
+116,5,61,0,72,117,51,38,255,87,15,38,138,7,10,192,
+116,5,38,254,15,235,98,38,255,87,19,38,139,95,3,131,
+251,254,116,89,38,128,127,1,0,116,240,38,138,71,1,254,
+200,38,136,7,38,255,87,17,235,63,61,9,15,116,10,61,
+0,77,116,5,61,0,80,117,52,38,255,87,15,38,138,7,
+254,192,38,56,71,1,116,5,38,136,7,235,28,38,255,87,
+19,38,139,95,5,131,251,255,116,19,38,128,127,1,0,116,
+240,38,198,7,0,38,255,87,17,38,255,87,13,89,195,61,
+115,31,116,7,61,106,36,15,133,252,0,83,81,139,200,38,
+138,7,38,255,87,11,83,38,138,7,179,32,246,227,139,216,
+129,195,86,4,38,3,30,197,20,102,80,129,249,106,36,117,
+116,38,128,127,2,15,15,132,198,0,38,139,54,197,20,38,
+128,124,22,1,15,133,184,0,38,198,71,2,15,102,38,139,
+71,20,102,5,0,8,0,0,102,38,137,71,20,38,198,71,
+1,112,38,128,103,7,191,232,109,233,38,198,68,2,2,38,
+137,28,38,139,54,197,20,38,254,132,223,7,38,254,140,198,
+7,102,88,91,38,15,182,79,3,128,225,1,116,9,38,136,
+111,3,38,254,140,199,7,38,136,111,1,184,5,0,235,99,
+190,231,124,235,71,38,138,71,2,60,13,117,7,38,198,71,
+2,12,235,236,232,82,0,131,249,2,116,20,227,10,190,39,
+124,232,141,232,116,58,235,8,190,29,124,232,131,232,116,48,
+60,15,117,16,102,38,139,71,20,102,45,0,8,0,0,102,
+38,137,71,20,38,198,71,2,13,190,170,124,102,88,91,38,
+138,119,1,178,61,179,48,6,30,7,232,73,25,7,235,3,
+102,88,91,89,91,249,195,248,195,80,87,38,139,54,197,20,
+129,198,158,7,38,15,182,76,2,227,85,128,249,1,117,12,
+38,139,60,38,138,69,2,232,26,2,114,5,131,198,3,235,
+227,177,1,102,38,139,71,16,86,80,38,139,69,5,38,139,
+54,197,20,15,188,192,181,32,246,229,3,240,129,198,86,4,
+88,102,38,59,68,20,94,124,5,185,2,0,235,18,131,198,
+3,38,138,108,2,10,237,116,7,128,253,1,117,240,235,200,
+95,88,195,61,32,57,116,5,61,13,28,117,49,86,139,243,
+38,138,7,38,255,87,11,176,42,38,246,71,3,1,117,11,
+38,254,68,2,38,128,79,3,1,235,11,38,254,76,2,176,
+32,38,128,103,3,254,232,38,0,139,222,94,249,195,248,195,
+83,80,38,138,7,38,255,87,11,88,232,124,253,91,195,83,
+80,38,138,7,38,255,87,11,88,232,135,253,91,195,195,178,
+4,38,138,119,1,232,64,26,83,87,30,80,81,140,192,142,
+216,139,202,232,198,27,38,161,130,21,142,216,138,93,1,89,
+88,31,95,232,7,26,91,195,96,139,54,197,20,139,254,15,
+182,140,223,7,227,44,138,100,10,128,204,128,129,199,214,5,
+129,198,120,7,128,125,4,0,116,17,128,125,7,1,117,11,
+138,5,87,139,62,223,18,232,10,0,95,131,199,38,59,254,
+126,226,97,195,96,6,190,183,83,232,195,3,198,5,8,198,
+69,1,2,198,69,2,0,136,69,3,51,219,137,93,6,80,
+232,183,16,232,240,16,184,51,10,163,116,20,184,46,10,163,
+114,20,88,80,190,49,124,185,7,0,186,12,8,187,65,13,
+191,53,9,232,202,2,88,114,35,190,184,83,232,128,3,115,
+56,186,10,18,187,69,22,176,1,180,112,185,1,0,190,84,
+124,232,116,22,232,230,17,232,147,22,235,29,139,62,223,18,
+198,5,8,198,69,1,2,198,69,2,0,136,69,3,199,69,
+6,2,1,232,84,16,232,141,16,7,97,195,138,69,22,60,
+4,116,10,60,14,116,6,60,42,116,2,248,195,249,195,0,
+139,54,195,20,137,54,197,20,255,211,114,7,139,52,131,254,
+255,117,241,195,80,10,192,116,76,138,224,128,228,2,128,252,
+2,116,9,38,138,69,2,232,74,0,114,62,36,252,60,236,
+116,56,60,244,116,10,60,220,116,22,60,248,116,34,235,47,
+190,27,154,38,128,62,241,18,0,116,3,190,4,154,235,34,
+190,185,153,38,128,62,241,18,0,116,3,190,162,153,235,18,
+190,213,153,235,13,190,197,153,235,8,190,224,153,235,3,190,
+39,154,88,195,60,2,116,14,60,1,116,10,60,7,125,6,
+60,5,116,2,248,195,249,195,87,102,83,102,82,102,187,0,
+0,32,0,102,11,210,117,7,102,59,195,119,2,235,80,102,
+139,216,102,37,0,0,224,255,139,194,102,193,192,11,102,61,
+0,4,0,0,114,25,232,81,0,38,198,69,3,32,38,198,
+69,4,84,38,198,69,5,66,38,198,69,6,0,235,53,102,
+139,195,102,193,232,11,232,49,0,38,198,69,3,32,38,198,
+69,4,71,38,198,69,5,66,38,198,69,6,0,235,21,102,
+209,232,232,21,0,38,198,69,3,32,38,198,69,4,77,38,
+198,69,5,0,102,90,102,91,95,195,83,102,187,232,3,0,
+0,102,247,227,102,187,0,4,0,0,102,247,243,191,153,20,
+232,135,22,131,232,3,3,248,38,139,29,38,199,5,46,0,
+38,137,93,1,91,195,96,185,12,0,176,32,191,153,20,243,
+170,128,251,5,116,26,128,251,0,116,21,10,255,116,5,128,
+251,7,125,12,191,153,20,131,199,7,51,192,170,249,235,58,
+191,158,20,246,199,240,116,28,191,153,20,138,207,128,225,15,
+254,201,102,51,192,64,102,211,224,232,46,22,3,248,176,45,
+170,192,239,4,138,207,254,201,102,51,192,64,102,211,224,232,
+24,22,3,248,176,75,170,50,192,170,97,190,153,20,195,80,
+83,81,86,190,236,18,101,136,100,4,187,31,0,246,227,187,
+254,18,3,216,101,136,52,101,136,84,1,101,137,92,2,185,
+1,0,232,157,24,94,89,91,88,195,83,81,86,176,38,246,
+231,38,139,54,197,20,3,240,138,132,218,5,128,188,216,5,
+0,116,16,139,156,228,5,11,219,117,4,254,200,235,4,138,
+39,42,196,15,182,200,102,51,210,102,74,102,209,234,139,156,
+219,5,15,188,195,15,187,195,38,139,54,197,20,180,32,246,
+228,3,240,102,38,59,148,102,4,124,6,102,38,139,148,102,
+4,11,219,117,221,102,51,192,139,216,102,3,194,18,223,226,
+249,102,51,210,139,211,94,89,91,195,86,51,192,38,128,60,
+0,116,4,70,64,235,246,94,195,59,193,115,9,43,200,176,
+32,232,94,22,226,249,195,81,185,4,0,139,62,197,20,129,
+199,120,7,128,125,2,96,117,5,131,239,38,226,245,89,195,
+136,46,122,20,83,82,87,15,182,232,80,232,37,1,93,95,
+90,91,15,131,163,0,87,176,1,180,112,232,170,19,90,139,
+197,246,196,128,116,21,128,228,127,138,196,82,131,194,7,232,
+166,22,232,124,21,90,139,197,15,182,232,232,154,22,232,112,
+21,198,6,118,20,0,198,6,119,20,255,235,46,232,230,14,
+116,8,232,232,14,61,27,1,116,94,139,22,114,20,232,119,
+22,128,62,119,20,0,117,19,232,200,0,115,76,186,50,0,
+247,226,208,236,138,196,179,1,232,54,21,139,22,116,20,232,
+86,22,160,118,20,60,0,116,12,60,1,116,12,60,2,116,
+12,176,124,235,10,176,47,235,6,176,45,235,2,176,92,254,
+6,118,20,128,62,118,20,4,117,9,198,6,118,20,0,254,
+6,119,20,232,140,21,235,149,249,156,232,48,19,157,195,80,
+87,51,219,232,28,0,138,5,10,192,116,19,60,113,116,7,
+60,112,116,3,249,235,8,11,246,116,232,255,214,115,228,95,
+88,195,102,80,102,82,139,62,223,18,102,51,192,139,197,138,
+224,176,16,102,137,5,102,184,128,16,1,0,102,137,69,4,
+102,51,192,176,3,102,137,69,8,102,51,192,176,128,102,137,
+69,12,184,0,2,102,137,69,28,139,22,231,18,232,96,183,
+102,137,69,24,232,163,12,232,220,12,102,90,102,88,139,62,
+231,18,195,232,237,192,232,92,192,131,199,26,139,69,6,15,
+186,240,15,115,1,195,81,83,82,51,219,15,182,13,11,201,
+116,87,131,199,20,138,21,10,210,116,78,176,20,254,194,246,
+226,139,208,81,139,69,6,15,186,240,15,115,9,128,14,122,
+20,1,3,216,235,11,246,6,122,20,1,116,4,129,195,0,
+4,208,14,122,20,3,250,226,219,89,184,8,0,43,193,145,
+210,14,122,20,145,51,210,139,195,247,241,61,0,4,116,9,
+248,15,182,14,122,20,227,1,249,90,91,89,195,87,80,139,
+62,223,18,198,5,28,198,69,1,2,102,51,192,136,69,2,
+136,69,3,102,137,69,4,232,0,12,232,57,12,88,95,195,
+0,0,102,82,102,80,102,83,102,51,210,102,187,255,0,0,
+0,102,247,243,102,51,210,102,187,63,0,0,0,102,247,243,
+139,200,102,61,255,3,0,0,118,3,185,255,3,102,91,102,
+88,102,90,178,255,182,63,195,83,38,129,191,254,1,85,170,
+117,68,129,195,190,1,180,4,128,252,0,116,57,38,138,7,
+60,128,116,7,131,195,16,254,204,235,237,38,138,87,5,128,
+250,0,116,34,254,194,38,138,119,6,128,230,63,128,254,0,
+116,20,128,250,0,117,6,138,230,176,0,235,10,180,0,138,
+198,246,226,248,235,1,249,91,195,102,80,102,83,30,6,86,
+81,82,232,44,182,137,132,203,6,30,7,187,0,4,3,222,
+102,184,0,0,0,0,46,138,117,24,178,2,51,201,177,1,
+232,243,176,114,52,232,128,255,114,47,102,15,183,216,102,82,
+102,46,139,69,20,102,11,192,117,19,102,51,210,102,46,139,
+69,16,102,247,243,102,61,255,3,0,0,118,3,184,255,3,
+102,90,139,200,131,196,4,235,2,90,89,94,7,31,102,91,
+102,88,51,192,46,137,13,46,136,85,2,46,137,69,3,46,
+137,69,5,46,136,69,7,46,136,69,8,128,250,8,118,5,
+46,128,77,8,8,46,137,69,9,46,136,69,11,46,137,69,
+12,46,136,117,14,46,136,69,15,195,102,83,102,81,82,102,
+87,30,6,30,7,139,54,195,20,137,54,197,20,232,21,192,
+38,139,52,131,254,255,117,241,232,89,185,51,246,86,139,54,
+193,20,131,254,255,15,132,64,1,94,190,83,16,46,15,182,
+14,157,0,46,128,62,60,0,1,117,19,131,249,2,124,14,
+191,65,0,51,210,139,193,247,231,131,232,40,3,240,184,95,
+1,247,225,3,240,46,137,54,12,88,51,192,129,254,156,17,
+126,32,185,173,18,191,156,17,43,207,139,249,3,254,190,172,
+18,253,30,6,140,200,142,216,142,192,243,164,7,31,252,71,
+139,199,80,189,2,0,232,187,7,191,83,16,139,54,193,20,
+185,95,1,51,192,6,14,7,87,243,170,95,7,38,139,84,
+19,46,137,85,9,38,139,84,17,46,137,85,7,38,139,84,
+15,46,137,85,5,38,139,84,6,46,137,21,38,138,84,8,
+46,136,85,2,38,138,84,9,46,136,85,3,38,138,84,10,
+46,136,85,11,179,0,86,38,128,188,156,1,6,117,19,102,
+38,139,132,157,1,38,138,188,155,1,254,203,129,198,54,4,
+235,45,129,198,111,3,38,138,68,2,10,192,116,88,86,38,
+139,52,60,1,116,11,102,38,139,68,16,38,138,124,1,235,
+13,102,38,139,68,16,102,38,139,84,32,38,138,60,94,87,
+80,46,138,69,12,180,26,246,228,131,199,13,3,248,88,46,
+136,125,24,102,46,137,69,16,102,46,137,85,20,46,254,6,
+156,0,232,141,253,88,80,232,15,254,95,46,254,69,12,131,
+198,3,254,195,235,160,94,129,199,95,1,38,139,116,2,131,
+254,255,15,133,42,255,232,207,3,184,0,1,46,128,62,156,
+0,0,116,11,38,128,62,253,18,0,116,3,131,200,32,93,
+7,31,102,95,90,102,89,102,91,11,237,116,4,131,196,2,
+85,195,30,86,87,85,83,232,27,185,139,93,4,131,199,10,
+189,0,0,131,251,0,116,20,138,5,60,0,116,10,75,83,
+85,87,232,53,186,95,93,91,69,71,235,231,15,182,76,21,
+86,187,0,0,198,6,125,20,1,139,254,129,199,111,3,15,
+182,77,2,227,52,87,139,61,128,249,2,117,35,139,247,131,
+238,27,87,191,151,124,232,84,196,95,50,219,138,69,1,232,
+191,16,138,93,8,191,129,125,232,11,2,232,116,196,235,3,
+232,19,0,95,131,199,3,235,198,94,232,101,196,232,67,1,
+91,93,95,94,31,195,102,96,87,138,5,232,84,196,191,151,
+124,232,25,196,83,50,219,232,135,16,91,191,145,125,232,12,
+196,95,86,6,83,30,7,138,93,2,138,125,3,232,134,249,
+91,7,6,102,80,83,81,138,4,10,192,116,6,232,242,16,
+70,235,244,138,69,2,87,232,118,185,232,224,195,95,89,91,
+102,88,7,94,87,191,154,125,232,210,195,95,86,87,6,140,
+216,142,192,102,139,69,16,102,139,85,32,7,6,30,7,232,
+150,248,86,81,190,153,20,232,64,250,185,9,0,232,73,250,
+89,94,7,191,153,20,232,159,195,128,62,152,20,0,116,8,
+232,154,195,83,232,222,15,91,176,32,180,6,232,123,15,95,
+139,69,14,11,192,117,18,6,30,7,38,138,69,8,232,227,
+247,7,87,139,254,232,117,195,95,232,166,195,139,54,197,20,
+15,182,76,21,94,131,125,14,0,117,11,138,85,36,139,125,
+5,232,248,0,235,106,139,117,14,15,182,12,138,100,1,131,
+198,3,138,69,2,60,7,117,4,176,2,235,2,176,5,86,
+87,191,166,125,232,54,195,95,94,87,86,86,6,30,7,139,
+216,232,178,248,7,138,4,10,192,116,6,232,36,16,70,235,
+244,138,195,232,170,184,232,20,195,94,138,4,232,117,247,139,
+254,232,9,195,232,59,195,94,139,124,1,138,84,3,86,83,
+232,153,0,88,94,95,131,198,4,226,180,198,6,125,20,1,
+102,97,195,102,80,96,15,182,76,21,51,219,139,235,138,132,
+88,4,60,15,117,9,246,132,93,4,64,117,18,235,40,60,
+12,116,12,60,0,116,8,60,13,116,4,60,217,114,24,131,
+253,0,117,9,191,178,125,232,179,194,232,229,194,191,122,125,
+232,115,0,232,220,194,69,131,198,32,67,226,193,139,54,197,
+20,15,182,140,17,8,227,40,131,253,0,117,9,191,178,125,
+232,138,194,232,188,194,139,254,129,199,176,5,131,199,38,128,
+125,4,0,116,247,246,69,12,128,116,241,232,72,254,226,236,
+131,253,0,116,3,232,154,194,97,102,88,195,15,188,223,15,
+187,223,176,32,246,227,87,139,54,197,20,3,240,191,129,125,
+232,19,0,56,218,117,6,191,234,153,232,64,194,232,114,194,
+95,11,255,117,215,195,82,232,51,194,138,195,83,179,0,232,
+159,14,91,184,32,3,128,251,10,114,2,254,204,232,10,14,
+191,118,125,232,23,194,6,15,168,140,216,142,232,142,192,232,
+181,15,138,132,94,4,180,7,128,62,152,20,0,116,2,180,
+31,232,235,247,15,169,7,86,6,81,140,216,142,192,102,139,
+132,102,4,102,51,210,102,80,232,189,246,190,153,20,232,105,
+248,185,9,0,232,114,248,102,88,89,7,94,191,153,20,232,
+198,193,128,62,152,20,0,116,11,191,150,125,232,190,193,83,
+232,2,14,91,191,150,125,232,179,193,138,132,88,4,60,15,
+117,6,191,11,125,232,165,193,60,12,117,6,191,8,125,232,
+155,193,60,11,117,6,191,245,124,232,145,193,60,13,117,6,
+191,170,124,232,135,193,60,217,117,6,191,17,125,232,125,193,
+60,219,117,6,191,34,125,232,115,193,60,221,117,6,191,51,
+125,232,105,193,60,236,117,6,191,67,125,232,95,193,60,238,
+117,6,191,85,125,232,85,193,60,254,117,6,191,103,125,232,
+75,193,128,188,88,4,0,117,6,191,158,124,232,62,193,90,
+195,96,232,240,183,198,69,60,0,87,131,199,44,232,40,193,
+232,95,193,191,129,124,232,36,193,191,162,0,232,30,193,191,
+137,124,232,24,193,95,198,69,40,0,131,199,24,232,8,193,
+232,63,193,97,195,0,0,0,96,46,15,182,14,157,0,131,
+249,2,15,140,173,0,46,128,62,60,0,1,15,133,163,0,
+190,28,0,189,83,16,46,137,108,30,129,197,95,1,46,15,
+182,68,5,177,3,211,192,139,208,30,6,140,200,142,216,142,
+192,139,198,46,15,182,14,157,0,73,81,139,202,139,240,46,
+137,124,6,139,199,190,28,0,243,165,46,137,109,254,129,197,
+95,1,89,226,229,7,31,139,240,46,199,68,6,0,0,190,
+28,0,189,83,16,6,14,7,87,191,97,0,232,70,0,129,
+197,95,1,191,83,0,176,190,170,139,198,171,46,139,116,6,
+186,231,15,14,89,95,46,137,124,16,232,40,0,129,197,95,
+1,46,137,124,22,176,190,170,139,198,171,176,234,170,139,194,
+171,139,193,171,46,139,116,6,11,246,117,218,7,190,28,0,
+232,249,176,97,195,80,86,81,6,30,190,106,95,140,201,142,
+217,142,193,185,5,0,243,164,31,30,46,138,70,11,4,48,
+46,136,5,71,190,111,95,140,201,142,217,142,193,185,17,0,
+243,164,50,192,46,136,5,71,31,7,89,94,88,195,83,108,
+111,116,32,32,51,119,97,114,101,32,99,111,110,116,114,111,
+108,108,101,114,0,160,0,0,0,0,0,0,0,0,0,0,
+36,80,77,77,80,6,86,46,198,6,135,95,0,141,6,140,
+95,80,232,41,0,114,16,46,198,6,134,95,1,46,140,6,
+130,95,46,137,54,132,95,131,196,2,94,7,14,7,88,232,
+219,0,115,9,87,191,158,170,232,178,191,249,95,195,85,139,
+236,102,80,83,81,87,187,0,224,142,195,51,246,139,126,4,
+102,46,139,5,102,38,57,4,117,27,38,128,124,4,1,117,
+20,86,185,16,0,51,192,38,2,4,70,226,250,94,60,0,
+117,3,248,235,13,70,131,254,16,114,210,67,131,251,255,117,
+200,249,95,89,91,102,88,93,195,85,139,236,80,82,86,46,
+142,6,130,95,46,139,54,132,95,106,1,106,255,106,255,139,
+70,4,193,232,3,106,0,80,106,0,38,255,92,7,131,196,
+12,131,250,0,117,5,131,248,0,116,22,46,137,22,136,95,
+46,163,138,95,193,232,4,193,226,12,3,208,142,194,248,235,
+1,249,94,90,88,93,195,6,86,82,46,142,6,130,95,46,
+139,54,132,95,102,46,131,62,136,95,0,116,27,46,255,54,
+136,95,46,255,54,138,95,106,2,38,255,92,7,131,196,6,
+131,250,0,117,3,248,235,1,249,90,94,7,195,81,87,6,
+30,80,184,64,0,142,216,191,19,0,139,5,131,232,2,193,
+224,6,46,163,128,95,88,31,80,193,224,6,46,41,6,128,
+95,88,46,128,62,134,95,0,116,35,193,224,9,80,232,72,
+255,114,23,131,196,2,46,198,6,135,95,1,46,140,6,30,
+16,46,163,34,16,140,192,248,235,84,131,196,2,46,131,62,
+34,16,0,117,55,193,224,9,139,200,184,0,112,80,81,142,
+192,51,255,51,192,252,243,175,89,116,36,81,184,255,255,51,
+255,252,243,175,89,116,24,88,131,192,4,61,0,112,116,12,
+46,59,6,128,95,117,214,184,0,16,235,209,249,235,15,46,
+163,32,16,88,46,163,30,16,46,137,14,34,16,248,7,95,
+89,195,80,81,87,6,46,131,62,34,16,0,116,46,46,128,
+62,135,95,0,116,6,232,14,255,248,235,35,46,161,30,16,
+142,192,51,255,46,139,14,34,16,46,161,32,16,243,171,51,
+192,46,163,34,16,46,163,30,16,248,235,3,249,235,0,7,
+95,89,88,195,6,86,87,83,81,82,30,184,64,0,142,216,
+187,19,0,139,7,193,224,6,80,180,193,248,205,21,88,114,
+16,187,14,0,139,15,139,209,131,225,63,117,4,59,194,116,
+47,139,221,193,227,6,43,195,142,192,51,255,139,221,193,227,
+9,139,203,51,192,252,243,171,51,255,38,137,45,187,19,0,
+41,47,46,199,6,151,0,0,0,46,140,6,149,0,235,88,
+46,198,6,153,0,1,140,192,142,216,51,246,51,255,139,221,
+193,227,6,43,195,51,201,142,192,138,12,193,225,9,252,243,
+165,139,205,193,225,9,51,192,252,243,171,106,64,31,187,19,
+0,41,47,140,192,187,14,0,137,7,51,255,38,139,29,139,
+203,193,225,10,3,221,38,137,29,3,249,38,137,45,46,137,
+14,151,0,46,140,6,149,0,31,90,89,91,95,94,7,195,
+85,87,51,201,136,14,199,20,46,138,62,36,16,46,138,30,
+37,16,232,46,1,131,224,254,131,192,40,139,208,237,11,192,
+15,133,231,0,139,46,195,20,139,241,232,225,0,128,252,0,
+116,7,128,252,134,15,132,193,0,191,46,0,232,117,1,61,
+2,16,116,4,65,70,235,226,232,248,0,169,1,0,15,132,
+164,0,131,224,254,80,82,131,192,40,139,208,237,11,192,90,
+88,15,133,145,0,62,136,126,8,62,136,94,9,232,175,0,
+232,223,0,62,136,70,10,62,199,70,11,96,35,87,81,62,
+138,126,8,62,138,94,9,191,4,0,232,39,1,169,4,0,
+117,14,62,138,126,8,62,138,94,9,131,200,4,232,31,1,
+86,139,245,137,46,197,20,232,201,1,232,238,1,115,35,62,
+138,126,8,46,58,62,36,16,117,57,62,138,94,9,46,58,
+30,37,16,117,46,191,130,111,232,114,188,51,201,94,89,95,
+235,57,80,87,82,62,139,86,6,131,194,40,191,162,0,131,
+199,14,46,139,5,239,90,95,88,254,6,199,20,129,197,45,
+8,137,44,94,89,95,70,233,48,255,15,182,14,199,20,227,
+10,129,237,45,8,62,199,70,0,255,255,95,93,195,81,82,
+180,177,176,2,185,2,16,186,193,19,205,26,90,89,195,139,
+208,62,137,70,6,139,216,62,137,70,13,131,192,12,62,137,
+70,19,139,195,131,192,8,62,137,70,17,131,195,4,62,137,
+94,15,195,191,18,0,232,107,0,139,208,191,16,0,232,99,
+0,195,87,30,6,83,161,231,18,46,163,236,99,140,216,46,
+163,238,99,184,0,240,142,216,180,177,176,14,187,0,0,14,
+7,191,234,99,205,26,114,45,46,139,30,234,99,46,161,238,
+99,142,216,46,139,62,236,99,62,138,70,8,62,138,102,9,
+128,228,248,57,5,116,11,131,199,16,131,235,16,117,244,249,
+235,3,138,69,14,115,2,176,255,91,7,31,95,195,0,2,
+0,0,0,0,81,180,177,176,9,205,26,139,193,89,195,81,
+139,200,180,177,176,12,205,26,89,195,232,32,0,81,6,30,
+7,129,239,128,0,185,32,0,102,51,192,243,102,171,7,89,
+198,69,252,128,139,215,232,151,170,232,238,0,195,102,80,102,
+83,102,81,232,1,1,102,37,0,32,0,0,116,245,248,102,
+89,102,91,102,88,195,102,83,102,81,82,85,232,247,5,102,
+185,35,2,0,0,232,223,0,232,250,5,115,54,160,241,18,
+60,16,124,27,186,9,18,187,70,23,176,1,180,112,185,2,
+0,190,84,172,232,145,5,232,3,1,232,176,5,235,37,191,
+1,127,232,248,186,232,42,187,191,42,127,232,239,186,232,236,
+0,235,17,102,37,0,64,0,0,117,186,232,182,0,248,139,
+77,150,227,8,139,46,197,20,62,255,86,11,93,90,102,89,
+102,91,195,102,80,82,86,139,54,197,20,102,184,0,0,219,
+0,232,57,0,232,112,0,102,37,0,64,0,0,117,7,139,
+84,19,102,237,235,238,94,90,102,88,195,102,80,87,232,6,
+178,139,62,231,18,102,46,161,241,123,102,59,69,4,116,3,
+249,235,6,198,6,253,18,1,248,95,102,88,195,86,139,54,
+197,20,131,124,6,0,116,9,82,139,84,13,102,239,90,94,
+195,139,116,13,102,100,137,4,94,195,86,139,54,197,20,131,
+124,6,0,116,9,82,139,84,17,102,239,90,94,195,139,116,
+17,102,100,137,4,94,195,86,139,54,197,20,131,124,6,0,
+116,9,82,139,84,15,102,237,90,94,195,139,116,15,102,100,
+139,4,94,195,86,139,54,197,20,131,124,6,0,116,9,82,
+139,84,19,102,237,90,94,195,139,116,19,102,100,139,4,94,
+195,0,0,0,0,0,96,180,1,205,22,97,195,30,83,81,
+140,200,142,216,180,0,205,22,46,139,14,112,101,227,4,255,
+209,115,241,89,91,31,195,83,86,87,139,28,255,211,15,130,
+88,1,139,76,5,46,137,14,112,101,15,182,76,4,131,198,
+7,38,137,54,126,20,81,86,51,219,86,139,52,138,4,60,
+0,116,18,60,3,117,3,232,157,1,50,192,59,221,117,2,
+176,1,232,187,1,94,131,198,2,67,226,222,94,89,184,1,
+0,87,86,139,221,209,227,139,48,128,60,0,117,55,139,92,
+3,255,211,115,10,131,248,5,15,132,223,0,233,249,0,94,
+86,139,221,209,227,139,48,128,60,0,116,21,128,60,3,117,
+11,86,139,116,1,128,124,12,1,94,126,33,176,1,232,111,
+1,94,95,235,188,232,85,255,61,9,15,116,10,61,0,80,
+116,5,61,0,77,117,24,184,1,0,232,34,1,3,232,131,
+253,255,117,3,139,233,77,59,233,117,180,51,237,235,176,61,
+0,15,116,10,61,0,72,116,5,61,0,75,117,17,131,253,
+0,116,5,184,255,255,235,210,139,233,184,255,255,235,203,61,
+13,28,117,87,128,60,1,116,5,128,60,2,117,21,138,4,
+38,139,54,126,20,131,238,7,131,124,2,0,116,3,255,84,
+2,235,101,128,60,6,117,9,139,116,1,139,52,255,214,235,
+8,128,60,3,117,9,139,116,1,232,108,1,233,114,255,128,
+60,4,117,23,81,85,139,124,9,139,116,7,51,237,232,214,
+254,93,89,94,95,95,94,91,233,204,254,232,95,0,114,40,
+11,219,116,11,131,248,5,15,133,70,255,94,95,235,230,232,
+103,0,117,3,233,58,255,232,20,0,15,131,51,255,85,139,
+232,232,107,0,93,233,7,255,94,95,95,94,91,195,83,81,
+86,82,38,139,54,126,20,51,210,139,28,131,127,11,0,116,
+16,57,71,11,116,5,57,71,13,117,6,139,194,149,249,235,
+7,66,131,198,2,226,226,248,90,94,89,91,195,139,223,11,
+219,116,21,131,63,0,116,14,57,7,117,5,255,87,2,235,
+7,131,195,4,235,237,51,219,195,61,0,59,116,5,61,0,
+104,117,11,131,124,5,0,116,5,255,84,5,51,192,195,80,
+176,0,232,43,0,88,195,86,87,139,116,1,139,124,14,38,
+139,5,180,4,246,228,139,124,10,3,248,139,69,2,139,124,
+16,38,137,5,139,124,19,11,255,116,2,255,215,95,94,195,
+86,87,139,254,128,61,6,117,9,139,117,1,139,52,255,214,
+235,8,139,117,1,128,61,3,117,5,232,8,0,235,3,232,
+70,1,95,94,195,30,6,86,87,80,83,81,82,85,156,252,
+191,132,21,86,87,185,10,0,243,164,95,94,157,138,36,128,
+196,2,38,136,101,2,139,92,14,38,139,23,50,246,254,194,
+58,84,12,126,3,138,84,12,254,202,193,226,2,139,92,10,
+3,218,101,139,31,38,137,93,11,138,100,9,38,136,101,10,
+138,100,18,38,136,101,9,6,31,139,247,232,234,0,93,90,
+89,91,88,95,94,7,31,195,83,81,82,87,85,86,176,1,
+185,30,0,232,125,1,138,52,138,84,1,138,108,2,138,76,
+3,138,124,8,232,17,5,138,68,4,138,124,2,138,92,3,
+138,100,5,232,59,5,139,254,15,182,77,12,139,117,10,139,
+93,14,38,139,7,138,117,6,138,85,7,82,80,81,86,101,
+139,52,138,93,8,56,196,117,3,138,93,18,6,15,168,7,
+80,232,210,2,88,7,254,196,94,131,198,4,254,198,226,222,
+89,91,90,73,117,2,235,77,139,247,232,240,252,61,0,72,
+116,42,61,0,80,116,50,61,27,1,116,29,61,13,28,117,
+233,139,117,14,38,137,28,139,117,10,193,227,2,139,88,2,
+139,117,16,38,137,28,248,235,28,249,235,25,131,251,0,116,
+201,139,235,75,232,166,0,235,193,59,217,116,189,139,235,67,
+232,154,0,235,181,94,86,80,156,176,1,185,30,0,232,238,
+0,176,1,232,207,254,157,88,94,139,92,19,11,219,116,2,
+255,211,93,95,90,89,91,195,83,81,82,86,87,85,80,138,
+52,134,240,232,24,2,134,240,138,84,1,138,108,2,134,232,
+232,11,2,134,232,138,76,3,138,124,8,232,42,4,88,80,
+138,100,5,60,0,116,3,138,100,10,138,124,2,134,248,232,
+236,1,134,248,138,92,3,138,68,4,232,68,4,139,254,139,
+117,11,138,117,6,134,240,232,212,1,134,240,138,85,7,88,
+82,86,138,93,8,60,0,116,3,138,93,9,6,15,168,7,
+232,227,1,7,94,90,93,95,94,90,89,91,195,30,80,82,
+81,254,198,254,194,138,198,42,228,3,197,138,242,42,237,138,
+76,13,138,84,8,30,6,31,232,59,1,31,59,235,114,4,
+254,200,235,2,254,192,138,84,18,6,31,232,40,1,89,90,
+88,31,195,30,86,87,81,83,80,179,160,254,200,246,227,139,
+240,191,145,21,138,193,246,227,139,200,38,139,30,130,21,142,
+219,156,252,209,233,243,165,157,88,91,89,95,94,31,195,6,
+30,86,87,81,83,80,6,31,139,30,130,21,142,195,190,145,
+21,179,160,254,200,246,227,139,248,138,193,246,227,139,200,209,
+233,156,252,243,165,128,62,12,0,1,117,3,232,192,4,157,
+88,91,89,95,94,31,7,195,80,81,176,1,177,30,232,146,
+255,89,88,10,192,116,14,83,81,139,203,138,252,232,40,3,
+89,91,232,92,3,6,14,7,232,7,4,7,195,80,81,176,
+1,177,30,232,153,255,89,88,195,180,1,205,22,116,6,180,
+0,205,22,235,244,195,30,80,184,64,0,142,216,102,139,30,
+108,0,88,31,195,30,102,80,102,81,250,102,3,203,184,64,
+0,142,216,102,161,108,0,102,59,195,115,6,102,5,178,0,
+24,0,102,59,200,251,102,89,102,88,31,195,80,81,82,85,
+180,2,205,26,139,234,180,2,205,26,114,4,59,234,116,246,
+93,90,89,88,195,128,62,12,0,1,117,21,80,83,140,219,
+184,15,0,193,232,4,3,195,131,192,1,163,130,21,91,88,
+195,199,6,130,21,0,184,205,17,36,48,60,48,117,6,199,
+6,130,21,0,176,195,80,83,81,82,87,6,82,232,87,2,
+137,22,114,20,90,80,82,254,200,254,206,138,214,138,240,232,
+54,2,90,88,139,30,130,21,142,195,187,160,0,254,200,246,
+227,139,248,138,222,254,203,209,227,3,251,138,218,232,39,2,
+38,138,5,232,247,1,254,194,232,13,2,131,199,2,226,240,
+139,22,114,20,232,1,2,7,95,90,89,91,88,195,38,128,
+62,241,18,0,116,10,38,128,62,12,0,1,116,2,44,5,
+195,0,0,0,85,51,237,38,138,2,60,0,116,6,232,65,
+1,69,235,243,93,195,96,51,237,232,204,1,38,138,2,60,
+0,116,8,232,167,1,69,254,194,235,241,97,195,82,232,198,
+1,254,198,178,0,232,176,1,90,195,128,252,0,116,10,81,
+15,182,204,232,12,1,226,251,89,195,87,102,86,85,83,81,
+102,82,51,201,65,102,51,210,102,190,10,0,0,0,102,247,
+246,102,80,138,194,232,179,0,102,88,83,102,131,248,0,117,
+227,139,236,139,217,138,86,1,38,136,21,131,197,2,71,226,
+244,38,199,5,0,0,3,227,3,227,139,195,102,90,89,91,
+93,102,94,95,195,139,216,83,102,193,232,16,232,5,0,88,
+232,1,0,195,80,138,196,232,5,0,88,232,1,0,195,83,
+232,104,0,83,138,195,232,153,0,91,138,199,232,147,0,91,
+195,80,81,82,50,246,178,100,60,0,117,13,128,251,1,117,
+6,232,63,0,232,60,0,235,49,50,228,246,242,10,192,116,
+2,182,1,10,246,116,7,4,48,232,102,0,235,8,128,251,
+1,117,3,232,29,0,138,204,138,194,50,228,178,10,246,242,
+60,1,138,208,138,193,116,2,235,207,4,48,232,67,0,90,
+89,88,195,80,176,32,232,57,0,88,195,232,9,0,138,251,
+192,232,4,232,1,0,195,80,36,15,138,216,60,10,125,5,
+128,195,48,88,195,128,235,10,128,195,65,88,195,0,0,0,
+184,0,1,185,32,32,205,16,195,184,0,1,185,7,6,205,
+16,195,82,232,161,0,60,13,117,7,178,0,232,137,0,90,
+195,60,10,117,12,128,254,29,115,5,254,198,232,121,0,90,
+195,30,80,46,161,38,16,142,216,128,62,12,0,0,88,31,
+117,14,90,80,83,30,42,255,180,14,205,16,31,91,88,195,
+83,30,80,81,87,46,161,38,16,142,216,246,6,13,0,1,
+116,6,138,30,14,0,235,13,139,202,232,207,1,161,130,21,
+142,216,138,93,1,95,89,88,31,232,128,1,91,254,194,128,
+250,80,117,4,50,210,254,198,232,29,0,90,195,80,83,81,
+82,185,1,0,42,255,180,9,232,97,1,232,25,0,254,194,
+232,5,0,90,89,91,88,195,80,83,81,30,42,255,180,2,
+205,16,31,89,91,88,195,80,83,81,42,255,180,3,205,16,
+89,91,88,195,180,15,205,16,136,62,82,40,180,7,232,59,
+0,198,6,152,20,0,195,195,80,83,81,82,138,223,176,32,
+138,250,138,215,232,193,255,232,163,255,254,194,56,202,118,244,
+254,198,56,238,118,236,90,89,91,88,195,181,29,177,79,51,
+210,138,252,232,210,255,51,210,232,157,255,195,136,38,81,40,
+195,80,83,81,82,86,30,85,30,46,255,54,38,16,31,190,
+94,172,128,62,12,0,0,116,3,190,106,172,10,192,116,20,
+190,100,172,128,62,12,0,0,116,3,190,112,172,60,2,117,
+3,190,118,172,31,232,96,255,46,138,4,83,138,220,232,60,
+255,91,42,237,138,203,254,201,42,202,139,233,46,138,68,4,
+83,138,220,232,39,255,226,251,46,138,68,1,232,30,255,91,
+138,207,42,206,254,201,46,138,68,5,138,250,254,198,138,215,
+232,37,255,83,138,220,232,4,255,91,138,211,232,25,255,83,
+138,220,232,248,254,91,226,228,254,198,138,215,46,138,68,2,
+232,5,255,138,220,232,229,254,139,205,46,138,68,4,232,220,
+254,226,251,46,138,68,3,232,211,254,93,31,94,90,89,91,
+88,195,83,81,82,86,81,101,138,52,128,254,22,124,17,80,
+6,46,255,54,38,16,7,138,198,232,210,252,138,240,7,88,
+101,138,84,1,101,138,92,4,86,101,139,116,2,232,230,252,
+94,131,198,5,89,226,207,94,90,89,91,195,30,80,46,161,
+38,16,142,216,88,128,62,12,0,1,116,4,205,16,235,15,
+81,82,232,162,254,139,202,232,7,0,232,105,0,90,89,31,
+195,87,6,80,83,81,232,19,0,139,14,130,21,142,193,38,
+136,5,38,136,93,1,89,91,88,7,95,195,80,81,51,255,
+176,160,246,229,50,237,208,225,3,193,3,248,89,88,195,86,
+30,6,80,83,81,46,161,38,16,142,216,161,130,21,142,192,
+51,246,181,0,177,0,38,139,4,138,220,232,24,0,131,198,
+2,254,193,128,249,80,117,238,254,197,128,253,30,117,229,89,
+91,88,7,31,94,195,6,96,60,18,115,3,233,132,0,60,
+126,118,2,235,126,190,92,171,180,16,246,228,3,240,137,54,
+83,40,184,0,160,142,192,176,80,246,229,193,224,4,15,182,
+241,3,240,137,54,85,40,186,196,3,176,2,238,183,255,176,
+1,186,197,3,139,62,85,40,139,54,83,40,238,185,16,0,
+246,195,1,116,31,246,195,16,116,12,138,231,38,136,37,131,
+199,80,226,248,235,37,46,138,36,38,136,37,131,199,80,70,
+226,244,235,23,246,195,16,117,4,50,228,235,223,46,138,36,
+246,212,38,136,37,131,199,80,70,226,242,208,203,208,224,60,
+16,117,177,97,7,195,84,104,101,32,102,105,114,109,119,97,
+114,101,32,105,115,32,105,110,99,111,109,112,97,116,105,98,
+108,101,32,119,105,116,104,32,66,73,79,83,46,13,10,0,
+0,51,119,97,114,101,32,66,73,79,83,32,105,110,115,116,
+97,108,108,101,100,32,115,117,99,99,101,115,115,102,117,108,
+108,121,0,0,51,119,97,114,101,32,66,73,79,83,32,110,
+111,116,32,105,110,115,116,97,108,108,101,100,0,0,13,10,
+0,13,10,87,65,82,78,73,78,71,58,32,51,119,97,114,
+101,32,71,105,103,97,80,97,116,104,32,67,111,110,116,114,
+111,108,108,101,114,32,110,111,116,32,102,111,117,110,100,13,
+10,0,0,32,32,32,45,32,0,0,32,100,114,105,118,101,
+32,0,0,32,32,68,114,105,118,101,32,0,0,32,32,85,
+110,105,116,32,0,0,32,32,99,97,112,97,99,105,116,121,
+32,0,0,32,98,108,111,99,107,115,46,0,0,78,117,109,
+98,101,114,32,111,102,32,117,110,105,116,115,32,102,111,117,
+110,100,58,32,0,0,32,82,65,73,68,32,48,32,0,0,
+32,82,65,73,68,32,49,32,0,0,32,77,105,114,114,111,
+114,32,0,0,32,82,65,73,68,32,49,48,0,0,32,82,
+65,73,68,32,53,32,0,0,32,82,65,73,68,32,53,48,
+0,0,0,114,112,1,124,112,2,134,112,7,144,112,5,154,
+112,82,164,112,83,164,112,84,164,112,255,0,0,58,34,0,
+0,1,0,0,210,112,0,0,0,236,78,0,0,0,0,0,
+0,0,0,0,0,0,0,193,170,48,28,0,19,171,63,28,
+18,101,171,48,28,63,116,171,48,28,42,133,171,48,29,0,
+160,171,63,29,5,242,171,48,29,36,10,172,48,29,60,18,
+172,48,20,14,205,126,112,13,28,244,34,0,66,149,36,27,
+1,198,36,0,0,0,0,6,13,162,143,126,8,13,61,142,
+112,9,13,118,142,112,9,18,189,143,126,10,13,151,142,112,
+10,30,217,143,126,11,13,206,142,112,12,13,4,143,112,13,
+13,58,143,112,13,57,223,143,126,14,13,110,143,112,14,37,
+231,143,126,16,13,88,130,112,16,19,116,130,126,2,10,252,
+143,71,2,49,56,144,79,3,10,77,144,71,4,10,137,144,
+71,5,10,198,144,71,5,59,2,145,79,6,10,13,145,79,
+8,10,30,145,71,9,10,86,145,71,9,14,150,145,79,10,
+10,206,145,71,11,10,13,146,71,12,10,76,146,71,12,14,
+134,146,79,13,10,178,146,71,14,10,229,146,71,14,18,34,
+147,79,15,10,70,147,71,16,10,125,147,71,17,10,180,147,
+71,17,18,242,147,79,18,10,24,148,71,19,10,60,148,71,
+19,14,122,148,79,20,10,134,148,71,22,13,88,130,71,22,
+19,116,130,79,12,23,255,113,112,14,23,88,130,112,14,29,
+116,130,126,69,114,114,111,114,32,32,32,32,32,32,105,110,
+32,111,112,99,111,100,101,32,32,32,46,0,0,10,18,151,
+148,71,10,42,196,148,79,11,18,214,148,71,12,18,2,149,
+71,13,18,38,149,71,14,18,82,149,71,14,18,100,149,79,
+16,21,105,149,71,0,0,244,132,48,28,0,107,133,63,28,
+8,189,133,48,28,17,195,133,48,28,68,210,133,48,28,54,
+242,133,56,28,38,250,133,48,29,0,7,135,63,29,5,89,
+134,48,29,33,113,134,48,29,53,121,134,48,29,0,7,135,
+63,29,5,89,134,48,29,33,127,134,48,29,53,121,134,48,
+0,0,237,149,48,2,5,63,150,23,4,5,132,150,30,19,
+7,172,150,30,20,7,178,150,30,22,45,237,150,30,23,45,
+250,150,30,24,45,8,151,30,19,45,194,150,30,20,45,209,
+150,30,23,7,223,150,30,29,0,25,151,63,29,9,107,151,
+48,29,24,113,151,48,29,49,128,151,48,29,72,142,151,48,
+0,0,89,155,48,2,5,171,155,23,4,5,237,155,30,29,
+0,18,156,63,29,9,100,156,48,29,72,106,156,48,0,0,
+55,169,48,1,1,137,169,30,1,15,162,0,23,1,32,152,
+169,30,1,55,166,169,30,1,65,173,169,30,2,1,182,169,
+30,2,32,195,169,30,3,1,213,169,30,3,32,243,169,30,
+4,1,221,169,30,5,1,3,170,30,29,0,24,170,48,3,
+8,89,135,112,5,8,155,135,112,5,16,251,137,126,6,8,
+215,135,112,8,8,24,136,112,8,11,7,138,126,9,8,87,
+136,112,10,8,150,136,112,12,8,188,136,112,12,11,25,138,
+126,13,8,253,136,112,14,8,62,137,112,16,8,71,137,112,
+16,11,43,138,126,17,8,130,137,112,17,37,61,138,126,18,
+8,189,137,112,18,8,91,138,126,20,7,168,141,112,21,8,
+236,141,112,21,14,43,142,126,21,52,56,142,126,3,8,105,
+138,112,5,8,171,138,112,5,22,84,141,126,5,46,103,141,
+126,6,8,237,138,112,7,8,41,139,112,9,8,88,139,112,
+9,11,117,141,126,10,8,152,139,112,11,8,215,139,112,12,
+8,19,140,112,14,8,68,140,112,14,11,135,141,126,15,8,
+130,140,112,16,8,194,140,112,17,8,0,141,112,19,8,20,
+141,112,19,8,151,141,126,19,33,154,141,126,19,43,161,141,
 126,20,7,168,141,112,21,8,236,141,112,21,14,43,142,126,
-21,52,56,142,126,3,8,105,138,112,5,8,171,138,112,5,
-22,84,141,126,5,46,103,141,126,6,8,237,138,112,7,8,
-41,139,112,9,8,88,139,112,9,11,117,141,126,10,8,152,
-139,112,11,8,215,139,112,12,8,19,140,112,14,8,68,140,
-112,14,11,135,141,126,15,8,130,140,112,16,8,194,140,112,
-17,8,0,141,112,19,8,20,141,112,19,8,151,141,126,19,
-33,154,141,126,19,43,161,141,126,20,7,168,141,112,21,8,
-236,141,112,21,14,43,142,126,21,52,56,142,126,3,10,83,
-152,112,5,10,129,152,112,6,10,190,152,112,6,67,151,153,
-126,8,10,252,152,112,9,10,56,153,112,10,10,116,153,112,
-10,34,156,153,126,17,10,88,130,112,17,16,116,130,126,5,
-8,114,156,112,7,8,162,156,112,8,8,227,156,112,9,8,
-29,157,112,9,16,197,157,126,11,8,42,157,112,12,8,102,
-157,112,13,8,162,157,112,13,32,202,157,126,15,8,88,130,
-112,15,14,116,130,126,9,16,150,151,112,10,16,200,151,112,
-12,16,88,130,112,12,22,116,130,126,2,3,160,130,112,3,
-3,231,130,112,4,3,44,131,112,6,3,60,131,126,23,3,
-109,131,112,20,15,89,132,112,21,15,124,132,112,20,15,142,
-132,112,21,15,194,132,112,20,14,150,126,112,20,15,215,127,
-112,20,22,44,128,126,21,15,10,128,112,21,37,52,128,126,
-20,14,59,128,112,20,25,147,128,126,21,14,113,128,112,21,
-36,154,128,126,20,22,161,128,7,117,154,2,0,96,154,0,
-0,75,154,4,0,159,154,5,0,138,154,7,0,180,154,82,
-0,96,154,0,0,75,154,4,0,159,154,5,0,180,154,83,
-0,96,154,0,0,75,154,4,0,159,154,5,0,138,154,7,
-0,201,154,82,0,222,154,83,0,243,154,84,0,5,117,1,
-0,253,116,3,0,1,117,3,0,1,117,4,0,1,117,3,
-0,1,117,5,1,1,117,3,0,1,117,5,1,21,117,4,
-1,1,117,5,1,1,117,3,0,37,117,7,1,1,117,3,
-0,205,167,0,0,191,167,1,0,17,155,5,0,35,155,7,
-0,53,155,9,0,0,64,102,36,0,66,149,36,51,4,149,
-36,0,88,129,48,27,1,202,36,0,0,0,0,27,1,198,
-36,0,0,0,0,19,22,24,42,0,23,20,23,23,31,0,
-0,4,19,53,21,49,21,48,2,42,19,60,22,73,0,23,
-20,61,23,31,117,117,2,12,90,21,88,21,48,0,0,22,
-22,29,30,0,23,23,23,23,31,125,117,3,7,55,21,51,
-21,48,0,0,22,60,25,73,0,23,23,61,23,31,117,117,
-2,12,57,21,59,21,48,0,0,25,2,27,16,0,23,26,
-3,23,31,31,144,149,25,18,27,32,0,23,26,19,23,31,
-31,159,149,25,34,27,50,0,23,26,35,23,31,31,190,149,
-25,52,27,67,0,23,26,53,23,31,31,174,149,25,69,27,
-78,0,23,26,70,23,31,31,207,149,25,27,27,36,0,23,
-26,28,23,31,31,217,149,25,44,27,53,0,23,26,45,23,
-31,31,227,149,0,0,0,236,78,164,35,0,0,0,0,0,
-0,0,0,4,253,117,0,0,164,35,61,119,161,117,0,46,
-0,0,4,10,118,0,0,164,35,80,119,161,117,0,32,0,
-0,4,36,118,0,0,164,35,90,123,161,117,0,19,0,0,
-4,23,118,0,0,164,35,96,119,161,117,0,50,0,0,4,
-49,118,0,0,164,35,74,121,161,117,0,25,0,0,3,169,
-117,0,0,30,36,0,0,0,0,0,0,0,0,3,190,117,
-0,0,30,36,0,0,0,0,0,0,0,0,3,211,117,0,
-0,30,36,0,0,0,0,0,0,0,0,3,232,117,0,0,
-30,36,0,0,0,0,0,0,0,0,1,62,118,0,0,30,
-36,0,0,0,0,0,0,0,0,2,75,118,0,0,30,36,
-0,0,0,0,0,0,0,0,1,62,118,0,0,66,36,0,
-0,0,0,0,0,0,0,2,75,118,0,0,66,36,0,0,
-0,0,0,0,0,0,232,36,0,0,6,1,58,88,118,103,
-118,118,118,148,118,133,118,163,118,164,39,218,36,6,0,0,
-178,118,208,118,193,118,223,118,238,118,253,118,166,45,15,47,
-2,0,0,12,119,27,119,20,14,37,126,112,136,60,163,61,
-5,0,0,96,120,9,120,229,119,66,120,81,120,0,0,134,
-166,48,1,5,216,166,23,2,5,24,167,23,23,7,85,167,
-30,22,32,100,167,30,23,32,126,167,30,25,32,143,167,30,
-29,0,25,151,63,29,9,107,151,48,29,24,113,151,48,29,
-49,128,151,48,29,72,142,151,48,13,14,228,167,112,15,14,
-88,130,112,15,20,116,130,126,13,14,14,168,112,14,14,65,
-168,112,16,14,88,130,112,16,20,116,130,126,22,21,25,30,
-0,23,23,22,23,31,111,120,2,8,92,21,94,21,48,0,
-0,3,244,119,0,0,245,62,0,0,0,0,0,0,0,0,
-24,59,27,72,0,23,25,60,23,31,117,117,2,12,90,21,
-88,21,48,0,0,3,24,120,0,0,245,62,0,0,0,0,
-0,0,0,0,21,59,24,72,0,23,22,60,23,31,117,117,
-2,12,57,21,59,21,48,0,0,21,59,22,72,0,23,22,
-60,23,31,80,172,1,12,57,21,59,21,48,0,0,1,48,
-121,0,0,245,62,0,0,0,0,0,0,0,0,2,61,121,
-0,0,245,62,0,0,0,0,0,0,0,0,3,208,119,0,
-0,17,63,0,0,0,0,0,0,0,0,171,167,0,0,181,
-167,1,0,11,26,24,130,112,14,26,88,130,112,14,32,116,
-130,126,20,14,50,129,112,20,14,117,129,126,21,14,100,129,
-112,21,14,127,129,126,21,24,132,129,126,20,24,138,129,112,
-20,24,181,129,126,20,37,191,129,126,21,24,172,129,112,21,
-26,196,129,126,5,8,82,168,112,7,8,131,168,112,7,12,
-28,169,126,8,8,193,168,112,10,8,201,168,112,10,11,41,
-169,126,11,8,4,169,112,15,8,88,130,112,15,14,116,130,
-126,11,32,43,132,112,11,45,81,132,126,12,28,57,132,112,
-12,46,84,132,126,14,25,125,130,112,14,35,155,130,126,11,
-24,1,130,112,14,26,88,130,112,14,32,116,130,126,11,26,
-232,129,112,14,26,88,130,112,14,32,116,130,126,11,26,202,
-129,112,14,26,88,130,112,14,32,116,130,126,26,27,28,36,
-0,23,27,28,23,31,31,217,149,26,44,28,53,0,23,27,
-45,23,31,31,227,149,104,64,203,65,8,0,0,232,121,247,
-121,6,122,21,122,36,122,51,122,202,121,217,121,0,0,47,
-161,48,5,2,129,161,71,7,8,212,161,30,9,2,232,161,
-71,11,8,37,162,30,14,8,56,162,30,17,8,86,162,30,
-20,8,109,162,30,21,8,133,162,30,23,8,152,162,30,29,
-0,171,162,63,29,9,253,162,48,29,72,3,163,48,20,14,
-199,128,112,21,14,250,128,112,10,16,73,164,71,11,16,122,
-164,71,11,48,161,164,79,12,16,167,164,71,13,16,215,164,
-71,15,18,5,165,71,1,62,118,0,0,47,67,0,0,0,
-0,0,0,0,0,2,75,118,0,0,47,67,0,0,0,0,
-0,0,0,0,3,66,122,0,0,47,67,0,0,0,0,0,
-0,0,0,3,87,122,0,0,47,67,0,0,0,0,0,0,
-0,0,3,108,122,0,0,47,67,0,0,0,0,0,0,0,
-0,3,129,122,0,0,47,67,0,0,0,0,0,0,0,0,
-3,150,122,0,0,47,67,0,0,0,0,0,0,0,0,3,
-171,122,0,0,47,67,0,0,0,0,0,0,0,0,6,36,
-9,45,0,23,7,37,23,31,192,122,2,8,113,21,99,21,
-48,0,0,10,36,13,49,0,23,11,37,23,31,117,117,2,
-12,101,21,103,21,48,246,64,13,36,27,44,0,23,14,37,
-23,31,212,122,15,5,105,21,107,21,48,0,0,16,36,23,
-48,0,23,17,37,23,31,16,123,15,10,109,21,111,21,48,
-0,0,19,36,22,49,0,23,20,37,23,31,192,122,2,12,
-115,21,117,21,48,0,0,22,36,25,49,0,23,23,38,23,
-31,80,172,1,11,119,21,121,21,48,0,0,171,167,0,0,
-181,167,1,0,29,161,0,0,38,161,1,0,29,161,0,0,
-173,160,1,0,180,160,2,0,187,160,3,0,194,160,4,0,
-201,160,5,0,208,160,6,0,215,160,7,0,222,160,8,0,
-229,160,9,0,236,160,10,0,243,160,11,0,250,160,12,0,
-1,161,13,0,8,161,14,0,15,161,15,0,101,160,1,0,
-113,160,2,0,125,160,3,0,137,160,4,0,149,160,5,0,
-161,160,6,0,5,8,11,163,112,7,8,58,163,112,7,66,
-122,163,126,8,8,128,163,112,8,55,191,163,126,9,8,196,
-163,112,11,8,239,163,126,12,8,32,164,126,15,8,88,130,
-112,15,14,116,130,126,76,67,78,69,2,0,0,161,123,176,
-123,0,0,208,157,48,2,2,34,158,23,3,2,108,158,23,
-29,0,178,158,63,29,9,4,159,48,29,72,10,159,48,20,
-14,199,128,112,21,14,250,128,112,9,12,246,151,112,10,12,
-46,152,112,11,12,88,130,112,11,18,116,130,126,1,62,118,
-0,0,214,70,0,0,0,0,0,0,0,0,2,75,118,0,
-0,214,70,0,0,0,0,0,0,0,0,5,8,18,159,112,
-7,8,67,159,112,8,8,128,159,112,9,8,193,159,112,9,
-23,243,159,126,9,35,253,159,126,11,8,9,160,112,12,8,
-72,160,112,15,8,88,130,112,15,14,116,130,126,24,0,0,
-0,28,54,242,133,56,29,59,240,134,48,28,54,242,133,48,
-29,59,227,134,63,29,71,144,134,48,29,59,240,134,48,29,
-59,223,134,63,29,61,224,133,48,20,14,73,127,112,21,14,
-116,127,112,20,14,162,127,112,21,14,116,127,112,9,17,223,
-131,112,10,28,11,132,112,9,53,35,132,126,9,60,35,132,
-126,10,46,38,132,126,12,25,125,130,112,12,35,155,130,126,
-20,14,94,126,112,51,119,97,114,101,32,65,84,65,32,82,
-65,73,68,32,67,111,110,116,114,111,108,108,101,114,32,58,
-32,69,115,99,97,108,97,100,101,32,32,0,0,66,73,79,
-83,58,32,0,0,32,32,70,105,114,109,119,97,114,101,58,
-32,0,0,85,110,105,116,32,0,0,73,110,99,111,109,112,
-108,101,116,101,0,0,72,111,116,32,83,112,97,114,101,32,
-32,32,32,32,32,32,32,0,0,83,105,110,103,108,101,32,
-68,105,115,107,32,0,0,32,32,32,32,74,66,79,68,32,
-32,32,32,0,0,32,32,32,32,32,32,32,32,32,32,32,
-32,0,0,32,32,32,32,32,32,32,32,32,32,32,32,0,
-0,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,32,0,0,32,0,0,32,0,0,32,0,0,85,110,99,
-111,110,118,101,114,116,101,100,32,68,67,66,0,0,85,110,
-115,117,112,112,111,114,116,101,100,32,68,67,66,0,0,68,
-67,66,32,100,97,116,97,32,99,104,101,99,107,0,0,68,
-67,66,32,114,101,97,100,32,102,97,105,108,117,114,101,0,
-0,68,67,66,32,114,101,97,100,32,116,105,109,101,111,117,
-116,0,0,78,111,116,32,115,117,112,112,111,114,116,101,100,
-0,0,45,32,0,0,80,111,114,116,32,0,0,32,32,80,
-111,114,116,32,0,0,85,110,105,116,32,0,0,32,45,32,
-0,0,32,32,0,0,32,32,32,32,32,32,32,32,32,32,
-0,0,32,83,117,98,117,110,105,116,32,32,0,0,70,111,
-108,108,111,119,105,110,103,32,100,114,105,118,101,115,32,119,
-105,108,108,32,110,111,116,32,98,101,32,101,120,112,111,114,
-116,101,100,32,116,111,32,79,83,58,0,0,83,108,111,116,
-32,35,58,32,0,0,80,114,101,115,115,32,112,97,103,101,
-32,100,111,119,110,32,107,101,121,32,116,111,32,110,101,120,
-116,32,112,97,103,101,44,32,112,97,103,101,32,117,112,32,
-116,111,32,102,105,114,115,116,32,112,97,103,101,46,46,0,
-0,78,101,119,32,117,110,105,116,115,32,99,97,110,110,111,
-116,32,98,101,32,114,101,109,111,118,101,100,46,32,80,114,
-101,115,115,32,97,110,121,32,107,101,121,32,116,111,32,99,
-111,110,116,105,110,117,101,46,0,0,85,110,105,116,32,105,
-110,105,116,105,97,108,105,122,97,116,105,111,110,32,102,97,
-105,108,101,100,46,32,80,114,101,115,115,32,97,110,121,32,
+21,52,56,142,126,3,10,83,152,112,5,10,129,152,112,6,
+10,190,152,112,6,67,151,153,126,8,10,252,152,112,9,10,
+56,153,112,10,10,116,153,112,10,34,156,153,126,17,10,88,
+130,112,17,16,116,130,126,5,8,114,156,112,7,8,162,156,
+112,8,8,227,156,112,9,8,29,157,112,9,16,197,157,126,
+11,8,42,157,112,12,8,102,157,112,13,8,162,157,112,13,
+32,202,157,126,15,8,88,130,112,15,14,116,130,126,9,16,
+150,151,112,10,16,200,151,112,12,16,88,130,112,12,22,116,
+130,126,2,3,160,130,112,3,3,231,130,112,4,3,44,131,
+112,6,3,60,131,126,23,3,109,131,112,20,15,89,132,112,
+21,15,124,132,112,20,15,142,132,112,21,15,194,132,112,20,
+14,150,126,112,20,15,215,127,112,20,22,44,128,126,21,15,
+10,128,112,21,37,52,128,126,20,14,59,128,112,20,25,147,
+128,126,21,14,113,128,112,21,36,154,128,126,20,22,161,128,
+7,117,154,2,0,96,154,0,0,75,154,4,0,159,154,5,
+0,138,154,7,0,180,154,82,0,96,154,0,0,75,154,4,
+0,159,154,5,0,180,154,83,0,96,154,0,0,75,154,4,
+0,159,154,5,0,138,154,7,0,201,154,82,0,222,154,83,
+0,243,154,84,0,5,117,1,0,253,116,3,0,1,117,3,
+0,1,117,4,0,1,117,3,0,1,117,5,1,1,117,3,
+0,1,117,5,1,21,117,4,1,1,117,5,1,1,117,3,
+0,37,117,7,1,1,117,3,0,205,167,0,0,191,167,1,
+0,17,155,5,0,35,155,7,0,53,155,9,0,0,64,102,
+36,0,66,149,36,51,4,149,36,0,88,129,48,27,1,202,
+36,0,0,0,0,27,1,198,36,0,0,0,0,19,22,24,
+42,0,23,20,23,23,31,0,0,4,19,53,21,49,21,48,
+2,42,19,60,22,73,0,23,20,61,23,31,117,117,2,12,
+90,21,88,21,48,0,0,22,22,29,30,0,23,23,23,23,
+31,125,117,3,7,55,21,51,21,48,0,0,22,60,25,73,
+0,23,23,61,23,31,117,117,2,12,57,21,59,21,48,0,
+0,25,2,27,16,0,23,26,3,23,31,31,144,149,25,18,
+27,32,0,23,26,19,23,31,31,159,149,25,34,27,50,0,
+23,26,35,23,31,31,190,149,25,52,27,67,0,23,26,53,
+23,31,31,174,149,25,69,27,78,0,23,26,70,23,31,31,
+207,149,25,27,27,36,0,23,26,28,23,31,31,217,149,25,
+44,27,53,0,23,26,45,23,31,31,227,149,0,0,0,236,
+78,164,35,0,0,0,0,0,0,0,0,4,253,117,0,0,
+164,35,61,119,161,117,0,46,0,0,4,10,118,0,0,164,
+35,80,119,161,117,0,32,0,0,4,36,118,0,0,164,35,
+90,123,161,117,0,19,0,0,4,23,118,0,0,164,35,96,
+119,161,117,0,50,0,0,4,49,118,0,0,164,35,74,121,
+161,117,0,25,0,0,3,169,117,0,0,30,36,0,0,0,
+0,0,0,0,0,3,190,117,0,0,30,36,0,0,0,0,
+0,0,0,0,3,211,117,0,0,30,36,0,0,0,0,0,
+0,0,0,3,232,117,0,0,30,36,0,0,0,0,0,0,
+0,0,1,62,118,0,0,30,36,0,0,0,0,0,0,0,
+0,2,75,118,0,0,30,36,0,0,0,0,0,0,0,0,
+1,62,118,0,0,66,36,0,0,0,0,0,0,0,0,2,
+75,118,0,0,66,36,0,0,0,0,0,0,0,0,232,36,
+0,0,6,1,58,88,118,103,118,118,118,148,118,133,118,163,
+118,164,39,218,36,6,0,0,178,118,208,118,193,118,223,118,
+238,118,253,118,166,45,15,47,2,0,0,12,119,27,119,20,
+14,37,126,112,136,60,163,61,5,0,0,96,120,9,120,229,
+119,66,120,81,120,0,0,134,166,48,1,5,216,166,23,2,
+5,24,167,23,23,7,85,167,30,22,32,100,167,30,23,32,
+126,167,30,25,32,143,167,30,29,0,25,151,63,29,9,107,
+151,48,29,24,113,151,48,29,49,128,151,48,29,72,142,151,
+48,13,14,228,167,112,15,14,88,130,112,15,20,116,130,126,
+13,14,14,168,112,14,14,65,168,112,16,14,88,130,112,16,
+20,116,130,126,22,21,25,30,0,23,23,22,23,31,111,120,
+2,8,92,21,94,21,48,0,0,3,244,119,0,0,245,62,
+0,0,0,0,0,0,0,0,24,59,27,72,0,23,25,60,
+23,31,117,117,2,12,90,21,88,21,48,0,0,3,24,120,
+0,0,245,62,0,0,0,0,0,0,0,0,21,59,24,72,
+0,23,22,60,23,31,117,117,2,12,57,21,59,21,48,0,
+0,21,59,22,72,0,23,22,60,23,31,80,172,1,12,57,
+21,59,21,48,0,0,1,48,121,0,0,245,62,0,0,0,
+0,0,0,0,0,2,61,121,0,0,245,62,0,0,0,0,
+0,0,0,0,3,208,119,0,0,17,63,0,0,0,0,0,
+0,0,0,171,167,0,0,181,167,1,0,11,26,24,130,112,
+14,26,88,130,112,14,32,116,130,126,20,14,50,129,112,20,
+14,117,129,126,21,14,100,129,112,21,14,127,129,126,21,24,
+132,129,126,20,24,138,129,112,20,24,181,129,126,20,37,191,
+129,126,21,24,172,129,112,21,26,196,129,126,5,8,82,168,
+112,7,8,131,168,112,7,12,28,169,126,8,8,193,168,112,
+10,8,201,168,112,10,11,41,169,126,11,8,4,169,112,15,
+8,88,130,112,15,14,116,130,126,11,32,43,132,112,11,45,
+81,132,126,12,28,57,132,112,12,46,84,132,126,14,25,125,
+130,112,14,35,155,130,126,11,24,1,130,112,14,26,88,130,
+112,14,32,116,130,126,11,26,232,129,112,14,26,88,130,112,
+14,32,116,130,126,11,26,202,129,112,14,26,88,130,112,14,
+32,116,130,126,26,27,28,36,0,23,27,28,23,31,31,217,
+149,26,44,28,53,0,23,27,45,23,31,31,227,149,104,64,
+203,65,8,0,0,232,121,247,121,6,122,21,122,36,122,51,
+122,202,121,217,121,0,0,47,161,48,5,2,129,161,71,7,
+8,212,161,30,9,2,232,161,71,11,8,37,162,30,14,8,
+56,162,30,17,8,86,162,30,20,8,109,162,30,21,8,133,
+162,30,23,8,152,162,30,29,0,171,162,63,29,9,253,162,
+48,29,72,3,163,48,20,14,199,128,112,21,14,250,128,112,
+10,16,73,164,71,11,16,122,164,71,11,48,161,164,79,12,
+16,167,164,71,13,16,215,164,71,15,18,5,165,71,1,62,
+118,0,0,47,67,0,0,0,0,0,0,0,0,2,75,118,
+0,0,47,67,0,0,0,0,0,0,0,0,3,66,122,0,
+0,47,67,0,0,0,0,0,0,0,0,3,87,122,0,0,
+47,67,0,0,0,0,0,0,0,0,3,108,122,0,0,47,
+67,0,0,0,0,0,0,0,0,3,129,122,0,0,47,67,
+0,0,0,0,0,0,0,0,3,150,122,0,0,47,67,0,
+0,0,0,0,0,0,0,3,171,122,0,0,47,67,0,0,
+0,0,0,0,0,0,6,36,9,45,0,23,7,37,23,31,
+192,122,2,8,113,21,99,21,48,0,0,10,36,13,49,0,
+23,11,37,23,31,117,117,2,12,101,21,103,21,48,246,64,
+13,36,27,44,0,23,14,37,23,31,212,122,15,5,105,21,
+107,21,48,0,0,16,36,23,48,0,23,17,37,23,31,16,
+123,15,10,109,21,111,21,48,0,0,19,36,22,49,0,23,
+20,37,23,31,192,122,2,12,115,21,117,21,48,0,0,22,
+36,25,49,0,23,23,38,23,31,80,172,1,11,119,21,121,
+21,48,0,0,171,167,0,0,181,167,1,0,29,161,0,0,
+38,161,1,0,29,161,0,0,173,160,1,0,180,160,2,0,
+187,160,3,0,194,160,4,0,201,160,5,0,208,160,6,0,
+215,160,7,0,222,160,8,0,229,160,9,0,236,160,10,0,
+243,160,11,0,250,160,12,0,1,161,13,0,8,161,14,0,
+15,161,15,0,101,160,1,0,113,160,2,0,125,160,3,0,
+137,160,4,0,149,160,5,0,161,160,6,0,5,8,11,163,
+112,7,8,58,163,112,7,66,122,163,126,8,8,128,163,112,
+8,55,191,163,126,9,8,196,163,112,11,8,239,163,126,12,
+8,32,164,126,15,8,88,130,112,15,14,116,130,126,76,67,
+78,69,2,0,0,161,123,176,123,0,0,208,157,48,2,2,
+34,158,23,3,2,108,158,23,29,0,178,158,63,29,9,4,
+159,48,29,72,10,159,48,20,14,199,128,112,21,14,250,128,
+112,9,12,246,151,112,10,12,46,152,112,11,12,88,130,112,
+11,18,116,130,126,1,62,118,0,0,214,70,0,0,0,0,
+0,0,0,0,2,75,118,0,0,214,70,0,0,0,0,0,
+0,0,0,5,8,18,159,112,7,8,67,159,112,8,8,128,
+159,112,9,8,193,159,112,9,23,243,159,126,9,35,253,159,
+126,11,8,9,160,112,12,8,72,160,112,15,8,88,130,112,
+15,14,116,130,126,24,0,0,0,28,54,242,133,56,29,59,
+240,134,48,28,54,242,133,48,29,59,227,134,63,29,71,144,
+134,48,29,59,240,134,48,29,59,223,134,63,29,61,224,133,
+48,20,14,73,127,112,21,14,116,127,112,20,14,162,127,112,
+21,14,116,127,112,9,17,223,131,112,10,28,11,132,112,9,
+53,35,132,126,9,60,35,132,126,10,46,38,132,126,12,25,
+125,130,112,12,35,155,130,126,20,14,94,126,112,51,119,97,
+114,101,32,65,84,65,32,82,65,73,68,32,67,111,110,116,
+114,111,108,108,101,114,32,58,32,69,115,99,97,108,97,100,
+101,32,32,0,0,66,73,79,83,58,32,0,0,32,32,70,
+105,114,109,119,97,114,101,58,32,0,0,85,110,105,116,32,
+0,0,73,110,99,111,109,112,108,101,116,101,0,0,72,111,
+116,32,83,112,97,114,101,32,32,32,32,32,32,32,32,0,
+0,83,105,110,103,108,101,32,68,105,115,107,32,0,0,32,
+32,32,32,74,66,79,68,32,32,32,32,0,0,32,32,32,
+32,32,32,32,32,32,32,32,32,0,0,32,32,32,32,32,
+32,32,32,32,32,32,32,0,0,32,32,32,32,32,32,32,
+32,32,32,32,32,32,32,32,32,32,0,0,32,0,0,32,
+0,0,32,0,0,85,110,99,111,110,118,101,114,116,101,100,
+32,68,67,66,0,0,85,110,115,117,112,112,111,114,116,101,
+100,32,68,67,66,0,0,68,67,66,32,100,97,116,97,32,
+99,104,101,99,107,0,0,68,67,66,32,114,101,97,100,32,
+102,97,105,108,117,114,101,0,0,68,67,66,32,114,101,97,
+100,32,116,105,109,101,111,117,116,0,0,78,111,116,32,115,
+117,112,112,111,114,116,101,100,0,0,45,32,0,0,80,111,
+114,116,32,0,0,32,32,80,111,114,116,32,0,0,85,110,
+105,116,32,0,0,32,45,32,0,0,32,32,0,0,32,32,
+32,32,32,32,32,32,32,32,0,0,32,83,117,98,117,110,
+105,116,32,32,0,0,70,111,108,108,111,119,105,110,103,32,
+100,114,105,118,101,115,32,119,105,108,108,32,110,111,116,32,
+98,101,32,101,120,112,111,114,116,101,100,32,116,111,32,79,
+83,58,0,0,83,108,111,116,32,35,58,32,0,0,80,114,
+101,115,115,32,112,97,103,101,32,100,111,119,110,32,107,101,
+121,32,116,111,32,110,101,120,116,32,112,97,103,101,44,32,
+112,97,103,101,32,117,112,32,116,111,32,102,105,114,115,116,
+32,112,97,103,101,46,46,0,0,78,101,119,32,117,110,105,
+116,115,32,99,97,110,110,111,116,32,98,101,32,114,101,109,
+111,118,101,100,46,32,80,114,101,115,115,32,97,110,121,32,
 107,101,121,32,116,111,32,99,111,110,116,105,110,117,101,46,
-0,0,85,110,100,111,32,97,108,108,32,99,104,97,110,103,
-101,115,32,97,110,100,32,114,101,115,116,111,114,101,32,105,
-110,105,116,105,97,108,32,115,101,116,116,105,110,103,115,63,
-32,91,89,47,78,93,32,0,0,68,111,32,121,111,117,32,
-119,97,110,116,32,116,111,32,108,101,97,118,101,32,99,111,
-110,102,105,103,117,114,97,116,105,111,110,32,117,116,105,108,
-105,116,121,63,32,91,89,47,78,93,32,0,0,84,104,101,
-114,101,32,105,115,32,110,111,32,114,101,115,112,111,110,115,
-101,32,102,114,111,109,32,116,104,101,32,102,105,114,109,119,
-97,114,101,46,0,0,80,108,101,97,115,101,32,104,105,116,
-32,97,32,107,101,121,32,116,111,32,99,111,110,116,105,110,
-117,101,46,0,0,84,104,101,114,101,32,105,115,32,110,111,
-32,114,101,100,117,110,100,97,110,116,32,97,114,114,97,121,
-32,111,110,32,116,104,101,32,98,111,97,114,100,46,0,0,
-68,111,32,121,111,117,32,115,116,105,108,108,32,119,97,110,
-116,32,116,111,32,109,97,107,101,32,97,32,104,111,116,32,
-115,112,97,114,101,63,32,91,89,47,78,93,0,0,84,104,
-101,32,100,114,105,118,101,32,121,111,117,32,115,101,108,101,
-99,116,32,105,115,32,116,111,32,115,109,97,108,108,32,116,
-111,32,98,101,32,97,32,104,111,116,32,115,112,97,114,101,
-46,0,0,83,101,108,101,99,116,32,100,114,105,118,101,115,
-32,102,105,114,115,116,32,98,121,32,109,111,118,105,110,103,
-32,116,104,101,32,99,117,114,115,111,114,32,111,118,101,114,
-32,116,104,101,0,0,100,114,105,118,101,32,97,110,100,32,
-104,105,116,116,105,110,103,32,116,104,101,32,69,110,116,101,
-114,32,107,101,121,46,0,0,100,114,105,118,101,115,0,0,
-69,110,116,101,114,0,0,83,101,108,101,99,116,32,116,104,
-101,32,97,114,114,97,121,32,102,105,114,115,116,32,98,121,
-32,109,111,118,105,110,103,32,116,104,101,32,99,117,114,115,
-111,114,32,111,118,101,114,32,116,104,101,0,0,97,114,114,
-97,121,32,97,110,100,32,104,105,116,116,105,110,103,32,116,
-104,101,32,69,110,116,101,114,32,107,101,121,46,0,0,97,
-114,114,97,121,0,0,69,110,116,101,114,0,0,32,32,32,
-32,32,32,32,85,112,100,97,116,105,110,103,32,67,111,110,
-102,105,103,117,114,97,116,105,111,110,46,46,46,32,32,32,
-32,0,0,83,101,108,101,99,116,32,49,32,100,101,103,114,
-97,100,101,100,32,97,114,114,97,121,46,32,73,102,32,116,
-104,101,32,100,101,103,114,97,100,101,100,32,97,114,114,97,
-121,32,105,115,0,0,109,105,115,115,105,110,103,32,100,114,
-105,118,101,115,44,32,116,104,101,110,32,97,108,115,111,32,
-115,101,108,101,99,116,32,102,114,111,109,32,97,118,97,105,
-108,97,98,108,101,32,100,114,105,118,101,46,0,0,77,97,
-105,110,116,97,105,110,32,99,97,110,32,111,110,108,121,32,
-98,101,32,100,111,110,101,32,111,110,101,32,97,116,32,97,
-32,116,105,109,101,46,32,32,83,101,108,101,99,116,0,0,
-111,110,101,32,97,114,114,97,121,32,111,110,108,121,46,0,
-0,77,97,105,110,116,97,105,110,0,0,111,110,101,0,0,
-111,110,108,121,0,0,77,97,105,110,116,97,105,110,32,99,
-97,110,32,110,111,116,32,98,101,32,112,101,114,102,111,114,
-109,101,100,32,111,110,0,0,97,32,74,66,79,68,46,0,
-0,77,97,105,110,116,97,105,110,0,0,110,111,116,0,0,
-74,66,79,68,0,0,84,104,101,114,101,32,105,115,32,97,
-32,109,105,115,99,111,109,112,97,114,101,32,101,114,114,111,
-114,46,0,0,84,104,101,32,117,110,105,116,32,104,97,115,
-32,73,47,79,32,101,114,114,111,114,46,0,0,67,111,114,
-114,101,99,116,101,100,32,32,32,32,32,101,114,114,111,114,
-115,46,0,0,84,104,101,114,101,32,119,101,114,101,32,110,
-111,32,109,105,115,99,111,109,112,97,114,101,115,46,0,0,
-32,79,82,80,72,65,78,32,32,32,32,32,32,32,32,32,
-32,32,32,32,74,66,79,68,32,32,32,78,79,32,68,82,
-73,86,69,32,80,114,101,115,115,32,97,110,121,32,107,101,
-121,32,116,111,32,99,111,110,116,105,110,117,101,46,0,0,
-97,110,121,32,107,101,121,0,0,80,114,101,115,115,32,116,
-104,101,32,101,115,99,32,107,101,121,32,116,111,32,99,97,
-110,99,101,108,46,0,0,101,115,99,0,0,67,114,101,97,
-116,105,110,103,32,111,114,32,100,101,115,116,114,111,121,105,
-110,103,32,97,114,114,97,121,115,32,119,105,108,108,32,100,
-101,115,116,114,111,121,32,97,108,108,32,101,120,105,115,116,
-105,110,103,32,100,97,116,97,32,111,110,32,116,104,101,105,
-114,0,0,109,101,109,98,101,114,32,100,105,115,107,32,100,
-114,105,118,101,115,46,32,85,115,105,110,103,32,97,32,100,
-114,105,118,101,32,102,111,114,32,97,32,114,101,98,117,105,
-108,100,32,119,105,108,108,32,111,118,101,114,119,114,105,116,
-101,32,100,97,116,97,0,0,111,110,32,116,104,97,116,32,
-100,114,105,118,101,46,0,0,68,97,116,97,32,111,110,32,
-116,104,101,32,102,111,108,108,111,119,105,110,103,32,100,114,
-105,118,101,115,32,119,105,108,108,32,98,101,32,100,101,115,
-116,114,111,121,101,100,58,0,0,83,97,118,101,32,99,111,
-110,102,105,103,117,114,97,116,105,111,110,32,97,110,100,32,
-101,120,105,116,63,32,91,89,47,78,93,0,0,80,114,111,
-102,105,108,105,110,103,32,32,65,114,114,97,121,32,85,110,
-105,116,0,0,80,101,114,99,101,110,116,97,103,101,32,100,
-111,110,101,32,58,32,32,32,32,37,0,0,32,0,0,32,
-32,32,0,0,73,110,105,116,32,82,65,73,68,53,32,65,
-114,114,97,121,32,85,110,105,116,0,0,67,108,101,97,114,
-32,112,114,101,118,105,111,117,115,32,100,105,115,107,32,99,
-111,110,116,101,110,116,32,111,110,32,85,110,105,116,32,32,
-32,83,108,111,116,0,0,80,101,114,99,101,110,116,97,103,
-101,32,100,111,110,101,32,58,32,32,32,32,37,0,0,32,
-0,0,32,32,32,0,0,86,101,114,105,102,121,32,85,110,
-105,116,32,0,0,80,101,114,99,101,110,116,97,103,101,32,
-100,111,110,101,32,58,32,32,32,32,37,0,0,32,0,0,
-32,32,32,0,0,68,111,32,121,111,117,32,119,97,110,116,
-32,116,111,32,115,97,118,101,32,99,111,110,102,105,103,117,
-114,97,116,105,111,110,0,0,97,110,100,32,101,120,105,116,
-63,32,91,89,47,78,93,32,0,0,89,111,117,32,109,97,
-100,101,32,99,104,97,110,103,101,32,116,111,32,97,114,114,
-97,121,32,97,116,116,114,105,98,117,116,101,44,32,117,110,
-105,116,32,115,101,113,117,101,110,99,101,44,0,0,97,110,
-100,47,111,114,32,99,111,110,116,114,111,108,108,101,114,32,
-112,111,108,105,99,121,46,32,32,83,97,118,101,32,97,110,
-100,32,101,120,105,116,63,32,91,89,47,78,93,32,0,0,
+0,0,85,110,105,116,32,105,110,105,116,105,97,108,105,122,
+97,116,105,111,110,32,102,97,105,108,101,100,46,32,80,114,
+101,115,115,32,97,110,121,32,107,101,121,32,116,111,32,99,
+111,110,116,105,110,117,101,46,0,0,85,110,100,111,32,97,
+108,108,32,99,104,97,110,103,101,115,32,97,110,100,32,114,
+101,115,116,111,114,101,32,105,110,105,116,105,97,108,32,115,
+101,116,116,105,110,103,115,63,32,91,89,47,78,93,32,0,
+0,68,111,32,121,111,117,32,119,97,110,116,32,116,111,32,
+108,101,97,118,101,32,99,111,110,102,105,103,117,114,97,116,
+105,111,110,32,117,116,105,108,105,116,121,63,32,91,89,47,
+78,93,32,0,0,84,104,101,114,101,32,105,115,32,110,111,
+32,114,101,115,112,111,110,115,101,32,102,114,111,109,32,116,
+104,101,32,102,105,114,109,119,97,114,101,46,0,0,80,108,
+101,97,115,101,32,104,105,116,32,97,32,107,101,121,32,116,
+111,32,99,111,110,116,105,110,117,101,46,0,0,84,104,101,
+114,101,32,105,115,32,110,111,32,114,101,100,117,110,100,97,
+110,116,32,97,114,114,97,121,32,111,110,32,116,104,101,32,
+98,111,97,114,100,46,0,0,68,111,32,121,111,117,32,115,
+116,105,108,108,32,119,97,110,116,32,116,111,32,109,97,107,
+101,32,97,32,104,111,116,32,115,112,97,114,101,63,32,91,
+89,47,78,93,0,0,84,104,101,32,100,114,105,118,101,32,
+121,111,117,32,115,101,108,101,99,116,32,105,115,32,116,111,
+32,115,109,97,108,108,32,116,111,32,98,101,32,97,32,104,
+111,116,32,115,112,97,114,101,46,0,0,83,101,108,101,99,
+116,32,100,114,105,118,101,115,32,102,105,114,115,116,32,98,
+121,32,109,111,118,105,110,103,32,116,104,101,32,99,117,114,
+115,111,114,32,111,118,101,114,32,116,104,101,0,0,100,114,
+105,118,101,32,97,110,100,32,104,105,116,116,105,110,103,32,
+116,104,101,32,69,110,116,101,114,32,107,101,121,46,0,0,
+100,114,105,118,101,115,0,0,69,110,116,101,114,0,0,83,
+101,108,101,99,116,32,116,104,101,32,97,114,114,97,121,32,
+102,105,114,115,116,32,98,121,32,109,111,118,105,110,103,32,
+116,104,101,32,99,117,114,115,111,114,32,111,118,101,114,32,
+116,104,101,0,0,97,114,114,97,121,32,97,110,100,32,104,
+105,116,116,105,110,103,32,116,104,101,32,69,110,116,101,114,
+32,107,101,121,46,0,0,97,114,114,97,121,0,0,69,110,
+116,101,114,0,0,32,32,32,32,32,32,32,85,112,100,97,
+116,105,110,103,32,67,111,110,102,105,103,117,114,97,116,105,
+111,110,46,46,46,32,32,32,32,0,0,83,101,108,101,99,
+116,32,49,32,100,101,103,114,97,100,101,100,32,97,114,114,
+97,121,46,32,73,102,32,116,104,101,32,100,101,103,114,97,
+100,101,100,32,97,114,114,97,121,32,105,115,0,0,109,105,
+115,115,105,110,103,32,100,114,105,118,101,115,44,32,116,104,
+101,110,32,97,108,115,111,32,115,101,108,101,99,116,32,102,
+114,111,109,32,97,118,97,105,108,97,98,108,101,32,100,114,
+105,118,101,46,0,0,77,97,105,110,116,97,105,110,32,99,
+97,110,32,111,110,108,121,32,98,101,32,100,111,110,101,32,
+111,110,101,32,97,116,32,97,32,116,105,109,101,46,32,32,
+83,101,108,101,99,116,0,0,111,110,101,32,97,114,114,97,
+121,32,111,110,108,121,46,0,0,77,97,105,110,116,97,105,
+110,0,0,111,110,101,0,0,111,110,108,121,0,0,77,97,
+105,110,116,97,105,110,32,99,97,110,32,110,111,116,32,98,
+101,32,112,101,114,102,111,114,109,101,100,32,111,110,0,0,
+97,32,74,66,79,68,46,0,0,77,97,105,110,116,97,105,
+110,0,0,110,111,116,0,0,74,66,79,68,0,0,84,104,
+101,114,101,32,105,115,32,97,32,109,105,115,99,111,109,112,
+97,114,101,32,101,114,114,111,114,46,0,0,84,104,101,32,
+117,110,105,116,32,104,97,115,32,73,47,79,32,101,114,114,
+111,114,46,0,0,67,111,114,114,101,99,116,101,100,32,32,
+32,32,32,101,114,114,111,114,115,46,0,0,84,104,101,114,
+101,32,119,101,114,101,32,110,111,32,109,105,115,99,111,109,
+112,97,114,101,115,46,0,0,32,79,82,80,72,65,78,32,
+32,32,32,32,32,32,32,32,32,32,32,32,74,66,79,68,
+32,32,32,78,79,32,68,82,73,86,69,32,80,114,101,115,
+115,32,97,110,121,32,107,101,121,32,116,111,32,99,111,110,
+116,105,110,117,101,46,0,0,97,110,121,32,107,101,121,0,
+0,80,114,101,115,115,32,116,104,101,32,101,115,99,32,107,
+101,121,32,116,111,32,99,97,110,99,101,108,46,0,0,101,
+115,99,0,0,67,114,101,97,116,105,110,103,32,111,114,32,
+100,101,115,116,114,111,121,105,110,103,32,97,114,114,97,121,
+115,32,119,105,108,108,32,100,101,115,116,114,111,121,32,97,
+108,108,32,101,120,105,115,116,105,110,103,32,100,97,116,97,
+32,111,110,32,116,104,101,105,114,0,0,109,101,109,98,101,
+114,32,100,105,115,107,32,100,114,105,118,101,115,46,32,85,
+115,105,110,103,32,97,32,100,114,105,118,101,32,102,111,114,
+32,97,32,114,101,98,117,105,108,100,32,119,105,108,108,32,
+111,118,101,114,119,114,105,116,101,32,100,97,116,97,0,0,
+111,110,32,116,104,97,116,32,100,114,105,118,101,46,0,0,
+68,97,116,97,32,111,110,32,116,104,101,32,102,111,108,108,
+111,119,105,110,103,32,100,114,105,118,101,115,32,119,105,108,
+108,32,98,101,32,100,101,115,116,114,111,121,101,100,58,0,
+0,83,97,118,101,32,99,111,110,102,105,103,117,114,97,116,
+105,111,110,32,97,110,100,32,101,120,105,116,63,32,91,89,
+47,78,93,0,0,80,114,111,102,105,108,105,110,103,32,32,
+65,114,114,97,121,32,85,110,105,116,0,0,80,101,114,99,
+101,110,116,97,103,101,32,100,111,110,101,32,58,32,32,32,
+32,37,0,0,32,0,0,32,32,32,0,0,73,110,105,116,
+32,82,65,73,68,53,32,65,114,114,97,121,32,85,110,105,
+116,0,0,67,108,101,97,114,32,112,114,101,118,105,111,117,
+115,32,100,105,115,107,32,99,111,110,116,101,110,116,32,111,
+110,32,85,110,105,116,32,32,32,83,108,111,116,0,0,80,
+101,114,99,101,110,116,97,103,101,32,100,111,110,101,32,58,
+32,32,32,32,37,0,0,32,0,0,32,32,32,0,0,86,
+101,114,105,102,121,32,85,110,105,116,32,0,0,80,101,114,
+99,101,110,116,97,103,101,32,100,111,110,101,32,58,32,32,
+32,32,37,0,0,32,0,0,32,32,32,0,0,68,111,32,
+121,111,117,32,119,97,110,116,32,116,111,32,115,97,118,101,
+32,99,111,110,102,105,103,117,114,97,116,105,111,110,0,0,
+97,110,100,32,101,120,105,116,63,32,91,89,47,78,93,32,
+0,0,89,111,117,32,109,97,100,101,32,99,104,97,110,103,
+101,32,116,111,32,97,114,114,97,121,32,97,116,116,114,105,
+98,117,116,101,44,32,117,110,105,116,32,115,101,113,117,101,
+110,99,101,44,0,0,97,110,100,47,111,114,32,99,111,110,
+116,114,111,108,108,101,114,32,112,111,108,105,99,121,46,32,
+32,83,97,118,101,32,97,110,100,32,101,120,105,116,63,32,
+91,89,47,78,93,32,0,0,32,32,32,32,32,32,32,32,
 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,32,32,32,32,32,32,32,32,32,32,51,119,97,114,101,
-32,66,73,79,83,32,109,97,110,97,103,101,114,32,40,115,
-108,111,116,32,32,32,41,32,32,32,32,32,32,32,32,32,
-32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,0,
-0,65,118,97,105,108,97,98,108,101,32,68,114,105,118,101,
-115,58,0,0,69,120,112,111,114,116,97,98,108,101,32,85,
-110,105,116,115,58,0,0,32,65,108,116,45,70,49,32,72,
-101,108,112,32,32,18,29,32,80,114,101,118,105,111,117,115,
-47,78,101,120,116,32,32,65,108,116,45,97,32,83,101,108,
-32,97,108,108,32,100,114,118,32,32,32,114,32,82,101,109,
-111,118,101,32,32,69,110,116,101,114,32,83,101,108,101,99,
-116,47,68,101,115,101,108,0,0,72,101,108,112,0,0,80,
-114,101,118,105,111,117,115,47,78,101,120,116,0,0,83,101,
-108,101,99,116,47,68,101,115,101,108,0,0,84,111,103,103,
-108,101,32,72,111,116,32,83,112,97,114,101,0,0,82,101,
-109,111,118,101,0,0,83,101,108,32,97,108,108,32,100,114,
-118,0,0,32,32,70,54,32,82,101,115,116,111,114,101,32,
-73,110,105,116,105,97,108,32,86,97,108,117,101,115,32,32,
-69,115,99,32,66,111,97,114,100,32,83,101,108,101,99,116,
-105,111,110,32,32,70,56,32,68,111,110,101,32,32,32,32,
+32,32,32,51,119,97,114,101,32,66,73,79,83,32,109,97,
+110,97,103,101,114,32,40,115,108,111,116,32,32,32,41,32,
 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,32,32,0,0,82,101,115,116,111,114,101,32,73,110,105,
-116,105,97,108,32,86,97,108,117,101,115,0,0,67,97,110,
-99,101,108,0,0,68,111,110,101,0,0,66,111,97,114,100,
-32,83,101,108,101,99,116,105,111,110,0,0,82,101,111,114,
-100,101,114,0,0,85,110,115,117,112,112,111,114,116,101,100,
-32,68,114,105,118,101,115,58,0,0,73,110,99,111,109,112,
-108,101,116,101,32,68,114,105,118,101,115,32,97,110,100,32,
-79,116,104,101,114,115,58,0,0,85,110,117,115,97,98,108,
-101,32,65,114,114,97,121,115,58,0,0,115,32,0,0,80,
-71,85,80,32,80,71,68,79,87,78,0,0,32,32,32,32,
+32,32,32,32,32,32,32,0,0,65,118,97,105,108,97,98,
+108,101,32,68,114,105,118,101,115,58,0,0,69,120,112,111,
+114,116,97,98,108,101,32,85,110,105,116,115,58,0,0,32,
+65,108,116,45,70,49,32,72,101,108,112,32,32,18,29,32,
+80,114,101,118,105,111,117,115,47,78,101,120,116,32,32,65,
+108,116,45,97,32,83,101,108,32,97,108,108,32,100,114,118,
+32,32,32,114,32,82,101,109,111,118,101,32,32,69,110,116,
+101,114,32,83,101,108,101,99,116,47,68,101,115,101,108,0,
+0,72,101,108,112,0,0,80,114,101,118,105,111,117,115,47,
+78,101,120,116,0,0,83,101,108,101,99,116,47,68,101,115,
+101,108,0,0,84,111,103,103,108,101,32,72,111,116,32,83,
+112,97,114,101,0,0,82,101,109,111,118,101,0,0,83,101,
+108,32,97,108,108,32,100,114,118,0,0,32,32,70,54,32,
+82,101,115,116,111,114,101,32,73,110,105,116,105,97,108,32,
+86,97,108,117,101,115,32,32,69,115,99,32,66,111,97,114,
+100,32,83,101,108,101,99,116,105,111,110,32,32,70,56,32,
+68,111,110,101,32,32,32,32,32,32,32,32,32,32,32,32,
+32,32,32,32,32,32,32,32,32,32,32,0,0,82,101,115,
+116,111,114,101,32,73,110,105,116,105,97,108,32,86,97,108,
+117,101,115,0,0,67,97,110,99,101,108,0,0,68,111,110,
+101,0,0,66,111,97,114,100,32,83,101,108,101,99,116,105,
+111,110,0,0,82,101,111,114,100,101,114,0,0,85,110,115,
+117,112,112,111,114,116,101,100,32,68,114,105,118,101,115,58,
+0,0,73,110,99,111,109,112,108,101,116,101,32,68,114,105,
+118,101,115,32,97,110,100,32,79,116,104,101,114,115,58,0,
+0,85,110,117,115,97,98,108,101,32,65,114,114,97,121,115,
+58,0,0,115,32,0,0,80,71,85,80,32,80,71,68,79,
+87,78,0,0,32,32,32,32,32,32,32,32,32,32,32,32,
+32,32,32,32,32,32,32,32,32,0,0,32,32,70,54,32,
+82,101,115,116,111,114,101,32,73,110,105,116,105,97,108,32,
+86,97,108,117,101,115,32,32,69,115,99,32,67,97,110,99,
+101,108,32,32,32,32,32,32,32,32,32,32,32,70,56,32,
+68,111,110,101,32,32,32,32,32,32,32,32,32,32,32,32,
+32,32,32,32,32,32,32,32,32,32,32,0,0,32,32,32,
 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,0,0,32,32,70,54,32,82,101,115,116,111,114,101,32,
-73,110,105,116,105,97,108,32,86,97,108,117,101,115,32,32,
-69,115,99,32,67,97,110,99,101,108,32,32,32,32,32,32,
-32,32,32,32,32,70,56,32,68,111,110,101,32,32,32,32,
+32,32,32,32,32,77,97,105,110,32,72,101,108,112,32,83,
+99,114,101,101,110,32,32,32,32,32,32,32,32,32,32,32,
+32,32,32,32,32,32,32,49,32,111,102,32,50,0,0,85,
+115,101,32,116,104,101,32,97,114,114,111,119,32,107,101,121,
+115,32,116,111,32,110,97,118,105,103,97,116,101,32,116,104,
+114,111,117,103,104,32,116,104,101,32,100,114,105,118,101,32,
+108,105,115,116,44,32,116,104,101,0,0,97,114,114,97,121,
+32,108,105,115,116,44,32,97,110,100,32,116,104,101,32,97,
+99,116,105,111,110,32,98,117,116,116,111,110,115,32,97,116,
+32,116,104,101,32,98,111,116,116,111,109,32,111,102,32,116,
+104,101,32,115,99,114,101,101,110,46,0,0,84,111,32,99,
+114,101,97,116,101,32,97,110,32,97,114,114,97,121,44,32,
+102,105,114,115,116,32,115,101,108,101,99,116,32,116,104,101,
+32,100,114,105,118,101,115,32,116,111,32,105,110,99,108,117,
+100,101,32,105,110,32,116,104,101,0,0,97,114,114,97,121,
+32,98,121,32,109,111,118,105,110,103,32,116,104,101,32,99,
+117,114,115,111,114,32,111,118,101,114,32,116,104,101,32,100,
+114,105,118,101,32,97,110,100,32,112,114,101,115,115,105,110,
+103,32,69,110,116,101,114,46,0,0,84,104,101,110,32,115,
+101,108,101,99,116,32,116,104,101,32,99,114,101,97,116,101,
+32,97,114,114,97,121,32,98,117,116,116,111,110,46,0,0,
+84,111,32,100,101,108,101,116,101,32,97,110,32,97,114,114,
+97,121,44,32,102,105,114,115,116,32,115,101,108,101,99,116,
+32,116,104,101,32,97,114,114,97,121,32,98,121,32,109,111,
+118,105,110,103,32,116,104,101,32,99,117,114,115,111,114,0,
+0,111,118,101,114,32,116,104,101,32,97,114,114,97,121,32,
+97,110,100,32,112,114,101,115,115,105,110,103,32,69,110,116,
+101,114,46,32,84,104,101,110,32,115,101,108,101,99,116,32,
+116,104,101,32,68,101,108,101,116,101,32,65,114,114,97,121,
+0,0,98,117,116,116,111,110,46,0,0,84,111,32,109,111,
+100,105,102,121,32,97,110,32,97,114,114,97,121,44,32,98,
+121,32,97,100,100,105,110,103,32,111,114,32,100,101,108,101,
+116,105,110,103,32,100,114,105,118,101,115,32,116,111,32,105,
+116,32,111,114,0,0,99,104,97,110,103,105,110,103,32,105,
+116,115,32,97,114,114,97,121,32,115,116,114,97,116,101,103,
+121,44,32,100,101,108,101,116,101,32,116,104,101,32,97,114,
+114,97,121,32,102,105,114,115,116,44,32,116,104,101,110,0,
+0,114,101,45,99,114,101,97,116,101,32,105,116,32,119,105,
+116,104,32,116,104,101,32,112,114,111,112,101,114,32,100,114,
+105,118,101,115,32,97,110,100,47,111,114,32,97,114,114,97,
+121,32,112,97,114,97,109,101,116,101,114,115,46,0,0,97,
+114,114,111,119,32,107,101,121,115,0,0,99,114,101,97,116,
+101,32,97,110,32,97,114,114,97,121,44,0,0,100,101,108,
+101,116,101,32,97,110,32,97,114,114,97,121,44,0,0,109,
+111,100,105,102,121,32,97,110,32,97,114,114,97,121,44,0,
+0,100,101,108,101,116,101,32,116,104,101,32,97,114,114,97,
+121,32,102,105,114,115,116,44,32,116,104,101,110,0,0,114,
+101,45,99,114,101,97,116,101,32,105,116,0,0,32,32,32,
 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,32,32,0,0,32,32,32,32,32,32,32,32,32,32,32,
-32,32,32,32,32,32,32,32,32,32,32,32,32,77,97,105,
-110,32,72,101,108,112,32,83,99,114,101,101,110,32,32,32,
-32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,49,
-32,111,102,32,50,0,0,85,115,101,32,116,104,101,32,97,
-114,114,111,119,32,107,101,121,115,32,116,111,32,110,97,118,
-105,103,97,116,101,32,116,104,114,111,117,103,104,32,116,104,
-101,32,100,114,105,118,101,32,108,105,115,116,44,32,116,104,
-101,0,0,97,114,114,97,121,32,108,105,115,116,44,32,97,
-110,100,32,116,104,101,32,97,99,116,105,111,110,32,98,117,
-116,116,111,110,115,32,97,116,32,116,104,101,32,98,111,116,
-116,111,109,32,111,102,32,116,104,101,32,115,99,114,101,101,
-110,46,0,0,84,111,32,99,114,101,97,116,101,32,97,110,
-32,97,114,114,97,121,44,32,102,105,114,115,116,32,115,101,
-108,101,99,116,32,116,104,101,32,100,114,105,118,101,115,32,
-116,111,32,105,110,99,108,117,100,101,32,105,110,32,116,104,
-101,0,0,97,114,114,97,121,32,98,121,32,109,111,118,105,
-110,103,32,116,104,101,32,99,117,114,115,111,114,32,111,118,
-101,114,32,116,104,101,32,100,114,105,118,101,32,97,110,100,
-32,112,114,101,115,115,105,110,103,32,69,110,116,101,114,46,
-0,0,84,104,101,110,32,115,101,108,101,99,116,32,116,104,
-101,32,99,114,101,97,116,101,32,97,114,114,97,121,32,98,
-117,116,116,111,110,46,0,0,84,111,32,100,101,108,101,116,
-101,32,97,110,32,97,114,114,97,121,44,32,102,105,114,115,
-116,32,115,101,108,101,99,116,32,116,104,101,32,97,114,114,
-97,121,32,98,121,32,109,111,118,105,110,103,32,116,104,101,
-32,99,117,114,115,111,114,0,0,111,118,101,114,32,116,104,
-101,32,97,114,114,97,121,32,97,110,100,32,112,114,101,115,
-115,105,110,103,32,69,110,116,101,114,46,32,84,104,101,110,
-32,115,101,108,101,99,116,32,116,104,101,32,68,101,108,101,
-116,101,32,65,114,114,97,121,0,0,98,117,116,116,111,110,
-46,0,0,84,111,32,109,111,100,105,102,121,32,97,110,32,
-97,114,114,97,121,44,32,98,121,32,97,100,100,105,110,103,
-32,111,114,32,100,101,108,101,116,105,110,103,32,100,114,105,
-118,101,115,32,116,111,32,105,116,32,111,114,0,0,99,104,
-97,110,103,105,110,103,32,105,116,115,32,97,114,114,97,121,
-32,115,116,114,97,116,101,103,121,44,32,100,101,108,101,116,
-101,32,116,104,101,32,97,114,114,97,121,32,102,105,114,115,
-116,44,32,116,104,101,110,0,0,114,101,45,99,114,101,97,
-116,101,32,105,116,32,119,105,116,104,32,116,104,101,32,112,
-114,111,112,101,114,32,100,114,105,118,101,115,32,97,110,100,
-47,111,114,32,97,114,114,97,121,32,112,97,114,97,109,101,
-116,101,114,115,46,0,0,97,114,114,111,119,32,107,101,121,
-115,0,0,99,114,101,97,116,101,32,97,110,32,97,114,114,
-97,121,44,0,0,100,101,108,101,116,101,32,97,110,32,97,
-114,114,97,121,44,0,0,109,111,100,105,102,121,32,97,110,
-32,97,114,114,97,121,44,0,0,100,101,108,101,116,101,32,
-116,104,101,32,97,114,114,97,121,32,102,105,114,115,116,44,
-32,116,104,101,110,0,0,114,101,45,99,114,101,97,116,101,
-32,105,116,0,0,32,32,32,32,32,32,32,32,32,32,32,
-32,32,32,32,32,32,32,32,32,32,32,32,32,77,97,105,
-110,32,72,101,108,112,32,83,99,114,101,101,110,32,32,32,
-32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,50,
-32,111,102,32,50,0,0,84,111,32,99,104,97,110,103,101,
-32,116,104,101,32,119,114,105,116,101,32,99,97,99,104,101,
-32,115,116,97,116,101,32,111,114,32,116,111,32,118,101,114,
-105,102,121,32,97,114,114,97,121,44,32,102,105,114,115,116,
-32,115,101,108,101,99,116,0,0,116,104,101,32,97,114,114,
-97,121,32,98,121,32,109,111,118,105,110,103,32,116,104,101,
-32,99,117,114,115,111,114,32,111,118,101,114,32,116,104,101,
-32,97,114,114,97,121,32,97,110,100,32,112,114,101,115,115,
-105,110,103,0,0,69,110,116,101,114,46,32,84,104,101,110,
-32,115,101,108,101,99,116,32,116,104,101,32,77,97,105,110,
-116,97,105,110,32,65,114,114,97,121,32,98,117,116,116,111,
-110,46,0,0,84,111,32,114,101,98,117,105,108,100,32,97,
-110,32,97,114,114,97,121,44,32,102,105,114,115,116,32,115,
-101,108,101,99,116,32,116,104,101,32,100,101,103,114,97,100,
-101,100,32,97,114,114,97,121,32,98,121,32,109,111,118,105,
-110,103,0,0,116,104,101,32,99,117,114,115,111,114,32,111,
-118,101,114,32,116,104,101,32,97,114,114,97,121,32,97,110,
-100,32,112,114,101,115,115,105,110,103,32,69,110,116,101,114,
-46,32,73,102,32,116,104,101,32,100,101,103,114,97,100,101,
-100,0,0,97,114,114,97,121,32,105,115,32,109,105,115,115,
-105,110,103,32,97,32,100,114,105,118,101,40,115,41,44,32,
-116,104,101,110,32,97,108,115,111,32,115,101,108,101,99,116,
-32,97,110,32,97,118,97,105,108,97,98,108,101,0,0,100,
-114,105,118,101,40,115,41,46,32,84,104,101,110,32,115,101,
-108,101,99,116,32,116,104,101,32,82,101,98,117,105,108,100,
-32,65,114,114,97,121,32,98,117,116,116,111,110,46,0,0,
-84,111,32,99,114,101,97,116,101,32,97,32,115,112,97,114,
-101,44,32,115,101,108,101,99,116,32,97,32,100,114,105,118,
-101,32,102,114,111,109,32,116,104,101,32,97,118,97,105,108,
-97,98,108,101,32,100,114,105,118,101,115,46,0,0,78,79,
-84,69,58,32,83,112,97,114,101,32,100,114,105,118,101,115,
-32,119,105,108,108,32,98,101,32,117,115,101,100,32,111,110,
-108,121,32,111,110,32,97,114,114,97,121,115,32,119,104,101,
-114,101,32,116,104,101,32,115,112,97,114,101,0,0,100,114,
-105,118,101,39,115,32,99,97,112,97,99,105,116,121,32,105,
-115,32,103,114,101,97,116,101,114,32,111,114,32,101,113,117,
-97,108,32,116,111,32,116,104,101,32,97,114,114,97,121,39,
-115,32,115,109,97,108,108,101,115,116,0,0,109,101,109,98,
-101,114,39,115,32,99,97,112,97,99,105,116,121,46,0,0,
-82,32,107,101,121,32,116,111,32,114,101,109,111,118,101,32,
-117,110,105,116,32,97,110,100,32,80,71,32,85,112,32,97,
-110,100,32,80,71,32,68,110,32,107,101,121,32,116,111,32,
-114,101,111,114,100,101,114,32,117,110,105,116,115,46,0,0,
-119,114,105,116,101,32,99,97,99,104,101,32,115,116,97,116,
-101,0,0,118,101,114,105,102,121,32,97,114,114,97,121,0,
-0,114,101,98,117,105,108,100,32,97,110,32,97,114,114,97,
-121,0,0,99,114,101,97,116,101,32,97,32,115,112,97,114,
-101,0,0,82,0,0,80,71,32,85,112,0,0,80,71,32,
-68,110,0,0,45,45,45,45,45,45,45,45,45,45,45,45,
+32,32,32,32,32,77,97,105,110,32,72,101,108,112,32,83,
+99,114,101,101,110,32,32,32,32,32,32,32,32,32,32,32,
+32,32,32,32,32,32,32,50,32,111,102,32,50,0,0,84,
+111,32,99,104,97,110,103,101,32,116,104,101,32,119,114,105,
+116,101,32,99,97,99,104,101,32,115,116,97,116,101,32,111,
+114,32,116,111,32,118,101,114,105,102,121,32,97,114,114,97,
+121,44,32,102,105,114,115,116,32,115,101,108,101,99,116,0,
+0,116,104,101,32,97,114,114,97,121,32,98,121,32,109,111,
+118,105,110,103,32,116,104,101,32,99,117,114,115,111,114,32,
+111,118,101,114,32,116,104,101,32,97,114,114,97,121,32,97,
+110,100,32,112,114,101,115,115,105,110,103,0,0,69,110,116,
+101,114,46,32,84,104,101,110,32,115,101,108,101,99,116,32,
+116,104,101,32,77,97,105,110,116,97,105,110,32,65,114,114,
+97,121,32,98,117,116,116,111,110,46,0,0,84,111,32,114,
+101,98,117,105,108,100,32,97,110,32,97,114,114,97,121,44,
+32,102,105,114,115,116,32,115,101,108,101,99,116,32,116,104,
+101,32,100,101,103,114,97,100,101,100,32,97,114,114,97,121,
+32,98,121,32,109,111,118,105,110,103,0,0,116,104,101,32,
+99,117,114,115,111,114,32,111,118,101,114,32,116,104,101,32,
+97,114,114,97,121,32,97,110,100,32,112,114,101,115,115,105,
+110,103,32,69,110,116,101,114,46,32,73,102,32,116,104,101,
+32,100,101,103,114,97,100,101,100,0,0,97,114,114,97,121,
+32,105,115,32,109,105,115,115,105,110,103,32,97,32,100,114,
+105,118,101,40,115,41,44,32,116,104,101,110,32,97,108,115,
+111,32,115,101,108,101,99,116,32,97,110,32,97,118,97,105,
+108,97,98,108,101,0,0,100,114,105,118,101,40,115,41,46,
+32,84,104,101,110,32,115,101,108,101,99,116,32,116,104,101,
+32,82,101,98,117,105,108,100,32,65,114,114,97,121,32,98,
+117,116,116,111,110,46,0,0,84,111,32,99,114,101,97,116,
+101,32,97,32,115,112,97,114,101,44,32,115,101,108,101,99,
+116,32,97,32,100,114,105,118,101,32,102,114,111,109,32,116,
+104,101,32,97,118,97,105,108,97,98,108,101,32,100,114,105,
+118,101,115,46,0,0,78,79,84,69,58,32,83,112,97,114,
+101,32,100,114,105,118,101,115,32,119,105,108,108,32,98,101,
+32,117,115,101,100,32,111,110,108,121,32,111,110,32,97,114,
+114,97,121,115,32,119,104,101,114,101,32,116,104,101,32,115,
+112,97,114,101,0,0,100,114,105,118,101,39,115,32,99,97,
+112,97,99,105,116,121,32,105,115,32,103,114,101,97,116,101,
+114,32,111,114,32,101,113,117,97,108,32,116,111,32,116,104,
+101,32,97,114,114,97,121,39,115,32,115,109,97,108,108,101,
+115,116,0,0,109,101,109,98,101,114,39,115,32,99,97,112,
+97,99,105,116,121,46,0,0,82,32,107,101,121,32,116,111,
+32,114,101,109,111,118,101,32,117,110,105,116,32,97,110,100,
+32,80,71,32,85,112,32,97,110,100,32,80,71,32,68,110,
+32,107,101,121,32,116,111,32,114,101,111,114,100,101,114,32,
+117,110,105,116,115,46,0,0,119,114,105,116,101,32,99,97,
+99,104,101,32,115,116,97,116,101,0,0,118,101,114,105,102,
+121,32,97,114,114,97,121,0,0,114,101,98,117,105,108,100,
+32,97,110,32,97,114,114,97,121,0,0,99,114,101,97,116,
+101,32,97,32,115,112,97,114,101,0,0,82,0,0,80,71,
+32,85,112,0,0,80,71,32,68,110,0,0,45,45,45,45,
 45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
 45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
 45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
-45,45,45,45,45,45,0,0,80,114,101,115,115,32,80,103,
-85,112,32,38,32,80,103,68,110,32,116,111,32,115,119,105,
-116,99,104,32,104,101,108,112,32,115,99,114,101,101,110,115,
-32,111,114,32,101,115,99,32,116,111,32,101,120,105,116,32,
-104,101,108,112,46,0,0,80,103,85,112,32,38,32,80,103,
-68,110,0,0,101,115,99,0,0,87,104,101,110,32,121,111,
-117,32,99,111,110,102,105,103,117,114,101,32,121,111,117,114,
-32,100,105,115,107,32,97,114,114,97,121,40,115,41,44,32,
-101,120,105,115,116,105,110,103,32,100,97,116,97,32,111,110,
-0,0,115,111,109,101,32,100,114,105,118,101,115,32,109,97,
-121,32,98,101,32,111,118,101,114,119,114,105,116,116,101,110,
-46,0,0,87,104,101,110,32,121,111,117,32,104,105,116,32,
-116,104,101,32,68,111,110,101,32,107,101,121,44,32,121,111,
-117,32,119,105,108,108,32,98,101,32,110,111,116,105,102,105,
-101,100,32,119,104,105,99,104,0,0,100,114,105,118,101,115,
-32,119,105,108,108,32,98,101,32,111,118,101,114,119,114,105,
-116,116,101,110,32,97,110,100,32,111,102,102,101,114,101,100,
-32,116,104,101,32,111,112,116,105,111,110,32,111,102,0,0,
-97,98,97,110,100,111,110,105,110,103,32,116,104,101,32,110,
-101,119,32,115,101,116,116,105,110,103,115,32,98,101,102,111,
-114,101,32,97,110,121,32,100,97,116,97,32,105,115,32,108,
-111,115,116,46,0,0,73,102,32,121,111,117,32,97,114,101,
-32,99,111,110,99,101,114,110,101,100,32,97,98,111,117,116,
-32,108,111,115,105,110,103,32,100,97,116,97,44,32,104,105,
-116,32,69,115,99,97,112,101,0,0,116,111,32,115,116,111,
-112,32,99,111,110,102,105,103,117,114,105,110,103,32,97,110,
-100,32,98,97,99,107,32,117,112,32,121,111,117,114,32,100,
-114,105,118,101,115,32,102,105,114,115,116,46,0,0,68,105,
-115,107,115,32,104,97,118,101,32,101,120,105,115,116,105,110,
-103,32,100,97,116,97,63,0,0,100,114,105,118,101,115,32,
-109,97,121,32,98,101,32,111,118,101,114,119,114,105,116,116,
-101,110,46,0,0,68,111,110,101,0,0,69,115,99,97,112,
-101,0,0,98,97,99,107,32,117,112,32,121,111,117,114,32,
-100,114,105,118,101,115,0,0,89,111,117,114,32,51,119,97,
-114,101,32,99,111,110,116,114,111,108,108,101,114,32,99,117,
-114,114,101,110,116,108,121,32,104,97,115,32,97,110,32,100,
-101,103,114,97,100,101,100,32,100,105,115,107,32,97,114,114,
-97,121,0,0,100,101,103,114,97,100,101,100,32,100,105,115,
-107,32,97,114,114,97,121,0,0,105,110,115,116,97,108,108,
-101,100,46,32,70,97,117,108,116,32,116,111,108,101,114,97,
-110,116,32,100,105,115,107,32,97,114,114,97,121,115,32,98,
-101,99,111,109,101,32,100,101,103,114,97,100,101,100,32,119,
-104,101,110,0,0,116,104,101,121,32,97,114,101,32,109,105,
-115,115,105,110,103,32,97,32,109,101,109,98,101,114,32,100,
-114,105,118,101,46,32,87,104,105,108,101,32,116,104,101,32,
-97,114,114,97,121,39,115,32,100,97,116,97,32,109,97,121,
-0,0,98,101,32,114,101,97,100,32,97,110,100,32,110,101,
-119,32,100,97,116,97,32,109,97,121,32,98,101,32,119,114,
-105,116,116,101,110,32,116,111,32,105,116,44,32,105,116,32,
-105,115,32,110,111,32,108,111,110,103,101,114,0,0,110,111,
-32,108,111,110,103,101,114,0,0,102,97,117,108,116,32,116,
-111,108,101,114,97,110,116,46,0,0,87,105,116,104,32,97,
-32,100,101,103,114,97,100,101,100,32,97,114,114,97,121,32,
-121,111,117,32,104,97,118,101,32,102,111,117,114,32,99,111,
-117,114,115,101,115,32,111,102,32,97,99,116,105,111,110,58,
-0,0,40,49,41,32,73,102,32,116,104,101,32,97,114,114,
-97,121,32,104,97,115,32,97,32,100,114,105,118,101,32,116,
-104,97,116,32,105,115,32,108,105,115,116,101,100,32,97,115,
-32,78,111,116,32,73,110,32,85,115,101,44,32,116,114,121,
-0,0,73,102,32,116,104,101,32,97,114,114,97,121,32,104,
-97,115,32,97,32,100,114,105,118,101,32,116,104,97,116,32,
-105,115,32,108,105,115,116,101,100,32,97,115,32,78,111,116,
-32,73,110,32,85,115,101,44,0,0,114,101,98,117,105,108,
-100,105,110,103,32,116,104,101,32,97,114,114,97,121,32,102,
-105,114,115,116,46,32,73,102,32,105,116,32,115,116,105,108,
-108,32,100,111,101,115,32,110,111,116,32,119,111,114,107,44,
-32,114,101,109,111,118,101,0,0,116,104,101,32,78,111,116,
-32,105,110,32,85,115,101,32,100,114,105,118,101,32,97,110,
-100,32,114,101,98,117,105,108,100,32,116,104,101,32,97,114,
-114,97,121,32,117,115,105,110,103,32,97,32,110,101,119,32,
-100,114,105,118,101,46,0,0,40,50,41,32,73,102,32,111,
-110,101,32,111,102,32,116,104,101,32,109,101,109,98,101,114,
-32,100,114,105,118,101,115,32,105,115,32,110,111,116,32,108,
-105,115,116,101,100,44,32,105,116,32,109,97,121,32,98,101,
-0,0,73,102,32,111,110,101,32,111,102,32,116,104,101,32,
-109,101,109,98,101,114,32,100,114,105,118,101,115,32,105,115,
-32,110,111,116,32,108,105,115,116,101,100,44,0,0,117,110,
-112,108,117,103,103,101,100,32,111,114,32,105,116,32,109,97,
-121,32,98,101,32,98,114,111,107,101,110,32,98,101,121,111,
-110,100,32,114,101,99,111,103,110,105,116,105,111,110,46,0,
-0,32,32,32,32,40,97,41,32,73,102,32,116,104,101,32,
-100,114,105,118,101,32,119,97,115,32,115,105,109,112,108,121,
-32,117,110,112,108,117,103,103,101,100,44,32,114,101,99,111,
-110,110,101,99,116,32,105,116,32,97,110,100,0,0,73,102,
-32,116,104,101,32,100,114,105,118,101,32,119,97,115,32,115,
-105,109,112,108,121,32,117,110,112,108,117,103,103,101,100,44,
-0,0,32,32,32,32,114,101,98,111,111,116,46,32,73,102,
-32,100,97,116,97,32,119,97,115,32,119,114,105,116,116,101,
-110,32,116,111,32,116,104,101,32,97,114,114,97,121,32,119,
-104,105,108,101,32,105,116,0,0,32,32,32,32,119,97,115,
-32,100,101,103,114,97,100,101,100,44,32,121,111,117,32,119,
-105,108,108,32,98,101,32,114,101,113,117,105,114,101,100,32,
-116,111,32,114,101,98,117,105,108,100,32,105,116,46,0,0,
-32,32,32,32,40,98,41,32,82,101,98,117,105,108,100,32,
-116,104,101,32,97,114,114,97,121,32,117,115,105,110,103,32,
-97,32,110,101,119,32,100,114,105,118,101,46,32,65,110,121,
-32,100,97,116,97,32,111,110,32,116,104,101,0,0,82,101,
-98,117,105,108,100,32,116,104,101,32,97,114,114,97,121,32,
-117,115,105,110,103,32,97,32,110,101,119,32,100,114,105,118,
-101,46,0,0,32,32,32,32,110,101,119,32,100,114,105,118,
-101,32,119,105,108,108,32,98,101,32,111,118,101,114,119,114,
-105,116,116,101,110,46,0,0,40,52,41,32,68,111,32,110,
-111,116,104,105,110,103,32,97,110,100,32,114,117,110,32,119,
-105,116,104,32,116,104,101,32,97,114,114,97,121,32,97,115,
-32,102,117,110,99,116,105,111,110,97,108,44,32,98,117,116,
-32,110,111,116,0,0,68,111,32,110,111,116,104,105,110,103,
-0,0,102,97,117,108,116,32,116,111,108,101,114,97,110,116,
-46,0,0,89,111,117,114,32,104,97,118,101,32,115,101,108,
-101,99,116,101,100,32,115,111,109,101,32,97,118,97,105,108,
-97,98,108,101,32,100,114,105,118,101,115,32,116,111,0,0,
-97,118,97,105,108,97,98,108,101,32,100,114,105,118,101,115,
-0,0,99,114,101,97,116,101,32,101,120,112,111,114,116,97,
-98,108,101,32,117,110,105,116,46,32,32,84,104,105,115,32,
-119,105,108,108,32,100,101,115,116,114,111,121,0,0,97,108,
-108,32,101,120,105,115,116,105,110,103,32,100,97,116,97,32,
-111,110,32,116,104,111,115,101,32,100,114,105,118,101,115,46,
-0,0,79,110,99,101,32,110,101,119,32,117,110,105,116,115,
-32,97,114,101,32,99,114,101,97,116,101,100,44,32,116,104,
-111,115,101,32,100,97,116,97,32,97,114,101,0,0,78,79,
-84,32,114,101,99,111,118,101,114,97,98,108,101,46,0,0,
-78,79,84,0,0,68,111,32,121,111,117,32,119,97,110,116,
-32,116,111,32,99,114,101,97,116,101,32,116,104,101,32,117,
-110,105,116,63,32,91,89,47,78,93,0,0,32,67,114,101,
-97,116,101,32,85,110,105,116,32,0,0,32,68,101,108,101,
-116,101,32,85,110,105,116,32,0,0,32,82,101,98,117,105,
-108,100,32,85,110,105,116,32,0,0,32,77,97,105,110,116,
-97,105,110,32,85,110,105,116,32,0,0,32,80,111,108,105,
-99,121,32,0,0,32,32,32,79,75,32,32,32,0,0,32,
-67,97,110,99,101,108,32,0,0,32,32,32,32,32,32,32,
+45,45,45,45,45,45,45,45,45,45,45,45,45,45,0,0,
+80,114,101,115,115,32,80,103,85,112,32,38,32,80,103,68,
+110,32,116,111,32,115,119,105,116,99,104,32,104,101,108,112,
+32,115,99,114,101,101,110,115,32,111,114,32,101,115,99,32,
+116,111,32,101,120,105,116,32,104,101,108,112,46,0,0,80,
+103,85,112,32,38,32,80,103,68,110,0,0,101,115,99,0,
+0,87,104,101,110,32,121,111,117,32,99,111,110,102,105,103,
+117,114,101,32,121,111,117,114,32,100,105,115,107,32,97,114,
+114,97,121,40,115,41,44,32,101,120,105,115,116,105,110,103,
+32,100,97,116,97,32,111,110,0,0,115,111,109,101,32,100,
+114,105,118,101,115,32,109,97,121,32,98,101,32,111,118,101,
+114,119,114,105,116,116,101,110,46,0,0,87,104,101,110,32,
+121,111,117,32,104,105,116,32,116,104,101,32,68,111,110,101,
+32,107,101,121,44,32,121,111,117,32,119,105,108,108,32,98,
+101,32,110,111,116,105,102,105,101,100,32,119,104,105,99,104,
+0,0,100,114,105,118,101,115,32,119,105,108,108,32,98,101,
+32,111,118,101,114,119,114,105,116,116,101,110,32,97,110,100,
+32,111,102,102,101,114,101,100,32,116,104,101,32,111,112,116,
+105,111,110,32,111,102,0,0,97,98,97,110,100,111,110,105,
+110,103,32,116,104,101,32,110,101,119,32,115,101,116,116,105,
+110,103,115,32,98,101,102,111,114,101,32,97,110,121,32,100,
+97,116,97,32,105,115,32,108,111,115,116,46,0,0,73,102,
+32,121,111,117,32,97,114,101,32,99,111,110,99,101,114,110,
+101,100,32,97,98,111,117,116,32,108,111,115,105,110,103,32,
+100,97,116,97,44,32,104,105,116,32,69,115,99,97,112,101,
+0,0,116,111,32,115,116,111,112,32,99,111,110,102,105,103,
+117,114,105,110,103,32,97,110,100,32,98,97,99,107,32,117,
+112,32,121,111,117,114,32,100,114,105,118,101,115,32,102,105,
+114,115,116,46,0,0,68,105,115,107,115,32,104,97,118,101,
+32,101,120,105,115,116,105,110,103,32,100,97,116,97,63,0,
+0,100,114,105,118,101,115,32,109,97,121,32,98,101,32,111,
+118,101,114,119,114,105,116,116,101,110,46,0,0,68,111,110,
+101,0,0,69,115,99,97,112,101,0,0,98,97,99,107,32,
+117,112,32,121,111,117,114,32,100,114,105,118,101,115,0,0,
+89,111,117,114,32,51,119,97,114,101,32,99,111,110,116,114,
+111,108,108,101,114,32,99,117,114,114,101,110,116,108,121,32,
+104,97,115,32,97,110,32,100,101,103,114,97,100,101,100,32,
+100,105,115,107,32,97,114,114,97,121,0,0,100,101,103,114,
+97,100,101,100,32,100,105,115,107,32,97,114,114,97,121,0,
+0,105,110,115,116,97,108,108,101,100,46,32,70,97,117,108,
+116,32,116,111,108,101,114,97,110,116,32,100,105,115,107,32,
+97,114,114,97,121,115,32,98,101,99,111,109,101,32,100,101,
+103,114,97,100,101,100,32,119,104,101,110,0,0,116,104,101,
+121,32,97,114,101,32,109,105,115,115,105,110,103,32,97,32,
+109,101,109,98,101,114,32,100,114,105,118,101,46,32,87,104,
+105,108,101,32,116,104,101,32,97,114,114,97,121,39,115,32,
+100,97,116,97,32,109,97,121,0,0,98,101,32,114,101,97,
+100,32,97,110,100,32,110,101,119,32,100,97,116,97,32,109,
+97,121,32,98,101,32,119,114,105,116,116,101,110,32,116,111,
+32,105,116,44,32,105,116,32,105,115,32,110,111,32,108,111,
+110,103,101,114,0,0,110,111,32,108,111,110,103,101,114,0,
+0,102,97,117,108,116,32,116,111,108,101,114,97,110,116,46,
+0,0,87,105,116,104,32,97,32,100,101,103,114,97,100,101,
+100,32,97,114,114,97,121,32,121,111,117,32,104,97,118,101,
+32,102,111,117,114,32,99,111,117,114,115,101,115,32,111,102,
+32,97,99,116,105,111,110,58,0,0,40,49,41,32,73,102,
+32,116,104,101,32,97,114,114,97,121,32,104,97,115,32,97,
+32,100,114,105,118,101,32,116,104,97,116,32,105,115,32,108,
+105,115,116,101,100,32,97,115,32,78,111,116,32,73,110,32,
+85,115,101,44,32,116,114,121,0,0,73,102,32,116,104,101,
+32,97,114,114,97,121,32,104,97,115,32,97,32,100,114,105,
+118,101,32,116,104,97,116,32,105,115,32,108,105,115,116,101,
+100,32,97,115,32,78,111,116,32,73,110,32,85,115,101,44,
+0,0,114,101,98,117,105,108,100,105,110,103,32,116,104,101,
+32,97,114,114,97,121,32,102,105,114,115,116,46,32,73,102,
+32,105,116,32,115,116,105,108,108,32,100,111,101,115,32,110,
+111,116,32,119,111,114,107,44,32,114,101,109,111,118,101,0,
+0,116,104,101,32,78,111,116,32,105,110,32,85,115,101,32,
+100,114,105,118,101,32,97,110,100,32,114,101,98,117,105,108,
+100,32,116,104,101,32,97,114,114,97,121,32,117,115,105,110,
+103,32,97,32,110,101,119,32,100,114,105,118,101,46,0,0,
+40,50,41,32,73,102,32,111,110,101,32,111,102,32,116,104,
+101,32,109,101,109,98,101,114,32,100,114,105,118,101,115,32,
+105,115,32,110,111,116,32,108,105,115,116,101,100,44,32,105,
+116,32,109,97,121,32,98,101,0,0,73,102,32,111,110,101,
+32,111,102,32,116,104,101,32,109,101,109,98,101,114,32,100,
+114,105,118,101,115,32,105,115,32,110,111,116,32,108,105,115,
+116,101,100,44,0,0,117,110,112,108,117,103,103,101,100,32,
+111,114,32,105,116,32,109,97,121,32,98,101,32,98,114,111,
+107,101,110,32,98,101,121,111,110,100,32,114,101,99,111,103,
+110,105,116,105,111,110,46,0,0,32,32,32,32,40,97,41,
+32,73,102,32,116,104,101,32,100,114,105,118,101,32,119,97,
+115,32,115,105,109,112,108,121,32,117,110,112,108,117,103,103,
+101,100,44,32,114,101,99,111,110,110,101,99,116,32,105,116,
+32,97,110,100,0,0,73,102,32,116,104,101,32,100,114,105,
+118,101,32,119,97,115,32,115,105,109,112,108,121,32,117,110,
+112,108,117,103,103,101,100,44,0,0,32,32,32,32,114,101,
+98,111,111,116,46,32,73,102,32,100,97,116,97,32,119,97,
+115,32,119,114,105,116,116,101,110,32,116,111,32,116,104,101,
+32,97,114,114,97,121,32,119,104,105,108,101,32,105,116,0,
+0,32,32,32,32,119,97,115,32,100,101,103,114,97,100,101,
+100,44,32,121,111,117,32,119,105,108,108,32,98,101,32,114,
+101,113,117,105,114,101,100,32,116,111,32,114,101,98,117,105,
+108,100,32,105,116,46,0,0,32,32,32,32,40,98,41,32,
+82,101,98,117,105,108,100,32,116,104,101,32,97,114,114,97,
+121,32,117,115,105,110,103,32,97,32,110,101,119,32,100,114,
+105,118,101,46,32,65,110,121,32,100,97,116,97,32,111,110,
+32,116,104,101,0,0,82,101,98,117,105,108,100,32,116,104,
+101,32,97,114,114,97,121,32,117,115,105,110,103,32,97,32,
+110,101,119,32,100,114,105,118,101,46,0,0,32,32,32,32,
+110,101,119,32,100,114,105,118,101,32,119,105,108,108,32,98,
+101,32,111,118,101,114,119,114,105,116,116,101,110,46,0,0,
+40,52,41,32,68,111,32,110,111,116,104,105,110,103,32,97,
+110,100,32,114,117,110,32,119,105,116,104,32,116,104,101,32,
+97,114,114,97,121,32,97,115,32,102,117,110,99,116,105,111,
+110,97,108,44,32,98,117,116,32,110,111,116,0,0,68,111,
+32,110,111,116,104,105,110,103,0,0,102,97,117,108,116,32,
+116,111,108,101,114,97,110,116,46,0,0,89,111,117,114,32,
+104,97,118,101,32,115,101,108,101,99,116,101,100,32,115,111,
+109,101,32,97,118,97,105,108,97,98,108,101,32,100,114,105,
+118,101,115,32,116,111,0,0,97,118,97,105,108,97,98,108,
+101,32,100,114,105,118,101,115,0,0,99,114,101,97,116,101,
+32,101,120,112,111,114,116,97,98,108,101,32,117,110,105,116,
+46,32,32,84,104,105,115,32,119,105,108,108,32,100,101,115,
+116,114,111,121,0,0,97,108,108,32,101,120,105,115,116,105,
+110,103,32,100,97,116,97,32,111,110,32,116,104,111,115,101,
+32,100,114,105,118,101,115,46,0,0,79,110,99,101,32,110,
+101,119,32,117,110,105,116,115,32,97,114,101,32,99,114,101,
+97,116,101,100,44,32,116,104,111,115,101,32,100,97,116,97,
+32,97,114,101,0,0,78,79,84,32,114,101,99,111,118,101,
+114,97,98,108,101,46,0,0,78,79,84,0,0,68,111,32,
+121,111,117,32,119,97,110,116,32,116,111,32,99,114,101,97,
+116,101,32,116,104,101,32,117,110,105,116,63,32,91,89,47,
+78,93,0,0,32,67,114,101,97,116,101,32,85,110,105,116,
+32,0,0,32,68,101,108,101,116,101,32,85,110,105,116,32,
+0,0,32,82,101,98,117,105,108,100,32,85,110,105,116,32,
+0,0,32,77,97,105,110,116,97,105,110,32,85,110,105,116,
+32,0,0,32,80,111,108,105,99,121,32,0,0,32,32,32,
+79,75,32,32,32,0,0,32,67,97,110,99,101,108,32,0,
+0,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,32,32,32,32,32,32,32,32,67,114,101,97,116,101,32,
-68,105,115,107,32,65,114,114,97,121,32,32,32,32,32,32,
+32,67,114,101,97,116,101,32,68,105,115,107,32,65,114,114,
+97,121,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,32,32,32,32,32,32,32,32,0,0,78,111,116,101,58,
-32,67,114,101,97,116,105,110,103,32,97,110,32,97,114,114,
-97,121,32,119,105,108,108,32,111,118,101,114,119,114,105,116,
-101,32,101,120,105,115,116,105,110,103,32,100,97,116,97,32,
-111,110,32,105,116,115,32,100,114,105,118,101,115,46,0,0,
-67,114,101,97,116,101,32,97,32,100,105,115,107,32,97,114,
-114,97,121,32,102,114,111,109,32,116,104,101,115,101,32,100,
-114,105,118,101,115,58,0,0,82,65,73,68,0,0,99,111,
-110,102,105,103,117,114,97,116,105,111,110,58,0,0,65,114,
-114,97,121,39,115,32,87,114,105,116,101,0,0,67,97,99,
-104,101,32,83,116,97,116,101,58,0,0,83,116,114,105,112,
-101,32,83,105,122,101,58,0,0,67,111,110,116,105,110,117,
-101,32,111,110,0,0,115,111,117,114,99,101,32,101,114,114,
-111,114,0,0,100,117,114,105,110,103,32,114,101,98,117,105,
-108,100,58,0,0,32,32,65,108,116,45,70,49,32,72,101,
-108,112,32,32,32,32,32,32,32,32,18,29,32,80,114,101,
-118,105,111,117,115,47,78,101,120,116,32,32,32,32,32,32,
-69,110,116,101,114,32,67,104,97,110,103,101,32,86,97,108,
-117,101,32,32,32,32,32,32,32,69,115,99,32,67,97,110,
-99,101,108,32,32,0,0,72,101,108,112,0,0,80,114,101,
-118,105,111,117,115,47,78,101,120,116,0,0,67,104,97,110,
-103,101,32,86,97,108,117,101,0,0,67,97,110,99,101,108,
-0,0,82,65,73,68,32,99,111,110,102,105,103,117,114,97,
-116,105,111,110,32,111,110,108,121,32,115,117,112,112,111,114,
-116,32,105,100,101,110,116,105,99,97,108,32,100,114,105,118,
-101,115,0,0,80,108,101,97,115,101,32,99,104,101,99,107,
-32,97,110,100,32,114,101,112,108,97,99,101,32,117,110,105,
-100,101,110,116,105,99,97,108,32,100,114,105,118,101,115,46,
-0,0,82,101,98,117,105,108,100,32,100,101,115,116,105,110,
-97,116,105,111,110,32,99,97,112,97,99,105,116,121,32,110,
-101,101,100,115,32,116,111,32,109,97,116,99,104,32,116,104,
-101,32,115,111,117,114,99,101,0,0,73,110,115,116,97,108,
-108,32,97,110,100,32,115,101,108,101,99,116,32,97,32,100,
-114,105,118,101,32,97,116,32,108,101,97,115,116,0,0,32,
-32,32,32,32,32,32,32,32,32,32,32,32,32,32,67,114,
-101,97,116,101,32,68,105,115,107,32,65,114,114,97,121,32,
-72,101,108,112,32,83,99,114,101,101,110,0,0,84,104,101,
-32,108,105,115,116,101,100,32,100,114,105,118,101,115,32,119,
-105,108,108,32,98,101,32,99,111,109,98,105,110,101,100,32,
-105,110,116,111,32,97,32,100,105,115,107,32,97,114,114,97,
-121,46,32,67,104,101,99,107,0,0,116,104,97,116,32,121,
-111,117,32,104,97,118,101,32,115,101,108,101,99,116,101,100,
-32,116,104,101,32,99,111,114,114,101,99,116,32,100,114,105,
-118,101,115,32,98,101,102,111,114,101,32,104,105,116,116,105,
-110,103,32,79,75,46,0,0,78,111,116,101,32,116,104,97,
-116,32,116,104,101,32,100,97,116,97,32,111,110,32,116,104,
-101,32,100,114,105,118,101,115,32,105,110,32,116,104,101,32,
-100,105,115,107,32,97,114,114,97,121,32,119,105,108,108,32,
-98,101,0,0,111,118,101,114,119,114,105,116,116,101,110,32,
-111,110,108,121,32,97,102,116,101,114,32,121,111,117,32,99,
-111,109,112,108,101,116,101,32,97,108,108,32,121,111,117,114,
-32,99,111,110,102,105,103,117,114,97,116,105,111,110,0,0,
-115,101,116,116,105,110,103,115,32,97,110,100,32,115,101,108,
-101,99,116,32,116,104,101,32,68,111,110,101,32,107,101,121,
-46,0,0,79,75,46,0,0,68,111,110,101,0,0,82,69,
-66,85,73,76,68,73,78,71,32,40,97,102,116,101,114,32,
-70,56,41,0,0,82,69,66,85,73,76,68,73,78,71,0,
-0,77,105,115,115,105,110,103,32,100,114,105,118,101,115,0,
-0,86,69,82,73,70,89,73,78,71,0,0,68,69,71,82,
-65,68,69,68,0,0,78,111,116,32,105,110,32,85,115,101,
-0,0,82,101,98,117,105,108,100,32,105,110,116,111,0,0,
-73,78,73,84,32,65,82,82,65,89,32,40,97,102,116,101,
-114,32,70,56,41,0,0,73,78,73,84,32,65,82,82,65,
-89,0,0,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,32,32,32,32,32,32,32,32,0,0,73,78,67,79,77,
-80,76,69,84,69,0,0,32,32,83,105,110,103,108,101,32,
-68,114,105,118,101,32,32,32,32,32,0,0,32,32,83,116,
-114,105,112,101,32,40,82,65,73,68,32,48,41,32,32,0,
-0,32,32,77,105,114,114,111,114,32,40,82,65,73,68,32,
-49,41,32,32,0,0,32,32,32,32,32,82,65,73,68,32,
-49,48,32,32,32,32,32,32,32,0,0,32,32,32,32,32,
-82,65,73,68,32,53,32,32,32,32,32,32,32,32,0,0,
-32,32,32,32,32,82,65,73,68,32,53,48,32,32,32,32,
-32,32,32,0,0,32,32,32,32,32,82,65,73,68,32,53,
-48,32,32,50,88,54,32,32,0,0,32,32,32,32,32,82,
-65,73,68,32,53,48,32,32,51,88,52,32,32,0,0,32,
-32,32,32,32,82,65,73,68,32,53,48,32,32,52,88,51,
-32,32,0,0,32,32,56,32,75,66,32,0,0,32,49,54,
-32,75,66,32,0,0,32,51,50,32,75,66,32,0,0,32,
-54,52,32,75,66,32,0,0,32,49,50,56,75,66,32,0,
-0,32,50,53,54,75,66,32,0,0,32,53,49,50,75,66,
-32,0,0,32,32,49,32,77,66,32,0,0,32,32,78,47,
-65,32,32,0,0,32,32,32,32,32,32,32,32,32,32,32,
+32,0,0,78,111,116,101,58,32,67,114,101,97,116,105,110,
+103,32,97,110,32,97,114,114,97,121,32,119,105,108,108,32,
+111,118,101,114,119,114,105,116,101,32,101,120,105,115,116,105,
+110,103,32,100,97,116,97,32,111,110,32,105,116,115,32,100,
+114,105,118,101,115,46,0,0,67,114,101,97,116,101,32,97,
+32,100,105,115,107,32,97,114,114,97,121,32,102,114,111,109,
+32,116,104,101,115,101,32,100,114,105,118,101,115,58,0,0,
+82,65,73,68,0,0,99,111,110,102,105,103,117,114,97,116,
+105,111,110,58,0,0,65,114,114,97,121,39,115,32,87,114,
+105,116,101,0,0,67,97,99,104,101,32,83,116,97,116,101,
+58,0,0,83,116,114,105,112,101,32,83,105,122,101,58,0,
+0,67,111,110,116,105,110,117,101,32,111,110,0,0,115,111,
+117,114,99,101,32,101,114,114,111,114,0,0,100,117,114,105,
+110,103,32,114,101,98,117,105,108,100,58,0,0,32,32,65,
+108,116,45,70,49,32,72,101,108,112,32,32,32,32,32,32,
+32,32,18,29,32,80,114,101,118,105,111,117,115,47,78,101,
+120,116,32,32,32,32,32,32,69,110,116,101,114,32,67,104,
+97,110,103,101,32,86,97,108,117,101,32,32,32,32,32,32,
+32,69,115,99,32,67,97,110,99,101,108,32,32,0,0,72,
+101,108,112,0,0,80,114,101,118,105,111,117,115,47,78,101,
+120,116,0,0,67,104,97,110,103,101,32,86,97,108,117,101,
+0,0,67,97,110,99,101,108,0,0,82,65,73,68,32,99,
+111,110,102,105,103,117,114,97,116,105,111,110,32,111,110,108,
+121,32,115,117,112,112,111,114,116,32,105,100,101,110,116,105,
+99,97,108,32,100,114,105,118,101,115,0,0,80,108,101,97,
+115,101,32,99,104,101,99,107,32,97,110,100,32,114,101,112,
+108,97,99,101,32,117,110,105,100,101,110,116,105,99,97,108,
+32,100,114,105,118,101,115,46,0,0,82,101,98,117,105,108,
+100,32,100,101,115,116,105,110,97,116,105,111,110,32,99,97,
+112,97,99,105,116,121,32,110,101,101,100,115,32,116,111,32,
+109,97,116,99,104,32,116,104,101,32,115,111,117,114,99,101,
+0,0,73,110,115,116,97,108,108,32,97,110,100,32,115,101,
+108,101,99,116,32,97,32,100,114,105,118,101,32,97,116,32,
+108,101,97,115,116,0,0,32,32,32,32,32,32,32,32,32,
+32,32,32,32,32,32,67,114,101,97,116,101,32,68,105,115,
+107,32,65,114,114,97,121,32,72,101,108,112,32,83,99,114,
+101,101,110,0,0,84,104,101,32,108,105,115,116,101,100,32,
+100,114,105,118,101,115,32,119,105,108,108,32,98,101,32,99,
+111,109,98,105,110,101,100,32,105,110,116,111,32,97,32,100,
+105,115,107,32,97,114,114,97,121,46,32,67,104,101,99,107,
+0,0,116,104,97,116,32,121,111,117,32,104,97,118,101,32,
+115,101,108,101,99,116,101,100,32,116,104,101,32,99,111,114,
+114,101,99,116,32,100,114,105,118,101,115,32,98,101,102,111,
+114,101,32,104,105,116,116,105,110,103,32,79,75,46,0,0,
+78,111,116,101,32,116,104,97,116,32,116,104,101,32,100,97,
+116,97,32,111,110,32,116,104,101,32,100,114,105,118,101,115,
+32,105,110,32,116,104,101,32,100,105,115,107,32,97,114,114,
+97,121,32,119,105,108,108,32,98,101,0,0,111,118,101,114,
+119,114,105,116,116,101,110,32,111,110,108,121,32,97,102,116,
+101,114,32,121,111,117,32,99,111,109,112,108,101,116,101,32,
+97,108,108,32,121,111,117,114,32,99,111,110,102,105,103,117,
+114,97,116,105,111,110,0,0,115,101,116,116,105,110,103,115,
+32,97,110,100,32,115,101,108,101,99,116,32,116,104,101,32,
+68,111,110,101,32,107,101,121,46,0,0,79,75,46,0,0,
+68,111,110,101,0,0,82,69,66,85,73,76,68,73,78,71,
+32,40,97,102,116,101,114,32,70,56,41,0,0,82,69,66,
+85,73,76,68,73,78,71,0,0,77,105,115,115,105,110,103,
+32,100,114,105,118,101,115,0,0,86,69,82,73,70,89,73,
+78,71,0,0,68,69,71,82,65,68,69,68,0,0,78,111,
+116,32,105,110,32,85,115,101,0,0,82,101,98,117,105,108,
+100,32,105,110,116,111,0,0,73,78,73,84,32,65,82,82,
+65,89,32,40,97,102,116,101,114,32,70,56,41,0,0,73,
+78,73,84,32,65,82,82,65,89,0,0,32,32,32,32,32,
 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,32,32,32,32,68,101,108,101,116,101,32,68,105,115,107,
-32,65,114,114,97,121,32,32,32,32,32,32,32,32,32,32,
+32,0,0,73,78,67,79,77,80,76,69,84,69,0,0,32,
+32,83,105,110,103,108,101,32,68,114,105,118,101,32,32,32,
+32,32,0,0,32,32,83,116,114,105,112,101,32,40,82,65,
+73,68,32,48,41,32,32,0,0,32,32,77,105,114,114,111,
+114,32,40,82,65,73,68,32,49,41,32,32,0,0,32,32,
+32,32,32,82,65,73,68,32,49,48,32,32,32,32,32,32,
+32,0,0,32,32,32,32,32,82,65,73,68,32,53,32,32,
+32,32,32,32,32,32,0,0,32,32,32,32,32,82,65,73,
+68,32,53,48,32,32,32,32,32,32,32,0,0,32,32,32,
+32,32,82,65,73,68,32,53,48,32,32,50,88,54,32,32,
+0,0,32,32,32,32,32,82,65,73,68,32,53,48,32,32,
+51,88,52,32,32,0,0,32,32,32,32,32,82,65,73,68,
+32,53,48,32,32,52,88,51,32,32,0,0,32,32,56,32,
+75,66,32,0,0,32,49,54,32,75,66,32,0,0,32,51,
+50,32,75,66,32,0,0,32,54,52,32,75,66,32,0,0,
+32,49,50,56,75,66,32,0,0,32,50,53,54,75,66,32,
+0,0,32,53,49,50,75,66,32,0,0,32,32,49,32,77,
+66,32,0,0,32,32,78,47,65,32,32,0,0,32,32,32,
 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,32,32,32,32,0,0,78,111,116,101,58,32,79,110,99,
-101,32,97,110,32,97,114,114,97,121,32,105,115,32,100,101,
-108,101,116,101,100,44,32,105,116,115,32,100,97,116,97,32,
-119,105,108,108,32,98,101,99,111,109,101,32,117,110,114,101,
-97,100,97,98,108,101,46,0,0,68,101,108,101,116,101,32,
-116,104,101,32,102,111,108,108,111,119,105,110,103,32,100,105,
-115,107,32,97,114,114,97,121,40,115,41,58,0,0,32,32,
-65,108,116,45,70,49,32,72,101,108,112,32,32,32,32,32,
+32,32,32,32,32,32,32,32,32,32,32,32,32,68,101,108,
+101,116,101,32,68,105,115,107,32,65,114,114,97,121,32,32,
 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
+32,32,32,32,32,32,32,32,32,32,32,32,32,0,0,78,
+111,116,101,58,32,79,110,99,101,32,97,110,32,97,114,114,
+97,121,32,105,115,32,100,101,108,101,116,101,100,44,32,105,
+116,115,32,100,97,116,97,32,119,105,108,108,32,98,101,99,
+111,109,101,32,117,110,114,101,97,100,97,98,108,101,46,0,
+0,68,101,108,101,116,101,32,116,104,101,32,102,111,108,108,
+111,119,105,110,103,32,100,105,115,107,32,97,114,114,97,121,
+40,115,41,58,0,0,32,32,65,108,116,45,70,49,32,72,
+101,108,112,32,32,32,32,32,32,32,32,32,32,32,32,32,
 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,32,69,115,99,32,67,97,110,99,101,108,32,32,0,0,
-72,101,108,112,0,0,67,97,110,99,101,108,0,0,32,32,
-32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,68,
-101,108,101,116,101,32,68,105,115,107,32,65,114,114,97,121,
-32,72,101,108,112,32,83,99,114,101,101,110,0,0,84,104,
-101,32,108,105,115,116,101,100,32,100,105,115,107,32,97,114,
-114,97,121,40,115,41,32,119,105,108,108,32,98,101,32,98,
-114,111,107,101,110,32,105,110,116,111,32,105,110,100,105,118,
-105,100,117,97,108,32,100,114,105,118,101,115,46,0,0,67,
-104,101,99,107,32,116,104,97,116,32,121,111,117,32,104,97,
-118,101,32,115,101,108,101,99,116,101,100,32,116,104,101,32,
-99,111,114,114,101,99,116,32,97,114,114,97,121,40,115,41,
-32,98,101,102,111,114,101,0,0,104,105,116,116,105,110,103,
-32,79,75,46,0,0,78,111,116,101,32,116,104,97,116,32,
-116,104,101,32,100,97,116,97,32,111,110,32,116,104,101,32,
-100,114,105,118,101,115,32,105,110,32,116,104,101,32,100,105,
-115,107,32,97,114,114,97,121,32,119,105,108,108,32,98,101,
-0,0,111,118,101,114,119,114,105,116,116,101,110,32,111,110,
-108,121,32,97,102,116,101,114,32,121,111,117,32,99,111,109,
-112,108,101,116,101,32,97,108,108,32,121,111,117,114,32,99,
-111,110,102,105,103,117,114,97,116,105,111,110,0,0,115,101,
-116,116,105,110,103,115,32,97,110,100,32,115,101,108,101,99,
-116,32,116,104,101,32,68,111,110,101,32,107,101,121,46,0,
-0,79,75,46,0,0,68,111,110,101,0,0,32,32,32,32,
+32,32,32,32,32,32,32,32,32,32,69,115,99,32,67,97,
+110,99,101,108,32,32,0,0,72,101,108,112,0,0,67,97,
+110,99,101,108,0,0,32,32,32,32,32,32,32,32,32,32,
+32,32,32,32,32,32,32,68,101,108,101,116,101,32,68,105,
+115,107,32,65,114,114,97,121,32,72,101,108,112,32,83,99,
+114,101,101,110,0,0,84,104,101,32,108,105,115,116,101,100,
+32,100,105,115,107,32,97,114,114,97,121,40,115,41,32,119,
+105,108,108,32,98,101,32,98,114,111,107,101,110,32,105,110,
+116,111,32,105,110,100,105,118,105,100,117,97,108,32,100,114,
+105,118,101,115,46,0,0,67,104,101,99,107,32,116,104,97,
+116,32,121,111,117,32,104,97,118,101,32,115,101,108,101,99,
+116,101,100,32,116,104,101,32,99,111,114,114,101,99,116,32,
+97,114,114,97,121,40,115,41,32,98,101,102,111,114,101,0,
+0,104,105,116,116,105,110,103,32,79,75,46,0,0,78,111,
+116,101,32,116,104,97,116,32,116,104,101,32,100,97,116,97,
+32,111,110,32,116,104,101,32,100,114,105,118,101,115,32,105,
+110,32,116,104,101,32,100,105,115,107,32,97,114,114,97,121,
+32,119,105,108,108,32,98,101,0,0,111,118,101,114,119,114,
+105,116,116,101,110,32,111,110,108,121,32,97,102,116,101,114,
+32,121,111,117,32,99,111,109,112,108,101,116,101,32,97,108,
+108,32,121,111,117,114,32,99,111,110,102,105,103,117,114,97,
+116,105,111,110,0,0,115,101,116,116,105,110,103,115,32,97,
+110,100,32,115,101,108,101,99,116,32,116,104,101,32,68,111,
+110,101,32,107,101,121,46,0,0,79,75,46,0,0,68,111,
+110,101,0,0,32,32,32,32,32,32,32,32,32,32,32,32,
 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,32,32,32,32,32,32,32,32,32,32,82,101,98,117,105,
-108,100,32,68,105,115,107,32,65,114,114,97,121,32,32,32,
+32,32,32,82,101,98,117,105,108,100,32,68,105,115,107,32,
+65,114,114,97,121,32,32,32,32,32,32,32,32,32,32,32,
 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,32,32,32,32,32,32,32,32,32,32,32,0,0,78,111,
-116,101,58,32,82,101,98,117,105,108,100,105,110,103,32,119,
-105,108,108,32,111,99,99,117,114,32,97,102,116,101,114,32,
-97,108,108,32,99,111,110,102,105,103,117,114,97,116,105,111,
-110,32,99,104,97,110,103,101,115,32,97,114,101,32,99,111,
-109,112,108,101,116,101,0,0,97,110,100,32,121,111,117,32,
-104,97,118,101,32,101,120,105,116,101,100,32,116,104,101,32,
-51,119,97,114,101,32,68,105,115,107,32,65,114,114,97,121,
-32,67,111,110,102,105,103,117,114,97,116,105,111,110,32,85,
-116,105,108,105,116,121,32,40,70,56,41,46,0,0,32,32,
-65,108,116,45,70,49,32,72,101,108,112,32,32,32,32,32,
+32,32,32,32,0,0,78,111,116,101,58,32,82,101,98,117,
+105,108,100,105,110,103,32,119,105,108,108,32,111,99,99,117,
+114,32,97,102,116,101,114,32,97,108,108,32,99,111,110,102,
+105,103,117,114,97,116,105,111,110,32,99,104,97,110,103,101,
+115,32,97,114,101,32,99,111,109,112,108,101,116,101,0,0,
+97,110,100,32,121,111,117,32,104,97,118,101,32,101,120,105,
+116,101,100,32,116,104,101,32,51,119,97,114,101,32,68,105,
+115,107,32,65,114,114,97,121,32,67,111,110,102,105,103,117,
+114,97,116,105,111,110,32,85,116,105,108,105,116,121,32,40,
+70,56,41,46,0,0,32,32,65,108,116,45,70,49,32,72,
+101,108,112,32,32,32,32,32,32,32,32,32,32,32,32,32,
 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
+32,32,32,32,32,32,32,32,32,32,69,115,99,32,67,97,
+110,99,101,108,32,32,0,0,72,101,108,112,0,0,67,97,
+110,99,101,108,0,0,32,32,32,32,32,32,32,32,32,32,
+32,32,32,32,32,32,32,82,101,98,117,105,108,100,32,68,
+105,115,107,32,65,114,114,97,121,32,72,101,108,112,32,83,
+99,114,101,101,110,0,0,84,104,101,32,115,101,108,101,99,
+116,101,100,32,97,114,114,97,121,32,119,105,108,108,32,98,
+101,32,114,101,98,117,105,108,116,46,32,65,102,116,101,114,
+32,116,104,101,32,99,111,109,112,108,101,116,105,111,110,32,
+111,102,0,0,114,101,98,117,105,108,100,44,32,116,104,101,
+32,97,114,114,97,121,32,119,105,108,108,32,98,101,99,111,
+109,101,32,102,97,117,108,116,32,116,111,108,101,114,97,110,
+116,32,97,103,97,105,110,46,32,84,104,101,32,115,116,97,
+116,117,115,0,0,119,105,108,108,32,109,111,118,101,32,102,
+114,111,109,32,100,101,103,114,97,100,101,100,32,116,111,32,
+114,101,98,117,105,108,100,105,110,103,32,116,111,32,110,111,
+114,109,97,108,46,0,0,100,101,103,114,97,100,101,100,0,
+0,114,101,98,117,105,108,100,105,110,103,0,0,78,111,116,
+101,32,116,104,97,116,32,116,104,101,32,114,101,98,117,105,
+108,100,32,119,105,108,108,32,110,111,116,32,97,99,116,117,
+97,108,108,121,32,98,101,103,105,110,32,117,110,116,105,108,
+32,97,102,116,101,114,32,116,104,101,0,0,111,112,101,114,
+97,116,105,110,103,32,115,121,115,116,101,109,32,105,115,32,
+108,111,97,100,101,100,46,0,0,32,49,32,115,101,99,111,
+110,100,32,0,0,32,50,32,115,101,99,111,110,100,115,0,
+0,32,51,32,115,101,99,111,110,100,115,0,0,32,52,32,
+115,101,99,111,110,100,115,0,0,32,53,32,115,101,99,111,
+110,100,115,0,0,32,54,32,115,101,99,111,110,100,115,0,
+0,32,32,49,32,32,0,0,32,32,50,32,32,0,0,32,
+32,51,32,32,0,0,32,32,52,32,32,0,0,32,32,53,
+32,32,0,0,32,32,54,32,32,0,0,32,32,55,32,32,
+0,0,32,32,56,32,32,0,0,32,32,57,32,32,0,0,
+32,49,48,32,32,0,0,32,49,49,32,32,0,0,32,49,
+50,32,32,0,0,32,49,51,32,32,0,0,32,49,52,32,
+32,0,0,32,49,53,32,32,0,0,32,49,54,32,32,0,
+0,32,65,84,65,45,54,32,0,0,83,65,84,65,79,79,
+66,0,0,32,32,32,32,32,32,32,32,32,32,32,32,32,
 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,32,69,115,99,32,67,97,110,99,101,108,32,32,0,0,
-72,101,108,112,0,0,67,97,110,99,101,108,0,0,32,32,
-32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,82,
-101,98,117,105,108,100,32,68,105,115,107,32,65,114,114,97,
-121,32,72,101,108,112,32,83,99,114,101,101,110,0,0,84,
-104,101,32,115,101,108,101,99,116,101,100,32,97,114,114,97,
-121,32,119,105,108,108,32,98,101,32,114,101,98,117,105,108,
-116,46,32,65,102,116,101,114,32,116,104,101,32,99,111,109,
-112,108,101,116,105,111,110,32,111,102,0,0,114,101,98,117,
-105,108,100,44,32,116,104,101,32,97,114,114,97,121,32,119,
-105,108,108,32,98,101,99,111,109,101,32,102,97,117,108,116,
-32,116,111,108,101,114,97,110,116,32,97,103,97,105,110,46,
-32,84,104,101,32,115,116,97,116,117,115,0,0,119,105,108,
-108,32,109,111,118,101,32,102,114,111,109,32,100,101,103,114,
-97,100,101,100,32,116,111,32,114,101,98,117,105,108,100,105,
-110,103,32,116,111,32,110,111,114,109,97,108,46,0,0,100,
-101,103,114,97,100,101,100,0,0,114,101,98,117,105,108,100,
-105,110,103,0,0,78,111,116,101,32,116,104,97,116,32,116,
-104,101,32,114,101,98,117,105,108,100,32,119,105,108,108,32,
-110,111,116,32,97,99,116,117,97,108,108,121,32,98,101,103,
-105,110,32,117,110,116,105,108,32,97,102,116,101,114,32,116,
-104,101,0,0,111,112,101,114,97,116,105,110,103,32,115,121,
-115,116,101,109,32,105,115,32,108,111,97,100,101,100,46,0,
-0,32,49,32,115,101,99,111,110,100,32,0,0,32,50,32,
-115,101,99,111,110,100,115,0,0,32,51,32,115,101,99,111,
-110,100,115,0,0,32,52,32,115,101,99,111,110,100,115,0,
-0,32,53,32,115,101,99,111,110,100,115,0,0,32,54,32,
-115,101,99,111,110,100,115,0,0,32,32,49,32,32,0,0,
-32,32,50,32,32,0,0,32,32,51,32,32,0,0,32,32,
-52,32,32,0,0,32,32,53,32,32,0,0,32,32,54,32,
-32,0,0,32,32,55,32,32,0,0,32,32,56,32,32,0,
-0,32,32,57,32,32,0,0,32,49,48,32,32,0,0,32,
-49,49,32,32,0,0,32,49,50,32,32,0,0,32,49,51,
-32,32,0,0,32,49,52,32,32,0,0,32,49,53,32,32,
-0,0,32,49,54,32,32,0,0,32,65,84,65,45,54,32,
-0,0,83,65,84,65,79,79,66,0,0,32,32,32,32,32,
+32,32,32,32,80,111,108,105,99,121,32,67,111,110,116,114,
+111,108,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,32,32,32,32,32,32,32,32,32,32,32,80,111,108,105,
-99,121,32,67,111,110,116,114,111,108,32,32,32,32,32,32,
+32,32,32,0,0,78,111,116,101,58,32,67,104,97,110,103,
+105,110,103,32,74,66,79,68,32,112,111,108,105,99,121,32,
+119,105,108,108,32,99,97,117,115,101,32,97,108,108,32,114,
+101,99,101,110,116,32,109,111,100,105,102,105,101,100,32,99,
+111,110,102,105,103,117,114,97,116,105,111,110,32,108,111,115,
+116,46,0,0,32,32,0,0,69,120,112,111,114,116,32,74,
+66,79,68,32,100,105,115,107,115,58,0,0,78,111,116,101,
+58,32,83,116,97,103,103,101,114,101,100,32,115,112,105,110,
+117,112,32,119,111,114,107,115,32,111,110,108,121,32,105,102,
+32,116,104,101,32,100,114,105,118,101,115,32,115,117,112,112,
+111,114,116,32,105,116,46,0,0,83,116,97,103,103,101,114,
+101,100,32,115,112,105,110,117,112,58,0,0,78,117,109,98,
+101,114,32,111,102,32,100,114,105,118,101,115,32,112,101,114,
+32,115,112,105,110,117,112,58,0,0,68,101,108,97,121,32,
+98,101,116,119,101,101,110,32,115,112,105,110,117,112,58,0,
+0,68,105,115,97,98,108,101,32,119,114,105,116,101,32,99,
+97,99,104,101,32,111,110,0,0,32,32,100,101,103,114,97,
+100,101,100,32,97,114,114,97,121,58,0,0,83,116,97,103,
+103,101,114,101,100,32,109,101,116,104,111,100,58,0,0,32,
+32,65,108,116,45,70,49,32,72,101,108,112,32,32,32,32,
 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,32,32,32,32,32,32,32,32,32,32,0,0,78,111,116,
-101,58,32,67,104,97,110,103,105,110,103,32,74,66,79,68,
-32,112,111,108,105,99,121,32,119,105,108,108,32,99,97,117,
-115,101,32,97,108,108,32,114,101,99,101,110,116,32,109,111,
-100,105,102,105,101,100,32,99,111,110,102,105,103,117,114,97,
-116,105,111,110,32,108,111,115,116,46,0,0,32,32,0,0,
-69,120,112,111,114,116,32,74,66,79,68,32,100,105,115,107,
-115,58,0,0,78,111,116,101,58,32,83,116,97,103,103,101,
-114,101,100,32,115,112,105,110,117,112,32,119,111,114,107,115,
-32,111,110,108,121,32,105,102,32,116,104,101,32,100,114,105,
-118,101,115,32,115,117,112,112,111,114,116,32,105,116,46,0,
-0,83,116,97,103,103,101,114,101,100,32,115,112,105,110,117,
-112,58,0,0,78,117,109,98,101,114,32,111,102,32,100,114,
-105,118,101,115,32,112,101,114,32,115,112,105,110,117,112,58,
-0,0,68,101,108,97,121,32,98,101,116,119,101,101,110,32,
-115,112,105,110,117,112,58,0,0,68,105,115,97,98,108,101,
-32,119,114,105,116,101,32,99,97,99,104,101,32,111,110,0,
-0,32,32,100,101,103,114,97,100,101,100,32,97,114,114,97,
-121,58,0,0,83,116,97,103,103,101,114,101,100,32,109,101,
-116,104,111,100,58,0,0,32,32,65,108,116,45,70,49,32,
-72,101,108,112,32,32,32,32,32,32,32,32,32,32,32,32,
 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,32,32,32,32,32,32,32,32,32,32,69,115,99,32,67,
-97,110,99,101,108,32,32,0,0,72,101,108,112,0,0,67,
-97,110,99,101,108,0,0,32,32,32,32,32,32,32,32,32,
-32,32,32,32,32,32,32,32,32,32,80,111,108,105,99,121,
-32,67,111,110,116,114,111,108,32,72,101,108,112,32,83,99,
-114,101,101,110,0,0,84,104,105,115,32,115,99,114,101,101,
-110,32,97,108,108,111,119,115,32,109,111,100,105,102,105,99,
-97,116,105,111,110,32,111,102,32,115,111,109,101,32,112,111,
-108,105,99,121,32,115,101,116,116,105,110,103,32,111,102,32,
-116,104,105,115,0,0,116,104,105,115,0,0,98,111,97,114,
-100,46,32,32,84,104,101,32,99,104,97,110,103,101,115,32,
-119,105,108,108,32,98,101,32,115,97,118,101,100,32,119,104,
-101,110,32,104,105,116,116,105,110,103,32,79,75,46,32,32,
-84,104,101,32,115,97,118,101,100,0,0,79,75,46,0,0,
-118,97,108,117,101,115,32,119,105,108,108,32,112,101,114,115,
-105,115,116,32,116,104,114,111,117,103,104,32,112,111,119,101,
-114,32,99,121,99,108,101,115,46,0,0,78,111,116,101,32,
-116,104,97,116,32,99,104,97,110,103,105,110,103,32,116,104,
-101,32,69,120,112,111,114,116,32,74,66,79,68,32,115,101,
-116,116,105,110,103,32,119,105,108,108,0,0,114,101,115,117,
-108,116,32,105,110,32,108,111,115,105,110,103,32,99,111,110,
-102,105,103,117,114,97,116,105,111,110,32,99,104,97,110,103,
-101,115,46,0,0,67,104,97,110,103,105,110,103,32,112,111,
-108,105,99,121,32,111,110,32,101,120,112,111,114,116,105,110,
-103,32,111,102,32,74,66,79,68,32,100,105,115,107,115,32,
-119,105,108,108,0,0,99,97,117,115,101,32,97,108,108,32,
-99,111,110,102,105,103,117,114,97,116,105,111,110,32,99,104,
-97,110,103,101,115,32,108,111,115,116,46,0,0,108,111,115,
-116,0,0,73,102,32,116,104,97,116,32,105,115,32,110,111,
-116,32,105,110,116,101,110,100,101,100,44,32,112,108,101,97,
-115,101,32,112,114,101,115,115,32,78,46,32,32,84,104,101,
-110,0,0,116,104,101,32,109,111,100,105,102,105,101,100,32,
-99,111,110,102,105,103,117,114,97,116,105,111,110,32,119,105,
-108,108,32,110,111,116,32,98,101,32,108,111,115,116,46,0,
-0,68,111,32,121,111,117,32,119,97,110,116,32,116,111,32,
-99,111,109,109,105,116,32,116,104,101,32,112,111,108,105,99,
-121,32,99,104,97,110,103,101,63,32,91,89,47,78,93,0,
-0,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,32,32,32,80,111,108,105,99,121,32,67,111,110,116,114,
-111,108,32,72,101,108,112,32,83,99,114,101,101,110,0,0,
-84,104,101,32,115,101,108,101,99,116,101,100,32,97,114,114,
-97,121,32,119,105,108,108,32,98,101,32,114,101,98,117,105,
-108,116,46,32,65,102,116,101,114,32,116,104,101,32,99,111,
-109,112,108,101,116,105,111,110,32,111,102,0,0,114,101,98,
-117,105,108,100,44,32,116,104,101,32,97,114,114,97,121,32,
-119,105,108,108,32,98,101,99,111,109,101,32,102,97,117,108,
-116,32,116,111,108,101,114,97,110,116,32,97,103,97,105,110,
-46,32,84,104,101,32,115,116,97,116,117,115,0,0,119,105,
-108,108,32,109,111,118,101,32,102,114,111,109,32,100,101,103,
-114,97,100,101,100,32,116,111,32,114,101,98,117,105,108,100,
-105,110,103,32,116,111,32,110,111,114,109,97,108,46,0,0,
-100,101,103,114,97,100,101,100,0,0,114,101,98,117,105,108,
-100,105,110,103,0,0,78,111,116,101,32,116,104,97,116,32,
-116,104,101,32,114,101,98,117,105,108,100,32,119,105,108,108,
-32,110,111,116,32,97,99,116,117,97,108,108,121,32,98,101,
-103,105,110,32,117,110,116,105,108,32,97,102,116,101,114,32,
-116,104,101,0,0,111,112,101,114,97,116,105,110,103,32,115,
-121,115,116,101,109,32,105,115,32,108,111,97,100,101,100,46,
-0,0,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
+32,32,32,69,115,99,32,67,97,110,99,101,108,32,32,0,
+0,72,101,108,112,0,0,67,97,110,99,101,108,0,0,32,
 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-77,97,105,110,116,97,105,110,32,68,105,115,107,32,65,114,
-114,97,121,32,32,32,32,32,32,32,32,32,32,32,32,32,
+32,32,80,111,108,105,99,121,32,67,111,110,116,114,111,108,
+32,72,101,108,112,32,83,99,114,101,101,110,0,0,84,104,
+105,115,32,115,99,114,101,101,110,32,97,108,108,111,119,115,
+32,109,111,100,105,102,105,99,97,116,105,111,110,32,111,102,
+32,115,111,109,101,32,112,111,108,105,99,121,32,115,101,116,
+116,105,110,103,32,111,102,32,116,104,105,115,0,0,116,104,
+105,115,0,0,98,111,97,114,100,46,32,32,84,104,101,32,
+99,104,97,110,103,101,115,32,119,105,108,108,32,98,101,32,
+115,97,118,101,100,32,119,104,101,110,32,104,105,116,116,105,
+110,103,32,79,75,46,32,32,84,104,101,32,115,97,118,101,
+100,0,0,79,75,46,0,0,118,97,108,117,101,115,32,119,
+105,108,108,32,112,101,114,115,105,115,116,32,116,104,114,111,
+117,103,104,32,112,111,119,101,114,32,99,121,99,108,101,115,
+46,0,0,78,111,116,101,32,116,104,97,116,32,99,104,97,
+110,103,105,110,103,32,116,104,101,32,69,120,112,111,114,116,
+32,74,66,79,68,32,115,101,116,116,105,110,103,32,119,105,
+108,108,0,0,114,101,115,117,108,116,32,105,110,32,108,111,
+115,105,110,103,32,99,111,110,102,105,103,117,114,97,116,105,
+111,110,32,99,104,97,110,103,101,115,46,0,0,67,104,97,
+110,103,105,110,103,32,112,111,108,105,99,121,32,111,110,32,
+101,120,112,111,114,116,105,110,103,32,111,102,32,74,66,79,
+68,32,100,105,115,107,115,32,119,105,108,108,0,0,99,97,
+117,115,101,32,97,108,108,32,99,111,110,102,105,103,117,114,
+97,116,105,111,110,32,99,104,97,110,103,101,115,32,108,111,
+115,116,46,0,0,108,111,115,116,0,0,73,102,32,116,104,
+97,116,32,105,115,32,110,111,116,32,105,110,116,101,110,100,
+101,100,44,32,112,108,101,97,115,101,32,112,114,101,115,115,
+32,78,46,32,32,84,104,101,110,0,0,116,104,101,32,109,
+111,100,105,102,105,101,100,32,99,111,110,102,105,103,117,114,
+97,116,105,111,110,32,119,105,108,108,32,110,111,116,32,98,
+101,32,108,111,115,116,46,0,0,68,111,32,121,111,117,32,
+119,97,110,116,32,116,111,32,99,111,109,109,105,116,32,116,
+104,101,32,112,111,108,105,99,121,32,99,104,97,110,103,101,
+63,32,91,89,47,78,93,0,0,32,32,32,32,32,32,32,
+32,32,32,32,32,32,32,32,32,32,32,32,80,111,108,105,
+99,121,32,67,111,110,116,114,111,108,32,72,101,108,112,32,
+83,99,114,101,101,110,0,0,84,104,101,32,115,101,108,101,
+99,116,101,100,32,97,114,114,97,121,32,119,105,108,108,32,
+98,101,32,114,101,98,117,105,108,116,46,32,65,102,116,101,
+114,32,116,104,101,32,99,111,109,112,108,101,116,105,111,110,
+32,111,102,0,0,114,101,98,117,105,108,100,44,32,116,104,
+101,32,97,114,114,97,121,32,119,105,108,108,32,98,101,99,
+111,109,101,32,102,97,117,108,116,32,116,111,108,101,114,97,
+110,116,32,97,103,97,105,110,46,32,84,104,101,32,115,116,
+97,116,117,115,0,0,119,105,108,108,32,109,111,118,101,32,
+102,114,111,109,32,100,101,103,114,97,100,101,100,32,116,111,
+32,114,101,98,117,105,108,100,105,110,103,32,116,111,32,110,
+111,114,109,97,108,46,0,0,100,101,103,114,97,100,101,100,
+0,0,114,101,98,117,105,108,100,105,110,103,0,0,78,111,
+116,101,32,116,104,97,116,32,116,104,101,32,114,101,98,117,
+105,108,100,32,119,105,108,108,32,110,111,116,32,97,99,116,
+117,97,108,108,121,32,98,101,103,105,110,32,117,110,116,105,
+108,32,97,102,116,101,114,32,116,104,101,0,0,111,112,101,
+114,97,116,105,110,103,32,115,121,115,116,101,109,32,105,115,
+32,108,111,97,100,101,100,46,0,0,32,32,32,32,32,32,
 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,32,0,0,84,104,101,32,97,114,114,97,121,32,108,105,
-115,116,101,100,32,98,101,108,111,119,32,99,97,110,32,104,
-97,118,101,32,105,116,115,32,119,114,105,116,101,32,99,97,
-99,104,101,32,115,116,97,116,101,32,99,104,97,110,103,101,
-100,46,0,0,86,101,114,105,102,121,32,99,104,101,99,107,
-115,32,116,104,101,32,100,97,116,97,32,105,110,116,101,103,
-114,105,116,121,32,111,102,32,97,32,102,97,117,108,116,32,
-116,111,108,101,114,97,110,116,32,97,114,114,97,121,46,0,
-0,86,101,114,105,102,121,32,65,114,114,97,121,58,0,0,
-67,111,110,116,105,110,117,101,32,111,110,32,115,111,117,114,
-99,101,32,101,114,114,111,114,0,0,100,117,114,105,110,103,
-32,114,101,98,117,105,108,100,58,0,0,65,114,114,97,121,
-39,115,32,87,114,105,116,101,32,67,97,99,104,101,32,83,
-116,97,116,101,58,0,0,32,32,32,110,111,32,32,32,0,
-0,32,32,121,101,115,32,32,32,0,0,32,32,32,101,110,
-97,98,108,101,100,32,32,0,0,32,32,100,105,115,97,98,
-108,101,100,32,32,0,0,110,111,0,0,121,101,115,0,0,
-78,101,119,108,121,32,99,114,101,97,116,101,100,32,97,114,
-114,97,121,32,99,97,110,32,110,111,116,32,98,101,32,118,
-101,114,105,102,105,101,100,46,0,0,84,104,105,115,32,97,
-114,114,97,121,32,119,105,108,108,32,110,111,116,32,98,101,
-32,118,101,114,105,102,105,101,100,32,98,101,99,97,117,115,
-101,32,105,116,32,105,115,32,110,111,116,0,0,105,110,32,
-110,111,114,109,97,108,32,109,111,100,101,46,0,0,32,32,
-32,32,32,32,32,32,32,32,32,32,32,32,32,32,77,97,
-105,110,116,97,105,110,32,68,105,115,107,32,65,114,114,97,
-121,32,72,101,108,112,32,83,99,114,101,101,110,0,0,84,
-104,101,32,119,114,105,116,101,32,99,97,99,104,101,32,99,
-97,110,32,98,101,32,101,110,97,98,108,101,100,47,100,105,
-115,97,98,108,101,100,32,111,110,32,97,110,32,97,114,114,
-97,121,32,98,121,32,97,114,114,97,121,0,0,98,97,115,
-105,115,46,0,0,73,102,32,86,101,114,105,102,121,32,65,
-114,114,97,121,32,105,115,32,39,121,101,115,39,44,32,116,
-104,101,110,32,116,104,101,32,97,114,114,97,121,32,119,105,
-108,108,32,98,101,32,118,101,114,105,102,105,101,100,0,0,
-97,102,116,101,114,32,39,79,75,39,32,105,115,32,112,114,
-101,115,115,101,100,46,0,0,119,114,105,116,101,32,99,97,
-99,104,101,0,0,86,101,114,105,102,121,32,65,114,114,97,
-121,0,0,32,32,32,32,32,32,32,32,32,32,32,32,32,
+32,32,32,32,32,32,32,32,77,97,105,110,116,97,105,110,
+32,68,105,115,107,32,65,114,114,97,121,32,32,32,32,32,
 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,32,32,65,100,118,97,110,99,101,32,68,101,116,97,105,
-108,115,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
+32,32,32,32,32,32,32,32,32,32,0,0,84,104,101,32,
+97,114,114,97,121,32,108,105,115,116,101,100,32,98,101,108,
+111,119,32,99,97,110,32,104,97,118,101,32,105,116,115,32,
+119,114,105,116,101,32,99,97,99,104,101,32,115,116,97,116,
+101,32,99,104,97,110,103,101,100,46,0,0,86,101,114,105,
+102,121,32,99,104,101,99,107,115,32,116,104,101,32,100,97,
+116,97,32,105,110,116,101,103,114,105,116,121,32,111,102,32,
+97,32,102,97,117,108,116,32,116,111,108,101,114,97,110,116,
+32,97,114,114,97,121,46,0,0,86,101,114,105,102,121,32,
+65,114,114,97,121,58,0,0,67,111,110,116,105,110,117,101,
+32,111,110,32,115,111,117,114,99,101,32,101,114,114,111,114,
+0,0,100,117,114,105,110,103,32,114,101,98,117,105,108,100,
+58,0,0,65,114,114,97,121,39,115,32,87,114,105,116,101,
+32,67,97,99,104,101,32,83,116,97,116,101,58,0,0,32,
+32,32,110,111,32,32,32,0,0,32,32,121,101,115,32,32,
+32,0,0,32,32,32,101,110,97,98,108,101,100,32,32,0,
+0,32,32,100,105,115,97,98,108,101,100,32,32,0,0,110,
+111,0,0,121,101,115,0,0,78,101,119,108,121,32,99,114,
+101,97,116,101,100,32,97,114,114,97,121,32,99,97,110,32,
+110,111,116,32,98,101,32,118,101,114,105,102,105,101,100,46,
+0,0,84,104,105,115,32,97,114,114,97,121,32,119,105,108,
+108,32,110,111,116,32,98,101,32,118,101,114,105,102,105,101,
+100,32,98,101,99,97,117,115,101,32,105,116,32,105,115,32,
+110,111,116,0,0,105,110,32,110,111,114,109,97,108,32,109,
+111,100,101,46,0,0,32,32,32,32,32,32,32,32,32,32,
+32,32,32,32,32,32,77,97,105,110,116,97,105,110,32,68,
+105,115,107,32,65,114,114,97,121,32,72,101,108,112,32,83,
+99,114,101,101,110,0,0,84,104,101,32,119,114,105,116,101,
+32,99,97,99,104,101,32,99,97,110,32,98,101,32,101,110,
+97,98,108,101,100,47,100,105,115,97,98,108,101,100,32,111,
+110,32,97,110,32,97,114,114,97,121,32,98,121,32,97,114,
+114,97,121,0,0,98,97,115,105,115,46,0,0,73,102,32,
+86,101,114,105,102,121,32,65,114,114,97,121,32,105,115,32,
+39,121,101,115,39,44,32,116,104,101,110,32,116,104,101,32,
+97,114,114,97,121,32,119,105,108,108,32,98,101,32,118,101,
+114,105,102,105,101,100,0,0,97,102,116,101,114,32,39,79,
+75,39,32,105,115,32,112,114,101,115,115,101,100,46,0,0,
+119,114,105,116,101,32,99,97,99,104,101,0,0,86,101,114,
+105,102,121,32,65,114,114,97,121,0,0,32,32,32,32,32,
 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,32,32,0,0,66,73,79,83,32,86,101,114,115,105,111,
-110,58,0,0,66,117,115,46,68,101,118,46,70,117,110,58,
-0,0,83,108,111,116,35,0,0,66,97,115,101,73,79,58,
-0,0,70,87,32,86,101,114,115,105,111,110,58,0,0,77,
-111,110,105,116,111,114,32,86,101,114,115,105,111,110,58,0,
-0,77,111,100,101,108,58,0,0,79,110,98,111,97,114,100,
-32,77,101,109,111,114,121,32,115,105,122,101,58,0,0,83,
-101,114,105,97,108,32,110,117,109,98,101,114,58,0,0,83,
-121,115,116,101,109,32,66,66,83,32,83,117,112,112,111,114,
-116,58,0,0,32,32,32,32,32,32,32,32,32,32,32,32,
-32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,80,
-114,101,115,115,32,97,110,121,32,107,101,121,32,116,111,32,
-99,111,110,116,105,110,117,101,46,32,32,32,32,32,32,32,
+32,32,32,32,32,32,32,32,32,32,32,65,100,118,97,110,
+99,101,32,68,101,116,97,105,108,115,32,32,32,32,32,32,
 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,32,32,32,0,0,236,236,236,32,80,114,101,115,115,32,
-60,65,108,116,45,51,62,32,116,111,32,97,99,99,101,115,
-115,32,51,119,97,114,101,32,66,73,79,83,32,77,97,110,
-97,103,101,114,32,236,236,236,0,0,79,112,101,114,97,116,
-105,111,110,32,109,101,109,111,114,121,32,97,108,108,111,99,
-97,116,105,111,110,32,102,97,105,108,46,0,0,32,32,32,
+32,32,32,32,32,32,32,32,32,32,32,0,0,66,73,79,
+83,32,86,101,114,115,105,111,110,58,0,0,66,117,115,46,
+68,101,118,46,70,117,110,58,0,0,83,108,111,116,35,0,
+0,66,97,115,101,73,79,58,0,0,70,87,32,86,101,114,
+115,105,111,110,58,0,0,77,111,110,105,116,111,114,32,86,
+101,114,115,105,111,110,58,0,0,77,111,100,101,108,58,0,
+0,79,110,98,111,97,114,100,32,77,101,109,111,114,121,32,
+115,105,122,101,58,0,0,83,101,114,105,97,108,32,110,117,
+109,98,101,114,58,0,0,83,121,115,116,101,109,32,66,66,
+83,32,83,117,112,112,111,114,116,58,0,0,32,32,32,32,
 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,32,32,32,32,32,32,32,32,32,32,51,119,97,114,101,
-32,66,111,97,114,100,115,32,115,101,108,101,99,116,105,111,
-110,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,32,32,32,32,32,32,32,32,32,32,32,32,0,0,32,
-32,32,32,32,32,32,32,32,32,32,32,32,32,32,18,29,
-32,80,114,101,118,105,111,117,115,47,78,101,120,116,32,32,
-32,32,32,69,110,116,101,114,32,71,111,32,105,110,116,111,
-32,104,105,103,104,108,105,103,104,116,101,100,32,98,111,97,
-114,100,32,32,32,32,32,32,32,32,32,32,32,32,32,0,
-0,80,114,101,118,105,111,117,115,47,78,101,120,116,0,0,
-32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,0,
-0,71,111,32,105,110,116,111,32,104,105,103,104,108,105,103,
-104,116,101,100,32,98,111,97,114,100,0,0,32,32,32,32,
+32,32,32,32,32,32,32,80,114,101,115,115,32,97,110,121,
+32,107,101,121,32,116,111,32,99,111,110,116,105,110,117,101,
+46,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
+32,32,32,32,32,32,32,32,32,32,32,32,0,0,236,236,
+236,32,80,114,101,115,115,32,60,65,108,116,45,51,62,32,
+116,111,32,97,99,99,101,115,115,32,51,119,97,114,101,32,
+66,73,79,83,32,77,97,110,97,103,101,114,32,236,236,236,
+0,0,79,112,101,114,97,116,105,111,110,32,109,101,109,111,
+114,121,32,97,108,108,111,99,97,116,105,111,110,32,102,97,
+105,108,46,0,0,32,32,32,32,32,32,32,32,32,32,32,
 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,32,32,32,32,32,32,32,32,32,32,32,69,115,99,32,
-67,97,110,99,101,108,32,32,32,32,32,32,32,32,32,32,
-32,32,32,32,32,70,56,32,68,111,110,101,32,32,32,32,
-32,32,32,32,32,32,32,32,32,32,32,32,0,0,32,32,
+32,32,32,51,119,97,114,101,32,66,111,97,114,100,115,32,
+115,101,108,101,99,116,105,111,110,32,32,32,32,32,32,32,
 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,32,32,32,0,0,67,97,110,99,101,108,0,0,68,111,
-110,101,0,0,66,111,97,114,100,32,97,116,32,115,108,111,
-116,58,0,0,9,28,145,131,112,12,28,168,131,112,9,50,
-192,131,126,12,46,195,131,126,9,28,200,131,112,12,28,168,
-131,112,9,50,192,131,126,12,46,195,131,126,80,155,0,0,
-20,14,1,127,112,21,14,42,127,112,218,191,192,217,196,179,
-201,187,200,188,205,186,20,21,22,23,24,25,26,27,28,19,
-30,31,32,32,32,32,32,32,0,48,120,252,48,48,48,0,
-0,48,48,48,252,120,48,0,102,102,102,102,102,230,230,6,
-6,254,254,0,0,0,0,0,0,0,0,0,0,0,0,31,
-31,24,24,24,24,24,24,24,0,0,0,0,0,0,0,248,
-248,24,24,24,24,24,24,24,24,24,24,24,24,24,24,31,
-31,0,0,0,0,0,0,0,24,24,24,24,24,24,24,248,
-248,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,
-255,0,0,0,0,0,0,0,24,24,24,24,24,24,24,24,
-24,24,24,24,24,24,24,24,0,0,0,0,0,127,127,96,
-96,103,103,102,102,102,102,102,0,0,0,0,0,254,254,6,
-6,230,230,102,102,102,102,102,102,102,102,102,102,103,103,96,
-96,127,127,0,0,0,0,0,0,0,0,0,0,36,102,255,
-255,102,36,0,0,0,0,0,0,0,0,0,0,255,255,0,
-0,255,255,0,0,0,0,0,102,102,102,102,102,102,102,102,
-102,102,102,102,102,102,102,102,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,24,60,60,60,24,24,
-24,0,24,24,0,0,0,0,0,102,102,102,36,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,108,108,254,108,108,
-108,254,108,108,0,0,0,0,24,24,124,198,194,192,124,6,
-6,134,198,124,24,24,0,0,0,0,0,0,194,198,12,24,
-48,96,198,134,0,0,0,0,0,0,56,108,108,56,118,220,
-204,204,204,118,0,0,0,0,0,48,48,48,96,0,0,0,
-0,0,0,0,0,0,0,0,0,0,12,24,48,48,48,48,
-48,48,24,12,0,0,0,0,0,0,48,24,12,12,12,12,
-12,12,24,48,0,0,0,0,0,0,0,0,0,102,60,255,
-60,102,0,0,0,0,0,0,0,0,0,0,0,24,24,126,
-24,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,24,24,24,48,0,0,0,0,0,0,0,0,0,0,254,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,24,24,0,0,0,0,0,0,0,0,2,6,12,24,
-48,96,192,128,0,0,0,0,0,0,56,108,198,198,214,214,
-198,198,108,56,0,0,0,0,0,0,24,56,120,24,24,24,
-24,24,24,126,0,0,0,0,0,0,124,198,6,12,24,48,
-96,192,198,254,0,0,0,0,0,0,124,198,6,6,60,6,
-6,6,198,124,0,0,0,0,0,0,12,28,60,108,204,254,
-12,12,12,30,0,0,0,0,0,0,254,192,192,192,252,6,
-6,6,198,124,0,0,0,0,0,0,56,96,192,192,252,198,
-198,198,198,124,0,0,0,0,0,0,254,198,6,6,12,24,
-48,48,48,48,0,0,0,0,0,0,124,198,198,198,124,198,
-198,198,198,124,0,0,0,0,0,0,124,198,198,198,126,6,
-6,6,12,120,0,0,0,0,0,0,0,0,24,24,0,0,
-0,24,24,0,0,0,0,0,0,0,0,0,24,24,0,0,
-0,24,24,48,0,0,0,0,0,0,0,6,12,24,48,96,
-48,24,12,6,0,0,0,0,0,0,0,0,0,126,0,0,
-126,0,0,0,0,0,0,0,0,0,0,96,48,24,12,6,
-12,24,48,96,0,0,0,0,0,0,124,198,198,12,24,24,
-24,0,24,24,0,0,0,0,0,0,0,124,198,198,222,222,
-222,220,192,124,0,0,0,0,0,0,16,56,108,198,198,254,
-198,198,198,198,0,0,0,0,0,0,252,102,102,102,124,102,
-102,102,102,252,0,0,0,0,0,0,60,102,194,192,192,192,
-192,194,102,60,0,0,0,0,0,0,248,108,102,102,102,102,
-102,102,108,248,0,0,0,0,0,0,254,102,98,104,120,104,
-96,98,102,254,0,0,0,0,0,0,254,102,98,104,120,104,
-96,96,96,240,0,0,0,0,0,0,60,102,194,192,192,222,
-198,198,102,58,0,0,0,0,0,0,198,198,198,198,254,198,
-198,198,198,198,0,0,0,0,0,0,60,24,24,24,24,24,
-24,24,24,60,0,0,0,0,0,0,30,12,12,12,12,12,
-204,204,204,120,0,0,0,0,0,0,230,102,102,108,120,120,
-108,102,102,230,0,0,0,0,0,0,240,96,96,96,96,96,
-96,98,102,254,0,0,0,0,0,0,198,238,254,254,214,198,
-198,198,198,198,0,0,0,0,0,0,198,230,246,254,222,206,
-198,198,198,198,0,0,0,0,0,0,124,198,198,198,198,198,
-198,198,198,124,0,0,0,0,0,0,252,102,102,102,124,96,
-96,96,96,240,0,0,0,0,0,0,124,198,198,198,198,198,
-198,214,222,124,12,14,0,0,0,0,252,102,102,102,124,108,
-102,102,102,230,0,0,0,0,0,0,124,198,198,96,56,12,
-6,198,198,124,0,0,0,0,0,0,126,126,90,24,24,24,
-24,24,24,60,0,0,0,0,0,0,198,198,198,198,198,198,
-198,198,198,124,0,0,0,0,0,0,198,198,198,198,198,198,
-198,108,56,16,0,0,0,0,0,0,198,198,198,198,214,214,
-214,254,238,108,0,0,0,0,0,0,198,198,108,124,56,56,
-124,108,198,198,0,0,0,0,0,0,102,102,102,102,60,24,
-24,24,24,60,0,0,0,0,0,0,254,198,134,12,24,48,
-96,194,198,254,0,0,0,0,0,0,60,48,48,48,48,48,
-48,48,48,60,0,0,0,0,0,0,0,128,192,224,112,56,
-28,14,6,2,0,0,0,0,0,0,60,12,12,12,12,12,
-12,12,12,60,0,0,0,0,16,56,108,198,0,0,0,0,
+32,32,32,32,32,0,0,32,32,32,32,32,32,32,32,32,
+32,32,32,32,32,32,18,29,32,80,114,101,118,105,111,117,
+115,47,78,101,120,116,32,32,32,32,32,69,110,116,101,114,
+32,71,111,32,105,110,116,111,32,104,105,103,104,108,105,103,
+104,116,101,100,32,98,111,97,114,100,32,32,32,32,32,32,
+32,32,32,32,32,32,32,0,0,80,114,101,118,105,111,117,
+115,47,78,101,120,116,0,0,32,32,32,32,32,32,32,32,
+32,32,32,32,32,32,32,0,0,71,111,32,105,110,116,111,
+32,104,105,103,104,108,105,103,104,116,101,100,32,98,111,97,
+114,100,0,0,32,32,32,32,32,32,32,32,32,32,32,32,
+32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
+32,32,32,32,69,115,99,32,67,97,110,99,101,108,32,32,
+32,32,32,32,32,32,32,32,32,32,32,32,32,70,56,32,
+68,111,110,101,32,32,32,32,32,32,32,32,32,32,32,32,
+32,32,32,32,0,0,32,32,32,32,32,32,32,32,32,32,
+32,32,32,32,32,32,32,32,32,32,32,32,0,0,67,97,
+110,99,101,108,0,0,68,111,110,101,0,0,66,111,97,114,
+100,32,97,116,32,115,108,111,116,58,0,0,9,28,145,131,
+112,12,28,168,131,112,9,50,192,131,126,12,46,195,131,126,
+9,28,200,131,112,12,28,168,131,112,9,50,192,131,126,12,
+46,195,131,126,80,155,0,0,20,14,1,127,112,21,14,42,
+127,112,218,191,192,217,196,179,201,187,200,188,205,186,20,21,
+22,23,24,25,26,27,28,19,30,31,32,32,32,32,32,32,
+0,48,120,252,48,48,48,0,0,48,48,48,252,120,48,0,
+102,102,102,102,102,230,230,6,6,254,254,0,0,0,0,0,
+0,0,0,0,0,0,0,31,31,24,24,24,24,24,24,24,
+0,0,0,0,0,0,0,248,248,24,24,24,24,24,24,24,
+24,24,24,24,24,24,24,31,31,0,0,0,0,0,0,0,
+24,24,24,24,24,24,24,248,248,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,255,255,0,0,0,0,0,0,0,
+24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,
+0,0,0,0,0,127,127,96,96,103,103,102,102,102,102,102,
+0,0,0,0,0,254,254,6,6,230,230,102,102,102,102,102,
+102,102,102,102,102,103,103,96,96,127,127,0,0,0,0,0,
+0,0,0,0,0,36,102,255,255,102,36,0,0,0,0,0,
+0,0,0,0,0,255,255,0,0,255,255,0,0,0,0,0,
+102,102,102,102,102,102,102,102,102,102,102,102,102,102,102,102,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,255,0,0,48,48,24,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,120,12,124,
-204,204,204,118,0,0,0,0,0,0,224,96,96,120,108,102,
-102,102,102,124,0,0,0,0,0,0,0,0,0,124,198,192,
-192,192,198,124,0,0,0,0,0,0,28,12,12,60,108,204,
-204,204,204,118,0,0,0,0,0,0,0,0,0,124,198,254,
-192,192,198,124,0,0,0,0,0,0,56,108,100,96,240,96,
-96,96,96,240,0,0,0,0,0,0,0,0,0,118,204,204,
-204,204,204,124,12,204,120,0,0,0,224,96,96,108,118,102,
-102,102,102,230,0,0,0,0,0,0,24,24,0,56,24,24,
-24,24,24,60,0,0,0,0,0,0,6,6,0,14,6,6,
-6,6,6,6,102,102,60,0,0,0,224,96,96,102,108,120,
-120,108,102,230,0,0,0,0,0,0,56,24,24,24,24,24,
-24,24,24,60,0,0,0,0,0,0,0,0,0,236,254,214,
-214,214,214,198,0,0,0,0,0,0,0,0,0,220,102,102,
-102,102,102,102,0,0,0,0,0,0,0,0,0,124,198,198,
-198,198,198,124,0,0,0,0,0,0,0,0,0,220,102,102,
-102,102,102,124,96,96,240,0,0,0,0,0,0,118,204,204,
-204,204,204,124,12,12,30,0,0,0,0,0,0,220,118,102,
-96,96,96,240,0,0,0,0,0,0,0,0,0,124,198,96,
-56,12,198,124,0,0,0,0,0,0,16,48,48,252,48,48,
-48,48,54,28,0,0,0,0,0,0,0,0,0,204,204,204,
-204,204,204,118,0,0,0,0,0,0,0,0,0,102,102,102,
-102,102,60,24,0,0,0,0,0,0,0,0,0,198,198,214,
-214,214,254,108,0,0,0,0,0,0,0,0,0,198,108,56,
-56,56,108,198,0,0,0,0,0,0,0,0,0,198,198,198,
-198,198,198,126,6,12,248,0,0,0,0,0,0,254,204,24,
-48,96,198,254,0,0,0,0,0,0,14,24,24,24,112,24,
-24,24,24,14,0,0,0,0,0,0,24,24,24,24,0,24,
-24,24,24,24,0,0,0,0,0,0,112,24,24,24,14,24,
-24,24,24,112,0,0,0,0,0,0,118,220,0,0,0,0,
+0,0,24,60,60,60,24,24,24,0,24,24,0,0,0,0,
+0,102,102,102,36,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,108,108,254,108,108,108,254,108,108,0,0,0,0,
+24,24,124,198,194,192,124,6,6,134,198,124,24,24,0,0,
+0,0,0,0,194,198,12,24,48,96,198,134,0,0,0,0,
+0,0,56,108,108,56,118,220,204,204,204,118,0,0,0,0,
+0,48,48,48,96,0,0,0,0,0,0,0,0,0,0,0,
+0,0,12,24,48,48,48,48,48,48,24,12,0,0,0,0,
+0,0,48,24,12,12,12,12,12,12,24,48,0,0,0,0,
+0,0,0,0,0,102,60,255,60,102,0,0,0,0,0,0,
+0,0,0,0,0,24,24,126,24,24,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,24,24,24,48,0,0,0,
+0,0,0,0,0,0,0,254,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,24,24,0,0,0,0,
+0,0,0,0,2,6,12,24,48,96,192,128,0,0,0,0,
+0,0,56,108,198,198,214,214,198,198,108,56,0,0,0,0,
+0,0,24,56,120,24,24,24,24,24,24,126,0,0,0,0,
+0,0,124,198,6,12,24,48,96,192,198,254,0,0,0,0,
+0,0,124,198,6,6,60,6,6,6,198,124,0,0,0,0,
+0,0,12,28,60,108,204,254,12,12,12,30,0,0,0,0,
+0,0,254,192,192,192,252,6,6,6,198,124,0,0,0,0,
+0,0,56,96,192,192,252,198,198,198,198,124,0,0,0,0,
+0,0,254,198,6,6,12,24,48,48,48,48,0,0,0,0,
+0,0,124,198,198,198,124,198,198,198,198,124,0,0,0,0,
+0,0,124,198,198,198,126,6,6,6,12,120,0,0,0,0,
+0,0,0,0,24,24,0,0,0,24,24,0,0,0,0,0,
+0,0,0,0,24,24,0,0,0,24,24,48,0,0,0,0,
+0,0,0,6,12,24,48,96,48,24,12,6,0,0,0,0,
+0,0,0,0,0,126,0,0,126,0,0,0,0,0,0,0,
+0,0,0,96,48,24,12,6,12,24,48,96,0,0,0,0,
+0,0,124,198,198,12,24,24,24,0,24,24,0,0,0,0,
+0,0,0,124,198,198,222,222,222,220,192,124,0,0,0,0,
+0,0,16,56,108,198,198,254,198,198,198,198,0,0,0,0,
+0,0,252,102,102,102,124,102,102,102,102,252,0,0,0,0,
+0,0,60,102,194,192,192,192,192,194,102,60,0,0,0,0,
+0,0,248,108,102,102,102,102,102,102,108,248,0,0,0,0,
+0,0,254,102,98,104,120,104,96,98,102,254,0,0,0,0,
+0,0,254,102,98,104,120,104,96,96,96,240,0,0,0,0,
+0,0,60,102,194,192,192,222,198,198,102,58,0,0,0,0,
+0,0,198,198,198,198,254,198,198,198,198,198,0,0,0,0,
+0,0,60,24,24,24,24,24,24,24,24,60,0,0,0,0,
+0,0,30,12,12,12,12,12,204,204,204,120,0,0,0,0,
+0,0,230,102,102,108,120,120,108,102,102,230,0,0,0,0,
+0,0,240,96,96,96,96,96,96,98,102,254,0,0,0,0,
+0,0,198,238,254,254,214,198,198,198,198,198,0,0,0,0,
+0,0,198,230,246,254,222,206,198,198,198,198,0,0,0,0,
+0,0,124,198,198,198,198,198,198,198,198,124,0,0,0,0,
+0,0,252,102,102,102,124,96,96,96,96,240,0,0,0,0,
+0,0,124,198,198,198,198,198,198,214,222,124,12,14,0,0,
+0,0,252,102,102,102,124,108,102,102,102,230,0,0,0,0,
+0,0,124,198,198,96,56,12,6,198,198,124,0,0,0,0,
+0,0,126,126,90,24,24,24,24,24,24,60,0,0,0,0,
+0,0,198,198,198,198,198,198,198,198,198,124,0,0,0,0,
+0,0,198,198,198,198,198,198,198,108,56,16,0,0,0,0,
+0,0,198,198,198,198,214,214,214,254,238,108,0,0,0,0,
+0,0,198,198,108,124,56,56,124,108,198,198,0,0,0,0,
+0,0,102,102,102,102,60,24,24,24,24,60,0,0,0,0,
+0,0,254,198,134,12,24,48,96,194,198,254,0,0,0,0,
+0,0,60,48,48,48,48,48,48,48,48,60,0,0,0,0,
+0,0,0,128,192,224,112,56,28,14,6,2,0,0,0,0,
+0,0,60,12,12,12,12,12,12,12,12,60,0,0,0,0,
+16,56,108,198,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,255,0,0,
+48,48,24,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,120,12,124,204,204,204,118,0,0,0,0,
+0,0,224,96,96,120,108,102,102,102,102,124,0,0,0,0,
+0,0,0,0,0,124,198,192,192,192,198,124,0,0,0,0,
+0,0,28,12,12,60,108,204,204,204,204,118,0,0,0,0,
+0,0,0,0,0,124,198,254,192,192,198,124,0,0,0,0,
+0,0,56,108,100,96,240,96,96,96,96,240,0,0,0,0,
+0,0,0,0,0,118,204,204,204,204,204,124,12,204,120,0,
+0,0,224,96,96,108,118,102,102,102,102,230,0,0,0,0,
+0,0,24,24,0,56,24,24,24,24,24,60,0,0,0,0,
+0,0,6,6,0,14,6,6,6,6,6,6,102,102,60,0,
+0,0,224,96,96,102,108,120,120,108,102,230,0,0,0,0,
+0,0,56,24,24,24,24,24,24,24,24,60,0,0,0,0,
+0,0,0,0,0,236,254,214,214,214,214,198,0,0,0,0,
+0,0,0,0,0,220,102,102,102,102,102,102,0,0,0,0,
+0,0,0,0,0,124,198,198,198,198,198,124,0,0,0,0,
+0,0,0,0,0,220,102,102,102,102,102,124,96,96,240,0,
+0,0,0,0,0,118,204,204,204,204,204,124,12,12,30,0,
+0,0,0,0,0,220,118,102,96,96,96,240,0,0,0,0,
+0,0,0,0,0,124,198,96,56,12,198,124,0,0,0,0,
+0,0,16,48,48,252,48,48,48,48,54,28,0,0,0,0,
+0,0,0,0,0,204,204,204,204,204,204,118,0,0,0,0,
+0,0,0,0,0,102,102,102,102,102,60,24,0,0,0,0,
+0,0,0,0,0,198,198,214,214,214,254,108,0,0,0,0,
+0,0,0,0,0,198,108,56,56,56,108,198,0,0,0,0,
+0,0,0,0,0,198,198,198,198,198,198,126,6,12,248,0,
+0,0,0,0,0,254,204,24,48,96,198,254,0,0,0,0,
+0,0,14,24,24,24,112,24,24,24,24,14,0,0,0,0,
+0,0,24,24,24,24,0,24,24,24,24,24,0,0,0,0,
+0,0,112,24,24,24,14,24,24,24,24,112,0,0,0,0,
+0,0,118,220,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,
@@ -29823,10 +29996,9 @@ unsigned char tw_fw_code[] __initdata = 
 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,42,66,69,57,88,
-32,50,46,48,50,46,48,49,46,48,51,55,128,112,96,80,
-136,119,102,85,3,0,24,0,64,192,0,0,184,31,233,31,
-0,0,0,0,0
+0,0,0,42,66,69,57,88,32,50,46,48,50,46,48,49,
+46,48,51,55,128,112,96,80,136,119,102,85,3,0,24,0,
+64,192,0,0,184,31,233,31,0,0,0,0,0
 };
 
 #define TW_FW_SIZE sizeof(tw_fw_code)
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/AM53C974.c linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/AM53C974.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/AM53C974.c	2001-09-30 21:26:07.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/AM53C974.c	2004-09-05 16:06:04.000000000 +0200
@@ -1027,6 +1027,78 @@ static void do_AM53C974_intr(int irq, vo
 	spin_unlock_irqrestore(&io_request_lock, flags);
 }
 
+/************************************************************************** 
+* Function : AM53C974_set_async(struct Scsi_Host *instance, int target)
+*
+* Purpose : put controller into async. mode
+*
+* Inputs : instance -- which AM53C974
+*          target -- which SCSI target to deal with
+* 
+* Returns : nothing
+**************************************************************************/
+static __inline__ void AM53C974_set_async(struct Scsi_Host *instance, int target)
+{
+	AM53C974_local_declare();
+	struct AM53C974_hostdata *hostdata = (struct AM53C974_hostdata *) instance->hostdata;
+	AM53C974_setio(instance);
+
+	AM53C974_write_8(STPREG, hostdata->sync_per[target]);
+	AM53C974_write_8(SOFREG, (DEF_SOF_RAD << 6) | (DEF_SOF_RAA << 4));
+}
+
+/************************************************************************** 
+* Function : AM53C974_set_sync(struct Scsi_Host *instance, int target)
+*
+* Purpose : put controller into sync. mode
+*
+* Inputs : instance -- which AM53C974
+*          target -- which SCSI target to deal with
+* 
+* Returns : nothing
+**************************************************************************/
+static __inline__ void AM53C974_set_sync(struct Scsi_Host *instance, int target)
+{
+	AM53C974_local_declare();
+	struct AM53C974_hostdata *hostdata = (struct AM53C974_hostdata *) instance->hostdata;
+	AM53C974_setio(instance);
+
+	AM53C974_write_8(STPREG, hostdata->sync_per[target]);
+	AM53C974_write_8(SOFREG, (SOFREG_SO & hostdata->sync_off[target]) |
+			 (DEF_SOF_RAD << 6) | (DEF_SOF_RAA << 4));
+}
+
+/************************************************************************** 
+* Function : AM53C974_transfer_dma(struct Scsi_Host *instance, short dir,
+*                                  unsigned long length, char *data)
+*
+* Purpose : setup DMA transfer
+*
+* Inputs : instance -- which AM53C974
+*          dir -- direction flag, 0: write to device, read from memory; 
+*                                 1: read from device, write to memory
+*          length -- number of bytes to transfer to from buffer
+*          data -- pointer to data buffer
+* 
+* Returns : nothing
+**************************************************************************/
+static __inline__ void AM53C974_transfer_dma(struct Scsi_Host *instance, short dir,
+					unsigned long length, char *data)
+{
+	AM53C974_local_declare();
+	AM53C974_setio(instance);
+
+	AM53C974_write_8(CMDREG, CMDREG_NOP);
+	AM53C974_write_8(DMACMD, (dir << 7) | DMACMD_INTE_D);	/* idle command */
+	AM53C974_write_8(STCLREG, (unsigned char) (length & 0xff));
+	AM53C974_write_8(STCMREG, (unsigned char) ((length & 0xff00) >> 8));
+	AM53C974_write_8(STCHREG, (unsigned char) ((length & 0xff0000) >> 16));
+	AM53C974_write_32(DMASTC, length & 0xffffff);
+	AM53C974_write_32(DMASPA, virt_to_bus(data));
+	AM53C974_write_8(CMDREG, CMDREG_IT | CMDREG_DMA);
+	AM53C974_write_8(DMACMD, (dir << 7) | DMACMD_INTE_D | DMACMD_START);
+}
+
 /************************************************************************
 * Function : AM53C974_intr(int irq, void *dev_id, struct pt_regs *regs) *
 *                                                                       *
@@ -1464,47 +1536,6 @@ static int AM53C974_sync_neg(struct Scsi
 	return (0);
 }
 
-/************************************************************************** 
-* Function : AM53C974_set_async(struct Scsi_Host *instance, int target)
-*
-* Purpose : put controller into async. mode
-*
-* Inputs : instance -- which AM53C974
-*          target -- which SCSI target to deal with
-* 
-* Returns : nothing
-**************************************************************************/
-static __inline__ void AM53C974_set_async(struct Scsi_Host *instance, int target)
-{
-	AM53C974_local_declare();
-	struct AM53C974_hostdata *hostdata = (struct AM53C974_hostdata *) instance->hostdata;
-	AM53C974_setio(instance);
-
-	AM53C974_write_8(STPREG, hostdata->sync_per[target]);
-	AM53C974_write_8(SOFREG, (DEF_SOF_RAD << 6) | (DEF_SOF_RAA << 4));
-}
-
-/************************************************************************** 
-* Function : AM53C974_set_sync(struct Scsi_Host *instance, int target)
-*
-* Purpose : put controller into sync. mode
-*
-* Inputs : instance -- which AM53C974
-*          target -- which SCSI target to deal with
-* 
-* Returns : nothing
-**************************************************************************/
-static __inline__ void AM53C974_set_sync(struct Scsi_Host *instance, int target)
-{
-	AM53C974_local_declare();
-	struct AM53C974_hostdata *hostdata = (struct AM53C974_hostdata *) instance->hostdata;
-	AM53C974_setio(instance);
-
-	AM53C974_write_8(STPREG, hostdata->sync_per[target]);
-	AM53C974_write_8(SOFREG, (SOFREG_SO & hostdata->sync_off[target]) |
-			 (DEF_SOF_RAD << 6) | (DEF_SOF_RAA << 4));
-}
-
 /***********************************************************************
 * Function : AM53C974_information_transfer(struct Scsi_Host *instance, *
 *                          unsigned char statreg, unsigned char isreg, *
@@ -2157,37 +2188,6 @@ static void AM53C974_intr_reselect(struc
 }
 
 /************************************************************************** 
-* Function : AM53C974_transfer_dma(struct Scsi_Host *instance, short dir,
-*                                  unsigned long length, char *data)
-*
-* Purpose : setup DMA transfer
-*
-* Inputs : instance -- which AM53C974
-*          dir -- direction flag, 0: write to device, read from memory; 
-*                                 1: read from device, write to memory
-*          length -- number of bytes to transfer to from buffer
-*          data -- pointer to data buffer
-* 
-* Returns : nothing
-**************************************************************************/
-static __inline__ void AM53C974_transfer_dma(struct Scsi_Host *instance, short dir,
-					unsigned long length, char *data)
-{
-	AM53C974_local_declare();
-	AM53C974_setio(instance);
-
-	AM53C974_write_8(CMDREG, CMDREG_NOP);
-	AM53C974_write_8(DMACMD, (dir << 7) | DMACMD_INTE_D);	/* idle command */
-	AM53C974_write_8(STCLREG, (unsigned char) (length & 0xff));
-	AM53C974_write_8(STCMREG, (unsigned char) ((length & 0xff00) >> 8));
-	AM53C974_write_8(STCHREG, (unsigned char) ((length & 0xff0000) >> 16));
-	AM53C974_write_32(DMASTC, length & 0xffffff);
-	AM53C974_write_32(DMASPA, virt_to_bus(data));
-	AM53C974_write_8(CMDREG, CMDREG_IT | CMDREG_DMA);
-	AM53C974_write_8(DMACMD, (dir << 7) | DMACMD_INTE_D | DMACMD_START);
-}
-
-/************************************************************************** 
 * Function : AM53C974_dma_blast(struct Scsi_Host *instance, unsigned char dmastatus,
 *                               unsigned char statreg)
 *
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/Config.in linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/Config.in
--- linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/Config.in	2004-06-29 11:30:47.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/Config.in	2004-09-05 16:08:33.000000000 +0200
@@ -18,6 +18,7 @@ if [ "$CONFIG_BLK_DEV_SR" != "n" ]; then
 fi
 dep_tristate '  SCSI media changer support' CONFIG_CHR_DEV_SCH $CONFIG_SCSI
 dep_tristate '  SCSI generic support' CONFIG_CHR_DEV_SG $CONFIG_SCSI
+   dep_mbool '    Use Direct I/O' CONFIG_CHR_DEV_SG_DIO $CONFIG_CHR_DEV_SG
 
 dep_tristate '  SCSI monitor support' CONFIG_CHR_DEV_SM $CONFIG_SCSI
 
@@ -68,6 +69,7 @@ dep_tristate 'Always IN2000 SCSI support
 dep_tristate 'AM53/79C974 PCI SCSI support' CONFIG_SCSI_AM53C974 $CONFIG_SCSI $CONFIG_PCI
 dep_tristate 'LSI MegaRAID support (driver 1.18 series)' CONFIG_SCSI_MEGARAID $CONFIG_SCSI
 dep_tristate 'LSI MegaRAID support (driver 2.xx series)' CONFIG_SCSI_MEGARAID2 $CONFIG_SCSI
+   dep_mbool '  Collect statistics to report in /proc' CONFIG_SCSI_MEGARAID2_PROC_STATS $CONFIG_SCSI_MEGARAID2
 dep_tristate 'iSCSI support (SCSI-over-Network)' CONFIG_SCSI_ISCSI $CONFIG_SCSI m
 dep_mbool 'Serial ATA (SATA) support' CONFIG_SCSI_SATA $CONFIG_SCSI
 dep_tristate '  ServerWorks Frodo / Apple K2 SATA support (EXPERIMENTAL)' CONFIG_SCSI_SATA_SVW $CONFIG_SCSI_SATA $CONFIG_PCI $CONFIG_EXPERIMENTAL
@@ -205,19 +207,24 @@ dep_tristate 'PCI2000 support' CONFIG_SC
 dep_tristate 'PCI2220i support' CONFIG_SCSI_PCI2220I $CONFIG_SCSI
 dep_tristate 'PSI240i support' CONFIG_SCSI_PSI240I $CONFIG_SCSI
 dep_tristate 'Promise SX6000 support' CONFIG_SCSI_PTI_ST $CONFIG_SCSI
-dep_tristate 'Qlogic FAS SCSI support' CONFIG_SCSI_QLOGIC_FAS $CONFIG_SCSI
-if [ "$CONFIG_PCI" = "y" ]; then
-   dep_tristate 'Qlogic ISP SCSI support' CONFIG_SCSI_QLOGIC_ISP $CONFIG_SCSI
-   dep_tristate 'Qlogic ISP FC SCSI support' CONFIG_SCSI_QLOGIC_FC $CONFIG_SCSI
-   if [ "$CONFIG_SCSI_QLOGIC_FC" != "n" ]; then
-      bool '   Include loadable firmware in driver' CONFIG_SCSI_QLOGIC_FC_FIRMWARE
-   fi
-   dep_tristate 'Qlogic QLA 1280 SCSI support' CONFIG_SCSI_QLOGIC_1280 $CONFIG_SCSI
-   source drivers/scsi/qla2xxx/Config.in
-   source drivers/scsi/qla2xxx-60500/Config.in
-   source drivers/scsi/qla2xxx-60650/Config.in
+
+bool 'Qlogic support' CONFIG_QLOGIC_DRIVERS
+if [ "$CONFIG_QLOGIC_DRIVERS" = "y" ]; then
+  dep_tristate '  Qlogic FAS SCSI support' CONFIG_SCSI_QLOGIC_FAS $CONFIG_SCSI
+  if [ "$CONFIG_PCI" = "y" ]; then
+     dep_tristate '  Qlogic ISP SCSI support' CONFIG_SCSI_QLOGIC_ISP $CONFIG_SCSI
+     dep_tristate '  Qlogic ISP FC SCSI support' CONFIG_SCSI_QLOGIC_FC $CONFIG_SCSI
+     if [ "$CONFIG_SCSI_QLOGIC_FC" != "n" ]; then
+        bool '    Include loadable firmware in driver' CONFIG_SCSI_QLOGIC_FC_FIRMWARE
+     fi
+     dep_tristate '  Qlogic QLA 1280 SCSI support' CONFIG_SCSI_QLOGIC_1280 $CONFIG_SCSI
+     source drivers/scsi/qla2xxx/Config.in
+     source drivers/scsi/qla2xxx-60500/Config.in
+     source drivers/scsi/qla2xxx-60650/Config.in
+  fi
+  source drivers/scsi/isp/Config.in
 fi
-source drivers/scsi/isp/Config.in
+
 if [ "$CONFIG_X86" = "y" ]; then
    dep_tristate 'Seagate ST-02 and Future Domain TMC-8xx SCSI support' CONFIG_SCSI_SEAGATE $CONFIG_SCSI
 fi
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/aha152x.c linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/aha152x.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/aha152x.c	2002-11-29 00:53:14.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/aha152x.c	2004-09-05 15:48:42.000000000 +0200
@@ -222,10 +222,6 @@
 
 #include <linux/module.h>
 
-#if defined(PCMCIA)
-#undef MODULE
-#endif
-
 #include <linux/sched.h>
 #include <asm/irq.h>
 #include <asm/io.h>
@@ -254,6 +250,10 @@
 
 #include <scsi/scsicam.h>
 
+#if defined(PCMCIA)
+#undef MODULE
+#endif
+
 /* DEFINES */
 
 /* For PCMCIA cards, always use AUTOCONF */
@@ -3933,7 +3933,9 @@ int aha152x_proc_info(char *buffer, char
 	return thislength < length ? thislength : length;
 }
 
+#ifndef PCMCIA
 /* Eventually this will go into an include file, but this will be later */
 static Scsi_Host_Template driver_template = AHA152X;
 
 #include "scsi_module.c"
+#endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/aic7xxx/aic79xx_osm.c linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/aic7xxx/aic79xx_osm.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/aic7xxx/aic79xx_osm.c	2004-06-29 11:24:42.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/aic7xxx/aic79xx_osm.c	2004-09-05 16:06:04.000000000 +0200
@@ -2871,6 +2871,19 @@ out:
 	ahd_unlock(ahd, &s);
 }
 
+static __inline int
+ahd_linux_dv_fallback(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
+{
+	u_long s;
+	int retval;
+
+	ahd_lock(ahd, &s);
+	retval = ahd_linux_fallback(ahd, devinfo);
+	ahd_unlock(ahd, &s);
+
+	return (retval);
+}
+
 static void
 ahd_linux_dv_transition(struct ahd_softc *ahd, struct scsi_cmnd *cmd,
 			struct ahd_devinfo *devinfo,
@@ -3517,19 +3530,6 @@ ahd_linux_dv_su(struct ahd_softc *ahd, s
 	cmd->cmnd[4] = le | SSS_START;
 }
 
-static __inline int
-ahd_linux_dv_fallback(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
-{
-	u_long s;
-	int retval;
-
-	ahd_lock(ahd, &s);
-	retval = ahd_linux_fallback(ahd, devinfo);
-	ahd_unlock(ahd, &s);
-
-	return (retval);
-}
-
 static int
 ahd_linux_fallback(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
 {
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/fdomain.c linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/fdomain.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/fdomain.c	2002-11-29 00:53:14.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/fdomain.c	2004-09-05 15:48:42.000000000 +0200
@@ -2046,7 +2046,9 @@ int fdomain_16x0_release(struct Scsi_Hos
 
 MODULE_LICENSE("GPL");
 
+#ifndef PCMCIA
 /* Eventually this will go into an include file, but this will be later */
 static Scsi_Host_Template driver_template = FDOMAIN_16X0;
 
 #include "scsi_module.c"
+#endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/ips.c linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/ips.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/ips.c	2004-06-29 11:24:49.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/ips.c	2004-09-05 15:48:34.000000000 +0200
@@ -133,6 +133,10 @@
 /* 6.10.00  - Remove 1G Addressing Limitations                               */
 /* 6.11.xx  - Get VersionInfo buffer off the stack !              DDTS 60401 */
 /* 6.11.xx  - Make Logical Drive Info structure safe for DMA      DDTS 60639 */
+/* 7.10.xx  - Add highmem_io flag in SCSI Templete for 2.4 kernels           */
+/*          - Fix path/name for scsi_hosts.h include for 2.6 kernels         */
+/*          - Fix sort order of 7k                                           */
+/*          - Remove 3 unused "inline" functions                             */
 /*****************************************************************************/
 
 /*
@@ -176,7 +180,13 @@
 #include <scsi/sg.h>
 
 #include "scsi.h"
+
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,0)
 #include "hosts.h"
+#else
+#include <scsi/scsi_host.h>
+#endif
+
 #include "ips.h"
 
 #include <linux/module.h>
@@ -197,8 +207,8 @@ MODULE_PARM(ips, "s");
 /*
  * DRIVER_VER
  */
-#define IPS_VERSION_HIGH        "7.00"
-#define IPS_VERSION_LOW         ".15 "
+#define IPS_VERSION_HIGH        "7.10"
+#define IPS_VERSION_LOW         ".18 "
 
 #if !defined(__i386__) && !defined(__ia64__) && !defined(__x86_64__)
 #warning "This driver has only been tested on the x86/ia64/x86_64 platforms"
@@ -277,9 +287,9 @@ static Scsi_Host_Template ips_driver_tem
 	.use_clustering		= ENABLE_CLUSTERING,
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
 	.use_new_eh_code	= 1,
-#ifdef RHEL3
-    .vary_io            = 1,
 #endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)  &&  LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+    .highmem_io          = 1,   
 #endif
 };
 
@@ -477,21 +487,17 @@ static uint32_t ips_statupd_copperhead(i
 static uint32_t ips_statupd_copperhead_memio(ips_ha_t *);
 static uint32_t ips_statupd_morpheus(ips_ha_t *);
 static ips_scb_t *ips_getscb(ips_ha_t *);
-static inline void ips_putq_scb_head(ips_scb_queue_t *, ips_scb_t *);
-static inline void ips_putq_scb_tail(ips_scb_queue_t *, ips_scb_t *);
-static inline void ips_putq_wait_head(ips_wait_queue_t *, Scsi_Cmnd *);
-static inline void ips_putq_wait_tail(ips_wait_queue_t *, Scsi_Cmnd *);
-static inline void ips_putq_copp_head(ips_copp_queue_t *,
-				      ips_copp_wait_item_t *);
-static inline void ips_putq_copp_tail(ips_copp_queue_t *,
+static void ips_putq_scb_head(ips_scb_queue_t *, ips_scb_t *);
+static void ips_putq_wait_tail(ips_wait_queue_t *, Scsi_Cmnd *);
+static void ips_putq_copp_tail(ips_copp_queue_t *,
 				      ips_copp_wait_item_t *);
-static inline ips_scb_t *ips_removeq_scb_head(ips_scb_queue_t *);
-static inline ips_scb_t *ips_removeq_scb(ips_scb_queue_t *, ips_scb_t *);
-static inline Scsi_Cmnd *ips_removeq_wait_head(ips_wait_queue_t *);
-static inline Scsi_Cmnd *ips_removeq_wait(ips_wait_queue_t *, Scsi_Cmnd *);
-static inline ips_copp_wait_item_t *ips_removeq_copp(ips_copp_queue_t *,
+static ips_scb_t *ips_removeq_scb_head(ips_scb_queue_t *);
+static ips_scb_t *ips_removeq_scb(ips_scb_queue_t *, ips_scb_t *);
+static Scsi_Cmnd *ips_removeq_wait_head(ips_wait_queue_t *);
+static Scsi_Cmnd *ips_removeq_wait(ips_wait_queue_t *, Scsi_Cmnd *);
+static ips_copp_wait_item_t *ips_removeq_copp(ips_copp_queue_t *,
 						     ips_copp_wait_item_t *);
-static inline ips_copp_wait_item_t *ips_removeq_copp_head(ips_copp_queue_t *);
+static ips_copp_wait_item_t *ips_removeq_copp_head(ips_copp_queue_t *);
 
 static int ips_is_passthru(Scsi_Cmnd *);
 static int ips_make_passthru(ips_ha_t *, Scsi_Cmnd *, ips_scb_t *, int);
@@ -1888,7 +1894,7 @@ ips_flash_bios(ips_ha_t * ha, ips_passth
 /*   Fill in a single scb sg_list element from an address                   */
 /*   return a -1 if a breakup occurred                                      */
 /****************************************************************************/
-static inline int
+static int
 ips_fill_scb_sg_single(ips_ha_t * ha, dma_addr_t busaddr,
 		       ips_scb_t * scb, int indx, unsigned int e_len)
 {
@@ -2953,7 +2959,7 @@ ips_next(ips_ha_t * ha, int intr)
 /* ASSUMED to be called from within the HA lock                             */
 /*                                                                          */
 /****************************************************************************/
-static inline void
+static void
 ips_putq_scb_head(ips_scb_queue_t * queue, ips_scb_t * item)
 {
 	METHOD_TRACE("ips_putq_scb_head", 1);
@@ -2972,38 +2978,6 @@ ips_putq_scb_head(ips_scb_queue_t * queu
 
 /****************************************************************************/
 /*                                                                          */
-/* Routine Name: ips_putq_scb_tail                                          */
-/*                                                                          */
-/* Routine Description:                                                     */
-/*                                                                          */
-/*   Add an item to the tail of the queue                                   */
-/*                                                                          */
-/* ASSUMED to be called from within the HA lock                             */
-/*                                                                          */
-/****************************************************************************/
-static inline void
-ips_putq_scb_tail(ips_scb_queue_t * queue, ips_scb_t * item)
-{
-	METHOD_TRACE("ips_putq_scb_tail", 1);
-
-	if (!item)
-		return;
-
-	item->q_next = NULL;
-
-	if (queue->tail)
-		queue->tail->q_next = item;
-
-	queue->tail = item;
-
-	if (!queue->head)
-		queue->head = item;
-
-	queue->count++;
-}
-
-/****************************************************************************/
-/*                                                                          */
 /* Routine Name: ips_removeq_scb_head                                       */
 /*                                                                          */
 /* Routine Description:                                                     */
@@ -3013,7 +2987,7 @@ ips_putq_scb_tail(ips_scb_queue_t * queu
 /* ASSUMED to be called from within the HA lock                             */
 /*                                                                          */
 /****************************************************************************/
-static inline ips_scb_t *
+static ips_scb_t *
 ips_removeq_scb_head(ips_scb_queue_t * queue)
 {
 	ips_scb_t *item;
@@ -3048,7 +3022,7 @@ ips_removeq_scb_head(ips_scb_queue_t * q
 /* ASSUMED to be called from within the HA lock                             */
 /*                                                                          */
 /****************************************************************************/
-static inline ips_scb_t *
+static ips_scb_t *
 ips_removeq_scb(ips_scb_queue_t * queue, ips_scb_t * item)
 {
 	ips_scb_t *p;
@@ -3085,34 +3059,6 @@ ips_removeq_scb(ips_scb_queue_t * queue,
 
 /****************************************************************************/
 /*                                                                          */
-/* Routine Name: ips_putq_wait_head                                         */
-/*                                                                          */
-/* Routine Description:                                                     */
-/*                                                                          */
-/*   Add an item to the head of the queue                                   */
-/*                                                                          */
-/* ASSUMED to be called from within the HA lock                             */
-/*                                                                          */
-/****************************************************************************/
-static inline void
-ips_putq_wait_head(ips_wait_queue_t * queue, Scsi_Cmnd * item)
-{
-	METHOD_TRACE("ips_putq_wait_head", 1);
-
-	if (!item)
-		return;
-
-	item->host_scribble = (char *) queue->head;
-	queue->head = item;
-
-	if (!queue->tail)
-		queue->tail = item;
-
-	queue->count++;
-}
-
-/****************************************************************************/
-/*                                                                          */
 /* Routine Name: ips_putq_wait_tail                                         */
 /*                                                                          */
 /* Routine Description:                                                     */
@@ -3122,7 +3068,7 @@ ips_putq_wait_head(ips_wait_queue_t * qu
 /* ASSUMED to be called from within the HA lock                             */
 /*                                                                          */
 /****************************************************************************/
-static inline void
+static void
 ips_putq_wait_tail(ips_wait_queue_t * queue, Scsi_Cmnd * item)
 {
 	METHOD_TRACE("ips_putq_wait_tail", 1);
@@ -3154,7 +3100,7 @@ ips_putq_wait_tail(ips_wait_queue_t * qu
 /* ASSUMED to be called from within the HA lock                             */
 /*                                                                          */
 /****************************************************************************/
-static inline Scsi_Cmnd *
+static Scsi_Cmnd *
 ips_removeq_wait_head(ips_wait_queue_t * queue)
 {
 	Scsi_Cmnd *item;
@@ -3189,7 +3135,7 @@ ips_removeq_wait_head(ips_wait_queue_t *
 /* ASSUMED to be called from within the HA lock                             */
 /*                                                                          */
 /****************************************************************************/
-static inline Scsi_Cmnd *
+static Scsi_Cmnd *
 ips_removeq_wait(ips_wait_queue_t * queue, Scsi_Cmnd * item)
 {
 	Scsi_Cmnd *p;
@@ -3226,34 +3172,6 @@ ips_removeq_wait(ips_wait_queue_t * queu
 
 /****************************************************************************/
 /*                                                                          */
-/* Routine Name: ips_putq_copp_head                                         */
-/*                                                                          */
-/* Routine Description:                                                     */
-/*                                                                          */
-/*   Add an item to the head of the queue                                   */
-/*                                                                          */
-/* ASSUMED to be called from within the HA lock                             */
-/*                                                                          */
-/****************************************************************************/
-static inline void
-ips_putq_copp_head(ips_copp_queue_t * queue, ips_copp_wait_item_t * item)
-{
-	METHOD_TRACE("ips_putq_copp_head", 1);
-
-	if (!item)
-		return;
-
-	item->next = queue->head;
-	queue->head = item;
-
-	if (!queue->tail)
-		queue->tail = item;
-
-	queue->count++;
-}
-
-/****************************************************************************/
-/*                                                                          */
 /* Routine Name: ips_putq_copp_tail                                         */
 /*                                                                          */
 /* Routine Description:                                                     */
@@ -3263,7 +3181,7 @@ ips_putq_copp_head(ips_copp_queue_t * qu
 /* ASSUMED to be called from within the HA lock                             */
 /*                                                                          */
 /****************************************************************************/
-static inline void
+static void
 ips_putq_copp_tail(ips_copp_queue_t * queue, ips_copp_wait_item_t * item)
 {
 	METHOD_TRACE("ips_putq_copp_tail", 1);
@@ -3295,7 +3213,7 @@ ips_putq_copp_tail(ips_copp_queue_t * qu
 /* ASSUMED to be called from within the HA lock                             */
 /*                                                                          */
 /****************************************************************************/
-static inline ips_copp_wait_item_t *
+static ips_copp_wait_item_t *
 ips_removeq_copp_head(ips_copp_queue_t * queue)
 {
 	ips_copp_wait_item_t *item;
@@ -3330,7 +3248,7 @@ ips_removeq_copp_head(ips_copp_queue_t *
 /* ASSUMED to be called from within the HA lock                             */
 /*                                                                          */
 /****************************************************************************/
-static inline ips_copp_wait_item_t *
+static ips_copp_wait_item_t *
 ips_removeq_copp(ips_copp_queue_t * queue, ips_copp_wait_item_t * item)
 {
 	ips_copp_wait_item_t *p;
@@ -4014,7 +3932,7 @@ ips_send_cmd(ips_ha_t * ha, ips_scb_t * 
 			scb->cmd.logical_info.reserved2 = 0;
 			scb->cmd.logical_info.reserved3 = 0;
 			scb->data_len = sizeof (IPS_LD_INFO);
-            scb->data_busaddr = ha->logical_drive_info_dma_addr;
+			scb->data_busaddr = ha->logical_drive_info_dma_addr;
 			scb->flags = 0;
 			scb->cmd.logical_info.buffer_addr = scb->data_busaddr;
 			ret = IPS_SUCCESS;
@@ -4340,7 +4258,7 @@ ips_online(ips_ha_t * ha, ips_scb_t * sc
 
 	if ((scb->basic_status & IPS_GSC_STATUS_MASK) > 1) {
 		memset(ha->logical_drive_info, 0, sizeof (IPS_LD_INFO));
-        return (0);
+		return (0);
 	}
 
 	if (ha->logical_drive_info->drive_info[scb->target_id].state !=
@@ -4579,7 +4497,7 @@ ips_free(ips_ha_t * ha)
 		if (ha->logical_drive_info) {
 			pci_free_consistent(ha->pcidev,
 					    sizeof (IPS_LD_INFO),
-                        ha->logical_drive_info,
+					    ha->logical_drive_info,
 					    ha->logical_drive_info_dma_addr);
 			ha->logical_drive_info = NULL;
 		}
@@ -4773,7 +4691,7 @@ ips_getscb(ips_ha_t * ha)
 	}
 
 	ha->scb_freelist = scb->q_next;
-    scb->flags = 0;
+	scb->flags = 0;
 	scb->q_next = NULL;
 
 	ips_init_scb(ha, scb);
@@ -6831,7 +6749,7 @@ ips_version_check(ips_ha_t * ha, int int
 
 	METHOD_TRACE("ips_version_check", 1);
 
-    VersionInfo = ( IPS_VERSION_DATA * ) ha->ioctl_data;
+	VersionInfo = ( IPS_VERSION_DATA * ) ha->ioctl_data;
 
 	memset(FirmwareVersion, 0, IPS_COMPAT_ID_LENGTH + 1);
 	memset(BiosVersion, 0, IPS_COMPAT_ID_LENGTH + 1);
@@ -6843,7 +6761,7 @@ ips_version_check(ips_ha_t * ha, int int
 	rc = IPS_FAILURE;
 	if (ha->subsys->param[4] & IPS_GET_VERSION_SUPPORT) {	/* If Versioning is Supported */
 		/* Get the Version Info with a Get Version Command */
-        memset( VersionInfo, 0, sizeof (IPS_VERSION_DATA));
+		memset( VersionInfo, 0, sizeof (IPS_VERSION_DATA));
 		rc = ips_get_version_info(ha, ha->ioctl_busaddr, intr);
 		if (rc == IPS_SUCCESS)
 			memcpy(FirmwareVersion, VersionInfo->compatibilityId,
@@ -6999,7 +6917,6 @@ ips_order_controllers(void)
 			for (j = position; j < ips_num_controllers; j++) {
 				switch (ips_ha[j]->ad_type) {
 				case IPS_ADTYPE_SERVERAID6M:
-				case IPS_ADTYPE_SERVERAID7k:
 				case IPS_ADTYPE_SERVERAID7M:
 					if (nvram->adapter_order[i] == 'M') {
 						ips_shift_controllers(position,
@@ -7020,6 +6937,7 @@ ips_order_controllers(void)
 				case IPS_ADTYPE_SERVERAID6I:
 				case IPS_ADTYPE_SERVERAID5I2:
 				case IPS_ADTYPE_SERVERAID5I1:
+				case IPS_ADTYPE_SERVERAID7k:
 					if (nvram->adapter_order[i] == 'S') {
 						ips_shift_controllers(position,
 								      j);
@@ -7548,6 +7466,15 @@ ips_init_phase2(int index)
 MODULE_LICENSE("GPL");
 #endif
 
+#ifdef MODULE_DESCRIPTION
+MODULE_DESCRIPTION("IBM ServeRAID Adapter Driver " IPS_VER_STRING);
+#endif
+
+#ifdef MODULE_VERSION
+MODULE_VERSION(IPS_VER_STRING);
+#endif
+
+
 /*
  * Overrides for Emacs so that we almost follow Linus's tabbing style.
  * Emacs will notice this stuff at the end of the file and automatically
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/ips.h linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/ips.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/ips.h	2004-06-29 11:30:43.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/ips.h	2004-09-05 15:48:34.000000000 +0200
@@ -96,6 +96,9 @@
    #endif
 
    #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+      #define IRQ_NONE
+      #define IRQ_HANDLED
+      #define IRQ_RETVAL(x)
       #define IPS_REGISTER_HOSTS(SHT)      scsi_register_module(MODULE_SCSI_HA,SHT)
       #define IPS_UNREGISTER_HOSTS(SHT)    scsi_unregister_module(MODULE_SCSI_HA,SHT)
       #define IPS_ADD_HOST(shost,device)
@@ -1206,13 +1209,13 @@ typedef struct {
 
 #define IPS_VER_MAJOR 7
 #define IPS_VER_MAJOR_STRING "7"
-#define IPS_VER_MINOR 00
-#define IPS_VER_MINOR_STRING "00"
-#define IPS_VER_BUILD 15
-#define IPS_VER_BUILD_STRING "15"
-#define IPS_VER_STRING "7.00.15"
+#define IPS_VER_MINOR 10
+#define IPS_VER_MINOR_STRING "10"
+#define IPS_VER_BUILD 18
+#define IPS_VER_BUILD_STRING "18"
+#define IPS_VER_STRING "7.10.18"
 #define IPS_RELEASE_ID 0x00020000
-#define IPS_BUILD_IDENT 625
+#define IPS_BUILD_IDENT 731
 #define IPS_LEGALCOPYRIGHT_STRING "(C) Copyright IBM Corp. 1994, 2002. All Rights Reserved."
 #define IPS_ADAPTECCOPYRIGHT_STRING "(c) Copyright Adaptec, Inc. 2002 to 2004. All Rights Reserved."
 #define IPS_DELLCOPYRIGHT_STRING "(c) Copyright Dell 2004. All Rights Reserved."
@@ -1223,32 +1226,35 @@ typedef struct {
 #define IPS_VER_SERVERAID2 "2.88.13"
 #define IPS_VER_NAVAJO "2.88.13"
 #define IPS_VER_SERVERAID3 "6.10.24"
-#define IPS_VER_SERVERAID4H "7.00.15"
-#define IPS_VER_SERVERAID4MLx "7.00.15"
-#define IPS_VER_SARASOTA "7.00.15"
-#define IPS_VER_MARCO "7.00.15"
-#define IPS_VER_SEBRING "7.00.15"
+#define IPS_VER_SERVERAID4H "7.10.11"
+#define IPS_VER_SERVERAID4MLx "7.10.18"
+#define IPS_VER_SARASOTA "7.10.18"
+#define IPS_VER_MARCO "7.10.18"
+#define IPS_VER_SEBRING "7.10.18"
+#define IPS_VER_KEYWEST "7.10.18"
 
 /* Compatability IDs for various adapters */
 #define IPS_COMPAT_UNKNOWN ""
-#define IPS_COMPAT_CURRENT "SB610"
+#define IPS_COMPAT_CURRENT "KW710"
 #define IPS_COMPAT_SERVERAID1 "2.25.01"
 #define IPS_COMPAT_SERVERAID2 "2.88.13"
 #define IPS_COMPAT_NAVAJO  "2.88.13"
 #define IPS_COMPAT_KIOWA "2.88.13"
 #define IPS_COMPAT_SERVERAID3H  "SB610"
 #define IPS_COMPAT_SERVERAID3L  "SB610"
-#define IPS_COMPAT_SERVERAID4H  "SB610"
-#define IPS_COMPAT_SERVERAID4M  "SB610"
-#define IPS_COMPAT_SERVERAID4L  "SB610"
-#define IPS_COMPAT_SERVERAID4Mx "SB610"
-#define IPS_COMPAT_SERVERAID4Lx "SB610"
-#define IPS_COMPAT_SARASOTA     "SB610"
-#define IPS_COMPAT_MARCO        "SB610"
-#define IPS_COMPAT_SEBRING      "SB610"
-#define IPS_COMPAT_BIOS "SB610"
+#define IPS_COMPAT_SERVERAID4H  "KW710"
+#define IPS_COMPAT_SERVERAID4M  "KW710"
+#define IPS_COMPAT_SERVERAID4L  "KW710"
+#define IPS_COMPAT_SERVERAID4Mx "KW710"
+#define IPS_COMPAT_SERVERAID4Lx "KW710"
+#define IPS_COMPAT_SARASOTA     "KW710"
+#define IPS_COMPAT_MARCO        "KW710"
+#define IPS_COMPAT_SEBRING      "KW710"
+#define IPS_COMPAT_TAMPA        "KW710"
+#define IPS_COMPAT_KEYWEST      "KW710"
+#define IPS_COMPAT_BIOS "KW710"
 
-#define IPS_COMPAT_MAX_ADAPTER_TYPE 16
+#define IPS_COMPAT_MAX_ADAPTER_TYPE 18
 #define IPS_COMPAT_ID_LENGTH 8
 
 #define IPS_DEFINE_COMPAT_TABLE(tablename) \
@@ -1268,7 +1274,9 @@ typedef struct {
       IPS_COMPAT_SARASOTA,         /* one-channel variety of SARASOTA */  \
       IPS_COMPAT_SARASOTA,         /* two-channel variety of SARASOTA */  \
       IPS_COMPAT_MARCO, \
-      IPS_COMPAT_SEBRING \
+      IPS_COMPAT_SEBRING, \
+	  IPS_COMPAT_TAMPA, \
+      IPS_COMPAT_KEYWEST \
    }
 
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/isp/Config.in linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/isp/Config.in
--- linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/isp/Config.in	2004-06-29 11:24:44.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/isp/Config.in	2004-09-05 16:06:14.000000000 +0200
@@ -28,7 +28,7 @@
 #
 #
 if [ "$CONFIG_PCI" = "y" ]; then
-    dep_tristate 'Single Driver Qlogic FC/SCSI support' CONFIG_SCSI_NEWISP $CONFIG_SCSI
+    dep_tristate '  Single Driver Qlogic FC/SCSI support' CONFIG_SCSI_NEWISP $CONFIG_SCSI
    if [ "$CONFIG_SCSI_NEWISP" != "n" ]; then
 #
 # Eventually we'll put some more options in.
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/megaraid.c linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/megaraid.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/megaraid.c	2004-06-29 11:30:51.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/megaraid.c	2004-09-05 16:06:04.000000000 +0200
@@ -3469,6 +3469,24 @@ int megaraid_detect (Scsi_Host_Template 
 	return count;
 }
 
+static inline void mega_freeSgList (mega_host_config * megaCfg)
+{
+	int i;
+
+	for (i = 0; i < megaCfg->max_cmds; i++) {
+		if (megaCfg->scbList[i].sgList)
+			pci_free_consistent (megaCfg->dev,
+					     sizeof (mega_64sglist) *
+					     MAX_SGLIST,
+					     megaCfg->scbList[i].sgList,
+					     megaCfg->scbList[i].
+					     dma_sghandle64);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)	/* 0x020400 */
+			kfree (megaCfg->scbList[i].sgList);	/* free sgList */
+#endif
+	}
+}
+
 /*---------------------------------------------------------------------
  * Release the controller's resources
  *---------------------------------------------------------------------*/
@@ -3878,24 +3896,6 @@ static void mega_swap_hosts (struct Scsi
 	return;
 }
 
-static inline void mega_freeSgList (mega_host_config * megaCfg)
-{
-	int i;
-
-	for (i = 0; i < megaCfg->max_cmds; i++) {
-		if (megaCfg->scbList[i].sgList)
-			pci_free_consistent (megaCfg->dev,
-					     sizeof (mega_64sglist) *
-					     MAX_SGLIST,
-					     megaCfg->scbList[i].sgList,
-					     megaCfg->scbList[i].
-					     dma_sghandle64);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)	/* 0x020400 */
-			kfree (megaCfg->scbList[i].sgList);	/* free sgList */
-#endif
-	}
-}
-
 /*----------------------------------------------
  * Get information about the card/driver
  *----------------------------------------------*/
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/megaraid2.c linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/megaraid2.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/megaraid2.c	2004-06-29 11:24:46.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/megaraid2.c	2004-09-05 16:06:04.000000000 +0200
@@ -31,6 +31,7 @@
  *
  */
 
+#include <linux/config.h>
 #include <linux/mm.h>
 #include <linux/fs.h>
 #include <linux/blk.h>
@@ -973,6 +974,19 @@ mega_query_adapter(adapter_t *adapter)
 }
 
 
+/**
+ * mega_runpendq()
+ * @adapter - pointer to our soft state
+ *
+ * Runs through the list of pending requests.
+ */
+static inline void
+mega_runpendq(adapter_t *adapter)
+{
+	if(!list_empty(&adapter->pending_list))
+		__mega_runpendq(adapter);
+}
+
 /*
  * megaraid_queue()
  * @scmd - Issue this scsi command
@@ -1023,6 +1037,92 @@ megaraid_queue(Scsi_Cmnd *scmd, void (*d
 
 
 /**
+ * mega_allocate_scb()
+ * @adapter - pointer to our soft state
+ * @cmd - scsi command from the mid-layer
+ *
+ * Allocate a SCB structure. This is the central structure for controller
+ * commands.
+ */
+static inline scb_t *
+mega_allocate_scb(adapter_t *adapter, Scsi_Cmnd *cmd)
+{
+	struct list_head *head = &adapter->free_list;
+	scb_t	*scb;
+
+	/* Unlink command from Free List */
+	if( !list_empty(head) ) {
+
+		scb = list_entry(head->next, scb_t, list);
+
+		list_del_init(head->next);
+
+		scb->state = SCB_ACTIVE;
+		scb->cmd = cmd;
+		scb->dma_type = MEGA_DMA_TYPE_NONE;
+
+		return scb;
+	}
+
+	return NULL;
+}
+
+
+/**
+ * mega_get_ldrv_num()
+ * @adapter - pointer to our soft state
+ * @cmd - scsi mid layer command
+ * @channel - channel on the controller
+ *
+ * Calculate the logical drive number based on the information in scsi command
+ * and the channel number.
+ */
+static inline int
+mega_get_ldrv_num(adapter_t *adapter, Scsi_Cmnd *cmd, int channel)
+{
+	int		tgt;
+	int		ldrv_num;
+
+	tgt = cmd->target;
+
+	if ( tgt > adapter->this_id )
+		tgt--;	/* we do not get inquires for initiator id */
+
+	ldrv_num = (channel * 15) + tgt;
+
+
+	/*
+	 * If we have a logical drive with boot enabled, project it first
+	 */
+	if( adapter->boot_ldrv_enabled ) {
+		if( ldrv_num == 0 ) {
+			ldrv_num = adapter->boot_ldrv;
+		}
+		else {
+			if( ldrv_num <= adapter->boot_ldrv ) {
+				ldrv_num--;
+			}
+		}
+	}
+
+	/*
+	 * If "delete logical drive" feature is enabled on this controller.
+	 * Do only if at least one delete logical drive operation was done.
+	 *
+	 * Also, after logical drive deletion, instead of logical drive number,
+	 * the value returned should be 0x80+logical drive id.
+	 *
+	 * These is valid only for IO commands.
+	 */
+
+	if (adapter->support_random_del && adapter->read_ldidmap )
+		ldrv_num += 0x80;
+
+	return ldrv_num;
+}
+
+
+/**
  * mega_build_cmd()
  * @adapter - pointer to our soft state
  * @cmd - Prepare using this scsi command
@@ -1297,7 +1397,7 @@ mega_build_cmd(adapter_t *adapter, Scsi_
 
 				mbox->lba &= 0x1FFFFF;
 
-#if MEGA_HAVE_STATS
+#ifdef CONFIG_SCSI_MEGARAID2_PROC_STATS
 				/*
 				 * Take modulo 0x80, since the logical drive
 				 * number increases by 0x80 when a logical
@@ -1328,7 +1428,7 @@ mega_build_cmd(adapter_t *adapter, Scsi_
 					((u32)cmd->cmnd[4] << 8) |
 					(u32)cmd->cmnd[5];
 
-#if MEGA_HAVE_STATS
+#ifdef CONFIG_SCSI_MEGARAID2_PROC_STATS
 				if (*cmd->cmnd == READ_10) {
 					adapter->nreads[ldrv_num%0x80]++;
 					adapter->nreadblocks[ldrv_num%0x80] +=
@@ -1357,7 +1457,7 @@ mega_build_cmd(adapter_t *adapter, Scsi_
 					((u32)cmd->cmnd[8] << 8) |
 					(u32)cmd->cmnd[9];
 
-#if MEGA_HAVE_STATS
+#ifdef CONFIG_SCSI_MEGARAID2_PROC_STATS
 				if (*cmd->cmnd == READ_12) {
 					adapter->nreads[ldrv_num%0x80]++;
 					adapter->nreadblocks[ldrv_num%0x80] +=
@@ -1603,51 +1703,6 @@ mega_prepare_extpassthru(adapter_t *adap
 }
 
 
-/**
- * mega_allocate_scb()
- * @adapter - pointer to our soft state
- * @cmd - scsi command from the mid-layer
- *
- * Allocate a SCB structure. This is the central structure for controller
- * commands.
- */
-static inline scb_t *
-mega_allocate_scb(adapter_t *adapter, Scsi_Cmnd *cmd)
-{
-	struct list_head *head = &adapter->free_list;
-	scb_t	*scb;
-
-	/* Unlink command from Free List */
-	if( !list_empty(head) ) {
-
-		scb = list_entry(head->next, scb_t, list);
-
-		list_del_init(head->next);
-
-		scb->state = SCB_ACTIVE;
-		scb->cmd = cmd;
-		scb->dma_type = MEGA_DMA_TYPE_NONE;
-
-		return scb;
-	}
-
-	return NULL;
-}
-
-
-/**
- * mega_runpendq()
- * @adapter - pointer to our soft state
- *
- * Runs through the list of pending requests.
- */
-static inline void
-mega_runpendq(adapter_t *adapter)
-{
-	if(!list_empty(&adapter->pending_list))
-		__mega_runpendq(adapter);
-}
-
 static void
 __mega_runpendq(adapter_t *adapter)
 {
@@ -1679,7 +1734,7 @@ __mega_runpendq(adapter_t *adapter)
  * busy. We also take the scb from the pending list if the mailbox is
  * available.
  */
-static inline int
+static int
 issue_scb(adapter_t *adapter, scb_t *scb)
 {
 	volatile mbox64_t	*mbox64 = adapter->mbox64;
@@ -1742,6 +1797,17 @@ issue_scb(adapter_t *adapter, scb_t *scb
 }
 
 
+/*
+ * Wait until the controller's mailbox is available
+ */
+static inline int
+mega_busywait_mbox (adapter_t *adapter)
+{
+	if (adapter->mbox->busy)
+		return __mega_busywait_mbox(adapter);
+	return 0;
+}
+
 /**
  * issue_scb_block()
  * @adapter - pointer to our soft state
@@ -1844,38 +1910,6 @@ bug_blocked_mailbox:
 
 
 /**
- * megaraid_isr_iomapped()
- * @irq - irq
- * @devp - pointer to our soft state
- * @regs - unused
- *
- * Interrupt service routine for io-mapped controllers.
- * Find out if our device is interrupting. If yes, acknowledge the interrupt
- * and service the completed commands.
- */
-static void
-megaraid_isr_iomapped(int irq, void *devp, struct pt_regs *regs)
-{
-	adapter_t	*adapter = devp;
-	unsigned long	flags;
-
-
-	spin_lock_irqsave(adapter->host_lock, flags);
-
-	megaraid_iombox_ack_sequence(adapter);
-
-	/* Loop through any pending requests */
-	if( atomic_read(&adapter->quiescent ) == 0) {
-		mega_runpendq(adapter);
-	}
-
-	spin_unlock_irqrestore(adapter->host_lock, flags);
-
-	return;
-}
-
-
-/**
  * megaraid_iombox_ack_sequence - interrupt ack sequence for IO mapped HBAs
  * @adapter	- controller's soft state
  *
@@ -1938,38 +1972,6 @@ megaraid_iombox_ack_sequence(adapter_t *
 
 
 /**
- * megaraid_isr_memmapped()
- * @irq - irq
- * @devp - pointer to our soft state
- * @regs - unused
- *
- * Interrupt service routine for memory-mapped controllers.
- * Find out if our device is interrupting. If yes, acknowledge the interrupt
- * and service the completed commands.
- */
-static void
-megaraid_isr_memmapped(int irq, void *devp, struct pt_regs *regs)
-{
-	adapter_t	*adapter = devp;
-	unsigned long	flags;
-
-
-	spin_lock_irqsave(adapter->host_lock, flags);
-
-	megaraid_memmbox_ack_sequence(adapter);
-
-	/* Loop through any pending requests */
-	if(atomic_read(&adapter->quiescent) == 0) {
-		mega_runpendq(adapter);
-	}
-
-	spin_unlock_irqrestore(adapter->host_lock, flags);
-
-	return;
-}
-
-
-/**
  * megaraid_memmbox_ack_sequence - interrupt ack sequence for memory mapped HBAs
  * @adapter	- controller's soft state
  *
@@ -2037,6 +2039,70 @@ megaraid_memmbox_ack_sequence(adapter_t 
 
 
 /**
+ * megaraid_isr_iomapped()
+ * @irq - irq
+ * @devp - pointer to our soft state
+ * @regs - unused
+ *
+ * Interrupt service routine for io-mapped controllers.
+ * Find out if our device is interrupting. If yes, acknowledge the interrupt
+ * and service the completed commands.
+ */
+static void
+megaraid_isr_iomapped(int irq, void *devp, struct pt_regs *regs)
+{
+	adapter_t	*adapter = devp;
+	unsigned long	flags;
+
+
+	spin_lock_irqsave(adapter->host_lock, flags);
+
+	megaraid_iombox_ack_sequence(adapter);
+
+	/* Loop through any pending requests */
+	if( atomic_read(&adapter->quiescent ) == 0) {
+		mega_runpendq(adapter);
+	}
+
+	spin_unlock_irqrestore(adapter->host_lock, flags);
+
+	return;
+}
+
+
+/**
+ * megaraid_isr_memmapped()
+ * @irq - irq
+ * @devp - pointer to our soft state
+ * @regs - unused
+ *
+ * Interrupt service routine for memory-mapped controllers.
+ * Find out if our device is interrupting. If yes, acknowledge the interrupt
+ * and service the completed commands.
+ */
+static void
+megaraid_isr_memmapped(int irq, void *devp, struct pt_regs *regs)
+{
+	adapter_t	*adapter = devp;
+	unsigned long	flags;
+
+
+	spin_lock_irqsave(adapter->host_lock, flags);
+
+	megaraid_memmbox_ack_sequence(adapter);
+
+	/* Loop through any pending requests */
+	if(atomic_read(&adapter->quiescent) == 0) {
+		mega_runpendq(adapter);
+	}
+
+	spin_unlock_irqrestore(adapter->host_lock, flags);
+
+	return;
+}
+
+
+/**
  * mega_cmd_done()
  * @adapter - pointer to our soft state
  * @completed - array of ids of completed commands
@@ -2045,7 +2111,7 @@ megaraid_memmbox_ack_sequence(adapter_t 
  *
  * Complete the comamnds and call the scsi mid-layer callback hooks.
  */
-static inline void
+static void
 mega_cmd_done(adapter_t *adapter, u8 completed[], int nstatus, int status)
 {
 	mega_ext_passthru	*epthru = NULL;
@@ -2134,7 +2200,7 @@ mega_cmd_done(adapter_t *adapter, u8 com
 				continue;
 			}
 
-#if MEGA_HAVE_STATS
+#ifdef CONFIG_SCSI_MEGARAID2_PROC_STATS
 			{
 
 			int	logdrv = mbox->logdrv;
@@ -2348,17 +2414,6 @@ mega_free_scb(adapter_t *adapter, scb_t 
 }
 
 
-/*
- * Wait until the controller's mailbox is available
- */
-static inline int
-mega_busywait_mbox (adapter_t *adapter)
-{
-	if (adapter->mbox->busy)
-		return __mega_busywait_mbox(adapter);
-	return 0;
-}
-
 static int
 __mega_busywait_mbox (adapter_t *adapter)
 {
@@ -2513,6 +2568,44 @@ mega_8_to_40ld(mraid_inquiry *inquiry, m
 }
 
 
+static inline void
+mega_free_sgl(adapter_t *adapter)
+{
+	scb_t	*scb;
+	int	i;
+
+	for(i = 0; i < adapter->max_cmds; i++) {
+
+		scb = &adapter->scb_list[i];
+
+		if( scb->sgl64 ) {
+			pci_free_consistent(adapter->dev,
+				sizeof(mega_sgl64) * adapter->sglen,
+				scb->sgl64,
+				scb->sgl_dma_addr);
+
+			scb->sgl64 = NULL;
+		}
+
+		if( scb->pthru ) {
+			pci_free_consistent(adapter->dev, sizeof(mega_passthru),
+				scb->pthru, scb->pthru_dma_addr);
+
+			scb->pthru = NULL;
+		}
+
+		if( scb->epthru ) {
+			pci_free_consistent(adapter->dev,
+				sizeof(mega_ext_passthru),
+				scb->epthru, scb->epthru_dma_addr);
+
+			scb->epthru = NULL;
+		}
+
+	}
+}
+
+
 /*
  * Release the controller's resources
  */
@@ -2649,44 +2742,6 @@ megaraid_release(struct Scsi_Host *host)
 	return 0;
 }
 
-static inline void
-mega_free_sgl(adapter_t *adapter)
-{
-	scb_t	*scb;
-	int	i;
-
-	for(i = 0; i < adapter->max_cmds; i++) {
-
-		scb = &adapter->scb_list[i];
-
-		if( scb->sgl64 ) {
-			pci_free_consistent(adapter->dev,
-				sizeof(mega_sgl64) * adapter->sglen,
-				scb->sgl64,
-				scb->sgl_dma_addr);
-
-			scb->sgl64 = NULL;
-		}
-
-		if( scb->pthru ) {
-			pci_free_consistent(adapter->dev, sizeof(mega_passthru),
-				scb->pthru, scb->pthru_dma_addr);
-
-			scb->pthru = NULL;
-		}
-
-		if( scb->epthru ) {
-			pci_free_consistent(adapter->dev,
-				sizeof(mega_ext_passthru),
-				scb->epthru, scb->epthru_dma_addr);
-
-			scb->epthru = NULL;
-		}
-
-	}
-}
-
-
 /*
  * Get information about the card/driver
  */
@@ -2904,6 +2959,27 @@ megaraid_reset(Scsi_Cmnd *cmd)
 }
 
 
+/**
+ * mega_allocate_inquiry()
+ * @dma_handle - handle returned for dma address
+ * @pdev - handle to pci device
+ *
+ * allocates memory for inquiry structure
+ */
+static inline caddr_t
+mega_allocate_inquiry(dma_addr_t *dma_handle, struct pci_dev *pdev)
+{
+	return pci_alloc_consistent(pdev, sizeof(mega_inquiry3), dma_handle);
+}
+
+
+static inline void
+mega_free_inquiry(caddr_t inquiry, dma_addr_t dma_handle, struct pci_dev *pdev)
+{
+	pci_free_consistent(pdev, sizeof(mega_inquiry3), inquiry, dma_handle);
+}
+
+
 #ifdef CONFIG_PROC_FS
 /* Following code handles /proc fs  */
 
@@ -3097,7 +3173,7 @@ proc_read_stat(char *page, char **start,
 	len = sprintf(page, "Statistical Information for this controller\n");
 	len += sprintf(page+len, "pend_cmds = %d\n",
 			atomic_read(&adapter->pend_cmds));
-#if MEGA_HAVE_STATS
+#ifdef CONFIG_SCSI_MEGARAID2_PROC_STATS
 	for(i = 0; i < adapter->numldrv; i++) {
 		len += sprintf(page+len, "Logical Drive %d:\n", i);
 
@@ -4221,7 +4297,7 @@ megadev_ioctl(struct inode *inode, struc
 			return (-EFAULT);
 		break;
 
-#if MEGA_HAVE_STATS
+#ifdef CONFIG_SCSI_MEGARAID2_PROC_STATS
 
 	case GET_STATS:
 		/*
@@ -5122,60 +5198,6 @@ mega_support_cluster(adapter_t *adapter)
 
 
 /**
- * mega_get_ldrv_num()
- * @adapter - pointer to our soft state
- * @cmd - scsi mid layer command
- * @channel - channel on the controller
- *
- * Calculate the logical drive number based on the information in scsi command
- * and the channel number.
- */
-static inline int
-mega_get_ldrv_num(adapter_t *adapter, Scsi_Cmnd *cmd, int channel)
-{
-	int		tgt;
-	int		ldrv_num;
-
-	tgt = cmd->target;
-
-	if ( tgt > adapter->this_id )
-		tgt--;	/* we do not get inquires for initiator id */
-
-	ldrv_num = (channel * 15) + tgt;
-
-
-	/*
-	 * If we have a logical drive with boot enabled, project it first
-	 */
-	if( adapter->boot_ldrv_enabled ) {
-		if( ldrv_num == 0 ) {
-			ldrv_num = adapter->boot_ldrv;
-		}
-		else {
-			if( ldrv_num <= adapter->boot_ldrv ) {
-				ldrv_num--;
-			}
-		}
-	}
-
-	/*
-	 * If "delete logical drive" feature is enabled on this controller.
-	 * Do only if at least one delete logical drive operation was done.
-	 *
-	 * Also, after logical drive deletion, instead of logical drive number,
-	 * the value returned should be 0x80+logical drive id.
-	 *
-	 * These is valid only for IO commands.
-	 */
-
-	if (adapter->support_random_del && adapter->read_ldidmap )
-		ldrv_num += 0x80;
-
-	return ldrv_num;
-}
-
-
-/**
  * mega_reorder_hosts()
  *
  * Hack: reorder the scsi hosts in mid-layer so that the controller with the
@@ -5389,27 +5411,6 @@ mega_adapinq(adapter_t *adapter, dma_add
 }
 
 
-/**
- * mega_allocate_inquiry()
- * @dma_handle - handle returned for dma address
- * @pdev - handle to pci device
- *
- * allocates memory for inquiry structure
- */
-static inline caddr_t
-mega_allocate_inquiry(dma_addr_t *dma_handle, struct pci_dev *pdev)
-{
-	return pci_alloc_consistent(pdev, sizeof(mega_inquiry3), dma_handle);
-}
-
-
-static inline void
-mega_free_inquiry(caddr_t inquiry, dma_addr_t dma_handle, struct pci_dev *pdev)
-{
-	pci_free_consistent(pdev, sizeof(mega_inquiry3), inquiry, dma_handle);
-}
-
-
 /** mega_internal_dev_inquiry()
  * @adapter - pointer to our soft state
  * @ch - channel for this device
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/megaraid2.h linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/megaraid2.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/megaraid2.h	2004-06-29 11:24:46.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/megaraid2.h	2004-09-05 16:06:04.000000000 +0200
@@ -1,6 +1,7 @@
 #ifndef __MEGARAID_H__
 #define __MEGARAID_H__
 
+#include <linux/config.h>
 #include <linux/version.h>
 #include <linux/spinlock.h>
 
@@ -29,15 +30,6 @@
 #define MEGA_HAVE_CLUSTERING	1
 
 /*
- * Driver statistics - Set this flag if you are interested in statics about
- * number of I/O completed on each logical drive and how many interrupts
- * generated. If enabled, this information is available through /proc
- * interface and through the private ioctl. Setting this flag has a
- * performance penalty.
- */
-#define MEGA_HAVE_STATS		0
-
-/*
  * Enhanced /proc interface - This feature will allow you to have a more
  * detailed /proc interface for megaraid driver. E.g., a real time update of
  * the status of the logical drives, battery status, physical drives etc.
@@ -914,7 +906,7 @@ typedef struct {
 	atomic_t	pend_cmds;	/* maintain a counter for
 					pending commands in firmware */
 
-#if MEGA_HAVE_STATS
+#ifdef CONFIG_SCSI_MEGARAID2_PROC_STATS
 	u32	nreads[MAX_LOGICAL_DRIVES_40LD];
 	u32	nreadblocks[MAX_LOGICAL_DRIVES_40LD];
 	u32	nwrites[MAX_LOGICAL_DRIVES_40LD];
@@ -1099,14 +1091,12 @@ const char *megaraid_info (struct Scsi_H
 static int megaraid_detect(Scsi_Host_Template *);
 static void mega_find_card(Scsi_Host_Template *, u16, u16);
 static int mega_query_adapter(adapter_t *);
-static inline int issue_scb(adapter_t *, scb_t *);
+static int issue_scb(adapter_t *, scb_t *);
 static int mega_setup_mailbox(adapter_t *);
 
 static int megaraid_queue (Scsi_Cmnd *, void (*)(Scsi_Cmnd *));
 static scb_t * mega_build_cmd(adapter_t *, Scsi_Cmnd *, int *);
-static inline scb_t *mega_allocate_scb(adapter_t *, Scsi_Cmnd *);
 static void __mega_runpendq(adapter_t *);
-static inline void mega_runpendq(adapter_t *);
 static int issue_scb_block(adapter_t *, u_char *);
 
 static void megaraid_isr_memmapped(int, void *, struct pt_regs *);
@@ -1123,9 +1113,8 @@ static int megaraid_reset(Scsi_Cmnd *);
 
 static int mega_build_sglist (adapter_t *adapter, scb_t *scb,
 			      u32 *buffer, u32 *length);
-static inline int mega_busywait_mbox (adapter_t *);
 static int __mega_busywait_mbox (adapter_t *);
-static inline void mega_cmd_done(adapter_t *, u8 [], int, int);
+static void mega_cmd_done(adapter_t *, u8 [], int, int);
 static inline void mega_free_sgl (adapter_t *adapter);
 static void mega_8_to_40ld (mraid_inquiry *inquiry,
 		mega_inquiry3 *enquiry3, mega_product_info *);
@@ -1177,8 +1166,6 @@ static int proc_rdrv(adapter_t *, char *
 
 static int mega_adapinq(adapter_t *, dma_addr_t);
 static int mega_internal_dev_inquiry(adapter_t *, u8, u8, dma_addr_t);
-static inline caddr_t mega_allocate_inquiry(dma_addr_t *, struct pci_dev *);
-static inline void mega_free_inquiry(caddr_t, dma_addr_t, struct pci_dev *);
 static int mega_print_inquiry(char *, char *);
 #endif
 
@@ -1189,7 +1176,6 @@ static mega_ext_passthru* mega_prepare_e
 		scb_t *, Scsi_Cmnd *, int, int);
 static void mega_enum_raid_scsi(adapter_t *);
 static void mega_get_boot_drv(adapter_t *);
-static inline int mega_get_ldrv_num(adapter_t *, Scsi_Cmnd *, int);
 static int mega_support_random_del(adapter_t *);
 static int mega_del_logdrv(adapter_t *, int);
 static int mega_do_del_logdrv(adapter_t *, int);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/nsp32.c linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/nsp32.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/nsp32.c	2004-06-29 11:24:42.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/nsp32.c	2004-09-05 16:06:04.000000000 +0200
@@ -3365,6 +3365,48 @@ static int nsp32_prom_read(nsp32_hw_data
 	return val;
 }
 
+static inline void nsp32_prom_set(nsp32_hw_data *data, int bit, int val)
+{
+	unsigned int base = data->BaseAddress;
+	int tmp;
+
+	tmp = nsp32_index_read1(base, SERIAL_ROM_CTL);
+
+	if (val == 0) {
+		tmp &= ~bit;
+	} else {
+		tmp |=  bit;
+	}
+
+	nsp32_index_write1(base, SERIAL_ROM_CTL, tmp);
+
+	udelay(10);
+}
+
+static inline int nsp32_prom_get(nsp32_hw_data *data, int bit)
+{
+	unsigned int base = data->BaseAddress;
+	int tmp, ret;
+
+	if (bit != SROM_DATA) {
+		nsp32_msg(KERN_ERR, "return value is not appropriate");
+		return 0;
+	}
+
+
+	tmp = nsp32_index_read1(base, SERIAL_ROM_CTL) & bit;
+
+	if (tmp == 0) {
+		ret = 0;
+	} else {
+		ret = 1;
+	}
+
+	udelay(10);
+
+	return ret;
+}
+
 static void nsp32_prom_start (nsp32_hw_data *data)
 {
 	/* start condition */
@@ -3410,49 +3452,6 @@ static int nsp32_prom_read_bit(nsp32_hw_
 	return val;
 }
 
-static inline void nsp32_prom_set(nsp32_hw_data *data, int bit, int val)
-{
-	unsigned int base = data->BaseAddress;
-	int tmp;
-
-	tmp = nsp32_index_read1(base, SERIAL_ROM_CTL);
-
-	if (val == 0) {
-		tmp &= ~bit;
-	} else {
-		tmp |=  bit;
-	}
-
-	nsp32_index_write1(base, SERIAL_ROM_CTL, tmp);
-
-	udelay(10);
-}
-
-static inline int nsp32_prom_get(nsp32_hw_data *data, int bit)
-{
-	unsigned int base = data->BaseAddress;
-	int tmp, ret;
-
-	if (bit != SROM_DATA) {
-		nsp32_msg(KERN_ERR, "return value is not appropriate");
-		return 0;
-	}
-
-
-	tmp = nsp32_index_read1(base, SERIAL_ROM_CTL) & bit;
-
-	if (tmp == 0) {
-		ret = 0;
-	} else {
-		ret = 1;
-	}
-
-	udelay(10);
-
-	return ret;
-}
-
-
 /**************************************************************************
  * Power Management
  */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/osst.c linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/osst.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/osst.c	2001-12-21 18:41:55.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/osst.c	2004-09-05 16:06:00.000000000 +0200
@@ -3082,6 +3082,7 @@ static ssize_t osst_write(struct file * 
 	ST_mode * STm;
 	ST_partstat * STps;
 	int dev = TAPE_NR(inode->i_rdev);
+	loff_t pos = *ppos;
 
 	STp = os_scsi_tapes[dev];
 
@@ -3299,7 +3300,7 @@ if (SRpnt) printk(KERN_ERR "osst%d:A: No
 		if (i == (-ENOSPC)) {
 			transfer = STp->buffer->writing;	/* FIXME -- check this logic */
 			if (transfer <= do_count) {
-				filp->f_pos += do_count - transfer;
+				pos += do_count - transfer;
 				count -= do_count - transfer;
 				if (STps->drv_block >= 0) {
 					STps->drv_block += (do_count - transfer) / STp->block_size;
@@ -3337,7 +3338,7 @@ if (SRpnt) printk(KERN_ERR "osst%d:A: No
 			goto out;
 		}
 
-		filp->f_pos += do_count;
+		pos += do_count;
 		b_point += do_count;
 		count -= do_count;
 		if (STps->drv_block >= 0) {
@@ -3359,7 +3360,7 @@ if (SRpnt) printk(KERN_ERR "osst%d:A: No
 		if (STps->drv_block >= 0) {
 			STps->drv_block += blks;
 		}
-		filp->f_pos += count;
+		pos += count;
 		count = 0;
 	}
 
@@ -3389,6 +3390,7 @@ if (SRpnt) printk(KERN_ERR "osst%d:A: No
 	retval = total;
 
 out:
+	*ppos = pos;
 	if (SRpnt != NULL) scsi_release_request(SRpnt);
 
 	up(&STp->lock);
@@ -3409,6 +3411,7 @@ static ssize_t osst_read(struct file * f
 	ST_partstat * STps;
 	Scsi_Request *SRpnt = NULL;
 	int dev = TAPE_NR(inode->i_rdev);
+	loff_t pos = *ppos;
 
 	STp = os_scsi_tapes[dev];
 
@@ -3534,7 +3537,7 @@ static ssize_t osst_read(struct file * f
 			}
 			STp->logical_blk_num += transfer / STp->block_size;
 			STps->drv_block      += transfer / STp->block_size;
-			filp->f_pos          += transfer;
+			pos                  += transfer;
 			buf                  += transfer;
 			total                += transfer;
 		}
@@ -3573,6 +3576,7 @@ static ssize_t osst_read(struct file * f
 	retval = total;
 
 out:
+	*ppos = pos;
 	if (SRpnt != NULL) scsi_release_request(SRpnt);
 
 	up(&STp->lock);
@@ -5384,6 +5388,7 @@ static struct file_operations osst_fops 
 	read:		osst_read,
 	write:		osst_write,
 	ioctl:		osst_ioctl,
+	llseek:		no_llseek,
 	open:		os_scsi_tape_open,
 	flush:		os_scsi_tape_flush,
 	release:	os_scsi_tape_close,
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/qla1280.c linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/qla1280.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/qla1280.c	2004-06-29 11:23:16.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/qla1280.c	2004-09-05 16:06:04.000000000 +0200
@@ -861,6 +861,41 @@ static int qla1280_read_nvram(struct scs
 }
 
 
+ /*
+    * qla2100_enable_intrs
+    * qla2100_disable_intrs
+    *
+    * Input:
+    *      ha = adapter block pointer.
+    *
+    * Returns:
+    *      None
+  */
+static inline void
+qla1280_enable_intrs(struct scsi_qla_host *ha)
+{
+	struct device_reg *reg;
+
+	reg = ha->iobase;
+	/* enable risc and host interrupts */
+	WRT_REG_WORD(&reg->ictrl, (ISP_EN_INT | ISP_EN_RISC));
+	RD_REG_WORD(&reg->ictrl);	/* PCI Posted Write flush */
+	ha->flags.ints_enabled = 1;
+}
+
+static inline void
+qla1280_disable_intrs(struct scsi_qla_host *ha)
+{
+	struct device_reg *reg;
+
+	reg = ha->iobase;
+	/* disable risc and host interrupts */
+	WRT_REG_WORD(&reg->ictrl, 0);
+	RD_REG_WORD(&reg->ictrl);	/* PCI Posted Write flush */
+	ha->flags.ints_enabled = 0;
+}
+
+
 /**************************************************************************
  * qla1280_do_device_init
  *    This routine will register the device with the SCSI subsystem,
@@ -2074,40 +2109,6 @@ qla1280_mem_free(struct scsi_qla_host *h
 /*                QLogic ISP1280 Hardware Support Functions.                */
 /****************************************************************************/
 
- /*
-    * qla2100_enable_intrs
-    * qla2100_disable_intrs
-    *
-    * Input:
-    *      ha = adapter block pointer.
-    *
-    * Returns:
-    *      None
-  */
-static inline void
-qla1280_enable_intrs(struct scsi_qla_host *ha)
-{
-	struct device_reg *reg;
-
-	reg = ha->iobase;
-	/* enable risc and host interrupts */
-	WRT_REG_WORD(&reg->ictrl, (ISP_EN_INT | ISP_EN_RISC));
-	RD_REG_WORD(&reg->ictrl);	/* PCI Posted Write flush */
-	ha->flags.ints_enabled = 1;
-}
-
-static inline void
-qla1280_disable_intrs(struct scsi_qla_host *ha)
-{
-	struct device_reg *reg;
-
-	reg = ha->iobase;
-	/* disable risc and host interrupts */
-	WRT_REG_WORD(&reg->ictrl, 0);
-	RD_REG_WORD(&reg->ictrl);	/* PCI Posted Write flush */
-	ha->flags.ints_enabled = 0;
-}
-
 /*
  * qla1280_initialize_adapter
  *      Initialize board.
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/qla2xxx/Config.in linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/qla2xxx/Config.in
--- linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/qla2xxx/Config.in	2004-06-29 11:23:13.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/qla2xxx/Config.in	2004-09-05 16:06:14.000000000 +0200
@@ -1,6 +1,6 @@
-bool 'Qlogic QLA 2XXX v6 FC SCSI support' CONFIG_SCSI_QLOGIC_QLA2XXX
+bool '  Qlogic QLA 2XXX v6 FC SCSI support' CONFIG_SCSI_QLOGIC_QLA2XXX
 if [ "$CONFIG_SCSI_QLOGIC_QLA2XXX" != "n" ]; then
-	dep_tristate '  Qlogic QLA 2100 v6 FC SCSI support' CONFIG_SCSI_QLOGIC_QLA2XXX_QLA2100 $CONFIG_SCSI
-	dep_tristate '  Qlogic QLA 2200 v6 FC SCSI support' CONFIG_SCSI_QLOGIC_QLA2XXX_QLA2200 $CONFIG_SCSI
-	dep_tristate '  Qlogic QLA 2300 v6 FC SCSI support' CONFIG_SCSI_QLOGIC_QLA2XXX_QLA2300 $CONFIG_SCSI
+	dep_tristate '    Qlogic QLA 2100 v6 FC SCSI support' CONFIG_SCSI_QLOGIC_QLA2XXX_QLA2100 $CONFIG_SCSI
+	dep_tristate '    Qlogic QLA 2200 v6 FC SCSI support' CONFIG_SCSI_QLOGIC_QLA2XXX_QLA2200 $CONFIG_SCSI
+	dep_tristate '    Qlogic QLA 2300 v6 FC SCSI support' CONFIG_SCSI_QLOGIC_QLA2XXX_QLA2300 $CONFIG_SCSI
 fi
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/qla2xxx/qla2x00.c linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/qla2xxx/qla2x00.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/qla2xxx/qla2x00.c	2004-06-29 11:23:16.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/qla2xxx/qla2x00.c	2004-09-05 15:46:10.000000000 +0200
@@ -18720,10 +18720,10 @@ apidev_init(struct Scsi_Host *host) 
 #ifndef __VMWARE__
            // XXX: Fix this when proc_mknod works again on main!!!
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-	proc_mknod(APIDEV_NODE, 0777+S_IFCHR, host->hostt->proc_dir,
+	proc_mknod(APIDEV_NODE, 0600+S_IFCHR, host->hostt->proc_dir,
 			(kdev_t)MKDEV(apidev_major, 0));
 #else
-	proc_mknod(APIDEV_NODE, 0777+S_IFCHR, host->hostt->proc_dir,
+	proc_mknod(APIDEV_NODE, 0600+S_IFCHR, host->hostt->proc_dir,
 			(kdev_t)mk_kdev(apidev_major, 0));
 #endif
 #endif //__VMWARE__
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/qla2xxx-60500/Config.in linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/qla2xxx-60500/Config.in
--- linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/qla2xxx-60500/Config.in	2004-06-29 11:23:14.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/qla2xxx-60500/Config.in	2004-09-05 16:06:14.000000000 +0200
@@ -1,6 +1,6 @@
-bool 'Qlogic QLA 2XXX (version 6.05.00) FC SCSI support' CONFIG_SCSI_QLA2XXX_60500
+bool '  Qlogic QLA 2XXX (version 6.05.00) FC SCSI support' CONFIG_SCSI_QLA2XXX_60500
 if [ "$CONFIG_SCSI_QLA2XXX_60500" != "n" ]; then
-	dep_tristate '  Qlogic QLA 2100 (version 6.05.00) FC SCSI support' CONFIG_SCSI_QLA2XXX_QLA2100_60500 $CONFIG_SCSI
-	dep_tristate '  Qlogic QLA 2200 (version 6.05.00) FC SCSI support' CONFIG_SCSI_QLA2XXX_QLA2200_60500 $CONFIG_SCSI
-	dep_tristate '  Qlogic QLA 2300 (version 6.05.00) FC SCSI support' CONFIG_SCSI_QLA2XXX_QLA2300_60500 $CONFIG_SCSI
+	dep_tristate '    Qlogic QLA 2100 (version 6.05.00) FC SCSI support' CONFIG_SCSI_QLA2XXX_QLA2100_60500 $CONFIG_SCSI
+	dep_tristate '    Qlogic QLA 2200 (version 6.05.00) FC SCSI support' CONFIG_SCSI_QLA2XXX_QLA2200_60500 $CONFIG_SCSI
+	dep_tristate '    Qlogic QLA 2300 (version 6.05.00) FC SCSI support' CONFIG_SCSI_QLA2XXX_QLA2300_60500 $CONFIG_SCSI
 fi
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/qla2xxx-60500/qla2x00.c linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/qla2xxx-60500/qla2x00.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/qla2xxx-60500/qla2x00.c	2004-06-29 11:23:14.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/qla2xxx-60500/qla2x00.c	2004-09-05 15:46:10.000000000 +0200
@@ -17298,10 +17298,10 @@ apidev_init(struct Scsi_Host *host) 
 #ifndef __VMWARE__
            // XXX: Fix this when proc_mknod works again on main!!!
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-	proc_mknod(APIDEV_NODE, 0777+S_IFCHR, host->hostt->proc_dir,
+	proc_mknod(APIDEV_NODE, 0600+S_IFCHR, host->hostt->proc_dir,
 			(kdev_t)MKDEV(apidev_major, 0));
 #else
-	proc_mknod(APIDEV_NODE, 0777+S_IFCHR, host->hostt->proc_dir,
+	proc_mknod(APIDEV_NODE, 0600+S_IFCHR, host->hostt->proc_dir,
 			(kdev_t)mk_kdev(apidev_major, 0));
 #endif
 #endif //__VMWARE__
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/qla2xxx-60650/Config.in linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/qla2xxx-60650/Config.in
--- linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/qla2xxx-60650/Config.in	2004-06-29 11:23:15.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/qla2xxx-60650/Config.in	2004-09-05 16:06:14.000000000 +0200
@@ -1,6 +1,6 @@
-bool 'Qlogic QLA 2XXX (version 6.06.50) FC SCSI support' CONFIG_SCSI_QLA2XXX_60650
+bool '  Qlogic QLA 2XXX (version 6.06.50) FC SCSI support' CONFIG_SCSI_QLA2XXX_60650
 if [ "$CONFIG_SCSI_QLA2XXX_60650" != "n" ]; then
-	dep_tristate '  Qlogic QLA 2100 (version 6.06.50) FC SCSI support' CONFIG_SCSI_QLA2XXX_QLA2100_60650 $CONFIG_SCSI
-	dep_tristate '  Qlogic QLA 2200 (version 6.06.50) FC SCSI support' CONFIG_SCSI_QLA2XXX_QLA2200_60650 $CONFIG_SCSI
-	dep_tristate '  Qlogic QLA 2300 (version 6.06.50) FC SCSI support' CONFIG_SCSI_QLA2XXX_QLA2300_60650 $CONFIG_SCSI
+	dep_tristate '    Qlogic QLA 2100 (version 6.06.50) FC SCSI support' CONFIG_SCSI_QLA2XXX_QLA2100_60650 $CONFIG_SCSI
+	dep_tristate '    Qlogic QLA 2200 (version 6.06.50) FC SCSI support' CONFIG_SCSI_QLA2XXX_QLA2200_60650 $CONFIG_SCSI
+	dep_tristate '    Qlogic QLA 2300 (version 6.06.50) FC SCSI support' CONFIG_SCSI_QLA2XXX_QLA2300_60650 $CONFIG_SCSI
 fi
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/qla2xxx-60650/qla2x00.c linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/qla2xxx-60650/qla2x00.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/qla2xxx-60650/qla2x00.c	2004-06-29 11:23:15.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/qla2xxx-60650/qla2x00.c	2004-09-05 15:46:10.000000000 +0200
@@ -18757,10 +18757,10 @@ apidev_init(struct Scsi_Host *host) 
 #ifndef __VMWARE__
            // XXX: Fix this when proc_mknod works again on main!!!
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-	proc_mknod(APIDEV_NODE, 0777+S_IFCHR, host->hostt->proc_dir,
+	proc_mknod(APIDEV_NODE, 0600+S_IFCHR, host->hostt->proc_dir,
 			(kdev_t)MKDEV(apidev_major, 0));
 #else
-	proc_mknod(APIDEV_NODE, 0777+S_IFCHR, host->hostt->proc_dir,
+	proc_mknod(APIDEV_NODE, 0600+S_IFCHR, host->hostt->proc_dir,
 			(kdev_t)mk_kdev(apidev_major, 0));
 #endif
 #endif //__VMWARE__
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/qlogicfas.c linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/qlogicfas.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/qlogicfas.c	2002-08-03 02:39:44.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/qlogicfas.c	2004-09-05 15:48:42.000000000 +0200
@@ -111,10 +111,6 @@
 
 #include <linux/module.h>
 
-#ifdef PCMCIA
-#undef MODULE
-#endif 
-
 #include <linux/blk.h>	/* to get disk capacity */
 #include <linux/kernel.h>
 #include <linux/string.h>
@@ -131,6 +127,10 @@
 #include "qlogicfas.h"
 #include <linux/stat.h>
 
+#ifdef PCMCIA
+#undef MODULE
+#endif 
+
 /*----------------------------------------------------------------*/
 /* driver state info, local to driver */
 static int	    qbase;	/* Port */
@@ -147,6 +147,8 @@ static int	    qlcfg8 = ( SLOWCABLE << 7
 static int	    qlcfg9 = ( ( XTALFREQ + 4 ) / 5 );
 static int	    qlcfgc = ( FASTCLK << 3 ) | ( FASTSCSI << 4 );
 
+struct	Scsi_Host	*hreg;	/* registered host structure */
+
 /*----------------------------------------------------------------*/
 /* The qlogic card uses two register maps - These macros select which one */
 #define REG0 ( outb( inb( qbase + 0xd ) & 0x7f , qbase + 0xd ), outb( 4 , qbase + 0xd ))
@@ -541,13 +543,24 @@ void	qlogicfas_preset(int port, int irq)
 }
 #endif
 
+int	qlogicfas_release(struct Scsi_Host *hreg)
+{
+	release_region(qbase, 0x10);
+
+	if (qlirq >= 0)
+		free_irq(qlirq, hreg);
+
+	scsi_unregister(hreg);
+
+	return 0;
+}
+
 /*----------------------------------------------------------------*/
 /* look for qlogic card and init if found */
 int __QLINIT qlogicfas_detect(Scsi_Host_Template * host)
 {
 int	i, j;			/* these are only used by IRQ detect */
 int	qltyp;			/* type of chip */
-struct	Scsi_Host	*hreg;	/* registered host structure */
 unsigned long	flags;
 
 host->proc_name =  "qlogicfas";
@@ -620,16 +633,28 @@ host->proc_name =  "qlogicfas";
 	else
 		printk( "Ql: Using preset IRQ %d\n", qlirq );
 
-	if (qlirq >= 0 && !request_irq(qlirq, do_ql_ihandl, 0, "qlogicfas", NULL))
+	if (qlirq >= 0)
 		host->can_queue = 1;
 #endif
 	hreg = scsi_register( host , 0 );	/* no host data */
 	if (!hreg)
 		goto err_release_mem;
+
+#if QL_USE_IRQ
+#ifdef PCMCIA
+	if(request_irq(qlirq, do_ql_ihandl, SA_SHIRQ, "qlogicfas", hreg) < 0)
+#else	
+	if(request_irq(qlirq, do_ql_ihandl, SA_SHIRQ, "qlogicfas", hreg) < 0)
+#endif	
+	{
+		scsi_unregister(hreg);
+		goto err_release_mem;
+	}
+#endif
 	hreg->io_port = qbase;
 	hreg->n_io_port = 16;
 	hreg->dma_channel = -1;
-	if( qlirq != -1 )
+	if( qlirq >= 0 )
 		hreg->irq = qlirq;
 
 	sprintf(qinfo, "Qlogicfas Driver version 0.46, chip %02X at %03X, IRQ %d, TPdma:%d",
@@ -640,8 +665,8 @@ host->proc_name =  "qlogicfas";
 
  err_release_mem:
 	release_region(qbase, 0x10);
-	if (host->can_queue)
-		free_irq(qlirq, do_ql_ihandl);
+	if (qlirq >= 0)
+		free_irq(qlirq, hreg);
 	return 0;
 
 }
@@ -692,7 +717,9 @@ const char	*qlogicfas_info(struct Scsi_H
 }
 MODULE_LICENSE("GPL");
 
+#ifndef PCMCIA
 /* Eventually this will go into an include file, but this will be later */
 static Scsi_Host_Template driver_template = QLOGICFAS;
 #include "scsi_module.c"
+#endif
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/qlogicfas.h linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/qlogicfas.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/qlogicfas.h	2001-04-12 04:02:37.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/qlogicfas.h	2004-09-05 15:48:42.000000000 +0200
@@ -2,6 +2,7 @@
 #define _QLOGICFAS_H
 
 int qlogicfas_detect(Scsi_Host_Template * );
+int qlogicfas_release(struct Scsi_Host *);
 const char * qlogicfas_info(struct Scsi_Host *);
 int qlogicfas_command(Scsi_Cmnd *);
 int qlogicfas_queuecommand(Scsi_Cmnd *, void (* done)(Scsi_Cmnd *));
@@ -21,6 +22,7 @@ int qlogicfas_biosparam(Disk *, kdev_t, 
 
 #define QLOGICFAS {		\
 	detect:         qlogicfas_detect,	\
+        release:        qlogicfas_release,      \
 	info:           qlogicfas_info,		\
 	command:        qlogicfas_command, 	\
 	queuecommand:   qlogicfas_queuecommand,	\
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/scsi_debug.c linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/scsi_debug.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/scsi_debug.c	2002-11-29 00:53:14.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/scsi_debug.c	2004-09-05 15:48:42.000000000 +0200
@@ -48,7 +48,7 @@
 
 #include "scsi_debug.h"
 
-static const char * scsi_debug_version_str = "Version: 0.61 (20020815)";
+static const char * scsi_debug_version_str = "Version: 0.63 (20040831)";
 
 
 #ifndef SCSI_CMD_READ_16
@@ -73,7 +73,7 @@ static const char * scsi_debug_version_s
 #define SCSI_DEBUG_OPT_MEDIUM_ERR   2
 #define SCSI_DEBUG_OPT_EVERY_NTH   4
 
-#define OPT_MEDIUM_ERR_ADDR   0x1234
+#define OPT_MEDIUM_ERR_ADDR   0x1234  /* that's 4660 in decimal */
 
 static int scsi_debug_num_devs = DEF_NR_FAKE_DEVS;
 static int scsi_debug_opts = DEF_OPTS;
@@ -124,7 +124,7 @@ static struct sdebug_queued_cmd queued_a
 
 static unsigned char * fake_storep;	/* ramdisk storage */
 
-static unsigned char broken_buff[SDEBUG_SENSE_LEN];
+static unsigned char spare_buff[SDEBUG_SENSE_LEN];
 
 static int num_aborts = 0;
 static int num_dev_resets = 0;
@@ -193,8 +193,7 @@ int scsi_debug_queuecommand(Scsi_Cmnd * 
 	else 
 		buff = (unsigned char *) SCpnt->request_buffer;
 	if (NULL == buff) {
-		printk(KERN_WARNING "scsi_debug:qc: buff was NULL??\n");
-		buff = broken_buff;	/* just point at dummy */
+		buff = spare_buff;	/* just point at dummy */
 		bufflen = SDEBUG_SENSE_LEN;
 	}
 
@@ -370,7 +369,7 @@ int scsi_debug_queuecommand(Scsi_Cmnd * 
 		if ((errsts = check_reset(SCpnt, devip)))
 			break;
 		mk_sense_buffer(devip, ILLEGAL_REQUEST, 0x20, 0, 14);
-		errsts = (COMMAND_COMPLETE << 8) | (CHECK_CONDITION << 1);
+		errsts = (DRIVER_SENSE << 24) | (CHECK_CONDITION << 1);
 		break;
 	}
 	return schedule_resp(SCpnt, devip, done, errsts, scsi_debug_delay);
@@ -390,7 +389,7 @@ static int check_reset(Scsi_Cmnd * SCpnt
 	if (devip->reset) {
 		devip->reset = 0;
 		mk_sense_buffer(devip, UNIT_ATTENTION, 0x29, 0, 14);
-		return (COMMAND_COMPLETE << 8) | (CHECK_CONDITION << 1);
+		return (DRIVER_SENSE << 24) | (CHECK_CONDITION << 1);
 	}
 	return 0;
 }
@@ -451,7 +450,7 @@ static int resp_inquiry(unsigned char * 
 	arr[0] = pq_pdt;
 	if (0x2 & cmd[1]) {  /* CMDDT bit set */
 		mk_sense_buffer(devip, ILLEGAL_REQUEST, 0x24, 0, 14);
-		return (COMMAND_COMPLETE << 8) | (CHECK_CONDITION << 1);
+		return (DRIVER_SENSE << 24) | (CHECK_CONDITION << 1);
 	} else if (0x1 & cmd[1]) {  /* EVPD bit set */
 		int dev_id_num, len;
 		char dev_id_str[6];
@@ -476,7 +475,7 @@ static int resp_inquiry(unsigned char * 
 		} else {
 			/* Illegal request, invalid field in cdb */
 			mk_sense_buffer(devip, ILLEGAL_REQUEST, 0x24, 0, 14);
-			return (COMMAND_COMPLETE << 8) | (CHECK_CONDITION << 1);
+			return (DRIVER_SENSE << 24) | (CHECK_CONDITION << 1);
 		}
 		memcpy(buff, arr, min_len); 
 		return 0;
@@ -589,7 +588,7 @@ static int resp_mode_sense(unsigned char
 	memset(arr, 0, SDEBUG_MAX_MSENSE_SZ);
 	if (0x3 == pcontrol) {  /* Saving values not supported */
 		mk_sense_buffer(devip, ILLEGAL_REQUEST, 0x39, 0, 14);
-		return (COMMAND_COMPLETE << 8) | (CHECK_CONDITION << 1);
+		return (DRIVER_SENSE << 24) | (CHECK_CONDITION << 1);
 	}
 	dev_spec = DEV_READONLY(target) ? 0x80 : 0x0;
 	if (msense_6) {
@@ -631,7 +630,7 @@ static int resp_mode_sense(unsigned char
 		break;
 	default:
 		mk_sense_buffer(devip, ILLEGAL_REQUEST, 0x24, 0, 14);
-		return (COMMAND_COMPLETE << 8) | (CHECK_CONDITION << 1);
+		return (DRIVER_SENSE << 24) | (CHECK_CONDITION << 1);
 	}
 	if (msense_6)
 		arr[0] = offset - 1;
@@ -655,14 +654,14 @@ static int resp_read(Scsi_Cmnd * SCpnt, 
 
 	if (upper_blk || (block + num > CAPACITY)) {
 		mk_sense_buffer(devip, ILLEGAL_REQUEST, 0x21, 0, 14);
-		return (COMMAND_COMPLETE << 8) | (CHECK_CONDITION << 1);
+		return (DRIVER_SENSE << 24) | (CHECK_CONDITION << 1);
 	}
 	if ((SCSI_DEBUG_OPT_MEDIUM_ERR & scsi_debug_opts) &&
-	    (block >= OPT_MEDIUM_ERR_ADDR) && 
-	    (block < (OPT_MEDIUM_ERR_ADDR + num))) {
+	    (block <= OPT_MEDIUM_ERR_ADDR) &&
+            ((block + num) > OPT_MEDIUM_ERR_ADDR)) {
 		mk_sense_buffer(devip, MEDIUM_ERROR, 0x11, 0, 14);
 		/* claim unrecoverable read error */
-		return (COMMAND_COMPLETE << 8) | (CHECK_CONDITION << 1);
+		return (DRIVER_SENSE << 24) | (CHECK_CONDITION << 1);
 	}
 	read_lock_irqsave(&atomic_rw, iflags);
         sgcount = 0;
@@ -704,7 +703,7 @@ static int resp_write(Scsi_Cmnd * SCpnt,
 
 	if (upper_blk || (block + num > CAPACITY)) {
 		mk_sense_buffer(devip, ILLEGAL_REQUEST, 0x21, 0, 14);
-		return (COMMAND_COMPLETE << 8) | (CHECK_CONDITION << 1);
+		return (DRIVER_SENSE << 24) | (CHECK_CONDITION << 1);
 	}
 
 	write_lock_irqsave(&atomic_rw, iflags);
@@ -744,7 +743,7 @@ static int resp_report_luns(unsigned cha
 	alloc_len = cmd[9] + (cmd[8] << 8) + (cmd[7] << 16) + (cmd[6] << 24);
 	if ((alloc_len < 16) || (select_report > 2)) {
 		mk_sense_buffer(devip, ILLEGAL_REQUEST, 0x24, 0, 14);
-		return (COMMAND_COMPLETE << 8) | (CHECK_CONDITION << 1);
+		return (DRIVER_SENSE << 24) | (CHECK_CONDITION << 1);
 	}
 	if (bufflen > 3) {
 		memset(buff, 0, bufflen);
@@ -773,8 +772,10 @@ static void timer_intr_handler(unsigned 
 		return;
 	}
 	sqcp->in_use = 0;
-	if (sqcp->done_funct)
+	if (sqcp->done_funct) {
+		sqcp->a_cmnd->result = sqcp->scsi_result;
 		sqcp->done_funct(sqcp->a_cmnd); /* callback to mid level */
+	}
 	sqcp->done_funct = NULL;
 	spin_unlock_irqrestore(&queued_arr_lock, iflags);
 }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/scsi_merge.c linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/scsi_merge.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/scsi_merge.c	2004-06-29 11:31:08.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/scsi_merge.c	2004-09-05 16:05:43.000000000 +0200
@@ -397,7 +397,7 @@ __inline static int __scsi_back_merge_fn
 		return 0;
 
 	if (!BH_PHYS_4G(req->bhtail, bh))
-		return 0;
+		goto new_end_segment;
 
 	if (use_clustering) {
 		/* 
@@ -456,7 +456,7 @@ __inline static int __scsi_front_merge_f
 		return 0;
 
 	if (!BH_PHYS_4G(bh, req->bh))
-		return 0;
+		goto new_start_segment;
 
 	if (use_clustering) {
 		/* 
@@ -619,7 +619,7 @@ __inline static int __scsi_merge_request
 		return 0;
 
 	if (!BH_PHYS_4G(req->bhtail, next->bh))
-		return 0;
+		goto dont_combine;
 
 	/*
 	 * The main question is whether the two segments at the boundaries
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/scsiiom.c linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/scsiiom.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/scsiiom.c	2000-12-31 20:06:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/scsiiom.c	2004-09-05 16:06:04.000000000 +0200
@@ -211,6 +211,24 @@ dc390_dma_intr (PACB pACB)
 };
 #endif
 
+static void __inline__
+dc390_InvalidCmd( PACB pACB )
+{
+    if( pACB->pActiveDCB->pActiveSRB->SRBState & (SRB_START_+SRB_MSGOUT) )
+	DC390_write8 (ScsiCmd, CLEAR_FIFO_CMD);
+}
+
+#define DC390_ENABLE_MSGOUT DC390_write8 (ScsiCmd, SET_ATN_CMD)
+
+/* abort command */
+static void __inline__
+dc390_EnableMsgOut_Abort ( PACB pACB, PSRB pSRB )
+{
+    pSRB->MsgOutBuf[0] = ABORT; 
+    pSRB->MsgCnt = 1; DC390_ENABLE_MSGOUT;
+    pSRB->pSRBDCB->DCBFlag &= ~ABORT_DEV_;
+}
+
 void __inline__
 DC390_Interrupt( int irq, void *dev_id, struct pt_regs *regs)
 {
@@ -569,8 +587,6 @@ dc390_printMsg (UCHAR *MsgBuf, UCHAR len
 };
 #endif
 
-#define DC390_ENABLE_MSGOUT DC390_write8 (ScsiCmd, SET_ATN_CMD)
-
 /* reject_msg */
 static void __inline__
 dc390_MsgIn_reject (PACB pACB, PSRB pSRB)
@@ -580,15 +596,6 @@ dc390_MsgIn_reject (PACB pACB, PSRB pSRB
   DEBUG0 (printk (KERN_INFO "DC390: Reject message\n");)
 }
 
-/* abort command */
-static void __inline__
-dc390_EnableMsgOut_Abort ( PACB pACB, PSRB pSRB )
-{
-    pSRB->MsgOutBuf[0] = ABORT; 
-    pSRB->MsgCnt = 1; DC390_ENABLE_MSGOUT;
-    pSRB->pSRBDCB->DCBFlag &= ~ABORT_DEV_;
-}
-
 static PSRB
 dc390_MsgIn_QTag (PACB pACB, PDCB pDCB, UCHAR tag)
 {
@@ -1355,6 +1362,47 @@ dc390_add_dev (PACB pACB, PDCB pDCB, PSC
 };
 
 
+static void __inline__
+dc390_RequestSense( PACB pACB, PDCB pDCB, PSRB pSRB )
+{
+    PSCSICMD  pcmd;
+
+    REMOVABLEDEBUG(printk (KERN_INFO "DC390: RequestSense (Cmd %02x, Id %02x, LUN %02x)\n",\
+	    pSRB->pcmd->cmnd[0], pDCB->TargetID, pDCB->TargetLUN);)
+
+    pSRB->SRBFlag |= AUTO_REQSENSE;
+    //pSRB->Segment0[0] = (UINT) pSRB->CmdBlock[0];
+    //pSRB->Segment0[1] = (UINT) pSRB->CmdBlock[4];
+    //pSRB->Segment1[0] = ((UINT)(pSRB->pcmd->cmd_len) << 8) + pSRB->SGcount;
+    //pSRB->Segment1[1] = pSRB->TotalXferredLen;
+    pSRB->SavedSGCount = pSRB->SGcount;
+    pSRB->SavedTotXLen = pSRB->TotalXferredLen;
+    pSRB->AdaptStatus = 0;
+    pSRB->TargetStatus = 0; /* CHECK_CONDITION<<1; */
+
+    pcmd = pSRB->pcmd;
+
+    pSRB->Segmentx.address = (PUCHAR) &(pcmd->sense_buffer);
+    pSRB->Segmentx.length = sizeof(pcmd->sense_buffer);
+    pSRB->pSegmentList = &pSRB->Segmentx;
+    pSRB->SGcount = 1;
+    pSRB->SGIndex = 0;
+
+    //pSRB->CmdBlock[0] = REQUEST_SENSE;
+    //pSRB->CmdBlock[1] = pDCB->TargetLUN << 5;
+    //(USHORT) pSRB->CmdBlock[2] = 0;
+    //(USHORT) pSRB->CmdBlock[4] = sizeof(pcmd->sense_buffer);
+    //pSRB->ScsiCmdLen = 6;
+
+    pSRB->TotalXferredLen = 0;
+    pSRB->SGToBeXferLen = 0;
+    if( dc390_StartSCSI( pACB, pDCB, pSRB ) ) {
+	dc390_Going_to_Waiting ( pDCB, pSRB );
+	dc390_waiting_timer (pACB, HZ/5);
+    }
+}
+
+
 void
 dc390_SRBdone( PACB pACB, PDCB pDCB, PSRB pSRB )
 {
@@ -1738,53 +1786,3 @@ dc390_ScsiRstDetect( PACB pACB )
     return;
 }
 
-
-static void __inline__
-dc390_RequestSense( PACB pACB, PDCB pDCB, PSRB pSRB )
-{
-    PSCSICMD  pcmd;
-
-    REMOVABLEDEBUG(printk (KERN_INFO "DC390: RequestSense (Cmd %02x, Id %02x, LUN %02x)\n",\
-	    pSRB->pcmd->cmnd[0], pDCB->TargetID, pDCB->TargetLUN);)
-
-    pSRB->SRBFlag |= AUTO_REQSENSE;
-    //pSRB->Segment0[0] = (UINT) pSRB->CmdBlock[0];
-    //pSRB->Segment0[1] = (UINT) pSRB->CmdBlock[4];
-    //pSRB->Segment1[0] = ((UINT)(pSRB->pcmd->cmd_len) << 8) + pSRB->SGcount;
-    //pSRB->Segment1[1] = pSRB->TotalXferredLen;
-    pSRB->SavedSGCount = pSRB->SGcount;
-    pSRB->SavedTotXLen = pSRB->TotalXferredLen;
-    pSRB->AdaptStatus = 0;
-    pSRB->TargetStatus = 0; /* CHECK_CONDITION<<1; */
-
-    pcmd = pSRB->pcmd;
-
-    pSRB->Segmentx.address = (PUCHAR) &(pcmd->sense_buffer);
-    pSRB->Segmentx.length = sizeof(pcmd->sense_buffer);
-    pSRB->pSegmentList = &pSRB->Segmentx;
-    pSRB->SGcount = 1;
-    pSRB->SGIndex = 0;
-
-    //pSRB->CmdBlock[0] = REQUEST_SENSE;
-    //pSRB->CmdBlock[1] = pDCB->TargetLUN << 5;
-    //(USHORT) pSRB->CmdBlock[2] = 0;
-    //(USHORT) pSRB->CmdBlock[4] = sizeof(pcmd->sense_buffer);
-    //pSRB->ScsiCmdLen = 6;
-
-    pSRB->TotalXferredLen = 0;
-    pSRB->SGToBeXferLen = 0;
-    if( dc390_StartSCSI( pACB, pDCB, pSRB ) ) {
-	dc390_Going_to_Waiting ( pDCB, pSRB );
-	dc390_waiting_timer (pACB, HZ/5);
-    }
-}
-
-
-
-static void __inline__
-dc390_InvalidCmd( PACB pACB )
-{
-    if( pACB->pActiveDCB->pActiveSRB->SRBState & (SRB_START_+SRB_MSGOUT) )
-	DC390_write8 (ScsiCmd, CLEAR_FIFO_CMD);
-}
-
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/sg.c linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/sg.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/sg.c	2004-06-29 11:31:13.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/sg.c	2004-09-05 16:08:33.000000000 +0200
@@ -77,7 +77,12 @@ static void sg_proc_cleanup(void);
 #include <linux/version.h>
 #endif /* LINUX_VERSION_CODE */
 
-#define SG_ALLOW_DIO_DEF 0
+#ifdef CONFIG_CHR_DEV_SG_DIO
+# define SG_ALLOW_DIO_DEF 1
+#else
+# define SG_ALLOW_DIO_DEF 0
+#endif
+
 #define SG_ALLOW_DIO_CODE	/* compile out be commenting this define */
 #ifdef SG_ALLOW_DIO_CODE
 #include <linux/iobuf.h>
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/sim710.c linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/sim710.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/sim710.c	2002-08-03 02:39:44.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/sim710.c	2004-09-05 16:06:04.000000000 +0200
@@ -921,172 +921,6 @@ handle_script_int(struct Scsi_Host * hos
 }
 
 
-/* A quick wrapper for sim710_intr_handle to grab the spin lock */
-
-static void
-do_sim710_intr_handle(int irq, void *dev_id, struct pt_regs *regs)
-{
-    unsigned long flags;
-
-    spin_lock_irqsave(&io_request_lock, flags);
-    sim710_intr_handle(irq, dev_id, regs);
-    spin_unlock_irqrestore(&io_request_lock, flags);
-}
-
-
-/* A "high" level interrupt handler */
-
-static void
-sim710_intr_handle(int irq, void *dev_id, struct pt_regs *regs)
-{
-    struct Scsi_Host * host = (struct Scsi_Host *)dev_id;
-    struct sim710_hostdata *hostdata = (struct sim710_hostdata *)host->hostdata[0];
-    Scsi_Cmnd * cmd;
-    unsigned char istat, dstat;
-    unsigned char sstat0;
-    u32 scratch, dsps, resume_offset = 0;
-
-    istat = NCR_read8(ISTAT_REG);
-    if (!(istat & (ISTAT_SIP|ISTAT_DIP)))
-	return;
-    else {
-	sim710_intrs++;
-	dsps = NCR_read32(DSPS_REG);
-	hostdata->state = STATE_HALTED;
-	sstat0 = dstat = 0;
-	scratch = NCR_read32(SCRATCH_REG);
-	if (istat & ISTAT_SIP) {
-	    sstat0 = NCR_read8(SSTAT0_REG);
-	}
-	if (istat & ISTAT_DIP) {
-	    udelay(10);		/* Some comment somewhere about 10cycles
-				 * between accesses to sstat0 and dstat ??? */
-	    dstat = NCR_read8(DSTAT_REG);
-	}
-	DEB(DEB_INTS, printk("scsi%d: Int %d, istat %02x, sstat0 %02x "
-		"dstat %02x, dsp [%04x], scratch %02x\n",
-	    host->host_no, sim710_intrs, istat, sstat0, dstat,
-	    (u32 *)(bus_to_virt(NCR_read32(DSP_REG))) - hostdata->script,
-	    scratch));
-	if (scratch & 0x100) {
-	    u8 *p = hostdata->msgin_buf;
-
-	    DEB(DEB_INTS, printk("  msgin_buf: %02x %02x %02x %02x\n",
-			p[0], p[1], p[2], p[3]));
-	}
-	if ((dstat & DSTAT_SIR) && dsps == A_int_reselected) {
-	    /* Reselected.  Identify the target from LCRC_REG, and
-	     * update current command.  If we were trying to select
-	     * a device, then that command needs to go back on the
-	     * issue_queue for later.
-	     */
-	    unsigned char lcrc = NCR_read8(LCRC_REG_10);
-	    int id = 0;
-
-	    if (!(lcrc & 0x7f)) {
-		printk("scsi%d: Reselected with LCRC = %02x\n",
-			host->host_no, lcrc);
-		cmd = NULL;
-	    }
-	    else {
-		while (!(lcrc & 1)) {
-		    id++;
-		    lcrc >>= 1;
-		}
-		DEB(DEB_DISC, printk("scsi%d: Reselected by ID %d\n",
-			host->host_no, id));
-		if (hostdata->running) {
-		    /* Clear SIGP */
-		    (void)NCR_read8(CTEST2_REG_700);
-
-		    DEB(DEB_DISC, printk("scsi%d: Select of %d interrupted "
-				"by reselect from %d (%p)\n",
-				host->host_no, hostdata->running->target,
-				id, hostdata->target[id].cur_cmd));
-		    cmd = hostdata->running;
-		    hostdata->target[cmd->target].cur_cmd = NULL;
-		    cmd->SCp.ptr = (unsigned char *) hostdata->issue_queue;
-		    hostdata->issue_queue = cmd;
-		}
-		cmd = hostdata->running = hostdata->target[id].cur_cmd;
-	    }
-	}
-	else
-	    cmd = hostdata->running;
-
-	if (!cmd) {
-	    printk("scsi%d: No active command!\n", host->host_no);
-	    printk("scsi%d: Int %d, istat %02x, sstat0 %02x "
-		"dstat %02x, dsp [%04x], scratch %02x, dsps %08x\n",
-		host->host_no, sim710_intrs, istat, sstat0, dstat,
-		(u32 *)(bus_to_virt(NCR_read32(DSP_REG))) - hostdata->script,
-		NCR_read32(SCRATCH_REG), dsps);
-	    /* resume_offset is zero, which will cause a host reset */
-	}
-	else if (sstat0 & SSTAT0_700_STO) {
-	    DEB(DEB_TOUT, printk("scsi%d: Selection timeout\n", host->host_no));
-	    cmd->result = DID_NO_CONNECT << 16;
-	    SCSI_DONE(cmd);
-	    hostdata->target[cmd->target].cur_cmd = NULL;
-	    resume_offset = Ent_reselect;
-	}
-	else if (sstat0 & (SSTAT0_SGE|SSTAT0_UDC|SSTAT0_RST|SSTAT0_PAR)) {
-	    printk("scsi%d: Serious error, sstat0 = %02x\n", host->host_no,
-			    sstat0);
-	    sim710_errors++;
-	    /* resume_offset is zero, which will cause a host reset */
-	}
-	else if (dstat & (DSTAT_BF|DSTAT_ABRT|DSTAT_SSI|DSTAT_WTD)) {
-	    printk("scsi%d: Serious error, dstat = %02x\n", host->host_no,
-			    dstat);
-	    sim710_errors++;
-	    /* resume_offset is zero, which will cause a host reset */
-	}
-	else if (dstat & DSTAT_SIR)
-	    resume_offset = handle_script_int(host, cmd);
-	else if (sstat0 & SSTAT0_MA)
-	    resume_offset = handle_phase_mismatch(host, cmd);
-	else if (dstat & DSTAT_IID) {
-	    /* This can be due to a quick reselect while doing a WAIT
-	     * DISCONNECT.
-	     */
-	    resume_offset = handle_idd(host, cmd);
-	}
-	else {
-	    sim710_errors++;
-	    printk("scsi%d: Spurious interrupt!\n", host->host_no);
-	    /* resume_offset is zero, which will cause a host reset */
-	}
-    }
-
-    if (resume_offset) {
-	if (resume_offset == Ent_reselect) {
-	    hostdata->running = NULL;
-	    hostdata->state = STATE_IDLE;
-	}
-	else
-	    hostdata->state = STATE_BUSY;
-	DEB(DEB_RESUME, printk("scsi%d: Resuming at script[0x%x]\n",
-		host->host_no, resume_offset/4));
-#ifdef DEBUG_LIMIT_INTS
-	if (sim710_intrs < DEBUG_LIMIT_INTS)
-#endif
-	{
-	    NCR_write32(SCRATCH_REG, 0);
-	    NCR_write32(DSP_REG, virt_to_bus(hostdata->script+resume_offset/4));
-	}
-	if (resume_offset == Ent_reselect)
-	    run_process_issue_queue(hostdata);
-    }
-    else {
-	printk("scsi%d: Failed to handle interrupt.  Failing commands "
-		"and resetting SCSI bus and chip\n", host->host_no);
-	mdelay(1000);		/* Give chance to read screen!! */
-	full_reset(host);
-    }
-}
-
-
 static void
 run_command (struct sim710_hostdata *hostdata, Scsi_Cmnd *cmd)
 {
@@ -1284,6 +1118,172 @@ process_issue_queue (struct sim710_hostd
 }
 
 
+/* A quick wrapper for sim710_intr_handle to grab the spin lock */
+
+static void
+do_sim710_intr_handle(int irq, void *dev_id, struct pt_regs *regs)
+{
+    unsigned long flags;
+
+    spin_lock_irqsave(&io_request_lock, flags);
+    sim710_intr_handle(irq, dev_id, regs);
+    spin_unlock_irqrestore(&io_request_lock, flags);
+}
+
+
+/* A "high" level interrupt handler */
+
+static void
+sim710_intr_handle(int irq, void *dev_id, struct pt_regs *regs)
+{
+    struct Scsi_Host * host = (struct Scsi_Host *)dev_id;
+    struct sim710_hostdata *hostdata = (struct sim710_hostdata *)host->hostdata[0];
+    Scsi_Cmnd * cmd;
+    unsigned char istat, dstat;
+    unsigned char sstat0;
+    u32 scratch, dsps, resume_offset = 0;
+
+    istat = NCR_read8(ISTAT_REG);
+    if (!(istat & (ISTAT_SIP|ISTAT_DIP)))
+	return;
+    else {
+	sim710_intrs++;
+	dsps = NCR_read32(DSPS_REG);
+	hostdata->state = STATE_HALTED;
+	sstat0 = dstat = 0;
+	scratch = NCR_read32(SCRATCH_REG);
+	if (istat & ISTAT_SIP) {
+	    sstat0 = NCR_read8(SSTAT0_REG);
+	}
+	if (istat & ISTAT_DIP) {
+	    udelay(10);		/* Some comment somewhere about 10cycles
+				 * between accesses to sstat0 and dstat ??? */
+	    dstat = NCR_read8(DSTAT_REG);
+	}
+	DEB(DEB_INTS, printk("scsi%d: Int %d, istat %02x, sstat0 %02x "
+		"dstat %02x, dsp [%04x], scratch %02x\n",
+	    host->host_no, sim710_intrs, istat, sstat0, dstat,
+	    (u32 *)(bus_to_virt(NCR_read32(DSP_REG))) - hostdata->script,
+	    scratch));
+	if (scratch & 0x100) {
+	    u8 *p = hostdata->msgin_buf;
+
+	    DEB(DEB_INTS, printk("  msgin_buf: %02x %02x %02x %02x\n",
+			p[0], p[1], p[2], p[3]));
+	}
+	if ((dstat & DSTAT_SIR) && dsps == A_int_reselected) {
+	    /* Reselected.  Identify the target from LCRC_REG, and
+	     * update current command.  If we were trying to select
+	     * a device, then that command needs to go back on the
+	     * issue_queue for later.
+	     */
+	    unsigned char lcrc = NCR_read8(LCRC_REG_10);
+	    int id = 0;
+
+	    if (!(lcrc & 0x7f)) {
+		printk("scsi%d: Reselected with LCRC = %02x\n",
+			host->host_no, lcrc);
+		cmd = NULL;
+	    }
+	    else {
+		while (!(lcrc & 1)) {
+		    id++;
+		    lcrc >>= 1;
+		}
+		DEB(DEB_DISC, printk("scsi%d: Reselected by ID %d\n",
+			host->host_no, id));
+		if (hostdata->running) {
+		    /* Clear SIGP */
+		    (void)NCR_read8(CTEST2_REG_700);
+
+		    DEB(DEB_DISC, printk("scsi%d: Select of %d interrupted "
+				"by reselect from %d (%p)\n",
+				host->host_no, hostdata->running->target,
+				id, hostdata->target[id].cur_cmd));
+		    cmd = hostdata->running;
+		    hostdata->target[cmd->target].cur_cmd = NULL;
+		    cmd->SCp.ptr = (unsigned char *) hostdata->issue_queue;
+		    hostdata->issue_queue = cmd;
+		}
+		cmd = hostdata->running = hostdata->target[id].cur_cmd;
+	    }
+	}
+	else
+	    cmd = hostdata->running;
+
+	if (!cmd) {
+	    printk("scsi%d: No active command!\n", host->host_no);
+	    printk("scsi%d: Int %d, istat %02x, sstat0 %02x "
+		"dstat %02x, dsp [%04x], scratch %02x, dsps %08x\n",
+		host->host_no, sim710_intrs, istat, sstat0, dstat,
+		(u32 *)(bus_to_virt(NCR_read32(DSP_REG))) - hostdata->script,
+		NCR_read32(SCRATCH_REG), dsps);
+	    /* resume_offset is zero, which will cause a host reset */
+	}
+	else if (sstat0 & SSTAT0_700_STO) {
+	    DEB(DEB_TOUT, printk("scsi%d: Selection timeout\n", host->host_no));
+	    cmd->result = DID_NO_CONNECT << 16;
+	    SCSI_DONE(cmd);
+	    hostdata->target[cmd->target].cur_cmd = NULL;
+	    resume_offset = Ent_reselect;
+	}
+	else if (sstat0 & (SSTAT0_SGE|SSTAT0_UDC|SSTAT0_RST|SSTAT0_PAR)) {
+	    printk("scsi%d: Serious error, sstat0 = %02x\n", host->host_no,
+			    sstat0);
+	    sim710_errors++;
+	    /* resume_offset is zero, which will cause a host reset */
+	}
+	else if (dstat & (DSTAT_BF|DSTAT_ABRT|DSTAT_SSI|DSTAT_WTD)) {
+	    printk("scsi%d: Serious error, dstat = %02x\n", host->host_no,
+			    dstat);
+	    sim710_errors++;
+	    /* resume_offset is zero, which will cause a host reset */
+	}
+	else if (dstat & DSTAT_SIR)
+	    resume_offset = handle_script_int(host, cmd);
+	else if (sstat0 & SSTAT0_MA)
+	    resume_offset = handle_phase_mismatch(host, cmd);
+	else if (dstat & DSTAT_IID) {
+	    /* This can be due to a quick reselect while doing a WAIT
+	     * DISCONNECT.
+	     */
+	    resume_offset = handle_idd(host, cmd);
+	}
+	else {
+	    sim710_errors++;
+	    printk("scsi%d: Spurious interrupt!\n", host->host_no);
+	    /* resume_offset is zero, which will cause a host reset */
+	}
+    }
+
+    if (resume_offset) {
+	if (resume_offset == Ent_reselect) {
+	    hostdata->running = NULL;
+	    hostdata->state = STATE_IDLE;
+	}
+	else
+	    hostdata->state = STATE_BUSY;
+	DEB(DEB_RESUME, printk("scsi%d: Resuming at script[0x%x]\n",
+		host->host_no, resume_offset/4));
+#ifdef DEBUG_LIMIT_INTS
+	if (sim710_intrs < DEBUG_LIMIT_INTS)
+#endif
+	{
+	    NCR_write32(SCRATCH_REG, 0);
+	    NCR_write32(DSP_REG, virt_to_bus(hostdata->script+resume_offset/4));
+	}
+	if (resume_offset == Ent_reselect)
+	    run_process_issue_queue(hostdata);
+    }
+    else {
+	printk("scsi%d: Failed to handle interrupt.  Failing commands "
+		"and resetting SCSI bus and chip\n", host->host_no);
+	mdelay(1000);		/* Give chance to read screen!! */
+	full_reset(host);
+    }
+}
+
+
 int
 sim710_queuecommand(Scsi_Cmnd * cmd, void (*done)(Scsi_Cmnd *))
 {
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/st.c linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/st.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/st.c	2002-11-29 00:53:14.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/st.c	2004-09-05 16:06:37.000000000 +0200
@@ -9,10 +9,10 @@
    Steve Hirsch, Andreas Koppenh"ofer, Michael Leodolter, Eyal Lebedinsky,
    Michael Schaefer, J"org Weule, and Eric Youngdale.
 
-   Copyright 1992 - 2002 Kai Makisara
-   email Kai.Makisara@metla.fi
+   Copyright 1992 - 2004 Kai Makisara
+   email Kai.Makisara@kolumbus.fi
 
-   Last modified: Mon Aug  5 22:54:13 2002 by makisara
+   Last modified: Fri Jan  2 17:50:08 2004 by makisara
    Some small formal changes - aeb, 950809
 
    Last modified: 18-JAN-1998 Richard Gooch <rgooch@atnf.csiro.au> Devfs support
@@ -21,7 +21,7 @@
    error handling will be discarded.
  */
 
-static char *verstr = "20020805";
+static char *verstr = "20040102";
 
 #include <linux/module.h>
 
@@ -72,7 +72,6 @@ static char *verstr = "20020805";
 #include "constants.h"
 
 static int buffer_kbs;
-static int write_threshold_kbs;
 static int max_buffers = (-1);
 static int max_sg_segs;
 static int blocking_open = ST_BLOCKING_OPEN;
@@ -84,8 +83,6 @@ MODULE_LICENSE("GPL");
 
 MODULE_PARM(buffer_kbs, "i");
 MODULE_PARM_DESC(buffer_kbs, "Default driver buffer size (KB; 32)");
-MODULE_PARM(write_threshold_kbs, "i");
-MODULE_PARM_DESC(write_threshold_kbs, "Asynchronous write threshold (KB; 30)");
 MODULE_PARM(max_buffers, "i");
 MODULE_PARM_DESC(max_buffers, "Maximum number of buffer allocated at initialisation (4)");
 MODULE_PARM(max_sg_segs, "i");
@@ -103,8 +100,8 @@ static struct st_dev_parm {
 	{
 		"buffer_kbs", &buffer_kbs
 	},
-	{
-		"write_threshold_kbs", &write_threshold_kbs
+	{	/* Retained for compatibility */
+		"write_threshold_kbs", NULL
 	},
 	{
 		"max_buffers", &max_buffers
@@ -122,7 +119,6 @@ static struct st_dev_parm {
 /* The default definitions have been moved to st_options.h */
 
 #define ST_BUFFER_SIZE (ST_BUFFER_BLOCKS * ST_KILOBYTE)
-#define ST_WRITE_THRESHOLD (ST_WRITE_THRESHOLD_BLOCKS * ST_KILOBYTE)
 
 /* The buffer size should fit into the 24 bits for length in the
    6-byte SCSI read and write commands. */
@@ -153,7 +149,6 @@ static rwlock_t st_dev_arr_lock = RW_LOC
 static int st_nbr_buffers;
 static ST_buffer **st_buffers = NULL;
 static int st_buffer_size = ST_BUFFER_SIZE;
-static int st_write_threshold = ST_WRITE_THRESHOLD;
 static int st_max_buffers = ST_MAX_BUFFERS;
 static int st_max_sg_segs = ST_MAX_SG;
 
@@ -167,6 +162,7 @@ static void normalize_buffer(ST_buffer *
 static int set_sg_lengths(ST_buffer *, unsigned int);
 static int append_to_buffer(const char *, ST_buffer *, int);
 static int from_buffer(ST_buffer *, char *, int);
+static void move_buffer_data(ST_buffer *, int);
 
 static int st_init(void);
 static int st_attach(Scsi_Device *);
@@ -1196,6 +1192,7 @@ static ssize_t
 	ssize_t total;
 	ssize_t i, do_count, blks, transfer;
 	ssize_t retval = 0;
+	int residual, retry_eot = 0, scode;
 	int write_threshold;
 	int doing_write = 0;
 	unsigned char cmd[MAX_COMMAND_SIZE];
@@ -1205,6 +1202,7 @@ static ssize_t
 	ST_mode *STm;
 	ST_partstat *STps;
 	int dev = TAPE_NR(inode->i_rdev);
+	loff_t pos = *ppos;
 
 	read_lock(&st_dev_arr_lock);
 	STp = scsi_tapes[dev];
@@ -1280,6 +1278,18 @@ static ssize_t
 		goto out;
 	}
 
+	if ((STp->buffer)->writing) {
+		write_behind_check(STp);
+		if ((STp->buffer)->syscall_result) {
+                        DEBC(printk(ST_DEB_MSG "st%d: Async write error (write) %x.\n",
+                                    dev, (STp->buffer)->midlevel_result));
+			if ((STp->buffer)->midlevel_result == INT_MAX)
+				STps->eof = ST_EOM_OK;
+			else
+				STps->eof = ST_EOM_ERROR;
+		}
+	}
+
 	if (STp->block_size == 0) {
 		if (STp->max_block > 0 &&
 		    (count < STp->min_block || count > STp->max_block)) {
@@ -1327,18 +1337,6 @@ static ssize_t
 		}
 	}
 
-	if ((STp->buffer)->writing) {
-		write_behind_check(STp);
-		if ((STp->buffer)->syscall_result) {
-                        DEBC(printk(ST_DEB_MSG "st%d: Async write error (write) %x.\n",
-                                    dev, (STp->buffer)->midlevel_result));
-			if ((STp->buffer)->midlevel_result == INT_MAX)
-				STps->eof = ST_EOM_OK;
-			else
-				STps->eof = ST_EOM_ERROR;
-		}
-	}
-
 	if (STps->eof == ST_EOM_OK) {
 		retval = (-ENOSPC);
 		goto out;
@@ -1367,7 +1365,7 @@ static ssize_t
 		write_threshold = 1;
 	} else
 		write_threshold = (STp->buffer)->buffer_blocks * STp->block_size;
-	if (!STm->do_async_writes)
+	if (!STm->do_async_writes || STp->block_size > 0)
 		write_threshold--;
 
 	total = count;
@@ -1381,7 +1379,7 @@ static ssize_t
 	b_point = buf;
 	while ((STp->block_size == 0 && !STm->do_async_writes && count > 0) ||
 	       (STp->block_size != 0 &&
-		(STp->buffer)->buffer_bytes + count > write_threshold)) {
+		(STp->buffer)->buffer_bytes + count > write_threshold && !retry_eot)) {
 		doing_write = 1;
 		if (STp->block_size == 0)
 			do_count = count;
@@ -1398,6 +1396,7 @@ static ssize_t
 			goto out;
 		}
 
+	retry_write:
 		if (STp->block_size == 0)
 			blks = transfer = do_count;
 		else {
@@ -1420,46 +1419,66 @@ static ssize_t
                         DEBC(printk(ST_DEB_MSG "st%d: Error on write:\n", dev));
 			if ((SRpnt->sr_sense_buffer[0] & 0x70) == 0x70 &&
 			    (SRpnt->sr_sense_buffer[2] & 0x40)) {
+				scode = SRpnt->sr_sense_buffer[2] & 0x0f;
 				if ((SRpnt->sr_sense_buffer[0] & 0x80) != 0)
-					transfer = (SRpnt->sr_sense_buffer[3] << 24) |
+					residual = (SRpnt->sr_sense_buffer[3] << 24) |
 					    (SRpnt->sr_sense_buffer[4] << 16) |
 					    (SRpnt->sr_sense_buffer[5] << 8) |
                                                 SRpnt->sr_sense_buffer[6];
 				else if (STp->block_size == 0 &&
-					 (SRpnt->sr_sense_buffer[2] & 0x0f) ==
-                                         VOLUME_OVERFLOW)
-					transfer = do_count;
+					 scode == VOLUME_OVERFLOW)
+					residual = do_count;
 				else
-					transfer = 0;
+					residual = 0;
 				if (STp->block_size != 0)
-					transfer *= STp->block_size;
-				if (transfer <= do_count) {
-					filp->f_pos += do_count - transfer;
-					count -= do_count - transfer;
+					residual *= STp->block_size;
+				if (residual <= do_count) {
+					/* Within the data in this write() */
+					pos += do_count - residual;
+					count -= do_count - residual;
 					if (STps->drv_block >= 0) {
 						if (STp->block_size == 0 &&
-                                                    transfer < do_count)
+						    residual < do_count)
 							STps->drv_block++;
 						else if (STp->block_size != 0)
 							STps->drv_block +=
-                                                                (do_count - transfer) /
+								(transfer - residual) /
                                                                 STp->block_size;
 					}
 					STps->eof = ST_EOM_OK;
 					retval = (-ENOSPC); /* EOM within current request */
                                         DEBC(printk(ST_DEB_MSG
                                                        "st%d: EOM with %d bytes unwritten.\n",
-						       dev, transfer));
+						       dev, count));
 				} else {
-					STps->eof = ST_EOM_ERROR;
-					STps->drv_block = (-1); /* Too cautious? */
-					retval = (-EIO);	/* EOM for old data */
-					DEBC(printk(ST_DEB_MSG
-                                                       "st%d: EOM with lost data.\n",
-                                                       dev));
+					/* EOT in within data buffered earlier */
+					if (!retry_eot && (SRpnt->sr_sense_buffer[0] & 1) == 0 &&
+					    (scode == NO_SENSE || scode == RECOVERED_ERROR)) {
+						move_buffer_data(STp->buffer, transfer - residual);
+						retry_eot = TRUE;
+						if (STps->drv_block >= 0) {
+							STps->drv_block += (transfer - residual) /
+								STp->block_size;
+						}
+						STps->eof = ST_EOM_OK;
+						DEBC(printk(ST_DEB_MSG
+							    "st%d: Retry write of %d bytes at EOM.\n",
+							    dev, do_count));
+						goto retry_write;
+					}
+					else {
+						/* Either error within data buffered by driver or failed retry */
+						STps->eof = ST_EOM_ERROR;
+						STps->drv_block = (-1); /* Too cautious? */
+						retval = (-EIO);	/* EOM for old data */
+						DEBC(printk(ST_DEB_MSG
+							    "st%d: EOM with lost data.\n",
+							    dev));
+					}
 				}
 			} else {
 				STps->drv_block = (-1);		/* Too cautious? */
+				retry_eot = FALSE;
 				retval = (-EIO);
 			}
 
@@ -1471,7 +1490,7 @@ static ssize_t
 				retval = total - count;
 			goto out;
 		}
-		filp->f_pos += do_count;
+		pos += do_count;
 		b_point += do_count;
 		count -= do_count;
 		if (STps->drv_block >= 0) {
@@ -1483,14 +1502,14 @@ static ssize_t
 		(STp->buffer)->buffer_bytes = 0;
 		STp->dirty = 0;
 	}
-	if (count != 0) {
+	if (count != 0 && !retry_eot) {
 		STp->dirty = 1;
 		i = append_to_buffer(b_point, STp->buffer, count);
 		if (i) {
 			retval = i;
 			goto out;
 		}
-		filp->f_pos += count;
+		pos += count;
 		count = 0;
 	}
 
@@ -1499,26 +1518,14 @@ static ssize_t
 		goto out;
 	}
 
-	if (STm->do_async_writes &&
-	    (((STp->buffer)->buffer_bytes >= STp->write_threshold &&
-	      (STp->buffer)->buffer_bytes >= STp->block_size) ||
-	     STp->block_size == 0)) {
+	if (STm->do_async_writes && STp->block_size == 0) {
 		/* Schedule an asynchronous write */
-		if (STp->block_size == 0)
-			(STp->buffer)->writing = (STp->buffer)->buffer_bytes;
-		else
-			(STp->buffer)->writing = ((STp->buffer)->buffer_bytes /
-				      STp->block_size) * STp->block_size;
-		STp->dirty = !((STp->buffer)->writing ==
-			       (STp->buffer)->buffer_bytes);
-
-		if (STp->block_size == 0)
-			blks = (STp->buffer)->writing;
-		else
-			blks = (STp->buffer)->writing / STp->block_size;
-		cmd[2] = blks >> 16;
-		cmd[3] = blks >> 8;
-		cmd[4] = blks;
+		(STp->buffer)->writing = (STp->buffer)->buffer_bytes;
+		STp->dirty = FALSE;
+		residual = (STp->buffer)->writing;
+		cmd[2] = residual >> 16;
+		cmd[3] = residual >> 8;
+		cmd[4] = residual;
 		DEB( STp->write_pending = 1; )
 
 		SRpnt = st_do_scsi(SRpnt, STp, cmd, (STp->buffer)->writing,
@@ -1532,11 +1539,12 @@ static ssize_t
 
 	}
 	STps->at_sm &= (total == 0);
-	if (total > 0)
+	if (total > 0 && !retry_eot)
 		STps->eof = ST_NOEOF;
-	retval = total;
+	retval = total - count;
 
  out:
+	*ppos = pos;
 	if (SRpnt != NULL)
 		scsi_release_request(SRpnt);
 	up(&STp->lock);
@@ -1625,9 +1633,14 @@ static long read_tape(Scsi_Tape *STp, lo
 
 				if (SRpnt->sr_sense_buffer[2] & 0x20) {	/* ILI */
 					if (STp->block_size == 0) {
-						if (transfer < 0) {
+						if (transfer <= 0) {
+							if (transfer < 0)
+								printk(KERN_NOTICE
+								       "st%d: Failed to read %d byte block with %d byte read.\n",
+								       dev, bytes - transfer, bytes);
 							if (STps->drv_block >= 0)
 								STps->drv_block += 1;
+							(STp->buffer)->buffer_bytes = 0;
 							return (-ENOMEM);
 						}
 						(STp->buffer)->buffer_bytes = bytes - transfer;
@@ -1694,6 +1707,9 @@ static long read_tape(Scsi_Tape *STp, lo
 				} else	/* Some other extended sense code */
 					retval = (-EIO);
 			}
+
+			if ((STp->buffer)->buffer_bytes < 0) /* Caused by bogus sense data */
+				(STp->buffer)->buffer_bytes = 0;
 		}
 		/* End of extended sense test */ 
 		else {		/* Non-extended sense */
@@ -1729,6 +1745,7 @@ static ssize_t
 	ST_mode *STm;
 	ST_partstat *STps;
 	int dev = TAPE_NR(inode->i_rdev);
+	loff_t pos = *ppos;
 
 	read_lock(&st_dev_arr_lock);
 	STp = scsi_tapes[dev];
@@ -1873,7 +1890,7 @@ static ssize_t
 				retval = i;
 				goto out;
 			}
-			filp->f_pos += transfer;
+			pos += transfer;
 			buf += transfer;
 			total += transfer;
 		}
@@ -1903,6 +1920,7 @@ static ssize_t
 	retval = total;
 
  out:
+	*ppos = pos;
 	if (SRpnt != NULL) {
 		scsi_release_request(SRpnt);
 		SRpnt = NULL;
@@ -2004,16 +2022,7 @@ static int st_set_options(Scsi_Tape *STp
 			debugging = value; )
 		st_log_options(STp, STm, dev);
 	} else if (code == MT_ST_WRITE_THRESHOLD) {
-		value = (options & ~MT_ST_OPTIONS) * ST_KILOBYTE;
-		if (value < 1 || value > st_buffer_size) {
-			printk(KERN_WARNING
-                               "st%d: Write threshold %d too small or too large.\n",
-			       dev, value);
-			return (-EIO);
-		}
-		STp->write_threshold = value;
-		printk(KERN_INFO "st%d: Write threshold set to %d bytes.\n",
-		       dev, value);
+		/* Retained for compatibility */
 	} else if (code == MT_ST_DEF_BLKSIZE) {
 		value = (options & ~MT_ST_OPTIONS);
 		if (value == ~MT_ST_OPTIONS) {
@@ -2155,7 +2164,7 @@ static int read_mode_page(Scsi_Tape *STp
 
 /* Send the mode page in the tape buffer to the drive. Assumes that the mode data
    in the buffer is correctly formatted. */
-static int write_mode_page(Scsi_Tape *STp, int page)
+static int write_mode_page(Scsi_Tape *STp, int page, int slow)
 {
 	int pgo;
 	unsigned char cmd[MAX_COMMAND_SIZE];
@@ -2174,7 +2183,7 @@ static int write_mode_page(Scsi_Tape *ST
 	(STp->buffer)->b_data[pgo + MP_OFF_PAGE_NBR] &= MP_MSK_PAGE_NBR;
 
 	SRpnt = st_do_scsi(SRpnt, STp, cmd, cmd[4], SCSI_DATA_WRITE,
-			   STp->timeout, 0, TRUE);
+			   (slow ? STp->long_timeout : STp->timeout), 0, TRUE);
 	if (SRpnt == NULL)
 		return (STp->buffer)->syscall_result;
 
@@ -2241,7 +2250,7 @@ static int st_compression(Scsi_Tape * ST
 			b_data[mpoffs + CP_OFF_C_ALGO] = 0; /* no compression */
 	}
 
-	retval = write_mode_page(STp, COMPRESSION_PAGE);
+	retval = write_mode_page(STp, COMPRESSION_PAGE, FALSE);
 	if (retval) {
                 DEBC(printk(ST_DEB_MSG "st%d: Compression change failed.\n", dev));
 		return (-EIO);
@@ -3055,7 +3064,7 @@ static int partition_tape(Scsi_Tape *STp
 	bp[pgo + PP_OFF_RESERVED] = 0;
 	bp[pgo + PP_OFF_FLAGS] = PP_BIT_IDP | PP_MSK_PSUM_MB;
 
-	result = write_mode_page(STp, PART_PAGE);
+	result = write_mode_page(STp, PART_PAGE, TRUE);
 	if (result) {
 		printk(KERN_INFO "st%d: Partitioning of tape failed.\n", dev);
 		result = (-EIO);
@@ -3269,6 +3278,11 @@ static int st_ioctl(struct inode *inode,
 			goto out;
 		}
 
+		if (mtc.mt_op == MTREADY) {
+			retval = test_ready(STp, 0);
+			goto out;
+		}
+		
 		if (STp->can_partitions && STp->ready == ST_READY &&
 		    (i = update_partition(STp)) < 0) {
 			retval = i;
@@ -3644,6 +3658,50 @@ static int from_buffer(ST_buffer * st_bp
 }
 
 
+/* Move data towards start of buffer */
+static void move_buffer_data(ST_buffer * st_bp, int offset)
+{
+	int src_seg, dst_seg, src_offset = 0, dst_offset;
+	int count, total;
+
+	if (offset == 0)
+		return;
+
+	total=st_bp->buffer_bytes - offset;
+	for (src_seg=0; src_seg < st_bp->sg_segs; src_seg++) {
+		src_offset = offset;
+		if (src_offset < st_bp->sg_lengths[src_seg])
+			break;
+		offset -= st_bp->sg_lengths[src_seg];
+	}
+	if (src_seg == st_bp->sg_segs) {	/* Should never happen */
+		printk(KERN_WARNING "st: zap_buffer offset overflow.\n");
+		return;
+	}
+
+	st_bp->buffer_bytes = st_bp->read_pointer = total;
+	for (dst_seg=dst_offset=0; total > 0; ) {
+		count = min(st_bp->sg_lengths[dst_seg] - dst_offset,
+			    st_bp->sg_lengths[src_seg] - src_offset);
+		memmove(st_bp->sg[dst_seg].address + dst_offset,
+			st_bp->sg[src_seg].address + src_offset, count);
+		printk("st: move (%d,%d) -> (%d,%d) count %d\n",
+		       src_seg, src_offset, dst_seg, dst_offset, count);
+		src_offset += count;
+		if (src_offset >= st_bp->sg_lengths[src_seg]) {
+			src_seg++;
+			src_offset = 0;
+		}
+		dst_offset += count;
+		if (dst_offset >= st_bp->sg_lengths[dst_seg]) {
+			dst_seg++;
+			dst_offset = 0;
+		}
+		total -= count;
+	}
+}
+
+
 /* Set the scatter/gather list length fields to sum up to the transfer length.
    Return the number of segments being used. */
 static int set_sg_lengths(ST_buffer *st_bp, unsigned int length)
@@ -3668,15 +3726,6 @@ static void validate_options(void)
 {
 	if (buffer_kbs > 0)
 		st_buffer_size = buffer_kbs * ST_KILOBYTE;
-	if (write_threshold_kbs > 0)
-		st_write_threshold = write_threshold_kbs * ST_KILOBYTE;
-	else if (buffer_kbs > 0)
-		st_write_threshold = st_buffer_size - 2048;
-	if (st_write_threshold > st_buffer_size) {
-		st_write_threshold = st_buffer_size;
-		printk(KERN_WARNING "st: write_threshold limited to %d bytes.\n",
-		       st_write_threshold);
-	}
 	if (max_buffers >= 0)
 		st_max_buffers = max_buffers;
 	if (max_sg_segs >= ST_FIRST_SG)
@@ -3695,13 +3744,15 @@ static int __init st_setup(char *str)
 
 	if (ints[0] > 0) {
 		for (i = 0; i < ints[0] && i < ARRAY_SIZE(parms); i++)
-			*parms[i].val = ints[i + 1];
+			if (parms[i].val)
+				*parms[i].val = ints[i + 1];
 	} else {
 		while (stp != NULL) {
 			for (i = 0; i < ARRAY_SIZE(parms); i++) {
 				len = strlen(parms[i].name);
 				if (!strncmp(stp, parms[i].name, len) &&
-				    (*(stp + len) == ':' || *(stp + len) == '=')) {
+				    (*(stp + len) == ':' || *(stp + len) == '=') &&
+				    parms[i].val) {
 					*parms[i].val =
                                                 simple_strtoul(stp + len + 1, NULL, 0);
 					break;
@@ -3732,6 +3783,7 @@ static struct file_operations st_fops =
 	read:		st_read,
 	write:		st_write,
 	ioctl:		st_ioctl,
+	llseek:		no_llseek,
 	open:		st_open,
 	flush:		st_flush,
 	release:	st_release,
@@ -3863,7 +3915,6 @@ static int st_attach(Scsi_Device * SDp)
 	tpnt->fast_mteom = ST_FAST_MTEOM;
 	tpnt->scsi2_logical = ST_SCSI2LOGICAL;
 	tpnt->immediate = ST_NOWAIT;
-	tpnt->write_threshold = st_write_threshold;
 	tpnt->default_drvbuffer = 0xff;		/* No forced buffering */
 	tpnt->partition = 0;
 	tpnt->new_partition = 0;
@@ -3941,8 +3992,8 @@ static int st_init()
 		return 0;
 
 	printk(KERN_INFO
-	       "st: Version %s, bufsize %d, wrt %d, max init. bufs %d, s/g segs %d\n",
-	       verstr, st_buffer_size, st_write_threshold, st_max_buffers, st_max_sg_segs);
+	       "st: Version %s, bufsize %d, max init. bufs %d, s/g segs %d\n",
+	       verstr, st_buffer_size, st_max_buffers, st_max_sg_segs);
 
 	write_lock_irqsave(&st_dev_arr_lock, flags);
 	if (!st_registered) {
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/st.h linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/st.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/st.h	2002-11-29 00:53:14.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/st.h	2004-09-05 15:48:41.000000000 +0200
@@ -86,7 +86,6 @@ typedef struct {
 	unsigned char use_pf;			/* Set Page Format bit in all mode selects? */
 	unsigned char c_algo;	     /* compression algorithm */
 	int tape_type;
-	int write_threshold;
 	int timeout;		/* timeout for normal commands */
 	int long_timeout;	/* timeout for commands known to take long time */
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/st_options.h linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/st_options.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/scsi/st_options.h	2002-11-29 00:53:14.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/scsi/st_options.h	2004-09-05 15:48:41.000000000 +0200
@@ -1,9 +1,9 @@
 /*
    The compile-time configurable defaults for the Linux SCSI tape driver.
 
-   Copyright 1995-2002 Kai Makisara.
+   Copyright 1995-2003 Kai Makisara.
 
-   Last modified: Wed May  1 11:06:47 2002 by makisara
+   Last modified: Sun Apr  6 22:45:15 2003 by makisara
 */
 
 #ifndef _ST_OPTIONS_H
@@ -33,11 +33,6 @@
 /* The tape driver buffer size in kilobytes. Must be non-zero. */
 #define ST_BUFFER_BLOCKS 32
 
-/* The number of kilobytes of data in the buffer that triggers an
-   asynchronous write in fixed block mode. See also ST_ASYNC_WRITES
-   below. */
-#define ST_WRITE_THRESHOLD_BLOCKS 30
-
 /* The maximum number of tape buffers the driver tries to allocate at 
    driver initialisation. The number is also constrained by the number
    of drives detected. If more buffers are needed, they are allocated
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/usb/audio.c linux-2.4.20-wolk4.16-fullkernel/drivers/usb/audio.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/usb/audio.c	2004-06-29 11:22:52.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/usb/audio.c	2004-09-05 16:06:31.000000000 +0200
@@ -2141,6 +2141,8 @@ static int usb_audio_ioctl_mixdev(struct
   
 	if (cmd == SOUND_MIXER_INFO) {
 		mixer_info info;
+
+		memset(&info, 0, sizeof(info));
 		strncpy(info.id, "USB_AUDIO", sizeof(info.id));
 		strncpy(info.name, "USB Audio Class Driver", sizeof(info.name));
 		info.modify_counter = ms->modcnt;
@@ -2150,6 +2152,8 @@ static int usb_audio_ioctl_mixdev(struct
 	}
 	if (cmd == SOUND_OLD_MIXER_INFO) {
 		_old_mixer_info info;
+
+		memset(&info, 0, sizeof(info));
 		strncpy(info.id, "USB_AUDIO", sizeof(info.id));
 		strncpy(info.name, "USB Audio Class Driver", sizeof(info.name));
 		if (copy_to_user((void *)arg, &info, sizeof(info)))
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/usb/brlvger.c linux-2.4.20-wolk4.16-fullkernel/drivers/usb/brlvger.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/usb/brlvger.c	2002-11-29 00:53:14.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/usb/brlvger.c	2004-09-05 16:06:31.000000000 +0200
@@ -596,6 +596,9 @@ brlvger_write(struct file *file, const c
 
 	off = *pos;
 
+	if (off < 0)
+		return -EINVAL;
+
 	if(off > priv->plength)
 		return -ESPIPE;;
 
@@ -743,6 +746,7 @@ brlvger_ioctl(struct inode *inode, struc
 	case BRLVGER_GET_INFO: {
 		struct brlvger_info vi;
 
+		memset(&vi, 0, sizeof(vi));
 		strncpy(vi.driver_version, DRIVER_VERSION,
 			sizeof(vi.driver_version));
 		vi.driver_version[sizeof(vi.driver_version)-1] = 0;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/usb/devio.c linux-2.4.20-wolk4.16-fullkernel/drivers/usb/devio.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/usb/devio.c	2004-06-29 11:31:08.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/usb/devio.c	2004-09-05 16:06:00.000000000 +0200
@@ -80,7 +80,7 @@ static ssize_t usbdev_read(struct file *
 	struct dev_state *ps = (struct dev_state *)file->private_data;
 	ssize_t ret = 0;
 	unsigned len;
-	loff_t pos;
+	loff_t pos, last;
 	int i;
 
 	pos = *ppos;
@@ -102,37 +102,38 @@ static ssize_t usbdev_read(struct file *
 			goto err;
 		}
 
-		*ppos += len;
+		pos += len;
 		buf += len;
 		nbytes -= len;
 		ret += len;
 	}
 
-	pos = sizeof(struct usb_device_descriptor);
+	last = sizeof(struct usb_device_descriptor);
 	for (i = 0; nbytes && i < ps->dev->descriptor.bNumConfigurations; i++) {
 		struct usb_config_descriptor *config =
 			(struct usb_config_descriptor *)ps->dev->rawdescriptors[i];
 		unsigned int length = le16_to_cpu(config->wTotalLength);
 
-		if (*ppos < pos + length) {
-			len = length - (*ppos - pos);
+		if (pos < last + length) {
+			len = length - (pos - last);
 			if (len > nbytes)
 				len = nbytes;
 
 			if (copy_to_user(buf,
-			    ps->dev->rawdescriptors[i] + (*ppos - pos), len)) {
+			    ps->dev->rawdescriptors[i] + (pos - last), len)) {
 				ret = -EFAULT;
 				goto err;
 			}
 
-			*ppos += len;
+			pos += len;
 			buf += len;
 			nbytes -= len;
 			ret += len;
 		}
 
-		pos += length;
+		last += length;
 	}
+	*ppos = pos;
 
 err:
 	up_read(&ps->devsem);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/usb/drivers.c linux-2.4.20-wolk4.16-fullkernel/drivers/usb/drivers.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/usb/drivers.c	2000-04-27 00:22:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/usb/drivers.c	2004-09-05 16:06:00.000000000 +0200
@@ -52,9 +52,10 @@ static ssize_t usb_driver_read(struct fi
 	struct list_head *tmp = usb_driver_list.next;
 	char *page, *start, *end;
 	ssize_t ret = 0;
-	unsigned int pos, len;
+	loff_t n = *ppos;
+	unsigned int pos = n, len;
 
-	if (*ppos < 0)
+	if (pos != n)
 		return -EINVAL;
 	if (nbytes <= 0)
 		return 0;
@@ -64,7 +65,6 @@ static ssize_t usb_driver_read(struct fi
                 return -ENOMEM;
 	start = page;
 	end = page + (PAGE_SIZE - 100);
-	pos = *ppos;
 	for (; tmp != &usb_driver_list; tmp = tmp->next) {
 		struct usb_driver *driver = list_entry(tmp, struct usb_driver, driver_list);
 		int minor = driver->fops ? driver->minor : -1;
@@ -88,7 +88,7 @@ static ssize_t usb_driver_read(struct fi
 		if (copy_to_user(buf, page + pos, len))
 			ret = -EFAULT;
 		else
-			*ppos += len;
+			*ppos = pos + len;
 	}
 	free_page((unsigned long)page);
 	return ret;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/usb/hid-core.c linux-2.4.20-wolk4.16-fullkernel/drivers/usb/hid-core.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/usb/hid-core.c	2004-06-29 11:24:12.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/usb/hid-core.c	2004-09-05 16:04:42.000000000 +0200
@@ -265,6 +265,8 @@ static int hid_add_field(struct hid_pars
 
 	offset = report->size;
 	report->size += parser->global.report_size * parser->global.report_count;
+	if (usages < parser->global.report_count)
+		usages = parser->global.report_count;
 
 	if (usages == 0)
 		return 0; /* ignore padding fields */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/usb/host/uhci-debug.h linux-2.4.20-wolk4.16-fullkernel/drivers/usb/host/uhci-debug.h
--- linux-2.4.20-wolk4.15-fullkernel/drivers/usb/host/uhci-debug.h	2004-06-29 11:22:51.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/usb/host/uhci-debug.h	2004-09-05 16:06:00.000000000 +0200
@@ -530,16 +530,14 @@ static ssize_t uhci_proc_read(struct fil
 			loff_t *ppos)
 {
 	struct uhci_proc *up = file->private_data;
-	unsigned int pos;
+	loff_t n = *ppos;
+	unsigned int pos = n;
 	unsigned int size;
 
-	pos = *ppos;
 	size = up->size;
-	if (pos >= size)
+	if (pos != n || pos >= size)
 		return 0;
-	if (nbytes >= size)
-		nbytes = size;
-	if (pos + nbytes > size)
+	if (nbytes > size - pos)
 		nbytes = size - pos;
 
 	if (!access_ok(VERIFY_WRITE, buf, nbytes))
@@ -548,7 +546,7 @@ static ssize_t uhci_proc_read(struct fil
 	if (copy_to_user(buf, up->data + pos, nbytes))
 		return -EFAULT;
 
-	*ppos += nbytes;
+	*ppos = pos + nbytes;
 
 	return nbytes;
 }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/usb/serial/io_edgeport.c linux-2.4.20-wolk4.16-fullkernel/drivers/usb/serial/io_edgeport.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/usb/serial/io_edgeport.c	2004-06-29 11:22:51.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/usb/serial/io_edgeport.c	2004-09-05 16:06:31.000000000 +0200
@@ -1909,6 +1909,7 @@ static int edge_ioctl (struct usb_serial
 
 		case TIOCGICOUNT:
 			cnow = edge_port->icount;
+			memset(&icount, 0, sizeof(icount));
 			icount.cts = cnow.cts;
 			icount.dsr = cnow.dsr;
 			icount.rng = cnow.rng;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/usb/serial/ipaq.c linux-2.4.20-wolk4.16-fullkernel/drivers/usb/serial/ipaq.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/usb/serial/ipaq.c	2004-06-29 11:22:51.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/usb/serial/ipaq.c	2004-09-05 16:06:31.000000000 +0200
@@ -188,6 +188,7 @@ static int ipaq_open(struct usb_serial_p
 	port->private = (void *)priv;
 	priv->active = 0;
 	priv->queue_len = 0;
+	priv->free_len = 0;
 	INIT_LIST_HEAD(&priv->queue);
 	INIT_LIST_HEAD(&priv->freelist);
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/usb/vicam.c linux-2.4.20-wolk4.16-fullkernel/drivers/usb/vicam.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/usb/vicam.c	2004-06-29 11:31:16.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/usb/vicam.c	2004-09-05 16:06:31.000000000 +0200
@@ -481,6 +481,7 @@ vicam_ioctl(struct video_device *dev, un
 			struct video_capability b;
 
 			DBG("VIDIOCGCAP\n");
+			memset(&b, 0, sizeof(b));
 			strcpy(b.name, "ViCam-based Camera");
 			b.type = VID_TYPE_CAPTURE;
 			b.channels = 1;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/video/fbcon.c linux-2.4.20-wolk4.16-fullkernel/drivers/video/fbcon.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/video/fbcon.c	2004-06-29 11:58:58.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/video/fbcon.c	2004-09-05 16:09:11.000000000 +0200
@@ -2015,7 +2015,10 @@ static inline int fbcon_set_font(int uni
        font length must be multiple of 256, at least. And 256 is multiple
        of 4 */
     k = 0;
-    while (p > new_data) k += *--(u32 *)p;
+    while (p > new_data) {
+        p = (u8 *)((u32 *)p - 1);
+        k += *(u32 *)p;
+    }
     FNTSUM(new_data) = k;
     /* Check if the same font is on some other console already */
     for (i = 0; i < MAX_NR_CONSOLES; i++) {
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/video/fbmem.c linux-2.4.20-wolk4.16-fullkernel/drivers/video/fbmem.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/video/fbmem.c	2004-06-29 11:23:44.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/video/fbmem.c	2004-09-05 16:06:00.000000000 +0200
@@ -390,7 +390,7 @@ static int fbmem_read_proc(char *buf, ch
 static ssize_t
 fb_read(struct file *file, char *buf, size_t count, loff_t *ppos)
 {
-	unsigned long p = *ppos;
+	loff_t p = *ppos;
 	struct inode *inode = file->f_dentry->d_inode;
 	int fbidx = GET_FB_IDX(inode->i_rdev);
 	struct fb_info *info = registered_fb[fbidx];
@@ -400,12 +400,13 @@ fb_read(struct file *file, char *buf, si
 	if (! fb || ! info->disp)
 		return -ENODEV;
 
+	if (p < 0)
+		return -EINVAL;
+
 	fb->fb_get_fix(&fix,PROC_CONSOLE(info), info);
 	if (p >= fix.smem_len)
 	    return 0;
-	if (count >= fix.smem_len)
-	    count = fix.smem_len;
-	if (count + p > fix.smem_len)
+	if (count > fix.smem_len - p)
 		count = fix.smem_len - p;
 	if (count) {
 	    char *base_addr;
@@ -414,7 +415,7 @@ fb_read(struct file *file, char *buf, si
 	    count -= copy_to_user(buf, base_addr+p, count);
 	    if (!count)
 		return -EFAULT;
-	    *ppos += count;
+	    *ppos = p + count;
 	}
 	return count;
 }
@@ -422,7 +423,7 @@ fb_read(struct file *file, char *buf, si
 static ssize_t
 fb_write(struct file *file, const char *buf, size_t count, loff_t *ppos)
 {
-	unsigned long p = *ppos;
+	loff_t p = *ppos;
 	struct inode *inode = file->f_dentry->d_inode;
 	int fbidx = GET_FB_IDX(inode->i_rdev);
 	struct fb_info *info = registered_fb[fbidx];
@@ -433,13 +434,14 @@ fb_write(struct file *file, const char *
 	if (! fb || ! info->disp)
 		return -ENODEV;
 
+	if (p < 0)
+		return -EINVAL;
+
 	fb->fb_get_fix(&fix, PROC_CONSOLE(info), info);
 	if (p > fix.smem_len)
 	    return -ENOSPC;
-	if (count >= fix.smem_len)
-	    count = fix.smem_len;
 	err = 0;
-	if (count + p > fix.smem_len) {
+	if (count > fix.smem_len - p) {
 	    count = fix.smem_len - p;
 	    err = -ENOSPC;
 	}
@@ -448,7 +450,7 @@ fb_write(struct file *file, const char *
 
 	    base_addr = info->disp->screen_base;
 	    count -= copy_from_user(base_addr+p, buf, count);
-	    *ppos += count;
+	    *ppos = p + count;
 	    err = -EFAULT;
 	}
 	if (count)
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/drivers/zorro/proc.c linux-2.4.20-wolk4.16-fullkernel/drivers/zorro/proc.c
--- linux-2.4.20-wolk4.15-fullkernel/drivers/zorro/proc.c	2002-11-29 00:53:15.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/drivers/zorro/proc.c	2004-09-05 16:06:00.000000000 +0200
@@ -50,11 +50,9 @@ proc_bus_zorro_read(struct file *file, c
 	struct ConfigDev cd;
 	loff_t pos = *ppos;
 
-	if (pos >= sizeof(struct ConfigDev))
+	if (pos < 0 || pos >= sizeof(struct ConfigDev))
 		return 0;
-	if (nbytes >= sizeof(struct ConfigDev))
-		nbytes = sizeof(struct ConfigDev);
-	if (pos + nbytes > sizeof(struct ConfigDev))
+	if (nbytes > sizeof(struct ConfigDev) - pos)
 		nbytes = sizeof(struct ConfigDev) - pos;
 
 	/* Construct a ConfigDev */
@@ -67,7 +65,7 @@ proc_bus_zorro_read(struct file *file, c
 
 	if (copy_to_user(buf, &cd, nbytes))
 		return -EFAULT;
-	*ppos += nbytes;
+	*ppos = pos + nbytes;
 
 	return nbytes;
 }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/Config.in linux-2.4.20-wolk4.16-fullkernel/fs/Config.in
--- linux-2.4.20-wolk4.15-fullkernel/fs/Config.in	2004-06-29 11:31:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/Config.in	2004-09-05 16:09:22.000000000 +0200
@@ -59,7 +59,7 @@ dep_tristate '    UMSDOS: Unix-like file
 dep_tristate '  VFAT (Windows-95) fs support' CONFIG_VFAT_FS $CONFIG_FAT_FS
 tristate 'NTFS file system support (read only)' CONFIG_NTFS_FS
 dep_mbool '  NTFS debugging support' CONFIG_NTFS_DEBUG $CONFIG_NTFS_FS
-dep_mbool '  NTFS write support (DANGEROUS)' CONFIG_NTFS_RW $CONFIG_NTFS_FS $CONFIG_EXPERIMENTAL
+dep_mbool '  NTFS write support' CONFIG_NTFS_RW $CONFIG_NTFS_FS $CONFIG_EXPERIMENTAL
 endmenu
 
 
@@ -69,9 +69,13 @@ dep_bool '/dev/pts file system for Unix9
 bool '/proc file system support' CONFIG_PROC_FS
 if [ "$CONFIG_PROC_FS" = "y" ] ; then
   bool '  Enhanced /proc/meminfo output' CONFIG_PROC_FS_ENHANCED_MEMINFO
-  bool '  /proc/config.gz (Kernel Configuration)' CONFIG_PROC_CONFIG
-  bool '  Kernel .config support' CONFIG_IKCONFIG
-  dep_bool '    Enable access to .config through /proc/ikconfig' CONFIG_IKCONFIG_PROC $CONFIG_IKCONFIG
+  bool '  /proc/config.{gz|bz2} (Kernel Configuration)' CONFIG_PROC_CONFIG
+  if [ "$CONFIG_PROC_CONFIG" = "y" ]; then
+    choice '        Compression algorithm for /proc/config.*' \
+	"GZIP		CONFIG_PROC_CONFIG_GZ \
+	 BZIP2		CONFIG_PROC_CONFIG_BZ2 \
+	 NONE		CONFIG_PROC_CONFIG_NONE" GZIP
+  fi
 fi
 dep_bool '/dev file system support (EXPERIMENTAL)' CONFIG_DEVFS_FS $CONFIG_EXPERIMENTAL
 dep_bool '  Automatically mount at boot' CONFIG_DEVFS_MOUNT $CONFIG_DEVFS_FS
@@ -116,14 +120,14 @@ if [ "$CONFIG_NET" = "y" ]; then
    dep_tristate 'NFS file system support' CONFIG_NFS_FS $CONFIG_INET
       dep_mbool '  Provide NFSv3 client support' CONFIG_NFS_V3 $CONFIG_NFS_FS
       dep_mbool '    nfsacl protocol extension' CONFIG_NFS_ACL $CONFIG_NFS_V3
-      dep_mbool '  Allow direct I/O on NFS files (EXPERIMENTAL)' CONFIG_NFS_DIRECTIO $CONFIG_NFS_FS $CONFIG_EXPERIMENTAL
+      dep_mbool '  Allow direct I/O on NFS files' CONFIG_NFS_DIRECTIO $CONFIG_NFS_FS
        dep_bool '  Root file system on NFS' CONFIG_ROOT_NFS $CONFIG_NFS_FS $CONFIG_IP_PNP
        dep_bool '    Disable Floppy Fallback' CONFIG_NO_FLOPPY_FALLBACK $CONFIG_ROOT_NFS
 
    dep_tristate 'NFS server support' CONFIG_NFSD $CONFIG_INET
       dep_mbool '  Provide NFSv3 server support' CONFIG_NFSD_V3 $CONFIG_NFSD
       dep_mbool '    nfsacl protocol extension' CONFIG_NFSD_ACL $CONFIG_NFSD_V3
-      dep_mbool '  Provide NFS server over TCP support (EXPERIMENTAL)' CONFIG_NFSD_TCP $CONFIG_NFSD $CONFIG_EXPERIMENTAL
+      dep_mbool '  Provide NFS server over TCP support' CONFIG_NFSD_TCP $CONFIG_NFSD
       dep_mbool '    Use filehandle aliasing (for HA-NFS)' CONFIG_NFSD_FHALIAS $CONFIG_NFSD
 
    if [ "$CONFIG_NFS_FS" = "y" -o "$CONFIG_NFSD" = "y" ]; then
@@ -150,7 +154,9 @@ if [ "$CONFIG_NET" = "y" ]; then
      define_bool CONFIG_LOCKD_V4 y
    fi
 
-   dep_tristate 'CIFS support (advanced network filesystem for Samba, Window and other CIFS compliant servers)' CONFIG_CIFS $CONFIG_INET
+   dep_tristate 'CIFS support (advanced network filesystem for Samba, Windows and other CIFS compliant servers)' CONFIG_CIFS $CONFIG_INET
+      dep_mbool '  CIFS statistics' CONFIG_CIFS_STATS $CONFIG_CIFS 
+      dep_mbool '  CIFS POSIX Protocol Extensions' CONFIG_CIFS_POSIX $CONFIG_CIFS
 
    dep_tristate 'SMB file system support (to mount Windows shares etc.)' CONFIG_SMB_FS $CONFIG_INET
    if [ "$CONFIG_SMB_FS" != "n" ]; then
@@ -175,7 +181,7 @@ if [ "$CONFIG_NET" = "y" ]; then
 
    dep_tristate 'Secure SHell Filesystem support (shfs/sshfs)' CONFIG_SH_FS $CONFIG_EXPERIMENTAL $CONFIG_INET
    if [ "$CONFIG_SH_FS" != "n" ]; then
-   	choice '  Debug Level' \
+   	choice '      Debug Level' \
 	"DISABLED	CONFIG_SH_FS_DEBUG0 \
 	 VERBOSE	CONFIG_SH_FS_DEBUG1 \
 	 ALLOC_DEBUG	CONFIG_SH_FS_DEBUG2 \
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/attr.c linux-2.4.20-wolk4.16-fullkernel/fs/attr.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/attr.c	2002-02-25 20:38:07.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/fs/attr.c	2004-09-05 16:06:01.000000000 +0200
@@ -33,7 +33,8 @@ int inode_change_ok(struct inode *inode,
 
 	/* Make sure caller can chgrp. */
 	if ((ia_valid & ATTR_GID) &&
-	    (!in_group_p(attr->ia_gid) && attr->ia_gid != inode->i_gid) &&
+	    (current->fsuid != inode->i_uid ||
+	    (!in_group_p(attr->ia_gid) && attr->ia_gid != inode->i_gid)) &&
 	    !capable(CAP_CHOWN))
 		goto error;
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/autofs4/autofs_i.h linux-2.4.20-wolk4.16-fullkernel/fs/autofs4/autofs_i.h
--- linux-2.4.20-wolk4.15-fullkernel/fs/autofs4/autofs_i.h	2002-08-03 02:39:45.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/autofs4/autofs_i.h	2004-09-05 16:06:17.000000000 +0200
@@ -80,7 +80,7 @@ struct autofs_wait_queue {
 	char *name;
 	/* This is for status reporting upon return */
 	int status;
-	int wait_ctr;
+	atomic_t wait_ctr;
 };
 
 #define AUTOFS_SBI_MAGIC 0x6d4a556d
@@ -91,7 +91,11 @@ struct autofs_sb_info {
 	pid_t oz_pgrp;
 	int catatonic;
 	int version;
+	int sub_version;
 	unsigned long exp_timeout;
+	int reghost_enabled;
+	int needs_reghost;
+	struct semaphore wq_sem;
 	struct super_block *sb;
 	struct autofs_wait_queue *queues; /* Wait queue pointer */
 };
@@ -123,6 +127,12 @@ static inline int autofs4_ispending(stru
 		(inf != NULL && inf->flags & AUTOFS_INF_EXPIRING);
 }
 
+static inline void autofs4_copy_atime(struct file *src, struct file *dst)
+{
+	dst->f_dentry->d_inode->i_atime = src->f_dentry->d_inode->i_atime;
+	return;
+}
+
 struct inode *autofs4_get_inode(struct super_block *, struct autofs_info *);
 struct autofs_info *autofs4_init_inf(struct autofs_sb_info *, mode_t mode);
 void autofs4_free_ino(struct autofs_info *);
@@ -139,6 +149,7 @@ int autofs4_expire_multi(struct super_bl
 extern struct inode_operations autofs4_symlink_inode_operations;
 extern struct inode_operations autofs4_dir_inode_operations;
 extern struct inode_operations autofs4_root_inode_operations;
+extern struct file_operations autofs4_dir_operations;
 extern struct file_operations autofs4_root_operations;
 
 /* Initializing function */
@@ -155,6 +166,56 @@ enum autofs_notify
 	NFY_EXPIRE
 };
 
-int autofs4_wait(struct autofs_sb_info *,struct qstr *, enum autofs_notify);
+int autofs4_wait(struct autofs_sb_info *,struct dentry *, enum autofs_notify);
 int autofs4_wait_release(struct autofs_sb_info *,autofs_wqt_t,int);
 void autofs4_catatonic_mode(struct autofs_sb_info *);
+
+#if !defined(REDHAT_KERNEL) || LINUX_VERSION_CODE < KERNEL_VERSION(2,4,19)
+/**
+ * list_for_each_entry  -       iterate over list of given type
+ * @pos:        the type * to use as a loop counter.
+ * @head:       the head for your list.
+ * @member:     the name of the list_struct within the struct.
+ */
+#define list_for_each_entry(pos, head, member)                          \
+        for (pos = list_entry((head)->next, typeof(*pos), member),      \
+                     prefetch(pos->member.next);                        \
+             &pos->member != (head);                                    \
+             pos = list_entry(pos->member.next, typeof(*pos), member),  \
+                     prefetch(pos->member.next))
+
+#endif
+
+static inline int simple_positive(struct dentry *dentry)
+{
+	return dentry->d_inode && !d_unhashed(dentry);
+}
+
+static inline int simple_empty_nolock(struct dentry *dentry)
+{
+	struct dentry *child;
+	int ret = 0;
+
+	list_for_each_entry(child, &dentry->d_subdirs, d_child)
+		if (simple_positive(child))
+			goto out;
+	ret = 1;
+out:
+	return ret;
+}
+
+static inline int simple_empty(struct dentry *dentry)
+{
+	struct dentry *child;
+	int ret = 0;
+
+	spin_lock(&dcache_lock);
+	list_for_each_entry(child, &dentry->d_subdirs, d_child)
+		if (simple_positive(child))
+			goto out;
+	ret = 1;
+out:
+	spin_unlock(&dcache_lock);
+	return ret;
+}
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/autofs4/expire.c linux-2.4.20-wolk4.16-fullkernel/fs/autofs4/expire.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/autofs4/expire.c	2001-06-12 04:15:27.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/autofs4/expire.c	2004-09-05 16:06:17.000000000 +0200
@@ -4,6 +4,7 @@
  *
  *  Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved
  *  Copyright 1999-2000 Jeremy Fitzhardinge <jeremy@goop.org>
+ *  Copyright 2001-2003 Ian Kent <raven@themaw.net>
  *
  * This file is part of the Linux kernel and is made available under
  * the terms of the GNU General Public License, version 2, or at your
@@ -13,134 +14,238 @@
 
 #include "autofs_i.h"
 
-/*
- * Determine if a subtree of the namespace is busy.
- *
- * mnt is the mount tree under the autofs mountpoint
- */
-static inline int is_vfsmnt_tree_busy(struct vfsmount *mnt)
+static unsigned long now;
+
+/* Check if a dentry can be expired return 1 if it can else return 0 */
+static inline int autofs4_can_expire(struct dentry *dentry,
+					unsigned long timeout, int do_now)
+{
+	struct autofs_info *ino = autofs4_dentry_ino(dentry);
+
+	/* dentry in the process of being deleted */
+	if (ino == NULL)
+		return 0;
+
+	/* No point expiring a pending mount */
+	if (dentry->d_flags & DCACHE_AUTOFS_PENDING)
+		return 0;
+
+	if (!do_now) {
+		/* Too young to die */
+		if (time_after(ino->last_used + timeout, now))
+			return 0;
+		
+		/* update last_used here :- 
+		   - obviously makes sense if it is in use now
+		   - less obviously, prevents rapid-fire expire
+		     attempts if expire fails the first time */
+		ino->last_used = now;
+	}
+
+	return 1;
+}
+
+/* Sorry I can't solve the problem without using counts either */
+static int autofs4_may_umount(struct vfsmount *mnt)
 {
-	struct vfsmount *this_parent = mnt;
 	struct list_head *next;
-	int count;
+	struct vfsmount *this_parent = mnt;
+	int actual_refs;
+	int minimum_refs;
 
-	count = atomic_read(&mnt->mnt_count) - 1;
+	actual_refs = atomic_read(&mnt->mnt_count);
+	minimum_refs = 2;
 
+	spin_lock(&dcache_lock);
 repeat:
 	next = this_parent->mnt_mounts.next;
-	DPRINTK(("is_vfsmnt_tree_busy: mnt=%p, this_parent=%p, next=%p\n",
-		 mnt, this_parent, next));
 resume:
-	for( ; next != &this_parent->mnt_mounts; next = next->next) {
-		struct vfsmount *p = list_entry(next, struct vfsmount,
-						mnt_child);
-
-		/* -1 for struct vfs_mount's normal count, 
-		   -1 to compensate for child's reference to parent */
-		count += atomic_read(&p->mnt_count) - 1 - 1;
+	while (next != &this_parent->mnt_mounts) {
+		struct vfsmount *p = list_entry(next, struct vfsmount, mnt_child);
+
+		next = next->next;
 
-		DPRINTK(("is_vfsmnt_tree_busy: p=%p, count now %d\n",
-			 p, count));
+		actual_refs += atomic_read(&p->mnt_count);
+		minimum_refs += 2;
 
 		if (!list_empty(&p->mnt_mounts)) {
 			this_parent = p;
 			goto repeat;
 		}
-		/* root is busy if any leaf is busy */
-		if (atomic_read(&p->mnt_count) > 1)
-			return 1;
 	}
 
-	/* All done at this level ... ascend and resume the search. */
 	if (this_parent != mnt) {
-		next = this_parent->mnt_child.next; 
+		next = this_parent->mnt_child.next;
 		this_parent = this_parent->mnt_parent;
 		goto resume;
 	}
+	spin_unlock(&dcache_lock);
+
+	DPRINTK(("autofs4_may_umount: done actual = %d, minimum = %d\n",
+		 actual_refs, minimum_refs));
 
-	DPRINTK(("is_vfsmnt_tree_busy: count=%d\n", count));
-	return count != 0; /* remaining users? */
+	return actual_refs > minimum_refs;
 }
 
-/* Traverse a dentry's list of vfsmounts and return the number of
-   non-busy mounts */
-static int check_vfsmnt(struct vfsmount *mnt, struct dentry *dentry)
+/* Check a mount point for busyness return 1 if not busy, otherwise */
+static int autofs4_check_mount(struct vfsmount *mnt, struct dentry *dentry)
 {
-	int ret = dentry->d_mounted;
-	struct vfsmount *vfs = lookup_mnt(mnt, dentry);
+	int status = 0;
 
-	if (vfs && is_vfsmnt_tree_busy(vfs))
-		ret--;
-	DPRINTK(("check_vfsmnt: ret=%d\n", ret));
-	return ret;
+	DPRINTK(("autofs4_check_mount: dentry %p %.*s\n",
+		 dentry, (int)dentry->d_name.len, dentry->d_name.name));
+
+	mntget(mnt);
+	dget(dentry);
+
+	if (!follow_down(&mnt, &dentry))
+		goto done;
+
+	while (d_mountpoint(dentry) && follow_down(&mnt, &dentry))
+		;
+
+	/* This is an autofs submount, we can't expire it */
+	if (is_autofs4_dentry(dentry))
+		goto done;
+	
+	/* The big question */
+	if (autofs4_may_umount(mnt) == 0)
+		status = 1;
+done:
+	DPRINTK(("autofs4_check_mount: returning = %d\n", status));
+	mntput(mnt);
+	dput(dentry);
+	return status;
 }
 
-/* Check dentry tree for busyness.  If a dentry appears to be busy
-   because it is a mountpoint, check to see if the mounted
-   filesystem is busy. */
-static int is_tree_busy(struct vfsmount *topmnt, struct dentry *top)
+/* Check a directory tree of mount points for busyness
+ * The tree is not busy iff no mountpoints are busy 
+ * Return 1 if the tree is busy or 0 otherwise
+ */
+static int autofs4_check_tree(struct vfsmount *mnt,
+	       		      struct dentry *top,
+			      unsigned long timeout,
+			      int do_now)
 {
-	struct dentry *this_parent;
+	struct dentry *this_parent = top;
 	struct list_head *next;
-	int count;
 
-	count = atomic_read(&top->d_count);
-	
-	DPRINTK(("is_tree_busy: top=%p initial count=%d\n", 
-		 top, count));
-	this_parent = top;
-
-	if (is_autofs4_dentry(top)) {
-		count--;
-		DPRINTK(("is_tree_busy: autofs; count=%d\n", count));
-	}
+	DPRINTK(("autofs4_check_tree: parent %p %.*s\n",
+		 top, (int)top->d_name.len, top->d_name.name));
 
-	if (d_mountpoint(top))
-		count -= check_vfsmnt(topmnt, top);
+	/* Negative dentry - give up */
+	if (!simple_positive(top))
+		return 0;
+
+	/* Timeout of a tree mount is determined by its top dentry */
+	if (!autofs4_can_expire(top, timeout, do_now))
+		return 0;
 
- repeat:
+	spin_lock(&dcache_lock);
+repeat:
 	next = this_parent->d_subdirs.next;
- resume:
+resume:
 	while (next != &this_parent->d_subdirs) {
-		int adj = 0;
-		struct dentry *dentry = list_entry(next, struct dentry,
-						   d_child);
+		struct dentry *dentry = list_entry(next, struct dentry, d_child);
+
+		/* Negative dentry - give up */
+		if (!simple_positive(dentry)) {
+			next = next->next;
+			continue;
+		}
+
+		DPRINTK(("autofs4_check_tree: dentry %p %.*s\n",
+			 dentry, (int)dentry->d_name.len, dentry->d_name.name));
+
+		if (!list_empty(&dentry->d_subdirs)) {
+			this_parent = dentry;
+			goto repeat;
+		}
+
+		dentry = dget(dentry);
+		spin_unlock(&dcache_lock);
+
+		if (d_mountpoint(dentry)) {
+			/* First busy => tree busy */
+			if (!autofs4_check_mount(mnt, dentry)) {
+				dput(dentry);
+				return 0;
+			}
+		}
+
+		dput(dentry);
+		spin_lock(&dcache_lock);
 		next = next->next;
+	}
+
+	if (this_parent != top) {
+		next = this_parent->d_child.next;
+		this_parent = this_parent->d_parent;
+		goto resume;
+	}
+	spin_unlock(&dcache_lock);
+
+	return 1;
+}
+
+struct dentry *autofs4_check_leaves(struct vfsmount *mnt,
+				    struct dentry *parent,
+				    unsigned long timeout,
+				    int do_now)
+{
+	struct dentry *this_parent = parent;
+	struct list_head *next;
 
-		count += atomic_read(&dentry->d_count) - 1;
+	DPRINTK(("autofs4_check_leaves: parent %p %.*s\n",
+		 parent, (int)parent->d_name.len, parent->d_name.name));
 
-		if (d_mountpoint(dentry))
-			adj += check_vfsmnt(topmnt, dentry);
+	spin_lock(&dcache_lock);
+repeat:
+	next = this_parent->d_subdirs.next;
+resume:
+	while (next != &this_parent->d_subdirs) {
+		struct dentry *dentry = list_entry(next, struct dentry, d_child);
 
-		if (is_autofs4_dentry(dentry)) {
-			adj++;
-			DPRINTK(("is_tree_busy: autofs; adj=%d\n",
-				 adj));
+		/* Negative dentry - give up */
+		if (!simple_positive(dentry)) {
+			next = next->next;
+			continue;
 		}
 
-		count -= adj;
+		DPRINTK(("autofs4_check_leaves: dentry %p %.*s\n",
+			 dentry, (int)dentry->d_name.len, dentry->d_name.name));
 
 		if (!list_empty(&dentry->d_subdirs)) {
 			this_parent = dentry;
 			goto repeat;
 		}
 
-		if (atomic_read(&dentry->d_count) != adj) {
-			DPRINTK(("is_tree_busy: busy leaf (d_count=%d adj=%d)\n",
-				 atomic_read(&dentry->d_count), adj));
-			return 1;
+		dentry = dget(dentry);
+		spin_unlock(&dcache_lock);
+
+		if (d_mountpoint(dentry)) {
+			/* Can we expire this guy */
+			if (!autofs4_can_expire(dentry, timeout, do_now))
+				goto cont;
+
+			/* Can we umount this guy */
+			if (autofs4_check_mount(mnt, dentry))
+				return dentry;
 		}
+cont:
+		dput(dentry);
+		spin_lock(&dcache_lock);
+		next = next->next;
 	}
 
-	/* All done at this level ... ascend and resume the search. */
-	if (this_parent != top) {
-		next = this_parent->d_child.next; 
+	if (this_parent != parent) {
+		next = this_parent->d_child.next;
 		this_parent = this_parent->d_parent;
 		goto resume;
 	}
+	spin_unlock(&dcache_lock);
 
-	DPRINTK(("is_tree_busy: count=%d\n", count));
-	return count != 0; /* remaining users? */
+	return NULL;
 }
 
 /*
@@ -152,61 +257,86 @@ static int is_tree_busy(struct vfsmount 
 static struct dentry *autofs4_expire(struct super_block *sb,
 				     struct vfsmount *mnt,
 				     struct autofs_sb_info *sbi,
-				     int do_now)
+				     int how)
 {
-	unsigned long now = jiffies;
 	unsigned long timeout;
 	struct dentry *root = sb->s_root;
-	struct list_head *tmp;
+	struct dentry *expired = NULL;
+	struct list_head *next;
+	int do_now = how & AUTOFS_EXP_IMMEDIATE;
+	int exp_leaves = how & AUTOFS_EXP_LEAVES;
 
 	if (!sbi->exp_timeout || !root)
 		return NULL;
 
+	now = jiffies;
 	timeout = sbi->exp_timeout;
 
 	spin_lock(&dcache_lock);
-	for(tmp = root->d_subdirs.next;
-	    tmp != &root->d_subdirs; 
-	    tmp = tmp->next) {
-		struct autofs_info *ino;
-		struct dentry *dentry = list_entry(tmp, struct dentry, d_child);
+	next = root->d_subdirs.next;
 
-		if (dentry->d_inode == NULL)
+	/* On exit from the loop expire is set to a dgot dentry
+	 * to expire or it's NULL */
+	while (next != &root->d_subdirs) {
+		struct dentry *dentry = list_entry(next, struct dentry, d_child);
+
+		/* Negative dentry - give up */
+		if (!simple_positive(dentry)) {
+			next = next->next;
 			continue;
+		}
 
-		ino = autofs4_dentry_ino(dentry);
+		dentry = dget(dentry);
+		spin_unlock(&dcache_lock);
 
-		if (ino == NULL) {
-			/* dentry in the process of being deleted */
-			continue;
+		/* Case 1: indirect mount or top level direct mount */
+		if (d_mountpoint(dentry)) {
+			DPRINTK(("autofs4_expire: checking mountpoint %p %.*s\n",
+			 dentry, (int)dentry->d_name.len, dentry->d_name.name));
+
+			/* Can we expire this guy */
+			if (!autofs4_can_expire(dentry, timeout, do_now))
+				goto next;
+
+			/* Can we umount this guy */
+			if (autofs4_check_mount(mnt, dentry)) {
+				expired = dentry;
+				break;
+			}
+			goto next;
 		}
 
-		/* No point expiring a pending mount */
-		if (dentry->d_flags & DCACHE_AUTOFS_PENDING)
-			continue;
+		if (simple_empty(dentry))
+			goto next;
 
-		if (!do_now) {
-			/* Too young to die */
-			if (time_after(ino->last_used + timeout, now))
-				continue;
-		
-			/* update last_used here :- 
-			   - obviously makes sense if it is in use now
-			   - less obviously, prevents rapid-fire expire
-			     attempts if expire fails the first time */
-			ino->last_used = now;
+		/* Case 2: tree mount, expire iff entire tree is not busy */
+		if (!exp_leaves) {
+			if (autofs4_check_tree(mnt, dentry, timeout, do_now)) {
+				expired = dentry;
+				break;
+			}
+		/* Case 3: direct mount, expire individual leaves */
+		} else {
+			expired = autofs4_check_leaves(mnt, dentry, timeout, do_now);
+			if (expired) {
+				dput(dentry);
+				break;
+			}
 		}
-		if (!is_tree_busy(mnt, dentry)) {
-			DPRINTK(("autofs_expire: returning %p %.*s\n",
-				 dentry, (int)dentry->d_name.len, dentry->d_name.name));
-			/* Start from here next time */
-			list_del(&root->d_subdirs);
-			list_add(&root->d_subdirs, &dentry->d_child);
-			dget(dentry);
-			spin_unlock(&dcache_lock);
+next:
+		dput(dentry);
+		spin_lock(&dcache_lock);
+		next = next->next;
+	}
 
-			return dentry;
-		}
+	if ( expired ) {
+		DPRINTK(("autofs4_expire: returning %p %.*s\n",
+			 expired, (int)expired->d_name.len, expired->d_name.name));
+		spin_lock(&dcache_lock);
+		list_del(&expired->d_parent->d_subdirs);
+		list_add(&expired->d_parent->d_subdirs, &expired->d_child);
+		spin_unlock(&dcache_lock);
+		return expired;
 	}
 	spin_unlock(&dcache_lock);
 
@@ -259,11 +389,11 @@ int autofs4_expire_multi(struct super_bl
 		/* This is synchronous because it makes the daemon a
                    little easier */
 		de_info->flags |= AUTOFS_INF_EXPIRING;
-		ret = autofs4_wait(sbi, &dentry->d_name, NFY_EXPIRE);
+		ret = autofs4_wait(sbi, dentry, NFY_EXPIRE);
 		de_info->flags &= ~AUTOFS_INF_EXPIRING;
 		dput(dentry);
 	}
-		
+
 	return ret;
 }
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/autofs4/inode.c linux-2.4.20-wolk4.16-fullkernel/fs/autofs4/inode.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/autofs4/inode.c	2002-08-03 02:39:45.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/autofs4/inode.c	2004-09-05 16:06:17.000000000 +0200
@@ -87,7 +87,7 @@ static void autofs4_put_super(struct sup
 
 	kfree(sbi);
 
-	DPRINTK(("autofs: shutting down\n"));
+	DPRINTK(("autofs4: shutting down\n"));
 }
 
 static int autofs4_statfs(struct super_block *sb, struct statfs *buf);
@@ -181,12 +181,13 @@ struct super_block *autofs4_read_super(s
 	struct file * pipe;
 	int pipefd;
 	struct autofs_sb_info *sbi;
+	struct autofs_info *ino;
 	int minproto, maxproto;
 
 	sbi = (struct autofs_sb_info *) kmalloc(sizeof(*sbi), GFP_KERNEL);
 	if ( !sbi )
 		goto fail_unlock;
-	DPRINTK(("autofs: starting up, sbi = %p\n",sbi));
+	DPRINTK(("autofs4: starting up, sbi = %p\n",sbi));
 
 	memset(sbi, 0, sizeof(*sbi));
 
@@ -197,7 +198,11 @@ struct super_block *autofs4_read_super(s
 	sbi->oz_pgrp = current->pgrp;
 	sbi->sb = s;
 	sbi->version = 0;
+	sbi->sub_version = 0;
+	init_MUTEX(&sbi->wq_sem);
 	sbi->queues = NULL;
+	sbi->reghost_enabled = 0;
+	sbi->needs_reghost = 0;
 	s->s_blocksize = 1024;
 	s->s_blocksize_bits = 10;
 	s->s_magic = AUTOFS_SUPER_MAGIC;
@@ -206,7 +211,12 @@ struct super_block *autofs4_read_super(s
 	/*
 	 * Get the root inode and dentry, but defer checking for errors.
 	 */
-	root_inode = autofs4_get_inode(s, autofs4_mkroot(sbi));
+	ino = autofs4_mkroot(sbi);
+	root_inode = autofs4_get_inode(s, ino);
+	kfree(ino);
+	if (!root_inode)
+		goto fail_free;
+
 	root_inode->i_op = &autofs4_root_inode_operations;
 	root_inode->i_fop = &autofs4_root_operations;
 	root = d_alloc_root(root_inode);
@@ -220,14 +230,14 @@ struct super_block *autofs4_read_super(s
 			  &root_inode->i_uid, &root_inode->i_gid,
 			  &sbi->oz_pgrp,
 			  &minproto, &maxproto)) {
-		printk("autofs: called with bogus options\n");
+		printk("autofs4: called with bogus options\n");
 		goto fail_dput;
 	}
 
 	/* Couldn't this be tested earlier? */
 	if (maxproto < AUTOFS_MIN_PROTO_VERSION ||
 	    minproto > AUTOFS_MAX_PROTO_VERSION) {
-		printk("autofs: kernel does not match daemon version "
+		printk("autofs4: kernel does not match daemon version "
 		       "daemon (%d, %d) kernel (%d, %d)\n",
 			minproto, maxproto,
 			AUTOFS_MIN_PROTO_VERSION, AUTOFS_MAX_PROTO_VERSION);
@@ -235,12 +245,13 @@ struct super_block *autofs4_read_super(s
 	}
 
 	sbi->version = maxproto > AUTOFS_MAX_PROTO_VERSION ? AUTOFS_MAX_PROTO_VERSION : maxproto;
+	sbi->sub_version =  AUTOFS_PROTO_SUBVERSION;
 
-	DPRINTK(("autofs: pipe fd = %d, pgrp = %u\n", pipefd, sbi->oz_pgrp));
+	DPRINTK(("autofs4: pipe fd = %d, pgrp = %u\n", pipefd, sbi->oz_pgrp));
 	pipe = fget(pipefd);
 	
 	if ( !pipe ) {
-		printk("autofs: could not open pipe file descriptor\n");
+		printk("autofs4: could not open pipe file descriptor\n");
 		goto fail_dput;
 	}
 	if ( !pipe->f_op || !pipe->f_op->write )
@@ -257,7 +268,7 @@ struct super_block *autofs4_read_super(s
 	 * Failure ... clean up.
 	 */
 fail_fput:
-	printk("autofs: pipe file descriptor does not contain proper ops\n");
+	printk("autofs4: pipe file descriptor does not contain proper ops\n");
 	/*
 	 * fput() can block, so we clear the super block first.
 	 */
@@ -270,7 +281,7 @@ fail_dput:
 	dput(root);
 	goto fail_free;
 fail_iput:
-	printk("autofs: get root dentry failed\n");
+	printk("autofs4: get root dentry failed\n");
 	/*
 	 * iput() can block, so we clear the super block first.
 	 */
@@ -314,7 +325,7 @@ struct inode *autofs4_get_inode(struct s
 	if (S_ISDIR(inf->mode)) {
 		inode->i_nlink = 2;
 		inode->i_op = &autofs4_dir_inode_operations;
-		inode->i_fop = &dcache_dir_ops;
+		inode->i_fop = &autofs4_dir_operations;
 	} else if (S_ISLNK(inf->mode)) {
 		inode->i_size = inf->size;
 		inode->i_op = &autofs4_symlink_inode_operations;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/autofs4/root.c linux-2.4.20-wolk4.16-fullkernel/fs/autofs4/root.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/autofs4/root.c	2002-08-03 02:39:45.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/autofs4/root.c	2004-09-05 16:06:17.000000000 +0200
@@ -4,6 +4,7 @@
  *
  *  Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved
  *  Copyright 1999-2000 Jeremy Fitzhardinge <jeremy@goop.org>
+ *  Copyright 2001-2003 Ian Kent <raven@themaw.net>
  *
  * This file is part of the Linux kernel and is made available under
  * the terms of the GNU General Public License, version 2, or at your
@@ -16,6 +17,10 @@
 #include <linux/param.h>
 #include <linux/sched.h>
 #include <linux/smp_lock.h>
+#include <linux/file.h>
+#include <linux/limits.h>
+#include <linux/iobuf.h>
+#include <linux/module.h>
 #include "autofs_i.h"
 
 static struct dentry *autofs4_dir_lookup(struct inode *,struct dentry *);
@@ -24,18 +29,26 @@ static int autofs4_dir_unlink(struct ino
 static int autofs4_dir_rmdir(struct inode *,struct dentry *);
 static int autofs4_dir_mkdir(struct inode *,struct dentry *,int);
 static int autofs4_root_ioctl(struct inode *, struct file *,unsigned int,unsigned long);
+static int autofs4_dir_open(struct inode *inode, struct file *file);
+static int autofs4_dir_close(struct inode *inode, struct file *file);
+static int autofs4_dir_readdir(struct file * filp, void * dirent, filldir_t filldir);
+static int autofs4_root_readdir(struct file * filp, void * dirent, filldir_t filldir);
 static struct dentry *autofs4_root_lookup(struct inode *,struct dentry *);
+static int autofs4_dcache_readdir(struct file *, void *, filldir_t);
 
 struct file_operations autofs4_root_operations = {
-	open:		dcache_dir_open,
-	release:	dcache_dir_close,
-	llseek:		dcache_dir_lseek,
 	read:		generic_read_dir,
-	readdir:	dcache_readdir,
-	fsync:		dcache_dir_fsync,
+	readdir:	autofs4_root_readdir,
 	ioctl:		autofs4_root_ioctl,
 };
 
+struct file_operations autofs4_dir_operations = {
+	open:		autofs4_dir_open,
+	release:	autofs4_dir_close,
+	read:		generic_read_dir,
+	readdir:	autofs4_dir_readdir,
+};
+
 struct inode_operations autofs4_root_inode_operations = {
 	lookup:		autofs4_root_lookup,
 	unlink:		autofs4_dir_unlink,
@@ -54,10 +67,11 @@ struct inode_operations autofs4_dir_inod
 
 /* Update usage from here to top of tree, so that scan of
    top-level directories will give a useful result */
-static void autofs4_update_usage(struct dentry *dentry)
+static inline void autofs4_update_usage(struct dentry *dentry)
 {
 	struct dentry *top = dentry->d_sb->s_root;
 
+	spin_lock(&dcache_lock);
 	for(; dentry != top; dentry = dentry->d_parent) {
 		struct autofs_info *ino = autofs4_dentry_ino(dentry);
 
@@ -66,11 +80,213 @@ static void autofs4_update_usage(struct 
 			ino->last_used = jiffies;
 		}
 	}
+	spin_unlock(&dcache_lock);
+}
+
+static int autofs4_root_readdir(struct file *file, void *dirent, filldir_t filldir)
+{
+	struct autofs_sb_info *sbi = autofs4_sbi(file->f_dentry->d_sb);
+	int oz_mode = autofs4_oz_mode(sbi);
+
+	DPRINTK(("autofs4_root_readdir called, filp->f_pos = %lld\n", file->f_pos));
+
+	/*
+	 * Don't set reghost flag if:
+	 * 1) f_pos is larger than zero -- we've already been here.
+	 * 2) we haven't even enabled reghosting in the 1st place.
+	 * 3) this is the daemon doing a readdir
+	 */
+	if ( oz_mode && file->f_pos == 0 && sbi->reghost_enabled )
+		sbi->needs_reghost = 1;
+
+	DPRINTK(("autofs4_root_readdir: needs_reghost = %d\n", sbi->needs_reghost));
+
+	return autofs4_dcache_readdir(file, dirent, filldir);
+}
+
+/*
+ * From 2.4 kernel readdir.c
+ */
+static int autofs4_dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
+{
+	int i;
+	struct dentry *dentry = filp->f_dentry;
+
+	i = filp->f_pos;
+	switch (i) {
+		case 0:
+			if (filldir(dirent, ".", 1, i, dentry->d_inode->i_ino, DT_DIR) < 0)
+				break;
+			i++;
+			filp->f_pos++;
+			/* fallthrough */
+		case 1:
+			if (filldir(dirent, "..", 2, i, dentry->d_parent->d_inode->i_ino, DT_DIR) < 0)
+				break;
+			i++;
+			filp->f_pos++;
+			/* fallthrough */
+		default: {
+			struct list_head *list;
+			int j = i-2;
+
+			spin_lock(&dcache_lock);
+			list = dentry->d_subdirs.next;
+
+			for (;;) {
+				if (list == &dentry->d_subdirs) {
+					spin_unlock(&dcache_lock);
+					return 0;
+				}
+				if (!j)
+					break;
+				j--;
+				list = list->next;
+			}
+
+			while(1) {
+				struct dentry *de = list_entry(list, struct dentry, d_child);
+
+				if (!list_empty(&de->d_hash) && de->d_inode) {
+					spin_unlock(&dcache_lock);
+					if (filldir(dirent, de->d_name.name, de->d_name.len, filp->f_pos, de->d_inode->i_ino, DT_UNKNOWN) < 0)
+						break;
+					spin_lock(&dcache_lock);
+				}
+				filp->f_pos++;
+				list = list->next;
+				if (list != &dentry->d_subdirs)
+					continue;
+				spin_unlock(&dcache_lock);
+				break;
+			}
+		}
+	}
+	return 0;
+}
+
+static int autofs4_dir_open(struct inode *inode, struct file *file)
+{
+	struct dentry *dentry = file->f_dentry;
+	struct vfsmount *mnt = file->f_vfsmnt;
+	struct autofs_sb_info *sbi = autofs4_sbi(dentry->d_sb);
+	int status;
+
+	DPRINTK(("autofs4_dir_open: file=%p dentry=%p %.*s\n",
+		 file, dentry, dentry->d_name.len, dentry->d_name.name));
+
+	if (autofs4_oz_mode(sbi))
+		goto out;
+
+	if (autofs4_ispending(dentry)) {
+		DPRINTK(("autofs4_dir_open: dentry busy\n"));
+		return -EBUSY;
+	}
+
+	if (!d_mountpoint(dentry) && dentry->d_op && dentry->d_op->d_revalidate) {
+		int empty;
+
+		/* In case there are stale directory dentrys from a failed mount */
+		spin_lock(&dcache_lock);
+		empty = list_empty(&dentry->d_subdirs);
+		spin_unlock(&dcache_lock);
+
+		if (!empty)
+			d_invalidate(dentry);
+
+		status = (dentry->d_op->d_revalidate)(dentry, LOOKUP_CONTINUE);
+
+		if ( !status )
+			return -ENOENT;
+	}
+
+	if ( d_mountpoint(dentry) ) {
+		struct file *fp = NULL;
+		struct vfsmount *fp_mnt = mntget(mnt);
+		struct dentry *fp_dentry = dget(dentry);
+
+		while (follow_down(&fp_mnt, &fp_dentry) && d_mountpoint(fp_dentry));
+
+		fp = dentry_open(fp_dentry, fp_mnt, file->f_flags);
+		status = PTR_ERR(fp);
+		if ( IS_ERR(fp) ) {
+			file->private_data = NULL;
+			return status;
+		}
+		file->private_data = fp;
+	}
+out:
+	return 0;
+}
+
+static int autofs4_dir_close(struct inode *inode, struct file *file)
+{
+	struct dentry *dentry = file->f_dentry;
+	struct autofs_sb_info *sbi = autofs4_sbi(dentry->d_sb);
+
+	DPRINTK(("autofs4_dir_close: file=%p dentry=%p %.*s\n",
+		 file, dentry, dentry->d_name.len, dentry->d_name.name));
+
+	if ( autofs4_oz_mode(sbi) )
+		goto out;
+
+	if ( autofs4_ispending(dentry) ) {
+		DPRINTK(("autofs4_dir_close: dentry busy\n"));
+		return -EBUSY;
+	}
+
+	if ( d_mountpoint(dentry) ) {
+		struct file *fp = file->private_data;
+
+		if (!fp)
+			return -ENOENT;
+
+		filp_close(fp, current->files);
+		file->private_data = NULL;
+	}
+out:
+	return 0;
+}
+
+static int autofs4_dir_readdir(struct file *file, void *dirent, filldir_t filldir)
+{
+	struct dentry *dentry = file->f_dentry;
+	struct autofs_sb_info *sbi = autofs4_sbi(dentry->d_sb);
+	int status;
+
+	DPRINTK(("autofs4_readdir: file=%p dentry=%p %.*s\n",
+		 file, dentry, dentry->d_name.len, dentry->d_name.name));
+
+	if ( autofs4_oz_mode(sbi) )
+		goto out;
+
+	if ( autofs4_ispending(dentry) ) {
+		DPRINTK(("autofs4_readdir: dentry busy\n"));
+		return -EBUSY;
+	}
+
+	if ( d_mountpoint(dentry) ) {
+		struct file *fp = file->private_data;
+
+		if (!fp)
+			return -ENOENT;
+
+		if (!fp->f_op || !fp->f_op->readdir)
+			goto out;
+
+		status = vfs_readdir(fp, filldir, dirent);
+		file->f_pos = fp->f_pos;
+		if ( status )
+			autofs4_copy_atime(file, fp);
+		return status;
+	}
+out:
+	return autofs4_dcache_readdir(file, dirent, filldir);
 }
 
 static int try_to_fill_dentry(struct dentry *dentry, 
 			      struct super_block *sb,
-			      struct autofs_sb_info *sbi)
+			      struct autofs_sb_info *sbi, int flags)
 {
 	struct autofs_info *de_info = autofs4_dentry_ino(dentry);
 	int status = 0;
@@ -79,12 +295,11 @@ static int try_to_fill_dentry(struct den
            when expiration is done to trigger mount request with a new
            dentry */
 	if (de_info && (de_info->flags & AUTOFS_INF_EXPIRING)) {
-		DPRINTK(("try_to_fill_entry: waiting for expire %p name=%.*s, flags&PENDING=%s de_info=%p de_info->flags=%x\n",
-			 dentry, dentry->d_name.len, dentry->d_name.name, 
-			 dentry->d_flags & DCACHE_AUTOFS_PENDING?"t":"f",
-			 de_info, de_info?de_info->flags:0));
-		status = autofs4_wait(sbi, &dentry->d_name, NFY_NONE);
-		
+		DPRINTK(("try_to_fill_entry: waiting for expire %p name=%.*s\n",
+			 dentry, dentry->d_name.len, dentry->d_name.name));
+
+		status = autofs4_wait(sbi, dentry, NFY_NONE);
+
 		DPRINTK(("try_to_fill_entry: expire done status=%d\n", status));
 		
 		return 0;
@@ -94,12 +309,12 @@ static int try_to_fill_dentry(struct den
 		 dentry, dentry->d_name.len, dentry->d_name.name, dentry->d_inode));
 
 	/* Wait for a pending mount, triggering one if there isn't one already */
-	while(dentry->d_inode == NULL) {
-		DPRINTK(("try_to_fill_entry: waiting for mount name=%.*s, de_info=%p de_info->flags=%x\n",
-			 dentry->d_name.len, dentry->d_name.name, 
-			 de_info, de_info?de_info->flags:0));
-		status = autofs4_wait(sbi, &dentry->d_name, NFY_MOUNT);
-		 
+	if (dentry->d_inode == NULL) {
+		DPRINTK(("try_to_fill_entry: waiting for mount name=%.*s\n",
+			 dentry->d_name.len, dentry->d_name.name));
+
+		status = autofs4_wait(sbi, dentry, NFY_MOUNT);
+
 		DPRINTK(("try_to_fill_entry: mount done status=%d\n", status));
 
 		if (status && dentry->d_inode)
@@ -114,19 +329,22 @@ static int try_to_fill_dentry(struct den
 			/* Return a negative dentry, but leave it "pending" */
 			return 1;
 		}
-	}
+	/* Trigger mount for path component or follow link */
+	} else if ( flags & (LOOKUP_CONTINUE | LOOKUP_DIRECTORY) ||
+			current->link_count ) {
+		DPRINTK(("try_to_fill_entry: waiting for mount name=%.*s\n",
+			 dentry->d_name.len, dentry->d_name.name));
 
-	/* If this is an unused directory that isn't a mount point,
-	   bitch at the daemon and fix it in user space */
-	spin_lock(&dcache_lock);
-	if (S_ISDIR(dentry->d_inode->i_mode) &&
-	    !d_mountpoint(dentry) && 
-	    list_empty(&dentry->d_subdirs)) {
-		DPRINTK(("try_to_fill_entry: mounting existing dir\n"));
-		spin_unlock(&dcache_lock);
-		return autofs4_wait(sbi, &dentry->d_name, NFY_MOUNT) == 0;
+		dentry->d_flags |= DCACHE_AUTOFS_PENDING;
+		status = autofs4_wait(sbi, dentry, NFY_MOUNT);
+
+		DPRINTK(("try_to_fill_entry: mount done status=%d\n", status));
+
+		if ( status ) {
+			dentry->d_flags &= ~DCACHE_AUTOFS_PENDING;
+			return 0;
+		}
 	}
-	spin_unlock(&dcache_lock);
 
 	/* We don't update the usages for the autofs daemon itself, this
 	   is necessary for recursive autofs mounts */
@@ -137,46 +355,46 @@ static int try_to_fill_dentry(struct den
 	return 1;
 }
 
-
 /*
  * Revalidate is called on every cache lookup.  Some of those
  * cache lookups may actually happen while the dentry is not
  * yet completely filled in, and revalidate has to delay such
  * lookups..
  */
-static int autofs4_root_revalidate(struct dentry * dentry, int flags)
+static int autofs4_revalidate(struct dentry * dentry, int flags)
 {
 	struct inode * dir = dentry->d_parent->d_inode;
 	struct autofs_sb_info *sbi = autofs4_sbi(dir->i_sb);
-	struct autofs_info *ino;
 	int oz_mode = autofs4_oz_mode(sbi);
+	int status = 1;
+
+	DPRINTK(("autofs4_revalidate: dentry=%p %.*s flags=%d\n",
+		 dentry, dentry->d_name.len, dentry->d_name.name, flags));
 
 	/* Pending dentry */
 	if (autofs4_ispending(dentry)) {
-		if (autofs4_oz_mode(sbi))
-			return 1;
-		else
-			return try_to_fill_dentry(dentry, dir->i_sb, sbi);
+		if ( !oz_mode )
+			status = try_to_fill_dentry(dentry, dir->i_sb, sbi, flags);
+		return status;
 	}
 
 	/* Negative dentry.. invalidate if "old" */
-	if (dentry->d_inode == NULL)
-		return (dentry->d_time - jiffies <= AUTOFS_NEGATIVE_TIMEOUT);
-
-	ino = autofs4_dentry_ino(dentry);
+	if (dentry->d_inode == NULL) {
+		status = (dentry->d_time - jiffies <= AUTOFS_NEGATIVE_TIMEOUT);
+		return status;
+	}
 
 	/* Check for a non-mountpoint directory with no contents */
 	spin_lock(&dcache_lock);
 	if (S_ISDIR(dentry->d_inode->i_mode) &&
 	    !d_mountpoint(dentry) && 
 	    list_empty(&dentry->d_subdirs)) {
-		DPRINTK(("autofs_root_revalidate: dentry=%p %.*s, emptydir\n",
+		DPRINTK(("autofs4_revalidate: dentry=%p %.*s, emptydir\n",
 			 dentry, dentry->d_name.len, dentry->d_name.name));
 		spin_unlock(&dcache_lock);
-		if (oz_mode)
-			return 1;
-		else
-			return try_to_fill_dentry(dentry, dir->i_sb, sbi);
+		if (!oz_mode)
+			status = try_to_fill_dentry(dentry, dir->i_sb, sbi, flags);
+		return status;
 	}
 	spin_unlock(&dcache_lock);
 
@@ -184,25 +402,13 @@ static int autofs4_root_revalidate(struc
 	if (!oz_mode)
 		autofs4_update_usage(dentry);
 
-	return 1;
-}
-
-static int autofs4_revalidate(struct dentry *dentry, int flags)
-{
-	struct autofs_sb_info *sbi = autofs4_sbi(dentry->d_sb);
-
-	if (!autofs4_oz_mode(sbi))
-		autofs4_update_usage(dentry);
-
-	return 1;
+	return status;
 }
 
 static void autofs4_dentry_release(struct dentry *de)
 {
 	struct autofs_info *inf;
 
-	lock_kernel();
-
 	DPRINTK(("autofs4_dentry_release: releasing %p\n", de));
 
 	inf = autofs4_dentry_ino(de);
@@ -214,13 +420,11 @@ static void autofs4_dentry_release(struc
 
 		autofs4_free_ino(inf);
 	}
-
-	unlock_kernel();
 }
 
 /* For dentries of directories in the root dir */
 static struct dentry_operations autofs4_root_dentry_operations = {
-	d_revalidate:	autofs4_root_revalidate,
+	d_revalidate:	autofs4_revalidate,
 	d_release:	autofs4_dentry_release,
 };
 
@@ -235,7 +439,7 @@ static struct dentry_operations autofs4_
 static struct dentry *autofs4_dir_lookup(struct inode *dir, struct dentry *dentry)
 {
 #if 0
-	DPRINTK(("autofs_dir_lookup: ignoring lookup of %.*s/%.*s\n",
+	DPRINTK(("autofs4_dir_lookup: ignoring lookup of %.*s/%.*s\n",
 		 dentry->d_parent->d_name.len, dentry->d_parent->d_name.name,
 		 dentry->d_name.len, dentry->d_name.name));
 #endif
@@ -251,7 +455,7 @@ static struct dentry *autofs4_root_looku
 	struct autofs_sb_info *sbi;
 	int oz_mode;
 
-	DPRINTK(("autofs_root_lookup: name = %.*s\n", 
+	DPRINTK(("autofs4_root_lookup: name = %.*s\n", 
 		 dentry->d_name.len, dentry->d_name.name));
 
 	if (dentry->d_name.len > NAME_MAX)
@@ -260,7 +464,8 @@ static struct dentry *autofs4_root_looku
 	sbi = autofs4_sbi(dir->i_sb);
 
 	oz_mode = autofs4_oz_mode(sbi);
-	DPRINTK(("autofs_lookup: pid = %u, pgrp = %u, catatonic = %d, oz_mode = %d\n",
+
+	DPRINTK(("autofs4_root_lookup: pid = %u, pgrp = %u, catatonic = %d, oz_mode = %d\n",
 		 current->pid, current->pgrp, sbi->catatonic, oz_mode));
 
 	/*
@@ -291,8 +496,15 @@ static struct dentry *autofs4_root_looku
 	 * a signal. If so we can force a restart..
 	 */
 	if (dentry->d_flags & DCACHE_AUTOFS_PENDING) {
-		if (signal_pending(current))
-			return ERR_PTR(-ERESTARTNOINTR);
+		/* See if we were interrupted */
+		if (signal_pending(current)) {
+			sigset_t *sigset = &current->pending.signal;
+			if (sigismember (sigset, SIGKILL) ||
+			    sigismember (sigset, SIGQUIT) ||
+			    sigismember (sigset, SIGINT)) {
+			    return ERR_PTR(-ERESTARTNOINTR);
+			}
+		}
 	}
 
 	/*
@@ -316,7 +528,7 @@ static int autofs4_dir_symlink(struct in
 	struct inode *inode;
 	char *cp;
 
-	DPRINTK(("autofs_dir_symlink: %s <- %.*s\n", symname, 
+	DPRINTK(("autofs4_dir_symlink: %s <- %.*s\n", symname, 
 		 dentry->d_name.len, dentry->d_name.name));
 
 	if (!autofs4_oz_mode(sbi))
@@ -366,7 +578,7 @@ static int autofs4_dir_symlink(struct in
  * If a process is blocked on the dentry waiting for the expire to finish,
  * it will invalidate the dentry and try to mount with a new one.
  *
- * Also see autofs_dir_rmdir().. 
+ * Also see autofs4_dir_rmdir().. 
  */
 static int autofs4_dir_unlink(struct inode *dir, struct dentry *dentry)
 {
@@ -416,8 +628,6 @@ static int autofs4_dir_rmdir(struct inod
 	return 0;
 }
 
-
-
 static int autofs4_dir_mkdir(struct inode *dir, struct dentry *dentry, int mode)
 {
 	struct autofs_sb_info *sbi = autofs4_sbi(dir->i_sb);
@@ -427,7 +637,7 @@ static int autofs4_dir_mkdir(struct inod
 	if ( !autofs4_oz_mode(sbi) )
 		return -EACCES;
 
-	DPRINTK(("autofs_dir_mkdir: dentry %p, creating %.*s\n",
+	DPRINTK(("autofs4_dir_mkdir: dentry %p, creating %.*s\n",
 		 dentry, dentry->d_name.len, dentry->d_name.name));
 
 	ino = autofs4_init_ino(ino, sbi, S_IFDIR | 0555);
@@ -451,6 +661,19 @@ static int autofs4_dir_mkdir(struct inod
 	return 0;
 }
 
+/* 
+ * Identify autofs_dentries - this is so we can tell if there's
+ * an extra dentry refcount or not.  We only hold a refcount on the
+ * dentry if its non-negative (ie, d_inode != NULL)
+ */
+int is_autofs4_dentry(struct dentry *dentry)
+{
+	return dentry && dentry->d_inode &&
+		(dentry->d_op == &autofs4_root_dentry_operations ||
+		 dentry->d_op == &autofs4_dentry_operations) &&
+		dentry->d_fsdata != NULL;
+}
+
 /* Get/set timeout ioctl() operation */
 static inline int autofs4_get_set_timeout(struct autofs_sb_info *sbi,
 					 unsigned long *p)
@@ -476,16 +699,65 @@ static inline int autofs4_get_protover(s
 	return put_user(sbi->version, p);
 }
 
-/* Identify autofs_dentries - this is so we can tell if there's
-   an extra dentry refcount or not.  We only hold a refcount on the
-   dentry if its non-negative (ie, d_inode != NULL)
-*/
-int is_autofs4_dentry(struct dentry *dentry)
+/* Return protocol sub version */
+static inline int autofs4_get_protosubver(struct autofs_sb_info *sbi, int *p)
 {
-	return dentry && dentry->d_inode &&
-		(dentry->d_op == &autofs4_root_dentry_operations ||
-		 dentry->d_op == &autofs4_dentry_operations) &&
-		dentry->d_fsdata != NULL;
+	return put_user(sbi->sub_version, p);
+}
+
+/*
+ * Tells the daemon whether we need to reghost or not. Also, clears
+ * the reghost_needed flag.
+ */
+static inline int autofs4_ask_reghost(struct autofs_sb_info *sbi, int *p)
+{
+	int status;
+
+	DPRINTK(("autofs_ask_reghost: returning %d\n", sbi->needs_reghost));
+
+	status = put_user(sbi->needs_reghost, p);
+	if ( status )
+		return status;
+
+	 sbi->needs_reghost = 0;
+	 return 0;
+}
+
+/*
+ * Enable / Disable reghosting ioctl() operation
+ */
+static inline int autofs4_toggle_reghost(struct autofs_sb_info *sbi, int *p)
+{
+	int status;
+	int val;
+
+	status = get_user(val, p);
+
+	DPRINTK(("autofs4_toggle_reghost: reghost = %d\n", val));
+
+	if (status)
+		return status;
+
+	/* turn on/off reghosting, with the val */
+	sbi->reghost_enabled = val;
+	return 0;
+}
+
+/*
+ * Tells the daemon whether we can umaont the autofs mount.
+ */
+static inline int autofs4_ask_umount(struct vfsmount *mnt, int *p)
+{
+	int status = 0;
+
+	if (may_umount(mnt) == 0)
+		status = 1;
+
+	DPRINTK(("autofs_ask_umount: returning %d\n", status));
+
+	status = put_user(status, p);
+
+	return status;
 }
 
 /*
@@ -497,7 +769,7 @@ static int autofs4_root_ioctl(struct ino
 {
 	struct autofs_sb_info *sbi = autofs4_sbi(inode->i_sb);
 
-	DPRINTK(("autofs_ioctl: cmd = 0x%08x, arg = 0x%08lx, sbi = %p, pgrp = %u\n",
+	DPRINTK(("autofs4_ioctl: cmd = 0x%08x, arg = 0x%08lx, sbi = %p, pgrp = %u\n",
 		 cmd,arg,sbi,current->pgrp));
 
 	if ( _IOC_TYPE(cmd) != _IOC_TYPE(AUTOFS_IOC_FIRST) ||
@@ -517,9 +789,19 @@ static int autofs4_root_ioctl(struct ino
 		return 0;
 	case AUTOFS_IOC_PROTOVER: /* Get protocol version */
 		return autofs4_get_protover(sbi, (int *)arg);
+	case AUTOFS_IOC_PROTOSUBVER: /* Get protocol sub version */
+		return autofs4_get_protosubver(sbi, (int *) arg);
 	case AUTOFS_IOC_SETTIMEOUT:
 		return autofs4_get_set_timeout(sbi,(unsigned long *)arg);
 
+	case AUTOFS_IOC_TOGGLEREGHOST:
+		return autofs4_toggle_reghost(sbi, (int *) arg);
+	case AUTOFS_IOC_ASKREGHOST:
+		return autofs4_ask_reghost(sbi, (int *) arg);
+
+	case AUTOFS_IOC_ASKUMOUNT:
+		return autofs4_ask_umount(filp->f_vfsmnt, (int *) arg);
+
 	/* return a single thing to expire */
 	case AUTOFS_IOC_EXPIRE:
 		return autofs4_expire_run(inode->i_sb,filp->f_vfsmnt,sbi,
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/autofs4/waitq.c linux-2.4.20-wolk4.16-fullkernel/fs/autofs4/waitq.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/autofs4/waitq.c	2001-02-09 20:29:44.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/fs/autofs4/waitq.c	2004-09-05 16:06:17.000000000 +0200
@@ -3,6 +3,7 @@
  * linux/fs/autofs/waitq.c
  *
  *  Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved
+ *  Copyright 2001-2003 Ian Kent <raven@themaw.net>
  *
  * This file is part of the Linux kernel and is made available under
  * the terms of the GNU General Public License, version 2, or at your
@@ -27,7 +28,7 @@ void autofs4_catatonic_mode(struct autof
 {
 	struct autofs_wait_queue *wq, *nwq;
 
-	DPRINTK(("autofs: entering catatonic mode\n"));
+	DPRINTK(("autofs4: entering catatonic mode\n"));
 
 	sbi->catatonic = 1;
 	wq = sbi->queues;
@@ -35,9 +36,11 @@ void autofs4_catatonic_mode(struct autof
 	while ( wq ) {
 		nwq = wq->next;
 		wq->status = -ENOENT; /* Magic is gone - report failure */
-		kfree(wq->name);
-		wq->name = NULL;
-		wake_up(&wq->queue);
+		if ( wq->name ) {
+			kfree(wq->name);
+			wq->name = NULL;
+		}
+		wake_up_interruptible(&wq->queue);
 		wq = nwq;
 	}
 	if (sbi->pipe) {
@@ -90,8 +93,8 @@ static void autofs4_notify_daemon(struct
 	union autofs_packet_union pkt;
 	size_t pktsz;
 
-	DPRINTK(("autofs_notify: wait id = 0x%08lx, name = %.*s, type=%d\n",
-		 wq->wait_queue_token, wq->len, wq->name, type));
+	DPRINTK(("autofs4_notify: wait id = 0x%08lx, name = %.*s, type=%d\n",
+		(unsigned long) wq->wait_queue_token, wq->len, wq->name, type));
 
 	memset(&pkt,0,sizeof pkt); /* For security reasons */
 
@@ -116,7 +119,7 @@ static void autofs4_notify_daemon(struct
 		memcpy(ep->name, wq->name, wq->len);
 		ep->name[wq->len] = '\0';
 	} else {
-		printk("autofs_notify_daemon: bad type %d!\n", type);
+		printk("autofs4_notify_daemon: bad type %d!\n", type);
 		return;
 	}
 
@@ -124,62 +127,107 @@ static void autofs4_notify_daemon(struct
 		autofs4_catatonic_mode(sbi);
 }
 
-int autofs4_wait(struct autofs_sb_info *sbi, struct qstr *name,
+static int autofs4_getpath(struct autofs_sb_info *sbi,
+			   struct dentry *dentry, char **name)
+{
+	struct dentry *root = sbi->sb->s_root;
+	struct dentry *tmp;
+	char *buf = *name;
+	char *p;
+	int len = 0;
+
+	spin_lock(&dcache_lock);
+	for (tmp = dentry ; tmp != root ; tmp = tmp->d_parent)
+		len += tmp->d_name.len + 1;
+
+	if (--len > NAME_MAX) {
+		spin_unlock(&dcache_lock);
+		return 0;
+	}
+
+	*(buf + len) = '\0';
+	p = buf + len - dentry->d_name.len;
+	strncpy(p, dentry->d_name.name, dentry->d_name.len);
+
+	for (tmp = dentry->d_parent; tmp != root ; tmp = tmp->d_parent) {
+		*(--p) = '/';
+		p -= tmp->d_name.len;
+		strncpy(p, tmp->d_name.name, tmp->d_name.len);
+	}
+	spin_unlock(&dcache_lock);
+
+	return len;
+}
+
+int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
 		enum autofs_notify notify)
 {
 	struct autofs_wait_queue *wq;
-	int status;
+	char *name;
+	int len, status;
 
 	/* In catatonic mode, we don't wait for nobody */
-	if ( sbi->catatonic )
+	if (sbi->catatonic)
 		return -ENOENT;
-	
-	/* We shouldn't be able to get here, but just in case */
-	if ( name->len > NAME_MAX )
+
+	name = kmalloc(NAME_MAX + 1, GFP_KERNEL);
+	if (!name)
+		return -ENOMEM;
+
+	len = autofs4_getpath(sbi, dentry, &name);
+	if (!len) {
+		kfree(name);
 		return -ENOENT;
+	}
+
+	if (down_interruptible(&sbi->wq_sem)) {
+		kfree(name);
+		return -EINTR;
+	}
 
 	for ( wq = sbi->queues ; wq ; wq = wq->next ) {
-		if ( wq->hash == name->hash &&
-		     wq->len == name->len &&
-		     wq->name && !memcmp(wq->name,name->name,name->len) )
+		if ( wq->hash == dentry->d_name.hash &&
+		     wq->len == len &&
+		     wq->name && !memcmp(wq->name, name, len) )
 			break;
 	}
 	
 	if ( !wq ) {
 		/* Create a new wait queue */
-		wq = kmalloc(sizeof(struct autofs_wait_queue),GFP_KERNEL);
-		if ( !wq )
-			return -ENOMEM;
-
-		wq->name = kmalloc(name->len,GFP_KERNEL);
-		if ( !wq->name ) {
-			kfree(wq);
+		wq = kmalloc(sizeof(struct autofs_wait_queue), GFP_KERNEL);
+		if ( !wq ) {
+			kfree(name);
+			up(&sbi->wq_sem);
 			return -ENOMEM;
 		}
+
 		wq->wait_queue_token = autofs4_next_wait_queue;
 		if (++autofs4_next_wait_queue == 0)
 			autofs4_next_wait_queue = 1;
-		init_waitqueue_head(&wq->queue);
-		wq->hash = name->hash;
-		wq->len = name->len;
-		wq->status = -EINTR; /* Status return if interrupted */
-		memcpy(wq->name, name->name, name->len);
 		wq->next = sbi->queues;
 		sbi->queues = wq;
+		init_waitqueue_head(&wq->queue);
+		wq->hash = dentry->d_name.hash;
+		wq->name = name;
+		wq->len = len;
+		wq->status = -EINTR; /* Status return if interrupted */
+		atomic_set(&wq->wait_ctr, 2);
+		up(&sbi->wq_sem);
 
-		DPRINTK(("autofs_wait: new wait id = 0x%08lx, name = %.*s, nfy=%d\n",
-			 wq->wait_queue_token, wq->len, wq->name, notify));
+		DPRINTK(("autofs4_wait: new wait id = 0x%08lx, name = %.*s, nfy=%d\n",
+			(unsigned long) wq->wait_queue_token, wq->len, wq->name, notify));
 		/* autofs4_notify_daemon() may block */
-		wq->wait_ctr = 2;
 		if (notify != NFY_NONE) {
 			autofs4_notify_daemon(sbi,wq, 
-					      notify == NFY_MOUNT ? autofs_ptype_missing :
-								    autofs_ptype_expire_multi);
+				notify == NFY_MOUNT ? 
+					autofs_ptype_missing :
+				       	autofs_ptype_expire_multi);
 		}
 	} else {
-		wq->wait_ctr++;
-		DPRINTK(("autofs_wait: existing wait id = 0x%08lx, name = %.*s, nfy=%d\n",
-			 wq->wait_queue_token, wq->len, wq->name, notify));
+		atomic_inc(&wq->wait_ctr);
+		up(&sbi->wq_sem);
+		DPRINTK(("autofs4_wait: existing wait id = 0x%08lx, name = %.*s, nfy=%d\n",
+			(unsigned long) wq->wait_queue_token, wq->len, wq->name, notify));
 	}
 
 	/* wq->name is NULL if and only if the lock is already released */
@@ -204,7 +252,7 @@ int autofs4_wait(struct autofs_sb_info *
 		recalc_sigpending(current);
 		spin_unlock_irqrestore(&current->sigmask_lock, irqflags);
 
-		interruptible_sleep_on(&wq->queue);
+		wait_event_interruptible(wq->queue, wq->name == NULL);
 
 		spin_lock_irqsave(&current->sigmask_lock, irqflags);
 		current->blocked = oldset;
@@ -216,7 +264,8 @@ int autofs4_wait(struct autofs_sb_info *
 
 	status = wq->status;
 
-	if (--wq->wait_ctr == 0)	/* Are we the last process to need status? */
+	/* Are we the last process to need status? */
+	if (atomic_dec_and_test(&wq->wait_ctr))
 		kfree(wq);
 
 	return status;
@@ -227,23 +276,29 @@ int autofs4_wait_release(struct autofs_s
 {
 	struct autofs_wait_queue *wq, **wql;
 
+	down(&sbi->wq_sem);
 	for ( wql = &sbi->queues ; (wq = *wql) ; wql = &wq->next ) {
 		if ( wq->wait_queue_token == wait_queue_token )
 			break;
 	}
-	if ( !wq )
+
+	if ( !wq ) {
+		up(&sbi->wq_sem);
 		return -EINVAL;
+	}
 
 	*wql = wq->next;	/* Unlink from chain */
+	up(&sbi->wq_sem);
 	kfree(wq->name);
 	wq->name = NULL;	/* Do not wait on this queue */
 
 	wq->status = status;
 
-	if (--wq->wait_ctr == 0)	/* Is anyone still waiting for this guy? */
+	/* Is anyone still waiting for this guy? */
+	if (atomic_dec_and_test(&wq->wait_ctr))
 		kfree(wq);
 	else
-		wake_up(&wq->queue);
+		wake_up_interruptible(&wq->queue);
 
 	return 0;
 }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/binfmt_elf.c linux-2.4.20-wolk4.16-fullkernel/fs/binfmt_elf.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/binfmt_elf.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/binfmt_elf.c	2004-09-05 17:09:43.000000000 +0200
@@ -105,7 +105,7 @@ static void set_brk(unsigned long start,
 
 #ifdef CONFIG_GRKERNSEC_PAX_RANDEXEC
 	if (current->flags & PF_PAX_RANDEXEC)
-		__do_mmap_pgoff(NULL, ELF_PAGEALIGN(start + current->mm->delta_exec), 0UL, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_FIXED | MAP_MIRROR, start);
+		__do_mmap_pgoff(current->mm, NULL, ELF_PAGEALIGN(start + current->mm->delta_exec), 0UL, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_FIXED | MAP_MIRROR, start);
 #endif
 
 }
@@ -897,8 +897,6 @@ static int load_elf_binary(struct linux_
 	}
 #endif
 
-	gr_set_pax_flags(current);	
-
 	elf_entry = (unsigned long) elf_ex.e_entry;
 
 	/* Do this so that we can load the interpreter, if need be.  We will
@@ -983,7 +981,7 @@ static int load_elf_binary(struct linux_
 				if (len > SEGMEXEC_TASK_SIZE || addr > SEGMEXEC_TASK_SIZE-len)
 					continue;
 				down_write(&current->mm->mmap_sem);
-				error = __do_mmap_pgoff(bprm->file, addr, len, elf_prot, elf_flags, (elf_ppnt->p_offset - ELF_PAGEOFFSET(elf_ppnt->p_vaddr)) >> PAGE_SHIFT);
+				error = __do_mmap_pgoff(current->mm, bprm->file, addr, len, elf_prot, elf_flags, (elf_ppnt->p_offset - ELF_PAGEOFFSET(elf_ppnt->p_vaddr)) >> PAGE_SHIFT);
 				up_write(&current->mm->mmap_sem);
 			}
 #endif
@@ -1011,14 +1009,14 @@ static int load_elf_binary(struct linux_
 #ifdef CONFIG_GRKERNSEC_PAX_SEGMEXEC
 			if (current->flags & PF_PAX_SEGMEXEC) {
 				if (elf_prot & PROT_EXEC) {
-					load_addr_random = __do_mmap_pgoff(NULL, ELF_PAGESTART(load_bias_random + vaddr), elf_ppnt->p_memsz + ELF_PAGEOFFSET(elf_ppnt->p_vaddr), PROT_NONE, MAP_PRIVATE | MAP_FIXED, 0UL);
+					load_addr_random = __do_mmap_pgoff(current->mm, NULL, ELF_PAGESTART(load_bias_random + vaddr), elf_ppnt->p_memsz + ELF_PAGEOFFSET(elf_ppnt->p_vaddr), PROT_NONE, MAP_PRIVATE | MAP_FIXED, 0UL);
 					if (!BAD_ADDR(load_addr_random)) {
-						load_addr_random = __do_mmap_pgoff(NULL, ELF_PAGESTART(load_bias_random + vaddr + SEGMEXEC_TASK_SIZE), 0UL, elf_prot, elf_flags | MAP_MIRROR, error);
+						load_addr_random = __do_mmap_pgoff(current->mm, NULL, ELF_PAGESTART(load_bias_random + vaddr + SEGMEXEC_TASK_SIZE), 0UL, elf_prot, elf_flags | MAP_MIRROR, error);
 						if (!BAD_ADDR(load_addr_random))
 							load_addr_random -= SEGMEXEC_TASK_SIZE;
 					}
 				} else
-					load_addr_random = __do_mmap_pgoff(NULL, ELF_PAGESTART(load_bias_random + vaddr), 0UL, elf_prot, elf_flags | MAP_MIRROR, error);
+					load_addr_random = __do_mmap_pgoff(current->mm, NULL, ELF_PAGESTART(load_bias_random + vaddr), 0UL, elf_prot, elf_flags | MAP_MIRROR, error);
 			}
 #endif
 
@@ -1079,7 +1077,7 @@ static int load_elf_binary(struct linux_
 #endif
 
 	if (current->flags & PF_PAX_RANDMMAP)
-		elf_brk += pax_delta_mask(get_random_long(), 4, PAGE_SHIFT);
+		elf_brk += PAGE_SIZE + pax_delta_mask(get_random_long(), 4, PAGE_SHIFT);
 #undef pax_delta_mask
 #endif
 
@@ -1302,7 +1300,7 @@ out:
  * These are the only things you should do on a core-file: use only these
  * functions to write out all the necessary info.
  */
-static int dump_write(struct file *file, const void *addr, int nr)
+static int dump_write(struct file *file, const void *addr, size_t nr)
 {
 	return file->f_op->write(file, addr, nr, &file->f_pos) == nr;
 }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/buffer.c linux-2.4.20-wolk4.16-fullkernel/fs/buffer.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/buffer.c	2004-06-29 11:32:00.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/buffer.c	2004-09-05 16:09:21.000000000 +0200
@@ -167,7 +167,6 @@ void unlock_buffer(struct buffer_head *b
 {
 	clear_bit(BH_Wait_IO, &bh->b_state);
 	clear_bit(BH_Launder, &bh->b_state);
-	clear_bit(BH_Atomic, &bh->b_state);
 	/*
 	 * When a locked buffer is visible to the I/O layer BH_Launder
 	 * is set. This means before unlocking we must clear BH_Launder,
@@ -396,6 +395,7 @@ int sync_buffers(kdev_t dev, int wait)
 	}
 	return err;
 }
+EXPORT_SYMBOL(sync_buffers);
 
 int fsync_super(struct super_block *sb)
 {
@@ -1356,8 +1356,9 @@ struct buffer_head * get_unused_buffer_h
 
 	/*
 	 * If we need an async buffer, use the reserved buffer heads.
+	 * Non-PF_MEMALLOC tasks can just loop in create_buffers().
 	 */
-	if (async) {
+	if (async && (current->flags & PF_MEMALLOC)) {
 		spin_lock(&unused_list_lock);
 		if (unused_list) {
 			bh = unused_list;
@@ -2495,7 +2496,6 @@ int brw_kiovec(int rw, int nr, struct ki
 	struct page *	map;
 	struct buffer_head *tmp, **bhs = NULL;
 	int iosize = size;
-	unsigned int	atomic_seq;
 
 	if (!nr)
 		return 0;
@@ -2512,10 +2512,6 @@ int brw_kiovec(int rw, int nr, struct ki
 			panic("brw_kiovec: iobuf not initialised");
 	}
 
-	atomic_seq = 0;
-	if (rw == WRITE)
-		atomic_seq = blk_get_atomic_seq();
-
 	/* 
 	 * OK to walk down the iovec doing page IO on each page we find. 
 	 */
@@ -2572,8 +2568,7 @@ int brw_kiovec(int rw, int nr, struct ki
 				init_buffer(tmp, end_buffer_io_kiobuf, iobuf);
 				tmp->b_dev = dev;
 				tmp->b_blocknr = blocknr;
-				tmp->b_state = (1 << BH_Mapped) | (1 << BH_Lock) | (1 << BH_Req) | (1 << BH_Atomic);
-				bh_elv_seq(tmp) = atomic_seq;
+				tmp->b_state = (1 << BH_Mapped) | (1 << BH_Lock) | (1 << BH_Req);
 
 				if (rw == WRITE) {
 					set_bit(BH_Uptodate, &tmp->b_state);
@@ -2591,16 +2586,12 @@ int brw_kiovec(int rw, int nr, struct ki
 				 * Wait for IO if we have got too much 
 				 */
 				if (bhind >= KIO_MAX_SECTORS) {
-					if (atomic_seq)
-						blk_refile_atomic_queue(atomic_seq);
 					kiobuf_wait_for_io(iobuf); /* wake-one */
 					err = wait_kio(rw, bhind, bhs, size);
 					if (err >= 0)
 						transferred += err;
 					else
 						goto finished;
-					if (rw == WRITE)
-						atomic_seq = blk_get_atomic_seq();
 					bhind = 0;
 				}
 
@@ -2619,12 +2610,12 @@ int brw_kiovec(int rw, int nr, struct ki
 
 	/* Is there any IO still left to submit? */
 	if (bhind) {
-		if (atomic_seq)
-			blk_refile_atomic_queue(atomic_seq);
 		kiobuf_wait_for_io(iobuf); /* wake-one */
 		err = wait_kio(rw, bhind, bhs, size);
 		if (err >= 0)
 			transferred += err;
+		else
+			goto finished;
 	}
 
  finished:
@@ -3391,7 +3382,6 @@ int brw_kvec_async(int rw, kvec_cb_t cb,
 	int		length;
 	unsigned	sector_size = 1 << sector_shift;
 	int		i;
-	unsigned int	atomic_seq;
 	int		dovary = cb.dovary;
 	int		iosize;
 
@@ -3434,10 +3424,6 @@ int brw_kvec_async(int rw, kvec_cb_t cb,
 	brw_cb->cb = cb;
 	brw_cb->nr = 0;
 
-	atomic_seq = 0;
-	if (rw == WRITE)
-		atomic_seq = blk_get_atomic_seq();
-
 	/* This is ugly.  FIXME. */
 	for (i=0, veclet=vec->veclet; i<vec->nr; i++,veclet++) {
 		struct page *page = veclet->page;
@@ -3470,9 +3456,8 @@ int brw_kvec_async(int rw, kvec_cb_t cb,
 			tmp->b_dev = dev;
 			tmp->b_blocknr = blknr;
 			blknr += iosize >> sector_shift;
-			tmp->b_state = (1 << BH_Mapped) | (1 << BH_Lock) |
-				       (1 << BH_Req) | (1 << BH_Atomic);
-			bh_elv_seq(tmp) = atomic_seq;
+			tmp->b_state = (1 << BH_Mapped) | (1 << BH_Lock)
+					| (1 << BH_Req);
 			tmp->b_private = brw_cb;
 
 			if (rw == WRITE) {
@@ -3505,8 +3490,6 @@ submit:
 			submit_bh(rw, brw_cb->bh[i]);
 	}
 	brw_cb_put(brw_cb);
-	if (atomic_seq)
-		blk_refile_atomic_queue(atomic_seq);
 
 	return 0;
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/cifs/AUTHORS linux-2.4.20-wolk4.16-fullkernel/fs/cifs/AUTHORS
--- linux-2.4.20-wolk4.15-fullkernel/fs/cifs/AUTHORS	2004-06-29 11:24:22.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/cifs/AUTHORS	2004-09-05 15:47:54.000000000 +0200
@@ -21,10 +21,17 @@ Zwane Mwaikambo
 Andi Kleen
 Amrut Joshi
 Shobhit Dayal
+Sergey Vlasov
+Richard Hughes
+Yury Umanets
 
 Test case and Bug Report contributors
 -------------------------------------
 Thanks to those in the community who have submitted detailed bug reports
 and debug of problems they have found:  Jochen Dolze, David Blaine,
-Rene Scharfe, Martin Josefsson, Alexander Wild and others. 
+Rene Scharfe, Martin Josefsson, Alexander Wild, Anthony Liguori,
+Lars Muller, Urban Widmark, Massimiliano Ferrero, Howard Owen,
+Olaf Kirch, Kieron Briggs, Nick Millington and others. 
 
+And thanks to the IBM LTC and Power test teams and SuSE testers for
+finding multiple bugs during excellent stress test runs.
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/cifs/CHANGES linux-2.4.20-wolk4.16-fullkernel/fs/cifs/CHANGES
--- linux-2.4.20-wolk4.15-fullkernel/fs/cifs/CHANGES	2004-06-29 11:24:22.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/cifs/CHANGES	2004-09-05 15:47:54.000000000 +0200
@@ -1,3 +1,132 @@
+Version 1.20
+------------
+Make transaction counts more consistent. Merge /proc/fs/cifs/SimultaneousOps
+info into /proc/fs/cifs/DebugData.  Fix oops in rare oops in readdir 
+(in build_wildcard_path_from_dentry).  Fix mknod to pass type field
+(block/char/fifo) properly.  Remove spurious mount warning log entry when
+credentials passed as mount argument. Set major/minor device number in
+inode for block and char devices when unix extensions enabled.
+
+Version 1.19
+------------
+Fix /proc/fs/cifs/Stats and DebugData display to handle larger
+amounts of return data. Properly limit requests to MAX_REQ (50
+is the usual maximum active multiplex SMB/CIFS requests per server).
+Do not kill cifsd (and thus hurt the other SMB session) when more than one
+session to the same server (but with different userids) exists and one
+of the two user's smb sessions is being removed while leaving the other.
+Do not loop reconnecting in cifsd demultiplex thread when admin
+kills the thread without going through unmount.
+
+Version 1.18
+------------
+Do not rename hardlinked files (since that should be a noop). Flush
+cached write behind data when reopening a file after session abend,
+except when already in write. Grab per socket sem during reconnect 
+to avoid oops in sendmsg if overlapping with reconnect. Do not
+reset cached inode file size on readdir for files open for write on 
+client.
+
+
+Version 1.17
+------------
+Update number of blocks in file so du command is happier (in Linux a fake
+blocksize of 512 is required for calculating number of blocks in inode).
+Fix prepare write of partial pages to read in data from server if possible.
+Fix race on tcpStatus field between unmount and reconnection code, causing
+cifsd process sometimes to hang around forever. Improve out of memory
+checks in cifs_filldir
+
+Version 1.16
+------------
+Fix incorrect file size in file handle based setattr on big endian hardware.
+Fix oops in build_path_from_dentry when out of memory.  Add checks for invalid
+and closing file structs in writepage/partialpagewrite.  Add statistics
+for each mounted share (new menuconfig option). Fix endianness problem in
+volume information displayed in /proc/fs/cifs/DebugData (only affects
+affects big endian architectures). Prevent renames while constructing
+path names for open, mkdir and rmdir.
+
+Version 1.15
+------------
+Change to mempools for alloc smb request buffers and multiplex structs
+to better handle low memory problems (and potential deadlocks).
+
+Version 1.14
+------------
+Fix incomplete listings of large directories on Samba servers when Unix
+extensions enabled.  Fix oops when smb_buffer can not be allocated. Fix
+rename deadlock when writing out dirty pages at same time.
+
+Version 1.13
+------------
+Fix open of files in which O_CREATE can cause the mode to change in
+some cases. Fix case in which retry of write overlaps file close.
+Fix PPC64 build error.  Reduce excessive stack usage in smb password
+hashing. Fix overwrite of Linux user's view of file mode to Windows servers.
+
+Version 1.12
+------------
+Fixes for large file copy, signal handling, socket retry, buffer
+allocation and low memory situations.
+
+Version 1.11
+------------
+Better port 139 support to Windows servers (RFC1001/RFC1002 Session_Initialize)
+also now allowing support for specifying client netbiosname.  NT4 support added.
+
+Version 1.10
+------------
+Fix reconnection (and certain failed mounts) to properly wake up the
+blocked users thread so it does not seem hung (in some cases was blocked
+until the cifs receive timeout expired). Fix spurious error logging
+to kernel log when application with open network files killed. 
+
+Version 1.09
+------------
+Fix /proc/fs module unload warning message (that could be logged
+to the kernel log). Fix intermittent failure in connectathon
+test7 (hardlink count not immediately refreshed in case in which
+inode metadata can be incorrectly kept cached when time near zero)
+
+Version 1.08
+------------
+Allow file_mode and dir_mode (specified at mount time) to be enforced
+locally (the server already enforced its own ACLs too) for servers
+that do not report the correct mode (do not support the 
+CIFS Unix Extensions).
+
+Version 1.07
+------------
+Fix some small memory leaks in some unmount error paths. Fix major leak
+of cache pages in readpages causing multiple read oriented stress
+testcases (including fsx, and even large file copy) to fail over time. 
+
+Version 1.06
+------------
+Send NTCreateX with ATTR_POSIX if Linux/Unix extensions negotiated with server.
+This allows files that differ only in case and improves performance of file
+creation and file open to such servers.  Fix semaphore conflict which causes 
+slow delete of open file to Samba (which unfortunately can cause an oplock
+break to self while vfs_unlink held i_sem) which can hang for 20 seconds.
+
+Version 1.05
+------------
+fixes to cifs_readpages for fsx test case
+
+Version 1.04
+------------
+Fix caching data integrity bug when extending file size especially when no
+oplock on file.  Fix spurious logging of valid already parsed mount options
+that are parsed outside of the cifs vfs such as nosuid.
+
+
+Version 1.03
+------------
+Connect to server when port number override not specified, and tcp port
+unitialized.  Reset search to restart at correct file when kernel routine
+filldir returns error during large directory searches (readdir). 
+
 Version 1.02
 ------------
 Fix caching problem when files opened by multiple clients in which 
@@ -5,9 +134,7 @@ page cache could contain stale data, and
 not occur often enough while file was still open when read ahead
 (read oplock) not allowed.  Treat "sep=" when first mount option
 as an overrride of comma as the default separator between mount
-options. Fix 2.4 specific problems with overflow of time conversion
-causing incorrect file dates and times, and also with opens which
-specify O_CREAT | O_EXCL failing unnecessarily.
+options. 
 
 Version 1.01
 ------------
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/cifs/README linux-2.4.20-wolk4.16-fullkernel/fs/cifs/README
--- linux-2.4.20-wolk4.15-fullkernel/fs/cifs/README	2004-06-29 11:24:22.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/cifs/README	2004-09-05 15:47:54.000000000 +0200
@@ -63,7 +63,19 @@ domain to the proper network user.  The 
 trivially built from Samba 3.0 or later source e.g. by executing:
 
 	gcc samba/source/client/mount.cifs.c -o mount.cifs
-	
+
+Note that when the mount.cifs utility is run suid (allowing user mounts), 
+in order to reduce risks, the "nosuid" mount flag is passed in on mount to
+disallow execution of an suid program mounted on the remote target.
+When mount is executed as root, nosuid is not passed in by default,
+and execution of suid programs on the remote target would be enabled
+by default. This can be changed, as with nfs and other filesystems, 
+by simply specifying "nosuid" among the mount options. For user mounts 
+though to be able to pass the suid flag to mount requires rebuilding 
+mount.cifs with the following flag: 
+ 
+        gcc samba/source/client/mount.cifs.c -DCIFS_ALLOW_USR_SUID -o mount.cifs
+
 There is a corresponding manual page for cifs mounting in the Samba 3.0 and
 later source tree in docs/manpages/mount.cifs.8 
 
@@ -85,16 +97,31 @@ Linux: 
 
 	case sensitive = yes
 	delete readonly = yes 
- 
+	ea support = yes
+
+Note that ea support is required for supporting Linux xattrs. 
 Some administrators also change the "map archive" and the "create mask" 
-parameters from their default values.  Creating special devices (mknod) remotely 
-may require specifying a mkdev function to Samba.  For more information on these 
-see the manual pages ("man smb.conf") on the Samba server system.  Note that the 
-cifs vfs, unlike the smbfs vfs, does not read the smb.conf on the client system 
+parameters from their default values.  Creating special devices (mknod) 
+remotely may require specifying a mkdev function to Samba if you are not using 
+Samba 3.0.5 or later.  For more information on these see the manual pages
+("man smb.conf") on the Samba server system.  Note that the cifs vfs,
+unlike the smbfs vfs, does not read the smb.conf on the client system 
 (the few optional settings are passed in on mount via -o parameters instead).  
-Note that Samba 2.2.7 or later includes a fix that allows the CIFS VFS to delete 
+Note that Samba 2.2.7 or later includes a fix that allows the CIFS VFS to delete
 open files (required for strict POSIX compliance).  Windows Servers already 
-supported this feature.  
+supported this feature. Samba server does not allow symlinks that refer to files
+outside of the share, so in Samba versions prior to 3.0.5, most symlinks to
+files with absolute paths (ie beginning with slash) such as:
+	 ln -s /mnt/foo bar
+would be forbidden. Samba 3.0.5 server or later includes the ability to create 
+such symlinks safely by converting unsafe symlinks (ie symlinks to server 
+files that are outside of the share) to a samba specific format on the server
+that is ignored by local server applications and non-cifs clients and that will
+not be traversed by the Samba server).  This is opaque to the Linux client
+application using the cifs vfs. Absolute symlinks will work to Samba 3.0.5 or
+later, but only for remote clients using the CIFS Unix extensions, and will
+be invisbile to Windows clients and typically will not affect local
+applications running on the same server as Samba.  
 
 Use instructions:
 ================
@@ -103,8 +130,11 @@ Once the CIFS VFS support is built into 
 servers: 
 
   mount -t cifs //9.53.216.11/e$ /mnt -o user=myname,pass=mypassword
-  
-after -o the following cifs vfs specific options are supported:
+
+Before -o the option -v may be specified to make the mount.cifs
+mount helper display the mount steps more verbosely.  
+After -o the following commonly used cifs vfs specific options
+are supported:
 
   user=<username>
   pass=<password>
@@ -118,11 +148,25 @@ of the standard mount options "noexec" a
 running an altered binary on your local system (downloaded from a hostile server
 or altered by a hostile router).
 
+When using the mount helper mount.cifs, passwords may be specified via alternate
+mechanisms, instead of specifying it after -o using the normal "pass=" syntax
+on the command line:
+1) By including it in a credential file. Specify credentials=filename as one
+of the mount options. Credential files contain two lines
+        username=someuser
+        password=your_password
+2) By specifying the password in the PASSWD environment variable (similarly
+the user name can be taken from the USER environment variable).
+3) By specifying the password in a file by name via PASSWD_FILE
+4) By specifying the password in a file by file descriptor via PASSWD_FD
+
+If no password is provided, mount.cifs will prompt for password entry
+
 Restrictions
 ============
 Servers must support the NTLM SMB dialect (which is the most recent, supported 
-by Samba and Windows NT, 2000 and XP and many other SMB/CIFS servers) and 
-servers must support either "pure-TCP" (port 445 TCP/IP CIFS connections) or RFC 
+by Samba and Windows NT version 4, 2000 and XP and many other SMB/CIFS servers) 
+Servers must support either "pure-TCP" (port 445 TCP/IP CIFS connections) or RFC 
 1001/1002 support for "Netbios-Over-TCP/IP." Neither of these is likely to be a 
 problem as most servers support this.  IPv6 support is planned for the future.  
 
@@ -139,8 +183,28 @@ A partial list of the supported mount op
 		mount.	
   domain	Set the SMB/CIFS workgroup name prepended to the
 		username during CIFS session establishment
-  uid           If CIFS Unix extensions are not supported by the server
-                this overrides the default uid for inodes.
+  uid		If CIFS Unix extensions are not supported by the server
+		this overrides the default uid for inodes. For mounts to
+		servers which do support the CIFS Unix extensions, such
+		as a properly configured Samba server, the server provides
+		the uid, gid and mode.  For servers which do not support
+		the Unix extensions, the default uid (and gid) returned on
+		lookup of existing files is the uid (gid) of the person
+		who executed the mount (root, except when mount.cifs
+		is configured setuid for user mounts) unless the "uid=" 
+		(gid) mount option is specified.  For the uid (gid) of newly
+		created files and directories, ie files created since 
+		the last mount of the server share, the expected uid 
+		(gid) is cached as as long as the inode remains in 
+		memory on the client.   Also note that permission
+		checks (authorization checks) on accesses to a file occur
+		at the server, but there are cases in which an administrator
+		may want to restrict at the client as well.  For those
+		servers which do not report a uid/gid owner
+		(such as Windows), permissions can also be checked at the
+		client, and a crude form of client side permission checking 
+		can be enabled by specifying file_mode and dir_mode on 
+		the client
   gid		If CIFS Unix extensions are not supported by the server
 		this overrides the default gid for inodes.
   file_mode     If CIFS Unix extensions are not supported by the server
@@ -173,14 +237,44 @@ A partial list of the supported mount op
 		or password or domain. This option is less important
 		when the cifs mount helper cifs.mount (version 1.1 or later)
 		is used.
+  nosuid        Do not allow remote executables with the suid bit 
+		program to be executed.  This is only meaningful for mounts
+		to servers such as Samba which support the CIFS Unix Extensions.
+		If you do not trust the servers in your network (your mount
+		targets) it is recommended that you specify this option for
+		greater security.
+  suid          Allow remote files on this mountpoint with suid enabled to 
+		be executed (default for mounts when executed as root,
+		nosuid is default for user mounts).
+  credentials   Although ignored by the cifs kernel component, it is used by 
+		the mount helper, mount.cifs. When mount.cifs is installed it
+		opens and reads the credential file specified in order  
+		to obtain the userid and password arguments which are passed to
+		the cifs vfs.
+  guest         Although ignored by the kernel component, the mount.cifs
+		mount helper will not prompt the user for a password
+		if guest is specified on the mount options.  If no
+		password is specified a null password will be used.
+
+The mount.cifs mount helper also accepts a few mount options before -o
+including:
+
+	-S      take password from stdin (equivalent to setting the environment
+		variable "PASSWD_FD=0"
+	-V      print mount.cifs version
+	-?      display simple usage information
+
+With recent 2.6 kernel versions of modutils, the version of the cifs kernel
+module can be displayed via modinfo.
 
 Misc /proc/fs/cifs Flags and Debug Info
 =======================================
 Informational pseudo-files:
 DebugData		Displays information about active CIFS sessions
-SimultaneousOps		Counter which holds maximum number of
-			simultaneous outstanding SMB/CIFS requests.
-Stats			Lists summary resource usage information
+			and shares.
+Stats			Lists summary resource usage information as well as per
+			share statistics, if CONFIG_CIFS_STATS in enabled
+			in the kernel configuration.
 
 Configuration pseudo-files:
 MultiuserMount		If set to one, more than one CIFS session to 
@@ -230,8 +324,29 @@ tracing to the kernel message log type: 
 and for more extensive tracing including the start of smb requests and responses
 
 	echo 1 > /proc/fs/cifs/traceSMB
+
+Three other experimental features are under development and to test 
+require enabling an ifdef (e.g. by  adding "#define CIFS_FCNTL" in cifsglob.h)
+
+	CONFIG_CIFS_QUOTA
+
+	CONFIG_CIFS_XATTR
+
+	CONFIG_CIFS_FCNTL  (fcntl needed for support of directory change 
+			    notification and perhaps later for file leases)
+
+Per share (per client mount) statistics are available in /proc/fs/cifs/DebugData
+if the kernel was configured with cifs statistics enabled.  The statistics
+represent the number of successful (ie non-zero return code from the server) 
+SMB responses to some of the more common commands (open, delete, mkdir etc.).
+Also recorded is the total bytes read and bytes written to the server for
+that share.  Note that due to client caching effects this can be less than the
+number of bytes read and written by the application running on the client.
+The statistics for the number of total SMBs and oplock breaks are different in
+that they represent all for that share, not just those for which the server
+returned success.
 	
-Also note that "cat /proc/fs/cifs/DebugData" will display some information about 
+Also note that "cat /proc/fs/cifs/DebugData" will display information about 
 the active sessions and the shares that are mounted.  Note: NTLMv2 enablement 
 will not work since they its implementation is not quite complete yet.
 Do not alter these configuration values unless you are doing specific testing.  
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/cifs/TODO linux-2.4.20-wolk4.16-fullkernel/fs/cifs/TODO
--- linux-2.4.20-wolk4.15-fullkernel/fs/cifs/TODO	2004-06-29 11:24:22.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/cifs/TODO	2004-09-05 15:47:54.000000000 +0200
@@ -1,7 +1,7 @@
-version 1.0.2 January 29, 2004
+version 1.16 May 27, 2004
 
-A Partial List of Known Problems and Missing Features
-=====================================================
+A Partial List of Missing Features
+==================================
 
 Contributions are welcome.  There are plenty of opportunities
 for visible, important contributions to this module.  Here
@@ -21,8 +21,8 @@ e) NTLMv2 authentication (mostly impleme
 
 f) MD5-HMAC signing SMB PDUs when SPNEGO style SessionSetup 
 used (Kerberos or NTLMSSP). Signing alreadyimplemented for NTLM
-	and raw NTLMSSP already. This is important when enabling
-	extended security and mounting to Windows 2003 Servers
+and raw NTLMSSP already. This is important when enabling
+extended security and mounting to Windows 2003 Servers
 
 f) Directory entry caching relies on a 1 second timer, rather than 
 using FindNotify or equivalent.  - (started)
@@ -34,7 +34,8 @@ h) quota support
 
 i) support for the Linux 2.5 kernel new feature get_xattr and set_xattr
 which will allow us to expose dos attributes as well as real
-ACLs
+ACLs. This support has been started in the current code, but is
+ifdeffed out.
 
 k) finish writepages support (multi-page write behind for improved
 performance) and syncpage
@@ -42,7 +43,9 @@ performance) and syncpage
 l) hook lower into the sockets api (as NFS/SunRPC does) to avoid the
 extra copy in/out of the socket buffers in some cases.
 
-m) finish support for IPv6
+m) finish support for IPv6.  This is mostly complete but
+needs a simple inet_pton like function to convert ipv6
+addresses in string representation.
 
 o) Better optimize open (and pathbased setfilesize) to reduce the
 oplock breaks coming from windows srv.  Piggyback identical file
@@ -51,10 +54,23 @@ than resending (helps reduce server reso
 spurious oplock breaks).
 
 p) Improve performance of readpages by sending more than one read
-at a time when 8 pages or more are requested.
+at a time when 8 pages or more are requested.  Evaluate whether
+reads larger than 16K would be helpful.
 
+q) For support of Windows9x/98 we need to retry failed mounts
+to *SMBSERVER (default server name) with the uppercase hostname
+in the RFC1001 session_init request.
 
-KNOWN BUGS (updated January 30, 2004)
+r) Add Extended Attributed support (for storing UID/GID info
+to Windows servers)
+
+s) Finish fcntl D_NOTIFY support so kde and gnome file list windows
+will autorefresh
+
+t) Add GUI tool to configure /proc/fs/cifs settings and for display of
+the CIFS statistics
+
+KNOWN BUGS (updated May 27, 2004)
 ====================================
 1) existing symbolic links (Windows reparse points) are recognized but
 can not be created remotely. They are implemented for Samba and those that
@@ -64,15 +80,27 @@ symlink text beginning with slash
 but recognizes them
 3) create of new files to FAT partitions on Windows servers can
 succeed but still return access denied (appears to be Windows 
-not client problem).  NTFS partitions do not have this problem.
+server not cifs client problem) and has not been reproduced recently.
+NTFS partitions do not have this problem.
+4) debug connectathon lock test case 10 which fails against
+Samba (may be unmappable due to POSIX to Windows lock model
+differences but worth investigating).  Also debug Samba to 
+see why lock test case 7 takes longer to complete to Samba
+than to Windows.
 
 Misc testing to do
-=================
+==================
 1) check out max path names and max path name components against various server
-types.
+types. Try nested symlinks. Return max path name in stat -f information
 
-2) Run dbench. Modify file portion of ltp so it can run against a mounted network
+2) Modify file portion of ltp so it can run against a mounted network
 share and run it against cifs vfs.
 
-3) Additional performance testing and optimization using iozone and similar tools.
+3) Additional performance testing and optimization using iozone and similar - 
+there are some easy changes that can be done to parallelize sequential writes,
+and when signing is disabled to request larger read sizes (larger than 
+negotiated size) and send larger write sizes to modern servers.
+
+4) More exhaustively test the recently added NT4 support against various
+NT4 service pack levels.
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/cifs/asn1.c linux-2.4.20-wolk4.16-fullkernel/fs/cifs/asn1.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/cifs/asn1.c	2004-06-29 11:24:22.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/cifs/asn1.c	2004-09-05 15:47:54.000000000 +0200
@@ -201,7 +201,7 @@ asn1_header_decode(struct asn1_ctx *ctx,
 	if (def)
 		*eoc = ctx->pointer + len;
 	else
-		*eoc = 0;
+		*eoc = NULL;
 	return 1;
 }
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/cifs/cifs_debug.c linux-2.4.20-wolk4.16-fullkernel/fs/cifs/cifs_debug.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/cifs/cifs_debug.c	2004-06-29 11:24:22.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/cifs/cifs_debug.c	2004-09-05 15:47:54.000000000 +0200
@@ -22,7 +22,6 @@
 #include <linux/fs.h>
 #include <linux/string.h>
 #include <linux/ctype.h>
-#define __NO_VERSION__
 #include <linux/module.h>
 #include <linux/proc_fs.h>
 #include <asm/uaccess.h>
@@ -57,25 +56,30 @@ cifs_dump_mem(char *label, void *data, i
 	}
 }
 
-#if CONFIG_PROC_FS
+#ifdef CONFIG_PROC_FS
 int
 cifs_debug_data_read(char *buf, char **beginBuffer, off_t offset,
 		     int count, int *eof, void *data)
 {
 	struct list_head *tmp;
+	struct list_head *tmp1;
+	struct mid_q_entry * mid_entry;
 	struct cifsSesInfo *ses;
 	struct cifsTconInfo *tcon;
 	int i;
 	int length = 0;
-	char *buf_start = buf;
+	char * original_buf = buf;
 
+	*beginBuffer = buf + offset;
+
+	
 	length =
 	    sprintf(buf,
 		    "Display Internal CIFS Data Structures for Debugging\n"
 		    "---------------------------------------------------\n");
 	buf += length;
 
-	length = sprintf(buf, "Servers: \n");
+	length = sprintf(buf, "Servers:\n");
 	buf += length;
 
 	i = 0;
@@ -85,15 +89,17 @@ cifs_debug_data_read(char *buf, char **b
 		ses = list_entry(tmp, struct cifsSesInfo, cifsSessionList);
 		length =
 		    sprintf(buf,
-			    "\n%d) Name: %s  Domain: %s Mounts: %d ServerOS: %s  \n\tServerNOS: %s\tCapabilities: 0x%x\n\tSMB session status: %d\tTCP session status: %d",
+			    "\n%d) Name: %s  Domain: %s Mounts: %d ServerOS: %s  \n\tServerNOS: %s\tCapabilities: 0x%x\n\tSMB session status: %d\tTCP status: %d",
 				i, ses->serverName, ses->serverDomain, atomic_read(&ses->inUse),
 				ses->serverOS, ses->serverNOS, ses->capabilities,ses->status,ses->server->tcpStatus);
 		buf += length;
 		if(ses->server) {
-			buf += sprintf(buf, "\n\tLocal Users To Same Server: %d SecMode: 0x%x",
-				atomic_read(&ses->server->socketUseCount),ses->server->secMode);
+			buf += sprintf(buf, "\n\tLocal Users To Server: %d SecMode: 0x%x Req Active: %d",
+				atomic_read(&ses->server->socketUseCount),
+				ses->server->secMode,
+				atomic_read(&ses->server->inFlight));
 			
-			/* length = sprintf(buf, "\nMIDs: \n");
+			length = sprintf(buf, "\nMIDs: \n");
 			buf += length;
 
 			spin_lock(&GlobalMid_Lock);
@@ -102,11 +108,11 @@ cifs_debug_data_read(char *buf, char **b
 					mid_q_entry,
 					qhead);
 				if(mid_entry) {
-					length = sprintf(buf,"State: %d com: %d pid: %d tsk: %p\n",mid_entry->midState,mid_entry->command,mid_entry->pid,mid_entry->tsk);
+					length = sprintf(buf,"State: %d com: %d pid: %d tsk: %p mid %d\n",mid_entry->midState,mid_entry->command,mid_entry->pid,mid_entry->tsk,mid_entry->mid);
 					buf += length;
 				}
 			}
-			spin_unlock(&GlobalMid_Lock); */
+			spin_unlock(&GlobalMid_Lock); 
 		}
 
 	}
@@ -114,7 +120,7 @@ cifs_debug_data_read(char *buf, char **b
 	sprintf(buf, "\n");
 	buf++;
 
-	length = sprintf(buf, "\nShares: \n");
+	length = sprintf(buf, "\nShares:\n");
 	buf += length;
 
 	i = 0;
@@ -124,7 +130,7 @@ cifs_debug_data_read(char *buf, char **b
 		tcon = list_entry(tmp, struct cifsTconInfo, cifsConnectionList);
 		length =
 		    sprintf(buf,
-			    "\n%d) %s Uses: %d on FS: %s with characteristics: 0x%x Attributes: 0x%x\n\tPathComponentMax: %d Status: %d",
+			    "\n%d) %s Uses: %d Type: %s Characteristics: 0x%x Attributes: 0x%x\nPathComponentMax: %d Status: %d",
 			    i, tcon->treeName,
 			    atomic_read(&tcon->useCount),
 			    tcon->nativeFileSystem,
@@ -141,68 +147,137 @@ cifs_debug_data_read(char *buf, char **b
 			    sprintf(buf, " type: %d ",
 				    tcon->fsDevInfo.DeviceType);
 		buf += length;
-		if(tcon->tidStatus == CifsNeedReconnect)
+		if(tcon->tidStatus == CifsNeedReconnect) {
 			buf += sprintf(buf, "\tDISCONNECTED ");
+			length += 14;
+		}
 	}
 	read_unlock(&GlobalSMBSeslock);
 
 	length = sprintf(buf, "\n");
 	buf += length;
 
-	*eof = 1;
 	/* BB add code to dump additional info such as TCP session info now */
-	/*
-	   if (offset >= (buf - buf_start)) 
-	   {
-	   *beginBuffer = buf;
-	   return 0;
-	   }
-	   *beginBuffer = buf + offset;
-	   if ((buf - buf_start - offset) > count)
-	   return count;
-   else */
-	return (buf - buf_start - offset);
-}
-
-int
-cifs_total_xid_read(char *buf, char **beginBuffer, off_t offset,
-		    int length, int *eof, void *data)
-{
+	/* Now calculate total size of returned data */
+	length = buf - original_buf;
 
-	length =
-	    sprintf(buf,
-		    "Total vfs operations: %d and maximum simultaneous serviced by this filesystem: %d\n",
-		    GlobalCurrentXid,GlobalMaxActiveXid);
+	if(offset + count >= length)
+		*eof = 1;
+	if(length < offset) {
+		*eof = 1;
+		return 0;
+	} else {
+		length = length - offset;
+	}
+	if (length > count)
+		length = count;
 
 	return length;
 }
 
+#ifdef CONFIG_CIFS_STATS
 int
 cifs_stats_read(char *buf, char **beginBuffer, off_t offset,
-		  int length, int *eof, void *data)
+		  int count, int *eof, void *data)
 {
-	int item_length;
-	length =
-	    sprintf(buf,
-		    "Currently Allocated structures\nCIFS Sessions: %d\n",sesInfoAllocCount.counter);
+	int item_length,i,length;
+	struct list_head *tmp;
+	struct cifsTconInfo *tcon;
+
+	*beginBuffer = buf + offset;
+
+	length = sprintf(buf,
+			"Resources in use\nCIFS Session: %d\n",
+			sesInfoAllocCount.counter);
 	buf += length;
 	item_length = 
-		sprintf(buf,"Shares (unique mount targets): %d\n",tconInfoAllocCount.counter);
+		sprintf(buf,"Share (unique mount targets): %d\n",
+			tconInfoAllocCount.counter);
 	length += item_length;
 	buf += item_length;      
 	item_length = 
-			sprintf(buf,"Allocated SMB Request and Response Buffers: %d\n",bufAllocCount.counter);
+		sprintf(buf,"SMB Request/Response Buffer: %d\n",
+			bufAllocCount.counter);
 	length += item_length;
 	buf += item_length;      
 	item_length = 
-		sprintf(buf,"Active Operations (MIDs in use): %d\n",midCount.counter);
+		sprintf(buf,"Operations (MIDs): %d\n",
+			midCount.counter);
 	length += item_length;
 	buf += item_length;
-	item_length = sprintf(buf,"%d sessions and %d shares reconnected after failure\n",tcpSesReconnectCount.counter,tconInfoReconnectCount.counter);
+	item_length = sprintf(buf,
+		"\n%d session %d share reconnects\n",
+		tcpSesReconnectCount.counter,tconInfoReconnectCount.counter);
+	length += item_length;
+	buf += item_length;
+
+	item_length = sprintf(buf,
+		"Total vfs operations: %d maximum at one time: %d\n",
+		GlobalCurrentXid,GlobalMaxActiveXid);
 	length += item_length;
+	buf += item_length;
+
+	i = 0;
+	read_lock(&GlobalSMBSeslock);
+	list_for_each(tmp, &GlobalTreeConnectionList) {
+		i++;
+		tcon = list_entry(tmp, struct cifsTconInfo, cifsConnectionList);
+		item_length = sprintf(buf,"\n%d) %s",i, tcon->treeName);
+		buf += item_length;
+		length += item_length;
+		if(tcon->tidStatus == CifsNeedReconnect) {
+			buf += sprintf(buf, "\tDISCONNECTED ");
+			length += 14;
+		}
+		item_length = sprintf(buf,"\nSMBs: %d Oplock Breaks: %d",
+			atomic_read(&tcon->num_smbs_sent),
+			atomic_read(&tcon->num_oplock_brks));
+		buf += item_length;
+		length += item_length;
+		item_length = sprintf(buf,"\nReads: %d Bytes %lld",
+			atomic_read(&tcon->num_reads),
+			(long long)(tcon->bytes_read));
+		buf += item_length;
+		length += item_length;
+		item_length = sprintf(buf,"\nWrites: %d Bytes: %lld",
+			atomic_read(&tcon->num_writes),
+			(long long)(tcon->bytes_written));
+		buf += item_length;
+		length += item_length;
+		item_length = sprintf(buf,
+			"\nOpens: %d Deletes: %d\nMkdirs: %d Rmdirs: %d",
+			atomic_read(&tcon->num_opens),
+			atomic_read(&tcon->num_deletes),
+			atomic_read(&tcon->num_mkdirs),
+			atomic_read(&tcon->num_rmdirs));
+		buf += item_length;
+		length += item_length;
+		item_length = sprintf(buf,
+			"\nRenames: %d T2 Renames %d",
+			atomic_read(&tcon->num_renames),
+			atomic_read(&tcon->num_t2renames));
+		buf += item_length;
+		length += item_length;
+	}
+	read_unlock(&GlobalSMBSeslock);
+
+	buf += sprintf(buf,"\n");
+	length++;
 
+	if(offset + count >= length)
+		*eof = 1;
+	if(length < offset) {
+		*eof = 1;
+		return 0;
+	} else {
+		length = length - offset;
+	}
+	if (length > count)
+		length = count;
+		
 	return length;
 }
+#endif
 
 struct proc_dir_entry *proc_fs_cifs;
 read_proc_t cifs_txanchor_read;
@@ -238,67 +313,65 @@ cifs_proc_init(void)
 
 	proc_fs_cifs->owner = THIS_MODULE;
 	create_proc_read_entry("DebugData", 0, proc_fs_cifs,
-				cifs_debug_data_read, 0);
-
-	create_proc_read_entry("SimultaneousOps", 0, proc_fs_cifs,
-				cifs_total_xid_read, 0);
+				cifs_debug_data_read, NULL);
 
+#ifdef CONFIG_CIFS_STATS
 	create_proc_read_entry("Stats", 0, proc_fs_cifs,
-				cifs_stats_read, 0);
-
+				cifs_stats_read, NULL);
+#endif
 	pde = create_proc_read_entry("cifsFYI", 0, proc_fs_cifs,
-				cifsFYI_read, 0);
+				cifsFYI_read, NULL);
 	if (pde)
 		pde->write_proc = cifsFYI_write;
 
 	pde =
 	    create_proc_read_entry("traceSMB", 0, proc_fs_cifs,
-				traceSMB_read, 0);
+				traceSMB_read, NULL);
 	if (pde)
 		pde->write_proc = traceSMB_write;
 
 	pde = create_proc_read_entry("OplockEnabled", 0, proc_fs_cifs,
-				oplockEnabled_read, 0);
+				oplockEnabled_read, NULL);
 	if (pde)
 		pde->write_proc = oplockEnabled_write;
 
 	pde = create_proc_read_entry("QuotaEnabled", 0, proc_fs_cifs,
-				quotaEnabled_read, 0);
+				quotaEnabled_read, NULL);
 	if (pde)
 		pde->write_proc = quotaEnabled_write;
 
 	pde = create_proc_read_entry("LinuxExtensionsEnabled", 0, proc_fs_cifs,
-				linuxExtensionsEnabled_read, 0);
+				linuxExtensionsEnabled_read, NULL);
 	if (pde)
 		pde->write_proc = linuxExtensionsEnabled_write;
 
 	pde =
 	    create_proc_read_entry("MultiuserMount", 0, proc_fs_cifs,
-				multiuser_mount_read, 0);
+				multiuser_mount_read, NULL);
 	if (pde)
 		pde->write_proc = multiuser_mount_write;
 
 	pde =
 	    create_proc_read_entry("ExtendedSecurity", 0, proc_fs_cifs,
-				extended_security_read, 0);
+				extended_security_read, NULL);
 	if (pde)
 		pde->write_proc = extended_security_write;
 
 	pde =
 	create_proc_read_entry("LookupCacheEnabled", 0, proc_fs_cifs,
-				lookupFlag_read, 0);
+				lookupFlag_read, NULL);
 	if (pde)
 		pde->write_proc = lookupFlag_write;
 
 	pde =
 	    create_proc_read_entry("NTLMV2Enabled", 0, proc_fs_cifs,
-				ntlmv2_enabled_read, 0);
+				ntlmv2_enabled_read, NULL);
 	if (pde)
 		pde->write_proc = ntlmv2_enabled_write;
 
 	pde =
 	    create_proc_read_entry("PacketSigningEnabled", 0, proc_fs_cifs,
-				packet_signing_enabled_read, 0);
+				packet_signing_enabled_read, NULL);
 	if (pde)
 		pde->write_proc = packet_signing_enabled_write;
 }
@@ -311,9 +384,10 @@ cifs_proc_clean(void)
 
 	remove_proc_entry("DebugData", proc_fs_cifs);
 	remove_proc_entry("cifsFYI", proc_fs_cifs);
-	remove_proc_entry("TraceSMB", proc_fs_cifs);
-	remove_proc_entry("SimultaneousOps", proc_fs_cifs);
+	remove_proc_entry("traceSMB", proc_fs_cifs);
+#ifdef CONFIG_CIFS_STATS
 	remove_proc_entry("Stats", proc_fs_cifs);
+#endif
 	remove_proc_entry("MultiuserMount", proc_fs_cifs);
 	remove_proc_entry("OplockEnabled", proc_fs_cifs);
 	remove_proc_entry("NTLMV2Enabled",proc_fs_cifs);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/cifs/cifs_debug.h linux-2.4.20-wolk4.16-fullkernel/fs/cifs/cifs_debug.h
--- linux-2.4.20-wolk4.15-fullkernel/fs/cifs/cifs_debug.h	2004-06-29 11:24:22.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/cifs/cifs_debug.h	2004-09-05 15:47:54.000000000 +0200
@@ -63,18 +63,4 @@ extern int cifsERROR;
 #define cifserror(format,arg...)
 #endif		/* _CIFS_DEBUG */
 
-/*
- *	statistics
- *	----------
- */
-#ifdef	_CIFS_STATISTICS
-#define	INCREMENT(x)	((x)++)
-#define	DECREMENT(x)	((x)--)
-#define	HIGHWATERMARK(x,y)	x = MAX((x), (y))
-#else
-#define	INCREMENT(x)
-#define	DECREMENT(x)
-#define	HIGHWATERMARK(x,y)
-#endif				/* _CIFS_STATISTICS */
-
 #endif				/* _H_CIFS_DEBUG */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/cifs/cifs_unicode.h linux-2.4.20-wolk4.16-fullkernel/fs/cifs/cifs_unicode.h
--- linux-2.4.20-wolk4.15-fullkernel/fs/cifs/cifs_unicode.h	2004-06-29 11:24:22.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/cifs/cifs_unicode.h	2004-09-05 15:47:54.000000000 +0200
@@ -84,7 +84,7 @@ UniStrcat(wchar_t * ucs1, const wchar_t 
  * UniStrchr:  Find a character in a string
  *
  * Returns:
- *     Address of first occurance of character in string
+ *     Address of first occurrence of character in string
  *     or NULL if the character is not in the string
  */
 static inline wchar_t *
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/cifs/cifs_uniupr.h linux-2.4.20-wolk4.16-fullkernel/fs/cifs/cifs_uniupr.h
--- linux-2.4.20-wolk4.15-fullkernel/fs/cifs/cifs_uniupr.h	2004-06-29 11:24:22.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/cifs/cifs_uniupr.h	2004-09-05 15:47:54.000000000 +0200
@@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa
 	{0x0490, 0x04cc, UniCaseRangeU0490},
 	{0x1e00, 0x1ffc, UniCaseRangeU1e00},
 	{0xff40, 0xff5a, UniCaseRangeUff40},
-	{0, 0, 0}
+	{0, 0, NULL}
 };
 #endif
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/cifs/cifsencrypt.c linux-2.4.20-wolk4.16-fullkernel/fs/cifs/cifsencrypt.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/cifs/cifsencrypt.c	2004-06-29 11:24:22.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/cifs/cifsencrypt.c	2004-09-05 15:47:54.000000000 +0200
@@ -74,7 +74,7 @@ int cifs_sign_smb(struct smb_hdr * cifs_
 
 	rc = cifs_calculate_signature(cifs_pdu, ses->mac_signing_key,smb_signature);
 	if(rc)
-                memset(cifs_pdu->Signature.SecuritySignature, 0, 8);
+		memset(cifs_pdu->Signature.SecuritySignature, 0, 8);
 	else
 		memcpy(cifs_pdu->Signature.SecuritySignature, smb_signature, 8);
 
@@ -88,15 +88,15 @@ int cifs_verify_signature(struct smb_hdr
 	char server_response_sig[8];
 	char what_we_think_sig_should_be[20];
 
-        if((cifs_pdu == NULL) || (mac_key == NULL))
-                return -EINVAL;
+	if((cifs_pdu == NULL) || (mac_key == NULL))
+		return -EINVAL;
 
 	if (cifs_pdu->Command == SMB_COM_NEGOTIATE)
 		return 0;
 
 	if (cifs_pdu->Command == SMB_COM_LOCKING_ANDX) {
 		struct smb_com_lock_req * pSMB = (struct smb_com_lock_req *)cifs_pdu;
-	        if(pSMB->LockType & LOCKING_ANDX_OPLOCK_RELEASE)
+	    if(pSMB->LockType & LOCKING_ANDX_OPLOCK_RELEASE)
 			return 0;
 	}
 
@@ -113,10 +113,10 @@ int cifs_verify_signature(struct smb_hdr
 		its signature against what the server sent */
 	memcpy(server_response_sig,cifs_pdu->Signature.SecuritySignature,8);
 
-        cifs_pdu->Signature.Sequence.SequenceNumber = expected_sequence_number;
-        cifs_pdu->Signature.Sequence.Reserved = 0;
+	cifs_pdu->Signature.Sequence.SequenceNumber = expected_sequence_number;
+	cifs_pdu->Signature.Sequence.Reserved = 0;
 
-        rc = cifs_calculate_signature(cifs_pdu, mac_key,
+	rc = cifs_calculate_signature(cifs_pdu, mac_key,
 		what_we_think_sig_should_be);
 
 	if(rc)
@@ -167,19 +167,19 @@ int CalcNTLMv2_partial_mac_key(struct ci
 		return -EINVAL;
   
 	ucase_buf = kmalloc((MAX_USERNAME_SIZE+1), GFP_KERNEL);
-        unicode_buf = kmalloc((MAX_USERNAME_SIZE+1)*4, GFP_KERNEL);
+	unicode_buf = kmalloc((MAX_USERNAME_SIZE+1)*4, GFP_KERNEL);
    
 	for(i=0;i<user_name_len;i++)
 		ucase_buf[i] = nls_info->charset2upper[(int)ses->userName[i]];
 	ucase_buf[i] = 0;
-        user_name_len = cifs_strtoUCS(unicode_buf, ucase_buf, MAX_USERNAME_SIZE*2, nls_info);
+	user_name_len = cifs_strtoUCS(unicode_buf, ucase_buf, MAX_USERNAME_SIZE*2, nls_info);
 	unicode_buf[user_name_len] = 0;
 	user_name_len++;
 
-        for(i=0;i<dom_name_len;i++)
-                ucase_buf[i] = nls_info->charset2upper[(int)ses->domainName[i]];
-        ucase_buf[i] = 0;
-        dom_name_len = cifs_strtoUCS(unicode_buf+user_name_len, ucase_buf, MAX_USERNAME_SIZE*2, nls_info);
+	for(i=0;i<dom_name_len;i++)
+		ucase_buf[i] = nls_info->charset2upper[(int)ses->domainName[i]];
+	ucase_buf[i] = 0;
+	dom_name_len = cifs_strtoUCS(unicode_buf+user_name_len, ucase_buf, MAX_USERNAME_SIZE*2, nls_info);
 
 	unicode_buf[user_name_len + dom_name_len] = 0;
 	hmac_md5_update((const unsigned char *) unicode_buf,
@@ -200,6 +200,5 @@ void CalcNTLMv2_response(const struct ci
 	hmac_md5_update(ses->server->cryptKey,8,&context);
 /*	hmac_md5_update(v2_session_response+16)client thing,8,&context); */ /* BB fix */
 
-
 	hmac_md5_final(v2_session_response,&context);
 }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/cifs/cifsfs.c linux-2.4.20-wolk4.16-fullkernel/fs/cifs/cifsfs.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/cifs/cifsfs.c	2004-06-29 11:24:22.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/cifs/cifsfs.c	2004-09-05 15:47:54.000000000 +0200
@@ -1,7 +1,7 @@
 /*
  *   fs/cifs/cifsfs.c
  *
- *   Copyright (C) International Business Machines  Corp., 2002,2003
+ *   Copyright (C) International Business Machines  Corp., 2002,2004
  *   Author(s): Steve French (sfrench@us.ibm.com)
  *
  *   Common Internet FileSystem (CIFS) client
@@ -42,9 +42,11 @@
 #include "cifs_debug.h"
 #include "cifs_fs_sb.h"
 #include <linux/mm.h>
-#define CIFS_MAGIC_NUMBER 0xFF534D42	/* the first four bytes of all SMB PDUs */
+#define CIFS_MAGIC_NUMBER 0xFF534D42	/* the first four bytes of SMB PDUs */
+/* BB when mempool_resize is added back in, we will resize pool on new mount */
+#define CIFS_MIN_RCV_POOL 11 /* enough for progress to five servers */
 
-#ifdef CIFS_QUOTA
+#ifdef CONFIG_CIFS_QUOTA
 static struct quotactl_ops cifs_quotactl_ops;
 #endif
 
@@ -65,7 +67,7 @@ unsigned int CIFSMaximumBufferSize = CIF
 struct task_struct * oplockThread = NULL;
 
 extern int cifs_mount(struct super_block *, struct cifs_sb_info *, char *,
-			char *);
+			const char *);
 extern int cifs_umount(struct super_block *, struct cifs_sb_info *);
 void cifs_proc_init(void);
 void cifs_proc_clean(void);
@@ -80,9 +82,13 @@ cifs_read_super(struct super_block *sb, 
 	struct cifs_sb_info *cifs_sb;
 	int rc = 0;
 
+	sb->s_flags |= MS_NODIRATIME; /* and probably even noatime */
 	cifs_sb = CIFS_SB(sb);
 	if(cifs_sb == NULL)
 		return 0;
+	else
+		memset(cifs_sb,0,sizeof(struct cifs_sb_info));
+	
 
 	rc = cifs_mount(sb, cifs_sb, data, NULL);
 
@@ -97,20 +103,22 @@ cifs_read_super(struct super_block *sb, 
 	sb->s_op = &cifs_super_ops;
 /*	if(cifs_sb->tcon->ses->server->maxBuf > MAX_CIFS_HDR_SIZE + 512)
 	    sb->s_blocksize = cifs_sb->tcon->ses->server->maxBuf - MAX_CIFS_HDR_SIZE; */
-#ifdef CIFS_QUOTA
+#ifdef CONFIG_CIFS_QUOTA
 	sb->s_qcop = &cifs_quotactl_ops;
 #endif
 	sb->s_blocksize = CIFS_MAX_MSGSIZE;
 	sb->s_blocksize_bits = 14;	/* default 2**14 = CIFS_MAX_MSGSIZE */
 	inode = iget(sb, ROOT_I);
 
-	if (!inode)
+	if (!inode) {
 		goto out_no_root;
+	}
 
 	sb->s_root = d_alloc_root(inode);
 
-	if (!sb->s_root)
+	if (!sb->s_root) {
 		goto out_no_root;
+	}
 
 	return sb;
 
@@ -248,110 +256,115 @@ cifs_show_options(struct seq_file *s, st
 }
 #endif
 
-#ifdef CIFS_QUOTA
+#ifdef CONFIG_CIFS_QUOTA
 int cifs_xquota_set(struct super_block * sb, int quota_type, qid_t qid,
-                struct fs_disk_quota * pdquota)
+		struct fs_disk_quota * pdquota)
 {
-        int xid;
-        int rc = 0;
-        struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
-        struct cifsTconInfo *pTcon;
-
-        if(cifs_sb)
-                pTcon = cifs_sb->tcon;
-        else
-                return -EIO;
+	int xid;
+	int rc = 0;
+	struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
+	struct cifsTconInfo *pTcon;
+	
+	if(cifs_sb)
+		pTcon = cifs_sb->tcon;
+	else
+		return -EIO;
 
 
-        xid = GetXid();
-        if(pTcon) {
-                cFYI(1,("set type: 0x%x id: %d",quota_type,qid));
-        } else {
-                return -EIO;
-        }
+	xid = GetXid();
+	if(pTcon) {
+		cFYI(1,("set type: 0x%x id: %d",quota_type,qid));		
+	} else {
+		return -EIO;
+	}
 
-        FreeXid(xid);
-        return rc;
+	FreeXid(xid);
+	return rc;
 }
 
 int cifs_xquota_get(struct super_block * sb, int quota_type, qid_t qid,
                 struct fs_disk_quota * pdquota)
 {
-        int xid;
-        int rc = 0;
-        struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
-        struct cifsTconInfo *pTcon;
-
-        if(cifs_sb)
-                pTcon = cifs_sb->tcon;
-        else
-                return -EIO;
+	int xid;
+	int rc = 0;
+	struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
+	struct cifsTconInfo *pTcon;
 
-        xid = GetXid();
-        if(pTcon) {
+	if(cifs_sb)
+		pTcon = cifs_sb->tcon;
+	else
+		return -EIO;
+
+	xid = GetXid();
+	if(pTcon) {
                 cFYI(1,("set type: 0x%x id: %d",quota_type,qid));
-        } else {
-                rc = -EIO;
-        }
+	} else {
+		rc = -EIO;
+	}
 
-        FreeXid(xid);
-        return rc;
+	FreeXid(xid);
+	return rc;
 }
 
 int cifs_xstate_set(struct super_block * sb, unsigned int flags, int operation)
 {
-        int xid;
-        int rc = 0;
-        struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
-        struct cifsTconInfo *pTcon;
-
-        if(cifs_sb)
-                pTcon = cifs_sb->tcon;
-        else
-                return -EIO;
+	int xid; 
+	int rc = 0;
+	struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
+	struct cifsTconInfo *pTcon;
+
+	if(cifs_sb)
+		pTcon = cifs_sb->tcon;
+	else
+		return -EIO;
 
-        xid = GetXid();
-        if(pTcon) {
+	xid = GetXid();
+	if(pTcon) {
                 cFYI(1,("flags: 0x%x operation: 0x%x",flags,operation));
-        } else {
-                rc = -EIO;
-        }
+	} else {
+		rc = -EIO;
+	}
 
-        FreeXid(xid);
-        return rc;
+	FreeXid(xid);
+	return rc;
 }
 
 int cifs_xstate_get(struct super_block * sb, struct fs_quota_stat *qstats)
 {
-        int xid;
-        int rc = 0;
-        struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
-        struct cifsTconInfo *pTcon;
-
-        if(cifs_sb) {
-                pTcon = cifs_sb->tcon;
-        } else {
-                return -EIO;
-        }
-        xid = GetXid();
-        if(pTcon) {
-                cFYI(1,("pqstats %p",qstats));
-        } else {
-                rc = -EIO;
-        }
+	int xid;
+	int rc = 0;
+	struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
+	struct cifsTconInfo *pTcon;
+
+	if(cifs_sb) {
+		pTcon = cifs_sb->tcon;
+	} else {
+		return -EIO;
+	}
+	xid = GetXid();
+	if(pTcon) {
+		cFYI(1,("pqstats %p",qstats));		
+	} else {
+		rc = -EIO;
+	}
 
-        FreeXid(xid);
-        return rc;
+	FreeXid(xid);
+	return rc;
 }
 
 static struct quotactl_ops cifs_quotactl_ops = {
-        .set_xquota     = cifs_xquota_set,
-        .get_xquota     = cifs_xquota_set,
-        .set_xstate     = cifs_xstate_set,
-        .get_xstate     = cifs_xstate_get,
+	.set_xquota	= cifs_xquota_set,
+	.get_xquota	= cifs_xquota_set,
+	.set_xstate	= cifs_xstate_set,
+	.get_xstate	= cifs_xstate_get,
 };
 #endif
 
+static int cifs_remount(struct super_block *sb, int *flags, char *data)
+{
+	*flags |= MS_NODIRATIME;
+	return 0;
+}
 
 struct super_operations cifs_super_ops = {
 	.read_inode = cifs_read_inode,
@@ -372,7 +385,7 @@ struct super_operations cifs_super_ops =
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
 static struct super_block *
 cifs_get_sb(struct file_system_type *fs_type,
-	    int flags, char *dev_name, void *data)
+	    int flags, const char *dev_name, void *data)
 {
 	int rc;
 	struct super_block *sb = sget(fs_type, NULL, set_anon_super, NULL);
@@ -409,7 +422,16 @@ cifs_read_wrapper(struct file * file, ch
 	if(CIFS_I(file->f_dentry->d_inode)->clientCanCacheRead) {
 		return generic_file_read(file,read_data,read_size,poffset);
 	} else {
-		invalidate_inode_pages(file->f_dentry->d_inode);
+		/* BB do we need to lock inode from here until after invalidate? */
+/*		if(file->f_dentry->d_inode->i_mapping) {
+			filemap_fdatawrite(file->f_dentry->d_inode->i_mapping);
+			filemap_fdatawait(file->f_dentry->d_inode->i_mapping);
+		}*/
+/*		cifs_revalidate(file->f_dentry);*/ /* BB fixme */
+
+		/* BB we should make timer configurable - perhaps 
+		   by simply calling cifs_revalidate here */
+		/* invalidate_remote_inode(file->f_dentry->d_inode);*/
 		return generic_file_read(file,read_data,read_size,poffset);
 	}
 }
@@ -428,19 +450,13 @@ cifs_write_wrapper(struct file * file, c
 		return -EIO;
 
 	/* check whether we can cache writes locally */
-	/* if not then check whether we can use the page cache at all */
-	if(CIFS_I(file->f_dentry->d_inode)->clientCanCacheAll)  {
-		return generic_file_write(file,write_data, write_size,poffset);
-
-	} else {
-		if(CIFS_I(file->f_dentry->d_inode)->clientCanCacheRead) {
-			/* no need to invalidate the local copy */
-		} else
-			invalidate_inode_pages(file->f_dentry->d_inode);
-		written = generic_file_write(file,write_data, write_size,poffset);
-		/* since we can not cache writes, need to sync the data */
-		return written;
+	written = generic_file_write(file,write_data,write_size,poffset);
+	if(!CIFS_I(file->f_dentry->d_inode)->clientCanCacheAll)  {
+		if(file->f_dentry->d_inode->i_mapping) {
+			filemap_fdatasync(file->f_dentry->d_inode->i_mapping);
+		}
 	}
+	return written;
 }
 
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
@@ -477,7 +493,7 @@ struct inode_operations cifs_file_inode_
 /*	.getattr = cifs_getattr,*/
 	.rename = cifs_rename,
 	.permission = cifs_permission,
-#ifdef CIFS_XATTR
+#ifdef CONFIG_CIFS_XATTR
 	.setxattr = cifs_setxattr,
 	.getxattr = cifs_getxattr,
 	.listxattr = cifs_listxattr,
@@ -492,7 +508,7 @@ struct inode_operations cifs_symlink_ino
 	/* BB add the following two eventually */
 	/* revalidate: cifs_revalidate,
 	   setattr:    cifs_notify_change, *//* BB do we need notify change */
-#ifdef CIFS_XATTR
+#ifdef CONFIG_CIFS_XATTR
 	.setxattr = cifs_setxattr,
 	.getxattr = cifs_getxattr,
 	.listxattr = cifs_listxattr,
@@ -510,12 +526,18 @@ struct file_operations cifs_file_ops = {
 	.flush = cifs_flush,
 	.mmap  = cifs_file_mmap,
 /*	.sendfile = generic_file_sendfile,*/
+#ifdef CONFIG_CIFS_FCNTL
+	.fcntl = cifs_fcntl,
+#endif
 };
 
 struct file_operations cifs_dir_ops = {
 	.readdir = cifs_readdir,
 	.release = cifs_closedir,
 	.read    = generic_read_dir,
+#ifdef CONFIG_CIFS_FCNTL
+	.fcntl   = cifs_fcntl,
+#endif
 };
 /*
 static void
@@ -539,8 +561,6 @@ cifs_init_inodecache(void)
 					      cifs_init_once, NULL);
 	if (cifs_inode_cachep == NULL)
 		return -ENOMEM;
-	else
-		memset(cifs_sb,0,sizeof(struct cifs_sb_info));
 	
 
 	return 0;
@@ -614,25 +634,32 @@ static int cifs_oplock_thread(void * dum
 
 	daemonize();
 	sprintf(current->comm,"cifsoplockd");
+
 	oplockThread = current;
 	do {
 		set_current_state(TASK_INTERRUPTIBLE);
-
-		schedule_timeout(3*HZ);
+		
+		schedule_timeout(1*HZ);  
 		spin_lock(&GlobalMid_Lock);
 		if(list_empty(&GlobalOplock_Q)) {
 			spin_unlock(&GlobalMid_Lock);
-			schedule_timeout(7*HZ);
+			set_current_state(TASK_INTERRUPTIBLE);
+			schedule_timeout(39*HZ);
 		} else {
-			oplock_item = list_entry(GlobalOplock_Q.next,
+			oplock_item = list_entry(GlobalOplock_Q.next, 
 				struct oplock_q_entry, qhead);
-
 			if(oplock_item) {
+				cFYI(1,("found oplock item to write out")); 
 				pTcon = oplock_item->tcon;
 				inode = oplock_item->pinode;
 				netfid = oplock_item->netfid;
 				spin_unlock(&GlobalMid_Lock);
 				DeleteOplockQEntry(oplock_item);
+				/* can not grab inode sem here since it would
+				deadlock when oplock received on delete 
+				since vfs_unlink holds the i_sem across
+				the call */
+				/* down(&inode->i_sem);*/
 				if (S_ISREG(inode->i_mode)) {
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,17))
 					rc = filemap_fdatasync(inode->i_mapping);
@@ -645,12 +672,20 @@ static int cifs_oplock_thread(void * dum
 						invalidate_inode_pages(inode);
 				} else
 					rc = 0;
-				rc = CIFSSMBLock(0, pTcon, 
-					netfid,
-					0 /* len */ , 0 /* offset */, 0, 
-					0, LOCKING_ANDX_OPLOCK_RELEASE,
-					0 /* wait flag */);
-				cFYI(1,("Oplock release rc = %d ",rc));
+				/* releasing a stale oplock after recent reconnection 
+				of smb session using a now incorrect file 
+				handle is not a data integrity issue but do  
+				not bother sending an oplock release if session 
+				to server still is disconnected since oplock 
+				already released by the server in that case */
+				if(pTcon->tidStatus != CifsNeedReconnect) {
+					rc = CIFSSMBLock(0, pTcon, 
+						netfid,
+						0 /* len */ , 0 /* offset */, 0, 
+						0, LOCKING_ANDX_OPLOCK_RELEASE,
+						0 /* wait flag */);
+					cFYI(1,("Oplock release rc = %d ",rc));
+				}
 			} else
 				spin_unlock(&GlobalMid_Lock);
 		}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/cifs/cifsfs.h linux-2.4.20-wolk4.16-fullkernel/fs/cifs/cifsfs.h
--- linux-2.4.20-wolk4.15-fullkernel/fs/cifs/cifsfs.h	2004-06-29 11:24:22.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/cifs/cifsfs.h	2004-09-05 15:47:54.000000000 +0200
@@ -60,7 +60,6 @@ extern int cifs_setattr(struct dentry *,
 
 extern struct inode_operations cifs_file_inode_ops;
 extern void cifs_truncate_file(struct inode *);
-
 extern struct inode_operations cifs_symlink_inode_ops;
 
 /* Functions related to files and directories */
@@ -79,6 +78,7 @@ extern int cifs_file_mmap(struct file * 
 extern struct file_operations cifs_dir_ops;
 extern int cifs_dir_open(struct inode *inode, struct file *file);
 extern int cifs_readdir(struct file *file, void *direntry, filldir_t filldir);
+extern long cifs_fcntl(int, unsigned int, unsigned long, struct file *);
 
 /* Functions related to dir entries */
 extern struct dentry_operations cifs_dentry_ops;
@@ -88,5 +88,10 @@ extern int cifs_follow_link(struct dentr
 extern int cifs_readlink(struct dentry *direntry, char *buffer, int buflen);
 extern int cifs_symlink(struct inode *inode, struct dentry *direntry,
 			const char *symname);
-
-#endif				/* _CIFSSMB_H */
+extern int	cifs_removexattr(struct dentry *, const char *);
+extern int 	cifs_setxattr(struct dentry *, const char *, const void *,
+			 size_t, int);
+extern ssize_t	cifs_getxattr(struct dentry *, const char *, void *, size_t);
+extern ssize_t	cifs_listxattr(struct dentry *, char *, size_t);
+#define CIFS_VERSION   "1.20"
+#endif				/* _CIFSFS_H */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/cifs/cifsglob.h linux-2.4.20-wolk4.16-fullkernel/fs/cifs/cifsglob.h
--- linux-2.4.20-wolk4.15-fullkernel/fs/cifs/cifsglob.h	2004-06-29 11:24:22.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/cifs/cifsglob.h	2004-09-05 15:47:54.000000000 +0200
@@ -16,6 +16,7 @@
  * 
  */
 #include <linux/in.h>
+#include <linux/in6.h>
 #include "cifs_fs_sb.h"
 /*
  * The sizes of various internal tables and strings
@@ -33,9 +34,14 @@
 
 /*
  * MAX_REQ is the maximum number of requests that WE will send
- * on one NetBIOS handle concurently.
+ * on one socket concurently. It also matches the most common
+ * value of max multiplex returned by servers.  We may 
+ * eventually want to use the negotiated value (in case
+ * future servers can handle more) when we are more confident that
+ * we will not have problems oveloading the socket with pending
+ * write data.
  */
-#define MAX_REQ (10)
+#define CIFS_MAX_REQ 50 
 
 #define SERVER_NAME_LENGTH 15
 #define SERVER_NAME_LEN_WITH_NULL     (SERVER_NAME_LENGTH + 1)
@@ -87,6 +93,13 @@ enum securityEnum {
 	Kerberos		/* Kerberos via SPNEGO */
 };
 
+enum protocolEnum {
+	IPV4 = 0,
+	IPV6,
+	SCTP
+	/* Netbios frames protocol not supported at this time */
+};
+
 /*
  *****************************************************************
  * Except the CIFS PDUs themselves all the
@@ -98,17 +111,22 @@ struct TCP_Server_Info {
 	char server_Name[SERVER_NAME_LEN_WITH_NULL];	/* 15 chars + X'20'in 16th */
 	char unicode_server_Name[SERVER_NAME_LEN_WITH_NULL * 2];	/* Unicode version of server_Name */
 	struct socket *ssocket;
-	struct sockaddr_in sockAddr;
-	wait_queue_head_t response_q;
+	union {
+		struct sockaddr_in sockAddr;
+		struct sockaddr_in6 sockAddr6;
+	} addr;
+	wait_queue_head_t response_q; 
+	wait_queue_head_t request_q; /* if more than maxmpx to srvr must block*/
 	struct list_head pending_mid_q;
 	void *Server_NlsInfo;	/* BB - placeholder for future NLS info  */
 	unsigned short server_codepage;	/* codepage for the server    */
 	unsigned long ip_address;	/* IP addr for the server if known     */
-	unsigned long svType;	/* computer type                       */
+	enum protocolEnum protocolType;	
 	char versionMajor;
 	char versionMinor;
 	int svlocal:1;		/* local server or remote */
-	atomic_t socketUseCount;	/* indicates if the server has any open cifs sessions */
+	atomic_t socketUseCount; /* number of open cifs sessions on socket */
+	atomic_t inFlight;  /* number of requests on the wire to server */
 	enum statusEnum tcpStatus; /* what we think the status is */
 	struct semaphore tcpSem;
 	struct task_struct *tsk;
@@ -128,6 +146,7 @@ struct TCP_Server_Info {
 	int capabilities; /* allow selective disabling of caps by smb sess */
 	__u16 timeZone;
 	char cryptKey[CIFS_CRYPTO_KEY_SIZE];
+	char workstation_RFC1001_name[16]; /* 16th byte is always zero */
 };
 
 /*
@@ -151,7 +170,7 @@ struct cifsSesInfo {
 	struct semaphore sesSem;
 	struct cifsUidInfo *uidInfo;	/* pointer to user info */
 	struct TCP_Server_Info *server;	/* pointer to server info */
-	atomic_t inUse;		/* # of CURRENT users of this ses */
+	atomic_t inUse; /* # of mounts (tree connections) on this ses */
 	enum statusEnum status;
 	__u32 sequence_number;  /* needed for CIFS PDU signature */
 	__u16 ipc_tid;		/* special tid for connection to IPC share */
@@ -179,12 +198,27 @@ struct cifsTconInfo {
 	struct cifsSesInfo *ses;	/* pointer to session associated with */
 	char treeName[MAX_TREE_SIZE + 1]; /* UNC name of resource (in ASCII not UTF) */
 	char *nativeFileSystem;
-	__u16 tid;		/* The 2 byte transaction id */
+	__u16 tid;		/* The 2 byte tree id */
 	__u16 Flags;		/* optional support bits */
 	enum statusEnum tidStatus;
-	atomic_t useCount;	/* how many mounts (explicit or implicit refer to this share */
+	atomic_t useCount;	/* how many mounts (explicit or implicit) to this share */
+#ifdef CONFIG_CIFS_STATS
+	atomic_t num_smbs_sent;
+	atomic_t num_writes;
+	atomic_t num_reads;
+	atomic_t num_oplock_brks;
+	atomic_t num_opens;
+	atomic_t num_deletes;
+	atomic_t num_mkdirs;
+	atomic_t num_rmdirs;
+	atomic_t num_renames;
+	atomic_t num_t2renames;
+	__u64    bytes_read;
+	__u64    bytes_written;
+	spinlock_t stat_lock;
+#endif
 	FILE_SYSTEM_DEVICE_INFO fsDevInfo;
-	FILE_SYSTEM_ATTRIBUTE_INFO fsAttrInfo;	/* note file system name may be truncated - but very unlikely */
+	FILE_SYSTEM_ATTRIBUTE_INFO fsAttrInfo;	/* ok if file system name truncated */
 	FILE_SYSTEM_UNIX_INFO fsUnixInfo;
 	int retry:1;
 	/* BB add field for back pointer to sb struct? */
@@ -252,6 +286,7 @@ static inline struct cifs_sb_info * CIFS
         return (struct cifs_sb_info *) &(sb->u);
 }
 
+
 /* one of these for every pending CIFS request to the server */
 struct mid_q_entry {
 	struct list_head qhead;	/* mids waiting on reply from this server */
@@ -279,13 +314,6 @@ struct oplock_q_entry {
 #define   MID_RESPONSE_RECEIVED 4
 #define   MID_RETRY_NEEDED      8 /* session closed while this request out */
 
-struct servers_not_supported { /* @z4a */
-	struct servers_not_supported *next1;  /* @z4a */
-	char server_Name[SERVER_NAME_LEN_WITH_NULL]; /* @z4a */
-	/* Server Names in SMB protocol are 15 chars + X'20'  */
-	/*   in 16th byte...                      @z4a        */
-};
-
 /*
  *****************************************************************
  * All constants go here
@@ -383,4 +411,3 @@ GLOBAL_EXTERN unsigned int ntlmv2_suppor
 GLOBAL_EXTERN unsigned int sign_CIFS_PDUs;  /* enable smb packet signing */
 GLOBAL_EXTERN unsigned int linuxExtEnabled;  /* enable Linux/Unix CIFS extensions */
 
-
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/cifs/cifspdu.h linux-2.4.20-wolk4.16-fullkernel/fs/cifs/cifspdu.h
--- linux-2.4.20-wolk4.15-fullkernel/fs/cifs/cifspdu.h	2004-06-29 11:24:22.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/cifs/cifspdu.h	2004-09-05 15:47:54.000000000 +0200
@@ -34,9 +34,10 @@
 #define SMB_COM_DELETE                0x06
 #define SMB_COM_RENAME                0x07
 #define SMB_COM_LOCKING_ANDX          0x24
+#define SMB_COM_COPY                  0x29
 #define SMB_COM_READ_ANDX             0x2E
 #define SMB_COM_WRITE_ANDX            0x2F
-#define SMB_COM_TRANSACTION2	      0x32
+#define SMB_COM_TRANSACTION2          0x32
 #define SMB_COM_TRANSACTION2_SECONDARY 0x33
 #define SMB_COM_FIND_CLOSE2           0x34
 #define SMB_COM_TREE_DISCONNECT       0x71
@@ -641,6 +642,9 @@ typedef struct smb_com_open_req {	/* als
 #define OPLOCK_BATCH	 2
 #define OPLOCK_READ	 3  /* level 2 oplock */
 
+/* open response for CreateAction shifted left */
+#define CIFS_CREATE_ACTION 0x20000 /* file created */
+
 typedef struct smb_com_open_rsp {
 	struct smb_hdr hdr;	/* wct = 34 BB */
 	__u8 AndXCommand;
@@ -772,6 +776,34 @@ typedef struct smb_com_rename_req {
 	/* followed by NewFileName */
 } RENAME_REQ;
 
+	/* copy request flags */
+#define COPY_MUST_BE_FILE      0x0001
+#define COPY_MUST_BE_DIR       0x0002
+#define COPY_TARGET_MODE_ASCII 0x0004 /* if not set, binary */
+#define COPY_SOURCE_MODE_ASCII 0x0008 /* if not set, binary */
+#define COPY_VERIFY_WRITES     0x0010
+#define COPY_TREE              0x0020 
+
+typedef struct smb_com_copy_req {
+	struct smb_hdr hdr;	/* wct = 3 */
+	__u16 Tid2;
+	__u16 OpenFunction;
+	__u16 Flags;
+	__u16 ByteCount;
+	__u8 BufferFormat;	/* 4 = ASCII or Unicode */ 
+	unsigned char OldFileName[1];
+	/* followed by __u8 BufferFormat2 */
+	/* followed by NewFileName string */
+} COPY_REQ;
+
+typedef struct smb_com_copy_rsp {
+	struct smb_hdr hdr;     /* wct = 1 */
+	__u16 CopyCount;    /* number of files copied */
+	__u16 ByteCount;    /* may be zero */
+	__u8 BufferFormat;  /* 0x04 - only present if errored file follows */
+	unsigned char ErrorFileName[1]; /* only present if error in copy */
+} COPY_RSP;
+
 #define CREATE_HARD_LINK		0x103
 #define MOVEFILE_COPY_ALLOWED		0x0002
 #define MOVEFILE_REPLACE_EXISTING	0x0001
@@ -830,6 +862,10 @@ typedef struct smb_com_create_directory_
 	__u16 ByteCount;	/* bct = 0 */
 } CREATE_DIRECTORY_RSP;
 
+/***************************************************/
+/* NT Transact structure defintions follow         */
+/* Currently only ioctl and notify are implemented */
+/***************************************************/
 typedef struct smb_com_transaction_ioctl_req {
 	struct smb_hdr hdr;	/* wct = 23 */
 	__u8 MaxSetupCount;
@@ -872,29 +908,45 @@ typedef struct smb_com_transaction_ioctl
 } TRANSACT_IOCTL_RSP;
 
 typedef struct smb_com_transaction_change_notify_req {
-        struct smb_hdr hdr;     /* wct = 23 */
-        __u8 MaxSetupCount;
-        __u16 Reserved;
-        __u32 TotalParameterCount;
-        __u32 TotalDataCount;
-        __u32 MaxParameterCount;
-        __u32 MaxDataCount;
-        __u32 ParameterCount;
-        __u32 ParameterOffset;
-        __u32 DataCount;
-        __u32 DataOffset;
-        __u8 SetupCount; /* four setup words follow subcommand */
-        /* SNIA spec incorrectly included spurious pad here */
-        __u16 SubCommand;/* 4 = Change Notify */
+	struct smb_hdr hdr;     /* wct = 23 */
+	__u8 MaxSetupCount;
+	__u16 Reserved;
+	__u32 TotalParameterCount;
+	__u32 TotalDataCount;
+	__u32 MaxParameterCount;
+	__u32 MaxDataCount;
+	__u32 ParameterCount;
+	__u32 ParameterOffset;
+	__u32 DataCount;
+	__u32 DataOffset;
+	__u8 SetupCount; /* four setup words follow subcommand */
+	/* SNIA spec incorrectly included spurious pad here */
+	__u16 SubCommand;/* 4 = Change Notify */
 	__u32 CompletionFilter;  /* operation to monitor */
 	__u16 Fid;
 	__u8 WatchTree;  /* 1 = Monitor subdirectories */
+	__u8 Reserved2;
 	__u16 ByteCount;
-	__u8 Pad[3];
-	__u8 Data[1];
+/* __u8 Pad[3];*/
+/*	__u8 Data[1];*/
 } TRANSACT_CHANGE_NOTIFY_REQ;
 
-/* Completion Filter flags */
+typedef struct smb_com_transaction_change_notify_rsp {
+	struct smb_hdr hdr;	/* wct = 18 */
+	__u8 Reserved[3];
+	__u32 TotalParameterCount;
+	__u32 TotalDataCount;
+	__u32 ParameterCount;
+	__u32 ParameterOffset;
+	__u32 ParameterDisplacement;
+	__u32 DataCount;
+	__u32 DataOffset;
+	__u32 DataDisplacement;
+	__u8 SetupCount;   /* 0 */
+	__u16 ByteCount;
+	/* __u8 Pad[3]; */
+} TRANSACT_CHANGE_NOTIFY_RSP;
+/* Completion Filter flags for Notify */
 #define FILE_NOTIFY_CHANGE_FILE_NAME    0x00000001
 #define FILE_NOTIFY_CHANGE_DIR_NAME     0x00000002
 #define FILE_NOTIFY_CHANGE_NAME         0x00000003
@@ -909,6 +961,15 @@ typedef struct smb_com_transaction_chang
 #define FILE_NOTIFY_CHANGE_STREAM_SIZE  0x00000400
 #define FILE_NOTIFY_CHANGE_STREAM_WRITE 0x00000800
 
+#define FILE_ACTION_ADDED		0x00000001
+#define FILE_ACTION_REMOVED		0x00000002
+#define FILE_ACTION_MODIFIED		0x00000003
+#define FILE_ACTION_RENAMED_OLD_NAME	0x00000004
+#define FILE_ACTION_RENAMED_NEW_NAME	0x00000005
+#define FILE_ACTION_ADDED_STREAM	0x00000006
+#define FILE_ACTION_REMOVED_STREAM	0x00000007
+#define FILE_ACTION_MODIFIED_STREAM	0x00000008
+
 /* response contains array of the following structures */
 struct file_notify_information {
 	__u32 NextEntryOffset;
@@ -985,9 +1046,12 @@ typedef union smb_com_transaction2 {
 
 /* PathInfo/FileInfo infolevels */
 #define SMB_INFO_STANDARD                   1
+#define SMB_INFO_QUERY_EAS_FROM_LIST        3
+#define SMB_INFO_QUERY_ALL_EAS              4
 #define SMB_INFO_IS_NAME_VALID              6
 #define SMB_QUERY_FILE_BASIC_INFO       0x101
 #define SMB_QUERY_FILE_STANDARD_INFO    0x102
+#define SMB_QUERY_FILE_EA_INFO          0x103
 #define SMB_QUERY_FILE_NAME_INFO        0x104
 #define SMB_QUERY_FILE_ALLOCATION_INFO  0x105
 #define SMB_QUERY_FILE_END_OF_FILEINFO  0x106
@@ -1007,8 +1071,13 @@ typedef union smb_com_transaction2 {
 #define SMB_SET_FILE_UNIX_HLINK         0x203
 #define SMB_SET_FILE_BASIC_INFO2        0x3ec
 #define SMB_SET_FILE_RENAME_INFORMATION 0x3f2
+#define SMB_FILE_ALL_INFO2              0x3fa
 #define SMB_SET_FILE_ALLOCATION_INFO2   0x3fb
 #define SMB_SET_FILE_END_OF_FILE_INFO2  0x3fc
+#define SMB_FILE_MOVE_CLUSTER_INFO      0x407
+#define SMB_FILE_QUOTA_INFO             0x408
+#define SMB_FILE_REPARSEPOINT_INFO      0x409
+#define SMB_FILE_MAXIMUM_INFO           0x40d
 
 /* Find File infolevels */
 #define SMB_FIND_FILE_DIRECTORY_INFO      0x101
@@ -1103,10 +1172,10 @@ typedef struct smb_com_transaction2_spi_
 } TRANSACTION2_SPI_RSP;
 
 struct set_file_rename {
-        __u32 overwrite;   /* 1 = overwrite dest */
-        __u32 root_fid;   /* zero */
+	__u32 overwrite;   /* 1 = overwrite dest */
+	__u32 root_fid;   /* zero */
 	__u32 target_name_len;
-        char  target_name[0];  /* Must be unicode */
+	char  target_name[0];  /* Must be unicode */
 };
 
 struct smb_com_transaction2_sfi_req {
@@ -1270,6 +1339,7 @@ typedef struct smb_com_transaction2_fnex
 	__u16 LastNameOffset;
 } T2_FNEXT_RSP_PARMS;
 
+/* QFSInfo Levels */
 #define SMB_INFO_ALLOCATION         1
 #define SMB_INFO_VOLUME             2
 #define SMB_QUERY_FS_VOLUME_INFO    0x102
@@ -1277,6 +1347,8 @@ typedef struct smb_com_transaction2_fnex
 #define SMB_QUERY_FS_DEVICE_INFO    0x104
 #define SMB_QUERY_FS_ATTRIBUTE_INFO 0x105
 #define SMB_QUERY_CIFS_UNIX_INFO    0x200
+#define SMB_QUERY_LABEL_INFO        0x3ea
+#define SMB_QUERY_FS_QUOTA_INFO     0x3ee
 
 typedef struct smb_com_transaction2_qfsi_req {
 	struct smb_hdr hdr;	/* wct = 14+ */
@@ -1337,7 +1409,7 @@ typedef struct smb_com_transaction2_get_
 	__u8 Reserved3;
 	__u16 SubCommand;	/* one setup word */
 	__u16 ByteCount;
-	__u8 Pad[3];		/* Win2K has sent 0x0F01 (max resp length perhaps?) followed by one byte pad - doesnt seem to matter though */
+	__u8 Pad[3];		/* Win2K has sent 0x0F01 (max resp length perhaps?) followed by one byte pad - doesn't seem to matter though */
 	__u16 MaxReferralLevel;
 	char RequestFileName[1];
 } TRANSACTION2_GET_DFS_REFER_REQ;
@@ -1618,16 +1690,17 @@ struct gealist {
 };
 
 struct fea {
-	unsigned char fEA;
-	unsigned char cbName;
-	unsigned short cbValue;
+	unsigned char EA_flags;
+	__u8 name_len;
+	__u16 value_len;
 	char szName[1];
+	/* optionally followed by value */
 };
 /* flags for _FEA.fEA */
 #define FEA_NEEDEA         0x80	/* need EA bit */
 
 struct fealist {
-	unsigned long cbList;
+	__u32 list_len;
 	struct fea list[1];
 };
 
@@ -1638,6 +1711,83 @@ struct data_blob {
 	void (*free) (struct data_blob * data_blob);
 };
 
+#ifdef CONFIG_CIFS_POSIX
+/* 
+	For better POSIX semantics from Linux client, (even better
+	than the existing CIFS Unix Extensions) we need updated PDUs for:
+	
+	1) PosixCreateX - to set and return the mode, inode#, device info and
+	perhaps add a CreateDevice - to create Pipes and other special .inodes
+	Also note POSIX open flags
+	2) Close - to return the last write time to do cache across close more safely
+	3) PosixQFSInfo - to return statfs info
+	4) FindFirst return unique inode number - what about resume key, two forms short (matches readdir) and full (enough info to cache inodes)
+	5) Mkdir - set mode
+	
+	And under consideration: 
+	6) FindClose2 (return nanosecond timestamp ??)
+	7) Use nanosecond timestamps throughout all time fields if 
+	   corresponding attribute flag is set
+	8) sendfile - handle based copy
+	9) Direct i/o
+	10) "POSIX ACL" support
+	11) Misc fcntls?
+	
+	what about fixing 64 bit alignment
+	
+	There are also various legacy SMB/CIFS requests used as is
+	
+	From existing Lanman and NTLM dialects:
+	--------------------------------------
+	NEGOTIATE
+	SESSION_SETUP_ANDX (BB which?)
+	TREE_CONNECT_ANDX (BB which wct?)
+	TREE_DISCONNECT (BB add volume timestamp on response)
+	LOGOFF_ANDX
+	DELETE (note delete open file behavior)
+	DELETE_DIRECTORY
+	READ_AND_X
+	WRITE_AND_X
+	LOCKING_AND_X (note posix lock semantics)
+	RENAME (note rename across dirs and open file rename posix behaviors)
+	NT_RENAME (for hardlinks) Is this good enough for all features?
+	FIND_CLOSE2
+	TRANSACTION2 (18 cases)
+		SMB_SET_FILE_END_OF_FILE_INFO2 SMB_SET_PATH_END_OF_FILE_INFO2
+		(BB verify that never need to set allocation size)
+		SMB_SET_FILE_BASIC_INFO2 (setting times - BB can it be done via Unix ext?)
+	
+	COPY (note support for copy across directories) - FUTURE, OPTIONAL
+	setting/getting OS/2 EAs - FUTURE (BB can this handle
+	        setting Linux xattrs perfectly)         - OPTIONAL
+    dnotify                                         - FUTURE, OPTIONAL
+    quota                                           - FUTURE, OPTIONAL
+			
+	Note that various requests implemented for NT interop such as 
+		NT_TRANSACT (IOCTL) QueryReparseInfo
+	are unneeded to servers compliant with the CIFS POSIX extensions
+	
+	From CIFS Unix Extensions:
+	-------------------------
+	T2 SET_PATH_INFO (SMB_SET_FILE_UNIX_LINK) for symlinks
+	T2 SET_PATH_INFO (SMB_SET_FILE_BASIC_INFO2)
+	T2 QUERY_PATH_INFO (SMB_QUERY_FILE_UNIX_LINK)
+	T2 QUERY_PATH_INFO (SMB_QUERY_FILE_UNIX_BASIC) - BB check for missing inode fields
+					Actually need QUERY_FILE_UNIX_INFO since has inode num
+					BB what about a) blksize/blkbits/blocks
+								  b) i_version
+								  c) i_rdev
+								  d) notify mask?
+								  e) generation
+								  f) size_seqcount
+	T2 FIND_FIRST/FIND_NEXT FIND_FILE_UNIX
+	TRANS2_GET_DFS_REFERRAL				  - OPTIONAL but recommended
+	T2_QFS_INFO QueryDevice/AttributeInfo - OPTIONAL
+	
+	
+ */
+#endif 
+
 #pragma pack()			/* resume default structure packing */
 
 #endif				/* _CIFSPDU_H */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/cifs/cifsproto.h linux-2.4.20-wolk4.16-fullkernel/fs/cifs/cifsproto.h
--- linux-2.4.20-wolk4.15-fullkernel/fs/cifs/cifsproto.h	2004-06-29 11:24:22.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/cifs/cifsproto.h	2004-09-05 15:47:54.000000000 +0200
@@ -63,10 +63,10 @@ extern u64 cifs_UnixTimeToNT(time_t);
 extern int cifs_get_inode_info(struct inode **pinode,
 			const unsigned char *search_path, 
 			FILE_ALL_INFO * pfile_info,
-			struct super_block *sb);
+			struct super_block *sb, int xid);
 extern int cifs_get_inode_info_unix(struct inode **pinode,
 			const unsigned char *search_path,
-			struct super_block *sb);
+			struct super_block *sb,int xid);
 
 extern int cifs_setup_session(unsigned int xid, struct cifsSesInfo *pSesInfo, 
 			struct nls_table * nls_info);
@@ -239,8 +239,16 @@ extern int CIFSSMBSeek(int xid,
 			int whence, unsigned long offset, long long *newoffset);
 
 extern int CIFSSMBCopy(int xid,
-			struct cifsTconInfo *ftcon,
-			char *fromName,
-			struct cifsTconInfo *ttcon,
-			char *toName, int ofun, int flags);
+			struct cifsTconInfo *source_tcon,
+			const char *fromName,
+			const __u16 target_tid,
+			const char *toName, const int flags,
+			const struct nls_table *nls_codepage);
+extern int CIFSSMBNotify(const int xid, struct cifsTconInfo *tcon, 
+			const int notify_subdirs,const __u16 netfid,__u32 filter,
+			const struct nls_table *nls_codepage);
+extern int CIFSSMBQAllEAs(const int xid, struct cifsTconInfo *tcon,
+		 const unsigned char *searchName,
+		 char * EAData, size_t size,
+		 const struct nls_table *nls_codepage);
 #endif			/* _CIFSPROTO_H */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/cifs/cifssmb.c linux-2.4.20-wolk4.16-fullkernel/fs/cifs/cifssmb.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/cifs/cifssmb.c	2004-06-29 11:24:22.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/cifs/cifssmb.c	2004-09-05 15:47:54.000000000 +0200
@@ -37,13 +37,24 @@
 #include "cifs_unicode.h"
 #include "cifs_debug.h"
 
+#ifdef CONFIG_CIFS_POSIX
 static struct {
 	int index;
 	char *name;
 } protocols[] = {
 	{CIFS_PROT, "\2NT LM 0.12"}, 
+	{CIFS_PROT, "\2POSIX 2"},
 	{BAD_PROT, "\2"}
 };
+#else
+static struct {
+	int index;
+	char *name;
+} protocols[] = {
+	{CIFS_PROT, "\2NT LM 0.12"}, 
+	{BAD_PROT, "\2"}
+};
+#endif
 
 
 /* Mark as invalid, all open files on tree connections since they
@@ -145,7 +156,8 @@ smb_init(int smb_command, int wct, struc
 		return rc;
 
 	*request_buf = cifs_buf_get();
-	if (request_buf == 0) {
+	if (*request_buf == 0) {
+		/* BB should we add a retry in here if not a writepage? */
 		return -ENOMEM;
 	}
     /* Although the original thought was we needed the response buf for  */
@@ -156,6 +168,12 @@ smb_init(int smb_command, int wct, struc
 
 	header_assemble((struct smb_hdr *) *request_buf, smb_command, tcon,
 			wct /*wct */ );
+
+#ifdef CONFIG_CIFS_STATS
+        if(tcon != NULL) {
+                atomic_inc(&tcon->num_smbs_sent);
+        }
+#endif
 	return rc;
 }
 
@@ -174,7 +192,7 @@ CIFSSMBNegotiate(unsigned int xid, struc
 		rc = -EIO;
 		return rc;
 	}
-	rc = smb_init(SMB_COM_NEGOTIATE, 0, 0 /* no tcon yet */ ,
+	rc = smb_init(SMB_COM_NEGOTIATE, 0, NULL /* no tcon yet */ ,
 		      (void **) &pSMB, (void **) &pSMBr);
 	if (rc)
 		return rc;
@@ -299,8 +317,6 @@ CIFSSMBTDis(const int xid, struct cifsTc
 		return 0;  
 	}
 
-/* BB remove (from server) list of shares - but with smp safety  BB */
-/* BB is ses active - do we need to check here - but how? BB */
 	if((tcon->ses == 0) || (tcon->ses->server == 0)) {    
 		up(&tcon->tconSem);
 		return -EIO;
@@ -349,7 +365,7 @@ CIFSSMBLogoff(const int xid, struct cifs
 		return -EBUSY;
 	}
 
-	rc = smb_init(SMB_COM_LOGOFF_ANDX, 2, 0 /* no tcon anymore */,
+	rc = smb_init(SMB_COM_LOGOFF_ANDX, 2, NULL /* no tcon anymore */,
 		 (void **) &pSMB, (void **) &smb_buffer_response);
 
 	if(ses->server->secMode & (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED))
@@ -367,8 +383,12 @@ CIFSSMBLogoff(const int xid, struct cifs
 			 smb_buffer_response, &length, 0);
 	if (ses->server) {
 		atomic_dec(&ses->server->socketUseCount);
-		if (atomic_read(&ses->server->socketUseCount) == 0)
+		if (atomic_read(&ses->server->socketUseCount) == 0) {
+			spin_lock(&GlobalMid_Lock);
 			ses->server->tcpStatus = CifsExiting;
+			spin_unlock(&GlobalMid_Lock);
+			rc = -ESHUTDOWN;
+		}
 	}
 	if (pSMB)
 		cifs_buf_release(pSMB);
@@ -420,7 +440,13 @@ DelFileRetry:
 			 (struct smb_hdr *) pSMBr, &bytes_returned, 0);
 	if (rc) {
 		cFYI(1, ("Error in RMFile = %d", rc));
-	}
+	} 
+#ifdef CONFIG_CIFS_STATS
+        else {
+		atomic_inc(&tcon->num_deletes);
+        }
+#endif
+
 	if (pSMB)
 		cifs_buf_release(pSMB);
 	if (rc == -EAGAIN)
@@ -448,8 +474,8 @@ RmDirRetry:
 
 	if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
 		name_len = cifs_strtoUCS((wchar_t *) pSMB->DirName, dirName, 530
-					 /* find define for this maxpathcomponent */
-					 , nls_codepage);
+				/* find define for this maxpathcomponent */
+				, nls_codepage);
 		name_len++;	/* trailing null */
 		name_len *= 2;
 	} else {		/* BB improve the check for buffer overruns BB */
@@ -467,6 +493,12 @@ RmDirRetry:
 	if (rc) {
 		cFYI(1, ("Error in RMDir = %d", rc));
 	}
+#ifdef CONFIG_CIFS_STATS
+        else {
+		atomic_inc(&tcon->num_rmdirs);
+        }
+#endif
+
 	if (pSMB)
 		cifs_buf_release(pSMB);
 	if (rc == -EAGAIN)
@@ -512,6 +544,11 @@ MkDirRetry:
 	if (rc) {
 		cFYI(1, ("Error in Mkdir = %d", rc));
 	}
+#ifdef CONFIG_CIFS_STATS
+        else {
+		atomic_inc(&tcon->num_mkdirs);
+        }
+#endif
 	if (pSMB)
 		cifs_buf_release(pSMB);
 	if (rc == -EAGAIN)
@@ -564,8 +601,14 @@ openRetry:
 	}
 	pSMB->DesiredAccess = cpu_to_le32(access_flags);
 	pSMB->AllocationSize = 0;
-	pSMB->FileAttributes = ATTR_NORMAL;	/* XP does not handle ATTR_POSIX_SEMANTICS */
-	/*if ((omode & S_IWUGO) == 0)
+	pSMB->FileAttributes = ATTR_NORMAL;
+	/* XP does not handle ATTR_POSIX_SEMANTICS */
+	/* but it helps speed up case sensitive checks for other
+	servers such as Samba */
+	if (tcon->ses->capabilities & CAP_UNIX)
+		pSMB->FileAttributes |= ATTR_POSIX_SEMANTICS;
+
+	/* if ((omode & S_IWUGO) == 0)
 		pSMB->FileAttributes |= ATTR_READONLY;*/
 	/*  Above line causes problems due to vfs splitting create into two
 		pieces - need to set mode after file created not while it is
@@ -590,7 +633,10 @@ openRetry:
 	} else {
 		*pOplock = pSMBr->OplockLevel;	/* one byte no need to le_to_cpu */
 		*netfid = pSMBr->Fid;	/* cifs fid stays in le */
-		/* Do we care about the CreateAction in any cases? */
+		/* Let caller know file was created so we can set the mode. */
+		/* Do we care about the CreateAction in any other cases? */
+		if(cpu_to_le32(FILE_CREATE) == pSMBr->CreateAction)
+			*pOplock |= CIFS_CREATE_ACTION; 
 		if(pfile_info) {
 		    memcpy((char *)pfile_info,(char *)&pSMBr->CreationTime,
 			36 /* CreationTime to Attributes */);
@@ -599,6 +645,10 @@ openRetry:
 		    pfile_info->EndOfFile = pSMBr->EndOfFile;
 		    pfile_info->NumberOfLinks = cpu_to_le32(1);
 		}
+
+#ifdef CONFIG_CIFS_STATS
+		atomic_inc(&tcon->num_opens);
+#endif
 	}
 	if (pSMB)
 		cifs_buf_release(pSMB);
@@ -721,7 +771,7 @@ CIFSSMBWrite(const int xid, struct cifsT
 	rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
 			 (struct smb_hdr *) pSMBr, &bytes_returned, long_op);
 	if (rc) {
-		cERROR(1, ("Send error in write = %d", rc));
+		cFYI(1, ("Send error in write = %d", rc));
 		*nbytes = 0;
 	} else
 		*nbytes = le16_to_cpu(pSMBr->Count);
@@ -770,14 +820,20 @@ CIFSSMBLock(const int xid, struct cifsTc
 	pSMB->AndXCommand = 0xFF;	/* none */
 	pSMB->Fid = smb_file_id; /* netfid stays le */
 
-	pSMB->Locks[0].Pid = cpu_to_le16(current->tgid);
-	temp = cpu_to_le64(len);
-	pSMB->Locks[0].LengthLow = (__u32)(len & 0xFFFFFFFF);
-	pSMB->Locks[0].LengthHigh =  (__u32)(len>>32);
-	temp = cpu_to_le64(offset);
-	pSMB->Locks[0].OffsetLow = (__u32)(offset & 0xFFFFFFFF);
-	pSMB->Locks[0].OffsetHigh = (__u32)(offset>>32);
-	pSMB->ByteCount = sizeof (LOCKING_ANDX_RANGE);
+	if(numLock != 0) {
+		pSMB->Locks[0].Pid = cpu_to_le16(current->tgid);
+		/* BB where to store pid high? */
+		temp = cpu_to_le64(len);
+		pSMB->Locks[0].LengthLow = (__u32)(temp & 0xFFFFFFFF);
+		pSMB->Locks[0].LengthHigh =  (__u32)(temp>>32);
+		temp = cpu_to_le64(offset);
+		pSMB->Locks[0].OffsetLow = (__u32)(temp & 0xFFFFFFFF);
+		pSMB->Locks[0].OffsetHigh = (__u32)(temp>>32);
+		pSMB->ByteCount = sizeof (LOCKING_ANDX_RANGE);
+	} else {
+		/* oplock break */
+		pSMB->ByteCount = 0;
+	}
 	pSMB->hdr.smb_buf_length += pSMB->ByteCount;
 	pSMB->ByteCount = cpu_to_le16(pSMB->ByteCount);
 
@@ -785,7 +841,7 @@ CIFSSMBLock(const int xid, struct cifsTc
 			 (struct smb_hdr *) pSMBr, &bytes_returned, timeout);
 
 	if (rc) {
-		cERROR(1, ("Send error in Lock = %d", rc));
+		cFYI(1, ("Send error in Lock = %d", rc));
 	}
 	if (pSMB)
 		cifs_buf_release(pSMB);
@@ -818,7 +874,10 @@ CIFSSMBClose(const int xid, struct cifsT
 	rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
 			 (struct smb_hdr *) pSMBr, &bytes_returned, 0);
 	if (rc) {
-		cERROR(1, ("Send error in Close = %d", rc));
+		if(rc!=-EINTR) {
+			/* EINTR is expected when user ctl-c to kill app */
+			cERROR(1, ("Send error in Close = %d", rc));
+		}
 	}
 	if (pSMB)
 		cifs_buf_release(pSMB);
@@ -882,7 +941,6 @@ renameRetry:
 	}
 
 	pSMB->ByteCount = 1 /* 1st signature byte */  + name_len + name_len2;
-    /* we could also set search attributes but not needed */
 	pSMB->hdr.smb_buf_length += pSMB->ByteCount;
 	pSMB->ByteCount = cpu_to_le16(pSMB->ByteCount);
 
@@ -890,7 +948,14 @@ renameRetry:
 			 (struct smb_hdr *) pSMBr, &bytes_returned, 0);
 	if (rc) {
 		cFYI(1, ("Send error in rename = %d", rc));
+	} 
+
+#ifdef CONFIG_CIFS_STATS
+	  else {
+		atomic_inc(&tcon->num_renames);
 	}
+#endif
+
 	if (pSMB)
 		cifs_buf_release(pSMB);
 
@@ -912,34 +977,34 @@ int CIFSSMBRenameOpenFile(const int xid,
 	int bytes_returned = 0;
 	int len_of_str;
 
-        cFYI(1, ("Rename to File by handle"));
-        rc = smb_init(SMB_COM_TRANSACTION2, 15, pTcon, (void **) &pSMB,
-                      (void **) &pSMBr);
-        if (rc)
-                return rc;
+	cFYI(1, ("Rename to File by handle"));
+	rc = smb_init(SMB_COM_TRANSACTION2, 15, pTcon, (void **) &pSMB,
+			(void **) &pSMBr);
+	if (rc)
+		return rc;
 
-        pSMB->ParameterCount = 6;
-        pSMB->MaxSetupCount = 0;
-        pSMB->Reserved = 0;
-        pSMB->Flags = 0;
-        pSMB->Timeout = 0;
-        pSMB->Reserved2 = 0;
-        pSMB->ParameterOffset = offsetof(struct smb_com_transaction2_sfi_req,
-                                     Fid) - 4;
-        pSMB->DataOffset = pSMB->ParameterOffset + pSMB->ParameterCount;
+	pSMB->ParameterCount = 6;
+	pSMB->MaxSetupCount = 0;
+	pSMB->Reserved = 0;
+	pSMB->Flags = 0;
+	pSMB->Timeout = 0;
+	pSMB->Reserved2 = 0;
+	pSMB->ParameterOffset = offsetof(struct smb_com_transaction2_sfi_req,
+				Fid) - 4;
+	pSMB->DataOffset = pSMB->ParameterOffset + pSMB->ParameterCount;
 
-        data_offset = (char *) (&pSMB->hdr.Protocol) + pSMB->DataOffset;
+	data_offset = (char *) (&pSMB->hdr.Protocol) + pSMB->DataOffset;
 	rename_info = (struct set_file_rename *) data_offset;
-        pSMB->MaxParameterCount = cpu_to_le16(2);
-        pSMB->MaxDataCount = cpu_to_le16(1000); /* BB find max SMB PDU from sess */
-        pSMB->SetupCount = 1;
-        pSMB->Reserved3 = 0;
-        pSMB->SubCommand = cpu_to_le16(TRANS2_SET_FILE_INFORMATION);
-        pSMB->ByteCount = 3 /* pad */  + pSMB->ParameterCount;
-        pSMB->ParameterCount = cpu_to_le16(pSMB->ParameterCount);
-        pSMB->TotalParameterCount = pSMB->ParameterCount;
-        pSMB->ParameterOffset = cpu_to_le16(pSMB->ParameterOffset);
-        pSMB->DataOffset = cpu_to_le16(pSMB->DataOffset);
+	pSMB->MaxParameterCount = cpu_to_le16(2);
+	pSMB->MaxDataCount = cpu_to_le16(1000); /* BB find max SMB PDU from sess */
+	pSMB->SetupCount = 1;
+	pSMB->Reserved3 = 0;
+	pSMB->SubCommand = cpu_to_le16(TRANS2_SET_FILE_INFORMATION);
+	pSMB->ByteCount = 3 /* pad */  + pSMB->ParameterCount;
+	pSMB->ParameterCount = cpu_to_le16(pSMB->ParameterCount);
+	pSMB->TotalParameterCount = pSMB->ParameterCount;
+	pSMB->ParameterOffset = cpu_to_le16(pSMB->ParameterOffset);
+	pSMB->DataOffset = cpu_to_le16(pSMB->DataOffset);
 	/* construct random name ".cifs_tmp<inodenum><mid>" */
 	rename_info->overwrite = cpu_to_le32(1);
 	rename_info->root_fid  = 0;
@@ -964,11 +1029,15 @@ int CIFSSMBRenameOpenFile(const int xid,
 	rc = SendReceive(xid, pTcon->ses, (struct smb_hdr *) pSMB,
                          (struct smb_hdr *) pSMBr, &bytes_returned, 0);
 	if (rc) {
-                cFYI(1,("Send error in Rename (by file handle) = %d", rc));
+		cFYI(1,("Send error in Rename (by file handle) = %d", rc));
 	}
-
+#ifdef CONFIG_CIFS_STATS
+	  else {
+		atomic_inc(&pTcon->num_t2renames);
+	}
+#endif
 	if (pSMB)
-                cifs_buf_release(pSMB);
+		cifs_buf_release(pSMB);
 
 	/* Note: On -EAGAIN error only caller can retry on handle based calls
 		since file handle passed in no longer valid */
@@ -976,6 +1045,76 @@ int CIFSSMBRenameOpenFile(const int xid,
 	return rc;
 }
 
+int
+CIFSSMBCopy(const int xid, struct cifsTconInfo *tcon, const char * fromName, 
+            const __u16 target_tid, const char *toName, const int flags,
+            const struct nls_table *nls_codepage)
+{
+	int rc = 0;
+	COPY_REQ *pSMB = NULL;
+	COPY_RSP *pSMBr = NULL;
+	int bytes_returned;
+	int name_len, name_len2;
+
+	cFYI(1, ("In CIFSSMBCopy"));
+copyRetry:
+	rc = smb_init(SMB_COM_COPY, 1, tcon, (void **) &pSMB,
+			(void **) &pSMBr);
+	if (rc)
+		return rc;
+
+	pSMB->BufferFormat = 0x04;
+	pSMB->Tid2 = target_tid;
+
+	if(flags & COPY_TREE)
+		pSMB->Flags |= COPY_TREE;
+	pSMB->Flags = cpu_to_le16(pSMB->Flags);
+
+	if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
+		name_len = cifs_strtoUCS((wchar_t *) pSMB->OldFileName, 
+				fromName, 
+				530 /* find define for this maxpathcomponent */,
+				nls_codepage);
+		name_len++;     /* trailing null */
+		name_len *= 2;
+		pSMB->OldFileName[name_len] = 0x04;     /* pad */
+		/* protocol requires ASCII signature byte on Unicode string */
+		pSMB->OldFileName[name_len + 1] = 0x00;
+		name_len2 = cifs_strtoUCS((wchar_t *) & pSMB->
+				OldFileName[name_len + 2], toName, 530,
+				nls_codepage);
+		name_len2 += 1 /* trailing null */  + 1 /* Signature word */ ;
+		name_len2 *= 2; /* convert to bytes */
+	} else {                /* BB improve the check for buffer overruns BB */
+		name_len = strnlen(fromName, 530);
+		name_len++;     /* trailing null */
+		strncpy(pSMB->OldFileName, fromName, name_len);
+		name_len2 = strnlen(toName, 530);
+		name_len2++;    /* trailing null */
+		pSMB->OldFileName[name_len] = 0x04;  /* 2nd buffer format */
+		strncpy(&pSMB->OldFileName[name_len + 1], toName, name_len2);
+		name_len2++;    /* trailing null */
+		name_len2++;    /* signature byte */
+	}
+
+	pSMB->ByteCount = 1 /* 1st signature byte */  + name_len + name_len2;
+	pSMB->hdr.smb_buf_length += pSMB->ByteCount;
+	pSMB->ByteCount = cpu_to_le16(pSMB->ByteCount);
+
+	rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
+		(struct smb_hdr *) pSMBr, &bytes_returned, 0);
+	if (rc) {
+		cFYI(1, ("Send error in copy = %d with %d files copied",
+			rc, pSMBr->CopyCount));
+	}
+	if (pSMB)
+		cifs_buf_release(pSMB);
+
+	if (rc == -EAGAIN)
+		goto copyRetry;
+
+	return rc;
+}
 
 int
 CIFSUnixCreateSymLink(const int xid, struct cifsTconInfo *tcon,
@@ -1346,9 +1485,9 @@ CIFSSMBQueryReparseLinkInfo(const int xi
 
 	pSMB->TotalParameterCount = 0 ;
 	pSMB->TotalDataCount = 0;
-	pSMB->MaxParameterCount = cpu_to_le16(2);
+	pSMB->MaxParameterCount = cpu_to_le32(2);
 	/* BB find exact data count max from sess structure BB */
-	pSMB->MaxDataCount = cpu_to_le16(4000);
+	pSMB->MaxDataCount = cpu_to_le32(4000);
 	pSMB->MaxSetupCount = 4;
 	pSMB->Reserved = 0;
 	pSMB->ParameterOffset = 0;
@@ -1475,6 +1614,8 @@ QPathInfoRetry:
 	} else {		/* decode response */
 		pSMBr->DataOffset = le16_to_cpu(pSMBr->DataOffset);
 		/* BB also check enough total bytes returned */
+		/* BB we need to improve the validity checking
+		of these trans2 responses */
 		if ((pSMBr->ByteCount < 40) || (pSMBr->DataOffset > 512)) 
 			rc = -EIO;	/* bad smb */
 		else if (pFindData){
@@ -1502,7 +1643,7 @@ CIFSSMBUnixQPathInfo(const int xid, stru
 	TRANSACTION2_QPI_REQ *pSMB = NULL;
 	TRANSACTION2_QPI_RSP *pSMBr = NULL;
 	int rc = 0;
-	int bytes_returned;
+	int bytes_returned = 0;
 	int name_len;
 
 	cFYI(1, ("In QPathInfo (Unix) the path %s", searchName));
@@ -1558,9 +1699,13 @@ UnixQPathInfoRetry:
 	} else {		/* decode response */
 		pSMBr->DataOffset = le16_to_cpu(pSMBr->DataOffset);
 		/* BB also check if enough total bytes returned */
-		if ((pSMBr->ByteCount < 40) || (pSMBr->DataOffset > 512))
+		if ((pSMBr->ByteCount < sizeof(FILE_UNIX_BASIC_INFO)) || 
+			(pSMBr->DataOffset > 512) || 
+			(pSMBr->DataOffset < sizeof(struct smb_hdr))) {
+			cFYI(1,("UnixQPathinfo invalid data offset %d bytes returned %d",
+					(int)pSMBr->DataOffset,bytes_returned));
 			rc = -EIO;	/* bad smb */
-		else {
+		} else {
 			memcpy((char *) pFindData,
 			       (char *) &pSMBr->hdr.Protocol +
 			       pSMBr->DataOffset,
@@ -1924,7 +2069,7 @@ CIFSGetDFSRefer(const int xid, struct ci
 	if (ses == NULL)
 		return -ENODEV;
 getDFSRetry:
-	rc = smb_init(SMB_COM_TRANSACTION2, 15, 0, (void **) &pSMB,
+	rc = smb_init(SMB_COM_TRANSACTION2, 15, NULL, (void **) &pSMB,
 		      (void **) &pSMBr);
 	if (rc)
 		return rc;
@@ -2197,6 +2342,11 @@ QFSAttributeRetry:
 			    (FILE_SYSTEM_ATTRIBUTE_INFO
 			     *) (((char *) &pSMBr->hdr.Protocol) +
 				 pSMBr->DataOffset);
+			response_data->Attributes = le32_to_cpu(response_data->Attributes);
+			response_data->MaxPathNameComponentLength = 
+				le32_to_cpu(response_data->MaxPathNameComponentLength);
+			response_data->FileSystemNameLen = 
+				le32_to_cpu(response_data->FileSystemNameLen);
 			memcpy(&tcon->fsAttrInfo, response_data,
 			       sizeof (FILE_SYSTEM_ATTRIBUTE_INFO));
 		}
@@ -2266,6 +2416,10 @@ QFSDeviceRetry:
 			    (FILE_SYSTEM_DEVICE_INFO
 			     *) (((char *) &pSMBr->hdr.Protocol) +
 				 pSMBr->DataOffset);
+			response_data->DeviceType = 
+				le32_to_cpu(response_data->DeviceType);
+			response_data->DeviceCharacteristics = 
+				le32_to_cpu(response_data->DeviceCharacteristics);
 			memcpy(&tcon->fsDevInfo, response_data,
 			       sizeof (FILE_SYSTEM_DEVICE_INFO));
 		}
@@ -2276,7 +2430,6 @@ QFSDeviceRetry:
 	if (rc == -EAGAIN)
 		goto QFSDeviceRetry;
 
-
 	return rc;
 }
 
@@ -2334,6 +2487,12 @@ QFSUnixRetry:
 			    (FILE_SYSTEM_UNIX_INFO
 			     *) (((char *) &pSMBr->hdr.Protocol) +
 				 pSMBr->DataOffset);
+			response_data->MajorVersionNumber =
+				le16_to_cpu(response_data->MajorVersionNumber);
+			response_data->MinorVersionNumber =
+				le16_to_cpu(response_data->MinorVersionNumber);
+			response_data->Capability =
+				le64_to_cpu(response_data->Capability);
 			memcpy(&tcon->fsUnixInfo, response_data,
 			       sizeof (FILE_SYSTEM_UNIX_INFO));
 		}
@@ -2456,7 +2615,8 @@ CIFSSMBSetFileSize(const int xid, struct
 	int bytes_returned = 0;
 	__u32 tmp;
 
-	cFYI(1, ("SetFileSize (via SetFileInfo)"));
+	cFYI(1, ("SetFileSize (via SetFileInfo) %lld",
+			(long long)size));
 	rc = smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &pSMB,
 		      (void **) &pSMBr);
 	if (rc)
@@ -2496,7 +2656,7 @@ CIFSSMBSetFileSize(const int xid, struct
 		(struct file_end_of_file_info *) (((char *) &pSMB->hdr.Protocol) +
 			pSMB->DataOffset);
 	pSMB->DataOffset = cpu_to_le16(pSMB->DataOffset); /* now safe to change to le */
-	parm_data->FileSize = size;
+	parm_data->FileSize = cpu_to_le64(size);
 	pSMB->Fid = fid;
 	if(SetAllocation) {
 		if (tcon->ses->capabilities & CAP_INFOLEVEL_PASSTHRU)
@@ -2678,6 +2838,23 @@ setPermsRetry:
 	data_offset->DevMajor = cpu_to_le64(MAJOR(device));
 	data_offset->DevMinor = cpu_to_le64(MINOR(device));
 	data_offset->Permissions = cpu_to_le64(mode);
+    
+	if(S_ISREG(mode))
+		data_offset->Type = cpu_to_le32(UNIX_FILE);
+	else if(S_ISDIR(mode))
+		data_offset->Type = cpu_to_le32(UNIX_DIR);
+	else if(S_ISLNK(mode))
+		data_offset->Type = cpu_to_le32(UNIX_SYMLINK);
+	else if(S_ISCHR(mode))
+		data_offset->Type = cpu_to_le32(UNIX_CHARDEV);
+	else if(S_ISBLK(mode))
+		data_offset->Type = cpu_to_le32(UNIX_BLOCKDEV);
+	else if(S_ISFIFO(mode))
+		data_offset->Type = cpu_to_le32(UNIX_FIFO);
+	else if(S_ISSOCK(mode))
+		data_offset->Type = cpu_to_le32(UNIX_SOCKET);
+
+
 	pSMB->ByteCount = cpu_to_le16(pSMB->ByteCount);
 	rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
 			 (struct smb_hdr *) pSMBr, &bytes_returned, 0);
@@ -2691,3 +2868,149 @@ setPermsRetry:
 		goto setPermsRetry;
 	return rc;
 }
+
+int CIFSSMBNotify(const int xid, struct cifsTconInfo *tcon, 
+			const int notify_subdirs, const __u16 netfid,
+			__u32 filter, const struct nls_table *nls_codepage)
+{
+	int rc = 0;
+	struct smb_com_transaction_change_notify_req * pSMB = NULL;
+	struct smb_com_transaction_change_notify_rsp * pSMBr = NULL;
+	int bytes_returned;
+
+	cFYI(1, ("In CIFSSMBNotify for file handle %d",(int)netfid));
+	rc = smb_init(SMB_COM_NT_TRANSACT, 23, tcon, (void **) &pSMB,
+                      (void **) &pSMBr);
+	if (rc)
+		return rc;
+
+	pSMB->TotalParameterCount = 0 ;
+	pSMB->TotalDataCount = 0;
+	pSMB->MaxParameterCount = cpu_to_le32(2);
+	/* BB find exact data count max from sess structure BB */
+	pSMB->MaxDataCount = 0; /* same in little endian or be */
+	pSMB->MaxSetupCount = 4;
+	pSMB->Reserved = 0;
+	pSMB->ParameterOffset = 0;
+	pSMB->DataCount = 0;
+	pSMB->DataOffset = 0;
+	pSMB->SetupCount = 4; /* single byte does not need le conversion */
+	pSMB->SubCommand = cpu_to_le16(NT_TRANSACT_NOTIFY_CHANGE);
+	pSMB->ParameterCount = pSMB->TotalParameterCount;
+	if(notify_subdirs)
+		pSMB->WatchTree = 1; /* one byte - no le conversion needed */
+	pSMB->Reserved2 = 0;
+	pSMB->CompletionFilter = cpu_to_le32(filter);
+	pSMB->Fid = netfid; /* file handle always le */
+	pSMB->ByteCount = 0;
+
+	pSMB->hdr.smb_buf_length += pSMB->ByteCount;
+	rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
+			(struct smb_hdr *) pSMBr, &bytes_returned, 0);
+	if (rc) {
+		cFYI(1, ("Error in Notify = %d", rc));
+	}
+	if (pSMB)
+		cifs_buf_release(pSMB);
+/*		if (rc == -EAGAIN)
+			goto NotifyRetry; */
+	return rc;	
+}
+#ifdef CONFIG_CIFS_XATTR
+int
+CIFSSMBQAllEAs(const int xid, struct cifsTconInfo *tcon,
+		 const unsigned char *searchName,
+		 char * EAData, size_t size,
+		 const struct nls_table *nls_codepage)
+{
+		/* BB assumes one setup word */
+	TRANSACTION2_QPI_REQ *pSMB = NULL;
+	TRANSACTION2_QPI_RSP *pSMBr = NULL;
+	int rc = 0;
+	int bytes_returned;
+	int name_len;
+
+	cFYI(1, ("In Query All EAs path %s", searchName));
+QAllEAsRetry:
+	rc = smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &pSMB,
+		      (void **) &pSMBr);
+	if (rc)
+		return rc;
+
+	if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
+		name_len =
+		    cifs_strtoUCS((wchar_t *) pSMB->FileName, searchName, 530
+				  /* find define for this maxpathcomponent */
+				  , nls_codepage);
+		name_len++;	/* trailing null */
+		name_len *= 2;
+	} else {		/* BB improve the check for buffer overruns BB */
+		name_len = strnlen(searchName, 530);
+		name_len++;	/* trailing null */
+		strncpy(pSMB->FileName, searchName, name_len);
+	}
+
+	pSMB->TotalParameterCount = 2 /* level */  + 4 /* reserved */  +
+	    name_len /* includes null */ ;
+	pSMB->TotalDataCount = 0;
+	pSMB->MaxParameterCount = cpu_to_le16(2);
+	pSMB->MaxDataCount = cpu_to_le16(4000);	/* BB find exact max SMB PDU from sess structure BB */
+	pSMB->MaxSetupCount = 0;
+	pSMB->Reserved = 0;
+	pSMB->Flags = 0;
+	pSMB->Timeout = 0;
+	pSMB->Reserved2 = 0;
+	pSMB->ParameterOffset = cpu_to_le16(offsetof(
+        struct smb_com_transaction2_qpi_req ,InformationLevel) - 4);
+	pSMB->DataCount = 0;
+	pSMB->DataOffset = 0;
+	pSMB->SetupCount = 1;
+	pSMB->Reserved3 = 0;
+	pSMB->SubCommand = cpu_to_le16(TRANS2_QUERY_PATH_INFORMATION);
+	pSMB->ByteCount = pSMB->TotalParameterCount + 1 /* pad */ ;
+	pSMB->TotalParameterCount = cpu_to_le16(pSMB->TotalParameterCount);
+	pSMB->ParameterCount = pSMB->TotalParameterCount;
+	pSMB->InformationLevel = cpu_to_le16(SMB_INFO_QUERY_ALL_EAS);
+	pSMB->Reserved4 = 0;
+	pSMB->hdr.smb_buf_length += pSMB->ByteCount;
+	pSMB->ByteCount = cpu_to_le16(pSMB->ByteCount);
+
+	rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
+			 (struct smb_hdr *) pSMBr, &bytes_returned, 0);
+	if (rc) {
+		cFYI(1, ("Send error in QueryAllEAs = %d", rc));
+	} else {		/* decode response */
+		pSMBr->DataOffset = le16_to_cpu(pSMBr->DataOffset);
+		/* BB also check enough total bytes returned */
+		/* BB we need to improve the validity checking
+		of these trans2 responses */
+		if ((pSMBr->ByteCount < 4) || (pSMBr->DataOffset > 512)) 
+			rc = -EIO;	/* bad smb */
+	   /* else if (pFindData){
+			memcpy((char *) pFindData,
+			       (char *) &pSMBr->hdr.Protocol +
+			       pSMBr->DataOffset, kl);
+		}*/ else {
+			/* check that length of list is not more than bcc */
+			/* check that each entry does not go beyond length
+			   of list */
+			/* check that each element of each entry does not
+			   go beyond end of list */
+			struct fealist * ea_response_data;
+			rc = 0;
+			/* validate_trans2_offsets() */
+			/* BB to check if(start of smb + pSMBr->DataOffset > &bcc+ bcc)*/
+			ea_response_data = (struct fealist *)
+				(((char *) &pSMBr->hdr.Protocol) +
+				pSMBr->DataOffset);
+			cFYI(1,("ea length %d",ea_response_data->list_len));
+		}
+	}
+	if (pSMB)
+		cifs_buf_release(pSMB);
+	if (rc == -EAGAIN)
+		goto QAllEAsRetry;
+
+	return rc;
+}
+#endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/cifs/connect.c linux-2.4.20-wolk4.16-fullkernel/fs/cifs/connect.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/cifs/connect.c	2004-06-29 11:24:22.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/cifs/connect.c	2004-09-05 15:47:54.000000000 +0200
@@ -1,7 +1,7 @@
 /*
  *   fs/cifs/connect.c
  *
- *   Copyright (C) International Business Machines  Corp., 2002,2003
+ *   Copyright (C) International Business Machines  Corp., 2002,2004
  *   Author(s): Steve French (sfrench@us.ibm.com)
  *
  *   This library is free software; you can redistribute it and/or modify
@@ -26,6 +26,8 @@
 #include <linux/version.h>
 #include <linux/ipv6.h>
 #include <linux/pagemap.h>
+#include <linux/ctype.h>
+#include <linux/utsname.h>
 #include <asm/uaccess.h>
 #include <asm/processor.h>
 #include "cifspdu.h"
@@ -36,6 +38,7 @@
 #include "cifs_fs_sb.h"
 #include "ntlmssp.h"
 #include "nterr.h"
+#include "rfc1002pdu.h"
 
 #define CIFS_PORT 445
 #define RFC1001_PORT 139
@@ -44,7 +47,7 @@ extern void SMBencrypt(unsigned char *pa
 		       unsigned char *p24);
 extern void SMBNTencrypt(unsigned char *passwd, unsigned char *c8,
 			 unsigned char *p24);
-extern int cifs_inet_addr(char *);
+extern int cifs_inet_pton(int, const char *, void *dst);
 
 struct smb_vol {
 	char *username;
@@ -53,20 +56,25 @@ struct smb_vol {
 	char *UNC;
 	char *UNCip;
 	char *iocharset;  /* local code page for mapping to and from Unicode */
-	char *source_rfc1001_name; /* netbios name of client */
+	char source_rfc1001_name[16]; /* netbios name of client */
 	uid_t linux_uid;
 	gid_t linux_gid;
 	mode_t file_mode;
 	mode_t dir_mode;
 	int rw:1;
 	int retry:1;
+	int intr:1;
 	unsigned int rsize;
 	unsigned int wsize;
 	unsigned int sockopt;
 	unsigned short int port;
 };
 
-int ipv4_connect(struct sockaddr_in *psin_server, struct socket **csocket);
+static int ipv4_connect(struct sockaddr_in *psin_server, 
+			struct socket **csocket,
+			char * netb_name);
+static int ipv6_connect(struct sockaddr_in6 *psin_server, 
+			struct socket **csocket);
 
 
 	/* 
@@ -87,9 +95,15 @@ cifs_reconnect(struct TCP_Server_Info *s
 	struct cifsTconInfo *tcon;
 	struct mid_q_entry * mid_entry;
 	
-	if(server->tcpStatus == CifsExiting)
+	spin_lock(&GlobalMid_Lock);
+	if(server->tcpStatus == CifsExiting) {
+		/* the demux thread will exit normally 
+		next time through the loop */
+		spin_unlock(&GlobalMid_Lock);
 		return rc;
-	server->tcpStatus = CifsNeedReconnect;
+	} else
+		server->tcpStatus = CifsNeedReconnect;
+	spin_unlock(&GlobalMid_Lock);
 	server->maxBuf = 0;
 
 	cFYI(1, ("Reconnecting tcp session "));
@@ -114,11 +128,12 @@ cifs_reconnect(struct TCP_Server_Info *s
 		}
 	}
 	read_unlock(&GlobalSMBSeslock);
-
+	/* do not want to be sending data on a socket we are freeing */
+	down(&server->tcpSem); 
 	if(server->ssocket) {
 		cFYI(1,("State: 0x%x Flags: 0x%lx", server->ssocket->state,
 			server->ssocket->flags));
-		server->ssocket->ops->shutdown(server->ssocket,SEND_SHUTDOWN);;
+		server->ssocket->ops->shutdown(server->ssocket,SEND_SHUTDOWN);
 		cFYI(1,("Post shutdown state: 0x%x Flags: 0x%lx", server->ssocket->state,
 			server->ssocket->flags));
 		sock_release(server->ssocket);
@@ -140,21 +155,30 @@ cifs_reconnect(struct TCP_Server_Info *s
 		}
 	}
 	spin_unlock(&GlobalMid_Lock);
-
+	up(&server->tcpSem); 
 
 	while ((server->tcpStatus != CifsExiting) && (server->tcpStatus != CifsGood))
 	{
-		rc = ipv4_connect(&server->sockAddr, &server->ssocket);
+		if(server->protocolType == IPV6) {
+			rc = ipv6_connect(&server->addr.sockAddr6,&server->ssocket);
+		} else {
+			rc = ipv4_connect(&server->addr.sockAddr, 
+					&server->ssocket,
+					server->workstation_RFC1001_name);
+		}
 		if(rc) {
 			set_current_state(TASK_INTERRUPTIBLE);
 			schedule_timeout(3 * HZ);
 		} else {
 			atomic_inc(&tcpSesReconnectCount);
-			server->tcpStatus = CifsGood;
+			spin_lock(&GlobalMid_Lock);
+			if(server->tcpStatus != CifsExiting)
+				server->tcpStatus = CifsGood;
+			spin_unlock(&GlobalMid_Lock);
+	/*		atomic_set(&server->inFlight,0);*/
 			wake_up(&server->response_q);
 		}
 	}
-
 	return rc;
 }
 
@@ -176,9 +200,8 @@ cifs_demultiplex_thread(struct TCP_Serve
 
 	daemonize();
 	sprintf(current->comm,"cifsd");
-	
-/*	allow_signal(SIGKILL);*/
-
+	/* allow_signal(SIGKILL);*/
+	current->flags |= PF_MEMALLOC;
 	server->tsk = current;	/* save process info to wake at shutdown */
 	cFYI(1, ("Demultiplex PID: %d", current->pid));
 
@@ -192,9 +215,10 @@ cifs_demultiplex_thread(struct TCP_Serve
 			memset(smb_buffer, 0, sizeof (struct smb_hdr));
 
 		if (smb_buffer == NULL) {
-			cERROR(1,
-			       ("Can not get mem for SMB response buffer "));
-			return -ENOMEM;
+			cERROR(1,("Can not get memory for SMB response"));
+			set_current_state(TASK_INTERRUPTIBLE);
+			schedule_timeout(HZ * 3); /* give system time to free memory */
+			continue;
 		}
 		iov.iov_base = smb_buffer;
 		iov.iov_len = sizeof (struct smb_hdr) - 1;	
@@ -219,6 +243,7 @@ cifs_demultiplex_thread(struct TCP_Serve
 			csocket = server->ssocket;
 			continue;
 		} else if ((length == -ERESTARTSYS) || (length == -EAGAIN)) {
+			set_current_state(TASK_INTERRUPTIBLE);
 			schedule_timeout(1); /* minimum sleep to prevent looping
 				allowing socket to clear and app threads to set
 				tcpStatus CifsNeedReconnect if server hung */
@@ -229,39 +254,64 @@ cifs_demultiplex_thread(struct TCP_Serve
 				/* some servers kill tcp session rather than returning
 					smb negprot error in which case reconnecting here is
 					not going to help - return error to mount */
-				server->tcpStatus = CifsExiting;
 				break;
 			}
-
-			cFYI(1,("Reconnecting after unexpected rcvmsg error "));
+			if(length == -EINTR) { 
+				cFYI(1,("cifsd thread killed"));
+				break;
+			}
+			cFYI(1,("Reconnecting after unexpected peek error %d",length));
 			cifs_reconnect(server);
 			csocket = server->ssocket;
+			wake_up(&server->response_q);
 			continue;
 		}
 
 		pdu_length = 4 + ntohl(smb_buffer->smb_buf_length);
-		cFYI(1, ("Peek length rcvd: %d with smb length: %d", length, pdu_length));
+		/* Ony read pdu_length after below checks for too short (due
+		   to e.g. int overflow) and too long ie beyond end of buf */
+		cFYI(1, ("Peek length rcvd: 0x%x beginning 0x%x)", length, pdu_length));
 
 		temp = (char *) smb_buffer;
 		if (length > 3) {
-			if (temp[0] == (char) 0x85) {
+			if (temp[0] == (char) RFC1002_SESSION_KEEP_ALIVE) {
 				iov.iov_base = smb_buffer;
 				iov.iov_len = 4;
 				length = sock_recvmsg(csocket, &smb_msg, 4, 0);
-				cFYI(0,
-				     ("Received 4 byte keep alive packet "));
-			} else if ((temp[0] == (char) 0x83)
+				cFYI(0,("Received 4 byte keep alive packet"));
+			} else if (temp[0] == (char) RFC1002_POSITIVE_SESSION_RESPONSE) {
+				iov.iov_base = smb_buffer;
+					iov.iov_len = 4;
+					length = sock_recvmsg(csocket, &smb_msg, 4, 0);
+					cFYI(1,("Good RFC 1002 session rsp"));
+			} else if ((temp[0] == (char)RFC1002_NEGATIVE_SESSION_RESPONSE)
 				   && (length == 5)) {
 				/* we get this from Windows 98 instead of error on SMB negprot response */
-				cERROR(1,
-				       ("Negative RFC 1002 Session response. Error = 0x%x",
-					temp[4]));
-				break;
-
+				cFYI(1,("Negative RFC 1002 Session Response Error 0x%x)",temp[4]));
+				if(server->tcpStatus == CifsNew) {
+					/* if nack on negprot (rather than 
+					ret of smb negprot error) reconnecting
+					not going to help, ret error to mount */
+					break;
+				} else {
+					/* give server a second to
+					clean up before reconnect attempt */
+					set_current_state(TASK_INTERRUPTIBLE);
+					schedule_timeout(HZ);
+					/* always try 445 first on reconnect
+					since we get NACK on some if we ever
+					connected to port 139 (the NACK is 
+					since we do not begin with RFC1001
+					session initialize frame) */
+					server->addr.sockAddr.sin_port = CIFS_PORT;
+					cifs_reconnect(server);
+					csocket = server->ssocket;
+					wake_up(&server->response_q);
+					continue;
+				}
 			} else if (temp[0] != (char) 0) {
-				cERROR(1,
-				       ("Unknown RFC 1001 frame received not 0x00 nor 0x85"));
-				cifs_dump_mem(" Received Data is: ", temp, length);
+				cERROR(1,("Unknown RFC 1002 frame"));
+				cifs_dump_mem(" Received Data: ", temp, length);
 				cifs_reconnect(server);
 				csocket = server->ssocket;
 				continue;
@@ -289,8 +339,9 @@ cifs_demultiplex_thread(struct TCP_Serve
 					length = 0;
 					iov.iov_base = smb_buffer;
 					iov.iov_len = pdu_length;
-					for (total_read = 0; total_read < pdu_length; total_read += length) {	
-             /* Should improve check for buffer overflow with bad pdu_length */
+					for (total_read = 0; 
+					     total_read < pdu_length;
+					     total_read += length) {	
 						length = sock_recvmsg(csocket, &smb_msg, 
 							pdu_length - total_read, 0);
 						if (length == 0) {
@@ -349,9 +400,21 @@ cifs_demultiplex_thread(struct TCP_Serve
 			}
 		}
 	}
-   
+	spin_lock(&GlobalMid_Lock);
 	server->tcpStatus = CifsExiting;
 	server->tsk = NULL;
+	atomic_set(&server->inFlight, 0);
+	spin_unlock(&GlobalMid_Lock);
+	/* Although there should not be any requests blocked on 
+	this queue it can not hurt to be paranoid and try to wake up requests
+	that may haven been blocked when more than 50 at time were on the wire 
+	to the same server - they now will see the session is in exit state
+	and get out of SendReceive.  */
+	wake_up_all(&server->request_q);
+	/* give those requests time to exit */
+	set_current_state(TASK_INTERRUPTIBLE);
+	schedule_timeout(HZ/8);
+
 	if(server->ssocket) {
 		sock_release(csocket);
 		server->ssocket = NULL;
@@ -372,7 +435,7 @@ cifs_demultiplex_thread(struct TCP_Serve
 				ses->server = NULL;
 			}
 		}
-		kfree(server);
+		read_unlock(&GlobalSMBSeslock);
 	} else {
 		spin_lock(&GlobalMid_Lock);
 		list_for_each(tmp, &server->pending_mid_q) {
@@ -387,10 +450,25 @@ cifs_demultiplex_thread(struct TCP_Serve
 			}
 		}
 		spin_unlock(&GlobalMid_Lock);
+		read_unlock(&GlobalSMBSeslock);
+		set_current_state(TASK_INTERRUPTIBLE);
+		/* 1/8th of sec is more than enough time for them to exit */
+		schedule_timeout(HZ/8); 
 	}
-	read_unlock(&GlobalSMBSeslock);
 
-	cFYI(1, ("About to exit from demultiplex thread"));
+	if (list_empty(&server->pending_mid_q)) {
+		/* mpx threads have not exited yet give them 
+		at least the smb send timeout time for long ops */
+		cFYI(1, ("Wait for exit from demultiplex thread"));
+		set_current_state(TASK_INTERRUPTIBLE);
+		schedule_timeout(46 * HZ);	
+		/* if threads still have not exited they are probably never
+		coming home not much else we can do but free the memory */
+	}
+	kfree(server);
+
+	set_current_state(TASK_INTERRUPTIBLE);
+	schedule_timeout(HZ/4);
 	return 0;
 }
 
@@ -409,12 +487,21 @@ cifs_parse_mount_options(char *options, 
 {
 	char *value;
 	char *data;
-	int  temp_len, i, j;
+	unsigned int  temp_len, i, j;
 	char separator[2];
 
 	separator[0] = ',';
 	separator[1] = 0; 
 
+	memset(vol->source_rfc1001_name,0x20,15);
+	for(i=0;i < strnlen(system_utsname.nodename,15);i++) {
+		/* does not have to be a perfect mapping since the field is
+		informational, only used for servers that do not support
+		port 445 and it can be overridden at mount time */
+		vol->source_rfc1001_name[i] = toupper(system_utsname.nodename[i]);
+	}
+	vol->source_rfc1001_name[15] = 0;
+
 	vol->linux_uid = current->uid;	/* current->euid instead? */
 	vol->linux_gid = current->gid;
 	vol->dir_mode = S_IRWXUGO;
@@ -524,6 +611,8 @@ cifs_parse_mount_options(char *options, 
 			}
 			if ((temp_len = strnlen(value, 300)) < 300) {
 				vol->UNC = kmalloc(temp_len+1,GFP_KERNEL);
+				if(vol->UNC == NULL)
+					return 1;
 				strcpy(vol->UNC,value);
 				if (strncmp(vol->UNC, "//", 2) == 0) {
 					vol->UNC[0] = '\\';
@@ -543,6 +632,8 @@ cifs_parse_mount_options(char *options, 
 				printk(KERN_WARNING "CIFS: invalid domain name\n");
 				return 1;	/* needs_arg; */
 			}
+			/* BB are there cases in which a comma can be valid in
+			a domain name and need special handling? */
 			if (strnlen(value, 65) < 65) {
 				vol->domainname = value;
 				cFYI(1, ("Domain name set"));
@@ -605,17 +696,46 @@ cifs_parse_mount_options(char *options, 
 					simple_strtoul(value, &value, 0);
 			}
 		} else if (strnicmp(data, "netbiosname", 4) == 0) {
-			if (!value || !*value) {
-				vol->source_rfc1001_name = NULL;
-			} else if (strnlen(value, 17) < 17) {
-				vol->source_rfc1001_name = value;
+			if (!value || !*value || (*value == ' ')) {
+				cFYI(1,("invalid (empty) netbiosname specified"));
 			} else {
-				printk(KERN_WARNING "CIFS: netbiosname too long (more than 15)\n");
+				memset(vol->source_rfc1001_name,0x20,15);
+				for(i=0;i<15;i++) {
+				/* BB are there cases in which a comma can be 
+				valid in this workstation netbios name (and need
+				special handling)? */
+
+				/* We do not uppercase netbiosname for user */
+					if (value[i]==0)
+						break;
+					else 
+						vol->source_rfc1001_name[i] = value[i];
+				}
+				/* The string has 16th byte zero still from
+				set at top of the function  */
+				if((i==15) && (value[i] != 0))
+					printk(KERN_WARNING "CIFS: netbiosname longer than 15 and was truncated.\n");
 			}
+		} else if (strnicmp(data, "credentials", 4) == 0) {
+			/* ignore */
 		} else if (strnicmp(data, "version", 3) == 0) {
 			/* ignore */
 		} else if (strnicmp(data, "rw", 2) == 0) {
 			vol->rw = TRUE;
+		} else if ((strnicmp(data, "suid", 4) == 0) ||
+				   (strnicmp(data, "nosuid", 6) == 0) ||
+				   (strnicmp(data, "exec", 4) == 0) ||
+				   (strnicmp(data, "noexec", 6) == 0) ||
+				   (strnicmp(data, "nodev", 5) == 0) ||
+				   (strnicmp(data, "noauto", 6) == 0) ||
+				   (strnicmp(data, "dev", 3) == 0)) {
+			/*  The mount tool or mount.cifs helper (if present)
+				uses these opts to set flags, and the flags are read
+				by the kernel vfs layer before we get here (ie
+				before read super) so there is no point trying to
+				parse these options again and set anything and it
+				is ok to just ignore them */
+			continue;
 		} else if (strnicmp(data, "ro", 2) == 0) {
 			vol->rw = FALSE;
 		} else if (strnicmp(data, "hard", 4) == 0) {
@@ -626,6 +746,12 @@ cifs_parse_mount_options(char *options, 
 			vol->retry = 0;
 		} else if (strnicmp(data, "nosoft", 6) == 0) {
 			vol->retry = 1;
+		} else if (strnicmp(data, "nointr", 6) == 0) {
+			vol->intr = 0;
+		} else if (strnicmp(data, "intr", 4) == 0) {
+			vol->intr = 1;
+		} else if (strnicmp(data, "noac", 4) == 0) {
+			printk(KERN_WARNING "CIFS: Mount option noac not supported. Instead set /proc/fs/cifs/LookupCacheEnabled to 0\n");
 		} else
 			printk(KERN_WARNING "CIFS: Unknown mount option %s\n",data);
 	}
@@ -636,6 +762,8 @@ cifs_parse_mount_options(char *options, 
 		}
 		if ((temp_len = strnlen(devname, 300)) < 300) {
 			vol->UNC = kmalloc(temp_len+1,GFP_KERNEL);
+			if(vol->UNC == NULL)
+				return 1;
 			strcpy(vol->UNC,devname);
 			if (strncmp(vol->UNC, "//", 2) == 0) {
 				vol->UNC[0] = '\\';
@@ -667,7 +795,7 @@ cifs_find_tcp_session(__u32 new_target_i
 	list_for_each(tmp, &GlobalSMBSessionList) {
 		ses = list_entry(tmp, struct cifsSesInfo, cifsSessionList);
 		if (ses->server) {
-			if (ses->server->sockAddr.sin_addr.s_addr ==
+			if (ses->server->addr.sockAddr.sin_addr.s_addr ==
 			    new_target_ip_addr) {
 				/* BB lock server and tcp session and increment use count here?? */
 				*psrvTcp = ses->server;	/* found a match on the TCP session */
@@ -700,9 +828,9 @@ find_unc(__u32 new_target_ip_addr, char 
 			if (tcon->ses->server) {
 				cFYI(1,
 				     (" old ip addr: %x == new ip %x ?",
-				      tcon->ses->server->sockAddr.sin_addr.
+				      tcon->ses->server->addr.sockAddr.sin_addr.
 				      s_addr, new_target_ip_addr));
-				if (tcon->ses->server->sockAddr.sin_addr.
+				if (tcon->ses->server->addr.sockAddr.sin_addr.
 				    s_addr == new_target_ip_addr) {
 	/* BB lock tcon and server and tcp session and increment use count here? */
 					/* found a match on the TCP session */
@@ -746,7 +874,8 @@ connect_to_dfs_path(int xid, struct cifs
 		the helper that resolves tcp names, mount to it, try to 
 		tcon to it unmount it if fail */
 
-	/* BB free memory for referrals string BB */
+	if(referrals)
+		kfree(referrals);
 
 	return rc;
 }
@@ -784,10 +913,28 @@ get_dfs_path(int xid, struct cifsSesInfo
 	return rc;
 }
 
-int
-ipv4_connect(struct sockaddr_in *psin_server, struct socket **csocket)
+/* See RFC1001 section 14 on representation of Netbios names */
+static void rfc1002mangle(char * target,char * source, unsigned int length)
+{
+	unsigned int i,j;
+
+	for(i=0,j=0;i<(length);i++) {
+		/* mask a nibble at a time and encode */
+		target[j] = 'A' + (0x0F & (source[i] >> 4));
+		target[j+1] = 'A' + (0x0F & source[i]);
+		j+=2;
+	}
+
+}
+
+
+static int
+ipv4_connect(struct sockaddr_in *psin_server, struct socket **csocket, 
+			 char * netbios_name)
 {
 	int rc = 0;
+	int connected = 0;
+	unsigned short int orig_port = 0;
 
 	if(*csocket == NULL) {
 		rc = sock_create(PF_INET, SOCK_STREAM, IPPROTO_TCP, csocket);
@@ -798,6 +945,7 @@ ipv4_connect(struct sockaddr_in *psin_se
 		} else {
 		/* BB other socket options to set KEEPALIVE, NODELAY? */
 			cFYI(1,("Socket created"));
+			(*csocket)->sk->allocation = GFP_NOFS; 
 		}
 	}
 
@@ -806,9 +954,15 @@ ipv4_connect(struct sockaddr_in *psin_se
 		rc = (*csocket)->ops->connect(*csocket,
 				(struct sockaddr *) psin_server,
 				sizeof (struct sockaddr_in),0);
-	}
+		if (rc >= 0)
+			connected = 1;
+	} 
+
+	if(!connected) {
+		/* save original port so we can retry user specified port  
+			later if fall back ports fail this time  */
+		orig_port = psin_server->sin_port;
 
-	if(rc < 0) {
 		/* do not retry on the same port we just failed on */
 		if(psin_server->sin_port != htons(CIFS_PORT)) {
 			psin_server->sin_port = htons(CIFS_PORT);
@@ -816,87 +970,147 @@ ipv4_connect(struct sockaddr_in *psin_se
 			rc = (*csocket)->ops->connect(*csocket,
 					(struct sockaddr *) psin_server,
 					sizeof (struct sockaddr_in),0);
+			if (rc >= 0)
+				connected = 1;
 		}
 	}
-	if (rc < 0) {
+	if (!connected) {
 		psin_server->sin_port = htons(RFC1001_PORT);
 		rc = (*csocket)->ops->connect(*csocket, (struct sockaddr *)
 					      psin_server, sizeof (struct sockaddr_in),0);
-		if (rc < 0) {
-			cFYI(1, ("Error connecting to socket. %d", rc));
-			sock_release(*csocket);
-			*csocket = NULL;
-			return rc;
-		}
+		if (rc >= 0) 
+			connected = 1;
 	}
 
+	/* give up here - unless we want to retry on different
+		protocol families some day */
+	if (!connected) {
+		if(orig_port)
+			psin_server->sin_port = orig_port;
+		cFYI(1,("Error %d connecting to server via ipv4",rc));
+		sock_release(*csocket);
+		*csocket = NULL;
+		return rc;
+	}
 	/* Eventually check for other socket options to change from 
 		the default. sock_setsockopt not used because it expects 
 		user space buffer */
 	(*csocket)->sk->rcvtimeo = 7 * HZ;
+			
+	/* send RFC1001 sessinit */
+
+	if(psin_server->sin_port == htons(139)) {
+		/* some servers require RFC1001 sessinit before sending
+		negprot - BB check reconnection in case where second 
+		sessinit is sent but no second negprot */
+		struct rfc1002_session_packet * ses_init_buf;
+		struct smb_hdr * smb_buf;
+		ses_init_buf = cifs_kcalloc(sizeof(struct rfc1002_session_packet), GFP_KERNEL);
+		if(ses_init_buf) {
+			ses_init_buf->trailer.session_req.called_len = 32;
+			rfc1002mangle(ses_init_buf->trailer.session_req.called_name,
+				DEFAULT_CIFS_CALLED_NAME,16);
+			ses_init_buf->trailer.session_req.calling_len = 32;
+			/* calling name ends in null (byte 16) from old smb
+			convention. */
+			if(netbios_name && (netbios_name[0] !=0)) {
+				rfc1002mangle(ses_init_buf->trailer.session_req.calling_name,
+					netbios_name,16);
+			} else {
+				rfc1002mangle(ses_init_buf->trailer.session_req.calling_name,
+					"LINUX_CIFS_CLNT",16);
+			}
+			ses_init_buf->trailer.session_req.scope1 = 0;
+			ses_init_buf->trailer.session_req.scope2 = 0;
+			smb_buf = (struct smb_hdr *)ses_init_buf;
+			/* sizeof RFC1002_SESSION_REQUEST with no scope */
+			smb_buf->smb_buf_length = 0x81000044;
+			rc = smb_send(*csocket, smb_buf, 0x44,
+				(struct sockaddr *)psin_server);
+			kfree(ses_init_buf);
+		}
+		/* else the negprot may still work without this 
+		even though malloc failed */
+		
+	}
 		
 	return rc;
 }
 
-int
+static int
 ipv6_connect(struct sockaddr_in6 *psin_server, struct socket **csocket)
 {
 	int rc = 0;
+	int connected = 0;
 
-	rc = sock_create(PF_INET6, SOCK_STREAM,
-			 IPPROTO_TCP /* IPPROTO_IPV6 ? */ , csocket);
-	if (rc < 0) {
-		cERROR(1, ("Error creating socket. Aborting operation"));
-		return rc;
+	if(*csocket == NULL) {
+		rc = sock_create(PF_INET6, SOCK_STREAM, IPPROTO_TCP, csocket);
+		if (rc < 0) {
+			cERROR(1, ("Error %d creating ipv6 socket",rc));
+			*csocket = NULL;
+			return rc;
+		} else {
+		/* BB other socket options to set KEEPALIVE, NODELAY? */
+			 cFYI(1,("ipv6 Socket created"));
+			(*csocket)->sk->allocation = GFP_NOFS;
+		}
 	}
 
 	psin_server->sin6_family = AF_INET6;
+
 	if(psin_server->sin6_port) { /* user overrode default port */
 		rc = (*csocket)->ops->connect(*csocket,
 				(struct sockaddr *) psin_server,
 				sizeof (struct sockaddr_in6),0);
-		if (rc >= 0) {
-                /* BB other socket options to set KEEPALIVE, timeouts? NODELAY? */
-			return rc;
-		}
-	}
+		if (rc >= 0)
+			connected = 1;
+	} 
 
-	/* do not retry on the same port we just failed on */
-	if(psin_server->sin6_port != htons(CIFS_PORT)) {
-		psin_server->sin6_port = htons(CIFS_PORT);
+	if(!connected) {
+		/* do not retry on the same port we just failed on */
+		if(psin_server->sin6_port != htons(CIFS_PORT)) {
+			psin_server->sin6_port = htons(CIFS_PORT);
 
-		rc = (*csocket)->ops->connect(*csocket,
-				(struct sockaddr *) psin_server,
-				sizeof (struct sockaddr_in6), 0);
-/* BB fix the timeout to be shorter above - and check flags */
+			rc = (*csocket)->ops->connect(*csocket,
+					(struct sockaddr *) psin_server,
+					sizeof (struct sockaddr_in6),0);
+			if (rc >= 0)
+				connected = 1;
+		}
 	}
-	if (rc < 0) {
+	if (!connected) {
 		psin_server->sin6_port = htons(RFC1001_PORT);
 		rc = (*csocket)->ops->connect(*csocket, (struct sockaddr *)
-					      psin_server,
-					      sizeof (struct sockaddr_in6), 0);
-		if (rc < 0) {
-			cFYI(1,
-			     ("Error connecting to socket (via ipv6). %d",
-			      rc));
-			sock_release(*csocket);
-			*csocket = NULL;
-			return rc;
-		}
+					 psin_server, sizeof (struct sockaddr_in6),0);
+		if (rc >= 0) 
+			connected = 1;
 	}
 
+	/* give up here - unless we want to retry on different
+		protocol families some day */
+	if (!connected) {
+		cFYI(1,("Error %d connecting to server via ipv6",rc));
+		sock_release(*csocket);
+		*csocket = NULL;
+		return rc;
+	}
+	/* Eventually check for other socket options to change from 
+		the default. sock_setsockopt not used because it expects 
+		user space buffer */
+	(*csocket)->sk->rcvtimeo = 7 * HZ;
+		
 	return rc;
 }
 
 int
 cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
-	   char *mount_data, char *devname)
+	   char *mount_data, const char *devname)
 {
 	int rc = 0;
 	int xid;
 	struct socket *csocket = NULL;
 	struct sockaddr_in sin_server;
-/*	struct sockaddr_in6 sin_server6; */
+	struct sockaddr_in6 sin_server6;
 	struct smb_vol volume_info;
 	struct cifsSesInfo *pSesInfo = NULL;
 	struct cifsSesInfo *existingCifsSes = NULL;
@@ -904,13 +1118,15 @@ cifs_mount(struct super_block *sb, struc
 	struct TCP_Server_Info *srvTcp = NULL;
 
 	xid = GetXid();
-/*	cFYI(1, ("Entering cifs_mount. Xid: %d with: %s", xid, mount_data)); */
+
+	cFYI(1, ("Entering cifs_mount. Xid: %d with: %s", xid, mount_data)); /* BB removeme BB fixme */
 	
 	memset(&volume_info,0,sizeof(struct smb_vol));
-
-	if(cifs_parse_mount_options(mount_data, devname, &volume_info)) {
+	if (cifs_parse_mount_options(mount_data, devname, &volume_info)) {
 		if(volume_info.UNC)
 			kfree(volume_info.UNC);
+		if(volume_info.password)
+			kfree(volume_info.password);
 		FreeXid(xid);
 		return -EINVAL;
 	}
@@ -922,17 +1138,51 @@ cifs_mount(struct super_block *sb, struc
 		cifserror("No username specified ");
         /* In userspace mount helper we can get user name from alternate
            locations such as env variables and files on disk */
+		if(volume_info.UNC)
+			kfree(volume_info.UNC);
+		if(volume_info.password)
+			kfree(volume_info.password);
 		FreeXid(xid);
 		return -EINVAL;
 	}
 
-	if (volume_info.UNC) {
-		sin_server.sin_addr.s_addr = cifs_inet_addr(volume_info.UNCip);
-		cFYI(1, ("UNC: %s  ", volume_info.UNC));
-	} else {
-		/* BB we could connect to the DFS root? but which server do we ask? */
+	if (volume_info.UNCip && volume_info.UNC) {
+		rc = cifs_inet_pton(AF_INET, volume_info.UNCip,&sin_server.sin_addr.s_addr);
+
+		if(rc == 0) {
+			/* not ipv4 address, try ipv6 */
+			rc = cifs_inet_pton(AF_INET6,volume_info.UNCip,&sin_server6.sin6_addr.in6_u); 
+		} 
+       
+		if(rc != 1) {
+			/* we failed translating address */
+			if(volume_info.UNC)
+				kfree(volume_info.UNC);
+			if(volume_info.password)
+				kfree(volume_info.password);
+			FreeXid(xid);
+			return -EINVAL;
+		}
+
+		cFYI(1, ("UNC: %s ip: %s", volume_info.UNC, volume_info.UNCip));
+		/* success */
+		rc = 0;
+	} else if (volume_info.UNCip){
+		/* BB using ip addr as server name connect to the DFS root below */
+		cERROR(1,("Connecting to DFS root not implemented yet"));
+		if(volume_info.UNC)
+			kfree(volume_info.UNC);
+		if(volume_info.password)
+			kfree(volume_info.password);
+		FreeXid(xid);
+		return -EINVAL;
+	} else /* which servers DFS root would we conect to */ {
 		cERROR(1,
 		       ("CIFS mount error: No UNC path (e.g. -o unc=//192.168.1.100/public) specified  "));
+		if(volume_info.UNC)
+			kfree(volume_info.UNC);
+		if(volume_info.password)
+			kfree(volume_info.password);
 		FreeXid(xid);
 		return -EINVAL;
 	}
@@ -945,6 +1195,10 @@ cifs_mount(struct super_block *sb, struc
 		cifs_sb->local_nls = load_nls(volume_info.iocharset);
 		if(cifs_sb->local_nls == NULL) {
 			cERROR(1,("CIFS mount error: iocharset %s not found",volume_info.iocharset));
+			if(volume_info.UNC)
+				kfree(volume_info.UNC);
+			if(volume_info.password)
+				kfree(volume_info.password);
 			FreeXid(xid);
 			return -ELIBACC;
 		}
@@ -958,7 +1212,9 @@ cifs_mount(struct super_block *sb, struc
 	} else {	/* create socket */
 		if(volume_info.port)
 			sin_server.sin_port = htons(volume_info.port);
-		rc = ipv4_connect(&sin_server, &csocket);
+		else
+			sin_server.sin_port = 0;
+		rc = ipv4_connect(&sin_server,&csocket,volume_info.source_rfc1001_name);
 		if (rc < 0) {
 			cERROR(1,
 			       ("Error connecting to IPv4 socket. Aborting operation"));
@@ -966,6 +1222,8 @@ cifs_mount(struct super_block *sb, struc
 				sock_release(csocket);
 			if(volume_info.UNC)
 				kfree(volume_info.UNC);
+			if(volume_info.password)
+				kfree(volume_info.password);
 			FreeXid(xid);
 			return rc;
 		}
@@ -976,25 +1234,37 @@ cifs_mount(struct super_block *sb, struc
 			sock_release(csocket);
 			if(volume_info.UNC)
 				kfree(volume_info.UNC);
+			if(volume_info.password)
+				kfree(volume_info.password);
 			FreeXid(xid);
 			return rc;
 		} else {
 			memset(srvTcp, 0, sizeof (struct TCP_Server_Info));
-			memcpy(&srvTcp->sockAddr, &sin_server, sizeof (struct sockaddr_in));	
-            /* BB Add code for ipv6 case too */
+			memcpy(&srvTcp->addr.sockAddr, &sin_server, sizeof (struct sockaddr_in));
+			atomic_set(&srvTcp->inFlight,0);
+			/* BB Add code for ipv6 case too */
 			srvTcp->ssocket = csocket;
+			srvTcp->protocolType = IPV4;
 			init_waitqueue_head(&srvTcp->response_q);
+			init_waitqueue_head(&srvTcp->request_q);
 			INIT_LIST_HEAD(&srvTcp->pending_mid_q);
+			/* at this point we are the only ones with the pointer
+			to the struct since the kernel thread not created yet
+			so no need to spinlock this init of tcpStatus */
 			srvTcp->tcpStatus = CifsNew;
 			init_MUTEX(&srvTcp->tcpSem);
 			kernel_thread((void *)(void *)cifs_demultiplex_thread, srvTcp,
 				      CLONE_FS | CLONE_FILES | CLONE_VM);
+			memcpy(srvTcp->workstation_RFC1001_name, volume_info.source_rfc1001_name,16);
 		}
 	}
 
 	if (existingCifsSes) {
 		pSesInfo = existingCifsSes;
 		cFYI(1, ("Existing smb sess found "));
+		if(volume_info.password)
+			kfree(volume_info.password);
+		/* volume_info.UNC freed at end of function */
 	} else if (!rc) {
 		cFYI(1, ("Existing smb sess not found "));
 		pSesInfo = sesInfoAlloc();
@@ -1006,7 +1276,8 @@ cifs_mount(struct super_block *sb, struc
 				NIPQUAD(sin_server.sin_addr.s_addr));
 		}
 
-		if (!rc){   
+		if (!rc){
+			/* volume_info.password freed at unmount */   
 			if (volume_info.password)
 				pSesInfo->password = volume_info.password;
 			if (volume_info.username)
@@ -1021,7 +1292,9 @@ cifs_mount(struct super_block *sb, struc
 			up(&pSesInfo->sesSem);
 			if(!rc)
 				atomic_inc(&srvTcp->socketUseCount);
-		}
+		} else
+			if(volume_info.password)
+				kfree(volume_info.password);
 	}
     
 	/* search for existing tcon to this server share */
@@ -1086,28 +1359,37 @@ cifs_mount(struct super_block *sb, struc
 			}
 		}
 	}
-	if (pSesInfo->capabilities & CAP_LARGE_FILES) {
-		cFYI(0, ("Large files supported "));
-		sb->s_maxbytes = (u64) 1 << 63;
-	} else
-		sb->s_maxbytes = (u64) 1 << 31;	/* 2 GB */
+	if(pSesInfo) {
+		if (pSesInfo->capabilities & CAP_LARGE_FILES) {
+			sb->s_maxbytes = (u64) 1 << 63;
+		} else
+			sb->s_maxbytes = (u64) 1 << 31;	/* 2 GB */
+	}
 
 /* on error free sesinfo and tcon struct if needed */
 	if (rc) {
-		if(atomic_read(&srvTcp->socketUseCount) == 0)
-                	srvTcp->tcpStatus = CifsExiting;
-		           /* If find_unc succeeded then rc == 0 so we can not end */
-		if (tcon)  /* up here accidently freeing someone elses tcon struct */
+		/* if session setup failed, use count is zero but
+		we still need to free cifsd thread */
+		if(atomic_read(&srvTcp->socketUseCount) == 0) {
+			spin_lock(&GlobalMid_Lock);
+			srvTcp->tcpStatus = CifsExiting;
+			spin_unlock(&GlobalMid_Lock);
+			if(srvTcp->tsk)
+				send_sig(SIGKILL,srvTcp->tsk,1);
+		}
+		 /* If find_unc succeeded then rc == 0 so we can not end */
+		if (tcon)  /* up accidently freeing someone elses tcon struct */
 			tconInfoFree(tcon);
 		if (existingCifsSes == 0) {
 			if (pSesInfo) {
-				if (pSesInfo->server) {
-					if (pSesInfo->Suid)
-						CIFSSMBLogoff(xid, pSesInfo);
-					if(pSesInfo->server->tsk)
+				if ((pSesInfo->server) && 
+				    (pSesInfo->status == CifsGood)) {
+					int temp_rc;
+					temp_rc = CIFSSMBLogoff(xid, pSesInfo);
+					/* if the socketUseCount is now zero */
+					if((temp_rc == -ESHUTDOWN) &&
+					   (pSesInfo->server->tsk))
 						send_sig(SIGKILL,pSesInfo->server->tsk,1);
-					set_current_state(TASK_INTERRUPTIBLE);
-					schedule_timeout(HZ / 4);	/* give captive thread time to exit */
 				} else
 					cFYI(1, ("No session or bad tcon"));
 				sesInfoFree(pSesInfo);
@@ -1125,6 +1407,11 @@ cifs_mount(struct super_block *sb, struc
 		if (tcon->ses->capabilities & CAP_UNIX)
 			CIFSSMBQFSUnixInfo(xid, tcon, cifs_sb->local_nls);
 	}
+
+	/* volume_info.password is freed above when existing session found
+	(in which case it is not needed anymore) but when new sesion is created
+	the password ptr is put in the new session structure (in which case the
+	password will be freed at unmount time) */
 	if(volume_info.UNC)
 		kfree(volume_info.UNC);
 	FreeXid(xid);
@@ -1159,7 +1446,7 @@ CIFSSessSetup(unsigned int xid, struct c
 
 	/* send SMBsessionSetup here */
 	header_assemble(smb_buffer, SMB_COM_SESSION_SETUP_ANDX,
-			0 /* no tCon exists yet */ , 13 /* wct */ );
+			NULL /* no tCon exists yet */ , 13 /* wct */ );
 
 	pSMB->req_no_secext.AndXCommand = 0xFF;
 	pSMB->req_no_secext.MaxBufferSize = cpu_to_le16(ses->server->maxBuf);
@@ -1281,7 +1568,7 @@ CIFSSessSetup(unsigned int xid, struct c
 					bcc_ptr +=
 					    pSMBr->resp.SecurityBlobLength;
 
-				if (smb_buffer->Flags2 &= SMBFLG2_UNICODE) {
+				if (smb_buffer->Flags2 & SMBFLG2_UNICODE) {
 					if ((long) (bcc_ptr) % 2) {
 						remaining_words =
 						    (BCC(smb_buffer_response)
@@ -1415,7 +1702,7 @@ CIFSSpnegoSessSetup(unsigned int xid, st
 
 	/* send SMBsessionSetup here */
 	header_assemble(smb_buffer, SMB_COM_SESSION_SETUP_ANDX,
-			0 /* no tCon exists yet */ , 12 /* wct */ );
+			NULL /* no tCon exists yet */ , 12 /* wct */ );
 	pSMB->req.hdr.Flags2 |= SMBFLG2_EXT_SEC;
 	pSMB->req.AndXCommand = 0xFF;
 	pSMB->req.MaxBufferSize = cpu_to_le16(ses->server->maxBuf);
@@ -1534,7 +1821,7 @@ CIFSSpnegoSessSetup(unsigned int xid, st
 					      pSMBr->resp.SecurityBlobLength));
 				}
 
-				if (smb_buffer->Flags2 &= SMBFLG2_UNICODE) {
+				if (smb_buffer->Flags2 & SMBFLG2_UNICODE) {
 					if ((long) (bcc_ptr) % 2) {
 						remaining_words =
 						    (BCC(smb_buffer_response)
@@ -1677,7 +1964,7 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned i
 
 	/* send SMBsessionSetup here */
 	header_assemble(smb_buffer, SMB_COM_SESSION_SETUP_ANDX,
-			0 /* no tCon exists yet */ , 12 /* wct */ );
+			NULL /* no tCon exists yet */ , 12 /* wct */ );
 	pSMB->req.hdr.Flags2 |= SMBFLG2_EXT_SEC;
 	pSMB->req.hdr.Flags |= (SMBFLG_CASELESS | SMBFLG_CANONICAL_PATH_FORMAT);
 
@@ -1845,7 +2132,7 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned i
 						ses->server->secMode |= 
 							SECMODE_SIGN_ENABLED;
 
-				if (smb_buffer->Flags2 &= SMBFLG2_UNICODE) {
+				if (smb_buffer->Flags2 & SMBFLG2_UNICODE) {
 					if ((long) (bcc_ptr) % 2) {
 						remaining_words =
 						    (BCC(smb_buffer_response)
@@ -2017,7 +2304,7 @@ CIFSNTLMSSPAuthSessSetup(unsigned int xi
 
 	/* send SMBsessionSetup here */
 	header_assemble(smb_buffer, SMB_COM_SESSION_SETUP_ANDX,
-			0 /* no tCon exists yet */ , 12 /* wct */ );
+			NULL /* no tCon exists yet */ , 12 /* wct */ );
 	pSMB->req.hdr.Flags |= (SMBFLG_CASELESS | SMBFLG_CANONICAL_PATH_FORMAT);
 	pSMB->req.hdr.Flags2 |= SMBFLG2_EXT_SEC;
 	pSMB->req.AndXCommand = 0xFF;
@@ -2241,7 +2528,7 @@ CIFSNTLMSSPAuthSessSetup(unsigned int xi
 				cFYI(1,
 				     ("NTLMSSP response to Authenticate "));
 
-				if (smb_buffer->Flags2 &= SMBFLG2_UNICODE) {
+				if (smb_buffer->Flags2 & SMBFLG2_UNICODE) {
 					if ((long) (bcc_ptr) % 2) {
 						remaining_words =
 						    (BCC(smb_buffer_response)
@@ -2390,7 +2677,7 @@ CIFSTCon(unsigned int xid, struct cifsSe
 	smb_buffer_response = smb_buffer;
 
 	header_assemble(smb_buffer, SMB_COM_TREE_CONNECT_ANDX,
-			0 /*no tid */ , 4 /*wct */ );
+			NULL /*no tid */ , 4 /*wct */ );
 	smb_buffer->Uid = ses->Suid;
 	pSMB = (TCONX_REQ *) smb_buffer;
 	pSMBr = (TCONX_RSP *) smb_buffer_response;
@@ -2440,11 +2727,13 @@ CIFSTCon(unsigned int xid, struct cifsSe
         /* skip service field (NB: this field is always ASCII) */
 		bcc_ptr += length + 1;	
 		strncpy(tcon->treeName, tree, MAX_TREE_SIZE);
-		if (smb_buffer->Flags2 &= SMBFLG2_UNICODE) {
+		if (smb_buffer->Flags2 & SMBFLG2_UNICODE) {
 			length = UniStrnlen((wchar_t *) bcc_ptr, 512);
 			if (((long) bcc_ptr + (2 * length)) -
 			    (long) pByteArea(smb_buffer_response) <=
 			    BCC(smb_buffer_response)) {
+				if(tcon->nativeFileSystem)
+					kfree(tcon->nativeFileSystem);
 				tcon->nativeFileSystem =
 				    cifs_kcalloc(length + 2, GFP_KERNEL);
 				cifs_strfromUCS_le(tcon->nativeFileSystem,
@@ -2461,6 +2750,8 @@ CIFSTCon(unsigned int xid, struct cifsSe
 			if (((long) bcc_ptr + length) -
 			    (long) pByteArea(smb_buffer_response) <=
 			    BCC(smb_buffer_response)) {
+				if(tcon->nativeFileSystem)
+					kfree(tcon->nativeFileSystem);
 				tcon->nativeFileSystem =
 				    cifs_kcalloc(length + 1, GFP_KERNEL);
 				strncpy(tcon->nativeFileSystem, bcc_ptr,
@@ -2486,6 +2777,7 @@ cifs_umount(struct super_block *sb, stru
 	int rc = 0;
 	int xid;
 	struct cifsSesInfo *ses = NULL;
+	struct task_struct *cifsd_task;
 
 	xid = GetXid();
 
@@ -2498,18 +2790,19 @@ cifs_umount(struct super_block *sb, stru
 		}
 		tconInfoFree(cifs_sb->tcon);
 		if ((ses) && (ses->server)) {
+			/* save off task so we do not refer to ses later */
+			cifsd_task = ses->server->tsk;
 			cFYI(1, ("About to do SMBLogoff "));
 			rc = CIFSSMBLogoff(xid, ses);
 			if (rc == -EBUSY) {
 				FreeXid(xid);
 				return 0;
-			}
-			set_current_state(TASK_INTERRUPTIBLE);
-			schedule_timeout(HZ / 4);	/* give captive thread time to exit */
-			if((ses->server) && (ses->server->ssocket)) {            
-				cFYI(1,("Waking up socket by sending it signal "));
-				send_sig(SIGKILL,ses->server->tsk,1);
-			}
+			} else if (rc == -ESHUTDOWN) {
+				cFYI(1,("Waking up socket by sending it signal"));
+				send_sig(SIGKILL,cifsd_task,1);
+				rc = 0;
+			} /* else - we have an smb session
+				left on this socket do not kill cifsd */
 		} else
 			cFYI(1, ("No session or bad tcon"));
 	}
@@ -2533,7 +2826,7 @@ int cifs_setup_session(unsigned int xid,
 	char ntlm_session_key[CIFS_SESSION_KEY_SIZE];
 	int ntlmv2_flag = FALSE;
 
-    /* what if server changes its buffer size after dropping the session? */
+	/* what if server changes its buffer size after dropping the session? */
 	if(pSesInfo->server->maxBuf == 0) /* no need to send on reconnect */ {
 		rc = CIFSSMBNegotiate(xid, pSesInfo);
 		if(rc == -EAGAIN) /* retry only once on 1st time connection */ {
@@ -2541,14 +2834,21 @@ int cifs_setup_session(unsigned int xid,
 			if(rc == -EAGAIN) 
 				rc = -EHOSTDOWN;
 		}
-		if(rc == 0)
-			pSesInfo->server->tcpStatus = CifsGood;
+		if(rc == 0) {
+			spin_lock(&GlobalMid_Lock);
+			if(pSesInfo->server->tcpStatus != CifsExiting)
+				pSesInfo->server->tcpStatus = CifsGood;
+			else
+				rc = -EHOSTDOWN;
+			spin_unlock(&GlobalMid_Lock);
+
+		}
 	}
-	pSesInfo->capabilities = pSesInfo->server->capabilities;
-	if(linuxExtEnabled == 0)
-		pSesInfo->capabilities &= (~CAP_UNIX);
-	pSesInfo->sequence_number = 0;
 	if (!rc) {
+		pSesInfo->capabilities = pSesInfo->server->capabilities;
+		if(linuxExtEnabled == 0)
+			pSesInfo->capabilities &= (~CAP_UNIX);
+		pSesInfo->sequence_number = 0;
 		cFYI(1,("Security Mode: 0x%x Capabilities: 0x%x Time Zone: %d",
 			pSesInfo->server->secMode,
 			pSesInfo->server->capabilities,
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/cifs/dir.c linux-2.4.20-wolk4.16-fullkernel/fs/cifs/dir.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/cifs/dir.c	2004-06-29 11:24:22.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/cifs/dir.c	2004-09-05 15:47:54.000000000 +0200
@@ -37,7 +37,7 @@ renew_parental_timestamps(struct dentry 
 	do {
 		direntry->d_time = jiffies;
 		direntry = direntry->d_parent;
-	} while (!IS_ROOT(direntry));	/* BB for DFS case should stop at the root of share which could be lower than root of this mount due to implicit dfs connections */
+	} while (!IS_ROOT(direntry));	
 }
 
 /* Note: caller must free return buffer */
@@ -48,14 +48,26 @@ build_path_from_dentry(struct dentry *di
 	int namelen = 0;
 	char *full_path;
 
+	if(direntry == NULL)
+		return NULL;  /* not much we can do if dentry is freed and
+		we need to reopen the file after it was closed implicitly
+		when the server crashed */
+
+cifs_bp_rename_retry:
 	for (temp = direntry; !IS_ROOT(temp);) {
 		namelen += (1 + temp->d_name.len);
 		temp = temp->d_parent;
+		if(temp == NULL) {
+			cERROR(1,("corrupt dentry"));
+			return NULL;
+		}
 	}
-	namelen += 1;		/* allow for trailing null */
-	full_path = kmalloc(namelen, GFP_KERNEL);
-	namelen--;
+
+	full_path = kmalloc(namelen+1, GFP_KERNEL);
+	if(full_path == NULL)
+		return full_path;
 	full_path[namelen] = 0;	/* trailing null */
+
 	for (temp = direntry; !IS_ROOT(temp);) {
 		namelen -= 1 + temp->d_name.len;
 		if (namelen < 0) {
@@ -67,15 +79,28 @@ build_path_from_dentry(struct dentry *di
 			cFYI(0, (" name: %s ", full_path + namelen));
 		}
 		temp = temp->d_parent;
+		if(temp == NULL) {
+			cERROR(1,("corrupt dentry"));
+			kfree(full_path);
+			return NULL;
+		}
 	}
-	if (namelen != 0)
+	if (namelen != 0) {
 		cERROR(1,
 		       ("We did not end path lookup where we expected namelen is %d",
 			namelen));
+		/* presumably this is only possible if we were racing with a rename 
+		of one of the parent directories  (we can not lock the dentries
+		above us to prevent this, but retrying should be harmless) */
+		kfree(full_path);
+		namelen = 0;
+		goto cifs_bp_rename_retry;
+	}
 
 	return full_path;
 }
 
+/* Note: caller must free return buffer */
 char *
 build_wildcard_path_from_dentry(struct dentry *direntry)
 {
@@ -83,18 +108,28 @@ build_wildcard_path_from_dentry(struct d
 	int namelen = 0;
 	char *full_path;
 
+	if(direntry == NULL)
+		return NULL;  /* not much we can do if dentry is freed and
+		we need to reopen the file after it was closed implicitly
+		when the server crashed */
+
+cifs_bwp_rename_retry:
 	for (temp = direntry; !IS_ROOT(temp);) {
 		namelen += (1 + temp->d_name.len);
 		temp = temp->d_parent;
+		if(temp == NULL) {
+			cERROR(1,("corrupt dentry"));
+			return NULL;
+		}
 	}
-	namelen += 3;		/* allow for trailing null and wildcard (slash and *) */
-	full_path = kmalloc(namelen, GFP_KERNEL);
-	namelen--;
-	full_path[namelen] = 0;	/* trailing null */
-	namelen--;
-	full_path[namelen] = '*';
-	namelen--;
+
+	full_path = kmalloc(namelen+3, GFP_KERNEL);
+	if(full_path == NULL)
+		return full_path;
+
 	full_path[namelen] = '\\';
+	full_path[namelen+1] = '*';
+	full_path[namelen+2] = 0;  /* trailing null */
 
 	for (temp = direntry; !IS_ROOT(temp);) {
 		namelen -= 1 + temp->d_name.len;
@@ -104,13 +139,26 @@ build_wildcard_path_from_dentry(struct d
 			full_path[namelen] = '\\';
 			strncpy(full_path + namelen + 1, temp->d_name.name,
 				temp->d_name.len);
+			cFYI(0, (" name: %s ", full_path + namelen));
 		}
 		temp = temp->d_parent;
+		if(temp == NULL) {
+			cERROR(1,("corrupt dentry"));
+			kfree(full_path);
+			return NULL;
+		}
 	}
-	if (namelen != 0)
+	if (namelen != 0) {
 		cERROR(1,
 		       ("We did not end path lookup where we expected namelen is %d",
 			namelen));
+		/* presumably this is only possible if we were racing with a rename 
+		of one of the parent directories  (we can not lock the dentries
+		above us to prevent this, but retrying should be harmless) */
+		kfree(full_path);
+		namelen = 0;
+		goto cifs_bwp_rename_retry;
+	}
 
 	return full_path;
 }
@@ -136,7 +184,13 @@ cifs_create(struct inode *inode, struct 
 	cifs_sb = CIFS_SB(inode->i_sb);
 	pTcon = cifs_sb->tcon;
 
+	down(&direntry->d_sb->s_vfs_rename_sem);
 	full_path = build_path_from_dentry(direntry);
+	up(&direntry->d_sb->s_vfs_rename_sem);
+	if(full_path == NULL) {
+		FreeXid(xid);
+		return -ENOMEM;
+	}
 
 	/* BB add processing to set equivalent of mode - e.g. via CreateX with ACLs */
 
@@ -151,10 +205,10 @@ cifs_create(struct inode *inode, struct 
 		 passed in rather than creating new one?? */
 		if (pTcon->ses->capabilities & CAP_UNIX)
 			rc = cifs_get_inode_info_unix(&newinode, full_path,
-						      inode->i_sb);
+						      inode->i_sb,xid);
 		else
 			rc = cifs_get_inode_info(&newinode, full_path,
-						 buf, inode->i_sb);
+						 buf, inode->i_sb,xid);
 
 		if (rc != 0) {
 			cFYI(1,("Create worked but get_inode_info failed with rc = %d",
@@ -204,15 +258,19 @@ int cifs_mknod(struct inode *inode, stru
 	cifs_sb = CIFS_SB(inode->i_sb);
 	pTcon = cifs_sb->tcon;
 
+	down(&direntry->d_sb->s_vfs_rename_sem);
 	full_path = build_path_from_dentry(direntry);
-
-	if (pTcon->ses->capabilities & CAP_UNIX) {
+	up(&direntry->d_sb->s_vfs_rename_sem);
+	if(full_path == NULL)
+		rc = -ENOMEM;
+	
+	if (full_path && (pTcon->ses->capabilities & CAP_UNIX)) {
 		rc = CIFSSMBUnixSetPerms(xid, pTcon,
 			full_path, mode, current->euid, current->egid,
 			device_number, cifs_sb->local_nls);
 		if(!rc) {
 			rc = cifs_get_inode_info_unix(&newinode, full_path,
-						inode->i_sb);
+						inode->i_sb,xid);
 			direntry->d_op = &cifs_dentry_ops;
 			if(rc == 0)
 				d_instantiate(direntry, newinode);
@@ -230,7 +288,8 @@ int cifs_mknod(struct inode *inode, stru
 struct dentry *
 cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry)
 {
-	int rc, xid;
+	int xid;
+	int rc = 0; /* to get around spurious gcc warning, set to zero here */
 	struct cifs_sb_info *cifs_sb;
 	struct cifsTconInfo *pTcon;
 	struct inode *newInode = NULL;
@@ -249,7 +308,15 @@ cifs_lookup(struct inode *parent_dir_ino
 	cifs_sb = CIFS_SB(parent_dir_inode->i_sb);
 	pTcon = cifs_sb->tcon;
 
+	/* can not grab the rename sem here since it would
+	deadlock in the cases (beginning of sys_rename itself)
+	in which we already have the sb rename sem */
 	full_path = build_path_from_dentry(direntry);
+	if(full_path == NULL) {
+		FreeXid(xid);
+		return ERR_PTR(-ENOMEM);
+	}
+
 	if (direntry->d_inode != NULL) {
 		cFYI(1, (" non-NULL inode in lookup"));
 	} else {
@@ -257,12 +324,13 @@ cifs_lookup(struct inode *parent_dir_ino
 	}
 	cFYI(1,
 	     (" Full path: %s inode = 0x%p", full_path, direntry->d_inode));
+
 	if (pTcon->ses->capabilities & CAP_UNIX)
 		rc = cifs_get_inode_info_unix(&newInode, full_path,
-					      parent_dir_inode->i_sb);
+					      parent_dir_inode->i_sb,xid);
 	else
 		rc = cifs_get_inode_info(&newInode, full_path, NULL,
-					 parent_dir_inode->i_sb);
+					 parent_dir_inode->i_sb,xid);
 
 	if ((rc == 0) && (newInode != NULL)) {
 		direntry->d_op = &cifs_dentry_ops;
@@ -275,10 +343,10 @@ cifs_lookup(struct inode *parent_dir_ino
 		rc = 0;
 		d_add(direntry, NULL);
 	} else {
-		cERROR(1,
-		       ("Error 0x%x or (%d decimal) on cifs_get_inode_info in lookup",
-			rc, rc));
-		/* BB special case check for Access Denied - watch security exposure of returning dir info implicitly via different rc if file exists or not but no access BB */
+		cERROR(1,("Error 0x%x or on cifs_get_inode_info in lookup",rc));
+		/* BB special case check for Access Denied - watch security 
+		exposure of returning dir info implicitly via different rc 
+		if file exists or not but no access BB */
 	}
 
 	if (full_path)
@@ -301,9 +369,16 @@ cifs_dir_open(struct inode *inode, struc
 	cifs_sb = CIFS_SB(inode->i_sb);
 	pTcon = cifs_sb->tcon;
 
-	full_path = build_wildcard_path_from_dentry(file->f_dentry);
+	if(file->f_dentry) {
+		down(&file->f_dentry->d_sb->s_vfs_rename_sem);
+		full_path = build_wildcard_path_from_dentry(file->f_dentry);
+		up(&file->f_dentry->d_sb->s_vfs_rename_sem);
+	} else {
+		FreeXid(xid);
+		return -EIO;
+	}
 
-	cFYI(1, (" inode = 0x%p and full path is %s", inode, full_path));
+	cFYI(1, ("inode = 0x%p and full path is %s", inode, full_path));
 
 	if (full_path)
 		kfree(full_path);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/cifs/file.c linux-2.4.20-wolk4.16-fullkernel/fs/cifs/file.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/cifs/file.c	2004-06-29 11:24:22.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/cifs/file.c	2004-09-05 15:47:54.000000000 +0200
@@ -29,6 +29,7 @@
 #include <linux/list.h>
 #include <asm/div64.h>
 #include <linux/mm.h>
+#include <linux/types.h>
 #include "cifsfs.h"
 #include "cifspdu.h"
 #include "cifsglob.h"
@@ -51,15 +52,22 @@ cifs_open(struct inode *inode, struct fi
 	int disposition;
 	__u16 netfid;
 	FILE_ALL_INFO * buf = NULL;
+	time_t temp;
 
 	xid = GetXid();
 
-	cFYI(1, (" inode = 0x%p file flags are %x", inode, file->f_flags));
 	cifs_sb = CIFS_SB(inode->i_sb);
 	pTcon = cifs_sb->tcon;
 
+	down(&inode->i_sb->s_vfs_rename_sem);
 	full_path = build_path_from_dentry(file->f_dentry);
+	up(&inode->i_sb->s_vfs_rename_sem);
+	if(full_path == NULL) {
+		FreeXid(xid);
+		return -ENOMEM;
+	}
 
+	cFYI(1, (" inode = 0x%p file flags are 0x%x for %s", inode, file->f_flags,full_path));
 	if ((file->f_flags & O_ACCMODE) == O_RDONLY)
 		desiredAccess = GENERIC_READ;
 	else if ((file->f_flags & O_ACCMODE) == O_WRONLY)
@@ -119,6 +127,10 @@ cifs_open(struct inode *inode, struct fi
 	/* Also refresh inode by passing in file_info buf returned by SMBOpen 
 	   and calling get_inode_info with returned buf (at least 
 	   helps non-Unix server case */
+
+	/* BB we can not do this if this is the second open of a file 
+	and the first handle has writebehind data, we might be 
+	able to simply do a filemap_fdatawrite/filemap_fdatawait first */
 	buf = kmalloc(sizeof(FILE_ALL_INFO),GFP_KERNEL);
 	if(buf==0) {
 		if (full_path)
@@ -126,7 +138,6 @@ cifs_open(struct inode *inode, struct fi
 		FreeXid(xid);
 		return -ENOMEM;
 	}
-
 	rc = CIFSSMBOpen(xid, pTcon, full_path, disposition, desiredAccess,
 			CREATE_NOT_DIR, &netfid, &oplock, buf, cifs_sb->local_nls);
 	if (rc) {
@@ -134,10 +145,9 @@ cifs_open(struct inode *inode, struct fi
 		cFYI(1, ("oplock: %d ", oplock));	
 	} else {
 		file->private_data =
-		    kmalloc(sizeof (struct cifsFileInfo), GFP_KERNEL);
+			kmalloc(sizeof (struct cifsFileInfo), GFP_KERNEL);
 		if (file->private_data) {
-			memset(file->private_data, 0,
-			       sizeof (struct cifsFileInfo));
+			memset(file->private_data, 0, sizeof(struct cifsFileInfo));
 			pCifsFile = (struct cifsFileInfo *) file->private_data;
 			pCifsFile->netfid = netfid;
 			pCifsFile->pid = current->pid;
@@ -151,29 +161,58 @@ cifs_open(struct inode *inode, struct fi
 			list_add(&pCifsFile->tlist,&pTcon->openFileList);
 			pCifsInode = CIFS_I(file->f_dentry->d_inode);
 			if(pCifsInode) {
-				list_add(&pCifsFile->flist,&pCifsInode->openFileList);
-				write_unlock(&files_lock);
+				/* want handles we can use to read with first */
+				/* in the list so we do not have to walk the */
+				/* list to search for one in prepare_write */
+				if ((file->f_flags & O_ACCMODE) == O_WRONLY) {
+					list_add_tail(&pCifsFile->flist,&pCifsInode->openFileList);
+				} else {
+					list_add(&pCifsFile->flist,&pCifsInode->openFileList);
+				}
+				spin_unlock(&files_lock);
 				write_unlock(&GlobalSMBSeslock);
+				if(pCifsInode->clientCanCacheRead) {
+					/* we have the inode open somewhere else
+					   no need to discard cache data */
+				} else {
+					if(buf) {
+					/* BB need same check in cifs_create too? */
 
-		                if (pTcon->ses->capabilities & CAP_UNIX)
+					/* if not oplocked, invalidate inode pages if mtime 
+					   or file size changed */
+						temp = cifs_NTtimeToUnix(le64_to_cpu(buf->LastWriteTime));
+						if((file->f_dentry->d_inode->i_mtime == temp) && 
+							(file->f_dentry->d_inode->i_size == (loff_t)le64_to_cpu(buf->EndOfFile))) {
+							cFYI(1,("inode unchanged on server"));
+						} else {
+							if(file->f_dentry->d_inode->i_mapping) {
+							/* BB no need to lock inode until after invalidate*/
+							/* since namei code should already have it locked?*/
+								filemap_fdatasync(file->f_dentry->d_inode->i_mapping);
+							}
+							cFYI(1,("invalidating remote inode since open detected it changed"));
+							invalidate_inode_pages(file->f_dentry->d_inode);
+						}
+					}
+				}
+				if (pTcon->ses->capabilities & CAP_UNIX)
 					rc = cifs_get_inode_info_unix(&file->f_dentry->d_inode,
-						full_path, inode->i_sb);
+						full_path, inode->i_sb,xid);
 				else
 					rc = cifs_get_inode_info(&file->f_dentry->d_inode,
-						full_path, buf, inode->i_sb);
+						full_path, buf, inode->i_sb,xid);
 
-				if(oplock == OPLOCK_EXCLUSIVE) {
+				if((oplock & 0xF) == OPLOCK_EXCLUSIVE) {
 					pCifsInode->clientCanCacheAll = TRUE;
 					pCifsInode->clientCanCacheRead = TRUE;
 					cFYI(1,("Exclusive Oplock granted on inode %p",file->f_dentry->d_inode));
-				} else if(oplock == OPLOCK_READ)
+				} else if((oplock & 0xF) == OPLOCK_READ)
 					pCifsInode->clientCanCacheRead = TRUE;
 			} else {
-				write_unlock(&files_lock);
+				spin_unlock(&files_lock);
 				write_unlock(&GlobalSMBSeslock);
 			}
-
-			if(file->f_flags & O_CREAT) {           
+			if(oplock & CIFS_CREATE_ACTION) {           
 				/* time to set mode which we can not set earlier due
 				 to problems creating new read-only files */
 				if (cifs_sb->tcon->ses->capabilities & CAP_UNIX)                
@@ -210,107 +249,135 @@ static int cifs_relock_file(struct cifsF
 	return rc;
 }
 
-static int cifs_reopen_file(struct inode *inode, struct file *file)
+static int cifs_reopen_file(struct inode *inode, struct file *file, int can_flush)
 {
-        int rc = -EACCES;
-        int xid, oplock;
-        struct cifs_sb_info *cifs_sb;
-        struct cifsTconInfo *pTcon;
-        struct cifsFileInfo *pCifsFile;
-        struct cifsInodeInfo *pCifsInode;
-        char *full_path = NULL;
-        int desiredAccess = 0x20197;
-        int disposition = FILE_OPEN;
-        __u16 netfid;
-        FILE_ALL_INFO * buf = NULL;
-
-        if(inode == NULL)
-                return -EBADF;
-        if (file->private_data) {
-                pCifsFile = (struct cifsFileInfo *) file->private_data;
-        } else
-                return -EBADF;
-
-        xid = GetXid();
-        down(&pCifsFile->fh_sem);
-        if(pCifsFile->invalidHandle == FALSE) {
-                up(&pCifsFile->fh_sem);
-                FreeXid(xid);
-                return 0;
-        }
+	int rc = -EACCES;
+	int xid, oplock;
+	struct cifs_sb_info *cifs_sb;
+	struct cifsTconInfo *pTcon;
+	struct cifsFileInfo *pCifsFile;
+	struct cifsInodeInfo *pCifsInode;
+	char *full_path = NULL;
+	int desiredAccess = 0x20197;
+	int disposition = FILE_OPEN;
+	__u16 netfid;
+
+	if(inode == NULL)
+		return -EBADF;
+	if (file->private_data) {
+		pCifsFile = (struct cifsFileInfo *) file->private_data;
+	} else
+		return -EBADF;
+
+	xid = GetXid();
+	down(&pCifsFile->fh_sem);
+	if(pCifsFile->invalidHandle == FALSE) {
+		up(&pCifsFile->fh_sem);
+		FreeXid(xid);
+		return 0;
+	}
+
+	if(file->f_dentry == NULL) {
+		up(&pCifsFile->fh_sem);
+		cFYI(1,("failed file reopen, no valid name if dentry freed"));
+		FreeXid(xid);
+		return -EBADF;
+	}
+	cifs_sb = CIFS_SB(inode->i_sb);
+	pTcon = cifs_sb->tcon;
+/* can not grab rename sem here because various ops, including
+those that already have the rename sem can end up causing writepage
+to get called and if the server was down that means we end up here,
+and we can never tell if the caller already has the rename_sem */
+	full_path = build_path_from_dentry(file->f_dentry);
+	if(full_path == NULL) {
+		up(&pCifsFile->fh_sem);
+		FreeXid(xid);
+		return -ENOMEM;
+	}
 
+	cFYI(1, (" inode = 0x%p file flags are 0x%x for %s", inode, file->f_flags,full_path));
+	if ((file->f_flags & O_ACCMODE) == O_RDONLY)
+		desiredAccess = GENERIC_READ;
+	else if ((file->f_flags & O_ACCMODE) == O_WRONLY)
+		desiredAccess = GENERIC_WRITE;
+	else if ((file->f_flags & O_ACCMODE) == O_RDWR) {
+		/* GENERIC_ALL is too much permission to request */
+		/* can cause unnecessary access denied on create */
+		/* desiredAccess = GENERIC_ALL; */
+		desiredAccess = GENERIC_READ | GENERIC_WRITE;
+	}
 
-        cifs_sb = CIFS_SB(inode->i_sb);
-        pTcon = cifs_sb->tcon;
+	if (oplockEnabled)
+		oplock = REQ_OPLOCK;
+	else
+		oplock = FALSE;
 
-        full_path = build_path_from_dentry(file->f_dentry);
+	
+	/* Can not refresh inode by passing in file_info buf to be returned
+	 by SMBOpen and then calling get_inode_info with returned buf 
+	 since file might have write behind data that needs to be flushed 
+	 and server version of file size can be stale. If we 
+	 knew for sure that inode was not dirty locally we could do this */
 
-        cFYI(1, (" inode = 0x%p file flags are 0x%x for %s", inode, file->f_flags,full_path));
-        if ((file->f_flags & O_ACCMODE) == O_RDONLY)
-                desiredAccess = GENERIC_READ;
-        else if ((file->f_flags & O_ACCMODE) == O_WRONLY)
-                desiredAccess = GENERIC_WRITE;
-        else if ((file->f_flags & O_ACCMODE) == O_RDWR)
-                desiredAccess = GENERIC_READ | GENERIC_WRITE;
-
-        if (oplockEnabled)
-                oplock = REQ_OPLOCK;
-        else
-                oplock = FALSE;
-
-        /* BB pass O_SYNC flag through on file attributes .. BB */
-
-        /* Also refresh inode by passing in file_info buf returned by SMBOpen
-           and calling get_inode_info with returned buf (at least
-           helps non-Unix server case */
-        buf = kmalloc(sizeof(FILE_ALL_INFO),GFP_KERNEL);
-        if(buf==0) {
-                up(&pCifsFile->fh_sem);
-                if (full_path)
-                        kfree(full_path);
-                FreeXid(xid);
-                return -ENOMEM;
-        }
-        rc = CIFSSMBOpen(xid, pTcon, full_path, disposition, desiredAccess,
-                                CREATE_NOT_DIR, &netfid, &oplock, buf, cifs_sb->local_nls);
-        if (rc) {
-                up(&pCifsFile->fh_sem);
-                cFYI(1, ("cifs_open returned 0x%x ", rc));
-                cFYI(1, ("oplock: %d ", oplock));
-        } else {
-                pCifsFile->netfid = netfid;
-                pCifsFile->invalidHandle = FALSE;
-                up(&pCifsFile->fh_sem);
-                pCifsInode = CIFS_I(inode);
-                if(pCifsInode) {
-                        if (pTcon->ses->capabilities & CAP_UNIX)
-                                rc = cifs_get_inode_info_unix(&inode,
-                                                full_path, inode->i_sb);
-                        else
-                                rc = cifs_get_inode_info(&inode,
-                                                full_path, buf, inode->i_sb);
-
-                        if(oplock == OPLOCK_EXCLUSIVE) {
-                                pCifsInode->clientCanCacheAll =  TRUE;
-                                pCifsInode->clientCanCacheRead = TRUE;
-                                cFYI(1,("Exclusive Oplock granted on inode %p",file->f_dentry->d_inode));
-                        } else if(oplock == OPLOCK_READ) {
-                                pCifsInode->clientCanCacheRead = TRUE;
-                                pCifsInode->clientCanCacheAll =  FALSE;
-                        } else {
-                                pCifsInode->clientCanCacheRead = FALSE;
-                                pCifsInode->clientCanCacheAll =  FALSE;
-                        }
-                        cifs_relock_file(pCifsFile);
-                }
-        }
+/*	buf = kmalloc(sizeof(FILE_ALL_INFO),GFP_KERNEL);
+	if(buf==0) {
+		up(&pCifsFile->fh_sem);
+		if (full_path)
+			kfree(full_path);
+		FreeXid(xid);
+		return -ENOMEM;
+	}*/
+	rc = CIFSSMBOpen(xid, pTcon, full_path, disposition, desiredAccess,
+				CREATE_NOT_DIR, &netfid, &oplock, NULL, cifs_sb->local_nls);
+	if (rc) {
+		up(&pCifsFile->fh_sem);
+		cFYI(1, ("cifs_open returned 0x%x ", rc));
+		cFYI(1, ("oplock: %d ", oplock));
+	} else {
+		pCifsFile->netfid = netfid;
+		pCifsFile->invalidHandle = FALSE;
+		up(&pCifsFile->fh_sem);
+		pCifsInode = CIFS_I(inode);
+		if(pCifsInode) {
+			if(can_flush) {
+				filemap_fdatasync(inode->i_mapping);
+				filemap_fdatawait(inode->i_mapping);
+			/* temporarily disable caching while we
+			go to server to get inode info */
+				pCifsInode->clientCanCacheAll = FALSE;
+				pCifsInode->clientCanCacheRead = FALSE;
+				if (pTcon->ses->capabilities & CAP_UNIX)
+					rc = cifs_get_inode_info_unix(&inode,
+						full_path, inode->i_sb,xid);
+				else
+					rc = cifs_get_inode_info(&inode,
+						full_path, NULL, inode->i_sb,xid);
+			} /* else we are writing out data to server already
+			and could deadlock if we tried to flush data, and 
+			since we do not know if we have data that would
+			invalidate the current end of file on the server
+			we can not go to the server to get the new
+			inod info */
+			if((oplock & 0xF) == OPLOCK_EXCLUSIVE) {
+				pCifsInode->clientCanCacheAll =  TRUE;
+				pCifsInode->clientCanCacheRead = TRUE;
+				cFYI(1,("Exclusive Oplock granted on inode %p",file->f_dentry->d_inode));
+			} else if((oplock & 0xF) == OPLOCK_READ) {
+				pCifsInode->clientCanCacheRead = TRUE;
+				pCifsInode->clientCanCacheAll =  FALSE;
+			} else {
+				pCifsInode->clientCanCacheRead = FALSE;
+				pCifsInode->clientCanCacheAll =  FALSE;
+			}
+			cifs_relock_file(pCifsFile);
+		}
+	}
 
-        if (buf)
-                kfree(buf);
-        if (full_path)
-                kfree(full_path);
-        FreeXid(xid);
-        return rc;
+	if (full_path)
+		kfree(full_path);
+	FreeXid(xid);
+	return rc;
 }
 
 int
@@ -328,7 +395,7 @@ cifs_close(struct inode *inode, struct f
 	cifs_sb = CIFS_SB(inode->i_sb);
 	pTcon = cifs_sb->tcon;
 	if (pSMBFile) {
-		pSMBFile->closePend	= TRUE;
+		pSMBFile->closePend    = TRUE;
 		spin_lock(&files_lock);
 		if(pTcon) {
 			/* no sense reconnecting to close a file that is
@@ -355,7 +422,6 @@ cifs_close(struct inode *inode, struct f
 		info on this inode, much less write behind and read ahead */
 		CIFS_I(inode)->clientCanCacheRead = FALSE;
 		CIFS_I(inode)->clientCanCacheAll  = FALSE;
-		invalidate_inode_pages(inode);
 	}
 	if((rc ==0) && CIFS_I(inode)->write_behind_rc)
 		rc = CIFS_I(inode)->write_behind_rc;
@@ -414,7 +480,6 @@ cifs_lock(struct file *file, int cmd, st
 		cFYI(1, ("Blocking lock "));
 		wait_flag = TRUE;
 	} */                          
-
 	if (pfLock->fl_flags & FL_ACCESS)
 		cFYI(1, ("Process suspended by mandatory locking - not implemented yet "));
 	if (pfLock->fl_flags & FL_LEASE)
@@ -502,9 +567,13 @@ cifs_write(struct file * file, const cha
 	int xid, long_op;
 	struct cifsFileInfo * open_file;
 
-	xid = GetXid();
+	if(file->f_dentry == NULL)
+		return -EBADF;
 
 	cifs_sb = CIFS_SB(file->f_dentry->d_sb);
+	if(cifs_sb == NULL) {
+		return -EBADF;
+	}
 	pTcon = cifs_sb->tcon;
 
 	/*cFYI(1,
@@ -512,11 +581,16 @@ cifs_write(struct file * file, const cha
 	   *poffset, file->f_dentry->d_name.name)); */
 
 	if (file->private_data == NULL) {
+		return -EBADF;
+	} else {
+		open_file = (struct cifsFileInfo *) file->private_data;
+	}
+	
+	xid = GetXid();
+	if(file->f_dentry->d_inode == NULL) {
 		FreeXid(xid);
 		return -EBADF;
 	}
-	open_file = (struct cifsFileInfo *) file->private_data;
-
 
 	if (*poffset > file->f_dentry->d_inode->i_size)
 		long_op = 2;  /* writes past end of file can take a long time */
@@ -527,8 +601,32 @@ cifs_write(struct file * file, const cha
 	     total_written += bytes_written) {
 		rc = -EAGAIN;
 		while(rc == -EAGAIN) {
-			if ((open_file->invalidHandle) && (!open_file->closePend)) {
-				rc = cifs_reopen_file(file->f_dentry->d_inode,file);
+			if(file->private_data == NULL) {
+				/* file has been closed on us */
+				FreeXid(xid);
+			/* if we have gotten here we have written some data
+			and blocked, and the file has been freed on us
+			while we blocked so return what we managed to write */
+				return total_written;
+			} 
+			if(open_file->closePend) {
+				FreeXid(xid);
+				if(total_written)
+					return total_written;
+				else
+					return -EBADF;
+			}
+			if (open_file->invalidHandle) {
+				if((file->f_dentry == NULL) ||
+				   (file->f_dentry->d_inode == NULL)) {
+					FreeXid(xid);
+					return total_written;
+				}
+				/* we could deadlock if we called
+				 filemap_fdatawait from here so tell
+				reopen_file not to flush data to server now */
+				rc = cifs_reopen_file(file->f_dentry->d_inode,
+					file,FALSE);
 				if(rc != 0)
 					break;
 			}
@@ -550,13 +648,28 @@ cifs_write(struct file * file, const cha
 			*poffset += bytes_written;
 		long_op = FALSE; /* subsequent writes fast - 15 seconds is plenty */
 	}
-	file->f_dentry->d_inode->i_ctime = file->f_dentry->d_inode->i_mtime =
-		CURRENT_TIME;
-	if (bytes_written > 0) {
-		if (*poffset > file->f_dentry->d_inode->i_size)
-			file->f_dentry->d_inode->i_size = *poffset;
+
+#ifdef CONFIG_CIFS_STATS
+	if(total_written > 0) {
+		atomic_inc(&pTcon->num_writes);
+		spin_lock(&pTcon->stat_lock);
+		pTcon->bytes_written += total_written;
+		spin_unlock(&pTcon->stat_lock);
+	}
+#endif		
+
+	/* since the write may have blocked check these pointers again */
+	if(file->f_dentry) {
+		if(file->f_dentry->d_inode) {
+			file->f_dentry->d_inode->i_ctime = file->f_dentry->d_inode->i_mtime =
+				CURRENT_TIME;
+			if (total_written > 0) {
+				if (*poffset > file->f_dentry->d_inode->i_size)
+					file->f_dentry->d_inode->i_size = *poffset;
+			}
+			mark_inode_dirty_sync(file->f_dentry->d_inode);
+		}
 	}
-	mark_inode_dirty_sync(file->f_dentry->d_inode);
 	FreeXid(xid);
 	return total_written;
 }
@@ -566,49 +679,54 @@ cifs_partialpagewrite(struct page *page,
 {
 	struct address_space *mapping = page->mapping;
 	loff_t offset = (loff_t)page->index << PAGE_CACHE_SHIFT;
-	char * write_data = kmap(page);
+	char * write_data;
 	int rc = -EFAULT;
 	int bytes_written = 0;
 	struct cifs_sb_info *cifs_sb;
 	struct cifsTconInfo *pTcon;
-	struct inode *inode = page->mapping->host;
+	struct inode *inode;
 	struct cifsInodeInfo *cifsInode;
 	struct cifsFileInfo *open_file = NULL;
 	struct list_head *tmp;
 	struct list_head *tmp1;
 
-	cifs_sb = CIFS_SB(inode->i_sb);
-	pTcon = cifs_sb->tcon;
-
-	/* figure out which file struct to use 
-	if (file->private_data == NULL) {
-	   kunmap(page);
-	   return -EBADF;
-	}     
-	 */
 	if (!mapping) {
 		return -EFAULT;
 	} else if(!mapping->host) {
 		return -EFAULT;
 	}
 
+	inode = page->mapping->host;
+	cifs_sb = CIFS_SB(inode->i_sb);
+	pTcon = cifs_sb->tcon;
+
 	offset += (loff_t)from;
+	write_data = kmap(page);
 	write_data += from;
 
-	if((to > PAGE_CACHE_SIZE) || (from > to) || (offset > mapping->host->i_size)) {
+	if((to > PAGE_CACHE_SIZE) || (from > to)) {
 		kunmap(page);
 		return -EIO;
 	}
 
+	/* racing with truncate? */
+	if(offset > mapping->host->i_size) {
+		kunmap(page);
+		return 0; /* don't care */
+	}
+
 	/* check to make sure that we are not extending the file */
 	if(mapping->host->i_size - offset < (loff_t)to)
 		to = (unsigned)(mapping->host->i_size - offset); 
 		
 
 	cifsInode = CIFS_I(mapping->host);
-	read_lock(&GlobalSMBSeslock);
+	read_lock(&GlobalSMBSeslock); 
+	/* BB we should start at the end */
 	list_for_each_safe(tmp, tmp1, &cifsInode->openFileList) {            
 		open_file = list_entry(tmp,struct cifsFileInfo, flist);
+		if(open_file->closePend)
+			continue;
 		/* We check if file is open for writing first */
 		if((open_file->pfile) && 
 		   ((open_file->pfile->f_flags & O_RDWR) || 
@@ -622,11 +740,19 @@ cifs_partialpagewrite(struct page *page,
 			if ((bytes_written > 0) && (offset)) {
 				rc = 0;
 			} else if(bytes_written < 0) {
-				rc = bytes_written;
+				if(rc == -EBADF) {
+				/* have seen a case in which
+				kernel seemed to have closed/freed a file
+				even with writes active so we might as well
+				see if there are other file structs to try
+				for the same inode before giving up */
+					continue;
+				} else
+					rc = bytes_written;
 			}
 			break;  /* now that we found a valid file handle
-                                and tried to write to it we are done, no
-                                sense continuing to loop looking for another */
+				and tried to write to it we are done, no
+				sense continuing to loop looking for another */
 		}
 		if(tmp->next == NULL) {
 			cFYI(1,("File instance %p removed",tmp));
@@ -666,6 +792,9 @@ cifs_writepage(struct page* page)
 	xid = GetXid();
 /* BB add check for wbc flags */
 	page_cache_get(page);
+        if (!Page_Uptodate(page)) {
+		cFYI(1,("ppw - page not up to date"));
+	}
 	
 	rc = cifs_partialpagewrite(page,0,PAGE_CACHE_SIZE);
 	SetPageUptodate(page); /* BB add check for error and Clearuptodate? */
@@ -687,14 +816,13 @@ cifs_commit_write(struct file *file, str
 	int rc = 0;
 	struct inode *inode = page->mapping->host;
 	loff_t position = ((loff_t)page->index << PAGE_CACHE_SHIFT) + to;
-	struct cifsFileInfo *open_file;
-	struct cifs_sb_info *cifs_sb;
+	char * page_data;
 
 	xid = GetXid();
-
+	cFYI(1,("commit write for page %p up to position %lld for %d",page,position,to));
 	if (position > inode->i_size){
 		inode->i_size = position;
-		if (file->private_data == NULL) {
+		/*if (file->private_data == NULL) {
 			rc = -EBADF;
 		} else {
 			open_file = (struct cifsFileInfo *)file->private_data;
@@ -707,19 +835,43 @@ cifs_commit_write(struct file *file, str
 					if(rc != 0)
 						break;
 				}
-                if(!open_file->closePend)
-				    rc = CIFSSMBSetFileSize(xid, cifs_sb->tcon, 
+				if(!open_file->closePend) {
+					rc = CIFSSMBSetFileSize(xid, cifs_sb->tcon, 
 						position, open_file->netfid,
 						open_file->pid,FALSE);
-                else {
-                    rc = -EBADF;
-                    break;
-                }
+				} else {
+					rc = -EBADF;
+					break;
+				}
 			}
 			cFYI(1,(" SetEOF (commit write) rc = %d",rc));
-		}
+		}*/
+	}
+	if (!Page_Uptodate(page)) {
+		position =  ((loff_t)page->index << PAGE_CACHE_SHIFT) + offset;
+		/* can not rely on (or let) writepage write this data */
+		if(to < offset) {
+			cFYI(1,("Illegal offsets, can not copy from %d to %d",
+				offset,to));
+			FreeXid(xid);
+			return rc;
+		}
+		/* this is probably better than directly calling 
+		partialpage_write since in this function
+		the file handle is known which we might as well
+		leverage */
+		/* BB check if anything else missing out of ppw */
+		/* such as updating last write time */
+		page_data = kmap(page);
+		rc = cifs_write(file, page_data+offset,to-offset,
+                                        &position);
+		if(rc > 0)
+			rc = 0;
+		/* else if rc < 0 should we set writebehind rc? */
+		kunmap(page);
+	} else {	
+		set_page_dirty(page);
 	}
-	set_page_dirty(page);
 
 	FreeXid(xid);
 	return rc;
@@ -741,11 +893,8 @@ cifs_fsync(struct file *file, struct den
 #else
 	filemap_fdatasync(inode->i_mapping);
 #endif
-
-
 	if(rc == 0)
 		CIFS_I(inode)->write_behind_rc = 0;
-
 	FreeXid(xid);
 	return rc;
 }
@@ -800,10 +949,10 @@ int cifs_flush(struct file *file)
 #else
 	filemap_fdatasync(inode->i_mapping);
 #endif
-
-	cFYI(1,("Flush inode %p file %p rc %d",inode,file,rc));
 	if(rc == 0) /* reset wb rc if we were able to write out dirty pages */
 		CIFS_I(inode)->write_behind_rc = 0;
+		
+	cFYI(1,("Flush inode %p file %p rc %d",inode,file,rc));
 
 	return rc;
 }
@@ -833,8 +982,12 @@ cifs_read(struct file * file, char *read
 	}
 	open_file = (struct cifsFileInfo *)file->private_data;
 
+	if((file->f_flags & O_ACCMODE) == O_WRONLY) {
+		cFYI(1,("attempting read on write only file instance"));
+	}
+
 	for (total_read = 0,current_offset=read_data; read_size > total_read;
-		total_read += bytes_read,current_offset+=bytes_read) {
+				total_read += bytes_read,current_offset+=bytes_read) {
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,15))
 		current_read_size = min_t(const int,read_size - total_read,cifs_sb->rsize);
 #else
@@ -843,15 +996,16 @@ cifs_read(struct file * file, char *read
 		rc = -EAGAIN;
 		while(rc == -EAGAIN) {
 			if ((open_file->invalidHandle) && (!open_file->closePend)) {
-				rc = cifs_reopen_file(file->f_dentry->d_inode,file);
+				rc = cifs_reopen_file(file->f_dentry->d_inode,
+					file,TRUE);
 				if(rc != 0)
-				break;
+					break;
 			}
 
 			rc = CIFSSMBRead(xid, pTcon,
-				open_file->netfid,
-				current_read_size, *poffset,
-				&bytes_read, &current_offset);
+				 open_file->netfid,
+				 current_read_size, *poffset,
+				 &bytes_read, &current_offset);
 		}
 		if (rc || (bytes_read == 0)) {
 			if (total_read) {
@@ -861,10 +1015,15 @@ cifs_read(struct file * file, char *read
 				return rc;
 			}
 		} else {
+#ifdef CONFIG_CIFS_STATS
+			atomic_inc(&pTcon->num_reads);
+			spin_lock(&pTcon->stat_lock);
+			pTcon->bytes_read += total_read;
+			spin_unlock(&pTcon->stat_lock);
+#endif
 			*poffset += bytes_read;
 		}
 	}
-
 	FreeXid(xid);
 	return total_read;
 }
@@ -898,11 +1057,8 @@ static void cifs_copy_cache_pages(struct
 		if(list_empty(pages))
 			break;
 
-		spin_lock(&mapping->page_lock);
-		page = list_entry(pages->prev, struct page, list);
-
-		list_del(&page->list);
-		spin_unlock(&mapping->page_lock);
+		page = list_entry(pages->prev, struct page, lru);
+		list_del(&page->lru);
 
 		if (add_to_page_cache(page, mapping, page->index, GFP_KERNEL)) {
 			page_cache_release(page);
@@ -910,33 +1066,30 @@ static void cifs_copy_cache_pages(struct
 			continue;
 		}
 
-		page_cache_get(page);
 		target = kmap_atomic(page,KM_USER0);
 
 		if(PAGE_CACHE_SIZE > bytes_read) {
 			memcpy(target,data,bytes_read);
+			/* zero the tail end of this partial page */
+			memset(target+bytes_read,0,PAGE_CACHE_SIZE-bytes_read);
 			bytes_read = 0;
 		} else {
 			memcpy(target,data,PAGE_CACHE_SIZE);
 			bytes_read -= PAGE_CACHE_SIZE;
 		}
+		kunmap_atomic(target,KM_USER0);
 
-		if (!pagevec_add(plru_pvec, page))
-			__pagevec_lru_add(plru_pvec);
 		flush_dcache_page(page);
 		SetPageUptodate(page);
-		kunmap_atomic(page,KM_USER0);
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,20))
 		unlock_page(page);
-#else
-		UnlockPage(page);
-#endif
-		page_cache_release(page);
+		if (!pagevec_add(plru_pvec, page))
+			__pagevec_lru_add(plru_pvec);
 		data += PAGE_CACHE_SIZE;
 	}
 	return;
 }
 
+
 static int
 cifs_readpages(struct file *file, struct address_space *mapping,
 		struct list_head *page_list, unsigned num_pages)
@@ -949,7 +1102,7 @@ cifs_readpages(struct file *file, struct
 	struct cifsTconInfo *pTcon;
 	int bytes_read = 0;
 	unsigned int read_size,i;
-	char * smb_read_data = 0;
+	char * smb_read_data = NULL;
 	struct smb_com_read_rsp * pSMBr;
 	struct pagevec lru_pvec;
 	struct cifsFileInfo * open_file;
@@ -966,31 +1119,42 @@ cifs_readpages(struct file *file, struct
 	pagevec_init(&lru_pvec, 0);
 
 	for(i = 0;i<num_pages;) {
-		spin_lock(&mapping->page_lock);
+		unsigned contig_pages;
+		struct page * tmp_page;
+		unsigned long expected_index;
+
 		if(list_empty(page_list)) {
-			spin_unlock(&mapping->page_lock);
 			break;
 		}
-		page = list_entry(page_list->prev, struct page, list);
+		page = list_entry(page_list->prev, struct page, lru);
 		offset = (loff_t)page->index << PAGE_CACHE_SHIFT;
-	        spin_unlock(&mapping->page_lock);
+
+		/* count adjacent pages that we will read into */
+		contig_pages = 0;
+		expected_index = list_entry(page_list->prev,struct page,lru)->index;
+		list_for_each_entry_reverse(tmp_page,page_list,lru) {
+			if(tmp_page->index == expected_index) {
+				contig_pages++;
+				expected_index++;
+			} else {
+				break; 
+			}
+		}
+		if(contig_pages + i >  num_pages) {
+			contig_pages = num_pages - i;
+		}
 
 		/* for reads over a certain size could initiate async read ahead */
 
-		cFYI(0,("Read %d pages into cache at offset %ld ",
-			num_pages-i, (unsigned long) offset)); 
-		
-		read_size = (num_pages - i) * PAGE_CACHE_SIZE;
+		read_size = contig_pages * PAGE_CACHE_SIZE;
 		/* Read size needs to be in multiples of one page */
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,15))
 		read_size = min_t(const unsigned int,read_size,cifs_sb->rsize & PAGE_CACHE_MASK);
-#else
-                read_size = min(read_size,cifs_sb->rsize & PAGE_CACHE_MASK);
-#endif
+
 		rc = -EAGAIN;
 		while(rc == -EAGAIN) {
 			if ((open_file->invalidHandle) && (!open_file->closePend)) {
-				rc = cifs_reopen_file(file->f_dentry->d_inode,file);
+				rc = cifs_reopen_file(file->f_dentry->d_inode,
+					file, TRUE);
 				if(rc != 0)
 					break;
 			}
@@ -999,104 +1163,185 @@ cifs_readpages(struct file *file, struct
 				open_file->netfid,
 				read_size, offset,
 				&bytes_read, &smb_read_data);
+			/* BB need to check return code here */
+			if(rc== -EAGAIN) {
+				if(smb_read_data) {
+					cifs_buf_release(smb_read_data);
+					smb_read_data = NULL;
+				}
+			}
 		}
-
 		if ((rc < 0) || (smb_read_data == NULL)) {
 			cFYI(1,("Read error in readpages: %d",rc));
 			/* clean up remaing pages off list */
-            
-			spin_lock(&mapping->page_lock);
 			while (!list_empty(page_list) && (i < num_pages)) {
-				page = list_entry(page_list->prev, struct page, list);
-				list_del(&page->list);
+				page = list_entry(page_list->prev, struct page, lru);
+				list_del(&page->lru);
+				page_cache_release(page);
 			}
-			spin_unlock(&mapping->page_lock);
 			break;
 		} else if (bytes_read > 0) {
 			pSMBr = (struct smb_com_read_rsp *)smb_read_data;
 			cifs_copy_cache_pages(mapping, page_list, bytes_read,
-				smb_read_data + 4 /* RFC1000 hdr */ +
+				smb_read_data + 4 /* RFC1001 hdr */ +
 				le16_to_cpu(pSMBr->DataOffset), &lru_pvec);
+
 			i +=  bytes_read >> PAGE_CACHE_SHIFT;
-			if((bytes_read & PAGE_CACHE_MASK) != bytes_read) {
+#ifdef CONFIG_CIFS_STATS
+			atomic_inc(&pTcon->num_reads);
+			spin_lock(&pTcon->stat_lock);
+			pTcon->bytes_read += bytes_read;
+			spin_unlock(&pTcon->stat_lock);
+#endif
+			if((int)(bytes_read & PAGE_CACHE_MASK) != bytes_read) {
 				cFYI(1,("Partial page %d of %d read to cache",i++,num_pages));
-				break;
+
+				i++; /* account for partial page */
+
+				/* server copy of file can have smaller size than client */
+				/* BB do we need to verify this common case ? this case is ok - 
+				if we are at server EOF we will hit it on next read */
+
+			/* while(!list_empty(page_list) && (i < num_pages)) {
+					page = list_entry(page_list->prev,struct page, list);
+					list_del(&page->list);
+					page_cache_release(page);
+				}
+				break; */
 			}
 		} else {
-			cFYI(1,("No bytes read cleaning remaining pages off readahead list"));
+			cFYI(1,("No bytes read (%d) at offset %lld . Cleaning remaining pages from readahead list",bytes_read,offset)); 
 			/* BB turn off caching and do new lookup on file size at server? */
 			while (!list_empty(page_list) && (i < num_pages)) {
-				page = list_entry(page_list->prev, struct page, list);
-				list_del(&page->list);
+				page = list_entry(page_list->prev, struct page, lru);
+				list_del(&page->lru);
+				page_cache_release(page); /* BB removeme - replace with zero of page? */
 			}
-
 			break;
 		}
 		if(smb_read_data) {
 			cifs_buf_release(smb_read_data);
-			smb_read_data = 0;
+			smb_read_data = NULL;
 		}
 		bytes_read = 0;
 	}
 
 	pagevec_lru_add(&lru_pvec);
 
+/* need to free smb_read_data buf before exit */
+	if(smb_read_data) {
+		cifs_buf_release(smb_read_data);
+		smb_read_data = NULL;
+	} 
+
 	FreeXid(xid);
 	return rc;
 }
 #endif
 
-static int
-cifs_readpage(struct file *file, struct page *page)
+static int cifs_readpage_worker(struct file *file, struct page *page, loff_t * poffset)
 {
-	loff_t offset = (loff_t)page->index << PAGE_CACHE_SHIFT;
 	char * read_data;
-	int rc = -EACCES;
-	int xid;
-
-	xid = GetXid();
-
-	if (file->private_data == NULL) {
-		FreeXid(xid);
-		return -EBADF;
-	}
-
-	cFYI(0,("readpage %p at offset %d 0x%x\n",page,(int)offset,(int)offset));
+	int rc;
 
 	page_cache_get(page);
 	read_data = kmap(page);
 	/* for reads over a certain size could initiate async read ahead */
-
-	rc = cifs_read(file, read_data, PAGE_CACHE_SIZE, &offset);
-
+                                                                                                                           
+	rc = cifs_read(file, read_data, PAGE_CACHE_SIZE, poffset);
+                                                                                                                           
 	if (rc < 0)
 		goto io_error;
 	else {
 		cFYI(1,("Bytes read %d ",rc));
 	}
-
+                                                                                                                           
 	file->f_dentry->d_inode->i_atime = CURRENT_TIME;
-
-	if(PAGE_CACHE_SIZE > (unsigned int)rc) {
+                                                                                                                           
+	if(PAGE_CACHE_SIZE > rc) {
 		memset(read_data+rc, 0, PAGE_CACHE_SIZE - rc);
 	}
 	flush_dcache_page(page);
 	SetPageUptodate(page);
 	rc = 0;
-
+                                                                                                                           
 io_error:
-	kunmap(page);
+        kunmap(page);
+	page_cache_release(page);
+	return rc;
+}
+
+static int
+cifs_readpage(struct file *file, struct page *page)
+{
+	loff_t offset = (loff_t)page->index << PAGE_CACHE_SHIFT;
+	int rc = -EACCES;
+	int xid;
+
+	xid = GetXid();
+
+	if (file->private_data == NULL) {
+		FreeXid(xid);
+		return -EBADF;
+	}
+
+	cFYI(1,("readpage %p at offset %d 0x%x\n",page,(int)offset,(int)offset));
+
+	rc = cifs_readpage_worker(file,page,&offset);
+
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,20))
 	unlock_page(page);
 #else
 	UnlockPage(page);
 #endif
 
-	page_cache_release(page);
 	FreeXid(xid);
 	return rc;
 }
 
+/* We do not want to update the file size from server for inodes
+   open for write - to avoid races with writepage extending
+   the file - in the future we could consider allowing
+   refreshing the inode only on increases in the file size
+   but this is tricky to do without racing with writebehind
+   page caching in the current Linux kernel design */
+
+int is_size_safe_to_change(struct cifsInodeInfo * cifsInode)
+{
+	struct list_head *tmp;
+	struct list_head *tmp1;
+	struct cifsFileInfo *open_file = NULL;
+	int rc = TRUE;
+
+	if(cifsInode == NULL)
+		return rc;
+
+	read_lock(&GlobalSMBSeslock);
+	list_for_each_safe(tmp, tmp1, &cifsInode->openFileList) {
+		open_file = list_entry(tmp,struct cifsFileInfo, flist);
+		if(open_file == NULL)
+			break;
+		if(open_file->closePend)
+			continue;
+	/* We check if file is open for writing,
+	BB we could supplement this with a check to see if file size
+	changes have been flushed to server - ie inode metadata dirty */
+		if((open_file->pfile) &&
+		   ((open_file->pfile->f_flags & O_RDWR) ||
+		    (open_file->pfile->f_flags & O_WRONLY))) {
+			rc = FALSE;
+			break;
+		}
+		if(tmp->next == NULL) {
+			cFYI(1,("File instance %p removed",tmp));
+			break;
+		}
+	}
+	read_unlock(&GlobalSMBSeslock);
+	return rc;
+}
+
+
 void
 fill_in_inode(struct inode *tmp_inode,
 	      FILE_DIRECTORY_INFO * pfindData, int *pobject_type)
@@ -1110,7 +1355,6 @@ fill_in_inode(struct inode *tmp_inode,
 	pfindData->EndOfFile = le64_to_cpu(pfindData->EndOfFile);
 	cifsInfo->cifsAttrs = pfindData->ExtFileAttributes;
 	cifsInfo->time = jiffies;
-	atomic_inc(&cifsInfo->inUse);	/* inc on every refresh of inode info */
 
 	/* Linux can not store file creation time unfortunately so ignore it */
 	tmp_inode->i_atime =
@@ -1123,10 +1367,12 @@ fill_in_inode(struct inode *tmp_inode,
 	/* 2767 perms - indicate mandatory locking */
 		/* BB fill in uid and gid here? with help from winbind? 
 			or retrieve from NTFS stream extended attribute */
-	tmp_inode->i_uid = cifs_sb->mnt_uid;
-	tmp_inode->i_gid = cifs_sb->mnt_gid;
-	/* set default mode. will override for dirs below */
-	tmp_inode->i_mode = cifs_sb->mnt_file_mode;
+	if(atomic_read(&cifsInfo->inUse) == 0) {
+		tmp_inode->i_uid = cifs_sb->mnt_uid;
+		tmp_inode->i_gid = cifs_sb->mnt_gid;
+		/* set default mode. will override for dirs below */
+		tmp_inode->i_mode = cifs_sb->mnt_file_mode;
+	}
 
 	cFYI(0,
 	     ("CIFS FFIRST: Attributes came in as 0x%x",
@@ -1138,7 +1384,9 @@ fill_in_inode(struct inode *tmp_inode,
 	} else if (pfindData->ExtFileAttributes & ATTR_DIRECTORY) {
 		*pobject_type = DT_DIR;
 		/* override default perms since we do not lock dirs */
-		tmp_inode->i_mode = cifs_sb->mnt_dir_mode;
+		if(atomic_read(&cifsInfo->inUse) == 0) {
+			tmp_inode->i_mode = cifs_sb->mnt_dir_mode;
+		}
 		tmp_inode->i_mode |= S_IFDIR;
 	} else {
 		*pobject_type = DT_REG;
@@ -1149,14 +1397,19 @@ fill_in_inode(struct inode *tmp_inode,
 	}/* could add code here - to validate if device or weird share type? */
 
 	/* can not fill in nlink here as in qpathinfo version and Unx search */
-	tmp_inode->i_size = pfindData->EndOfFile;
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,15)) 
-	tmp_inode->i_blocks =
-		(tmp_inode->i_blksize - 1 + pfindData->AllocationSize) >> tmp_inode->i_blkbits;
-#else
-	tmp_inode->i_blocks =
-		(tmp_inode->i_blksize - 1 + pfindData->AllocationSize) >> 14;
-#endif
+	if(atomic_read(&cifsInfo->inUse) == 0) {
+		atomic_set(&cifsInfo->inUse,1);
+	}
+	if(is_size_safe_to_change(cifsInfo)) {
+		/* can not safely change the file size here if the
+		client is writing to it due to potential races */
+		tmp_inode->i_size = pfindData->EndOfFile;
+
+	/* 512 bytes (2**9) is the fake blocksize that must be used */
+	/* for this calculation, even though the reported blocksize is larger */
+		tmp_inode->i_blocks = (512 - 1 + pfindData->AllocationSize) >> 9;
+	}
+
 	if (pfindData->AllocationSize < pfindData->EndOfFile)
 		cFYI(1, ("Possible sparse file: allocation size less than end of file "));
 	cFYI(1,
@@ -1211,9 +1464,13 @@ unix_fill_in_inode(struct inode *tmp_ino
 	} else if (pfindData->Type == UNIX_CHARDEV) {
 		*pobject_type = DT_CHR;
 		tmp_inode->i_mode |= S_IFCHR;
+		tmp_inode->i_rdev = MKDEV(le64_to_cpu(pfindData->DevMajor),
+				le64_to_cpu(pfindData->DevMinor) & MINORMASK);
 	} else if (pfindData->Type == UNIX_BLOCKDEV) {
 		*pobject_type = DT_BLK;
 		tmp_inode->i_mode |= S_IFBLK;
+		tmp_inode->i_rdev = MKDEV(le64_to_cpu(pfindData->DevMajor),
+				le64_to_cpu(pfindData->DevMinor) & MINORMASK);
 	} else if (pfindData->Type == UNIX_FIFO) {
 		*pobject_type = DT_FIFO;
 		tmp_inode->i_mode |= S_IFIFO;
@@ -1227,31 +1484,32 @@ unix_fill_in_inode(struct inode *tmp_ino
 	tmp_inode->i_nlink = le64_to_cpu(pfindData->Nlinks);
 
 	pfindData->NumOfBytes = le64_to_cpu(pfindData->NumOfBytes);
-	pfindData->EndOfFile = le64_to_cpu(pfindData->EndOfFile);
-	tmp_inode->i_size = pfindData->EndOfFile;
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,15))
-	tmp_inode->i_blocks =
-                (tmp_inode->i_blksize - 1 + pfindData->NumOfBytes) >> tmp_inode->i_blkbits;
-#else
-	tmp_inode->i_blocks =
-                (tmp_inode->i_blksize - 1 + pfindData->NumOfBytes) >> 14;
-#endif
+	if(is_size_safe_to_change(cifsInfo)) {
+		/* can not safely change the file size here if the
+		client is writing to it due to potential races */
+		pfindData->EndOfFile = le64_to_cpu(pfindData->EndOfFile);
+		tmp_inode->i_size = pfindData->EndOfFile;
+
+	/* 512 bytes (2**9) is the fake blocksize that must be used */
+	/* for this calculation, not the real blocksize */
+		tmp_inode->i_blocks = (512 - 1 + pfindData->NumOfBytes) >> 9;
+	}
 
 	if (S_ISREG(tmp_inode->i_mode)) {
-		cFYI(1, (" File inode "));
+		cFYI(1, ("File inode"));
 		tmp_inode->i_op = &cifs_file_inode_ops;
 		tmp_inode->i_fop = &cifs_file_ops;
 		tmp_inode->i_data.a_ops = &cifs_addr_ops;
 	} else if (S_ISDIR(tmp_inode->i_mode)) {
-		cFYI(1, (" Directory inode"));
+		cFYI(1, ("Directory inode"));
 		tmp_inode->i_op = &cifs_dir_inode_ops;
 		tmp_inode->i_fop = &cifs_dir_ops;
 	} else if (S_ISLNK(tmp_inode->i_mode)) {
-		cFYI(1, (" Symbolic Link inode "));
+		cFYI(1, ("Symbolic Link inode"));
 		tmp_inode->i_op = &cifs_symlink_inode_ops;
 /* tmp_inode->i_fop = *//* do not need to set to anything */
 	} else {
-		cFYI(1, (" Init special inode "));
+		cFYI(1, ("Special inode")); 
 		init_special_inode(tmp_inode, tmp_inode->i_mode,
 				   kdev_t_to_nr(tmp_inode->i_rdev));
 	}
@@ -1277,25 +1535,28 @@ construct_dentry(struct qstr *qstring, s
 		*ptmp_inode = tmp_dentry->d_inode;
 		/* BB overwrite the old name? i.e. tmp_dentry->d_name and tmp_dentry->d_name.len ?? */
 		if(*ptmp_inode == NULL) {
-	                *ptmp_inode = new_inode(file->f_dentry->d_sb);
+			*ptmp_inode = new_inode(file->f_dentry->d_sb);
+			if(*ptmp_inode == NULL)
+				return;
 			d_instantiate(tmp_dentry, *ptmp_inode);
-                        pCifsI = CIFS_I(*ptmp_inode);
-                        INIT_LIST_HEAD(&pCifsI->openFileList);
-                        /* can not enable caching for this inode
-                        until a file instance is open and we
-                        can check the oplock flag on the open
-                        response */
-                        (*ptmp_inode)->i_blksize = CIFS_MAX_MSGSIZE;
+			insert_inode_hash(*ptmp_inode);
+			pCifsI = CIFS_I(*ptmp_inode);
+			INIT_LIST_HEAD(&pCifsI->openFileList);
+			/* can not enable caching for this inode
+			until a file instance is open and we
+			can check the oplock flag on the open
+			response */
+			(*ptmp_inode)->i_blksize = CIFS_MAX_MSGSIZE;
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,15))
-                        (*ptmp_inode)->i_blkbits = 14;  /* 2**14 = CIFS_MAX_MSGSIZE */
+			(*ptmp_inode)->i_blkbits = 14;  /* 2**14 = CIFS_MAX_MSGSIZE */
 #endif
-                        pCifsI->clientCanCacheRead = FALSE;
-                        pCifsI->clientCanCacheAll = FALSE;
-                        pCifsI->time = 0;
-                        /* do not need to set cifs Attrs since
-                                they are about to be overwritten
-                                in fill_in_inode */
-                        atomic_set(&pCifsI->inUse, 0);
+			pCifsI->clientCanCacheRead = FALSE;
+			pCifsI->clientCanCacheAll = FALSE;
+			pCifsI->time = 0;
+			/* do not need to set cifs Attrs since
+			they are about to be overwritten
+			in fill_in_inode */
+			atomic_set(&pCifsI->inUse, 0);
 		}
 	} else {
 		tmp_dentry = d_alloc(file->f_dentry, qstring);
@@ -1303,10 +1564,13 @@ construct_dentry(struct qstr *qstring, s
 			cERROR(1,("Failed allocating dentry"));
 			return;
 		}
-			
-		*ptmp_inode = new_inode(file->f_dentry->d_sb);
-		if(ptmp_inode) {
+
+		if(ptmp_inode) {			
+			*ptmp_inode = new_inode(file->f_dentry->d_sb);
+			if(*ptmp_inode == NULL)
+				return;
 			pCifsI = CIFS_I(*ptmp_inode);
+			insert_inode_hash(*ptmp_inode);
 			INIT_LIST_HEAD(&pCifsI->openFileList);
 			/* can not enable caching for this inode 
 			until a file instance is open and we
@@ -1325,20 +1589,17 @@ construct_dentry(struct qstr *qstring, s
 			atomic_set(&pCifsI->inUse, 0);
 		}
 		tmp_dentry->d_op = &cifs_dentry_ops;
-		cFYI(0, (" instantiate dentry 0x%p with inode 0x%p ",
-			 tmp_dentry, *ptmp_inode));
 		d_instantiate(tmp_dentry, *ptmp_inode);
 		d_rehash(tmp_dentry);
 	}
 
 	tmp_dentry->d_time = jiffies;
-	cFYI(1, ("i_blksize = %ld", (*ptmp_inode)->i_blksize));
 	*pnew_dentry = tmp_dentry;
 }
 
 static void reset_resume_key(struct file * dir_file, 
-						unsigned char * filename, 
-						unsigned int len) {
+				unsigned char * filename, 
+				unsigned int len,int Unicode,struct nls_table * nls_tab) {
 	struct cifsFileInfo *cifsFile;
 
 	cifsFile = (struct cifsFileInfo *)dir_file->private_data;
@@ -1348,12 +1609,25 @@ static void reset_resume_key(struct file
 		kfree(cifsFile->search_resume_name);
 	}
 
+	if(Unicode) 
+		len *= 2;
 	cifsFile->resume_name_length = len;
+
 	cifsFile->search_resume_name = 
-			kmalloc(cifsFile->resume_name_length, GFP_KERNEL);
-	memcpy(cifsFile->search_resume_name, filename, 
+		kmalloc(cifsFile->resume_name_length, GFP_KERNEL);
+
+	if(cifsFile->search_resume_name == NULL) {
+		cERROR(1,("failed new resume key allocate, length %d",
+				  cifsFile->resume_name_length));
+		return;
+	}
+	if(Unicode)
+		cifs_strtoUCS((wchar_t *) cifsFile->search_resume_name,
+			filename, len, nls_tab);
+	else
+		memcpy(cifsFile->search_resume_name, filename, 
 		   cifsFile->resume_name_length);
-	cFYI(1,("Reset resume key to: %s",filename));
+	cFYI(1,("Reset resume key to: %s with len %d",filename,len));
 	return;
 }
 
@@ -1371,14 +1645,15 @@ cifs_filldir(struct qstr *pqstring, FILE
 	pqstring->len = pfindData->FileNameLength;
 
 	construct_dentry(pqstring, file, &tmp_inode, &tmp_dentry);
-
+	if((tmp_inode == NULL) || (tmp_dentry == NULL)) {
+		return -ENOMEM;
+	}
 	fill_in_inode(tmp_inode, pfindData, &object_type);
 	rc = filldir(direntry, pfindData->FileName, pqstring->len, file->f_pos,
 		tmp_inode->i_ino, object_type);
 	if(rc) {
 		/* due to readdir error we need to recalculate resume 
 		key so next readdir will restart on right entry */
-		reset_resume_key(file, pfindData->FileName, pqstring->len);
 		cFYI(1,("Error %d on filldir of %s",rc ,pfindData->FileName));
 	}
 	dput(tmp_dentry);
@@ -1398,6 +1673,9 @@ cifs_filldir_unix(struct qstr *pqstring,
 	pqstring->len = strnlen(pUnixFindData->FileName, MAX_PATHCONF);
 
 	construct_dentry(pqstring, file, &tmp_inode, &tmp_dentry);
+        if((tmp_inode == NULL) || (tmp_dentry == NULL)) {
+                return -ENOMEM;
+        }
 
 	unix_fill_in_inode(tmp_inode, pUnixFindData, &object_type);
 	rc = filldir(direntry, pUnixFindData->FileName, pqstring->len,
@@ -1405,7 +1683,6 @@ cifs_filldir_unix(struct qstr *pqstring,
 	if(rc) {
 		/* due to readdir error we need to recalculate resume 
 			key so next readdir will restart on right entry */
-		reset_resume_key(file, pUnixFindData->FileName,pqstring->len);
 		cFYI(1,("Error %d on filldir of %s",rc ,pUnixFindData->FileName));
 	}
 	dput(tmp_dentry);
@@ -1445,7 +1722,14 @@ cifs_readdir(struct file *file, void *di
 	data = kmalloc(bufsize, GFP_KERNEL);
 	pfindData = (FILE_DIRECTORY_INFO *) data;
 
+	if(file->f_dentry == NULL) {
+		FreeXid(xid);
+		return -EIO;
+	}
+	down(&file->f_dentry->d_sb->s_vfs_rename_sem);
 	full_path = build_wildcard_path_from_dentry(file->f_dentry);
+	up(&file->f_dentry->d_sb->s_vfs_rename_sem);
+
 
 	cFYI(1, ("Full path: %s start at: %lld ", full_path, file->f_pos));
 
@@ -1495,8 +1779,7 @@ cifs_readdir(struct file *file, void *di
 			searchHandle = findParms.SearchHandle;
 			if(file->private_data == NULL)
 				file->private_data =
-				    kmalloc(sizeof(struct cifsFileInfo),
-					  GFP_KERNEL);
+					kmalloc(sizeof(struct cifsFileInfo),GFP_KERNEL);
 			if (file->private_data) {
 				memset(file->private_data, 0,
 				       sizeof (struct cifsFileInfo));
@@ -1596,6 +1879,8 @@ cifs_readdir(struct file *file, void *di
 							/* do not end search if
 								kernel not ready to take
 								remaining entries yet */
+							reset_resume_key(file, pfindData->FileName,qstring.len,
+								Unicode, cifs_sb->local_nls);
 							findParms.EndofSearch = 0;
 							break;
 						}
@@ -1634,6 +1919,8 @@ cifs_readdir(struct file *file, void *di
 								kernel not ready to take
 								remaining entries yet */
 							findParms.EndofSearch = 0;
+							reset_resume_key(file, pfindDataUnix->FileName,
+								qstring.len,Unicode,cifs_sb->local_nls);
 							break;
 						}
 						file->f_pos++;
@@ -1672,7 +1959,6 @@ cifs_readdir(struct file *file, void *di
 				break;
 			}
 			searchHandle = cifsFile->netfid;
-			cFYI(1,("FindNext resume name: %s len: %d",cifsFile->search_resume_name,cifsFile->resume_name_length));
 			rc = CIFSFindNext(xid, pTcon, pfindData,
 				&findNextParms, searchHandle, 
 				cifsFile->search_resume_name,
@@ -1747,10 +2033,10 @@ cifs_readdir(struct file *file, void *di
 					cifsFile->search_resume_name = 
 						kmalloc(cifsFile->resume_name_length, GFP_KERNEL);
 					cFYI(1,("fnext last file: %s with name %d bytes long",
-						lastFindData->FileName,
+						pfindDataUnix->FileName,
 						cifsFile->resume_name_length));
 					memcpy(cifsFile->search_resume_name,
-						lastFindData->FileName, 
+						pfindDataUnix->FileName, 
 						cifsFile->resume_name_length);
 				}
 
@@ -1784,6 +2070,8 @@ cifs_readdir(struct file *file, void *di
 								kernel not ready to take
 								remaining entries yet */
 								findNextParms.EndofSearch = 0;
+								reset_resume_key(file, pfindData->FileName,qstring.len,
+									Unicode,cifs_sb->local_nls);
 								break;
 							}
 							file->f_pos++;
@@ -1824,6 +2112,8 @@ cifs_readdir(struct file *file, void *di
 								kernel not ready to take
 								remaining entries yet */
 								findNextParms.EndofSearch = 0;
+								reset_resume_key(file, pfindDataUnix->FileName,qstring.len,
+									Unicode,cifs_sb->local_nls);
 								break;
 							}
 							file->f_pos++;
@@ -1849,50 +2139,47 @@ cifs_readdir(struct file *file, void *di
 
 	return rc;
 }
-
-static int cifs_prepare_write(struct file *file, struct page *page,
-                        unsigned from, unsigned to)
+int cifs_prepare_write(struct file *file, struct page *page,
+			unsigned from, unsigned to)
 {
-        if (!Page_Uptodate(page)) {
-                if (to - from != PAGE_CACHE_SIZE) {
-                        void *kaddr = kmap_atomic(page, KM_USER0);
-                        memset(kaddr, 0, from);
-                        memset(kaddr + to, 0, PAGE_CACHE_SIZE - to);
-                        flush_dcache_page(page);
-                        kunmap_atomic(kaddr, KM_USER0);
-                }
-                SetPageUptodate(page);
-        }
-        return 0;
+	int rc = 0;
+        loff_t offset = (loff_t)page->index << PAGE_CACHE_SHIFT;
+	cFYI(1,("prepare write for page %p from %d to %d",page,from,to));
+	if (!Page_Uptodate(page)) {
+	/*	if (to - from != PAGE_CACHE_SIZE) {
+			void *kaddr = kmap_atomic(page, KM_USER0);
+			memset(kaddr, 0, from);
+			memset(kaddr + to, 0, PAGE_CACHE_SIZE - to);
+			flush_dcache_page(page);
+			kunmap_atomic(kaddr, KM_USER0);
+		} */
+		/* If we are writing a full page it will be up to date,
+		no need to read from the server */
+		if((to==PAGE_CACHE_SIZE) && (from == 0))
+			SetPageUptodate(page);
+
+		/* might as well read a page, it is fast enough */
+		if((file->f_flags & O_ACCMODE) != O_WRONLY) {
+			rc = cifs_readpage_worker(file,page,&offset);
+		} else {
+		/* should we try using another
+		file handle if there is one - how would we lock it
+		to prevent close of that handle racing with this read? */
+		/* In any case this will be written out by commit_write */
+		}
+	}
+
+	/* BB should we pass any errors back? e.g. if we do not have read access to the file */
+	return 0;
 }
 
+
 struct address_space_operations cifs_addr_ops = {
 	.readpage = cifs_readpage,
 /*	.readpages = cifs_readpages, */
 	.writepage = cifs_writepage,
-	.prepare_write = cifs_prepare_write,
-	.commit_write = cifs_commit_write,
-	.sync_page = cifs_sync_page,
-	/*.direct_IO = */
-};
-
-struct address_space_operations cifs_addr_ops_writethrough = {
-	.readpage = cifs_readpage,
-/*	.readpages = cifs_readpages,*/
-	.writepage = cifs_writepage,
-	.prepare_write = cifs_prepare_write,
+	.prepare_write = cifs_prepare_write, 
 	.commit_write = cifs_commit_write,
 	.sync_page = cifs_sync_page,
-	/*.direct_IO = 	 */
 	/*.direct_IO = */
 };
-
-struct address_space_operations cifs_addr_ops_nocache = {
-	.readpage = cifs_readpage,
-/*	.readpages = cifs_readpages,*/
-	.writepage = cifs_writepage,
-	.prepare_write = cifs_prepare_write,
-	.commit_write = cifs_commit_write,
-	.sync_page = cifs_sync_page,
-};
-
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/cifs/inode.c linux-2.4.20-wolk4.16-fullkernel/fs/cifs/inode.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/cifs/inode.c	2004-06-29 11:24:22.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/cifs/inode.c	2004-09-05 15:47:54.000000000 +0200
@@ -30,6 +30,8 @@
 #include "cifs_debug.h"
 #include "cifs_fs_sb.h"
 
+extern int is_size_safe_to_change(struct cifsInodeInfo *);
+
 struct inode * get_cifs_inode(struct super_block * sb)
 {
 	struct inode * newinode;
@@ -47,6 +49,7 @@ struct inode * get_cifs_inode(struct sup
 #endif
 		atomic_set(&cifsInfo->inUse, 0);
 		cifsInfo->time = 0;
+		insert_inode_hash(newinode);
 	}
 	return newinode;
 
@@ -55,9 +58,8 @@ struct inode * get_cifs_inode(struct sup
 int
 cifs_get_inode_info_unix(struct inode **pinode,
 			 const unsigned char *search_path,
-			 struct super_block *sb)
+			 struct super_block *sb,int xid)
 {
-	int xid;
 	int rc = 0;
 	FILE_UNIX_BASIC_INFO findData;
 	struct cifsTconInfo *pTcon;
@@ -65,16 +67,12 @@ cifs_get_inode_info_unix(struct inode **
 	struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
 	char *tmp_path;
 
-/* BB add caching check so we do not go to server to overwrite inode info to cached file
-	where the local file sizes are correct and the server info is stale  BB */
-
-	xid = GetXid();
-
 	pTcon = cifs_sb->tcon;
 	cFYI(1, (" Getting info on %s ", search_path));
 	/* we could have done a find first instead but this returns more info */
 	rc = CIFSSMBUnixQPathInfo(xid, pTcon, search_path, &findData,
 				  cifs_sb->local_nls);
+	/* dump_mem("\nUnixQPathInfo return data", &findData, sizeof(findData)); */
 	if (rc) {
 		if (rc == -EREMOTE) {
 			tmp_path =
@@ -84,7 +82,6 @@ cifs_get_inode_info_unix(struct inode **
 				    strnlen(search_path, MAX_PATHCONF) + 1,
 				    GFP_KERNEL);
 			if (tmp_path == NULL) {
-				FreeXid(xid);
 				return -ENOMEM;
 			}
         /* have to skip first of the double backslash of UNC name */
@@ -97,7 +94,6 @@ cifs_get_inode_info_unix(struct inode **
 
 			/* BB fix up inode etc. */
 		} else if (rc) {
-			FreeXid(xid);
 			return rc;
 		}
 
@@ -108,14 +104,17 @@ cifs_get_inode_info_unix(struct inode **
 		if (*pinode == NULL) {
 			*pinode = get_cifs_inode(sb);
 		}
+		if(*pinode == NULL) {
+			return -ENOMEM;
+		}
+			
 		inode = *pinode;
-
 		cifsInfo = CIFS_I(inode);
 
 		cFYI(1, (" Old time %ld ", cifsInfo->time));
 		cifsInfo->time = jiffies;
 		cFYI(1, (" New time %ld ", cifsInfo->time));
-		atomic_inc(&cifsInfo->inUse);	/* inc on every refresh of inode */
+		atomic_set(&cifsInfo->inUse,1);	/* ok to set on every refresh of inode */
 
 		inode->i_atime =
 		    cifs_NTtimeToUnix(le64_to_cpu(findData.LastAccessTime));
@@ -134,8 +133,12 @@ cifs_get_inode_info_unix(struct inode **
 			inode->i_mode |= S_IFDIR;
 		} else if (findData.Type == UNIX_CHARDEV) {
 			inode->i_mode |= S_IFCHR;
+			inode->i_rdev = MKDEV(le64_to_cpu(findData.DevMajor),
+				le64_to_cpu(findData.DevMinor) & MINORMASK);
 		} else if (findData.Type == UNIX_BLOCKDEV) {
 			inode->i_mode |= S_IFBLK;
+			inode->i_rdev = MKDEV(le64_to_cpu(findData.DevMajor),
+				le64_to_cpu(findData.DevMinor) & MINORMASK);
 		} else if (findData.Type == UNIX_FIFO) {
 			inode->i_mode |= S_IFIFO;
 		} else if (findData.Type == UNIX_SOCKET) {
@@ -146,18 +149,28 @@ cifs_get_inode_info_unix(struct inode **
 		inode->i_nlink = le64_to_cpu(findData.Nlinks);
 		findData.NumOfBytes = le64_to_cpu(findData.NumOfBytes);
 		findData.EndOfFile = le64_to_cpu(findData.EndOfFile);
-		inode->i_size = findData.EndOfFile;
+
+		if(is_size_safe_to_change(cifsInfo)) {
+		/* can not safely change the file size here if the
+		   client is writing to it due to potential races */
+			inode->i_size = findData.EndOfFile;
 /* blksize needs to be multiple of two. So safer to default to blksize
 	and blkbits set in superblock so 2**blkbits and blksize will match */
 /*		inode->i_blksize =
 		    (pTcon->ses->server->maxBuf - MAX_CIFS_HDR_SIZE) & 0xFFFFFE00;*/
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,15))
-		inode->i_blocks = 
-	                (inode->i_blksize - 1 + findData.NumOfBytes) >> inode->i_blkbits;
-#else
-		inode->i_blocks = 
-	                (inode->i_blksize - 1 + findData.NumOfBytes) >> 14;
-#endif
+
+		/* This seems incredibly stupid but it turns out that
+		i_blocks is not related to (i_size / i_blksize), instead a
+		size of 512 is required to be used for calculating num blocks */
+		 
+
+/*		inode->i_blocks = 
+	                (inode->i_blksize - 1 + findData.NumOfBytes) >> inode->i_blkbits;*/
+
+		/* 512 bytes (2**9) is the fake blocksize that must be used */
+		/* for this calculation */
+			inode->i_blocks = (512 - 1 + findData.NumOfBytes) >> 9;
+		}
 
 		if (findData.NumOfBytes < findData.EndOfFile)
 			cFYI(1, ("Server inconsistency Error: it says allocation size less than end of file "));
@@ -183,15 +196,13 @@ cifs_get_inode_info_unix(struct inode **
 					   kdev_t_to_nr(inode->i_rdev));
 		}
 	}
-	FreeXid(xid);
 	return rc;
 }
 
 int
 cifs_get_inode_info(struct inode **pinode, const unsigned char *search_path, 
-		FILE_ALL_INFO * pfindData, struct super_block *sb)
+		FILE_ALL_INFO * pfindData, struct super_block *sb, int xid)
 {
-	int xid;
 	int rc = 0;
 	struct cifsTconInfo *pTcon;
 	struct inode *inode;
@@ -199,15 +210,12 @@ cifs_get_inode_info(struct inode **pinod
 	char *tmp_path;
 	char *buf = NULL;
 
-	xid = GetXid();
-
 	pTcon = cifs_sb->tcon;
 	cFYI(1,("Getting info on %s ", search_path));
 
 	if((pfindData == NULL) && (*pinode != NULL)) {
 		if(CIFS_I(*pinode)->clientCanCacheRead) {
 			cFYI(1,("No need to revalidate inode sizes on cached file "));
-			FreeXid(xid);
 			return rc;
 		}
 	}
@@ -220,6 +228,7 @@ cifs_get_inode_info(struct inode **pinod
 		rc = CIFSSMBQPathInfo(xid, pTcon, search_path, pfindData,
 			      cifs_sb->local_nls);
 	}
+	/* dump_mem("\nQPathInfo return data",&findData, sizeof(findData)); */
 	if (rc) {
 		if (rc == -EREMOTE) {
 			tmp_path =
@@ -229,10 +238,9 @@ cifs_get_inode_info(struct inode **pinod
 				    strnlen(search_path, MAX_PATHCONF) + 1,
 				    GFP_KERNEL);
 			if (tmp_path == NULL) {
-			    if(buf)
-				kfree(buf);
-			    FreeXid(xid);
-			    return -ENOMEM;
+				if(buf)
+					kfree(buf);
+				return -ENOMEM;
 			}
 
 			strncpy(tmp_path, pTcon->treeName, MAX_TREE_SIZE);
@@ -243,10 +251,9 @@ cifs_get_inode_info(struct inode **pinod
 			kfree(tmp_path);
 			/* BB fix up inode etc. */
 		} else if (rc) {
-		    if(buf)
-			kfree(buf);
-		    FreeXid(xid);
-		    return rc;
+			if(buf)
+				kfree(buf);
+			return rc;
 		}
 	} else {
 		struct cifsInodeInfo *cifsInfo;
@@ -255,7 +262,8 @@ cifs_get_inode_info(struct inode **pinod
 		if (*pinode == NULL) {
 			*pinode = get_cifs_inode(sb);
 		}
-
+		if(*pinode == NULL)
+			return -ENOMEM;
 		inode = *pinode;
 		cifsInfo = CIFS_I(inode);
 		pfindData->Attributes = le32_to_cpu(pfindData->Attributes);
@@ -263,7 +271,6 @@ cifs_get_inode_info(struct inode **pinod
 		cFYI(1, (" Old time %ld ", cifsInfo->time));
 		cifsInfo->time = jiffies;
 		cFYI(1, (" New time %ld ", cifsInfo->time));
-		atomic_inc(&cifsInfo->inUse);	/* inc on every refresh of inode */
 
 /* blksize needs to be multiple of two. So safer to default to blksize
         and blkbits set in superblock so 2**blkbits and blksize will match */
@@ -281,7 +288,9 @@ cifs_get_inode_info(struct inode **pinod
 		     (" Attributes came in as 0x%x ", pfindData->Attributes));
 
 		/* set default mode. will override for dirs below */
-		inode->i_mode = cifs_sb->mnt_file_mode;
+		if(atomic_read(&cifsInfo->inUse) == 0)
+			/* new inode, can safely set these fields */
+			inode->i_mode = cifs_sb->mnt_file_mode;
 
 		if (pfindData->Attributes & ATTR_REPARSE) {
 	/* Can IFLNK be set as it basically is on windows with IFREG or IFDIR? */
@@ -297,15 +306,17 @@ cifs_get_inode_info(struct inode **pinod
 				inode->i_mode &= ~(S_IWUGO);
    /* BB add code here - validate if device or weird share or device type? */
 		}
-		inode->i_size = le64_to_cpu(pfindData->EndOfFile);
-		pfindData->AllocationSize = le64_to_cpu(pfindData->AllocationSize);
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,15))
-		inode->i_blocks =
-	                (inode->i_blksize - 1 + pfindData->AllocationSize) >> inode->i_blkbits;
-#else
-		inode->i_blocks =
-	                (inode->i_blksize - 1 + pfindData->AllocationSize) >> 14;
-#endif
+		if(is_size_safe_to_change(cifsInfo)) {
+		/* can not safely change the file size here if the
+		client is writing to it due to potential races */
+			inode->i_size = le64_to_cpu(pfindData->EndOfFile);
+
+		/* 512 bytes (2**9) is the fake blocksize that must be used */
+		/* for this calculation */
+			inode->i_blocks = (512 - 1 + pfindData->AllocationSize)
+				 >> 9;
+		}
+                pfindData->AllocationSize = le64_to_cpu(pfindData->AllocationSize);
 
 		cFYI(1,
 		     (" Size %ld and blocks %ld ",
@@ -314,8 +325,13 @@ cifs_get_inode_info(struct inode **pinod
 
 		/* BB fill in uid and gid here? with help from winbind? 
 			or retrieve from NTFS stream extended attribute */
-		inode->i_uid = cifs_sb->mnt_uid;
-		inode->i_gid = cifs_sb->mnt_gid;
+		if(atomic_read(&cifsInfo->inUse) == 0) {
+			inode->i_uid = cifs_sb->mnt_uid;
+			inode->i_gid = cifs_sb->mnt_gid;
+			/* set so we do not keep refreshing these fields with
+			bad data after user has changed them in memory */
+			atomic_set(&cifsInfo->inUse,1);
+		}
 		
 		if (S_ISREG(inode->i_mode)) {
 			cFYI(1, (" File inode "));
@@ -336,22 +352,34 @@ cifs_get_inode_info(struct inode **pinod
 	}
 	if(buf)
 	    kfree(buf);
-	FreeXid(xid);
 	return rc;
 }
 
 void
 cifs_read_inode(struct inode *inode)
 {				/* gets root inode */
-
+	int xid;
 	struct cifs_sb_info *cifs_sb;
-
+	struct cifsInodeInfo *cifs_inode;
+	
 	cifs_sb = CIFS_SB(inode->i_sb);
+	xid = GetXid();
+	
+	cifs_inode = CIFS_I(inode);
+	cifs_inode->cifsAttrs = ATTR_DIRECTORY; 
+	atomic_set(&cifs_inode->inUse, 0);
+	cifs_inode->time = 0;
+	inode->i_blksize = CIFS_MAX_MSGSIZE;
+	inode->i_blkbits = 14;  /* 2**14 = CIFS_MAX_MSGSIZE */
+
+	INIT_LIST_HEAD(&cifs_inode->openFileList);
 
 	if (cifs_sb->tcon->ses->capabilities & CAP_UNIX)
-		cifs_get_inode_info_unix(&inode, "", inode->i_sb);
+		cifs_get_inode_info_unix(&inode, "", inode->i_sb,xid);
 	else
-		cifs_get_inode_info(&inode, "", NULL, inode->i_sb);
+		cifs_get_inode_info(&inode, "", NULL, inode->i_sb,xid);
+	/* can not call macro FreeXid here since in a void func */
+	_FreeXid(xid);
 }
 
 int
@@ -372,12 +400,21 @@ cifs_unlink(struct inode *inode, struct 
 	cifs_sb = CIFS_SB(inode->i_sb);
 	pTcon = cifs_sb->tcon;
 
+/* Unlink can be called from rename so we can not grab
+	the sem here since we deadlock otherwise */
+/*	down(&direntry->d_sb->s_vfs_rename_sem);*/
 	full_path = build_path_from_dentry(direntry);
-
+/*	up(&direntry->d_sb->s_vfs_rename_sem);*/
+	if(full_path == NULL) {
+		FreeXid(xid);
+		return -ENOMEM;
+	}
 	rc = CIFSSMBDelFile(xid, pTcon, full_path, cifs_sb->local_nls);
 
 	if (!rc) {
 		direntry->d_inode->i_nlink--;
+	} else if (rc == -ENOENT) {
+		d_drop(direntry);
 	} else if (rc == -ETXTBSY) {
 		int oplock = FALSE;
 		__u16 netfid;
@@ -411,8 +448,8 @@ cifs_unlink(struct inode *inode, struct 
 				__u16 netfid;
 
 				rc = CIFSSMBOpen(xid, pTcon, full_path, FILE_OPEN, DELETE,
-                                	CREATE_NOT_DIR | CREATE_DELETE_ON_CLOSE,
-	                                &netfid, &oplock, NULL, cifs_sb->local_nls);
+						CREATE_NOT_DIR | CREATE_DELETE_ON_CLOSE,
+						&netfid, &oplock, NULL, cifs_sb->local_nls);
 				if(rc==0) {
 					CIFSSMBRenameOpenFile(xid,pTcon,netfid,NULL,cifs_sb->local_nls);
 					CIFSSMBClose(xid, pTcon, netfid);
@@ -452,7 +489,13 @@ cifs_mkdir(struct inode *inode, struct d
 	cifs_sb = CIFS_SB(inode->i_sb);
 	pTcon = cifs_sb->tcon;
 
+	down(&inode->i_sb->s_vfs_rename_sem);
 	full_path = build_path_from_dentry(direntry);
+	up(&inode->i_sb->s_vfs_rename_sem);
+	if(full_path == NULL) {
+		FreeXid(xid);
+		return -ENOMEM;
+	}
 	/* BB add setting the equivalent of mode via CreateX w/ACLs */
 	rc = CIFSSMBMkDir(xid, pTcon, full_path, cifs_sb->local_nls);
 	if (rc) {
@@ -462,10 +505,10 @@ cifs_mkdir(struct inode *inode, struct d
 		inode->i_nlink++;
 		if (pTcon->ses->capabilities & CAP_UNIX)
 			rc = cifs_get_inode_info_unix(&newinode, full_path,
-						      inode->i_sb);
+						      inode->i_sb,xid);
 		else
 			rc = cifs_get_inode_info(&newinode, full_path,NULL,
-						 inode->i_sb);
+						 inode->i_sb,xid);
 
 		direntry->d_op = &cifs_dentry_ops;
 		d_instantiate(direntry, newinode);
@@ -505,7 +548,13 @@ cifs_rmdir(struct inode *inode, struct d
 	cifs_sb = CIFS_SB(inode->i_sb);
 	pTcon = cifs_sb->tcon;
 
+	down(&inode->i_sb->s_vfs_rename_sem);
 	full_path = build_path_from_dentry(direntry);
+	up(&inode->i_sb->s_vfs_rename_sem);
+	if(full_path == NULL) {
+		FreeXid(xid);
+		return -ENOMEM;
+	}
 
 	rc = CIFSSMBRmDir(xid, pTcon, full_path, cifs_sb->local_nls);
 
@@ -550,30 +599,67 @@ cifs_rename(struct inode *source_inode, 
                      different share. Might eventually add support for this */
 	}
 
+	/* we already  have the rename sem so we do not need
+	to grab it again here to protect the path integrity */
 	fromName = build_path_from_dentry(source_direntry);
 	toName = build_path_from_dentry(target_direntry);
+	if((fromName == NULL) || (toName == NULL)) {
+		rc = -ENOMEM;
+		goto cifs_rename_exit;
+	}
 
 	rc = CIFSSMBRename(xid, pTcon, fromName, toName,
 			   cifs_sb_source->local_nls);
 	if(rc == -EEXIST) {
-		cifs_unlink(target_inode, target_direntry);
-		rc = CIFSSMBRename(xid, pTcon, fromName, toName,
-				   cifs_sb_source->local_nls);
+		/* check if they are the same file 
+		because rename of hardlinked files is a noop */
+		FILE_UNIX_BASIC_INFO * info_buf_source;
+		FILE_UNIX_BASIC_INFO * info_buf_target;
+
+		info_buf_source = 
+			kmalloc(2 * sizeof(FILE_UNIX_BASIC_INFO),GFP_KERNEL);
+		if(info_buf_source != NULL) {
+			info_buf_target = info_buf_source+1;
+			rc = CIFSSMBUnixQPathInfo(xid, pTcon, fromName, 
+				info_buf_source, cifs_sb_source->local_nls);
+			if(rc == 0) {
+				rc = CIFSSMBUnixQPathInfo(xid,pTcon,toName,
+						info_buf_target,
+						cifs_sb_target->local_nls);
+			}
+			if((rc == 0) && 
+				(info_buf_source->UniqueId == 
+				 info_buf_target->UniqueId)) {
+			/* do not rename since the files are hardlinked 
+			   which is a noop */
+			} else {
+			/* we either can not tell the files are hardlinked
+			(as with Windows servers) or files are not hardlinked 
+			so delete the target manually before renaming to
+			follow POSIX rather than Windows semantics */
+				cifs_unlink(target_inode, target_direntry);
+				rc = CIFSSMBRename(xid, pTcon, fromName, toName,
+					cifs_sb_source->local_nls);
+			}
+			kfree(info_buf_source);
+		} /* if we can not get memory just leave rc as EEXIST */
 	}
 
 	if((rc == -EIO)||(rc == -EEXIST)) {
-                int oplock = FALSE;
-                __u16 netfid;
+		int oplock = FALSE;
+		__u16 netfid;
 
-                rc = CIFSSMBOpen(xid, pTcon, fromName, FILE_OPEN, GENERIC_READ,
-                                CREATE_NOT_DIR,
-                                &netfid, &oplock, NULL, cifs_sb_source->local_nls);
-                if(rc==0) {
-                        CIFSSMBRenameOpenFile(xid,pTcon,netfid,
-                                toName, cifs_sb_source->local_nls);
-                        CIFSSMBClose(xid, pTcon, netfid);
-                }
+		rc = CIFSSMBOpen(xid, pTcon, fromName, FILE_OPEN, GENERIC_READ,
+					CREATE_NOT_DIR,
+					&netfid, &oplock, NULL, cifs_sb_source->local_nls);
+		if(rc==0) {
+			CIFSSMBRenameOpenFile(xid,pTcon,netfid,
+					toName, cifs_sb_source->local_nls);
+			CIFSSMBClose(xid, pTcon, netfid);
+		}
 	}
+
+cifs_rename_exit:
 	if (fromName)
 		kfree(fromName);
 	if (toName)
@@ -591,25 +677,44 @@ cifs_revalidate(struct dentry *direntry)
 	char *full_path;
 	struct cifs_sb_info *cifs_sb;
 	struct cifsInodeInfo *cifsInode;
+	loff_t local_size;
+	time_t local_mtime;
+	int invalidate_inode = FALSE;
+
+	if(direntry->d_inode == NULL)
+		return -ENOENT;
+
+	cifsInode = CIFS_I(direntry->d_inode);
+
+	if(cifsInode == NULL)
+		return -ENOENT;
+
+	/* no sense revalidating inode info on file that no one can write */
+	if(CIFS_I(direntry->d_inode)->clientCanCacheRead)
+		return rc;
 
 	xid = GetXid();
 
 	cifs_sb = CIFS_SB(direntry->d_sb);
 
+	/* can not safely grab the rename sem here if
+	rename calls revalidate since that would deadlock */
 	full_path = build_path_from_dentry(direntry);
+	if(full_path == NULL) {
+		FreeXid(xid);
+		return -ENOMEM;
+	}
 	cFYI(1,
-	     ("Revalidate full path: %s for inode 0x%p with count %d dentry: 0x%p d_time %ld at time %ld ",
+	     ("Revalidate: %s inode 0x%p count %d dentry: 0x%p d_time %ld jiffies %ld",
 	      full_path, direntry->d_inode,
 	      direntry->d_inode->i_count.counter, direntry,
 	      direntry->d_time, jiffies));
 
-	cifsInode = CIFS_I(direntry->d_inode);
-	/* BB add check - do not need to revalidate oplocked files */
-
-	if (time_before(jiffies, cifsInode->time + HZ)) {
+	if (cifsInode->time == 0){
+		/* was set to zero previously to force revalidate */
+	} else if (time_before(jiffies, cifsInode->time + HZ) && lookupCacheEnabled) {
 	    if((S_ISREG(direntry->d_inode->i_mode) == 0) || 
-			(direntry->d_inode->i_nlink == 1) || 
-			(lookupCacheEnabled == 0)) {
+			(direntry->d_inode->i_nlink == 1)) {  
 			if (full_path)
 				kfree(full_path);
 			FreeXid(xid);
@@ -618,10 +723,14 @@ cifs_revalidate(struct dentry *direntry)
 			cFYI(1,("Have to revalidate file due to hardlinks"));
 		}            
 	}
+	
+	/* save mtime and size */
+	local_mtime = direntry->d_inode->i_mtime;
+	local_size  = direntry->d_inode->i_size;
 
 	if (cifs_sb->tcon->ses->capabilities & CAP_UNIX) {
 		rc = cifs_get_inode_info_unix(&direntry->d_inode, full_path,
-					 direntry->d_sb);
+					 direntry->d_sb,xid);
 		if(rc) {
 			cFYI(1,("error on getting revalidate info %d",rc));
 /*			if(rc != -ENOENT)
@@ -629,7 +738,7 @@ cifs_revalidate(struct dentry *direntry)
 		}
 	} else {
 		rc = cifs_get_inode_info(&direntry->d_inode, full_path, NULL,
-				    direntry->d_sb);
+				    direntry->d_sb,xid);
 		if(rc) {
 			cFYI(1,("error on getting revalidate info %d",rc));
 /*			if(rc != -ENOENT)
@@ -638,8 +747,44 @@ cifs_revalidate(struct dentry *direntry)
 	}
 	/* should we remap certain errors, access denied?, to zero */
 
-	/* BB if not oplocked, invalidate inode pages if mtime has changed */
+	/* if not oplocked, we invalidate inode pages if mtime 
+	   or file size had changed on server */
+
+	if((local_mtime == direntry->d_inode->i_mtime) && 
+		(local_size == direntry->d_inode->i_size)) {
+		cFYI(1,("cifs_revalidate - inode unchanged"));
+	} else {
+		/* file may have changed on server */
+		if(cifsInode->clientCanCacheRead) {
+			/* no need to invalidate inode pages since we were
+			   the only ones who could have modified the file and
+			   the server copy is staler than ours */
+		} else {
+			invalidate_inode = TRUE;
+		}
+	}
 
+	/* can not grab this sem since kernel filesys locking
+		documentation indicates i_sem may be taken by the kernel 
+		on lookup and rename which could deadlock if we grab
+		the i_sem here as well */
+/*	down(&direntry->d_inode->i_sem);*/
+	/* need to write out dirty pages here  */
+	if(direntry->d_inode->i_mapping) {
+		/* do we need to lock inode until after invalidate completes below? */
+		filemap_fdatasync(direntry->d_inode->i_mapping);
+	}
+	if(invalidate_inode) {
+		filemap_fdatawait(direntry->d_inode->i_mapping);
+		/* may eventually have to do this for open files too */
+		if(list_empty(&(cifsInode->openFileList))) {
+			/* Has changed on server - flush read ahead pages */
+			cFYI(1,("Invalidating read ahead data on closed file"));
+			invalidate_inode_pages(direntry->d_inode);
+		}
+	}
+/*	up(&direntry->d_inode->i_sem);*/
+	
 	if (full_path)
 		kfree(full_path);
 	FreeXid(xid);
@@ -733,30 +878,25 @@ cifs_truncate_file(struct inode *inode)
 	return;
 }
 
-static int cifs_trunc_page(struct address_space *mapping, loff_t from)
+static int cifs_truncate_page(struct address_space *mapping, loff_t from)
 {
-        unsigned long index = from >> PAGE_CACHE_SHIFT;
-        unsigned offset = from & (PAGE_CACHE_SIZE-1);
-        struct page *page;
-        char *kaddr;
-        int rc = 0;
-
-        page = grab_cache_page(mapping, index);
-        if (!page)
-                return -ENOMEM;
-
-        kaddr = kmap_atomic(page, KM_USER0);
-        memset(kaddr + offset, 0, PAGE_CACHE_SIZE - offset);
-        flush_dcache_page(page);
-        kunmap_atomic(kaddr, KM_USER0);
-        set_page_dirty(page);
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,20))
-        unlock_page(page);
-#else
-	UnlockPage(page);
-#endif
-        page_cache_release(page);
-        return rc;
+	unsigned long index = from >> PAGE_CACHE_SHIFT;
+	unsigned offset = from & (PAGE_CACHE_SIZE-1);
+	struct page *page;
+	char *kaddr;
+	int rc = 0;
+
+	page = grab_cache_page(mapping, index);
+	if (!page)
+		return -ENOMEM;
+
+	kaddr = kmap_atomic(page, KM_USER0);
+	memset(kaddr + offset, 0, PAGE_CACHE_SIZE - offset);
+	flush_dcache_page(page);
+	kunmap_atomic(kaddr, KM_USER0);
+	unlock_page(page);
+	page_cache_release(page);
+	return rc;
 }
 
 int
@@ -785,37 +925,44 @@ cifs_setattr(struct dentry *direntry, st
 	cifs_sb = CIFS_SB(direntry->d_inode->i_sb);
 	pTcon = cifs_sb->tcon;
 
+	down(&direntry->d_sb->s_vfs_rename_sem);
 	full_path = build_path_from_dentry(direntry);
+	up(&direntry->d_sb->s_vfs_rename_sem);
+	if(full_path == NULL) {
+		FreeXid(xid);
+		return -ENOMEM;
+	}
 	cifsInode = CIFS_I(direntry->d_inode);
 
 	/* BB check if we need to refresh inode from server now ? BB */
 
-	cFYI(1, (" Changing attributes 0x%x", attrs->ia_valid));
+	/* need to flush data before changing file size on server */
+	filemap_fdatasync(direntry->d_inode->i_mapping);
 
 	if (attrs->ia_valid & ATTR_SIZE) {
-		read_lock(&GlobalSMBSeslock);
+		read_lock(&GlobalSMBSeslock); 
 		/* To avoid spurious oplock breaks from server, in the case
 			of inodes that we already have open, avoid doing path
 			based setting of file size if we can do it by handle.
 			This keeps our caching token (oplock) and avoids
 			timeouts when the local oplock break takes longer to flush
-			writebehind data than the SMB timeout for the SetPathInfo
+			writebehind data than the SMB timeout for the SetPathInfo 
 			request would allow */
-		list_for_each(tmp, &cifsInode->openFileList) {
+		list_for_each(tmp, &cifsInode->openFileList) {            
 			open_file = list_entry(tmp,struct cifsFileInfo, flist);
 			/* We check if file is open for writing first */
 			if((open_file->pfile) &&
-			   ((open_file->pfile->f_flags & O_RDWR) ||
-			    (open_file->pfile->f_flags & O_WRONLY))) {
+				((open_file->pfile->f_flags & O_RDWR) || 
+				 (open_file->pfile->f_flags & O_WRONLY))) {
 				if(open_file->invalidHandle == FALSE) {
-					/* we found a valid, writeable network file
+					/* we found a valid, writeable network file 
 					handle to use to try to set the file size */
 					__u16 nfid = open_file->netfid;
 					__u32 npid = open_file->pid;
 					read_unlock(&GlobalSMBSeslock);
 					found = TRUE;
 					rc = CIFSSMBSetFileSize(xid, pTcon, attrs->ia_size,
-						nfid,npid,FALSE);
+					   nfid,npid,FALSE);
 					cFYI(1,("SetFileSize by handle (setattrs) rc = %d",rc));
 				/* Do not need reopen and retry on EAGAIN since we will
 					retry by pathname below */
@@ -825,25 +972,26 @@ cifs_setattr(struct dentry *direntry, st
 				}
 			}
 		}
-		if(found == FALSE)
+		if(found == FALSE) {
 			read_unlock(&GlobalSMBSeslock);
+		}
+
 
 		if(rc != 0) {
 			/* Set file size by pathname rather than by handle either
 			because no valid, writeable file handle for it was found or
 			because there was an error setting it by handle */
 			rc = CIFSSMBSetEOF(xid, pTcon, full_path, attrs->ia_size,FALSE,
-				cifs_sb->local_nls);
+				   cifs_sb->local_nls);
 			cFYI(1,(" SetEOF by path (setattrs) rc = %d",rc));
 		}
-
-        /*  For Allocation Size - do not need to call the following
-            it did not hurt if it fails but why bother */
-	/*	CIFSSMBSetEOF(xid, pTcon, full_path, attrs->ia_size, TRUE, cifs_sb->local_nls);*/
+        
+	/*  Server is ok setting allocation size implicitly - no need to call: */
+	/*CIFSSMBSetEOF(xid, pTcon, full_path, attrs->ia_size, TRUE, cifs_sb->local_nls);*/
 
 		if (rc == 0) {
 			rc = vmtruncate(direntry->d_inode, attrs->ia_size);
-			cifs_trunc_page(direntry->d_inode->i_mapping, direntry->d_inode->i_size);
+			cifs_truncate_page(direntry->d_inode->i_mapping, direntry->d_inode->i_size);
 		}
 	}
 	if (attrs->ia_valid & ATTR_UID) {
@@ -912,11 +1060,10 @@ cifs_setattr(struct dentry *direntry, st
 		rc = CIFSSMBSetTimes(xid, pTcon, full_path, &time_buf,
 				cifs_sb->local_nls);
 	}
-	
-	/* do not  need local check to inode_check_ok since the server does that */
-	inode_setattr(direntry->d_inode, attrs);
-
 
+	/* do not  need local check to inode_check_ok since the server does that */
+	if (!rc)
+		rc = inode_setattr(direntry->d_inode, attrs);
 	if (full_path)
 		kfree(full_path);
 	FreeXid(xid);
@@ -926,8 +1073,7 @@ cifs_setattr(struct dentry *direntry, st
 void
 cifs_delete_inode(struct inode *inode)
 {
-	/* Note: called without the big kernel filelock - remember spinlocks! */
 	cFYI(1, ("In cifs_delete_inode, inode = 0x%p ", inode));
-	/* may have to add back in when safe distributed caching of
-             directories via e.g. FindNotify added */
+	/* may have to add back in if and when safe distributed caching of
+		directories added e.g. via FindNotify */
 }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/cifs/link.c linux-2.4.20-wolk4.16-fullkernel/fs/cifs/link.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/cifs/link.c	2004-06-29 11:24:22.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/cifs/link.c	2004-09-05 15:47:54.000000000 +0200
@@ -44,10 +44,18 @@ cifs_hardlink(struct dentry *old_file, s
 	cifs_sb_target = CIFS_SB(inode->i_sb);
 	pTcon = cifs_sb_target->tcon;
 
-/* No need to check for cross device links since server will do that - BB note DFS case in future though (when we may have to check) */
+/* No need to check for cross device links since server will do that
+   BB note DFS case in future though (when we may have to check) */
 
+	down(&inode->i_sb->s_vfs_rename_sem);
 	fromName = build_path_from_dentry(old_file);
 	toName = build_path_from_dentry(direntry);
+	up(&inode->i_sb->s_vfs_rename_sem);
+	if((fromName == NULL) || (toName == NULL)) {
+		rc = -ENOMEM;
+		goto cifs_hl_exit;
+	}
+
 	if (cifs_sb_target->tcon->ses->capabilities & CAP_UNIX)
 		rc = CIFSUnixCreateHardLink(xid, pTcon, fromName, toName,
 					    cifs_sb_target->local_nls);
@@ -70,6 +78,7 @@ cifs_hardlink(struct dentry *old_file, s
 	cifsInode = CIFS_I(old_file->d_inode);
 	cifsInode->time = 0;	/* will force revalidate to go get info when needed */
 
+cifs_hl_exit:
 	if (fromName)
 		kfree(fromName);
 	if (toName)
@@ -90,12 +99,22 @@ cifs_follow_link(struct dentry *direntry
 	struct cifsTconInfo *pTcon;
 
 	xid = GetXid();
+
+	down(&direntry->d_sb->s_vfs_rename_sem);
 	full_path = build_path_from_dentry(direntry);
+	up(&direntry->d_sb->s_vfs_rename_sem);
+
+	if(full_path == NULL) {
+		FreeXid(xid);
+		return -ENOMEM;
+	}
 	cFYI(1, ("Full path: %s inode = 0x%p", full_path, inode));
 	cifs_sb = CIFS_SB(inode->i_sb);
 	pTcon = cifs_sb->tcon;
 	target_path = kmalloc(PATH_MAX, GFP_KERNEL);
 	if(target_path == NULL) {
+		if (full_path)
+			kfree(full_path);
 		FreeXid(xid);
 		return -ENOMEM;
 	}
@@ -147,7 +166,15 @@ cifs_symlink(struct inode *inode, struct
 	cifs_sb = CIFS_SB(inode->i_sb);
 	pTcon = cifs_sb->tcon;
 
+	down(&inode->i_sb->s_vfs_rename_sem);
 	full_path = build_path_from_dentry(direntry);
+	up(&inode->i_sb->s_vfs_rename_sem);
+
+	if(full_path == NULL) {
+		FreeXid(xid);
+		return -ENOMEM;
+	}
+
 	cFYI(1, ("Full path: %s ", full_path));
 	cFYI(1, ("symname is %s", symname));
 
@@ -161,10 +188,10 @@ cifs_symlink(struct inode *inode, struct
 	if (rc == 0) {
 		if (pTcon->ses->capabilities & CAP_UNIX)
 			rc = cifs_get_inode_info_unix(&newinode, full_path,
-						      inode->i_sb);
+						      inode->i_sb,xid);
 		else
 			rc = cifs_get_inode_info(&newinode, full_path, NULL,
-						 inode->i_sb);
+						 inode->i_sb,xid);
 
 		if (rc != 0) {
 			cFYI(1,
@@ -202,7 +229,18 @@ cifs_readlink(struct dentry *direntry, c
 	xid = GetXid();
 	cifs_sb = CIFS_SB(inode->i_sb);
 	pTcon = cifs_sb->tcon;
+
+/* BB would it be safe against deadlock to grab this sem 
+      even though rename itself grabs the sem and calls lookup? */
+/*       down(&inode->i_sb->s_vfs_rename_sem);*/
 	full_path = build_path_from_dentry(direntry);
+/*       up(&inode->i_sb->s_vfs_rename_sem);*/
+
+	if(full_path == NULL) {
+		FreeXid(xid);
+		return -ENOMEM;
+	}
+
 	cFYI(1,
 	     ("Full path: %s inode = 0x%p pBuffer = 0x%p buflen = %d",
 	      full_path, inode, pBuffer, buflen));
@@ -212,6 +250,8 @@ cifs_readlink(struct dentry *direntry, c
 		len = buflen;
 	tmpbuffer = kmalloc(len,GFP_KERNEL);   
 	if(tmpbuffer == NULL) {
+		if (full_path)
+			kfree(full_path);
 		FreeXid(xid);
 		return -ENOMEM;
 	}
@@ -251,10 +291,11 @@ cifs_readlink(struct dentry *direntry, c
 						cFYI(1,("num referral: %d",num_referrals));
 						if(referrals) {
 							cFYI(1,("referral string: %s ",referrals));
-							strncpy(tmpbuffer, referrals, len-1);
+							strncpy(tmpbuffer, referrals, len-1);                            
 						}
 					}
-
+					if(referrals)
+						kfree(referrals);
 					kfree(tmp_path);
 					if(referrals) {
 						kfree(referrals);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/cifs/md4.c linux-2.4.20-wolk4.16-fullkernel/fs/cifs/md4.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/cifs/md4.c	2004-06-29 11:24:22.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/cifs/md4.c	2004-09-05 15:47:54.000000000 +0200
@@ -3,7 +3,7 @@
    Version 1.9.
    a implementation of MD4 designed for use in the SMB authentication protocol
    Copyright (C) Andrew Tridgell 1997-1998.
-   Modified by Steve French (sfrench@us.ibm.com) 2002
+   Modified by Steve French (sfrench@us.ibm.com) 2002-2003
    
    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
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/cifs/md5.c linux-2.4.20-wolk4.16-fullkernel/fs/cifs/md5.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/cifs/md5.c	2004-06-29 11:24:22.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/cifs/md5.c	2004-09-05 15:47:54.000000000 +0200
@@ -148,7 +148,7 @@ MD5Final(unsigned char digest[16], struc
 	MD5Transform(ctx->buf, (__u32 *) ctx->in);
 	byteReverse((unsigned char *) ctx->buf, 4);
 	memmove(digest, ctx->buf, 16);
-	memset(ctx, 0, sizeof (ctx));	/* In case it's sensitive */
+	memset(ctx, 0, sizeof(*ctx));	/* In case it's sensitive */
 }
 
 /* The four core functions - F1 is optimized somewhat */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/cifs/misc.c linux-2.4.20-wolk4.16-fullkernel/fs/cifs/misc.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/cifs/misc.c	2004-06-29 11:24:22.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/cifs/misc.c	2004-09-05 15:47:54.000000000 +0200
@@ -57,6 +57,8 @@ void
 _FreeXid(unsigned int xid)
 {
 	spin_lock(&GlobalMid_Lock);
+	/* if(GlobalTotalActiveXid == 0)
+		BUG(); */
 	GlobalTotalActiveXid--;
 	spin_unlock(&GlobalMid_Lock);
 }
@@ -120,6 +122,9 @@ tconInfoAlloc(void)
 		ret_buf->tidStatus = CifsNew;
 		INIT_LIST_HEAD(&ret_buf->openFileList);
 		init_MUTEX(&ret_buf->tconSem);
+#ifdef CONFIG_CIFS_STATS
+		ret_buf->stat_lock = SPIN_LOCK_UNLOCKED;
+#endif
 		write_unlock(&GlobalSMBSeslock);
 	}
 	return ret_buf;
@@ -144,7 +149,7 @@ tconInfoFree(struct cifsTconInfo *buf_to
 struct smb_hdr *
 cifs_buf_get(void)
 {
-	struct smb_hdr *ret_buf = 0;
+	struct smb_hdr *ret_buf = NULL;
 
 /* We could use negotiated size instead of max_msgsize - 
    but it may be more efficient to always alloc same size 
@@ -316,8 +321,8 @@ checkSMB(struct smb_hdr *smb, __u16 mid,
 	     ("Entering checkSMB with Length: %x, smb_buf_length: %x ",
 	      length, ntohl(smb->smb_buf_length)));
 	if (((unsigned int)length < 2 + sizeof (struct smb_hdr))
-	    || (4 + ntohl(smb->smb_buf_length) >
-		CIFS_MAX_MSGSIZE + MAX_CIFS_HDR_SIZE)) {
+	    || (ntohl(smb->smb_buf_length) >
+		CIFS_MAX_MSGSIZE + MAX_CIFS_HDR_SIZE - 4)) {
 		if ((unsigned int)length < 2 + sizeof (struct smb_hdr)) {
 			cERROR(1, ("Length less than 2 + sizeof smb_hdr "));
 			if (((unsigned int)length >= sizeof (struct smb_hdr) - 1)
@@ -325,8 +330,8 @@ checkSMB(struct smb_hdr *smb, __u16 mid,
 				return 0;	/* some error cases do not return wct and bcc */
 
 		}
-		if (4 + ntohl(smb->smb_buf_length) >
-		    CIFS_MAX_MSGSIZE + MAX_CIFS_HDR_SIZE)
+		if (ntohl(smb->smb_buf_length) >
+		    CIFS_MAX_MSGSIZE + MAX_CIFS_HDR_SIZE - 4)
 			cERROR(1,
 			       ("smb_buf_length greater than CIFS_MAX_MSGSIZE ... "));
 		cERROR(1,
@@ -389,12 +394,13 @@ is_valid_oplock_break(struct smb_hdr *bu
 	list_for_each(tmp, &GlobalTreeConnectionList) {
 		tcon = list_entry(tmp, struct cifsTconInfo, cifsConnectionList);
 		if (tcon->tid == buf->Tid) {
+#ifdef CONFIG_CIFS_STATS
+			atomic_inc(&tcon->num_oplock_brks);
+#endif
 			list_for_each(tmp1,&tcon->openFileList){
 				netfile = list_entry(tmp1,struct cifsFileInfo,tlist);
 				if(pSMB->Fid == netfile->netfid) {
 					struct cifsInodeInfo *pCifsInode;
-			/* BB Add following logic to mark inode for write through 
-              		    inode->i_data.a_ops = &cifs_addr_ops_writethrough; */
 					read_unlock(&GlobalSMBSeslock);
 					cFYI(1,("Matching file id, processing oplock break"));
 					pCifsInode = 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/cifs/netmisc.c linux-2.4.20-wolk4.16-fullkernel/fs/cifs/netmisc.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/cifs/netmisc.c	2004-06-29 11:24:22.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/cifs/netmisc.c	2004-09-05 15:47:54.000000000 +0200
@@ -125,10 +125,10 @@ const struct smb_to_posix_error mapping_
 /* Convert string containing dotted ip address to binary form */
 /* returns 0 if invalid address */
 
-/* BB add address family, change rc to status flag and return *//* also see inet_pton */
-/* To identify v4 vs. v6 - 1) check for colon (v6 only) 2) then call inet_pton to parse for bad address  */
+/* BB add address family, change rc to status flag and return union or for ipv6 */
+/*  will need parent to call something like inet_pton to convert ipv6 address  BB */
 int
-cifs_inet_addr(char *cp)
+cifs_inet_pton(int address_family, char *cp,void *dst)
 {
 	struct in_addr address;
 	int value;
@@ -140,6 +140,9 @@ cifs_inet_addr(char *cp)
 	static const int addr_class_max[4] =
 	    { 0xffffffff, 0xffffff, 0xffff, 0xff };
 
+	if(address_family != AF_INET)
+		return -EAFNOSUPPORT;
+
 	for (i = 0; i < 4; i++) {
 		bytes[i] = 0;
 	}
@@ -166,6 +169,9 @@ cifs_inet_addr(char *cp)
 				return 0;
 			*end++ = value;
 			temp = *++cp;
+		} else if (temp == ':') {
+			cFYI(1,("IPv6 addresses not supported for CIFS mounts yet"));
+			return -1;
 		} else
 			break;
 	}
@@ -182,8 +188,8 @@ cifs_inet_addr(char *cp)
 		return 0;
 
 	address.s_addr = *((int *) bytes) | htonl(value);
-	return address.s_addr;
-
+	*((int *)dst) = address.s_addr;
+	return 1; /* success */
 }
 
 /*****************************************************************************
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/cifs/rfc1002pdu.h linux-2.4.20-wolk4.16-fullkernel/fs/cifs/rfc1002pdu.h
--- linux-2.4.20-wolk4.15-fullkernel/fs/cifs/rfc1002pdu.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/fs/cifs/rfc1002pdu.h	2004-09-05 15:47:54.000000000 +0200
@@ -0,0 +1,79 @@
+/*
+ *   fs/cifs/rfc1002pdu.h
+ *
+ *   Protocol Data Unit definitions for RFC 1001/1002 support
+ *
+ *   Copyright (c) International Business Machines  Corp., 2004
+ *   Author(s): Steve French (sfrench@us.ibm.com)
+ *
+ *   This library is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU Lesser General Public License as published
+ *   by the Free Software Foundation; either version 2.1 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This library 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 Lesser General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Lesser General Public License
+ *   along with this library; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
+ */
+
+#pragma pack(1)
+
+/* NB: unlike smb/cifs packets, the RFC1002 structures are big endian */
+
+	/* RFC 1002 session packet types */
+#define RFC1002_SESSION_MESASAGE 0x00
+#define RFC1002_SESSION_REQUEST  0x81
+#define RFC1002_POSITIVE_SESSION_RESPONSE 0x82
+#define RFC1002_NEGATIVE_SESSION_RESPONSE 0x83
+#define RFC1002_RETARGET_SESSION_RESPONSE 0x83
+#define RFC1002_SESSION_KEEP_ALIVE 0x85
+
+	/* RFC 1002 flags (only one defined */
+#define RFC1002_LENGTH_EXTEND 0x80 /* high order bit of length (ie +64K) */
+
+struct rfc1002_session_packet {
+	__u8	type;
+	__u8	flags;
+	__u16	length;
+	union {
+		struct {
+			__u8 called_len;
+			__u8 called_name[32];
+			__u8 scope1; /* null */
+			__u8 calling_len;
+			__u8 calling_name[32];
+			__u8 scope2; /* null */
+		} session_req;
+		struct {
+			__u32 retarget_ip_addr;
+			__u16 port;
+		} retarget_resp;
+		__u8 neg_ses_resp_error_code;
+		/* POSITIVE_SESSION_RESPONSE packet does not include trailer.
+		SESSION_KEEP_ALIVE packet also does not include a trailer.
+		Trailer for the SESSION_MESSAGE packet is SMB/CIFS header */
+	} trailer;
+};
+
+/* Negative Session Response error codes */
+#define RFC1002_NOT_LISTENING_CALLED  0x80 /* not listening on called name */
+#define RFC1002_NOT_LISTENING_CALLING 0x81 /* not listening on calling name */
+#define RFC1002_NOT_PRESENT           0x82 /* called name not present */
+#define RFC1002_INSUFFICIENT_RESOURCE 0x83
+#define RFC1002_UNSPECIFIED_ERROR     0x8F
+
+/* RFC 1002 Datagram service packets are not defined here as they
+are not needed for the network filesystem client unless we plan on
+implementing broadcast resolution of the server ip address (from
+server netbios name). Currently server names are resolved only via DNS
+(tcp name) or ip address or an /etc/hosts equivalent mapping to ip address.*/
+
+#define DEFAULT_CIFS_CALLED_NAME  "*SMBSERVER      "
+
+#pragma pack()		/* resume default structure packing */
+                                                             
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/cifs/smbdes.c linux-2.4.20-wolk4.16-fullkernel/fs/cifs/smbdes.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/cifs/smbdes.c	2004-06-29 11:24:22.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/cifs/smbdes.c	2004-09-05 15:47:54.000000000 +0200
@@ -6,7 +6,7 @@
    SMB authentication protocol
 
    Copyright (C) Andrew Tridgell 1998
-   Modified by Steve French (sfrench@us.ibm.com) 2002,2003
+   Modified by Steve French (sfrench@us.ibm.com) 2002,2004
    
    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
@@ -44,7 +44,7 @@
    should confirm it for yourself (and maybe let me know if you come
    up with a different answer to the one above)
 */
-
+#include <linux/slab.h>
 #define uchar unsigned char
 
 static uchar perm1[56] = { 57, 49, 41, 33, 25, 17, 9,
@@ -191,14 +191,23 @@ static void
 dohash(char *out, char *in, char *key, int forw)
 {
 	int i, j, k;
-	char pk1[56];
+	char *pk1;
 	char c[28];
 	char d[28];
-	char cd[56];
+	char *cd;
 	char ki[16][48];
-	char pd1[64];
+	char *pd1;
 	char l[32], r[32];
-	char rl[64];
+	char *rl;
+
+	/* Have to reduce stack usage */
+	pk1 = kmalloc(56+56+64+64,GFP_KERNEL);
+	if(pk1 == NULL)
+		return;
+
+	cd = pk1 + 56;
+	pd1= cd  + 56;
+	rl = pd1 + 64;
 
 	permute(pk1, key, perm1, 56);
 
@@ -223,12 +232,22 @@ dohash(char *out, char *in, char *key, i
 	}
 
 	for (i = 0; i < 16; i++) {
-		char er[48];
-		char erk[48];
+		char *er;  /* er[48]  */
+		char *erk; /* erk[48] */
 		char b[8][6];
-		char cb[32];
-		char pcb[32];
-		char r2[32];
+		char *cb;  /* cb[32]  */
+		char *pcb; /* pcb[32] */
+		char *r2;  /* r2[32]  */
+
+		er = kmalloc(48+48+32+32+32, GFP_KERNEL);
+		if(er == NULL) {
+			kfree(pk1);
+			return;
+		}
+		erk = er+48;
+		cb  = erk+48;
+		pcb = cb+32;
+		r2  = pcb+32;
 
 		permute(er, r, perm4, 48);
 
@@ -262,11 +281,14 @@ dohash(char *out, char *in, char *key, i
 
 		for (j = 0; j < 32; j++)
 			r[j] = r2[j];
+
+		kfree(er);
 	}
 
 	concat(rl, r, l, 32, 32);
 
 	permute(out, rl, perm6, 64);
+	kfree(pk1);
 }
 
 static void
@@ -291,11 +313,18 @@ static void
 smbhash(unsigned char *out, unsigned char *in, unsigned char *key, int forw)
 {
 	int i;
-	char outb[64];
-	char inb[64];
-	char keyb[64];
+	char *outb; /* outb[64] */
+	char *inb;  /* inb[64]  */
+	char *keyb; /* keyb[64] */
 	unsigned char key2[8];
 
+	outb = kmalloc(64 * 3,GFP_KERNEL);
+	if(outb == NULL)
+		return;
+
+	inb  = outb + 64;
+	keyb = inb +  64;
+
 	str_to_key(key, key2);
 
 	for (i = 0; i < 64; i++) {
@@ -314,6 +343,7 @@ smbhash(unsigned char *out, unsigned cha
 		if (outb[i])
 			out[i / 8] |= (1 << (7 - (i % 8)));
 	}
+	kfree(outb);
 }
 
 void
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/cifs/transport.c linux-2.4.20-wolk4.16-fullkernel/fs/cifs/transport.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/cifs/transport.c	2004-06-29 11:24:22.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/cifs/transport.c	2004-09-05 15:47:54.000000000 +0200
@@ -1,7 +1,7 @@
 /*
  *   fs/cifs/transport.c
  *
- *   Copyright (C) International Business Machines  Corp., 2002,2003
+ *   Copyright (C) International Business Machines  Corp., 2002,2004
  *   Author(s): Steve French (sfrench@us.ibm.com)
  *
  *   This library is free software; you can redistribute it and/or modify
@@ -87,7 +87,7 @@ struct oplock_q_entry *
 AllocOplockQEntry(struct inode * pinode, __u16 fid, struct cifsTconInfo * tcon)
 {
 	struct oplock_q_entry *temp;
-	if ((pinode == NULL) || (tcon == NULL)) {
+	if ((pinode== NULL) || (tcon == NULL)) {
 		cERROR(1, ("Null parms passed to AllocOplockQEntry"));
 		return NULL;
 	}
@@ -97,8 +97,8 @@ AllocOplockQEntry(struct inode * pinode,
 		return temp;
 	else {
 		temp->pinode = pinode;
-		temp->netfid = fid;
 		temp->tcon = tcon;
+		temp->netfid = fid;
 		spin_lock(&GlobalMid_Lock);
 		list_add_tail(&temp->qhead, &GlobalOplock_Q);
 		spin_unlock(&GlobalMid_Lock);
@@ -121,13 +121,13 @@ smb_send(struct socket *ssocket, struct 
 	 unsigned int smb_buf_length, struct sockaddr *sin)
 {
 	int rc = 0;
+	int i = 0;
 	struct msghdr smb_msg;
 	struct iovec iov;
 	mm_segment_t temp_fs;
 
 	if(ssocket == NULL)
 		return -ENOTSOCK; /* BB eventually add reconnect code here */
-/*  ssocket->sk->allocation = GFP_BUFFER; *//* BB is this spurious? */
 	iov.iov_base = smb_buffer;
 	iov.iov_len = smb_buf_length + 4;
 
@@ -150,18 +150,33 @@ smb_send(struct socket *ssocket, struct 
 
 	temp_fs = get_fs();	/* we must turn off socket api parm checking */
 	set_fs(get_ds());
-	rc = sock_sendmsg(ssocket, &smb_msg, smb_buf_length + 4);
-	while((rc == -ENOSPC) || (rc == -EAGAIN)) {
-		schedule_timeout(HZ/2);
+	while(iov.iov_len > 0) {
 		rc = sock_sendmsg(ssocket, &smb_msg, smb_buf_length + 4);
+		if ((rc == -ENOSPC) || (rc == -EAGAIN)) {
+			i++;
+			if(i > 60) {
+				cERROR(1,
+				   ("sends on sock %p stuck for 30 seconds",
+				    ssocket));
+				rc = -EAGAIN;
+				break;
+			}
+			set_current_state(TASK_INTERRUPTIBLE);
+			schedule_timeout(HZ/2);
+			continue;
+		}
+		if (rc < 0) 
+			break;
+		iov.iov_base += rc;
+		iov.iov_len -= rc;
 	}
 	set_fs(temp_fs);
 
 	if (rc < 0) {
-		cERROR(1,
-		       ("Error %d sending data on socket to server.", rc));
-	} else
+		cERROR(1,("Error %d sending data on socket to server.", rc));
+	} else {
 		rc = 0;
+	}
 
 	return rc;
 }
@@ -173,34 +188,81 @@ SendReceive(const unsigned int xid, stru
 {
 	int rc = 0;
 	unsigned int receive_len;
-	long timeout = 10 * HZ;
+	long timeout;
 	struct mid_q_entry *midQ;
 
-	if ((ses == NULL) || (ses->server == NULL)) {
-		cERROR(1,("Null tcp session or smb session: %p",ses));
+	if (ses == NULL) {
+		cERROR(1,("Null smb session"));
+		return -EIO;
+	}
+	if(ses->server == NULL) {
+		cERROR(1,("Null tcp session"));
 		return -EIO;
 	}
 
+	/* Ensure that we do not send more than 50 overlapping requests 
+	   to the same server. We may make this configurable later or
+	   use ses->maxReq */
+	if(long_op == -1) {
+		/* oplock breaks must not be held up */
+		atomic_inc(&ses->server->inFlight);
+	} else {
+		spin_lock(&GlobalMid_Lock); 
+		while(1) {        
+			if(atomic_read(&ses->server->inFlight) >= CIFS_MAX_REQ){
+				spin_unlock(&GlobalMid_Lock);
+				wait_event(ses->server->request_q,
+					atomic_read(&ses->server->inFlight)
+					 < CIFS_MAX_REQ);
+				spin_lock(&GlobalMid_Lock);
+			} else {
+				if(ses->server->tcpStatus == CifsExiting) {
+					spin_unlock(&GlobalMid_Lock);
+					return -ENOENT;
+				}
+
+			/* can not count locking commands against total since
+			   they are allowed to block on server */
+					
+				if(long_op < 3) {
+				/* update # of requests on the wire to server */
+					atomic_inc(&ses->server->inFlight);
+				}
+				spin_unlock(&GlobalMid_Lock);
+				break;
+			}
+		}
+	}
+	/* make sure that we sign in the same order that we send on this socket 
+	   and avoid races inside tcp sendmsg code that could cause corruption
+	   of smb data */
+
+	down(&ses->server->tcpSem); 
+
 	if (ses->server->tcpStatus == CifsExiting) {
-		return -ENOENT;
+		rc = -ENOENT;
+		goto out_unlock;
 	} else if (ses->server->tcpStatus == CifsNeedReconnect) {
 		cFYI(1,("tcp session dead - return to caller to retry"));
-		return -EAGAIN;
+		rc = -EAGAIN;
+		goto out_unlock;
 	} else if (ses->status != CifsGood) {
 		/* check if SMB session is bad because we are setting it up */
 		if((in_buf->Command != SMB_COM_SESSION_SETUP_ANDX) && 
 			(in_buf->Command != SMB_COM_NEGOTIATE)) {
-			return -EAGAIN;
+			rc = -EAGAIN;
+			goto out_unlock;
 		} /* else ok - we are setting up session */
 	}
-	/* make sure that we sign in the same order that we send on this socket 
-		and avoid races inside tcp sendmsg code that could cause corruption
-		of smb data */
-	down(&ses->server->tcpSem); 
 	midQ = AllocMidQEntry(in_buf, ses);
 	if (midQ == NULL) {
 		up(&ses->server->tcpSem);
-		return -EIO;
+		/* If not lock req, update # of requests on wire to server */
+		if(long_op < 3) {
+			atomic_dec(&ses->server->inFlight); 
+			wake_up(&ses->server->request_q);
+		}
+		return -ENOMEM;
 	}
 
 	if (in_buf->smb_buf_length > CIFS_MAX_MSGSIZE + MAX_CIFS_HDR_SIZE - 4) {
@@ -209,6 +271,11 @@ SendReceive(const unsigned int xid, stru
 		       ("Illegal length, greater than maximum frame, %d ",
 			in_buf->smb_buf_length));
 		DeleteMidQEntry(midQ);
+		/* If not lock req, update # of requests on wire to server */
+		if(long_op < 3) {
+			atomic_dec(&ses->server->inFlight); 
+			wake_up(&ses->server->request_q);
+		}
 		return -EIO;
 	}
 
@@ -219,8 +286,18 @@ SendReceive(const unsigned int xid, stru
 
 	midQ->midState = MID_REQUEST_SUBMITTED;
 	rc = smb_send(ses->server->ssocket, in_buf, in_buf->smb_buf_length,
-		      (struct sockaddr *) &(ses->server->sockAddr));
-	up(&ses->server->tcpSem);
+		      (struct sockaddr *) &(ses->server->addr.sockAddr));
+	if(rc < 0) {
+		DeleteMidQEntry(midQ);
+		up(&ses->server->tcpSem);
+		/* If not lock req, update # of requests on wire to server */
+		if(long_op < 3) {
+			atomic_dec(&ses->server->inFlight); 
+			wake_up(&ses->server->request_q);
+		}
+		return rc;
+	} else
+		up(&ses->server->tcpSem);
 	if (long_op == -1)
 		goto cifs_no_response_exit;
 	else if (long_op == 2) /* writes past end of file can take looooong time */
@@ -234,42 +311,59 @@ SendReceive(const unsigned int xid, stru
 		timeout = 15 * HZ;
 	/* wait for 15 seconds or until woken up due to response arriving or 
 	   due to last connection to this server being unmounted */
-
-	timeout = interruptible_sleep_on_timeout(&ses->server->response_q,timeout);
-
 	if (signal_pending(current)) {
-		cFYI(1, ("CIFS: caught signal"));
-		DeleteMidQEntry(midQ);
-		return -EINTR;
-	} else {  /* BB spinlock protect this against races with demux thread */
-		spin_lock(&GlobalMid_Lock);
-		if (midQ->resp_buf) {
-			spin_unlock(&GlobalMid_Lock);
-			receive_len =
-			    be32_to_cpu(midQ->resp_buf->smb_buf_length);
-		} else {
-			cFYI(1,("No response buffer"));
-			if(midQ->midState == MID_REQUEST_SUBMITTED) {
-				if(ses->server->tcpStatus == CifsExiting)
-					rc = -EHOSTDOWN;
-				else {
+		/* if signal pending do not hold up user for full smb timeout
+		but we still give response a change to complete */
+		if(midQ->midState & MID_REQUEST_SUBMITTED) {
+			set_current_state(TASK_UNINTERRUPTIBLE);
+			timeout = sleep_on_timeout(&ses->server->response_q,2 * HZ);
+		}
+	} else { /* using normal timeout */
+		/* timeout = wait_event_interruptible_timeout(ses->server->response_q,
+			(midQ->midState & MID_RESPONSE_RECEIVED) || 
+			((ses->server->tcpStatus != CifsGood) &&
+			 (ses->server->tcpStatus != CifsNew)),
+			timeout); */ 
+		/* Can not allow user interrupts- wreaks havoc with performance */
+		if(midQ->midState & MID_REQUEST_SUBMITTED) {
+			set_current_state(TASK_UNINTERRUPTIBLE);
+			timeout = sleep_on_timeout(&ses->server->response_q,timeout);
+		}
+	}
+    
+	spin_lock(&GlobalMid_Lock);
+	if (midQ->resp_buf) {
+		spin_unlock(&GlobalMid_Lock);
+		receive_len = be32_to_cpu(midQ->resp_buf->smb_buf_length);
+	} else {
+		cERROR(1,("No response buffer"));
+		if(midQ->midState == MID_REQUEST_SUBMITTED) {
+			if(ses->server->tcpStatus == CifsExiting)
+				rc = -EHOSTDOWN;
+			else {
 				ses->server->tcpStatus = CifsNeedReconnect;
 				midQ->midState = MID_RETRY_NEEDED;
-				}
 			}
+		}
 
+		if (rc != -EHOSTDOWN) {
 			if(midQ->midState == MID_RETRY_NEEDED) {
 				rc = -EAGAIN;
 				cFYI(1,("marking request for retry"));
 			} else {
 				rc = -EIO;
 			}
-			spin_unlock(&GlobalMid_Lock);
-			DeleteMidQEntry(midQ);
-			return rc;
 		}
+		spin_unlock(&GlobalMid_Lock);
+		DeleteMidQEntry(midQ);
+		/* If not lock req, update # of requests on wire to server */
+		if(long_op < 3) {
+			atomic_dec(&ses->server->inFlight); 
+			wake_up(&ses->server->request_q);
+		}
+		return rc;
 	}
-
+  
 	if (receive_len > CIFS_MAX_MSGSIZE + MAX_CIFS_HDR_SIZE) {
 		cERROR(1,
 		       ("Frame too large received.  Length: %d  Xid: %d",
@@ -319,8 +413,22 @@ SendReceive(const unsigned int xid, stru
 		}
 	}
 cifs_no_response_exit:
-	DeleteMidQEntry(midQ);	/* BB what if process is killed?
-			 - BB add background daemon to clean up Mid entries from
-			 killed processes & test killing process with active mid */
+	DeleteMidQEntry(midQ);
+
+	if(long_op < 3) {
+		atomic_dec(&ses->server->inFlight); 
+		wake_up(&ses->server->request_q);
+	}
+
+	return rc;
+
+out_unlock:
+	up(&ses->server->tcpSem);
+	/* If not lock req, update # of requests on wire to server */
+	if(long_op < 3) {
+		atomic_dec(&ses->server->inFlight); 
+		wake_up(&ses->server->request_q);
+	}
+
 	return rc;
 }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/devfs/base.c linux-2.4.20-wolk4.16-fullkernel/fs/devfs/base.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/devfs/base.c	2004-06-29 11:26:10.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/devfs/base.c	2004-09-05 16:06:00.000000000 +0200
@@ -3312,7 +3312,7 @@ static ssize_t devfsd_read (struct file 
 {
     int done = FALSE;
     int ival;
-    loff_t pos, devname_offset, tlen, rpos;
+    loff_t pos, devname_offset, tlen, rpos, old_pos;
     devfs_handle_t de;
     struct devfsd_buf_entry *entry;
     struct fs_info *fs_info = file->f_dentry->d_inode->i_sb->u.generic_sbp;
@@ -3363,8 +3363,8 @@ static ssize_t devfsd_read (struct file 
     info->namelen = DEVFS_PATHLEN - pos - 1;
     if (info->mode == 0) info->mode = de->mode;
     devname_offset = info->devname - (char *) info;
-    rpos = *ppos;
-    if (rpos < devname_offset)
+    old_pos = rpos = *ppos;
+    if (rpos >= 0 && rpos < devname_offset)
     {
 	/*  Copy parts of the header  */
 	tlen = devname_offset - rpos;
@@ -3390,7 +3390,7 @@ static ssize_t devfsd_read (struct file 
 	}
 	rpos += tlen;
     }
-    tlen = rpos - *ppos;
+    tlen = rpos - old_pos;
     if (done)
     {
 	devfs_handle_t parent;
@@ -3504,16 +3504,17 @@ static ssize_t stat_read (struct file *f
 			  loff_t *ppos)
 {
     ssize_t num;
+    loff_t n = *ppos;
     char txt[80];
 
     num = sprintf (txt, "Number of entries: %u  number of bytes: %u\n",
 		   stat_num_entries, stat_num_bytes) + 1;
     /*  Can't seek (pread) on this device  */
     if (ppos != &file->f_pos) return -ESPIPE;
-    if (*ppos >= num) return 0;
-    if (*ppos + len > num) len = num - *ppos;
-    if ( copy_to_user (buf, txt + *ppos, len) ) return -EFAULT;
-    *ppos += len;
+    if (n != (unsigned)n || n >= num) return 0;
+    if (len > num - n) len = num - n;
+    if ( copy_to_user (buf, txt + n, len) ) return -EFAULT;
+    *ppos = n + len;
     return len;
 }   /*  End Function stat_read  */
 #endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/eventpoll.c linux-2.4.20-wolk4.16-fullkernel/fs/eventpoll.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/eventpoll.c	2004-06-29 11:24:14.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/eventpoll.c	2004-09-05 15:47:42.000000000 +0200
@@ -96,6 +96,8 @@
 #define EPI_SLAB_DEBUG 0
 #endif /* #if DEBUG_EPI != 0 */
 
+/* Epoll private bits inside the event mask */
+#define EP_PRIVATE_BITS (EPOLLONESHOT | EPOLLET)
 
 /* Maximum number of poll wake up nests we are allowing */
 #define EP_MAX_POLLWAKE_NESTS 4
@@ -179,7 +181,7 @@ struct poll_safewake {
 
 /*
  * This structure is stored inside the "private_data" member of the file
- * structure and rapresent the main data sructure for the eventpoll
+ * structure and represent the main data sructure for the eventpoll
  * interface.
  */
 struct eventpoll {
@@ -248,6 +250,9 @@ struct epitem {
 	/* The "container" of this item */
 	struct eventpoll *ep;
 
+	/* The file descriptor this item refers to */
+	int fd;
+
 	/* The file this item refers to */
 	struct file *file;
 
@@ -288,15 +293,17 @@ static int ep_getfd(int *efd, struct ino
 static int ep_alloc_pages(char **pages, int numpages);
 static int ep_free_pages(char **pages, int numpages);
 static int ep_file_init(struct file *file, unsigned int hashbits);
-static unsigned int ep_hash_index(struct eventpoll *ep, struct file *file);
+static unsigned int ep_hash_index(struct eventpoll *ep, struct file *file, int fd);
 static struct list_head *ep_hash_entry(struct eventpoll *ep, unsigned int index);
 static int ep_init(struct eventpoll *ep, unsigned int hashbits);
 static void ep_free(struct eventpoll *ep);
-static struct epitem *ep_find(struct eventpoll *ep, struct file *file);
+static struct epitem *ep_find(struct eventpoll *ep, struct file *file, int fd);
 static void ep_use_epitem(struct epitem *epi);
 static void ep_release_epitem(struct epitem *epi);
-static void ep_ptable_queue_proc(struct file *file, wait_queue_head_t *whead, poll_table *pt);
-static int ep_insert(struct eventpoll *ep, struct epoll_event *event, struct file *tfile);
+static void ep_ptable_queue_proc(struct file *file, wait_queue_head_t *whead,
+				 poll_table *pt);
+static int ep_insert(struct eventpoll *ep, struct epoll_event *event,
+		     struct file *tfile, int fd);
 static int ep_modify(struct eventpoll *ep, struct epitem *epi, struct epoll_event *event);
 static void ep_unregister_pollwait(struct eventpoll *ep, struct epitem *epi);
 static int ep_unlink(struct eventpoll *ep, struct epitem *epi);
@@ -442,29 +449,17 @@ void eventpoll_init_file(struct file *fi
 
 
 /*
- * This is called from inside fs/file_table.c:__fput() to unlink files
- * from the eventpoll interface. We need to have this facility to cleanup
- * correctly files that are closed without being removed from the eventpoll
- * interface.
+ * This is called from eventpoll_release() to unlink files from the eventpoll
+ * interface. We need to have this facility to cleanup correctly files that are
+ * closed without being removed from the eventpoll interface.
  */
-void eventpoll_release(struct file *file)
+void eventpoll_release_file(struct file *file)
 {
 	struct list_head *lsthead = &file->f_ep_links;
 	struct eventpoll *ep;
 	struct epitem *epi;
 
 	/*
-	 * Fast check to avoid the get/release of the semaphore. Since
-	 * we're doing this outside the semaphore lock, it might return
-	 * false negatives, but we don't care. It'll help in 99.99% of cases
-	 * to avoid the semaphore lock. False positives simply cannot happen
-	 * because the file in on the way to be removed and nobody ( but
-	 * eventpoll ) has still a reference to this file.
-	 */
-	if (list_empty(lsthead))
-		return;
-
-	/*
 	 * We don't want to get "file->f_ep_lock" because it is not
 	 * necessary. It is not necessary because we're in the "struct file"
 	 * cleanup path, and this means that noone is using this file anymore.
@@ -538,9 +533,9 @@ eexit_1:
 
 
 /*
- * The following function implement the controller interface for the eventpoll
- * file that enable the insertion/removal/change of file descriptors inside
- * the interest set. It rapresents the kernel part of the user spcae epoll_ctl(2).
+ * The following function implements the controller interface for the eventpoll
+ * file that enables the insertion/removal/change of file descriptors inside
+ * the interest set. It represents the kernel part of the user space epoll_ctl(2).
  */
 asmlinkage long sys_epoll_ctl(int epfd, int op, int fd, struct epoll_event *event)
 {
@@ -550,8 +545,8 @@ asmlinkage long sys_epoll_ctl(int epfd, 
 	struct epitem *epi;
 	struct epoll_event epds;
 
-	DNPRINTK(3, (KERN_INFO "[%p] eventpoll: sys_epoll_ctl(%d, %d, %d, %u)\n",
-		     current, epfd, op, fd, event->events));
+	DNPRINTK(3, (KERN_INFO "[%p] eventpoll: sys_epoll_ctl(%d, %d, %d, %p)\n",
+		     current, epfd, op, fd, event));
 
 	error = -EFAULT;
 	if (copy_from_user(&epds, event, sizeof(struct epoll_event)))
@@ -591,7 +586,7 @@ asmlinkage long sys_epoll_ctl(int epfd, 
 	down_write(&ep->sem);
 
 	/* Try to lookup the file inside our hash table */
-	epi = ep_find(ep, tfile);
+	epi = ep_find(ep, tfile, fd);
 
 	error = -EINVAL;
 	switch (op) {
@@ -599,7 +594,7 @@ asmlinkage long sys_epoll_ctl(int epfd, 
 		if (!epi) {
 			epds.events |= POLLERR | POLLHUP;
 
-			error = ep_insert(ep, &epds, tfile);
+			error = ep_insert(ep, &epds, tfile, fd);
 		} else
 			error = -EEXIST;
 		break;
@@ -632,8 +627,8 @@ eexit_3:
 eexit_2:
 	fput(file);
 eexit_1:
-	DNPRINTK(3, (KERN_INFO "[%p] eventpoll: sys_epoll_ctl(%d, %d, %d, %u) = %d\n",
-		     current, epfd, op, fd, event->events, error));
+	DNPRINTK(3, (KERN_INFO "[%p] eventpoll: sys_epoll_ctl(%d, %d, %d, %p) = %d\n",
+		     current, epfd, op, fd, event, error));
 
 	return error;
 }
@@ -825,10 +820,11 @@ static int ep_file_init(struct file *fil
 /*
  * Calculate the index of the hash relative to "file".
  */
-static unsigned int ep_hash_index(struct eventpoll *ep, struct file *file)
+static unsigned int ep_hash_index(struct eventpoll *ep, struct file *file, int fd)
 {
+	unsigned long ptr = (unsigned long) file ^ (fd << ep->hashbits);
 
-	return (unsigned int) hash_ptr(file, ep->hashbits);
+	return (unsigned int) hash_ptr((void *) ptr, ep->hashbits);
 }
 
 
@@ -931,7 +927,7 @@ static void ep_free(struct eventpoll *ep
  * the returned item, so the caller must call ep_release_epitem()
  * after finished using the "struct epitem".
  */
-static struct epitem *ep_find(struct eventpoll *ep, struct file *file)
+static struct epitem *ep_find(struct eventpoll *ep, struct file *file, int fd)
 {
 	unsigned long flags;
 	struct list_head *lsthead, *lnk;
@@ -939,11 +935,11 @@ static struct epitem *ep_find(struct eve
 
 	read_lock_irqsave(&ep->lock, flags);
 
-	lsthead = ep_hash_entry(ep, ep_hash_index(ep, file));
+	lsthead = ep_hash_entry(ep, ep_hash_index(ep, file, fd));
 	list_for_each(lnk, lsthead) {
 		epi = list_entry(lnk, struct epitem, llink);
 
-		if (epi->file == file) {
+		if (epi->file == file && epi->fd == fd) {
 			ep_use_epitem(epi);
 			break;
 		}
@@ -987,7 +983,8 @@ static void ep_release_epitem(struct epi
  * This is the callback that is used to add our wait queue to the
  * target file wakeup lists.
  */
-static void ep_ptable_queue_proc(struct file *file, wait_queue_head_t *whead, poll_table *pt)
+static void ep_ptable_queue_proc(struct file *file, wait_queue_head_t *whead,
+				 poll_table *pt)
 {
 	struct epitem *epi = EP_ITEM_FROM_EPQUEUE(pt);
 	struct eppoll_entry *pwq;
@@ -1006,7 +1003,8 @@ static void ep_ptable_queue_proc(struct 
 }
 
 
-static int ep_insert(struct eventpoll *ep, struct epoll_event *event, struct file *tfile)
+static int ep_insert(struct eventpoll *ep, struct epoll_event *event,
+		     struct file *tfile, int fd)
 {
 	int error, revents, pwake = 0;
 	unsigned long flags;
@@ -1025,6 +1023,7 @@ static int ep_insert(struct eventpoll *e
 	INIT_LIST_HEAD(&epi->pwqlist);
 	epi->ep = ep;
 	epi->file = tfile;
+	epi->fd = fd;
 	epi->event = *event;
 	atomic_set(&epi->usecnt, 1);
 	epi->nwait = 0;
@@ -1057,7 +1056,7 @@ static int ep_insert(struct eventpoll *e
 	write_lock_irqsave(&ep->lock, flags);
 
 	/* Add the current item to the hash table */
-	list_add(&epi->llink, ep_hash_entry(ep, ep_hash_index(ep, tfile)));
+	list_add(&epi->llink, ep_hash_entry(ep, ep_hash_index(ep, tfile, fd)));
 
 	/* If the file is already "ready" we drop it inside the ready list */
 	if ((revents & event->events) && !EP_IS_LINKED(&epi->rdllink)) {
@@ -1076,8 +1075,8 @@ static int ep_insert(struct eventpoll *e
 	if (pwake)
 		ep_poll_safewake(&psw, &ep->poll_wait);
 
-	DNPRINTK(3, (KERN_INFO "[%p] eventpoll: ep_insert(%p, %p)\n",
-		     current, ep, tfile));
+	DNPRINTK(3, (KERN_INFO "[%p] eventpoll: ep_insert(%p, %p, %d)\n",
+		     current, ep, tfile, fd));
 
 	return 0;
 
@@ -1301,6 +1300,15 @@ static int ep_poll_callback(wait_queue_t
 
 	write_lock_irqsave(&ep->lock, flags);
 
+	/*
+	 * If the event mask does not contain any poll(2) event, we consider the
+	 * descriptor to be disabled. This condition is likely the effect of the
+	 * EPOLLONESHOT bit that disables the descriptor when an event is received,
+	 * until the next EPOLL_CTL_MOD will be issued.
+	 */
+	if (!(epi->event.events & ~EP_PRIVATE_BITS))
+		goto is_disabled;
+
 	/* If this file is already in the ready list we exit soon */
 	if (EP_IS_LINKED(&epi->rdllink))
 		goto is_linked;
@@ -1317,6 +1325,7 @@ is_linked:
 	if (waitqueue_active(&ep->poll_wait))
 		pwake++;
 
+is_disabled:
 	write_unlock_irqrestore(&ep->lock, flags);
 
 	/* We have to call this outside the lock */
@@ -1453,6 +1462,8 @@ static int ep_send_events(struct eventpo
 				eventcnt += eventbuf;
 				eventbuf = 0;
 			}
+			if (epi->event.events & EPOLLONESHOT)
+				epi->event.events &= EP_PRIVATE_BITS;
 		}
 	}
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/exec.c linux-2.4.20-wolk4.16-fullkernel/fs/exec.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/exec.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/exec.c	2004-09-05 17:09:43.000000000 +0200
@@ -914,9 +914,6 @@ int prepare_binprm(struct linux_binprm *
 			cap_set_full(bprm->cap_effective);
 	}
 
-	if (gr_handle_ptrace_exec(bprm->file->f_dentry, bprm->file->f_vfsmnt))
-		return -EACCES;
-
 	memset(bprm->buf,0,BINPRM_BUF_SIZE);
 	return kernel_read(bprm->file,0,bprm->buf,BINPRM_BUF_SIZE);
 }
@@ -979,8 +976,11 @@ void compute_creds(struct linux_binprm *
 	
         /* AUD: Audit candidate if current->cap_effective is set */
 
-        current->suid = current->euid = current->fsuid = bprm->e_uid;
-        current->sgid = current->egid = current->fsgid = bprm->e_gid;
+	if (!gr_check_user_change(-1, bprm->e_uid, bprm->e_uid))
+		current->suid = current->euid = current->fsuid = bprm->e_uid;
+
+	if (!gr_check_group_change(-1, bprm->e_gid, bprm->e_gid))
+	        current->sgid = current->egid = current->fsgid = bprm->e_gid;
 
 	gr_handle_chroot_caps(current);
 
@@ -1248,7 +1248,9 @@ int do_execve(char * filename, char ** a
 	current->exec_file = file;
 #endif
 
-	gr_set_proc_label(file->f_dentry, file->f_vfsmnt);
+	retval = gr_set_proc_label(file->f_dentry, file->f_vfsmnt);
+	if (retval < 0)
+		goto out_fail;
 
 	retval = search_binary_handler(&bprm,regs);
 	if (retval >= 0) {
@@ -1284,6 +1286,7 @@ int do_execve(char * filename, char ** a
 	  }
 	}
 
+out_fail:
 #ifdef CONFIG_GRKERNSEC
 	current->acl = old_acl;
 	memcpy(current->rlim, old_rlim, sizeof(old_rlim));
@@ -1525,6 +1528,10 @@ int do_coredump(long signr, struct pt_re
 	if (!is_dumpable(current))
 		goto fail;
 	current->mm->dumpable = 0;
+
+	if (signr == SIGKILL || signr == SIGILL)
+		gr_handle_brute_attach(current);
+
 	gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
 	if (current->rlim[RLIMIT_CORE].rlim_cur < binfmt->min_coredump)
 		goto fail;
@@ -1611,7 +1618,7 @@ int do_coredump(long signr, struct pt_re
 	if (name_n < 1)
 	    goto fail;
 
-	file = filp_open(corename, O_CREAT | 2 | O_NOFOLLOW, 0600);
+	file = filp_open(corename, O_LARGEFILE | O_CREAT | 2 | O_NOFOLLOW, 0600);
 	if (IS_ERR(file))
 		goto fail;
 	inode = file->f_dentry->d_inode;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/ext2/super.c linux-2.4.20-wolk4.16-fullkernel/fs/ext2/super.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/ext2/super.c	2004-06-29 11:31:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/ext2/super.c	2004-09-05 16:08:40.000000000 +0200
@@ -545,10 +545,6 @@ struct super_block * ext2_read_super (st
 
 	/* Set defaults before we parse the mount options */
 	def_mount_opts = le32_to_cpu(es->s_default_mount_opts);
-
-	/* For a complete list, see include/linux/ext2_fs.h */
-	sbi->s_mount_opt = 0x0002;
-
 	if (def_mount_opts & EXT2_DEFM_DEBUG)
 		set_opt(sbi->s_mount_opt, DEBUG);
 	if (def_mount_opts & EXT2_DEFM_BSDGROUPS)
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/ext3/inode.c linux-2.4.20-wolk4.16-fullkernel/fs/ext3/inode.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/ext3/inode.c	2004-06-29 11:31:49.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/ext3/inode.c	2004-09-05 16:08:28.000000000 +0200
@@ -878,22 +878,39 @@ ext3_direct_io_get_block(struct inode *i
 	int ret = 0;
 
 	lock_kernel();
-	if (handle && handle->h_buffer_credits <= EXT3_RESERVE_TRANS_BLOCKS) {
+	if (!handle)
+		goto get_block;		/* A read */
+
+	if (handle->h_transaction->t_state == T_LOCKED) {
+		/*
+		 * Huge direct-io writes can hold off commits for long
+		 * periods of time.  Let this commit run.
+		 */
+		ext3_journal_stop(handle, inode);
+		handle = ext3_journal_start(inode, DIO_CREDITS);
+		if (IS_ERR(handle))
+			ret = PTR_ERR(handle);
+		goto get_block;
+	}
+
+	if (handle->h_buffer_credits <= EXT3_RESERVE_TRANS_BLOCKS) {
 		/*
 		 * Getting low on buffer credits...
 		 */
-		if (!ext3_journal_extend(handle, DIO_CREDITS)) {
+		ret = ext3_journal_extend(handle, DIO_CREDITS);
+		if (ret > 0) {
 			/*
-			 * Couldn't extend the transaction.  Start a new one
+			 * Couldn't extend the transaction.  Start a new one.
 			 */
 			ret = ext3_journal_restart(handle, DIO_CREDITS);
 		}
 	}
+
+get_block:
 	if (ret == 0)
 		ret = ext3_get_block_handle(handle, inode, iblock,
 					bh_result, create, 0);
-	if (ret == 0)
-		bh_result->b_size = (1 << inode->i_blkbits);
+	bh_result->b_size = (1 << inode->i_blkbits);
 	unlock_kernel();
 	return ret;
 }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/ext3/super.c linux-2.4.20-wolk4.16-fullkernel/fs/ext3/super.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/ext3/super.c	2004-06-29 11:31:50.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/ext3/super.c	2004-09-05 16:08:30.000000000 +0200
@@ -1010,10 +1010,7 @@ struct super_block * ext3_read_super (st
 	
 	/* Set defaults before we parse the mount options */
 	def_mount_opts = le32_to_cpu(es->s_default_mount_opts);
-
-	/* For a complete list, see include/linux/ext3_fs.h */
-	sbi->s_mount_opt = 0x0002;
-
+	sbi->s_mount_opt = 0;
 	if (def_mount_opts & EXT3_DEFM_DEBUG)
 		set_opt(sbi->s_mount_opt, DEBUG);
 	if (def_mount_opts & EXT3_DEFM_BSDGROUPS)
@@ -1379,6 +1376,7 @@ static journal_t *ext3_get_journal(struc
 	if (!journal) {
 		printk(KERN_ERR "EXT3-fs: Could not load journal inode\n");
 		iput(journal_inode);
+		return NULL;
 	}
 	ext3_init_journal_params(EXT3_SB(sb), journal);
 	return journal;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/fat/file.c linux-2.4.20-wolk4.16-fullkernel/fs/fat/file.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/fat/file.c	2004-06-29 11:24:12.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/fat/file.c	2004-09-05 16:06:02.000000000 +0200
@@ -117,8 +117,17 @@ void fat_truncate(struct inode *inode)
 	int cluster;
 
 	/* Why no return value?  Surely the disk could fail... */
+#if 0
+	/*
+	 * Why do we need this check? VFS layer should already have
+	 * checked user access before we ever get here; and we can 
+	 * get here from iput on read-only file system, consider
+	 * remounting file system read-only after changing some file.
+	 * That is exactly what happens with supermount and breaks it
+	 */
 	if (IS_RDONLY (inode))
 		return /* -EPERM */;
+#endif
 	if (IS_IMMUTABLE(inode))
 		return /* -EPERM */;
 	cluster = 1 << sbi->cluster_bits;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/fcntl.c linux-2.4.20-wolk4.16-fullkernel/fs/fcntl.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/fcntl.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/fcntl.c	2004-09-05 17:09:43.000000000 +0200
@@ -65,10 +65,11 @@ static int locate_fd(struct files_struct
 	int error;
 	unsigned int start;
 
+	gr_learn_resource(current, RLIMIT_NOFILE, orig_start, 0);
+
 	write_lock(&files->file_lock);
 	
 	error = -EINVAL;
-	gr_learn_resource(current, RLIMIT_NOFILE, orig_start, 0);
 	if (orig_start >= current->rlim[RLIMIT_NOFILE].rlim_cur)
 		goto out;
 
@@ -144,6 +145,8 @@ asmlinkage long sys_dup2(unsigned int ol
 	struct file * file, *tofree;
 	struct files_struct * files = current->files;
 
+	gr_learn_resource(current, RLIMIT_NOFILE, newfd, 0);
+
 	write_lock(&files->file_lock);
 	if (!(file = fcheck(oldfd)))
 		goto out_unlock;
@@ -151,7 +154,6 @@ asmlinkage long sys_dup2(unsigned int ol
 	if (newfd == oldfd)
 		goto out_unlock;
 	err = -EBADF;
-	gr_learn_resource(current, RLIMIT_NOFILE, newfd, 0);
 	if (newfd >= current->rlim[RLIMIT_NOFILE].rlim_cur)
 		goto out_unlock;
 	get_file(file);			/* We are now finished with oldfd */
@@ -446,10 +448,6 @@ void send_sigio(struct fown_struct *fown
 			match = -p->pgrp;
 		if (pid != match)
 			continue;
-		if (gr_check_protected_task(p))
-			continue;
-		if (gr_pid_is_chrooted(p))
-			continue;
 		send_sigio_to_task(p, fown, fd, band);
 	}
 out:
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/hfs/file.c linux-2.4.20-wolk4.16-fullkernel/fs/hfs/file.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/hfs/file.c	2002-02-25 20:38:08.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/fs/hfs/file.c	2004-09-05 16:06:00.000000000 +0200
@@ -150,7 +150,7 @@ static hfs_rwret_t hfs_file_read(struct 
 		return -EINVAL;
 	}
 	pos = *ppos;
-	if (pos >= HFS_FORK_MAX) {
+	if (pos < 0 || pos >= HFS_FORK_MAX) {
 		return 0;
 	}
 	size = inode->i_size;
@@ -167,7 +167,7 @@ static hfs_rwret_t hfs_file_read(struct 
 	}
 	if ((read = hfs_do_read(inode, HFS_I(inode)->fork, pos,
 				buf, left, filp->f_reada != 0)) > 0) {
-	        *ppos += read;
+	        *ppos = pos + read;
 		filp->f_reada = 1;
 	}
 
@@ -197,7 +197,7 @@ static hfs_rwret_t hfs_file_write(struct
 
 	pos = (filp->f_flags & O_APPEND) ? inode->i_size : *ppos;
 
-	if (pos >= HFS_FORK_MAX) {
+	if (pos < 0 || pos >= HFS_FORK_MAX) {
 		return 0;
 	}
 	if (count > HFS_FORK_MAX) {
@@ -207,8 +207,8 @@ static hfs_rwret_t hfs_file_write(struct
 	        pos += written;
 
 	*ppos = pos;
-	if (*ppos > inode->i_size) {
-	        inode->i_size = *ppos;
+	if (pos > inode->i_size) {
+	        inode->i_size = pos;
 		mark_inode_dirty(inode);
 	}
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/hfs/file_cap.c linux-2.4.20-wolk4.16-fullkernel/fs/hfs/file_cap.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/hfs/file_cap.c	2001-09-10 16:31:25.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/hfs/file_cap.c	2004-09-05 16:06:00.000000000 +0200
@@ -191,7 +191,7 @@ static hfs_rwret_t cap_info_write(struct
 				  hfs_rwarg_t count, loff_t *ppos)
 {
         struct inode *inode = filp->f_dentry->d_inode;
-	hfs_u32 pos;
+	hfs_u32 pos, last;
 
 	if (!S_ISREG(inode->i_mode)) {
 		hfs_warn("hfs_file_write: mode = %07o\n", inode->i_mode);
@@ -207,14 +207,14 @@ static hfs_rwret_t cap_info_write(struct
 		return 0;
 	}
 
-	*ppos += count;
-	if (*ppos > HFS_FORK_MAX) {
-		*ppos = HFS_FORK_MAX;
+	last = pos + count;
+	if (last > HFS_FORK_MAX) {
+		last = HFS_FORK_MAX;
 		count = HFS_FORK_MAX - pos;
 	}
 
-	if (*ppos > inode->i_size)
-	        inode->i_size = *ppos;
+	if (last > inode->i_size)
+	        inode->i_size = last;
 
 	/* Only deal with the part we store in memory */
 	if (pos < sizeof(struct hfs_cap_info)) {
@@ -272,6 +272,7 @@ static hfs_rwret_t cap_info_write(struct
 		}
 	}
 
+	*ppos = last;
 	inode->i_mtime = inode->i_ctime = CURRENT_TIME;
 	mark_inode_dirty(inode);
 	return count;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/hfs/file_hdr.c linux-2.4.20-wolk4.16-fullkernel/fs/hfs/file_hdr.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/hfs/file_hdr.c	2001-08-12 19:56:56.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/hfs/file_hdr.c	2004-09-05 16:06:00.000000000 +0200
@@ -384,7 +384,7 @@ static hfs_rwret_t hdr_read(struct file 
 	struct hfs_cat_entry *entry = HFS_I(inode)->entry;
 	const struct hfs_hdr_layout *layout;
 	off_t start, length, offset;
-	off_t pos = *ppos;
+	loff_t pos = *ppos;
 	int left, lcv, read = 0;
 
 	if (!S_ISREG(inode->i_mode)) {
@@ -399,7 +399,7 @@ static hfs_rwret_t hdr_read(struct file 
 	}
 
 	/* Adjust count to fit within the bounds of the file */
-	if ((pos >= inode->i_size) || (count <= 0)) {
+	if (pos != (unsigned)pos || pos >= inode->i_size || count <= 0) {
 		return 0;
 	} else if (count > inode->i_size - pos) {
 		count = inode->i_size - pos;
@@ -646,7 +646,7 @@ static hfs_rwret_t hdr_write(struct file
 		hfs_warn("hfs_hdr_write: mode = %07o\n", inode->i_mode);
 		return -EINVAL;
 	}
-	if (count <= 0) {
+	if (count <= 0 || pos != (unsigned)pos) {
 		return 0;
 	}
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/jfs/file.c linux-2.4.20-wolk4.16-fullkernel/fs/jfs/file.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/jfs/file.c	2004-06-29 11:31:50.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/jfs/file.c	2004-09-05 16:08:29.000000000 +0200
@@ -71,11 +71,13 @@ static int jfs_open(struct inode *inode,
 	if (S_ISREG(inode->i_mode) && file->f_mode & FMODE_WRITE &&
 	    (inode->i_size == 0)) {
 		struct jfs_inode_info *ji = JFS_IP(inode);
+		spin_lock_irq(&ji->ag_lock);
 		if (ji->active_ag == -1) {
 			ji->active_ag = ji->agno;
 			atomic_inc(
 			    &JFS_SBI(inode->i_sb)->bmap->db_active[ji->agno]);
 		}
+		spin_unlock_irq(&ji->ag_lock);
 	}
 
 	return 0;
@@ -84,11 +86,13 @@ static int jfs_release(struct inode *ino
 {
 	struct jfs_inode_info *ji = JFS_IP(inode);
 
+	spin_lock_irq(&ji->ag_lock);
 	if (ji->active_ag != -1) {
 		struct bmap *bmap = JFS_SBI(inode->i_sb)->bmap;
 		atomic_dec(&bmap->db_active[ji->active_ag]);
 		ji->active_ag = -1;
 	}
+	spin_unlock_irq(&ji->ag_lock);
 
 	return 0;
 }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/jfs/inode.c linux-2.4.20-wolk4.16-fullkernel/fs/jfs/inode.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/jfs/inode.c	2004-06-29 11:31:50.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/jfs/inode.c	2004-09-05 16:08:29.000000000 +0200
@@ -50,10 +50,13 @@ void jfs_clear_inode(struct inode *inode
 
 	jfs_info("jfs_clear_inode called ip = 0x%p", inode);
 
+	spin_lock_irq(&ji->ag_lock);
 	if (ji->active_ag != -1) {
 		struct bmap *bmap = JFS_SBI(inode->i_sb)->bmap;
 		atomic_dec(&bmap->db_active[ji->active_ag]);
+		ji->active_ag = -1;
 	}
+	spin_unlock_irq(&ji->ag_lock);
 
 	ASSERT(list_empty(&ji->anon_inode_list));
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/jfs/jfs_dmap.c linux-2.4.20-wolk4.16-fullkernel/fs/jfs/jfs_dmap.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/jfs/jfs_dmap.c	2004-06-29 11:23:46.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/jfs/jfs_dmap.c	2004-09-05 15:46:57.000000000 +0200
@@ -1205,6 +1205,12 @@ static int dbAllocNext(struct bmap * bmp
 	s8 *leaf;
 	u32 mask;
 
+	if (dp->tree.leafidx != cpu_to_le32(LEAFIND)) {
+		jfs_error(bmp->db_ipbmap->i_sb,
+			  "dbAllocNext: Corrupt dmap page");
+		return -EIO;
+	}
+
 	/* pick up a pointer to the leaves of the dmap tree.
 	 */
 	leaf = dp->tree.stree + le32_to_cpu(dp->tree.leafidx);
@@ -1328,7 +1334,15 @@ dbAllocNear(struct bmap * bmp,
 	    struct dmap * dp, s64 blkno, int nblocks, int l2nb, s64 * results)
 {
 	int word, lword, rc;
-	s8 *leaf = dp->tree.stree + le32_to_cpu(dp->tree.leafidx);
+	s8 *leaf;
+
+	if (dp->tree.leafidx != cpu_to_le32(LEAFIND)) {
+		jfs_error(bmp->db_ipbmap->i_sb,
+			  "dbAllocNear: Corrupt dmap page");
+		return -EIO;
+	}
+
+	leaf = dp->tree.stree + le32_to_cpu(dp->tree.leafidx);
 
 	/* determine the word within the dmap that holds the hint
 	 * (i.e. blkno).  also, determine the last word in the dmap
@@ -1490,6 +1504,13 @@ dbAllocAG(struct bmap * bmp, int agno, s
 	dcp = (struct dmapctl *) mp->data;
 	budmin = dcp->budmin;
 
+	if (dcp->leafidx != cpu_to_le32(CTLLEAFIND)) {
+		jfs_error(bmp->db_ipbmap->i_sb,
+			  "dbAllocAG: Corrupt dmapctl page");
+		release_metapage(mp);
+		return -EIO;
+	}
+
 	/* search the subtree(s) of the dmap control page that describes
 	 * the allocation group, looking for sufficient free space.  to begin,
 	 * determine how many allocation groups are represented in a dmap
@@ -1698,6 +1719,13 @@ static int dbFindCtl(struct bmap * bmp, 
 		dcp = (struct dmapctl *) mp->data;
 		budmin = dcp->budmin;
 
+		if (dcp->leafidx != cpu_to_le32(CTLLEAFIND)) {
+			jfs_error(bmp->db_ipbmap->i_sb,
+				  "dbFindCtl: Corrupt dmapctl page");
+			release_metapage(mp);
+			return -EIO;
+		}
+
 		/* search the tree within the dmap control page for
 		 * sufficent free space.  if sufficient free space is found,
 		 * dbFindLeaf() returns the index of the leaf at which
@@ -2460,6 +2488,13 @@ dbAdjCtl(struct bmap * bmp, s64 blkno, i
 		return -EIO;
 	dcp = (struct dmapctl *) mp->data;
 
+	if (dcp->leafidx != cpu_to_le32(CTLLEAFIND)) {
+		jfs_error(bmp->db_ipbmap->i_sb,
+			  "dbAdjCtl: Corrupt dmapctl page");
+		release_metapage(mp);
+		return -EIO;
+	}
+
 	/* determine the leaf number corresponding to the block and
 	 * the index within the dmap control tree.
 	 */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/jfs/jfs_extent.c linux-2.4.20-wolk4.16-fullkernel/fs/jfs/jfs_extent.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/jfs/jfs_extent.c	2004-06-29 11:23:46.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/jfs/jfs_extent.c	2004-09-05 15:46:57.000000000 +0200
@@ -554,6 +554,7 @@ extBalloc(struct inode *ip, s64 hint, s6
 
 	if (S_ISREG(ip->i_mode) && (ji->fileset == FILESYSTEM_I)) {
 		ag = BLKTOAG(daddr, sbi);
+		spin_lock_irq(&ji->ag_lock);
 		if (ji->active_ag == -1) {
 			atomic_inc(&bmp->db_active[ag]);
 			ji->active_ag = ag;
@@ -562,6 +563,7 @@ extBalloc(struct inode *ip, s64 hint, s6
 			atomic_inc(&bmp->db_active[ag]);
 			ji->active_ag = ag;
 		}
+		spin_unlock_irq(&ji->ag_lock);
 	}
 
 	return (0);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/jfs/jfs_imap.c linux-2.4.20-wolk4.16-fullkernel/fs/jfs/jfs_imap.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/jfs/jfs_imap.c	2004-06-29 11:23:46.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/jfs/jfs_imap.c	2004-09-05 15:46:57.000000000 +0200
@@ -1286,6 +1286,7 @@ int diFree(struct inode *ip)
 	 * to be freed by the transaction;  
 	 */
 	tid = txBegin(ipimap->i_sb, COMMIT_FORCE);
+	down(&JFS_IP(ipimap)->commit_sem);
 
 	/* acquire tlock of the iag page of the freed ixad 
 	 * to force the page NOHOMEOK (even though no data is
@@ -1318,6 +1319,7 @@ int diFree(struct inode *ip)
 	rc = txCommit(tid, 1, &iplist[0], COMMIT_FORCE);
 
 	txEnd(tid);
+	up(&JFS_IP(ipimap)->commit_sem);
 
 	/* unlock the AG inode map information */
 	AG_UNLOCK(imap, agno);
@@ -2630,10 +2632,13 @@ diNewIAG(struct inomap * imap, int *iagn
 		 */
 #endif				/*  _STILL_TO_PORT */
 		tid = txBegin(sb, COMMIT_FORCE);
+		down(&JFS_IP(ipimap)->commit_sem);
 
 		/* update the inode map addressing structure to point to it */
 		if ((rc =
 		     xtInsert(tid, ipimap, 0, blkno, xlen, &xaddr, 0))) {
+			txEnd(tid);
+			up(&JFS_IP(ipimap)->commit_sem);
 			/* Free the blocks allocated for the iag since it was
 			 * not successfully added to the inode map
 			 */
@@ -2658,6 +2663,7 @@ diNewIAG(struct inomap * imap, int *iagn
 		rc = txCommit(tid, 1, &iplist[0], COMMIT_FORCE);
 
 		txEnd(tid);
+		up(&JFS_IP(ipimap)->commit_sem);
 
 		duplicateIXtree(sb, blkno, xlen, &xaddr);
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/jfs/jfs_incore.h linux-2.4.20-wolk4.16-fullkernel/fs/jfs/jfs_incore.h
--- linux-2.4.20-wolk4.15-fullkernel/fs/jfs/jfs_incore.h	2004-06-29 11:31:50.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/jfs/jfs_incore.h	2004-09-05 16:08:29.000000000 +0200
@@ -54,6 +54,7 @@ struct jfs_inode_info {
 	lid_t	blid;		/* lid of pseudo buffer?	*/
 	lid_t	atlhead;	/* anonymous tlock list head	*/
 	lid_t	atltail;	/* anonymous tlock list tail	*/
+	spinlock_t ag_lock;	/* protects active_ag		*/
 	struct list_head anon_inode_list; /* inodes having anonymous txns */
 	/*
 	 * rdwrlock serializes xtree between reads & writes and synchronizes
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/jfs/jfs_logmgr.c linux-2.4.20-wolk4.16-fullkernel/fs/jfs/jfs_logmgr.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/jfs/jfs_logmgr.c	2004-06-29 11:23:46.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/jfs/jfs_logmgr.c	2004-09-05 16:09:19.000000000 +0200
@@ -1845,7 +1845,6 @@ static inline void lbmRedrive(struct lbu
 static int lbmRead(struct jfs_log * log, int pn, struct lbuf ** bpp)
 {
 	struct lbuf *bp;
-	unsigned long flags;
 
 	/*
 	 * allocate a log buffer
@@ -1864,11 +1863,7 @@ static int lbmRead(struct jfs_log * log,
 	generic_make_request(READ, &bp->l_bh);
 	run_task_queue(&tq_disk);
 
-	LCACHE_LOCK(flags);		/* disable+lock */
-
-	LCACHE_SLEEP_COND(bp->l_ioevent, (bp->l_flag != lbmREAD), flags);
-
-	LCACHE_UNLOCK(flags);	/* unlock+enable */
+	wait_event(bp->l_ioevent, (bp->l_flag != lbmREAD));
 
 	return 0;
 }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/jfs/jfs_metapage.c linux-2.4.20-wolk4.16-fullkernel/fs/jfs/jfs_metapage.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/jfs/jfs_metapage.c	2004-06-29 11:23:46.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/jfs/jfs_metapage.c	2004-09-05 15:46:58.000000000 +0200
@@ -606,6 +606,7 @@ again:
 			if (page) {
 				block_flushpage(page, 0);
 				UnlockPage(page);
+				page_cache_release(page);
 			}
 		}
 	}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/jfs/jfs_mount.c linux-2.4.20-wolk4.16-fullkernel/fs/jfs/jfs_mount.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/jfs/jfs_mount.c	2004-06-29 11:23:46.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/jfs/jfs_mount.c	2004-09-05 15:46:58.000000000 +0200
@@ -197,9 +197,6 @@ int jfs_mount(struct super_block *sb)
 	/*
 	 *      unwind on error
 	 */
-//errout42: /* close fileset inode allocation map */
-	diUnmount(ipimap, 1);
-
       errout41:		/* close fileset inode allocation map inode */
 	diFreeSpecial(ipimap);
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/jfs/jfs_xtree.c linux-2.4.20-wolk4.16-fullkernel/fs/jfs/jfs_xtree.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/jfs/jfs_xtree.c	2004-06-29 11:23:46.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/jfs/jfs_xtree.c	2004-09-05 15:46:57.000000000 +0200
@@ -1071,8 +1071,10 @@ xtSplitUp(tid_t tid,
 		 */
 		/* get/pin the parent page <sp> */
 		XT_GETPAGE(ip, parent->bn, smp, PSIZE, sp, rc);
-		if (rc)
-			goto errout2;
+		if (rc) {
+			XT_PUTPAGE(rcmp);
+			return rc;
+		}
 
 		/*
 		 * The new key entry goes ONE AFTER the index of parent entry,
@@ -1106,8 +1108,10 @@ xtSplitUp(tid_t tid,
 			rc = (sp->header.flag & BT_ROOT) ?
 			    xtSplitRoot(tid, ip, split, &rmp) :
 			    xtSplitPage(tid, ip, split, &rmp, &rbn);
-			if (rc)
-				goto errout1;
+			if (rc) {
+				XT_PUTPAGE(smp);
+				return rc;
+			}
 
 			XT_PUTPAGE(smp);
 			/* keep new child page <rp> pinned */
@@ -1170,19 +1174,6 @@ xtSplitUp(tid_t tid,
 	XT_PUTPAGE(rmp);
 
 	return 0;
-
-	/*
-	 * If something fails in the above loop we were already walking back
-	 * up the tree and the tree is now inconsistent.
-	 * release all pages we're holding.
-	 */
-      errout1:
-	XT_PUTPAGE(smp);
-
-      errout2:
-	XT_PUTPAGE(rcmp);
-
-	return rc;
 }
 
 
@@ -3504,7 +3495,17 @@ s64 xtTruncate(tid_t tid, struct inode *
 	 * a page that was formerly to the right, let's make sure that the
 	 * next pointer is zero.
 	 */
-	p->header.next = 0;
+	if (p->header.next) {
+		if (log)
+			/*
+			 * Make sure this change to the header is logged.
+			 * If we really truncate this leaf, the flag
+			 * will be changed to tlckTRUNCATE
+			 */
+			tlck = txLock(tid, ip, mp, tlckXTREE|tlckGROW);
+		BT_MARK_DIRTY(mp, ip);
+		p->header.next = 0;
+	}
 
 	freed = 0;
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/jfs/super.c linux-2.4.20-wolk4.16-fullkernel/fs/jfs/super.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/jfs/super.c	2004-06-29 11:31:50.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/jfs/super.c	2004-09-05 16:08:29.000000000 +0200
@@ -484,6 +484,7 @@ static void init_once(void *foo, kmem_ca
 		init_rwsem(&jfs_ip->rdwrlock);
 		init_MUTEX(&jfs_ip->commit_sem);
 		init_rwsem(&jfs_ip->xattr_sem);
+		spin_lock_init(&jfs_ip->ag_lock);
 		jfs_ip->active_ag = -1;
 #ifdef CONFIG_JFS_POSIX_ACL
 		jfs_ip->i_acl = JFS_ACL_NOT_CACHED;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/lufs/Makefile linux-2.4.20-wolk4.16-fullkernel/fs/lufs/Makefile
--- linux-2.4.20-wolk4.15-fullkernel/fs/lufs/Makefile	2004-06-29 11:25:46.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/lufs/Makefile	2004-09-05 16:01:02.000000000 +0200
@@ -17,3 +17,4 @@ obj-m    := $(O_TARGET)
 # EXTRA_CFLAGS += -DLUFS_VERBOSE
 
 include $(TOPDIR)/Rules.make
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/lufs/file.c linux-2.4.20-wolk4.16-fullkernel/fs/lufs/file.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/lufs/file.c	2004-06-29 11:25:46.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/lufs/file.c	2004-09-05 16:01:02.000000000 +0200
@@ -147,7 +147,7 @@ static int lu_file_readpage(struct file 
 	goto out;
     }
 
-    offset = p->index << PAGE_CACHE_SHIFT;
+    offset = ((long long) p->index) << PAGE_CACHE_SHIFT;
     count = PAGE_SIZE;
 
     siov[0].iov_base = &offset;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/lufs/fs.h linux-2.4.20-wolk4.16-fullkernel/fs/lufs/fs.h
--- linux-2.4.20-wolk4.15-fullkernel/fs/lufs/fs.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/fs/lufs/fs.h	2004-09-05 16:01:02.000000000 +0200
@@ -0,0 +1,112 @@
+/*
+ * lufs.h
+ * Copyright (C) 2002 Florin Malita <mali@go.ro>
+ *
+ * This file is part of LUFS, a free userspace filesystem implementation.
+ * See http://lufs.sourceforge.net/ for updates.
+ *
+ * LUFS 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.
+ *
+ * LUFS 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  02111-1307  USA
+ */
+
+#ifndef _LUFS_FS_H_
+#define _LUFS_FS_H_
+
+#include <sys/types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct dir_cache;
+struct directory;
+struct lufs_fattr;
+struct file_system;
+struct list_head;
+struct dir_cache;
+
+#define MAX_LEN		64
+
+struct credentials{
+    char	user[MAX_LEN];
+    char	group[MAX_LEN];
+    uid_t	uid;
+    gid_t	gid;
+};
+
+
+struct directory* lu_cache_mkdir(char*);
+int lu_cache_add2dir(struct directory*, char*, char*, struct lufs_fattr*);
+int lu_cache_lookup(struct dir_cache*, char*, char*, struct lufs_fattr*, char*, int);
+void lu_cache_add_dir(struct dir_cache*, struct directory*);
+void lu_cache_killdir(struct directory*);
+
+int lu_check_to(int, int, int);
+int lu_atomic_read(int, char*, int, int);
+int lu_atomic_write(int, char*, int, int);
+
+int lu_opt_loadcfg(struct list_head*, char*);
+int lu_opt_parse(struct list_head*, char*, char*);
+int lu_opt_getint(struct list_head*, char*, char*, long int*, int);
+const char* lu_opt_getchar(struct list_head*, char*, char*);
+
+
+#ifdef __cplusplus
+} /* end of extern "C" { */
+#endif
+
+#ifdef TRACE
+#undef TRACE
+#endif
+#ifdef WARN
+#undef WARN
+#endif
+#ifdef ERROR
+#undef ERROR
+#endif
+
+#ifdef __cplusplus
+
+#include <iostream>
+
+#ifdef DEBUG
+#define TRACE(x) 	cout<<std::hex<<"["<<getpid()<<"]("<<__func__<<")"<<x<<"\n"
+#define WARN(x)		cerr<<std::hex<<"["<<getpid()<<"]("<<__func__<<")"<<x<<"\n"
+#define ERROR(x)	cerr<<std::hex<<"["<<getpid()<<"]("<<__func__<<")"<<x<<"\n"
+#else
+#define TRACE(x...)	do{}while(0)
+#define WARN(x...)	do{}while(0)
+#define ERROR(x...)	cerr<<x<<"\n"
+#endif
+
+#else
+
+#include <stdio.h>
+
+#ifdef DEBUG
+#define TRACE(x...)	do{fprintf(stdout, "[%x](%s) ", getpid(), __func__); fprintf(stdout, x); fprintf(stdout, "\n");}while(0)
+#define WARN(x...)	do{fprintf(stdout, "[%x](%s) ", getpid(), __func__); fprintf(stdout, x); fprintf(stdout, "\n");}while(0)
+#define ERROR(x...)	do{fprintf(stderr, "[%x](%s) ", getpid(), __func__); fprintf(stdout, x); fprintf(stdout, "\n");}while(0)
+#else
+#define TRACE(x...)	do{}while(0)
+#define WARN(x...)	do{}while(0)
+#define ERROR(x...)	do{fprintf(stderr, x); fprintf(stderr, "\n");}while(0)
+#endif
+
+#endif
+
+
+
+#endif
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/lufs/symlink.c linux-2.4.20-wolk4.16-fullkernel/fs/lufs/symlink.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/lufs/symlink.c	2004-06-29 11:25:46.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/lufs/symlink.c	2004-09-05 16:01:02.000000000 +0200
@@ -179,7 +179,3 @@ struct inode_operations lu_symlink_inode
     setattr:		lufs_notify_change,
 };
 
-
-
-
-
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/namei.c linux-2.4.20-wolk4.16-fullkernel/fs/namei.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/namei.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/namei.c	2004-09-05 17:09:43.000000000 +0200
@@ -1130,9 +1130,12 @@ static inline int check_sticky(struct in
 static inline int may_delete(struct inode *dir,struct dentry *victim, int isdir)
 {
 	int error;
-	if (!victim->d_inode || victim->d_parent->d_inode != dir)
+
+	if (!victim->d_inode)
 		return -ENOENT;
 
+	BUG_ON(victim->d_parent->d_inode != dir);
+
         #ifdef CONFIG_RSBAC_ALLOW_DAC_DISABLE_PART
         if(rsbac_dac_part_disabled(victim))
           error = 0;
@@ -1331,9 +1334,7 @@ int open_namei(const char * pathname, in
 		if (error)
 			return error;
 
-		if (gr_acl_is_enabled() && nd->dentry->d_inode && 
-		    S_ISBLK(nd->dentry->d_inode->i_mode) &&
-	    	    !capable(CAP_SYS_RAWIO)) {
+		if (gr_handle_rawio(nd->dentry->d_inode)) {
 			error = -EPERM;
 			goto exit;
 		}
@@ -1385,7 +1386,7 @@ do_last:
 			up(&dir->d_inode->i_sem);
 			goto exit_dput;
 		}
-		if (!gr_acl_handle_creat(dentry, nd->dentry, nd->mnt, flag)) {
+		if (!gr_acl_handle_creat(dentry, nd->dentry, nd->mnt, flag, mode)) {
 			error = -EACCES;
 			up(&dir->d_inode->i_sem);
 			goto exit_dput;
@@ -1416,8 +1417,7 @@ do_last:
 	 * It already exists.
 	 */
 
-	if (gr_acl_is_enabled() && S_ISBLK(dentry->d_inode->i_mode) &&
-	    !capable(CAP_SYS_RAWIO)) {
+	if (gr_handle_rawio(dentry->d_inode)) {
 		error = -EPERM;
 		up(&dir->d_inode->i_sem);
 		goto exit_dput;
@@ -1871,7 +1871,7 @@ asmlinkage long sys_mknod(const char * f
 			goto out_dput;
 		}
 
-		if (!gr_acl_handle_mknod(dentry, nd.dentry, nd.mnt)) {
+		if (!gr_acl_handle_mknod(dentry, nd.dentry, nd.mnt, mode)) {
 			error = -EACCES;
 			dput(dentry);
 			goto out_dput;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/nfs/inode.c linux-2.4.20-wolk4.16-fullkernel/fs/nfs/inode.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/nfs/inode.c	2004-06-29 11:23:06.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/nfs/inode.c	2004-09-05 15:45:54.000000000 +0200
@@ -695,7 +695,7 @@ nfs_zap_caches(struct inode *inode)
 	NFS_ATTRTIMEO(inode) = NFS_MINATTRTIMEO(inode);
 	NFS_ATTRTIMEO_UPDATE(inode) = jiffies;
 
-	invalidate_inode_pages(inode);
+	invalidate_inode_pages2(inode->i_mapping);
 
 	memset(NFS_COOKIEVERF(inode), 0, sizeof(NFS_COOKIEVERF(inode)));
 	NFS_CACHEINV(inode);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/nfsd/nfs3xdr.c linux-2.4.20-wolk4.16-fullkernel/fs/nfsd/nfs3xdr.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/nfsd/nfs3xdr.c	2004-06-29 11:23:03.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/nfsd/nfs3xdr.c	2004-09-05 15:45:54.000000000 +0200
@@ -295,7 +295,7 @@ xdr_argsize_check(struct svc_rqst *rqstp
 {
 	struct svc_buf	*buf = &rqstp->rq_argbuf;
 
-	return p - buf->base <= buf->buflen;
+	return p >= buf->base && p <= buf->base + buf->buflen ;
 }
 
 static inline int
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/nfsd/vfs.c linux-2.4.20-wolk4.16-fullkernel/fs/nfsd/vfs.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/nfsd/vfs.c	2004-06-29 11:25:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/nfsd/vfs.c	2004-09-05 15:55:04.000000000 +0200
@@ -587,6 +587,22 @@ found:
 	return ra;
 }
 
+/* copied from fs/read_write.c */
+static inline loff_t llseek(struct file *file, loff_t offset, int origin)
+{
+	loff_t (*fn)(struct file *, loff_t, int);
+	loff_t retval;
+
+	fn = default_llseek;
+	if (file->f_op && file->f_op->llseek)
+		fn = file->f_op->llseek;
+	lock_kernel();
+	retval = fn(file, offset, origin);
+	unlock_kernel();
+	return retval;
+}
+
+
 /*
  * Read data from a file. count must contain the requested read count
  * on entry. On return, *count contains the number of bytes actually read.
@@ -622,7 +638,7 @@ nfsd_read(struct svc_rqst *rqstp, struct
 		file.f_ralen = ra->p_ralen;
 		file.f_rawin = ra->p_rawin;
 	}
-	file.f_pos = offset;
+	llseek(&file, offset, 0);
 
 	oldfs = get_fs(); set_fs(KERNEL_DS);
 	err = file.f_op->read(&file, buf, *count, &file.f_pos);
@@ -707,7 +723,8 @@ nfsd_write(struct svc_rqst *rqstp, struc
 	if (stable && !EX_WGATHER(exp))
 		file.f_flags |= O_SYNC;
 
-	file.f_pos = offset;		/* set write offset */
+
+	llseek(&file, offset, 0);
 
 	/* Write the data. */
 	oldfs = get_fs(); set_fs(KERNEL_DS);
@@ -1400,10 +1417,12 @@ nfsd_readdir(struct svc_rqst *rqstp, str
 	err = nfsd_open(rqstp, fhp, S_IFDIR, MAY_READ, &file);
 	if (err)
 		goto out;
-	if (offset > ~(u32) 0)
-		goto out_close;
 
-	file.f_pos = offset;
+	offset = llseek(&file, offset, 0);
+	if (offset < 0) {
+		err = nfserrno((int)offset);
+		goto out_close;
+	}
 
 	/* Set up the readdir context */
 	memset(&cd, 0, sizeof(cd));
@@ -1431,11 +1450,13 @@ nfsd_readdir(struct svc_rqst *rqstp, str
 	/* If we didn't fill the buffer completely, we're at EOF */
 	eof = !cd.eob;
 
+
+	offset = llseek(&file, 0LL, 1);
 	if (cd.offset) {
 		if (rqstp->rq_vers == 3)
-			(void)xdr_encode_hyper(cd.offset, file.f_pos);
+			(void)xdr_encode_hyper(cd.offset, offset);
 		else
-			*cd.offset = htonl(file.f_pos);
+			*cd.offset = htonl(offset);
 	}
 
 	p = cd.buffer;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/ntfs/ChangeLog linux-2.4.20-wolk4.16-fullkernel/fs/ntfs/ChangeLog
--- linux-2.4.20-wolk4.15-fullkernel/fs/ntfs/ChangeLog	2004-06-29 11:24:12.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/ntfs/ChangeLog	2004-09-05 15:47:37.000000000 +0200
@@ -1,6 +1,6 @@
 ToDo:
 	- Find and fix bugs.
-	- Enable NFS exporting of NTFS.
+	- Enable NFS exporting of NTFS (done on 2.6 and not planned on 2.4).
 	- Implement aops->set_page_dirty() in order to take control of buffer
 	  dirtying. Not having it means if page_has_buffers(), all buffers
 	  will be dirtied with the page. And if not they won't be. That is
@@ -20,6 +20,25 @@ ToDo:
 	  sufficient for synchronisation here. We then just need to make sure
 	  ntfs_readpage/writepage/truncate interoperate properly with us.
 
+2.1.6b - Documentation update.
+
+	- Update kernel help documentation on NTFS write support.
+
+2.1.6a - Fix minor bug in handling of compressed directories.
+
+	- Fix bug in handling of compressed directories.  A compressed
+	  directory is not really compressed so when we set the ->i_blocks
+	  field of a compressed directory inode we were setting it from the
+	  non-existing field ni->itype.compressed.size which gave random
+	  results...  For directories we now always use ni->allocated_size.
+
+2.1.5a - Fix minor bug in attribute list attribute handling.
+
+	- Fix bug in attribute list handling.  Actually it is not as much a bug
+	  as too much protection in that we were not allowing attribute lists
+	  which waste space on disk while Windows XP clearly allows it and in
+	  fact creates such attribute lists so our driver was failing.
+
 2.1.4a - Reduce compiler requirements.
 
 	- Remove all uses of unnamed structs and unions in the driver to make
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/ntfs/Makefile linux-2.4.20-wolk4.16-fullkernel/fs/ntfs/Makefile
--- linux-2.4.20-wolk4.15-fullkernel/fs/ntfs/Makefile	2004-06-29 11:24:12.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/ntfs/Makefile	2004-09-05 15:47:37.000000000 +0200
@@ -7,7 +7,7 @@ obj-y   := aops.o attrib.o compress.o de
 
 obj-m   := $(O_TARGET)
 
-EXTRA_CFLAGS = -DNTFS_VERSION=\"2.1.4a\"
+EXTRA_CFLAGS = -DNTFS_VERSION=\"2.1.6b\"
 
 ifeq ($(CONFIG_NTFS_DEBUG),y)
 EXTRA_CFLAGS += -DDEBUG
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/ntfs/attrib.c linux-2.4.20-wolk4.16-fullkernel/fs/ntfs/attrib.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/ntfs/attrib.c	2004-06-29 11:24:12.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/ntfs/attrib.c	2004-09-05 15:47:37.000000000 +0200
@@ -830,7 +830,7 @@ run_list_element *decompress_mapping_pai
 				goto io_error;
 			for (deltaxcn = (s8)buf[b--]; b > b2; b--)
 				deltaxcn = (deltaxcn << 8) + buf[b];
-			/* Change the current lcn to it's new value. */
+			/* Change the current lcn to its new value. */
 			lcn += deltaxcn;
 #ifdef DEBUG
 			/*
@@ -1214,7 +1214,7 @@ BOOL find_attr(const ATTR_TYPES type, co
  * load_attribute_list - load an attribute list into memory
  * @vol:		ntfs volume from which to read
  * @run_list:		run list of the attribute list
- * @al:			destination buffer
+ * @al_start:		destination buffer
  * @size:		size of the destination buffer in bytes
  * @initialized_size:	initialized size of the attribute list
  *
@@ -1226,10 +1226,11 @@ BOOL find_attr(const ATTR_TYPES type, co
  *
  * Return 0 on success or -errno on error.
  */
-int load_attribute_list(ntfs_volume *vol, run_list *run_list, u8 *al,
+int load_attribute_list(ntfs_volume *vol, run_list *run_list, u8 *al_start,
 		const s64 size, const s64 initialized_size)
 {
 	LCN lcn;
+	u8 *al = al_start;
 	u8 *al_end = al + initialized_size;
 	run_list_element *rl;
 	struct buffer_head *bh;
@@ -1283,32 +1284,28 @@ int load_attribute_list(ntfs_volume *vol
 	}
 	if (initialized_size < size) {
 initialize:
-		memset(al + initialized_size, 0, size - initialized_size);
+		memset(al_start + initialized_size, 0, size - initialized_size);
 	}
 done:
 	up_read(&run_list->lock);
 	return err;
 do_final:
 	if (al < al_end) {
-		/* Partial block. */
-		memcpy(al, bh->b_data, al_end - al);
-		brelse(bh);
 		/*
-		 * Skip sanity checking if initialized_size < size as it is
-		 * too much trouble.
+		 * Partial block.
+		 *
+		 * Note: The attribute list can be smaller than its allocation
+		 * by multiple clusters.  This has been encountered by at least
+		 * two people running Windows XP, thus we cannot do any
+		 * truncation sanity checking here. (AIA)
 		 */
+		memcpy(al, bh->b_data, al_end - al);
+		brelse(bh);
 		if (initialized_size < size)
 			goto initialize;
-		/* If the final lcn is partial all is fine. */
-		if (((s64)(block - (lcn << vol->cluster_size_bits >>
-				block_size_bits)) << block_size_bits >>
-				vol->cluster_size_bits) == rl->length - 1) {
-			if (!rl[1].length || (rl[1].lcn == LCN_RL_NOT_MAPPED
-					&& !rl[2].length))
-				goto done;
-		}
-	} else
-		brelse(bh);
+		goto done;
+	}
+	brelse(bh);
 	/* Real overflow! */
 	ntfs_error(sb, "Attribute list buffer overflow. Read attribute list "
 			"is truncated.");
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/ntfs/attrib.h linux-2.4.20-wolk4.16-fullkernel/fs/ntfs/attrib.h
--- linux-2.4.20-wolk4.15-fullkernel/fs/ntfs/attrib.h	2004-06-29 11:24:12.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/ntfs/attrib.h	2004-09-05 15:47:37.000000000 +0200
@@ -87,7 +87,7 @@ BOOL lookup_attr(const ATTR_TYPES type, 
 		const IGNORE_CASE_BOOL ic, const VCN lowest_vcn, const u8 *val,
 		const u32 val_len, attr_search_context *ctx);
 
-extern int load_attribute_list(ntfs_volume *vol, run_list *rl, u8 *al,
+extern int load_attribute_list(ntfs_volume *vol, run_list *rl, u8 *al_start,
 		const s64 size, const s64 initialized_size);
 
 static inline s64 attribute_value_length(const ATTR_RECORD *a)
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/ntfs/inode.c linux-2.4.20-wolk4.16-fullkernel/fs/ntfs/inode.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/ntfs/inode.c	2004-06-29 11:24:12.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/ntfs/inode.c	2004-09-05 15:47:37.000000000 +0200
@@ -1,7 +1,7 @@
 /**
  * inode.c - NTFS kernel inode handling. Part of the Linux-NTFS project.
  *
- * Copyright (c) 2001-2003 Anton Altaparmakov
+ * Copyright (c) 2001-2004 Anton Altaparmakov
  *
  * This program/include file is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as published
@@ -1005,7 +1005,7 @@ no_data_attr_special_case:
 	 * sizes of all non-resident attributes present to give us the Linux
 	 * correct size that should go into i_blocks (after division by 512).
 	 */
-	if (!NInoCompressed(ni))
+	if (S_ISDIR(vi->i_mode) || !NInoCompressed(ni))
 		vi->i_blocks = ni->allocated_size >> 9;
 	else
 		vi->i_blocks = ni->itype.compressed.size >> 9;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/ntfs/layout.h linux-2.4.20-wolk4.16-fullkernel/fs/ntfs/layout.h
--- linux-2.4.20-wolk4.15-fullkernel/fs/ntfs/layout.h	2004-06-29 11:24:12.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/ntfs/layout.h	2004-09-05 15:47:37.000000000 +0200
@@ -42,8 +42,8 @@
 #define const_cpu_to_le32(x)	__constant_cpu_to_le32(x)
 #define const_cpu_to_le64(x)	__constant_cpu_to_le64(x)
 
-/* The NTFS oem_id */
-#define magicNTFS	const_cpu_to_le64(0x202020205346544e) /* "NTFS    " */
+/* The NTFS oem_id "NTFS    "*/
+#define magicNTFS	const_cpu_to_le64(0x202020205346544eULL)
 
 /*
  * Location of bootsector on partition:
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/ntfs/types.h linux-2.4.20-wolk4.16-fullkernel/fs/ntfs/types.h
--- linux-2.4.20-wolk4.15-fullkernel/fs/ntfs/types.h	2004-06-29 11:24:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/ntfs/types.h	2004-09-05 15:47:37.000000000 +0200
@@ -23,7 +23,7 @@
 #ifndef _LINUX_NTFS_TYPES_H
 #define _LINUX_NTFS_TYPES_H
 
-#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 96) || __GNUC__ == 3
+#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
 #define SN(X)   X	/* Struct Name */
 #define SC(P,N) P.N	/* ShortCut: Prefix, Name */
 #else
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/open.c linux-2.4.20-wolk4.16-fullkernel/fs/open.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/open.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/open.c	2004-09-05 17:09:43.000000000 +0200
@@ -726,7 +726,7 @@ asmlinkage long sys_fchmod(unsigned int 
 	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
 		goto out_putf;
 
-	if (!gr_acl_handle_fchmod(dentry, file->f_vfsmnt)) {
+	if (!gr_acl_handle_fchmod(dentry, file->f_vfsmnt, mode)) {
 		err = -EACCES;
 		goto out_putf;
 	}
@@ -776,7 +776,7 @@ asmlinkage long sys_chmod(const char * f
 	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
 		goto dput_and_out;
 
-	if (!gr_acl_handle_chmod(nd.dentry, nd.mnt)) {
+	if (!gr_acl_handle_chmod(nd.dentry, nd.mnt, mode)) {
 		error = -EACCES;
 		goto dput_and_out;
 	}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/openpromfs/inode.c linux-2.4.20-wolk4.16-fullkernel/fs/openpromfs/inode.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/openpromfs/inode.c	2001-12-21 18:42:03.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/fs/openpromfs/inode.c	2004-09-05 16:06:00.000000000 +0200
@@ -69,17 +69,18 @@ static ssize_t nodenum_read(struct file 
 			    size_t count, loff_t *ppos)
 {
 	struct inode *inode = file->f_dentry->d_inode;
+	loff_t pos = *ppos;
 	char buffer[10];
 	
 	if (count < 0 || !inode->u.generic_ip)
 		return -EINVAL;
 	sprintf (buffer, "%8.8x\n", (u32)(long)(inode->u.generic_ip));
-	if (file->f_pos >= 9)
+	if (pos != (unsigned)pos || pos >= 9)
 		return 0;
-	if (count > 9 - file->f_pos)
-		count = 9 - file->f_pos;
-	copy_to_user(buf, buffer + file->f_pos, count);
-	file->f_pos += count;
+	if (count > 9 - pos)
+		count = 9 - pos;
+	copy_to_user(buf, buffer + pos, count);
+	*ppos = pos + count;
 	return count;
 }
 
@@ -87,6 +88,7 @@ static ssize_t property_read(struct file
 			     size_t count, loff_t *ppos)
 {
 	struct inode *inode = filp->f_dentry->d_inode;
+	loff_t pos = *ppos;
 	int i, j, k;
 	u32 node;
 	char *p, *s;
@@ -94,7 +96,7 @@ static ssize_t property_read(struct file
 	openprom_property *op;
 	char buffer[64];
 	
-	if (filp->f_pos >= 0xffffff)
+	if (pos < 0 || pos >= 0xffffff)
 		return -EINVAL;
 	if (!filp->private_data) {
 		node = nodes[(u16)((long)inode->u.generic_ip)].node;
@@ -180,7 +182,7 @@ static ssize_t property_read(struct file
 	} else {
 		i = (op->len << 1) + 1;
 	}
-	k = filp->f_pos;
+	k = pos;
 	if (k >= i) return 0;
 	if (count > i - k) count = i - k;
 	if (op->flag & OPP_STRING) {
@@ -196,16 +198,16 @@ static ssize_t property_read(struct file
 			j = count;
 
 		if (j >= 0) {
-			copy_to_user(buf + k - filp->f_pos,
+			copy_to_user(buf + k - pos,
 				     op->value + k - 1, j);
 			count -= j;
 			k += j;
 		}
 
 		if (count)
-			__put_user('\'', &buf [k++ - filp->f_pos]);
+			__put_user('\'', &buf [k++ - pos]);
 		if (count > 1)
-			__put_user('\n', &buf [k++ - filp->f_pos]);
+			__put_user('\n', &buf [k++ - pos]);
 
 	} else if (op->flag & OPP_STRINGLIST) {
 		char *tmp;
@@ -273,47 +275,48 @@ static ssize_t property_read(struct file
 
 		if ((k < i - 1) && (k & 1)) {
 			sprintf (buffer, "%02x", *(op->value + (k >> 1)));
-			__put_user(buffer[1], &buf[k++ - filp->f_pos]);
+			__put_user(buffer[1], &buf[k++ - pos]);
 			count--;
 		}
 
 		for (; (count > 1) && (k < i - 1); k += 2) {
 			sprintf (buffer, "%02x", *(op->value + (k >> 1)));
-			copy_to_user (buf + k - filp->f_pos, buffer, 2);
+			copy_to_user (buf + k - pos, buffer, 2);
 			count -= 2;
 		}
 
 		if (count && (k < i - 1)) {
 			sprintf (buffer, "%02x", *(op->value + (k >> 1)));
-			__put_user(buffer[0], &buf[k++ - filp->f_pos]);
+			__put_user(buffer[0], &buf[k++ - pos]);
 			count--;
 		}
 
 		if (count)
-			__put_user('\n', &buf [k++ - filp->f_pos]);
+			__put_user('\n', &buf [k++ - pos]);
 	}
-	count = k - filp->f_pos;
-	filp->f_pos = k;
+	count = k - pos;
+	*ppos = k;
 	return count;
 }
 
 static ssize_t property_write(struct file *filp, const char *buf,
 			      size_t count, loff_t *ppos)
 {
+	loff_t pos = *ppos;
 	int i, j, k;
 	char *p;
 	u32 *q;
 	void *b;
 	openprom_property *op;
 	
-	if (filp->f_pos >= 0xffffff)
+	if (pos < 0 || pos >= 0xffffff)
 		return -EINVAL;
 	if (!filp->private_data) {
 		i = property_read (filp, NULL, 0, 0);
 		if (i)
 			return i;
 	}
-	k = filp->f_pos;
+	k = pos;
 	op = (openprom_property *)filp->private_data;
 	if (!(op->flag & OPP_STRING)) {
 		u32 *first, *last;
@@ -433,7 +436,8 @@ static ssize_t property_write(struct fil
 				op->len = i;
 		} else
 			op->len = i;
-		filp->f_pos += count;
+		pos += count;
+		*ppos = pos;
 	}
 write_try_string:
 	if (!(op->flag & OPP_BINARY)) {
@@ -450,7 +454,8 @@ write_try_string:
 				op->flag |= OPP_QUOTED;
 				buf++;
 				count--;
-				filp->f_pos++;
+				pos++;
+				*ppos = pos;
 				if (!count) {
 					op->flag |= OPP_STRING;
 					return 1;
@@ -459,9 +464,9 @@ write_try_string:
 				op->flag |= OPP_NOTQUOTED;
 		}
 		op->flag |= OPP_STRING;
-		if (op->alloclen <= count + filp->f_pos) {
+		if (op->alloclen <= count + pos) {
 			b = kmalloc (sizeof (openprom_property)
-				     + 2 * (count + filp->f_pos), GFP_KERNEL);
+				     + 2 * (count + pos), GFP_KERNEL);
 			if (!b)
 				return -ENOMEM;
 			memcpy (b, filp->private_data,
@@ -469,14 +474,14 @@ write_try_string:
 				+ strlen (op->name) + op->alloclen);
 			memset (((char *)b) + sizeof (openprom_property)
 				+ strlen (op->name) + op->alloclen, 
-				0, 2*(count - filp->f_pos) - op->alloclen);
+				0, 2*(count - pos) - op->alloclen);
 			op = (openprom_property *)b;
-			op->alloclen = 2*(count + filp->f_pos);
+			op->alloclen = 2*(count + pos);
 			b = filp->private_data;
 			filp->private_data = (void *)op;
 			kfree (b);
 		}
-		p = op->value + filp->f_pos - ((op->flag & OPP_QUOTED) ? 1 : 0);
+		p = op->value + pos - ((op->flag & OPP_QUOTED) ? 1 : 0);
 		copy_from_user (p, buf, count);
 		op->flag |= OPP_DIRTY;
 		for (i = 0; i < count; i++, p++)
@@ -486,17 +491,19 @@ write_try_string:
 			}
 		if (i < count) {
 			op->len = p - op->value;
-			filp->f_pos += i + 1;
+			pos += i + 1;
+			*ppos = pos;
 			if ((p > op->value) && (op->flag & OPP_QUOTED)
 			    && (*(p - 1) == '\''))
 				op->len--;
 		} else {
 			if (p - op->value > op->len)
 				op->len = p - op->value;
-			filp->f_pos += count;
+			pos += count;
+			*ppos = pos;
 		}
 	}
-	return filp->f_pos - k;
+	return pos - k;
 }
 
 int property_release (struct inode *inode, struct file *filp)
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/partitions/msdos.c linux-2.4.20-wolk4.16-fullkernel/fs/partitions/msdos.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/partitions/msdos.c	2002-11-29 00:53:15.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/fs/partitions/msdos.c	2004-09-05 16:06:02.000000000 +0200
@@ -71,6 +71,12 @@ static inline int is_extended_partition(
 		SYS_IND(p) == LINUX_EXTENDED_PARTITION);
 }
 
+static inline int is_overflow(unsigned int u, unsigned int v)
+{
+	unsigned int s = u + v;
+	return (s < u);
+}
+
 /*
  * msdos_partition_name() formats the short partition name into the supplied
  * buffer, and returns a pointer to that buffer.
@@ -553,7 +559,7 @@ reread:
 int msdos_partition(struct gendisk *hd, struct block_device *bdev,
 		    unsigned long first_sector, int first_part_minor)
 {
-	int i, minor = first_part_minor;
+	int i, j, minor = first_part_minor;
 	Sector sect;
 	struct partition *p;
 	unsigned char *data;
@@ -575,6 +581,46 @@ int msdos_partition(struct gendisk *hd, 
 	p = (struct partition *) (data + 0x1be);
 
 	/*
+	 * Consistency checks to the partition table:
+	 * <http://www.win.tue.nl/~aeb/partitions/partition_tables-2.html>
+	 *
+	 * No two non-extended partitions overlap. Don't assume
+	 * partitions are ordered towards increasing start sector.
+	 */
+
+	/* Note: START_SECT() & NR_SECTS() return unsigned quantities */
+	err = 0;
+	for (i = 0; !err && i < 4; i++) {
+		struct partition *p1 = &p[i];
+		unsigned int p1_sstart = START_SECT(p1);
+		unsigned int p1_scount = NR_SECTS(p1);
+		if (p1_scount == 0 || is_extended_partition(p1))
+			continue;
+		if (is_overflow(p1_sstart, p1_scount))
+			err = 1;
+		for (j = i + 1; !err && j < 4; j++) {
+			struct partition *p2 = &p[j];
+			unsigned int p2_sstart = START_SECT(p2);
+			unsigned int p2_scount = NR_SECTS(p2);
+			if (p2_scount == 0 || is_extended_partition(p2))
+				continue;
+			if (is_overflow(p2_sstart, p2_scount))
+				err = 1;
+			/* partitions overlap? */
+			else if ((p2_sstart - p1_sstart) < p1_scount)
+				err = 2;
+			else if ((p1_sstart - p2_sstart) < p2_scount)
+				err = 2;
+		}
+	}
+	if (err && !msdos_magic_present(data + 0xfc)) {
+		printk(" inconsistent partition table (%s)\n",
+			   (err == 1 ? "overflow" : (err == 2 ? "overlap" : "unknown")));
+		put_dev_sector(sect);
+		return 1; /* valid partition type but invalid partition table */
+	}
+
+	/*
 	 * Look for partitions in two passes:
 	 * First find the primary and DOS-type extended partitions.
 	 * On the second pass look inside *BSD, Unixware and Solaris partitions.
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/proc/Makefile linux-2.4.20-wolk4.16-fullkernel/fs/proc/Makefile
--- linux-2.4.20-wolk4.15-fullkernel/fs/proc/Makefile	2004-06-29 11:25:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/proc/Makefile	2004-09-05 16:09:22.000000000 +0200
@@ -19,7 +19,27 @@ obj-y += proc_devtree.o
 endif
 
 ifeq ($(CONFIG_TRUSTEES),y)
-obj-y +=  trustee.o
+obj-y += trustee.o
 endif
 
+obj-$(CONFIG_PROC_CONFIG) += kconfig.o
+
 include $(TOPDIR)/Rules.make
+
+CONFGEN_FLAGS := -a kconfig_data -q 'static const'
+
+ifeq ($(CONFIG_PROC_CONFIG_GZ),y)
+  CONFGEN_FLAGS += -z gzip
+else
+  ifeq ($(CONFIG_PROC_CONFIG_BZ2),y)
+    CONFGEN_FLAGS += -z bzip2
+  endif
+endif
+
+kconfig.o: confdata.h
+
+confdata.h: $(TOPDIR)/.config $(TOPDIR)/scripts/carray
+	$(TOPDIR)/scripts/carray $(CONFGEN_FLAGS) -o $@ < $(TOPDIR)/.config
+
+$(TOPDIR)/scripts/carray: $(TOPDIR)/scripts/carray.c
+	$(HOSTCC) $(HOSTCFLAGS) -o $@ $<
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/proc/array.c linux-2.4.20-wolk4.16-fullkernel/fs/proc/array.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/proc/array.c	2004-06-29 11:31:07.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/proc/array.c	2004-09-05 16:05:41.000000000 +0200
@@ -161,12 +161,11 @@ static inline char * task_state(struct t
 		"PPid:\t%d\n"
 		"TracerPid:\t%d\n"
 		"Uid:\t%d\t%d\t%d\t%d\n"
-		"Gid:\t%d\t%d\t%d\t%d\n"
-		"TGid:\t%d\n",
+		"Gid:\t%d\t%d\t%d\t%d\n",
 		get_task_state(p), p->tgid,
 		p->pid, p->pid ? p->p_opptr->pid : 0, 0,
 		p->uid, p->euid, p->suid, p->fsuid,
-		p->gid, p->egid, p->sgid, p->fsgid, p->tgid);
+		p->gid, p->egid, p->sgid, p->fsgid);
 	read_unlock(&tasklist_lock);	
 	task_lock(p);
 	buffer += sprintf(buffer,
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/proc/base.c linux-2.4.20-wolk4.16-fullkernel/fs/proc/base.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/proc/base.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/proc/base.c	2004-09-05 17:09:43.000000000 +0200
@@ -248,7 +248,8 @@ static int proc_root_link(struct inode *
 #define MAY_PTRACE(task) \
 	(task == current || \
 	(task->p_pptr == current && \
-	(task->ptrace & PT_PTRACED) && task->state == TASK_STOPPED))
+	(task->ptrace & PT_PTRACED) && task->state == TASK_STOPPED && \
+	!gr_handle_proc_ptrace(task)))
 
 static int may_ptrace_attach(struct task_struct *task)
 {
@@ -267,6 +268,8 @@ static int may_ptrace_attach(struct task
 	rmb();
 	if (!is_dumpable(task) && !capable(CAP_SYS_PTRACE))
 		goto out;
+	if (gr_handle_proc_ptrace(task))
+		goto out;
 
 	retval = 1;
 
@@ -549,6 +552,7 @@ static ssize_t proc_info_read(struct fil
 	ssize_t length;
 	ssize_t end;
 	struct task_struct *task = inode->u.proc_i.task;
+	loff_t pos = *ppos;
 
 	if (count > PROC_BLOCK_SIZE)
 		count = PROC_BLOCK_SIZE;
@@ -562,14 +566,14 @@ static ssize_t proc_info_read(struct fil
 		return length;
 	}
 	/* Static 4kB (or whatever) block capacity */
-	if (*ppos >= length) {
+	if (pos < 0 || pos >= length) {
 		free_page(page);
 		return 0;
 	}
-	if (count + *ppos > length)
-		count = length - *ppos;
-	end = count + *ppos;
-	if (copy_to_user(buf, (char *) page + *ppos, count))
+	if (count > length - pos)
+		count = length - pos;
+	end = count + pos;
+	if (copy_to_user(buf, (char *) page + pos, count))
 		count = -EFAULT;
 	else
 		*ppos = end;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/proc/generic.c linux-2.4.20-wolk4.16-fullkernel/fs/proc/generic.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/proc/generic.c	2004-06-29 11:30:54.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/proc/generic.c	2004-09-05 16:06:00.000000000 +0200
@@ -57,6 +57,7 @@ proc_file_read(struct file * file, char 
 	ssize_t	n, count;
 	char	*start;
 	struct proc_dir_entry * dp;
+	loff_t pos = *ppos;
 
 	dp = (struct proc_dir_entry *) inode->u.generic_ip;
 
@@ -69,6 +70,8 @@ proc_file_read(struct file * file, char 
 	while ((nbytes > 0) && !eof)
 	{
 		count = MIN(PROC_BLOCK_SIZE, nbytes);
+		if ((unsigned)pos > INT_MAX)
+			break;
 
 		start = NULL;
 		if (dp->get_info) {
@@ -76,11 +79,11 @@ proc_file_read(struct file * file, char 
 			 * Handle backwards compatibility with the old net
 			 * routines.
 			 */
-			n = dp->get_info(page, &start, *ppos, count);
+			n = dp->get_info(page, &start, pos, count);
 			if (n < count)
 				eof = 1;
 		} else if (dp->read_proc) {
-			n = dp->read_proc(page, &start, *ppos,
+			n = dp->read_proc(page, &start, pos,
 					  count, &eof, dp->data);
 		} else
 			break;
@@ -89,8 +92,8 @@ proc_file_read(struct file * file, char 
 			/*
 			 * For proc files that are less than 4k
 			 */
-			start = page + *ppos;
-			n -= *ppos;
+			start = page + pos;
+			n -= pos;
 			if (n <= 0)
 				break;
 			if (n > count)
@@ -118,12 +121,13 @@ proc_file_read(struct file * file, char 
 			break;
 		}
 
-		*ppos += start < page ? (long)start : n; /* Move down the file */
+		pos += start < page ? (long)start : n; /* Move down the file */
 		nbytes -= n;
 		buf += n;
 		retval += n;
 	}
 	vfree(page);
+	*ppos = pos;
 	return retval;
 }
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/proc/kconfig.c linux-2.4.20-wolk4.16-fullkernel/fs/proc/kconfig.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/proc/kconfig.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/fs/proc/kconfig.c	2004-09-05 16:09:22.000000000 +0200
@@ -0,0 +1,118 @@
+/*
+ * kconfig.c - provide (compressed) kernel config via /proc/config.gz
+ *
+ * Copyright (c) 2001 Andreas Ferber <af@devcon.net>
+ *
+ * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/version.h>
+#include <linux/string.h>
+#include <linux/kernel.h>
+#include <linux/proc_fs.h>
+#include <linux/init.h>
+
+#ifndef CONFIG_PROC_FS
+#error /proc filesystem not enabled
+#endif
+
+#include "confdata.h"
+
+#ifdef CONFIG_PROC_CONFIG_GZ
+# define KCONF_PROCNAME "config.gz"
+#else
+# ifdef CONFIG_PROC_CONFIG_BZ2
+#  define KCONF_PROCNAME "config.bz2"
+# else
+#  define KCONF_PROCNAME "config"
+# endif
+#endif
+
+static struct proc_dir_entry *proc_kconfig;
+
+#if 0
+#define DEBUGP(format, args...) printk(KERN_DEBUG format, ## args)
+#else
+#define DEBUGP(format, args...)	/* empty */
+#endif
+
+static int
+proc_kconfig_read(char *buf, char **start, off_t offset,
+		  int len, int *eof, void *unused)
+{
+	DEBUGP("proc_kconfig_read: offset = %i, len = %i\n", offset, len);
+
+	if (offset + len > sizeof(kconfig_data)) {
+		len = sizeof(kconfig_data) - offset;
+		*eof = 1;
+		DEBUGP
+		    ("proc_kconfig_read: eof reached (returning len = %i)\n",
+		     len);
+	}
+
+	memcpy(buf, kconfig_data + offset, len);
+	*start = buf;
+	return len;
+}
+
+static int __init kconfig_init(void)
+{
+	DEBUGP("kconfig: init module\n");
+
+#ifdef CONFIG_GRKERNSEC_PROC_ADD
+#ifdef CONFIG_GRKERNSEC_PROC_USER
+	proc_kconfig = create_proc_entry(KCONF_PROCNAME, S_IRUSR, NULL);
+#elif CONFIG_GRKERNSEC_PROC_USERGROUP
+	proc_kconfig = create_proc_entry(KCONF_PROCNAME, S_IRUSR | S_IRGRP, NULL);
+#endif
+#else
+	proc_kconfig = create_proc_entry(KCONF_PROCNAME, 0, NULL);
+#endif
+
+	if (proc_kconfig == NULL) {
+		printk(KERN_ERR "kconfig: unable to register /proc/"
+		       KCONF_PROCNAME "\n");
+		return -1;
+	}
+
+	proc_kconfig->size = sizeof(kconfig_data);
+	proc_kconfig->read_proc = proc_kconfig_read;
+
+	return 0;
+}
+
+/* for 2.2.x compatibility */
+#if LINUX_KERNEL_VERSION < KERNEL_VERSION(2,3,0)
+#define __exit			/* empty */
+#endif
+
+static void __exit kconfig_exit(void)
+{
+	DEBUGP("kconfig: removing module\n");
+
+	remove_proc_entry(KCONF_PROCNAME, NULL);
+}
+
+module_init(kconfig_init);
+module_exit(kconfig_exit);
+
+MODULE_AUTHOR("Andreas Ferber");
+MODULE_DESCRIPTION
+    ("Provides /proc/config.gz with the (compressed) kernel config");
+
+/*
+ * vi:ts=8 sw=8 expandtab
+ */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/proc/kcore.c linux-2.4.20-wolk4.16-fullkernel/fs/proc/kcore.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/proc/kcore.c	2004-06-29 11:26:14.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/proc/kcore.c	2004-09-05 16:06:00.000000000 +0200
@@ -125,8 +125,9 @@ static ssize_t read_kcore(struct file *f
 		if (copy_to_user(buf, (void *) (PAGE_OFFSET+p-PAGE_SIZE), count))
 			return -EFAULT;
 		read += count;
+		p += count;
 	}
-	*ppos += read;
+	*ppos = p;
 	return read;
 }
 #else /* CONFIG_KCORE_AOUT */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/proc/proc_misc.c linux-2.4.20-wolk4.16-fullkernel/fs/proc/proc_misc.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/proc/proc_misc.c	2004-06-29 11:31:51.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/proc/proc_misc.c	2004-09-05 16:09:18.000000000 +0200
@@ -396,23 +396,6 @@ static struct file_operations proc_parti
 	release:	seq_release,
 };
 
-#ifdef CONFIG_PROC_CONFIG
-static int config_read_proc(char *page, char **start, off_t off,
-                                 int count, int *eof, void *data)
-{
-	extern char *kernel_config_data;
-	extern int kernel_config_data_size;
-	int len = kernel_config_data_size;
-	if (len <= off+count) *eof = 1;
-	*start = page;
-	len -= off;
-	if (len>count) len = count;
-	if (len<0) len = 0;
-	memcpy(page,kernel_config_data+off,len);
-	return len;
-}
-#endif
-
 #ifdef CONFIG_MODULES
 extern struct seq_operations modules_op;
 static int modules_open(struct inode *inode, struct file *file)
@@ -959,12 +942,13 @@ static int memory_read_proc(char *page, 
 static ssize_t read_profile(struct file *file, char *buf,
 			    size_t count, loff_t *ppos)
 {
-	unsigned long p = *ppos;
+	loff_t n = *ppos;
+	unsigned p = n;
 	ssize_t read;
 	char * pnt;
 	unsigned int sample_step = 1 << prof_shift;
 
-	if (p >= (prof_len+1)*sizeof(unsigned int))
+	if (p != n || p >= (prof_len+1)*sizeof(unsigned int))
 		return 0;
 	if (count > (prof_len+1)*sizeof(unsigned int) - p)
 		count = (prof_len+1)*sizeof(unsigned int) - p;
@@ -978,7 +962,7 @@ static ssize_t read_profile(struct file 
 	if (copy_to_user(buf,(void *)pnt,count))
 		return -EFAULT;
 	read += count;
-	*ppos += read;
+	*ppos = n + read;
 	return read;
 }
 
@@ -1163,13 +1147,4 @@ void __init proc_misc_init(void)
 			entry->proc_fops = &ppc_htab_operations;
 	}
 #endif
-
-#ifdef CONFIG_PROC_CONFIG
-	{
-		extern int kernel_config_data_size;
-		entry = create_proc_read_entry("config.gz", S_IRUSR, NULL, config_read_proc, NULL);
-		if (entry)
-			entry->size = kernel_config_data_size;
-	}
-#endif
 }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/ramfs/inode.c linux-2.4.20-wolk4.16-fullkernel/fs/ramfs/inode.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/ramfs/inode.c	2004-06-29 11:31:19.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/ramfs/inode.c	2004-09-05 16:09:14.000000000 +0200
@@ -271,80 +271,17 @@ static int ramfs_sync_file(struct file *
 	return 0;
 }
 
-static int ramfs_populate(struct vm_area_struct *vma,
-			unsigned long addr,
-			unsigned long len,
-			pgprot_t prot,
-			unsigned long pgoff,
-			int nonblock)
-{
-	struct file *file = vma->vm_file;
-	struct address_space *mapping = file->f_dentry->d_inode->i_mapping;
-	struct inode *inode = mapping->host;
-	unsigned long size;
-	struct mm_struct *mm = vma->vm_mm;
-	struct page *page;
-	int err;
-
-repeat:
-	size = (inode->i_size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
-	if (pgoff + (len >> PAGE_CACHE_SHIFT) > size)
-		return -EINVAL;
-
-	page = find_get_page(mapping, pgoff);
-	if (!page)
-		return -ENOMEM;
-	if (page) {
-		err = install_page(mm, vma, addr, page, prot);
-		if (err) {
-			page_cache_release(page);
-			return err;
-		}
-		/*
-		 * Zap the page from the LRU:
-		 */
-		if (PageLRU(page))
-			lru_cache_del(page);
-	}
-
-	len -= PAGE_SIZE;
-	addr += PAGE_SIZE;
-	pgoff++;
-	if (len)
-		goto repeat;
-
-	return 0;
-}
-
-static struct vm_operations_struct ramfs_vm_ops = {
-	nopage: filemap_nopage,
-	populate: ramfs_populate,
-};
-
 static struct address_space_operations ramfs_aops = {
 	readpage:	ramfs_readpage,
 	writepage:	fail_writepage,
 	prepare_write:	ramfs_prepare_write,
-	commit_write:	ramfs_commit_write,
+	commit_write:	ramfs_commit_write
 };
 
-static int ramfs_mmap(struct file * file, struct vm_area_struct * vma)
-{
-	struct vm_operations_struct * ops;
-	struct inode *inode = file->f_dentry->d_inode;
-
-	ops = &ramfs_vm_ops;
-	if (!inode->i_sb || !S_ISREG(inode->i_mode))
-		return -EACCES;
-	UPDATE_ATIME(inode);
-	vma->vm_ops = ops;
-	return 0;
-}
-
 static struct file_operations ramfs_file_operations = {
 	read:		generic_file_read,
 	write:		generic_file_write,
-	mmap:		ramfs_mmap,
+	mmap:		generic_file_mmap,
 	fsync:		ramfs_sync_file,
 };
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/readdir.c linux-2.4.20-wolk4.16-fullkernel/fs/readdir.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/readdir.c	2004-06-29 11:31:29.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/readdir.c	2004-09-05 16:09:03.000000000 +0200
@@ -312,7 +312,7 @@ static int filldir(void * __buf, const c
 	put_user(reclen, &dirent->d_reclen);
 	copy_to_user(dirent->d_name, name, namlen);
 	put_user(0, dirent->d_name + namlen);
-	((char *) dirent) += reclen;
+	dirent = (void *)dirent + reclen;
 	buf->current_dir = dirent;
 	buf->count -= reclen;
 	return 0;
@@ -403,7 +403,7 @@ static int filldir64(void * __buf, const
 	copy_to_user(dirent, &d, NAME_OFFSET(&d));
 	copy_to_user(dirent->d_name, name, namlen);
 	put_user(0, dirent->d_name + namlen);
-	((char *) dirent) += reclen;
+	dirent = (void *)dirent + reclen;
 	buf->current_dir = dirent;
 	buf->count -= reclen;
 	return 0;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/shfs/shell.c linux-2.4.20-wolk4.16-fullkernel/fs/shfs/shell.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/shfs/shell.c	2004-06-29 11:29:57.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/shfs/shell.c	2004-09-05 16:04:53.000000000 +0200
@@ -213,6 +213,7 @@ parse_dir(char *s, char **col)
 	int c = 0;
 	int is_space = 1;
 	int device = 0;
+	char *start = s;
 
 	while (*s) {
 		if (c == DIR_COLS)
@@ -227,17 +228,20 @@ parse_dir(char *s, char **col)
 						s++;
 				}
 				*s = '\0';
+				start = s+1;
 				is_space = 1;
+			} else {
+				if (c != DIR_NAME)
+					start = s+1;
 			}
 		} else {
 			if (is_space) {
 				/* (b)lock/(c)haracter device hack */
-				col[c++] = s;
+				col[c++] = start;
 				is_space = 0;
 				if ((c-1 == DIR_PERM) && ((*s == 'b')||(*s == 'c'))) {
 					device = 1;
 				}
-
 			}
 		}
 		s++;
@@ -957,11 +961,11 @@ shell_statfs(struct shfs_sb_info *info, 
 
 	s = info->sockbuf;
 	if ((p = strsep(&s, " ")))
-		attr->f_blocks = simple_strtoull(p, NULL, 10);
+		attr->f_blocks = simple_strtoull(p, NULL, 10) >> 2;
 	if ((p = strsep(&s, " ")))
-		attr->f_bfree = attr->f_blocks - simple_strtoull(p, NULL, 10);
+		attr->f_bfree = attr->f_blocks - (simple_strtoull(p, NULL, 10) >> 2);
 	if ((p = strsep(&s, " ")))
-		attr->f_bavail = simple_strtoull(p, NULL, 10);
+		attr->f_bavail = simple_strtoull(p, NULL, 10) >> 2;
 
 	result = sock_readln(info, info->sockbuf, SOCKBUF_SIZE);
 	if (result < 0)
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/udf/file.c linux-2.4.20-wolk4.16-fullkernel/fs/udf/file.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/udf/file.c	2004-06-29 11:24:14.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/udf/file.c	2004-09-05 16:06:00.000000000 +0200
@@ -113,7 +113,8 @@ static ssize_t udf_file_write(struct fil
 {
 	ssize_t retval;
 	struct inode *inode = file->f_dentry->d_inode;
-	int err, pos;
+	int err;
+	loff_t pos;
 
 	if (UDF_I_ALLOCTYPE(inode) == ICBTAG_FLAG_AD_IN_ICB)
 	{
@@ -122,8 +123,11 @@ static ssize_t udf_file_write(struct fil
 		else
 			pos = *ppos;
 
-		if (inode->i_sb->s_blocksize < (udf_file_entry_alloc_offset(inode) +
-			pos + count))
+		if (pos < 0 || pos + count < pos)
+			return 0;
+
+		if (inode->i_sb->s_blocksize - udf_file_entry_alloc_offset(inode) <
+			pos + count)
 		{
 			udf_expand_file_adinicb(inode, pos + count, &err);
 			if (UDF_I_ALLOCTYPE(inode) == ICBTAG_FLAG_AD_IN_ICB)
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/linux-2.4/xfs_aops.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/linux-2.4/xfs_aops.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/linux-2.4/xfs_aops.c	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/linux-2.4/xfs_aops.c	2004-09-05 16:08:48.000000000 +0200
@@ -209,6 +209,7 @@ xfs_map_at_offset(
 	sector_shift = block_bits - BBSHIFT;
 	bn = iomapp->iomap_bn >> sector_shift;
 	bn += delta;
+	BUG_ON(!bn && !(iomapp->iomap_flags & IOMAP_REALTIME));
 	ASSERT((bn << sector_shift) >= iomapp->iomap_bn);
 
 	lock_buffer(bh);
@@ -887,7 +888,7 @@ linvfs_get_block_core(
 
 			bn = iomap.iomap_bn >> (inode->i_blkbits - BBSHIFT);
 			bn += delta;
-
+			BUG_ON(!bn && !(iomap.iomap_flags & IOMAP_REALTIME));
 			bh_result->b_blocknr = bn;
 			set_buffer_mapped(bh_result);
 		}
@@ -911,10 +912,10 @@ linvfs_get_block_core(
 	}
 
 	if (iomap.iomap_flags & IOMAP_DELAY) {
-		if (unlikely(direct))
-			BUG();
+		BUG_ON(direct);
 		if (create) {
 			set_buffer_mapped(bh_result);
+			set_buffer_uptodate(bh_result);
 		}
 		set_buffer_delay(bh_result);
 	}
@@ -934,17 +935,6 @@ linvfs_get_block(
 }
 
 STATIC int
-linvfs_get_block_sync(
-	struct inode		*inode,
-	long			iblock,
-	struct buffer_head	*bh_result,
-	int			create)
-{
-	return linvfs_get_block_core(inode, iblock, bh_result,
-					create, 0, BMAPI_SYNC|BMAPI_WRITE);
-}
-
-STATIC int
 linvfs_get_block_direct(
 	struct inode		*inode,
 	long			iblock,
@@ -1155,13 +1145,7 @@ linvfs_prepare_write(
 	unsigned int		from,
 	unsigned int		to)
 {
-	if (file && (file->f_flags & O_SYNC)) {
-		return block_prepare_write(page, from, to,
-						linvfs_get_block_sync);
-	} else {
-		return block_prepare_write(page, from, to,
-						linvfs_get_block);
-	}
+	return block_prepare_write(page, from, to, linvfs_get_block);
 }
 
 /*
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/linux-2.4/xfs_buf.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/linux-2.4/xfs_buf.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/linux-2.4/xfs_buf.c	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/linux-2.4/xfs_buf.c	2004-09-07 17:39:17.000000000 +0200
@@ -767,11 +767,8 @@ pagebuf_get(				/* allocate a buffer		*/
 	pb = _pagebuf_find(target, ioff, isize, flags, new_pb);
 	if (pb == new_pb) {
 		error = _pagebuf_lookup_pages(pb, flags);
-		if (unlikely(error)) {
-			printk(KERN_WARNING
-			       "pagebuf_get: failed to lookup pages\n");
+		if (error)
 			goto no_buffer;
-		}
 	} else {
 		pagebuf_deallocate(new_pb);
 		if (unlikely(pb == NULL))
@@ -1445,6 +1442,7 @@ xfs_free_buftarg(
 	xfs_flush_buftarg(btp, 1);
 	if (external)
 		xfs_blkdev_put(btp->pbr_bdev);
+	iput(btp->pbr_mapping->host);
 	kmem_free(btp, sizeof(*btp));
 }
 
@@ -1458,7 +1456,7 @@ xfs_incore_relse(
 	truncate_inode_pages(btp->pbr_mapping, 0LL);
 }
 
-void
+int
 xfs_setsize_buftarg(
 	xfs_buftarg_t		*btp,
 	unsigned int		blocksize,
@@ -1472,7 +1470,40 @@ xfs_setsize_buftarg(
 		printk(KERN_WARNING
 			"XFS: Cannot set_blocksize to %u on device 0x%x\n",
 			sectorsize, kdev_t_to_nr(btp->pbr_kdev));
+		return EINVAL;
 	}
+	return 0;
+}
+
+STATIC int
+xfs_mapping_buftarg(
+	xfs_buftarg_t		*btp,
+	struct block_device	*bdev)
+{
+	kdev_t			kdev;
+	struct inode		*inode;
+	struct address_space	*mapping;
+	static struct address_space_operations mapping_aops = {
+		.sync_page = block_sync_page,
+	};
+
+	kdev = to_kdev_t(bdev->bd_dev);
+	inode = new_inode(bdev->bd_inode->i_sb);
+	if (!inode) {
+		printk(KERN_WARNING
+			"XFS: Cannot allocate mapping inode for device %s\n",
+			XFS_BUFTARG_NAME(btp));
+		return ENOMEM;
+	}
+	inode->i_mode = S_IFBLK;
+	inode->i_dev  = kdev;
+	inode->i_rdev = kdev;
+	inode->i_bdev = bdev;
+	mapping = &inode->i_data;
+	mapping->a_ops = &mapping_aops;
+	mapping->gfp_mask = GFP_KERNEL;
+	btp->pbr_mapping = mapping;
+	return 0;
 }
 
 xfs_buftarg_t *
@@ -1480,16 +1511,14 @@ xfs_alloc_buftarg(
 	struct block_device	*bdev)
 {
 	xfs_buftarg_t		*btp;
+	kdev_t			kdev;
 
 	btp = kmem_zalloc(sizeof(*btp), KM_SLEEP);
 
+	kdev = to_kdev_t(bdev->bd_dev);
 	btp->pbr_dev =  bdev->bd_dev;
-	btp->pbr_kdev = to_kdev_t(btp->pbr_dev);
+	btp->pbr_kdev = kdev;
 	btp->pbr_bdev = bdev;
-	btp->pbr_mapping = bdev->bd_inode->i_mapping;
-	xfs_setsize_buftarg(btp, PAGE_CACHE_SIZE,
-			    get_hardsect_size(btp->pbr_kdev));
-
 	switch (MAJOR(btp->pbr_dev)) {
 	case MD_MAJOR:
 	case EVMS_MAJOR:
@@ -1499,8 +1528,15 @@ xfs_alloc_buftarg(
 		btp->pbr_flags = PBR_SECTOR_ONLY;
 		break;
 	}
-
+	if (xfs_setsize_buftarg(btp, PAGE_CACHE_SIZE, get_hardsect_size(kdev)))
+		goto error;
+	if (xfs_mapping_buftarg(btp, bdev))
+		goto error;
 	return btp;
+
+error:
+	kmem_free(btp, sizeof(*btp));
+	return NULL;
 }
 
 /*
@@ -1830,7 +1866,7 @@ _pagebuf_ioapply(			/* apply function to
 	cur_offset = pb->pb_offset;
 	cur_len = buffer_len;
 
-	if (!pb->pb_locked &&
+	if (!pb->pb_locked && !(pb->pb_flags & PBF_DIRECTIO) &&
 	    (pb->pb_target->pbr_bsize < PAGE_CACHE_SIZE)) {
 		for (index = 0; index < pb->pb_page_count; index++)
 			lock_page(pb->pb_pages[index]);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/linux-2.4/xfs_buf.h linux-2.4.20-wolk4.16-fullkernel/fs/xfs/linux-2.4/xfs_buf.h
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/linux-2.4/xfs_buf.h	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/linux-2.4/xfs_buf.h	2004-09-05 16:08:48.000000000 +0200
@@ -617,7 +617,7 @@ static inline int xfs_bdwrite(void *mp, 
  
 extern xfs_buftarg_t *xfs_alloc_buftarg(struct block_device *);
 extern void xfs_free_buftarg(xfs_buftarg_t *, int);
-extern void xfs_setsize_buftarg(xfs_buftarg_t *, unsigned int, unsigned int);
+extern int xfs_setsize_buftarg(xfs_buftarg_t *, unsigned int, unsigned int);
 extern void xfs_incore_relse(xfs_buftarg_t *, int, int);
 extern int xfs_flush_buftarg(xfs_buftarg_t *, int);
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/linux-2.4/xfs_ioctl.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/linux-2.4/xfs_ioctl.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/linux-2.4/xfs_ioctl.c	2004-06-29 11:31:58.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/linux-2.4/xfs_ioctl.c	2004-09-05 16:08:48.000000000 +0200
@@ -71,14 +71,6 @@
 #include <linux/iobuf.h>
 
 /*
- * ioctl commands that are used by Linux filesystems
- */
-#define XFS_IOC_GETXFLAGS	_IOR('f', 1, long)
-#define XFS_IOC_SETXFLAGS	_IOW('f', 2, long)
-#define XFS_IOC_GETVERSION	_IOR('v', 1, long)
-
-
-/*
  * xfs_find_handle maps from userspace xfs_fsop_handlereq structure to
  * a file or fs handle.
  *
@@ -827,13 +819,23 @@ xfs_ioctl(
 	case XFS_IOC_FREEZE:
 		if (!capable(CAP_SYS_ADMIN))
 			return -EPERM;
-		xfs_fs_freeze(mp);
+
+		if (vp->v_vfsp->vfs_frozen == SB_UNFROZEN) {
+			freeze_bdev(mp->m_ddev_targp->pbr_bdev);
+			if (mp->m_rtdev_targp)
+				freeze_bdev(mp->m_rtdev_targp->pbr_bdev);
+		}
 		return 0;
 
 	case XFS_IOC_THAW:
 		if (!capable(CAP_SYS_ADMIN))
 			return -EPERM;
-		xfs_fs_thaw(mp);
+
+		if (vp->v_vfsp->vfs_frozen != SB_UNFROZEN) {
+			thaw_bdev(mp->m_ddev_targp->pbr_bdev, inode->i_sb);
+			if (mp->m_rtdev_targp)
+				thaw_bdev(mp->m_ddev_targp->pbr_bdev, NULL);
+		}
 		return 0;
 
 	case XFS_IOC_GOINGDOWN: {
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/linux-2.4/xfs_iops.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/linux-2.4/xfs_iops.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/linux-2.4/xfs_iops.c	2004-06-29 11:32:10.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/linux-2.4/xfs_iops.c	2004-09-05 16:08:48.000000000 +0200
@@ -82,9 +82,14 @@ validate_fields(
 
 	va.va_mask = XFS_AT_NLINK|XFS_AT_SIZE|XFS_AT_NBLOCKS;
 	VOP_GETATTR(vp, &va, ATTR_LAZY, NULL, error);
-	ip->i_nlink = va.va_nlink;
-	ip->i_size = va.va_size;
-	ip->i_blocks = va.va_nblocks;
+	if (likely(!error)) {
+		ip->i_nlink = va.va_nlink;
+		ip->i_blocks = va.va_nblocks;
+
+		/* we're under i_sem so i_size can't change under us */
+		if (i_size_read(ip) != va.va_size)
+			i_size_write(ip, va.va_size);
+	}
 }
 
 #ifdef CONFIG_XFS_POSIX_ACL
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/linux-2.4/xfs_linux.h linux-2.4.20-wolk4.16-fullkernel/fs/xfs/linux-2.4/xfs_linux.h
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/linux-2.4/xfs_linux.h	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/linux-2.4/xfs_linux.h	2004-09-05 16:08:48.000000000 +0200
@@ -35,6 +35,9 @@
 #include <linux/types.h>
 #include <linux/config.h>
 
+#undef __user
+#define __user
+
 /*
  * Some types are conditional depending on the target system.
  * XFS_BIG_BLKNOS needs block layer disk addresses to be 64 bits.
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/linux-2.4/xfs_lrw.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/linux-2.4/xfs_lrw.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/linux-2.4/xfs_lrw.c	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/linux-2.4/xfs_lrw.c	2004-09-05 16:08:48.000000000 +0200
@@ -283,6 +283,8 @@ xfs_read(
 	XFS_STATS_INC(xs_read_calls);
 
 	if (unlikely(ioflags & IO_ISDIRECT)) {
+		if ((ssize_t)size < 0)
+			return -XFS_ERROR(EINVAL);
 		if (((__psint_t)buf & BBMASK) ||
 		    (*offset & mp->m_blockmask) ||
 		    (size & mp->m_blockmask)) {
@@ -605,7 +607,7 @@ xfs_write(
 	io = &xip->i_iocore;
 	mp = io->io_mount;
 
-	xfs_check_frozen(mp, bdp, XFS_FREEZE_WRITE);
+	fs_check_frozen(vp->v_vfsp, SB_FREEZE_WRITE);
 
 	if (XFS_FORCED_SHUTDOWN(xip->i_mount)) {
 		return -EIO;
@@ -620,8 +622,6 @@ xfs_write(
 		iolock = XFS_IOLOCK_SHARED;
 		locktype = VRWLOCK_WRITE_DIRECT;
 	} else {
-		if (io->io_flags & XFS_IOCORE_RT)
-			return XFS_ERROR(-EINVAL);
 		iolock = XFS_IOLOCK_EXCL;
 		locktype = VRWLOCK_WRITE;
 	}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/linux-2.4/xfs_super.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/linux-2.4/xfs_super.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/linux-2.4/xfs_super.c	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/linux-2.4/xfs_super.c	2004-09-05 16:08:48.000000000 +0200
@@ -568,32 +568,73 @@ linvfs_remount(
 	return -error;
 }
 
+struct super_block *freeze_bdev(struct block_device *bdev)
+{
+	struct super_block *sb;
+	struct vfs *vfsp;
+	int error;
+
+	sb = get_super(to_kdev_t(bdev->bd_dev));
+	if (sb && !(sb->s_flags & MS_RDONLY)) {
+		vfsp = LINVFS_GET_VFS(sb);
+
+		/* Stop new writers */
+		vfsp->vfs_frozen = SB_FREEZE_WRITE;
+		wmb();
+
+		/* Flush the refcache */
+		VFS_SYNC(vfsp, SYNC_REFCACHE|SYNC_WAIT, NULL, error);
+
+		/* Flush delalloc and delwri data */
+		VFS_SYNC(vfsp, SYNC_DELWRI|SYNC_WAIT, NULL, error);
+
+		/* Pause transaction subsystem */
+		vfsp->vfs_frozen = SB_FREEZE_TRANS;
+		wmb();
+
+		/* Flush any remaining inodes into buffers */
+		VFS_SYNC(vfsp, SYNC_ATTR|SYNC_WAIT, NULL, error);
+
+		 /* Push all buffers out to disk */
+		sync_buffers(sb->s_dev, 1);
+
+		/* Push the superblock and write an unmount record */
+		VFS_FREEZE(vfsp);
+	}
+
+	sync_buffers(to_kdev_t(bdev->bd_dev), 1);
+	return sb;      /* thaw_bdev releases sb->s_umount */
+}
+
+void thaw_bdev(struct block_device *bdev, struct super_block *sb)
+{
+	if (sb) {
+		struct vfs *vfsp = LINVFS_GET_VFS(sb);
+
+		BUG_ON(sb->s_bdev != bdev);
+
+		vfsp->vfs_frozen = SB_UNFROZEN;
+		wmb();
+		wake_up(&vfsp->vfs_wait_unfrozen);
+
+		drop_super(sb);
+	}
+}
+
 STATIC void
 linvfs_freeze_fs(
 	struct super_block	*sb)
 {
-	vfs_t			*vfsp = LINVFS_GET_VFS(sb);
-	vnode_t			*vp;
-	int			error;
-
 	if (sb->s_flags & MS_RDONLY)
 		return;
-	VFS_ROOT(vfsp, &vp, error);
-	VOP_IOCTL(vp, LINVFS_GET_IP(vp), NULL, 0, XFS_IOC_FREEZE, 0, error);
-	VN_RELE(vp);
+	freeze_bdev(sb->s_bdev);
 }
 
 STATIC void
 linvfs_unfreeze_fs(
 	struct super_block	*sb)
 {
-	vfs_t			*vfsp = LINVFS_GET_VFS(sb);
-	vnode_t			*vp;
-	int			error;
-
-	VFS_ROOT(vfsp, &vp, error);
-	VOP_IOCTL(vp, LINVFS_GET_IP(vp), NULL, 0, XFS_IOC_THAW, 0, error);
-	VN_RELE(vp);
+	thaw_bdev(sb->s_bdev, sb);
 }
 
 STATIC int
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/linux-2.4/xfs_super.h linux-2.4.20-wolk4.16-fullkernel/fs/xfs/linux-2.4/xfs_super.h
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/linux-2.4/xfs_super.h	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/linux-2.4/xfs_super.h	2004-09-05 16:08:48.000000000 +0200
@@ -136,5 +136,7 @@ extern void xfs_blkdev_put(struct block_
 
 /* matching a 2.6 kernel export, thus no xfs_ prefix */
 extern struct dentry *d_alloc_anon(struct inode *inode);
+extern struct super_block *freeze_bdev(struct block_device *bdev);
+extern void thaw_bdev(struct block_device *bdev, struct super_block *sb);
 
 #endif	/* __XFS_SUPER_H__ */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/linux-2.4/xfs_vfs.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/linux-2.4/xfs_vfs.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/linux-2.4/xfs_vfs.c	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/linux-2.4/xfs_vfs.c	2004-09-05 16:08:48.000000000 +0200
@@ -243,6 +243,18 @@ vfs_force_shutdown(
 	((*bhvtovfsops(next)->vfs_force_shutdown)(next, fl, file, line));
 }
 
+void
+vfs_freeze(
+	struct bhv_desc		*bdp)
+{
+	struct bhv_desc		*next = bdp;
+
+	ASSERT(next);
+	while (! (bhvtovfsops(next))->vfs_freeze)
+		next = BHV_NEXT(next);
+	((*bhvtovfsops(next)->vfs_freeze)(next));
+}
+
 vfs_t *
 vfs_allocate( void )
 {
@@ -251,6 +263,7 @@ vfs_allocate( void )
 	vfsp = kmem_zalloc(sizeof(vfs_t), KM_SLEEP);
 	bhv_head_init(VFS_BHVHEAD(vfsp), "vfs");
 	init_waitqueue_head(&vfsp->vfs_wait_sync_task);
+	init_waitqueue_head(&vfsp->vfs_wait_unfrozen);
 	return vfsp;
 }
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/linux-2.4/xfs_vfs.h linux-2.4.20-wolk4.16-fullkernel/fs/xfs/linux-2.4/xfs_vfs.h
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/linux-2.4/xfs_vfs.h	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/linux-2.4/xfs_vfs.h	2004-09-05 16:08:48.000000000 +0200
@@ -53,6 +53,8 @@ typedef struct vfs {
 	struct super_block	*vfs_super;	/* Linux superblock structure */
 	struct task_struct	*vfs_sync_task;
 	wait_queue_head_t	vfs_wait_sync_task;
+	int			vfs_frozen;
+	wait_queue_head_t	vfs_wait_unfrozen;
 } vfs_t;
 
 #define vfs_fbhv		vfs_bh.bh_first	/* 1st on vfs behavior chain */
@@ -114,6 +116,7 @@ typedef int	(*vfs_quotactl_t)(bhv_desc_t
 typedef void	(*vfs_init_vnode_t)(bhv_desc_t *,
 				struct vnode *, bhv_desc_t *, int);
 typedef void	(*vfs_force_shutdown_t)(bhv_desc_t *, int, char *, int);
+typedef void	(*vfs_freeze_t)(bhv_desc_t *);
 typedef	struct inode * (*vfs_get_inode_t)(bhv_desc_t *, xfs_ino_t, int);
 
 typedef struct vfsops {
@@ -132,6 +135,7 @@ typedef struct vfsops {
 	vfs_get_inode_t		vfs_get_inode;	/* bhv specific iget */
 	vfs_init_vnode_t	vfs_init_vnode;	/* initialize a new vnode */
 	vfs_force_shutdown_t	vfs_force_shutdown;	/* crash and burn */
+	vfs_freeze_t		vfs_freeze;	/* freeze fs for snapshot */
 } vfsops_t;
 
 /*
@@ -152,6 +156,7 @@ typedef struct vfsops {
 #define VFS_GET_INODE(v, ino, fl)	( vfs_get_inode(VHEAD(v), ino,fl) )
 #define VFS_INIT_VNODE(v, vp,b,ul)	( vfs_init_vnode(VHEAD(v), vp,b,ul) )
 #define VFS_FORCE_SHUTDOWN(v, fl,f,l)	( vfs_force_shutdown(VHEAD(v), fl,f,l) )
+#define VFS_FREEZE(v)			( vfs_freeze(VHEAD(v)) )
 
 /*
  * PVFS's.  Operates on behavior descriptor pointers.
@@ -170,6 +175,7 @@ typedef struct vfsops {
 #define PVFS_GET_INODE(b, ino,fl)	( vfs_get_inode(b, ino,fl) )
 #define PVFS_INIT_VNODE(b, vp,b2,ul)	( vfs_init_vnode(b, vp,b2,ul) )
 #define PVFS_FORCE_SHUTDOWN(b, fl,f,l)	( vfs_force_shutdown(b, fl,f,l) )
+#define PVFS_FREEZE(b)			( vfs_freeze(b) )
 
 extern int vfs_mount(bhv_desc_t *, struct xfs_mount_args *, struct cred *);
 extern int vfs_parseargs(bhv_desc_t *, char *, struct xfs_mount_args *, int);
@@ -185,6 +191,7 @@ extern int vfs_quotactl(bhv_desc_t *, in
 extern struct inode *vfs_get_inode(bhv_desc_t *, xfs_ino_t, int);
 extern void vfs_init_vnode(bhv_desc_t *, struct vnode *, bhv_desc_t *, int);
 extern void vfs_force_shutdown(bhv_desc_t *, int, char *, int);
+extern void vfs_freeze(bhv_desc_t *);
 
 typedef struct bhv_vfsops {
 	struct vfsops		bhv_common;
@@ -205,4 +212,14 @@ extern void bhv_insert_all_vfsops(struct
 extern void bhv_remove_all_vfsops(struct vfs *, int);
 extern void bhv_remove_vfsops(struct vfs *, int);
 
+enum {
+	SB_UNFROZEN = 0,
+	SB_FREEZE_WRITE	= 1,
+	SB_FREEZE_TRANS = 2,
+};
+
+#define fs_frozen(vfsp)		((vfsp)->vfs_frozen)
+#define fs_check_frozen(vfsp, level) \
+	wait_event((vfsp)->vfs_wait_unfrozen, ((vfsp)->vfs_frozen < (level)))
+
 #endif	/* __XFS_VFS_H__ */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/linux-2.4/xfs_vnode.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/linux-2.4/xfs_vnode.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/linux-2.4/xfs_vnode.c	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/linux-2.4/xfs_vnode.c	2004-09-05 16:08:46.000000000 +0200
@@ -199,13 +199,50 @@ vn_get(
 }
 
 /*
+ * Revalidate the Linux inode from the vattr.
+ * Note: i_size _not_ updated; we must hold the inode
+ * semaphore when doing that - callers responsibility.
+ */
+void
+vn_revalidate_core(
+	struct vnode	*vp,
+	vattr_t		*vap)
+{
+	struct inode	*inode = LINVFS_GET_IP(vp);
+
+	inode->i_mode	    = VTTOIF(vap->va_type) | vap->va_mode;
+	inode->i_nlink	    = vap->va_nlink;
+	inode->i_uid	    = vap->va_uid;
+	inode->i_gid	    = vap->va_gid;
+	inode->i_blocks	    = vap->va_nblocks;
+	inode->i_mtime	    = vap->va_mtime.tv_sec;
+	inode->i_ctime	    = vap->va_ctime.tv_sec;
+	inode->i_atime	    = vap->va_atime.tv_sec;
+	if (vap->va_xflags & XFS_XFLAG_IMMUTABLE)
+		inode->i_flags |= S_IMMUTABLE;
+	else
+		inode->i_flags &= ~S_IMMUTABLE;
+	if (vap->va_xflags & XFS_XFLAG_APPEND)
+		inode->i_flags |= S_APPEND;
+	else
+		inode->i_flags &= ~S_APPEND;
+	if (vap->va_xflags & XFS_XFLAG_SYNC)
+		inode->i_flags |= S_SYNC;
+	else
+		inode->i_flags &= ~S_SYNC;
+	if (vap->va_xflags & XFS_XFLAG_NOATIME)
+		inode->i_flags |= S_NOATIME;
+	else
+		inode->i_flags &= ~S_NOATIME;
+}
+
+/*
  * Revalidate the Linux inode from the vnode.
  */
 int
 vn_revalidate(
 	struct vnode	*vp)
 {
-	struct inode	*inode;
 	vattr_t		va;
 	int		error;
 
@@ -215,33 +252,7 @@ vn_revalidate(
 	va.va_mask = XFS_AT_STAT|XFS_AT_XFLAGS;
 	VOP_GETATTR(vp, &va, 0, NULL, error);
 	if (!error) {
-		inode = LINVFS_GET_IP(vp);
-		inode->i_mode	    = VTTOIF(va.va_type) | va.va_mode;
-		inode->i_nlink	    = va.va_nlink;
-		inode->i_uid	    = va.va_uid;
-		inode->i_gid	    = va.va_gid;
-		i_size_write(inode, va.va_size);
-		inode->i_blocks	    = va.va_nblocks;
-		inode->i_mtime	    = va.va_mtime.tv_sec;
-		inode->i_ctime	    = va.va_ctime.tv_sec;
-		inode->i_atime	    = va.va_atime.tv_sec;
-		if (va.va_xflags & XFS_XFLAG_IMMUTABLE)
-			inode->i_flags |= S_IMMUTABLE;
-		else
-			inode->i_flags &= ~S_IMMUTABLE;
-		if (va.va_xflags & XFS_XFLAG_APPEND)
-			inode->i_flags |= S_APPEND;
-		else
-			inode->i_flags &= ~S_APPEND;
-		if (va.va_xflags & XFS_XFLAG_SYNC)
-			inode->i_flags |= S_SYNC;
-		else
-			inode->i_flags &= ~S_SYNC;
-		if (va.va_xflags & XFS_XFLAG_NOATIME)
-			inode->i_flags |= S_NOATIME;
-		else
-			inode->i_flags &= ~S_NOATIME;
-
+		vn_revalidate_core(vp, &va);
 		VUNMODIFY(vp);
 	}
 	return -error;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/linux-2.4/xfs_vnode.h linux-2.4.20-wolk4.16-fullkernel/fs/xfs/linux-2.4/xfs_vnode.h
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/linux-2.4/xfs_vnode.h	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/linux-2.4/xfs_vnode.h	2004-09-05 16:08:46.000000000 +0200
@@ -528,6 +528,7 @@ typedef struct vnode_map {
 extern void	vn_purge(struct vnode *, vmap_t *);
 extern vnode_t	*vn_get(struct vnode *, vmap_t *);
 extern int	vn_revalidate(struct vnode *);
+extern void	vn_revalidate_core(struct vnode *, vattr_t *);
 extern void	vn_remove(struct vnode *);
 
 static inline int vn_count(struct vnode *vp)
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/quota/xfs_dquot.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/quota/xfs_dquot.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/quota/xfs_dquot.c	2004-06-29 11:31:58.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/quota/xfs_dquot.c	2004-09-05 16:08:48.000000000 +0200
@@ -145,7 +145,7 @@ xfs_qm_dqinit(
 		 dqp->q_res_icount = 0;
 		 dqp->q_res_rtbcount = 0;
 		 dqp->q_pincount = 0;
-		 dqp->q_hash = 0;
+		 dqp->q_hash = NULL;
 		 ASSERT(dqp->dq_flnext == dqp->dq_flprev);
 
 #ifdef XFS_DQUOT_TRACE
@@ -187,9 +187,9 @@ xfs_qm_dqdestroy(
  */
 STATIC void
 xfs_qm_dqinit_core(
-	xfs_dqid_t	 id,
-	uint		 type,
-	xfs_dqblk_t	 *d)
+	xfs_dqid_t	id,
+	uint		type,
+	xfs_dqblk_t	*d)
 {
 	/*
 	 * Caller has zero'd the entire dquot 'chunk' already.
@@ -250,6 +250,36 @@ __xfs_dqtrace_entry(
 
 
 /*
+ * If default limits are in force, push them into the dquot now.
+ * We overwrite the dquot limits only if they are zero and this
+ * is not the root dquot.
+ */
+void
+xfs_qm_adjust_dqlimits(
+	xfs_mount_t		*mp,
+	xfs_disk_dquot_t	*d)
+{
+	xfs_quotainfo_t		*q = mp->m_quotainfo;
+
+	ASSERT(!INT_ISZERO(d->d_id, ARCH_CONVERT));
+
+	if (q->qi_bsoftlimit && INT_ISZERO(d->d_blk_softlimit, ARCH_CONVERT))
+		INT_SET(d->d_blk_softlimit, ARCH_CONVERT, q->qi_bsoftlimit);
+	if (q->qi_bhardlimit && INT_ISZERO(d->d_blk_hardlimit, ARCH_CONVERT))
+		INT_SET(d->d_blk_hardlimit, ARCH_CONVERT, q->qi_bhardlimit);
+	if (q->qi_isoftlimit && INT_ISZERO(d->d_ino_softlimit, ARCH_CONVERT))
+		INT_SET(d->d_ino_softlimit, ARCH_CONVERT, q->qi_isoftlimit);
+	if (q->qi_ihardlimit && INT_ISZERO(d->d_ino_hardlimit, ARCH_CONVERT))
+		INT_SET(d->d_ino_hardlimit, ARCH_CONVERT, q->qi_ihardlimit);
+	if (q->qi_rtbsoftlimit &&
+	    INT_ISZERO(d->d_rtb_softlimit, ARCH_CONVERT))
+		INT_SET(d->d_rtb_softlimit, ARCH_CONVERT, q->qi_rtbsoftlimit);
+	if (q->qi_rtbhardlimit &&
+	    INT_ISZERO(d->d_rtb_hardlimit, ARCH_CONVERT))
+		INT_SET(d->d_rtb_hardlimit, ARCH_CONVERT, q->qi_rtbhardlimit);
+}
+
+/*
  * Check the limits and timers of a dquot and start or reset timers
  * if necessary.
  * This gets called even when quota enforcement is OFF, which makes our
@@ -265,53 +295,81 @@ xfs_qm_adjust_dqtimers(
 	xfs_mount_t		*mp,
 	xfs_disk_dquot_t	*d)
 {
-	/*
-	 * The dquot had better be locked. We are modifying it here.
-	 */
-
-	/*
-	 * root's limits are not real limits.
-	 */
-	if (INT_ISZERO(d->d_id, ARCH_CONVERT))
-		return;
+	ASSERT(!INT_ISZERO(d->d_id, ARCH_CONVERT));
 
 #ifdef QUOTADEBUG
 	if (INT_GET(d->d_blk_hardlimit, ARCH_CONVERT))
-		ASSERT(INT_GET(d->d_blk_softlimit, ARCH_CONVERT) <= INT_GET(d->d_blk_hardlimit, ARCH_CONVERT));
+		ASSERT(INT_GET(d->d_blk_softlimit, ARCH_CONVERT) <=
+			INT_GET(d->d_blk_hardlimit, ARCH_CONVERT));
 	if (INT_GET(d->d_ino_hardlimit, ARCH_CONVERT))
-		ASSERT(INT_GET(d->d_ino_softlimit, ARCH_CONVERT) <= INT_GET(d->d_ino_hardlimit, ARCH_CONVERT));
+		ASSERT(INT_GET(d->d_ino_softlimit, ARCH_CONVERT) <=
+			INT_GET(d->d_ino_hardlimit, ARCH_CONVERT));
+	if (INT_GET(d->d_rtb_hardlimit, ARCH_CONVERT))
+		ASSERT(INT_GET(d->d_rtb_softlimit, ARCH_CONVERT) <=
+			INT_GET(d->d_rtb_hardlimit, ARCH_CONVERT));
 #endif
 	if (INT_ISZERO(d->d_btimer, ARCH_CONVERT)) {
 		if ((INT_GET(d->d_blk_softlimit, ARCH_CONVERT) &&
-		    (INT_GET(d->d_bcount, ARCH_CONVERT) >= INT_GET(d->d_blk_softlimit, ARCH_CONVERT))) ||
+		    (INT_GET(d->d_bcount, ARCH_CONVERT) >=
+				INT_GET(d->d_blk_softlimit, ARCH_CONVERT))) ||
 		    (INT_GET(d->d_blk_hardlimit, ARCH_CONVERT) &&
-		    (INT_GET(d->d_bcount, ARCH_CONVERT) >= INT_GET(d->d_blk_hardlimit, ARCH_CONVERT)))) {
-			INT_SET(d->d_btimer, ARCH_CONVERT, get_seconds() + XFS_QI_BTIMELIMIT(mp));
+		    (INT_GET(d->d_bcount, ARCH_CONVERT) >=
+				INT_GET(d->d_blk_hardlimit, ARCH_CONVERT)))) {
+			INT_SET(d->d_btimer, ARCH_CONVERT,
+				get_seconds() + XFS_QI_BTIMELIMIT(mp));
 		}
 	} else {
 		if ((INT_ISZERO(d->d_blk_softlimit, ARCH_CONVERT) ||
-		    (INT_GET(d->d_bcount, ARCH_CONVERT) < INT_GET(d->d_blk_softlimit, ARCH_CONVERT))) &&
+		    (INT_GET(d->d_bcount, ARCH_CONVERT) <
+				INT_GET(d->d_blk_softlimit, ARCH_CONVERT))) &&
 		    (INT_ISZERO(d->d_blk_hardlimit, ARCH_CONVERT) ||
-		    (INT_GET(d->d_bcount, ARCH_CONVERT) < INT_GET(d->d_blk_hardlimit, ARCH_CONVERT)))) {
+		    (INT_GET(d->d_bcount, ARCH_CONVERT) <
+				INT_GET(d->d_blk_hardlimit, ARCH_CONVERT)))) {
 			INT_ZERO(d->d_btimer, ARCH_CONVERT);
 		}
 	}
 
 	if (INT_ISZERO(d->d_itimer, ARCH_CONVERT)) {
 		if ((INT_GET(d->d_ino_softlimit, ARCH_CONVERT) &&
-		    (INT_GET(d->d_icount, ARCH_CONVERT) >= INT_GET(d->d_ino_softlimit, ARCH_CONVERT))) ||
+		    (INT_GET(d->d_icount, ARCH_CONVERT) >=
+				INT_GET(d->d_ino_softlimit, ARCH_CONVERT))) ||
 		    (INT_GET(d->d_ino_hardlimit, ARCH_CONVERT) &&
-		    (INT_GET(d->d_icount, ARCH_CONVERT) >= INT_GET(d->d_ino_hardlimit, ARCH_CONVERT)))) {
-			INT_SET(d->d_itimer, ARCH_CONVERT, get_seconds() + XFS_QI_ITIMELIMIT(mp));
+		    (INT_GET(d->d_icount, ARCH_CONVERT) >=
+				INT_GET(d->d_ino_hardlimit, ARCH_CONVERT)))) {
+			INT_SET(d->d_itimer, ARCH_CONVERT,
+				get_seconds() + XFS_QI_ITIMELIMIT(mp));
 		}
 	} else {
 		if ((INT_ISZERO(d->d_ino_softlimit, ARCH_CONVERT) ||
-		    (INT_GET(d->d_icount, ARCH_CONVERT) < INT_GET(d->d_ino_softlimit, ARCH_CONVERT)))  &&
+		    (INT_GET(d->d_icount, ARCH_CONVERT) <
+				INT_GET(d->d_ino_softlimit, ARCH_CONVERT)))  &&
 		    (INT_ISZERO(d->d_ino_hardlimit, ARCH_CONVERT) ||
-		    (INT_GET(d->d_icount, ARCH_CONVERT) < INT_GET(d->d_ino_hardlimit, ARCH_CONVERT)))) {
+		    (INT_GET(d->d_icount, ARCH_CONVERT) <
+				INT_GET(d->d_ino_hardlimit, ARCH_CONVERT)))) {
 			INT_ZERO(d->d_itimer, ARCH_CONVERT);
 		}
 	}
+
+	if (INT_ISZERO(d->d_rtbtimer, ARCH_CONVERT)) {
+		if ((INT_GET(d->d_rtb_softlimit, ARCH_CONVERT) &&
+		    (INT_GET(d->d_rtbcount, ARCH_CONVERT) >=
+				INT_GET(d->d_rtb_softlimit, ARCH_CONVERT))) ||
+		    (INT_GET(d->d_rtb_hardlimit, ARCH_CONVERT) &&
+		    (INT_GET(d->d_rtbcount, ARCH_CONVERT) >=
+				INT_GET(d->d_rtb_hardlimit, ARCH_CONVERT)))) {
+			INT_SET(d->d_rtbtimer, ARCH_CONVERT,
+				get_seconds() + XFS_QI_RTBTIMELIMIT(mp));
+		}
+	} else {
+		if ((INT_ISZERO(d->d_rtb_softlimit, ARCH_CONVERT) ||
+		    (INT_GET(d->d_rtbcount, ARCH_CONVERT) <
+				INT_GET(d->d_rtb_softlimit, ARCH_CONVERT))) &&
+		    (INT_ISZERO(d->d_rtb_hardlimit, ARCH_CONVERT) ||
+		    (INT_GET(d->d_rtbcount, ARCH_CONVERT) <
+				INT_GET(d->d_rtb_hardlimit, ARCH_CONVERT)))) {
+			INT_ZERO(d->d_rtbtimer, ARCH_CONVERT);
+		}
+	}
 }
 
 /*
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/quota/xfs_dquot.h linux-2.4.20-wolk4.16-fullkernel/fs/xfs/quota/xfs_dquot.h
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/quota/xfs_dquot.h	2004-06-29 11:31:58.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/quota/xfs_dquot.h	2004-09-05 16:08:48.000000000 +0200
@@ -209,6 +209,8 @@ extern int		xfs_qm_dqflock_nowait(xfs_dq
 extern void		xfs_qm_dqflock_pushbuf_wait(xfs_dquot_t *dqp);
 extern void		xfs_qm_adjust_dqtimers(xfs_mount_t *,
 					xfs_disk_dquot_t *);
+extern void		xfs_qm_adjust_dqlimits(xfs_mount_t *,
+					xfs_disk_dquot_t *);
 extern int		xfs_qm_dqwarn(xfs_disk_dquot_t *, uint);
 extern int		xfs_qm_dqget(xfs_mount_t *, xfs_inode_t *,
 					xfs_dqid_t, uint, uint, xfs_dquot_t **);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/quota/xfs_qm.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/quota/xfs_qm.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/quota/xfs_qm.c	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/quota/xfs_qm.c	2004-09-05 16:08:48.000000000 +0200
@@ -229,11 +229,8 @@ xfs_qm_hold_quotafs_ref(
 	 */
 	XFS_QM_LOCK(xfs_Gqm);
 
-	if (xfs_Gqm == NULL) {
-		if ((xfs_Gqm = xfs_Gqm_init()) == NULL) {
-			return (XFS_ERROR(EINVAL));
-		}
-	}
+	if (xfs_Gqm == NULL)
+		xfs_Gqm = xfs_Gqm_init();
 	/*
 	 * We can keep a list of all filesystems with quotas mounted for
 	 * debugging and statistical purposes, but ...
@@ -1216,22 +1213,46 @@ xfs_qm_init_quotainfo(
 			     XFS_QMOPT_DQSUSER|XFS_QMOPT_DOWARN,
 			     &dqp);
 	if (! error) {
+		xfs_disk_dquot_t	*ddqp = &dqp->q_core;
+
 		/*
 		 * The warnings and timers set the grace period given to
 		 * a user or group before he or she can not perform any
 		 * more writing. If it is zero, a default is used.
 		 */
-		qinf->qi_btimelimit = INT_GET(dqp->q_core.d_btimer, ARCH_CONVERT) ?
-			INT_GET(dqp->q_core.d_btimer, ARCH_CONVERT) : XFS_QM_BTIMELIMIT;
-		qinf->qi_itimelimit = INT_GET(dqp->q_core.d_itimer, ARCH_CONVERT) ?
-			INT_GET(dqp->q_core.d_itimer, ARCH_CONVERT) : XFS_QM_ITIMELIMIT;
-		qinf->qi_rtbtimelimit = INT_GET(dqp->q_core.d_rtbtimer, ARCH_CONVERT) ?
-			INT_GET(dqp->q_core.d_rtbtimer, ARCH_CONVERT) : XFS_QM_RTBTIMELIMIT;
-		qinf->qi_bwarnlimit = INT_GET(dqp->q_core.d_bwarns, ARCH_CONVERT) ?
-			INT_GET(dqp->q_core.d_bwarns, ARCH_CONVERT) : XFS_QM_BWARNLIMIT;
-		qinf->qi_iwarnlimit = INT_GET(dqp->q_core.d_iwarns, ARCH_CONVERT) ?
-			INT_GET(dqp->q_core.d_iwarns, ARCH_CONVERT) : XFS_QM_IWARNLIMIT;
-
+		qinf->qi_btimelimit =
+				INT_GET(ddqp->d_btimer, ARCH_CONVERT) ?
+				INT_GET(ddqp->d_btimer, ARCH_CONVERT) :
+				XFS_QM_BTIMELIMIT;
+		qinf->qi_itimelimit =
+				INT_GET(ddqp->d_itimer, ARCH_CONVERT) ?
+				INT_GET(ddqp->d_itimer, ARCH_CONVERT) :
+				XFS_QM_ITIMELIMIT;
+		qinf->qi_rtbtimelimit =
+				INT_GET(ddqp->d_rtbtimer, ARCH_CONVERT) ?
+				INT_GET(ddqp->d_rtbtimer, ARCH_CONVERT) :
+				XFS_QM_RTBTIMELIMIT;
+		qinf->qi_bwarnlimit =
+				INT_GET(ddqp->d_bwarns, ARCH_CONVERT) ?
+				INT_GET(ddqp->d_bwarns, ARCH_CONVERT) :
+				XFS_QM_BWARNLIMIT;
+		qinf->qi_iwarnlimit =
+				INT_GET(ddqp->d_iwarns, ARCH_CONVERT) ?
+				INT_GET(ddqp->d_iwarns, ARCH_CONVERT) :
+				XFS_QM_IWARNLIMIT;
+		qinf->qi_bhardlimit =
+				INT_GET(ddqp->d_blk_hardlimit, ARCH_CONVERT);
+		qinf->qi_bsoftlimit =
+				INT_GET(ddqp->d_blk_softlimit, ARCH_CONVERT);
+		qinf->qi_ihardlimit =
+				INT_GET(ddqp->d_ino_hardlimit, ARCH_CONVERT);
+		qinf->qi_isoftlimit =
+				INT_GET(ddqp->d_ino_softlimit, ARCH_CONVERT);
+		qinf->qi_rtbhardlimit =
+				INT_GET(ddqp->d_rtb_hardlimit, ARCH_CONVERT);
+		qinf->qi_rtbsoftlimit =
+				INT_GET(ddqp->d_rtb_softlimit, ARCH_CONVERT);
+ 
 		/*
 		 * We sent the XFS_QMOPT_DQSUSER flag to dqget because
 		 * we don't want this dquot cached. We haven't done a
@@ -1691,10 +1712,12 @@ xfs_qm_quotacheck_dqadjust(
 	}
 
 	/*
-	 * Adjust the timers since we just changed usages
+	 * Set default limits, adjust timers (since we changed usages)
 	 */
-	if (! XFS_IS_SUSER_DQUOT(dqp))
+	if (! XFS_IS_SUSER_DQUOT(dqp)) {
+		xfs_qm_adjust_dqlimits(dqp->q_mount, &dqp->q_core);
 		xfs_qm_adjust_dqtimers(dqp->q_mount, &dqp->q_core);
+	}
 
 	dqp->dq_flags |= XFS_DQ_DIRTY;
 }
@@ -1735,7 +1758,7 @@ STATIC int
 xfs_qm_dqusage_adjust(
 	xfs_mount_t	*mp,		/* mount point for filesystem */
 	xfs_ino_t	ino,		/* inode number to get data for */
-	void		*buffer,	/* not used */
+	void		__user *buffer,	/* not used */
 	int		ubsize,		/* not used */
 	void		*private_data,	/* not used */
 	xfs_daddr_t	bno,		/* starting block of inode cluster */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/quota/xfs_qm.h linux-2.4.20-wolk4.16-fullkernel/fs/xfs/quota/xfs_qm.h
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/quota/xfs_qm.h	2004-06-29 11:23:25.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/quota/xfs_qm.h	2004-09-05 16:08:48.000000000 +0200
@@ -136,9 +136,14 @@ typedef struct xfs_quotainfo {
 	xfs_qwarncnt_t	 qi_bwarnlimit;	 /* limit for num warnings */
 	xfs_qwarncnt_t	 qi_iwarnlimit;	 /* limit for num warnings */
 	mutex_t		 qi_quotaofflock;/* to serialize quotaoff */
-	/* Some useful precalculated constants */
 	xfs_filblks_t	 qi_dqchunklen;	 /* # BBs in a chunk of dqs */
 	uint		 qi_dqperchunk;	 /* # ondisk dqs in above chunk */
+	xfs_qcnt_t	 qi_bhardlimit;	 /* default data blk hard limit */
+	xfs_qcnt_t	 qi_bsoftlimit;	 /* default data blk soft limit */
+	xfs_qcnt_t	 qi_ihardlimit;	 /* default inode count hard limit */
+	xfs_qcnt_t	 qi_isoftlimit;	 /* default inode count soft limit */
+	xfs_qcnt_t	 qi_rtbhardlimit;/* default realtime blk hard limit */
+	xfs_qcnt_t	 qi_rtbsoftlimit;/* default realtime blk soft limit */
 } xfs_quotainfo_t;
 
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/quota/xfs_qm_stats.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/quota/xfs_qm_stats.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/quota/xfs_qm_stats.c	2004-06-29 11:23:25.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/quota/xfs_qm_stats.c	2004-09-05 16:08:48.000000000 +0200
@@ -137,8 +137,8 @@ xfs_qm_read_stats(
 void
 xfs_qm_init_procfs(void)
 {
-	create_proc_read_entry("fs/xfs/xqmstat", 0, 0, xfs_qm_read_stats, NULL);
-	create_proc_read_entry("fs/xfs/xqm", 0, 0, xfs_qm_read_xfsquota, NULL);
+	create_proc_read_entry("fs/xfs/xqmstat", 0, NULL, xfs_qm_read_stats, NULL);
+	create_proc_read_entry("fs/xfs/xqm", 0, NULL, xfs_qm_read_xfsquota, NULL);
 }
 
 void
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/quota/xfs_qm_syscalls.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/quota/xfs_qm_syscalls.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/quota/xfs_qm_syscalls.c	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/quota/xfs_qm_syscalls.c	2004-09-05 16:08:48.000000000 +0200
@@ -648,8 +648,11 @@ xfs_qm_scall_setqlim(
 	if (hard == 0 || hard >= soft) {
 		INT_SET(ddq->d_blk_hardlimit, ARCH_CONVERT, hard);
 		INT_SET(ddq->d_blk_softlimit, ARCH_CONVERT, soft);
-	}
-	else {
+		if (id == 0) {
+			mp->m_quotainfo->qi_bhardlimit = hard;
+			mp->m_quotainfo->qi_bsoftlimit = soft;
+		}
+	} else {
 		qdprintk("blkhard %Ld < blksoft %Ld\n", hard, soft);
 	}
 	hard = (newlim->d_fieldmask & FS_DQ_RTBHARD) ?
@@ -661,40 +664,49 @@ xfs_qm_scall_setqlim(
 	if (hard == 0 || hard >= soft) {
 		INT_SET(ddq->d_rtb_hardlimit, ARCH_CONVERT, hard);
 		INT_SET(ddq->d_rtb_softlimit, ARCH_CONVERT, soft);
-	}
-	else
+		if (id == 0) {
+			mp->m_quotainfo->qi_rtbhardlimit = hard;
+			mp->m_quotainfo->qi_rtbsoftlimit = soft;
+		}
+	} else {
 		qdprintk("rtbhard %Ld < rtbsoft %Ld\n", hard, soft);
+	}
 
 	hard = (newlim->d_fieldmask & FS_DQ_IHARD) ?
 		(xfs_qcnt_t) newlim->d_ino_hardlimit :
-		INT_GET(ddq->d_ino_hardlimit, ARCH_CONVERT);
+			INT_GET(ddq->d_ino_hardlimit, ARCH_CONVERT);
 	soft = (newlim->d_fieldmask & FS_DQ_ISOFT) ?
 		(xfs_qcnt_t) newlim->d_ino_softlimit :
-		INT_GET(ddq->d_ino_softlimit, ARCH_CONVERT);
+			INT_GET(ddq->d_ino_softlimit, ARCH_CONVERT);
 	if (hard == 0 || hard >= soft) {
 		INT_SET(ddq->d_ino_hardlimit, ARCH_CONVERT, hard);
 		INT_SET(ddq->d_ino_softlimit, ARCH_CONVERT, soft);
-	}
-	else
+		if (id == 0) {
+			mp->m_quotainfo->qi_ihardlimit = hard;
+			mp->m_quotainfo->qi_isoftlimit = soft;
+		}
+	} else {
 		qdprintk("ihard %Ld < isoft %Ld\n", hard, soft);
+	}
 
 	if (id == 0) {
 		/*
 		 * Timelimits for the super user set the relative time
 		 * the other users can be over quota for this file system.
-		 * If it is zero a default is used.
+		 * If it is zero a default is used.  Ditto for the default
+		 * soft and hard limit values (already done, above).
 		 */
 		if (newlim->d_fieldmask & FS_DQ_BTIMER) {
 			mp->m_quotainfo->qi_btimelimit = newlim->d_btimer;
-			INT_SET(dqp->q_core.d_btimer, ARCH_CONVERT, newlim->d_btimer);
+			INT_SET(ddq->d_btimer, ARCH_CONVERT, newlim->d_btimer);
 		}
 		if (newlim->d_fieldmask & FS_DQ_ITIMER) {
 			mp->m_quotainfo->qi_itimelimit = newlim->d_itimer;
-			INT_SET(dqp->q_core.d_itimer, ARCH_CONVERT, newlim->d_itimer);
+			INT_SET(ddq->d_itimer, ARCH_CONVERT, newlim->d_itimer);
 		}
 		if (newlim->d_fieldmask & FS_DQ_RTBTIMER) {
 			mp->m_quotainfo->qi_rtbtimelimit = newlim->d_rtbtimer;
-			INT_SET(dqp->q_core.d_rtbtimer, ARCH_CONVERT, newlim->d_rtbtimer);
+			INT_SET(ddq->d_rtbtimer, ARCH_CONVERT, newlim->d_rtbtimer);
 		}
 	} else /* if (XFS_IS_QUOTA_ENFORCED(mp)) */ {
 		/*
@@ -1114,7 +1126,7 @@ mutex_t	      qcheck_lock;
 	  cmn_err(CE_DEBUG, "%s (#%d)", title, (int) (l)->qh_nelems); \
 	  for (dqp = (xfs_dqtest_t *)(l)->qh_next; dqp != NULL; \
 	       dqp = (xfs_dqtest_t *)dqp->NXT) { \
-		cmn_err(CE_DEBUG, "  %d\. \"%d (%s)\"  bcnt = %d, icnt = %d", \
+		cmn_err(CE_DEBUG, "  %d. \"%d (%s)\"  bcnt = %d, icnt = %d", \
 			 ++i, dqp->d_id, DQFLAGTO_TYPESTR(dqp),	     \
 			 dqp->d_bcount, dqp->d_icount); } \
 }
@@ -1299,7 +1311,7 @@ STATIC int
 xfs_qm_internalqcheck_adjust(
 	xfs_mount_t	*mp,		/* mount point for filesystem */
 	xfs_ino_t	ino,		/* inode number to get data for */
-	void		*buffer,	/* not used */
+	void		__user *buffer,	/* not used */
 	int		ubsize,		/* not used */
 	void		*private_data,	/* not used */
 	xfs_daddr_t	bno,		/* starting block of inode cluster */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/quota/xfs_trans_dquot.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/quota/xfs_trans_dquot.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/quota/xfs_trans_dquot.c	2004-06-29 11:31:58.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/quota/xfs_trans_dquot.c	2004-09-05 16:08:48.000000000 +0200
@@ -452,9 +452,13 @@ xfs_trans_apply_dquot_deltas(
 				INT_MOD(d->d_rtbcount, ARCH_CONVERT, (xfs_qcnt_t)totalrtbdelta);
 
 			/*
+			 * Get any default limits in use.
 			 * Start/reset the timer(s) if needed.
 			 */
-			xfs_qm_adjust_dqtimers(tp->t_mountp, d);
+			if (!INT_ISZERO(d->d_id, ARCH_CONVERT)) {
+				xfs_qm_adjust_dqlimits(tp->t_mountp, d);
+				xfs_qm_adjust_dqtimers(tp->t_mountp, d);
+			}
 
 			dqp->dq_flags |= XFS_DQ_DIRTY;
 			/*
@@ -625,6 +629,7 @@ xfs_trans_unreserve_and_mod_dquots(
 STATIC int
 xfs_trans_dqresv(
 	xfs_trans_t	*tp,
+	xfs_mount_t	*mp,
 	xfs_dquot_t	*dqp,
 	long		nblks,
 	long		ninos,
@@ -635,6 +640,7 @@ xfs_trans_dqresv(
 	xfs_qcnt_t	softlimit;
 	time_t		btimer;
 	xfs_qcnt_t	*resbcountp;
+	xfs_quotainfo_t	*q = mp->m_quotainfo;
 
 	if (! (flags & XFS_QMOPT_DQLOCK)) {
 		xfs_dqlock(dqp);
@@ -642,13 +648,21 @@ xfs_trans_dqresv(
 	ASSERT(XFS_DQ_IS_LOCKED(dqp));
 	if (flags & XFS_TRANS_DQ_RES_BLKS) {
 		hardlimit = INT_GET(dqp->q_core.d_blk_hardlimit, ARCH_CONVERT);
+		if (!hardlimit)
+			hardlimit = q->qi_bhardlimit;
 		softlimit = INT_GET(dqp->q_core.d_blk_softlimit, ARCH_CONVERT);
+		if (!softlimit)
+			softlimit = q->qi_bsoftlimit;
 		btimer = INT_GET(dqp->q_core.d_btimer, ARCH_CONVERT);
 		resbcountp = &dqp->q_res_bcount;
 	} else {
 		ASSERT(flags & XFS_TRANS_DQ_RES_RTBLKS);
 		hardlimit = INT_GET(dqp->q_core.d_rtb_hardlimit, ARCH_CONVERT);
+		if (!hardlimit)
+			hardlimit = q->qi_rtbhardlimit;
 		softlimit = INT_GET(dqp->q_core.d_rtb_softlimit, ARCH_CONVERT);
+		if (!softlimit)
+			softlimit = q->qi_rtbsoftlimit;
 		btimer = INT_GET(dqp->q_core.d_rtbtimer, ARCH_CONVERT);
 		resbcountp = &dqp->q_res_rtbcount;
 	}
@@ -689,14 +703,18 @@ xfs_trans_dqresv(
 			}
 		}
 		if (ninos > 0) {
-			if (INT_GET(dqp->q_core.d_ino_hardlimit, ARCH_CONVERT) > 0ULL &&
-			    INT_GET(dqp->q_core.d_icount, ARCH_CONVERT) >=
-			    INT_GET(dqp->q_core.d_ino_hardlimit, ARCH_CONVERT)) {
+			hardlimit = INT_GET(dqp->q_core.d_ino_hardlimit, ARCH_CONVERT);
+			if (!hardlimit)
+				hardlimit = q->qi_ihardlimit;
+			softlimit = INT_GET(dqp->q_core.d_ino_softlimit, ARCH_CONVERT);
+			if (!softlimit)
+				softlimit = q->qi_isoftlimit;
+			if (hardlimit > 0ULL &&
+			    INT_GET(dqp->q_core.d_icount, ARCH_CONVERT) >= hardlimit) {
 				error = EDQUOT;
 				goto error_return;
-			} else if (INT_GET(dqp->q_core.d_ino_softlimit, ARCH_CONVERT) > 0ULL &&
-				   INT_GET(dqp->q_core.d_icount, ARCH_CONVERT) >=
-				   INT_GET(dqp->q_core.d_ino_softlimit, ARCH_CONVERT)) {
+			} else if (softlimit > 0ULL &&
+				   INT_GET(dqp->q_core.d_icount, ARCH_CONVERT) >= softlimit) {
 				/*
 				 * If timer or warnings has expired,
 				 * return EDQUOT
@@ -786,19 +804,20 @@ xfs_trans_reserve_quota_bydquots(
 	resvd = 0;
 
 	if (udqp) {
-		if (xfs_trans_dqresv(tp, udqp, nblks, ninos, flags))
+		if (xfs_trans_dqresv(tp, mp, udqp, nblks, ninos, flags))
 			return (EDQUOT);
 		resvd = 1;
 	}
 
 	if (gdqp) {
-		if (xfs_trans_dqresv(tp, gdqp, nblks, ninos, flags)) {
+		if (xfs_trans_dqresv(tp, mp, gdqp, nblks, ninos, flags)) {
 			/*
 			 * can't do it, so backout previous reservation
 			 */
 			if (resvd) {
-				xfs_trans_dqresv(tp, udqp,  -nblks, -ninos,
-						 flags);
+				flags |= XFS_QMOPT_FORCE_RES;
+				xfs_trans_dqresv(tp, mp, udqp,
+						 -nblks, -ninos, flags);
 			}
 			return (EDQUOT);
 		}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/support/ktrace.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/support/ktrace.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/support/ktrace.c	2004-06-29 11:31:58.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/support/ktrace.c	2004-09-05 16:08:48.000000000 +0200
@@ -30,14 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <linux/types.h>
-#include <linux/slab.h>
-
-#include <xfs_types.h>
-#include "kmem.h"
-#include "spin.h"
-#include "debug.h"
-#include "ktrace.h"
+#include <xfs.h>
 
 static kmem_zone_t *ktrace_hdr_zone;
 static kmem_zone_t *ktrace_ent_zone;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/support/move.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/support/move.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/support/move.c	2004-06-29 11:23:25.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/support/move.c	2004-09-05 16:08:48.000000000 +0200
@@ -30,13 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <linux/string.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include <xfs_types.h>
-#include "debug.h"
-#include "move.h"
+#include <xfs.h>
 
 /* Read from kernel buffer at src to user/kernel buffer defined
  * by the uio structure. Advance the pointer in the uio struct
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_acl.h linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_acl.h
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_acl.h	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_acl.h	2004-09-05 16:08:48.000000000 +0200
@@ -95,7 +95,7 @@ extern int xfs_acl_vremove(struct vnode 
 #define _ACL_XFS_IACCESS(i,m,c) (XFS_IFORK_Q(i) ? xfs_acl_iaccess(i,m,c) : -1)
 
 #define _ACL_ALLOC(a)		((a) = kmem_zone_alloc(xfs_acl_zone, KM_SLEEP))
-#define _ACL_FREE(a)		((a)? kmem_zone_free(xfs_acl_zone, (a)) : 0)
+#define _ACL_FREE(a)		((a)? kmem_zone_free(xfs_acl_zone, (a)):(void)0)
 
 #else
 #define xfs_acl_zone_init(zone,name)
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_alloc.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_alloc.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_alloc.c	2004-06-29 11:31:58.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_alloc.c	2004-09-05 16:08:48.000000000 +0200
@@ -665,7 +665,7 @@ xfs_alloc_ag_vextent_exact(
 	 * Allocate/initialize a cursor for the by-number freespace btree.
 	 */
 	bno_cur = xfs_btree_init_cursor(args->mp, args->tp, args->agbp,
-		args->agno, XFS_BTNUM_BNO, 0, 0);
+		args->agno, XFS_BTNUM_BNO, NULL, 0);
 	/*
 	 * Lookup bno and minlen in the btree (minlen is irrelevant, really).
 	 * Look for the closest free block <= bno, it must contain bno
@@ -721,7 +721,7 @@ xfs_alloc_ag_vextent_exact(
 	 * Allocate/initialize a cursor for the by-size btree.
 	 */
 	cnt_cur = xfs_btree_init_cursor(args->mp, args->tp, args->agbp,
-		args->agno, XFS_BTNUM_CNT, 0, 0);
+		args->agno, XFS_BTNUM_CNT, NULL, 0);
 	ASSERT(args->agbno + args->len <=
 		INT_GET(XFS_BUF_TO_AGF(args->agbp)->agf_length,
 			ARCH_CONVERT));
@@ -788,7 +788,7 @@ xfs_alloc_ag_vextent_near(
 	 * Get a cursor for the by-size btree.
 	 */
 	cnt_cur = xfs_btree_init_cursor(args->mp, args->tp, args->agbp,
-		args->agno, XFS_BTNUM_CNT, 0, 0);
+		args->agno, XFS_BTNUM_CNT, NULL, 0);
 	ltlen = 0;
 	bno_cur_lt = bno_cur_gt = NULL;
 	/*
@@ -916,7 +916,7 @@ xfs_alloc_ag_vextent_near(
 		 * Set up a cursor for the by-bno tree.
 		 */
 		bno_cur_lt = xfs_btree_init_cursor(args->mp, args->tp,
-			args->agbp, args->agno, XFS_BTNUM_BNO, 0, 0);
+			args->agbp, args->agno, XFS_BTNUM_BNO, NULL, 0);
 		/*
 		 * Fix up the btree entries.
 		 */
@@ -944,7 +944,7 @@ xfs_alloc_ag_vextent_near(
 	 * Allocate and initialize the cursor for the leftward search.
 	 */
 	bno_cur_lt = xfs_btree_init_cursor(args->mp, args->tp, args->agbp,
-		args->agno, XFS_BTNUM_BNO, 0, 0);
+		args->agno, XFS_BTNUM_BNO, NULL, 0);
 	/*
 	 * Lookup <= bno to find the leftward search's starting point.
 	 */
@@ -956,7 +956,7 @@ xfs_alloc_ag_vextent_near(
 		 * search.
 		 */
 		bno_cur_gt = bno_cur_lt;
-		bno_cur_lt = 0;
+		bno_cur_lt = NULL;
 	}
 	/*
 	 * Found something.  Duplicate the cursor for the rightward search.
@@ -1301,7 +1301,7 @@ xfs_alloc_ag_vextent_size(
 	 * Allocate and initialize a cursor for the by-size btree.
 	 */
 	cnt_cur = xfs_btree_init_cursor(args->mp, args->tp, args->agbp,
-		args->agno, XFS_BTNUM_CNT, 0, 0);
+		args->agno, XFS_BTNUM_CNT, NULL, 0);
 	bno_cur = NULL;
 	/*
 	 * Look for an entry >= maxlen+alignment-1 blocks.
@@ -1406,7 +1406,7 @@ xfs_alloc_ag_vextent_size(
 	 * Allocate and initialize a cursor for the by-block tree.
 	 */
 	bno_cur = xfs_btree_init_cursor(args->mp, args->tp, args->agbp,
-		args->agno, XFS_BTNUM_BNO, 0, 0);
+		args->agno, XFS_BTNUM_BNO, NULL, 0);
 	if ((error = xfs_alloc_fixup_trees(cnt_cur, bno_cur, fbno, flen,
 			rbno, rlen, XFSA_FIXUP_CNT_OK)))
 		goto error0;
@@ -1553,7 +1553,7 @@ xfs_free_ag_extent(
 	/*
 	 * Allocate and initialize a cursor for the by-block btree.
 	 */
-	bno_cur = xfs_btree_init_cursor(mp, tp, agbp, agno, XFS_BTNUM_BNO, 0,
+	bno_cur = xfs_btree_init_cursor(mp, tp, agbp, agno, XFS_BTNUM_BNO, NULL,
 		0);
 	cnt_cur = NULL;
 	/*
@@ -1613,7 +1613,7 @@ xfs_free_ag_extent(
 	/*
 	 * Now allocate and initialize a cursor for the by-size tree.
 	 */
-	cnt_cur = xfs_btree_init_cursor(mp, tp, agbp, agno, XFS_BTNUM_CNT, 0,
+	cnt_cur = xfs_btree_init_cursor(mp, tp, agbp, agno, XFS_BTNUM_CNT, NULL,
 		0);
 	/*
 	 * Have both left and right contiguous neighbors.
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_alloc_btree.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_alloc_btree.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_alloc_btree.c	2004-06-29 11:31:58.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_alloc_btree.c	2004-09-05 16:08:48.000000000 +0200
@@ -263,7 +263,7 @@ xfs_alloc_delrec(
 			/*
 			 * Update the cursor so there's one fewer level.
 			 */
-			xfs_btree_setbuf(cur, level, 0);
+			xfs_btree_setbuf(cur, level, NULL);
 			cur->bc_nlevels--;
 		} else if (level > 0 &&
 			   (error = xfs_alloc_decrement(cur, level, &i)))
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_attr.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_attr.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_attr.c	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_attr.c	2004-09-05 16:08:48.000000000 +0200
@@ -104,7 +104,6 @@ STATIC int xfs_attr_rmtval_set(xfs_da_ar
 STATIC int xfs_attr_rmtval_remove(xfs_da_args_t *args);
 
 #define ATTR_RMTVALUE_MAPSIZE	1	/* # of map entries at once */
-#define ATTR_RMTVALUE_TRANSBLKS	8	/* max # of blks in a transaction */
 
 #if defined(XFS_ATTR_TRACE)
 ktrace_t *xfs_attr_trace_buf;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_bmap.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_bmap.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_bmap.c	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_bmap.c	2004-09-05 16:08:48.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2004 Silicon Graphics, Inc.  All Rights Reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
@@ -203,8 +203,6 @@ STATIC void
 xfs_bmap_check_extents(
 	xfs_inode_t		*ip,		/* incore inode pointer */
 	int			whichfork);	/* data or attr fork */
-#else
-#define	xfs_bmap_check_extents(ip,w)
 #endif
 
 /*
@@ -3429,6 +3427,20 @@ xfs_bmap_do_search_extents(
 	int		high;		/* high index of binary search */
 	int		low;		/* low index of binary search */
 
+	/*
+	 * Initialize the extent entry structure to catch access to
+	 * uninitialized br_startblock field.
+	 */
+	got.br_startoff = 0xffa5a5a5a5a5a5a5LL;
+	got.br_blockcount = 0xa55a5a5a5a5a5a5aLL;
+	got.br_state = XFS_EXT_INVALID;
+
+#if XFS_BIG_BLKNOS
+	got.br_startblock = 0xffffa5a5a5a5a5a5LL;
+#else
+	got.br_startblock = 0xffffa5a5;
+#endif
+
 	if (lastx != NULLEXTNUM && lastx < nextents)
 		ep = base + lastx;
 	else
@@ -3527,6 +3539,8 @@ xfs_bmap_search_extents(
 	xfs_bmbt_rec_t  *base;          /* base of extent list */
 	xfs_extnum_t    lastx;          /* last extent index used */
 	xfs_extnum_t    nextents;       /* extent list size */
+	xfs_bmbt_rec_t  *ep;            /* extent list entry pointer */
+	int		rt;		/* realtime flag    */
 
 	XFS_STATS_INC(xs_look_exlist);
 	ifp = XFS_IFORK_PTR(ip, whichfork);
@@ -3534,8 +3548,18 @@ xfs_bmap_search_extents(
 	nextents = ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t);
 	base = &ifp->if_u1.if_extents[0];
 
-	return xfs_bmap_do_search_extents(base, lastx, nextents, bno, eofp,
+	ep = xfs_bmap_do_search_extents(base, lastx, nextents, bno, eofp,
 					  lastxp, gotp, prevp);
+	rt = ip->i_d.di_flags & XFS_DIFLAG_REALTIME;
+	if(!rt && !gotp->br_startblock && (*lastxp != NULLEXTNUM)) {
+                cmn_err(CE_PANIC,"Access to block zero: fs: <%s> inode: %lld "
+			"start_block : %llx start_off : %llx blkcnt : %llx "
+			"extent-state : %x \n",
+			(ip->i_mount)->m_fsname,(long long)ip->i_ino,
+			gotp->br_startblock, gotp->br_startoff,
+			gotp->br_blockcount,gotp->br_state);
+        }
+        return ep;
 }
 
 
@@ -4689,8 +4713,41 @@ xfs_bmapi(
 					}
 					break;
 				}
+
+				/*
+				 * Split changing sb for alen and indlen since
+				 * they could be coming from different places.
+				 */
+				if (ip->i_d.di_flags & XFS_DIFLAG_REALTIME) {
+					xfs_extlen_t	extsz;
+					xfs_extlen_t	ralen;
+					if (!(extsz = ip->i_d.di_extsize))
+						extsz = mp->m_sb.sb_rextsize;
+					ralen = roundup(alen, extsz);
+					ralen = ralen / mp->m_sb.sb_rextsize;
+					if (xfs_mod_incore_sb(mp,
+						XFS_SBS_FREXTENTS,
+						-(ralen), rsvd)) {
+						if (XFS_IS_QUOTA_ON(ip->i_mount))
+							XFS_TRANS_UNRESERVE_BLKQUOTA(
+						     		mp, NULL, ip,
+								(long)alen);
+						break;
+					}
+				} else {
+					if (xfs_mod_incore_sb(mp,
+							      XFS_SBS_FDBLOCKS,
+							      -(alen), rsvd)) {
+						if (XFS_IS_QUOTA_ON(ip->i_mount))
+							XFS_TRANS_UNRESERVE_BLKQUOTA(
+								mp, NULL, ip,
+								(long)alen);
+						break;
+					}
+				}
+
 				if (xfs_mod_incore_sb(mp, XFS_SBS_FDBLOCKS,
-						-(alen + indlen), rsvd)) {
+						-(indlen), rsvd)) {
 					XFS_TRANS_UNRESERVE_BLKQUOTA(
 						mp, NULL, ip, (long)alen);
 					break;
@@ -5445,7 +5502,7 @@ int						/* error code */
 xfs_getbmap(
 	bhv_desc_t		*bdp,		/* XFS behavior descriptor*/
 	struct getbmap		*bmv,		/* user bmap structure */
-	void			*ap,		/* pointer to user's array */
+	void			__user *ap,	/* pointer to user's array */
 	int			interface)	/* interface flags */
 {
 	__int64_t		bmvend;		/* last block requested */
@@ -5634,8 +5691,10 @@ xfs_getbmap(
 					(__int64_t)(bmvend - bmv->bmv_offset));
 				bmv->bmv_entries++;
 				ap = (interface & BMV_IF_EXTENDED) ?
-					(void *)((struct getbmapx *)ap + 1) :
-					(void *)((struct getbmap *)ap + 1);
+						(void __user *)
+					((struct getbmapx __user *)ap + 1) :
+						(void __user *)
+					((struct getbmap __user *)ap + 1);
 			}
 		}
 	} while (nmap && nexleft && bmv->bmv_length);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_bmap.h linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_bmap.h
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_bmap.h	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_bmap.h	2004-09-05 16:08:48.000000000 +0200
@@ -328,7 +328,7 @@ int						/* error code */
 xfs_getbmap(
 	bhv_desc_t		*bdp,		/* XFS behavior descriptor*/
 	struct getbmap		*bmv,		/* user bmap structure */
-	void			*ap,		/* pointer to user's array */
+	void			__user *ap,	/* pointer to user's array */
 	int			iflags);	/* interface flags */
 
 /*
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_bmap_btree.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_bmap_btree.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_bmap_btree.c	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_bmap_btree.c	2004-09-05 16:08:48.000000000 +0200
@@ -1953,7 +1953,7 @@ xfs_bmbt_get_block(
 		*bpp = cur->bc_bufs[level];
 		rval = XFS_BUF_TO_BMBT_BLOCK(*bpp);
 	} else {
-		*bpp = 0;
+		*bpp = NULL;
 		ifp = XFS_IFORK_PTR(cur->bc_private.b.ip,
 			cur->bc_private.b.whichfork);
 		rval = ifp->if_broot;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_bmap_btree.h linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_bmap_btree.h
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_bmap_btree.h	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_bmap_btree.h	2004-09-05 16:08:48.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000,2002-2004 Silicon Graphics, Inc.  All Rights Reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
@@ -153,7 +153,7 @@ typedef enum {
  */
 typedef enum {
 	XFS_EXT_NORM, XFS_EXT_UNWRITTEN,
-	XFS_EXT_DMAPI_OFFLINE
+	XFS_EXT_DMAPI_OFFLINE, XFS_EXT_INVALID
 } xfs_exntst_t;
 
 /*
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_buf_item.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_buf_item.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_buf_item.c	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_buf_item.c	2004-09-05 16:08:48.000000000 +0200
@@ -55,8 +55,6 @@
 #include "xfs_error.h"
 
 
-#define	ROUNDUPNBWORD(x)	(((x) + (NBWORD - 1)) & ~(NBWORD - 1))
-
 kmem_zone_t	*xfs_buf_item_zone;
 
 #ifdef XFS_TRANS_DEBUG
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_da_btree.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_da_btree.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_da_btree.c	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_da_btree.c	2004-09-05 16:08:48.000000000 +0200
@@ -2092,7 +2092,7 @@ xfs_da_do_buf(
 	int		caller,
 	inst_t		*ra)
 {
-	xfs_buf_t	*bp = 0;
+	xfs_buf_t	*bp = NULL;
 	xfs_buf_t	**bplist;
 	int		error=0;
 	int		i;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_dfrag.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_dfrag.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_dfrag.c	2004-06-29 11:31:58.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_dfrag.c	2004-09-05 16:08:48.000000000 +0200
@@ -65,7 +65,7 @@
  */
 int
 xfs_swapext(
-	xfs_swapext_t   *sxp)
+	xfs_swapext_t	__user *sxp)
 {
 	xfs_swapext_t	sx;
 	xfs_inode_t     *ip=NULL, *tip=NULL, *ips[2];
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_dfrag.h linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_dfrag.h
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_dfrag.h	2004-06-29 11:23:26.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_dfrag.h	2004-09-05 16:08:48.000000000 +0200
@@ -60,7 +60,7 @@ typedef struct xfs_swapext
 /*
  * Syscall interface for xfs_swapext
  */
-int	xfs_swapext(struct xfs_swapext *sx);
+int	xfs_swapext(struct xfs_swapext __user *sx);
 
 #endif	/* __KERNEL__ */
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_dinode.h linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_dinode.h
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_dinode.h	2004-06-29 11:31:58.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_dinode.h	2004-09-05 16:08:48.000000000 +0200
@@ -456,6 +456,7 @@ xfs_dinode_t *xfs_buf_to_dinode(struct x
 #define XFS_DIFLAG_SYNC_BIT      5	/* inode is written synchronously */
 #define XFS_DIFLAG_NOATIME_BIT   6	/* do not update atime */
 #define XFS_DIFLAG_NODUMP_BIT    7	/* do not dump */
+#define XFS_DIFLAG_RTINHERIT_BIT 8	/* create with realtime bit set */
 #define XFS_DIFLAG_REALTIME      (1 << XFS_DIFLAG_REALTIME_BIT)
 #define XFS_DIFLAG_PREALLOC      (1 << XFS_DIFLAG_PREALLOC_BIT)
 #define XFS_DIFLAG_NEWRTBM       (1 << XFS_DIFLAG_NEWRTBM_BIT)
@@ -464,5 +465,11 @@ xfs_dinode_t *xfs_buf_to_dinode(struct x
 #define XFS_DIFLAG_SYNC          (1 << XFS_DIFLAG_SYNC_BIT)
 #define XFS_DIFLAG_NOATIME       (1 << XFS_DIFLAG_NOATIME_BIT)
 #define XFS_DIFLAG_NODUMP        (1 << XFS_DIFLAG_NODUMP_BIT)
+#define XFS_DIFLAG_RTINHERIT     (1 << XFS_DIFLAG_RTINHERIT_BIT)
+
+#define XFS_DIFLAG_ANY \
+	(XFS_DIFLAG_REALTIME | XFS_DIFLAG_PREALLOC | XFS_DIFLAG_NEWRTBM | \
+	 XFS_DIFLAG_IMMUTABLE | XFS_DIFLAG_APPEND | XFS_DIFLAG_SYNC | \
+	 XFS_DIFLAG_NOATIME | XFS_DIFLAG_NODUMP | XFS_DIFLAG_RTINHERIT)
 
 #endif	/* __XFS_DINODE_H__ */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_dir2_trace.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_dir2_trace.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_dir2_trace.c	2004-06-29 11:31:58.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_dir2_trace.c	2004-09-05 16:08:48.000000000 +0200
@@ -211,7 +211,7 @@ xfs_dir2_trace_args_s(
 		(void *)((unsigned long)(args->inumber >> 32)),
 		(void *)((unsigned long)(args->inumber & 0xFFFFFFFF)),
 		(void *)args->dp, (void *)args->trans,
-		(void *)(unsigned long)args->justcheck, (void *)(long)s, 0);
+		(void *)(unsigned long)args->justcheck, (void *)(long)s, NULL);
 }
 
 void
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_fs.h linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_fs.h
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_fs.h	2004-06-29 11:31:58.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_fs.h	2004-09-05 16:08:48.000000000 +0200
@@ -76,6 +76,7 @@ struct fsxattr {
 #define XFS_XFLAG_SYNC		0x00000020	/* all writes synchronous */
 #define XFS_XFLAG_NOATIME	0x00000040	/* do not update access time */
 #define XFS_XFLAG_NODUMP	0x00000080	/* do not include in backups */
+#define XFS_XFLAG_RTINHERIT	0x00000100	/* create with rt bit set */
 #define XFS_XFLAG_HASATTR	0x80000000	/* no DIFLAG for this	*/
 
 /*
@@ -164,7 +165,7 @@ typedef struct xfs_flock64 {
 	__s64		l_start;
 	__s64		l_len;		/* len == 0 means until end of file */
 	__s32		l_sysid;
-	pid_t		l_pid;
+	__u32		l_pid;
 	__s32		l_pad[4];	/* reserve area			    */
 } xfs_flock64_t;
 
@@ -313,10 +314,10 @@ typedef struct xfs_bstat {
  * The user-level BulkStat Request interface structure.
  */
 typedef struct xfs_fsop_bulkreq {
-	__u64		*lastip;	/* last inode # pointer		*/
+	__u64		__user *lastip;	/* last inode # pointer		*/
 	__s32		icount;		/* count of entries in buffer	*/
-	void		*ubuffer;	/* user buffer for inode desc.	*/
-	__s32		*ocount;	/* output count pointer		*/
+	void		__user *ubuffer;/* user buffer for inode desc.	*/
+	__s32		__user *ocount;	/* output count pointer		*/
 } xfs_fsop_bulkreq_t;
 
 
@@ -344,12 +345,12 @@ typedef struct xfs_error_injection {
  */
 typedef struct xfs_fsop_handlereq {
 	__u32		fd;		/* fd for FD_TO_HANDLE		*/
-	void		*path;		/* user pathname		*/
+	void		__user *path;	/* user pathname		*/
 	__u32		oflags;		/* open flags			*/
-	void		*ihandle;	/* user supplied handle		*/
+	void		__user *ihandle;/* user supplied handle		*/
 	__u32		ihandlen;	/* user supplied length		*/
-	void		*ohandle;	/* user buffer for handle	*/
-	__u32		*ohandlen;	/* user buffer length		*/
+	void		__user *ohandle;/* user buffer for handle	*/
+	__u32		__user *ohandlen;/* user buffer length		*/
 } xfs_fsop_handlereq_t;
 
 /*
@@ -360,35 +361,35 @@ typedef struct xfs_fsop_handlereq {
  */
 
 typedef struct xfs_fsop_setdm_handlereq {
-	struct xfs_fsop_handlereq hreq; /* handle interface structure */
-	struct fsdmidata *data;		/* DMAPI data to set	      */
+	struct xfs_fsop_handlereq	hreq;	/* handle information	*/
+	struct fsdmidata		__user *data;	/* DMAPI data	*/
 } xfs_fsop_setdm_handlereq_t;
 
 typedef struct xfs_attrlist_cursor {
-	__u32	opaque[4];
+	__u32		opaque[4];
 } xfs_attrlist_cursor_t;
 
 typedef struct xfs_fsop_attrlist_handlereq {
-	struct xfs_fsop_handlereq hreq; /* handle interface structure */
-	struct xfs_attrlist_cursor pos; /* opaque cookie, list offset */
-	__u32 flags;			/* flags, use ROOT/USER names */
-	__u32 buflen;			/* length of buffer supplied  */
-	void *buffer;			/* attrlist data to return    */
+	struct xfs_fsop_handlereq	hreq; /* handle interface structure */
+	struct xfs_attrlist_cursor	pos; /* opaque cookie, list offset */
+	__u32				flags;	/* which namespace to use */
+	__u32				buflen;	/* length of buffer supplied */
+	void				__user *buffer;	/* returned names */
 } xfs_fsop_attrlist_handlereq_t;
 
 typedef struct xfs_attr_multiop {
-	__u32	am_opcode;
-	__s32	am_error;
-	void	*am_attrname;
-	void	*am_attrvalue;
-	__u32	am_length;
-	__u32	am_flags;
+	__u32		am_opcode;
+	__s32		am_error;
+	void		__user *am_attrname;
+	void		__user *am_attrvalue;
+	__u32		am_length;
+	__u32		am_flags;
 } xfs_attr_multiop_t;
 
 typedef struct xfs_fsop_attrmulti_handlereq {
-	struct xfs_fsop_handlereq hreq; /* handle interface structure */
-	__u32 opcount;			/* count of following multiop */
-	struct xfs_attr_multiop *ops;	/* attr_multi data to get/set */
+	struct xfs_fsop_handlereq	hreq; /* handle interface structure */
+	__u32				opcount;/* count of following multiop */
+	struct xfs_attr_multiop		__user *ops; /* attr_multi data */
 } xfs_fsop_attrmulti_handlereq_t;
 
 /*
@@ -445,6 +446,13 @@ typedef struct xfs_handle {
 #define XFS_FSOP_GOING_FLAGS_NOLOGFLUSH		0x2	/* don't flush log nor data */
 
 /*
+ * ioctl commands that are used by Linux filesystems
+ */
+#define XFS_IOC_GETXFLAGS	_IOR('f', 1, long)
+#define XFS_IOC_SETXFLAGS	_IOW('f', 2, long)
+#define XFS_IOC_GETVERSION	_IOR('v', 1, long)
+
+/*
  * ioctl commands that replace IRIX fcntl()'s
  * For 'documentation' purposed more than anything else,
  * the "cmd #" field reflects the IRIX fcntl number.
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_fsops.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_fsops.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_fsops.c	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_fsops.c	2004-09-05 16:08:48.000000000 +0200
@@ -142,6 +142,7 @@ xfs_growfs_data_private(
 	int			dpct;
 	int			error;
 	xfs_agnumber_t		nagcount;
+	xfs_agnumber_t		nagimax = 0;
 	xfs_rfsblock_t		nb, nb_mod;
 	xfs_rfsblock_t		new;
 	xfs_rfsblock_t		nfree;
@@ -183,7 +184,7 @@ xfs_growfs_data_private(
 		memset(&mp->m_perag[oagcount], 0,
 			(nagcount - oagcount) * sizeof(xfs_perag_t));
 		mp->m_flags |= XFS_MOUNT_32BITINODES;
-		xfs_initialize_perag(mp, nagcount);
+		nagimax = xfs_initialize_perag(mp, nagcount);
 		up_write(&mp->m_peraglock);
 	}
 	tp = xfs_trans_alloc(mp, XFS_TRANS_GROWFS);
@@ -372,6 +373,9 @@ xfs_growfs_data_private(
 	if (error) {
 		return error;
 	}
+	/* New allocation groups fully initialized, so update mount struct */
+	if (nagimax)
+		mp->m_maxagi = nagimax;
 	if (mp->m_sb.sb_imax_pct) {
 		__uint64_t icount = mp->m_sb.sb_dblocks * mp->m_sb.sb_imax_pct;
 		do_div(icount, 100);
@@ -507,9 +511,9 @@ xfs_reserve_blocks(
 	__uint64_t              *inval,
 	xfs_fsop_resblks_t      *outval)
 {
-	__uint64_t              lcounter, delta;
-	__uint64_t              request;
-	unsigned long s;
+	__int64_t		lcounter, delta;
+	__uint64_t		request;
+	unsigned long		s;
 
 	/* If inval is null, report current values and return */
 
@@ -536,8 +540,7 @@ xfs_reserve_blocks(
 		mp->m_resblks = request;
 	} else {
 		delta = request - mp->m_resblks;
-		lcounter = mp->m_sb.sb_fdblocks;
-		lcounter -= delta;
+		lcounter = mp->m_sb.sb_fdblocks - delta;
 		if (lcounter < 0) {
 			/* We can't satisfy the request, just get what we can */
 			mp->m_resblks += mp->m_sb.sb_fdblocks;
@@ -583,63 +586,22 @@ xfs_fs_log_dummy(xfs_mount_t *mp)
 }
 
 int
-xfs_fs_freeze(
-	xfs_mount_t	*mp)
-{
-	vfs_t		*vfsp;
-	/*REFERENCED*/
-	int		error;
-
-	vfsp = XFS_MTOVFS(mp);
-
-	/* Stop new writers */
-	xfs_start_freeze(mp, XFS_FREEZE_WRITE);
-
-	/* Flush the refcache */
-	xfs_refcache_purge_mp(mp);
-
-	/* Flush delalloc and delwri data */
-	VFS_SYNC(vfsp, SYNC_DELWRI|SYNC_WAIT, NULL, error);
-
-	/* Pause transaction subsystem */
-	xfs_start_freeze(mp, XFS_FREEZE_TRANS);
-
-	/* Flush any remaining inodes into buffers */
-	VFS_SYNC(vfsp, SYNC_ATTR|SYNC_WAIT, NULL, error);
-
-	/* Push all buffers out to disk */
-	xfs_binval(mp->m_ddev_targp);
-	if (mp->m_rtdev_targp) {
-		xfs_binval(mp->m_rtdev_targp);
-	}
-
-	/* Push the superblock and write an unmount record */
-	xfs_log_unmount_write(mp);
-	xfs_unmountfs_writesb(mp);
-
-	return 0;
-}
-
-int
-xfs_fs_thaw(
-	xfs_mount_t	*mp)
-{
-	xfs_finish_freeze(mp);
-	return 0;
-}
-
-int
 xfs_fs_goingdown(
 	xfs_mount_t	*mp,
 	__uint32_t	inflags)
 {
-	switch (inflags)
-	{
-	case XFS_FSOP_GOING_FLAGS_DEFAULT:
-		xfs_fs_freeze(mp);
-		xfs_force_shutdown(mp, XFS_FORCE_UMOUNT);
-		xfs_fs_thaw(mp);
+	switch (inflags) {
+	case XFS_FSOP_GOING_FLAGS_DEFAULT: {
+		struct vfs *vfsp = XFS_MTOVFS(mp);
+		struct super_block *sb = freeze_bdev(vfsp->vfs_super->s_bdev);
+
+		if (sb) {
+			xfs_force_shutdown(mp, XFS_FORCE_UMOUNT);
+			thaw_bdev(sb->s_bdev, sb);
+		}
+	
 		break;
+	}
 	case XFS_FSOP_GOING_FLAGS_LOGFLUSH:
 		xfs_force_shutdown(mp, XFS_FORCE_UMOUNT);
 		break;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_fsops.h linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_fsops.h
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_fsops.h	2004-06-29 11:31:58.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_fsops.h	2004-09-05 16:08:48.000000000 +0200
@@ -60,14 +60,6 @@ xfs_reserve_blocks(
 	xfs_fsop_resblks_t	*outval);
 
 int
-xfs_fs_freeze(
-	xfs_mount_t		*mp);
-
-int
-xfs_fs_thaw(
-	xfs_mount_t		*mp);
-
-int
 xfs_fs_goingdown(
 	xfs_mount_t		*mp,
 	__uint32_t		inflags);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_inode.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_inode.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_inode.c	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_inode.c	2004-09-05 16:08:48.000000000 +0200
@@ -860,25 +860,28 @@ xfs_dic2xflags(
 	xfs_arch_t		arch)
 {
 	__uint16_t		di_flags;
-	uint			flags = 0;
+	uint			flags;
 
 	di_flags = INT_GET(dic->di_flags, arch);
-	if (di_flags & XFS_DIFLAG_REALTIME)
-		flags |= XFS_XFLAG_REALTIME;
-	if (di_flags & XFS_DIFLAG_PREALLOC)
-		flags |= XFS_XFLAG_PREALLOC;
-	if (di_flags & XFS_DIFLAG_IMMUTABLE)
-		flags |= XFS_XFLAG_IMMUTABLE;
-	if (di_flags & XFS_DIFLAG_APPEND)
-		flags |= XFS_XFLAG_APPEND;
-	if (di_flags & XFS_DIFLAG_SYNC)
-		flags |= XFS_XFLAG_SYNC;
-	if (di_flags & XFS_DIFLAG_NOATIME)
-		flags |= XFS_XFLAG_NOATIME;
-	if (di_flags & XFS_DIFLAG_NODUMP)
-		flags |= XFS_XFLAG_NODUMP;
-	if (XFS_CFORK_Q_ARCH(dic, arch))
-		flags |= XFS_XFLAG_HASATTR;
+	flags = XFS_CFORK_Q_ARCH(dic, arch) ? XFS_XFLAG_HASATTR : 0;
+	if (di_flags & XFS_DIFLAG_ANY) {
+		if (di_flags & XFS_DIFLAG_REALTIME)
+			flags |= XFS_XFLAG_REALTIME;
+		if (di_flags & XFS_DIFLAG_PREALLOC)
+			flags |= XFS_XFLAG_PREALLOC;
+		if (di_flags & XFS_DIFLAG_IMMUTABLE)
+			flags |= XFS_XFLAG_IMMUTABLE;
+		if (di_flags & XFS_DIFLAG_APPEND)
+			flags |= XFS_XFLAG_APPEND;
+		if (di_flags & XFS_DIFLAG_SYNC)
+			flags |= XFS_XFLAG_SYNC;
+		if (di_flags & XFS_DIFLAG_NOATIME)
+			flags |= XFS_XFLAG_NOATIME;
+		if (di_flags & XFS_DIFLAG_NODUMP)
+			flags |= XFS_XFLAG_NODUMP;
+		if (di_flags & XFS_DIFLAG_RTINHERIT)
+			flags |= XFS_XFLAG_RTINHERIT;
+	}
 	return flags;
 }
 
@@ -1236,8 +1239,15 @@ xfs_ialloc(
 		break;
 	case S_IFREG:
 	case S_IFDIR:
-		if (pip->i_d.di_flags &
-		    (XFS_DIFLAG_NOATIME|XFS_DIFLAG_NODUMP|XFS_DIFLAG_SYNC)) {
+		if (unlikely(pip->i_d.di_flags & XFS_DIFLAG_ANY)) {
+			if (pip->i_d.di_flags & XFS_DIFLAG_RTINHERIT) {
+				if ((mode & S_IFMT) == S_IFDIR) {
+					ip->i_d.di_flags |= XFS_DIFLAG_RTINHERIT;
+				} else {
+					ip->i_d.di_flags |= XFS_DIFLAG_REALTIME;
+					ip->i_iocore.io_flags |= XFS_IOCORE_RT;
+				}
+			}
 			if ((pip->i_d.di_flags & XFS_DIFLAG_NOATIME) &&
 			    xfs_inherit_noatime)
 				ip->i_d.di_flags |= XFS_DIFLAG_NOATIME;
@@ -1248,6 +1258,7 @@ xfs_ialloc(
 			    xfs_inherit_sync)
 				ip->i_d.di_flags |= XFS_DIFLAG_SYNC;
 		}
+		/* FALLTHROUGH */
 	case S_IFLNK:
 		ip->i_d.di_format = XFS_DINODE_FMT_EXTENTS;
 		ip->i_df.if_flags = XFS_IFEXTENTS;
@@ -3579,6 +3590,7 @@ corrupt_out:
 	return XFS_ERROR(EFSCORRUPTED);
 }
 
+
 /*
  * Flush all inactive inodes in mp.  Return true if no user references
  * were found, false otherwise.
@@ -3634,7 +3646,6 @@ xfs_iflush_all(
 					continue;
 				}
 				if (!(flag & XFS_FLUSH_ALL)) {
-					ASSERT(0);
 					busy = 1;
 					done = 1;
 					break;
@@ -3851,6 +3862,6 @@ xfs_ilock_trace(xfs_inode_t *ip, int loc
 		     (void *)ra,		/* caller of ilock */
 		     (void *)(unsigned long)current_cpu(),
 		     (void *)(unsigned long)current_pid(),
-		     0,0,0,0,0,0,0,0,0,0);
+		     NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 }
 #endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_iomap.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_iomap.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_iomap.c	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_iomap.c	2004-09-05 16:08:48.000000000 +0200
@@ -165,20 +165,24 @@ xfs_imap_to_bmap(
 		nisize = io->io_new_size;
 
 	for (pbm = 0; imaps && pbm < iomaps; imaps--, iomapp++, imap++, pbm++) {
-		iomapp->iomap_target = io->io_flags & XFS_IOCORE_RT ?
-			mp->m_rtdev_targp : mp->m_ddev_targp;
 		iomapp->iomap_offset = XFS_FSB_TO_B(mp, imap->br_startoff);
 		iomapp->iomap_delta = offset - iomapp->iomap_offset;
 		iomapp->iomap_bsize = XFS_FSB_TO_B(mp, imap->br_blockcount);
 		iomapp->iomap_flags = flags;
 
+		if (io->io_flags & XFS_IOCORE_RT) {
+			iomapp->iomap_flags |= IOMAP_REALTIME;
+			iomapp->iomap_target = mp->m_rtdev_targp;
+		} else {
+			iomapp->iomap_target = mp->m_ddev_targp;
+		}
 		start_block = imap->br_startblock;
 		if (start_block == HOLESTARTBLOCK) {
 			iomapp->iomap_bn = IOMAP_DADDR_NULL;
-			iomapp->iomap_flags = IOMAP_HOLE;
+			iomapp->iomap_flags |= IOMAP_HOLE;
 		} else if (start_block == DELAYSTARTBLOCK) {
 			iomapp->iomap_bn = IOMAP_DADDR_NULL;
-			iomapp->iomap_flags = IOMAP_DELAY;
+			iomapp->iomap_flags |= IOMAP_DELAY;
 		} else {
 			iomapp->iomap_bn = XFS_FSB_TO_DB_IO(io, start_block);
 			if (ISUNWRITTEN(imap))
@@ -512,6 +516,15 @@ xfs_iomap_write_direct(
 
 	*ret_imap = imap[0];
 	*nmaps = 1;
+	if ( !(io->io_flags & XFS_IOCORE_RT)  && !ret_imap->br_startblock) {
+                cmn_err(CE_PANIC,"Access to block zero:  fs <%s> inode: %lld "
+                        "start_block : %llx start_off : %llx blkcnt : %llx "
+                        "extent-state : %x \n",
+                        (ip->i_mount)->m_fsname,
+                        (long long)ip->i_ino,
+                        ret_imap->br_startblock, ret_imap->br_startoff,
+                        ret_imap->br_blockcount,ret_imap->br_state);
+        }
 	return 0;
 
  error0:	/* Cancel bmap, unlock inode, and cancel trans */
@@ -572,8 +585,10 @@ retry:
 	 * out to the file system's write iosize.  We clean up any extra
 	 * space left over when the file is closed in xfs_inactive().
 	 *
-	 * We don't bother with this for sync writes, because we need
-	 * to minimize the amount we write for good performance.
+	 * For sync writes, we are flushing delayed allocate space to
+	 * try to make additional space available for allocation near
+	 * the filesystem full boundary - preallocation hurts in that
+	 * situation, of course.
 	 */
 	if (!(ioflag & BMAPI_SYNC) && ((offset + count) > ip->i_d.di_size)) {
 		xfs_off_t	aligned_offset;
@@ -598,6 +613,20 @@ retry:
 				return error;
 			}
 			for (n = 0; n < nimaps; n++) {
+				if ( !(io->io_flags & XFS_IOCORE_RT)  && 
+					!imap[n].br_startblock) {
+					cmn_err(CE_PANIC,"Access to block "
+						"zero:  fs <%s> inode: %lld "
+						"start_block : %llx start_off "
+						": %llx blkcnt : %llx "
+						"extent-state : %x \n",
+						(ip->i_mount)->m_fsname,
+						(long long)ip->i_ino,
+						imap[n].br_startblock,
+						imap[n].br_startoff,
+						imap[n].br_blockcount,
+						imap[n].br_state);
+        			}
 				if ((imap[n].br_startblock != HOLESTARTBLOCK) &&
 				    (imap[n].br_startblock != DELAYSTARTBLOCK)) {
 					goto write_map;
@@ -621,7 +650,8 @@ write_map:
 	 * request to a stripe width boundary if the file size is >=
 	 * stripe width and we are allocating past the allocation eof.
 	 */
-	if (mp->m_swidth && (mp->m_flags & XFS_MOUNT_SWALLOC)
+	if (!(io->io_flags & XFS_IOCORE_RT) && mp->m_swidth 
+	    && (mp->m_flags & XFS_MOUNT_SWALLOC)
 	    && (isize >= XFS_FSB_TO_B(mp, mp->m_swidth)) && aeof) {
 		int eof;
 		xfs_fileoff_t new_last_fsb;
@@ -639,8 +669,8 @@ write_map:
 	 * if the file size is >= stripe unit size, and we are allocating past
 	 * the allocation eof.
 	 */
-	} else if (mp->m_dalign && (isize >= XFS_FSB_TO_B(mp, mp->m_dalign))
-		   && aeof) {
+	} else if (!(io->io_flags & XFS_IOCORE_RT) && mp->m_dalign &&
+		   (isize >= XFS_FSB_TO_B(mp, mp->m_dalign)) && aeof) {
 		int eof;
 		xfs_fileoff_t new_last_fsb;
 		new_last_fsb = roundup_64(last_fsb, mp->m_dalign);
@@ -651,8 +681,22 @@ write_map:
 		if (eof) {
 			last_fsb = new_last_fsb;
 		}
-	}
+	/*
+	 * Round up the allocation request to a real-time extent boundary
+	 * if the file is on the real-time subvolume.
+	 */
+	} else if (io->io_flags & XFS_IOCORE_RT && aeof) {
+		int eof;
+		xfs_fileoff_t new_last_fsb;
 
+		new_last_fsb = roundup_64(last_fsb, mp->m_sb.sb_rextsize);
+		error = XFS_BMAP_EOF(mp, io, new_last_fsb, XFS_DATA_FORK, &eof);
+		if (error) {
+			return error;
+		}
+		if (eof)
+			last_fsb = new_last_fsb;
+	}
 	error = xfs_bmapi(NULL, ip, offset_fsb,
 			  (xfs_filblks_t)(last_fsb - offset_fsb),
 			  XFS_BMAPI_DELAY | XFS_BMAPI_WRITE |
@@ -680,6 +724,15 @@ write_map:
 
 	*ret_imap = imap[0];
 	*nmaps = 1;
+	if ( !(io->io_flags & XFS_IOCORE_RT)  && !ret_imap->br_startblock) {
+		cmn_err(CE_PANIC,"Access to block zero:  fs <%s> inode: %lld "
+                        "start_block : %llx start_off : %llx blkcnt : %llx "
+                        "extent-state : %x \n",
+                        (ip->i_mount)->m_fsname,
+                        (long long)ip->i_ino,
+                        ret_imap->br_startblock, ret_imap->br_startoff,
+                        ret_imap->br_blockcount,ret_imap->br_state);
+	}
 	return 0;
 }
 
@@ -697,6 +750,7 @@ xfs_iomap_write_allocate(
 	int		*retmap)
 {
 	xfs_mount_t	*mp = ip->i_mount;
+	xfs_iocore_t    *io = &ip->i_iocore;
 	xfs_fileoff_t	offset_fsb, last_block;
 	xfs_fileoff_t	end_fsb, map_start_fsb;
 	xfs_fsblock_t	first_block;
@@ -802,6 +856,18 @@ xfs_iomap_write_allocate(
 		 */
 
 		for (i = 0; i < nimaps; i++) {
+			if ( !(io->io_flags & XFS_IOCORE_RT)  && 
+				!imap[i].br_startblock) {
+				cmn_err(CE_PANIC,"Access to block zero:  "
+					"fs <%s> inode: %lld "
+					"start_block : %llx start_off : %llx " 
+					"blkcnt : %llx extent-state : %x \n",
+					(ip->i_mount)->m_fsname,
+					(long long)ip->i_ino,
+					imap[i].br_startblock,
+					imap[i].br_startoff,
+				        imap[i].br_blockcount,imap[i].br_state);
+                        }
 			if ((map->br_startoff >= imap[i].br_startoff) &&
 			    (map->br_startoff < (imap[i].br_startoff +
 						 imap[i].br_blockcount))) {
@@ -837,6 +903,7 @@ xfs_iomap_write_unwritten(
 	size_t		count)
 {
 	xfs_mount_t	*mp = ip->i_mount;
+	xfs_iocore_t    *io = &ip->i_iocore;
 	xfs_trans_t	*tp;
 	xfs_fileoff_t	offset_fsb;
 	xfs_filblks_t	count_fsb;
@@ -853,7 +920,8 @@ xfs_iomap_write_unwritten(
 				&ip->i_iocore, offset, count);
 
 	offset_fsb = XFS_B_TO_FSBT(mp, offset);
-	count_fsb = XFS_B_TO_FSB(mp, count);
+	count_fsb = XFS_B_TO_FSB(mp, (xfs_ufsize_t)offset + count);
+	count_fsb = (xfs_filblks_t)(count_fsb - offset_fsb);
 
 	do {
 		nres = XFS_DIOSTRAT_SPACE_RES(mp, 0);
@@ -898,6 +966,16 @@ xfs_iomap_write_unwritten(
 		xfs_iunlock(ip, XFS_ILOCK_EXCL);
 		if (error)
 			goto error0;
+		
+		if ( !(io->io_flags & XFS_IOCORE_RT)  && !imap.br_startblock) {
+			cmn_err(CE_PANIC,"Access to block zero:  fs <%s> "
+				"inode: %lld start_block : %llx start_off : "
+				"%llx blkcnt : %llx extent-state : %x \n",
+				(ip->i_mount)->m_fsname,
+				(long long)ip->i_ino,
+				imap.br_startblock,imap.br_startoff,
+				imap.br_blockcount,imap.br_state);
+        	}
 
 		if ((numblks_fsb = imap.br_blockcount) == 0) {
 			/*
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_iomap.h linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_iomap.h
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_iomap.h	2004-06-29 11:31:58.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_iomap.h	2004-09-05 16:08:48.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2003,2004 Silicon Graphics, Inc.  All Rights Reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
@@ -42,6 +42,7 @@ typedef enum {				/* iomap_flags values 
 	IOMAP_EOF =		0x01,	/* mapping contains EOF   */
 	IOMAP_HOLE =		0x02,	/* mapping covers a hole  */
 	IOMAP_DELAY =		0x04,	/* mapping covers delalloc region  */
+	IOMAP_REALTIME =	0x10,	/* mapping on the realtime device  */
 	IOMAP_UNWRITTEN =	0x20,	/* mapping covers allocated */
 					/* but uninitialized file data  */
 	IOMAP_NEW =		0x40	/* just allocate */
@@ -57,7 +58,7 @@ typedef enum {
 	BMAPI_IGNSTATE = (1 << 4),	/* ignore unwritten state on read */
 	BMAPI_DIRECT = (1 << 5),		/* direct instead of buffered write */
 	BMAPI_MMAP = (1 << 6),		/* allocate for mmap write */
-	BMAPI_SYNC = (1 << 7),		/* sync write */
+	BMAPI_SYNC = (1 << 7),		/* sync write to flush delalloc space */
 	BMAPI_TRYLOCK = (1 << 8),	/* non-blocking request */
 	BMAPI_DEVICE = (1 << 9),	/* we only want to know the device */
 } bmapi_flags_t;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_itable.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_itable.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_itable.c	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_itable.c	2004-09-05 16:08:48.000000000 +0200
@@ -68,7 +68,7 @@ int		       		/* error status */
 xfs_bulkstat_one(
 	xfs_mount_t	*mp,		/* mount point for filesystem */
 	xfs_ino_t	ino,		/* inode number to get data for */
-	void		*buffer,	/* buffer to place output in */
+	void		__user *buffer,	/* buffer to place output in */
 	int		ubsize,		/* size of buffer */
 	void		*private_data,	/* my private data */
 	xfs_daddr_t	bno,		/* starting bno of inode cluster */
@@ -231,7 +231,7 @@ xfs_bulkstat(
 	bulkstat_one_pf		formatter, /* func that'd fill a single buf */
 	void			*private_data,/* private data for formatter */
 	size_t			statstruct_size, /* sizeof struct filling */
-	xfs_caddr_t		ubuffer, /* buffer with inode stats */
+	char			__user *ubuffer, /* buffer with inode stats */
 	int			flags,	/* defined in xfs_itable.h */
 	int			*done)	/* 1 if there're more stats to get */
 {
@@ -265,7 +265,7 @@ xfs_bulkstat(
 	int			tmp;	/* result value from btree calls */
 	int			ubcount; /* size of user's buffer */
 	int			ubleft;	/* bytes left in user's buffer */
-	xfs_caddr_t		ubufp;	/* current pointer into user's buffer */
+	char			__user *ubufp;	/* pointer into user's buffer */
 	int			ubelem;	/* spaces used in user's buffer */
 	int			ubused;	/* bytes used by formatter */
 	xfs_buf_t		*bp;	/* ptr to on-disk inode cluster buf */
@@ -633,7 +633,7 @@ int					/* error status */
 xfs_bulkstat_single(
 	xfs_mount_t		*mp,	/* mount point for filesystem */
 	xfs_ino_t		*lastinop, /* inode to return */
-	xfs_caddr_t		buffer,	/* buffer with inode stats */
+	char			__user *buffer, /* buffer with inode stats */
 	int			*done)	/* 1 if there're more stats to get */
 {
 	int			count;	/* count value for bulkstat call */
@@ -682,7 +682,7 @@ xfs_inumbers(
 	xfs_mount_t	*mp,		/* mount point for filesystem */
 	xfs_ino_t	*lastino,	/* last inode returned */
 	int		*count,		/* size of buffer/count returned */
-	xfs_caddr_t	ubuffer)	/* buffer with inode descriptions */
+	xfs_inogrp_t	__user *ubuffer)/* buffer with inode descriptions */
 {
 	xfs_buf_t	*agbp;
 	xfs_agino_t	agino;
@@ -766,7 +766,7 @@ xfs_inumbers(
 				error = XFS_ERROR(EFAULT);
 				break;
 			}
-			ubuffer += bufidx * sizeof(*buffer);
+			ubuffer += bufidx;
 			*count += bufidx;
 			bufidx = 0;
 		}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_itable.h linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_itable.h
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_itable.h	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_itable.h	2004-09-05 16:08:48.000000000 +0200
@@ -40,7 +40,7 @@
  */
 typedef int (*bulkstat_one_pf)(struct xfs_mount	*mp,
 			       xfs_ino_t	ino,
-			       void		*buffer,
+			       void		__user *buffer,
 			       int		ubsize,
 			       void		*private_data,
 			       xfs_daddr_t	bno,
@@ -73,7 +73,7 @@ xfs_bulkstat(
 	bulkstat_one_pf formatter,	/* func that'd fill a single buf */
 	void		*private_data,	/* private data for formatter */
 	size_t		statstruct_size,/* sizeof struct that we're filling */
-	xfs_caddr_t	ubuffer,	/* buffer with inode stats */
+	char		__user *ubuffer,/* buffer with inode stats */
 	int		flags,		/* flag to control access method */
 	int		*done);		/* 1 if there're more stats to get */
 
@@ -81,14 +81,14 @@ int
 xfs_bulkstat_single(
 	xfs_mount_t		*mp,
 	xfs_ino_t		*lastinop,
-	xfs_caddr_t		buffer,
+	char			__user *buffer,
 	int			*done);
 
 int
 xfs_bulkstat_one(
 	xfs_mount_t		*mp,
 	xfs_ino_t		ino,
-	void			*buffer,
+	void			__user *buffer,
 	int			ubsize,
 	void			*private_data,
 	xfs_daddr_t		bno,
@@ -101,6 +101,6 @@ xfs_inumbers(
 	xfs_mount_t		*mp,	/* mount point for filesystem */
 	xfs_ino_t		*last,	/* last inode returned */
 	int			*count,	/* size of buffer/count returned */
-	xfs_caddr_t		buffer);/* buffer with inode descriptions */
+	xfs_inogrp_t		__user *buffer);/* buffer with inode info */
 
 #endif	/* __XFS_ITABLE_H__ */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_log.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_log.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_log.c	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_log.c	2004-09-07 17:39:16.000000000 +0200
@@ -122,7 +122,6 @@ STATIC void		xlog_ticket_put(xlog_t *log
 /* local debug functions */
 #if defined(DEBUG) && !defined(XLOG_NOLOG)
 STATIC void	xlog_verify_dest_ptr(xlog_t *log, __psint_t ptr);
-STATIC void	xlog_verify_disk_cycle_no(xlog_t *log, xlog_in_core_t *iclog);
 STATIC void	xlog_verify_grant_head(xlog_t *log, int equals);
 STATIC void	xlog_verify_iclog(xlog_t *log, xlog_in_core_t *iclog,
 				  int count, boolean_t syncing);
@@ -130,7 +129,6 @@ STATIC void	xlog_verify_tail_lsn(xlog_t 
 				     xfs_lsn_t tail_lsn);
 #else
 #define xlog_verify_dest_ptr(a,b)
-#define xlog_verify_disk_cycle_no(a,b)
 #define xlog_verify_grant_head(a,b)
 #define xlog_verify_iclog(a,b,c,d)
 #define xlog_verify_tail_lsn(a,b,c)
@@ -356,13 +354,13 @@ xfs_log_notify(xfs_mount_t	  *mp,		/* mo
 	if (!xlog_debug && xlog_target == log->l_targ)
 		return 0;
 #endif
-	cb->cb_next = 0;
+	cb->cb_next = NULL;
 	spl = LOG_LOCK(log);
 	abortflg = (iclog->ic_state & XLOG_STATE_IOERROR);
 	if (!abortflg) {
 		ASSERT_ALWAYS((iclog->ic_state == XLOG_STATE_ACTIVE) ||
 			      (iclog->ic_state == XLOG_STATE_WANT_SYNC));
-		cb->cb_next = 0;
+		cb->cb_next = NULL;
 		*(iclog->ic_callback_tail) = cb;
 		iclog->ic_callback_tail = &(cb->cb_next);
 	}
@@ -564,7 +562,7 @@ xfs_log_unmount_write(xfs_mount_t *mp)
 	xlog_in_core_t	 *first_iclog;
 #endif
 	xfs_log_iovec_t  reg[1];
-	xfs_log_ticket_t tic = 0;
+	xfs_log_ticket_t tic = NULL;
 	xfs_lsn_t	 lsn;
 	int		 error;
 	SPLDECL(s);
@@ -813,7 +811,7 @@ xfs_log_need_covered(xfs_mount_t *mp)
 	xlog_t		*log = mp->m_log;
 	vfs_t		*vfsp = XFS_MTOVFS(mp);
 
-	if (mp->m_frozen || XFS_FORCED_SHUTDOWN(mp) ||
+	if (fs_frozen(vfsp) || XFS_FORCED_SHUTDOWN(mp) ||
 	    (vfsp->vfs_flag & VFS_RDONLY))
 		return 0;
 
@@ -1277,7 +1275,7 @@ xlog_commit_record(xfs_mount_t  *mp,
 	int		error;
 	xfs_log_iovec_t	reg[1];
 
-	reg[0].i_addr = 0;
+	reg[0].i_addr = NULL;
 	reg[0].i_len = 0;
 
 	ASSERT_ALWAYS(iclog);
@@ -1413,9 +1411,13 @@ xlog_sync(xlog_t		*log,
 	xlog_pack_data(log, iclog);       /* put cycle number in every block */
 
 	/* real byte length */
-	INT_SET(iclog->ic_header.h_len, 
-		ARCH_CONVERT,
-		iclog->ic_offset + iclog->ic_roundoff);
+	if (XFS_SB_VERSION_HASLOGV2(&log->l_mp->m_sb)) {
+		INT_SET(iclog->ic_header.h_len, 
+			ARCH_CONVERT,
+			iclog->ic_offset + iclog->ic_roundoff);
+	} else {
+		INT_SET(iclog->ic_header.h_len, ARCH_CONVERT, iclog->ic_offset);
+	}
 
 	/* put ops count in correct order */
 	ops = iclog->ic_header.h_num_logops;
@@ -1857,7 +1859,7 @@ xlog_state_clean_log(xlog_t *log)
 		if (iclog->ic_state == XLOG_STATE_DIRTY) {
 			iclog->ic_state	= XLOG_STATE_ACTIVE;
 			iclog->ic_offset       = 0;
-			iclog->ic_callback	= 0;   /* don't need to free */
+			iclog->ic_callback	= NULL;   /* don't need to free */
 			/*
 			 * If the number of ops in this iclog indicate it just
 			 * contains the dummy transaction, we can
@@ -2080,7 +2082,7 @@ xlog_state_do_callback(
 
 			while (cb != 0) {
 				iclog->ic_callback_tail = &(iclog->ic_callback);
-				iclog->ic_callback = 0;
+				iclog->ic_callback = NULL;
 				LOG_UNLOCK(log, s);
 
 				/* perform callbacks in the order given */
@@ -3098,7 +3100,7 @@ xlog_state_ticket_alloc(xlog_t *log)
 		log->l_ticket_cnt++;
 		log->l_ticket_tcnt++;
 	}
-	t_list->t_next = 0;
+	t_list->t_next = NULL;
 	log->l_tail = t_list;
 	LOG_UNLOCK(log, s);
 }	/* xlog_state_ticket_alloc */
@@ -3126,7 +3128,7 @@ xlog_ticket_put(xlog_t		*log,
 	/* no need to clear fields */
 #else
 	/* When we debug, it is easier if tickets are cycled */
-	ticket->t_next     = 0;
+	ticket->t_next     = NULL;
 	if (log->l_tail != 0) {
 		log->l_tail->t_next = ticket;
 	} else {
@@ -3242,33 +3244,6 @@ xlog_verify_dest_ptr(xlog_t     *log,
 		xlog_panic("xlog_verify_dest_ptr: invalid ptr");
 }	/* xlog_verify_dest_ptr */
 
-
-#ifdef DEBUG
-/* check split LR write */
-STATIC void
-xlog_verify_disk_cycle_no(xlog_t	 *log,
-			  xlog_in_core_t *iclog)
-{
-    xfs_buf_t	*bp;
-    uint	cycle_no;
-    xfs_caddr_t ptr;
-    xfs_daddr_t	i;
-
-    if (BLOCK_LSN(iclog->ic_header.h_lsn, ARCH_CONVERT) < 10) {
-	cycle_no = CYCLE_LSN(iclog->ic_header.h_lsn, ARCH_CONVERT);
-	bp = xlog_get_bp(log, 1);
-	ASSERT(bp);
-	for (i = 0; i < BLOCK_LSN(iclog->ic_header.h_lsn, ARCH_CONVERT); i++) {
-	    xlog_bread(log, i, 1, bp);
-	    ptr = xlog_align(log, i, 1, bp);
-	    if (GET_CYCLE(ptr, ARCH_CONVERT) != cycle_no)
-		xlog_warn("XFS: xlog_verify_disk_cycle_no: bad cycle no");
-	}
-	xlog_put_bp(bp);
-    }
-}	/* xlog_verify_disk_cycle_no */
-#endif
-
 STATIC void
 xlog_verify_grant_head(xlog_t *log, int equals)
 {
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_log_recover.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_log_recover.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_log_recover.c	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_log_recover.c	2004-09-05 16:08:48.000000000 +0200
@@ -2047,12 +2047,11 @@ xfs_qm_dqcheck(
 		errs++;
 	}
 
-	if (! errs) {
+	if (! errs && !INT_ISZERO(ddq->d_id, ARCH_CONVERT)) {
 		if (INT_GET(ddq->d_blk_softlimit, ARCH_CONVERT) &&
 		    INT_GET(ddq->d_bcount, ARCH_CONVERT) >=
 				INT_GET(ddq->d_blk_softlimit, ARCH_CONVERT)) {
-			if (INT_ISZERO(ddq->d_btimer, ARCH_CONVERT) &&
-			    !INT_ISZERO(ddq->d_id, ARCH_CONVERT)) {
+			if (INT_ISZERO(ddq->d_btimer, ARCH_CONVERT)) {
 				if (flags & XFS_QMOPT_DOWARN)
 					cmn_err(CE_ALERT,
 					"%s : Dquot ID 0x%x (0x%p) "
@@ -2065,8 +2064,7 @@ xfs_qm_dqcheck(
 		if (INT_GET(ddq->d_ino_softlimit, ARCH_CONVERT) &&
 		    INT_GET(ddq->d_icount, ARCH_CONVERT) >=
 				INT_GET(ddq->d_ino_softlimit, ARCH_CONVERT)) {
-			if (INT_ISZERO(ddq->d_itimer, ARCH_CONVERT) &&
-			    !INT_ISZERO(ddq->d_id, ARCH_CONVERT)) {
+			if (INT_ISZERO(ddq->d_itimer, ARCH_CONVERT)) {
 				if (flags & XFS_QMOPT_DOWARN)
 					cmn_err(CE_ALERT,
 					"%s : Dquot ID 0x%x (0x%p) "
@@ -2076,6 +2074,19 @@ xfs_qm_dqcheck(
 				errs++;
 			}
 		}
+		if (INT_GET(ddq->d_rtb_softlimit, ARCH_CONVERT) &&
+		    INT_GET(ddq->d_rtbcount, ARCH_CONVERT) >=
+				INT_GET(ddq->d_rtb_softlimit, ARCH_CONVERT)) {
+			if (INT_ISZERO(ddq->d_rtbtimer, ARCH_CONVERT)) {
+				if (flags & XFS_QMOPT_DOWARN)
+					cmn_err(CE_ALERT,
+					"%s : Dquot ID 0x%x (0x%p) "
+					"RTBLK TIMER NOT STARTED",
+					str, (int)
+					INT_GET(ddq->d_id, ARCH_CONVERT), ddq);
+				errs++;
+			}
+		}
 	}
 
 	if (!errs || !(flags & XFS_QMOPT_DQREPAIR))
@@ -2319,7 +2330,7 @@ xlog_recover_do_inode_trans(
 		 * invalidate the buffer when we write it out below.
 		 */
 		imap.im_blkno = 0;
-		xfs_imap(log->l_mp, 0, ino, &imap, 0);
+		xfs_imap(log->l_mp, NULL, ino, &imap, 0);
 	}
 
 	/*
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_mount.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_mount.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_mount.c	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_mount.c	2004-09-05 16:08:48.000000000 +0200
@@ -140,9 +140,6 @@ xfs_mount_init(void)
 	 */
 	xfs_trans_ail_init(mp);
 
-	/* Init freeze sync structures */
-	spinlock_init(&mp->m_freeze_lock, "xfs_freeze");
-	init_sv(&mp->m_wait_unfreeze, SV_DEFAULT, "xfs_freeze", 0);
 	atomic_set(&mp->m_active_trans, 0);
 
 	return mp;
@@ -192,8 +189,6 @@ xfs_mount_free(
 		VFS_REMOVEBHV(vfsp, &mp->m_bhv);
 	}
 
-	spinlock_destroy(&mp->m_freeze_lock);
-	sv_destroy(&mp->m_wait_unfreeze);
 	kmem_free(mp, sizeof(xfs_mount_t));
 }
 
@@ -283,17 +278,22 @@ xfs_mount_validate_sb(
 		return XFS_ERROR(EFSCORRUPTED);
 	}
 
-#if !XFS_BIG_BLKNOS
+	ASSERT(PAGE_SHIFT >= sbp->sb_blocklog);
+	ASSERT(sbp->sb_blocklog >= BBSHIFT);
+
+#if XFS_BIG_BLKNOS     /* Limited by ULONG_MAX of page cache index */
+	if (unlikely(
+	    (sbp->sb_dblocks >> (PAGE_SHIFT - sbp->sb_blocklog)) > ULONG_MAX ||
+	    (sbp->sb_rblocks >> (PAGE_SHIFT - sbp->sb_blocklog)) > ULONG_MAX)) {
+#else                  /* Limited by UINT_MAX of sectors */
 	if (unlikely(
-	    (sbp->sb_dblocks << (__uint64_t)(sbp->sb_blocklog - BBSHIFT))
-		> UINT_MAX ||
-	    (sbp->sb_rblocks << (__uint64_t)(sbp->sb_blocklog - BBSHIFT))
-		> UINT_MAX)) {
+	    (sbp->sb_dblocks << (sbp->sb_blocklog - BBSHIFT)) > UINT_MAX ||
+	    (sbp->sb_rblocks << (sbp->sb_blocklog - BBSHIFT)) > UINT_MAX)) {
+#endif
 		cmn_err(CE_WARN,
 	"XFS: File system is too large to be mounted on this system.");
 		return XFS_ERROR(E2BIG);
 	}
-#endif
 
 	if (unlikely(sbp->sb_inprogress)) {
 		cmn_err(CE_WARN, "XFS: file system busy");
@@ -318,10 +318,10 @@ xfs_mount_validate_sb(
 	return 0;
 }
 
-void
-xfs_initialize_perag(xfs_mount_t *mp, int agcount)
+xfs_agnumber_t
+xfs_initialize_perag(xfs_mount_t *mp, xfs_agnumber_t agcount)
 {
-	int		index, max_metadata;
+	xfs_agnumber_t	index, max_metadata;
 	xfs_perag_t	*pag;
 	xfs_agino_t	agino;
 	xfs_ino_t	ino;
@@ -377,7 +377,7 @@ xfs_initialize_perag(xfs_mount_t *mp, in
 			pag->pagi_inodeok = 1;
 		}
 	}
-	mp->m_maxagi = index;
+	return index;
 }
 
 /*
@@ -638,9 +638,8 @@ xfs_mountfs(
 	xfs_buf_t	*bp;
 	xfs_sb_t	*sbp = &(mp->m_sb);
 	xfs_inode_t	*rip;
-	vnode_t		*rvp = 0;
+	vnode_t		*rvp = NULL;
 	int		readio_log, writeio_log;
-	vmap_t		vmap;
 	xfs_daddr_t	d;
 	__uint64_t	ret64;
 	__int64_t	update_flags;
@@ -952,7 +951,7 @@ xfs_mountfs(
 	mp->m_perag =
 		kmem_zalloc(sbp->sb_agcount * sizeof(xfs_perag_t), KM_SLEEP);
 
-	xfs_initialize_perag(mp, sbp->sb_agcount);
+	mp->m_maxagi = xfs_initialize_perag(mp, sbp->sb_agcount);
 
 	/*
 	 * log's mount-time initialization. Perform 1st part recovery if needed
@@ -984,7 +983,6 @@ xfs_mountfs(
 
 	ASSERT(rip != NULL);
 	rvp = XFS_ITOV(rip);
-	VMAP(rvp, vmap);
 
 	if (unlikely((rip->i_d.di_mode & S_IFMT) != S_IFDIR)) {
 		cmn_err(CE_WARN, "XFS: corrupted root inode");
@@ -1048,7 +1046,6 @@ xfs_mountfs(
 	 * Free up the root inode.
 	 */
 	VN_RELE(rvp);
-	vn_purge(rvp, &vmap);
  error3:
 	xfs_log_unmount_dealloc(mp);
  error2:
@@ -1582,59 +1579,3 @@ xfs_mount_log_sbunit(
 	xfs_mod_sb(tp, fields);
 	xfs_trans_commit(tp, 0, NULL);
 }
-
-/* Functions to lock access out of the filesystem for forced
- * shutdown or snapshot.
- */
-
-void
-xfs_start_freeze(
-	xfs_mount_t	*mp,
-	int		level)
-{
-	unsigned long	s = mutex_spinlock(&mp->m_freeze_lock);
-
-	mp->m_frozen = level;
-	mutex_spinunlock(&mp->m_freeze_lock, s);
-
-	if (level == XFS_FREEZE_TRANS) {
-		while (atomic_read(&mp->m_active_trans) > 0)
-			delay(100);
-	}
-}
-
-void
-xfs_finish_freeze(
-	xfs_mount_t	*mp)
-{
-	unsigned long	s = mutex_spinlock(&mp->m_freeze_lock);
-
-	if (mp->m_frozen) {
-		mp->m_frozen = 0;
-		sv_broadcast(&mp->m_wait_unfreeze);
-	}
-
-	mutex_spinunlock(&mp->m_freeze_lock, s);
-}
-
-void
-xfs_check_frozen(
-	xfs_mount_t	*mp,
-	bhv_desc_t	*bdp,
-	int		level)
-{
-	unsigned long	s;
-
-	if (mp->m_frozen) {
-		s = mutex_spinlock(&mp->m_freeze_lock);
-
-		if (mp->m_frozen < level) {
-			mutex_spinunlock(&mp->m_freeze_lock, s);
-		} else {
-			sv_wait(&mp->m_wait_unfreeze, 0, &mp->m_freeze_lock, s);
-		}
-	}
-
-	if (level == XFS_FREEZE_TRANS)
-		atomic_inc(&mp->m_active_trans);
-}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_mount.h linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_mount.h
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_mount.h	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_mount.h	2004-09-05 16:08:48.000000000 +0200
@@ -382,10 +382,6 @@ typedef struct xfs_mount {
 	struct xfs_dmops	m_dm_ops;	/* vector of DMI ops */
 	struct xfs_qmops	m_qm_ops;	/* vector of XQM ops */
 	struct xfs_ioops	m_io_ops;	/* vector of I/O ops */
-	lock_t			m_freeze_lock;	/* Lock for m_frozen */
-	uint			m_frozen;	/* FS frozen for shutdown or
-						 * snapshot */
-	sv_t			m_wait_unfreeze;/* waiting to unfreeze */
 	atomic_t		m_active_trans;	/* number trans frozen */
 } xfs_mount_t;
 
@@ -555,20 +551,10 @@ extern int	xfs_readsb(xfs_mount_t *mp);
 extern void	xfs_freesb(xfs_mount_t *);
 extern void	xfs_do_force_shutdown(bhv_desc_t *, int, char *, int);
 extern int	xfs_syncsub(xfs_mount_t *, int, int, int *);
-extern void	xfs_initialize_perag(xfs_mount_t *, int);
+extern xfs_agnumber_t	xfs_initialize_perag(xfs_mount_t *, xfs_agnumber_t);
 extern void	xfs_xlatesb(void *, struct xfs_sb *, int, xfs_arch_t,
 			__int64_t);
 
-/*
- * Flags for freeze operations.
- */
-#define XFS_FREEZE_WRITE	1
-#define XFS_FREEZE_TRANS	2
-
-extern void	xfs_start_freeze(xfs_mount_t *, int);
-extern void	xfs_finish_freeze(xfs_mount_t *);
-extern void	xfs_check_frozen(xfs_mount_t *, bhv_desc_t *, int);
-
 extern struct vfsops xfs_vfsops;
 extern struct vnodeops xfs_vnodeops;
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_quota.h linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_quota.h
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_quota.h	2004-06-29 11:31:58.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_quota.h	2004-09-05 16:08:48.000000000 +0200
@@ -309,23 +309,27 @@ typedef struct xfs_dqtrxops {
 } xfs_dqtrxops_t;
 
 #define XFS_DQTRXOP(mp, tp, op, args...) \
-			((mp)->m_qm_ops.xfs_dqtrxops ? \
-			((mp)->m_qm_ops.xfs_dqtrxops->op)(tp, ## args) : 0)
+		((mp)->m_qm_ops.xfs_dqtrxops ? \
+		((mp)->m_qm_ops.xfs_dqtrxops->op)(tp, ## args) : 0)
+
+#define XFS_DQTRXOP_VOID(mp, tp, op, args...) \
+		((mp)->m_qm_ops.xfs_dqtrxops ? \
+		((mp)->m_qm_ops.xfs_dqtrxops->op)(tp, ## args) : (void)0)
 
 #define XFS_TRANS_DUP_DQINFO(mp, otp, ntp) \
-	XFS_DQTRXOP(mp, otp, qo_dup_dqinfo, ntp)
+	XFS_DQTRXOP_VOID(mp, otp, qo_dup_dqinfo, ntp)
 #define XFS_TRANS_FREE_DQINFO(mp, tp) \
-	XFS_DQTRXOP(mp, tp, qo_free_dqinfo)
+	XFS_DQTRXOP_VOID(mp, tp, qo_free_dqinfo)
 #define XFS_TRANS_MOD_DQUOT_BYINO(mp, tp, ip, field, delta) \
-	XFS_DQTRXOP(mp, tp, qo_mod_dquot_byino, ip, field, delta)
+	XFS_DQTRXOP_VOID(mp, tp, qo_mod_dquot_byino, ip, field, delta)
 #define XFS_TRANS_APPLY_DQUOT_DELTAS(mp, tp) \
-	XFS_DQTRXOP(mp, tp, qo_apply_dquot_deltas)
+	XFS_DQTRXOP_VOID(mp, tp, qo_apply_dquot_deltas)
 #define XFS_TRANS_RESERVE_QUOTA_NBLKS(mp, tp, ip, nblks, ninos, fl) \
 	XFS_DQTRXOP(mp, tp, qo_reserve_quota_nblks, mp, ip, nblks, ninos, fl)
 #define XFS_TRANS_RESERVE_QUOTA_BYDQUOTS(mp, tp, ud, gd, nb, ni, fl) \
 	XFS_DQTRXOP(mp, tp, qo_reserve_quota_bydquots, mp, ud, gd, nb, ni, fl)
 #define XFS_TRANS_UNRESERVE_AND_MOD_DQUOTS(mp, tp) \
-	XFS_DQTRXOP(mp, tp, qo_unreserve_and_mod_dquots)
+	XFS_DQTRXOP_VOID(mp, tp, qo_unreserve_and_mod_dquots)
 
 #define XFS_TRANS_RESERVE_BLKQUOTA(mp, tp, ip, nblks) \
 	XFS_TRANS_RESERVE_QUOTA_NBLKS(mp, tp, ip, nblks, 0, \
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_rtalloc.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_rtalloc.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_rtalloc.c	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_rtalloc.c	2004-09-05 16:08:48.000000000 +0200
@@ -2353,13 +2353,7 @@ xfs_rtmount_inodes(
 	ASSERT(sbp->sb_rsumino != NULLFSINO);
 	error = xfs_iget(mp, NULL, sbp->sb_rsumino, 0, &mp->m_rsumip, 0);
 	if (error) {
-		vnode_t		*rbmvp;		/* vnode for bitmap file */
-		vmap_t		vmap;		/* vmap to delete vnode */
-
-		rbmvp = XFS_ITOV(mp->m_rbmip);
-		VMAP(rbmvp, vmap);
-		VN_RELE(rbmvp);
-		vn_purge(rbmvp, &vmap);
+		VN_RELE(XFS_ITOV(mp->m_rbmip));
 		return error;
 	}
 	ASSERT(mp->m_rsumip != NULL);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_sb.h linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_sb.h
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_sb.h	2004-06-29 11:31:58.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_sb.h	2004-09-05 16:08:48.000000000 +0200
@@ -250,9 +250,9 @@ int xfs_sb_good_version(xfs_sb_t *sbp);
 	((((sbp)->sb_versionnum >= XFS_SB_VERSION_1) && \
 	  ((sbp)->sb_versionnum <= XFS_SB_VERSION_3)) || \
 	   ((XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \
-	    !(((sbp)->sb_versionnum & ~XFS_SB_VERSION_OKREALBITS) && \
-	      ((sbp)->sb_versionnum & XFS_SB_VERSION_MOREBITSBIT) && \
-	      ((sbp)->sb_features2 & ~XFS_SB_VERSION2_OKREALBITS))
+	    !(((sbp)->sb_versionnum & ~XFS_SB_VERSION_OKREALBITS) || \
+	      (((sbp)->sb_versionnum & XFS_SB_VERSION_MOREBITSBIT) && \
+	       ((sbp)->sb_features2 & ~XFS_SB_VERSION2_OKREALBITS)))
 
 #ifdef __KERNEL__
 #define	XFS_SB_GOOD_VERSION(sbp)	\
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_trans.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_trans.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_trans.c	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_trans.c	2004-09-05 16:08:48.000000000 +0200
@@ -131,7 +131,9 @@ xfs_trans_alloc(
 	xfs_mount_t	*mp,
 	uint		type)
 {
-	xfs_check_frozen(mp, NULL, XFS_FREEZE_TRANS);
+	fs_check_frozen(XFS_MTOVFS(mp), SB_FREEZE_TRANS);
+	atomic_inc(&mp->m_active_trans);
+
 	return (_xfs_trans_alloc(mp, type));
 
 }
@@ -489,6 +491,9 @@ xfs_trans_apply_sb_deltas(
 	if (tp->t_frextents_delta != 0) {
 		INT_MOD(sbp->sb_frextents, ARCH_CONVERT, tp->t_frextents_delta);
 	}
+	if (tp->t_res_frextents_delta != 0) {
+		INT_MOD(sbp->sb_frextents, ARCH_CONVERT, tp->t_res_frextents_delta);
+	}
 	if (tp->t_dblocks_delta != 0) {
 		INT_MOD(sbp->sb_dblocks, ARCH_CONVERT, tp->t_dblocks_delta);
 		whole = 1;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_trans_item.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_trans_item.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_trans_item.c	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_trans_item.c	2004-09-05 16:08:48.000000000 +0200
@@ -290,7 +290,7 @@ xfs_trans_next_item(xfs_trans_t *tp, xfs
 	}
 	ASSERT(0);
 	/* NOTREACHED */
-	return 0; /* keep gcc quite */
+	return NULL; /* keep gcc quite */
 }
 
 /*
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_types.h linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_types.h
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_types.h	2004-06-29 11:31:58.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_types.h	2004-09-05 16:08:48.000000000 +0200
@@ -58,7 +58,7 @@ typedef enum { B_FALSE,B_TRUE }	boolean_
 typedef __int64_t		prid_t;		/* project ID */
 typedef __uint32_t		inst_t;		/* an instruction */
 
-typedef __u64			xfs_off_t;
+typedef __s64			xfs_off_t;	/* <file offset> type */
 typedef __u64			xfs_ino_t;	/* <inode> type */
 typedef __s64			xfs_daddr_t;	/* <disk address> type */
 typedef char *			xfs_caddr_t;	/* <core address> type */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_vfsops.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_vfsops.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_vfsops.c	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_vfsops.c	2004-09-05 16:08:48.000000000 +0200
@@ -431,6 +431,16 @@ xfs_mount(
 	logdev = rtdev = NULL;
 
 	/*
+	 * Setup xfs_mount function vectors from available behaviors
+	 */
+	p = vfs_bhv_lookup(vfsp, VFS_POSITION_DM);
+	mp->m_dm_ops = p ? *(xfs_dmops_t *) vfs_bhv_custom(p) : xfs_dmcore_stub;
+	p = vfs_bhv_lookup(vfsp, VFS_POSITION_QM);
+	mp->m_qm_ops = p ? *(xfs_qmops_t *) vfs_bhv_custom(p) : xfs_qmcore_stub;
+	p = vfs_bhv_lookup(vfsp, VFS_POSITION_IO);
+	mp->m_io_ops = p ? *(xfs_ioops_t *) vfs_bhv_custom(p) : xfs_iocore_xfs;
+
+	/*
 	 * Open real time and log devices - order is important.
 	 */
 	if (args->logname[0]) {
@@ -455,68 +465,73 @@ xfs_mount(
 	}
 
 	/*
-	 * Setup xfs_mount function vectors from available behaviors
-	 */
-	p = vfs_bhv_lookup(vfsp, VFS_POSITION_DM);
-	mp->m_dm_ops = p ? *(xfs_dmops_t *) vfs_bhv_custom(p) : xfs_dmcore_stub;
-	p = vfs_bhv_lookup(vfsp, VFS_POSITION_QM);
-	mp->m_qm_ops = p ? *(xfs_qmops_t *) vfs_bhv_custom(p) : xfs_qmcore_stub;
-	p = vfs_bhv_lookup(vfsp, VFS_POSITION_IO);
-	mp->m_io_ops = p ? *(xfs_ioops_t *) vfs_bhv_custom(p) : xfs_iocore_xfs;
-
-	/*
 	 * Setup xfs_mount buffer target pointers
 	 */
+	error = ENOMEM;
 	mp->m_ddev_targp = xfs_alloc_buftarg(ddev);
-	if (rtdev)
+	if (!mp->m_ddev_targp) {
+		xfs_blkdev_put(logdev);
+		xfs_blkdev_put(rtdev);
+		return error;
+	}
+	if (rtdev) {
 		mp->m_rtdev_targp = xfs_alloc_buftarg(rtdev);
+		if (!mp->m_rtdev_targp)
+			goto error0;
+	}
 	mp->m_logdev_targp = (logdev && logdev != ddev) ?
 				xfs_alloc_buftarg(logdev) : mp->m_ddev_targp;
+	if (!mp->m_logdev_targp)
+		goto error0;
 
 	/*
 	 * Setup flags based on mount(2) options and then the superblock
 	 */
 	error = xfs_start_flags(vfsp, args, mp);
 	if (error)
-		goto error;
+		goto error1;
 	error = xfs_readsb(mp);
 	if (error)
-		goto error;
+		goto error1;
 	error = xfs_finish_flags(vfsp, args, mp);
-	if (error) {
-		xfs_freesb(mp);
-		goto error;
-	}
+	if (error)
+		goto error2;
 
 	/*
 	 * Setup xfs_mount buffer target pointers based on superblock
 	 */
-	xfs_setsize_buftarg(mp->m_ddev_targp, mp->m_sb.sb_blocksize,
-			    mp->m_sb.sb_sectsize);
-	if (logdev && logdev != ddev) {
+	error = xfs_setsize_buftarg(mp->m_ddev_targp, mp->m_sb.sb_blocksize,
+				    mp->m_sb.sb_sectsize);
+	if (!error && logdev && logdev != ddev) {
 		unsigned int	log_sector_size = BBSIZE;
 
 		if (XFS_SB_VERSION_HASSECTOR(&mp->m_sb))
 			log_sector_size = mp->m_sb.sb_logsectsize;
-		xfs_setsize_buftarg(mp->m_logdev_targp, mp->m_sb.sb_blocksize,
-				    log_sector_size);
-	}
-	if (rtdev)
-		xfs_setsize_buftarg(mp->m_rtdev_targp, mp->m_sb.sb_blocksize,
-				    mp->m_sb.sb_blocksize);
+		error = xfs_setsize_buftarg(mp->m_logdev_targp,
+					    mp->m_sb.sb_blocksize,
+					    log_sector_size);
+	}
+	if (!error && rtdev)
+		error = xfs_setsize_buftarg(mp->m_rtdev_targp,
+					    mp->m_sb.sb_blocksize,
+					    mp->m_sb.sb_sectsize);
+	if (error)
+		goto error2;
 
-	if (!(error = XFS_IOINIT(vfsp, args, flags)))
+	error = XFS_IOINIT(vfsp, args, flags);
+	if (!error)
 		return 0;
-
- error:
+error2:
+	if (mp->m_sb_bp)
+		xfs_freesb(mp);
+error1:
 	xfs_binval(mp->m_ddev_targp);
-	if (logdev != NULL && logdev != ddev) {
+	if (logdev && logdev != ddev)
 		xfs_binval(mp->m_logdev_targp);
-	}
-	if (rtdev != NULL) {
+	if (rtdev)
 		xfs_binval(mp->m_rtdev_targp);
-	}
-	xfs_unmountfs_close(mp, NULL);
+error0:
+	xfs_unmountfs_close(mp, credp);
 	return error;
 }
 
@@ -1508,7 +1523,10 @@ xfs_syncsub(
 	 * eventually kicked out of the cache.
 	 */
 	if (flags & SYNC_REFCACHE) {
-		xfs_refcache_purge_some(mp);
+		if (flags & SYNC_WAIT)
+			xfs_refcache_purge_mp(mp);
+		else
+			xfs_refcache_purge_some(mp);
 	}
 
 	/*
@@ -1866,6 +1884,20 @@ xfs_showargs(
 	return 0;
 }
 
+STATIC void
+xfs_freeze(
+	bhv_desc_t	*bdp)
+{
+	xfs_mount_t	*mp = XFS_BHVTOM(bdp);
+
+	while (atomic_read(&mp->m_active_trans) > 0)
+		delay(100);
+
+	/* Push the superblock and write an unmount record */
+	xfs_log_unmount_write(mp);
+	xfs_unmountfs_writesb(mp);
+}
+
 
 vfsops_t xfs_vfsops = {
 	BHV_IDENTITY_INIT(VFS_BHV_XFS,VFS_POSITION_XFS),
@@ -1883,4 +1915,5 @@ vfsops_t xfs_vfsops = {
 	.vfs_get_inode		= xfs_get_inode,
 	.vfs_init_vnode		= xfs_initialize_vnode,
 	.vfs_force_shutdown	= xfs_do_force_shutdown,
+	.vfs_freeze		= xfs_freeze,
 };
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_vnodeops.c linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_vnodeops.c
--- linux-2.4.20-wolk4.15-fullkernel/fs/xfs/xfs_vnodeops.c	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/fs/xfs/xfs_vnodeops.c	2004-09-05 16:08:48.000000000 +0200
@@ -283,7 +283,7 @@ xfs_getattr(
 /*
  * xfs_setattr
  */
-STATIC int
+int
 xfs_setattr(
 	bhv_desc_t		*bdp,
 	vattr_t			*vap,
@@ -305,6 +305,7 @@ xfs_setattr(
 	int			mandlock_before, mandlock_after;
 	struct xfs_dquot	*udqp, *gdqp, *olddquot1, *olddquot2;
 	int			file_owner;
+	int			need_iolock = (flags & ATTR_DMI) == 0;
 
 	vp = BHV_TO_VNODE(bdp);
 	vn_trace_entry(vp, __FUNCTION__, (inst_t *)__return_address);
@@ -406,7 +407,8 @@ xfs_setattr(
 				goto error_return;
 			}
 		}
-		lock_flags |= XFS_IOLOCK_EXCL;
+		if (need_iolock)
+			lock_flags |= XFS_IOLOCK_EXCL;
 	}
 
 	xfs_ilock(ip, lock_flags);
@@ -678,7 +680,8 @@ xfs_setattr(
 					     XFS_TRANS_PERM_LOG_RES,
 					     XFS_ITRUNCATE_LOG_COUNT))) {
 			xfs_trans_cancel(tp, 0);
-			xfs_iunlock(ip, XFS_IOLOCK_EXCL);
+			if (need_iolock)
+				xfs_iunlock(ip, XFS_IOLOCK_EXCL);
 			return code;
 		}
 		commit_flags = XFS_TRANS_RELEASE_LOG_RES;
@@ -823,10 +826,15 @@ xfs_setattr(
 				mp->m_sb.sb_blocklog;
 		}
 		if (mask & XFS_AT_XFLAGS) {
-			ip->i_d.di_flags = 0;
-			if (vap->va_xflags & XFS_XFLAG_REALTIME) {
+			/* can't set PREALLOC this way, just preserve it */
+			ip->i_d.di_flags =
+				(ip->i_d.di_flags & XFS_DIFLAG_PREALLOC);
+			if (vap->va_xflags & XFS_XFLAG_REALTIME &&
+			    (ip->i_d.di_mode & S_IFMT) == S_IFREG) {
 				ip->i_d.di_flags |= XFS_DIFLAG_REALTIME;
 				ip->i_iocore.io_flags |= XFS_IOCORE_RT;
+			} else {
+				ip->i_iocore.io_flags &= ~XFS_IOCORE_RT;
 			}
 			if (vap->va_xflags & XFS_XFLAG_IMMUTABLE)
 				ip->i_d.di_flags |= XFS_DIFLAG_IMMUTABLE;
@@ -838,7 +846,9 @@ xfs_setattr(
 				ip->i_d.di_flags |= XFS_DIFLAG_NOATIME;
 			if (vap->va_xflags & XFS_XFLAG_NODUMP)
 				ip->i_d.di_flags |= XFS_DIFLAG_NODUMP;
-			/* can't set PREALLOC this way, just ignore it */
+			if ((vap->va_xflags & XFS_XFLAG_RTINHERIT) &&
+			    (ip->i_d.di_mode & S_IFMT) == S_IFDIR)
+				ip->i_d.di_flags |= XFS_DIFLAG_RTINHERIT;
 		}
 		xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
 		timeflags |= XFS_ICHGTIME_CHG;
@@ -1822,8 +1832,6 @@ xfs_lookup(
 }
 
 
-#define	XFS_CREATE_NEW_MAXTRIES	10000
-
 /*
  * xfs_create (create a new file).
  */
@@ -4292,6 +4300,7 @@ xfs_free_file_space(
 	int			rt;
 	xfs_fileoff_t		startoffset_fsb;
 	xfs_trans_t		*tp;
+	int			need_iolock = (attr_flags & ATTR_DMI) == 0;
 
 	vn_trace_entry(XFS_ITOV(ip), __FUNCTION__, (inst_t *)__return_address);
 	mp = ip->i_mount;
@@ -4319,7 +4328,8 @@ xfs_free_file_space(
 			return(error);
 	}
 
-	xfs_ilock(ip, XFS_IOLOCK_EXCL);
+	if (need_iolock)
+		xfs_ilock(ip, XFS_IOLOCK_EXCL);
 	rounding = MAX((__uint8_t)(1 << mp->m_sb.sb_blocklog),
 			(__uint8_t)NBPP);
 	ilen = len + (offset & (rounding - 1));
@@ -4338,7 +4348,7 @@ xfs_free_file_space(
 		error = xfs_bmapi(NULL, ip, startoffset_fsb, 1, 0, NULL, 0,
 			&imap, &nimap, NULL);
 		if (error)
-			return error;
+			goto out_unlock_iolock;
 		ASSERT(nimap == 0 || nimap == 1);
 		if (nimap && imap.br_startblock != HOLESTARTBLOCK) {
 			xfs_daddr_t	block;
@@ -4353,7 +4363,7 @@ xfs_free_file_space(
 		error = xfs_bmapi(NULL, ip, endoffset_fsb - 1, 1, 0, NULL, 0,
 			&imap, &nimap, NULL);
 		if (error)
-			return error;
+			goto out_unlock_iolock;
 		ASSERT(nimap == 0 || nimap == 1);
 		if (nimap && imap.br_startblock != HOLESTARTBLOCK) {
 			ASSERT(imap.br_startblock != DELAYSTARTBLOCK);
@@ -4442,14 +4452,17 @@ xfs_free_file_space(
 		xfs_iunlock(ip, XFS_ILOCK_EXCL);
 	}
 
-	xfs_iunlock(ip, XFS_IOLOCK_EXCL);
+ out_unlock_iolock:
+	if (need_iolock)
+		xfs_iunlock(ip, XFS_IOLOCK_EXCL);
 	return error;
 
  error0:
 	xfs_bmap_cancel(&free_list);
  error1:
 	xfs_trans_cancel(tp, XFS_TRANS_RELEASE_LOG_RES | XFS_TRANS_ABORT);
-	xfs_iunlock(ip, XFS_ILOCK_EXCL | XFS_IOLOCK_EXCL);
+	xfs_iunlock(ip, need_iolock ? (XFS_ILOCK_EXCL | XFS_IOLOCK_EXCL) :
+		    XFS_ILOCK_EXCL);
 	return error;
 }
 
@@ -4606,20 +4619,21 @@ xfs_change_file_space(
 	xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);
 	xfs_trans_ihold(tp, ip);
 
-	ip->i_d.di_mode &= ~S_ISUID;
-
-	/*
-	 * Note that we don't have to worry about mandatory
-	 * file locking being disabled here because we only
-	 * clear the S_ISGID bit if the Group execute bit is
-	 * on, but if it was on then mandatory locking wouldn't
-	 * have been enabled.
-	 */
-	if (ip->i_d.di_mode & S_IXGRP)
-		ip->i_d.di_mode &= ~S_ISGID;
+	if ((attr_flags & ATTR_DMI) == 0) {
+		ip->i_d.di_mode &= ~S_ISUID;
 
-	xfs_ichgtime(ip, XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG);
+		/*
+		 * Note that we don't have to worry about mandatory
+		 * file locking being disabled here because we only
+		 * clear the S_ISGID bit if the Group execute bit is
+		 * on, but if it was on then mandatory locking wouldn't
+		 * have been enabled.
+		 */
+		if (ip->i_d.di_mode & S_IXGRP)
+			ip->i_d.di_mode &= ~S_ISGID;
 
+		xfs_ichgtime(ip, XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG);
+	}
 	if (setprealloc)
 		ip->i_d.di_flags |= XFS_DIFLAG_PREALLOC;
 	else if (clrprealloc)
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/Makefile linux-2.4.20-wolk4.16-fullkernel/gradm1/Makefile
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/Makefile	2003-05-28 03:39:22.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/Makefile	1970-01-01 01:00:00.000000000 +0100
@@ -1,96 +0,0 @@
-##############################################################################
-#gradm (c) 2002 Brad Spengler 		                http://grsecurity.net#
-#----------------------------				---------------------#
-#gradm is licensed under the GNU GPL http://www.gnu.org		             #
-##############################################################################
-
-GRADM_BIN=gradm
-GRSEC_DIR=/etc/grsec
-
-LEX=/usr/bin/lex
-FLEX=/usr/bin/flex
-LEXFLAGS=-B
-YACC=/usr/bin/yacc
-BYACC=/usr/bin/byacc
-BISON=/usr/bin/bison
-#for dietlibc
-#CC=/usr/bin/diet /usr/bin/gcc
-CC=/usr/bin/gcc
-FIND=/usr/bin/find
-STRIP=/usr/bin/strip
-#for sparc64
-#LIBS=
-LIBS=-lfl
-#for sparc64
-#CFLAGS=-O2 -m64 -mcpu=ultrasparc -mcmodel=medlow -ffixed-g4 \
-#	-fcall-used-g5 -fcall-used-g5 -fcall-used-g7 -Wno-sign-compare -DGRSEC_DIR=\"$(GRSEC_DIR)\"
-CFLAGS=-O2 -DGRSEC_DIR=\"$(GRSEC_DIR)\"
-LDFLAGS=-static			# must be left as static,otherwise requires
-				# modification in gradm_adm.c
-INSTALL = /usr/bin/install -c
-
-# FHS
-MANDIR=/usr/share/man
-# older MANDIR
-#MANDIR=/usr/man
-DESTDIR=
-
-OBJECTS=gradm.tab.o lex.gradm.o learn.tab.o lex.learn.o gradm_misc.o \
-	gradm_parse.o gradm_arg.o gradm_pw.o gradm_opt.o gradm_cap.o \
-	gradm_sha256.o gradm_adm.o gradm_analyze.o gradm_res.o \
-	gradm_human.o gradm_learn.o gradm_net.o
-
-all: $(USE_YACC) $(USE_LEX) $(GRADM_BIN)
-
-USE_YACC = $(shell if [ -x $(BYACC) ]; then echo $(BYACC); \
-	else if [ -x $(BISON) ]; then echo $(BISON) -y; \
-	else if [ -x $(YACC) ]; then echo $(YACC); \
-	else \
-		echo "Bison/(b)yacc needs to be installed to compile gradm."; \
-		exit 1; \
-	fi;fi;fi)
-
-USE_LEX = $(shell if [ -x $(FLEX) ]; then echo $(FLEX); \
-	else if [ -x $(LEX) ]; then echo $(LEX); \
-	else \
-		echo "(f)Lex needs to be installed to compile gradm."; \
-		exit 1; \
-	fi;fi)
-
-$(GRADM_BIN): $(OBJECTS)
-	$(CC) $(CFLAGS) -o $@ $(OBJECTS) $(LIBS) $(LDFLAGS)
-
-gradm.tab.c: gradm.y
-	$(USE_YACC) -b gradm -p gradm -d ./gradm.y
-
-lex.gradm.c: gradm.l
-	$(USE_LEX) $(LEXFLAGS) -Pgradm ./gradm.l
-
-learn.tab.c: gradm_learner.y
-	$(USE_YACC) -b learn -p learn -d ./gradm_learner.y
-
-lex.learn.c: gradm_learner.l
-	$(USE_LEX) $(LEXFLAGS) -Plearn ./gradm_learner.l
-
-install: $(GRADM_BIN) gradm.8 acl
-	mkdir -p $(DESTDIR)/sbin
-	$(INSTALL) -m 0700 $(GRADM_BIN) $(DESTDIR)/sbin
-	$(STRIP) $(DESTDIR)/sbin/$(GRADM_BIN)
-	mkdir -p -m 700 $(DESTDIR)$(GRSEC_DIR)
-	@if [ ! -f $(DESTDIR)$(GRSEC_DIR)/acl ] ; then \
-		$(INSTALL) -m 0600 acl $(DESTDIR)$(GRSEC_DIR) ; \
-	fi
-	mkdir -p $(DESTDIR)$(MANDIR)/man8
-	$(INSTALL) -m 0644 gradm.8 $(DESTDIR)$(MANDIR)/man8/$(GRADM_BIN).8
-	@if [ -z $(DESTDIR) ] ; then \
-		if [ -x /sbin/$(GRADM_BIN) ] ; then \
-			if [ ! -f $(GRSEC_DIR)/pw ] ; then \
-				/sbin/$(GRADM_BIN) -P ; \
-			else \
-				$(FIND) $(GRSEC_DIR) -type f -name pw ! -size 48c -exec /sbin/$(GRADM_BIN) -P \; ; \
-			fi \
-		fi \
-	fi
-
-clean:
-	rm -f core *.o $(GRADM_BIN) lex.*.c *.tab.c *.tab.h
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/acl linux-2.4.20-wolk4.16-fullkernel/gradm1/acl
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/acl	2003-06-21 19:10:50.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/acl	1970-01-01 01:00:00.000000000 +0100
@@ -1,105 +0,0 @@
-#sample default process acl for grsecurity
-
-/ {
-	/		r
-	/opt		rx
-	/home		rwx
-	/mnt		rw
-	/dev
-	/dev/urandom	r
-	/dev/random	r
-	/dev/zero	rw
-	/dev/input	rw
-	/dev/psaux	rw
-	/dev/null	rw
-	/dev/tty?	rw
-	/dev/console	rw
-	/dev/tty	rw
-	/dev/ttyp?	rw
-	/dev/pts	rw
-	/dev/ptmx	rw
-	/dev/dsp	rw
-	/dev/mixer	rw
-	/dev/fd0	r
-	/dev/cdrom	r
-	/dev/mem	h
-	/dev/kmem	h
-	/dev/port	h
-	/bin		rx
-	/sbin		rx
-	/lib		rx
-	/usr		rx
-	/etc		rx
-	/etc/ssh	h
-	/proc		rwx
-	/proc/kcore	h
-	/proc/sys	r
-	/root		r
-	/tmp		rw
-	/var		rwx
-	/var/tmp	rw
-	/var/log	r
-	/boot		h
-	/etc/grsec	h
-	
-	-CAP_SYS_TTY_CONFIG
-	-CAP_LINUX_IMMUTABLE
-	-CAP_NET_RAW
-	-CAP_MKNOD
-	-CAP_SYS_ADMIN
-	-CAP_SYS_RAWIO
-	-CAP_SYS_MODULE
-	-CAP_SYS_PTRACE
-	-CAP_NET_ADMIN
-	-CAP_NET_BIND_SERVICE
-	-CAP_SYS_CHROOT
-}
-
-/sbin/init {
-	/dev/initctl rw
-}
-
-/sbin/syslogd {
-	/dev/log rw
-	/var/log w
-}
-
-/sbin/klogd {
-	/dev/log rw
-}
-
-/usr/sbin/cron {
-	/dev/log rw
-}
-
-/usr/sbin/crond {
-	/dev/log rw
-}
-
-/usr/sbin/xinetd p {
-	/dev/log rw
-}
-
-/usr/sbin/inetd p {
-	/dev/log rw
-}
-
-/usr/sbin/anacron {
-	/dev/log rw
-}
-
-/bin/login {
-	/dev/log rw
-}
-
-# the d flag protects /proc fd and mem entries for sshd
-/usr/sbin/sshd dp {
-	/etc/ssh r
-	/dev/log rw
-	+CAP_SYS_TTY_CONFIG
-	+CAP_SYS_CHROOT
-}
-
-/usr/sbin/tcpd {
-	/dev/log rw
-}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/debian_secure_acls/apache linux-2.4.20-wolk4.16-fullkernel/gradm1/debian_secure_acls/apache
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/debian_secure_acls/apache	2003-11-18 19:10:17.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/debian_secure_acls/apache	1970-01-01 01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
-/usr/sbin/apache oXA {
-	/usr/share r
-	/etc r
-	/etc/grsec h
-	/etc/ld.so.cache r
-	/tmp rwx
-	/lib rx
-	/usr/lib rx
-	/var/log/apache a
-	/var/run/apache.pid w
-	/var/run/mysqld/mysqld.sock rw
-	/var/www rx
-	/dev/null rw
-	/bin/bash x
-	/usr/sbin/apache x
-	/
-
-	-CAP_ALL
-	+CAP_DAC_OVERRIDE
-	+CAP_KILL
-	+CAP_SETGID
-	+CAP_SETUID
-	+CAP_NET_BIND_SERVICE
-
-	RES_CRASH 1 10m
-
-	connect {
-		0.0.0.0/0:53 dgram udp
-	}
-
-	bind {
-		0.0.0.0/0:80 stream tcp
-	}
-}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/debian_secure_acls/cron linux-2.4.20-wolk4.16-fullkernel/gradm1/debian_secure_acls/cron
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/debian_secure_acls/cron	2002-12-14 20:26:19.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/debian_secure_acls/cron	1970-01-01 01:00:00.000000000 +0100
@@ -1,28 +0,0 @@
-/usr/sbin/cron oX {
-        /etc/environment
-        /var/spool/cron/crontabs
-        /var/mail
-        /usr/sbin/sendmail x
-        /root
-	/lib rx
-        /etc r
-	/etc/grsec h
-        /dev/log rw
-        /bin/bash x
-	/usr/sbin/cron x
-	/ h
-
-	-CAP_ALL
-	+CAP_SETGID
-	+CAP_SETUID
-
-	RES_CRASH 1 10m
-
-	connect {
-		disabled
-	}
-
-	bind {
-		disabled
-	}
-}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/debian_secure_acls/default linux-2.4.20-wolk4.16-fullkernel/gradm1/debian_secure_acls/default
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/debian_secure_acls/default	2003-04-06 21:43:47.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/debian_secure_acls/default	1970-01-01 01:00:00.000000000 +0100
@@ -1,50 +0,0 @@
-/ {
-	/
-	/opt	rx
-	/home	rx
-	/mnt	r
-	/dev
-	/dev/random     r
-	/dev/urandom    r
-	/dev/input      rw
-	/dev/psaux      rw
-	/dev/tty?	rw
-	/dev/null       rw
-	/dev/pts        rw
-	/dev/ptmx       rw
-	/dev/tty        rw
-	/dev/dsp        rw
-	/dev/mixer      rw
-	/dev/console    rw
-	/dev/mem        h
-        /dev/kmem       h 
-	/dev/port	h
-        /dev/zero       rw
-        /bin            rx
-        /sbin           rx
-        /lib            rx
-        /usr            rx
-        /etc            rx
-        /etc/postfix    r 
-        /etc/init.d     h 
-        /etc/shadow-    h 
-        /etc/shadow     h 
-        /proc           rwx
-        /proc/sys       r 
-        /proc/kcore     h 
-        /root           r
-        /tmp            rw
-        /var            rx
-        /var/cache      rw
-        /var/spool      rw
-        /var/spool/postfix/lib rx
-        /var/run        rw
-	/var/tmp	rw
-	/var/log
-	/boot		r
-	/etc/grsec	h
-
-	-CAP_ALL
-}
-
-include </etc/grsec/debian_secure_acls>
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/debian_secure_acls/getty linux-2.4.20-wolk4.16-fullkernel/gradm1/debian_secure_acls/getty
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/debian_secure_acls/getty	2003-01-13 05:18:13.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/debian_secure_acls/getty	1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-/sbin/getty oX {
-        /var/run/utmp rw
-        /var/log/wtmp w 
-        /etc/ld.so.preload
-        /etc/ld.so.cache r
-        /etc/issue r
-        /dev/tty6 rw
-        /dev/tty5 rw
-        /dev/tty4 rw
-        /dev/tty3 rw
-        /dev/tty2 rw
-        /dev/tty1 rw
-        /dev
-	/lib rx
-	/bin/login x
-	/sbin/getty x
-	/ h
-	
-	-CAP_ALL
-	+CAP_CHOWN
-	+CAP_DAC_OVERRIDE
-
-	connect {
-		disabled
-	}
-
-	bind {
-		disabled
-	}
-}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/debian_secure_acls/inetd linux-2.4.20-wolk4.16-fullkernel/gradm1/debian_secure_acls/inetd
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/debian_secure_acls/inetd	2003-01-13 05:18:13.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/debian_secure_acls/inetd	1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-/usr/sbin/inetd oX {
-        /usr/sbin/inetd x
-        /etc/ld.so.cache r
-        /etc/passwd r
-        /lib rx
-        /usr/lib rx
-        /usr/sbin/tcpd x
-        / h
-
-        -CAP_ALL
-
-	RES_CRASH 1 10m
-
-	connect {
-		disabled
-	}
-
-	bind {
-		disabled
-	}
-}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/debian_secure_acls/init linux-2.4.20-wolk4.16-fullkernel/gradm1/debian_secure_acls/init
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/debian_secure_acls/init	2002-11-25 16:59:32.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/debian_secure_acls/init	1970-01-01 01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
-/sbin/init oX {
-	/var/run/utmp rw
-	/sbin/getty x
-	/dev/console rw
-	/sbin/init x
-	/lib rx
-	/dev/initctl
-	/var/log/wtmp w
-	/ h
-
-	-CAP_ALL
-
-	connect {
-		disabled
-	}
-
-	bind {
-		disabled
-	}
-}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/debian_secure_acls/ipop3d linux-2.4.20-wolk4.16-fullkernel/gradm1/debian_secure_acls/ipop3d
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/debian_secure_acls/ipop3d	2002-12-14 20:26:19.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/debian_secure_acls/ipop3d	1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
-/usr/sbin/ipop3d o {
-	/etc/grsec h
-	/etc r
-        /tmp rw
-	/dev/urandom r
-	/dev/log rw
-        /home rw
-        /var/mail rw
-        /usr/share/zoneinfo r
-        /usr/lib rx
-	/lib rx
-        /usr/bin/mlock x
-	/usr/sbin/ipop3d x
-	/ h
-
-	-CAP_ALL
-	+CAP_SETGID
-	+CAP_SETUID
-
-	RES_CRASH 1 10m
-
-	connect {
-		disabled
-	}
-
-	bind {
-		disabled
-	}
-}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/debian_secure_acls/klogd linux-2.4.20-wolk4.16-fullkernel/gradm1/debian_secure_acls/klogd
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/debian_secure_acls/klogd	2003-01-13 05:18:13.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/debian_secure_acls/klogd	1970-01-01 01:00:00.000000000 +0100
@@ -1,27 +0,0 @@
-/sbin/klogd poX {
-        /usr/share/zoneinfo r
-        /proc/kmsg r
-        /etc/ld.so.preload
-        /etc/ld.so.cache r
-        /dev/log rw
-        /dev/kmem r
-        /boot r
-        /var/run/klogd.pid rw
-        /var/run
-        /lib rx
-	/sbin/klogd x
-	/
-
-	-CAP_ALL
-	+CAP_SYS_ADMIN
-
-	RES_CRASH 1 10m
-
-	connect {
-		disabled
-	}
-
-	bind {
-		disabled
-	}
-}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/debian_secure_acls/login linux-2.4.20-wolk4.16-fullkernel/gradm1/debian_secure_acls/login
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/debian_secure_acls/login	2002-12-14 20:26:19.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/debian_secure_acls/login	1970-01-01 01:00:00.000000000 +0100
@@ -1,41 +0,0 @@
-/bin/login oX {
-	/var/mail
-	/var/log/btmp
-	/proc
-	/home
-	/root
-	/var/run/utmp rw
-	/var/log/wtmp w
-	/var/log/lastlog rw
-	/var/log/faillog rw
-	/usr/share/zoneinfo r
-	/lib rx
-	/etc r
-	/etc/grsec h
-	/dev/tty1 w
-	/dev/tty2 w
-	/dev/tty3 w
-	/dev/tty4 w
-	/dev/tty5 w
-	/dev/log rw
-	/bin/bash x
-	/bin/login x
-	/ h
-
-	-CAP_ALL
-	+CAP_CHOWN
-	+CAP_FOWNER
-	+CAP_FSETID
-	+CAP_SETGID
-	+CAP_SETUID
-
-	RES_CRASH 1 10m
-
-	connect {
-		disabled
-	}
-
-	bind {
-		disabled
-	}
-}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/debian_secure_acls/mysqld linux-2.4.20-wolk4.16-fullkernel/gradm1/debian_secure_acls/mysqld
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/debian_secure_acls/mysqld	2003-11-18 19:13:47.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/debian_secure_acls/mysqld	1970-01-01 01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-/usr/sbin/mysqld oX {
-        /usr/share/mysql r
-        /usr/sbin/mysqld x
-        /lib rx
-	/tmp rw
-	/usr/lib rx
-	/var/lib/mysql rw
-	/var/log
-	/var/log/mysql.log a
-        / h
-
-	-CAP_ALL
-
-	RES_CRASH 1 10m
-
-	connect {
-		disabled
-	}
-
-	bind {
-		disabled
-	}
-}
-
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/debian_secure_acls/postfix linux-2.4.20-wolk4.16-fullkernel/gradm1/debian_secure_acls/postfix
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/debian_secure_acls/postfix	2003-01-13 05:18:13.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/debian_secure_acls/postfix	1970-01-01 01:00:00.000000000 +0100
@@ -1,33 +0,0 @@
-/usr/lib/postfix o {
-	/var/spool/postfix rw
-	/var/spool/postfix/lib rx
-	/var/mail w
-	/dev/log rw
-	/dev/null rw
-	/dev/urandom r
-	/etc/aliases
-	/etc/postfix rw
-	/etc r
-	/etc/grsec h
-	/lib rx
-	/usr/lib rx
-	/usr/share/zoneinfo r
-	/var/tmp
-	/ h
-
-	-CAP_ALL
-	+CAP_DAC_OVERRIDE
-	+CAP_KILL
-	+CAP_SETGID
-	+CAP_SETUID
-	+CAP_SYS_CHROOT
-
-	connect {
-		0.0.0.0/0:53 stream dgram ip tcp udp
-		0.0.0.0/0:25 stream ip tcp
-	}
-
-	bind {
-		disabled
-	}
-}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/debian_secure_acls/sshd linux-2.4.20-wolk4.16-fullkernel/gradm1/debian_secure_acls/sshd
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/debian_secure_acls/sshd	2003-11-18 18:58:37.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/debian_secure_acls/sshd	1970-01-01 01:00:00.000000000 +0100
@@ -1,45 +0,0 @@
-/usr/sbin/sshd dpoX {
-        /var/run
-        /var/run/sshd.pid rw
-        /var/run/utmp rw
-        /var/log/wtmp w
-        /var/log
-        /root
-	/root/.ssh r
-        /proc
-	/dev
-	/dev/log rw
-        /dev/tty rw
-	/dev/null rw
-        /dev/pts rw
-        /dev/ptmx rw
-        /var/run/sshd
-        /var/mail
-        /var/log/lastlog rw
-        /usr/lib rx
-	/lib rx
-	/home
-	/etc r
-	/etc/grsec h
-	/bin/bash x
-	/tmp rw
-	/ h
-
-	-CAP_ALL
-	+CAP_CHOWN
-	+CAP_SETGID
-	+CAP_SETUID
-	+CAP_SYS_CHROOT
-	+CAP_SYS_RESOURCE
-	+CAP_SYS_TTY_CONFIG
-
-	RES_CRASH 1 10m
-
-	connect {
-		0.0.0.0/0:53 dgram udp
-	}
-
-	bind {
-		0.0.0.0/0:22 stream tcp
-	}
-}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/debian_secure_acls/syslogd linux-2.4.20-wolk4.16-fullkernel/gradm1/debian_secure_acls/syslogd
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/debian_secure_acls/syslogd	2002-12-16 04:17:46.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/debian_secure_acls/syslogd	1970-01-01 01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-/sbin/syslogd poX {
-        /etc/syslog.conf r
-        /dev/console rw
-        /etc/services r
-        /lib rx
-	/dev
-	/dev/log rw
-	/var/run rw
-	/var/log w
-	/sbin/syslogd x
-	/ h
-	
-	-CAP_ALL
-
-	RES_CRASH 1 10m
-
-	connect {
-		disabled
-	}
-
-	bind {
-		disabled
-	}
-}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/debian_secure_acls/tcpd linux-2.4.20-wolk4.16-fullkernel/gradm1/debian_secure_acls/tcpd
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/debian_secure_acls/tcpd	2003-01-13 05:18:13.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/debian_secure_acls/tcpd	1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-/usr/sbin/tcpd o {
-        /usr/share/zoneinfo r
-	/usr/sbin x
-        /usr/lib 
-        /lib rx
-        /etc/protocols r
-        /etc/nsswitch.conf r
-        /etc/ld.so.cache r
-        /etc/hosts.deny r
-        /etc/hosts.allow r
-        /dev/log rw
-        /usr/sbin/tcpd x
-        / h
-
-        -CAP_ALL
-}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/debian_secure_acls/xfree86 linux-2.4.20-wolk4.16-fullkernel/gradm1/debian_secure_acls/xfree86
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/debian_secure_acls/xfree86	2003-01-19 19:18:49.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/debian_secure_acls/xfree86	1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-/usr/X11R6/bin/XFree86 SP {
-	/var/log/XFree86.0.log rw
-	/var/log/XFree86.1.log rw
-	/dev/mem rw
-	/dev/nvidiactl rw
-	/dev/nvidia0 rw
-
-        +CAP_CHOWN
-        +CAP_SETUID
-        +CAP_SETGID
-        +CAP_DAC_OVERRIDE
-        +CAP_SYS_RAWIO
-        +CAP_SYS_MODULE
-        +CAP_SYS_NICE
-        +CAP_SYS_TTY_CONFIG
-        +CAP_IPC_OWNER
-}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm.8 linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm.8
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm.8	2003-01-13 05:11:29.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm.8	1970-01-01 01:00:00.000000000 +0100
@@ -1,119 +0,0 @@
-.TH GRADM 8 
-.SH NAME
-gradm \- Administration program for grsecurity ACLs
-.SH SYNOPSIS
-.B gradm
-[
-.B \-E 
-]
-[
-.B \-R
-]
-[
-.B \-L [logfile]
-]
-[
-.B \-O <filename|stream>
-]
-[
-.B \-M
-<filename|uid>
-]
-[
-.B \-D 
-]
-[
-.B \-T
-<subject> <object>
-]
-[
-.B \-P
-]
-[
-.B \-a 
-]
-[
-.B \-h 
-]
-[
-.B \-v
-]
-
-.SH DESCRIPTION
-
-.I gradm
-is the userspace ACL parsing and authentication program for the
-.I grsecurity
-Access Control List System.
-
-grsecurity aims to be a complete security system for Linux 2.4.  gradm 
-performs several tasks for the ACL system including authenticated via a 
-password to the kernel and parsing ACLs to be passed to the kernel.
-
-.SH OPTIONS
-.TP
-
-All options to gradm are mutually exclusive, except for -L and -O.
-.TP
-.B \-E
-Enable the ACL system
-.TP
-
-.B \-R
-Reload the ACL system (only valid while in admin mode)
-.TP
-
-.B \-M <filename|uid>
-Remove an execution ban on a given uid or filename that has been
-put in place by the RES_CRASH resource restriction of the ACL system.
-.TP
-
-.B \-L [logfile]
-Parses the learning logs.  Accepts an optional argument which
-specifies the kernel logfile to scan for the learning logs.
-Learning logs are logged through syslog with a level of INFO.
-If the argument is not specified, gradm will scan your
-/etc/syslog.conf file to find a suitable log to scan.
-This option has to be used with -O.
-.TP
-
-.B \-O <filename|stream>
-Specifies output mode.  Requires a single argument that can be
-"stdout", "stderr", or a regular file.  Only used with -L.
-.TP
-
-.B \-D
-Disable the ACL system
-.TP
-
-.B \-T <subject> <object>
-Displays the permissions for object allowed by subject
-.TP
-
-.B \-P
-Setup the password for the ACL system
-.TP
-
-.B \-a
-Obtain full administrative capabilities(override ACL system)
-.TP
-
-.B \-h
-Display help information
-.TP
-
-.B \-v
-Print version information and exit
-.TP
-
-.BR
-
-.SH REPORTING BUGS
-Please include as much information as possible(using any available debugging 
-options) and send bug reports for gradm or the grsecurity ACL system 
-to 
-.B dev@grsecurity.net.
-
-.SH AUTHOR
-.B grsecurity and gradm
-were created and are maintained by Brad Spengler <spender@grsecurity.net>
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm.h linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm.h
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm.h	2004-02-21 15:22:21.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,47 +0,0 @@
-#ifndef GRADM_H
-#define GRADM_H
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <getopt.h>
-#include <fcntl.h>
-#include <termios.h>
-#include <sys/stat.h>
-#include <asm/param.h>
-#include <glob.h>
-#include <dirent.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <sys/resource.h>
-#include <sys/mman.h>
-#include <asm/posix_types.h>
-#include <asm/ioctls.h>
-#include <linux/elf.h>
-#include <linux/limits.h>
-#include <linux/capability.h>
-
-#include "gradm_defs.h"
-#include "gradm_func.h"
-
-#define failure(x) do { \
-	fprintf(stderr, x ": %s\n\n", strerror(errno)); \
-	exit(EXIT_FAILURE);\
-  	} while(0)
-
-#define for_each_subject(x, y) \
-	for(x = (y)->proc; x; x = (x)->prev)
-
-#define for_each_include(x) \
-	for(x = includes; x; x = (x)->prev)
-
-#define for_each_object(x, y) \
-	for(x = y; x; x = (x)->prev)
-
-#define MAJOR(dev)      ((dev)>>8)
-#define MINOR(dev)      ((dev) & 0xff)
-#define MKDEV(ma,mi)    ((ma)<<8 | (mi))
-
-#endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm.l linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm.l
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm.l	2003-04-27 16:47:45.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm.l	1970-01-01 01:00:00.000000000 +0100
@@ -1,185 +0,0 @@
-%{
-#include "gradm.h"
-#include "gradm.tab.h"
-
-extern unsigned long lineno;
-char * gr_line;
-
-void gradmerror(const char *s);
-int gradmwrap(void);
-
-int res_modes = 0;
-
-unsigned char old_state = 0;
-%}
-
-IP [0-9]{1,3}"."[0-9]{1,3}"."[0-9]{1,3}"."[0-9]{1,3}
-IPWITHMASK [0-9]{1,3}"."[0-9]{1,3}"."[0-9]{1,3}"."[0-9]{1,3}"/"[0-9]{1,2}
-
-%option nounput
-
-%x COMMENT
-%x CONNECTBIND
-%s RES_MOD
-%%
-
-<*>"#"		{
-			if (YYSTATE != COMMENT)
-				old_state = YYSTATE;
-			BEGIN COMMENT;
-		}
-<COMMENT>[.]*	;
-<COMMENT>"\n"	{
-			lineno++;
-			BEGIN(old_state);
-		}
-<*>"\n"		{
-			lineno++;
-		}
-<*>[ \t]+		;
-"include"		return INCLUDE;
-
-<RES_MOD>[0-9]+[smhdKMG]?	{
-			res_modes++;
-
-			if(res_modes == 2)			
-				BEGIN INITIAL;
-			gradmlval.gr_tmpbuf = strdup(yytext);
-			return RES_ACL_MOD;
-			}
-<RES_MOD>"unlimited"	{
-			res_modes++;
-
-			if(res_modes == 2)			
-				BEGIN INITIAL;
-			gradmlval.gr_tmpbuf = strdup(yytext);
-			return RES_ACL_MOD;
-			}
-
-"+CAP_"[_A-Z]+	{
-			gradmlval.gr_tmpbuf = strdup(yytext);
-			return CAP_RAISE;
-		}
-"-CAP_"[_A-Z]+	{ 
-			gradmlval.gr_tmpbuf = strdup(yytext);
-			return CAP_DROP;
-		}
-"RES_"[A-Z]+	{
-			gradmlval.gr_tmpbuf = strdup(yytext);
-			res_modes = 0;
-			BEGIN RES_MOD;
-			return RES_ACL;
-		}
-[rwxaotdsbFWIAOPXSRMGKChlivpk]+	{ 
-			gradmlval.gr_tmpbuf = strdup(yytext);
-			return ACL_MODE;
-		}
-[/][^ \t\n]*	{ 
-			gradmlval.gr_tmpbuf = strdup(yytext);
-			return ACL_SUBJECT;
-		}
-["][/].*["]	{
-			gr_line = yytext;
-			gr_line++;
-			*(gr_line + strlen(gr_line) - 1) = '\0';
-			gradmlval.gr_tmpbuf = strdup(gr_line);
-			return ACL_SUBJECT;
-		}
-[<].+[>]	{
-			gr_line = yytext;
-			gr_line++;
-			*(gr_line + strlen(gr_line) - 1) = '\0';
-			gradmlval.gr_tmpbuf = strdup(gr_line);
-			return INCLUDE_FNAME;
-		}
-
-connect		{
-			BEGIN CONNECTBIND;
-			return CONNECT;
-		}
-bind		{
-			BEGIN CONNECTBIND;
-			return	BIND;
-		}
-<CONNECTBIND>disabled		return DISABLED;
-<CONNECTBIND>{IP}	{
-				gradmlval.gr_tmpbuf = strdup(yytext);
-				return IP;
-			}	
-<CONNECTBIND>{IPWITHMASK}	{
-				gradmlval.gr_tmpbuf = strdup(yytext);
-				return IPWITHMASK;
-			}	
-<CONNECTBIND>[a-z_]+	{	gradmlval.gr_tmpbuf = strdup(yytext);
-				return TYPE;
-			}
-<CONNECTBIND>[0-9]{1,5}	{
-				gradmlval.gr_tmpbuf = strdup(yytext);
-				return MASKPORT;
-			}
-<CONNECTBIND>[\-:]		return *yytext;
-<CONNECTBIND>[{}]	{
-				if(*yytext == '}') BEGIN INITIAL;
-				return *yytext;
-			}
-[{}]			return *yytext;
-.			gradmerror("invalid character");
-
-%%
-
-int gradmwrap(void)
-{
-	return 1;
-}
-
-void gradmerror(const char *s) 
-{
-        fflush(stderr);
-        fprintf(stderr, "\"%s\" caused a %s on line %lu of %s\n", yytext, s, 
-		lineno, current_acl_file);
-	exit(EXIT_FAILURE);
-}
-
-void no_coredump(void)
-{
-	struct rlimit rlim;
-
-	rlim.rlim_cur = 0;
-	rlim.rlim_max = 0;
-
-	setrlimit(RLIMIT_CORE, &rlim);
-
-	return;
-}
-
-
-int main(int argc, char *argv[])
-{
-#ifdef GRADM_DEBUG
-	struct file_acl *filp;
-	struct proc_acl *proc;
-	extern struct rlimconv rlim_table[];
-	int i;
-#endif
-	no_coredump();
-
-	init_variables();
-
-	parse_args(argc, argv);
-
-#ifdef GRADM_DEBUG
-	for(proc = def_acl_tmp->proc;proc;proc=proc->prev) {
-		printf("SUBJECT: %s dev:%d inode:%lu mode:%d c_raise:%x c_drop:%x\n", 
-			proc->filename, proc->dev, proc->inode, proc->mode, proc->cap_raise, 
-			proc->cap_drop);
-		if (!proc->ip_object)
-			printf("\tNo socket restrictions\n");
-		for(filp = proc->proc_object;filp;filp=filp->prev)
-			printf("\tOBJECT: %s dev:%d inode:%lu mode:%d\n", filp->filename, filp->dev, filp->inode, filp->mode);	
-		for(i=0;i<GR_NLIMITS;i++)
-			if(proc->resmask & (1 << i))
-				printf("\t%s: soft: %lu hard: %lu\n", rlim_table[i].name, proc->res[i].rlim_cur, proc->res[i].rlim_max);
-	}
-#endif
-	return 0;
-}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm.y linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm.y
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm.y	2003-03-28 03:42:46.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm.y	1970-01-01 01:00:00.000000000 +0100
@@ -1,227 +0,0 @@
-%{
-#include "gradm.h"
-/* gradm grammar parser */
-
-extern int gradmlex(void);
-
-struct ip_acl ip;
-
-void conv_name_to_type(char * name)
-{
-	struct protoent * proto;
-	unsigned short i;
-
-	if(!strcmp(name, "raw_proto"))
-		ip.proto[IPPROTO_RAW / 32] |= (1 << (IPPROTO_RAW % 32));
-	else if(!strcmp(name, "raw_sock"))
-		ip.type |= (1 << SOCK_RAW);
-	else if(!strcmp(name, "any_sock")) {
-		ip.type = ~0;
-		ip.type &= ~(1 << 0);  // there is no sock type 0
-	} else if(!strcmp(name, "any_proto")) {
-		for(i = 0; i < 8; i++)
-			ip.proto[i] = ~0;
-	} else if(!strcmp(name, "stream"))
-		ip.type |= (1 << SOCK_STREAM);
-	else if(!strcmp(name, "dgram"))
-		ip.type |= (1 << SOCK_DGRAM);
-	else if(!strcmp(name, "rdm"))
-		ip.type |= (1 << SOCK_RDM);
-	else if(!strcmp(name, "tcp")) { // silly protocol 0
-		ip.proto[IPPROTO_IP / 32] |= (1 << (IPPROTO_IP % 32));
-		ip.proto[IPPROTO_TCP / 32] |= (1 << (IPPROTO_TCP % 32));
-	} else if(!strcmp(name, "udp")) { // silly protocol 0
-		ip.proto[IPPROTO_IP / 32] |= (1 << (IPPROTO_IP % 32));
-		ip.proto[IPPROTO_UDP / 32] |= (1 << (IPPROTO_UDP % 32));
-	} else if((proto = getprotobyname(name)))
-		ip.proto[proto->p_proto / 32] |= (1 << (proto->p_proto % 32));
-	else {
-		fprintf(stderr, "Invalid type/protocol: %s\n", name);
-		exit(EXIT_FAILURE);
-	}
-	return;
-}			
-
-char * get_mask(char * ipwithmask)
-{
-	char *p = strchr(ipwithmask, '/');
-	
-	*p = '\0';
-	p++;
-	return p;
-}
-
-%}
-
-%union {
-	char *gr_tmpbuf;  
-}
-
-%token <gr_tmpbuf> ACL_SUBJECT ACL_MODE CAP_RAISE CAP_DROP INCLUDE INCLUDE_FNAME RES_ACL RES_ACL_MOD IP MASKPORT IPWITHMASK TYPE CONNECT BIND DISABLED
-
-%%
-
-acl_file:	proc_acl
-	|	acl_file proc_acl
-	;
-
-proc_object_list:	/* empty */
-		|	proc_object_list ACL_SUBJECT ACL_MODE 
-		{ 
-			if(!add_proc_object_acl(&def_acl_tmp->filp, $2, 
-					proc_object_mode_conv($3),GR_FEXIST))
-				exit(EXIT_FAILURE);
-		}
-		|	proc_object_list ACL_SUBJECT 
-		{ 
-			if(!add_proc_object_acl(&def_acl_tmp->filp, $2, 
-					proc_object_mode_conv(""),GR_FEXIST))
-				exit(EXIT_FAILURE);
-		}
-		| 	proc_object_list cap_acl
-		|	proc_object_list res_acl
-		|	proc_object_list ip_acl
-		;
-
-res_acl:	RES_ACL	RES_ACL_MOD RES_ACL_MOD
-		{
-			add_res_acl(&def_acl_tmp, $1, $2, $3);
-		}
-		;
-
-ip_acl:		CONNECT '{' conn_ip_real_acl '}'
-		{
-			memset(&ip, 0, sizeof(ip));
-		}
-	|	CONNECT '{' DISABLED '}'
-		{
-			memset(&ip, 0, sizeof(ip));
-			add_ip_acl(&(def_acl_tmp->ipp), GR_IP_CONNECT, &ip);
-		}
-	|	BIND '{' bind_ip_real_acl '}'
-		{
-			memset(&ip, 0, sizeof(ip));
-		}
-	|	BIND '{' DISABLED '}'
-		{
-			memset(&ip, 0, sizeof(ip));
-			add_ip_acl(&(def_acl_tmp->ipp), GR_IP_BIND, &ip);
-		}
-	;
-
-conn_ip_real_acl:	ip_ip_acl ip_type_acl
-			{
-				add_ip_acl(&(def_acl_tmp->ipp), GR_IP_CONNECT, &ip);
-				memset(&ip, 0, sizeof(ip));
-			}
-	|	conn_ip_real_acl ip_ip_acl ip_type_acl
-			{
-				add_ip_acl(&(def_acl_tmp->ipp), GR_IP_CONNECT, &ip);
-				memset(&ip, 0, sizeof(ip));
-			}
-	;
-
-bind_ip_real_acl:	ip_ip_acl ip_type_acl
-			{
-				add_ip_acl(&(def_acl_tmp->ipp), GR_IP_BIND, &ip);
-				memset(&ip, 0, sizeof(ip));
-			}
-	|	bind_ip_real_acl ip_ip_acl ip_type_acl
-			{
-				add_ip_acl(&(def_acl_tmp->ipp), GR_IP_BIND, &ip);
-				memset(&ip, 0, sizeof(ip));
-			}
-	;
-
-ip_type_acl:	TYPE
-		{
-			conv_name_to_type($1);
-		}
-	|	ip_type_acl TYPE
-		{
-			conv_name_to_type($2);
-		}
-	;
-
-ip_ip_acl:	IP
-		{
-			add_ip_ip_acl(&ip, $1, "32", "0", "65535");
-		}
-	|	IPWITHMASK
-		{
-			char *netmask = get_mask($1);
-			add_ip_ip_acl(&ip, $1, netmask, "0", "65535");
-		}
-	|	IPWITHMASK ':' MASKPORT
-		{
-			char *netmask = get_mask($1);
-			add_ip_ip_acl(&ip, $1, netmask, $3, $3);
-		}
-	|	IPWITHMASK ':' MASKPORT '-' MASKPORT
-		{
-			char *netmask = get_mask($1);
-			add_ip_ip_acl(&ip, $1, netmask, $3, $5);
-		}
-	|	IP ':' MASKPORT
-		{
-			add_ip_ip_acl(&ip, $1, "32", $3, $3);
-		}
-	|	IP ':' MASKPORT '-' MASKPORT
-		{
-			add_ip_ip_acl(&ip, $1, "32", $3, $5);
-		}
-	;
-cap_acl:	CAP_DROP 
-		{ 
-			add_cap_acl(&def_acl_tmp, $1);
-		}
-	|	CAP_RAISE
-		{
-			add_cap_acl(&def_acl_tmp, $1);
-		}
-	;
-
-proc_acl:	INCLUDE INCLUDE_FNAME 
-		{
-			add_include($2);
-		}
-	|	ACL_SUBJECT ACL_MODE '{' proc_object_list '}' 
-		{ 	
-			struct stat fstat;
-			
-			if(!stat($1, &fstat) && S_ISREG(fstat.st_mode)) {
-				if(is_valid_elf_binary($1)) {
-					if(!add_proc_object_acl(&def_acl_tmp->filp, $1, 
-							proc_object_mode_conv("x"),GR_FLEARN))
-						exit(EXIT_FAILURE);
-				} else {
-					if(!add_proc_object_acl(&def_acl_tmp->filp, $1, 
-							proc_object_mode_conv("rx"),GR_FLEARN))
-						exit(EXIT_FAILURE);
-				}
-			}
-			if(!add_proc_subject_acl(&def_acl_tmp, $1, 
-					proc_subject_mode_conv($2)))
-				exit(EXIT_FAILURE);
-		}
-	|	ACL_SUBJECT '{' proc_object_list '}' 
-		{ 
-			struct stat fstat;
-		
-			if(!stat($1, &fstat) && S_ISREG(fstat.st_mode)) {
-				if(is_valid_elf_binary($1)) {
-					if(!add_proc_object_acl(&def_acl_tmp->filp, $1, 
-							proc_object_mode_conv("x"),GR_FLEARN))
-						exit(EXIT_FAILURE);
-				} else {
-					if(!add_proc_object_acl(&def_acl_tmp->filp, $1, 
-							proc_object_mode_conv("rx"),GR_FLEARN))
-						exit(EXIT_FAILURE);
-				}
-			}
-			if(!add_proc_subject_acl(&def_acl_tmp, $1, 
-					proc_subject_mode_conv("")))
-				exit(EXIT_FAILURE);
-		}
-	;
-%%
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm_adm.c linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm_adm.c
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm_adm.c	2003-07-10 20:05:38.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm_adm.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,123 +0,0 @@
-#include "gradm.h"
-
-int
-is_valid_elf_binary(const char *filename)
-{
-	struct elf32_hdr header_elf;
-	int fd;
-
-	if ((fd = open(filename, O_RDONLY)) < 0)
-		return 0;
-
-	if ((read(fd, &header_elf, sizeof (header_elf)) != sizeof (header_elf)))
-		goto failure;
-
-	if (strncmp(header_elf.e_ident, ELFMAG, SELFMAG))
-		goto failure;
-
-	if (header_elf.e_type != ET_EXEC && header_elf.e_type != ET_DYN)
-		goto failure;
-
-	close(fd);
-	return 1;
-      failure:
-	close(fd);
-	return 0;
-}
-
-static void
-find_gradm_path(char *gradm_realpath)
-{
-	char gradm_procpath[21] = { 0 };
-
-	snprintf(gradm_procpath, sizeof (gradm_procpath),
-		 "/proc/%d/exe", getpid());
-
-	if (readlink(gradm_procpath, gradm_realpath, PATH_MAX - 1) < 0)
-		failure("readlink");
-
-	return;
-}
-
-void
-add_gradm_acl(void)
-{
-	struct stat fstat;
-	char gradm_realpath[PATH_MAX] = { 0 };
-	char *gradm_name;
-	struct ip_acl ip;
-
-	find_gradm_path(gradm_realpath);
-
-	def_acl_tmp->cap_raise_tmp = 0;
-	def_acl_tmp->cap_drop_tmp = 0;
-
-	if (!stat("/proc/sys/kernel/grsecurity/acl", &fstat)) {
-		if (!add_proc_object_acl(&(def_acl_tmp->filp),
-					 "/proc/sys/kernel/grsecurity/acl",
-					 proc_object_mode_conv("w"), GR_FEXIST))
-			exit(EXIT_FAILURE);
-	} else {
-		fprintf(stderr, "/proc/sys/kernel/grsecurity/acl does not "
-			"exist.  Please recompile your kernel with "
-			"grsecurity's ACL system.\n");
-		exit(EXIT_FAILURE);
-	}
-	if (!add_proc_object_acl(&(def_acl_tmp->filp), "/",
-				 proc_object_mode_conv("h"), GR_FEXIST))
-		exit(EXIT_FAILURE);
-
-	memset(&ip, 0, sizeof (ip));
-	add_ip_acl(&(def_acl_tmp->ipp), GR_IP_CONNECT, &ip);
-	add_ip_acl(&(def_acl_tmp->ipp), GR_IP_BIND, &ip);
-
-	gradm_name = strdup(gradm_realpath);
-
-	if (!add_proc_object_acl(&(def_acl_tmp->filp), gradm_name,
-				 proc_object_mode_conv("x"), GR_FEXIST))
-		exit(EXIT_FAILURE);
-	add_cap_acl(&def_acl_tmp, "-CAP_ALL");
-	add_cap_acl(&def_acl_tmp, "+CAP_IPC_LOCK");
-	if (!add_proc_subject_acl(&def_acl_tmp, gradm_name,
-				  proc_subject_mode_conv("do")))
-		exit(EXIT_FAILURE);
-	return;
-}
-
-void
-add_admin_acl(void)
-{
-	def_acl_tmp->cap_raise_tmp = 0;
-	def_acl_tmp->cap_drop_tmp = 0;
-
-	if (!add_proc_object_acl
-	    (&(def_acl_tmp->filp), "/", proc_object_mode_conv("rwxi"),
-	     GR_FEXIST))
-		exit(EXIT_FAILURE);
-	add_cap_acl(&def_acl_tmp, "+CAP_ALL");
-	if (!add_proc_subject_acl
-	    (&def_acl_tmp, "god", proc_subject_mode_conv("kvo")))
-		exit(EXIT_FAILURE);
-
-	return;
-}
-
-void
-add_kernel_acl(void)
-{
-	def_acl_tmp->cap_raise_tmp = 0;
-	def_acl_tmp->cap_drop_tmp = 0;
-
-	if (!add_proc_object_acl
-	    (&(def_acl_tmp->filp), "/", proc_object_mode_conv("rx"), GR_FEXIST))
-		exit(EXIT_FAILURE);
-	if (!add_proc_object_acl
-	    (&(def_acl_tmp->filp), "/etc/grsec", proc_object_mode_conv("h"),
-	     GR_FEXIST))
-		exit(EXIT_FAILURE);
-	if (!add_proc_subject_acl
-	    (&def_acl_tmp, "kernel", proc_subject_mode_conv("o")))
-		exit(EXIT_FAILURE);
-
-	return;
-}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm_analyze.c linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm_analyze.c
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm_analyze.c	2003-06-24 00:28:02.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm_analyze.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,551 +0,0 @@
-#include "gradm.h"
-
-static struct proc_acl *
-get_default_acl(void)
-{
-	struct proc_acl *tmp;
-
-	for_each_subject(tmp, def_acl_tmp)
-	    if (!strcmp(tmp->filename, "/"))
-		return tmp;
-
-	return NULL;
-}
-
-int
-test_perm(const char *subj, const char *obj)
-{
-	struct proc_acl *proc;
-	struct file_acl *filp;
-	char *tmpsubj;
-	char *tmpobj;
-	__u32 perm = -1;
-
-	if ((tmpsubj = calloc(strlen(subj) + 1, sizeof (char))) == NULL)
-		failure("calloc");
-
-	if ((tmpobj = calloc(strlen(obj) + 1, sizeof (char))) == NULL)
-		failure("calloc");
-
-	strcpy(tmpsubj, subj);
-
-	do {
-		for_each_subject(proc, def_acl_tmp) {
-			if (!strcmp(proc->filename, tmpsubj)) {
-				strcpy(tmpobj, obj);
-				do {
-					for_each_object(filp, proc->proc_object) {
-						if (!strcmp
-						    (filp->filename, tmpobj)) {
-							perm = filp->mode;
-							goto done;
-						}
-					}
-				} while (parent_dir(obj, &tmpobj));
-			}
-		}
-	} while (parent_dir(subj, &tmpsubj));
-
-      done:
-	printf("Allowed access for %s from %s:\n", obj, subj);
-	printf("Read: %s\n"
-	       "Write: %s\n"
-	       "Append: %s\n"
-	       "Execute: %s\n"
-	       "Hidden: %s\n"
-	       "Inherit ACL on exec: %s\n"
-	       "Read-only ptrace: %s\n"
-	       "Audit reads: %s\n"
-	       "Audit writes: %s\n"
-	       "Audit execs: %s\n"
-	       "Audit appends: %s\n"
-	       "Audit finds: %s\n"
-	       "Audit inherits: %s\n",
-	       (perm & GR_READ) ? "yes" : "no",
-	       (perm & GR_WRITE) ? "yes" : "no",
-	       (perm & GR_APPEND) ? "yes" : "no",
-	       (perm & GR_EXEC) ? "yes" : "no",
-	       (perm & GR_FIND) ? "no" : "yes",
-	       (perm & GR_INHERIT) ? "yes" : "no",
-	       (perm & GR_PTRACERD) ? "yes" : "no",
-	       (perm & GR_AUDIT_READ) ? "yes" : "no",
-	       (perm & GR_AUDIT_WRITE) ? "yes" : "no",
-	       (perm & GR_AUDIT_EXEC) ? "yes" : "no",
-	       (perm & GR_AUDIT_APPEND) ? "yes" : "no",
-	       (perm & GR_AUDIT_FIND) ? "yes" : "no",
-	       (perm & GR_AUDIT_INHERIT) ? "yes" : "no");
-
-	return perm;
-}
-
-static int
-check_permission(struct proc_acl *def_acl, const char *filename,
-		 struct chk_perm *chk)
-{
-	struct file_acl *tmpf = NULL;
-	char *tmpname;
-
-	if (chk->type == CHK_FILE) {
-		if ((tmpname =
-		     calloc(strlen(filename) + 1, sizeof (char))) == NULL)
-			failure("calloc");
-
-		strcpy(tmpname, filename);
-
-		do {
-			for_each_object(tmpf, def_acl->proc_object)
-			    if (!strcmp(tmpf->filename, tmpname)) {
-				if (((chk->w_modes == 0xffff)
-				     || (tmpf->mode & chk->w_modes))
-				    && ((chk->u_modes == 0xffff)
-					|| !(tmpf->mode & chk->u_modes))) {
-					free(tmpname);
-					return 1;
-				} else {
-					free(tmpname);
-					return 0;
-				}
-			}
-		} while (parent_dir(filename, &tmpname));
-
-		free(tmpname);
-	} else if (chk->type == CHK_CAP) {
-		if (((chk->w_caps == 0xffffffff)
-		     || !(def_acl->cap_drop & chk->w_caps))
-		    && ((chk->u_caps == 0xffffffff)
-			|| (def_acl->cap_drop & chk->u_caps)))
-			return 1;
-	}
-
-	return 0;
-}
-
-static int
-check_subjects(void)
-{
-	struct proc_acl *tmp;
-	struct proc_acl *def_acl;
-	struct chk_perm chk;
-	unsigned int errs_found = 0;
-
-	def_acl = get_default_acl();
-
-	if (!def_acl)
-		return 0;
-
-	chk.type = CHK_FILE;
-	chk.u_modes = GR_WRITE;
-	chk.w_modes = 0xffff;
-
-	for_each_subject(tmp, def_acl_tmp)
-	    if ((tmp->filename[0] == '/') && (tmp->filename[1] != '\0'))
-		if (!check_permission(def_acl, tmp->filename, &chk))
-			fprintf(stderr,
-				"Warning: write access is allowed to your "
-				"subject ACL for %s.  Please ensure that the subject is running with less privilege than the default ACL.\n",
-				tmp->filename);
-
-	return errs_found;
-}
-
-static void
-check_default_objects(void)
-{
-	int def_notfound = 1;
-	struct proc_acl *tmp;
-	struct file_acl *tmpf;
-
-	for_each_subject(tmp, def_acl_tmp) {
-		for_each_object(tmpf, tmp->proc_object)
-		    if (!strcmp(tmpf->filename, "/"))
-			def_notfound = 0;
-		if (def_notfound) {
-			fprintf(stderr, "Default ACL object not found for "
-				"subject %s\nThe ACL system will "
-				"not load until you correct this "
-				"error.\n", tmp->filename);
-			exit(EXIT_FAILURE);
-		}
-		def_notfound = 1;
-	}
-
-	return;
-}
-
-static int
-check_lilo_conf(struct proc_acl *def_acl)
-{
-	FILE *liloconf;
-	char buf[PATH_MAX];
-	struct stat fstat;
-	struct chk_perm chk;
-	unsigned int errs_found = 0;
-	char *p;
-
-	if ((liloconf = fopen("/etc/lilo.conf", "r")) == NULL)
-		return 0;
-
-	chk.type = CHK_FILE;
-	chk.u_modes = GR_WRITE;
-	chk.w_modes = 0xffff;
-
-	while (fgets(buf, PATH_MAX - 1, liloconf)) {
-		if (buf[strlen(buf) - 1] == '\n')
-			buf[strlen(buf) - 1] = '\0';
-		if ((p = strstr(buf, "image="))) {
-			p += 6;
-			if (!stat(p, &fstat)
-			    && !check_permission(def_acl, p, &chk)) {
-				fprintf(stderr,
-					"Write access is allowed to %s, a kernel "
-					"for your system specified in "
-					"/etc/lilo.conf.\n\n", p);
-				errs_found++;
-			}
-		}
-	}
-
-	fclose(liloconf);
-
-	return errs_found;
-}
-
-static int
-check_lib_paths(struct proc_acl *def_acl)
-{
-	FILE *ldconf;
-	char buf[PATH_MAX];
-	struct stat fstat;
-	struct chk_perm chk;
-	unsigned int errs_found = 0;
-
-	if ((ldconf = fopen("/etc/ld.so.conf", "r")) == NULL)
-		return 0;
-
-	chk.type = CHK_FILE;
-	chk.u_modes = GR_WRITE;
-	chk.w_modes = 0xffff;
-
-	while (fgets(buf, PATH_MAX - 1, ldconf)) {
-		if (buf[strlen(buf) - 1] == '\n')
-			buf[strlen(buf) - 1] = '\0';
-
-		if (!stat(buf, &fstat) && !check_permission(def_acl, buf, &chk)) {
-			fprintf(stderr,
-				"Write access is allowed to %s, a directory which "
-				"holds libraries for your system and is included "
-				"in /etc/ld.so.conf.\n\n", buf);
-			errs_found++;
-		}
-	}
-
-	fclose(ldconf);
-
-	return errs_found;
-}
-
-static int
-check_path_env(struct proc_acl *def_acl)
-{
-	char *pathstr, *p, *p2;
-	struct stat fstat;
-	struct chk_perm chk;
-	unsigned int errs_found = 0;
-
-	if ((pathstr = getenv("PATH")) == NULL)
-		return 0;
-
-	p = pathstr;
-
-	chk.type = CHK_FILE;
-	chk.u_modes = GR_WRITE;
-	chk.w_modes = 0xffff;
-
-	while ((p2 = strchr(p, ':'))) {
-		*p2++ = '\0';
-		if (!stat(p, &fstat) && !check_permission(def_acl, p, &chk)) {
-			fprintf(stderr,
-				"Write access is allowed to %s, a directory which "
-				"holds binaries for your system and is included "
-				"in the PATH environment variable.\n\n", p);
-			errs_found++;
-		}
-		p = p2;
-	}
-
-	if (!stat(p, &fstat) && !check_permission(def_acl, p, &chk)) {
-		fprintf(stderr,
-			"Write access is allowed to %s, a directory which "
-			"holds binaries for your system and is included "
-			"in the PATH environment variable.\n\n", p);
-		errs_found++;
-	}
-
-	return errs_found;
-}
-
-static int
-handle_notrojan_mode(void)
-{
-	struct proc_acl *subj, *subj2;
-	struct file_acl *obj, *obj2;
-	char *objname;
-	int ret = 0;
-
-	for_each_subject(subj, def_acl_tmp) {
-		if (!(subj->mode & GR_NOTROJAN))
-			continue;
-		for_each_object(obj, subj->proc_object) {
-			if (!(obj->mode & GR_EXEC))
-				continue;
-			if ((objname =
-			     malloc(strlen(obj->filename) + 1)) == NULL)
-				failure("malloc");
-			strcpy(objname, obj->filename);
-			do {
-				for_each_subject(subj2, def_acl_tmp) {
-					if (subj2 == subj
-					    || (subj2->filename[0] != '/'))
-						continue;
-					for_each_object(obj2,
-							subj2->proc_object) {
-						if (!strcmp
-						    (obj2->filename, objname)) {
-							if (obj2->
-							    mode & GR_WRITE) {
-								ret++;
-								fprintf(stderr,
-									"\'T\' specified in mode for %s."
-									"  %s's executable object %s is "
-									"writable by %s, due to its "
-									"writable object %s.\nThis would "
-									"allow %s to execute trojaned code.\n\n",
-									subj->
-									filename,
-									subj->
-									filename,
-									obj->
-									filename,
-									subj2->
-									filename,
-									obj2->
-									filename,
-									subj->
-									filename);
-							}
-							break;
-						}
-					}
-				}
-			} while (parent_dir(obj->filename, &objname));
-			free(objname);
-		}
-	}
-
-	return ret;
-}
-
-void
-analyze_acls(void)
-{
-	struct proc_acl *def_acl;
-	struct chk_perm chk;
-	unsigned int errs_found = 0;
-
-	if ((def_acl = get_default_acl()) == NULL) {
-		fprintf(stderr, "There is no default ACL present in your "
-			"configuration.\nPlease read the ACL "
-			"documentation and create a default ACL "
-			"before attempting to enable the ACL " "system.\n");
-		exit(EXIT_FAILURE);
-	}
-
-	check_default_objects();
-	errs_found += check_subjects();
-
-	chk.type = CHK_FILE;
-	chk.u_modes = GR_FIND;
-	chk.w_modes = 0xffff;
-
-	if (!check_permission(def_acl, GRSEC_DIR, &chk)) {
-		fprintf(stderr,
-			"Viewing access is allowed to %s, the directory which "
-			"holds ACL and ACL password information.\n\n",
-			GRSEC_DIR);
-		errs_found++;
-	}
-
-	if (!check_permission(def_acl, "/dev/kmem", &chk)) {
-		fprintf(stderr,
-			"Viewing access is allowed to /dev/kmem.  This could "
-			"allow an attacker to modify the code of your "
-			"running kernel.\n\n");
-		errs_found++;
-	}
-
-	if (!check_permission(def_acl, "/dev/mem", &chk)) {
-		fprintf(stderr,
-			"Viewing access is allowed to /dev/mem.  This would "
-			"allow an attacker to modify the code of programs "
-			"running on your system.\n\n");
-		errs_found++;
-	}
-
-	if (!check_permission(def_acl, "/dev/port", &chk)) {
-		fprintf(stderr,
-			"Viewing access is allowed to /dev/port.  This would "
-			"allow an attacker to modify the code of programs "
-			"running on your system.\n\n");
-		errs_found++;
-	}
-
-	if (!check_permission(def_acl, "/proc/kcore", &chk)) {
-		fprintf(stderr,
-			"Viewing access is allowed to /proc/kcore.  This would "
-			"allow an attacker to view the raw memory of processes "
-			"running on your system.\n\n");
-		errs_found++;
-	}
-
-	chk.u_modes = GR_WRITE;
-
-	if (!check_permission(def_acl, "/boot", &chk)) {
-		fprintf(stderr,
-			"Writing access is allowed to /boot, the directory which "
-			"holds boot and kernel information.\n\n");
-		errs_found++;
-	}
-
-	if (!check_permission(def_acl, "/dev", &chk)) {
-		fprintf(stderr,
-			"Writing access is allowed to /dev, the directory which "
-			"holds system devices.\n\n");
-		errs_found++;
-	}
-
-	if (!check_permission(def_acl, "/dev/log", &chk)) {
-		fprintf(stderr,
-			"Writing access is allowed to /dev/log.  This could in some cases allow an attacker"
-			" to spoof learning logs on your system.\n\n");
-		errs_found++;
-	}
-
-	if (!check_permission(def_acl, "/root", &chk)) {
-		fprintf(stderr,
-			"Writing access is allowed to /root, the directory which "
-			"holds shell configurations for the root user.  "
-			"If writing is allowed to this directory, an attacker "
-			"could modify your $PATH environment to fool you "
-			"into executing a trojaned gradm.\n\n");
-		errs_found++;
-	}
-
-	if (!check_permission(def_acl, "/proc/sys", &chk)) {
-		fprintf(stderr,
-			"Write access is allowed to /proc/sys, the directory which "
-			"holds entries that allow modifying kernel variables.\n\n");
-		errs_found++;
-	}
-
-	if (!check_permission(def_acl, "/etc", &chk)) {
-		fprintf(stderr,
-			"Write access is allowed to /etc, the directory which "
-			"holds initialization scripts and configuration files.\n\n");
-		errs_found++;
-	}
-
-	if (!check_permission(def_acl, "/lib", &chk)) {
-		fprintf(stderr,
-			"Write access is allowed to /lib, a directory which "
-			"holds system libraries and loadable modules.\n\n");
-		errs_found++;
-	}
-
-	if (!check_permission(def_acl, "/usr/lib", &chk)) {
-		fprintf(stderr,
-			"Write access is allowed to /usr/lib, a directory which "
-			"holds system libraries.\n\n");
-		errs_found++;
-	}
-
-	chk.u_modes = GR_READ;
-
-	if (!check_permission(def_acl, "/dev", &chk)) {
-		fprintf(stderr,
-			"Reading access is allowed to /dev, the directory which "
-			"holds system devices.\n\n");
-		errs_found++;
-	}
-
-	chk.type = CHK_CAP;
-	chk.u_caps =
-	    (1 << CAP_SYS_MODULE) | (1 << CAP_SYS_RAWIO) | (1 << CAP_MKNOD);
-	chk.w_caps = 0xffffffff;
-
-	if (!check_permission(def_acl, "", &chk)) {
-		fprintf(stderr,
-			"CAP_SYS_MODULE, CAP_SYS_RAWIO, and CAP_MKNOD are all not "
-			"removed for all users.  This would allow an "
-			"attacker to modify the kernel by means of a "
-			"module or corrupt devices on your system.\n\n");
-		errs_found++;
-	}
-
-	chk.u_caps = (1 << CAP_SYS_ADMIN);
-	chk.w_caps = 0xffffffff;
-
-	if (!check_permission(def_acl, "", &chk)) {
-		fprintf(stderr, "CAP_SYS_ADMIN is not "
-			"removed for all users.  This would allow an "
-			"attacker to mount filesystems to bypass ACLs\n\n");
-		errs_found++;
-	}
-
-	chk.u_caps = (1 << CAP_NET_ADMIN);
-	chk.w_caps = 0xffffffff;
-
-	if (!check_permission(def_acl, "", &chk)) {
-		fprintf(stderr, "CAP_NET_ADMIN is not "
-			"removed for all users.  This would allow an "
-			"attacker to modify your firewall configuration or redirect private information\n\n");
-		errs_found++;
-	}
-
-	chk.u_caps = (1 << CAP_NET_BIND_SERVICE);
-	chk.w_caps = 0xffffffff;
-
-	if (!check_permission(def_acl, "", &chk)) {
-		fprintf(stderr, "CAP_NET_BIND_SERVICE is not "
-			"removed for all users.  This would allow an "
-			"attacker (if he can kill a network daemon) to "
-			"launch a trojaned daemon that could steal privileged information\n\n");
-		errs_found++;
-	}
-
-	chk.u_caps = (1 << CAP_SYS_TTY_CONFIG);
-	chk.w_caps = 0xffffffff;
-
-	if (!check_permission(def_acl, "", &chk)) {
-		fprintf(stderr, "CAP_SYS_TTY_CONFIG is not "
-			"removed for all users.  This would allow an "
-			"attacker to hijack terminals of "
-			"privileged processes\n\n");
-		errs_found++;
-	}
-
-	errs_found += check_path_env(def_acl);
-	errs_found += check_lib_paths(def_acl);
-	errs_found += check_lilo_conf(def_acl);
-
-	errs_found += handle_notrojan_mode();
-
-	if (errs_found) {
-		printf("There were %d holes found in your ACL "
-		       "configuration.  These must be fixed before the "
-		       "ACL system will be allowed to be enabled.\n",
-		       errs_found);
-		exit(EXIT_FAILURE);
-	}
-
-	return;
-}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm_arg.c linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm_arg.c
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm_arg.c	2003-12-15 15:00:59.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm_arg.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,238 +0,0 @@
-#include "gradm.h"
-
-static void
-show_version(void)
-{
-	printf("gradm v%s\n"
-	       "Licensed under the GNU General Public License (GPL)\n"
-	       "Copyright 2002,2003  Brad Spengler\n", GR_VERSION);
-	exit(EXIT_SUCCESS);
-}
-
-static void
-show_help(void)
-{
-	printf("gradm %s\n"
-	       "grsecurity administration program\n\n"
-	       "Usage: gradm [option] ... \n\n"
-	       "Examples:\n"
-	       "	gradm -P\n"
-	       "	gradm -T /bin/su /etc/shadow\n"
-	       "Options:\n"
-	       "	-E, --enable	Enable the grsecurity ACL system\n"
-	       "	-D, --disable	Disable the grsecurity ACL system\n"
-	       "	-P, --passwd	Create password for ACL administration\n"
-	       "	-R, --reload	Reload the ACL system while in admin mode\n"
-	       "	-L [filename], --learn\n"
-	       "			Compute new ACLs from learning log\n"
-	       "	-O <filename>, --output\n"
-	       "			Specify where to place ACLs generated from learning mode\n"
-	       "	-M <filename|uid>, --modsegv\n"
-	       "			Remove a ban on a specific file or UID\n"
-	       "	-T <subject> <object>, --test\n"
-	       "			Display permissions for object allowed by subject\n"
-	       "	-a, --admin	Provides full overriding access for the current user\n"
-	       "	-h, --help	Display this help\n"
-	       "	-v, --version	Display version information\n",
-	       GR_VERSION);
-
-	exit(EXIT_SUCCESS);
-	return;
-}
-
-static void
-conv_name_to_num(const char *filename, unsigned short *dev, ino_t * inode)
-{
-	struct stat fstat;
-
-	if (stat(filename, &fstat)) {
-		fprintf(stderr, "Unable to stat %s: %s\n", filename,
-			strerror(errno));
-		exit(EXIT_FAILURE);
-	}
-
-	*dev = MKDEV(MAJOR(fstat.st_dev), MINOR(fstat.st_dev));
-	*inode = fstat.st_ino;
-
-	return;
-}
-
-void
-parse_args(int argc, char *argv[])
-{
-	int next_option = 0;
-	int err;
-	char *output_log = NULL;
-	char *learn_log = NULL;
-	int gr_learn = 0;
-	int gr_output = 0;
-	struct gr_pw_entry entry;
-	struct gr_arg *grarg;
-	const char *const short_opts = "EDPRL::O:M:T:ahv";
-	const struct option long_opts[] = {
-		{"help", 0, NULL, 'h'},
-		{"version", 0, NULL, 'v'},
-		{"enable", 0, NULL, 'E'},
-		{"test", 1, NULL, 'T'},
-		{"disable", 0, NULL, 'D'},
-		{"passwd", 0, NULL, 'P'},
-		{"admin", 0, NULL, 'a'},
-		{"reload", 0, NULL, 'R'},
-		{"modsegv", 1, NULL, 'M'},
-		{"learn", 2, NULL, 'L'},
-		{"output", 1, NULL, 'O'},
-		{NULL, 0, NULL, 0}
-	};
-
-	err = mlock(&entry, sizeof (entry));
-	if (err)
-		fprintf(stderr, "Warning: Unable to lock password "
-			"in physical memory.\n");
-
-	memset(&entry, 0, sizeof (struct gr_pw_entry));
-
-	if (argc < 2)
-		show_help();
-
-	while ((next_option =
-		getopt_long(argc, argv, short_opts, long_opts, NULL)) != -1) {
-
-		switch (next_option) {
-		case 'E':
-			if (argc > 2)
-				show_help();
-			entry.mode = GRADM_ENABLE;
-			parse_acls();
-			expand_acls();
-			analyze_acls();
-			grarg = conv_user_to_kernel(&entry);
-			read_saltandpass(grarg->salt, grarg->sum);
-			transmit_to_kernel(grarg, sizeof (struct gr_arg));
-			memset(grarg, 0, sizeof (struct gr_arg));
-			break;
-		case 'R':
-			if (argc > 2)
-				show_help();
-			entry.mode = GRADM_RELOAD;
-			get_user_passwd(&entry, GR_PWONLY);
-			parse_acls();
-			expand_acls();
-			analyze_acls();
-			grarg = conv_user_to_kernel(&entry);
-			read_saltandpass(grarg->salt, grarg->sum);
-			transmit_to_kernel(grarg, sizeof (struct gr_arg));
-			memset(grarg, 0, sizeof (struct gr_arg));
-			break;
-		case 'M':
-			if ((argc != 3) || (optind > argc)
-			    || (strlen(optarg) < 1))
-				show_help();
-			entry.mode = GRADM_MODSEGV;
-			get_user_passwd(&entry, GR_PWONLY);
-
-			if (isdigit(optarg[0]))
-				entry.segv_uid = atoi(optarg);
-			else
-				conv_name_to_num(optarg, &entry.segv_dev,
-						 &entry.segv_inode);
-			grarg = conv_user_to_kernel(&entry);
-			transmit_to_kernel(grarg, sizeof (struct gr_arg));
-			memset(grarg, 0, sizeof (struct gr_arg));
-			exit(EXIT_SUCCESS);
-			break;
-		case 'D':
-			get_user_passwd(&entry, GR_PWONLY);
-			entry.mode = GRADM_DISABLE;
-			grarg = conv_user_to_kernel(&entry);
-			transmit_to_kernel(grarg, sizeof (struct gr_arg));
-			memset(grarg, 0, sizeof (struct gr_arg));
-			exit(EXIT_SUCCESS);
-			break;
-		case 'L':
-			if (argc > 5 || argc < 3)
-				show_help();
-			gr_learn = 1;
-			if (optind <= (argc - 1) && argv[optind][0] != '-')
-				learn_log = strdup(argv[optind]);
-			break;
-		case 'O':
-			if (argc > 5 || argc < 3)
-				show_help();
-			gr_output = 1;
-			if (optarg)
-				output_log = strdup(optarg);
-			break;
-		case 'P':
-			if (argc > 2)
-				show_help();
-			printf("Setting up grsecurity ACL password\n");
-			get_user_passwd(&entry, GR_PWANDSUM);
-			generate_salt(&entry);
-			generate_hash(&entry);
-			write_user_passwd(&entry);
-			memset(&entry, 0, sizeof (struct gr_pw_entry));
-			exit(EXIT_SUCCESS);
-			break;
-		case 'T':
-			if ((argc != 4) || (optind >= argc))
-				show_help();
-			parse_acls();
-			expand_acls();
-			test_perm(argv[optind - 1], argv[optind]);
-			exit(EXIT_SUCCESS);
-			break;
-		case 'a':
-			if (argc > 2)
-				show_help();
-			get_user_passwd(&entry, GR_PWONLY);
-			entry.mode = GRADM_ADMIN;
-			grarg = conv_user_to_kernel(&entry);
-			transmit_to_kernel(grarg, sizeof (struct gr_arg));
-			memset(grarg, 0, sizeof (struct gr_arg));
-			exit(EXIT_SUCCESS);
-			break;
-		case 'v':
-			if (argc > 2)
-				show_help();
-			show_version();
-			break;
-		case 'h':
-			show_help();
-			break;
-		default:
-			show_help();
-			break;
-		}
-	}
-
-	if ((gr_learn && !gr_output) || (gr_output && !gr_learn)) {
-		fprintf(stderr, "-L and -O must be used together.\n");
-		exit(EXIT_FAILURE);
-	}
-
-	if (gr_learn && gr_output) {
-		FILE *stream;
-
-		if (!strcmp(output_log, "stdout"))
-			stream = stdout;
-		else if (!strcmp(output_log, "stderr"))
-			stream = stderr;
-		else {
-			stream = fopen(output_log, "a");
-			if (!stream) {
-				fprintf(stderr,
-					"Unable to open %s for writing.\n"
-					"Error: %s\n", output_log,
-					strerror(errno));
-				exit(EXIT_FAILURE);
-			}
-		}
-
-		if (!learn_log)
-			syslog_lookup_log(&learn_log);
-
-		handle_learn_logs(learn_log, stream);
-
-	}
-	return;
-}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm_cap.c linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm_cap.c
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm_cap.c	2003-05-28 03:39:22.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm_cap.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,85 +0,0 @@
-#include "gradm.h"
-
-struct capability_set capability_list[] = {
-	{"CAP_CHOWN", CAP_CHOWN},
-	{"CAP_DAC_OVERRIDE", CAP_DAC_OVERRIDE},
-	{"CAP_DAC_READ_SEARCH", CAP_DAC_READ_SEARCH},
-	{"CAP_FOWNER", CAP_FOWNER},
-	{"CAP_FSETID", CAP_FSETID},
-	{"CAP_KILL", CAP_KILL},
-	{"CAP_SETGID", CAP_SETGID},
-	{"CAP_SETUID", CAP_SETUID},
-	{"CAP_SETPCAP", CAP_SETPCAP},
-	{"CAP_LINUX_IMMUTABLE", CAP_LINUX_IMMUTABLE},
-	{"CAP_NET_BIND_SERVICE", CAP_NET_BIND_SERVICE},
-	{"CAP_NET_BROADCAST", CAP_NET_BROADCAST},
-	{"CAP_NET_ADMIN", CAP_NET_ADMIN},
-	{"CAP_NET_RAW", CAP_NET_RAW},
-	{"CAP_IPC_LOCK", CAP_IPC_LOCK},
-	{"CAP_IPC_OWNER", CAP_IPC_OWNER},
-	{"CAP_SYS_MODULE", CAP_SYS_MODULE},
-	{"CAP_SYS_RAWIO", CAP_SYS_RAWIO},
-	{"CAP_SYS_CHROOT", CAP_SYS_CHROOT},
-	{"CAP_SYS_PTRACE", CAP_SYS_PTRACE},
-	{"CAP_SYS_PACCT", CAP_SYS_PACCT},
-	{"CAP_SYS_ADMIN", CAP_SYS_ADMIN},
-	{"CAP_SYS_BOOT", CAP_SYS_BOOT},
-	{"CAP_SYS_NICE", CAP_SYS_NICE},
-	{"CAP_SYS_RESOURCE", CAP_SYS_RESOURCE},
-	{"CAP_SYS_TIME", CAP_SYS_TIME},
-	{"CAP_SYS_TTY_CONFIG", CAP_SYS_TTY_CONFIG},
-	{"CAP_MKNOD", CAP_MKNOD},
-	{"CAP_LEASE", CAP_LEASE},
-	{"CAP_ALL", ~0}
-};
-
-__u32
-cap_conv(const char *cap)
-{
-	int i;
-
-	for (i = 0;
-	     i < sizeof (capability_list) / sizeof (struct capability_set); i++)
-		if (!strcmp(cap, capability_list[i].cap_name)) {
-			if (i == (sizeof (capability_list) /
-				  sizeof (struct capability_set) - 1))
-				return ~0;	/* CAP_ALL */
-			else
-				return (1 << (capability_list[i].cap_val));
-		}
-
-	fprintf(stderr, "Invalid capability name \"%s\" on line %lu of %s.\n"
-		"The ACL system will not load until this"
-		" error is fixed.\n", cap, lineno, current_acl_file);
-
-	exit(EXIT_FAILURE);
-
-	return 0;
-}
-
-void
-add_cap_acl(struct acl_tmps **acl_tmp, const char *cap)
-{
-	__u32 kcap = cap_conv(cap + 1);
-
-	if (*cap == '+')
-		(*acl_tmp)->cap_raise_tmp |= kcap;
-	else
-		(*acl_tmp)->cap_drop_tmp |= kcap;
-
-	return;
-}
-
-void
-modify_caps(struct proc_acl **proc, int cap)
-{
-	__u32 cap_same;
-
-	(*proc)->cap_raise |= (1 << cap);
-
-	cap_same = (*proc)->cap_raise & (*proc)->cap_drop;
-	(*proc)->cap_raise &= ~cap_same;
-	(*proc)->cap_drop &= ~cap_same;
-
-	return;
-}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm_defs.h linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm_defs.h
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm_defs.h	2004-04-14 19:14:07.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm_defs.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,319 +0,0 @@
-#define GR_SYSCTL_PATH 		"/proc/sys/kernel/grsecurity/acl"
-
-#ifndef GRSEC_DIR
-#define GRSEC_DIR		"/etc/grsec"
-#endif
-#define GR_ACL_PATH 		GRSEC_DIR "/acl"
-#define GR_PW_PATH 		GRSEC_DIR "/pw"
-
-#define SYSLOG_CONF		"/etc/syslog.conf"
-
-#define GR_VERSION		"1.9.15"
-
-#define GR_PWONLY		0
-#define GR_PWANDSUM		1
-
-#define GR_PW_LEN		128
-#define GR_SALT_SIZE		16
-#define GR_SHA_SUM_SIZE		32
-
-#define GR_FEXIST		0x01
-#define GR_FFAKE		0x02
-#define GR_FLEARN		0x04
-#define GR_GLOB			0x08
-#define GR_SYMLINK		0x10
-
-#define CHK_FILE		0
-#define CHK_CAP			1
-
-#undef PATH_MAX
-#define PATH_MAX 		4096
-#define MAX_LINE_LEN 		5000
-
-#define GR_LEARN_THRESH		4
-
-#define GR_NLIMITS	(RLIM_NLIMITS + 1)
-
-enum {
-	GRADM_DISABLE = 0,
-	GRADM_ENABLE = 1,
-	GRADM_ADMIN = 2,
-	GRADM_RELOAD = 3,
-	GRADM_MODSEGV = 4
-};
-
-enum {
-	GR_IP_BIND = 0x01,
-	GR_IP_CONNECT = 0x02,
-};
-
-enum {
-	GR_READ = 0x00000001,
-	GR_APPEND = 0x00000002,
-	GR_WRITE = 0x00000004,
-	GR_EXEC = 0x00000008,
-	GR_FIND = 0x00000010,
-	GR_INHERIT = 0x00000040,
-	GR_PTRACERD = 0x00000100,
-	GR_AUDIT_READ = 0x00000200,
-	GR_AUDIT_APPEND = 0x00000400,
-	GR_AUDIT_WRITE = 0x00001000,
-	GR_AUDIT_EXEC = 0x00002000,
-	GR_AUDIT_FIND = 0x00004000,
-	GR_AUDIT_INHERIT = 0x00008000,
-	GR_SUPPRESS = 0x00010000
-};
-
-enum {
-	GR_DELETED = 0x00000080
-};
-
-enum {
-	GR_KILL = 0x00000001,
-	GR_VIEW = 0x00000002,
-	GR_PROTECTED = 0x00000100,
-	GR_LEARN = 0x00000200,
-	GR_IGNORE = 0x00000400,
-	GR_OVERRIDE = 0x00000800,
-	GR_PAXPAGE = 0x00001000,
-	GR_PAXSEGM = 0x00002000,
-	GR_PAXGCC = 0x00004000,
-	GR_PAXRANDMMAP = 0x00008000,
-	GR_PAXRANDEXEC = 0x00010000,
-	GR_PAXMPROTECT = 0x00020000,
-	GR_PROTSHM = 0x00040000,
-	GR_KILLPROC = 0x00080000,
-	GR_KILLIPPROC = 0x00100000,
-	GR_NOTROJAN = 0x00200000,
-	GR_PROTPROCPID = 0x00400000,
-	GR_PROCACCT = 0x00800000
-};
-
-/* internal use only.  not to be modified */
-
-struct capability_set {
-	char *cap_name;
-	__u32 cap_val;
-};
-
-struct rlimconv {
-	const char *name;
-	unsigned short val;
-};
-
-struct learn_info {
-	unsigned short subj_dev;
-	ino_t subj_ino;
-	char *obj_name;
-	__u32 res_cur, res_max;
-	__u32 mode;
-};
-
-struct ip_learn_info {
-	unsigned short subj_dev;
-	ino_t subj_ino;
-	__u32 addr;
-	__u16 port;
-	__u16 sock;
-	__u16 proto;
-	__u16 mode;
-};
-
-struct chk_perm {
-	unsigned short type;
-	__u32 w_modes;
-	__u32 u_modes;
-	__u32 w_caps;
-	__u32 u_caps;
-};
-
-/************************************************************************\
-|  none of these fields are to be modified directly.			 |
-|  these structures only appear inside process acls.  They are not 	 |
-|  permitted in the grammar of the configuration files to be outside of a| 
-|  process acl.								 |
-\************************************************************************/
-
-struct ip_acl {
-	__u32 addr;
-	__u32 netmask;
-	__u16 low, high;
-	__u8 mode;		// connect or bind
-	__u32 type;		// stream, dgram, raw..etc
-	__u32 proto[8];		// we have to support all 255 protocols
-
-	struct ip_acl *prev;
-	struct ip_acl *next;
-};
-
-struct file_acl {
-	char *filename;
-	ino_t inode;
-	unsigned short dev;
-	__u32 mode;
-
-	struct file_acl *prev;
-	struct file_acl *next;
-};
-
-/************************************************************************\
-|  none of these fields are to be modified directly.  modes, 		 |
-|  capabilities, and filenames are verified before set.  proc_subject	 |
-|  is filled out after all the proc_objects are collected for the current|
-|  process acl								 |
-\************************************************************************/
-
-struct proc_acl {
-	char *filename;
-	ino_t inode;
-	unsigned short dev;
-	__u32 mode;
-	__u32 cap_raise;
-	__u32 cap_drop;
-
-	struct rlimit res[GR_NLIMITS];
-	__u16 resmask;
-
-	__u32 ip_proto[8];
-	__u32 ip_type;
-	struct ip_acl **ips;
-	__u32 ip_num;
-
-	__u32 crashes;
-	unsigned long expires;
-
-	struct file_acl *proc_object;
-	struct ip_acl *ip_object;
-	struct proc_acl *prev;
-	struct proc_acl *next;
-
-	struct file_acl **obj_hash;
-	__u32 obj_hash_size;
-};
-
-/************************************************************************\
-|  32768 permutations of each password. a dictionary attack of		 | 
-|  1,000,000 passwords would require storage space of 32768 * 		 |
-|  1000000 * (32 + 16) = 1.6 Terabytes					 |
-|									 |
-|  mode stores the operation we want to perform with the acl system.	 |
-|  not all modes operate with the kernel.  Mode that initializes the 	 |
-|  acl system and reads acls is enable.		 			 |
-|  disable, and admin also interact with the kernel.		         |
-\************************************************************************/
-
-struct gr_pw_entry {
-	unsigned char passwd[GR_PW_LEN];
-	unsigned char sum[GR_SHA_SUM_SIZE];
-	unsigned char salt[GR_SALT_SIZE];
-	unsigned short segv_dev;
-	ino_t segv_inode;
-	uid_t segv_uid;
-	__u16 mode;
-};
-
-/************************************************************************\
-|  structure used for include file information.  Filename contains the	 |
-|  FULL pathname of the included file.  We use this to check for	 |
-|  duplicated includes.  the left variable is only used when iterating	 |
-|  through the includes linked list to make sure that already loaded acl |
-|  configs are not loaded again.  The only value of importance it holds  |
-|  is zero, which tells the algorithm to stop processing backwards 	 |
-|  through the linked list.						 |
-\************************************************************************/
-
-struct include_line {
-	char *filename;
-	unsigned int left;
-	struct include_line *prev;
-	struct include_line *next;
-};
-
-/* We use this to keep track of deleted files, since each subject needs
-   to agree on an inode/dev
-*/
-
-struct deleted_file {
-	char *filename;
-	ino_t ino;
-	struct deleted_file *next;
-} *deleted_files;
-
-/************************************************************************\
-|  used for keeping track of the current line number of the file we're   |
-|  reading.  initialized to 1 before every new acl file is read		 |
-\************************************************************************/
-
-unsigned long lineno;
-
-struct acl_tmps {
-	__u32 cap_raise_tmp;
-	__u32 cap_drop_tmp;
-	struct rlimit res[GR_NLIMITS];
-	__u32 resmask;
-	__u32 ip_proto[8];
-	__u32 ip_type;
-	struct proc_acl *proc;
-	struct file_acl *filp;
-	struct ip_acl *ipp;
-} *def_acl_tmp;
-
-/************************************************************************\
-|  used for the linked list of included files in acl configs.  no 	 |
-|  structures of the linked list should be modified while in use, since	 |
-|  it is used for duplicate checking.  This explains the somewhat	 |
-|  complex code in gradm_parse.c in parse_acls()			 |
-|  includes->next should never exist.  includes points to the last	 |
-|  added include file.  The rest can be accessed through includes->prev  |
-\************************************************************************/
-
-struct include_line *includes;
-
-/************************************************************************\
-|  used to hold the name of the current acl file being read.  This	 |
-|  pointer should not be modified directly.  Rather, 			 |
-|  change_current_acl_file() should be used to change it, since it 	 |
-|  auto-frees the current pointer.  This mainly has use to make error 	 |
-|  logs more informative						 |
-\************************************************************************/
-
-char *current_acl_file;
-
-/************************************************************************\
-|  basically a dummy pointer.  its use is to set "magic" values to the   |
-|  left member of the include_line structure.  We need this because while| 
-|  we're operating on the current state of the includes linked list, by  |
-|  parsing the included files, more included files may show up.		 |
-|  Therefore we need some way to make sure that we don't re-parse a file |
-|  we've already parsed (this would generated a duplicate error) and we  |
-|  can't modify the important contents of the linked list.		 |
-\************************************************************************/
-
-unsigned int includeno;
-
-struct user_acl_subject_db {
-	struct proc_acl **s_table;
-	__u32 s_entries;	/* Number of entries in table */
-	__u32 i_entries;	/* total number of ip acls */
-	__u32 o_entries;	/* Total number of object acls */
-};
-
-struct gr_arg {
-	struct user_acl_subject_db subj_db;
-	unsigned char pw[GR_PW_LEN];
-	unsigned char salt[GR_SALT_SIZE];
-	unsigned char sum[GR_SHA_SUM_SIZE];
-	unsigned short segv_dev;
-	ino_t segv_inode;
-	uid_t segv_uid;
-	__u16 mode;
-
-};
-
-struct learn_info **learn_db;
-struct ip_learn_info **ip_learn_db;
-unsigned long learn_num;
-unsigned long ip_learn_num;
-
-struct capability_set capability_list[30];
-struct rlimconv rlim_table[12];
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm_func.h linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm_func.h
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm_func.h	2003-04-06 05:13:37.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm_func.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,177 +0,0 @@
-void yyerror(const char *s);
-//Pre: error message as string
-//Post: prints the error message returned by yacc
-
-FILE *open_acl_file(const char *filename);
-//Pre: filename as string
-//Post: existence of file is checked, file is opened for read access
-//      and returned as a file struct
-
-void get_user_passwd(struct gr_pw_entry *entry, int mode);
-//Pre: gr_pw_entry struct (can be empty) and a valid mode (0 or 1)
-//Post: the gr_pw_entry struct is filled with values depending on the
-//      mode chosen.  It can be GR_PWONLY or GR_PWANDSUM.  In the latter
-//      case, the password is entered twice for verification, a random 
-//      salt is chosen, and the SHA1 sum is computed.
-//      This mode is only used for password generation, and is written
-//      to /etc/grsec/pw.  In the other mode, the password is simply
-//      written to the structure, and is then sent on to the kernel
-//      for any kernel operations (except init mode) that are initiated 
-
-void transmit_to_kernel(void *buf, unsigned long len);
-//Pre: pointer to a region of memory, length of memory to send to kernel
-//Post: writes len bytes of data from pointer buf to the kernel.
-//      an error is generated if bytes written != len or if
-//      /proc/sys/kernel/grsecurity/acl
-
-void generate_salt(struct gr_pw_entry *entry);
-//Pre: gr_pw_entry structure (possibly empty)
-//Post: GR_SALT_SIZE bytes are read from /dev/random and stored
-//      in the salt member of gr_pw_entry
-
-void write_user_passwd(struct gr_pw_entry *entry);
-//Pre: gr_pw_entry with SHA1 sum and salt filled out
-//Post: salt and sum are written to /etc/grsec/pw
-
-void parse_acls(void);
-//Pre: none
-//Post: initiates parsing of the main acl config, and handles parsing of
-//      all included acl configs
-
-void analyze_acls(void);
-//Pre: none
-//Post: checks for common mistakes in acl files.  We do this before
-//      sending the data off to the kernel with transmit_to_kernel()
-//      currently checks to see if a default acl is not present
-
-void generate_hash(struct gr_pw_entry *entry);
-//Pre: gr_pw_entry with password and salt filled out
-//Post: salt is prepended to the password, hashed with SHA1 and stored
-//      in the sum member of gr_pw_entry
-
-void init_variables(void);
-//Pre: none
-//Post: initializes line number, cap_raise_tmp, cap_drop_tmp,
-//      and main linked lists
-
-void parse_args(int argc, char *argv[]);
-//Pre: array of argument pointers and number of args
-//Post: handles options passed to gradm.
-
-__u32 cap_conv(const char *cap);
-//Pre: capability name as string
-//Post: returns value of capability as determined by capability.h
-
-__u32 file_mode_conv(const char *mode);
-//Pre: string (possibly null) of mode characters for file acls
-//Post: returns the or'd value of all the modes on success
-//      prints error message and quits on failure
-//      fails when character in mode string is not a valid file acl mode
-
-__u32 proc_subject_mode_conv(const char *mode);
-//Pre: string (possibly null) of mode characters for proc acl subjects
-//Post: returns the or'd value of all the modes on success
-//      prints error message and quits on failure
-//      fails when character in mode string is not valid proc acl subject mode
-
-__u32 proc_object_mode_conv(const char *mode);
-//Pre: string (possibly null) of mode characters for proc acl objects
-//Post: returns the or'd value of all the modes on success
-//      prints error message and quits on failure
-//      fails when character in mode string is not valid proc acl object mode
-
-int add_proc_subject_acl(struct acl_tmps **acl_tmp, char *filename, __u32 mode);
-//Pre: filename as string, mode as string, type as integer, struct acl_tmps
-//Post: adds a new process acl to the current linked list of process acls
-//      this function is called after all the other functions related
-//      to adding data to proc acls, namely the two functions below
-//      after creation of process acl, cap_raise_tmp and cap_drop_tmp
-//      are zeroed, and gr_file_tmp is set to NULL (so a new linked list is
-//      created next time) linked list works in such a way that ->next 
-//      points to the previously entered acl 
-//      type determines whether the current acl has the subject checked
-//      if its on the filesystem.  we change the type for the admin
-//      acl, since it does not belong to a single file.
-
-int add_proc_object_acl(struct file_acl **filp, char *filename,
-			__u32 mode, int type);
-//Pre: filename as string, mode as string, linked list of files
-//Post: adds a process acl object to the temporary linked list
-//      of process acl objects, to be inserted when the process acl 
-//      subject is found. type specifies whether or not the object being
-//      added was created during learning mode
-
-void add_cap_acl(struct acl_tmps **tmp_acl, const char *cap);
-//Pre: capability (including the + or -) as string
-//Post: or's the current value of cap_raise and cap_drop for the current 
-//      process acl with that derived from capability.h through 
-//      converting the capability argument to its integer equivalent.
-
-void add_admin_acl(void);
-//Pre: none
-//Post: adds the acl for admin mode: full inherited capabilities, full 
-//      overriding file access, kill and view access
-
-void add_gradm_acl(void);
-//Pre: none
-//Post: adds the acl for gradm: very restrictive
-
-void change_current_acl_file(const char *filename);
-//Pre: filename as string
-//Post: frees current_acl_file and mallocs a new one with size strlen(filename)
-
-struct gr_arg *conv_user_to_kernel(struct gr_pw_entry *entry);
-//Pre: filled out gr_pw_entry struct, used to copy passwd to gr_arg
-//Post: allocates memory roughly the size of all the process subjects and
-//      objects, and fills in the gr_arg structure
-
-void add_include(const char *filename);
-//Pre: filename to add to include list
-//Post: adds filename to include list, to be parsed later
-
-int parent_dir(const char *filename, char *parent_dirent[]);
-//Pre: filename to check for /'s, parent_dir to store parent directory in
-//      parent_dir must contain a copy of filename before being called
-//Post: returns 1 if a parent directory was stored, 0 if not.  parent_dir 
-//      holds the parent directory
-
-void rem_proc_object_acl(struct proc_acl *proc, struct file_acl *filp);
-//Pre: proc acl to operate on, proc object to remove
-//Post: removes filp from proc acl proc
-
-void expand_acls(void);
-//Pre: process acl to operate on
-//Post: handles override and inheritance for the passed proc acl
-
-int test_perm(const char *obj, const char *subj);
-
-void add_res_acl(struct acl_tmps **acl_tmp, const char *name,
-		 const char *soft, const char *hard);
-void pass_struct_to_human(FILE * stream, struct acl_tmps *def_acl);
-
-void syslog_lookup_log(char **learnlog);
-
-int is_valid_elf_binary(const char *filename);
-
-void handle_learn_logs(const char *logfile, FILE * stream);
-
-void modify_caps(struct proc_acl **proc, int cap);
-
-void modify_res(struct proc_acl **proc, int res, unsigned long cur,
-		unsigned long max);
-
-void add_ip_acl(struct ip_acl **ip_acl, __u8 mode, struct ip_acl *tmp);
-
-void add_ip_ip_acl(struct ip_acl *ip_acl, char *ip,
-		   char *netmask, char *low, char *high);
-void parse_learn_log(const char *filename);
-
-void add_learn_ip_info(unsigned short subj_dev, ino_t subj_ino,
-		       __u32 ip, __u16 port, __u16 sock, __u16 proto,
-		       __u16 mode);
-void add_learn_file_info(unsigned short subj_dev, ino_t subj_ino,
-			 unsigned long res_cur, unsigned long res_max,
-			 char **obj_name, __u32 mode);
-void read_saltandpass(char *salt, char *pass);
-
-void add_kernel_acl(void);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm_human.c linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm_human.c
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm_human.c	2003-04-13 20:45:11.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm_human.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,305 +0,0 @@
-#include "gradm.h"
-
-static struct mode_name_table {
-	__u32 modeint;
-	char modechar;
-} mode_table[] = {
-	{
-	GR_READ, 'r'}, {
-	GR_EXEC, 'x'}, {
-	GR_WRITE, 'w'}, {
-	GR_APPEND, 'a'}, {
-	GR_INHERIT, 'i'}, {
-	GR_PTRACERD, 't'}, {
-	GR_AUDIT_FIND, 'F'}, {
-	GR_AUDIT_READ, 'R'}, {
-	GR_AUDIT_WRITE, 'W'}, {
-	GR_AUDIT_EXEC, 'X'}, {
-	GR_AUDIT_APPEND, 'A'}, {
-	GR_AUDIT_INHERIT, 'I'}, {
-	GR_SUPPRESS, 's'}, {
-	GR_FIND, 'h'}
-};
-
-static struct subj_mode_name_table {
-	__u32 modeint;
-	char modechar;
-} subj_mode_table[] = {
-	{
-	GR_KILL, 'k'}, {
-	GR_PROTECTED, 'p'}, {
-	GR_VIEW, 'v'}, {
-	GR_IGNORE, 'O'}, {
-	GR_FIND, 'h'}, {
-	GR_PROTSHM, 'A'}, {
-	GR_PAXPAGE, 'P'}, {
-	GR_PAXSEGM, 'S'}, {
-	GR_PAXRANDMMAP, 'R'}, {
-	GR_PAXGCC, 'G'}, {
-	GR_PAXMPROTECT, 'M'}, {
-	GR_PAXRANDEXEC, 'X'}, {
-	GR_KILLPROC, 'K'}, {
-	GR_KILLIPPROC, 'C'}, {
-	GR_NOTROJAN, 'T'}, {
-	GR_PROTPROCPID, 'd'}, {
-	GR_PROCACCT, 'b'}
-};
-
-static int
-netmask_to_int(unsigned long netmask)
-{
-	unsigned short i;
-	unsigned long net;
-
-	if (!netmask)
-		return 0;
-
-	if (netmask == 0xffffffff)
-		return 32;
-
-	for (i = 0; i <= 32; i++) {
-		net = 0xffffffff << (32 - i);
-		if (net == netmask)
-			return i;
-	}
-
-	return 0;
-}
-
-static void
-show_ip_acl(struct ip_acl *ipp, FILE * stream)
-{
-	struct in_addr addr;
-	unsigned short netmask;
-	unsigned short i;
-	struct protoent *proto;
-
-	addr.s_addr = ipp->addr;
-	netmask = netmask_to_int(ipp->netmask);
-
-	if ((netmask == 32) && ipp->low == ipp->high)
-		fprintf(stream, "\t\t%s:%u", inet_ntoa(addr), ipp->low);
-	else if (ipp->low == ipp->high)
-		fprintf(stream, "\t\t%s/%u:%u", inet_ntoa(addr),
-			netmask, ipp->low);
-	else if (netmask == 32)
-		fprintf(stream, "\t\t%s:%u-%u", inet_ntoa(addr),
-			ipp->low, ipp->high);
-	else
-		fprintf(stream, "\t\t%s/%u:%u-%u", inet_ntoa(addr),
-			netmask, ipp->low, ipp->high);
-
-	for (i = 1; i < 5; i++) {
-		if (ipp->type & (1 << i)) {
-			switch (i) {
-			case SOCK_RAW:
-				fprintf(stream, " raw_sock");
-				break;
-			case SOCK_DGRAM:
-				fprintf(stream, " dgram");
-				break;
-			case SOCK_STREAM:
-				fprintf(stream, " stream");
-				break;
-			case SOCK_RDM:
-				fprintf(stream, " rdm");
-				break;
-			}
-		}
-	}
-	for (i = 0; i < 256; i++) {
-		if (ipp->proto[i / 32] & (1 << (i % 32))) {
-			if (i == IPPROTO_RAW) {
-				fprintf(stream, " raw_proto");
-			} else {
-				proto = getprotobynumber(i);
-				fprintf(stream, " %s", proto->p_name);
-			}
-		}
-	}
-
-	fprintf(stream, "\n");
-	return;
-}
-
-static void
-conv_mode_to_str(__u32 mode, char *modestr, unsigned short len)
-{
-	unsigned short i;
-	unsigned short x;
-
-	memset(modestr, 0, len);
-
-	for (x = 0, i = 0;
-	     i < len
-	     && x < (sizeof (mode_table) / sizeof (struct mode_name_table));
-	     x++) {
-		if (mode_table[x].modeint == GR_WRITE && (mode & GR_WRITE)) {
-			modestr[i] = 'w';
-			mode &= ~GR_APPEND;
-			i++;
-			continue;
-		}
-		if (mode_table[x].modeint == GR_AUDIT_WRITE
-		    && (mode & GR_AUDIT_WRITE)) {
-			modestr[i] = 'W';
-			mode &= ~GR_AUDIT_APPEND;
-			i++;
-			continue;
-		}
-		if (mode_table[x].modeint == GR_FIND && !(mode & GR_FIND)) {
-			modestr[i] = 'h';
-			i++;
-			continue;
-		} else if (mode_table[x].modeint == GR_FIND)
-			continue;
-
-		if (mode & mode_table[x].modeint) {
-			modestr[i] = mode_table[x].modechar;
-			i++;
-		}
-	}
-
-	return;
-}
-
-static void
-conv_subj_mode_to_str(__u32 mode, char *modestr, unsigned short len)
-{
-	unsigned short i;
-	unsigned short x;
-
-	memset(modestr, 0, len);
-
-	for (x = 0, i = 0;
-	     i < len
-	     && x <
-	     (sizeof (subj_mode_table) / sizeof (struct subj_mode_name_table));
-	     x++) {
-		if (subj_mode_table[x].modeint == GR_FIND && !(mode & GR_FIND)) {
-			modestr[i] = 'h';
-			i++;
-			continue;
-		} else if (subj_mode_table[x].modeint == GR_FIND)
-			continue;
-
-		if (mode & subj_mode_table[x].modeint) {
-			modestr[i] = subj_mode_table[x].modechar;
-			i++;
-		}
-	}
-
-	return;
-}
-
-void
-pass_struct_to_human(FILE * stream, struct acl_tmps *def_acl)
-{
-	unsigned short i;
-	char modes[33];
-	struct proc_acl *proc;
-	struct file_acl *filp;
-	struct ip_acl *ipp;
-	unsigned int drop_num;
-	unsigned long c_cnt;
-	unsigned long b_cnt;
-
-	for_each_subject(proc, def_acl) {
-		if (!(proc->mode & GR_LEARN))
-			continue;
-		proc->mode &= ~GR_LEARN;
-		conv_subj_mode_to_str(proc->mode, modes, sizeof (modes));
-		fprintf(stream, "%s %so {\n", proc->filename, modes);
-		for_each_object(filp, proc->proc_object) {
-			conv_mode_to_str(filp->mode, modes, sizeof (modes));
-			fprintf(stream, "\t%s %s\n", filp->filename, modes);
-		}
-
-		for (i = drop_num = 0;
-		     i <
-		     ((sizeof (capability_list) /
-		       sizeof (struct capability_set)) - 1); i++)
-			if (proc->cap_drop & (1 << capability_list[i].cap_val))
-				drop_num++;
-
-		if (!drop_num)
-			fprintf(stream, "\t+CAP_ALL\n");
-		else if (drop_num ==
-			 ((sizeof (capability_list) /
-			   sizeof (struct capability_set)) - 1))
-			fprintf(stream, "\t-CAP_ALL\n");
-		else if (drop_num <
-			 ((sizeof (capability_list) /
-			   sizeof (struct capability_set)) - 1) / 2) {
-			fprintf(stream, "\t+CAP_ALL\n");
-			for (i = 0;
-			     i <
-			     ((sizeof (capability_list) /
-			       sizeof (struct capability_set)) - 1); i++)
-				if (proc->
-				    cap_drop & (1 << capability_list[i].
-						cap_val))
-					fprintf(stream, "\t-%s\n",
-						capability_list[i].cap_name);
-		} else {
-			fprintf(stream, "\t-CAP_ALL\n");
-			for (i = 0;
-			     i <
-			     ((sizeof (capability_list) /
-			       sizeof (struct capability_set)) - 1); i++)
-				if (!
-				    (proc->
-				     cap_drop & (1 << capability_list[i].
-						 cap_val)))
-					fprintf(stream, "\t+%s\n",
-						capability_list[i].cap_name);
-		}
-
-		for (i = 0;
-		     i < (sizeof (rlim_table) / sizeof (struct rlimconv)); i++)
-			if (proc->resmask & (1 << rlim_table[i].val))
-				fprintf(stream, "\t%s %lu %lu\n",
-					rlim_table[i].name,
-					proc->res[i].rlim_cur,
-					proc->res[i].rlim_max);
-		if (!proc->ip_object)
-			goto finish_acl;
-
-		c_cnt = 0;
-		b_cnt = 0;
-
-		for_each_object(ipp, proc->ip_object) {
-			if (ipp->mode == GR_IP_CONNECT)
-				c_cnt++;
-			else if (ipp->mode == GR_IP_BIND)
-				b_cnt++;
-		}
-
-		fprintf(stream, "\n\tconnect {\n");
-		for_each_object(ipp, proc->ip_object) {
-			if (ipp->mode == GR_IP_CONNECT) {
-				if (c_cnt == 1 && !ipp->type)
-					fprintf(stream, "\t\tdisabled\n");
-				else if (ipp->type)
-					show_ip_acl(ipp, stream);
-			}
-		}
-
-		fprintf(stream, "\t}\n\n");
-		fprintf(stream, "\tbind {\n");
-		for_each_object(ipp, proc->ip_object) {
-			if (ipp->mode == GR_IP_BIND) {
-				if (b_cnt == 1 && !ipp->type)
-					fprintf(stream, "\t\tdisabled\n");
-				else if (ipp->type)
-					show_ip_acl(ipp, stream);
-			}
-		}
-
-		fprintf(stream, "\t}\n\n");
-	      finish_acl:
-		fprintf(stream, "}\n");
-	}
-
-	return;
-}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm_learn.c linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm_learn.c
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm_learn.c	2003-04-16 21:34:21.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm_learn.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,474 +0,0 @@
-#include "gradm.h"
-
-static unsigned long *learn_queue = NULL;
-static unsigned long learn_queue_size = 0;
-
-static int
-strcompare(const void *x, const void *y)
-{
-	struct learn_info *x1 = *(struct learn_info **) x;
-	struct learn_info *y1 = *(struct learn_info **) y;
-	return strcmp(x1->obj_name, y1->obj_name);
-}
-
-static void
-sort_names(struct learn_info **obj_array, unsigned long num)
-{
-	return qsort(obj_array, num, sizeof (struct learn_info *), strcompare);
-}
-
-static int
-has_similar_dir(const char *f1, const char *f2, unsigned int len)
-{
-	if (!strncmp(f2, f1, len) && (f2[len] == '/' || f2[len] == '\0'))
-		return 1;
-
-	return 0;
-}
-
-static void
-set_common_dir(const char *fname, char **common_dir, unsigned int *len)
-{
-	unsigned int i;
-	char *p;
-
-	if (*fname != '/') {
-		*len = 0;
-		return;
-	}
-
-	for (i = strlen(fname) - 1; i >= 0; i--)
-		if (fname[i] == '/')
-			break;
-
-	if (!i)
-		i++;
-
-	strncpy(*common_dir, fname, i);
-
-	*len = i;
-	p = *common_dir;
-	p[i] = '\0';
-
-	return;
-}
-
-static int
-have_common_dir(const char *fname, char *common_dir, unsigned int len)
-{
-	unsigned int i;
-	unsigned int namelen = strlen(fname);
-
-	if (!namelen)
-		return 0;
-
-	for (i = namelen - 1; i >= 0; i--)
-		if (fname[i] == '/')
-			break;
-
-	if (!i)
-		i++;
-
-	if (i != len)
-		return 0;
-
-	if (strncmp(fname, common_dir, len))
-		return 0;
-
-	return 1;
-}
-
-static void
-remove_queue_items(void)
-{
-	unsigned long i;
-
-	for (i = 0; i < learn_queue_size; i++) {
-		free((*(learn_db + (*(learn_queue + i))))->obj_name);
-		(*(learn_db + (*(learn_queue + i)))) = NULL;
-	}
-
-	return;
-}
-
-static void
-add_to_remove_queue(unsigned long offset)
-{
-	if (!learn_queue)
-		learn_queue =
-		    (unsigned long *) calloc(1, sizeof (unsigned long));
-
-	if (!learn_queue)
-		failure("calloc");
-
-	learn_queue =
-	    realloc(learn_queue,
-		    (learn_queue_size + 1) * sizeof (unsigned long));
-
-	if (!learn_queue)
-		failure("realloc");
-
-	(*(learn_queue + learn_queue_size)) = offset;
-
-	learn_queue_size++;
-
-	return;
-}
-
-static void
-clear_remove_queue(void)
-{
-	learn_queue_size = 0;
-	learn_queue = NULL;
-	return;
-}
-
-static int
-learn_is_dupe(unsigned short subj_dev, ino_t subj_ino,
-	      unsigned long res_cur, unsigned long res_max,
-	      char *obj_name, __u32 mode)
-{
-	struct learn_info **tmp_db;
-	unsigned long i;
-
-	tmp_db = learn_db;
-
-	for (i = 0; i < learn_num; i++, tmp_db++) {
-		if (!(*tmp_db))
-			continue;
-
-		if (((*tmp_db)->subj_dev == subj_dev) &&
-		    ((*tmp_db)->subj_ino == subj_ino) &&
-		    !strcmp((*tmp_db)->obj_name, obj_name)) {
-			// capabilities and resources get special handling
-			if (!strlen(obj_name)) {
-				if (!res_cur && !res_max &&
-				    !(*tmp_db)->res_cur &&
-				    !(*tmp_db)->res_max &&
-				    ((*tmp_db)->mode == mode))
-					return 1;
-				else if (res_cur && res_max &&
-					 (*tmp_db)->res_cur &&
-					 (*tmp_db)->res_max &&
-					 (*tmp_db)->mode == mode) {
-					if (res_cur > (*tmp_db)->res_cur)
-						(*tmp_db)->res_cur = res_cur;
-					if (res_max > (*tmp_db)->res_max)
-						(*tmp_db)->res_max = res_max;
-					return 1;
-				}
-				continue;
-			}
-
-			if ((*tmp_db)->mode != mode)
-				(*tmp_db)->mode |= mode;
-
-			return 1;
-		}
-	}
-
-	return 0;
-}
-
-static void
-insert_reduced_acl(unsigned long offset, char *common_dir,
-		   unsigned long res_cur, unsigned long res_max,
-		   unsigned short subj_dev, ino_t subj_ino, __u32 mode)
-{
-	char *reduced_dir;
-	unsigned int len = strlen(common_dir) + 1;
-
-	reduced_dir = (char *) calloc(len, sizeof (char));
-	if (!reduced_dir)
-		failure("calloc");
-
-	strcpy(reduced_dir, common_dir);
-	
-	if (learn_is_dupe
-	    (subj_dev, subj_ino, res_cur, res_max, reduced_dir, mode)) {
-		free(reduced_dir);
-		free((*(learn_db + offset))->obj_name);
-		(*(learn_db + offset)) = NULL;
-		return;
-	}
-
-	(*(learn_db + offset))->subj_dev = subj_dev;
-	(*(learn_db + offset))->subj_ino = subj_ino;
-	(*(learn_db + offset))->res_cur = res_cur;
-	(*(learn_db + offset))->res_max = res_max;
-	(*(learn_db + offset))->mode = mode;
-	(*(learn_db + offset))->obj_name = reduced_dir;
-
-	return;
-}
-
-static void
-reduce_acls(void)
-{
-	struct learn_info **tmp_db;
-	unsigned long i;
-	unsigned long x;
-	char *common_dir;
-	unsigned int common_len;
-	unsigned long occur;
-
-	if (!learn_num)
-		return;
-
-	common_dir = (char *) calloc(PATH_MAX, sizeof (char));
-
-	if (!common_dir)
-		failure("calloc");
-
-	tmp_db = learn_db;
-
-	for (i = 0; i < (learn_num - 1); i++) {
-		x = 1;
-		occur = 0;
-		if (!(*(tmp_db + i)))
-			continue;
-
-		set_common_dir((*(tmp_db + i))->obj_name, &common_dir,
-			       &common_len);
-		if (!common_len)
-			continue;
-
-		while ((x < (learn_num - i)) &&
-		       (((*(tmp_db + i + x)) && has_similar_dir(common_dir,
-								(*
-								 (tmp_db + i +
-								  x))->obj_name,
-								common_len))
-			|| !(*(tmp_db + i + x)))) {
-			if (!(*(tmp_db + i + x))) {
-				x++;
-				continue;
-			}
-
-			if (have_common_dir((*(tmp_db + x + i))->obj_name,
-					    common_dir, common_len) &&
-			    ((*(tmp_db + i))->subj_dev ==
-			     (*(tmp_db + x + i))->subj_dev) &&
-			    ((*(tmp_db + i))->subj_ino ==
-			     (*(tmp_db + x + i))->subj_ino) &&
-			    ((*(tmp_db + i))->mode ==
-			     (*(tmp_db + x + i))->mode)) {
-				occur++;
-				add_to_remove_queue(i + x);
-			}
-			x++;
-		}
-
-		if (occur >= GR_LEARN_THRESH) {
-			remove_queue_items();
-			insert_reduced_acl(i, common_dir,
-					   (*(tmp_db + i))->res_cur,
-					   (*(tmp_db + i))->res_max,
-					   (*(tmp_db + i))->subj_dev,
-					   (*(tmp_db + i))->subj_ino,
-					   (*(tmp_db + i))->mode);
-		}
-		clear_remove_queue();
-	}
-
-	free(common_dir);
-	return;
-}
-
-int
-learn_ip_is_dupe(unsigned short subj_dev, ino_t subj_ino,
-		 unsigned long ip, __u16 port, __u16 sock, __u16 proto,
-		 __u16 mode)
-{
-	struct ip_learn_info **tmp_db;
-	unsigned long i;
-
-	tmp_db = ip_learn_db;
-
-	for (i = 0; i < ip_learn_num; i++, tmp_db++) {
-		if (((*tmp_db)->subj_dev == subj_dev) &&
-		    ((*tmp_db)->subj_ino == subj_ino) &&
-		    ((*tmp_db)->addr == ip) &&
-		    ((*tmp_db)->port == port) &&
-		    ((*tmp_db)->sock == sock) &&
-		    ((*tmp_db)->proto == proto) && ((*tmp_db)->mode == mode))
-			return 1;
-	}
-
-	return 0;
-}
-
-void
-add_learn_ip_info(unsigned short subj_dev, ino_t subj_ino,
-		  __u32 ip, __u16 port, __u16 sock, __u16 proto, __u16 mode)
-{
-	struct ip_learn_info **tmp_db;
-
-	if (learn_ip_is_dupe(subj_dev, subj_ino, ip, port, sock, proto, mode))
-		return;
-
-	if ((ip_learn_db =
-	     (struct ip_learn_info **) realloc(ip_learn_db,
-					       (ip_learn_num +
-						1) *
-					       sizeof (struct ip_learn_info *)))
-	    == NULL)
-		failure("calloc");
-
-	tmp_db = ip_learn_db + ip_learn_num;
-
-	*tmp_db =
-	    (struct ip_learn_info *) calloc(1, sizeof (struct ip_learn_info));
-
-	if (!(*tmp_db))
-		failure("calloc");
-
-	(*tmp_db)->subj_dev = subj_dev;
-	(*tmp_db)->subj_ino = subj_ino;
-	(*tmp_db)->addr = ip;
-	(*tmp_db)->port = port;
-	(*tmp_db)->sock = sock;
-	(*tmp_db)->proto = proto;
-	(*tmp_db)->mode = mode;
-
-	ip_learn_num++;
-
-	return;
-}
-
-void
-add_learn_file_info(unsigned short subj_dev, ino_t subj_ino,
-		    unsigned long res_cur, unsigned long res_max,
-		    char **obj_name, __u32 mode)
-{
-	struct learn_info **tmp_db;
-	char *p;
-
-	if (!obj_name) {
-		fprintf(stderr, "Out of memory.\n");
-		exit(EXIT_FAILURE);
-	}
-
-	if ((p = strstr(*obj_name, " (deleted)")))
-		*p = '\0';
-
-	if (learn_is_dupe
-	    (subj_dev, subj_ino, res_cur, res_max, *obj_name, mode)) {
-		free(*obj_name);
-		return;
-	}
-
-	if ((learn_db =
-	     (struct learn_info **) realloc(learn_db,
-					    (learn_num +
-					     1) *
-					    sizeof (struct learn_info *))) ==
-	    NULL)
-		failure("calloc");
-
-	tmp_db = learn_db + learn_num;
-
-	*tmp_db = (struct learn_info *) calloc(1, sizeof (struct learn_info));
-
-	if (!(*tmp_db))
-		failure("calloc");
-
-	(*tmp_db)->subj_dev = subj_dev;
-	(*tmp_db)->subj_ino = subj_ino;
-	(*tmp_db)->res_cur = res_cur;
-	(*tmp_db)->res_max = res_max;
-	(*tmp_db)->obj_name = *obj_name;
-	(*tmp_db)->mode = mode;
-	/* to be able to perform an operation on the file, we have to be
-	   able to view it */
-	if (strlen(*obj_name))	// check if it's a file
-		(*tmp_db)->mode |= GR_FIND;
-
-	learn_num++;
-
-	return;
-}
-
-void
-merge_acl_rules(struct acl_tmps **def_acl)
-{
-	unsigned long i;
-	struct proc_acl *proc = (*def_acl)->proc;
-
-	for_each_subject(proc, (*def_acl)) {
-		if (!(proc->mode & GR_LEARN))
-			continue;
-
-		for (i = 0; i < learn_num; i++) {
-			if (!(*(learn_db + i)))
-				continue;
-
-			if (((*(learn_db + i))->subj_dev == proc->dev) &&
-			    ((*(learn_db + i))->subj_ino == proc->inode)) {
-				/* ok, we found matching processes,
-				   let's add the rule. */
-				if (!strlen((*(learn_db + i))->obj_name)
-				    && !((*(learn_db + i))->res_cur)
-				    && !((*(learn_db + i))->res_max))
-					modify_caps(&proc,
-						    (*(learn_db + i))->mode);
-				else if (!strlen((*(learn_db + i))->obj_name))
-					modify_res(&proc,
-						   (*(learn_db + i))->mode,
-						   (*(learn_db + i))->res_cur,
-						   (*(learn_db + i))->res_max);
-				else
-					add_proc_object_acl(&
-							    (proc->proc_object),
-							    (*(learn_db + i))->
-							    obj_name,
-							    (*(learn_db + i))->
-							    mode, GR_FLEARN);
-			}
-		}
-
-		for (i = 0; i < ip_learn_num; i++) {
-			if (((*(ip_learn_db + i))->subj_dev == proc->dev) &&
-			    ((*(ip_learn_db + i))->subj_ino == proc->inode)) {
-				struct ip_acl tmp_ip;
-				memset(&tmp_ip, 0, sizeof (tmp_ip));
-
-				tmp_ip.addr = (*(ip_learn_db + i))->addr;
-				tmp_ip.low = (*(ip_learn_db + i))->port;
-				tmp_ip.high = (*(ip_learn_db + i))->port;
-
-				tmp_ip.netmask = 0xffffffff;
-				tmp_ip.type |=
-				    (1 << (*(ip_learn_db + i))->sock);
-				tmp_ip.proto[(*(ip_learn_db + i))->proto /
-					     32] |=
-				    (1 << ((*(ip_learn_db + i))->proto % 32));
-				tmp_ip.mode = (*(ip_learn_db + i))->mode;
-
-				if ((*(ip_learn_db + i))->mode == GR_IP_BIND)
-					add_ip_acl(&(proc->ip_object),
-						   GR_IP_BIND, &tmp_ip);
-				else if ((*(ip_learn_db + i))->mode ==
-					 GR_IP_CONNECT)
-					add_ip_acl(&(proc->ip_object),
-						   GR_IP_CONNECT, &tmp_ip);
-			}
-		}
-	}
-
-	return;
-}
-
-void
-handle_learn_logs(const char *file, FILE * stream)
-{
-	parse_learn_log(file);
-	sort_names(learn_db, learn_num);
-	reduce_acls();
-	parse_acls();
-	expand_acls();
-	merge_acl_rules(&def_acl_tmp);
-	pass_struct_to_human(stream, def_acl_tmp);
-
-	return;
-}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm_learner.l linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm_learner.l
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm_learner.l	2003-04-13 21:15:00.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm_learner.l	1970-01-01 01:00:00.000000000 +0100
@@ -1,75 +0,0 @@
-%{
-#include "gradm.h"
-#include "learn.tab.h"
-
-extern int learnparse(void);
-void learnerror(const char *s);
-int learnwrap(void);
-%}
-
-DATE [A-Z][a-z][a-z][ ]{1,2}[0-9]{1,2}" "[0-9][0-9]:[0-9][0-9]:[0-9][0-9]
-HOSTKERNGRSEC [A-Za-z0-9\-]+" kernel: grsec: LEARN:"
-METALOGKERNGRSEC [A-Za-z0-9\-]+" [kernel] grsec: LEARN:"
-SYSLOGNGKERNGRSEC [A-Za-z0-9@\-]+" grsec: LEARN:"
-NUM [0-9]+
-FILENAME [/][A-Za-z0-9@\-_#., /]*
-IPADDR [0-9]{1,3}"."[0-9]{1,3}"."[0-9]{1,3}"."[0-9]{1,3}
-
-%option nounput
-
-%x ERROR
-
-%%
-
-^{DATE}" "{HOSTKERNGRSEC} 		{ return DATE; }
-^{DATE}" "{METALOGKERNGRSEC} 		{ return DATE; }
-^{DATE}" "{SYSLOGNGKERNGRSEC} 		{ return DATE; }
-{NUM}					{
-					  learnlval.string = strdup(yytext);
-					  return NUM;
-					}
-{FILENAME}				{
-					  learnlval.string = strdup(yytext);
-					  return FILENAME;
-					}
-{IPADDR}				{
-					  learnlval.string = strdup(yytext);
-					  return IPADDR;
-					}
-:					{ return ':'; }
-.					;
-%%
-
-void learnerror(const char *s) { return; }
-int learnwrap(void) { return 1; }
-
-void parse_learn_log(const char * filename)
-{
-	FILE * file;
-	
-	file = fopen(filename, "r");
-
-	if(!file) {
-		fprintf(stderr, "Unable to open %s.\n"
-				"Error: %s\n", filename, strerror(errno));
-		exit(EXIT_FAILURE);
-	}
-	
-	learn_db = (struct learn_info **) calloc(1, sizeof(struct learn_info *));
-	learn_num = 0;
-
-	if(!learn_db)
-		failure("calloc");
-
-	ip_learn_db = (struct ip_learn_info **) calloc(1, sizeof(struct ip_learn_info *));
-	ip_learn_num = 0;
-
-	if(!ip_learn_db)
-		failure("calloc");
-
-	learnin = file;
-	learnparse();
-
-	fclose(file);
-	return;
-}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm_learner.y linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm_learner.y
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm_learner.y	2003-01-16 17:40:40.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm_learner.y	1970-01-01 01:00:00.000000000 +0100
@@ -1,63 +0,0 @@
-%{
-#include "gradm.h"
-extern int learnlex(void);
-%}
-
-%union {
-	char * string;
-}
-
-%token <string> NUM FILENAME IPADDR DATE JUNK
-%type <string> filename
-
-%%
-
-learn_logs:	learn_log
-	|	learn_logs learn_log
-	;
-
-filename:	/*empty*/	{ $$ = strdup(""); }
-	|	FILENAME	{
-				 if (!strcmp($1, "//"))
-					$1[1] = '\0';
-				 $$ = $1;
-				}
-	;
-
-learn_log:
-		error
-	|	DATE NUM ':' NUM ':' NUM ':' NUM ':' filename ':' NUM
-		{
-			__u16 s;
-			__u32 l, l2, l3, l4;
-
-			s = atoi($2);
-			l = atol($4);
-			l2 = atol($6);
-			l3 = atol($8);
-			l4 = atol($12);
-			add_learn_file_info(s, l, l2, l3, &($10), l4);
-		}		
-	|	DATE NUM ':' NUM ':' IPADDR ':' NUM ':' NUM ':' NUM ':' NUM
-		{
-			__u16 s, s2, s3, s4, s5;
-			__u32 l, addr;
-			struct in_addr ip;
-
-			s = atoi($2);
-			l = atol($4);
-
-			if (inet_aton($6, &ip))
-				addr = ip.s_addr;
-			else
-				addr = 0;
-
-			s2 = atoi($8);
-			s3 = atoi($10);
-			s4 = atoi($12);
-			s5 = atoi($14);
-
-			add_learn_ip_info(s, l, addr, s2, s3, s4, s5);
-		}
-	;
-%%
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm_misc.c linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm_misc.c
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm_misc.c	2003-04-16 21:34:21.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm_misc.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,170 +0,0 @@
-#include "gradm.h"
-
-FILE *
-open_acl_file(const char *filename)
-{
-	FILE *aclfile;
-
-	if ((aclfile = fopen(filename, "r")) == NULL) {
-		fprintf(stderr, "Unable to open %s for reading.\n", filename);
-		failure("fopen");
-	}
-
-	return aclfile;
-}
-
-void
-transmit_to_kernel(void *buf, unsigned long len)
-{
-	int fd;
-
-	if ((fd = open(GR_SYSCTL_PATH, O_WRONLY)) < 0) {
-		fprintf(stderr, "Could not open %s\n", GR_SYSCTL_PATH);
-		failure("open");
-	}
-
-	if (write(fd, buf, len) != len) {
-		switch (errno) {
-		case EFAULT:
-			fprintf(stderr, "Error copying structures to the "
-				"kernel.\n");
-			break;
-		case ENOMEM:
-			fprintf(stderr, "Out of memory.\n");
-			break;
-		case EBUSY:
-			fprintf(stderr, "You have attempted to authenticate "
-				"while authentication was locked, try "
-				"again later.\n");
-			break;
-		case EAGAIN:
-			fprintf(stderr, "Your request was ignored, "
-				"please check the kernel logs for more "
-				"info.\n");
-		case EPERM:
-			fprintf(stderr, "Invalid password.\n");
-			break;
-		case EINVAL:
-		default:
-			fprintf(stderr, "You are using incompatible "
-				"versions of gradm and grsecurity.\n"
-				"Please update both versions to the "
-				"ones available on the website.\n");
-		}
-	}
-
-	close(fd);
-
-	return;
-}
-
-void
-init_variables(void)
-{
-	extern struct ip_acl ip;
-	lineno = 1;
-
-	current_acl_file = NULL;
-	includes = NULL;
-
-	memset(&ip, 0, sizeof (ip));
-
-	if ((def_acl_tmp =
-	     (struct acl_tmps *) calloc(1, sizeof (struct acl_tmps))) == NULL)
-		failure("calloc");
-
-	return;
-}
-
-void
-change_current_acl_file(const char *filename)
-{
-	char *p;
-
-	free(current_acl_file);
-
-	if ((p = (char *) calloc(strlen(filename) + 1, sizeof (char))) == NULL)
-		failure("calloc");
-
-	strcpy(p, filename);
-
-	current_acl_file = p;
-
-	return;
-}
-
-int
-parent_dir(const char *filename, char *parent_dirent[])
-{
-	int i;
-
-	if ((strlen(*parent_dirent) <= 1) || (strlen(filename) <= 1))
-		return 0;
-
-	for (i = strlen(*parent_dirent) - 1; i >= 0; i--) {
-		if (i)
-			(*parent_dirent)[i] = '\0';
-		if (filename[i] == '/')
-			return 1;
-	}
-
-	return 0;
-}
-
-void
-syslog_lookup_log(char **learn_log)
-{
-	FILE *syslog_conf;
-	char *buf;
-	char *p = NULL;
-	char *p2;
-
-	buf = calloc(MAX_LINE_LEN + 1, sizeof (char));
-
-	if (!buf)
-		failure("calloc");
-
-	syslog_conf = fopen(SYSLOG_CONF, "r");
-
-	if (!syslog_conf) {
-		fprintf(stderr, "Unable to open %s for reading.\n"
-			"Error: %s\n", SYSLOG_CONF, strerror(errno));
-		exit(EXIT_FAILURE);
-	}
-
-	while (fgets(buf, MAX_LINE_LEN, syslog_conf)) {
-		p = strchr(buf, '#');
-		if (p)
-			*p = '\0';
-		if (strstr(buf, "kern.*") || strstr(buf, "kern.=info")
-		    || strstr(buf, "kern.debug") || strstr(buf, "*.debug")
-		    || strstr(buf, "*.=info") || strstr(buf, "*.info")
-		    || strstr(buf, "kern.info") || strstr(buf, "*.*")) {
-			p = strchr(buf, '/');
-			if (p) {
-				if (!strncmp(p, "/dev", 4))
-					continue;
-				p2 = strchr(p, '\n');
-				if (p2)
-					*p2 = '\0';
-				break;
-			}
-		}
-	}
-
-	if (!p) {
-		fprintf(stderr, "Unable to find log to scan from %s.\n"
-			"Please report this to dev@grsecurity.net "
-			"and attach your %s file.\n", SYSLOG_CONF, SYSLOG_CONF);
-		exit(EXIT_FAILURE);
-	}
-
-	*learn_log = strdup(p);
-
-	if (!*learn_log)
-		failure("strdup");
-
-	free(buf);
-	fclose(syslog_conf);
-	return;
-}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm_net.c linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm_net.c
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm_net.c	2003-04-06 05:13:37.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm_net.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,57 +0,0 @@
-#include "gradm.h"
-
-void
-add_ip_acl(struct ip_acl **ipp, __u8 mode, struct ip_acl *acl_tmp)
-{
-	struct ip_acl *p;
-
-	p = (struct ip_acl *) calloc(1, sizeof (struct ip_acl));
-	if (!p)
-		failure("calloc");
-
-	if (*ipp)
-		(*ipp)->next = p;
-
-	p->prev = *ipp;
-
-	if (mode == GR_IP_CONNECT)
-		p->mode |= GR_IP_CONNECT;
-	else if (mode == GR_IP_BIND)
-		p->mode |= GR_IP_BIND;
-
-	p->addr = acl_tmp->addr;
-	p->netmask = acl_tmp->netmask;
-	p->low = acl_tmp->low;
-	p->high = acl_tmp->high;
-	memcpy(p->proto, acl_tmp->proto, sizeof (acl_tmp->proto));
-	p->type = acl_tmp->type;
-
-	*ipp = p;
-
-	return;
-}
-
-void
-add_ip_ip_acl(struct ip_acl *ip_acl, char *ip, char *netmask,
-	      char *low, char *high)
-{
-	unsigned int bits = atoi(netmask);
-	struct in_addr address;
-
-	if (!bits)
-		ip_acl->netmask = 0UL;
-	else
-		ip_acl->netmask = 0xffffffff << (32 - bits);
-
-	if (!inet_aton(ip, &address)) {
-		fprintf(stderr, "Invalid IP on line %lu of %s.\n", lineno,
-			current_acl_file);
-		exit(EXIT_FAILURE);
-	}
-
-	ip_acl->addr = address.s_addr;
-	ip_acl->low = atoi(low);
-	ip_acl->high = atoi(high);
-
-	return;
-}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm_opt.c linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm_opt.c
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm_opt.c	2003-06-06 16:28:27.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm_opt.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,77 +0,0 @@
-#include "gradm.h"
-
-static void
-compute_cap_creds(struct proc_acl *set, struct proc_acl *cmp)
-{
-	__u32 cap_same;
-
-	set->cap_raise |= cmp->cap_raise;
-	set->cap_drop |= cmp->cap_drop;
-
-	cap_same = set->cap_raise & cmp->cap_drop;
-	set->cap_raise &= ~cap_same;
-	set->cap_drop &= ~cap_same;
-	cap_same = set->cap_drop & cmp->cap_raise;
-	set->cap_drop &= ~cap_same;
-	set->cap_raise &= ~cap_same;
-
-	return;
-}
-
-static void
-expand_acl(struct proc_acl *proc)
-{
-	char *tmpproc;
-	struct proc_acl *tmpp;
-	struct file_acl *tmpf1;
-	struct file_acl *tmpf2;
-
-	if ((tmpproc =
-	     calloc(strlen(proc->filename) + 1, sizeof (char))) == NULL)
-		failure("calloc");
-
-	strcpy(tmpproc, proc->filename);
-
-	while (parent_dir(proc->filename, &tmpproc)) {
-		for_each_subject(tmpp, def_acl_tmp) {
-			if (!strcmp(tmpproc, tmpp->filename)) {
-				compute_cap_creds(proc, tmpp);	// perform capability inheritance
-				for_each_object(tmpf1, tmpp->proc_object) {
-					for_each_object(tmpf2,
-							proc->proc_object)
-					    if (!strcmp
-						(tmpf1->filename,
-						 tmpf2->filename))
-						break;
-					if (!tmpf2)	// not found in current subject
-						add_proc_object_acl(&proc->
-								    proc_object,
-								    tmpf1->
-								    filename,
-								    tmpf1->mode,
-								    GR_FEXIST | GR_GLOB | GR_SYMLINK);
-				}
-			}
-		}
-	}
-
-	free(tmpproc);
-	return;
-}
-
-void
-expand_acls(void)
-{
-	struct proc_acl *proc;
-
-	for_each_subject(proc, def_acl_tmp) {
-		if (!(proc->mode & GR_OVERRIDE) && strcmp(proc->filename, "/"))
-			expand_acl(proc);
-		else {
-			proc->mode &= ~GR_OVERRIDE;
-			compute_cap_creds(proc, proc);
-		}
-	}
-
-	return;
-}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm_parse.c linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm_parse.c
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm_parse.c	2003-05-05 04:12:28.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm_parse.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,872 +0,0 @@
-#include "gradm.h"
-
-extern FILE *gradmin;
-extern int gradmparse(void);
-
-static struct deleted_file *
-is_deleted_file_dupe(const char *filename)
-{
-	struct deleted_file *tmp;
-
-	tmp = deleted_files;
-
-	do {
-		if (!strcmp(filename, tmp->filename))
-			return tmp;
-	} while ((tmp = tmp->next));
-
-	return NULL;
-}
-
-static struct deleted_file *
-add_deleted_file(char *filename)
-{
-	struct deleted_file *dfile;
-	struct deleted_file *retfile;
-	static ino_t ino = 0;
-
-	ino++;
-
-	if (!deleted_files) {
-		deleted_files = malloc(sizeof (struct deleted_file));
-		if (!deleted_files)
-			failure("malloc");
-		deleted_files->filename = filename;
-		deleted_files->ino = ino;
-		deleted_files->next = NULL;
-	} else {
-		retfile = is_deleted_file_dupe(filename);
-		if (retfile)
-			return retfile;
-		dfile = malloc(sizeof (struct deleted_file));
-		if (!dfile)
-			failure("malloc");
-		dfile->filename = filename;
-		dfile->ino = ino;
-		dfile->next = deleted_files;
-		deleted_files = dfile;
-	}
-
-	return deleted_files;
-}
-
-static struct file_acl *
-is_proc_object_dupe(struct file_acl *filp, struct file_acl *filp2)
-{
-	struct file_acl *tmp = filp;
-
-	for_each_object(tmp, filp)
-	    if (((tmp->inode == filp2->inode) && (tmp->dev == filp2->dev)) ||
-		!strcmp(tmp->filename, filp2->filename))
-		return tmp;
-
-	return NULL;
-}
-
-static struct proc_acl *
-is_proc_subject_dupe(struct acl_tmps *acl_tmp, struct proc_acl *proc)
-{
-	struct proc_acl *tmp = acl_tmp->proc;
-
-	for_each_subject(tmp, acl_tmp)
-	    if (((tmp->inode == proc->inode) && (tmp->dev == proc->dev)) ||
-		!strcmp(tmp->filename, proc->filename))
-		return tmp;
-
-	return NULL;
-}
-
-static int
-is_include_dupe(const char *filename)
-{
-	struct include_line *tmp = includes;
-
-	for_each_include(tmp)
-	    if (!strcmp(tmp->filename, filename))
-		return 1;
-
-	return 0;
-}
-
-static int
-add_globbing_file(struct file_acl **filp, char *filename, __u32 mode, int type)
-{
-	char tmp[PATH_MAX] = { 0 };
-	unsigned int len = strlen(filename);
-	unsigned long i;
-	char *last;
-	glob_t pglob;
-	int err;
-	struct file_acl ftmp, ftmp2;
-	struct stat fstat;
-
-	while (len--) {
-		switch (*(filename + len)) {
-		case '*':
-		case '?':
-		case '/':
-			goto out;
-		}
-	}
-      out:
-	/* this means the globbing was done before the last path component
-	   therefore we want to add objects even if they don't exist
-	   eg: /home/ * /test would match /home/user1/test, /home/user2/test,
-	   /home/user3/test....etc even if the "test" file did not exist
-	   in their homedirs
-	 */
-	if (*(filename + len) == '/') {
-		len = strlen(filename);
-		while (len--) {
-			switch (*(filename + len)) {
-			case '*':
-			case '?':
-				goto out2;
-			}
-		}
-	      out2:
-		last = strchr(filename + len, '/');
-		*last = '\0';
-		last++;
-
-		err = glob(filename, GLOB_PERIOD | GLOB_ONLYDIR, NULL, &pglob);
-
-		if (err) {
-			fprintf(stderr, "glob() error \"%s\" encountered"
-				" on line %lu of %s.\n"
-				"The ACL system will not load until this"
-				" error is fixed.\n", strerror(errno), lineno,
-				current_acl_file);
-			exit(EXIT_FAILURE);
-		}
-
-		for (i = 0; i < pglob.gl_pathc; i++) {
-			len = strlen(*(pglob.gl_pathv + i));
-
-			if (len > 3) {
-				char *p;
-				p = (*(pglob.gl_pathv + i) + len - 3);
-				if (!strcmp(p, "/.."))
-					continue;
-				p++;
-				if (!strcmp(p, "/."))
-					continue;
-			}
-
-			snprintf(tmp, sizeof (tmp), "%s/%s",
-				 *(pglob.gl_pathv + i), last);
-
-			ftmp.filename = tmp;
-
-			if (!lstat(ftmp.filename, &fstat)) {
-				ftmp.inode = fstat.st_ino;
-				ftmp.dev =
-				    MKDEV(MAJOR(fstat.st_dev),
-					  MINOR(fstat.st_dev));
-
-				if (S_ISLNK(fstat.st_mode)) {
-					char buf[PATH_MAX];
-					memset(&buf, 0, sizeof (buf));
-					realpath(ftmp.filename, buf);
-					ftmp2.filename = buf;
-
-					if (!stat(ftmp2.filename, &fstat)) {
-						ftmp2.inode = fstat.st_ino;
-						ftmp2.dev =
-						    MKDEV(MAJOR(fstat.st_dev),
-							  MINOR(fstat.st_dev));
-
-						if (is_proc_object_dupe
-						    (*filp, &ftmp2))
-							goto add_link1;
-						if (!add_proc_object_acl
-						    (filp, strdup(buf), mode,
-						     type | GR_GLOB))
-							return 0;
-					}
-				}
-add_link1:
-				if (is_proc_object_dupe(*filp, &ftmp))
-					continue;
-				if (!add_proc_object_acl
-				    (filp, strdup(tmp), mode, type))
-					return 0;
-			}
-		}
-		globfree(&pglob);
-	} else {
-		err = glob(filename, GLOB_PERIOD, NULL, &pglob);
-		if (err) {
-			fprintf(stderr, "glob() error \"%s\" encountered"
-				" on line %lu of %s.\n"
-				"The ACL system will not load until this"
-				" error is fixed.\n", strerror(errno), lineno,
-				current_acl_file);
-			exit(EXIT_FAILURE);
-		}
-
-		for (i = 0; i < pglob.gl_pathc; i++) {
-			len = strlen(*(pglob.gl_pathv + i));
-
-			if (len > 3) {
-				char *p;
-				p = (*(pglob.gl_pathv + i) + len - 3);
-				if (!strcmp(p, "/.."))
-					continue;
-				p++;
-				if (!strcmp(p, "/."))
-					continue;
-			}
-
-			ftmp.filename = *(pglob.gl_pathv + i);
-
-			if (!lstat(ftmp.filename, &fstat)) {
-				ftmp.inode = fstat.st_ino;
-				ftmp.dev =
-				    MKDEV(MAJOR(fstat.st_dev),
-					  MINOR(fstat.st_dev));
-
-				if (S_ISLNK(fstat.st_mode)) {
-					char buf[PATH_MAX];
-					memset(&buf, 0, sizeof (buf));
-					realpath(ftmp.filename, buf);
-					ftmp2.filename = buf;
-
-					if (!stat(ftmp2.filename, &fstat)) {
-						ftmp2.inode = fstat.st_ino;
-						ftmp2.dev =
-						    MKDEV(MAJOR(fstat.st_dev),
-							  MINOR(fstat.st_dev));
-
-						if (is_proc_object_dupe
-						    (*filp, &ftmp2))
-							goto add_link2;
-						if (!add_proc_object_acl
-						    (filp, strdup(buf), mode,
-						     type | GR_GLOB))
-							return 0;
-					}
-				}
-add_link2:
-				if (is_proc_object_dupe(*filp, &ftmp))
-					continue;
-				if (!add_proc_object_acl
-				    (filp, *(pglob.gl_pathv + i), mode,
-				     type))
-					return 0;
-
-			}
-		}
-	}
-
-	return 1;
-}
-
-static void
-display_all_dupes(struct file_acl *filp, struct file_acl *filp2)
-{
-	struct file_acl *tmp = filp;
-	struct stat fstat;
-	struct file_acl ftmp;
-
-	for_each_object(tmp, filp)
-	    if (!stat(tmp->filename, &fstat)) {
-		ftmp.inode = fstat.st_ino;
-		ftmp.dev = MKDEV(MAJOR(fstat.st_dev), MINOR(fstat.st_dev));
-		if (ftmp.inode == filp2->inode && ftmp.dev == filp2->dev)
-			fprintf(stderr, "%s\n", tmp->filename);
-	}
-
-	return;
-}
-
-int
-add_proc_object_acl(struct file_acl **filp, char *filename,
-		    __u32 mode, int type)
-{
-	struct file_acl *p;
-	struct file_acl *p2;
-	struct stat fstat;
-	struct deleted_file *dfile;
-	unsigned int file_len = strlen(filename) + 1;
-
-	if (!filename) {
-		fprintf(stderr, "Out of memory.\n");
-		exit(EXIT_FAILURE);
-	}
-
-	if (strchr(filename, '?') || strchr(filename, '*'))
-		return add_globbing_file(filp, filename, mode, type);
-
-	if (lstat(filename, &fstat)) {
-		dfile = add_deleted_file(filename);
-		fstat.st_ino = dfile->ino;
-		fstat.st_dev = 0;
-		mode |= GR_DELETED;
-	} else if (S_ISLNK(fstat.st_mode) && !(type & GR_GLOB)) {
-		char buf[PATH_MAX];
-
-		memset(&buf, 0, sizeof (buf));
-		realpath(filename, buf);
-		add_proc_object_acl(filp, strdup(buf), mode, type | GR_SYMLINK);
-	}
-
-	if ((p =
-	     (struct file_acl *) calloc(1, sizeof (struct file_acl))) == NULL)
-		failure("calloc");
-
-	if (*filp)
-		(*filp)->next = p;
-
-	p->prev = *filp;
-
-	if ((filename[file_len - 2] == '/') && file_len != 2)
-		filename[file_len - 2] = '\0';
-
-	if (file_len > PATH_MAX) {
-		fprintf(stderr, "Filename too long on line %lu of file %s.\n",
-			lineno, current_acl_file);
-		exit(EXIT_FAILURE);
-	}
-
-	p->filename = filename;
-	p->mode = mode;
-	p->inode = fstat.st_ino;
-	p->dev = MKDEV(MAJOR(fstat.st_dev), MINOR(fstat.st_dev));
-
-	if (type & GR_FLEARN) {
-		struct file_acl *tmp = *filp;
-
-		for_each_object(tmp, *filp) {
-			if (!strcmp(tmp->filename, p->filename) ||
-			    ((tmp->inode == p->inode)
-			     && (tmp->dev == p->dev))) {
-				tmp->mode |= mode;
-				return 1;
-			}
-		}
-	} else if ((p2 = is_proc_object_dupe(*filp, p))) {
-		if (type & GR_SYMLINK)
-			return 1;
-		fprintf(stderr, "Duplicate ACL entry found for \"%s\""
-			" on line %lu of %s.\n"
-			"\"%s\" references the same object as the following object(s):\n",
-			p->filename, lineno, current_acl_file, p->filename);
-		display_all_dupes(*filp, p);
-		fprintf(stderr, "specified on an earlier line."
-			"The ACL system will not load until this"
-			" error is fixed.\n");
-		return 0;
-	}
-
-	*filp = p;
-
-	return 1;
-}
-
-/*
-void rem_proc_object_acl(struct proc_acl *proc, struct file_acl *filp)
-{
-	if(filp->next)
-		filp->next->prev = filp->prev;
-	else if(filp->prev) // we're in the first run of the for loop
-		filp->prev->next = NULL;
-	// else - we're the only acl in this subject
-	free(filp); 
-
-	return;
-}
-*/
-
-int
-add_proc_subject_acl(struct acl_tmps **acl_tmp, char *filename, __u32 mode)
-{
-	struct proc_acl *p;
-	struct proc_acl *p2;
-	struct deleted_file *dfile;
-	struct ip_acl *tmpi;
-	struct stat fstat;
-	unsigned short i;
-	unsigned int file_len;
-
-	if (!filename) {
-		fprintf(stderr, "Out of memory.\n");
-		exit(EXIT_FAILURE);
-	}
-
-	file_len = strlen(filename) + 1;
-
-	if ((p =
-	     (struct proc_acl *) calloc(1, sizeof (struct proc_acl))) == NULL)
-		failure("calloc");
-
-	if ((*acl_tmp)->proc)
-		(*acl_tmp)->proc->next = p;
-
-	p->prev = (*acl_tmp)->proc;
-
-	if ((filename[file_len - 2] == '/') && file_len != 2)
-		filename[file_len - 2] = '\0';
-
-	if (file_len > PATH_MAX) {
-		fprintf(stderr, "Filename too long on line %lu of file %s.\n",
-			lineno, current_acl_file);
-		exit(EXIT_FAILURE);
-	}
-
-	if (!strcmp(filename, "god") || stat(filename, &fstat)) {
-		dfile = add_deleted_file(filename);
-		fstat.st_ino = dfile->ino;
-		fstat.st_dev = 0;
-		mode |= GR_DELETED;
-	}
-
-	p->filename = filename;
-	p->mode = mode;
-
-	p->proc_object = (*acl_tmp)->filp;
-
-	p->ip_object = (*acl_tmp)->ipp;
-	if (p->ip_object) {
-		for_each_object(tmpi, p->ip_object) {
-			for (i = 0; i < 8; i++)
-				p->ip_proto[i] |= tmpi->proto[i];
-			p->ip_type |= tmpi->type;
-		}
-	}
-
-	p->cap_raise = (*acl_tmp)->cap_raise_tmp;
-	p->cap_drop = (*acl_tmp)->cap_drop_tmp;
-
-	memcpy(p->res, (*acl_tmp)->res, sizeof ((*acl_tmp)->res));
-	p->resmask = (*acl_tmp)->resmask;
-
-	if ((p->resmask & (1 << RLIM_NLIMITS)) &&	// check for RES_CRASH
-	    S_ISDIR(fstat.st_mode) && !(mode & GR_DELETED)) {
-		fprintf(stderr, "RES_CRASH is only valid for binary "
-			"ACL subjects.\n"
-			"The ACL system will not load until this "
-			"error in subject ACL: %s is fixed.\n\n", p->filename);
-		exit(EXIT_FAILURE);
-	}
-
-	p->dev = MKDEV(MAJOR(fstat.st_dev), MINOR(fstat.st_dev));
-	p->inode = fstat.st_ino;
-
-	if ((p2 = is_proc_subject_dupe(*acl_tmp, p))) {
-		fprintf(stderr, "Duplicate ACL entry found for \"%s\""
-			" on line %lu of %s.\n"
-			"\"%s\" references the same subject as \"%s\""
-			" specified on an earlier line.\n"
-			"The ACL system will not load until this"
-			" error is fixed.\n", p->filename, lineno,
-			current_acl_file, p->filename, p2->filename);
-		return 0;
-	}
-
-	(*acl_tmp)->cap_raise_tmp = 0;
-	(*acl_tmp)->cap_drop_tmp = 0;
-	memset((*acl_tmp)->res, 0, sizeof ((*acl_tmp)->res));
-	memset((*acl_tmp)->ip_proto, 0, sizeof ((*acl_tmp)->ip_proto));
-	(*acl_tmp)->ip_type = 0;
-	(*acl_tmp)->resmask = 0;
-	(*acl_tmp)->filp = NULL;
-	(*acl_tmp)->ipp = NULL;
-	(*acl_tmp)->proc = p;
-
-	return 1;
-}
-
-/*
-void rem_proc_subject_acl(struct proc_acl * proc)
-{
-	struct file_acl * filp = proc->proc_object;
-
-	while(filp && filp->prev) {
-		filp = filp->prev;
-		free(filp->next);
-	}
-
-	if(filp)
-		free(filp);
-	
-	if(proc->next)
-		proc->next->prev = proc->prev;
-	else if(proc->prev) // we're at the end of process acls
-		proc->prev->next = NULL;
-	// else - we're the only subject acl, impossible
-
-	free(proc);
-
-	return;
-}
-*/
-
-__u32
-proc_subject_mode_conv(const char *mode)
-{
-	int i;
-	__u32 retmode = 0;
-
-	retmode |= GR_FIND;
-
-	for (i = 0; i < strlen(mode); i++) {
-		switch (mode[i]) {
-		case 'T':
-			retmode |= GR_NOTROJAN;
-			break;
-		case 'K':
-			retmode |= GR_KILLPROC;
-			break;
-		case 'C':
-			retmode |= GR_KILLIPPROC;
-			break;
-		case 'A':
-			retmode |= GR_PROTSHM;
-			break;
-		case 'P':
-			retmode |= GR_PAXPAGE;
-			break;
-		case 'R':
-			retmode |= GR_PAXRANDMMAP;
-			break;
-		case 'M':
-			retmode |= GR_PAXMPROTECT;
-			break;
-		case 'S':
-			retmode |= GR_PAXSEGM;
-			break;
-		case 'G':
-			retmode |= GR_PAXGCC;
-			break;
-		case 'X':
-			retmode |= GR_PAXRANDEXEC;
-			break;
-		case 'O':
-			retmode |= GR_IGNORE;
-			break;
-		case 'o':
-			retmode |= GR_OVERRIDE;
-			break;
-		case 'l':
-			retmode |= GR_LEARN;
-			break;
-		case 'h':
-			retmode &= ~GR_FIND;
-			break;
-		case 'p':
-			retmode |= GR_PROTECTED;
-			break;
-		case 'k':
-			retmode |= GR_KILL;
-			break;
-		case 'v':
-			retmode |= GR_VIEW;
-			break;
-		case 'd':
-			retmode |= GR_PROTPROCPID;
-			break;
-		case 'b':
-			retmode |= GR_PROCACCT;
-			break;
-		default:
-			fprintf(stderr, "Invalid proc subject mode "
-				"\'%c\' found on line %lu "
-				"of %s\n", mode[i], lineno, current_acl_file);
-		}
-	}
-
-	return retmode;
-}
-
-__u32
-proc_object_mode_conv(const char *mode)
-{
-	int i;
-	__u32 retmode = 0;
-
-	retmode |= GR_FIND;
-
-	for (i = 0; i < strlen(mode); i++) {
-		switch (mode[i]) {
-		case 'r':
-			retmode |= GR_READ;
-			break;
-		case 'w':
-			retmode |= GR_WRITE;
-			retmode |= GR_APPEND;
-			break;
-		case 'x':
-			retmode |= GR_EXEC;
-			break;
-		case 'a':
-			retmode |= GR_APPEND;
-			break;
-		case 'h':
-			retmode &= ~GR_FIND;
-			break;
-		case 'i':
-			retmode |= GR_INHERIT;
-			break;
-		case 't':
-			retmode |= GR_PTRACERD;
-			break;
-		case 'F':
-			retmode |= GR_AUDIT_FIND;
-			break;
-		case 'R':
-			retmode |= GR_AUDIT_READ;
-			break;
-		case 'W':
-			retmode |= GR_AUDIT_WRITE;
-			retmode |= GR_AUDIT_APPEND;
-			break;
-		case 'X':
-			retmode |= GR_AUDIT_EXEC;
-			break;
-		case 'A':
-			retmode |= GR_AUDIT_APPEND;
-			break;
-		case 'I':
-			retmode |= GR_AUDIT_INHERIT;
-			break;
-		case 's':
-			retmode |= GR_SUPPRESS;
-			break;
-		default:
-			fprintf(stderr, "Invalid proc object mode "
-				"\'%c\' found on line %lu "
-				"of %s\n", mode[i], lineno, current_acl_file);
-		}
-	}
-
-	return retmode;
-}
-
-void
-add_include(const char *filename)
-{
-	int n;
-	struct stat fstat;
-	char *dir;
-	struct include_line *p;
-
-	if (filename[0] == '/') {
-		if ((dir =
-		     (char *) calloc(strlen(filename) + 1,
-				     sizeof (char))) == NULL)
-			failure("calloc");
-		strcpy(dir, filename);
-	} else {
-		fprintf(stderr,
-			"Only absolute paths are supported for include.\n"
-			"The include of %s is therefore invalid.\n", filename);
-		exit(EXIT_FAILURE);
-	}
-
-	if (stat(dir, &fstat) < 0) {
-		fprintf(stderr, "Unable to stat include \"%s\".\n"
-			"Error: %s\n", dir, strerror(errno));
-		exit(EXIT_FAILURE);
-	}
-
-	if (S_ISDIR(fstat.st_mode)) {
-		struct dirent **namelist;
-		char path[PATH_MAX];
-
-		n = scandir(dir, &namelist, 0, alphasort);
-		if (n >= 0) {
-			while (n--) {
-				if (strcmp(namelist[n]->d_name, ".")
-				    && strcmp(namelist[n]->d_name, "..")) {
-					memset(&path, 0, sizeof (path));
-					snprintf(path, PATH_MAX - 1, "%s/%s",
-						 dir, namelist[n]->d_name);
-					add_include(path);
-				}
-			}
-		}
-		free(dir);
-		return;
-	}
-
-	if (is_include_dupe(dir)) {
-		fprintf(stderr,
-			"Duplicate include entry \"%s\" found on line %lu "
-			"of %s.\n" "The ACL system will not load until this "
-			"error is fixed.\n", dir, lineno, current_acl_file);
-		exit(EXIT_FAILURE);
-	}
-
-	if ((p =
-	     (struct include_line *) calloc(1,
-					    sizeof (struct include_line))) ==
-	    NULL)
-		failure("calloc");
-
-	if (includes)
-		includes->next = p;
-
-	p->prev = includes;
-
-	p->filename = dir;
-	p->left = includeno++;
-
-	includes = p;
-
-	return;
-}
-
-void
-parse_acls(void)
-{
-	struct include_line *p;
-	struct include_line *tmp;
-
-	if (chdir(GRSEC_DIR) < 0) {
-		fprintf(stderr, "Error changing directory to %s\n"
-			"Error: %s\n", GRSEC_DIR, strerror(errno));
-		exit(EXIT_FAILURE);
-	}
-
-	add_admin_acl();
-	add_kernel_acl();
-	add_gradm_acl();
-
-	gradmin = open_acl_file(GR_ACL_PATH);
-	add_include(GR_ACL_PATH);
-	change_current_acl_file(GR_ACL_PATH);
-	gradmparse();
-	fclose(gradmin);
-
-	if (includeno == 1)
-		return;
-
-	do {
-
-		tmp = includes;
-		includeno = 1;
-
-		p = includes;
-		do {
-			lineno = 1;
-			def_acl_tmp->cap_raise_tmp = 0;
-			def_acl_tmp->cap_drop_tmp = 0;
-			memset(def_acl_tmp->res, 0, sizeof (def_acl_tmp->res));
-			memset(def_acl_tmp->ip_proto, 0,
-			       sizeof (def_acl_tmp->ip_proto));
-			def_acl_tmp->ip_type = 0;
-			def_acl_tmp->resmask = 0;
-
-			gradmin = open_acl_file(p->filename);
-			change_current_acl_file(p->filename);
-			gradmparse();
-			fclose(gradmin);
-
-			p = p->prev;
-		} while (p->left);
-		tmp->left = 0;
-	} while (tmp != includes);
-
-	return;
-}
-
-struct gr_arg *
-conv_user_to_kernel(struct gr_pw_entry *entry)
-{
-	struct gr_arg *retarg;
-	struct user_acl_subject_db *subj_db;
-	struct proc_acl *tmp = NULL;
-	struct file_acl *tmpf = NULL;
-	struct ip_acl *tmpi = NULL;
-	struct ip_acl *i_tmp = NULL;
-	struct proc_acl **s_tmp = NULL;
-	struct ip_acl **i_table = NULL;
-	unsigned long facls = 0;
-	unsigned long pacls = 0;
-	unsigned long iacls = 0;
-	unsigned long tiacls = 0;
-	unsigned long i = 0;
-	int err;
-
-	for_each_subject(tmp, def_acl_tmp) {
-		pacls++;
-		for_each_object(tmpi, tmp->ip_object)
-		    tiacls++;
-		for_each_object(tmpf, tmp->proc_object)
-		    facls++;
-	}
-
-	if ((retarg =
-	     (struct gr_arg *) calloc(1, sizeof (struct gr_arg))) == NULL)
-		failure("calloc");
-
-	err = mlock(retarg, sizeof (struct gr_arg));
-	if (err)
-		fprintf(stderr, "Warning, unable to lock authentication "
-			"structure in physical memory.\n");
-
-	if (!pacls && !facls)	// we are disabling, don't want to calloc 0
-		goto set_pw;
-
-	if ((subj_db =
-	     (struct user_acl_subject_db *) calloc(1,
-						   sizeof (struct
-							   user_acl_subject_db)))
-	    == NULL)
-		failure("calloc");
-
-	subj_db->s_entries = pacls;
-	subj_db->i_entries = tiacls;
-	subj_db->o_entries = facls;
-
-	if ((s_tmp = subj_db->s_table =
-	     (struct proc_acl **) calloc(pacls,
-					 sizeof (struct proc_acl *))) == NULL)
-		failure("calloc");
-
-	for_each_subject(tmp, def_acl_tmp) {
-		*s_tmp = tmp;
-		iacls = 0;
-		for_each_object(tmpi, tmp->ip_object)
-		    iacls++;
-		if (iacls) {
-			i_table =
-			    (struct ip_acl **) calloc(iacls,
-						      sizeof (struct ip_acl *));
-			if (!i_table)
-				failure("calloc");
-			i = 0;
-			for_each_object(tmpi, tmp->ip_object) {
-				i_tmp =
-				    (struct ip_acl *) calloc(1,
-							     sizeof (struct
-								     ip_acl));
-				memcpy(i_tmp, tmpi, sizeof (struct ip_acl));
-				*(i_table + i) = i_tmp;
-				i++;
-			}
-			(*s_tmp)->ips = i_table;
-			(*s_tmp)->ip_num = iacls;
-		} else {
-			(*s_tmp)->ips = NULL;
-			(*s_tmp)->ip_num = 0;
-		}
-		s_tmp++;
-	}
-
-	memcpy(&retarg->subj_db, subj_db, sizeof (struct user_acl_subject_db));
-      set_pw:
-
-	strncpy(retarg->pw, entry->passwd, GR_PW_LEN - 1);
-	retarg->pw[GR_PW_LEN - 1] = '\0';
-
-	retarg->mode = entry->mode;
-	retarg->segv_inode = entry->segv_inode;
-	retarg->segv_dev = entry->segv_dev;
-	retarg->segv_uid = entry->segv_uid;
-
-	memset(entry, 0, sizeof (struct gr_pw_entry));
-
-	return retarg;
-}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm_pw.c linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm_pw.c
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm_pw.c	2003-04-06 05:13:38.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm_pw.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,158 +0,0 @@
-#include "gradm.h"
-
-void
-write_user_passwd(struct gr_pw_entry *entry)
-{
-	int fd;
-
-	if ((access(GR_PW_PATH, F_OK)) != 0) {
-		if ((fd =
-		     open(GR_PW_PATH, O_EXCL | O_CREAT,
-			  S_IRUSR | S_IWUSR)) < 0) {
-			fprintf(stderr, "Could not open %s\n", GR_PW_PATH);
-			failure("open");
-		}
-
-		close(fd);
-	}
-
-	if ((fd = open(GR_PW_PATH, O_WRONLY)) < 0) {
-		fprintf(stderr, "Could not open %s\n", GR_PW_PATH);
-		failure("open");
-	}
-
-	if (write(fd, entry->salt, GR_SALT_SIZE) != GR_SALT_SIZE) {
-		fprintf(stderr, "Error writing to %s\n", GR_PW_PATH);
-		failure("write");
-	}
-
-	if (write(fd, entry->sum, GR_SHA_SUM_SIZE) != GR_SHA_SUM_SIZE) {
-		fprintf(stderr, "Error writing to %s\n", GR_PW_PATH);
-		failure("write");
-	}
-
-	close(fd);
-
-	return;
-}
-
-void
-get_user_passwd(struct gr_pw_entry *entry, int mode)
-{
-	struct termios term;
-	struct gr_pw_entry *old = NULL;
-	struct gr_pw_entry new;
-	int i, err;
-
-	err = mlock(&new, sizeof (new));
-	if (err)
-		fprintf(stderr, "Warning: Unable to lock password "
-			"into physical memory.\n");
-      start_pw:
-	memset(&new, 0, sizeof (struct gr_pw_entry));
-
-	for (i = 0; i <= mode; i++) {
-		if (i == GR_PWANDSUM) {
-			old = entry;
-			entry = &new;
-		}
-
-		printf("%s", (i ? "Re-enter Password: " : "Password: "));
-		fflush(stdout);
-
-		tcgetattr(STDIN_FILENO, &term);
-
-		if (term.c_lflag & ECHO) {
-			term.c_lflag &= ~ECHO;
-			tcsetattr(STDIN_FILENO, TCSANOW, &term);
-		}
-
-		if ((read(STDIN_FILENO, entry->passwd, GR_PW_LEN)) < 0) {
-			fprintf(stderr,
-				"\nError reading password from user.\n");
-			term.c_lflag |= ECHO;
-			tcsetattr(STDIN_FILENO, TCSANOW, &term);
-			failure("read");
-		}
-
-		printf("\n");
-		fflush(stdout);
-
-		term.c_lflag |= ECHO;
-		tcsetattr(STDIN_FILENO, TCSANOW, &term);
-
-		entry->passwd[strlen(entry->passwd) - 1] = '\0';
-
-		if ((strlen(entry->passwd) < 6) && mode == 1) {
-			fprintf(stderr,
-				"Your password must be at least 6 characters in length.\n");
-			goto start_pw;
-		}
-
-		if (i == GR_PWANDSUM) {
-			if (strcmp(old->passwd, entry->passwd)) {
-				fprintf(stderr, "Passwords do not match.\n");
-				exit(EXIT_FAILURE);
-			}
-			entry = old;
-			memset(&new, 0, sizeof (struct gr_pw_entry));
-			printf("Password written to %s.\n", GR_PW_PATH);
-		}
-	}
-	munlock(&new, sizeof (new));
-	return;
-}
-
-void
-generate_salt(struct gr_pw_entry *entry)
-{
-	int fd;
-
-	if ((fd = open("/dev/random", O_RDONLY)) < 0) {
-		if ((fd = open("/dev/urandom", O_RDONLY)) < 0) {
-			fprintf(stderr,
-				"Unable to open /dev/urandom for reading.\n");
-			failure("open");
-		}
-	}
-
-	if (read(fd, entry->salt, GR_SALT_SIZE) != GR_SALT_SIZE) {
-		close(fd);
-		if ((fd = open("/dev/urandom", O_RDONLY)) < 0) {
-			fprintf(stderr,
-				"Unable to open /dev/urandom for reading.\n");
-			failure("open");
-		}
-		if (read(fd, entry->salt, GR_SALT_SIZE) != GR_SALT_SIZE) {
-			fprintf(stderr, "Unable to read from /dev/random\n");
-			failure("read");
-		}
-	}
-
-	return;
-}
-
-void
-read_saltandpass(char *salt, char *pass)
-{
-	int fd;
-	unsigned char total[GR_SHA_SUM_SIZE + GR_SALT_SIZE];
-
-	fd = open(GR_PW_PATH, O_RDONLY);
-	if (fd < 0) {
-		fprintf(stderr, "Error opening: %s\n", GR_PW_PATH);
-		perror("open");
-		exit(EXIT_FAILURE);
-	}
-
-	if (read(fd, total, sizeof (total)) != sizeof (total)) {
-		fprintf(stderr, "Your password file is not set up correctly.\n"
-			"Run gradm -P to set a password.\n");
-		exit(EXIT_FAILURE);
-	}
-
-	memcpy(salt, total, GR_SALT_SIZE);
-	memcpy(pass, total + GR_SALT_SIZE, GR_SHA_SUM_SIZE);
-
-	return;
-}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm_res.c linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm_res.c
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm_res.c	2004-02-21 15:22:21.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm_res.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,151 +0,0 @@
-#include "gradm.h"
-
-/* fix broken glibc installs */
-#ifndef RLIMIT_LOCKS
-#define RLIMIT_LOCKS 10
-#endif
-#ifndef NR_OPEN
-#define NR_OPEN 1024
-#endif
-
-struct rlimconv rlim_table[] = {
-	{"RES_CPU", RLIMIT_CPU},
-	{"RES_FSIZE", RLIMIT_FSIZE},
-	{"RES_DATA", RLIMIT_DATA},
-	{"RES_STACK", RLIMIT_STACK},
-	{"RES_CORE", RLIMIT_CORE},
-	{"RES_RSS", RLIMIT_RSS},
-	{"RES_NPROC", RLIMIT_NPROC},
-	{"RES_NOFILE", RLIMIT_NOFILE},
-	{"RES_MEMLOCK", RLIMIT_MEMLOCK},
-	{"RES_AS", RLIMIT_AS},
-	{"RES_LOCKS", RLIMIT_LOCKS},
-	{"RES_CRASH", RLIMIT_LOCKS + 1}
-
-};
-
-static unsigned short
-name_to_res(const char *name)
-{
-	int i;
-
-	for (i = 0; i < (sizeof (rlim_table) / sizeof (struct rlimconv)); i++) {
-		if (!strcmp(rlim_table[i].name, name))
-			return rlim_table[i].val;
-	}
-
-	fprintf(stderr, "Invalid resource name: %s "
-		"found on line %lu of %s.\n", name, lineno, current_acl_file);
-	exit(EXIT_FAILURE);
-
-	return 0;
-}
-
-static unsigned short
-res_to_mask(unsigned short res)
-{
-	return (1 << res);
-}
-
-static unsigned long
-conv_res(const char *lim)
-{
-	unsigned long res;
-	char *p;
-	unsigned int len = strlen(lim);
-	int i;
-
-	if (!strcmp("unlimited", lim))
-		return ~0UL;
-
-	if (isdigit(lim[len - 1]))
-		return atol(lim);
-
-	if ((p = (char *) calloc(len + 1, sizeof (char))) == NULL)
-		failure("calloc");
-
-	strcpy(p, lim);
-
-	for (i = 0; i < len - 1; i++) {
-		if (!isdigit(lim[i])) {
-			fprintf(stderr, "Invalid resource limit: %s "
-				"found on line %lu of %s.\n", lim, lineno,
-				current_acl_file);
-			exit(EXIT_FAILURE);
-		}
-	}
-
-	p[i] = '\0';
-	res = atol(p);
-	free(p);
-
-	switch (lim[i]) {
-	case 'm':
-		res = res * HZ * 60;
-		break;
-	case 'h':
-		res = res * HZ * 60 * 60;
-		break;
-	case 'd':
-		res = res * HZ * 60 * 60 * 24;
-		break;
-	case 's':
-		res = res * HZ;
-		break;
-	case 'K':
-		res = res << 10;
-		break;
-	case 'M':
-		res = res << 20;
-		break;
-	case 'G':
-		res = res << 30;
-		break;
-	default:
-		fprintf(stderr, "Invalid resource limit: %s "
-			"found on line %lu of %s.\n", lim, lineno,
-			current_acl_file);
-		exit(EXIT_FAILURE);
-	}
-
-	return res;
-}
-
-void
-modify_res(struct proc_acl **proc, int res, unsigned long cur,
-	   unsigned long max)
-{
-	if ((res < 0)
-	    || (res > (sizeof (rlim_table) / sizeof (struct rlimconv))))
-		return;
-
-	if ((*proc)->resmask & res_to_mask(rlim_table[res].val)) {
-		(*proc)->res[res].rlim_cur = cur;
-		(*proc)->res[res].rlim_max = max;
-	}
-
-	return;
-}
-
-void
-add_res_acl(struct acl_tmps **acl_tmp, const char *name,
-	    const char *soft, const char *hard)
-{
-	struct rlimit lim;
-
-	lim.rlim_cur = conv_res(soft);
-	lim.rlim_max = conv_res(hard);
-
-	if (!strcmp(name, "RES_NOFILE") && (lim.rlim_cur > NR_OPEN ||
-					    lim.rlim_max > NR_OPEN)) {
-		fprintf(stderr, "Limits for RES_NOFILE cannot be larger "
-			"than %u.\n", NR_OPEN);
-		exit(EXIT_FAILURE);
-	}
-
-	(*acl_tmp)->resmask |= res_to_mask(name_to_res(name));
-
-	memcpy(&((*acl_tmp)->res[name_to_res(name)]), &lim, sizeof (lim));
-
-	return;
-}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm_sha256.c linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm_sha256.c
--- linux-2.4.20-wolk4.15-fullkernel/gradm1/gradm_sha256.c	2003-04-06 05:13:38.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/gradm1/gradm_sha256.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,288 +0,0 @@
-#include "gradm.h"
-
-/* digest-sha256.c,v 1.13 2002/10/02 22:02:08 hvr Exp $
- *
- * SHA-256 code by Jean-Luc Cooke <jlcooke@certainkey.com>.
- * 
- * Glue code originally by Andrew McDonald and Alan Smithee, mailed
- * to maintainer on pulped trees.
- *
- * 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, or (at your option) any
- * later version.
- *
- */
-
-typedef struct {
-	__u32 state[8];
-	__u32 count[2];
-	__u8 buf[128];
-} sha256_ctx_t;
-
-static __inline__ __u32
-generic_rotr32(const __u32 x, const unsigned bits)
-{
-	const unsigned n = bits % 32;
-	return (x >> n) | (x << (32 - n));
-}
-
-#define Ch(x,y,z)   ((x & y) ^ (~x & z))
-#define Maj(x,y,z)  ((x & y) ^ ( x & z) ^ (y & z))
-#define RORu32(x,y) generic_rotr32(x, y)
-#define e0(x)       (RORu32(x, 2) ^ RORu32(x,13) ^ RORu32(x,22))
-#define e1(x)       (RORu32(x, 6) ^ RORu32(x,11) ^ RORu32(x,25))
-#define s0(x)       (RORu32(x, 7) ^ RORu32(x,18) ^ (x >> 3))
-#define s1(x)       (RORu32(x,17) ^ RORu32(x,19) ^ (x >> 10))
-
-#define H0         0x6a09e667
-#define H1         0xbb67ae85
-#define H2         0x3c6ef372
-#define H3         0xa54ff53a
-#define H4         0x510e527f
-#define H5         0x9b05688c
-#define H6         0x1f83d9ab
-#define H7         0x5be0cd19
-
-const static __u32 sha256_K[64] = {
-	0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5,
-	0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
-	0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3,
-	0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
-	0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc,
-	0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
-	0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7,
-	0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
-	0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13,
-	0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
-	0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3,
-	0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
-	0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5,
-	0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
-	0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208,
-	0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
-};
-
-#define LOAD_OP(I)\
- {\
-  t1  = input[(4*I)  ] & 0xff; t1<<=8;\
-  t1 |= input[(4*I)+1] & 0xff; t1<<=8;\
-  t1 |= input[(4*I)+2] & 0xff; t1<<=8;\
-  t1 |= input[(4*I)+3] & 0xff;\
-  W[I] = t1;\
- }
-
-#define BLEND_OP(I) W[I] = s1(W[I-2]) + W[I-7] + s0(W[I-15]) + W[I-16];
-
-static void
-SHA256Transform(__u32 * state, const __u8 * input)
-{
-	__u32 a, b, c, d, e, f, g, h, t1, t2;
-	__u32 W[64];
-
-	int i;
-
-	/* load the input */
-	LOAD_OP(0);
-	LOAD_OP(1);
-	LOAD_OP(2);
-	LOAD_OP(3);
-	LOAD_OP(4);
-	LOAD_OP(5);
-	LOAD_OP(6);
-	LOAD_OP(7);
-	LOAD_OP(8);
-	LOAD_OP(9);
-	LOAD_OP(10);
-	LOAD_OP(11);
-	LOAD_OP(12);
-	LOAD_OP(13);
-	LOAD_OP(14);
-	LOAD_OP(15);
-
-	/* now blend */
-	for (i = 16; i < 64; i += 8) {
-		BLEND_OP(i);
-		BLEND_OP(i + 1);
-		BLEND_OP(i + 2);
-		BLEND_OP(i + 3);
-		BLEND_OP(i + 4);
-		BLEND_OP(i + 5);
-		BLEND_OP(i + 6);
-		BLEND_OP(i + 7);
-	}
-
-	/* load the state into our registers */
-	a = state[0];
-	b = state[1];
-	c = state[2];
-	d = state[3];
-	e = state[4];
-	f = state[5];
-	g = state[6];
-	h = state[7];
-
-	/* now iterate */
-	for (i = 0; i < 64; i += 8) {
-		t1 = h + e1(e) + Ch(e, f, g) + sha256_K[i] + W[i];
-		t2 = e0(a) + Maj(a, b, c);
-		d += t1;
-		h = t1 + t2;
-		t1 = g + e1(d) + Ch(d, e, f) + sha256_K[i + 1] + W[i + 1];
-		t2 = e0(h) + Maj(h, a, b);
-		c += t1;
-		g = t1 + t2;
-		t1 = f + e1(c) + Ch(c, d, e) + sha256_K[i + 2] + W[i + 2];
-		t2 = e0(g) + Maj(g, h, a);
-		b += t1;
-		f = t1 + t2;
-		t1 = e + e1(b) + Ch(b, c, d) + sha256_K[i + 3] + W[i + 3];
-		t2 = e0(f) + Maj(f, g, h);
-		a += t1;
-		e = t1 + t2;
-		t1 = d + e1(a) + Ch(a, b, c) + sha256_K[i + 4] + W[i + 4];
-		t2 = e0(e) + Maj(e, f, g);
-		h += t1;
-		d = t1 + t2;
-		t1 = c + e1(h) + Ch(h, a, b) + sha256_K[i + 5] + W[i + 5];
-		t2 = e0(d) + Maj(d, e, f);
-		g += t1;
-		c = t1 + t2;
-		t1 = b + e1(g) + Ch(g, h, a) + sha256_K[i + 6] + W[i + 6];
-		t2 = e0(c) + Maj(c, d, e);
-		f += t1;
-		b = t1 + t2;
-		t1 = a + e1(f) + Ch(f, g, h) + sha256_K[i + 7] + W[i + 7];
-		t2 = e0(b) + Maj(b, c, d);
-		e += t1;
-		a = t1 + t2;
-	}
-
-	state[0] += a;
-	state[1] += b;
-	state[2] += c;
-	state[3] += d;
-	state[4] += e;
-	state[5] += f;
-	state[6] += g;
-	state[7] += h;
-
-	/* clear any sensitive info... */
-	a = b = c = d = e = f = g = h = t1 = t2 = 0;
-	memset(W, 0, 64 * sizeof (__u32));
-}
-
-static void
-SHA256Init(sha256_ctx_t * C)
-{
-	C->state[0] = H0;
-	C->state[1] = H1;
-	C->state[2] = H2;
-	C->state[3] = H3;
-	C->state[4] = H4;
-	C->state[5] = H5;
-	C->state[6] = H6;
-	C->state[7] = H7;
-	C->count[0] = C->count[1] = 0;
-	memset(C->buf, 0, 128);
-}
-
-static void
-SHA256Update(sha256_ctx_t * C, const __u8 * input, __u32 inputLen)
-{
-	__u32 i, index, partLen;
-
-	/* Compute number of bytes mod 128 */
-	index = (__u32) ((C->count[0] >> 3) & 0x3f);
-
-	/* Update number of bits */
-	if ((C->count[0] += (inputLen << 3)) < (inputLen << 3)) {
-		C->count[1]++;
-		C->count[1] += (inputLen >> 29);
-	}
-
-	partLen = 64 - index;
-
-	/* Transform as many times as possible. */
-	if (inputLen >= partLen) {
-		memcpy(&C->buf[index], input, partLen);
-		SHA256Transform(C->state, C->buf);
-
-		for (i = partLen; i + 63 < inputLen; i += 64)
-			SHA256Transform(C->state, &input[i]);
-		index = 0;
-	} else {
-		i = 0;
-	}
-
-	/* Buffer remaining input */
-	memcpy(&C->buf[index], &input[i], inputLen - i);
-}
-
-static void
-SHA256Final(sha256_ctx_t * C, __u8 * digest)
-{
-	const static __u8 padding[64] = { 0x80, };
-	__u8 bits[8];
-	__u32 t, index, padLen;
-	int i, j;
-
-	/* Save number of bits */
-	t = C->count[0];
-	bits[7] = t;
-	t >>= 8;
-	bits[6] = t;
-	t >>= 8;
-	bits[5] = t;
-	t >>= 8;
-	bits[4] = t;
-	t = C->count[1];
-	bits[3] = t;
-	t >>= 8;
-	bits[2] = t;
-	t >>= 8;
-	bits[1] = t;
-	t >>= 8;
-	bits[0] = t;
-
-	/* Pad out to 56 mod 64. */
-	index = (C->count[0] >> 3) & 0x3f;
-	padLen = (index < 56) ? (56 - index) : ((64 + 56) - index);
-	SHA256Update(C, padding, padLen);
-
-	/* Append length (before padding) */
-	SHA256Update(C, bits, sizeof (bits));
-
-	/* Store state in digest */
-	for (i = j = 0; i < 8; i++, j += 4) {
-		t = C->state[i];
-		digest[j + 3] = t;
-		t >>= 8;
-		digest[j + 2] = t;
-		t >>= 8;
-		digest[j + 1] = t;
-		t >>= 8;
-		digest[j] = t;
-	}
-
-	/* Zeroize sensitive information. */
-	memset(C, 0, sizeof (sha256_ctx_t));
-}
-
-void
-generate_hash(struct gr_pw_entry *entry)
-{
-	sha256_ctx_t context;
-	char *pos;
-
-	pos = memchr(entry->passwd, '\n', strlen(entry->passwd));
-	if (pos)
-		*pos = '\0';
-
-	SHA256Init(&context);
-	SHA256Update(&context, entry->salt, GR_SALT_SIZE);
-	SHA256Update(&context, entry->passwd, strlen(entry->passwd));
-	SHA256Final(&context, entry->sum);
-
-	return;
-}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/Makefile linux-2.4.20-wolk4.16-fullkernel/gradm2/Makefile
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/Makefile	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,131 @@
+##############################################################################
+#gradm (c) 2002,2003,2004 Brad Spengler 	        http://grsecurity.net#
+#--------------------------------------			---------------------#
+#gradm is licensed under the GNU GPL http://www.gnu.org		             #
+##############################################################################
+
+GRADM_BIN=gradm2
+GRSEC_DIR=/etc/grsec2
+
+LEX=/usr/bin/lex
+FLEX=/usr/bin/flex
+LEXFLAGS=-B
+YACC=/usr/bin/yacc
+BYACC=/usr/bin/byacc
+BISON=/usr/bin/bison
+MKNOD=/bin/mknod
+#for dietlibc
+#CC=/usr/bin/diet /usr/bin/gcc
+CC=/usr/bin/gcc
+FIND=/usr/bin/find
+STRIP=/usr/bin/strip
+KERNVER=`uname -r | cut -d"." -f 2`
+LIBS = $(shell if [ "`uname -m`" != "sparc64" ]; then echo "-lfl" ; else echo "" ; fi)
+OPT_FLAGS = $(shell if [ "`uname -m`" != "sparc64" ]; then echo "-O2" ; else echo "-O2 -m64" ; fi)
+CFLAGS=$(OPT_FLAGS) -DGRSEC_DIR=\"$(GRSEC_DIR)\" -DKERNVER=$(KERNVER)
+LDFLAGS=
+INSTALL = /usr/bin/install -c
+
+# FHS
+MANDIR=/usr/share/man
+# older MANDIR
+#MANDIR=/usr/man
+DESTDIR=
+
+OBJECTS=gradm.tab.o lex.gradm.o learn_pass1.tab.o learn_pass2.tab.o \
+	fulllearn_pass1.tab.o fulllearn_pass2.tab.o fulllearn_pass3.tab.o \
+	gradm_misc.o gradm_parse.o gradm_arg.o gradm_pw.o gradm_opt.o \
+	gradm_cap.o gradm_sha256.o gradm_adm.o gradm_analyze.o gradm_res.o \
+	gradm_human.o gradm_learn.o gradm_net.o gradm_nest.o \
+	gradm_sym.o gradm_newlearn.o gradm_fulllearn.o gradm_lib.o \
+	lex.fulllearn_pass1.o lex.fulllearn_pass2.o \
+	lex.fulllearn_pass3.o lex.learn_pass1.o lex.learn_pass2.o
+
+all: $(USE_YACC) $(USE_LEX) $(GRADM_BIN) grlearn
+
+USE_YACC = $(shell if [ -x $(BYACC) ]; then echo $(BYACC); \
+	else if [ -x $(BISON) ]; then echo $(BISON) -y; \
+	else if [ -x $(YACC) ]; then echo $(YACC); \
+	else \
+		echo "Bison/(b)yacc needs to be installed to compile gradm."; \
+		exit 1; \
+	fi;fi;fi)
+
+USE_LEX = $(shell if [ -x $(FLEX) ]; then echo $(FLEX); \
+	else if [ -x $(LEX) ]; then echo $(LEX); \
+	else \
+		echo "(f)Lex needs to be installed to compile gradm."; \
+		exit 1; \
+	fi;fi)
+
+$(GRADM_BIN): $(OBJECTS)
+	$(CC) $(CFLAGS) -o $@ $(OBJECTS) $(LIBS) $(LDFLAGS)
+
+grlearn: grlearn.c gradm_lib.c
+	$(CC) $(CFLAGS) -o $@ grlearn.c gradm_lib.c $(LIBS) $(LDFLAGS)
+
+
+gradm.tab.c: gradm.y
+	$(USE_YACC) -b gradm -p gradm -d ./gradm.y
+
+lex.gradm.c: gradm.l
+	$(USE_LEX) $(LEXFLAGS) -Pgradm ./gradm.l
+
+fulllearn_pass1.tab.c: gradm_fulllearn_pass1.y
+	$(USE_YACC) -b fulllearn_pass1 -p fulllearn_pass1 -d ./gradm_fulllearn_pass1.y
+fulllearn_pass2.tab.c: gradm_fulllearn_pass2.y
+	$(USE_YACC) -b fulllearn_pass2 -p fulllearn_pass2 -d ./gradm_fulllearn_pass2.y
+fulllearn_pass3.tab.c: gradm_fulllearn_pass3.y
+	$(USE_YACC) -b fulllearn_pass3 -p fulllearn_pass3 -d ./gradm_fulllearn_pass3.y
+
+lex.fulllearn_pass1.c: gradm_fulllearn_pass1.l
+	$(USE_LEX) $(LEXFLAGS) -Pfulllearn_pass1 ./gradm_fulllearn_pass1.l
+lex.fulllearn_pass2.c: gradm_fulllearn_pass2.l
+	$(USE_LEX) $(LEXFLAGS) -Pfulllearn_pass2 ./gradm_fulllearn_pass2.l
+lex.fulllearn_pass3.c: gradm_fulllearn_pass3.l
+	$(USE_LEX) $(LEXFLAGS) -Pfulllearn_pass3 ./gradm_fulllearn_pass3.l
+
+learn_pass1.tab.c: gradm_learn_pass1.y
+	$(USE_YACC) -b learn_pass1 -p learn_pass1 -d ./gradm_learn_pass1.y
+learn_pass2.tab.c: gradm_learn_pass2.y
+	$(USE_YACC) -b learn_pass2 -p learn_pass2 -d ./gradm_learn_pass2.y
+
+lex.learn_pass1.c: gradm_learn_pass1.l
+	$(USE_LEX) $(LEXFLAGS) -Plearn_pass1 ./gradm_learn_pass1.l
+lex.learn_pass2.c: gradm_learn_pass2.l
+	$(USE_LEX) $(LEXFLAGS) -Plearn_pass2 ./gradm_learn_pass2.l
+
+install: $(GRADM_BIN) gradm.8 policy grlearn
+	mkdir -p $(DESTDIR)/sbin
+	$(INSTALL) -m 0755 $(GRADM_BIN) $(DESTDIR)/sbin
+	$(STRIP) $(DESTDIR)/sbin/$(GRADM_BIN)
+	$(INSTALL) -m 0700 grlearn $(DESTDIR)/sbin
+	$(STRIP) $(DESTDIR)/sbin/grlearn
+	mkdir -p -m 700 $(DESTDIR)$(GRSEC_DIR)
+	if [ -f $(DESTDIR)$(GRSEC_DIR)/acl ] ; then \
+		if [ -f $(DESTDIR)$(GRSEC_DIR)/acl ] ; then \
+			mv $(DESTDIR)$(GRSEC_DIR)/acl $(DESTDIR)$(GRSEC_DIR)/policy ; \
+		else \
+			$(INSTALL) -m 0600 policy $(DESTDIR)$(GRSEC_DIR) ; \
+		fi \
+	fi
+	@if [ -z "`cut -d" " -f3 /proc/mounts | grep "^devfs"`" ] ; then \
+		rm -f $(DESTDIR)/dev/grsec ; \
+		if [ ! -e $(DESTDIR)/dev/grsec ] ; then \
+			mkdir -p $(DESTDIR)/dev ; \
+			$(MKNOD) -m 0622 $(DESTDIR)/dev/grsec c 1 12 ; \
+		fi \
+	fi
+	mkdir -p $(DESTDIR)$(MANDIR)/man8
+	$(INSTALL) -m 0644 gradm.8 $(DESTDIR)$(MANDIR)/man8/$(GRADM_BIN).8
+	@if [ -z $(DESTDIR) ] ; then \
+		if [ -x /sbin/$(GRADM_BIN) ] ; then \
+			$(FIND) $(GRSEC_DIR) -type f -name pw -size 48c -exec rm -f $(GRSEC_DIR)/pw \; ; \
+			if [ ! -f $(GRSEC_DIR)/pw ] ; then \
+				/sbin/$(GRADM_BIN) -P ; \
+                        fi \
+		fi \
+	fi
+
+clean:
+	rm -f core *.o $(GRADM_BIN) lex.*.c *.tab.c *.tab.h grlearn
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/debian/changelog linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/changelog
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/debian/changelog	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/changelog	2004-09-05 18:58:10.000000000 +0200
@@ -0,0 +1,26 @@
+gradm2 (2.0.1-2) unstable; urgency=high
+
+  * Fix Makefile error
+
+ -- Marc-Christian Petersen <m.c.p@wolk.linux-systeme.com>  Sun, 05 Sep 2004 18:30:02 +0200
+
+gradm2 (2.0.1-1) unstable; urgency=medium
+
+  * New upstream release, grsec device is now 'c 1 12' and _not_ 'c 1 10';
+    thus recreate it if it exists with the wrong minor number.
+  * Added Dutch Debconf translation, thanks to Luk Claes
+    <Luk.Claes@UGent.be>!
+
+ -- László Böszörményi (GCS) <gcs@lsc.hu>  Mon, 16 Aug 2004 23:01:54 +0000
+
+gradm2 (2.0-1) unstable; urgency=low
+
+  * Initial release (closes: #244094).
+  * Changed binary name to gradm2 and config dir to /etc/gradm2 , not to
+    conflict with the gradm package, as one may need both on dual boot
+    setups.
+  * Renamed /etc/gradm2/acl to /etc/gradm2/policy as well, as now it is
+    required upstream.
+  * Backport amd64 compile fix from upstream CVS.
+
+ -- László Böszörményi (GCS) <gcs@lsc.hu>  Sat, 24 Apr 2004 19:19:02 +0000
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/debian/config linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/config
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/debian/config	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/config	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,13 @@
+#!/bin/sh -e
+
+. /usr/share/debconf/confmodule
+
+# Check for configure time
+if [ "$1" = configure -o "$1" = reconfigure ]; then
+	db_version 2.0
+	db_input medium gradm2/create_dev_grsec || true
+	db_go
+fi
+
+
+exit 0
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/debian/control linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/control
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/debian/control	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/control	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,16 @@
+Source: gradm2
+Section: admin
+Priority: optional
+Maintainer: László Böszörményi (GCS) <gcs@lsc.hu>
+Build-Depends: debhelper (>> 4.0.0), bison, flex
+Standards-Version: 3.6.1
+
+Package: gradm2
+Architecture: any
+Suggests: kernel-patch-grsecurity2
+Depends: ${misc:Depends}
+Description: Administration program for the grsecurity2 RBAC based ACL system
+ Used to manage the RBAC based ACL system of grsecurity2. Please note that you
+ will need a specially patched kernel for grsecurity to work (see the
+ kernel-patch-grsecurity2 Debian package). You can find more information
+ about grsecurity at http://www.grsecurity.net/
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/debian/copyright linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/copyright
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/debian/copyright	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/copyright	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,23 @@
+This package was debianized by  LA¡szlA¶szA¶rmACnyi (GCS) <gcs@lsc.hu> on
+at, 24 Apr 2004 20:19:02 CET
+
+It was downloaded from: http://www.grsecurity.net/download.php
+
+Upstream Authors: Brad Spender <spender@grsecurity.net>
+
+Copyright:
+    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  02111-1307  USA
+
+The complete license can be found at '/usr/share/common-licenses/GPL-2'.
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/debian/grlearn.8 linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/grlearn.8
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/debian/grlearn.8	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/grlearn.8	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,26 @@
+.TH GRLEARN 8
+.SH NAME
+grlearn \- Automatic learning daemon for grsecurity RBAC system
+.SH SYNOPSIS
+.B grlearn
+[
+.B logfile
+]
+
+.SH DESCRIPTION
+.I grlearn
+is a daemon for automaticaly create minimalistic learnt access configuration
+for the grsecurity RBAC system.
+
+.SH BUGS
+This package is by no means complete.
+
+.SH REPORTING BUGS
+Please include as much information as possible(using any available debugging
+options) and send bug reports for gradm2 or the grsecurity RBAC system
+to
+.B dev@grsecurity.net.
+                                                                                
+.SH AUTHOR
+.B grsecurity and grlearn
+were created and are maintained by Brad Spengler <spender@grsecurity.net>
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/debian/lintian.overrides linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/lintian.overrides
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/debian/lintian.overrides	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/lintian.overrides	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1 @@
+gradm2: mknod-in-maintainer-script
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/debian/po/POTFILES.in linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/po/POTFILES.in
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/debian/po/POTFILES.in	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/po/POTFILES.in	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] templates
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/debian/po/hu.po linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/po/hu.po
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/debian/po/hu.po	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/po/hu.po	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,42 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-07-04 12:45+0000\n"
+"PO-Revision-Date: 2004-07-28 22:25+0100\n"
+"Last-Translator: László 'GCS' Böszörményi <gcs@lsc.hu>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../templates:3
+msgid "gradm2 needs a device entry "
+msgstr "A gradm2-nek szüksége van egy eszközbejegyzésre"
+
+#. Type: note
+#. Description
+#: ../templates:3
+msgid ""
+"gradm2 needs a special entry, a device called /dev/grsec to communicate with "
+"the kernel. It will be created for you if you don't already have it and you "
+"don't have devfs or udev."
+msgstr ""
+"A gradm2-nek szükséges egy speciális bejegyzés, egy eszköz amit /dev/grsec -"
+"nek hívnak. Ez létre lesz hozva, ha még nem létezik, és nem devfs-t vagy "
+"udev-et használ."
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/debian/po/nl.po linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/po/nl.po
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/debian/po/nl.po	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/po/nl.po	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,39 @@
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+# 
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+# 
+#    Developers do not need to manually edit POT or PO files.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: gradm2 2.0-1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-07-04 12:45+0000\n"
+"PO-Revision-Date: 2004-08-11 17:13+0100\n"
+"Last-Translator: Luk Claes <luk.claes@ugent.be>\n"
+"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../templates:3
+msgid "gradm2 needs a device entry "
+msgstr "gradm2 heeft een apparaat (device) nodig"
+
+#. Type: note
+#. Description
+#: ../templates:3
+#, fuzzy
+msgid ""
+"gradm2 needs a special entry, a device called /dev/grsec to communicate with "
+"the kernel. It will be created for you if you don't already have it and you "
+"don't have devfs or udev."
+msgstr ""
+"gradm2 heeft een speciaal apparaat nodig, genaamd /dev/grsec, om te "
+"communiceren met de kernel. Het zal voor u worden aangemaakt als u het nog "
+"niet heeft en u geen devfs heeft."
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/debian/po/templates.pot linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/po/templates.pot
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/debian/po/templates.pot	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/po/templates.pot	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,40 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-07-04 12:45+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../templates:3
+msgid "gradm2 needs a device entry "
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../templates:3
+msgid ""
+"gradm2 needs a special entry, a device called /dev/grsec to communicate with "
+"the kernel. It will be created for you if you don't already have it and you "
+"don't have devfs or udev."
+msgstr ""
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/debian/postinst linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/postinst
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/debian/postinst	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/postinst	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,13 @@
+#!/bin/sh -e
+
+. /usr/share/debconf/confmodule
+
+if [ "$1" = configure ]; then
+	if [ ! -c /dev/grsec ] && [ ! -c /dev/.devfsd ] && [ ! -f /dev/.udev.tdb ]; then
+		mknod -m 0622 /dev/grsec c 1 12 || true
+	fi
+fi
+
+#DEBHELPER#
+
+exit 0
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/debian/preinst linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/preinst
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/debian/preinst	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/preinst	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,13 @@
+#!/bin/sh -e
+
+. /usr/share/debconf/confmodule
+
+if [ "$1" = install ] || [ "$1" = upgrade ]; then
+	if [ -c /dev/grsec ] && [ `ls -l /dev/grsec | tr -s ' ' | cut -f6 -d' '` = 10 ]; then
+		rm -f /dev/grsec
+	fi
+fi
+
+#DEBHELPER#
+
+exit 0
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/debian/rules linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/rules
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/debian/rules	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/rules	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,67 @@
+#!/usr/bin/make -f
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+export DH_COMPAT=4
+
+BUILDDIR=$(CURDIR)/debian/gradm2
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -g
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+debian/po/templates.pot: debian/templates
+	@debconf-updatepo
+
+clean: debian/po/templates.pot
+	dh_testdir
+
+	rm -f build-stamp install-stamp
+	$(MAKE) clean
+	dh_clean
+
+build: build-stamp
+
+build-stamp:
+	dh_testdir
+
+	$(MAKE)
+	touch $@
+
+install: install-stamp
+
+install-stamp: build
+	dh_testdir
+
+	$(MAKE) install DESTDIR=$(BUILDDIR)
+	rm -rf $(BUILDDIR)/dev/
+	install -d $(BUILDDIR)/usr/share/lintian/overrides/
+	install -m0644 $(CURDIR)/debian/lintian.overrides $(BUILDDIR)/usr/share/lintian/overrides/gradm2
+	touch $@
+
+binary-indep: build install
+
+binary-arch: build install
+	dh_testdir
+	dh_installdebconf
+	dh_installdocs
+	dh_installman debian/grlearn.8
+	dh_installchangelogs
+	dh_compress
+	dh_strip
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: clean build binary-indep binary-arch binary install
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/debian/templates linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/templates
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/debian/templates	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/debian/templates	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,6 @@
+Template: gradm2/create_dev_grsec
+Type: note
+_Description: gradm2 needs a device entry 
+ gradm2 needs a special entry, a device called /dev/grsec to communicate with
+ the kernel. It will be created for you if you don't already have it and you
+ don't have devfs or udev.
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm.8 linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm.8
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm.8	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm.8	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,135 @@
+.TH GRADM 8 
+.SH NAME
+gradm \- Administration program for the grsecurity RBAC system
+.SH SYNOPSIS
+.B gradm
+[
+.B \-E 
+]
+[
+.B \-R
+]
+[
+.B \-F
+]
+[
+.B \-L <logfile>
+]
+[
+.B \-O <filename|stream>
+]
+[
+.B \-M
+<filename|uid>
+]
+[
+.B \-D 
+]
+[
+.B \-P [rolename]
+]
+[
+.B \-a <rolename>
+]
+[
+.B \-n <rolename>
+]
+[
+.B \-u
+]
+[
+.B \-h 
+]
+[
+.B \-v
+]
+
+.SH DESCRIPTION
+
+.I gradm
+is the userspace RBAC parsing and authentication program for
+.I grsecurity
+
+grsecurity aims to be a complete security system for Linux 2.4.  gradm 
+performs several tasks for the RBAC system including authenticated via a 
+password to the kernel and parsing rules to be passed to the kernel.
+
+.SH OPTIONS
+.TP
+
+All options to gradm are mutually exclusive, except for -L and -O.
+.TP
+.B \-E
+Enable the RBAC system
+.TP
+
+.B \-R
+Reload the RBAC system (only valid while in admin mode)
+.TP
+
+.B \-F
+Toggle full learning mode.
+If used only with -L, it enables the RBAC system in full learning
+mode.
+If used with -L and -O, it parses the full learning logs and
+generates a complete ruleset.
+.TP
+
+.B \-M <filename|uid>
+Remove an execution ban on a given uid or filename that has been
+put in place by the RES_CRASH resource restriction of the RBAC system.
+.TP
+
+.B \-L <logfile>
+Parses the learning logs.  Accepts an argument which
+specifies the logfile to scan for the learning logs.
+This option can be used with -E, -O, or -F.
+.TP
+
+.B \-O <filename|stream>
+Specifies output mode.  Requires a single argument that can be
+"stdout", "stderr", or a regular file.  Only used with -L or -F.
+.TP
+
+.B \-D
+Disable the RBAC system
+.TP
+
+.B \-P [rolename]
+Without an argument, it sets the password for administering
+the RBAC system.  With a role name as an argument, it sets
+the password for that given special role.
+.TP
+
+.B \-a <rolename>
+Authenticate to a special role that requires a password.
+.TP
+
+.B \-n <rolename>
+Authenticate to a special role that does not require a password.
+.TP
+
+.B \-u
+Removes yourself from your current special role, reverting back
+to the normal role selection.  To be used, for instance, for logging
+out of an admin role without exiting your shell.
+
+.B \-h
+Display help information
+.TP
+
+.B \-v
+Print version information and exit
+.TP
+
+.BR
+
+.SH REPORTING BUGS
+Please include as much information as possible(using any available debugging 
+options) and send bug reports for gradm or the grsecurity RBAC system 
+to 
+.B dev@grsecurity.net.
+
+.SH AUTHOR
+.B grsecurity and gradm
+were created and are maintained by Brad Spengler <spender@grsecurity.net>
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm.h linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm.h
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm.h	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,79 @@
+#ifndef GRADM_H
+#define GRADM_H
+#include <stdio.h>
+#include <ctype.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <signal.h>
+#include <getopt.h>
+#include <sched.h>
+#include <fcntl.h>
+#include <termios.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <sys/poll.h>
+#include <asm/param.h>
+#include <asm/ioctls.h>
+#include <dirent.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <pwd.h>
+#include <grp.h>
+#include <fnmatch.h>
+#include <elf.h>
+#include <sys/resource.h>
+#include <sys/mman.h>
+#include <asm/posix_types.h>
+#include <linux/capability.h>
+#include <linux/limits.h>
+#include <linux/threads.h>
+#include <linux/version.h>
+
+#define failure(x) do { \
+	fprintf(stderr, x ": %s\n\n", strerror(errno)); \
+	exit(EXIT_FAILURE);\
+  	} while(0)
+
+#define for_each_role(x, y) \
+	for(x = y; x; x = (x)->prev)
+
+#define for_each_subject(x, y) \
+	for(x = (y)->hash->first; x; x = (x)->prev)
+
+#define for_each_include(x) \
+	for(x = includes; x; x = (x)->prev)
+
+#define for_each_object(x, y) \
+	for(x = (y)->hash->first; x; x = (x)->prev)
+
+#define for_each_allowed_ip(x, y) \
+	for(x = y; x; x = (x)->prev)
+
+#define for_each_transition(x, y) \
+	for(x = y; x; x = (x)->prev)
+
+#define for_each_globbed(x, y) \
+	for(x = (y)->globbed; x; x = (x)->next)
+
+
+#if KERNVER == 6
+typedef __u32 gr_dev_t;
+#undef MAJOR
+#undef MINOR
+#undef MKDEV
+#define MAJOR(dev)     ((unsigned int) ((dev)>>20))
+#define MINOR(dev)     ((unsigned int) ((dev) & ((1U << 20) - 1)))
+#define MKDEV(ma,mi)   ((mi & 0xff) | (ma << 8) | ((mi & ~0xff) << 12))
+#else
+typedef unsigned short gr_dev_t;
+#define MAJOR(dev)	((dev)>>8)
+#define MINOR(dev)	((dev) & 0xff)
+#define MKDEV(ma,mi)	((ma)<<8 | (mi))
+#endif
+
+#include "gradm_defs.h"
+#include "gradm_func.h"
+
+#endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm.l linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm.l
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm.l	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm.l	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,511 @@
+%{
+#include "gradm.h"
+#include "gradm.tab.h"
+
+unsigned long lineno;
+char *gr_line;
+unsigned int old_state;
+unsigned int old_state2;
+
+int gradmerror(char *s);
+int gradmwrap(void);
+int is_eof(void);
+void add_include(char *includename);
+
+struct include_entry {
+	unsigned long lineno;
+	YY_BUFFER_STATE buffer;
+	FILE *file;
+	char *name;
+	struct include_entry *prev;
+	struct include_entry *next;
+	struct include_entry *parent;
+	struct include_entry **stack;
+	int sp;
+};
+
+struct include_entry include_stack;
+struct include_entry *current_stack;
+
+%}
+
+IP [0-9]{1,3}"."[0-9]{1,3}"."[0-9]{1,3}"."[0-9]{1,3}
+
+%option nounput
+
+%x ROLE_STATE SUBJECT_STATE IP_STATE RES_STATE COMMENT_STATE ROLETYPE_STATE
+%x INCLUDE_STATE IPNETMASK_STATE IPPORT_STATE ROLETRANS_STATE
+%x VAR_STATE VAR_OBJ_STATE IDTRANS_STATE DOMAIN_STATE DOMAINTYPE_STATE
+%x DOMAINLIST_STATE
+
+%%
+
+<*>"\n"					{
+					  lineno++;
+					  if (YYSTATE == COMMENT_STATE)
+						  BEGIN(old_state2);
+					  if (YYSTATE != VAR_STATE && YYSTATE != VAR_OBJ_STATE)
+						  BEGIN(INITIAL);
+					}
+<*>"#"					{
+					  if (YYSTATE != COMMENT_STATE)
+						  old_state2 = YYSTATE;
+					  BEGIN(COMMENT_STATE);
+					}
+<*>[ \t]+				;
+<COMMENT_STATE>.*			;
+
+<ROLETYPE_STATE>[ugslGNAT]*		{
+					  gradmlval.string = strdup(yytext);
+					  return ROLE_TYPE;
+					}
+<DOMAINTYPE_STATE>([ug]l?)|(l?[ug])	{
+					  BEGIN(DOMAINLIST_STATE);
+					  gradmlval.string = strdup(yytext);
+					  return DOMAIN_TYPE;
+					}
+<ROLE_STATE>[_a-zA-Z0-9-]{1,30}		{
+					  BEGIN(ROLETYPE_STATE);
+					  gradmlval.string = strdup(yytext);
+					  return ROLE_NAME;
+					}
+<DOMAIN_STATE>[_a-zA-Z0-9-]{1,30}	{
+					  BEGIN(DOMAINTYPE_STATE);
+					  gradmlval.string = strdup(yytext);
+					  return ROLE_NAME;
+					}
+<DOMAINLIST_STATE>[_a-zA-Z0-9-]{1,30}	{
+					  gradmlval.string = strdup(yytext);
+					  return ROLE_NAME;
+					}
+<ROLETRANS_STATE>[_a-zA-Z0-9-]{1,30}	{
+					  gradmlval.string = strdup(yytext);
+					  return ROLE_NAME;
+					}
+
+<SUBJECT_STATE>":"			{ 
+					  return ':';
+					}
+<SUBJECT_STATE>[/][^ :\t\n]*		{ 
+					  gradmlval.string = strdup(yytext);
+					  return SUBJ_NAME;
+					}
+<SUBJECT_STATE>["][/][^:\n]*["]		{
+					  gr_line = yytext;
+					  gr_line++;
+					  *(gr_line + strlen(gr_line) - 1) = '\0';
+					  gradmlval.string = strdup(gr_line);
+					  return SUBJ_NAME;
+					}
+<SUBJECT_STATE>$HOME[/]?[^ :\t\n]*	{ 
+					  gradmlval.string = strdup(yytext);
+					  return SUBJ_NAME;
+					}
+<SUBJECT_STATE>["]$HOME[/]?[^:\n]*["]		{
+					  gr_line = yytext;
+					  gr_line++;
+					  *(gr_line + strlen(gr_line) - 1) = '\0';
+					  gradmlval.string = strdup(gr_line);
+					  return SUBJ_NAME;
+					}
+<SUBJECT_STATE>[TKCAPRMSGXOolhpkvdbr]+	{
+					  gradmlval.string = strdup(yytext);
+					  return SUBJ_MODE;
+					}
+
+<RES_STATE>"unlimited"			{
+					  gradmlval.string = strdup(yytext);
+					  return RES_SOFTHARD;
+					}
+<RES_STATE>[0-9]+[smhdKMG]?		{
+					  gradmlval.string = strdup(yytext);
+					  return RES_SOFTHARD;
+					}
+
+<IP_STATE>"disabled"			{
+					  gradmlval.string = strdup(yytext);
+					  return DISABLED;
+					}
+<IP_STATE>{IP}				{
+					  gradmlval.string = strdup(yytext);
+					  return IPADDR;
+					}
+<IP_STATE>[/]				{
+					  BEGIN(IPNETMASK_STATE);
+					  return *yytext;
+					}
+<IP_STATE>[:-]				{
+					  BEGIN(IPPORT_STATE);
+					  return *yytext;
+					}
+<IP_STATE>"raw_sock"|"dgram"|"rdm"|"stream"|"any_sock" {
+					  gradmlval.string = strdup(yytext);
+					  return IPTYPE;
+					}
+<IP_STATE>[a-z_-]+			{
+					  gradmlval.string = strdup(yytext);
+					  return IPPROTO;
+					}
+
+<IPNETMASK_STATE>[0-9]{1,2}		{
+					  BEGIN(IP_STATE);
+					  gradmlval.string = strdup(yytext);
+					  return IPNETMASK;
+					}
+<IPPORT_STATE>[0-9]{1,5}		{
+					  BEGIN(IP_STATE);
+					  gradmlval.string = strdup(yytext);
+					  return IPPORT;
+					}
+
+"define"				{
+					  old_state = YYSTATE;
+					  BEGIN(VAR_STATE);
+					  return DEFINE;
+					}
+[$][a-zA-Z0-9_]+			{
+					  gr_line = yytext;
+					  gr_line++;
+					  gradmlval.string = strdup(gr_line);
+					  return VARIABLE;
+					}
+<VAR_STATE>[a-zA-Z0-9_]+		{
+					  gradmlval.string = strdup(yytext);
+					  return DEFINE_NAME;
+					}
+<VAR_STATE>"{"				{
+					  BEGIN(VAR_OBJ_STATE);
+					  return '{';
+					}
+<VAR_OBJ_STATE>"}"			{
+					  BEGIN(old_state);
+					  return '}';
+					}
+<VAR_OBJ_STATE>[/][^ \t\n]*		{
+					  gradmlval.string = strdup(yytext);
+					  return OBJ_NAME;
+					}
+<VAR_OBJ_STATE>["][/].*["]		{
+					  gr_line = yytext;
+					  gr_line++;
+					  *(gr_line + strlen(gr_line) - 1) = '\0';
+					  gradmlval.string = strdup(gr_line);
+					  return OBJ_NAME;
+					}
+<VAR_OBJ_STATE>[rwxahitmFRWXAIMdDcCspo]+	{
+					  gradmlval.string = strdup(yytext);
+					  return OBJ_MODE;
+					}
+<IDTRANS_STATE>[_a-zA-Z0-9-]{1,30}	{
+					  gradmlval.string = strdup(yytext);
+					  return ID_NAME;
+					}
+"user_transition_allow"			{
+					  BEGIN(IDTRANS_STATE);
+					  return USER_TRANS_ALLOW;
+					}
+"user_transition_deny"			{
+					  BEGIN(IDTRANS_STATE);
+					  return USER_TRANS_DENY;
+					}
+"group_transition_allow"		{
+					  BEGIN(IDTRANS_STATE);
+					  return GROUP_TRANS_ALLOW;
+					}
+"group_transition_deny"			{
+					  BEGIN(IDTRANS_STATE);
+					  return GROUP_TRANS_DENY;
+					}
+"role"					{
+					  BEGIN(ROLE_STATE);
+					  return ROLE;
+					}
+"domain"				{
+					  BEGIN(DOMAIN_STATE);
+					  return DOMAIN;
+					}
+"role_allow_ip"				{
+					  BEGIN(IP_STATE);
+					  return ROLE_ALLOW_IP;
+					}
+"role_transitions"			{
+					  BEGIN(ROLETRANS_STATE);
+					  return ROLE_TRANSITION;
+					}
+"subject"				{
+					  BEGIN(SUBJECT_STATE);
+					  return SUBJECT;
+					}
+"connect"				{
+					  BEGIN(IP_STATE);
+					  return CONNECT;
+					}
+"bind"					{
+					  BEGIN(IP_STATE);
+					  return BIND;
+					}
+"include"[ \t]*[<][/].*[>]		{
+					  gr_line = strchr(yytext, '/');
+					  *(gr_line + strlen(gr_line) - 1) = '\0';
+					  add_include(gr_line);					  
+					}
+[+-]"CAP_"[_A-Z]+			{
+					  gradmlval.string = strdup(yytext);
+					  return CAP_NAME;
+					}
+"RES_"[A-Z]+				{
+					  BEGIN(RES_STATE);
+					  gradmlval.string = strdup(yytext);
+					  return RES_NAME;
+					}
+
+[/][^ \t\n]*				{
+					  gradmlval.string = strdup(yytext);
+					  return OBJ_NAME;
+					}
+["][/].*["]				{
+					  gr_line = yytext;
+					  gr_line++;
+					  *(gr_line + strlen(gr_line) - 1) = '\0';
+					  gradmlval.string = strdup(gr_line);
+					  return OBJ_NAME;
+					}
+$HOME[/]?[^ \t\n]*			{
+					  gradmlval.string = strdup(yytext);
+					  return OBJ_NAME;
+					}
+["]$HOME[/]?.*["]			{
+					  gr_line = yytext;
+					  gr_line++;
+					  *(gr_line + strlen(gr_line) - 1) = '\0';
+					  gradmlval.string = strdup(gr_line);
+					  return OBJ_NAME;
+					}
+[rwxahitmFRWXAIMcCdDspo]+		{
+					  gradmlval.string = strdup(yytext);
+					  return OBJ_MODE;
+					}
+[|&()-]					{
+						return *yytext;
+					}
+[{}]					;
+<<EOF>>					{
+					  if (is_eof())
+						yyterminate();
+					}
+.					{ gradmerror("invalid character"); }
+
+%%
+
+void add_include(char *includename)
+{
+	struct stat fstat;
+	FILE *tmpfile;
+
+	if (current_stack->sp >= MAX_INCLUDE_DEPTH) {
+		fprintf(stderr, "Includes too deep while trying to process "
+				"%s\n", includename);
+		exit(EXIT_FAILURE);
+	}
+
+	current_stack->stack = realloc(current_stack->stack, (1 + current_stack->sp) * sizeof(struct include_entry *));
+	if (current_stack->stack == NULL)
+		failure("realloc");
+	current_stack->stack[current_stack->sp] = calloc(1, sizeof(struct include_entry));
+	if (current_stack->stack[current_stack->sp] == NULL)
+		failure("calloc");
+	current_stack->stack[current_stack->sp]->lineno = lineno;
+	lineno = 1;
+	current_stack->stack[current_stack->sp]->file = yyin;
+	current_stack->stack[current_stack->sp]->name = current_acl_file;
+	current_stack->stack[current_stack->sp]->buffer = YY_CURRENT_BUFFER;
+	current_stack->stack[current_stack->sp]->parent = current_stack;
+
+	if (!stat(includename, &fstat)) {
+		if (S_ISDIR(fstat.st_mode)) {
+			struct dirent **namelist;
+			struct include_entry *last = current_stack->stack[current_stack->sp];
+			struct include_entry *tmp;
+			char *path;
+			int n;
+
+			n = scandir(includename, &namelist, 0, alphasort);
+			if (n >= 3) {
+				while (n--) {
+					if (!strcmp(namelist[n]->d_name, ".") || !strcmp(namelist[n]->d_name, ".."))
+						continue;
+					tmp = calloc(1, sizeof(struct include_entry));
+					if (tmp == NULL)
+						failure("calloc");
+					
+					path = calloc(1, strlen(includename) + strlen(namelist[n]->d_name) + 2);
+					if (path == NULL)
+						failure("calloc");
+
+					sprintf(path, "%s/%s", includename, namelist[n]->d_name);
+
+					tmp->name = path;
+					tmp->lineno = 1;
+					tmp->parent = current_stack;
+
+					last->next = tmp;
+					tmp->prev = last;
+					last = tmp;
+				}
+				change_current_acl_file(tmp->name);
+				tmpfile = fopen(tmp->name, "r");
+
+				if (!tmpfile) {
+					fprintf(stderr, "Unable to open included file: %s\n", tmp->name);
+					exit(EXIT_FAILURE);
+				}
+
+				yyin = tmpfile;
+				current_stack = tmp;
+				yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE));
+				return;
+			}
+			return;
+		}
+	}
+	tmpfile = fopen(includename, "r");
+
+	if (!tmpfile) {
+		fprintf(stderr, "Unable to open included file: %s\n",
+			includename);
+		exit(EXIT_FAILURE);
+	}
+
+	change_current_acl_file(includename);
+	current_stack->sp++;
+	yyin = tmpfile;
+	yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE));
+
+	return;
+}
+
+int is_eof(void)
+{
+	if (current_stack->sp)
+		fclose(yyin);
+	current_stack->sp--;
+	if (current_stack->sp < 0) {
+		if (!current_stack->prev || !current_stack->prev->prev) {
+			if (current_stack->parent == NULL || current_stack->parent->name == NULL) {
+				current_stack->sp = 0;
+				lineno = 1;
+				return 1;
+			} else {
+				current_stack = current_stack->parent;
+				goto regular;
+			}
+		} else {
+			current_stack = current_stack->prev;
+			lineno = 1;
+			change_current_acl_file(current_stack->name);
+			yy_delete_buffer(YY_CURRENT_BUFFER);
+			yyin = fopen(current_stack->name, "r");
+			if (yyin == NULL) {
+				fprintf(stderr, "Unable to open included file: %s\n", current_stack->name);
+				exit(EXIT_FAILURE);
+			}
+			yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE));
+			return 0;
+		}
+	}
+
+regular:
+	change_current_acl_file(current_stack->stack[current_stack->sp]->name);
+	yy_delete_buffer(YY_CURRENT_BUFFER);
+	lineno = current_stack->stack[current_stack->sp]->lineno;
+	yyin = current_stack->stack[current_stack->sp]->file;
+	yy_switch_to_buffer(current_stack->stack[current_stack->sp]->buffer);
+
+	return 0;
+}
+
+int gradmwrap(void)
+{
+	return 1;
+}
+
+int gradmerror(char *s)
+{
+	fflush(stderr);  
+	fprintf(stderr, "\"%s\" caused a %s on line %lu of %s\n", yytext, s,
+		lineno, current_acl_file);
+	exit(EXIT_FAILURE);
+}
+
+void no_coredump(void)
+{
+	struct rlimit rlim;
+
+	rlim.rlim_cur = 0;
+	rlim.rlim_max = 0;
+
+	setrlimit(RLIMIT_CORE, &rlim);
+
+	return;
+}
+
+#ifdef GRADM_DEBUG
+void show_policy(void) {
+	struct file_acl *filp;
+	struct proc_acl *proc;
+	struct role_acl *rolp;
+	struct role_transition *rolet;
+	extern struct rlimconv rlim_table[];
+	int i;
+
+	for (rolp = current_role;rolp;rolp=rolp->prev) {
+	printf("ROLE: %s type:%s uid/gid:%u\n", rolp->rolename,
+		rolp->roletype & GR_ROLE_SPECIAL ? "special" :
+		rolp->roletype & GR_ROLE_USER ? "user" :
+		rolp->roletype & GR_ROLE_GROUP ? "group" :
+		rolp->roletype & GR_ROLE_DEFAULT ? "default" : "",
+		rolp->uidgid);
+	printf("\tTRANSITIONS:");
+	for (rolet = rolp->transitions; rolet; rolet=rolet->prev)
+		printf(" %s", rolet->rolename);
+	printf("\n");
+	for (proc = rolp->hash->first;proc;proc=proc->prev) {
+		printf("\tSUBJECT: %s dev:%d inode:%lu mode:%d c_raise:%x c_drop:%x\n",
+			proc->filename, proc->dev, proc->inode, proc->mode, ~proc->cap_drop,
+			proc->cap_drop);
+		if (!proc->ips)
+			printf("\t\tNo socket restrictions\n");
+		for (filp = proc->hash->first;filp;filp=filp->prev)
+                        printf("\t\tOBJECT: %s dev:%d inode:%lu mode:%d\n", filp->filename, filp->dev, filp->inode, filp->mode);
+		for (i=0;i<GR_NLIMITS;i++)
+			if (proc->resmask & (1 << i))
+				printf("\t\t%s: soft: %lu hard: %lu\n", rlim_table[i].name, proc->res[i].rlim_cur, proc->res[i].rlim_max);
+	}
+	}
+}
+#endif
+
+int main(int argc, char *argv[])
+{
+	if (geteuid() != getuid()) {
+		fprintf(stderr, "gradm is not meant to run suid root.\n");
+		exit(EXIT_FAILURE);
+	}
+
+	special_role_uid = 0;
+	
+	no_coredump();
+
+	current_stack = &include_stack;
+	memset(current_stack, 0, sizeof(struct include_entry));
+
+	init_variables();
+
+	parse_args(argc, argv);
+
+#ifdef GRADM_DEBUG
+	show_policy();
+#endif
+	return 0;
+}
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm.y linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm.y
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm.y	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm.y	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,356 @@
+%{
+#include "gradm.h"
+
+extern int gradmlex(void);
+
+struct ip_acl ip;
+struct var_object *var_obj = NULL;
+char *nested[MAX_NEST_DEPTH];
+int current_nest_depth = 0;
+%}
+
+%union {
+	char *string;
+	__u32 long_int;
+	__u16 mode;
+	struct var_object * var;
+}
+
+%token <string> ROLE ROLE_NAME ROLE_TYPE SUBJECT SUBJ_NAME OBJ_NAME 
+%token <string> RES_NAME RES_SOFTHARD CONNECT BIND IPADDR IPPORT IPTYPE
+%token <string> IPPROTO OBJ_MODE SUBJ_MODE IPNETMASK CAP_NAME ROLE_ALLOW_IP
+%token <string> ROLE_TRANSITION VARIABLE DEFINE DEFINE_NAME DISABLED
+%token <string> ID_NAME USER_TRANS_ALLOW GROUP_TRANS_ALLOW 
+%token <string> USER_TRANS_DENY GROUP_TRANS_DENY DOMAIN_TYPE DOMAIN
+%type <long_int> subj_mode obj_mode ip_netmask
+%type <mode> role_type
+%type <var> variable_expression
+%left '&'
+%left '|'
+%left '-'
+
+%%
+
+compiled_acl:			various_acls
+	|			compiled_acl various_acls
+	;
+
+various_acls:			role_label
+	|			domain_label
+	|			role_allow_ip
+	|			role_transitions
+	|			subject_label
+	|			user_allow_label
+	|			user_deny_label
+	|			group_allow_label
+	|			group_deny_label
+	|			variable_object
+	|			variable_expression
+				{
+					interpret_variable($1);
+				}
+	|			nested_label
+	|			object_file_label
+	|			object_cap_label
+	|			object_res_label
+	|			object_connect_ip_label
+	|			object_bind_ip_label
+	;
+
+variable_expression:		VARIABLE
+				{
+					$$ = sym_retrieve($1);
+					if (!$$) {
+						fprintf(stderr, "Variable \"%s\" not defined on line %lu of %s.\n", $1, lineno, current_acl_file);
+						exit(EXIT_FAILURE);
+					}
+				}
+	|			variable_expression '|' variable_expression
+				{
+					$$ = union_objects($1, $3);
+				}
+	|			variable_expression '&' variable_expression
+				{
+					$$ = intersect_objects($1, $3);
+				}
+	|			variable_expression '-' variable_expression
+				{
+					$$ = differentiate_objects($1, $3);
+				}
+	|			'(' variable_expression ')'
+				{
+					$$ = $2;
+				}
+	;
+
+variable_object:		DEFINE DEFINE_NAME '{' var_object_list '}'
+				{
+				  if (sym_retrieve($1)) {
+					fprintf(stderr, "Duplicate variable \"%s\" defined on line %lu of %s.\n", $1, lineno, current_acl_file);
+					exit(EXIT_FAILURE);
+				  }
+				  sym_store($2, var_obj);
+				  var_obj = NULL;
+				}
+	;
+
+var_object_list:		OBJ_NAME obj_mode
+				{
+				  add_var_object(&var_obj, $1, $2);
+				}
+	|			var_object_list OBJ_NAME obj_mode
+				{
+				  add_var_object(&var_obj, $2, $3);
+				}
+	;
+
+domain_label:			DOMAIN ROLE_NAME DOMAIN_TYPE 
+				{
+				 if (!add_role_acl(&current_role, $2, GR_ROLE_DOMAIN | role_mode_conv($3), 1))
+					exit(EXIT_FAILURE);
+				}
+				domain_user_list
+	;
+
+domain_user_list:		ROLE_NAME
+				{
+					add_domain_child(current_role, $1);
+				}
+	|			domain_user_list ROLE_NAME
+				{
+					add_domain_child(current_role, $2);
+				}
+	;
+
+role_label: 			ROLE ROLE_NAME role_type
+				{
+				 if (!add_role_acl(&current_role, $2, $3, 0))
+					exit(EXIT_FAILURE);
+				}
+	;
+
+role_type: /* empty */
+				{ $$ = role_mode_conv(""); }
+	|			ROLE_TYPE
+				{ $$ = role_mode_conv($1); }
+	;
+
+subject_label:			SUBJECT SUBJ_NAME subj_mode
+				{
+				 if (current_role && current_role->roletype & GR_ROLE_LEARN) {
+					fprintf(stderr, "Error on line %lu of %s.\n"
+							"Subjects are not allowed for a role with learning enabled, as "
+							"they are generated by the learning mode.\n"
+							"The RBAC system will not load until you correct this error.\n\n",
+							lineno, current_acl_file);
+					exit(EXIT_FAILURE);
+				 }
+
+				 if (!add_proc_subject_acl(current_role, $2, $3, 0))
+					exit(EXIT_FAILURE);
+				}
+	;
+
+nested_label:			SUBJECT SUBJ_NAME nested_subjs subj_mode
+				{
+					add_proc_nested_acl(current_role, $2, nested, current_nest_depth, $4);
+					current_nest_depth = 0;
+				}
+	;
+
+nested_subjs:			':' SUBJ_NAME
+				{
+					nested[current_nest_depth] = $2;
+					current_nest_depth++;
+				}
+	|
+				nested_subjs ':' SUBJ_NAME
+				{
+					if (current_nest_depth >= MAX_NEST_DEPTH) {
+						fprintf(stderr, "Nesting too deep (over %d) on line %lu of %s.\n", MAX_NEST_DEPTH,
+								lineno, current_acl_file);
+						exit(EXIT_FAILURE);
+					}
+					nested[current_nest_depth] = $3;
+					current_nest_depth++;
+				}
+	;
+
+user_allow_ids:			ID_NAME
+				{
+					add_id_transition(current_subject, $1, GR_ID_USER, GR_ID_ALLOW);
+				}
+	|
+				user_allow_ids ID_NAME
+				{
+					add_id_transition(current_subject, $2, GR_ID_USER, GR_ID_ALLOW);
+				}
+	;
+user_allow_label:		USER_TRANS_ALLOW user_allow_ids
+				{
+				}
+	;
+
+user_deny_ids:			ID_NAME
+				{
+					add_id_transition(current_subject, $1, GR_ID_USER, GR_ID_DENY);
+				}
+	|
+				user_deny_ids ID_NAME
+				{
+					add_id_transition(current_subject, $2, GR_ID_USER, GR_ID_DENY);
+				}
+	;
+user_deny_label:		USER_TRANS_DENY user_deny_ids
+				{
+				}
+	;
+
+group_allow_ids:		ID_NAME
+				{
+					add_id_transition(current_subject, $1, GR_ID_GROUP, GR_ID_ALLOW);
+				}
+	|
+				group_allow_ids ID_NAME
+				{
+					add_id_transition(current_subject, $2, GR_ID_GROUP, GR_ID_ALLOW);
+				}
+	;
+group_allow_label:		GROUP_TRANS_ALLOW group_allow_ids
+				{
+				}
+	;
+
+group_deny_ids:			ID_NAME
+				{
+					add_id_transition(current_subject, $1, GR_ID_GROUP, GR_ID_DENY);
+				}
+	|
+				group_deny_ids ID_NAME
+				{
+					add_id_transition(current_subject, $2, GR_ID_GROUP, GR_ID_DENY);
+				}
+	;
+group_deny_label:		GROUP_TRANS_DENY group_deny_ids
+				{
+				}
+	;
+
+object_file_label:		OBJ_NAME obj_mode
+				{
+				 if (!add_proc_object_acl(current_subject, $1, $2, GR_FEXIST))
+					exit(EXIT_FAILURE);
+				}
+	;
+
+object_cap_label:		CAP_NAME
+				{
+				 add_cap_acl(current_subject, $1);
+				}
+	;
+
+object_res_label:		RES_NAME RES_SOFTHARD RES_SOFTHARD
+				{
+				 add_res_acl(current_subject, $1, $2, $3);
+				}
+	;
+
+subj_mode: /* empty */
+				{ $$ = proc_subject_mode_conv(""); }
+	|			SUBJ_MODE
+				{ $$ = proc_subject_mode_conv($1); }
+	;
+
+obj_mode: /* empty */
+				{ $$ = proc_object_mode_conv(""); }
+	|			OBJ_MODE
+				{ $$ = proc_object_mode_conv($1); }
+	;
+
+role_transitions:		ROLE_TRANSITION role_names
+				{
+				}
+	;
+
+role_names:			ROLE_NAME
+				{
+					add_role_transition(current_role, $1);
+				}
+	|			role_names ROLE_NAME
+				{
+					add_role_transition(current_role, $2);
+				}
+	;
+
+role_allow_ip:			ROLE_ALLOW_IP IPADDR ip_netmask
+				{
+					add_role_allowed_ip(current_role, get_ip($2), $3);
+				}
+	;
+
+object_connect_ip_label:	CONNECT IPADDR ip_netmask ip_ports ip_typeproto
+				{
+				 ip.addr = get_ip($2);
+				 ip.netmask = $3;
+				 add_ip_acl(current_subject, GR_IP_CONNECT, &ip);
+				 memset(&ip, 0, sizeof(ip));
+				}
+	|
+				CONNECT DISABLED
+				{
+				 add_ip_acl(current_subject, GR_IP_CONNECT, &ip);
+				}
+	;
+
+object_bind_ip_label:		BIND IPADDR ip_netmask ip_ports ip_typeproto
+				{
+				 ip.addr = get_ip($2);
+				 ip.netmask = $3;
+				 add_ip_acl(current_subject, GR_IP_BIND, &ip);
+				 memset(&ip, 0, sizeof(ip));
+				}
+	|
+				BIND DISABLED
+				{
+				 add_ip_acl(current_subject, GR_IP_BIND, &ip);
+				}
+	;
+
+ip_netmask: /* emtpy */
+				{ $$ = 0xffffffff; }
+	|			'/' IPNETMASK
+				{
+				  unsigned int bits = atoi($2);
+
+				  if (!bits)
+					$$ = 0UL;
+				  else
+					$$ = 0xffffffff << (32 - bits);
+				}
+	;
+
+ip_ports: /* emtpy */
+				{
+				 ip.low = 0;
+				 ip.high = 65535;
+				}
+	|			':' IPPORT
+				{
+				 ip.low = ip.high = atoi($2);
+				}
+	|			':' IPPORT '-' IPPORT
+				{
+				 ip.low = atoi($2);
+				 ip.high = atoi($4);
+				}
+	;
+
+ip_typeproto:			IPPROTO
+				{ conv_name_to_type(&ip, $1); }
+	|			IPTYPE
+				{ conv_name_to_type(&ip, $1); }
+	| 			ip_typeproto IPPROTO
+				{ conv_name_to_type(&ip, $2); }
+	|			ip_typeproto IPTYPE
+				{ conv_name_to_type(&ip, $2); }
+	;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm2.8 linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm2.8
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm2.8	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm2.8	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,136 @@
+.TH GRADM2 8 
+.SH NAME
+gradm2 \- Administration program for the grsecurity RBAC system
+.SH SYNOPSIS
+.B gradm2
+[
+.B \-E 
+]
+[
+.B \-R
+]
+[
+.B \-F
+]
+[
+.B \-L <logfile>
+]
+[
+.B \-O <filename|stream>
+]
+[
+.B \-M
+<filename|uid>
+]
+[
+.B \-D 
+]
+[
+.B \-P [rolename]
+]
+[
+.B \-a <rolename>
+]
+[
+.B \-n <rolename>
+]
+[
+.B \-u
+]
+[
+.B \-h 
+]
+[
+.B \-v
+]
+
+.SH DESCRIPTION
+
+.I gradm2
+is the userspace ACL parsing and authentication program for the
+.I grsecurity
+Access Control List System.
+
+grsecurity aims to be a complete security system for Linux 2.4.  gradm2 
+performs several tasks for the RBAC system including authenticated via a 
+password to the kernel and parsing rules to be passed to the kernel.
+
+.SH OPTIONS
+.TP
+
+All options to gradm2 are mutually exclusive, except for -L and -O.
+.TP
+.B \-E
+Enable the RBAC system
+.TP
+
+.B \-R
+Reload the RBAC system (only valid while in admin mode)
+.TP
+
+.B \-F
+Toggle full learning mode.
+If used only with -L, it enables the RBAC system in full learning
+mode.
+If used with -L and -O, it parses the full learning logs and
+generates a complete ruleset.
+.TP
+
+.B \-M <filename|uid>
+Remove an execution ban on a given uid or filename that has been
+put in place by the RES_CRASH resource restriction of the RBAC system.
+.TP
+
+.B \-L <logfile>
+Parses the learning logs.  Accepts an argument which
+specifies the logfile to scan for the learning logs.
+This option can be used with -E, -O, or -F.
+.TP
+
+.B \-O <filename|stream>
+Specifies output mode.  Requires a single argument that can be
+"stdout", "stderr", or a regular file.  Only used with -L or -F.
+.TP
+
+.B \-D
+Disable the RBAC system
+.TP
+
+.B \-P [rolename]
+Without an argument, it sets the password for administering
+the RBAC system.  With a role name as an argument, it sets
+the password for that given special role.
+.TP
+
+.B \-a <rolename>
+Authenticate to a special role that requires a password.
+.TP
+
+.B \-n <rolename>
+Authenticate to a special role that does not require a password.
+.TP
+
+.B \-u
+Removes yourself from your current special role, reverting back
+to the normal role selection.  To be used, for instance, for logging
+out of an admin role without exiting your shell.
+
+.B \-h
+Display help information
+.TP
+
+.B \-v
+Print version information and exit
+.TP
+
+.BR
+
+.SH REPORTING BUGS
+Please include as much information as possible(using any available debugging 
+options) and send bug reports for gradm2 or the grsecurity RBAC system 
+to 
+.B dev@grsecurity.net.
+
+.SH AUTHOR
+.B grsecurity and gradm2
+were created and are maintained by Brad Spengler <spender@grsecurity.net>
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_adm.c linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_adm.c
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_adm.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_adm.c	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,256 @@
+#include "gradm.h"
+
+int
+is_valid_elf_binary(const char *filename)
+{
+	Elf32_Ehdr header_elf;
+	Elf64_Ehdr header_elf64;
+	int fd;
+
+	if ((fd = open(filename, O_RDONLY)) < 0)
+		return 0;
+
+	if ((read(fd, &header_elf64, sizeof (header_elf64)) != sizeof (header_elf64)))
+		goto failure;
+
+	memcpy(&header_elf, &header_elf64, sizeof(header_elf));
+
+	/* binary is 32bit */
+	if (header_elf.e_ident[EI_CLASS] == 1) {
+		if (strncmp(header_elf.e_ident, ELFMAG, SELFMAG))
+			goto failure;
+
+		if (header_elf.e_type != ET_EXEC && header_elf.e_type != ET_DYN)
+			goto failure;
+	/* binary is 64bit */
+	} else if (header_elf64.e_ident[EI_CLASS] == 2) {
+		if (strncmp(header_elf64.e_ident, ELFMAG, SELFMAG))
+			goto failure;
+
+		if (header_elf64.e_type != ET_EXEC && header_elf64.e_type != ET_DYN)
+			goto failure;
+
+	} else
+		goto failure;
+
+	close(fd);
+	return 1;
+      failure:
+	close(fd);
+	return 0;
+}
+
+static void
+find_gradm_path(char *gradm_realpath)
+{
+	char gradm_procpath[21] = { 0 };
+
+	snprintf(gradm_procpath, sizeof (gradm_procpath),
+		 "/proc/%d/exe", getpid());
+
+	if (readlink(gradm_procpath, gradm_realpath, PATH_MAX - 1) < 0)
+		failure("readlink");
+
+	return;
+}
+
+void
+add_gradm_acl(struct role_acl *role)
+{
+	struct stat fstat;
+	char gradm_realpath[PATH_MAX] = { 0 };
+	char *gradm_name;
+	struct ip_acl ip;
+
+	find_gradm_path(gradm_realpath);
+
+	gradm_name = strdup(gradm_realpath);
+
+	if (!add_proc_subject_acl(role, gradm_name,
+				  proc_subject_mode_conv("do"), 0))
+		exit(EXIT_FAILURE);
+
+	if (!stat(GRDEV_PATH, &fstat)) {
+		if (!add_proc_object_acl(current_subject, GRDEV_PATH,
+					 proc_object_mode_conv("w"), GR_FEXIST))
+			exit(EXIT_FAILURE);
+	} else {
+		fprintf(stderr, "%s does not "
+			"exist.  Please recompile your kernel with "
+			"grsecurity and install a newer version of gradm.\n",
+			GRDEV_PATH);
+		exit(EXIT_FAILURE);
+	}
+
+	memset(&ip, 0, sizeof (ip));
+	add_ip_acl(current_subject, GR_IP_CONNECT, &ip);
+	add_ip_acl(current_subject, GR_IP_BIND, &ip);
+
+	if (!add_proc_object_acl(current_subject, "/",
+				 proc_object_mode_conv("h"), GR_FEXIST))
+		exit(EXIT_FAILURE);
+
+	if (!add_proc_object_acl(current_subject, "/etc/ld.so.cache",
+				 proc_object_mode_conv("r"), GR_FEXIST))
+		exit(EXIT_FAILURE);
+
+	if (!add_proc_object_acl(current_subject, "/etc/ld.so.preload",
+				 proc_object_mode_conv("r"), GR_FEXIST))
+		exit(EXIT_FAILURE);
+
+	if (!add_proc_object_acl(current_subject, "/dev/urandom",
+				 proc_object_mode_conv("r"), GR_FEXIST))
+		exit(EXIT_FAILURE);
+
+	if (!add_proc_object_acl(current_subject, "/lib",
+				 proc_object_mode_conv("rx"), GR_FEXIST))
+		exit(EXIT_FAILURE);
+
+	if (!add_proc_object_acl(current_subject, "/usr/lib",
+				 proc_object_mode_conv("rx"), GR_FEXIST))
+		exit(EXIT_FAILURE);
+
+	if (!add_proc_object_acl(current_subject, "/lib64",
+				 proc_object_mode_conv("rx"), GR_FEXIST))
+		exit(EXIT_FAILURE);
+
+	if (!add_proc_object_acl(current_subject, "/usr/lib64",
+				 proc_object_mode_conv("rx"), GR_FEXIST))
+		exit(EXIT_FAILURE);
+
+	if (!add_proc_object_acl(current_subject, gradm_name,
+				 proc_object_mode_conv("x"), GR_FEXIST))
+		exit(EXIT_FAILURE);
+	add_cap_acl(current_subject, "-CAP_ALL");
+	add_cap_acl(current_subject, "+CAP_IPC_LOCK");
+
+	return;
+}
+
+void
+add_kernel_acl(void)
+{
+	if (!add_role_acl
+	    (&current_role, strdup(":::kernel:::"), role_mode_conv("sN"), 1))
+		exit(EXIT_FAILURE);
+	if (!add_proc_subject_acl
+	    (current_role, "/", proc_subject_mode_conv("o"), 0))
+		exit(EXIT_FAILURE);
+	if (!add_proc_object_acl
+	    (current_subject, "/", proc_object_mode_conv("rx"), GR_FEXIST))
+		exit(EXIT_FAILURE);
+	if (!add_proc_object_acl
+	    (current_subject, "/dev/tty", proc_object_mode_conv("rw"), GR_FEXIST))
+		exit(EXIT_FAILURE);
+	if (!add_proc_object_acl
+	    (current_subject, "/dev/null", proc_object_mode_conv("rw"), GR_FEXIST))
+		exit(EXIT_FAILURE);
+	if (!add_proc_object_acl
+	    (current_subject, "/etc/grsec", proc_object_mode_conv("h"),
+	     GR_FEXIST))
+		exit(EXIT_FAILURE);
+
+	return;
+}
+
+void
+add_grlearn_acl(struct role_acl *role)
+{
+	struct stat fstat;
+	struct ip_acl ip;
+
+	if (stat(GRLEARN_PATH, &fstat)) {
+		fprintf(stderr, "%s does not exist.  Please reinstall gradm.\n", GRLEARN_PATH);
+		exit(EXIT_FAILURE);
+	}
+
+	if (!add_proc_subject_acl(role, GRLEARN_PATH,
+				  proc_subject_mode_conv("hpdo"), 0))
+		exit(EXIT_FAILURE);
+
+	memset(&ip, 0, sizeof (ip));
+	add_ip_acl(current_subject, GR_IP_CONNECT, &ip);
+	add_ip_acl(current_subject, GR_IP_BIND, &ip);
+
+	if (!add_proc_object_acl(current_subject, "/",
+				 proc_object_mode_conv("h"), GR_FEXIST))
+		exit(EXIT_FAILURE);
+
+	if (!add_proc_object_acl(current_subject, GRLEARN_PATH,
+				 proc_object_mode_conv("x"), GR_FEXIST))
+		exit(EXIT_FAILURE);
+	add_cap_acl(current_subject, "-CAP_ALL");
+
+	return;
+}
+
+void add_fulllearn_acl(void)
+{
+	struct ip_acl ip;
+
+	if (!add_role_acl
+	    (&current_role, strdup("default"), role_mode_conv("A"), 0))
+		exit(EXIT_FAILURE);
+	if (!add_proc_subject_acl
+	    (current_role, "/", proc_subject_mode_conv("ol"), 0))
+		exit(EXIT_FAILURE);
+	if (!add_proc_object_acl
+	    (current_subject, "/", proc_object_mode_conv("h"), GR_FEXIST))
+		exit(EXIT_FAILURE);
+	add_cap_acl(current_subject, "-CAP_ALL");
+
+	memset(&ip, 0, sizeof (ip));
+	add_ip_acl(current_subject, GR_IP_CONNECT, &ip);
+	add_ip_acl(current_subject, GR_IP_BIND, &ip);
+	add_gradm_acl(current_role);
+	add_kernel_acl();
+	expand_acls();
+	return;
+}
+
+void add_rolelearn_acl(void)
+{
+	struct ip_acl ip;
+
+	if (!add_proc_subject_acl
+	    (current_role, "/", proc_subject_mode_conv("ol"), 0))
+		exit(EXIT_FAILURE);
+	if (!add_proc_object_acl
+	    (current_subject, "/", proc_object_mode_conv("h"), GR_FEXIST))
+		exit(EXIT_FAILURE);
+	add_cap_acl(current_subject, "-CAP_ALL");
+
+	memset(&ip, 0, sizeof (ip));
+	add_ip_acl(current_subject, GR_IP_CONNECT, &ip);
+	add_ip_acl(current_subject, GR_IP_BIND, &ip);
+
+	return;
+}
+
+void start_grlearn(char *logfile)
+{
+	pid_t pid;
+
+	pid = fork();
+
+	if (!pid) {
+		execl(GRLEARN_PATH, GRLEARN_PATH, logfile, NULL);
+	} else if (pid > 0) {
+		wait(NULL);
+	}
+
+	return;
+}
+
+void stop_grlearn(void)
+{
+	pid_t pid;
+
+	pid = fork();
+
+	if (!pid) {
+		execl(GRLEARN_PATH, GRLEARN_PATH, "-stop", NULL);
+	}
+
+	return;
+}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_analyze.c linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_analyze.c
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_analyze.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_analyze.c	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,564 @@
+#include "gradm.h"
+
+static int
+check_permission(struct role_acl *role, struct proc_acl *def_acl,
+		 const char *filename, struct chk_perm *chk)
+{
+	struct file_acl *tmpf = NULL;
+	struct proc_acl *tmpp = def_acl;
+	struct file_acl *tmpg = NULL;
+	char *tmpname;
+	__u32 cap_drop = 0, cap_mask = 0;
+
+	if (chk->type == CHK_FILE) {
+		tmpname = alloca(strlen(filename) + 1);
+		strcpy(tmpname, filename);
+
+		do {
+			tmpp = def_acl;
+			do {
+				tmpf = lookup_acl_object_by_name(tmpp, tmpname);
+				if (tmpf) {
+					/* check globbed objects */
+					for_each_globbed(tmpg, tmpf) {
+						if (!fnmatch(tmpg->filename, filename, 0)) {
+							if (((chk->w_modes == 0xffff)
+							     || (tmpg->mode & chk->w_modes))
+							    && ((chk->u_modes == 0xffff)
+								|| !(tmpg->mode & chk->u_modes))) {
+								return 1;
+							} else {
+								return 0;
+							}
+						}
+					}
+					if (((chk->w_modes == 0xffff)
+					     || (tmpf->mode & chk->w_modes))
+					    && ((chk->u_modes == 0xffff)
+						|| !(tmpf->mode & chk->u_modes))) {
+						return 1;
+					} else {
+						return 0;
+					}
+				}
+			} while ((tmpp = tmpp->parent_subject));
+		} while (parent_dir(filename, &tmpname));
+	} else if (chk->type == CHK_CAP) {
+		cap_mask = tmpp->cap_mask;
+		cap_drop = tmpp->cap_drop;
+
+		while ((tmpp = tmpp->parent_subject)) {
+			cap_drop |= tmpp->cap_drop & (tmpp->cap_mask & ~cap_mask);
+			cap_mask |= tmpp->cap_mask;
+		}
+
+		if (((chk->w_caps == 0xffffffff)
+		     || !(cap_drop & chk->w_caps))
+		    && ((chk->u_caps == 0xffffffff)
+			|| (cap_drop & chk->u_caps)))
+			return 1;
+	}
+
+	return 0;
+}
+
+static int
+check_subjects(struct role_acl *role)
+{
+	struct proc_acl *tmp;
+	struct proc_acl *def_acl;
+	struct chk_perm chk;
+	unsigned int errs_found = 0;
+
+	chk.type = CHK_FILE;
+	chk.u_modes = GR_WRITE;
+	chk.w_modes = 0xffff;
+
+	def_acl = role->root_label;
+	if (!def_acl)
+		return 0;
+
+	for_each_subject(tmp, role)
+	    if ((tmp->filename[0] == '/') && (tmp->filename[1] != '\0'))
+		if (!check_permission(role, def_acl, tmp->filename, &chk))
+			fprintf(stderr,
+				"Warning: write access is allowed to your "
+				"subject for %s in role %s.  Please ensure that the subject is running with less privilege than the default subject.\n",
+				tmp->filename, role->rolename);
+
+	return errs_found;
+}
+
+static void
+check_default_objects(struct role_acl *role)
+{
+	struct proc_acl *tmp;
+	struct file_acl *tmpf;
+
+	for_each_subject(tmp, role) {
+		/* skip all inherited subjects */
+		if (tmp->parent_subject != NULL)
+			continue;
+		tmpf = lookup_acl_object_by_name(tmp, "/");
+		if (tmpf == NULL) {
+			fprintf(stderr, "Default object not found for "
+				"role %s subject %s\nThe RBAC system will "
+				"not load until you correct this "
+				"error.\n", role->rolename, tmp->filename);
+			exit(EXIT_FAILURE);
+		}
+	}
+
+	return;
+}
+
+static int
+check_lilo_conf(struct role_acl *role, struct proc_acl *def_acl)
+{
+	FILE *liloconf;
+	char buf[PATH_MAX];
+	struct stat fstat;
+	struct chk_perm chk;
+	unsigned int errs_found = 0;
+	char *p;
+
+	if ((liloconf = fopen("/etc/lilo.conf", "r")) == NULL)
+		return 0;
+
+	chk.type = CHK_FILE;
+	chk.u_modes = GR_WRITE;
+	chk.w_modes = 0xffff;
+
+	while (fgets(buf, PATH_MAX - 1, liloconf)) {
+		if (buf[strlen(buf) - 1] == '\n')
+			buf[strlen(buf) - 1] = '\0';
+		if ((p = strstr(buf, "image="))) {
+			p += 6;
+			if (!stat(p, &fstat)
+			    && !check_permission(role, def_acl, p, &chk)) {
+				fprintf(stderr,
+					"Write access is allowed by role %s to %s, a kernel "
+					"for your system specified in "
+					"/etc/lilo.conf.\n\n", role->rolename,
+					p);
+				errs_found++;
+			}
+		}
+	}
+
+	fclose(liloconf);
+
+	return errs_found;
+}
+
+static int
+check_lib_paths(struct role_acl *role, struct proc_acl *def_acl)
+{
+	FILE *ldconf;
+	char buf[PATH_MAX];
+	struct stat fstat;
+	struct chk_perm chk;
+	unsigned int errs_found = 0;
+
+	if ((ldconf = fopen("/etc/ld.so.conf", "r")) == NULL)
+		return 0;
+
+	chk.type = CHK_FILE;
+	chk.u_modes = GR_WRITE;
+	chk.w_modes = 0xffff;
+
+	while (fgets(buf, PATH_MAX - 1, ldconf)) {
+		if (buf[strlen(buf) - 1] == '\n')
+			buf[strlen(buf) - 1] = '\0';
+
+		if (!stat(buf, &fstat)
+		    && !check_permission(role, def_acl, buf, &chk)) {
+			fprintf(stderr,
+				"Write access is allowed by role %s to %s, a directory which "
+				"holds libraries for your system and is included "
+				"in /etc/ld.so.conf.\n\n", role->rolename, buf);
+			errs_found++;
+		}
+	}
+
+	fclose(ldconf);
+
+	return errs_found;
+}
+
+static int
+check_path_env(struct role_acl *role, struct proc_acl *def_acl)
+{
+	char *pathstr, *p, *p2;
+	struct stat fstat;
+	struct chk_perm chk;
+	unsigned int errs_found = 0;
+
+	if ((pathstr = getenv("PATH")) == NULL)
+		return 0;
+
+	p = pathstr;
+
+	chk.type = CHK_FILE;
+	chk.u_modes = GR_WRITE;
+	chk.w_modes = 0xffff;
+
+	while ((p2 = strchr(p, ':'))) {
+		*p2++ = '\0';
+		if (!stat(p, &fstat)
+		    && !check_permission(role, def_acl, p, &chk)) {
+			fprintf(stderr,
+				"Write access is allowed by role %s to %s, a directory which "
+				"holds binaries for your system and is included "
+				"in the PATH environment variable.\n\n",
+				role->rolename, p);
+			errs_found++;
+		}
+		p = p2;
+	}
+
+	if (!stat(p, &fstat) && !check_permission(role, def_acl, p, &chk)) {
+		fprintf(stderr,
+			"Write access is allowed by role %s to %s, a directory which "
+			"holds binaries for your system and is included "
+			"in the PATH environment variable.\n\n", role->rolename,
+			p);
+		errs_found++;
+	}
+
+	return errs_found;
+}
+
+static int
+handle_notrojan_mode(void)
+{
+	struct proc_acl *subj, *subj2;
+	struct file_acl *obj, *obj2;
+	struct role_acl *role, *role2;
+	char *objname;
+	int ret = 0;
+
+	for_each_role(role, current_role) {
+		for_each_subject(subj, role) {
+			if (!(subj->mode & GR_NOTROJAN))
+				continue;
+			for_each_object(obj, subj) {
+				if (!(obj->mode & GR_EXEC))
+					continue;
+				if ((objname =
+				     malloc(strlen(obj->filename) + 1)) == NULL)
+					failure("malloc");
+				strcpy(objname, obj->filename);
+				do {
+					for_each_role(role2, current_role) {
+						for_each_subject(subj2, role2) {
+							if (subj2 == subj
+							    || (subj2->
+								filename[0] !=
+								'/'))
+								continue;
+							obj2 = lookup_acl_object_by_name(subj2, objname);
+							if (obj2 && obj2->mode & GR_WRITE) {
+								ret++;
+								fprintf(stderr,
+								     "\'T\' specified in mode for %s."
+								     "  %s's executable object %s is "
+								     "writable by %s, due to its "
+								     "writable object %s.\nThis would "
+								     "allow %s to execute trojaned code.\n\n",
+								     subj->filename, subj->filename,
+								     obj->filename, subj2->filename,
+								     obj2->filename, subj->filename);
+								break;
+							}
+						}
+					}
+				} while (parent_dir(obj->filename, &objname));
+				free(objname);
+			}
+		}
+	}
+
+	return ret;
+}
+
+void
+check_role_transitions(void)
+{
+	struct role_acl *role, *role2;
+	struct role_transition *trans;
+	int found = 0;
+
+	for_each_role(role, current_role) {
+		for_each_transition(trans, role->transitions) {
+			found = 0;
+			for_each_role(role2, current_role) {
+				if (!(role2->roletype & GR_ROLE_SPECIAL))
+					continue;
+				if (!strcmp(role2->rolename, trans->rolename))
+					found = 1;
+			}
+			if (!found) {
+				fprintf(stderr,
+					"Error in transition to special role %s in role "
+					"%s.\nSpecial role %s does not exist.\n",
+					trans->rolename, role->rolename,
+					trans->rolename);
+				exit(EXIT_FAILURE);
+			}
+		}
+	}
+
+	return;
+}
+
+void
+analyze_acls(void)
+{
+	struct proc_acl *def_acl;
+	struct chk_perm chk;
+	unsigned int errs_found = 0;
+	struct role_acl *role;
+	int def_role_found = 0;
+
+	check_role_transitions();
+
+	for_each_role(role, current_role)
+		if (role->roletype & GR_ROLE_DEFAULT)
+			def_role_found = 1;
+
+	if (!def_role_found) {
+		fprintf(stderr, "There is no default role present in your "
+			"configuration.\nPlease read the RBAC "
+			"documentation and create a default role before "
+			"attempting to enable the RBAC system.\n\n");
+		exit(EXIT_FAILURE);
+	}
+
+	for_each_role(role, current_role) {
+		if (role->roletype & GR_ROLE_SPECIAL)
+			continue;
+
+		def_acl = role->root_label;
+		if (!def_acl) {
+			fprintf(stderr, "There is no default subject for "
+				"the role for %s present in your "
+				"configuration.\nPlease read the RBAC "
+				"documentation and create a default subject "
+				"before attempting to enable the RBAC "
+				"system.\n", role->rolename);
+			exit(EXIT_FAILURE);
+		}
+
+		check_default_objects(role);
+		errs_found += check_subjects(role);
+
+		chk.type = CHK_FILE;
+		chk.u_modes = GR_FIND;
+		chk.w_modes = 0xffff;
+
+		if (!check_permission(role, def_acl, GRDEV_PATH, &chk)) {
+			fprintf(stderr,
+				"Viewing access is allowed by role %s to %s.\n"
+				"If you want this role to be able to authenticate to the kernel, add G to its role mode.\n\n",
+				role->rolename, GRDEV_PATH);
+			errs_found++;
+		}
+
+		if (!check_permission(role, def_acl, GRSEC_DIR, &chk)) {
+			fprintf(stderr,
+				"Viewing access is allowed by role %s to %s, the directory which "
+				"stores RBAC policies and RBAC password information.\n\n",
+				role->rolename, GRSEC_DIR);
+			errs_found++;
+		}
+
+		if (!check_permission(role, def_acl, "/dev/kmem", &chk)) {
+			fprintf(stderr,
+				"Viewing access is allowed by role %s to /dev/kmem.  This could "
+				"allow an attacker to modify the code of your "
+				"running kernel.\n\n", role->rolename);
+			errs_found++;
+		}
+
+		if (!check_permission(role, def_acl, "/dev/mem", &chk)) {
+			fprintf(stderr,
+				"Viewing access is allowed by role %s to /dev/mem.  This would "
+				"allow an attacker to modify the code of programs "
+				"running on your system.\n\n", role->rolename);
+			errs_found++;
+		}
+
+		if (!check_permission(role, def_acl, "/dev/port", &chk)) {
+			fprintf(stderr,
+				"Viewing access is allowed by role %s to /dev/port.  This would "
+				"allow an attacker to modify the code of programs "
+				"running on your system.\n\n", role->rolename);
+			errs_found++;
+		}
+
+		if (!check_permission(role, def_acl, "/proc/kcore", &chk)) {
+			fprintf(stderr,
+				"Viewing access is allowed by role %s to /proc/kcore.  This would "
+				"allow an attacker to view the raw memory of processes "
+				"running on your system.\n\n", role->rolename);
+			errs_found++;
+		}
+
+		chk.u_modes = GR_WRITE;
+
+		if (!check_permission(role, def_acl, "/boot", &chk)) {
+			fprintf(stderr,
+				"Writing access is allowed by role %s to /boot, the directory which "
+				"holds boot and kernel information.\n\n",
+				role->rolename);
+			errs_found++;
+		}
+
+		if (!check_permission(role, def_acl, "/dev", &chk)) {
+			fprintf(stderr,
+				"Writing access is allowed by role %s to /dev, the directory which "
+				"holds system devices.\n\n", role->rolename);
+			errs_found++;
+		}
+
+		if (!check_permission(role, def_acl, "/dev/log", &chk)) {
+			fprintf(stderr,
+				"Writing access is allowed by role %s to /dev/log.  This could in some cases allow an attacker"
+				" to spoof syslog warnings on your system.\n\n",
+				role->rolename);
+			errs_found++;
+		}
+
+		if (!check_permission(role, def_acl, "/root", &chk)) {
+			fprintf(stderr,
+				"Writing access is allowed by role %s to /root, the directory which "
+				"holds shell configurations for the root user.  "
+				"If writing is allowed to this directory, an attacker "
+				"could modify your $PATH environment to fool you "
+				"into executing a trojaned gradm.\n\n",
+				role->rolename);
+			errs_found++;
+		}
+
+		if (!check_permission(role, def_acl, "/proc/sys", &chk)) {
+			fprintf(stderr,
+				"Write access is allowed by role %s to /proc/sys, the directory which "
+				"holds entries that allow modifying kernel variables.\n\n",
+				role->rolename);
+			errs_found++;
+		}
+
+		if (!check_permission(role, def_acl, "/etc", &chk)) {
+			fprintf(stderr,
+				"Write access is allowed by role %s to /etc, the directory which "
+				"holds initialization scripts and configuration files.\n\n",
+				role->rolename);
+			errs_found++;
+		}
+
+		if (!check_permission(role, def_acl, "/lib", &chk)) {
+			fprintf(stderr,
+				"Write access is allowed by role %s to /lib, a directory which "
+				"holds system libraries and loadable modules.\n\n",
+				role->rolename);
+			errs_found++;
+		}
+
+		if (!check_permission(role, def_acl, "/usr/lib", &chk)) {
+			fprintf(stderr,
+				"Write access is allowed by role %s to /usr/lib, a directory which "
+				"holds system libraries.\n\n", role->rolename);
+			errs_found++;
+		}
+
+		chk.u_modes = GR_READ;
+
+		if (!check_permission(role, def_acl, "/dev", &chk)) {
+			fprintf(stderr,
+				"Reading access is allowed by role %s to /dev, the directory which "
+				"holds system devices.\n\n", role->rolename);
+			errs_found++;
+		}
+
+		chk.type = CHK_CAP;
+		chk.u_caps =
+		    (1 << CAP_SYS_MODULE) | (1 << CAP_SYS_RAWIO) | (1 <<
+								    CAP_MKNOD);;
+		chk.w_caps = 0xffffffff;
+
+		if (!check_permission(role, def_acl, "", &chk)) {
+			fprintf(stderr,
+				"CAP_SYS_MODULE, CAP_SYS_RAWIO, and CAP_MKNOD are all not "
+				"removed in role %s.  This would allow an "
+				"attacker to modify the kernel by means of a "
+				"module or corrupt devices on your system.\n\n",
+				role->rolename);
+			errs_found++;
+		}
+
+		chk.u_caps = (1 << CAP_SYS_ADMIN);
+		chk.w_caps = 0xffffffff;
+
+		if (!check_permission(role, def_acl, "", &chk)) {
+			fprintf(stderr, "CAP_SYS_ADMIN is not "
+				"removed in role %s.  This would allow an "
+				"attacker to mount filesystems to bypass your policies\n\n",
+				role->rolename);
+			errs_found++;
+		}
+
+		chk.u_caps = (1 << CAP_NET_ADMIN);
+		chk.w_caps = 0xffffffff;
+
+		if (!check_permission(role, def_acl, "", &chk)) {
+			fprintf(stderr, "CAP_NET_ADMIN is not "
+				"removed for role %s.  This would allow an "
+				"attacker to modify your firewall configuration or redirect private information\n\n",
+				role->rolename);
+			errs_found++;
+		}
+
+		chk.u_caps = (1 << CAP_NET_BIND_SERVICE);
+		chk.w_caps = 0xffffffff;
+
+		if (!check_permission(role, def_acl, "", &chk)) {
+			fprintf(stderr, "CAP_NET_BIND_SERVICE is not "
+			        "removed for role %s.  This would allow an "
+			        "attacker (if he can kill a network daemon) to "
+			        "launch a trojaned daemon that could steal privileged information\n\n",
+				role->rolename);
+			errs_found++;
+		}
+
+		chk.u_caps = (1 << CAP_SYS_TTY_CONFIG);
+		chk.w_caps = 0xffffffff;
+
+		if (!check_permission(role, def_acl, "", &chk)) {
+			fprintf(stderr, "CAP_SYS_TTY_CONFIG is not "
+				"removed for role %s.  This would allow an "
+				"attacker to hijack terminals of "
+				"privileged processes\n\n",
+				role->rolename);
+			errs_found++;
+		}
+
+
+		errs_found += check_path_env(role, def_acl);
+		errs_found += check_lib_paths(role, def_acl);
+		errs_found += check_lilo_conf(role, def_acl);
+
+		errs_found += handle_notrojan_mode();
+
+		if (errs_found) {
+			printf("There were %d holes found in your RBAC "
+			       "configuration.  These must be fixed before the "
+			       "RBAC system will be allowed to be enabled.\n",
+			       errs_found);
+			exit(EXIT_FAILURE);
+		}
+
+	}
+
+	return;
+}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_arg.c linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_arg.c
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_arg.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_arg.c	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,316 @@
+#include "gradm.h"
+
+static void
+show_version(void)
+{
+	printf("gradm v%s\n"
+	       "Licensed under the GNU General Public License (GPL)\n"
+	       "Copyright 2002,2003  Brad Spengler\n", GR_VERSION);
+	exit(EXIT_SUCCESS);
+}
+
+static void
+show_help(void)
+{
+	printf("gradm %s\n"
+	       "grsecurity administration program\n\n"
+	       "Usage: gradm [option] ... \n\n"
+	       "Examples:\n"
+	       "	gradm -P\n"
+	       "	gradm -F -L /etc/grsec/learning.logs -O /etc/grsec/acl\n"
+	       "Options:\n"
+	       "	-E, --enable	Enable the grsecurity RBAC system\n"
+	       "	-D, --disable	Disable the grsecurity RBAC system\n"
+	       "	-S, --status	Check status of RBAC system\n"
+	       "	-F, --fulllearn Enable full system learning\n"
+	       "	-P [rolename], --passwd\n"
+	       "			Create password for RBAC administration\n"
+	       "			or a special role\n"
+	       "	-R, --reload	Reload the RBAC system while in admin mode\n"
+	       "	-L <filename>, --learn\n"
+	       "			Specify the pathname for learning logs\n"
+	       "	-O <filename>, --output\n"
+	       "			Specify where to place policies generated from learning mode\n"
+	       "	-M <filename|uid>, --modsegv\n"
+	       "			Remove a ban on a specific file or UID\n"
+	       "	-a <rolename> , --auth\n"
+	       "			Authenticates to a special role that requires auth\n"
+	       "	-u, --unauth    Remove yourself from your current special role\n"
+	       "	-n <rolename> , --noauth\n"
+	       "			Authenticates to a special role that doesn't require auth\n"
+	       "	-h, --help	Display this help\n"
+	       "	-v, --version	Display version information\n",
+	       GR_VERSION);
+
+	exit(EXIT_SUCCESS);
+	return;
+}
+
+static void
+conv_name_to_num(const char *filename, gr_dev_t *dev, ino_t * inode)
+{
+	struct stat fstat;
+
+	if (stat(filename, &fstat)) {
+		fprintf(stderr, "Unable to stat %s: %s\n", filename,
+			strerror(errno));
+		exit(EXIT_FAILURE);
+	}
+
+	*dev = MKDEV(MAJOR(fstat.st_dev), MINOR(fstat.st_dev));
+	*inode = fstat.st_ino;
+
+	return;
+}
+
+void
+parse_args(int argc, char *argv[])
+{
+	int next_option = 0;
+	int err;
+	char *output_log = NULL;
+	char *learn_log = NULL;
+	int gr_learn = 0;
+	int gr_output = 0;
+	int gr_enable = 0;
+	int gr_fulllearn = 0;
+	struct gr_pw_entry entry;
+	struct gr_arg_wrapper *grarg;
+	char cwd[PATH_MAX];
+	const char *const short_opts = "SEFuDP::RL:O:M:a:n:hv";
+	const struct option long_opts[] = {
+		{"help", 0, NULL, 'h'},
+		{"version", 0, NULL, 'v'},
+		{"status", 0, NULL, 'S'},
+		{"enable", 0, NULL, 'E'},
+		{"disable", 0, NULL, 'D'},
+		{"passwd", 2, NULL, 'P'},
+		{"auth", 1, NULL, 'a'},
+		{"noauth", 1, NULL, 'n'},
+		{"reload", 0, NULL, 'R'},
+		{"modsegv", 1, NULL, 'M'},
+		{"learn", 1, NULL, 'L'},
+		{"fulllearn", 0, NULL, 'F'},
+		{"output", 1, NULL, 'O'},
+		{"unauth", 0, NULL, 'u'},
+		{NULL, 0, NULL, 0}
+	};
+
+	getcwd(cwd, PATH_MAX - 1);
+
+	err = mlock(&entry, sizeof (entry));
+	if (err && !getuid())
+		fprintf(stderr, "Warning: Unable to lock password "
+			"into physical memory.\n");
+
+	memset(&entry, 0, sizeof (struct gr_pw_entry));
+
+	if (argc < 2)
+		show_help();
+
+	while ((next_option =
+		getopt_long(argc, argv, short_opts, long_opts, NULL)) != -1) {
+
+		switch (next_option) {
+		case 'S':
+			if (argc > 2)
+				show_help();
+			check_acl_status(GRADM_STATUS);
+			break;
+		case 'E':
+			if (argc > 4)
+				show_help();
+			entry.mode = GRADM_ENABLE;
+			check_acl_status(entry.mode);
+			parse_acls();
+			expand_acls();
+			analyze_acls();
+			gr_enable = 1;
+			break;
+		case 'F':
+			if (argc > 6)
+				show_help();
+			entry.mode = GRADM_ENABLE;
+			check_acl_status(entry.mode);
+			gr_fulllearn = 1;
+			gr_enable = 1;
+			break;
+		case 'u':
+			if (argc > 2)
+				show_help();
+			entry.mode = GRADM_UNSPROLE;
+			check_acl_status(entry.mode);
+			grarg = conv_user_to_kernel(&entry);
+			transmit_to_kernel(grarg);
+			break;
+		case 'R':
+			if (argc > 2)
+				show_help();
+			entry.mode = GRADM_RELOAD;
+			check_acl_status(entry.mode);
+			get_user_passwd(&entry, GR_PWONLY);
+			parse_acls();
+			expand_acls();
+			analyze_acls();
+			grarg = conv_user_to_kernel(&entry);
+			read_saltandpass(entry.rolename, grarg->arg->salt,
+					 grarg->arg->sum);
+			transmit_to_kernel(grarg);
+			break;
+		case 'M':
+			if ((argc != 3) || (optind > argc)
+			    || (strlen(optarg) < 1))
+				show_help();
+			entry.mode = GRADM_MODSEGV;
+			check_acl_status(entry.mode);
+			get_user_passwd(&entry, GR_PWONLY);
+
+			if (isdigit(optarg[0]))
+				entry.segv_uid = atoi(optarg);
+			else
+				conv_name_to_num(optarg, &entry.segv_dev,
+						 &entry.segv_inode);
+			grarg = conv_user_to_kernel(&entry);
+			transmit_to_kernel(grarg);
+			exit(EXIT_SUCCESS);
+			break;
+		case 'D':
+			if (argc > 2)
+				show_help();
+			entry.mode = GRADM_DISABLE;
+			check_acl_status(entry.mode);
+			get_user_passwd(&entry, GR_PWONLY);
+			grarg = conv_user_to_kernel(&entry);
+			transmit_to_kernel(grarg);
+			exit(EXIT_SUCCESS);
+			break;
+		case 'L':
+			if (argc > 6 || argc < 3)
+				show_help();
+			gr_learn = 1;
+			if (optarg) {
+				char pathbuf[PATH_MAX];
+				if (*optarg == '/')
+					learn_log = strdup(optarg);
+				else {
+					strcpy(pathbuf, cwd);
+					if (strlen(optarg) + strlen(pathbuf) + 2 > PATH_MAX) {
+						fprintf(stderr, "Unable to open %s for learning logs.\n", optarg);
+						exit(EXIT_FAILURE);
+					}
+					strcat(pathbuf, "/");
+					strcat(pathbuf, optarg);
+					learn_log = strdup(pathbuf);
+				}
+			}
+			break;
+		case 'O':
+			if (argc > 6 || argc < 3)
+				show_help();
+			gr_output = 1;
+			if (optarg)
+				output_log = strdup(optarg);
+			break;
+		case 'P':
+			if (argc > 3)
+				show_help();
+			if (argc == 3) {
+				strncpy(entry.rolename, argv[2], GR_SPROLE_LEN);
+				entry.rolename[GR_SPROLE_LEN - 1] = '\0';
+				printf("Setting up password for role %s\n",
+				       entry.rolename);
+			} else
+				printf("Setting up grsecurity RBAC password\n");
+			get_user_passwd(&entry, GR_PWANDSUM);
+			generate_salt(&entry);
+			generate_hash(&entry);
+			write_user_passwd(&entry);
+			memset(&entry, 0, sizeof (struct gr_pw_entry));
+			exit(EXIT_SUCCESS);
+			break;
+		case 'a':
+			if (argc != 3)
+				show_help();
+			strncpy(entry.rolename, argv[2], GR_SPROLE_LEN);
+			entry.rolename[GR_SPROLE_LEN - 1] = '\0';
+			entry.mode = GRADM_SPROLE;
+			check_acl_status(entry.mode);
+			get_user_passwd(&entry, GR_PWONLY);
+			grarg = conv_user_to_kernel(&entry);
+			transmit_to_kernel(grarg);
+			exit(EXIT_SUCCESS);
+			break;
+		case 'n':
+			if (argc != 3)
+				show_help();
+			strncpy(entry.rolename, argv[2], GR_SPROLE_LEN);
+			entry.rolename[GR_SPROLE_LEN - 1] = '\0';
+			entry.mode = GRADM_SPROLE;
+			check_acl_status(entry.mode);
+			grarg = conv_user_to_kernel(&entry);
+			transmit_to_kernel(grarg);
+			exit(EXIT_SUCCESS);
+			break;
+		case 'v':
+			if (argc > 2)
+				show_help();
+			show_version();
+			break;
+		case 'h':
+			show_help();
+			break;
+		default:
+			show_help();
+			break;
+		}
+	}
+
+	if ((gr_output && !gr_learn)) {
+		fprintf(stderr, "-L and -O must be used together.\n");
+		exit(EXIT_FAILURE);
+	}
+
+	if ((gr_fulllearn && !gr_learn)) {
+		fprintf(stderr, "-L and -F must be used together.\n");
+		exit(EXIT_FAILURE);
+	}
+
+	if (gr_fulllearn && gr_learn && gr_output)
+		gr_enable = 0;
+
+	if (gr_enable) {
+		check_acl_status(entry.mode);
+		if (gr_fulllearn)
+			add_fulllearn_acl();
+		if (gr_learn)
+			start_grlearn(learn_log);
+		grarg = conv_user_to_kernel(&entry);
+		read_saltandpass(entry.rolename, grarg->arg->salt,
+				 grarg->arg->sum);
+		transmit_to_kernel(grarg);
+	} else if (gr_learn && gr_output) {
+		FILE *stream;
+
+		if (!strcmp(output_log, "stdout"))
+			stream = stdout;
+		else if (!strcmp(output_log, "stderr"))
+			stream = stderr;
+		else {
+			stream = fopen(output_log, "a");
+			if (!stream) {
+				fprintf(stderr,
+					"Unable to open %s for writing.\n"
+					"Error: %s\n", output_log,
+					strerror(errno));
+				exit(EXIT_FAILURE);
+			}
+		}
+
+		if (gr_fulllearn)
+			generate_full_learned_acls(learn_log, stream);
+		else
+			handle_learn_logs(learn_log, stream);
+
+	}
+	return;
+}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_cap.c linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_cap.c
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_cap.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_cap.c	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,90 @@
+#include "gradm.h"
+
+struct capability_set capability_list[] = {
+	{"CAP_CHOWN", CAP_CHOWN},
+	{"CAP_DAC_OVERRIDE", CAP_DAC_OVERRIDE},
+	{"CAP_DAC_READ_SEARCH", CAP_DAC_READ_SEARCH},
+	{"CAP_FOWNER", CAP_FOWNER},
+	{"CAP_FSETID", CAP_FSETID},
+	{"CAP_KILL", CAP_KILL},
+	{"CAP_SETGID", CAP_SETGID},
+	{"CAP_SETUID", CAP_SETUID},
+	{"CAP_SETPCAP", CAP_SETPCAP},
+	{"CAP_LINUX_IMMUTABLE", CAP_LINUX_IMMUTABLE},
+	{"CAP_NET_BIND_SERVICE", CAP_NET_BIND_SERVICE},
+	{"CAP_NET_BROADCAST", CAP_NET_BROADCAST},
+	{"CAP_NET_ADMIN", CAP_NET_ADMIN},
+	{"CAP_NET_RAW", CAP_NET_RAW},
+	{"CAP_IPC_LOCK", CAP_IPC_LOCK},
+	{"CAP_IPC_OWNER", CAP_IPC_OWNER},
+	{"CAP_SYS_MODULE", CAP_SYS_MODULE},
+	{"CAP_SYS_RAWIO", CAP_SYS_RAWIO},
+	{"CAP_SYS_CHROOT", CAP_SYS_CHROOT},
+	{"CAP_SYS_PTRACE", CAP_SYS_PTRACE},
+	{"CAP_SYS_PACCT", CAP_SYS_PACCT},
+	{"CAP_SYS_ADMIN", CAP_SYS_ADMIN},
+	{"CAP_SYS_BOOT", CAP_SYS_BOOT},
+	{"CAP_SYS_NICE", CAP_SYS_NICE},
+	{"CAP_SYS_RESOURCE", CAP_SYS_RESOURCE},
+	{"CAP_SYS_TIME", CAP_SYS_TIME},
+	{"CAP_SYS_TTY_CONFIG", CAP_SYS_TTY_CONFIG},
+	{"CAP_MKNOD", CAP_MKNOD},
+	{"CAP_LEASE", CAP_LEASE},
+	{"CAP_ALL", ~0}
+};
+
+__u32
+cap_conv(const char *cap)
+{
+	int i;
+
+	for (i = 0;
+	     i < sizeof (capability_list) / sizeof (struct capability_set); i++)
+		if (!strcmp(cap, capability_list[i].cap_name)) {
+			if (i == (sizeof (capability_list) /
+				  sizeof (struct capability_set) - 1))
+				return ~0;	/* CAP_ALL */
+			else
+				return (1 << (capability_list[i].cap_val));
+		}
+
+	fprintf(stderr, "Invalid capability name \"%s\" on line %lu of %s.\n"
+		"The RBAC system will not load until this"
+		" error is fixed.\n", cap, lineno, current_acl_file);
+
+	exit(EXIT_FAILURE);
+
+	return 0;
+}
+
+void
+add_cap_acl(struct proc_acl *subject, const char *cap)
+{
+	__u32 kcap = cap_conv(cap + 1);
+
+	if (!subject) {
+		fprintf(stderr, "Error on line %lu of %s.  Attempt to "
+			"add a capability without a subject declaration.\n"
+			"The RBAC system will not load until this "
+			"error is fixed.\n", lineno, current_acl_file);
+		exit(EXIT_FAILURE);
+	}
+
+	if (*cap == '+') {
+		subject->cap_drop &= ~kcap;
+		subject->cap_mask |= kcap;
+	} else {
+		subject->cap_drop |= kcap;
+		subject->cap_mask |= kcap;
+	}
+	return;
+}
+
+void
+modify_caps(struct proc_acl *proc, int cap)
+{
+	proc->cap_drop &= ~(1 << cap);
+	proc->cap_mask |= (1 << cap);
+
+	return;
+}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_defs.h linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_defs.h
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_defs.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_defs.h	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,403 @@
+#ifndef GRSEC_DIR
+#define GRSEC_DIR		"/etc/grsec2"
+#endif
+#define GRLEARN_PATH		"/sbin/grlearn"
+#define GRDEV_PATH		"/dev/grsec"
+#define GR_POLICY_PATH 		GRSEC_DIR "/policy"
+#define GR_PW_PATH 		GRSEC_DIR "/pw"
+
+#define GR_VERSION		"2.0.1"
+#define GRADM_VERSION		0x201
+
+#define GR_PWONLY		0
+#define GR_PWANDSUM		1
+
+#define GR_PW_LEN		128
+#define GR_SALT_SIZE		16
+#define GR_SHA_SUM_SIZE		32
+
+#define GR_SPROLE_LEN		64
+
+#define GR_FEXIST		0x1
+#define GR_FFAKE		0x2
+#define GR_FLEARN		0x4
+#define GR_SYMLINK		0x8
+
+#define CHK_FILE		0
+#define CHK_CAP			1
+
+#undef PATH_MAX
+#define PATH_MAX 		4096
+#define MAX_LINE_LEN 		5000
+
+#define MAX_INCLUDE_DEPTH	10
+#define MAX_NEST_DEPTH		8
+
+#define GR_NLIMITS	(RLIM_NLIMITS + 1)
+
+enum {
+	GRADM_DISABLE 	= 0,
+	GRADM_ENABLE 	= 1,
+	GRADM_SPROLE 	= 2,
+	GRADM_RELOAD 	= 3,
+	GRADM_MODSEGV 	= 4,
+	GRADM_STATUS 	= 5,
+	GRADM_UNSPROLE 	= 6
+};
+
+enum {
+	GR_IP_BIND 	= 0x01,
+	GR_IP_CONNECT 	= 0x02,
+};
+
+enum {
+	GR_ID_USER 	= 0x01,
+	GR_ID_GROUP 	= 0x02,
+};
+
+enum {
+	GR_ID_ALLOW	= 0x01,
+	GR_ID_DENY	= 0x02,
+};
+
+enum {
+	GR_READ 	= 0x00000001,
+	GR_APPEND 	= 0x00000002,
+	GR_WRITE 	= 0x00000004,
+	GR_EXEC 	= 0x00000008,
+	GR_FIND 	= 0x00000010,
+	GR_INHERIT 	= 0x00000040,
+	GR_PTRACERD 	= 0x00000100,
+	GR_SETID 	= 0x00000200,
+	GR_CREATE 	= 0x00000400,
+	GR_DELETE 	= 0x00000800,
+	GR_NOPTRACE	= 0x00001000,
+	GR_AUDIT_READ 	= 0x00002000,
+	GR_AUDIT_APPEND = 0x00004000,
+	GR_AUDIT_WRITE 	= 0x00008000,
+	GR_AUDIT_EXEC 	= 0x00010000,
+	GR_AUDIT_FIND 	= 0x00020000,
+	GR_AUDIT_INHERIT= 0x00040000,
+	GR_AUDIT_SETID 	= 0x00080000,
+	GR_AUDIT_CREATE = 0x00100000,
+	GR_AUDIT_DELETE = 0x00200000,
+	GR_SUPPRESS 	= 0x00400000
+};
+
+enum {
+	GR_ROLE_USER = 0x0001,
+	GR_ROLE_GROUP = 0x0002,
+	GR_ROLE_DEFAULT = 0x0004,
+	GR_ROLE_SPECIAL = 0x0008,
+	GR_ROLE_AUTH = 0x0010,
+	GR_ROLE_NOPW = 0x0020,
+	GR_ROLE_GOD = 0x0040,
+	GR_ROLE_LEARN = 0x0080,
+	GR_ROLE_TPE = 0x0100,
+	GR_ROLE_DOMAIN = 0x0200
+};
+
+enum {
+	GR_DELETED = 0x00000080
+};
+
+enum {
+	GR_KILL 	= 0x00000001,
+	GR_VIEW 	= 0x00000002,
+	GR_PROTECTED 	= 0x00000100,
+	GR_LEARN 	= 0x00000200,
+	GR_IGNORE 	= 0x00000400,
+	GR_OVERRIDE 	= 0x00000800,
+	GR_PAXPAGE 	= 0x00001000,
+	GR_PAXSEGM 	= 0x00002000,
+	GR_PAXGCC 	= 0x00004000,
+	GR_PAXRANDMMAP 	= 0x00008000,
+	GR_PAXRANDEXEC 	= 0x00010000,
+	GR_PAXMPROTECT 	= 0x00020000,
+	GR_PROTSHM 	= 0x00040000,
+	GR_KILLPROC 	= 0x00080000,
+	GR_KILLIPPROC 	= 0x00100000,
+	GR_NOTROJAN 	= 0x00200000,
+	GR_PROTPROCFD 	= 0x00400000,
+	GR_PROCACCT 	= 0x00800000,
+	GR_RELAXPTRACE  = 0x01000000,
+	GR_NESTED	= 0x02000000
+};
+
+/* internal use only.  not to be modified */
+
+struct capability_set {
+	char *cap_name;
+	__u32 cap_val;
+};
+
+struct rlimconv {
+	const char *name;
+	unsigned short val;
+};
+
+struct chk_perm {
+	unsigned short type;
+	__u32 w_modes;
+	__u32 u_modes;
+	__u32 w_caps;
+	__u32 u_caps;
+};
+
+struct role_allowed_ip {
+	__u32 addr;
+	__u32 netmask;
+
+	struct role_allowed_ip *prev;
+	struct role_allowed_ip *next;
+};
+
+struct ip_acl {
+	__u32 addr;
+	__u32 netmask;
+	__u16 low, high;
+	__u8 mode;		// connect or bind
+	__u32 type;		// stream, dgram, raw..etc
+	__u32 proto[8];		// we have to support all 255 protocols
+
+	struct ip_acl *prev;
+	struct ip_acl *next;
+};
+
+struct file_acl {
+	char *filename;
+	ino_t inode;
+	gr_dev_t dev;
+	__u32 mode;
+
+	struct proc_acl *nested;
+	struct file_acl *globbed;
+
+	struct file_acl *prev;
+	struct file_acl *next;
+};
+
+struct var_object {
+	char *filename;
+	__u32 mode;
+
+	struct var_object *prev;
+	struct var_object *next;
+};
+
+struct role_transition {
+	char *rolename;
+
+	struct role_transition *prev;
+	struct role_transition *next;
+};
+
+struct role_acl {
+	char *rolename;
+	uid_t uidgid;
+	__u16 roletype;
+
+	__u16 auth_attempts;
+	unsigned long expires;
+
+	struct proc_acl *root_label;
+	struct gr_hash_struct *hash;
+
+	struct role_acl *prev;
+	struct role_acl *next;
+
+	struct role_transition *transitions;
+	struct role_allowed_ip *allowed_ips;
+	uid_t *domain_children;
+	__u16 domain_child_num;
+
+	struct proc_acl **subj_hash;
+	__u32 subj_hash_size;
+};
+
+struct proc_acl {
+	char *filename;
+	ino_t inode;
+	gr_dev_t dev;
+	__u32 mode;
+	__u32 cap_mask;
+	__u32 cap_drop;
+
+	struct rlimit res[GR_NLIMITS];
+	__u16 resmask;
+
+	__u8 user_trans_type;
+	__u8 group_trans_type;
+	uid_t *user_transitions;
+	gid_t *group_transitions;
+	__u16 user_trans_num;
+	__u16 group_trans_num;
+
+	__u32 ip_proto[8];
+	__u32 ip_type;
+	struct ip_acl **ips;
+	__u32 ip_num;
+
+	__u32 crashes;
+	unsigned long expires;
+
+	struct proc_acl *parent_subject;
+	struct gr_hash_struct *hash;
+	struct proc_acl *prev;
+	struct proc_acl *next;
+
+	struct file_acl **obj_hash;
+	__u32 obj_hash_size;
+};
+
+struct gr_learn_ip_node {
+	__u8 ip_node;
+	__u16 **ports;
+	__u32 ip_proto[8];
+	__u32 ip_type;
+	unsigned char root_node:1;
+	unsigned char all_low_ports:1;
+	unsigned char all_high_ports:1;
+	struct gr_learn_ip_node *parent;
+	struct gr_learn_ip_node **leaves;
+};
+
+struct gr_learn_role_entry {
+	char *rolename;
+	__u16 rolemode;
+	unsigned int id;
+	struct gr_hash_struct *hash;
+	struct gr_learn_file_node *subject_list;
+	struct gr_learn_ip_node *allowed_ips;
+};	
+
+struct gr_learn_group_node {
+	char *rolename;
+	gid_t gid;
+	struct gr_learn_user_node **users;
+	struct gr_hash_struct *hash;
+	struct gr_learn_file_node *subject_list;
+	struct gr_learn_ip_node *allowed_ips;
+};
+
+struct gr_learn_file_tmp_node {
+	char *filename;
+	__u32 mode;
+};
+
+struct gr_learn_user_node {
+	char *rolename;
+	uid_t uid;
+	struct gr_learn_group_node *group;
+	struct gr_hash_struct *hash;
+	struct gr_learn_file_node *subject_list;
+	struct gr_learn_ip_node *allowed_ips;
+};
+
+struct gr_learn_subject_node {
+	__u32 cap_raise;
+	struct rlimit res[GR_NLIMITS];
+	__u16 resmask;
+};
+
+struct gr_learn_file_node {
+	char *filename;
+	__u32 mode;
+	struct gr_learn_file_node **leaves;
+	struct gr_learn_file_node *parent;
+	struct gr_hash_struct *hash;
+	struct gr_learn_file_node *object_list;
+	struct gr_learn_ip_node *connect_list;
+	struct gr_learn_ip_node *bind_list;
+	struct gr_learn_subject_node *subject;
+	unsigned char dont_display:1;
+};
+
+struct gr_pw_entry {
+	unsigned char rolename[GR_SPROLE_LEN];
+	unsigned char passwd[GR_PW_LEN];
+	unsigned char sum[GR_SHA_SUM_SIZE];
+	unsigned char salt[GR_SALT_SIZE];
+	gr_dev_t segv_dev;
+	ino_t segv_inode;
+	uid_t segv_uid;
+	__u16 mode;
+};
+
+/* We use this to keep track of deleted files, since each subject needs
+   to agree on an inode/dev
+*/
+
+struct deleted_file {
+	char *filename;
+	ino_t ino;
+	struct deleted_file *next;
+} *deleted_files;
+
+unsigned long lineno;
+
+struct role_acl *current_role;
+struct proc_acl *current_subject;
+
+char *current_acl_file;
+
+enum {
+	GR_HASH_SUBJECT,
+	GR_HASH_OBJECT,
+	GR_HASH_FILENAME
+};
+
+struct gr_hash_struct {
+	void **table;
+	void **nametable;
+	void *first;
+	__u32 table_size;
+	__u32 used_size;
+	int type;
+};
+
+struct user_acl_role_db {
+	struct role_acl **r_table;
+	__u32 num_pointers;		/* Number of allocations to track */
+	__u32 num_roles;		/* Number of roles */
+	__u32 num_domain_children;	/* Number of domain children */
+	__u32 num_subjects;		/* Number of subjects */
+	__u32 num_objects; 		/* Number of objects */
+};
+
+struct sprole_pw {
+	unsigned char *rolename;
+	unsigned char salt[GR_SALT_SIZE];
+	unsigned char sum[GR_SHA_SUM_SIZE];
+};
+
+struct gr_arg {
+	struct user_acl_role_db role_db;
+	unsigned char pw[GR_PW_LEN];
+	unsigned char salt[GR_SALT_SIZE];
+	unsigned char sum[GR_SHA_SUM_SIZE];
+	unsigned char sp_role[GR_SPROLE_LEN];
+	struct sprole_pw *sprole_pws;
+	gr_dev_t segv_dev;
+	ino_t segv_inode;
+	uid_t segv_uid;
+	__u16 num_sprole_pws;
+	__u16 mode;
+};
+
+struct gr_arg_wrapper {
+	struct gr_arg *arg;
+	__u32 version;
+	__u32 size;
+};
+
+struct capability_set capability_list[30];
+struct rlimconv rlim_table[12];
+
+uid_t special_role_uid;
+
+__u32 num_subjects;
+__u32 num_roles;
+__u32 num_objects;
+__u32 num_pointers;
+__u32 num_domain_children;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_fulllearn.c linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_fulllearn.c
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_fulllearn.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_fulllearn.c	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,275 @@
+#include "gradm.h"
+
+struct gr_learn_group_node **role_list = NULL;
+extern FILE *fulllearn_pass1in;
+extern FILE *fulllearn_pass2in;
+extern FILE *fulllearn_pass3in;
+extern int fulllearn_pass1parse(void);
+extern int fulllearn_pass2parse(void);
+extern int fulllearn_pass3parse(void);
+
+void fulllearn_pass1(FILE *stream)
+{
+	fulllearn_pass1in = stream;
+	printf("Beginning full learning 1st pass...");
+	fflush(stdout);
+	fulllearn_pass1parse();
+	printf("done.\n");
+	fflush(stdout);
+	printf("Beginning full learning role reduction...");
+	fflush(stdout);
+	reduce_roles(&role_list);
+	printf("done.\n");
+	fflush(stdout);
+
+	return;
+}
+
+int full_reduce_subjects(struct gr_learn_group_node *group,
+			 struct gr_learn_user_node *user, FILE *unused)
+{
+	struct gr_learn_file_tmp_node **tmptable;
+	unsigned long i;
+	__u32 table_size;
+
+	if (user) {
+		printf("Beginning full learning subject reduction for user %s...", user->rolename);
+		fflush(stdout);
+		if (!user->hash)
+			insert_file(&(user->subject_list), "/", GR_FIND, 1);
+		else {
+			sort_file_list(user->hash);
+			tmptable = (struct gr_learn_file_tmp_node **)user->hash->table;
+			table_size = user->hash->table_size;
+			for (i = 0; i < table_size; i++) {
+				if (tmptable[i] == NULL)
+					continue;
+				insert_file(&(user->subject_list), tmptable[i]->filename, tmptable[i]->mode, 1);
+			}
+		}
+		printf("done.\n");
+		fflush(stdout);
+	} else {
+		printf("Beginning full learning subject reduction for group %s...", group->rolename);
+		fflush(stdout);
+		if (!group->hash)
+			insert_file(&(group->subject_list), "/", GR_FIND, 1);
+		else {
+			sort_file_list(group->hash);
+			tmptable = (struct gr_learn_file_tmp_node **)group->hash->table;
+			table_size = group->hash->table_size;
+			for (i = 0; i < table_size; i++) {
+				if (tmptable[i] == NULL)
+					continue;
+				insert_file(&(group->subject_list), tmptable[i]->filename, tmptable[i]->mode, 1);
+			}
+		}
+		printf("done.\n");
+		fflush(stdout);
+	}
+
+	return 0;
+}
+
+int full_reduce_allowed_ips(struct gr_learn_group_node *group,
+			    struct gr_learn_user_node *user,
+			    FILE *unused)
+{
+	if (user)
+		reduce_ip_tree(user->allowed_ips);
+	else if (group)
+		reduce_ip_tree(group->allowed_ips);
+
+	return 0;
+}	
+
+void fulllearn_pass2(FILE *stream)
+{
+	fulllearn_pass2in = stream;
+	printf("Beginning full learning 2nd pass...");
+	fflush(stdout);
+	fulllearn_pass2parse();
+	printf("done.\n");
+	fflush(stdout);
+	traverse_roles(role_list, &full_reduce_subjects, NULL);
+	traverse_roles(role_list, &full_reduce_allowed_ips, NULL);
+
+	return;
+}
+
+int full_reduce_object_node(struct gr_learn_file_node *subject,
+			    struct gr_learn_file_node *unused1,
+			    FILE *unused2)
+{
+	struct gr_learn_file_tmp_node **tmptable;
+	unsigned long i;
+	__u32 table_size;
+
+	if (subject->hash == NULL)
+		return 0;
+	printf("Beginning full learning object reduction for subject %s...", subject->filename);
+	fflush(stdout);
+	sort_file_list(subject->hash);
+	tmptable = (struct gr_learn_file_tmp_node **)subject->hash->table;
+	table_size = subject->hash->table_size;
+	for (i = 0; i < table_size; i++) {
+		if (tmptable[i] == NULL)
+			continue;
+		insert_file(&(subject->object_list), tmptable[i]->filename, tmptable[i]->mode, 0);
+	}
+
+	first_stage_reduce_tree(subject->object_list);
+	second_stage_reduce_tree(subject->object_list);
+
+	enforce_high_protected_paths(subject);
+
+	third_stage_reduce_tree(subject->object_list);
+	printf("done.\n");
+	fflush(stdout);
+	return 0;
+}
+
+int full_reduce_objects(struct gr_learn_group_node *group,
+			 struct gr_learn_user_node *user,
+			 FILE *unused)
+{
+	struct gr_learn_file_node *subjects;
+
+	if (user)
+		subjects = user->subject_list;
+	else
+		subjects = group->subject_list;
+
+	traverse_file_tree(subjects, &full_reduce_object_node, NULL, NULL);
+
+	return 0;
+}
+
+int full_reduce_ip_node(struct gr_learn_file_node *subject,
+			struct gr_learn_file_node *unused1,
+			FILE *unused2)
+{
+	struct gr_learn_ip_node *tmp = subject->connect_list;
+
+	reduce_ip_tree(tmp);
+	reduce_ports_tree(tmp);
+
+	tmp = subject->bind_list;
+
+	reduce_ip_tree(tmp);
+	reduce_ports_tree(tmp);
+
+	return 0;
+}	
+
+int full_reduce_ips(struct gr_learn_group_node *group,
+			 struct gr_learn_user_node *user,
+			FILE *unused)
+{
+	struct gr_learn_file_node *subjects;
+
+	if (user)
+		subjects = user->subject_list;
+	else
+		subjects = group->subject_list;
+
+	traverse_file_tree(subjects, &full_reduce_ip_node, NULL, NULL);
+
+	return 0;
+}
+
+void fulllearn_pass3(FILE *stream)
+{
+	fulllearn_pass3in = stream;
+	printf("Beginning full learning 3rd pass...");
+	fflush(stdout);
+	fulllearn_pass3parse();
+	printf("done.\n");
+	fflush(stdout);
+	traverse_roles(role_list, &full_reduce_objects, NULL);
+	traverse_roles(role_list, &full_reduce_ips, NULL);
+
+	return;
+}
+
+void enforce_hidden_file(struct gr_learn_file_node *subject, char *filename)
+{
+	struct gr_learn_file_node *objects = subject->object_list;
+	struct gr_learn_file_node *retobj;
+	
+	retobj = match_file_node(objects, filename);
+	if (retobj->mode & GR_FIND && !strcmp(retobj->filename, filename))
+		retobj->mode = 0;
+	else if (retobj->mode & GR_FIND)
+		insert_file(&(subject->object_list), strdup(filename), 0, 0);
+
+	return;
+}
+
+int ensure_subject_security(struct gr_learn_file_node *subject,
+			struct gr_learn_file_node *unused1,
+			FILE *unused2)
+{
+	if (strcmp(subject->filename, "/"))
+		return 0;
+
+	enforce_hidden_file(subject, "/etc/ssh");
+	enforce_hidden_file(subject, "/dev/mem");
+	enforce_hidden_file(subject, "/dev/kmem");
+	enforce_hidden_file(subject, "/dev/port");
+	enforce_hidden_file(subject, "/proc/kcore");
+	enforce_hidden_file(subject, GRSEC_DIR);
+	enforce_hidden_file(subject, GRDEV_PATH);
+
+	return 0;
+}
+
+int ensure_role_security(struct gr_learn_group_node *group,
+			 struct gr_learn_user_node *user,
+			FILE *unused)
+{
+	struct gr_learn_file_node *subjects;
+
+	if (user)
+		subjects = user->subject_list;
+	else
+		subjects = group->subject_list;
+
+	traverse_file_tree(subjects, &ensure_subject_security, NULL, NULL);
+
+	return 0;
+}
+
+void fulllearn_finalpass(void)
+{
+	printf("Beginning full learning final pass...");
+	fflush(stdout);
+	traverse_roles(role_list, &ensure_role_security, NULL);
+	printf("done.\n");
+	fflush(stdout);
+	return;
+}
+
+void generate_full_learned_acls(char *learn_log, FILE *stream)
+{
+	FILE *learnlog;
+
+	learnlog = fopen(learn_log, "r");
+	if (learnlog == NULL) {
+		fprintf(stderr, "Unable to open learning log: %s.\n"
+				"Error: %s\n", learn_log, strerror(errno));
+		exit(EXIT_FAILURE);
+	}
+	fulllearn_pass1(learnlog);
+	fseek(learnlog, 0, SEEK_SET);
+	fulllearn_pass2(learnlog);
+	fseek(learnlog, 0, SEEK_SET);
+	fulllearn_pass3(learnlog);
+	fclose(learnlog);
+
+	fulllearn_finalpass();
+
+	display_roles(role_list, stream);
+
+	return;
+}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_fulllearn_pass1.l linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_fulllearn_pass1.l
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_fulllearn_pass1.l	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_fulllearn_pass1.l	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,41 @@
+%{
+#include "gradm.h"
+#include "fulllearn_pass1.tab.h"
+
+void fulllearn_pass1error(const char *s);
+int fulllearn_pass1wrap(void);
+%}
+
+ROLENAME [_a-zA-Z0-9-]{1,30}
+NUM [0-9]+
+FILENAME [/][^\t\n]*
+IPADDR [0-9]{1,3}"."[0-9]{1,3}"."[0-9]{1,3}"."[0-9]{1,3}
+
+%option nounput
+
+%x ERROR
+
+%%
+
+{NUM}					{
+					  fulllearn_pass1lval.string = strdup(yytext);
+					  return NUM;
+					}
+{ROLENAME}				{
+					  fulllearn_pass1lval.string = strdup(yytext);
+					  return ROLENAME;
+					}
+{FILENAME}				{
+					  fulllearn_pass1lval.string = strdup(yytext);
+					  return FILENAME;
+					}
+{IPADDR}				{
+					  fulllearn_pass1lval.string = strdup(yytext);
+					  return IPADDR;
+					}
+[\t]					{ return ':'; }
+.					;
+%%
+
+void fulllearn_pass1error(const char *s) { return; }
+int fulllearn_pass1wrap(void) { return 1; }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_fulllearn_pass1.y linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_fulllearn_pass1.y
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_fulllearn_pass1.y	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_fulllearn_pass1.y	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,64 @@
+%{
+#include "gradm.h"
+extern int fulllearn_pass1lex(void);
+
+extern struct gr_learn_group_node **role_list;
+%}
+
+%union {
+	char * string;
+}
+
+%token <string> NUM FILENAME IPADDR ROLENAME
+%type <string> filename
+
+%%
+
+learn_logs:	learn_log
+	|	learn_logs learn_log
+	;
+
+filename:	/*empty*/	{ $$ = strdup(""); }
+	|	FILENAME	{
+				  if (!strcmp($1, "//"))
+					$1[1] = '\0';
+				  $$ = $1;
+				}
+	;
+
+learn_log:
+		error
+	|	ROLENAME ':' NUM ':' NUM ':' NUM ':' filename ':' filename ':' NUM ':' NUM ':' filename ':' NUM ':' IPADDR
+		{
+			struct passwd *pwd;
+			struct group *grp;
+			uid_t uid;
+			gid_t gid;
+
+			uid = atoi($5);
+			gid = atoi($7);
+
+			pwd = getpwuid(uid);
+			grp = getgrgid(gid);
+
+			if (pwd && grp)
+				insert_user(&role_list, strdup(pwd->pw_name), strdup(grp->gr_name), uid, gid);
+		}		
+	|	ROLENAME ':' NUM ':' NUM ':' NUM ':' filename ':' filename ':' IPADDR ':' NUM ':' NUM ':' NUM ':' NUM ':' IPADDR
+		{
+			struct passwd *pwd;
+			struct group *grp;
+			uid_t uid;
+			gid_t gid;
+
+			uid = atoi($5);
+			gid = atoi($7);
+
+			pwd = getpwuid(uid);
+			grp = getgrgid(gid);
+
+			if (pwd && grp)
+				insert_user(&role_list, strdup(pwd->pw_name), strdup(grp->gr_name), uid, gid);
+		}
+	;
+%%
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_fulllearn_pass2.l linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_fulllearn_pass2.l
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_fulllearn_pass2.l	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_fulllearn_pass2.l	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,41 @@
+%{
+#include "gradm.h"
+#include "fulllearn_pass2.tab.h"
+
+void fulllearn_pass2error(const char *s);
+int fulllearn_pass2wrap(void);
+%}
+
+ROLENAME [_a-zA-Z0-9-]{1,30}
+NUM [0-9]+
+FILENAME [/][^\t\n]*
+IPADDR [0-9]{1,3}"."[0-9]{1,3}"."[0-9]{1,3}"."[0-9]{1,3}
+
+%option nounput
+
+%x ERROR
+
+%%
+
+{NUM}					{
+					  fulllearn_pass2lval.string = strdup(yytext);
+					  return NUM;
+					}
+{ROLENAME}				{
+					  fulllearn_pass2lval.string = strdup(yytext);
+					  return ROLENAME;
+					}
+{FILENAME}				{
+					  fulllearn_pass2lval.string = strdup(yytext);
+					  return FILENAME;
+					}
+{IPADDR}				{
+					  fulllearn_pass2lval.string = strdup(yytext);
+					  return IPADDR;
+					}
+[\t]					{ return ':'; }
+.					;
+%%
+
+void fulllearn_pass2error(const char *s) { return; }
+int fulllearn_pass2wrap(void) { return 1; }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_fulllearn_pass2.y linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_fulllearn_pass2.y
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_fulllearn_pass2.y	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_fulllearn_pass2.y	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,91 @@
+%{
+#include "gradm.h"
+extern int fulllearn_pass2lex(void);
+
+extern struct gr_learn_group_node **role_list;
+%}
+
+%union {
+	char * string;
+}
+
+%token <string> NUM FILENAME IPADDR ROLENAME
+%type <string> filename
+
+%%
+
+learn_logs:	learn_log
+	|	learn_logs learn_log
+	;
+
+filename:	/*empty*/	{ $$ = strdup(""); }
+	|	FILENAME	{
+				  if (!strcmp($1, "//"))
+					$1[1] = '\0';
+				  $$ = $1;
+				}
+	;
+
+learn_log:
+		error
+	|	ROLENAME ':' NUM ':' NUM ':' NUM ':' filename ':' filename ':' NUM ':' NUM ':' filename ':' NUM ':' IPADDR
+		{
+			struct gr_learn_group_node *group = NULL;
+			struct gr_learn_user_node *user = NULL;
+			uid_t uid;
+			gid_t gid;
+			unsigned long res1, res2;
+			struct in_addr ip;
+			__u32 addr;
+
+			uid = atoi($5);
+			gid = atoi($7);
+			res1 = atol($13);
+			res2 = atol($15);
+
+			if (inet_aton($21, &ip))
+				addr = ip.s_addr;
+			else
+				addr = 0;				
+
+			match_role(role_list, uid, gid, &group, &user);
+			if (user)
+				insert_ip(&(user->allowed_ips), addr, 0, 0, 0);
+			else if (group)
+				insert_ip(&(group->allowed_ips), addr, 0, 0, 0);
+				
+			if (user && ((!strcmp($17, "")  && strlen($9) > 1 && !res1 && !res2) || is_protected_path($17, atoi($19))))
+				insert_learn_user_subject(user, conv_filename_to_struct($9, GR_FIND | GR_OVERRIDE));
+			else if (group && ((!strcmp($17, "") && strlen($9) > 1 && !res1 && !res2) || is_protected_path($17, atoi($19))))
+				insert_learn_group_subject(group, conv_filename_to_struct($9, GR_FIND | GR_OVERRIDE));
+		}		
+	|	ROLENAME ':' NUM ':' NUM ':' NUM ':' filename ':' filename ':' IPADDR ':' NUM ':' NUM ':' NUM ':' NUM ':' IPADDR
+		{
+			struct gr_learn_group_node *group = NULL;
+			struct gr_learn_user_node *user = NULL;
+			uid_t uid;
+			gid_t gid;
+			struct in_addr ip;
+			__u32 addr;
+
+			uid = atoi($5);
+			gid = atoi($7);
+
+			if (inet_aton($23, &ip))
+				addr = ip.s_addr;
+			else
+				addr = 0;				
+
+			match_role(role_list, uid, gid, &group, &user);
+			if (user)
+				insert_ip(&(user->allowed_ips), addr, 0, 0, 0);
+			else if (group)
+				insert_ip(&(group->allowed_ips), addr, 0, 0, 0);
+
+			if (user)
+				insert_learn_user_subject(user, conv_filename_to_struct($9, GR_FIND | GR_OVERRIDE));
+			else if (group)
+				insert_learn_group_subject(group, conv_filename_to_struct($9, GR_FIND | GR_OVERRIDE));
+		}
+	;
+%%
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_fulllearn_pass3.l linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_fulllearn_pass3.l
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_fulllearn_pass3.l	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_fulllearn_pass3.l	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,41 @@
+%{
+#include "gradm.h"
+#include "fulllearn_pass3.tab.h"
+
+void fulllearn_pass3error(const char *s);
+int fulllearn_pass3wrap(void);
+%}
+
+ROLENAME [_a-zA-Z0-9-]{1,30}
+NUM [0-9]+
+FILENAME [/][^\t\n]*
+IPADDR [0-9]{1,3}"."[0-9]{1,3}"."[0-9]{1,3}"."[0-9]{1,3}
+
+%option nounput
+
+%x ERROR
+
+%%
+
+{NUM}					{
+					  fulllearn_pass3lval.string = strdup(yytext);
+					  return NUM;
+					}
+{ROLENAME}				{
+					  fulllearn_pass3lval.string = strdup(yytext);
+					  return ROLENAME;
+					}
+{FILENAME}				{
+					  fulllearn_pass3lval.string = strdup(yytext);
+					  return FILENAME;
+					}
+{IPADDR}				{
+					  fulllearn_pass3lval.string = strdup(yytext);
+					  return IPADDR;
+					}
+[\t]					{ return ':'; }
+.					;
+%%
+
+void fulllearn_pass3error(const char *s) { return; }
+int fulllearn_pass3wrap(void) { return 1; }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_fulllearn_pass3.y linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_fulllearn_pass3.y
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_fulllearn_pass3.y	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_fulllearn_pass3.y	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,108 @@
+%{
+#include "gradm.h"
+extern int fulllearn_pass3lex(void);
+
+extern struct gr_learn_group_node **role_list;
+%}
+
+%union {
+	char * string;
+}
+
+%token <string> NUM FILENAME IPADDR ROLENAME
+%type <string> filename
+
+%%
+
+learn_logs:	learn_log
+	|	learn_logs learn_log
+	;
+
+filename:	/*empty*/	{ $$ = strdup(""); }
+	|	FILENAME	{
+				  if (!strcmp($1, "//"))
+					$1[1] = '\0';
+				  $$ = $1;
+				}
+	;
+
+learn_log:
+		error
+	|	ROLENAME ':' NUM ':' NUM ':' NUM ':' filename ':' filename ':' NUM ':' NUM ':' filename ':' NUM ':' IPADDR
+		{
+			struct gr_learn_group_node *group = NULL;
+			struct gr_learn_user_node *user = NULL;
+			struct gr_learn_file_node *subjlist = NULL;
+			struct gr_learn_file_node *subject = NULL;
+			uid_t uid;
+			gid_t gid;
+			__u32 mode;
+			unsigned long res1, res2;
+
+			uid = atoi($5);
+			gid = atoi($7);
+			mode = atoi($19);
+			res1 = atol($13);
+			res2 = atol($15);
+
+			match_role(role_list, uid, gid, &group, &user);
+			if (user)
+				subjlist = user->subject_list;
+			else if (group)
+				subjlist = group->subject_list;
+
+			if (subjlist)
+				subject = match_file_node(subjlist, $9);
+			if (subject && strcmp($17, ""))
+				insert_learn_object(subject, conv_filename_to_struct($17, mode | GR_FIND));
+			else if (subject && strlen($9) > 1 && !res1 && !res2) {
+				if (subject->subject == NULL) {
+					subject->subject = calloc(1, sizeof(struct gr_learn_subject_node));
+					if (subject->subject == NULL)
+						failure("calloc");
+				}
+				subject->subject->cap_raise |= (1 << mode);
+			}
+		}		
+	|	ROLENAME ':' NUM ':' NUM ':' NUM ':' filename ':' filename ':' IPADDR ':' NUM ':' NUM ':' NUM ':' NUM ':' IPADDR
+		{
+			struct gr_learn_group_node *group = NULL;
+			struct gr_learn_user_node *user = NULL;
+			struct gr_learn_file_node *subjlist = NULL;
+			struct gr_learn_file_node *subject = NULL;
+			uid_t uid;
+			gid_t gid;
+			struct in_addr ip;
+			__u32 addr;
+			__u16 port;
+			__u8 mode, proto, socktype;
+
+			uid = atoi($5);
+			gid = atoi($7);
+			mode = atoi($19);
+
+			if (inet_aton($13, &ip))
+				addr = ip.s_addr;
+			else
+				addr = 0;
+
+			port = atoi($15);
+			socktype = atoi($17);
+			proto = atoi($19);
+			mode = atoi($21);
+
+			match_role(role_list, uid, gid, &group, &user);
+			if (user)
+				subjlist = user->subject_list;
+			else if (group)
+				subjlist = group->subject_list;
+
+			if (subjlist)
+				subject = match_file_node(subjlist, $9);
+			if (subject && mode == GR_IP_CONNECT)
+				insert_ip(&(subject->connect_list), addr, port, proto, socktype);
+			else if (subject && mode == GR_IP_BIND)
+				insert_ip(&(subject->bind_list), addr, port, proto, socktype);
+		}
+	;
+%%
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_func.h linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_func.h
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_func.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_func.h	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,129 @@
+void yyerror(const char *s);
+FILE *open_acl_file(const char *filename);
+void get_user_passwd(struct gr_pw_entry *entry, int mode);
+int transmit_to_kernel(struct gr_arg_wrapper *buf);
+void generate_salt(struct gr_pw_entry *entry);
+void write_user_passwd(struct gr_pw_entry *entry);
+void parse_acls(void);
+void analyze_acls(void);
+void generate_hash(struct gr_pw_entry *entry);
+void init_variables(void);
+void parse_args(int argc, char *argv[]);
+__u32 cap_conv(const char *cap);
+__u32 file_mode_conv(const char *mode);
+__u32 proc_subject_mode_conv(const char *mode);
+__u32 proc_object_mode_conv(const char *mode);
+int add_proc_subject_acl(struct role_acl *role, char *filename, __u32 mode, int flag);
+int add_proc_object_acl(struct proc_acl *subject, char *filename,
+			__u32 mode, int type);
+void add_cap_acl(struct proc_acl *subject, const char *cap);
+void add_gradm_acl(struct role_acl *role);
+void add_grlearn_acl(struct role_acl *role);
+void change_current_acl_file(const char *filename);
+struct gr_arg_wrapper *conv_user_to_kernel(struct gr_pw_entry *entry);
+int parent_dir(const char *filename, char *parent_dirent[]);
+void rem_proc_object_acl(struct proc_acl *proc, struct file_acl *filp);
+void expand_acls(void);
+int test_perm(const char *obj, const char *subj);
+void add_res_acl(struct proc_acl *subject, const char *name,
+		 const char *soft, const char *hard);
+void pass_struct_to_human(FILE * stream);
+int is_valid_elf_binary(const char *filename);
+void handle_learn_logs(const char *logfile, FILE * stream);
+void modify_caps(struct proc_acl *proc, int cap);
+void modify_res(struct proc_acl *proc, int res, unsigned long cur,
+		unsigned long max);
+void add_ip_acl(struct proc_acl *subject, __u8 mode, struct ip_acl *tmp);
+int read_saltandpass(char *rolename, unsigned char *salt, unsigned char *pass);
+void add_kernel_acl(void);
+int add_role_acl(struct role_acl **role, char *rolename, __u16 type,
+		 int ignore);
+__u16 role_mode_conv(const char *mode);
+__u32 get_ip(char *p);
+void conv_name_to_type(struct ip_acl *ip, char *name);
+void add_role_allowed_ip(struct role_acl *role, __u32 addr, __u32 netmask);
+void add_role_transition(struct role_acl *role, char *rolename);
+void add_id_transition(struct proc_acl *subject, char *idname, int usergroup, int allowdeny);
+void add_proc_nested_acl(struct role_acl *role, char *mainsubjname, char **nestednames, int nestlen, __u32 nestmode);
+void start_grlearn(char *logfile);
+void stop_grlearn(void);
+void sym_store(char *symname, struct var_object *object);
+struct var_object *sym_retrieve(char *symname);
+void add_var_object(struct var_object **object, char *name, __u32 mode);
+void interpret_variable(struct var_object *var);
+struct var_object *union_objects(struct var_object *var1, struct var_object *var2);
+struct var_object *intersect_objects(struct var_object *var1, struct var_object *var2);
+struct var_object *differentiate_objects(struct var_object *var1, struct var_object *var2);
+void sort_file_list(struct gr_hash_struct *hash);
+struct gr_learn_file_node *match_file_node(struct gr_learn_file_node *base, const char *filename);
+struct gr_learn_file_tmp_node *conv_filename_to_struct(char *filename, __u32 mode);
+void match_role(struct gr_learn_group_node **grouplist, uid_t uid, gid_t gid, struct gr_learn_group_node **group, struct gr_learn_user_node **user);
+struct gr_learn_ip_node ** find_insert_ip(struct gr_learn_ip_node **base, __u32 ip, struct gr_learn_ip_node **parent);
+void conv_mode_to_str(__u32 mode, char *modestr, unsigned short len);
+void conv_subj_mode_to_str(__u32 mode, char *modestr, unsigned short len);
+void generate_full_learned_acls(char *learn_log, FILE *stream);
+void reduce_roles(struct gr_learn_group_node ***grouplist);
+void insert_file(struct gr_learn_file_node **base, char *filename, __u32 mode, __u8 subj);
+void first_stage_reduce_tree(struct gr_learn_file_node *base);
+void second_stage_reduce_tree(struct gr_learn_file_node *base);
+void third_stage_reduce_tree(struct gr_learn_file_node *base);
+void traverse_roles(struct gr_learn_group_node **grouplist,
+		int (*act)(struct gr_learn_group_node *group, struct gr_learn_user_node *user, FILE *stream),
+		FILE *stream);
+void traverse_file_tree(struct gr_learn_file_node *base,
+		int (*act)(struct gr_learn_file_node *node, struct gr_learn_file_node *optarg, FILE *stream),
+		struct gr_learn_file_node *optarg, FILE *stream);
+void reduce_ip_tree(struct gr_learn_ip_node *base);
+void reduce_ports_tree(struct gr_learn_ip_node *base);
+void display_roles(struct gr_learn_group_node **grouplist, FILE *stream);
+void add_fulllearn_acl(void);
+void insert_ip(struct gr_learn_ip_node **base, __u32 ip, __u16 port, __u8 proto,
+		__u8 socktype);
+int is_protected_path(char *filename, __u32 mode);
+
+struct gr_learn_role_entry *
+insert_learn_role(struct gr_learn_role_entry ***role_list, char *rolename, __u16 rolemode);
+void insert_learn_object(struct gr_learn_file_node *subject, struct gr_learn_file_tmp_node *object);
+void insert_learn_role_subject(struct gr_learn_role_entry *role, struct gr_learn_file_tmp_node *subject);
+void insert_learn_group_subject(struct gr_learn_group_node *role, struct gr_learn_file_tmp_node *subject);
+void insert_learn_user_subject(struct gr_learn_user_node *role, struct gr_learn_file_tmp_node *subject);
+struct gr_learn_role_entry *
+find_learn_role(struct gr_learn_role_entry **role_list, char *rolename);
+int full_reduce_object_node(struct gr_learn_file_node *subject,
+			    struct gr_learn_file_node *unused1,
+			    FILE *unused2);
+void
+conv_role_mode_to_str(__u16 mode, char *modestr, unsigned short len);
+int full_reduce_ip_node(struct gr_learn_file_node *subject,
+			struct gr_learn_file_node *unused1,
+			FILE *unused2);
+void display_ip_tree(struct gr_learn_ip_node *base, __u8 contype, FILE *stream);
+int display_only_ip(struct gr_learn_ip_node *node, struct gr_learn_ip_node **unused, __u8 unused2,
+		    FILE *stream);
+void traverse_ip_tree(struct gr_learn_ip_node *base,
+			struct gr_learn_ip_node **optarg,
+			int (*act)(struct gr_learn_ip_node *node, struct gr_learn_ip_node **optarg, __u8 contype, FILE *stream),
+			__u8 contype, FILE *stream);
+void display_tree(struct gr_learn_file_node *base, FILE *stream);
+void enforce_high_protected_paths(struct gr_learn_file_node *subject);
+void insert_user(struct gr_learn_group_node ***grouplist, char *username, char *groupname, uid_t uid, gid_t gid);
+void add_rolelearn_acl(void);
+int ensure_subject_security(struct gr_learn_file_node *subject,
+			struct gr_learn_file_node *unused1,
+			FILE *unused2);
+
+void check_acl_status(__u16 reqmode);
+struct file_acl *lookup_acl_object_by_name(struct proc_acl *subject, char *name);
+struct proc_acl *lookup_acl_subject_by_name(struct role_acl *role, char *name);
+struct file_acl *lookup_acl_object(struct proc_acl *subject, struct file_acl *object);
+struct proc_acl *lookup_acl_subject(struct role_acl *role, struct proc_acl *subject);
+
+void * gr_dyn_alloc(unsigned long len);
+void * gr_stat_alloc(unsigned long len);
+void * gr_dyn_realloc(void *addr, unsigned long len);
+void gr_dyn_free(void *addr);
+
+void insert_acl_object(struct proc_acl *subject, struct file_acl *object);
+void insert_acl_subject(struct role_acl *role, struct proc_acl *subject);
+
+void insert_nested_acl_subject(struct proc_acl *subject);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_human.c linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_human.c
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_human.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_human.c	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,161 @@
+#include "gradm.h"
+
+static struct role_name_table {
+	__u16 modeint;
+	char modechar;
+} role_mode_table[] = {
+	{
+	GR_ROLE_USER, 'u'}, {
+	GR_ROLE_GROUP, 'g'}, {
+	GR_ROLE_SPECIAL, 's'}, {
+	GR_ROLE_AUTH, 'G'}, {
+	GR_ROLE_NOPW, 'N'}, {
+	GR_ROLE_GOD, 'A'}, {
+	GR_ROLE_TPE, 'T'}
+};
+
+static struct mode_name_table {
+	__u32 modeint;
+	char modechar;
+} mode_table[] = {
+	{
+	GR_READ, 'r'}, {
+	GR_EXEC, 'x'}, {
+	GR_WRITE, 'w'}, {
+	GR_APPEND, 'a'}, {
+	GR_INHERIT, 'i'}, {
+	GR_PTRACERD, 't'}, {
+	GR_SETID,    'm'}, {
+	GR_CREATE,    'c'}, {
+	GR_DELETE,    'd'}, {
+	GR_AUDIT_FIND, 'F'}, {
+	GR_AUDIT_READ, 'R'}, {
+	GR_AUDIT_WRITE, 'W'}, {
+	GR_AUDIT_EXEC, 'X'}, {
+	GR_AUDIT_APPEND, 'A'}, {
+	GR_AUDIT_INHERIT, 'I'}, {
+	GR_AUDIT_SETID, 'M'}, {
+	GR_AUDIT_CREATE, 'C'}, {
+	GR_AUDIT_DELETE, 'D'}, {
+	GR_SUPPRESS, 's'}, {
+	GR_NOPTRACE, 'p'}, {
+	GR_FIND, 'h'}
+};
+
+static struct subj_mode_name_table {
+	__u32 modeint;
+	char modechar;
+} subj_mode_table[] = {
+	{
+	GR_OVERRIDE, 'o'}, {
+	GR_KILL, 'k'}, {
+	GR_PROTECTED, 'p'}, {
+	GR_VIEW, 'v'}, {
+	GR_IGNORE, 'O'}, {
+	GR_FIND, 'h'}, {
+	GR_PROTSHM, 'A'}, {
+	GR_PAXPAGE, 'P'}, {
+	GR_PAXSEGM, 'S'}, {
+	GR_PAXRANDMMAP, 'R'}, {
+	GR_PAXGCC, 'G'}, {
+	GR_PAXMPROTECT, 'M'}, {
+	GR_PAXRANDEXEC, 'X'}, {
+	GR_KILLPROC, 'K'}, {
+	GR_KILLIPPROC, 'C'}, {
+	GR_NOTROJAN, 'T'}, {
+	GR_PROTPROCFD, 'd'}, {
+	GR_PROCACCT, 'b'}, {
+	GR_RELAXPTRACE, 'r'}
+};
+
+void
+conv_mode_to_str(__u32 mode, char *modestr, unsigned short len)
+{
+	unsigned short i;
+	unsigned short x;
+
+	memset(modestr, 0, len);
+
+	for (x = 0, i = 0;
+	     i < len
+	     && x < (sizeof (mode_table) / sizeof (struct mode_name_table));
+	     x++) {
+		if (mode_table[x].modeint == GR_WRITE && (mode & GR_WRITE)) {
+			modestr[i] = 'w';
+			mode &= ~GR_APPEND;
+			i++;
+			continue;
+		}
+		if (mode_table[x].modeint == GR_AUDIT_WRITE
+		    && (mode & GR_AUDIT_WRITE)) {
+			modestr[i] = 'W';
+			mode &= ~GR_AUDIT_APPEND;
+			i++;
+			continue;
+		}
+		if (mode_table[x].modeint == GR_FIND && !(mode & GR_FIND)) {
+			modestr[i] = 'h';
+			i++;
+			continue;
+		} else if (mode_table[x].modeint == GR_FIND)
+			continue;
+
+		if (mode & mode_table[x].modeint) {
+			modestr[i] = mode_table[x].modechar;
+			i++;
+		}
+	}
+
+	return;
+}
+
+void
+conv_subj_mode_to_str(__u32 mode, char *modestr, unsigned short len)
+{
+	unsigned short i;
+	unsigned short x;
+
+	memset(modestr, 0, len);
+
+	for (x = 0, i = 0;
+	     i < len
+	     && x <
+	     (sizeof (subj_mode_table) / sizeof (struct subj_mode_name_table));
+	     x++) {
+		if (subj_mode_table[x].modeint == GR_FIND && !(mode & GR_FIND)) {
+			modestr[i] = 'h';
+			i++;
+			continue;
+		} else if (subj_mode_table[x].modeint == GR_FIND)
+			continue;
+
+		if (mode & subj_mode_table[x].modeint) {
+			modestr[i] = subj_mode_table[x].modechar;
+			i++;
+		}
+	}
+
+	return;
+}
+
+void
+conv_role_mode_to_str(__u16 mode, char *modestr, unsigned short len)
+{
+	unsigned short i;
+	unsigned short x;
+
+	memset(modestr, 0, len);
+
+	for (x = 0, i = 0;
+	     i < len
+	     && x <
+	     (sizeof (role_mode_table) / sizeof (struct role_name_table));
+	     x++) {
+		if (mode & role_mode_table[x].modeint) {
+			modestr[i] = role_mode_table[x].modechar;
+			i++;
+		}
+	}
+
+	return;
+}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_learn.c linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_learn.c
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_learn.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_learn.c	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,325 @@
+#include "gradm.h"
+
+struct gr_learn_role_entry *default_role_entry;
+struct gr_learn_role_entry **group_role_list;
+struct gr_learn_role_entry **user_role_list;
+struct gr_learn_role_entry **special_role_list;
+
+extern FILE *learn_pass1in;
+extern FILE *learn_pass2in;
+extern int learn_pass1parse(void);
+extern int learn_pass2parse(void);
+
+void learn_pass1(FILE *stream)
+{
+	struct gr_learn_role_entry **tmp;
+	struct gr_learn_file_tmp_node **tmptable;
+	unsigned long i;
+	__u32 table_size;
+
+	learn_pass1in = stream;
+	learn_pass1parse();
+
+	if (default_role_entry) {
+		tmptable = (struct gr_learn_file_tmp_node **)default_role_entry->hash->table;
+		table_size = default_role_entry->hash->table_size;
+		sort_file_list(default_role_entry->hash);
+		for (i = 0; i < table_size; i++) {
+			if (tmptable[i] == NULL)
+				continue;
+			if (default_role_entry->rolemode & GR_ROLE_LEARN)
+				insert_file(&(default_role_entry->subject_list), tmptable[i]->filename, tmptable[i]->mode, 1);
+			else
+				insert_file(&(default_role_entry->subject_list), tmptable[i]->filename, tmptable[i]->mode, 2);
+		}
+		if (default_role_entry->rolemode & GR_ROLE_LEARN)
+			reduce_ip_tree(default_role_entry->allowed_ips);
+	}
+
+	tmp = group_role_list;
+	while (tmp && *tmp) {
+		tmptable = (struct gr_learn_file_tmp_node **)(*tmp)->hash->table;
+		table_size = (*tmp)->hash->table_size;
+		sort_file_list((*tmp)->hash);
+		for (i = 0; i < table_size; i++) {
+			if (tmptable[i] == NULL)
+				continue;
+			if ((*tmp)->rolemode & GR_ROLE_LEARN)
+				insert_file(&((*tmp)->subject_list), tmptable[i]->filename, tmptable[i]->mode, 1);
+			else
+				insert_file(&((*tmp)->subject_list), tmptable[i]->filename, tmptable[i]->mode, 2);
+		}
+		if ((*tmp)->rolemode & GR_ROLE_LEARN)
+			reduce_ip_tree((*tmp)->allowed_ips);
+		tmp++;
+	}
+
+	tmp = user_role_list;
+	while (tmp && *tmp) {
+		tmptable = (struct gr_learn_file_tmp_node **)(*tmp)->hash->table;
+		table_size = (*tmp)->hash->table_size;
+		sort_file_list((*tmp)->hash);
+		for (i = 0; i < table_size; i++) {
+			if (tmptable[i] == NULL)
+				continue;
+			if ((*tmp)->rolemode & GR_ROLE_LEARN)
+				insert_file(&((*tmp)->subject_list), tmptable[i]->filename, tmptable[i]->mode, 1);
+			else
+				insert_file(&((*tmp)->subject_list), tmptable[i]->filename, tmptable[i]->mode, 2);
+		}
+		if ((*tmp)->rolemode & GR_ROLE_LEARN)
+			reduce_ip_tree((*tmp)->allowed_ips);
+		tmp++;
+	}
+
+	tmp = special_role_list;
+	while (tmp && *tmp) {
+		tmptable = (struct gr_learn_file_tmp_node **)(*tmp)->hash->table;
+		table_size = (*tmp)->hash->table_size;
+		sort_file_list((*tmp)->hash);
+		for (i = 0; i < table_size; i++) {
+			if (tmptable[i] == NULL)
+				continue;
+			if ((*tmp)->rolemode & GR_ROLE_LEARN)
+				insert_file(&((*tmp)->subject_list), tmptable[i]->filename, tmptable[i]->mode, 1);
+			else
+				insert_file(&((*tmp)->subject_list), tmptable[i]->filename, tmptable[i]->mode, 2);
+		}
+		if ((*tmp)->rolemode & GR_ROLE_LEARN)
+			reduce_ip_tree((*tmp)->allowed_ips);
+		tmp++;
+	}
+
+	return;
+}
+
+void merge_acl_rules()
+{
+	struct gr_learn_role_entry *matchrole = NULL;
+	struct gr_learn_file_node *matchsubj = NULL;
+	struct role_acl *role;
+	struct proc_acl *subject;
+	struct file_acl *object;
+	struct ip_acl *ipp;
+	unsigned int i, x, y;
+
+	for_each_role(role, current_role) {
+		if (role->roletype & GR_ROLE_LEARN)
+			continue;
+
+		if (role->roletype & GR_ROLE_USER)
+			matchrole = find_learn_role(user_role_list, role->rolename);
+		else if (role->roletype & GR_ROLE_GROUP)
+			matchrole = find_learn_role(group_role_list, role->rolename);
+		else if (role->roletype & GR_ROLE_SPECIAL)
+			matchrole = find_learn_role(special_role_list, role->rolename);
+		else
+			matchrole = default_role_entry;
+
+		for_each_subject(subject, role) {
+			if (!(subject->mode & GR_LEARN))
+				continue;
+			if (matchrole)
+				matchsubj = match_file_node(matchrole->subject_list, subject->filename);
+			if (matchrole && matchsubj) {
+				if (matchsubj->subject == NULL) {
+					matchsubj->subject = calloc(1, sizeof(struct gr_learn_subject_node));
+					if (matchsubj->subject == NULL)
+						failure("calloc");
+				}
+				matchsubj->subject->cap_raise |= ~subject->cap_drop;
+				matchsubj->subject->resmask |= subject->resmask;
+				for (i = 0; i < GR_NLIMITS; i++) {
+					if (subject->res[i].rlim_cur > matchsubj->subject->res[i].rlim_cur)
+						matchsubj->subject->res[i].rlim_cur = subject->res[i].rlim_cur;
+					if (subject->res[i].rlim_max > matchsubj->subject->res[i].rlim_max)
+						matchsubj->subject->res[i].rlim_max = subject->res[i].rlim_max;
+				}
+				for_each_object(object, subject) {
+					insert_learn_object(matchsubj, conv_filename_to_struct(object->filename, object->mode));
+				}
+				for (i = 0; i < subject->ip_num; i++) {
+					ipp = subject->ips[i];
+					if (ipp->mode == GR_IP_CONNECT) {
+						for (i = ipp->low; i <= ipp->high; i++)
+						for (x = 0; x < 5; x++)
+						for (y = 0; y < 256; y++)
+						if ((ipp->type & (1 << x)) && (ipp->proto[y / 32] & (1 << y % 32)))
+							insert_ip(&(matchsubj->connect_list), ipp->addr, i, x, y);
+					} else if (ipp->mode == GR_IP_BIND) {
+						for (i = ipp->low; i <= ipp->high; i++)
+						for (x = 0; x < 5; x++)
+						for (y = 0; y < 256; y++)
+						if ((ipp->type & (1 << x)) && (ipp->proto[y / 32] & (1 << y % 32)))
+							insert_ip(&(matchsubj->bind_list), ipp->addr, i, x, y);
+					}
+				}
+			}
+		}
+	}
+			
+
+	return;
+}
+
+void learn_pass2(FILE *stream)
+{
+	struct gr_learn_role_entry **tmp;
+	struct gr_learn_file_node *subjects;
+	
+	learn_pass2in = stream;
+	learn_pass2parse();
+
+	merge_acl_rules();
+
+	if (default_role_entry) {
+		subjects = default_role_entry->subject_list;
+		traverse_file_tree(subjects, &full_reduce_object_node, NULL, NULL);
+		traverse_file_tree(subjects, &full_reduce_ip_node, NULL, NULL);
+		traverse_file_tree(subjects, &ensure_subject_security, NULL, NULL);
+	}
+
+	tmp = group_role_list;
+	while (tmp && *tmp) {
+		subjects = (*tmp)->subject_list;
+		traverse_file_tree(subjects, &full_reduce_object_node, NULL, NULL);
+		traverse_file_tree(subjects, &full_reduce_ip_node, NULL, NULL);
+		traverse_file_tree(subjects, &ensure_subject_security, NULL, NULL);
+		tmp++;
+	}
+
+	tmp = user_role_list;
+	while (tmp && *tmp) {
+		subjects = (*tmp)->subject_list;
+		traverse_file_tree(subjects, &full_reduce_object_node, NULL, NULL);
+		traverse_file_tree(subjects, &full_reduce_ip_node, NULL, NULL);
+		traverse_file_tree(subjects, &ensure_subject_security, NULL, NULL);
+		tmp++;
+	}
+
+	tmp = special_role_list;
+	while (tmp && *tmp) {
+		subjects = (*tmp)->subject_list;
+		traverse_file_tree(subjects, &full_reduce_object_node, NULL, NULL);
+		traverse_file_tree(subjects, &full_reduce_ip_node, NULL, NULL);
+		traverse_file_tree(subjects, &ensure_subject_security, NULL, NULL);
+		tmp++;
+	}
+
+	return;
+}
+
+void
+perform_parse_and_reduce(const char *file)
+{
+	FILE *learnlog;
+
+	learnlog = fopen(file, "r");
+	if (learnlog == NULL) {
+		fprintf(stderr, "Unable to open learning log: %s.\n"
+				"Error: %s\n", file, strerror(errno));
+		exit(EXIT_FAILURE);
+	}
+
+	learn_pass1(learnlog);
+	fseek(learnlog, 0, SEEK_SET);
+	learn_pass2(learnlog);
+
+	fclose(learnlog);
+
+	return;
+}
+
+void display_learn_logs(FILE *stream)
+{
+	struct gr_learn_role_entry **tmp;
+	struct gr_learn_file_node *subjects;
+	struct gr_learn_ip_node *allowed_ips;
+	char rolemode[17];
+	
+	if (default_role_entry) {
+		if (!(default_role_entry->rolemode & GR_ROLE_LEARN))
+			fprintf(stream, "###  THE BELOW SUBJECT(S) SHOULD BE ADDED TO THE DEFAULT ROLE ###\n");
+		else
+			fprintf(stream, "role default G\n");
+		subjects = default_role_entry->subject_list;
+		allowed_ips = default_role_entry->allowed_ips;
+		if (allowed_ips)
+			traverse_ip_tree(allowed_ips, NULL, &display_only_ip, 0, stream);
+		if (subjects)
+			display_tree(subjects, stream);
+
+		fprintf(stream, "\n");
+	}
+
+	tmp = group_role_list;
+	while (tmp && *tmp) {
+		if (!((*tmp)->rolemode & GR_ROLE_LEARN))
+			fprintf(stream, "###  THE BELOW SUBJECT(S) SHOULD BE ADDED TO THE GROUP ROLE \"%s\" ###\n", (*tmp)->rolename);
+		else {
+			conv_role_mode_to_str((*tmp)->rolemode, rolemode, sizeof(rolemode));
+			fprintf(stream, "role %s %s\n", (*tmp)->rolename, rolemode);
+		}
+		subjects = (*tmp)->subject_list;
+		allowed_ips = (*tmp)->allowed_ips;
+		if (allowed_ips)
+			traverse_ip_tree(allowed_ips, NULL, &display_only_ip, 0, stream);
+		if (subjects)
+			display_tree(subjects, stream);
+
+		fprintf(stream, "\n");
+		tmp++;
+	}
+
+	tmp = user_role_list;
+	while (tmp && *tmp) {
+		if (!((*tmp)->rolemode & GR_ROLE_LEARN))
+			fprintf(stream, "###  THE BELOW SUBJECT(S) SHOULD BE ADDED TO THE USER ROLE \"%s\" ###\n", (*tmp)->rolename);
+		else {
+			conv_role_mode_to_str((*tmp)->rolemode, rolemode, sizeof(rolemode));
+			fprintf(stream, "role %s %s\n", (*tmp)->rolename, rolemode);
+		}
+		subjects = (*tmp)->subject_list;
+		allowed_ips = (*tmp)->allowed_ips;
+		if (allowed_ips)
+			traverse_ip_tree(allowed_ips, NULL, &display_only_ip, 0, stream);
+		if (subjects)
+			display_tree(subjects, stream);
+
+		fprintf(stream, "\n");
+		tmp++;
+	}
+
+	tmp = special_role_list;
+	while (tmp && *tmp) {
+		if (!((*tmp)->rolemode & GR_ROLE_LEARN))
+			fprintf(stream, "###  THE BELOW SUBJECT(S) SHOULD BE ADDED TO THE SPECIAL ROLE \"%s\" ###\n", (*tmp)->rolename);
+		else {
+			conv_role_mode_to_str((*tmp)->rolemode, rolemode, sizeof(rolemode));
+			fprintf(stream, "role %s %s\n", (*tmp)->rolename, rolemode);
+		}
+		subjects = (*tmp)->subject_list;
+		allowed_ips = (*tmp)->allowed_ips;
+		if (allowed_ips)
+			traverse_ip_tree(allowed_ips, NULL, &display_only_ip, 0, stream);
+		if (subjects)
+			display_tree(subjects, stream);
+
+		fprintf(stream, "\n");
+		tmp++;
+	}
+
+	return;
+}	
+
+
+void
+handle_learn_logs(const char *file, FILE * stream)
+{
+	parse_acls();
+	expand_acls();
+	perform_parse_and_reduce(file);
+	display_learn_logs(stream);
+
+	return;
+}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_learn_pass1.l linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_learn_pass1.l
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_learn_pass1.l	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_learn_pass1.l	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,41 @@
+%{
+#include "gradm.h"
+#include "learn_pass1.tab.h"
+
+void learn_pass1error(const char *s);
+int learn_pass1wrap(void);
+%}
+
+ROLENAME [_a-zA-Z0-9-]{1,30}
+NUM [0-9]+
+FILENAME [/][^\t\n]*
+IPADDR [0-9]{1,3}"."[0-9]{1,3}"."[0-9]{1,3}"."[0-9]{1,3}
+
+%option nounput
+
+%x ERROR
+
+%%
+
+{NUM}					{
+					  learn_pass1lval.string = strdup(yytext);
+					  return NUM;
+					}
+{ROLENAME}				{
+					  learn_pass1lval.string = strdup(yytext);
+					  return ROLENAME;
+					}
+{FILENAME}				{
+					  learn_pass1lval.string = strdup(yytext);
+					  return FILENAME;
+					}
+{IPADDR}				{
+					  learn_pass1lval.string = strdup(yytext);
+					  return IPADDR;
+					}
+[\t]					{ return ':'; }
+.					;
+%%
+
+void learn_pass1error(const char *s) { return; }
+int learn_pass1wrap(void) { return 1; }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_learn_pass1.y linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_learn_pass1.y
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_learn_pass1.y	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_learn_pass1.y	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,112 @@
+%{
+#include "gradm.h"
+extern int learn_pass1lex(void);
+
+extern struct gr_learn_role_entry *default_role_entry;
+extern struct gr_learn_role_entry **group_role_list;
+extern struct gr_learn_role_entry **user_role_list;
+extern struct gr_learn_role_entry **special_role_list;
+
+%}
+
+%union {
+	char * string;
+}
+
+%token <string> NUM FILENAME IPADDR ROLENAME
+%type <string> filename
+
+%%
+
+learn_logs:	learn_log
+	|	learn_logs learn_log
+	;
+
+filename:	/*empty*/	{ $$ = strdup(""); }
+	|	FILENAME	{
+				  if (!strcmp($1, "//"))
+					$1[1] = '\0';
+				  $$ = $1;
+				}
+	;
+
+learn_log:
+		error
+	|	ROLENAME ':' NUM ':' NUM ':' NUM ':' filename ':' filename ':' NUM ':' NUM ':' filename ':' NUM ':' IPADDR
+		{
+			struct gr_learn_role_entry *role;
+			unsigned long res1, res2;
+			__u16 rolemode;
+			struct in_addr ip;
+			__u32 addr;
+
+			rolemode = atoi($3);
+			res1 = atoi($13);
+			res2 = atoi($15);
+
+			if (inet_aton($21, &ip))
+				addr = ip.s_addr;
+			else
+				addr = 0;
+
+			if (rolemode & GR_ROLE_USER)
+				role = insert_learn_role(&user_role_list, $1, rolemode);
+			else if (rolemode & GR_ROLE_GROUP)
+				role = insert_learn_role(&group_role_list, $1, rolemode);
+			else if (rolemode & GR_ROLE_SPECIAL)
+				role = insert_learn_role(&special_role_list, $1, rolemode);
+			else {
+				if (default_role_entry == NULL) {
+					default_role_entry = calloc(1, sizeof(struct gr_learn_role_entry));
+					if (!default_role_entry)
+						failure("calloc");
+				}
+
+				role = default_role_entry;
+			}
+
+			if (rolemode & GR_ROLE_LEARN) {
+				insert_ip(&(role->allowed_ips), addr, 0, 0, 0);
+				if ((!strcmp($17, "") && strlen($9) > 1 && !res1 && !res2) || is_protected_path($17, atoi($19)))
+					insert_learn_role_subject(role, conv_filename_to_struct($9, GR_FIND | GR_OVERRIDE));
+			} else if (strlen($9) > 1)
+				insert_learn_role_subject(role, conv_filename_to_struct($11, GR_FIND | GR_OVERRIDE));
+		}		
+	|	ROLENAME ':' NUM ':' NUM ':' NUM ':' filename ':' filename ':' IPADDR ':' NUM ':' NUM ':' NUM ':' NUM ':' IPADDR
+		{
+			struct gr_learn_role_entry *role;
+			__u16 rolemode;
+			struct in_addr ip;
+			__u32 addr;
+
+			rolemode = atoi($3);
+
+			if (inet_aton($23, &ip))
+				addr = ip.s_addr;
+			else
+				addr = 0;
+
+			if (rolemode & GR_ROLE_USER)
+				role = insert_learn_role(&user_role_list, $1, rolemode);
+			else if (rolemode & GR_ROLE_GROUP)
+				role = insert_learn_role(&group_role_list, $1, rolemode);
+			else if (rolemode & GR_ROLE_SPECIAL)
+				role = insert_learn_role(&special_role_list, $1, rolemode);
+			else {
+				if (default_role_entry == NULL) {
+					default_role_entry = calloc(1, sizeof(struct gr_learn_role_entry));
+					if (!default_role_entry)
+						failure("calloc");
+				}
+	
+				role = default_role_entry;
+			}
+
+			if (rolemode & GR_ROLE_LEARN) {
+				insert_ip(&(role->allowed_ips), addr, 0, 0, 0);
+				insert_learn_role_subject(role, conv_filename_to_struct($9, GR_FIND | GR_OVERRIDE));
+			} else if (strlen($9) > 1)
+				insert_learn_role_subject(role, conv_filename_to_struct($11, GR_FIND | GR_OVERRIDE));
+		}
+	;
+%%
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_learn_pass2.l linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_learn_pass2.l
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_learn_pass2.l	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_learn_pass2.l	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,41 @@
+%{
+#include "gradm.h"
+#include "learn_pass2.tab.h"
+
+void learn_pass2error(const char *s);
+int learn_pass2wrap(void);
+%}
+
+ROLENAME [_a-zA-Z0-9-]{1,30}
+NUM [0-9]+
+FILENAME [/][^\t\n]*
+IPADDR [0-9]{1,3}"."[0-9]{1,3}"."[0-9]{1,3}"."[0-9]{1,3}
+
+%option nounput
+
+%x ERROR
+
+%%
+
+{NUM}					{
+					  learn_pass2lval.string = strdup(yytext);
+					  return NUM;
+					}
+{ROLENAME}				{
+					  learn_pass2lval.string = strdup(yytext);
+					  return ROLENAME;
+					}
+{FILENAME}				{
+					  learn_pass2lval.string = strdup(yytext);
+					  return FILENAME;
+					}
+{IPADDR}				{
+					  learn_pass2lval.string = strdup(yytext);
+					  return IPADDR;
+					}
+[\t]					{ return ':'; }
+.					;
+%%
+
+void learn_pass2error(const char *s) { return; }
+int learn_pass2wrap(void) { return 1; }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_learn_pass2.y linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_learn_pass2.y
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_learn_pass2.y	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_learn_pass2.y	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,123 @@
+%{
+#include "gradm.h"
+extern int learn_pass2lex(void);
+
+extern struct gr_learn_role_entry *default_role_entry;
+extern struct gr_learn_role_entry **group_role_list;
+extern struct gr_learn_role_entry **user_role_list;
+extern struct gr_learn_role_entry **special_role_list;
+
+%}
+
+%union {
+	char * string;
+}
+
+%token <string> NUM FILENAME IPADDR ROLENAME
+%type <string> filename
+
+%%
+
+learn_logs:	learn_log
+	|	learn_logs learn_log
+	;
+
+filename:	/*empty*/	{ $$ = strdup(""); }
+	|	FILENAME	{
+				  if (!strcmp($1, "//"))
+					$1[1] = '\0';
+				  $$ = $1;
+				}
+	;
+
+learn_log:
+		error
+	|	ROLENAME ':' NUM ':' NUM ':' NUM ':' filename ':' filename ':' NUM ':' NUM ':' filename ':' NUM ':' IPADDR
+		{
+			struct gr_learn_role_entry *role;
+			struct gr_learn_file_node *subjlist;
+			struct gr_learn_file_node *subject;
+			__u32 mode;
+			__u16 rolemode;
+			unsigned long res1, res2;
+
+			rolemode = atoi($3);
+			mode = atoi($19);
+			res1 = atol($13);
+			res2 = atol($15);
+
+
+			if (rolemode & GR_ROLE_USER)
+				role = insert_learn_role(&user_role_list, $1, rolemode);
+			else if (rolemode & GR_ROLE_GROUP)
+				role = insert_learn_role(&group_role_list, $1, rolemode);
+			else if (rolemode & GR_ROLE_SPECIAL)
+				role = insert_learn_role(&special_role_list, $1, rolemode);
+			else
+				role = default_role_entry;
+
+			subjlist = role->subject_list;
+
+			if (rolemode & GR_ROLE_LEARN)
+				subject = match_file_node(subjlist, $9);
+			else
+				subject = match_file_node(subjlist, $11);
+				
+			if (strcmp($17, ""))
+				insert_learn_object(subject, conv_filename_to_struct($17, mode | GR_FIND));
+			else if ((strlen($9) > 1) && !res1 && !res2) {
+				if (subject->subject == NULL) {
+					subject->subject = calloc(1, sizeof(struct gr_learn_subject_node));
+					if (subject->subject == NULL)
+						failure("calloc");
+				}
+				subject->subject->cap_raise |= (1 << mode);
+			}
+		}		
+	|	ROLENAME ':' NUM ':' NUM ':' NUM ':' filename ':' filename ':' IPADDR ':' NUM ':' NUM ':' NUM ':' NUM ':' IPADDR
+		{
+			struct gr_learn_role_entry *role;
+			struct gr_learn_file_node *subjlist;
+			struct gr_learn_file_node *subject;
+			__u16 rolemode;
+			struct in_addr ip;
+			__u32 addr;
+			__u16 port;
+			__u8 mode, proto, socktype;
+
+			mode = atoi($19);
+
+			rolemode = atoi($3);
+			if (inet_aton($13, &ip))
+				addr = ip.s_addr;
+			else
+				addr = 0;
+
+			port = atoi($15);
+			socktype = atoi($17);
+			proto = atoi($19);
+			mode = atoi($21);
+
+			if (rolemode & GR_ROLE_USER)
+				role = insert_learn_role(&user_role_list, $1, rolemode);
+			else if (rolemode & GR_ROLE_GROUP)
+				role = insert_learn_role(&group_role_list, $1, rolemode);
+			else if (rolemode & GR_ROLE_SPECIAL)
+				role = insert_learn_role(&special_role_list, $1, rolemode);
+			else
+				role = default_role_entry;
+
+			subjlist = role->subject_list;
+
+			if (rolemode & GR_ROLE_LEARN)
+				subject = match_file_node(subjlist, $9);
+			else
+				subject = match_file_node(subjlist, $11);
+				
+			if (mode == GR_IP_CONNECT)
+				insert_ip(&(subject->connect_list), addr, port, proto, socktype);
+			else if (mode == GR_IP_BIND)
+				insert_ip(&(subject->bind_list), addr, port, proto, socktype);
+		}
+	;
+%%
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_lib.c linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_lib.c
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_lib.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_lib.c	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,561 @@
+#include "gradm.h"
+
+/* anticipatory memory allocator */
+
+/* gr_stat_alloc(): for groups of allocations that need to be done quickly
+		    allocate several more of larger size, fit for use as
+		    filenames (4k), then hand out one at a time until 
+		    there are none left.
+   gr_dyn_alloc() : addresses that need constant resizing
+		    here we allocate 16 times the amount requested,
+		    once this is full, we redirect to the real realloc,
+		    and then update our internal structures.
+*/
+
+struct mem_entry {
+	void *data;
+	void *current;
+};
+
+struct resize_entry {
+	unsigned long max;
+};
+
+#define MAX_MEM_SIZE	512
+#define MAX_RESIZE_SIZE	16
+
+static struct mem_entry **stat_alloc = NULL;
+static unsigned long stat_alloc_num = 0;
+static unsigned long stat_alloc_start = 0;
+
+void gr_stat_free_all(void)
+{
+	unsigned long i;
+
+	for (i = 0; i < stat_alloc_num; i++)
+		free(stat_alloc[i]->data);
+	if (stat_alloc != NULL)
+		free(stat_alloc);
+	stat_alloc_num = 0;
+	stat_alloc = NULL;
+}
+
+void * gr_stat_alloc(unsigned long len)
+{
+	unsigned long i, j;
+	void *ret = NULL;
+
+	if (stat_alloc == NULL) {
+		stat_alloc = calloc(MAX_MEM_SIZE, sizeof(struct mem_entry *));
+		if (stat_alloc == NULL)
+			failure("calloc");
+		stat_alloc_num = MAX_MEM_SIZE;
+
+		/* allocate new mem_entries */
+		for (j = 0; j < MAX_MEM_SIZE; j++) {
+			stat_alloc[j] = calloc(1, sizeof(struct mem_entry));
+			if (stat_alloc[j] == NULL)
+				failure("calloc");
+		}
+	}
+
+	for (i = stat_alloc_start; i < stat_alloc_num; i++) {
+		if (stat_alloc[i]->data != NULL) {
+			if ((stat_alloc[i]->current - stat_alloc[i]->data + len) < (PATH_MAX * MAX_MEM_SIZE)) {
+				ret = stat_alloc[i]->current;
+				stat_alloc[i]->current = stat_alloc[i]->current + len;
+				return ret;
+			}
+		} else
+			break;
+	}
+
+	if (i == stat_alloc_num) {
+		/* out of space, need to resize allocation list */
+		stat_alloc = realloc(stat_alloc, (stat_alloc_num + MAX_MEM_SIZE) * sizeof(struct mem_entry *));
+		if (stat_alloc == NULL)
+			failure("realloc");
+		stat_alloc_num = stat_alloc_num + MAX_MEM_SIZE;
+		memset(stat_alloc + MAX_MEM_SIZE, 0, MAX_MEM_SIZE * sizeof(struct mem_entry *));
+
+		/* allocate new mem_entries */
+		for (j = 0; j < MAX_MEM_SIZE; j++) {
+			stat_alloc[MAX_MEM_SIZE + j] = calloc(1, sizeof(struct mem_entry));
+			if (stat_alloc[MAX_MEM_SIZE + j] == NULL)
+				failure("calloc");
+		}
+	}
+
+	/* ->data was null, let's allocate it */
+	stat_alloc[i]->data = malloc(PATH_MAX * MAX_MEM_SIZE);
+	if (stat_alloc[i]->data == NULL)
+		failure("malloc");
+	stat_alloc[i]->current = stat_alloc[i]->data + len;
+	stat_alloc_start = i;
+	ret = stat_alloc[i]->data;
+
+	return ret;
+}
+
+void * gr_dyn_alloc(unsigned long len)
+{
+	void *ret;
+	struct resize_entry *resent;
+
+	/* store usage information before the actual allocation. */
+	ret = calloc(1, (MAX_RESIZE_SIZE * len) + sizeof(struct resize_entry));
+	if (ret == NULL)
+		failure("calloc");
+	resent = ret;
+	resent->max = MAX_RESIZE_SIZE * len;
+	ret = ret + sizeof(struct resize_entry);
+
+	return ret;
+}
+
+void * gr_dyn_realloc(void *addr, unsigned long len)
+{
+	void *ret = NULL;
+	struct resize_entry *resent;
+
+	if (addr == NULL)
+		return gr_dyn_alloc(len);
+
+	resent = addr - sizeof(struct resize_entry);
+	if (len < resent->max)
+		return addr;
+	else {
+		ret = realloc(resent, (MAX_RESIZE_SIZE * len) + sizeof(struct resize_entry));
+		if (ret == NULL)
+			failure("relloc");
+		resent = ret;
+		resent->max = MAX_RESIZE_SIZE * len;
+		ret = ret + sizeof(struct resize_entry);
+	}
+
+	return ret;		
+}
+
+void gr_dyn_free(void *addr)
+{
+	void *ptr;
+
+	ptr = addr - sizeof(struct resize_entry);
+	free(ptr);
+
+	return;
+}
+
+unsigned long table_sizes[] = {
+	13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
+	32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
+	4194301, 8388593, 16777213, 33554393, 67108859, 134217689,
+	268435399, 536870909, 1073741789, 2147483647
+};
+
+static __inline__ unsigned long
+fhash(const unsigned long ino, const unsigned int dev, const unsigned long sz)
+{
+	return (((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9))) % sz);
+}
+
+/* Name hashing routines. Initial hash value */
+/* Hash courtesy of the R5 hash in reiserfs modulo sign bits */
+#define init_name_hash()                0
+
+/* partial hash update function. Assume roughly 4 bits per character */
+static __inline__ unsigned long partial_name_hash(unsigned long c, 
+unsigned long prevhash)
+{
+	return (prevhash + (c << 4) + (c >> 4)) * 11;
+}
+
+/* Finally: cut down the number of bits to a int value (and try to avoid losing bits) */
+static __inline__ unsigned long end_name_hash(unsigned long hash)
+{
+	return (unsigned int) hash;
+}
+
+/* Compute the hash for a name string. */
+static __inline__ unsigned int full_name_hash(const unsigned char * name)
+{
+	unsigned long hash = init_name_hash();
+	while (*name != '\0')
+		hash = partial_name_hash(*name++, hash);
+	return end_name_hash(hash);
+}
+
+static __inline__ unsigned long
+nhash(const char *name, const unsigned long sz)
+{
+	return full_name_hash(name) % sz;
+}
+
+void insert_hash_entry(struct gr_hash_struct *hash, void *entry);
+void insert_name_entry(struct gr_hash_struct *hash, void *entry);
+
+void resize_hash_table(struct gr_hash_struct *hash)
+{
+	unsigned long i;
+	struct gr_hash_struct newhash;
+
+	for (i = 0; i < sizeof(table_sizes)/sizeof(table_sizes[0]); i++) {
+		if (table_sizes[i] > hash->table_size) {
+			newhash.table_size = table_sizes[i];
+			break;
+		}
+	}
+
+	if (newhash.table_size == 0) {
+		fprintf(stderr, "Out of memory.\n");
+		exit(EXIT_FAILURE);
+	}
+
+	newhash.table = calloc(newhash.table_size, sizeof(void *));
+	if (newhash.table == NULL)
+		failure("calloc");
+
+	newhash.nametable = NULL;
+	if (hash->type != GR_HASH_FILENAME) {
+		newhash.nametable = calloc(newhash.table_size, sizeof(void *));
+		if (newhash.nametable == NULL)
+			failure("calloc");
+	}
+
+	newhash.used_size = 0;
+	newhash.type = hash->type;
+	newhash.first = hash->first;
+	
+	for (i = 0; i < hash->table_size; i++)
+		if (hash->table[i]) {
+			insert_hash_entry(&newhash, hash->table[i]);
+			insert_name_entry(&newhash, hash->table[i]);
+		}
+
+	free(hash->table);
+	if (hash->nametable)
+		free(hash->nametable);
+	memcpy(hash, &newhash, sizeof(newhash));
+
+	return;
+}
+
+void *lookup_name_entry(struct gr_hash_struct *hash, char *name)
+{
+	if (hash == NULL)
+		return NULL;
+	if (hash->type == GR_HASH_OBJECT) {
+		unsigned long index = nhash(name, hash->table_size);
+		struct file_acl *match;
+		unsigned char i = 0;
+
+		match = (struct file_acl *)hash->nametable[index];
+
+		while (match && strcmp(match->filename, name)) {
+			index = (index + (1 << i)) % hash->table_size;
+			match = (struct file_acl *)hash->nametable[index];
+			i = (i + 1) % 32;
+		}
+
+		return match;
+	} else if (hash->type == GR_HASH_SUBJECT) {
+		unsigned long index = nhash(name, hash->table_size);
+		struct proc_acl *match;
+		unsigned char i = 0;
+
+		match = (struct proc_acl *)hash->nametable[index];
+
+		while (match && strcmp(match->filename, name)) {
+			index = (index + (1 << i)) % hash->table_size;
+			match = (struct proc_acl *)hash->nametable[index];
+			i = (i + 1) % 32;
+		}
+
+		return match;
+	}
+	return NULL;
+}
+
+struct file_acl *lookup_acl_object_by_name(struct proc_acl *subject, char *name)
+{
+	return (struct file_acl *)lookup_name_entry(subject->hash, name);
+}
+
+struct proc_acl *lookup_acl_subject_by_name(struct role_acl *role, char *name)
+{
+	return (struct proc_acl *)lookup_name_entry(role->hash, name);
+}
+
+void *lookup_hash_entry(struct gr_hash_struct *hash, void *entry)
+{
+	if (hash == NULL)
+		return NULL;
+
+	if (hash->type == GR_HASH_OBJECT) {
+		struct file_acl *object = (struct file_acl *)entry;
+		unsigned long index = fhash(object->inode, object->dev, hash->table_size);
+		struct file_acl *match;
+		unsigned char i = 0;
+
+		match = (struct file_acl *)hash->table[index];
+
+		while (match && (match->inode != object->inode ||
+		       match->dev != object->dev)) {
+			index = (index + (1 << i)) % hash->table_size;
+			match = (struct file_acl *)hash->table[index];
+			i = (i + 1) % 32;
+		}
+
+		return match;
+	} else if (hash->type == GR_HASH_SUBJECT) {
+		struct proc_acl *subject = (struct proc_acl *)entry;
+		unsigned long index = fhash(subject->inode, subject->dev, hash->table_size);
+		struct proc_acl *match;
+		unsigned char i = 0;
+
+		match = (struct proc_acl *)hash->table[index];
+
+		while (match && (match->inode != subject->inode ||
+		       match->dev != subject->dev)) {
+			index = (index + (1 << i)) % hash->table_size;
+			match = (struct proc_acl *)hash->table[index];
+			i = (i + 1) % 32;
+		}
+
+		return match;
+	} else if (hash->type == GR_HASH_FILENAME) {
+		char *filename = (char *)entry;
+		unsigned long index = nhash(filename, hash->table_size);
+		struct gr_learn_file_tmp_node *match;
+		unsigned char i = 0;
+
+		match = (struct gr_learn_file_tmp_node *)hash->table[index];
+
+		while (match && strcmp(match->filename, filename)) {
+			index = (index + (1 << i)) % hash->table_size;
+			match = (struct gr_learn_file_tmp_node *)hash->table[index];
+			i = (i + 1) % 32;
+		}
+
+		return match;
+	}
+	return NULL;
+}
+
+struct file_acl *lookup_acl_object(struct proc_acl *subject, struct file_acl *object)
+{
+	return (struct file_acl *)lookup_hash_entry(subject->hash, object);
+}
+
+struct gr_learn_file_tmp_node *lookup_learn_object(struct gr_learn_file_node *subject, char *filename)
+{
+	return (struct gr_learn_file_tmp_node *)lookup_hash_entry(subject->hash, filename);
+}
+
+struct gr_learn_file_tmp_node *lookup_learn_role_subject(struct gr_learn_role_entry *role, char *filename)
+{
+	return (struct gr_learn_file_tmp_node *)lookup_hash_entry(role->hash, filename);
+}
+
+struct gr_learn_file_tmp_node *lookup_learn_group_subject(struct gr_learn_group_node *role, char *filename)
+{
+	return (struct gr_learn_file_tmp_node *)lookup_hash_entry(role->hash, filename);
+}
+
+struct gr_learn_file_tmp_node *lookup_learn_user_subject(struct gr_learn_user_node *role, char *filename)
+{
+	return (struct gr_learn_file_tmp_node *)lookup_hash_entry(role->hash, filename);
+}
+
+struct proc_acl *lookup_acl_subject(struct role_acl *role, struct proc_acl *subject)
+{
+	return (struct proc_acl *)lookup_hash_entry(role->hash, subject);
+}
+
+
+void insert_name_entry(struct gr_hash_struct *hash, void *entry)
+{
+	if (hash->type == GR_HASH_OBJECT) {
+		struct file_acl *object = (struct file_acl *)entry;
+		unsigned long index = nhash(object->filename, hash->table_size);
+		struct file_acl **curr;
+		unsigned char i = 0;
+
+		curr = (struct file_acl **)&hash->nametable[index];
+
+		while (*curr) {
+			index = (index + (1 << i)) % hash->table_size;
+			curr = (struct file_acl **)&hash->nametable[index];
+			i = (i + 1) % 32;
+		}
+
+		*curr = (struct file_acl *)entry;
+	} else if (hash->type == GR_HASH_SUBJECT) {
+		struct proc_acl *subject = (struct proc_acl *)entry;
+		unsigned long index = nhash(subject->filename, hash->table_size);
+		struct proc_acl **curr;
+		unsigned char i = 0;
+
+		curr = (struct proc_acl **)&hash->nametable[index];
+
+		while (*curr) {
+			index = (index + (1 << i)) % hash->table_size;
+			curr = (struct proc_acl **)&hash->nametable[index];
+			i = (i + 1) % 32;
+		}
+
+		*curr = (struct proc_acl *)entry;
+	}		
+}
+
+void insert_hash_entry(struct gr_hash_struct *hash, void *entry)
+{
+	/* resize if we're over 50% full */
+	if ((hash->used_size + 1) > (hash->table_size / 2))
+		resize_hash_table(hash);
+
+	if (hash->type == GR_HASH_OBJECT) {
+		struct file_acl *object = (struct file_acl *)entry;
+		unsigned long index = fhash(object->inode, object->dev, hash->table_size);
+		struct file_acl **curr;
+		unsigned char i = 0;
+
+		curr = (struct file_acl **)&hash->table[index];
+
+		while (*curr) {
+			index = (index + (1 << i)) % hash->table_size;
+			curr = (struct file_acl **)&hash->table[index];
+			i = (i + 1) % 32;
+		}
+
+		*curr = (struct file_acl *)entry;
+		insert_name_entry(hash, *curr);
+		hash->used_size++;
+	} else if (hash->type == GR_HASH_SUBJECT) {
+		struct proc_acl *subject = (struct proc_acl *)entry;
+		unsigned long index = fhash(subject->inode, subject->dev, hash->table_size);
+		struct proc_acl **curr;
+		unsigned char i = 0;
+
+		curr = (struct proc_acl **)&hash->table[index];
+
+		while (*curr) {
+			index = (index + (1 << i)) % hash->table_size;
+			curr = (struct proc_acl **)&hash->table[index];
+			i = (i + 1) % 32;
+		}
+
+		*curr = (struct proc_acl *)entry;
+		insert_name_entry(hash, *curr);
+		hash->used_size++;
+	} else if (hash->type == GR_HASH_FILENAME) {
+		struct gr_learn_file_tmp_node *node = (struct gr_learn_file_tmp_node *)entry;
+		unsigned long index = nhash(node->filename, hash->table_size);
+		struct gr_learn_file_tmp_node **curr;
+		unsigned char i = 0;
+
+		curr = (struct gr_learn_file_tmp_node **)&hash->table[index];
+
+		while (*curr && strcmp(node->filename, (*curr)->filename)) {
+			index = (index + (1 << i)) % hash->table_size;
+			curr = (struct gr_learn_file_tmp_node **)&hash->table[index];
+			i = (i + 1) % 32;
+		}
+
+		if (*curr)
+			(*curr)->mode |= node->mode;
+		else {
+			*curr = (struct gr_learn_file_tmp_node *)entry;
+			hash->used_size++;
+		}
+	}
+}
+
+struct gr_hash_struct *create_hash_table(int type)
+{
+	struct gr_hash_struct *hash;
+
+	hash = calloc(1, sizeof(struct gr_hash_struct));
+	if (hash == NULL)
+		failure("calloc");
+	hash->table = calloc(table_sizes[0], sizeof(void *));
+	if (hash->table == NULL)
+		failure("calloc");
+	if (type != GR_HASH_FILENAME) {
+		hash->nametable = calloc(table_sizes[0], sizeof(void *));
+		if (hash->nametable == NULL)
+			failure("calloc");
+	}
+	hash->table_size = table_sizes[0];
+	hash->type = type;
+
+	return hash;
+}
+
+void insert_learn_object(struct gr_learn_file_node *subject, struct gr_learn_file_tmp_node *object)
+{
+	if (subject->hash == NULL)
+		subject->hash = create_hash_table(GR_HASH_FILENAME);
+	insert_hash_entry(subject->hash, object);
+}
+
+void insert_learn_role_subject(struct gr_learn_role_entry *role, struct gr_learn_file_tmp_node *subject)
+{
+	if (role->hash == NULL)
+		role->hash = create_hash_table(GR_HASH_FILENAME);
+	insert_hash_entry(role->hash, subject);
+}
+
+void insert_learn_group_subject(struct gr_learn_group_node *role, struct gr_learn_file_tmp_node *subject)
+{
+	if (role->hash == NULL)
+		role->hash = create_hash_table(GR_HASH_FILENAME);
+	insert_hash_entry(role->hash, subject);
+}
+
+void insert_learn_user_subject(struct gr_learn_user_node *role, struct gr_learn_file_tmp_node *subject)
+{
+	if (role->hash == NULL)
+		role->hash = create_hash_table(GR_HASH_FILENAME);
+	insert_hash_entry(role->hash, subject);
+}
+
+void insert_acl_object(struct proc_acl *subject, struct file_acl *object)
+{
+	if (subject->hash->first == NULL) {
+		subject->hash->first = object;
+	} else {
+		((struct file_acl *)subject->hash->first)->next = object;
+		object->prev = subject->hash->first;
+		subject->hash->first = object;
+	}
+
+	insert_hash_entry(subject->hash, object);
+
+	return;
+}
+
+void insert_acl_subject(struct role_acl *role, struct proc_acl *subject)
+{
+	if (role->hash == NULL) {
+		/* create object hash table */
+		role->hash = create_hash_table(GR_HASH_SUBJECT);
+		role->hash->first = subject;
+	} else {
+		((struct proc_acl *)role->hash->first)->next = subject;
+		subject->prev = role->hash->first;
+		role->hash->first = subject;
+	}
+	/* force every subject to have a hash table whether or not they
+	   have any objects */
+	subject->hash = create_hash_table(GR_HASH_OBJECT);
+	insert_hash_entry(role->hash, subject);
+
+	return;
+}
+
+void insert_nested_acl_subject(struct proc_acl *subject)
+{
+	subject->hash = create_hash_table(GR_HASH_OBJECT);
+	return;
+}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_misc.c linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_misc.c
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_misc.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_misc.c	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,177 @@
+#include "gradm.h"
+
+FILE *
+open_acl_file(const char *filename)
+{
+	FILE *aclfile;
+
+	if ((aclfile = fopen(filename, "r")) == NULL) {
+		fprintf(stderr, "Unable to open %s for reading.\n", filename);
+		failure("fopen");
+	}
+
+	return aclfile;
+}
+
+int
+transmit_to_kernel(struct gr_arg_wrapper *buf)
+{
+	int fd;
+	int err = 0;
+
+	if ((fd = open(GRDEV_PATH, O_WRONLY)) < 0) {
+		fprintf(stderr, "Could not open %s.\n", GRDEV_PATH);
+		failure("open");
+	}
+
+	if (write(fd, buf, sizeof(struct gr_arg_wrapper)) != sizeof(struct gr_arg_wrapper)) {
+		err = 1;
+		switch (errno) {
+		case EFAULT:
+			fprintf(stderr, "Error copying structures to the "
+				"kernel.\n");
+			break;
+		case ENOMEM:
+			fprintf(stderr, "Out of memory.\n");
+			break;
+		case EBUSY:
+			fprintf(stderr, "You have attempted to authenticate "
+				"while authentication was locked, try "
+				"again later.\n");
+			break;
+		case EAGAIN:
+			fprintf(stderr, "Your request was ignored, "
+				"please check the kernel logs for more "
+				"info.\n");
+		case EPERM:
+			fprintf(stderr, "Invalid password.\n");
+			break;
+		case EINVAL:
+		default:
+			fprintf(stderr, "You are using incompatible "
+				"versions of gradm and grsecurity.\n"
+				"Please update both versions to the "
+				"ones available on the website.\n");
+		}
+	}
+
+	close(fd);
+	if (buf->arg->mode != GRADM_DISABLE) {
+		memset(buf->arg, 0, sizeof(struct gr_arg));
+		if (err)
+			exit(EXIT_FAILURE);
+	} else {
+		memset(buf->arg, 0, sizeof(struct gr_arg));
+		if (err)
+			exit(EXIT_FAILURE);
+		else
+			stop_grlearn();
+	}
+
+	return err;
+}
+
+void check_acl_status(__u16 reqmode)
+{
+	int fd;
+	int retval;
+	struct gr_arg arg;
+	struct gr_arg_wrapper wrapper;
+
+	wrapper.version = GRADM_VERSION;
+	wrapper.size = sizeof(struct gr_arg);
+	wrapper.arg = &arg;
+	arg.mode = GRADM_STATUS;
+
+	if ((fd = open(GRDEV_PATH, O_WRONLY)) < 0) {
+		fprintf(stderr, "Could not open %s.\n", GRDEV_PATH);
+		failure("open");
+	}
+
+	retval = write(fd, &wrapper, sizeof(struct gr_arg_wrapper));
+	close(fd);
+
+	switch (reqmode) {
+	case GRADM_STATUS:
+		if (retval == 1) {
+			printf("The RBAC system is currently enabled.\n");
+			exit(0);
+		} else if (retval == 2) {
+			printf("The RBAC system is currently disabled.\n");
+			exit(1);
+		}
+		break;
+	case GRADM_ENABLE:
+		if (retval == 1) {
+			printf("The operation you requested cannot be performed "
+				"because the RBAC system is currently enabled.\n");
+			exit(EXIT_FAILURE);
+		}
+		break;
+	case GRADM_RELOAD:
+	case GRADM_DISABLE:
+	case GRADM_SPROLE:
+	case GRADM_UNSPROLE:
+	case GRADM_MODSEGV:
+		if (retval == 2) {
+			printf("The operation you requested cannot be performed "
+				"because the RBAC system is currently disabled.\n");
+			exit(EXIT_FAILURE);
+		}
+		break;
+	}
+
+	return;
+}
+
+void
+init_variables(void)
+{
+	extern struct ip_acl ip;
+	lineno = 1;
+
+	current_acl_file = NULL;
+	current_role = NULL;
+	current_subject = NULL;
+	num_roles = 0;
+	num_subjects = 0;
+	num_objects = 0;
+	num_pointers = 0;
+
+	memset(&ip, 0, sizeof (ip));
+
+	return;
+}
+
+void
+change_current_acl_file(const char *filename)
+{
+	char *p;
+
+	if ((p = (char *) calloc(strlen(filename) + 1, sizeof (char))) == NULL)
+		failure("calloc");
+
+	strcpy(p, filename);
+
+	current_acl_file = p;
+
+	return;
+}
+
+int
+parent_dir(const char *filename, char *parent_dirent[])
+{
+	int i;
+
+	if ((strlen(*parent_dirent) <= 1) || (strlen(filename) <= 1))
+		return 0;
+
+	for (i = strlen(*parent_dirent) - 1; i >= 0; i--) {
+		if (i)
+			(*parent_dirent)[i] = '\0';
+		if (filename[i] == '/')
+			return 1;
+	}
+
+	return 0;
+}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_nest.c linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_nest.c
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_nest.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_nest.c	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,89 @@
+#include "gradm.h"
+
+void
+add_proc_nested_acl(struct role_acl *role, char *mainsubjname,
+		    char **nestednames, int nestlen, __u32 nestmode)
+{
+	int i;
+	char *nestname;
+	unsigned int namelen = 0;
+	struct proc_acl *stmp;
+	struct file_acl *otmp = NULL;
+	struct stat fstat;
+
+	if (nestmode & GR_LEARN) {
+		fprintf(stderr, "Error on line %lu of %s:\n", lineno,
+			current_acl_file);
+		fprintf(stderr,
+			"Learning is not yet implemented for nested subjects.\n");
+		exit(EXIT_FAILURE);
+	}
+
+	namelen += strlen(mainsubjname);
+	for (i = 0; i < nestlen; i++)
+		namelen += strlen(nestednames[i]) + 1;
+
+	nestname = malloc(namelen + 1);
+
+	if (!nestname) {
+		fprintf(stderr, "Out of memory.\n");
+		exit(EXIT_FAILURE);
+	}
+
+	strcpy(nestname, mainsubjname);
+	for (i = 0; i < nestlen; i++)
+		sprintf(nestname + strlen(nestname), ":%s", nestednames[i]);
+
+	stmp = lookup_acl_subject_by_name(role, mainsubjname);
+	if (stmp == NULL) {
+		fprintf(stderr,
+			"No subject %s found for nested subject %s specified on line %lu of %s.\n",
+			mainsubjname, nestname, lineno, current_acl_file);
+		exit(EXIT_FAILURE);
+	}
+
+	for (i = 0; i < nestlen; i++) {
+		otmp = lookup_acl_object_by_name(stmp, nestednames[i]);
+		if (otmp == NULL) {
+			fprintf(stderr,
+				"No object %s found for nested subject %s "
+				"specified on line %lu of %s.\n",
+				nestednames[i], nestname, lineno,
+				current_acl_file);
+			exit(EXIT_FAILURE);
+		} else if (!otmp->nested && (i != nestlen - 1)) {
+			fprintf(stderr,
+				"No nested subject %s found for nested "
+				"subject %s specified on line %lu of %s.\n",
+				nestednames[i], nestname, lineno,
+				current_acl_file);
+			exit(EXIT_FAILURE);
+		} else if (otmp->nested && (i == nestlen - 1)) {
+			fprintf(stderr,
+				"Duplicate nested subject %s found on line "
+				"%lu of %s.\n",
+				nestname, lineno, current_acl_file);
+			exit(EXIT_FAILURE);
+		}
+		if (i != nestlen - 1)
+			stmp = otmp->nested;
+	}
+
+	add_proc_subject_acl(role, nestednames[i - 1], nestmode, GR_FFAKE);
+
+	namelen = strlen(nestednames[i-1]);
+	for_each_object(otmp, stmp) {
+		if (!strncmp(nestednames[i-1], otmp->filename, namelen) && (otmp->filename[namelen] == '/' || otmp->filename[namelen] == '\0'))
+			if (otmp->mode & GR_EXEC)
+				otmp->nested = current_subject;
+	}
+	current_subject->parent_subject = stmp;
+	current_subject->mode |= GR_NESTED;
+
+	if (!stat(nestednames[i - 1], &fstat) && S_ISREG(fstat.st_mode)) {
+		if (!add_proc_object_acl(current_subject, nestednames[i - 1], proc_object_mode_conv("rx"), GR_FLEARN))
+			exit(EXIT_FAILURE);
+	}
+
+	return;
+}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_net.c linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_net.c
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_net.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_net.c	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,126 @@
+#include "gradm.h"
+
+void
+add_role_allowed_ip(struct role_acl *role, __u32 addr, __u32 netmask)
+{
+	struct role_allowed_ip **roleipp;
+	struct role_allowed_ip *roleip;
+
+	num_pointers++;
+
+	roleip =
+	    (struct role_allowed_ip *) calloc(1,
+					      sizeof (struct role_allowed_ip));
+	if (!roleip)
+		failure("calloc");
+
+	roleipp = &(role->allowed_ips);
+
+	if (*roleipp)
+		(*roleipp)->next = roleip;
+
+	roleip->prev = *roleipp;
+
+	roleip->addr = addr;
+	roleip->netmask = netmask;
+
+	*roleipp = roleip;
+
+	return;
+}
+
+void
+add_ip_acl(struct proc_acl *subject, __u8 mode, struct ip_acl *acl_tmp)
+{
+	struct ip_acl *p;
+	int i;
+
+	if (!subject) {
+		fprintf(stderr, "Error on line %lu of %s.\n  Definition "
+			"of an IP policy without a subject definition.\n"
+			"The RBAC system will not be allowed to be "
+			"enabled until this problem is fixed.\n",
+			lineno, current_acl_file);
+		exit(EXIT_FAILURE);
+	}
+
+	/* add one for the pointer to array of pointers */
+	if (subject->ips == NULL)
+		num_pointers++;
+
+	num_pointers++;
+
+	subject->ip_num++;
+	subject->ips = gr_dyn_realloc(subject->ips, subject->ip_num * sizeof(struct ip_acl *));
+
+	p = (struct ip_acl *) calloc(1, sizeof (struct ip_acl));
+	if (!p)
+		failure("calloc");
+
+	*(subject->ips + subject->ip_num - 1) = p;
+
+	p->mode = mode;
+	p->addr = acl_tmp->addr;
+	p->netmask = acl_tmp->netmask;
+	p->low = acl_tmp->low;
+	p->high = acl_tmp->high;
+	memcpy(p->proto, acl_tmp->proto, sizeof (acl_tmp->proto));
+	p->type = acl_tmp->type;
+
+	for (i = 0; i < 8; i++)
+		subject->ip_proto[i] |= p->proto[i];
+	subject->ip_type |= p->type;
+
+	return;
+}
+
+__u32
+get_ip(char *ip)
+{
+	struct in_addr address;
+
+	if (!inet_aton(ip, &address)) {
+		fprintf(stderr, "Invalid IP on line %lu of %s.\n", lineno,
+			current_acl_file);
+		exit(EXIT_FAILURE);
+	}
+
+	return address.s_addr;
+}
+
+void
+conv_name_to_type(struct ip_acl *ip, char *name)
+{
+	struct protoent *proto;
+	unsigned short i;
+
+	if (!strcmp(name, "raw_proto"))
+		ip->proto[IPPROTO_RAW / 32] |= (1 << (IPPROTO_RAW % 32));
+	else if (!strcmp(name, "raw_sock"))
+		ip->type |= (1 << SOCK_RAW);
+	else if (!strcmp(name, "any_sock")) {
+		ip->type = ~0;
+		ip->type &= ~(1 << 0);	// there is no sock type 0
+	} else if (!strcmp(name, "any_proto")) {
+		for (i = 0; i < 8; i++)
+			ip->proto[i] = ~0;
+	} else if (!strcmp(name, "stream"))
+		ip->type |= (1 << SOCK_STREAM);
+	else if (!strcmp(name, "dgram"))
+		ip->type |= (1 << SOCK_DGRAM);
+	else if (!strcmp(name, "rdm"))
+		ip->type |= (1 << SOCK_RDM);
+	else if (!strcmp(name, "tcp")) {	// silly protocol 0
+		ip->proto[IPPROTO_IP / 32] |= (1 << (IPPROTO_IP % 32));
+		ip->proto[IPPROTO_TCP / 32] |= (1 << (IPPROTO_TCP % 32));
+	} else if (!strcmp(name, "udp")) {	// silly protocol 0
+		ip->proto[IPPROTO_IP / 32] |= (1 << (IPPROTO_IP % 32));
+		ip->proto[IPPROTO_UDP / 32] |= (1 << (IPPROTO_UDP % 32));
+	} else if ((proto = getprotobyname(name)))
+		ip->proto[proto->p_proto / 32] |= (1 << (proto->p_proto % 32));
+	else {
+		fprintf(stderr, "Invalid type/protocol: %s\n", name);
+		exit(EXIT_FAILURE);
+	}
+	return;
+}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_newlearn.c linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_newlearn.c
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_newlearn.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_newlearn.c	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,1675 @@
+#include "gradm.h"
+
+char *high_reduce_dirs[] = {
+				"/tmp",
+				"/var/tmp",
+				"/proc",
+				"/lib",
+				"/lib/security",
+				"/lib/modules",
+				"/usr/lib",
+				"/var/lib",
+				"/usr/bin",
+				"/usr/sbin",
+				"/sbin",
+				"/etc",
+				"/bin",
+				"/usr/local/share",
+				"/usr/local/bin",
+				"/usr/local/sbin",
+				"/usr/local/etc",
+				"/usr/local/lib",
+				"/usr/share",
+				"/usr/share/locale",
+				"/usr/share/zoneinfo",
+				"/usr/X11R6/lib",
+				NULL
+			   };
+
+char *dont_reduce_dirs[] = {
+				"/",
+				"/dev",
+				"/usr",
+				NULL
+			   };
+
+char *protected_paths[] = {
+				"/etc",
+				"/lib",
+				"/boot",
+				"/usr",
+				"/opt",
+				"/var",
+				"/dev/log",
+				"/root",
+				NULL
+			};
+
+char *high_protected_paths[] = {
+				"/etc/ssh",
+				GRSEC_DIR,
+				GRDEV_PATH,
+				"/proc/kcore",
+				"/proc/sys",
+				"/etc/shadow",
+				"/etc/passwd",
+				"/var/log",
+				"/dev/mem",
+				"/dev/kmem",
+				"/dev/port",
+				"/dev/log",
+				NULL
+			};
+
+int is_protected_path(char *filename, __u32 mode)
+{
+	char **tmp;
+	unsigned int len;
+
+	if (!(mode & (GR_WRITE | GR_APPEND)))
+		return 0;
+
+	tmp = protected_paths;
+	while (*tmp) {
+		len = strlen(*tmp);
+		if (!strncmp(filename, *tmp, len) &&
+		    (filename[len] == '\0' || filename[len] == '/'))
+			return 1;
+		tmp++;
+	}
+
+	return 0;
+}
+
+void enforce_high_protected_paths(struct gr_learn_file_node *subject)
+{
+	struct gr_learn_file_tmp_node **tmptable;
+	char **tmp;
+	unsigned int len;
+	unsigned long i;
+
+	tmp = high_protected_paths;
+	tmptable = (struct gr_learn_file_tmp_node **)subject->hash->table;
+
+	while (*tmp) {
+		len = strlen(*tmp);
+		for (i = 0; i < subject->hash->table_size; i++) {
+			if (tmptable[i] == NULL)
+				continue;
+			if (!tmptable[i]->mode)
+				continue;
+			if (!strncmp(tmptable[i]->filename, *tmp, len) &&
+			    (tmptable[i]->filename[len] == '\0' || tmptable[i]->filename[len] == '/'))
+				goto next;
+		}
+		insert_file(&(subject->object_list), *tmp, 0, 0);
+next:
+		tmp++;
+	}
+			
+	return;
+}
+
+void match_role(struct gr_learn_group_node **grouplist, uid_t uid, gid_t gid, struct gr_learn_group_node **group,
+		struct gr_learn_user_node **user)
+{
+	struct gr_learn_group_node **tmpgroup;
+	struct gr_learn_user_node **tmpuser;
+
+	*group = NULL;
+	*user = NULL;
+
+	tmpgroup = grouplist;
+
+	if (!tmpgroup)
+		return;
+
+	while (*tmpgroup) {
+		tmpuser = (*tmpgroup)->users;
+		while (tmpuser && *tmpuser) {
+			if ((*tmpuser)->uid == uid) {
+				*user = *tmpuser;
+				return;
+			}
+			tmpuser++;
+		}
+		tmpgroup++;
+	}
+
+	tmpgroup = grouplist;
+
+	while (*tmpgroup) {
+		if ((*tmpgroup)->gid == gid) {
+			*group = *tmpgroup;
+			return;
+		}
+		tmpgroup++;
+	}
+				
+	return;
+}
+
+void traverse_roles(struct gr_learn_group_node **grouplist, 
+		    int (*act)(struct gr_learn_group_node *group, struct gr_learn_user_node *user, FILE *stream),
+		    FILE *stream)
+{
+	struct gr_learn_group_node **tmpgroup;
+	struct gr_learn_user_node **tmpuser;
+
+	tmpgroup = grouplist;
+
+	if (!tmpgroup)
+		return;
+
+	while(*tmpgroup) {
+		tmpuser = (*tmpgroup)->users;
+		if (!tmpuser)
+			act(*tmpgroup, NULL, stream);
+		else {
+			while(*tmpuser) {
+				act(*tmpgroup, *tmpuser, stream);
+				tmpuser++;
+			}
+		}
+		tmpgroup++;
+	}
+
+	return;
+}
+
+int display_role(struct gr_learn_group_node *group, struct gr_learn_user_node *user, FILE *stream)
+{
+	struct gr_learn_file_node *subject = NULL;
+	struct gr_learn_ip_node *allowed_ips = NULL;
+
+	if (user) {
+		fprintf(stream, "role %s u%s\n", user->rolename, strcmp(user->rolename, "root") ? "" : "G");
+		subject = user->subject_list;
+		allowed_ips = user->allowed_ips;
+	} else {
+		fprintf(stream, "role %s g\n", group->rolename);
+		subject = group->subject_list;
+		allowed_ips = group->allowed_ips;
+	}
+
+	if (allowed_ips)
+		traverse_ip_tree(allowed_ips, NULL, &display_only_ip, 0, stream);
+
+	if (subject)
+		display_tree(subject, stream);
+
+	fprintf(stream, "\n");
+
+	return 0;
+}
+
+void display_roles(struct gr_learn_group_node **grouplist, FILE *stream)
+{
+	fprintf(stream, "role default\n");
+	fprintf(stream, "subject / {\n");
+	fprintf(stream, "\t/\t\t\t\th\n");
+	fprintf(stream, "\t-CAP_ALL\n");
+	fprintf(stream, "\tconnect\tdisabled\n");
+	fprintf(stream, "\tbind\tdisabled\n");
+	fprintf(stream, "}\n\n");
+	traverse_roles(grouplist, &display_role, stream);
+	return;
+}
+	
+struct gr_learn_group_node **find_insert_group(struct gr_learn_group_node ***grouplist, gid_t gid)
+{
+	struct gr_learn_group_node **tmp = *grouplist;
+	unsigned long num = 0;
+
+	if (!tmp) {
+		*grouplist = (struct gr_learn_group_node **)gr_dyn_alloc(2 * sizeof(struct gr_learn_group_node *));
+		return (*grouplist);
+	}
+
+	while(*tmp) {
+		if ((*tmp)->gid == gid)
+			return tmp;
+		tmp++;
+		num++;
+	}
+
+	*grouplist = (struct gr_learn_group_node **)gr_dyn_realloc(*grouplist, (num + 2) * sizeof(struct gr_learn_group_node *));
+	memset(*grouplist + num, 0, 2 * sizeof(struct gr_learn_group_node *));
+ 
+	return (*grouplist + num);
+}
+
+unsigned long count_users(struct gr_learn_group_node *group)
+{
+	struct gr_learn_user_node **tmp;
+	unsigned long ret = 0;
+
+	tmp = group->users;
+
+	if (!tmp)
+		return 0;
+
+	while (*tmp) {
+		ret++;
+		tmp++;
+	}
+
+	return ret;
+}
+
+void insert_user(struct gr_learn_group_node ***grouplist, char *username, char *groupname, uid_t uid, gid_t gid)
+{
+	struct gr_learn_group_node **group;
+	struct gr_learn_user_node **tmpuser;
+	struct gr_learn_user_node **tmp;
+	unsigned long num;
+
+	/* first check to see if the user exists in any group */
+
+	group = *grouplist;
+	while (group && *group) {
+		tmpuser = (*group)->users;
+		while (tmpuser && *tmpuser) {
+			if ((*tmpuser)->uid == uid)
+				return;
+			tmpuser++;
+		}
+		group++;
+	}
+
+	group = find_insert_group(grouplist, gid);
+
+	if (*group) {
+		tmp = (*group)->users;
+		while (tmp && *tmp) {
+			if ((*tmp)->uid == uid)
+				return;
+			tmp++;
+		}
+		num = count_users(*group);
+
+		(*group)->users = (struct gr_learn_user_node **)gr_dyn_realloc((*group)->users, (num + 2) * sizeof(struct gr_learn_user_node *));
+		memset((*group)->users + num, 0, 2 * sizeof(struct gr_learn_user_node *));
+
+		tmpuser = ((*group)->users + num);
+		*tmpuser = (struct gr_learn_user_node *)gr_stat_alloc(sizeof(struct gr_learn_user_node));
+		(*tmpuser)->rolename = username;
+		(*tmpuser)->uid = uid;
+		(*tmpuser)->group = *group;
+	} else {
+		*group = (struct gr_learn_group_node *)gr_stat_alloc(sizeof(struct gr_learn_group_node));
+		(*group)->rolename = groupname;
+		(*group)->gid = gid;
+		(*group)->users = (struct gr_learn_user_node **)gr_dyn_alloc(2 * sizeof(struct gr_learn_user_node *));
+		tmpuser = (*group)->users;
+		*tmpuser = (struct gr_learn_user_node *)gr_stat_alloc(sizeof(struct gr_learn_user_node));
+		(*tmpuser)->rolename = username;
+		(*tmpuser)->uid = uid;
+		(*tmpuser)->group = *group;
+	}
+
+	return;
+}
+
+void reduce_roles(struct gr_learn_group_node ***grouplist)
+{
+	unsigned int thresh = 3;
+	struct gr_learn_group_node **group = *grouplist;
+	struct gr_learn_user_node **tmpuser;
+	unsigned long num;
+
+	while (group && *group) {
+		num = count_users(*group);
+		if (num >= thresh) {
+			tmpuser = (*group)->users;
+			while(*tmpuser) {
+				/* free(*tmpuser); */
+				*tmpuser = NULL;
+				tmpuser++;
+			}
+			gr_dyn_free((*group)->users);
+			(*group)->users = NULL;
+		}
+		group++;
+	}
+	
+	return;
+}
+
+void traverse_file_tree(struct gr_learn_file_node *base,
+		   int (*act)(struct gr_learn_file_node *node, struct gr_learn_file_node *optarg, FILE *stream),
+		   struct gr_learn_file_node *optarg, FILE *stream)
+{
+	struct gr_learn_file_node **node;
+
+	if (!base)
+		return;
+
+	act(base, optarg, stream);
+
+	node = base->leaves;
+
+	if (!node)
+		return;
+
+	while(*node) {
+		traverse_file_tree(*node, act, optarg, stream);
+		node++;
+	}
+
+	return;
+}
+
+struct gr_learn_file_node *match_file_node(struct gr_learn_file_node *base,
+					const char *filename)
+{
+	struct gr_learn_file_node **node, *ret;
+	unsigned int baselen, filelen;
+
+	filelen = strlen(filename);
+
+	if (!base)
+		return base;
+
+	baselen = strlen(base->filename);
+	if ((filelen == baselen) && !strcmp(base->filename, filename))
+		return base;
+
+	if ((baselen >= filelen) || strncmp(base->filename, filename, baselen) || (filename[baselen] != '/' && baselen != 1))
+		return NULL;
+
+	node = base->leaves;
+
+	if (!node)
+		return base;
+
+	while(*node) {
+		if ((ret = match_file_node(*node, filename)))
+			return ret;
+		node++;
+	}
+	
+	return base;
+}
+
+unsigned long count_nodes(struct gr_learn_file_node **node)
+{
+	unsigned long ret = 0;
+
+	if (!node)
+		return 0;
+
+	while(*node) {
+		ret++;
+		node++;
+	}
+
+	return ret;
+}
+
+unsigned long count_leaf_nodes(struct gr_learn_file_node **node)
+{
+	unsigned long ret = 0;
+
+	if (!node)
+		return 0;
+
+	while(*node) {
+		if (!((*node)->leaves))
+			ret++;
+		node++;
+	}
+
+	return ret;
+}
+
+unsigned long count_total_leaves(struct gr_learn_file_node *node)
+{
+	unsigned long leaves = 0;
+	struct gr_learn_file_node **tmp;
+
+	tmp = node->leaves;
+	if (!tmp)
+		return 0;
+
+	while(*tmp) {
+		leaves++;
+		leaves += count_total_leaves(*tmp);
+		tmp++;
+	}
+
+	return leaves;
+}
+
+unsigned long count_max_depth(struct gr_learn_file_node *node)
+{
+	unsigned long max = 0, tmpmax = 0;
+	struct gr_learn_file_node **tmp;
+
+	tmp = node->leaves;
+	if (!tmp)
+		return 0;
+
+	max++;
+	while(*tmp) {
+		tmpmax = count_max_depth(*tmp);
+		if ((max + tmpmax) > max)
+			max = tmpmax + max;
+		tmp++;
+	}
+
+	return max;
+}	
+
+unsigned long count_nested_depth(struct gr_learn_file_node *node)
+{
+	unsigned long depth = 0;
+	struct gr_learn_file_node *tmp;
+
+	tmp = node->parent;
+	if (!tmp)
+		return 0;
+
+	while(tmp) {
+		depth++;
+		tmp = tmp->parent;
+	}
+
+	return depth;
+}	
+
+int reduce_all_children(struct gr_learn_file_node *node)
+{
+	unsigned long num, not_leaf = 0;
+	unsigned long i, j;
+	struct gr_learn_file_node **tmp;
+	
+	tmp = node->leaves;
+	num = 0;
+	while (*tmp) {
+		if (!((*tmp)->leaves)) {
+			node->mode |= (*tmp)->mode;
+			if (node->subject && (*tmp)->subject) {
+				node->subject->cap_raise |= (*tmp)->subject->cap_raise;
+				node->subject->resmask |= (*tmp)->subject->resmask;
+				for (i = 0; i < GR_NLIMITS; i++) {
+					if ((*tmp)->subject->res[i].rlim_cur > node->subject->res[i].rlim_cur)
+						node->subject->res[i].rlim_cur = (*tmp)->subject->res[i].rlim_cur;
+					if ((*tmp)->subject->res[i].rlim_max > node->subject->res[i].rlim_max)
+						node->subject->res[i].rlim_max = (*tmp)->subject->res[i].rlim_max;
+				}
+			}
+		} else
+			not_leaf++;
+		tmp++;
+		num++;
+	}
+
+	tmp = node->leaves;
+	for (i = 0; i < num; i++) {
+		if (*(tmp + i) && !(*(tmp + i))->leaves) {
+			/* free(*(tmp + i)); */
+			*(tmp + i) = NULL;
+			j = i;
+			while (*(tmp + j + 1)) {
+				*(tmp + j) = *(tmp + j + 1);
+				j++;
+			}
+			*(tmp + j) = NULL;			
+		}
+	}
+
+	if (!not_leaf) {
+		gr_dyn_free(node->leaves);
+		node->leaves = NULL;
+		return 0;
+	}
+
+	return 0;
+}
+
+int reduce_all_leaves(struct gr_learn_file_node *node)
+{
+	struct gr_learn_file_node **tmp;
+	unsigned int i;
+
+	tmp = node->leaves;
+	if (!tmp)
+		return 0;
+	while (*tmp) {
+		reduce_all_leaves(*tmp);
+		node->mode |= (*tmp)->mode;
+		if (node->subject && (*tmp)->subject) {
+			node->subject->cap_raise |= (*tmp)->subject->cap_raise;
+			node->subject->resmask |= (*tmp)->subject->resmask;
+			for (i = 0; i < GR_NLIMITS; i++) {
+				if ((*tmp)->subject->res[i].rlim_cur > node->subject->res[i].rlim_cur)
+					node->subject->res[i].rlim_cur = (*tmp)->subject->res[i].rlim_cur;
+				if ((*tmp)->subject->res[i].rlim_max > node->subject->res[i].rlim_max)
+					node->subject->res[i].rlim_max = (*tmp)->subject->res[i].rlim_max;
+			}
+		}
+		/* free(*tmp); */
+		*tmp = NULL;
+		tmp++;
+	}
+	gr_dyn_free(node->leaves);
+	node->leaves = NULL;
+
+	return 0;
+}
+
+__u16 greatest_occurring_mode(struct gr_learn_file_node *node)
+{
+	struct gr_learn_file_node **tmp;
+	__u16 modes[12] = { GR_FIND,
+			    GR_FIND | GR_READ,
+			    GR_FIND | GR_READ | GR_WRITE,
+			    GR_FIND | GR_READ | GR_EXEC,
+			    GR_FIND | GR_EXEC,
+			    GR_FIND | GR_WRITE,
+			    GR_FIND | GR_WRITE | GR_CREATE,
+			    GR_FIND | GR_WRITE | GR_DELETE,
+			    GR_FIND | GR_WRITE | GR_CREATE | GR_DELETE,
+			    GR_FIND | GR_READ | GR_WRITE | GR_CREATE | GR_DELETE,
+			    GR_FIND | GR_READ | GR_WRITE | GR_DELETE,
+			    GR_FIND | GR_READ | GR_WRITE | GR_CREATE,
+			};
+	unsigned long counts[12] = {0};
+	__u16 max;
+	int i;
+
+	tmp = node->leaves;
+
+	while (*tmp) {
+		for (i = 0; i < 12; i++) {
+			if ((*tmp)->mode == modes[i])
+				counts[i]++;
+		}
+
+		tmp++;
+	}
+
+	max = 0;
+
+	for (i = 0; i < 12; i++) {
+		if (counts[i] > counts[max])
+			max = i;
+	}
+
+	return modes[max];
+}
+
+int reduce_children_mode(struct gr_learn_file_node *node)
+{
+	struct gr_learn_file_node **tmp;
+	struct gr_learn_file_node **tmp2;
+	__u16 mode;
+
+	tmp = node->leaves;
+	if (!tmp)
+		return 0;
+	
+	mode = greatest_occurring_mode(node);
+
+	node->mode |= mode;
+
+	while (*tmp) {
+		if ((*tmp)->mode == mode && !(*tmp)->leaves) {
+			tmp2 = tmp + 1;
+			while (*tmp2++) {
+				/* free *(tmp2 - 1) */
+				*(tmp2 - 1) = *tmp2;
+			}
+		}
+		tmp++;
+	}
+
+	return 0;
+}
+
+int analyze_node_read_permissions(struct gr_learn_file_node *node)
+{
+	struct gr_learn_file_node **tmp;
+
+	if (!node->leaves)
+		return 1;
+
+	tmp = node->leaves;
+
+	while (*tmp) {
+		if (((*tmp)->mode & GR_WRITE) && !((*tmp)->mode & GR_READ))
+			return 0;
+		if (!analyze_node_read_permissions(*tmp))
+			return 0;
+		tmp++;
+	}
+
+	return 1;
+}
+
+int analyze_node_write_permissions(struct gr_learn_file_node *node)
+{
+	struct gr_learn_file_node **tmp;
+
+	if (!node->leaves)
+		return 1;
+
+	tmp = node->leaves;
+
+	while (*tmp) {
+		if (!((*tmp)->mode & GR_WRITE) && ((*tmp)->mode & GR_READ))
+			return 0;
+		if (!analyze_node_write_permissions(*tmp))
+			return 0;
+		tmp++;
+	}
+
+	return 1;
+}
+
+int analyze_child_read_permissions(struct gr_learn_file_node *node)
+{
+	struct gr_learn_file_node **tmp;
+
+	if (!node->leaves)
+		return 1;
+
+	tmp = node->leaves;
+
+	while (*tmp) {
+		if ((*tmp)->leaves) {
+			tmp++;
+			continue;
+		}
+		if (((*tmp)->mode & GR_WRITE) && !((*tmp)->mode & GR_READ))
+			return 0;
+		tmp++;
+	}
+
+	return 1;
+}
+
+int analyze_child_write_permissions(struct gr_learn_file_node *node)
+{
+	struct gr_learn_file_node **tmp;
+
+	if (!node->leaves)
+		return 1;
+
+	tmp = node->leaves;
+
+	while (*tmp) {
+		if ((*tmp)->leaves) {
+			tmp++;
+			continue;
+		}
+		if (!((*tmp)->mode & GR_WRITE) && ((*tmp)->mode & GR_READ))
+			return 0;
+		tmp++;
+	}
+
+	return 1;
+}
+
+int *analyze_node_reduction(struct gr_learn_file_node *node)
+{
+	int reduce_child_thresh = 4;
+	int reduce_leaves_thresh = 8;
+	int reduction_level = 0;
+	unsigned long node_num;
+	unsigned long child_num;
+	unsigned long depth_num;
+	unsigned long nested_num;
+	char **tmp;
+
+	if (!node->leaves)
+		return NULL;
+
+	node_num = count_leaf_nodes(node->leaves);
+	child_num = count_total_leaves(node);
+	depth_num = count_max_depth(node);
+	nested_num = count_nested_depth(node);
+
+	tmp = dont_reduce_dirs;
+	while (*tmp) {
+		if (!strcmp(node->filename, *tmp))
+			return NULL;
+		tmp++;
+	}
+
+	if (node_num > 3)
+		reduction_level++;
+	if (node_num > 6)
+		reduction_level++;
+	if (node_num > 20)
+		reduction_level++;
+	if (nested_num > 2)
+		reduction_level++;
+	if (nested_num > 4)
+		reduction_level++;
+	if (nested_num > 6)
+		reduction_level++;
+	if (child_num > 5)
+		reduction_level++;
+	if (child_num > 10)
+		reduction_level++;
+	if (child_num > 20)
+		reduction_level++;
+	if (child_num > 40)
+		reduction_level++;
+	if (child_num > 80)
+		reduction_level++;
+	if (depth_num > 2)
+		reduction_level++;
+	if (depth_num > 4)
+		reduction_level++;
+	if (depth_num > 6)
+		reduction_level++;
+
+	tmp = high_reduce_dirs;
+	while (*tmp) {
+		if (!strcmp(node->filename, *tmp) && ((node_num > 4) || (child_num > 10)))
+			reduction_level *= 2;
+		tmp++;
+	}
+
+	if (node->subject)
+		goto final;
+
+	if (analyze_node_read_permissions(node) || analyze_node_write_permissions(node))
+		reduction_level *= 2;
+	else {
+		if (reduction_level >= reduce_leaves_thresh)
+			return (int *)&reduce_children_mode;
+	}
+
+final:
+	if (reduction_level >= reduce_leaves_thresh)
+		return (int *)&reduce_all_leaves;
+	else if (reduction_level >= reduce_child_thresh)
+		return (int *)&reduce_all_children;
+	else
+		return NULL;
+}
+
+int second_reduce_node(struct gr_learn_file_node *node,
+		       struct gr_learn_file_node *unused1, FILE *unused)
+{
+	int (* retval)(struct gr_learn_file_node *node);
+
+	retval = (int (*)(struct gr_learn_file_node *))analyze_node_reduction(node);
+
+	if (retval)
+		retval(node);
+
+	return 0;
+}		
+
+void second_stage_reduce_tree(struct gr_learn_file_node *base)
+{
+	return traverse_file_tree(base, &second_reduce_node, NULL, NULL);
+}
+
+int third_reduce_node(struct gr_learn_file_node *node,
+		       struct gr_learn_file_node *unused1, FILE *unused)
+{
+	struct gr_learn_file_node **tmp, **tmp2;
+
+	tmp = node->leaves;
+
+	if (!tmp)
+		return 0;
+
+	while (*tmp) {
+		if ((*tmp)->leaves) {
+			tmp++;
+			continue;
+		}
+		if ((*tmp)->mode == node->mode ||
+		    (((node->mode & (GR_WRITE | GR_CREATE)) == (GR_WRITE | GR_CREATE)) &&
+		    ((*tmp)->mode & GR_WRITE))) {
+			node->mode |= (*tmp)->mode;
+			tmp2 = tmp;
+			/* free(*tmp); */
+			*tmp = NULL;
+			while(*(tmp2 + 1)) {
+				*tmp2 = *(tmp2 + 1);
+				tmp2++;
+			}
+			*tmp2 = NULL;
+		} else
+			tmp++;
+	}
+
+	return 0;
+}	
+		
+
+void third_stage_reduce_tree(struct gr_learn_file_node *base)
+{
+	return traverse_file_tree(base, &third_reduce_node, NULL, NULL);
+}
+
+struct gr_learn_file_node **find_insert_file(struct gr_learn_file_node **base,
+					struct gr_learn_file_node *insert, unsigned int filelen,
+					struct gr_learn_file_node **parent)
+{
+	struct gr_learn_file_node **node, **tmpnode, **ret;
+	unsigned int baselen;
+	unsigned long num_leaves;
+
+	if (!*base) {
+		*parent = *base;
+		return base;
+	}
+
+	baselen = strlen((*base)->filename);
+	if ((filelen == baselen) && !strcmp((*base)->filename, insert->filename))
+		return base;
+
+	node = (*base)->leaves;
+
+	if (!node && (baselen < filelen) && !strncmp((*base)->filename, insert->filename, baselen) && 
+	    (baselen == 1 || insert->filename[baselen] == '/')) {
+		*parent = *base;
+		(*base)->leaves = node = (struct gr_learn_file_node **)gr_dyn_alloc(2 * sizeof(struct gr_learn_file_node *));
+		return node;
+	} else if (!node)
+		return NULL;
+
+	tmpnode = node;
+
+	while(*tmpnode) {
+		ret = find_insert_file(tmpnode, insert, filelen, parent);
+		if (ret)
+			return ret;
+		tmpnode++;
+	}
+	
+	if ((baselen >= filelen) || strncmp((*base)->filename, insert->filename, baselen) || 
+	    (baselen != 1 && insert->filename[baselen] != '/'))
+		return NULL;
+
+	*parent = *base;
+	num_leaves = count_nodes(node);
+	(*base)->leaves = node = (struct gr_learn_file_node **)gr_dyn_realloc((*base)->leaves, (num_leaves + 2) * sizeof(struct gr_learn_file_node *));
+	memset(node + num_leaves, 0, 2 * sizeof(struct gr_learn_file_node *));
+	return (node + num_leaves);
+}
+
+
+
+void do_insert_file(struct gr_learn_file_node **base, char *filename, __u32 mode, __u8 subj)
+{
+	struct gr_learn_file_node **node;
+	struct gr_learn_file_node *parent = NULL;
+	struct gr_learn_file_node *insert;
+
+	insert = (struct gr_learn_file_node *)gr_stat_alloc(sizeof(struct gr_learn_file_node));
+
+	insert->filename = filename;
+	insert->mode = mode;
+
+	if (subj)
+		insert_file(&(insert->object_list), strdup("/"), 0, 0);		
+
+	node = find_insert_file(base, insert, strlen(filename), &parent);
+
+	if (*node) {
+		(*node)->mode |= mode;
+		(*node)->dont_display = 0;
+		/* free(insert); */
+		return;
+	} else {
+		*node = insert;
+		(*node)->parent = parent;
+	}
+
+	return;
+}
+
+void insert_file(struct gr_learn_file_node **base, char *filename, __u32 mode, __u8 subj)
+{
+	/* we're inserting a new file, and an entry for / does not exist, add it */
+	if (!(*base)) {
+		if (subj) {
+			do_insert_file(base, strdup("/"), GR_FIND, subj);
+			if (subj == 2) /* learning in non-full mode, don't display / subject */
+				(*base)->dont_display = 1;
+		} else
+			do_insert_file(base, strdup("/"), 0, subj);
+	}
+
+	do_insert_file(base, filename, mode, subj);
+
+	return;
+}
+
+int first_reduce_node(struct gr_learn_file_node *node,
+		       struct gr_learn_file_node *unused1, FILE *unused)
+{
+	unsigned long thresh = 5;	
+	unsigned long cnt = 0;
+	unsigned long num = count_nodes(node->leaves);
+	struct gr_learn_file_node **tmp, **tmp2, **tmp3, *tmp4;
+	struct gr_learn_file_node *parent = NULL;
+	char *p, *p2;
+	unsigned int node_len = strlen(node->filename);
+
+	if (num < thresh)
+		return 0;
+
+	tmp = node->leaves;
+
+	while (*tmp) {
+		p = strdup((*tmp)->filename);
+		if (node_len == 1)
+			p2 = strchr(p + 1, '/');
+		else
+			p2 = strchr(p + node_len + 1, '/');
+
+		if (!p2) {
+			tmp++;
+			cnt++;
+			continue;
+		}
+
+		*p2 = '\0';
+		insert_file(&node, p, 0, 0);
+		cnt++;
+		/* node->leaves might have been modified during insert */
+		tmp = node->leaves + cnt;
+	}
+
+	tmp = node->leaves;
+
+	while (*tmp && num) {
+		parent = NULL;
+		tmp4 = *tmp;
+		tmp2 = tmp;
+		while(*(tmp2 + 1)) {
+			*tmp2 = *(tmp2 + 1);
+			tmp2++;
+		}
+		*tmp2 = NULL;
+		tmp3 = find_insert_file(&node, tmp4, strlen(tmp4->filename), &parent);
+		if (!(*tmp3)) {
+			*tmp3 = tmp4;
+			(*tmp3)->parent = parent;
+		}
+		num--;
+	}
+
+	return 0;
+}
+
+void first_stage_reduce_tree(struct gr_learn_file_node *base)
+{
+	return traverse_file_tree(base, &first_reduce_node, NULL, NULL);
+}
+
+int display_leaf(struct gr_learn_file_node *node,
+		       struct gr_learn_file_node *unused1, FILE *stream);
+
+void display_tree(struct gr_learn_file_node *base, FILE *stream)
+{
+	traverse_file_tree(base, &display_leaf, NULL, stream);
+	return;
+}
+
+int display_leaf(struct gr_learn_file_node *node,
+		       struct gr_learn_file_node *unused1, FILE *stream)
+{
+	char modes[33];
+	int i;
+
+	if (node->dont_display)
+		return 0;
+
+	if (node->object_list) {
+		struct gr_learn_file_node *object;
+		struct gr_learn_ip_node *connect;
+		struct gr_learn_ip_node *bind;
+		unsigned int raise_num;
+
+		object = node->object_list;
+		connect = node->connect_list;
+		bind = node->bind_list;
+		conv_subj_mode_to_str(node->mode, modes, sizeof(modes));
+		fprintf(stream, "subject %s %s {\n", node->filename, modes);
+		if (object)
+			display_tree(object, stream);
+		if (!node->subject) {
+			fprintf(stream, "\t-CAP_ALL\n");
+			goto show_ips;
+		}
+
+		for(i = raise_num = 0; i < ((sizeof(capability_list)/sizeof(struct capability_set)) - 1); i++)
+			if (node->subject->cap_raise & (1 << capability_list[i].cap_val))
+				raise_num++;
+
+		if (raise_num < ((sizeof(capability_list)/sizeof(struct capability_set)) - 1) / 2) {
+			fprintf(stream, "\t-CAP_ALL\n");
+			for(i = 0; i < ((sizeof(capability_list)/sizeof(struct capability_set)) - 1); i++)
+				if (node->subject->cap_raise & (1 << capability_list[i].cap_val))
+					fprintf(stream, "\t+%s\n", capability_list[i].cap_name);
+		} else {
+			fprintf(stream, "\t+CAP_ALL\n");
+			for(i = 0; i < ((sizeof(capability_list)/sizeof(struct capability_set)) - 1); i++)
+				if (!(node->subject->cap_raise & (1 << capability_list[i].cap_val)))
+					fprintf(stream, "\t-%s\n", capability_list[i].cap_name);
+		}
+
+		for(i = 0; i < (sizeof(rlim_table)/sizeof(struct rlimconv)); i++)
+			if (node->subject->resmask & (1 << rlim_table[i].val))
+				fprintf(stream, "\t%s %lu %lu\n",
+					rlim_table[i].name,
+					node->subject->res[i].rlim_cur,
+					node->subject->res[i].rlim_max);
+
+show_ips:
+		if (bind)
+			display_ip_tree(bind, GR_IP_BIND, stream);
+		else
+			fprintf(stream, "\tbind\tdisabled\n");
+		if (connect)
+			display_ip_tree(connect, GR_IP_CONNECT, stream);
+		else
+			fprintf(stream, "\tconnect\tdisabled\n");
+
+		fprintf(stream, "}\n\n");
+	} else {
+		conv_mode_to_str(node->mode, modes, sizeof(modes));
+		i = strlen(node->filename);
+		if (strchr(node->filename, ' ')) {
+				if (i < 8)
+					fprintf(stream, "\t\"%s\"\t\t\t\t%s\n", node->filename, modes);
+				else if (i < 16)
+					fprintf(stream, "\t\"%s\"\t\t\t%s\n", node->filename, modes);
+				else if (i < 24)
+					fprintf(stream, "\t\"%s\"\t\t%s\n", node->filename, modes);
+				else
+					fprintf(stream, "\t\"%s\"\t%s\n", node->filename, modes);
+		} else {
+			if (i < 8)
+				fprintf(stream, "\t%s\t\t\t\t%s\n", node->filename, modes);
+			else if (i < 16)
+				fprintf(stream, "\t%s\t\t\t%s\n", node->filename, modes);
+			else if (i < 24)
+				fprintf(stream, "\t%s\t\t%s\n", node->filename, modes);
+			else
+				fprintf(stream, "\t%s\t%s\n", node->filename, modes);
+		}
+	}
+	return 0;
+}
+
+void traverse_ip_tree(struct gr_learn_ip_node *base,
+		   struct gr_learn_ip_node **optarg,
+		   int (*act)(struct gr_learn_ip_node *node, struct gr_learn_ip_node **optarg, __u8 contype, FILE *stream),
+		   __u8 contype, FILE *stream)
+{
+	struct gr_learn_ip_node **node;
+
+	if (!base)
+		return;
+
+	act(base, optarg, contype, stream);
+	
+	node = base->leaves;
+
+	while(node && *node) {
+		traverse_ip_tree(*node, optarg, act, contype, stream);
+		node++;
+	}
+
+	return;
+}
+
+int count_ip_depth(struct gr_learn_ip_node *node)
+{
+	int depth = 0;
+
+	while ((node = node->parent))
+		depth++;
+
+	return depth;
+}
+
+unsigned long count_total_ips(struct gr_learn_ip_node *node)
+{
+	unsigned long ips = 0;
+	struct gr_learn_ip_node **tmp;
+
+	tmp = node->leaves;
+	if (!tmp)
+		return 1;
+
+	while(*tmp) {
+		ips += count_total_ips(*tmp);
+		tmp++;
+	}
+
+	return ips;
+}
+	
+
+int display_ip_node(struct gr_learn_ip_node *node, struct gr_learn_ip_node **unused, __u8 contype,
+		    FILE *stream)
+{
+	struct gr_learn_ip_node *saved = node;
+	int depth = count_ip_depth(node);
+	__u16 **tmpport;
+	__u8 ip[4];
+	char ipandtype[64] = {0};
+	char socktypeandprotos[4096] = {0};
+	struct protoent *proto;
+	int netmask = 0;
+	int i;
+
+	if (node->leaves)
+		return 0;
+
+	if (!node->root_node)
+		netmask = 8 * depth;
+	else {
+		ip[0] = ip[1] = ip[2] = ip[3] = 0;
+		goto print_ip;
+	}
+
+	for(i = 3; i >= 0; i--) {
+		if (depth < (i + 1))
+			ip[i] = 0;
+		else {
+			ip[i] = node->ip_node;
+			node = node->parent;
+		}
+	}
+
+print_ip:
+	node = saved;
+	if (contype == GR_IP_CONNECT)
+		sprintf(ipandtype, "\tconnect %u.%u.%u.%u/%u", ip[0], ip[1], ip[2], ip[3], netmask);
+	else if (contype == GR_IP_BIND)
+		sprintf(ipandtype, "\tbind %u.%u.%u.%u/%u", ip[0], ip[1], ip[2], ip[3], netmask);
+
+	for (i = 1; i < 5; i++) {
+		if (node->ip_type & (1 << i)) {
+			switch (i) {
+			case SOCK_RAW:
+				strcat(socktypeandprotos, " raw_sock");
+				break;
+			case SOCK_DGRAM:
+				strcat(socktypeandprotos, " dgram");
+				break;
+			case SOCK_STREAM:
+				strcat(socktypeandprotos, " stream");
+				break;
+			case SOCK_RDM:
+				strcat(socktypeandprotos, " rdm");
+				break;
+			}
+		}
+	}
+
+	for (i = 0; i < 256; i++) {
+		if (node->ip_proto[i / 32] & (1 << (i % 32))) {
+			if (i == IPPROTO_RAW) {
+				strcat(socktypeandprotos, " raw_proto");
+			} else {
+				proto = getprotobynumber(i);
+				strcat(socktypeandprotos, " ");
+				strcat(socktypeandprotos, proto->p_name);
+			}
+		}
+	}
+
+	if (node->all_low_ports && node->all_high_ports)
+		fprintf(stream, "%s:0-65535%s\n", ipandtype, socktypeandprotos);
+	else if (node->all_low_ports)
+		fprintf(stream, "%s:0-1023%s\n", ipandtype, socktypeandprotos);
+	else if (node->all_high_ports)
+		fprintf(stream, "%s:1024-65535%s\n", ipandtype, socktypeandprotos);
+
+	tmpport = node->ports;
+
+	while(tmpport && *tmpport) {
+		if (!(node->all_low_ports && **tmpport < 1024) &&
+		    !(node->all_high_ports && **tmpport >= 1024))
+			fprintf(stream, "%s:%u%s\n", ipandtype, **tmpport, socktypeandprotos);
+		tmpport++;
+	}
+
+	return 0;
+}
+
+int display_only_ip(struct gr_learn_ip_node *node, struct gr_learn_ip_node **unused, __u8 unused2,
+		    FILE *stream)
+{
+	struct gr_learn_ip_node *saved = node;
+	int depth = count_ip_depth(node);
+	__u8 ip[4];
+	int netmask = 0;
+	int i;
+
+	if (node->leaves)
+		return 0;
+
+	if (!node->root_node)
+		netmask = 8 * depth;
+	else {
+		ip[0] = ip[1] = ip[2] = ip[3] = 0;
+		goto print_ip;
+	}
+
+	for(i = 3; i >= 0; i--) {
+		if (depth < (i + 1))
+			ip[i] = 0;
+		else {
+			ip[i] = node->ip_node;
+			node = node->parent;
+		}
+	}
+
+print_ip:
+	node = saved;
+	fprintf(stream, "role_allow_ip\t%u.%u.%u.%u/%u\n", ip[0], ip[1], ip[2], ip[3], netmask);
+
+	return 0;
+}
+
+void display_ip_tree(struct gr_learn_ip_node *base, __u8 contype, FILE *stream)
+{
+	traverse_ip_tree(base, NULL, &display_ip_node, contype, stream);
+	return;
+}
+
+unsigned long count_ports(__u16 **ports)
+{
+	unsigned long ret = 0;
+
+	if (!ports)
+		return ret;
+
+	while (*ports) {
+		ports++;
+		ret++;
+	}
+
+	return ret;
+}		
+		
+unsigned long count_ips(struct gr_learn_ip_node **ips)
+{
+	unsigned long ret = 0;
+
+	if (!ips)
+		return ret;
+
+	while (*ips) {
+		ips++;
+		ret++;
+	}
+
+	return ret;
+}
+
+int analyze_ip_node(struct gr_learn_ip_node *node)
+{
+	int depth = count_ip_depth(node);
+	unsigned long num_ips = count_total_ips(node);
+	unsigned long analysis_factor = (depth + 1) * num_ips;
+
+	if (analysis_factor > 19)
+		return 1;
+	else
+		return 0;
+}
+
+void insert_port(struct gr_learn_ip_node *node, __u16 port)
+{
+	__u16 **tmpport;
+	unsigned long num;
+
+	tmpport = node->ports;
+
+	num = count_ports(tmpport);
+
+	while(tmpport && *tmpport) {
+		if (**tmpport == port)
+			return;
+		tmpport++;
+	}
+
+	if (!num) {
+		node->ports = (__u16 **)gr_dyn_alloc(2 * sizeof(__u16 *));
+		*(node->ports) = (__u16 *)gr_stat_alloc(sizeof(__u16));
+		**(node->ports) = port;
+	} else {
+		node->ports = (__u16 **)gr_dyn_realloc(node->ports, (num + 2) * sizeof(__u16 *));
+		memset(node->ports + num, 0, 2 * sizeof(__u16 *));
+		*(node->ports + num) = (__u16 *)gr_stat_alloc(sizeof(__u16));
+		**(node->ports + num) = port;
+	}
+
+	return;
+}
+
+void remove_port(struct gr_learn_ip_node *node, __u16 port)
+{
+	__u16 **ports = node->ports;
+	unsigned long num = count_ports(ports);
+	unsigned long i;
+
+	for(i = 0; i < num; i++) {
+		if (**(ports + i) == port) {
+			while (i < num) {
+				**(ports + i) = **(ports + i + 1);
+				i++;
+			}
+		}
+	}
+
+	return;
+}
+
+void do_reduce_ip_node(struct gr_learn_ip_node *node, struct gr_learn_ip_node *actor)
+{
+	__u16 **tmpport = node->ports;
+	struct gr_learn_ip_node **tmpip;
+	int i;
+
+	while (tmpport && *tmpport) {
+		insert_port(actor, **tmpport);
+		/* free(*tmpport); */
+		*tmpport = NULL;
+		tmpport++;
+	}
+	if (node->ports) {
+		gr_dyn_free(node->ports);
+		node->ports = NULL;
+	}
+
+	for (i = 0; i < (sizeof(node->ip_proto)/sizeof(node->ip_proto[0])); i++)
+		actor->ip_proto[i] |= node->ip_proto[i];
+	actor->ip_type |= node->ip_type;
+
+	if (!node->leaves) {
+		/* free(node); */
+		return;
+	}
+
+	tmpip = node->leaves;
+
+	while(*tmpip) {
+		do_reduce_ip_node(*tmpip, actor);
+		tmpip++;
+	}
+
+	gr_dyn_free(node->leaves);
+	node->leaves = NULL;
+
+	return;
+}
+
+
+
+int reduce_ip_node(struct gr_learn_ip_node *node, struct gr_learn_ip_node **actor, __u8 unused1,
+		   FILE *unused2)
+{
+	
+	if (analyze_ip_node(node)) {
+		*actor = node;
+		do_reduce_ip_node(node, *actor);
+	}
+
+	return 0;
+}
+
+int analyze_port_node(struct gr_learn_ip_node *node)
+{
+	unsigned long low_ports = 0, high_ports = 0;
+	int ret = 0;
+	__u16 **tmpport;
+
+	tmpport = node->ports;
+
+	while (tmpport && *tmpport) {
+		if (**tmpport < 1024)
+			low_ports++;
+		else
+			high_ports++;
+		tmpport++;
+	}
+
+	if (low_ports > 5)
+		ret += 1;
+	if (high_ports > 4)
+		ret += 2;
+
+	return ret;
+}	
+
+int reduce_port_node(struct gr_learn_ip_node *node, struct gr_learn_ip_node **unused, __u8 unused1,
+		     FILE *unused2)
+{
+	
+	switch(analyze_port_node(node)) {
+	case 1:
+		node->all_low_ports = 1;
+		break;
+	case 2:
+		node->all_high_ports = 1;
+		break;
+	case 3:
+		node->all_low_ports = 1;
+		node->all_high_ports = 1;
+		break;
+	}
+
+	return 0;
+}
+
+
+void reduce_ip_tree(struct gr_learn_ip_node *base)
+{
+	struct gr_learn_ip_node *tmp = NULL;
+
+	traverse_ip_tree(base, &tmp, &reduce_ip_node, 0, NULL);
+	return;
+}
+
+void reduce_ports_tree(struct gr_learn_ip_node *base)
+{
+	traverse_ip_tree(base, NULL, &reduce_port_node, 0, NULL);
+	return;
+}
+
+__u8 extract_ip_field(__u32 ip, unsigned long depth)
+{
+	__u8 ip_node[4];
+
+	memcpy(ip_node, &ip, sizeof(ip));
+
+	switch(depth) {
+	case 3:
+		return ip_node[3];
+	case 2:
+		return ip_node[2];
+	case 1:
+		return ip_node[1];
+	case 0:
+		return ip_node[0];
+	default:
+		return 0;
+	}
+
+}
+
+struct gr_learn_ip_node ** find_insert_ip(struct gr_learn_ip_node **base, __u32 ip,
+					  struct gr_learn_ip_node **parent)
+{
+	struct gr_learn_ip_node *** node = NULL;
+	struct gr_learn_ip_node **tmpip = NULL;
+	int depth = 0;
+	unsigned long num_ips = 0;
+	int match = 0;
+
+	if (!(*base)) {
+		(*base) = (struct gr_learn_ip_node *)gr_stat_alloc(sizeof(struct gr_learn_ip_node));
+		(*base)->root_node = 1;
+	}
+
+	depth = count_ip_depth(*base);
+	node = &((*base)->leaves);
+
+	tmpip = *node;
+	while (tmpip && *tmpip) {
+		if ((*tmpip)->ip_node == extract_ip_field(ip, depth)) {
+			match = 1;
+			break;
+		}
+		tmpip++;
+	}
+
+	if (match && depth < 3) {
+		return find_insert_ip(tmpip, ip, parent);
+	} else if (match)
+		return tmpip;
+	else {
+		num_ips = count_ips(*node);
+		(*node) = (struct gr_learn_ip_node **)gr_dyn_realloc((*node), (2 + num_ips) * sizeof(struct gr_learn_ip_node *));
+		memset((*node) + num_ips, 0, 2 * sizeof(struct gr_learn_ip_node *));
+
+		if (depth == 3) {
+			*parent = *base;
+			return ((*node) + num_ips);
+		} else {
+			(*((*node) + num_ips)) = (struct gr_learn_ip_node *)gr_stat_alloc(sizeof(struct gr_learn_ip_node));
+			(*((*node) + num_ips))->ip_node = extract_ip_field(ip, depth);
+			(*((*node) + num_ips))->parent = *base;
+			return find_insert_ip(((*node) + num_ips), ip, parent);
+		}
+	}
+}
+
+
+void insert_ip(struct gr_learn_ip_node **base, __u32 ip, __u16 port, __u8 proto,
+		__u8 socktype)
+{
+	struct gr_learn_ip_node **node;
+	struct gr_learn_ip_node *parent = NULL;
+	struct gr_learn_ip_node *insert;
+	__u8 ip_node[4];
+
+	insert = (struct gr_learn_ip_node *)gr_stat_alloc(sizeof(struct gr_learn_ip_node));
+
+	insert_port(insert, port);
+	insert->ip_proto[proto / 32] = (1 << (proto % 32));
+	insert->ip_type |= (1 << socktype);
+	memcpy(&ip_node, &ip, sizeof(ip));
+	insert->ip_node = ip_node[3];
+
+	node = find_insert_ip(base, ip, &parent);
+
+	if (*node) {
+		(*node)->ip_proto[proto / 32] |= (1 << (proto % 32));
+		(*node)->ip_type |= (1 << socktype);
+		insert_port(*node, port);
+		/* free(insert); */
+		return;
+	} else {
+		*node = insert;
+		(*node)->parent = parent;
+	}
+
+	return;
+}
+
+static int strcompare(const void *x, const void *y)
+{
+        struct gr_learn_file_tmp_node *x1 = *(struct gr_learn_file_tmp_node **) x;
+        struct gr_learn_file_tmp_node *y1 = *(struct gr_learn_file_tmp_node **) y;
+
+	if (x1 == NULL && y1 == NULL)
+		return 0;
+	if (x1 == NULL && y1 != NULL)
+		return 1;
+	if (x1 != NULL && y1 == NULL)
+		return -1;
+        return strcmp(x1->filename, y1->filename);
+}
+
+/* use this function to operate on a hash table, thus we need to handle
+   null entries in the table.  we modify strcompare above to make null
+   pointers lexicographically greater than all filenames, effectively
+   pushing them to the end of the table
+*/
+
+void sort_file_list(struct gr_hash_struct *hash)
+{
+	if (hash == NULL)
+		return;
+
+	return qsort(hash->table, hash->table_size, sizeof (struct gr_learn_file_tmp_node *), strcompare);
+}
+
+struct gr_learn_file_tmp_node *conv_filename_to_struct(char *filename, __u32 mode)
+{
+	struct gr_learn_file_tmp_node *node;
+
+	node = (struct gr_learn_file_tmp_node *)gr_stat_alloc(sizeof(struct gr_learn_file_tmp_node));
+	node->filename = filename;
+	node->mode = mode;
+
+	return node;
+}
+
+struct gr_learn_role_entry *
+insert_learn_role(struct gr_learn_role_entry ***role_list, char *rolename, __u16 rolemode)
+{
+	unsigned long num = 0;
+
+	if (!(*role_list)) {
+		*role_list = (struct gr_learn_role_entry **)gr_dyn_alloc(2 * sizeof(struct gr_learn_role_entry *));
+	} else {
+		struct gr_learn_role_entry **tmp;
+
+		tmp = *role_list;
+		while(*tmp) {
+			if (!strcmp((*tmp)->rolename, rolename)) {
+				(*tmp)->rolemode |= rolemode;
+				return *tmp;
+			}
+			num++;
+			tmp++;
+		}
+		*role_list = (struct gr_learn_role_entry **)gr_dyn_realloc(*role_list, (2 + num) * sizeof(struct gr_learn_role_entry *));
+		memset(*role_list + num, 0, 2 * sizeof(struct gr_learn_role_entry *));
+	}
+
+	(*((*role_list) + num)) = (struct gr_learn_role_entry *)gr_stat_alloc(sizeof(struct gr_learn_role_entry));
+	(*((*role_list) + num))->rolename = rolename;
+	(*((*role_list) + num))->rolemode = rolemode;
+
+	/* give every learned role a / subject */
+	insert_learn_role_subject(*((*role_list) + num), conv_filename_to_struct("/", GR_FIND));
+
+	return (*((*role_list) + num));
+}
+
+struct gr_learn_role_entry *
+find_learn_role(struct gr_learn_role_entry **role_list, char *rolename)
+{
+	struct gr_learn_role_entry **tmp;
+
+	tmp = role_list;
+	while(tmp && *tmp) {
+		if (!strcmp((*tmp)->rolename, rolename))
+			return *tmp;
+		tmp++;
+	}
+	return NULL;
+}
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_opt.c linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_opt.c
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_opt.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_opt.c	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,43 @@
+#include "gradm.h"
+
+static void
+expand_acl(struct proc_acl *proc, struct role_acl *role)
+{
+	char *tmpproc;
+	struct proc_acl *tmpp;
+
+	tmpproc = alloca(strlen(proc->filename) + 1);
+	strcpy(tmpproc, proc->filename);
+
+	while (parent_dir(proc->filename, &tmpproc)) {
+		tmpp = lookup_acl_subject_by_name(role, tmpproc);
+	        if (tmpp) {
+			proc->parent_subject = tmpp;
+			return;
+		}
+	}
+
+	return;
+}
+
+void
+expand_acls(void)
+{
+	struct proc_acl *proc;
+	struct role_acl *role;
+	struct stat fstat;
+
+	for_each_role(role, current_role) {
+		for_each_subject(proc, role) {
+			if (!stat(proc->filename, &fstat) && S_ISREG(fstat.st_mode)) {
+				if (!add_proc_object_acl(proc, proc->filename, proc_object_mode_conv("rx"), GR_FLEARN))
+					exit(EXIT_FAILURE);
+			}
+			/* if we're not nested and not /, set parent subject */
+			if (!(proc->mode & GR_OVERRIDE) && !(proc->mode & GR_NESTED) && strcmp(proc->filename, "/"))
+				expand_acl(proc, role);
+		}
+	}
+
+	return;
+}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_parse.c linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_parse.c
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_parse.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_parse.c	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,1094 @@
+#include "gradm.h"
+
+extern FILE *gradmin;
+extern int gradmparse(void);
+
+void
+add_id_transition(struct proc_acl *subject, char *idname, int usergroup, int allowdeny)
+{
+	struct passwd *pwd;
+	struct group *grp;
+
+	if (usergroup == GR_ID_USER) {
+		if (allowdeny == GR_ID_ALLOW) {
+			if (subject->user_trans_type & GR_ID_DENY) {
+				fprintf(stderr, "Error on line %lu of %s.  You cannot use "
+					"both user_transition_allow and user_transition_deny.\n"
+					"The RBAC system will not be allowed to be enabled until "
+					"this error is fixed.\n", lineno, current_acl_file);
+				exit(EXIT_FAILURE);
+			}
+			subject->user_trans_type |= GR_ID_ALLOW;
+		} else if (allowdeny == GR_ID_DENY) {
+			if (subject->user_trans_type & GR_ID_ALLOW) {
+				fprintf(stderr, "Error on line %lu of %s.  You cannot use "
+					"both user_transition_allow and user_transition_deny.\n"
+					"The RBAC system will not be allowed to be enabled until "
+					"this error is fixed.\n", lineno, current_acl_file);
+				exit(EXIT_FAILURE);
+			}
+			subject->user_trans_type |= GR_ID_DENY;
+		}
+
+		pwd = getpwnam(idname);
+
+		if (!pwd) {
+			fprintf(stderr, "User %s on line %lu of %s "
+				"does not exist.\nThe RBAC system will "
+				"not be allowed to be enabled until "
+				"this error is fixed.\n", idname,
+				lineno, current_acl_file);
+			exit(EXIT_FAILURE);
+		}
+
+		/* increment pointer count upon allocation of user transition list */
+		if (subject->user_transitions == NULL)
+			num_pointers++;
+
+		subject->user_trans_num++;
+		subject->user_transitions = gr_dyn_realloc(subject->user_transitions, subject->user_trans_num * sizeof(uid_t));
+		*(subject->user_transitions + subject->user_trans_num - 1) = pwd->pw_uid;
+	} else if (usergroup == GR_ID_GROUP) {
+		if (allowdeny == GR_ID_ALLOW) {
+			if (subject->group_trans_type & GR_ID_DENY) {
+				fprintf(stderr, "Error on line %lu of %s.  You cannot use "
+					"both group_transition_allow and group_transition_deny.\n"
+					"The RBAC system will not be allowed to be enabled until "
+					"this error is fixed.\n", lineno, current_acl_file);
+				exit(EXIT_FAILURE);
+			}
+			subject->group_trans_type |= GR_ID_ALLOW;
+		} else if (allowdeny == GR_ID_DENY) {
+			if (subject->group_trans_type & GR_ID_ALLOW) {
+				fprintf(stderr, "Error on line %lu of %s.  You cannot use "
+					"both group_transition_allow and group_transition_deny.\n"
+					"The RBAC system will not be allowed to be enabled until "
+					"this error is fixed.\n", lineno, current_acl_file);
+				exit(EXIT_FAILURE);
+			}
+			subject->group_trans_type |= GR_ID_DENY;
+		}
+
+		grp = getgrnam(idname);
+
+		if (!grp) {
+			fprintf(stderr, "Group %s on line %lu of %s "
+				"does not exist.\nThe RBAC system will "
+				"not be allowed to be enabled until "
+				"this error is fixed.\n", idname,
+				lineno, current_acl_file);
+			exit(EXIT_FAILURE);
+		}
+
+		/* increment pointer count upon allocation of group transition list */
+		if (subject->group_transitions == NULL)
+			num_pointers++;
+
+		subject->group_trans_num++;
+		subject->group_transitions = gr_dyn_realloc(subject->group_transitions, subject->group_trans_num * sizeof(gid_t));
+		*(subject->group_transitions + subject->group_trans_num - 1) = grp->gr_gid;
+	}
+
+	return;
+}
+
+void
+add_domain_child(struct role_acl *role, char *idname)
+{
+	struct passwd *pwd;
+	struct group *grp;
+
+	/* reason for this is that in the kernel, the hash table which is keyed by UID/GID
+	   has a size dependent on the number of roles.  Since we want to fake a domain
+	   as being a real role for each of those users/groups by providing a pointer
+	   to the domain for each user/group, we need to count each of these against the
+	   role count */
+	num_domain_children++;
+
+	/* increment pointer count upon allocation of domain list */
+	if (role->domain_children == NULL)
+		num_pointers++;
+
+	if (role->roletype & GR_ROLE_USER) {
+		pwd = getpwnam(idname);
+
+		if (!pwd) {
+			fprintf(stderr, "User %s on line %lu of %s "
+				"does not exist.\nThe RBAC system will "
+				"not be allowed to be enabled until "
+				"this error is fixed.\n", idname,
+				lineno, current_acl_file);
+			exit(EXIT_FAILURE);
+		}
+
+		role->domain_child_num++;
+		role->domain_children = gr_dyn_realloc(role->domain_children, role->domain_child_num * sizeof(uid_t));
+		*(role->domain_children + role->domain_child_num - 1) = pwd->pw_uid;
+	} else if (role->roletype & GR_ROLE_GROUP) {
+		grp = getgrnam(idname);
+
+		if (!grp) {
+			fprintf(stderr, "Group %s on line %lu of %s "
+				"does not exist.\nThe RBAC system will "
+				"not be allowed to be enabled until "
+				"this error is fixed.\n", idname,
+				lineno, current_acl_file);
+			exit(EXIT_FAILURE);
+		}
+
+		role->domain_child_num++;
+		role->domain_children = gr_dyn_realloc(role->domain_children, role->domain_child_num * sizeof(uid_t));
+		*(role->domain_children + role->domain_child_num - 1) = grp->gr_gid;
+	} else {
+		// should never get here
+		fprintf(stderr, "Unhandled exception 1.\n");
+		exit(EXIT_FAILURE);
+	}
+
+	return;
+}
+
+void
+add_role_transition(struct role_acl *role, char *rolename)
+{
+	struct role_transition **roletpp;
+	struct role_transition *roletp;
+
+	/* one for transition, one for name */
+	num_pointers += 2;
+
+	roletp =
+	    (struct role_transition *) calloc(1,
+					      sizeof (struct role_transition));
+	if (!roletp)
+		failure("calloc");
+
+	roletpp = &(role->transitions);
+
+	if (*roletpp)
+		(*roletpp)->next = roletp;
+
+	roletp->prev = *roletpp;
+
+	roletp->rolename = rolename;
+
+	*roletpp = roletp;
+
+	return;
+}
+
+static struct deleted_file *
+is_deleted_file_dupe(const char *filename)
+{
+	struct deleted_file *tmp;
+
+	tmp = deleted_files;
+
+	do {
+		if (!strcmp(filename, tmp->filename))
+			return tmp;
+	} while ((tmp = tmp->next));
+
+	return NULL;
+}
+
+static struct deleted_file *
+add_deleted_file(char *filename)
+{
+	struct deleted_file *dfile;
+	struct deleted_file *retfile;
+	static ino_t ino = 0;
+
+	ino++;
+
+	if (!deleted_files) {
+		deleted_files = malloc(sizeof (struct deleted_file));
+		if (!deleted_files)
+			failure("malloc");
+		deleted_files->filename = filename;
+		deleted_files->ino = ino;
+		deleted_files->next = NULL;
+	} else {
+		retfile = is_deleted_file_dupe(filename);
+		if (retfile)
+			return retfile;
+		dfile = malloc(sizeof (struct deleted_file));
+		if (!dfile)
+			failure("malloc");
+		dfile->filename = filename;
+		dfile->ino = ino;
+		dfile->next = deleted_files;
+		deleted_files = dfile;
+	}
+
+	return deleted_files;
+}
+
+static int
+is_role_dupe(struct role_acl *role, const char *rolename, const __u16 type)
+{
+	struct role_acl *tmp;
+
+	for_each_role(tmp, role)
+	    if ((tmp->roletype & type) && !strcmp(tmp->rolename, rolename))
+		return 1;
+
+	return 0;
+}
+
+static struct file_acl *
+is_proc_object_dupe(struct proc_acl *subject, struct file_acl *object)
+{
+	struct file_acl *tmp;
+
+	tmp = lookup_acl_object_by_name(subject, object->filename);
+	if (tmp)
+		return tmp;
+	tmp = lookup_acl_object(subject, object);
+	if (tmp)
+		return tmp;
+
+	return NULL;
+}
+
+static struct proc_acl *
+is_proc_subject_dupe(struct role_acl *role, struct proc_acl *subject)
+{
+	struct proc_acl *tmp;
+
+	tmp = lookup_acl_subject_by_name(role, subject->filename);
+	if (tmp)
+		return tmp;
+	tmp = lookup_acl_subject(role, subject);
+	if (tmp)
+		return tmp;
+
+	return NULL;
+}
+
+int
+add_role_acl(struct role_acl **role, char *rolename, __u16 type, int ignore)
+{
+	struct role_acl *rtmp;
+	struct passwd *pwd;
+	struct group *grp;
+
+	num_roles++;
+
+	/* one for role, one for name */
+	num_pointers += 2;
+
+	if (!rolename) {
+		fprintf(stderr, "Out of memory.\n");
+		exit(EXIT_FAILURE);
+	}
+
+	if ((rtmp =
+	     (struct role_acl *) calloc(1, sizeof (struct role_acl))) == NULL)
+		failure("calloc");
+
+	rtmp->roletype = type;
+	rtmp->rolename = rolename;
+
+	if (strcmp(rolename, "default") && (type & GR_ROLE_DEFAULT)) {
+		fprintf(stderr, "No role type specified for %s on line %lu "
+			"of %s.\nThe RBAC system will not be allowed to be "
+			"enabled until this error is fixed.\n", rolename,
+			lineno, current_acl_file);
+		return 0;
+	}
+
+	if (is_role_dupe(*role, rtmp->rolename, rtmp->roletype)) {
+		fprintf(stderr, "Duplicate role on line %lu of %s.\n"
+			"The RBAC system will not be allowed to be "
+			"enabled until this error is fixed.\n",
+			lineno, current_acl_file);
+		return 0;
+	}
+
+	if (ignore)
+		rtmp->uidgid = special_role_uid++;
+	else if (strcmp(rolename, "default") || !(type & GR_ROLE_DEFAULT)) {
+		if (type & GR_ROLE_USER) {
+			pwd = getpwnam(rolename);
+
+			if (!pwd) {
+				fprintf(stderr, "User %s on line %lu of %s "
+					"does not exist.\nThe RBAC system will "
+					"not be allowed to be enabled until "
+					"this error is fixed.\n", rolename,
+					lineno, current_acl_file);
+				return 0;
+			}
+
+			rtmp->uidgid = pwd->pw_uid;
+		} else if (type & GR_ROLE_GROUP) {
+			grp = getgrnam(rolename);
+
+			if (!grp) {
+				fprintf(stderr, "Group %s on line %lu of %s "
+					"does not exist.\nThe RBAC system will "
+					"not be allowed to be enabled until "
+					"this error is fixed.\n", rolename,
+					lineno, current_acl_file);
+				return 0;
+			}
+
+			rtmp->uidgid = grp->gr_gid;
+		} else if (type & GR_ROLE_SPECIAL) {
+			rtmp->uidgid = special_role_uid++;
+		}
+	}
+
+	if (*role)
+		(*role)->next = rtmp;
+
+	rtmp->prev = *role;
+
+	*role = rtmp;
+
+	if (type & GR_ROLE_SPECIAL)
+		add_role_transition(*role,rolename);
+
+	if (type & GR_ROLE_AUTH)
+		add_gradm_acl(*role);
+	if (!(type & GR_ROLE_SPECIAL))
+		add_grlearn_acl(*role);
+	if (type & GR_ROLE_LEARN)
+		add_rolelearn_acl();
+
+	return 1;
+}
+
+int count_slashes(char *str)
+{
+	int i = 0;
+	while (*str) {
+		if (*str == '/')
+			i++;
+		str++;
+	}
+
+	return i;
+}
+
+static int
+add_globbing_file(struct proc_acl *subject, char *filename,
+		  __u32 mode, int type)
+{
+	char *basepoint = strdup(filename);
+	char *p, *p2;
+	struct file_acl *anchor;
+	struct file_acl *glob, *glob2;
+	int lnum, onum;
+
+	/* one for the object itself, one for the filename */
+	num_pointers += 2;
+
+	if (!basepoint)
+		failure("strdup");
+
+	/* calculate basepoint, eg basepoint of /home/ * /test is /home */
+	p = p2 = basepoint;
+	while (*p != '\0') {
+		if (*p == '/')
+			p2 = p;
+		if (*p == '?' || *p == '*' || *p == '[')
+			break;
+		p++;
+	}
+	/* if base is / */
+	if (p2 == basepoint)
+		*(p2 + 1) = '\0';
+	else
+		*p2 = '\0';
+
+	anchor = lookup_acl_object_by_name(subject, basepoint);
+
+	if (!anchor) {
+		fprintf(stderr, "Error on line %lu of %s:\n"
+			"Object %s needs to be specified before globbed object %s\n",
+			lineno, current_acl_file, basepoint, filename);
+		exit(EXIT_FAILURE);
+	}
+
+	if (anchor->globbed) {
+		glob = anchor->globbed;
+		glob2 = calloc(1, sizeof(struct file_acl));
+		if (!glob2)
+			failure("calloc");
+		onum = count_slashes(filename);
+		lnum = count_slashes(glob->filename);
+		if (onum > lnum) {
+			glob2->next = glob;
+			anchor->globbed = glob2;
+			glob2->filename = filename;
+			glob2->mode = mode;
+			glob->prev = glob2;
+			return 1;
+		}
+		while (glob->next) {
+			lnum = count_slashes(glob->next->filename);
+			if (onum > lnum) {
+				glob2->next = glob->next;
+				glob->next = glob2;
+				glob2->filename = filename;
+				glob2->mode = mode;
+				glob2->prev = glob;
+				glob->next->prev = glob2;
+				return 1;
+			}
+			glob = glob->next;
+		}
+		glob2->filename = filename;
+		glob2->mode = mode;
+		glob2->prev = glob;
+		glob->next = glob2;
+	} else {
+		glob2 = calloc(1, sizeof(struct file_acl));
+		if (!glob2)
+			failure("calloc");
+		glob2->filename = filename;
+		glob2->mode = mode;
+		anchor->globbed = glob2;
+	}
+
+	return 1;
+}
+
+static void
+display_all_dupes(struct proc_acl *subject, struct file_acl *filp2)
+{
+	struct file_acl *tmp;
+	struct stat fstat;
+	struct file_acl ftmp;
+
+	for_each_object(tmp, subject)
+	    if (!stat(tmp->filename, &fstat)) {
+		ftmp.inode = fstat.st_ino;
+		ftmp.dev = MKDEV(MAJOR(fstat.st_dev), MINOR(fstat.st_dev));
+		if (ftmp.inode == filp2->inode && ftmp.dev == filp2->dev)
+			fprintf(stderr, "%s\n", tmp->filename);
+	}
+
+	return;
+}
+
+static char *
+parse_homedir(char *filename)
+{
+	struct passwd *pwd;
+	unsigned int newlen;
+	char *newfilename;
+
+	if (!(current_role->roletype & GR_ROLE_USER)) {
+		fprintf(stderr, "Error on line %lu of %s.  $HOME "
+				"is supported only on user roles.\n",
+				lineno, current_acl_file);
+		exit(EXIT_FAILURE);
+	}
+
+	pwd = getpwuid(current_role->uidgid);
+
+	if (pwd == NULL) {
+		fprintf(stderr, "Error: /etc/passwd was modified during parsing.\n");
+		exit(EXIT_FAILURE);
+	}
+
+	newlen = strlen(pwd->pw_dir) + strlen(filename) - 5 + 1;
+		
+	newfilename = calloc(1, newlen);
+
+	if (!newfilename) {
+		fprintf(stderr, "Out of memory.\n");
+		exit(EXIT_FAILURE);
+	}
+
+	strcpy(newfilename, pwd->pw_dir);
+	strcat(newfilename, (filename + 5));
+
+	return newfilename;
+}
+
+int
+add_proc_object_acl(struct proc_acl *subject, char *filename,
+		    __u32 mode, int type)
+{
+	struct file_acl *p;
+	struct file_acl *p2;
+	struct stat fstat;
+	struct deleted_file *dfile;
+	unsigned int file_len;
+	char *str;
+
+	if (!subject) {
+		fprintf(stderr, "Error on line %lu of %s.  Attempt to "
+			"add an object without a subject declaration.\n"
+			"The RBAC system will not load until this "
+			"error is fixed.\n", lineno, current_acl_file);
+		return 0;
+	}
+
+	if (!filename) {
+		fprintf(stderr, "Out of memory.\n");
+		exit(EXIT_FAILURE);
+	}
+
+	if (!strncmp(filename, "$HOME", 5))
+		filename = parse_homedir(filename);
+
+	str = filename;
+	file_len = 0;
+	while (*str) {
+		file_len++;
+		if (*str == '?' || *str == '*')
+			return add_globbing_file(subject, filename, mode, type);
+		if (*str == '[') {
+			char *str2 = str;
+			while (*str2) {
+				if (*str2 == ']')	
+					return add_globbing_file(subject, filename, mode, type);
+				str2++;
+			}
+		}
+		str++;
+	}
+
+	file_len++;
+
+	num_objects++;
+	/* one for the object, one for the filename, one for the name entry struct in the kernel*/
+	num_pointers += 3;
+
+	if (lstat(filename, &fstat)) {
+		dfile = add_deleted_file(filename);
+		fstat.st_ino = dfile->ino;
+		fstat.st_dev = 0;
+		mode |= GR_DELETED;
+	} else if (S_ISLNK(fstat.st_mode)) {
+		char buf[PATH_MAX];
+		memset(&buf, 0, sizeof (buf));
+		realpath(filename, buf);
+		if (!add_proc_object_acl(subject, strdup(buf), mode, type | GR_SYMLINK))
+			return 0;
+	}
+
+	if ((p =
+	     (struct file_acl *) calloc(1, sizeof (struct file_acl))) == NULL)
+		failure("calloc");
+
+	if ((filename[file_len - 2] == '/') && file_len != 2)
+		filename[file_len - 2] = '\0';
+
+	if (file_len > PATH_MAX) {
+		fprintf(stderr, "Filename too long on line %lu of file %s.\n",
+			lineno, current_acl_file);
+		exit(EXIT_FAILURE);
+	}
+
+	p->filename = filename;
+	p->mode = mode;
+	p->inode = fstat.st_ino;
+	p->dev = MKDEV(MAJOR(fstat.st_dev), MINOR(fstat.st_dev));
+
+	if (type & GR_FLEARN) {
+		struct file_acl *tmp;
+
+		tmp = lookup_acl_object_by_name(subject, p->filename);
+		if (tmp) {
+			tmp->mode |= mode;
+			return 1;
+		}
+		tmp = lookup_acl_object(subject, p);
+		if (tmp) {
+			tmp->mode |= mode;
+			return 1;
+		}
+	} else if ((p2 = is_proc_object_dupe(subject, p))) {
+		if (type & GR_SYMLINK)
+			return 1;
+		fprintf(stderr, "Duplicate object found for \"%s\""
+			" in role %s, subject %s, on line %lu of %s.\n"
+			"\"%s\" references the same object as the following object(s):\n",
+			p->filename, current_role->rolename, 
+			subject->filename, lineno, 
+			current_acl_file, p->filename);
+		display_all_dupes(subject, p);
+		fprintf(stderr, "specified on an earlier line."
+			"The RBAC system will not load until this"
+			" error is fixed.\n");
+		return 0;
+	}
+
+	insert_acl_object(subject, p);
+
+	return 1;
+}
+
+int
+add_proc_subject_acl(struct role_acl *role, char *filename, __u32 mode, int flag)
+{
+	struct proc_acl *p;
+	struct proc_acl *p2;
+	struct deleted_file *dfile;
+	struct stat fstat;
+	unsigned int file_len;
+
+	num_subjects++;
+	/* one for the subject, one for the filename */
+	num_pointers += 2;
+
+	if (!role) {
+		fprintf(stderr, "Error on line %lu of %s.  Attempt to "
+			"add a subject without a role declaration.\n"
+			"The RBAC system will not load until this "
+			"error is fixed.\n", lineno, current_acl_file);
+		return 0;
+	}
+
+	if (!filename) {
+		fprintf(stderr, "Out of memory.\n");
+		exit(EXIT_FAILURE);
+	}
+
+	if (!strncmp(filename, "$HOME", 5))
+		filename = parse_homedir(filename);
+
+	file_len = strlen(filename) + 1;
+
+	if (stat(filename, &fstat)) {
+		dfile = add_deleted_file(filename);
+		fstat.st_ino = dfile->ino;
+		fstat.st_dev = 0;
+		mode |= GR_DELETED;
+	}
+
+	if ((p =
+	     (struct proc_acl *) calloc(1, sizeof (struct proc_acl))) == NULL)
+		failure("calloc");
+
+	if (!strcmp(filename, "/") && !(flag & GR_FFAKE))
+		role->root_label = p;
+
+	if ((filename[file_len - 2] == '/') && file_len != 2)
+		filename[file_len - 2] = '\0';
+
+	if (file_len > PATH_MAX) {
+		fprintf(stderr, "Filename too long on line %lu of file %s.\n",
+			lineno, current_acl_file);
+		exit(EXIT_FAILURE);
+	}
+
+	p->filename = filename;
+	p->mode = mode;
+
+	p->dev = MKDEV(MAJOR(fstat.st_dev), MINOR(fstat.st_dev));
+	p->inode = fstat.st_ino;
+
+	if (!(flag & GR_FFAKE) && (p2 = is_proc_subject_dupe(role, p))) {
+		fprintf(stderr, "Duplicate subject found for \"%s\""
+			" in role %s, on line %lu of %s.\n"
+			"\"%s\" references the same object as \"%s\""
+			" specified on an earlier line.\n"
+			"The RBAC system will not load until this"
+			" error is fixed.\n", p->filename, 
+			role->rolename, lineno,
+			current_acl_file, p->filename, p2->filename);
+		return 0;
+	}
+
+	/* don't insert nested subjects into main hash */
+	if (!(flag & GR_FFAKE))
+		insert_acl_subject(role, p);
+	else
+		insert_nested_acl_subject(p);
+
+	current_subject = p;
+
+	return 1;
+}
+
+__u16
+role_mode_conv(const char *mode)
+{
+	int len = strlen(mode) - 1;
+	__u16 retmode = GR_ROLE_DEFAULT;
+
+	for (; len >= 0; len--) {
+		switch (mode[len]) {
+		case 'u':
+			retmode &= ~GR_ROLE_DEFAULT;
+			retmode |= GR_ROLE_USER;
+			break;
+		case 'g':
+			retmode &= ~GR_ROLE_DEFAULT;
+			retmode |= GR_ROLE_GROUP;
+			break;
+		case 's':
+			retmode &= ~GR_ROLE_DEFAULT;
+			retmode |= GR_ROLE_SPECIAL;
+			break;
+		case 'l':
+			retmode |= GR_ROLE_LEARN;
+			break;
+		case 'G':
+			retmode |= GR_ROLE_AUTH;
+			break;
+		case 'N':
+			retmode |= GR_ROLE_NOPW;
+			break;
+		case 'A':
+			retmode |= GR_ROLE_GOD;
+			break;
+		case 'T':
+			retmode |= GR_ROLE_TPE;
+			break;
+		}
+	}
+
+	if (retmode & GR_ROLE_SPECIAL &&
+	    retmode & (GR_ROLE_USER | GR_ROLE_GROUP)) {
+		fprintf(stderr, "Error on line %lu of %s.  The role mode must be either "
+				"special, or user/group, not both.\n"
+				"The RBAC system will not load until this"
+				" error is fixed.\n", lineno, current_acl_file); 
+		exit(EXIT_FAILURE);
+	}
+
+	if ((retmode & (GR_ROLE_USER | GR_ROLE_GROUP)) && (retmode & GR_ROLE_NOPW)) {
+		fprintf(stderr, "Error on line %lu of %s.  The role mode \"N\" can only "
+				"be used with a special role.\n"
+				"The RBAC system will not load until this"
+				" error is fixed.\n", lineno, current_acl_file); 
+		exit(EXIT_FAILURE);
+	}
+	if ((retmode & (GR_ROLE_USER | GR_ROLE_GROUP)) ==
+		(GR_ROLE_USER | GR_ROLE_GROUP)) {
+		fprintf(stderr, "Error on line %lu of %s.  The role mode cannot be both "
+				"user or group, you must choose one.\n"
+				"The RBAC system will not load until this"
+				" error is fixed.\n", lineno, current_acl_file); 
+		exit(EXIT_FAILURE);
+	}
+
+	return retmode;
+}
+
+__u32
+proc_subject_mode_conv(const char *mode)
+{
+	int i;
+	__u32 retmode = 0;
+
+	retmode |= GR_FIND;
+
+	for (i = 0; i < strlen(mode); i++) {
+		switch (mode[i]) {
+		case 'T':
+			retmode |= GR_NOTROJAN;
+			break;
+		case 'K':
+			retmode |= GR_KILLPROC;
+			break;
+		case 'C':
+			retmode |= GR_KILLIPPROC;
+			break;
+		case 'A':
+			retmode |= GR_PROTSHM;
+			break;
+		case 'P':
+			retmode |= GR_PAXPAGE;
+			break;
+		case 'R':
+			retmode |= GR_PAXRANDMMAP;
+			break;
+		case 'M':
+			retmode |= GR_PAXMPROTECT;
+			break;
+		case 'S':
+			retmode |= GR_PAXSEGM;
+			break;
+		case 'G':
+			retmode |= GR_PAXGCC;
+			break;
+		case 'X':
+			retmode |= GR_PAXRANDEXEC;
+			break;
+		case 'O':
+			retmode |= GR_IGNORE;
+			break;
+		case 'o':
+			retmode |= GR_OVERRIDE;
+			break;
+		case 'l':
+			retmode |= GR_LEARN;
+			break;
+		case 'h':
+			retmode &= ~GR_FIND;
+			break;
+		case 'p':
+			retmode |= GR_PROTECTED;
+			break;
+		case 'k':
+			retmode |= GR_KILL;
+			break;
+		case 'v':
+			retmode |= GR_VIEW;
+			break;
+		case 'd':
+			retmode |= GR_PROTPROCFD;
+			break;
+		case 'b':
+			retmode |= GR_PROCACCT;
+			break;
+		case 'r':
+			retmode |= GR_RELAXPTRACE;
+			break;
+		default:
+			fprintf(stderr, "Invalid proc subject mode "
+				"\'%c\' found on line %lu "
+				"of %s\n", mode[i], lineno, current_acl_file);
+		}
+	}
+
+	return retmode;
+}
+
+__u32
+proc_object_mode_conv(const char *mode)
+{
+	int i;
+	__u32 retmode = 0;
+
+	retmode |= GR_FIND;
+
+	for (i = 0; i < strlen(mode); i++) {
+		switch (mode[i]) {
+		case 'r':
+			retmode |= GR_READ;
+			break;
+		case 'w':
+			retmode |= GR_WRITE;
+			retmode |= GR_APPEND;
+			break;
+		case 'c':
+			retmode |= GR_CREATE;
+			break;
+		case 'd':
+			retmode |= GR_DELETE;
+			break;
+		case 'x':
+			retmode |= GR_EXEC;
+			break;
+		case 'a':
+			retmode |= GR_APPEND;
+			break;
+		case 'h':
+			retmode &= ~GR_FIND;
+			break;
+		case 'i':
+			retmode |= GR_INHERIT;
+			break;
+		case 't':
+			retmode |= GR_PTRACERD;
+			break;
+		case 'F':
+			retmode |= GR_AUDIT_FIND;
+			break;
+		case 'R':
+			retmode |= GR_AUDIT_READ;
+			break;
+		case 'W':
+			retmode |= GR_AUDIT_WRITE;
+			retmode |= GR_AUDIT_APPEND;
+			break;
+		case 'X':
+			retmode |= GR_AUDIT_EXEC;
+			break;
+		case 'A':
+			retmode |= GR_AUDIT_APPEND;
+			break;
+		case 'I':
+			retmode |= GR_AUDIT_INHERIT;
+			break;
+		case 'M':
+			retmode |= GR_AUDIT_SETID;
+			break;
+		case 'C':
+			retmode |= GR_AUDIT_CREATE;
+			break;
+		case 'D':
+			retmode |= GR_AUDIT_DELETE;
+			break;
+		case 's':
+			retmode |= GR_SUPPRESS;
+			break;
+		case 'm':
+			retmode |= GR_SETID;
+			break;
+		case 'p':
+			retmode |= GR_NOPTRACE;
+			break;
+		default:
+			fprintf(stderr, "Invalid proc object mode "
+				"\'%c\' found on line %lu "
+				"of %s\n", mode[i], lineno, current_acl_file);
+		}
+	}
+
+	return retmode;
+}
+
+void
+parse_acls(void)
+{
+	if (chdir(GRSEC_DIR) < 0) {
+		fprintf(stderr, "Error changing directory to %s\n"
+			"Error: %s\n", GRSEC_DIR, strerror(errno));
+		exit(EXIT_FAILURE);
+	}
+
+	gradmin = open_acl_file(GR_POLICY_PATH);
+	change_current_acl_file(GR_POLICY_PATH);
+	gradmparse();
+	fclose(gradmin);
+
+	add_kernel_acl();
+
+	return;
+}
+
+static void
+setup_special_roles(struct gr_arg *grarg)
+{
+	struct role_acl *rtmp = NULL;
+	struct gr_pw_entry entry;
+	int err;
+	__u16 i = 0;
+
+	memset(&entry, 0, sizeof (struct gr_pw_entry));
+
+	err = mlock(&entry, sizeof (struct gr_pw_entry));
+	if (err && !getuid())
+		fprintf(stderr, "Warning, unable to lock authentication "
+			"structure in physical memory.\n");
+
+	for_each_role(rtmp, current_role) {
+		if (rtmp->roletype & GR_ROLE_SPECIAL &&
+		    !(rtmp->roletype & GR_ROLE_NOPW)) {
+			strncpy(entry.rolename, rtmp->rolename, GR_SPROLE_LEN);
+			entry.rolename[GR_SPROLE_LEN - 1] = '\0';
+			if (!read_saltandpass
+			    (entry.rolename, entry.salt, entry.sum)) {
+				fprintf(stderr,
+					"No password exists for special "
+					"role %s.\nRun gradm -P %s to set up a password "
+					"for the role.\n", rtmp->rolename,
+					rtmp->rolename);
+				exit(EXIT_FAILURE);
+			}
+			grarg->sprole_pws[i].rolename =
+			    (unsigned char *) rtmp->rolename;
+			memcpy(grarg->sprole_pws[i].salt, entry.salt,
+			       GR_SALT_SIZE);
+			memcpy(grarg->sprole_pws[i].sum, entry.sum,
+			       GR_SHA_SUM_SIZE);
+			memset(&entry, 0, sizeof (struct gr_pw_entry));
+			i++;
+		}
+	}
+
+	return;
+}
+
+struct gr_arg_wrapper *
+conv_user_to_kernel(struct gr_pw_entry *entry)
+{
+	struct gr_arg_wrapper *wrapper;
+	struct gr_arg *retarg;
+	struct user_acl_role_db *role_db;
+	struct role_acl *rtmp = NULL;
+	struct role_acl **r_tmp = NULL;
+	unsigned long i = 0;
+	unsigned long racls = 0;
+	__u16 sproles = 0;
+	int err;
+
+	for_each_role(rtmp, current_role) {
+		racls++;
+		if (rtmp->roletype & GR_ROLE_SPECIAL &&
+		    !(rtmp->roletype & GR_ROLE_NOPW))
+			sproles++;
+	}
+
+	if ((retarg =
+	     (struct gr_arg *) calloc(1, sizeof (struct gr_arg))) == NULL)
+		failure("calloc");
+
+	if ((wrapper =
+	     (struct gr_arg_wrapper *) calloc(1, sizeof (struct gr_arg_wrapper))) == NULL)
+		failure("calloc");
+
+	wrapper->version = GRADM_VERSION;
+	wrapper->size = sizeof(struct gr_arg);
+	wrapper->arg = retarg;
+
+	err = mlock(retarg, sizeof (struct gr_arg));
+	if (err && !getuid())
+		fprintf(stderr, "Warning, unable to lock authentication "
+			"structure in physical memory.\n");
+
+	if (!racls)	// we are disabling, don't want to calloc 0
+		goto set_pw;
+
+	if ((retarg->sprole_pws =
+	     (struct sprole_pw *) calloc(sproles,
+					 sizeof (struct sprole_pw))) == NULL)
+		failure("calloc");
+
+	err = mlock(retarg->sprole_pws, sproles * sizeof (struct sprole_pw));
+	if (err && !getuid())
+		fprintf(stderr, "Warning, unable to lock authentication "
+			"structure in physical memory.\n");
+
+	setup_special_roles(retarg);
+
+	retarg->num_sprole_pws = sproles;
+
+	role_db = (struct user_acl_role_db *) calloc(1, sizeof (struct user_acl_role_db));
+	if (role_db == NULL)
+		failure("calloc");
+
+	role_db->num_pointers = num_pointers;
+	role_db->num_roles = num_roles;
+	role_db->num_domain_children = num_domain_children;
+	role_db->num_subjects = num_subjects;
+	role_db->num_objects = num_objects;
+
+	if ((r_tmp = role_db->r_table =
+	     (struct role_acl **) calloc(racls,
+					 sizeof (struct role_acl *))) == NULL)
+		failure("calloc");
+
+	for_each_role(rtmp, current_role) {
+		*r_tmp = rtmp;
+		r_tmp++;
+	}
+
+	memcpy(&retarg->role_db, role_db, sizeof (struct user_acl_role_db));
+      set_pw:
+
+	strncpy(retarg->pw, entry->passwd, GR_PW_LEN - 1);
+	retarg->pw[GR_PW_LEN - 1] = '\0';
+	strncpy(retarg->sp_role, entry->rolename, GR_SPROLE_LEN);
+	retarg->sp_role[GR_SPROLE_LEN - 1] = '\0';
+
+	retarg->mode = entry->mode;
+	retarg->segv_inode = entry->segv_inode;
+	retarg->segv_dev = entry->segv_dev;
+	retarg->segv_uid = entry->segv_uid;
+
+	memset(entry, 0, sizeof (struct gr_pw_entry));
+
+	return wrapper;
+}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_pw.c linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_pw.c
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_pw.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_pw.c	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,189 @@
+#include "gradm.h"
+
+void
+write_user_passwd(struct gr_pw_entry *entry)
+{
+	int fd;
+	int len;
+	off_t offset;
+	unsigned char total[GR_SPROLE_LEN + GR_SHA_SUM_SIZE + GR_SALT_SIZE];
+
+	if ((access(GR_PW_PATH, F_OK)) != 0) {
+		if ((fd =
+		     open(GR_PW_PATH, O_EXCL | O_CREAT,
+			  S_IRUSR | S_IWUSR)) < 0) {
+			fprintf(stderr, "Could not open %s\n", GR_PW_PATH);
+			failure("open");
+		}
+
+		close(fd);
+	}
+
+	if ((fd = open(GR_PW_PATH, O_RDWR)) < 0) {
+		fprintf(stderr, "Could not open %s\n", GR_PW_PATH);
+		failure("open");
+	}
+
+	while ((len = read(fd, total, sizeof (total))) == sizeof (total)) {
+		if (!memcmp(&total, entry->rolename, GR_SPROLE_LEN)) {
+			if ((offset =
+			     lseek(fd, -sizeof (total),
+				   SEEK_CUR)) == (off_t) - 1)
+				failure("lseek");
+			break;
+		}
+	}
+
+	if (write(fd, entry->rolename, GR_SPROLE_LEN) != GR_SPROLE_LEN) {
+		fprintf(stderr, "Error writing to %s\n", GR_PW_PATH);
+		failure("write");
+	}
+
+	if (write(fd, entry->salt, GR_SALT_SIZE) != GR_SALT_SIZE) {
+		fprintf(stderr, "Error writing to %s\n", GR_PW_PATH);
+		failure("write");
+	}
+
+	if (write(fd, entry->sum, GR_SHA_SUM_SIZE) != GR_SHA_SUM_SIZE) {
+		fprintf(stderr, "Error writing to %s\n", GR_PW_PATH);
+		failure("write");
+	}
+
+	close(fd);
+
+	return;
+}
+
+void
+get_user_passwd(struct gr_pw_entry *entry, int mode)
+{
+	struct termios term;
+	struct gr_pw_entry *old = NULL;
+	struct gr_pw_entry new;
+	int i, err;
+
+	err = mlock(&new, sizeof (new));
+	if (err && !getuid())
+		fprintf(stderr, "Warning: Unable to lock password "
+			"into physical memory.\n");
+      start_pw:
+	memset(&new, 0, sizeof (struct gr_pw_entry));
+
+	for (i = 0; i <= mode; i++) {
+		if (i == GR_PWANDSUM) {
+			old = entry;
+			entry = &new;
+		}
+
+		printf("%s", (i ? "Re-enter Password: " : "Password: "));
+		fflush(stdout);
+
+		tcgetattr(STDIN_FILENO, &term);
+
+		if (term.c_lflag & ECHO) {
+			term.c_lflag &= ~ECHO;
+			tcsetattr(STDIN_FILENO, TCSANOW, &term);
+		}
+
+		if ((read(STDIN_FILENO, entry->passwd, GR_PW_LEN)) < 0) {
+			fprintf(stderr,
+				"\nError reading password from user.\n");
+			term.c_lflag |= ECHO;
+			tcsetattr(STDIN_FILENO, TCSANOW, &term);
+			failure("read");
+		}
+
+		printf("\n");
+		fflush(stdout);
+
+		term.c_lflag |= ECHO;
+		tcsetattr(STDIN_FILENO, TCSANOW, &term);
+
+		entry->passwd[strlen(entry->passwd) - 1] = '\0';
+
+		if ((strlen(entry->passwd) < 6) && mode == 1) {
+			fprintf(stderr,
+				"Your password must be at least 6 characters in length.\n");
+			goto start_pw;
+		}
+
+		if (i == GR_PWANDSUM) {
+			if (strcmp(old->passwd, entry->passwd)) {
+				fprintf(stderr, "Passwords do not match.\n");
+				exit(EXIT_FAILURE);
+			}
+			entry = old;
+			memset(&new, 0, sizeof (struct gr_pw_entry));
+			printf("Password written to %s.\n", GR_PW_PATH);
+		}
+	}
+
+	return;
+}
+
+void
+generate_salt(struct gr_pw_entry *entry)
+{
+	int fd;
+
+	if ((fd = open("/dev/random", O_RDONLY)) < 0) {
+		if ((fd = open("/dev/urandom", O_RDONLY)) < 0) {
+			fprintf(stderr,
+				"Unable to open /dev/urandom for reading.\n");
+			failure("open");
+		}
+	}
+
+	if (read(fd, entry->salt, GR_SALT_SIZE) != GR_SALT_SIZE) {
+		close(fd);
+		if ((fd = open("/dev/urandom", O_RDONLY)) < 0) {
+			fprintf(stderr,
+				"Unable to open /dev/urandom for reading.\n");
+			failure("open");
+		}
+		if (read(fd, entry->salt, GR_SALT_SIZE) != GR_SALT_SIZE) {
+			fprintf(stderr, "Unable to read from /dev/random\n");
+			failure("read");
+		}
+	}
+
+	return;
+}
+
+int
+read_saltandpass(char *rolename, unsigned char *salt, unsigned char *pass)
+{
+	int fd;
+	int len;
+	int found = 0;
+	unsigned char cmp[GR_SPROLE_LEN];
+	unsigned char total[GR_SPROLE_LEN + GR_SHA_SUM_SIZE + GR_SALT_SIZE];
+
+	memset(&cmp, 0, sizeof (cmp));
+
+	fd = open(GR_PW_PATH, O_RDONLY);
+	if (fd < 0) {
+		fprintf(stderr, "Error opening: %s\n", GR_PW_PATH);
+		perror("open");
+		exit(EXIT_FAILURE);
+	}
+
+	while ((len = read(fd, total, sizeof (total))) == sizeof (total)) {
+		if (!memcmp(&total, rolename, GR_SPROLE_LEN)) {
+			found = 1;
+			break;
+		}
+	}
+
+	if (!found && !memcmp(rolename, &cmp, GR_SPROLE_LEN)) {
+		fprintf(stderr, "Your password file is not set up correctly.\n"
+			"Run gradm -P to set a password.\n");
+		exit(EXIT_FAILURE);
+	} else if (!found)
+		return 0;
+
+	memcpy(salt, total + GR_SPROLE_LEN, GR_SALT_SIZE);
+	memcpy(pass, total + GR_SPROLE_LEN + GR_SALT_SIZE, GR_SHA_SUM_SIZE);
+
+	return 1;
+}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_res.c linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_res.c
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_res.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_res.c	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,158 @@
+#include "gradm.h"
+
+/* fix broken glibc installs */
+#ifndef RLIMIT_LOCKS
+#define RLIMIT_LOCKS 10
+#endif
+#ifndef NR_OPEN
+#define NR_OPEN 1024
+#endif
+
+struct rlimconv rlim_table[] = {
+	{"RES_CPU", RLIMIT_CPU},
+	{"RES_FSIZE", RLIMIT_FSIZE},
+	{"RES_DATA", RLIMIT_DATA},
+	{"RES_STACK", RLIMIT_STACK},
+	{"RES_CORE", RLIMIT_CORE},
+	{"RES_RSS", RLIMIT_RSS},
+	{"RES_NPROC", RLIMIT_NPROC},
+	{"RES_NOFILE", RLIMIT_NOFILE},
+	{"RES_MEMLOCK", RLIMIT_MEMLOCK},
+	{"RES_AS", RLIMIT_AS},
+	{"RES_LOCKS", RLIMIT_LOCKS},
+	{"RES_CRASH", RLIMIT_LOCKS + 1}
+
+};
+
+static unsigned short
+name_to_res(const char *name)
+{
+	int i;
+
+	for (i = 0; i < (sizeof (rlim_table) / sizeof (struct rlimconv)); i++) {
+		if (!strcmp(rlim_table[i].name, name))
+			return rlim_table[i].val;
+	}
+
+	fprintf(stderr, "Invalid resource name: %s "
+		"found on line %lu of %s.\n", name, lineno, current_acl_file);
+	exit(EXIT_FAILURE);
+
+	return 0;
+}
+
+static unsigned short
+res_to_mask(unsigned short res)
+{
+	return (1 << res);
+}
+
+static unsigned long
+conv_res(const char *lim)
+{
+	unsigned long res;
+	char *p;
+	int i;
+	unsigned int len = strlen(lim);
+
+	if (!strcmp("unlimited", lim))
+		return ~0UL;
+
+	if (isdigit(lim[len - 1]))
+		return atol(lim);
+
+	if ((p = (char *) calloc(len + 1, sizeof (char))) == NULL)
+		failure("calloc");
+
+	strcpy(p, lim);
+
+	for (i = 0; i < len - 1; i++) {
+		if (!isdigit(lim[i])) {
+			fprintf(stderr, "Invalid resource limit: %s "
+				"found on line %lu of %s.\n", lim, lineno,
+				current_acl_file);
+			exit(EXIT_FAILURE);
+		}
+	}
+
+	p[i] = '\0';
+	res = atol(p);
+	free(p);
+
+	switch (lim[i]) {
+	case 'm':
+		res = res * HZ * 60;
+		break;
+	case 'h':
+		res = res * HZ * 60 * 60;
+		break;
+	case 'd':
+		res = res * HZ * 60 * 60 * 24;
+		break;
+	case 's':
+		res = res * HZ;
+		break;
+	case 'K':
+		res = res << 10;
+		break;
+	case 'M':
+		res = res << 20;
+		break;
+	case 'G':
+		res = res << 30;
+		break;
+	default:
+		fprintf(stderr, "Invalid resource limit: %s "
+			"found on line %lu of %s.\n", lim, lineno,
+			current_acl_file);
+		exit(EXIT_FAILURE);
+	}
+
+	return res;
+}
+
+void
+modify_res(struct proc_acl *proc, int res, unsigned long cur, unsigned long max)
+{
+	if ((res < 0)
+	    || (res > (sizeof (rlim_table) / sizeof (struct rlimconv))))
+		return;
+
+	if (proc->resmask & res_to_mask(rlim_table[res].val)) {
+		proc->res[res].rlim_cur = cur;
+		proc->res[res].rlim_max = max;
+	}
+
+	return;
+}
+
+void
+add_res_acl(struct proc_acl *subject, const char *name,
+	    const char *soft, const char *hard)
+{
+	struct rlimit lim;
+
+	if (!subject) {
+		fprintf(stderr, "Error on line %lu of %s.  Attempt to "
+			"add a resource without a subject declaration.\n"
+			"The RBAC system will not load until this "
+			"error is fixed.\n", lineno, current_acl_file);
+		exit(EXIT_FAILURE);
+	}
+
+	lim.rlim_cur = conv_res(soft);
+	lim.rlim_max = conv_res(hard);
+
+	if (!strcmp(name, "RES_NOFILE") && (lim.rlim_cur > NR_OPEN ||
+					    lim.rlim_max > NR_OPEN)) {
+		fprintf(stderr, "Limits for RES_NOFILE cannot be larger "
+			"than %u.\n", NR_OPEN);
+		exit(EXIT_FAILURE);
+	}
+
+	subject->resmask |= res_to_mask(name_to_res(name));
+
+	memcpy(&(subject->res[name_to_res(name)]), &lim, sizeof (lim));
+
+	return;
+}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_sha256.c linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_sha256.c
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_sha256.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_sha256.c	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,288 @@
+#include "gradm.h"
+
+/* digest-sha256.c,v 1.13 2002/10/02 22:02:08 hvr Exp $
+ *
+ * SHA-256 code by Jean-Luc Cooke <jlcooke@certainkey.com>.
+ * 
+ * Glue code originally by Andrew McDonald and Alan Smithee, mailed
+ * to maintainer on pulped trees.
+ *
+ * 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, or (at your option) any
+ * later version.
+ *
+ */
+
+typedef struct {
+	__u32 state[8];
+	__u32 count[2];
+	__u8 buf[128];
+} sha256_ctx_t;
+
+static __inline__ __u32
+generic_rotr32(const __u32 x, const unsigned bits)
+{
+	const unsigned n = bits % 32;
+	return (x >> n) | (x << (32 - n));
+}
+
+#define Ch(x,y,z)   ((x & y) ^ (~x & z))
+#define Maj(x,y,z)  ((x & y) ^ ( x & z) ^ (y & z))
+#define RORu32(x,y) generic_rotr32(x, y)
+#define e0(x)       (RORu32(x, 2) ^ RORu32(x,13) ^ RORu32(x,22))
+#define e1(x)       (RORu32(x, 6) ^ RORu32(x,11) ^ RORu32(x,25))
+#define s0(x)       (RORu32(x, 7) ^ RORu32(x,18) ^ (x >> 3))
+#define s1(x)       (RORu32(x,17) ^ RORu32(x,19) ^ (x >> 10))
+
+#define H0         0x6a09e667
+#define H1         0xbb67ae85
+#define H2         0x3c6ef372
+#define H3         0xa54ff53a
+#define H4         0x510e527f
+#define H5         0x9b05688c
+#define H6         0x1f83d9ab
+#define H7         0x5be0cd19
+
+const static __u32 sha256_K[64] = {
+	0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5,
+	0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
+	0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3,
+	0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
+	0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc,
+	0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
+	0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7,
+	0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
+	0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13,
+	0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
+	0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3,
+	0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
+	0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5,
+	0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
+	0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208,
+	0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
+};
+
+#define LOAD_OP(I)\
+ {\
+  t1  = input[(4*I)  ] & 0xff; t1<<=8;\
+  t1 |= input[(4*I)+1] & 0xff; t1<<=8;\
+  t1 |= input[(4*I)+2] & 0xff; t1<<=8;\
+  t1 |= input[(4*I)+3] & 0xff;\
+  W[I] = t1;\
+ }
+
+#define BLEND_OP(I) W[I] = s1(W[I-2]) + W[I-7] + s0(W[I-15]) + W[I-16];
+
+static void
+SHA256Transform(__u32 * state, const __u8 * input)
+{
+	__u32 a, b, c, d, e, f, g, h, t1, t2;
+	__u32 W[64];
+
+	int i;
+
+	/* load the input */
+	LOAD_OP(0);
+	LOAD_OP(1);
+	LOAD_OP(2);
+	LOAD_OP(3);
+	LOAD_OP(4);
+	LOAD_OP(5);
+	LOAD_OP(6);
+	LOAD_OP(7);
+	LOAD_OP(8);
+	LOAD_OP(9);
+	LOAD_OP(10);
+	LOAD_OP(11);
+	LOAD_OP(12);
+	LOAD_OP(13);
+	LOAD_OP(14);
+	LOAD_OP(15);
+
+	/* now blend */
+	for (i = 16; i < 64; i += 8) {
+		BLEND_OP(i);
+		BLEND_OP(i + 1);
+		BLEND_OP(i + 2);
+		BLEND_OP(i + 3);
+		BLEND_OP(i + 4);
+		BLEND_OP(i + 5);
+		BLEND_OP(i + 6);
+		BLEND_OP(i + 7);
+	}
+
+	/* load the state into our registers */
+	a = state[0];
+	b = state[1];
+	c = state[2];
+	d = state[3];
+	e = state[4];
+	f = state[5];
+	g = state[6];
+	h = state[7];
+
+	/* now iterate */
+	for (i = 0; i < 64; i += 8) {
+		t1 = h + e1(e) + Ch(e, f, g) + sha256_K[i] + W[i];
+		t2 = e0(a) + Maj(a, b, c);
+		d += t1;
+		h = t1 + t2;
+		t1 = g + e1(d) + Ch(d, e, f) + sha256_K[i + 1] + W[i + 1];
+		t2 = e0(h) + Maj(h, a, b);
+		c += t1;
+		g = t1 + t2;
+		t1 = f + e1(c) + Ch(c, d, e) + sha256_K[i + 2] + W[i + 2];
+		t2 = e0(g) + Maj(g, h, a);
+		b += t1;
+		f = t1 + t2;
+		t1 = e + e1(b) + Ch(b, c, d) + sha256_K[i + 3] + W[i + 3];
+		t2 = e0(f) + Maj(f, g, h);
+		a += t1;
+		e = t1 + t2;
+		t1 = d + e1(a) + Ch(a, b, c) + sha256_K[i + 4] + W[i + 4];
+		t2 = e0(e) + Maj(e, f, g);
+		h += t1;
+		d = t1 + t2;
+		t1 = c + e1(h) + Ch(h, a, b) + sha256_K[i + 5] + W[i + 5];
+		t2 = e0(d) + Maj(d, e, f);
+		g += t1;
+		c = t1 + t2;
+		t1 = b + e1(g) + Ch(g, h, a) + sha256_K[i + 6] + W[i + 6];
+		t2 = e0(c) + Maj(c, d, e);
+		f += t1;
+		b = t1 + t2;
+		t1 = a + e1(f) + Ch(f, g, h) + sha256_K[i + 7] + W[i + 7];
+		t2 = e0(b) + Maj(b, c, d);
+		e += t1;
+		a = t1 + t2;
+	}
+
+	state[0] += a;
+	state[1] += b;
+	state[2] += c;
+	state[3] += d;
+	state[4] += e;
+	state[5] += f;
+	state[6] += g;
+	state[7] += h;
+
+	/* clear any sensitive info... */
+	a = b = c = d = e = f = g = h = t1 = t2 = 0;
+	memset(W, 0, 64 * sizeof (__u32));
+}
+
+static void
+SHA256Init(sha256_ctx_t * C)
+{
+	C->state[0] = H0;
+	C->state[1] = H1;
+	C->state[2] = H2;
+	C->state[3] = H3;
+	C->state[4] = H4;
+	C->state[5] = H5;
+	C->state[6] = H6;
+	C->state[7] = H7;
+	C->count[0] = C->count[1] = 0;
+	memset(C->buf, 0, 128);
+}
+
+static void
+SHA256Update(sha256_ctx_t * C, const __u8 * input, __u32 inputLen)
+{
+	__u32 i, index, partLen;
+
+	/* Compute number of bytes mod 128 */
+	index = (__u32) ((C->count[0] >> 3) & 0x3f);
+
+	/* Update number of bits */
+	if ((C->count[0] += (inputLen << 3)) < (inputLen << 3)) {
+		C->count[1]++;
+		C->count[1] += (inputLen >> 29);
+	}
+
+	partLen = 64 - index;
+
+	/* Transform as many times as possible. */
+	if (inputLen >= partLen) {
+		memcpy(&C->buf[index], input, partLen);
+		SHA256Transform(C->state, C->buf);
+
+		for (i = partLen; i + 63 < inputLen; i += 64)
+			SHA256Transform(C->state, &input[i]);
+		index = 0;
+	} else {
+		i = 0;
+	}
+
+	/* Buffer remaining input */
+	memcpy(&C->buf[index], &input[i], inputLen - i);
+}
+
+static void
+SHA256Final(sha256_ctx_t * C, __u8 * digest)
+{
+	const static __u8 padding[64] = { 0x80, };
+	__u8 bits[8];
+	__u32 t, index, padLen;
+	int i, j;
+
+	/* Save number of bits */
+	t = C->count[0];
+	bits[7] = t;
+	t >>= 8;
+	bits[6] = t;
+	t >>= 8;
+	bits[5] = t;
+	t >>= 8;
+	bits[4] = t;
+	t = C->count[1];
+	bits[3] = t;
+	t >>= 8;
+	bits[2] = t;
+	t >>= 8;
+	bits[1] = t;
+	t >>= 8;
+	bits[0] = t;
+
+	/* Pad out to 56 mod 64. */
+	index = (C->count[0] >> 3) & 0x3f;
+	padLen = (index < 56) ? (56 - index) : ((64 + 56) - index);
+	SHA256Update(C, padding, padLen);
+
+	/* Append length (before padding) */
+	SHA256Update(C, bits, sizeof (bits));
+
+	/* Store state in digest */
+	for (i = j = 0; i < 8; i++, j += 4) {
+		t = C->state[i];
+		digest[j + 3] = t;
+		t >>= 8;
+		digest[j + 2] = t;
+		t >>= 8;
+		digest[j + 1] = t;
+		t >>= 8;
+		digest[j] = t;
+	}
+
+	/* Zeroize sensitive information. */
+	memset(C, 0, sizeof (sha256_ctx_t));
+}
+
+void
+generate_hash(struct gr_pw_entry *entry)
+{
+	sha256_ctx_t context;
+	char *pos;
+
+	pos = memchr(entry->passwd, '\n', strlen(entry->passwd));
+	if (pos)
+		*pos = '\0';
+
+	SHA256Init(&context);
+	SHA256Update(&context, entry->salt, GR_SALT_SIZE);
+	SHA256Update(&context, entry->passwd, strlen(entry->passwd));
+	SHA256Final(&context, entry->sum);
+
+	return;
+}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_sym.c linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_sym.c
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/gradm_sym.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/gradm_sym.c	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,148 @@
+#include "gradm.h"
+
+struct object_variable {
+	char *symname;
+	struct var_object *object;
+};
+
+static struct object_variable *symtab = NULL;
+static unsigned int symtab_size = 0;
+
+void interpret_variable(struct var_object *var)
+{
+	for (; var; var = var->prev) {
+		if (!add_proc_object_acl(current_subject, var->filename, var->mode, GR_FEXIST))
+			exit(EXIT_FAILURE);
+	}
+
+	return;
+}
+
+struct var_object * intersect_objects(struct var_object *var1, struct var_object *var2)
+{
+	struct var_object *tmpvar1, *tmpvar2, *retvar = NULL;
+
+	for (tmpvar1 = var1; tmpvar1; tmpvar1 = tmpvar1->prev) {
+		for (tmpvar2 = var2; tmpvar2; tmpvar2 = tmpvar2->prev) {
+			if (!strcmp(tmpvar1->filename, tmpvar2->filename)) {
+				add_var_object(&retvar, tmpvar1->filename, tmpvar1->mode & tmpvar2->mode);
+				break;
+			}
+		}
+	}
+
+	return retvar;
+}
+
+struct var_object * union_objects(struct var_object *var1, struct var_object *var2)
+{
+	struct var_object *tmpvar1, *tmpvar2, *retvar = NULL;
+	int found_dupe = 0;
+
+	for (tmpvar1 = var1; tmpvar1; tmpvar1 = tmpvar1->prev) {
+		found_dupe = 0;
+		for (tmpvar2 = var2; tmpvar2; tmpvar2 = tmpvar2->prev) {
+			if (!strcmp(tmpvar1->filename, tmpvar2->filename)) {
+				add_var_object(&retvar, tmpvar1->filename, tmpvar1->mode | tmpvar2->mode);
+				found_dupe = 1;
+				break;
+			}
+		}
+		if (!found_dupe)
+			add_var_object(&retvar, tmpvar1->filename, tmpvar1->mode);
+	}
+
+	for (tmpvar2 = var2; tmpvar2; tmpvar2 = tmpvar2->prev) {
+		found_dupe = 0;
+		for (tmpvar1 = var1; tmpvar1; tmpvar1 = tmpvar1->prev) {
+			if (!strcmp(tmpvar1->filename, tmpvar2->filename)) {
+				add_var_object(&retvar, tmpvar2->filename, tmpvar1->mode | tmpvar2->mode);
+				found_dupe = 1;
+				break;
+			}
+		}
+		if (!found_dupe)
+			add_var_object(&retvar, tmpvar2->filename, tmpvar2->mode);
+	}
+
+	return retvar;
+}
+
+struct var_object * differentiate_objects(struct var_object *var1, struct var_object *var2)
+{
+	struct var_object *tmpvar1, *tmpvar2, *retvar = NULL;
+	int found_dupe = 0;
+	char *path;
+
+	for (tmpvar1 = var1; tmpvar1; tmpvar1 = tmpvar1->prev) {
+		path = calloc(strlen(tmpvar1->filename) + 1, sizeof(char));
+		if (!path)
+			failure("calloc");
+		strcpy(path, tmpvar1->filename);
+		found_dupe = 0;
+		do {
+			for (tmpvar2 = var2; tmpvar2; tmpvar2 = tmpvar2->prev) {
+				if (!strcmp(path, tmpvar2->filename)) {
+					found_dupe = 1;
+					add_var_object(&retvar, tmpvar1->filename, tmpvar1->mode &= ~tmpvar2->mode);
+					goto done;
+				}
+			}
+		} while(parent_dir(tmpvar1->filename, &path));
+done:
+		if (!found_dupe)
+			add_var_object(&retvar, tmpvar1->filename, tmpvar1->mode);
+		free(path);
+	}
+
+	return retvar;
+}
+
+void add_var_object(struct var_object **object, char *name, __u32 mode)
+{
+	struct var_object *v;
+
+	v = (struct var_object *) calloc(1, sizeof(struct var_object));
+
+	if (!v)
+		failure("calloc");
+
+	if (*object)
+		(*object)->next = v;
+
+	v->prev = *object;
+
+	v->filename = name;
+	v->mode = mode;
+
+	*object = v;
+
+	return;
+}
+
+struct var_object * sym_retrieve(char *symname)
+{
+	unsigned int i;
+
+	for (i = 0; i < symtab_size; i++)
+		if (!strcmp(symname, symtab[i].symname))
+			return symtab[i].object;
+		
+
+	return NULL;
+}
+
+void sym_store(char *symname, struct var_object *object)
+{
+	symtab_size++;
+
+	symtab = realloc(symtab, symtab_size * sizeof(struct object_variable));
+
+	if (symtab == NULL)
+		failure("realloc");
+
+	symtab[symtab_size - 1].symname = symname;
+	symtab[symtab_size - 1].object = object;
+
+	return;
+}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/grlearn.c linux-2.4.20-wolk4.16-fullkernel/gradm2/grlearn.c
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/grlearn.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/grlearn.c	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,279 @@
+#include "gradm.h"
+
+#define GR_LEARN_PID_PATH "/etc/grsec2/.grlearn.pid"
+#define LEARN_BUFFER_SIZE (1024 * 1024)
+#define MAX_ENTRY_SIZE 16384
+
+int stop_daemon(void)
+{
+	int fd;
+	pid_t learn_pid;
+
+	fd = open(GR_LEARN_PID_PATH, O_RDONLY);
+
+	if (fd < 0)
+		exit(EXIT_FAILURE);
+
+	read(fd, &learn_pid, sizeof(learn_pid));
+
+	kill(learn_pid, 9);
+
+	close(fd);
+
+	unlink(GR_LEARN_PID_PATH);
+
+	return 0;
+}
+		
+
+int write_pid_log(pid_t pid)
+{
+	struct stat fstat;
+	int fd;
+	pid_t learn_pid;
+	char pathname[PATH_MAX] = {0};
+	char procname[64] = {0};
+
+	if (!stat(GR_LEARN_PID_PATH, &fstat)) {
+		fd = open(GR_LEARN_PID_PATH, O_RDONLY);
+
+		if (fd < 0) {
+			fprintf(stderr, "Unable to open %s:\n"
+				"%s\n", GR_LEARN_PID_PATH, strerror(errno));
+			kill(pid, 9);
+			exit(EXIT_FAILURE);
+		}
+
+		read(fd, &learn_pid, sizeof(learn_pid));
+		close(fd);
+		unlink(GR_LEARN_PID_PATH);
+
+		snprintf(procname, sizeof(procname) - 1, "/proc/%d/exe", learn_pid);
+		if (readlink(procname, pathname, PATH_MAX - 1) < 0)
+			goto start;
+		if (strcmp(pathname, GRLEARN_PATH))
+			goto start;
+		fprintf(stderr, "Learning daemon possibly running already...killing process.\n");
+
+		kill(learn_pid, 9);
+	}
+start:		
+	fd = open(GR_LEARN_PID_PATH, O_WRONLY | O_CREAT | O_EXCL, 0600);
+
+	if (fd < 0) {
+		fprintf(stderr, "Unable to open %s:\n"
+			"%s\n", GR_LEARN_PID_PATH, strerror(errno));
+		kill(pid, 9);
+		exit(EXIT_FAILURE);
+	}
+
+	write(fd, &pid, sizeof(pid));
+
+	close(fd);
+
+	return 0;
+}
+
+struct cache_entry {
+	char *entryname;
+	unsigned long used;
+	unsigned long checked;
+	unsigned char taken:1;
+} *cache[640];
+static unsigned long check_count = 0;
+
+/* maintain a cache of most recently used items */
+int check_cache(char *str)
+{
+	int i;
+	check_count++;
+	for (i = 0; i < 640; i++) {
+		if (!cache[i]->taken)
+			continue;
+		if (!strcmp(cache[i]->entryname, str)) {
+			cache[i]->used++;
+			return 1;
+		}
+	}
+
+	return 0;
+}
+
+void insert_into_cache(char *str)
+{
+	int i;
+	struct cache_entry *least;
+	int start = random() % 639;
+
+	least = cache[start];
+
+	for (i = start + 1; i != start; i = (i + 1) % 640) {
+		if (!cache[i]->taken) {
+			cache[i]->taken = 1;
+			least = cache[i];
+			break;
+		}
+		if (cache[i]->used < least->used && (cache[i]->checked + 1280) < check_count)
+			least = cache[i];
+	}
+
+	strcpy(least->entryname, str);
+	least->used = 0;
+	least->checked = check_count;
+
+	return;
+}
+		
+__inline__ char * rewrite_learn_entry(char *p)
+{
+	int i;
+	char *tmp = p;
+	char *endobj;
+	char *slash;
+	char *next;
+	unsigned int len;
+
+	for (i = 0; i < 8; i++) {
+		tmp = strchr(tmp, '\t');
+		if (!tmp)
+			return p;
+		tmp++;
+	}
+	/* now we have a pointer to the object name */
+	endobj = strchr(tmp, '\t');
+	if (!endobj)
+		return p;
+	*endobj = '\0';
+	/* now we have separated the string */
+
+	if (strncmp(tmp, "/proc/", 6)) {
+		*endobj = '\t';
+		return p;
+	}
+
+	if (*(tmp + 6) < '1' || *(tmp + 6) > '9') {
+		*endobj = '\t';
+		return p;
+	}
+
+	slash = strchr(tmp + 6, '/');
+	*endobj = '\t';
+	next = endobj;
+	while(*next++);
+	if (slash == NULL) {
+		/* we have a /proc/<pid> dir, convert to /proc */
+		len = next - endobj;
+		memmove(tmp + 5, endobj, len);
+		return next;
+	} else {
+		/* we have /proc/<pid>/something, convert to /proc/star/something */
+		len = next - slash;
+		*(tmp + 6) = '*';
+		memmove(tmp + 7, slash, len);
+		return next;
+	}
+
+	return p;
+}
+
+int main(int argc, char *argv[])
+{
+	char *buf;
+	char *next;
+	char *p;
+	ssize_t retval;
+	struct pollfd fds;
+	int fd, fd2;
+	pid_t pid;
+	struct sched_param schedulerparam;
+	int i;
+
+	if (argc != 2)
+		return 1;
+	
+	if (!strcmp(argv[1], "-stop"))
+		return stop_daemon();
+		
+	/* perform various operations to make us act in near real-time */
+
+	srandom(getpid());
+
+	mlockall(MCL_CURRENT | MCL_FUTURE);
+
+	buf = calloc(1, LEARN_BUFFER_SIZE);
+	if (!buf)
+		return 1;
+	for(i = 0; i < 640; i++) {
+		cache[i] = calloc(1, sizeof(struct cache_entry));
+		if (!cache[i])
+			return 1;
+		cache[i]->entryname = calloc(1, MAX_ENTRY_SIZE);
+		if (!cache[i]->entryname)
+			return 1;
+	}
+
+	setpriority(PRIO_PROCESS, 0, -20);
+	nice(-19);
+	schedulerparam.sched_priority = sched_get_priority_max(SCHED_FIFO);
+	sched_setscheduler(0, SCHED_FIFO, &schedulerparam);
+
+	fd = open(GRDEV_PATH, O_RDONLY);
+
+	if (fd < 0) {
+		fprintf(stderr, "Error opening %s:\n"
+			"%s\n", GRDEV_PATH, strerror(errno));
+		exit(EXIT_FAILURE);
+	}
+
+	fd2 = open(argv[1], O_WRONLY | O_APPEND | O_CREAT, 0600);
+
+	if (fd2 < 0) {
+		fprintf(stderr, "Error opening %s\n"
+			"%s\n", argv[1], strerror(errno));
+		exit(EXIT_FAILURE);
+	}
+
+	fcntl(fd, F_SETFD, FD_CLOEXEC);
+	fcntl(fd2, F_SETFD, FD_CLOEXEC);
+
+	pid = fork();
+
+	if (pid > 0) {
+		write_pid_log(pid);
+		exit(EXIT_SUCCESS);
+	} else if (!pid) {
+		close(0);
+		close(1);
+		close(2);
+	} else {
+		fprintf(stderr, "Unable to fork.\n");
+		exit(EXIT_FAILURE);
+	}
+
+	fds.fd = fd;
+	fds.events = POLLIN;
+
+	while (poll(&fds, 1, -1) > 0) {
+		retval = read(fd, buf, LEARN_BUFFER_SIZE);
+		if (retval > 0) {
+			p = buf;
+			while (p < (buf + retval)) {
+				next = p;
+				/* next = rewrite_learn_entry(p); */
+				if (!check_cache(p)) {
+					insert_into_cache(p);
+					write(fd2, p, strlen(p));
+				}
+				if (next == p)
+					while (*p++);
+				else
+					p = next;
+			}
+		}
+	}
+
+	close(fd);
+	close(fd2);
+
+	return 0;
+}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/gradm2/policy linux-2.4.20-wolk4.16-fullkernel/gradm2/policy
--- linux-2.4.20-wolk4.15-fullkernel/gradm2/policy	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/gradm2/policy	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,234 @@
+#sample default policy for grsecurity
+#
+# Role flags:
+# A -> This role is an administrative role, thus it has special privilege normal
+#      roles do not have.  In particular, this role bypasses the 
+#      additional ptrace restrictions
+# N -> Don't require authentication for this role.  To access
+#      the role, use gradm2 -n <rolename>
+# s -> This role is a special role, meaning it does not belong to a
+#      user or group, and does not require an enforced secure policy
+#      base to be included in the ruleset
+# u -> This role is a user role
+# g -> This role is a group role
+# G -> This role can use gradm2 to authenticate to the kernel
+#      A polciy for gradm2 will automatically be added to the role
+# T -> Enable TPE for this role
+# l -> Enable learning for this role
+#
+# a role can only be one of user, group, or special
+#
+# role_allow_ip IP/optional netmask
+# eg: role_allow_ip 192.168.1.0/24
+# You can have as many of these per role as you want
+# They restrict the use of a role to a list of IPs.  If a user
+# is on the system that would normally get the role does not
+# belong to those lists of IPs, the system falls back through
+# its method of determining a role for the user
+#
+# Role hierarchy
+# user -> group -> default
+# First a user role attempts to match, if one is not found,
+# a group role attempts to match, if one is not found,
+# the default role is used.
+#
+# role_transitions <special role 1> <special role 2> ... <special role n>
+# eg: role_transitions www_admin dns_admin
+#
+# role transitions specify which special roles a given role is allowed
+# to authenticate to.  This applies to special roles that do not
+# require password authentication as well.  If a user tries to
+# authenticate to a role that is not within his transition table, he
+# will receive a permission denied error
+#
+# Nested subjects
+# subject /bin/su:/bin/bash:/bin/cat
+#	  / rwx
+#	  +CAP_ALL
+# grant privilege to specific processes if they are executed
+# within a trusted path.  In this case, privilege is
+# granted if /bin/cat is executed from /bin/bash, which is
+# executed from /bin/su.
+#
+# Configuration inheritance on nested subjects
+# nested subjects inherit rules from their parents.  In the
+# example above, the nested subject would inherit rules
+# from the nested subject for /bin/su:/bin/bash,
+# and the subject /bin/su
+# View the 1.9.x documentation for more information on
+# configuration inheritance
+#
+# new object modes:
+# m -> allow creation of setuid/setgid files/directories
+#      and modification of files/directories to be setuid/setgid
+# M -> audit the setuid/setgid creation/modification
+# c -> allow creation of the file/directory
+# C -> audit the creation
+# d -> allow deletion of the file/directory
+# D -> audit the deletion
+# p -> reject all ptraces to this object
+# new subject modes:
+# r -> relax ptrace restrictions (allows process to ptrace processes
+#      other than its own descendants)
+#
+# user/group transitions:
+# You may now specify what users and groups a given subject can
+# transition to.  This can be done on an inclusive or exclusive basis.
+# Examples:
+# subject /bin/su
+# user_transition_allow root spender
+# group_transition_allow root spender
+# subject /bin/su
+# user_transition_deny evilhacker
+# subject /bin/su
+# group_transition_deny evilhacker1 evilhacker2
+#
+# Domains:
+# With domains you can combine users that don't share a common
+# GID as well as groups so that they share a single policy
+# Domains work just like roles, with the only exception being that
+# the line starting with "role" is replaced with one of the following:
+# domain somedomainname u user1 user2 user3 user4 ... usern
+# domain somedomainname g group1 group2 group3 group4 ... groupn
+#
+# New learning system:
+# To learn on a given subject: add l (the letter l, not the number 1)
+# to the subject mode
+# To learn on a given role, add l to the role mode
+# For both of these, to enable learning, enable the system like:
+# gradm2 -L /etc/grsec2/learning.logs -E
+# and then generate the rules after disabling the system after the 
+# learning phase with:
+# gradm2 -L /etc/grsec2/learning.logs -O /etc/grsec2/policy
+# To use full system learning, enable the system like:
+# gradm2 -F -L /etc/grsec2/learning.logs
+# and then generate the rules after disabling the system after the 
+# learning phase with:
+# gradm2 -F -L /etc/grsec2/learning.logs -O /etc/grsec2/policy
+
+role admin sA
+subject / r
+	/ rwcdmxi
+
+role default G
+role_transitions admin
+subject /
+	/		r
+	/opt		rx
+	/home		rwxcd
+	/mnt		rw
+	/dev
+	/dev/grsec	h
+	/dev/urandom	r
+	/dev/random	r
+	/dev/zero	rw
+	/dev/input	rw
+	/dev/psaux	rw
+	/dev/null	rw
+	/dev/tty0	rw
+	/dev/tty1	rw
+	/dev/tty2	rw
+	/dev/tty3	rw
+	/dev/tty4	rw
+	/dev/tty5	rw
+	/dev/tty6	rw
+	/dev/tty7	rw
+	/dev/tty8	rw
+	/dev/console	rw
+	/dev/tty	rw
+	/dev/pts	rw
+	/dev/ptmx	rw
+	/dev/dsp	rw
+	/dev/mixer	rw
+	/dev/initctl	rw
+	/dev/fd0	r
+	/dev/cdrom	r
+	/dev/mem	h
+	/dev/kmem	h
+	/dev/port	h
+	/bin		rx
+	/sbin		rx
+	/lib		rx
+	/usr		rx
+	/etc		rx
+	/proc		rwx
+	/proc/kcore	h
+	/proc/sys	r
+	/root		r
+	/tmp		rwcd
+	/var		rwxcd
+	/var/tmp	rwcd
+	/var/log	r
+	/boot		r
+	/etc/grsec2	h
+	/etc/ssh	h
+
+# if sshd needs to be restarted, it can be done through the admin role
+	/usr/sbin/sshd
+	
+	-CAP_KILL
+	-CAP_SYS_TTY_CONFIG
+	-CAP_LINUX_IMMUTABLE
+	-CAP_NET_RAW
+	-CAP_MKNOD
+	-CAP_SYS_ADMIN
+	-CAP_SYS_RAWIO
+	-CAP_SYS_MODULE
+	-CAP_SYS_PTRACE
+	-CAP_NET_ADMIN
+	-CAP_NET_BIND_SERVICE
+	-CAP_SYS_CHROOT
+
+#	RES_AS 100M 100M
+
+#	connect 192.168.1.0/24:22 stream tcp
+#	bind	0.0.0.0 stream dgram tcp udp
+
+# the d flag protects /proc fd and mem entries for sshd
+# all daemons should have 'p' in their subject mode to prevent
+# an attacker from killing the service (and restarting it with trojaned
+# config file or taking the port it reserved to run a trojaned service)
+
+subject /usr/sbin/sshd dpo
+	/		h
+	/bin/bash	x
+	/dev		h
+	/dev/log	rw
+	/dev/null	r
+	/dev/ptmx	rw
+	/dev/pts	rw
+	/dev/tty	rw
+	/dev/tty?	rw
+	/etc		r
+	/etc/grsec2	h
+	/home
+	/lib		rx
+	/root
+	/proc
+	/proc/kcore	h
+	/proc/sys	h
+	/usr/lib	rx
+	/var/log
+	/var/mail
+	/var/log/lastlog	rw
+	/var/log/wtmp		w
+	/var/run/sshd
+	/var/run/utmp		rw
+
+	-CAP_ALL
+	+CAP_CHOWN
+	+CAP_SETGID
+	+CAP_SETUID
+	+CAP_SYS_CHROOT
+	+CAP_SYS_RESOURCE
+	+CAP_SYS_TTY_CONFIG
+
+subject /usr/X11R6/bin/XFree86
+	/dev/mem	rw
+
+	+CAP_SYS_ADMIN
+	+CAP_SYS_TTY_CONFIG
+	+CAP_SYS_RAWIO
+
+subject /usr/bin/ssh
+	/etc/ssh/ssh_config r
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/Config.in linux-2.4.20-wolk4.16-fullkernel/grsecurity/Config.in
--- linux-2.4.20-wolk4.15-fullkernel/grsecurity/Config.in	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/grsecurity/Config.in	2004-09-05 17:09:43.000000000 +0200
@@ -28,6 +28,7 @@ define_bool CONFIG_GRKERNSEC_PROC n
 define_bool CONFIG_GRKERNSEC_PROC_IPADDR n
 define_bool CONFIG_GRKERNSEC_PROC_MEMMAP n
 define_bool CONFIG_GRKERNSEC_HIDESYM n
+define_bool CONFIG_GRKERNSEC_BRUTE n
 define_bool CONFIG_GRKERNSEC_CHROOT_CAPS n
 define_bool CONFIG_GRKERNSEC_CHROOT_SYSCTL n
 define_bool CONFIG_GRKERNSEC_PROC_USERGROUP n
@@ -110,8 +111,8 @@ define_int CONFIG_GRKERNSEC_ACL_TIMEOUT 
 
 define_int  CONFIG_GRKERNSEC_FLOODTIME 10
 define_int  CONFIG_GRKERNSEC_FLOODBURST 4
-define_bool CONFIG_GRKERNSEC_CHROOT_SYSCTL y
 define_bool CONFIG_GRKERNSEC_PROC_MEMMAP y
+define_bool CONFIG_GRKERNSEC_CHROOT_SYSCTL y
 define_bool CONFIG_GRKERNSEC_LINK y
 define_bool CONFIG_GRKERNSEC_FIFO y
 define_bool CONFIG_GRKERNSEC_RANDPID y
@@ -143,6 +144,7 @@ define_bool CONFIG_GRKERNSEC_PAX_RANDKST
 define_bool CONFIG_GRKERNSEC_PAX_KERNEXEC n
 define_bool CONFIG_GRKERNSEC_PAX_ASLR y
 define_bool CONFIG_GRKERNSEC_PAX_RANDMMAP y
+define_bool CONFIG_GRKERNSEC_BRUTE n
 fi
 if [ "$CONFIG_GRKERNSEC_HI" = "y" ]; then
 define_int CONFIG_GRKERNSEC_FLOODTIME 10
@@ -175,6 +177,7 @@ define_bool CONFIG_GRKERNSEC_PROC y
 define_bool CONFIG_GRKERNSEC_PROC_IPADDR n
 define_bool CONFIG_GRKERNSEC_PROC_MEMMAP y
 define_bool CONFIG_GRKERNSEC_HIDESYM y
+define_bool CONFIG_GRKERNSEC_BRUTE y
 define_bool CONFIG_GRKERNSEC_PROC_USERGROUP y
 define_int  CONFIG_GRKERNSEC_PROC_GID 10
 define_bool CONFIG_GRKERNSEC_KMEM y
@@ -228,7 +231,7 @@ bool 'Use ELF program header marking' CO
 choice 'MAC system integration' \
 	"none		CONFIG_GRKERNSEC_PAX_NO_ACL_FLAGS \
 	 direct		CONFIG_GRKERNSEC_PAX_HAVE_ACL_FLAGS \
-	 hook		CONFIG_GRKERNSEC_PAX_HOOK_ACL_FLAGS" none
+	 hook		CONFIG_GRKERNSEC_PAX_HOOK_ACL_FLAGS" direct
 endmenu
 mainmenu_option next_comment
 comment 'Address Space Protection'
@@ -304,10 +307,11 @@ if [ "$CONFIG_X86" = "y" ]; then
   fi
 fi
 bool 'Remove addresses from /proc/pid/[maps|stat]' CONFIG_GRKERNSEC_PROC_MEMMAP
+bool 'Deter exploit bruteforcing' CONFIG_GRKERNSEC_BRUTE
 bool 'Hide kernel symbols' CONFIG_GRKERNSEC_HIDESYM
 endmenu
 mainmenu_option next_comment
-comment 'ACL options'
+comment 'Role Based Access Control Options'
 bool 'Hide kernel processes' CONFIG_GRKERNSEC_ACL_HIDEKERN
 int 'Maximum tries before password lockout' CONFIG_GRKERNSEC_ACL_MAXTRIES 3
 int 'Time to wait after max password tries, in seconds' CONFIG_GRKERNSEC_ACL_TIMEOUT 30
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/Makefile linux-2.4.20-wolk4.16-fullkernel/grsecurity/Makefile
--- linux-2.4.20-wolk4.15-fullkernel/grsecurity/Makefile	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/grsecurity/Makefile	2004-09-05 17:09:43.000000000 +0200
@@ -15,7 +15,7 @@ obj-y = grsec_chdir.o grsec_chroot.o grs
 ifeq ($(CONFIG_GRKERNSEC),y)
 obj-y += grsec_init.o grsum.o gracl.o gracl_ip.o gracl_segv.o obsd_rand.o \
 	gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
-	grsec_textrel.o
+	gracl_learn.o grsec_textrel.o
 obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
 else
 obj-y += grsec_disabled.o
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/gracl.c linux-2.4.20-wolk4.16-fullkernel/grsecurity/gracl.c
--- linux-2.4.20-wolk4.15-fullkernel/grsecurity/gracl.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/grsecurity/gracl.c	2004-09-05 17:09:43.000000000 +0200
@@ -26,34 +26,48 @@
 #include <asm/errno.h>
 #include <asm/mman.h>
 
-static struct acl_subject_db acl_subj_set;
-static struct acl_subject_label *subj_list_head;
+static struct acl_role_db acl_role_set;
+static struct acl_role_label *role_list_head;
 static struct name_db name_set;
 static struct name_db inodev_set;
 
-struct admin_pw *gr_pwent;	/* password entry */
-static u8 acl_admin_value;
+/* for keeping track of userspace pointers used for subjects, so we
+   can share references in the kernel as well
+*/
 
-static DECLARE_MUTEX(gr_proc_sem);
+static struct dentry *real_root;
+static struct vfsmount *real_root_mnt;
+
+static struct acl_subj_map_db subj_map_set;
+
+
+static struct acl_role_label *default_role;
+
+static u16 acl_sp_role_value;
+
+static DECLARE_MUTEX(gr_dev_sem);
 rwlock_t gr_inode_lock = RW_LOCK_UNLOCKED;
 
-extern char *gr_shared_page[NR_CPUS];
+extern char *gr_shared_page[4][NR_CPUS];
+struct gr_arg *gr_usermode;
 
 static unsigned long gr_status = GR_STATUS_INIT;
 
-extern int chkpw(struct gr_arg *entry, struct admin_pw *pwent);
+extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
+extern void gr_clear_learn_entries(void);
 
 #ifdef CONFIG_GRKERNSEC_RESLOG
-extern __inline__ void gr_log_resource(const struct task_struct *task,
-				       const int res,
-				       const unsigned long wanted, const int gt);
+extern void gr_log_resource(const struct task_struct *task,
+			    const int res, const unsigned long wanted, const int gt);
 #endif
 
-/* The special mode : admin(called god_label for historical reasons) mode */
+unsigned char *gr_system_salt;
+unsigned char *gr_system_sum;
+
+static struct sprole_pw **acl_special_roles = NULL;
+static __u16 num_sprole_pws = 0;
 
-static struct acl_subject_label *god_label = NULL;
-static struct acl_subject_label *kernel_label = NULL;
-static struct acl_subject_label *root_label = NULL;
+static struct acl_role_label *kernel_role = NULL;
 
 /* The following are used to keep a place held in the hash table when we move
    entries around.  They can be replaced during insert. */
@@ -62,6 +76,15 @@ static struct acl_subject_label *deleted
 static struct acl_object_label *deleted_object;
 static struct name_entry *deleted_inodev;
 
+/* for keeping track of the last and final allocated subjects, since
+   nested subject parsing is tricky
+*/
+static struct acl_subject_label *s_last = NULL;
+static struct acl_subject_label *s_final = NULL;
+
+static unsigned int gr_auth_attempts = 0;
+static unsigned long gr_auth_expires = 0UL;
+
 extern int gr_init_uidset(void);
 extern void gr_free_uidset(void);
 extern void gr_remove_uid(uid_t uid);
@@ -73,26 +96,100 @@ gr_acl_is_enabled(void)
 	return (gr_status & GR_READY);
 }
 
-static __inline__ char *
+char gr_roletype_to_char(void)
+{
+	switch (current->role->roletype &
+		(GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
+		 GR_ROLE_SPECIAL)) {
+	case GR_ROLE_DEFAULT:
+		return 'D';
+	case GR_ROLE_USER:
+		return 'U';
+	case GR_ROLE_GROUP:
+		return 'G';
+	case GR_ROLE_SPECIAL:
+		return 'S';
+	}
+
+	return 'X';
+}
+
+__inline__ int
+gr_acl_tpe_check(void)
+{
+	if (unlikely(!(gr_status & GR_READY)))
+		return 0;
+	if (current->role->roletype & GR_ROLE_TPE)
+		return 1;
+	else
+		return 0;
+}
+
+int
+gr_handle_rawio(const struct inode *inode)
+{
+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
+	if (inode && S_ISBLK(inode->i_mode) &&
+	    grsec_enable_chroot_caps && proc_is_chrooted(current) &&
+	    !capable(CAP_SYS_RAWIO))
+		return 1;
+#endif
+	return 0;
+}
+
+
+static __inline__ int
+gr_streq(const char *a, const char *b, const __u16 lena, const __u16 lenb)
+{
+	int i;
+	unsigned long *l1;
+	unsigned long *l2;
+	unsigned char *c1;
+	unsigned char *c2;
+	int num_longs;
+
+	if (likely(lena != lenb))
+		return 0;
+
+	l1 = (unsigned long *)a;
+	l2 = (unsigned long *)b;
+
+	num_longs = lena / sizeof(unsigned long);
+
+	for (i = num_longs; i--; l1++, l2++) {
+		if (unlikely(*l1 != *l2))
+			return 0;
+	}
+
+	c1 = (unsigned char *) l1;
+	c2 = (unsigned char *) l2;
+
+	i = lena - (num_longs * sizeof(unsigned long));	
+
+	for (; i--; c1++, c2++) {
+		if (unlikely(*c1 != *c2))
+			return 0;
+	}
+
+	return 1;
+}
+		
+static char *
 d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
 	    char *buf, int buflen)
 {
 	char *res;
-	struct dentry *our_dentry;
-	struct vfsmount *our_mount;
-	struct vfsmount *rootmnt;
 	struct dentry *root;
+	struct vfsmount *rootmnt;
 
-	our_dentry = (struct dentry *) dentry;
-	our_mount = (struct vfsmount *) vfsmnt;
-
+	/* we can't use real_root, real_root_mnt, because they belong only to the RBAC system */
 	read_lock(&child_reaper->fs->lock);
-	rootmnt = mntget(child_reaper->fs->rootmnt);
 	root = dget(child_reaper->fs->root);
+	rootmnt = mntget(child_reaper->fs->rootmnt);
 	read_unlock(&child_reaper->fs->lock);
 
 	spin_lock(&dcache_lock);
-	res = __d_path(our_dentry, our_mount, root, rootmnt, buf, buflen);
+	res = __d_path((struct dentry *)dentry, (struct vfsmount *)vfsmnt, root, rootmnt, buf, buflen);
 	spin_unlock(&dcache_lock);
 	if (unlikely(IS_ERR(res)))
 		res = strcpy(buf, "<path too long>");
@@ -101,10 +198,60 @@ d_real_path(const struct dentry *dentry,
 	return res;
 }
 
+static __inline__ char *
+__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
+	    char *buf, int buflen)
+{
+	char *res;
+	struct dentry *root;
+	struct vfsmount *rootmnt;
+
+	/* we can't use real_root, real_root_mnt, because they belong only to the RBAC system */
+	read_lock(&child_reaper->fs->lock);
+	root = dget(child_reaper->fs->root);
+	rootmnt = mntget(child_reaper->fs->rootmnt);
+	read_unlock(&child_reaper->fs->lock);
+
+	res = __d_path((struct dentry *)dentry, (struct vfsmount *)vfsmnt, root, rootmnt, buf, buflen);
+	if (unlikely(IS_ERR(res)))
+		res = strcpy(buf, "<path too long>");
+	dput(root);
+	mntput(rootmnt);
+	return res;
+}
+
+char *
+gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
+{
+	return __d_real_path(dentry, mnt, gr_shared_page[0][smp_processor_id()],
+			   PAGE_SIZE);
+}
+
 char *
 gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
 {
-	return d_real_path(dentry, mnt, gr_shared_page[smp_processor_id()],
+	return d_real_path(dentry, mnt, gr_shared_page[0][smp_processor_id()],
+			   PAGE_SIZE);
+}
+
+char *
+gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
+{
+	return d_real_path(dentry, mnt, gr_shared_page[1][smp_processor_id()],
+			   PAGE_SIZE);
+}
+
+char *
+gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
+{
+	return d_real_path(dentry, mnt, gr_shared_page[2][smp_processor_id()],
+			   PAGE_SIZE);
+}
+
+char *
+gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
+{
+	return d_real_path(dentry, mnt, gr_shared_page[3][smp_processor_id()],
 			   PAGE_SIZE);
 }
 
@@ -119,29 +266,146 @@ to_gr_audit(const __u32 reqmode)
 	retmode |= (reqmode & GR_EXEC) ? GR_AUDIT_EXEC : 0;
 	retmode |= (reqmode & GR_INHERIT) ? GR_AUDIT_INHERIT : 0;
 	retmode |= (reqmode & GR_FIND) ? GR_AUDIT_FIND : 0;
+	retmode |= (reqmode & GR_SETID) ? GR_AUDIT_SETID : 0;
+	retmode |= (reqmode & GR_CREATE) ? GR_AUDIT_CREATE : 0;
+	retmode |= (reqmode & GR_DELETE) ? GR_AUDIT_DELETE : 0;
 
 	return retmode;
 }
 
 __inline__ struct acl_subject_label *
-lookup_acl_subj_label(const ino_t ino, const kdev_t dev)
+lookup_subject_map(const struct acl_subject_label *userp)
+{
+	unsigned long index = shash(userp, subj_map_set.s_size);
+	struct subject_map *match;
+	__u8 i = 0;
+
+	match = subj_map_set.s_hash[index];
+
+	while (match && match->user != userp) {
+		index = (index + (1 << i)) % subj_map_set.s_size;
+		match = subj_map_set.s_hash[index];
+		i = (i + 1) % 32;
+	}
+
+	if (match)
+		return match->kernel;
+	else
+		return NULL;
+}
+
+static void
+insert_subj_map_entry(struct subject_map *subjmap)
+{
+	unsigned long index = shash(subjmap->user, subj_map_set.s_size);
+	struct subject_map **curr;
+	__u8 i = 0;
+
+	curr = &subj_map_set.s_hash[index];
+
+	while (*curr) {
+		index = (index + (1 << i)) % subj_map_set.s_size;
+		curr = &subj_map_set.s_hash[index];
+		i = (i + 1) % 32;
+	}
+
+	*curr = subjmap;
+
+	return;
+}
+
+__inline__ struct acl_role_label *
+lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
+		      const gid_t gid)
+{
+	unsigned long index = rhash(uid, GR_ROLE_USER, acl_role_set.r_size);
+	struct acl_role_label *match;
+	struct role_allowed_ip *ipp;
+	int x;
+	__u8 i = 0;
+
+	match = acl_role_set.r_hash[index];
+
+	while (match) {
+		if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
+			for (x = 0; x < match->domain_child_num; x++) {
+				if (match->domain_children[x] == uid)
+					goto found;
+			}
+		} else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
+			break;
+		index = (index + (1 << i)) % acl_role_set.r_size;
+		match = acl_role_set.r_hash[index];
+		i = (i + 1) % 32;
+	}
+found:
+	if (match == NULL) {
+	      try_group:
+		index = rhash(gid, GR_ROLE_GROUP, acl_role_set.r_size);
+		match = acl_role_set.r_hash[index];
+		i = 0;
+
+		while (match) {
+			if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
+				for (x = 0; x < match->domain_child_num; x++) {
+					if (match->domain_children[x] == gid)
+						goto found2;
+				}
+			} else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
+				break;
+			index = (index + (1 << i)) % acl_role_set.r_size;
+			match = acl_role_set.r_hash[index];
+			i = (i + 1) % 32;
+		}
+found2:
+		if (match == NULL)
+			match = default_role;
+		if (match->allowed_ips == NULL)
+			return match;
+		else {
+			for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
+				if (likely
+				    ((ntohl(task->curr_ip) & ipp->netmask) ==
+				     (ntohl(ipp->addr) & ipp->netmask)))
+					return match;
+			}
+			match = default_role;
+		}
+	} else if (match->allowed_ips == NULL) {
+		return match;
+	} else {
+		for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
+			if (likely
+			    ((ntohl(task->curr_ip) & ipp->netmask) ==
+			     (ntohl(ipp->addr) & ipp->netmask)))
+				return match;
+		}
+		goto try_group;
+	}
+
+	return match;
+}
+
+__inline__ struct acl_subject_label *
+lookup_acl_subj_label(const ino_t ino, const kdev_t dev,
+		      const struct acl_role_label *role)
 {
-	unsigned long index = fhash(ino, dev, acl_subj_set.s_size);
+	unsigned long subj_size = role->subj_hash_size;
+	struct acl_subject_label **s_hash = role->subj_hash;
+	unsigned long index = fhash(ino, dev, subj_size);
 	struct acl_subject_label *match;
 	__u8 i = 0;
 
-	match = acl_subj_set.s_hash[index];
+	match = s_hash[index];
 
 	while (match && (match->inode != ino || match->device != dev ||
 	       (match->mode & GR_DELETED))) {
-		index = (index + (1 << i)) % acl_subj_set.s_size;
-		match = acl_subj_set.s_hash[index];
+		index = (index + (1 << i)) % subj_size;
+		match = s_hash[index];
 		i = (i + 1) % 32;
 	}
 
-	if (unlikely(match && (match != deleted_subject) &&
-		     (match->inode == ino) && (match->device == dev) &&
-		     !(match->mode & GR_DELETED)))
+	if (match && (match != deleted_subject) && !(match->mode & GR_DELETED))
 		return match;
 	else
 		return NULL;
@@ -166,9 +430,7 @@ lookup_acl_obj_label(const ino_t ino, co
 		i = (i + 1) % 32;
 	}
 
-	if (unlikely(match && (match != deleted_object) &&
-		     (match->inode == ino) && (match->device == dev) &&
-		     !(match->mode & GR_DELETED)))
+	if (match && (match != deleted_object) && !(match->mode & GR_DELETED))
 		return match;
 	else
 		return NULL;
@@ -193,13 +455,11 @@ lookup_acl_obj_label_create(const ino_t 
 		i = (i + 1) % 32;
 	}
 
-	if (unlikely(match && (match != deleted_object) &&
-		     (match->inode == ino) && (match->device == dev) &&
-		     (match->mode & GR_DELETED)))
+	if (match && (match != deleted_object) && (match->mode & GR_DELETED))
 		return match;
 
-	index = fhash(ino, dev, obj_size);
 	i = 0;
+	index = fhash(ino, dev, obj_size);
 	match = o_hash[index];
 
 	while (match && (match->inode != ino || match->device != dev ||
@@ -209,9 +469,7 @@ lookup_acl_obj_label_create(const ino_t 
 		i = (i + 1) % 32;
 	}
 
-	if (unlikely(match && (match != deleted_object) &&
-		     (match->inode == ino) && (match->device == dev) &&
-		     !(match->mode & GR_DELETED)))
+	if (match && (match != deleted_object) && !(match->mode & GR_DELETED))
 		return match;
 	else
 		return NULL;
@@ -220,22 +478,20 @@ lookup_acl_obj_label_create(const ino_t 
 static __inline__ struct name_entry *
 lookup_name_entry(const char *name)
 {
-	unsigned long index = nhash(name, name_set.n_size);
+	__u16 len = strlen(name);
+	unsigned long index = nhash(name, len, name_set.n_size);
 	struct name_entry *match;
 	__u8 i = 0;
 
 	match = name_set.n_hash[index];
 
-	while (match && (strcmp(match->name, name)) != 0) {
+	while (match && !gr_streq(match->name, name, match->len, len)) {
 		index = (index + (1 << i)) % name_set.n_size;
 		match = name_set.n_hash[index];
 		i = (i + 1) % 32;
 	}
 
-	if (unlikely(match && !strcmp(name, match->name)))
-		return match;
-	else
-		return NULL;
+	return match;
 }
 
 static __inline__ struct name_entry *
@@ -253,16 +509,12 @@ lookup_inodev_entry(const ino_t ino, con
 		i = (i + 1) % 32;
 	}
 
-	if (unlikely(match && (match != deleted_inodev) &&
-		     (match->inode == ino) && (match->device == dev)))
+	if (match && (match != deleted_inodev))
 		return match;
 	else
 		return NULL;
 }
 
-/* The following routines perform insertion into the tables after
- * the add_{type} process the config file */
-
 static void
 insert_inodev_entry(struct name_entry *nentry)
 {
@@ -284,16 +536,50 @@ insert_inodev_entry(struct name_entry *n
 	return;
 }
 
+static void
+__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
+{
+	unsigned long index =
+	    rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), acl_role_set.r_size);
+	struct acl_role_label **curr;
+	__u8 i = 0;
+
+	curr = &acl_role_set.r_hash[index];
+
+	while (*curr) {
+		index = (index + (1 << i)) % acl_role_set.r_size;
+		curr = &acl_role_set.r_hash[index];
+		i = (i + 1) % 32;
+	}
+
+	*curr = role;
+
+	return;
+}
+
+static void
+insert_acl_role_label(struct acl_role_label *role)
+{
+	int i;
+
+	if (role->roletype & GR_ROLE_DOMAIN) {
+		for (i = 0; i < role->domain_child_num; i++)
+			__insert_acl_role_label(role, role->domain_children[i]);
+	} else
+		__insert_acl_role_label(role, role->uidgid);
+}
+					
 static int
 insert_name_entry(char *name, const ino_t inode, const kdev_t device)
 {
-	unsigned long index = nhash(name, name_set.n_size);
 	struct name_entry **curr;
 	__u8 i = 0;
+	__u16 len = strlen(name);
+	unsigned long index = nhash(name, len, name_set.n_size);
 
 	curr = &name_set.n_hash[index];
 
-	while (*curr && strcmp(name, (*curr)->name)) {
+	while (*curr && !gr_streq((*curr)->name, name, (*curr)->len, len)) {
 		index = (index + (1 << i)) % name_set.n_size;
 		curr = &name_set.n_hash[index];
 		i = (i + 1) % 32;
@@ -307,6 +593,7 @@ insert_name_entry(char *name, const ino_
 		nentry->name = name;
 		nentry->inode = inode;
 		nentry->device = device;
+		nentry->len = len;
 		*curr = nentry;
 		/* insert us into the table searchable by inode/dev */
 		insert_inodev_entry(nentry);
@@ -338,18 +625,20 @@ insert_acl_obj_label(struct acl_object_l
 }
 
 static void
-insert_acl_subj_label(struct acl_subject_label *obj)
+insert_acl_subj_label(struct acl_subject_label *obj,
+		      struct acl_role_label *role)
 {
-	unsigned long index =
-	    fhash(obj->inode, obj->device, acl_subj_set.s_size);
+	unsigned long subj_size = role->subj_hash_size;
+	struct acl_subject_label **s_hash = role->subj_hash;
+	unsigned long index = fhash(obj->inode, obj->device, subj_size);
 	struct acl_subject_label **curr;
 	__u8 i = 0;
 
-	curr = &acl_subj_set.s_hash[index];
+	curr = &s_hash[index];
 
 	while (*curr && *curr != deleted_subject) {
-		index = (index + (1 << i)) % acl_subj_set.s_size;
-		curr = &acl_subj_set.s_hash[index];
+		index = (index + (1 << i)) % subj_size;
+		curr = &s_hash[index];
 		i = (i + 1) % 32;
 	}
 
@@ -358,11 +647,6 @@ insert_acl_subj_label(struct acl_subject
 	return;
 }
 
-/* Create a table(requesting size close to 2^pwr entrie of member size)
- * and replace the current table size with the new one.
- * We use prime table sizes until we reach the bounds of 32-bit word machines 
- * Once we reach there we simply double the table size */
-
 static void **
 create_table(__u32 * len)
 {
@@ -394,22 +678,21 @@ create_table(__u32 * len)
 }
 
 static int
-init_variables(const unsigned long acl_obj_size,
-	       const unsigned long acl_subj_size,
-	       const unsigned long acl_ip_size)
+init_variables(const struct gr_arg *arg)
 {
 	unsigned long stacksize;
 
-	acl_subj_set.s_size = acl_subj_size;
-	name_set.n_size = (acl_obj_size + acl_subj_size);
-	inodev_set.n_size = (acl_obj_size + acl_subj_size);
+	subj_map_set.s_size = arg->role_db.num_subjects;
+	acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
+	name_set.n_size = arg->role_db.num_objects;
+	inodev_set.n_size = arg->role_db.num_objects;
 
 	if (!gr_init_uidset())
 		return 1;
 
 	/* set up the stack that holds allocation info */
 
-	stacksize = (3 * acl_obj_size) + (4 * acl_subj_size) + acl_ip_size + 3;
+	stacksize = arg->role_db.num_pointers + 5;
 
 	if (!acl_alloc_stack_init(stacksize))
 		return 1;
@@ -431,18 +714,31 @@ init_variables(const unsigned long acl_o
 	memset(deleted_object, 0, sizeof (struct acl_object_label));
 	memset(deleted_inodev, 0, sizeof (struct name_entry));
 
+	/* grab reference for the real root dentry and vfsmount */
+	read_lock(&child_reaper->fs->lock);
+	real_root_mnt = mntget(child_reaper->fs->rootmnt);
+	real_root = dget(child_reaper->fs->root);
+	read_unlock(&child_reaper->fs->lock);
+	
+
 	/* We only want 50% full tables for now */
 
-	acl_subj_set.s_hash =
-	    (struct acl_subject_label **) create_table(&acl_subj_set.s_size);
+	subj_map_set.s_hash =
+	    (struct subject_map **) create_table(&subj_map_set.s_size);
+	acl_role_set.r_hash =
+	    (struct acl_role_label **) create_table(&acl_role_set.r_size);
 	name_set.n_hash = (struct name_entry **) create_table(&name_set.n_size);
 	inodev_set.n_hash =
 	    (struct name_entry **) create_table(&inodev_set.n_size);
 
-	if (!acl_subj_set.s_hash || !name_set.n_hash || !inodev_set.n_hash)
+	if (!subj_map_set.s_hash || !acl_role_set.r_hash || 
+	    !name_set.n_hash || !inodev_set.n_hash)
 		return 1;
-	memset(acl_subj_set.s_hash, 0,
-	       sizeof (struct acl_subject_label *) * acl_subj_set.s_size);
+
+	memset(subj_map_set.s_hash, 0,
+	       sizeof(struct subject_map *) * subj_map_set.s_size);
+	memset(acl_role_set.r_hash, 0,
+	       sizeof (struct acl_role_label *) * acl_role_set.r_size);
 	memset(name_set.n_hash, 0,
 	       sizeof (struct name_entry *) * name_set.n_size);
 	memset(inodev_set.n_hash, 0,
@@ -451,42 +747,91 @@ init_variables(const unsigned long acl_o
 	return 0;
 }
 
+/* free information not needed after startup
+   currently contains user->kernel pointer mappings for subjects
+*/
+
+static void
+free_init_variables(void)
+{
+	__u32 i;
+
+	if (subj_map_set.s_hash) {
+		for (i = 0; i < subj_map_set.s_size; i++) {
+			if (subj_map_set.s_hash[i]) {
+				kfree(subj_map_set.s_hash[i]);
+				subj_map_set.s_hash[i] = NULL;
+			}
+		}
+
+		if ((subj_map_set.s_size * sizeof (struct subject_map *)) <=
+		    PAGE_SIZE)
+			kfree(subj_map_set.s_hash);
+		else
+			vfree(subj_map_set.s_hash);
+	}
+
+	return;
+}
+
 static void
 free_variables(void)
 {
 	struct acl_subject_label *s;
+	struct acl_role_label *r;
 	struct task_struct *task;
 
+	gr_clear_learn_entries();
+
 	read_lock(&tasklist_lock);
 	for_each_task(task) {
-		task->acl_admin = 0;
-		task->acl_admin_id = 0;
+		task->acl_sp_role = 0;
+		task->acl_role_id = 0;
 		task->acl = NULL;
+		task->role = NULL;
 	}
 	read_unlock(&tasklist_lock);
 
+	/* release the reference to the real root dentry and vfsmount */
+	if (real_root)
+		dput(real_root);
+	real_root = NULL;
+	if (real_root_mnt)
+		mntput(real_root_mnt);
+	real_root_mnt = NULL;
+
 	/* free all object hash tables */
 
-	if (subj_list_head) {
-		for (s = subj_list_head; s; s = s->next) {
-			if (!s->obj_hash)
+	if (role_list_head) {
+		for (r = role_list_head; r; r = r->next) {
+			if (!r->subj_hash)
 				break;
-			if ((s->obj_hash_size *
-			     sizeof (struct acl_object_label *)) <= PAGE_SIZE)
-				kfree(s->obj_hash);
+			for (s = r->hash->first; s; s = s->next) {
+				if (!s->obj_hash)
+					break;
+				if ((s->obj_hash_size *
+				     sizeof (struct acl_object_label *)) <=
+				    PAGE_SIZE)
+					kfree(s->obj_hash);
+				else
+					vfree(s->obj_hash);
+			}
+			if ((r->subj_hash_size *
+			     sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
+				kfree(r->subj_hash);
 			else
-				vfree(s->obj_hash);
+				vfree(r->subj_hash);
 		}
 	}
 
 	acl_free_all();
 
-	if (acl_subj_set.s_hash) {
-		if ((acl_subj_set.s_size *
-		     sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
-			kfree(acl_subj_set.s_hash);
+	if (acl_role_set.r_hash) {
+		if ((acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
+		    PAGE_SIZE)
+			kfree(acl_role_set.r_hash);
 		else
-			vfree(acl_subj_set.s_hash);
+			vfree(acl_role_set.r_hash);
 	}
 	if (name_set.n_hash) {
 		if ((name_set.n_size * sizeof (struct name_entry *)) <=
@@ -508,12 +853,11 @@ free_variables(void)
 
 	memset(&name_set, 0, sizeof (struct name_db));
 	memset(&inodev_set, 0, sizeof (struct name_db));
-	memset(&acl_subj_set, 0, sizeof (struct acl_subject_db));
+	memset(&acl_role_set, 0, sizeof (struct acl_role_db));
+	memset(&subj_map_set, 0, sizeof (struct acl_subj_map_db));
 
-	kernel_label = NULL;
-	god_label = NULL;
-	root_label = NULL;
-	subj_list_head = NULL;
+	role_list_head = NULL;
+	default_role = NULL;
 
 	return;
 }
@@ -536,11 +880,61 @@ count_user_objs(struct acl_object_label 
 	return num;
 }
 
+static struct acl_subject_label *
+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role);
+
+static int
+copy_user_glob(struct acl_object_label *obj)
+{
+	struct acl_object_label *g_tmp, **guser, *glast = NULL;
+	unsigned int len;
+	char *tmp;
+
+	if (obj->globbed == NULL)
+		return 0;
+
+	guser = &obj->globbed;
+	while (*guser) {
+		g_tmp = (struct acl_object_label *)
+			acl_alloc(sizeof (struct acl_object_label));
+		if (g_tmp == NULL)
+			return -ENOMEM;
+
+		if (copy_from_user(g_tmp, *guser,
+				   sizeof (struct acl_object_label)))
+			return -EFAULT;
+
+		len = strnlen_user(g_tmp->filename, PATH_MAX);
+
+		if (!len || len >= PATH_MAX)
+			return -EINVAL;
+
+		if ((tmp = (char *) acl_alloc(len)) == NULL)
+			return -ENOMEM;
+
+		if (copy_from_user(tmp, g_tmp->filename, len))
+			return -EFAULT;
+
+		g_tmp->filename = tmp;
+
+		if (glast)
+			glast->next = g_tmp;
+		g_tmp->prev = glast;
+		*guser = g_tmp;
+		glast = g_tmp;
+		guser = &((*guser)->next);
+	}
+		
+	return 0;
+}
+
 static int
-copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj)
+copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
+	       struct acl_role_label *role)
 {
 	struct acl_object_label *o_tmp;
 	unsigned int len;
+	int ret;
 	char *tmp;
 
 	while (userp) {
@@ -571,147 +965,524 @@ copy_user_objs(struct acl_object_label *
 		if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
 				       o_tmp->device))
 			return -ENOMEM;
+
+		ret = copy_user_glob(o_tmp);
+		if (ret)
+			return ret;
+
+		if (o_tmp->nested) {
+			o_tmp->nested = do_copy_user_subj(o_tmp->nested, role);
+			if (IS_ERR(o_tmp->nested))
+				return PTR_ERR(o_tmp->nested);
+
+			s_final = o_tmp->nested;
+		}
 	}
 
 	return 0;
 }
 
-static int
-copy_user_acl(struct gr_arg *arg)
+static __u32
+count_user_subjs(struct acl_subject_label *userp)
 {
-	struct acl_subject_label *s_tmp = NULL, **s_utmp, *s_utmp2, *s_last;
-	struct acl_ip_label **i_tmp, *i_utmp2;
-	unsigned long s_num, i_num;
-	char *tmp;
-	int err = 0;
-	unsigned int len;
-	__u32 num_objs;
-
-	s_utmp = (struct acl_subject_label **) arg->subj_db.s_table;
+	struct acl_subject_label s_tmp;
+	__u32 num = 0;
 
-	for (s_num = 0; s_num < arg->subj_db.s_entries; s_num++) {
-		s_last = s_tmp;
-		if ((s_tmp =
-		     acl_alloc(sizeof (struct acl_subject_label))) == NULL) {
-			err = -ENOMEM;
-			goto cleanup;
-		}
-		if (copy_from_user(&s_utmp2, s_utmp + s_num,
-				   sizeof (struct acl_subject_label *))) {
-			err = -EFAULT;
-			goto cleanup;
-		}
-		if (copy_from_user(s_tmp, s_utmp2,
-				   sizeof (struct acl_subject_label))) {
-			err = -EFAULT;
-			goto cleanup;
-		}
+	while (userp) {
+		if (copy_from_user(&s_tmp, userp,
+				   sizeof (struct acl_subject_label)))
+			break;
 
-		/* set up subject pointers */
+		userp = s_tmp.prev;
+		/* do not count nested subjects against this count, since
+		   they are not included in the hash table, but are
+		   attached to objects.  We have already counted
+		   the subjects in userspace for the allocation 
+		   stack
+		*/
+		if (!(s_tmp.mode & GR_NESTED))
+			num++;
+	}
 
-		if (!s_last) {
-			s_tmp->prev = NULL;
-			subj_list_head = s_tmp;
-		} else {
-			s_last->next = s_tmp;
-			s_tmp->prev = s_last;
-		}
+	return num;
+}
 
-		if (s_num == (arg->subj_db.s_entries - 1))
-			s_tmp->next = NULL;
+static int
+copy_user_allowedips(struct acl_role_label *rolep)
+{
+	struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
 
-		len = strnlen_user(s_tmp->filename, PATH_MAX);
+	ruserip = rolep->allowed_ips;
 
-		if (!len || len >= PATH_MAX) {
-			err = -EINVAL;
-			goto cleanup;
-		}
+	while (ruserip) {
+		rlast = rtmp;
 
-		if ((tmp = (char *) acl_alloc(len)) == NULL) {
-			err = -ENOMEM;
-			goto cleanup;
-		}
-		if (copy_from_user(tmp, s_tmp->filename, len)) {
-			err = -EFAULT;
-			goto cleanup;
-		}
-		s_tmp->filename = tmp;
+		if ((rtmp = (struct role_allowed_ip *)
+		     acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
+			return -ENOMEM;
 
-		/* set up object hash table */
-		num_objs = count_user_objs(s_tmp->proc_object);
+		if (copy_from_user(rtmp, ruserip,
+				   sizeof (struct role_allowed_ip)))
+			return -EFAULT;
 
-		s_tmp->obj_hash_size = num_objs;
-		s_tmp->obj_hash =
-		    (struct acl_object_label **)
-		    create_table(&(s_tmp->obj_hash_size));
+		ruserip = rtmp->prev;
 
-		if (!s_tmp->obj_hash) {
-			err = -ENOMEM;
-			goto cleanup;
+		if (!rlast) {
+			rtmp->prev = NULL;
+			rolep->allowed_ips = rtmp;
+		} else {
+			rlast->next = rtmp;
+			rtmp->prev = rlast;
 		}
-		memset(s_tmp->obj_hash, 0,
-		       s_tmp->obj_hash_size *
-		       sizeof (struct acl_object_label *));
 
-		/* add in objects */
-		err = copy_user_objs(s_tmp->proc_object, s_tmp);
+		if (!ruserip)
+			rtmp->next = NULL;
+	}
 
-		if (err)
+	return 0;
+}
+
+static int
+copy_user_transitions(struct acl_role_label *rolep)
+{
+	struct role_transition *rusertp, *rtmp = NULL, *rlast;
+	unsigned int len;
+	char *tmp;
+
+	rusertp = rolep->transitions;
+
+	while (rusertp) {
+		rlast = rtmp;
+
+		if ((rtmp = (struct role_transition *)
+		     acl_alloc(sizeof (struct role_transition))) == NULL)
+			return -ENOMEM;
+
+		if (copy_from_user(rtmp, rusertp,
+				   sizeof (struct role_transition)))
+			return -EFAULT;
+
+		rusertp = rtmp->prev;
+
+		len = strnlen_user(rtmp->rolename, GR_SPROLE_LEN);
+
+		if (!len || len >= GR_SPROLE_LEN)
+			return -EINVAL;
+
+		if ((tmp = (char *) acl_alloc(len)) == NULL)
+			return -ENOMEM;
+
+		if (copy_from_user(tmp, rtmp->rolename, len))
+			return -EFAULT;
+
+		rtmp->rolename = tmp;
+
+		if (!rlast) {
+			rtmp->prev = NULL;
+			rolep->transitions = rtmp;
+		} else {
+			rlast->next = rtmp;
+			rtmp->prev = rlast;
+		}
+
+		if (!rusertp)
+			rtmp->next = NULL;
+	}
+
+	return 0;
+}
+
+static struct acl_subject_label *
+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role)
+{
+	struct acl_subject_label *s_tmp = NULL, *s_tmp2;
+	unsigned int len;
+	char *tmp;
+	__u32 num_objs;
+	struct acl_ip_label **i_tmp, *i_utmp2;
+	struct gr_hash_struct ghash;
+	struct subject_map *subjmap;
+	unsigned long i_num;
+	int err;
+
+	s_tmp = lookup_subject_map(userp);
+
+	/* we've already copied this subject into the kernel, just return
+	   the reference to it, and don't copy it over again
+	*/
+	if (s_tmp)
+		return(s_tmp);
+
+	if ((s_tmp = (struct acl_subject_label *)
+	    acl_alloc(sizeof (struct acl_subject_label))) == NULL)
+		return ERR_PTR(-ENOMEM);
+
+	subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
+	if (subjmap == NULL)
+		return ERR_PTR(-ENOMEM);
+
+	subjmap->user = userp;
+	subjmap->kernel = s_tmp;
+	insert_subj_map_entry(subjmap);
+
+	if (copy_from_user(s_tmp, userp,
+			   sizeof (struct acl_subject_label)))
+		return ERR_PTR(-EFAULT);
+
+	if (!s_last) {
+		s_tmp->prev = NULL;
+		role->hash->first = s_tmp;
+	} else {
+		s_last->next = s_tmp;
+		s_tmp->prev = s_last;
+	}
+
+	s_last = s_tmp;
+
+	len = strnlen_user(s_tmp->filename, PATH_MAX);
+
+	if (!len || len >= PATH_MAX)
+		return ERR_PTR(-EINVAL);
+
+	if ((tmp = (char *) acl_alloc(len)) == NULL)
+		return ERR_PTR(-ENOMEM);
+
+	if (copy_from_user(tmp, s_tmp->filename, len))
+		return ERR_PTR(-EFAULT);
+
+	s_tmp->filename = tmp;
+
+	if (!strcmp(s_tmp->filename, "/"))
+		role->root_label = s_tmp;
+
+	if (copy_from_user(&ghash, s_tmp->hash, sizeof(struct gr_hash_struct)))
+		return ERR_PTR(-EFAULT);
+
+	/* copy user and group transition tables */
+
+	if (s_tmp->user_trans_num) {
+		uid_t *uidlist;
+
+		uidlist = (uid_t *)acl_alloc(s_tmp->user_trans_num * sizeof(uid_t));
+		if (uidlist == NULL)
+			return ERR_PTR(-ENOMEM);
+		if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
+			return ERR_PTR(-EFAULT);
+
+		s_tmp->user_transitions = uidlist;
+	}
+
+	if (s_tmp->group_trans_num) {
+		gid_t *gidlist;
+
+		gidlist = (gid_t *)acl_alloc(s_tmp->group_trans_num * sizeof(gid_t));
+		if (gidlist == NULL)
+			return ERR_PTR(-ENOMEM);
+		if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
+			return ERR_PTR(-EFAULT);
+
+		s_tmp->group_transitions = gidlist;
+	}
+
+	/* set up object hash table */
+	num_objs = count_user_objs(ghash.first);
+
+	s_tmp->obj_hash_size = num_objs;
+	s_tmp->obj_hash =
+	    (struct acl_object_label **)
+	    create_table(&(s_tmp->obj_hash_size));
+
+	if (!s_tmp->obj_hash)
+		return ERR_PTR(-ENOMEM);
+
+	memset(s_tmp->obj_hash, 0,
+	       s_tmp->obj_hash_size *
+	       sizeof (struct acl_object_label *));
+
+	/* copy before adding in objects, since a nested
+	   acl could be found and be the final subject
+	   copied
+	*/
+
+	s_final = s_tmp;
+
+	/* add in objects */
+	err = copy_user_objs(ghash.first, s_tmp, role);
+
+	if (err)
+		return ERR_PTR(err);
+
+	/* set pointer for parent subject */
+	if (s_tmp->parent_subject) {
+		s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role);
+
+		if (IS_ERR(s_tmp2))
+			return s_tmp2;
+
+		s_tmp->parent_subject = s_tmp2;
+	}
+
+	/* add in ip acls */
+
+	if (!s_tmp->ip_num) {
+		s_tmp->ips = NULL;
+		goto insert;
+	}
+
+	i_tmp =
+	    (struct acl_ip_label **) acl_alloc(s_tmp->ip_num *
+					       sizeof (struct
+						       acl_ip_label *));
+
+	if (!i_tmp)
+		return ERR_PTR(-ENOMEM);
+
+	for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
+		*(i_tmp + i_num) =
+		    (struct acl_ip_label *)
+		    acl_alloc(sizeof (struct acl_ip_label));
+		if (!*(i_tmp + i_num))
+			return ERR_PTR(-ENOMEM);
+
+		if (copy_from_user
+		    (&i_utmp2, s_tmp->ips + i_num,
+		     sizeof (struct acl_ip_label *)))
+			return ERR_PTR(-EFAULT);
+
+		if (copy_from_user
+		    (*(i_tmp + i_num), i_utmp2,
+		     sizeof (struct acl_ip_label)))
+			return ERR_PTR(-EFAULT);
+	}
+
+	s_tmp->ips = i_tmp;
+
+insert:
+	if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
+			       s_tmp->device))
+		return ERR_PTR(-ENOMEM);
+
+	return s_tmp;
+}
+
+static int
+copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
+{
+	struct acl_subject_label s_pre;
+	struct acl_subject_label * ret;
+	int err;
+
+	while (userp) {
+		if (copy_from_user(&s_pre, userp,
+				   sizeof (struct acl_subject_label)))
+			return -EFAULT;
+		
+		/* do not add nested subjects here, add
+		   while parsing objects
+		*/
+
+		if (s_pre.mode & GR_NESTED) {
+			userp = s_pre.prev;
+			continue;
+		}
+
+		ret = do_copy_user_subj(userp, role);
+
+		err = PTR_ERR(ret);
+		if (IS_ERR(ret))
+			return err;
+
+		insert_acl_subj_label(ret, role);
+
+		userp = s_pre.prev;
+	}
+
+	s_final->next = NULL;
+
+	return 0;
+}
+
+static int
+copy_user_acl(struct gr_arg *arg)
+{
+	struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2, *r_last;
+	struct sprole_pw *sptmp;
+	struct gr_hash_struct *ghash;
+	uid_t *domainlist;
+	unsigned long r_num;
+	unsigned int len;
+	char *tmp;
+	int err = 0;
+	__u16 i;
+	__u32 num_subjs;
+
+	/* we need a default and kernel role */
+	if (arg->role_db.num_roles < 2)
+		return -EINVAL;
+
+	/* copy special role authentication info from userspace */
+
+	num_sprole_pws = arg->num_sprole_pws;
+	acl_special_roles = (struct sprole_pw **) acl_alloc(num_sprole_pws * sizeof(struct sprole_pw *));
+
+	if (!acl_special_roles) {
+		err = -ENOMEM;
+		goto cleanup;
+	}
+
+	for (i = 0; i < num_sprole_pws; i++) {
+		sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
+		if (!sptmp) {
+			err = -ENOMEM;
+			goto cleanup;
+		}
+		if (copy_from_user(sptmp, arg->sprole_pws + i,
+				   sizeof (struct sprole_pw))) {
+			err = -EFAULT;
+			goto cleanup;
+		}
+
+		len =
+		    strnlen_user(sptmp->rolename, GR_SPROLE_LEN);
+
+		if (!len || len >= GR_SPROLE_LEN) {
+			err = -EINVAL;
+			goto cleanup;
+		}
+
+		if ((tmp = (char *) acl_alloc(len)) == NULL) {
+			err = -ENOMEM;
+			goto cleanup;
+		}
+
+		if (copy_from_user(tmp, sptmp->rolename, len)) {
+			err = -EFAULT;
+			goto cleanup;
+		}
+
+#ifdef CONFIG_GRKERNSEC_ACL_DEBUG
+		printk(KERN_ALERT "Copying special role %s\n", tmp);
+#endif
+		sptmp->rolename = tmp;
+		acl_special_roles[i] = sptmp;
+	}
+
+	r_utmp = (struct acl_role_label **) arg->role_db.r_table;
+
+	for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
+		r_last = r_tmp;
+
+		r_tmp = acl_alloc(sizeof (struct acl_role_label));
+
+		if (!r_tmp) {
+			err = -ENOMEM;
+			goto cleanup;
+		}
+
+		if (copy_from_user(&r_utmp2, r_utmp + r_num,
+				   sizeof (struct acl_role_label *))) {
+			err = -EFAULT;
+			goto cleanup;
+		}
+
+		if (copy_from_user(r_tmp, r_utmp2,
+				   sizeof (struct acl_role_label))) {
+			err = -EFAULT;
+			goto cleanup;
+		}
+
+		if (!r_last) {
+			r_tmp->prev = NULL;
+			role_list_head = r_tmp;
+		} else {
+			r_last->next = r_tmp;
+			r_tmp->prev = r_last;
+		}
+
+		if (r_num == (arg->role_db.num_roles - 1))
+			r_tmp->next = NULL;
+
+		len = strnlen_user(r_tmp->rolename, GR_SPROLE_LEN);
+
+		if (!len || len >= PATH_MAX) {
+			err = -EINVAL;
 			goto cleanup;
+		}
 
-		if (!(strcmp(s_tmp->filename, "god")))
-			god_label = s_tmp;
-		if (!(strcmp(s_tmp->filename, "kernel")))
-			kernel_label = s_tmp;
-		else if (!(strcmp(s_tmp->filename, "/")))
-			root_label = s_tmp;
-
-		/* add in ip acls */
-
-		if (!s_tmp->ip_num) {
-			s_tmp->ips = NULL;
-			goto insert;
-		}
-
-		if ((i_tmp =
-		     (struct acl_ip_label **) acl_alloc(s_tmp->ip_num *
-							sizeof (struct
-								acl_ip_label
-								*))) == NULL) {
+		if ((tmp = (char *) acl_alloc(len)) == NULL) {
 			err = -ENOMEM;
 			goto cleanup;
 		}
+		if (copy_from_user(tmp, r_tmp->rolename, len)) {
+			err = -EFAULT;
+			goto cleanup;
+		}
+		r_tmp->rolename = tmp;
+
+		if (!strcmp(r_tmp->rolename, "default")
+		    && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
+			default_role = r_tmp;
+		} else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
+			kernel_role = r_tmp;
+		}
+
+		if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL) {
+			err = -ENOMEM;
+			goto cleanup;
+		}
+		if (copy_from_user(ghash, r_tmp->hash, sizeof(struct gr_hash_struct))) {
+			err = -EFAULT;
+			goto cleanup;
+		}
+
+		r_tmp->hash = ghash;
+
+		num_subjs = count_user_subjs(r_tmp->hash->first);
 
-		for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
-			if ((*(i_tmp + i_num) =
-			     (struct acl_ip_label *)
-			     acl_alloc(sizeof (struct acl_ip_label))) == NULL) {
+		r_tmp->subj_hash_size = num_subjs;
+		r_tmp->subj_hash =
+		    (struct acl_subject_label **)
+		    create_table(&(r_tmp->subj_hash_size));
+
+		if (!r_tmp->subj_hash) {
+			err = -ENOMEM;
+			goto cleanup;
+		}
+
+		err = copy_user_allowedips(r_tmp);
+		if (err)
+			goto cleanup;
+
+		/* copy domain info */
+		if (r_tmp->domain_children != NULL) {
+			domainlist = acl_alloc(r_tmp->domain_child_num * sizeof(uid_t));
+			if (domainlist == NULL) {
 				err = -ENOMEM;
 				goto cleanup;
 			}
-			if (copy_from_user
-			    (&i_utmp2, s_tmp->ips + i_num,
-			     sizeof (struct acl_ip_label *))) {
-				err = -EFAULT;
-				goto cleanup;
-			}
-			if (copy_from_user
-			    (*(i_tmp + i_num), i_utmp2,
-			     sizeof (struct acl_ip_label))) {
+			if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t))) {
 				err = -EFAULT;
 				goto cleanup;
 			}
+			r_tmp->domain_children = domainlist;
 		}
 
-		s_tmp->ips = i_tmp;
+		err = copy_user_transitions(r_tmp);
+		if (err)
+			goto cleanup;
 
-	      insert:
-		insert_acl_subj_label(s_tmp);
-		if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
-				       s_tmp->device)) {
-			err = -ENOMEM;
+		memset(r_tmp->subj_hash, 0,
+		       r_tmp->subj_hash_size *
+		       sizeof (struct acl_subject_label *));
+
+		s_last = NULL;
+
+		err = copy_user_subjs(r_tmp->hash->first, r_tmp);
+
+		if (err)
 			goto cleanup;
-		}
+
+		insert_acl_role_label(r_tmp);
 	}
 
       cleanup:
@@ -724,14 +1495,10 @@ gracl_init(struct gr_arg *args)
 {
 	int error = 0;
 
-	memcpy(gr_pwent->salt, args->salt, GR_SALT_LEN);
-	memcpy(gr_pwent->sum, args->sum, GR_SHA_LEN);
+	memcpy(gr_system_salt, args->salt, GR_SALT_LEN);
+	memcpy(gr_system_sum, args->sum, GR_SHA_LEN);
 
-	if (args->subj_db.s_entries < 3)
-		return -EINVAL;
-
-	if (init_variables(args->subj_db.o_entries, args->subj_db.s_entries,
-			   args->subj_db.i_entries)) {
+	if (init_variables(args)) {
 		security_alert_good(GR_INITF_ACL_MSG, GR_VERSION);
 		error = -ENOMEM;
 		free_variables();
@@ -739,6 +1506,7 @@ gracl_init(struct gr_arg *args)
 	}
 
 	error = copy_user_acl(args);
+	free_init_variables();
 	if (error) {
 		free_variables();
 		goto out;
@@ -750,44 +1518,210 @@ gracl_init(struct gr_arg *args)
 	}
 
 	gr_status |= GR_READY;
-	acl_admin_value = 0;
       out:
 	return error;
 }
 
-/* * * * * * * * * * * * * * * * * * * * * * *
- * Begin Misc Section 
- * * * * * * * * * * * * * * * * * * * * * * */
+/* derived from glibc fnmatch() 0: match, 1: no match*/
 
-static __u32
+static int
+glob_match(const char *pattern, const char *string)
+{
+	char *p = pattern, *n = string;
+	char c;
+
+	while ((c = *p++) != '\0') {
+	switch (c) {
+		case '?':
+			if (*n == '\0')
+				return 1;
+			else if (*n == '/')
+				return 1;
+			break;
+		case '\\':
+			if (*n != c)
+				return 1;
+			break;
+		case '*':
+			for (c = *p++; c == '?' || c == '*'; c = *p++) {
+				if (*n == '/')
+					return 1;
+				else if (c == '?') {
+					if (*n == '\0')
+						return 1;
+					else
+						++n;
+				}
+			}
+			if (c == '\0') {
+				if (strchr(n, '/') != NULL)
+					return 1;
+				else
+					return 0;
+			} else {
+				const char *endp;
+
+				if ((endp = strchr(n, '/')) == NULL)
+					endp = n + strlen(n);
+
+				if (c == '[') {
+					for (--p; n < endp; ++n)
+						if (!glob_match(p, n))
+							return 0;
+				} else if (c == '/') {
+					while (*n != '\0' && *n != '/')
+						++n;
+					if (*n == '/' && !glob_match(p, n + 1))
+						return 0;
+				} else {
+					for (--p; n < endp; ++n)
+						if (*n == c && !glob_match(p, n))
+							return 0;
+				}
+
+				return 1;
+			}
+		case '[':
+			{
+			int not;
+			char cold;
+
+			if (*n == '\0' || *n == '/')
+				return 1;
+
+			not = (*p == '!' || *p == '^');
+			if (not)
+				++p;
+
+			c = *p++;
+			for (;;) {
+				unsigned char fn = (unsigned char)*n;
+
+				if (c == '\0')
+					return 1;
+				else {
+					if (c == fn)
+						goto matched;
+					cold = c;
+					c = *p++;
+
+					if (c == '-' && *p != ']') {
+						unsigned char cend = *p++;
+
+						if (cend == '\0')
+							return 1;
+
+						if (cold <= fn && fn <= cend)
+							goto matched;
+
+						c = *p++;
+					}
+				}
+
+				if (c == ']')
+					break;
+			}
+			if (!not)
+				return 1;
+			break;
+		matched:
+			while (c != ']') {
+				if (c == '\0')
+					return 1;
+
+				c = *p++;
+			}
+			if (not)
+				return 1;
+		}
+		break;
+	default:
+		if (c != *n)
+			return 1;
+	}
+
+	++n;
+	}
+				
+	if (*n == '\0')
+		return 0;
+
+	if (*n == '/')
+		return 0;
+
+	return 1;
+}
+
+static struct acl_object_label *
+chk_glob_label(struct acl_object_label *globbed,
+		struct dentry *dentry, struct vfsmount *mnt, char **path)
+{
+	struct acl_object_label *tmp;
+
+	if (*path == NULL)
+		*path = gr_to_filename_nolock(dentry, mnt);
+
+	tmp = globbed;
+
+	while (tmp) {
+		if (!glob_match(tmp->filename, *path))
+			return tmp;
+		tmp = tmp->next;
+	}
+
+	return NULL;
+}
+
+static __inline__ struct acl_object_label *
+full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
+	    struct dentry *curr_dentry,
+	    const struct acl_subject_label *subj, char **path)
+{
+	struct acl_subject_label *tmpsubj;
+	struct acl_object_label *retval;
+	struct acl_object_label *retval2;
+
+	tmpsubj = (struct acl_subject_label *) subj;
+	read_lock(&gr_inode_lock);
+	do {
+		retval =
+		    	lookup_acl_obj_label(curr_dentry->d_inode->i_ino,
+					 curr_dentry->d_inode->i_dev, tmpsubj);
+		if (retval) {
+			if (retval->globbed) {
+				retval2 = chk_glob_label(retval->globbed, (struct dentry *)orig_dentry,
+						  (struct vfsmount *)orig_mnt, path);
+				if (retval2)
+					retval = retval2;
+			}
+			break;
+		}
+	} while ((tmpsubj = tmpsubj->parent_subject));
+	read_unlock(&gr_inode_lock);
+
+	return retval;
+}
+
+static struct acl_object_label *
 chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
-	      const __u32 reqmode, const struct acl_subject_label *subj)
+	      const struct acl_subject_label *subj)
 {
 	struct dentry *dentry = (struct dentry *) l_dentry;
 	struct vfsmount *mnt = (struct vfsmount *) l_mnt;
-	struct dentry *root;
-	struct vfsmount *rootmnt;
 	struct acl_object_label *retval;
+	char *path = NULL;
 
-	read_lock(&child_reaper->fs->lock);
-	rootmnt = mntget(child_reaper->fs->rootmnt);
-	root = dget(child_reaper->fs->root);
-	read_unlock(&child_reaper->fs->lock);
 	spin_lock(&dcache_lock);
 
 	for (;;) {
-		if (unlikely(dentry == root && mnt == rootmnt))
+		if (dentry == real_root && mnt == real_root_mnt)
 			break;
-		if (unlikely(dentry == mnt->mnt_root || IS_ROOT(dentry))) {
+		if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
 			if (mnt->mnt_parent == mnt)
 				break;
 
-			read_lock(&gr_inode_lock);
-			retval =
-			    lookup_acl_obj_label(dentry->d_inode->i_ino,
-						 dentry->d_inode->i_dev, subj);
-			read_unlock(&gr_inode_lock);
-			if (unlikely(retval != NULL))
+			retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path);
+			if (retval != NULL)
 				goto out;
 
 			dentry = mnt->mnt_mountpoint;
@@ -795,55 +1729,78 @@ chk_obj_label(const struct dentry *l_den
 			continue;
 		}
 
-		read_lock(&gr_inode_lock);
-		retval =
-		    lookup_acl_obj_label(dentry->d_inode->i_ino,
-					 dentry->d_inode->i_dev, subj);
-		read_unlock(&gr_inode_lock);
-		if (unlikely(retval != NULL))
+		retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path);
+		if (retval != NULL)
 			goto out;
 
 		dentry = dentry->d_parent;
 	}
 
-	read_lock(&gr_inode_lock);
-	retval =
-	    lookup_acl_obj_label(dentry->d_inode->i_ino, dentry->d_inode->i_dev,
-				 subj);
-	read_unlock(&gr_inode_lock);
+	retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path);
 
-	if (unlikely(retval == NULL)) {
-		read_lock(&gr_inode_lock);
-		retval =
-		    lookup_acl_obj_label(root->d_inode->i_ino,
-					 root->d_inode->i_dev, subj);
-		read_unlock(&gr_inode_lock);
+	if (retval == NULL)
+		retval = full_lookup(l_dentry, l_mnt, real_root, subj, &path);
+      out:
+	spin_unlock(&dcache_lock);
+
+	return retval;
+}
+
+static struct acl_object_label *
+chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
+	      const struct acl_subject_label *subj, char *path)
+{
+	struct dentry *dentry = (struct dentry *) l_dentry;
+	struct vfsmount *mnt = (struct vfsmount *) l_mnt;
+	struct acl_object_label *retval;
+
+	spin_lock(&dcache_lock);
+
+	for (;;) {
+		if (dentry == real_root && mnt == real_root_mnt)
+			break;
+		if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
+			if (mnt->mnt_parent == mnt)
+				break;
+
+			retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path);
+			if (retval != NULL)
+				goto out;
+
+			dentry = mnt->mnt_mountpoint;
+			mnt = mnt->mnt_parent;
+			continue;
+		}
+
+		retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path);
+		if (retval != NULL)
+			goto out;
+
+		dentry = dentry->d_parent;
 	}
+
+	retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path);
+
+	if (retval == NULL)
+		retval = full_lookup(l_dentry, l_mnt, real_root, subj, &path);
       out:
 	spin_unlock(&dcache_lock);
-	dput(root);
-	mntput(rootmnt);
 
-	return (retval->mode & reqmode);
+	return retval;
 }
 
 static struct acl_subject_label *
-chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt)
+chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
+	       const struct acl_role_label *role)
 {
 	struct dentry *dentry = (struct dentry *) l_dentry;
 	struct vfsmount *mnt = (struct vfsmount *) l_mnt;
-	struct dentry *root;
-	struct vfsmount *rootmnt;
 	struct acl_subject_label *retval;
 
-	read_lock(&child_reaper->fs->lock);
-	rootmnt = mntget(child_reaper->fs->rootmnt);
-	root = dget(child_reaper->fs->root);
-	read_unlock(&child_reaper->fs->lock);
 	spin_lock(&dcache_lock);
 
 	for (;;) {
-		if (unlikely(dentry == root && mnt == rootmnt))
+		if (unlikely(dentry == real_root && mnt == real_root_mnt))
 			break;
 		if (unlikely(dentry == mnt->mnt_root || IS_ROOT(dentry))) {
 			if (mnt->mnt_parent == mnt)
@@ -852,7 +1809,7 @@ chk_subj_label(const struct dentry *l_de
 			read_lock(&gr_inode_lock);
 			retval =
 			    lookup_acl_subj_label(dentry->d_inode->i_ino,
-						  dentry->d_inode->i_dev);
+						  dentry->d_inode->i_dev, role);
 			read_unlock(&gr_inode_lock);
 			if (unlikely(retval != NULL))
 				goto out;
@@ -865,7 +1822,7 @@ chk_subj_label(const struct dentry *l_de
 		read_lock(&gr_inode_lock);
 		retval =
 		    lookup_acl_subj_label(dentry->d_inode->i_ino,
-					  dentry->d_inode->i_dev);
+					  dentry->d_inode->i_dev, role);
 		read_unlock(&gr_inode_lock);
 		if (unlikely(retval != NULL))
 			goto out;
@@ -876,35 +1833,31 @@ chk_subj_label(const struct dentry *l_de
 	read_lock(&gr_inode_lock);
 	retval =
 	    lookup_acl_subj_label(dentry->d_inode->i_ino,
-				  dentry->d_inode->i_dev);
+				  dentry->d_inode->i_dev, role);
 	read_unlock(&gr_inode_lock);
 
 	if (unlikely(retval == NULL)) {
 		read_lock(&gr_inode_lock);
 		retval =
-		    lookup_acl_subj_label(root->d_inode->i_ino,
-					  root->d_inode->i_dev);
+		    lookup_acl_subj_label(real_root->d_inode->i_ino,
+					  real_root->d_inode->i_dev, role);
 		read_unlock(&gr_inode_lock);
 	}
       out:
 	spin_unlock(&dcache_lock);
-	dput(root);
-	mntput(rootmnt);
 
 	return retval;
 }
 
 static __inline__ void
-gr_log_learn(const struct acl_subject_label *curracl,
-	     const struct dentry *dentry, const struct vfsmount *mnt,
-	     const char *pathname, const __u32 mode)
-{
-	security_learn(GR_LEARN_AUDIT_MSG, curracl->device,
-		       (unsigned long) curracl->inode,
-		       dentry->d_inode ? (unsigned long) dentry->d_inode->
-		       i_dev : 0UL,
-		       dentry->d_inode ? (unsigned long) dentry->d_inode->
-		       i_ino : 0UL, pathname, (unsigned long) mode);
+gr_log_learn(const struct acl_role_label *role, const uid_t uid, const gid_t gid,
+	     const struct task_struct *task, const char *pathname,
+	     const __u32 mode)
+{
+	security_learn(GR_LEARN_AUDIT_MSG, role->rolename, role->roletype,
+		       uid, gid, task->exec_file ? gr_to_filename1(task->exec_file->f_dentry,
+		       task->exec_file->f_vfsmnt) : task->acl->filename, task->acl->filename,
+		       1, 1, pathname, (unsigned long) mode, NIPQUAD(task->curr_ip));
 
 	return;
 }
@@ -915,26 +1868,28 @@ gr_check_link(const struct dentry * new_
 	      const struct vfsmount * parent_mnt,
 	      const struct dentry * old_dentry, const struct vfsmount * old_mnt)
 {
+	struct acl_object_label *obj;
 	__u32 oldmode, newmode;
 
 	if (unlikely(!(gr_status & GR_READY)))
-		return GR_WRITE;
+		return (GR_WRITE | GR_CREATE);
 
-	oldmode = chk_obj_label(old_dentry, old_mnt, (__u32) ~ 0, current->acl);
+	obj = chk_obj_label(old_dentry, old_mnt, current->acl);
+	oldmode = obj->mode;
 
 	if (current->acl->mode & GR_LEARN)
-		oldmode |= GR_WRITE;
-
+		oldmode |= (GR_WRITE | GR_CREATE);
 	newmode =
 	    gr_check_create(new_dentry, parent_dentry, parent_mnt,
-			    oldmode | GR_AUDIT_WRITE | GR_SUPPRESS);
+			    oldmode | GR_CREATE | GR_AUDIT_CREATE |
+			    GR_AUDIT_WRITE | GR_SUPPRESS);
 
 	if ((newmode & oldmode) == oldmode)
 		return newmode;
 	else if (current->acl->mode & GR_LEARN) {
-		gr_log_learn(current->acl, old_dentry, old_mnt,
-			     gr_to_filename(old_dentry, old_mnt), oldmode);
-		return GR_WRITE;
+		gr_log_learn(current->role, current->uid, current->gid,
+			current, gr_to_filename(old_dentry, old_mnt), oldmode);
+		return (GR_WRITE | GR_CREATE);
 	} else if (newmode & GR_SUPPRESS)
 		return GR_SUPPRESS;
 	else
@@ -947,25 +1902,28 @@ gr_search_file(const struct dentry * den
 {
 	__u32 retval = mode;
 	struct acl_subject_label *curracl;
+	struct acl_object_label *currobj;
 
 	if (unlikely(!(gr_status & GR_READY)))
 		return (mode & ~GR_AUDITS);
 
 	curracl = current->acl;
 
-	retval = chk_obj_label(dentry, mnt, mode, curracl);
+	currobj = chk_obj_label(dentry, mnt, curracl);
+	retval = currobj->mode & mode;
 
 	if (unlikely
-	    ((curracl->mode & GR_LEARN) && (mode != GR_PTRACERD)
+	    ((curracl->mode & GR_LEARN) && !(mode & GR_NOPTRACE)
 	     && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
 		__u32 new_mode = mode;
 
 		new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
 
 		retval = new_mode;
+
 		if (!(mode & GR_NOLEARN))
-			gr_log_learn(curracl, dentry, mnt,
-				     gr_to_filename(dentry, mnt), new_mode);
+			gr_log_learn(current->role, current->uid, current->gid,
+				     current, gr_to_filename(dentry, mnt), new_mode);
 	}
 
 	return retval;
@@ -978,14 +1936,15 @@ gr_check_create(const struct dentry * ne
 	struct name_entry *match;
 	struct acl_object_label *matchpo;
 	struct acl_subject_label *curracl;
+	char *path;
 	__u32 retval;
 
 	if (unlikely(!(gr_status & GR_READY)))
 		return (mode & ~GR_AUDITS);
 
 	preempt_disable();
-
-	match = lookup_name_entry(gr_to_filename(new_dentry, mnt));
+	path = gr_to_filename(new_dentry, mnt);
+	match = lookup_name_entry(path);
 
 	if (!match)
 		goto check_parent;
@@ -1004,8 +1963,8 @@ gr_check_create(const struct dentry * ne
 
 			new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
 
-			gr_log_learn(curracl, new_dentry, mnt,
-				     gr_to_filename(new_dentry, mnt), new_mode);
+			gr_log_learn(current->role, current->uid, current->gid,
+				     current, gr_to_filename(new_dentry, mnt), new_mode);
 
 			preempt_enable();
 			return new_mode;
@@ -1014,10 +1973,11 @@ gr_check_create(const struct dentry * ne
 		return (matchpo->mode & mode);
 	}
 
-      check_parent:
+	check_parent:
 	curracl = current->acl;
 
-	retval = chk_obj_label(parent, mnt, mode, curracl);
+	matchpo = chk_obj_create_label(parent, mnt, curracl, path);
+	retval = matchpo->mode & mode;
 
 	if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
 	    && (curracl->mode & GR_LEARN)) {
@@ -1025,8 +1985,8 @@ gr_check_create(const struct dentry * ne
 
 		new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
 
-		gr_log_learn(curracl, new_dentry, mnt,
-			     gr_to_filename(new_dentry, mnt), new_mode);
+		gr_log_learn(current->role, current->uid, current->gid, 
+			     current, gr_to_filename(new_dentry, mnt), new_mode);
 		preempt_enable();
 		return new_mode;
 	}
@@ -1062,19 +2022,16 @@ gr_check_protected_task(const struct tas
 __inline__ void
 gr_copy_label(struct task_struct *tsk)
 {
-	/* We don't need to lock task...because task is being created
-	 * in do_fork() so it can't be modified anywhere else as it has
-	 * yet to be a true process. see kernel/fork.c */
-
 	tsk->used_accept = 0;
-	tsk->used_connect = 0;
-	tsk->acl_admin = 0;
-	tsk->acl_admin_id = current->acl_admin_id;
+	tsk->acl_sp_role = 0;
+	tsk->acl_role_id = current->acl_role_id;
 	tsk->acl = current->acl;
+	tsk->role = current->role;
+	tsk->curr_ip = current->curr_ip;
 	if (current->exec_file)
 		get_file(current->exec_file);
 	tsk->exec_file = current->exec_file;
-	tsk->curr_ip = current->curr_ip;
+	tsk->is_writable = current->is_writable;
 	if (unlikely(current->used_accept))
 		current->curr_ip = 0;
 
@@ -1103,9 +2060,11 @@ gr_set_proc_res(void)
 	return;
 }
 
+#ifdef CONFIG_GRKERNSEC_PAX_HAVE_ACL_FLAGS
 void
-gr_set_pax_flags(struct task_struct *task)
+pax_set_flags(struct linux_binprm *bprm)
 {
+	struct task_struct *task = current;
 	struct acl_subject_label *proc;
 
 	if (unlikely(!(gr_status & GR_READY)))
@@ -1128,31 +2087,245 @@ gr_set_pax_flags(struct task_struct *tas
 
 	return;
 }
+#endif
+
+static __inline__ void
+do_set_role_label(struct task_struct *task, const uid_t uid, const gid_t gid)
+{
+	task->role = lookup_acl_role_label(task, uid, gid);
+
+	return;
+}
+
+int
+gr_check_user_change(int real, int effective, int fs)
+{
+	unsigned int i;
+	__u16 num;
+	uid_t *uidlist;
+	int curuid;
+	int realok = 0;
+	int effectiveok = 0;
+	int fsok = 0;
+
+	if (unlikely(!(gr_status & GR_READY)))
+		return 0;
+
+	num = current->acl->user_trans_num;
+	uidlist = current->acl->user_transitions;
+
+	if (uidlist == NULL)
+		return 0;
+
+	if (real == -1)
+		realok = 1;
+	if (effective == -1)
+		effectiveok = 1;
+	if (fs == -1)
+		fsok = 1;
+
+	if (current->acl->user_trans_type & GR_ID_ALLOW) {
+		for (i = 0; i < num; i++) {
+			curuid = (int)uidlist[i];
+			if (real == curuid)
+				realok = 1;
+			if (effective == curuid)
+				effectiveok = 1;
+			if (fs == curuid)
+				fsok = 1;
+		}
+	} else if (current->acl->user_trans_type & GR_ID_DENY) {
+		for (i = 0; i < num; i++) {
+			curuid = (int)uidlist[i];
+			if (real == curuid)
+				break;
+			if (effective == curuid)
+				break;
+			if (fs == curuid)
+				break;
+		}
+		/* not in deny list */
+		if (i == num) {
+			realok = 1;
+			effectiveok = 1;
+			fsok = 1;
+		}
+	}
+
+	if (realok && effectiveok && fsok)
+		return 0;
+	else {
+		security_alert(GR_USRCHANGE_ACL_MSG,
+			realok ? (effectiveok ? (fsok ? 0 : fs) : effective) : real, DEFAULTSECARGS);
+		return 1;
+	}
+}
+
+int
+gr_check_group_change(int real, int effective, int fs)
+{
+	unsigned int i;
+	__u16 num;
+	gid_t *gidlist;
+	int curgid;
+	int realok = 0;
+	int effectiveok = 0;
+	int fsok = 0;
+
+	if (unlikely(!(gr_status & GR_READY)))
+		return 0;
+
+	num = current->acl->group_trans_num;
+	gidlist = current->acl->group_transitions;
+
+	if (gidlist == NULL)
+		return 0;
+
+	if (real == -1)
+		realok = 1;
+	if (effective == -1)
+		effectiveok = 1;
+	if (fs == -1)
+		fsok = 1;
+
+	if (current->acl->group_trans_type & GR_ID_ALLOW) {
+		for (i = 0; i < num; i++) {
+			curgid = (int)gidlist[i];
+			if (real == curgid)
+				realok = 1;
+			if (effective == curgid)
+				effectiveok = 1;
+			if (fs == curgid)
+				fsok = 1;
+		}
+	} else if (current->acl->group_trans_type & GR_ID_DENY) {
+		for (i = 0; i < num; i++) {
+			curgid = (int)gidlist[i];
+			if (real == curgid)
+				break;
+			if (effective == curgid)
+				break;
+			if (fs == curgid)
+				break;
+		}
+		/* not in deny list */
+		if (i == num) {
+			realok = 1;
+			effectiveok = 1;
+			fsok = 1;
+		}
+	}
+
+	if (realok && effectiveok && fsok)
+		return 0;
+	else {
+		security_alert(GR_GRPCHANGE_ACL_MSG,
+			realok ? (effectiveok ? (fsok ? 0 : fs) : effective) : real, DEFAULTSECARGS);
+		return 1;
+	}
+}
 
 void
+gr_set_role_label(struct task_struct *task, const uid_t uid, const uid_t gid)
+{
+	struct acl_object_label *obj;
+	struct file *filp;
+
+	if (unlikely(!(gr_status & GR_READY)))
+		return;
+
+	filp = task->exec_file;
+
+	/* kernel process, we'll give them the kernel role */
+	if (unlikely(!filp)) {
+		task->role = kernel_role;
+		task->acl = kernel_role->root_label;
+		return;
+	} else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL))
+		do_set_role_label(task, uid, gid);
+
+	task->acl =
+	    chk_subj_label(filp->f_dentry, filp->f_vfsmnt, task->role);
+
+	task->is_writable = 0;
+
+	/* ignore additional mmap checks for processes that are writable 
+	   by the default ACL */
+	obj = chk_obj_label(filp->f_dentry, filp->f_vfsmnt, default_role->root_label);
+	if (unlikely(obj->mode & GR_WRITE))
+		task->is_writable = 1;
+	obj = chk_obj_label(filp->f_dentry, filp->f_vfsmnt, task->role->root_label);
+	if (unlikely(obj->mode & GR_WRITE))
+		task->is_writable = 1;
+
+#ifdef CONFIG_GRKERNSEC_ACL_DEBUG
+	printk(KERN_ALERT "Set role label for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
+#endif
+
+	gr_set_proc_res();
+
+	return;
+}
+
+int
 gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt)
 {
+	struct task_struct *task = current;
 	struct acl_subject_label *newacl;
+	struct acl_object_label *obj;
 	__u32 retmode;
 
 	if (unlikely(!(gr_status & GR_READY)))
-		return;
+		return 0;
+
+	newacl = chk_subj_label(dentry, mnt, task->role);
 
-	newacl = chk_subj_label(dentry, mnt);
+	task_lock(task);
+	if (((task->ptrace & PT_PTRACED) && !(task->acl->mode & 
+	     GR_OVERRIDE) && (task->acl != newacl) && 
+	     !(task->role->roletype & GR_ROLE_GOD) && 
+	     !gr_search_file(dentry, GR_PTRACERD, mnt)) ||
+	    (atomic_read(&task->fs->count) > 1 ||
+	     atomic_read(&task->files->count) > 1 ||
+	     atomic_read(&task->sig->count) > 1)) {
+		task_unlock(task);
+		security_alert(GR_PTRACE_EXEC_ACL_MSG,
+			       gr_to_filename(dentry, mnt), DEFAULTSECARGS);
+		return -EACCES;
+	}
+	obj = chk_obj_label(dentry, mnt, task->acl);
+	retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
 
-	retmode =
-	    chk_obj_label(dentry, mnt, GR_INHERIT | GR_AUDIT_INHERIT,
-			  current->acl);
-
-	if ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))
-		current->acl = newacl;
-	else if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
-		security_audit(GR_INHERIT_ACL_MSG, current->acl->filename,
+	if ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT)) {
+		if (obj->nested)
+			task->acl = obj->nested;
+		else
+			task->acl = newacl;
+		task_unlock(task);
+	} else if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT) {
+		task_unlock(task);
+		security_audit(GR_INHERIT_ACL_MSG, task->acl->filename,
 			       gr_to_filename(dentry, mnt), DEFAULTSECARGS);
+	} else
+		task_unlock(task);
+
+	task->is_writable = 0;
+
+	/* ignore additional mmap checks for processes that are writable 
+	   by the default ACL */
+	obj = chk_obj_label(dentry, mnt, default_role->root_label);
+	if (unlikely(obj->mode & GR_WRITE))
+		task->is_writable = 1;
+	obj = chk_obj_label(dentry, mnt, task->role->root_label);
+	if (unlikely(obj->mode & GR_WRITE))
+		task->is_writable = 1;
 
 	gr_set_proc_res();
 
-	return;
+#ifdef CONFIG_GRKERNSEC_ACL_DEBUG
+	printk(KERN_ALERT "Set subject label for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
+#endif
+	return 0;
 }
 
 static __inline__ void
@@ -1161,14 +2334,22 @@ do_handle_delete(const ino_t ino, const 
 	struct acl_object_label *matchpo;
 	struct acl_subject_label *matchps;
 	struct acl_subject_label *i;
+	struct acl_role_label *role;
 
-	for (i = subj_list_head; i; i = i->next) {
-		if ((matchpo = lookup_acl_obj_label(ino, dev, i)) != NULL)
-			matchpo->mode |= GR_DELETED;
-	}
+	for (role = role_list_head; role; role = role->next) {
+		for (i = role->hash->first; i; i = i->next) {
+			if (unlikely((i->mode & GR_NESTED) &&
+				     (i->inode == ino) &&
+				     (i->device == dev)))
+				i->mode |= GR_DELETED;
+			if (unlikely((matchpo =
+			     lookup_acl_obj_label(ino, dev, i)) != NULL))
+				matchpo->mode |= GR_DELETED;
+		}
 
-	if ((matchps = lookup_acl_subj_label(ino, dev)) != NULL)
-		matchps->mode |= GR_DELETED;
+		if (unlikely((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL))
+			matchps->mode |= GR_DELETED;
+	}
 
 	return;
 }
@@ -1180,7 +2361,7 @@ gr_handle_delete(const ino_t ino, const 
 		return;
 
 	write_lock(&gr_inode_lock);
-	if (lookup_inodev_entry(ino, dev))
+	if (unlikely((unsigned long)lookup_inodev_entry(ino, dev)))
 		do_handle_delete(ino, dev);
 	write_unlock(&gr_inode_lock);
 
@@ -1226,24 +2407,27 @@ update_acl_obj_label(const ino_t oldinod
 
 static __inline__ void
 update_acl_subj_label(const ino_t oldinode, const kdev_t olddevice,
-		      const ino_t newinode, const kdev_t newdevice)
+		      const ino_t newinode, const kdev_t newdevice,
+		      struct acl_role_label *role)
 {
-	unsigned long index = fhash(oldinode, olddevice, acl_subj_set.s_size);
+	struct acl_subject_label **s_hash = role->subj_hash;
+	unsigned long subj_size = role->subj_hash_size;
+	unsigned long index = fhash(oldinode, olddevice, subj_size);
 	struct acl_subject_label **match;
 	struct acl_subject_label *tmp;
 	__u8 i = 0;
 
-	match = &acl_subj_set.s_hash[index];
+	match = &s_hash[index];
 
 	while (*match && ((*match)->inode != oldinode ||
 	       (*match)->device != olddevice ||
 	       !((*match)->mode & GR_DELETED))) {
-		index = (index + (1 << i)) % acl_subj_set.s_size;
+		index = (index + (1 << i)) % subj_size;
 		i = (i + 1) % 32;
-		match = &acl_subj_set.s_hash[index];
+		match = &s_hash[index];
 	}
 
-	if (*match && ((*match) != deleted_subject)
+	if (*match && (*match != deleted_subject)
 	    && ((*match)->inode == oldinode)
 	    && ((*match)->device == olddevice)
 	    && ((*match)->mode & GR_DELETED)) {
@@ -1255,7 +2439,7 @@ update_acl_subj_label(const ino_t oldino
 
 		*match = deleted_subject;
 
-		insert_acl_subj_label(tmp);
+		insert_acl_subj_label(tmp, role);
 	}
 
 	return;
@@ -1301,14 +2485,24 @@ do_handle_create(const struct name_entry
 		 const struct vfsmount *mnt)
 {
 	struct acl_subject_label *i;
+	struct acl_role_label *role;
 
-	update_acl_subj_label(matchn->inode, matchn->device,
-			      dentry->d_inode->i_ino, dentry->d_inode->i_dev);
-
-	for (i = subj_list_head; i; i = i->next) {
-		update_acl_obj_label(matchn->inode, matchn->device,
-				     dentry->d_inode->i_ino,
-				     dentry->d_inode->i_dev, i);
+	for (role = role_list_head; role; role = role->next) {
+		update_acl_subj_label(matchn->inode, matchn->device,
+				      dentry->d_inode->i_ino,
+				      dentry->d_inode->i_dev, role);
+
+		for (i = role->hash->first; i; i = i->next) {
+			if (unlikely((i->mode & GR_NESTED) &&
+				     (i->inode == dentry->d_inode->i_ino) &&
+				     (i->device == dentry->d_inode->i_dev))) {
+				i->inode = dentry->d_inode->i_ino;
+				i->device = dentry->d_inode->i_dev;
+			}
+			update_acl_obj_label(matchn->inode, matchn->device,
+					     dentry->d_inode->i_ino,
+					     dentry->d_inode->i_dev, i);
+		}
 	}
 
 	update_inodev_entry(matchn->inode, matchn->device,
@@ -1329,7 +2523,7 @@ gr_handle_create(const struct dentry *de
 	matchn = lookup_name_entry(gr_to_filename(dentry, mnt));
 	preempt_enable();
 
-	if (matchn) {
+	if (unlikely((unsigned long)matchn)) {
 		write_lock(&gr_inode_lock);
 		do_handle_create(matchn, dentry, mnt);
 		write_unlock(&gr_inode_lock);
@@ -1355,7 +2549,7 @@ gr_handle_rename(struct inode *old_dir, 
 	error = vfs_rename(old_dir, old_dentry, new_dir, new_dentry);
 	unlock_kernel();
 
-	if (error)
+	if (unlikely(error))
 		return error;
 
 	/* we wouldn't have to check d_inode if it weren't for
@@ -1364,9 +2558,9 @@ gr_handle_rename(struct inode *old_dir, 
 
 	write_lock(&gr_inode_lock);
 	if (unlikely(replace && new_dentry->d_inode)) {
-		if (lookup_inodev_entry(new_dentry->d_inode->i_ino,
+		if (unlikely(lookup_inodev_entry(new_dentry->d_inode->i_ino,
 					new_dentry->d_inode->i_dev) &&
-		    (new_dentry->d_inode->i_nlink <= 1))
+		    (old_dentry->d_inode->i_nlink <= 1)))
 			do_handle_delete(new_dentry->d_inode->i_ino,
 					 new_dentry->d_inode->i_dev);
 	}
@@ -1377,77 +2571,211 @@ gr_handle_rename(struct inode *old_dir, 
 		do_handle_delete(old_dentry->d_inode->i_ino,
 				 old_dentry->d_inode->i_dev);
 
-	if (matchn)
+	if (unlikely((unsigned long)matchn))
 		do_handle_create(matchn, old_dentry, mnt);
 	write_unlock(&gr_inode_lock);
 
 	return error;
 }
 
-/* The following variables are needed for timer manipulation */
-static struct timer_list gr_badpw;
-static int failures = 0;
-static int during_wait = 0;
+static int
+lookup_special_role_auth(const char *rolename, unsigned char **salt,
+			 unsigned char **sum)
+{
+	struct acl_role_label *r;
+	struct role_allowed_ip *ipp;
+	struct role_transition *trans;
+	__u16 i;
+	int found = 0;
+
+	/* check transition table */
+
+	for (trans = current->role->transitions; trans; trans = trans->next) {
+		if (!strcmp(rolename, trans->rolename)) {
+			found = 1;
+			break;
+		}
+	}
+
+	if (!found)
+		return 0;
+
+	/* handle special roles that do not require authentication 
+	   and check ip */
+
+	for (r = role_list_head; r; r = r->next) {
+		if (!strcmp(rolename, r->rolename) &&
+		    (r->roletype & GR_ROLE_SPECIAL)) {
+			found = 0;
+			if (r->allowed_ips != NULL) {
+				for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
+					if ((ntohl(current->curr_ip) & ipp->netmask) ==
+					     (ntohl(ipp->addr) & ipp->netmask))
+						found = 1;
+				}
+			} else
+				found = 2;
+			if (!found)
+				return 0;
+
+			if (r->roletype & GR_ROLE_NOPW) {
+				*salt = NULL;
+				*sum = NULL;
+				return 1;
+			}
+		}
+	}
+
+	for (i = 0; i < num_sprole_pws; i++) {
+		if (!strcmp(rolename, acl_special_roles[i]->rolename)) {
+			*salt = acl_special_roles[i]->salt;
+			*sum = acl_special_roles[i]->sum;
+			return 1;
+		}
+	}
+
+	return 0;
+}
 
 static void
-gr_timer(unsigned long ignored)
+assign_special_role(char *rolename)
 {
-	failures = 0;
-	during_wait = 0;
-	del_timer(&gr_badpw);
+	struct acl_object_label *obj;
+	struct acl_role_label *r;
+	struct acl_role_label *assigned = NULL;
+	struct task_struct *tsk;
+	struct file *filp;
+
+	for (r = role_list_head; r; r = r->next)
+		if (!strcmp(rolename, r->rolename) &&
+		    (r->roletype & GR_ROLE_SPECIAL))
+			assigned = r;
+
+	if (!assigned)
+		return;
+
+	read_lock(&tasklist_lock);
+	read_lock(&grsec_exec_file_lock);
+	tsk = current->p_pptr;
+	if (tsk == NULL) {
+		read_unlock(&grsec_exec_file_lock);
+		read_unlock(&tasklist_lock);
+		return;
+	}
 
+	filp = tsk->exec_file;
+	if (filp == NULL) {
+		read_unlock(&grsec_exec_file_lock);
+		read_unlock(&tasklist_lock);
+		return;
+	}
+
+	tsk->is_writable = 0;
+
+	acl_sp_role_value = (acl_sp_role_value % 65535) + 1;
+	tsk->acl_sp_role = 1;
+	tsk->acl_role_id = acl_sp_role_value;
+	tsk->role = assigned;
+	tsk->acl = chk_subj_label(filp->f_dentry, filp->f_vfsmnt, tsk->role);
+
+	/* ignore additional mmap checks for processes that are writable 
+	   by the default ACL */
+	obj = chk_obj_label(filp->f_dentry, filp->f_vfsmnt, default_role->root_label);
+	if (unlikely(obj->mode & GR_WRITE))
+		tsk->is_writable = 1;
+	obj = chk_obj_label(filp->f_dentry, filp->f_vfsmnt, tsk->role->root_label);
+	if (unlikely(obj->mode & GR_WRITE))
+		tsk->is_writable = 1;
+
+#ifdef CONFIG_GRKERNSEC_ACL_DEBUG
+	printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename, tsk->acl->filename, tsk->comm, tsk->pid);
+#endif
+
+	read_unlock(&grsec_exec_file_lock);
+	read_unlock(&tasklist_lock);
 	return;
 }
 
-int
-gr_proc_handler(ctl_table * table, int write, struct file *filp, void *buffer,
-		size_t * lenp)
+ssize_t
+write_grsec_handler(struct file *file, const char * buf, size_t count, loff_t *ppos)
 {
-	struct gr_arg *arg;
-	struct gr_arg usermode;
-	int error = sizeof (struct gr_arg);
+	struct gr_arg_wrapper uwrap;
+	unsigned char *sprole_salt;
+	unsigned char *sprole_sum;
+	int error = sizeof (struct gr_arg_wrapper);
 	int error2 = 0;
 
-	if (!write)
-		return -EPERM;
+	down(&gr_dev_sem);
+
+	if (count != sizeof (struct gr_arg_wrapper)) {
+		security_alert_good(GR_DEV_ACL_MSG, (int)count,
+				    (int) sizeof (struct gr_arg_wrapper));
+		error = -EINVAL;
+		goto out;
+	}
 
-	down(&gr_proc_sem);
+	if ((gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES)
+	    && time_before_eq(gr_auth_expires, jiffies)) {
+		gr_auth_expires = 0;
+		gr_auth_attempts = 0;
+	}
 
-	arg = (struct gr_arg *) buffer;
+	if (copy_from_user(&uwrap, buf, sizeof (struct gr_arg_wrapper))) {
+		error = -EFAULT;
+		goto out;
+	}
 
-	if (*lenp != sizeof (struct gr_arg)) {
-		security_alert_good(GR_PROC_ACL_MSG, (int) *lenp,
-				    (int) sizeof (struct gr_arg));
+	if ((uwrap.version != GRSECURITY_VERSION) || (uwrap.size != sizeof(struct gr_arg))) {
 		error = -EINVAL;
 		goto out;
 	}
-	if (during_wait) {
+
+	if (copy_from_user(gr_usermode, uwrap.arg, sizeof (struct gr_arg))) {
+		error = -EFAULT;
+		goto out;
+	}
+
+	if (gr_usermode->mode != SPROLE && time_after(gr_auth_expires, jiffies)) {
 		error = -EBUSY;
 		goto out;
 	}
 
-	if (copy_from_user(&usermode, arg, sizeof (struct gr_arg))) {
-		error = -EFAULT;
+	/* if non-root trying to do anything other than use a special role,
+	   do not attempt authentication, do not count towards authentication
+	   locking
+	 */
+
+	if (gr_usermode->mode != SPROLE && current->uid) {
+		error = -EPERM;
 		goto out;
 	}
 
-	/* ensure pw is null terminated */
+	/* ensure pw and special role name are null terminated */
 
-	usermode.pw[GR_PW_LEN - 1] = '\0';
+	gr_usermode->pw[GR_PW_LEN - 1] = '\0';
+	gr_usermode->sp_role[GR_SPROLE_LEN - 1] = '\0';
 
 	/* Okay. 
 	 * We have our enough of the argument structure..(we have yet
 	 * to copy_from_user the tables themselves) . Copy the tables
 	 * only if we need them, i.e. for loading operations. */
 
-	switch (usermode.mode) {
+	switch (gr_usermode->mode) {
+	case STATUS:
+			if (gr_status & GR_READY)
+				error = 1;
+			else
+				error = 2;
+			goto out;
 	case SHUTDOWN:
-		if ((gr_status & GR_READY) && !(chkpw(&usermode, gr_pwent))) {
+		if ((gr_status & GR_READY)
+		    && !(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
 			gr_status &= ~GR_READY;
 			security_alert_good(GR_SHUTS_ACL_MSG, DEFAULTSECARGS);
 			free_variables();
-			memset(&usermode, 0, sizeof (struct gr_arg));
-			memset(gr_pwent, 0, sizeof (struct admin_pw));
+			memset(gr_usermode, 0, sizeof (struct gr_arg));
+			memset(gr_system_salt, 0, GR_SALT_LEN);
+			memset(gr_system_sum, 0, GR_SHA_LEN);
 		} else if (gr_status & GR_READY) {
 			security_alert(GR_SHUTF_ACL_MSG, DEFAULTSECARGS);
 			error = -EPERM;
@@ -1457,7 +2785,7 @@ gr_proc_handler(ctl_table * table, int w
 		}
 		break;
 	case ENABLE:
-		if (!(gr_status & GR_READY) && !(error2 = gracl_init(&usermode)))
+		if (!(gr_status & GR_READY) && !(error2 = gracl_init(gr_usermode)))
 			security_alert_good(GR_ENABLE_ACL_MSG, GR_VERSION);
 		else {
 			if (gr_status & GR_READY)
@@ -1472,11 +2800,11 @@ gr_proc_handler(ctl_table * table, int w
 		if (!(gr_status & GR_READY)) {
 			security_alert_good(GR_RELOADI_ACL_MSG);
 			error = -EAGAIN;
-		} else if (!(chkpw(&usermode, gr_pwent))) {
+		} else if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
 			lock_kernel();
 			gr_status &= ~GR_READY;
 			free_variables();
-			if (!(error2 = gracl_init(&usermode))) {
+			if (!(error2 = gracl_init(gr_usermode))) {
 				unlock_kernel();
 				security_alert_good(GR_RELOAD_ACL_MSG,
 						    GR_VERSION);
@@ -1500,53 +2828,93 @@ gr_proc_handler(ctl_table * table, int w
 			break;
 		}
 
-		if (!(chkpw(&usermode, gr_pwent))) {
+		if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
 			security_alert_good(GR_SEGVMODS_ACL_MSG,
 					    DEFAULTSECARGS);
-			if (usermode.segv_device && usermode.segv_inode) {
+			if (gr_usermode->segv_device && gr_usermode->segv_inode) {
 				struct acl_subject_label *segvacl;
 				segvacl =
-				    lookup_acl_subj_label(usermode.segv_inode,
-							  usermode.segv_device);
+				    lookup_acl_subj_label(gr_usermode->segv_inode,
+							  gr_usermode->segv_device,
+							  current->role);
 				if (segvacl) {
 					segvacl->crashes = 0;
 					segvacl->expires = 0;
 				}
-			} else if (gr_find_uid(usermode.segv_uid) >= 0) {
-				gr_remove_uid(usermode.segv_uid);
+			} else if (gr_find_uid(gr_usermode->segv_uid) >= 0) {
+				gr_remove_uid(gr_usermode->segv_uid);
 			}
 		} else {
 			security_alert(GR_SEGVMODF_ACL_MSG, DEFAULTSECARGS);
 			error = -EPERM;
 		}
 		break;
-	case GOD:
+	case SPROLE:
 		if (unlikely(!(gr_status & GR_READY))) {
-			security_alert_good(GR_ADMINI_ACL_MSG, DEFAULTSECARGS);
+			security_alert_good(GR_SPROLEI_ACL_MSG, DEFAULTSECARGS);
 			error = -EAGAIN;
 			break;
 		}
 
-		if (!(chkpw(&usermode, gr_pwent))) {
-			acl_admin_value = (acl_admin_value % 255) + 1;
-			security_alert_good(GR_ADMINS_ACL_MSG, acl_admin_value,
-					    DEFAULTSECARGS);
-			read_lock(&tasklist_lock);
-			if (current->p_pptr) {
-				current->p_pptr->acl =
-				    (struct acl_subject_label *) god_label;
-				current->p_pptr->acl_admin = 1;
-				current->p_pptr->acl_admin_id = acl_admin_value;
-			}
-			read_unlock(&tasklist_lock);
+		if ((current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES)
+		    && time_before_eq(current->role->expires, jiffies)) {
+			current->role->expires = 0;
+			current->role->auth_attempts = 0;
+		}
+
+		if (time_after(current->role->expires, jiffies)) {
+			error = -EBUSY;
+			goto out;
+		}
+
+		if (lookup_special_role_auth
+		    (gr_usermode->sp_role, &sprole_salt, &sprole_sum)
+		    && ((!sprole_salt && !sprole_sum)
+			|| !(chkpw(gr_usermode, sprole_salt, sprole_sum)))) {
+			assign_special_role(gr_usermode->sp_role);
+			security_alert_good(GR_SPROLES_ACL_MSG,
+					    (current->p_pptr) ? current->
+					    p_pptr->role->rolename : "",
+					    acl_sp_role_value, DEFAULTSECARGS);
 		} else {
-			security_alert(GR_ADMINF_ACL_MSG, DEFAULTSECARGS);
+			security_alert(GR_SPROLEF_ACL_MSG, gr_usermode->sp_role,
+				       DEFAULTSECARGS);
 			error = -EPERM;
+			current->role->auth_attempts++;
+			if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES) {
+				current->role->expires =
+				    jiffies + CONFIG_GRKERNSEC_ACL_TIMEOUT * HZ;
+				security_alert(GR_MAXROLEPW_ACL_MSG,
+				       CONFIG_GRKERNSEC_ACL_MAXTRIES,
+				       gr_usermode->sp_role, DEFAULTSECARGS);
+			}
+
+			goto out;
+		}
+		break;
+	case UNSPROLE:
+		if (unlikely(!(gr_status & GR_READY))) {
+			security_alert_good(GR_UNSPROLEI_ACL_MSG, DEFAULTSECARGS);
+			error = -EAGAIN;
+			break;
 		}
 
+		if (current->role->roletype & GR_ROLE_SPECIAL) {
+			security_alert_good(GR_UNSPROLES_ACL_MSG,
+					    (current->p_pptr) ? current->
+					    p_pptr->role->rolename : "",
+					    (current->p_pptr) ? current->
+					    p_pptr->acl_role_id : 0, DEFAULTSECARGS);
+			gr_set_acls(1);
+		} else {
+			security_alert(GR_UNSPROLEF_ACL_MSG, current->role->rolename,
+				       DEFAULTSECARGS);
+			error = -EPERM;
+			goto out;
+		}
 		break;
 	default:
-		security_alert(GR_INVMODE_ACL_MSG, usermode.mode,
+		security_alert(GR_INVMODE_ACL_MSG, gr_usermode->mode,
 			       DEFAULTSECARGS);
 		error = -EINVAL;
 		break;
@@ -1555,47 +2923,63 @@ gr_proc_handler(ctl_table * table, int w
 	if (error != -EPERM)
 		goto out;
 
-	failures++;
+	gr_auth_attempts++;
 
-	if (failures > CONFIG_GRKERNSEC_ACL_MAXTRIES) {
+	if (gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES) {
 		security_alert(GR_MAXPW_ACL_MSG, CONFIG_GRKERNSEC_ACL_MAXTRIES);
-		init_timer(&gr_badpw);
-		gr_badpw.data = 0;
-		gr_badpw.function = gr_timer;
-		gr_badpw.expires = jiffies + CONFIG_GRKERNSEC_ACL_TIMEOUT * HZ;
-		add_timer(&gr_badpw);
-		during_wait = 1;
+		gr_auth_expires = jiffies + CONFIG_GRKERNSEC_ACL_TIMEOUT * HZ;
 	}
 
       out:
-	up(&gr_proc_sem);
+	up(&gr_dev_sem);
 	return error;
 }
 
 int
 gr_set_acls(const int type)
 {
+	struct acl_object_label *obj;
 	struct task_struct *task;
 	struct file *filp;
 	unsigned short i;
 
 	read_lock(&tasklist_lock);
+	read_lock(&grsec_exec_file_lock);
 	for_each_task(task) {
 		/* check to see if we're called from the exit handler,
 		   if so, only replace ACLs that have inherited the admin
 		   ACL */
-		if (type && task->acl_admin_id != current->acl_admin_id)
+
+		if (type && (task->role != current->role ||
+			     task->acl_role_id != current->acl_role_id))
 			continue;
 
-		task->acl_admin_id = 0;
+		task->acl_role_id = 0;
+		task->acl_sp_role = 0;
 
 		if ((filp = task->exec_file)) {
+			do_set_role_label(task, task->uid, task->gid);
+
 			task->acl =
-			    chk_subj_label(filp->f_dentry, filp->f_vfsmnt);
+			    chk_subj_label(filp->f_dentry, filp->f_vfsmnt,
+					   task->role);
 			if (task->acl) {
 				struct acl_subject_label *curr;
 				curr = task->acl;
 
+				task->is_writable = 0;
+				/* ignore additional mmap checks for processes that are writable 
+				   by the default ACL */
+				obj = chk_obj_label(filp->f_dentry, filp->f_vfsmnt, default_role->root_label);
+				if (unlikely(obj->mode & GR_WRITE))
+					task->is_writable = 1;
+				obj = chk_obj_label(filp->f_dentry, filp->f_vfsmnt, task->role->root_label);
+				if (unlikely(obj->mode & GR_WRITE))
+					task->is_writable = 1;
+
+#ifdef CONFIG_GRKERNSEC_ACL_DEBUG
+				printk(KERN_ALERT "gr_set_acls for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
+#endif
 				if (!(curr->mode & GR_LEARN))
 					for (i = 0; i < RLIM_NLIMITS; i++) {
 						if (!(curr->resmask & (1 << i)))
@@ -1607,6 +2991,7 @@ gr_set_acls(const int type)
 						    curr->res[i].rlim_max;
 					}
 			} else {
+				read_unlock(&grsec_exec_file_lock);
 				read_unlock(&tasklist_lock);
 				security_alert_good(GR_DEFACL_MSG, task->comm,
 						    task->pid);
@@ -1614,12 +2999,14 @@ gr_set_acls(const int type)
 			}
 		} else {
 			// it's a kernel process
+			task->role = kernel_role;
+			task->acl = kernel_role->root_label;
 #ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
-			kernel_label->mode &= ~GR_FIND;
+			task->acl->mode &= ~GR_FIND;
 #endif
-			task->acl = kernel_label;
 		}
 	}
+	read_unlock(&grsec_exec_file_lock);
 	read_unlock(&tasklist_lock);
 	return 0;
 }
@@ -1693,8 +3080,8 @@ gr_learn_resource(const struct task_stru
 		if (wanted > acl->res[res].rlim_max)
 			acl->res[res].rlim_max = res_add;
 
-		security_learn(GR_LEARN_AUDIT_MSG, acl->device,
-			       (unsigned long) acl->inode,
+		security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
+			       task->role->roletype, acl->filename,
 			       acl->res[res].rlim_cur, acl->res[res].rlim_max,
 			       "", (unsigned long) res);
 	}
@@ -1712,7 +3099,8 @@ gr_handle_sysctl(const struct ctl_table 
 	struct proc_dir_entry *tmp;
 	struct nameidata nd;
 	const char *proc_sys = "/proc/sys";
-	char *path = gr_shared_page[smp_processor_id()];
+	char *path = gr_shared_page[0][smp_processor_id()];
+	struct acl_object_label *obj;
 	unsigned short len = 0, pos = 0, depth = 0, i;
 	__u32 err = 0;
 	__u32 mode = 0;
@@ -1762,9 +3150,8 @@ gr_handle_sysctl(const struct ctl_table 
 	if (err)
 		goto out;
 
-	err =
-	    chk_obj_label(nd.dentry, nd.mnt,
-			  mode | to_gr_audit(mode) | GR_SUPPRESS, current->acl);
+	obj = chk_obj_label(nd.dentry, nd.mnt, current->acl);
+	err = obj->mode & (mode | to_gr_audit(mode) | GR_SUPPRESS);
 
 	if (unlikely((current->acl->mode & GR_LEARN) && ((err & mode) != mode))) {
 		__u32 new_mode = mode;
@@ -1772,7 +3159,8 @@ gr_handle_sysctl(const struct ctl_table 
 		new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
 
 		err = new_mode;
-		gr_log_learn(current->acl, nd.dentry, nd.mnt, path, new_mode);
+		gr_log_learn(current->role, current->uid, current->gid,
+			     current, path, new_mode);
 	} else if ((err & mode) != mode && !(err & GR_SUPPRESS)) {
 		security_alert(GR_SYSCTL_ACL_MSG, "denied", path,
 			       (mode & GR_READ) ? " reading" : "",
@@ -1796,21 +3184,88 @@ gr_handle_sysctl(const struct ctl_table 
 #endif
 
 int
-gr_handle_ptrace(struct task_struct *task, const long request)
+gr_handle_proc_ptrace(struct task_struct *task)
 {
-	__u32 retmode;
 	struct file *filp;
+	struct task_struct *tmp = task;
+	struct task_struct *curtemp = current;
+	__u32 retmode;
 
 	if (unlikely(!(gr_status & GR_READY)))
 		return 0;
 
+	read_lock(&tasklist_lock);
+	read_lock(&grsec_exec_file_lock);
 	filp = task->exec_file;
 
-	if (!filp)
+	while (tmp->pid > 0) {
+		if (tmp == curtemp)
+			break;
+		tmp = tmp->p_pptr;
+	}
+
+	if (!filp || (tmp->pid == 0 && !(current->acl->mode & GR_RELAXPTRACE))) {
+		read_unlock(&grsec_exec_file_lock);
+		read_unlock(&tasklist_lock);
+		return 1;
+	}
+
+	retmode = gr_search_file(filp->f_dentry, GR_NOPTRACE, filp->f_vfsmnt);
+	read_unlock(&grsec_exec_file_lock);
+	read_unlock(&tasklist_lock);
+
+	if (retmode & GR_NOPTRACE)
+		return 1;
+
+	if (!(current->acl->mode & GR_OVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
+	    && (current->acl != task->acl || (current->acl != current->role->root_label
+	    && current->pid != task->pid)))
+		return 1;
+
+	return 0;
+}
+
+int
+gr_handle_ptrace(struct task_struct *task, const long request)
+{
+	struct task_struct *tmp = task;
+	struct task_struct *curtemp = current;
+	__u32 retmode;
+
+	if (unlikely(!(gr_status & GR_READY)))
+		return 0;
+
+	read_lock(&tasklist_lock);
+	while (tmp->pid > 0) {
+		if (tmp == curtemp)
+			break;
+		tmp = tmp->p_pptr;
+	}
+	read_unlock(&tasklist_lock);
+
+	if (tmp->pid == 0 && !(current->acl->mode & GR_RELAXPTRACE)) {
+		security_alert(GR_PTRACE_ACL_MSG, task->exec_file ? 
+			       gr_to_filename(task->exec_file->f_dentry, task->exec_file->f_vfsmnt)
+			       : "(none)", task->comm, task->pid, 
+			       DEFAULTSECARGS);
+		return 1;
+	}
+
+	read_lock(&grsec_exec_file_lock);
+	if (unlikely(!task->exec_file)) {
+		read_unlock(&grsec_exec_file_lock);
 		return 0;
+	}
 
-	retmode = gr_search_file(filp->f_dentry, GR_PTRACERD, filp->f_vfsmnt);
+	retmode = gr_search_file(task->exec_file->f_dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_vfsmnt);
+	read_unlock(&grsec_exec_file_lock);
 
+	if (retmode & GR_NOPTRACE) {
+		security_alert(GR_PTRACE_ACL_MSG, gr_to_filename(task->exec_file->f_dentry, task->exec_file->f_vfsmnt),
+			       task->comm, task->pid, DEFAULTSECARGS);
+		return 1;
+	}
+		
 	if (retmode & GR_PTRACERD) {
 		switch (request) {
 		case PTRACE_POKETEXT:
@@ -1831,41 +3286,11 @@ gr_handle_ptrace(struct task_struct *tas
 			return 0;
 		}
 	} else if (!(current->acl->mode & GR_OVERRIDE) &&
-		   (current->acl != god_label) && (task->acl != current->acl ||
-						   (current->acl != root_label
-						    && current->pid !=
-						    task->pid))) {
+		   !(current->role->roletype & GR_ROLE_GOD) &&
+		   (current->acl != task->acl)) {
 		security_alert(GR_PTRACE_ACL_MSG,
-			       gr_to_filename(filp->f_dentry, filp->f_vfsmnt),
-			       task->comm, task->pid, DEFAULTSECARGS);
-		return 1;
-	}
-
-	return 0;
-}
-
-int
-gr_handle_ptrace_exec(const struct dentry *dentry, const struct vfsmount *mnt)
-{
-	__u32 retmode;
-	struct acl_subject_label *subj;
-
-	if (unlikely(!(gr_status & GR_READY)))
-		return 0;
-
-	if (unlikely
-	    ((current->ptrace & PT_PTRACED)
-	     && !(current->acl->mode & GR_OVERRIDE)))
-		retmode = gr_search_file(dentry, GR_PTRACERD, mnt);
-	else
-		return 0;
-
-	subj = chk_subj_label(dentry, mnt);
-
-	if (!(retmode & GR_PTRACERD) && (current->acl != god_label) &&
-	    (current->acl != subj)) {
-		security_alert(GR_PTRACE_EXEC_ACL_MSG,
-			       gr_to_filename(dentry, mnt), DEFAULTSECARGS);
+			       gr_to_filename(task->exec_file->f_dentry, task->exec_file->f_vfsmnt),
+					      task->comm, task->pid, DEFAULTSECARGS);
 		return 1;
 	}
 
@@ -1875,24 +3300,20 @@ gr_handle_ptrace_exec(const struct dentr
 int
 gr_handle_mmap(const struct file *filp, const unsigned long prot)
 {
-	struct file *exec_file;
+	struct acl_object_label *obj, *obj2;
 
 	if (unlikely(!(gr_status & GR_READY) ||
 		     (current->acl->mode & GR_OVERRIDE) || !filp ||
 		     !(prot & PROT_EXEC)))
 		return 0;
 
-	exec_file = current->exec_file;
-
-	if (!exec_file)
-		return 1;
-
-	/* ignore processes that are writable by the default ACL */
-	if (chk_obj_label
-	    (exec_file->f_dentry, exec_file->f_vfsmnt, GR_WRITE, root_label))
+	if (unlikely(current->is_writable))
 		return 0;
 
-	if (chk_obj_label(filp->f_dentry, filp->f_vfsmnt, GR_WRITE, root_label)) {
+	obj = chk_obj_label(filp->f_dentry, filp->f_vfsmnt, default_role->root_label);
+	obj2 = chk_obj_label(filp->f_dentry, filp->f_vfsmnt,
+			     current->role->root_label);
+	if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
 		security_alert(GR_WRITLIB_ACL_MSG,
 			       gr_to_filename(filp->f_dentry, filp->f_vfsmnt),
 			       DEFAULTSECARGS);
@@ -1907,7 +3328,7 @@ gr_acl_handle_mmap(const struct file *fi
 {
 	__u32 mode;
 
-	if (!file || !(prot & PROT_EXEC))
+	if (unlikely(!file || !(prot & PROT_EXEC)))
 		return 1;
 
 	mode =
@@ -1915,14 +3336,14 @@ gr_acl_handle_mmap(const struct file *fi
 			   GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
 			   file->f_vfsmnt);
 
-	if (!gr_tpe_allow(file) || (!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
+	if (unlikely(!gr_tpe_allow(file) || (!(mode & GR_EXEC) && !(mode & GR_SUPPRESS)))) {
 		security_alert(GR_MMAP_ACL_MSG, "denied",
 			       gr_to_filename(file->f_dentry, file->f_vfsmnt),
 			       DEFAULTSECARGS);
 		return 0;
-	} else if (!gr_tpe_allow(file) || !(mode & GR_EXEC)) {
+	} else if (unlikely(!gr_tpe_allow(file) || !(mode & GR_EXEC))) {
 		return 0;
-	} else if (mode & GR_EXEC && mode & GR_AUDIT_EXEC) {
+	} else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
 		security_audit(GR_MMAP_ACL_MSG, "successful",
 			       gr_to_filename(file->f_dentry, file->f_vfsmnt),
 			       DEFAULTSECARGS);
@@ -1937,7 +3358,7 @@ gr_acl_handle_mprotect(const struct file
 {
 	__u32 mode;
 
-	if (!file || !(prot & PROT_EXEC))
+	if (unlikely(!file || !(prot & PROT_EXEC)))
 		return 1;
 
 	mode =
@@ -1945,14 +3366,14 @@ gr_acl_handle_mprotect(const struct file
 			   GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
 			   file->f_vfsmnt);
 
-	if (!gr_tpe_allow(file) || (!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
+	if (unlikely(!gr_tpe_allow(file) || (!(mode & GR_EXEC) && !(mode & GR_SUPPRESS)))) {
 		security_alert(GR_MPROTECT_ACL_MSG, "denied",
 			       gr_to_filename(file->f_dentry, file->f_vfsmnt),
 			       DEFAULTSECARGS);
 		return 0;
-	} else if (!gr_tpe_allow(file) || !(mode & GR_EXEC)) {
+	} else if (unlikely(!gr_tpe_allow(file) || !(mode & GR_EXEC))) {
 		return 0;
-	} else if (mode & GR_EXEC && mode & GR_AUDIT_EXEC) {
+	} else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
 		security_audit(GR_MPROTECT_ACL_MSG, "successful",
 			       gr_to_filename(file->f_dentry, file->f_vfsmnt),
 			       DEFAULTSECARGS);
@@ -1996,14 +3417,15 @@ gr_acl_handle_psacct(struct task_struct 
 	cputime -= cmin * 60;
 	csec = cputime;
 
-	security_audit(GR_ACL_PROCACCT_MSG, task->comm,
+	security_audit(GR_ACL_PROCACCT_MSG, gr_task_fullpath(task), task->comm,
 		       task->pid, NIPQUAD(task->curr_ip), tty_name(task->tty,
 								   cur_tty),
 		       task->uid, task->euid, task->gid, task->egid, wday, whr,
 		       wmin, wsec, cday, chr, cmin, csec,
 		       (task->
 			flags & PF_SIGNALED) ? "killed by signal" : "exited",
-		       code, task->p_pptr->comm, task->p_pptr->pid,
+		       code, gr_parent_task_fullpath(task), 
+		       task->p_pptr->comm, task->p_pptr->pid,
 		       NIPQUAD(task->p_pptr->curr_ip),
 		       tty_name(task->p_pptr->tty, parent_tty),
 		       task->p_pptr->uid, task->p_pptr->euid, task->p_pptr->gid,
@@ -2014,8 +3436,9 @@ gr_acl_handle_psacct(struct task_struct 
 
 void gr_set_kernel_label(struct task_struct *task)
 {
-	if (gr_status & GR_READY)
-		task->acl = kernel_label;
-
+	if (gr_status & GR_READY) {
+		task->role = kernel_role;
+		task->acl = kernel_role->root_label;
+	}
 	return;
 }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/gracl_cap.c linux-2.4.20-wolk4.16-fullkernel/grsecurity/gracl_cap.c
--- linux-2.4.20-wolk4.15-fullkernel/grsecurity/gracl_cap.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/grsecurity/gracl_cap.c	2004-09-05 17:09:43.000000000 +0200
@@ -40,28 +40,48 @@ static const char *captab_log[29] = {
 };
 
 int
-gr_is_capable(const int cap)
+gr_task_is_capable(struct task_struct *task, const int cap)
 {
 	struct acl_subject_label *curracl;
+	__u32 cap_drop = 0, cap_mask = 0;
 
 	if (!gr_acl_is_enabled())
 		return 1;
 
-	curracl = current->acl;
+	curracl = task->acl;
 
-	if (!cap_raised(curracl->cap_lower, cap))
+	cap_drop = curracl->cap_lower;
+	cap_mask = curracl->cap_mask;
+
+	while ((curracl = curracl->parent_subject)) {
+		if (!(cap_mask & (1 << cap)) && (curracl->cap_mask & (1 << cap)))
+			cap_drop |= curracl->cap_lower & (1 << cap);
+		cap_mask |= curracl->cap_mask;
+	}
+
+	if (!cap_raised(cap_drop, cap))
 		return 1;
 
+	curracl = task->acl;
+
 	if ((curracl->mode & GR_LEARN)
-	    && cap_raised(current->cap_effective, cap)) {
-		security_learn(GR_LEARN_AUDIT_MSG, curracl->device,
-			       curracl->inode, 0UL, 0UL, "",
-			       (unsigned long) cap);
+	    && cap_raised(task->cap_effective, cap)) {
+		security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
+			       task->role->roletype, task->uid,
+			       task->gid, task->exec_file ?
+			       gr_to_filename(task->exec_file->f_dentry,
+			       task->exec_file->f_vfsmnt) : curracl->filename,
+			       curracl->filename, 0UL,
+			       0UL, "", (unsigned long) cap, NIPQUAD(task->curr_ip));
 		return 1;
 	}
 
-	if ((cap >= 0) && (cap < 29) && cap_raised(current->cap_effective, cap))
-		security_alert(GR_CAP_ACL_MSG, captab_log[cap], DEFAULTSECARGS);
+	if ((cap >= 0) && (cap < 29) && cap_raised(task->cap_effective, cap))
+		security_alert(GR_CAP_ACL_MSG, captab_log[cap], 
+				gr_task_fullpath(task), task->comm, task->pid, task->uid, task->euid, 
+				task->gid, task->egid, gr_parent_task_fullpath(task), 
+				task->p_pptr->comm, task->p_pptr->pid, task->p_pptr->uid, 
+				task->p_pptr->euid, task->p_pptr->gid, task->p_pptr->egid);
 
 	return 0;
 }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/gracl_fs.c linux-2.4.20-wolk4.16-fullkernel/grsecurity/gracl_fs.c
--- linux-2.4.20-wolk4.15-fullkernel/grsecurity/gracl_fs.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/grsecurity/gracl_fs.c	2004-09-05 17:09:43.000000000 +0200
@@ -3,6 +3,7 @@
 #include <linux/types.h>
 #include <linux/fs.h>
 #include <linux/file.h>
+#include <linux/stat.h>
 #include <linux/grsecurity.h>
 #include <linux/grinternal.h>
 #include <linux/gracl.h>
@@ -25,7 +26,8 @@ gr_acl_handle_hidden_file(const struct d
 		return mode;
 	} else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
 		security_alert(GR_HIDDEN_ACL_MSG, "denied",
-			       gr_to_filename(dentry, mnt), DEFAULTSECARGS);
+			       gr_to_filename(dentry, mnt),
+			       DEFAULTSECARGS);
 		return 0;
 	} else if (unlikely(!(mode & GR_FIND)))
 		return 0;
@@ -43,11 +45,11 @@ gr_acl_handle_open(const struct dentry *
 	if (unlikely(!dentry->d_inode))
 		return reqmode;
 
-	if (fmode & O_APPEND)
+	if (unlikely(fmode & O_APPEND))
 		reqmode |= GR_APPEND;
-	else if (fmode & FMODE_WRITE)
+	else if (unlikely(fmode & FMODE_WRITE))
 		reqmode |= GR_WRITE;
-	if ((fmode & FMODE_READ) && !(fmode & O_DIRECTORY))
+	if (likely((fmode & FMODE_READ) && !(fmode & O_DIRECTORY)))
 		reqmode |= GR_READ;
 
 	mode =
@@ -80,22 +82,25 @@ gr_acl_handle_open(const struct dentry *
 __u32
 gr_acl_handle_creat(const struct dentry * dentry,
 		    const struct dentry * p_dentry,
-		    const struct vfsmount * p_mnt, const int fmode)
+		    const struct vfsmount * p_mnt, const int fmode,
+		    const int imode)
 {
-	__u32 reqmode = GR_WRITE;
+	__u32 reqmode = GR_WRITE | GR_CREATE;
 	__u32 mode;
 
-	if (fmode & O_APPEND)
+	if (unlikely(fmode & O_APPEND))
 		reqmode |= GR_APPEND;
-	if ((fmode & FMODE_READ) && !(fmode & O_DIRECTORY))
+	if (unlikely((fmode & FMODE_READ) && !(fmode & O_DIRECTORY)))
 		reqmode |= GR_READ;
+	if (unlikely((fmode & O_CREAT) && (imode & (S_ISUID | S_ISGID))))
+		reqmode |= GR_SETID;
 
 	mode =
 	    gr_check_create(dentry, p_dentry, p_mnt,
 			    reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
 
 	if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
-		security_audit(GR_OPEN_ACL_MSG, "successful",
+		security_audit(GR_CREATE_ACL_MSG, "successful",
 			       gr_to_filename(dentry, p_mnt),
 			       reqmode & GR_READ ? " reading" : "",
 			       reqmode & GR_WRITE ? " writing" :
@@ -105,7 +110,7 @@ gr_acl_handle_creat(const struct dentry 
 	} else
 	    if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
 	{
-		security_alert(GR_OPEN_ACL_MSG, "denied",
+		security_alert(GR_CREATE_ACL_MSG, "denied",
 			       gr_to_filename(dentry, p_mnt),
 			       reqmode & GR_READ ? " reading" : "",
 			       reqmode & GR_WRITE ? " writing" : reqmode &
@@ -181,13 +186,13 @@ gr_acl_handle_access(const struct dentry
 __u32
 gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
 {
-	generic_fs_handler(dentry, mnt, GR_WRITE, GR_RMDIR_ACL_MSG);
+	generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
 }
 
 __u32
 gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
 {
-	generic_fs_handler(dentry, mnt, GR_WRITE, GR_UNLINK_ACL_MSG);
+	generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
 }
 
 __u32
@@ -203,15 +208,30 @@ gr_acl_handle_utime(const struct dentry 
 }
 
 __u32
-gr_acl_handle_fchmod(const struct dentry *dentry, const struct vfsmount *mnt)
+gr_acl_handle_fchmod(const struct dentry *dentry, const struct vfsmount *mnt,
+		     mode_t mode)
 {
-	generic_fs_handler(dentry, mnt, GR_WRITE, GR_FCHMOD_ACL_MSG);
+	if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode)))
+		return 1;
+
+	if (unlikely((mode != (mode_t)-1) && (mode & (S_ISUID | S_ISGID)))) {
+		generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
+				   GR_FCHMOD_ACL_MSG);
+	} else {
+		generic_fs_handler(dentry, mnt, GR_WRITE, GR_FCHMOD_ACL_MSG);
+	}
 }
 
 __u32
-gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt)
+gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
+		    mode_t mode)
 {
-	generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
+	if (unlikely((mode != (mode_t)-1) && (mode & (S_ISUID | S_ISGID)))) {
+		generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
+				   GR_CHMOD_ACL_MSG);
+	} else {
+		generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
+	}
 }
 
 __u32
@@ -237,14 +257,14 @@ __u32
 gr_acl_handle_filldir(const struct dentry *dentry, const struct vfsmount *mnt,
 		      const ino_t ino)
 {
-	if (dentry->d_inode) {
+	if (likely((unsigned long)(dentry->d_inode))) {
 		struct dentry d = *dentry;
 		struct inode inode = *(dentry->d_inode);
 
 		inode.i_ino = ino;
 		d.d_inode = &inode;
 
-		if (!gr_search_file(&d, GR_FIND | GR_NOLEARN, mnt))
+		if (unlikely(!gr_search_file(&d, GR_FIND | GR_NOLEARN, mnt)))
 			return 0;
 	}
 
@@ -258,26 +278,27 @@ gr_acl_handle_link(const struct dentry *
 		   const struct dentry * old_dentry,
 		   const struct vfsmount * old_mnt, const char *to)
 {
+	__u32 needmode = GR_WRITE | GR_CREATE;
 	__u32 mode;
 
 	mode =
 	    gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
 			  old_mnt);
 
-	if (unlikely(mode & GR_WRITE && mode & GR_AUDIT_WRITE)) {
+	if (unlikely(((mode & needmode) == needmode) && mode & GR_AUDITS)) {
 		security_audit(GR_LINK_ACL_MSG, "successful",
 			       gr_to_filename(old_dentry, old_mnt), to,
 			       DEFAULTSECARGS);
 		return mode;
-	} else if (unlikely(!(mode & GR_WRITE) && !(mode & GR_SUPPRESS))) {
+	} else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
 		security_alert(GR_LINK_ACL_MSG, "denied",
 			       gr_to_filename(old_dentry, old_mnt), to,
 			       DEFAULTSECARGS);
 		return 0;
-	} else if (unlikely(!(mode & GR_WRITE)))
+	} else if (unlikely((mode & needmode) != needmode))
 		return 0;
 
-	return GR_WRITE;
+	return (GR_WRITE | GR_CREATE);
 }
 
 __u32
@@ -285,26 +306,28 @@ gr_acl_handle_symlink(const struct dentr
 		      const struct dentry * parent_dentry,
 		      const struct vfsmount * parent_mnt, const char *from)
 {
+	__u32 needmode = GR_WRITE | GR_CREATE;
 	__u32 mode;
 
 	mode =
 	    gr_check_create(new_dentry, parent_dentry, parent_mnt,
+			    GR_CREATE | GR_AUDIT_CREATE |
 			    GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
 
-	if (unlikely(mode & GR_WRITE && mode & GR_AUDIT_WRITE)) {
+	if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
 		security_audit(GR_SYMLINK_ACL_MSG, "successful",
 			       from, gr_to_filename(new_dentry, parent_mnt),
 			       DEFAULTSECARGS);
 		return mode;
-	} else if (unlikely(!(mode & GR_WRITE) && !(mode & GR_SUPPRESS))) {
+	} else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
 		security_alert(GR_SYMLINK_ACL_MSG, "denied",
 			       from, gr_to_filename(new_dentry, parent_mnt),
 			       DEFAULTSECARGS);
 		return 0;
-	} else if (unlikely(!(mode & GR_WRITE)))
+	} else if (unlikely((mode & needmode) != needmode))
 		return 0;
 
-	return GR_WRITE;
+	return (GR_WRITE | GR_CREATE);
 }
 
 #define generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt, reqmode, fmt) \
@@ -332,10 +355,15 @@ gr_acl_handle_symlink(const struct dentr
 __u32
 gr_acl_handle_mknod(const struct dentry * new_dentry,
 		    const struct dentry * parent_dentry,
-		    const struct vfsmount * parent_mnt)
+		    const struct vfsmount * parent_mnt,
+		    const int mode)
 {
+	__u32 reqmode = GR_WRITE | GR_CREATE;
+	if (unlikely(mode & (S_ISUID | S_ISGID)))
+		reqmode |= GR_SETID;
+
 	generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
-				  GR_WRITE, GR_MKNOD_ACL_MSG);
+				  reqmode, GR_MKNOD_ACL_MSG);
 }
 
 __u32
@@ -344,7 +372,7 @@ gr_acl_handle_mkdir(const struct dentry 
 		    const struct vfsmount *parent_mnt)
 {
 	generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
-				  GR_WRITE, GR_MKDIR_ACL_MSG);
+				  GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
 }
 
 #define RENAME_CHECK_SUCCESS(old, new) \
@@ -370,18 +398,22 @@ gr_acl_handle_rename(struct dentry *new_
 		gr_replace = 0;
 
 		comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
-					GR_READ | GR_WRITE | GR_AUDIT_READ |
-					GR_AUDIT_WRITE | GR_SUPPRESS);
+					GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
+					GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
 		comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
+				       GR_DELETE | GR_AUDIT_DELETE |
 				       GR_AUDIT_READ | GR_AUDIT_WRITE |
 				       GR_SUPPRESS, old_mnt);
 	} else {
 		comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
+				       GR_CREATE | GR_DELETE |
+				       GR_AUDIT_CREATE | GR_AUDIT_DELETE |
 				       GR_AUDIT_READ | GR_AUDIT_WRITE |
 				       GR_SUPPRESS, parent_mnt);
 		comp2 =
 		    gr_search_file(old_dentry,
 				   GR_READ | GR_WRITE | GR_AUDIT_READ |
+				   GR_DELETE | GR_AUDIT_DELETE |
 				   GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
 	}
 
@@ -411,17 +443,25 @@ gr_acl_handle_rename(struct dentry *new_
 void
 gr_acl_handle_exit(void)
 {
-	u8 id;
-	if (unlikely(current->acl_admin && gr_acl_is_enabled())) {
-		id = current->acl_admin_id;
+	u16 id;
+	char *rolename;
+	struct file *exec_file;
+
+	if (unlikely(current->acl_sp_role && gr_acl_is_enabled())) {
+		id = current->acl_role_id;
+		rolename = current->role->rolename;
 		gr_set_acls(1);
-		security_alert_good(GR_ADMINL_ACL_MSG, id, DEFAULTSECARGS);
+		security_alert_good(GR_SPROLEL_ACL_MSG,
+				    rolename, id, DEFAULTSECARGS);
 	}
 
-	if (current->exec_file) {
-		fput(current->exec_file);
-		current->exec_file = NULL;
-	}
+	write_lock(&grsec_exec_file_lock);
+	exec_file = current->exec_file;
+	current->exec_file = NULL;
+	write_unlock(&grsec_exec_file_lock);
+
+	if (exec_file)
+		fput(exec_file);
 }
 
 int
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/gracl_ip.c linux-2.4.20-wolk4.16-fullkernel/grsecurity/gracl_ip.c
--- linux-2.4.20-wolk4.15-fullkernel/grsecurity/gracl_ip.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/grsecurity/gracl_ip.c	2004-09-05 17:09:43.000000000 +0200
@@ -25,6 +25,58 @@
 #define GR_BIND 	0x01
 #define GR_CONNECT 	0x02
 
+static const char * gr_protocols[256] = {
+	"ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
+	"egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
+	"chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
+	"trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
+	"merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
+	"il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
+	"mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
+	"tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
+	"sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
+	"cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak", 
+	"iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf", 
+	"eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
+	"scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
+	"aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
+	"vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
+	"uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
+	"sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
+	"unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
+	"unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
+	"unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
+	"unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
+	"unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
+	"unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
+	"unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
+	"unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
+	"unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
+	"unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
+	"unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
+	"unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
+	"unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
+	"unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
+	"unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
+	};
+
+static const char * gr_socktypes[11] = {
+	"unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6", 
+	"unknown:7", "unknown:8", "unknown:9", "packet"
+	};
+
+__inline__ const char *
+gr_proto_to_name(unsigned char proto)
+{
+	return gr_protocols[proto];
+}
+
+__inline__ const char *
+gr_socktype_to_name(unsigned char type)
+{
+	return gr_socktypes[type];
+}
+
 int
 gr_search_socket(const int domain, const int type, const int protocol)
 {
@@ -52,20 +104,31 @@ gr_search_socket(const int domain, const
 		   bind/connect, so we'll fake a bind learn log */
 		if (type == SOCK_RAW || type == SOCK_PACKET) {
 			__u32 fakeip = 0;
-			security_learn(GR_IP_LEARN_MSG, curr->device,
-				       curr->inode, NIPQUAD(fakeip), 0, type,
-				       protocol, GR_CONNECT);
+			security_learn(GR_IP_LEARN_MSG, current->role->rolename,
+				       current->role->roletype, current->uid,
+				       current->gid, current->exec_file ?
+				       gr_to_filename(current->exec_file->f_dentry,
+				       current->exec_file->f_vfsmnt) :
+				       curr->filename, curr->filename,
+				       NIPQUAD(fakeip), 0, type,
+				       protocol, GR_CONNECT, NIPQUAD(current->curr_ip));
 		} else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
 			__u32 fakeip = 0;
-			security_learn(GR_IP_LEARN_MSG, curr->device,
-				       curr->inode, NIPQUAD(fakeip), 0, type,
-				       protocol, GR_BIND);
+			security_learn(GR_IP_LEARN_MSG, current->role->rolename,
+				       current->role->roletype, current->uid,
+				       current->gid, current->exec_file ?
+				       gr_to_filename(current->exec_file->f_dentry,
+				       current->exec_file->f_vfsmnt) :
+				       curr->filename, curr->filename,
+				       NIPQUAD(fakeip), 0, type,
+				       protocol, GR_BIND, NIPQUAD(current->curr_ip));
 		}
 		/* we'll log when they use connect or bind */
 		goto exit;
 	}
 
-	security_alert(GR_SOCK_MSG, domain, type, protocol, DEFAULTSECARGS);
+	security_alert(GR_SOCK_MSG, "inet", gr_socktype_to_name(type),
+		       gr_proto_to_name(protocol), DEFAULTSECARGS);
 
 	return 0;
       exit:
@@ -107,18 +170,25 @@ gr_search_connectbind(const int mode, co
 	}
 
 	if (curr->mode & GR_LEARN) {
-		security_learn(GR_IP_LEARN_MSG, curr->device, curr->inode,
+		security_learn(GR_IP_LEARN_MSG, current->role->rolename,
+			       current->role->roletype, current->uid,
+			       current->gid, current->exec_file ?
+			       gr_to_filename(current->exec_file->f_dentry,
+			       current->exec_file->f_vfsmnt) :
+			       curr->filename, curr->filename,
 			       NIPQUAD(ip_addr), ip_port, type,
-			       sk->protocol, mode);
+			       sk->protocol, mode, NIPQUAD(current->curr_ip));
 		return 1;
 	}
 
 	if (mode == GR_BIND)
-		security_alert(GR_BIND_ACL_MSG, NIPQUAD(ip_addr), ip_port, type,
-			       sk->protocol, DEFAULTSECARGS);
+		security_alert(GR_BIND_ACL_MSG, NIPQUAD(ip_addr), ip_port,
+			       gr_socktype_to_name(type), gr_proto_to_name(sk->protocol),
+			       DEFAULTSECARGS);
 	else if (mode == GR_CONNECT)
 		security_alert(GR_CONNECT_ACL_MSG, NIPQUAD(ip_addr), ip_port,
-			       type, sk->protocol, DEFAULTSECARGS);
+			       gr_socktype_to_name(type), gr_proto_to_name(sk->protocol),
+			       DEFAULTSECARGS);
 
 	return 0;
 }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/gracl_learn.c linux-2.4.20-wolk4.16-fullkernel/grsecurity/gracl_learn.c
--- linux-2.4.20-wolk4.15-fullkernel/grsecurity/gracl_learn.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/grsecurity/gracl_learn.c	2004-09-05 17:09:43.000000000 +0200
@@ -0,0 +1,170 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/sched.h>
+#include <linux/poll.h>
+#include <linux/smp_lock.h>
+#include <linux/string.h>
+#include <linux/file.h>
+#include <linux/types.h>
+#include <linux/vmalloc.h>
+#include <linux/grinternal.h>
+
+extern ssize_t write_grsec_handler(struct file * file, const char * buf,
+				   size_t count, loff_t *ppos);
+extern int gr_acl_is_enabled(void);
+
+static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
+static int gr_learn_attached;
+
+/* use a 1MB buffer */
+#define LEARN_BUFFER_SIZE (1024 * 1024)
+
+static spinlock_t gr_learn_lock = SPIN_LOCK_UNLOCKED;
+static char *learn_buffer;
+static int learn_buffer_len;
+
+static ssize_t
+read_learn(struct file *file, char * buf, size_t count, loff_t * ppos)
+{
+	DECLARE_WAITQUEUE(wait, current);
+	ssize_t retval = 0;
+
+	add_wait_queue(&learn_wait, &wait);
+	set_current_state(TASK_INTERRUPTIBLE);
+	do {
+		spin_lock(&gr_learn_lock);
+		if (learn_buffer_len)
+			break;
+		spin_unlock(&gr_learn_lock);
+
+		if (file->f_flags & O_NONBLOCK) {
+			retval = -EAGAIN;
+			goto out;
+		}
+		if (signal_pending(current)) {
+			retval = -ERESTARTSYS;
+			goto out;
+		}
+
+		schedule();
+	} while (1);
+
+	if (copy_to_user(buf, learn_buffer, learn_buffer_len)) {
+		retval = -EFAULT;
+		spin_unlock(&gr_learn_lock);
+		goto out;
+	}
+
+	retval = learn_buffer_len;
+	learn_buffer_len = 0;
+
+	spin_unlock(&gr_learn_lock);
+out:
+	set_current_state(TASK_RUNNING);
+	remove_wait_queue(&learn_wait, &wait);
+	return retval;
+}
+
+static unsigned int
+poll_learn(struct file * file, poll_table * wait)
+{
+	poll_wait(file, &learn_wait, wait);
+
+	if (learn_buffer_len)
+		return (POLLIN | POLLRDNORM);
+
+	return 0;
+}
+
+void
+gr_clear_learn_entries(void)
+{
+	spin_lock(&gr_learn_lock);
+	learn_buffer_len = 0;
+	if (learn_buffer != NULL) {
+		vfree(learn_buffer);
+		learn_buffer = NULL;
+	}
+	spin_unlock(&gr_learn_lock);
+
+	return;
+}
+
+void
+gr_add_learn_entry(const char *fmt, ...)
+{
+	va_list args;
+	unsigned int len;
+
+	if (!gr_learn_attached)
+		return;
+
+	spin_lock(&gr_learn_lock);
+
+	/* leave a gap at the end so we know when it's "full" but don't have to
+	   compute the exact length of the string we're trying to append
+	*/
+	if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
+		spin_unlock(&gr_learn_lock);
+		wake_up_interruptible(&learn_wait);
+		return;
+	}
+	if (learn_buffer == NULL) {
+		spin_unlock(&gr_learn_lock);
+		return;
+	}
+
+	va_start(args, fmt);
+	len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
+	va_end(args);
+
+	learn_buffer_len += len + 1;
+
+	spin_unlock(&gr_learn_lock);
+	wake_up_interruptible(&learn_wait);
+
+	return;
+}
+
+static int
+open_learn(struct inode *inode, struct file *file)
+{
+	if (file->f_mode & FMODE_READ && gr_learn_attached)
+		return -EBUSY;
+	if (file->f_mode & FMODE_READ) {
+		spin_lock(&gr_learn_lock);
+		if (learn_buffer == NULL)
+			learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
+		if (learn_buffer == NULL)
+			return -ENOMEM;
+		learn_buffer_len = 0;
+		gr_learn_attached = 1;
+		spin_unlock(&gr_learn_lock);
+	}
+	return 0;
+}
+
+static int
+close_learn(struct inode *inode, struct file *file)
+{
+	if (file->f_mode & FMODE_READ) {
+		spin_lock(&gr_learn_lock);
+		if (learn_buffer != NULL) {
+			vfree(learn_buffer);
+			learn_buffer = NULL;
+		}
+		learn_buffer_len = 0;
+		gr_learn_attached = 0;
+		spin_unlock(&gr_learn_lock);
+	}
+
+	return 0;
+}
+		
+struct file_operations grsec_fops = {
+	read:		read_learn,
+	write:		write_grsec_handler,
+	open:		open_learn,
+	release:	close_learn,
+	poll:		poll_learn,
+};
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/gracl_res.c linux-2.4.20-wolk4.16-fullkernel/grsecurity/gracl_res.c
--- linux-2.4.20-wolk4.15-fullkernel/grsecurity/gracl_res.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/grsecurity/gracl_res.c	2004-09-05 17:09:43.000000000 +0200
@@ -40,10 +40,15 @@ gr_log_resource(const struct task_struct
 		      (!gt && wanted >= task->rlim[res].rlim_cur)) &&
 		     task->rlim[res].rlim_cur != RLIM_INFINITY))
 		security_alert(GR_RESOURCE_MSG, wanted, restab_log[res],
-			       task->rlim[res].rlim_cur, task->comm,
+			       task->rlim[res].rlim_cur,
+			       gr_task_fullpath(task), task->comm,
 			       task->pid, task->uid, task->euid,
-			       task->p_pptr->comm, task->p_pptr->pid,
-			       task->p_pptr->uid, task->p_pptr->euid);
+			       task->gid, task->egid,
+			       gr_parent_task_fullpath(task),
+			       task->p_pptr->comm,
+			       task->p_pptr->pid, task->p_pptr->uid, 
+			       task->p_pptr->euid, task->p_pptr->gid,
+			       task->p_pptr->egid);
 
 	preempt_enable_no_resched();
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/gracl_segv.c linux-2.4.20-wolk4.16-fullkernel/grsecurity/gracl_segv.c
--- linux-2.4.20-wolk4.15-fullkernel/grsecurity/gracl_segv.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/grsecurity/gracl_segv.c	2004-09-05 17:09:43.000000000 +0200
@@ -27,8 +27,9 @@ static struct crash_uid *uid_set;
 static unsigned short uid_used;
 static rwlock_t gr_uid_lock = RW_LOCK_UNLOCKED;
 extern rwlock_t gr_inode_lock;
-extern __inline__ struct acl_subject_label *lookup_acl_subj_label(ino_t inode,
-								  kdev_t dev);
+extern struct acl_subject_label *
+	lookup_acl_subj_label(const ino_t inode, const kdev_t dev,
+			      struct acl_role_label *role);
 
 int
 gr_init_uidset(void)
@@ -214,12 +215,16 @@ gr_handle_crash(struct task_struct *task
 		curr->expires = jiffies + curr->res[GR_CRASH_RES].rlim_max;
 
 	if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
-	    (time_after(curr->expires, jiffies))) {
+	    time_after(curr->expires, jiffies)) {
 		if (task->uid && proc_is_setxid(task)) {
-			security_alert(GR_SEGVSTART_ACL_MSG, task->comm,
+			security_alert(GR_SEGVSTART_ACL_MSG,
+				       gr_task_fullpath(task), task->comm,
 				       task->pid, task->uid, task->euid,
+				       task->gid, task->egid,
+				       gr_parent_task_fullpath(task),
 				       task->p_pptr->comm, task->p_pptr->pid,
 				       task->p_pptr->uid, task->p_pptr->euid,
+				       task->p_pptr->gid, task->p_pptr->egid,
 				       task->uid,
 				       curr->res[GR_CRASH_RES].rlim_max / HZ);
 			write_lock(&gr_uid_lock);
@@ -234,10 +239,14 @@ gr_handle_crash(struct task_struct *task
 			}
 			read_unlock(&tasklist_lock);
 		} else {
-			security_alert(GR_SEGVNOSUID_ACL_MSG, task->comm,
+			security_alert(GR_SEGVNOSUID_ACL_MSG,
+				       gr_task_fullpath(task), task->comm,
 				       task->pid, task->uid, task->euid,
+				       task->gid, task->egid,
+				       gr_parent_task_fullpath(task),
 				       task->p_pptr->comm, task->p_pptr->pid,
 				       task->p_pptr->uid, task->p_pptr->euid,
+				       task->p_pptr->gid, task->p_pptr->egid,
 				       kdevname(curr->device), curr->inode,
 				       curr->res[GR_CRASH_RES].rlim_max / HZ);
 			read_lock(&tasklist_lock);
@@ -267,7 +276,8 @@ gr_check_crash_exec(const struct file *f
 
 	read_lock(&gr_inode_lock);
 	curr = lookup_acl_subj_label(filp->f_dentry->d_inode->i_ino,
-				     filp->f_dentry->d_inode->i_dev);
+				     filp->f_dentry->d_inode->i_dev,
+				     current->role);
 	read_unlock(&gr_inode_lock);
 
 	if (!curr || !(curr->resmask & (1 << GR_CRASH_RES)) ||
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_chroot.c linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_chroot.c
--- linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_chroot.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_chroot.c	2004-09-05 17:09:43.000000000 +0200
@@ -23,11 +23,17 @@ gr_handle_chroot_unix(const pid_t pid)
 
 	for (p = *htable; p && p->pid != pid; p = p->pidhash_next) ;
 
-	if (unlikely(p && !have_same_root(current, p))) {
-		read_unlock(&tasklist_lock);
-		security_alert(GR_UNIX_CHROOT_MSG, DEFAULTSECARGS);
-		return 0;
+	if (p) {
+		task_lock(p);
+		if (!have_same_root(current, p)) {
+			task_unlock(p);
+			read_unlock(&tasklist_lock);
+			security_alert(GR_UNIX_CHROOT_MSG, DEFAULTSECARGS);
+			return 0;
+		}
+		task_unlock(p);
 	}
+
 	read_unlock(&tasklist_lock);
 #endif
 	return 1;
@@ -60,37 +66,104 @@ gr_handle_chroot_setpriority(struct task
 }
 
 int
-gr_handle_chroot_capset(const struct task_struct *target)
+gr_handle_chroot_capset(struct task_struct *target)
 {
 #ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
-	if (grsec_enable_chroot_caps && proc_is_chrooted(current) &&
-	    !have_same_root(current, target)) {
-		security_alert(GR_CAPSET_CHROOT_MSG, target->comm,
-			       target->pid, DEFAULTSECARGS);
+	if (!grsec_enable_chroot_caps || !proc_is_chrooted(current))
+		return 0;
+	task_lock(target);
+	if (!have_same_root(current, target)) {
+		task_unlock(target);
+		security_alert(GR_CAPSET_CHROOT_MSG, target->comm, target->pid,
+			       DEFAULTSECARGS);
 		return 1;
 	}
+	task_unlock(target);
+#endif
+	return 0;
+}
+
+int
+gr_handle_chroot_rawio(const struct inode *inode)
+{
+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
+	if (grsec_enable_chroot_caps && proc_is_chrooted(current) && 
+	    inode && S_ISBLK(inode->i_mode) && !capable(CAP_SYS_RAWIO))
+		return 1;
 #endif
 	return 0;
 }
 
 int
-gr_pid_is_chrooted(const struct task_struct *p)
+gr_pid_is_chrooted(struct task_struct *p)
 {
 #ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
-	if (!grsec_enable_chroot_findtask || (current->pid <= 1))
+	if (!grsec_enable_chroot_findtask || !current->fs || 
+	    !proc_is_chrooted(current) || !p)
 		return 0;
 
-	if (p && p->fs && p->fs->root && p->fs->root->d_inode &&
-	    child_reaper && child_reaper->fs && child_reaper->fs->root &&
-	    child_reaper->fs->root->d_inode && current && current->fs &&
-	    current->fs->root && current->fs->root->d_inode) {
-		if (proc_is_chrooted(current) && !have_same_root(current, p))
-			return 1;
+	task_lock(p);
+	if (p->fs && !have_same_root(current, p)) {
+		task_unlock(p);
+		return 1;
 	}
+	task_unlock(p);
 #endif
 	return 0;
 }
 
+#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
+int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
+{
+	struct dentry *dentry = (struct dentry *)u_dentry;
+	struct vfsmount *mnt = (struct vfsmount *)u_mnt;
+	struct dentry *realroot;
+	struct vfsmount *realrootmnt;
+	struct dentry *currentroot;
+	struct vfsmount *currentmnt;
+
+	read_lock(&child_reaper->fs->lock);
+	realrootmnt = mntget(child_reaper->fs->rootmnt);
+	realroot = dget(child_reaper->fs->root);
+	read_unlock(&child_reaper->fs->lock);
+
+	read_lock(&current->fs->lock);
+	currentmnt = mntget(current->fs->rootmnt);
+	currentroot = dget(current->fs->root);
+	read_unlock(&current->fs->lock);
+
+	spin_lock(&dcache_lock);
+	for (;;) {
+		if (unlikely((dentry == realroot && mnt == realrootmnt)
+		     || (dentry == currentroot && mnt == currentmnt)))
+			break;
+		if (unlikely(dentry == mnt->mnt_root || IS_ROOT(dentry))) {
+			if (mnt->mnt_parent == mnt)
+				break;
+			dentry = mnt->mnt_mountpoint;
+			mnt = mnt->mnt_parent;
+			continue;
+		}
+		dentry = dentry->d_parent;
+	}
+	spin_unlock(&dcache_lock);
+
+	dput(currentroot);
+	mntput(currentmnt);
+
+	if (dentry == realroot && mnt == realrootmnt) {
+		/* access is outside of chroot */
+		dput(realroot);
+		mntput(realrootmnt);
+		return 0;
+	}
+
+	dput(realroot);
+	mntput(realrootmnt);
+	return 1;
+}
+#endif
+
 int
 gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
 {
@@ -100,59 +173,11 @@ gr_chroot_fchdir(struct dentry *u_dentry
 
 	if (!proc_is_chrooted(current))
 		return 1;
-	else {
-		struct dentry *dentry = u_dentry;
-		struct vfsmount *mnt = u_mnt;
-		struct dentry *realroot;
-		struct vfsmount *realrootmnt;
-		struct dentry *currentroot;
-		struct vfsmount *currentmnt;
-
-		read_lock(&child_reaper->fs->lock);
-		realrootmnt = mntget(child_reaper->fs->rootmnt);
-		realroot = dget(child_reaper->fs->root);
-		read_unlock(&child_reaper->fs->lock);
-
-		read_lock(&current->fs->lock);
-		currentmnt = mntget(current->fs->rootmnt);
-		currentroot = dget(current->fs->root);
-		read_unlock(&current->fs->lock);
-
-		spin_lock(&dcache_lock);
-		for (;;) {
-			if (unlikely
-			    ((dentry == realroot && mnt == realrootmnt)
-			     || (dentry == currentroot && mnt == currentmnt)))
-				break;
-			if (unlikely
-			    (dentry == mnt->mnt_root || IS_ROOT(dentry))) {
-				if (mnt->mnt_parent == mnt)
-					break;
-				dentry = mnt->mnt_mountpoint;
-				mnt = mnt->mnt_parent;
-				continue;
-			}
-			dentry = dentry->d_parent;
-		}
-		spin_unlock(&dcache_lock);
-
-		dput(currentroot);
-		mntput(currentmnt);
-
-		if (dentry == realroot && mnt == realrootmnt) {
-			/* ok, they're definitely trying to fchdir outside of the
-			   chroot. */
-			dput(realroot);
-			mntput(realrootmnt);
-			security_alert(GR_CHROOT_FCHDIR_MSG,
-				       gr_to_filename(u_dentry, u_mnt),
-				       DEFAULTSECARGS);
-			return 0;
-		} else {
-			dput(realroot);
-			mntput(realrootmnt);
-			return 1;
-		}
+	else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
+		security_alert(GR_CHROOT_FCHDIR_MSG,
+			       gr_to_filename(u_dentry, u_mnt),
+			       DEFAULTSECARGS);
+		return 0;
 	}
 #endif
 	return 1;
@@ -177,22 +202,30 @@ gr_chroot_shmat(const pid_t shm_cprid, c
 
 	for (p = *htable; p && p->pid != shm_cprid; p = p->pidhash_next) ;
 
-	if (unlikely(p && !have_same_root(current, p) &&
-		     (p->start_time < shm_createtime))) {
-		read_unlock(&tasklist_lock);
-		security_alert(GR_SHMAT_CHROOT_MSG, DEFAULTSECARGS);
-		return 0;
-	}
-
-	if (unlikely(!p)) {
+	if (p) {
+		task_lock(p);
+		if (!have_same_root(current, p) &&
+		    (p->start_time < shm_createtime)) {
+			task_unlock(p);
+			read_unlock(&tasklist_lock);
+			security_alert(GR_SHMAT_CHROOT_MSG, DEFAULTSECARGS);
+			return 0;
+		}
+		task_unlock(p);
+	} else {
 		htable = &pidhash[pid_hashfn(shm_lapid)];
 		for (p = *htable; p && p->pid != shm_lapid;
 		     p = p->pidhash_next) ;
 
-		if (unlikely(p && !have_same_root(current, p))) {
-			read_unlock(&tasklist_lock);
-			security_alert(GR_SHMAT_CHROOT_MSG, DEFAULTSECARGS);
-			return 0;
+		if (p) {
+			task_lock(p);
+			if (!have_same_root(current, p)) {
+				task_unlock(p);
+				read_unlock(&tasklist_lock);
+				security_alert(GR_SHMAT_CHROOT_MSG, DEFAULTSECARGS);
+				return 0;
+			}
+			task_unlock(p);
 		}
 	}
 
@@ -217,7 +250,7 @@ gr_handle_chroot_mknod(const struct dent
 		       const struct vfsmount *mnt, const int mode)
 {
 #ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
-	if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) &&
+	if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
 	    proc_is_chrooted(current)) {
 		security_alert(GR_MKNOD_CHROOT_MSG,
 			       gr_to_filename(dentry, mnt), DEFAULTSECARGS);
@@ -234,8 +267,7 @@ gr_handle_chroot_mount(const struct dent
 #ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
 	if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
 		security_alert(GR_MOUNT_CHROOT_MSG, dev_name,
-			       gr_to_filename(dentry, mnt),
-			       DEFAULTSECARGS);
+			       gr_to_filename(dentry, mnt), DEFAULTSECARGS);
 		return -EPERM;
 	}
 #endif
@@ -258,7 +290,8 @@ int
 gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
 {
 #ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
-	if (grsec_enable_chroot_double && proc_is_chrooted(current)) {
+	if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
+	    !gr_is_outside_chroot(dentry, mnt)) {
 		security_alert(GR_CHROOT_CHROOT_MSG,
 			       gr_to_filename(dentry, mnt), DEFAULTSECARGS);
 		return -EPERM;
@@ -310,7 +343,7 @@ gr_handle_chroot_chmod(const struct dent
 {
 #ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
 	if (grsec_enable_chroot_chmod &&
-	    ((mode & S_ISUID) || (mode & S_ISGID)) &&
+	    ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
 	    proc_is_chrooted(current)) {
 		security_alert(GR_CHMOD_CHROOT_MSG,
 			       gr_to_filename(dentry, mnt), DEFAULTSECARGS);
@@ -319,3 +352,4 @@ gr_handle_chroot_chmod(const struct dent
 #endif
 	return 0;
 }
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_disabled.c linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_disabled.c
--- linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_disabled.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_disabled.c	2004-09-05 17:09:43.000000000 +0200
@@ -10,75 +10,82 @@
 #include <linux/kdev_t.h>
 #include <linux/net.h>
 #include <linux/in.h>
-#include <linux/skbuff.h>
 #include <linux/ip.h>
+#include <linux/skbuff.h>
 #include <linux/sysctl.h>
-#include <linux/grdefs.h>
+
+#ifdef CONFIG_GRKERNSEC_PAX_HAVE_ACL_FLAGS
+__inline__ void
+pax_set_flags(struct linux_binprm *bprm)
+{
+	return;
+}
+#endif
 
 #ifdef CONFIG_SYSCTL
-__u32
+__inline__ __u32
 gr_handle_sysctl(const struct ctl_table * table, const void *oldval, const void *newval)
 {
-	__u32 mode = 0;
-	if (oldval)
-		mode |= GR_READ;
-	if (newval)
-		mode |= GR_WRITE;
-
- 	return mode;
+	return 1;
 }
 #endif
 
-int
+__inline__ int
 gr_acl_is_enabled(void)
 {
 	return 0;
 }
 
-void
+__inline__ int
+gr_handle_rawio(const struct inode *inode)
+{
+	return 0;
+}
+
+__inline__ void
 gr_acl_handle_psacct(struct task_struct *task, const long code)
 {
 	return;
 }
 
-int
-gr_handle_ptrace_exec(const struct dentry *dentry, const struct vfsmount *mnt)
+__inline__ int
+gr_handle_mmap(const struct file *filp, const unsigned long prot)
 {
 	return 0;
 }
 
-int
-gr_handle_mmap(const struct file *filp, const unsigned long prot)
+__inline__ int
+gr_handle_ptrace(struct task_struct *task, const long request)
 {
 	return 0;
 }
 
-int
-gr_handle_ptrace(struct task_struct *task, const long request)
+__inline__ int
+gr_handle_proc_ptrace(struct task_struct *task)
 {
 	return 0;
 }
 
-void
+__inline__ void
 gr_learn_resource(const struct task_struct *task,
 		  const int res, const unsigned long wanted, const int gt)
 {
 	return;
 }
 
-int
+__inline__ int
 gr_set_acls(const int type)
 {
 	return 0;
 }
 
-int
+__inline__ int
 gr_check_hidden_task(const struct task_struct *tsk)
 {
 	return 0;
 }
 
-int
+__inline__ int
 gr_check_protected_task(const struct task_struct *task)
 {
 	return 0;
@@ -90,49 +97,49 @@ gr_copy_label(struct task_struct *tsk)
 	return;
 }
 
-void
+__inline__ void
 gr_set_pax_flags(struct task_struct *task)
 {
 	return;
 }
 
-void
+__inline__ int
 gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt)
 {
-	return;
+	return 0;
 }
 
-void
+__inline__ void
 gr_handle_delete(const ino_t ino, const kdev_t dev)
 {
 	return;
 }
 
-void
+__inline__ void
 gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
 {
 	return;
 }
 
-void
+__inline__ void
 gr_handle_crash(struct task_struct *task, const int sig)
 {
 	return;
 }
 
-int
+__inline__ int
 gr_check_crash_exec(const struct file *filp)
 {
 	return 0;
 }
 
-int
+__inline__ int
 gr_check_crash_uid(const uid_t uid)
 {
 	return 0;
 }
 
-int
+__inline__ int
 gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
 		 struct dentry *old_dentry,
 		 struct dentry *new_dentry,
@@ -141,123 +148,126 @@ gr_handle_rename(struct inode *old_dir, 
 	return 0;
 }
 
-int
+__inline__ int
 gr_search_socket(const int family, const int type, const int protocol)
 {
 	return 1;
 }
 
-int
+__inline__ int
 gr_search_connectbind(const int mode, const struct socket *sock,
 		      const struct sockaddr_in *addr)
 {
 	return 1;
 }
 
-int
-gr_is_capable(const int cap)
+__inline__ int
+gr_task_is_capable(struct task_struct *task, const int cap)
 {
 	return 1;
 }
 
-void
+__inline__ void
 gr_handle_alertkill(void)
 {
 	return;
 }
 
-__u32
+__inline__ __u32
 gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
 {
 	return 1;
 }
 
-__u32
+__inline__ __u32
 gr_acl_handle_hidden_file(const struct dentry * dentry,
 			  const struct vfsmount * mnt)
 {
 	return 1;
 }
 
-__u32
+__inline__ __u32
 gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
 		   const int fmode)
 {
 	return 1;
 }
 
-__u32
+__inline__ __u32
 gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
 {
 	return 1;
 }
 
-__u32
+__inline__ __u32
 gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
 {
 	return 1;
 }
 
-int
+__inline__ int
 gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
 		   unsigned int *vm_flags)
 {
 	return 1;
 }
 
-__u32
+__inline__ __u32
 gr_acl_handle_truncate(const struct dentry * dentry,
 		       const struct vfsmount * mnt)
 {
 	return 1;
 }
 
-__u32
+__inline__ __u32
 gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
 {
 	return 1;
 }
 
-__u32
+__inline__ __u32
 gr_acl_handle_access(const struct dentry * dentry,
 		     const struct vfsmount * mnt, const int fmode)
 {
 	return 1;
 }
 
-__u32
-gr_acl_handle_fchmod(const struct dentry * dentry, const struct vfsmount * mnt)
+__inline__ __u32
+gr_acl_handle_fchmod(const struct dentry * dentry, const struct vfsmount * mnt,
+		     mode_t mode)
 {
 	return 1;
 }
 
-__u32
-gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt)
+__inline__ __u32
+gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
+		    mode_t mode)
 {
 	return 1;
 }
 
-__u32
+__inline__ __u32
 gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
 {
 	return 1;
 }
 
-void
+__inline__ void
 grsecurity_init(void)
 {
 	return;
 }
 
-__u32
+__inline__ __u32
 gr_acl_handle_mknod(const struct dentry * new_dentry,
 		    const struct dentry * parent_dentry,
-		    const struct vfsmount * parent_mnt)
+		    const struct vfsmount * parent_mnt,
+		    const int mode)
 {
 	return 1;
 }
 
-__u32
+__inline__ __u32
 gr_acl_handle_mkdir(const struct dentry * new_dentry,
 		    const struct dentry * parent_dentry,
 		    const struct vfsmount * parent_mnt)
@@ -265,7 +275,7 @@ gr_acl_handle_mkdir(const struct dentry 
 	return 1;
 }
 
-__u32
+__inline__ __u32
 gr_acl_handle_symlink(const struct dentry * new_dentry,
 		      const struct dentry * parent_dentry,
 		      const struct vfsmount * parent_mnt, const char *from)
@@ -273,7 +283,7 @@ gr_acl_handle_symlink(const struct dentr
 	return 1;
 }
 
-__u32
+__inline__ __u32
 gr_acl_handle_link(const struct dentry * new_dentry,
 		   const struct dentry * parent_dentry,
 		   const struct vfsmount * parent_mnt,
@@ -283,7 +293,7 @@ gr_acl_handle_link(const struct dentry *
 	return 1;
 }
 
-int
+__inline__ int
 gr_acl_handle_rename(const struct dentry *new_dentry,
 		     const struct dentry *parent_dentry,
 		     const struct vfsmount *parent_mnt,
@@ -294,78 +304,98 @@ gr_acl_handle_rename(const struct dentry
 	return 1;
 }
 
-__u32
+__inline__ __u32
 gr_acl_handle_filldir(const struct dentry * dentry,
 		      const struct vfsmount * mnt, const ino_t ino)
 {
 	return 1;
 }
 
-int
+__inline__ int
 gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
 		const time_t shm_createtime, const uid_t cuid, const int shmid)
 {
 	return 1;
 }
 
-int
+__inline__ int
 gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
 {
 	return 1;
 }
 
-int
+__inline__ int
 gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
 {
 	return 1;
 }
 
-__u32
+__inline__ __u32
 gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
 {
 	return 1;
 }
 
-__u32
+__inline__ __u32
 gr_acl_handle_creat(const struct dentry * dentry,
 		    const struct dentry * p_dentry,
-		    const struct vfsmount * p_mnt, const int fmode)
+		    const struct vfsmount * p_mnt, const int fmode,
+		    const int imode)
 {
 	return 1;
 }
 
-void
+__inline__ void
 gr_acl_handle_exit(void)
 {
 	return;
 }
 
-int
+__inline__ int
 gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
 {
 	return 1;
 }
 
-int
+__inline__ void
+gr_set_role_label(const uid_t uid, const gid_t gid)
+{
+	return;
+}
+
+__inline__ int
 gr_acl_handle_procpidmem(const struct task_struct *task)
 {
 	return 0;
 }
 
-int
+__inline__ int
 gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
 {
 	return 1;
 }
 
-int
+__inline__ int
 gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
 {
 	return 1;
 }
 
-void
+__inline__ void
 gr_set_kernel_label(struct task_struct *task)
 {
 	return;
 }
+
+__inline__ int
+gr_check_user_change(int real, int effective, int fs)
+{
+	return 0;
+}
+
+__inline__ int
+gr_check_group_change(int real, int effective, int fs)
+{
+	return 0;
+}
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_init.c linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_init.c
--- linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_init.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_init.c	2004-09-05 17:09:43.000000000 +0200
@@ -4,6 +4,7 @@
 #include <linux/smp_lock.h>
 #include <linux/gracl.h>
 #include <linux/slab.h>
+#include <linux/vmalloc.h>
 
 int grsec_enable_link;
 int grsec_enable_dmesg;
@@ -57,40 +58,42 @@ spinlock_t grsec_alert_lock = SPIN_LOCK_
 unsigned long grsec_alert_wtime = 0;
 unsigned long grsec_alert_fyet = 0;
 
-spinlock_t grsec_alertgood_lock = SPIN_LOCK_UNLOCKED;
-unsigned long grsec_alertgood_wtime = 0;
-unsigned long grsec_alertgood_fyet = 0;
-
 spinlock_t grsec_audit_lock = SPIN_LOCK_UNLOCKED;
-spinlock_t grsec_learn_lock = SPIN_LOCK_UNLOCKED;
 
-char *gr_shared_page[NR_CPUS];
-extern struct admin_pw *gr_pwent;
+rwlock_t grsec_exec_file_lock = RW_LOCK_UNLOCKED;
+
+char *gr_shared_page[4][NR_CPUS];
+extern struct gr_arg *gr_usermode;
+extern unsigned char *gr_system_salt;
+extern unsigned char *gr_system_sum;
 
 void
 grsecurity_init(void)
 {
-	int i;
+	int i, j;
 	/* create the per-cpu shared pages */
 
 	preempt_disable();
-
-	for (i = 0; i < NR_CPUS; i++) {
-		gr_shared_page[i] = (char *) get_zeroed_page(GFP_KERNEL);
-		if (!gr_shared_page[i]) {
-			panic("Unable to allocate grsecurity shared page");
-			return;
+	for (j = 0; j < 4; j++) {
+		for (i = 0; i < NR_CPUS; i++) {
+			gr_shared_page[j][i] = (char *) get_zeroed_page(GFP_KERNEL);
+			if (!gr_shared_page[j][i]) {
+				panic("Unable to allocate grsecurity shared page");
+				return;
+			}
 		}
 	}
-
 	preempt_enable();
 
 	/* allocate memory for authentication structure */
-	gr_pwent = kmalloc(sizeof(struct admin_pw), GFP_KERNEL);
-	if (gr_pwent == NULL) {
+	gr_usermode = kmalloc(sizeof(struct gr_arg), GFP_KERNEL);
+	gr_system_salt = kmalloc(GR_SALT_LEN, GFP_KERNEL);
+	gr_system_sum = kmalloc(GR_SHA_LEN, GFP_KERNEL);
+
+	if (!gr_usermode || !gr_system_salt || !gr_system_sum) {
 		panic("Unable to allocate grsecurity authentication structure");
 		return;
-	}	
+	}
 
 #ifndef CONFIG_GRKERNSEC_SYSCTL
 	grsec_lock = 1;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_link.c linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_link.c
--- linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_link.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_link.c	2004-09-05 17:09:43.000000000 +0200
@@ -13,8 +13,7 @@ gr_handle_follow_link(const struct inode
 	if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
 	    (parent->i_mode & S_ISVTX) && (parent->i_uid != inode->i_uid) &&
 	    (parent->i_mode & S_IWOTH) && (current->fsuid != inode->i_uid)) {
-		security_alert(GR_SYMLINK_MSG,
-			       gr_to_filename(dentry, mnt),
+		security_alert(GR_SYMLINK_MSG, gr_to_filename(dentry, mnt),
 			       inode->i_uid, inode->i_gid, DEFAULTSECARGS);
 		return -EACCES;
 	}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_mem.c linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_mem.c
--- linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_mem.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_mem.c	2004-09-05 17:09:43.000000000 +0200
@@ -41,10 +41,17 @@ gr_handle_open_port(void)
 int
 gr_handle_mem_mmap(const unsigned long offset, struct vm_area_struct *vma)
 {
-	if (offset < __pa(high_memory) &&
-	    (pgprot_val(vma->vm_page_prot) & PROT_WRITE) &&
-	    !(offset == 0xf0000 && ((vma->vm_end - vma->vm_start) <= 0x10000)) &&
-	    !(offset == 0xa0000 && ((vma->vm_end - vma->vm_start) <= 0x20000))) {
+	if (offset + vma->vm_end - vma->vm_start <= offset) {
+		security_alert(GR_MEM_MMAP_MSG, DEFAULTSECARGS);
+		return -EPERM;
+	}
+
+	if (offset < __pa(high_memory) && (vma->vm_flags & VM_WRITE)
+#ifdef CONFIG_X86
+ 	    && !(offset == 0xf0000 && ((vma->vm_end - vma->vm_start) <= 0x10000))
+	    && !(offset == 0xa0000 && ((vma->vm_end - vma->vm_start) <= 0x20000))
+#endif
+	   ) {
 		security_alert(GR_MEM_MMAP_MSG, DEFAULTSECARGS);
 		return -EPERM;
 	} else if (offset < __pa(high_memory))
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_sig.c linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_sig.c
--- linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_sig.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_sig.c	2004-09-05 17:09:43.000000000 +0200
@@ -12,11 +12,14 @@ gr_log_signal(const int sig, const struc
 			security_alert_good(GR_UNISIGLOG_MSG, sig,
 					    DEFAULTSECARGS);
 		} else {
-			security_alert_good(GR_DUALSIGLOG_MSG,
-					    sig, t->comm, t->pid, t->uid,
-					    t->euid, t->p_pptr->comm,
+			security_alert_good(GR_DUALSIGLOG_MSG, sig,
+					    gr_task_fullpath0(t), t->comm,
+					    t->pid, t->uid, t->euid, t->gid,
+					    t->egid, gr_parent_task_fullpath0(t),
+					    t->p_pptr->comm,
 					    t->p_pptr->pid, t->p_pptr->uid,
-					    t->p_pptr->euid, DEFAULTSECARGS);
+					    t->p_pptr->euid, t->p_pptr->gid,
+					    t->p_pptr->egid, DEFAULTSECARGS);
 		}
 	}
 #endif
@@ -27,14 +30,43 @@ int
 gr_handle_signal(const struct task_struct *p, const int sig)
 {
 #ifdef CONFIG_GRKERNSEC
-	if (current->pid > 1 && gr_check_protected_task(p)) {
-		security_alert(GR_SIG_ACL_MSG, sig, p->comm, p->pid, p->uid,
-			       p->euid, p->p_pptr->comm, p->p_pptr->pid,
-			       p->p_pptr->uid, p->p_pptr->euid, DEFAULTSECARGS);
+	if (current->pid > 1 && sig != SIGCHLD && gr_check_protected_task(p)) {
+		security_alert(GR_SIG_ACL_MSG, sig, gr_task_fullpath0(p),
+			       p->comm, p->pid, p->uid,
+			       p->euid, p->gid, p->egid,
+			       gr_parent_task_fullpath0(p), p->p_pptr->comm,
+			       p->p_pptr->pid, p->p_pptr->uid,
+			       p->p_pptr->euid, p->p_pptr->gid,
+			       p->p_pptr->egid, DEFAULTSECARGS);
 		return -EPERM;
-	} else if (gr_pid_is_chrooted(p)) {
+	} else if (gr_pid_is_chrooted((struct task_struct *)p)) {
 		return -EPERM;
 	}
 #endif
 	return 0;
 }
+
+void gr_handle_brute_attach(struct task_struct *p)
+{
+#ifdef CONFIG_GRKERNSEC_BRUTE
+	read_lock(&tasklist_lock);
+	read_lock(&grsec_exec_file_lock);
+	if (p->p_pptr && p->p_pptr->exec_file == p->exec_file)
+		p->p_pptr->brute = 1;
+	read_unlock(&grsec_exec_file_lock);
+	read_unlock(&tasklist_lock);
+#endif
+	return;
+}
+
+void gr_handle_brute_check(void)
+{
+#ifdef CONFIG_GRKERNSEC_BRUTE
+	if (current->brute) {
+		set_current_state(TASK_UNINTERRUPTIBLE);
+		schedule_timeout(30 * HZ);
+	}	
+#endif
+	return;
+}
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_sock.c linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_sock.c
--- linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_sock.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_sock.c	2004-09-05 17:09:43.000000000 +0200
@@ -7,6 +7,114 @@
 #include <linux/grinternal.h>
 #include <linux/gracl.h>
 
+#ifdef CONFIG_GRKERNSEC
+#define gr_conn_table_size 65521
+struct task_struct *gr_conn_table[gr_conn_table_size];
+struct task_struct *deleted_conn = (struct task_struct *)~0;
+spinlock_t gr_conn_table_lock = SPIN_LOCK_UNLOCKED;
+
+extern __inline__ const char * gr_socktype_to_name(unsigned char type);
+extern __inline__ const char * gr_proto_to_name(unsigned char proto);
+
+static __inline__ int 
+conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
+{
+	return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
+}
+
+static __inline__ int
+conn_match(const struct task_struct *task, __u32 saddr, __u32 daddr, 
+	   __u16 sport, __u16 dport)
+{
+	if (unlikely(task != deleted_conn && task->gr_saddr == saddr && 
+		     task->gr_daddr == daddr && task->gr_sport == sport &&
+		     task->gr_dport == dport))
+		return 1;
+	else
+		return 0;
+}
+
+void gr_add_to_task_ip_table(struct task_struct *task)
+{
+	unsigned int index;
+
+	if (unlikely(gr_conn_table == NULL))
+		return;
+
+	index = conn_hash(task->gr_saddr, task->gr_daddr,
+			  task->gr_sport, task->gr_dport, 
+			  gr_conn_table_size);
+
+	spin_lock(&gr_conn_table_lock);
+
+	while (gr_conn_table[index] && gr_conn_table[index] != deleted_conn) {
+		index = (index + 1) % gr_conn_table_size;
+	}
+
+	gr_conn_table[index] = task;
+
+	spin_unlock(&gr_conn_table_lock);
+
+	return;
+}
+
+void gr_del_task_from_ip_table_nolock(struct task_struct *task)
+{
+	unsigned int index;
+
+	if (unlikely(gr_conn_table == NULL))
+		return;
+
+	index = conn_hash(task->gr_saddr, task->gr_daddr, 
+			  task->gr_sport, task->gr_dport, 
+			  gr_conn_table_size);
+
+	while (gr_conn_table[index] && !conn_match(gr_conn_table[index], 
+		task->gr_saddr, task->gr_daddr, task->gr_sport, 
+		task->gr_dport)) {
+		index = (index + 1) % gr_conn_table_size;
+	}
+
+	if (gr_conn_table[index]) {
+		if (gr_conn_table[(index + 1) % gr_conn_table_size])
+			gr_conn_table[index] = deleted_conn;
+		else
+			gr_conn_table[index] = NULL;
+	}
+
+	return;
+}
+
+struct task_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
+					     __u16 sport, __u16 dport)
+{
+	unsigned int index;
+
+	if (unlikely(gr_conn_table == NULL))
+		return NULL;
+
+	index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
+
+	while (gr_conn_table[index] && !conn_match(gr_conn_table[index], 
+		saddr, daddr, sport, dport)) {
+		index = (index + 1) % gr_conn_table_size;
+	}
+
+	return gr_conn_table[index];
+}
+
+#endif
+
+void gr_del_task_from_ip_table(struct task_struct *task)
+{
+#ifdef CONFIG_GRKERNSEC
+	spin_lock(&gr_conn_table_lock);
+	gr_del_task_from_ip_table_nolock(task);
+	spin_unlock(&gr_conn_table_lock);
+#endif
+	return;
+}
+
 void
 gr_attach_curr_ip(const struct sock *sk)
 {
@@ -16,28 +124,17 @@ gr_attach_curr_ip(const struct sock *sk)
 	if (unlikely(sk->protocol != IPPROTO_TCP))
 		return;
 
-	read_lock(&tasklist_lock);
-	for_each_task(p) {
-		if (likely(!p->used_connect))
-			continue;
-		if (unlikely(sk->rcv_saddr == p->gr_daddr &&
-			     sk->daddr == p->gr_saddr &&
-			     ntohs(sk->sport) ==
-			     ntohs(p->gr_dport)
-			     && ntohs(sk->dport) ==
-			     ntohs(p->gr_sport))) {
-			current->curr_ip = p->curr_ip;
-			current->used_accept = 1;
-			p->gr_daddr = 0;
-			p->gr_saddr = 0;
-			p->gr_sport = 0;
-			p->gr_dport = 0;
-			p->used_connect = 0;
-			read_unlock(&tasklist_lock);
-			return;
-		}
+	spin_lock(&gr_conn_table_lock);
+	p = gr_lookup_task_ip_table(sk->daddr, sk->rcv_saddr,
+				    sk->dport, sk->sport);
+	if (unlikely(p != NULL)) {
+		current->curr_ip = p->curr_ip;
+		current->used_accept = 1;
+		gr_del_task_from_ip_table_nolock(p);
+		spin_unlock(&gr_conn_table_lock);
+		return;
 	}
-	read_unlock(&tasklist_lock);
+	spin_unlock(&gr_conn_table_lock);
 
 	current->curr_ip = sk->daddr;
 	current->used_accept = 1;
@@ -50,9 +147,9 @@ gr_handle_sock_all(const int family, con
 {
 #ifdef CONFIG_GRKERNSEC_SOCKET_ALL
 	if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
-	    (family != AF_UNIX) && (family != AF_LOCAL)) {
-		security_alert(GR_SOCK_MSG, family, type,
-			       protocol, DEFAULTSECARGS);
+	    (family != AF_UNIX) && (family != AF_LOCAL) && (type < SOCK_MAX)) {
+		security_alert(GR_SOCK2_MSG, family, gr_socktype_to_name(type), gr_proto_to_name(protocol),
+			       DEFAULTSECARGS);
 		return -EACCES;
 	}
 #endif
@@ -94,8 +191,11 @@ gr_cap_rtnetlink(void)
 #ifdef CONFIG_GRKERNSEC
 	if (!gr_acl_is_enabled())
 		return current->cap_effective;
+	else if (cap_raised(current->cap_effective, CAP_NET_ADMIN) &&
+		 gr_task_is_capable(current, CAP_NET_ADMIN))
+		return current->cap_effective;
 	else
-		return (current->cap_effective & ~(current->acl->cap_lower));
+		return 0;
 #else
 	return current->cap_effective;
 #endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_sysctl.c linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_sysctl.c
--- linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_sysctl.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_sysctl.c	2004-09-05 17:09:43.000000000 +0200
@@ -6,9 +6,8 @@
 int
 gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
 {
-#ifdef CONFIG_GRKERNSEC
-	if (!strcmp(dirname, "grsecurity") && grsec_lock
-	    && strcmp(name, "acl") && (op & 002)) {
+#ifdef CONFIG_GRKERNSEC_SYSCTL
+	if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & 002)) {
 		security_alert(GR_SYSCTL_MSG, name, DEFAULTSECARGS);
 		return -EACCES;
 	}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_tpe.c linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_tpe.c
--- linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsec_tpe.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsec_tpe.c	2004-09-05 17:09:43.000000000 +0200
@@ -4,13 +4,15 @@
 #include <linux/fs.h>
 #include <linux/grinternal.h>
 
+extern int gr_acl_tpe_check(void);
+
 int
 gr_tpe_allow(const struct file *file)
 {
-#ifdef CONFIG_GRKERNSEC_TPE
+#ifdef CONFIG_GRKERNSEC
 	struct inode *inode = file->f_dentry->d_parent->d_inode;
 
-	if (current->uid && grsec_enable_tpe && in_group_p(grsec_tpe_gid) &&
+	if (current->uid && ((grsec_enable_tpe && in_group_p(grsec_tpe_gid)) || gr_acl_tpe_check()) &&
 	    (inode->i_uid || (!inode->i_uid && ((inode->i_mode & S_IWGRP) ||
 						(inode->i_mode & S_IWOTH))))) {
 		security_alert(GR_EXEC_TPE_MSG,
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsum.c linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsum.c
--- linux-2.4.20-wolk4.15-fullkernel/grsecurity/grsum.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/grsecurity/grsum.c	2004-09-05 17:09:43.000000000 +0200
@@ -5,12 +5,13 @@
 #include <linux/crypto.h>
 #include <linux/gracl.h>
 
+
 #if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
 #error "crypto and sha256 must be built into the kernel"
 #endif
 
 int
-chkpw(struct gr_arg *entry, struct admin_pw *pwent)
+chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
 {
 	char *p;
 	struct crypto_tfm *tfm;
@@ -28,11 +29,11 @@ chkpw(struct gr_arg *entry, struct admin
 
 	crypto_digest_init(tfm);
 
-	p = pwent->salt;
+	p = salt;
 	sg[0].page = virt_to_page(p);
 	sg[0].offset = ((long) p & ~PAGE_MASK);
 	sg[0].length = GR_SALT_LEN;
-
+	
 	crypto_digest_update(tfm, sg, 1);
 
 	p = entry->pw;
@@ -47,7 +48,7 @@ chkpw(struct gr_arg *entry, struct admin
 	memset(entry->pw, 0, GR_PW_LEN);
 
 	for (i = 0; i < GR_SHA_LEN; i++)
-		if (pwent->sum[i] != temp_sum[i])
+		if (sum[i] != temp_sum[i])
 			retval = 1;
 		else
 			dummy = 1;	// waste a cycle
@@ -56,4 +57,3 @@ chkpw(struct gr_arg *entry, struct admin
 
 	return retval;
 }
-
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/asm-alpha/resource.h linux-2.4.20-wolk4.16-fullkernel/include/asm-alpha/resource.h
--- linux-2.4.20-wolk4.15-fullkernel/include/asm-alpha/resource.h	2004-06-29 11:31:19.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/asm-alpha/resource.h	2004-09-05 16:09:14.000000000 +0200
@@ -39,7 +39,7 @@
     {INR_OPEN, INR_OPEN},			/* RLIMIT_NOFILE */	\
     {LONG_MAX, LONG_MAX},			/* RLIMIT_AS */		\
     {LONG_MAX, LONG_MAX},			/* RLIMIT_NPROC */	\
-    {PAGE_SIZE,PAGE_SIZE},			/* RLIMIT_MEMLOCK */	\
+    {LONG_MAX, LONG_MAX},			/* RLIMIT_MEMLOCK */	\
     {LONG_MAX, LONG_MAX},                       /* RLIMIT_LOCKS */      \
 }
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/asm-arm/resource.h linux-2.4.20-wolk4.16-fullkernel/include/asm-arm/resource.h
--- linux-2.4.20-wolk4.15-fullkernel/include/asm-arm/resource.h	2004-06-29 11:31:19.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/asm-arm/resource.h	2004-09-05 16:09:14.000000000 +0200
@@ -37,7 +37,7 @@
 	{ RLIM_INFINITY, RLIM_INFINITY },	\
 	{ 0,             0             },	\
 	{ INR_OPEN,      INR_OPEN      },	\
-	{ PAGE_SIZE,     PAGE_SIZE     },	\
+	{ RLIM_INFINITY, RLIM_INFINITY },	\
 	{ RLIM_INFINITY, RLIM_INFINITY },	\
 	{ RLIM_INFINITY, RLIM_INFINITY },	\
 }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/asm-cris/resource.h linux-2.4.20-wolk4.16-fullkernel/include/asm-cris/resource.h
--- linux-2.4.20-wolk4.15-fullkernel/include/asm-cris/resource.h	2004-06-29 11:31:19.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/asm-cris/resource.h	2004-09-05 16:09:14.000000000 +0200
@@ -37,7 +37,7 @@
 	{ RLIM_INFINITY, RLIM_INFINITY },		\
 	{             0,             0 },		\
 	{      INR_OPEN,     INR_OPEN  },		\
-	{     PAGE_SIZE,     PAGE_SIZE },		\
+	{ RLIM_INFINITY, RLIM_INFINITY },               \
         { RLIM_INFINITY, RLIM_INFINITY },		\
 	{ RLIM_INFINITY, RLIM_INFINITY },		\
 }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/asm-i386/bitops.h linux-2.4.20-wolk4.16-fullkernel/include/asm-i386/bitops.h
--- linux-2.4.20-wolk4.15-fullkernel/include/asm-i386/bitops.h	2004-06-29 11:23:10.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/asm-i386/bitops.h	2004-09-05 16:06:30.000000000 +0200
@@ -275,7 +275,6 @@ static __inline__ int find_first_zero_bi
 
 	if (!size)
 		return 0;
-	/* This looks at memory. Mark it volatile to tell gcc not to move it around */
 	__asm__ __volatile__(
 		"movl $-1,%%eax\n\t"
 		"xorl %%edx,%%edx\n\t"
@@ -288,7 +287,7 @@ static __inline__ int find_first_zero_bi
 		"shll $3,%%edi\n\t"
 		"addl %%edi,%%edx"
 		:"=d" (res), "=&c" (d0), "=&D" (d1), "=&a" (d2)
-		:"1" ((size + 31) >> 5), "2" (addr), "b" (addr));
+		:"1" ((size + 31) >> 5), "2" (addr), "b" (addr) : "memory");
 	return res;
 }
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/asm-i386/page_offset.h linux-2.4.20-wolk4.16-fullkernel/include/asm-i386/page_offset.h
--- linux-2.4.20-wolk4.15-fullkernel/include/asm-i386/page_offset.h	2004-06-29 11:32:25.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/asm-i386/page_offset.h	2004-09-05 16:09:00.000000000 +0200
@@ -8,6 +8,8 @@
 # define PAGE_OFFSET_RAW	0x80000000
 #elif defined(CONFIG_3GB)
 # define PAGE_OFFSET_RAW	0x40000000
+#elif defined(CONFIG_1GB_REAL)
+# define PAGE_OFFSET_RAW	0xB0000000
 #endif
 
 #ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/asm-i386/pgtable.h linux-2.4.20-wolk4.16-fullkernel/include/asm-i386/pgtable.h
--- linux-2.4.20-wolk4.15-fullkernel/include/asm-i386/pgtable.h	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/asm-i386/pgtable.h	2004-09-05 17:09:43.000000000 +0200
@@ -21,12 +21,6 @@
 #include <asm/bitops.h>
 #endif
 
-extern pgd_t swapper_pg_dir[1024];
-
-#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
-extern pgd_t kernexec_pg_dir[1024];
-#endif
-
 extern void paging_init(void);
 
 /* Caches aren't brain-dead on the intel. */
@@ -111,14 +105,11 @@ extern unsigned long pgkern_mask;
 extern unsigned long empty_zero_page[1024];
 #define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
 
-#endif /* !__ASSEMBLY__ */
-
 /*
  * The Linux x86 paging architecture is 'compile-time dual-mode', it
  * implements both the traditional 2-level x86 page tables and the
  * newer 3-level PAE-mode page tables.
  */
-#ifndef __ASSEMBLY__
 #if CONFIG_X86_PAE
 # include <asm/pgtable-3level.h>
 
@@ -136,8 +127,15 @@ extern void pgtable_cache_init(void);
 #define pgtable_cache_init()	do { } while (0)
 
 #endif
+
+extern pgd_t swapper_pg_dir[PTRS_PER_PTE];
+
+#ifdef CONFIG_GRKERNSEC_PAX_KERNEXEC
+extern pgd_t kernexec_pg_dir[PTRS_PER_PTE];
 #endif
 
+#endif /* !__ASSEMBLY__ */
+
 #define __beep() asm("movb $0x3,%al; outb %al,$0x61")
 
 #define PMD_SIZE	(1UL << PMD_SHIFT)
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/asm-i386/resource.h linux-2.4.20-wolk4.16-fullkernel/include/asm-i386/resource.h
--- linux-2.4.20-wolk4.15-fullkernel/include/asm-i386/resource.h	2004-06-29 11:31:19.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/asm-i386/resource.h	2004-09-05 16:09:14.000000000 +0200
@@ -37,7 +37,7 @@
 	{ RLIM_INFINITY, RLIM_INFINITY },		\
 	{             0,             0 },		\
 	{      INR_OPEN,     INR_OPEN  },		\
-	{     PAGE_SIZE,     PAGE_SIZE },		\
+	{ RLIM_INFINITY, RLIM_INFINITY },		\
 	{ RLIM_INFINITY, RLIM_INFINITY },		\
         { RLIM_INFINITY, RLIM_INFINITY },		\
 }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/asm-i386/rwsem.h linux-2.4.20-wolk4.16-fullkernel/include/asm-i386/rwsem.h
--- linux-2.4.20-wolk4.15-fullkernel/include/asm-i386/rwsem.h	2004-06-29 11:31:09.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/asm-i386/rwsem.h	2004-09-05 16:09:33.000000000 +0200
@@ -4,8 +4,6 @@
  *
  * Derived from asm-i386/semaphore.h
  *
- * Trylock by Brian Watson (Brian.J.Watson@compaq.com).
- *
  *
  * The MSW of the count is the negated number of active writers and waiting
  * lockers, and the LSW is the total number of active locks
@@ -35,7 +33,7 @@
 #define _I386_RWSEM_H
 
 #ifndef _LINUX_RWSEM_H
-#error please dont include asm/rwsem.h directly, use linux/rwsem.h instead
+#error "please don't include asm/rwsem.h directly, use linux/rwsem.h instead"
 #endif
 
 #ifdef __KERNEL__
@@ -49,6 +47,7 @@ struct rwsem_waiter;
 extern struct rw_semaphore *FASTCALL(rwsem_down_read_failed(struct rw_semaphore *sem));
 extern struct rw_semaphore *FASTCALL(rwsem_down_write_failed(struct rw_semaphore *sem));
 extern struct rw_semaphore *FASTCALL(rwsem_wake(struct rw_semaphore *));
+extern struct rw_semaphore *FASTCALL(rwsem_downgrade_wake(struct rw_semaphore *sem));
 
 /*
  * the semaphore definition
@@ -114,8 +113,8 @@ LOCK_PREFIX	"  incl      (%%eax)\n\t" /*
 		"  jmp       1b\n"
 		LOCK_SECTION_END
 		"# ending down_read\n\t"
-		: "+m"(sem->count)
-		: "a"(sem)
+		: "=m"(sem->count)
+		: "a"(sem), "m"(sem->count)
 		: "memory", "cc");
 }
 
@@ -152,8 +151,8 @@ static inline void __down_write(struct r
 	tmp = RWSEM_ACTIVE_WRITE_BIAS;
 	__asm__ __volatile__(
 		"# beginning down_write\n\t"
-LOCK_PREFIX	"  xadd      %0,(%%eax)\n\t" /* subtract 0x0000ffff, returns the old value */
-		"  testl     %0,%0\n\t" /* was the count 0 before? */
+LOCK_PREFIX	"  xadd      %%edx,(%%eax)\n\t" /* subtract 0x0000ffff, returns the old value */
+		"  testl     %%edx,%%edx\n\t" /* was the count 0 before? */
 		"  jnz       2f\n\t" /* jump if we weren't granted the lock */
 		"1:\n\t"
 		LOCK_SECTION_START("")
@@ -164,8 +163,8 @@ LOCK_PREFIX	"  xadd      %0,(%%eax)\n\t"
 		"  jmp       1b\n"
 		LOCK_SECTION_END
 		"# ending down_write"
-		: "+d"(tmp), "+m"(sem->count)
-		: "a"(sem)
+		: "=m"(sem->count), "=d"(tmp)
+		: "a"(sem), "1"(tmp), "m"(sem->count)
 		: "memory", "cc");
 }
 
@@ -203,8 +202,8 @@ LOCK_PREFIX	"  xadd      %%edx,(%%eax)\n
 		"  jmp       1b\n"
 		LOCK_SECTION_END
 		"# ending __up_read\n"
-		: "+m"(sem->count), "+d"(tmp)
-		: "a"(sem)
+		: "=m"(sem->count), "=d"(tmp)
+		: "a"(sem), "1"(tmp), "m"(sem->count)
 		: "memory", "cc");
 }
 
@@ -229,20 +228,46 @@ LOCK_PREFIX	"  xaddl     %%edx,(%%eax)\n
 		"  jmp       1b\n"
 		LOCK_SECTION_END
 		"# ending __up_write\n"
-		: "+m"(sem->count)
-		: "a"(sem), "i"(-RWSEM_ACTIVE_WRITE_BIAS)
+		: "=m"(sem->count)
+		: "a"(sem), "i"(-RWSEM_ACTIVE_WRITE_BIAS), "m"(sem->count)
 		: "memory", "cc", "edx");
 }
 
 /*
+ * downgrade write lock to read lock
+ */
+static inline void __downgrade_write(struct rw_semaphore *sem)
+{
+	__asm__ __volatile__(
+		"# beginning __downgrade_write\n\t"
+LOCK_PREFIX	"  addl      %2,(%%eax)\n\t" /* transitions 0xZZZZ0001 -> 0xYYYY0001 */
+		"  js        2f\n\t" /* jump if the lock is being waited upon */
+		"1:\n\t"
+		LOCK_SECTION_START("")
+		"2:\n\t"
+		"  pushl     %%ecx\n\t"
+		"  pushl     %%edx\n\t"
+		"  call      rwsem_downgrade_wake\n\t"
+		"  popl      %%edx\n\t"
+		"  popl      %%ecx\n\t"
+		"  jmp       1b\n"
+		LOCK_SECTION_END
+		"# ending __downgrade_write\n"
+		: "=m"(sem->count)
+		: "a"(sem), "i"(-RWSEM_WAITING_BIAS), "m"(sem->count)
+		: "memory", "cc");
+}
+#define HAVE_DOWNGRADE_WRITE
+
+/*
  * implement atomic add functionality
  */
 static inline void rwsem_atomic_add(int delta, struct rw_semaphore *sem)
 {
 	__asm__ __volatile__(
 LOCK_PREFIX	"addl %1,%0"
-		:"=m"(sem->count)
-		:"ir"(delta), "m"(sem->count));
+		: "=m"(sem->count)
+		: "ir"(delta), "m"(sem->count));
 }
 
 /*
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/asm-i386/smpboot.h linux-2.4.20-wolk4.16-fullkernel/include/asm-i386/smpboot.h
--- linux-2.4.20-wolk4.15-fullkernel/include/asm-i386/smpboot.h	2004-06-29 11:31:09.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/asm-i386/smpboot.h	2004-09-05 16:06:02.000000000 +0200
@@ -152,8 +152,8 @@ static inline int target_cpus(void)
 			cpu = (cpu+1)%smp_num_cpus;
 			return cpu_to_physical_apicid(cpu);
 		default:
+			return cpu_online_map;
 	}
-	return cpu_online_map;
 }
 #else
 #define target_cpus() (cpu_online_map)
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/asm-i386/unistd.h linux-2.4.20-wolk4.16-fullkernel/include/asm-i386/unistd.h
--- linux-2.4.20-wolk4.15-fullkernel/include/asm-i386/unistd.h	2004-06-29 11:31:44.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/asm-i386/unistd.h	2004-09-05 16:09:14.000000000 +0200
@@ -260,7 +260,6 @@
 #define __NR_epoll_create	254
 #define __NR_epoll_ctl		255
 #define __NR_epoll_wait		256
-#define __NR_remap_file_pages	257
 #define __NR_setcpucap		260	/* Broege's CPU */
 
 /* RSBAC - we use 223 / security */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/asm-ia64/resource.h linux-2.4.20-wolk4.16-fullkernel/include/asm-ia64/resource.h
--- linux-2.4.20-wolk4.15-fullkernel/include/asm-ia64/resource.h	2004-06-29 11:31:19.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/asm-ia64/resource.h	2004-09-05 16:09:14.000000000 +0200
@@ -40,7 +40,7 @@
 	{ RLIM_INFINITY, RLIM_INFINITY },		\
 	{             0,             0 },		\
 	{      INR_OPEN,     INR_OPEN  },		\
-	{     PAGE_SIZE,     PAGE_SIZE },		\
+	{ RLIM_INFINITY, RLIM_INFINITY },		\
 	{ RLIM_INFINITY, RLIM_INFINITY },		\
 	{ RLIM_INFINITY, RLIM_INFINITY },		\
 }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/asm-m68k/resource.h linux-2.4.20-wolk4.16-fullkernel/include/asm-m68k/resource.h
--- linux-2.4.20-wolk4.15-fullkernel/include/asm-m68k/resource.h	2004-06-29 11:31:19.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/asm-m68k/resource.h	2004-09-05 16:09:14.000000000 +0200
@@ -37,7 +37,7 @@
 	{ RLIM_INFINITY, RLIM_INFINITY },		\
 	{             0,             0 },		\
 	{      INR_OPEN,     INR_OPEN  },		\
-	{     PAGE_SIZE,     PAGE_SIZE },		\
+	{ RLIM_INFINITY, RLIM_INFINITY },		\
 	{ RLIM_INFINITY, RLIM_INFINITY },		\
         { RLIM_INFINITY, RLIM_INFINITY },		\
 }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/asm-mips/resource.h linux-2.4.20-wolk4.16-fullkernel/include/asm-mips/resource.h
--- linux-2.4.20-wolk4.15-fullkernel/include/asm-mips/resource.h	2004-06-29 11:31:19.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/asm-mips/resource.h	2004-09-05 16:09:14.000000000 +0200
@@ -44,7 +44,7 @@
 	{ RLIM_INFINITY, RLIM_INFINITY },		\
 	{ RLIM_INFINITY, RLIM_INFINITY },		\
 	{ 0,             0             },		\
-	{     PAGE_SIZE,     PAGE_SIZE },		\
+	{ RLIM_INFINITY, RLIM_INFINITY },		\
 	{ RLIM_INFINITY, RLIM_INFINITY },		\
 }
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/asm-mips64/resource.h linux-2.4.20-wolk4.16-fullkernel/include/asm-mips64/resource.h
--- linux-2.4.20-wolk4.15-fullkernel/include/asm-mips64/resource.h	2004-06-29 11:31:19.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/asm-mips64/resource.h	2004-09-05 16:09:14.000000000 +0200
@@ -45,7 +45,7 @@
 	{ RLIM_INFINITY, RLIM_INFINITY },		\
 	{ RLIM_INFINITY, RLIM_INFINITY },		\
 	{ 0,             0             },		\
-	{ PAGE_SIZE,     PAGE_SIZE     },		\
+	{ RLIM_INFINITY, RLIM_INFINITY },		\
 	{ RLIM_INFINITY, RLIM_INFINITY },		\
 }
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/asm-parisc/resource.h linux-2.4.20-wolk4.16-fullkernel/include/asm-parisc/resource.h
--- linux-2.4.20-wolk4.15-fullkernel/include/asm-parisc/resource.h	2004-06-29 11:31:19.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/asm-parisc/resource.h	2004-09-05 16:09:14.000000000 +0200
@@ -37,7 +37,7 @@
 	{ RLIM_INFINITY, RLIM_INFINITY },		\
 	{             0,             0 },		\
 	{      INR_OPEN,     INR_OPEN  },		\
-	{     PAGE_SIZE,     PAGE_SIZE },		\
+	{ RLIM_INFINITY, RLIM_INFINITY },		\
 	{ RLIM_INFINITY, RLIM_INFINITY },		\
 	{ RLIM_INFINITY, RLIM_INFINITY },		\
 }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/asm-ppc/resource.h linux-2.4.20-wolk4.16-fullkernel/include/asm-ppc/resource.h
--- linux-2.4.20-wolk4.15-fullkernel/include/asm-ppc/resource.h	2004-06-29 11:31:19.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/asm-ppc/resource.h	2004-09-05 16:09:14.000000000 +0200
@@ -37,7 +37,7 @@
 	{ RLIM_INFINITY, RLIM_INFINITY },		\
 	{             0,             0 },		\
 	{      INR_OPEN,     INR_OPEN  },		\
-	{     PAGE_SIZE,     PAGE_SIZE },		\
+	{ RLIM_INFINITY, RLIM_INFINITY },		\
 	{ RLIM_INFINITY, RLIM_INFINITY },		\
 	{ RLIM_INFINITY, RLIM_INFINITY },		\
 }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/asm-ppc64/mman.h linux-2.4.20-wolk4.16-fullkernel/include/asm-ppc64/mman.h
--- linux-2.4.20-wolk4.15-fullkernel/include/asm-ppc64/mman.h	2004-06-29 11:31:19.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/asm-ppc64/mman.h	2004-09-05 16:09:14.000000000 +0200
@@ -21,7 +21,6 @@
 #define MAP_ANONYMOUS	0x20		/* don't use a file */
 #define MAP_RENAME      MAP_ANONYMOUS   /* In SunOS terminology */
 #define MAP_NORESERVE   0x40            /* don't reserve swap pages */
-#define MAP_LOCKED	0x80
 
 #define MAP_GROWSDOWN	0x0100		/* stack-like segment */
 #define MAP_DENYWRITE	0x0800		/* ETXTBSY */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/asm-ppc64/resource.h linux-2.4.20-wolk4.16-fullkernel/include/asm-ppc64/resource.h
--- linux-2.4.20-wolk4.15-fullkernel/include/asm-ppc64/resource.h	2004-06-29 11:31:19.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/asm-ppc64/resource.h	2004-09-05 16:09:14.000000000 +0200
@@ -43,7 +43,7 @@
 	{ RLIM_INFINITY, RLIM_INFINITY },		\
 	{             0,             0 },		\
 	{      INR_OPEN,     INR_OPEN  },		\
-	{     PAGE_SIZE,     PAGE_SIZE },		\
+	{ RLIM_INFINITY, RLIM_INFINITY },		\
 	{ RLIM_INFINITY, RLIM_INFINITY },		\
 	{ RLIM_INFINITY, RLIM_INFINITY },		\
 }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/asm-s390/resource.h linux-2.4.20-wolk4.16-fullkernel/include/asm-s390/resource.h
--- linux-2.4.20-wolk4.15-fullkernel/include/asm-s390/resource.h	2004-06-29 11:31:19.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/asm-s390/resource.h	2004-09-05 16:09:14.000000000 +0200
@@ -45,7 +45,7 @@
 	{ RLIM_INFINITY, RLIM_INFINITY },		\
 	{             0,             0 },		\
 	{ INR_OPEN, INR_OPEN },                         \
-	{     PAGE_SIZE,     PAGE_SIZE },		\
+	{ RLIM_INFINITY, RLIM_INFINITY },		\
 	{ RLIM_INFINITY, RLIM_INFINITY },		\
 	{ RLIM_INFINITY, RLIM_INFINITY },		\
 }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/asm-s390x/resource.h linux-2.4.20-wolk4.16-fullkernel/include/asm-s390x/resource.h
--- linux-2.4.20-wolk4.15-fullkernel/include/asm-s390x/resource.h	2004-06-29 11:31:19.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/asm-s390x/resource.h	2004-09-05 16:09:14.000000000 +0200
@@ -45,7 +45,7 @@
 	{ RLIM_INFINITY, RLIM_INFINITY },		\
 	{        0,        0 },                  	\
 	{ INR_OPEN, INR_OPEN },                         \
-	{     PAGE_SIZE,     PAGE_SIZE },		\
+	{ RLIM_INFINITY, RLIM_INFINITY },		\
 	{ RLIM_INFINITY, RLIM_INFINITY },		\
 	{ RLIM_INFINITY, RLIM_INFINITY },		\
 }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/asm-sh/resource.h linux-2.4.20-wolk4.16-fullkernel/include/asm-sh/resource.h
--- linux-2.4.20-wolk4.15-fullkernel/include/asm-sh/resource.h	2004-06-29 11:31:19.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/asm-sh/resource.h	2004-09-05 16:09:14.000000000 +0200
@@ -37,7 +37,7 @@
 	{ RLIM_INFINITY, RLIM_INFINITY },		\
 	{             0,             0 },		\
 	{      INR_OPEN,     INR_OPEN  },		\
-	{     PAGE_SIZE,     PAGE_SIZE },		\
+	{ RLIM_INFINITY, RLIM_INFINITY },		\
 	{ RLIM_INFINITY, RLIM_INFINITY },		\
 	{ RLIM_INFINITY, RLIM_INFINITY },		\
 }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/asm-sparc/resource.h linux-2.4.20-wolk4.16-fullkernel/include/asm-sparc/resource.h
--- linux-2.4.20-wolk4.15-fullkernel/include/asm-sparc/resource.h	2004-06-29 11:31:19.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/asm-sparc/resource.h	2004-09-05 16:09:14.000000000 +0200
@@ -42,7 +42,7 @@
     {       0, RLIM_INFINITY},		\
     {RLIM_INFINITY, RLIM_INFINITY},	\
     {INR_OPEN, INR_OPEN}, {0, 0},	\
-    {PAGE_SIZE,     PAGE_SIZE },	\
+    {RLIM_INFINITY, RLIM_INFINITY},	\
     {RLIM_INFINITY, RLIM_INFINITY},	\
     {RLIM_INFINITY, RLIM_INFINITY}	\
 }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/asm-sparc64/resource.h linux-2.4.20-wolk4.16-fullkernel/include/asm-sparc64/resource.h
--- linux-2.4.20-wolk4.15-fullkernel/include/asm-sparc64/resource.h	2004-06-29 11:31:19.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/asm-sparc64/resource.h	2004-09-05 16:09:14.000000000 +0200
@@ -41,7 +41,7 @@
     {       0, RLIM_INFINITY},		\
     {RLIM_INFINITY, RLIM_INFINITY},	\
     {INR_OPEN, INR_OPEN}, {0, 0},	\
-    {PAGE_SIZE,     PAGE_SIZE },	\
+    {RLIM_INFINITY, RLIM_INFINITY},	\
     {RLIM_INFINITY, RLIM_INFINITY},	\
     {RLIM_INFINITY, RLIM_INFINITY}	\
 }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/asm-x86_64/resource.h linux-2.4.20-wolk4.16-fullkernel/include/asm-x86_64/resource.h
--- linux-2.4.20-wolk4.15-fullkernel/include/asm-x86_64/resource.h	2004-06-29 11:31:19.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/asm-x86_64/resource.h	2004-09-05 16:09:14.000000000 +0200
@@ -37,7 +37,7 @@
 	{ RLIM_INFINITY, RLIM_INFINITY },		\
 	{             0,             0 },		\
 	{      INR_OPEN,     INR_OPEN  },		\
-	{     PAGE_SIZE,     PAGE_SIZE },		\
+	{ RLIM_INFINITY, RLIM_INFINITY },		\
 	{ RLIM_INFINITY, RLIM_INFINITY },		\
         { RLIM_INFINITY, RLIM_INFINITY },		\
 }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/agp_backend.h linux-2.4.20-wolk4.16-fullkernel/include/linux/agp_backend.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/agp_backend.h	2004-06-29 11:30:54.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/agp_backend.h	2004-09-05 16:05:57.000000000 +0200
@@ -51,6 +51,7 @@ enum chipset_type {
 	INTEL_I845_G,
 	INTEL_I855_PM,
 	INTEL_I865_G,
+	INTEL_I915_G,
 	INTEL_I840,
 	INTEL_I845,
 	INTEL_I850,
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/auto_fs.h linux-2.4.20-wolk4.16-fullkernel/include/linux/auto_fs.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/auto_fs.h	2002-11-29 00:53:15.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/auto_fs.h	2004-09-05 16:06:17.000000000 +0200
@@ -45,7 +45,7 @@
  * If so, 32-bit user-space code should be backwards compatible.
  */
 
-#if defined(__sparc__) || defined(__mips__) || defined(__s390__) || defined(__x86_64__)
+#if defined(__sparc__) || defined(__mips__) || defined(__s390__) || defined(__powerpc__) || defined(__x86_64__)
 typedef unsigned int autofs_wqt_t;
 #else
 typedef unsigned long autofs_wqt_t;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/auto_fs4.h linux-2.4.20-wolk4.16-fullkernel/include/linux/auto_fs4.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/auto_fs4.h	2001-11-22 20:46:40.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/auto_fs4.h	2004-09-05 16:06:17.000000000 +0200
@@ -23,6 +23,12 @@
 #define AUTOFS_MIN_PROTO_VERSION	3
 #define AUTOFS_MAX_PROTO_VERSION	4
 
+#define AUTOFS_PROTO_SUBVERSION		5
+
+/* Mask for expire behaviour */
+#define AUTOFS_EXP_IMMEDIATE            1
+#define AUTOFS_EXP_LEAVES               2
+
 /* New message type */
 #define autofs_ptype_expire_multi	2	/* Expire entry (umount request) */
 
@@ -41,7 +47,10 @@ union autofs_packet_union {
 	struct autofs_packet_expire_multi expire_multi;
 };
 
-#define AUTOFS_IOC_EXPIRE_MULTI _IOW(0x93,0x66,int)
-
+#define AUTOFS_IOC_EXPIRE_MULTI		_IOW(0x93,0x66,int)
+#define AUTOFS_IOC_PROTOSUBVER		_IOR(0x93,0x67,int)
+#define AUTOFS_IOC_ASKREGHOST		_IOR(0x93,0x68,int)
+#define AUTOFS_IOC_TOGGLEREGHOST	_IOR(0x93,0x69,int)
+#define AUTOFS_IOC_ASKUMOUNT		_IOR(0x93,0x70,int)
 
 #endif /* _LINUX_AUTO_FS4_H */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/blk.h linux-2.4.20-wolk4.16-fullkernel/include/linux/blk.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/blk.h	2004-06-29 11:25:02.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/blk.h	2004-09-05 16:09:18.000000000 +0200
@@ -86,13 +86,6 @@ void initrd_init(void);
 
 static inline void blkdev_dequeue_request(struct request * req)
 {
-	request_queue_t *q = req->q;
-
-	if (q) {
-		if (q->last_merge == req || (q->head_active && q->last_merge == blkdev_next_request(req)))
-			q->last_merge = NULL;
-	}
-
 	list_del(&req->queue);
 }
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/blkdev.h linux-2.4.20-wolk4.16-fullkernel/include/linux/blkdev.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/blkdev.h	2004-06-29 11:31:45.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/blkdev.h	2004-09-05 16:09:19.000000000 +0200
@@ -106,9 +106,7 @@ struct request_queue
 	 * Together with queue_head for cacheline sharing
 	 */
 	struct list_head	queue_head;
-	struct list_head	atomic_head;
 	elevator_t		elevator;
-	struct request		*last_merge;
 
 	request_fn_proc		* request_fn;
 	merge_request_fn	* back_merge_fn;
@@ -126,7 +124,6 @@ struct request_queue
 	 * This is used to remove the plug when tq_disk runs.
 	 */
 	struct tq_struct	plug_tq;
-	struct list_head	atomic_entry;
 
 	/*
 	 * Boolean that indicates whether this queue is plugged or not.
@@ -182,14 +179,6 @@ extern unsigned long blk_max_low_pfn, bl
 #define BLK_BOUNCE_HIGH		(blk_max_low_pfn << PAGE_SHIFT)
 #define BLK_BOUNCE_ANY		(blk_max_pfn << PAGE_SHIFT)
 
-/*
- * max guaranteed atomic I/O size while dealing with bounce buffers.
- * highmemio capable devices (pci64 in particular) can go well beyond
- * this limit. Must be a multiple of 512bytes obviously.
- */
-#define BLK_ATOMIC_BOUNCE_SIZE		32768
-#define BLK_ATOMIC_BOUNCE_ENTRIES	(BLK_ATOMIC_BOUNCE_SIZE >> 9)
-
 extern void blk_queue_bounce_limit(request_queue_t *, u64);
 
 #ifdef CONFIG_HIGHMEM
@@ -247,13 +236,6 @@ extern void generic_make_request(int rw,
 extern inline request_queue_t *blk_get_queue(kdev_t dev);
 extern void blkdev_release_request(struct request *);
 
-extern spinlock_cacheline_t blk_atomic_lock_cacheline;
-#define blk_atomic_lock (blk_atomic_lock_cacheline.lock)
-extern unsigned int blk_get_atomic_seq(void);
-extern spinlock_cacheline_t blk_atomic_queue_lock_cacheline;
-#define blk_atomic_queue_lock (blk_atomic_queue_lock_cacheline.lock)
-extern void FASTCALL(blk_refile_atomic_queue(int sequence));
-
 /*
  * Access functions for manipulating queue properties
  */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/cciss_ioctl.h linux-2.4.20-wolk4.16-fullkernel/include/linux/cciss_ioctl.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/cciss_ioctl.h	2004-06-29 11:24:46.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/cciss_ioctl.h	2004-09-05 15:48:31.000000000 +0200
@@ -208,4 +208,31 @@ typedef struct _LogvolInfo_struct{
 #define CCISS_GETLUNINFO  _IOR(CCISS_IOC_MAGIC, 17, LogvolInfo_struct)
 #define CCISS_BIG_PASSTHRU _IOWR(CCISS_IOC_MAGIC, 18, BIG_IOCTL_Command_struct)
 
+#ifdef __KERNEL__
+#ifdef __x86_64__
+
+/* 32 bit compatible ioctl structs */ 
+typedef struct _IOCTL32_Command_struct {
+  LUNAddr_struct	   LUN_info;
+  RequestBlock_struct      Request;
+  ErrorInfo_struct  	   error_info; 
+  WORD			   buf_size;  /* size in bytes of the buf */
+  __u32			   buf; /* 32 bit pointer to data buffer */
+} IOCTL32_Command_struct;
+
+typedef struct _BIG_IOCTL32_Command_struct {
+  LUNAddr_struct	   LUN_info;
+  RequestBlock_struct      Request;
+  ErrorInfo_struct  	   error_info; 
+  DWORD			   malloc_size; /* < MAX_KMALLOC_SIZE in cciss.c */
+  DWORD			   buf_size;    /* size in bytes of the buf */
+  				        /* < malloc_size * MAXSGENTRIES */
+  __u32 		buf;	/* 32 bit pointer to data buffer */
+} BIG_IOCTL32_Command_struct;
+
+#define CCISS_PASSTHRU32   _IOWR(CCISS_IOC_MAGIC, 11, IOCTL32_Command_struct)
+#define CCISS_BIG_PASSTHRU32 _IOWR(CCISS_IOC_MAGIC, 18, BIG_IOCTL32_Command_struct)
+
+#endif /* __x86_64__ */
+#endif /* __KERNEL__ */
 #endif  
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/eventpoll.h linux-2.4.20-wolk4.16-fullkernel/include/linux/eventpoll.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/eventpoll.h	2004-06-29 11:24:13.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/eventpoll.h	2004-09-05 15:47:42.000000000 +0200
@@ -14,19 +14,34 @@
 #ifndef _LINUX_EVENTPOLL_H
 #define _LINUX_EVENTPOLL_H
 
+#include <linux/types.h>
+
 
 /* Valid opcodes to issue to sys_epoll_ctl() */
 #define EPOLL_CTL_ADD 1
 #define EPOLL_CTL_DEL 2
 #define EPOLL_CTL_MOD 3
 
+/* Set the One Shot behaviour for the target file descriptor */
+#define EPOLLONESHOT (1 << 30)
+
 /* Set the Edge Triggered behaviour for the target file descriptor */
 #define EPOLLET (1 << 31)
 
+/*
+ * On x86-64 and ia64 make the 64bit structure have the same alignment 
+ * as the 32bit structure. This makes 32bit emulation easier.
+ */
+#if defined(__x86_64__)
+#define EPOLL_PACKED __attribute__((packed))
+#else
+#define EPOLL_PACKED
+#endif
+
 struct epoll_event {
 	__u32 events;
 	__u64 data;
-};
+} EPOLL_PACKED;
 
 #ifdef __KERNEL__
 
@@ -43,8 +58,37 @@ asmlinkage long sys_epoll_wait(int epfd,
 /* Used to initialize the epoll bits inside the "struct file" */
 void eventpoll_init_file(struct file *file);
 
-/* Used in fs/file_table.c:__fput() to unlink files from the eventpoll interface */
-void eventpoll_release(struct file *file);
+/* Used to release the epoll bits inside the "struct file" */
+void eventpoll_release_file(struct file *file);
+
+/*
+ * This is called from inside fs/file_table.c:__fput() to unlink files
+ * from the eventpoll interface. We need to have this facility to cleanup
+ * correctly files that are closed without being removed from the eventpoll
+ * interface.
+ */
+static inline void eventpoll_release(struct file *file)
+{
+
+	/*
+	 * Fast check to avoid the get/release of the semaphore. Since
+	 * we're doing this outside the semaphore lock, it might return
+	 * false negatives, but we don't care. It'll help in 99.99% of cases
+	 * to avoid the semaphore lock. False positives simply cannot happen
+	 * because the file in on the way to be removed and nobody ( but
+	 * eventpoll ) has still a reference to this file.
+	 */
+	if (likely(list_empty(&file->f_ep_links)))
+		return;
+
+	/*
+	 * The file is being closed while it is still linked to an epoll
+	 * descriptor. We need to handle this by correctly unlinking it
+	 * from its containers.
+	 */
+	eventpoll_release_file(file);
+}
+
 
 #endif /* #ifdef __KERNEL__ */
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/fs.h linux-2.4.20-wolk4.16-fullkernel/include/linux/fs.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/fs.h	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/fs.h	2004-09-05 16:09:19.000000000 +0200
@@ -238,7 +238,6 @@ enum bh_state_bits {
 	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
 			 * for private allocation by other entities
@@ -283,7 +282,6 @@ struct buffer_head {
  	void *b_private;		/* reserved for b_end_io */
 	void *b_journal_head;		/* ext3 journal_heads */
 	unsigned long b_rsector;	/* Real buffer location on disk */
-	int b_elv_sequence;			/* for atomic blocks */
 	wait_queue_head_t b_wait;
 
 	struct list_head     b_inode_buffers;	/* doubly linked list of inode dirty buffers */
@@ -304,7 +302,6 @@ void init_buffer(struct buffer_head *, b
 #define buffer_async(bh)	__buffer_state(bh,Async)
 #define buffer_launder(bh)	__buffer_state(bh,Launder)
 #define buffer_delay(bh)	__buffer_state(bh,Delay)
-#define buffer_atomic(bh)	__buffer_state(bh,Atomic)
 
 #define bh_offset(bh)		((unsigned long)(bh)->b_data & ~PAGE_MASK)
 
@@ -312,7 +309,6 @@ extern void set_bh_page(struct buffer_he
 
 #define touch_buffer(bh)	mark_page_accessed(bh->b_page)
 
-#define bh_elv_seq(bh)		(bh)->b_elv_sequence
 
 #include <linux/pipe_fs_i.h>
 #include <linux/minix_fs_i.h>
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/gracl.h linux-2.4.20-wolk4.16-fullkernel/include/linux/gracl.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/gracl.h	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/gracl.h	2004-09-05 17:09:43.000000000 +0200
@@ -1,28 +1,25 @@
 #ifndef GR_ACL_H
 #define GR_ACL_H
-#endif
+
 #include <linux/grdefs.h>
 #include <linux/resource.h>
 
 #include <asm/resource.h>
 
-/* * * * * * * * * * * * * * * * * * * * *
- * grsecurity ACL System
- * Main header file
- * Purpose: define most gracl data structures 
- * * * * * * * * * * * * * * * * * * * * */
-
 /* Major status information */
 
-#define GR_VERSION  "grsecurity 1.9.15"
+#define GR_VERSION  "grsecurity 2.0.1"
+#define GRSECURITY_VERSION 0x201
 
 enum {
 
 	SHUTDOWN = 0,
 	ENABLE = 1,
-	GOD = 2,
+	SPROLE = 2,
 	RELOAD = 3,
-	SEGVMOD = 4
+	SEGVMOD = 4,
+	STATUS = 5,
+	UNSPROLE = 6
 };
 
 /* Password setup definitions
@@ -33,9 +30,14 @@ enum {
 	GR_SHA_LEN = 32,
 };
 
+enum {
+	GR_SPROLE_LEN = 64,
+};
+
 /* Begin Data Structures */
 
-struct admin_pw {
+struct sprole_pw {
+	unsigned char *rolename;
 	unsigned char salt[GR_SALT_LEN];
 	unsigned char sum[GR_SHA_LEN];	/* 256-bit SHA hash of the password */
 };
@@ -44,11 +46,12 @@ struct name_entry {
 	ino_t inode;
 	kdev_t device;
 	char *name;
+	__u16 len;
 };
 
-struct acl_subject_db {
-	struct acl_subject_label **s_hash;
-	__u32 s_size;
+struct acl_role_db {
+	struct acl_role_label **r_hash;
+	__u32 r_size;
 };
 
 struct name_db {
@@ -61,18 +64,34 @@ struct crash_uid {
 	unsigned long expires;
 };
 
+struct gr_hash_struct {
+	void **table;
+	void **nametable;
+	void *first;
+	__u32 table_size;
+	__u32 used_size;
+	int type;
+};
+
 /* Userspace Grsecurity ACL data structures */
 struct acl_subject_label {
 	char *filename;
 	ino_t inode;
 	kdev_t device;
 	__u32 mode;
-	__u32 cap_raise;
+	__u32 cap_mask;
 	__u32 cap_lower;
 
 	struct rlimit res[RLIM_NLIMITS + 1];
 	__u16 resmask;
 
+	__u8 user_trans_type;
+	__u8 group_trans_type;
+	uid_t *user_transitions;
+	gid_t *group_transitions;
+	__u16 user_trans_num;
+	__u16 group_trans_num;
+
 	__u32 ip_proto[8];
 	__u32 ip_type;
 	struct acl_ip_label **ips;
@@ -81,8 +100,8 @@ struct acl_subject_label {
 	__u32 crashes;
 	unsigned long expires;
 
-	struct acl_object_label *proc_object;
-	struct acl_ip_label *ip_object;
+	struct acl_subject_label *parent_subject;
+	struct gr_hash_struct *hash;
 	struct acl_subject_label *prev;
 	struct acl_subject_label *next;
 
@@ -90,11 +109,51 @@ struct acl_subject_label {
 	__u32 obj_hash_size;
 };
 
-struct user_acl_subject_db {
-	struct acl_subject_label **s_table;
-	__u32 s_entries;	/* Number of entries in table */
-	__u32 i_entries;	/* total number of ip acls */
-	__u32 o_entries;	/* Total number of object acls */
+struct role_allowed_ip {
+	__u32 addr;
+	__u32 netmask;
+
+	struct role_allowed_ip *prev;
+	struct role_allowed_ip *next;
+};
+
+struct role_transition {
+	char *rolename;
+
+	struct role_transition *prev;
+	struct role_transition *next;
+};
+
+struct acl_role_label {
+	char *rolename;
+	uid_t uidgid;
+	__u16 roletype;
+
+	__u16 auth_attempts;
+	unsigned long expires;
+
+	struct acl_subject_label *root_label;
+	struct gr_hash_struct *hash;
+
+	struct acl_role_label *prev;
+	struct acl_role_label *next;
+
+	struct role_transition *transitions;
+	struct role_allowed_ip *allowed_ips;
+	uid_t *domain_children;
+	__u16 domain_child_num;
+
+	struct acl_subject_label **subj_hash;
+	__u32 subj_hash_size;
+};
+
+struct user_acl_role_db {
+	struct acl_role_label **r_table;
+	__u32 num_pointers;		/* Number of allocations to track */
+	__u32 num_roles;		/* Number of roles */
+	__u32 num_domain_children;	/* Number of domain children */
+	__u32 num_subjects;		/* Number of subjects */
+	__u32 num_objects;		/* Number of objects */
 };
 
 struct acl_object_label {
@@ -103,6 +162,9 @@ struct acl_object_label {
 	kdev_t device;
 	__u32 mode;
 
+	struct acl_subject_label *nested;
+	struct acl_object_label *globbed;
+
 	/* next two structures not used */
 
 	struct acl_object_label *prev;
@@ -124,15 +186,33 @@ struct acl_ip_label {
 };
 
 struct gr_arg {
-	struct user_acl_subject_db subj_db;
+	struct user_acl_role_db role_db;
 	unsigned char pw[GR_PW_LEN];
 	unsigned char salt[GR_SALT_LEN];
 	unsigned char sum[GR_SHA_LEN];
+	unsigned char sp_role[GR_SPROLE_LEN];
+	struct sprole_pw *sprole_pws;
 	kdev_t segv_device;
 	ino_t segv_inode;
 	uid_t segv_uid;
+	__u16 num_sprole_pws;
 	__u16 mode;
+};
 
+struct gr_arg_wrapper {
+	struct gr_arg *arg;
+	__u32 version;
+	__u32 size;
+};
+
+struct subject_map {
+	struct acl_subject_label *user;
+	struct acl_subject_label *kernel;
+};
+
+struct acl_subj_map_db {
+	struct subject_map **s_hash;
+	__u32 s_size;
 };
 
 /* End Data Structures Section */
@@ -143,13 +223,27 @@ struct gr_arg {
    Shift/add algorithm with modulus of table size and an XOR*/
 
 static __inline__ unsigned long
+rhash(const uid_t uid, const __u16 type, const unsigned long sz)
+{
+	return (((uid << type) + (uid ^ type)) % sz);
+}
+
+static __inline__ unsigned long
+shash(const struct acl_subject_label *userp, const unsigned long sz)
+{
+	return ((const unsigned long)userp % sz);
+}
+
+static __inline__ unsigned long
 fhash(const ino_t ino, const kdev_t dev, const unsigned long sz)
 {
 	return (((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9))) % sz);
 }
 
 static __inline__ unsigned long
-nhash(const char *name, const unsigned long sz)
+nhash(const char *name, const __u16 len, const unsigned long sz)
 {
-	return full_name_hash(name, strlen(name)) % sz;
+	return full_name_hash(name, len) % sz;
 }
+
+#endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/grdefs.h linux-2.4.20-wolk4.16-fullkernel/include/linux/grdefs.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/grdefs.h	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/grdefs.h	2004-09-05 17:09:43.000000000 +0200
@@ -10,6 +10,21 @@ enum {
 
 /* Begin  ACL declarations */
 
+/* Role flags */
+
+enum {
+	GR_ROLE_USER = 0x0001,
+	GR_ROLE_GROUP = 0x0002,
+	GR_ROLE_DEFAULT = 0x0004,
+	GR_ROLE_SPECIAL = 0x0008,
+	GR_ROLE_AUTH = 0x0010,
+	GR_ROLE_NOPW = 0x0020,
+	GR_ROLE_GOD = 0x0040,
+	GR_ROLE_LEARN = 0x0080,
+	GR_ROLE_TPE = 0x0100,
+	GR_ROLE_DOMAIN = 0x0200
+};
+
 /* ACL Subject and Object mode flags */
 enum {
 	GR_DELETED = 0x00000080
@@ -17,49 +32,68 @@ enum {
 
 /* ACL Object-only mode flags */
 enum {
-	GR_READ = 0x00000001,
-	GR_APPEND = 0x00000002,
-	GR_WRITE = 0x00000004,
-	GR_EXEC = 0x00000008,
-	GR_FIND = 0x00000010,
-	GR_INHERIT = 0x00000040,
-	GR_PTRACERD = 0x00000100,
-	GR_AUDIT_READ = 0x00000200,
-	GR_AUDIT_APPEND = 0x00000400,
-	GR_AUDIT_WRITE = 0x00001000,
-	GR_AUDIT_EXEC = 0x00002000,
-	GR_AUDIT_FIND = 0x00004000,
-	GR_AUDIT_INHERIT = 0x00008000,
-	GR_SUPPRESS = 0x00010000,
-	GR_NOLEARN = 0x00020000
+	GR_READ 	= 0x00000001,
+	GR_APPEND 	= 0x00000002,
+	GR_WRITE 	= 0x00000004,
+	GR_EXEC 	= 0x00000008,
+	GR_FIND 	= 0x00000010,
+	GR_INHERIT 	= 0x00000040,
+	GR_PTRACERD 	= 0x00000100,
+	GR_SETID 	= 0x00000200,
+	GR_CREATE 	= 0x00000400,
+	GR_DELETE 	= 0x00000800,
+	GR_NOPTRACE	= 0x00001000,
+	GR_AUDIT_READ 	= 0x00002000,
+	GR_AUDIT_APPEND = 0x00004000,
+	GR_AUDIT_WRITE 	= 0x00008000,
+	GR_AUDIT_EXEC 	= 0x00010000,
+	GR_AUDIT_FIND 	= 0x00020000,
+	GR_AUDIT_INHERIT= 0x00040000,
+	GR_AUDIT_SETID 	= 0x00080000,
+	GR_AUDIT_CREATE = 0x00100000,
+	GR_AUDIT_DELETE = 0x00200000,
+	GR_SUPPRESS 	= 0x00400000,
+	GR_NOLEARN 	= 0x00800000
 };
 
 #define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
-		   GR_AUDIT_FIND | GR_AUDIT_INHERIT)
+		   GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
+		   GR_AUDIT_CREATE | GR_AUDIT_DELETE)
 
 /* ACL subject-only mode flags */
 enum {
-	GR_KILL = 0x00000001,
-	GR_VIEW = 0x00000002,
-	GR_PROTECTED = 0x00000100,
-	GR_LEARN = 0x00000200,
-	GR_OVERRIDE = 0x00000400,
+	GR_KILL 	= 0x00000001,
+	GR_VIEW 	= 0x00000002,
+	GR_PROTECTED 	= 0x00000100,
+	GR_LEARN 	= 0x00000200,
+	GR_OVERRIDE 	= 0x00000400,
 	/* just a placeholder, this mode is only used in userspace */
-	GR_DUMMY = 0x00000800,
-
-	GR_PAXPAGE = 0x00001000,
-	GR_PAXSEGM = 0x00002000,
-	GR_PAXGCC = 0x00004000,
-	GR_PAXRANDMMAP = 0x00008000,
-	GR_PAXRANDEXEC = 0x00010000,
-	GR_PAXMPROTECT = 0x00020000,
-	GR_PROTSHM = 0x00040000,
-	GR_KILLPROC = 0x00080000,
-	GR_KILLIPPROC = 0x00100000,
+	GR_DUMMY 	= 0x00000800,
+	GR_PAXPAGE 	= 0x00001000,
+	GR_PAXSEGM 	= 0x00002000,
+	GR_PAXGCC 	= 0x00004000,
+	GR_PAXRANDMMAP 	= 0x00008000,
+	GR_PAXRANDEXEC 	= 0x00010000,
+	GR_PAXMPROTECT 	= 0x00020000,
+	GR_PROTSHM 	= 0x00040000,
+	GR_KILLPROC 	= 0x00080000,
+	GR_KILLIPPROC	= 0x00100000,
 	/* just a placeholder, this mode is only used in userspace */
-	GR_NOTROJAN = 0x00200000,
-	GR_PROTPROCFD = 0x00400000,
-	GR_PROCACCT = 0x00800000
+	GR_NOTROJAN 	= 0x00200000,
+	GR_PROTPROCFD 	= 0x00400000,
+	GR_PROCACCT 	= 0x00800000,
+	GR_RELAXPTRACE	= 0x01000000,
+	GR_NESTED	= 0x02000000
+};
+
+enum {
+	GR_ID_USER      = 0x01,
+	GR_ID_GROUP     = 0x02,
+};
+
+enum {
+	GR_ID_ALLOW     = 0x01,
+	GR_ID_DENY      = 0x02,
 };
 
 #define GR_CRASH_RES	11
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/grinternal.h linux-2.4.20-wolk4.16-fullkernel/include/linux/grinternal.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/grinternal.h	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/grinternal.h	2004-09-05 17:09:43.000000000 +0200
@@ -4,24 +4,34 @@
 #ifdef CONFIG_GRKERNSEC
 
 #include <linux/grdefs.h>
+#include <linux/gracl.h>
 #include <linux/grmsg.h>
 
+extern void gr_add_learn_entry(const char *fmt, ...);
 extern __u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
 			    const struct vfsmount *mnt);
 extern __u32 gr_check_create(const struct dentry *new_dentry,
 			     const struct dentry *parent,
 			     const struct vfsmount *mnt, const __u32 mode);
 extern int gr_check_protected_task(const struct task_struct *task);
-extern __inline__ __u32 to_gr_audit(const __u32 reqmode);
+extern __u32 to_gr_audit(const __u32 reqmode);
 extern int gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
 			    struct dentry *old_dentry,
 			    struct dentry *new_dentry,
 			    struct vfsmount *mnt, const __u8 replace);
 extern int gr_set_acls(const int type);
+extern int gr_acl_is_enabled(void);
+extern char gr_roletype_to_char(void);
 
 extern void gr_handle_alertkill(void);
 extern char *gr_to_filename(const struct dentry *dentry,
 			    const struct vfsmount *mnt);
+extern char *gr_to_filename1(const struct dentry *dentry,
+			    const struct vfsmount *mnt);
+extern char *gr_to_filename2(const struct dentry *dentry,
+			    const struct vfsmount *mnt);
+extern char *gr_to_filename3(const struct dentry *dentry,
+			    const struct vfsmount *mnt);
 
 extern int grsec_enable_link;
 extern int grsec_enable_fifo;
@@ -73,12 +83,25 @@ extern spinlock_t grsec_alert_lock;
 extern unsigned long grsec_alert_wtime;
 extern unsigned long grsec_alert_fyet;
 
-extern spinlock_t grsec_alertgood_lock;
-extern unsigned long grsec_alertgood_wtime;
-extern unsigned long grsec_alertgood_fyet;
-
 extern spinlock_t grsec_audit_lock;
-extern spinlock_t grsec_learn_lock;
+
+extern rwlock_t grsec_exec_file_lock;
+
+#define gr_task_fullpath(tsk) (tsk->exec_file ? \
+			gr_to_filename2(tsk->exec_file->f_dentry, \
+			tsk->exec_file->f_vfsmnt) : "/")
+
+#define gr_parent_task_fullpath(tsk) (tsk->p_pptr->exec_file ? \
+			gr_to_filename3(tsk->p_pptr->exec_file->f_dentry, \
+			tsk->p_pptr->exec_file->f_vfsmnt) : "/")
+
+#define gr_task_fullpath0(tsk) (tsk->exec_file ? \
+			gr_to_filename(tsk->exec_file->f_dentry, \
+			tsk->exec_file->f_vfsmnt) : "/")
+
+#define gr_parent_task_fullpath0(tsk) (tsk->p_pptr->exec_file ? \
+			gr_to_filename1(tsk->p_pptr->exec_file->f_dentry, \
+			tsk->p_pptr->exec_file->f_vfsmnt) : "/")
 
 #define proc_is_chrooted(tsk_a)  ((tsk_a->pid > 1) && \
 			  ((tsk_a->fs->root->d_inode->i_dev != \
@@ -91,10 +114,13 @@ extern spinlock_t grsec_learn_lock;
 			  (tsk_a->fs->root->d_inode->i_ino == \
 			  tsk_b->fs->root->d_inode->i_ino))
 
-#define DEFAULTSECARGS current->comm, current->pid, current->uid, \
-		       current->euid, current->p_pptr->comm, \
-		       current->p_pptr->pid, current->p_pptr->uid, \
-		       current->p_pptr->euid
+#define DEFAULTSECARGS gr_task_fullpath(current), current->comm, \
+		       current->pid, current->uid, \
+		       current->euid, current->gid, current->egid, \
+		       gr_parent_task_fullpath(current), \
+		       current->p_pptr->comm, current->p_pptr->pid, \
+		       current->p_pptr->uid, current->p_pptr->euid, \
+		       current->p_pptr->gid, current->p_pptr->egid
 
 #define GR_CHROOT_CAPS ( \
 	CAP_TO_MASK(CAP_FOWNER) | \
@@ -107,43 +133,28 @@ extern spinlock_t grsec_learn_lock;
 
 #define security_alert_good(normal_msg,args...) \
 ({ \
-	spin_lock(&grsec_alertgood_lock); \
-	\
-	if (!grsec_alertgood_wtime || jiffies - grsec_alertgood_wtime > CONFIG_GRKERNSEC_FLOODTIME * HZ) { \
-	    grsec_alertgood_wtime = jiffies; grsec_alertgood_fyet = 0; \
-	    if (current->curr_ip) \
-		printk(KERN_ALERT "grsec: From %u.%u.%u.%u: " normal_msg "\n", NIPQUAD(current->curr_ip) , ## args); \
-	    else \
-	    	printk(KERN_ALERT "grsec: " normal_msg "\n" , ## args); \
-	} else if((jiffies - grsec_alertgood_wtime < CONFIG_GRKERNSEC_FLOODTIME * HZ) && (grsec_alertgood_fyet < CONFIG_GRKERNSEC_FLOODBURST)) { \
-	    grsec_alertgood_fyet++; \
-	    if (current->curr_ip) \
-		printk(KERN_ALERT "grsec: From %u.%u.%u.%u: " normal_msg "\n", NIPQUAD(current->curr_ip) , ## args); \
-	    else \
-	    	printk(KERN_ALERT "grsec: " normal_msg "\n" , ## args); \
-	} else if (grsec_alertgood_fyet == CONFIG_GRKERNSEC_FLOODBURST) { \
-	    grsec_alertgood_wtime = jiffies; grsec_alertgood_fyet++; \
-	    printk(KERN_ALERT "grsec: more alerts, logging disabled for " \
-		    "%d seconds\n", CONFIG_GRKERNSEC_FLOODTIME); \
-	} \
-	\
-	spin_unlock(&grsec_alertgood_lock); \
-})
-
-#define security_alert(normal_msg,args...) \
-({ \
+	read_lock(&tasklist_lock); \
+	read_lock(&grsec_exec_file_lock); \
 	spin_lock(&grsec_alert_lock); \
 	\
 	if (!grsec_alert_wtime || jiffies - grsec_alert_wtime > CONFIG_GRKERNSEC_FLOODTIME * HZ) { \
 	    grsec_alert_wtime = jiffies; grsec_alert_fyet = 0; \
-	    if (current->curr_ip) \
+	    if (current->curr_ip && gr_acl_is_enabled()) \
+		printk(KERN_ALERT "grsec: From %u.%u.%u.%u: (%.64s:%c:%.950s) " normal_msg "\n", NIPQUAD(current->curr_ip), current->role->rolename, gr_roletype_to_char(), current->acl->filename , ## args); \
+	    else if (current->curr_ip) \
 		printk(KERN_ALERT "grsec: From %u.%u.%u.%u: " normal_msg "\n", NIPQUAD(current->curr_ip) , ## args); \
+	    else if (gr_acl_is_enabled()) \
+		printk(KERN_ALERT "grsec: (%.64s:%c:%.950s) " normal_msg "\n", current->role->rolename, gr_roletype_to_char(), current->acl->filename , ## args); \
 	    else \
 	    	printk(KERN_ALERT "grsec: " normal_msg "\n" , ## args); \
 	} else if((jiffies - grsec_alert_wtime < CONFIG_GRKERNSEC_FLOODTIME * HZ) && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) { \
 	    grsec_alert_fyet++; \
-	    if (current->curr_ip) \
+	    if (current->curr_ip && gr_acl_is_enabled()) \
+		printk(KERN_ALERT "grsec: From %u.%u.%u.%u: (%.64s:%c:%.950s) " normal_msg "\n", NIPQUAD(current->curr_ip), current->role->rolename, gr_roletype_to_char(), current->acl->filename , ## args); \
+	    else if (current->curr_ip) \
 		printk(KERN_ALERT "grsec: From %u.%u.%u.%u: " normal_msg "\n", NIPQUAD(current->curr_ip) , ## args); \
+	    else if (gr_acl_is_enabled()) \
+		printk(KERN_ALERT "grsec: (%.64s:%c:%.950s) " normal_msg "\n", current->role->rolename, gr_roletype_to_char(), current->acl->filename , ## args); \
 	    else \
 	    	printk(KERN_ALERT "grsec: " normal_msg "\n" , ## args); \
 	} else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) { \
@@ -152,26 +163,40 @@ extern spinlock_t grsec_learn_lock;
 		    "%d seconds\n", CONFIG_GRKERNSEC_FLOODTIME); \
 	} \
 	\
-	gr_handle_alertkill(); \
 	spin_unlock(&grsec_alert_lock); \
+	read_unlock(&grsec_exec_file_lock); \
+	read_unlock(&tasklist_lock); \
+})
+
+#define security_alert(normal_msg,args...) \
+({ \
+	security_alert_good(normal_msg,args); \
+	gr_handle_alertkill(); \
 })
 
 #define security_audit(normal_msg,args...) \
 ({ \
+	read_lock(&tasklist_lock); \
+	read_lock(&grsec_exec_file_lock); \
 	spin_lock(&grsec_audit_lock); \
-	if (current->curr_ip) \
-		printk(KERN_INFO "grsec: From %u.%u.%u.%u: " normal_msg "\n", \
-		       NIPQUAD(current->curr_ip) , ## args); \
+	if (current->curr_ip && gr_acl_is_enabled()) \
+	    printk(KERN_INFO "grsec: From %u.%u.%u.%u: (%.64s:%.950s) " normal_msg "\n", NIPQUAD(current->curr_ip), current->role->rolename, current->acl->filename , ## args); \
+	else if (current->curr_ip) \
+	    printk(KERN_INFO "grsec: From %u.%u.%u.%u: " normal_msg "\n", NIPQUAD(current->curr_ip) , ## args); \
+	else if (gr_acl_is_enabled()) \
+	    printk(KERN_INFO "grsec: (%.64s:%.950s) " normal_msg "\n", current->role->rolename, current->acl->filename , ## args); \
 	else \
-		printk(KERN_INFO "grsec: " normal_msg "\n", ## args); \
+	    printk(KERN_INFO "grsec: " normal_msg "\n" , ## args); \
 	spin_unlock(&grsec_audit_lock); \
+	read_unlock(&grsec_exec_file_lock); \
+	read_unlock(&tasklist_lock); \
 })
 
 #define security_learn(normal_msg,args...) \
 ({ \
-	spin_lock(&grsec_learn_lock); \
-	printk(KERN_INFO "grsec: " normal_msg "\n", ## args); \
-	spin_unlock(&grsec_learn_lock); \
+	preempt_disable(); \
+	gr_add_learn_entry(normal_msg "\n", ## args); \
+	preempt_enable(); \
 })
 
 #endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/grmsg.h linux-2.4.20-wolk4.16-fullkernel/include/linux/grmsg.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/grmsg.h	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/grmsg.h	2004-09-05 17:09:43.000000000 +0200
@@ -1,5 +1,5 @@
-#define DEFAULTSECMSG "(%.16s:%d) UID(%d) EUID(%d), parent (%.16s:%d) UID(%d) EUID(%d)"
-#define GR_ACL_PROCACCT_MSG "(%.16s:%d) IP:%u.%u.%u.%u TTY:%.64s UID(%d) EUID(%d) GID(%d) EGID(%d) run time:[%ud %uh %um %us] cpu time:[%ud %uh %um %us] %s with exit code %ld, parent (%.16s:%d) IP:%u.%u.%u.%u TTY:%.64s UID(%d) EUID(%d) GID(%d) EGID(%d)"
+#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%d/%d gid/egid:%d/%d, parent %.256s[%.16s:%d] uid/euid:%d/%d gid/egid:%d/%d"
+#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%u.%u.%u.%u TTY:%.64s uid/euid:%d/%d gid/egid:%d/%d run time:[%ud %uh %um %us] cpu time:[%ud %uh %um %us] %s with exit code %ld, parent %.256s[%.16s:%d] IP:%u.%u.%u.%u TTY:%.64s uid/euid:%d/%d gid/egid:%d/%d"
 #define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by " DEFAULTSECMSG
 #define GR_IOPERM_MSG "denied use of ioperm() by " DEFAULTSECMSG
 #define GR_IOPL_MSG "denied use of iopl() by " DEFAULTSECMSG
@@ -11,9 +11,10 @@
 #define GR_MEM_WRITE_MSG "attempted write of /dev/mem by " DEFAULTSECMSG
 #define GR_MEM_MMAP_MSG "attempted mmap write of /dev/[k]mem by " DEFAULTSECMSG
 #define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by " DEFAULTSECMSG
-#define GR_LEARN_AUDIT_MSG "LEARN:%d:%lu:%lu:%lu:%.950s:%lu"
+#define GR_LEARN_AUDIT_MSG "%s\t%u\t%u\t%u\t%.4095s\t%.4095s\t%lu\t%lu\t%.4095s\t%lu\t%u.%u.%u.%u"
 #define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by " DEFAULTSECMSG
 #define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by " DEFAULTSECMSG
+#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by " DEFAULTSECMSG
 #define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by " DEFAULTSECMSG
 #define GR_MKNOD_CHROOT_MSG "refused attempt to mknod %.950s from chroot by " DEFAULTSECMSG
 #define GR_MKNOD_ACL_MSG "%s mknod of %.950s by " DEFAULTSECMSG
@@ -46,24 +47,28 @@
 #define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by " DEFAULTSECMSG
 #define GR_INITF_ACL_MSG "init_variables() failed %s"
 #define GR_DISABLED_ACL_MSG "Error loading %s, trying to run kernel with acls disabled. To disable acls at startup use <kernel image name> gracl=off from your boot loader"
-#define GR_PROC_ACL_MSG "Proc handler: being fed garbage %d bytes sent %d required"
+#define GR_DEV_ACL_MSG "/dev/grsec: being fed garbage %d bytes sent %d required"
 #define GR_SHUTS_ACL_MSG "shutdown auth success for " DEFAULTSECMSG
 #define GR_SHUTF_ACL_MSG "shutdown auth failure for " DEFAULTSECMSG
-#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled acl for " DEFAULTSECMSG
+#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for " DEFAULTSECMSG
 #define GR_SEGVMODS_ACL_MSG "segvmod auth success for " DEFAULTSECMSG
 #define GR_SEGVMODF_ACL_MSG "segvmod auth failure for " DEFAULTSECMSG
-#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled acl for " DEFAULTSECMSG
+#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for " DEFAULTSECMSG
 #define GR_ENABLE_ACL_MSG "Loaded %s"
-#define GR_ENABLEF_ACL_MSG "Unable to load %s for " DEFAULTSECMSG " ACL system may already be enabled."
-#define GR_RELOADI_ACL_MSG "Ignoring reload request for disabled ACL"
+#define GR_ENABLEF_ACL_MSG "Unable to load %s for " DEFAULTSECMSG " RBAC system may already be enabled."
+#define GR_RELOADI_ACL_MSG "Ignoring reload request for disabled RBAC system"
 #define GR_RELOAD_ACL_MSG "Reloaded %s"
 #define GR_RELOADF_ACL_MSG "Failed reload of %s for " DEFAULTSECMSG
-#define GR_ADMINI_ACL_MSG "Ignoring change to admin mode for disabled acl for " DEFAULTSECMSG
-#define GR_ADMINS_ACL_MSG "successful change to admin mode (id %d) by " DEFAULTSECMSG
-#define GR_ADMINL_ACL_MSG "admin (id %d) mode exited by " DEFAULTSECMSG
-#define GR_ADMINF_ACL_MSG "admin auth failure for " DEFAULTSECMSG
+#define GR_SPROLEI_ACL_MSG "Ignoring change to special role for disabled RBAC system for " DEFAULTSECMSG
+#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by " DEFAULTSECMSG
+#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by " DEFAULTSECMSG
+#define GR_SPROLEF_ACL_MSG "special role %s failure for " DEFAULTSECMSG
+#define GR_UNSPROLEI_ACL_MSG "Ignoring unauth of special role for disabled RBAC system for " DEFAULTSECMSG
+#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by " DEFAULTSECMSG
+#define GR_UNSPROLEF_ACL_MSG "special role unauth of %s failure for " DEFAULTSECMSG
 #define GR_INVMODE_ACL_MSG "Invalid mode %d by " DEFAULTSECMSG
 #define GR_MAXPW_ACL_MSG "Maximum pw attempts reached (%d), locking password authentication"
+#define GR_MAXROLEPW_ACL_MSG "Maximum pw attempts reached (%d) trying to auth to special role %s, locking auth for role of " DEFAULTSECMSG
 #define GR_PRIORITY_CHROOT_MSG "attempted priority change of process (%.16s:%d) by " DEFAULTSECMSG
 #define GR_CAPSET_CHROOT_MSG "denied capset of (%.16s:%d) within chroot by " DEFAULTSECMSG
 #define GR_FAILFORK_MSG "failed fork with errno %d by " DEFAULTSECMSG
@@ -77,14 +82,17 @@
 #define GR_DEFACL_MSG "Fatal: Unable to find ACL for (%.16s:%d)"
 #define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by " DEFAULTSECMSG
 #define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by " DEFAULTSECMSG
-#define GR_SOCK_MSG "attempted socket(%d,%d,%d) by " DEFAULTSECMSG
+#define GR_SOCK_MSG "attempted socket(%.16s,%.16s,%.16s) by " DEFAULTSECMSG
+#define GR_SOCK2_MSG "attempted socket(%d,%.16s,%.16s) by " DEFAULTSECMSG
 #define GR_BIND_MSG "attempted bind() by " DEFAULTSECMSG
 #define GR_CONNECT_MSG "attempted connect by " DEFAULTSECMSG
-#define GR_BIND_ACL_MSG "attempted bind to %u.%u.%u.%u port %u sock type %u protocol %u by " DEFAULTSECMSG
-#define GR_CONNECT_ACL_MSG "attempted connect to %u.%u.%u.%u port %u sock type %u protocol %u by " DEFAULTSECMSG
-#define GR_IP_LEARN_MSG "LEARN:%d:%lu:%u.%u.%u.%u:%u:%u:%u:%u"
+#define GR_BIND_ACL_MSG "attempted bind to %u.%u.%u.%u port %u sock type %.16s protocol %.16s by " DEFAULTSECMSG
+#define GR_CONNECT_ACL_MSG "attempted connect to %u.%u.%u.%u port %u sock type %.16s protocol %.16s by " DEFAULTSECMSG
+#define GR_IP_LEARN_MSG "%s\t%u\t%u\t%u\t%.4095s\t%.4095s\t%u.%u.%u.%u\t%u\t%u\t%u\t%u\t%u.%u.%u.%u"
 #define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process " DEFAULTSECMSG
 #define GR_CAP_ACL_MSG "use of %s denied for " DEFAULTSECMSG
+#define GR_USRCHANGE_ACL_MSG "change to uid %d denied for " DEFAULTSECMSG
+#define GR_GRPCHANGE_ACL_MSG "change to gid %d denied for " DEFAULTSECMSG
 #define GR_REMOUNT_AUDIT_MSG "remount of %.30s by " DEFAULTSECMSG
 #define GR_UNMOUNT_AUDIT_MSG "unmount of %.30s by " DEFAULTSECMSG
 #define GR_MOUNT_AUDIT_MSG "mount %.30s to %.64s by " DEFAULTSECMSG
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/grsecurity.h linux-2.4.20-wolk4.16-fullkernel/include/linux/grsecurity.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/grsecurity.h	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/grsecurity.h	2004-09-05 17:09:43.000000000 +0200
@@ -1,10 +1,19 @@
 #ifndef GR_SECURITY_H
 #define GR_SECURITY_H
 
-extern int gr_pid_is_chrooted(const struct task_struct *p);
+extern void gr_handle_brute_attach(struct task_struct *p);
+extern void gr_handle_brute_check(void);
+
+extern int gr_check_user_change(int real, int effective, int fs);
+extern int gr_check_group_change(int real, int effective, int fs);
+
+extern void gr_add_to_task_ip_table(struct task_struct *p);
+extern void gr_del_task_from_ip_table(struct task_struct *p);
+
+extern int gr_pid_is_chrooted(struct task_struct *p);
 extern int gr_handle_chroot_nice(void);
 extern int gr_handle_chroot_sysctl(const int op);
-extern int gr_handle_chroot_capset(const struct task_struct *target);
+extern int gr_handle_chroot_capset(struct task_struct *target);
 extern int gr_handle_chroot_setpriority(const struct task_struct *p,
 					const int niceval);
 extern int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
@@ -22,6 +31,7 @@ extern int gr_handle_chroot_mount(const 
 extern int gr_handle_chroot_pivot(void);
 extern int gr_handle_chroot_unix(const pid_t pid);
 
+extern int gr_handle_rawio(const struct inode *inode);
 extern int gr_handle_nproc(void);
 
 extern void gr_handle_ioperm(void);
@@ -63,7 +73,7 @@ extern int gr_handle_hardlink(const stru
 			      struct inode *inode,
 			      const int mode, const char *to);
 
-extern int gr_is_capable(const int cap);
+extern int gr_task_is_capable(struct task_struct *task, const int cap);
 extern void gr_learn_resource(const struct task_struct *task, const int limit,
 			      const unsigned long wanted, const int gt);
 extern void gr_copy_label(struct task_struct *tsk);
@@ -71,7 +81,6 @@ extern void gr_handle_crash(struct task_
 extern int gr_handle_signal(const struct task_struct *p, const int sig);
 extern int gr_check_crash_uid(const uid_t uid);
 extern int gr_check_protected_task(const struct task_struct *task);
-extern void gr_set_kernel_label(struct task_struct *task);
 extern int gr_acl_handle_mmap(const struct file *file,
 			      const unsigned long prot);
 extern int gr_acl_handle_mprotect(const struct file *file,
@@ -84,20 +93,22 @@ extern __u32 gr_acl_handle_utime(const s
 extern __u32 gr_acl_handle_access(const struct dentry *dentry,
 				  const struct vfsmount *mnt, const int fmode);
 extern __u32 gr_acl_handle_fchmod(const struct dentry *dentry,
-				  const struct vfsmount *mnt);
+				  const struct vfsmount *mnt, mode_t mode);
 extern __u32 gr_acl_handle_chmod(const struct dentry *dentry,
-				 const struct vfsmount *mnt);
+				 const struct vfsmount *mnt, mode_t mode);
 extern __u32 gr_acl_handle_chown(const struct dentry *dentry,
 				 const struct vfsmount *mnt);
-extern int gr_handle_ptrace_exec(const struct dentry *dentry,
-				 const struct vfsmount *mnt);
 extern int gr_handle_ptrace(struct task_struct *task, const long request);
+extern int gr_handle_proc_ptrace(struct task_struct *task);
 extern int gr_handle_mmap(const struct file *filp, const unsigned long prot);
 extern __u32 gr_acl_handle_execve(const struct dentry *dentry,
 				  const struct vfsmount *mnt);
 extern int gr_check_crash_exec(const struct file *filp);
 extern int gr_acl_is_enabled(void);
-extern void gr_set_proc_label(const struct dentry *dentry,
+extern void gr_set_kernel_label(struct task_struct *task);
+extern void gr_set_role_label(struct task_struct *task, const uid_t uid,
+			      const gid_t gid);
+extern int gr_set_proc_label(const struct dentry *dentry,
 			      const struct vfsmount *mnt);
 extern __u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
 				       const struct vfsmount *mnt);
@@ -105,12 +116,14 @@ extern __u32 gr_acl_handle_open(const st
 				const struct vfsmount *mnt, const int fmode);
 extern __u32 gr_acl_handle_creat(const struct dentry *dentry,
 				 const struct dentry *p_dentry,
-				 const struct vfsmount *p_mnt, const int fmode);
+				 const struct vfsmount *p_mnt, const int fmode,
+				 const int imode);
 extern void gr_handle_create(const struct dentry *dentry,
 			     const struct vfsmount *mnt);
 extern __u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
 				 const struct dentry *parent_dentry,
-				 const struct vfsmount *parent_mnt);
+				 const struct vfsmount *parent_mnt,
+				 const int mode);
 extern __u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
 				 const struct dentry *parent_dentry,
 				 const struct vfsmount *parent_mnt);
@@ -128,22 +141,21 @@ extern __u32 gr_acl_handle_link(const st
 				const struct vfsmount *parent_mnt,
 				const struct dentry *old_dentry,
 				const struct vfsmount *old_mnt, const char *to);
-extern __u32 gr_check_link(const struct dentry *new_dentry,
-			   const struct dentry *parent_dentry,
-			   const struct vfsmount *parent_mnt,
-			   const struct dentry *old_dentry,
-			   const struct vfsmount *old_mnt);
 extern int gr_acl_handle_rename(struct dentry *new_dentry,
 				struct dentry *parent_dentry,
 				const struct vfsmount *parent_mnt,
 				struct dentry *old_dentry,
 				struct inode *old_parent_inode,
 				struct vfsmount *old_mnt, const char *newname);
+extern __u32 gr_check_link(const struct dentry *new_dentry,
+			   const struct dentry *parent_dentry,
+			   const struct vfsmount *parent_mnt,
+			   const struct dentry *old_dentry,
+			   const struct vfsmount *old_mnt);
 extern __u32 gr_acl_handle_filldir(const struct dentry *dentry,
 				   const struct vfsmount *mnt, const ino_t ino);
 extern __u32 gr_acl_handle_unix(const struct dentry *dentry,
 				const struct vfsmount *mnt);
-extern void gr_set_pax_flags(struct task_struct *task);
 extern void gr_acl_handle_exit(void);
 extern void gr_acl_handle_psacct(struct task_struct *task, const long code);
 extern int gr_acl_handle_procpidmem(const struct task_struct *task);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/highuid.h linux-2.4.20-wolk4.16-fullkernel/include/linux/highuid.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/highuid.h	2001-11-22 20:46:18.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/highuid.h	2004-09-05 15:45:38.000000000 +0200
@@ -75,6 +75,8 @@ extern int overflowgid;
 #define SET_STAT_UID(stat, uid)		(stat).st_uid = (uid)
 #define SET_STAT_GID(stat, gid)		(stat).st_gid = (gid)
 
+#define low2highuid(uid) (uid)
+#define low2highgid(gid) (gid)
 #endif /* CONFIG_UID16 */
 
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/if_bonding.h linux-2.4.20-wolk4.16-fullkernel/include/linux/if_bonding.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/if_bonding.h	2004-06-29 11:25:07.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/if_bonding.h	2004-09-05 15:54:58.000000000 +0200
@@ -32,6 +32,9 @@
  * 2003/05/01 - Amir Noam <amir.noam at intel dot com>
  *	- Added ABI version control to restore compatibility between
  *	  new/old ifenslave and new/old bonding.
+ *
+ * 2003/12/01 - Shmulik Hen <shmulik.hen at intel dot com>
+ *	- Code cleanup and style changes
  */
 
 #ifndef _LINUX_IF_BONDING_H
@@ -88,7 +91,7 @@ typedef struct ifbond {
 typedef struct ifslave
 {
 	__s32 slave_id; /* Used as an IN param to the BOND_SLAVE_INFO_QUERY ioctl */
-	__s8 slave_name[IFNAMSIZ];
+	char slave_name[IFNAMSIZ];
 	__s8 link;
 	__s8 state;
 	__u32  link_failure_count;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/if_vlan.h linux-2.4.20-wolk4.16-fullkernel/include/linux/if_vlan.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/if_vlan.h	2004-06-29 11:25:04.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/if_vlan.h	2004-09-05 15:54:58.000000000 +0200
@@ -200,6 +200,148 @@ static inline int vlan_hwaccel_receive_s
 {
 	return __vlan_hwaccel_rx(skb, grp, vlan_tag, 1);
 }
+
+/**
+ * __vlan_put_tag - regular VLAN tag inserting
+ * @skb: skbuff to tag
+ * @tag: VLAN tag to insert
+ *
+ * Inserts the VLAN tag into @skb as part of the payload
+ * Returns a VLAN tagged skb. If a new skb is created, @skb is freed.
+ * 
+ * Following the skb_unshare() example, in case of error, the calling function
+ * doesn't have to worry about freeing the original skb.
+ */
+static inline struct sk_buff *__vlan_put_tag(struct sk_buff *skb, unsigned short tag)
+{
+	struct vlan_ethhdr *veth;
+
+	if (skb_headroom(skb) < VLAN_HLEN) {
+		struct sk_buff *sk_tmp = skb;
+		skb = skb_realloc_headroom(sk_tmp, VLAN_HLEN);
+		kfree_skb(sk_tmp);
+		if (!skb) {
+			printk(KERN_ERR "vlan: failed to realloc headroom\n");
+			return NULL;
+		}
+	} else {
+		skb = skb_unshare(skb, GFP_ATOMIC);
+		if (!skb) {
+			printk(KERN_ERR "vlan: failed to unshare skbuff\n");
+			return NULL;
+		}
+	}
+
+	veth = (struct vlan_ethhdr *)skb_push(skb, VLAN_HLEN);
+
+	/* Move the mac addresses to the beginning of the new header. */
+	memmove(skb->data, skb->data + VLAN_HLEN, 2 * VLAN_ETH_ALEN);
+
+	/* first, the ethernet type */
+	veth->h_vlan_proto = __constant_htons(ETH_P_8021Q);
+
+	/* now, the tag */
+	veth->h_vlan_TCI = htons(tag);
+
+	return skb;
+}
+
+/**
+ * __vlan_hwaccel_put_tag - hardware accelerated VLAN inserting
+ * @skb: skbuff to tag
+ * @tag: VLAN tag to insert
+ *
+ * Puts the VLAN tag in @skb->cb[] and lets the device do the rest
+ */
+static inline struct sk_buff *__vlan_hwaccel_put_tag(struct sk_buff *skb, unsigned short tag)
+{
+	struct vlan_skb_tx_cookie *cookie;
+
+	cookie = VLAN_TX_SKB_CB(skb);
+	cookie->magic = VLAN_TX_COOKIE_MAGIC;
+	cookie->vlan_tag = tag;
+
+	return skb;
+}
+
+#define HAVE_VLAN_PUT_TAG
+
+/**
+ * vlan_put_tag - inserts VLAN tag according to device features
+ * @skb: skbuff to tag
+ * @tag: VLAN tag to insert
+ *
+ * Assumes skb->dev is the target that will xmit this frame.
+ * Returns a VLAN tagged skb.
+ */
+static inline struct sk_buff *vlan_put_tag(struct sk_buff *skb, unsigned short tag)
+{
+	if (skb->dev->features & NETIF_F_HW_VLAN_TX) {
+		return __vlan_hwaccel_put_tag(skb, tag);
+	} else {
+		return __vlan_put_tag(skb, tag);
+	}
+}
+
+/**
+ * __vlan_get_tag - get the VLAN ID that is part of the payload
+ * @skb: skbuff to query
+ * @tag: buffer to store vlaue
+ * 
+ * Returns error if the skb is not of VLAN type
+ */
+static inline int __vlan_get_tag(struct sk_buff *skb, unsigned short *tag)
+{
+	struct vlan_ethhdr *veth = (struct vlan_ethhdr *)skb->data;
+
+	if (veth->h_vlan_proto != __constant_htons(ETH_P_8021Q)) {
+		return -EINVAL;
+	}
+
+	*tag = ntohs(veth->h_vlan_TCI);
+
+	return 0;
+}
+
+/**
+ * __vlan_hwaccel_get_tag - get the VLAN ID that is in @skb->cb[]
+ * @skb: skbuff to query
+ * @tag: buffer to store vlaue
+ * 
+ * Returns error if @skb->cb[] is not set correctly
+ */
+static inline int __vlan_hwaccel_get_tag(struct sk_buff *skb, unsigned short *tag)
+{
+	struct vlan_skb_tx_cookie *cookie;
+
+	cookie = VLAN_TX_SKB_CB(skb);
+	if (cookie->magic == VLAN_TX_COOKIE_MAGIC) {
+		*tag = cookie->vlan_tag;
+		return 0;
+	} else {
+		*tag = 0;
+		return -EINVAL;
+	}
+}
+
+#define HAVE_VLAN_GET_TAG
+
+/**
+ * vlan_get_tag - get the VLAN ID from the skb
+ * @skb: skbuff to query
+ * @tag: buffer to store vlaue
+ * 
+ * Returns error if the skb is not VLAN tagged
+ */
+static inline int vlan_get_tag(struct sk_buff *skb, unsigned short *tag)
+{
+	if (skb->dev->features & NETIF_F_HW_VLAN_TX) {
+		return __vlan_hwaccel_get_tag(skb, tag);
+	} else {
+		return __vlan_get_tag(skb, tag);
+	}
+}
+
 #endif /* __KERNEL__ */
 
 /* VLAN IOCTLs are found in sockios.h */
@@ -213,7 +355,9 @@ enum vlan_ioctl_cmds {
 	GET_VLAN_INGRESS_PRIORITY_CMD,
 	GET_VLAN_EGRESS_PRIORITY_CMD,
 	SET_VLAN_NAME_TYPE_CMD,
-	SET_VLAN_FLAG_CMD
+	SET_VLAN_FLAG_CMD,
+        GET_VLAN_REALDEV_NAME_CMD, /* If this works, you know it's a VLAN device, btw */
+        GET_VLAN_VID_CMD /* Get the VID of this VLAN (specified by name) */
 };
 
 enum vlan_name_types {
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/input.h linux-2.4.20-wolk4.16-fullkernel/include/linux/input.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/input.h	2004-06-29 11:22:52.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/input.h	2004-09-05 16:04:42.000000000 +0200
@@ -472,7 +472,8 @@ struct input_event {
 #define BUS_PCI			0x01
 #define BUS_ISAPNP		0x02
 #define BUS_USB			0x03
-#define BUS_HIL                 0x04
+#define BUS_HIL			0x04
+#define BUS_BLUETOOTH		0x05
 
 #define BUS_ISA			0x10
 #define BUS_I8042		0x11
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/kmap_types.h linux-2.4.20-wolk4.16-fullkernel/include/linux/kmap_types.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/kmap_types.h	2004-06-29 11:26:00.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/kmap_types.h	2004-09-05 16:04:20.000000000 +0200
@@ -7,8 +7,8 @@ enum km_type {
 	KM_SKB_DATA_SOFTIRQ,
 	KM_USER0,
 	KM_USER1,
-	KM_BH_IRQ,
 	KM_BIO_IRQ,
+	KM_BH_IRQ,
 	KM_IRQ0,
 	KM_IRQ1,
 	KM_SOFTIRQ0,
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/loop.h linux-2.4.20-wolk4.16-fullkernel/include/linux/loop.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/loop.h	2004-06-29 11:31:54.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/loop.h	2004-09-09 12:48:49.000000000 +0200
@@ -69,6 +69,10 @@ struct loop_device {
 	unsigned long		lo_offs_sec;
 	unsigned long		lo_iv_remove;
 	unsigned char		lo_crypt_name[LO_NAME_SIZE];
+#if CONFIG_BLK_DEV_LOOP_KEYSCRUB
+	void			(*lo_keyscrub_fn)(void *);
+	void			*lo_keyscrub_ptr;
+#endif
 };
 
 typedef	int (* transfer_proc_t)(struct loop_device *, int cmd,
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/mm.h linux-2.4.20-wolk4.16-fullkernel/include/linux/mm.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/mm.h	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/mm.h	2004-09-05 17:09:43.000000000 +0200
@@ -125,7 +125,6 @@ struct vm_area_struct {
 #define VM_DONTCOPY	0x00020000      /* Do not copy this vma on fork */
 #define VM_DONTEXPAND	0x00040000	/* Cannot expand with mremap() */
 #define VM_RESERVED	0x00080000	/* Don't unmap it from swap_out */
-#define VM_NO_UNLOCK	0x00800000	/* do not unlock */
 
 #if defined(CONFIG_GRKERNSEC_PAX_SEGMEXEC) || defined(CONFIG_GRKERNSEC_PAX_RANDEXEC)
 #define VM_MIRROR	0x00100000	/* vma is mirroring another */
@@ -186,7 +185,6 @@ struct vm_operations_struct {
 	struct page * (*nopage)(struct vm_area_struct * area, unsigned long address, int unused);
 #define HAVE_VMOP_MPROTECT
 	int (*mprotect)(struct vm_area_struct * area, unsigned int newflags);
-	int (*populate)(struct vm_area_struct * area, unsigned long address, unsigned long len, pgprot_t prot, unsigned long pgoff, int nonblock);
 };
 
 /* forward declaration; pte_chain is meant to be internal to rmap.c */
@@ -630,7 +628,7 @@ extern void FASTCALL(free_exact(void * a
 #define __free_page(page) __free_pages((page), 0)
 #define free_page(addr) free_pages((addr),0)
 
-extern void FASTCALL(fixup_freespace(struct zone_struct *));
+extern void FASTCALL(fixup_freespace(struct zone_struct *, int));
 extern void show_free_areas(void);
 extern void show_free_areas_node(pg_data_t *pgdat);
 
@@ -639,7 +637,7 @@ extern void clear_page_tables(struct mm_
 extern int fail_writepage(struct page *);
 struct page * shmem_nopage(struct vm_area_struct * vma, unsigned long address, int unused);
 struct file *shmem_file_setup(char * name, loff_t size);
-extern int shmem_lock(struct file * file, int lock);
+extern void shmem_lock(struct file * file, int lock);
 extern int shmem_zero_setup(struct vm_area_struct *);
 
 extern void zap_page_range(struct mm_struct *mm, unsigned long address, unsigned long size);
@@ -652,8 +650,6 @@ extern int vmtruncate(struct inode * ino
 extern pmd_t *FASTCALL(__pmd_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address));
 extern pte_t *FASTCALL(pte_alloc_kernel(struct mm_struct *mm, pmd_t *pmd, unsigned long address));
 extern pte_t *FASTCALL(pte_alloc_map(struct mm_struct *mm, pmd_t *pmd, unsigned long address));
-extern int install_page(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long addr, struct page *page, pgprot_t prot);
-extern long sys_remap_file_pages(unsigned long start, unsigned long size, unsigned long prot, unsigned long pgoff, unsigned long nonblock);
 extern int handle_mm_fault(struct mm_struct *mm,struct vm_area_struct *vma, unsigned long address, int write_access);
 extern int make_pages_present(unsigned long addr, unsigned long end);
 extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
@@ -791,17 +787,6 @@ static inline int __can_vma_merge(struct
 	return 1;
 }
 
-/* mlock can just return an instant EPERM if the caller has no
-   permission to do any memory locking. */
-static inline int can_do_mlock(void)
-{
-	if (capable(CAP_IPC_LOCK))
-		return 1;
-	if (current->rlim[RLIMIT_MEMLOCK].rlim_cur != 0)
-		return 1;
-	return 0;
-}
-
 struct zone_t;
 /* filemap.c */
 extern void remove_inode_page(struct page *);
@@ -861,6 +846,11 @@ static inline int expand_stack(struct vm
 {
 	unsigned long grow;
 
+#if defined(CONFIG_GRKERNSEC_PAX_SEGMEXEC) || defined(CONFIG_GRKERNSEC_PAX_RANDEXEC)
+	struct vm_area_struct * vma_m = NULL;
+	unsigned long address_m = 0UL;
+#endif
+
 	/*
 	 * vma->vm_start/vm_end cannot change under us because the caller is required
 	 * to hold the mmap_sem in write mode. We need to get the spinlock only
@@ -876,9 +866,6 @@ static inline int expand_stack(struct vm
 
 #if defined(CONFIG_GRKERNSEC_PAX_SEGMEXEC) || defined(CONFIG_GRKERNSEC_PAX_RANDEXEC)
 	if (vma->vm_flags & VM_MIRROR) {
-		struct vm_area_struct * vma_m;
-		unsigned long address_m;
-
 		address_m = vma->vm_start + (unsigned long)vma->vm_private_data;
 		vma_m = find_vma(vma->vm_mm, address_m);
 		if (!vma_m || vma_m->vm_start != address_m || !(vma_m->vm_flags & VM_MIRROR) ||
@@ -897,12 +884,6 @@ static inline int expand_stack(struct vm
 			spin_unlock(&vma->vm_mm->page_table_lock);
 			return -ENOMEM;
 		}
-
-		vma_m->vm_start = address_m;
-		vma_m->vm_pgoff -= grow;
-		vma_m->vm_mm->total_vm += grow;
-		if (vma_m->vm_flags & VM_LOCKED)
-			vma_m->vm_mm->locked_vm += grow;
 	} else
 #endif
 
@@ -919,6 +900,17 @@ static inline int expand_stack(struct vm
 	vma->vm_mm->total_vm += grow;
 	if (vma->vm_flags & VM_LOCKED)
 		vma->vm_mm->locked_vm += grow;
+
+#if defined(CONFIG_GRKERNSEC_PAX_SEGMEXEC) || defined(CONFIG_GRKERNSEC_PAX_RANDEXEC)
+	if (vma->vm_flags & VM_MIRROR) {
+		vma_m->vm_start = address_m;
+		vma_m->vm_pgoff -= grow;
+		vma_m->vm_mm->total_vm += grow;
+		if (vma_m->vm_flags & VM_LOCKED)
+			vma_m->vm_mm->locked_vm += grow;
+	}
+#endif
+
 	spin_unlock(&vma->vm_mm->page_table_lock);
 	return 0;
 }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/mman.h linux-2.4.20-wolk4.16-fullkernel/include/linux/mman.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/mman.h	2004-06-29 11:31:19.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/mman.h	2004-09-05 16:09:14.000000000 +0200
@@ -6,12 +6,4 @@
 #define MREMAP_MAYMOVE	1
 #define MREMAP_FIXED	2
 
-#ifndef MAP_POPULATE
-# define MAP_POPULATE 0x8000
-#endif
-
-#ifndef MAP_NONBLOCK
-# define MAP_NONBLOCK 0x10000
-#endif
-
 #endif /* _LINUX_MMAN_H */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/mtio.h linux-2.4.20-wolk4.16-fullkernel/include/linux/mtio.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/mtio.h	2001-11-22 20:47:07.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/mtio.h	2004-09-05 16:06:37.000000000 +0200
@@ -64,6 +64,7 @@ struct	mtop {
 #define MTCOMPRESSION 32/* control compression with SCSI mode page 15 */
 #define MTSETPART 33	/* Change the active tape partition */
 #define MTMKPART  34	/* Format the tape with one or two partitions */
+#define MTREADY   35	/* Get drive ready status */
 
 /* structure for MTIOCGET - mag tape get status command */
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/net.h linux-2.4.20-wolk4.16-fullkernel/include/linux/net.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/net.h	2001-11-22 20:46:19.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/net.h	2004-09-05 16:04:42.000000000 +0200
@@ -139,6 +139,7 @@ extern int   	sock_sendmsg(struct socket
 extern int	sock_recvmsg(struct socket *, struct msghdr *m, int len, int flags);
 extern int	sock_readv_writev(int type, struct inode * inode, struct file * file,
 				  const struct iovec * iov, long count, long size);
+extern struct socket *sockfd_lookup(int fd, int *err);
 
 extern int	net_ratelimit(void);
 extern unsigned long net_random(void);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/netdevice.h linux-2.4.20-wolk4.16-fullkernel/include/linux/netdevice.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/netdevice.h	2004-06-29 11:31:26.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/netdevice.h	2004-09-05 16:06:32.000000000 +0200
@@ -104,41 +104,43 @@ struct ethtool_ops;
  
 struct net_device_stats
 {
-	unsigned long	rx_packets;		/* total packets received	*/
-	unsigned long	tx_packets;		/* total packets transmitted	*/
-        /* rx and tx counters fixed up to 64-bit */
-        long long       rx_bytes;               /* total bytes received         */
-        long long       tx_bytes;               /* total bytes transmitted      */
-	unsigned long	rx_errors;		/* bad packets received		*/
-	unsigned long	tx_errors;		/* packet transmit problems	*/
-	unsigned long	rx_dropped;		/* no space in linux buffers	*/
-	unsigned long	tx_dropped;		/* no space available in linux	*/
-	unsigned long	multicast;		/* multicast packets received	*/
-	unsigned long	collisions;
+	unsigned long		rx_packets;		/* total packets received	*/
+	unsigned long		tx_packets;		/* total packets transmitted	*/
+
+	/* rx and tx counters fixed up to 64-bit */
+	unsigned long long	rx_bytes;		/* total bytes received		*/
+	unsigned long long	tx_bytes;		/* total bytes transmitted	*/
+
+	unsigned long		rx_errors;		/* bad packets received		*/
+	unsigned long		tx_errors;		/* packet transmit problems	*/
+	unsigned long		rx_dropped;		/* no space in linux buffers	*/
+	unsigned long		tx_dropped;		/* no space available in linux	*/
+	unsigned long		multicast;		/* multicast packets received	*/
+	unsigned long		collisions;
 
 	/* detailed rx_errors: */
-	unsigned long	rx_length_errors;
-	unsigned long	rx_over_errors;		/* receiver ring buff overflow	*/
-	unsigned long	rx_crc_errors;		/* recved pkt with crc error	*/
-	unsigned long	rx_frame_errors;	/* recv'd frame alignment error */
-	unsigned long	rx_fifo_errors;		/* recv'r fifo overrun		*/
-	unsigned long	rx_missed_errors;	/* receiver missed packet	*/
+	unsigned long		rx_length_errors;
+	unsigned long		rx_over_errors;		/* receiver ring buff overflow	*/
+	unsigned long		rx_crc_errors;		/* recved pkt with crc error	*/
+	unsigned long		rx_frame_errors;	/* recv'd frame alignment error */
+	unsigned long		rx_fifo_errors;		/* recv'r fifo overrun		*/
+	unsigned long		rx_missed_errors;	/* receiver missed packet	*/
 
 	/* detailed tx_errors */
-	unsigned long	tx_aborted_errors;
-	unsigned long	tx_carrier_errors;
-	unsigned long	tx_fifo_errors;
-	unsigned long	tx_heartbeat_errors;
-	unsigned long	tx_window_errors;
+	unsigned long		tx_aborted_errors;
+	unsigned long		tx_carrier_errors;
+	unsigned long		tx_fifo_errors;
+	unsigned long		tx_heartbeat_errors;
+	unsigned long		tx_window_errors;
 	
 	/* for cslip etc */
-	unsigned long	rx_compressed;
-	unsigned long	tx_compressed;
+	unsigned long		rx_compressed;
+	unsigned long		tx_compressed;
 
 	/* for Ethernet devices */
-	unsigned long	media;
-	unsigned long	duplex_mode;
-	int		link_stat;
+	unsigned long		media;
+	unsigned long		duplex_mode;
+	int			link_stat;
 
 };
 
@@ -377,8 +379,8 @@ struct net_device
 
 	struct Qdisc		*qdisc;
 	struct Qdisc		*qdisc_sleeping;
-	struct Qdisc		*qdisc_list;
 	struct Qdisc		*qdisc_ingress;
+	struct list_head	qdisc_list;
 	unsigned long		tx_queue_len;	/* Max frames per queue allowed */
 
 	/* Intercepted ptype */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/netfilter_ipv4/ip_conntrack.h linux-2.4.20-wolk4.16-fullkernel/include/linux/netfilter_ipv4/ip_conntrack.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/netfilter_ipv4/ip_conntrack.h	2004-06-29 11:25:35.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/netfilter_ipv4/ip_conntrack.h	2004-09-05 16:00:30.000000000 +0200
@@ -257,6 +257,7 @@ extern void ip_ct_death_by_timeout(unsig
 /* Call me when a conntrack is destroyed. */
 extern void (*ip_conntrack_destroyed)(struct ip_conntrack *conntrack);
 
+extern int ip_ct_no_defrag;
 /* Returns new sk_buff, or NULL */
 struct sk_buff *
 ip_ct_gather_frags(struct sk_buff *skb);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/netfilter_ipv4/ip_conntrack_ftp.h linux-2.4.20-wolk4.16-fullkernel/include/linux/netfilter_ipv4/ip_conntrack_ftp.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/netfilter_ipv4/ip_conntrack_ftp.h	2002-11-29 00:53:15.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/netfilter_ipv4/ip_conntrack_ftp.h	2004-09-05 15:59:18.000000000 +0200
@@ -4,11 +4,6 @@
 
 #ifdef __KERNEL__
 
-#include <linux/netfilter_ipv4/lockhelp.h>
-
-/* Protects ftp part of conntracks */
-DECLARE_LOCK_EXTERN(ip_ftp_lock);
-
 #define FTP_PORT	21
 
 #endif /* __KERNEL__ */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/netfilter_ipv4/ip_conntrack_irc.h linux-2.4.20-wolk4.16-fullkernel/include/linux/netfilter_ipv4/ip_conntrack_irc.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/netfilter_ipv4/ip_conntrack_irc.h	2002-11-29 00:53:15.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/netfilter_ipv4/ip_conntrack_irc.h	2004-09-05 15:59:18.000000000 +0200
@@ -33,8 +33,6 @@ struct ip_ct_irc_master {
 
 #ifdef __KERNEL__
 
-#include <linux/netfilter_ipv4/lockhelp.h>
-
 #define IRC_PORT	6667
 
 struct dccproto {
@@ -42,9 +40,6 @@ struct dccproto {
 	int matchlen;
 };
 
-/* Protects irc part of conntracks */
-DECLARE_LOCK_EXTERN(ip_irc_lock);
-
 #endif /* __KERNEL__ */
 
 #endif /* _IP_CONNTRACK_IRC_H */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/netlink.h linux-2.4.20-wolk4.16-fullkernel/include/linux/netlink.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/netlink.h	2004-06-29 11:26:18.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/netlink.h	2004-09-05 16:06:06.000000000 +0200
@@ -67,7 +67,8 @@ struct nlmsghdr
 #define NLMSG_DATA(nlh)  ((void*)(((char*)nlh) + NLMSG_LENGTH(0)))
 #define NLMSG_NEXT(nlh,len)	 ((len) -= NLMSG_ALIGN((nlh)->nlmsg_len), \
 				  (struct nlmsghdr*)(((char*)(nlh)) + NLMSG_ALIGN((nlh)->nlmsg_len)))
-#define NLMSG_OK(nlh,len) ((len) > 0 && (nlh)->nlmsg_len >= sizeof(struct nlmsghdr) && \
+#define NLMSG_OK(nlh,len) ((len) >= (int)sizeof(struct nlmsghdr) && \
+			   (nlh)->nlmsg_len >= sizeof(struct nlmsghdr) && \
 			   (nlh)->nlmsg_len <= (len))
 #define NLMSG_PAYLOAD(nlh,len) ((nlh)->nlmsg_len - NLMSG_SPACE((len)))
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/nfsd/xdr3.h linux-2.4.20-wolk4.16-fullkernel/include/linux/nfsd/xdr3.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/nfsd/xdr3.h	2004-06-29 11:23:03.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/nfsd/xdr3.h	2004-09-05 15:45:54.000000000 +0200
@@ -42,7 +42,7 @@ struct nfsd3_writeargs {
 	__u32			count;
 	int			stable;
 	__u8 *			data;
-	int			len;
+	__u32			len;
 };
 
 struct nfsd3_createargs {
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/pci_ids.h linux-2.4.20-wolk4.16-fullkernel/include/linux/pci_ids.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/pci_ids.h	2004-06-29 11:31:13.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/pci_ids.h	2004-09-05 16:05:51.000000000 +0200
@@ -602,6 +602,7 @@
 #define PCI_DEVICE_ID_HP_ZX1_IOC	0x122a
 #define PCI_DEVICE_ID_HP_PCIX_LBA	0x122e
 #define PCI_DEVICE_ID_HP_SX1000_IOC	0x127c
+#define PCI_DEVICE_ID_HP_CISS		0x3210
 
 #define PCI_VENDOR_ID_PCTECH		0x1042
 #define PCI_DEVICE_ID_PCTECH_RZ1000	0x1000
@@ -977,17 +978,27 @@
 #define PCI_DEVICE_ID_NVIDIA_UVTNT2			0x002D
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE		0x0035
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA		0x0036
+#define PCI_DEVICE_ID_NVIDIA_NVENET_10			0x0037
+#define PCI_DEVICE_ID_NVIDIA_NVENET_11			0x0038
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA2		0x003e
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_IDE		0x0053
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA		0x0054
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA2		0x0055
+#define PCI_DEVICE_ID_NVIDIA_NVENET_8			0x0056
+#define PCI_DEVICE_ID_NVIDIA_NVENET_9			0x0057
 #define PCI_DEVICE_ID_NVIDIA_NFORCE2_IDE		0x0065
+#define PCI_DEVICE_ID_NVIDIA_NVENET_2			0x0066
 #define PCI_DEVICE_ID_NVIDIA_NFORCE2S_IDE		0x0085
+#define PCI_DEVICE_ID_NVIDIA_NVENET_4			0x0086
+#define PCI_DEVICE_ID_NVIDIA_NVENET_5			0x008c
 #define PCI_DEVICE_ID_NVIDIA_NFORCE2S_SATA		0x008e
 #define PCI_DEVICE_ID_NVIDIA_ITNT2			0x00A0
 #define PCI_DEVICE_ID_NVIDIA_NFORCE3_IDE		0x00d5
+#define PCI_DEVICE_ID_NVIDIA_NVENET_3			0x00d5
+#define PCI_DEVICE_ID_NVIDIA_NVENET_7			0x00df
 #define PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA		0x00e3
 #define PCI_DEVICE_ID_NVIDIA_NFORCE3S_IDE		0x00e5
+#define PCI_DEVICE_ID_NVIDIA_NVENET_6			0x00e6
 #define PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA2		0x00ee
 #define PCI_DEVICE_ID_NVIDIA_GEFORCE_SDR		0x0100
 #define PCI_DEVICE_ID_NVIDIA_GEFORCE_DDR		0x0101
@@ -1014,6 +1025,7 @@
 #define PCI_DEVICE_ID_NVIDIA_IGEFORCE2			0x01a0
 #define PCI_DEVICE_ID_NVIDIA_NFORCE			0x01a4
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_IDE			0x01bc
+#define PCI_DEVICE_ID_NVIDIA_NVENET_1			0x01c3
 #define PCI_DEVICE_ID_NVIDIA_NFORCE2			0x01e0
 #define PCI_DEVICE_ID_NVIDIA_NFORCE3			0x00d1
 #define PCI_DEVICE_ID_NVIDIA_GEFORCE3			0x0200
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/pkt_sched.h linux-2.4.20-wolk4.16-fullkernel/include/linux/pkt_sched.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/pkt_sched.h	2004-06-29 11:25:53.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/pkt_sched.h	2004-09-05 17:14:41.000000000 +0200
@@ -157,13 +157,6 @@ enum
 
 /* SFQ section */
 
-enum
-{
-	TCA_SFQ_HASH_CLASSIC,
-	TCA_SFQ_HASH_DST,
-	TCA_SFQ_HASH_SRC,
-};
-
 struct tc_sfq_qopt
 {
 	unsigned	quantum;	/* Bytes per round allocated to flow */
@@ -171,7 +164,6 @@ struct tc_sfq_qopt
 	__u32		limit;		/* Maximal packets in queue */
 	unsigned	divisor;	/* Hash divisor  */
 	unsigned	flows;		/* Maximal number of flows  */
-	unsigned	hash_kind;	/* Hash function to use for flow identification */
 };
 
 /*
@@ -181,8 +173,6 @@ struct tc_sfq_qopt
  *
  *	The only reason for this is efficiency, it is possible
  *	to change these parameters in compile time.
- *	
- *	If you need to play with this values use esfq.
  */
 
 /* RED section */
@@ -554,12 +544,34 @@ enum {
 
 #define TCA_ATM_MAX	TCA_ATM_STATE
 
-/* Delay section */
-struct tc_dly_qopt
+/* Network emulator */
+
+enum
+{
+	TCA_NETEM_UNSPEC,
+	TCA_NETEM_CORR,
+	TCA_NETEM_DELAY_DIST,
+};
+
+#define TCA_NETEM_MAX	TCA_NETEM_DELAY_DIST
+
+struct tc_netem_qopt
 {
-	__u32	latency;
-	__u32   limit;
-	__u32	loss;
+	__u32	latency;	/* added delay (us) */
+	__u32   limit;		/* fifo limit (packets) */
+	__u32	loss;		/* random packet loss (0=none ~0=100%) */
+	__u32	gap;		/* re-ordering gap (0 for delay all) */
+	__u32   duplicate;	/* random packet dup  (0=none ~0=100%) */
+	__u32	jitter;		/* random jitter in latency (us) */
 };
 
+struct tc_netem_corr
+{
+	__u32	delay_corr;	/* delay correlation */
+	__u32	loss_corr;	/* packet loss correlation */
+	__u32	dup_corr;	/* duplicate correlation  */
+};
+
+#define NETEM_DIST_SCALE	8192
+
 #endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/rbtree.h linux-2.4.20-wolk4.16-fullkernel/include/linux/rbtree.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/rbtree.h	2004-06-29 11:23:32.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/rbtree.h	2004-09-05 16:06:35.000000000 +0200
@@ -123,6 +123,12 @@ extern void rb_erase(rb_node_t *, rb_roo
 extern rb_node_t *rb_get_first(rb_root_t *root);
 extern rb_node_t *rb_get_next(rb_node_t *n);
 
+/* Find logical next and previous nodes in a tree */
+extern rb_node_t *rb_next(rb_node_t *);
+extern rb_node_t *rb_prev(rb_node_t *);
+extern rb_node_t *rb_first(rb_root_t *);
+extern rb_node_t *rb_last(rb_root_t *);
+
 static inline void rb_link_node(rb_node_t * node, rb_node_t * parent, rb_node_t ** rb_link)
 {
 	node->rb_parent = parent;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/rtnetlink.h linux-2.4.20-wolk4.16-fullkernel/include/linux/rtnetlink.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/rtnetlink.h	2004-06-29 11:35:50.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/rtnetlink.h	2004-09-05 16:09:09.000000000 +0200
@@ -69,7 +69,8 @@ struct rtattr
 
 #define RTA_ALIGNTO	4
 #define RTA_ALIGN(len) ( ((len)+RTA_ALIGNTO-1) & ~(RTA_ALIGNTO-1) )
-#define RTA_OK(rta,len) ((len) > 0 && (rta)->rta_len >= sizeof(struct rtattr) && \
+#define RTA_OK(rta,len) ((len) >= (int)sizeof(struct rtattr) && \
+			 (rta)->rta_len >= sizeof(struct rtattr) && \
 			 (rta)->rta_len <= (len))
 #define RTA_NEXT(rta,attrlen)	((attrlen) -= RTA_ALIGN((rta)->rta_len), \
 				 (struct rtattr*)(((char*)(rta)) + RTA_ALIGN((rta)->rta_len)))
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/rwsem.h linux-2.4.20-wolk4.16-fullkernel/include/linux/rwsem.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/rwsem.h	2002-11-29 00:53:15.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/rwsem.h	2004-09-05 16:09:33.000000000 +0200
@@ -101,6 +101,17 @@ static inline void up_write(struct rw_se
 	rwsemtrace(sem,"Leaving up_write");
 }
 
+#ifdef HAVE_DOWNGRADE_WRITE
+/*
+ * downgrade write lock to read lock
+ */
+static inline void downgrade_write(struct rw_semaphore *sem)
+{
+	rwsemtrace(sem,"Entering downgrade_write");
+	__downgrade_write(sem);
+	rwsemtrace(sem,"Leaving downgrade_write");
+}
+#endif
 
 #endif /* __KERNEL__ */
 #endif /* _LINUX_RWSEM_H */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/sched.h linux-2.4.20-wolk4.16-fullkernel/include/linux/sched.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/sched.h	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/sched.h	2004-09-07 09:57:25.000000000 +0200
@@ -29,8 +29,8 @@ extern unsigned long event;
 #include <linux/securebits.h>
 #include <linux/fs_struct.h>
 
-extern int gr_is_capable(const int cap);
-extern int gr_pid_is_chrooted(const struct task_struct *p);
+extern int gr_task_is_capable(struct task_struct *task, const int cap);
+extern int gr_pid_is_chrooted(struct task_struct *p);
 
 struct exec_domain;
 
@@ -477,17 +477,19 @@ struct task_struct {
 
 /* added by grsecurity's ACL system */
 #ifdef CONFIG_GRKERNSEC
-	struct acl_subject_label * acl;
-	struct file * exec_file;
+	struct acl_subject_label *acl;
+	struct acl_role_label *role;
+	struct file *exec_file;
 	u32 curr_ip;
 	u32 gr_saddr;
 	u32 gr_daddr;
 	u16 gr_sport;
 	u16 gr_dport;
-	u8 acl_admin_id;
-	u8 acl_admin:1;
+	u16 acl_role_id;
+	u8 acl_sp_role:1;
 	u8 used_accept:1;
-	u8 used_connect:1;
+	u8 is_writable:1;
+	u8 brute:1;
 #endif
 
 /* TASK_UNMAPPED_BASE value */
@@ -854,7 +856,7 @@ static inline int fsuser(void)
 static inline int capable(int cap)
 {
 #if 1 /* ok now */
-	if (cap_raised(current->cap_effective, cap) && gr_is_capable(cap))
+	if (cap_raised(current->cap_effective, cap) && gr_task_is_capable(current, cap))
 #else
 	if (cap_is_fs_cap(cap) ? current->fsuid == 0 : current->euid == 0)
 #endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/shfs_fs_sb.h linux-2.4.20-wolk4.16-fullkernel/include/linux/shfs_fs_sb.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/shfs_fs_sb.h	2004-06-29 11:51:44.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/shfs_fs_sb.h	2004-09-05 16:04:53.000000000 +0200
@@ -38,10 +38,10 @@ struct shfs_sb_info {
 	struct shfs_fileops fops;
 	int version;
 	int ttl;
-	__kernel_uid_t uid;
-	__kernel_gid_t gid;
-	__kernel_mode_t root_mode;
-	__kernel_mode_t fmask;
+	uid_t uid;
+	gid_t gid;
+	mode_t root_mode;
+	mode_t fmask;
 	char mount_point[SHFS_PATH_MAX];
 	struct semaphore sock_sem;	/* next 4 vars are guarded */
 	struct file *sock;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/sysctl.h linux-2.4.20-wolk4.16-fullkernel/include/linux/sysctl.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/sysctl.h	2004-06-29 11:35:50.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/sysctl.h	2004-09-05 16:09:36.000000000 +0200
@@ -372,6 +372,7 @@ enum
 	NET_TCP_BIC_LOW_WINDOW=113,
 	NET_TCP_DEFAULT_WIN_SCALE=114,
 	NET_TCP_MODERATE_RCVBUF=115,
+	NET_DEBUG=116,
 };
 
 enum {
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/tpqic02.h linux-2.4.20-wolk4.16-fullkernel/include/linux/tpqic02.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/tpqic02.h	2001-11-22 20:47:23.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/tpqic02.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,738 +0,0 @@
-/* $Id: tpqic02.h,v 1.5 1996/12/14 23:01:38 root Exp root $
- *
- * Include file for QIC-02 driver for Linux.
- *
- * Copyright (c) 1992--1995 by H. H. Bergman. All rights reserved.
- *
- * ******* USER CONFIG SECTION BELOW (Near line 70) *******
- */
-
-#ifndef _LINUX_TPQIC02_H
-#define _LINUX_TPQIC02_H
-
-#include <linux/config.h>
-
-#if CONFIG_QIC02_TAPE || CONFIG_QIC02_TAPE_MODULE
-
-/* need to have QIC02_TAPE_DRIVE and QIC02_TAPE_IFC expand to something */
-#include <linux/mtio.h>
-
-
-/* Make QIC02_TAPE_IFC expand to something.
- *
- * The only difference between WANGTEK and EVEREX is in the 
- * handling of the DMA channel 3.
- * Note that the driver maps EVEREX to WANGTEK internally for speed
- * reasons. Externally WANGTEK==1, EVEREX==2, ARCHIVE==3.
- * These must correspond to the values used in qic02config(1).
- *
- * Support for Mountain controllers was added by Erik Jacobson
- * and severely hacked by me.   -- hhb
- * 
- * Support for Emerald controllers by Alan Bain <afrb2@chiark.chu.cam.ac.uk>
- * with more hacks by me.   -- hhb
- */
-#define WANGTEK		1		   /* don't know about Wangtek QIC-36 */
-#define EVEREX		(WANGTEK+1)  /* I heard *some* of these are identical */
-#define EVEREX_811V	EVEREX			      /* With TEAC MT 2ST 45D */
-#define EVEREX_831V	EVEREX
-#define ARCHIVE		3
-#define ARCHIVE_SC400	ARCHIVE	       /* rumoured to be from the pre-SMD-age */
-#define ARCHIVE_SC402	ARCHIVE		       /* don't know much about SC400 */
-#define ARCHIVE_SC499	ARCHIVE       /* SC402 and SC499R should be identical */
-
-#define MOUNTAIN	5		       /* Mountain Computer Interface */
-#define EMERALD		6		       /* Emerald Interface card */
-
-
-
-#define QIC02_TAPE_PORT_RANGE 	8	 /* number of IO locations to reserve */
-
-
-/*********** START OF USER CONFIGURABLE SECTION ************/
-
-/* Tape configuration: Select DRIVE, IFC, PORT, IRQ and DMA below.
- * Runtime (re)configuration is not supported yet.
- *
- * Tape drive configuration:	(MT_IS* constants are defined in mtio.h)
- *
- * QIC02_TAPE_DRIVE = MT_ISWT5150
- *	- Wangtek 5150, format: up to QIC-150.
- * QIC02_TAPE_DRIVE = MT_ISQIC02_ALL_FEATURES
- *	- Enables some optional QIC02 commands that some drives may lack.
- *	  It is provided so you can check which are supported by your drive.
- *	  Refer to tpqic02.h for others.
- *
- * Supported interface cards: QIC02_TAPE_IFC =
- *	WANGTEK,
- *	ARCHIVE_SC402, ARCHIVE_SC499.	(both same programming interface)
- *
- * Make sure you have the I/O ports/DMA channels 
- * and IRQ stuff configured properly!
- * NOTE: There may be other device drivers using the same major
- *       number. This must be avoided. Check for timer.h conflicts too.
- *
- * If you have an EVEREX EV-831 card and you are using DMA channel 3,
- * you will probably have to ``#define QIC02_TAPE_DMA3_FIX'' below.
- */
-
-/* CONFIG_QIC02_DYNCONF can be defined in autoconf.h, by `make config' */
-
-/*** #undef CONFIG_QIC02_DYNCONF ***/
-
-#ifndef CONFIG_QIC02_DYNCONF
-
-#define QIC02_TAPE_DRIVE	MT_ISQIC02_ALL_FEATURES	 /* drive type */
-/* #define QIC02_TAPE_DRIVE	MT_ISWT5150 */
-/* #define QIC02_TAPE_DRIVE	MT_ISARCHIVE_5945L2 */
-/* #define QIC02_TAPE_DRIVE	MT_ISTEAC_MT2ST */
-/* #define QIC02_TAPE_DRIVE	MT_ISARCHIVE_2150L */
-/* #define QIC02_TAPE_DRIVE	MT_ISARCHIVESC499 */
-
-/* Either WANGTEK, ARCHIVE or MOUNTAIN. Not EVEREX. 
- * If you have an EVEREX, use WANGTEK and try the DMA3_FIX below.
- */
-#define QIC02_TAPE_IFC		WANGTEK	/* interface card type */
-/* #define QIC02_TAPE_IFC		ARCHIVE */
-/* #define QIC02_TAPE_IFC		MOUNTAIN */
-
-#define QIC02_TAPE_PORT 	0x300	/* controller port address */
-#define QIC02_TAPE_IRQ		5	/* For IRQ2, use 9 here, others normal. */
-#define QIC02_TAPE_DMA		1	/* either 1 or 3, because 2 is used by the floppy */
-
-/* If DMA3 doesn't work, but DMA1 does, and you have a 
- * Wangtek/Everex card, you can try #define-ing the flag
- * below. Note that you should also change the DACK jumper
- * for Wangtek/Everex cards when changing the DMA channel.
- */
-#undef QIC02_TAPE_DMA3_FIX
-
-/************ END OF USER CONFIGURABLE SECTION *************/
-
-/* I put the stuff above in config.in, but a few recompiles, to
- * verify different configurations, and several days later I decided
- * to change it back again.
- */
-
-
-
-/* NOTE: TP_HAVE_DENS should distinguish between available densities (?)
- * NOTE: Drive select is not implemented -- I have only one tape streamer,
- *	 so I'm unable and unmotivated to test and implement that. ;-) ;-)
- */
-#if QIC02_TAPE_DRIVE == MT_ISWT5150
-#define TP_HAVE_DENS	1
-#define TP_HAVE_BSF	0	/* nope */
-#define TP_HAVE_FSR	0	/* nope */
-#define TP_HAVE_BSR	0	/* nope */
-#define TP_HAVE_EOD	0	/* most of the time */
-#define TP_HAVE_SEEK	0
-#define TP_HAVE_TELL	0
-#define TP_HAVE_RAS1	1
-#define TP_HAVE_RAS2	1
-
-#elif QIC02_TAPE_DRIVE == MT_ISARCHIVESC499	/* Archive SC-499 QIC-36 controller */
-#define TP_HAVE_DENS	1	/* can do set density (QIC-11 / QIC-24) */
-#define TP_HAVE_BSF	0
-#define TP_HAVE_FSR	1	/* can skip one block forwards */
-#define TP_HAVE_BSR	1	/* can skip one block backwards */
-#define TP_HAVE_EOD	1	/* can seek to end of recorded data */
-#define TP_HAVE_SEEK	0
-#define TP_HAVE_TELL	0
-#define TP_HAVE_RAS1	1	/* can run selftest 1 */
-#define TP_HAVE_RAS2	1	/* can run selftest 2 */
-/* These last two selftests shouldn't be used yet! */
-
-#elif (QIC02_TAPE_DRIVE == MT_ISARCHIVE_2060L) || (QIC02_TAPE_DRIVE == MT_ISARCHIVE_2150L)
-#define TP_HAVE_DENS	1	/* can do set density (QIC-24 / QIC-120 / QIC-150) */
-#define TP_HAVE_BSF	0
-#define TP_HAVE_FSR	1	/* can skip one block forwards */
-#define TP_HAVE_BSR	1	/* can skip one block backwards */
-#define TP_HAVE_EOD	1	/* can seek to end of recorded data */
-#define TP_HAVE_TELL	1	/* can read current block address */
-#define TP_HAVE_SEEK	1	/* can seek to block */
-#define TP_HAVE_RAS1	1	/* can run selftest 1 */
-#define TP_HAVE_RAS2	1	/* can run selftest 2 */
-/* These last two selftests shouldn't be used yet! */
-
-#elif QIC02_TAPE_DRIVE == MT_ISARCHIVE_5945L2
-/* can anyone verify this entry?? */
-#define TP_HAVE_DENS	1	/* can do set density?? (QIC-24??) */
-#define TP_HAVE_BSF	0
-#define TP_HAVE_FSR	1	/* can skip one block forwards */
-#define TP_HAVE_BSR	1	/* can skip one block backwards */
-#define TP_HAVE_EOD	1	/* can seek to end of recorded data */
-#define TP_HAVE_TELL	1	/* can read current block address */
-#define TP_HAVE_SEEK	1	/* can seek to block */
-#define TP_HAVE_RAS1	1	/* can run selftest 1 */
-#define TP_HAVE_RAS2	1	/* can run selftest 2 */
-/* These last two selftests shouldn't be used yet! */
-
-#elif QIC02_TAPE_DRIVE == MT_ISTEAC_MT2ST
-/* can anyone verify this entry?? */
-#define TP_HAVE_DENS	0	/* cannot do set density?? (QIC-150?) */
-#define TP_HAVE_BSF	0
-#define TP_HAVE_FSR	1	/* can skip one block forwards */
-#define TP_HAVE_BSR	1	/* can skip one block backwards */
-#define TP_HAVE_EOD	1	/* can seek to end of recorded data */
-#define TP_HAVE_SEEK	1	/* can seek to block */
-#define TP_HAVE_TELL	1	/* can read current block address */
-#define TP_HAVE_RAS1	1	/* can run selftest 1 */
-#define TP_HAVE_RAS2	1	/* can run selftest 2 */
-/* These last two selftests shouldn't be used yet! */
-
-#elif QIC02_TAPE_DRIVE == MT_ISQIC02_ALL_FEATURES
-#define TP_HAVE_DENS	1	/* can do set density */
-#define TP_HAVE_BSF	1	/* can search filemark backwards */
-#define TP_HAVE_FSR	1	/* can skip one block forwards */
-#define TP_HAVE_BSR	1	/* can skip one block backwards */
-#define TP_HAVE_EOD	1	/* can seek to end of recorded data */
-#define TP_HAVE_SEEK	1	/* seek to block address */
-#define TP_HAVE_TELL	1	/* tell current block address */
-#define TP_HAVE_RAS1	1	/* can run selftest 1 */
-#define TP_HAVE_RAS2	1	/* can run selftest 2 */
-/* These last two selftests shouldn't be used yet! */
-
-
-#else
-#error No QIC-02 tape drive type defined!
-/* If your drive is not listed above, first try the 'ALL_FEATURES',
- * to see what commands are supported, then create your own entry in
- * the list above. You may want to mail it to me, so that I can include
- * it in the next release.
- */
-#endif
-
-#endif /* !CONFIG_QIC02_DYNCONF */
-
-
-/* WANGTEK interface card specifics */
-#define WT_QIC02_STAT_PORT	(QIC02_TAPE_PORT)
-#define WT_QIC02_CTL_PORT	(QIC02_TAPE_PORT)
-#define WT_QIC02_CMD_PORT	(QIC02_TAPE_PORT+1)
-#define WT_QIC02_DATA_PORT	(QIC02_TAPE_PORT+1)
-
-/* status register bits (Active LOW!) */
-#define WT_QIC02_STAT_POLARITY	0
-#define WT_QIC02_STAT_READY	0x01
-#define WT_QIC02_STAT_EXCEPTION	0x02
-#define WT_QIC02_STAT_MASK	(WT_QIC02_STAT_READY|WT_QIC02_STAT_EXCEPTION)
-
-#define WT_QIC02_STAT_RESETMASK	0x07
-#define WT_QIC02_STAT_RESETVAL	(WT_QIC02_STAT_RESETMASK & ~WT_QIC02_STAT_EXCEPTION)
-
-/* controller register (QIC02_CTL_PORT) bits */
-#define WT_QIC02_CTL_RESET	0x02
-#define WT_QIC02_CTL_REQUEST	0x04
-#define WT_CTL_ONLINE		0x01
-#define WT_CTL_CMDOFF		0xC0 
-
-#define WT_CTL_DMA3		0x10			  /* enable dma chan3 */
-#define WT_CTL_DMA1		0x08	         /* enable dma chan1 or chan2 */
-
-/* EMERALD interface card specifics
- * Much like Wangtek, only different polarity and bit locations
- */
-#define EMR_QIC02_STAT_PORT	(QIC02_TAPE_PORT)
-#define EMR_QIC02_CTL_PORT	(QIC02_TAPE_PORT)
-#define EMR_QIC02_CMD_PORT	(QIC02_TAPE_PORT+1)
-#define EMR_QIC02_DATA_PORT	(QIC02_TAPE_PORT+1)
-
-/* status register bits (Active High!) */
-#define EMR_QIC02_STAT_POLARITY		1
-#define EMR_QIC02_STAT_READY		0x01
-#define EMR_QIC02_STAT_EXCEPTION	0x02
-#define EMR_QIC02_STAT_MASK	(EMR_QIC02_STAT_READY|EMR_QIC02_STAT_EXCEPTION)
-
-#define EMR_QIC02_STAT_RESETMASK	0x07
-#define EMR_QIC02_STAT_RESETVAL	(EMR_QIC02_STAT_RESETMASK & ~EMR_QIC02_STAT_EXCEPTION)
-
-/* controller register (QIC02_CTL_PORT) bits */
-#define EMR_QIC02_CTL_RESET	0x02
-#define EMR_QIC02_CTL_REQUEST	0x04
-#define EMR_CTL_ONLINE		0x01
-#define EMR_CTL_CMDOFF		0xC0 
-
-#define EMR_CTL_DMA3		0x10			  /* enable dma chan3 */
-#define EMR_CTL_DMA1		0x08	         /* enable dma chan1 or chan2 */
-
-
-
-/* ARCHIVE interface card specifics */
-#define AR_QIC02_STAT_PORT	(QIC02_TAPE_PORT+1)
-#define AR_QIC02_CTL_PORT	(QIC02_TAPE_PORT+1)
-#define AR_QIC02_CMD_PORT	(QIC02_TAPE_PORT)
-#define AR_QIC02_DATA_PORT	(QIC02_TAPE_PORT)
-
-#define AR_START_DMA_PORT	(QIC02_TAPE_PORT+2)
-#define AR_RESET_DMA_PORT	(QIC02_TAPE_PORT+3)
-
-/* STAT port bits */
-#define AR_QIC02_STAT_POLARITY	0
-#define AR_STAT_IRQF		0x80	/* active high, interrupt request flag */
-#define AR_QIC02_STAT_READY	0x40	/* active low */
-#define AR_QIC02_STAT_EXCEPTION	0x20	/* active low */
-#define AR_QIC02_STAT_MASK	(AR_QIC02_STAT_READY|AR_QIC02_STAT_EXCEPTION)
-#define AR_STAT_DMADONE		0x10	/* active high, DMA done */
-#define AR_STAT_DIRC		0x08	/* active high, direction */
-
-#define AR_QIC02_STAT_RESETMASK	0x70	/* check RDY,EXC,DMADONE */
-#define AR_QIC02_STAT_RESETVAL	((AR_QIC02_STAT_RESETMASK & ~AR_STAT_IRQF & ~AR_QIC02_STAT_EXCEPTION) | AR_STAT_DMADONE)
-
-/* CTL port bits */
-#define AR_QIC02_CTL_RESET	0x80	/* drive reset */
-#define AR_QIC02_CTL_REQUEST	0x40	/* notify of new command */
-#define AR_CTL_IEN		0x20	/* interrupt enable */
-#define AR_CTL_DNIEN		0x10	/* done-interrupt enable */
-  /* Note: All of these bits are cleared automatically when writing to
-   * AR_RESET_DMA_PORT. So AR_CTL_IEN and AR_CTL_DNIEN must be
-   * reprogrammed before the write to AR_START_DMA_PORT.
-   */
-
-
-/* MOUNTAIN interface specifics */
-#define MTN_QIC02_STAT_PORT	(QIC02_TAPE_PORT+1)
-#define MTN_QIC02_CTL_PORT	(QIC02_TAPE_PORT+1)
-#define MTN_QIC02_CMD_PORT	(QIC02_TAPE_PORT)
-#define MTN_QIC02_DATA_PORT	(QIC02_TAPE_PORT)
-
-#define MTN_W_SELECT_DMA_PORT	(QIC02_TAPE_PORT+2)
-#define MTN_R_DESELECT_DMA_PORT	(QIC02_TAPE_PORT+2)
-#define MTN_W_DMA_WRITE_PORT	(QIC02_TAPE_PORT+3)
-
-/* STAT port bits */
-#define MTN_QIC02_STAT_POLARITY	 0
-#define MTN_QIC02_STAT_READY	 0x02	/* active low */
-#define MTN_QIC02_STAT_EXCEPTION 0x04	/* active low */
-#define MTN_QIC02_STAT_MASK	 (MTN_QIC02_STAT_READY|MTN_QIC02_STAT_EXCEPTION)
-#define MTN_STAT_DMADONE	 0x01	/* active high, DMA done */
-
-#define MTN_QIC02_STAT_RESETMASK 0x07	/* check RDY,EXC,DMADONE */
-#define MTN_QIC02_STAT_RESETVAL	 ((MTN_QIC02_STAT_RESETMASK & ~MTN_QIC02_STAT_EXCEPTION) | MTN_STAT_DMADONE)
-
-/* CTL port bits */
-#define MTN_QIC02_CTL_RESET_NOT	 0x80	/* drive reset, active low */
-#define MTN_QIC02_CTL_RESET	 0x80	/* Fodder #definition to keep gcc happy */
-
-#define MTN_QIC02_CTL_ONLINE	 0x40	/* Put drive on line  */
-#define MTN_QIC02_CTL_REQUEST	 0x20	/* notify of new command */
-#define MTN_QIC02_CTL_IRQ_DRIVER 0x10	/* Enable IRQ tristate driver */
-#define MTN_QIC02_CTL_DMA_DRIVER 0x08	/* Enable DMA tristate driver */
-#define MTN_CTL_EXC_IEN		 0x04	/* Exception interrupt enable */
-#define MTN_CTL_RDY_IEN		 0x02	/* Ready interrupt enable */
-#define MTN_CTL_DNIEN		 0x01	/* done-interrupt enable */
-
-#define MTN_CTL_ONLINE		(MTN_QIC02_CTL_RESET_NOT | MTN_QIC02_CTL_IRQ_DRIVER | MTN_QIC02_CTL_DMA_DRIVER)
-
-
-#ifndef CONFIG_QIC02_DYNCONF
-
-# define QIC02_TAPE_DEBUG	(qic02_tape_debug)
-
-# if QIC02_TAPE_IFC == WANGTEK	
-#  define QIC02_STAT_POLARITY	WT_QIC02_STAT_POLARITY
-#  define QIC02_STAT_PORT	WT_QIC02_STAT_PORT
-#  define QIC02_CTL_PORT	WT_QIC02_CTL_PORT
-#  define QIC02_CMD_PORT	WT_QIC02_CMD_PORT
-#  define QIC02_DATA_PORT	WT_QIC02_DATA_PORT
-
-#  define QIC02_STAT_READY	WT_QIC02_STAT_READY
-#  define QIC02_STAT_EXCEPTION	WT_QIC02_STAT_EXCEPTION
-#  define QIC02_STAT_MASK	WT_QIC02_STAT_MASK
-#  define QIC02_STAT_RESETMASK	WT_QIC02_STAT_RESETMASK
-#  define QIC02_STAT_RESETVAL	WT_QIC02_STAT_RESETVAL
-
-#  define QIC02_CTL_RESET	WT_QIC02_CTL_RESET
-#  define QIC02_CTL_REQUEST	WT_QIC02_CTL_REQUEST
-
-#  if QIC02_TAPE_DMA == 3
-#   ifdef QIC02_TAPE_DMA3_FIX
-#    define WT_CTL_DMA		WT_CTL_DMA1
-#   else
-#    define WT_CTL_DMA		WT_CTL_DMA3
-#   endif
-#  elif QIC02_TAPE_DMA == 1
-#    define WT_CTL_DMA		WT_CTL_DMA1
-#  else
-#   error Unsupported or incorrect DMA configuration.
-#  endif
-
-# elif QIC02_TAPE_IFC == EMERALD
-#  define QIC02_STAT_POLARITY	EMR_QIC02_STAT_POLARITY
-#  define QIC02_STAT_PORT	EMR_QIC02_STAT_PORT
-#  define QIC02_CTL_PORT	EMR_QIC02_CTL_PORT
-#  define QIC02_CMD_PORT	EMR_QIC02_CMD_PORT
-#  define QIC02_DATA_PORT	EMR_QIC02_DATA_PORT
-
-#  define QIC02_STAT_READY	EMR_QIC02_STAT_READY
-#  define QIC02_STAT_EXCEPTION	EMR_QIC02_STAT_EXCEPTION
-#  define QIC02_STAT_MASK	EMR_QIC02_STAT_MASK
-#  define QIC02_STAT_RESETMASK	EMR_QIC02_STAT_RESETMASK
-#  define QIC02_STAT_RESETVAL	EMR_QIC02_STAT_RESETVAL
-
-#  define QIC02_CTL_RESET	EMR_QIC02_CTL_RESET
-#  define QIC02_CTL_REQUEST	EMR_QIC02_CTL_REQUEST
-
-#  if QIC02_TAPE_DMA == 3
-#   ifdef QIC02_TAPE_DMA3_FIX
-#    define EMR_CTL_DMA		EMR_CTL_DMA1
-#   else
-#    define EMR_CTL_DMA		EMR_CTL_DMA3
-#   endif
-#  elif QIC02_TAPE_DMA == 1
-#    define EMR_CTL_DMA		EMR_CTL_DMA1
-#  else
-#   error Unsupported or incorrect DMA configuration.
-#  endif
-
-# elif QIC02_TAPE_IFC == ARCHIVE
-#  define QIC02_STAT_POLARITY	AR_QIC02_STAT_POLARITY
-#  define QIC02_STAT_PORT	AR_QIC02_STAT_PORT
-#  define QIC02_CTL_PORT	AR_QIC02_CTL_PORT
-#  define QIC02_CMD_PORT	AR_QIC02_CMD_PORT
-#  define QIC02_DATA_PORT	AR_QIC02_DATA_PORT
-
-#  define QIC02_STAT_READY	AR_QIC02_STAT_READY
-#  define QIC02_STAT_EXCEPTION	AR_QIC02_STAT_EXCEPTION
-#  define QIC02_STAT_MASK	AR_QIC02_STAT_MASK
-#  define QIC02_STAT_RESETMASK	AR_QIC02_STAT_RESETMASK
-#  define QIC02_STAT_RESETVAL	AR_QIC02_STAT_RESETVAL
-
-#  define QIC02_CTL_RESET	AR_QIC02_CTL_RESET
-#  define QIC02_CTL_REQUEST	AR_QIC02_CTL_REQUEST
-
-#  if QIC02_TAPE_DMA > 3	/* channel 2 is used by the floppy driver */
-#   error DMA channels other than 1 and 3 are not supported.
-#  endif
-
-# elif QIC02_TAPE_IFC == MOUNTAIN
-#  define QIC02_STAT_POLARITY	MTN_QIC02_STAT_POLARITY
-#  define QIC02_STAT_PORT	MTN_QIC02_STAT_PORT
-#  define QIC02_CTL_PORT	MTN_QIC02_CTL_PORT
-#  define QIC02_CMD_PORT	MTN_QIC02_CMD_PORT
-#  define QIC02_DATA_PORT	MTN_QIC02_DATA_PORT
-
-#  define QIC02_STAT_READY	MTN_QIC02_STAT_READY
-#  define QIC02_STAT_EXCEPTION	MTN_QIC02_STAT_EXCEPTION
-#  define QIC02_STAT_MASK	MTN_QIC02_STAT_MASK
-#  define QIC02_STAT_RESETMASK	MTN_QIC02_STAT_RESETMASK
-#  define QIC02_STAT_RESETVAL	MTN_QIC02_STAT_RESETVAL
-
-#  define QIC02_CTL_RESET	MTN_QIC02_CTL_RESET
-#  define QIC02_CTL_REQUEST	MTN_QIC02_CTL_REQUEST
-
-#  if QIC02_TAPE_DMA > 3	/* channel 2 is used by the floppy driver */
-#   error DMA channels other than 1 and 3 are not supported.
-#  endif
-
-# else
-#  error No valid interface card specified!
-# endif /* QIC02_TAPE_IFC */
-
-
-  /* An ugly hack to make sure WT_CTL_DMA is defined even for the
-   * static, non-Wangtek case. The alternative was even worse.
-   */ 
-# ifndef WT_CTL_DMA
-#  define WT_CTL_DMA		WT_CTL_DMA1
-# endif
-
-/*******************/
-
-#else /* !CONFIG_QIC02_DYNCONF */
-
-/* Now the runtime config version, using variables instead of constants.
- *
- * qic02_tape_dynconf is R/O for the kernel, set from userspace.
- * qic02_tape_ccb is private to the driver, R/W.
- */
-
-# define QIC02_TAPE_DRIVE	(qic02_tape_dynconf.mt_type)
-# define QIC02_TAPE_IFC		(qic02_tape_ccb.ifc_type)
-# define QIC02_TAPE_IRQ		(qic02_tape_dynconf.irqnr)
-# define QIC02_TAPE_DMA		(qic02_tape_dynconf.dmanr)
-# define QIC02_TAPE_PORT	(qic02_tape_dynconf.port)
-# define WT_CTL_DMA		(qic02_tape_ccb.dma_enable_value)
-# define QIC02_TAPE_DEBUG	(qic02_tape_dynconf.debug)
-
-# define QIC02_STAT_PORT	(qic02_tape_ccb.port_stat)
-# define QIC02_CTL_PORT 	(qic02_tape_ccb.port_ctl)
-# define QIC02_CMD_PORT 	(qic02_tape_ccb.port_cmd)
-# define QIC02_DATA_PORT 	(qic02_tape_ccb.port_data)
-
-# define QIC02_STAT_POLARITY	(qic02_tape_ccb.stat_polarity)
-# define QIC02_STAT_READY	(qic02_tape_ccb.stat_ready)
-# define QIC02_STAT_EXCEPTION	(qic02_tape_ccb.stat_exception)
-# define QIC02_STAT_MASK	(qic02_tape_ccb.stat_mask)
-
-# define QIC02_STAT_RESETMASK	(qic02_tape_ccb.stat_resetmask)
-# define QIC02_STAT_RESETVAL	(qic02_tape_ccb.stat_resetval)
-
-# define QIC02_CTL_RESET	(qic02_tape_ccb.ctl_reset)
-# define QIC02_CTL_REQUEST	(qic02_tape_ccb.ctl_request)
-
-# define TP_HAVE_DENS		(qic02_tape_dynconf.have_dens)
-# define TP_HAVE_BSF		(qic02_tape_dynconf.have_bsf)
-# define TP_HAVE_FSR		(qic02_tape_dynconf.have_fsr)
-# define TP_HAVE_BSR		(qic02_tape_dynconf.have_bsr)
-# define TP_HAVE_EOD		(qic02_tape_dynconf.have_eod)
-# define TP_HAVE_SEEK		(qic02_tape_dynconf.have_seek)
-# define TP_HAVE_TELL		(qic02_tape_dynconf.have_tell)
-# define TP_HAVE_RAS1		(qic02_tape_dynconf.have_ras1)
-# define TP_HAVE_RAS2		(qic02_tape_dynconf.have_ras2)
-
-#endif /* CONFIG_QIC02_DYNCONF */
-
-
-/* "Vendor Unique" codes */
-/* Archive seek & tell stuff */
-#define AR_QCMDV_TELL_BLK	0xAE	/* read current block address */
-#define AR_QCMDV_SEEK_BLK	0xAD	/* seek to specific block */
-#define AR_SEEK_BUF_SIZE	3	/* address is 3 bytes */
-
-
-
-/*
- * Misc common stuff
- */
-
-/* Standard QIC-02 commands -- rev F.  All QIC-02 drives must support these */
-#define QCMD_SEL_1	0x01		/* select drive 1 */
-#define QCMD_SEL_2	0x02		/* select drive 2 */
-#define QCMD_SEL_3	0x04		/* select drive 3 */
-#define QCMD_SEL_4	0x08		/* select drive 4 */
-#define	QCMD_REWIND	0x21		/* rewind tape */
-#define QCMD_ERASE	0x22		/* erase tape */
-#define QCMD_RETEN	0x24		/* retension tape */
-#define	QCMD_WRT_DATA	0x40		/* write data */
-#define	QCMD_WRT_FM	0x60		/* write file mark */
-#define	QCMD_RD_DATA	0x80		/* read data */
-#define	QCMD_RD_FM	0xA0		/* read file mark (forward direction) */
-#define	QCMD_RD_STAT	0xC0		/* read status */
-
-/* Other (optional/vendor unique) commands */
- /* Density commands are only valid when TP_BOM is set! */
-#define QCMD_DENS_11	0x26		/* QIC-11 */
-#define QCMD_DENS_24	0x27		/* QIC-24: 9 track 60MB */
-#define QCMD_DENS_120	0x28		/* QIC-120: 15 track 120MB */
-#define QCMD_DENS_150	0x29		/* QIC-150: 18 track 150MB */
-#define QCMD_DENS_300	0x2A		/* QIC-300/QIC-2100 */
-#define QCMD_DENS_600	0x2B		/* QIC-600/QIC-2200 */
-/* don't know about QIC-1000 and QIC-1350 */
-
-#define	QCMD_WRTNU_DATA	0x40		/* write data, no underruns, insert filler. */
-#define QCMD_SPACE_FWD	0x81		/* skip next block */
-#define QCMD_SPACE_BCK	0x89		/* move tape head one block back -- very useful! */
-#define QCMD_RD_FM_BCK	0xA8		/* read filemark (backwards) */
-#define QCMD_SEEK_EOD	0xA3		/* skip to EOD */
-#define	QCMD_RD_STAT_X1	0xC1		/* read extended status 1 */
-#define	QCMD_RD_STAT_X2	0xC4		/* read extended status 2 */
-#define	QCMD_RD_STAT_X3	0xE0		/* read extended status 3 */
-#define QCMD_SELF_TST1	0xC2		/* run self test 1 (nondestructive) */
-#define QCMD_SELF_TST2	0xCA		/* run self test 2 (destructive) */
-
-
-
-/* Optional, QFA (Quick File Access) commands.
- * Not all drives support this, but those that do could use these commands
- * to implement semi-non-sequential access. `mt fsf` would benefit from this.
- * QFA divides the tape into 2 partitions, a data and a directory partition,
- * causing some incompatibility problems wrt std QIC-02 data exchange.
- * It would be useful to cache the directory info, but that might be tricky
- * to do in kernel-space. [Size constraints.]
- * Refer to the QIC-02 specs, appendix A for more information.
- * I have no idea how other *nix variants implement QFA.
- * I have no idea which drives support QFA and which don't.
- */
-#define QFA_ENABLE	0x2D		/* enter QFA mode, give @ BOT only */
-#define QFA_DATA	0x20		/* select data partition */
-#define QFA_DIR		0x23		/* select directory partition */
-#define QFA_RD_POS	0xCF		/* read position+status bytes */
-#define QFA_SEEK_EOD	0xA1		/* seek EOD within current partition */
-#define QFA_SEEK_BLK	0xAF		/* seek to a block within current partition */
-
-
-
-
-/*
- * Debugging flags
- */
-#define TPQD_SENSE_TEXT	0x0001
-#define TPQD_SENSE_CNTS 0x0002
-#define TPQD_REWIND	0x0004
-#define TPQD_TERM_CYCLE	0x0008
-#define TPQD_IOCTLS	0x0010
-#define TPQD_DMAX	0x0020
-#define TPQD_BLKSZ	0x0040
-#define TPQD_MISC	0x0080
-
-#define TPQD_DEBUG	0x0100
-
-#define TPQD_DIAGS	0x1000
-
-#define TPQD_ALWAYS	0x8000
-
-#define TPQD_DEFAULT_FLAGS	0x00fc
-
-
-#define TPQDBG(f)	((QIC02_TAPE_DEBUG) & (TPQD_##f))
-
-
-/* Minor device codes for tapes:
- * |7|6|5|4|3|2|1|0|
- *  | \ | / \ | / |_____ 1=rewind on close, 0=no rewind on close
- *  |  \|/    |_________ Density: 000=none, 001=QIC-11, 010=24, 011=120,
- *  |   |                100=QIC-150, 101..111 reserved.
- *  |   |_______________ Reserved for unit numbers.
- *  |___________________ Reserved for diagnostics during debugging.
- */
-
-#define	TP_REWCLOSE(d)	((MINOR(d)&0x01) == 1)	   		/* rewind bit */
-			   /* rewind is only done if data has been transferred */
-#define	TP_DENS(dev)	((MINOR(dev) >> 1) & 0x07) 	      /* tape density */
-#define TP_UNIT(dev)	((MINOR(dev) >> 4) & 0x07)	       /* unit number */
-
-/* print excessive diagnostics */
-#define TP_DIAGS(dev)	(QIC02_TAPE_DEBUG & TPQD_DIAGS)
-
-/* status codes returned by a WTS_RDSTAT call */
-struct tpstatus {	/* sizeof(short)==2), LSB first */
-	unsigned short	exs;	/* Drive exception flags */
-	unsigned short	dec;	/* data error count: nr of blocks rewritten/soft read errors */
-	unsigned short	urc;	/* underrun count: nr of times streaming was interrupted */
-};
-#define TPSTATSIZE	sizeof(struct tpstatus)
-
-
-/* defines for tpstatus.exs -- taken from 386BSD wt driver */
-#define	TP_POR		0x100	/* Power on or reset occurred */
-#define	TP_EOR		0x200	/* REServed for end of RECORDED media */
-#define	TP_PAR		0x400	/* REServed for bus parity */
-#define	TP_BOM		0x800	/* Beginning of media */
-#define	TP_MBD		0x1000	/* Marginal block detected */
-#define	TP_NDT		0x2000	/* No data detected */
-#define	TP_ILL		0x4000	/* Illegal command */
-#define	TP_ST1		0x8000	/* Status byte 1 flag */
-#define	TP_FIL		0x01	/* File mark detected */
-#define	TP_BNL		0x02	/* Bad block not located */
-#define	TP_UDA		0x04	/* Unrecoverable data error */
-#define	TP_EOM		0x08	/* End of media */
-#define	TP_WRP		0x10	/* Write protected cartridge */
-#define	TP_USL		0x20	/* Unselected drive */
-#define	TP_CNI		0x40	/* Cartridge not in place */
-#define	TP_ST0		0x80	/* Status byte 0 flag */
-
-#define REPORT_ERR0	(TP_CNI|TP_USL|TP_WRP|TP_EOM|TP_UDA|TP_BNL|TP_FIL)
-#define REPORT_ERR1	(TP_ILL|TP_NDT|TP_MBD|TP_PAR)
-
-
-/* exception numbers */
-#define EXC_UNKNOWN	0	/* (extra) Unknown exception code */
-#define EXC_NDRV	1	/* No drive */
-#define EXC_NCART	2	/* No cartridge */
-#define EXC_WP		3	/* Write protected */
-#define EXC_EOM		4	/* EOM */
-#define EXC_RWA		5	/* read/write abort */
-#define EXC_XBAD	6	/* read error, bad block transferred */
-#define EXC_XFILLER	7	/* read error, filler block transferred */
-#define EXC_NDT		8	/* read error, no data */
-#define EXC_NDTEOM	9	/* read error, no data & EOM */
-#define EXC_NDTBOM	10	/* read error, no data & BOM */
-#define EXC_FM		11	/* Read a filemark */
-#define EXC_ILL		12	/* Illegal command */
-#define EXC_POR		13	/* Power on/reset */
-#define EXC_MARGINAL	14	/* Marginal block detected */
-#define EXC_EOR		15	/* (extra, for SEEKEOD) End Of Recorded data reached */
-#define EXC_BOM		16	/* (extra) BOM reached */
-
-
-#define TAPE_NOTIFY_TIMEOUT	1000000
-
-/* internal function return codes */
-#define TE_OK	0		/* everything is fine */
-#define TE_EX	1		/* exception detected */
-#define TE_ERR	2		/* some error */
-#define TE_NS	3		/* can't read status */
-#define TE_TIM	4		/* timed out */
-#define TE_DEAD	5		/* tape drive doesn't respond */
-#define TE_END	6		/******** Archive hack *****/
-
-/* timeout timer values -- check these! */
-#define TIM_S	(4*HZ)		/* 4 seconds (normal cmds) */
-#define TIM_M	(30*HZ)		/* 30 seconds (write FM) */
-#define TIM_R	(8*60*HZ)	/* 8 minutes (retensioning) */
-#define TIM_F	(2*3600*HZ)	/* est. 1.2hr for full tape read/write+2 retens */
-
-#define TIMERON(t)	mod_timer(&tp_timer, jiffies + (t))
-#define TIMEROFF	del_timer_sync(&tp_timer);
-#define TIMERCONT	add_timer(&tp_timer);
-
-
-typedef char flag;
-#define NO	0	/* NO must be 0 */
-#define YES	1	/* YES must be != 0 */
-
-
-#ifdef TDEBUG
-# define TPQDEB(s)	s
-# define TPQPUTS(s)	tpqputs(s)
-#else
-# define TPQDEB(s)
-# define TPQPUTS(s)
-#endif
-
-
-/* NR_BLK_BUF is a `tuneable parameter'. If you're really low on
- * kernel space, you could decrease it to 1, or if you got a very
- * slow machine, you could increase it up to 127 blocks. Less kernel
- * buffer blocks result in more context-switching.
- */
-#define NR_BLK_BUF	20				    /* max 127 blocks */
-#define TAPE_BLKSIZE	512		  /* streamer tape block size (fixed) */
-#define TPQBUF_SIZE	(TAPE_BLKSIZE*NR_BLK_BUF)	       /* buffer size */
-
-
-#define BLOCKS_BEYOND_EW	2	/* nr of blocks after Early Warning hole */
-#define BOGUS_IRQ		32009
-
-
-/* This is internal data, filled in based on the ifc_type field given
- * by the user. Everex is mapped to Wangtek with a different
- * `dma_enable_value', if dmanr==3.
- */
-struct qic02_ccb {
-	long	ifc_type;
-
-	unsigned short	port_stat;	/* Status port address */
-	unsigned short	port_ctl;	/* Control port address */
-	unsigned short	port_cmd;	/* Command port address */
-	unsigned short	port_data;	/* Data port address */
-
-	/* status register bits */
-	unsigned short	stat_polarity;	/* invert status bits or not */
-	unsigned short	stat_ready;	/* drive ready */
-	unsigned short	stat_exception;	/* drive signals exception */
-	unsigned short	stat_mask;
-	unsigned short	stat_resetmask;
-	unsigned short	stat_resetval;
-
-	/* control register bits */
-	unsigned short	ctl_reset;	/* reset drive */
-	unsigned short	ctl_request;	/* latch command */
-	
-	/* This is used to change the DMA3 behaviour */
-	unsigned short	dma_enable_value;
-};
-
-#if MODULE
-static int qic02_tape_init(void);
-#else
-extern int qic02_tape_init(void);			  /* for mem.c */
-#endif
-
-
-
-#endif /* CONFIG_QIC02_TAPE */
-
-#endif /* _LINUX_TPQIC02_H */
-
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/uinput.h linux-2.4.20-wolk4.16-fullkernel/include/linux/uinput.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/uinput.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/uinput.h	2004-09-05 16:04:42.000000000 +0200
@@ -0,0 +1,79 @@
+/*
+ *  User level driver support for input subsystem
+ *
+ * Heavily based on evdev.c by Vojtech Pavlik
+ *
+ * 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 02111-1307 USA
+ *
+ * Author: Aristeu Sergio Rozanski Filho <aris@cathedrallabs.org>
+ * 
+ * Changes/Revisions:
+ *	0.1	20/06/2002
+ *		- first public version
+ */
+
+#ifndef __UINPUT_H_
+#define __UINPUT_H_
+
+#ifdef __KERNEL__
+#define UINPUT_MINOR		223
+#define UINPUT_NAME		"uinput"
+#define UINPUT_BUFFER_SIZE	16
+
+/* state flags => bit index for {set|clear|test}_bit ops */
+#define UIST_CREATED		0
+
+struct uinput_device {
+	struct input_dev	*dev;
+	unsigned long		state;
+	wait_queue_head_t	waitq;
+	unsigned char		ready,
+				head,
+				tail;
+	struct input_event	buff[UINPUT_BUFFER_SIZE];
+};
+#endif	/* __KERNEL__ */
+
+/* ioctl */
+#define UINPUT_IOCTL_BASE	'U'
+#define UI_DEV_CREATE		_IO(UINPUT_IOCTL_BASE, 1)
+#define UI_DEV_DESTROY		_IO(UINPUT_IOCTL_BASE, 2)
+#define UI_SET_EVBIT		_IOW(UINPUT_IOCTL_BASE, 100, int)
+#define UI_SET_KEYBIT		_IOW(UINPUT_IOCTL_BASE, 101, int)
+#define UI_SET_RELBIT		_IOW(UINPUT_IOCTL_BASE, 102, int)
+#define UI_SET_ABSBIT		_IOW(UINPUT_IOCTL_BASE, 103, int)
+#define UI_SET_MSCBIT		_IOW(UINPUT_IOCTL_BASE, 104, int)
+#define UI_SET_LEDBIT		_IOW(UINPUT_IOCTL_BASE, 105, int)
+#define UI_SET_SNDBIT		_IOW(UINPUT_IOCTL_BASE, 106, int)
+#define UI_SET_FFBIT		_IOW(UINPUT_IOCTL_BASE, 107, int)
+
+#ifndef NBITS
+#define NBITS(x) ((((x)-1)/(sizeof(long)*8))+1)
+#endif	/* NBITS */
+
+#define UINPUT_MAX_NAME_SIZE	80
+struct uinput_user_dev {
+	char name[UINPUT_MAX_NAME_SIZE];
+	unsigned short idbus;
+	unsigned short idvendor;
+	unsigned short idproduct;
+	unsigned short idversion;
+	int ff_effects_max;
+	int absmax[ABS_MAX + 1];
+	int absmin[ABS_MAX + 1];
+	int absfuzz[ABS_MAX + 1];
+	int absflat[ABS_MAX + 1];
+};
+#endif	/* __UINPUT_H_ */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/linux/wait.h linux-2.4.20-wolk4.16-fullkernel/include/linux/wait.h
--- linux-2.4.20-wolk4.15-fullkernel/include/linux/wait.h	2004-06-29 11:23:39.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/linux/wait.h	2004-09-05 15:47:42.000000000 +0200
@@ -260,7 +260,7 @@ static inline void __remove_wait_queue(w
 		wq_write_lock_irqsave(&(q)->lock, flags);	\
 		(wait)->flags = 0;				\
 		__add_wait_queue((q), (wait));			\
-		mb();						\
+		rmb();						\
 		if (!(cond)) {					\
 			_raced = 1;				\
 			__remove_wait_queue((q), (wait));	\
@@ -276,7 +276,7 @@ static inline void __remove_wait_queue(w
 		wq_write_lock_irqsave(&(q)->lock, flags);	\
 		(wait)->flags = WQ_FLAG_EXCLUSIVE;		\
 		__add_wait_queue_tail((q), (wait));		\
-		mb();						\
+		rmb();						\
 		if (!(cond)) {					\
 			_raced = 1;				\
 			__remove_wait_queue((q), (wait));	\
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/net/arp.h linux-2.4.20-wolk4.16-fullkernel/include/net/arp.h
--- linux-2.4.20-wolk4.15-fullkernel/include/net/arp.h	2001-11-22 20:47:14.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/include/net/arp.h	2004-09-05 15:54:58.000000000 +0200
@@ -5,6 +5,8 @@
 #include <linux/if_arp.h>
 #include <net/neighbour.h>
 
+#define HAVE_ARP_CREATE
+
 extern struct neigh_table arp_tbl;
 
 extern void	arp_init(void);
@@ -19,6 +21,12 @@ extern int	arp_bind_neighbour(struct dst
 extern int	arp_mc_map(u32 addr, u8 *haddr, struct net_device *dev, int dir);
 extern void	arp_ifdown(struct net_device *dev);
 
+extern struct sk_buff *arp_create(int type, int ptype, u32 dest_ip,
+				  struct net_device *dev, u32 src_ip,
+				  unsigned char *dest_hw, unsigned char *src_hw,
+				  unsigned char *target_hw);
+extern void arp_xmit(struct sk_buff *skb);
+
 extern struct neigh_ops arp_broken_ops;
 
 #endif	/* _ARP_H */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/net/bluetooth/bluetooth.h linux-2.4.20-wolk4.16-fullkernel/include/net/bluetooth/bluetooth.h
--- linux-2.4.20-wolk4.15-fullkernel/include/net/bluetooth/bluetooth.h	2004-06-29 11:26:15.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/net/bluetooth/bluetooth.h	2004-09-05 16:04:42.000000000 +0200
@@ -52,6 +52,7 @@
 #define BTPROTO_RFCOMM	3
 #define BTPROTO_BNEP	4
 #define BTPROTO_CMTP	5
+#define BTPROTO_HIDP	6
 
 #define SOL_HCI     0
 #define SOL_L2CAP   6
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/net/bluetooth/hci.h linux-2.4.20-wolk4.16-fullkernel/include/net/bluetooth/hci.h
--- linux-2.4.20-wolk4.15-fullkernel/include/net/bluetooth/hci.h	2004-06-29 11:26:15.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/net/bluetooth/hci.h	2004-09-05 16:04:42.000000000 +0200
@@ -42,11 +42,6 @@
 #define HCI_DEV_SUSPEND	5
 #define HCI_DEV_RESUME	6
 
-/* HCI notify events */
-#define HCI_NOTIFY_CONN_ADD		1
-#define HCI_NOTIFY_CONN_DEL		2
-#define HCI_NOTIFY_VOICE_SETTING	3
-
 /* HCI device types */
 #define HCI_VHCI	0
 #define HCI_USB		1
@@ -55,6 +50,11 @@
 #define HCI_RS232 	4
 #define HCI_PCI		5
 
+/* HCI device quirks */
+enum {
+	HCI_QUIRK_RESET_ON_INIT
+};
+
 /* HCI device flags */
 enum {
 	HCI_UP,
@@ -275,19 +275,6 @@ typedef struct {
 } __attribute__ ((packed)) write_class_of_dev_cp;
 #define WRITE_CLASS_OF_DEV_CP_SIZE 3
 
-#define OCF_READ_VOICE_SETTING	0x0025
-typedef struct {
-	__u8	status;
-	__u16	voice_setting;
-} __attribute__ ((packed)) read_voice_setting_rp;
-#define READ_VOICE_SETTING_RP_SIZE 3
-
-#define OCF_WRITE_VOICE_SETTING	0x0026
-typedef struct {
-	__u16	voice_setting;
-} __attribute__ ((packed)) write_voice_setting_cp;
-#define WRITE_VOICE_SETTING_CP_SIZE 2
-
 #define OCF_HOST_BUFFER_SIZE	0x0033
 typedef struct {
 	__u16 	acl_mtu;
@@ -480,6 +467,17 @@ typedef struct {
 } __attribute__ ((packed)) inquiry_info;
 #define INQUIRY_INFO_SIZE 14
 
+#define EVT_INQUIRY_RESULT_WITH_RSSI	0x22
+typedef struct {
+	bdaddr_t	bdaddr;
+	__u8	pscan_rep_mode;
+	__u8	pscan_period_mode;
+	__u8	dev_class[3];
+	__u16	clock_offset;
+	__s8	rssi;
+} __attribute__ ((packed)) inquiry_info_with_rssi;
+#define INQUIRY_INFO_WITH_RSSI_SIZE 14
+
 #define EVT_CONN_COMPLETE 	0x03
 typedef struct {
 	__u8	status;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/net/bluetooth/hci_core.h linux-2.4.20-wolk4.16-fullkernel/include/net/bluetooth/hci_core.h
--- linux-2.4.20-wolk4.15-fullkernel/include/net/bluetooth/hci_core.h	2004-06-29 11:26:15.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/net/bluetooth/hci_core.h	2004-09-05 16:04:42.000000000 +0200
@@ -68,12 +68,13 @@ struct hci_dev {
 	__u8	 	type;
 	bdaddr_t	bdaddr;
 	__u8		features[8];
-	__u16		voice_setting;
 
 	__u16		pkt_type;
 	__u16		link_policy;
 	__u16		link_mode;
 
+	unsigned long	quirks;
+
 	atomic_t 	cmd_cnt;
 	unsigned int 	acl_cnt;
 	unsigned int 	sco_cnt;
@@ -117,7 +118,6 @@ struct hci_dev {
 	int (*flush)(struct hci_dev *hdev);
 	int (*send)(struct sk_buff *skb);
 	void (*destruct)(struct hci_dev *hdev);
-	void (*notify)(struct hci_dev *hdev, unsigned int evt, unsigned long arg);
 	int (*ioctl)(struct hci_dev *hdev, unsigned int cmd, unsigned long arg);
 };
 
@@ -169,6 +169,12 @@ static inline void inquiry_cache_init(st
 	c->list = NULL;
 }
 
+static inline int inquiry_cache_empty(struct hci_dev *hdev)
+{
+	struct inquiry_cache *c = &hdev->inq_cache;
+	return (c->list == NULL);
+}
+
 static inline long inquiry_cache_age(struct hci_dev *hdev)
 {
 	struct inquiry_cache *c = &hdev->inq_cache;
@@ -284,10 +290,12 @@ static inline void hci_conn_hold(struct 
 static inline void hci_conn_put(struct hci_conn *conn)
 {
 	if (atomic_dec_and_test(&conn->refcnt)) {
-		if (conn->type == SCO_LINK)
+		if (conn->type == ACL_LINK) {
+			unsigned long timeo = (conn->out) ?
+				HCI_DISCONN_TIMEOUT : HCI_DISCONN_TIMEOUT * 2;
+			hci_conn_set_timer(conn, timeo);
+		} else
 			hci_conn_set_timer(conn, HZ / 100);
-		else if (conn->out)
-			hci_conn_set_timer(conn, HCI_DISCONN_TIMEOUT);
 	}
 }
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/net/bluetooth/l2cap.h linux-2.4.20-wolk4.16-fullkernel/include/net/bluetooth/l2cap.h
--- linux-2.4.20-wolk4.15-fullkernel/include/net/bluetooth/l2cap.h	2004-06-29 11:26:15.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/net/bluetooth/l2cap.h	2004-09-05 16:04:42.000000000 +0200
@@ -190,6 +190,14 @@ typedef struct {
 } __attribute__ ((packed))	l2cap_info_rsp;
 #define L2CAP_INFO_RSP_SIZE	4
 
+/* info type */
+#define L2CAP_IT_CL_MTU     0x0001
+#define L2CAP_IT_FEAT_MASK  0x0002
+
+/* info result */
+#define L2CAP_IR_SUCCESS    0x0000
+#define L2CAP_IR_NOTSUPP    0x0001
+
 /* ----- L2CAP connections ----- */
 struct l2cap_chan_list {
 	struct sock	*head;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/net/bluetooth/rfcomm.h linux-2.4.20-wolk4.16-fullkernel/include/net/bluetooth/rfcomm.h
--- linux-2.4.20-wolk4.15-fullkernel/include/net/bluetooth/rfcomm.h	2004-06-29 11:26:15.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/net/bluetooth/rfcomm.h	2004-09-05 16:04:42.000000000 +0200
@@ -167,8 +167,8 @@ struct rfcomm_session {
 	int              initiator;
 
 	/* Default DLC parameters */
+	int    cfc;
 	uint   mtu;
-	uint   credits;
 
 	struct list_head dlcs;
 };
@@ -190,7 +190,7 @@ struct rfcomm_dlc {
 	u8            mscex;
 
 	uint          mtu;
-	uint          credits;
+	uint          cfc;
 	uint          rx_credits;
 	uint          tx_credits;
 
@@ -219,6 +219,11 @@ struct rfcomm_dlc {
 #define RFCOMM_MSCEX_RX     2
 #define RFCOMM_MSCEX_OK     (RFCOMM_MSCEX_TX + RFCOMM_MSCEX_RX)
 
+/* CFC states */
+#define RFCOMM_CFC_UNKNOWN  -1
+#define RFCOMM_CFC_DISABLED 0
+#define RFCOMM_CFC_ENABLED  RFCOMM_MAX_CREDITS
+
 extern struct task_struct *rfcomm_thread;
 extern unsigned long rfcomm_event;
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/net/ip.h linux-2.4.20-wolk4.16-fullkernel/include/net/ip.h
--- linux-2.4.20-wolk4.15-fullkernel/include/net/ip.h	2004-06-29 11:24:39.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/net/ip.h	2004-09-05 15:59:18.000000000 +0200
@@ -238,6 +238,7 @@ extern int	ip_call_ra_chain(struct sk_bu
  */
  
 struct sk_buff *ip_defrag(struct sk_buff *skb);
+extern void ipfrag_flush(void);
 extern int ip_frag_nqueues;
 extern atomic_t ip_frag_mem;
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/net/pkt_sched.h linux-2.4.20-wolk4.16-fullkernel/include/net/pkt_sched.h
--- linux-2.4.20-wolk4.15-fullkernel/include/net/pkt_sched.h	2004-06-29 11:26:18.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/net/pkt_sched.h	2004-09-05 16:04:46.000000000 +0200
@@ -84,11 +84,11 @@ struct Qdisc
 #define TCQ_F_THROTTLED	2
 #define TCQ_F_INGRES	4
 	struct Qdisc_ops	*ops;
-	struct Qdisc		*next;
 	u32			handle;
 	atomic_t		refcnt;
 	struct sk_buff_head	q;
 	struct net_device	*dev;
+	struct list_head	list;
 
 	struct tc_stats		stats;
 	int			(*reshape_fail)(struct sk_buff *skb, struct Qdisc *q);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/net/sock.h linux-2.4.20-wolk4.16-fullkernel/include/net/sock.h
--- linux-2.4.20-wolk4.15-fullkernel/include/net/sock.h	2004-06-29 11:35:50.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/net/sock.h	2004-09-05 16:09:09.000000000 +0200
@@ -499,6 +499,7 @@ struct tcp_opt {
 		__u32	cnt;		/* increase cwnd by 1 after this number of ACKs */
 		__u32 	last_max_cwnd;	/* last maximium snd_cwnd */
 		__u32	last_cwnd;	/* the last snd_cwnd */
+		__u32   last_stamp;     /* time when updated last_cwnd */
 	} bictcp;
 };
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/include/net/tcp.h linux-2.4.20-wolk4.16-fullkernel/include/net/tcp.h
--- linux-2.4.20-wolk4.15-fullkernel/include/net/tcp.h	2004-06-29 11:31:53.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/include/net/tcp.h	2004-09-05 16:09:36.000000000 +0200
@@ -507,6 +507,7 @@ extern int sysctl_tcp_bic_fast_convergen
 extern int sysctl_tcp_bic_low_window;
 extern int sysctl_tcp_default_win_scale;
 extern int sysctl_tcp_moderate_rcvbuf;
+extern int sysctl_netdebug;
 
 extern atomic_t tcp_memory_allocated;
 extern atomic_t tcp_sockets_allocated;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/init/main.c linux-2.4.20-wolk4.16-fullkernel/init/main.c
--- linux-2.4.20-wolk4.15-fullkernel/init/main.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/init/main.c	2004-09-05 17:09:43.000000000 +0200
@@ -612,7 +612,7 @@ asmlinkage void __init start_kernel(void
 	 *	We want to tell the user if we are using grsecurity or not.
 	 */
 	#ifdef CONFIG_GRKERNSEC
-		printk("GRSECURITY: Grsecurity v1.9.15 initialized. (C) 2004, Brad Spengler.\n");
+		printk("GRSECURITY: Grsecurity v2.0.1 initialized. (C) 2004, Brad Spengler.\n");
 	#endif
 
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/init/version.c linux-2.4.20-wolk4.16-fullkernel/init/version.c
--- linux-2.4.20-wolk4.15-fullkernel/init/version.c	2004-06-29 11:31:43.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/init/version.c	2004-09-05 16:09:18.000000000 +0200
@@ -6,14 +6,10 @@
  *  May be freely distributed as part of Linux.
  */
 
-#include <linux/config.h>
 #include <linux/uts.h>
 #include <linux/utsname.h>
 #include <linux/version.h>
 #include <linux/compile.h>
-#ifdef CONFIG_PROC_CONFIG
-#include <linux/config_data.h>
-#endif
 
 #define version(a) Version_ ## a
 #define version_string(a) version(a)
@@ -26,7 +22,7 @@ struct new_utsname system_utsname = {
 };
 
 const char *wolk_banner =
-	"WOLK - Working Overloaded Linux Kernel - v4.15 - Server Edition""\n\n";
+	"WOLK - Working Overloaded Linux Kernel - v4.16 - Server Edition""\n\n";
 
 const char *linux_banner = 
 	"Linux version " UTS_RELEASE " (" LINUX_COMPILE_BY "@"
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/ipc/shm.c linux-2.4.20-wolk4.16-fullkernel/ipc/shm.c
--- linux-2.4.20-wolk4.15-fullkernel/ipc/shm.c	2004-06-29 11:31:19.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/ipc/shm.c	2004-09-05 16:09:14.000000000 +0200
@@ -658,9 +658,12 @@ asmlinkage long sys_shmctl (int shmid, i
 	case SHM_LOCK:
 	case SHM_UNLOCK:
 	{
-		/* Allow superuser to lock segment in memory */
-		if (!can_do_mlock())
+/* Allow superuser to lock segment in memory */
+/* Should the pages be faulted in here or leave it to user? */
+/* need to determine interaction with current->swappable */
+		if (!capable(CAP_IPC_LOCK))
 			return -EPERM;
+
 		shp = shm_lock(shmid);
 		if(shp==NULL)
 			return -EINVAL;
@@ -668,9 +671,8 @@ asmlinkage long sys_shmctl (int shmid, i
 		if(err)
 			goto out_unlock;
 		if(cmd==SHM_LOCK) {
-			err = shmem_lock(shp->shm_file, 1);
-			if (!err)
-				shp->shm_flags |= SHM_LOCKED;
+			shmem_lock(shp->shm_file, 1);
+			shp->shm_flags |= SHM_LOCKED;
 		} else {
 			shmem_lock(shp->shm_file, 0);
 			shp->shm_flags &= ~SHM_LOCKED;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/kdb/modules/kdbm_task.c linux-2.4.20-wolk4.16-fullkernel/kdb/modules/kdbm_task.c
--- linux-2.4.20-wolk4.15-fullkernel/kdb/modules/kdbm_task.c	2004-06-29 11:23:28.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/kdb/modules/kdbm_task.c	2004-09-05 15:46:29.000000000 +0200
@@ -122,8 +122,8 @@ kdbm_task(int argc, const char **argv, c
 	kdb_printf(" lock_depth=%d\n", tp->lock_depth);
 
 	kdb_printf(
-	    "  fs=0x%p files=0x%p mm=0x%p nr_local_pages=%u\n",
-	    tp->fs, tp->files, tp->mm, tp->nr_local_pages);
+	    "  fs=0x%p files=0x%p mm=0x%p\n",
+	    tp->fs, tp->files, tp->mm);
 
 	kdb_printf(
 	    "  uid=%d euid=%d suid=%d fsuid=%d gid=%d egid=%d sgid=%d fsgid=%d\n",
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/kernel/Makefile linux-2.4.20-wolk4.16-fullkernel/kernel/Makefile
--- linux-2.4.20-wolk4.15-fullkernel/kernel/Makefile	2004-06-29 11:31:21.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/kernel/Makefile	2004-09-05 16:09:17.000000000 +0200
@@ -23,7 +23,6 @@ obj-$(CONFIG_PM) += pm.o
 obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o
 obj-$(CONFIG_KALLSYMS) += kallsyms.o
 obj-$(CONFIG_EVLOG) += evl_buf.o evl_cmd.o
-obj-$(CONFIG_IKCONFIG) += configs.o
 
 ifneq ($(CONFIG_IA64),y)
 # According to Alan Modra <alan@linuxcare.com.au>, the -fno-omit-frame-pointer is
@@ -35,10 +34,3 @@ CFLAGS_sched.o := $(PROFILING) -fno-omit
 endif
 
 include $(TOPDIR)/Rules.make
-
-ikconfig.h: $(TOPDIR)/scripts/mkconfigs $(TOPDIR)/.config $(TOPDIR)/Makefile
-	$(CONFIG_SHELL) $(TOPDIR)/scripts/mkconfigs $(TOPDIR)/.config $(TOPDIR)/Makefile > ikconfig.h
-
-configs.o: ikconfig.h configs.c \
-		$(TOPDIR)/include/linux/version.h $(TOPDIR)/include/linux/compile.h
-
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/kernel/configs.c linux-2.4.20-wolk4.16-fullkernel/kernel/configs.c
--- linux-2.4.20-wolk4.15-fullkernel/kernel/configs.c	2004-06-29 11:26:20.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/kernel/configs.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,189 +0,0 @@
-/*
- * kernel/configs.c
- * Echo the kernel .config file used to build the kernel
- *
- * Copyright (C) 2002 Khalid Aziz <khalid_aziz@hp.com>
- * Copyright (C) 2002 Randy Dunlap <rddunlap@osdl.org>
- * Copyright (C) 2002 Al Stone <ahs3@fc.hp.com>
- * Copyright (C) 2002 Hewlett-Packard Company
- *
- * 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, GOOD TITLE or
- * NON INFRINGEMENT.  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., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/proc_fs.h>
-#include <linux/init.h>
-#include <linux/compile.h>
-#include <linux/version.h>
-#include <asm/uaccess.h>
-
-/**************************************************/
-/* the actual current config file                 */
-
-#include "ikconfig.h"
-
-#ifdef CONFIG_IKCONFIG_PROC
-
-/**************************************************/
-/* globals and useful constants                   */
-
-static char *IKCONFIG_NAME = "ikconfig";
-static char *IKCONFIG_VERSION = "0.5";
-
-static int ikconfig_current_size = 0;
-static struct proc_dir_entry *ikconfig_dir, *current_config, *built_with;
-
-static int
-ikconfig_permission_current(struct inode *inode, int op)
-{
-	/* anyone can read the device, no one can write to it */
-	return (op == MAY_READ) ? 0 : -EACCES;
-}
-
-static ssize_t
-ikconfig_output_current(struct file *file, char *buf,
-			 size_t len, loff_t * offset)
-{
-	int i, limit;
-	int cnt;
-
-	limit = (ikconfig_current_size > len) ? len : ikconfig_current_size;
-	for (i = file->f_pos, cnt = 0;
-	     i < ikconfig_current_size && cnt < limit; i++, cnt++) {
-		if (put_user(ikconfig_config[i], buf + cnt))
-			return -EFAULT;
-	}
-	file->f_pos = i;
-	return cnt;
-}
-
-static int
-ikconfig_open_current(struct inode *inode, struct file *file)
-{
-	if (file->f_mode & FMODE_READ) {
-		inode->i_size = ikconfig_current_size;
-		file->f_pos = 0;
-	}
-	return 0;
-}
-
-static int
-ikconfig_close_current(struct inode *inode, struct file *file)
-{
-	return 0;
-}
-
-static struct file_operations ikconfig_file_ops = {
-	.read = ikconfig_output_current,
-	.open = ikconfig_open_current,
-	.release = ikconfig_close_current,
-};
-
-static struct inode_operations ikconfig_inode_ops = {
-	.permission = ikconfig_permission_current,
-};
-
-/***************************************************/
-/* proc_read_built_with: let people read the info  */
-/* we have on the tools used to build this kernel  */
-
-static int
-proc_read_built_with(char *page, char **start,
-		     off_t off, int count, int *eof, void *data)
-{
-	*eof = 1;
-	return sprintf(page,
-			"Kernel:    %s\nCompiler:  %s\nVersion_in_Makefile: %s\n",
-			ikconfig_built_with, LINUX_COMPILER, UTS_RELEASE);
-}
-
-/***************************************************/
-/* ikconfig_init: start up everything we need to */
-
-int __init
-ikconfig_init(void)
-{
-	int result = 0;
-
-	printk(KERN_INFO "ikconfig %s with /proc/ikconfig\n",
-	       IKCONFIG_VERSION);
-
-	/* create the ikconfig directory */
-	ikconfig_dir = proc_mkdir(IKCONFIG_NAME, NULL);
-	if (ikconfig_dir == NULL) {
-		result = -ENOMEM;
-		goto leave;
-	}
-	ikconfig_dir->owner = THIS_MODULE;
-
-	/* create the current config file */
-	current_config = create_proc_entry("config", S_IFREG | S_IRUGO,
-					   ikconfig_dir);
-	if (current_config == NULL) {
-		result = -ENOMEM;
-		goto leave2;
-	}
-	current_config->proc_iops = &ikconfig_inode_ops;
-	current_config->proc_fops = &ikconfig_file_ops;
-	current_config->owner = THIS_MODULE;
-	ikconfig_current_size = strlen(ikconfig_config);
-	current_config->size = ikconfig_current_size;
-
-	/* create the "built with" file */
-	built_with = create_proc_read_entry("built_with", 0444, ikconfig_dir,
-					    proc_read_built_with, NULL);
-	if (built_with == NULL) {
-		result = -ENOMEM;
-		goto leave3;
-	}
-	built_with->owner = THIS_MODULE;
-	goto leave;
-
-leave3:
-	/* remove the file from proc */
-	remove_proc_entry("config", ikconfig_dir);
-
-leave2:
-	/* remove the ikconfig directory */
-	remove_proc_entry(IKCONFIG_NAME, NULL);
-
-leave:
-	return result;
-}
-
-/***************************************************/
-/* cleanup_ikconfig: clean up our mess           */
-
-static void
-cleanup_ikconfig(void)
-{
-	/* remove the files */
-	remove_proc_entry("config", ikconfig_dir);
-	remove_proc_entry("built_with", ikconfig_dir);
-
-	/* remove the ikconfig directory */
-	remove_proc_entry(IKCONFIG_NAME, NULL);
-}
-
-module_init(ikconfig_init);
-module_exit(cleanup_ikconfig);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Randy Dunlap");
-MODULE_DESCRIPTION("Echo the kernel .config file used to build the kernel");
-
-#endif /* CONFIG_IKCONFIG_PROC */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/kernel/exit.c linux-2.4.20-wolk4.16-fullkernel/kernel/exit.c
--- linux-2.4.20-wolk4.15-fullkernel/kernel/exit.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/kernel/exit.c	2004-09-05 17:09:43.000000000 +0200
@@ -7,6 +7,7 @@
 #include <linux/config.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
+#include <linux/file.h>
 #include <linux/smp_lock.h>
 #include <linux/module.h>
 #include <linux/completion.h>
@@ -37,6 +38,11 @@ extern void sem_exit (void);
 #ifdef CONFIG_GRKERNSEC_DESTROY_SHM
 extern void shm_exit (void);
 #endif
+
+#ifdef CONFIG_GRKERNSEC
+extern rwlock_t grsec_exec_file_lock;
+#endif
+
 extern struct task_struct *child_reaper;
 
 int sysctl_warn_preempt = 1;		/* Warn about preempted tasks still holding locks */
@@ -168,10 +174,12 @@ void reparent_to_init(void)
 	write_lock_irq(&tasklist_lock);
 
 #ifdef CONFIG_GRKERNSEC
+	write_lock(&grsec_exec_file_lock);
 	if (current->exec_file) {
 		fput(current->exec_file);
 		current->exec_file = NULL;
 	}
+	write_unlock(&grsec_exec_file_lock);
 #endif
 
 	/* Reparent to init */
@@ -211,10 +219,12 @@ void daemonize(void)
 	struct fs_struct *fs;
 
 #ifdef CONFIG_GRKERNSEC
+	write_lock(&grsec_exec_file_lock);
 	if (current->exec_file) {
 		fput(current->exec_file);
 		current->exec_file = NULL;
 	}
+	write_unlock(&grsec_exec_file_lock);
 #endif
 	gr_set_kernel_label(current);
 
@@ -579,6 +589,7 @@ fake_volatile:
 #endif
 	gr_acl_handle_psacct(tsk, code);
 	gr_acl_handle_exit();
+	gr_del_task_from_ip_table(tsk);
 
 #ifdef CONFIG_SYSTRACE
 	systrace_exit(tsk);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/kernel/fork.c linux-2.4.20-wolk4.16-fullkernel/kernel/fork.c
--- linux-2.4.20-wolk4.15-fullkernel/kernel/fork.c	2004-06-29 11:31:28.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/kernel/fork.c	2004-09-05 17:09:43.000000000 +0200
@@ -296,8 +296,7 @@ static inline int dup_mmap(struct mm_str
 		if (!tmp)
 			goto fail_nomem;
 		*tmp = *mpnt;
-		if (likely(!(tmp->vm_flags & VM_NO_UNLOCK)))
-			tmp->vm_flags &= ~VM_LOCKED;
+		tmp->vm_flags &= ~VM_LOCKED;
 		tmp->vm_mm = mm;
 		tmp->vm_next = NULL;
 		file = tmp->vm_file;
@@ -800,6 +799,8 @@ int do_fork(unsigned long clone_flags, u
           }
         #endif
 
+	gr_handle_brute_check();
+
 	retval = -ENOMEM;
 	p = alloc_task_struct();
 	if (!p)
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/kernel/ksyms.c linux-2.4.20-wolk4.16-fullkernel/kernel/ksyms.c
--- linux-2.4.20-wolk4.15-fullkernel/kernel/ksyms.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/kernel/ksyms.c	2004-09-05 17:09:43.000000000 +0200
@@ -85,6 +85,7 @@ __attribute__((section("__ksymtab"))) = 
 };
 #endif
 
+
 EXPORT_SYMBOL(inter_module_register);
 EXPORT_SYMBOL(inter_module_unregister);
 EXPORT_SYMBOL(inter_module_get);
@@ -210,9 +211,9 @@ EXPORT_SYMBOL(d_lookup);
 EXPORT_SYMBOL(__d_path);
 EXPORT_SYMBOL(mark_buffer_dirty);
 EXPORT_SYMBOL(discard_buffer);      /* for FS flushpage funcs */
-EXPORT_SYMBOL(end_buffer_io_sync);
-EXPORT_SYMBOL(end_buffer_io_async);
 EXPORT_SYMBOL(set_buffer_async_io); /* for reiserfs_writepage */
+EXPORT_SYMBOL(end_buffer_io_async);
+EXPORT_SYMBOL(end_buffer_io_sync);
 /* EXPORT_SYMBOL(__mark_dirty); */
 EXPORT_SYMBOL(__mark_buffer_dirty);
 EXPORT_SYMBOL(__mark_inode_dirty);
@@ -700,7 +701,7 @@ EXPORT_SYMBOL(kdb_usb_infos);
 #endif
 
 /* grsecurity */
-EXPORT_SYMBOL(gr_is_capable);
+EXPORT_SYMBOL(gr_task_is_capable);
 EXPORT_SYMBOL(gr_pid_is_chrooted);
 EXPORT_SYMBOL(gr_learn_resource);
 EXPORT_SYMBOL(gr_set_kernel_label);
@@ -713,21 +714,20 @@ EXPORT_SYMBOL(set_fs_root);
 
 /* evfs */
 #if defined (CONFIG_EVFS_FS) || defined (CONFIG_EVFS_FS_MODULE)
-extern void sys_rename();
-extern void sys_readlink();
-extern void sys_unlink();
-extern void sys_symlink();
-extern void sys_mknod();
-extern void sys_mknod();
-extern void sys_mkdir();
-extern void sys_rmdir();
-extern void sys_link();
-EXPORT_SYMBOL(sys_rename);
+extern long sys_readlink(const char * path, char * buf, int bufsiz);
+extern long sys_link(const char * oldname, const char * newname);
+extern long sys_unlink(const char * pathname);
+extern long sys_symlink(const char * oldname, const char * newname);
+extern long sys_mkdir(const char * pathname, int mode);
+extern long sys_rmdir(const char * pathname);
+extern long sys_mknod(const char * filename, int mode, dev_t dev);
+extern long sys_rename(const char * oldname, const char * newname);
 EXPORT_SYMBOL(sys_readlink);
+EXPORT_SYMBOL(sys_link);
 EXPORT_SYMBOL(sys_unlink);
 EXPORT_SYMBOL(sys_symlink);
-EXPORT_SYMBOL(sys_mknod);
 EXPORT_SYMBOL(sys_mkdir);
 EXPORT_SYMBOL(sys_rmdir);
-EXPORT_SYMBOL(sys_link);
+EXPORT_SYMBOL(sys_mknod);
+EXPORT_SYMBOL(sys_rename);
 #endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/kernel/module.c linux-2.4.20-wolk4.16-fullkernel/kernel/module.c
--- linux-2.4.20-wolk4.15-fullkernel/kernel/module.c	2004-06-29 11:31:26.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/kernel/module.c	2004-09-05 16:08:39.000000000 +0200
@@ -1497,6 +1497,7 @@ void print_modules(void)
 					"%s ", this_mod->name);
 		this_mod = this_mod->next;
 	}
+	printk("Modules linked in: ");
 	printk("%s\n",modlist);
 }
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/kernel/panic.c linux-2.4.20-wolk4.16-fullkernel/kernel/panic.c
--- linux-2.4.20-wolk4.15-fullkernel/kernel/panic.c	2004-06-29 11:58:58.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/kernel/panic.c	2004-09-05 16:09:11.000000000 +0200
@@ -214,15 +214,8 @@ NORET_TYPE void panic(const char * fmt, 
 	va_start(args, fmt);
 	vsnprintf(buf, sizeof(buf), fmt, args);
 	va_end(args);
-	printk(KERN_EMERG "Kernel panic: %s\n",buf);
-	if (netdump_func)
-		BUG();
-	if (in_interrupt())
-		printk(KERN_EMERG "In interrupt handler - not syncing\n");
-	else if (!current->pid)
-		printk(KERN_EMERG "In idle task - not syncing\n");
-	else
-		sys_sync();
+	sys_sync();
+	printk(KERN_EMERG "Kernel panic - not syncing: %s\n",buf);
 	bust_spinlocks(0);
 
 #ifdef CONFIG_SMP
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/kernel/sched.c linux-2.4.20-wolk4.16-fullkernel/kernel/sched.c
--- linux-2.4.20-wolk4.15-fullkernel/kernel/sched.c	2004-06-29 11:31:44.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/kernel/sched.c	2004-09-05 16:08:21.000000000 +0200
@@ -756,9 +756,9 @@ skip_queue:
 	 * 3) are cache-hot on their current CPU.
 	 */
 
-#define CAN_MIGRATE_TASK(p,rq,this_cpu)						\
-	((idle || (jiffies - (p)->sleep_timestamp > cache_decay_ticks)) &&	\
-		((p) != (rq)->curr) &&						\
+#define CAN_MIGRATE_TASK(p,rq,this_cpu)					\
+	((jiffies - (p)->sleep_timestamp > cache_decay_ticks) &&	\
+		((p) != (rq)->curr) &&					\
 			((p)->cpus_allowed & (1UL << (this_cpu))))
 
 	curr = curr->prev;
@@ -991,6 +991,7 @@ need_resched:
 	case TASK_RUNNING:
 		;
 	}
+pick_next_task:
 	if (unlikely(!rq->nr_running)) {
 #ifdef CONFIG_SMP
 		load_balance(rq, 2);
@@ -1002,7 +1003,6 @@ need_resched:
 		rq->expired_timestamp = 0;
 		goto switch_tasks;
 	}
-pick_next_task:
 
 	array = rq->active;
 	if (unlikely(!array->nr_active)) {
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/kernel/signal.c linux-2.4.20-wolk4.16-fullkernel/kernel/signal.c
--- linux-2.4.20-wolk4.15-fullkernel/kernel/signal.c	2004-06-29 11:31:21.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/kernel/signal.c	2004-09-07 09:57:25.000000000 +0200
@@ -363,7 +363,7 @@ int bad_signal(int sig, struct siginfo *
 	    && ((sig != SIGCONT) || (current->session != t->session))
 	    && (   (   (current->euid ^ t->suid) && (current->euid ^ t->uid)
 	    && (current->uid ^ t->suid) && (current->uid ^ t->uid)
-	            && !capable(CAP_KILL)
+	            && !capable(CAP_KILL) && !gr_handle_signal(t, sig)
 	           )
                 /* RSBAC */
                 #ifdef CONFIG_RSBAC
@@ -643,13 +643,9 @@ kill_pg_info(int sig, struct siginfo *in
 		read_lock(&tasklist_lock);
 		for_each_task(p) {
 			if (p->pgrp == pgrp && thread_group_leader(p)) {
-				if (gr_handle_signal(p, sig))
-					retval = -EPERM;
-				else {
-					int err = send_sig_info(sig, info, p);
-					if (retval)
-						retval = err;
-				}
+				int err = send_sig_info(sig, info, p);
+				if (retval)
+					retval = err;
 			}
 		}
 		read_unlock(&tasklist_lock);
@@ -700,10 +696,7 @@ kill_proc_info(int sig, struct siginfo *
                        if (tg)
                                p = tg;
                 }
-		if (gr_handle_signal(p, sig))
-			error = -EPERM;
-		else
-			error = send_sig_info(sig, info, p);
+		error = send_sig_info(sig, info, p);
 	}
 	read_unlock(&tasklist_lock);
 	return error;
@@ -728,14 +721,10 @@ static int kill_something_info(int sig, 
 		read_lock(&tasklist_lock);
 		for_each_task(p) {
 			if (p->pid > 1 && p != current && thread_group_leader(p)) {
-				if (gr_handle_signal(p, sig))
-					retval = -EPERM;
-				else {
-					int err = send_sig_info(sig, info, p);
-					++count;
-					if (err != -EPERM)
-						retval = err;
-				}
+				int err = send_sig_info(sig, info, p);
+				++count;
+				if (err != -EPERM)
+					retval = err;
 			}
 		}
 		read_unlock(&tasklist_lock);
@@ -1083,7 +1072,7 @@ sys_tkill(int pid, int sig)
        p = find_task_by_pid(pid);
        error = -ESRCH;
        if (p) {
-               error = send_sig_info(sig, &info, p);
+              error = send_sig_info(sig, &info, p);
        }
        read_unlock(&tasklist_lock);
        return error;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/kernel/sys.c linux-2.4.20-wolk4.16-fullkernel/kernel/sys.c
--- linux-2.4.20-wolk4.15-fullkernel/kernel/sys.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/kernel/sys.c	2004-09-05 17:09:43.000000000 +0200
@@ -606,6 +606,10 @@ asmlinkage long sys_setregid(gid_t rgid,
 			return -EPERM;
 		}
 	}
+
+	if (gr_check_group_change(new_rgid, new_egid, -1))
+		return -EPERM;
+
 	if (!core_allow_setid && new_egid != old_egid)
 	{
 		current->mm->dumpable = 0;
@@ -614,6 +618,9 @@ asmlinkage long sys_setregid(gid_t rgid,
 	if (rgid != (gid_t) -1 ||
 	    (egid != (gid_t) -1 && egid != old_rgid))
 		current->sgid = new_egid;
+
+	gr_set_role_label(current, current->uid, new_rgid);
+
 	current->fsgid = new_egid;
 	current->egid = new_egid;
 	current->gid = new_rgid;
@@ -629,6 +636,9 @@ asmlinkage long sys_setgid(gid_t gid)
 {
 	int old_egid = current->egid;
 
+	if (gr_check_group_change(gid, gid, gid))
+		return -EPERM;
+
         /* RSBAC */
         #ifdef CONFIG_RSBAC
         union rsbac_target_id_t       rsbac_target_id;
@@ -662,6 +672,9 @@ asmlinkage long sys_setgid(gid_t gid)
 			current->mm->dumpable=0;
 			wmb();
 		}
+
+		gr_set_role_label(current, current->uid, gid);
+
 		current->gid = current->egid = current->sgid = current->fsgid = gid;
 	}
 	else if (((gid == current->gid) || (gid == current->sgid))
@@ -748,6 +761,9 @@ static int set_user(uid_t new_ruid, int 
 		current->mm->dumpable = 0;
 		wmb();
 	}
+
+	gr_set_role_label(current, new_ruid, current->gid);
+
 	current->uid = new_ruid;
 	return 0;
 }
@@ -799,6 +815,9 @@ asmlinkage long sys_setreuid(uid_t ruid,
 			return -EPERM;
 	}
 
+	if (gr_check_user_change(new_ruid, new_euid, -1))
+		return -EPERM;
+
         /* RSBAC */
         #ifdef CONFIG_RSBAC
         if(ruid != (uid_t) -1)
@@ -910,6 +929,12 @@ asmlinkage long sys_setuid(uid_t uid)
 	old_suid = current->suid;
 	new_suid = old_suid;
 	
+	if (gr_check_crash_uid(uid))
+		return -EPERM;
+
+	if (gr_check_user_change(uid, uid, uid))
+		return -EPERM;
+
 	if (capable(CAP_SETUID)) {
 		if (uid != old_ruid && set_user(uid, !core_allow_setid && old_euid != uid) < 0)
 			return -EAGAIN;
@@ -917,9 +942,6 @@ asmlinkage long sys_setuid(uid_t uid)
 	} else if ((uid != current->uid) && (uid != new_suid))
 		return -EPERM;
 
-	if (gr_check_crash_uid(uid))
-		return -EPERM;
-
 	if (!core_allow_setid && old_euid != uid)
 	{
 		current->mm->dumpable = 0;
@@ -981,6 +1003,9 @@ asmlinkage long sys_setresuid(uid_t ruid
 			return -EPERM;
 	}
 
+	if (gr_check_user_change(ruid, euid, -1))
+		return -EPERM;
+
         /* RSBAC */
         #ifdef CONFIG_RSBAC
         if(ruid != (uid_t) -1)
@@ -1079,6 +1104,9 @@ asmlinkage long sys_setresgid(gid_t rgid
 			return -EPERM;
 	}
 
+	if (gr_check_group_change(rgid, egid, -1))
+		return -EPERM;
+
         /* RSBAC */
         #ifdef CONFIG_RSBAC
         if(rgid != (gid_t) -1)
@@ -1108,8 +1136,10 @@ asmlinkage long sys_setresgid(gid_t rgid
 		current->egid = egid;
 	}
 	current->fsgid = current->egid;
-	if (rgid != (gid_t) -1)
+	if (rgid != (gid_t) -1) {
+		gr_set_role_label(current, current->uid, rgid);
 		current->gid = rgid;
+	}
 	if (sgid != (gid_t) -1)
 		current->sgid = sgid;
 	return 0;
@@ -1142,6 +1172,9 @@ asmlinkage long sys_setfsuid(uid_t uid)
 	    uid == current->suid || uid == current->fsuid || 
 	    capable(CAP_SETUID))
 	{
+		if (gr_check_user_change(-1, -1, uid))
+			return -EPERM;
+
 		if (!core_allow_setid && uid != old_fsuid)
 		{
 			current->mm->dumpable = 0;
@@ -1184,6 +1217,9 @@ asmlinkage long sys_setfsgid(gid_t gid)
 	    gid == current->sgid || gid == current->fsgid || 
 	    capable(CAP_SETGID))
 	{
+		if (gr_check_group_change(-1, -1, gid))
+			return -EPERM;
+
 		if (!core_allow_setid && gid != old_fsgid)
 		{
 			current->mm->dumpable = 0;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/kernel/sysctl.c linux-2.4.20-wolk4.16-fullkernel/kernel/sysctl.c
--- linux-2.4.20-wolk4.15-fullkernel/kernel/sysctl.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/kernel/sysctl.c	2004-09-05 17:09:43.000000000 +0200
@@ -52,8 +52,6 @@
 #include <linux/grsecurity.h>
 #include <linux/grinternal.h>
 
-extern int gr_proc_handler(ctl_table * table, int write, struct file * filp,
-			   void * buffer, size_t * lenp);
 extern __u32 gr_handle_sysctl(const ctl_table * table, const void *oldval,
 			      const void *newval);
 extern int gr_handle_sysctl_mod(const char *dirname, const char *name, const int op);
@@ -359,7 +357,7 @@ static ctl_table kern_table[] = {
 	{KERN_STACKDEFER, "stackdefer", &sysctl_stackdefer, sizeof(int),
 	 0644, NULL, &proc_dointvec},
 
-#ifdef CONFIG_GRKERNSEC
+#ifdef CONFIG_GRKERNSEC_SYSCTL
 	{KERN_GRSECURITY, "grsecurity", NULL, 0, 0500, grsecurity_table},
 #endif
 
@@ -370,21 +368,19 @@ static ctl_table kern_table[] = {
 	{0}
 };
 
-#ifdef CONFIG_GRKERNSEC
-enum {GS_ACL=1, GS_LINK, GS_FIFO, GS_EXECVE, GS_EXECLOG, GS_RESLOG, GS_SIGNAL, 
+#ifdef CONFIG_GRKERNSEC_SYSCTL
+enum {GS_LINK=1, GS_FIFO, GS_EXECVE, GS_EXECLOG, GS_RESLOG, GS_SIGNAL,
 GS_FORKFAIL, GS_TIME, GS_CHROOT_SHMAT, GS_CHROOT_UNIX, GS_CHROOT_MNT,
 GS_CHROOT_FCHDIR, GS_CHROOT_DBL, GS_CHROOT_PVT, GS_CHROOT_CD, GS_CHROOT_CM,
 GS_CHROOT_MK, GS_CHROOT_NI, GS_CHROOT_EXECLOG, GS_CHROOT_CAPS, 
-GS_CHROOT_SYSCTL, GS_TPE, GS_TPE_GID, GS_TPE_ALL, 
+GS_CHROOT_SYSCTL, GS_TPE, GS_TPE_GID, GS_TPE_ALL,
 GS_RANDPID, GS_RANDID, GS_RANDSRC, GS_RANDISN, GS_RANDPING, GS_RANDTTL,
 GS_SOCKET_ALL, GS_SOCKET_ALL_GID, GS_SOCKET_CLIENT,
-GS_SOCKET_CLIENT_GID, GS_SOCKET_SERVER, GS_SOCKET_SERVER_GID, 
+GS_SOCKET_CLIENT_GID, GS_SOCKET_SERVER, GS_SOCKET_SERVER_GID,
 GS_GROUP, GS_GID, GS_ACHDIR, GS_AMOUNT, GS_AIPC, GS_TEXTREL, GS_DMSG,
 GS_RANDRPC, GS_FINDTASK, GS_IO, GS_LOCK};
 
 static ctl_table grsecurity_table[] = {
-	{GS_ACL,"acl", NULL, sizeof(int), 0600, NULL, &gr_proc_handler},
-#ifdef CONFIG_GRKERNSEC_SYSCTL
 #ifdef CONFIG_GRKERNSEC_LINK
 	{GS_LINK, "linking_restrictions", &grsec_enable_link, sizeof (int),
 	 0600, NULL, &proc_dointvec}, 
@@ -569,7 +565,6 @@ static ctl_table grsecurity_table[] = {
 #endif
 	{GS_LOCK, "grsec_lock", &grsec_lock, sizeof (int), 0600, NULL,
 	 &proc_dointvec},
-#endif
 	{0}
 };
 #endif
@@ -741,7 +736,7 @@ static int test_perm(int mode, int op)
 
 static inline int ctl_perm(ctl_table *table, int op)
 {
-	if (gr_handle_sysctl_mod(table->de->parent->name, table->de->name, op))
+	if (table->de && gr_handle_sysctl_mod(table->de->parent->name, table->de->name, op))
 		return -EACCES;
 	if (gr_handle_chroot_sysctl(op))
 		return -EACCES;
@@ -1262,7 +1257,7 @@ static int do_proc_dointvec(ctl_table *t
 				if (!isspace(c))
 					break;
 				left--;
-				((char *) buffer)++;
+				buffer += sizeof(char);
 			}
 			if (!left)
 				break;
@@ -1415,7 +1410,7 @@ int proc_dointvec_minmax(ctl_table *tabl
 				if (!isspace(c))
 					break;
 				left--;
-				((char *) buffer)++;
+				buffer += sizeof(char);
 			}
 			if (!left)
 				break;
@@ -1516,7 +1511,7 @@ static int do_proc_doulongvec_minmax(ctl
 				if (!isspace(c))
 					break;
 				left--;
-				((char *) buffer)++;
+				buffer += sizeof(char);
 			}
 			if (!left)
 				break;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/lib/Makefile linux-2.4.20-wolk4.16-fullkernel/lib/Makefile
--- linux-2.4.20-wolk4.15-fullkernel/lib/Makefile	2004-06-29 11:26:20.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/lib/Makefile	2004-09-05 16:04:49.000000000 +0200
@@ -9,7 +9,7 @@
 L_TARGET := lib.a
 
 export-objs := cmdline.o dec_and_lock.o rwsem-spinlock.o rwsem.o \
-	       rbtree.o qsort.o firmware_class.o
+		rbtree.o qsort.o firmware_class.o
 
 obj-y := errno.o ctype.o string.o vsprintf.o brlock.o cmdline.o \
 	 bust_spinlocks.o rbtree.o dump_stack.o propolice.o
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/lib/firmware_class.c linux-2.4.20-wolk4.16-fullkernel/lib/firmware_class.c
--- linux-2.4.20-wolk4.15-fullkernel/lib/firmware_class.c	2004-06-29 11:26:15.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/lib/firmware_class.c	2004-09-05 16:04:42.000000000 +0200
@@ -565,7 +565,9 @@ firmware_class_exit(void)
 module_init(firmware_class_init);
 module_exit(firmware_class_exit);
 
+#ifndef CONFIG_FW_LOADER
 EXPORT_SYMBOL(release_firmware);
 EXPORT_SYMBOL(request_firmware);
 EXPORT_SYMBOL(request_firmware_nowait);
 EXPORT_SYMBOL(register_firmware);
+#endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/lib/rbtree.c linux-2.4.20-wolk4.16-fullkernel/lib/rbtree.c
--- linux-2.4.20-wolk4.15-fullkernel/lib/rbtree.c	2004-06-29 11:23:32.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/lib/rbtree.c	2004-09-05 16:06:35.000000000 +0200
@@ -334,3 +334,74 @@ rb_node_t *rb_get_next(rb_node_t *n)
 }
 EXPORT_SYMBOL(rb_get_next);
 
+/*
+ * This function returns the first node (in sort order) of the tree.
+ */
+rb_node_t *rb_first(rb_root_t *root)
+{
+	rb_node_t *n;
+
+	n = root->rb_node;
+	if (!n)
+		return NULL;
+	while (n->rb_left)
+		n = n->rb_left;
+	return n;
+}
+EXPORT_SYMBOL(rb_first);
+
+rb_node_t *rb_last(rb_root_t *root)
+{
+	rb_node_t *n;
+
+	n = root->rb_node;
+	if (!n)
+		return NULL;
+	while (n->rb_right)
+		n = n->rb_right;
+	return n;
+}
+EXPORT_SYMBOL(rb_last);
+
+rb_node_t *rb_next(rb_node_t *node)
+{
+	/* If we have a right-hand child, go down and then left as far
+	   as we can. */
+	if (node->rb_right) {
+		node = node->rb_right;
+		while (node->rb_left)
+			node = node->rb_left;
+	}
+
+	/* No right-hand children.  Everything down and left is
+	   smaller than us, so any 'next' node must be in the general
+	   direction of our parent. Go up the tree; any time the
+	   ancestor is a right-hand child of its parent, keep going
+	   up. First time it's a left-hand child of its parent, said
+	   parent is our 'next' node. */
+	while (node->rb_parent && node == node->rb_parent->rb_right)
+		node = node->rb_parent;
+
+	return node->rb_parent;
+}
+EXPORT_SYMBOL(rb_next);
+
+rb_node_t *rb_prev(rb_node_t *node)
+{
+	/* If we have a left-hand child, go down and then right as far
+	   as we can. */
+	if (node->rb_left) {
+		node = node->rb_left;
+		while (node->rb_right)
+			node = node->rb_right;	 
+	}
+
+	/* No left-hand children. Go up till we find an ancestor which
+	   is a right-hand child of its parent */
+	while (node->rb_parent && node == node->rb_parent->rb_left)
+		node = node->rb_parent;
+
+	return node->rb_parent;
+}
+EXPORT_SYMBOL(rb_prev);
+
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/lib/rwsem.c linux-2.4.20-wolk4.16-fullkernel/lib/rwsem.c
--- linux-2.4.20-wolk4.15-fullkernel/lib/rwsem.c	2004-06-29 11:35:48.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/lib/rwsem.c	2004-09-05 16:09:33.000000000 +0200
@@ -29,14 +29,15 @@ void rwsemtrace(struct rw_semaphore *sem
 
 /*
  * handle the lock being released whilst there are processes blocked on it that can now run
- * - if we come here, then:
- *   - the 'active part' of the count (&0x0000ffff) reached zero but has been re-incremented
+ * - if we come here from up_xxxx(), then:
+ *   - the 'active part' of the count (&0x0000ffff) had reached zero (but may have changed)
  *   - the 'waiting part' of the count (&0xffff0000) is negative (and will still be so)
  *   - there must be someone on the queue
  * - the spinlock must be held by the caller
- * - woken process blocks are discarded from the list after having flags zeroised
+ * - woken process blocks are discarded from the list after having task zeroised
+ * - writers are only woken if downgrading is false
  */
-static inline struct rw_semaphore *__rwsem_do_wake(struct rw_semaphore *sem)
+static inline struct rw_semaphore *__rwsem_do_wake(struct rw_semaphore *sem, int downgrading)
 {
 	struct rwsem_waiter *waiter;
 	struct task_struct *tsk;
@@ -45,7 +46,12 @@ static inline struct rw_semaphore *__rws
 
 	rwsemtrace(sem,"Entering __rwsem_do_wake");
 
-	/* only wake someone up if we can transition the active part of the count from 0 -> 1 */
+	if (downgrading)
+		goto dont_wake_writers;
+
+	/* if we came through an up_xxxx() call, we only only wake someone up
+	 * if we can transition the active part of the count from 0 -> 1
+	 */
  try_again:
 	oldcount = rwsem_atomic_update(RWSEM_ACTIVE_BIAS,sem) - RWSEM_ACTIVE_BIAS;
 	if (oldcount & RWSEM_ACTIVE_MASK)
@@ -68,9 +74,16 @@ static inline struct rw_semaphore *__rws
 	free_task_struct(tsk);
 	goto out;
 
-	/* grant an infinite number of read locks to the readers at the front of the queue
-	 * - note we increment the 'active part' of the count by the number of readers (less one
-	 *   for the activity decrement we've already done) before waking any processes up
+	/* don't want to wake any writers */
+ dont_wake_writers:
+	waiter = list_entry(sem->wait_list.next,struct rwsem_waiter,list);
+	if (waiter->flags & RWSEM_WAITING_FOR_WRITE)
+		goto out;
+
+	/* grant an infinite number of read locks to the readers at the front
+	 * of the queue
+	 * - note we increment the 'active part' of the count by the number of
+	 *   readers before waking any processes up
 	 */
  readers_only:
 	woken = 0;
@@ -85,8 +98,10 @@ static inline struct rw_semaphore *__rws
 	} while (waiter->flags & RWSEM_WAITING_FOR_READ);
 
 	loop = woken;
-	woken *= RWSEM_ACTIVE_BIAS-RWSEM_WAITING_BIAS;
-	woken -= RWSEM_ACTIVE_BIAS;
+	woken *= RWSEM_ACTIVE_BIAS - RWSEM_WAITING_BIAS;
+	if (!downgrading)
+		woken -= RWSEM_ACTIVE_BIAS; /* we'd already done one increment
+					     * earlier */
 	rwsem_atomic_add(woken,sem);
 
 	next = sem->wait_list.next;
@@ -140,7 +155,7 @@ static inline struct rw_semaphore *rwsem
 	 * - it might even be this process, since the waker takes a more active part
 	 */
 	if (!(count & RWSEM_ACTIVE_MASK))
-		sem = __rwsem_do_wake(sem);
+		sem = __rwsem_do_wake(sem, 0);
 
 	spin_unlock(&sem->wait_lock);
 
@@ -191,7 +206,7 @@ struct rw_semaphore *rwsem_down_write_fa
 
 /*
  * handle waking up a waiter on the semaphore
- * - up_read has decremented the active part of the count if we come here
+ * - up_read/up_write has decremented the active part of the count if we come here
  */
 struct rw_semaphore *rwsem_wake(struct rw_semaphore *sem)
 {
@@ -201,7 +216,7 @@ struct rw_semaphore *rwsem_wake(struct r
 
 	/* do nothing if list empty */
 	if (!list_empty(&sem->wait_list))
-		sem = __rwsem_do_wake(sem);
+		sem = __rwsem_do_wake(sem, 0);
 
 	spin_unlock(&sem->wait_lock);
 
@@ -210,9 +225,31 @@ struct rw_semaphore *rwsem_wake(struct r
 	return sem;
 }
 
+/*
+ * downgrade a write lock into a read lock
+ * - caller incremented waiting part of count, and discovered it to be still negative
+ * - just wake up any readers at the front of the queue
+ */
+struct rw_semaphore *rwsem_downgrade_wake(struct rw_semaphore *sem)
+{
+	rwsemtrace(sem,"Entering rwsem_downgrade_wake");
+
+	spin_lock(&sem->wait_lock);
+
+	/* do nothing if list empty */
+	if (!list_empty(&sem->wait_list))
+		sem = __rwsem_do_wake(sem, 1);
+
+	spin_unlock(&sem->wait_lock);
+
+	rwsemtrace(sem,"Leaving rwsem_downgrade_wake");
+	return sem;
+}
+
 EXPORT_SYMBOL_NOVERS(rwsem_down_read_failed);
 EXPORT_SYMBOL_NOVERS(rwsem_down_write_failed);
 EXPORT_SYMBOL_NOVERS(rwsem_wake);
+EXPORT_SYMBOL_NOVERS(rwsem_downgrade_wake);
 #if RWSEM_DEBUG
 EXPORT_SYMBOL(rwsemtrace);
 #endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/mm/Makefile linux-2.4.20-wolk4.16-fullkernel/mm/Makefile
--- linux-2.4.20-wolk4.15-fullkernel/mm/Makefile	2004-06-29 11:32:00.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/mm/Makefile	2004-09-05 16:09:14.000000000 +0200
@@ -14,7 +14,7 @@ export-objs := shmem.o filemap.o memory.
 
 obj-y	 := memory.o mmap.o filemap.o mprotect.o mlock.o mremap.o \
 	    vmalloc.o slab.o bootmem.o swap.o vmscan.o page_alloc.o \
-	    numa.o shmem.o rmap.o fremap.o oom_notifier.o
+	    numa.o shmem.o rmap.o oom_notifier.o
 
 obj-$(CONFIG_HIGHMEM) += highmem.o
 obj-$(CONFIG_SWAP) += page_io.o swap_state.o swapfile.o
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/mm/filemap.c linux-2.4.20-wolk4.16-fullkernel/mm/filemap.c
--- linux-2.4.20-wolk4.15-fullkernel/mm/filemap.c	2004-06-29 11:31:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/mm/filemap.c	2004-09-05 16:08:46.000000000 +0200
@@ -3405,7 +3405,7 @@ int precheck_file_write(struct file *fil
 	/*
 	 *	LFS rule 
 	 */
-	if ( pos + *count > MAX_NON_LFS && !(file->f_flags&O_LARGEFILE)) {
+	if ( pos + *count > MAX_NON_LFS && !(file->f_flags & O_LARGEFILE)) {
 		if (pos >= MAX_NON_LFS) {
 			send_sig(SIGXFSZ, current, 0);
 			goto out;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/mm/fremap.c linux-2.4.20-wolk4.16-fullkernel/mm/fremap.c
--- linux-2.4.20-wolk4.15-fullkernel/mm/fremap.c	2004-06-29 11:31:19.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/mm/fremap.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,148 +0,0 @@
-/*
- *   linux/mm/fremap.c
- * 
- * Explicit pagetable population and nonlinear (random) mappings support.
- *
- * started by Ingo Molnar, Copyright (C) 2002
- */
-
-#include <linux/mm.h>
-#include <linux/file.h>
-#include <linux/mman.h>
-#include <linux/pagemap.h>
-#include <asm/mmu_context.h>
-
-static inline int zap_pte(struct mm_struct *mm, pte_t *ptep)
-{
-	pte_t pte = *ptep;
-
-	if (pte_none(pte))
-		return 0;
-	if (pte_present(pte)) {
-		unsigned long pfn = pte_pfn(pte);
-
-		pte = ptep_get_and_clear(ptep);
-		if (pfn_valid(pfn)) {
-			struct page *page = pfn_to_page(pfn);
-			if (!PageReserved(page)) {
-				if (!PageDirty(page) && pte_dirty(pte))
-					set_page_dirty(page);
-				/*
-				 * An rmap-ed page might exist already,
-				 * if we zap it here then remove the pte
-				 * chain entry as well:
-				 */
-				if (page->pte.direct)
-					page_remove_rmap(page, ptep);
-				page_cache_release(page);
-				mm->rss--;
-			}
-		}
-		return 1;
-	} else {
-		free_swap_and_cache(pte_to_swp_entry(pte));
-		pte_clear(ptep);
-		return 0;
-	}
-}
-
-/*
- * Install a page to a given virtual memory address, release any
- * previously existing mapping.
- */
-int install_page(struct mm_struct *mm, struct vm_area_struct *vma,
-		unsigned long addr, struct page *page, pgprot_t prot)
-{
-	int err = -ENOMEM, flush;
-	pte_t *pte, entry;
-	pgd_t *pgd;
-	pmd_t *pmd;
-
-	pgd = pgd_offset(mm, addr);
-	spin_lock(&mm->page_table_lock);
-
-	pmd = pmd_alloc(mm, pgd, addr);
-	if (!pmd)
-		goto err_unlock;
-
-	pte = pte_alloc_map(mm, pmd, addr);
-	if (!pte)
-		goto err_unlock;
-
-	flush = zap_pte(mm, pte);
-
-	mm->rss++;
-	flush_page_to_ram(page);
-	flush_icache_page(vma, page);
-	entry = mk_pte(page, prot);
-	set_pte(pte, entry);
-	pte_unmap(pte);
-	if (flush)
-		flush_tlb_page(vma, addr);
-
-	spin_unlock(&mm->page_table_lock);
-	return 0;
-
-err_unlock:
-	spin_unlock(&mm->page_table_lock);
-err:
-	return err;
-}
-
-/***
- * sys_remap_file_pages - remap arbitrary pages of a shared backing store
- *                        file within an existing vma.
- * @start: start of the remapped virtual memory range
- * @size: size of the remapped virtual memory range
- * @prot: new protection bits of the range
- * @pgoff: to be mapped page of the backing store file
- * @flags: 0 or MAP_NONBLOCK - the later will cause no IO.
- *
- * this syscall works purely via pagetables, so it's the most efficient
- * way to map the same (large) file into a given virtual window. Unlike
- * mmap()/mremap() it does not create any new vmas. The new mappings are
- * also safe across swapout.
- *
- * NOTE: the 'prot' parameter right now is ignored, and the vma's default
- * protection is used. Arbitrary protections might be implemented in the
- * future.
- */
-long sys_remap_file_pages(unsigned long start, unsigned long size,
-	unsigned long __prot, unsigned long pgoff, unsigned long flags)
-{
-	struct mm_struct *mm = current->mm;
-	unsigned long end = start + size;
-	struct vm_area_struct *vma;
-	int err;
-
-	err = -EPERM;
-	if (!can_do_mlock())
-		return err;
-	err = -EINVAL;
-
-	if (__prot || (start & ~PAGE_MASK) || (size & ~PAGE_MASK))
-		return err;
-
-	/* Does the address range wrap, or is the span zero-sized? */
-	if (start + size <= start)
-		return err;
-
-	down_read(&mm->mmap_sem);
-
-	vma = find_vma(mm, start);
-	/*
-	 * Make sure the vma is shared, that it supports prefaulting,
-	 * and that the remapped range is valid and fully within
-	 * the single existing vma:
-	 */
-	if (vma && (vma->vm_flags & VM_SHARED) && (vma->vm_flags & VM_LOCKED) &&
-		vma->vm_ops && vma->vm_ops->populate &&
-			end > start && start >= vma->vm_start &&
-				end <= vma->vm_end)
-		err = vma->vm_ops->populate(vma, start, size, vma->vm_page_prot,
-				pgoff, flags & MAP_NONBLOCK);
-
-	up_read(&mm->mmap_sem);
-
-	return err;
-}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/mm/highmem.c linux-2.4.20-wolk4.16-fullkernel/mm/highmem.c
--- linux-2.4.20-wolk4.15-fullkernel/mm/highmem.c	2004-06-29 11:31:24.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/mm/highmem.c	2004-09-05 16:09:19.000000000 +0200
@@ -22,7 +22,6 @@
 #include <linux/highmem.h>
 #include <linux/swap.h>
 #include <linux/slab.h>
-#include <linux/blkdev.h>
 
 static mempool_t *page_pool, *isa_page_pool;
 
@@ -227,14 +226,6 @@ static LIST_HEAD(emergency_pages);
 int nr_emergency_bhs;
 static LIST_HEAD(emergency_bhs);
 
-int nr_atomic_emergency_pages;
-static LIST_HEAD(atomic_emergency_pages);
-
-int nr_atomic_emergency_bhs;
-static LIST_HEAD(atomic_emergency_bhs);
-
-int atomic_emergency_owner;
-
 /*
  * Simple bounce buffer support for highmem pages.
  * This will be moved to the block layer in 2.5.
@@ -274,66 +265,35 @@ static inline void bounce_end_io (struct
 	struct page *page;
 	struct buffer_head *bh_orig = (struct buffer_head *)(bh->b_private);
 	unsigned long flags;
-	int atomic = bh_elv_seq(bh);
 
 	bh_orig->b_end_io(bh_orig, uptodate);
 
 	page = bh->b_page;
 
 	spin_lock_irqsave(&emergency_lock, flags);
-	if (!atomic) {
-		if (nr_emergency_pages >= POOL_SIZE)
-			__free_page(page);
-		else {
-			/*
-			 * We are abusing page->list to manage
-			 * the highmem emergency pool:
-			 */
-			list_add(&page->list, &emergency_pages);
-			nr_emergency_pages++;
-		}
-
-		if (nr_emergency_bhs >= POOL_SIZE) {
+	if (nr_emergency_pages >= POOL_SIZE)
+		__free_page(page);
+	else {
+		/*
+		 * We are abusing page->list to manage
+		 * the highmem emergency pool:
+		 */
+		list_add(&page->list, &emergency_pages);
+		nr_emergency_pages++;
+	}
+	
+	if (nr_emergency_bhs >= POOL_SIZE) {
 #ifdef HIGHMEM_DEBUG
-			/* Don't clobber the constructed slab cache */
-			init_waitqueue_head(&bh->b_wait);
+		/* Don't clobber the constructed slab cache */
+		init_waitqueue_head(&bh->b_wait);
 #endif
-			kmem_cache_free(bh_cachep, bh);
-		} else {
-			/*
-			 * Ditto in the bh case, here we abuse b_inode_buffers:
-			 */
-			list_add(&bh->b_inode_buffers, &emergency_bhs);
-			nr_emergency_bhs++;
-		}
+		kmem_cache_free(bh_cachep, bh);
 	} else {
-		if (nr_atomic_emergency_pages >= BLK_ATOMIC_BOUNCE_ENTRIES)
-			__free_page(page);
-		else {
-			/*
-			 * We are abusing page->list to manage
-			 * the highmem emergency pool:
-			 */
-			list_add(&page->list, &atomic_emergency_pages);
-			nr_atomic_emergency_pages++;
-		}
-
-		if (nr_atomic_emergency_bhs >= BLK_ATOMIC_BOUNCE_ENTRIES) {
-#ifdef HIGHMEM_DEBUG
-			/* Don't clobber the constructed slab cache */
-			init_waitqueue_head(&bh->b_wait);
-#endif
-			kmem_cache_free(bh_cachep, bh);
-		} else {
-			/*
-			 * Ditto in the bh case, here we abuse b_inode_buffers:
-			 */
-			list_add(&bh->b_inode_buffers, &atomic_emergency_bhs);
-			nr_atomic_emergency_bhs++;
-		}
-		BUG_ON(nr_atomic_emergency_pages != nr_atomic_emergency_bhs);
-		if (nr_atomic_emergency_pages >= BLK_ATOMIC_BOUNCE_ENTRIES)
-			atomic_emergency_owner = 0;
+		/*
+		 * Ditto in the bh case, here we abuse b_inode_buffers:
+		 */
+		list_add(&bh->b_inode_buffers, &emergency_bhs);
+		nr_emergency_bhs++;
 	}
 	spin_unlock_irqrestore(&emergency_lock, flags);
 }
@@ -367,24 +327,6 @@ static __init int init_emergency_pool(vo
 		list_add(&bh->b_inode_buffers, &emergency_bhs);
 		nr_emergency_bhs++;
 	}
-	while (nr_atomic_emergency_pages < BLK_ATOMIC_BOUNCE_ENTRIES) {
-		struct page * page = alloc_page(GFP_ATOMIC);
-		if (!page) {
-			printk("couldn't refill highmem emergency pages");
-			break;
-		}
-		list_add(&page->list, &atomic_emergency_pages);
-		nr_atomic_emergency_pages++;
-	}
-	while (nr_atomic_emergency_bhs < BLK_ATOMIC_BOUNCE_ENTRIES) {
-		struct buffer_head * bh = kmem_cache_alloc(bh_cachep, SLAB_ATOMIC);
-		if (!bh) {
-			printk("couldn't refill highmem emergency bhs");
-			break;
-		}
-		list_add(&bh->b_inode_buffers, &atomic_emergency_bhs);
-		nr_atomic_emergency_bhs++;
-	}
 	spin_unlock_irq(&emergency_lock);
 	printk("allocated %d pages and %d bhs reserved for the highmem bounces\n",
 	       nr_emergency_pages, nr_emergency_bhs);
@@ -416,7 +358,7 @@ static void bounce_end_io_read (struct b
 	bounce_end_io(bh, uptodate);
 }
 
-struct page *alloc_bounce_page (int atomic)
+struct page *alloc_bounce_page (void)
 {
 	struct list_head *tmp;
 	struct page *page;
@@ -434,39 +376,25 @@ repeat_alloc:
 	/*
 	 * Try to allocate from the emergency pool.
 	 */
+	tmp = &emergency_pages;
 	spin_lock_irq(&emergency_lock);
-	if (!atomic) {
-		tmp = &emergency_pages;
-		if (!list_empty(tmp)) {
-			page = list_entry(tmp->next, struct page, list);
-			list_del(tmp->next);
-			nr_emergency_pages--;
-		}
-	} else {
-		tmp = &atomic_emergency_pages;
-		if ((!atomic_emergency_owner || atomic_emergency_owner == atomic) &&
-		    !list_empty(tmp)) {
-			page = list_entry(tmp->next, struct page, list);
-			list_del(tmp->next);
-			nr_atomic_emergency_pages--;
-			atomic_emergency_owner = atomic;
-		}
+	if (!list_empty(tmp)) {
+		page = list_entry(tmp->next, struct page, list);
+		list_del(tmp->next);
+		nr_emergency_pages--;
 	}
 	spin_unlock_irq(&emergency_lock);
 	if (page)
 		return page;
 
-	if (atomic)
-		blk_refile_atomic_queue(atomic);
 	/* we need to wait I/O completion */
 	run_task_queue(&tq_disk);
 
-	__set_current_state(TASK_RUNNING);
 	yield();
 	goto repeat_alloc;
 }
 
-struct buffer_head *alloc_bounce_bh (int atomic)
+struct buffer_head *alloc_bounce_bh (void)
 {
 	struct list_head *tmp;
 	struct buffer_head *bh;
@@ -484,35 +412,20 @@ repeat_alloc:
 	/*
 	 * Try to allocate from the emergency pool.
 	 */
+	tmp = &emergency_bhs;
 	spin_lock_irq(&emergency_lock);
-	if (!atomic) {
-		tmp = &emergency_bhs;
-		if (!list_empty(tmp)) {
-			bh = list_entry(tmp->next, struct buffer_head, b_inode_buffers);
-			list_del(tmp->next);
-			nr_emergency_bhs--;
-		}
-	} else {
-		tmp = &atomic_emergency_bhs;
-		if ((!atomic_emergency_owner || atomic_emergency_owner == atomic) &&
-		    !list_empty(tmp)) {
-			bh = list_entry(tmp->next, struct buffer_head, b_inode_buffers);
-			list_del(tmp->next);
-			nr_atomic_emergency_bhs--;
-			atomic_emergency_owner = atomic;
-		}
-
+	if (!list_empty(tmp)) {
+		bh = list_entry(tmp->next, struct buffer_head, b_inode_buffers);
+		list_del(tmp->next);
+		nr_emergency_bhs--;
 	}
 	spin_unlock_irq(&emergency_lock);
 	if (bh)
 		return bh;
 
-	if (atomic)
-		blk_refile_atomic_queue(atomic);
 	/* we need to wait I/O completion */
 	run_task_queue(&tq_disk);
 
-	__set_current_state(TASK_RUNNING);
 	yield();
 	goto repeat_alloc;
 }
@@ -525,14 +438,14 @@ struct buffer_head * create_bounce(int r
 	if (!PageHighMem(bh_orig->b_page))
 		return bh_orig;
 
-	bh = alloc_bounce_bh(bh_elv_seq(bh_orig));
+	bh = alloc_bounce_bh();
 	/*
 	 * This is wasteful for 1k buffers, but this is a stopgap measure
 	 * and we are being ineffective anyway. This approach simplifies
 	 * things immensly. On boxes with more than 4GB RAM this should
 	 * not be an issue anyway.
 	 */
-	page = alloc_bounce_page(bh_elv_seq(bh_orig));
+	page = alloc_bounce_page();
 
 	set_bh_page(bh, page, 0);
 
@@ -560,7 +473,6 @@ struct buffer_head * create_bounce(int r
 		bh->b_end_io = bounce_end_io_read;
 	bh->b_private = (void *)bh_orig;
 	bh->b_rsector = bh_orig->b_rsector;
-	bh_elv_seq(bh) = bh_elv_seq(bh_orig);
 #ifdef HIGHMEM_DEBUG
 	memset(&bh->b_wait, -1, sizeof(bh->b_wait));
 #endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/mm/memory.c linux-2.4.20-wolk4.16-fullkernel/mm/memory.c
--- linux-2.4.20-wolk4.15-fullkernel/mm/memory.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/mm/memory.c	2004-09-05 17:09:43.000000000 +0200
@@ -713,12 +713,19 @@ int map_user_kiobuf(int rw, struct kiobu
 	err = get_user_pages(current, mm, va, pgcount,
 			(rw==READ), 0, iobuf->maplist, NULL);
 	up_read(&mm->mmap_sem);
-	if (err < 0) {
+	/* get_user_pages returns the amount of mapped pages,
+	 * which can be less than the amount of requested pages
+	 * in some cases. To avoid surprises downstream, we
+	 * unmap and return an error in those cases.  -bjornw
+	 */
+	if(err > 0)
+		iobuf->nr_pages = err;
+	if (err < pgcount) {
+		/* unmap depends on nr_pages being set at this point */
 		unmap_kiobuf(iobuf);
 		dprintk ("map_user_kiobuf: end %d\n", err);
-		return err;
+		return err < 0 ? err : -ENOMEM;
 	}
-	iobuf->nr_pages = err;
 	while (err--) {
 		/* FIXME: flush superflous for rw==READ,
 		 * probably wrong function for rw==WRITE
@@ -1122,17 +1129,22 @@ static void pax_mirror_fault(struct mm_s
 	if (pte_none(entry_m)) {
 		++mm->rss;
 	} else if (pte_present(entry_m)) {
-		page_remove_rmap(pte_page(entry_m), pte_m);
-		page_cache_release(pte_page(entry_m));
+		page_m = pte_page(entry_m);
+		if (!PageReserved(page_m)) {
+			page_remove_rmap(pte_page(entry_m), pte_m);
+			page_cache_release(page_m);
+		} else
+			++mm->rss;
 	} else {
 		free_swap_and_cache(pte_to_swp_entry(entry_m));
 		++mm->rss;
 	}
 
 	page_m = pte_page(*pte);
-	page_cache_get(page_m);
+	if (!PageReserved(page_m))
+		page_cache_get(page_m);
 	entry_m = mk_pte(page_m, vma_m->vm_page_prot);
-	if (pte_write(*pte))
+	if (pte_write(*pte) && (vma_m->vm_flags & VM_WRITE))
 		entry_m = pte_mkdirty(pte_mkwrite(entry_m));
 	establish_pte(vma_m, address_m, pte_m, entry_m);  
 }                      
@@ -1719,12 +1731,9 @@ int handle_mm_fault(struct mm_struct *mm
 		address_m = address + (unsigned long)vma->vm_private_data;
 		pgd_m = pgd_offset(mm, address_m);
 		pmd_m = pmd_alloc(mm, pgd_m, address_m);
-		if (!pmd_m) {
-			spin_unlock(&mm->page_table_lock);
-			return -1;
-		}
-		pte_m = pte_alloc_map(mm, pmd_m, address_m);
-		if (!pte_m) {
+		if (pmd_m)
+			pte_m = pte_alloc_map(mm, pmd_m, address_m);
+		if (!pmd_m || !pte_m) {
 			spin_unlock(&mm->page_table_lock);
 			return -1;
 		}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/mm/mlock.c linux-2.4.20-wolk4.16-fullkernel/mm/mlock.c
--- linux-2.4.20-wolk4.15-fullkernel/mm/mlock.c	2004-06-29 11:31:19.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/mm/mlock.c	2004-09-05 16:09:14.000000000 +0200
@@ -182,7 +182,7 @@ static int do_mlock(unsigned long start,
 	struct vm_area_struct * vma, * next;
 	int error;
 
-	if (on && !can_do_mlock())
+	if (on && !capable(CAP_IPC_LOCK))
 		return -EPERM;
 	len = PAGE_ALIGN(len);
 	end = start + len;
@@ -211,11 +211,8 @@ static int do_mlock(unsigned long start,
 		/* Here we know that  vma->vm_start <= nstart < vma->vm_end. */
 
 		newflags = vma->vm_flags | VM_LOCKED;
-		if (!on) {
+		if (!on)
 			newflags &= ~VM_LOCKED;
-			if (vma->vm_flags & VM_NO_UNLOCK)
-				return -EINVAL; 
-		}
 
 		if (vma->vm_end >= end) {
 			error = mlock_fixup(vma, nstart, end, newflags);
@@ -255,12 +252,12 @@ asmlinkage long sys_mlock(unsigned long 
 
 	/* check against resource limits */
 	gr_learn_resource(current, RLIMIT_MEMLOCK, locked, 1);
-	if (locked > lock_limit && !capable(CAP_IPC_LOCK))
+	if (locked > lock_limit)
 		goto out;
 
-	/* we may lock at most 90% of physical memory... */
+	/* we may lock at most half of physical memory... */
 	/* (this check is pretty bogus, but doesn't hurt) */
-	if (locked > num_physpages/10*9)
+	if (locked > num_physpages/2)
 		goto out;
 
 	error = do_mlock(start, len, 1);
@@ -287,7 +284,7 @@ static int do_mlockall(int flags)
 	unsigned int def_flags;
 	struct vm_area_struct * vma;
 
-	if (!can_do_mlock())
+	if (!capable(CAP_IPC_LOCK))
 		return -EPERM;
 
 	def_flags = 0;
@@ -310,11 +307,8 @@ static int do_mlockall(int flags)
 			break;
 
 		newflags = vma->vm_flags | VM_LOCKED;
-		if (!(flags & MCL_CURRENT)) {
+		if (!(flags & MCL_CURRENT))
 			newflags &= ~VM_LOCKED;
-			if (vma->vm_flags & VM_NO_UNLOCK)
-				continue;
-		}
 		error = mlock_fixup(vma, vma->vm_start, vma->vm_end, newflags);
 		if (error)
 			break;
@@ -336,12 +330,12 @@ asmlinkage long sys_mlockall(int flags)
 
 	ret = -ENOMEM;
 	gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm, 1);
-	if (current->mm->total_vm > lock_limit && !capable(CAP_IPC_LOCK))
+	if (current->mm->total_vm > lock_limit)
 		goto out;
 
-	/* we may lock at most 90% of physical memory... */
+	/* we may lock at most half of physical memory... */
 	/* (this check is pretty bogus, but doesn't hurt) */
-	if (current->mm->total_vm > num_physpages/10*9)
+	if (current->mm->total_vm > num_physpages/2)
 		goto out;
 
 	ret = do_mlockall(flags);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/mm/mmap.c linux-2.4.20-wolk4.16-fullkernel/mm/mmap.c
--- linux-2.4.20-wolk4.15-fullkernel/mm/mmap.c	2004-06-29 11:31:48.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/mm/mmap.c	2004-09-05 16:09:14.000000000 +0200
@@ -557,17 +557,12 @@ unsigned long __do_mmap_pgoff(struct mm_
 	}
 #endif
 
-	if (flags & MAP_LOCKED)
-		vm_flags |= VM_LOCKED;
-
 	/* mlock MCL_FUTURE? */
 	if (vm_flags & VM_LOCKED) {
-		unsigned long locked, lock_limit;
-		locked = mm->locked_vm << PAGE_SHIFT;
-		lock_limit = current->rlim[RLIMIT_MEMLOCK].rlim_cur;
+		unsigned long locked = mm->locked_vm << PAGE_SHIFT;
 		locked += len;
 		gr_learn_resource(current, RLIMIT_MEMLOCK, locked, 1);
-		if (locked > lock_limit && !capable(CAP_IPC_LOCK))
+		if (locked > current->rlim[RLIMIT_MEMLOCK].rlim_cur)
 			return -EAGAIN;
 	}
 
@@ -791,12 +786,6 @@ out:	
 		mm->locked_vm += len >> PAGE_SHIFT;
 		make_pages_present(addr, addr + len);
 	}
-	if (flags & MAP_POPULATE) {
-		up_write(&mm->mmap_sem);
-		sys_remap_file_pages(addr, len, prot,
-					pgoff, flags & MAP_NONBLOCK);
-		down_write(&mm->mmap_sem);
-	}
 
         /* RSBAC: notify ADF of mapped segment */
         #ifdef CONFIG_RSBAC
@@ -1441,12 +1430,10 @@ unsigned long do_brk(unsigned long addr,
 	 * mlock MCL_FUTURE?
 	 */
 	if (mm->def_flags & VM_LOCKED) {
-		unsigned long locked, lock_limit;
-		locked = mm->locked_vm << PAGE_SHIFT;
-		lock_limit = current->rlim[RLIMIT_MEMLOCK].rlim_cur;
+		unsigned long locked = mm->locked_vm << PAGE_SHIFT;
 		locked += len;
 		gr_learn_resource(current, RLIMIT_MEMLOCK, locked, 1);
-		if (locked > lock_limit && !capable(CAP_IPC_LOCK))
+		if (locked > current->rlim[RLIMIT_MEMLOCK].rlim_cur)
 			return -EAGAIN;
 	}
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/mm/mremap.c linux-2.4.20-wolk4.16-fullkernel/mm/mremap.c
--- linux-2.4.20-wolk4.15-fullkernel/mm/mremap.c	2004-06-29 11:31:27.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/mm/mremap.c	2004-09-05 16:09:14.000000000 +0200
@@ -370,13 +370,11 @@ unsigned long do_mremap(unsigned long ad
 			goto out;
 	}
 	if (vma->vm_flags & VM_LOCKED) {
-		unsigned long locked, lock_limit;
-		locked = current->mm->locked_vm << PAGE_SHIFT;
-		lock_limit = current->rlim[RLIMIT_MEMLOCK].rlim_cur;
+		unsigned long locked = current->mm->locked_vm << PAGE_SHIFT;
 		locked += new_len - old_len;
 		ret = -EAGAIN;
 		gr_learn_resource(current, RLIMIT_MEMLOCK, locked, 1);
-		if (locked > lock_limit && !capable(CAP_IPC_LOCK))
+		if (locked > current->rlim[RLIMIT_MEMLOCK].rlim_cur)
 			goto out;
 	}
 	ret = -ENOMEM;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/mm/page_alloc.c linux-2.4.20-wolk4.16-fullkernel/mm/page_alloc.c
--- linux-2.4.20-wolk4.15-fullkernel/mm/page_alloc.c	2004-06-29 11:32:23.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/mm/page_alloc.c	2004-09-05 16:08:23.000000000 +0200
@@ -65,8 +65,6 @@ static int zone_extrafree_max[MAX_NR_ZON
 #endif
 
 int vm_gfp_debug = 0;
-int free_dbg_count = 0;
-
 
 
 static void FASTCALL(__free_pages_ok (struct page *page, unsigned int order));
@@ -144,7 +142,7 @@ static void __free_pages_ok (struct page
 	 * a reference to a page in order to pin it for io. -ben
 	 */
 	if (PageLRU(page)) {
-		if (unlikely(in_interrupt()) || ((free_dbg_count++ % 10000) == 0)) {
+		if (unlikely(in_interrupt())) {
 			unsigned long flags;
 
 			spin_lock_irqsave(&free_pages_ok_no_irq_lock, flags);
@@ -183,18 +181,8 @@ static void __free_pages_ok (struct page
 		BUG();
 	if (PageInactiveClean(page))
 		BUG();
-#ifdef CONFIG_GRKERNSEC_PAX_RANDEXEC
-	if (page->pte.direct) {
-		printk(KERN_WARNING "There's a BUG() with PaX's ET_EXEC vs. RMAP. Someone has to fix this up!\n");
-		printk(KERN_WARNING "Please write to 'pageexec@freemail.hu' and ask, if they'll do RMAP support please.\n");
-		printk(KERN_WARNING "It should be trivial for them because 2.6 has rmap too.\n");
-		printk(KERN_WARNING "The machine will restart very soon to prevent file corruption!\n");
-		BUG();
-	}
-#else
 	if (page->pte.direct)
 		BUG();
-#endif
 
 #ifdef CONFIG_MXT
 	remove_hidden_pages(page, order);
@@ -362,15 +350,17 @@ struct page *_alloc_pages(unsigned int g
  * inactive_clean list onto the free list until the zone has enough
  * free pages or until the inactive_clean pages are exhausted.
  */
-void FASTCALL(fixup_freespace(zone_t * zone));
-void fixup_freespace(zone_t * zone)
+void FASTCALL(fixup_freespace(zone_t * zone, int direct_reclaim));
+void fixup_freespace(zone_t * zone, int 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 && worktodo-- > 0);
+	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 && worktodo-- > 0);
+	}
 }
 
 #define PAGES_KERNEL	0
@@ -463,24 +453,29 @@ struct page * __alloc_pages(unsigned int
 
 try_again:
 	/*
-	 * First, refill the free list to at least the minimum watermark.
-	 * This needs to be done in order to fulfill allocations which
-	 * can't do direct reclaim, as well as higher order allocations.
+	 * 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.  Make sure to stay above
+	 * the watermark that triggers kswapd, otherwise we could
+	 * upset zone balancing.
 	 */
 	zone = zonelist->zones;
 	if (!*zone)
 		return NULL;
-	if (direct_reclaim) {
-		for (;;) {
-			zone_t *z = *(zone++);
-			if (!z)
-				break;
-			if (!z->size)
-				continue;
+	for (;;) {
+		zone_t *z = *(zone++);
+		if (!z)
+			break;
+		if (!z->size)
+			continue;
 
-			if (z->free_pages < z->pages_min)
-				fixup_freespace(z);
-		}
+		if (z->free_pages > z->pages_low) {
+			page = rmqueue(z, order);
+			if (page)
+				return page;
+		} else if (z->free_pages < z->pages_min)
+			fixup_freespace(z, direct_reclaim);
 	}
 
 	/*
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/mm/shmem.c linux-2.4.20-wolk4.16-fullkernel/mm/shmem.c
--- linux-2.4.20-wolk4.15-fullkernel/mm/shmem.c	2004-06-29 11:31:48.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/mm/shmem.c	2004-09-05 16:09:14.000000000 +0200
@@ -841,79 +841,17 @@ struct page *shmem_nopage(struct vm_area
 	return page;
 }
 
-static int shmem_populate(struct vm_area_struct *vma,
-	unsigned long addr, unsigned long len,
-	pgprot_t prot, unsigned long pgoff, int nonblock)
-{
-	struct inode *inode = vma->vm_file->f_dentry->d_inode;
-	struct mm_struct *mm = vma->vm_mm;
-	unsigned long size;
-
-	size = (inode->i_size + PAGE_SIZE - 1) >> PAGE_SHIFT;
-	if (pgoff >= size || pgoff + (len >> PAGE_SHIFT) > size)
-		return -EINVAL;
-	
-	vma->vm_flags |= VM_NO_UNLOCK;
-
-	while ((long) len > 0) {
-		struct page *page = NULL;
-		int err;
-		/*
-		 * Will need changing if PAGE_CACHE_SIZE != PAGE_SIZE
-		 */
-		err = shmem_getpage(inode, pgoff, &page, SGP_CACHE);
-		if (err)
-			return err;
-		if (page) {
-			mark_page_accessed(page);
-			err = install_page(mm, vma, addr, page, prot);
-			if (err) {
-				page_cache_release(page);
-				return err;
-			}
-		}
-		len -= PAGE_SIZE;
-		addr += PAGE_SIZE;
-		pgoff++;
-	}
-	return 0;
-}
-
-/*
- * If you do not understand this, read:
- * http://www.cs.umd.edu/class/spring2003/cmsc311/Notes/BitOp/bitwise.html
- */
-int shmem_lock(struct file *file, int lock)
+void shmem_lock(struct file *file, int lock)
 {
 	struct inode *inode = file->f_dentry->d_inode;
 	struct shmem_inode_info *info = SHMEM_I(inode);
-	struct mm_struct *mm = current->mm;
-	unsigned long lock_limit, locked;
-	int retval = -ENOMEM;
 
 	spin_lock(&info->lock);
-
-	if (lock && (!info->flags & VM_LOCKED)) { 
-		locked = inode->i_size >> PAGE_SHIFT;
-		locked += mm->locked_vm;
-		lock_limit = current->rlim[RLIMIT_MEMLOCK].rlim_cur;
-		lock_limit >>= PAGE_SHIFT;
-		if (locked > lock_limit && !capable(CAP_IPC_LOCK))
-			goto out_nomem;
-		if (locked > num_physpages/10*9)
-			goto out_nomem;
-		mm->locked_vm = locked;
+	if (lock)
 		info->flags |= VM_LOCKED;
-	}
-	if (!lock && (info->flags & VM_LOCKED) && mm) {
-		locked = inode->i_size >> PAGE_SHIFT;
-		mm->locked_vm -= locked;
+	else
 		info->flags &= ~VM_LOCKED;
-	}
-	retval = 0;
-out_nomem:
 	spin_unlock(&info->lock);
-	return retval;
 }
 
 static int shmem_mmap(struct file *file, struct vm_area_struct *vma)
@@ -1130,9 +1068,13 @@ static void do_shmem_file_read(struct fi
 	struct inode *inode = filp->f_dentry->d_inode;
 	struct address_space *mapping = inode->i_mapping;
 	unsigned long index, offset;
+	loff_t pos = *ppos;
+
+	if (unlikely(pos < 0))
+		return;
 
-	index = *ppos >> PAGE_CACHE_SHIFT;
-	offset = *ppos & ~PAGE_CACHE_MASK;
+	index = pos >> PAGE_CACHE_SHIFT;
+	offset = pos & ~PAGE_CACHE_MASK;
 
 	for (;;) {
 		struct page *page = NULL;
@@ -1680,7 +1622,6 @@ static struct super_operations shmem_ops
 
 static struct vm_operations_struct shmem_vm_ops = {
 	nopage:		shmem_nopage,
-	populate:	shmem_populate,
 };
 
 #ifdef CONFIG_TMPFS
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/mm/vmscan.c linux-2.4.20-wolk4.16-fullkernel/mm/vmscan.c
--- linux-2.4.20-wolk4.15-fullkernel/mm/vmscan.c	2004-06-29 11:32:23.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/mm/vmscan.c	2004-09-05 16:08:57.000000000 +0200
@@ -101,7 +101,7 @@ static int shrink_other_caches(unsigned 
  * Low ram machines that swaps all the time want to turn
  * this on (i.e. set to 1).
  */
-int vm_anon_lru = 1;
+int vm_anon_lru = 0;
 
 /*
  * "vm_passes" is the number of vm passes before failing the
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/8021q/vlan.c linux-2.4.20-wolk4.16-fullkernel/net/8021q/vlan.c
--- linux-2.4.20-wolk4.15-fullkernel/net/8021q/vlan.c	2002-11-29 00:53:15.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/net/8021q/vlan.c	2004-09-05 15:54:51.000000000 +0200
@@ -1,4 +1,4 @@
-/*
+/* -*- linux-c -*-
  * INET		802.1Q VLAN
  *		Ethernet-type device handling.
  *
@@ -45,9 +45,8 @@ spinlock_t vlan_group_lock = SPIN_LOCK_U
 
 static char vlan_fullname[] = "802.1Q VLAN Support";
 static unsigned int vlan_version = 1;
-static unsigned int vlan_release = 7;
+static unsigned int vlan_release = 8;
 static char vlan_copyright[] = "Ben Greear <greearb@candelatech.com>";
-static char vlan_buggyright[] = "David S. Miller <davem@redhat.com>";
 
 static int vlan_device_event(struct notifier_block *, unsigned long, void *);
 
@@ -85,8 +84,6 @@ static int __init vlan_proto_init(void)
 
 	printk(VLAN_INF "%s v%u.%u %s\n",
 	       vlan_fullname, vlan_version, vlan_release, vlan_copyright);
-	printk(VLAN_INF "All bugs added by %s\n",
-	       vlan_buggyright);
 
 	/* proc file system initialization */
 	err = vlan_proc_init();
@@ -229,12 +226,13 @@ static int unregister_vlan_dev(struct ne
 			if (real_dev->features &
 			    (NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER)) {
 				real_dev->vlan_rx_kill_vid(real_dev, vlan_id);
-			} else {
-				br_write_lock(BR_NETPROTO_LOCK);
-				grp->vlan_devices[vlan_id] = NULL;
-				br_write_unlock(BR_NETPROTO_LOCK);
 			}
 
+			br_write_lock(BR_NETPROTO_LOCK);
+			grp->vlan_devices[vlan_id] = NULL;
+			br_write_unlock(BR_NETPROTO_LOCK);
+
+
 			/* Caller unregisters (and if necessary, puts)
 			 * VLAN device, but we get rid of the reference to
 			 * real_dev here.
@@ -256,6 +254,12 @@ static int unregister_vlan_dev(struct ne
 				__grp_unhash(grp);
 				spin_unlock_bh(&vlan_group_lock);
 
+				/* Free the group, after we have removed it
+				 * from the hash.
+				 */
+				kfree(grp);
+				grp = NULL;
+
 				ret = 1;
 			}
 
@@ -526,7 +530,9 @@ static struct net_device *register_vlan_
 	    
 	grp->vlan_devices[VLAN_ID] = new_dev;
 
-	vlan_proc_add_dev(new_dev); /* create it's proc entry */
+	if (vlan_proc_add_dev(new_dev)<0)/* create it's proc entry */
+            	printk(KERN_WARNING "VLAN: failed to add proc entry for %s\n",
+					                 new_dev->name);
 
 	if (real_dev->features & NETIF_F_HW_VLAN_FILTER)
 		real_dev->vlan_rx_add_vid(real_dev, VLAN_ID);
@@ -626,6 +632,7 @@ static int vlan_device_event(struct noti
 			ret = unregister_vlan_dev(dev,
 						  VLAN_DEV_INFO(vlandev)->vlan_id);
 
+			dev_put(vlandev);
 			unregister_netdevice(vlandev);
 
 			/* Group was destroyed? */
@@ -647,15 +654,9 @@ out:
 int vlan_ioctl_handler(unsigned long arg)
 {
 	int err = 0;
+        unsigned short vid = 0;
 	struct vlan_ioctl_args args;
 
-	/* everything here needs root permissions, except aguably the
-	 * hack ioctls for sending packets.  However, I know _I_ don't
-	 * want users running that on my network! --BLG
-	 */
-	if (!capable(CAP_NET_ADMIN))
-		return -EPERM;
-
 	if (copy_from_user(&args, (void*)arg,
                            sizeof(struct vlan_ioctl_args)))
 		return -EFAULT;
@@ -670,24 +671,33 @@ int vlan_ioctl_handler(unsigned long arg
 
 	switch (args.cmd) {
 	case SET_VLAN_INGRESS_PRIORITY_CMD:
+		if (!capable(CAP_NET_ADMIN))
+			return -EPERM;
+
 		err = vlan_dev_set_ingress_priority(args.device1,
 						    args.u.skb_priority,
 						    args.vlan_qos);
 		break;
 
 	case SET_VLAN_EGRESS_PRIORITY_CMD:
+		if (!capable(CAP_NET_ADMIN))
+			return -EPERM;
 		err = vlan_dev_set_egress_priority(args.device1,
 						   args.u.skb_priority,
 						   args.vlan_qos);
 		break;
 
 	case SET_VLAN_FLAG_CMD:
+		if (!capable(CAP_NET_ADMIN))
+			return -EPERM;
 		err = vlan_dev_set_vlan_flag(args.device1,
 					     args.u.flag,
 					     args.vlan_qos);
 		break;
 
 	case SET_VLAN_NAME_TYPE_CMD:
+		if (!capable(CAP_NET_ADMIN))
+			return -EPERM;
 		if ((args.u.name_type >= 0) &&
 		    (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
 			vlan_name_type = args.u.name_type;
@@ -697,17 +707,9 @@ int vlan_ioctl_handler(unsigned long arg
 		}
 		break;
 
-		/* TODO:  Figure out how to pass info back...
-		   case GET_VLAN_INGRESS_PRIORITY_IOCTL:
-		   err = vlan_dev_get_ingress_priority(args);
-		   break;
-
-		   case GET_VLAN_EGRESS_PRIORITY_IOCTL:
-		   err = vlan_dev_get_egress_priority(args);
-		   break;
-		*/
-
 	case ADD_VLAN_CMD:
+		if (!capable(CAP_NET_ADMIN))
+			return -EPERM;
 		/* we have been given the name of the Ethernet Device we want to
 		 * talk to:  args.dev1	 We also have the
 		 * VLAN ID:  args.u.VID
@@ -720,12 +722,53 @@ int vlan_ioctl_handler(unsigned long arg
 		break;
 
 	case DEL_VLAN_CMD:
+		if (!capable(CAP_NET_ADMIN))
+			return -EPERM;
 		/* Here, the args.dev1 is the actual VLAN we want
 		 * to get rid of.
 		 */
 		err = unregister_vlan_device(args.device1);
 		break;
 
+	case GET_VLAN_INGRESS_PRIORITY_CMD:
+		/* TODO:  Implement
+		err = vlan_dev_get_ingress_priority(args);
+		if (copy_to_user((void*)arg, &args,
+				 sizeof(struct vlan_ioctl_args))) {
+			err = -EFAULT;
+		}
+		*/
+		err = -EINVAL;
+		break;
+
+	case GET_VLAN_EGRESS_PRIORITY_CMD:
+		/* TODO:  Implement
+		err = vlan_dev_get_egress_priority(args.device1, &(args.args);
+		if (copy_to_user((void*)arg, &args,
+				 sizeof(struct vlan_ioctl_args))) {
+			err = -EFAULT;
+		}
+		*/
+		err = -EINVAL;
+		break;
+
+	case GET_VLAN_REALDEV_NAME_CMD:
+		err = vlan_dev_get_realdev_name(args.device1, args.u.device2);
+		if (copy_to_user((void*)arg, &args,
+				 sizeof(struct vlan_ioctl_args))) {
+			err = -EFAULT;
+		}
+		break;
+
+	case GET_VLAN_VID_CMD:
+		err = vlan_dev_get_vid(args.device1, &vid);
+		args.u.VID = vid;
+		if (copy_to_user((void*)arg, &args,
+				 sizeof(struct vlan_ioctl_args))) {
+			err = -EFAULT;
+		}
+		break;
+		
 	default:
 		/* pass on to underlying device instead?? */
 		printk(VLAN_DBG "%s: Unknown VLAN CMD: %x \n",
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/8021q/vlan.h linux-2.4.20-wolk4.16-fullkernel/net/8021q/vlan.h
--- linux-2.4.20-wolk4.15-fullkernel/net/8021q/vlan.h	2002-08-03 02:39:46.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/8021q/vlan.h	2004-09-05 15:54:51.000000000 +0200
@@ -7,7 +7,7 @@
 /* #define VLAN_DEBUG */
 
 #define VLAN_ERR KERN_ERR
-#define VLAN_INF KERN_ALERT
+#define VLAN_INF KERN_INFO
 #define VLAN_DBG KERN_ALERT /* change these... to debug, having a hard time
                              * changing the log level at run-time..for some reason.
                              */
@@ -73,5 +73,7 @@ int vlan_dev_set_ingress_priority(char* 
 int vlan_dev_set_egress_priority(char* dev_name, __u32 skb_prio, short vlan_prio);
 int vlan_dev_set_vlan_flag(char* dev_name, __u32 flag, short flag_val);
 void vlan_dev_set_multicast_list(struct net_device *vlan_dev);
+int vlan_dev_get_realdev_name(const char *dev_name, char* result);
+int vlan_dev_get_vid(const char *dev_name, unsigned short* result);
 
 #endif /* !(__BEN_VLAN_802_1Q_INC__) */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/8021q/vlan_dev.c linux-2.4.20-wolk4.16-fullkernel/net/8021q/vlan_dev.c
--- linux-2.4.20-wolk4.15-fullkernel/net/8021q/vlan_dev.c	2002-11-29 00:53:15.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/net/8021q/vlan_dev.c	2004-09-05 16:06:31.000000000 +0200
@@ -1,4 +1,4 @@
-/*
+/* -*- linux-c -*-
  * INET		802.1Q VLAN
  *		Ethernet-type device handling.
  *
@@ -75,7 +75,11 @@ int vlan_dev_rebuild_header(struct sk_bu
 static inline struct sk_buff *vlan_check_reorder_header(struct sk_buff *skb)
 {
 	if (VLAN_DEV_INFO(skb->dev)->flags & 1) {
-		skb = skb_share_check(skb, GFP_ATOMIC);
+		if (skb_shared(skb) || skb_cloned(skb)) {
+			struct sk_buff *nskb = skb_copy(skb, GFP_ATOMIC);
+			kfree_skb(skb);
+			skb = nskb;
+		}
 		if (skb) {
 			/* Lifted from Gleb's VLAN code... */
 			memmove(skb->data - ETH_HLEN,
@@ -171,7 +175,7 @@ int vlan_skb_recv(struct sk_buff *skb, s
 
 #ifdef VLAN_DEBUG
 		printk(VLAN_DBG "%s: dropping skb: %p because came in on wrong device, dev: %s  real_dev: %s, skb_dev: %s\n",
-			__FUNCTION__ skb, dev->name, 
+			__FUNCTION__, skb, dev->name, 
 			VLAN_DEV_INFO(skb->dev)->real_dev->name, 
 			skb->dev->name);
 #endif
@@ -442,6 +446,7 @@ int vlan_dev_hard_start_xmit(struct sk_b
 	 */
 
 	if (veth->h_vlan_proto != __constant_htons(ETH_P_8021Q)) {
+		int orig_headroom = skb_headroom(skb);
 		unsigned short veth_TCI;
 
 		/* This is not a VLAN frame...but we can fix that! */
@@ -451,33 +456,7 @@ int vlan_dev_hard_start_xmit(struct sk_b
 		printk(VLAN_DBG "%s: proto to encap: 0x%hx (hbo)\n",
 			__FUNCTION__, htons(veth->h_vlan_proto));
 #endif
-
-		if (skb_headroom(skb) < VLAN_HLEN) {
-			struct sk_buff *sk_tmp = skb;
-			skb = skb_realloc_headroom(sk_tmp, VLAN_HLEN);
-			kfree_skb(sk_tmp);
-			if (skb == NULL) {
-				stats->tx_dropped++;
-				return 0;
-			}
-			VLAN_DEV_INFO(dev)->cnt_inc_headroom_on_tx++;
-		} else {
-			if (!(skb = skb_unshare(skb, GFP_ATOMIC))) {
-				printk(KERN_ERR "vlan: failed to unshare skbuff\n");
-				stats->tx_dropped++;
-				return 0;
-			}
-		}
-		veth = (struct vlan_ethhdr *)skb_push(skb, VLAN_HLEN);
-
-		/* Move the mac addresses to the beginning of the new header. */
-		memmove(skb->data, skb->data + VLAN_HLEN, 12);
-
-		/* first, the ethernet type */
-		/* put_unaligned(__constant_htons(ETH_P_8021Q), &veth->h_vlan_proto); */
-		veth->h_vlan_proto = __constant_htons(ETH_P_8021Q);
-
-		/* Now, construct the second two bytes. This field looks something
+		/* Construct the second two bytes. This field looks something
 		 * like:
 		 * usr_priority: 3 bits	 (high bits)
 		 * CFI		 1 bit
@@ -486,10 +465,16 @@ int vlan_dev_hard_start_xmit(struct sk_b
 		veth_TCI = VLAN_DEV_INFO(dev)->vlan_id;
 		veth_TCI |= vlan_dev_get_egress_qos_mask(dev, skb);
 
-		veth->h_vlan_TCI = htons(veth_TCI);
-	}
+		skb = __vlan_put_tag(skb, veth_TCI);
+		if (!skb) {
+			stats->tx_dropped++;
+			return 0;
+		}
 
-	skb->dev = VLAN_DEV_INFO(dev)->real_dev;
+		if (orig_headroom < VLAN_HLEN) {
+			VLAN_DEV_INFO(dev)->cnt_inc_headroom_on_tx++;
+		}
+	}
 
 #ifdef VLAN_DEBUG
 	printk(VLAN_DBG "%s: about to send skb: %p to dev: %s\n",
@@ -503,6 +488,7 @@ int vlan_dev_hard_start_xmit(struct sk_b
 	stats->tx_packets++; /* for statics only */
 	stats->tx_bytes += skb->len;
 
+	skb->dev = VLAN_DEV_INFO(dev)->real_dev;
 	dev_queue_xmit(skb);
 
 	return 0;
@@ -511,17 +497,22 @@ int vlan_dev_hard_start_xmit(struct sk_b
 int vlan_dev_hwaccel_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
 	struct net_device_stats *stats = vlan_dev_get_stats(dev);
-	struct vlan_skb_tx_cookie *cookie;
+	unsigned short veth_TCI;
+
+	/* Construct the second two bytes. This field looks something
+	 * like:
+	 * usr_priority: 3 bits	 (high bits)
+	 * CFI		 1 bit
+	 * VLAN ID	 12 bits (low bits)
+	 */
+	veth_TCI = VLAN_DEV_INFO(dev)->vlan_id;
+	veth_TCI |= vlan_dev_get_egress_qos_mask(dev, skb);
+	skb = __vlan_hwaccel_put_tag(skb, veth_TCI);
 
 	stats->tx_packets++;
 	stats->tx_bytes += skb->len;
 
 	skb->dev = VLAN_DEV_INFO(dev)->real_dev;
-	cookie = VLAN_TX_SKB_CB(skb);
-	cookie->magic = VLAN_TX_COOKIE_MAGIC;
-	cookie->vlan_tag = (VLAN_DEV_INFO(dev)->vlan_id |
-			    vlan_dev_get_egress_qos_mask(dev, skb));
-
 	dev_queue_xmit(skb);
 
 	return 0;
@@ -632,6 +623,60 @@ int vlan_dev_set_vlan_flag(char *dev_nam
 	return -EINVAL;
 }
 
+
+int vlan_dev_get_realdev_name(const char *dev_name, char* result)
+{
+	struct net_device *dev = dev_get_by_name(dev_name);
+	int rv = 0;
+	
+	if (dev) {
+		if (dev->priv_flags & IFF_802_1Q_VLAN) {
+			strncpy(result, VLAN_DEV_INFO(dev)->real_dev->name, 23);
+			dev_put(dev);
+			rv = 0;
+		} else {
+			/*printk(KERN_ERR 
+			       "%s: %s is not a vlan device, priv_flags: %hX.\n",
+			       __FUNCTION__, dev->name, dev->priv_flags);*/
+			dev_put(dev);
+			rv = -EINVAL;
+		}
+	} else {
+		/* printk(KERN_ERR	 "%s: Could not find device: %s\n", 
+		   __FUNCTION__, dev_name); */
+		rv = -ENODEV;
+	}
+
+	return rv;
+}
+
+int vlan_dev_get_vid(const char *dev_name, unsigned short* result)
+{
+	struct net_device *dev = dev_get_by_name(dev_name);
+	int rv = 0;
+	
+	if (dev) {
+		if (dev->priv_flags & IFF_802_1Q_VLAN) {
+			*result = VLAN_DEV_INFO(dev)->vlan_id;
+			dev_put(dev);
+			rv = 0;
+		} else {
+			/*printk(KERN_ERR 
+			       "%s: %s is not a vlan device, priv_flags: %hX.\n",
+			       __FUNCTION__, dev->name, dev->priv_flags);*/
+			dev_put(dev);
+			rv = -EINVAL;
+		}
+	} else {
+		/* printk(KERN_ERR	 "%s: Could not find device: %s\n", 
+		   __FUNCTION__, dev_name);*/
+		rv = -ENODEV;
+	}
+
+	return rv;
+}
+
+
 int vlan_dev_set_mac_address(struct net_device *dev, void *addr_struct_p)
 {
 	struct sockaddr *addr = (struct sockaddr *)(addr_struct_p);
@@ -737,8 +782,7 @@ static void vlan_flush_mc_list(struct ne
 	struct dev_mc_list *dmi = dev->mc_list;
 
 	while (dmi) {
-		dev_mc_delete(dev, dmi->dmi_addr, dmi->dmi_addrlen, 0);
-		printk(KERN_INFO "%s: del %.2x:%.2x:%.2x:%.2x:%.2x:%.2x mcast address from vlan interface\n",
+		printk(KERN_DEBUG "%s: del %.2x:%.2x:%.2x:%.2x:%.2x:%.2x mcast address from vlan interface\n",
 		       dev->name,
 		       dmi->dmi_addr[0],
 		       dmi->dmi_addr[1],
@@ -746,6 +790,7 @@ static void vlan_flush_mc_list(struct ne
 		       dmi->dmi_addr[3],
 		       dmi->dmi_addr[4],
 		       dmi->dmi_addr[5]);
+		dev_mc_delete(dev, dmi->dmi_addr, dmi->dmi_addrlen, 0);
 		dmi = dev->mc_list;
 	}
 
@@ -820,7 +865,7 @@ void vlan_dev_set_multicast_list(struct 
 		for (dmi = vlan_dev->mc_list; dmi != NULL; dmi = dmi->next) {
 			if (vlan_should_add_mc(dmi, VLAN_DEV_INFO(vlan_dev)->old_mc_list)) {
 				dev_mc_add(real_dev, dmi->dmi_addr, dmi->dmi_addrlen, 0);
-				printk(KERN_INFO "%s: add %.2x:%.2x:%.2x:%.2x:%.2x:%.2x mcast address to master interface\n",
+				printk(KERN_DEBUG "%s: add %.2x:%.2x:%.2x:%.2x:%.2x:%.2x mcast address to master interface\n",
 				       vlan_dev->name,
 				       dmi->dmi_addr[0],
 				       dmi->dmi_addr[1],
@@ -838,7 +883,7 @@ void vlan_dev_set_multicast_list(struct 
 				 * delete it from the real list on the underlying device.
 				 */
 				dev_mc_delete(real_dev, dmi->dmi_addr, dmi->dmi_addrlen, 0);
-				printk(KERN_INFO "%s: del %.2x:%.2x:%.2x:%.2x:%.2x:%.2x mcast address from master interface\n",
+				printk(KERN_DEBUG "%s: del %.2x:%.2x:%.2x:%.2x:%.2x:%.2x mcast address from master interface\n",
 				       vlan_dev->name,
 				       dmi->dmi_addr[0],
 				       dmi->dmi_addr[1],
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/8021q/vlanproc.c linux-2.4.20-wolk4.16-fullkernel/net/8021q/vlanproc.c
--- linux-2.4.20-wolk4.15-fullkernel/net/8021q/vlanproc.c	2004-06-29 11:25:50.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/8021q/vlanproc.c	2004-09-05 16:06:00.000000000 +0200
@@ -204,8 +204,10 @@ int vlan_proc_rem_dev(struct net_device 
 #endif
 
 	/** NOTE:  This will consume the memory pointed to by dent, it seems. */
-	remove_proc_entry(VLAN_DEV_INFO(vlandev)->dent->name, proc_vlan_dir);
-	VLAN_DEV_INFO(vlandev)->dent = NULL;
+	if (VLAN_DEV_INFO(vlandev)->dent) {
+		remove_proc_entry(VLAN_DEV_INFO(vlandev)->dent->name, proc_vlan_dir);
+		VLAN_DEV_INFO(vlandev)->dent = NULL;
+	}
 
 	return 0;
 }
@@ -232,7 +234,9 @@ static ssize_t vlan_proc_read(struct fil
 	struct inode *inode = file->f_dentry->d_inode;
 	struct proc_dir_entry *dent;
 	char *page;
-	int pos, offs, len;
+	int pos, len;
+	loff_t n = *ppos;
+	unsigned offs = n;
 
 	if (count <= 0)
 		return 0;
@@ -249,15 +253,14 @@ static ssize_t vlan_proc_read(struct fil
 		return -ENOBUFS;
 
 	pos = dent->get_info(page, dent->data, 0, 0);
-	offs = file->f_pos;
-	if (offs < pos) {
+	if (offs == n && offs < pos) {
 		len = min_t(int, pos - offs, count);
 		if (copy_to_user(buf, (page + offs), len)) {
 			kfree(page);
 			return -EFAULT;
 		}
 
-		file->f_pos += len;
+		*ppos = offs + len;
 	} else {
 		len = 0;
 	}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/atm/br2684.c linux-2.4.20-wolk4.16-fullkernel/net/atm/br2684.c
--- linux-2.4.20-wolk4.15-fullkernel/net/atm/br2684.c	2002-08-03 02:39:46.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/atm/br2684.c	2004-09-05 16:06:01.000000000 +0200
@@ -728,6 +728,8 @@ static ssize_t br2684_proc_read(struct f
 {
 	unsigned long page;
 	int len = 0, x, left;
+	loff_t n = *pos;
+
 	page = get_free_page(GFP_KERNEL);
 	if (!page)
 		return -ENOMEM;
@@ -736,7 +738,7 @@ static ssize_t br2684_proc_read(struct f
 		left = count;
 	read_lock(&devs_lock);
 	for (;;) {
-		x = br2684_proc_engine(*pos, &((char *) page)[len]);
+		x = br2684_proc_engine(n, &((char *) page)[len]);
 		if (x == 0)
 			break;
 		if (x > left)
@@ -751,11 +753,12 @@ static ssize_t br2684_proc_read(struct f
 		}
 		len += x;
 		left -= x;
-		(*pos)++;
+		n++;
 		if (left < 256)
 			break;
 	}
 	read_unlock(&devs_lock);
+	*pos = n;
 	if (len > 0 && copy_to_user(buf, (char *) page, len))
 		len = -EFAULT;
 	free_page(page);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/atm/mpoa_proc.c linux-2.4.20-wolk4.16-fullkernel/net/atm/mpoa_proc.c
--- linux-2.4.20-wolk4.15-fullkernel/net/atm/mpoa_proc.c	2001-07-04 20:50:38.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/atm/mpoa_proc.c	2004-09-05 16:06:01.000000000 +0200
@@ -109,6 +109,7 @@ static ssize_t proc_mpc_read(struct file
 	eg_cache_entry *eg_entry;
 	struct timeval now;
 	unsigned char ip_string[16];
+	loff_t n = *pos;
 	if(count == 0)
 	        return 0;
 	page = get_free_page(GFP_KERNEL);
@@ -150,14 +151,14 @@ static ssize_t proc_mpc_read(struct file
 		mpc = mpc->next;
 	}
 
-	if (*pos >= length) length = 0;
+	if (n != (unsigned)n || n >= length) length = 0;
 	else {
-	  if ((count + *pos) > length) count = length - *pos;
+	  if (count > length - n) count = length - n;
 	  if (copy_to_user(buff, (char *)page , count)) {
  		  free_page(page);
 		  return -EFAULT;
           }
-	  *pos += count;
+	  *pos = n + count;
 	}
 
  	free_page(page);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/Config.in linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/Config.in
--- linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/Config.in	2004-06-29 11:26:15.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/Config.in	2004-09-05 16:04:42.000000000 +0200
@@ -14,6 +14,7 @@ if [ "$CONFIG_NET" != "n" ]; then
       source net/bluetooth/rfcomm/Config.in
       source net/bluetooth/bnep/Config.in
       source net/bluetooth/cmtp/Config.in
+      source net/bluetooth/hidp/Config.in
       source drivers/bluetooth/Config.in
    fi
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/Makefile linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/Makefile
--- linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/Makefile	2004-06-29 11:26:15.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/Makefile	2004-09-05 16:04:42.000000000 +0200
@@ -16,6 +16,7 @@ obj-$(CONFIG_BLUEZ_SCO) += sco.o
 subdir-$(CONFIG_BLUEZ_RFCOMM) += rfcomm
 subdir-$(CONFIG_BLUEZ_BNEP) += bnep
 subdir-$(CONFIG_BLUEZ_CMTP) += cmtp
+subdir-$(CONFIG_BLUEZ_HIDP) += hidp
 
 ifeq ($(CONFIG_BLUEZ_RFCOMM),y)
 obj-y += rfcomm/rfcomm.o
@@ -25,6 +26,14 @@ ifeq ($(CONFIG_BLUEZ_BNEP),y)
 obj-y += bnep/bnep.o
 endif
 
+ifeq ($(CONFIG_BLUEZ_CMTP),y)
+obj-y += cmtp/cmtp.o
+endif
+
+ifeq ($(CONFIG_BLUEZ_HIDP),y)
+obj-y += hidp/hidp.o
+endif
+
 include $(TOPDIR)/Rules.make
 
 bluez.o: $(bluez-objs)
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/af_bluetooth.c linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/af_bluetooth.c
--- linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/af_bluetooth.c	2004-06-29 11:26:15.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/af_bluetooth.c	2004-09-05 16:04:42.000000000 +0200
@@ -57,7 +57,7 @@
 #endif
 
 /* Bluetooth sockets */
-#define BLUEZ_MAX_PROTO	6
+#define BLUEZ_MAX_PROTO	7
 static struct net_proto_family *bluez_proto[BLUEZ_MAX_PROTO];
 
 int bluez_sock_register(int proto, struct net_proto_family *ops)
@@ -221,12 +221,11 @@ int bluez_sock_recvmsg(struct socket *so
 unsigned int bluez_sock_poll(struct file * file, struct socket *sock, poll_table *wait)
 {
 	struct sock *sk = sock->sk;
-	unsigned int mask;
+	unsigned int mask = 0;
 
 	BT_DBG("sock %p, sk %p", sock, sk);
 
 	poll_wait(file, sk->sleep, wait);
-	mask = 0;
 
 	if (sk->err || !skb_queue_empty(&sk->error_queue))
 		mask |= POLLERR;
@@ -242,9 +241,11 @@ unsigned int bluez_sock_poll(struct file
 	if (sk->state == BT_CLOSED)
 		mask |= POLLHUP;
 
-	if (sk->state == BT_CONNECT || sk->state == BT_CONNECT2)
+	if (sk->state == BT_CONNECT ||
+			sk->state == BT_CONNECT2 ||
+			sk->state == BT_CONFIG)
 		return mask;
-	
+
 	if (sock_writeable(sk))
 		mask |= POLLOUT | POLLWRNORM | POLLWRBAND;
 	else
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/bnep/core.c linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/bnep/core.c
--- linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/bnep/core.c	2004-06-29 11:26:15.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/bnep/core.c	2004-09-05 16:04:43.000000000 +0200
@@ -63,7 +63,7 @@
 #define BT_DBG(D...)
 #endif
 
-#define VERSION "1.1"
+#define VERSION "1.2"
 
 static LIST_HEAD(bnep_session_list);
 static DECLARE_RWSEM(bnep_session_sem);
@@ -113,13 +113,28 @@ static int bnep_send_rsp(struct bnep_ses
 	return bnep_send(s, &rsp, sizeof(rsp));
 }
 
+#ifdef CONFIG_BLUEZ_BNEP_PROTO_FILTER
+static inline void bnep_set_default_proto_filter(struct bnep_session *s)
+{
+	/* (IPv4, ARP)  */
+	s->proto_filter[0].start = htons(0x0800);
+	s->proto_filter[0].end   = htons(0x0806);
+	/* (RARP, AppleTalk) */
+	s->proto_filter[1].start = htons(0x8035);
+	s->proto_filter[1].end   = htons(0x80F3);
+	/* (IPX, IPv6) */
+	s->proto_filter[2].start = htons(0x8137);
+	s->proto_filter[2].end   = htons(0x86DD);
+}
+#endif
+
 static int bnep_ctrl_set_netfilter(struct bnep_session *s, u16 *data, int len)
 {
 	int n;
 
 	if (len < 2)
 		return -EILSEQ;
-	
+
 	n = ntohs(get_unaligned(data));
 	data++; len -= 2;
 
@@ -141,9 +156,13 @@ static int bnep_ctrl_set_netfilter(struc
 			BT_DBG("proto filter start %d end %d",
 				f[i].start, f[i].end);
 		}
+
 		if (i < BNEP_MAX_PROTO_FILTERS)
 			memset(f + i, 0, sizeof(*f));
 
+		if (n == 0)
+			bnep_set_default_proto_filter(s);
+
 		bnep_send_rsp(s, BNEP_FILTER_NET_TYPE_RSP, BNEP_SUCCESS);
 	} else {
 		bnep_send_rsp(s, BNEP_FILTER_NET_TYPE_RSP, BNEP_FILTER_LIMIT_REACHED);
@@ -160,7 +179,7 @@ static int bnep_ctrl_set_mcfilter(struct
 
 	if (len < 2)
 		return -EILSEQ;
-	
+
 	n = ntohs(get_unaligned((u16 *) data)); 
 	data += 2; len -= 2;
 
@@ -214,7 +233,7 @@ static int bnep_rx_control(struct bnep_s
 	int err = 0;
 
 	data++; len--;
-	
+
 	switch (cmd) {
 	case BNEP_CMD_NOT_UNDERSTOOD:
 	case BNEP_SETUP_CONN_REQ:
@@ -268,13 +287,13 @@ static int bnep_rx_extension(struct bnep
 			/* Unknown extension, skip it. */
 			break;
 		}
-	
+
 		if (!skb_pull(skb, h->len)) {
 			err = -EILSEQ;
 			break;
 		}
 	} while (!err && (h->type & BNEP_EXT_HEADER));
-	
+
 	return err;
 }
 
@@ -300,7 +319,7 @@ static inline int bnep_rx_frame(struct b
 
 	if ((type & BNEP_TYPE_MASK) > BNEP_RX_TYPES)
 		goto badframe;
-	
+
 	if ((type & BNEP_TYPE_MASK) == BNEP_CONTROL) {
 		bnep_rx_control(s, skb->data, skb->len);
 		kfree_skb(skb);
@@ -326,7 +345,7 @@ static inline int bnep_rx_frame(struct b
 			goto badframe;
 		s->eh.h_proto = get_unaligned((u16 *) (skb->data - 2));
 	}
-	
+
 	/* We have to alloc new skb and copy data here :(. Because original skb
 	 * may not be modified and because of the alignment requirements. */
 	nskb = alloc_skb(2 + ETH_HLEN + skb->len, GFP_KERNEL);
@@ -342,7 +361,7 @@ static inline int bnep_rx_frame(struct b
 	case BNEP_COMPRESSED:
 		memcpy(__skb_put(nskb, ETH_HLEN), &s->eh, ETH_HLEN);
 		break;
-	
+
 	case BNEP_COMPRESSED_SRC_ONLY:
 		memcpy(__skb_put(nskb, ETH_ALEN), s->eh.h_dest, ETH_ALEN);
 		memcpy(__skb_put(nskb, ETH_ALEN), skb->mac.raw, ETH_ALEN);
@@ -362,7 +381,7 @@ static inline int bnep_rx_frame(struct b
 
 	memcpy(__skb_put(nskb, skb->len), skb->data, skb->len);
 	kfree_skb(skb);
-	
+
 	s->stats.rx_packets++;
 	nskb->dev       = dev;
 	nskb->ip_summed = CHECKSUM_UNNECESSARY;
@@ -426,9 +445,9 @@ static inline int bnep_tx_frame(struct b
 send:
 	iv[il++] = (struct iovec) { skb->data, skb->len };
 	len += skb->len;
-	
+
 	/* FIXME: linearize skb */
-	
+
 	s->msg.msg_iov    = iv;
 	s->msg.msg_iovlen = il;
 	len = sock->ops->sendmsg(sock, &s->msg, len, NULL);
@@ -453,16 +472,16 @@ static int bnep_session(void *arg)
 
 	BT_DBG("");
 
-        daemonize(); reparent_to_init();
+	daemonize(); reparent_to_init();
 
-        sprintf(current->comm, "kbnepd %s", dev->name);
-	
-        sigfillset(&current->blocked);
+	sprintf(current->comm, "kbnepd %s", dev->name);
+
+	sigfillset(&current->blocked);
 	flush_signals(current);
 
 	set_user_nice(current, -15);
 
-        set_fs(KERNEL_DS);
+	set_fs(KERNEL_DS);
 
 	init_waitqueue_entry(&wait, current);
 	add_wait_queue(sk->sleep, &wait);
@@ -477,13 +496,13 @@ static int bnep_session(void *arg)
 
 		if (sk->state != BT_CONNECTED)
 			break;
-	
+
 		// TX
 		while ((skb = skb_dequeue(&sk->write_queue)))
 			if (bnep_tx_frame(s, skb))
 				break;
 		netif_wake_queue(dev);
-	
+
 		schedule();
 	}
 	set_current_state(TASK_RUNNING);
@@ -547,28 +566,19 @@ int bnep_add_connection(struct bnep_conn
 	s->sock  = sock;
 	s->role  = req->role;
 	s->state = BT_CONNECTED;
-	
+
 	s->msg.msg_flags = MSG_NOSIGNAL;
 
 #ifdef CONFIG_BLUEZ_BNEP_MC_FILTER
 	/* Set default mc filter */
 	set_bit(bnep_mc_hash(dev->broadcast), &s->mc_filter);
 #endif
-	
+
 #ifdef CONFIG_BLUEZ_BNEP_PROTO_FILTER
 	/* Set default protocol filter */
-
-	/* (IPv4, ARP)  */
-	s->proto_filter[0].start = htons(0x0800);
-	s->proto_filter[0].end   = htons(0x0806);
-	/* (RARP, AppleTalk) */
-	s->proto_filter[1].start = htons(0x8035);
-	s->proto_filter[1].end   = htons(0x80F3);
-	/* (IPX, IPv6) */
-	s->proto_filter[2].start = htons(0x8137);
-	s->proto_filter[2].end   = htons(0x86DD);
+	bnep_set_default_proto_filter(s);
 #endif
-	
+
 	dev->init = bnep_net_init;
 	dev->priv = s;
 	err = register_netdev(dev);
@@ -577,7 +587,7 @@ int bnep_add_connection(struct bnep_conn
 	}
 
 	__bnep_link_session(s);
-	
+
 	err = kernel_thread(bnep_session, s, CLONE_FS | CLONE_FILES | CLONE_SIGHAND);
 	if (err < 0) {
 		/* Session thread start failed, gotta cleanup. */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/bnep/sock.c linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/bnep/sock.c
--- linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/bnep/sock.c	2004-06-29 11:26:15.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/bnep/sock.c	2004-09-05 16:04:42.000000000 +0200
@@ -55,36 +55,6 @@
 #define BT_DBG( A... )
 #endif
 
-static inline struct socket *socki_lookup(struct inode *inode)
-{
-	return &inode->u.socket_i;
-}
-
-static struct socket *sockfd_lookup(int fd, int *err)
-{
-	struct file *file;
-	struct inode *inode;
-	struct socket *sock;
-
-	if (!(file = fget(fd))) {
-		*err = -EBADF;
-		return NULL;
-	}
-
-	inode = file->f_dentry->d_inode;
-	if (!inode->i_sock || !(sock = socki_lookup(inode))) {
-		*err = -ENOTSOCK;
-		fput(file);
-		return NULL;
-	}
-
-	if (sock->file != file) {
-		printk(KERN_ERR "socki_lookup: socket file changed!\n");
-		sock->file = file;
-	}
-	return sock;
-}
- 
 static int bnep_sock_release(struct socket *sock)
 {
 	struct sock *sk = sock->sk;
@@ -124,8 +94,10 @@ static int bnep_sock_ioctl(struct socket
 		if (!nsock)
 			return err;
 
-		if (nsock->sk->state != BT_CONNECTED)
+		if (nsock->sk->state != BT_CONNECTED) {
+			fput(nsock->file);
 			return -EBADFD;
+		}
 
 		err = bnep_add_connection(&ca, nsock);
 		if (!err) {
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/cmtp/sock.c linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/cmtp/sock.c
--- linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/cmtp/sock.c	2004-06-29 11:26:15.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/cmtp/sock.c	2004-09-05 16:04:42.000000000 +0200
@@ -47,36 +47,6 @@
 #define BT_DBG(D...)
 #endif
 
-static inline struct socket *socki_lookup(struct inode *inode)
-{
-	return &inode->u.socket_i;
-}
-
-static struct socket *sockfd_lookup(int fd, int *err)
-{
-	struct file *file;
-	struct inode *inode;
-	struct socket *sock;
-
-	if (!(file = fget(fd))) {
-		*err = -EBADF;
-		return NULL;
-	}
-
-	inode = file->f_dentry->d_inode;
-	if (!inode->i_sock || !(sock = socki_lookup(inode))) {
-		*err = -ENOTSOCK;
-		fput(file);
-		return NULL;
-	}
-
-	if (sock->file != file) {
-		printk(KERN_ERR "socki_lookup: socket file changed!\n");
-		sock->file = file;
-	}
-	return sock;
-}
-
 static int cmtp_sock_release(struct socket *sock)
 {
 	struct sock *sk = sock->sk;
@@ -116,8 +86,10 @@ static int cmtp_sock_ioctl(struct socket
 		if (!nsock)
 			return err;
 
-		if (nsock->sk->state != BT_CONNECTED)
+		if (nsock->sk->state != BT_CONNECTED) {
+			fput(nsock->file);
 			return -EBADFD;
+		}
 
 		err = cmtp_add_connection(&ca, nsock);
 		if (!err) {
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/hci_conn.c linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/hci_conn.c
--- linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/hci_conn.c	2004-06-29 11:26:15.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/hci_conn.c	2004-09-05 16:04:42.000000000 +0200
@@ -71,7 +71,7 @@ void hci_acl_connect(struct hci_conn *co
 
 	memset(&cp, 0, sizeof(cp));
 	bacpy(&cp.bdaddr, &conn->dst);
-	cp.pscan_rep_mode = 0x01;
+	cp.pscan_rep_mode = 0x02;
 
 	if ((ie = inquiry_cache_lookup(hdev, &conn->dst)) &&
 			inquiry_entry_age(ie) <= INQUIRY_ENTRY_AGE_MAX) {
@@ -168,9 +168,6 @@ struct hci_conn *hci_conn_add(struct hci
 
 	hci_dev_hold(hdev);
 
-	if (hdev->notify)
-		hdev->notify(hdev, HCI_NOTIFY_CONN_ADD, (unsigned long) conn);
-
 	tasklet_disable(&hdev->tx_task);
 	conn_hash_add(hdev, conn);
 	tasklet_enable(&hdev->tx_task);
@@ -207,9 +204,6 @@ int hci_conn_del(struct hci_conn *conn)
 
 	skb_queue_purge(&conn->data_q);
 
-	if (hdev->notify)
-		hdev->notify(hdev, HCI_NOTIFY_CONN_DEL, (unsigned long) conn);
-
 	hci_dev_put(hdev);
 
 	kfree(conn);
@@ -364,21 +358,24 @@ int hci_get_conn_list(unsigned long arg)
 	struct hci_conn_info *ci;
 	struct hci_dev *hdev;
 	struct list_head *p;
-	int n = 0, size;
+	int n = 0, size, err;
 
 	if (copy_from_user(&req, (void *) arg, sizeof(req)))
 		return -EFAULT;
 
-	if (!(hdev = hci_dev_get(req.dev_id)))
-		return -ENODEV;
+	if (!req.conn_num || req.conn_num > (PAGE_SIZE * 2) / sizeof(*ci))
+		return -EINVAL;
 
-	size = req.conn_num * sizeof(struct hci_conn_info) + sizeof(req);
-
-	if (verify_area(VERIFY_WRITE, (void *)arg, size))
-		return -EFAULT;
+	size = sizeof(req) + req.conn_num * sizeof(*ci);
 
 	if (!(cl = (void *) kmalloc(size, GFP_KERNEL)))
 		return -ENOMEM;
+
+	if (!(hdev = hci_dev_get(req.dev_id))) {
+		kfree(cl);
+		return -ENODEV;
+	}
+
 	ci = cl->conn_info;
 
 	hci_dev_lock_bh(hdev);
@@ -392,20 +389,21 @@ int hci_get_conn_list(unsigned long arg)
 		(ci + n)->out   = c->out;
 		(ci + n)->state = c->state;
 		(ci + n)->link_mode = c->link_mode;
-		n++;
+		if (++n >= req.conn_num)
+			break;
 	}
 	hci_dev_unlock_bh(hdev);
 
 	cl->dev_id = hdev->id;
 	cl->conn_num = n;
-	size = n * sizeof(struct hci_conn_info) + sizeof(req);
+	size = sizeof(req) + n * sizeof(*ci);
 
 	hci_dev_put(hdev);
 
-	copy_to_user((void *) arg, cl, size);
+	err = copy_to_user((void *) arg, cl, size);
 	kfree(cl);
 
-	return 0;
+	return err ? -EFAULT : 0;
 }
 
 int hci_get_conn_info(struct hci_dev *hdev, unsigned long arg)
@@ -418,9 +416,6 @@ int hci_get_conn_info(struct hci_dev *hd
 	if (copy_from_user(&req, (void *) arg, sizeof(req)))
 		return -EFAULT;
 
-	if (verify_area(VERIFY_WRITE, ptr, sizeof(ci)))
-		return -EFAULT;
-
 	hci_dev_lock_bh(hdev);
 	conn = conn_hash_lookup_ba(hdev, req.type, &req.bdaddr);
 	if (conn) {
@@ -436,6 +431,5 @@ int hci_get_conn_info(struct hci_dev *hd
 	if (!conn)
 		return -ENOENT;
 
-	copy_to_user(ptr, &ci, sizeof(ci));
-	return 0;
+	return copy_to_user(ptr, &ci, sizeof(ci)) ? -EFAULT : 0;
 }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/hci_core.c linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/hci_core.c
--- linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/hci_core.c	2004-06-29 11:26:15.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/hci_core.c	2004-09-05 16:04:42.000000000 +0200
@@ -218,6 +218,10 @@ static void hci_init_req(struct hci_dev 
 
 	/* Mandatory initialization */
 
+	/* Reset */
+	if (test_bit(HCI_QUIRK_RESET_ON_INIT, &hdev->quirks))
+		hci_send_cmd(hdev, OGF_HOST_CTL, OCF_RESET, 0, NULL);
+
 	/* Read Local Supported Features */
 	hci_send_cmd(hdev, OGF_INFO_PARAM, OCF_READ_LOCAL_FEATURES, 0, NULL);
 
@@ -240,9 +244,6 @@ static void hci_init_req(struct hci_dev 
 	/* Read BD Address */
 	hci_send_cmd(hdev, OGF_INFO_PARAM, OCF_READ_BD_ADDR, 0, NULL);
 
-        /* Read Voice Setting */
-	hci_send_cmd(hdev, OGF_HOST_CTL, OCF_READ_VOICE_SETTING, 0, NULL);
-
 	/* Optional initialization */
 
 	/* Clear Event Filters */
@@ -411,6 +412,7 @@ int hci_inquiry(unsigned long arg)
 
 	hci_dev_lock_bh(hdev);
 	if (inquiry_cache_age(hdev) > INQUIRY_CACHE_AGE_MAX || 
+					inquiry_cache_empty(hdev) ||
 					ir.flags & IREQ_CACHE_FLUSH) {
 		inquiry_cache_flush(hdev);
 		do_inquiry = 1;
@@ -714,22 +716,20 @@ int hci_get_dev_list(unsigned long arg)
 	struct hci_dev_list_req *dl;
 	struct hci_dev_req *dr;
 	struct list_head *p;
-	int n = 0, size;
+	int n = 0, size, err;
 	__u16 dev_num;
 
 	if (get_user(dev_num, (__u16 *) arg))
 		return -EFAULT;
 
-	if (!dev_num)
+	if (!dev_num || dev_num > (PAGE_SIZE * 2) / sizeof(*dr))
 		return -EINVAL;
-	
-	size = dev_num * sizeof(*dr) + sizeof(*dl);
 
-	if (verify_area(VERIFY_WRITE, (void *) arg, size))
-		return -EFAULT;
+	size = sizeof(*dl) + dev_num * sizeof(*dr);
 
 	if (!(dl = kmalloc(size, GFP_KERNEL)))
 		return -ENOMEM;
+
 	dr = dl->dev_req;
 
 	read_lock_bh(&hdev_list_lock);
@@ -744,12 +744,12 @@ int hci_get_dev_list(unsigned long arg)
 	read_unlock_bh(&hdev_list_lock);
 
 	dl->dev_num = n;
-	size = n * sizeof(*dr) + sizeof(*dl);
+	size = sizeof(*dl) + n * sizeof(*dr);
 
-	copy_to_user((void *) arg, dl, size);
+	err = copy_to_user((void *) arg, dl, size);
 	kfree(dl);
 
-	return 0;
+	return err ? -EFAULT : 0;
 }
 
 int hci_get_dev_info(unsigned long arg)
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/hci_event.c linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/hci_event.c
--- linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/hci_event.c	2004-06-29 11:26:15.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/hci_event.c	2004-09-05 16:04:42.000000000 +0200
@@ -123,8 +123,6 @@ static void hci_cc_link_policy(struct hc
 static void hci_cc_host_ctl(struct hci_dev *hdev, __u16 ocf, struct sk_buff *skb)
 {
 	__u8 status, param;
-	__u16 setting;
-	read_voice_setting_rp *vs;
 	void *sent;
 
 	BT_DBG("%s ocf 0x%x", hdev->name, ocf);
@@ -200,7 +198,6 @@ static void hci_cc_host_ctl(struct hci_d
 		sent = hci_sent_cmd_data(hdev, OGF_HOST_CTL, OCF_WRITE_SCAN_ENABLE);
 		if (!sent)
 			break;
-
 		status = *((__u8 *) skb->data);
 		param  = *((__u8 *) sent);
 
@@ -218,46 +215,6 @@ static void hci_cc_host_ctl(struct hci_d
 		hci_req_complete(hdev, status);
 		break;
 
-	case OCF_READ_VOICE_SETTING:
-		vs = (read_voice_setting_rp *) skb->data;
-
-		if (vs->status) { 
-			BT_DBG("%s READ_VOICE_SETTING failed %d", hdev->name, vc->status);
-			break;
-		}
-
-		setting = __le16_to_cpu(vs->voice_setting);
-
-		if (hdev->voice_setting != setting ) {
-			hdev->voice_setting = setting;
-
-			BT_DBG("%s: voice setting 0x%04x", hdev->name, setting);
-
-			if (hdev->notify)
-				hdev->notify(hdev, HCI_NOTIFY_VOICE_SETTING, 0);
-		}
-
-		break;
-
-	case OCF_WRITE_VOICE_SETTING:
-		sent = hci_sent_cmd_data(hdev, OGF_HOST_CTL, OCF_WRITE_VOICE_SETTING);
-		if (!sent)
-			break;
-
-		status = *((__u8 *) skb->data);
-		setting = __le16_to_cpu(get_unaligned((__u16 *) sent));
-
-		if (!status && hdev->voice_setting != setting) {
-			hdev->voice_setting = setting;
-
-			BT_DBG("%s: voice setting 0x%04x", hdev->name, setting);
-
-			if (hdev->notify)
-				hdev->notify(hdev, HCI_NOTIFY_VOICE_SETTING, 0);
-		}
-		hci_req_complete(hdev, status);
-		break;
-
 	case OCF_HOST_BUFFER_SIZE:
 		status = *((__u8 *) skb->data);
 		if (status) {
@@ -325,8 +282,7 @@ static void hci_cc_info_param(struct hci
 		hdev->sco_pkts = hdev->sco_cnt = __le16_to_cpu(bs->sco_max_pkt);
 
 		BT_DBG("%s mtu: acl %d, sco %d max_pkt: acl %d, sco %d", hdev->name,
-			hdev->acl_mtu, hdev->sco_mtu, hdev->acl_pkts, hdev->sco_pkts);
-
+		    hdev->acl_mtu, hdev->sco_mtu, hdev->acl_pkts, hdev->sco_pkts);
 		break;
 
 	case OCF_READ_BD_ADDR:
@@ -364,7 +320,7 @@ static inline void hci_cs_create_conn(st
 			status, batostr(&cc->bdaddr), conn);
 
 	if (status) {
-		if (conn) {
+		if (conn && conn->state == BT_CONNECT) {
 			conn->state = BT_CLOSED;
 			hci_proto_connect_cfm(conn, status);
 			hci_conn_del(conn);
@@ -496,6 +452,29 @@ static inline void hci_inquiry_result_ev
 	hci_dev_unlock(hdev);
 }
 
+/* Inquiry Result With RSSI */
+static inline void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, struct sk_buff *skb)
+{
+	inquiry_info_with_rssi *info = (inquiry_info_with_rssi *) (skb->data + 1);
+	int num_rsp = *((__u8 *) skb->data);
+
+	BT_DBG("%s num_rsp %d", hdev->name, num_rsp);
+
+	hci_dev_lock(hdev);
+	for (; num_rsp; num_rsp--) {
+		inquiry_info tmp;
+		bacpy(&tmp.bdaddr, &info->bdaddr);
+		tmp.pscan_rep_mode    = info->pscan_rep_mode;
+		tmp.pscan_period_mode = info->pscan_period_mode;
+		tmp.pscan_mode        = 0x00;
+		memcpy(tmp.dev_class, &info->dev_class, 3);
+		tmp.clock_offset      = info->clock_offset;
+		info++;
+		inquiry_cache_update(hdev, &tmp);
+	}
+	hci_dev_unlock(hdev);
+}
+
 /* Connect Request */
 static inline void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
@@ -792,6 +771,10 @@ void hci_event_packet(struct hci_dev *hd
 		hci_inquiry_result_evt(hdev, skb);
 		break;
 
+	case EVT_INQUIRY_RESULT_WITH_RSSI:
+		hci_inquiry_result_with_rssi_evt(hdev, skb);
+		break;
+
 	case EVT_CONN_REQUEST:
 		hci_conn_request_evt(hdev, skb);
 		break;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/hci_sock.c linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/hci_sock.c
--- linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/hci_sock.c	2004-06-29 11:26:15.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/hci_sock.c	2004-09-05 16:04:42.000000000 +0200
@@ -66,20 +66,20 @@ static struct hci_sec_filter hci_sec_fil
 	/* Packet types */
 	0x10,
 	/* Events */
-	{ 0xd9fe, 0x0 },
+	{ 0x1000d9fe, 0x0000300c },
 	/* Commands */
 	{
 		{ 0x0 },
 		/* OGF_LINK_CTL */
-		{ 0x2a000002, 0x0, 0x0, 0x0  },
+		{ 0xbe000006, 0x00000001, 0x0000, 0x00 },
 		/* OGF_LINK_POLICY */
-		{ 0x1200, 0x0, 0x0, 0x0      },
+		{ 0x00005200, 0x00000000, 0x0000, 0x00 },
 		/* OGF_HOST_CTL */
-		{ 0x80100000, 0x202a, 0x0, 0x0 },
+		{ 0xaab00200, 0x2b402aaa, 0x0154, 0x00 },
 		/* OGF_INFO_PARAM */
-		{ 0x22a, 0x0, 0x0, 0x0       },
+		{ 0x000002be, 0x00000000, 0x0000, 0x00 },
 		/* OGF_STATUS_PARAM */
-		{ 0x2e, 0x0, 0x0, 0x0        }
+		{ 0x000000ea, 0x00000000, 0x0000, 0x00 }
 	}
 };
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/hidp/Config.in linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/hidp/Config.in
--- linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/hidp/Config.in	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/hidp/Config.in	2004-09-05 16:04:42.000000000 +0200
@@ -0,0 +1,5 @@
+#
+# Bluetooth HIDP layer configuration
+#
+
+dep_tristate 'HIDP protocol support' CONFIG_BLUEZ_HIDP $CONFIG_INPUT $CONFIG_BLUEZ_L2CAP
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/hidp/Makefile linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/hidp/Makefile
--- linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/hidp/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/hidp/Makefile	2004-09-05 16:04:42.000000000 +0200
@@ -0,0 +1,10 @@
+#
+# Makefile for the Linux Bluetooth HIDP layer
+#
+
+O_TARGET := hidp.o
+
+obj-y	:= core.o sock.o
+obj-m	+= $(O_TARGET)
+
+include $(TOPDIR)/Rules.make
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/hidp/core.c linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/hidp/core.c
--- linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/hidp/core.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/hidp/core.c	2004-09-05 16:04:43.000000000 +0200
@@ -0,0 +1,655 @@
+/* 
+   HIDP implementation for Linux Bluetooth stack (BlueZ).
+   Copyright (C) 2003-2004 Marcel Holtmann <marcel@holtmann.org>
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License version 2 as
+   published by the Free Software Foundation;
+
+   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 OF THIRD PARTY RIGHTS.
+   IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
+   CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 
+   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 
+   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
+   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+   ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 
+   COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 
+   SOFTWARE IS DISCLAIMED.
+*/
+
+#include <linux/config.h>
+#include <linux/module.h>
+
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/kernel.h>
+#include <linux/major.h>
+#include <linux/sched.h>
+#include <linux/slab.h>
+#include <linux/poll.h>
+#include <linux/fcntl.h>
+#include <linux/skbuff.h>
+#include <linux/socket.h>
+#include <linux/ioctl.h>
+#include <linux/file.h>
+#include <linux/init.h>
+#include <net/sock.h>
+
+#include <linux/input.h>
+
+#include <net/bluetooth/bluetooth.h>
+#include <net/bluetooth/l2cap.h>
+
+#include "hidp.h"
+
+#ifndef CONFIG_BT_HIDP_DEBUG
+#undef  BT_DBG
+#define BT_DBG(D...)
+#endif
+
+#define VERSION "1.0"
+
+static DECLARE_RWSEM(hidp_session_sem);
+static LIST_HEAD(hidp_session_list);
+
+static unsigned char hidp_keycode[256] = {
+	  0,  0,  0,  0, 30, 48, 46, 32, 18, 33, 34, 35, 23, 36, 37, 38,
+	 50, 49, 24, 25, 16, 19, 31, 20, 22, 47, 17, 45, 21, 44,  2,  3,
+	  4,  5,  6,  7,  8,  9, 10, 11, 28,  1, 14, 15, 57, 12, 13, 26,
+	 27, 43, 43, 39, 40, 41, 51, 52, 53, 58, 59, 60, 61, 62, 63, 64,
+	 65, 66, 67, 68, 87, 88, 99, 70,119,110,102,104,111,107,109,106,
+	105,108,103, 69, 98, 55, 74, 78, 96, 79, 80, 81, 75, 76, 77, 71,
+	 72, 73, 82, 83, 86,127,116,117,183,184,185,186,187,188,189,190,
+	191,192,193,194,134,138,130,132,128,129,131,137,133,135,136,113,
+	115,114,  0,  0,  0,121,  0, 89, 93,124, 92, 94, 95,  0,  0,  0,
+	122,123, 90, 91, 85,  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,
+	 29, 42, 56,125, 97, 54,100,126,164,166,165,163,161,115,114,113,
+	150,158,159,128,136,177,178,176,142,152,173,140
+};
+
+static struct hidp_session *__hidp_get_session(bdaddr_t *bdaddr)
+{
+	struct hidp_session *session;
+	struct list_head *p;
+
+	BT_DBG("");
+
+	list_for_each(p, &hidp_session_list) {
+		session = list_entry(p, struct hidp_session, list);
+		if (!bacmp(bdaddr, &session->bdaddr))
+			return session;
+	}
+	return NULL;
+}
+
+static void __hidp_link_session(struct hidp_session *session)
+{
+	MOD_INC_USE_COUNT;
+	list_add(&session->list, &hidp_session_list);
+}
+
+static void __hidp_unlink_session(struct hidp_session *session)
+{
+	list_del(&session->list);
+	MOD_DEC_USE_COUNT;
+}
+
+static void __hidp_copy_session(struct hidp_session *session, struct hidp_conninfo *ci)
+{
+	bacpy(&ci->bdaddr, &session->bdaddr);
+
+	ci->flags = session->flags;
+	ci->state = session->state;
+
+	ci->vendor  = 0x0000;
+	ci->product = 0x0000;
+	ci->version = 0x0000;
+	memset(ci->name, 0, 128);
+
+	if (session->input) {
+		ci->vendor  = session->input->idvendor;
+		ci->product = session->input->idproduct;
+		ci->version = session->input->idversion;
+		if (session->input->name)
+			strncpy(ci->name, session->input->name, 128);
+		else
+			strncpy(ci->name, "HID Boot Device", 128);
+	}
+}
+
+static int hidp_input_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
+{
+	struct hidp_session *session = dev->private;
+	struct sk_buff *skb;
+	unsigned char newleds;
+
+	BT_DBG("session %p hid %p data %p size %d", session, device, data, size);
+
+	if (type != EV_LED)
+		return -1;
+
+	newleds = (!!test_bit(LED_KANA,    dev->led) << 3) |
+		  (!!test_bit(LED_COMPOSE, dev->led) << 3) |
+		  (!!test_bit(LED_SCROLLL, dev->led) << 2) |
+		  (!!test_bit(LED_CAPSL,   dev->led) << 1) |
+		  (!!test_bit(LED_NUML,    dev->led));
+
+	if (session->leds == newleds)
+		return 0;
+
+	session->leds = newleds;
+
+	if (!(skb = alloc_skb(3, GFP_ATOMIC))) {
+		BT_ERR("Can't allocate memory for new frame");
+		return -ENOMEM;
+	}
+
+	*skb_put(skb, 1) = 0xa2;
+	*skb_put(skb, 1) = 0x01;
+	*skb_put(skb, 1) = newleds;
+
+	skb_queue_tail(&session->intr_transmit, skb);
+
+	hidp_schedule(session);
+
+	return 0;
+}
+
+static void hidp_input_report(struct hidp_session *session, struct sk_buff *skb)
+{
+	struct input_dev *dev = session->input;
+	unsigned char *keys = session->keys;
+	unsigned char *udata = skb->data + 1;
+	signed char *sdata = skb->data + 1;
+	int i, size = skb->len - 1;
+
+	switch (skb->data[0]) {
+	case 0x01:	/* Keyboard report */
+		for (i = 0; i < 8; i++)
+			input_report_key(dev, hidp_keycode[i + 224], (udata[0] >> i) & 1);
+
+		for (i = 2; i < 8; i++) {
+			if (keys[i] > 3 && memscan(udata + 2, keys[i], 6) == udata + 8) {
+				if (hidp_keycode[keys[i]])
+					input_report_key(dev, hidp_keycode[keys[i]], 0);
+				else
+					BT_ERR("Unknown key (scancode %#x) released.", keys[i]);
+			}
+
+			if (udata[i] > 3 && memscan(keys + 2, udata[i], 6) == keys + 8) {
+				if (hidp_keycode[udata[i]])
+					input_report_key(dev, hidp_keycode[udata[i]], 1);
+				else
+					BT_ERR("Unknown key (scancode %#x) pressed.", udata[i]);
+			}
+		}
+
+		memcpy(keys, udata, 8);
+		break;
+
+	case 0x02:	/* Mouse report */
+		input_report_key(dev, BTN_LEFT,   sdata[0] & 0x01);
+		input_report_key(dev, BTN_RIGHT,  sdata[0] & 0x02);
+		input_report_key(dev, BTN_MIDDLE, sdata[0] & 0x04);
+		input_report_key(dev, BTN_SIDE,   sdata[0] & 0x08);
+		input_report_key(dev, BTN_EXTRA,  sdata[0] & 0x10);
+
+		input_report_rel(dev, REL_X, sdata[1]);
+		input_report_rel(dev, REL_Y, sdata[2]);
+
+		if (size > 3)
+			input_report_rel(dev, REL_WHEEL, sdata[3]);
+		break;
+	}
+
+	input_event(dev, EV_RST, 0, 0);
+}
+
+static void hidp_idle_timeout(unsigned long arg)
+{
+	struct hidp_session *session = (struct hidp_session *) arg;
+
+	atomic_inc(&session->terminate);
+	hidp_schedule(session);
+}
+
+static inline void hidp_set_timer(struct hidp_session *session)
+{
+	if (session->idle_to > 0)
+		mod_timer(&session->timer, jiffies + HZ * session->idle_to);
+}
+
+static inline void hidp_del_timer(struct hidp_session *session)
+{
+	if (session->idle_to > 0)
+		del_timer(&session->timer);
+}
+
+static inline void hidp_send_message(struct hidp_session *session, unsigned char hdr)
+{
+	struct sk_buff *skb;
+
+	BT_DBG("session %p", session);
+
+	if (!(skb = alloc_skb(1, GFP_ATOMIC))) {
+		BT_ERR("Can't allocate memory for message");
+		return;
+	}
+
+	*skb_put(skb, 1) = hdr;
+
+	skb_queue_tail(&session->ctrl_transmit, skb);
+
+	hidp_schedule(session);
+}
+
+static inline int hidp_recv_frame(struct hidp_session *session, struct sk_buff *skb)
+{
+	__u8 hdr;
+
+	BT_DBG("session %p skb %p len %d", session, skb, skb->len);
+
+	hdr = skb->data[0];
+	skb_pull(skb, 1);
+
+	if (hdr == 0xa1) {
+		hidp_set_timer(session);
+
+		if (session->input)
+			hidp_input_report(session, skb);
+	} else {
+		BT_DBG("Unsupported protocol header 0x%02x", hdr);
+	}
+
+	kfree_skb(skb);
+	return 0;
+}
+
+static int hidp_send_frame(struct socket *sock, unsigned char *data, int len)
+{
+	struct iovec iv = { data, len };
+	struct msghdr msg;
+
+	BT_DBG("sock %p data %p len %d", sock, data, len);
+
+	if (!len)
+		return 0;
+
+	memset(&msg, 0, sizeof(msg));
+	msg.msg_iovlen = 1;
+	msg.msg_iov = &iv;
+
+	return sock_sendmsg(sock, &msg, len);
+}
+
+static int hidp_process_transmit(struct hidp_session *session)
+{
+	struct sk_buff *skb;
+
+	BT_DBG("session %p", session);
+
+	while ((skb = skb_dequeue(&session->ctrl_transmit))) {
+		if (hidp_send_frame(session->ctrl_sock, skb->data, skb->len) < 0) {
+			skb_queue_head(&session->ctrl_transmit, skb);
+			break;
+		}
+
+		hidp_set_timer(session);
+		kfree_skb(skb);
+	}
+
+	while ((skb = skb_dequeue(&session->intr_transmit))) {
+		if (hidp_send_frame(session->intr_sock, skb->data, skb->len) < 0) {
+			skb_queue_head(&session->intr_transmit, skb);
+			break;
+		}
+
+		hidp_set_timer(session);
+		kfree_skb(skb);
+	}
+
+	return skb_queue_len(&session->ctrl_transmit) +
+				skb_queue_len(&session->intr_transmit);
+}
+
+static int hidp_session(void *arg)
+{
+	struct hidp_session *session = arg;
+	struct sock *ctrl_sk = session->ctrl_sock->sk;
+	struct sock *intr_sk = session->intr_sock->sk;
+	struct sk_buff *skb;
+	int vendor = 0x0000, product = 0x0000;
+	wait_queue_t ctrl_wait, intr_wait;
+	unsigned long timeo = HZ;
+
+	BT_DBG("session %p", session);
+
+	if (session->input) {
+		vendor  = session->input->idvendor;
+		product = session->input->idproduct;
+	}
+
+	daemonize(); reparent_to_init();
+
+	sprintf(current->comm, "khidpd_%04x%04x", vendor, product);
+
+	sigfillset(&current->blocked);
+	flush_signals(current);
+
+	set_user_nice(current, -15);
+
+	set_fs(KERNEL_DS);
+
+	init_waitqueue_entry(&ctrl_wait, current);
+	init_waitqueue_entry(&intr_wait, current);
+	add_wait_queue(ctrl_sk->sleep, &ctrl_wait);
+	add_wait_queue(intr_sk->sleep, &intr_wait);
+	while (!atomic_read(&session->terminate)) {
+		set_current_state(TASK_INTERRUPTIBLE);
+
+		if (ctrl_sk->state != BT_CONNECTED || intr_sk->state != BT_CONNECTED)
+			break;
+
+		while ((skb = skb_dequeue(&ctrl_sk->receive_queue))) {
+			skb_orphan(skb);
+			hidp_recv_frame(session, skb);
+		}
+
+		while ((skb = skb_dequeue(&intr_sk->receive_queue))) {
+			skb_orphan(skb);
+			hidp_recv_frame(session, skb);
+		}
+
+		hidp_process_transmit(session);
+
+		schedule();
+	}
+	set_current_state(TASK_RUNNING);
+	remove_wait_queue(intr_sk->sleep, &intr_wait);
+	remove_wait_queue(ctrl_sk->sleep, &ctrl_wait);
+
+	down_write(&hidp_session_sem);
+
+	hidp_del_timer(session);
+
+	if (intr_sk->state != BT_CONNECTED) {
+		init_waitqueue_entry(&ctrl_wait, current);
+		add_wait_queue(ctrl_sk->sleep, &ctrl_wait);
+		while (timeo && ctrl_sk->state != BT_CLOSED) {
+			set_current_state(TASK_INTERRUPTIBLE);
+			timeo = schedule_timeout(timeo);
+		}
+		set_current_state(TASK_RUNNING);
+		remove_wait_queue(ctrl_sk->sleep, &ctrl_wait);
+		timeo = HZ;
+	}
+
+	fput(session->ctrl_sock->file);
+
+	init_waitqueue_entry(&intr_wait, current);
+	add_wait_queue(intr_sk->sleep, &intr_wait);
+	while (timeo && intr_sk->state != BT_CLOSED) {
+		set_current_state(TASK_INTERRUPTIBLE);
+		timeo = schedule_timeout(timeo);
+	}
+	set_current_state(TASK_RUNNING);
+	remove_wait_queue(intr_sk->sleep, &intr_wait);
+
+	fput(session->intr_sock->file);
+
+	__hidp_unlink_session(session);
+
+	if (session->input) {
+		input_unregister_device(session->input);
+		kfree(session->input);
+	}
+
+	up_write(&hidp_session_sem);
+
+	kfree(session);
+	return 0;
+}
+
+static inline void hidp_setup_input(struct hidp_session *session, struct hidp_connadd_req *req)
+{
+	struct input_dev *input = session->input;
+	int i;
+
+	input->private = session;
+
+	input->idbus     = BUS_BLUETOOTH;
+	input->idvendor  = req->vendor;
+	input->idproduct = req->product;
+	input->idversion = req->version;
+
+	if (req->subclass & 0x40) {
+		set_bit(EV_KEY, input->evbit);
+		set_bit(EV_LED, input->evbit);
+		set_bit(EV_REP, input->evbit);
+
+		set_bit(LED_NUML,    input->ledbit);
+		set_bit(LED_CAPSL,   input->ledbit);
+		set_bit(LED_SCROLLL, input->ledbit);
+		set_bit(LED_COMPOSE, input->ledbit);
+		set_bit(LED_KANA,    input->ledbit);
+
+		for (i = 0; i < sizeof(hidp_keycode); i++)
+			set_bit(hidp_keycode[i], input->keybit);
+		clear_bit(0, input->keybit);
+	}
+
+	if (req->subclass & 0x80) {
+		input->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
+		input->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_RIGHT) | BIT(BTN_MIDDLE);
+		input->relbit[0] = BIT(REL_X) | BIT(REL_Y);
+		input->keybit[LONG(BTN_MOUSE)] |= BIT(BTN_SIDE) | BIT(BTN_EXTRA);
+		input->relbit[0] |= BIT(REL_WHEEL);
+	}
+
+	input->event = hidp_input_event;
+
+	input_register_device(input);
+}
+
+int hidp_add_connection(struct hidp_connadd_req *req, struct socket *ctrl_sock, struct socket *intr_sock)
+{
+	struct hidp_session *session, *s;
+	int err;
+
+	BT_DBG("");
+
+	if (bacmp(&bluez_pi(ctrl_sock->sk)->src, &bluez_pi(intr_sock->sk)->src) ||
+			bacmp(&bluez_pi(ctrl_sock->sk)->dst, &bluez_pi(intr_sock->sk)->dst))
+		return -ENOTUNIQ;
+
+	session = kmalloc(sizeof(struct hidp_session), GFP_KERNEL);
+	if (!session) 
+		return -ENOMEM;
+	memset(session, 0, sizeof(struct hidp_session));
+
+	session->input = kmalloc(sizeof(struct input_dev), GFP_KERNEL);
+	if (!session->input) {
+		kfree(session);
+		return -ENOMEM;
+	}
+	memset(session->input, 0, sizeof(struct input_dev));
+
+	down_write(&hidp_session_sem);
+
+	s = __hidp_get_session(&bluez_pi(ctrl_sock->sk)->dst);
+	if (s && s->state == BT_CONNECTED) {
+		err = -EEXIST;
+		goto failed;
+	}
+
+	bacpy(&session->bdaddr, &bluez_pi(ctrl_sock->sk)->dst);
+
+	session->ctrl_mtu = min_t(uint, l2cap_pi(ctrl_sock->sk)->omtu, l2cap_pi(ctrl_sock->sk)->imtu);
+	session->intr_mtu = min_t(uint, l2cap_pi(intr_sock->sk)->omtu, l2cap_pi(intr_sock->sk)->imtu);
+
+	BT_DBG("ctrl mtu %d intr mtu %d", session->ctrl_mtu, session->intr_mtu);
+
+	session->ctrl_sock = ctrl_sock;
+	session->intr_sock = intr_sock;
+	session->state     = BT_CONNECTED;
+
+	init_timer(&session->timer);
+
+	session->timer.function = hidp_idle_timeout;
+	session->timer.data     = (unsigned long) session;
+
+	skb_queue_head_init(&session->ctrl_transmit);
+	skb_queue_head_init(&session->intr_transmit);
+
+	session->flags   = req->flags & (1 << HIDP_BLUETOOTH_VENDOR_ID);
+	session->idle_to = req->idle_to;
+
+	if (session->input)
+		hidp_setup_input(session, req);
+
+	__hidp_link_session(session);
+
+	hidp_set_timer(session);
+
+	err = kernel_thread(hidp_session, session, CLONE_FS | CLONE_FILES | CLONE_SIGHAND);
+	if (err < 0)
+		goto unlink;
+
+	if (session->input) {
+		hidp_send_message(session, 0x70);
+		session->flags |= (1 << HIDP_BOOT_PROTOCOL_MODE);
+
+		session->leds = 0xff;
+		hidp_input_event(session->input, EV_LED, 0, 0);
+	}
+
+	up_write(&hidp_session_sem);
+	return 0;
+
+unlink:
+	hidp_del_timer(session);
+
+	__hidp_unlink_session(session);
+
+	if (session->input)
+		input_unregister_device(session->input);
+
+failed:
+	up_write(&hidp_session_sem);
+
+	if (session->input)
+		kfree(session->input);
+
+	kfree(session);
+	return err;
+}
+
+int hidp_del_connection(struct hidp_conndel_req *req)
+{
+	struct hidp_session *session;
+	int err = 0;
+
+	BT_DBG("");
+
+	down_read(&hidp_session_sem);
+
+	session = __hidp_get_session(&req->bdaddr);
+	if (session) {
+		if (req->flags & (1 << HIDP_VIRTUAL_CABLE_UNPLUG)) {
+			hidp_send_message(session, 0x15);
+		} else {
+			/* Flush the transmit queues */
+			skb_queue_purge(&session->ctrl_transmit);
+			skb_queue_purge(&session->intr_transmit);
+
+			/* Kill session thread */
+			atomic_inc(&session->terminate);
+			hidp_schedule(session);
+		}
+	} else
+		err = -ENOENT;
+
+	up_read(&hidp_session_sem);
+	return err;
+}
+
+int hidp_get_connlist(struct hidp_connlist_req *req)
+{
+	struct list_head *p;
+	int err = 0, n = 0;
+
+	BT_DBG("");
+
+	down_read(&hidp_session_sem);
+
+	list_for_each(p, &hidp_session_list) {
+		struct hidp_session *session;
+		struct hidp_conninfo ci;
+
+		session = list_entry(p, struct hidp_session, list);
+
+		__hidp_copy_session(session, &ci);
+
+		if (copy_to_user(req->ci, &ci, sizeof(ci))) {
+			err = -EFAULT;
+			break;
+		}
+
+		if (++n >= req->cnum)
+			break;
+
+		req->ci++;
+	}
+	req->cnum = n;
+
+	up_read(&hidp_session_sem);
+	return err;
+}
+
+int hidp_get_conninfo(struct hidp_conninfo *ci)
+{
+	struct hidp_session *session;
+	int err = 0;
+
+	down_read(&hidp_session_sem);
+
+	session = __hidp_get_session(&ci->bdaddr);
+	if (session)
+		__hidp_copy_session(session, ci);
+	else
+		err = -ENOENT;
+
+	up_read(&hidp_session_sem);
+	return err;
+}
+
+static int __init hidp_init(void)
+{
+	l2cap_load();
+
+	hidp_init_sockets();
+
+	BT_INFO("BlueZ HIDP ver %s", VERSION);
+	BT_INFO("Copyright (C) 2003-2004 Marcel Holtmann <marcel@holtmann.org>");
+
+	return 0;
+}
+
+static void __exit hidp_exit(void)
+{
+	hidp_cleanup_sockets();
+}
+
+module_init(hidp_init);
+module_exit(hidp_exit);
+
+MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
+MODULE_DESCRIPTION("Bluetooth HIDP ver " VERSION);
+MODULE_LICENSE("GPL");
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/hidp/hidp.h linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/hidp/hidp.h
--- linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/hidp/hidp.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/hidp/hidp.h	2004-09-05 16:04:42.000000000 +0200
@@ -0,0 +1,122 @@
+/* 
+   HIDP implementation for Linux Bluetooth stack (BlueZ).
+   Copyright (C) 2003-2004 Marcel Holtmann <marcel@holtmann.org>
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License version 2 as
+   published by the Free Software Foundation;
+
+   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 OF THIRD PARTY RIGHTS.
+   IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
+   CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 
+   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 
+   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
+   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+   ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 
+   COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 
+   SOFTWARE IS DISCLAIMED.
+*/
+
+#ifndef __HIDP_H
+#define __HIDP_H
+
+#include <linux/types.h>
+#include <net/bluetooth/bluetooth.h>
+
+/* HIDP ioctl defines */
+#define HIDPCONNADD	_IOW('H', 200, int)
+#define HIDPCONNDEL	_IOW('H', 201, int)
+#define HIDPGETCONNLIST	_IOR('H', 210, int)
+#define HIDPGETCONNINFO	_IOR('H', 211, int)
+
+#define HIDP_VIRTUAL_CABLE_UNPLUG	0
+#define HIDP_BOOT_PROTOCOL_MODE		1
+#define HIDP_BLUETOOTH_VENDOR_ID	9
+
+struct hidp_connadd_req {
+	int   ctrl_sock;	// Connected control socket
+	int   intr_sock;	// Connteted interrupt socket
+	__u16 parser;
+	__u16 rd_size;
+	__u8 *rd_data;
+	__u8  country;
+	__u8  subclass;
+	__u16 vendor;
+	__u16 product;
+	__u16 version;
+	__u32 flags;
+	__u32 idle_to;
+	char  name[128];
+};
+
+struct hidp_conndel_req {
+	bdaddr_t bdaddr;
+	__u32    flags;
+};
+
+struct hidp_conninfo {
+	bdaddr_t bdaddr;
+	__u32    flags;
+	__u16    state;
+	__u16    vendor;
+	__u16    product;
+	__u16    version;
+	char     name[128];
+};
+
+struct hidp_connlist_req {
+	__u32  cnum;
+	struct hidp_conninfo *ci;
+};
+
+int hidp_add_connection(struct hidp_connadd_req *req, struct socket *ctrl_sock, struct socket *intr_sock);
+int hidp_del_connection(struct hidp_conndel_req *req);
+int hidp_get_connlist(struct hidp_connlist_req *req);
+int hidp_get_conninfo(struct hidp_conninfo *ci);
+
+/* HIDP session defines */
+struct hidp_session {
+	struct list_head list;
+
+	struct socket *ctrl_sock;
+	struct socket *intr_sock;
+
+	bdaddr_t bdaddr;
+
+	unsigned long state;
+	unsigned long flags;
+	unsigned long idle_to;
+
+	uint ctrl_mtu;
+	uint intr_mtu;
+
+	atomic_t terminate;
+
+	unsigned char keys[8];
+	unsigned char leds;
+
+	struct input_dev *input;
+
+	struct timer_list timer;
+
+	struct sk_buff_head ctrl_transmit;
+	struct sk_buff_head intr_transmit;
+};
+
+static inline void hidp_schedule(struct hidp_session *session)
+{
+	struct sock *ctrl_sk = session->ctrl_sock->sk;
+	struct sock *intr_sk = session->intr_sock->sk;
+
+	wake_up_interruptible(ctrl_sk->sleep);
+	wake_up_interruptible(intr_sk->sleep);
+}
+
+/* HIDP init defines */
+extern int __init hidp_init_sockets(void);
+extern void __exit hidp_cleanup_sockets(void);
+
+#endif /* __HIDP_H */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/hidp/sock.c linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/hidp/sock.c
--- linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/hidp/sock.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/hidp/sock.c	2004-09-05 16:04:42.000000000 +0200
@@ -0,0 +1,212 @@
+/* 
+   HIDP implementation for Linux Bluetooth stack (BlueZ).
+   Copyright (C) 2003-2004 Marcel Holtmann <marcel@holtmann.org>
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License version 2 as
+   published by the Free Software Foundation;
+
+   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 OF THIRD PARTY RIGHTS.
+   IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
+   CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 
+   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 
+   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
+   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+   ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 
+   COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 
+   SOFTWARE IS DISCLAIMED.
+*/
+
+#include <linux/config.h>
+#include <linux/module.h>
+
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/kernel.h>
+#include <linux/major.h>
+#include <linux/sched.h>
+#include <linux/slab.h>
+#include <linux/poll.h>
+#include <linux/fcntl.h>
+#include <linux/skbuff.h>
+#include <linux/socket.h>
+#include <linux/ioctl.h>
+#include <linux/file.h>
+#include <linux/init.h>
+#include <net/sock.h>
+
+#include "hidp.h"
+
+#ifndef CONFIG_BT_HIDP_DEBUG
+#undef  BT_DBG
+#define BT_DBG(D...)
+#endif
+
+static int hidp_sock_release(struct socket *sock)
+{
+	struct sock *sk = sock->sk;
+
+	BT_DBG("sock %p sk %p", sock, sk);
+
+	if (!sk)
+		return 0;
+
+	sock_orphan(sk);
+	sock_put(sk);
+
+	MOD_DEC_USE_COUNT;
+	return 0;
+}
+
+static int hidp_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
+{
+	struct hidp_connadd_req ca;
+	struct hidp_conndel_req cd;
+	struct hidp_connlist_req cl;
+	struct hidp_conninfo ci;
+	struct socket *csock;
+	struct socket *isock;
+	int err;
+
+	BT_DBG("cmd %x arg %lx", cmd, arg);
+
+	switch (cmd) {
+	case HIDPCONNADD:
+		if (!capable(CAP_NET_ADMIN))
+			return -EACCES;
+
+		if (copy_from_user(&ca, (void *) arg, sizeof(ca)))
+			return -EFAULT;
+
+		csock = sockfd_lookup(ca.ctrl_sock, &err);
+		if (!csock)
+			return err;
+
+		isock = sockfd_lookup(ca.intr_sock, &err);
+		if (!isock) {
+			fput(csock->file);
+			return err;
+		}
+
+		if (csock->sk->state != BT_CONNECTED || isock->sk->state != BT_CONNECTED) {
+			fput(csock->file);
+			fput(isock->file);
+			return -EBADFD;
+		}
+
+		err = hidp_add_connection(&ca, csock, isock);
+		if (!err) {
+			if (copy_to_user((void *) arg, &ca, sizeof(ca)))
+				err = -EFAULT;
+		} else {
+			fput(csock->file);
+			fput(isock->file);
+		}
+
+		return err;
+
+	case HIDPCONNDEL:
+		if (!capable(CAP_NET_ADMIN))
+			return -EACCES;
+
+		if (copy_from_user(&cd, (void *) arg, sizeof(cd)))
+			return -EFAULT;
+
+		return hidp_del_connection(&cd);
+
+	case HIDPGETCONNLIST:
+		if (copy_from_user(&cl, (void *) arg, sizeof(cl)))
+			return -EFAULT;
+
+		if (cl.cnum <= 0)
+			return -EINVAL;
+
+		err = hidp_get_connlist(&cl);
+		if (!err && copy_to_user((void *) arg, &cl, sizeof(cl)))
+			return -EFAULT;
+
+		return err;
+
+	case HIDPGETCONNINFO:
+		if (copy_from_user(&ci, (void *) arg, sizeof(ci)))
+			return -EFAULT;
+
+		err = hidp_get_conninfo(&ci);
+		if (!err && copy_to_user((void *) arg, &ci, sizeof(ci)))
+			return -EFAULT;
+
+		return err;
+	}
+
+	return -EINVAL;
+}
+
+static struct proto_ops hidp_sock_ops = {
+	family:		PF_BLUETOOTH,
+	release:	hidp_sock_release,
+	ioctl:		hidp_sock_ioctl,
+	bind:		sock_no_bind,
+	getname:	sock_no_getname,
+	sendmsg:	sock_no_sendmsg,
+	recvmsg:	sock_no_recvmsg,
+	poll:		sock_no_poll,
+	listen:		sock_no_listen,
+	shutdown:	sock_no_shutdown,
+	setsockopt:	sock_no_setsockopt,
+	getsockopt:	sock_no_getsockopt,
+	connect:	sock_no_connect,
+	socketpair:	sock_no_socketpair,
+	accept:		sock_no_accept,
+	mmap:		sock_no_mmap
+};
+
+static int hidp_sock_create(struct socket *sock, int protocol)
+{
+	struct sock *sk;
+
+	BT_DBG("sock %p", sock);
+
+	if (sock->type != SOCK_RAW)
+		return -ESOCKTNOSUPPORT;
+
+	sock->ops = &hidp_sock_ops;
+
+	if (!(sk = sk_alloc(PF_BLUETOOTH, GFP_KERNEL, 1)))
+		return -ENOMEM;
+
+	MOD_INC_USE_COUNT;
+
+	sock->state = SS_UNCONNECTED;
+	sock_init_data(sock, sk);
+
+	sk->destruct = NULL;
+	sk->protocol = protocol;
+
+	return 0;
+}
+
+static struct net_proto_family hidp_sock_family_ops = {
+	family:		PF_BLUETOOTH,
+	create:		hidp_sock_create
+};
+
+int __init hidp_init_sockets(void)
+{
+	int err;
+
+	if ((err = bluez_sock_register(BTPROTO_HIDP, &hidp_sock_family_ops)))
+		BT_ERR("Can't register HIDP socket layer (%d)", err);
+
+	return err;
+}
+
+void __exit hidp_cleanup_sockets(void)
+{
+	int err;
+
+	if ((err = bluez_sock_unregister(BTPROTO_HIDP)))
+		BT_ERR("Can't unregister HIDP socket layer (%d)", err);
+}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/l2cap.c linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/l2cap.c
--- linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/l2cap.c	2004-06-29 11:26:15.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/l2cap.c	2004-09-05 16:04:42.000000000 +0200
@@ -1642,6 +1642,35 @@ static inline int l2cap_disconnect_rsp(s
 	return 0;
 }
 
+static inline int l2cap_information_req(struct l2cap_conn *conn, l2cap_cmd_hdr *cmd, u8 *data)
+{
+	l2cap_info_req *req = (l2cap_info_req *) data;
+	l2cap_info_rsp rsp;
+	u16 type;
+
+	type = __le16_to_cpu(req->type);
+
+	BT_DBG("type 0x%4.4x", type);
+
+	rsp.type   = __cpu_to_le16(type);
+	rsp.result = __cpu_to_le16(L2CAP_IR_NOTSUPP);
+	l2cap_send_rsp(conn, cmd->ident, L2CAP_INFO_RSP, sizeof(rsp), &rsp);
+	return 0;
+}
+
+static inline int l2cap_information_rsp(struct l2cap_conn *conn, l2cap_cmd_hdr *cmd, u8 *data)
+{
+	l2cap_info_rsp *rsp = (l2cap_info_rsp *) data;
+	u16 type, result;
+
+	type   = __le16_to_cpu(rsp->type);
+	result = __le16_to_cpu(rsp->result);
+
+	BT_DBG("type 0x%4.4x result 0x%2.2x", type, result);
+
+	return 0;
+}
+
 static inline void l2cap_sig_channel(struct l2cap_conn *conn, struct sk_buff *skb)
 {
 	__u8 *data = skb->data;
@@ -1649,6 +1678,8 @@ static inline void l2cap_sig_channel(str
 	l2cap_cmd_hdr cmd;
 	int err = 0;
 
+	l2cap_raw_recv(conn, skb);
+
 	while (len >= L2CAP_CMD_HDR_SIZE) {
 		memcpy(&cmd, data, L2CAP_CMD_HDR_SIZE);
 		data += L2CAP_CMD_HDR_SIZE;
@@ -1664,6 +1695,10 @@ static inline void l2cap_sig_channel(str
 		}
 
 		switch (cmd.code) {
+		case L2CAP_COMMAND_REJ:
+			/* FIXME: We should process this */
+			break;
+
 		case L2CAP_CONN_REQ:
 			err = l2cap_connect_req(conn, &cmd, data);
 			break;
@@ -1688,23 +1723,23 @@ static inline void l2cap_sig_channel(str
 			err = l2cap_disconnect_rsp(conn, &cmd, data);
 			break;
 
-		case L2CAP_COMMAND_REJ:
-			/* FIXME: We should process this */
-			l2cap_raw_recv(conn, skb);
-			break;
-
 		case L2CAP_ECHO_REQ:
 			l2cap_send_rsp(conn, cmd.ident, L2CAP_ECHO_RSP, cmd.len, data);
 			break;
 
 		case L2CAP_ECHO_RSP:
+			break;
+
 		case L2CAP_INFO_REQ:
+			err = l2cap_information_req(conn, &cmd, data);
+			break;
+
 		case L2CAP_INFO_RSP:
-			l2cap_raw_recv(conn, skb);
+			err = l2cap_information_rsp(conn, &cmd, data);
 			break;
 
 		default:
-			BT_ERR("Uknown signaling command 0x%2.2x", cmd.code);
+			BT_ERR("Unknown signaling command 0x%2.2x", cmd.code);
 			err = -EINVAL;
 			break;
 		};
@@ -1713,7 +1748,7 @@ static inline void l2cap_sig_channel(str
 			l2cap_cmd_rej rej;
 			BT_DBG("error %d", err);
 
-			/* FIXME: Map err to a valid reason. */
+			/* FIXME: Map err to a valid reason */
 			rej.reason = __cpu_to_le16(0);
 			l2cap_send_rsp(conn, cmd.ident, L2CAP_COMMAND_REJ, L2CAP_CMD_REJ_SIZE, &rej);
 		}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/rfcomm/core.c linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/rfcomm/core.c
--- linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/rfcomm/core.c	2004-06-29 11:26:15.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/rfcomm/core.c	2004-09-05 16:04:42.000000000 +0200
@@ -51,7 +51,7 @@
 #include <net/bluetooth/l2cap.h>
 #include <net/bluetooth/rfcomm.h>
 
-#define VERSION "1.0"
+#define VERSION "1.1"
 
 #ifndef CONFIG_BLUEZ_RFCOMM_DEBUG
 #undef  BT_DBG
@@ -202,7 +202,7 @@ static void rfcomm_dlc_clear_state(struc
 	d->mtu        = RFCOMM_DEFAULT_MTU;
 	d->v24_sig    = RFCOMM_V24_RTC | RFCOMM_V24_RTR | RFCOMM_V24_DV;
 
-	d->credits    = 0;
+	d->cfc        = RFCOMM_CFC_DISABLED;
 	d->rx_credits = RFCOMM_DEFAULT_CREDITS;
 }
 
@@ -309,8 +309,8 @@ static int __rfcomm_dlc_open(struct rfco
 	d->state    = BT_CONFIG;
 	rfcomm_dlc_link(s, d);
 
-	d->mtu     = s->mtu;
-	d->credits = s->credits;
+	d->mtu = s->mtu;
+	d->cfc = (s->cfc == RFCOMM_CFC_UNKNOWN) ? 0 : s->cfc;
 
 	if (s->state == BT_CONNECTED)
 		rfcomm_send_pn(s, 1, d);
@@ -410,7 +410,7 @@ void __rfcomm_dlc_throttle(struct rfcomm
 {
 	BT_DBG("dlc %p state %ld", d, d->state);
 
-	if (!d->credits) {
+	if (!d->cfc) {
 		d->v24_sig |= RFCOMM_V24_FC;
 		set_bit(RFCOMM_MSC_PENDING, &d->flags);
 	}
@@ -421,7 +421,7 @@ void __rfcomm_dlc_unthrottle(struct rfco
 {
 	BT_DBG("dlc %p state %ld", d, d->state);
 
-	if (!d->credits) {
+	if (!d->cfc) {
 		d->v24_sig &= ~RFCOMM_V24_FC;
 		set_bit(RFCOMM_MSC_PENDING, &d->flags);
 	}
@@ -474,8 +474,8 @@ struct rfcomm_session *rfcomm_session_ad
 	s->state = state;
 	s->sock  = sock;
 
-	s->mtu     = RFCOMM_DEFAULT_MTU;
-	s->credits = 0;
+	s->mtu   = RFCOMM_DEFAULT_MTU;
+	s->cfc   = RFCOMM_CFC_UNKNOWN;
 	
 	list_add(&s->list, &session_list);
 
@@ -746,7 +746,7 @@ static int rfcomm_send_pn(struct rfcomm_
 	pn->ack_timer   = 0;
 	pn->max_retrans = 0;
 
-	if (cr || d->credits) {
+	if (s->cfc) {
 		pn->flow_ctrl = cr ? 0xf0 : 0xe0;
 		pn->credits = RFCOMM_DEFAULT_CREDITS;
 	} else {
@@ -1140,29 +1140,17 @@ static int rfcomm_apply_pn(struct rfcomm
 	BT_DBG("dlc %p state %ld dlci %d mtu %d fc 0x%x credits %d", 
 			d, d->state, d->dlci, pn->mtu, pn->flow_ctrl, pn->credits);
 
-	if (cr) {
-		if (pn->flow_ctrl == 0xf0) {
-			s->credits = RFCOMM_MAX_CREDITS;
-			d->credits = s->credits;
-			d->tx_credits = pn->credits;
-		} else {
-			set_bit(RFCOMM_TX_THROTTLED, &d->flags);
-			d->credits = 0;
-		}
+	if (pn->flow_ctrl == 0xf0 || pn->flow_ctrl == 0xe0) {
+		d->cfc = s->cfc = RFCOMM_CFC_ENABLED;
+		d->tx_credits = pn->credits;
 	} else {
-		if (pn->flow_ctrl == 0xe0) {
-			s->credits = RFCOMM_MAX_CREDITS;
-			d->credits = s->credits;
-			d->tx_credits = pn->credits;
-		} else {
-			set_bit(RFCOMM_TX_THROTTLED, &d->flags);
-			d->credits = 0;
-		}
+		d->cfc = s->cfc = RFCOMM_CFC_DISABLED;
+		set_bit(RFCOMM_TX_THROTTLED, &d->flags);
 	}
 
 	d->priority = pn->priority;
 
-	d->mtu = btohs(pn->mtu);
+	d->mtu = s->mtu = btohs(pn->mtu);
 
 	return 0;
 }
@@ -1352,7 +1340,7 @@ static int rfcomm_recv_msc(struct rfcomm
 		return 0;
 
 	if (cr) {
-		if (msc->v24_sig & RFCOMM_V24_FC && !d->credits)
+		if (msc->v24_sig & RFCOMM_V24_FC && !d->cfc)
 			set_bit(RFCOMM_TX_THROTTLED, &d->flags);
 		else
 			clear_bit(RFCOMM_TX_THROTTLED, &d->flags);
@@ -1443,7 +1431,7 @@ static int rfcomm_recv_data(struct rfcom
 		goto drop;
 	}
 
-	if (pf && d->credits) {
+	if (pf && d->cfc) {
 		u8 credits = *(u8 *) skb->data; skb_pull(skb, 1);
 
 		d->tx_credits += credits;
@@ -1548,20 +1536,20 @@ static inline int rfcomm_process_tx(stru
 	struct sk_buff *skb;
 	int err;
 
-	BT_DBG("dlc %p state %ld credits %d rx_credits %d tx_credits %d", 
-			d, d->state, d->credits, d->rx_credits, d->tx_credits);
+	BT_DBG("dlc %p state %ld cfc %d rx_credits %d tx_credits %d", 
+			d, d->state, d->cfc, d->rx_credits, d->tx_credits);
 
 	/* Send pending MSC */
 	if (test_and_clear_bit(RFCOMM_MSC_PENDING, &d->flags))
 		rfcomm_send_msc(d->session, 1, d->dlci, d->v24_sig);
 	
-	if (d->credits) {
+	if (d->cfc) {
 		/* CFC enabled. 
 		 * Give them some credits */
 		if (!test_bit(RFCOMM_RX_THROTTLED, &d->flags) &&
-			       	d->rx_credits <= (d->credits >> 2)) {
-			rfcomm_send_credits(d->session, d->addr, d->credits - d->rx_credits);
-			d->rx_credits = d->credits;
+			       	d->rx_credits <= (d->cfc >> 2)) {
+			rfcomm_send_credits(d->session, d->addr, d->cfc - d->rx_credits);
+			d->rx_credits = d->cfc;
 		}
 	} else {
 		/* CFC disabled. 
@@ -1582,7 +1570,7 @@ static inline int rfcomm_process_tx(stru
 		d->tx_credits--;
 	}
 
-	if (d->credits && !d->tx_credits) {
+	if (d->cfc && !d->tx_credits) {
 		/* We're out of TX credits.
 		 * Set TX_THROTTLED flag to avoid unnesary wakeups by dlc_send. */
 		set_bit(RFCOMM_TX_THROTTLED, &d->flags);
@@ -1666,9 +1654,10 @@ static inline void rfcomm_accept_connect
 	nsock->sk->state_change = rfcomm_l2state_change;
 
 	s = rfcomm_session_add(nsock, BT_OPEN);
-	if (s)
+	if (s) {
 		rfcomm_session_hold(s);
-	else
+		rfcomm_schedule(RFCOMM_SCHED_RX);
+	} else
 		sock_release(nsock);
 }
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/rfcomm/tty.c linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/rfcomm/tty.c
--- linux-2.4.20-wolk4.15-fullkernel/net/bluetooth/rfcomm/tty.c	2004-06-29 11:26:15.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/bluetooth/rfcomm/tty.c	2004-09-05 16:04:42.000000000 +0200
@@ -109,6 +109,13 @@ static inline void rfcomm_dev_hold(struc
 
 static inline void rfcomm_dev_put(struct rfcomm_dev *dev)
 {
+	/* The reason this isn't actually a race, as you no
+	   doubt have a little voice screaming at you in your
+	   head, is that the refcount should never actually
+	   reach zero unless the device has already been taken
+	   off the list, in rfcomm_dev_del(). And if that's not
+	   true, we'll hit the BUG() in rfcomm_dev_destruct()
+	   anyway. */
 	if (atomic_dec_and_test(&dev->refcnt))
 		rfcomm_dev_destruct(dev);
 }
@@ -132,10 +139,13 @@ static inline struct rfcomm_dev *rfcomm_
 	struct rfcomm_dev *dev;
 
 	read_lock(&rfcomm_dev_lock);
+
 	dev = __rfcomm_dev_get(id);
+	if (dev)
+		rfcomm_dev_hold(dev);
+
 	read_unlock(&rfcomm_dev_lock);
 
-	if (dev) rfcomm_dev_hold(dev);
 	return dev;
 }
 
@@ -328,12 +338,14 @@ static int rfcomm_release_dev(unsigned l
 
 	BT_DBG("dev_id %id flags 0x%x", req.dev_id, req.flags);
 
-	if (!capable(CAP_NET_ADMIN))
-		return -EPERM;
-
 	if (!(dev = rfcomm_dev_get(req.dev_id)))
 		return -ENODEV;
 
+	if (dev->flags != NOCAP_FLAGS && !capable(CAP_NET_ADMIN)) {
+		rfcomm_dev_put(dev);
+		return -EPERM;
+	}
+
 	if (req.flags & (1 << RFCOMM_HANGUP_NOW))
 		rfcomm_dlc_close(dev->dlc, 0);
 
@@ -347,7 +359,7 @@ static int rfcomm_get_dev_list(unsigned 
 	struct rfcomm_dev_list_req *dl;
 	struct rfcomm_dev_info *di;
 	struct list_head *p;
-	int n = 0, size;
+	int n = 0, size, err;
 	u16 dev_num;
 
 	BT_DBG("");
@@ -355,14 +367,11 @@ static int rfcomm_get_dev_list(unsigned 
 	if (get_user(dev_num, (u16 *) arg))
 		return -EFAULT;
 
-	if (!dev_num)
+	if (!dev_num || dev_num > (PAGE_SIZE * 4) / sizeof(*di))
 		return -EINVAL;
 
 	size = sizeof(*dl) + dev_num * sizeof(*di);
 
-	if (verify_area(VERIFY_WRITE, (void *)arg, size))
-		return -EFAULT;
-
 	if (!(dl = kmalloc(size, GFP_KERNEL)))
 		return -ENOMEM;
 
@@ -387,9 +396,10 @@ static int rfcomm_get_dev_list(unsigned 
 	dl->dev_num = n;
 	size = sizeof(*dl) + n * sizeof(*di);
 
-	copy_to_user((void *) arg, dl, size);
+	err = copy_to_user((void *) arg, dl, size);
 	kfree(dl);
-	return 0;
+
+	return err ? -EFAULT : 0;
 }
 
 static int rfcomm_get_dev_info(unsigned long arg)
@@ -486,7 +496,8 @@ static void rfcomm_dev_state_change(stru
 				rfcomm_dev_del(dev);
 
 				/* We have to drop DLC lock here, otherwise
-				 * rfcomm_dev_put() will dead lock if it's the last refference */
+				   rfcomm_dev_put() will dead lock if it's
+				   the last reference. */
 				rfcomm_dlc_unlock(dlc);
 				rfcomm_dev_put(dev);
 				rfcomm_dlc_lock(dlc);
@@ -541,6 +552,10 @@ static int rfcomm_tty_open(struct tty_st
 
 	BT_DBG("tty %p id %d", tty, id);
 
+	/* We don't leak this refcount. For reasons which are not entirely
+	   clear, the TTY layer will call our ->close() method even if the
+	   open fails. We decrease the refcount there, and decreasing it
+	   here too would cause breakage. */
 	dev = rfcomm_dev_get(id);
 	if (!dev)
 		return -ENODEV;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/bridge/br_if.c linux-2.4.20-wolk4.16-fullkernel/net/bridge/br_if.c
--- linux-2.4.20-wolk4.15-fullkernel/net/bridge/br_if.c	2004-06-29 11:24:12.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/bridge/br_if.c	2004-09-05 16:06:18.000000000 +0200
@@ -19,6 +19,7 @@
 #include <linux/inetdevice.h>
 #include <linux/rtnetlink.h>
 #include <linux/brlock.h>
+#include <linux/etherdevice.h>
 #include <asm/uaccess.h>
 #include "br_private.h"
 
@@ -44,7 +45,7 @@ static int __br_del_if(struct net_bridge
 	struct net_bridge_port *p;
 	struct net_bridge_port **pptr;
 
-	if ((p = dev->br_port) == NULL)
+	if ((p = dev->br_port) == NULL || p->br != br)
 		return -EINVAL;
 
 	br_stp_disable_port(p);
@@ -232,6 +233,9 @@ int br_add_if(struct net_bridge *br, str
 	if (dev->hard_start_xmit == br_dev_xmit)
 		return -ELOOP;
 
+	if (!is_valid_ether_addr(dev->dev_addr))
+		return -EADDRNOTAVAIL;
+
 	dev_hold(dev);
 	write_lock_bh(&br->lock);
 	if ((p = new_nbp(br, dev)) == NULL) {
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/core/dev.c linux-2.4.20-wolk4.16-fullkernel/net/core/dev.c
--- linux-2.4.20-wolk4.15-fullkernel/net/core/dev.c	2004-06-29 11:31:26.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/core/dev.c	2004-09-05 16:06:32.000000000 +0200
@@ -1582,7 +1582,7 @@ int netif_receive_skb(struct sk_buff *sk
 {
 	struct packet_type *ptype, *pt_prev;
 	int ret = NET_RX_DROP;
-	unsigned short type = skb->protocol;
+	unsigned short type;
 	unsigned short i_ptype;
 
 	if (skb->stamp.tv_sec == 0)
@@ -1643,6 +1643,7 @@ int netif_receive_skb(struct sk_buff *sk
 	}
 #endif
 
+	type = skb->protocol;
 	for (ptype=ptype_base[ntohs(type)&15]; !i_ptype && ptype;ptype=ptype->next) {
 		if (ptype->type == type &&
 		    (!ptype->dev || ptype->dev == skb->dev)) {
@@ -1953,8 +1954,8 @@ static int dev_get_info(char *buffer, ch
 
 
 	size = sprintf(buffer, 
-		"Inter-|   Receive                                                |  Transmit\n"
-		" face |bytes    packets errs drop fifo frame compressed multicast|bytes    packets errs drop fifo colls carrier compressed\n");
+		"Inter-| --------------------------- Receive -------------------------- | ------------------------- Transmit --------------------------\n"
+		" face |bytes          packets errs drop fifo frame compressed multicast|bytes          packets errs drop fifo colls carrier compressed\n");
 	
 	pos += size;
 	len += size;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/core/ethtool.c linux-2.4.20-wolk4.16-fullkernel/net/core/ethtool.c
--- linux-2.4.20-wolk4.15-fullkernel/net/core/ethtool.c	2004-06-29 11:30:47.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/core/ethtool.c	2004-09-05 16:05:07.000000000 +0200
@@ -159,7 +159,7 @@ static int ethtool_get_regs(struct net_d
 	if (copy_to_user(useraddr, &regs, sizeof(regs)))
 		goto out;
 	useraddr += offsetof(struct ethtool_regs, data);
-	if (copy_to_user(useraddr, regbuf, reglen))
+	if (copy_to_user(useraddr, regbuf, regs.len))
 		goto out;
 	ret = 0;
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/core/sock.c linux-2.4.20-wolk4.16-fullkernel/net/core/sock.c
--- linux-2.4.20-wolk4.15-fullkernel/net/core/sock.c	2004-06-29 11:24:14.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/core/sock.c	2004-09-05 16:06:15.000000000 +0200
@@ -507,7 +507,7 @@ int sock_getsockopt(struct socket *sock,
 				v.tm.tv_usec = 0;
 			} else {
 				v.tm.tv_sec = sk->rcvtimeo/HZ;
-				v.tm.tv_usec = ((sk->rcvtimeo%HZ)*1000)/HZ;
+				v.tm.tv_usec = ((sk->rcvtimeo%HZ)*1000000)/HZ;
 			}
 			break;
 
@@ -518,7 +518,7 @@ int sock_getsockopt(struct socket *sock,
 				v.tm.tv_usec = 0;
 			} else {
 				v.tm.tv_sec = sk->sndtimeo/HZ;
-				v.tm.tv_usec = ((sk->sndtimeo%HZ)*1000)/HZ;
+				v.tm.tv_usec = ((sk->sndtimeo%HZ)*1000000)/HZ;
 			}
 			break;
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/decnet/dn_dev.c linux-2.4.20-wolk4.16-fullkernel/net/decnet/dn_dev.c
--- linux-2.4.20-wolk4.15-fullkernel/net/decnet/dn_dev.c	2001-12-21 18:42:05.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/net/decnet/dn_dev.c	2004-09-05 15:45:37.000000000 +0200
@@ -1061,31 +1061,39 @@ int dnet_gifconf(struct net_device *dev,
 {
 	struct dn_dev *dn_db = (struct dn_dev *)dev->dn_ptr;
 	struct dn_ifaddr *ifa;
-	struct ifreq *ifr = (struct ifreq *)buf;
+	char buffer[DN_IFREQ_SIZE];
+	struct ifreq *ifr = (struct ifreq *)buffer;
+	struct sockaddr_dn *addr = (struct sockaddr_dn *)&ifr->ifr_addr;
 	int done = 0;
 
 	if ((dn_db == NULL) || ((ifa = dn_db->ifa_list) == NULL))
 		return 0;
 
 	for(; ifa; ifa = ifa->ifa_next) {
-		if (!ifr) {
+		if (!buf) {
 			done += sizeof(DN_IFREQ_SIZE);
 			continue;
 		}
 		if (len < DN_IFREQ_SIZE)
 			return done;
-		memset(ifr, 0, DN_IFREQ_SIZE);
+		memset(buffer, 0, DN_IFREQ_SIZE);
 
 		if (ifa->ifa_label)
 			strcpy(ifr->ifr_name, ifa->ifa_label);
 		else
 			strcpy(ifr->ifr_name, dev->name);
 
-		(*(struct sockaddr_dn *) &ifr->ifr_addr).sdn_family = AF_DECnet;
-		(*(struct sockaddr_dn *) &ifr->ifr_addr).sdn_add.a_len = 2;
-		(*(dn_address *)(*(struct sockaddr_dn *) &ifr->ifr_addr).sdn_add.a_addr) = ifa->ifa_local;
+		addr->sdn_family = AF_DECnet;
+		addr->sdn_add.a_len = 2;
+		memcpy(addr->sdn_add.a_addr, &ifa->ifa_local,
+			sizeof(dn_address));
+
+		if (copy_to_user(buf, buffer, DN_IFREQ_SIZE)) {
+			done = -EFAULT;
+			break;
+		}
 
-		ifr = (struct ifreq *)((char *)ifr + DN_IFREQ_SIZE);
+		buf  += DN_IFREQ_SIZE;
 		len  -= DN_IFREQ_SIZE;
 		done += DN_IFREQ_SIZE;
 	}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipsec/Makefile.ver linux-2.4.20-wolk4.16-fullkernel/net/ipsec/Makefile.ver
--- linux-2.4.20-wolk4.15-fullkernel/net/ipsec/Makefile.ver	2004-06-29 11:24:06.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/ipsec/Makefile.ver	2004-09-09 17:00:27.000000000 +0200
@@ -1 +1 @@
-IPSECVERSION=1.0.6
+IPSECVERSION=1.0.7
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipsec/defconfig linux-2.4.20-wolk4.16-fullkernel/net/ipsec/defconfig
--- linux-2.4.20-wolk4.15-fullkernel/net/ipsec/defconfig	2004-06-29 11:24:06.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/ipsec/defconfig	1970-01-01 01:00:00.000000000 +0100
@@ -1,132 +0,0 @@
-
-#
-# RCSID $Id: defconfig,v 1.5 2003/07/04 19:07:34 ken Exp $
-#
-
-#
-# FreeS/WAN IPSec implementation, KLIPS kernel config defaults
-#
-
-#
-# First, lets override stuff already set or not in the kernel config.
-#
-# We can't even think about leaving this off...
-CONFIG_INET=y
-
-#
-# This must be on for subnet protection.
-CONFIG_IP_FORWARD=y
-
-# Shut off IPSEC masquerading if it has been enabled, since it will 
-# break the compile.  IPPROTO_ESP and IPPROTO_AH were included in 
-# net/ipv4/ip_masq.c when they should have gone into include/linux/in.h.
-CONFIG_IP_MASQUERADE_IPSEC=n
-
-#
-# Next, lets set the recommended FreeS/WAN configuration.
-#
-
-# To config as static (preferred), 'y'.  To config as module, 'm'.
-CONFIG_IPSEC=m
-
-# To do tunnel mode IPSec, this must be enabled.
-CONFIG_IPSEC_IPIP=y
-
-# To enable authentication, say 'y'.   (Highly recommended)
-CONFIG_IPSEC_AH=y
-
-# Authentication algorithm(s):
-CONFIG_IPSEC_AUTH_HMAC_MD5=y
-CONFIG_IPSEC_AUTH_HMAC_SHA1=y
-
-# To enable encryption, say 'y'.   (Highly recommended)
-CONFIG_IPSEC_ESP=y
-
-# Encryption algorithm(s):
-CONFIG_IPSEC_ENC_3DES=y
-
-# IP Compression: new, probably still has minor bugs.
-CONFIG_IPSEC_IPCOMP=y
-
-# To enable userspace-switchable KLIPS debugging, say 'y'.
-CONFIG_IPSEC_DEBUG=y
-
-# modular algo extensions (and new ALGOs)
-CONFIG_IPSEC_ALG=y
-CONFIG_IPSEC_ALG_AES=m
-CONFIG_IPSEC_ALG_TWOFISH=m
-CONFIG_IPSEC_ALG_SERPENT=m
-
-# NAT Traversal
-CONFIG_IPSEC_NAT_TRAVERSAL=y
-
-# Use CryptoAPI for ALG?
-CONFIG_IPSEC_ALG_CRYPTOAPI=n
-
-# NAT Traversal
-CONFIG_IPSEC_NAT_TRAVERSAL=y
-
-#
-#
-# $Log: defconfig,v $
-# Revision 1.5  2003/07/04 19:07:34  ken
-# Added NAT-T 0.6 diff/patch from Tuomo
-#
-# Revision 1.4  2003/02/21 22:59:21  ken
-# Set default for CONFIG_IPSEC_ALG_CRYPTOAPI=n
-#
-# Revision 1.3  2002/09/05 16:50:58  ken
-# Enabled NAT-T by default
-#
-# Revision 1.2  2002/09/05 03:27:08  ken
-# Applied freeswan-alg-0.8.0-BASE-klips.diff
-#
-# Revision 1.1.1.1  2002/09/05 03:13:17  ken
-# 1.98b
-#
-# Revision 1.20  2002/04/02 04:07:40  mcr
-# 	default build is now 'm'odule for KLIPS
-#
-# Revision 1.19  2002/03/08 18:57:17  rgb
-# Added a blank line at the beginning of the file to make it easier for
-# other projects to patch ./arch/i386/defconfig, for example
-# LIDS+grSecurity requested by Jason Pattie.
-#
-# Revision 1.18  2000/11/30 17:26:56  rgb
-# Cleaned out unused options and enabled ipcomp by default.
-#
-# Revision 1.17  2000/09/15 11:37:01  rgb
-# Merge in heavily modified Svenning Soerensen's <svenning@post5.tele.dk>
-# IPCOMP zlib deflate code.
-#
-# Revision 1.16  2000/09/08 19:12:55  rgb
-# Change references from DEBUG_IPSEC to CONFIG_IPSEC_DEBUG.
-#
-# Revision 1.15  2000/05/24 19:37:13  rgb
-# *** empty log message ***
-#
-# Revision 1.14  2000/05/11 21:14:57  henry
-# just commenting the FOOBAR=y lines out is not enough
-#
-# Revision 1.13  2000/05/10 20:17:58  rgb
-# Comment out netlink defaults, which are no longer needed.
-#
-# Revision 1.12  2000/05/10 19:13:38  rgb
-# Added configure option to shut off no eroute passthrough.
-#
-# Revision 1.11  2000/03/16 07:09:46  rgb
-# Hardcode PF_KEYv2 support.
-# Disable IPSEC_ICMP by default.
-# Remove DES config option from defaults file.
-#
-# Revision 1.10  2000/01/11 03:09:42  rgb
-# Added a default of 'y' to PF_KEYv2 keying I/F.
-#
-# Revision 1.9  1999/05/08 21:23:12  rgb
-# Added support for 2.2.x kernels.
-#
-# Revision 1.8  1999/04/06 04:54:25  rgb
-# Fix/Add RCSID Id: and Log: bits to make PHMDs happy.  This includes
-# patch shell fixes.
-#
-#
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipsec/libopenswan/version.c linux-2.4.20-wolk4.16-fullkernel/net/ipsec/libopenswan/version.c
--- linux-2.4.20-wolk4.15-fullkernel/net/ipsec/libopenswan/version.c	2004-06-29 12:12:14.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/ipsec/libopenswan/version.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,40 +0,0 @@
-/*
- * return IPsec version information
- * Copyright (C) 2001  Henry Spencer.
- * 
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/lgpl.txt>.
- * 
- * This library 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 Library General Public
- * License for more details.
- *
- * RCSID $Id: version.in.c,v 1.2 2003/11/16 23:22:48 ken Exp $
- */
-#include "internal.h"
-#include "openswan.h"
-
-#define	V	"1.0.6"		/* substituted in by Makefile */
-static const char freeswan_number[] = V;
-static const char freeswan_string[] = "Linux FreeS/WAN " V;
-
-/*
- - ipsec_version_code - return IPsec version number/code, as string
- */
-const char *
-ipsec_version_code()
-{
-	return freeswan_number;
-}
-
-/*
- - ipsec_version_string - return full version string
- */
-const char *
-ipsec_version_string()
-{
-	return freeswan_string;
-}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipv4/Config.in linux-2.4.20-wolk4.16-fullkernel/net/ipv4/Config.in
--- linux-2.4.20-wolk4.15-fullkernel/net/ipv4/Config.in	2004-06-29 11:30:53.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/ipv4/Config.in	2004-09-05 17:32:29.000000000 +0200
@@ -24,6 +24,7 @@ if [ "$CONFIG_IP_PNP" = "y" ]; then
 #   bool '    IP: ARP support' CONFIG_IP_PNP_ARP		
 fi
 tristate '  IP: tunneling' CONFIG_NET_IPIP
+tristate '  IP: WCCP tunnels over IP' CONFIG_NET_IPWCCP
 tristate '  IP: GRE tunnels over IP' CONFIG_NET_IPGRE
 if [ "$CONFIG_IP_MULTICAST" = "y" ]; then
    if [ "$CONFIG_NET_IPGRE" != "n" ]; then
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipv4/Makefile linux-2.4.20-wolk4.16-fullkernel/net/ipv4/Makefile
--- linux-2.4.20-wolk4.15-fullkernel/net/ipv4/Makefile	2004-06-29 11:30:53.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/ipv4/Makefile	2004-09-05 17:32:29.000000000 +0200
@@ -9,7 +9,7 @@
 
 O_TARGET := ipv4.o
 
-export-objs = ipip.o ip_gre.o
+export-objs = ipip.o ip_gre.o ip_wccp.o
 
 obj-y     := utils.o route.o inetpeer.o proc.o protocol.o \
 	     ip_input.o ip_fragment.o ip_forward.o ip_options.o \
@@ -23,6 +23,7 @@ obj-$(CONFIG_IP_ROUTE_NAT) += ip_nat_dum
 obj-$(CONFIG_IP_MROUTE) += ipmr.o
 obj-$(CONFIG_NET_IPIP) += ipip.o
 obj-$(CONFIG_NET_IPGRE) += ip_gre.o
+obj-$(CONFIG_NET_IPWCCP) += ip_wccp.o
 obj-$(CONFIG_SYN_COOKIES) += syncookies.o
 obj-$(CONFIG_IP_PNP) += ipconfig.o
 obj-$(CONFIG_RICMP) += ricmp.o
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipv4/arp.c linux-2.4.20-wolk4.16-fullkernel/net/ipv4/arp.c
--- linux-2.4.20-wolk4.15-fullkernel/net/ipv4/arp.c	2004-06-29 11:25:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/ipv4/arp.c	2004-09-05 16:04:12.000000000 +0200
@@ -542,34 +542,26 @@ static inline int arp_fwd_proxy(struct i
  */
 
 /*
- *	Create and send an arp packet. If (dest_hw == NULL), we create a broadcast
+ *	Create an arp packet. If (dest_hw == NULL), we create a broadcast
  *	message.
  */
-
-void arp_send(int type, int ptype, u32 dest_ip, 
-	      struct net_device *dev, u32 src_ip, 
-	      unsigned char *dest_hw, unsigned char *src_hw,
-	      unsigned char *target_hw)
+struct sk_buff *arp_create(int type, int ptype, u32 dest_ip,
+			   struct net_device *dev, u32 src_ip,
+			   unsigned char *dest_hw, unsigned char *src_hw,
+			   unsigned char *target_hw)
 {
 	struct sk_buff *skb;
 	struct arphdr *arp;
 	unsigned char *arp_ptr;
 
 	/*
-	 *	No arp on this interface.
-	 */
-	
-	if (dev->flags&IFF_NOARP)
-		return;
-
-	/*
 	 *	Allocate a buffer
 	 */
 	
 	skb = alloc_skb(sizeof(struct arphdr)+ 2*(dev->addr_len+4)
 				+ dev->hard_header_len + 15, GFP_ATOMIC);
 	if (skb == NULL)
-		return;
+		return NULL;
 
 	skb_reserve(skb, (dev->hard_header_len+15)&~15);
 	skb->nh.raw = skb->data;
@@ -649,12 +641,46 @@ void arp_send(int type, int ptype, u32 d
 	arp_ptr+=dev->addr_len;
 	memcpy(arp_ptr, &dest_ip, 4);
 
-	/* Send it off, maybe filter it using firewalling first.  */
-	NF_HOOK(NF_ARP, NF_ARP_OUT, skb, NULL, dev, dev_queue_xmit);
-	return;
+	return skb;
 
 out:
 	kfree_skb(skb);
+	return NULL;
+}
+
+/*
+ *	Send an arp packet.
+ */
+void arp_xmit(struct sk_buff *skb)
+{
+	/* Send it off, maybe filter it using firewalling first.  */
+	NF_HOOK(NF_ARP, NF_ARP_OUT, skb, NULL, skb->dev, dev_queue_xmit);
+}
+
+/*
+ *	Create and send an arp packet.
+ */
+void arp_send(int type, int ptype, u32 dest_ip, 
+	      struct net_device *dev, u32 src_ip, 
+	      unsigned char *dest_hw, unsigned char *src_hw,
+	      unsigned char *target_hw)
+{
+	struct sk_buff *skb;
+
+	/*
+	 *	No arp on this interface.
+	 */
+	
+	if (dev->flags&IFF_NOARP)
+		return;
+
+	skb = arp_create(type, ptype, dest_ip, dev, src_ip,
+			 dest_hw, src_hw, target_hw);
+	if (skb == NULL) {
+		return;
+	}
+
+	arp_xmit(skb);
 }
 
 static void parp_redo(struct sk_buff *skb)
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipv4/devinet.c linux-2.4.20-wolk4.16-fullkernel/net/ipv4/devinet.c
--- linux-2.4.20-wolk4.15-fullkernel/net/ipv4/devinet.c	2004-06-29 11:25:55.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/ipv4/devinet.c	2004-09-05 16:08:36.000000000 +0200
@@ -714,7 +714,23 @@ int devinet_ioctl(unsigned int cmd, void
 			if (ifa->ifa_mask != sin->sin_addr.s_addr) {
 				inet_del_ifa(in_dev, ifap, 0);
 				ifa->ifa_mask = sin->sin_addr.s_addr;
-				ifa->ifa_prefixlen = inet_mask_len(ifa->ifa_mask);
+				ifa->ifa_prefixlen =
+					inet_mask_len(ifa->ifa_mask);
+
+				/* See if current broadcast address matches
+				 * with current netmask, then recalculate
+				 * the broadcast address. Otherwise it's a
+				 * funny address, so don't touch it since
+				 * the user seems to know what (s)he's doing...
+				 */
+				if ((dev->flags & IFF_BROADCAST) &&
+				    (ifa->ifa_prefixlen < 31) &&
+				    (ifa->ifa_broadcast ==
+				     (ifa->ifa_local|~ifa->ifa_mask))) {
+					ifa->ifa_broadcast =
+						(ifa->ifa_local |
+						 ~sin->sin_addr.s_addr);
+				}
 				inet_insert_ifa(ifa);
 			}
 			break;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipv4/icmp.c linux-2.4.20-wolk4.16-fullkernel/net/ipv4/icmp.c
--- linux-2.4.20-wolk4.15-fullkernel/net/ipv4/icmp.c	2004-06-29 11:31:06.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/ipv4/icmp.c	2004-09-05 16:09:36.000000000 +0200
@@ -149,6 +149,7 @@ struct icmp_err icmp_err_convert[] = {
 };
 
 extern int sysctl_ip_default_ttl;
+extern int sysctl_netdebug;
 
 /* Control parameters for ECHO replies. */
 int sysctl_icmp_echo_ignore_all;
@@ -916,7 +917,8 @@ int icmp_rcv(struct sk_buff *skb)
 	case CHECKSUM_HW:
 		if ((u16)csum_fold(skb->csum) == 0)
 			break;
-		NETDEBUG(if (net_ratelimit()) printk(KERN_DEBUG "icmp v4 hw csum failure\n"));
+		if (sysctl_netdebug)
+			NETDEBUG(if (net_ratelimit()) printk(KERN_DEBUG "ICMP: hw icmp v4 csum failed.\n"));
 	case CHECKSUM_NONE:
 		if ((u16)csum_fold(skb_checksum(skb, 0, skb->len, 0)))
 			goto error;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipv4/igmp.c linux-2.4.20-wolk4.16-fullkernel/net/ipv4/igmp.c
--- linux-2.4.20-wolk4.15-fullkernel/net/ipv4/igmp.c	2002-11-29 00:53:15.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/net/ipv4/igmp.c	2004-09-05 16:09:36.000000000 +0200
@@ -98,6 +98,7 @@
 #include <linux/mroute.h>
 #endif
 
+extern int sysctl_netdebug;
 
 #define IP_MAX_MEMBERSHIPS 20
 
@@ -390,7 +391,8 @@ int igmp_rcv(struct sk_buff *skb)
 	case IGMP_MTRACE_RESP:
 		break;
 	default:
-		NETDEBUG(printk(KERN_DEBUG "New IGMP type=%d, why we do not know about it?\n", ih->type));
+		if (sysctl_netdebug)
+			NETDEBUG(printk(KERN_DEBUG "IGMP: New IGMP type=%d, why we do not know about it?\n", ih->type));
 	}
 	in_dev_put(in_dev);
 	kfree_skb(skb);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipv4/ip_fragment.c linux-2.4.20-wolk4.16-fullkernel/net/ipv4/ip_fragment.c
--- linux-2.4.20-wolk4.15-fullkernel/net/ipv4/ip_fragment.c	2004-06-29 11:24:09.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/ipv4/ip_fragment.c	2004-09-05 16:09:36.000000000 +0200
@@ -55,6 +55,9 @@
 int sysctl_ipfrag_high_thresh = 256*1024;
 int sysctl_ipfrag_low_thresh = 192*1024;
 
+/* From tcp_ipv4.c */
+extern int sysctl_netdebug;
+
 /* Important NOTE! Fragment queue must be destroyed before MSL expires.
  * RFC791 is wrong proposing to prolongate timer each fragment arrival by TTL.
  */
@@ -126,7 +129,7 @@ static unsigned int ipqhashfn(u16 id, u3
 }
 
 static struct timer_list ipfrag_secret_timer;
-int sysctl_ipfrag_secret_interval = 10 * 60 * HZ;
+int sysctl_ipfrag_secret_interval = 10 * 30 * HZ;
 
 static void ipfrag_secret_rebuild(unsigned long dummy)
 {
@@ -168,14 +171,18 @@ static void ipfrag_secret_rebuild(unsign
 atomic_t ip_frag_mem = ATOMIC_INIT(0);	/* Memory used for fragments */
 
 /* Memory Tracking Functions. */
-static __inline__ void frag_kfree_skb(struct sk_buff *skb)
+static __inline__ void frag_kfree_skb(struct sk_buff *skb, int *work)
 {
+	if (work)
+		*work -= skb->truesize;
 	atomic_sub(skb->truesize, &ip_frag_mem);
 	kfree_skb(skb);
 }
 
-static __inline__ void frag_free_queue(struct ipq *qp)
+static __inline__ void frag_free_queue(struct ipq *qp, int *work)
 {
+	if (work)
+		*work -= sizeof(struct ipq);
 	atomic_sub(sizeof(struct ipq), &ip_frag_mem);
 	kfree(qp);
 }
@@ -194,7 +201,7 @@ static __inline__ struct ipq *frag_alloc
 /* Destruction primitives. */
 
 /* Complete destruction of ipq. */
-static void ip_frag_destroy(struct ipq *qp)
+static void ip_frag_destroy(struct ipq *qp, int *work)
 {
 	struct sk_buff *fp;
 
@@ -206,18 +213,18 @@ static void ip_frag_destroy(struct ipq *
 	while (fp) {
 		struct sk_buff *xp = fp->next;
 
-		frag_kfree_skb(fp);
+		frag_kfree_skb(fp, work);
 		fp = xp;
 	}
 
 	/* Finally, release the queue descriptor itself. */
-	frag_free_queue(qp);
+	frag_free_queue(qp, work);
 }
 
-static __inline__ void ipq_put(struct ipq *ipq)
+static __inline__ void ipq_put(struct ipq *ipq, int *work)
 {
 	if (atomic_dec_and_test(&ipq->refcnt))
-		ip_frag_destroy(ipq);
+		ip_frag_destroy(ipq, work);
 }
 
 /* Kill ipq entry. It is not destroyed immediately,
@@ -236,16 +243,19 @@ static __inline__ void ipq_kill(struct i
 }
 
 /* Memory limiting on fragments.  Evictor trashes the oldest 
- * fragment queue until we are back under the low threshold.
+ * fragment queue until we are back under the threshold.
  */
-static void ip_evictor(void)
+static void __ip_evictor(int threshold)
 {
 	struct ipq *qp;
 	struct list_head *tmp;
+	int work;
 
-	for(;;) {
-		if (atomic_read(&ip_frag_mem) <= sysctl_ipfrag_low_thresh)
-			return;
+	work = atomic_read(&ip_frag_mem) - threshold;
+	if (work <= 0)
+		return;
+
+	while (work > 0) {
 		read_lock(&ipfrag_lock);
 		if (list_empty(&ipq_lru_list)) {
 			read_unlock(&ipfrag_lock);
@@ -261,11 +271,16 @@ static void ip_evictor(void)
 			ipq_kill(qp);
 		spin_unlock(&qp->lock);
 
-		ipq_put(qp);
+		ipq_put(qp, &work);
 		IP_INC_STATS_BH(IpReasmFails);
 	}
 }
 
+static inline void ip_evictor(void)
+{
+	__ip_evictor(sysctl_ipfrag_low_thresh);
+}
+
 /*
  * Oops, a fragment queue timed out.  Kill it and send an ICMP reply.
  */
@@ -293,7 +308,7 @@ static void ip_expire(unsigned long arg)
 	}
 out:
 	spin_unlock(&qp->lock);
-	ipq_put(qp);
+	ipq_put(qp, NULL);
 }
 
 /* Creation primitives. */
@@ -316,7 +331,7 @@ static struct ipq *ip_frag_intern(unsign
 			atomic_inc(&qp->refcnt);
 			write_unlock(&ipfrag_lock);
 			qp_in->last_in |= COMPLETE;
-			ipq_put(qp_in);
+			ipq_put(qp_in, NULL);
 			return qp;
 		}
 	}
@@ -366,7 +381,8 @@ static struct ipq *ip_frag_create(unsign
 	return ip_frag_intern(hash, qp);
 
 out_nomem:
-	NETDEBUG(if (net_ratelimit()) printk(KERN_ERR "ip_frag_create: no memory left !\n"));
+	if (sysctl_netdebug)
+		NETDEBUG(if (net_ratelimit()) printk(KERN_ERR "IP: ip_frag_create: no memory left !\n"));
 	return NULL;
 }
 
@@ -505,7 +521,7 @@ static void ip_frag_queue(struct ipq *qp
 				qp->fragments = next;
 
 			qp->meat -= free_it->len;
-			frag_kfree_skb(free_it);
+			frag_kfree_skb(free_it, NULL);
 		}
 	}
 
@@ -613,10 +629,9 @@ static struct sk_buff *ip_frag_reasm(str
 	return head;
 
 out_nomem:
- 	NETDEBUG(if (net_ratelimit())
-	         printk(KERN_ERR 
-			"IP: queue_glue: no memory for gluing queue %p\n",
-			qp));
+	if (sysctl_netdebug)
+ 		NETDEBUG(if (net_ratelimit())
+			printk(KERN_ERR "IP: queue_glue: no memory for gluing queue %p\n", qp));
 	goto out_fail;
 out_oversize:
 	if (net_ratelimit())
@@ -656,7 +671,7 @@ struct sk_buff *ip_defrag(struct sk_buff
 			ret = ip_frag_reasm(qp, dev);
 
 		spin_unlock(&qp->lock);
-		ipq_put(qp);
+		ipq_put(qp, NULL);
 		return ret;
 	}
 
@@ -675,3 +690,8 @@ void ipfrag_init(void)
 	ipfrag_secret_timer.expires = jiffies + sysctl_ipfrag_secret_interval;
 	add_timer(&ipfrag_secret_timer);
 }
+
+void ipfrag_flush(void)
+{
+	__ip_evictor(0);
+}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipv4/ip_output.c linux-2.4.20-wolk4.16-fullkernel/net/ipv4/ip_output.c
--- linux-2.4.20-wolk4.15-fullkernel/net/ipv4/ip_output.c	2004-06-29 11:25:27.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/ipv4/ip_output.c	2004-09-05 16:09:36.000000000 +0200
@@ -325,11 +325,11 @@ fragment:
 		/* Reject packet ONLY if TCP might fragment
 		 * it itself, if were careful enough.
 		 */
-		NETDEBUG(printk(KERN_DEBUG "sending pkt_too_big (len[%u] pmtu[%u]) to self\n",
+		if (sysctl_netdebug)
+			NETDEBUG(printk(KERN_DEBUG "IP: sending pkt_too_big (len[%u] pmtu[%u]) to self\n",
 				skb->len, rt->u.dst.pmtu));
 
-		icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED,
-			  htonl(rt->u.dst.pmtu));
+		icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED, htonl(rt->u.dst.pmtu));
 		kfree_skb(skb);
 		return -EMSGSIZE;
 	}
@@ -813,7 +813,8 @@ int ip_fragment(struct sk_buff *skb, int
 		 */
 
 		if ((skb2 = alloc_skb(len+hlen+dev->hard_header_len+15,GFP_ATOMIC)) == NULL) {
-			NETDEBUG(printk(KERN_INFO "IP: frag: no memory for new fragment!\n"));
+			if (sysctl_netdebug)
+				NETDEBUG(printk(KERN_INFO "IP: frag: no memory for new fragment!\n"));
 			err = -ENOMEM;
 			goto fail;
 		}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipv4/ip_wccp.c linux-2.4.20-wolk4.16-fullkernel/net/ipv4/ip_wccp.c
--- linux-2.4.20-wolk4.15-fullkernel/net/ipv4/ip_wccp.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/net/ipv4/ip_wccp.c	2004-09-05 17:32:29.000000000 +0200
@@ -0,0 +1,167 @@
+/*
+ *      $Id: ip_wccp.c,v 1.6 2004/08/19 12:49:50 hno Exp $
+ *
+ * Maintainer:
+ *		Henrik Nordstrom <hno@squid-cache.org>
+ *
+ * Change log:
+ *   2004-08-19 SONE Naoto
+ *		Updated to support Linux 2.6.8
+ *
+ *   2004-02-17 Henrik Nordstrom <hno@squid-cache.org>
+ *		Updated to linux-2.6.0
+ *		WCCPv2 support
+ *
+ *   2003-10-20 Henrik Nordstrom <hno@squid-cache.org>
+ *   		Dropped support for old kernels. Linux-2.4 or later required
+ *   		Play well with Netfilter
+ *
+ *   2002-04-16 francis a. vidal <francisv@dagupan.com>
+ *		Module license tag
+ *
+ *   2002-04-13 Henrik Nordstrom <hno@squid-cache.org>
+ *   		Updated to Linux-2.4
+ *		- there no longer is a len argument to ip_wccp_recv
+ *		- deal with fragmented skb packets
+ *		- incremental checksumming to allow detection of corrupted
+ *		  packets
+ *
+ *   1999-09-30 Glenn Chisholm <glenn@ircache.net>
+ *              Original release
+ */
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/sched.h>
+#include <linux/kernel.h>
+#include <linux/skbuff.h>
+#include <linux/netdevice.h>
+#include <linux/in.h>
+#include <linux/if_arp.h>
+#include <linux/init.h>
+#include <linux/inetdevice.h>
+#include <linux/version.h>
+#include <net/checksum.h>
+#include <net/protocol.h>
+#include <linux/netfilter_ipv4.h>
+#include <net/ip.h>
+#include <net/inet_ecn.h>
+
+#define WCCP_PROTOCOL_TYPE 	0x883E
+#define WCCP_GRE_LEN		sizeof(u32)
+#define WCCP2_GRE_EXTRA		sizeof(u32)
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,9)
+/* New License scheme */
+#ifdef MODULE_LICENSE
+MODULE_AUTHOR("Glenn Chisholm");
+MODULE_DESCRIPTION("WCCP module");
+MODULE_LICENSE("GPL");
+#endif
+#endif
+
+static inline void ip_wccp_ecn_decapsulate(struct iphdr *outer_iph, struct sk_buff *skb)
+{
+	struct iphdr *inner_iph = skb->nh.iph;
+
+	if (INET_ECN_is_ce(outer_iph->tos) &&
+	    INET_ECN_is_not_ce(inner_iph->tos))
+		IP_ECN_set_ce(inner_iph);
+}
+
+
+int ip_wccp_rcv(struct sk_buff *skb)
+{
+	u32  *gre_hdr;
+	struct iphdr *iph;
+
+	if (!pskb_may_pull(skb, 16))
+		goto drop;
+
+	iph = skb->nh.iph;
+	gre_hdr = (u32 *)skb->h.raw;
+	if(*gre_hdr != __constant_htonl(WCCP_PROTOCOL_TYPE)) 
+		goto drop;
+
+	skb->mac.raw = skb->nh.raw;
+
+	/* WCCP2 puts an extra 4 octets into the header, but uses the same
+	 * encapsulation type; if it looks as if the first octet of the packet
+	 * isn't the beginning of an IPv4 header, assume it's WCCP2.
+	 * This should be safe as these bits are reserved in the WCCPv2 header
+	 * and always zero in WCCPv2.
+	 */
+	if ((skb->h.raw[WCCP_GRE_LEN] & 0xF0) != 0x40) {
+		skb->nh.raw = pskb_pull(skb, WCCP_GRE_LEN + WCCP2_GRE_EXTRA);
+	} else { 
+		skb->nh.raw = pskb_pull(skb, WCCP_GRE_LEN);
+	}
+	if (skb->len <= 0) 
+		goto drop;
+
+	memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options));
+	skb->protocol = __constant_htons(ETH_P_IP);
+	skb->pkt_type = PACKET_HOST;
+
+	dst_release(skb->dst);
+	skb->dst = NULL;
+#ifdef CONFIG_NETFILTER
+	nf_conntrack_put(skb->nfct);
+	skb->nfct = NULL;
+#ifdef CONFIG_NETFILTER_DEBUG
+	skb->nf_debug = 0;
+#endif
+#endif
+	ip_wccp_ecn_decapsulate(iph, skb);
+	netif_rx(skb);
+	return(0);
+
+drop:
+	kfree_skb(skb);
+	return(0);
+}
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,8)
+static struct net_protocol ipwccp_protocol = {
+#else
+static struct inet_protocol ipwccp_protocol = {
+#endif
+    .handler	= ip_wccp_rcv
+};
+static inline void wccp_add_protocol(void) { inet_add_protocol(&ipwccp_protocol, IPPROTO_GRE); }
+static inline int wccp_del_protocol(void) { return inet_del_protocol(&ipwccp_protocol, IPPROTO_GRE); }
+#else
+static struct inet_protocol ipwccp_protocol = {
+  ip_wccp_rcv,     
+  NULL,           
+  0,            
+  IPPROTO_GRE, 
+  0,          
+  NULL,      
+  "GRE"     
+};
+static inline void wccp_add_protocol(void) { inet_add_protocol(&ipwccp_protocol); }
+static inline int wccp_del_protocol(void) { return inet_del_protocol(&ipwccp_protocol); }
+#endif
+
+int __init ip_wccp_init(void)
+{
+	printk(KERN_INFO "WCCP IPv4/GRE driver\n");
+	wccp_add_protocol();
+	return 0;
+}
+
+static void __exit ip_wccp_fini(void)
+{
+	if (wccp_del_protocol() < 0)
+		printk(KERN_INFO "ip_wccp: can't remove protocol\n");
+	else
+		printk(KERN_INFO "WCCP IPv4/GRE driver unloaded\n");
+}
+
+#ifdef MODULE
+module_init(ip_wccp_init);
+#endif
+module_exit(ip_wccp_fini);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipv4/netfilter/arp_tables.c linux-2.4.20-wolk4.16-fullkernel/net/ipv4/netfilter/arp_tables.c
--- linux-2.4.20-wolk4.15-fullkernel/net/ipv4/netfilter/arp_tables.c	2004-06-29 11:25:29.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/ipv4/netfilter/arp_tables.c	2004-09-05 15:59:18.000000000 +0200
@@ -101,7 +101,7 @@ static inline int arp_packet_match(const
 {
 	char *arpptr = (char *)(arphdr + 1);
 	char *src_devaddr, *tgt_devaddr;
-	u32 *src_ipaddr, *tgt_ipaddr;
+	u32 src_ipaddr, tgt_ipaddr;
 	int i, ret;
 
 #define FWINV(bool,invflg) ((bool) ^ !!(arpinfo->invflags & invflg))
@@ -140,11 +140,11 @@ static inline int arp_packet_match(const
 
 	src_devaddr = arpptr;
 	arpptr += dev->addr_len;
-	src_ipaddr = (u32 *) arpptr;
+	memcpy(&src_ipaddr, arpptr, sizeof(u32));
 	arpptr += sizeof(u32);
 	tgt_devaddr = arpptr;
 	arpptr += dev->addr_len;
-	tgt_ipaddr = (u32 *) arpptr;
+	memcpy(&tgt_ipaddr, arpptr, sizeof(u32));
 
 	if (FWINV(arp_devaddr_compare(&arpinfo->src_devaddr, src_devaddr, dev->addr_len),
 		  ARPT_INV_SRCDEVADDR) ||
@@ -155,19 +155,19 @@ static inline int arp_packet_match(const
 		return 0;
 	}
 
-	if (FWINV(((*src_ipaddr) & arpinfo->smsk.s_addr) != arpinfo->src.s_addr,
+	if (FWINV(((src_ipaddr) & arpinfo->smsk.s_addr) != arpinfo->src.s_addr,
 		  ARPT_INV_SRCIP) ||
-	    FWINV((((*tgt_ipaddr) & arpinfo->tmsk.s_addr) != arpinfo->tgt.s_addr),
+	    FWINV((((tgt_ipaddr) & arpinfo->tmsk.s_addr) != arpinfo->tgt.s_addr),
 		  ARPT_INV_TGTIP)) {
 		dprintf("Source or target IP address mismatch.\n");
 
 		dprintf("SRC: %u.%u.%u.%u. Mask: %u.%u.%u.%u. Target: %u.%u.%u.%u.%s\n",
-			NIPQUAD(*src_ipaddr),
+			NIPQUAD(src_ipaddr),
 			NIPQUAD(arpinfo->smsk.s_addr),
 			NIPQUAD(arpinfo->src.s_addr),
 			arpinfo->invflags & ARPT_INV_SRCIP ? " (INV)" : "");
 		dprintf("TGT: %u.%u.%u.%u Mask: %u.%u.%u.%u Target: %u.%u.%u.%u.%s\n",
-			NIPQUAD(*tgt_ipaddr),
+			NIPQUAD(tgt_ipaddr),
 			NIPQUAD(arpinfo->tmsk.s_addr),
 			NIPQUAD(arpinfo->tgt.s_addr),
 			arpinfo->invflags & ARPT_INV_TGTIP ? " (INV)" : "");
@@ -188,7 +188,10 @@ static inline int arp_packet_match(const
 	}
 
 	for (i = 0, ret = 0; i < IFNAMSIZ/sizeof(unsigned long); i++) {
-		ret |= (((const unsigned long *)outdev)[i]
+		unsigned long odev;
+		memcpy(&odev, outdev + i*sizeof(unsigned long),
+		       sizeof(unsigned long));
+		ret |= (odev
 			^ ((const unsigned long *)arpinfo->outiface)[i])
 			& ((const unsigned long *)arpinfo->outiface_mask)[i];
 	}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipv4/netfilter/ip_conntrack_core.c linux-2.4.20-wolk4.16-fullkernel/net/ipv4/netfilter/ip_conntrack_core.c
--- linux-2.4.20-wolk4.15-fullkernel/net/ipv4/netfilter/ip_conntrack_core.c	2004-06-29 11:25:34.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/ipv4/netfilter/ip_conntrack_core.c	2004-09-05 16:00:30.000000000 +0200
@@ -1185,6 +1185,8 @@ void ip_ct_refresh(struct ip_conntrack *
 	WRITE_UNLOCK(&ip_conntrack_lock);
 }
 
+int ip_ct_no_defrag;
+
 /* Returns new sk_buff, or NULL */
 struct sk_buff *
 ip_ct_gather_frags(struct sk_buff *skb)
@@ -1193,6 +1195,12 @@ ip_ct_gather_frags(struct sk_buff *skb)
 #ifdef CONFIG_NETFILTER_DEBUG
 	unsigned int olddebug = skb->nf_debug;
 #endif
+
+	if (unlikely(ip_ct_no_defrag)) {
+		kfree_skb(skb);
+		return NULL;
+	}
+
 	if (sk) {
 		sock_hold(sk);
 		skb_orphan(skb);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipv4/netfilter/ip_conntrack_ftp.c linux-2.4.20-wolk4.16-fullkernel/net/ipv4/netfilter/ip_conntrack_ftp.c
--- linux-2.4.20-wolk4.15-fullkernel/net/ipv4/netfilter/ip_conntrack_ftp.c	2004-06-29 11:25:27.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/ipv4/netfilter/ip_conntrack_ftp.c	2004-09-05 15:59:18.000000000 +0200
@@ -11,7 +11,7 @@
 #include <linux/netfilter_ipv4/ip_conntrack_helper.h>
 #include <linux/netfilter_ipv4/ip_conntrack_ftp.h>
 
-DECLARE_LOCK(ip_ftp_lock);
+static DECLARE_LOCK(ip_ftp_lock);
 struct module *ip_conntrack_ftp = THIS_MODULE;
 
 #define MAX_PORTS 8
@@ -338,7 +338,6 @@ static int help(const struct iphdr *iph,
 	memset(&expect, 0, sizeof(expect));
 
 	/* Update the ftp info */
-	LOCK_BH(&ip_ftp_lock);
 	if (htonl((array[0] << 24) | (array[1] << 16) | (array[2] << 8) | array[3])
 	    == ct->tuplehash[dir].tuple.src.ip) {
 		exp->seq = ntohl(tcph->seq) + matchoff;
@@ -358,7 +357,8 @@ static int help(const struct iphdr *iph,
 		   <lincoln@cesar.org.br> for reporting this potential
 		   problem (DMZ machines opening holes to internal
 		   networks, or the packet filter itself). */
-		if (!loose) goto out;
+		if (!loose)
+			return NF_ACCEPT;
 	}
 
 	exp->tuple = ((struct ip_conntrack_tuple)
@@ -376,9 +376,6 @@ static int help(const struct iphdr *iph,
 
 	/* Ignore failure; should only happen with NAT */
 	ip_conntrack_expect_related(ct, &expect);
- out:
-	UNLOCK_BH(&ip_ftp_lock);
-
 	return NF_ACCEPT;
 }
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipv4/netfilter/ip_conntrack_irc.c linux-2.4.20-wolk4.16-fullkernel/net/ipv4/netfilter/ip_conntrack_irc.c
--- linux-2.4.20-wolk4.15-fullkernel/net/ipv4/netfilter/ip_conntrack_irc.c	2004-06-29 11:25:28.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/ipv4/netfilter/ip_conntrack_irc.c	2004-09-05 15:59:18.000000000 +0200
@@ -29,7 +29,6 @@
 #include <net/checksum.h>
 #include <net/tcp.h>
 
-#include <linux/netfilter_ipv4/lockhelp.h>
 #include <linux/netfilter_ipv4/ip_conntrack_helper.h>
 #include <linux/netfilter_ipv4/ip_conntrack_irc.h>
 
@@ -61,7 +60,6 @@ struct dccproto dccprotos[NUM_DCCPROTO] 
 };
 #define MINMATCHLEN	5
 
-DECLARE_LOCK(ip_irc_lock);
 struct module *ip_conntrack_irc = THIS_MODULE;
 
 #if 0
@@ -208,8 +206,6 @@ static int help(const struct iphdr *iph,
 			
 			memset(&expect, 0, sizeof(expect));
 
-			LOCK_BH(&ip_irc_lock);
-
 			/* save position of address in dcc string,
 			 * neccessary for NAT */
 			DEBUGP("tcph->seq = %u\n", tcph->seq);
@@ -236,8 +232,6 @@ static int help(const struct iphdr *iph,
 				ntohs(exp->tuple.dst.u.tcp.port));
 
 			ip_conntrack_expect_related(ct, &expect);
-			UNLOCK_BH(&ip_irc_lock);
-
 			return NF_ACCEPT;
 		} /* for .. NUM_DCCPROTO */
 	} /* while data < ... */
@@ -315,7 +309,5 @@ static void fini(void)
 	}
 }
 
-EXPORT_SYMBOL(ip_irc_lock);
-
 module_init(init);
 module_exit(fini);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipv4/netfilter/ip_conntrack_standalone.c linux-2.4.20-wolk4.16-fullkernel/net/ipv4/netfilter/ip_conntrack_standalone.c
--- linux-2.4.20-wolk4.15-fullkernel/net/ipv4/netfilter/ip_conntrack_standalone.c	2004-06-29 11:25:36.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/ipv4/netfilter/ip_conntrack_standalone.c	2004-09-05 16:00:32.000000000 +0200
@@ -396,6 +396,13 @@ static int init_or_cleanup(int init)
  cleanup_inandlocalops:
 	nf_unregister_hook(&ip_conntrack_local_out_ops);
  cleanup_inops:
+	/* Frag queues may hold fragments with skb->dst == NULL */
+	ip_ct_no_defrag = 1;
+	local_bh_disable();
+	br_write_lock(BR_NETPROTO_LOCK);
+	br_write_unlock(BR_NETPROTO_LOCK);
+	ipfrag_flush();
+	local_bh_enable();
 	nf_unregister_hook(&ip_conntrack_in_ops);
  cleanup_proc:
 	proc_net_remove("ip_conntrack");
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipv4/netfilter/ip_nat_ftp.c linux-2.4.20-wolk4.16-fullkernel/net/ipv4/netfilter/ip_nat_ftp.c
--- linux-2.4.20-wolk4.15-fullkernel/net/ipv4/netfilter/ip_nat_ftp.c	2004-06-29 11:25:27.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/ipv4/netfilter/ip_nat_ftp.c	2004-09-05 15:59:18.000000000 +0200
@@ -24,8 +24,6 @@ static int ports_c = 0;
 MODULE_PARM(ports, "1-" __MODULE_STRING(MAX_PORTS) "i");
 #endif
 
-DECLARE_LOCK_EXTERN(ip_ftp_lock);
-
 /* FIXME: Time out? --RR */
 
 static unsigned int
@@ -48,8 +46,6 @@ ftp_nat_expected(struct sk_buff **pskb,
 	DEBUGP("nat_expected: We have a connection!\n");
 	exp_ftp_info = &ct->master->help.exp_ftp_info;
 
-	LOCK_BH(&ip_ftp_lock);
-
 	if (exp_ftp_info->ftptype == IP_CT_FTP_PORT
 	    || exp_ftp_info->ftptype == IP_CT_FTP_EPRT) {
 		/* PORT command: make connection go to the client. */
@@ -64,7 +60,6 @@ ftp_nat_expected(struct sk_buff **pskb,
 		DEBUGP("nat_expected: PASV cmd. %u.%u.%u.%u->%u.%u.%u.%u\n",
 		       NIPQUAD(newsrcip), NIPQUAD(newdstip));
 	}
-	UNLOCK_BH(&ip_ftp_lock);
 
 	if (HOOK2MANIP(hooknum) == IP_NAT_MANIP_SRC)
 		newip = newsrcip;
@@ -100,8 +95,6 @@ mangle_rfc959_packet(struct sk_buff **ps
 {
 	char buffer[sizeof("nnn,nnn,nnn,nnn,nnn,nnn")];
 
-	MUST_BE_LOCKED(&ip_ftp_lock);
-
 	sprintf(buffer, "%u,%u,%u,%u,%u,%u",
 		NIPQUAD(newip), port>>8, port&0xFF);
 
@@ -123,8 +116,6 @@ mangle_eprt_packet(struct sk_buff **pskb
 {
 	char buffer[sizeof("|1|255.255.255.255|65535|")];
 
-	MUST_BE_LOCKED(&ip_ftp_lock);
-
 	sprintf(buffer, "|1|%u.%u.%u.%u|%u|", NIPQUAD(newip), port);
 
 	DEBUGP("calling ip_nat_mangle_tcp_packet\n");
@@ -145,8 +136,6 @@ mangle_epsv_packet(struct sk_buff **pskb
 {
 	char buffer[sizeof("|||65535|")];
 
-	MUST_BE_LOCKED(&ip_ftp_lock);
-
 	sprintf(buffer, "|||%u|", port);
 
 	DEBUGP("calling ip_nat_mangle_tcp_packet\n");
@@ -166,7 +155,7 @@ static int (*mangle[])(struct sk_buff **
     [IP_CT_FTP_EPSV] mangle_epsv_packet
 };
 
-static int ftp_data_fixup(const struct ip_ct_ftp_expect *ct_ftp_info,
+static int ftp_data_fixup(const struct ip_ct_ftp_expect *exp_ftp_info,
 			  struct ip_conntrack *ct,
 			  struct sk_buff **pskb,
 			  enum ip_conntrack_info ctinfo,
@@ -178,15 +167,14 @@ static int ftp_data_fixup(const struct i
 	u_int16_t port;
 	struct ip_conntrack_tuple newtuple;
 
-	MUST_BE_LOCKED(&ip_ftp_lock);
 	DEBUGP("FTP_NAT: seq %u + %u in %u\n",
-	       expect->seq, ct_ftp_info->len,
+	       expect->seq, exp_ftp_info->len,
 	       ntohl(tcph->seq));
 
 	/* Change address inside packet to match way we're mapping
 	   this connection. */
-	if (ct_ftp_info->ftptype == IP_CT_FTP_PASV
-	    || ct_ftp_info->ftptype == IP_CT_FTP_EPSV) {
+	if (exp_ftp_info->ftptype == IP_CT_FTP_PASV
+	    || exp_ftp_info->ftptype == IP_CT_FTP_EPSV) {
 		/* PASV/EPSV response: must be where client thinks server
 		   is */
 		newip = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.ip;
@@ -208,7 +196,7 @@ static int ftp_data_fixup(const struct i
 	newtuple.src.u.tcp.port = expect->tuple.src.u.tcp.port;
 
 	/* Try to get same port: if not, try to change it. */
-	for (port = ct_ftp_info->port; port != 0; port++) {
+	for (port = exp_ftp_info->port; port != 0; port++) {
 		newtuple.dst.u.tcp.port = htons(port);
 
 		if (ip_conntrack_change_expect(expect, &newtuple) == 0)
@@ -217,9 +205,9 @@ static int ftp_data_fixup(const struct i
 	if (port == 0)
 		return 0;
 
-	if (!mangle[ct_ftp_info->ftptype](pskb, newip, port,
+	if (!mangle[exp_ftp_info->ftptype](pskb, newip, port,
 					  expect->seq - ntohl(tcph->seq),
-					  ct_ftp_info->len, ct, ctinfo))
+					  exp_ftp_info->len, ct, ctinfo))
 		return 0;
 
 	return 1;
@@ -236,12 +224,12 @@ static unsigned int help(struct ip_connt
 	struct tcphdr *tcph = (void *)iph + iph->ihl*4;
 	unsigned int datalen;
 	int dir;
-	struct ip_ct_ftp_expect *ct_ftp_info;
+	struct ip_ct_ftp_expect *exp_ftp_info;
 
 	if (!exp)
 		DEBUGP("ip_nat_ftp: no exp!!");
 
-	ct_ftp_info = &exp->help.exp_ftp_info;
+	exp_ftp_info = &exp->help.exp_ftp_info;
 
 	/* Only mangle things once: original direction in POST_ROUTING
 	   and reply direction on PRE_ROUTING. */
@@ -257,29 +245,23 @@ static unsigned int help(struct ip_connt
 	}
 
 	datalen = (*pskb)->len - iph->ihl * 4 - tcph->doff * 4;
-	LOCK_BH(&ip_ftp_lock);
 	/* If it's in the right range... */
-	if (between(exp->seq + ct_ftp_info->len,
+	if (between(exp->seq + exp_ftp_info->len,
 		    ntohl(tcph->seq),
 		    ntohl(tcph->seq) + datalen)) {
-		if (!ftp_data_fixup(ct_ftp_info, ct, pskb, ctinfo, exp)) {
-			UNLOCK_BH(&ip_ftp_lock);
+		if (!ftp_data_fixup(exp_ftp_info, ct, pskb, ctinfo, exp))
 			return NF_DROP;
-		}
 	} else {
 		/* Half a match?  This means a partial retransmisison.
 		   It's a cracker being funky. */
 		if (net_ratelimit()) {
 			printk("FTP_NAT: partial packet %u/%u in %u/%u\n",
-			       exp->seq, ct_ftp_info->len,
+			       exp->seq, exp_ftp_info->len,
 			       ntohl(tcph->seq),
 			       ntohl(tcph->seq) + datalen);
 		}
-		UNLOCK_BH(&ip_ftp_lock);
 		return NF_DROP;
 	}
-	UNLOCK_BH(&ip_ftp_lock);
-
 	return NF_ACCEPT;
 }
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipv4/netfilter/ip_nat_irc.c linux-2.4.20-wolk4.16-fullkernel/net/ipv4/netfilter/ip_nat_irc.c
--- linux-2.4.20-wolk4.15-fullkernel/net/ipv4/netfilter/ip_nat_irc.c	2004-06-29 11:25:28.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/ipv4/netfilter/ip_nat_irc.c	2004-09-05 15:59:18.000000000 +0200
@@ -46,9 +46,6 @@ MODULE_PARM(ports, "1-" __MODULE_STRING(
 MODULE_PARM_DESC(ports, "port numbers of IRC servers");
 #endif
 
-/* protects irc part of conntracks */
-DECLARE_LOCK_EXTERN(ip_irc_lock);
-
 /* FIXME: Time out? --RR */
 
 static unsigned int
@@ -89,7 +86,7 @@ irc_nat_expected(struct sk_buff **pskb,
 	return ip_nat_setup_info(ct, &mr, hooknum);
 }
 
-static int irc_data_fixup(const struct ip_ct_irc_expect *ct_irc_info,
+static int irc_data_fixup(const struct ip_ct_irc_expect *exp_irc_info,
 			  struct ip_conntrack *ct,
 			  struct sk_buff **pskb,
 			  enum ip_conntrack_info ctinfo,
@@ -104,23 +101,16 @@ static int irc_data_fixup(const struct i
 	/* "4294967296 65635 " */
 	char buffer[18];
 
-	MUST_BE_LOCKED(&ip_irc_lock);
-
 	DEBUGP("IRC_NAT: info (seq %u + %u) in %u\n",
-	       expect->seq, ct_irc_info->len,
+	       expect->seq, exp_irc_info->len,
 	       ntohl(tcph->seq));
 
 	newip = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.ip;
 
 	/* Alter conntrack's expectations. */
-
-	/* We can read expect here without conntrack lock, since it's
-	   only set in ip_conntrack_irc, with ip_irc_lock held
-	   writable */
-
 	t = expect->tuple;
 	t.dst.ip = newip;
-	for (port = ct_irc_info->port; port != 0; port++) {
+	for (port = exp_irc_info->port; port != 0; port++) {
 		t.dst.u.tcp.port = htons(port);
 		if (ip_conntrack_change_expect(expect, &t) == 0) {
 			DEBUGP("using port %d", port);
@@ -150,7 +140,7 @@ static int irc_data_fixup(const struct i
 
 	return ip_nat_mangle_tcp_packet(pskb, ct, ctinfo, 
 					expect->seq - ntohl(tcph->seq),
-					ct_irc_info->len, buffer, 
+					exp_irc_info->len, buffer, 
 					strlen(buffer));
 }
 
@@ -165,12 +155,12 @@ static unsigned int help(struct ip_connt
 	struct tcphdr *tcph = (void *) iph + iph->ihl * 4;
 	unsigned int datalen;
 	int dir;
-	struct ip_ct_irc_expect *ct_irc_info;
+	struct ip_ct_irc_expect *exp_irc_info;
 
 	if (!exp)
 		DEBUGP("ip_nat_irc: no exp!!");
 		
-	ct_irc_info = &exp->help.exp_irc_info;
+	exp_irc_info = &exp->help.exp_irc_info;
 
 	/* Only mangle things once: original direction in POST_ROUTING
 	   and reply direction on PRE_ROUTING. */
@@ -187,30 +177,24 @@ static unsigned int help(struct ip_connt
 	DEBUGP("got beyond not touching\n");
 
 	datalen = (*pskb)->len - iph->ihl * 4 - tcph->doff * 4;
-	LOCK_BH(&ip_irc_lock);
 	/* Check wether the whole IP/address pattern is carried in the payload */
-	if (between(exp->seq + ct_irc_info->len,
+	if (between(exp->seq + exp_irc_info->len,
 		    ntohl(tcph->seq),
 		    ntohl(tcph->seq) + datalen)) {
-		if (!irc_data_fixup(ct_irc_info, ct, pskb, ctinfo, exp)) {
-			UNLOCK_BH(&ip_irc_lock);
+		if (!irc_data_fixup(exp_irc_info, ct, pskb, ctinfo, exp))
 			return NF_DROP;
-		}
 	} else { 
 		/* Half a match?  This means a partial retransmisison.
 		   It's a cracker being funky. */
 		if (net_ratelimit()) {
 			printk
 			    ("IRC_NAT: partial packet %u/%u in %u/%u\n",
-			     exp->seq, ct_irc_info->len,
+			     exp->seq, exp_irc_info->len,
 			     ntohl(tcph->seq),
 			     ntohl(tcph->seq) + datalen);
 		}
-		UNLOCK_BH(&ip_irc_lock);
 		return NF_DROP;
 	}
-	UNLOCK_BH(&ip_irc_lock);
-
 	return NF_ACCEPT;
 }
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipv4/netfilter/ip_nat_rule.c linux-2.4.20-wolk4.16-fullkernel/net/ipv4/netfilter/ip_nat_rule.c
--- linux-2.4.20-wolk4.15-fullkernel/net/ipv4/netfilter/ip_nat_rule.c	2004-06-29 11:25:28.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/ipv4/netfilter/ip_nat_rule.c	2004-09-05 15:57:33.000000000 +0200
@@ -121,7 +121,8 @@ static unsigned int ipt_snat_target(stru
 	ct = ip_conntrack_get(*pskb, &ctinfo);
 
 	/* Connection must be valid and new. */
-	IP_NF_ASSERT(ct && (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED));
+	IP_NF_ASSERT(ct && (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED
+	                    || ctinfo == IP_CT_RELATED + IP_CT_IS_REPLY));
 	IP_NF_ASSERT(out);
 
 	return ip_nat_setup_info(ct, targinfo, hooknum);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipv4/netfilter/ipt_MASQUERADE.c linux-2.4.20-wolk4.16-fullkernel/net/ipv4/netfilter/ipt_MASQUERADE.c
--- linux-2.4.20-wolk4.15-fullkernel/net/ipv4/netfilter/ipt_MASQUERADE.c	2004-06-29 11:25:30.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/ipv4/netfilter/ipt_MASQUERADE.c	2004-09-05 15:59:35.000000000 +0200
@@ -79,8 +79,8 @@ masquerade_target(struct sk_buff **pskb,
 		return NF_ACCEPT;
 
 	ct = ip_conntrack_get(*pskb, &ctinfo);
-	IP_NF_ASSERT(ct && (ctinfo == IP_CT_NEW
-				  || ctinfo == IP_CT_RELATED));
+	IP_NF_ASSERT(ct && (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED
+	                    || ctinfo == IP_CT_RELATED + IP_CT_IS_REPLY));
 
 	mr = targinfo;
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipv4/netfilter/ipt_ULOG.c linux-2.4.20-wolk4.16-fullkernel/net/ipv4/netfilter/ipt_ULOG.c
--- linux-2.4.20-wolk4.15-fullkernel/net/ipv4/netfilter/ipt_ULOG.c	2004-06-29 11:25:27.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/ipv4/netfilter/ipt_ULOG.c	2004-09-05 15:57:33.000000000 +0200
@@ -89,7 +89,6 @@ typedef struct {
 static ulog_buff_t ulog_buffers[ULOG_MAXNLGROUPS];	/* array of buffers */
 
 static struct sock *nflognl;	/* our socket */
-static size_t qlen;		/* current length of multipart-nlmsg */
 DECLARE_LOCK(ulog_lock);	/* spinlock */
 
 /* send one ulog_buff_t to userspace */
@@ -108,7 +107,7 @@ static void ulog_send(unsigned int nlgro
 
 	NETLINK_CB(ub->skb).dst_groups = (1 << nlgroupnum);
 	DEBUGP("ipt_ULOG: throwing %d packets to netlink mask %u\n",
-		ub->qlen, nlgroup);
+		ub->qlen, nlgroupnum);
 	netlink_broadcast(nflognl, ub->skb, 0, (1 << nlgroupnum), GFP_ATOMIC);
 
 	ub->qlen = 0;
@@ -118,7 +117,7 @@ static void ulog_send(unsigned int nlgro
 }
 
 
-/* timer function to flush queue in ULOG_FLUSH_INTERVAL time */
+/* timer function to flush queue in flushtimeout time */
 static void ulog_timer(unsigned long data)
 {
 	DEBUGP("ipt_ULOG: timer function called, calling ulog_send\n");
@@ -246,12 +245,6 @@ static unsigned int ipt_ulog_target(stru
 		ub->lastnlh->nlmsg_flags |= NLM_F_MULTI;
 	}
 
-	/* if threshold is reached, send message to userspace */
-	if (qlen >= loginfo->qthreshold) {
-		if (loginfo->qthreshold > 1)
-			nlh->nlmsg_type = NLMSG_DONE;
-	}
-
 	ub->lastnlh = nlh;
 
 	/* if timer isn't already running, start it */
@@ -260,6 +253,13 @@ static unsigned int ipt_ulog_target(stru
 		add_timer(&ub->timer);
 	}
 
+	/* if threshold is reached, send message to userspace */
+	if (ub->qlen >= loginfo->qthreshold) {
+		if (loginfo->qthreshold > 1)
+			nlh->nlmsg_type = NLMSG_DONE;
+		ulog_send(groupnum);
+	}
+
 	UNLOCK_BH(&ulog_lock);
 
 	return IPT_CONTINUE;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipv4/raw.c linux-2.4.20-wolk4.16-fullkernel/net/ipv4/raw.c
--- linux-2.4.20-wolk4.15-fullkernel/net/ipv4/raw.c	2004-06-29 11:25:27.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/ipv4/raw.c	2004-09-05 16:06:31.000000000 +0200
@@ -524,6 +524,8 @@ int raw_recvmsg(struct sock *sk, struct 
 	}
 	if (sk->protinfo.af_inet.cmsg_flags)
 		ip_cmsg_recv(msg, skb);
+	if (flags & MSG_TRUNC)
+		copied = skb->len;
 done:
 	skb_free_datagram(sk, skb);
 out:	return err ? : copied;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipv4/route.c linux-2.4.20-wolk4.16-fullkernel/net/ipv4/route.c
--- linux-2.4.20-wolk4.15-fullkernel/net/ipv4/route.c	2004-06-29 11:25:30.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/ipv4/route.c	2004-09-05 16:08:36.000000000 +0200
@@ -118,7 +118,7 @@ int ip_rt_gc_elasticity		= 8;
 int ip_rt_mtu_expires		= 10 * 60 * HZ;
 int ip_rt_min_pmtu		= 512 + 20 + 20;
 int ip_rt_min_advmss		= 256;
-int ip_rt_secret_interval	= 10 * 60 * HZ;
+int ip_rt_secret_interval	= 10 * 30 * HZ;
 static unsigned long rt_deadline;
 
 #define RTprint(a...)	printk(KERN_DEBUG a)
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipv4/sysctl_net_ipv4.c linux-2.4.20-wolk4.16-fullkernel/net/ipv4/sysctl_net_ipv4.c
--- linux-2.4.20-wolk4.15-fullkernel/net/ipv4/sysctl_net_ipv4.c	2004-06-29 11:31:53.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/ipv4/sysctl_net_ipv4.c	2004-09-05 16:09:36.000000000 +0200
@@ -74,6 +74,9 @@ static int ip_local_port_range_max[] = {
 /* From tcp_input.c */
 extern int sysctl_tcp_westwood;
 
+/* From tcp_ipv4.c */
+extern int sysctl_netdebug;
+
 int sysctl_secure_pmtu = 1; 
 
 struct ipv4_config ipv4_config;
@@ -313,6 +316,8 @@ ctl_table ipv4_table[] = {
  	{NET_TCP_MODERATE_RCVBUF, "tcp_moderate_rcvbuf",
 	 &sysctl_tcp_moderate_rcvbuf, sizeof(int), 0644, NULL,
 	 &proc_dointvec},
+	{NET_DEBUG, "netdebug",
+	 &sysctl_netdebug, sizeof(int), 0640, NULL, &proc_dointvec},
 	{0}
 };
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipv4/tcp.c linux-2.4.20-wolk4.16-fullkernel/net/ipv4/tcp.c
--- linux-2.4.20-wolk4.15-fullkernel/net/ipv4/tcp.c	2004-06-29 11:31:53.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/ipv4/tcp.c	2004-09-05 16:09:36.000000000 +0200
@@ -275,7 +275,7 @@ kmem_cache_t *tcp_timewait_cachep;
 
 atomic_t tcp_orphan_count = ATOMIC_INIT(0);
 
-int sysctl_tcp_default_win_scale = 0;
+int sysctl_tcp_default_win_scale = 7;
 
 int sysctl_tcp_mem[3];
 int sysctl_tcp_wmem[3] = { 4*1024, 16*1024, 128*1024 };
@@ -1302,7 +1302,7 @@ void cleanup_rbuf(struct sock *sk, int c
 	struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
 	int time_to_ack = 0;
 
-#if TCP_DEBUG
+#ifdef TCP_DEBUG
 	struct sk_buff *skb = skb_peek(&sk->receive_queue);
 
 	BUG_TRAP(skb==NULL || before(tp->copied_seq, TCP_SKB_CB(skb)->end_seq));
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipv4/tcp_input.c linux-2.4.20-wolk4.16-fullkernel/net/ipv4/tcp_input.c
--- linux-2.4.20-wolk4.15-fullkernel/net/ipv4/tcp_input.c	2004-06-29 11:31:54.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/ipv4/tcp_input.c	2004-09-05 16:08:36.000000000 +0200
@@ -94,16 +94,16 @@ int sysctl_tcp_app_win = 31;
 int sysctl_tcp_adv_win_scale = 2;
 
 int sysctl_tcp_stdurg = 0;
-int sysctl_tcp_rfc1337 = 0;
+int sysctl_tcp_rfc1337 = 1;
 int sysctl_tcp_max_orphans = NR_FILE;
 int sysctl_tcp_frto = 0;
 
 int sysctl_tcp_nometrics_save = 0;
 
 int sysctl_tcp_westwood = 0;
-int sysctl_tcp_vegas_cong_avoid = 0;
+int sysctl_tcp_vegas_cong_avoid = 1;
 
-int sysctl_tcp_moderate_rcvbuf = 0;
+int sysctl_tcp_moderate_rcvbuf = 1;
 
 /* Default values of the Vegas variables, in fixed-point representation
  * with V_PARAM_SHIFT bits to the right of the binary point.
@@ -112,7 +112,7 @@ int sysctl_tcp_moderate_rcvbuf = 0;
 int sysctl_tcp_vegas_alpha = 1<<V_PARAM_SHIFT;
 int sysctl_tcp_vegas_beta  = 3<<V_PARAM_SHIFT;
 int sysctl_tcp_vegas_gamma = 1<<V_PARAM_SHIFT;
-int sysctl_tcp_bic;
+int sysctl_tcp_bic = 0;
 int sysctl_tcp_bic_fast_convergence = 1;
 int sysctl_tcp_bic_low_window = 14;
 
@@ -341,6 +341,15 @@ static void tcp_init_buffer_space(struct
 	tp->snd_cwnd_stamp = tcp_time_stamp;
 }
 
+static void init_bictcp(struct tcp_opt *tp)
+{
+	tp->bictcp.cnt = 0;
+
+	tp->bictcp.last_max_cwnd = 0;
+	tp->bictcp.last_cwnd = 0;
+	tp->bictcp.last_stamp = 0;
+}
+
 /* 5. Recalculate window clamp after socket hit its memory bounds. */
 static void tcp_clamp_window(struct sock *sk, struct tcp_opt *tp)
 {
@@ -850,8 +859,10 @@ static void tcp_init_metrics(struct sock
 	 * to low value, and then abruptly stops to do it and starts to delay
 	 * ACKs, wait for troubles.
 	 */
-	if (dst->rtt > tp->srtt)
+	if (dst->rtt > tp->srtt) {
 		tp->srtt = dst->rtt;
+		tp->rtt_seq = tp->snd_nxt;
+	}
 	if (dst->rttvar > tp->mdev) {
 		tp->mdev = dst->rttvar;
 		tp->mdev_max = tp->rttvar = max(tp->mdev, TCP_RTO_MIN);
@@ -1243,6 +1254,8 @@ void tcp_enter_frto_loss(struct sock *sk
 	tcp_set_ca_state(tp, TCP_CA_Loss);
 	tp->high_seq = tp->frto_highmark;
 	TCP_ECN_queue_cwr(tp);
+
+	init_bictcp(tp);
 }
 
 void tcp_clear_retrans(struct tcp_opt *tp)
@@ -2019,10 +2032,12 @@ static inline __u32 bictcp_cwnd(struct t
 	if (!sysctl_tcp_bic)
 		return tp->snd_cwnd;
 
-	if (tp->bictcp.last_cwnd == tp->snd_cwnd)
-		return tp->bictcp.cnt; /*  same cwnd, no update */
-      
+	if (tp->bictcp.last_cwnd == tp->snd_cwnd &&
+	   (s32)(tcp_time_stamp - tp->bictcp.last_stamp) <= (HZ>>5))
+		return tp->bictcp.cnt;
+
 	tp->bictcp.last_cwnd = tp->snd_cwnd;
+	tp->bictcp.last_stamp = tcp_time_stamp;
       
 	/* start off normal */
 	if (tp->snd_cwnd <= sysctl_tcp_bic_low_window)
@@ -4597,6 +4612,7 @@ int tcp_rcv_state_process(struct sock *s
 				return 1;
 
 			tcp_init_westwood(sk);
+			init_bictcp(tp);
 
 			/* Now we have several options: In theory there is 
 			 * nothing else in the frame. KA9Q has an option to 
@@ -4620,6 +4636,7 @@ int tcp_rcv_state_process(struct sock *s
 
 	case TCP_SYN_SENT:
 		tcp_init_westwood(sk);
+		init_bictcp(tp);
 
 		queued = tcp_rcv_synsent_state_process(sk, skb, th, len);
 		if (queued >= 0)
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipv4/tcp_ipv4.c linux-2.4.20-wolk4.16-fullkernel/net/ipv4/tcp_ipv4.c
--- linux-2.4.20-wolk4.15-fullkernel/net/ipv4/tcp_ipv4.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/ipv4/tcp_ipv4.c	2004-09-05 17:09:43.000000000 +0200
@@ -87,6 +87,9 @@ extern int sysctl_tcp_ignore_bogus;
 extern int sysctl_tcp_ignore_ack;
 extern int sysctl_stealth_logging;
 
+/* netdebug */
+int sysctl_netdebug = 1;
+
 /* Check TCP sequence numbers in ICMP packets. */
 #define ICMP_MIN_LENGTH 8
 
@@ -250,17 +253,14 @@ static int tcp_v4_get_port(struct sock *
 
 		spin_lock(&tcp_portalloc_lock);
 		rover = tcp_port_rover;
-                do {
 #ifdef CONFIG_GRKERNSEC_RANDSRC
-			if (grsec_enable_randsrc && (high > low)) {
-				rover = low + (get_random_long() % (high - low));
-			} else
+		if (grsec_enable_randsrc && (high > low))
+			rover = low + (get_random_long() % remaining);
 #endif
-			{
-				rover++;
-				if ((rover < low) || (rover > high))
-					rover = low;
-			}
+                do {
+			rover++;
+			if ((rover < low) || (rover > high))
+				rover = low;
 
 			head = &tcp_bhash[tcp_bhashfn(rover)];
 			spin_lock(&head->lock);
@@ -722,18 +722,15 @@ static int tcp_v4_hash_connect(struct so
 		 */
 		spin_lock(&tcp_portalloc_lock);
 		rover = tcp_port_rover;
-
-		do {
 #ifdef CONFIG_GRKERNSEC_RANDSRC
-			if(grsec_enable_randsrc && (high > low)) {
-				rover = low + (get_random_long() % (high - low));
-			} else
+		if (grsec_enable_randsrc && (high > low))
+			rover = low + (get_random_long() % remaining);
 #endif
-			{
-				rover++;
-				if ((rover < low) || (rover > high))
-					rover = low;
-			}
+		do {
+			rover++;
+			if ((rover < low) || (rover > high))
+				rover = low;
+
 			head = &tcp_bhash[tcp_bhashfn(rover)];
 			spin_lock(&head->lock);		
 
@@ -783,11 +780,12 @@ static int tcp_v4_hash_connect(struct so
 		spin_unlock(&head->lock);
 
 #ifdef CONFIG_GRKERNSEC
+		gr_del_task_from_ip_table(current);
 		current->gr_saddr = sk->rcv_saddr;
 		current->gr_daddr = sk->daddr;
 		current->gr_sport = sk->sport;
 		current->gr_dport = sk->dport;
-		current->used_connect = 1;
+		gr_add_to_task_ip_table(current);
 #endif
 
 		if (tw) {
@@ -1696,9 +1694,10 @@ int tcp_v4_conn_request(struct sock *sk,
 			 * to destinations, already remembered
 			 * to the moment of synflood.
 			 */
-			NETDEBUG(if (net_ratelimit()) \
-				printk(KERN_DEBUG "TCP: drop open request from %u.%u.%u.%u/%u\n", \
-					NIPQUAD(saddr), ntohs(skb->h.th->source)));
+			if (sysctl_netdebug)
+				NETDEBUG(if (net_ratelimit()) \
+					printk(KERN_DEBUG "TCP: drop open request from %u.%u.%u.%u/%u\n", \
+						NIPQUAD(saddr), ntohs(skb->h.th->source)));
 			dst_release(dst);
 			goto drop_and_free;
 		}
@@ -1937,8 +1936,8 @@ static int tcp_v4_checksum_init(struct s
 		if (!tcp_v4_check(skb->h.th,skb->len,skb->nh.iph->saddr,
 				  skb->nh.iph->daddr,skb->csum))
 			return 0;
-
-		NETDEBUG(if (net_ratelimit()) printk(KERN_DEBUG "hw tcp v4 csum failed\n"));
+		if (sysctl_netdebug)
+			NETDEBUG(if (net_ratelimit()) printk(KERN_DEBUG "TCP: hw tcp v4 csum failed.\n"));
 		skb->ip_summed = CHECKSUM_NONE;
 	}
 	if (skb->len <= 76) {
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipv4/tcp_minisocks.c linux-2.4.20-wolk4.16-fullkernel/net/ipv4/tcp_minisocks.c
--- linux-2.4.20-wolk4.15-fullkernel/net/ipv4/tcp_minisocks.c	2004-06-29 11:31:53.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/ipv4/tcp_minisocks.c	2004-09-05 16:08:36.000000000 +0200
@@ -741,9 +741,6 @@ struct sock *tcp_create_openreq_child(st
 		newtp->snd_cwnd = 2;
 		newtp->snd_cwnd_cnt = 0;
 
-		newtp->bictcp.cnt = 0;
-		newtp->bictcp.last_max_cwnd = newtp->bictcp.last_cwnd = 0;
-
 		newtp->frto_counter = 0;
 		newtp->frto_highmark = 0;
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipv4/tcp_timer.c linux-2.4.20-wolk4.16-fullkernel/net/ipv4/tcp_timer.c
--- linux-2.4.20-wolk4.15-fullkernel/net/ipv4/tcp_timer.c	2004-06-29 11:24:09.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/ipv4/tcp_timer.c	2004-09-05 16:09:36.000000000 +0200
@@ -333,16 +333,18 @@ static void tcp_retransmit_timer(struct 
 		 * connection. If the socket is an orphan, time it out,
 		 * we cannot allow such beasts to hang infinitely.
 		 */
-#ifdef TCP_DEBUG
-		if (net_ratelimit())
-			printk(KERN_DEBUG "TCP: Treason uncloaked! Peer %u.%u.%u.%u:%u/%u shrinks window %u:%u. Repaired.\n",
-			       NIPQUAD(sk->daddr), htons(sk->dport), sk->num,
-			       tp->snd_una, tp->snd_nxt);
-#endif
+
+		if (sysctl_netdebug)
+			NETDEBUG(if (net_ratelimit())
+				printk(KERN_DEBUG "TCP: Treason uncloaked! Peer %u.%u.%u.%u:%u/%u shrinks window %u:%u. Repaired.\n",
+				NIPQUAD(sk->daddr), htons(sk->dport), sk->num,
+				tp->snd_una, tp->snd_nxt));
+
 		if (tcp_time_stamp - tp->rcv_tstamp > TCP_RTO_MAX) {
 			tcp_write_err(sk);
 			goto out;
 		}
+
 		tcp_enter_loss(sk, 0);
 		tcp_retransmit_skb(sk, skb_peek(&sk->write_queue));
 		__sk_dst_reset(sk);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipv4/udp.c linux-2.4.20-wolk4.16-fullkernel/net/ipv4/udp.c
--- linux-2.4.20-wolk4.15-fullkernel/net/ipv4/udp.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/ipv4/udp.c	2004-09-05 17:09:43.000000000 +0200
@@ -104,6 +104,9 @@ extern int gr_search_udp_recvmsg(const s
 extern int gr_search_udp_sendmsg(const struct sock *sk,
 					const struct sockaddr_in *addr);
 
+/* From tcp_ipv4.c */
+extern int sysctl_netdebug;
+
 #ifdef CONFIG_RSBAC_MS_SOCK
 #include <rsbac/adf.h>
 #include <rsbac/error.h>
@@ -487,6 +490,7 @@ int udp_sendmsg(struct sock *sk, struct 
 		ufh.uh.dest = usin->sin_port;
 		if (ufh.uh.dest == 0)
 			return -EINVAL;
+
 		if (!gr_search_udp_sendmsg(sk, usin))
 			return -EPERM;
 	} else {
@@ -722,7 +726,10 @@ int udp_recvmsg(struct sock *sk, struct 
   	}
 	if (sk->protinfo.af_inet.cmsg_flags)
 		ip_cmsg_recv(msg, skb);
+
 	err = copied;
+	if (flags & MSG_TRUNC)
+		err = skb->len - sizeof(struct udphdr);
   
         /* RSBAC */
         #ifdef CONFIG_RSBAC_MS_SOCK
@@ -984,7 +991,8 @@ static int udp_checksum_init(struct sk_b
 		skb->ip_summed = CHECKSUM_UNNECESSARY;
 		if (!udp_check(uh, ulen, saddr, daddr, skb->csum))
 			return 0;
-		NETDEBUG(if (net_ratelimit()) printk(KERN_DEBUG "udp v4 hw csum failure.\n"));
+		if (sysctl_netdebug)
+			NETDEBUG(if (net_ratelimit()) printk(KERN_DEBUG "UDP: hw udp v4 csum failed.\n"));
 		skb->ip_summed = CHECKSUM_NONE;
 	}
 	if (skb->ip_summed != CHECKSUM_UNNECESSARY)
@@ -1056,14 +1064,15 @@ int udp_rcv(struct sk_buff *skb)
 	return(0);
 
 short_packet:
-	NETDEBUG(if (net_ratelimit())
-		 printk(KERN_DEBUG "UDP: short packet: %u.%u.%u.%u:%u %d/%d to %u.%u.%u.%u:%u\n",
-			NIPQUAD(saddr),
-			ntohs(uh->source),
-			ulen,
-			len,
-			NIPQUAD(daddr),
-			ntohs(uh->dest)));
+	if (sysctl_netdebug)
+		NETDEBUG(if (net_ratelimit())
+			printk(KERN_DEBUG "UDP: short packet: %u.%u.%u.%u:%u %d/%d to %u.%u.%u.%u:%u\n",
+				NIPQUAD(saddr),
+				ntohs(uh->source),
+				ulen,
+				len,
+				NIPQUAD(daddr),
+				ntohs(uh->dest)));
 no_header:
 	UDP_INC_STATS_BH(UdpInErrors);
 	kfree_skb(skb);
@@ -1074,13 +1083,14 @@ csum_error:
 	 * RFC1122: OK.  Discards the bad packet silently (as far as 
 	 * the network is concerned, anyway) as per 4.1.3.4 (MUST). 
 	 */
-	NETDEBUG(if (net_ratelimit())
-		 printk(KERN_DEBUG "UDP: bad checksum. From %d.%d.%d.%d:%d to %d.%d.%d.%d:%d ulen %d\n",
-			NIPQUAD(saddr),
-			ntohs(uh->source),
-			NIPQUAD(daddr),
-			ntohs(uh->dest),
-			ulen));
+	if (sysctl_netdebug)
+		NETDEBUG(if (net_ratelimit())
+			printk(KERN_DEBUG "UDP: bad checksum. From %d.%d.%d.%d:%d to %d.%d.%d.%d:%d ulen %d\n",
+				NIPQUAD(saddr),
+				ntohs(uh->source),
+				NIPQUAD(daddr),
+				ntohs(uh->dest),
+				ulen));
 	UDP_INC_STATS_BH(UdpInErrors);
 	kfree_skb(skb);
 	return(0);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipv6/netfilter/ip6_tables.c linux-2.4.20-wolk4.16-fullkernel/net/ipv6/netfilter/ip6_tables.c
--- linux-2.4.20-wolk4.15-fullkernel/net/ipv6/netfilter/ip6_tables.c	2004-06-29 11:25:29.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/ipv6/netfilter/ip6_tables.c	2004-09-05 15:57:32.000000000 +0200
@@ -1567,10 +1567,8 @@ tcp_match(const struct sk_buff *skb,
 	  u_int16_t datalen,
 	  int *hotdrop)
 {
-	const struct tcphdr *tcp;
+	const struct tcphdr *tcp = hdr;
 	const struct ip6t_tcp *tcpinfo = matchinfo;
-	int tcpoff;
-	u8 nexthdr = skb->nh.ipv6h->nexthdr;
 
 	/* To quote Alan:
 
@@ -1591,24 +1589,6 @@ tcp_match(const struct sk_buff *skb,
 		return 0;
 	}
 
-	tcpoff = (u8*)(skb->nh.ipv6h + 1) - skb->data;
-	tcpoff = ipv6_skip_exthdr(skb, tcpoff, &nexthdr, skb->len - tcpoff);
-	if (tcpoff < 0 || tcpoff > skb->len) {
-		duprintf("tcp_match: cannot skip exthdr. Dropping.\n");
-		*hotdrop = 1;
-		return 0;
-	} else if (nexthdr == IPPROTO_FRAGMENT)
-		return 0;
-	else if (nexthdr != IPPROTO_TCP ||
-		 skb->len - tcpoff < sizeof(struct tcphdr)) {
-		/* cannot be occured */
-		duprintf("tcp_match: cannot get TCP header. Dropping.\n");
-		*hotdrop = 1;
-		return 0;
-	}
-
-	tcp = (struct tcphdr *)(skb->data + tcpoff);
-
 	/* FIXME: Try tcp doff >> packet len against various stacks --RR */
 
 #define FWINVTCP(bool,invflg) ((bool) ^ !!(tcpinfo->invflags & invflg))
@@ -1659,10 +1639,8 @@ udp_match(const struct sk_buff *skb,
 	  u_int16_t datalen,
 	  int *hotdrop)
 {
-	const struct udphdr *udp;
+	const struct udphdr *udp = hdr;
 	const struct ip6t_udp *udpinfo = matchinfo;
-	int udpoff;
-	u8 nexthdr = skb->nh.ipv6h->nexthdr;
 
 	if (offset == 0 && datalen < sizeof(struct udphdr)) {
 		/* We've been asked to examine this packet, and we
@@ -1672,23 +1650,6 @@ udp_match(const struct sk_buff *skb,
 		return 0;
 	}
 
-	udpoff = (u8*)(skb->nh.ipv6h + 1) - skb->data;
-	udpoff = ipv6_skip_exthdr(skb, udpoff, &nexthdr, skb->len - udpoff);
-	if (udpoff < 0 || udpoff > skb->len) {
-		duprintf("udp_match: cannot skip exthdr. Dropping.\n");
-		*hotdrop = 1;
-		return 0;
-	} else if (nexthdr == IPPROTO_FRAGMENT)
-		return 0;
-	else if (nexthdr != IPPROTO_UDP ||
-		 skb->len - udpoff < sizeof(struct udphdr)) {
-		duprintf("udp_match: cannot get UDP header. Dropping.\n");
-		*hotdrop = 1;
-		return 0;
-	}
-
-	udp = (struct udphdr *)(skb->data + udpoff);
-
 	/* Must not be a fragment. */
 	return !offset
 		&& port_match(udpinfo->spts[0], udpinfo->spts[1],
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipv6/netfilter/ip6t_LOG.c linux-2.4.20-wolk4.16-fullkernel/net/ipv6/netfilter/ip6t_LOG.c
--- linux-2.4.20-wolk4.15-fullkernel/net/ipv6/netfilter/ip6t_LOG.c	2004-06-29 11:25:27.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/ipv6/netfilter/ip6t_LOG.c	2004-09-05 15:59:18.000000000 +0200
@@ -56,7 +56,7 @@ static u_int8_t ip6_nexthdr(u_int8_t cur
 		repeatedly...with a large stick...no, an even LARGER
 		stick...no, you're still not thinking big enough */
 			nexthdr = **hdrptr;
-			hdrlen = *hdrptr[1] * 4 + 8;
+			hdrlen = (*hdrptr)[1] * 4 + 8;
 			*hdrptr = *hdrptr + hdrlen;
 			break;
 		/*stupid rfc2402 */
@@ -64,7 +64,7 @@ static u_int8_t ip6_nexthdr(u_int8_t cur
 		case IPPROTO_ROUTING:
 		case IPPROTO_HOPOPTS:
 			nexthdr = **hdrptr;
-			hdrlen = *hdrptr[1] * 8 + 8;
+			hdrlen = (*hdrptr)[1] * 8 + 8;
 			*hdrptr = *hdrptr + hdrlen;
 			break;
 		case IPPROTO_FRAGMENT:
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipv6/raw.c linux-2.4.20-wolk4.16-fullkernel/net/ipv6/raw.c
--- linux-2.4.20-wolk4.15-fullkernel/net/ipv6/raw.c	2004-06-29 11:35:50.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/ipv6/raw.c	2004-09-05 16:09:09.000000000 +0200
@@ -406,7 +406,10 @@ int rawv6_recvmsg(struct sock *sk, struc
 
 	if (sk->net_pinfo.af_inet6.rxopt.all)
 		datagram_recv_ctl(sk, msg, skb);
+
 	err = copied;
+	if (flags & MSG_TRUNC)
+		err = skb->len;
 
 out_free:
 	skb_free_datagram(sk, skb);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/ipv6/udp.c linux-2.4.20-wolk4.16-fullkernel/net/ipv6/udp.c
--- linux-2.4.20-wolk4.15-fullkernel/net/ipv6/udp.c	2004-06-29 11:35:50.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/ipv6/udp.c	2004-09-05 16:09:09.000000000 +0200
@@ -471,7 +471,10 @@ int udpv6_recvmsg(struct sock *sk, struc
 			}
 		}
   	}
+
 	err = copied;
+	if (flags & MSG_TRUNC)
+		err = skb->len - sizeof(struct udphdr);
 
 out_free:
 	skb_free_datagram(sk, skb);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/lr/lrcmd.c linux-2.4.20-wolk4.16-fullkernel/net/lr/lrcmd.c
--- linux-2.4.20-wolk4.15-fullkernel/net/lr/lrcmd.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/net/lr/lrcmd.c	2004-09-05 16:00:19.000000000 +0200
@@ -0,0 +1,922 @@
+/*
+ * $Id: lrcmd.c,v 1.9 2004/03/06 14:45:11 yumo Exp $
+ * lrcfg -- lr device driver configurator program
+ *
+ * Author: Yumo (Katsuyuki Yumoto) 2001-2004
+ *         yumo@st.rim.or.jp
+ *
+ *
+ * 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  02111-1307, USA.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <net/if.h>
+#include <netinet/in.h>
+
+typedef unsigned short u16;
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,5)
+#include "miicompat.h"
+#else
+#include <linux/mii.h>
+#endif
+
+#ifdef ETHMAP
+#include <ethmap.h>
+#endif
+
+#include <linux/sockios.h>
+#include "lr.h"
+#include "lrcfg.h"
+
+/* internal error codes */
+#define ERR_FAILCNF -1
+#define ERR_FEWARGS -2
+#define ERR_INVALPIF -3
+#define ERR_INVALPNAM -4
+#define ERR_INVALPTR -5
+#define ERR_INVALPVAL -6
+#define ERR_INVALSD -7
+#define ERR_INVALVIF -8
+#define ERR_NODRV -9
+#define ERR_NOMEM -10
+#define ERR_UNKNCOMM -11
+
+/* maximum name length */
+#define MAX_NAME 7
+
+
+char *get_field_n(char *d, char *s, int n)
+{
+	char *p, *q, c;
+	int i;
+
+	if (!d || !s)
+		goto exit;
+
+	p = strrchr (s, '\n');
+	if (p){
+		*p = '\0';
+	}
+	for (p = q = s, i = 1; p && *p;){
+		for (; (*p == ' ' || *p == '\t') && *p; p++)
+			;
+		q = strchr(p, ' ');
+		if (!q){
+			q = strchr(p, '\t');
+		}
+		if (!q){
+			q = strchr(p, '\0');
+		}
+		if (i == n){
+			c = *q;
+			*q = '\0';
+			strcpy(d, p);
+			*q = c;
+			return d;
+		}
+		i++;
+		p = q;
+	}
+
+exit:
+	return NULL;
+}
+
+
+
+char *get_module_name(char *d, char *ifname)
+{
+	FILE *fp;
+	char astr[MAXLINE][MAXCOL+1];
+	char s1[MAXCOL+1];
+	char s2[MAXCOL+1];
+	char s3[MAXCOL+1];
+	char s4[MAXCOL+1];
+	char s5[MAXCOL+1];
+	char cmd[128];
+	char *p, *q;
+	int i = 0, j = 0, n;
+
+	if (!d || !ifname || strlen(ifname) > MAX_NAME){
+		return NULL;
+	}
+
+	/* first stage */
+	sprintf(cmd, "/sbin/ifconfig %s 0 up", ifname);
+
+	if (system(cmd)){
+		return NULL;
+	}
+
+	fp = popen("/bin/cat /proc/modules", "r");
+	if (!fp){
+		return NULL;
+	}
+	for (i = 0; fgets(astr[i]+1, MAXCOL, fp) && i < MAXLINE; i++){
+		if (get_field_n(s1, astr[i]+1, 3)){
+			if (!atoi(s1)){
+				astr[i][0] = 1; /* exclusive mark */
+			} else {
+				astr[i][0] = 0;
+			}
+		}
+	}
+	pclose (fp);
+
+	n = i;
+
+	/* second stage */
+	sprintf(cmd, "/sbin/ifconfig %s 0 down", ifname);
+
+	if (system(cmd)){
+		return NULL;
+	}
+	
+	if ((fp = popen("/bin/cat /proc/modules", "r")) == NULL){
+		return NULL;
+	}
+	for (; fgets(s1, MAXCOL, fp);){
+		if (get_field_n(s2, s1, 1)){
+			for (i = 0; i < n; i++){
+				if (!astr[i][0] && get_field_n(s3, astr[i]+1, 1)){
+					if (strcmp(s2, s3) == 0){
+						p = get_field_n(s4, astr[i]+1, 3);
+						q = get_field_n(s5, s1, 3);
+						if (p && q && atoi(p) != atoi(q)+1){
+							astr[i][0] = 1; /* exclusive mark */
+						}
+					}
+				}
+			}
+		} else {
+			break;
+		}
+	}
+	pclose (fp);
+
+
+	/* third stage */
+	sprintf(cmd, "/sbin/ifconfig %s 0 up", ifname);
+
+	if (system(cmd)){
+		return NULL;
+	}
+	
+	if ((fp = popen("/bin/cat /proc/modules", "r")) == NULL){
+		return NULL;
+	}
+	for (j = 0; fgets(s1, MAXCOL, fp);){
+		if (get_field_n(s2, s1, 1)){
+			for (i = 0; i < n; i++){
+				if (!astr[i][0] && get_field_n(s3, astr[i]+1, 1)){
+					if (strcmp(s2, s3) == 0){
+						p = get_field_n(s4, astr[i]+1, 3);
+						q = get_field_n(s5, s1, 3);
+						if (p && q && atoi(p) != atoi(q)){
+							astr[i][0] = 1; /* exclusive mark */
+						} else {
+						    j++;
+							strcpy(d, s2);
+						}
+					}
+				}
+			}
+		} else {
+			break;
+		}
+	}
+	pclose (fp);
+
+
+	/* check if single line is remaining */
+	if (j != 1){
+		return NULL;
+	}
+	return d;
+}
+
+
+
+
+
+
+
+int lr_config(int sock, struct ifreq *req)
+{
+	int ret;
+
+	ret = ioctl(sock, SIOCDEVPRIVATE, req);
+	if (ret < 0){
+		perror(PROG_NAME);
+	}
+	return ret;
+}
+
+
+void print_version(struct u_drv_info di)
+{
+	printf ("%s %d.%d.%d\n", di.name, di.major, di.minor, di.patch);
+	printf ("Copyright 2001-2004 Yumo (Katsuyuki Yumoto)\n");
+	printf ("\
+This is free software; see the source for copying conditions. There is NO\n\
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n");
+	printf ("\n");
+	return;
+}
+
+
+int version_match(struct u_drv_info di)
+{
+	return((di.major == LR_VER_MAJOR) && (di.minor == LR_VER_MINOR))?1:0;
+}
+
+
+void print_general_info(char *s)
+{
+	char sbuf[1024];
+	int len;
+
+	strcpy(sbuf, s);
+	len = strlen(sbuf);
+	sprintf(sbuf+len, "lrcfg version            : %d.%d.%d\n",
+		   LR_VER_MAJOR, LR_VER_MINOR, LR_VER_PATCH);
+	len = strlen(sbuf);
+	sprintf(sbuf+len,"Please type \"lrcfg -h\" to show usage.\n\n");
+	printf("%s", sbuf);
+	return;
+}
+
+
+int does_driver_exists(int s, struct u_drv_info *di)
+{
+	struct ifreq req;
+	struct lrconf vc;
+	int ret = 1;
+
+	if (s < 0 || !di){
+		ret = 0;
+		goto exit;
+	}
+	(struct lrconf *)req.ifr_data = &vc;
+	vc.buf = (unsigned char *)di;
+	vc.size = sizeof(struct u_drv_info);
+
+	/* check if lr device driver exists... */
+	strcpy(req.ifr_name, DEFAULT_LR_NAME);
+	vc.action = LRCTL_VERSION;
+	vc.magic = LR_MAGIC;
+	if (lr_config(s, &req))
+		ret = 0;
+
+	if (ret && strcmp(di->name, "LR") != 0)
+		ret = 0;
+
+exit:
+	return ret;
+}
+
+int add_phyif(int s, char *pif, char *vif)
+{
+	struct ifreq req;
+	struct lrconf vc;
+	char str[MAXCOL];
+	int ret = ERR_FAILCNF;
+
+	if (s < 0){
+		ret = ERR_INVALSD;
+		goto exit;
+	}
+	if (!pif ||	strlen(pif) > MAX_NAME){
+		ret = ERR_INVALPIF;
+		goto exit;
+	}
+	if (!vif ||	strlen(vif) > MAX_NAME){
+		ret = ERR_INVALVIF;
+		goto exit;
+	}
+
+	(struct lrconf *)req.ifr_data = &vc;
+	strcpy(req.ifr_name, DEFAULT_LR_NAME);
+	strcpy(vc.vif_name, vif);
+	strcpy(vc.pif_name, pif);
+	if (get_module_name(str, pif)){
+		strcpy(vc.pif_module, str);
+	} else {
+		vc.pif_module[0] = '\0';
+	}
+	vc.action = LRCTL_ADD_PHYIF;
+	vc.magic = LR_MAGIC;
+	vc.size = 0;
+	vc.buf = NULL;
+	if (lr_config(s, &req))
+		goto exit;
+	ret = 0;
+
+exit:
+	return ret;
+}
+
+int del_phyif(int s, char *pif)
+{
+	struct ifreq req;
+	struct lrconf vc;
+	int ret = ERR_FAILCNF;
+
+	if (s < 0){
+		ret = ERR_INVALSD;
+		goto exit;
+	}
+	if (!pif ||	strlen(pif) > MAX_NAME){
+		ret = ERR_INVALPIF;
+		goto exit;
+	}
+
+	strcpy(req.ifr_name, DEFAULT_LR_NAME);
+	req.ifr_data = (unsigned char *)&vc;
+	strcpy(vc.pif_name, pif);
+	vc.action = LRCTL_DEL_PHYIF;
+	vc.magic = LR_MAGIC;
+	vc.size = 0;
+	vc.buf = NULL;
+
+	if (lr_config(s, &req)){
+		goto exit;
+	}
+	ret = 0;
+
+exit:
+	return ret;
+}
+
+int print_dist_info(int s, char *vif)
+{
+	struct ifreq req;
+	struct lrconf vc;
+	unsigned char buf[1024*1024];
+	struct u_dist_info *di = (struct u_dist_info *)buf;
+	int i, j;
+	int ret = ERR_FAILCNF;
+
+	if (s < 0){
+		ret = ERR_INVALSD;
+		goto exit;
+	}
+	if (!vif ||	strlen(vif) > MAX_NAME){
+		ret = ERR_INVALVIF;
+		goto exit;
+	}
+
+	strcpy(req.ifr_name, DEFAULT_LR_NAME);
+	req.ifr_data = (unsigned char *)&vc;
+	strcpy(vc.vif_name, vif);
+	vc.action = LRCTL_GET_DISTINFO;
+	vc.magic = LR_MAGIC;
+	vc.size = 1024*1024;
+	vc.buf = buf;
+
+	if (lr_config(s, &req))
+		goto exit;
+
+	printf("\nlr distributing information\n");
+	printf("\nlr device: %s\n\n", vif);
+	printf("  neighbors       sub-group      age\n");
+	for (i = 0; i < vc.size; i++){
+		printf("%c ", di[i].is_bfu?'*':' ');
+		for (j = 0; j < 3; j++)
+			printf("%02x", di[i].m_addr[j]);
+		printf("-");
+		for (j = 3; j < 6; j++)
+			printf("%02x", di[i].m_addr[j]);
+		printf("      %2d        %5d\n", di[i].sgid, di[i].age);
+	}
+	printf("\n");
+
+	ret = 0;
+
+exit:
+	return ret;
+}
+
+int print_bfu_info(int s, char *vif)
+{
+	struct ifreq req;
+	struct lrconf vc;
+	unsigned char *buf = NULL;
+	struct u_bfu_info *di = NULL;
+	int i, j;
+	int ret = ERR_FAILCNF;
+
+	if (s < 0){
+		ret = ERR_INVALSD;
+		goto exit;
+	}
+	if (!vif ||	strlen(vif) > MAX_NAME){
+		ret = ERR_INVALVIF;
+		goto exit;
+	}
+
+	buf = (unsigned char *)malloc(sizeof(unsigned char)*1024*1024);
+	di = (struct u_bfu_info *)buf;
+	if (!buf){
+		ret = ERR_NOMEM;
+		goto exit;
+	}
+	strcpy(req.ifr_name, DEFAULT_LR_NAME);
+	req.ifr_data = (unsigned char *)&vc;
+	strcpy(vc.vif_name, vif);
+	vc.action = LRCTL_GET_BFUINFO;
+	vc.magic = LR_MAGIC;
+	vc.size = 1024*1024;
+	vc.buf = buf;
+
+	if (lr_config(s, &req))
+		goto exit;
+
+	printf("\nlr broadcast filtering unit information\n");
+	printf("\nlr device: %s\n\n", vif);
+	printf("neighbors       rcv sub-group      age\n");
+	for (i = 0; i < vc.size; i++){
+		for (j = 0; j < 3; j++)
+			printf("%02x", di[i].gaddr[j]);
+		printf("-");
+		for (j = 3; j < 6; j++)
+			printf("%02x", di[i].gaddr[j]);
+		printf("      %2d        %5d\n", di[i].min_sgid, di[i].age);
+	}
+	printf("\n");
+
+	ret = 0;
+exit:
+	if (buf)
+		free(buf);
+
+	return ret;
+}
+
+
+int print_group_info(struct u_group_info u, char *vif)
+{
+	int i;
+	int ret = 0;
+
+	if (!vif ||	strlen(vif) > MAX_NAME){
+		ret = ERR_INVALVIF;
+		goto exit;
+	}
+
+	printf("\nlr group information\n");
+	printf("\nlr device: %s\n\n", vif);
+	printf("group id:           %2d\n", u.gid);
+	printf("group address:     ");
+	for (i = 0; i < 3; i++)
+		printf("%02x", u.gaddr[i]);
+	printf("-");
+	for (i = 3; i < 6; i++)
+		printf("%02x", u.gaddr[i]);
+	printf("\n");
+	printf("periodic time:   %5d\n", u.perio_time);
+	printf("age time:        %5d\n", u.age_time);
+	printf("topology change detection/notification: %s\n",
+		   u.tchg_opt?"yes":"no");
+	printf("LRCP Phase II compatibility: %s\n",
+		   u.pii_opt?"yes":"no");
+	printf("group link status:   %s\n", u.lstat?"up":"down");
+	printf("\n\n");
+
+exit:
+	return ret;
+}
+
+int get_group_info(struct u_group_info *u, int s, char *vif)
+{
+	struct ifreq req;
+	struct lrconf vc;
+	int i;
+	int ret = ERR_FAILCNF;
+
+	if (!u){
+		ret = ERR_INVALPTR;
+		goto exit;
+	}
+	if (s < 0){
+		ret = ERR_INVALSD;
+		goto exit;
+	}
+	if (!vif ||	strlen(vif) > MAX_NAME){
+		ret = ERR_INVALVIF;
+		goto exit;
+	}
+
+	strcpy(req.ifr_name, DEFAULT_LR_NAME);
+	req.ifr_data = (unsigned char *)&vc;
+	strcpy(vc.vif_name, vif);
+	vc.action = LRCTL_GET_GRPINFO;
+	vc.magic = LR_MAGIC;
+	vc.size = sizeof(struct u_group_info);
+	(struct u_group_info *)vc.buf = u;
+
+	if (lr_config(s, &req))
+		goto exit;
+	ret = 0;
+
+exit:
+	return ret;
+}
+
+int set_group_info(struct u_group_info *u, int s, char *vif)
+{
+	struct ifreq req;
+	struct lrconf vc;
+	int ret = ERR_FAILCNF;
+
+	if (!u){
+		ret = ERR_INVALPTR;
+		goto exit;
+	}
+	if (s < 0){
+		ret = ERR_INVALSD;
+		goto exit;
+	}
+	if (!vif ||	strlen(vif) > MAX_NAME){
+		ret = ERR_INVALVIF;
+		goto exit;
+	}
+
+	strcpy(req.ifr_name, DEFAULT_LR_NAME);
+	(struct vethconf *)req.ifr_data = &vc;
+	strcpy(vc.vif_name, vif);
+	vc.action = LRCTL_SET_GRPINFO;
+	vc.magic = LR_MAGIC;
+	vc.size = sizeof(struct u_group_info);
+	(struct u_group_info *)vc.buf = u;
+	
+	if (lr_config(s, &req))
+		goto exit;
+	ret = 0;
+
+exit:
+	return ret;
+}
+
+int group_param_set(struct u_group_info *u, char *pnam, char *pval)
+{
+	int ret = 0;
+
+	if (!u){
+		ret = ERR_INVALPTR;
+		goto exit;
+	}
+	if (!pnam || strlen(pnam) > MAX_NAME){
+		ret = ERR_INVALPNAM;
+		goto exit;
+	}
+	if (!pval || strlen(pval) > MAX_NAME){
+		ret = ERR_INVALPVAL;
+		goto exit;
+	}
+
+	if (strcmp(pnam, "perio") == 0){
+		u->perio_time = atoi(pval)&0x7fff;
+	} else if (strcmp(pnam, "age") == 0){
+		u->age_time = atoi(pval)&0x7fff;
+	} else if (strcmp(pnam, "tchg") == 0){
+		u->tchg_opt = (strcmp(pval, "yes") == 0)?1:0;
+	} else if (strcmp(pnam, "pii") == 0){
+		u->pii_opt = (strcmp(pval, "yes") == 0)?1:0;
+	} else {
+		ret = ERR_INVALPNAM;
+		goto exit;
+	}
+
+	if (u->perio_time == 0)
+		ret = ERR_INVALPVAL;
+
+exit:
+	return ret;
+}
+
+int print_port_list(int s, char *vif)
+{
+	struct ifreq req;
+	struct lrconf vc;
+	unsigned char buf[1024*1024];
+	int i;
+	struct u_port_info *p = (struct u_port_info *)buf;
+	int ret = ERR_FAILCNF;
+	char ifname[MAX_NAME*4];
+#ifdef ETHMAP
+	char *sticky_intf = NULL;
+#endif
+
+	if (s < 0){
+		ret = ERR_INVALSD;
+		goto exit;
+	}
+	if (!vif ||	strlen(vif) > MAX_NAME){
+		ret = ERR_INVALVIF;
+		goto exit;
+	}
+
+	strcpy(req.ifr_name, DEFAULT_LR_NAME);
+	req.ifr_data = (unsigned char *)&vc;
+	strcpy(vc.vif_name, vif);
+	vc.action = LRCTL_GET_PORTLIST;
+	vc.magic = LR_MAGIC;
+	vc.size = 1024*1024;
+	vc.buf = buf;
+
+	if (lr_config(s, &req)){
+		goto exit;
+	}
+
+	printf("\nlr port information\n");
+	printf("\nlr device: %s\n\n", vif);
+	printf("active      port       name        sub-group  group  link\n");
+	for (i = 0; i < vc.size; i++){
+#ifdef ETHMAP
+		sticky_intf = ethmap_reverse_query(p[i].dev_name);
+		if (sticky_intf)
+			sprintf(ifname, "[%s]", sticky_intf);
+		else
+#endif
+			sprintf(ifname, "%s", p[i].dev_name);
+		printf("   %c         %2d   %10s          %2d       %2d     %-4s\n",
+			   (p[i].pid==p[i].aid)?'*':' ',
+			   p[i].pid,
+			   ifname,
+			   p[i].sgid, p[i].gid,
+			   p[i].lstat?"up":"down");
+	}
+	printf("\n");
+	ret = 0;
+
+exit:
+	return ret;
+}
+
+
+int print_sys_info(int s)
+{
+	struct ifreq req;
+	struct lrconf vc;
+	struct u_sys_info si;
+	int i;
+	int ret = ERR_FAILCNF;
+
+	if (s < 0){
+		ret = ERR_INVALSD;
+		goto exit;
+	}
+
+	strcpy(req.ifr_name, DEFAULT_LR_NAME);
+	req.ifr_data = (unsigned char *)&vc;
+	strcpy(vc.vif_name, DEFAULT_LR_NAME);
+	vc.action = LRCTL_GET_SYSINFO;
+	vc.magic = LR_MAGIC;
+	vc.size = sizeof(struct u_sys_info);
+	vc.buf = (unsigned char *)&si;
+
+	if (lr_config(s, &req)){
+		goto exit;
+	}
+
+	printf("\nlr system global information\n\n");
+	printf("system id:  ");
+	for (i = 0; i < 3; i++)
+		printf("%02x", si.sys_id[i]);
+	printf("-");
+	for (i = 3; i < 6; i++)
+		printf("%02x", si.sys_id[i]);
+	printf("\n\n");
+	
+	ret = 0;
+
+exit:
+	return ret;
+}
+
+void print_reason(int code)
+{
+	switch(code){
+	case ERR_FAILCNF:
+		fprintf(stderr, "%s: Fail to ioctl.\n", PROG_NAME);
+		break;
+	case ERR_FEWARGS:
+		fprintf(stderr, "%s: Too few arguments.\n", PROG_NAME);
+		break;
+	case ERR_INVALPIF:
+		fprintf(stderr, "%s: Invalid physical interface name\n", PROG_NAME);
+		break;
+	case ERR_INVALPNAM:
+		fprintf(stderr, "%s: Invalid parameter name\n", PROG_NAME);
+		break;
+	case ERR_INVALPTR:
+		fprintf(stderr, "%s: Invalid pointer\n", PROG_NAME);
+		break;
+	case ERR_INVALPVAL:
+		fprintf(stderr, "%s: Invalid parameter value\n", PROG_NAME);
+		break;
+	case ERR_INVALSD:
+		fprintf(stderr, "%s: Invalid socket id\n", PROG_NAME);
+		break;
+	case ERR_INVALVIF:
+		fprintf(stderr, "%s: Invalid virtual interface name\n", PROG_NAME);
+		break;
+	case ERR_NODRV:
+		fprintf(stderr, "%s: lr driver does not exists.\n", PROG_NAME);
+		break;
+	case ERR_NOMEM:
+		fprintf(stderr, "%s: Cannot allocate memory.\n", PROG_NAME);
+		break;
+	case ERR_UNKNCOMM:
+		fprintf(stderr, "%s: Unknown command\n", PROG_NAME);
+		break;
+	}
+}
+
+int lr_command(int argc, char **argv)
+{
+	int sock;
+	char sbuf[1024];
+	char str[MAXCOL];
+	struct u_drv_info di;
+	int ret = 0;
+#ifdef ETHMAP
+	char *sticky_intf = NULL;
+#endif
+
+	if (argc < 2) {
+		usage();
+		ret = 1;
+		goto close_and_ret;
+	}
+	if (strcmp(argv[1], "-h") == 0 ||
+		strcmp(argv[1], "--help") == 0){
+		usage();
+		goto close_and_ret;
+	}
+	
+	/* a silly raw socket just for ioctl()ling it */
+//	sock = socket(AF_INET, SOCK_RAW, IPPROTO_RAW);
+	sock = socket(AF_INET, SOCK_DGRAM, 0);
+	if (sock < 0) {
+		perror(PROG_NAME);
+		print_general_info("");
+		ret = 1;
+		goto close_and_ret;
+	}
+	
+	if (!does_driver_exists(sock, &di)){
+		print_general_info("lr device driver does not exists.\n");
+		ret = 1;
+		goto close_and_ret;
+	}
+	
+	if (!version_match(di)){
+		print_general_info("Version mismatch between lrcfg and lr driver.\nUpdate lrcfg please.\n\n");
+		printf("lr device driver version : %d.%d.%d\n", di.major, di.minor, di.patch);
+		printf("lrcfg version            : %d.%d.%d\n",
+			   LR_VER_MAJOR, LR_VER_MINOR, LR_VER_PATCH);
+		ret = 1;
+		goto close_and_ret;
+	}
+	
+	
+	if (strcmp(argv[1], "add") == 0){
+		if (argc < 4){
+			ret = ERR_FEWARGS;
+			goto close_and_ret;
+		}
+#ifdef ETHMAP
+		sticky_intf = ethmap_query(argv[2]);
+		ret = add_phyif(sock, sticky_intf, argv[3]);
+#else
+		ret = add_phyif(sock, argv[2], argv[3]);
+#endif
+	} else if (strcmp(argv[1], "del") == 0){
+		if (argc < 3){
+			ret = ERR_FEWARGS;
+			goto close_and_ret;
+		}
+#ifdef ETHMAP
+		sticky_intf = ethmap_query(argv[2]);
+		ret =del_phyif(sock, sticky_intf);
+#else
+		ret =del_phyif(sock, argv[2]);
+#endif
+	} else if (strcmp(argv[1], "list") == 0){
+		FILE *fp = fopen("/proc/net/lrcp", "r");
+		if (!fp){
+			ret = ERR_NODRV;
+			goto close_and_ret;
+		}
+		for (; fgets(str, MAXCOL, fp);){
+			printf("%s", str);
+		}
+	} else if (strcmp(argv[1], "showdist") == 0){
+		if (argc < 3){
+			ret = ERR_FEWARGS;
+			goto close_and_ret;
+		}
+		ret = print_dist_info(sock, argv[2]);
+	} else if (strcmp(argv[1], "showbfu") == 0){
+		if (argc < 3){
+			ret = ERR_FEWARGS;
+			goto close_and_ret;
+		}
+		ret = print_bfu_info(sock, argv[2]);
+	} else if (strcmp(argv[1], "showport") == 0){
+		if (argc < 3){
+			ret = ERR_FEWARGS;
+			goto close_and_ret;
+		}
+		ret = print_port_list(sock, argv[2]);
+	} else if (strcmp(argv[1], "showsys") == 0){
+		ret = print_sys_info(sock);
+	} else if (strcmp(argv[1], "showgrp") == 0){
+		struct u_group_info u;
+		
+		if (argc < 3){
+			ret = ERR_FEWARGS;
+			goto close_and_ret;
+		}
+		ret = get_group_info(&u, sock, argv[2]);
+		if (ret)
+			goto close_and_ret;
+
+		ret = print_group_info(u, argv[2]);
+	
+	} else if (strcmp(argv[1], "setgrp") == 0){
+	
+		struct u_group_info u;
+		
+		if (argc < 5){
+			ret = ERR_FEWARGS;
+			goto close_and_ret;
+		}
+		
+		if (strncmp(argv[2], "lr", 2)){
+			ret = ERR_INVALVIF;
+			goto close_and_ret;
+		}
+		
+		ret =get_group_info(&u, sock, argv[2]);
+		if (ret){
+			goto close_and_ret;
+		}
+		
+		ret = group_param_set(&u, argv[3], argv[4]);
+		if (ret){
+			goto close_and_ret;
+		}
+		
+		ret = set_group_info(&u, sock, argv[2]);
+		
+	} else if (strcmp(argv[1], "ver") == 0){
+		print_version(di);
+		ret = 0;
+		goto close_and_ret;
+	} else {
+		ret = ERR_UNKNCOMM;
+		goto close_and_ret;
+	}
+	
+close_and_ret:
+	if (ret < 0)
+		print_reason(ret);
+	
+	if (ret){
+		ret = 1;
+	}
+	close(sock);
+	return ret;
+}
+
+/*
+ * Local variables:
+ *  c-indent-level: 4
+ *  c-basic-offset: 4
+ *  tab-width: 4
+ *  indent-tabs-mode: t
+ * End:
+ */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/lr/lrlink.c linux-2.4.20-wolk4.16-fullkernel/net/lr/lrlink.c
--- linux-2.4.20-wolk4.15-fullkernel/net/lr/lrlink.c	2004-06-29 11:25:31.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/lr/lrlink.c	2004-09-05 16:00:20.000000000 +0200
@@ -1,4 +1,4 @@
-/* $Id: lr.c,v 1.16 2004/02/21 08:41:28 yumo Exp $ */
+/* $Id: lr.c,v 1.18 2004/06/16 12:18:44 yumo Exp $ */
 /* LR: A virtual ethernet device driver for Linux. 
  *
  * This device driver is implementation of Redundancy of
@@ -828,6 +828,7 @@ static int lr_group_distribution(struct 
 	skb = skb_clone(nskb, GFP_ATOMIC);
 
 	if (!skb){
+		kfree_skb(nskb);
 		return NET_XMIT_DROP;
 	}
 
@@ -839,12 +840,14 @@ static int lr_group_distribution(struct 
          * this to all the sug-groups.
 		 */
 		if (!lr_all_subg_distribution(skb, vp->group->var.subg_list)){
-			return NET_XMIT_DROP;
+			kfree_skb(nskb);
+			return NET_XMIT_SUCCESS;
 		}
 		break;
 	default:
 		if (!lr_subg_distribution(skb, vp->group->var.subg_list, sgid)){
-			return NET_XMIT_DROP;
+			kfree_skb(nskb);
+			return NET_XMIT_SUCCESS;
 		}
 		break;
 	}
@@ -3064,6 +3067,8 @@ static int lr_ioctl_dispatch(struct lrco
  			return lr_get_version((struct u_drv_info *)vc->buf);
 
 		case LRCTL_ADD_PHYIF: /* add physical i/f to pool*/
+			if (!cap_raised(current->cap_effective, CAP_NET_ADMIN))
+				return -EPERM;
 			n = lr_get_group_id_by_name(vc->vif_name);
 			if (!n)
 				return -ENODEV;
@@ -3075,6 +3080,8 @@ static int lr_ioctl_dispatch(struct lrco
 			return n;
 
 		case LRCTL_DEL_PHYIF: /* delete physical i/f from pool */
+			if (!cap_raised(current->cap_effective, CAP_NET_ADMIN))
+				return -EPERM;
 			n = lr_del_phyif(vc->pif_name);
 			return n;
 
@@ -3106,6 +3113,8 @@ static int lr_ioctl_dispatch(struct lrco
 			vc->size = n;
 			break;
 		case LRCTL_SET_GRPINFO:
+			if (!cap_raised(current->cap_effective, CAP_NET_ADMIN))
+				return -EPERM;
 			n = lr_set_group_info((struct u_group_info *)vc->buf, vc->vif_name);
 			if (n < 0)
 				return n;
@@ -3113,12 +3122,16 @@ static int lr_ioctl_dispatch(struct lrco
 			break;
 #if 0
 		case LRCTL_ADD_GRP:
+			if (!cap_raised(current->cap_effective, CAP_NET_ADMIN))
+				return -EPERM;
 			n = lr_add_group((struct u_group_info *)vc->buf);
 			if (n < 0)
 				return -EINVAL;
 			vc->size = n;
 			break;
 		case LRCTL_DEL_GRP:
+			if (!cap_raised(current->cap_effective, CAP_NET_ADMIN))
+				return -EPERM;
 			n = lr_del_group((struct u_group_info *)vc->buf);
 			if (n < 0)
 				return -EINVAL;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/lr/lrlink.h linux-2.4.20-wolk4.16-fullkernel/net/lr/lrlink.h
--- linux-2.4.20-wolk4.15-fullkernel/net/lr/lrlink.h	2004-06-29 11:25:31.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/lr/lrlink.h	2004-09-05 16:00:19.000000000 +0200
@@ -1,4 +1,4 @@
-/* $Id: lr.h,v 1.11 2004/03/01 13:48:57 yumo Exp $ */
+/* $Id: lr.h,v 1.12 2004/03/06 14:47:32 yumo Exp $ */
 /* LRCP: A virtual ethernet device driver for Linux header file. 
  *
  * This device driver is an implementation of Redundancy of Multiple
@@ -30,7 +30,7 @@
 
 #define LR_VER_MAJOR 0
 #define LR_VER_MINOR 8
-#define LR_VER_PATCH 4
+#define LR_VER_PATCH 5
 
 #define LR_MAGIC 0x3eac
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/lr/miicompat.h linux-2.4.20-wolk4.16-fullkernel/net/lr/miicompat.h
--- linux-2.4.20-wolk4.15-fullkernel/net/lr/miicompat.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/net/lr/miicompat.h	2004-09-05 16:00:19.000000000 +0200
@@ -0,0 +1,197 @@
+#ifndef SIOCGMIIPHY /* Old linux does not define this */
+#define SIOCGMIIPHY SIOCDEVPRIVATE
+#define SIOCGMIIREG SIOCDEVPRIVATE+1
+#define SIOCSMIIREG SIOCDEVPRIVATE+2
+
+/* following definitions come from in linux-2.4.18 */
+
+/*
+ * linux/mii.h: definitions for MII-compatible transceivers
+ * Originally drivers/net/sunhme.h.
+ *
+ * Copyright (C) 1996, 1999, 2001 David S. Miller (davem@redhat.com)
+ */
+
+#ifndef __LINUX_MII_H__
+#define __LINUX_MII_H__
+
+#include <linux/types.h>
+
+/* Generic MII registers. */
+
+#define MII_BMCR            0x00        /* Basic mode control register */
+#define MII_BMSR            0x01        /* Basic mode status register  */
+#define MII_PHYSID1         0x02        /* PHYS ID 1                   */
+#define MII_PHYSID2         0x03        /* PHYS ID 2                   */
+#define MII_ADVERTISE       0x04        /* Advertisement control reg   */
+#define MII_LPA             0x05        /* Link partner ability reg    */
+#define MII_EXPANSION       0x06        /* Expansion register          */
+#define MII_DCOUNTER        0x12        /* Disconnect counter          */
+#define MII_FCSCOUNTER      0x13        /* False carrier counter       */
+#define MII_NWAYTEST        0x14        /* N-way auto-neg test reg     */
+#define MII_RERRCOUNTER     0x15        /* Receive error counter       */
+#define MII_SREVISION       0x16        /* Silicon revision            */
+#define MII_RESV1           0x17        /* Reserved...                 */
+#define MII_LBRERROR        0x18        /* Lpback, rx, bypass error    */
+#define MII_PHYADDR         0x19        /* PHY address                 */
+#define MII_RESV2           0x1a        /* Reserved...                 */
+#define MII_TPISTATUS       0x1b        /* TPI status for 10mbps       */
+#define MII_NCONFIG         0x1c        /* Network interface config    */
+
+/* Basic mode control register. */
+#define BMCR_RESV               0x007f  /* Unused...                   */
+#define BMCR_CTST               0x0080  /* Collision test              */
+#define BMCR_FULLDPLX           0x0100  /* Full duplex                 */
+#define BMCR_ANRESTART          0x0200  /* Auto negotiation restart    */
+#define BMCR_ISOLATE            0x0400  /* Disconnect DP83840 from MII */
+#define BMCR_PDOWN              0x0800  /* Powerdown the DP83840       */
+#define BMCR_ANENABLE           0x1000  /* Enable auto negotiation     */
+#define BMCR_SPEED100           0x2000  /* Select 100Mbps              */
+#define BMCR_LOOPBACK           0x4000  /* TXD loopback bits           */
+#define BMCR_RESET              0x8000  /* Reset the DP83840           */
+
+/* Basic mode status register. */
+#define BMSR_ERCAP              0x0001  /* Ext-reg capability          */
+#define BMSR_JCD                0x0002  /* Jabber detected             */
+#define BMSR_LSTATUS            0x0004  /* Link status                 */
+#define BMSR_ANEGCAPABLE        0x0008  /* Able to do auto-negotiation */
+#define BMSR_RFAULT             0x0010  /* Remote fault detected       */
+#define BMSR_ANEGCOMPLETE       0x0020  /* Auto-negotiation complete   */
+#define BMSR_RESV               0x07c0  /* Unused...                   */
+#define BMSR_10HALF             0x0800  /* Can do 10mbps, half-duplex  */
+#define BMSR_10FULL             0x1000  /* Can do 10mbps, full-duplex  */
+#define BMSR_100HALF            0x2000  /* Can do 100mbps, half-duplex */
+#define BMSR_100FULL            0x4000  /* Can do 100mbps, full-duplex */
+#define BMSR_100BASE4           0x8000  /* Can do 100mbps, 4k packets  */
+
+/* Advertisement control register. */
+#define ADVERTISE_SLCT          0x001f  /* Selector bits               */
+#define ADVERTISE_CSMA          0x0001  /* Only selector supported     */
+#define ADVERTISE_10HALF        0x0020  /* Try for 10mbps half-duplex  */
+#define ADVERTISE_10FULL        0x0040  /* Try for 10mbps full-duplex  */
+#define ADVERTISE_100HALF       0x0080  /* Try for 100mbps half-duplex */
+#define ADVERTISE_100FULL       0x0100  /* Try for 100mbps full-duplex */
+#define ADVERTISE_100BASE4      0x0200  /* Try for 100mbps 4k packets  */
+#define ADVERTISE_RESV          0x1c00  /* Unused...                   */
+#define ADVERTISE_RFAULT        0x2000  /* Say we can detect faults    */
+#define ADVERTISE_LPACK         0x4000  /* Ack link partners response  */
+#define ADVERTISE_NPAGE         0x8000  /* Next page bit               */
+
+#define ADVERTISE_FULL (ADVERTISE_100FULL | ADVERTISE_10FULL | \
+			ADVERTISE_CSMA)
+#define ADVERTISE_ALL (ADVERTISE_10HALF | ADVERTISE_10FULL | \
+                       ADVERTISE_100HALF | ADVERTISE_100FULL)
+
+/* Link partner ability register. */
+#define LPA_SLCT                0x001f  /* Same as advertise selector  */
+#define LPA_10HALF              0x0020  /* Can do 10mbps half-duplex   */
+#define LPA_10FULL              0x0040  /* Can do 10mbps full-duplex   */
+#define LPA_100HALF             0x0080  /* Can do 100mbps half-duplex  */
+#define LPA_100FULL             0x0100  /* Can do 100mbps full-duplex  */
+#define LPA_100BASE4            0x0200  /* Can do 100mbps 4k packets   */
+#define LPA_RESV                0x1c00  /* Unused...                   */
+#define LPA_RFAULT              0x2000  /* Link partner faulted        */
+#define LPA_LPACK               0x4000  /* Link partner acked us       */
+#define LPA_NPAGE               0x8000  /* Next page bit               */
+
+#define LPA_DUPLEX		(LPA_10FULL | LPA_100FULL)
+#define LPA_100			(LPA_100FULL | LPA_100HALF | LPA_100BASE4)
+
+/* Expansion register for auto-negotiation. */
+#define EXPANSION_NWAY          0x0001  /* Can do N-way auto-nego      */
+#define EXPANSION_LCWP          0x0002  /* Got new RX page code word   */
+#define EXPANSION_ENABLENPAGE   0x0004  /* This enables npage words    */
+#define EXPANSION_NPCAPABLE     0x0008  /* Link partner supports npage */
+#define EXPANSION_MFAULTS       0x0010  /* Multiple faults detected    */
+#define EXPANSION_RESV          0xffe0  /* Unused...                   */
+
+/* N-way test register. */
+#define NWAYTEST_RESV1          0x00ff  /* Unused...                   */
+#define NWAYTEST_LOOPBACK       0x0100  /* Enable loopback for N-way   */
+#define NWAYTEST_RESV2          0xfe00  /* Unused...                   */
+
+
+struct mii_if_info {
+	int phy_id;
+	int advertising;
+
+	unsigned int full_duplex : 1;
+	unsigned int duplex_lock : 1;
+
+	struct net_device *dev;
+	int (*mdio_read) (struct net_device *dev, int phy_id, int location);
+	void (*mdio_write) (struct net_device *dev, int phy_id, int location, int val);
+};
+
+struct ethtool_cmd;
+
+int mii_link_ok (struct mii_if_info *mii);
+int mii_nway_restart (struct mii_if_info *mii);
+int mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd);
+int mii_ethtool_sset(struct mii_if_info *mii, struct ethtool_cmd *ecmd);
+
+
+/* This structure is used in all SIOCxMIIxxx ioctl calls */
+struct mii_ioctl_data {
+	u16		phy_id;
+	u16		reg_num;
+	u16		val_in;
+	u16		val_out;
+};
+
+
+/**
+ * mii_nway_result
+ * @negotiated: value of MII ANAR and'd with ANLPAR
+ *
+ * Given a set of MII abilities, check each bit and returns the
+ * currently supported media, in the priority order defined by
+ * IEEE 802.3u.  We use LPA_xxx constants but note this is not the
+ * value of LPA solely, as described above.
+ *
+ * The one exception to IEEE 802.3u is that 100baseT4 is placed
+ * between 100T-full and 100T-half.  If your phy does not support
+ * 100T4 this is fine.  If your phy places 100T4 elsewhere in the
+ * priority order, you will need to roll your own function.
+ */
+static inline unsigned int mii_nway_result (unsigned int negotiated)
+{
+	unsigned int ret;
+
+	if (negotiated & LPA_100FULL)
+		ret = LPA_100FULL;
+	else if (negotiated & LPA_100BASE4)
+		ret = LPA_100BASE4;
+	else if (negotiated & LPA_100HALF)
+		ret = LPA_100HALF;
+	else if (negotiated & LPA_10FULL)
+		ret = LPA_10FULL;
+	else
+		ret = LPA_10HALF;
+
+	return ret;
+}
+
+/**
+ * mii_duplex
+ * @duplex_lock: Non-zero if duplex is locked at full
+ * @negotiated: value of MII ANAR and'd with ANLPAR
+ *
+ * A small helper function for a common case.  Returns one
+ * if the media is operating or locked at full duplex, and
+ * returns zero otherwise.
+ */
+static inline unsigned int mii_duplex (unsigned int duplex_lock,
+				       unsigned int negotiated)
+{
+	if (duplex_lock)
+		return 1;
+	if (mii_nway_result(negotiated) & LPA_DUPLEX)
+		return 1;
+	return 0;
+}
+
+
+#endif /* __LINUX_MII_H__ */
+
+#endif /* SIOCGMIIPHY */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/netlink/af_netlink.c linux-2.4.20-wolk4.16-fullkernel/net/netlink/af_netlink.c
--- linux-2.4.20-wolk4.15-fullkernel/net/netlink/af_netlink.c	2004-06-29 11:26:18.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/netlink/af_netlink.c	2004-09-05 16:08:03.000000000 +0200
@@ -43,6 +43,7 @@
 #include <linux/grsecurity.h>
 #include <net/sock.h>
 #include <net/scm.h>
+#include <linux/tqueue.h>
 
 #define Nprintk(a...)
 
@@ -64,6 +65,15 @@ struct netlink_opt
 	void			(*data_ready)(struct sock *sk, int bytes);
 };
 
+struct netlink_work
+{
+	struct sock 		*sk;
+	int 			len;
+	struct tq_struct	work;
+};
+
+static DECLARE_TASK_QUEUE(tq_netlink);
+static DECLARE_WAIT_QUEUE_HEAD(netlink_thread_wait);
 static struct sock *nl_table[MAX_LINKS];
 static DECLARE_WAIT_QUEUE_HEAD(nl_table_wait);
 static unsigned nl_nonroot[MAX_LINKS];
@@ -82,6 +92,15 @@ static atomic_t nl_table_users = ATOMIC_
 
 static struct notifier_block *netlink_chain;
 
+void netlink_tq_handler(void *data)
+{
+	struct netlink_work *work = data;
+	
+	work->sk->data_ready(work->sk, work->len);
+	sock_put(work->sk);
+	kfree(work);
+}
+
 static void netlink_sock_destruct(struct sock *sk)
 {
 	skb_queue_purge(&sk->receive_queue);
@@ -386,6 +405,7 @@ static int netlink_getname(struct socket
 	struct sockaddr_nl *nladdr=(struct sockaddr_nl *)addr;
 	
 	nladdr->nl_family = AF_NETLINK;
+	nladdr->nl_pad = 0;
 	*addr_len = sizeof(*nladdr);
 
 	if (peer) {
@@ -421,6 +441,11 @@ retry:
 	if (sk == NULL)
 		goto no_dst;
 
+	/* Don't bother queuing skb if kernel socket has no input function */
+	if (sk->protinfo.af_netlink->pid == 0 &&
+	    !sk->protinfo.af_netlink->data_ready)
+		goto no_dst;
+
 #ifdef NL_EMULATE_DEV
 	if (sk->protinfo.af_netlink->handler) {
 		skb_orphan(skb);
@@ -432,6 +457,8 @@ retry:
 
 	if (atomic_read(&sk->rmem_alloc) > sk->rcvbuf ||
 	    test_bit(0, &sk->protinfo.af_netlink->state)) {
+		struct task_struct *client;
+		
 		if (!timeo) {
 			if (ssk->protinfo.af_netlink->pid == 0)
 				netlink_overrun(sk);
@@ -440,6 +467,19 @@ retry:
 			return -EAGAIN;
 		}
 
+		if (!sk->protinfo.af_netlink->pid) {
+			/* Kernel is sending information to user space
+			 * and socket buffer is full: Wake up user */
+			
+			client = find_task_by_pid(sk->protinfo.af_netlink->pid);
+			if (!client) {
+				sock_put(sk);
+				kfree_skb(skb);
+				return -EAGAIN;
+			}
+			wake_up_process(client);
+		}
+
 		__set_current_state(TASK_INTERRUPTIBLE);
 		add_wait_queue(&sk->protinfo.af_netlink->wait, &wait);
 
@@ -462,8 +502,26 @@ retry:
 	skb_orphan(skb);
 	skb_set_owner_r(skb, sk);
 	skb_queue_tail(&sk->receive_queue, skb);
-	sk->data_ready(sk, len);
-	sock_put(sk);
+
+	if (!sk->protinfo.af_netlink->pid) {
+		struct netlink_work *nlwork = 
+			kmalloc(sizeof(struct netlink_work), GFP_KERNEL);
+		
+		if  (!nlwork) {
+			sock_put(sk);
+			return -EAGAIN;
+		}
+		
+		INIT_TQUEUE(&nlwork->work, netlink_tq_handler, nlwork);
+		nlwork->sk = sk;
+		nlwork->len = len;
+		queue_task(&nlwork->work, &tq_netlink);
+		wake_up(&netlink_thread_wait);
+	} else {
+		sk->data_ready(sk, len);
+		sock_put(sk);
+	}
+	
 	return len;
 
 no_dst:
@@ -485,7 +543,22 @@ static __inline__ int netlink_broadcast_
                 skb_orphan(skb);
 		skb_set_owner_r(skb, sk);
 		skb_queue_tail(&sk->receive_queue, skb);
-		sk->data_ready(sk, skb->len);
+
+		if (!sk->protinfo.af_netlink->pid) {
+			struct netlink_work *nlwork = 
+				kmalloc(sizeof(struct netlink_work), GFP_KERNEL);
+		
+			if  (!nlwork) 
+				return -EAGAIN;
+		
+			INIT_TQUEUE(&nlwork->work, netlink_tq_handler, nlwork);
+			nlwork->sk = sk;
+			nlwork->len = skb->len;
+			queue_task(&nlwork->work, &tq_netlink);
+			wake_up(&netlink_thread_wait);
+		} else 
+			sk->data_ready(sk, skb->len);
+
 		return 0;
 	}
 	return -1;
@@ -529,11 +602,12 @@ void netlink_broadcast(struct sock *ssk,
 			netlink_overrun(sk);
 			/* Clone failed. Notify ALL listeners. */
 			failure = 1;
+			sock_put(sk);
 		} else if (netlink_broadcast_deliver(sk, skb2)) {
 			netlink_overrun(sk);
+			sock_put(sk);
 		} else
 			skb2 = NULL;
-		sock_put(sk);
 	}
 
 	netlink_unlock_table();
@@ -563,6 +637,14 @@ void netlink_set_err(struct sock *ssk, u
 	read_unlock(&nl_table_lock);
 }
 
+static inline void netlink_rcv_wake(struct sock *sk)
+{
+	if (skb_queue_len(&sk->receive_queue) == 0)
+		clear_bit(0, &sk->protinfo.af_netlink->state);
+	if (!test_bit(0, &sk->protinfo.af_netlink->state))
+		wake_up_interruptible(&sk->protinfo.af_netlink->wait);
+}
+
 static int netlink_sendmsg(struct socket *sock, struct msghdr *msg, int len,
 			   struct scm_cookie *scm)
 {
@@ -664,6 +746,7 @@ static int netlink_recvmsg(struct socket
 	if (msg->msg_name) {
 		struct sockaddr_nl *addr = (struct sockaddr_nl*)msg->msg_name;
 		addr->nl_family = AF_NETLINK;
+		addr->nl_pad    = 0;
 		addr->nl_pid	= NETLINK_CB(skb).pid;
 		addr->nl_groups	= NETLINK_CB(skb).dst_groups;
 		msg->msg_namelen = sizeof(*addr);
@@ -677,12 +760,7 @@ static int netlink_recvmsg(struct socket
 		netlink_dump(sk);
 
 out:
-	if (skb_queue_len(&sk->receive_queue) <= sk->rcvbuf/2) {
-		if (skb_queue_len(&sk->receive_queue) == 0)
-			clear_bit(0, &sk->protinfo.af_netlink->state);
-		if (!test_bit(0, &sk->protinfo.af_netlink->state))
-			wake_up_interruptible(&sk->protinfo.af_netlink->wait);
-	}
+	netlink_rcv_wake(sk);
 	return err ? : copied;
 }
 
@@ -690,13 +768,7 @@ void netlink_data_ready(struct sock *sk,
 {
 	if (sk->protinfo.af_netlink->data_ready)
 		sk->protinfo.af_netlink->data_ready(sk, len);
-
-	if (skb_queue_len(&sk->receive_queue) <= sk->rcvbuf/2) {
-		if (skb_queue_len(&sk->receive_queue) == 0)
-			clear_bit(0, &sk->protinfo.af_netlink->state);
-		if (!test_bit(0, &sk->protinfo.af_netlink->state))
-			wake_up_interruptible(&sk->protinfo.af_netlink->wait);
-	}
+	netlink_rcv_wake(sk);
 }
 
 /*
@@ -884,8 +956,17 @@ void netlink_ack(struct sk_buff *in_skb,
 		size = NLMSG_SPACE(4 + NLMSG_ALIGN(nlh->nlmsg_len));
 
 	skb = alloc_skb(size, GFP_KERNEL);
-	if (!skb)
-		return;
+	if (!skb) {
+		struct sock *sk;
+
+		sk = netlink_lookup(in_skb->sk->protocol,
+				    NETLINK_CB(in_skb).pid);
+		if (sk) {
+			sk->err = ENOBUFS;
+			sk->error_report(sk);
+			sock_put(sk);
+		}
+	}
 
 	rep = __nlmsg_put(skb, NETLINK_CB(in_skb).pid, nlh->nlmsg_seq,
 			  NLMSG_ERROR, sizeof(struct nlmsgerr));
@@ -895,6 +976,26 @@ void netlink_ack(struct sk_buff *in_skb,
 	netlink_unicast(in_skb->sk, skb, NETLINK_CB(in_skb).pid, MSG_DONTWAIT);
 }
 
+static int netlink_thread(void *unused)
+{
+	struct task_struct *tsk = current;
+	DECLARE_WAITQUEUE(wait, tsk);
+
+	daemonize();
+	strcpy(tsk->comm, "knetlinkd");
+	sigfillset(&tsk->blocked);
+	mb();
+
+	for (;;) {
+		run_task_queue(&tq_netlink);
+		
+		__set_current_state(TASK_INTERRUPTIBLE);
+		add_wait_queue(&netlink_thread_wait, &wait);
+		schedule();
+		__set_current_state(TASK_RUNNING);
+		remove_wait_queue(&netlink_thread_wait, &wait);
+	}
+}
 
 #ifdef NL_EMULATE_DEV
 
@@ -1054,6 +1155,8 @@ static int __init netlink_proto_init(voi
 #ifdef CONFIG_PROC_FS
 	create_proc_read_entry("net/netlink", 0, 0, netlink_read_proc, NULL);
 #endif
+	kernel_thread(netlink_thread, NULL, CLONE_FS | CLONE_FILES | CLONE_SIGNAL);
+	
 	return 0;
 }
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/netsyms.c linux-2.4.20-wolk4.16-fullkernel/net/netsyms.c
--- linux-2.4.20-wolk4.15-fullkernel/net/netsyms.c	2004-06-29 11:35:50.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/netsyms.c	2004-09-05 16:09:09.000000000 +0200
@@ -47,9 +47,6 @@ extern __u32 sysctl_rmem_max;
 #include <linux/ip.h>
 #include <net/protocol.h>
 #include <net/arp.h>
-#if defined(CONFIG_ATM_CLIP) || defined(CONFIG_ATM_CLIP_MODULE)
-#include <net/atmclip.h>
-#endif
 #include <net/ip.h>
 #include <net/udp.h>
 #include <net/tcp.h>
@@ -260,6 +257,8 @@ EXPORT_SYMBOL(ip_route_input_lookup);
 EXPORT_SYMBOL(icmp_send);
 EXPORT_SYMBOL(ip_options_compile);
 EXPORT_SYMBOL(ip_options_undo);
+EXPORT_SYMBOL(arp_create);
+EXPORT_SYMBOL(arp_xmit);
 EXPORT_SYMBOL(arp_send);
 EXPORT_SYMBOL(arp_broken_ops);
 EXPORT_SYMBOL(__ip_select_ident);
@@ -280,6 +279,7 @@ EXPORT_SYMBOL(ip_dev_find);
 EXPORT_SYMBOL(inetdev_by_index);
 EXPORT_SYMBOL(in_dev_finish_destroy);
 EXPORT_SYMBOL(ip_defrag);
+EXPORT_SYMBOL(ipfrag_flush);
 
 /* Route manipulation */
 EXPORT_SYMBOL(ip_rt_ioctl);
@@ -473,9 +473,6 @@ EXPORT_SYMBOL(xrlim_allow);
 EXPORT_SYMBOL(ip_rcv);
 EXPORT_SYMBOL(arp_rcv);
 EXPORT_SYMBOL(arp_tbl);
-#if defined(CONFIG_ATM_CLIP) || defined(CONFIG_ATM_CLIP_MODULE)
-EXPORT_SYMBOL(clip_tbl_hook);
-#endif
 EXPORT_SYMBOL(arp_find);
 
 #endif  /* CONFIG_INET */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/sched/Config.in linux-2.4.20-wolk4.16-fullkernel/net/sched/Config.in
--- linux-2.4.20-wolk4.15-fullkernel/net/sched/Config.in	2004-06-29 11:25:52.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/sched/Config.in	2004-09-05 17:14:41.000000000 +0200
@@ -13,11 +13,10 @@ tristate '  The simplest PRIO pseudosche
 tristate '  WRR packet scheduler' CONFIG_NET_SCH_WRR
 tristate '  RED queue' CONFIG_NET_SCH_RED
 tristate '  SFQ queue' CONFIG_NET_SCH_SFQ
-tristate '  ESFQ queue' CONFIG_NET_SCH_ESFQ
 tristate '  TEQL queue' CONFIG_NET_SCH_TEQL
 tristate '  TBF queue' CONFIG_NET_SCH_TBF
 tristate '  GRED queue' CONFIG_NET_SCH_GRED
-tristate '  Network delay simulator' CONFIG_NET_SCH_DELAY
+tristate '  Network emulator' CONFIG_NET_SCH_NETEM
 tristate '  Diffserv field marker' CONFIG_NET_SCH_DSMARK
 
 if [ "$CONFIG_NETFILTER" = "n" -o "$CONFIG_NET_QOS" = "n" -o \
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/sched/Makefile linux-2.4.20-wolk4.16-fullkernel/net/sched/Makefile
--- linux-2.4.20-wolk4.15-fullkernel/net/sched/Makefile	2004-06-29 11:25:52.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/sched/Makefile	2004-09-05 17:14:41.000000000 +0200
@@ -15,12 +15,11 @@ obj-$(CONFIG_NET_SCH_INGRESS)	+= sch_ing
 obj-$(CONFIG_NET_SCH_CBQ)	+= sch_cbq.o
 obj-$(CONFIG_NET_SCH_WRR)	+= sch_wrr.o
 obj-$(CONFIG_NET_SCH_CSZ)	+= sch_csz.o
-obj-$(CONFIG_NET_SCH_DELAY)	+= sch_delay.o
+obj-$(CONFIG_NET_SCH_NETEM)	+= sch_netem.o
 obj-$(CONFIG_NET_SCH_HPFQ)	+= sch_hpfq.o
 obj-$(CONFIG_NET_SCH_HFSC)	+= sch_hfsc.o
 obj-$(CONFIG_NET_SCH_HTB)	+= sch_htb.o
 obj-$(CONFIG_NET_SCH_SFQ)	+= sch_sfq.o
-obj-$(CONFIG_NET_SCH_ESFQ)	+= sch_esfq.o
 obj-$(CONFIG_NET_SCH_RED)	+= sch_red.o
 obj-$(CONFIG_NET_SCH_TBF)	+= sch_tbf.o
 obj-$(CONFIG_NET_SCH_PRIO)	+= sch_prio.o
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/sched/sch_api.c linux-2.4.20-wolk4.16-fullkernel/net/sched/sch_api.c
--- linux-2.4.20-wolk4.15-fullkernel/net/sched/sch_api.c	2004-06-29 11:25:36.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/sched/sch_api.c	2004-09-05 17:14:41.000000000 +0200
@@ -32,6 +32,7 @@
 #include <linux/init.h>
 #include <linux/proc_fs.h>
 #include <linux/kmod.h>
+#include <linux/list.h>
 
 #include <net/sock.h>
 #include <net/pkt_sched.h>
@@ -193,7 +194,7 @@ struct Qdisc *qdisc_lookup(struct net_de
 {
 	struct Qdisc *q;
 
-	for (q = dev->qdisc_list; q; q = q->next) {
+	list_for_each_entry(q, &dev->qdisc_list, list) {
 		if (q->handle == handle)
 			return q;
 	}
@@ -424,6 +425,7 @@ qdisc_create(struct net_device *dev, u32
 
 	memset(sch, 0, size);
 
+	INIT_LIST_HEAD(&sch->list);
 	skb_queue_head_init(&sch->q);
 
 	if (handle == TC_H_INGRESS)
@@ -449,8 +451,7 @@ qdisc_create(struct net_device *dev, u32
 
 	if (!ops->init || (err = ops->init(sch, tca[TCA_OPTIONS-1])) == 0) {
 		write_lock(&qdisc_tree_lock);
-		sch->next = dev->qdisc_list;
-		dev->qdisc_list = sch;
+		list_add_tail(&sch->list, &dev->qdisc_list);
 		write_unlock(&qdisc_tree_lock);
 #ifdef CONFIG_NET_ESTIMATOR
 		if (tca[TCA_RATE-1])
@@ -805,15 +806,18 @@ static int tc_dump_qdisc(struct sk_buff 
 		if (idx > s_idx)
 			s_q_idx = 0;
 		read_lock(&qdisc_tree_lock);
-		for (q = dev->qdisc_list, q_idx = 0; q;
-		     q = q->next, q_idx++) {
-			if (q_idx < s_q_idx)
+		q_idx = 0;
+		list_for_each_entry(q, &dev->qdisc_list, list) {
+			if (q_idx < s_q_idx) {
+				q_idx++;
 				continue;
+			}
 			if (tc_fill_qdisc(skb, q, 0, NETLINK_CB(cb->skb).pid,
 					  cb->nlh->nlmsg_seq, NLM_F_MULTI, RTM_NEWQDISC) <= 0) {
 				read_unlock(&qdisc_tree_lock);
 				goto done;
 			}
+			q_idx++;
 		}
 		read_unlock(&qdisc_tree_lock);
 	}
@@ -1024,13 +1028,16 @@ static int tc_dump_tclass(struct sk_buff
 		return 0;
 
 	s_t = cb->args[0];
+	t = 0;
 
 	read_lock(&qdisc_tree_lock);
-	for (q=dev->qdisc_list, t=0; q; q = q->next, t++) {
-		if (t < s_t) continue;
-		if (!q->ops->cl_ops) continue;
-		if (tcm->tcm_parent && TC_H_MAJ(tcm->tcm_parent) != q->handle)
+	list_for_each_entry(q, &dev->qdisc_list, list) {
+		if (t < s_t || !q->ops->cl_ops ||
+		    (tcm->tcm_parent &&
+		     TC_H_MAJ(tcm->tcm_parent) != q->handle)) {
+			t++;
 			continue;
+		}
 		if (t > s_t)
 			memset(&cb->args[1], 0, sizeof(cb->args)-sizeof(cb->args[0]));
 		arg.w.fn = qdisc_class_dump;
@@ -1043,6 +1050,7 @@ static int tc_dump_tclass(struct sk_buff
 		cb->args[1] = arg.w.count;
 		if (arg.w.stop)
 			break;
+		t++;
 	}
 	read_unlock(&qdisc_tree_lock);
 
@@ -1232,9 +1240,6 @@ int __init pktsched_init(void)
 #ifdef CONFIG_NET_SCH_SFQ
 	INIT_QDISC(sfq);
 #endif
-#ifdef CONFIG_NET_SCH_ESFQ
-	INIT_QDISC(esfq);
-#endif
 #ifdef CONFIG_NET_SCH_TBF
 	INIT_QDISC(tbf);
 #endif
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/sched/sch_atm.c linux-2.4.20-wolk4.16-fullkernel/net/sched/sch_atm.c
--- linux-2.4.20-wolk4.15-fullkernel/net/sched/sch_atm.c	2004-06-29 11:25:52.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/sched/sch_atm.c	2004-09-05 16:01:11.000000000 +0200
@@ -566,7 +566,6 @@ static int atm_tc_init(struct Qdisc *sch
 	struct atm_qdisc_data *p = PRIV(sch);
 
 	DPRINTK("atm_tc_init(sch %p,[qdisc %p],opt %p)\n",sch,p,opt);
-	memset(p,0,sizeof(*p));
 	p->flows = &p->link;
 	if(!(p->link.q = qdisc_create_dflt(sch->dev,&pfifo_qdisc_ops)))
 		p->link.q = &noop_qdisc;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/sched/sch_cbq.c linux-2.4.20-wolk4.16-fullkernel/net/sched/sch_cbq.c
--- linux-2.4.20-wolk4.15-fullkernel/net/sched/sch_cbq.c	2004-06-29 11:25:53.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/sched/sch_cbq.c	2004-09-05 16:03:37.000000000 +0200
@@ -1712,15 +1712,18 @@ static void cbq_destroy_filters(struct c
 	}
 }
 
-static void cbq_destroy_class(struct cbq_class *cl)
+static void cbq_destroy_class(struct Qdisc *sch, struct cbq_class *cl)
 {
+	struct cbq_sched_data *q = (struct cbq_sched_data *)sch->data;
+
 	cbq_destroy_filters(cl);
 	qdisc_destroy(cl->q);
 	qdisc_put_rtab(cl->R_tab);
 #ifdef CONFIG_NET_ESTIMATOR
 	qdisc_kill_estimator(&cl->stats);
 #endif
-	kfree(cl);
+	if (cl != &q->link)
+		kfree(cl);
 }
 
 static void
@@ -1743,8 +1746,7 @@ cbq_destroy(struct Qdisc* sch)
 
 		for (cl = q->classes[h]; cl; cl = next) {
 			next = cl->next;
-			if (cl != &q->link)
-				cbq_destroy_class(cl);
+			cbq_destroy_class(sch, cl);
 		}
 	}
 
@@ -1766,7 +1768,7 @@ static void cbq_put(struct Qdisc *sch, u
 		spin_unlock_bh(&sch->dev->queue_lock);
 #endif
 
-		cbq_destroy_class(cl);
+		cbq_destroy_class(sch, cl);
 	}
 }
 
@@ -2000,7 +2002,7 @@ static int cbq_delete(struct Qdisc *sch,
 	sch_tree_unlock(sch);
 
 	if (--cl->refcnt == 0)
-		cbq_destroy_class(cl);
+		cbq_destroy_class(sch, cl);
 
 	return 0;
 }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/sched/sch_delay.c linux-2.4.20-wolk4.16-fullkernel/net/sched/sch_delay.c
--- linux-2.4.20-wolk4.15-fullkernel/net/sched/sch_delay.c	2004-06-29 11:25:53.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/sched/sch_delay.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,289 +0,0 @@
-/*
- * net/sched/sch_delay.c	Simple constant delay
- *
- * 		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.
- *
- * Authors:	Stephen Hemminger <shemminger@osdl.org>
- */
-
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-
-#include <linux/string.h>
-#include <linux/mm.h>
-#include <linux/socket.h>
-#include <linux/sockios.h>
-#include <linux/in.h>
-#include <linux/errno.h>
-#include <linux/interrupt.h>
-#include <linux/if_ether.h>
-#include <linux/inet.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/notifier.h>
-#include <net/ip.h>
-#include <net/route.h>
-#include <linux/skbuff.h>
-#include <net/sock.h>
-#include <net/pkt_sched.h>
-
-/*	Network delay simulator
-	This scheduler adds a fixed delay to all packets.
-	Similar to NISTnet and BSD Dummynet.
-
-	It uses byte fifo underneath similar to TBF */
-struct dly_sched_data {
-	u32	latency;
-	u32	limit;
-	u32	loss;
-	struct timer_list timer;
-	struct Qdisc *qdisc;
-};
-
-/* Time stamp put into socket buffer control block */
-struct dly_skb_cb {
-	psched_time_t	queuetime;
-};
-
-/* Enqueue packets with underlying discipline (fifo)
- * but mark them with current time first.
- */
-static int dly_enqueue(struct sk_buff *skb, struct Qdisc *sch)
-{
-	struct dly_sched_data *q = (struct dly_sched_data *)sch->data;
-	struct dly_skb_cb *cb = (struct dly_skb_cb *)skb->cb;
-	int ret;
-
-	/* Random packet drop 0 => none, ~0 => all */
-	if (q->loss >= net_random()) {
-		sch->stats.drops++;
-		return 0;	/* lie about loss so TCP doesn't know */
-	}
-
-	PSCHED_GET_TIME(cb->queuetime);
-
-	/* Queue to underlying scheduler */
-	ret = q->qdisc->enqueue(skb, q->qdisc);
-	if (ret)
-		sch->stats.drops++;
-	else {
-		sch->q.qlen++;
-		sch->stats.bytes += skb->len;
-		sch->stats.packets++;
-	}
-	return ret;
-}
-
-/* Requeue packets but don't change time stamp */
-static int dly_requeue(struct sk_buff *skb, struct Qdisc *sch)
-{
-	struct dly_sched_data *q = (struct dly_sched_data *)sch->data;
-	int ret;
-
-	ret = q->qdisc->ops->requeue(skb, q->qdisc);
-	if (ret == 0)
-		sch->q.qlen++;
-	return ret;
-}
-
-static unsigned int dly_drop(struct Qdisc *sch)
-{
-	struct dly_sched_data *q = (struct dly_sched_data *)sch->data;
-	unsigned int len;
-
-	len = q->qdisc->ops->drop(q->qdisc);
-	if (len) {
-		sch->q.qlen--;
-		sch->stats.drops++;
-	}
-	return len;
-}
-
-/* Dequeue packet.
- * If packet needs to be held up, then stop the
- * queue and set timer to wakeup later.
- */
-static struct sk_buff *dly_dequeue(struct Qdisc *sch)
-{
-	struct dly_sched_data *q = (struct dly_sched_data *)sch->data;
-	struct sk_buff *skb;
-
- retry:
-	skb = q->qdisc->dequeue(q->qdisc);
-	if (skb) {
-		struct dly_skb_cb *cb = (struct dly_skb_cb *)skb->cb;
-		psched_time_t now;
-		long diff, delay;
-
-		PSCHED_GET_TIME(now);
-		diff = q->latency - PSCHED_TDIFF(now, cb->queuetime);
-
-		if (diff <= 0) {
-			sch->q.qlen--;
-			sch->flags &= ~TCQ_F_THROTTLED;
-			return skb;
-		}
-
-		if (q->qdisc->ops->requeue(skb, q->qdisc) != NET_XMIT_SUCCESS) {
-			sch->q.qlen--;
-			sch->stats.drops++;
-			goto retry;
-		}
-
-		delay = PSCHED_US2JIFFIE(diff);
-		if (delay <= 0)
-		  delay = 1;
-		mod_timer(&q->timer, jiffies+delay);
-
-		sch->flags |= TCQ_F_THROTTLED;
-	}
-	return NULL;
-}
-
-static void dly_reset(struct Qdisc *sch)
-{
-	struct dly_sched_data *q = (struct dly_sched_data *)sch->data;
-
-	qdisc_reset(q->qdisc);
-	sch->q.qlen = 0;
-	sch->flags &= ~TCQ_F_THROTTLED;
-	del_timer(&q->timer);
-}
-
-static void dly_timer(unsigned long arg)
-{
-	struct Qdisc *sch = (struct Qdisc *)arg;
-
-	sch->flags &= ~TCQ_F_THROTTLED;
-	netif_schedule(sch->dev);
-}
-
-/* Tell Fifo the new limit. */
-static int change_limit(struct Qdisc *q, u32 limit)
-{
-	struct rtattr *rta;
-	int ret;
-
-	rta = kmalloc(RTA_LENGTH(sizeof(struct tc_fifo_qopt)), GFP_KERNEL);
-	if (!rta)
-		return -ENOMEM;
-
-	rta->rta_type = RTM_NEWQDISC;
-	rta->rta_len = RTA_LENGTH(sizeof(struct tc_fifo_qopt));
-	((struct tc_fifo_qopt *)RTA_DATA(rta))->limit = limit;
-	ret = q->ops->change(q, rta);
-	kfree(rta);
-
-	return ret;
-}
-
-/* Setup underlying FIFO discipline */
-static int dly_change(struct Qdisc *sch, struct rtattr *opt)
-{
-	struct dly_sched_data *q = (struct dly_sched_data *)sch->data;
-	struct tc_dly_qopt *qopt = RTA_DATA(opt);
-	int err;
-
-	if (q->qdisc == &noop_qdisc) {
-		struct Qdisc *child
-			= qdisc_create_dflt(sch->dev, &bfifo_qdisc_ops);
-		if (!child)
-			return -EINVAL;
-		q->qdisc = child;
-	}
-
-	err = change_limit(q->qdisc, qopt->limit);
-	if (err) {
-		qdisc_destroy(q->qdisc);
-		q->qdisc = &noop_qdisc;
-	} else {
-		q->latency = qopt->latency;
-		q->limit = qopt->limit;
-		q->loss = qopt->loss;
-	}
-	return err;
-}
-
-static int dly_init(struct Qdisc *sch, struct rtattr *opt)
-{
-	struct dly_sched_data *q = (struct dly_sched_data *)sch->data;
-	int err;
-
-	if (!opt)
-		return -EINVAL;
-
-	MOD_INC_USE_COUNT;
-
-	init_timer(&q->timer);
-	q->timer.function = dly_timer;
-	q->timer.data = (unsigned long) sch;
-	q->qdisc = &noop_qdisc;
-
-	err = dly_change(sch, opt);
-	if (err)
-		MOD_DEC_USE_COUNT;
-
-	return err;
-}
-
-static void dly_destroy(struct Qdisc *sch)
-{
-	struct dly_sched_data *q = (struct dly_sched_data *)sch->data;
-
-	del_timer(&q->timer);
-	qdisc_destroy(q->qdisc);
-	q->qdisc = &noop_qdisc;
-
-	MOD_DEC_USE_COUNT;
-}
-
-static int dly_dump(struct Qdisc *sch, struct sk_buff *skb)
-{
-	struct dly_sched_data *q = (struct dly_sched_data *)sch->data;
-	unsigned char	 *b = skb->tail;
-	struct tc_dly_qopt qopt;
-
-	qopt.latency = q->latency;
-	qopt.limit = q->limit;
-	qopt.loss = q->loss;
-
-	RTA_PUT(skb, TCA_OPTIONS, sizeof(qopt), &qopt);
-
-	return skb->len;
-
-rtattr_failure:
-	skb_trim(skb, b - skb->data);
-	return -1;
-}
-
-struct Qdisc_ops dly_qdisc_ops = {
-	.id		=	"delay",
-	.priv_size	=	sizeof(struct dly_sched_data),
-	.enqueue	=	dly_enqueue,
-	.dequeue	=	dly_dequeue,
-	.requeue	=	dly_requeue,
-	.drop		=	dly_drop,
-	.init		=	dly_init,
-	.reset		=	dly_reset,
-	.destroy	=	dly_destroy,
-	.change		=	dly_change,
-	.dump		=	dly_dump,
-};
-
-#ifdef MODULE
-int init_module(void)
-{
-	return register_qdisc(&dly_qdisc_ops);
-}
-
-void cleanup_module(void)
-{
-	unregister_qdisc(&dly_qdisc_ops);
-}
-#endif
-MODULE_LICENSE("GPL");
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/sched/sch_dsmark.c linux-2.4.20-wolk4.16-fullkernel/net/sched/sch_dsmark.c
--- linux-2.4.20-wolk4.15-fullkernel/net/sched/sch_dsmark.c	2004-06-29 11:25:53.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/sched/sch_dsmark.c	2004-09-05 16:01:11.000000000 +0200
@@ -329,8 +329,6 @@ int dsmark_init(struct Qdisc *sch,struct
 	    !tb[TCA_DSMARK_INDICES-1] ||
 	    RTA_PAYLOAD(tb[TCA_DSMARK_INDICES-1]) < sizeof(__u16))
                 return -EINVAL;
-	memset(p,0,sizeof(*p));
-	p->filter_list = NULL;
 	p->indices = *(__u16 *) RTA_DATA(tb[TCA_DSMARK_INDICES-1]);
 	if (!p->indices)
 		return -EINVAL;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/sched/sch_esfq.c linux-2.4.20-wolk4.16-fullkernel/net/sched/sch_esfq.c
--- linux-2.4.20-wolk4.15-fullkernel/net/sched/sch_esfq.c	2004-06-29 11:25:36.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/sched/sch_esfq.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,588 +0,0 @@
-/*
- * net/sched/sch_esfq.c	Extended Stochastic Fairness Queueing discipline.
- *
- *		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.
- *
- * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
- * Changes:	Alexander Atanasov, <alex@ssi.bg>
- *		Added dynamic depth,limit,divisor,hash_kind options.
- *		Added dst and src hashes.
- */
-
-#include <linux/config.h>
-#include <linux/module.h>
-#include <asm/uaccess.h>
-#include <asm/system.h>
-#include <asm/bitops.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/string.h>
-#include <linux/mm.h>
-#include <linux/socket.h>
-#include <linux/sockios.h>
-#include <linux/in.h>
-#include <linux/errno.h>
-#include <linux/interrupt.h>
-#include <linux/if_ether.h>
-#include <linux/inet.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/notifier.h>
-#include <linux/init.h>
-#include <net/ip.h>
-#include <linux/ipv6.h>
-#include <net/route.h>
-#include <linux/skbuff.h>
-#include <net/sock.h>
-#include <net/pkt_sched.h>
-
-
-/*	Stochastic Fairness Queuing algorithm.
-	For more comments look at sch_sfq.c.
-	The difference is that you can change limit, depth,
-	hash table size and choose 3 hash types.
-	
-	classic:	same as in sch_sfq.c
-	dst:		destination IP address
-	src:		source IP address
-	
-	TODO: 
-		make sfq_change work.
-*/
-
-
-/* This type should contain at least SFQ_DEPTH*2 values */
-typedef unsigned int esfq_index;
-
-struct esfq_head
-{
-	esfq_index	next;
-	esfq_index	prev;
-};
-
-struct esfq_sched_data
-{
-/* Parameters */
-	int		perturb_period;
-	unsigned	quantum;	/* Allotment per round: MUST BE >= MTU */
-	int		limit;
-	unsigned	depth;
-	unsigned	hash_divisor;
-	unsigned	hash_kind;
-/* Variables */
-	struct timer_list perturb_timer;
-	int		perturbation;
-	esfq_index	tail;		/* Index of current slot in round */
-	esfq_index	max_depth;	/* Maximal depth */
-
-	esfq_index	*ht;			/* Hash table */
-	esfq_index	*next;			/* Active slots link */
-	short		*allot;			/* Current allotment per slot */
-	unsigned short	*hash;			/* Hash value indexed by slots */
-	struct sk_buff_head	*qs;		/* Slot queue */
-	struct esfq_head	*dep;		/* Linked list of slots, indexed by depth */
-};
-
-static __inline__ unsigned esfq_hash_u32(struct esfq_sched_data *q,u32 h)
-{
-	int pert = q->perturbation;
-
-	if (pert)
-		h = (h<<pert) ^ (h>>(0x1F - pert));
-
-	h = ntohl(h) * 2654435761UL;
-	return h & (q->hash_divisor-1);
-}
-
-static __inline__ unsigned esfq_fold_hash_classic(struct esfq_sched_data *q, u32 h, u32 h1)
-{
-	int pert = q->perturbation;
-
-	/* Have we any rotation primitives? If not, WHY? */
-	h ^= (h1<<pert) ^ (h1>>(0x1F - pert));
-	h ^= h>>10;
-	return h & (q->hash_divisor-1);
-}
-
-#ifndef IPPROTO_ESP
-#define IPPROTO_ESP 50
-#endif
-
-static unsigned esfq_hash(struct esfq_sched_data *q, struct sk_buff *skb)
-{
-	u32 h, h2;
-	u32 hs;
-
-	switch (skb->protocol) {
-	case __constant_htons(ETH_P_IP):
-	{
-		struct iphdr *iph = skb->nh.iph;
-		h = iph->daddr;
-		hs = iph->saddr;
-		h2 = hs^iph->protocol;
-		if (!(iph->frag_off&htons(IP_MF|IP_OFFSET)) &&
-		    (iph->protocol == IPPROTO_TCP ||
-		     iph->protocol == IPPROTO_UDP ||
-		     iph->protocol == IPPROTO_ESP))
-			h2 ^= *(((u32*)iph) + iph->ihl);
-		break;
-	}
-	case __constant_htons(ETH_P_IPV6):
-	{
-		struct ipv6hdr *iph = skb->nh.ipv6h;
-		h = iph->daddr.s6_addr32[3];
-		hs = iph->saddr.s6_addr32[3];
-		h2 = hs^iph->nexthdr;
-		if (iph->nexthdr == IPPROTO_TCP ||
-		    iph->nexthdr == IPPROTO_UDP ||
-		    iph->nexthdr == IPPROTO_ESP)
-			h2 ^= *(u32*)&iph[1];
-		break;
-	}
-	default:
-		h = (u32)(unsigned long)skb->dst;
-		hs = (u32)(unsigned long)skb->sk;
-		h2 = hs^skb->protocol;
-	}
-	switch(q->hash_kind)
-	{
-	case TCA_SFQ_HASH_CLASSIC:
-		return esfq_fold_hash_classic(q, h, h2);
-	case TCA_SFQ_HASH_DST:
-		return esfq_hash_u32(q,h);
-	case TCA_SFQ_HASH_SRC:
-		return esfq_hash_u32(q,hs);
-	default:
-		if (net_ratelimit())
-			printk(KERN_DEBUG "esfq unknown hash method, fallback to classic\n");
-	}
-	return esfq_fold_hash_classic(q, h, h2);
-}
-
-extern __inline__ void esfq_link(struct esfq_sched_data *q, esfq_index x)
-{
-	esfq_index p, n;
-	int d = q->qs[x].qlen + q->depth;
-
-	p = d;
-	n = q->dep[d].next;
-	q->dep[x].next = n;
-	q->dep[x].prev = p;
-	q->dep[p].next = q->dep[n].prev = x;
-}
-
-extern __inline__ void esfq_dec(struct esfq_sched_data *q, esfq_index x)
-{
-	esfq_index p, n;
-
-	n = q->dep[x].next;
-	p = q->dep[x].prev;
-	q->dep[p].next = n;
-	q->dep[n].prev = p;
-
-	if (n == p && q->max_depth == q->qs[x].qlen + 1)
-		q->max_depth--;
-
-	esfq_link(q, x);
-}
-
-extern __inline__ void esfq_inc(struct esfq_sched_data *q, esfq_index x)
-{
-	esfq_index p, n;
-	int d;
-
-	n = q->dep[x].next;
-	p = q->dep[x].prev;
-	q->dep[p].next = n;
-	q->dep[n].prev = p;
-	d = q->qs[x].qlen;
-	if (q->max_depth < d)
-		q->max_depth = d;
-
-	esfq_link(q, x);
-}
-
-static int esfq_drop(struct Qdisc *sch)
-{
-	struct esfq_sched_data *q = (struct esfq_sched_data *)sch->data;
-	esfq_index d = q->max_depth;
-	struct sk_buff *skb;
-
-	/* Queue is full! Find the longest slot and
-	   drop a packet from it */
-
-	if (d > 1) {
-		esfq_index x = q->dep[d+q->depth].next;
-		skb = q->qs[x].prev;
-		__skb_unlink(skb, &q->qs[x]);
-		kfree_skb(skb);
-		esfq_dec(q, x);
-		sch->q.qlen--;
-		sch->stats.drops++;
-		return 1;
-	}
-
-	if (d == 1) {
-		/* It is difficult to believe, but ALL THE SLOTS HAVE LENGTH 1. */
-		d = q->next[q->tail];
-		q->next[q->tail] = q->next[d];
-		q->allot[q->next[d]] += q->quantum;
-		skb = q->qs[d].prev;
-		__skb_unlink(skb, &q->qs[d]);
-		kfree_skb(skb);
-		esfq_dec(q, d);
-		sch->q.qlen--;
-		q->ht[q->hash[d]] = q->depth;
-		sch->stats.drops++;
-		return 1;
-	}
-
-	return 0;
-}
-
-static int
-esfq_enqueue(struct sk_buff *skb, struct Qdisc* sch)
-{
-	struct esfq_sched_data *q = (struct esfq_sched_data *)sch->data;
-	unsigned hash = esfq_hash(q, skb);
-	unsigned depth = q->depth;
-	esfq_index x;
-
-	x = q->ht[hash];
-	if (x == depth) {
-		q->ht[hash] = x = q->dep[depth].next;
-		q->hash[x] = hash;
-	}
-	__skb_queue_tail(&q->qs[x], skb);
-	esfq_inc(q, x);
-	if (q->qs[x].qlen == 1) {		/* The flow is new */
-		if (q->tail == depth) {	/* It is the first flow */
-			q->tail = x;
-			q->next[x] = x;
-			q->allot[x] = q->quantum;
-		} else {
-			q->next[x] = q->next[q->tail];
-			q->next[q->tail] = x;
-			q->tail = x;
-		}
-	}
-	if (++sch->q.qlen < q->limit-1) {
-		sch->stats.bytes += skb->len;
-		sch->stats.packets++;
-		return 0;
-	}
-
-	esfq_drop(sch);
-	return NET_XMIT_CN;
-}
-
-static int
-esfq_requeue(struct sk_buff *skb, struct Qdisc* sch)
-{
-	struct esfq_sched_data *q = (struct esfq_sched_data *)sch->data;
-	unsigned hash = esfq_hash(q, skb);
-	unsigned depth = q->depth;
-	esfq_index x;
-
-	x = q->ht[hash];
-	if (x == depth) {
-		q->ht[hash] = x = q->dep[depth].next;
-		q->hash[x] = hash;
-	}
-	__skb_queue_head(&q->qs[x], skb);
-	esfq_inc(q, x);
-	if (q->qs[x].qlen == 1) {		/* The flow is new */
-		if (q->tail == depth) {	/* It is the first flow */
-			q->tail = x;
-			q->next[x] = x;
-			q->allot[x] = q->quantum;
-		} else {
-			q->next[x] = q->next[q->tail];
-			q->next[q->tail] = x;
-			q->tail = x;
-		}
-	}
-	if (++sch->q.qlen < q->limit - 1)
-		return 0;
-
-	sch->stats.drops++;
-	esfq_drop(sch);
-	return NET_XMIT_CN;
-}
-
-
-
-
-static struct sk_buff *
-esfq_dequeue(struct Qdisc* sch)
-{
-	struct esfq_sched_data *q = (struct esfq_sched_data *)sch->data;
-	struct sk_buff *skb;
-	unsigned depth = q->depth;
-	esfq_index a, old_a;
-
-	/* No active slots */
-	if (q->tail == depth)
-		return NULL;
-	
-	a = old_a = q->next[q->tail];
-	
-	/* Grab packet */
-	skb = __skb_dequeue(&q->qs[a]);
-	esfq_dec(q, a);
-	sch->q.qlen--;
-	
-	/* Is the slot empty? */
-	if (q->qs[a].qlen == 0) {
-		a = q->next[a];
-		if (a == old_a) {
-			q->tail = depth;
-			return skb;
-		}
-		q->next[q->tail] = a;
-		q->allot[a] += q->quantum;
-	} else if ((q->allot[a] -= skb->len) <= 0) {
-		q->tail = a;
-		a = q->next[a];
-		q->allot[a] += q->quantum;
-	}
-	
-	return skb;
-}
-
-static void
-esfq_reset(struct Qdisc* sch)
-{
-	struct sk_buff *skb;
-
-	while ((skb = esfq_dequeue(sch)) != NULL)
-		kfree_skb(skb);
-}
-
-static void esfq_perturbation(unsigned long arg)
-{
-	struct Qdisc *sch = (struct Qdisc*)arg;
-	struct esfq_sched_data *q = (struct esfq_sched_data *)sch->data;
-
-	q->perturbation = net_random()&0x1F;
-	q->perturb_timer.expires = jiffies + q->perturb_period;
-
-	if (q->perturb_period) {
-		q->perturb_timer.expires = jiffies + q->perturb_period;
-		add_timer(&q->perturb_timer);
-	}
-}
-
-static int esfq_change(struct Qdisc *sch, struct rtattr *opt)
-{
-	struct esfq_sched_data *q = (struct esfq_sched_data *)sch->data;
-	struct tc_sfq_qopt *ctl = RTA_DATA(opt);
-	int old_perturb = q->perturb_period;
-	
-	if (opt->rta_len < RTA_LENGTH(sizeof(*ctl)))
-		return -EINVAL;
-	
-	sch_tree_lock(sch);
-	q->quantum = ctl->quantum ? : psched_mtu(sch->dev);
-	q->perturb_period = ctl->perturb_period*HZ;
-//	q->hash_divisor = ctl->divisor;
-//	q->tail = q->limit = q->depth = ctl->flows;
-	
-	if (ctl->limit)
-		q->limit = min_t(u32, ctl->limit, q->depth);
-	
-	if (ctl->hash_kind) {
-		q->hash_kind = ctl->hash_kind;
-		if (q->hash_kind !=  TCA_SFQ_HASH_CLASSIC)
-			q->perturb_period = 0;
-	}
-	
-	// is sch_tree_lock enough to do this ?
-	while (sch->q.qlen >= q->limit-1)
-		esfq_drop(sch);
-	
-	if (old_perturb)
-		del_timer(&q->perturb_timer);
-	if (q->perturb_period) {
-		q->perturb_timer.expires = jiffies + q->perturb_period;
-		add_timer(&q->perturb_timer);
-	} else {
-		q->perturbation = 0;
-	}
-	sch_tree_unlock(sch);
-	return 0;
-}
-
-static int esfq_init(struct Qdisc *sch, struct rtattr *opt)
-{
-	struct esfq_sched_data *q = (struct esfq_sched_data *)sch->data;
-	struct tc_sfq_qopt *ctl;
-	esfq_index p = ~0UL/2;
-	int i;
-	
-	if (opt && opt->rta_len < RTA_LENGTH(sizeof(*ctl)))
-		return -EINVAL;
-
-	q->perturb_timer.data = (unsigned long)sch;
-	q->perturb_timer.function = esfq_perturbation;
-	init_timer(&q->perturb_timer);
-	q->perturbation = 0;
-	q->hash_kind = TCA_SFQ_HASH_CLASSIC;
-	q->max_depth = 0;
-	if (opt == NULL) {
-		q->quantum = psched_mtu(sch->dev);
-		q->perturb_period = 0;
-		q->hash_divisor = 1024;
-		q->tail = q->limit = q->depth = 128;
-		
-	} else {
-		ctl = RTA_DATA(opt);
-		q->quantum = ctl->quantum ? : psched_mtu(sch->dev);
-		q->perturb_period = ctl->perturb_period*HZ;
-		q->hash_divisor = ctl->divisor ? : 1024;
-		q->tail = q->limit = q->depth = ctl->flows ? : 128;
-		
-		if ( q->depth > p - 1 )
-			return -EINVAL;
-		
-		if (ctl->limit)
-			q->limit = min_t(u32, ctl->limit, q->depth);
-		
-		if (ctl->hash_kind) {
-			q->hash_kind = ctl->hash_kind;
-		}
-		
-		if (q->perturb_period) {
-			q->perturb_timer.expires = jiffies + q->perturb_period;
-			add_timer(&q->perturb_timer);
-		}
-	}
-	
-	q->ht = kmalloc(q->hash_divisor*sizeof(esfq_index), GFP_KERNEL);
-	if (!q->ht)
-		goto err_case;
-		
-	q->dep = kmalloc((1+q->depth*2)*sizeof(struct esfq_head), GFP_KERNEL);
-	if (!q->dep)
-		goto err_case;
-	q->next = kmalloc(q->depth*sizeof(esfq_index), GFP_KERNEL);
-	if (!q->next)
-		goto err_case;
-	
-	q->allot = kmalloc(q->depth*sizeof(short), GFP_KERNEL);
-	if (!q->allot)
-		goto err_case;
-	q->hash = kmalloc(q->depth*sizeof(unsigned short), GFP_KERNEL);
-	if (!q->hash)
-		goto err_case;
-	q->qs = kmalloc(q->depth*sizeof(struct sk_buff_head), GFP_KERNEL);
-	if (!q->qs)
-		goto err_case;
-	
-	for (i=0; i< q->hash_divisor; i++)
-		q->ht[i] = q->depth;
-	for (i=0; i<q->depth; i++) {
-		skb_queue_head_init(&q->qs[i]);
-		q->dep[i+q->depth].next = i+q->depth;
-		q->dep[i+q->depth].prev = i+q->depth;
-	}
-	
-	for (i=0; i<q->depth; i++)
-		esfq_link(q, i);
-	MOD_INC_USE_COUNT;
-	return 0;
-err_case:
-	if (q->ht)
-		kfree(q->ht);
-	if (q->dep)
-		kfree(q->dep);
-	if (q->next)
-		kfree(q->next);
-	if (q->allot)
-		kfree(q->allot);
-	if (q->hash)
-		kfree(q->hash);
-	if (q->qs)
-		kfree(q->qs);
-	return -ENOBUFS;
-}
-
-static void esfq_destroy(struct Qdisc *sch)
-{
-	struct esfq_sched_data *q = (struct esfq_sched_data *)sch->data;
-	del_timer(&q->perturb_timer);
-	if(q->ht)
-		kfree(q->ht);
-	if(q->dep)
-		kfree(q->dep);
-	if(q->next)
-		kfree(q->next);
-	if(q->allot)
-		kfree(q->allot);
-	if(q->hash)
-		kfree(q->hash);
-	if(q->qs)
-		kfree(q->qs);
-	MOD_DEC_USE_COUNT;
-}
-
-static int esfq_dump(struct Qdisc *sch, struct sk_buff *skb)
-{
-	struct esfq_sched_data *q = (struct esfq_sched_data *)sch->data;
-	unsigned char	 *b = skb->tail;
-	struct tc_sfq_qopt opt;
-
-	opt.quantum = q->quantum;
-	opt.perturb_period = q->perturb_period/HZ;
-
-	opt.limit = q->limit;
-	opt.divisor = q->hash_divisor;
-	opt.flows = q->depth;
-	opt.hash_kind = q->hash_kind;
-
-	RTA_PUT(skb, TCA_OPTIONS, sizeof(opt), &opt);
-
-	return skb->len;
-
-rtattr_failure:
-	skb_trim(skb, b - skb->data);
-	return -1;
-}
-
-struct Qdisc_ops esfq_qdisc_ops =
-{
-	NULL,
-	NULL,
-	"esfq",
-	sizeof(struct esfq_sched_data),
-
-	esfq_enqueue,
-	esfq_dequeue,
-	esfq_requeue,
-	esfq_drop,
-
-	esfq_init,
-	esfq_reset,
-	esfq_destroy,
-	NULL, /* esfq_change - needs more work */
-
-	esfq_dump,
-};
-
-#ifdef MODULE
-int init_module(void)
-{
-	return register_qdisc(&esfq_qdisc_ops);
-}
-
-void cleanup_module(void) 
-{
-	unregister_qdisc(&esfq_qdisc_ops);
-}
-#endif
-MODULE_LICENSE("GPL");
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/sched/sch_generic.c linux-2.4.20-wolk4.16-fullkernel/net/sched/sch_generic.c
--- linux-2.4.20-wolk4.15-fullkernel/net/sched/sch_generic.c	2004-06-29 11:25:59.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/sched/sch_generic.c	2004-09-05 16:04:18.000000000 +0200
@@ -29,6 +29,7 @@
 #include <linux/skbuff.h>
 #include <linux/rtnetlink.h>
 #include <linux/init.h>
+#include <linux/list.h>
 #if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
 #include <linux/imq.h>
 #endif
@@ -398,6 +399,7 @@ struct Qdisc * qdisc_create_dflt(struct 
 		return NULL;
 	memset(sch, 0, size);
 
+	INIT_LIST_HEAD(&sch->list);
 	skb_queue_head_init(&sch->q);
 	sch->ops = ops;
 	sch->enqueue = ops->enqueue;
@@ -427,22 +429,10 @@ void qdisc_reset(struct Qdisc *qdisc)
 void qdisc_destroy(struct Qdisc *qdisc)
 {
 	struct Qdisc_ops *ops = qdisc->ops;
-	struct net_device *dev;
 
 	if (!atomic_dec_and_test(&qdisc->refcnt))
 		return;
-
-	dev = qdisc->dev;
-
-	if (dev) {
-		struct Qdisc *q, **qp;
-		for (qp = &qdisc->dev->qdisc_list; (q=*qp) != NULL; qp = &q->next) {
-			if (q == qdisc) {
-				*qp = q->next;
-				break;
-			}
-		}
-	}
+	list_del(&qdisc->list);
 #ifdef CONFIG_NET_ESTIMATOR
 	qdisc_kill_estimator(&qdisc->stats);
 #endif
@@ -471,10 +461,8 @@ void dev_activate(struct net_device *dev
 				printk(KERN_INFO "%s: activation failed\n", dev->name);
 				return;
 			}
-
 			write_lock(&qdisc_tree_lock);
-			qdisc->next = dev->qdisc_list;
-			dev->qdisc_list = qdisc;
+			list_add_tail(&qdisc->list, &dev->qdisc_list);
 			write_unlock(&qdisc_tree_lock);
 
 		} else {
@@ -520,7 +508,7 @@ void dev_init_scheduler(struct net_devic
 	dev->qdisc = &noop_qdisc;
 	spin_unlock_bh(&dev->queue_lock);
 	dev->qdisc_sleeping = &noop_qdisc;
-	dev->qdisc_list = NULL;
+	INIT_LIST_HEAD(&dev->qdisc_list);
 	write_unlock(&qdisc_tree_lock);
 
 	dev_watchdog_init(dev);
@@ -542,9 +530,8 @@ void dev_shutdown(struct net_device *dev
 		qdisc_destroy(qdisc);
         }
 #endif
-	BUG_TRAP(dev->qdisc_list == NULL);
+	BUG_TRAP(list_empty(&dev->qdisc_list));
 	BUG_TRAP(!timer_pending(&dev->watchdog_timer));
-	dev->qdisc_list = NULL;
 	spin_unlock_bh(&dev->queue_lock);
 	write_unlock(&qdisc_tree_lock);
 }
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/sched/sch_hfsc.c linux-2.4.20-wolk4.16-fullkernel/net/sched/sch_hfsc.c
--- linux-2.4.20-wolk4.15-fullkernel/net/sched/sch_hfsc.c	2004-06-29 11:25:53.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/sched/sch_hfsc.c	2004-09-05 16:01:11.000000000 +0200
@@ -61,6 +61,7 @@
 #include <linux/slab.h>
 #include <linux/timer.h>
 #include <linux/list.h>
+#include <linux/rbtree.h>
 #include <linux/init.h>
 #include <linux/netdevice.h>
 #include <linux/rtnetlink.h>
@@ -131,9 +132,11 @@ struct hfsc_class
 	struct list_head children;	/* child classes */
 	struct Qdisc	*qdisc;		/* leaf qdisc */
 
-	struct list_head actlist;	/* active children list */
-	struct list_head alist;		/* active children list member */
-	struct list_head ellist;	/* eligible list member */
+	rb_node_t el_node;		/* qdisc's eligible tree member */
+	rb_root_t vt_tree;		/* active children sorted by cl_vt */
+	rb_node_t vt_node;		/* parent's vt_tree member */
+	rb_root_t cf_tree;		/* active children sorted by cl_f */
+	rb_node_t cf_node;		/* parent's cf_heap member */
 	struct list_head hlist;		/* hash list member */
 	struct list_head dlist;		/* drop list member */
 
@@ -159,6 +162,9 @@ struct hfsc_class
 					   adjustment */
 	u64	cl_vtoff;		/* inter-period cumulative vt offset */
 	u64	cl_cvtmax;		/* max child's vt in the last period */
+	u64	cl_cvtoff;		/* cumulative cvtmax of all periods */
+	u64	cl_pcvtoff;		/* parent's cvtoff at initalization
+					   time */
 
 	struct internal_sc cl_rsc;	/* internal real-time service curve */
 	struct internal_sc cl_fsc;	/* internal fair service curve */
@@ -181,7 +187,7 @@ struct hfsc_sched
 	u16	defcls;				/* default class id */
 	struct hfsc_class root;			/* root class */
 	struct list_head clhash[HFSC_HSIZE];	/* class hash */
-	struct list_head eligible;		/* eligible list */
+	rb_root_t eligible;			/* eligible tree */
 	struct list_head droplist;		/* active leaf class list (for
 						   dropping) */
 	struct sk_buff_head requeue;		/* requeued packet */
@@ -217,82 +223,51 @@ do {									\
 
 
 /*
- * eligible list holds backlogged classes being sorted by their eligible times.
- * there is one eligible list per hfsc instance.
+ * eligible tree holds backlogged classes being sorted by their eligible times.
+ * there is one eligible tree per hfsc instance.
  */
 
 static void
-ellist_insert(struct hfsc_class *cl)
+eltree_insert(struct hfsc_class *cl)
 {
-	struct list_head *head = &cl->sched->eligible;
-	struct hfsc_class *p;
-
-	/* check the last entry first */
-	if (list_empty(head) ||
-	    ((p = list_entry(head->prev, struct hfsc_class, ellist)) &&
-	     p->cl_e <= cl->cl_e)) {
-		list_add_tail(&cl->ellist, head);
-		return;
-	}
-
-	list_for_each_entry(p, head, ellist) {
-		if (cl->cl_e < p->cl_e) {
-			/* insert cl before p */
-			list_add_tail(&cl->ellist, &p->ellist);
-			return;
-		}
+	rb_node_t **p = &cl->sched->eligible.rb_node;
+	rb_node_t *parent = NULL;
+	struct hfsc_class *cl1;
+
+	while (*p != NULL) {
+		parent = *p;
+		cl1 = rb_entry(parent, struct hfsc_class, el_node);
+		if (cl->cl_e >= cl1->cl_e)
+			p = &parent->rb_right;
+		else
+			p = &parent->rb_left;
 	}
-	ASSERT(0); /* should not reach here */
+	rb_link_node(&cl->el_node, parent, p);
+	rb_insert_color(&cl->el_node, &cl->sched->eligible);
 }
 
 static inline void
-ellist_remove(struct hfsc_class *cl)
+eltree_remove(struct hfsc_class *cl)
 {
-	list_del(&cl->ellist);
+	rb_erase(&cl->el_node, &cl->sched->eligible);
 }
 
-static void
-ellist_update(struct hfsc_class *cl)
+static inline void
+eltree_update(struct hfsc_class *cl)
 {
-	struct list_head *head = &cl->sched->eligible;
-	struct hfsc_class *p, *last;
-
-	/*
-	 * the eligible time of a class increases monotonically.
-	 * if the next entry has a larger eligible time, nothing to do.
-	 */
-	if (cl->ellist.next == head ||
-	    ((p = list_entry(cl->ellist.next, struct hfsc_class, ellist)) &&
-	     cl->cl_e <= p->cl_e))
-		return;
-
-	/* check the last entry */
-	last = list_entry(head->prev, struct hfsc_class, ellist);
-	if (last->cl_e <= cl->cl_e) {
-		list_move_tail(&cl->ellist, head);
-		return;
-	}
-
-	/*
-	 * the new position must be between the next entry
-	 * and the last entry
-	 */
-	list_for_each_entry_continue(p, head, ellist) {
-		if (cl->cl_e < p->cl_e) {
-			list_move_tail(&cl->ellist, &p->ellist);
-			return;
-		}
-	}
-	ASSERT(0); /* should not reach here */
+	eltree_remove(cl);
+	eltree_insert(cl);
 }
 
 /* find the class with the minimum deadline among the eligible classes */
 static inline struct hfsc_class *
-ellist_get_mindl(struct list_head *head, u64 cur_time)
+eltree_get_mindl(struct hfsc_sched *q, u64 cur_time)
 {
 	struct hfsc_class *p, *cl = NULL;
+	rb_node_t *n;
 
-	list_for_each_entry(p, head, ellist) {
+	for (n = rb_first(&q->eligible); n != NULL; n = rb_next(n)) {
+		p = rb_entry(n, struct hfsc_class, el_node);
 		if (p->cl_e > cur_time)
 			break;
 		if (cl == NULL || p->cl_d < cl->cl_d)
@@ -303,92 +278,62 @@ ellist_get_mindl(struct list_head *head,
 
 /* find the class with minimum eligible time among the eligible classes */
 static inline struct hfsc_class *
-ellist_get_minel(struct list_head *head)
+eltree_get_minel(struct hfsc_sched *q)
 {
-	if (list_empty(head))
+	rb_node_t *n;
+	
+	n = rb_first(&q->eligible);
+	if (n == NULL)
 		return NULL;
-	return list_entry(head->next, struct hfsc_class, ellist);
+	return rb_entry(n, struct hfsc_class, el_node);
 }
 
 /*
- * active children list holds backlogged child classes being sorted
- * by their virtual time. each intermediate class has one active
- * children list.
+ * vttree holds holds backlogged child classes being sorted by their virtual
+ * time. each intermediate class has one vttree.
  */
 static void
-actlist_insert(struct hfsc_class *cl)
+vttree_insert(struct hfsc_class *cl)
 {
-	struct list_head *head = &cl->cl_parent->actlist;
-	struct hfsc_class *p;
-
-	/* check the last entry first */
-	if (list_empty(head) ||
-	    ((p = list_entry(head->prev, struct hfsc_class, alist)) &&
-	     p->cl_vt <= cl->cl_vt)) {
-		list_add_tail(&cl->alist, head);
-		return;
-	}
-
-	list_for_each_entry(p, head, alist) {
-		if (cl->cl_vt < p->cl_vt) {
-			/* insert cl before p */
-			list_add_tail(&cl->alist, &p->alist);
-			return;
-		}
+	rb_node_t **p = &cl->cl_parent->vt_tree.rb_node;
+	rb_node_t *parent = NULL;
+	struct hfsc_class *cl1;
+
+	while (*p != NULL) {
+		parent = *p;
+		cl1 = rb_entry(parent, struct hfsc_class, vt_node);
+		if (cl->cl_vt >= cl1->cl_vt)
+			p = &parent->rb_right;
+		else
+			p = &parent->rb_left;
 	}
-	ASSERT(0); /* should not reach here */
+	rb_link_node(&cl->vt_node, parent, p);
+	rb_insert_color(&cl->vt_node, &cl->cl_parent->vt_tree);
 }
 
 static inline void
-actlist_remove(struct hfsc_class *cl)
+vttree_remove(struct hfsc_class *cl)
 {
-	list_del(&cl->alist);
+	rb_erase(&cl->vt_node, &cl->cl_parent->vt_tree);
 }
 
-static void
-actlist_update(struct hfsc_class *cl)
+static inline void
+vttree_update(struct hfsc_class *cl)
 {
-	struct list_head *head = &cl->cl_parent->actlist;
-	struct hfsc_class *p, *last;
-
-	/*
-	 * the virtual time of a class increases monotonically.
-	 * if the next entry has a larger virtual time, nothing to do.
-	 */
-	if (cl->alist.next == head ||
-	    ((p = list_entry(cl->alist.next, struct hfsc_class, alist)) &&
-	     cl->cl_vt <= p->cl_vt))
-		return;
-
-	/* check the last entry */
-	last = list_entry(head->prev, struct hfsc_class, alist);
-	if (last->cl_vt <= cl->cl_vt) {
-		list_move_tail(&cl->alist, head);
-		return;
-	}
-
-	/*
-	 * the new position must be between the next entry
-	 * and the last entry
-	 */
-	list_for_each_entry_continue(p, head, alist) {
-		if (cl->cl_vt < p->cl_vt) {
-			list_move_tail(&cl->alist, &p->alist);
-			return;
-		}
-	}
-	ASSERT(0); /* should not reach here */
+	vttree_remove(cl);
+	vttree_insert(cl);
 }
 
 static inline struct hfsc_class *
-actlist_firstfit(struct hfsc_class *cl, u64 cur_time)
+vttree_firstfit(struct hfsc_class *cl, u64 cur_time)
 {
 	struct hfsc_class *p;
+	rb_node_t *n;
 
-	list_for_each_entry(p, &cl->actlist, alist) {
-		if (p->cl_f <= cur_time) {
+	for (n = rb_first(&cl->vt_tree); n != NULL; n = rb_next(n)) {
+		p = rb_entry(n, struct hfsc_class, vt_node);
+		if (p->cl_f <= cur_time)
 			return p;
-		}
 	}
 	return NULL;
 }
@@ -397,14 +342,14 @@ actlist_firstfit(struct hfsc_class *cl, 
  * get the leaf class with the minimum vt in the hierarchy
  */
 static struct hfsc_class *
-actlist_get_minvt(struct hfsc_class *cl, u64 cur_time)
+vttree_get_minvt(struct hfsc_class *cl, u64 cur_time)
 {
 	/* if root-class's cfmin is bigger than cur_time nothing to do */
 	if (cl->cl_cfmin > cur_time)
 		return NULL;
 
 	while (cl->level > 0) {
-		cl = actlist_firstfit(cl, cur_time);
+		cl = vttree_firstfit(cl, cur_time);
 		if (cl == NULL)
 			return NULL;
 		/*
@@ -416,6 +361,38 @@ actlist_get_minvt(struct hfsc_class *cl,
 	return cl;
 }
 
+static void
+cftree_insert(struct hfsc_class *cl)
+{
+	rb_node_t **p = &cl->cl_parent->cf_tree.rb_node;
+	rb_node_t *parent = NULL;
+	struct hfsc_class *cl1;
+
+	while (*p != NULL) {
+		parent = *p;
+		cl1 = rb_entry(parent, struct hfsc_class, cf_node);
+		if (cl->cl_f >= cl1->cl_f)
+			p = &parent->rb_right;
+		else
+			p = &parent->rb_left;
+	}
+	rb_link_node(&cl->cf_node, parent, p);
+	rb_insert_color(&cl->cf_node, &cl->cl_parent->cf_tree);
+}
+
+static inline void
+cftree_remove(struct hfsc_class *cl)
+{
+	rb_erase(&cl->cf_node, &cl->cl_parent->cf_tree);
+}
+
+static inline void
+cftree_update(struct hfsc_class *cl)
+{
+	cftree_remove(cl);
+	cftree_insert(cl);
+}
+
 /*
  * service curve support functions
  *
@@ -709,7 +686,7 @@ init_ed(struct hfsc_class *cl, unsigned 
 	cl->cl_e = rtsc_y2x(&cl->cl_eligible, cl->cl_cumul);
 	cl->cl_d = rtsc_y2x(&cl->cl_deadline, cl->cl_cumul + next_len);
 
-	ellist_insert(cl);
+	eltree_insert(cl);
 }
 
 static void
@@ -718,7 +695,7 @@ update_ed(struct hfsc_class *cl, unsigne
 	cl->cl_e = rtsc_y2x(&cl->cl_eligible, cl->cl_cumul);
 	cl->cl_d = rtsc_y2x(&cl->cl_deadline, cl->cl_cumul + next_len);
 
-	ellist_update(cl);
+	eltree_update(cl);
 }
 
 static inline void
@@ -727,32 +704,25 @@ update_d(struct hfsc_class *cl, unsigned
 	cl->cl_d = rtsc_y2x(&cl->cl_deadline, cl->cl_cumul + next_len);
 }
 
-static void
+static inline void
 update_cfmin(struct hfsc_class *cl)
 {
+	rb_node_t *n = rb_first(&cl->cf_tree);
 	struct hfsc_class *p;
-	u64 cfmin;
 
-	if (list_empty(&cl->actlist)) {
+	if (n == NULL) {
 		cl->cl_cfmin = 0;
 		return;
 	}
-	cfmin = HT_INFINITY;
-	list_for_each_entry(p, &cl->actlist, alist) {
-		if (p->cl_f == 0) {
-			cl->cl_cfmin = 0;
-			return;
-		}
-		if (p->cl_f < cfmin)
-			cfmin = p->cl_f;
-	}
-	cl->cl_cfmin = cfmin;
+	p = rb_entry(n, struct hfsc_class, cf_node);
+	cl->cl_cfmin = p->cl_f;
 }
 
 static void
 init_vf(struct hfsc_class *cl, unsigned int len)
 {
-	struct hfsc_class *max_cl, *p;
+	struct hfsc_class *max_cl;
+	rb_node_t *n;
 	u64 vt, f, cur_time;
 	int go_active;
 
@@ -765,9 +735,9 @@ init_vf(struct hfsc_class *cl, unsigned 
 			go_active = 0;
 
 		if (go_active) {
-			if (!list_empty(&cl->cl_parent->actlist)) {
-				max_cl = list_entry(cl->cl_parent->actlist.prev,
-				                    struct hfsc_class, alist);
+			n = rb_last(&cl->cl_parent->vt_tree);
+			if (n != NULL) {
+				max_cl = rb_entry(n, struct hfsc_class,vt_node);
 				/*
 				 * set vt to the average of the min and max
 				 * classes.  if the parent's period didn't
@@ -783,19 +753,20 @@ init_vf(struct hfsc_class *cl, unsigned 
 			} else {
 				/*
 				 * first child for a new parent backlog period.
-				 * add parent's cvtmax to vtoff of children
-				 * to make a new vt (vtoff + vt) larger than
-				 * the vt in the last period for all children.
+				 * add parent's cvtmax to cvtoff to make a new
+				 * vt (vtoff + vt) larger than the vt in the
+				 * last period for all children.
 				 */
 				vt = cl->cl_parent->cl_cvtmax;
-				list_for_each_entry(p, &cl->cl_parent->children,
-				                                       siblings)
-					p->cl_vtoff += vt;
-				cl->cl_vt = 0;
+				cl->cl_parent->cl_cvtoff += vt;
 				cl->cl_parent->cl_cvtmax = 0;
 				cl->cl_parent->cl_cvtmin = 0;
+				cl->cl_vt = 0;
 			}
 
+			cl->cl_vtoff = cl->cl_parent->cl_cvtoff -
+							cl->cl_pcvtoff;
+
 			/* update the virtual curve */
 			vt = cl->cl_vt + cl->cl_vtoff;
 			rtsc_min(&cl->cl_virtual, &cl->cl_fsc, vt,
@@ -812,7 +783,8 @@ init_vf(struct hfsc_class *cl, unsigned 
 				cl->cl_parentperiod++;
 			cl->cl_f = 0;
 
-			actlist_insert(cl);
+			vttree_insert(cl);
+			cftree_insert(cl);
 
 			if (cl->cl_flags & HFSC_USC) {
 				/* class has upper limit curve */
@@ -832,6 +804,7 @@ init_vf(struct hfsc_class *cl, unsigned 
 		f = max(cl->cl_myf, cl->cl_cfmin);
 		if (f != cl->cl_f) {
 			cl->cl_f = f;
+			cftree_update(cl);
 			update_cfmin(cl->cl_parent);
 		}
 	}
@@ -864,9 +837,10 @@ update_vf(struct hfsc_class *cl, unsigne
 			if (cl->cl_vt > cl->cl_parent->cl_cvtmax)
 				cl->cl_parent->cl_cvtmax = cl->cl_vt;
 
-			/* remove this class from the vt list */
-			actlist_remove(cl);
+			/* remove this class from the vt tree */
+			vttree_remove(cl);
 
+			cftree_remove(cl);
 			update_cfmin(cl->cl_parent);
 
 			continue;
@@ -888,8 +862,8 @@ update_vf(struct hfsc_class *cl, unsigne
 			cl->cl_vt = cl->cl_parent->cl_cvtmin;
 		}
 
-		/* update the vt list */
-		actlist_update(cl);
+		/* update the vt tree */
+		vttree_update(cl);
 
 		if (cl->cl_flags & HFSC_USC) {
 			cl->cl_myf = cl->cl_myfadj + rtsc_y2x(&cl->cl_ulimit,
@@ -919,6 +893,7 @@ update_vf(struct hfsc_class *cl, unsigne
 		f = max(cl->cl_myf, cl->cl_cfmin);
 		if (f != cl->cl_f) {
 			cl->cl_f = f;
+			cftree_update(cl);
 			update_cfmin(cl->cl_parent);
 		}
 	}
@@ -939,13 +914,13 @@ static void
 set_passive(struct hfsc_class *cl)
 {
 	if (cl->cl_flags & HFSC_RSC)
-		ellist_remove(cl);
+		eltree_remove(cl);
 
 	list_del(&cl->dlist);
 
 	/*
-	 * actlist is now handled in update_vf() so that update_vf(cl, 0, 0)
-	 * needs to be called explicitly to remove a class from actlist
+	 * vttree is now handled in update_vf() so that update_vf(cl, 0, 0)
+	 * needs to be called explicitly to remove a class from vttree.
 	 */
 }
 
@@ -1168,7 +1143,8 @@ hfsc_change_class(struct Qdisc *sch, u32
 		cl->qdisc = &noop_qdisc;
 	cl->stats.lock = &sch->dev->queue_lock;
 	INIT_LIST_HEAD(&cl->children);
-	INIT_LIST_HEAD(&cl->actlist);
+	cl->vt_tree = RB_ROOT;
+	cl->cf_tree = RB_ROOT;
 
 	sch_tree_lock(sch);
 	list_add_tail(&cl->hlist, &q->clhash[hfsc_hash(classid)]);
@@ -1176,6 +1152,7 @@ hfsc_change_class(struct Qdisc *sch, u32
 	if (parent->level == 0)
 		hfsc_purge_queue(sch, parent);
 	hfsc_adjust_levels(parent);
+	cl->cl_pcvtoff = parent->cl_cvtoff;
 	sch_tree_unlock(sch);
 
 #ifdef CONFIG_NET_ESTIMATOR
@@ -1500,7 +1477,7 @@ hfsc_schedule_watchdog(struct Qdisc *sch
 	u64 next_time = 0;
 	long delay;
 
-	if ((cl = ellist_get_minel(&q->eligible)) != NULL)
+	if ((cl = eltree_get_minel(q)) != NULL)
 		next_time = cl->cl_e;
 	if (q->root.cl_cfmin != 0) {
 		if (next_time == 0 || next_time > q->root.cl_cfmin)
@@ -1525,13 +1502,12 @@ hfsc_init_qdisc(struct Qdisc *sch, struc
 		return -EINVAL;
 	qopt = RTA_DATA(opt);
 
-	memset(q, 0, sizeof(struct hfsc_sched));
 	sch->stats.lock = &sch->dev->queue_lock;
 
 	q->defcls = qopt->defcls;
 	for (i = 0; i < HFSC_HSIZE; i++)
 		INIT_LIST_HEAD(&q->clhash[i]);
-	INIT_LIST_HEAD(&q->eligible);
+	q->eligible = RB_ROOT;
 	INIT_LIST_HEAD(&q->droplist);
 	skb_queue_head_init(&q->requeue);
 
@@ -1543,7 +1519,8 @@ hfsc_init_qdisc(struct Qdisc *sch, struc
 		q->root.qdisc = &noop_qdisc;
 	q->root.stats.lock = &sch->dev->queue_lock;
 	INIT_LIST_HEAD(&q->root.children);
-	INIT_LIST_HEAD(&q->root.actlist);
+	q->root.vt_tree = RB_ROOT;
+	q->root.cf_tree = RB_ROOT;
 
 	list_add(&q->root.hlist, &q->clhash[hfsc_hash(q->root.classid)]);
 
@@ -1584,6 +1561,8 @@ hfsc_reset_class(struct hfsc_class *cl)
 	cl->cl_vtoff        = 0;
 	cl->cl_cvtmin       = 0;
 	cl->cl_cvtmax       = 0;
+	cl->cl_cvtoff       = 0;
+	cl->cl_pcvtoff      = 0;
 	cl->cl_vtperiod     = 0;
 	cl->cl_parentperiod = 0;
 	cl->cl_f            = 0;
@@ -1591,7 +1570,9 @@ hfsc_reset_class(struct hfsc_class *cl)
 	cl->cl_myfadj       = 0;
 	cl->cl_cfmin        = 0;
 	cl->cl_nactive      = 0;
-	INIT_LIST_HEAD(&cl->actlist);
+
+	cl->vt_tree = RB_ROOT;
+	cl->cf_tree = RB_ROOT;
 	qdisc_reset(cl->qdisc);
 
 	if (cl->cl_flags & HFSC_RSC)
@@ -1614,7 +1595,7 @@ hfsc_reset_qdisc(struct Qdisc *sch)
 			hfsc_reset_class(cl);
 	}
 	__skb_queue_purge(&q->requeue);
-	INIT_LIST_HEAD(&q->eligible);
+	q->eligible = RB_ROOT;
 	INIT_LIST_HEAD(&q->droplist);
 	del_timer(&q->wd_timer);
 	sch->flags &= ~TCQ_F_THROTTLED;
@@ -1712,14 +1693,14 @@ hfsc_dequeue(struct Qdisc *sch)
 	 * find the class with the minimum deadline among
 	 * the eligible classes.
 	 */
-	if ((cl = ellist_get_mindl(&q->eligible, cur_time)) != NULL) {
+	if ((cl = eltree_get_mindl(q, cur_time)) != NULL) {
 		realtime = 1;
 	} else {
 		/*
 		 * use link-sharing criteria
 		 * get the class with the minimum vt in the hierarchy
 		 */
-		cl = actlist_get_minvt(&q->root, cur_time);
+		cl = vttree_get_minvt(&q->root, cur_time);
 		if (cl == NULL) {
 			sch->stats.overlimits++;
 			hfsc_schedule_watchdog(sch, cur_time);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/sched/sch_htb.c linux-2.4.20-wolk4.16-fullkernel/net/sched/sch_htb.c
--- linux-2.4.20-wolk4.15-fullkernel/net/sched/sch_htb.c	2004-06-29 11:25:53.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/sched/sch_htb.c	2004-09-05 16:01:11.000000000 +0200
@@ -1186,7 +1186,6 @@ static int htb_init(struct Qdisc *sch, s
 				HTB_VER >> 16,HTB_VER & 0xffff,gopt->version);
 		return -EINVAL;
 	}
-	memset(q,0,sizeof(*q));
 	q->debug = gopt->debug;
 	HTB_DBG(0,1,"htb_init sch=%p handle=%X r2q=%d\n",sch,sch->handle,gopt->rate2quantum);
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/sched/sch_ingress.c linux-2.4.20-wolk4.16-fullkernel/net/sched/sch_ingress.c
--- linux-2.4.20-wolk4.15-fullkernel/net/sched/sch_ingress.c	2004-06-29 11:25:52.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/sched/sch_ingress.c	2004-09-05 16:01:11.000000000 +0200
@@ -254,8 +254,6 @@ int ingress_init(struct Qdisc *sch,struc
 	}
 
 	DPRINTK("ingress_init(sch %p,[qdisc %p],opt %p)\n",sch,p,opt);
-	memset(p, 0, sizeof(*p));
-	p->filter_list = NULL;
 	p->q = &noop_qdisc;
 	MOD_INC_USE_COUNT;
 	return 0;
@@ -296,9 +294,6 @@ static void ingress_destroy(struct Qdisc
 		p->filter_list = tp->next;
 		tcf_destroy(tp);
 	}
-	memset(p, 0, sizeof(*p));
-	p->filter_list = NULL;
-
 #if 0
 /* for future use */
 	qdisc_destroy(p->q);
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/sched/sch_netem.c linux-2.4.20-wolk4.16-fullkernel/net/sched/sch_netem.c
--- linux-2.4.20-wolk4.15-fullkernel/net/sched/sch_netem.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/net/sched/sch_netem.c	2004-09-05 16:03:37.000000000 +0200
@@ -0,0 +1,582 @@
+/*
+ * net/sched/sch_netem.c	Network emulator
+ *
+ * 		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.
+ *
+ *  		Many of the algorithms and ideas for this came from
+ *		NIST Net which is not copyrighted. 
+ *
+ * Authors:	Stephen Hemminger <shemminger@osdl.org>
+ *		Catalin(ux aka Dino) BOIE <catab at umbrella dot ro>
+ */
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <asm/bitops.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/netdevice.h>
+#include <linux/skbuff.h>
+#include <linux/rtnetlink.h>
+
+#include <net/pkt_sched.h>
+
+#define qdisc_priv(q)	((void *)(q->data))
+
+/*	Network Emulation Queuing algorithm.
+	====================================
+
+	Sources: [1] Mark Carson, Darrin Santay, "NIST Net - A Linux-based
+		 Network Emulation Tool
+		 [2] Luigi Rizzo, DummyNet for FreeBSD
+
+	 ----------------------------------------------------------------
+
+	 This started out as a simple way to delay outgoing packets to
+	 test TCP but has grown to include most of the functionality
+	 of a full blown network emulator like NISTnet. It can delay
+	 packets and add random jitter (and correlation). The random
+	 distribution can be loaded from a table as well to provide
+	 normal, Pareto, or experimental curves. Packet loss,
+	 duplication, and reordering can also be emulated.
+
+	 This qdisc does not do classification that can be handled in
+	 layering other disciplines.  It does not need to do bandwidth
+	 control either since that can be handled by using token
+	 bucket or other rate control.
+
+	 The simulator is limited by the Linux timer resolution
+	 and will create packet bursts on the HZ boundary (1ms).
+*/
+
+struct netem_sched_data {
+	struct Qdisc	*qdisc;
+	struct sk_buff_head delayed;
+	struct timer_list timer;
+
+	u32 latency;
+	u32 loss;
+	u32 limit;
+	u32 counter;
+	u32 gap;
+	u32 jitter;
+	u32 duplicate;
+
+	struct crndstate {
+		unsigned long last;
+		unsigned long rho;
+	} delay_cor, loss_cor, dup_cor;
+
+	struct disttable {
+		u32  size;
+		s16 table[0];
+	} *delay_dist;
+};
+
+/* Time stamp put into socket buffer control block */
+struct netem_skb_cb {
+	psched_time_t	time_to_send;
+};
+
+/* init_crandom - initialize correlated random number generator
+ * Use entropy source for initial seed.
+ */
+static void init_crandom(struct crndstate *state, unsigned long rho)
+{
+	state->rho = rho;
+	state->last = net_random();
+}
+
+/* get_crandom - correlated random number generator
+ * Next number depends on last value.
+ * rho is scaled to avoid floating point.
+ */
+static unsigned long get_crandom(struct crndstate *state)
+{
+	u64 value, rho;
+	unsigned long answer;
+
+	if (state->rho == 0)	/* no correllation */
+		return net_random();
+
+	value = net_random();
+	rho = (u64)state->rho + 1;
+	answer = (value * ((1ull<<32) - rho) + state->last * rho) >> 32;
+	state->last = answer;
+	return answer;
+}
+
+/* tabledist - return a pseudo-randomly distributed value with mean mu and
+ * std deviation sigma.  Uses table lookup to approximate the desired
+ * distribution, and a uniformly-distributed pseudo-random source.
+ */
+static long tabledist(unsigned long mu, long sigma, 
+		      struct crndstate *state, const struct disttable *dist)
+{
+	long t, x;
+	unsigned long rnd;
+
+	if (sigma == 0)
+		return mu;
+
+	rnd = get_crandom(state);
+
+	/* default uniform distribution */
+	if (dist == NULL) 
+		return (rnd % (2*sigma)) - sigma + mu;
+
+	t = dist->table[rnd % dist->size];
+	x = (sigma % NETEM_DIST_SCALE) * t;
+	if (x >= 0)
+		x += NETEM_DIST_SCALE/2;
+	else
+		x -= NETEM_DIST_SCALE/2;
+
+	return  x / NETEM_DIST_SCALE + (sigma / NETEM_DIST_SCALE) * t + mu;
+}
+
+/* Put skb in the private delayed queue. */
+static int delay_skb(struct Qdisc *sch, struct sk_buff *skb)
+{
+	struct netem_sched_data *q = qdisc_priv(sch);
+	struct netem_skb_cb *cb = (struct netem_skb_cb *)skb->cb;
+	psched_time_t now;
+	
+	PSCHED_GET_TIME(now);
+	PSCHED_TADD2(now, tabledist(q->latency, q->jitter, 
+				    &q->delay_cor, q->delay_dist),
+		     cb->time_to_send);
+	
+	/* Always queue at tail to keep packets in order */
+	if (likely(q->delayed.qlen < q->limit)) {
+		__skb_queue_tail(&q->delayed, skb);
+		sch->q.qlen++;
+		sch->stats.bytes += skb->len;
+		sch->stats.packets++;
+		return NET_XMIT_SUCCESS;
+	}
+
+	sch->stats.drops++;
+	kfree_skb(skb);
+	return NET_XMIT_DROP;
+}
+
+static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch)
+{
+	struct netem_sched_data *q = qdisc_priv(sch);
+
+	pr_debug("netem_enqueue skb=%p @%lu\n", skb, jiffies);
+
+	/* Random packet drop 0 => none, ~0 => all */
+	if (q->loss && q->loss >= get_crandom(&q->loss_cor)) {
+		pr_debug("netem_enqueue: random loss\n");
+		sch->stats.drops++;
+		return 0;	/* lie about loss so TCP doesn't know */
+	}
+
+	/* Random duplication */
+	if (q->duplicate && q->duplicate >= get_crandom(&q->dup_cor)) {
+		struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC);
+
+		pr_debug("netem_enqueue: dup %p\n", skb2);
+		if (skb2)
+			delay_skb(sch, skb2);
+	}
+
+	/* If doing simple delay then gap == 0 so all packets
+	 * go into the delayed holding queue
+	 * otherwise if doing out of order only "1 out of gap"
+	 * packets will be delayed.
+	 */
+	if (q->counter < q->gap) {
+		int ret;
+
+		++q->counter;
+		ret = q->qdisc->enqueue(skb, q->qdisc);
+		if (ret)
+			sch->stats.drops++;
+		return ret;
+	}
+	
+	q->counter = 0;
+
+	return delay_skb(sch, skb);
+}
+
+/* Requeue packets but don't change time stamp */
+static int netem_requeue(struct sk_buff *skb, struct Qdisc *sch)
+{
+	struct netem_sched_data *q = qdisc_priv(sch);
+	int ret;
+
+	if ((ret = q->qdisc->ops->requeue(skb, q->qdisc)) == 0)
+		sch->q.qlen++;
+
+	return ret;
+}
+
+static unsigned int netem_drop(struct Qdisc* sch)
+{
+	struct netem_sched_data *q = qdisc_priv(sch);
+	unsigned int len;
+
+	if ((len = q->qdisc->ops->drop(q->qdisc)) != 0) {
+		sch->q.qlen--;
+		sch->stats.drops++;
+	}
+	return len;
+}
+
+/* Dequeue packet.
+ *  Move all packets that are ready to send from the delay holding
+ *  list to the underlying qdisc, then just call dequeue
+ */
+static struct sk_buff *netem_dequeue(struct Qdisc *sch)
+{
+	struct netem_sched_data *q = qdisc_priv(sch);
+	struct sk_buff *skb;
+	psched_time_t now;
+
+	PSCHED_GET_TIME(now);
+	while ((skb = skb_peek(&q->delayed)) != NULL) {
+		const struct netem_skb_cb *cb
+			= (const struct netem_skb_cb *)skb->cb;
+		long delay 
+			= PSCHED_US2JIFFIE(PSCHED_TDIFF(cb->time_to_send, now));
+		pr_debug("netem_dequeue: delay queue %p@%lu %ld\n",
+			 skb, jiffies, delay);
+
+		/* if more time remaining? */
+		if (delay > 0) {
+			mod_timer(&q->timer, jiffies + delay);
+			break;
+		}
+		__skb_unlink(skb, &q->delayed);
+
+		if (q->qdisc->enqueue(skb, q->qdisc))
+			sch->stats.drops++;
+	}
+
+	skb = q->qdisc->dequeue(q->qdisc);
+	if (skb) 
+		sch->q.qlen--;
+	return skb;
+}
+
+static void netem_watchdog(unsigned long arg)
+{
+	struct Qdisc *sch = (struct Qdisc *)arg;
+
+	pr_debug("netem_watchdog: fired @%lu\n", jiffies);
+	netif_schedule(sch->dev);
+}
+
+static void netem_reset(struct Qdisc *sch)
+{
+	struct netem_sched_data *q = qdisc_priv(sch);
+
+	qdisc_reset(q->qdisc);
+	skb_queue_purge(&q->delayed);
+
+	sch->q.qlen = 0;
+	del_timer_sync(&q->timer);
+}
+
+static int set_fifo_limit(struct Qdisc *q, int limit)
+{
+        struct rtattr *rta;
+	int ret = -ENOMEM;
+
+	rta = kmalloc(RTA_LENGTH(sizeof(struct tc_fifo_qopt)), GFP_KERNEL);
+	if (rta) {
+		rta->rta_type = RTM_NEWQDISC;
+		rta->rta_len = RTA_LENGTH(sizeof(struct tc_fifo_qopt)); 
+		((struct tc_fifo_qopt *)RTA_DATA(rta))->limit = limit;
+		
+		ret = q->ops->change(q, rta);
+		kfree(rta);
+	}
+	return ret;
+}
+
+/*
+ * Distribution data is a variable size payload containing
+ * signed 16 bit values.
+ */
+static int get_dist_table(struct Qdisc *sch, const struct rtattr *attr)
+{
+	struct netem_sched_data *q = qdisc_priv(sch);
+	unsigned long n = RTA_PAYLOAD(attr)/sizeof(__s16);
+	const __s16 *data = RTA_DATA(attr);
+	struct disttable *d;
+	int i;
+
+	if (n > 65536)
+		return -EINVAL;
+
+	d = kmalloc(sizeof(*d) + n*sizeof(d->table[0]), GFP_KERNEL);
+	if (!d)
+		return -ENOMEM;
+
+	d->size = n;
+	for (i = 0; i < n; i++)
+		d->table[i] = data[i];
+	
+	spin_lock_bh(&sch->dev->queue_lock);
+	d = xchg(&q->delay_dist, d);
+	spin_unlock_bh(&sch->dev->queue_lock);
+
+	kfree(d);
+	return 0;
+}
+
+static int get_correlation(struct Qdisc *sch, const struct rtattr *attr)
+{
+	struct netem_sched_data *q = qdisc_priv(sch);
+	const struct tc_netem_corr *c = RTA_DATA(attr);
+
+	if (RTA_PAYLOAD(attr) != sizeof(*c))
+		return -EINVAL;
+
+	init_crandom(&q->delay_cor, c->delay_corr);
+	init_crandom(&q->loss_cor, c->loss_corr);
+	init_crandom(&q->dup_cor, c->dup_corr);
+	return 0;
+}
+
+static int netem_change(struct Qdisc *sch, struct rtattr *opt)
+{
+	struct netem_sched_data *q = qdisc_priv(sch);
+	struct tc_netem_qopt *qopt;
+	int ret;
+	
+	if (opt == NULL || RTA_PAYLOAD(opt) < sizeof(*qopt))
+		return -EINVAL;
+
+	qopt = RTA_DATA(opt);
+	ret = set_fifo_limit(q->qdisc, qopt->limit);
+	if (ret) {
+		pr_debug("netem: can't set fifo limit\n");
+		return ret;
+	}
+	
+	q->latency = qopt->latency;
+	q->jitter = qopt->jitter;
+	q->limit = qopt->limit;
+	q->gap = qopt->gap;
+	q->loss = qopt->loss;
+	q->duplicate = qopt->duplicate;
+
+	/* Handle nested options after initial queue options.
+	 * Should have put all options in nested format but too late now.
+	 */ 
+	if (RTA_PAYLOAD(opt) > sizeof(*qopt)) {
+		struct rtattr *tb[TCA_NETEM_MAX];
+		if (rtattr_parse(tb, TCA_NETEM_MAX, 
+				 RTA_DATA(opt) + sizeof(*qopt),
+				 RTA_PAYLOAD(opt) - sizeof(*qopt)))
+			return -EINVAL;
+
+		if (tb[TCA_NETEM_CORR-1]) {
+			ret = get_correlation(sch, tb[TCA_NETEM_CORR-1]);
+			if (ret)
+				return ret;
+		}
+
+		if (tb[TCA_NETEM_DELAY_DIST-1]) {
+			ret = get_dist_table(sch, tb[TCA_NETEM_DELAY_DIST-1]);
+			if (ret)
+				return ret;
+		}
+	}
+
+
+	return 0;
+}
+
+static int netem_init(struct Qdisc *sch, struct rtattr *opt)
+{
+	struct netem_sched_data *q = qdisc_priv(sch);
+	int ret;
+
+	if (!opt)
+		return -EINVAL;
+
+	MOD_INC_USE_COUNT;
+	skb_queue_head_init(&q->delayed);
+	init_timer(&q->timer);
+	q->timer.function = netem_watchdog;
+	q->timer.data = (unsigned long) sch;
+	q->counter = 0;
+
+	q->qdisc = qdisc_create_dflt(sch->dev, &pfifo_qdisc_ops);
+	if (!q->qdisc) {
+		pr_debug("netem: qdisc create failed\n");
+		return -ENOMEM;
+	}
+
+	ret = netem_change(sch, opt);
+	if (ret) {
+		pr_debug("netem: change failed\n");
+		qdisc_destroy(q->qdisc);
+		MOD_DEC_USE_COUNT;
+	}
+	return ret;
+}
+
+static void netem_destroy(struct Qdisc *sch)
+{
+	struct netem_sched_data *q = qdisc_priv(sch);
+
+	del_timer_sync(&q->timer);
+	qdisc_destroy(q->qdisc);
+	kfree(q->delay_dist);
+	MOD_DEC_USE_COUNT;
+}
+
+static int netem_dump(struct Qdisc *sch, struct sk_buff *skb)
+{
+	const struct netem_sched_data *q = qdisc_priv(sch);
+	unsigned char	 *b = skb->tail;
+	struct rtattr *rta = (struct rtattr *) b;
+	struct tc_netem_qopt qopt;
+	struct tc_netem_corr cor;
+
+	qopt.latency = q->latency;
+	qopt.jitter = q->jitter;
+	qopt.limit = q->limit;
+	qopt.loss = q->loss;
+	qopt.gap = q->gap;
+	qopt.duplicate = q->duplicate;
+	RTA_PUT(skb, TCA_OPTIONS, sizeof(qopt), &qopt);
+
+	cor.delay_corr = q->delay_cor.rho;
+	cor.loss_corr = q->loss_cor.rho;
+	cor.dup_corr = q->dup_cor.rho;
+	RTA_PUT(skb, TCA_NETEM_CORR, sizeof(cor), &cor);
+	rta->rta_len = skb->tail - b;
+
+	return skb->len;
+
+rtattr_failure:
+	skb_trim(skb, b - skb->data);
+	return -1;
+}
+
+static int netem_dump_class(struct Qdisc *sch, unsigned long cl,
+			  struct sk_buff *skb, struct tcmsg *tcm)
+{
+	struct netem_sched_data *q = qdisc_priv(sch);
+
+	if (cl != 1) 	/* only one class */
+		return -ENOENT;
+
+	tcm->tcm_handle |= TC_H_MIN(1);
+	tcm->tcm_info = q->qdisc->handle;
+
+	return 0;
+}
+
+static int netem_graft(struct Qdisc *sch, unsigned long arg, struct Qdisc *new,
+		     struct Qdisc **old)
+{
+	struct netem_sched_data *q = qdisc_priv(sch);
+
+	if (new == NULL)
+		new = &noop_qdisc;
+
+	sch_tree_lock(sch);
+	*old = xchg(&q->qdisc, new);
+	qdisc_reset(*old);
+	sch->q.qlen = 0;
+	sch_tree_unlock(sch);
+
+	return 0;
+}
+
+static struct Qdisc *netem_leaf(struct Qdisc *sch, unsigned long arg)
+{
+	struct netem_sched_data *q = qdisc_priv(sch);
+	return q->qdisc;
+}
+
+static unsigned long netem_get(struct Qdisc *sch, u32 classid)
+{
+	return 1;
+}
+
+static void netem_put(struct Qdisc *sch, unsigned long arg)
+{
+}
+
+static int netem_change_class(struct Qdisc *sch, u32 classid, u32 parentid, 
+			    struct rtattr **tca, unsigned long *arg)
+{
+	return -ENOSYS;
+}
+
+static int netem_delete(struct Qdisc *sch, unsigned long arg)
+{
+	return -ENOSYS;
+}
+
+static void netem_walk(struct Qdisc *sch, struct qdisc_walker *walker)
+{
+	if (!walker->stop) {
+		if (walker->count >= walker->skip)
+			if (walker->fn(sch, 1, walker) < 0) {
+				walker->stop = 1;
+				return;
+			}
+		walker->count++;
+	}
+}
+
+static struct tcf_proto **netem_find_tcf(struct Qdisc *sch, unsigned long cl)
+{
+	return NULL;
+}
+
+static struct Qdisc_class_ops netem_class_ops = {
+	.graft		=	netem_graft,
+	.leaf		=	netem_leaf,
+	.get		=	netem_get,
+	.put		=	netem_put,
+	.change		=	netem_change_class,
+	.delete		=	netem_delete,
+	.walk		=	netem_walk,
+	.tcf_chain	=	netem_find_tcf,
+	.dump		=	netem_dump_class,
+};
+
+static struct Qdisc_ops netem_qdisc_ops = {
+	.id		=	"netem",
+	.cl_ops		=	&netem_class_ops,
+	.priv_size	=	sizeof(struct netem_sched_data),
+	.enqueue	=	netem_enqueue,
+	.dequeue	=	netem_dequeue,
+	.requeue	=	netem_requeue,
+	.drop		=	netem_drop,
+	.init		=	netem_init,
+	.reset		=	netem_reset,
+	.destroy	=	netem_destroy,
+	.change		=	netem_change,
+	.dump		=	netem_dump,
+};
+
+
+static int __init netem_module_init(void)
+{
+	return register_qdisc(&netem_qdisc_ops);
+}
+static void __exit netem_module_exit(void)
+{
+	unregister_qdisc(&netem_qdisc_ops);
+}
+module_init(netem_module_init)
+module_exit(netem_module_exit)
+MODULE_LICENSE("GPL");
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/unix/af_unix.c linux-2.4.20-wolk4.16-fullkernel/net/unix/af_unix.c
--- linux-2.4.20-wolk4.15-fullkernel/net/unix/af_unix.c	2004-06-29 13:29:05.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/unix/af_unix.c	2004-09-05 17:09:43.000000000 +0200
@@ -736,7 +736,7 @@ static int unix_bind(struct socket *sock
 		 */
 		mode = S_IFSOCK | (sock->inode->i_mode & ~current->fs->umask);
 	
-		if (!gr_acl_handle_mknod(dentry, nd.dentry, nd.mnt)) {
+		if (!gr_acl_handle_mknod(dentry, nd.dentry, nd.mnt, mode)) {
 			err = -EACCES;
 			goto out_mknod_dput;
 		}	
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/veth/vethcmd.c linux-2.4.20-wolk4.16-fullkernel/net/veth/vethcmd.c
--- linux-2.4.20-wolk4.15-fullkernel/net/veth/vethcmd.c	2004-06-29 11:25:31.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/veth/vethcmd.c	2004-09-05 15:59:36.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- * $Id: vethcmd.c,v 1.7 2004/03/02 14:47:04 yumo Exp $
+ * $Id: vethcmd.c,v 1.9 2004/06/19 12:42:37 yumo Exp $
  * vethcfg -- veth device driver configurator program
  *
  * Author: Yumo (Katsuyuki Yumoto) 2000-2004
@@ -55,7 +55,7 @@
 #define ERR_UNKNCOMM -11
 
 /* maximum name length */
-#define MAX_NAME 7
+#define MAX_NAME 8
 
 char *get_field_n(char *d, char *s, int n)
 {
@@ -775,8 +775,8 @@ int port_param_set(struct u_port_info *u
 	if (strcmp(pnam, "akey") == 0){
 		u->actor_admin_port_key = atoi(pval)&0xff00;
 	} else if (strcmp(pnam, "aps_ac") == 0){
-		atoi(pval)?(u->partner_admin_port_state|=PS_LACP_ACTIVITY):
-			(u->partner_admin_port_state&=~PS_LACP_ACTIVITY);
+		atoi(pval)?(u->actor_admin_port_state|=PS_LACP_ACTIVITY):
+			(u->actor_admin_port_state&=~PS_LACP_ACTIVITY);
 	} else if (strcmp(pnam, "aps_to") == 0){
 		atoi(pval)?(u->actor_admin_port_state|=PS_LACP_TIMEOUT):
 			(u->actor_admin_port_state&=~PS_LACP_TIMEOUT);
@@ -925,7 +925,7 @@ int veth_command(int argc, char **argv)
 
 
 	/* a silly raw socket just for ioctl()ling it */
-	sock = socket(AF_INET, SOCK_RAW, IPPROTO_RAW);
+	sock = socket(AF_INET, SOCK_DGRAM, 0);
 	if (sock < 0) {
 		perror(PROG_NAME);
 		print_general_info("");
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/veth/vether.c linux-2.4.20-wolk4.16-fullkernel/net/veth/vether.c
--- linux-2.4.20-wolk4.15-fullkernel/net/veth/vether.c	2004-06-29 11:25:31.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/veth/vether.c	2004-09-05 16:00:20.000000000 +0200
@@ -1,4 +1,4 @@
-/* $Id: veth.c,v 1.33 2004/03/02 12:13:02 yumo Exp $ */
+/* $Id: veth.c,v 1.36 2004/06/19 12:42:37 yumo Exp $ */
 /* VETH: A virtual ethernet device driver for Linux. 
  *
  * This device driver is an implementation of Aggregation of Multiple
@@ -295,6 +295,7 @@ static void veth_record_pdu(struct lacpd
 
 		memcpy(vp->agg->av.partner_sys, p->pv.partner_oper_sys, ETH_ALEN);
 		vp->agg->av.partner_sys_pri = p->pv.partner_oper_sys_pri;
+		vp->agg->av.partner_oper_agg_key = p->pv.partner_oper_key;
 	}
 	
 	return;
@@ -391,8 +392,8 @@ static void veth_update_ntt(struct lacpd
 		(memcmp(veth_sysvar.actor_sys, buf->partner_sys, ETH_ALEN) == 0) &&
 		(veth_sysvar.actor_sys_pri == ntohs(buf->partner_sys_pri)) &&
 		(p->pv.actor_oper_port_key == ntohs(buf->partner_key)) &&
-		((p->pv.actor_oper_port_state & (PS_LACP_ACTIVITY | PS_LACP_TIMEOUT | PS_AGGREGATION)) ==
-		(buf->partner_state & (PS_LACP_ACTIVITY | PS_LACP_TIMEOUT | PS_AGGREGATION)));
+		((p->pv.actor_oper_port_state & (PS_LACP_ACTIVITY | PS_LACP_TIMEOUT | PS_SYNCHRONIZATION | PS_AGGREGATION)) ==
+		(buf->partner_state & (PS_LACP_ACTIVITY | PS_LACP_TIMEOUT | PS_SYNCHRONIZATION | PS_AGGREGATION)));
 
 	if (!param_match){
 		p->pv.need_to_xmit = _TRUE;
@@ -446,6 +447,7 @@ static void veth_detach_mux_from_agg(str
 			if (m == 0){ /* last one */
 				memset(ag->av.partner_sys, 0, ETH_ALEN);
 				ag->av.partner_sys_pri = 0;
+				ag->av.partner_oper_agg_key = 0;
 			}
 			break;
 		}
@@ -735,6 +737,7 @@ static int veth_frame_distribution(struc
 	switch (ag->n_ports){
 	case 0:
 		/* There are no ports for distributing this skb. */
+		spin_unlock_irqrestore(&ag->lock, flags);
 		goto freeandout;
 	case 1:
 		p = veth_ports + ag->ports[0];
@@ -3010,6 +3013,8 @@ static int veth_ioctl_dispatch(struct ve
 	case VETHCTL_ADD_PHYIF:
 		{
 			struct u_port_info *u = (struct u_port_info *)vc->buf;
+			if (!cap_raised(current->cap_effective, CAP_NET_ADMIN))
+				return -EPERM;
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
 			ret = veth_add_phyif(vc->pif_name, vc->pif_module, u->actor_admin_port_key);
 #else
@@ -3019,6 +3024,8 @@ static int veth_ioctl_dispatch(struct ve
 		break;
 
 	case VETHCTL_DEL_PHYIF:
+		if (!cap_raised(current->cap_effective, CAP_NET_ADMIN))
+			return -EPERM;
 		ret = veth_del_phyif(vc->pif_name);
 		break;
 
@@ -3038,6 +3045,8 @@ static int veth_ioctl_dispatch(struct ve
 		break;
 
 	case VETHCTL_SET_PORT_INFO:
+		if (!cap_raised(current->cap_effective, CAP_NET_ADMIN))
+			return -EPERM;
 		n = veth_set_port_info((struct u_port_info *)vc->buf, vc->pif_name);
 		(n < 0)? (ret = n) : (vc->size = n);
 		break;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/veth/vether.h linux-2.4.20-wolk4.16-fullkernel/net/veth/vether.h
--- linux-2.4.20-wolk4.15-fullkernel/net/veth/vether.h	2004-06-29 11:25:31.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/veth/vether.h	2004-09-05 15:59:36.000000000 +0200
@@ -1,4 +1,4 @@
-/* $Id: veth.h,v 1.20 2004/03/03 14:16:33 yumo Exp $ */
+/* $Id: veth.h,v 1.21 2004/06/19 12:49:26 yumo Exp $ */
 /* VETH: A virtual ethernet device driver for Linux header file. 
  *
  * This device driver is an implementation of Aggregation of Multiple
@@ -31,7 +31,7 @@
 
 #define VETH_VER_MAJOR 0
 #define VETH_VER_MINOR 6
-#define VETH_VER_PATCH 3
+#define VETH_VER_PATCH 5
 
 #define VETH_MAGIC 0x3be5
 
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/net/wanrouter/wanproc.c linux-2.4.20-wolk4.16-fullkernel/net/wanrouter/wanproc.c
--- linux-2.4.20-wolk4.15-fullkernel/net/wanrouter/wanproc.c	2004-06-29 11:31:09.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/net/wanrouter/wanproc.c	2004-09-05 16:06:01.000000000 +0200
@@ -243,7 +243,9 @@ typedef struct wan_stat_entry
 		struct inode *inode = file->f_dentry->d_inode;
 		struct proc_dir_entry* dent;
 		char* page;
-		int pos, offs, len;
+		int pos, len;
+		loff_t n = *ppos;
+		unsigned offs = n;
 
 		if (count <= 0)
 			return 0;
@@ -257,14 +259,13 @@ typedef struct wan_stat_entry
 			return -ENOBUFS;
 			
 		pos = dent->get_info(page, dent->data, 0, 0);
-		offs = file->f_pos;
-		if (offs < pos) {
+		if (offs == n && offs < pos) {
 			len = min_t(unsigned int, pos - offs, count);
 			if (copy_to_user(buf, (page + offs), len)) {
 				kfree(page);
 				return -EFAULT;
 			}
-			file->f_pos += len;
+			*ppos = offs + len;
 		}
 		else
 			len = 0;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/scripts/Makefile linux-2.4.20-wolk4.16-fullkernel/scripts/Makefile
--- linux-2.4.20-wolk4.15-fullkernel/scripts/Makefile	2000-03-16 20:27:17.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/scripts/Makefile	2004-09-05 16:09:22.000000000 +0200
@@ -40,6 +40,6 @@ docproc: docproc.o
 	${HOSTCC} -o docproc docproc.o
 
 clean:
-	rm -f *~ kconfig.tk *.o tkparse mkdep split-include docproc
+	rm -f *~ kconfig.tk *.o tkparse mkdep split-include docproc carray
 
 include $(TOPDIR)/Rules.make
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/scripts/bin2c.c linux-2.4.20-wolk4.16-fullkernel/scripts/bin2c.c
--- linux-2.4.20-wolk4.15-fullkernel/scripts/bin2c.c	2004-06-29 11:24:15.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/scripts/bin2c.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-int main(int argc, char *argv[])
-{
-	int ch,total=0;
-
-	if(argc>1) printf("const char *%s %s=\n",argv[1],argc>2?argv[2]:"");
-
-	do {
-		printf("\t\"");
-		while((ch=getchar())!=EOF)
-		{
-			total++;
-			printf("\\x%02x",ch);
-			if(total%16==0) break;
-		}
-		printf("\"\n");
-	} while(ch!=EOF);
-
-	if(argc>1) printf("\t;\n\nconst int %s_size = %d;\n",argv[1],total);
-
-	return 0;
-}
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/scripts/binoffset.c linux-2.4.20-wolk4.16-fullkernel/scripts/binoffset.c
--- linux-2.4.20-wolk4.15-fullkernel/scripts/binoffset.c	2004-06-29 11:26:20.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/scripts/binoffset.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,163 +0,0 @@
-/***************************************************************************
- * binoffset.c
- * (C) 2002 Randy Dunlap <rddunlap@osdl.org>
- *
-#   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., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-# binoffset.c:
-# - searches a (binary) file for a specified (binary) pattern
-# - returns the offset of the located pattern or ~0 if not found
-# - exits with exit status 0 normally or non-0 if pattern is not found
-#   or any other error occurs.
-
-****************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-
-#define VERSION		"0.1"
-#define BUF_SIZE	(16 * 1024)
-#define PAT_SIZE	100
-
-char		*progname;
-char		*inputname;
-int		inputfd;
-int		bix;			/* buf index */
-unsigned char	patterns [PAT_SIZE] = {0}; /* byte-sized pattern array */
-int		pat_len;		/* actual number of pattern bytes */
-unsigned char	*madr;			/* mmap address */
-size_t		filesize;
-int		num_matches = 0;
-off_t		firstloc = 0;
-
-void usage (void)
-{
-	fprintf (stderr, "%s ver. %s\n", progname, VERSION);
-	fprintf (stderr, "usage:  %s filename pattern_bytes\n",
-			progname);
-	fprintf (stderr, "        [prints location of pattern_bytes in file]\n");
-	exit (1);
-}
-
-int get_pattern (int pat_count, char *pats [])
-{
-	int ix, err, tmp;
-
-#ifdef DEBUG
-	fprintf (stderr,"get_pattern: count = %d\n", pat_count);
-	for (ix = 0; ix < pat_count; ix++)
-		fprintf (stderr, "  pat # %d:  [%s]\n", ix, pats[ix]);
-#endif
-
-	for (ix = 0; ix < pat_count; ix++) {
-		tmp = 0;
-		err = sscanf (pats[ix], "%5i", &tmp);
-		if (err != 1 || tmp > 0xff) {
-			fprintf (stderr, "pattern or value error in pattern # %d [%s]\n",
-					ix, pats[ix]);
-			usage ();
-		}
-		patterns [ix] = tmp;
-	}
-	pat_len = pat_count;
-}
-
-int search_pattern (void)
-{
-	for (bix = 0; bix < filesize; bix++) {
-		if (madr[bix] == patterns[0]) {
-			if (memcmp (&madr[bix], patterns, pat_len) == 0) {
-				if (num_matches == 0)
-					firstloc = bix;
-				num_matches++;
-			}
-		}
-	}
-}
-
-#ifdef NOTDEF
-size_t get_filesize (int fd)
-{
-	off_t end_off = lseek (fd, 0, SEEK_END);
-	lseek (fd, 0, SEEK_SET);
-	return (size_t) end_off;
-}
-#endif
-
-size_t get_filesize (int fd)
-{
-	int err;
-	struct stat stat;
-
-	err = fstat (fd, &stat);
-	fprintf (stderr, "filesize: %d\n", err < 0 ? err : stat.st_size);
-	if (err < 0)
-		return err;
-	return (size_t) stat.st_size;
-}
-
-int main (int argc, char *argv [])
-{
-	progname = argv[0];
-
-	if (argc < 3)
-		usage ();
-
-	get_pattern (argc - 2, argv + 2);
-
-	inputname = argv[1];
-
-	inputfd = open (inputname, O_RDONLY);
-	if (inputfd == -1) {
-		fprintf (stderr, "%s: cannot open '%s'\n",
-				progname, inputname);
-		exit (3);
-	}
-
-	filesize = get_filesize (inputfd);
-
-	madr = mmap (0, filesize, PROT_READ, MAP_PRIVATE, inputfd, 0);
-	if (madr == MAP_FAILED) {
-		fprintf (stderr, "mmap error = %d\n", errno);
-		close (inputfd);
-		exit (4);
-	}
-
-	search_pattern ();
-
-	if (munmap (madr, filesize))
-		fprintf (stderr, "munmap error = %d\n", errno);
-
-	if (close (inputfd))
-		fprintf (stderr, "%s: error %d closing '%s'\n",
-				progname, errno, inputname);
-
-	fprintf (stderr, "number of pattern matches = %d\n", num_matches);
-	if (num_matches == 0)
-		firstloc = ~0;
-	printf ("%d\n", firstloc);
-	fprintf (stderr, "%d\n", firstloc);
-
-	exit (num_matches ? 0 : 2);
-}
-
-/* end binoffset.c */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/scripts/carray.c linux-2.4.20-wolk4.16-fullkernel/scripts/carray.c
--- linux-2.4.20-wolk4.15-fullkernel/scripts/carray.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/scripts/carray.c	2004-09-05 16:09:22.000000000 +0200
@@ -0,0 +1,260 @@
+/*
+ * carray.c - encode a file into a C array
+ *
+ * Copyright (c) 2001 Andreas Ferber <af@devcon.net>
+ *
+ * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#define _GNU_SOURCE
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <getopt.h>
+#include <string.h>
+
+#define BUFSIZE 4096
+
+char *me;			/* argv[0] */
+
+/* program options */
+char *output_filename = "-";	/* default: STDOUT */
+char *input_filename = "-";	/* default: STDIN */
+char *compress_program = NULL;	/* default: no compression */
+char *array_name = "data";
+char *qualifier = "const";
+
+static void perror_fatal(const char *tag) __attribute__ ((noreturn));
+static void usage(void) __attribute__ ((noreturn));
+static void version(void) __attribute__ ((noreturn));
+
+void perror_fatal(const char *tag)
+{
+	fprintf(stderr, "%s: ", me);
+	perror(tag);
+	exit(1);
+}
+
+FILE *run_compression_child(const char *filename)
+{
+	FILE *tmp;
+	char *cmd;
+
+	cmd = malloc(strlen(compress_program)+strlen(" -c ")+strlen(filename)+1);
+	if (cmd == NULL) {
+		fprintf(stderr, "malloc failed\n");
+		exit(1);
+	}
+
+	/* malloc() above ensures that there is always enough space */
+	strcpy(cmd, compress_program);
+	strcat(cmd, " -c ");
+	strcat(cmd, filename);
+
+	tmp = popen(cmd, "r");
+	if (tmp == NULL) {
+		fprintf(stderr, "could not run gzip\n");
+		exit(1);
+	}
+
+	return tmp;
+}
+
+void write_head(FILE * output)
+{
+	fprintf(output, "/* autogenerated by %s - do not edit */\n\n", me);
+	if (strcmp(qualifier, "") != 0)
+		fprintf(output, "%s ", qualifier);
+	fprintf(output, "char %s[] = {\n", array_name);
+}
+
+void header_encode(FILE * input, FILE * output)
+{
+	size_t lw = 0;
+
+	write_head(output);
+	fprintf(output, "    ");
+
+	while (!feof(input)) {
+		static unsigned char buf[BUFSIZE];
+		size_t r;
+		size_t i;
+
+		r = fread(buf, 1, BUFSIZE, input);
+		for (i = 0; i < r; i++) {
+			fprintf(output, "0x%02x", (int) (buf[i]));
+			if (!(feof(input) && i == r - 1)) {
+				if (lw++ == 7) {
+					fprintf(output, ",\n    ");
+					lw = 0;
+				} else
+					fprintf(output, ", ");
+			}
+		}
+	}
+
+	fprintf(output, "\n};\n");
+}
+
+void usage(void)
+{
+	fprintf(stderr,
+		"Usage: carray [OPTION]... [SOURCE]\n"
+		"Encodes data into a C array, with optional compression.\n"
+		"Data is read from SOURCE or STDIN if SOURCE is omitted.\n"
+		"\n"
+		"  -a, --array-name=STRING      set the name of the generated array\n"
+		"  -q, --qualifier=STRING       type qualifiers for the array\n"
+		"  -o, --output=FILE            write output to FILE\n"
+		"  -z, --compression=PATH       path to a compression program\n"
+		"      --help                   display this help and exit\n"
+		"      --version                output version information and exit\n");
+	exit(0);
+}
+
+void version(void)
+{
+	fprintf(stderr,
+		"carray 0.42\n" "Written by Andreas Ferber.\n");
+	exit(0);
+}
+
+int main(int argc, char **argv)
+{
+
+	FILE *input;
+	FILE *output = stdout;
+
+	me = argv[0];
+
+	/* read options */
+	while (1) {
+		int c;
+
+		static struct option long_options[] = {
+			{"array-name", 1, NULL, 'a'},
+			{"qualifier", 1, NULL, 'q'},
+			{"output", 1, NULL, 'o'},
+			{"compression", 1, NULL, 'z'},
+			{"help", 0, NULL, 'h'},
+			{"version", 0, NULL, 'V'},
+			{NULL, 0, NULL, 0}
+		};
+
+		c =
+		    getopt_long(argc, argv, "a:q:o:z:", long_options,
+				NULL);
+		if (c == -1)	/* no more options */
+			break;
+
+		switch (c) {
+		case 'a':
+			array_name = optarg;
+			break;
+		case 'q':
+			qualifier = optarg;
+			break;
+		case 'o':
+			output_filename = optarg;
+			break;
+		case 'z':
+			if (strcmp(optarg, "none") == 0)
+				compress_program = NULL;
+			else
+				compress_program = optarg;
+			break;
+		case 'h':
+			usage();
+			break;
+		case 'V':
+			version();
+			break;
+		default:
+			/* error message already printed by getopt_long. */
+			fprintf(stderr,
+				"Try `%s --help' for more information.\n",
+				me);
+			exit(1);
+		}
+	}
+
+	/* get input filename if given */
+	if (optind < argc) {
+		if (optind < argc - 1) {
+			fprintf(stderr,
+				"%s: to many arguments\n"
+				"Try `%s --help' for more information.\n",
+				me, me);
+			exit(1);
+		}
+
+		input_filename = argv[optind++];
+	}
+
+	/* check if input file exists before running gzip
+	 * NOTE: this has a race condition, so we have to check gzip exit
+	 *       code also. The check here is only for more graceful
+	 *       "normal" error handling */
+	if (strcmp(input_filename, "-") != 0) {
+		struct stat s;
+		if (stat(input_filename, &s) == -1)
+			perror_fatal(input_filename);
+
+		if (access(input_filename, R_OK) == -1)
+			perror_fatal(input_filename);
+	}
+
+	/* open output file */
+	if (strcmp(output_filename, "-") != 0) {
+		output = fopen(output_filename, "w");
+		if (output == NULL)
+			perror_fatal(output_filename);
+	}
+
+	if (compress_program != NULL)
+		input = run_compression_child(input_filename);
+	else {
+		if (strcmp(input_filename, "-") == 0)
+			input = stdin;
+		else
+			input = fopen(input_filename, "r");
+	}
+
+	/* encode gzip output into a C header file */
+	header_encode(input, output);
+
+	fclose(output);
+
+	if (compress_program != NULL) {
+		if (pclose(input) != 0) {
+			if (strcmp(output_filename, "-") != 0)
+				(void) unlink(output_filename);
+			fprintf(stderr, "%s: gzip returned an error\n", me);
+			exit(1);
+		}
+	}
+	else {
+		fclose(input);
+	}
+
+	return 0;
+}
+
+/*
+ * vi:ts=8 sw=8 noexpandtab
+ */
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/scripts/extract-ikconfig linux-2.4.20-wolk4.16-fullkernel/scripts/extract-ikconfig
--- linux-2.4.20-wolk4.15-fullkernel/scripts/extract-ikconfig	2004-06-29 11:26:20.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/scripts/extract-ikconfig	1970-01-01 01:00:00.000000000 +0100
@@ -1,66 +0,0 @@
-#! /bin/sh 
-# extracts .config info from a [b]zImage file
-# uses: binoffset (new), dd, zcat, strings, grep
-# $arg1 is [b]zImage filename
-
-TMPFILE=""
-
-usage()
-{
-	echo "  usage: extract-ikconfig [b]zImage_filename"
-}
-
-clean_up()
-{
-	if [ -z $ISCOMP ]
-	then
-		rm -f $TMPFILE
-	fi
-}
-
-if [ $# -lt 1 ]
-then
-	usage
-	exit
-fi
-
-image=$1
-
-# There are two gzip headers, as well as arches which don't compress their
-# kernel.
-GZHDR="0x1f 0x8b 0x08 0x00"
-if [ `binoffset $image $GZHDR >/dev/null 2>&1 ; echo $?` -ne 0 ]
-then
-	GZHDR="0x1f 0x8b 0x08 0x08"
-	if [ `binoffset $image $GZHDR >/dev/null 2>&1 ; echo $?` -ne 0 ]
-	then
-		ISCOMP=0
-	fi
-fi
-
-PID=$$
-
-# Extract and uncompress the kernel image if necessary
-if [ -z $ISCOMP ]
-then
-	TMPFILE="/tmp/`basename $image`.vmlin.$PID"
-	dd if=$image bs=1 skip=`binoffset $image $GZHDR` 2> /dev/null | zcat > $TMPFILE
-else
-	TMPFILE=$image
-fi
-
-# Look for strings.
-strings $TMPFILE | grep "CONFIG_BEGIN=n" > /dev/null
-if [ $? -eq 0 ]
-then
-	strings $TMPFILE | awk "/CONFIG_BEGIN=n/,/CONFIG_END=n/" > $image.oldconfig.$PID
-else
-	echo "ERROR: Unable to extract kernel configuration information."
-	echo "       This kernel image may not have the config info."
-	clean_up
-	exit 1
-fi
-
-echo "Kernel configuration written to $image.oldconfig.$PID"
-clean_up
-exit 0
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/scripts/mkconfigs linux-2.4.20-wolk4.16-fullkernel/scripts/mkconfigs
--- linux-2.4.20-wolk4.15-fullkernel/scripts/mkconfigs	2004-06-29 11:31:51.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/scripts/mkconfigs	1970-01-01 01:00:00.000000000 +0100
@@ -1,81 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2002 Khalid Aziz <khalid_aziz@hp.com>
-# Copyright (C) 2002 Randy Dunlap <rddunlap@osdl.org>
-# Copyright (C) 2002 Al Stone <ahs3@fc.hp.com>
-# Copyright (C) 2002 Hewlett-Packard Company
-#
-#   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., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-# 
-# Rules to generate ikconfig.h from linux/.config:
-#	- Retain lines that begin with "CONFIG_"
-#	- Retain lines that begin with "# CONFIG_"
-#	- lines that use double-quotes must \\-escape-quote them
-
-
-kernel_version()
-{
-	KERNVER="`grep VERSION $1 | head -n 1 | cut -f3 -d' '`.`grep PATCHLEVEL $1 | head -n 1 | cut -f3 -d' '`.`grep SUBLEVEL $1 | head -n 1 | cut -f3 -d' '``grep EXTRAVERSION $1 | head -n 1 | cut -f3 -d' '`"
-}
-
-if [ $# -lt 2 ]
-then
-	echo "Usage: `basename $0` <configuration_file> <Makefile>"
-	exit 1
-fi
-
-config=$1
-makefile=$2
-
-echo "#ifndef _IKCONFIG_H"
-echo "#define _IKCONFIG_H"
-echo \
-"/*
- * 
- * 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, GOOD TITLE or
- * NON INFRINGEMENT.  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., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *
- * 
- * This file is generated automatically by scripts/mkconfigs. Do not edit.
- *
- */"
-
-echo "static char *ikconfig_built_with ="
-echo "    \"`uname -s` `uname -r` `uname -v` `uname -m`\";"
-echo
-kernel_version $makefile
-echo "#ifdef CONFIG_IKCONFIG_PROC"
-echo "static char *ikconfig_config = "
-echo "#else"
-echo "static char *ikconfig_config __initdata __attribute__((unused)) = "
-echo "#endif"
-echo "\"CONFIG_BEGIN=n\\n\\"
-echo "`cat $config | sed 's/\"/\\\\\"/g' | grep "^#\? \?CONFIG_" | awk '{ print $0 "\\\\n\\\\" }' `"
-echo "CONFIG_END=n\\n\";"
-echo "#endif /* _IKCONFIG_H */"
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/scripts/strip-spc-r.sh linux-2.4.20-wolk4.16-fullkernel/scripts/strip-spc-r.sh
--- linux-2.4.20-wolk4.15-fullkernel/scripts/strip-spc-r.sh	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.16-fullkernel/scripts/strip-spc-r.sh	2004-09-04 17:28:28.000000000 +0200
@@ -0,0 +1,9 @@
+#!/bin/bash
+# file recursive removal of whitespaces (but not form-feed) at the end of a line
+for f in `find . -name *[.][ch]`
+do
+  echo $f
+  mv $f $f.tmp
+  sed -e "s/[\t ]*$//g" $f.tmp >$f
+  rm $f.tmp
+done
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/scripts/tkgen.c linux-2.4.20-wolk4.16-fullkernel/scripts/tkgen.c
--- linux-2.4.20-wolk4.15-fullkernel/scripts/tkgen.c	2004-06-29 11:31:42.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/scripts/tkgen.c	2004-09-05 16:24:51.000000000 +0200
@@ -123,8 +123,8 @@ static int tot_menu_num = 0;
 /*
  * Pointers to mainmenu_option and endmenu of each menu.
  */
-struct kconfig * menu_first [200];
-struct kconfig * menu_last  [200];
+struct kconfig * menu_first [250];
+struct kconfig * menu_last  [250];
 
 /*
  * Generate portion of wish script for the beginning of a submenu.
@@ -1171,7 +1171,7 @@ void dump_tk_script( struct kconfig * sc
 	case token_mainmenu_option:
 	    if ( ++menu_depth >= 64 )
 		{ fprintf( stderr, "menus too deep\n" ); exit( 1 ); }
-	    if ( ++tot_menu_num >= 200 )
+	    if ( ++tot_menu_num >= 250 )
 		{ fprintf( stderr, "too many menus\n" ); exit( 1 ); }
 	    menu_num   [menu_depth]   = tot_menu_num;
 	    menu_first [tot_menu_num] = cfg;
diff -Naurp linux-2.4.20-wolk4.15-fullkernel/scripts/ver_linux linux-2.4.20-wolk4.16-fullkernel/scripts/ver_linux
--- linux-2.4.20-wolk4.15-fullkernel/scripts/ver_linux	2004-06-29 11:31:51.000000000 +0200
+++ linux-2.4.20-wolk4.16-fullkernel/scripts/ver_linux	2004-09-05 16:08:33.000000000 +0200
@@ -39,12 +39,15 @@ fsck.jfs -V 2>&1 | grep version | sed 's
 reiserfsck -V 2>&1 | grep reiserfsprogs | awk \
 'NR==1{print "reiserfsprogs         ", $NF}'
 
-reiserfsck -V 2>&1 | grep namesys | awk \
-'NR==1{print "reiserfsprogs         ", $2}'
+xfs_db -V 2>&1 | grep version | awk \
+'NR==1{print "xfsprogs              ", $3}'
 
 cardmgr -V 2>&1| grep version | awk \
 'NR==1{print "pcmcia-cs             ", $3}'
 
+quota -V 2>&1 | grep version | awk \
+'NR==1{print "quota-tools           ", $NF}'
+
 pppd --version 2>&1| grep version | awk \
 'NR==1{print "PPP                   ", $3}'
 
@@ -76,6 +79,14 @@ loadkeys -V 2>&1 | awk \
 
 expr --v 2>&1 | awk 'NR==1{print "Sh-utils              ", $NF}'
 
+gradm 2>&1 | awk 'NR==1{print "gradm                 ", $2}'
+
+gradm2 2>&1 | awk 'NR==1{print "gradm2                ", $2}'
+
+chpax 2>&1 | awk 'NR==1{print "chpax                 ", $2}'
+
+paxctl 2>&1 | awk 'NR==1{print "paxctl                ", $3}'
+
 if [ -e /proc/modules ]; then
     X=`cat /proc/modules | sed -e "s/ .*$//"`
     echo "Modules Loaded         "$X